diff --git a/.eslintignore b/.eslintignore
index 644318acf68..cc014c8b92f 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -11,7 +11,6 @@ lib/javascripts/messageformat.js
 lib/javascripts/moment.js
 lib/javascripts/moment_locale/
 lib/highlight_js/
-lib/es6_module_transpiler/support/es6-module-transpiler.js
 public/javascripts/
 spec/phantom_js/smoke_test.js
 vendor/
diff --git a/.eslintrc b/.eslintrc
index 4148a259baa..86bdc29e2ad 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -6,28 +6,27 @@
     "browser": true,
     "builtin": true
   },
-  ecmaVersion: 7,
+  "parserOptions": {
+    "ecmaVersion": 7,
+    "sourceType": "module"
+  },
   "globals":
     {"Ember":true,
     "jQuery":true,
     "$":true,
+    "QUnit":true,
     "RSVP":true,
     "Discourse":true,
     "Em":true,
     "Handlebars":true,
     "I18n":true,
     "bootbox":true,
-    "module":true,
     "moduleFor":true,
     "moduleForComponent":true,
     "Pretender":true,
     "sandbox":true,
     "controllerFor":true,
     "test":true,
-    "ok":true,
-    "not":true,
-    "expect":true,
-    "equal":true,
     "visit":true,
     "andThen":true,
     "click":true,
@@ -48,12 +47,8 @@
     "find":true,
     "sinon":true,
     "moment":true,
-    "start":true,
     "_":true,
     "alert":true,
-    "containsInstance":true,
-    "deepEqual":true,
-    "notEqual":true,
     "define":true,
     "require":true,
     "requirejs":true,
diff --git a/.image_optim.yml b/.image_optim.yml
deleted file mode 100644
index 746b85dc3b4..00000000000
--- a/.image_optim.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-skip_missing_workers: true
-allow_lossy: false
-# PNG
-advpng: false
-optipng:
-  level: 2
-pngcrush: false
-pngout: false
-pngquant: false
-# JPG
-jpegrecompress: false
-timeout: 15
diff --git a/.travis.yml b/.travis.yml
index 1c681386e01..25827245817 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,7 @@ env:
     - RUBY_GC_MALLOC_LIMIT=50000000
   matrix:
     - "RAILS_MASTER=0 QUNIT_RUN=0"
-    - "RAILS_MASTER=1 QUNIT_RUN=0"
     - "RAILS_MASTER=0 QUNIT_RUN=1"
-    - "RAILS_MASTER=1 QUNIT_RUN=1"
 
 addons:
   postgresql: 9.5
@@ -20,9 +18,6 @@ addons:
     - jhead
 
 matrix:
-  allow_failures:
-    - env: "RAILS_MASTER=1 QUNIT_RUN=0"
-    - env: "RAILS_MASTER=1 QUNIT_RUN=1"
   fast_finish: true
 
 rvm:
@@ -36,6 +31,7 @@ sudo: required
 dist: trusty
 
 cache:
+  yarn: true
   directories:
     - vendor/bundle
 
@@ -46,7 +42,7 @@ before_install:
   - git clone --depth=1 https://github.com/discourse/discourse-cakeday.git plugins/discourse-cakeday
   - git clone --depth=1 https://github.com/discourse/discourse-canned-replies.git plugins/discourse-canned-replies
   - git clone --depth=1 https://github.com/discourse/discourse-slack-official.git plugins/discourse-slack-official
-  - npm i -g eslint babel-eslint
+  - yarn global add eslint babel-eslint
   - eslint app/assets/javascripts
   - eslint --ext .es6 app/assets/javascripts
   - eslint --ext .es6 test/javascripts
@@ -61,4 +57,4 @@ install:
   - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi"
 
 script:
-  - bash -c "if [ '$QUNIT_RUN' == '0' ]; then bundle exec rspec && bundle exec rake plugin:spec; else bundle exec rake qunit:test['200000']; fi"
+  - bash -c "if [ '$QUNIT_RUN' == '0' ]; then bundle exec rspec && bundle exec rake plugin:spec; else LOAD_PLUGINS=1 bundle exec rake qunit:test['300000']; fi"
diff --git a/.tx/config b/.tx/config
index bd09128d4c4..77c2f933219 100644
--- a/.tx/config
+++ b/.tx/config
@@ -26,12 +26,6 @@ source_file = plugins/poll/config/locales/server.en.yml
 source_lang = en
 type = YML
 
-[discourse-org.imgurserverenyml]
-file_filter = vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.<lang>.yml
-source_file = vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.en.yml
-source_lang = en
-type = YML
-
 [discourse-org.narrativeclientenyml]
 file_filter = plugins/discourse-narrative-bot/config/locales/client.<lang>.yml
 source_file = plugins/discourse-narrative-bot/config/locales/client.en.yml
diff --git a/Gemfile b/Gemfile
index a3222a8b26c..091bf3fd1eb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,7 @@ end
 
 gem 'mail'
 gem 'mime-types', require: 'mime/types/columnar'
+gem 'mini_mime'
 
 gem 'hiredis'
 gem 'redis', require:  ["redis", "redis/connection/hiredis"]
@@ -48,10 +49,9 @@ gem 'onebox'
 gem 'http_accept_language', '~>2.0.5', require: false
 
 gem 'ember-rails', '0.18.5'
-gem 'ember-source', '2.10.0'
+gem 'ember-source'
 gem 'ember-handlebars-template', '0.7.5'
 gem 'barber'
-gem 'babel-transpiler'
 
 gem 'message_bus'
 
@@ -74,6 +74,10 @@ gem 'discourse_image_optim', require: 'image_optim'
 gem 'multi_json'
 gem 'mustache'
 gem 'nokogiri'
+
+# this may end up deprecating nokogiri
+gem 'oga', require: false
+
 gem 'omniauth'
 gem 'omniauth-openid'
 gem 'openid-redis-store'
@@ -94,13 +98,13 @@ gem 'r2', '~> 0.2.5', require: false
 gem 'rake'
 
 gem 'thor', require: false
-gem 'rest-client'
 gem 'rinku'
 gem 'sanitize'
 gem 'sidekiq'
 
 # for sidekiq web
-gem 'sinatra', require: false
+gem 'tilt', require: false
+
 gem 'execjs', require: false
 gem 'mini_racer'
 gem 'highline', require: false
@@ -118,7 +122,6 @@ group :test do
   gem 'webmock', require: false
   gem 'fakeweb', '~> 1.3.0', require: false
   gem 'minitest', require: false
-  gem 'timecop'
   # TODO: Remove once we upgrade to Rails 5.
   gem 'test_after_commit'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b617ecdee2..dce01c3c166 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,20 +39,18 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    annotate (2.7.1)
+    annotate (2.7.2)
       activerecord (>= 3.2, < 6.0)
-      rake (>= 10.4, < 12.0)
+      rake (>= 10.4, < 13.0)
+    ansi (1.5.0)
     arel (6.0.4)
+    ast (2.3.0)
     aws-sdk (2.5.3)
       aws-sdk-resources (= 2.5.3)
     aws-sdk-core (2.5.3)
       jmespath (~> 1.0)
     aws-sdk-resources (2.5.3)
       aws-sdk-core (= 2.5.3)
-    babel-source (5.8.34)
-    babel-transpiler (0.7.0)
-      babel-source (>= 4.0, < 6)
-      execjs (~> 2.0)
     barber (0.11.2)
       ember-source (>= 1.0, < 3)
       execjs (>= 1.2, < 3)
@@ -62,21 +60,21 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootsnap (0.3.0)
+    bootsnap (1.0.0)
       msgpack (~> 1.0)
     builder (3.2.3)
-    bullet (5.4.2)
+    bullet (5.5.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
     byebug (9.0.6)
     certified (1.0.0)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
-    connection_pool (2.2.0)
+    connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.2)
-    debug_inspector (0.0.2)
+    debug_inspector (0.0.3)
     diff-lcs (1.3)
     discourse-qunit-rails (0.0.9)
       railties
@@ -86,8 +84,6 @@ GEM
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
     email_reply_trimmer (0.1.6)
     ember-data-source (2.2.1)
       ember-source (>= 1.8, < 3.0)
@@ -101,9 +97,9 @@ GEM
       ember-source (>= 1.1.0)
       jquery-rails (>= 1.0.17)
       railties (>= 3.1)
-    ember-source (2.10.0)
+    ember-source (2.13.3)
     erubis (2.7.0)
-    excon (0.55.0)
+    excon (0.56.0)
     execjs (2.7.0)
     exifr (1.2.5)
     fabrication (2.9.8)
@@ -118,32 +114,30 @@ GEM
     fastimage (2.1.0)
     ffi (1.9.18)
     flamegraph (0.9.5)
-    foreman (0.82.0)
+    foreman (0.84.0)
       thor (~> 0.19.1)
     fspath (3.1.0)
     gc_tracer (1.5.1)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     guess_html_encoding (0.0.11)
     hashdiff (0.3.4)
     hashie (3.5.5)
     highline (1.7.8)
     hiredis (0.6.1)
     htmlentities (4.3.4)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     http_accept_language (2.0.5)
-    i18n (0.8.1)
+    i18n (0.8.4)
     image_size (1.5.0)
     in_threads (1.4.0)
     jmespath (1.3.1)
-    jquery-rails (4.2.1)
+    jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jwt (1.5.6)
     kgio (2.11.0)
-    libv8 (5.3.332.38.5)
+    libv8 (5.7.492.65.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -152,31 +146,31 @@ GEM
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
-    mail (2.6.6.rc1)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
-    memory_profiler (0.9.7)
+    memory_profiler (0.9.8)
     message_bus (2.0.2)
       rack (>= 1.1.3)
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (2.99.3)
-    mini_portile2 (2.1.0)
-    mini_racer (0.1.9)
-      libv8 (~> 5.3)
-    minitest (5.10.1)
-    mocha (1.1.0)
+    mini_mime (0.1.3)
+    mini_portile2 (2.2.0)
+    mini_racer (0.1.11)
+      libv8 (~> 5.7)
+    minitest (5.10.2)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
-    mock_redis (0.15.4)
+    mock_redis (0.17.3)
     moneta (1.0.0)
     msgpack (1.1.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     mustache (1.0.5)
-    netrc (0.11.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
-    nokogumbo (1.4.10)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    nokogumbo (1.4.13)
       nokogiri
     oauth (0.5.1)
     oauth2 (1.3.1)
@@ -185,7 +179,10 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    oj (3.0.5)
+    oga (2.10)
+      ast
+      ruby-ll (~> 2.1)
+    oj (3.1.0)
     omniauth (1.6.1)
       hashie (>= 3.4.6, < 3.6.0)
       rack (>= 1.6.2, < 3)
@@ -214,7 +211,7 @@ GEM
     omniauth-twitter (1.3.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.8.10)
+    onebox (1.8.16)
       fast_blank (>= 1.0.0)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
@@ -225,7 +222,7 @@ GEM
     openid-redis-store (0.0.2)
       redis
       ruby-openid
-    pg (0.19.0)
+    pg (0.20.0)
     progress (3.3.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -236,10 +233,10 @@ GEM
     pry-rails (0.3.4)
       pry (>= 0.9.10)
     public_suffix (2.0.5)
-    puma (3.6.0)
+    puma (3.9.1)
     r2 (0.2.6)
     rack (1.6.8)
-    rack-mini-profiler (0.10.4)
+    rack-mini-profiler (0.10.5)
       rack (>= 1.2.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
@@ -275,84 +272,79 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.18.0)
-    rake (11.3.0)
-    rake-compiler (0.9.9)
+    rake (12.0.0)
+    rake-compiler (1.0.4)
       rake
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rbtrace (0.4.8)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)
     redis (3.3.3)
-    redis-namespace (1.5.2)
+    redis-namespace (1.5.3)
       redis (~> 3.0, >= 3.0.4)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rinku (2.0.0)
+    rinku (2.0.2)
     rmmseg-cpp (0.2.9)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-html-matchers (0.7.0)
+      rspec-support (~> 3.6.0)
+    rspec-html-matchers (0.9.1)
       nokogiri (~> 1)
-      rspec (~> 3)
-    rspec-mocks (3.4.1)
+      rspec (>= 3.0.0.a, < 4)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     rtlit (0.0.5)
+    ruby-ll (2.1.2)
+      ansi
+      ast
     ruby-openid (2.7.0)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)
       nokogiri (>= 1.6.0)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sanitize (4.4.0)
+    sanitize (4.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
-    sass (3.4.23)
+    sass (3.4.24)
     sassc (1.11.2)
       bundler
       ffi (~> 1.9.6)
       sass (>= 3.3.0)
-    seed-fu (2.3.5)
-      activerecord (>= 3.1, < 4.3)
-      activesupport (>= 3.1, < 4.3)
+    seed-fu (2.3.6)
+      activerecord (>= 3.1)
+      activesupport (>= 3.1)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
     shoulda-context (1.2.2)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (4.2.4)
+    sidekiq (5.0.3)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
+      redis (~> 3.3, >= 3.3.3)
     simple-rss (1.3.1)
-    sinatra (1.4.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
     slop (3.6.0)
     spork (1.0.0rc4)
     spork-rails (4.0.0)
@@ -370,16 +362,15 @@ GEM
       activerecord (>= 3.2)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.5)
-    timecop (0.8.1)
+    tilt (2.0.7)
     trollop (2.1.2)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    uglifier (3.0.2)
+    uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.4)
     unicorn (5.3.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -396,7 +387,6 @@ DEPENDENCIES
   active_model_serializers (~> 0.8.3)
   annotate
   aws-sdk
-  babel-transpiler
   barber
   better_errors
   binding_of_caller
@@ -409,7 +399,7 @@ DEPENDENCIES
   email_reply_trimmer (= 0.1.6)
   ember-handlebars-template (= 0.7.5)
   ember-rails (= 0.18.5)
-  ember-source (= 2.10.0)
+  ember-source
   excon
   execjs
   fabrication (= 2.9.8)
@@ -432,6 +422,7 @@ DEPENDENCIES
   memory_profiler
   message_bus
   mime-types
+  mini_mime
   mini_racer
   minitest
   mocha
@@ -439,6 +430,7 @@ DEPENDENCIES
   multi_json
   mustache
   nokogiri
+  oga
   oj
   omniauth
   omniauth-facebook
@@ -465,7 +457,6 @@ DEPENDENCIES
   rbtrace
   redis
   redis-namespace
-  rest-client
   rinku
   rmmseg-cpp
   rspec
@@ -479,16 +470,15 @@ DEPENDENCIES
   shoulda
   sidekiq
   simple-rss
-  sinatra
   spork-rails
   stackprof
   test_after_commit
   thor
-  timecop
+  tilt
   uglifier
   unf
   unicorn
   webmock
 
 BUNDLED WITH
-   1.14.6
+   1.15.1
diff --git a/app/assets/javascripts/admin/components/ip-lookup.js.es6 b/app/assets/javascripts/admin/components/ip-lookup.js.es6
index 0c9b73d54ac..a185e4c0b6e 100644
--- a/app/assets/javascripts/admin/components/ip-lookup.js.es6
+++ b/app/assets/javascripts/admin/components/ip-lookup.js.es6
@@ -1,4 +1,5 @@
 import { ajax } from 'discourse/lib/ajax';
+import AdminUser from 'admin/models/admin-user';
 
 export default Ember.Component.extend({
   classNames: ["ip-lookup"],
@@ -44,7 +45,6 @@ export default Ember.Component.extend({
           self.set("totalOthersWithSameIP", result.total);
         });
 
-        const AdminUser = require('admin/models/admin-user').default;
         AdminUser.findAll("active", data).then(function (users) {
           self.setProperties({
             other_accounts: users,
diff --git a/app/assets/javascripts/admin/components/permalink-form.js.es6 b/app/assets/javascripts/admin/components/permalink-form.js.es6
index 2bde845c0c6..90dcf2a7b20 100644
--- a/app/assets/javascripts/admin/components/permalink-form.js.es6
+++ b/app/assets/javascripts/admin/components/permalink-form.js.es6
@@ -1,3 +1,5 @@
+import Permalink from 'admin/models/permalink';
+
 export default Ember.Component.extend({
   classNames: ['permalink-form'],
   formSubmitted: false,
@@ -18,8 +20,6 @@ export default Ember.Component.extend({
 
   actions: {
     submit: function() {
-      const Permalink = require('admin/models/permalink').default;
-
       if (!this.get('formSubmitted')) {
         const self = this;
         self.set('formSubmitted', true);
diff --git a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
index 8065d732fcc..eb03301c92d 100644
--- a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js.es6
@@ -2,11 +2,13 @@ import EmailPreview from 'admin/models/email-preview';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
 
 export default Ember.Controller.extend({
+  username: null,
+  lastSeen: null,
 
-  emailEmpty: Em.computed.empty('email'),
-  sendEmailDisabled: Em.computed.or('emailEmpty', 'sendingEmail'),
-  showSendEmailForm: Em.computed.notEmpty('model.html_content'),
-  htmlEmpty: Em.computed.empty('model.html_content'),
+  emailEmpty: Ember.computed.empty('email'),
+  sendEmailDisabled: Ember.computed.or('emailEmpty', 'sendingEmail'),
+  showSendEmailForm: Ember.computed.notEmpty('model.html_content'),
+  htmlEmpty: Ember.computed.empty('model.html_content'),
 
   actions: {
     refresh() {
@@ -14,7 +16,14 @@ export default Ember.Controller.extend({
 
       this.set('loading', true);
       this.set('sentEmail', false);
-      EmailPreview.findDigest(this.get('lastSeen'), this.get('username')).then(email => {
+
+      let username = this.get('username');
+      if (!username) {
+        username = this.currentUser.get('username');
+        this.set('username', username);
+      }
+
+      EmailPreview.findDigest(username, this.get('lastSeen')).then(email => {
         model.setProperties(email.getProperties('html_content', 'text_content'));
         this.set('loading', false);
       });
@@ -28,16 +37,14 @@ export default Ember.Controller.extend({
       this.set('sendingEmail', true);
       this.set('sentEmail', false);
 
-      const self = this;
-
-      EmailPreview.sendDigest(this.get('lastSeen'), this.get('username'), this.get('email')).then(result => {
+      EmailPreview.sendDigest(this.get('username'), this.get('lastSeen'), this.get('email')).then(result => {
         if (result.errors) {
           bootbox.alert(result.errors);
         } else {
-          self.set('sentEmail', true);
+          this.set('sentEmail', true);
         }
-      }).catch(popupAjaxError).finally(function() {
-        self.set('sendingEmail', false);
+      }).catch(popupAjaxError).finally(() => {
+        this.set('sendingEmail', false);
       });
     }
   }
diff --git a/app/assets/javascripts/admin/controllers/admin-group.js.es6 b/app/assets/javascripts/admin/controllers/admin-group.js.es6
index a0f4961b62f..52dbc07791b 100644
--- a/app/assets/javascripts/admin/controllers/admin-group.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-group.js.es6
@@ -15,6 +15,15 @@ export default Ember.Controller.extend({
     ];
   }.property(),
 
+  visibilityLevelOptions: function() {
+    return [
+      { name: I18n.t("groups.visibility_levels.public"), value: 0 },
+      { name: I18n.t("groups.visibility_levels.members"), value: 1 },
+      { name: I18n.t("groups.visibility_levels.staff"), value: 2 },
+      { name: I18n.t("groups.visibility_levels.owners"), value: 3 }
+    ];
+  }.property(),
+
   trustLevelOptions: function() {
     return [
       { name: I18n.t("groups.trust_levels.none"), value: 0 },
@@ -22,14 +31,16 @@ export default Ember.Controller.extend({
     ];
   }.property(),
 
-  @computed('model.visible', 'model.public')
-  disableMembershipRequestSetting(visible, publicGroup) {
-    return !visible || publicGroup;
+  @computed('model.visibility_level', 'model.public')
+  disableMembershipRequestSetting(visibility_level, publicGroup) {
+    visibility_level = parseInt(visibility_level);
+    return (visibility_level !== 0) || publicGroup;
   },
 
-  @computed('model.visible', 'model.allow_membership_requests')
-  disablePublicSetting(visible, allowMembershipRequests) {
-    return !visible || allowMembershipRequests;
+  @computed('model.visibility_level', 'model.allow_membership_requests')
+  disablePublicSetting(visibility_level, allowMembershipRequests) {
+    visibility_level = parseInt(visibility_level);
+    return (visibility_level !== 0) || allowMembershipRequests;
   },
 
   actions: {
diff --git a/app/assets/javascripts/admin/models/api-key.js.es6 b/app/assets/javascripts/admin/models/api-key.js.es6
index 2a7cf867783..024a1433929 100644
--- a/app/assets/javascripts/admin/models/api-key.js.es6
+++ b/app/assets/javascripts/admin/models/api-key.js.es6
@@ -1,4 +1,6 @@
+import AdminUser from 'admin/models/admin-user';
 import { ajax } from 'discourse/lib/ajax';
+
 const ApiKey = Discourse.Model.extend({
 
   /**
@@ -36,8 +38,7 @@ ApiKey.reopenClass({
     @param {...} var_args the properties to initialize this with
     @returns {ApiKey} the ApiKey instance
   **/
-  create: function() {
-    const AdminUser = require('admin/models/admin-user').default;
+  create() {
     var result = this._super.apply(this, arguments);
     if (result.user) {
       result.user = AdminUser.create(result.user);
diff --git a/app/assets/javascripts/admin/models/email-preview.js.es6 b/app/assets/javascripts/admin/models/email-preview.js.es6
index acc7462b925..2aaca02d1e7 100644
--- a/app/assets/javascripts/admin/models/email-preview.js.es6
+++ b/app/assets/javascripts/admin/models/email-preview.js.es6
@@ -1,42 +1,24 @@
 import { ajax } from 'discourse/lib/ajax';
 const EmailPreview = Discourse.Model.extend({});
 
+export function oneWeekAgo() {
+  return moment().locale('en').subtract(7, 'days').format('YYYY-MM-DD');
+}
+
 EmailPreview.reopenClass({
-  findDigest: function(lastSeenAt, username) {
-
-    if (Em.isEmpty(lastSeenAt)) {
-      lastSeenAt = this.oneWeekAgo();
-    }
-
-    if (Em.isEmpty(username)) {
-      username = Discourse.User.current().username;
-    }
 
+  findDigest(username, lastSeenAt) {
     return ajax("/admin/email/preview-digest.json", {
-      data: { last_seen_at: lastSeenAt, username: username }
-    }).then(function (result) {
-      return EmailPreview.create(result);
-    });
+      data: { last_seen_at: lastSeenAt || oneWeekAgo(), username }
+    }).then(result => EmailPreview.create(result));
   },
 
-  sendDigest: function(lastSeenAt, username, email) {
-    if (Em.isEmpty(lastSeenAt)) {
-      lastSeenAt = this.oneWeekAgo();
-    }
-
-    if (Em.isEmpty(username)) {
-      username = Discourse.User.current().username;
-    }
-
+  sendDigest(username, lastSeenAt, email) {
     return ajax("/admin/email/send-digest.json", {
-      data: { last_seen_at: lastSeenAt, username: username, email: email }
+      data: { last_seen_at: lastSeenAt || oneWeekAgo(), username, email }
     });
   },
 
-  oneWeekAgo() {
-    const en = moment().locale('en');
-    return en.subtract(7, 'days').format('YYYY-MM-DD');
-  }
 });
 
 export default EmailPreview;
diff --git a/app/assets/javascripts/admin/models/web-hook.js.es6 b/app/assets/javascripts/admin/models/web-hook.js.es6
index 325d9310452..27d72878b08 100644
--- a/app/assets/javascripts/admin/models/web-hook.js.es6
+++ b/app/assets/javascripts/admin/models/web-hook.js.es6
@@ -37,7 +37,7 @@ export default RestModel.extend({
   },
 
   groupFinder(term) {
-    return Group.findAll({search: term, ignore_automatic: false});
+    return Group.findAll({ term: term, ignore_automatic: false });
   },
 
   @computed('wildcard_web_hook', 'web_hook_event_types.[]')
@@ -82,4 +82,3 @@ export default RestModel.extend({
     return this.createProperties();
   }
 });
-
diff --git a/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6 b/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
index 7ca2f727722..0ee7b697554 100644
--- a/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-email-preview-digest.js.es6
@@ -1,16 +1,17 @@
-import EmailPreview from 'admin/models/email-preview';
+import { default as EmailPreview, oneWeekAgo } from 'admin/models/email-preview';
 
 export default Discourse.Route.extend({
 
   model() {
-    return EmailPreview.findDigest();
+    return EmailPreview.findDigest(this.currentUser.get('username'));
   },
 
   afterModel(model) {
     const controller = this.controllerFor('adminEmailPreviewDigest');
     controller.setProperties({
-      model: model,
-      lastSeen: moment().subtract(7, 'days').format('YYYY-MM-DD'),
+      model,
+      username: this.currentUser.get('username'),
+      lastSeen: oneWeekAgo(),
       showHtml: true
     });
   }
diff --git a/app/assets/javascripts/admin/routes/admin-group.js.es6 b/app/assets/javascripts/admin/routes/admin-group.js.es6
index 3575496edd4..0009f834e13 100644
--- a/app/assets/javascripts/admin/routes/admin-group.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-group.js.es6
@@ -4,7 +4,7 @@ export default Discourse.Route.extend({
 
   model(params) {
     if (params.name === 'new') {
-      return Group.create({ automatic: false, visible: true });
+      return Group.create({ automatic: false, visibility_level: 0 });
     }
 
     const group = this.modelFor('adminGroupsType').findBy('name', params.name);
diff --git a/app/assets/javascripts/admin/routes/admin-reports.js.es6 b/app/assets/javascripts/admin/routes/admin-reports.js.es6
index 47ece705808..65771110e86 100644
--- a/app/assets/javascripts/admin/routes/admin-reports.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-reports.js.es6
@@ -1,16 +1,9 @@
-/**
-  Handles routes for admin reports
+import Report from 'admin/models/report';
 
-  @class AdminReportsRoute
-  @extends Discourse.Route
-  @namespace Discourse
-  @module Discourse
-**/
 export default Discourse.Route.extend({
   queryParams: { mode: {}, "start_date": {}, "end_date": {}, "category_id": {}, "group_id": {} },
 
-  model: function(params) {
-    const Report = require('admin/models/report').default;
+  model(params) {
     return Report.find(params.type, params['start_date'], params['end_date'], params['category_id'], params['group_id']);
   },
 
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index 71d7216f273..77e254b42f2 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -1,3 +1,8 @@
-{{text-field value=value classNames="input-setting-string"}}
+{{#if setting.textarea}}
+  {{textarea value=value classNames="input-setting-textarea"}}
+{{else}}
+  {{text-field value=value classNames="input-setting-string"}}
+{{/if}}
+
 {{setting-validation-message message=validationMessage}}
 <div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
index 7f31c6e9bf2..87372268c74 100644
--- a/app/assets/javascripts/admin/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/templates/email-preview-digest.hbs
@@ -1,11 +1,11 @@
 <p>{{i18n 'admin.email.preview_digest_desc'}}</p>
 
-<div class='admin-controls'>
+<div class='admin-controls email-preview'>
   <div class='span7 controls'>
     <label for='last-seen'>{{i18n 'admin.email.last_seen_user'}}</label>
     {{date-picker-past value=lastSeen id="last-seen"}}
     <label>{{i18n 'admin.email.user'}}:</label>
-    {{user-selector single="true" usernames=username}}
+    {{user-selector single="true" usernames=username canReceiveUpdates="true"}}
     <button class='btn' {{action "refresh"}}>{{i18n 'admin.email.refresh'}}</button>
     <div class="toggle">
       <label>{{i18n 'admin.email.format'}}</label>
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index 79dbcfc3b64..d1e8f3df185 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -43,10 +43,8 @@
   {{/if}}
 
   <div>
-    <label>
-      {{input type="checkbox" checked=model.visible}}
-      {{i18n 'groups.visible'}}
-    </label>
+    <label for="visiblity">{{i18n 'groups.visibility_levels.title'}}</label>
+    {{combo-box name="alias" valueAttribute="value" value=model.visibility_level content=visibilityLevelOptions}}
   </div>
 
   {{#unless model.automatic}}
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 29c8e300b10..61c5442a930 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -27,15 +27,21 @@
 //= require ./discourse/lib/eyeline
 //= require ./discourse/lib/show-modal
 //= require ./discourse/mixins/scrolling
+//= require ./discourse/lib/ajax-error
 //= require ./discourse/models/model
 //= require ./discourse/models/rest
+//= require ./discourse/models/result-set
+//= require ./discourse/models/store
+//= require ./discourse/models/action-summary
+//= require ./discourse/models/topic
+//= require ./discourse/models/draft
+//= require ./discourse/models/composer
 //= require ./discourse/models/badge-grouping
 //= require ./discourse/models/badge
 //= require ./discourse/models/permission-type
 //= require ./discourse/models/user-action-group
 //= require ./discourse/models/category
 //= require ./discourse/models/input-validation
-//= require ./discourse/lib/ajax-error
 //= require ./discourse/lib/search
 //= require ./discourse/lib/user-search
 //= require ./discourse/lib/export-csv
@@ -44,10 +50,7 @@
 //= require ./discourse/lib/debounce
 //= require ./discourse/lib/safari-hacks
 //= require_tree ./discourse/adapters
-//= require ./discourse/models/result-set
-//= require ./discourse/models/store
 //= require ./discourse/models/post-action-type
-//= require ./discourse/models/action-summary
 //= require ./discourse/models/post
 //= require ./discourse/lib/posts-with-placeholders
 //= require ./discourse/models/post-stream
@@ -66,8 +69,6 @@
 //= require ./discourse/components/notifications-button
 //= require ./discourse/lib/link-mentions
 //= require ./discourse/components/site-header
-//= require ./discourse/lib/emoji/groups
-//= require ./discourse/lib/emoji/toolbar
 //= require ./discourse/components/d-editor
 //= require ./discourse/lib/screen-track
 //= require ./discourse/routes/discourse
diff --git a/app/assets/javascripts/deprecated.js b/app/assets/javascripts/deprecated.js
index 151ed975d0c..e96105b5818 100644
--- a/app/assets/javascripts/deprecated.js
+++ b/app/assets/javascripts/deprecated.js
@@ -1,7 +1,4 @@
+// ensure Discourse is added as a global
 (function() {
-  var Discourse = require('discourse').default;
-
-  Discourse.dialect_deprecated = true;
-
-  window.Discourse = Discourse;
+  window.Discourse = requirejs('discourse').default;
 })();
diff --git a/app/assets/javascripts/discourse-common/lib/get-owner.js.es6 b/app/assets/javascripts/discourse-common/lib/get-owner.js.es6
index ada334f0752..09f23c7b0da 100644
--- a/app/assets/javascripts/discourse-common/lib/get-owner.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/get-owner.js.es6
@@ -15,7 +15,11 @@ export function getRegister(obj) {
   const register = {
     lookup: (...args) => owner.lookup(...args),
     lookupFactory: (...args) => {
-      return owner.lookupFactory ? owner.lookupFactory(...args) : owner._lookupFactory(...args);
+      if (owner.factoryFor) {
+        return owner.factoryFor(...args);
+      } else if (owner._lookupFactory) {
+        return owner._lookupFactory(...args);
+      }
     },
 
     deprecateContainer(target) {
diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6
index b400d0b788a..1bbc1b432bf 100644
--- a/app/assets/javascripts/discourse-common/resolver.js.es6
+++ b/app/assets/javascripts/discourse-common/resolver.js.es6
@@ -38,7 +38,7 @@ export function buildResolver(baseName) {
     resolveRouter(parsedName) {
       const routerPath = `${baseName}/router`;
       if (requirejs.entries[routerPath]) {
-        const module = require(routerPath, null, null, true);
+        const module = requirejs(routerPath, null, null, true);
         return module.default;
       }
       return this._super(parsedName);
@@ -79,7 +79,7 @@ export function buildResolver(baseName) {
 
       var module;
       if (moduleName) {
-        module = require(moduleName, null, null, true /* force sync */);
+        module = requirejs(moduleName, null, null, true /* force sync */);
         if (module && module['default']) { module = module['default']; }
       }
       return module;
diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js
index 2d9f1d9f35f..dee43e5a9c1 100644
--- a/app/assets/javascripts/discourse-loader.js
+++ b/app/assets/javascripts/discourse-loader.js
@@ -1,4 +1,4 @@
-var define, require, requirejs;
+var define, requirejs;
 
 (function() {
 
@@ -54,7 +54,7 @@ var define, require, requirejs;
     var name = this.name;
 
     return this._require || (this._require = function(dep) {
-      return require(resolve(dep, name));
+      return requirejs(resolve(dep, name));
     });
   };
 
@@ -127,7 +127,7 @@ var define, require, requirejs;
     if (!mod) {
       throw new Error('Could not find module `' + name + '` imported from `' + origin + '`');
     }
-    return require(name);
+    return requirejs(name);
   }
 
   function missingModule(name) {
diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6
index 5ca85473c5b..1c572af7ba4 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -102,7 +102,7 @@ const Discourse = Ember.Application.extend({
 
     Object.keys(requirejs._eak_seen).forEach(function(key) {
       if (/\/pre\-initializers\//.test(key)) {
-        const module = require(key, null, null, true);
+        const module = requirejs(key, null, null, true);
         if (!module) { throw new Error(key + ' must export an initializer.'); }
 
         const init = module.default;
@@ -117,7 +117,7 @@ const Discourse = Ember.Application.extend({
 
     Object.keys(requirejs._eak_seen).forEach(function(key) {
       if (/\/initializers\//.test(key)) {
-        const module = require(key, null, null, true);
+        const module = requirejs(key, null, null, true);
         if (!module) { throw new Error(key + ' must export an initializer.'); }
 
         const init = module.default;
@@ -131,7 +131,7 @@ const Discourse = Ember.Application.extend({
     });
 
     // Plugins that are registered via `<script>` tags.
-    const withPluginApi = require('discourse/lib/plugin-api').withPluginApi;
+    const withPluginApi = requirejs('discourse/lib/plugin-api').withPluginApi;
     let initCount = 0;
     _pluginCallbacks.forEach(function(cb) {
       Discourse.instanceInitializer({
diff --git a/app/assets/javascripts/discourse/components/auto-update-input.js.es6 b/app/assets/javascripts/discourse/components/auto-update-input.js.es6
index 747c0617933..be97128e141 100644
--- a/app/assets/javascripts/discourse/components/auto-update-input.js.es6
+++ b/app/assets/javascripts/discourse/components/auto-update-input.js.es6
@@ -5,6 +5,8 @@ import {
   SET_BASED_ON_LAST_POST
 } from "discourse/components/auto-update-input-selector";
 
+import { PUBLISH_TO_CATEGORY_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer';
+
 export default Ember.Component.extend({
   selection: null,
   date: null,
@@ -62,10 +64,14 @@ export default Ember.Component.extend({
     }
   },
 
-  @computed("statusType", "input", "isCustom", "date", "time", "willCloseImmediately")
-  showTopicStatusInfo(statusType, input, isCustom, date, time, willCloseImmediately) {
+  @computed("statusType", "input", "isCustom", "date", "time", "willCloseImmediately", "categoryId")
+  showTopicStatusInfo(statusType, input, isCustom, date, time, willCloseImmediately, categoryId) {
     if (!statusType || willCloseImmediately) return false;
 
+    if (statusType === PUBLISH_TO_CATEGORY_STATUS_TYPE && Ember.isEmpty(categoryId)) {
+      return false;
+    }
+
     if (isCustom) {
       return date || time;
     } else {
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
index ac358350a91..260d13ce288 100644
--- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
@@ -39,12 +39,21 @@ export default Ember.Component.extend({
     if (!this.site.mobileView) { return; }
 
     let target = $(e.target);
-
-    if (target.hasClass('posts-map')) {
+    if (target.closest('.posts-map').length) {
       const topicId = target.closest('tr').attr('data-topic-id');
       if (topicId) {
         if (target.prop('tagName') !== 'A') {
-          target = target.find('a');
+          let targetLinks = target.find('a');
+          if (targetLinks.length) {
+            target = targetLinks;
+          } else {
+            targetLinks = target.closest('a');
+            if (targetLinks.length) {
+              target = targetLinks;
+            } else {
+              return false;
+            }
+          }
         }
 
         const topic = this.get('topics').findBy('id', parseInt(topicId));
diff --git a/app/assets/javascripts/discourse/components/category-chooser.js.es6 b/app/assets/javascripts/discourse/components/category-chooser.js.es6
index d0b8b45009a..dfc7cf51802 100644
--- a/app/assets/javascripts/discourse/components/category-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/category-chooser.js.es6
@@ -42,7 +42,7 @@ export default Combobox.extend({
 
   @computed("rootNone", "rootNoneLabel")
   none(rootNone, rootNoneLabel) {
-    if (Discourse.SiteSettings.allow_uncategorized_topics || this.get('allowUncategorized')) {
+    if (this.siteSettings.allow_uncategorized_topics || this.get('allowUncategorized')) {
       if (rootNone) {
         return rootNoneLabel || "category.none";
       } else {
diff --git a/app/assets/javascripts/discourse/components/composer-body.js.es6 b/app/assets/javascripts/discourse/components/composer-body.js.es6
index e9e4552a2b4..1078c2d7ef9 100644
--- a/app/assets/javascripts/discourse/components/composer-body.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-body.js.es6
@@ -3,8 +3,9 @@ import Composer from 'discourse/models/composer';
 import afterTransition from 'discourse/lib/after-transition';
 import positioningWorkaround from 'discourse/lib/safari-hacks';
 import { headerHeight } from 'discourse/components/site-header';
+import KeyEnterEscape from 'discourse/mixins/key-enter-escape';
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(KeyEnterEscape, {
   elementId: 'reply-control',
 
   classNameBindings: ['composer.creatingPrivateMessage:private-message',
@@ -65,17 +66,6 @@ export default Ember.Component.extend({
     }, 1000);
   },
 
-  keyDown(e) {
-    if (e.which === 27) {
-      this.sendAction('cancelled');
-      return false;
-    } else if (e.which === 13 && (e.ctrlKey || e.metaKey)) {
-      // CTRL+ENTER or CMD+ENTER
-      this.sendAction('save');
-      return false;
-    }
-  },
-
   @observes('composeState')
   disableFullscreen() {
     if (this.get('composeState') !== Composer.OPEN && positioningWorkaround.blur) {
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index b0213647fe3..8f2528cdd38 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1,10 +1,11 @@
 import userSearch from 'discourse/lib/user-search';
-import { default as computed, on } from 'ember-addons/ember-computed-decorators';
+import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators';
 import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions';
 import { linkSeenCategoryHashtags, fetchUnseenCategoryHashtags } from 'discourse/lib/link-category-hashtags';
 import { linkSeenTagHashtags, fetchUnseenTagHashtags } from 'discourse/lib/link-tag-hashtag';
 import Composer from 'discourse/models/composer';
 import { load } from 'pretty-text/oneboxer';
+import { applyInlineOneboxes } from 'pretty-text/inline-oneboxer';
 import { ajax } from 'discourse/lib/ajax';
 import InputValidation from 'discourse/models/input-validation';
 import { findRawTemplate } from 'discourse/lib/raw-templates';
@@ -30,6 +31,14 @@ export default Ember.Component.extend({
   _setupPreview() {
     const val = (this.site.mobileView ? false : (this.keyValueStore.get('composer.showPreview') || 'true'));
     this.set('showPreview', val === 'true');
+
+    this.appEvents.on('composer:show-preview', () => {
+      this.set('showPreview', true);
+    });
+
+    this.appEvents.on('composer:hide-preview', () => {
+      this.set('showPreview', false);
+    });
   },
 
   @computed('site.mobileView', 'showPreview')
@@ -42,9 +51,16 @@ export default Ember.Component.extend({
     return showPreview ? I18n.t('composer.hide_preview') : I18n.t('composer.show_preview');
   },
 
+  @observes('showPreview')
+  showPreviewChanged() {
+      this.keyValueStore.set({ key: 'composer.showPreview', value: this.get('showPreview') });
+  },
+
   @computed
   markdownOptions() {
     return {
+      previewing: true,
+
       lookupAvatarByPostNumber: (postNumber, topicId) => {
         const topic = this.get('topic');
         if (!topic) { return; }
@@ -158,6 +174,10 @@ export default Ember.Component.extend({
     });
   },
 
+  _loadInlineOneboxes(inline) {
+    applyInlineOneboxes(inline, ajax);
+  },
+
   _loadOneboxes($oneboxes) {
     const post = this.get('composer.post');
     let refresh = false;
@@ -228,6 +248,8 @@ export default Ember.Component.extend({
   _bindUploadTarget() {
     this._unbindUploadTarget(); // in case it's still bound, let's clean it up first
 
+    this._pasted = false;
+
     const $element = this.$();
     const csrf = this.session.get('csrfToken');
     const uploadPlaceholder = this.get('uploadPlaceholder');
@@ -238,10 +260,24 @@ export default Ember.Component.extend({
       pasteZone: $element,
     });
 
+    $element.on('fileuploadpaste', () => this._pasted = true);
+
     $element.on('fileuploadsubmit', (e, data) => {
-      const isUploading = validateUploadedFiles(data.files);
+      const isPrivateMessage = this.get("composer.privateMessage");
+
       data.formData = { type: "composer" };
+      if (isPrivateMessage) data.formData.for_private_message = true;
+      if (this._pasted) data.formData.pasted = true;
+
+      const opts = {
+        isPrivateMessage,
+        allowStaffToUploadAnyFileInPm: this.siteSettings.allow_staff_to_upload_any_file_in_pm,
+      };
+
+      const isUploading = validateUploadedFiles(data.files, opts);
+
       this.setProperties({ uploadProgress: 0, isUploading });
+
       return isUploading;
     });
 
@@ -250,6 +286,7 @@ export default Ember.Component.extend({
     });
 
     $element.on("fileuploadsend", (e, data) => {
+      this._pasted = false;
       this._validUploads++;
       this.appEvents.trigger('composer:insert-text', uploadPlaceholder);
 
@@ -428,6 +465,8 @@ export default Ember.Component.extend({
   @on('willDestroyElement')
   _composerClosed() {
     this.appEvents.trigger('composer:will-close');
+    this.appEvents.off('composer:show-preview');
+    this.appEvents.off('composer:hide-preview');
     Ember.run.next(() => {
       $('#main-outlet').css('padding-bottom', 0);
       // need to wait a bit for the "slide down" transition of the composer
@@ -469,7 +508,6 @@ export default Ember.Component.extend({
 
     togglePreview() {
       this.toggleProperty('showPreview');
-      this.keyValueStore.set({ key: 'composer.showPreview', value: this.get('showPreview') });
     },
 
     extraButtons(toolbar) {
@@ -541,6 +579,18 @@ export default Ember.Component.extend({
         Ember.run.debounce(this, this._loadOneboxes, $oneboxes, 450);
       }
 
+      let inline = {};
+      $('a.inline-onebox-loading', $preview).each(function(index, link) {
+        let $link = $(link);
+        $link.removeClass('inline-onebox-loading');
+        let text = $link.text();
+        inline[text] = inline[text] || [];
+        inline[text].push($link);
+      });
+      if (Object.keys(inline).length > 0) {
+        Ember.run.debounce(this, this._loadInlineOneboxes, inline, 450);
+      }
+
       this.trigger('previewRefreshed', $preview);
       this.sendAction('afterRefresh', $preview);
     },
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 2e37da138ee..8841500af8f 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -2,6 +2,7 @@ import { default as computed, observes } from 'ember-addons/ember-computed-decor
 import InputValidation from 'discourse/models/input-validation';
 import { load, lookupCache } from 'pretty-text/oneboxer';
 import { ajax } from 'discourse/lib/ajax';
+import afterTransition from 'discourse/lib/after-transition';
 
 export default Ember.Component.extend({
   classNames: ['title-input'],
@@ -10,7 +11,11 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
     if (this.get('focusTarget') === 'title') {
-      this.$('input').putCursorAtEnd();
+      const $input = this.$("input");
+
+      afterTransition(this.$().closest("#reply-control"), () => {
+        $input.putCursorAtEnd();
+      });
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js.es6 b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
new file mode 100644
index 00000000000..cd5369638c7
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
@@ -0,0 +1,14 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: '',
+
+  @computed('composeState')
+  toggleIcon(composeState) {
+    if (composeState === "draft" || composeState === "saving") {
+      return "times";
+    }
+    return "chevron-down";
+  }
+});
+
diff --git a/app/assets/javascripts/discourse/components/cook-text.js.es6 b/app/assets/javascripts/discourse/components/cook-text.js.es6
new file mode 100644
index 00000000000..80ed6935632
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/cook-text.js.es6
@@ -0,0 +1,15 @@
+import { cookAsync } from 'discourse/lib/text';
+
+const CookText = Ember.Component.extend({
+  tagName: '',
+  cooked: null,
+
+  didReceiveAttrs() {
+    this._super(...arguments);
+    cookAsync(this.get('rawText')).then(cooked => this.set('cooked', cooked));
+  }
+});
+
+CookText.reopenClass({ positionalParams: ['rawText'] });
+
+export default CookText;
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 9307e4cffbc..4463d1f4531 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,14 +1,13 @@
 /*global Mousetrap:true */
 import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators';
-import { showSelector } from "discourse/lib/emoji/toolbar";
 import Category from 'discourse/models/category';
 import { categoryHashtagTriggerRule } from 'discourse/lib/category-hashtags';
 import { TAG_HASHTAG_POSTFIX } from 'discourse/lib/tag-hashtags';
 import { search as searchCategoryTag  } from 'discourse/lib/category-tag-search';
 import { SEPARATOR } from 'discourse/lib/category-hashtags';
-import { cook } from 'discourse/lib/text';
+import { cookAsync } from 'discourse/lib/text';
 import { translations } from 'pretty-text/emoji/data';
-import { emojiSearch } from 'pretty-text/emoji';
+import { emojiSearch, isSkinTonableEmoji } from 'pretty-text/emoji';
 import { emojiUrlFor } from 'discourse/lib/text';
 import { getRegister } from 'discourse-common/lib/get-owner';
 import { findRawTemplate } from 'discourse/lib/raw-templates';
@@ -78,7 +77,11 @@ class Toolbar {
       group: 'insertions',
       icon: 'quote-right',
       shortcut: 'Shift+9',
-      perform: e => e.applySurround('> ', '', 'code_text')
+      perform: e => e.applyList(
+        '> ',
+        'blockquote_text',
+        { applyEmptyLines: true, multiline: true }
+      )
     });
 
     this.addButton({id: 'code', group: 'insertions', shortcut: 'Shift+C', action: 'formatCode'});
@@ -138,7 +141,7 @@ class Toolbar {
       label: button.label,
       icon: button.label ? null : button.icon || button.id,
       action: button.action || 'toolbarButton',
-      perform: button.perform || Ember.K,
+      perform: button.perform || function() { },
       trimLeading: button.trimLeading
     };
 
@@ -198,6 +201,7 @@ export default Ember.Component.extend({
   linkText: '',
   lastSel: null,
   _mouseTrap: null,
+  emojiPickerIsActive: false,
 
   @computed('placeholder')
   placeholderTranslated(placeholder) {
@@ -247,6 +251,7 @@ export default Ember.Component.extend({
     });
 
     if (this.get('composerEvents')) {
+      this.appEvents.on('composer:insert-block', text => this._addBlock(this._getSelected(), text));
       this.appEvents.on('composer:insert-text', text => this._addText(this._getSelected(), text));
       this.appEvents.on('composer:replace-text', (oldVal, newVal) => this._replaceText(oldVal, newVal));
     }
@@ -279,14 +284,14 @@ export default Ember.Component.extend({
     const value = this.get('value');
     const markdownOptions = this.get('markdownOptions') || {};
 
-    markdownOptions.siteSettings = this.siteSettings;
-
-    this.set('preview', cook(value));
-    Ember.run.scheduleOnce('afterRender', () => {
-      if (this._state !== "inDOM") { return; }
-      const $preview = this.$('.d-editor-preview');
-      if ($preview.length === 0) return;
-      this.sendAction('previewUpdated', $preview);
+    cookAsync(value, markdownOptions).then(cooked => {
+      this.set('preview', cooked);
+      Ember.run.scheduleOnce('afterRender', () => {
+        if (this._state !== "inDOM") { return; }
+        const $preview = this.$('.d-editor-preview');
+        if ($preview.length === 0) return;
+        this.sendAction('previewUpdated', $preview);
+      });
     });
   },
 
@@ -327,7 +332,6 @@ export default Ember.Component.extend({
   _applyEmojiAutocomplete($editorInput) {
     if (!this.siteSettings.enable_emoji) { return; }
 
-    const register = this.register;
     const self = this;
 
     $editorInput.autocomplete({
@@ -337,24 +341,16 @@ export default Ember.Component.extend({
         self.set('value', text);
       },
 
+      onKeyUp(text, cp) {
+        return text.substring(0, cp).match(/(:(?!:).?[\w-]*:?(?!:)(?:t\d?)?:?) ?$/g);
+      },
+
       transformComplete(v) {
         if (v.code) {
           return `${v.code}:`;
         } else {
-          showSelector({
-            appendTo: self.$(),
-            register,
-            onSelect: title => {
-              // Remove the previously type characters when a new emoji is selected from the selector.
-              let selected = self._getSelected();
-              let newPre = selected.pre.replace(/:[^:]+$/, ":");
-              let numOfRemovedChars = selected.pre.length - newPre.length;
-              selected.pre = newPre;
-              selected.start -= numOfRemovedChars;
-              selected.end -= numOfRemovedChars;
-              self._addText(selected, `${title}:`);
-            }
-          });
+          $editorInput.autocomplete({cancel: true});
+          self.set('emojiPickerIsActive', true);
           return "";
         }
       },
@@ -372,6 +368,20 @@ export default Ember.Component.extend({
             return resolve([translations[full]]);
           }
 
+          const match = term.match(/^:?(.*?):t(\d)?$/);
+          if (match) {
+            let name = match[1];
+            let scale = match[2];
+
+            if (isSkinTonableEmoji(name)) {
+              if (scale) {
+                return resolve([`${name}:t${scale}`]);
+              } else {
+                return resolve([2, 3, 4, 5, 6].map(x => `${name}:t${x}`));
+              }
+            }
+          }
+
           const options = emojiSearch(term, {maxResults: 5});
 
           return resolve(options);
@@ -434,11 +444,15 @@ export default Ember.Component.extend({
   },
 
   // perform the same operation over many lines of text
-  _getMultilineContents(lines, head, hval, hlen, tail, tlen) {
+  _getMultilineContents(lines, head, hval, hlen, tail, tlen, opts) {
     let operation = OP.NONE;
 
+    const applyEmptyLines = opts && opts.applyEmptyLines;
+
     return lines.map(l => {
-      if (l.length === 0) { return l; }
+      if (!applyEmptyLines && l.length === 0) {
+        return l;
+      }
 
       if (operation !== OP.ADDED &&
           (l.slice(0, hlen) === hval && tlen === 0 || l.slice(-tlen) === tail)) {
@@ -494,8 +508,15 @@ export default Ember.Component.extend({
         this.set('value', `${pre.slice(0, -hlen)}${sel.value}${post.slice(tlen)}`);
         this._selectText(sel.start - hlen, sel.value.length);
       } else {
-        const contents = this._getMultilineContents(lines, head, hval, hlen, tail, tlen);
-
+        const contents = this._getMultilineContents(
+          lines,
+          head,
+          hval,
+          hlen,
+          tail,
+          tlen,
+          opts
+        );
         this.set('value', `${pre}${contents}${post}`);
         if (lines.length === 1 && tlen > 0) {
           this._selectText(sel.start + hlen, sel.value.length);
@@ -506,9 +527,9 @@ export default Ember.Component.extend({
     }
   },
 
-  _applyList(sel, head, exampleKey) {
+  _applyList(sel, head, exampleKey, opts) {
     if (sel.value.indexOf("\n") !== -1) {
-      this._applySurround(sel, head, '', exampleKey);
+      this._applySurround(sel, head, '', exampleKey, opts);
     } else {
 
       const [hval, hlen] = getHead(head);
@@ -553,6 +574,36 @@ export default Ember.Component.extend({
     this._selectText(newSelection.start, newSelection.end - newSelection.start);
   },
 
+  _addBlock(sel, text) {
+    text = (text || '').trim();
+    if (text.length === 0) {
+      return;
+    }
+
+    let pre = sel.pre;
+    let post = sel.value + sel.post;
+
+    if (pre.length > 0) {
+      pre = pre.replace(/\n*$/, "\n\n");
+    }
+
+    if (post.length > 0) {
+      post = post.replace(/^\n*/, "\n\n");
+    }
+
+
+    const value = pre + text + post;
+    const $textarea = this.$('textarea.d-editor-input');
+
+    this.set('value', value);
+
+    $textarea.val(value);
+    $textarea.prop("selectionStart", (pre+text).length + 2);
+    $textarea.prop("selectionEnd", (pre+text).length + 2);
+
+    Ember.run.scheduleOnce("afterRender", () => $textarea.focus());
+  },
+
   _addText(sel, text) {
     const $textarea = this.$('textarea.d-editor-input');
     const insert = `${sel.pre}${text}`;
@@ -565,13 +616,28 @@ export default Ember.Component.extend({
   },
 
   actions: {
+    emojiSelected(code) {
+      let selected = this._getSelected();
+      const captures = selected.pre.match(/\B:(\w*)$/);
+
+      if(_.isEmpty(captures)) {
+        this._addText(selected, `:${code}:`);
+      } else {
+        let numOfRemovedChars = selected.pre.length - captures[1].length;
+        selected.pre = selected.pre.slice(0, selected.pre.length - captures[1].length);
+        selected.start -= numOfRemovedChars;
+        selected.end -= numOfRemovedChars;
+        this._addText(selected, `${code}:`);
+      }
+    },
+
     toolbarButton(button) {
       const selected = this._getSelected(button.trimLeading);
       const toolbarEvent = {
         selected,
         selectText: (from, length) => this._selectText(from, length),
         applySurround: (head, tail, exampleKey, opts) => this._applySurround(selected, head, tail, exampleKey, opts),
-        applyList: (head, exampleKey) => this._applyList(selected, head, exampleKey),
+        applyList: (head, exampleKey, opts) => this._applyList(selected, head, exampleKey, opts),
         addText: text => this._addText(selected, text),
         replaceText: text => this._addText({pre: '', post: ''}, text),
         getText: () => this.get('value'),
@@ -643,11 +709,7 @@ export default Ember.Component.extend({
     },
 
     emoji() {
-      showSelector({
-        appendTo: this.$(),
-        register: this.register,
-        onSelect: title => this._addText(this._getSelected(), `:${title}:`)
-      });
+      this.set('emojiPickerIsActive', !this.get('emojiPickerIsActive'));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/date-picker.js.es6 b/app/assets/javascripts/discourse/components/date-picker.js.es6
index d2667dd8637..709e1e51497 100644
--- a/app/assets/javascripts/discourse/components/date-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/date-picker.js.es6
@@ -2,7 +2,7 @@
 import loadScript from "discourse/lib/load-script";
 import { default as computed, on } from "ember-addons/ember-computed-decorators";
 
-export default Em.Component.extend({
+export default Ember.Component.extend({
   classNames: ["date-picker-wrapper"],
   _picker: null,
 
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
new file mode 100644
index 00000000000..08d54417582
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -0,0 +1,543 @@
+import { observes } from "ember-addons/ember-computed-decorators";
+import { findRawTemplate } from "discourse/lib/raw-templates";
+import { emojiUrlFor } from "discourse/lib/text";
+import KeyValueStore from "discourse/lib/key-value-store";
+import { emojis } from "pretty-text/emoji/data";
+import { extendedEmojiList, isSkinTonableEmoji } from "pretty-text/emoji";
+
+const keyValueStore = new KeyValueStore("discourse_emojis_");
+const EMOJI_USAGE = "emojiUsage";
+const EMOJI_SELECTED_DIVERSITY = "emojiSelectedDiversity";
+const PER_ROW = 11;
+const customEmojis = _.map(_.keys(extendedEmojiList()), code => {
+  return { code, src: emojiUrlFor(code) };
+});
+
+export function resetCache() {
+  keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
+  keyValueStore.setObject({ key: EMOJI_SELECTED_DIVERSITY, value: 1 });
+}
+
+let $picker, $filter, $results, $list, scrollPosition, $visibleSections, _checkTimeout;
+
+export default Ember.Component.extend({
+  willDestroyElement() {
+    this._super();
+
+    this._unbindEvents();
+    this.appEvents.off("emoji-picker:close");
+  },
+
+  didInsertElement() {
+    this._super();
+
+    this.appEvents.on("emoji-picker:close", () => this.set("active", false));
+
+    $picker = this.$(".emoji-picker");
+
+    if (!keyValueStore.getObject(EMOJI_USAGE)) {
+      keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
+    } else if(_.isPlainObject(keyValueStore.getObject(EMOJI_USAGE))) {
+      // handle legacy format
+      keyValueStore.setObject({ key: EMOJI_USAGE, value: _.keys(keyValueStore.getObject(EMOJI_USAGE)) });
+    }
+
+    scrollPosition = 0;
+  },
+
+  didUpdateAttrs() {
+    this._super();
+
+    if (this.get("active")) {
+      this.show();
+    } else {
+      this.close();
+    }
+  },
+
+  @observes("filter")
+  filterChanged() {
+    $filter.find(".clear-filter").toggle(!_.isEmpty(this.get("filter")));
+    Ember.run.debounce(this, this._filterEmojisList, 250);
+  },
+
+  @observes("selectedDiversity")
+  selectedDiversityChanged() {
+    keyValueStore.setObject({key: EMOJI_SELECTED_DIVERSITY, value: this.get("selectedDiversity")});
+
+    $.each($list.find(".emoji[data-loaded='1'].diversity"), (_, button) => {
+      $(button).css("background-image", "").removeAttr("data-loaded");
+    });
+
+    if(this.get("filter") !== "") {
+      $.each($results.find(".emoji.diversity"), (_, button) => this._setButtonBackground(button, true) );
+    }
+
+    this._updateSelectedDiversity();
+  },
+
+  @observes("recentEmojis")
+  recentEmojisChanged() {
+    const previousScrollTop = scrollPosition;
+    const $recentSection = $list.find(".section[data-section='recent']");
+    const $recentSectionGroup = $recentSection.find(".section-group");
+    const $recentCategory = $picker.find(".category-icon button[data-section='recent']").parent();
+    let persistScrollPosition = !$recentCategory.is(":visible") ? true : false;
+
+    // we set height to 0 to avoid it being taken into account for scroll position
+    if(_.isEmpty(this.get("recentEmojis"))) {
+      $recentCategory.hide();
+      $recentSection.css("height", 0).hide();
+    } else {
+      $recentCategory.show();
+      $recentSection.css("height", "auto").show();
+    }
+
+    const recentEmojis = _.map(this.get("recentEmojis"), code => {
+      return { code, src: emojiUrlFor(code) };
+    });
+    const template = findRawTemplate("emoji-picker-recent")({recentEmojis});
+    $recentSectionGroup.html(template);
+
+    if(persistScrollPosition) {
+      $list.scrollTop(previousScrollTop + $recentSection.outerHeight());
+    }
+
+    this._bindHover($recentSectionGroup);
+  },
+
+  close() {
+    $picker
+      .css({width: "", left: "", bottom: "", display: "none"})
+      .empty();
+
+    this.$().find(".emoji-picker-modal").remove();
+
+    this._unbindEvents();
+
+    clearTimeout(_checkTimeout);
+  },
+
+  show() {
+    const template = findRawTemplate("emoji-picker")({customEmojis});
+    $picker.html(template);
+    this.$().append("<div class='emoji-picker-modal'></div>");
+
+    $filter = $picker.find(".filter");
+    $results = $picker.find(".results");
+    $list = $picker.find(".list");
+
+    this.set("selectedDiversity", keyValueStore.getObject(EMOJI_SELECTED_DIVERSITY) || 1);
+    this.set("recentEmojis", keyValueStore.getObject(EMOJI_USAGE) || []);
+
+    this._bindEvents();
+
+    Ember.run.scheduleOnce("afterRender", this, function() {
+      this._sectionLoadingCheck();
+      this._loadCategoriesEmojis();
+      this._positionPicker();
+      this._scrollTo();
+      this._updateSelectedDiversity();
+    });
+  },
+
+  _updateSelectedDiversity() {
+    const $diversityPicker = $picker.find(".diversity-picker");
+
+    $diversityPicker.find(".diversity-scale").removeClass("selected");
+    $diversityPicker
+      .find(`.diversity-scale[data-level="${this.get("selectedDiversity")}"]`)
+      .addClass("selected");
+  },
+
+  _sectionLoadingCheck() {
+    _checkTimeout = setTimeout(() => { this._sectionLoadingCheck(); }, 500);
+    Ember.run.throttle(this, this._checkVisibleSection, 100);
+  },
+
+  _loadCategoriesEmojis() {
+    $.each($picker.find(".categories-column button.emoji"), (_, button) => {
+      const $button = $(button);
+      const code = this._codeWithDiversity($button.data("tabicon"), false);
+      $button.css("background-image", `url("${emojiUrlFor(code)}")`);
+    });
+  },
+
+  _bindEvents() {
+    this._bindDiversityClick();
+    this._bindSectionsScroll();
+    this._bindEmojiClick($list.find(".section-group"));
+    this._bindClearRecentEmojisGroup();
+    this._bindResizing();
+    this._bindCategoryClick();
+    this._bindModalClick();
+    this._bindFilterInput();
+
+    if(!this.site.isMobileDevice) {
+      this._bindHover();
+    }
+  },
+
+  _bindModalClick() {
+    this.$(".emoji-picker-modal")
+        .on("click", () => this.set("active", false));
+
+    this.$(document).on("click.emoji-picker", (event) => {
+      const onPicker = $(event.target).parents(".emoji-picker").length === 1;
+      const onGrippie = event.target.className.indexOf("grippie") > -1;
+      if(!onPicker && !onGrippie) {
+        this.set("active", false);
+        return false;
+      }
+    });
+  },
+
+  _unbindEvents() {
+    this.$(window).off("resize");
+    this.$(".emoji-picker-modal").off("click");
+    Ember.$("#reply-control").off("div-resizing");
+    this.$(document).off("click.emoji-picker");
+  },
+
+  _filterEmojisList() {
+    if (this.get("filter") === "") {
+      $filter.find("input[name='filter']").val("");
+      $results.empty().hide();
+      $list.show();
+    } else {
+      const lowerCaseFilter = this.get("filter").toLowerCase();
+      const filterableEmojis = emojis.concat(_.keys(extendedEmojiList()));
+      const filteredCodes = _.filter(filterableEmojis, code => {
+        return code.indexOf(lowerCaseFilter) > -1;
+      }).slice(0, 30);
+      $results.empty().html(
+        _.map(filteredCodes, (code) => {
+          const hasDiversity = isSkinTonableEmoji(code);
+          const diversity = hasDiversity ? "diversity" : "";
+          const scaledCode = this._codeWithDiversity(code, hasDiversity);
+          return `<button style="background-image: url('${emojiUrlFor(scaledCode)}')" type="button" class="emoji ${diversity}" tabindex="-1" title="${code}"></button>`;
+        })
+      ).show();
+      this._bindHover($results);
+      this._bindEmojiClick($results);
+      $list.hide();
+    }
+  },
+
+  _bindFilterInput() {
+    const $input = $filter.find("input");
+
+    $input.on("input", (event) => {
+      this.set("filter", event.currentTarget.value);
+    });
+
+    $filter.find(".clear-filter").on("click", () => {
+      $input.val("").focus();
+      this.set("filter", "");
+      return false;
+    });
+  },
+
+  _bindCategoryClick() {
+    $picker.find(".category-icon").on("click", "button.emoji", (event) => {
+      this.set("filter", "");
+      $results.empty();
+      $list.show();
+
+      const section = $(event.currentTarget).data("section");
+      const $section = $list.find(`.section[data-section="${section}"]`);
+      const scrollTop = $list.scrollTop() + ($section.offset().top - $list.offset().top);
+      this._scrollTo(scrollTop);
+      return false;
+    });
+  },
+
+  _bindHover($hoverables) {
+    const replaceInfoContent = (html) => $picker.find(".footer .info").html(html || "");
+
+    ($hoverables || $list.find(".section-group")).on({
+      mouseover: (event) => {
+        const code = this._codeForEmojiButton($(event.currentTarget));
+        const html = `<img src="${emojiUrlFor(code)}" class="emoji"> <span>:${code}:<span>`;
+        replaceInfoContent(html);
+      },
+      mouseleave: () => replaceInfoContent()
+    }, "button.emoji");
+  },
+
+  _bindResizing() {
+    this.$(window).on("resize", () => {
+      Ember.run.throttle(this, this._positionPicker, 16);
+    });
+
+    Ember.$("#reply-control").on("div-resizing", () => {
+      Ember.run.throttle(this, this._positionPicker, 16);
+    });
+  },
+
+  _bindClearRecentEmojisGroup() {
+    const $recent = $picker.find(".section[data-section='recent'] .clear-recent");
+    $recent.on("click", () => {
+      keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
+      this.set("recentEmojis", []);
+      this._scrollTo(0);
+      return false;
+    });
+  },
+
+  _bindEmojiClick($emojisContainer) {
+    const handler = (event) => {
+      const code = this._codeForEmojiButton($(event.currentTarget));
+
+      if($(event.currentTarget).parents(".section[data-section='recent']").length === 0) {
+        this._trackEmojiUsage(code);
+      }
+
+      this.sendAction("emojiSelected", code);
+
+      if(this.$(".emoji-picker-modal").hasClass("fadeIn")) {
+        this.set("active", false);
+      }
+
+      return false;
+    };
+
+    if(this.site.isMobileDevice) {
+      const self = this;
+
+      $emojisContainer
+        .off("touchstart")
+        .on("touchstart", "button.emoji", (touchStartEvent) => {
+          const $this = $(touchStartEvent.currentTarget);
+          $this.on("touchend", (touchEndEvent) => {
+            handler.bind(self)(touchEndEvent);
+            $this.off("touchend");
+          });
+          $this.on("touchmove", () => $this.off("touchend") );
+        });
+    } else {
+      $emojisContainer.off("click").on("click", "button.emoji", e => handler.bind(this)(e) );
+    }
+  },
+
+  _bindSectionsScroll() {
+    $list.on("scroll", () => {
+      scrollPosition = $list.scrollTop();
+      Ember.run.throttle(this, this._checkVisibleSection, 150);
+    });
+  },
+
+  _checkVisibleSection() {
+    // make sure we stop loading if picker has been removed
+    if(!$picker) {
+      return;
+    }
+
+    const $sections = $list.find(".section");
+    const listHeight = $list.innerHeight();
+    let $selectedSection;
+
+    $visibleSections = _.filter($sections, section => {
+      const $section = $(section);
+      const sectionTop = $section.position().top;
+      return sectionTop + $section.height() > 0 && sectionTop < listHeight;
+    });
+
+    if (!_.isEmpty(this.get("recentEmojis")) && scrollPosition === 0) {
+      $selectedSection = $(_.first($visibleSections));
+    } else {
+      $selectedSection = $(_.last($visibleSections));
+    }
+
+    if($selectedSection) {
+      $picker.find(".category-icon").removeClass("current");
+      $picker.find(`.category-icon button[data-section='${$selectedSection.data("section")}']`)
+             .parent()
+             .addClass("current");
+
+      this._loadVisibleSections();
+    }
+  },
+
+  _loadVisibleSections() {
+    if(!$visibleSections) {
+      return;
+    }
+
+    const listHeight = $list.innerHeight();
+    $visibleSections.forEach(visibleSection => {
+      const $unloadedEmojis = $(visibleSection).find("button.emoji[data-loaded!='1']");
+      $.each($unloadedEmojis, (_, button) => {
+        const $button = $(button);
+        const buttonTop = $button.position().top;
+        const buttonHeight = $button.height();
+
+        if(buttonTop + buttonHeight > 0 && buttonTop - buttonHeight < listHeight) {
+          this._setButtonBackground($button);
+        }
+      });
+    });
+  },
+
+  _bindDiversityClick() {
+    const $diversityScales = $picker.find(".diversity-picker .diversity-scale");
+    $diversityScales.on("click", (event) => {
+      const $selectedDiversity = $(event.currentTarget);
+      this.set("selectedDiversity", parseInt($selectedDiversity.data("level")));
+      return false;
+    });
+  },
+
+  _isReplyControlExpanded() {
+    const verticalSpace = this.$(window).height() -
+                          Ember.$(".d-header").height() -
+                          Ember.$("#reply-control").height();
+
+    return verticalSpace < $picker.height() - 48;
+  },
+
+  _positionPicker(){
+    if(!this.get("active")) { return; }
+
+    let windowWidth = this.$(window).width();
+
+    const desktopModalePositioning = options => {
+      let attributes = {
+        width: Math.min(windowWidth, 400) - 12,
+        marginLeft: -(Math.min(windowWidth, 400)/2) + 6,
+        marginTop: -130,
+        left: "50%",
+        bottom: "",
+        top: "50%",
+        display: "flex"
+      };
+
+      this.$(".emoji-picker-modal").addClass("fadeIn");
+      $picker.css(_.merge(attributes, options));
+    };
+
+    const mobilePositioning = options => {
+      let attributes = {
+        width: windowWidth - 12,
+        marginLeft: 5,
+        marginTop: -130,
+        left: 0,
+        bottom: "",
+        top: "50%",
+        display: "flex"
+      };
+
+      this.$(".emoji-picker-modal").addClass("fadeIn");
+      $picker.css(_.merge(attributes, options));
+    };
+
+    const desktopPositioning = options => {
+      let attributes = {
+        width: windowWidth < 485 ? windowWidth - 12 : 400,
+        marginLeft: "",
+        marginTop: "",
+        right: "",
+        left: "",
+        bottom: 32,
+        top: "",
+        display:
+        "flex"
+      };
+
+      this.$(".emoji-picker-modal").removeClass("fadeIn");
+      $picker.css(_.merge(attributes, options));
+    };
+
+    if(Ember.testing) {
+      desktopPositioning();
+      return;
+    }
+
+    if(this.site.isMobileDevice) {
+      mobilePositioning();
+    } else {
+      if(this._isReplyControlExpanded()) {
+        let $editorWrapper = Ember.$(".d-editor-preview-wrapper");
+        if(($editorWrapper.is(":visible") && $editorWrapper.width() < 400) || windowWidth < 485) {
+          desktopModalePositioning();
+        } else {
+          if($editorWrapper.is(":visible")) {
+            let previewOffset = Ember.$(".d-editor-preview-wrapper").offset();
+            let replyControlOffset = Ember.$("#reply-control").offset();
+            let left = previewOffset.left - replyControlOffset.left;
+            desktopPositioning({left});
+          } else {
+            desktopPositioning({
+              right: (Ember.$("#reply-control").width() - Ember.$(".d-editor-container").width()) / 2
+            });
+          }
+        }
+      } else {
+        if(windowWidth < 485) {
+          desktopModalePositioning();
+        } else {
+          let previewInputOffset = Ember.$(".d-editor-input").offset();
+          let replyControlOffset = Ember.$("#reply-control").offset() || {left: 0};
+          let left = previewInputOffset.left - replyControlOffset.left;
+          desktopPositioning({left, bottom: Ember.$("#reply-control").height() - 48});
+        }
+      }
+    }
+
+    const infoMaxWidth = $picker.width() -
+                         $picker.find(".categories-column").width() -
+                         $picker.find(".diversity-picker").width() -
+                         32;
+    $picker.find(".info").css("max-width", infoMaxWidth);
+  },
+
+  _codeWithDiversity(code, diversity) {
+    if(diversity && this.get("selectedDiversity") !== 1) {
+      return `${code}:t${this.get("selectedDiversity")}`;
+    } else {
+      return code;
+    }
+  },
+
+  _trackEmojiUsage(code) {
+    let recent = keyValueStore.getObject(EMOJI_USAGE) || [];
+    recent = recent.filter(r => r !== code);
+    recent.unshift(code);
+    recent.length = Math.min(recent.length, PER_ROW);
+    keyValueStore.setObject({ key: EMOJI_USAGE, value: recent });
+    this.set("recentEmojis", recent);
+  },
+
+  _scrollTo(y) {
+    const yPosition = _.isUndefined(y) ? scrollPosition : y;
+
+    $list.scrollTop(yPosition);
+
+    // if we don’t actually scroll we need to force it
+    if(yPosition === 0) {
+      $list.scroll();
+    }
+  },
+
+  _codeForEmojiButton($button) {
+    const title = $button.attr("title");
+    return this._codeWithDiversity(title, $button.hasClass("diversity"));
+  },
+
+  _setButtonBackground(button, diversity) {
+    const $button = $(button);
+    const code = this._codeWithDiversity(
+      $button.attr("title"),
+      diversity || $button.hasClass("diversity")
+    );
+
+    // force visual reloading if needed
+    if($button.css("background-image") !== "none") {
+      $button.css("background-image", "");
+    }
+
+    $button
+      .attr("data-loaded", 1)
+      .css("background-image", `url("${emojiUrlFor(code)}")`);
+  },
+});
diff --git a/app/assets/javascripts/discourse/components/expand-post.js.es6 b/app/assets/javascripts/discourse/components/expand-post.js.es6
new file mode 100644
index 00000000000..957750e92f2
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/expand-post.js.es6
@@ -0,0 +1,19 @@
+import { ajax } from 'discourse/lib/ajax';
+
+export default Ember.Component.extend({
+  tagName: '',
+
+  actions: {
+    expandItem() {
+      const item = this.get('item');
+      const topicId = item.get('topic_id');
+      const postNumber = item.get('post_number');
+
+      return ajax(`/posts/by_number/${topicId}/${postNumber}.json`).then(result => {
+        item.set('truncated', false);
+        item.set('excerpt', result.cooked);
+      });
+    }
+  }
+});
+
diff --git a/app/assets/javascripts/discourse/components/flat-button.js.es6 b/app/assets/javascripts/discourse/components/flat-button.js.es6
new file mode 100644
index 00000000000..792db361387
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/flat-button.js.es6
@@ -0,0 +1,16 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: 'button',
+  classNames: ['btn-flat'],
+  attributeBindings: ['disabled', 'translatedTitle:title'],
+
+  @computed("title")
+  translatedTitle(title) {
+    if (title) return I18n.t(title);
+  },
+
+  click() {
+    return this.attrs.action();
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
index 5c7449532d9..b27ce66f79c 100644
--- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -1,8 +1,10 @@
 import { default as computed } from 'ember-addons/ember-computed-decorators';
 import { popupAjaxError } from 'discourse/lib/ajax-error';
-import Group from 'discourse/models/group';
+import DiscourseURL from 'discourse/lib/url';
 
 export default Ember.Component.extend({
+  loading: false,
+
   @computed("model.public")
   canJoinGroup(publicGroup) {
     return publicGroup;
@@ -17,22 +19,6 @@ export default Ember.Component.extend({
     }
   },
 
-  @computed
-  disableRequestMembership() {
-    if (this.currentUser) {
-      return this.currentUser.trust_level < this.siteSettings.min_trust_to_send_messages;
-    } else {
-      return false;
-    }
-  },
-
-  @computed("disableRequestMembership")
-  requestMembershipButtonTitle(disableRequestMembership) {
-    if (disableRequestMembership) {
-      return "groups.request_membership_pm.disabled";
-    }
-  },
-
   _showLoginModal() {
     this.sendAction('showLogin');
     $.cookie('destination_url', window.location.href);
@@ -67,13 +53,12 @@ export default Ember.Component.extend({
 
     requestMembership() {
       if (this.currentUser) {
-        const groupName = this.get('model.name');
+        this.set('loading', true);
 
-        Group.loadOwners(groupName).then(result => {
-          const names = result.map(owner => owner.username).join(",");
-          const title = I18n.t('groups.request_membership_pm.title');
-          const body = I18n.t('groups.request_membership_pm.body', { groupName });
-          this.sendAction("createNewMessageViaParams", names, title, body);
+        this.get('model').requestMembership().then(result => {
+          DiscourseURL.routeTo(result.relative_url);
+        }).catch(popupAjaxError).finally(() => {
+          this.set('loading', false);
         });
       } else {
         this._showLoginModal();
diff --git a/app/assets/javascripts/discourse/components/group-post-stream.js.es6 b/app/assets/javascripts/discourse/components/group-post-stream.js.es6
deleted file mode 100644
index fc83f2dbb62..00000000000
--- a/app/assets/javascripts/discourse/components/group-post-stream.js.es6
+++ /dev/null
@@ -1,8 +0,0 @@
-export default Ember.Component.extend({
-  actions: {
-    // TODO: When on Ember 1.13, use a closure action
-    loadMore() {
-      this.sendAction('loadMore');
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js.es6
index 4beb5a3a932..563911b7252 100644
--- a/app/assets/javascripts/discourse/components/group-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/group-selector.js.es6
@@ -15,31 +15,27 @@ export default Ember.Component.extend({
 
   @on('didInsertElement')
   _initializeAutocomplete(opts) {
-    var self = this;
-    var selectedGroups;
-    var groupNames = this.get('groupNames');
+    let selectedGroups;
+    let groupNames = this.get('groupNames');
 
-    self.$('input').autocomplete({
+    this.$('input').autocomplete({
       allowAny: false,
       items: _.isArray(groupNames) ? groupNames : (Ember.isEmpty(groupNames)) ? [] : [groupNames],
       single: this.get('single'),
       updateData: (opts && opts.updateData) ? opts.updateData : false,
-      onChangeItems: function(items){
+      onChangeItems: items => {
         selectedGroups = items;
-        self.set("groupNames", items.join(","));
+        this.set("groupNames", items.join(","));
       },
-      transformComplete: function(g) {
+      transformComplete: g => {
         return g.name;
       },
-      dataSource: function(term) {
-        return self.get("groupFinder")(term).then(function(groups){
+      dataSource: term => {
+        return this.get("groupFinder")(term).then(groups => {
+          if(!selectedGroups) return groups;
 
-          if(!selectedGroups){
-            return groups;
-          }
-
-          return groups.filter(function(group){
-            return !selectedGroups.any(function(s){return s === group.name;});
+          return groups.filter(group => {
+            return !selectedGroups.any(s => s === group.name);
           });
         });
       },
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js.es6 b/app/assets/javascripts/discourse/components/highlight-text.js.es6
index ca783a23b76..a86d2dd3894 100644
--- a/app/assets/javascripts/discourse/components/highlight-text.js.es6
+++ b/app/assets/javascripts/discourse/components/highlight-text.js.es6
@@ -1,13 +1,11 @@
+import highlightText from 'discourse/lib/highlight-text';
+
 export default Ember.Component.extend({
   tagName: 'span',
 
   _highlightOnInsert: function() {
     const term = this.get('highlight');
-    const self = this;
-
-    if(!_.isEmpty(term)) {
-      self.$().highlight(term.split(/\s+/), {className: 'search-highlight'});
-    }
+    highlightText(this.$(), term);
   }.observes('highlight').on('didInsertElement')
 
 });
diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6
index 2153d3553a9..ed327cf8c39 100644
--- a/app/assets/javascripts/discourse/components/mount-widget.js.es6
+++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6
@@ -1,8 +1,8 @@
-import { keyDirty } from 'discourse/widgets/widget';
 import { diff, patch } from 'virtual-dom';
 import { WidgetClickHook } from 'discourse/widgets/hooks';
-import { renderedKey, queryRegistry } from 'discourse/widgets/widget';
+import { queryRegistry } from 'discourse/widgets/widget';
 import { getRegister } from 'discourse-common/lib/get-owner';
+import DirtyKeys from 'discourse/lib/dirty-keys';
 
 const _cleanCallbacks = {};
 export function addWidgetCleanCallback(widgetName, fn) {
@@ -18,6 +18,7 @@ export default Ember.Component.extend({
   _renderCallback: null,
   _childEvents: null,
   _dispatched: null,
+  dirtyKeys: null,
 
   init() {
     this._super();
@@ -34,6 +35,7 @@ export default Ember.Component.extend({
     this._childEvents = [];
     this._connected = [];
     this._dispatched = [];
+    this.dirtyKeys = new DirtyKeys(name);
   },
 
   didInsertElement() {
@@ -73,7 +75,7 @@ export default Ember.Component.extend({
 
   eventDispatched(eventName, key, refreshArg) {
     const onRefresh = Ember.String.camelize(eventName.replace(/:/, '-'));
-    keyDirty(key, { onRefresh, refreshArg });
+    this.dirtyKeys.keyDirty(key, { onRefresh, refreshArg });
     this.queueRerender();
   },
 
@@ -104,7 +106,10 @@ export default Ember.Component.extend({
 
       const t0 = new Date().getTime();
       const args = this.get('args') || this.buildArgs();
-      const opts = { model: this.get('model') };
+      const opts = {
+        model: this.get('model'),
+        dirtyKeys: this.dirtyKeys,
+      };
       const newTree = new this._widgetClass(args, this.register, opts);
 
       newTree._rerenderable = this;
@@ -122,8 +127,8 @@ export default Ember.Component.extend({
         this._renderCallback = null;
       }
       this.afterRender();
+      this.dirtyKeys.renderedKey('*');
 
-      Ember.run.scheduleOnce('afterRender', () => renderedKey('*'));
       if (this.profileWidget) {
         console.log(new Date().getTime() - t0);
       }
diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
index 994626ae8c8..87e59f60bae 100644
--- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
@@ -1,5 +1,4 @@
 import DiscourseURL from 'discourse/lib/url';
-import { keyDirty } from 'discourse/widgets/widget';
 import MountWidget from 'discourse/components/mount-widget';
 import { cloak, uncloak } from 'discourse/widgets/post-stream';
 import { isWorkaroundActive } from 'discourse/lib/safari-hacks';
@@ -245,13 +244,13 @@ export default MountWidget.extend({
     this.appEvents.on('post-stream:refresh', args => {
       if (args) {
         if (args.id) {
-          keyDirty(`post-${args.id}`);
+          this.dirtyKeys.keyDirty(`post-${args.id}`);
 
           if (args.refreshLikes) {
-            keyDirty(`post-menu-${args.id}`, { onRefresh: 'refreshLikes' });
+            this.dirtyKeys.keyDirty(`post-menu-${args.id}`, { onRefresh: 'refreshLikes' });
           }
         } else if (args.force) {
-          keyDirty(`*`);
+          this.dirtyKeys.forceAll();
         }
       }
       this.queueRerender();
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index bc345a5977a..109182042c4 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -1,5 +1,7 @@
 import { observes } from 'ember-addons/ember-computed-decorators';
 import { escapeExpression } from 'discourse/lib/utilities';
+import Group from 'discourse/models/group';
+import Badge from 'discourse/models/badge';
 
 const REGEXP_BLOCKS                = /(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/g;
 
@@ -80,7 +82,8 @@ export default Em.Component.extend({
             likes: false,
             private: false,
             seen: false
-          }
+          },
+          all_tags: false
         },
         status: '',
         min_post_count: '',
@@ -233,13 +236,15 @@ export default Em.Component.extend({
 
     const match = this.filterBlocks(REGEXP_TAGS_PREFIX);
     const tags = this.get('searchedTerms.tags');
+    const contain_all_tags = this.get('searchedTerms.special.all_tags');
 
     if (match.length !== 0) {
-      const existingInput = _.isArray(tags) ? tags.join(',') : tags;
+      const join_char = contain_all_tags ? '+' : ',';
+      const existingInput = _.isArray(tags) ? tags.join(join_char) : tags;
       const userInput = match[0].replace(REGEXP_TAGS_REPLACE, '');
 
       if (existingInput !== userInput) {
-        this.set('searchedTerms.tags', (userInput.length !== 0) ? userInput.split(',') : []);
+        this.set('searchedTerms.tags', (userInput.length !== 0) ? userInput.split(join_char) : []);
       }
     } else if (tags.length !== 0) {
       this.set('searchedTerms.tags', []);
@@ -368,14 +373,16 @@ export default Em.Component.extend({
     }
   },
 
-  @observes('searchedTerms.tags')
+  @observes('searchedTerms.tags', 'searchedTerms.special.all_tags')
   updateSearchTermForTags() {
     const match = this.filterBlocks(REGEXP_TAGS_PREFIX);
     const tagFilter = this.get('searchedTerms.tags');
     let searchTerm = this.get('searchTerm') || '';
+    const contain_all_tags = this.get('searchedTerms.special.all_tags');
 
     if (tagFilter && tagFilter.length !== 0) {
-      const tags = tagFilter.join(',');
+      const join_char = contain_all_tags ? '+' : ',';
+      const tags = tagFilter.join(join_char);
 
       if (match.length !== 0) {
         searchTerm = searchTerm.replace(match[0], `tags:${tags}`);
@@ -527,12 +534,10 @@ export default Em.Component.extend({
   },
 
   groupFinder(term) {
-    const Group = require('discourse/models/group').default;
-    return Group.findAll({search: term, ignore_automatic: false});
+    return Group.findAll({ term: term, ignore_automatic: false });
   },
 
   badgeFinder(term) {
-    const Badge = require('discourse/models/badge').default;
     return Badge.findAll({search: term});
   }
 });
diff --git a/app/assets/javascripts/discourse/components/stream-item.js.es6 b/app/assets/javascripts/discourse/components/stream-item.js.es6
index d81366bec78..26d1e6f8e5a 100644
--- a/app/assets/javascripts/discourse/components/stream-item.js.es6
+++ b/app/assets/javascripts/discourse/components/stream-item.js.es6
@@ -2,13 +2,7 @@ import { propertyEqual } from 'discourse/lib/computed';
 import { actionDescription } from "discourse/components/small-action";
 
 export default Ember.Component.extend({
-  classNameBindings: [":item", "item.hidden", "item.deleted", "moderatorAction"],
+  classNameBindings: [":item", "item.hidden", "item.deleted:deleted", "moderatorAction"],
   moderatorAction: propertyEqual("item.post_type", "site.post_types.moderator_action"),
   actionDescription: actionDescription("item.action_code", "item.created_at", "item.username"),
-
-  actions: {
-    removeBookmark(userAction) {
-      this.sendAction("removeBookmark", userAction);
-    }
-  }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-admin-menu-button.js.es6 b/app/assets/javascripts/discourse/components/topic-admin-menu-button.js.es6
index cb76f7997d4..fb6d7bf59a2 100644
--- a/app/assets/javascripts/discourse/components/topic-admin-menu-button.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-admin-menu-button.js.es6
@@ -1,10 +1,11 @@
 import MountWidget from 'discourse/components/mount-widget';
 
 export default MountWidget.extend({
+  classNames: 'topic-admin-menu-button-container',
   tagName: 'span',
   widget: "topic-admin-menu-button",
 
   buildArgs() {
-    return this.getProperties('topic', 'fixed', 'openUpwards');
+    return this.getProperties('topic', 'fixed', 'openUpwards', 'rightSide');
   }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
index 6e4ba25d148..d72be633d23 100644
--- a/app/assets/javascripts/discourse/components/topic-entrance.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-entrance.js.es6
@@ -92,17 +92,18 @@ export default Ember.Component.extend(CleansUp, {
     this.appEvents.off('topic-entrance:show');
   },
 
+  _jumpTo(destination) {
+    this.cleanUp();
+    DiscourseURL.routeTo(destination);
+  },
+
   actions: {
     enterTop() {
-      const topic = this.get('topic');
-      this.appEvents.trigger('header:update-topic', topic);
-      DiscourseURL.routeTo(topic.get('url'));
+      this._jumpTo(this.get('topic.url'));
     },
 
     enterBottom() {
-      const topic = this.get('topic');
-      this.appEvents.trigger('header:update-topic', topic);
-      DiscourseURL.routeTo(topic.get('lastPostUrl'));
+      this._jumpTo(this.get('topic.lastPostUrl'));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-progress.js.es6 b/app/assets/javascripts/discourse/components/topic-progress.js.es6
index f20f47426d7..a3f09e3182a 100644
--- a/app/assets/javascripts/discourse/components/topic-progress.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-progress.js.es6
@@ -20,7 +20,7 @@ export default Ember.Component.extend({
 
   @computed('postStream.loaded', 'topic.currentPost', 'postStream.filteredPostsCount')
   hideProgress(loaded, currentPost, filteredPostsCount) {
-    return (!loaded) || (!currentPost) || (filteredPostsCount < 2);
+    return (!loaded) || (!currentPost) || (!this.site.mobileView && filteredPostsCount < 2);
   },
 
   @computed('postStream.filteredPostsCount')
@@ -52,8 +52,14 @@ export default Ember.Component.extend({
   },
 
   _topicScrolled(event) {
-    this.set('progressPosition', event.postIndex);
-    this._streamPercentage = event.percent;
+    if (this.get('docked')) {
+      this.set('progressPosition', this.get('postStream.filteredPostsCount'));
+      this._streamPercentage = 1.0;
+    } else {
+      this.set('progressPosition', event.postIndex);
+      this._streamPercentage = event.percent;
+    }
+
     this._updateBar();
   },
 
@@ -92,10 +98,14 @@ export default Ember.Component.extend({
     if (!this._totalWidth) {
       this._totalWidth = $topicProgress[0].offsetWidth;
     }
+
+    // Only show percentage once we have one
+    if (!this._streamPercentage) { return; }
+
     const totalWidth = this._totalWidth;
     const progressWidth = (this._streamPercentage || 0) * totalWidth;
-
     const borderSize = (progressWidth === totalWidth) ? "0px" : "1px";
+
     const $bg = $topicProgress.find('.bg');
     if ($bg.length === 0) {
       const style = `border-right-width: ${borderSize}; width: ${progressWidth}px`;
@@ -106,11 +116,10 @@ export default Ember.Component.extend({
   },
 
   _dock() {
-    const maximumOffset = $('#topic-footer-buttons').offset(),
+    const maximumOffset = $('#topic-bottom').offset(),
           composerHeight = $('#reply-control').height() || 0,
           $topicProgressWrapper = this.$(),
-          offset = window.pageYOffset || $('html').scrollTop(),
-          topicProgressHeight = $('#topic-progress').height();
+          offset = window.pageYOffset || $('html').scrollTop();
 
     if (!$topicProgressWrapper || $topicProgressWrapper.length === 0) {
       return;
@@ -120,7 +129,13 @@ export default Ember.Component.extend({
     if (maximumOffset) {
       const threshold = maximumOffset.top;
       const windowHeight = $(window).height();
-      isDocked = offset >= threshold - windowHeight + topicProgressHeight + composerHeight;
+      const headerHeight = $('header').outerHeight(true);
+
+      if (this.capabilities.isIOS) {
+        isDocked = offset >= (threshold - windowHeight - headerHeight + composerHeight);
+      } else {
+        isDocked = offset >= (threshold - windowHeight + composerHeight);
+      }
     }
 
     const dockPos = $(document).height() - $('#topic-bottom').offset().top;
diff --git a/app/assets/javascripts/discourse/components/topic-title.js.es6 b/app/assets/javascripts/discourse/components/topic-title.js.es6
new file mode 100644
index 00000000000..05c6c37b696
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/topic-title.js.es6
@@ -0,0 +1,5 @@
+import KeyEnterEscape from 'discourse/mixins/key-enter-escape';
+
+export default Ember.Component.extend(KeyEnterEscape, {
+  elementId: 'topic-title',
+});
diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index c9871ecadb6..0b37142ff66 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -1,6 +1,7 @@
 import LoadMore from "discourse/mixins/load-more";
 import ClickTrack from 'discourse/lib/click-track';
 import { selectedText } from 'discourse/lib/utilities';
+import Post from 'discourse/models/post';
 
 export default Ember.Component.extend(LoadMore, {
   loading: false,
@@ -44,6 +45,13 @@ export default Ember.Component.extend(LoadMore, {
   }.on('willDestroyElement'),
 
   actions: {
+    removeBookmark(userAction) {
+      const stream = this.get('stream');
+      Post.updateBookmark(userAction.get("post_id"), false).then(() => {
+        stream.remove(userAction);
+      });
+    },
+
     loadMore() {
       if (this.get('loading')) { return; }
 
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 6c10b0b1dce..af23cb7d436 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -277,7 +277,17 @@ export default Ember.Controller.extend({
 
     // Toggle the reply view
     toggle() {
-      this.toggle();
+      this.closeAutocomplete();
+      if (this.get('model.composeState') === Composer.OPEN) {
+        if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
+          this.close();
+        } else {
+          this.shrink();
+        }
+      } else {
+        this.close();
+      }
+      return false;
     },
 
     togglePreview() {
@@ -330,6 +340,11 @@ export default Ember.Controller.extend({
     },
 
     hitEsc() {
+      if (Ember.$(".emoji-picker-modal").length === 1) {
+        this.appEvents.trigger('emoji-picker:close');
+        return;
+      }
+
       if ((this.get('messageCount') || 0) > 0) {
         this.appEvents.trigger('composer-messages:close');
         return;
@@ -385,20 +400,6 @@ export default Ember.Controller.extend({
     return Discourse.Category.list();
   }.property(),
 
-  toggle() {
-    this.closeAutocomplete();
-    if (this.get('model.composeState') === Composer.OPEN) {
-      if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
-        this.close();
-      } else {
-        this.shrink();
-      }
-    } else {
-      this.close();
-    }
-    return false;
-  },
-
   disableSubmit: Ember.computed.or("model.loading", "isUploading"),
 
   save(force) {
diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6
index 956b9bf35b7..9b3528f32b4 100644
--- a/app/assets/javascripts/discourse/controllers/create-account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6
@@ -7,9 +7,10 @@ import InputValidation from 'discourse/models/input-validation';
 import PasswordValidation from "discourse/mixins/password-validation";
 import UsernameValidation from "discourse/mixins/username-validation";
 import NameValidation from "discourse/mixins/name-validation";
+import UserFieldsValidation from "discourse/mixins/user-fields-validation";
 import { userPath } from 'discourse/lib/url';
 
-export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, UsernameValidation, NameValidation, {
+export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, UsernameValidation, NameValidation, UserFieldsValidation, {
   login: Ember.inject.controller(),
 
   complete: false,
@@ -50,19 +51,10 @@ export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, U
     if (this.get('emailValidation.failed')) return true;
     if (this.get('usernameValidation.failed')) return true;
     if (this.get('passwordValidation.failed')) return true;
+    if (this.get('userFieldsValidation.failed')) return true;
 
-    // Validate required fields
-    let userFields = this.get('userFields');
-    if (userFields) { userFields = userFields.filterBy('field.required'); }
-    if (!Ember.isEmpty(userFields)) {
-      const anyEmpty = userFields.any(function(uf) {
-        const val = uf.get('value');
-        return !val || Ember.isEmpty(val);
-      });
-      if (anyEmpty) { return true; }
-    }
     return false;
-  }.property('passwordRequired', 'nameValidation.failed', 'emailValidation.failed', 'usernameValidation.failed', 'passwordValidation.failed', 'formSubmitted', 'userFields.@each.value'),
+  }.property('passwordRequired', 'nameValidation.failed', 'emailValidation.failed', 'usernameValidation.failed', 'passwordValidation.failed', 'userFieldsValidation.failed', 'formSubmitted'),
 
 
   usernameRequired: Ember.computed.not('authOptions.omit_username'),
@@ -82,10 +74,6 @@ export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, U
     });
   }.property(),
 
-  nameInstructions: function() {
-    return I18n.t(Discourse.SiteSettings.full_name_required ? 'user.name.instructions_required' : 'user.name.instructions');
-  }.property(),
-
   // Check the email address
   emailValidation: function() {
     // If blank, fail without a reason
@@ -212,18 +200,6 @@ export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, U
         return self.flash(I18n.t('create_account.failed'), 'error');
       });
     }
-  },
-
-  _createUserFields: function() {
-    if (!this.site) { return; }
-
-    let userFields = this.site.get('user_fields');
-    if (userFields) {
-      userFields = _.sortBy(userFields, 'position').map(function(f) {
-        return Ember.Object.create({ value: null, field: f });
-      });
-    }
-    this.set('userFields', userFields);
-  }.on('init')
+  }
 
 });
diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
index e64351a2915..e955208acc2 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6
@@ -4,6 +4,7 @@ import BulkTopicSelection from 'discourse/mixins/bulk-topic-selection';
 import { endWith } from 'discourse/lib/computed';
 import showModal from 'discourse/lib/show-modal';
 import { userPath } from 'discourse/lib/url';
+import TopicList from 'discourse/models/topic-list';
 
 const controllerOpts = {
   discovery: Ember.inject.controller(),
@@ -60,7 +61,6 @@ const controllerOpts = {
 
       this.topicTrackingState.resetTracking();
       this.store.findFiltered('topicList', {filter}).then(list => {
-        const TopicList = require('discourse/models/topic-list').default;
         TopicList.hideUniformCategory(list, this.get('category'));
 
         this.setProperties({ model: list });
diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
index 34f1b9cf66d..fdb66c1a65f 100644
--- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
@@ -5,7 +5,7 @@ import { popupAjaxError } from 'discourse/lib/ajax-error';
 
 export const CLOSE_STATUS_TYPE = 'close';
 const OPEN_STATUS_TYPE = 'open';
-const PUBLISH_TO_CATEGORY_STATUS_TYPE = 'publish_to_category';
+export const PUBLISH_TO_CATEGORY_STATUS_TYPE = 'publish_to_category';
 const DELETE_STATUS_TYPE = 'delete';
 const REMINDER_TYPE = 'reminder';
 
@@ -33,9 +33,11 @@ export default Ember.Controller.extend(ModalFunctionality, {
     ];
   },
 
-  @computed('updateTime', 'loading')
-  saveDisabled(updateTime, loading) {
-    return Ember.isEmpty(updateTime) || loading;
+  @computed('updateTime', 'loading', 'publishToCategory', 'topicTimer.category_id')
+  saveDisabled(updateTime, loading, publishToCategory, topicTimerCategoryId) {
+    return Ember.isEmpty(updateTime) ||
+      loading ||
+      (publishToCategory && !topicTimerCategoryId);
   },
 
   @computed("model.visible")
@@ -70,7 +72,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       time,
       this.get('topicTimer.based_on_last_post'),
       statusType,
-      this.get('categoryId')
+      this.get('topicTimer.category_id')
     ).then(result => {
       if (time) {
         this.send('closeModal');
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index b316091285c..01095e6a2d7 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -158,7 +158,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   fetchUserDetails() {
     if (Discourse.User.currentProp('staff') && this.get('model.username')) {
-      const AdminUser = require('admin/models/admin-user').default;
+      const AdminUser = requirejs('admin/models/admin-user').default;
       AdminUser.find(this.get('model.user_id')).then(user => this.set('userDetails', user));
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
index fb159186400..4311368186c 100644
--- a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
@@ -5,6 +5,8 @@ import { extractError } from 'discourse/lib/ajax-error';
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Controller.extend(ModalFunctionality, {
+  offerHelp: null,
+  helpSeen: false,
 
   @computed('accountEmailOrUsername', 'disabled')
   submitDisabled(accountEmailOrUsername, disabled) {
@@ -35,8 +37,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
         if (data.user_found === true) {
           key += '_found';
           this.set('accountEmailOrUsername', '');
-          bootbox.alert(I18n.t(key, {email: escaped, username: escaped}));
-          this.send("closeModal");
+          this.set('offerHelp', I18n.t(key, {email: escaped, username: escaped}));
         } else {
           if (data.user_found === false) {
             key += '_not_found';
@@ -52,6 +53,14 @@ export default Ember.Controller.extend(ModalFunctionality, {
       });
 
       return false;
+    },
+
+    ok() {
+      this.send('closeModal');
+    },
+
+    help() {
+      this.setProperties({ offerHelp: I18n.t('forgot_password.help'), helpSeen: true });
     }
   }
 
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index a6751b639ea..d85760f6325 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -46,6 +46,14 @@ export default Ember.Controller.extend({
     return Em.isEmpty(q);
   },
 
+
+  @computed('q')
+  highlightQuery(q) {
+    if (!q) { return; }
+    // remove l which can be used for sorting
+    return _.reject(q.split(/\s+/), t => t === 'l').join(' ');
+  },
+
   @computed('skip_context', 'context')
   searchContextEnabled: {
     get(skip,context){
@@ -186,6 +194,11 @@ export default Ember.Controller.extend({
 
     ajax("/search", { data: args }).then(results => {
       const model = translateResults(results) || {};
+
+      if (results.grouped_search_result) {
+        this.set('q', results.grouped_search_result.term);
+      }
+
       setTransient('lastSearch', { searchKey, model }, 5);
       this.set("model", model);
     }).finally(() => this.set("searching", false));
diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6
index de971784e29..71509d9e137 100644
--- a/app/assets/javascripts/discourse/controllers/invite.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invite.js.es6
@@ -1,6 +1,8 @@
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import { emailValid } from 'discourse/lib/utilities';
 import computed from 'ember-addons/ember-computed-decorators';
+import Group from 'discourse/models/group';
+import Invite from 'discourse/models/invite';
 
 export default Ember.Controller.extend(ModalFunctionality, {
   userInvitedShow: Ember.inject.controller('user-invited-show'),
@@ -11,6 +13,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
   hasCustomMessage: false,
   customMessage: null,
   inviteIcon: "envelope",
+  invitingExistingUserToTopic: false,
 
   @computed('isMessage', 'invitingToTopic')
   title(isMessage, invitingToTopic) {
@@ -23,9 +26,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
   },
 
-  isAdmin: function(){
-    return Discourse.User.currentProp("admin");
-  }.property(),
+  @computed
+  isAdmin() {
+    return this.currentUser.admin;
+  },
 
   @computed('isAdmin', 'emailOrUsername', 'invitingToTopic', 'isPrivateTopic', 'model.groupNames', 'model.saving', 'model.details.can_invite_to')
   disabled(isAdmin, emailOrUsername, invitingToTopic, isPrivateTopic, groupNames, saving, can_invite_to) {
@@ -44,29 +48,32 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return false;
   },
 
-  disabledCopyLink: function() {
-    if (this.get('hasCustomMessage')) return true;
-    if (this.get('model.saving')) return true;
-    if (Ember.isEmpty(this.get('emailOrUsername'))) return true;
-    const emailOrUsername = this.get('emailOrUsername').trim();
+  @computed('isAdmin', 'emailOrUsername', 'model.saving', 'isPrivateTopic', 'model.groupNames', 'hasCustomMessage')
+  disabledCopyLink(isAdmin, emailOrUsername, saving, isPrivateTopic, groupNames, hasCustomMessage) {
+    if (hasCustomMessage) return true;
+    if (saving) return true;
+    if (Ember.isEmpty(emailOrUsername)) return true;
+    const email = emailOrUsername.trim();
     // email must be valid
-    if (!emailValid(emailOrUsername)) return true;
+    if (!emailValid(email)) return true;
     // normal users (not admin) can't invite users to private topic via email
-    if (!this.get('isAdmin') && this.get('isPrivateTopic') && emailValid(emailOrUsername)) return true;
+    if (!isAdmin && isPrivateTopic && emailValid(email)) return true;
     // when inviting to private topic via email, group name must be specified
-    if (this.get('isPrivateTopic') && Ember.isEmpty(this.get('model.groupNames')) && emailValid(emailOrUsername)) return true;
+    if (isPrivateTopic && Ember.isEmpty(groupNames) && emailValid(email)) return true;
     return false;
-  }.property('emailOrUsername', 'model.saving', 'isPrivateTopic', 'model.groupNames', 'hasCustomMessage'),
+  },
 
-  buttonTitle: function() {
-    return this.get('model.saving') ? 'topic.inviting' : 'topic.invite_reply.action';
-  }.property('model.saving'),
+  @computed('model.saving')
+  buttonTitle(saving) {
+    return saving ? 'topic.inviting' : 'topic.invite_reply.action';
+  },
 
   // We are inviting to a topic if the model isn't the current user.
   // The current user would mean we are inviting to the forum in general.
-  invitingToTopic: function() {
-    return this.get('model') !== this.currentUser;
-  }.property('model'),
+  @computed('model')
+  invitingToTopic(model) {
+    return model !== this.currentUser;
+  },
 
   @computed('model', 'model.details.can_invite_via_email')
   canInviteViaEmail(model, can_invite_via_email) {
@@ -89,14 +96,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
   isMessage: Em.computed.equal('model.archetype', 'private_message'),
 
   // Allow Existing Members? (username autocomplete)
-  allowExistingMembers: function() {
-    return this.get('invitingToTopic');
-  }.property('invitingToTopic'),
+  allowExistingMembers: Ember.computed.alias('invitingToTopic'),
+
+  @computed("isAdmin", "model.group_users")
+  isGroupOwnerOrAdmin(isAdmin, groupUsers) {
+    return isAdmin || (groupUsers && groupUsers.some(groupUser => groupUser.owner));
+  },
 
   // Show Groups? (add invited user to private group)
-  @computed('isAdmin', 'emailOrUsername', 'isPrivateTopic', 'isMessage', 'invitingToTopic', 'canInviteViaEmail')
-  showGroups(isAdmin, emailOrUsername, isPrivateTopic, isMessage, invitingToTopic, canInviteViaEmail) {
-    return isAdmin &&
+  @computed('isGroupOwnerOrAdmin', 'emailOrUsername', 'isPrivateTopic', 'isMessage', 'invitingToTopic', 'canInviteViaEmail')
+  showGroups(isGroupOwnerOrAdmin, emailOrUsername, isPrivateTopic, isMessage, invitingToTopic, canInviteViaEmail) {
+    return isGroupOwnerOrAdmin &&
            canInviteViaEmail &&
            !isMessage &&
            (emailValid(emailOrUsername) || isPrivateTopic || !invitingToTopic);
@@ -139,30 +149,34 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
   },
 
-  showGroupsClass: function() {
-    return this.get('isPrivateTopic') ? 'required' : 'optional';
-  }.property('isPrivateTopic'),
-
-  groupFinder(term) {
-    const Group = require('discourse/models/group').default;
-    return Group.findAll({search: term, ignore_automatic: true});
+  @computed('isPrivateTopic')
+  showGroupsClass(isPrivateTopic) {
+    return isPrivateTopic ? 'required' : 'optional';
   },
 
-  successMessage: function() {
+  groupFinder(term) {
+    return Group.findAll({ term: term, ignore_automatic: true });
+  },
+
+  @computed('isMessage', 'emailOrUsername', 'invitingExistingUserToTopic')
+  successMessage(isMessage, emailOrUsername, invitingExistingUserToTopic) {
     if (this.get('hasGroups')) {
       return I18n.t('topic.invite_private.success_group');
-    } else if (this.get('isMessage')) {
+    } else if (isMessage) {
       return I18n.t('topic.invite_private.success');
-    } else if ( emailValid(this.get('emailOrUsername')) ) {
-      return I18n.t('topic.invite_reply.success_email', { emailOrUsername: this.get('emailOrUsername') });
+    } else if (invitingExistingUserToTopic) {
+      return I18n.t('topic.invite_reply.success_existing_email', { emailOrUsername });
+    } else if (emailValid(emailOrUsername)) {
+      return I18n.t('topic.invite_reply.success_email', { emailOrUsername });
     } else {
       return I18n.t('topic.invite_reply.success_username');
     }
-  }.property('model.inviteLink', 'isMessage', 'emailOrUsername'),
+  },
 
-  errorMessage: function() {
-    return this.get('isMessage') ? I18n.t('topic.invite_private.error') : I18n.t('topic.invite_reply.error');
-  }.property('isMessage'),
+  @computed('isMessage')
+  errorMessage(isMessage) {
+    return isMessage ? I18n.t('topic.invite_private.error') : I18n.t('topic.invite_reply.error');
+  },
 
   @computed('canInviteViaEmail')
   placeholderKey(canInviteViaEmail) {
@@ -171,15 +185,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
             'topic.invite_reply.username_placeholder';
   },
 
-  customMessagePlaceholder: function() {
+  @computed
+  customMessagePlaceholder() {
     return I18n.t('invite.custom_message_placeholder');
-  }.property(),
+  },
 
   // Reset the modal to allow a new user to be invited.
   reset() {
     this.set('emailOrUsername', null);
     this.set('hasCustomMessage', false);
     this.set('customMessage', null);
+    this.set('invitingExistingUserToTopic', false);
     this.get('model').setProperties({
       groupNames: null,
       error: false,
@@ -188,12 +204,11 @@ export default Ember.Controller.extend(ModalFunctionality, {
       inviteLink: null
     });
   },
+
   actions: {
 
     createInvite() {
-      const Invite = require('discourse/models/invite').default;
       const self = this;
-
       if (this.get('disabled')) { return; }
 
       const groupNames = this.get('model.groupNames'),
@@ -231,13 +246,14 @@ export default Ember.Controller.extend(ModalFunctionality, {
               } else if (this.get('isMessage') && result && result.user) {
                 this.get('model.details.allowed_users').pushObject(Ember.Object.create(result.user));
                 this.appEvents.trigger('post-stream:refresh');
+              } else if (this.get('invitingToTopic') && emailValid(this.get('emailOrUsername').trim()) && result && result.user) {
+                this.set('invitingExistingUserToTopic', true);
               }
             }).catch(onerror);
       }
     },
 
     generateInvitelink() {
-      const Invite = require('discourse/models/invite').default;
       const self = this;
 
       if (this.get('disabled')) { return; }
diff --git a/app/assets/javascripts/discourse/controllers/invites-show.js.es6 b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
index d032c769852..20e533ec0c5 100644
--- a/app/assets/javascripts/discourse/controllers/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invites-show.js.es6
@@ -5,15 +5,17 @@ import { ajax } from 'discourse/lib/ajax';
 import PasswordValidation from "discourse/mixins/password-validation";
 import UsernameValidation from "discourse/mixins/username-validation";
 import NameValidation from "discourse/mixins/name-validation";
+import UserFieldsValidation from "discourse/mixins/user-fields-validation";
 import { findAll as findLoginMethods }  from 'discourse/models/login-method';
 
-export default Ember.Controller.extend(PasswordValidation, UsernameValidation, NameValidation, {
+export default Ember.Controller.extend(PasswordValidation, UsernameValidation, NameValidation, UserFieldsValidation, {
   invitedBy: Ember.computed.alias('model.invited_by'),
   email: Ember.computed.alias('model.email'),
   accountUsername: Ember.computed.alias('model.username'),
   passwordRequired: Ember.computed.notEmpty('accountPassword'),
   successMessage: null,
   errorMessage: null,
+  userFields: null,
   inviteImageUrl: getUrl('/images/envelope.svg'),
 
   @computed
@@ -21,11 +23,6 @@ export default Ember.Controller.extend(PasswordValidation, UsernameValidation, N
     return I18n.t('invites.welcome_to', {site_name: this.siteSettings.title});
   },
 
-  @computed
-  nameLabel() {
-    return I18n.t(this.siteSettings.full_name_required ? 'invites.name_label' : 'invites.name_label_optional');
-  },
-
   @computed('email')
   yourEmailMessage(email) {
     return I18n.t('invites.your_email', {email: email});
@@ -36,20 +33,30 @@ export default Ember.Controller.extend(PasswordValidation, UsernameValidation, N
     return findLoginMethods(this.siteSettings, this.capabilities, this.site.isMobileDevice).length > 0;
   },
 
-  @computed('usernameValidation.failed', 'passwordValidation.failed', 'nameValidation.failed')
-  submitDisabled(usernameFailed, passwordFailed, nameFailed) {
-    return usernameFailed || passwordFailed || nameFailed;
+  @computed('usernameValidation.failed', 'passwordValidation.failed', 'nameValidation.failed', 'userFieldsValidation.failed')
+  submitDisabled(usernameFailed, passwordFailed, nameFailed, userFieldsFailed) {
+    return usernameFailed || passwordFailed || nameFailed || userFieldsFailed;
   },
 
   actions: {
     submit() {
+
+      const userFields = this.get('userFields');
+      let userCustomFields = {};
+      if (!Ember.isEmpty(userFields)) {
+        userFields.forEach(function(f) {
+          userCustomFields[f.get('field.id')] = f.get('value');
+        });
+      }
+
       ajax({
         url: `/invites/show/${this.get('model.token')}.json`,
         type: 'PUT',
         data: {
           username: this.get('accountUsername'),
           name: this.get('accountName'),
-          password: this.get('accountPassword')
+          password: this.get('accountPassword'),
+          userCustomFields
         }
       }).then(result => {
         if (result.success) {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
index fa7f7470b32..2e0ec104bd4 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -47,8 +47,6 @@ export default Ember.Controller.extend(PreferencesTabController, {
       const model = this.get('model'),
             userFields = this.get('userFields');
 
-      model.set('name', this.get('newNameInput'));
-
       // Update the user fields
       if (!Ember.isEmpty(userFields)) {
         const modelFields = model.get('user_fields');
diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
index f6cfa7be70e..6317b07d67e 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6
@@ -1,11 +1,12 @@
+import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
 import { setting, propertyEqual } from 'discourse/lib/computed';
 import DiscourseURL from 'discourse/lib/url';
 import { userPath } from 'discourse/lib/url';
+import { popupAjaxError } from 'discourse/lib/ajax-error';
 
 export default Ember.Controller.extend({
   taken: false,
   saving: false,
-  error: false,
   errorMessage: null,
   newUsername: null,
 
@@ -15,35 +16,40 @@ export default Ember.Controller.extend({
   saveDisabled: Em.computed.or('saving', 'newUsernameEmpty', 'taken', 'unchanged', 'errorMessage'),
   unchanged: propertyEqual('newUsername', 'username'),
 
-  checkTaken: function() {
-    if( this.get('newUsername') && this.get('newUsername').length < this.get('minLength') ) {
+  @observes("newUsername")
+  checkTaken() {
+    let newUsername = this.get('newUsername');
+
+    if (newUsername && newUsername.length < this.get('minLength')) {
       this.set('errorMessage', I18n.t('user.name.too_short'));
     } else {
-      var self = this;
       this.set('taken', false);
       this.set('errorMessage', null);
+
       if (Ember.isEmpty(this.get('newUsername'))) return;
       if (this.get('unchanged')) return;
-      Discourse.User.checkUsername(this.get('newUsername'), undefined, this.get('content.id')).then(function(result) {
+
+      Discourse.User.checkUsername(newUsername, undefined, this.get('content.id')).then(result => {
         if (result.errors) {
-          self.set('errorMessage', result.errors.join(' '));
+          this.set('errorMessage', result.errors.join(' '));
         } else if (result.available === false) {
-          self.set('taken', true);
+          this.set('taken', true);
         }
       });
     }
-  }.observes('newUsername'),
+  },
 
-  saveButtonText: function() {
-    if (this.get('saving')) return I18n.t("saving");
+  @computed('saving')
+  saveButtonText(saving) {
+    if (saving) return I18n.t("saving");
     return I18n.t("user.change");
-  }.property('saving'),
+  },
 
   actions: {
     changeUsername() {
       if (this.get('saveDisabled')) { return; }
 
-      return bootbox.confirm(I18n.t("user.change_username.confirm"), 
+      return bootbox.confirm(I18n.t("user.change_username.confirm"),
                              I18n.t("no_value"),
                              I18n.t("yes_value"), result => {
         if (result) {
@@ -51,7 +57,7 @@ export default Ember.Controller.extend({
           this.get('content').changeUsername(this.get('newUsername')).then(() => {
             DiscourseURL.redirectTo(userPath(this.get('newUsername').toLowerCase() + "/preferences"));
           })
-          .catch(() => this.set('error', true))
+          .catch(popupAjaxError)
           .finally(() => this.set('saving', false));
         }
       });
@@ -59,5 +65,3 @@ export default Ember.Controller.extend({
   }
 
 });
-
-
diff --git a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6 b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
index ac84cf19683..ef7d23eba78 100644
--- a/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic-bulk-actions.js.es6
@@ -4,6 +4,9 @@ const _buttons = [];
 
 const alwaysTrue = () => true;
 
+function identity() {
+}
+
 function addBulkButton(action, key, opts) {
   opts = opts || {};
 
@@ -72,7 +75,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
     this.perform(operation).then(topics => {
       if (topics) {
         topics.forEach(cb);
-        (this.get('refreshClosure') || Ember.k)();
+        (this.get('refreshClosure') || identity)();
         this.send('closeModal');
       }
     });
@@ -80,7 +83,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   performAndRefresh(operation) {
     return this.perform(operation).then(() => {
-      (this.get('refreshClosure') || Ember.k)();
+      (this.get('refreshClosure') || identity)();
       this.send('closeModal');
     });
   },
@@ -145,7 +148,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
       this.perform({type: 'change_category', category_id: categoryId}).then(topics => {
         topics.forEach(t => t.set('category', category));
-        (this.get('refreshClosure') || Ember.k)();
+        (this.get('refreshClosure') || identity)();
         this.send('closeModal');
       });
     },
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index 8d36ea0e753..f015c94a020 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -196,7 +196,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
         const quotedText = Quote.build(post, buffer);
         composerOpts.quote = quotedText;
         if (composer.get('model.viewOpen')) {
-          this.appEvents.trigger('composer:insert-text', quotedText);
+          this.appEvents.trigger('composer:insert-block', quotedText);
         } else if (composer.get('model.viewDraft')) {
           const model = composer.get('model');
           model.set('reply', model.get('reply') + quotedText);
@@ -320,7 +320,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
           composerController.get('content.action') === Composer.REPLY) {
         composerController.set('content.post', post);
         composerController.set('content.composeState', Composer.OPEN);
-        this.appEvents.trigger('composer:insert-text', quotedText.trim());
+        this.appEvents.trigger('composer:insert-block', quotedText.trim());
       } else {
 
         const opts = {
diff --git a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6 b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
index 6e9f48296d8..d78b6710814 100644
--- a/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-invited-show.js.es6
@@ -12,6 +12,7 @@ export default Ember.Controller.extend({
   canLoadMore: true,
   invitesLoading: false,
   reinvitedAll: false,
+  rescindedAll: false,
 
   init: function() {
     this._super();
@@ -32,7 +33,7 @@ export default Ember.Controller.extend({
 
   inviteRedeemed: Em.computed.equal('filter', 'redeemed'),
 
-  showReinviteAllButton: function() {
+  showBulkActionButtons: function() {
     return (this.get('filter') === "pending" && this.get('model').invites.length > 4 && this.currentUser.get('staff'));
   }.property('filter'),
 
@@ -86,17 +87,27 @@ export default Ember.Controller.extend({
       return false;
     },
 
+    rescindAll() {
+      bootbox.confirm(I18n.t("user.invited.rescind_all_confirm"), confirm => {
+        if (confirm) {
+          Invite.rescindAll().then(() => {
+            this.set('rescindedAll', true);
+            this.get('model.invites').clear();
+          }).catch(popupAjaxError);
+        }
+      });
+    },
+
     reinvite(invite) {
       invite.reinvite();
       return false;
     },
 
     reinviteAll() {
-      const self = this;
       bootbox.confirm(I18n.t("user.invited.reinvite_all_confirm"), confirm => {
         if (confirm) {
-          Invite.reinviteAll().then(function() {
-            self.set('reinvitedAll', true);
+          Invite.reinviteAll().then(() => {
+            this.set('reinvitedAll', true);
           }).catch(popupAjaxError);
         }
       });
diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6
index 0aceb7d13b4..a17f2f53bfd 100644
--- a/app/assets/javascripts/discourse/controllers/user.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user.js.es6
@@ -87,7 +87,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
 
     adminDelete() {
       // I really want this deferred, don't want to bring in all this code till used
-      const AdminUser = require('admin/models/admin-user').default;
+      const AdminUser = requirejs('admin/models/admin-user').default;
       AdminUser.find(this.get('model.id')).then(user => user.destroy({deletePosts: true}));
     },
 
diff --git a/app/assets/javascripts/discourse/helpers/cook-text.js.es6 b/app/assets/javascripts/discourse/helpers/cook-text.js.es6
deleted file mode 100644
index 7864f01af80..00000000000
--- a/app/assets/javascripts/discourse/helpers/cook-text.js.es6
+++ /dev/null
@@ -1,4 +0,0 @@
-import { cook } from 'discourse/lib/text';
-import { registerUnbound } from 'discourse-common/lib/helpers';
-
-registerUnbound('cook-text', cook);
diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js.es6
index 7f3d8b247b0..068e762b077 100644
--- a/app/assets/javascripts/discourse/helpers/raw.js.es6
+++ b/app/assets/javascripts/discourse/helpers/raw.js.es6
@@ -20,7 +20,7 @@ function renderRaw(ctx, container, template, templateName, params) {
 
     const module = `discourse/raw-views/${templateName}`;
     if (requirejs.entries[module]) {
-      const viewClass = require(module, null, null, true);
+      const viewClass = requirejs(module, null, null, true);
       if (viewClass && viewClass.default) {
         params.view = viewClass.default.create(params, _injections);
       }
diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6 b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
index 4920eca574c..943c330a107 100644
--- a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
@@ -2,11 +2,11 @@ import { registerHelpers } from 'discourse-common/lib/helpers';
 
 export function autoLoadModules(container, registry) {
   Object.keys(requirejs.entries).forEach(entry => {
-    if ((/\/helpers\//).test(entry)) {
-      require(entry, null, null, true);
+    if ((/\/helpers\//).test(entry) && !(/-test/).test(entry)) {
+      requirejs(entry, null, null, true);
     }
-    if ((/\/widgets\//).test(entry)) {
-      require(entry, null, null, true);
+    if ((/\/widgets\//).test(entry) && !(/-test/).test(entry)) {
+      requirejs(entry, null, null, true);
     }
   });
   registerHelpers(registry);
diff --git a/app/assets/javascripts/discourse/initializers/inject-objects.js.es6 b/app/assets/javascripts/discourse/initializers/inject-objects.js.es6
index f15f57fa8a0..1ad38a8fb1e 100644
--- a/app/assets/javascripts/discourse/initializers/inject-objects.js.es6
+++ b/app/assets/javascripts/discourse/initializers/inject-objects.js.es6
@@ -2,5 +2,5 @@
 
 export default {
   name: "inject-objects",
-  initialize: Ember.K
+  initialize() { }
 };
diff --git a/app/assets/javascripts/discourse/initializers/register-discourse-location.js.es6 b/app/assets/javascripts/discourse/initializers/register-discourse-location.js.es6
index 1f073e95cfb..88c49402a82 100644
--- a/app/assets/javascripts/discourse/initializers/register-discourse-location.js.es6
+++ b/app/assets/javascripts/discourse/initializers/register-discourse-location.js.es6
@@ -2,5 +2,5 @@
 
 export default {
   name: "register-discourse-location",
-  initialize: Ember.K
+  initialize() { }
 };
diff --git a/app/assets/javascripts/discourse/lib/after-transition.js.es6 b/app/assets/javascripts/discourse/lib/after-transition.js.es6
index 11fe20b5e4c..afa1700e6df 100644
--- a/app/assets/javascripts/discourse/lib/after-transition.js.es6
+++ b/app/assets/javascripts/discourse/lib/after-transition.js.es6
@@ -25,5 +25,8 @@ var transitionEnd = (function() {
 })();
 
 export default function (element, callback) {
-  return $(element).on(transitionEnd, callback);
+  return $(element).on(transitionEnd, event => {
+    if (event.target !== event.currentTarget) return;
+    return callback(event);
+  });
 }
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index 4b49fdc0146..4ce4adb6ee5 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -358,10 +358,22 @@ export default function(options) {
   $(this).on('keyup.autocomplete', function(e) {
     if ([keys.esc, keys.enter].indexOf(e.which) !== -1) return true;
 
-    var cp = caretPosition(me[0]);
+    let cp = caretPosition(me[0]);
+    const key = me[0].value[cp-1];
 
-    if (options.key && completeStart === null && cp > 0) {
-      var key = me[0].value[cp-1];
+    if (options.key) {
+      if (options.onKeyUp && key !== options.key) {
+        let match = options.onKeyUp(me.val(), cp);
+        if (match) {
+          completeStart = cp - match[0].length;
+          completeEnd = completeStart + match[0].length - 1;
+          let term = match[0].substring(1, match[0].length);
+          updateAutoComplete(dataSource(term, options));
+        }
+      }
+    }
+
+    if (completeStart === null && cp > 0) {
       if (key === options.key) {
         var prevChar = me.val().charAt(cp-2);
         if (checkTriggerRule() && (!prevChar || allowedLettersRegex.test(prevChar))) {
@@ -370,7 +382,7 @@ export default function(options) {
         }
       }
     } else if (completeStart !== null) {
-      var term = me.val().substring(completeStart + (options.key ? 1 : 0), cp);
+      let term = me.val().substring(completeStart + (options.key ? 1 : 0), cp);
       updateAutoComplete(dataSource(term, options));
     }
   });
diff --git a/app/assets/javascripts/discourse/lib/autosize.js.es6 b/app/assets/javascripts/discourse/lib/autosize.js.es6
index dbdb858093c..efb85155c39 100644
--- a/app/assets/javascripts/discourse/lib/autosize.js.es6
+++ b/app/assets/javascripts/discourse/lib/autosize.js.es6
@@ -132,15 +132,9 @@ function assign(ta, {setOverflowX = true, setOverflowY = true} = {}) {
 		set.delete(ta);
 
 		Object.keys(style).forEach(key => {
-			ta.style[key] = style[key];
+      ta.style[key] = style[key];
 		});
-	}.bind(ta, {
-		height: ta.style.height,
-		resize: ta.style.resize,
-		overflowY: ta.style.overflowY,
-		overflowX: ta.style.overflowX,
-		wordWrap: ta.style.wordWrap,
-	});
+	}
 
 	ta.addEventListener('autosize:destroy', destroy, false);
 
diff --git a/app/assets/javascripts/discourse/lib/dirty-keys.js.es6 b/app/assets/javascripts/discourse/lib/dirty-keys.js.es6
new file mode 100644
index 00000000000..924e8fd2fb7
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/dirty-keys.js.es6
@@ -0,0 +1,32 @@
+export default class DirtyKeys {
+  constructor(name) {
+    this.name = name;
+    this._keys = {};
+  }
+
+  keyDirty(key, options) {
+    options = options || {};
+    options.dirty = true;
+    this._keys[key] = options;
+  }
+
+  forceAll() {
+    this.keyDirty('*');
+  }
+
+  allDirty() {
+    return !!this._keys['*'];
+  }
+
+  optionsFor(key) {
+    return this._keys[key] || { dirty: false };
+  }
+
+  renderedKey(key) {
+    if (key === '*') {
+      this._keys = {};
+    } else {
+      delete this._keys[key];
+    }
+  }
+}
diff --git a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
deleted file mode 100644
index 7b8d9bbedf6..00000000000
--- a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
+++ /dev/null
@@ -1,1134 +0,0 @@
-import { emojiExists } from 'pretty-text/emoji';
-
-// note that these categories are copied from Slack
-// be careful, there are ~20 differences in synonyms, e.g. :boom: vs. :collision:
-// a few Emoji are actually missing from the Slack categories as well (?), and were added
-const groups = [
-  {
-    name:"people",
-    fullname:"People",
-    tabicon:"grinning",
-    icons:[
-      "slight_smile",
-      "grinning",
-      "grin",
-      "joy",
-      "smiley",
-      "smile",
-      "sweat_smile",
-      "laughing",
-      "innocent",
-      "smiling_imp",
-      "imp",
-      "wink",
-      "blush",
-      "relaxed",
-      "yum",
-      "relieved",
-      "heart_eyes",
-      "sunglasses",
-      "smirk",
-      "neutral_face",
-      "expressionless",
-      "unamused",
-      "sweat",
-      "pensive",
-      "confused",
-      "confounded",
-      "kissing",
-      "kissing_heart",
-      "kissing_smiling_eyes",
-      "kissing_closed_eyes",
-      "stuck_out_tongue",
-      "stuck_out_tongue_winking_eye",
-      "stuck_out_tongue_closed_eyes",
-      "disappointed",
-      "worried",
-      "angry",
-      "rage",
-      "cry",
-      "persevere",
-      "triumph",
-      "disappointed_relieved",
-      "frowning",
-      "anguished",
-      "fearful",
-      "weary",
-      "sleepy",
-      "tired_face",
-      "grimacing",
-      "sob",
-      "open_mouth",
-      "hushed",
-      "cold_sweat",
-      "scream",
-      "astonished",
-      "flushed",
-      "sleeping",
-      "dizzy_face",
-      "no_mouth",
-      "mask",
-      "smile_cat",
-      "joy_cat",
-      "smiley_cat",
-      "heart_eyes_cat",
-      "smirk_cat",
-      "kissing_cat",
-      "pouting_cat",
-      "crying_cat_face",
-      "scream_cat",
-      "footprints",
-      "bust_in_silhouette",
-      "busts_in_silhouette",
-      "baby",
-      "boy",
-      "girl",
-      "man",
-      "woman",
-      "family",
-      "couple",
-      "two_men_holding_hands",
-      "two_women_holding_hands",
-      "dancers",
-      "bride_with_veil",
-      "person_with_blond_hair",
-      "man_with_gua_pi_mao",
-      "man_with_turban",
-      "older_man",
-      "older_woman",
-      "cop",
-      "construction_worker",
-      "princess",
-      "guardsman",
-      "angel",
-      "santa",
-      "ghost",
-      "japanese_ogre",
-      "japanese_goblin",
-      "hankey",
-      "skull",
-      "alien",
-      "space_invader",
-      "bow",
-      "information_desk_person",
-      "no_good",
-      "ok_woman",
-      "raising_hand",
-      "person_with_pouting_face",
-      "person_frowning",
-      "massage",
-      "haircut",
-      "couple_with_heart",
-      "couplekiss",
-      "raised_hands",
-      "clap",
-      "hand",
-      "ear",
-      "eyes",
-      "nose",
-      "lips",
-      "kiss",
-      "tongue",
-      "nail_care",
-      "wave",
-      "+1",
-      "-1",
-      "point_up",
-      "point_up_2",
-      "point_down",
-      "point_left",
-      "point_right",
-      "ok_hand",
-      "v",
-      "facepunch",
-      "fist",
-      "raised_hand",
-      "muscle",
-      "open_hands",
-      "pray",
-      "anger_right",
-      "eye",
-      "frowning2",
-      "hand_splayed",
-      "head_bandage",
-      "hugging",
-      "middle_finger",
-      "money_mouth",
-      "nerd",
-      "poop",
-      "punch",
-      "robot",
-      "rolling_eyes",
-      "skull_crossbones",
-      "slight_frown",
-      "speaking_head",
-      "spy",
-      "thinking",
-      "thumbsup",
-      "thumbsdown",
-      "upside_down",
-      "urn",
-      "vulcan",
-      "wind_blowing_face",
-      "writing_hand",
-      "zipper_mouth",
-      "female_couple_with_heart",
-      "male_couple_with_heart",
-      "female_couplekiss",
-      "male_couplekiss",
-      "family_man_woman_girl",
-      "family_man_woman_girl_boy",
-      "family_man_woman_boys",
-      "family_man_woman_girls",
-      "family_women_boy",
-      "family_women_girl",
-      "family_women_girl_boy",
-      "family_women_boys",
-      "family_women_girls",
-      "family_men_boy",
-      "family_men_girl",
-      "family_men_girl_boy",
-      "family_men_boys",
-      "family_men_girls"
-    ]
-  },
-  {
-    name:"nature",
-    fullname:"Nature",
-    tabicon:"evergreen_tree",
-    icons:[
-      "seedling",
-      "evergreen_tree",
-      "deciduous_tree",
-      "palm_tree",
-      "cactus",
-      "tulip",
-      "cherry_blossom",
-      "rose",
-      "hibiscus",
-      "sunflower",
-      "blossom",
-      "bouquet",
-      "ear_of_rice",
-      "herb",
-      "four_leaf_clover",
-      "maple_leaf",
-      "fallen_leaf",
-      "leaves",
-      "mushroom",
-      "chestnut",
-      "rat",
-      "mouse2",
-      "mouse",
-      "hamster",
-      "ox",
-      "water_buffalo",
-      "cow2",
-      "cow",
-      "tiger2",
-      "leopard",
-      "tiger",
-      "rabbit2",
-      "rabbit",
-      "cat2",
-      "cat",
-      "racehorse",
-      "horse",
-      "ram",
-      "sheep",
-      "goat",
-      "rooster",
-      "chicken",
-      "baby_chick",
-      "hatching_chick",
-      "hatched_chick",
-      "bird",
-      "penguin",
-      "elephant",
-      "dromedary_camel",
-      "camel",
-      "boar",
-      "pig2",
-      "pig",
-      "pig_nose",
-      "dog2",
-      "poodle",
-      "dog",
-      "wolf",
-      "bear",
-      "koala",
-      "panda_face",
-      "monkey_face",
-      "see_no_evil",
-      "hear_no_evil",
-      "speak_no_evil",
-      "monkey",
-      "dragon",
-      "dragon_face",
-      "crocodile",
-      "snake",
-      "turtle",
-      "frog",
-      "whale2",
-      "whale",
-      "dolphin",
-      "octopus",
-      "fish",
-      "tropical_fish",
-      "blowfish",
-      "shell",
-      "snail",
-      "bug",
-      "ant",
-      "bee",
-      "beetle",
-      "feet",
-      "zap",
-      "fire",
-      "crescent_moon",
-      "sunny",
-      "partly_sunny",
-      "cloud",
-      "droplet",
-      "sweat_drops",
-      "umbrella",
-      "dash",
-      "snowflake",
-      "star2",
-      "star",
-      "stars",
-      "sunrise_over_mountains",
-      "sunrise",
-      "rainbow",
-      "ocean",
-      "volcano",
-      "milky_way",
-      "mount_fuji",
-      "japan",
-      "globe_with_meridians",
-      "earth_africa",
-      "earth_americas",
-      "earth_asia",
-      "new_moon",
-      "waxing_crescent_moon",
-      "first_quarter_moon",
-      "moon",
-      "full_moon",
-      "waning_gibbous_moon",
-      "last_quarter_moon",
-      "waning_crescent_moon",
-      "new_moon_with_face",
-      "full_moon_with_face",
-      "first_quarter_moon_with_face",
-      "last_quarter_moon_with_face",
-      "sun_with_face",
-      "chipmunk",
-      "cloud_lightning",
-      "cloud_rain",
-      "cloud_snow",
-      "cloud_tornado",
-      "comet",
-      "crab",
-      "dove",
-      "fog",
-      "lion_face",
-      "scorpion",
-      "spider",
-      "spider_web",
-      "thunder_cloud_rain",
-      "turkey",
-      "unicorn",
-      "waxing_gibbous_moon",
-      "white_sun_cloud",
-      "white_sun_rain_cloud",
-      "white_sun_small_cloud"
-    ]
-  },
-  {
-    name:"food",
-    fullname:"Food & Drink",
-    tabicon:"hamburger",
-    icons:[
-      "tomato",
-      "eggplant",
-      "corn",
-      "sweet_potato",
-      "grapes",
-      "melon",
-      "watermelon",
-      "tangerine",
-      "lemon",
-      "banana",
-      "pineapple",
-      "apple",
-      "green_apple",
-      "pear",
-      "peach",
-      "cherries",
-      "strawberry",
-      "hamburger",
-      "pizza",
-      "meat_on_bone",
-      "poultry_leg",
-      "rice_cracker",
-      "rice_ball",
-      "rice",
-      "curry",
-      "ramen",
-      "spaghetti",
-      "bread",
-      "fries",
-      "dango",
-      "oden",
-      "sushi",
-      "fried_shrimp",
-      "fish_cake",
-      "icecream",
-      "shaved_ice",
-      "ice_cream",
-      "doughnut",
-      "cookie",
-      "chocolate_bar",
-      "candy",
-      "lollipop",
-      "custard",
-      "honey_pot",
-      "cake",
-      "bento",
-      "stew",
-      "egg",
-      "fork_and_knife",
-      "tea",
-      "coffee",
-      "sake",
-      "wine_glass",
-      "cocktail",
-      "tropical_drink",
-      "beer",
-      "beers",
-      "baby_bottle",
-      "burrito",
-      "champagne",
-      "cheese",
-      "hot_pepper",
-      "hotdog",
-      "taco"
-    ]
-  },
-  {
-    name:"celebration",
-    fullname:"Celebration",
-    tabicon:"gift",
-    icons:[
-      "ribbon",
-      "gift",
-      "birthday",
-      "jack_o_lantern",
-      "christmas_tree",
-      "tanabata_tree",
-      "bamboo",
-      "rice_scene",
-      "fireworks",
-      "sparkler",
-      "tada",
-      "confetti_ball",
-      "balloon",
-      "dizzy",
-      "sparkles",
-      "boom",
-      "mortar_board",
-      "crown",
-      "dolls",
-      "flags",
-      "wind_chime",
-      "crossed_flags",
-      "izakaya_lantern",
-      "ring",
-      "heart",
-      "broken_heart",
-      "love_letter",
-      "two_hearts",
-      "revolving_hearts",
-      "heartbeat",
-      "heartpulse",
-      "sparkling_heart",
-      "cupid",
-      "gift_heart",
-      "heart_decoration",
-      "purple_heart",
-      "yellow_heart",
-      "green_heart",
-      "blue_heart",
-      "heart_exclamation"
-    ]
-  },
-  {
-    name:"activity",
-    fullname:"Activities",
-    tabicon:"soccer",
-    icons:[
-      "runner",
-      "walking",
-      "dancer",
-      "rowboat",
-      "swimmer",
-      "surfer",
-      "bath",
-      "snowboarder",
-      "ski",
-      "snowman",
-      "bicyclist",
-      "mountain_bicyclist",
-      "horse_racing",
-      "tent",
-      "fishing_pole_and_fish",
-      "soccer",
-      "basketball",
-      "football",
-      "baseball",
-      "tennis",
-      "rugby_football",
-      "golf",
-      "trophy",
-      "running_shirt_with_sash",
-      "checkered_flag",
-      "musical_keyboard",
-      "guitar",
-      "violin",
-      "saxophone",
-      "trumpet",
-      "musical_note",
-      "notes",
-      "musical_score",
-      "headphones",
-      "microphone",
-      "performing_arts",
-      "ticket",
-      "tophat",
-      "circus_tent",
-      "clapper",
-      "art",
-      "dart",
-      "8ball",
-      "bowling",
-      "slot_machine",
-      "game_die",
-      "video_game",
-      "flower_playing_cards",
-      "black_joker",
-      "mahjong",
-      "carousel_horse",
-      "ferris_wheel",
-      "roller_coaster",
-      "badminton",
-      "ballot_box",
-      "basketball_player",
-      "bow_and_arrow",
-      "cricket",
-      "crossed_swords",
-      "field_hockey",
-      "golfer",
-      "hockey",
-      "ice_skate",
-      "paintbrush",
-      "skier",
-      "snowman2",
-      "stadium",
-      "volleyball"
-    ]
-  },
-  {
-    name:"travel",
-    fullname:"Travel & Places",
-    tabicon:"airplane",
-    icons:[
-      "train",
-      "mountain_railway",
-      "railway_car",
-      "steam_locomotive",
-      "monorail",
-      "bullettrain_side",
-      "bullettrain_front",
-      "train2",
-      "metro",
-      "light_rail",
-      "station",
-      "tram",
-      "bus",
-      "oncoming_bus",
-      "trolleybus",
-      "minibus",
-      "ambulance",
-      "fire_engine",
-      "police_car",
-      "oncoming_police_car",
-      "rotating_light",
-      "taxi",
-      "oncoming_taxi",
-      "car",
-      "oncoming_automobile",
-      "blue_car",
-      "truck",
-      "articulated_lorry",
-      "tractor",
-      "bike",
-      "busstop",
-      "fuelpump",
-      "construction",
-      "vertical_traffic_light",
-      "traffic_light",
-      "rocket",
-      "helicopter",
-      "airplane",
-      "seat",
-      "anchor",
-      "ship",
-      "speedboat",
-      "boat",
-      "aerial_tramway",
-      "mountain_cableway",
-      "suspension_railway",
-      "passport_control",
-      "customs",
-      "baggage_claim",
-      "left_luggage",
-      "yen",
-      "euro",
-      "pound",
-      "dollar",
-      "statue_of_liberty",
-      "moyai",
-      "foggy",
-      "tokyo_tower",
-      "fountain",
-      "european_castle",
-      "japanese_castle",
-      "city_sunrise",
-      "city_sunset",
-      "night_with_stars",
-      "bridge_at_night",
-      "house",
-      "house_with_garden",
-      "office",
-      "department_store",
-      "factory",
-      "post_office",
-      "european_post_office",
-      "hospital",
-      "bank",
-      "hotel",
-      "love_hotel",
-      "wedding",
-      "church",
-      "convenience_store",
-      "school",
-      "cn",
-      "de",
-      "es",
-      "fr",
-      "gb",
-      "it",
-      "jp",
-      "kr",
-      "ru",
-      "us",
-      "airplane_arriving",
-      "airplane_departure",
-      "airplane_small",
-      "beach",
-      "beach_umbrella",
-      "camping",
-      "city_dusk",
-      "cityscape",
-      "classical_building",
-      "construction_site",
-      "cruise_ship",
-      "desert",
-      "ferry",
-      "flag_black",
-      "flag_cn",
-      "flag_de",
-      "flag_es",
-      "flag_fr",
-      "flag_gb",
-      "flag_it",
-      "flag_jp",
-      "flag_kr",
-      "flag_ru",
-      "flag_us",
-      "flag_white",
-      "hole",
-      "homes",
-      "house_abandoned",
-      "island",
-      "kaaba",
-      "map",
-      "mosque",
-      "motorboat",
-      "motorcycle",
-      "motorway",
-      "mountain",
-      "mountain_snow",
-      "park",
-      "place_of_worship",
-      "race_car",
-      "railway_track",
-      "red_car",
-      "sailboat",
-      "shinto_shrine",
-      "sleeping_accommodation",
-      "synagogue"
-    ]
-  },
-  {
-    name:"objects",
-    fullname:"Objects & Symbols",
-    tabicon:"eyeglasses",
-    icons:[
-      "watch",
-      "iphone",
-      "calling",
-      "computer",
-      "alarm_clock",
-      "hourglass_flowing_sand",
-      "hourglass",
-      "camera",
-      "video_camera",
-      "movie_camera",
-      "tv",
-      "radio",
-      "pager",
-      "telephone_receiver",
-      "phone",
-      "fax",
-      "minidisc",
-      "floppy_disk",
-      "cd",
-      "dvd",
-      "vhs",
-      "battery",
-      "electric_plug",
-      "bulb",
-      "flashlight",
-      "satellite",
-      "credit_card",
-      "money_with_wings",
-      "moneybag",
-      "gem",
-      "closed_umbrella",
-      "pouch",
-      "purse",
-      "handbag",
-      "briefcase",
-      "school_satchel",
-      "lipstick",
-      "eyeglasses",
-      "womans_hat",
-      "sandal",
-      "high_heel",
-      "boot",
-      "mans_shoe",
-      "athletic_shoe",
-      "bikini",
-      "dress",
-      "kimono",
-      "womans_clothes",
-      "shirt",
-      "necktie",
-      "jeans",
-      "door",
-      "shower",
-      "bathtub",
-      "toilet",
-      "barber",
-      "syringe",
-      "pill",
-      "microscope",
-      "telescope",
-      "crystal_ball",
-      "wrench",
-      "hocho",
-      "nut_and_bolt",
-      "hammer",
-      "bomb",
-      "smoking",
-      "gun",
-      "bookmark",
-      "newspaper",
-      "key",
-      "email",
-      "envelope_with_arrow",
-      "incoming_envelope",
-      "e-mail",
-      "inbox_tray",
-      "outbox_tray",
-      "package",
-      "postal_horn",
-      "postbox",
-      "mailbox_closed",
-      "mailbox",
-      "mailbox_with_mail",
-      "mailbox_with_no_mail",
-      "page_facing_up",
-      "page_with_curl",
-      "bookmark_tabs",
-      "chart_with_upwards_trend",
-      "chart_with_downwards_trend",
-      "bar_chart",
-      "date",
-      "calendar",
-      "low_brightness",
-      "high_brightness",
-      "scroll",
-      "clipboard",
-      "book",
-      "notebook",
-      "notebook_with_decorative_cover",
-      "ledger",
-      "closed_book",
-      "green_book",
-      "blue_book",
-      "orange_book",
-      "books",
-      "card_index",
-      "link",
-      "paperclip",
-      "pushpin",
-      "scissors",
-      "triangular_ruler",
-      "round_pushpin",
-      "straight_ruler",
-      "triangular_flag_on_post",
-      "file_folder",
-      "open_file_folder",
-      "black_nib",
-      "pencil2",
-      "memo",
-      "lock_with_ink_pen",
-      "closed_lock_with_key",
-      "lock",
-      "unlock",
-      "mega",
-      "loudspeaker",
-      "sound",
-      "loud_sound",
-      "speaker",
-      "mute",
-      "zzz",
-      "bell",
-      "no_bell",
-      "thought_balloon",
-      "speech_balloon",
-      "children_crossing",
-      "mag",
-      "mag_right",
-      "no_entry_sign",
-      "no_entry",
-      "name_badge",
-      "no_pedestrians",
-      "do_not_litter",
-      "no_bicycles",
-      "non-potable_water",
-      "no_mobile_phones",
-      "underage",
-      "accept",
-      "ideograph_advantage",
-      "white_flower",
-      "secret",
-      "congratulations",
-      "u5408",
-      "u6e80",
-      "u7981",
-      "u6709",
-      "u7121",
-      "u7533",
-      "u55b6",
-      "u6708",
-      "u5272",
-      "u7a7a",
-      "sa",
-      "koko",
-      "u6307",
-      "chart",
-      "sparkle",
-      "eight_spoked_asterisk",
-      "negative_squared_cross_mark",
-      "white_check_mark",
-      "eight_pointed_black_star",
-      "vibration_mode",
-      "mobile_phone_off",
-      "vs",
-      "a",
-      "b",
-      "ab",
-      "cl",
-      "o2",
-      "sos",
-      "id",
-      "parking",
-      "wc",
-      "cool",
-      "free",
-      "new",
-      "ng",
-      "ok",
-      "up",
-      "atm",
-      "aries",
-      "taurus",
-      "gemini",
-      "cancer",
-      "leo",
-      "virgo",
-      "libra",
-      "scorpius",
-      "sagittarius",
-      "capricorn",
-      "aquarius",
-      "pisces",
-      "restroom",
-      "mens",
-      "womens",
-      "baby_symbol",
-      "wheelchair",
-      "potable_water",
-      "no_smoking",
-      "put_litter_in_its_place",
-      "arrow_forward",
-      "arrow_backward",
-      "arrow_up_small",
-      "arrow_down_small",
-      "fast_forward",
-      "rewind",
-      "arrow_double_up",
-      "arrow_double_down",
-      "arrow_right",
-      "arrow_left",
-      "arrow_up",
-      "arrow_down",
-      "arrow_upper_right",
-      "arrow_lower_right",
-      "arrow_lower_left",
-      "arrow_upper_left",
-      "arrow_up_down",
-      "left_right_arrow",
-      "arrows_counterclockwise",
-      "arrow_right_hook",
-      "leftwards_arrow_with_hook",
-      "arrow_heading_up",
-      "arrow_heading_down",
-      "twisted_rightwards_arrows",
-      "repeat",
-      "repeat_one",
-      "zero",
-      "one",
-      "two",
-      "three",
-      "four",
-      "five",
-      "six",
-      "seven",
-      "eight",
-      "nine",
-      "keycap_ten",
-      "keycap_star",
-      "1234",
-      "hash",
-      "abc",
-      "abcd",
-      "capital_abcd",
-      "information_source",
-      "signal_strength",
-      "cinema",
-      "symbols",
-      "heavy_plus_sign",
-      "heavy_minus_sign",
-      "wavy_dash",
-      "heavy_division_sign",
-      "heavy_multiplication_x",
-      "heavy_check_mark",
-      "arrows_clockwise",
-      "tm",
-      "copyright",
-      "registered",
-      "currency_exchange",
-      "heavy_dollar_sign",
-      "curly_loop",
-      "loop",
-      "part_alternation_mark",
-      "exclamation",
-      "bangbang",
-      "question",
-      "grey_exclamation",
-      "grey_question",
-      "interrobang",
-      "x",
-      "o",
-      "100",
-      "end",
-      "back",
-      "on",
-      "top",
-      "soon",
-      "cyclone",
-      "m",
-      "ophiuchus",
-      "six_pointed_star",
-      "beginner",
-      "trident",
-      "warning",
-      "hotsprings",
-      "recycle",
-      "anger",
-      "diamond_shape_with_a_dot_inside",
-      "spades",
-      "clubs",
-      "hearts",
-      "diamonds",
-      "ballot_box_with_check",
-      "white_circle",
-      "black_circle",
-      "radio_button",
-      "red_circle",
-      "large_blue_circle",
-      "small_red_triangle",
-      "small_red_triangle_down",
-      "small_orange_diamond",
-      "small_blue_diamond",
-      "large_orange_diamond",
-      "large_blue_diamond",
-      "black_small_square",
-      "white_small_square",
-      "black_large_square",
-      "white_large_square",
-      "black_medium_square",
-      "white_medium_square",
-      "black_medium_small_square",
-      "white_medium_small_square",
-      "black_square_button",
-      "white_square_button",
-      "clock1",
-      "clock2",
-      "clock3",
-      "clock4",
-      "clock5",
-      "clock6",
-      "clock7",
-      "clock8",
-      "clock9",
-      "clock10",
-      "clock11",
-      "clock12",
-      "clock130",
-      "clock230",
-      "clock330",
-      "clock430",
-      "clock530",
-      "clock630",
-      "clock730",
-      "clock830",
-      "clock930",
-      "clock1030",
-      "clock1130",
-      "clock1230",
-      "alembic",
-      "amphora",
-      "atom",
-      "biohazard",
-      "bed",
-      "bellhop",
-      "calendar_spiral",
-      "camera_with_flash",
-      "candle",
-      "card_box",
-      "chains",
-      "clock",
-      "coffin",
-      "compression",
-      "control_knobs",
-      "couch",
-      "crayon",
-      "cross",
-      "dagger",
-      "dark_sunglasses",
-      "desktop",
-      "dividers",
-      "envelope",
-      "file_cabinet",
-      "film_frames",
-      "fleur-de-lis",
-      "fork_knife_plate",
-      "frame_photo",
-      "gear",
-      "hammer_pick",
-      "helmet_with_cross",
-      "joystick",
-      "key2",
-      "keyboard",
-      "knife",
-      "label",
-      "level_slider",
-      "levitate",
-      "lifter",
-      "medal",
-      "menorah",
-      "metal",
-      "microphone2",
-      "military_medal",
-      "mouse_three_button",
-      "newspaper2",
-      "notepad_spiral",
-      "oil",
-      "om_symbol",
-      "orthodox_cross",
-      "paperclips",
-      "pause_button",
-      "peace",
-      "pen_ballpoint",
-      "pen_fountain",
-      "pencil",
-      "pick",
-      "ping_pong",
-      "play_pause",
-      "popcorn",
-      "prayer_beads",
-      "printer",
-      "projector",
-      "radioactive",
-      "record_button",
-      "reminder_ribbon",
-      "rosette",
-      "satellite_orbital",
-      "scales",
-      "shamrock",
-      "shield",
-      "shopping_bags",
-      "star_and_crescent",
-      "star_of_david",
-      "stop_button",
-      "stopwatch",
-      "telephone",
-      "ten",
-      "thermometer",
-      "thermometer_face",
-      "tickets",
-      "timer",
-      "tools",
-      "track_next",
-      "track_previous",
-      "trackball",
-      "umbrella2",
-      "wastebasket",
-      "wheel_of_dharma",
-      "yin_yang",
-      "left_speech_bubble"
-    ]
-  }
-];
-
-// scrub groups
-groups.forEach(group => {
-  group.icons = group.icons.reject(obj => !emojiExists(obj));
-});
-
-export default groups;
diff --git a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6 b/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
deleted file mode 100644
index 3666df1b580..00000000000
--- a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
+++ /dev/null
@@ -1,183 +0,0 @@
-import groups from 'discourse/lib/emoji/groups';
-import KeyValueStore from "discourse/lib/key-value-store";
-import { emojiList } from 'pretty-text/emoji';
-import { emojiUrlFor } from 'discourse/lib/text';
-import { findRawTemplate } from 'discourse/lib/raw-templates';
-
-const keyValueStore = new KeyValueStore("discourse_emojis_");
-const EMOJI_USAGE = "emojiUsage";
-
-let PER_ROW = 12;
-const PER_PAGE = 60;
-
-let ungroupedIcons, recentlyUsedIcons;
-
-if (!keyValueStore.getObject(EMOJI_USAGE)) {
-  keyValueStore.setObject({key: EMOJI_USAGE, value: {}});
-}
-
-function closeSelector() {
-  $('.emoji-modal, .emoji-modal-wrapper').remove();
-  $('body, textarea').off('keydown.emoji');
-}
-
-function initializeUngroupedIcons() {
-  const groupedIcons = {};
-
-  groups.forEach(group => {
-    group.icons.forEach(icon => groupedIcons[icon] = true);
-  });
-
-  ungroupedIcons = [];
-  const emojis = emojiList();
-  emojis.forEach(emoji => {
-    if (groupedIcons[emoji] !== true) {
-      ungroupedIcons.push(emoji);
-    }
-  });
-
-  if (ungroupedIcons.length) {
-    groups.push({name: 'ungrouped', icons: ungroupedIcons});
-  }
-}
-
-function trackEmojiUsage(title) {
-  const recent = keyValueStore.getObject(EMOJI_USAGE) || {};
-
-  if (!recent[title]) { recent[title] = { title: title, usage: 0 }; }
-  recent[title]["usage"]++;
-
-  keyValueStore.setObject({key: EMOJI_USAGE, value: recent});
-
-  // clear the cache
-  recentlyUsedIcons = null;
-}
-
-function sortByUsage(a, b) {
-  if (a.usage > b.usage) { return -1; }
-  if (b.usage > a.usage) { return 1; }
-  return a.title.localeCompare(b.title);
-}
-
-function initializeRecentlyUsedIcons() {
-  recentlyUsedIcons = [];
-
-  const usage = _.map(keyValueStore.getObject(EMOJI_USAGE)).sort(sortByUsage);
-  const recent = usage.slice(0, PER_ROW);
-
-  if (recent.length > 0) {
-
-    recent.forEach(emoji => recentlyUsedIcons.push(emoji.title));
-
-    const recentGroup = groups.findBy('name', 'recent');
-    if (recentGroup) {
-      recentGroup.icons = recentlyUsedIcons;
-    } else {
-      groups.push({ name: 'recent', icons: recentlyUsedIcons });
-    }
-  }
-}
-
-function toolbar(selected) {
-  if (!ungroupedIcons) { initializeUngroupedIcons(); }
-  if (!recentlyUsedIcons) { initializeRecentlyUsedIcons(); }
-
-  return groups.map((g, i) => {
-    let icon = g.tabicon;
-    let title = g.fullname;
-    if (g.name === "recent") {
-      icon = "star";
-      title = "Recent";
-    } else if (g.name === "ungrouped") {
-      icon = g.icons[0];
-      title = "Custom";
-    }
-
-    return { src: emojiUrlFor(icon),
-             title,
-             groupId: i,
-             selected: i === selected };
-  });
-}
-
-function bindEvents(page, offset, options) {
-  $('.emoji-page a').click(e => {
-    const title = $(e.currentTarget).attr('title');
-    trackEmojiUsage(title);
-    options.onSelect(title);
-    closeSelector();
-    return false;
-  }).hover(e => {
-    const title = $(e.currentTarget).attr('title');
-    const html = "<img src='" + emojiUrlFor(title) + "' class='emoji'> <span>:" + title + ":<span>";
-    $('.emoji-modal .info').html(html);
-  }, () => $('.emoji-modal .info').html(""));
-
-  $('.emoji-modal .nav .next a').click(() => render(page, offset+PER_PAGE, options));
-  $('.emoji-modal .nav .prev a').click(() => render(page, offset-PER_PAGE, options));
-
-  $('.emoji-modal .toolbar a').click(function(){
-    const p = parseInt($(this).data('group-id'));
-    render(p, 0, options);
-    return false;
-  });
-}
-
-function render(page, offset, options) {
-  keyValueStore.set({key: "emojiPage", value: page});
-  keyValueStore.set({key: "emojiOffset", value: offset});
-
-  const toolbarItems = toolbar(page);
-  const rows = [];
-  let row = [];
-  const icons = groups[page].icons;
-  const max = offset + PER_PAGE;
-
-  for(let i=offset; i<max; i++){
-    if(!icons[i]){ break; }
-    if(row.length === (options.perRow || PER_ROW)){
-      rows.push(row);
-      row = [];
-    }
-    row.push({src: emojiUrlFor(icons[i]), title: icons[i]});
-  }
-  rows.push(row);
-
-  const model = {
-    toolbarItems: toolbarItems,
-    rows: rows,
-    prevDisabled: offset === 0,
-    nextDisabled: (max + 1) > icons.length,
-    modalClass: options.modalClass
-  };
-
-  $('.emoji-modal', options.appendTo).remove();
-  const template = findRawTemplate('emoji-toolbar');
-  options.appendTo.append(template(model));
-
-  bindEvents(page, offset, options);
-}
-
-function showSelector(options) {
-  options = options || {};
-  options.appendTo = options.appendTo || $('body');
-
-  options.appendTo.append('<div class="emoji-modal-wrapper"></div>');
-  $('.emoji-modal-wrapper').click(() => closeSelector());
-
-  if (Discourse.Site.currentProp('mobileView')) { PER_ROW = 9; }
-  const page = options.page ? _.findIndex(groups, (g) => { return g.name === options.page; })
-                            : keyValueStore.getInt("emojiPage", 0);
-  const offset = keyValueStore.getInt("emojiOffset", 0);
-
-  render(page, offset, options);
-
-  $('body, textarea').on('keydown.emoji', e => {
-    if (e.which === 27) {
-      closeSelector();
-      return false;
-    }
-  });
-}
-
-export { showSelector };
diff --git a/app/assets/javascripts/discourse/lib/highlight-text.js.es6 b/app/assets/javascripts/discourse/lib/highlight-text.js.es6
new file mode 100644
index 00000000000..6d4b6020c7d
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/highlight-text.js.es6
@@ -0,0 +1,8 @@
+export default function($elem, term) {
+  if(!_.isEmpty(term)) {
+    // special case ignore "l" which is used for magic sorting
+    let words = _.reject(term.match(/"[^"]+"|[^\s]+/g), t => t === 'l');
+    words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
+    $elem.highlight(words, {className: 'search-highlight', wordsOnly: true});
+  }
+}
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6
index 8baf4b905d8..d40b17c6639 100644
--- a/app/assets/javascripts/discourse/lib/load-script.js.es6
+++ b/app/assets/javascripts/discourse/lib/load-script.js.es6
@@ -36,7 +36,11 @@ export default function loadScript(url, opts) {
   opts = opts || {};
 
   $('script').each((i, tag) => {
-    _loaded[tag.getAttribute('src')] = true;
+    const src = tag.getAttribute('src');
+
+    if (src && (opts.scriptTag || src !== url)) {
+      _loaded[tag.getAttribute('src')] = true;
+    }
   });
 
 
@@ -57,12 +61,12 @@ export default function loadScript(url, opts) {
     });
 
     const cb = function(data) {
-      _loaded[url] = true;
       if (opts && opts.css) {
         $("head").append("<style>" + data + "</style>");
       }
       done();
       resolve();
+      _loaded[url] = true;
     };
 
     let cdnUrl = url;
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 01b1c9216de..5d382e4ac04 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -22,7 +22,7 @@ import { attachAdditionalPanel } from 'discourse/widgets/header';
 
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = '0.8.6';
+const PLUGIN_API_VERSION = '0.8.7';
 
 class PluginApi {
   constructor(version, container) {
@@ -39,6 +39,25 @@ class PluginApi {
     return this.container.lookup('current-user:main');
   }
 
+  /**
+   * Allows you to overwrite or extend methods in a class.
+   *
+   * For example:
+   *
+   * ```
+   * api.modifyClass('controller:composer', {
+   *   actions: {
+   *     newActionHere() { }
+   *   }
+   * });
+   * ```
+   **/
+  modifyClass(resolverName, changes) {
+    const klass = this.container.factoryFor(resolverName);
+    klass.class.reopen(changes);
+    return klass;
+  }
+
   /**
    * Used for decorating the `cooked` content of a post after it is rendered using
    * jQuery.
@@ -61,7 +80,7 @@ class PluginApi {
 
     if (!opts.onlyStream) {
       decorate(ComposerEditor, 'previewRefreshed', callback);
-      decorate(this.container.lookupFactory('component:user-stream'), 'didInsertElement', callback);
+      decorate(this.container.factoryFor('component:user-stream').class, 'didInsertElement', callback);
     }
   }
 
@@ -170,7 +189,7 @@ class PluginApi {
    * ```
    **/
   attachWidgetAction(widget, actionName, fn) {
-    const widgetClass = this.container.lookupFactory(`widget:${widget}`);
+    const widgetClass = this.container.factoryFor(`widget:${widget}`).class;
     widgetClass.prototype[actionName] = fn;
   }
 
diff --git a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6 b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
index d398031d81e..3b1179c48ba 100644
--- a/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-connectors.js.es6
@@ -50,7 +50,7 @@ function findClass(outletName, uniqueName) {
   if (!_classPaths) {
     _classPaths = {};
     findOutlets(require._eak_seen, (outlet, res, un) => {
-      _classPaths[`${outlet}/${un}`] = require(res).default;
+      _classPaths[`${outlet}/${un}`] = requirejs(res).default;
     });
   }
 
diff --git a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6 b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
index a57f46c9eb4..fcad3553434 100644
--- a/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
+++ b/app/assets/javascripts/discourse/lib/posts-with-placeholders.js.es6
@@ -56,7 +56,7 @@ export default Ember.Object.extend(Ember.Array, {
   },
 
   finishedPrepending(postIds) {
-    this._changeArray(Ember.K, 0, 0, postIds.length);
+    this._changeArray(function() { }, 0, 0, postIds.length);
   },
 
   objectAt(index) {
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 745f7a84de7..89bc99ea605 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -7,8 +7,8 @@ export function isAppleDevice() {
 }
 
 
-// we can't tell what the actual visible window height is 
-// because we cannot account for the height of the mobile keyboard 
+// we can't tell what the actual visible window height is
+// because we cannot account for the height of the mobile keyboard
 // and any other mobile autocomplete UI that may appear
 // so let's be conservative here rather than trying to max out every
 // available pixel of height for the editor
@@ -123,6 +123,10 @@ function positioningWorkaround($fixedElement) {
 
   const checkForInputs = _.debounce(function(){
     $fixedElement.find('button:not(.hide-preview),a:not(.mobile-file-upload):not(.toggle-toolbar)').each(function(idx, elem){
+      if ($(elem).parents('.emoji-picker').length > 0) {
+        return;
+      }
+
       if ($(elem).parents('.autocomplete').length > 0) {
         return;
       }
diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6
index 30ab32629f9..9b9828deaab 100644
--- a/app/assets/javascripts/discourse/lib/search.js.es6
+++ b/app/assets/javascripts/discourse/lib/search.js.es6
@@ -6,13 +6,11 @@ import Category from 'discourse/models/category';
 import { search as searchCategoryTag  } from 'discourse/lib/category-tag-search';
 import userSearch from 'discourse/lib/user-search';
 import { userPath } from 'discourse/lib/url';
+import User from 'discourse/models/user';
+import Post from 'discourse/models/post';
+import Topic from 'discourse/models/topic';
 
 export function translateResults(results, opts) {
-
-  const User = require('discourse/models/user').default;
-  const Post = require('discourse/models/post').default;
-  const Topic = require('discourse/models/topic').default;
-
   if (!opts) opts = {};
 
   // Topics might not be included
@@ -94,9 +92,9 @@ export function searchForTerm(term, opts) {
     };
   }
 
-  var promise = ajax('/search/query', { data: data });
+  let promise = ajax('/search/query', { data: data });
 
-  promise.then(function(results){
+  promise.then(results => {
     return translateResults(results, opts);
   });
 
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js.es6
index dc3c1cdf971..970bbbae5ae 100644
--- a/app/assets/javascripts/discourse/lib/text.js.es6
+++ b/app/assets/javascripts/discourse/lib/text.js.es6
@@ -2,24 +2,40 @@ import { default as PrettyText, buildOptions } from 'pretty-text/pretty-text';
 import { performEmojiUnescape, buildEmojiUrl } from 'pretty-text/emoji';
 import WhiteLister from 'pretty-text/white-lister';
 import { sanitize as textSanitize } from 'pretty-text/sanitizer';
+import loadScript from 'discourse/lib/load-script';
 
-function getOpts() {
+function getOpts(opts) {
   const siteSettings = Discourse.__container__.lookup('site-settings:main');
 
-  return buildOptions({
+  opts = _.merge({
     getURL: Discourse.getURLWithCDN,
     currentUser: Discourse.__container__.lookup('current-user:main'),
     siteSettings
-  });
+  }, opts);
+
+  return buildOptions(opts);
 }
 
 // Use this to easily create a pretty text instance with proper options
-export function cook(text) {
-  return new Handlebars.SafeString(new PrettyText(getOpts()).cook(text));
+export function cook(text, options) {
+  return new Handlebars.SafeString(new PrettyText(getOpts(options)).cook(text));
 }
 
-export function sanitize(text) {
-  return textSanitize(text, new WhiteLister(getOpts()));
+// everything should eventually move to async API and this should be renamed
+// cook
+export function cookAsync(text, options) {
+  if (Discourse.MarkdownItURL) {
+    return loadScript(Discourse.MarkdownItURL)
+      .then(()=>cook(text, options))
+      .catch(e => Ember.Logger.error(e));
+  } else {
+    return Ember.RSVP.Promise.resolve(cook(text));
+  }
+}
+
+
+export function sanitize(text, options) {
+  return textSanitize(text, new WhiteLister(options));
 }
 
 function emojiOptions() {
diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 1d74f02eccb..1f989f297ef 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -14,6 +14,7 @@ const SERVER_SIDE_ONLY = [
   /^\/raw\//,
   /^\/posts\/\d+\/raw/,
   /^\/raw\/\d+/,
+  /^\/wizard/,
   /\.rss$/,
   /\.json$/,
 ];
@@ -191,13 +192,6 @@ const DiscourseURL = Ember.Object.extend({
     const oldPath = window.location.pathname;
     path = path.replace(/(https?\:)?\/\/[^\/]+/, '');
 
-    // handle prefixes
-    if (path.match(/^\//)) {
-      let rootURL = (Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri);
-      rootURL = rootURL.replace(/\/$/, '');
-      path = path.replace(rootURL, '');
-    }
-
     // Rewrite /my/* urls
     if (path.indexOf('/my/') === 0) {
       const currentUser = Discourse.User.current();
@@ -209,6 +203,13 @@ const DiscourseURL = Ember.Object.extend({
       }
     }
 
+    // handle prefixes
+    if (path.match(/^\//)) {
+      let rootURL = (Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri);
+      rootURL = rootURL.replace(/\/$/, '');
+      path = path.replace(rootURL, '');
+    }
+
     path = rewritePath(path);
     if (this.navigatedToPost(oldPath, path, opts)) { return; }
 
@@ -221,6 +222,11 @@ const DiscourseURL = Ember.Object.extend({
     // TODO: Extract into rules we can inject into the URL handler
     if (this.navigatedToHome(oldPath, path, opts)) { return; }
 
+    // Navigating to empty string is the same as root
+    if (path === '') {
+      path = '/';
+    }
+
     return this.handleURL(path, opts);
   },
 
@@ -367,7 +373,7 @@ const DiscourseURL = Ember.Object.extend({
         discoveryTopics.resetParams();
       }
 
-      router.router.updateURL(path);
+      router._routerMicrolib.updateURL(path);
     }
 
     const split = path.split('#');
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index d80b84cabc5..3a139c99223 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -102,8 +102,10 @@ export function selectedText() {
   $div.find("img.emoji").replaceWith(function() { return this.title; });
   // replace br with newlines
   $div.find("br").replaceWith(() => "\n");
+  // enforce newline at the end of paragraphs
+  $div.find("p").append(() => "\n");
 
-  return String($div.text()).trim();
+  return String($div.text()).trim().replace(/(^\s*\n)+/gm, "\n");
 }
 
 // Determine the row and col of the caret in an element
@@ -172,7 +174,7 @@ export function validateUploadedFiles(files, opts) {
   }
 
   opts = opts || {};
-  opts["type"] = uploadTypeFromFileName(upload.name);
+  opts.type = uploadTypeFromFileName(upload.name);
 
   return validateUploadedFile(upload, opts);
 }
@@ -185,12 +187,18 @@ export function validateUploadedFile(file, opts) {
   if (!name) { return false; }
 
   // check that the uploaded file is authorized
-  if (opts["imagesOnly"]) {
+  if (opts.allowStaffToUploadAnyFileInPm && opts.isPrivateMessage) {
+    if (Discourse.User.current("staff")) {
+      return true;
+    }
+  }
+
+  if (opts.imagesOnly) {
     if (!isAnImage(name) && !isAuthorizedImage(name)) {
       bootbox.alert(I18n.t('post.errors.upload_not_authorized', { authorized_extensions: authorizedImagesExtensions() }));
       return false;
     }
-  } else if (opts["csvOnly"]) {
+  } else if (opts.csvOnly) {
     if (!(/\.csv$/i).test(name)) {
       bootbox.alert(I18n.t('user.invited.bulk_invite.error'));
       return false;
@@ -202,10 +210,10 @@ export function validateUploadedFile(file, opts) {
     }
   }
 
-  if (!opts["bypassNewUserRestriction"]) {
+  if (!opts.bypassNewUserRestriction) {
     // ensures that new users can upload a file
-    if (!Discourse.User.current().isAllowedToUploadAFile(opts["type"])) {
-      bootbox.alert(I18n.t(`post.errors.${opts["type"]}_upload_not_allowed_for_new_user`));
+    if (!Discourse.User.current().isAllowedToUploadAFile(opts.type)) {
+      bootbox.alert(I18n.t(`post.errors.${opts.type}_upload_not_allowed_for_new_user`));
       return false;
     }
   }
@@ -288,7 +296,9 @@ export function uploadLocation(url) {
 
 export function getUploadMarkdown(upload) {
   if (isAnImage(upload.original_filename)) {
-    return '<img src="' + upload.url + '" width="' + upload.width + '" height="' + upload.height + '">';
+    const split = upload.original_filename.split('.');
+    const name = split[split.length-2];
+    return `![${name}|${upload.width}x${upload.height}](${upload.url})`;
   } else if (!Discourse.SiteSettings.prevent_anons_from_downloading_files && (/\.(mov|mp4|webm|ogv|mp3|ogg|wav|m4a)$/i).test(upload.original_filename)) {
     return uploadLocation(upload.url);
   } else {
diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js.es6
index 140ea94610f..2a9a36b37af 100644
--- a/app/assets/javascripts/discourse/mapping-router.js.es6
+++ b/app/assets/javascripts/discourse/mapping-router.js.es6
@@ -106,7 +106,7 @@ export function mapRoutes() {
   // can define admin routes.
   Object.keys(requirejs._eak_seen).forEach(function(key) {
     if (/route-map$/.test(key)) {
-      var module = require(key, null, null, true);
+      var module = requirejs(key, null, null, true);
       if (!module || !module.default) { throw new Error(key + ' must export a route map.'); }
 
       const mapObj = module.default;
diff --git a/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6 b/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
new file mode 100644
index 00000000000..f9037da98d1
--- /dev/null
+++ b/app/assets/javascripts/discourse/mixins/key-enter-escape.js.es6
@@ -0,0 +1,14 @@
+// A mixin where hitting ESC calls `cancelled` and ctrl+enter calls `save.
+export default {
+  keyDown(e) {
+    if (e.which === 27) {
+      this.sendAction('cancelled');
+      return false;
+    } else if (e.which === 13 && (e.ctrlKey || e.metaKey)) {
+      // CTRL+ENTER or CMD+ENTER
+      this.sendAction('save');
+      return false;
+    }
+  },
+};
+
diff --git a/app/assets/javascripts/discourse/mixins/name-validation.js.es6 b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
index 8a286522dff..b225533c36d 100644
--- a/app/assets/javascripts/discourse/mixins/name-validation.js.es6
+++ b/app/assets/javascripts/discourse/mixins/name-validation.js.es6
@@ -3,6 +3,11 @@ import { default as computed } from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Mixin.create({
 
+  @computed()
+  nameInstructions() {
+    return I18n.t(this.siteSettings.full_name_required ? 'user.name.instructions_required' : 'user.name.instructions');
+  },
+
   // Validate the name.
   @computed('accountName')
   nameValidation() {
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js.es6 b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
index c2997fa3954..bbd21aca02a 100644
--- a/app/assets/javascripts/discourse/mixins/scrolling.js.es6
+++ b/app/assets/javascripts/discourse/mixins/scrolling.js.es6
@@ -31,7 +31,7 @@ const Scrolling = Ember.Mixin.create({
     opts = opts || { debounce: 100 };
 
     // So we can not call the scrolled event while transitioning
-    const router = Discourse.__container__.lookup('router:main').router;
+    const router = Discourse.__container__.lookup('router:main')._routerMicrolib;
 
     let onScrollMethod = () => {
       if (router.activeTransition) { return; }
diff --git a/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6 b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
new file mode 100644
index 00000000000..6c3f8ca3c69
--- /dev/null
+++ b/app/assets/javascripts/discourse/mixins/user-fields-validation.js.es6
@@ -0,0 +1,35 @@
+import InputValidation from 'discourse/models/input-validation';
+import { on, default as computed } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Mixin.create({
+
+  @on('init')
+  _createUserFields() {
+    if (!this.site) { return; }
+
+    let userFields = this.site.get('user_fields');
+    if (userFields) {
+      userFields = _.sortBy(userFields, 'position').map(function(f) {
+        return Ember.Object.create({ value: null, field: f });
+      });
+    }
+    this.set('userFields', userFields);
+  },
+
+  // Validate required fields
+  @computed('userFields.@each.value')
+  userFieldsValidation() {
+    let userFields = this.get('userFields');
+    if (userFields) { userFields = userFields.filterBy('field.required'); }
+    if (!Ember.isEmpty(userFields)) {
+      const anyEmpty = userFields.any(uf => {
+        const val = uf.get('value');
+        return !val || Ember.isEmpty(val);
+      });
+      if (anyEmpty) {
+        return InputValidation.create({ failed: true });
+      }
+    }
+    return InputValidation.create({ ok: true });
+  }
+});
diff --git a/app/assets/javascripts/discourse/models/admin-post.js.es6 b/app/assets/javascripts/discourse/models/admin-post.js.es6
deleted file mode 100644
index 8de331ac955..00000000000
--- a/app/assets/javascripts/discourse/models/admin-post.js.es6
+++ /dev/null
@@ -1,26 +0,0 @@
-import Post from 'discourse/models/post';
-
-export default Post.extend({
-
-  _attachCategory: function () {
-    const categoryId = this.get("category_id");
-    if (categoryId) {
-      this.set("category", Discourse.Category.findById(categoryId));
-    }
-  }.on("init"),
-
-  presentName: Ember.computed.or('name', 'username'),
-
-  sameUser: function() {
-    return this.get("username") === Discourse.User.currentProp("username");
-  }.property("username"),
-
-  descriptionKey: function () {
-    if (this.get("reply_to_post_number")) {
-      return this.get("sameUser") ? "you_replied_to_post" : "user_replied_to_post";
-    } else {
-      return this.get("sameUser") ? "you_replied_to_topic" : "user_replied_to_topic";
-    }
-  }.property("reply_to_post_number", "sameUser")
-
-});
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index a85025e410e..c156613ef56 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -2,7 +2,6 @@ import { ajax } from 'discourse/lib/ajax';
 import { default as computed, observes } from "ember-addons/ember-computed-decorators";
 import GroupHistory from 'discourse/models/group-history';
 import RestModel from 'discourse/models/rest';
-import { popupAjaxError } from 'discourse/lib/ajax-error';
 
 const Group = RestModel.extend({
   limit: 50,
@@ -114,23 +113,27 @@ const Group = RestModel.extend({
     return aliasLevel === '99';
   },
 
-  @observes("visible", "canEveryoneMention")
+  @observes("visibility_level", "canEveryoneMention")
   _updateAllowMembershipRequests() {
-    if (!this.get('visible') || !this.get('canEveryoneMention')) {
+    if (this.get('visibility_level') !== 0 || !this.get('canEveryoneMention')) {
       this.set ('allow_membership_requests', false);
     }
   },
 
-  @observes("visible")
+  @observes("visibility_level")
   _updatePublic() {
-    if (!this.get('visible')) this.set('public', false);
+    let visibility_level = parseInt(this.get('visibility_level'));
+    if (visibility_level !== 0) {
+      this.set('public', false);
+      this.set('allow_membership_requests', false);
+    }
   },
 
   asJSON() {
     return {
       name: this.get('name'),
       alias_level: this.get('alias_level'),
-      visible: !!this.get('visible'),
+      visibility_level: this.get('visibility_level'),
       automatic_membership_email_domains: this.get('emailDomains'),
       automatic_membership_retroactive: !!this.get('automatic_membership_retroactive'),
       title: this.get('title'),
@@ -202,12 +205,18 @@ const Group = RestModel.extend({
       data: { notification_level, user_id: userId },
       type: "POST"
     });
-  }
+  },
+
+  requestMembership() {
+    return ajax(`/groups/${this.get('name')}/request_membership`, {
+      type: "POST"
+    });
+  },
 });
 
 Group.reopenClass({
   findAll(opts) {
-    return ajax("/admin/groups.json", { data: opts }).then(function (groups){
+    return ajax("/groups/search.json", { data: opts }).then(groups => {
       return groups.map(g => Group.create(g));
     });
   },
@@ -216,10 +225,6 @@ Group.reopenClass({
     return ajax("/groups/" + name + ".json").then(result => Group.create(result.basic_group));
   },
 
-  loadOwners(name) {
-    return ajax('/groups/' + name + '/owners.json').catch(popupAjaxError);
-  },
-
   loadMembers(name, offset, limit, params) {
     return ajax('/groups/' + name + '/members.json', {
       data: _.extend({
diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js.es6
index 1425e63b25a..b3373f10808 100644
--- a/app/assets/javascripts/discourse/models/invite.js.es6
+++ b/app/assets/javascripts/discourse/models/invite.js.es6
@@ -58,6 +58,10 @@ Invite.reopenClass({
 
   reinviteAll() {
     return ajax('/invites/reinvite-all', { type: 'POST' });
+  },
+
+  rescindAll() {
+    return ajax('/invites/rescind-all', { type: 'POST' });
   }
 
 });
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 7800d3be38c..367dee640c6 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -8,6 +8,7 @@ import computed from 'ember-addons/ember-computed-decorators';
 import { postUrl } from 'discourse/lib/utilities';
 import { cook } from 'discourse/lib/text';
 import { userPath } from 'discourse/lib/url';
+import Composer from 'discourse/models/composer';
 
 const Post = RestModel.extend({
 
@@ -104,7 +105,6 @@ const Post = RestModel.extend({
 
   createProperties() {
     // composer only used once, defer the dependency
-    const Composer = require('discourse/models/composer').default;
     const data = this.getProperties(Composer.serializedFieldsForCreate());
     data.reply_to_post_number = this.get('reply_to_post_number');
     data.image_sizes = this.get('imageSizes');
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6
index 0c595bb7359..ed78efd7524 100644
--- a/app/assets/javascripts/discourse/models/rest.js.es6
+++ b/app/assets/javascripts/discourse/models/rest.js.es6
@@ -3,7 +3,7 @@ const RestModel = Ember.Object.extend({
   isCreated: Ember.computed.equal('__state', 'created'),
   isSaving: false,
 
-  afterUpdate: Ember.K,
+  afterUpdate() { },
 
   update(props) {
     if (this.get('isSaving')) { return Ember.RSVP.reject(); }
diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6
index 0d1ef7cdac0..96086f068f9 100644
--- a/app/assets/javascripts/discourse/models/store.js.es6
+++ b/app/assets/javascripts/discourse/models/store.js.es6
@@ -297,7 +297,16 @@ export default Ember.Object.extend({
 
     if (existing) {
       delete obj.id;
-      const klass = this.register.lookupFactory('model:' + type) || RestModel;
+      let klass = this.register.lookupFactory('model:' + type);
+
+      if (klass && klass.class) {
+        klass = klass.class;
+      }
+
+      if (!klass) {
+        klass = RestModel;
+      }
+
       existing.setProperties(klass.munge(obj));
       obj.id = id;
       return existing;
diff --git a/app/assets/javascripts/discourse/models/user-posts-stream.js.es6 b/app/assets/javascripts/discourse/models/user-posts-stream.js.es6
index cd552d35dbf..6a96803bdde 100644
--- a/app/assets/javascripts/discourse/models/user-posts-stream.js.es6
+++ b/app/assets/javascripts/discourse/models/user-posts-stream.js.es6
@@ -1,6 +1,6 @@
 import { ajax } from 'discourse/lib/ajax';
 import { url } from 'discourse/lib/computed';
-import AdminPost from 'discourse/models/admin-post';
+import UserAction from 'discourse/models/user-action';
 
 export default Discourse.Model.extend({
   loaded: false,
@@ -36,7 +36,7 @@ export default Discourse.Model.extend({
 
     return ajax(this.get("url"), { cache: false }).then(function (result) {
       if (result) {
-        const posts = result.map(function (post) { return AdminPost.create(post); });
+        const posts = result.map(function (post) { return UserAction.create(post); });
         self.get("content").pushObjects(posts);
         self.setProperties({
           loaded: true,
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 2c800ff1998..5fe33977bf2 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -8,6 +8,7 @@ import mobile from 'discourse/lib/mobile';
 import { findAll } from 'discourse/models/login-method';
 import { getOwner } from 'discourse-common/lib/get-owner';
 import { userPath } from 'discourse/lib/url';
+import Composer from 'discourse/models/composer';
 
 function unlessReadOnly(method, message) {
   return function() {
@@ -58,7 +59,6 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
           reply = post ? window.location.protocol + "//" + window.location.host + post.get("url") : null;
 
       // used only once, one less dependency
-      const Composer = require('discourse/models/composer').default;
       return this.controllerFor('composer').open({
         action: Composer.PRIVATE_MESSAGE,
         usernames: recipient,
@@ -94,6 +94,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
     showCreateAccount: unlessReadOnly('handleShowCreateAccount', I18n.t("read_only_mode.login_disabled")),
 
     showForgotPassword() {
+      this.controllerFor('forgot-password').setProperties({ offerHelp: null, helpSeen: false });
       showModal('forgotPassword', { title: 'forgot_password.title' });
     },
 
diff --git a/app/assets/javascripts/discourse/routes/invites-show.js.es6 b/app/assets/javascripts/discourse/routes/invites-show.js.es6
index 9acc266ced8..10d85152580 100644
--- a/app/assets/javascripts/discourse/routes/invites-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/invites-show.js.es6
@@ -8,6 +8,8 @@ export default Discourse.Route.extend({
   model(params) {
     if (PreloadStore.get("invite_info")) {
       return PreloadStore.getAndRemove("invite_info").then(json => _.merge(params, json));
+    } else {
+      return {};
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 7f05b9f3eb8..5a2590d2792 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -218,6 +218,10 @@ const TopicRoute = Discourse.Route.extend({
 
     // We reset screen tracking every time a topic is entered
     this.screenTrack.start(model.get('id'), controller);
+
+    Ember.run.scheduleOnce('afterRender', () => {
+      this.appEvents.trigger('header:update-topic', model);
+    });
   }
 
 });
diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
index 4fbf8e4300c..13fe328d302 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
@@ -19,26 +19,9 @@ export default Discourse.Route.extend(ViewingActionType, {
   },
 
   actions: {
-
     didTransition() {
       this.controllerFor("user-activity")._showFooter();
       return true;
-    },
-
-    removeBookmark(userAction) {
-      var user = this.modelFor("user");
-      Discourse.Post.updateBookmark(userAction.get("post_id"), false)
-        .then(function() {
-          // remove the user action from the stream
-          user.get("stream").remove(userAction);
-          // update the counts
-          user.get("stats").forEach(function (stat) {
-            if (stat.get("action_type") === userAction.action_type) {
-              stat.decrementProperty("count");
-            }
-          });
-        });
-    },
-
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs
new file mode 100644
index 00000000000..09e841bd85b
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs
@@ -0,0 +1,12 @@
+{{#if site.mobileView}}
+  {{flat-button
+    class="toggle-toolbar"
+    icon="bars"
+    action=toggleToolbar}}
+{{/if}}
+
+{{flat-button
+  class="toggler"
+  icon=toggleIcon
+  action=toggleComposer
+  title='composer.toggler'}}
diff --git a/app/assets/javascripts/discourse/templates/components/cook-text.hbs b/app/assets/javascripts/discourse/templates/components/cook-text.hbs
new file mode 100644
index 00000000000..1732a781917
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/cook-text.hbs
@@ -0,0 +1 @@
+{{cooked}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index 47b714b8dc1..e01a9bb5c82 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -2,5 +2,8 @@
   {{fa-icon icon}}
 {{/if}}
 
-{{{translatedLabel}}}
+{{#if translatedLabel}}
+  <span class='d-button-label'>{{{translatedLabel}}}</span>
+{{/if}}
+
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index dacde9aa740..961b63c6efd 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -30,5 +30,8 @@
     <div class="d-editor-preview">
       {{{preview}}}
     </div>
+    {{plugin-outlet name="editor-preview"}}
   </div>
 </div>
+
+{{emoji-picker active=emojiPickerIsActive emojiSelected=(action 'emojiSelected')}}
diff --git a/app/assets/javascripts/discourse/templates/components/date-picker.hbs b/app/assets/javascripts/discourse/templates/components/date-picker.hbs
index d49379d954b..6e6054c2ad1 100644
--- a/app/assets/javascripts/discourse/templates/components/date-picker.hbs
+++ b/app/assets/javascripts/discourse/templates/components/date-picker.hbs
@@ -1 +1 @@
-{{input type="text" class="date-picker" placeholder=placeholder}}
+{{input type="text" class="date-picker" placeholder=placeholder value=value}}
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
new file mode 100644
index 00000000000..21f80d62367
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
@@ -0,0 +1 @@
+<div class='emoji-picker'></div>
diff --git a/app/assets/javascripts/discourse/templates/components/expand-post.hbs b/app/assets/javascripts/discourse/templates/components/expand-post.hbs
new file mode 100644
index 00000000000..4d3192668d1
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/expand-post.hbs
@@ -0,0 +1,5 @@
+{{#if item.truncated}}
+  <a class="expand-item" href {{action "expandItem"}} title={{i18n "post.expand_collapse"}}>
+    {{fa-icon "chevron-down"}}
+  </a>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/flat-button.hbs b/app/assets/javascripts/discourse/templates/components/flat-button.hbs
new file mode 100644
index 00000000000..41ee1dc6407
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/flat-button.hbs
@@ -0,0 +1 @@
+{{fa-icon icon}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
index c720c630f53..24db7b5c877 100644
--- a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
@@ -1,14 +1,17 @@
 <label>{{i18n 'groups.members'}} ({{model.user_count}})</label>
-<div>
-  <a class="previous {{if showingFirst 'disabled'}}" {{action "previous"}}>{{fa-icon "fast-backward"}}</a>
-  {{currentPage}}/{{totalPages}}
-  <a class="next {{if showingLast 'disabled'}}" {{action "next"}}>{{fa-icon "fast-forward"}}</a>
-</div>
-<div class="ac-wrap clearfix">
-  {{#each model.members as |member|}}
-    {{group-member member=member automatic=model.automatic removeAction="removeMember"}}
-  {{/each}}
-</div>
+
+{{#if model.members}}
+  <div>
+    <a class="previous {{if showingFirst 'disabled'}}" {{action "previous"}}>{{fa-icon "fast-backward"}}</a>
+    {{currentPage}}/{{totalPages}}
+    <a class="next {{if showingLast 'disabled'}}" {{action "next"}}>{{fa-icon "fast-forward"}}</a>
+  </div>
+  <div class="ac-wrap clearfix">
+    {{#each model.members as |member|}}
+      {{group-member member=member automatic=model.automatic removeAction="removeMember"}}
+    {{/each}}
+  </div>
+{{/if}}
 
 {{#unless model.automatic}}
   <div class="group-members-input-selector">
diff --git a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
index 0bb4ff804cc..ed17b2a79bd 100644
--- a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
@@ -24,10 +24,13 @@
   {{else}}
     {{d-button action="requestMembership"
         class="group-index-request"
+        disabled=loading
         icon="envelope"
-        label="groups.request"
-        title=requestMembershipButtonTitle
-        disabled=disableRequestMembership}}
+        label="groups.request"}}
+
+    {{#if loading}}
+      {{loading-spinner size="small"}}
+    {{/if}}
   {{/if}}
 {{else}}
   {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs b/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs
deleted file mode 100644
index a67a93d4e59..00000000000
--- a/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-{{#load-more selector=".user-stream .item" action="loadMore"}}
-  <div class='user-stream'>
-    {{#each posts as |post|}}
-      {{group-post post=post}}
-    {{else}}
-      <div>{{i18n emptyText}}</div>
-    {{/each}}
-  </div>
-{{/load-more}}
-
-{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs
index 09ac259ce27..bd7f867e86f 100644
--- a/app/assets/javascripts/discourse/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs
@@ -2,6 +2,7 @@
   <div class='clearfix info'>
     <a href="{{unbound post.user.userUrl}}" data-user-card="{{unbound post.user.username}}" class='avatar-link'><div class='avatar-wrapper'>{{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
     <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span>
+    {{expand-post item=post}}
     <span class="title">
       <a href={{post.url}}>{{{post.topic.fancyTitle}}}</a>
     </span>
@@ -13,6 +14,6 @@
     </div>
   </div>
   <p class='excerpt'>
-  {{{unbound post.excerpt}}}
+  {{{post.excerpt}}}
   </p>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/queued-post.hbs b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
index 6ddd37b864a..4b094fdb210 100644
--- a/app/assets/javascripts/discourse/templates/components/queued-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
@@ -34,7 +34,7 @@
       {{#if editing}}
         {{d-editor value=buffered.raw}}
       {{else}}
-        {{{cook-text post.raw}}}
+        {{cook-text post.raw}}
       {{/if}}
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
index 71a9c1b6198..e3ac643ec64 100644
--- a/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
@@ -41,6 +41,9 @@
       <label class="control-label" for="search-with-tags">{{i18n "search.advanced.with_tags.label"}}</label>
       <div class="controls">
         {{tag-chooser tags=searchedTerms.tags blacklist=searchedTerms.tags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true" width="70%"}}
+      <section class="field">
+          <label>{{ input type="checkbox" class="all-tags" checked=searchedTerms.special.all_tags}} {{i18n "search.advanced.filters.all_tags"}} </label>
+      </section>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/stream-item.hbs b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
index fed530753ef..ea3c9dcec98 100644
--- a/app/assets/javascripts/discourse/templates/components/stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
@@ -1,11 +1,21 @@
 <div class='clearfix info'>
   <a href={{item.userUrl}} data-user-card={{item.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
   <span class='time'>{{format-date item.created_at}}</span>
+  {{expand-post item=item}}
   {{topic-status topic=item disableActions=true}}
   <span class="title">
     <a href={{item.postUrl}}>{{{item.title}}}</a>
   </span>
   <div class="category">{{category-link item.category}}</div>
+
+  {{#if item.deleted_by}}
+    <span class="delete-info">
+      {{fa-icon "trash-o"}}
+      {{avatar item.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
+      {{format-date item.deleted_at leaveAgo="true"}}
+    </span>
+  {{/if}}
+
   {{plugin-outlet name="user-stream-item-header" args=(hash item=item)}}
 </div>
 
@@ -20,7 +30,7 @@
     <i class="icon {{child.icon}}"></i>
     {{#each child.items as |grandChild|}}
       {{#if grandChild.removableBookmark}}
-        <button class="btn btn-default remove-bookmark" {{action "removeBookmark" grandChild}}>
+        <button class="btn btn-default remove-bookmark" {{action removeBookmark grandChild}}>
           {{fa-icon 'times'}} {{i18n "bookmarks.remove"}}
         </button>
       {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
index 1e2dfce6ccb..e368600dda8 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-progress.hbs
@@ -1,3 +1,7 @@
+{{#unless hideProgress}}
+  {{yield}}
+{{/unless}}
+
 {{#if showBackButton}}
   <div class='progress-back-container'>
     {{d-button label="topic.timeline.back" class="btn-primary progress-back" action="goBack" icon="arrow-down"}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-title.hbs b/app/assets/javascripts/discourse/templates/components/topic-title.hbs
new file mode 100644
index 00000000000..8cea0f5c6cc
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/topic-title.hbs
@@ -0,0 +1,6 @@
+<div class="container">
+  <div class="title-wrapper">
+    {{yield}}
+  </div>
+  {{plugin-outlet name="topic-title" args=(hash model=model)}}
+</div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
index 5db0b43bb53..ad7f851e2c7 100644
--- a/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-fields/confirm.hbs
@@ -1,3 +1,3 @@
 <div class='controls'>
-  <label class="control-label">{{input checked=value type="checkbox"}} {{{field.description}}}</label>
+  <label class="control-label checkbox-label">{{input checked=value type="checkbox"}} {{{field.description}}}</label>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/user-stream.hbs b/app/assets/javascripts/discourse/templates/components/user-stream.hbs
new file mode 100644
index 00000000000..31783b50bdd
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-stream.hbs
@@ -0,0 +1,3 @@
+{{#each stream.content as |item|}}
+  {{stream-item item=item removeBookmark=(action "removeBookmark")}}
+{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 9e20fd73309..24912fed6be 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -22,10 +22,10 @@
       {{composer-messages composer=model messageCount=messageCount addLinkLookup="addLinkLookup"}}
 
       <div class='control'>
-        {{#if site.mobileView}}
-          <a href class='toggle-toolbar' {{action "toggleToolbar" bubbles=false}}></a>
-        {{/if}}
-        <a href class='toggler' {{action "toggle" bubbles=false}} title={{i18n 'composer.toggler'}}></a>
+        {{composer-toggles
+          composeState=model.composeState
+          toggleComposer=(action "toggle")
+          toggleToolbar=(action "toggleToolbar")}}
 
         {{#if model.viewOpen}}
           <div class='control-row reply-area'>
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker-recent.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-picker-recent.raw.hbs
new file mode 100644
index 00000000000..0ead5e5aee5
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/emoji-picker-recent.raw.hbs
@@ -0,0 +1,3 @@
+{{#each recentEmojis as |emoji|}}
+  <button style="background-image: url('{{emoji.src}}')" type="button" class="emoji" tabindex="-1" title="{{emoji.code}}"></button>
+{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb b/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
new file mode 100644
index 00000000000..74c0327485b
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
@@ -0,0 +1,75 @@
+<div class='categories-column'>
+  <div class='category-icon'>
+    <button type="button" class="emoji" tabindex="-1" title="{{i18n 'emoji_picker.recent'}}" data-section="recent" data-tabicon="star"></button>
+  </div>
+
+  <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
+    <div class='category-icon'>
+      <button type="button" class="emoji" tabindex="-1" data-tabicon="<%= group["tabicon"] %>" data-section="<%= group["name"] %>" title="<%= group["fullname"] %>"></button>
+    </div>
+  <% end %>
+
+  <% if !Emoji.custom.blank? %>
+    <div class='category-icon'>
+      <button data-tabicon="<%= Emoji.custom.first.name %>" type="button" class="emoji" tabindex="-1" data-section="ungrouped" title="{{i18n 'emoji_picker.custom'}}"></button>
+    </div>
+  <% end %>
+</div>
+
+<div class='main-column'>
+  <div class='filter'>
+    {{fa-icon 'search'}}
+    <input type='text' name="filter" placeholder="{{i18n 'emoji_picker.filter_placeholder'}}" autocomplete="off" autofocus/>
+    <button class='clear-filter'>
+      {{fa-icon 'times'}}
+    </button>
+  </div>
+
+  <div class='results'></div>
+
+  <div class='list'>
+    <div class='section' data-section='recent'>
+      <div class='section-header'>
+        <span class="title">{{i18n 'emoji_picker.recent'}}</span>
+        <a href='#' class='clear-recent'>{{fa-icon 'trash'}}</a>
+      </div>
+      <div class='section-group'></div>
+    </div>
+
+    <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
+      <div class='section' data-section='<%= group["name"] %>'>
+        <div class='section-header'>
+          <span class="title">{{i18n 'emoji_picker.<%= group["name"] %>'}}</span>
+        </div>
+        <div class='section-group'>
+          <% group["icons"].each  do |icon| %>
+            <button type="button" class="emoji <%= "diversity" if icon["diversity"] %>" tabindex="-1" title="<%= icon['name']%>"></button>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    {{#if customEmojis.length}}
+      <div class='section' data-section='ungrouped'>
+        <div class='section-header'>
+          <span class="title">{{i18n 'emoji_picker.custom'}}</span>
+        </div>
+        <div class='section-group'>
+          {{#each customEmojis as |emoji|}}
+            <button style="background-url: url("{{emoji.src}}")" type="button" class="emoji" tabindex="-1" title="{{emoji.code}}"></button>
+          {{/each}}
+        </div>
+      </div>
+    {{/if}}
+  </div>
+  <div class='footer'>
+    <div class='info'></div>
+    <div class='diversity-picker'>
+      <% ['default', 'light', 'medium-light', 'medium', 'medium-dark', 'dark'].each.with_index do |diversity, index| %>
+        <a href='#' title="{{i18n 'emoji_picker.<%= diversity.gsub('-', '_') %>_tone'}}" class='diversity-scale <%= diversity %>' data-level="<%= index + 1 %>">
+          {{fa-icon "check"}}
+        </a>
+      <% end %>
+    </div>
+  </div>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
deleted file mode 100644
index b7e39bb37ba..00000000000
--- a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class='emoji-modal {{modalClass}}'>
-  <ul class='toolbar'>
-    {{#each toolbarItems as |item|}}<li><a title='{{item.title}}' {{#if item.selected}}class='selected'{{/if}} data-group-id='{{item.groupId}}'><img src='{{item.src}}' class='emoji'></a></li>{{/each}}
-  </ul>
-  <div class='emoji-table-wrapper'>
-  <table class='emoji-page'>
-    {{#each rows as |row|}}
-      <tr>
-        {{#each row as |item|}}
-          <td><a title='{{item.title}}'><img src='{{item.src}}' class='emoji'></a></td>
-        {{/each}}
-      </tr>
-    {{/each}}
-  </table>
-  </div>
-
-  <div class='info'></div>
-  <div class='nav'>
-    <span class='prev'>
-      {{#if prevDisabled}}
-        {{fa-icon "fast-backward"}}
-      {{else}}
-        <a>{{fa-icon "fast-backward"}}</a>
-      {{/if}}
-    </span>
-    <span class='next'>
-      {{#if nextDisabled}}
-        {{fa-icon "fast-forward"}}
-      {{else}}
-        <a>{{fa-icon "fast-forward"}}</a>
-      {{/if}}
-    </span>
-  </div>
-  <div class='clearfix'></div>
-</div>
diff --git a/app/assets/javascripts/discourse/templates/flat-button.raw.hbs b/app/assets/javascripts/discourse/templates/flat-button.raw.hbs
new file mode 100644
index 00000000000..74384745a80
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/flat-button.raw.hbs
@@ -0,0 +1,3 @@
+<button class='btn-flat {{class}}' title='{{i18n "topics.bulk.toggle"}}'>
+  {{fa-icon icon}}
+</button>
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index bfeab09cfe2..e3962efe12f 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -107,7 +107,7 @@
             </span>
 
             {{#if result.blurb}}
-              {{#highlight-text highlight=q}}
+              {{#highlight-text highlight=highlightQuery}}
                 {{{unbound result.blurb}}}
               {{/highlight-text}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
index 7dbeebb3007..fd8a69a47dd 100644
--- a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
@@ -1 +1,11 @@
-{{group-post-stream posts=model emptyText=emptyText loadMore="loadMore" loading=loading}}
+{{#load-more selector=".user-stream .item" action=(action "loadMore")}}
+  <div class='user-stream'>
+    {{#each model as |post|}}
+      {{group-post post=post}}
+    {{else}}
+      <div>{{i18n emptyText}}</div>
+    {{/each}}
+  </div>
+{{/load-more}}
+
+{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 95fcabb36a7..24afa5a0c70 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -43,9 +43,7 @@
         {{/each}}
       {{/mobile-nav}}
 
-      {{group-membership-button model=model
-        createNewMessageViaParams='createNewMessageViaParams'
-        showLogin='showLogin'}}
+      {{group-membership-button model=model showLogin='showLogin'}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/templates/groups.hbs b/app/assets/javascripts/discourse/templates/groups.hbs
index 98faa7e4174..296324e7737 100644
--- a/app/assets/javascripts/discourse/templates/groups.hbs
+++ b/app/assets/javascripts/discourse/templates/groups.hbs
@@ -45,7 +45,6 @@
 
                 <td>
                   {{#group-membership-button model=group
-                      createNewMessageViaParams='createNewMessageViaParams'
                       showMembershipStatus=true
                       groupUserIds=groups.extras.group_user_ids
                       showLogin='showLogin'}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 5822156abd8..69f3611a790 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -23,26 +23,36 @@
         </p>
 
         <form>
-          <label>{{i18n 'user.username.title'}}</label>
           <div class="input username-input">
+            <label>{{i18n 'user.username.title'}}</label>
             {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="off"}}
             &nbsp;{{input-tip validation=usernameValidation id="username-validation"}}
+            <div class="instructions">{{i18n 'user.username.instructions'}}</div>
           </div>
 
-          <label>{{nameLabel}}</label>
           <div class="input name-input">
+            <label>{{i18n 'invites.name_label'}}</label>
             {{input value=accountName id="new-account-name" name="name"}}
+            <div class="instructions">{{nameInstructions}}</div>
           </div>
 
-          <label>{{i18n 'invites.password_label'}}</label>
           <div class="input password-input">
+            <label>{{i18n 'invites.password_label'}}</label>
             {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
             &nbsp;{{input-tip validation=passwordValidation}}
+            <div class="instructions">
+              {{passwordInstructions}} {{i18n 'invites.optional_description'}}
+              <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div>
+            </div>
           </div>
 
-          <div class="instructions">
-            <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div>
-          </div>
+          {{#if userFields}}
+            <div class='user-fields'>
+              {{#each userFields as |f|}}
+                {{user-field field=f.field value=f.value}}
+              {{/each}}
+            </div>
+          {{/if}}
 
           <button class='btn btn-primary' {{action "submit"}} disabled={{submitDisabled}}>{{i18n 'invites.accept_invite'}}</button>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
index 8668ba43a1b..6a1b4c24bee 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-timer.hbs
@@ -13,13 +13,16 @@
       {{else if publishToCategory}}
         <div class="control-group">
           <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
-          {{category-chooser valueAttribute="id" value=categoryId excludeCategoryId=excludeCategoryId}}
+          {{category-chooser
+              valueAttribute="id"
+              value=topicTimer.category_id
+              excludeCategoryId=excludeCategoryId}}
         </div>
 
         {{auto-update-input
             input=updateTime
             statusType=selection
-            categoryId=categoryId
+            categoryId=topicTimer.category_id
             basedOnLastPost=false}}
       {{else if autoClose}}
         {{auto-update-input
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 8a8db45cce2..c739f771979 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -1,9 +1,27 @@
 <form>
-  {{#d-modal-body}}
-    <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
-    {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
+  {{#d-modal-body class="forgot-password-modal"}}
+    {{#unless offerHelp}}
+      <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
+      {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
+    {{else}}
+      {{{offerHelp}}}
+    {{/unless}}
   {{/d-modal-body}}
   <div class="modal-footer">
-    <button class='btn btn-large btn-primary' disabled={{submitDisabled}} {{action "submit"}}>{{i18n 'forgot_password.reset'}}</button>
+    {{#unless offerHelp}}
+      {{d-button action="submit"
+	               label="forgot_password.reset"
+	               disabled=submitDisabled
+	               class="btn-primary"}}
+    {{else}}
+      {{d-button class="btn-large btn-primary"
+                 label="forgot_password.button_ok"
+                 action="ok"}}
+      {{#unless helpSeen}}
+        {{d-button class="btn-large"
+                   label="forgot_password.button_help"
+                   action="help"}}
+      {{/unless}}
+    {{/unless}}
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
index a324ccebc71..567e484a995 100644
--- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
@@ -7,6 +7,11 @@
     {{categories-admin-dropdown}}
   {{/if}}
   {{#if canCreateTopic}}
-    <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
+    {{d-button
+      id="create-topic"
+      action="createTopic"
+      icon="plus"
+      label="topic.create"
+    }}
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index a4e9aebda1a..4086eb489fe 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -12,8 +12,7 @@
 <div class='category-navigation'>
   {{bread-crumbs categories=categories
                  category=category
-                 noSubcategories=noSubcategories
-                 hideSubcategories=showingSubcategoryList}}
+                 noSubcategories=noSubcategories}}
 
   {{navigation-bar navItems=navItems filterMode=filterMode category=category}}
 
diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs
index c8cc96a9e73..07fb2f693db 100644
--- a/app/assets/javascripts/discourse/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs
@@ -4,6 +4,6 @@
   {{navigation-bar navItems=navItems filterMode=filterMode}}
 
   {{#if canCreateTopic}}
-    <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
+    <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i><span>{{i18n 'topic.create'}}</span></button>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/templates/preferences-username.hbs
index ae27149d9d2..fc68eccedc8 100644
--- a/app/assets/javascripts/discourse/templates/preferences-username.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-username.hbs
@@ -7,14 +7,6 @@
       </div>
     </div>
 
-    {{#if error}}
-      <div class="control-group">
-        <div class="instructions">
-          <div class='alert alert-error'>{{i18n 'user.change_username.error'}}</div>
-        </div>
-      </div>
-    {{/if}}
-
     <div class="control-group">
       <label class="control-label">{{i18n 'user.username.title'}}</label>
       <div class="controls">
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 194b9ef3bcf..5ad165da8cb 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -24,8 +24,7 @@
       {{bread-crumbs categories=categories
                      category=category
                      tagId=tag.id
-                     noSubcategories=noSubcategories
-                     hideSubcategories=showingSubcategoryList}}
+                     noSubcategories=noSubcategories}}
 
       {{navigation-bar navItems=navItems filterMode=filterMode}}
     {{else}}
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs
index ab53f6f29cf..7d7b6b62bb3 100644
--- a/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs
@@ -1,12 +1,14 @@
 <th data-sort-order='{{order}}' class='{{view.className}}'>
-  {{~#if showBulkToggle}}
-      <button class='btn bulk-select' title='{{i18n "topics.bulk.toggle"}}'><i class='fa fa-list'></i></button>
-  {{/if ~}}
-  {{~#if bulkSelectEnabled}}
-    <span class='bulk-select-topics'>
-      <button class='btn bulk-select-all'>{{i18n "topics.bulk.select_all"}}</button>
-      <button class='btn bulk-clear-all'>{{i18n "topics.bulk.clear_all"}}</button>
-    </span>
+  {{~#if canBulkSelect}}
+    {{~#if showBulkToggle}}
+      {{raw "flat-button" class="bulk-select" icon="list" title="topics.bulk.toggle"}}
+    {{/if ~}}
+    {{~#if bulkSelectEnabled}}
+      <span class='bulk-select-topics'>
+        <button class='btn bulk-select-all'>{{i18n "topics.bulk.select_all"}}</button>
+        <button class='btn bulk-clear-all'>{{i18n "topics.bulk.clear_all"}}</button>
+      </span>
+    {{/if ~}}
   {{/if ~}}
   {{view.localizedName}}
   {{~#if view.isSorting}}
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
index e5d1f506d6d..9f4646b3ad3 100644
--- a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
@@ -1,9 +1,11 @@
 {{#if bulkSelectEnabled}}
   <th class='star'>
-    <button class='btn bulk-select' title='{{i18n "topics.bulk.toggle"}}'><i class='fa fa-list'></i></button>
+    {{#if canBulkSelect}}
+      {{raw "flat-button" class="bulk-select" icon="list" title="topics.bulk.toggle"}}
+    {{/if}}
   </th>
 {{/if}}
-{{raw "topic-list-header-column" order='default' name='topic.title' bulkSelectEnabled=bulkSelectEnabled showBulkToggle=toggleInTitle}}
+{{raw "topic-list-header-column" order='default' name='topic.title' bulkSelectEnabled=bulkSelectEnabled showBulkToggle=toggleInTitle canBulkSelect=canBulkSelect}}
 {{#unless hideCategory}}
   {{raw "topic-list-header-column" sortable=sortable order='category' name='category_title'}}
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 24f49509826..aa0627534b5 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -10,59 +10,53 @@
 
   {{#if model.postStream.loaded}}
     {{#if model.postStream.firstPostPresent}}
-      <div id="topic-title">
-        <div class="container">
+      {{#topic-title cancelled="cancelEditingTopic" save="finishedEditingTopic" model=model}}
+        {{#if editingTopic}}
+          {{#if model.isPrivateMessage}}
+            <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
+          {{/if}}
 
-          <div class="title-wrapper">
-            {{#if editingTopic}}
-              {{#if model.isPrivateMessage}}
+          {{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}}
+          {{#if showCategoryChooser}}
+            <br>
+            {{category-chooser valueAttribute="id" value=buffered.category_id}}
+          {{/if}}
+
+          {{#if canEditTags}}
+            <br>
+            {{tag-chooser tags=buffered.tags categoryId=buffered.category_id}}
+          {{/if}}
+
+          {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
+
+          <br>
+          {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}}
+          {{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}}
+        {{else}}
+          <h1>
+            {{#unless model.is_warning}}
+              <a href={{pmPath}}>
                 <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
-              {{/if}}
+              </a>
+            {{/unless}}
 
-              {{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}}
-              {{#if showCategoryChooser}}
-                <br>
-                {{category-chooser valueAttribute="id" value=buffered.category_id}}
-              {{/if}}
-
-              {{#if canEditTags}}
-                <br>
-                {{tag-chooser tags=buffered.tags categoryId=buffered.category_id}}
-              {{/if}}
-
-              {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
-
-              <br>
-              {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}}
-              {{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}}
-            {{else}}
-              <h1>
-                {{#unless model.is_warning}}
-                  <a href={{pmPath}}>
-                    <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
-                  </a>
-                {{/unless}}
-
-                {{#if model.details.loaded}}
-                  {{topic-status topic=model}}
-                  <a href="{{unbound model.url}}" {{action "jumpTop"}} class="fancy-title">
-                    {{{model.fancyTitle}}}
-                  </a>
-                {{/if}}
-
-                {{#if model.details.can_edit}}
-                  <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{fa-icon "pencil"}}</a>
-                {{/if}}
-              </h1>
-
-              {{#unless model.isPrivateMessage}}
-                {{topic-category topic=model class="topic-category"}}
-              {{/unless}}
+            {{#if model.details.loaded}}
+              {{topic-status topic=model}}
+              <a href="{{unbound model.url}}" {{action "jumpTop"}} class="fancy-title">
+                {{{model.fancyTitle}}}
+              </a>
             {{/if}}
-          </div>
-          {{plugin-outlet name="topic-title" args=(hash model=model)}}
-        </div>
-      </div>
+
+            {{#if model.details.can_edit}}
+              <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{fa-icon "pencil"}}</a>
+            {{/if}}
+          </h1>
+
+          {{#unless model.isPrivateMessage}}
+            {{topic-category topic=model class="topic-category"}}
+          {{/unless}}
+        {{/if}}
+      {{/topic-title}}
     {{/if}}
 
     <div class="container posts">
@@ -71,24 +65,24 @@
       </div>
 
       {{#topic-navigation topic=model jumpToIndex=(action "jumpToIndex") as |info|}}
-        {{#if info.renderAdminMenuButton}}
-          {{topic-admin-menu-button
-            topic=model
-            fixed="true"
-            toggleMultiSelect=(action "toggleMultiSelect")
-            deleteTopic=(action "deleteTopic")
-            recoverTopic=(action "recoverTopic")
-            toggleClosed=(action "toggleClosed")
-            toggleArchived=(action "toggleArchived")
-            toggleVisibility=(action "toggleVisibility")
-            showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
-            showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
-            showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
-            convertToPublicTopic=(action "convertToPublicTopic")
-            convertToPrivateMessage=(action "convertToPrivateMessage")}}
-        {{/if}}
-
         {{#if info.renderTimeline}}
+          {{#if info.renderAdminMenuButton}}
+            {{topic-admin-menu-button
+              topic=model
+              fixed="true"
+              toggleMultiSelect=(action "toggleMultiSelect")
+              deleteTopic=(action "deleteTopic")
+              recoverTopic=(action "recoverTopic")
+              toggleClosed=(action "toggleClosed")
+              toggleArchived=(action "toggleArchived")
+              toggleVisibility=(action "toggleVisibility")
+              showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
+              showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
+              showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
+              convertToPublicTopic=(action "convertToPublicTopic")
+              convertToPrivateMessage=(action "convertToPrivateMessage")}}
+          {{/if}}
+
           {{topic-timeline
             topic=model
             prevEvent=info.prevEvent
@@ -113,11 +107,29 @@
             convertToPublicTopic=(action "convertToPublicTopic")
             convertToPrivateMessage=(action "convertToPrivateMessage")}}
         {{else}}
-          {{topic-progress
+          {{#topic-progress
             prevEvent=info.prevEvent
             topic=model
             expanded=info.topicProgressExpanded
             jumpToPost=(action "jumpToPost")}}
+            {{#if info.renderAdminMenuButton}}
+              {{topic-admin-menu-button
+                topic=model
+                openUpwards="true"
+                rightSide="true"
+                toggleMultiSelect=(action "toggleMultiSelect")
+                deleteTopic=(action "deleteTopic")
+                recoverTopic=(action "recoverTopic")
+                toggleClosed=(action "toggleClosed")
+                toggleArchived=(action "toggleArchived")
+                toggleVisibility=(action "toggleVisibility")
+                showTopicStatusUpdate=(action "topicRouteAction" "showTopicStatusUpdate")
+                showFeatureTopic=(action "topicRouteAction" "showFeatureTopic")
+                showChangeTimestamp=(action "topicRouteAction" "showChangeTimestamp")
+                convertToPublicTopic=(action "convertToPublicTopic")
+                convertToPrivateMessage=(action "convertToPrivateMessage")}}
+            {{/if}}
+          {{/topic-progress}}
         {{/if}}
       {{/topic-navigation}}
 
@@ -206,7 +218,7 @@
                     replyToPost=(action "replyToPost")
                     }}
                 {{else}}
-                  <div id="topic-footer-button">
+                  <div id="topic-footer-buttons">
                     {{d-button icon="reply" class="btn-primary pull-right" action="showLogin" label="topic.reply.title"}}
                   </div>
                 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 0a78d6e64fe..12a26aa3a0c 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -19,7 +19,12 @@
                 {{csv-uploader uploading=uploading}}
                 <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" target="_blank" style="color:black;">{{fa-icon "question-circle"}}</a>
               {{/if}}
-              {{#if showReinviteAllButton}}
+              {{#if showBulkActionButtons}}
+                {{#if rescindedAll}}
+                  {{i18n 'user.invited.rescinded_all'}}
+                {{else}}
+                  {{d-button icon="times" action="rescindAll" class="btn" label="user.invited.rescind_all"}}
+                {{/if}}
                 {{#if reinvitedAll}}
                   {{i18n 'user.invited.reinvited_all'}}
                 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
index 6ce1c117058..355e4aee776 100644
--- a/app/assets/javascripts/discourse/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/templates/user-topics-list.hbs
@@ -3,10 +3,8 @@
                      hideCategory=hideCategory
                      showParticipants=showParticipants
                      showPosters=showPosters
-                     canBulkSelect=canBulkSelect
                      bulkSelectEnabled=bulkSelectEnabled
-                     selected=selected
-                     skipHeader=true}}
+                     selected=selected}}
 
   {{conditional-loading-spinner condition=model.loadingMore}}
 {{/load-more}}
diff --git a/app/assets/javascripts/discourse/templates/user/posts.hbs b/app/assets/javascripts/discourse/templates/user/posts.hbs
index 08fc6f5f275..b1743bf0771 100644
--- a/app/assets/javascripts/discourse/templates/user/posts.hbs
+++ b/app/assets/javascripts/discourse/templates/user/posts.hbs
@@ -1,30 +1 @@
-{{#user-stream stream=model}}
-  {{#each model.content as |p|}}
-    <div class="item {{if p.hidden 'hidden'}} {{if p.deleted 'deleted'}} {{if p.moderator_action 'moderator-action'}}">
-      <div class="clearfix info">
-        <a href="{{unbound p.usernameUrl}}" class="avatar-link">
-          <div class="avatar-wrapper">
-            {{avatar p imageSize="large" extraClasses="actor" ignoreTitle="true"}}
-          </div>
-        </a>
-        <span class="time">
-          {{format-date p.created_at leaveAgo="true"}}
-        </span>
-        <span class="title">
-          <a href="{{unbound p.url}}">{{unbound p.topic_title}}</a>
-        </span>
-        <span class="category">
-          {{category-link p.category}}
-        </span>
-        {{#if p.deleted}}
-          <span class="delete-info">
-            <i class="fa fa-trash-o"></i> {{avatar p.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{format-date p.deleted_at leaveAgo="true"}}
-          </span>
-        {{/if}}
-      </div>
-      <p class="excerpt">
-        {{{p.excerpt}}}
-      </p>
-    </div>
-  {{/each}}
-{{/user-stream}}
+{{user-stream stream=model}}
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index 220ae57ba8a..2801c293baf 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -3,8 +3,4 @@
     {{{model.noContentHelp}}}
   </div>
 {{/if}}
-{{#user-stream stream=model}}
-  {{#each model.content as |item|}}
-    {{stream-item item=item removeBookmark="removeBookmark"}}
-  {{/each}}
-{{/user-stream}}
+{{user-stream stream=model}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 679bd102596..19150c2be89 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -139,7 +139,7 @@
     </div>
   </div>
 
-  <div class='top-section'>
+  <div class='top-section most-liked-section'>
     <div class='top-sub-section likes-section pull-left'>
       <h3 class='stats-title'>{{i18n "user.summary.most_liked_by"}}</h3>
       {{#if model.most_liked_by_users.length}}
diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6
index f3893f1f696..0fd705e7974 100644
--- a/app/assets/javascripts/discourse/widgets/button.js.es6
+++ b/app/assets/javascripts/discourse/widgets/button.js.es6
@@ -1,7 +1,8 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { iconNode } from 'discourse/helpers/fa-icon-node';
 
-export default createWidget('button', {
+
+const ButtonClass = {
   tagName: 'button.widget-button',
 
   buildClasses(attrs) {
@@ -59,4 +60,10 @@ export default createWidget('button', {
     }
     return this.sendWidgetAction(attrs.action);
   }
-});
+};
+
+export default createWidget('button', ButtonClass);
+
+createWidget('flat-button', jQuery.extend(ButtonClass, {
+  tagName: 'button.widget-button.btn-flat'
+}));
diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6
index 6351bc0710b..ef126fe152b 100644
--- a/app/assets/javascripts/discourse/widgets/glue.js.es6
+++ b/app/assets/javascripts/discourse/widgets/glue.js.es6
@@ -1,5 +1,6 @@
 import { diff, patch } from 'virtual-dom';
 import { queryRegistry } from 'discourse/widgets/widget';
+import DirtyKeys from 'discourse/lib/dirty-keys';
 
 export default class WidgetGlue {
 
@@ -9,6 +10,7 @@ export default class WidgetGlue {
     this.register = register;
     this.attrs = attrs;
     this._timeout = null;
+    this.dirtyKeys = new DirtyKeys(name);
 
     this._widgetClass = queryRegistry(name) || this.register.lookupFactory(`widget:${name}`);
     if (!this._widgetClass) {
@@ -27,7 +29,11 @@ export default class WidgetGlue {
 
   rerenderWidget() {
     Ember.run.cancel(this._timeout);
-    const newTree = new this._widgetClass(this.attrs, this.register);
+    const newTree = new this._widgetClass(
+      this.attrs,
+      this.register,
+      { dirtyKeys: this.dirtyKeys }
+    );
     const patches = diff(this._tree || this._rootNode, newTree);
 
     newTree._rerenderable = this;
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index 5b67b1bda34..4c8df62ae5c 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -4,6 +4,7 @@ import { avatarImg } from 'discourse/widgets/post';
 import DiscourseURL from 'discourse/lib/url';
 import { wantsNewWindow } from 'discourse/lib/intercept-click';
 import { applySearchAutocomplete } from "discourse/lib/search";
+import { ajax } from 'discourse/lib/ajax';
 
 import { h } from 'virtual-dom';
 
@@ -249,7 +250,29 @@ export default createWidget('header', {
   },
 
   linkClickedEvent(attrs) {
-    if (!(attrs && attrs.searchContextEnabled)) this.closeAll();
+
+    let searchContextEnabled = false;
+    if (attrs) {
+      searchContextEnabled = attrs.searchContextEnabled;
+
+      const { searchLogId, searchResultId, searchResultType } = attrs;
+      if (searchLogId && searchResultId && searchResultType) {
+
+        ajax('/search/click', {
+          type: 'POST',
+          data: {
+            search_log_id: searchLogId,
+            search_result_id: searchResultId,
+            search_result_type: searchResultType
+          }
+        });
+      }
+    }
+
+    if (!searchContextEnabled) {
+      this.closeAll();
+    }
+
     this.updateHighlight();
   },
 
@@ -282,7 +305,10 @@ export default createWidget('header', {
   },
 
   toggleUserMenu() {
-    this.state.ringBackdrop = false;
+    if (this.currentUser.get('read_first_notification')) {
+      this.state.ringBackdrop = false;
+    };
+
     this.state.userVisible = !this.state.userVisible;
   },
 
@@ -303,8 +329,12 @@ export default createWidget('header', {
 
     // If we're viewing a topic, only intercept search if there are cloaked posts
     if (showSearch && currentPath.match(/^topic\./)) {
-      showSearch = ($('.topic-post .cooked, .small-action:not(.time-gap)').length <
-                    this.register.lookup('controller:topic').get('model.postStream.stream.length'));
+      const controller = this.register.lookup('controller:topic');
+      const total = controller.get('model.postStream.stream.length') || 0;
+      const chunkSize = controller.get('model.chunk_size') || 0;
+
+      showSearch = (total > chunkSize) &&
+        $('.topic-post .cooked, .small-action:not(.time-gap)').length < total;
     }
 
     if (state.searchVisible) {
diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6
index 9e33999957d..4f6beef6bf2 100644
--- a/app/assets/javascripts/discourse/widgets/link.js.es6
+++ b/app/assets/javascripts/discourse/widgets/link.js.es6
@@ -11,12 +11,12 @@ export default createWidget('link', {
     const route = attrs.route;
     if (route) {
       const router = this.register.lookup('router:main');
-      if (router && router.router) {
+      if (router && router._routerMicrolib) {
         const params = [route];
         if (attrs.model) {
           params.push(attrs.model);
         }
-        return Discourse.getURL(router.router.generate.apply(router.router, params));
+        return Discourse.getURL(router._routerMicrolib.generate.apply(router._routerMicrolib, params));
       }
     } else {
       return Discourse.getURL(attrs.href);
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 4c39f4a5421..7f542a5d0cc 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -86,6 +86,35 @@ registerButton('edit', attrs => {
   }
 });
 
+registerButton('reply-small', attrs => {
+  if (!attrs.canCreatePost) { return; }
+
+  const args = {
+    action: 'replyToPost',
+    title: 'post.controls.reply',
+    icon: 'reply',
+    className: 'reply',
+  };
+
+  return args;
+});
+
+registerButton('wiki-edit', attrs => {
+  if (attrs.canEdit) {
+    const args = {
+      action: 'editPost',
+      className: 'edit create',
+      title: 'post.controls.edit',
+      icon: 'pencil-square-o',
+      alwaysShowYours: true
+    };
+    if (!attrs.mobileView) {
+      args.label = 'post.controls.edit_action';
+    }
+    return args;
+  }
+});
+
 registerButton('replies', (attrs, state, siteSettings) => {
   const replyCount = attrs.replyCount;
 
@@ -180,6 +209,13 @@ registerButton('delete', attrs => {
   }
 });
 
+function replaceButton(buttons, find, replace) {
+  const idx = buttons.indexOf(find);
+  if (idx !== -1) {
+    buttons[idx] = replace;
+  }
+}
+
 export default createWidget('post-menu', {
   tagName: 'section.post-menu-area.clearfix',
 
@@ -194,7 +230,7 @@ export default createWidget('post-menu', {
     if (builder) {
       const buttonAtts = builder(attrs, this.state, this.siteSettings);
       if (buttonAtts) {
-        return this.attach('button', buttonAtts);
+        return this.attach('flat-button', buttonAtts);
       }
     }
   },
@@ -209,7 +245,16 @@ export default createWidget('post-menu', {
 
     const allButtons = [];
     let visibleButtons = [];
-    siteSettings.post_menu.split('|').forEach(i => {
+
+    const orderedButtons = siteSettings.post_menu.split('|');
+
+    // If the post is a wiki, make Edit more prominent
+    if (attrs.wiki) {
+      replaceButton(orderedButtons, 'edit', 'reply-small');
+      replaceButton(orderedButtons, 'reply', 'wiki-edit');
+    }
+
+    orderedButtons.forEach(i => {
       const button = this.attachButton(i, attrs);
       if (button) {
         allButtons.push(button);
diff --git a/app/assets/javascripts/discourse/widgets/post-stream.js.es6 b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
index 0f99af0ce24..415c7915684 100644
--- a/app/assets/javascripts/discourse/widgets/post-stream.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-stream.js.es6
@@ -2,7 +2,6 @@ import { createWidget } from 'discourse/widgets/widget';
 import transformPost from 'discourse/lib/transform-post';
 import { Placeholder } from 'discourse/lib/posts-with-placeholders';
 import { addWidgetCleanCallback } from 'discourse/components/mount-widget';
-import { keyDirty } from 'discourse/widgets/widget';
 
 let transformCallbacks = null;
 function postTransformCallbacks(transformed) {
@@ -36,14 +35,15 @@ export function cloak(post, component) {
   const $post = $(`#post_${post.post_number}`);
   _cloaked[post.id] = true;
   _heights[post.id] = $post.outerHeight();
-  keyDirty(`post-${post.id}`);
+
+  component.dirtyKeys.keyDirty(`post-${post.id}`);
   Ember.run.debounce(component, 'queueRerender', 1000);
 }
 
 export function uncloak(post, component) {
   if (!CLOAKING_ENABLED || !_cloaked[post.id]) { return; }
   _cloaked[post.id] = null;
-  keyDirty(`post-${post.id}`);
+  component.dirtyKeys.keyDirty(`post-${post.id}`);
   component.queueRerender();
 }
 
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
index 1d190fc7c8b..d210b2e2d99 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
@@ -4,6 +4,7 @@ import RawHtml from 'discourse/widgets/raw-html';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { iconNode } from 'discourse/helpers/fa-icon-node';
+import highlightText from 'discourse/lib/highlight-text';
 
 class Highlighted extends RawHtml {
   constructor(html, term) {
@@ -12,24 +13,30 @@ class Highlighted extends RawHtml {
   }
 
   decorate($html) {
-    if (this.term) {
-      $html.highlight(this.term.split(/\s+/), { className: 'search-highlight' });
-    }
+    highlightText($html, this.term);
   }
 }
 
-function createSearchResult(type, linkField, fn) {
+function createSearchResult({ type, linkField, builder }) {
   return createWidget(`search-result-${type}`, {
     html(attrs) {
       return attrs.results.map(r => {
+
+        let searchResultId;
+        if (type === "topic") {
+          searchResultId = r.get('topic_id');
+        }
         return h('li', this.attach('link', {
           href: r.get(linkField),
-          contents: () => fn.call(this, r, attrs.term),
+          contents: () => builder.call(this, r, attrs.term),
           className: 'search-link',
-          searchContextEnabled: this.attrs.searchContextEnabled
+          searchResultId,
+          searchResultType: type,
+          searchContextEnabled: attrs.searchContextEnabled,
+          searchLogId: attrs.searchLogId
         }));
       });
-    }
+    },
   });
 }
 
@@ -45,27 +52,43 @@ function postResult(result, link, term) {
   return html;
 }
 
-createSearchResult('user', 'path', function(u) {
-  return [ avatarImg('small', { template: u.avatar_template, username: u.username }), ' ', h('span.user-results', h('b', u.username)), ' ',  h('span.user-results', u.name ? u.name : '') ];
+createSearchResult({
+  type: 'user',
+  linkField: 'path',
+  builder(u) {
+    return [ avatarImg('small', { template: u.avatar_template, username: u.username }), ' ', h('span.user-results', h('b', u.username)), ' ',  h('span.user-results', u.name ? u.name : '') ];
+  }
 });
 
-createSearchResult('topic', 'url', function(result, term) {
-  const topic = result.topic;
-  const link = h('span.topic', [
-    this.attach('topic-status', { topic, disableActions: true }),
-    h('span.topic-title', new Highlighted(topic.get('fancyTitle'), term)),
-    this.attach('category-link', { category: topic.get('category'), link: false })
-  ]);
+createSearchResult({
+  type: 'topic',
+  linkField: 'url',
+  builder(result, term) {
+    const topic = result.topic;
+    const link = h('span.topic', [
+      this.attach('topic-status', { topic, disableActions: true }),
+      h('span.topic-title', new Highlighted(topic.get('fancyTitle'), term)),
+      this.attach('category-link', { category: topic.get('category'), link: false })
+    ]);
 
-  return postResult.call(this, result, link, term);
+    return postResult.call(this, result, link, term);
+  }
 });
 
-createSearchResult('post', 'url', function(result, term) {
-  return postResult.call(this, result, I18n.t('search.post_format', result), term);
+createSearchResult({
+  type: 'post',
+  linkField: 'url',
+  builder(result, term) {
+    return postResult.call(this, result, I18n.t('search.post_format', result), term);
+  }
 });
 
-createSearchResult('category', 'url', function (c) {
-  return this.attach('category-link', { category: c, link: false });
+createSearchResult({
+  type: 'category',
+  linkField: 'url',
+  builder(c) {
+    return this.attach('category-link', { category: c, link: false });
+  }
 });
 
 createWidget('search-menu-results', {
@@ -100,7 +123,8 @@ createWidget('search-menu-results', {
 
       return [
         h('ul', this.attach(rt.componentName, {
-          searchContextEnabled: this.attrs.searchContextEnabled,
+          searchContextEnabled: attrs.searchContextEnabled,
+          searchLogId: attrs.results.grouped_search_result.search_log_id,
           results: rt.results,
           term: attrs.term
         })),
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 9f462a12055..d5e9b12e9ac 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -54,6 +54,11 @@ const SearchHelper = {
       this._activeSearch = searchForTerm(term, { typeFilter, searchContext, fullSearchUrl });
       this._activeSearch.then(content => {
         searchData.noResults = content.resultTypes.length === 0;
+
+        if (content.grouped_search_result) {
+          searchData.term = content.grouped_search_result.term;
+        }
+
         searchData.results = content;
       }).finally(() => {
         searchData.loading = false;
@@ -122,11 +127,13 @@ export default createWidget('search-menu', {
       if (searchData.loading) {
         results.push(h('div.searching', h('div.spinner')));
       } else {
-        results.push(this.attach('search-menu-results', { term: searchData.term,
-                                                          noResults: searchData.noResults,
-                                                          results: searchData.results,
-                                                          invalidTerm: searchData.invalidTerm,
-                                                          searchContextEnabled: searchData.contextEnabled }));
+        results.push(this.attach('search-menu-results', {
+          term: searchData.term,
+          noResults: searchData.noResults,
+          results: searchData.results,
+          invalidTerm: searchData.invalidTerm,
+          searchContextEnabled: searchData.contextEnabled
+        }));
       }
     }
 
diff --git a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
index ce00e979de2..75fad312f49 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -28,19 +28,26 @@ createWidget('topic-admin-menu-button', {
     if (!this.currentUser || !this.currentUser.get('canManageTopic')) { return; }
 
     const result = [];
-    result.push(this.attach('button', {
-      className: 'btn ' + (attrs.fixed ? " show-topic-admin" : ""),
-      title: 'topic_admin_menu',
-      icon: 'wrench',
-      action: 'showAdminMenu',
-      sendActionEvent: true
-    }));
+
+    // We don't show the button when expanded on the right side
+    if (!(attrs.rightSide && state.expanded)) {
+      result.push(this.attach('button', {
+        className: 'btn ' + (attrs.fixed ? " show-topic-admin" : ""),
+        title: 'topic_admin_menu',
+        icon: 'wrench',
+        action: 'showAdminMenu',
+        sendActionEvent: true
+      }));
+    }
 
     if (state.expanded) {
-      result.push(this.attach('topic-admin-menu', { position: state.position,
-                                                    fixed: attrs.fixed,
-                                                    topic: attrs.topic,
-                                                    openUpwards: attrs.openUpwards }));
+      result.push(this.attach('topic-admin-menu', {
+        position: state.position,
+        fixed: attrs.fixed,
+        topic: attrs.topic,
+        openUpwards: attrs.openUpwards,
+        rightSide: attrs.rightSide
+      }));
     }
 
     return result;
@@ -69,10 +76,20 @@ createWidget('topic-admin-menu-button', {
 export default createWidget('topic-admin-menu', {
   tagName: 'div.popup-menu.topic-admin-popup-menu',
 
+  buildClasses(attrs) {
+    if (attrs.rightSide) {
+      return 'right-side';
+    }
+  },
+
   buildAttributes(attrs) {
-    const { top, left, outerHeight } = attrs.position;
+    let { top, left, outerHeight } = attrs.position;
     const position = attrs.fixed ? 'fixed' : 'absolute';
 
+    if (attrs.rightSide) {
+      return;
+    }
+
     if (attrs.openUpwards) {
       const documentHeight = $(document).height();
       const mainHeight = $('#main').height();
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
index aca0c8aae2a..6e77bd18e4c 100644
--- a/app/assets/javascripts/discourse/widgets/topic-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
@@ -17,11 +17,16 @@ function renderParticipants(userFilters, participants) {
 
 createWidget('topic-map-show-links', {
   tagName: 'div.link-summary',
-  html(attrs) {
-    return h('a', I18n.t('topic_map.links_shown', { totalLinks: attrs.totalLinks }));
+  html() {
+    return h('span', this.attach('button', {
+      title: 'topic_map.links_shown',
+      icon: 'chevron-down',
+      action: 'showLinks',
+      className: 'btn'
+    }));
   },
 
-  click() {
+  showLinks() {
     this.sendWidgetAction('showAllLinks');
   }
 });
@@ -159,7 +164,9 @@ createWidget('topic-map-expanded', {
         if (l.title && l.title.length) {
           const domain = l.domain;
           if (domain && domain.length) {
-            host = h('span.domain', domain);
+            const s = domain.split('.');
+            if (s[0] === 'www') s.shift();
+            host = h('span.domain', s.join('.'));
           }
         }
 
@@ -179,7 +186,7 @@ createWidget('topic-map-expanded', {
       ];
 
       if (!state.allLinksShown && links.length < attrs.topicLinks.length) {
-        showAllLinksContent.push(this.attach('topic-map-show-links', { totalLinks: attrs.topicLinks.length }));
+        showAllLinksContent.push(this.attach('topic-map-show-links'));
       }
 
       const section = h('section.links', showAllLinksContent);
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index a77012282bc..f71e7b892d5 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -345,7 +345,11 @@ export default createWidget('topic-timeline', {
     }
 
     if (stream.length < 3) {
-      return result;
+      const topicHeight = $('#topic').height();
+      const windowHeight = $(window).height();
+      if ((topicHeight / windowHeight) < 2.0) {
+        return result;
+      }
     }
 
     const bottomAge = relativeAge(new Date(topic.last_posted_at), { addAgo: true, defaultFormat: timelineDate });
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index 94c798741ff..2d0ea8d587f 100644
--- a/app/assets/javascripts/discourse/widgets/widget.js.es6
+++ b/app/assets/javascripts/discourse/widgets/widget.js.es6
@@ -9,18 +9,6 @@ import DecoratorHelper from 'discourse/widgets/decorator-helper';
 function emptyContent() { }
 
 const _registry = {};
-let _dirty = {};
-
-export function keyDirty(key, options) {
-  options = options || {};
-  options.dirty = true;
-
-  _dirty[key] = options;
-}
-
-export function renderedKey(key) {
-  delete _dirty[key];
-}
 
 export function queryRegistry(name) {
   return _registry[name];
@@ -146,6 +134,7 @@ export default class Widget {
     this.mergeState = opts.state;
     this.model = opts.model;
     this.register = register;
+    this.dirtyKeys = opts.dirtyKeys;
 
     register.deprecateContainer(this);
 
@@ -185,6 +174,8 @@ export default class Widget {
   }
 
   render(prev) {
+    const { dirtyKeys } = this;
+
     if (prev && prev.key && prev.key === this.key) {
       this.state = prev.state;
     } else {
@@ -197,16 +188,16 @@ export default class Widget {
     }
 
     if (prev) {
-      const dirtyOpts = _dirty[prev.key] || { dirty: false };
+      const dirtyOpts = dirtyKeys.optionsFor(prev.key);
 
       if (prev.shadowTree) {
         this.shadowTree = true;
-        if (!dirtyOpts.dirty && !_dirty['*']) {
+        if (!dirtyOpts.dirty && !dirtyKeys.allDirty()) {
           return prev.vnode;
         }
       }
       if (prev.key) {
-        renderedKey(prev.key);
+        dirtyKeys.renderedKey(prev.key);
       }
 
       const refreshAction = dirtyOpts.onRefresh;
@@ -245,11 +236,15 @@ export default class Widget {
         return;
       }
       WidgetClass = this.register.lookupFactory(`widget:${widgetName}`);
+      if (WidgetClass && WidgetClass.class) {
+        WidgetClass = WidgetClass.class;
+      }
     }
 
     if (WidgetClass) {
       const result = new WidgetClass(attrs, this.register, opts);
       result.parentWidget = this;
+      result.dirtyKeys = this.dirtyKeys;
       return result;
     } else {
       throw `Couldn't find ${widgetName} factory`;
@@ -260,7 +255,7 @@ export default class Widget {
     let widget = this;
     while (widget) {
       if (widget.shadowTree) {
-        keyDirty(widget.key);
+        this.dirtyKeys.keyDirty(widget.key);
       }
 
       const rerenderable = widget._rerenderable;
diff --git a/app/assets/javascripts/ember-addons/ember-computed-decorators.js.es6 b/app/assets/javascripts/ember-addons/ember-computed-decorators.js.es6
index e8d3b7ba88f..3df6ac40182 100644
--- a/app/assets/javascripts/ember-addons/ember-computed-decorators.js.es6
+++ b/app/assets/javascripts/ember-addons/ember-computed-decorators.js.es6
@@ -54,7 +54,6 @@ export var not = macroAlias(Ember.computed.not);
 export var notEmpty = macroAlias(Ember.computed.notEmpty);
 export var oneWay = macroAlias(Ember.computed.oneWay);
 export var or = macroAlias(Ember.computed.or);
-export var readOnly = macroAlias(Ember.computed.readOnly);
 export var reads = macroAlias(Ember.computed.reads);
 export var setDiff = macroAlias(Ember.computed.setDiff);
 export var sort = macroAlias(Ember.computed.sort);
diff --git a/app/assets/javascripts/markdown-it-bundle.js b/app/assets/javascripts/markdown-it-bundle.js
new file mode 100644
index 00000000000..81c05f719fd
--- /dev/null
+++ b/app/assets/javascripts/markdown-it-bundle.js
@@ -0,0 +1,16 @@
+//= require markdown-it.js
+//= require ./pretty-text/engines/discourse-markdown/helpers
+//= require ./pretty-text/engines/discourse-markdown/mentions
+//= require ./pretty-text/engines/discourse-markdown/quotes
+//= require ./pretty-text/engines/discourse-markdown/emoji
+//= require ./pretty-text/engines/discourse-markdown/onebox
+//= require ./pretty-text/engines/discourse-markdown/bbcode-block
+//= require ./pretty-text/engines/discourse-markdown/bbcode-inline
+//= require ./pretty-text/engines/discourse-markdown/code
+//= require ./pretty-text/engines/discourse-markdown/category-hashtag
+//= require ./pretty-text/engines/discourse-markdown/censored
+//= require ./pretty-text/engines/discourse-markdown/table
+//= require ./pretty-text/engines/discourse-markdown/paragraph
+//= require ./pretty-text/engines/discourse-markdown/newline
+//= require ./pretty-text/engines/discourse-markdown/html-img
+//= require ./pretty-text/engines/discourse-markdown/text-post-process
diff --git a/app/assets/javascripts/pretty-text-bundle.js b/app/assets/javascripts/pretty-text-bundle.js
index 51d7b2b3551..a572344df81 100644
--- a/app/assets/javascripts/pretty-text-bundle.js
+++ b/app/assets/javascripts/pretty-text-bundle.js
@@ -3,11 +3,10 @@
 //= require ./pretty-text/censored-words
 //= require ./pretty-text/emoji/data
 //= require ./pretty-text/emoji
-//= require ./pretty-text/engines/discourse-markdown
-//= require_tree ./pretty-text/engines/discourse-markdown
+//= require ./pretty-text/engines/discourse-markdown-it
 //= require xss.min
-//= require better_markdown.js
 //= require ./pretty-text/xss
 //= require ./pretty-text/white-lister
 //= require ./pretty-text/sanitizer
 //= require ./pretty-text/oneboxer
+//= require ./pretty-text/inline-oneboxer
diff --git a/app/assets/javascripts/pretty-text/censored-words.js.es6 b/app/assets/javascripts/pretty-text/censored-words.js.es6
index 48e351cc17f..58900460bcb 100644
--- a/app/assets/javascripts/pretty-text/censored-words.js.es6
+++ b/app/assets/javascripts/pretty-text/censored-words.js.es6
@@ -2,9 +2,11 @@ function escapeRegexp(text) {
   return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
 }
 
-export function censor(text, censoredWords, censoredPattern) {
-  let patterns = [],
-      originalText = text;
+export function censorFn(censoredWords, censoredPattern, replacementLetter) {
+
+  let patterns = [];
+
+  replacementLetter = replacementLetter || "&#9632;";
 
   if (censoredWords && censoredWords.length) {
     patterns = censoredWords.split("|").map(t => `(${escapeRegexp(t)})`);
@@ -21,19 +23,35 @@ export function censor(text, censoredWords, censoredPattern) {
       censorRegexp = new RegExp("(\\b(?:" + patterns.join("|") + ")\\b)(?![^\\(]*\\))", "ig");
 
       if (censorRegexp) {
-        let m = censorRegexp.exec(text);
 
-        while (m && m[0]) {
-          if (m[0].length > originalText.length) { return originalText; } // regex is dangerous
-          const replacement = new Array(m[0].length+1).join('&#9632;');
-          text = text.replace(new RegExp(`(\\b${escapeRegexp(m[0])}\\b)(?![^\\(]*\\))`, "ig"), replacement);
-          m = censorRegexp.exec(text);
-        }
+        return function(text) {
+          let original = text;
+
+          try {
+            let m = censorRegexp.exec(text);
+
+            while (m && m[0]) {
+              if (m[0].length > original.length) { return original; } // regex is dangerous
+              const replacement = new Array(m[0].length+1).join(replacementLetter);
+              text = text.replace(new RegExp(`(\\b${escapeRegexp(m[0])}\\b)(?![^\\(]*\\))`, "ig"), replacement);
+              m = censorRegexp.exec(text);
+            }
+
+            return text;
+          } catch (e) {
+            return original;
+          }
+        };
+
       }
     } catch(e) {
-      return originalText;
+      // fall through
     }
   }
 
-  return text;
+  return function(t){ return t;};
+}
+
+export function censor(text, censoredWords, censoredPattern, replacementLetter) {
+  return censorFn(censoredWords, censoredPattern, replacementLetter)(text);
 }
diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6 b/app/assets/javascripts/pretty-text/emoji.js.es6
deleted file mode 100644
index 3df9040a240..00000000000
--- a/app/assets/javascripts/pretty-text/emoji.js.es6
+++ /dev/null
@@ -1,115 +0,0 @@
-import { emoji, aliases, translations } from 'pretty-text/emoji/data';
-
-// bump up this number to expire all emojis
-export const IMAGE_VERSION = "3";
-
-const extendedEmoji = {};
-
-export function registerEmoji(code, url) {
-  code = code.toLowerCase();
-  extendedEmoji[code] = url;
-}
-
-export function emojiList() {
-  const result = emoji.slice(0);
-  _.each(extendedEmoji, (v,k) => result.push(k));
-  return result;
-}
-
-const emojiHash = {};
-
-// add all default emojis
-emoji.forEach(code => emojiHash[code] = true);
-
-// and their aliases
-const aliasHash = {};
-Object.keys(aliases).forEach(name => {
-  aliases[name].forEach(alias => aliasHash[alias] = name);
-});
-
-export function performEmojiUnescape(string, opts) {
-  // this can be further improved by supporting matches of emoticons that don't begin with a colon
-  if (string.indexOf(":") >= 0) {
-    return string.replace(/\B:[^\s:]+:?\B/g, m => {
-      const isEmoticon = !!translations[m];
-      const emojiVal = isEmoticon ? translations[m] : m.slice(1, m.length - 1);
-      const hasEndingColon = m.lastIndexOf(":") === m.length - 1;
-      const url = buildEmojiUrl(emojiVal, opts);
-      const classes = isCustomEmoji(emojiVal, opts) ? "emoji emoji-custom" : "emoji";
-
-      return url && (isEmoticon || hasEndingColon) ?
-             `<img src='${url}' ${opts.skipTitle ? '' : `title='${emojiVal}'`} alt='${emojiVal}' class='${classes}'>` : m;
-    });
-  }
-
-  return string;
-}
-
-export function isCustomEmoji(code, opts) {
-  code = code.toLowerCase();
-  if (extendedEmoji.hasOwnProperty(code)) return true;
-  if (opts && opts.customEmoji && opts.customEmoji.hasOwnProperty(code)) return true;
-  return false;
-}
-
-export function buildEmojiUrl(code, opts) {
-  let url;
-  code = code.toLowerCase();
-
-  if (extendedEmoji.hasOwnProperty(code)) {
-    url = extendedEmoji[code];
-  }
-
-  if (opts && opts.customEmoji && opts.customEmoji[code]) {
-    url = opts.customEmoji[code];
-  }
-
-  if (!url && emojiHash.hasOwnProperty(code)) {
-    url = opts.getURL(`/images/emoji/${opts.emojiSet}/${code}.png`);
-  }
-
-  if (url) {
-    url = url + "?v=" + IMAGE_VERSION;
-  }
-
-  return url;
-}
-
-export function emojiExists(code) {
-  code = code.toLowerCase();
-  return !!(extendedEmoji.hasOwnProperty(code) || emojiHash.hasOwnProperty(code));
-};
-
-let toSearch;
-export function emojiSearch(term, options) {
-  const maxResults = (options && options["maxResults"]) || -1;
-  if (maxResults === 0) { return []; }
-
-  toSearch = toSearch || _.union(_.keys(emojiHash), _.keys(extendedEmoji), _.keys(aliasHash)).sort();
-
-  const results = [];
-
-  function addResult(t) {
-    const val = aliasHash[t] || t;
-    if (results.indexOf(val) === -1) {
-      results.push(val);
-    }
-    return maxResults > 0 && results.length >= maxResults;
-  }
-
-  for (let i=0; i<toSearch.length; i++) {
-    const item = toSearch[i];
-    if (item.indexOf(term) === 0 && addResult(item)) {
-      return results;
-    }
-  }
-
-  for (let i=0; i<toSearch.length; i++) {
-    const item = toSearch[i];
-    if (item.indexOf(term) > 0 && addResult(item)) {
-      return results;
-    }
-  }
-
-  return results;
-};
diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6.erb b/app/assets/javascripts/pretty-text/emoji.js.es6.erb
new file mode 100644
index 00000000000..136c2904261
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/emoji.js.es6.erb
@@ -0,0 +1,121 @@
+import { emojis, aliases, translations, tonableEmojis } from 'pretty-text/emoji/data';
+
+// bump up this number to expire all emojis
+export const IMAGE_VERSION = "<%= Emoji::EMOJI_VERSION %>";
+
+const extendedEmoji = {};
+
+export function registerEmoji(code, url) {
+  code = code.toLowerCase();
+  extendedEmoji[code] = url;
+}
+
+export function extendedEmojiList() {
+  return extendedEmoji;
+}
+
+const emojiHash = {};
+
+// add all default emojis
+emojis.forEach(code => emojiHash[code] = true);
+
+// and their aliases
+const aliasHash = {};
+Object.keys(aliases).forEach(name => {
+  aliases[name].forEach(alias => aliasHash[alias] = name);
+});
+
+export function performEmojiUnescape(string, opts) {
+  // this can be further improved by supporting matches of emoticons that don't begin with a colon
+  if (string.indexOf(":") >= 0) {
+    return string.replace(/\B:[^\s:]+(?::t\d)?:?\B/g, m => {
+      const isEmoticon = !!translations[m];
+      const emojiVal = isEmoticon ? translations[m] : m.slice(1, m.length - 1);
+      const hasEndingColon = m.lastIndexOf(":") === m.length - 1;
+      const url = buildEmojiUrl(emojiVal, opts);
+      const classes = isCustomEmoji(emojiVal, opts) ? "emoji emoji-custom" : "emoji";
+
+      return url && (isEmoticon || hasEndingColon) ?
+             `<img src='${url}' ${opts.skipTitle ? '' : `title='${emojiVal}'`} alt='${emojiVal}' class='${classes}'>` : m;
+    });
+  }
+
+  return string;
+}
+
+export function isCustomEmoji(code, opts) {
+  code = code.toLowerCase();
+  if (extendedEmoji.hasOwnProperty(code)) return true;
+  if (opts && opts.customEmoji && opts.customEmoji.hasOwnProperty(code)) return true;
+  return false;
+}
+
+export function buildEmojiUrl(code, opts) {
+  let url;
+  code = String(code).toLowerCase();
+  if (extendedEmoji.hasOwnProperty(code)) {
+    url = extendedEmoji[code];
+  }
+
+  if (opts && opts.customEmoji && opts.customEmoji[code]) {
+    url = opts.customEmoji[code];
+  }
+
+  const noToneMatch = code.match(/([^:]+):?/);
+  if (noToneMatch && !url && (emojiHash.hasOwnProperty(noToneMatch[1]) || aliasHash.hasOwnProperty(noToneMatch[1]))) {
+    url = opts.getURL(`/images/emoji/${opts.emojiSet}/${code.replace(/:t/, '/')}.png`);
+  }
+
+  if (url) {
+    url = url + "?v=" + IMAGE_VERSION;
+  }
+
+  return url;
+}
+
+export function emojiExists(code) {
+  code = code.toLowerCase();
+  return !!(extendedEmoji.hasOwnProperty(code) || emojiHash.hasOwnProperty(code) || aliasHash.hasOwnProperty(code));
+};
+
+let toSearch;
+export function emojiSearch(term, options) {
+  const maxResults = (options && options["maxResults"]) || -1;
+  if (maxResults === 0) { return []; }
+
+  toSearch = toSearch || _.union(_.keys(emojiHash), _.keys(extendedEmoji), _.keys(aliasHash)).sort();
+
+  const results = [];
+
+  function addResult(t) {
+    const val = aliasHash[t] || t;
+    if (results.indexOf(val) === -1) {
+      results.push(val);
+    }
+    return maxResults > 0 && results.length >= maxResults;
+  }
+
+  for (let i=0; i<toSearch.length; i++) {
+    const item = toSearch[i];
+    if (item.indexOf(term) === 0 && addResult(item)) {
+      return results;
+    }
+  }
+
+  for (let i=0; i<toSearch.length; i++) {
+    const item = toSearch[i];
+    if (item.indexOf(term) > 0 && addResult(item)) {
+      return results;
+    }
+  }
+
+  return results;
+};
+
+export function isSkinTonableEmoji(term) {
+  const match = _.compact(term.split(":"))[0];
+  if (match) {
+    return tonableEmojis.indexOf(match) !== -1;
+  }
+  return false;
+}
diff --git a/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb b/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
index 90861fb7bb8..18648449574 100644
--- a/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
+++ b/app/assets/javascripts/pretty-text/emoji/data.js.es6.erb
@@ -1,4 +1,5 @@
-export const emoji = <%= Emoji.standard.map(&:name).flatten.inspect %>;
+export const emojis = <%= Emoji.standard.map(&:name).flatten.inspect %>;
+export const tonableEmojis = <%= Emoji.tonable_emojis.flatten.inspect %>;
 export const aliases = <%= Emoji.aliases.inspect.gsub("=>", ":") %>;
 export const translations = {
   ':)'   : 'slight_smile',
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
new file mode 100644
index 00000000000..6ffa5092572
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown-it.js.es6
@@ -0,0 +1,279 @@
+import { default as WhiteLister } from 'pretty-text/white-lister';
+import { sanitize } from 'pretty-text/sanitizer';
+import guid from 'pretty-text/guid';
+
+function deprecate(feature, name){
+  return function() {
+    if (window.console && window.console.log) {
+      window.console.log(feature + ': ' + name + ' is deprecated, please use the new markdown it APIs');
+    }
+  };
+}
+
+function createHelper(featureName, opts, optionCallbacks, pluginCallbacks, getOptions, whiteListed) {
+  let helper = {};
+  helper.markdownIt = true;
+  helper.whiteList = info => whiteListed.push([featureName, info]);
+  helper.registerInline = deprecate(featureName,'registerInline');
+  helper.replaceBlock = deprecate(featureName,'replaceBlock');
+  helper.addPreProcessor = deprecate(featureName,'addPreProcessor');
+  helper.inlineReplace = deprecate(featureName,'inlineReplace');
+  helper.postProcessTag = deprecate(featureName,'postProcessTag');
+  helper.inlineRegexp = deprecate(featureName,'inlineRegexp');
+  helper.inlineBetween = deprecate(featureName,'inlineBetween');
+  helper.postProcessText = deprecate(featureName,'postProcessText');
+  helper.onParseNode = deprecate(featureName,'onParseNode');
+  helper.registerBlock = deprecate(featureName,'registerBlock');
+  // hack to allow moving of getOptions
+  helper.getOptions = () => getOptions.f();
+
+  helper.registerOptions = (callback) => {
+    optionCallbacks.push([featureName, callback]);
+  };
+
+  helper.registerPlugin = (callback) => {
+    pluginCallbacks.push([featureName, callback]);
+  };
+
+  return helper;
+}
+
+// TODO we may just use a proper ruler from markdown it... this is a basic proxy
+class Ruler {
+  constructor() {
+    this.rules = [];
+  }
+
+  getRules() {
+    return this.rules;
+  }
+
+  getRuleForTag(tag) {
+    this.ensureCache();
+    return this.cache[tag];
+  }
+
+  ensureCache() {
+    if (this.cache) { return; }
+
+    this.cache = {};
+    for(let i=this.rules.length-1;i>=0;i--) {
+      let info = this.rules[i];
+      this.cache[info.rule.tag] = info;
+    }
+  }
+
+  push(name, rule) {
+    this.rules.push({name, rule});
+    this.cache = null;
+  }
+}
+
+// block bb code ruler for parsing of quotes / code / polls
+function setupBlockBBCode(md) {
+  md.block.bbcode = { ruler: new Ruler() };
+}
+
+function setupInlineBBCode(md) {
+  md.inline.bbcode = { ruler: new Ruler() };
+}
+
+function setupTextPostProcessRuler(md) {
+  const TextPostProcessRuler = requirejs('pretty-text/engines/discourse-markdown/text-post-process').TextPostProcessRuler;
+  md.core.textPostProcess = { ruler: new TextPostProcessRuler() };
+}
+
+function renderHoisted(tokens, idx, options) {
+  const content = tokens[idx].content;
+  if (content && content.length > 0) {
+    let id = guid();
+    options.discourse.hoisted[id] = tokens[idx].content;
+    return id;
+  } else {
+    return '';
+  }
+}
+
+function setupUrlDecoding(md) {
+  // this fixed a subtle issue where %20 is decoded as space in
+  // automatic urls
+  md.utils.lib.mdurl.decode.defaultChars = ';/?:@&=+$,# ';
+}
+
+function setupHoister(md) {
+  md.renderer.rules.html_raw = renderHoisted;
+}
+
+const IMG_SIZE_REGEX = /^([1-9]+[0-9]*)x([1-9]+[0-9]*)(,([1-9][0-9]?)%)?$/;
+function renderImage(tokens, idx, options, env, slf) {
+  var token = tokens[idx];
+
+  let alt = slf.renderInlineAsText(token.children, options, env);
+
+  let split = alt.split('|');
+  if (split.length > 1) {
+    let match;
+    let info = split.splice(split.length-1)[0];
+
+    if (match = info.match(IMG_SIZE_REGEX)) {
+      if (match[1] && match[2]) {
+        alt = split.join('|');
+
+        let width = match[1];
+        let height = match[2];
+
+        if (match[4]) {
+          let percent = parseFloat(match[4]) / 100.0;
+          width = parseInt(width * percent);
+          height = parseInt(height * percent);
+        }
+
+        if (token.attrIndex('width') === -1) {
+          token.attrs.push(['width', width]);
+        }
+
+        if (token.attrIndex('height') === -1) {
+          token.attrs.push(['height', height]);
+        }
+      }
+
+    }
+  }
+
+  token.attrs[token.attrIndex('alt')][1] = alt;
+  return slf.renderToken(tokens, idx, options);
+}
+
+function setupImageDimensions(md) {
+  md.renderer.rules.image = renderImage;
+}
+
+let Helpers;
+
+export function setup(opts, siteSettings, state) {
+  if (opts.setup) {
+    return;
+  }
+
+  // we got to require this late cause bundle is not loaded in pretty-text
+  Helpers = Helpers || requirejs('pretty-text/engines/discourse-markdown/helpers');
+
+  opts.markdownIt = true;
+
+  let optionCallbacks = [];
+  let pluginCallbacks = [];
+
+  // ideally I would like to change the top level API a bit, but in the mean time this will do
+  let getOptions = {
+    f: () => opts
+  };
+
+  const check = /discourse-markdown\/|markdown-it\//;
+  let features = [];
+  let whiteListed = [];
+
+  Object.keys(require._eak_seen).forEach(entry => {
+    if (check.test(entry)) {
+      const module = requirejs(entry);
+      if (module && module.setup) {
+
+        const featureName = entry.split('/').reverse()[0];
+        features.push(featureName);
+        module.setup(createHelper(featureName, opts, optionCallbacks, pluginCallbacks, getOptions, whiteListed));
+      }
+    }
+  });
+
+  optionCallbacks.forEach(([,callback])=>{
+    callback(opts, siteSettings, state);
+  });
+
+  // enable all features by default
+  features.forEach(feature => {
+    if (!opts.features.hasOwnProperty(feature)) {
+      opts.features[feature] = true;
+    }
+  });
+
+  let copy = {};
+  Object.keys(opts).forEach(entry => {
+    copy[entry] = opts[entry];
+    delete opts[entry];
+  });
+
+  copy.helpers = {
+    textReplace: Helpers.textReplace
+  };
+
+  opts.discourse = copy;
+  getOptions.f = () => opts.discourse;
+
+  opts.engine = window.markdownit({
+    discourse: opts.discourse,
+    html: true,
+    breaks: opts.discourse.features.newline,
+    xhtmlOut: false,
+    linkify: opts.discourse.features.linkify,
+    typographer: siteSettings.enable_markdown_typographer
+  });
+
+  setupUrlDecoding(opts.engine);
+  setupHoister(opts.engine);
+  setupImageDimensions(opts.engine);
+  setupBlockBBCode(opts.engine);
+  setupInlineBBCode(opts.engine);
+  setupTextPostProcessRuler(opts.engine);
+
+  pluginCallbacks.forEach(([feature, callback])=>{
+    if (opts.discourse.features[feature]) {
+      opts.engine.use(callback);
+    }
+  });
+
+  // top level markdown it notifier
+  opts.markdownIt = true;
+  opts.setup = true;
+
+  if (!opts.discourse.sanitizer || !opts.sanitizer) {
+    const whiteLister = new WhiteLister(opts.discourse);
+
+    whiteListed.forEach(([feature, info]) => {
+      whiteLister.whiteListFeature(feature, info);
+    });
+
+    opts.sanitizer = opts.discourse.sanitizer = (!!opts.discourse.sanitize) ? a=>sanitize(a, whiteLister) : a=>a;
+  }
+
+}
+
+export function cook(raw, opts) {
+  // we still have to hoist html_raw nodes so they bypass the whitelister
+  // this is the case for oneboxes
+  let hoisted = {};
+
+  opts.discourse.hoisted = hoisted;
+
+  const rendered = opts.engine.render(raw);
+  let cooked = opts.discourse.sanitizer(rendered).trim();
+
+  const keys = Object.keys(hoisted);
+  if (keys.length) {
+    let found = true;
+
+    const unhoist = function(key) {
+      cooked = cooked.replace(new RegExp(key, "g"), function() {
+        found = true;
+        return hoisted[key];
+      });
+    };
+
+    while (found) {
+      found = false;
+      keys.forEach(unhoist);
+    }
+  }
+
+  delete opts.discourse.hoisted;
+  return cooked;
+
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6
deleted file mode 100644
index 7555bebdf3c..00000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6
+++ /dev/null
@@ -1,586 +0,0 @@
-import guid from 'pretty-text/guid';
-import { default as WhiteLister, whiteListFeature } from 'pretty-text/white-lister';
-import { escape } from 'pretty-text/sanitizer';
-
-var parser = window.BetterMarkdown,
-    MD = parser.Markdown,
-    DialectHelpers = parser.DialectHelpers,
-    hoisted;
-
-let currentOpts;
-
-const emitters = [];
-const preProcessors = [];
-const parseNodes = [];
-
-function findEndPos(text, start, stop, args, offset) {
-  let endPos, nextStart;
-  do {
-    endPos = text.indexOf(stop, offset);
-    if (endPos === -1) { return -1; }
-    nextStart = text.indexOf(start, offset);
-    offset = endPos + stop.length;
-  } while (nextStart !== -1 && nextStart < endPos);
-  return endPos;
-}
-
-class DialectHelper {
-  constructor() {
-    this._dialect = MD.dialects.Discourse = DialectHelpers.subclassDialect(MD.dialects.Gruber);
-    this._setup = false;
-  }
-
-  escape(str) {
-    return escape(str);
-  }
-
-  getOptions() {
-    return currentOpts;
-  }
-
-  registerInlineFeature(featureName, start, fn) {
-    this._dialect.inline[start] = function() {
-      if (!currentOpts.features[featureName]) { return; }
-      return fn.apply(this, arguments);
-    };
-  }
-
-  addPreProcessorFeature(featureName, fn) {
-    preProcessors.push(raw => {
-      if (!currentOpts.features[featureName]) { return raw; }
-      return fn(raw, hoister);
-    });
-  }
-
-  /**
-    The simplest kind of replacement possible. Replace a stirng token with JsonML.
-
-    For example to replace all occurrances of :) with a smile image:
-
-    ```javascript
-      helper.inlineReplace(':)', text => ['img', {src: '/images/smile.png'}]);
-    ```
-  **/
-  inlineReplaceFeature(featureName, token, emitter) {
-    this.registerInline(token, (text, match, prev) => {
-      if (!currentOpts.features[featureName]) { return; }
-      return [token.length, emitter.call(this, token, match, prev)];
-    });
-  }
-
-  /**
-    After the parser has been executed, change the contents of a HTML tag.
-
-    Let's say you want to replace the contents of all code tags to prepend
-    "EVIL TROUT HACKED YOUR CODE!":
-
-    ```javascript
-      helper.postProcessTag('code', contents => `EVIL TROUT HACKED YOUR CODE!\n\n${contents}`);
-    ```
-  **/
-  postProcessTagFeature(featureName, tag, emitter) {
-    this.onParseNode(event => {
-      if (!currentOpts.features[featureName]) { return; }
-      const node = event.node;
-      if (node[0] === tag) {
-        node[node.length-1] = emitter(node[node.length-1]);
-      }
-    });
-  }
-
-  /**
-    Matches inline using a regular expression. The emitter function is passed
-    the matches from the regular expression.
-
-    For example, this auto links URLs:
-
-    ```javascript
-      helper.inlineRegexp({
-        matcher: /((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.])(?:[^\s()<>]+|\([^\s()<>]+\))+(?:\([^\s()<>]+\)|[^`!()\[\]{};:'".,<>?«»“”‘’\s]))/gm,
-        spaceBoundary: true,
-        start: 'http',
-
-        emitter(matches) {
-          const url = matches[1];
-          return ['a', {href: url}, url];
-        }
-      });
-    ```
-  **/
-  inlineRegexpFeature(featureName, args) {
-    this.registerInline(args.start, function(text, match, prev) {
-      if (!currentOpts.features[featureName]) { return; }
-      if (invalidBoundary(args, prev)) { return; }
-
-      args.matcher.lastIndex = 0;
-      const m = args.matcher.exec(text);
-      if (m) {
-        const result = args.emitter.call(this, m);
-        if (result) {
-          return [m[0].length, result];
-        }
-      }
-    });
-  }
-
-  /**
-    Handles inline replacements surrounded by tokens.
-
-    For example, to handle markdown style bold. Note we use `concat` on the array because
-    the contents are JsonML too since we didn't pass `rawContents` as true. This supports
-    recursive markup.
-
-    ```javascript
-      helper.inlineBetween({
-        between: '**',
-        wordBoundary: true.
-        emitter(contents) {
-          return ['strong'].concat(contents);
-        }
-      });
-    ```
-  **/
-  inlineBetweenFeature(featureName, args) {
-    const start = args.start || args.between;
-    const stop = args.stop || args.between;
-    const startLength = start.length;
-
-    this.registerInline(start, function(text, match, prev) {
-      if (!currentOpts.features[featureName]) { return; }
-      if (invalidBoundary(args, prev)) { return; }
-
-      const endPos = findEndPos(text, start, stop, args, startLength);
-      if (endPos === -1) { return; }
-      var between = text.slice(startLength, endPos);
-
-      // If rawcontents is set, don't process inline
-      if (!args.rawContents) {
-        between = this.processInline(between);
-      }
-
-      var contents = args.emitter.call(this, between);
-      if (contents) {
-        return [endPos+stop.length, contents];
-      }
-    });
-  }
-
-  /**
-    Replaces a block of text between a start and stop. As opposed to inline, these
-    might span multiple lines.
-
-    Here's an example that takes the content between `[code]` ... `[/code]` and
-    puts them inside a `pre` tag:
-
-    ```javascript
-      helper.replaceBlock({
-        start: /(\[code\])([\s\S]*)/igm,
-        stop: '[/code]',
-        rawContents: true,
-
-        emitter(blockContents) {
-          return ['p', ['pre'].concat(blockContents)];
-        }
-      });
-    ```
-  **/
-  replaceBlockFeature(featureName, args) {
-    function blockFunc(block, next) {
-      if (!currentOpts.features[featureName]) { return; }
-
-      const linebreaks = currentOpts.traditionalMarkdownLinebreaks;
-      if (linebreaks && args.skipIfTradtionalLinebreaks) { return; }
-
-      args.start.lastIndex = 0;
-      const result = [];
-      const match = (args.start).exec(block);
-      if (!match) { return; }
-
-      const lastChance = () => !next.some(blk => blk.match(args.stop));
-
-      // shave off start tag and leading text, if any.
-      const pos = args.start.lastIndex - match[0].length;
-      const leading = block.slice(0, pos);
-      const trailing = match[2] ? match[2].replace(/^\n*/, "") : "";
-
-      // The other leading block should be processed first! eg a code block wrapped around a code block.
-      if (args.withoutLeading && args.withoutLeading.test(leading)) {
-        return;
-      }
-
-      // just give up if there's no stop tag in this or any next block
-      args.stop.lastIndex = block.length - trailing.length;
-      if (!args.stop.exec(block) && lastChance()) { return; }
-      if (leading.length > 0) {
-        var parsedLeading = this.processBlock(MD.mk_block(leading), []);
-        if (parsedLeading && parsedLeading[0]) {
-          result.push(parsedLeading[0]);
-        }
-      }
-      if (trailing.length > 0) {
-        next.unshift(MD.mk_block(trailing, block.trailing,
-          block.lineNumber + countLines(leading) + (match[2] ? match[2].length : 0) - trailing.length));
-      }
-
-      // go through the available blocks to find the matching stop tag.
-      const contentBlocks = [];
-      let nesting = 0;
-      let actualEndPos = -1;
-      let currentBlock;
-
-      blockloop:
-      while (currentBlock = next.shift()) {
-
-        // collect all the start and stop tags in the current block
-        args.start.lastIndex = 0;
-        const startPos = [];
-        let m;
-        while (m = (args.start).exec(currentBlock)) {
-          startPos.push(args.start.lastIndex - m[0].length);
-          args.start.lastIndex = args.start.lastIndex - (m[2] ? m[2].length : 0);
-        }
-        args.stop.lastIndex = 0;
-        const endPos = [];
-        while (m = (args.stop).exec(currentBlock)) {
-          endPos.push(args.stop.lastIndex - m[0].length);
-        }
-
-        // go through the available end tags:
-        let ep = 0;
-        let sp = 0;
-        while (ep < endPos.length) {
-          if (sp < startPos.length && startPos[sp] < endPos[ep]) {
-            // there's an end tag, but there's also another start tag first. we need to go deeper.
-            sp++; nesting++;
-          } else if (nesting > 0) {
-            // found an end tag, but we must go up a level first.
-            ep++; nesting--;
-          } else {
-            // found an end tag and we're at the top: done! -- or: start tag and end tag are
-            // identical, (i.e. startPos[sp] == endPos[ep]), so we don't do nesting at all.
-            actualEndPos = endPos[ep];
-            break blockloop;
-          }
-        }
-
-        if (lastChance()) {
-          // when lastChance() becomes true the first time, currentBlock contains the last
-          // end tag available in the input blocks but it's not on the right nesting level
-          // or we would have terminated the loop already. the only thing we can do is to
-          // treat the last available end tag as tho it were matched with our start tag
-          // and let the emitter figure out how to render the garbage inside.
-          actualEndPos = endPos[endPos.length - 1];
-          break;
-        }
-
-        // any left-over start tags still increase the nesting level
-        nesting += startPos.length - sp;
-        contentBlocks.push(currentBlock);
-      }
-
-      const stopLen = currentBlock.match(args.stop)[0].length;
-      const before = currentBlock.slice(0, actualEndPos).replace(/\n*$/, "");
-      const after = currentBlock.slice(actualEndPos + stopLen).replace(/^\n*/, "");
-      if (before.length > 0) contentBlocks.push(MD.mk_block(before, "", currentBlock.lineNumber));
-      if (after.length > 0) next.unshift(MD.mk_block(after, currentBlock.trailing, currentBlock.lineNumber + countLines(before)));
-
-      const emitterResult = args.emitter.call(this, contentBlocks, match);
-      if (emitterResult) { result.push(emitterResult); }
-      return result;
-    };
-
-    if (args.priority) {
-      blockFunc.priority = args.priority;
-    }
-
-    this.registerBlock(args.start.toString(), blockFunc);
-  }
-
-  /**
-    After the parser has been executed, post process any text nodes in the HTML document.
-    This is useful if you want to apply a transformation to the text.
-
-    If you are generating HTML from the text, it is preferable to use the replacer
-    functions and do it in the parsing part of the pipeline. This function is best for
-    simple transformations or transformations that have to happen after all earlier
-    processing is done.
-
-    For example, to convert all text to upper case:
-
-    ```javascript
-      helper.postProcessText(function (text) {
-        return text.toUpperCase();
-      });
-    ```
-  **/
-  postProcessTextFeature(featureName, fn) {
-    emitters.push(function () {
-      if (!currentOpts.features[featureName]) { return; }
-      return fn.apply(this, arguments);
-    });
-  }
-
-  onParseNodeFeature(featureName, fn) {
-    parseNodes.push(function () {
-      if (!currentOpts.features[featureName]) { return; }
-      return fn.apply(this, arguments);
-    });
-  }
-
-  registerBlockFeature(featureName, name, fn) {
-    const blockFunc = function() {
-      if (!currentOpts.features[featureName]) { return; }
-      return fn.apply(this, arguments);
-    };
-
-    blockFunc.priority = fn.priority;
-    this._dialect.block[name] = blockFunc;
-  }
-
-  applyFeature(featureName, module) {
-    helper.registerInline = (code, fn) => helper.registerInlineFeature(featureName, code, fn);
-    helper.replaceBlock = args => helper.replaceBlockFeature(featureName, args);
-    helper.addPreProcessor = fn => helper.addPreProcessorFeature(featureName, fn);
-    helper.inlineReplace = (token, emitter) => helper.inlineReplaceFeature(featureName, token, emitter);
-    helper.postProcessTag = (token, emitter) => helper.postProcessTagFeature(featureName, token, emitter);
-    helper.inlineRegexp = args => helper.inlineRegexpFeature(featureName, args);
-    helper.inlineBetween = args => helper.inlineBetweenFeature(featureName, args);
-    helper.postProcessText = fn => helper.postProcessTextFeature(featureName, fn);
-    helper.onParseNode = fn => helper.onParseNodeFeature(featureName, fn);
-    helper.registerBlock = (name, fn) => helper.registerBlockFeature(featureName, name, fn);
-
-    module.setup(this);
-  }
-
-  setup() {
-    if (this._setup) { return; }
-    this._setup = true;
-
-    Object.keys(require._eak_seen).forEach(entry => {
-      if (entry.indexOf('discourse-markdown') !== -1) {
-        const module = require(entry);
-        if (module && module.setup) {
-          const featureName = entry.split('/').reverse()[0];
-          helper.whiteList = info => whiteListFeature(featureName, info);
-
-          this.applyFeature(featureName, module);
-          helper.whiteList = undefined;
-        }
-      }
-    });
-
-    MD.buildBlockOrder(this._dialect.block);
-    var index = this._dialect.block.__order__.indexOf("code");
-    if (index > -1) {
-      this._dialect.block.__order__.splice(index, 1);
-      this._dialect.block.__order__.unshift("code");
-    }
-    MD.buildInlinePatterns(this._dialect.inline);
-  }
-};
-
-const helper = new DialectHelper();
-
-export function cook(raw, opts) {
-  currentOpts = opts;
-
-  hoisted = {};
-  raw = hoistCodeBlocksAndSpans(raw);
-
-  preProcessors.forEach(p => raw = p(raw));
-
-  const whiteLister = new WhiteLister(opts);
-
-  const tree = parser.toHTMLTree(raw, 'Discourse');
-  let result = opts.sanitizer(parser.renderJsonML(parseTree(tree, opts)), whiteLister);
-
-  // If we hoisted out anything, put it back
-  const keys = Object.keys(hoisted);
-  if (keys.length) {
-    let found = true;
-
-    const unhoist = function(key) {
-      result = result.replace(new RegExp(key, "g"), function() {
-        found = true;
-        return hoisted[key];
-      });
-    };
-
-    while (found) {
-      found = false;
-      keys.forEach(unhoist);
-    }
-  }
-
-  return result.trim();
-}
-
-export function setup() {
-  helper.setup();
-}
-
-function processTextNodes(node, event, emitter) {
-  if (node.length < 2) { return; }
-
-  if (node[0] === '__RAW') {
-    const hash = guid();
-    hoisted[hash] = node[1];
-    node[1] = hash;
-    return;
-  }
-
-  for (var j=1; j<node.length; j++) {
-    var textContent = node[j];
-    if (typeof textContent === "string") {
-      var result = emitter(textContent, event);
-      if (result) {
-        if (result instanceof Array) {
-          node.splice.apply(node, [j, 1].concat(result));
-        } else {
-          node[j] = result;
-        }
-      } else {
-        node[j] = textContent;
-      }
-
-    }
-  }
-}
-
-// Parse a JSON ML tree, using registered handlers to adjust it if necessary.
-function parseTree(tree, options, path, insideCounts) {
-
-  if (tree instanceof Array) {
-    const event = {node: tree, options, path, insideCounts: insideCounts || {}};
-    parseNodes.forEach(fn => fn(event));
-
-    for (var j=0; j<emitters.length; j++) {
-      processTextNodes(tree, event, emitters[j]);
-    }
-
-    path = path || [];
-    insideCounts = insideCounts || {};
-
-    path.push(tree);
-
-    for (var i=1; i<tree.length; i++) {
-      var n = tree[i],
-          tagName = n[0];
-
-      insideCounts[tagName] = (insideCounts[tagName] || 0) + 1;
-
-      if (n && n.length === 2 && n[0] === "p" && /^<!--([\s\S]*)-->$/.exec(n[1])) {
-        // Remove paragraphs around comment-only nodes.
-        tree[i] = n[1];
-      } else {
-        parseTree(n, options, path, insideCounts);
-      }
-
-      insideCounts[tagName] = insideCounts[tagName] - 1;
-    }
-
-    // If raw nodes are in paragraphs, pull them up
-    if (tree.length === 2 && tree[0] === 'p' && tree[1] instanceof Array && tree[1][0] === "__RAW") {
-      var text = tree[1][1];
-      tree[0] = "__RAW";
-      tree[1] = text;
-    }
-
-    path.pop();
-  }
-  return tree;
-}
-
-// Returns true if there's an invalid word boundary for a match.
-function invalidBoundary(args, prev) {
-  if (!(args.wordBoundary || args.spaceBoundary || args.spaceOrTagBoundary)) { return false; }
-
-  var last = prev[prev.length - 1];
-  if (typeof last !== "string") { return false; }
-
-  if (args.wordBoundary && (!last.match(/\W$/))) { return true; }
-  if (args.spaceBoundary && (!last.match(/\s$/))) { return true; }
-  if (args.spaceOrTagBoundary && (!last.match(/(\s|\>|\()$/))) { return true; }
-}
-
-function countLines(str) {
-  let index = -1, count = 0;
-  while ((index = str.indexOf("\n", index + 1)) !== -1) { count++; }
-  return count;
-}
-
-function hoister(t, target, replacement) {
-  const regexp = new RegExp(target.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'), "g");
-  if (t.match(regexp)) {
-    const hash = guid();
-    t = t.replace(regexp, hash);
-    hoisted[hash] = replacement;
-  }
-  return t;
-}
-
-function outdent(t) {
-  return t.replace(/^([ ]{4}|\t)/gm, "");
-}
-
-function removeEmptyLines(t) {
-  return t.replace(/^\n+/, "").replace(/\s+$/, "");
-}
-
-function hideBackslashEscapedCharacters(t) {
-  return t.replace(/\\\\/g, "\u1E800").replace(/\\`/g, "\u1E8001");
-}
-
-function showBackslashEscapedCharacters(t) {
-  return t.replace(/\u1E8001/g, "\\`").replace(/\u1E800/g, "\\\\");
-}
-
-function hoistCodeBlocksAndSpans(text) {
-  // replace all "\`" with a single character
-  text = hideBackslashEscapedCharacters(text);
-
-  // /!\ the order is important /!\
-
-  // fenced code blocks (AKA GitHub code blocks)
-  text = text.replace(/(^\n*|\n)```([a-z0-9\-]*)\n([\s\S]*?)\n```/g, function(_, before, language, content) {
-    const hash = guid();
-    hoisted[hash] = escape(showBackslashEscapedCharacters(removeEmptyLines(content)));
-    return before + "```" + language + "\n" + hash + "\n```";
-  });
-
-  // markdown code blocks
-  text = text.replace(/(^\n*|\n\n)((?:(?:[ ]{4}|\t).*\n*)+)/g, function(match, before, content, index) {
-    // make sure we aren't in a list
-    var previousLine = text.slice(0, index).trim().match(/.*$/);
-    if (previousLine && previousLine[0].length) {
-      previousLine = previousLine[0].trim();
-      if (/^(?:\*|\+|-|\d+\.)\s+/.test(previousLine)) {
-        return match;
-      }
-    }
-    // we can safely hoist the code block
-    const hash = guid();
-    hoisted[hash] = escape(outdent(showBackslashEscapedCharacters(removeEmptyLines(content))));
-    return before + "    " + hash + "\n";
-  });
-
-  // <pre>...</pre> code blocks
-  text = text.replace(/(\s|^)<pre>([\s\S]*?)<\/pre>/ig, function(_, before, content) {
-    const hash = guid();
-    hoisted[hash] = escape(showBackslashEscapedCharacters(removeEmptyLines(content)));
-    return before + "<pre>" + hash + "</pre>";
-  });
-
-  // code spans (double & single `)
-  ["``", "`"].forEach(function(delimiter) {
-    var regexp = new RegExp("(^|[^`])" + delimiter + "([^`\\n]+?)" + delimiter + "([^`]|$)", "g");
-    text = text.replace(regexp, function(_, before, content, after) {
-      const hash = guid();
-      hoisted[hash] = escape(showBackslashEscapedCharacters(content.trim()));
-      return before + delimiter + hash + delimiter + after;
-    });
-  });
-
-  // replace back all weird character with "\`"
-  return showBackslashEscapedCharacters(text);
-}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/auto-link.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/auto-link.js.es6
deleted file mode 100644
index 1a2bb7c0ff4..00000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/auto-link.js.es6
+++ /dev/null
@@ -1,26 +0,0 @@
-//  This addition handles auto linking of text. When included, it will parse out links and create
-//  `<a href>`s for them.
-
-const urlReplacerArgs = {
-  matcher: /^((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.])(?:[^\s()<>]+|\([^\s()<>]+\))+(?:\([^\s()<>]+\)|[^`!()\[\]{};:'".,<>?«»“”‘’\s]))/,
-  spaceOrTagBoundary: true,
-
-  emitter(matches) {
-    const url = matches[1];
-    let href = url;
-
-    // Don't autolink a markdown link to something
-    if (url.match(/\]\[\d$/)) { return; }
-
-    // If we improperly caught a markdown link abort
-    if (url.match(/\(http/)) { return; }
-
-    if (url.match(/^www/)) { href = "http://" + url; }
-    return ['a', { href }, url];
-  }
-};
-
-export function setup(helper) {
-  helper.inlineRegexp(_.merge({start: 'http'}, urlReplacerArgs));
-  helper.inlineRegexp(_.merge({start: 'www'}, urlReplacerArgs));
-}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
new file mode 100644
index 00000000000..db3931f2422
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
@@ -0,0 +1,269 @@
+let isWhiteSpace;
+
+function trailingSpaceOnly(src, start, max) {
+  let i;
+  for(i=start;i<max;i++) {
+    let code = src.charCodeAt(i);
+    if (code === 0x0A) { return true; }
+    if (!isWhiteSpace(code)) { return false; }
+  }
+
+  return true;
+}
+
+const ATTR_REGEX = /^\s*=(.+)$|((([a-z0-9]*)\s*)=)(["“”'].*["“”']|\S+)/ig;
+
+// parse a tag [test a=1 b=2] to a data structure
+// {tag: "test", attrs={a: "1", b: "2"}
+export function parseBBCodeTag(src, start, max, multiline) {
+
+  let i;
+  let tag;
+  let attrs = {};
+  let closed = false;
+  let length = 0;
+  let closingTag = false;
+
+  // closing tag
+  if (src.charCodeAt(start+1) === 47) {
+    closingTag = true;
+    start += 1;
+  }
+
+  for (i=start+1;i<max;i++) {
+    let letter = src[i];
+    if (!( (letter >= 'a' && letter <= 'z') ||
+         (letter >= 'A' && letter <= 'Z'))) {
+      break;
+    }
+  }
+
+  tag = src.slice(start+1, i);
+
+  if (!tag) {
+    return;
+  }
+
+  if (closingTag) {
+    if (src[i] === ']') {
+
+      if (multiline && !trailingSpaceOnly(src, i+1, max)) {
+        return;
+      }
+
+      return {tag, length: tag.length+3, closing: true};
+    }
+    return;
+  }
+
+  for (;i<max;i++) {
+    let letter = src[i];
+
+    if (letter === ']') {
+      closed = true;
+      break;
+    }
+  }
+
+  if (closed) {
+    length = (i-start)+1;
+
+    let raw = src.slice(start+tag.length+1, i);
+
+    // trivial parser that is going to have to be rewritten at some point
+    if (raw) {
+
+      let match, key, val;
+
+      while(match = ATTR_REGEX.exec(raw)) {
+        if (match[1]) {
+          key = '_default';
+        } else {
+          key = match[4];
+        }
+
+        val = match[1] || match[5];
+
+        if (val) {
+          val = val.trim();
+          val = val.replace(/^["'“”](.*)["'“”]$/, '$1');
+          attrs[key] = val;
+        }
+      }
+    }
+
+    if (multiline && !trailingSpaceOnly(src, start+length, max)) {
+      return;
+    }
+
+    tag = tag.toLowerCase();
+
+    return {tag, attrs, length};
+  }
+}
+
+function applyBBCode(state, startLine, endLine, silent, md) {
+
+  var nextLine,
+      old_parent, old_line_max, rule,
+      start = state.bMarks[startLine] + state.tShift[startLine],
+      initial = start,
+      max = state.eMarks[startLine];
+
+  // [ === 91
+  if (91 !== state.src.charCodeAt(start)) { return false; }
+
+  let info = parseBBCodeTag(state.src, start, max, true);
+
+  if (!info || info.closing) {
+    return false;
+  }
+
+  let ruleInfo = md.block.bbcode.ruler.getRuleForTag(info.tag);
+  if (!ruleInfo) { return false; }
+
+  rule = ruleInfo.rule;
+
+  // Since start is found, we can report success here in validation mode
+  if (silent) { return true; }
+
+  // Search for the end of the block
+  nextLine = startLine;
+
+  let closeTag;
+  let nesting = 0;
+
+  for (;;) {
+    nextLine++;
+    if (nextLine >= endLine) {
+      // unclosed bbcode block should not be autoclosed by end of document.
+      return false;
+    }
+
+    start = state.bMarks[nextLine] + state.tShift[nextLine];
+    max = state.eMarks[nextLine];
+
+    if (start < max && state.sCount[nextLine] < state.blkIndent) {
+      // non-empty line with negative indent should stop the list:
+      // - ```
+      //  test
+      break;
+    }
+
+
+    // bbcode close [ === 91
+    if (91 !== state.src.charCodeAt(start)) { continue; }
+
+    if (state.sCount[nextLine] - state.blkIndent >= 4) {
+      // closing fence should be indented less than 4 spaces
+      continue;
+    }
+
+    closeTag = parseBBCodeTag(state.src, start, max, true);
+
+    if (closeTag && closeTag.closing && closeTag.tag === info.tag) {
+      if (nesting === 0) {
+        break;
+      }
+      nesting--;
+    }
+
+    if (closeTag && !closeTag.closing && closeTag.tag === info.tag) {
+      nesting++;
+    }
+
+    closeTag = null;
+  }
+
+  if (!closeTag) {
+    return false;
+  }
+
+  old_parent = state.parentType;
+  old_line_max = state.lineMax;
+
+  // this will prevent lazy continuations from ever going past our end marker
+  state.lineMax = nextLine;
+
+  if (rule.replace) {
+    let content = state.src.slice(state.bMarks[startLine+1], state.eMarks[nextLine-1]);
+    if (!rule.replace.call(this, state, info, content)) {
+      return false;
+    }
+  } else {
+
+    if (rule.before) {
+      rule.before.call(this, state, info, state.src.slice(initial, initial + info.length + 1));
+    }
+
+    let wrapTag;
+    if (rule.wrap) {
+      let token;
+
+      if (typeof rule.wrap === 'function') {
+        token = new state.Token('wrap_bbcode', 'div', 1);
+        token.level = state.level+1;
+
+        if (!rule.wrap(token, info)) {
+          return false;
+        }
+
+        state.tokens.push(token);
+        state.level = token.level;
+        wrapTag = token.tag;
+
+      } else {
+
+        let split = rule.wrap.split('.');
+        wrapTag = split[0];
+        let className = split.slice(1).join(' ');
+
+        token = state.push('wrap_bbcode', wrapTag, 1);
+
+        if (className) {
+          token.attrs = [['class', className]];
+        }
+      }
+    }
+
+    let lastToken = state.tokens[state.tokens.length-1];
+    lastToken.map    = [ startLine, nextLine ];
+
+    state.md.block.tokenize(state, startLine + 1, nextLine);
+
+    if (rule.wrap) {
+      state.push('wrap_bbcode', wrapTag, -1);
+    }
+
+    if (rule.after) {
+      rule.after.call(this, state, lastToken, state.src.slice(start-2, start + closeTag.length - 1));
+    }
+  }
+
+  state.parentType = old_parent;
+  state.lineMax = old_line_max;
+  state.line = nextLine+1;
+
+  return true;
+}
+
+export function setup(helper) {
+  helper.registerPlugin(md => {
+    const ruler = md.block.bbcode.ruler;
+
+    ruler.push('code', {
+      tag: 'code',
+      replace: function(state, tagInfo, content) {
+        let token;
+        token = state.push('fence', 'code', 0);
+        token.content = content;
+        return true;
+      }
+    });
+
+    isWhiteSpace = md.utils.isWhiteSpace;
+    md.block.ruler.after('fence', 'bbcode', (state, startLine, endLine, silent)=> {
+      return applyBBCode(state, startLine, endLine, silent, md);
+    }, { alt: ['paragraph', 'reference', 'blockquote', 'list'] });
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6
new file mode 100644
index 00000000000..e508509298c
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6
@@ -0,0 +1,244 @@
+import { parseBBCodeTag } from 'pretty-text/engines/discourse-markdown/bbcode-block';
+
+function tokanizeBBCode(state, silent, ruler) {
+
+  let pos = state.pos;
+
+  // 91 = [
+  if (silent || state.src.charCodeAt(pos) !== 91) {
+    return false;
+  }
+
+  const tagInfo = parseBBCodeTag(state.src, pos, state.posMax);
+
+  if (!tagInfo) {
+    return false;
+  }
+
+  let rule, i;
+
+  let ruleInfo = ruler.getRuleForTag(tagInfo.tag);
+  if (!ruleInfo) { return false; }
+  rule = ruleInfo.rule;
+
+
+  if (rule.replace) {
+    // special handling for replace
+    // we pass raw contents to callback so we simply need to greedy match to end tag
+    if (tagInfo.closing) {
+      return false;
+    }
+
+    let closeTag = '[/' + tagInfo.tag + ']';
+    let found = false;
+
+    for(i=state.pos+tagInfo.length; i<=state.posMax-closeTag.length; i++) {
+      if (state.src.charCodeAt(pos) === 91 && state.src.slice(i, i + closeTag.length).toLowerCase() === closeTag) {
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) {
+      return false;
+    }
+
+    let content = state.src.slice(state.pos+tagInfo.length, i);
+
+    if (rule.replace(state, tagInfo, content)) {
+      state.pos = i + closeTag.length;
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+
+    tagInfo.rule = rule;
+
+    let token = state.push('text', '' , 0);
+    token.content = state.src.slice(pos, pos+tagInfo.length);
+    token.meta = 'bbcode';
+
+    state.delimiters.push({
+      bbInfo: tagInfo,
+      marker: 'bb' + tagInfo.tag,
+      open: !tagInfo.closing,
+      close: !!tagInfo.closing,
+      token: state.tokens.length - 1,
+      level: state.level,
+      end: -1,
+      jump: 0
+    });
+
+    state.pos = pos + tagInfo.length;
+    return true;
+  }
+}
+
+function processBBCode(state, silent) {
+  let i,
+      startDelim,
+      endDelim,
+      token,
+      tagInfo,
+      delimiters = state.delimiters,
+      max = delimiters.length;
+
+  if (silent) {
+    return;
+  }
+
+  for (i=0; i<max-1; i++) {
+    startDelim = delimiters[i];
+    tagInfo = startDelim.bbInfo;
+
+    if (!tagInfo) {
+      continue;
+    }
+
+    if (startDelim.end === -1) {
+      continue;
+    }
+
+    endDelim = delimiters[startDelim.end];
+
+    token = state.tokens[startDelim.token];
+    let tag, className;
+
+    if (typeof tagInfo.rule.wrap === 'function') {
+      let content = "";
+      for (let j = startDelim.token+1; j < endDelim.token; j++) {
+        let inner = state.tokens[j];
+        if (inner.type === 'text' && inner.meta !== 'bbcode') {
+          content += inner.content;
+        }
+      }
+      tagInfo.rule.wrap(token, state.tokens[endDelim.token], tagInfo, content);
+      continue;
+    } else {
+      let split = tagInfo.rule.wrap.split('.');
+      tag = split[0];
+      className = split.slice(1).join(' ');
+    }
+
+    token.type = 'bbcode_' + tagInfo.tag + '_open';
+    token.tag = tag;
+    if (className) {
+      token.attrs = [['class', className]];
+    }
+    token.nesting = 1;
+    token.markup = token.content;
+    token.content = '';
+
+    token = state.tokens[endDelim.token];
+    token.type = 'bbcode_' + tagInfo.tag + '_close';
+    token.tag = tag;
+    token.nesting = -1;
+    token.markup = token.content;
+    token.content = '';
+  }
+  return false;
+}
+
+export function setup(helper) {
+  helper.whiteList(['span.bbcode-b', 'span.bbcode-i', 'span.bbcode-u', 'span.bbcode-s']);
+
+  helper.registerOptions(opts => {
+    opts.features['bbcode-inline'] = true;
+  });
+
+  helper.registerPlugin(md => {
+    const ruler = md.inline.bbcode.ruler;
+
+    md.inline.ruler.push('bbcode-inline', (state,silent) => tokanizeBBCode(state,silent,ruler));
+    md.inline.ruler2.before('text_collapse', 'bbcode-inline', processBBCode);
+
+    ruler.push('code', {
+      tag: 'code',
+      replace: function(state, tagInfo, content) {
+        let token;
+        token = state.push('code_inline', 'code', 0);
+        token.content = content;
+        return true;
+      }
+    });
+
+    const simpleUrlRegex = /^http[s]?:\/\//;
+    ruler.push('url', {
+      tag: 'url',
+      wrap: function(startToken, endToken, tagInfo, content) {
+        const url = (tagInfo.attrs['_default'] || content).trim();
+
+        if (simpleUrlRegex.test(url)) {
+          startToken.type = 'link_open';
+          startToken.tag = 'a';
+          startToken.attrs = [['href', url], ['data-bbcode', 'true']];
+          startToken.content = '';
+          startToken.nesting = 1;
+
+          endToken.type = 'link_close';
+          endToken.tag = 'a';
+          endToken.content = '';
+          endToken.nesting = -1;
+        } else {
+          // just strip the bbcode tag
+          endToken.content = '';
+          startToken.content = '';
+
+          // edge case, we don't want this detected as a onebox if auto linked
+          // this ensures it is not stripped
+          startToken.type = 'html_inline';
+        }
+
+        return false;
+      }
+    });
+
+    ruler.push('email', {
+      tag: 'email',
+      replace: function(state, tagInfo, content) {
+        let token;
+        let email = tagInfo.attrs['_default'] || content;
+
+        token = state.push('link_open', 'a', 1);
+        token.attrs = [['href', 'mailto:' + email], ['data-bbcode', 'true']];
+
+        token = state.push('text', '', 0);
+        token.content = content;
+
+        token = state.push('link_close', 'a', -1);
+        return true;
+      }
+    });
+
+    ruler.push('image', {
+      tag: 'img',
+      replace: function(state, tagInfo, content) {
+        let token = state.push('image', 'img', 0);
+        token.attrs = [['src', content],['alt','']];
+        token.children = [];
+        return true;
+      }
+    });
+
+    ruler.push('bold', {
+      tag: 'b',
+      wrap: 'span.bbcode-b',
+    });
+
+    ruler.push('italic', {
+      tag: 'i',
+      wrap: 'span.bbcode-i'
+    });
+
+    ruler.push('underline', {
+      tag: 'u',
+      wrap: 'span.bbcode-u'
+    });
+
+    ruler.push('strike', {
+      tag: 's',
+      wrap: 'span.bbcode-s'
+    });
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6
deleted file mode 100644
index 52e0ecba1e6..00000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6
+++ /dev/null
@@ -1,168 +0,0 @@
-export function register(helper, codeName, args, emitter) {
-  // Optional second param for args
-  if (typeof args === "function") {
-    emitter = args;
-    args = {};
-  }
-
-  helper.replaceBlock({
-    start: new RegExp("\\[" + codeName + "(=[^\\[\\]]+)?\\]([\\s\\S]*)", "igm"),
-    stop: new RegExp("\\[\\/" + codeName + "\\]", "igm"),
-    emitter(blockContents, matches) {
-
-
-      const options = helper.getOptions();
-      while (blockContents.length && (typeof blockContents[0] === "string" || blockContents[0] instanceof String)) {
-        blockContents[0] = String(blockContents[0]).replace(/^\s+/, '');
-        if (!blockContents[0].length) {
-          blockContents.shift();
-        } else {
-          break;
-        }
-      }
-
-      let contents = [];
-      if (blockContents.length) {
-        const nextContents = blockContents.slice(1);
-        blockContents = this.processBlock(blockContents[0], nextContents);
-
-        nextContents.forEach(nc => {
-          blockContents = blockContents.concat(this.processBlock(nc, []));
-        });
-
-        blockContents.forEach(bc => {
-          if (typeof bc === "string" || bc instanceof String) {
-            var processed = this.processInline(String(bc));
-            if (processed.length) {
-              contents.push(['p'].concat(processed));
-            }
-          } else {
-            contents.push(bc);
-          }
-        });
-      }
-      if (!args.singlePara && contents.length === 1 && contents[0] instanceof Array && contents[0][0] === "para") {
-        contents[0].shift();
-        contents = contents[0];
-      }
-      const result = emitter(contents, matches[1] ? matches[1].replace(/^=|\"/g, '') : null, options);
-      return args.noWrap ? result : ['p', result];
-    }
-  });
-};
-
-export function builders(helper) {
-  function replaceBBCode(tag, emitter, opts) {
-    const start = `[${tag}]`;
-    const stop = `[/${tag}]`;
-
-    opts = opts || {};
-    opts = _.merge(opts, { start, stop, emitter });
-    helper.inlineBetween(opts);
-
-    opts = _.merge(opts, { start: start.toUpperCase(), stop: stop.toUpperCase(), emitter });
-    helper.inlineBetween(opts);
-  }
-
-  return {
-    replaceBBCode,
-
-    register(codeName, args, emitter) {
-      register(helper, codeName, args, emitter);
-    },
-
-    rawBBCode(tag, emitter) {
-      replaceBBCode(tag, emitter, { rawContents: true });
-    },
-
-    removeEmptyLines(contents) {
-      const result = [];
-      for (let i=0; i < contents.length; i++) {
-        if (contents[i] !== "\n") { result.push(contents[i]); }
-      }
-      return result;
-    },
-
-    replaceBBCodeParamsRaw(tag, emitter) {
-      var opts = {
-        rawContents: true,
-        emitter(contents) {
-          const m = /^([^\]]+)\]([\S\s]*)$/.exec(contents);
-          if (m) { return emitter.call(this, m[1], m[2]); }
-        }
-      };
-
-      helper.inlineBetween(_.merge(opts, { start: "[" + tag + "=", stop: "[/" + tag + "]" }));
-
-      tag = tag.toUpperCase();
-      helper.inlineBetween(_.merge(opts, { start: "[" + tag + "=", stop: "[/" + tag + "]" }));
-    }
-  };
-}
-
-export function setup(helper) {
-
-  helper.whiteList(['span.bbcode-b', 'span.bbcode-i', 'span.bbcode-u', 'span.bbcode-s']);
-
-  const { replaceBBCode, rawBBCode, removeEmptyLines, replaceBBCodeParamsRaw } = builders(helper);
-
-  replaceBBCode('b', contents => ['span', {'class': 'bbcode-b'}].concat(contents));
-  replaceBBCode('i', contents => ['span', {'class': 'bbcode-i'}].concat(contents));
-  replaceBBCode('u', contents => ['span', {'class': 'bbcode-u'}].concat(contents));
-  replaceBBCode('s', contents => ['span', {'class': 'bbcode-s'}].concat(contents));
-
-  replaceBBCode('ul', contents => ['ul'].concat(removeEmptyLines(contents)));
-  replaceBBCode('ol', contents => ['ol'].concat(removeEmptyLines(contents)));
-  replaceBBCode('li', contents => ['li'].concat(removeEmptyLines(contents)));
-
-  rawBBCode('img', href => ['img', {href}]);
-  rawBBCode('email', contents => ['a', {href: "mailto:" + contents, 'data-bbcode': true}, contents]);
-
-  replaceBBCode('url', contents => {
-    if (!Array.isArray(contents)) { return; }
-
-    const first = contents[0];
-    if (contents.length === 1 && Array.isArray(first) && first[0] === 'a') {
-      // single-line bbcode links shouldn't be oneboxed, so we mark this as a bbcode link.
-      if (typeof first[1] !== 'object') { first.splice(1, 0, {}); }
-      first[1]['data-bbcode'] = true;
-    }
-    return ['concat'].concat(contents);
-  });
-
-  replaceBBCodeParamsRaw('url', function(param, contents) {
-    const url = param.replace(/(^")|("$)/g, '');
-    return ['a', {'href': url}].concat(this.processInline(contents));
-  });
-
-  replaceBBCodeParamsRaw("email", function(param, contents) {
-    return ['a', {href: "mailto:" + param, 'data-bbcode': true}].concat(contents);
-  });
-
-  helper.onParseNode(event => {
-    if (!Array.isArray(event.node)) { return; }
-    const result = [event.node[0]];
-    const nodes = event.node.slice(1);
-    for (let i = 0; i < nodes.length; i++) {
-      if (Array.isArray(nodes[i]) && nodes[i][0] === 'concat') {
-        for (let j = 1; j < nodes[i].length; j++) { result.push(nodes[i][j]); }
-      } else {
-        result.push(nodes[i]);
-      }
-    }
-    for (let i = 0; i < result.length; i++) { event.node[i] = result[i]; }
-  });
-
-  helper.replaceBlock({
-    start: /(\[code\])([\s\S]*)/igm,
-    stop: /\[\/code\]/igm,
-    rawContents: true,
-
-    emitter(blockContents) {
-      const options = helper.getOptions();
-      const inner = blockContents.join("\n");
-      const defaultCodeLang = options.defaultCodeLang;
-      return ['p', ['pre', ['code', {'class': `lang-${defaultCodeLang}`}, inner]]];
-    }
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bold-italics.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bold-italics.js.es6
deleted file mode 100644
index e4d3679316e..00000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bold-italics.js.es6
+++ /dev/null
@@ -1,71 +0,0 @@
-import guid from 'pretty-text/guid';
-
-/**
-  markdown-js doesn't ensure that em/strong codes are present on word boundaries.
-  So we create our own handlers here.
-**/
-
-// From PageDown
-const aLetter = /[a-zA-Z0-9\u00aa\u00b5\u00ba\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376-\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0523\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0621-\u064a\u0660-\u0669\u066e-\u066f\u0671-\u06d3\u06d5\u06e5-\u06e6\u06ee-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07c0-\u07ea\u07f4-\u07f5\u07fa\u0904-\u0939\u093d\u0950\u0958-\u0961\u0966-\u096f\u0971-\u0972\u097b-\u097f\u0985-\u098c\u098f-\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc-\u09dd\u09df-\u09e1\u09e6-\u09f1\u0a05-\u0a0a\u0a0f-\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32-\u0a33\u0a35-\u0a36\u0a38-\u0a39\u0a59-\u0a5c\u0a5e\u0a66-\u0a6f\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2-\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0-\u0ae1\u0ae6-\u0aef\u0b05-\u0b0c\u0b0f-\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32-\u0b33\u0b35-\u0b39\u0b3d\u0b5c-\u0b5d\u0b5f-\u0b61\u0b66-\u0b6f\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99-\u0b9a\u0b9c\u0b9e-\u0b9f\u0ba3-\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0be6-\u0bef\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58-\u0c59\u0c60-\u0c61\u0c66-\u0c6f\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0-\u0ce1\u0ce6-\u0cef\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d28\u0d2a-\u0d39\u0d3d\u0d60-\u0d61\u0d66-\u0d6f\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32-\u0e33\u0e40-\u0e46\u0e50-\u0e59\u0e81-\u0e82\u0e84\u0e87-\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa-\u0eab\u0ead-\u0eb0\u0eb2-\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0ed0-\u0ed9\u0edc-\u0edd\u0f00\u0f20-\u0f29\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8b\u1000-\u102a\u103f-\u1049\u1050-\u1055\u105a-\u105d\u1061\u1065-\u1066\u106e-\u1070\u1075-\u1081\u108e\u1090-\u1099\u10a0-\u10c5\u10d0-\u10fa\u10fc\u1100-\u1159\u115f-\u11a2\u11a8-\u11f9\u1200-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u1676\u1681-\u169a\u16a0-\u16ea\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u17e0-\u17e9\u1810-\u1819\u1820-\u1877\u1880-\u18a8\u18aa\u1900-\u191c\u1946-\u196d\u1970-\u1974\u1980-\u19a9\u19c1-\u19c7\u19d0-\u19d9\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u1b50-\u1b59\u1b83-\u1ba0\u1bae-\u1bb9\u1c00-\u1c23\u1c40-\u1c49\u1c4d-\u1c7d\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u203f-\u2040\u2054\u2071\u207f\u2090-\u2094\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2183-\u2184\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2c6f\u2c71-\u2c7d\u2c80-\u2ce4\u2d00-\u2d25\u2d30-\u2d65\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3006\u3031-\u3035\u303b-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31b7\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fc3\ua000-\ua48c\ua500-\ua60c\ua610-\ua62b\ua640-\ua65f\ua662-\ua66e\ua67f-\ua697\ua717-\ua71f\ua722-\ua788\ua78b-\ua78c\ua7fb-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8d0-\ua8d9\ua900-\ua925\ua930-\ua946\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa50-\uaa59\uac00-\ud7a3\uf900-\ufa2d\ufa30-\ufa6a\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe33-\ufe34\ufe4d-\ufe4f\ufe70-\ufe74\ufe76-\ufefc\uff10-\uff19\uff21-\uff3a\uff3f\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]/;
-
-
-function unhoist(obj,from,to){
-  let unhoisted = 0;
-  const regex = new RegExp(from, "g");
-
-  if(_.isArray(obj)){
-    for (let i=0; i<obj.length; i++){
-      const item = obj[i];
-
-      if (_.isString(item)) {
-        // Odd, but we need +1 for the / in front of /*
-        const matches = item.match(regex);
-        unhoisted -= matches ? matches.length : 0;
-
-        obj[i] = item.replace(regex, to);
-        unhoisted += item.length - obj[i].length;
-      }
-      if (_.isArray(item)) {
-        unhoisted += unhoist(item, from, to);
-      }
-    }
-  }
-  return unhoisted;
-};
-
-export function setup(helper) {
-
-  function replaceMarkdown(match, tag) {
-    const hash = guid();
-
-    helper.registerInline(match, function(text, matched, prev) {
-      if (!text || text.length < match.length + 1) { return; }
-
-      let lastText = prev[prev.length-1];
-      lastText = typeof lastText === "string" && lastText;
-      lastText = lastText && lastText[lastText.length-1];
-
-      if (lastText && (lastText === "/" || lastText.match(aLetter))) { return; }
-      if (text[match.length].match(/\s/)) { return; }
-
-      // hoist out escaped \*
-      text = text.replace(new RegExp("\\\\\\" + match[0], "g"), hash);
-
-      const endText = new RegExp("[^\\s|" + match[0] + "]" + match.replace(/\*/g,"\\*") + "([^" + match[0] + "]|$)");
-      const finish = text.split("\n")[0].search(endText);
-      if (finish && finish >= 0) {
-        const newText = this.processInline(text.substring(match.length, finish+1));
-        const unhoisted_length = unhoist(newText,hash,match[0]);
-        const array = typeof tag === "string" ? [tag].concat(newText) : [tag[0], [tag[1]].concat(newText)];
-        return [(finish + match.length + 1) - unhoisted_length, array];
-      }
-    });
-  }
-
-  replaceMarkdown('***', ['strong','em']);
-  replaceMarkdown('___', ['strong','em']);
-  replaceMarkdown('**', 'strong');
-  replaceMarkdown('__', 'strong');
-  replaceMarkdown('*', 'em');
-  replaceMarkdown('_', 'em');
-};
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
index 2135663ea4c..488a528211e 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
@@ -1,17 +1,55 @@
+function addHashtag(buffer, matches, state) {
+  const options = state.md.options.discourse;
+  const slug = matches[1];
+  const categoryHashtagLookup = options.categoryHashtagLookup;
+  const result = categoryHashtagLookup && categoryHashtagLookup(slug);
+
+  let token;
+
+  if (result) {
+    token = new state.Token('link_open', 'a', 1);
+    token.attrs = [['class', 'hashtag'], ['href', result[0]]];
+    token.block = false;
+    buffer.push(token);
+
+    token = new state.Token('text', '', 0);
+    token.content = '#';
+    buffer.push(token);
+
+    token = new state.Token('span_open', 'span', 1);
+    token.block = false;
+    buffer.push(token);
+
+    token = new state.Token('text', '', 0);
+    token.content = result[1];
+    buffer.push(token);
+
+    buffer.push(new state.Token('span_close', 'span', -1));
+
+    buffer.push(new state.Token('link_close', 'a', -1));
+  } else {
+
+    token = new state.Token('span_open', 'span', 1);
+    token.attrs = [['class', 'hashtag']];
+    buffer.push(token);
+
+    token = new state.Token('text', '', 0);
+    token.content = matches[0];
+    buffer.push(token);
+
+    token = new state.Token('span_close', 'span', -1);
+    buffer.push(token);
+  }
+}
+
 export function setup(helper) {
-  helper.inlineRegexp({
-    start: '#',
-    matcher: /^#([\w-:]{1,101})/i,
-    spaceOrTagBoundary: true,
+  helper.registerPlugin(md=>{
 
-    emitter(matches) {
-      const options = helper.getOptions();
-      const [hashtag, slug] = matches;
-      const categoryHashtagLookup = options.categoryHashtagLookup;
-      const result = categoryHashtagLookup && categoryHashtagLookup(slug);
+    const rule = {
+      matcher: /#([\w-:]{1,101})/,
+      onMatch: addHashtag
+    };
 
-      return result ? ['a', { class: 'hashtag', href: result[0] }, '#', ["span", {}, result[1]]]
-                    : ['span', { class: 'hashtag' }, hashtag];
-    }
+    md.core.textPostProcess.ruler.push('category-hashtag', rule);
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
index b0ac2e5acc5..cd0d7bb7926 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
@@ -1,15 +1,41 @@
-import { censor } from 'pretty-text/censored-words';
-import { registerOption } from 'pretty-text/pretty-text';
+import { censorFn } from 'pretty-text/censored-words';
 
-registerOption((siteSettings, opts) => {
-  opts.features.censored = true;
-  opts.censoredWords = siteSettings.censored_words;
-  opts.censoredPattern = siteSettings.censored_pattern;
-});
+function recurse(tokens, apply) {
+  let i;
+  for(i=0;i<tokens.length;i++) {
+    apply(tokens[i]);
+    if (tokens[i].children) {
+      recurse(tokens[i].children, apply);
+    }
+  }
+}
 
-export function setup(helper) {
-  helper.addPreProcessor(text => {
-    const options = helper.getOptions();
-    return censor(text, options.censoredWords, options.censoredPattern);
+function censorTree(state, censor) {
+  if (!state.tokens) {
+    return;
+  }
+
+  recurse(state.tokens, token => {
+    if (token.content) {
+      token.content = censor(token.content);
+    }
+  });
+}
+
+export function setup(helper) {
+  helper.registerOptions((opts, siteSettings) => {
+    opts.censoredWords = siteSettings.censored_words;
+    opts.censoredPattern = siteSettings.censored_pattern;
+  });
+
+  helper.registerPlugin(md => {
+    const words = md.options.discourse.censoredWords;
+    const patterns = md.options.discourse.censoredPattern;
+
+    if ((words && words.length > 0) || (patterns && patterns.length > 0)) {
+      const replacement = String.fromCharCode(9632);
+      const censor = censorFn(words, patterns, replacement);
+      md.core.ruler.push('censored', state => censorTree(state, censor));
+    }
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6
index 10110f150be..a8def62ce27 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6
@@ -1,25 +1,36 @@
-import { escape } from 'pretty-text/sanitizer';
-import { registerOption } from 'pretty-text/pretty-text';
+// we need a custom renderer for code blocks cause we have a slightly non compliant
+// format with special handling for text and so on
 
-// Support for various code blocks
 const TEXT_CODE_CLASSES = ["text", "pre", "plain"];
 
-function codeFlattenBlocks(blocks) {
-  let result = "";
-  blocks.forEach(function(b) {
-    result += b;
-    if (b.trailing) { result += b.trailing; }
-  });
-  return result;
+
+function render(tokens, idx, options, env, slf, md) {
+  let token = tokens[idx],
+      info = token.info ? md.utils.unescapeAll(token.info) : '',
+      langName = md.options.discourse.defaultCodeLang,
+      className,
+      escapedContent = md.utils.escapeHtml(token.content);
+
+  if (info) {
+    // strip off any additional languages
+    info = info.trim().split(/\s+/g)[0];
+  }
+
+  const acceptableCodeClasses = md.options.discourse.acceptableCodeClasses;
+  if (acceptableCodeClasses && info && acceptableCodeClasses.indexOf(info) !== -1) {
+    langName = info;
+  }
+
+  className = TEXT_CODE_CLASSES.indexOf(info) !== -1 ? 'lang-nohighlight' : 'lang-' + langName;
+
+  return `<pre><code class="${className}">${escapedContent}</code></pre>\n`;
 }
 
-registerOption((siteSettings, opts) => {
-  opts.features.code = true;
-  opts.defaultCodeLang = siteSettings.default_code_lang;
-  opts.acceptableCodeClasses = (siteSettings.highlighted_languages || "").split("|").concat(['auto', 'nohighlight']);
-});
-
 export function setup(helper) {
+  helper.registerOptions((opts, siteSettings) => {
+    opts.defaultCodeLang = siteSettings.default_code_lang;
+    opts.acceptableCodeClasses = (siteSettings.highlighted_languages || "").split("|").concat(['auto', 'nohighlight']);
+  });
 
   helper.whiteList({
     custom(tag, name, value) {
@@ -32,50 +43,7 @@ export function setup(helper) {
     }
   });
 
-  helper.replaceBlock({
-    start: /^`{3}([^\n\[\]]+)?\n?([\s\S]*)?/gm,
-    stop: /^```$/gm,
-    withoutLeading: /\[quote/gm, //if leading text contains a quote this should not match
-    emitter(blockContents, matches) {
-      const opts = helper.getOptions();
-
-      let codeLang = opts.defaultCodeLang;
-      const acceptableCodeClasses = opts.acceptableCodeClasses;
-      if (acceptableCodeClasses && matches[1] && acceptableCodeClasses.indexOf(matches[1]) !== -1) {
-        codeLang = matches[1];
-      }
-
-      if (TEXT_CODE_CLASSES.indexOf(matches[1]) !== -1) {
-        return ['p', ['pre', ['code', {'class': 'lang-nohighlight'}, codeFlattenBlocks(blockContents) ]]];
-      } else  {
-        return ['p', ['pre', ['code', {'class': 'lang-' + codeLang}, codeFlattenBlocks(blockContents) ]]];
-      }
-    }
-  });
-
-  helper.replaceBlock({
-    start: /(<pre[^\>]*\>)([\s\S]*)/igm,
-    stop: /<\/pre>/igm,
-    rawContents: true,
-    skipIfTradtionalLinebreaks: true,
-
-    emitter(blockContents) {
-      return ['p', ['pre', codeFlattenBlocks(blockContents)]];
-    }
-  });
-
-  // Ensure that content in a code block is fully escaped. This way it's not white listed
-  // and we can use HTML and Javascript examples.
-  helper.onParseNode(function(event) {
-    const node = event.node,
-    path = event.path;
-
-    if (node[0] === 'code') {
-      const regexp = (path && path[path.length-1] && path[path.length-1][0] && path[path.length-1][0] === "pre") ?
-                     / +$/g : /^ +| +$/g;
-
-      const contents = node[node.length-1];
-      node[node.length-1] = escape(contents.replace(regexp,''));
-    }
+  helper.registerPlugin(md=>{
+    md.renderer.rules.fence = (tokens,idx,options,env,slf)=>render(tokens,idx,options,env,slf,md);
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
index 20577a97ad5..0472216a65c 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
@@ -1,108 +1,243 @@
-import { registerOption } from 'pretty-text/pretty-text';
 import { buildEmojiUrl, isCustomEmoji } from 'pretty-text/emoji';
 import { translations } from 'pretty-text/emoji/data';
 
-let _unicodeReplacements;
-let _unicodeRegexp;
-export function setUnicodeReplacements(replacements) {
-  _unicodeReplacements = replacements;
-  if (replacements) {
-    _unicodeRegexp = new RegExp(Object.keys(replacements).join("|"), "g");
-  }
-};
+const MAX_NAME_LENGTH = 60;
 
-function escapeRegExp(s) {
-  return s.replace(/[-/\\^$*+?.()|[\]{}]/gi, '\\$&');
-}
+let translationTree = null;
 
-function checkPrev(prev) {
-  if (prev && prev.length) {
-    const lastToken = prev[prev.length-1];
-    if (lastToken && lastToken.charAt) {
-      const lastChar = lastToken.charAt(lastToken.length-1);
-      if (!/\W/.test(lastChar)) return false;
-    }
-  }
-  return true;
-}
+// This allows us to efficiently search for aliases
+// We build a data structure that allows us to quickly
+// search through our N next chars to see if any match
+// one of our alias emojis.
+//
+function buildTranslationTree() {
+  let tree = [];
+  let lastNode;
 
-registerOption((siteSettings, opts, state) => {
-  opts.features.emoji = !!siteSettings.enable_emoji;
-  opts.emojiSet = siteSettings.emoji_set || "";
-  opts.customEmoji = state.customEmoji;
-});
+  Object.keys(translations).forEach(function(key){
+    let i;
+    let node = tree;
 
-export function setup(helper) {
+    for(i=0;i<key.length;i++) {
+      let code = key.charCodeAt(i);
+      let j;
 
-  helper.whiteList('img.emoji');
+      let found = false;
 
-  function imageFor(code) {
-    code = code.toLowerCase();
-    const opts = helper.getOptions();
-    const url = buildEmojiUrl(code, opts);
-    if (url) {
-      const title = `:${code}:`;
-      const classes = isCustomEmoji(code, opts) ? "emoji emoji-custom" : "emoji";
-      return ['img', { href: url, title, 'class': classes, alt: title }];
-    }
-  }
-
-  const translationsWithColon = {};
-  Object.keys(translations).forEach(t => {
-    if (t[0] === ':') {
-      translationsWithColon[t] = translations[t];
-    } else {
-      const replacement = translations[t];
-      helper.inlineReplace(t, (token, match, prev) => {
-        return checkPrev(prev) ? imageFor(replacement) : token;
-      });
-    }
-  });
-  const translationColonRegexp = new RegExp(Object.keys(translationsWithColon).map(t => `(${escapeRegExp(t)})`).join("|"));
-
-  helper.registerInline(':', (text, match, prev) => {
-    const endPos = text.indexOf(':', 1);
-    const firstSpace = text.search(/\s/);
-    if (!checkPrev(prev)) { return; }
-
-    // If there is no trailing colon, check our translations that begin with colons
-    if (endPos === -1 || (firstSpace !== -1 && endPos > firstSpace)) {
-      translationColonRegexp.lastIndex = 0;
-      const m = translationColonRegexp.exec(text);
-      if (m && m[0] && text.indexOf(m[0]) === 0) {
-        // Check outer edge
-        const lastChar = text.charAt(m[0].length);
-        if (lastChar && !/\s/.test(lastChar)) return;
-        const contents = imageFor(translationsWithColon[m[0]]);
-        if (contents) {
-          return [m[0].length, contents];
+      for (j=0;j<node.length;j++){
+        if (node[j][0] === code) {
+          node = node[j][1];
+          found = true;
+          break;
         }
       }
+
+      if (!found) {
+        // token, children, value
+        let tmp = [code, []];
+        node.push(tmp);
+        lastNode = tmp;
+        node = tmp[1];
+      }
+    }
+
+    lastNode[1] = translations[key];
+  });
+
+  return tree;
+}
+
+
+function imageFor(code, opts) {
+  code = code.toLowerCase();
+  const url = buildEmojiUrl(code, opts);
+  if (url) {
+    const title = `:${code}:`;
+    const classes = isCustomEmoji(code, opts) ? "emoji emoji-custom" : "emoji";
+    return {url, title, classes};
+  }
+}
+
+function getEmojiName(content, pos, state) {
+
+  if (content.charCodeAt(pos) !== 58) {
+    return;
+  }
+
+  if (pos > 0) {
+    let prev = content.charCodeAt(pos-1);
+    if (!state.md.utils.isSpace(prev) && !state.md.utils.isPunctChar(String.fromCharCode(prev))) {
       return;
     }
+  }
 
-    // Simple find and replace from our array
-    const between = text.slice(1, endPos);
-    const contents = imageFor(between);
-    if (contents) {
-      return [endPos+1, contents];
+  pos++;
+  if (content.charCodeAt(pos) === 58) {
+    return;
+  }
+
+  let length = 0;
+  while(length < MAX_NAME_LENGTH) {
+    length++;
+
+    if (content.charCodeAt(pos+length) === 58) {
+      // check for t2-t6
+      if (content.substr(pos+length+1, 3).match(/t[2-6]:/)) {
+        length += 3;
+      }
+      break;
     }
-  });
 
-  helper.addPreProcessor(text => {
-    if (_unicodeReplacements) {
-      _unicodeRegexp.lastIndex = 0;
+    if (pos+length > content.length) {
+      return;
+    }
+  }
 
-      let m;
-      while ((m = _unicodeRegexp.exec(text)) !== null) {
-        let replacement = ":" + _unicodeReplacements[m[0]] + ":";
-        const before = text.charAt(m.index-1);
-        if (!/\B/.test(before)) {
-          replacement = "\u200b" + replacement;
+  if (length === MAX_NAME_LENGTH) {
+    return;
+  }
+
+  return content.substr(pos, length);
+}
+
+// straight forward :smile: to emoji image
+function getEmojiTokenByName(name, state) {
+
+  let info;
+  if (info = imageFor(name, state.md.options.discourse)) {
+    let token = new state.Token('emoji', 'img', 0);
+    token.attrs = [['src', info.url],
+                   ['title', info.title],
+                   ['class', info.classes],
+                   ['alt', info.title]];
+
+    return token;
+  }
+}
+
+function getEmojiTokenByTranslation(content, pos, state) {
+
+  translationTree = translationTree || buildTranslationTree();
+
+  let currentTree = translationTree;
+
+  let i;
+  let search = true;
+  let found = false;
+  let start = pos;
+
+  while(search) {
+
+    search = false;
+    let code = content.charCodeAt(pos);
+
+    for (i=0;i<currentTree.length;i++) {
+      if(currentTree[i][0] === code) {
+        currentTree = currentTree[i][1];
+        pos++;
+        search = true;
+        if (typeof currentTree === "string") {
+          found = currentTree;
         }
-        text = text.replace(m[0], replacement);
+        break;
       }
     }
-    return text;
+  }
+
+  if (!found) {
+    return;
+  }
+
+  // quick boundary check
+  if (start > 0) {
+    let leading = content.charAt(start-1);
+    if (!state.md.utils.isSpace(leading.charCodeAt(0)) && !state.md.utils.isPunctChar(leading)) {
+      return;
+    }
+  }
+
+  // check trailing for punct or space
+  if (pos < content.length) {
+    let trailing = content.charCodeAt(pos);
+    if (!state.md.utils.isSpace(trailing)){
+      return;
+    }
+  }
+
+  let token = getEmojiTokenByName(found, state);
+  if (token) {
+    return { pos, token };
+  }
+}
+
+function applyEmoji(content, state, emojiUnicodeReplacer) {
+  let i;
+  let result = null;
+  let contentToken = null;
+
+  let start = 0;
+
+  if (emojiUnicodeReplacer) {
+    content = emojiUnicodeReplacer(content);
+  }
+
+  let endToken = content.length;
+
+  for (i=0; i<content.length-1; i++) {
+    let offset = 0;
+    let emojiName = getEmojiName(content,i,state);
+    let token = null;
+
+    if (emojiName) {
+      token = getEmojiTokenByName(emojiName, state);
+      if (token) {
+        offset = emojiName.length+2;
+      }
+    }
+
+    if (!token) {
+      // handle aliases (note: we can't do this in inline cause ; is not a split point)
+      //
+      let info = getEmojiTokenByTranslation(content, i, state);
+
+      if (info) {
+        offset = info.pos - i;
+        token = info.token;
+      }
+    }
+
+    if (token) {
+      result = result || [];
+      if (i-start>0) {
+        contentToken = new state.Token('text', '', 0);
+        contentToken.content = content.slice(start,i);
+        result.push(contentToken);
+      }
+
+      result.push(token);
+      endToken = start = i + offset;
+    }
+  }
+
+  if (endToken < content.length) {
+    contentToken = new state.Token('text', '', 0);
+    contentToken.content = content.slice(endToken);
+    result.push(contentToken);
+  }
+
+  return result;
+}
+
+export function setup(helper) {
+  helper.registerOptions((opts, siteSettings, state)=>{
+    opts.features.emoji = !!siteSettings.enable_emoji;
+    opts.emojiSet = siteSettings.emoji_set || "";
+    opts.customEmoji = state.customEmoji;
+  });
+
+  helper.registerPlugin((md)=>{
+    md.core.ruler.push('emoji', state => md.options.discourse.helpers.textReplace(
+      state, (c,s)=>applyEmoji(c,s,md.options.discourse.emojiUnicodeReplacer))
+    );
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6
new file mode 100644
index 00000000000..c689d5c633b
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6
@@ -0,0 +1,60 @@
+// since the markdown.it interface is a bit on the verbose side
+// we can keep some general patterns here
+
+
+export default null;
+
+// creates a rule suitable for inline parsing and replacement
+//
+// example:
+// const rule = inlineRegexRule(md, {
+//   start: '#',
+//   matcher: /^#([\w-:]{1,101})/i,
+//   emitter: emitter
+// });
+
+
+// based off https://github.com/markdown-it/markdown-it-emoji/blob/master/dist/markdown-it-emoji.js
+//
+export function textReplace(state, callback, skipAllLinks) {
+  var i, j, l, tokens, token,
+        blockTokens = state.tokens,
+        linkLevel = 0;
+
+  for (j = 0, l = blockTokens.length; j < l; j++) {
+    if (blockTokens[j].type !== 'inline') { continue; }
+    tokens = blockTokens[j].children;
+
+    // We scan from the end, to keep position when new tags added.
+    // Use reversed logic in links start/end match
+    for (i = tokens.length - 1; i >= 0; i--) {
+      token = tokens[i];
+
+      if (skipAllLinks) {
+        if (token.type === 'link_open' || token.type === 'link_close') {
+          linkLevel -= token.nesting;
+        } else if (token.type === 'html_inline') {
+          if (token.content.substr(0,2).toLowerCase() === "<a") {
+            linkLevel++;
+          } else if (token.content.substr(0,4).toLowerCase() === "</a>") {
+            linkLevel--;
+          }
+        }
+      } else {
+        if (token.type === 'link_open' || token.type === 'link_close') {
+          if (token.info === 'auto') { linkLevel -= token.nesting; }
+        }
+      }
+
+      if (token.type === 'text' && linkLevel === 0) {
+        let split;
+        if(split = callback(token.content, state)) {
+          // replace current node
+          blockTokens[j].children = tokens = state.md.utils.arrayReplaceAt(
+            tokens, i, split
+          );
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js.es6
new file mode 100644
index 00000000000..02adc2cf1e0
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js.es6
@@ -0,0 +1,71 @@
+// special handling for IMG tags on a line by themeselves
+// we always have to handle it as so it is an inline
+// see: https://talk.commonmark.org/t/newline-and-img-tags/2511
+
+const REGEX = /^<img.*\\?>\s*$/i;
+
+function rule(state, startLine, endLine) {
+
+  var nextLine, token, lineText,
+      pos = state.bMarks[startLine] + state.tShift[startLine],
+      max = state.eMarks[startLine];
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+
+  if (!state.md.options.html) { return false; }
+
+  if (state.src.charCodeAt(pos) !== 0x3C/* < */) { return false; }
+  let pos1 = state.src.charCodeAt(pos+1);
+  if (pos1 !== 73 /* I */ && pos1 !== 105 /* i */) { return false; }
+
+  lineText = state.src.slice(pos, max);
+
+  if (!REGEX.test(lineText)) {
+    return false;
+  }
+
+  let lines = [];
+  lines.push(lineText);
+
+  nextLine = startLine + 1;
+  for (; nextLine < endLine; nextLine++) {
+    pos = state.bMarks[nextLine] + state.tShift[nextLine];
+    max = state.eMarks[nextLine];
+    lineText = state.src.slice(pos, max);
+
+    if (lineText.trim() === "") {
+      break;
+    }
+
+    if (!REGEX.test(lineText)) {
+      break;
+    }
+
+    lines.push(lineText);
+  }
+
+  state.line = nextLine;
+  let oldParentType = state.parentType;
+  state.parentType = 'paragraph';
+
+  token = state.push('paragraph_open', 'p', 1);
+  token.map = [startLine, state.line];
+
+  token = state.push('inline', '', 0);
+  token.content = lines.join('\n');
+  token.map = [startLine, state.line];
+  token.children = [];
+
+  token = state.push('paragraph_close', 'p', -1);
+  state.parentType = oldParentType;
+
+  return true;
+}
+
+
+export function setup(helper) {
+  helper.registerPlugin(md=>{
+     md.block.ruler.before('html_block', 'html_img', rule, {alt: ['fence']});
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html.js.es6
deleted file mode 100644
index 0e5c5e4a18c..00000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html.js.es6
+++ /dev/null
@@ -1,50 +0,0 @@
-const BLOCK_TAGS = ['address', 'article', 'aside', 'audio', 'blockquote', 'canvas', 'dd', 'details',
-                    'div', 'dl', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3',
-                    'h4', 'h5', 'h6', 'header', 'hgroup', 'hr', 'iframe', 'noscript', 'ol', 'output',
-                    'p', 'pre', 'section', 'table', 'tfoot', 'ul', 'video', 'summary'];
-
-function splitAtLast(tag, block, next, first) {
-  const endTag = `</${tag}>`;
-  let endTagIndex = first ? block.indexOf(endTag) : block.lastIndexOf(endTag);
-
-  if (endTagIndex !== -1) {
-    endTagIndex += endTag.length;
-
-    const trailing = block.substr(endTagIndex).replace(/^\s+/, '');
-    if (trailing.length) {
-      next.unshift(trailing);
-    }
-
-    return [ block.substr(0, endTagIndex) ];
-  }
-};
-
-export function setup(helper) {
-
-  // If a row begins with HTML tags, don't parse it.
-  helper.registerBlock('html', function(block, next) {
-    let split, pos;
-
-    // Fix manual blockquote paragraphing even though it's not strictly correct
-    // PERF NOTE: /\S+<blockquote/ is a perf hog for search, try on huge string
-    if (pos = block.search(/<blockquote/) >= 0) {
-      if(block.substring(0, pos).search(/\s/) === -1) {
-        split = splitAtLast('blockquote', block, next, true);
-        if (split) { return this.processInline(split[0]); }
-      }
-    }
-
-    const m = /^\s*<\/?([^>]+)\>/.exec(block);
-    if (m && m[1]) {
-      const tag = m[1].split(/\s/);
-      if (tag && tag[0] && BLOCK_TAGS.indexOf(tag[0]) !== -1) {
-        split = splitAtLast(tag[0], block, next);
-        if (split) {
-          if (split.length === 1 && split[0] === block) { return; }
-          return split;
-        }
-        return [ block.toString() ];
-      }
-    }
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
index 115f58997da..54a5284372b 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
@@ -1,49 +1,48 @@
-/**
-  Supports our custom @mention syntax for calling out a user in a post.
-  It will add a special class to them, and create a link if the user is found in a
-  local map.
-**/
+function addMention(buffer, matches, state) {
+  let username = matches[1] || matches[2];
+  let mentionLookup = state.md.options.discourse.mentionLookup;
+  let getURL = state.md.options.discourse.getURL;
+
+  let type = mentionLookup && mentionLookup(username);
+
+  let tag = 'a';
+  let className = 'mention';
+  let href = null;
+
+  if (type === 'user') {
+    href = getURL('/u/') + username.toLowerCase();
+  } else if (type === 'group') {
+    href = getURL('/groups/') + username;
+    className = 'mention-group';
+  } else {
+    tag = 'span';
+  }
+
+  let token = new state.Token('mention_open', tag, 1);
+  token.attrs = [['class', className]];
+  if (href) {
+    token.attrs.push(['href', href]);
+  }
+
+  buffer.push(token);
+
+  token = new state.Token('text', '', 0);
+  token.content = '@'+username;
+
+  buffer.push(token);
+
+  token = new state.Token('mention_close', tag, -1);
+  buffer.push(token);
+}
+
 export function setup(helper) {
+  helper.registerPlugin(md => {
 
-  // We have to prune @mentions that are within links.
-  helper.onParseNode(event => {
-    const node = event.node,
-    path = event.path;
+    const rule = {
+      matcher: /@(\w[\w.-]{0,58}\w)|@(\w)/,
+      onMatch: addMention
+    };
 
-    if (node[1] && node[1]["class"] === 'mention')  {
-      const parent = path[path.length - 1];
-
-      // If the parent is an 'a', remove it
-      if (parent && parent[0] === 'a') {
-        const name = node[2];
-        node.length = 0;
-        node[0] = "__RAW";
-        node[1] = name;
-      }
-    }
-  });
-
-  helper.inlineRegexp({
-    start: '@',
-    // NOTE: since we can't use SiteSettings here (they loads later in process)
-    // we are being less strict to account for more cases than allowed
-    matcher: /^@(\w[\w.-]{0,59})\b/i,
-    wordBoundary: true,
-
-    emitter(matches) {
-      const mention = matches[0].trim();
-      const name = matches[1];
-      const opts = helper.getOptions();
-      const mentionLookup = opts.mentionLookup;
-
-      const type = mentionLookup && mentionLookup(name);
-      if (type === "user") {
-        return ['a', {'class': 'mention', href: opts.getURL("/u/") + name.toLowerCase()}, mention];
-      } else if (type === "group") {
-        return ['a', {'class': 'mention-group', href: opts.getURL("/groups/") + name}, mention];
-      } else {
-        return ['span', {'class': 'mention'}, mention];
-      }
-    }
+    md.core.textPostProcess.ruler.push('mentions', rule);
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6
index 3e74225e9c3..f1eb2ba759d 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6
@@ -1,27 +1,53 @@
-// Support for the newline behavior in markdown that most expect. Look through all text nodes
-// in the tree, replace any new lines with `br`s.
+// see: https://github.com/markdown-it/markdown-it/issues/375
+//
+// we use a custom paragraph rule cause we have to signal when a
+// link starts with a space, so we can bypass a onebox
+// this is a freedom patch, so careful, may break on updates
+
+
+function newline(state, silent) {
+  var token, pmax, max, pos = state.pos;
+
+  if (state.src.charCodeAt(pos) !== 0x0A/* \n */) { return false; }
+
+  pmax = state.pending.length - 1;
+  max = state.posMax;
+
+  // '  \n' -> hardbreak
+  // Lookup in pending chars is bad practice! Don't copy to other rules!
+  // Pending string is stored in concat mode, indexed lookups will cause
+  // convertion to flat mode.
+  if (!silent) {
+    if (pmax >= 0 && state.pending.charCodeAt(pmax) === 0x20) {
+      if (pmax >= 1 && state.pending.charCodeAt(pmax - 1) === 0x20) {
+        state.pending = state.pending.replace(/ +$/, '');
+        token = state.push('hardbreak', 'br', 0);
+      } else {
+        state.pending = state.pending.slice(0, -1);
+        token = state.push('softbreak', 'br', 0);
+      }
+
+    } else {
+      token = state.push('softbreak', 'br', 0);
+    }
+  }
+
+  pos++;
+
+  // skip heading spaces for next line
+  while (pos < max && state.md.utils.isSpace(state.src.charCodeAt(pos))) {
+    if (token) {
+      token.leading_space = true;
+    }
+    pos++;
+  }
+
+  state.pos = pos;
+  return true;
+};
 
 export function setup(helper) {
-  helper.postProcessText((text, event) => {
-    const { options, insideCounts } = event;
-    if (options.traditionalMarkdownLinebreaks || (insideCounts.pre > 0)) { return; }
-
-    if (text === "\n") {
-      // If the tag is just a new line, replace it with a `<br>`
-      return [['br']];
-    } else {
-      // If the text node contains new lines, perhaps with text between them, insert the
-      // `<br>` tags.
-      const split = text.split(/\n+/);
-      if (split.length) {
-        const replacement = [];
-        for (var i=0; i<split.length; i++) {
-          if (split[i].length > 0) { replacement.push(split[i]); }
-          if (i !== split.length-1) { replacement.push(['br']); }
-        }
-
-        return replacement;
-      }
-    }
+  helper.registerPlugin(md => {
+    md.inline.ruler.at('newline', newline);
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
index ee73c029257..eff7ee4ae2c 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
@@ -1,68 +1,116 @@
 import { lookupCache } from 'pretty-text/oneboxer';
+import { cachedInlineOnebox } from 'pretty-text/inline-oneboxer';
 
-//  Given a node in the document and its parent, determine whether it is on its own line or not.
-function isOnOneLine(link, parent) {
-  if (!parent) { return false; }
+const ONEBOX = 1;
+const INLINE = 2;
 
-  const siblings = parent.slice(1);
-  if ((!siblings) || (siblings.length < 1)) { return false; }
-
-  const idx = siblings.indexOf(link);
-  if (idx === -1) { return false; }
-
-  if (idx > 0) {
-    const prev = siblings[idx-1];
-    if (prev[0] !== 'br') { return false; }
+function applyOnebox(state, silent) {
+  if (silent || !state.tokens) {
+    return;
   }
 
-  if (idx < siblings.length) {
-    const next = siblings[idx+1];
-    if (next && (!((next[0] === 'br') || (typeof next === 'string' && next.trim() === "")))) { return false; }
-  }
+  for(let i=1;i<state.tokens.length;i++) {
+    let token = state.tokens[i];
+    let prev = state.tokens[i-1];
+    let prevAccepted =  prev.type === "paragraph_open" && prev.level === 0;
+    let mode = prevAccepted ? ONEBOX : INLINE;
 
-  return true;
-}
+    if (token.type === "inline" && prevAccepted) {
 
-//  We only onebox stuff that is on its own line.
-export function setup(helper) {
-  helper.onParseNode(event => {
-    const node = event.node,
-    path = event.path;
+      let children = token.children;
+      for(let j=0;j<children.length-2;j++){
+        let child = children[j];
 
-    // We only care about links
-    if (node[0] !== 'a')  { return; }
+        if (child.type === "link_open" && child.markup === 'linkify' && child.info === 'auto') {
 
-    const parent = path[path.length - 1];
+          if (j > children.length-3) {
+            continue;
+          }
 
-    // We don't onebox bbcode
-    if (node[1]['data-bbcode']) {
-      delete node[1]['data-bbcode'];
-      return;
-    }
+          if (j === 0 && token.leading_space) {
+            mode = INLINE;
+          } else if (j > 0) {
+            let prevSibling = children[j-1];
+            if (prevSibling.tag !== 'br' || prevSibling.leading_space) {
+              mode = INLINE;
+            }
+          }
 
-    // We don't onebox mentions
-    if (node[1]['class'] === 'mention') { return; }
+          // look ahead for soft or hard break
+          let text = children[j+1];
+          let close = children[j+2];
+          let lookahead = children[j+3];
 
-    // Don't onebox links within a list
-    for (var i=0; i<path.length; i++) {
-      if (path[i][0] === 'li') { return; }
-    }
+          if (lookahead && lookahead.tag !== 'br') {
+            mode = INLINE;
+          }
 
-    // If the link has a different label text than the link itself, don't onebox it.
-    const label = node[node.length-1];
-    if (label !== node[1]['href']) { return; }
+          // check attrs only include a href
+          let attrs = child.attrs;
 
-    if (isOnOneLine(node, parent)) {
+          if (!attrs || attrs.length !== 1 || attrs[0][0] !== "href") {
+            continue;
+          }
 
-      node[1]['class'] = 'onebox';
-      node[1].target = '_blank';
+          let href = attrs[0][1];
 
-      const contents = lookupCache(node[1].href);
-      if (contents) {
-        node[0] = '__RAW';
-        node[1] = contents;
-        node.length = 2;
+          // edge case ... what if this is not http or protocoless?
+          if (!/^http|^\/\//i.test(href)) {
+            continue;
+          }
+
+          // we already know text matches cause it is an auto link
+          if (!close || close.type !== "link_close") {
+            continue;
+          }
+
+          if (mode === ONEBOX) {
+            // we already determined earlier that 0 0 was href
+            let cached = lookupCache(attrs[0][1]);
+
+            if (cached) {
+              // replace link with 2 blank text nodes and inline html for onebox
+              child.type = 'html_raw';
+              child.content = cached;
+              child.inline = true;
+
+              text.type = 'html_raw';
+              text.content = '';
+              text.inline = true;
+
+              close.type = 'html_raw';
+              close.content = '';
+              close.inline = true;
+
+            } else {
+              // decorate...
+              attrs.push(["class", "onebox"]);
+              attrs.push(["target", "_blank"]);
+            }
+          } else if (mode === INLINE) {
+            let onebox = cachedInlineOnebox(href);
+
+            let options = state.md.options.discourse;
+            if (options.lookupInlineOnebox) {
+              onebox = options.lookupInlineOnebox(href);
+            }
+
+            if (onebox) {
+              text.content = onebox.title;
+            } else if (state.md.options.discourse.previewing) {
+              attrs.push(["class", "inline-onebox-loading"]);
+            }
+          }
+
+        }
       }
     }
+  }
+}
+
+
+export function setup(helper) {
+  helper.registerPlugin(md => {
+    md.core.ruler.after('linkify', 'onebox', applyOnebox);
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6
new file mode 100644
index 00000000000..dbc43b275f7
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6
@@ -0,0 +1,80 @@
+// see: https://github.com/markdown-it/markdown-it/issues/375
+//
+// we use a custom paragraph rule cause we have to signal when a
+// link starts with a space, so we can bypass a onebox
+// this is a freedom patch, so careful, may break on updates
+function paragraph(state, startLine/*, endLine*/) {
+  var content, terminate, i, l, token, oldParentType,
+      nextLine = startLine + 1,
+      terminatorRules = state.md.block.ruler.getRules('paragraph'),
+      endLine = state.lineMax,
+      hasLeadingSpace = false;
+
+  oldParentType = state.parentType;
+  state.parentType = 'paragraph';
+
+  // jump line-by-line until empty one or EOF
+  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
+    // this would be a code block normally, but after paragraph
+    // it's considered a lazy continuation regardless of what's there
+    if (state.sCount[nextLine] - state.blkIndent > 3) { continue; }
+
+    // quirk for blockquotes, this line should already be checked by that rule
+    if (state.sCount[nextLine] < 0) { continue; }
+
+    // Some tags can terminate paragraph without empty line.
+    terminate = false;
+    for (i = 0, l = terminatorRules.length; i < l; i++) {
+      if (terminatorRules[i](state, nextLine, endLine, true)) {
+        terminate = true;
+        break;
+      }
+    }
+    if (terminate) { break; }
+  }
+
+  // START CUSTOM CODE
+  content = state.getLines(startLine, nextLine, state.blkIndent, false);
+
+  i=0;
+  let contentLength = content.length;
+  while (i < contentLength) {
+    let chr = content.charCodeAt(i);
+    if (chr === 0x0A) {
+      hasLeadingSpace = false;
+    } else if (state.md.utils.isWhiteSpace(chr)) {
+      hasLeadingSpace = true;
+    } else {
+      break;
+    }
+    i++;
+  }
+
+  content = content.trim();
+  // END CUSTOM CODE
+
+  state.line = nextLine;
+
+  token               = state.push('paragraph_open', 'p', 1);
+  token.map           = [ startLine, state.line ];
+  // CUSTOM
+  token.leading_space = hasLeadingSpace;
+
+  token               = state.push('inline', '', 0);
+  token.content       = content;
+  token.map           = [ startLine, state.line ];
+  token.children      = [];
+  // CUSTOM
+  token.leading_space = hasLeadingSpace;
+
+  token          = state.push('paragraph_close', 'p', -1);
+
+  state.parentType = oldParentType;
+  return true;
+};
+
+export function setup(helper) {
+  helper.registerPlugin(md => {
+    md.block.ruler.at('paragraph', paragraph);
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6
deleted file mode 100644
index 87bc948d69c..00000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6
+++ /dev/null
@@ -1,80 +0,0 @@
-import { register } from 'pretty-text/engines/discourse-markdown/bbcode';
-import { registerOption } from 'pretty-text/pretty-text';
-import { performEmojiUnescape } from 'pretty-text/emoji';
-
-registerOption((siteSettings, opts) => {
-  opts.enableEmoji = siteSettings.enable_emoji;
-  opts.emojiSet = siteSettings.emoji_set;
-});
-
-
-export function setup(helper) {
-  register(helper, 'quote', {noWrap: true, singlePara: true}, (contents, bbParams, options) => {
-
-    const params = {'class': 'quote'};
-    let username = null;
-    const opts = helper.getOptions();
-
-    if (bbParams) {
-      const paramsSplit = bbParams.split(/\,\s*/);
-      username = paramsSplit[0];
-
-      paramsSplit.forEach(function(p,i) {
-        if (i > 0) {
-          var assignment = p.split(':');
-          if (assignment[0] && assignment[1]) {
-            const escaped = helper.escape(assignment[0]);
-            // don't escape attributes, makes no sense
-            if (escaped === assignment[0]) {
-              params['data-' + assignment[0]] = helper.escape(assignment[1].trim());
-            }
-          }
-        }
-      });
-    }
-
-    let avatarImg;
-    const postNumber = parseInt(params['data-post'], 10);
-    const topicId = parseInt(params['data-topic'], 10);
-
-    if (options.lookupAvatarByPostNumber) {
-      // client-side, we can retrieve the avatar from the post
-      avatarImg = options.lookupAvatarByPostNumber(postNumber, topicId);
-    } else if (options.lookupAvatar) {
-      // server-side, we need to lookup the avatar from the username
-      avatarImg = options.lookupAvatar(username);
-    }
-
-    // If there's no username just return a simple quote
-    if (!username) {
-      return ['p', ['aside', params, ['blockquote'].concat(contents)]];
-    }
-
-    const header = ['div', {'class': 'title'},
-                    ['div', {'class': 'quote-controls'}],
-                    avatarImg ? ['__RAW', avatarImg] : "",
-                    username ? `${username}:` : "" ];
-
-    if (options.topicId && postNumber && options.getTopicInfo && topicId !== options.topicId) {
-      const topicInfo = options.getTopicInfo(topicId);
-      if (topicInfo) {
-        var href = topicInfo.href;
-        if (postNumber > 0) { href += "/" + postNumber; }
-        // get rid of username said stuff
-        header.pop();
-
-        let title = topicInfo.title;
-
-        if (opts.enableEmoji) {
-          title = performEmojiUnescape(topicInfo.title, {
-            getURL: opts.getURL, emojiSet: opts.emojiSet
-          });
-        }
-
-        header.push(['a', {'href': href}, title]);
-      }
-    }
-
-    return ['aside', params, header, ['blockquote'].concat(contents)];
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
new file mode 100644
index 00000000000..06de98068f7
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
@@ -0,0 +1,133 @@
+import { performEmojiUnescape } from 'pretty-text/emoji';
+
+const rule = {
+  tag: 'quote',
+
+  before: function(state, tagInfo) {
+
+    const attrs = tagInfo.attrs;
+    let options = state.md.options.discourse;
+
+    let quoteInfo = attrs['_default'];
+    let username, postNumber, topicId, avatarImg, full;
+
+    if (quoteInfo) {
+      let split = quoteInfo.split(/\,\s*/);
+      username = split[0];
+
+      let i;
+      for(i=1;i<split.length;i++) {
+        if (split[i].indexOf("post:") === 0) {
+          postNumber = parseInt(split[i].substr(5),10);
+          continue;
+        }
+
+        if (split[i].indexOf("topic:") === 0) {
+          topicId = parseInt(split[i].substr(6),10);
+          continue;
+        }
+
+        if (/full:\s*true/.test(split[i])) {
+          full = true;
+          continue;
+        }
+      }
+    }
+
+
+    let token    = state.push('bbcode_open', 'aside', 1);
+    token.attrs  = [['class', 'quote']];
+
+    if (postNumber) {
+      token.attrs.push(['data-post', postNumber]);
+    }
+
+    if (topicId) {
+      token.attrs.push(['data-topic', topicId]);
+    }
+
+    if (full) {
+      token.attrs.push(['data-full', 'true']);
+    }
+
+    if (options.lookupAvatarByPostNumber) {
+      // client-side, we can retrieve the avatar from the post
+      avatarImg = options.lookupAvatarByPostNumber(postNumber, topicId);
+    } else if (options.lookupAvatar) {
+      // server-side, we need to lookup the avatar from the username
+      avatarImg = options.lookupAvatar(username);
+    }
+
+    if (username) {
+      let offTopicQuote = options.topicId &&
+                          postNumber &&
+                          options.getTopicInfo &&
+                          topicId !== options.topicId;
+
+      // on topic quote
+      token = state.push('quote_header_open', 'div', 1);
+      token.attrs = [['class', 'title']];
+
+      token = state.push('quote_controls_open', 'div', 1);
+      token.attrs = [['class', 'quote-controls']];
+
+      token = state.push('quote_controls_close', 'div', -1);
+
+      if (avatarImg) {
+        token = state.push('html_inline', '', 0);
+        token.content = avatarImg;
+      }
+
+      if (offTopicQuote) {
+        const topicInfo = options.getTopicInfo(topicId);
+        if (topicInfo) {
+          var href = topicInfo.href;
+          if (postNumber > 0) { href += "/" + postNumber; }
+
+          let title = topicInfo.title;
+
+
+          if (options.enableEmoji) {
+            title = performEmojiUnescape(topicInfo.title, {
+              getURL: options.getURL, emojiSet: options.emojiSet
+            });
+          }
+
+          token = state.push('link_open', 'a', 1);
+          token.attrs = [[ 'href', href ]];
+          token.block = false;
+
+          token = state.push('html_inline', '', 0);
+          token.content = title;
+
+          token = state.push('link_close', 'a', -1);
+          token.block = false;
+        }
+      } else {
+        token = state.push('text', '', 0);
+        token.content = ` ${username}:`;
+      }
+
+      token = state.push('quote_header_close', 'div', -1);
+    }
+
+    token        = state.push('bbcode_open', 'blockquote', 1);
+  },
+
+  after: function(state) {
+    state.push('bbcode_close', 'blockquote', -1);
+    state.push('bbcode_close', 'aside', -1);
+  }
+};
+
+export function setup(helper) {
+
+  helper.registerOptions((opts, siteSettings) => {
+    opts.enableEmoji = siteSettings.enable_emoji;
+    opts.emojiSet = siteSettings.emoji_set;
+  });
+
+  helper.registerPlugin(md=>{
+     md.block.bbcode.ruler.push('quotes', rule);
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js.es6
index 2a0e04a5b32..c3760799e0b 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/table.js.es6
@@ -1,33 +1,28 @@
-import { registerOption } from 'pretty-text/pretty-text';
-
-function tableFlattenBlocks(blocks) {
-  let result = "";
-
-  blocks.forEach(b => {
-    result += b;
-    if (b.trailing) { result += b.trailing; }
-  });
-
-  // bypass newline insertion
-  return result.replace(/[\n\r]/g, " ");
-};
-
-registerOption((siteSettings, opts) => {
-  opts.features.table = !!siteSettings.allow_html_tables;
-});
-
 export function setup(helper) {
+  // this is built in now
+  // TODO: sanitizer needs fixing, does not properly support this yet
 
-  helper.whiteList(['table', 'table.md-table', 'tbody', 'thead', 'tr', 'th', 'td']);
+  // we need a custom callback for style handling
+  helper.whiteList({
+    custom: function(tag,attr,val) {
+      if (tag !== 'th' && tag !== 'td') {
+        return false;
+      }
 
-  helper.replaceBlock({
-    start: /(<table[^>]*>)([\S\s]*)/igm,
-    stop: /<\/table>/igm,
-    rawContents: true,
-    priority: 1,
+      if (attr !== 'style') {
+        return false;
+      }
 
-    emitter(contents) {
-      return ['table', {"class": "md-table"}, tableFlattenBlocks.apply(this, [contents])];
+      return (val === 'text-align:right' || val === 'text-align:left' || val === 'text-align:center');
     }
   });
+
+  helper.whiteList([
+      'table',
+      'tbody',
+      'thead',
+      'tr',
+      'th',
+      'td',
+  ]);
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js.es6
new file mode 100644
index 00000000000..38bea8abf18
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js.es6
@@ -0,0 +1,127 @@
+
+export class TextPostProcessRuler {
+  constructor() {
+    this.rules = [];
+  }
+
+  getRules() {
+    return this.rules;
+  }
+
+  // TODO error handling
+  getMatcher() {
+    if (this.matcher) { return this.matcher; }
+
+    this.matcherIndex = [];
+
+    let rules = this.rules.map((r) =>
+      "(" + r.rule.matcher.toString().slice(1,-1) + ")"
+    );
+
+    let i;
+    let regexString = "";
+    let last = 1;
+
+    // this code is a bit tricky, our matcher may have multiple capture groups
+    // we want to dynamically determine how many
+    for(i=0; i<rules.length; i++) {
+      this.matcherIndex[i] = last;
+
+      if (i === rules.length-1) {
+        break;
+      }
+
+      if (i>0) {
+        regexString = regexString + '|';
+      }
+      regexString = regexString + rules[i];
+
+      let regex = new RegExp(regexString + '|(x)');
+      last = 'x'.match(regex).length - 1;
+    }
+
+    this.matcher = new RegExp(rules.join('|'), 'g');
+    return this.matcher;
+  }
+
+  applyRule(buffer, match, state) {
+    let i;
+    for(i=0; i<this.rules.length; i++) {
+      let index = this.matcherIndex[i];
+
+      if (match[index]) {
+        this.rules[i].rule.onMatch(buffer, match.slice(index, this.matcherIndex[i+1]), state);
+        break;
+      }
+    }
+  }
+
+  // TODO validate inputs
+  push(name, rule) {
+    this.rules.push({name, rule});
+    this.matcher = null;
+  }
+
+}
+
+function allowedBoundary(content, index, utils) {
+  let code = content.charCodeAt(index);
+  return (utils.isWhiteSpace(code) || utils.isPunctChar(String.fromCharCode(code)));
+}
+
+function textPostProcess(content, state, ruler) {
+  let result = null,
+      match,
+      pos = 0;
+
+  const matcher = ruler.getMatcher();
+
+  while (match = matcher.exec(content)) {
+    // check boundary
+    if (match.index > 0) {
+      if (!allowedBoundary(content, match.index-1, state.md.utils)) {
+        continue;
+      }
+    }
+
+    // check forward boundary as well
+    if (match.index + match[0].length < content.length) {
+      if (!allowedBoundary(content, match.index + match[0].length, state.md.utils)) {
+        continue;
+      }
+    }
+
+    if (match.index > pos) {
+      result = result || [];
+      let token = new state.Token('text', '', 0);
+      token.content = content.slice(pos, match.index);
+      result.push(token);
+    }
+
+    result = result || [];
+
+    ruler.applyRule(result, match, state);
+
+    pos = match.index + match[0].length;
+  }
+
+  if (result && pos < content.length) {
+    let token = new state.Token('text', '', 0);
+    token.content = content.slice(pos);
+    result.push(token);
+  }
+
+  return result;
+}
+
+
+export function setup(helper) {
+  helper.registerPlugin(md => {
+    const ruler = md.core.textPostProcess.ruler;
+    const replacer = (content, state) => textPostProcess(content, state, ruler);
+
+    md.core.ruler.push('text-post-process', state =>
+      md.options.discourse.helpers.textReplace(state, replacer, true)
+    );
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6 b/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
new file mode 100644
index 00000000000..b8be79f60e7
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
@@ -0,0 +1,19 @@
+let _cache = {};
+
+export function applyInlineOneboxes(inline, ajax) {
+  return ajax("/inline-onebox", {
+    data: { urls: Object.keys(inline) },
+  }).then(result => {
+    result['inline-oneboxes'].forEach(onebox => {
+      _cache[onebox.url] = onebox;
+      let links = inline[onebox.url] || [];
+      links.forEach(link => {
+        link.text(onebox.title);
+      });
+    });
+  });
+};
+
+export function cachedInlineOnebox(url) {
+  return _cache[url];
+}
diff --git a/app/assets/javascripts/pretty-text/oneboxer.js.es6 b/app/assets/javascripts/pretty-text/oneboxer.js.es6
index b56cff9d5a8..ac84ca0d1ac 100644
--- a/app/assets/javascripts/pretty-text/oneboxer.js.es6
+++ b/app/assets/javascripts/pretty-text/oneboxer.js.es6
@@ -19,7 +19,7 @@ function loadNext(ajax) {
     data: { url, refresh, user_id: userId },
     cache: true
   }).then(html => {
-    localCache[url] = html;
+    localCache[normalize(url)] = html;
     $elem.replaceWith(html);
   }, result => {
     if (result && result.jqXHR && result.jqXHR.status === 429) {
@@ -27,7 +27,7 @@ function loadNext(ajax) {
       removeLoading = false;
       loadingQueue.unshift({ url, refresh, $elem, userId });
     } else {
-      failedCache[url] = true;
+      failedCache[normalize(url)] = true;
     }
   }).finally(() => {
     timeout = Ember.run.later(() => loadNext(ajax), timeoutMs);
@@ -52,11 +52,11 @@ export function load(e, refresh, ajax, userId, synchronous) {
   // Unless we're forcing a refresh...
   if (!refresh) {
     // If we have it in our cache, return it.
-    const cached = localCache[url];
+    const cached = localCache[normalize(url)];
     if (cached) return cached;
 
     // If the request failed, don't do anything
-    const failed = failedCache[url];
+    const failed = failedCache[normalize(url)];
     if (failed) return;
   }
 
@@ -74,6 +74,12 @@ export function load(e, refresh, ajax, userId, synchronous) {
   }
 }
 
-export function lookupCache(url) {
-  return localCache[url];
+// Sometimes jQuery will return URLs with trailing slashes when the
+// `href` didn't have them.
+function normalize(url) {
+  return url.replace(/\/$/, '');
+}
+
+export function lookupCache(url) {
+  return localCache[normalize(url)];
 }
diff --git a/app/assets/javascripts/pretty-text/pretty-text.js.es6 b/app/assets/javascripts/pretty-text/pretty-text.js.es6
index 2769502ff86..21708cbe211 100644
--- a/app/assets/javascripts/pretty-text/pretty-text.js.es6
+++ b/app/assets/javascripts/pretty-text/pretty-text.js.es6
@@ -1,17 +1,13 @@
-import { cook, setup } from 'pretty-text/engines/discourse-markdown';
-import { sanitize } from 'pretty-text/sanitizer';
-import WhiteLister from 'pretty-text/white-lister';
+import { cook as cookIt, setup as setupIt } from 'pretty-text/engines/discourse-markdown-it';
 
-const _registerFns = [];
-const identity = value => value;
-
-export function registerOption(fn) {
-  _registerFns.push(fn);
+export function registerOption() {
+  // TODO next major version deprecate this
+  // if (window.console) {
+  //   window.console.log("registerOption is deprecated");
+  // }
 }
 
 export function buildOptions(state) {
-  setup();
-
   const {
     siteSettings,
     getURL,
@@ -21,10 +17,15 @@ export function buildOptions(state) {
     categoryHashtagLookup,
     userId,
     getCurrentUser,
-    currentUser
+    currentUser,
+    lookupAvatarByPostNumber,
+    emojiUnicodeReplacer,
+    lookupInlineOnebox,
+    previewing,
+    linkify
   } = state;
 
-  const features = {
+  let features = {
     'bold-italics': true,
     'auto-link': true,
     'mentions': true,
@@ -33,9 +34,14 @@ export function buildOptions(state) {
     'html': true,
     'category-hashtag': true,
     'onebox': true,
-    'newline': true
+    'linkify': linkify !== false,
+    'newline': !siteSettings.traditional_markdown_linebreaks
   };
 
+  if (state.features) {
+    features = _.merge(features, state.features);
+  }
+
   const options = {
     sanitize: true,
     getURL,
@@ -47,31 +53,43 @@ export function buildOptions(state) {
     userId,
     getCurrentUser,
     currentUser,
+    lookupAvatarByPostNumber,
     mentionLookup: state.mentionLookup,
-    allowedHrefSchemes: siteSettings.allowed_href_schemes ? siteSettings.allowed_href_schemes.split('|') : null
+    emojiUnicodeReplacer,
+    lookupInlineOnebox,
+    allowedHrefSchemes: siteSettings.allowed_href_schemes ? siteSettings.allowed_href_schemes.split('|') : null,
+    markdownIt: true,
+    previewing
   };
 
-  _registerFns.forEach(fn => fn(siteSettings, options, state));
+  // note, this will mutate options due to the way the API is designed
+  // may need a refactor
+  setupIt(options, siteSettings, state);
 
   return options;
 }
 
 export default class {
   constructor(opts) {
-    this.opts = opts || {};
-    this.opts.features = this.opts.features || {};
-    this.opts.sanitizer = (!!this.opts.sanitize) ? (this.opts.sanitizer || sanitize) : identity;
-    setup();
+    if (!opts) {
+      opts = buildOptions({ siteSettings: {}});
+    }
+    this.opts = opts;
+  }
+
+  disableSanitizer() {
+    this.opts.sanitizer = this.opts.discourse.sanitizer = ident => ident;
   }
 
   cook(raw) {
     if (!raw || raw.length === 0) { return ""; }
 
-    const result = cook(raw, this.opts);
+    let result;
+    result = cookIt(raw, this.opts);
     return result ? result : "";
   }
 
   sanitize(html) {
-    return this.opts.sanitizer(html, new WhiteLister(this.opts));
+    return this.opts.sanitizer(html).trim();
   }
 };
diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js.es6
index 81956eb4cce..30f8f23c966 100644
--- a/app/assets/javascripts/pretty-text/white-lister.js.es6
+++ b/app/assets/javascripts/pretty-text/white-lister.js.es6
@@ -1,114 +1,118 @@
-const masterList = {};
-const masterCallbacks = {};
-
-const _whiteLists = {};
-const _callbacks = {};
-
-function concatUniq(src, elems) {
-  src = src || [];
-  if (!Array.isArray(elems)) {
-    elems = [elems];
-  }
-  return src.concat(elems.filter(e => src.indexOf(e) === -1));
-}
+// to match:
+// abcd
+// abcd[test]
+// abcd[test=bob]
+const WHITELIST_REGEX = /([^\[]+)(\[([^=]+)(=(.*))?\])?/;
 
 export default class WhiteLister {
   constructor(options) {
-    options.features.default = true;
 
-    this._featureKeys = Object.keys(options.features).filter(f => options.features[f]);
-    this._key = this._featureKeys.join(':');
-    this._features = options.features;
-    this._options = options||{};
+    this._enabled = { "default": true };
+    this._allowedHrefSchemes =  (options && options.allowedHrefSchemes) || [];
+    this._rawFeatures = [["default", DEFAULT_LIST]];
+
+    this._cache = null;
+
+    if (options && options.features) {
+      Object.keys(options.features).forEach(f => {
+        if (options.features[f]) {
+          this._enabled[f] = true;
+        }
+      });
+    }
   }
 
-  getCustom() {
-    if (!_callbacks[this._key]) {
-      const callbacks = [];
-      this._featureKeys.forEach(f => {
-        (masterCallbacks[f] || []).forEach(cb => callbacks.push(cb));
-      });
-      _callbacks[this._key] = callbacks;
-    }
+  whiteListFeature(feature, info) {
+    this._rawFeatures.push([feature, info]);
+  }
 
-    return _callbacks[this._key];
+  disable(feature) {
+    this._enabled[feature] = false;
+    this._cache = null;
+  }
+
+  enable(feature) {
+    this._enabled[feature] = true;
+    this._cache = null;
+  }
+
+  _buildCache() {
+    const tagList = {};
+    const attrList = {};
+    const custom = [];
+
+    this._rawFeatures.forEach(([name, info]) => {
+      if (!this._enabled[name]) return;
+
+      if (info.custom) {
+        custom.push(info.custom);
+        return;
+      }
+
+      if (typeof info === "string") {
+        info = [info];
+      }
+
+      (info || []).forEach(tag => {
+        const classes = tag.split('.');
+        const tagWithAttr = classes.shift();
+
+        const m = WHITELIST_REGEX.exec(tagWithAttr);
+        if (m) {
+
+          const [,tagname,,attr,,val] = m;
+          tagList[tagname] = [];
+
+          let attrs = attrList[tagname] = attrList[tagname] || {};
+          if (classes.length > 0) {
+            attrs["class"] = (attrs["class"] || []).concat(classes);
+          }
+
+          if (attr) {
+            let attrInfo = attrs[attr] = attrs[attr] || [];
+
+            if (val) {
+              attrInfo.push(val);
+            } else {
+              attrs[attr] = ["*"];
+            }
+          }
+        }
+      });
+    });
+
+
+    this._cache = {custom, whiteList: {tagList, attrList}};
+  }
+
+  _ensureCache() {
+    if (!this._cache) { this._buildCache(); }
   }
 
   getWhiteList() {
-    if (!_whiteLists[this._key]) {
-      const tagList = {};
-      let attrList = {};
+    this._ensureCache();
+    return this._cache.whiteList;
+  }
 
-      // merge whitelists for these features
-      this._featureKeys.forEach(f => {
-        const info = masterList[f] || {};
-        Object.keys(info).forEach(t => {
-          tagList[t] = [];
-          attrList[t] = attrList[t] || {};
-
-          const attrs = info[t];
-          Object.keys(attrs).forEach(a => attrList[t][a] = concatUniq(attrList[t][a], attrs[a]));
-        });
-      });
-
-      _whiteLists[this._key] = { tagList, attrList };
-    }
-    return _whiteLists[this._key];
+  getCustom() {
+    this._ensureCache();
+    return this._cache.custom;
   }
 
   getAllowedHrefSchemes() {
-    return this._options.allowedHrefSchemes || [];
+    return this._allowedHrefSchemes;
   }
 }
 
-// Builds our object that represents whether something is sanitized for a particular feature.
-export function whiteListFeature(feature, info) {
-  const featureInfo = {};
-
-  // we can supply a callback instead
-  if (info.custom) {
-    masterCallbacks[feature] = masterCallbacks[feature] || [];
-    masterCallbacks[feature].push(info.custom);
-    return;
-  }
-
-  if (typeof info === "string") { info = [info]; }
-
-  (info || []).forEach(tag => {
-    const classes = tag.split('.');
-    const tagName = classes.shift();
-    const m = /\[([^\]]+)]/.exec(tagName);
-    if (m) {
-      const [full, inside] = m;
-      const stripped = tagName.replace(full, '');
-      const vals = inside.split('=');
-
-      featureInfo[stripped] = featureInfo[stripped] || {};
-      if (vals.length === 2) {
-        const [name, value] = vals;
-        featureInfo[stripped][name] = value;
-      } else {
-        featureInfo[stripped][inside] = '*';
-      }
-    }
-
-    featureInfo[tagName] = featureInfo[tagName] || {};
-    if (classes.length) {
-      featureInfo[tagName]['class'] = concatUniq(featureInfo[tagName]['class'], classes);
-    }
-  });
-
-  masterList[feature] = featureInfo;
-}
-
 // Only add to `default` when you always want your whitelist to occur. In other words,
 // don't change this for a plugin or a feature that can be disabled
-whiteListFeature('default', [
+const DEFAULT_LIST = [
   'a.attachment',
   'a.hashtag',
   'a.mention',
   'a.mention-group',
   'a.onebox',
+  'a.inline-onebox-loading',
   'a[data-bbcode]',
   'a[name]',
   'a[rel=nofollow]',
@@ -155,6 +159,7 @@ whiteListFeature('default', [
   'kbd',
   'li',
   'ol',
+  'ol[start]',
   'p',
   'pre',
   's',
@@ -167,4 +172,4 @@ whiteListFeature('default', [
   'sub',
   'sup',
   'ul',
-]);
+];
diff --git a/app/assets/javascripts/wizard/initializers/load-helpers.js.es6 b/app/assets/javascripts/wizard/initializers/load-helpers.js.es6
index b2e05d01810..4ed645f4da7 100644
--- a/app/assets/javascripts/wizard/initializers/load-helpers.js.es6
+++ b/app/assets/javascripts/wizard/initializers/load-helpers.js.es6
@@ -6,7 +6,7 @@ export default {
   initialize(application) {
     Object.keys(requirejs.entries).forEach(entry => {
       if ((/\/helpers\//).test(entry)) {
-        require(entry, null, null, true);
+        requirejs(entry, null, null, true);
       }
     });
     registerHelpers(application);
diff --git a/app/assets/javascripts/wizard/router.js.es6 b/app/assets/javascripts/wizard/router.js.es6
index ebc83ec380c..15abc15ff03 100644
--- a/app/assets/javascripts/wizard/router.js.es6
+++ b/app/assets/javascripts/wizard/router.js.es6
@@ -1,7 +1,7 @@
 import getUrl from 'discourse-common/lib/get-url';
 
 const Router = Ember.Router.extend({
-  rootURL: getUrl('/wizard'),
+  rootURL: getUrl('/wizard/'),
   location: Ember.testing ? 'none': 'history'
 });
 
diff --git a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6 b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
index fb95fa7abff..ca42183bb67 100644
--- a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
+++ b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
@@ -6,7 +6,7 @@ module("Acceptance: wizard", {
     wizard = startApp();
   },
 
-  teardown() {
+  afterEach() {
     Ember.run(wizard, 'destroy');
   }
 });
diff --git a/app/assets/javascripts/wizard/test/components/invite-list-test.js.es6 b/app/assets/javascripts/wizard/test/components/invite-list-test.js.es6
index 8e515c01c6d..cdfe0fbe159 100644
--- a/app/assets/javascripts/wizard/test/components/invite-list-test.js.es6
+++ b/app/assets/javascripts/wizard/test/components/invite-list-test.js.es6
@@ -4,7 +4,7 @@ moduleForComponent('invite-list', { integration: true });
 componentTest('can add users', {
   template: `{{invite-list field=field}}`,
 
-  setup() {
+  beforeEach() {
     this.set('field', {});
   },
 
diff --git a/app/assets/javascripts/wizard/test/helpers/component-test.js.es6 b/app/assets/javascripts/wizard/test/helpers/component-test.js.es6
index 0cc731b1ea0..21541d3413a 100644
--- a/app/assets/javascripts/wizard/test/helpers/component-test.js.es6
+++ b/app/assets/javascripts/wizard/test/helpers/component-test.js.es6
@@ -7,8 +7,8 @@ export function componentTest(name, opts) {
   test(name, function(assert) {
     initializer.initialize(this.registry);
 
-    if (opts.setup) {
-      opts.setup.call(this);
+    if (opts.beforeEach) {
+      opts.beforeEach.call(this);
     }
 
     andThen(() => this.render(opts.template));
diff --git a/app/assets/javascripts/wizard/test/test_helper.js b/app/assets/javascripts/wizard/test/test_helper.js
index 46042a0e725..91abd402c94 100644
--- a/app/assets/javascripts/wizard/test/test_helper.js
+++ b/app/assets/javascripts/wizard/test/test_helper.js
@@ -33,8 +33,9 @@ if (window.Logster) {
 } else {
   window.Logster = { enabled: false };
 }
+Ember.Test.adapter = window.QUnitAdapter.create();
 
-var createPretendServer = require('wizard/test/wizard-pretender', null, null, false).default;
+var createPretendServer = requirejs('wizard/test/wizard-pretender', null, null, false).default;
 
 var server;
 QUnit.testStart(function() {
@@ -45,12 +46,13 @@ QUnit.testDone(function() {
   server.shutdown();
 });
 
-var _testApp = require('wizard/test/helpers/start-app').default();
-var _buildResolver = require('discourse-common/resolver').buildResolver;
+
+var _testApp = requirejs('wizard/test/helpers/start-app').default();
+var _buildResolver = requirejs('discourse-common/resolver').buildResolver;
 window.setResolver(_buildResolver('wizard').create({ namespace: _testApp }));
 
 Object.keys(requirejs.entries).forEach(function(entry) {
   if ((/\-test/).test(entry)) {
-    require(entry, null, null, true);
+    requirejs(entry, null, null, true);
   }
 });
diff --git a/app/assets/javascripts/wizard/wizard.js.es6 b/app/assets/javascripts/wizard/wizard.js.es6
index 466b656d83c..7905a1df5b4 100644
--- a/app/assets/javascripts/wizard/wizard.js.es6
+++ b/app/assets/javascripts/wizard/wizard.js.es6
@@ -7,7 +7,7 @@ export default Ember.Application.extend({
   start() {
     Object.keys(requirejs._eak_seen).forEach(key => {
       if (/\/initializers\//.test(key)) {
-        const module = require(key, null, null, true);
+        const module = requirejs(key, null, null, true);
         if (!module) { throw new Error(key + ' must export an initializer.'); }
         this.initializer(module.default);
       }
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index a25115a6912..e462a8328a8 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -36,8 +36,8 @@ $mobile-breakpoint: 700px;
   tr {text-align: left;}
   td, th {padding: 8px;}
   td {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
+    border-top: 1px solid $primary-low; 
   }
   th {
     text-align: left;
@@ -94,11 +94,11 @@ td.flaggers td {
 
   .site-text {
     cursor: pointer;
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
     margin-bottom: 0.5em;
 
     &.overridden {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -60%);
+      background-color: $highlight-medium;
     }
 
     h3 {
@@ -112,7 +112,7 @@ td.flaggers td {
     .site-text-value {
       margin: 0.5em 5em 0.5em 0;
       max-height: 100px;
-      color: dark-light-diff($primary, $secondary, 40%, -10%);
+      color: $primary-medium; 
     }
 
   }
@@ -136,7 +136,7 @@ td.flaggers td {
   font-size: 0.857em;
   float: right;
   margin-right: 10px;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+  background-color: $primary-low; 
   padding: 2px 5px;
   border-radius: 5px;
   color: $primary;
@@ -222,16 +222,16 @@ td.flaggers td {
 }
 
 .admin-controls {
-  background-color: dark-light-diff($primary, $secondary, 90%, -65%);
+  background-color: $primary-low; 
   padding: 10px 10px 3px 0;
   @include clearfix;
   .nav.nav-pills {
     li.active {
       a {
-        border-color: dark-light-diff($primary, $secondary, 90%, -90%);
-        background-color: dark-light-diff($primary, $secondary, 40%, -10%);
+        border-color: $primary-low; 
+        background-color: $primary-medium; 
         &:hover {
-          background-color: dark-light-diff($primary, $secondary, 40%, -10%);
+          background-color: $primary-medium; 
         }
       }
     }
@@ -316,6 +316,17 @@ td.flaggers td {
   }
 }
 
+.email-preview {
+  .ac-wrap {
+    .item {
+      margin: 0.2em 0 0 0.4em;
+    }
+    // input[type=text] {
+    //   margin-left: 0.4em;
+    // }
+  }
+}
+
 .paste-users {
   width: 400px;
   height: 150px;
@@ -385,7 +396,7 @@ td.flaggers td {
   // Todo: set this properly - it needs to be >= the menu height
   min-height: 875px;
   margin-left: 0;
-  border-left: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
+  border-left: solid 1px $primary-low; 
   padding: 30px 0 30px 30px;
   @media (max-width: $mobile-breakpoint) {
     padding: 30px 0;
@@ -450,7 +461,7 @@ td.flaggers td {
     .setting-controls {
       float: left;
     }
-    .input-setting-string {
+    .input-setting-string, .input-setting-textarea {
       box-sizing: border-box;
       height: 30px;
       width: 100%;
@@ -458,13 +469,16 @@ td.flaggers td {
         width: 100%;
       }
     }
+    .input-setting-textarea {
+      height: 150px;
+    }
     .input-setting-list {
       @media (max-width: $mobile-breakpoint) {
         width: 100%;
       }
       padding: 1px;
       background-color: $secondary;
-      border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border: 1px solid $primary-low; 
       border-radius: 3px;
       box-shadow: inset 0 1px 1px rgba(51, 51, 51, 0.3);
       transition: border linear 0.2s, box-shadow linear 0.2s;
@@ -520,8 +534,8 @@ td.flaggers td {
   }
 
   .setting.overridden.string {
-    input[type=text] {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -60%);
+    input[type=text], textarea {
+      background-color: $highlight-medium;
     }
   }
 }
@@ -532,7 +546,7 @@ section.details {
     color: $primary;
     padding: 5px 10px;
     margin: 30px 0 5px 0;
-    border-bottom: 5px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 5px solid $primary-low; 
   }
 }
 
@@ -575,7 +589,7 @@ section.details {
   &.highlight-danger {
     background-color: scale-color($danger, $lightness: 50%);
   }
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low; 
   &:before, &:after {
     display: table;
     content: "";
@@ -695,14 +709,14 @@ section.details {
     font-size: 1em;
     line-height: 16px;
     padding: 4px;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
   }
 
   .badge-query-plan {
     font-size: 0.857em;
     line-height: 13px;
     padding: 4px;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
   }
 
   .count-warning {
@@ -765,8 +779,8 @@ section.details {
     background-color: scale-color($danger, $lightness: 70%);
   }
 
-  .message { background-color: dark-light-diff($highlight, $secondary, 50%, -70%); }
-  .message:hover { background-color: dark-light-diff($highlight, $secondary, 60%, -60%); }
+  .message { background-color: $highlight-medium; }
+  .message:hover { background-color: $highlight-low; }
 
   .flagged-post-avatar {
     margin-right: 10px;
@@ -901,7 +915,7 @@ table.api-keys {
     th {
       font-weight: normal;
       text-align: center;
-      background: dark-light-diff($primary, $secondary, 80%, -65%);
+      background: $primary-low; 
     }
     th.title {
       text-align: left;
@@ -951,7 +965,7 @@ table.api-keys {
   }
 
   &.detected-problems {
-    background: dark-light-diff($primary, $secondary, 90%, -75%);
+    background: $primary-low; 
     margin-bottom: 20px;
 
     .look-here {
@@ -976,7 +990,7 @@ table.api-keys {
         text-align: right;
       }
       .btn {
-        background: dark-light-diff($primary, $secondary, 80%, -85%);
+        background: $primary-low; 
       }
       ul {
         margin-left: 0;
@@ -1026,7 +1040,7 @@ table.api-keys {
 }
 
 .commits-widget {
-  border: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
+  border: solid 1px $primary-low; 
   height: 180px;
   margin-bottom: 36px;
 
@@ -1049,7 +1063,7 @@ table.api-keys {
     color: $primary;
     font-weight: bold;
     height: 30px;
-    background: dark-light-diff($primary, $secondary, 80%, -75%);
+    background: $primary-low; 
     cursor: pointer;
 
     h1 {
@@ -1072,7 +1086,7 @@ table.api-keys {
       @extend .clearfix;
       line-height: 1.0em;
       padding: 6px 8px;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
       .left {
         float: left;
       }
@@ -1082,7 +1096,7 @@ table.api-keys {
 
       img {
         margin-top: 2px;
-        border: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
+        border: solid 1px $primary-low; 
         padding: 2px;
         background-color: $secondary;
       }
@@ -1113,11 +1127,11 @@ table.api-keys {
     width: 6px;
   }
   ::-webkit-scrollbar-thumb {
-    background: dark-light-diff($primary, $secondary, 90%, -75%);
+    background: $primary-low; 
     -webkit-border-radius: 3px;
   }
   ::-webkit-scrollbar-track {
-    border-left: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
+    border-left: solid 1px $primary-low; 
   }
 }
 
@@ -1292,7 +1306,7 @@ table.api-keys {
     color: $primary;
     &:hover {
       color: $primary;
-      background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+      background-color: $primary-low; 
 
 
     }
@@ -1322,7 +1336,7 @@ table.api-keys {
 
   .heading-container {
     width: 100%;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
   }
   .col.heading {
     font-weight: bold;
@@ -1338,7 +1352,7 @@ table.api-keys {
 
   .ember-list-item-view {
     width: 100%;
-    border-top: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: solid 1px $primary-low; 
   }
 }
 
@@ -1471,7 +1485,7 @@ and (max-width : 500px) {
   div.ac-wrap {
     width: 100% !important;
     box-sizing: border-box;
-    }
+  }
 
   .admin-container {
     h2 {
@@ -1528,7 +1542,7 @@ tr.not-activated {
   .user-field {
     padding: 10px;
     margin-bottom: 10px;
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
 
     .form-display {
       width: 25%;
@@ -1918,11 +1932,11 @@ table#user-badges {
 .dbox20 { background: dark-light-diff($primary, $secondary, 20%, -20%); }
 .dbox30 { background: dark-light-diff($primary, $secondary, 30%, -30%); }
 .dbox40 { background: dark-light-diff($primary, $secondary, 40%, -40%); }
-.dbox50 { background: dark-light-diff($primary, $secondary, 50%, -50%); }
+.dbox50 { background: blend-primary-secondary(50%); }
 .dbox60 { background: dark-light-diff($primary, $secondary, 60%, -60%); }
 .dbox70 { background: dark-light-diff($primary, $secondary, 70%, -70%); }
 .dbox80 { background: dark-light-diff($primary, $secondary, 80%, -80%); }
-.dbox90 { background: dark-light-diff($primary, $secondary, 90%, -90%); }
+.dbox90 { background: $primary-low;  }
 .dbox100 { background: dark-light-diff($primary, $secondary, 100%, -100%); }
 .dbox5 { background: dark-light-diff($primary, $secondary, 5%, -5%); }
 .dbox15 { background: dark-light-diff($primary, $secondary, 15%, -15%); }
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 9a62dcff919..b550f65b3fb 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -10,7 +10,7 @@
   .field-error {
     margin-top: 10px;
     margin-bottom: 10px;
-    background-color: dark-light-diff($quaternary, $secondary, 70%, -70%);
+    background-color: $quaternary-low;
     padding: 5px;
   }
 
@@ -210,4 +210,3 @@
     margin-top: 20px;
   }
 }
-
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index cb1bccb1fc9..6a202efceab 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -16,8 +16,8 @@
   }
 }
 
-html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-light-diff($primary, $secondary, 45%, -30%);}
-.topic-list a.title.visited:not(.badge-notification) {color: dark-light-diff($primary, $secondary, 45%, -30%);}
+html.anon .topic-list a.title:visited:not(.badge-notification) {color: $primary-medium; }
+.topic-list a.title.visited:not(.badge-notification) {color: $primary-medium; }
 
 .topic-list {
   width: 100%;
@@ -28,7 +28,7 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
       vertical-align: top;
       margin-top: 2px;
     }
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+    border-bottom: 1px solid $primary-low; 
 
     &.last-visit {
       border-bottom: none;
@@ -58,7 +58,7 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
   }
 
   > tbody > tr:first-of-type {
-    border-top: 3px solid dark-light-diff($primary, $secondary, 90%, -75%);
+    border-top: 3px solid $primary-low; 
   }
 
   th,
@@ -238,7 +238,7 @@ ol.category-breadcrumb {
   overflow-x: hidden;
   overflow-y: auto;
   position: absolute;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   background-color: $secondary;
   z-index: 100;
 
@@ -300,7 +300,7 @@ ol.category-breadcrumb {
     @include unselectable;
 
     font-size: 1.2em;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border: 1px solid $primary-low; 
     padding: 5px;
     background: $secondary;
     position: absolute;
@@ -326,7 +326,7 @@ ol.category-breadcrumb {
           font-size: 0.8em;
         }
         &:hover {
-          background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
+          background-color: $highlight-medium;
         }
       }
     }
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 2afb3d10ed2..892151a3b26 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -30,15 +30,15 @@
     -webkit-appearance: none;
   }
   &.alert-success {
-    background-color:  dark-light-diff($success, $secondary, 50%, -60%);
+    background-color:  $success-low;
     color: $primary;
   }
   &.alert-error {
-    background-color:  rgba(dark-light-diff($danger, $secondary, 50%, -60%), .5);
+    background-color:  rgba($danger-low, .5);
     color: $primary;
   }
   &.alert-info {
-    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+    background-color: $tertiary-low;
     color: $primary;
     &.clickable {
       color: $tertiary;
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 477448dcda2..0626f267048 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -62,6 +62,12 @@
     }
   }
 
+  &.no-logos {
+    .category-box .category-box-inner > a {
+      padding: 3em 1em;
+    }
+  }
+
   .category-box-heading {
     padding: 1em 1em 0 1em;
   }
@@ -86,12 +92,6 @@
     text-align: center;
     color: $primary;
   }
-
-  &.no-logos {
-    .category-box a {
-      padding: 3em 1em;
-    }
-  }
 }
 
 .category-boxes-with-topics {
diff --git a/app/assets/stylesheets/common/base/colorpicker.scss b/app/assets/stylesheets/common/base/colorpicker.scss
index 6bcf8ae659d..83f29f78537 100644
--- a/app/assets/stylesheets/common/base/colorpicker.scss
+++ b/app/assets/stylesheets/common/base/colorpicker.scss
@@ -18,7 +18,7 @@
     max-width: 300px;
 
     .colorpicker {
-      border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border: 1px solid $primary-low; 
       margin-right: 2px;
       width: 16px;
       height: 16px;
diff --git a/app/assets/stylesheets/common/base/combobox.scss b/app/assets/stylesheets/common/base/combobox.scss
index cd9f44b52ca..e9c2fcda7b4 100644
--- a/app/assets/stylesheets/common/base/combobox.scss
+++ b/app/assets/stylesheets/common/base/combobox.scss
@@ -1,5 +1,5 @@
 .select2-results .select2-highlighted {
-    background: dark-light-diff($highlight, $secondary, 50%, -80%);
+    background: $highlight-medium;
     color: $primary;
 }
 
@@ -36,7 +36,7 @@
 
 .select2-container {
   border-radius: 3px;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   min-width: 200px;
 
   &.select2-dropdown-open {
@@ -71,7 +71,7 @@
   border-color: $tertiary;
 }
 .select2-drop {
-  color: dark-light-diff($primary, $secondary, -50%, 50%);
+  color: $primary;
 }
 .select2-drop-active {
   border: 1px solid $tertiary;
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 9f86c23d94f..d0079f72346 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -3,7 +3,7 @@
   position: absolute;
   width: 240px;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   ul {
     list-style: none;
     padding: 0;
@@ -15,7 +15,7 @@
         padding: 0 2px;
       }
 
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
 
       a {
         padding: 5px;
@@ -32,10 +32,10 @@
           vertical-align: middle;
         }
         &.selected {
-          background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+          background-color: $tertiary-low;
         }
         @include hover {
-          background-color: dark-light-diff($highlight, $secondary, 90%, -80%);
+          background-color: $highlight-low;
           text-decoration: none;
         }
       }
@@ -52,11 +52,13 @@
   .d-editor-button-bar {
     -moz-box-sizing: border-box;
     box-sizing: border-box;
-
     margin: 0px;
     padding: 5px;
-    border-bottom: 2px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 2px solid $primary-low; 
     height: 33px;
+    .btn:hover {
+      color: $primary-low; 
+    }
   }
 
   textarea {
@@ -88,7 +90,7 @@ div.ac-wrap div.item a.remove, .remove-link {
   border-radius: 12px;
   width: 10px;
   display: inline-block;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   &:hover {
     background-color: scale-color($danger, $lightness: 75%);
     border: 1px solid scale-color($danger, $lightness: 30%);
@@ -101,7 +103,7 @@ div.ac-wrap {
   overflow: auto;
   max-height: 150px;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   padding: 5px 4px 1px 4px;
   div.item {
     float: left;
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 6af69033aa6..b0c7ae08983 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -12,7 +12,7 @@
     float: right;
   }
   .total-rows {
-    color: dark-light-diff($primary, $secondary, 50%, -50%);
+    color: blend-primary-secondary(50%);
     text-align: right;
   }
   .spinner {
@@ -26,17 +26,17 @@
     td, th {
       padding: 0.5em;
       text-align: left;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
 
       .number, .time-read {
         font-size: 1.4em;
-        color: dark-light-diff($primary, $secondary, 50%, -20%);
+        color: $primary-medium; 
       }
     }
 
     tr.me {
       td {
-        background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
+        background-color: $highlight-low;
 
         .username a, .name, .title, .number, .time-read {
           color: dark-light-choose(scale-color($highlight, $lightness: -50%), scale-color($highlight, $lightness: 50%));
@@ -58,7 +58,7 @@
       }
 
       &:hover {
-        background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+        background-color: $primary-low; 
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 1aeaf7cfe3a..1960f4b6033 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -314,7 +314,7 @@ body {
   animation: rotate-forever 1s infinite linear;
   height: 30px;
   width: 30px;
-  border: 4px solid dark-light-diff($primary, $secondary, 50%, -50%);
+  border: 4px solid blend-primary-secondary(50%);
   border-right-color: transparent;
   border-radius: 50%;
 
@@ -329,7 +329,7 @@ body {
 .content-list {
 
   h3 {
-    color: dark-light-diff($primary, $secondary, 50%, -20%);
+    color: $primary-medium; 
     font-size: 1.071em;
     padding-left: 5px;
     margin-bottom: 10px;
@@ -340,10 +340,10 @@ body {
     margin: 0;
 
     li:first-of-type {
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-top: 1px solid $primary-low; 
     }
     li {
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
     }
 
     li a {
@@ -352,7 +352,7 @@ body {
       color: $primary;
 
       &:hover {
-        background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+        background-color: $primary-low; 
         color: $primary;
       }
 
@@ -380,7 +380,7 @@ span.relative-date {
 
 @keyframes background-fade-highlight {
   0% {
-    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+    background-color: $tertiary-low;
   }
   100% {
     background-color: transparent;
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index e97a2d186a6..cfbfbaff504 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -4,107 +4,246 @@ body img.emoji {
   vertical-align: middle;
 }
 
+.emoji-picker {
+  box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+  background-clip: padding-box;
+  z-index: 10000;
+  position: fixed;
+  display: none;
+  flex-direction: row;
+  height: 300px;
+  border-radius: 3px;
+  color: dark-light-choose(darken($primary, 40%), blend-primary-secondary(90%));
+  background-color: $secondary;
+  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+}
+
+.emoji-picker .categories-column {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  align-items: center;
+  justify-content: space-between;
+  border-right: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  min-width: 36px;
+}
+
+.emoji-picker .category-icon {
+  display: block;
+  margin: 4px auto;
+  -webkit-filter: grayscale(100%);
+  filter: grayscale(100%);
+
+  button.emoji {
+    margin: 0;
+    padding: 0;
+  }
+}
+
+.emoji-picker .category-icon.current, .emoji-picker .category-icon:hover {
+  -webkit-filter: grayscale(0%);
+  filter: grayscale(0%);
+}
+
+.emoji-picker .main-column {
+  display: flex;
+  flex-direction: column;
+  flex: 20;
+}
+
+.emoji-picker .list {
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+  padding: 0px;
+  flex: 1;
+  flex-direction: column;
+}
+
+.emoji-picker .section-header {
+  padding: 8px;
+  margin-bottom: 4px;
+  padding-bottom: 4px;
+  border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  justify-content: space-between;
+  display: flex;
+  align-items: center;
+}
+
+.emoji-picker .section-header .title {
+  color: $primary;
+}
+
+.emoji-picker .section-header .clear-recent .fa{
+  margin: 0;
+  padding: 0;
+  color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+
+  &:hover {
+    color: $primary;
+  }
+}
+
+.emoji-picker .section-group {
+  flex-wrap: wrap;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 4px;
+}
+
+.emoji-picker .footer {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+}
+
+.emoji-picker .info {
+  text-overflow: ellipsis;
+  max-width: 232px;
+  padding-left: 8px;
+  white-space: nowrap;
+  overflow: hidden;
+  font-weight: 700;
+  max-width: 125px;
+}
+
+.emoji-picker .diversity-picker {
+  display: flex;
+  justify-content: flex-end;
+  padding: 8px;
+}
+
+.emoji-picker .diversity-picker .diversity-scale {
+  width: 20px;
+  height: 20px;
+  margin-left: 5px;
+  border: 0;
+  border-radius: 3px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+.emoji-picker .diversity-picker .diversity-scale.default { background: #ffcc4d; }
+.emoji-picker .diversity-picker .diversity-scale.light { background: #f7dece; }
+.emoji-picker .diversity-picker .diversity-scale.medium-light { background: #f3d2a2; }
+.emoji-picker .diversity-picker .diversity-scale.medium { background: #d5ab88; }
+.emoji-picker .diversity-picker .diversity-scale.medium-dark { background: #af7e57; }
+.emoji-picker .diversity-picker .diversity-scale.dark { background: #7c533e; }
+
+.emoji-picker .diversity-picker .diversity-scale.selected i {
+  display: block;
+}
+
+.emoji-picker .diversity-picker i {
+  display: none;
+}
+
+.emoji-picker .diversity-picker i.fa {
+  color: #fff;
+  font-size: 12px;
+  text-shadow: 0.5px 1.5px 0 rgba(0,0,0,0.3);
+}
+
+.emoji-picker button.emoji {
+  background: transparent;
+  background-position: center;
+  background-repeat: no-repeat;
+  border-radius: 0;
+  background-size: 20px 20px;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 20px;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  vertical-align: top;
+  width: 20px;
+  outline: none;
+  padding: 3px;
+  margin: 2px;
+}
+
+.emoji-picker .section-group button.emoji:hover, .emoji-picker .results button.emoji:hover {
+  display: inline-block;
+  vertical-align: top;
+  border-radius: 50%;
+  background-color: lighten($tertiary, 40%);
+}
+
 .wmd-emoji-button:before {
   content:  "\f118";
 }
 
-.emoji-modal {
-  z-index: 10000;
-  position: fixed;
-  left: 50%;
-  top: 50%;
-  width: 445px;
-  min-height: 264px;
-  margin-top: -132px;
-  margin-left: -222px;
-  background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));
-}
-
-table.emoji-page td {
-  border: 1px solid transparent;
-  background-color: dark-light-choose(white, $secondary);
-  padding: 0 !important;
-}
-
-.emoji-page a {
-  padding: 8px;
-  display: block;
-  border-radius: 20px;
-}
-
-.emoji-page a:hover {
-  background-color: dark-light-choose(rgb(210, 236, 252), rgb(45, 19, 3));
-}
-
-.emoji-table-wrapper {
-  min-width: 442px;
-  min-height: 185px;
-  background-color: $secondary;
-}
-
-.emoji-modal-wrapper {
+.emoji-picker-modal.fadeIn {
   z-index: 9999;
   position: fixed;
   left: 0;
   top: 0;
   width: 100%;
   height: 100%;
-  opacity: dark-light-choose(0.8, 0.5);
+  opacity: .8;
   background-color: black;
 }
 
-.emoji-modal .toolbar {
-  margin: 8px 0 5px;
+.emoji-picker .filter {
+  background-color: none;
+  border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  padding: 5px;
+  display: flex;
+  position: relative;
+  align-items: center;
 }
 
-.emoji-modal .toolbar li {
-  display: inline;
-  padding-right: 1px;
-}
-
-.emoji-modal .toolbar li a {
-  padding: 8px;
-  background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));
-}
-
-.emoji-modal .toolbar li a.selected {
-  background-color: $secondary;
-}
-
-.emoji-modal .info {
-  height: 30px;
-  margin-left: 8px;
-  margin-top: 15px;
-  margin-bottom: 0px;
-}
-
-.emoji-modal .info span {
+.emoji-picker .filter .fa.fa-search {
+  color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+  font-size: 16px;
   margin-left: 5px;
-  font-weight: bold;
+  margin-right: 5px;
+}
+
+.emoji-picker .filter input {
+  height: 24px;
+  margin: 0;
+  flex: 1;
+  border: none;
+  box-shadow: none;
+  padding-right: 24px;
+  outline: none;
   color: $primary;
+  background: $secondary;
+
+  &:focus {
+    border: none;
+    box-shadow: none;
+  }
 }
 
-.emoji-modal .info {
-  float: left;
-}
-.emoji-modal .nav {
-  float: right;
-  margin-top: 15px;
+.emoji-picker .filter input::-ms-clear {
+  display: none;
 }
 
-.emoji-modal .nav span {
-  color: dark-light-choose(#aaa, #555);
-  margin-right: 10px;
+.emoji-picker .results {
+  display: none;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 4px;
+  flex: 1;
 }
 
-.emoji-modal .nav a {
-  color: dark-light-choose(#333, #ccc);
-}
+.emoji-picker .filter .clear-filter {
+  position: absolute;
+  right: 5px;
+  top: 12px;
+  border: 0;
+  background: none;
+  color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+  outline: none;
+  display: none;
 
-.emoji-shortname {
-  display: inline-block;
-  max-width: 200px;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  vertical-align: middle;
+  &:hover {
+    color: $primary;
+  }
 }
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 5287a777c3b..6c55db08f14 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -51,7 +51,7 @@ table.group-logs {
   width: 100%;
 
   th, tr {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
   }
 
   th {
@@ -67,7 +67,7 @@ table.group-logs {
     cursor: pointer;
 
     i {
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
     }
   }
 }
@@ -77,7 +77,7 @@ table.group-members {
   table-layout: fixed;
 
   tr {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
   }
 
   th:first-child {
@@ -90,7 +90,7 @@ table.group-members {
   }
 
   th {
-    border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 3px solid $primary-low; 
     text-align: center;
     padding: 5px 0px 5px 5px;
     color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
@@ -104,7 +104,7 @@ table.group-members {
 
     &:hover {
       cursor: pointer;
-      background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+      background-color: $primary-low; 
     }
   }
 
@@ -119,7 +119,7 @@ table.group-members {
 
     td {
       text-align: center;
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
       padding: 0.8em 0;
     }
   }
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index f40697b01c2..6dae404db0d 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -8,16 +8,16 @@
   width: 100%;
 
   th {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
     padding: 5px 0px;
     text-align: left;
   }
 
   tr {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
 
     td {
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
       padding: 0.8em 0;
     }
 
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 19917997670..4a674e8d1f9 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -69,14 +69,14 @@
 
         &:hover {
           color: $primary;
-          background-color:  dark-light-diff($primary, $secondary, 90%, -60%);
+          background-color:  $primary-low;
           border-top: 1px solid transparent;
           border-left: 1px solid transparent;
           border-right: 1px solid transparent;
         }
         &:active {
           color: $primary;
-          background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+          background-color: $primary-low;
         }
       }
       .drop-down-visible & {
@@ -85,9 +85,9 @@
           color: #7b7b7b;
           background-color: $secondary;
           cursor: default;
-          border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-          border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-          border-right: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+          border-top: 1px solid $primary-low;
+          border-left: 1px solid $primary-low;
+          border-right: 1px solid $primary-low;
 
           .badge-notification {
             top: -10px;
@@ -147,7 +147,7 @@
 
 
 .highlight-strong {
-  background-color: dark-light-diff($highlight, $secondary, 40%, -45%);
+  background-color: $highlight-medium;
 }
 
 .search-highlight {
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index 61a93372f28..2570034d60d 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -42,7 +42,7 @@
   .informations {
     margin: 6px;
     padding-right: 20px;
-    color: dark-light-diff($primary, $secondary, 50%, -50%);
+    color: blend-primary-secondary(50%);
     font-size: 1em;
   }
 
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 4c030178007..01b2f825100 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -91,9 +91,19 @@ $input-width: 220px;
     button.btn-primary {
       margin-top: 10px;
     }
-    label {
+    label:not(.checkbox-label) {
       font-weight: bold;
     }
+    .controls, .input {
+      margin-bottom: 10px;
+    }
+    .instructions {
+      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      margin: 0;
+      font-size: 0.929em;
+      font-weight: normal;
+      line-height: 18px;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index deb79628d5c..0e19a8a1175 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -18,7 +18,7 @@
 }
 
 .menu-panel {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   box-shadow: 0 2px 2px rgba(0,0,0, .25);
   background-color: $secondary;
   z-index: 1100;
@@ -60,7 +60,7 @@
       padding: 0.25em 0.5em;
       display: block;
       &:hover {
-        background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+        background-color: $highlight-medium;
       }
     }
 
@@ -191,7 +191,7 @@
     }
 
     &:hover a:not(.badge-notification) {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+      background-color: $highlight-medium;
     }
 
     button {margin-left: 5px;}
@@ -210,7 +210,7 @@
     .fa { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
     .icon { color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); }
     li {
-      background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+      background-color: $tertiary-low;
       padding: 0.25em 0.5em;
       i {
         float: left;
@@ -218,7 +218,7 @@
         padding-top: 2px;
       }
       span { color: $primary; }
-      &:hover { background-color: dark-light-diff($highlight, $secondary, 50%, -55%); }
+      &:hover { background-color: $highlight-medium; }
       a { padding: 0; }
       p {
         margin: 0;
@@ -256,7 +256,7 @@
 .notifications .logout {
   padding: 0.25em;
   &:hover {
-    background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+    background-color: $highlight-medium;
   }
 }
 
@@ -269,7 +269,7 @@ div.menu-links-header {
     display: table-row;
   }
   a:hover {
-    background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+    background-color: $highlight-medium;
   }
   a {
     padding: 0.5em;
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index c69d4a40583..c5a6647d07f 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -13,11 +13,11 @@
 
 .input-hint-text {
   margin-left: 0.5em;
-  color: dark-light-diff($secondary, $primary, 30%, -35%);
+  color: $secondary-medium;
 }
 
 .modal-header {
-  border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-bottom: 1px solid $primary-low; 
 }
 
 .modal-backdrop {
@@ -96,7 +96,7 @@
 }
 .modal-footer {
   padding: 14px 15px 15px;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low; 
 }
 .modal-footer:before,
 .modal-footer:after {
@@ -118,11 +118,11 @@
 .modal {
   .nav {
     padding: 10px 30px 10px 15px;
-    background-color: dark-light-diff($secondary, $primary, 10%, -15%);
+    background-color: $secondary;
     li > a {
       font-size: 1em;
     }
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
 
   }
 
@@ -212,6 +212,11 @@
     display: inline-block;
     margin-right: 10px;
   }
+
+  // password reset modal
+  .modal-body.forgot-password-modal p {
+    font-size: 14px;
+  }
 }
 
 .reply-where-modal {
@@ -230,7 +235,7 @@
         font-weight: normal;
       }
       &.btn-reply-here {
-        background: dark-light-diff($primary, $secondary, 90%, -60%);
+        background: $primary-low; 
         text-shadow: none;
         color: $primary;
       }
@@ -351,7 +356,7 @@
       font-weight: bold;
     }
     &:focus {
-      outline: 2px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      outline: 2px solid $primary-low; 
     }
   }
   .incoming-email-tabs {
@@ -362,7 +367,7 @@
     textarea, .incoming-email-html-part {
       height: 95%;
       border: none;
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-top: 1px solid $primary-low; 
       padding-top: 10px;
     }
     textarea {
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 5b718047c75..86e505e6226 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -89,7 +89,7 @@ a.loading-onebox {
 }
 
 aside.onebox {
-  border: 5px solid dark-light-diff($primary, $secondary, 90%, -85%);
+  border: 5px solid $primary-low; 
 
   padding: 12px 25px 12px 12px;
   font-size: 1em;
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index 7fa038db9c1..eeb82c5d045 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -108,7 +108,7 @@
   }
 
   .search-advanced-options {
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+    border: 1px solid $primary-low; 
     padding: 10px;
 
     .control-group.pull-left {
@@ -147,7 +147,7 @@
   }
   margin: 10px 0 15px;
   max-width: 780px;
-  border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-bottom: 3px solid $primary-low; 
   width: 100%;
   .sort-by {
     .desc {
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index f6911751204..f26c0623175 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -171,6 +171,10 @@ header .discourse-tag {color: $tag-color }
 .tag-chooser {
   width: 100%;
   margin: 5px 0;
+  ul.select2-choices {
+    max-height: 40px;
+    overflow-y: auto;
+  }
 }
 
 .title-wrapper .tag-chooser {
diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index acabe8664a0..7816086dc94 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -5,14 +5,14 @@
   top: 120px;
   right: 10px;
   z-index: 999;
-  outline: 0;
+  height: 35px;
 }
 
 .popup-menu {
   background-color: $secondary;
   width: 205px;
   padding: 10px;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   z-index: 999;
 
   ul {
@@ -34,8 +34,12 @@
 }
 
 .modal-body.feature-topic {
+  overflow: visible;
   padding: 5px;
   max-height: 500px;
+  input.date-picker {
+    margin: 0;
+  }
   hr {
     margin: 10px 0;
   }
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index aa739f782ab..ce52e4bb19e 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1,6 +1,6 @@
 .placeholder-avatar {
   display: inline-block;
-  background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+  background-color: $primary-low;
   width: 45px;
   height: 45px;
   border-radius: 50%;
@@ -8,7 +8,7 @@
 
 .placeholder-text {
   display: inline-block;
-  background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+  background-color: $primary-low;
   width: 100%;
   height: 1.5em;
   margin-bottom: 0.6em;
@@ -92,7 +92,7 @@ aside.quote {
 }
 
 .cooked .highlight {
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
   padding: 2px;
   margin: -2px;
 }
@@ -137,7 +137,7 @@ aside.quote {
 .quote-button {
   display: none;
   position: absolute;
-  background-color: dark-light-diff($primary, $secondary, 50%, -50%);
+  background-color: blend-primary-secondary(50%);
   color: dark-light-choose($secondary, $primary);
   padding: 10px;
   z-index: 401;
@@ -149,7 +149,7 @@ aside.quote {
   }
 
   &:hover {
-    background-color: dark-light-diff($primary, $secondary, 40%, -40%);
+    background-color: $primary-medium;
     cursor: pointer;
   }
 }
@@ -273,7 +273,7 @@ pre {
 kbd
 {
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   border-radius: 3px;
   box-shadow: 0 1px 0 rgba(0,0,0, .8);
   color: $primary;
@@ -317,7 +317,7 @@ blockquote > *:last-child {
 }
 
 
-table.md-table {
+.cooked table, .d-editor-preview table {
   thead {
     border-bottom: 2px solid lighten($primary, 80%);
     th {
@@ -395,15 +395,15 @@ table.md-table {
   .topic-body {
     .cooked {
       font-style: italic;
-      color: dark-light-diff($primary, $secondary, 55%, -40%);
+      color: $primary-medium;
     }
   }
 }
 
 a.mention, a.mention-group {
   padding: 2px 4px;
-  color: dark-light-diff($primary, $secondary, 30%, -20%);
-  background: dark-light-diff($primary, $secondary, 95%, -60%);
+  color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+  background: $primary-low;
   border-radius: 8px;
   font-weight: bold;
   font-size: 0.93em;
@@ -414,3 +414,9 @@ a.mention, a.mention-group {
     margin-top: 0;
   }
 }
+
+#suggested-topics {
+  .topics {
+    padding-bottom: 15px;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index 196aa05e2e7..5a6b735fc92 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -21,6 +21,31 @@
   }
 }
 
+#topic-progress-wrapper {
+  .topic-admin-menu-button-container {
+    position: relative;
+    right: 38px;
+    top: 35px;
+
+    .widget-button {
+      height: 35px;
+      border-right: 1px solid dark-light-diff($primary, $secondary, 80%, -70%);
+    }
+  }
+
+  .topic-admin-popup-menu.right-side {
+    position: relative;
+    right: 35px;
+  }
+}
+
+#topic-progress-wrapper.docked {
+  .topic-admin-popup-menu.right-side {
+    right: 40px;
+  }
+}
+
+
 #topic-title {
   .title-wrapper {
     float: left;
@@ -66,7 +91,7 @@
 
 .has-pending-posts {
   padding: 0.5em;
-  background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
+  background-color: $highlight-medium;
   a[href] {
     float: right;
   }
@@ -118,7 +143,7 @@
   .post-links {
     margin-top: 1em;
     padding-top: 1em;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+    border-top: 1px solid $primary-low; 
   }
 
   .expand-links {
@@ -160,7 +185,7 @@
     &:hover {
       color: $tertiary;
       i {
-        background: dark-light-diff($tertiary, $secondary, 85%, -65%);
+        background: $tertiary-low;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 7c25c2652a0..7e98f3c2c08 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -2,7 +2,7 @@
 .user-badge {
   padding: 3px 8px;
   color: $primary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+  border: 1px solid $primary-low;
   line-height: 19px;
   display: inline-block;
   background-color: $secondary;
@@ -126,7 +126,7 @@
 .badge-card {
   position: relative;
   display: inline-block;
-  background-color: dark-light-diff($primary, $secondary, 95%, -65%);
+  background-color: $primary-low;
   margin-right: 5px;
   margin-bottom: 10px;
   box-shadow: 1px 1px 3px rgba(0.0, 0.0, 0.0, 0.2);
@@ -142,7 +142,7 @@
     right: 5px;
     top: 5px;
     font-weight: bold;
-    color: dark-light-diff($primary, $secondary, 50%, -15%);
+    color: $primary-medium;
     font-size: 1.2em;
   }
 
@@ -156,7 +156,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      background-color: dark-light-diff($primary, $secondary, 92%, -60%);
+      background-color: $primary-low;
       font-size: 3em;
 
       img {
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 365fc9a3c83..72316b34ad1 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -12,6 +12,12 @@
   .avatar-link {
     margin-right: 3px;
   }
+
+}
+.user-stream .item .expand-item {
+  float: right;
+  margin-right: 0.5em;
+  color: lighten($primary, 40%);
 }
 
 .user-main {
@@ -221,7 +227,7 @@
         width: 100%;
         height: 100%;
         display: block;
-        color: black;
+        color: $primary;
       }
     }
   }
@@ -236,7 +242,7 @@
   }
 
   .label {
-    color: dark-light-diff($primary, $secondary, 50%, -50%);
+    color: blend-primary-secondary(50%);
   }
 }
 
@@ -248,7 +254,7 @@
   }
 
   li {
-    border-left: dark-light-diff($primary, $secondary, 90%, -65%) solid 2px;
+    border-left: $primary-low solid 2px;
     padding: 5px 8px;
     margin: 10px 0;
   }
@@ -288,7 +294,7 @@ and (max-width : 600px) {
 }
 
 .user-preferences .tags .select2-container-multi {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   width: 540px;
   border-radius: 0;
   .select2-choices {
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 8273d97c8b4..c160fc53538 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -169,12 +169,12 @@
     }
 
     li.bar>.badge-category {
-      background: dark-light-diff($primary, $secondary, 90%, -65%) !important;
+      background: $primary-low !important;
       color: $primary !important;
     }
 
     li.bullet>.badge-category {
-      background: dark-light-diff($primary, $secondary, 90%, -65%) !important;
+      background: $primary-low !important;
       color: $primary !important;
 
       .badge-category-bg {
@@ -279,9 +279,9 @@
 
   &.clicks {
     font-weight: normal;
-    background-color: dark-light-diff($primary, $secondary, 88%, -60%);
+    background-color: $primary-low;
     top: -1px;
-    color: dark-light-diff($primary, $secondary, 40%, -20%);
+    color: $primary-medium;
     position: relative;
     margin-left: 2px;
     border: none;
@@ -308,8 +308,8 @@
   padding: 4px 5px 2px 5px;
   color: $primary;
   text-shadow: 0 1px 0 rgba($primary, 0.1);
-  background-color: dark-light-diff($primary, $secondary, 90%, -65%);
-  border-color: dark-light-diff($primary, $secondary, 90%, -65%);
+  background-color: $primary-low;
+  border-color: $primary-low;
   font-size: 0.857em;
   box-shadow: inset 0 1px 0 rgba(0,0,0, 0.22);
 }
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index a1a3f4bc6db..bce45c1263a 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -46,17 +46,17 @@
   border: none;
   color: $primary;
   font-weight: normal;
-  background: dark-light-diff($primary, $secondary, 90%, -65%);
+  background: $primary-low; 
 
   &[href] {
     color: $primary;
   }
   &:hover {
-    background: dark-light-diff($primary, $secondary, 65%, -75%);
+    background: $primary-medium; 
     color: $secondary;
   }
   &[disabled], &.disabled {
-    background: dark-light-diff($primary, $secondary, 90%, -60%);
+    background: $primary-low; 
     &:hover { color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); }
     cursor: not-allowed;
   }
@@ -189,3 +189,12 @@
   font-size: 1.143em;
   line-height: 20px;
 }
+
+.btn-flat {
+  background: transparent;
+  border: 0;
+  outline: 0;
+  i.fa {
+    opacity: 0.7;
+  }
+}
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 59a34aad62c..6beae3c5917 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -32,7 +32,7 @@
       transition: background .15s;
       &:hover {
         color: $quaternary;
-        background-color: dark-light-diff($quaternary, $secondary, 70%, -70%);
+        background-color: $quaternary-low;
       }
     }
     &.active > a, > a.active {
@@ -49,9 +49,9 @@
   @extend %nav;
   padding: 0;
   overflow: hidden;
-  background: dark-light-diff($primary, $secondary, 90%, -75%);
+  background: $primary-low;
   li {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 80%, -60%);
+    border-bottom: 1px solid $primary-low;
     position: relative;
     &:last-of-type {
       border-bottom: 0;
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 8d3d6183902..b1a97021b0d 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -1,5 +1,5 @@
 .d-editor {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
 }
 
 .d-editor-container {
@@ -22,7 +22,7 @@
   min-width: 400px;
   position: absolute;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   padding: 1em;
   top: 25px;
 
@@ -71,7 +71,7 @@
   height: 20px;
   margin-right: 8px;
   margin-left: 5px;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+  background-color: $primary-low;
   display: inline-block;
   float: left;
 }
@@ -82,13 +82,13 @@
   height: 200px;
 
   &:disabled {
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low;
   }
 }
 
 .d-editor-preview {
   color: $primary;
-  border: 1px dashed dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px dashed $primary-low;
   overflow: auto;
   cursor: default;
   margin-top: 8px;
@@ -110,7 +110,7 @@
 .composing-whisper {
   .d-editor-preview {
     font-style: italic;
-    color: dark-light-diff($primary, $secondary, 55%, -40%) !important;
+    color: $primary-medium !important;
   }
 }
 
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 35b0418187d..bf08280bb1f 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -41,7 +41,7 @@ hr {
   height: 1px;
   margin: 1em 0;
   border: 0;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low;
   padding: 0;
 }
 
@@ -49,7 +49,6 @@ hr {
 // --------------------------------------------------
 
 ul,
-ol,
 dd {
   margin: 0 0 9px 25px;
   padding: 0;
@@ -60,6 +59,11 @@ dd {
   clear: both;
 }
 
+.cooked ul, .d-editor-preview ul {
+  margin: 0;
+  padding-left: 40px;
+}
+
 li {
   > ul,
   > ol {
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index f9c3ca2a5a0..ed55c8f5227 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -97,7 +97,7 @@
 
 // Stuff we repeat
 @mixin post-aside {
-  border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -85%);
+  border-left: 5px solid $primary-low;
   background-color: blend-primary-secondary(5%);
 }
 
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 43eb44cdb2d..2d7c6186bbb 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -78,3 +78,33 @@ $base-font-family: Helvetica, Arial, sans-serif !default;
     @return $dark-theme-result;
   }
 }
+
+// standard color transformations, use these if possible, and add any new dark-light-diffs here
+
+//primary
+$primary-low: dark-light-diff($primary, $secondary, 90%, -65%);
+$primary-medium: dark-light-diff($primary, $secondary, 50%, -20%);
+
+//secondary
+$secondary-low: dark-light-diff($secondary, $primary, 50%, -50%);
+$secondary-medium: dark-light-diff($secondary, $primary, 30%, -35%);
+
+//tertiary
+$tertiary-low: dark-light-diff($tertiary, $secondary, 85%, -65%);
+
+//quaternary
+$quaternary-low: dark-light-diff($quaternary, $secondary, 70%, -70%);
+
+//highlight
+$highlight-low: dark-light-diff($highlight, $secondary, 70%, -80%);
+$highlight-medium: dark-light-diff($highlight, $secondary, 50%, -55%);
+
+//danger
+$danger-low: dark-light-diff($danger, $secondary, 50%, -40%);
+$danger-medium: dark-light-diff($danger, $secondary, 30%, -60%);
+
+//success
+$success-low: dark-light-diff($success, $secondary, 50%, -60%);
+
+//love
+$love-low: dark-light-diff($love, $secondary, 85%, -60%);
diff --git a/app/assets/stylesheets/common/input_tip.scss b/app/assets/stylesheets/common/input_tip.scss
index fae0176e2a7..5f02aeb1118 100644
--- a/app/assets/stylesheets/common/input_tip.scss
+++ b/app/assets/stylesheets/common/input_tip.scss
@@ -7,7 +7,7 @@
   padding: 5px 10px;
   z-index: 101;
   &.bad {
-    background: dark-light-diff($danger, $secondary, 20%, -40%);
+    background: $danger-medium;
     color: white;
     box-shadow: 1px 1px 5px rgba(0,0,0, .7);
   }
diff --git a/app/assets/stylesheets/common/topic-entrance.scss b/app/assets/stylesheets/common/topic-entrance.scss
index 847edc46a86..6e9e1aa2099 100644
--- a/app/assets/stylesheets/common/topic-entrance.scss
+++ b/app/assets/stylesheets/common/topic-entrance.scss
@@ -1,6 +1,6 @@
 #topic-entrance {
 
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   padding: 5px;
   background: $secondary;
   box-shadow: 0 0px 2px rgba(0,0,0, .2);
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index d33120135f9..e6926808ede 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -90,9 +90,9 @@
 
   tbody {
     tr {
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+      border-bottom: 1px solid $primary-low; 
       &:first-of-type {
-        border-top: 3px solid dark-light-diff($primary, $secondary, 90%, -75%);
+        border-top: 3px solid $primary-low; 
       }
     }
 
@@ -120,11 +120,14 @@
   .category-list,
   .topic-list-latest {
     width: 48%;
+  }
+
+  .category-list {
     float: left;
   }
 
   .topic-list-latest {
-    margin-left: 4%;
+    float: right;
     th.latest {
       line-height: 19px;
     }
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index c8aa5306ea0..197169c728a 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -36,14 +36,14 @@
   padding: 10px;
 
   box-shadow: 3px 3px 3px rgba(0,0,0, 0.34);
-  background: dark-light-diff($highlight, $secondary, 50%, -80%);
+  background: $highlight-medium;
 
   &.urgent {
-    background: dark-light-diff($danger, $secondary, 50%, -40%);
+    background: $danger-low;
   }
 
   &.education-message {
-    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+    background-color: $tertiary-low;
   }
 
   h3 {
@@ -79,17 +79,17 @@
 }
 
 .custom-body {
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
   p {
     max-width: 98%;
   }
 }
 
 .similar-topics {
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
 
   a[href] {
-    color: dark-light-diff($primary, $secondary, -10%, 10%);
+    color: $primary-medium;
   }
 
   .posts-count {
@@ -140,21 +140,16 @@
   width: 100%;
   z-index: 999;
   height: 0;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+  background-color: $primary-low;
   bottom: 0;
   font-size: 1em;
   position: fixed;
   .toggler {
-    width: 15px;
     right: 1px;
     position: absolute;
-    font-size: 1.071em;
+    i { font-size: 1.1em; }
     color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
     padding: 0 10px 5px 10px;
-    &:before {
-      font-family: "FontAwesome";
-      content: "\f078";
-    }
   }
   a.cancel {
     padding-left: 7px;
@@ -184,7 +179,7 @@
   &.draft {
     height: 40px !important;
     cursor: pointer;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: 1px solid $primary-low;
     .draft-text {
       display: block;
 
@@ -192,25 +187,13 @@
         color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
       }
     }
-    .toggler {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f00d";
-      }
-    }
   }
   &.saving {
     height: 40px !important;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: 1px solid $primary-low;
     .saving-text {
       display: block;
     }
-    .toggler {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f00d";
-      }
-    }
   }
   .reply-area {
     max-width: 1500px;
@@ -299,7 +282,7 @@
       margin-right: 10px;
       float: left;
       &:disabled {
-        background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+        background-color: $primary-low;
       }
     }
     #topic-featured-link {
@@ -308,14 +291,14 @@
       width: 400px;
     }
     .d-editor-input:disabled {
-      background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+      background-color: $primary-low;
     }
     .d-editor-input, .d-editor-preview {
       color: $primary;
     }
 
     .d-editor-preview {
-      border: 1px dashed dark-light-diff($primary, $secondary, 90%, -60%);
+      border: 1px dashed $primary-low;
       overflow: auto;
       visibility: visible;
       cursor: default;
@@ -353,7 +336,7 @@
   .show-admin-options {
     vertical-align: top;
     margin-top: 8px;
-    background: dark-light-diff($primary, $secondary, 90%, -60%);
+    background: $primary-low;
   &:hover {
     color: $secondary;
     background: $primary;
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 20e1ebc1ee6..aac66f0295a 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -31,7 +31,7 @@ body {
   }
   #main {
     a.star {
-      color: dark-light-diff($secondary, $primary, 80%, -20%);
+      color: $secondary-medium;
       &:before {
         font-family: "FontAwesome";
         content: "\f005";
@@ -213,14 +213,14 @@ body {
     width: 210px;
     height: auto;
     background-color:$secondary;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border: 1px solid $primary-low; 
     border-radius: 3px;
     box-shadow: inset 0 1px 1px rgba(0,0,0, .3);
   }
   input {
     &[type="text"], &[type="password"], &[type="datetime"], &[type="datetime-local"], &[type="date"], &[type="month"], &[type="time"], &[type="week"], &[type="number"], &[type="email"], &[type="url"], &[type="search"], &[type="tel"], &[type="color"] {
       background-color: $secondary;
-      border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border: 1px solid $primary-low; 
       border-radius: 3px;
       box-shadow: inset 0 1px 1px rgba(0,0,0, .3);
     }
@@ -244,7 +244,7 @@ body {
 
   select {
     width: 220px;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border: 1px solid $primary-low; 
     &[multiple], &[size] {
       height: auto;
     }
@@ -272,8 +272,8 @@ body {
   }
   input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] {
     cursor: not-allowed;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
-    border-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
+    border-color: $primary-low; 
   }
   input {
     &[type="radio"][disabled], &[type="checkbox"][disabled], &[type="radio"][readonly], &[type="checkbox"][readonly] {
@@ -372,7 +372,7 @@ body {
     text-align: center;
     vertical-align: middle;
     background-color: $secondary;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border: 1px solid $primary-low; 
   }
   .input-prepend .add-on, .input-append .add-on, .input-prepend .btn, .input-append .btn {
     margin-left: -1px;
diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss
index 5c913eef7f3..5bd0b3b9e6b 100644
--- a/app/assets/stylesheets/desktop/group.scss
+++ b/app/assets/stylesheets/desktop/group.scss
@@ -48,7 +48,7 @@
 }
 
 .group-edit {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   padding: 10px;
 
   .form-horizontal {
diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss
index 858796f21b0..4519450e1aa 100644
--- a/app/assets/stylesheets/desktop/history.scss
+++ b/app/assets/stylesheets/desktop/history.scss
@@ -12,10 +12,10 @@
 
     .btn[disabled] {
       cursor: not-allowed;
-      background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+      background-color: $primary-low; 
     }
     .btn-danger[disabled] {
-      background-color: dark-light-diff($danger, $secondary, 30%, -60%);
+      background-color: $danger-medium;
     }
   }
   #display-modes {
@@ -25,7 +25,7 @@
 
     .btn {
       background-color:inherit;
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
     }
     .btn-primary {
       color: $primary;
@@ -35,7 +35,7 @@
   #revision-details {
     padding: 5px;
     margin-top: 10px;
-    border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 3px solid $primary-low; 
   }
   #revisions {
     word-wrap: break-word;
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 8eafec8f207..a99bf50c0fa 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -97,7 +97,13 @@
     }
   }
   form {
-    label, .input {
+    .controls, .input {
+      margin-left: 20px;
+    }
+    input, label {
+      margin-bottom: 0;
+    }
+    .user-field .control-label:not(.checkbox-label) {
       margin-left: 20px;
     }
   }
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index c345acd0cd1..35b4f4d6f1c 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -16,7 +16,7 @@
   height: auto;
   margin: -250px 0 0 -305px;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
 
   box-shadow: 0 3px 7px rgba(0,0,0, .8);
   background-clip: padding-box;
diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss
index 6d306bae6ee..363eca2dc8a 100644
--- a/app/assets/stylesheets/desktop/queued-posts.scss
+++ b/app/assets/stylesheets/desktop/queued-posts.scss
@@ -31,7 +31,7 @@
       }
     }
     .post-title {
-      color: dark-light-diff($primary, $secondary, 20%, -60%);
+      color: $primary-medium;
       font-weight: bold;
 
       .badge-wrapper {
@@ -41,4 +41,3 @@
 
   }
 }
-
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index c59373c6edd..edd58ce1e0c 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -61,10 +61,8 @@
   }
   button.bulk-select {
     padding: 0;
-    background: transparent;
-    &:hover {
-      color: dark-light-diff($primary, $secondary, 90%, -60%);
-    }
+    font-size: 1.05em;
+    margin-right: 0.3em;
   }
 
   .star {
@@ -115,7 +113,7 @@
   .sortable {
     cursor: pointer;
     &:hover {
-      background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+      background-color: $primary-low; 
     }
     @include unselectable;
   }
@@ -313,10 +311,20 @@ and (max-width : 850px) {
   .nav-pills {
     > li > a {
       font-size: 1em;
-      padding: 5px 10px ;
+      padding: 5px 10px;
       }
   }
 
+  // new topic just a "+" no text
+  button#create-topic {
+    span {
+      display: none;
+    }
+    i {
+      margin-right: 0;
+    }
+  }
+
   .topic-list {
 
     // tighter table header spacing
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 871e42c0d7b..fd0dea67181 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -53,17 +53,23 @@ section.post-menu-area {
 
 nav.post-controls {
 
-    .like-count {
-      font-size: inherit;
-      margin-right: -5px;
-    }
+  padding: 0;
 
-    padding: 0;
-    .highlight-action {
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
-    }
-    a, button {
+  .like-count {
+    font-size: inherit;
+    margin-right: -5px;
+  }
+
+  .highlight-action {
+    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+  }
+
+  a, button {
     color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+
+    i.fa {
+      opacity: 1.0;
+    }
     margin-right: 2px;
     display: inline-block;
   }
@@ -94,7 +100,7 @@ nav.post-controls {
     font-size: inherit;
     span.badge-posts {color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); }
     &:hover {
-      background: dark-light-diff($primary, $secondary, 90%, -65%);
+      background: $primary-low;
       span.badge-posts {color: $primary;}
     }
     i {
@@ -122,7 +128,7 @@ nav.post-controls {
     margin-left: 3px;
 
     &.d-hover {
-      background: dark-light-diff($primary, $secondary, 90%, -60%);
+      background: $primary-low;
       color: $primary;
     }
 
@@ -144,7 +150,7 @@ nav.post-controls {
 
     &.like.d-hover {
       color: $love;
-      background: dark-light-diff($love, $secondary, 85%, -60%)
+      background: $love-low;
     }
 
     &.has-like {color: $love;}
@@ -179,7 +185,7 @@ nav.post-controls {
     background-color: $secondary;
     width: 205px;
     padding: 10px;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border: 1px solid $primary-low;
     position: absolute;
     text-align: left;
     bottom: -2px;
@@ -288,11 +294,11 @@ a.star {
 .topic-map {
   margin: 20px 0 0 0;
   background: blend-primary-secondary(5%);
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+  border: 1px solid $primary-low;
   border-top: none; // would cause double top border
 
   section {
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+    border-top: 1px solid $primary-low;
   }
 
   h3 {
@@ -402,11 +408,11 @@ a.star {
       padding: 0 23px;
       color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
       background: blend-primary-secondary(5%);
-      border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+      border-left: 1px solid $primary-low;
+      border-top: 1px solid $primary-low;
       &:hover {
         color: $primary;
-        background: dark-light-diff($primary, $secondary, 90%, -80%);
+        background: $primary-low;
       }
 
       &.collapsed {
@@ -419,6 +425,16 @@ a.star {
       }
     }
   }
+
+  .link-summary .btn {
+    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+    background: blend-primary-secondary(5%);
+    width: 100%;
+    &:hover {
+      color: $primary;
+      background: dark-light-diff($primary, $secondary, 90%, -80%);
+    }
+  }
 }
 
 #topic-footer-buttons {
@@ -453,9 +469,7 @@ a.star {
     table-layout: fixed;
     margin-top: 10px;
   }
-  .topics {
-    padding-bottom: 15px;
-  }
+
   // this forces category to take less space in suggested topics
   // as the poster list is not present at all there.
   th.category {
@@ -567,7 +581,7 @@ video {
 
 .moderator {
   .topic-body {
-    background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
+    background-color: $highlight-low;
   }
 }
 
@@ -617,7 +631,7 @@ blockquote {
   aside {
     .quote, .title, blockquote, .onebox, .onebox-result {
       background: blend-primary-secondary(5%);
-      border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%);
+      border-left: 5px solid $primary-low;
     }
 
     aside.quote>blockquote, aside.quote>.title {
@@ -637,12 +651,12 @@ $topic-avatar-width: 45px;
   float: left;
   position: relative;
   z-index: 2;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-top: 1px solid $primary-low;
   padding: 12px $topic-body-width-padding 15px $topic-body-width-padding;
 }
 
 .topic-avatar {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-top: 1px solid $primary-low;
   padding-top: 15px;
   width: $topic-avatar-width;
   float: left;
@@ -655,7 +669,7 @@ $topic-avatar-width: 45px;
 
 .small-action {
   max-width: 755px;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-top: 1px solid $primary-low;
 }
 
 .small-action.deleted {
@@ -698,7 +712,7 @@ $topic-avatar-width: 45px;
   margin: 1px 0 0;
   list-style: none;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   box-shadow: 0 1px 5px rgba(0,0,0, .4);
   background-clip: padding-box;
   span {
@@ -730,7 +744,7 @@ $topic-avatar-width: 45px;
 .dropdown-menu .active > a:hover {
   color: $primary;
   text-decoration: none;
-  background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
+  background-color: $highlight-medium;
 
 }
 
@@ -738,7 +752,7 @@ $topic-avatar-width: 45px;
 .dropdown-menu .disabled > a:hover {
   text-decoration: none;
   color: $primary;
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
   cursor: default;
 }
 
@@ -757,7 +771,7 @@ $topic-avatar-width: 45px;
   width: 200px;
   position: fixed;
   z-index: 1000;
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
   border: 1px solid $tertiary;
   padding: 5px;
   margin-bottom: 5px;
@@ -876,7 +890,7 @@ a.attachment:before {
   display: block;
   position: absolute;
   left: 767px;
-  color: rgba(dark-light-diff($primary, $secondary, 90%, -65%) , .8);
+  color: rgba($primary-low, .8);
   font: 6.429em/1 FontAwesome;
   content: "\f014";
   z-index: -5;
@@ -911,7 +925,7 @@ a.attachment:before {
 }
 
 span.highlighted {
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
 }
 
 .username.new-user a {
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index bd4b0c9f5f0..af7c2da9026 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -80,7 +80,7 @@
 }
 
 .topic-status-info {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-top: 1px solid $primary-low; 
   padding-top: 10px;
   height: 20px;
   max-width: 757px;
@@ -99,7 +99,7 @@
 }
 
 #topic-progress-expanded {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   padding: 5px;
   background: $secondary;
 
@@ -149,7 +149,7 @@
   }
   background-color: $secondary;
   color: $tertiary;
-  border: 1px solid dark-light-diff($tertiary, $secondary, 85%, -65%);
+  border: 1px solid $tertiary-low;
   border-bottom: none;
   width: 145px;
   height: 34px;
@@ -183,8 +183,8 @@
     top: 0;
     bottom: 0;
     width: 0;
-    border-right: 1px solid  dark-light-diff($tertiary, $secondary, 85%, -65%);
-    background-color:  dark-light-diff($tertiary, $secondary, 85%, -65%);
+    border-right: 1px solid  $tertiary-low;
+    background-color:  $tertiary-low;
     transition: width .75s;
   }
 }
@@ -209,12 +209,12 @@
 }
 
 @media all
-and (max-width : 1000px) {
+and (min-width: 400px) {
 
   #topic-progress, #topic-progress-expanded {
-      right: 0;
-      left: 0;
-    }
+    right: 0;
+    left: 0;
+  }
 
   #topic-progress-wrapper {
     right: 160px;
@@ -229,7 +229,6 @@ and (max-width : 1000px) {
   }
 }
 
-
 @media all
 and (max-width : 485px) {
 
diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss
index 2d48ec8e003..0920d97213b 100644
--- a/app/assets/stylesheets/desktop/user-card.scss
+++ b/app/assets/stylesheets/desktop/user-card.scss
@@ -205,17 +205,12 @@ $user_card_background: $secondary;
 
     .names {
       float: left;
-      height: 60px;
-      position: relative;
       width: 45%;
 
       span {
-        position: absolute;
-        bottom: 0;
         display: block;
         width: 250px;
       }
-
     }
 
     .badge-section {
@@ -226,7 +221,7 @@ $user_card_background: $secondary;
 
       .user-badge {
         background: scale-color($user_card_background, $lightness: -5%);
-        border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        border: 1px solid $primary-low; 
         color: $user_card_primary;
       }
 
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index f22c226d5ce..07d645809f1 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -1,5 +1,4 @@
 // styles that apply to the user page
-
 .groups {
   .group-link {
     color: $tertiary;
@@ -49,6 +48,9 @@
     font-size: 80%;
     line-height: 1.4em;
   }
+  .form-horizontal .instructions {
+    margin-left: 160px;
+  }
   .avatar {
     margin-left: 3px;
   }
@@ -160,7 +162,7 @@
 
       th {
         text-align: left;
-        border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        border-bottom: 3px solid $primary-low; 
         padding: 0 0 10px 0;
         color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
         font-weight: normal;
@@ -168,7 +170,7 @@
 
       td {
         padding: 10px 0 10px 0;
-        border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        border-bottom: 1px solid $primary-low; 
       }
     }
 
@@ -180,7 +182,7 @@
     }
 
     .user-invite-controls {
-      background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+      background-color: $primary-low; 
       padding: 5px 10px 0px 0;
       height: 35px;
     }
@@ -212,8 +214,8 @@
 
   .secondary {
     background: scale-color($secondary, $lightness: -5%);
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: 1px solid $primary-low; 
+    border-bottom: 1px solid $primary-low; 
     font-size: 0.929em;
       .btn { padding: 3px 12px; }
 
@@ -250,7 +252,7 @@
       }
 
       dt {
-        color: dark-light-diff($secondary, $primary, 50%, -40%);
+        color: $secondary-medium;
         margin: 0;
       }
     }
@@ -262,8 +264,8 @@
       transition: margin .15s linear;
 
       blockquote {
-        background-color: dark-light-diff($secondary, $primary, 30%, -70%);
-        border-left-color: dark-light-diff($secondary, $primary, 50%, -50%);
+        background-color: $secondary-low; 
+        border-left-color: $secondary-low; 
       }
 
       h1 {
@@ -390,7 +392,7 @@
       padding: 0 0 2px 0;
       margin-top: 0;
       background: rgba($secondary, .85);
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
       .bio { display: none; }
 
       .primary {
@@ -434,7 +436,7 @@
       color: $primary;
     }
     .item.moderator-action {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -10%);
+      background-color: $highlight-medium;
     }
     .item.deleted {
       opacity: 0.8;
@@ -447,7 +449,7 @@
     .item {
       padding: 20px 8px 15px 8px;
       background-color: $secondary;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
     }
     .type {
       color: $primary;
@@ -491,7 +493,7 @@
     }
     .notification {
       &.unread {
-        background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+        background-color: $tertiary-low;
       }
 
       li { display: inline-block; }
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index 66af74d3d0b..65a25aa8f17 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -16,8 +16,8 @@ article.post {
   }
 
   .quote .title {
-    border-left: 5px solid darken(dark-light-diff($primary, $secondary, 97%, -45%), 10%);
-    background-color: dark-light-diff($primary, $secondary, 97%, -45%);
+    border-left: 5px solid darken($primary-low, 10%);
+    background-color: $primary-low;
     padding: 10px 10px 0 12px;
     .avatar { margin-right: 7px; }
   }
@@ -29,8 +29,8 @@ article.post {
   blockquote {
     padding: 10px 8px 10px 13px;
     margin: 0 0 10px 0;
-    background-color: dark-light-diff($primary, $secondary, 97%, -45%);
-    border-left: 5px solid darken(dark-light-diff($primary, $secondary, 97%, -45%), 10%);
+    background-color: $primary-low;
+    border-left: 5px solid darken($primary-low, 10%);
     p {
       margin: 0 0 10px 0;
     }
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index e524dd27942..1256f823e29 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -19,7 +19,7 @@ input {
   padding: 4px;
   border-radius: 3px;
   box-shadow: inset 0 1px 1px rgba(0,0,0, .3);
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
 }
 input[type=radio], input[type=checkbox] {
   box-shadow: none;
@@ -38,28 +38,19 @@ input[type=radio], input[type=checkbox] {
   width: 100%;
   z-index: 1039;
   height: 0;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+  background-color: $primary-low; 
   bottom: 0;
   font-size: 1em;
   position: fixed;
   .toggle-toolbar, .toggler {
-    width: 15px;
     right: 1px;
     position: absolute;
     font-size: 1.071em;
     color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    padding: 0 10px 5px 10px;
-    &:before {
-      font-family: "FontAwesome";
-      content: "\f078";
-    }
   }
 
   .toggle-toolbar {
     right: 30px;
-    &:before {
-      content: "\f0c9";
-    }
   }
 
   a.cancel {
@@ -97,7 +88,7 @@ input[type=radio], input[type=checkbox] {
   &.draft {
     height: 35px !important;
     cursor: pointer;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: 1px solid $primary-low; 
     .draft-text {
       display: block;
       position: absolute;
@@ -111,25 +102,13 @@ input[type=radio], input[type=checkbox] {
         color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
       }
     }
-    .toggler {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f00d";
-      }
-    }
   }
   &.saving {
     height: 40px !important;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: 1px solid $primary-low;
     .saving-text {
       display: block;
     }
-    .toggler {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f00d";
-      }
-    }
   }
 
   // if this is a new topic, make room for the category field in the editor on
@@ -207,6 +186,12 @@ input[type=radio], input[type=checkbox] {
       position: absolute;
       display: block;
       bottom: 0;
+      white-space: nowrap;
+      .btn {
+        max-width: 120px;
+        overflow: hidden;
+        white-space: nowrap;
+      }
     }
   }
   .category-input {
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index bbdbf8cf02b..ba1617ea54a 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -18,12 +18,12 @@
 }
 
 .directory .user {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 80%, -20%);
+  border-top: 1px solid $primary-low;
   padding: 1em;
 
 
   &.me {
-    background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
+    background-color: $highlight-low;
 
     .username a, .name, .title, .number, .time-read, .user-stat .label {
       color: scale-color($highlight, $lightness: -50%);
@@ -38,7 +38,7 @@
     }
     .label {
       margin-left: 0.2em;
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
     }
     i.fa-heart {
       color: $love;
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 97c23d24271..39162e34a05 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -73,7 +73,7 @@ blockquote {
   display: inline-block;
   .topic-status {
     i {
-      color: dark-light-diff($secondary, $primary, 40%, -20%);
+      color: $secondary-medium;
     }
   }
 }
@@ -123,7 +123,7 @@ h2#site-text-logo
   }
   margin: 0;
   padding: 0;
-  background: dark-light-diff($primary, $secondary, 90%, -65%);
+  background: $primary-low; 
   list-style: none;
   overflow: visible;
   position: relative;
diff --git a/app/assets/stylesheets/mobile/emoji.scss b/app/assets/stylesheets/mobile/emoji.scss
index 6d944937561..e69de29bb2d 100644
--- a/app/assets/stylesheets/mobile/emoji.scss
+++ b/app/assets/stylesheets/mobile/emoji.scss
@@ -1,10 +0,0 @@
-.emoji-table-wrapper {
-  min-width: 320px;
-}
-
-.emoji-modal {
-  width: 340px;
-  margin-top: -132px;
-  margin-left: -170px;
-  background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));
-}
diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss
index 0f52dbb84a4..395f8ca956f 100644
--- a/app/assets/stylesheets/mobile/history.scss
+++ b/app/assets/stylesheets/mobile/history.scss
@@ -9,7 +9,7 @@
     line-height: 2em;
   }
   #revision-details {
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
     padding: 5px;
     margin-top: 10px;
   }
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index d66aa8115ac..5c1d3e2bddf 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -26,7 +26,7 @@
     position: relative;
   }
   .nav-pills .drop {
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+    border: 1px solid $primary-low; 
     position: absolute;
     z-index: 1000;
     background-color: $secondary;
@@ -47,7 +47,7 @@
 
   }
   .nav-pills > li {
-    background: dark-light-diff($primary, $secondary, 90%, -65%);
+    background: $primary-low; 
     i.fa-caret-down {
       margin-left: 8px;
     }
@@ -146,9 +146,9 @@
 
   tbody {
     tr {
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+      border-bottom: 1px solid $primary-low; 
       &:first-of-type {
-        border-top: 3px solid dark-light-diff($primary, $secondary, 90%, -75%);
+        border-top: 3px solid $primary-low; 
       }
     }
     .category {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 453f863efd8..b8227b21c1b 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -3,7 +3,7 @@
 }
 
 .small-action {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low;
   color: lighten($primary, 50%);
   padding-bottom: 3px;
   text-transform: uppercase;
@@ -28,7 +28,7 @@
 }
 
 .topic-post article {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low;
   padding: 8px 0;
 }
 
@@ -47,6 +47,9 @@ span.badge-posts {
 
 nav.post-controls {
   clear: both;
+  i.fa {
+    opacity: 1.0;
+  }
 }
 
 .who-liked {
@@ -109,7 +112,7 @@ nav.post-controls {
   background-color: $secondary;
   width: 205px;
   padding: 10px;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   position: absolute;
   text-align: left;
   bottom: 0;
@@ -181,11 +184,11 @@ a.star {
 
   margin: 10px 0;
   background: blend-primary-secondary(5%);
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+  border: 1px solid $primary-low;
   border-top: none; // would cause double top border
 
   section {
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+    border-top: 1px solid $primary-low;
   }
 
   h3 {
@@ -300,8 +303,8 @@ a.star {
       padding: 0 15px;
       color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
       background: blend-primary-secondary(5%);
-      border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+      border-left: 1px solid $primary-low;
+      border-top: 1px solid $primary-low;
       .fa {
         margin: 0;
         font-size: 1.286em;
@@ -309,6 +312,12 @@ a.star {
       }
     }
   }
+
+  .link-summary .btn {
+    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+    background: blend-primary-secondary(5%);
+    width: 100%;
+  }
 }
 
 #topic-footer-buttons {
@@ -386,7 +395,7 @@ span.post-count {
 }
 
 .moderator .topic-body {
-  background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
+  background-color: $highlight-low;
 }
 
 .quote-button.visible {
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 2354605a9bb..0d719d7f032 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -45,7 +45,7 @@
 
 .topic-status-info {
   padding-left: 10px;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-top: 1px solid $primary-low; 
   padding-top: 10px;
   h3 {
     margin: 0;
@@ -66,7 +66,7 @@
 }
 
 #topic-progress-expanded {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   padding: 5px;
   background: $secondary;
 
@@ -113,7 +113,7 @@
   }
   background-color: $secondary;
   color: $tertiary;
-  border: 1px solid dark-light-diff($tertiary, $secondary, 85%, -65%);
+  border: 1px solid $tertiary-low;
   border-bottom: none;
   width: 145px;
   height: 34px;
@@ -144,8 +144,8 @@
     top: 0;
     bottom: 0;
     width: 0;
-    border-right: 1px solid  dark-light-diff($tertiary, $secondary, 85%, -65%);
-    background-color:  dark-light-diff($tertiary, $secondary, 85%, -65%);
+    border-right: 1px solid  $tertiary-low;
+    background-color:  $tertiary-low;
     transition: width .75s;
   }
 }
@@ -210,4 +210,4 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
   .btn.pull-right {
     margin-right: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 7136d89613c..3bcb6fb7454 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -159,11 +159,11 @@
     th {
       padding: 0.5em;
       text-align: right;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
     }
     td {
       padding: 0.5em;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
       img {
         margin-right: 10px;
       }
@@ -196,13 +196,13 @@
 
       th {
         text-align: left;
-        border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        border-bottom: 1px solid $primary-low; 
         padding: 5px;
       }
 
       td {
         padding: 5px;
-        border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        border-bottom: 1px solid $primary-low; 
       }
     }
   }
@@ -215,7 +215,7 @@
     color: $secondary;
 
     .secondary {
-      background: dark-light-diff($primary, $secondary, 90%, -65%);
+      background: $primary-low; 
       font-size: 0.929em;
 
       .btn { padding: 3px 12px; }
@@ -241,7 +241,7 @@
       }
 
       dt {
-        color: dark-light-diff($secondary, $primary, 50%, -40%);
+        color: $secondary-medium;
         margin: 0;
       }
     }
@@ -251,8 +251,8 @@
       background: rgba($secondary, .85);
 
       blockquote {
-        background-color: dark-light-diff($secondary, $primary, 30%, -70%);
-        border-left-color: dark-light-diff($secondary, $primary, 50%, -50%);
+        background-color: $secondary-low; 
+        border-left-color: $secondary-low; 
       }
 
       h1 {
@@ -399,7 +399,7 @@
       color: $primary;
     }
     .item.moderator-action {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -10%);
+      background-color: $highlight-medium;
     }
     .item.deleted {
       opacity: 0.8;
@@ -412,7 +412,7 @@
     .item {
       padding: 20px 0 15px 0;
       background-color: $secondary;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
     }
     .type {
       color: $primary;
diff --git a/app/assets/stylesheets/vendor/pikaday.scss b/app/assets/stylesheets/vendor/pikaday.scss
index 8465631879a..7880b8bc657 100644
--- a/app/assets/stylesheets/vendor/pikaday.scss
+++ b/app/assets/stylesheets/vendor/pikaday.scss
@@ -14,20 +14,20 @@ $pd-text-color: $primary !default;
 $pd-title-color: $primary !default;
 $pd-title-bg: $secondary !default;
 $pd-picker-bg: $secondary !default;
-$pd-picker-border: dark-light-diff($secondary, $primary, -20%, 20%) !default;
-$pd-picker-border-bottom: dark-light-diff($secondary, $primary, -30%, 30%) !default;
+$pd-picker-border: $primary-low !default;
+$pd-picker-border-bottom: $primary-low !default;
 $pd-picker-shadow: rgba(0,0,0,.5) !default;
-$pd-th-color: dark-light-diff($primary, $secondary, -20%, 20%) !default;
-$pd-day-color: dark-light-diff($primary, $secondary, -30%, 30%) !default;
-$pd-day-bg: dark-light-diff($primary, $secondary, 90%, -90%) !default;
-$pd-day-hover-color: $secondary !default;
-$pd-day-hover-bg: dark-light-diff($tertiary, $secondary, 30%, -30%) !default;
+$pd-th-color: $primary !default;
+$pd-day-color: $primary !default;
+$pd-day-bg: $secondary !default;
+$pd-day-hover-color: $primary !default;
+$pd-day-hover-bg: $tertiary-low !default;
 $pd-day-today-color: $tertiary !default;
 $pd-day-selected-color: $secondary !default;
 $pd-day-selected-bg: $tertiary !default;
-$pd-day-selected-shadow: dark-light-diff($tertiary, $secondary, 50%, -50%) !default;
-$pd-day-disabled-color: dark-light-diff($primary, $secondary, -20%, 20%) !default;
-$pd-week-color: dark-light-diff($primary, $secondary, -20%, 20%) !default;
+$pd-day-selected-shadow: $tertiary-low !default;
+$pd-day-disabled-color: $primary !default;
+$pd-week-color: $primary !default;
 
 // Font
 $pd-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb
index 455a22151e7..75e07bb22b6 100644
--- a/app/controllers/admin/email_controller.rb
+++ b/app/controllers/admin/email_controller.rb
@@ -73,7 +73,7 @@ class Admin::EmailController < Admin::AdminController
     params.require(:from)
     params.require(:to)
     # These strings aren't localized; they are sent to an anonymous SMTP user.
-    if !User.exists?(email: Email.downcase(params[:from])) && !SiteSetting.enable_staged_users
+    if !User.with_email(Email.downcase(params[:from])).exists? && !SiteSetting.enable_staged_users
       render json: { reject: true, reason: "Mail from your address is not accepted. Do you have an account here?" }
     elsif Email::Receiver.check_address(Email.downcase(params[:to])).nil?
       render json: { reject: true, reason: "Mail to this address is not accepted. Check the address and try to send again?" }
diff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rb
index d3d1e963289..b6fd3b631c3 100644
--- a/app/controllers/admin/email_templates_controller.rb
+++ b/app/controllers/admin/email_templates_controller.rb
@@ -15,6 +15,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
                      "system_messages.email_reject_reply_key", "system_messages.email_reject_topic_closed",
                      "system_messages.email_reject_topic_not_found",
                      "system_messages.email_reject_screened_email",
+                     "system_messages.email_reject_unrecognized_error",
                      "system_messages.pending_users_reminder", "system_messages.post_hidden",
                      "system_messages.restore_failed", "system_messages.restore_succeeded",
                      "system_messages.spam_post_blocked", "system_messages.too_many_spam_flags",
@@ -26,6 +27,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
                      "user_notifications.set_password", "user_notifications.signup",
                      "user_notifications.signup_after_approval",
                      "user_notifications.user_invited_to_private_message_pm",
+                     "user_notifications.user_invited_to_private_message_pm_group",
                      "user_notifications.user_invited_to_topic", "user_notifications.user_mentioned",
                      "user_notifications.user_posted", "user_notifications.user_posted_pm",
                      "user_notifications.user_quoted", "user_notifications.user_replied",
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index c93e287cee7..2a1f9a36e02 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,19 +1,4 @@
 class Admin::GroupsController < Admin::AdminController
-
-  def index
-    groups = Group.order(:name).where("groups.id <> ?", Group::AUTO_GROUPS[:everyone])
-
-    if search = params[:search].to_s
-      groups = groups.where("name ILIKE ?", "%#{search}%")
-    end
-
-    if params[:ignore_automatic].to_s == "true"
-      groups = groups.where(automatic: false)
-    end
-
-    render_serialized(groups, BasicGroupSerializer)
-  end
-
   def show
     render nothing: true
   end
@@ -29,7 +14,11 @@ class Admin::GroupsController < Admin::AdminController
       users = (params[:users] || []).map {|u| u.downcase}
       valid_emails = {}
       valid_usernames = {}
-      valid_users = User.where("username_lower IN (:users) OR email IN (:users)", users: users).pluck(:id, :username_lower, :email)
+
+      valid_users = User.joins(:user_emails)
+        .where("username_lower IN (:users) OR user_emails.email IN (:users)", users: users)
+        .pluck(:id, :username_lower, :"user_emails.email")
+
       valid_users.map! do |id, username_lower, email|
         valid_emails[email] = valid_usernames[username_lower] = id
         id
@@ -59,7 +48,11 @@ class Admin::GroupsController < Admin::AdminController
 
   def save_group(group)
     group.alias_level = group_params[:alias_level].to_i if group_params[:alias_level].present?
-    group.visible = group_params[:visible] == "true"
+
+    if group_params[:visibility_level]
+      group.visibility_level = group_params[:visibility_level]
+    end
+
     grant_trust_level = group_params[:grant_trust_level].to_i
     group.grant_trust_level = (grant_trust_level > 0 && grant_trust_level <= 4) ? grant_trust_level : nil
 
@@ -160,7 +153,7 @@ class Admin::GroupsController < Admin::AdminController
 
   def group_params
     params.require(:group).permit(
-      :name, :alias_level, :visible, :automatic_membership_email_domains,
+      :name, :alias_level, :visibility_level, :automatic_membership_email_domains,
       :automatic_membership_retroactive, :title, :primary_group,
       :grant_trust_level, :incoming_email, :flair_url, :flair_bg_color,
       :flair_color, :bio_raw, :public, :allow_membership_requests, :full_name,
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index 500968f9532..33c7b716fc3 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -43,12 +43,19 @@ class Admin::SiteTextsController < Admin::AdminController
 
   def update
     site_text = find_site_text
-    site_text[:value] = params[:site_text][:value]
-    old_text = I18n.t(site_text[:id])
-    StaffActionLogger.new(current_user).log_site_text_change(site_text[:id], site_text[:value], old_text)
+    value = site_text[:value] = params[:site_text][:value]
+    id = site_text[:id]
+    old_value = I18n.t(id)
+    translation_override = TranslationOverride.upsert!(I18n.locale, id, value)
 
-    TranslationOverride.upsert!(I18n.locale, site_text[:id], site_text[:value])
-    render_serialized(site_text, SiteTextSerializer, root: 'site_text', rest_serializer: true)
+    if translation_override.errors.empty?
+      StaffActionLogger.new(current_user).log_site_text_change(id, value, old_value)
+      render_serialized(site_text, SiteTextSerializer, root: 'site_text', rest_serializer: true)
+    else
+      render json: failed_json.merge(
+        message: translation_override.errors.full_messages.join("\n\n")
+      ), status: 422
+    end
   end
 
   def revert
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index b7e85c72fe9..c2da87bac4a 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -29,7 +29,7 @@ class CategoriesController < ApplicationController
     @category_list.draft_sequence = DraftSequence.current(current_user, Draft::NEW_TOPIC)
     @category_list.draft = Draft.get(current_user, Draft::NEW_TOPIC, @category_list.draft_sequence) if current_user
 
-    @title = I18n.t('js.filters.categories.title') unless category_options[:is_homepage]
+    @title = "#{I18n.t('js.filters.categories.title')} - #{SiteSetting.title}" unless category_options[:is_homepage]
 
     respond_to do |format|
       format.html do
diff --git a/app/controllers/email_controller.rb b/app/controllers/email_controller.rb
index 335afc4c674..c7eace9c02f 100644
--- a/app/controllers/email_controller.rb
+++ b/app/controllers/email_controller.rb
@@ -9,51 +9,42 @@ class EmailController < ApplicationController
   end
 
   def unsubscribe
-    key = UnsubscribeKey.find_by(key: params[:key])
+    @not_found = true
+    @watched_count = nil
 
-    if key
-      @user = key.user
-      post = key.post
-      @topic = (post && post.topic) || key.topic
-      @type = key.unsubscribe_key_type
+    if key = UnsubscribeKey.find_by(key: params[:key])
+      if @user = key.user
+        post = key.post
+        @topic = post&.topic || key.topic
+        @type = key.unsubscribe_key_type
+        @not_found = false
 
-      if current_user.present? && (@user != current_user)
-        @different_user = @user.name
-        @return_url = request.original_url
-      end
+        if current_user.present? && (@user != current_user)
+          @different_user = @user.name
+          @return_url = request.original_url
+        end
 
-      @watching_topic = @topic && TopicUser.exists?(user_id: @user.id,
-                                                    notification_level: TopicUser.notification_levels[:watching],
-                                                    topic_id: @topic.id)
+        watching = TopicUser.notification_levels[:watching]
 
-      @watched_count = nil
-      if @topic && @topic.category_id
-        if CategoryUser.exists?(user_id: @user.id,
-                                notification_level: CategoryUser.watching_levels,
-                                category_id: @topic.category_id)
-          @watched_count = TopicUser.joins(:topic)
-                                    .where(:user => @user,
-                                           :notification_level => TopicUser.notification_levels[:watching],
-                                           "topics.category_id" => @topic.category_id
-                                          ).count
+        if @topic
+          @watching_topic = TopicUser.exists?(user_id: @user.id, notification_level: watching, topic_id: @topic.id)
+          if @topic.category_id
+            if CategoryUser.exists?(user_id: @user.id, notification_level: CategoryUser.watching_levels, category_id: @topic.category_id)
+              @watched_count = TopicUser.joins(:topic)
+                                        .where(user: @user, notification_level: watching, "topics.category_id" => @topic.category_id)
+                                        .count
+            end
+          end
         end
       end
     end
-
-    if @user.blank?
-      @not_found = true
-    end
-
   end
 
   def perform_unsubscribe
-
     key = UnsubscribeKey.find_by(key: params[:key])
-    unless key && key.user
-      raise Discourse::NotFound
-    end
+    raise Discourse::NotFound unless key && key.user
 
-    topic = (key.post && key.post.topic) || key.topic
+    topic = key&.post&.topic || key.topic
     user = key.user
 
     updated = false
@@ -109,15 +100,16 @@ class EmailController < ApplicationController
       redirect_to :back
     else
       if topic
-        redirect_to path("/email/unsubscribed?topic_id=#{topic.id}")
+        redirect_to path("/email/unsubscribed?topic_id=#{topic.id}&email=#{user.email}")
       else
-        redirect_to path("/email/unsubscribed")
+        redirect_to path("/email/unsubscribed?email=#{user.email}")
       end
     end
 
   end
 
   def unsubscribed
+    @email = params[:email]
     @topic = Topic.find_by(id: params[:topic_id].to_i) if params[:topic_id]
   end
 
diff --git a/app/controllers/exceptions_controller.rb b/app/controllers/exceptions_controller.rb
index d5f21f8cb67..929509479a0 100644
--- a/app/controllers/exceptions_controller.rb
+++ b/app/controllers/exceptions_controller.rb
@@ -1,20 +1,21 @@
 class ExceptionsController < ApplicationController
   skip_before_filter :check_xhr, :preload_json
+  before_action :hide_google
 
   def not_found
-    @hide_google = true if SiteSetting.login_required
-
     # centralize all rendering of 404 into app controller
     raise Discourse::NotFound
   end
 
   # Give us an endpoint to use for 404 content in the ember app
   def not_found_body
-
-    # Don't show google search if it's embedded in the Ember app
-    @hide_google = true
-
     render html: build_not_found_page(200, false)
   end
 
+  private
+
+    def hide_google
+      @hide_google = true if SiteSetting.login_required
+    end
+
 end
diff --git a/app/controllers/finish_installation_controller.rb b/app/controllers/finish_installation_controller.rb
index c9a30724d48..4e73594d8a5 100644
--- a/app/controllers/finish_installation_controller.rb
+++ b/app/controllers/finish_installation_controller.rb
@@ -15,7 +15,7 @@ class FinishInstallationController < ApplicationController
       email = params[:email].strip
       raise Discourse::InvalidParameters.new unless @allowed_emails.include?(email)
 
-      return redirect_confirm(email) if User.where(email: email).exists?
+      return redirect_confirm(email) if UserEmail.exists?(email: email)
 
       @user.email = email
       @user.username = params[:username]
@@ -37,7 +37,7 @@ class FinishInstallationController < ApplicationController
 
   def resend_email
     @email = session[:registered_email]
-    @user = User.where(email: @email).first
+    @user = User.find_by_email(@email)
     if @user.present?
       @email_token = @user.email_tokens.unconfirmed.active.first
       if @email_token.present?
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 1a027838d77..46a69b6be4f 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -5,7 +5,9 @@ class GroupsController < ApplicationController
     :mentionable,
     :update,
     :messages,
-    :histories
+    :histories,
+    :request_membership,
+    :search
   ]
 
   skip_before_filter :preload_json, :check_xhr, only: [:posts_feed, :mentions_feed]
@@ -19,6 +21,12 @@ class GroupsController < ApplicationController
     page = params[:page]&.to_i || 0
 
     groups = Group.visible_groups(current_user)
+
+    unless guardian.is_staff?
+      # hide automatic groups from all non stuff to de-clutter page
+      groups = groups.where(automatic: false)
+    end
+
     count = groups.count
     groups = groups.offset(page * page_size).limit(page_size)
 
@@ -136,16 +144,6 @@ class GroupsController < ApplicationController
     }
   end
 
-  def owners
-    group = find_group(:group_id)
-
-    owners = group.users.where('group_users.owner')
-      .order("users.last_seen_at DESC")
-      .limit(5)
-
-    render_serialized(owners, GroupUserSerializer)
-  end
-
   def add_members
     group = Group.find(params[:id])
     group.public ? ensure_logged_in : guardian.ensure_can_edit!(group)
@@ -156,7 +154,7 @@ class GroupsController < ApplicationController
       elsif params[:user_ids].present?
         User.find(params[:user_ids].split(","))
       elsif params[:user_emails].present?
-        User.where(email: params[:user_emails].split(","))
+        User.with_email(params[:user_emails].split(","))
       else
         raise Discourse::InvalidParameters.new(
           'user_ids or usernames or user_emails must be present'
@@ -238,7 +236,32 @@ class GroupsController < ApplicationController
     else
       render_json_error(group)
     end
+  end
 
+  def request_membership
+    unless current_user.staff?
+      RateLimiter.new(current_user, "request_group_membership", 1, 1.day).performed!
+    end
+
+    group = find_group(:id)
+    group_name = group.name
+
+    usernames = [current_user.username].concat(
+      group.users.where('group_users.owner')
+        .order("users.last_seen_at DESC")
+        .limit(5)
+        .pluck("users.username")
+    )
+
+    post = PostCreator.new(current_user,
+      title: I18n.t('groups.request_membership_pm.title', group_name: group_name),
+      raw: I18n.t('groups.request_membership_pm.body', group_name: group_name),
+      archetype: Archetype.private_message,
+      target_usernames: usernames.join(','),
+      skip_validations: true
+    ).create!
+
+    render json: success_json.merge(relative_url: post.topic.relative_url)
   end
 
   def set_notifications
@@ -274,6 +297,22 @@ class GroupsController < ApplicationController
     )
   end
 
+  def search
+    groups = Group.visible_groups(current_user)
+      .where("groups.id <> ?", Group::AUTO_GROUPS[:everyone])
+      .order(:name)
+
+    if term = params[:term].to_s
+      groups = groups.where("name ILIKE :term OR full_name ILIKE :term", term: "%#{term}%")
+    end
+
+    if params[:ignore_automatic].to_s == "true"
+      groups = groups.where(automatic: false)
+    end
+
+    render_serialized(groups, BasicGroupSerializer)
+  end
+
   private
 
   def group_params
diff --git a/app/controllers/inline_onebox_controller.rb b/app/controllers/inline_onebox_controller.rb
new file mode 100644
index 00000000000..67afcf01b24
--- /dev/null
+++ b/app/controllers/inline_onebox_controller.rb
@@ -0,0 +1,10 @@
+require_dependency 'inline_oneboxer'
+
+class InlineOneboxController < ApplicationController
+  before_filter :ensure_logged_in
+
+  def show
+    oneboxes = InlineOneboxer.new(params[:urls]).process
+    render json: { "inline-oneboxes" => oneboxes }
+  end
+end
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 1693d1616a7..42ab4ca712e 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -6,9 +6,9 @@ class InvitesController < ApplicationController
   skip_before_filter :preload_json, except: [:show]
   skip_before_filter :redirect_to_login_if_required
 
-  before_filter :ensure_logged_in, only: [:destroy, :create, :create_invite_link, :resend_invite, :resend_all_invites, :upload_csv]
-  before_filter :ensure_new_registrations_allowed, only: [:show, :perform_accept_invitation, :redeem_disposable_invite]
-  before_filter :ensure_not_logged_in, only: [:show, :perform_accept_invitation, :redeem_disposable_invite]
+  before_filter :ensure_logged_in, only: [:destroy, :create, :create_invite_link, :rescind_all_invites, :resend_invite, :resend_all_invites, :upload_csv]
+  before_filter :ensure_new_registrations_allowed, only: [:show, :perform_accept_invitation]
+  before_filter :ensure_not_logged_in, only: [:show, :perform_accept_invitation]
 
   def show
     expires_now
@@ -30,12 +30,12 @@ class InvitesController < ApplicationController
 
   def perform_accept_invitation
     params.require(:id)
-    params.permit(:username, :name, :password)
+    params.permit(:username, :name, :password, :user_custom_fields)
     invite = Invite.find_by(invite_key: params[:id])
 
     if invite.present?
       begin
-        user = invite.redeem(username: params[:username], name: params[:name], password: params[:password])
+        user = invite.redeem(username: params[:username], name: params[:name], password: params[:password], user_custom_fields: params[:user_custom_fields])
         if user.present?
           log_on_user(user)
           post_process_invite(user)
@@ -61,9 +61,13 @@ class InvitesController < ApplicationController
   def create
     params.require(:email)
 
-    group_ids = Group.lookup_group_ids(params)
+    groups = Group.lookup_groups(
+      group_ids: params[:group_ids],
+      group_names: params[:group_names]
+    )
 
-    guardian.ensure_can_invite_to_forum!(group_ids)
+    guardian.ensure_can_invite_to_forum!(groups)
+    group_ids = groups.map(&:id)
 
     invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first
     if invite_exists && !guardian.can_send_multiple_invites?(current_user)
@@ -71,21 +75,27 @@ class InvitesController < ApplicationController
     end
 
     begin
-      if Invite.invite_by_email(params[:email], current_user, _topic=nil,  group_ids, params[:custom_message])
+      if Invite.invite_by_email(params[:email], current_user, nil, group_ids, params[:custom_message])
         render json: success_json
       else
         render json: failed_json, status: 422
       end
-    rescue Invite::UserExists => e
+    rescue Invite::UserExists, ActiveRecord::RecordInvalid => e
       render json: {errors: [e.message]}, status: 422
     end
   end
 
   def create_invite_link
     params.require(:email)
-    group_ids = Group.lookup_group_ids(params)
+
+    groups = Group.lookup_groups(
+      group_ids: params[:group_ids],
+      group_names: params[:group_names]
+    )
+
+    guardian.ensure_can_invite_to_forum!(groups)
     topic = Topic.find_by(id: params[:topic_id])
-    guardian.ensure_can_invite_to_forum!(group_ids)
+    group_ids = groups.map(&:id)
 
     invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first
     if invite_exists && !guardian.can_send_multiple_invites?(current_user)
@@ -104,42 +114,6 @@ class InvitesController < ApplicationController
     end
   end
 
-  def create_disposable_invite
-    guardian.ensure_can_create_disposable_invite!(current_user)
-    params.permit(:username, :email, :quantity, :group_names)
-
-    username_or_email = params[:username] ? fetch_username : fetch_email
-    user = User.find_by_username_or_email(username_or_email)
-
-    # generate invite tokens
-    invite_tokens = Invite.generate_disposable_tokens(user, params[:quantity], params[:group_names])
-
-    render_json_dump(invite_tokens)
-  end
-
-  def redeem_disposable_invite
-    params.require(:email)
-    params.permit(:username, :name, :topic)
-    params[:email] = params[:email].split(' ').join('+')
-
-    invite = Invite.find_by(invite_key: params[:token])
-
-    if invite.present?
-      user = Invite.redeem_from_token(params[:token], params[:email], params[:username], params[:name], params[:topic].to_i)
-      if user.present?
-        log_on_user(user)
-        post_process_invite(user)
-        topic = invite.topics.first
-        if topic.present?
-          redirect_to path("#{topic.relative_url}")
-          return
-        end
-      end
-    end
-
-    redirect_to path("/")
-  end
-
   def destroy
     params.require(:email)
 
@@ -150,6 +124,13 @@ class InvitesController < ApplicationController
     render nothing: true
   end
 
+  def rescind_all_invites
+    guardian.ensure_can_rescind_all_invites!(current_user)
+
+    Invite.rescind_all_invites_from(current_user)
+    render nothing: true
+  end
+
   def resend_invite
     params.require(:email)
     RateLimiter.new(current_user, "resend-invite-per-hour", 10, 1.hour).performed!
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 8fea454ebf0..66e59247f93 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -84,6 +84,7 @@ class ListController < ApplicationController
           else
             @title = I18n.t('js.filters.with_topics', filter: filter_title)
           end
+          @title << " - #{SiteSetting.title}"
         end
       end
 
@@ -110,6 +111,7 @@ class ListController < ApplicationController
   end
 
   def category_default
+    canonical_url "#{Discourse.base_url_no_prefix}#{@category.url}"
     view_method = @category.default_view
     view_method = 'latest' unless %w(latest top).include?(view_method)
 
@@ -181,7 +183,7 @@ class ListController < ApplicationController
     guardian.ensure_can_see!(@category)
     discourse_expires_in 1.minute
 
-    @title = @category.name
+    @title = "#{@category.name} - #{SiteSetting.title}"
     @link = "#{Discourse.base_url}#{@category.url}"
     @atom_link = "#{Discourse.base_url}#{@category.url}.rss"
     @description = "#{I18n.t('topics_in_category', category: @category.name)} #{@category.description}"
@@ -239,7 +241,7 @@ class ListController < ApplicationController
       @rss = "top_#{period}"
 
       if use_crawler_layout?
-        @title = I18n.t("js.filters.top.#{period}.title")
+        @title = I18n.t("js.filters.top.#{period}.title") + " - #{SiteSetting.title}"
       end
 
       respond_with_list(list)
diff --git a/app/controllers/onebox_controller.rb b/app/controllers/onebox_controller.rb
index c4e4fa47f46..a8700a59cf1 100644
--- a/app/controllers/onebox_controller.rb
+++ b/app/controllers/onebox_controller.rb
@@ -6,10 +6,11 @@ class OneboxController < ApplicationController
   def show
     params.require(:user_id)
 
-    preview = Oneboxer.cached_preview(params[:url])
-    preview.strip! if preview.present?
-
-    return render(plain: preview) if preview.present?
+    unless params[:refresh] == 'true'
+      preview = Oneboxer.cached_preview(params[:url])
+      preview.strip! if preview.present?
+      return render(plain: preview) if preview.present?
+    end
 
     # only 1 outgoing preview per user
     return render(nothing: true, status: 429) if Oneboxer.is_previewing?(params[:user_id])
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5f74ecd57b7..5e18b575203 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -445,7 +445,7 @@ class PostsController < ApplicationController
                                    .where(disagreed_at: nil)
                                    .select(:post_id))
 
-    render_serialized(posts, AdminPostSerializer)
+    render_serialized(posts, AdminUserActionSerializer)
   end
 
   def deleted_posts
@@ -458,7 +458,7 @@ class PostsController < ApplicationController
 
     posts = user_posts(guardian, user.id, offset: offset, limit: limit).where.not(deleted_at: nil)
 
-    render_serialized(posts, AdminPostSerializer)
+    render_serialized(posts, AdminUserActionSerializer)
   end
 
   protected
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index a88f5780939..60d63488aa0 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -22,6 +22,10 @@ class SearchController < ApplicationController
       search_args[:type_filter] = type if type
     end
 
+    search_args[:search_type] = :full_page
+    search_args[:ip_address] = request.remote_ip
+    search_args[:user_id] = current_user.id if current_user.present?
+
     search = Search.new(params[:q], search_args)
     result = search.execute
 
@@ -37,7 +41,6 @@ class SearchController < ApplicationController
         render_json_dump(serializer)
       end
     end
-
   end
 
   def query
@@ -49,17 +52,43 @@ class SearchController < ApplicationController
     search_args[:include_blurbs] = params[:include_blurbs] == "true" if params[:include_blurbs].present?
     search_args[:search_for_id] = true                               if params[:search_for_id].present?
 
-    context,type = lookup_search_context
+    context, type = lookup_search_context
+
     if context
       search_args[:search_context] = context
       search_args[:type_filter] = type if type
     end
 
-    search = Search.new(params[:term], search_args.symbolize_keys)
+    search_args[:search_type] = :header
+    search_args[:ip_address] = request.remote_ip
+    search_args[:user_id] = current_user.id if current_user.present?
+
+    search = Search.new(params[:term], search_args)
     result = search.execute
     render_serialized(result, GroupedSearchResultSerializer, result: result)
   end
 
+  def click
+    params.require(:search_log_id)
+    params.require(:search_result_type)
+    params.require(:search_result_id)
+
+    if params[:search_result_type] == 'topic'
+      where = { id: params[:search_log_id] }
+      if current_user.present?
+        where[:user_id] = current_user.id
+      else
+        where[:ip_address] = request.remote_ip
+      end
+
+      SearchLog.where(where).update_all(
+        clicked_topic_id: params[:search_result_id]
+      )
+    end
+
+    render json: success_json
+  end
+
   protected
 
   def lookup_search_context
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 1c88edee1ed..30c140304ee 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -35,7 +35,7 @@ class StaticController < ApplicationController
     if map.has_key?(@page)
       @topic = Topic.find_by_id(SiteSetting.send(map[@page][:topic_id]))
       raise Discourse::NotFound unless @topic
-      @title = @topic.title
+      @title = "#{@topic.title} - #{SiteSetting.title}"
       @body = @topic.posts.first.cooked
       @faq_overriden = !SiteSetting.faq_url.blank?
       render :show, layout: !request.xhr?, formats: [:html]
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index dea3d5d34c5..8d1328e0f2b 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -21,7 +21,7 @@ class StylesheetsController < ApplicationController
 
     target,digest = params[:name].split(/_([a-f0-9]{40})/)
 
-    if Rails.env == "development"
+    if !Rails.env.production?
       # TODO add theme
       # calling this method ensures we have a cache for said target
       # we hold of re-compilation till someone asks for asset
@@ -90,4 +90,3 @@ class StylesheetsController < ApplicationController
   end
 
 end
-
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index c5930606039..e35ca7391c4 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -484,8 +484,14 @@ class TopicsController < ApplicationController
 
     topic = Topic.find_by(id: params[:topic_id])
 
-    group_ids = Group.lookup_group_ids(params)
-    guardian.ensure_can_invite_to!(topic,group_ids)
+
+    groups = Group.lookup_groups(
+      group_ids: params[:group_ids],
+      group_names: params[:group_names]
+    )
+
+    guardian.ensure_can_invite_to!(topic, groups)
+    group_ids = groups.map(&:id)
 
     begin
       if topic.invite(current_user, username_or_email, group_ids, params[:custom_message])
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index 4ea747cedf9..c19fa695342 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -1,3 +1,4 @@
+require "mini_mime"
 require_dependency 'upload_creator'
 
 class UploadsController < ApplicationController
@@ -12,16 +13,18 @@ class UploadsController < ApplicationController
       return render json: failed_json, status: 422
     end
 
-    url  = params[:url]
-    file = params[:file] || params[:files]&.first
+    url    = params[:url]
+    file   = params[:file] || params[:files]&.first
+    pasted = params[:pasted] == "true"
+    for_private_message = params[:for_private_message] == "true"
 
     if params[:synchronous] && (current_user.staff? || is_api?)
-      data = create_upload(file, url, type)
+      data = create_upload(file, url, type, for_private_message, pasted)
       render json: data.as_json
     else
       Scheduler::Defer.later("Create Upload") do
         begin
-          data = create_upload(file, url, type)
+          data = create_upload(file, url, type, for_private_message, pasted)
         ensure
           MessageBus.publish("/uploads/#{type}", (data || {}).as_json, client_ids: [params[:client_id]])
         end
@@ -41,7 +44,7 @@ class UploadsController < ApplicationController
       if upload = Upload.find_by(sha1: params[:sha]) || Upload.find_by(id: params[:id], url: request.env["PATH_INFO"])
         opts = {
           filename: upload.original_filename,
-          content_type: Rack::Mime.mime_type(File.extname(upload.original_filename)),
+          content_type: MiniMime.lookup_by_filename(upload.original_filename)&.content_type,
         }
         opts[:disposition]   = "inline" if params[:inline]
         opts[:disposition] ||= "attachment" unless FileHelper.is_image?(upload.original_filename)
@@ -58,7 +61,7 @@ class UploadsController < ApplicationController
     raise Discourse::NotFound
   end
 
-  def create_upload(file, url, type)
+  def create_upload(file, url, type, for_private_message, pasted)
     if file.nil?
       if url.present? && is_api?
         maximum_upload_size = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
@@ -77,7 +80,14 @@ class UploadsController < ApplicationController
 
     return { errors: [I18n.t("upload.file_missing")] } if tempfile.nil?
 
-    upload = UploadCreator.new(tempfile, filename, type: type, content_type: content_type).create_for(current_user.id)
+    opts = {
+      type: type,
+      content_type: content_type,
+      for_private_message: for_private_message,
+      pasted: pasted,
+    }
+
+    upload = UploadCreator.new(tempfile, filename, opts).create_for(current_user.id)
 
     if upload.errors.empty? && current_user.admin?
       retain_hours = params[:retain_hours].to_i
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 8809e94d4c0..6b0409e2a49 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -115,6 +115,8 @@ class Users::OmniauthCallbacksController < ApplicationController
     # automatically activate/unstage any account if a provider marked the email valid
     if @auth_result.email_valid && @auth_result.email == user.email
       user.update!(staged: false)
+      # ensure there is an active email token
+      user.email_tokens.create(email: user.email) unless user.email_tokens.active.exists?
       user.activate
     end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b41acf4597d..69ad6520785 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -127,14 +127,13 @@ class UsersController < ApplicationController
     user = fetch_user_from_params
     guardian.ensure_can_edit_username!(user)
 
-    # TODO proper error surfacing (result is a Model#save call)
     result = UsernameChanger.change(user, params[:new_username], current_user)
-    raise Discourse::InvalidParameters.new(:new_username) unless result
 
-    render json: {
-      id: user.id,
-      username: user.username
-    }
+    if result
+      render json: { id: user.id, username: user.username }
+    else
+      render_json_error(user.errors.full_messages.join(','))
+    end
   end
 
   def check_emails
@@ -293,6 +292,7 @@ class UsersController < ApplicationController
   end
 
   def create
+    params.require(:email)
     params.permit(:user_fields)
 
     unless SiteSetting.allow_new_registrations
@@ -303,7 +303,7 @@ class UsersController < ApplicationController
       return fail_with("login.password_too_long")
     end
 
-    if params[:email] && params[:email].length > 254 + 1 + 253
+    if params[:email].length > 254 + 1 + 253
       return fail_with("login.email_too_long")
     end
 
@@ -311,7 +311,7 @@ class UsersController < ApplicationController
       return fail_with("login.reserved_username")
     end
 
-    if user = User.where(staged: true).find_by(email: params[:email].strip.downcase)
+    if user = User.where(staged: true).with_email(params[:email].strip.downcase).first
       user_params.each { |k, v| user.send("#{k}=", v) }
       user.staged = false
     else
@@ -435,7 +435,7 @@ class UsersController < ApplicationController
         else
           store_preloaded("password_reset", MultiJson.dump({ is_developer: UsernameCheckerService.is_developer?(@user.email) }))
         end
-        return redirect_to(wizard_path) if Wizard.user_requires_completion?(@user)
+        return redirect_to(wizard_path) if request.put? && Wizard.user_requires_completion?(@user)
       end
 
       format.json do
@@ -490,7 +490,7 @@ class UsersController < ApplicationController
       RateLimiter.new(nil, "admin-login-hr-#{request.remote_ip}", 6, 1.hour).performed!
       RateLimiter.new(nil, "admin-login-min-#{request.remote_ip}", 3, 1.minute).performed!
 
-      user = User.where(email: params[:email], admin: true).human_users.first
+      user = User.with_email(params[:email]).where(admin: true).human_users.first
       if user
         email_token = user.email_tokens.create(email: user.email)
         Jobs.enqueue(:critical_user_email, type: :admin_login, user_id: user.id, email_token: email_token.token)
@@ -606,6 +606,7 @@ class UsersController < ApplicationController
 
     User.transaction do
       @user.email = params[:email]
+      
       if @user.save
         @user.email_tokens.create(email: @user.email)
         enqueue_activation_email
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 404ed92bf42..944ab7f8ef2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -23,6 +23,9 @@ module ApplicationHelper
     if current_user.present?
       result[:userId] = current_user.id
     end
+    if SiteSetting.ga_universal_auto_link_domains.present?
+      result[:allowLinker] = true
+    end
     result.to_json.html_safe
   end
 
@@ -72,9 +75,17 @@ module ApplicationHelper
   end
 
   def body_classes
+    result = []
+
     if @category && @category.url.present?
-      "category-#{@category.url.sub(/^\/c\//, '').gsub(/\//, '-')}"
+      result << "category-#{@category.url.sub(/^\/c\//, '').gsub(/\//, '-')}"
     end
+
+    if current_user.present? && primary_group_name = current_user.primary_group&.name
+      result << "primary-group-#{primary_group_name.downcase}"
+    end
+
+    result.join(' ')
   end
 
   def rtl_class
@@ -219,9 +230,7 @@ module ApplicationHelper
   end
 
   def gsub_emoji_to_unicode(str)
-    if str
-      str.gsub(/:([\w\-+]*):/) { |name| Emoji.lookup_unicode($1) || name }
-    end
+    Emoji.gsub_emoji_to_unicode(str)
   end
 
   def application_logo_url
diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb
index ad96e94177e..c3f0cb96459 100644
--- a/app/helpers/topics_helper.rb
+++ b/app/helpers/topics_helper.rb
@@ -2,7 +2,7 @@ module TopicsHelper
   include ApplicationHelper
 
   def render_topic_title(topic)
-    link_to(gsub_emoji_to_unicode(topic.title),topic.relative_url)
+    link_to(Emoji.gsub_emoji_to_unicode(topic.title),topic.relative_url)
   end
 
   def categories_breadcrumb(topic)
diff --git a/app/jobs/regular/automatic_group_membership.rb b/app/jobs/regular/automatic_group_membership.rb
index dbe679889b0..b2f12d15022 100644
--- a/app/jobs/regular/automatic_group_membership.rb
+++ b/app/jobs/regular/automatic_group_membership.rb
@@ -13,14 +13,15 @@ module Jobs
 
       domains = group.automatic_membership_email_domains.gsub('.', '\.')
 
-      User.where("email ~* '@(#{domains})$'")
+      User.joins(:user_emails)
+          .where("user_emails.email ~* '@(#{domains})$'")
           .where("users.id NOT IN (SELECT user_id FROM group_users WHERE group_users.group_id = ?)", group_id)
           .activated
           .where(staged: false)
           .find_each do |user|
-
-          group.add(user)
-          GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(user)
+        next unless user.email_confirmed?
+        group.add(user)
+        GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(user)
       end
 
       Group.reset_counters(group.id, :group_users)
diff --git a/app/jobs/regular/crawl_topic_link.rb b/app/jobs/regular/crawl_topic_link.rb
index 05321081815..b5077aff854 100644
--- a/app/jobs/regular/crawl_topic_link.rb
+++ b/app/jobs/regular/crawl_topic_link.rb
@@ -1,50 +1,11 @@
 require 'open-uri'
 require 'nokogiri'
 require 'excon'
-require 'final_destination'
+require_dependency 'retrieve_title'
 
 module Jobs
   class CrawlTopicLink < Jobs::Base
 
-    class ReadEnough < StandardError; end
-
-    def self.max_chunk_size(uri)
-      # Amazon leaves the title until very late. Normally it's a bad idea to make an exception for
-      # one host but amazon is a big one.
-      return 80 if uri.host =~ /amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)$/
-
-      # Default is 10k
-      10
-    end
-
-    # Fetch the beginning of a HTML document at a url
-    def self.fetch_beginning(url)
-      # Never crawl in test mode
-      return if Rails.env.test?
-
-      fd = FinalDestination.new(url)
-      uri = fd.resolve
-      return "" unless uri
-
-      result = ""
-      streamer = lambda do |chunk, _, _|
-        result << chunk
-
-        # Using exceptions for flow control is really bad, but there really seems to
-        # be no sane way to get a stream to stop reading in Excon (or Net::HTTP for
-        # that matter!)
-        raise ReadEnough.new if result.size > (CrawlTopicLink.max_chunk_size(uri) * 1024)
-      end
-      Excon.get(uri.to_s, response_block: streamer, read_timeout: 20, headers: fd.request_headers)
-      result
-
-    rescue Excon::Errors::SocketError => ex
-      return result if ex.socket_error.is_a?(ReadEnough)
-      raise
-    rescue ReadEnough
-      result
-    end
-
     def execute(args)
       raise Discourse::InvalidParameters.new(:topic_link_id) unless args[:topic_link_id].present?
 
@@ -64,7 +25,7 @@ module Jobs
 
         # Special case: Images
         # If the link is to an image, put the filename as the title
-        if topic_link.url =~ /\.(jpg|gif|png)$/
+        if FileHelper.is_image?(topic_link.url)
           uri = URI(topic_link.url)
           filename = File.basename(uri.path)
           crawled = (TopicLink.where(id: topic_link.id).update_all(["title = ?, crawled_at = CURRENT_TIMESTAMP", filename]) == 1)
@@ -72,18 +33,9 @@ module Jobs
 
         unless crawled
           # Fetch the beginning of the document to find the title
-          result = CrawlTopicLink.fetch_beginning(topic_link.url)
-          doc = Nokogiri::HTML(result)
-          if doc
-            title = doc.at('title').try(:inner_text)
-            if title.present?
-              title.gsub!(/\n/, ' ')
-              title.gsub!(/ +/, ' ')
-              title.strip!
-              if title.present?
-                crawled = (TopicLink.where(id: topic_link.id).update_all(['title = ?, crawled_at = CURRENT_TIMESTAMP', title[0..254]]) == 1)
-              end
-            end
+          title = RetrieveTitle.crawl(topic_link.url)
+          if title.present?
+            crawled = (TopicLink.where(id: topic_link.id).update_all(['title = ?, crawled_at = CURRENT_TIMESTAMP', title[0..254]]) == 1)
           end
         end
       rescue Exception
diff --git a/app/jobs/regular/create_avatar_thumbnails.rb b/app/jobs/regular/create_avatar_thumbnails.rb
index 651dd2b0f2c..046f50bfe1c 100644
--- a/app/jobs/regular/create_avatar_thumbnails.rb
+++ b/app/jobs/regular/create_avatar_thumbnails.rb
@@ -3,6 +3,7 @@ module Jobs
   class CreateAvatarThumbnails < Jobs::Base
 
     def execute(args)
+      return if Rails.env.test?
       upload_id = args[:upload_id]
 
       raise Discourse::InvalidParameters.new(:upload_id) if upload_id.blank?
diff --git a/app/jobs/regular/invite_email.rb b/app/jobs/regular/invite_email.rb
index cd8ecb91af0..f373134a2bd 100644
--- a/app/jobs/regular/invite_email.rb
+++ b/app/jobs/regular/invite_email.rb
@@ -9,7 +9,7 @@ module Jobs
       raise Discourse::InvalidParameters.new(:invite_id) unless args[:invite_id].present?
 
       invite = Invite.find_by(id: args[:invite_id])
-      message = InviteMailer.send_invite(invite, args[:custom_message])
+      message = InviteMailer.send_invite(invite)
       Email::Sender.new(message, :invite).send
     end
 
diff --git a/app/jobs/regular/notify_mailing_list_subscribers.rb b/app/jobs/regular/notify_mailing_list_subscribers.rb
index 393b324dc12..41773141824 100644
--- a/app/jobs/regular/notify_mailing_list_subscribers.rb
+++ b/app/jobs/regular/notify_mailing_list_subscribers.rb
@@ -32,6 +32,7 @@ module Jobs
                      WHERE cu.category_id = ? AND cu.user_id = users.id AND cu.notification_level = ?
                   )', post.topic.category_id, CategoryUser.notification_levels[:muted])
 
+      DiscourseEvent.trigger(:notify_mailing_list_subscribers, users, post)
       users.find_each do |user|
         if Guardian.new(user).can_see?(post)
           if EmailLog.reached_max_emails?(user)
diff --git a/app/jobs/regular/post_alert.rb b/app/jobs/regular/post_alert.rb
index 30cef2534b1..cc93aad2855 100644
--- a/app/jobs/regular/post_alert.rb
+++ b/app/jobs/regular/post_alert.rb
@@ -4,9 +4,8 @@ module Jobs
     def execute(args)
       # maybe it was removed by the time we are making the post
       post = Post.where(id: args[:post_id]).first
-      PostAlerter.post_created(post) if post && post.topic
+      PostAlerter.post_created(post, args[:options] || {}) if post && post.topic
     end
 
   end
 end
-
diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index c14dae92fec..c38d9a55e24 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -28,7 +28,7 @@ module Jobs
 
       extract_images_from(post.cooked).each do |image|
         src = original_src = image['src']
-        src = "http:" + src if src.start_with?("//")
+        src = "http:#{src}" if src.start_with?("//")
 
         if is_valid_image_url(src)
           hotlinked = nil
@@ -47,13 +47,18 @@ module Jobs
               if hotlinked
                 if File.size(hotlinked.path) <= @max_size
                   filename = File.basename(URI.parse(src).path)
+                  filename << File.extname(hotlinked.path) unless filename["."]
                   upload = UploadCreator.new(hotlinked, filename, origin: src).create_for(post.user_id)
-                  downloaded_urls[src] = upload.url
+                  if upload.persisted?
+                    downloaded_urls[src] = upload.url
+                  else
+                    log(:info, "Failed to pull hotlinked image for post: #{post_id}: #{src} - #{upload.errors.join("\n")}")
+                  end
                 else
-                  Rails.logger.info("Failed to pull hotlinked image for post: #{post_id}: #{src} - Image is bigger than #{@max_size}")
+                  log(:info, "Failed to pull hotlinked image for post: #{post_id}: #{src} - Image is bigger than #{@max_size}")
                 end
               else
-                Rails.logger.error("There was an error while downloading '#{src}' locally for post: #{post_id}")
+                log(:info, "There was an error while downloading '#{src}' locally for post: #{post_id}")
               end
             end
             # have we successfully downloaded that file?
@@ -79,10 +84,7 @@ module Jobs
               raw.gsub!(/^#{escaped_src}(\s?)$/) { "<img src='#{url}'>#{$1}" }
             end
           rescue => e
-            Rails.logger.info("Failed to pull hotlinked image: #{src} post:#{post_id}\n" + e.message + "\n" + e.backtrace.join("\n"))
-          ensure
-            # close & delete the temp file
-            hotlinked && hotlinked.close!
+            log(:info, "Failed to pull hotlinked image: #{src} post:#{post_id}\n" + e.message + "\n" + e.backtrace.join("\n"))
           end
         end
 
@@ -94,12 +96,14 @@ module Jobs
         # we never want that job to bump the topic
         options = { bypass_bump: true }
         post.revise(Discourse.system_user, changes, options)
+      elsif downloaded_urls.present?
+        post.trigger_post_process(true)
       end
     end
 
     def extract_images_from(html)
       doc = Nokogiri::HTML::fragment(html)
-      doc.css("img[src]") - doc.css(".onebox-result img") - doc.css("img.avatar")
+      doc.css("img[src]") - doc.css("img.avatar")
     end
 
     def is_valid_image_url(src)
@@ -109,21 +113,33 @@ module Jobs
       return false if Discourse.store.has_been_uploaded?(src)
       # we don't want to pull relative images
       return false if src =~ /\A\/[^\/]/i
+
       # parse the src
       begin
         uri = URI.parse(src)
       rescue URI::InvalidURIError
         return false
       end
+
+      hostname = uri.hostname
+      return false unless hostname
+
       # we don't want to pull images hosted on the CDN (if we use one)
-      return false if Discourse.asset_host.present? && URI.parse(Discourse.asset_host).hostname == uri.hostname
-      return false if SiteSetting.s3_cdn_url.present? && URI.parse(SiteSetting.s3_cdn_url).hostname == uri.hostname
+      return false if Discourse.asset_host.present? && URI.parse(Discourse.asset_host).hostname == hostname
+      return false if SiteSetting.s3_cdn_url.present? && URI.parse(SiteSetting.s3_cdn_url).hostname == hostname
       # we don't want to pull images hosted on the main domain
-      return false if URI.parse(Discourse.base_url_no_prefix).hostname == uri.hostname
+      return false if URI.parse(Discourse.base_url_no_prefix).hostname == hostname
       # check the domains blacklist
       SiteSetting.should_download_images?(src)
     end
 
+    def log(log_level, message)
+      Rails.logger.public_send(
+        log_level,
+        "#{RailsMultisite::ConnectionManagement.current_db}: #{message}"
+      )
+    end
+
   end
 
 end
diff --git a/app/jobs/regular/push_notification.rb b/app/jobs/regular/push_notification.rb
index 651a7486bbe..e07e5d59208 100644
--- a/app/jobs/regular/push_notification.rb
+++ b/app/jobs/regular/push_notification.rb
@@ -20,8 +20,15 @@ module Jobs
           })
         end
 
-        RestClient.send :post, push_url, payload.merge({notifications: notifications}).to_json, content_type: :json, accept: :json
+        result = Excon.post(push_url,
+          body: payload.merge(notifications: notifications).to_json,
+          headers: { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }
+        )
 
+        if result.status != 200
+          # we failed to push a notification ... log it
+          Rails.logger.warn("Failed to push a notification to #{push_url} Status: #{result.status}: #{result.status_line}")
+        end
       end
 
     end
diff --git a/app/jobs/scheduled/clean_up_search_logs.rb b/app/jobs/scheduled/clean_up_search_logs.rb
new file mode 100644
index 00000000000..bd3bc2e04af
--- /dev/null
+++ b/app/jobs/scheduled/clean_up_search_logs.rb
@@ -0,0 +1,9 @@
+module Jobs
+  class CleanUpSearchLogs < Jobs::Scheduled
+    every 1.week
+
+    def execute(args)
+      SearchLog.clean_up
+    end
+  end
+end
diff --git a/app/jobs/scheduled/clean_up_uploads.rb b/app/jobs/scheduled/clean_up_uploads.rb
index 87e4acad282..8e1aeb28df6 100644
--- a/app/jobs/scheduled/clean_up_uploads.rb
+++ b/app/jobs/scheduled/clean_up_uploads.rb
@@ -5,13 +5,25 @@ module Jobs
     def execute(args)
       return unless SiteSetting.clean_up_uploads?
 
+      base_url = Discourse.store.internal? ? Discourse.store.relative_base_url : Discourse.store.absolute_base_url
+      s3_hostname = URI.parse(base_url).hostname
+      s3_cdn_hostname = URI.parse(SiteSetting.s3_cdn_url || "").hostname
+
       # Any URLs in site settings are fair game
       ignore_urls = [
         SiteSetting.logo_url,
         SiteSetting.logo_small_url,
         SiteSetting.favicon_url,
-        SiteSetting.apple_touch_icon_url
-      ]
+        SiteSetting.apple_touch_icon_url,
+      ].map do |url|
+        if url.present?
+          url = url.dup
+          url.gsub!(s3_cdn_hostname, s3_hostname) if s3_cdn_hostname.present?
+          url[base_url] && url[url.index(base_url)..-1]
+        else
+          nil
+        end
+      end.compact.uniq
 
       grace_period = [SiteSetting.clean_orphan_uploads_grace_period_hours, 1].max
 
@@ -30,7 +42,8 @@ module Jobs
         .where("up.profile_background IS NULL AND up.card_background IS NULL")
         .where("c.uploaded_logo_id IS NULL AND c.uploaded_background_id IS NULL")
         .where("ce.upload_id IS NULL AND tf.upload_id IS NULL")
-        .where("uploads.url NOT IN (?)", ignore_urls)
+
+      result = result.where("uploads.url NOT IN (?)", ignore_urls) if ignore_urls.present?
 
       result.find_each do |upload|
         next if QueuedPost.where("raw LIKE '%#{upload.sha1}%'").exists?
diff --git a/app/jobs/scheduled/grant_anniversary_badges.rb b/app/jobs/scheduled/grant_anniversary_badges.rb
index e5e3287cb03..04a38a90639 100644
--- a/app/jobs/scheduled/grant_anniversary_badges.rb
+++ b/app/jobs/scheduled/grant_anniversary_badges.rb
@@ -4,6 +4,8 @@ module Jobs
 
     def execute(args)
       return unless SiteSetting.enable_badges?
+      badge = Badge.find_by(id: Badge::Anniversary, enabled: true)
+      return unless badge
 
       start_date = args[:start_date] || 1.year.ago
       end_date = start_date + 1.year
@@ -31,14 +33,12 @@ module Jobs
         HAVING COUNT(p.id) > 0 AND COUNT(ub.id) = 0
       SQL
 
-      badge = Badge.find(Badge::Anniversary)
-      user_ids = results.map {|r| r['user_id'].to_i }
+      user_ids = results.map { |r| r['user_id'].to_i }
 
-      User.where(id: user_ids).each do |user|
+      User.where(id: user_ids).find_each do |user|
         BadgeGranter.grant(badge, user, created_at: end_date)
       end
     end
 
   end
 end
-
diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb
index 36141237162..35798bdfc16 100644
--- a/app/mailers/invite_mailer.rb
+++ b/app/mailers/invite_mailer.rb
@@ -8,7 +8,7 @@ class InviteMailer < ActionMailer::Base
     include EmailHelper
   end
 
-  def send_invite(invite, custom_message=nil)
+  def send_invite(invite)
     # Find the first topic they were invited to
     first_topic = invite.topics.order(:created_at).first
 
@@ -27,7 +27,7 @@ class InviteMailer < ActionMailer::Base
       end
 
       template = 'invite_mailer'
-      if custom_message.present?
+      if invite.custom_message.present?
         template = 'custom_invite_mailer'
       end
 
@@ -46,10 +46,10 @@ class InviteMailer < ActionMailer::Base
                   topic_excerpt: topic_excerpt,
                   site_description: SiteSetting.site_description,
                   site_title: SiteSetting.title,
-                  user_custom_message: custom_message)
+                  user_custom_message: invite.custom_message)
     else
       template = 'invite_forum_mailer'
-      if custom_message.present?
+      if invite.custom_message.present?
         template = 'custom_invite_forum_mailer'
       end
 
@@ -60,7 +60,7 @@ class InviteMailer < ActionMailer::Base
                   invite_link: "#{Discourse.base_url}/invites/#{invite.invite_key}",
                   site_description: SiteSetting.site_description,
                   site_title: SiteSetting.title,
-                  user_custom_message: custom_message)
+                  user_custom_message: invite.custom_message)
     end
   end
 
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 44d1cc7bd24..c209a940d16 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -1,6 +1,7 @@
 require_dependency 'markdown_linker'
 require_dependency 'email/message_builder'
 require_dependency 'age_words'
+require_dependency 'rtl'
 
 class UserNotifications < ActionMailer::Base
   include UserNotificationsHelper
@@ -310,7 +311,7 @@ class UserNotifications < ActionMailer::Base
     allow_reply_by_email = opts[:allow_reply_by_email] unless user.suspended?
     original_username = notification_data[:original_username] || notification_data[:display_username]
 
-    send_notification_email(
+    email_options = {
       title: notification_data[:topic_title],
       post: post,
       username: original_username,
@@ -322,7 +323,13 @@ class UserNotifications < ActionMailer::Base
       notification_type: notification_type,
       use_invite_template: opts[:use_invite_template],
       user: user
-    )
+    }
+
+    if group_id = notification_data[:group_id]
+      email_options[:group_name] = Group.find_by(id: group_id)&.name
+    end
+
+    send_notification_email(email_options)
   end
 
   def send_notification_email(opts)
@@ -336,12 +343,18 @@ class UserNotifications < ActionMailer::Base
     from_alias = opts[:from_alias]
     notification_type = opts[:notification_type]
     user = opts[:user]
+    group_name = opts[:group_name]
     locale = user_locale(user)
 
     template = "user_notifications.user_#{notification_type}"
     if post.topic.private_message?
       template << "_pm"
-      template << "_staged" if user.staged?
+
+      if group_name
+        template << "_group"
+      elsif user.staged
+        template << "_staged"
+      end
     end
 
     # category name
@@ -375,24 +388,40 @@ class UserNotifications < ActionMailer::Base
       end
     end
 
-    translation_override_exists = TranslationOverride.where(locale: SiteSetting.default_locale, translation_key: "#{template}.text_body_template").exists?
+    translation_override_exists = TranslationOverride.where(
+      locale: SiteSetting.default_locale,
+      translation_key: "#{template}.text_body_template"
+    ).exists?
 
     if opts[:use_invite_template]
-      if post.topic.private_message?
-        invite_template = "user_notifications.invited_to_private_message_body"
-      else
-        invite_template = "user_notifications.invited_to_topic_body"
-      end
+      invite_template = "user_notifications.invited"
+      invite_template << "_group" if group_name
+
+      invite_template <<
+        if post.topic.private_message?
+          "_to_private_message_body"
+        else
+          "_to_topic_body"
+        end
+
       topic_excerpt = post.excerpt.tr("\n", " ") if post.is_first_post? && post.excerpt
       topic_excerpt = "" if SiteSetting.private_email?
-      message = I18n.t(invite_template, username: username, topic_title: gsub_emoji_to_unicode(title), topic_excerpt: topic_excerpt, site_title: SiteSetting.title, site_description: SiteSetting.site_description)
+
+      message = I18n.t(invite_template,
+        username: username,
+        group_name: group_name,
+        topic_title: gsub_emoji_to_unicode(title),
+        topic_excerpt: topic_excerpt,
+        site_title: SiteSetting.title,
+        site_description: SiteSetting.site_description
+      )
 
       unless translation_override_exists
         html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render(
           template: 'email/invite',
           format: :html,
           locals: { message: PrettyText.cook(message, sanitize: false).html_safe,
-                    classes: RTL.new(user).css_class
+                    classes: Rtl.new(user).css_class
           }
         )
       end
@@ -418,14 +447,14 @@ class UserNotifications < ActionMailer::Base
                     reached_limit: reached_limit,
                     post: post,
                     in_reply_to_post: in_reply_to_post,
-                    classes: RTL.new(user).css_class
+                    classes: Rtl.new(user).css_class
           }
         )
       end
     end
 
     email_opts = {
-      topic_title: gsub_emoji_to_unicode(title),
+      topic_title: Emoji.gsub_emoji_to_unicode(title),
       topic_title_url_encoded: title ? URI.encode(title) : title,
       message: message,
       url: post.url(without_slug: SiteSetting.private_email?),
@@ -433,6 +462,7 @@ class UserNotifications < ActionMailer::Base
       topic_id: post.topic_id,
       context: context,
       username: username,
+      group_name: group_name,
       add_unsubscribe_link: !user.staged,
       mailing_list_mode: user.user_option.mailing_list_mode,
       unsubscribe_url: post.unsubscribe_url(user),
diff --git a/app/models/api_key.rb b/app/models/api_key.rb
index 9145ce4372e..a617902d41f 100644
--- a/app/models/api_key.rb
+++ b/app/models/api_key.rb
@@ -2,6 +2,7 @@ class ApiKey < ActiveRecord::Base
   belongs_to :user
   belongs_to :created_by, class_name: User
 
+  validates :user_id, uniqueness: true
   validates_presence_of :key
 
   def regenerate!(updated_by)
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 93c879b5dff..267ef981410 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -68,6 +68,7 @@ class DiscourseSingleSignOn < SingleSignOn
       user.active = true
       user.save!
       user.enqueue_welcome_message('welcome_user') unless suppress_welcome_message
+      user.set_automatic_groups
     end
 
     custom_fields.each do |k,v|
diff --git a/app/models/email_token.rb b/app/models/email_token.rb
index 820ea078f9b..cff339a08eb 100644
--- a/app/models/email_token.rb
+++ b/app/models/email_token.rb
@@ -64,14 +64,14 @@ class EmailToken < ActiveRecord::Base
       if result[:success]
         # If we are activating the user, send the welcome message
         user.send_welcome_message = !user.active?
-
         user.active = true
         user.email = result[:email_token].email
         user.save!
+        user.set_automatic_groups
       end
 
       if user
-        return User.find_by(email: Email.downcase(user.email)) if Invite.redeem_from_email(user.email).present?
+        return User.find_by_email(user.email) if Invite.redeem_from_email(user.email).present?
         user
       end
     end
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index ab61a60257a..513ad8478ff 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -1,6 +1,8 @@
 class Emoji
   # update this to clear the cache
-  EMOJI_VERSION = "v3"
+  EMOJI_VERSION = "5"
+
+  FITZPATRICK_SCALE ||= [ "1f3fb", "1f3fc", "1f3fd", "1f3fe", "1f3ff" ]
 
   include ActiveModel::SerializerSupport
 
@@ -23,13 +25,17 @@ class Emoji
   end
 
   def self.aliases
-    Discourse.cache.fetch(cache_key("aliases_emojis")) { load_aliases }
+    Discourse.cache.fetch(cache_key("aliases_emojis")) { db['aliases'] }
   end
 
   def self.custom
     Discourse.cache.fetch(cache_key("custom_emojis")) { load_custom }
   end
 
+  def self.tonable_emojis
+    Discourse.cache.fetch(cache_key("tonable_emojis")) { db['tonableEmojis'] }
+  end
+
   def self.exists?(name)
     Emoji[name].present?
   end
@@ -40,15 +46,19 @@ class Emoji
 
   def self.create_from_db_item(emoji)
     name = emoji["name"]
-    filename = "#{emoji['filename'] || name}.png"
+    filename = emoji['filename'] || name
     Emoji.new.tap do |e|
       e.name = name
-      e.url = "#{Discourse.base_uri}/images/emoji/#{SiteSetting.emoji_set}/#{filename}"
+      e.url = Emoji.url_for(filename)
     end
   end
 
+  def self.url_for(name)
+    "#{Discourse.base_uri}/images/emoji/#{SiteSetting.emoji_set}/#{name}.png?v=#{EMOJI_VERSION}"
+  end
+
   def self.cache_key(name)
-    "#{name}:#{EMOJI_VERSION}:#{Plugin::CustomEmoji.cache_key}"
+    "#{name}:v#{EMOJI_VERSION}:#{Plugin::CustomEmoji.cache_key}"
   end
 
   def self.clear_cache
@@ -56,6 +66,7 @@ class Emoji
     Discourse.cache.delete(cache_key("standard_emojis"))
     Discourse.cache.delete(cache_key("aliases_emojis"))
     Discourse.cache.delete(cache_key("all_emojis"))
+    Discourse.cache.delete(cache_key("tonable_emojis"))
   end
 
   def self.db_file
@@ -63,32 +74,13 @@ class Emoji
   end
 
   def self.db
-    return @db if @db
-    @db = File.open(db_file, "r:UTF-8") { |f| JSON.parse(f.read) }
-
-    # Small tweak to `emoji.json` from Emoji one
-    @db['emojis'] << {"code" => "1f44d", "name" => "+1", "filename" => "thumbsup"}
-    @db['emojis'] << {"code" => "1f44e", "name" => "-1", "filename" => "thumbsdown"}
-
-    @db
+    @db ||= File.open(db_file, "r:UTF-8") { |f| JSON.parse(f.read) }
   end
 
   def self.load_standard
     db['emojis'].map {|e| Emoji.create_from_db_item(e) }
   end
 
-  def self.load_aliases
-    return @aliases if @aliases
-
-    @aliases ||= db['aliases']
-
-    # Fix how `slightly_smiling` was mislabeled
-    @aliases['slight_smile'] ||= []
-    @aliases['slight_smile'] << 'slightly_smiling'
-
-    @aliases
-  end
-
   def self.load_custom
     result = []
 
@@ -120,21 +112,32 @@ class Emoji
   end
 
   def self.replacement_code(code)
-    hexes = code.split('-').map(&:hex)
-
+    hexes = code.split('-'.freeze).map!(&:hex)
     # Don't replace digits, letters and some symbols
-    return hexes.pack("U" * hexes.size) if hexes[0] > 255
+    hexes.pack("U*".freeze) if hexes[0] > 255
   end
 
   def self.unicode_replacements
     return @unicode_replacements if @unicode_replacements
 
-
     @unicode_replacements = {}
+    is_tonable_emojis = Emoji.tonable_emojis
+    fitzpatrick_scales = FITZPATRICK_SCALE.map { |scale| scale.to_i(16) }
+
     db['emojis'].each do |e|
-      next if e['name'] == 'tm'
+      name = e['name']
+      next if name == 'tm'.freeze
+
       code = replacement_code(e['code'])
-      @unicode_replacements[code] = e['name'] if code
+      next unless code
+
+      @unicode_replacements[code] = name
+      if is_tonable_emojis.include?(name)
+        fitzpatrick_scales.each_with_index do |scale, index|
+          toned_code = code.codepoints.insert(1, scale).pack("U*".freeze)
+          @unicode_replacements[toned_code] = "#{name}:t#{index+2}"
+        end
+      end
     end
 
     @unicode_replacements["\u{2639}"] = 'frowning'
@@ -156,14 +159,39 @@ class Emoji
     end.join
   end
 
+  def self.gsub_emoji_to_unicode(str)
+    if str
+      str.gsub(/:([\w\-+]*(?::t\d)?):/) { |name| Emoji.lookup_unicode($1) || name }
+    end
+  end
+
   def self.lookup_unicode(name)
     @reverse_map ||= begin
       map = {}
+      is_tonable_emojis = Emoji.tonable_emojis
+
       db['emojis'].each do |e|
         next if e['name'] == 'tm'
+
         code = replacement_code(e['code'])
-        map[e['name']] = code if code
+        next unless code
+
+        map[e['name']] = code
+        if is_tonable_emojis.include?(e['name'])
+          FITZPATRICK_SCALE.each_with_index do |scale, index|
+            toned_code = (code.codepoints.insert(1, scale.to_i(16))).pack("U*")
+            map["#{e['name']}:t#{index+2}"] = toned_code
+          end
+        end
       end
+
+      Emoji.aliases.each do |key, alias_names|
+        next unless alias_code = map[key]
+        alias_names.each do |alias_name|
+          map[alias_name] = alias_code
+        end
+      end
+
       map
     end
     @reverse_map[name]
diff --git a/app/models/emoji_set_site_setting.rb b/app/models/emoji_set_site_setting.rb
index b930860ad20..759b64e9b62 100644
--- a/app/models/emoji_set_site_setting.rb
+++ b/app/models/emoji_set_site_setting.rb
@@ -31,7 +31,9 @@ class EmojiSetSiteSetting < EnumSiteSetting
       { name: 'emoji_set.google', value: 'google' },
       { name: 'emoji_set.twitter', value: 'twitter' },
       { name: 'emoji_set.emoji_one', value: 'emoji_one' },
-      { name: 'emoji_set.win10', value: 'win10' }
+      { name: 'emoji_set.win10', value: 'win10' },
+      { name: 'emoji_set.google_classic', value: 'google_classic' },
+      { name: 'emoji_set.facebook_messenger', value: 'facebook_messenger' },
     ]
   end
 
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 8ecfd750041..2ee90b7bc1f 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -6,12 +6,12 @@ class GlobalSetting
     end
   end
 
-  VALID_SECRET_KEY = /^[0-9a-f]{128}$/
+  VALID_SECRET_KEY ||= /^[0-9a-f]{128}$/
   # this is named SECRET_TOKEN as opposed to SECRET_KEY_BASE
   # for legacy reasons
-  REDIS_SECRET_KEY = 'SECRET_TOKEN'
+  REDIS_SECRET_KEY ||= 'SECRET_TOKEN'
 
-  REDIS_VALIDATE_SECONDS = 30
+  REDIS_VALIDATE_SECONDS ||= 30
 
   # In Rails secret_key_base is used to encrypt the cookie store
   # the cookie store contains session data
diff --git a/app/models/group.rb b/app/models/group.rb
index ecfab9ec29b..5ca913f876e 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require_dependency 'enum'
+
 class Group < ActiveRecord::Base
   include HasCustomFields
   include AnonCacheInvalidator
@@ -62,17 +66,56 @@ class Group < ActiveRecord::Base
     :everyone => 99
   }
 
+  def self.visibility_levels
+    @visibility_levels = Enum.new(
+      public: 0,
+      members: 1,
+      staff: 2,
+      owners: 3
+    )
+  end
+
   validates :alias_level, inclusion: { in: ALIAS_LEVELS.values}
 
   scope :visible_groups, ->(user) {
     groups = Group.order(name: :asc).where("groups.id > 0")
 
-    if !user || !user.admin
-      owner_group_ids = GroupUser.where(user: user, owner: true).pluck(:group_id)
+    unless user&.admin
+      sql =  <<~SQL
+        groups.id IN (
+          SELECT g.id FROM groups g WHERE g.visibility_level = :public
+
+          UNION ALL
+
+          SELECT g.id FROM groups g
+          JOIN group_users gu ON gu.group_id = g.id AND
+                                 gu.user_id = :user_id
+          WHERE g.visibility_level = :members
+
+          UNION ALL
+
+          SELECT g.id FROM groups g
+          LEFT JOIN group_users gu ON gu.group_id = g.id AND
+                                 gu.user_id = :user_id AND
+                                 gu.owner
+          WHERE g.visibility_level = :staff AND (gu.id IS NOT NULL OR :is_staff)
+
+          UNION ALL
+
+          SELECT g.id FROM groups g
+          JOIN group_users gu ON gu.group_id = g.id AND
+                                 gu.user_id = :user_id AND
+                                 gu.owner
+          WHERE g.visibility_level = :owners
+
+        )
+      SQL
+
+      groups = groups.where(
+        sql,
+        Group.visibility_levels.to_h.merge(user_id: user&.id, is_staff: !!user&.staff?)
+      )
 
-      groups = groups.where("
-        (groups.automatic = false AND groups.visible = true) OR groups.id IN (?)
-      ", owner_group_ids)
     end
 
     groups
@@ -181,17 +224,14 @@ class Group < ActiveRecord::Base
     localized_name = I18n.t("groups.default_names.#{name}").downcase
     validator = UsernameValidator.new(localized_name)
 
-    group.name =
-      if !Group.where("LOWER(name) = ?", localized_name).exists? && validator.valid_format?
-        localized_name
-      else
-        name
-      end
+    if !Group.where("LOWER(name) = ?", localized_name).exists? && validator.valid_format?
+      group.name = localized_name
+    end
 
     # the everyone group is special, it can include non-users so there is no
     # way to have the membership in a table
     if name == :everyone
-      group.visible = false
+      group.visibility_level = Group.visibility_levels[:owners]
       group.save!
       return group
     end
@@ -282,7 +322,9 @@ class Group < ActiveRecord::Base
   end
 
   def self.search_group(name)
-    Group.where(visible: true).where("name ILIKE :term_like", term_like: "#{name}%")
+    Group.where(visibility_level: visibility_levels[:public]).where(
+      "name ILIKE :term_like OR full_name ILIKE :term_like", term_like: "#{name}%"
+    )
   end
 
   def self.lookup_group(name)
@@ -296,22 +338,19 @@ class Group < ActiveRecord::Base
     end
   end
 
-  def self.lookup_group_ids(opts)
-    if group_ids = opts[:group_ids]
-      group_ids = group_ids.split(",").map(&:to_i)
-      group_ids = Group.where(id: group_ids).pluck(:id)
+  def self.lookup_groups(group_ids: [], group_names: [])
+    if group_ids.present?
+      group_ids = group_ids.split(",")
+      group_ids.map!(&:to_i)
+      groups = Group.where(id: group_ids) if group_ids.present?
     end
 
-    group_ids ||= []
-
-    if group_names = opts[:group_names]
+    if group_names.present?
       group_names = group_names.split(",")
-      if group_names.present?
-        group_ids += Group.where(name: group_names).pluck(:id)
-      end
+      groups = (groups || Group).where(name: group_names) if group_names.present?
     end
 
-    group_ids
+    groups || []
   end
 
   def self.desired_trust_level_groups(trust_level)
@@ -399,24 +438,37 @@ class Group < ActiveRecord::Base
 
   def bulk_add(user_ids)
     if user_ids.present?
-      Group.exec_sql("INSERT INTO group_users
-                                  (group_id, user_id, created_at, updated_at)
-                     SELECT #{self.id},
-                            u.id,
-                            CURRENT_TIMESTAMP,
-                            CURRENT_TIMESTAMP
-                     FROM users AS u
-                     WHERE u.id IN (#{user_ids.join(', ')})
-                       AND NOT EXISTS(SELECT 1 FROM group_users AS gu
-                                      WHERE gu.user_id = u.id AND
-                                            gu.group_id = #{self.id})")
+      sql = <<~SQL
+      INSERT INTO group_users
+        (group_id, user_id, created_at, updated_at)
+      SELECT
+        #{self.id},
+        u.id,
+        CURRENT_TIMESTAMP,
+        CURRENT_TIMESTAMP
+      FROM users AS u
+      WHERE u.id IN (:user_ids)
+      AND NOT EXISTS (
+        SELECT 1 FROM group_users AS gu
+        WHERE gu.user_id = u.id AND
+        gu.group_id = :group_id
+      )
+      SQL
+
+      Group.exec_sql(sql, group_id: self.id, user_ids: user_ids)
+
+      new_attributes = {}
 
       if self.primary_group?
-        User.where(id: user_ids).update_all(primary_group_id: self.id)
+        new_attributes[:primary_group_id] = self.id
       end
 
       if self.title.present?
-        User.where(id: user_ids).update_all(title: self.title)
+        new_attributes[:title] = self.title
+      end
+
+      if new_attributes.present?
+        User.where(id: user_ids).update_all(new_attributes)
       end
 
       if self.grant_trust_level.present?
@@ -485,11 +537,11 @@ class Group < ActiveRecord::Base
       return if new_record? && !self.primary_group?
 
       if self.primary_group_changed?
-        sql = <<SQL
-        UPDATE users
-        /*set*/
-        /*where*/
-SQL
+        sql = <<~SQL
+          UPDATE users
+          /*set*/
+          /*where*/
+        SQL
 
         builder = SqlBuilder.new(sql)
         builder.where("
@@ -537,7 +589,6 @@ end
 #  automatic                          :boolean          default(FALSE), not null
 #  user_count                         :integer          default(0), not null
 #  alias_level                        :integer          default(0)
-#  visible                            :boolean          default(TRUE), not null
 #  automatic_membership_email_domains :text
 #  automatic_membership_retroactive   :boolean          default(FALSE)
 #  primary_group                      :boolean          default(FALSE), not null
@@ -554,6 +605,7 @@ end
 #  allow_membership_requests          :boolean          default(FALSE), not null
 #  full_name                          :string
 #  default_notification_level         :integer          default(3), not null
+#  visibility_level                   :integer          default(0), not null
 #
 # Indexes
 #
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 3b76c456db3..01b6e970f1d 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -32,8 +32,9 @@ class Invite < ActiveRecord::Base
   def user_doesnt_already_exist
     @email_already_exists = false
     return if email.blank?
-    u = User.find_by("email = ?", Email.downcase(email))
-    if u && u.id != self.user_id
+    user = User.find_by_email(email)
+
+    if user && user.id != self.user_id
       @email_already_exists = true
       errors.add(:email)
     end
@@ -52,8 +53,8 @@ class Invite < ActiveRecord::Base
     invalidated_at.nil?
   end
 
-  def redeem(username: nil, name: nil, password: nil)
-    InviteRedeemer.new(self, username, name, password).redeem unless expired? || destroyed? || !link_valid?
+  def redeem(username: nil, name: nil, password: nil, user_custom_fields: nil)
+    InviteRedeemer.new(self, username, name, password, user_custom_fields).redeem unless expired? || destroyed? || !link_valid?
   end
 
   def self.extend_permissions(topic, user, invited_by)
@@ -98,11 +99,9 @@ class Invite < ActiveRecord::Base
     group_ids = opts[:group_ids]
     send_email = opts[:send_email].nil? ? true : opts[:send_email]
     custom_message = opts[:custom_message]
-
     lower_email = Email.downcase(email)
-    user = User.find_by(email: lower_email)
 
-    if user
+    if user = User.find_by_email(lower_email)
       extend_permissions(topic, user, invited_by) if topic
       raise UserExists.new I18n.t("invite.user_exists", email: lower_email, username: user.username)
     end
@@ -122,6 +121,7 @@ class Invite < ActiveRecord::Base
     if !invite
       create_args = { invited_by: invited_by, email: lower_email }
       create_args[:moderator] = true if opts[:moderator]
+      create_args[:custom_message] = custom_message if custom_message
       invite = Invite.create!(create_args)
     end
 
@@ -143,30 +143,12 @@ class Invite < ActiveRecord::Base
       end
     end
 
-    Jobs.enqueue(:invite_email, invite_id: invite.id, custom_message: custom_message) if send_email
+    Jobs.enqueue(:invite_email, invite_id: invite.id) if send_email
 
     invite.reload
     invite
   end
 
-  # generate invite tokens without email
-  def self.generate_disposable_tokens(invited_by, quantity=nil, group_names=nil)
-    invite_tokens = []
-    quantity ||= 1
-    group_ids = get_group_ids(group_names)
-
-    quantity.to_i.times do
-      invite = Invite.create!(invited_by: invited_by)
-      group_ids = group_ids - invite.invited_groups.pluck(:group_id)
-      group_ids.each do |group_id|
-        invite.invited_groups.create!(group_id: group_id)
-      end
-      invite_tokens.push(invite.invite_key)
-    end
-
-    invite_tokens
-  end
-
   def self.get_group_ids(group_names)
     group_ids = []
     if group_names
@@ -235,16 +217,6 @@ class Invite < ActiveRecord::Base
     invite
   end
 
-  def self.redeem_from_token(token, email, username=nil, name=nil, topic_id=nil)
-    invite = Invite.find_by(invite_key: token)
-    if invite
-      invite.update_column(:email, email)
-      invite.topic_invites.create!(invite_id: invite.id, topic_id: topic_id) if topic_id && Topic.find_by_id(topic_id) && !invite.topic_invites.pluck(:topic_id).include?(topic_id)
-      user = InviteRedeemer.new(invite, username, name).redeem
-    end
-    user
-  end
-
   def resend_invite
     self.update_columns(created_at: Time.zone.now, updated_at: Time.zone.now)
     Jobs.enqueue(:invite_email, invite_id: self.id)
@@ -252,7 +224,13 @@ class Invite < ActiveRecord::Base
 
   def self.resend_all_invites_from(user_id)
     Invite.where('invites.user_id IS NULL AND invites.email IS NOT NULL AND invited_by_id = ?', user_id).find_each do |invite|
-      invite.resend_invite unless invite.blank?
+      invite.resend_invite
+    end
+  end
+
+  def self.rescind_all_invites_from(user)
+    Invite.where('invites.user_id IS NULL AND invites.email IS NOT NULL AND invited_by_id = ?', user.id).find_each do |invite|
+      invite.trash!(user)
     end
   end
 
@@ -289,6 +267,7 @@ end
 #  deleted_by_id  :integer
 #  invalidated_at :datetime
 #  moderator      :boolean          default(FALSE), not null
+#  custom_message :text
 #
 # Indexes
 #
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index a6212f91694..5de389af3b7 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -1,4 +1,4 @@
-InviteRedeemer = Struct.new(:invite, :username, :name, :password) do
+InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_fields) do
 
   def redeem
     Invite.transaction do
@@ -18,10 +18,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password) do
   end
 
   # extracted from User cause it is very specific to invites
-  def self.create_user_from_invite(invite, username, name, password=nil)
-    user_exists = User.find_by_email(invite.email)
-    return user if user_exists
-
+  def self.create_user_from_invite(invite, username, name, password=nil, user_custom_fields=nil)
     if username && UsernameValidator.new(username).valid_format? && User.username_available?(username)
       available_username = username
     else
@@ -42,6 +39,18 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password) do
       user.approved_at = Time.zone.now
     end
 
+    user_fields = UserField.all
+    if user_custom_fields.present? && user_fields.present?
+      field_params = user_custom_fields || {}
+      fields = user.custom_fields
+
+      user_fields.each do |f|
+        field_val = field_params[f.id.to_s]
+        fields["user_field_#{f.id}"] = field_val[0...UserField.max_length] unless field_val.blank?
+      end
+      user.custom_fields = fields
+    end
+
     user.moderator = true if invite.moderator? && invite.invited_by.staff?
     user.save!
 
@@ -76,13 +85,13 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password) do
 
   def get_invited_user
     result = get_existing_user
-    result ||= InviteRedeemer.create_user_from_invite(invite, username, name, password)
+    result ||= InviteRedeemer.create_user_from_invite(invite, username, name, password, user_custom_fields)
     result.send_welcome_message = false
     result
   end
 
   def get_existing_user
-    User.find_by(email: invite.email)
+    User.where(admin: false).find_by_email(invite.email)
   end
 
 
diff --git a/app/models/notification.rb b/app/models/notification.rb
index b64a7d06912..7db7a5b8bd3 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -12,9 +12,11 @@ class Notification < ActiveRecord::Base
   scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id')
                             .where('topics.id IS NULL OR topics.deleted_at IS NULL') }
 
-  after_commit :send_email
+  attr_accessor :skip_send_email
+
+  after_commit :send_email, on: :create
   # This is super weird because the tests fail if we don't specify `on: :destroy`
-  # TODO: Revert back to default in Rails 5 
+  # TODO: Revert back to default in Rails 5
   after_commit :refresh_notification_count, on: :destroy
   after_commit :refresh_notification_count, on: [:create, :update]
 
@@ -206,8 +208,7 @@ class Notification < ActiveRecord::Base
   end
 
   def send_email
-    transaction_includes_action = self.send(:transaction_include_any_action?, [:create])
-    NotificationEmailer.process_notification(self) if transaction_includes_action
+    NotificationEmailer.process_notification(self) if !skip_send_email
   end
 
 end
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index 20e886f987b..e665a8f89d3 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -107,6 +107,9 @@ class OptimizedImage < ActiveRecord::Base
     end
   end
 
+  def self.thumbnail_or_resize
+    SiteSetting.strip_image_metadata ? "thumbnail" : "resize"
+  end
 
   def self.resize_instructions(from, to, dimensions, opts={})
     ensure_safe_paths!(from, to)
@@ -115,12 +118,14 @@ class OptimizedImage < ActiveRecord::Base
     %W{
       convert
       #{from}[0]
+      -auto-orient
       -gravity center
       -background transparent
-      -thumbnail #{dimensions}^
+      -#{thumbnail_or_resize} #{dimensions}^
       -extent #{dimensions}
       -interpolate bicubic
       -unsharp 2x0.5+0.7+0
+      -interlace none
       -quality 98
       -profile #{File.join(Rails.root, 'vendor', 'data', 'RT_sRGB.icm')}
       #{to}
@@ -146,11 +151,13 @@ class OptimizedImage < ActiveRecord::Base
     %W{
       convert
       #{from}[0]
+      -auto-orient
       -gravity north
       -background transparent
-      -thumbnail #{opts[:width]}
+      -#{thumbnail_or_resize} #{opts[:width]}
       -crop #{dimensions}+0+0
       -unsharp 2x0.5+0.7+0
+      -interlace none
       -quality 98
       -profile #{File.join(Rails.root, 'vendor', 'data', 'RT_sRGB.icm')}
       #{to}
@@ -176,8 +183,10 @@ class OptimizedImage < ActiveRecord::Base
     %W{
       convert
       #{from}[0]
+      -auto-orient
       -gravity center
       -background transparent
+      -interlace none
       -resize #{dimensions}
       -profile #{File.join(Rails.root, 'vendor', 'data', 'RT_sRGB.icm')}
       #{to}
@@ -217,7 +226,7 @@ class OptimizedImage < ActiveRecord::Base
       return false
     end
 
-    ImageOptim.new.optimize_image!(to)
+    FileHelper.optimize_image!(to)
     true
   rescue
     Rails.logger.error("Could not optimize image: #{to}")
@@ -262,7 +271,7 @@ class OptimizedImage < ActiveRecord::Base
             optimized_image.sha1 = Upload.generate_digest(path)
           end
           # optimize if image
-          ImageOptim.new.optimize_image!(path)
+          FileHelper.optimize_image!(path)
           # store to new location & update the filesize
           File.open(path) do |f|
             optimized_image.url = Discourse.store.store_optimized_image(f, optimized_image)
diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 657fc9bce3f..1d70519eaf6 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -90,11 +90,15 @@ class PostMover
       raw: post.raw,
       topic_id: destination_topic.id,
       acting_user: user,
-      skip_validations: true
+      skip_validations: true,
+      guardian: Guardian.new(user)
     )
 
     PostAction.copy(post, new_post)
     new_post.update_column(:reply_count, @reply_count[1] || 0)
+    new_post.custom_fields = post.custom_fields
+    new_post.save_custom_fields
+    new_post
   end
 
   def move(post)
diff --git a/app/models/s3_region_site_setting.rb b/app/models/s3_region_site_setting.rb
index 153f92171be..8bb9513fd25 100644
--- a/app/models/s3_region_site_setting.rb
+++ b/app/models/s3_region_site_setting.rb
@@ -1,6 +1,7 @@
 require_dependency 'enum_site_setting'
 
 class S3RegionSiteSetting < EnumSiteSetting
+
   def self.valid_value?(val)
     valid_values.include? val
   end
@@ -10,20 +11,22 @@ class S3RegionSiteSetting < EnumSiteSetting
   end
 
   def self.valid_values
-    [ 'us-east-1',
-      'us-west-1',
-      'us-west-2',
-      'us-gov-west-1',
-      'eu-west-1',
-      'eu-west-2',
-      'eu-central-1',
-      'ap-southeast-1',
-      'ap-southeast-2',
-      'ap-south-1',
+    [
       'ap-northeast-1',
       'ap-northeast-2',
+      'ap-south-1',
+      'ap-southeast-1',
+      'ap-southeast-2',
+      'cn-north-1',
+      'eu-central-1',
+      'eu-west-1',
+      'eu-west-2',
       'sa-east-1',
-      'cn-north-1'
+      'us-east-1',
+      'us-east-2',
+      'us-gov-west-1',
+      'us-west-1',
+      'us-west-2',
     ]
   end
 
diff --git a/app/models/search_log.rb b/app/models/search_log.rb
new file mode 100644
index 00000000000..35a427d7185
--- /dev/null
+++ b/app/models/search_log.rb
@@ -0,0 +1,70 @@
+require_dependency 'enum'
+
+class SearchLog < ActiveRecord::Base
+  validates_presence_of :term, :ip_address
+
+  def self.search_types
+    @search_types ||= Enum.new(
+      header: 1,
+      full_page: 2
+    )
+  end
+
+  def self.log(term:, search_type:, ip_address:, user_id:nil)
+
+    search_type = search_types[search_type]
+    return [:error] unless search_type.present? && ip_address.present?
+
+    update_sql = <<~SQL
+      UPDATE search_logs
+      SET term = :term,
+        created_at = :created_at
+      WHERE created_at > :timeframe AND
+        position(term IN :term) = 1 AND
+        ((:user_id IS NULL AND ip_address = :ip_address) OR
+          (user_id = :user_id))
+      RETURNING id
+    SQL
+
+    rows = exec_sql(
+      update_sql,
+      term: term,
+      created_at: Time.zone.now,
+      timeframe: 5.seconds.ago,
+      user_id: user_id,
+      ip_address: ip_address
+    )
+
+    if rows.cmd_tuples == 0
+      result = create(
+        term: term,
+        search_type: search_type,
+        ip_address: ip_address,
+        user_id: user_id
+      )
+      [:created, result.id]
+    else
+      [:updated, rows[0]['id'].to_i]
+    end
+  end
+
+  def self.clean_up
+    search_id = SearchLog.order(:id).offset(SiteSetting.search_query_log_max_size).limit(1).pluck(:id)
+    if search_id.present?
+      SearchLog.where('id < ?', search_id[0]).delete_all
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: search_logs
+#
+#  id               :integer          not null, primary key
+#  term             :string           not null
+#  user_id          :integer
+#  ip_address       :inet             not null
+#  clicked_topic_id :integer
+#  search_type      :integer          not null
+#  created_at       :datetime         not null
+#
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 928a1756098..34d09eb1898 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -37,7 +37,7 @@ PLUGIN_API_JS
       name = node["name"] || node["data-template-name"] || "broken"
       is_raw = name =~ /\.raw$/
       if is_raw
-        template = "require('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(node.inner_html)})"
+        template = "requirejs('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(node.inner_html)})"
         node.replace <<COMPILED
           <script>
             (function() {
diff --git a/app/models/topic.rb b/app/models/topic.rb
index 8533894aa0f..9b3e0b0f2fa 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -372,8 +372,11 @@ class Topic < ActiveRecord::Base
     # Remove muted tags
     muted_tag_ids = TagUser.lookup(user, :muted).pluck(:tag_id)
     unless muted_tag_ids.empty?
-      topics = topics.joins("LEFT OUTER JOIN topic_tags ON topic_tags.topic_id = topics.id")
-                     .where("topic_tags.tag_id NOT IN (?)", muted_tag_ids)
+      # If multiple tags per topic, include topics with tags that aren't muted,
+      # and don't forget untagged topics.
+      topics = topics.where(
+        "EXISTS ( SELECT 1 FROM topic_tags WHERE topic_tags.topic_id = topics.id AND tag_id NOT IN (?) )
+        OR NOT EXISTS (SELECT 1 FROM topic_tags WHERE topic_tags.topic_id = topics.id)", muted_tag_ids)
     end
 
     topics
@@ -719,6 +722,24 @@ SQL
       # ensure all the notifications are out
       PostAlerter.new.after_save_post(last_post)
       add_small_action(user, "invited_group", group.name)
+
+      group_id = group.id
+
+      group.users.where(
+        "group_users.notification_level > ?", NotificationLevels.all[:muted]
+      ).find_each do |u|
+
+        u.notifications.create!(
+          notification_type: Notification.types[:invited_to_private_message],
+          topic_id: self.id,
+          post_number: 1,
+          data: {
+            topic_title: self.title,
+            display_username: user.username,
+            group_id: group_id
+          }.to_json
+        )
+      end
     end
 
     true
@@ -726,9 +747,10 @@ SQL
 
   # Invite a user to the topic by username or email. Returns success/failure
   def invite(invited_by, username_or_email, group_ids=nil, custom_message=nil)
+    user = User.find_by_username_or_email(username_or_email)
+
     if private_message?
       # If the user exists, add them to the message.
-      user = User.find_by_username_or_email(username_or_email)
       raise UserExists.new I18n.t("topic_invite.user_exists") if user.present? && topic_allowed_users.where(user_id: user.id).exists?
 
       if user && topic_allowed_users.create!(user_id: user.id)
@@ -746,18 +768,27 @@ SQL
     end
 
     if username_or_email =~ /^.+@.+$/ && Guardian.new(invited_by).can_invite_via_email?(self)
-      # rate limit topic invite
       RateLimiter.new(invited_by, "topic-invitations-per-day", SiteSetting.max_topic_invitations_per_day, 1.day.to_i).performed!
 
-      # NOTE callers expect an invite object if an invite was sent via email
-      invite_by_email(invited_by, username_or_email, group_ids, custom_message)
+      if user.present?
+        # add existing users
+        Invite.extend_permissions(self, user, invited_by)
+
+        # Notify the user they've been invited
+        user.notifications.create(notification_type: Notification.types[:invited_to_topic],
+                                  topic_id: id,
+                                  post_number: 1,
+                                  data: { topic_title: title,
+                                          display_username: invited_by.username }.to_json)
+        return true
+      else
+        # NOTE callers expect an invite object if an invite was sent via email
+        invite_by_email(invited_by, username_or_email, group_ids, custom_message)
+      end
     else
-      # invite existing member to a topic
-      user = User.find_by_username(username_or_email)
       raise UserExists.new I18n.t("topic_invite.user_exists") if user.present? && topic_allowed_users.where(user_id: user.id).exists?
 
       if user && topic_allowed_users.create!(user_id: user.id)
-        # rate limit topic invite
         RateLimiter.new(invited_by, "topic-invitations-per-day", SiteSetting.max_topic_invitations_per_day, 1.day.to_i).performed!
 
         # Notify the user they've been invited
@@ -782,7 +813,7 @@ SQL
   end
 
   def grant_permission_to_user(lower_email)
-    user = User.find_by(email: lower_email)
+    user = User.find_by_email(lower_email)
     topic_allowed_users.create!(user_id: user.id)
   end
 
@@ -964,8 +995,6 @@ SQL
 
   # Valid arguments for the time:
   #  * An integer, which is the number of hours from now to update the topic's status.
-  #  * A time, like "12:00", which is the time at which the topic's status will update in the current day
-  #    or the next day if that time has already passed today.
   #  * A timestamp, like "2013-11-25 13:00", when the topic's status should update.
   #  * A timestamp with timezone in JSON format. (e.g., "2013-11-26T21:00:00.000Z")
   #  * `nil` to delete the topic's status update.
@@ -975,9 +1004,10 @@ SQL
   #  * based_on_last_post: True if time should be based on timestamp of the last post.
   #  * category_id: Category that the update will apply to.
   def set_or_create_timer(status_type, time, by_user: nil, timezone_offset: 0, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id)
-    topic_timer_options = { status_type: status_type, topic: self }
+    topic_timer_options = { topic: self }
     topic_timer_options.merge!(user: by_user) unless TopicTimer.public_types[status_type]
     topic_timer = TopicTimer.find_or_initialize_by(topic_timer_options)
+    topic_timer.status_type = status_type
 
     if time.blank?
       topic_timer.trash!(trashed_by: by_user || Discourse.system_user)
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index dd5bc30559c..3ec37b314a5 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -17,7 +17,8 @@ class TopicConverter
         else
           Category.where(read_restricted: false)
             .where.not(id: SiteSetting.uncategorized_category_id)
-            .first.id
+            .order('id asc')
+            .pluck(:id).first
         end
 
       @topic.archetype = Archetype.default
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 12ae7dcaab0..d7691db82d2 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -57,6 +57,8 @@ SQL
 
     builder.where('ftl.topic_id = :topic_id', topic_id: topic_id)
     builder.where('ft.deleted_at IS NULL')
+    # note that ILIKE means "case insensitive LIKE"
+    builder.where("NOT(ftl.url ILIKE '%.png' OR ftl.url ILIKE '%.jpg' OR ftl.url ILIKE '%.gif')")
     builder.where("COALESCE(ft.archetype, 'regular') <> :archetype", archetype: Archetype.private_message)
 
     builder.secure_category(guardian.secure_category_ids)
@@ -122,17 +124,12 @@ SQL
           internal = false
           topic_id = nil
           post_number = nil
-          parsed_path = parsed.path || ""
 
           if Discourse.store.has_been_uploaded?(url)
             internal = Discourse.store.internal?
-          elsif (parsed.host == Discourse.current_hostname && parsed_path.start_with?(Discourse.base_uri)) || !parsed.host
+          elsif route = Discourse.route_for(parsed)
             internal = true
 
-            parsed_path.slice!(Discourse.base_uri)
-
-            route = Rails.application.routes.recognize_path(parsed_path)
-
             # We aren't interested in tracking internal links to users
             next if route[:controller] == 'users'
 
diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index d39c48221b1..6e73686f9b9 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -1,9 +1,12 @@
 require 'js_locale_helper'
+require "i18n/i18n_interpolation_keys_finder"
 
 class TranslationOverride < ActiveRecord::Base
   validates_uniqueness_of :translation_key, scope: :locale
   validates_presence_of :locale, :translation_key, :value
 
+  validate :check_interpolation_keys
+
   def self.upsert!(locale, key, value)
     params = { locale: locale, translation_key: key }
 
@@ -12,9 +15,10 @@ class TranslationOverride < ActiveRecord::Base
       data[:compiled_js] = JsLocaleHelper.compile_message_format(locale, value)
     end
 
-    row_count = where(params).update_all(data)
-    create!(params.merge(data)) if row_count == 0
-    i18n_changed
+    translation_override = find_or_initialize_by(params)
+    params.merge!(data) if translation_override.new_record?
+    i18n_changed if translation_override.update(data)
+    translation_override
   end
 
   def self.revert!(locale, *keys)
@@ -22,13 +26,34 @@ class TranslationOverride < ActiveRecord::Base
     i18n_changed
   end
 
-  protected
+  private
 
     def self.i18n_changed
       I18n.reload!
       MessageBus.publish('/i18n-flush', { refresh: true })
     end
 
+    def check_interpolation_keys
+      original_text = I18n.overrides_disabled do
+        I18n.backend.send(:lookup, self.locale, self.translation_key)
+      end
+
+      if original_text
+        original_interpolation_keys = I18nInterpolationKeysFinder.find(original_text)
+        new_interpolation_keys = I18nInterpolationKeysFinder.find(value)
+        missing_keys = (original_interpolation_keys - new_interpolation_keys)
+
+        if missing_keys.present?
+          self.errors.add(:base, I18n.t(
+            'activerecord.errors.models.translation_overrides.attributes.value.missing_interpolation_keys',
+            keys: missing_keys.join(', ')
+          ))
+
+          return false
+        end
+      end
+    end
+
 end
 
 # == Schema Information
diff --git a/app/models/upload.rb b/app/models/upload.rb
index d6e1916c720..5e272846402 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -13,8 +13,9 @@ class Upload < ActiveRecord::Base
 
   has_many :optimized_images, dependent: :destroy
 
-  attr_accessor :is_attachment_for_group_message
+  attr_accessor :for_group_message
   attr_accessor :for_theme
+  attr_accessor :for_private_message
 
   validates_presence_of :filesize
   validates_presence_of :original_filename
@@ -108,9 +109,7 @@ class Upload < ActiveRecord::Base
             upload.sha1 = Upload.generate_digest(path)
           end
           # optimize if image
-          if FileHelper.is_image?(File.basename(path))
-            ImageOptim.new.optimize_image!(path)
-          end
+          FileHelper.optimize_image!(path) if FileHelper.is_image?(File.basename(path))
           # store to new location & update the filesize
           File.open(path) do |f|
             upload.url = Discourse.store.store_upload(f, upload)
diff --git a/app/models/user.rb b/app/models/user.rb
index 0743ff766dc..f6af5defef8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -42,7 +42,9 @@ class User < ActiveRecord::Base
   has_many :email_change_requests, dependent: :destroy
   has_many :directory_items, dependent: :delete_all
   has_many :user_auth_tokens, dependent: :destroy
+  has_many :user_emails, dependent: :destroy
 
+  has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy
 
   has_one :user_option, dependent: :destroy
   has_one :user_avatar, dependent: :destroy
@@ -74,16 +76,13 @@ class User < ActiveRecord::Base
 
   delegate :last_sent_email_address, :to => :email_logs
 
-  before_validation :strip_downcase_email
-
   validates_presence_of :username
   validate :username_validator, if: :username_changed?
-  validates :email, presence: true, uniqueness: true
-  validates :email, format: { with: EmailValidator.email_regex }, if: :email_changed?
-  validates :email, email: true, if: :should_validate_email?
   validate :password_validator
   validates :name, user_full_name: true, if: :name_changed?, length: { maximum: 255 }
   validates :ip_address, allowed_ip_address: {on: :create, message: :signup_not_allowed}
+  validates :primary_email, presence: true, if: :should_validate_primary_email?
+  validates_associated :primary_email, if: :should_validate_primary_email?
 
   after_initialize :add_trust_level
 
@@ -98,7 +97,6 @@ class User < ActiveRecord::Base
   before_save :ensure_password_is_hashed
 
   after_save :expire_tokens_if_password_changed
-  after_save :automatic_group_membership
   after_save :clear_global_notice_if_needed
   after_save :refresh_avatar
   after_save :badge_grant
@@ -124,6 +122,8 @@ class User < ActiveRecord::Base
   # set to true to optimize creation and save for imports
   attr_accessor :import_mode
 
+  scope :with_email, ->(email) { joins(:user_emails).where(user_emails: { email: email }) }
+
   scope :human_users, -> { where('users.id > 0') }
 
   # excluding fake users like the system user or anonymous users
@@ -233,7 +233,7 @@ class User < ActiveRecord::Base
   end
 
   def self.find_by_email(email)
-    find_by(email: Email.downcase(email))
+    self.with_email(Email.downcase(email)).first
   end
 
   def self.find_by_username(username)
@@ -268,8 +268,8 @@ class User < ActiveRecord::Base
     used_invite.try(:invited_by)
   end
 
-  def should_validate_email?
-    return !skip_email_validation && !staged? && email_changed?
+  def should_validate_primary_email?
+    !skip_email_validation && !staged?
   end
 
   # Approve this user
@@ -574,6 +574,7 @@ class User < ActiveRecord::Base
     # TODO it may be worth caching this in a distributed cache, should be benched
     if SiteSetting.external_system_avatars_enabled
       url = SiteSetting.external_system_avatars_url.dup
+      url = "#{Discourse::base_uri}#{url}" unless url =~ /^https?:\/\//
       url.gsub! "{color}", letter_avatar_color(username.downcase)
       url.gsub! "{username}", username
       url.gsub! "{first_letter}", username[0].downcase
@@ -689,8 +690,7 @@ class User < ActiveRecord::Base
   end
 
   def activate
-    email_token = self.email_tokens.active.first
-    if email_token
+    if email_token = self.email_tokens.active.first
       EmailToken.confirm(email_token.token)
     else
       self.active = true
@@ -920,6 +920,34 @@ class User < ActiveRecord::Base
     end
   end
 
+  def set_automatic_groups
+    return unless active && email_confirmed? && !staged
+
+    Group.where(automatic: false)
+         .where("LENGTH(COALESCE(automatic_membership_email_domains, '')) > 0")
+         .each do |group|
+
+      domains = group.automatic_membership_email_domains.gsub('.', '\.')
+
+      if email =~ Regexp.new("@(#{domains})$", true) && !group.users.include?(self)
+        group.add(self)
+        GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(self)
+      end
+    end
+  end
+
+  def email
+    primary_email.email
+  end
+
+  def email=(email)
+    if primary_email
+      self.new_record? ? primary_email.email = email : primary_email.update(email: email)
+    else
+      build_primary_email(email: email)
+    end
+  end
+
   protected
 
   def badge_grant
@@ -949,23 +977,6 @@ class User < ActiveRecord::Base
     Group.user_trust_level_change!(id, trust_level)
   end
 
-  def automatic_group_membership
-    user = User.find(self.id)
-    return unless user && user.active && user.email_confirmed? && !user.staged
-
-    Group.where(automatic: false)
-         .where("LENGTH(COALESCE(automatic_membership_email_domains, '')) > 0")
-         .each do |group|
-
-      domains = group.automatic_membership_email_domains.gsub('.', '\.')
-
-      if user.email =~ Regexp.new("@(#{domains})$", true) && !group.users.include?(user)
-        group.add(user)
-        GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(user)
-      end
-    end
-  end
-
   def create_user_stat
     stat = UserStat.new(new_since: Time.now)
     stat.user_id = id
@@ -1013,13 +1024,6 @@ class User < ActiveRecord::Base
     self.username_lower = username.downcase
   end
 
-  def strip_downcase_email
-    if self.email
-      self.email = self.email.strip
-      self.email = self.email.downcase
-    end
-  end
-
   def username_validator
     username_format_validator || begin
       lower = username.downcase
@@ -1106,7 +1110,7 @@ end
 #  name                    :string
 #  seen_notification_id    :integer          default(0), not null
 #  last_posted_at          :datetime
-#  email                   :string(513)      not null
+#  email                   :string(513)
 #  password_hash           :string(64)
 #  salt                    :string(32)
 #  active                  :boolean          default(FALSE), not null
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
new file mode 100644
index 00000000000..d97077c20a9
--- /dev/null
+++ b/app/models/user_email.rb
@@ -0,0 +1,45 @@
+require_dependency 'email_validator'
+
+class UserEmail < ActiveRecord::Base
+  belongs_to :user
+
+  before_validation :strip_downcase_email
+
+  validates :email, presence: true, uniqueness: true
+
+  validates :email, email: true, format: { with: EmailValidator.email_regex },
+    if: :skip_email_validation?
+
+  validates :primary, uniqueness: { scope: [:user_id] }
+
+  private
+
+  def strip_downcase_email
+    if self.email
+      self.email = self.email.strip
+      self.email = self.email.downcase
+    end
+  end
+
+  def skip_email_validation?
+    return true if user && user.skip_email_validation
+    email_changed?
+  end
+end
+
+# == Schema Information
+#
+# Table name: user_emails
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer          not null
+#  email      :string(513)      not null
+#  primary    :boolean          default(FALSE), not null
+#  created_at :datetime
+#  updated_at :datetime
+#
+# Indexes
+#
+#  index_user_emails_on_user_id              (user_id)
+#  index_user_emails_on_user_id_and_primary  (user_id,primary) UNIQUE
+#
diff --git a/app/serializers/admin_post_serializer.rb b/app/serializers/admin_post_serializer.rb
deleted file mode 100644
index a06328d832f..00000000000
--- a/app/serializers/admin_post_serializer.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-class AdminPostSerializer < ApplicationSerializer
-
-  attributes :id,
-             :created_at,
-             :post_number,
-             :name, :username, :avatar_template,
-             :topic_id, :topic_slug, :topic_title,
-             :category_id,
-             :excerpt,
-             :hidden,
-             :moderator_action,
-             :deleted_at, :deleted_by,
-             :reply_to_post_number,
-             :action_type
-
-  def name
-    object.user.name
-  end
-
-  def include_name?
-    SiteSetting.enable_names?
-  end
-
-  def username
-    object.user.username
-  end
-
-  def avatar_template
-    object.user.avatar_template
-  end
-
-  def topic_slug
-    topic.slug
-  end
-
-  def topic_title
-    topic.title
-  end
-
-  def category_id
-    topic.category_id
-  end
-
-  def moderator_action
-    object.post_type == Post.types[:moderator_action] || object.post_type == Post.types[:small_action]
-  end
-
-  def deleted_by
-    BasicUserSerializer.new(object.deleted_by, root: false).as_json
-  end
-
-  def include_deleted_by?
-    object.trashed?
-  end
-
-  def action_type
-    object.user_actions.select { |ua| ua.user_id = object.user_id }
-                       .select { |ua| [UserAction::REPLY, UserAction::RESPONSE].include? ua.action_type }
-                       .first.try(:action_type)
-  end
-
-  private
-
-    # we need this to handle deleted topics which aren't loaded via the .includes(:topic)
-    # because Rails 4 "unscoped" support is bugged (cf. https://github.com/rails/rails/issues/13775)
-    def topic
-      return @topic if @topic
-      @topic = object.topic || Topic.with_deleted.find(object.topic_id)
-      @topic
-    end
-
-end
diff --git a/app/serializers/admin_user_action_serializer.rb b/app/serializers/admin_user_action_serializer.rb
new file mode 100644
index 00000000000..0cc58aa27a6
--- /dev/null
+++ b/app/serializers/admin_user_action_serializer.rb
@@ -0,0 +1,92 @@
+require_relative 'post_item_excerpt'
+
+class AdminUserActionSerializer < ApplicationSerializer
+  include PostItemExcerpt
+
+  attributes(
+    :id,
+    :created_at,
+    :post_number,
+    :post_id,
+    :name,
+    :username,
+    :avatar_template,
+    :topic_id,
+    :slug,
+    :title,
+    :category_id,
+    :truncated,
+    :hidden,
+    :moderator_action,
+    :deleted,
+    :deleted_at,
+    :deleted_by,
+    :reply_to_post_number,
+    :action_type
+  )
+
+  def post_id
+    object.id
+  end
+
+  def deleted
+    deleted_at.present?
+  end
+
+  def name
+    object.user.name
+  end
+
+  def include_name?
+    SiteSetting.enable_names?
+  end
+
+  def username
+    object.user.username
+  end
+
+  def avatar_template
+    object.user.avatar_template
+  end
+
+  def slug
+    topic.slug
+  end
+
+  def title
+    topic.title
+  end
+
+  def category_id
+    topic.category_id
+  end
+
+  def moderator_action
+    object.post_type == Post.types[:moderator_action] || object.post_type == Post.types[:small_action]
+  end
+
+  def deleted_by
+    BasicUserSerializer.new(object.deleted_by, root: false).as_json
+  end
+
+  def include_deleted_by?
+    object.trashed?
+  end
+
+  def action_type
+    object.user_actions.select { |ua| ua.user_id = object.user_id }
+                       .select { |ua| [UserAction::REPLY, UserAction::RESPONSE].include? ua.action_type }
+                       .first.try(:action_type)
+  end
+
+  private
+
+    # we need this to handle deleted topics which aren't loaded via the .includes(:topic)
+    # because Rails 4 "unscoped" support is bugged (cf. https://github.com/rails/rails/issues/13775)
+    def topic
+      return @topic if @topic
+      @topic = object.topic || Topic.with_deleted.find(object.topic_id)
+      @topic
+    end
+
+end
diff --git a/app/serializers/admin_user_serializer.rb b/app/serializers/admin_user_serializer.rb
index 0fa30b658e6..df7f279f619 100644
--- a/app/serializers/admin_user_serializer.rb
+++ b/app/serializers/admin_user_serializer.rb
@@ -8,8 +8,7 @@ class AdminUserSerializer < AdminUserListSerializer
              :can_activate,
              :can_deactivate,
              :ip_address,
-             :registration_ip_address,
-             :can_send_activation_email
+             :registration_ip_address
 
   has_one :single_sign_on_record, serializer: SingleSignOnRecordSerializer, embed: :objects
 
diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb
index d86d0606fce..e9cac82f26c 100644
--- a/app/serializers/basic_group_serializer.rb
+++ b/app/serializers/basic_group_serializer.rb
@@ -5,7 +5,7 @@ class BasicGroupSerializer < ApplicationSerializer
              :display_name,
              :user_count,
              :alias_level,
-             :visible,
+             :visibility_level,
              :automatic_membership_email_domains,
              :automatic_membership_retroactive,
              :primary_group,
diff --git a/app/serializers/basic_group_user_serializer.rb b/app/serializers/basic_group_user_serializer.rb
index fa2015b8c4f..3b402724709 100644
--- a/app/serializers/basic_group_user_serializer.rb
+++ b/app/serializers/basic_group_user_serializer.rb
@@ -1,3 +1,7 @@
 class BasicGroupUserSerializer < ApplicationSerializer
-  attributes :group_id, :user_id, :notification_level
+  attributes :group_id, :user_id, :notification_level, :owner
+
+  def include_owner?
+    object.user_id == scope&.user&.id
+  end
 end
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index beb7ae1d07b..f482dd7e13d 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -43,7 +43,7 @@ class CategorySerializer < BasicCategorySerializer
   end
 
   def include_is_special?
-    [SiteSetting.lounge_category_id, SiteSetting.meta_category_id, SiteSetting.staff_category_id, SiteSetting.uncategorized_category_id]
+    [SiteSetting.meta_category_id, SiteSetting.staff_category_id, SiteSetting.uncategorized_category_id]
     .include? object.id
   end
 
diff --git a/app/serializers/group_post_serializer.rb b/app/serializers/group_post_serializer.rb
index 1fb6305e59a..99a06f55340 100644
--- a/app/serializers/group_post_serializer.rb
+++ b/app/serializers/group_post_serializer.rb
@@ -1,10 +1,15 @@
+require_relative 'post_item_excerpt'
+
 class GroupPostSerializer < ApplicationSerializer
+  include PostItemExcerpt
+
   attributes :id,
-             :excerpt,
              :created_at,
              :title,
              :url,
-             :category
+             :category,
+             :post_number,
+             :topic_id
 
   has_one :user, serializer: GroupPostUserSerializer, embed: :object
   has_one :topic, serializer: BasicTopicSerializer, embed: :object
diff --git a/app/serializers/grouped_search_result_serializer.rb b/app/serializers/grouped_search_result_serializer.rb
index ff216c8a232..e3cfbe855f0 100644
--- a/app/serializers/grouped_search_result_serializer.rb
+++ b/app/serializers/grouped_search_result_serializer.rb
@@ -2,5 +2,14 @@ class GroupedSearchResultSerializer < ApplicationSerializer
   has_many :posts, serializer: SearchPostSerializer
   has_many :users, serializer: SearchResultUserSerializer
   has_many :categories, serializer: BasicCategorySerializer
-  attributes :more_posts, :more_users, :more_categories
+  attributes :more_posts, :more_users, :more_categories, :term, :search_log_id
+
+  def search_log_id
+    object.search_log_id
+  end
+
+  def include_search_log_id?
+    search_log_id.present?
+  end
+
 end
diff --git a/app/serializers/post_item_excerpt.rb b/app/serializers/post_item_excerpt.rb
new file mode 100644
index 00000000000..be74db9bdf9
--- /dev/null
+++ b/app/serializers/post_item_excerpt.rb
@@ -0,0 +1,25 @@
+module PostItemExcerpt
+
+  def self.included(base)
+    base.attributes(:excerpt, :truncated)
+  end
+
+  def cooked
+    @cooked ||= object.cooked || PrettyText.cook(object.raw)
+  end
+
+  def excerpt
+    return nil unless cooked
+    @excerpt ||= PrettyText.excerpt(cooked, 300, keep_emoji_images: true)
+  end
+
+  def truncated
+    true
+  end
+
+  def include_truncated?
+    cooked.length > 300
+  end
+
+end
+
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index f9a548372ed..23682bd629c 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -95,8 +95,8 @@ class TopicViewSerializer < ApplicationSerializer
     end
 
     if object.suggested_topics.try(:topics).present?
-      result[:suggested_topics] = object.suggested_topics.topics.map do |topic|
-        SuggestedTopicSerializer.new(topic, scope: scope, root: false)
+      result[:suggested_topics] = object.suggested_topics.topics.map do |t|
+        SuggestedTopicSerializer.new(t, scope: scope, root: false)
       end
     end
 
@@ -277,7 +277,7 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def unicode_title
-    gsub_emoji_to_unicode(object.topic.title)
+    Emoji.gsub_emoji_to_unicode(object.topic.title)
   end
 
   def include_pm_with_non_human_user?
diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb
index 965f4e61e4a..81b2cb2fe60 100644
--- a/app/serializers/user_action_serializer.rb
+++ b/app/serializers/user_action_serializer.rb
@@ -1,8 +1,10 @@
+require_relative 'post_item_excerpt'
+
 class UserActionSerializer < ApplicationSerializer
+  include PostItemExcerpt
 
   attributes :action_type,
              :created_at,
-             :excerpt,
              :avatar_template,
              :acting_avatar_template,
              :slug,
@@ -29,10 +31,6 @@ class UserActionSerializer < ApplicationSerializer
              :closed,
              :archived
 
-  def excerpt
-    cooked = object.cooked || PrettyText.cook(object.raw)
-    PrettyText.excerpt(cooked, 300, keep_emoji_images: true) if cooked
-  end
 
   def avatar_template
     User.avatar_template(object.username, object.uploaded_avatar_id)
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 23cda8dadcd..0e75983daf4 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -129,13 +129,8 @@ class UserSerializer < BasicUserSerializer
   end
 
   def groups
-    groups = object.groups.order(:id)
-
-    if scope.is_admin? || object.id == scope.user.try(:id)
-      groups
-    else
-      groups.where(visible: true)
-    end
+    object.groups.order(:id)
+          .visible_groups(scope.user)
   end
 
   def group_users
@@ -249,7 +244,7 @@ class UserSerializer < BasicUserSerializer
   end
 
   def can_send_private_message_to_user
-    scope.can_send_private_message?(object)
+    scope.can_send_private_message?(object) && scope.current_user != object
   end
 
   def bio_excerpt
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index 33923050b28..cfde16aa135 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -223,7 +223,7 @@ class BadgeGranter
     {errors: e.message}
   end
 
-  MAX_ITEMS_FOR_DELTA = 200
+  MAX_ITEMS_FOR_DELTA ||= 200
   def self.backfill(badge, opts=nil)
     return unless SiteSetting.enable_badges
     return unless badge.enabled
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index ec3d7e720da..e43ea3ed9d1 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -1,13 +1,16 @@
 require_dependency 'distributed_mutex'
 
 class PostAlerter
-
-  def self.post_created(post)
-    alerter = PostAlerter.new
+  def self.post_created(post, opts = {})
+    alerter = PostAlerter.new(opts)
     alerter.after_save_post(post, true)
     post
   end
 
+  def initialize(default_opts = {})
+    @default_opts = default_opts
+  end
+
   def not_allowed?(user, post)
     user.blank? ||
     user.id < 0 ||
@@ -81,14 +84,18 @@ class PostAlerter
     if new_record
       if post.topic.private_message?
         # users that aren't part of any mentioned groups
-        directly_targeted_users(post).each do |user|
+        users = directly_targeted_users(post)
+        DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
+        users.each do |user|
           notification_level = TopicUser.get(post.topic, user).try(:notification_level)
           if notified.include?(user) || notification_level == TopicUser.notification_levels[:watching]
             create_notification(user, Notification.types[:private_message], post)
           end
         end
         # users that are part of all mentionned groups
-        indirectly_targeted_users(post).each do |user|
+        users = indirectly_targeted_users(post)
+        DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
+        users.each do |user|
           # only create a notification when watching the group
           notification_level = TopicUser.get(post.topic, user).try(:notification_level)
 
@@ -142,7 +149,9 @@ class PostAlerter
     # Don't notify the OP
     user_ids -= [post.user_id]
 
-    User.where(id: user_ids).each do |u|
+    users = User.where(id: user_ids)
+    DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
+    users.each do |u|
       create_notification(u, Notification.types[:watching_first_post], post)
     end
   end
@@ -271,14 +280,16 @@ class PostAlerter
     Notification.types[:posted],
   ]
 
-  def create_notification(user, type, post, opts=nil)
+  def create_notification(user, type, post, opts = {})
+    opts = @default_opts.merge(opts)
+
+    DiscourseEvent.trigger(:before_create_notification, user, type, post, opts)
+
     return if user.blank?
     return if user.id < 0
 
     return if type == Notification.types[:liked] && user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:never]
 
-    opts ||= {}
-
     # Make sure the user can see the post
     return unless Guardian.new(user).can_see?(post)
 
@@ -291,11 +302,19 @@ class PostAlerter
                                       .exists?
 
     # skip if muted on the topic
-    return if TopicUser.get(post.topic, user).try(:notification_level) == TopicUser.notification_levels[:muted]
+    return if TopicUser.where(
+      topic: post.topic,
+      user: user,
+      notification_level: TopicUser.notification_levels[:muted]
+    ).exists?
 
     # skip if muted on the group
     if group = opts[:group]
-      return if GroupUser.find_by(group_id: opts[:group_id], user_id: user.id).try(:notification_level) == TopicUser.notification_levels[:muted]
+      return if GroupUser.where(
+        group_id: opts[:group_id],
+        user_id: user.id,
+        notification_level: TopicUser.notification_levels[:muted]
+      ).exists?
     end
 
     # Don't notify the same user about the same notification on the same post
@@ -375,7 +394,8 @@ class PostAlerter
                               topic_id: post.topic_id,
                               post_number: post.post_number,
                               post_action_id: opts[:post_action_id],
-                              data: notification_data.to_json)
+                              data: notification_data.to_json,
+                              skip_send_email: opts[:skip_send_email])
 
    if !existing_notification && NOTIFIABLE_TYPES.include?(type) && !user.suspended?
      # we may have an invalid post somehow, dont blow up
@@ -458,12 +478,13 @@ class PostAlerter
   end
 
   # Notify a bunch of users
-  def notify_non_pm_users(users, type, post, opts=nil)
+  def notify_non_pm_users(users, type, post, opts = {})
 
     return if post.topic.try(:private_message?)
 
     users = [users] unless users.is_a?(Array)
 
+    DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
     users.each do |u|
       create_notification(u, Notification.types[type], post, opts)
     end
@@ -509,6 +530,8 @@ SQL
     exclude_user_ids = notified.map(&:id)
     notify = notify.where("id NOT IN (?)", exclude_user_ids) if exclude_user_ids.present?
 
+
+    DiscourseEvent.trigger(:before_create_notifications_for_users, notify, post)
     notify.each do |user|
       create_notification(user, Notification.types[:posted], post)
     end
diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb
index 08478265679..72e526a301e 100644
--- a/app/services/search_indexer.rb
+++ b/app/services/search_indexer.rb
@@ -151,4 +151,3 @@ class SearchIndexer
     end
   end
 end
-
diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rb
index 9af5731fc91..838c2ba59e4 100644
--- a/app/services/user_destroyer.rb
+++ b/app/services/user_destroyer.rb
@@ -31,18 +31,16 @@ class UserDestroyer
           # block all external urls
           if opts[:block_urls]
             post.topic_links.each do |link|
-              unless link.internal ||
-                (Oneboxer.engine(link.url) != Onebox::Engine::WhitelistedGenericOnebox)
-
-                ScreenedUrl.watch(link.url, link.domain, ip_address: user.ip_address)&.record_match!
-              end
+              next if link.internal
+              next if Oneboxer.engine(link.url) != Onebox::Engine::WhitelistedGenericOnebox
+              ScreenedUrl.watch(link.url, link.domain, ip_address: user.ip_address)&.record_match!
             end
           end
 
           PostDestroyer.new(@actor.staff? ? @actor : Discourse.system_user, post).destroy
 
           if post.topic && post.is_first_post?
-            Topic.unscoped.where(id: post.topic.id).update_all(user_id: nil)
+            Topic.unscoped.where(id: post.topic_id).update_all(user_id: nil)
           end
         end
       end
@@ -51,39 +49,39 @@ class UserDestroyer
         post_action.remove_act!(Discourse.system_user)
       end
 
+      # keep track of emails used
+      user_emails = user.user_emails.pluck(:email)
+
       user.destroy.tap do |u|
         if u
-
           if opts[:block_email]
-            b = ScreenedEmail.block(u.email, ip_address: u.ip_address)
-            b.record_match! if b
-          end
-
-          if opts[:block_ip] && u.ip_address
-            b = ScreenedIpAddress.watch(u.ip_address)
-            b.record_match! if b
-            if u.registration_ip_address && u.ip_address != u.registration_ip_address
-              b = ScreenedIpAddress.watch(u.registration_ip_address)
-              b.record_match! if b
+            user_emails.each do |email|
+              ScreenedEmail.block(email, ip_address: u.ip_address)&.record_match!
             end
           end
 
-          Post.with_deleted.where(user_id: user.id).update_all("user_id = NULL")
+          if opts[:block_ip] && u.ip_address
+            ScreenedIpAddress.watch(u.ip_address)&.record_match!
+            if u.registration_ip_address && u.ip_address != u.registration_ip_address
+              ScreenedIpAddress.watch(u.registration_ip_address)&.record_match!
+            end
+          end
+
+          Post.unscoped.where(user_id: u.id).update_all(user_id: nil)
 
           # If this user created categories, fix those up:
-          categories = Category.where(user_id: user.id)
-          categories.each do |c|
-            c.user_id = Discourse.system_user.id
+          Category.where(user_id: u.id).each do |c|
+            c.user_id = Discourse::SYSTEM_USER_ID
             c.save!
-            if topic = Topic.with_deleted.find_by(id: c.topic_id)
-              topic.try(:recover!)
-              topic.user_id = Discourse.system_user.id
+            if topic = Topic.unscoped.find_by(id: c.topic_id)
+              topic.recover!
+              topic.user_id = Discourse::SYSTEM_USER_ID
               topic.save!
             end
           end
 
           StaffActionLogger.new(@actor == user ? Discourse.system_user : @actor).log_user_deletion(user, opts.slice(:context))
-          MessageBus.publish "/file-change", ["refresh"], user_ids: [user.id]
+          MessageBus.publish "/file-change", ["refresh"], user_ids: [u.id]
         end
       end
     end
diff --git a/app/views/about/index.html.erb b/app/views/about/index.html.erb
index 67b9d3240fe..563a9600c83 100644
--- a/app/views/about/index.html.erb
+++ b/app/views/about/index.html.erb
@@ -1,6 +1,6 @@
 <% if crawler_layout? %>
 
-<% content_for :title do %><%=t "about" %><% end %>
+<% content_for :title do %><%=t "about" %> - <%= SiteSetting.title %><% end %>
 
 <section itemscope itemtype="https://schema.org/AboutPage">
   <h1 itemprop="name">
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index f30438dd2f1..2733cc8167b 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -6,7 +6,7 @@
       <h2><a href='<%= c.url %>' itemprop='item'>
         <span itemprop='name'><%= c.name %></span>
       </a></h2>
-      <span itemprop='description'><%= c.description %></span>
+      <span itemprop='description'><%= c.description&.html_safe %></span>
     </div>
   <% end %>
 </div>
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index 05e0a95f948..f9b01467938 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -17,12 +17,6 @@
     <% end %>
     window.onerror(e && e.message, null,null,null,e);
   });
-
-<% if Rails.env.development? || Rails.env.test? %>
-  //Ember.ENV.RAISE_ON_DEPRECATION = true
-  //Ember.LOG_STACKTRACE_ON_DEPRECATION = true
-<% end %>
-
 </script>
 
 <script>
@@ -48,19 +42,20 @@
     Discourse.Environment = '<%= Rails.env %>';
     Discourse.SiteSettings = ps.get('siteSettings');
     Discourse.LetterAvatarVersion = '<%= LetterAvatar.version %>';
+    Discourse.MarkdownItURL = '<%= asset_url('markdown-it-bundle.js') %>';
     I18n.defaultLocale = '<%= SiteSetting.default_locale %>';
     Discourse.start();
     Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
     Discourse.Session.currentProp("disableCustomCSS", <%= loading_admin? %>);
     <%- if params["safe_mode"] %>
-        Discourse.Session.currentProp("safe_mode", <%= normalized_safe_mode.inspect.html_safe %>);
+    Discourse.Session.currentProp("safe_mode", <%= normalized_safe_mode.inspect.html_safe %>);
     <%- end %>
     Discourse.HighlightJSPath = <%= HighlightJs.path.inspect.html_safe %>;
     <%- if SiteSetting.enable_s3_uploads %>
       <%- if SiteSetting.s3_cdn_url.present? %>
-        Discourse.S3CDN = '<%= SiteSetting.s3_cdn_url %>';
+    Discourse.S3CDN = '<%= SiteSetting.s3_cdn_url %>';
       <%- end %>
-      Discourse.S3BaseUrl = '<%= Discourse.store.absolute_base_url %>';
+    Discourse.S3BaseUrl = '<%= Discourse.store.absolute_base_url %>';
     <%- end %>
   })();
 </script>
diff --git a/app/views/common/_google_universal_analytics.html.erb b/app/views/common/_google_universal_analytics.html.erb
index 9067c94cb3a..7c03711df43 100644
--- a/app/views/common/_google_universal_analytics.html.erb
+++ b/app/views/common/_google_universal_analytics.html.erb
@@ -5,4 +5,10 @@
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
   ga('create', '<%= SiteSetting.ga_universal_tracking_code %>', <%= ga_universal_json %>);
+
+  <% if SiteSetting.ga_universal_auto_link_domains.present? %>
+  ga('require', 'linker');
+  ga('linker:autoLink', <%= raw SiteSetting.ga_universal_auto_link_domains.split('|').to_json %>);
+  <% end %>
+
 </script>
diff --git a/app/views/email/unsubscribe.html.erb b/app/views/email/unsubscribe.html.erb
index b4d543a16b6..762cd8afae4 100644
--- a/app/views/email/unsubscribe.html.erb
+++ b/app/views/email/unsubscribe.html.erb
@@ -12,7 +12,7 @@
     <%- end %>
   <%- else %>
     <br/>
-    <h2><%= t 'unsubscribe.title'%></h2>
+    <h2><%= t 'unsubscribe.title'%> <%= @user.email %></h2>
     <br/>
     <%= form_tag(email_perform_unsubscribe_path(key: params[:key])) do %>
       <%if @topic %>
diff --git a/app/views/email/unsubscribed.html.erb b/app/views/email/unsubscribed.html.erb
index cfa7ed31ab5..a593bfed31b 100644
--- a/app/views/email/unsubscribed.html.erb
+++ b/app/views/email/unsubscribed.html.erb
@@ -3,7 +3,7 @@
   <h2><%=t "unsubscribed.title"%></h2>
   <br>
   <p>
-    <%=t("unsubscribed.description", url: path("/my/preferences")).html_safe %>
+    <%=t("unsubscribed.description", email: @email, url: path("/my/preferences")).html_safe %>
   </p>
 
   <% if @topic %>
diff --git a/app/views/exceptions/not_found.html.erb b/app/views/exceptions/not_found.html.erb
index 1298ec5449d..f7177c1eb3d 100644
--- a/app/views/exceptions/not_found.html.erb
+++ b/app/views/exceptions/not_found.html.erb
@@ -30,9 +30,9 @@
     <div class="span10 page-not-found-search">
       <h2><%= t 'page_not_found.search_title' %></h2>
       <p>
-        <form action='//google.com/search' id='google-search' onsubmit="return google_button_clicked()">
-          <input type="text" id='user-query' value="<%= @slug %>">
-          <input type='hidden' id='google-query' name="q">
+        <form action='//google.com/search' id='google-search'>
+          <input type="text" name="q" value="<%= @slug %>">
+          <input type='hidden'name="as_sitesearch" value="<%= local_domain %>">
           <button class="btn btn-primary"><%= t 'page_not_found.search_google' %></button>
         </form>
       </p>
@@ -40,12 +40,6 @@
   </div>
 
   <script language="Javascript">
-    function google_button_clicked(e) {
-      var searchValue = document.getElementById('user-query').value;
-      document.getElementById('google-query').value = 'site:<%= local_domain %> ' + searchValue;
-      return true;
-    }
-
     window.onpopstate = function(event) {
       if (event.state && !window.hasOwnProperty("Discourse")) {  //check if Discourse object exists if not take care of back navigation
         window.location = document.location;
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 984b0e198a0..93fadad04af 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -2,7 +2,7 @@
 <html lang="<%= SiteSetting.default_locale %>" class="<%= html_classes %>">
   <head>
     <meta charset="utf-8">
-    <title><%= content_for?(:title) ? yield(:title) + ' - ' + SiteSetting.title : SiteSetting.title %></title>
+    <title><%= content_for?(:title) ? yield(:title) : SiteSetting.title %></title>
     <meta name="description" content="<%= @description_meta || SiteSetting.site_description %>">
     <meta name="discourse_theme_key" content="<%= theme_key %>">
     <%= render partial: "layouts/head" %>
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index ac757cc8c24..b9c4ab0c46f 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -2,7 +2,7 @@
 <html lang="<%= SiteSetting.default_locale %>">
   <head>
     <meta charset="utf-8">
-    <title><%= content_for?(:title) ? yield(:title) + ' - ' + SiteSetting.title : SiteSetting.title %></title>
+    <title><%= content_for?(:title) ? yield(:title) : SiteSetting.title %></title>
     <meta name="description" content="<%= @description_meta || SiteSetting.site_description %>">
     <%= render partial: "layouts/head" %>
     <%- if rtl? %>
diff --git a/app/views/layouts/no_ember.html.erb b/app/views/layouts/no_ember.html.erb
index 035a84027bc..4b1be5bce0c 100644
--- a/app/views/layouts/no_ember.html.erb
+++ b/app/views/layouts/no_ember.html.erb
@@ -2,7 +2,7 @@
 <html lang="<%= SiteSetting.default_locale %>">
 <head>
   <meta charset="utf-8">
-  <title><%= content_for?(:title) ? yield(:title) + ' - ' + SiteSetting.title : SiteSetting.title %></title>
+  <title><%= content_for?(:title) ? yield(:title) : SiteSetting.title %></title>
   <meta name="description" content="">
   <%= render partial: "layouts/head" %>
   <%= render partial: "common/special_font_face" %>
diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index ba4b1dff319..4e9dfbcf269 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -99,7 +99,7 @@
 <% if @title %>
   <% content_for :title do %><%= @title %><% end %>
 <% elsif @category %>
-  <% content_for :title do %><%= @category.name %><% end %>
+  <% content_for :title do %><%= @category.name %> - <%= SiteSetting.title %><% end %>
 <% elsif params[:page] %>
-  <% content_for :title do %><%=t 'page_num', num: params[:page].to_i + 1 %><% end %>
+  <% content_for :title do %><%=t 'page_num', num: params[:page].to_i + 1 %> - <%= SiteSetting.title %><% end %>
 <% end %>
diff --git a/app/views/search/show.html.erb b/app/views/search/show.html.erb
index 4bc06c6f461..95d04d44e6c 100644
--- a/app/views/search/show.html.erb
+++ b/app/views/search/show.html.erb
@@ -1 +1 @@
-<% content_for :title do %><%= t 'js.search.results_page' %><% end %>
+<% content_for :title do %><%= t 'js.search.results_page' %> - <%= SiteSetting.title %><% end %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 0ffd169cb51..95deb76b9ab 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -1,6 +1,6 @@
 <% if crawler_layout? %>
 
-<% content_for :title do %><%=t "tags.title" %><% end %>
+<% content_for :title do %><%=t "tags.title" %> - <%= SiteSetting.title %><% end %>
 
 <h1><%=t "tags.title" %></h1>
 
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 606485c7ca1..d228518bd26 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -100,7 +100,7 @@
   <% end %>
 <% end %>
 
-<% content_for(:title) { "#{gsub_emoji_to_unicode(@topic_view.page_title)}" } %>
+<% content_for(:title) { @title || "#{gsub_emoji_to_unicode(@topic_view.page_title)} - #{SiteSetting.title}" } %>
 
 <% if @topic_view.print %>
   <% content_for :after_body do %>
diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index 44c83df06c8..df8efadc041 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -6,7 +6,8 @@
   <title></title>
 </head>
 
-<body style="-moz-box-sizing:border-box;-ms-text-size-adjust:100%;-webkit-box-sizing:border-box;-webkit-text-size-adjust:100%;box-sizing:border-box;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.3;margin:0;min-width:100%;padding:0;text-align:left;width:100%">
+<body dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="-moz-box-sizing:border-box;-ms-text-size-adjust:100%;-webkit-box-sizing:border-box;-webkit-text-size-adjust:100%;box-sizing:border-box;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:400;line-height:1.3;margin:0;min-width:100%;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;width:100%">
+
 
 <!--[if mso]>
 <style type="text/css">
@@ -19,7 +20,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
 </span>
 
 <%- if I18n.t('user_notifications.digest.custom.html.header').present? %>
-  <table style="width:100%;border-spacing:0;padding:0;">
+  <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%;border-spacing:0;padding:0;">
     <tr>
       <td style="padding:0;">
         <%= raw(t 'user_notifications.digest.custom.html.header') %>
@@ -27,7 +28,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
     </tr>
   </table>
 <%- else %>
-<table style="background-color:#<%= @header_bgcolor -%>;width:100%;">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="background-color:#<%= @header_bgcolor -%>;width:100%;">
   <tr>
     <td align="center" style="text-align: center;padding: 20px 0; font-family:Helvetica,Arial,sans-serif;">
 
@@ -44,11 +45,11 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
 </table>
 <%- end %>
 
-<table class="body" style="width:100%;background:#f3f3f3;padding:0;border-spacing:0;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="body" style="width:100%;background:#f3f3f3;padding:0;border-spacing:0;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
       <div class="with-accent-colors">
-        <table class="spacer" style="border-spacing:0;padding:0;width:100%">
+        <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="spacer" style="border-spacing:0;padding:0;width:100%">
           <tbody>
             <tr>
               <td height="400px" style="height:400px;border-collapse:collapse!important;margin:0;mso-line-height-rule:exactly;padding:0;">&nbsp;</td>
@@ -58,17 +59,17 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
       </div>
     </td>
     <td style="vertical-align:top;padding:0;font-family:Helvetica,Arial,sans-serif;">
-      <table align="center" class="with-accent-colors" style="border-spacing:0;margin:0;padding:0;text-align:inherit;vertical-align:top;width:100%">
+      <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" align="center" class="with-accent-colors" style="border-spacing:0;margin:0;padding:0;text-align:inherit;vertical-align:top;width:100%">
         <tbody>
           <tr>
-            <td style="border-collapse:collapse!important;color:#0a0a0a;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:normal">
+            <td style="border-collapse:collapse!important;color:#0a0a0a;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;word-wrap:normal">
 
 <br/>
 <center class="with-accent-colors" style="font-size:22px;font-weight:400;"><%=t 'user_notifications.digest.since_last_visit' %></center>
 
 
 
-<table style="table-layout:fixed;margin:10px 0 20px 0;padding:0;vertical-align:top;width:100%">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="table-layout:fixed;margin:10px 0 20px 0;padding:0;vertical-align:top;width:100%">
 <tbody>
   <tr>
     <%- @counts.each do |count| -%>
@@ -94,22 +95,22 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
           </tr>
         </tbody>
       </table>
-      <table align="center" style="border-spacing:0;background:#fefefe;margin:0;padding:0;text-align:center;vertical-align:top;width:100%">
+      <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" align="center" style="border-spacing:0;background:#fefefe;margin:0;padding:0;text-align:center;vertical-align:top;width:100%">
         <tbody>
           <tr>
-            <td style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:normal">
+            <td style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;word-wrap:normal">
 
 <% @popular_topics.each_with_index do |t, i| %>
 <!--   Beginning of Popular Topic   -->
-<table style="width:100%">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%">
   <tbody>
     <tr>
-      <td style="margin:0;padding:0 0 0 16px;text-align:left;vertical-align:top;">
+      <td style="margin:0;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
         <p style="color:#8f8f8f;line-height:1.3;margin: 20px 0 0 0;">
           <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
         </p>
       </td>
-      <td style="margin:0;padding: 0 16px 0 0;text-align:right;vertical-align:top;">
+      <td style="margin:0;padding:<%= rtl? ? '0 0 0 16px' : '0 16px 0 0' %>;text-align:<%= rtl? ? 'left' : 'right' %>;vertical-align:top;">
         <p class="text-right" style="color:#8f8f8f;line-height:1.3;margin:20px 0 0 0;font-weight:400;">
           <%= short_date(t.created_at) %>
         </p>
@@ -118,10 +119,10 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
   </tbody>
 </table>
 
-<table style="vertical-align:top;width:100%">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td style="padding: 0 8px 8px 16px; text-align:left; width:100%;">
+      <td style="padding:<%= rtl? ? '0 16px 8px 8px' : '0 8px 8px 16px' %>; text-align:<%= rtl? ? 'right' : 'left' %>; width:100%;">
         <h2 style="font-size:18px;font-weight:400;line-height:1.3;margin:0;padding:0;word-wrap:normal">
           <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none">
             <strong><%= gsub_emoji_to_unicode(t.title.truncate(60, separator: /\s/)) -%></strong>
@@ -135,13 +136,13 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
   </tbody>
 </table>
 
-<table style="padding:0;position:relative;text-align:left;vertical-align:top;width:100%">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;position:relative;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td style="color:#0a0a0a;line-height:1.3;margin:0 auto;padding:0 0 0 16px;width:50px;">
+      <td style="color:#0a0a0a;line-height:1.3;margin:0 auto;padding:<%= rtl? ? '0 16px 0 0' : '0 0 0 16px' %>;width:50px;">
         <img src="<%= t.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;float:none;height:50px;width:50px;margin:0;max-width:100%;outline:0;text-align:center;text-decoration:none;" align="center">
       </td>
-      <td style="color:#0a0a0a;padding:0 16px 0 8px;text-align:left;vertical-align:top;">
+      <td style="color:#0a0a0a;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
         <% if t.user %>
           <% if SiteSetting.enable_names? && t.user.name.present? && t.user.name.downcase != t.user.username.downcase %>
             <h6 style="color:inherit;line-height:1.3;margin:0;padding:0;font-weight: normal;font-size:16px;"><%= t.user.name -%></h6>
@@ -150,8 +151,8 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
         <% end %>
       </td>
       <%- if show_image_with_url(t.image_url) && t.featured_link.nil? && !(@excerpts[t.first_post&.id]||"").include?(t.image_url) -%>
-        <td style="margin:0;padding:0 16px 0 8px;text-align:right;" align="right">
-          <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-align:right;text-decoration:none;">
+        <td style="margin:0;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'left' : 'right' %>;" align="right">
+          <img src="<%= url_for_email(t.image_url) -%>" height="64" style="margin:auto;max-height:64px;max-width:100%;outline:0;text-align:<%= rtl? ? 'left' : 'right' %>;text-decoration:none;">
         </td>
       <%- end -%>
     </tr>
@@ -159,10 +160,10 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
 </table>
 
 <%- if t.first_post.present? && !t.first_post.user_deleted %>
-<table style="border-bottom:1px solid #f3f3f3;padding:0;text-align:left;vertical-align:top;width:100%">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="border-bottom:1px solid #f3f3f3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;text-align:left;width:100%;font-weight:normal;">
+      <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;padding:0 16px 0 16px;text-align:<%= rtl? ? 'right' : 'left' %>;width:100%;font-weight:normal;">
         <%= @excerpts[t.first_post.id] %>
       </td>
     </tr>
@@ -170,25 +171,25 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
 </table>
 <%- end %>
 
-<table style="padding:0;text-align:left;vertical-align:top;width:100%; margin-top:20px;">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%; margin-top:20px;">
   <tbody>
     <tr>
-      <td style="padding:0 8px 16px 16px;text-align:left;white-space:nowrap;vertical-align:top;width:75px">
-        <img src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:left;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
-        <p style="color:#8f8f8f;float:left;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:left;font-weight:400;"><%= t.like_count -%></p>
+      <td style="padding:<%= rtl? ? '0 16px 16px 8px' : '0 8px 16px 16px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;width:75px">
+        <img src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.like_count -%></p>
       </td>
-      <td style="padding:0 8px 16px 8px;text-align:left;white-space:nowrap;vertical-align:top;width:75px">
-        <img src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:left;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
-        <p style="color:#8f8f8f;float:left;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:left;font-weight:400;"><%= t.posts_count - 1 -%></p>
+      <td style="padding:0 8px 16px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;width:75px">
+        <img src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.posts_count - 1 -%></p>
       </td>
-      <td style="padding:0 8px 16px 8px;text-align:left;white-space:nowrap;vertical-align:top;">
+      <td style="padding:0 8px 16px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;white-space:nowrap;vertical-align:top;">
         <% t.posters_summary.each do |ps| %>
           <% if ps.user %>
             <img src="<%= ps.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:inline-block;height:20px;width:20px;outline:0;text-decoration:none;">
           <% end %>
         <% end %>
       </td>
-      <td style="line-height:1.3;padding:0 16px 0 8px;text-align:right;white-space:nowrap;vertical-align:top;">
+      <td style="line-height:1.3;padding:<%= rtl? ? '0 8px 0 16px' : '0 16px 0 8px' %>;text-align:<%= rtl? ? 'left' : 'right' %>;white-space:nowrap;vertical-align:top;">
         <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" class="with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space:nowrap;">
           <%=t 'user_notifications.digest.join_the_discussion' %>
         </a>
@@ -197,7 +198,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
   </tbody>
 </table>
 <div style="background-color:#f3f3f3;">
-  <table class="spacer" style="padding:0;width:100%">
+  <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="spacer" style="padding:0;width:100%">
     <tbody><tr><td height="20px" style="border-collapse:collapse!important;line-height:20px;margin:0;mso-line-height-rule:exactly;padding:0;">&#xA0;</td></tr></tbody>
   </table>
 </div>
@@ -217,7 +218,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
     <td class="side-spacer" style="width:5%;vertical-align:top;padding:0;">
       <!-- Background that goes down part-way behind content -->
       <div class="with-accent-colors">
-        <table class="spacer" style="border-spacing:0;padding:0;width:100%">
+        <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="spacer" style="border-spacing:0;padding:0;width:100%">
           <tbody>
             <tr>
               <td height="400px" style="height:400px;border-collapse:collapse!important;margin:0;mso-line-height-rule:exactly;padding:0;">&nbsp;</td>
@@ -235,38 +236,38 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
   <%=t 'user_notifications.digest.popular_posts' %>
 </center>
 
-<table class="body" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;text-align:left;vertical-align:top;">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="body" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
-    <td align="center" valign="top" style="width:90%;border-collapse:collapse!important;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;">
+    <td align="center" valign="top" style="width:90%;border-collapse:collapse!important;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
 
 <% @popular_posts.each do |post| %>
 
 <!--   Beginning of Popular Post   -->
-<table style="width:100%;background:#fefefe;border-spacing:0;padding:0;text-align:left;vertical-align:top;">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="width:100%;background:#fefefe;border-spacing:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
   <tbody>
     <tr>
-      <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;font-weight:200;padding:16px;text-align:left;width:100%;">
+      <td class="post-excerpt" style="color:#0a0a0a;font-size:14px;font-weight:200;padding:16px;text-align:<%= rtl? ? 'right' : 'left' %>;width:100%;">
         <%= email_excerpt(post.cooked) %>
       </td>
     </tr>
   </tbody>
 </table>
 
-<table style="border-spacing:0;background-color:#f3f3f3;padding:0;text-align:left;vertical-align:top;width:100%">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="border-spacing:0;background-color:#f3f3f3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td style="border-spacing:0;padding:0;color:#0a0a0a;line-height:1.3;padding:0 0 0 65px;text-align:left;">
+      <td style="border-spacing:0;padding:0;color:#0a0a0a;line-height:1.3;padding:<%= rtl? ? '0 65px 0 0' : '0 0 0 65px' %>;text-align:<%= rtl? ? 'right' : 'left' %>;">
         <img src="<%= email_image_url 'right_triangle.png' -%>" style="clear:both;display:block;height:20px;width:20px;outline:0;text-decoration:none;">
       </td>
     </tr>
   </tbody>
 </table>
 
-<table style="background-color:#f3f3f3;padding:0;position:relative;text-align:left;vertical-align:top;width:100%">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="background-color:#f3f3f3;padding:0;position:relative;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
   <tbody>
     <tr>
-      <td style="padding:0 8px 8px 8px;text-align:left;width:50px;vertical-align:top;">
+      <td style="padding:0 8px 8px 8px;text-align:<%= rtl? ? 'right' : 'left' %>;width:50px;vertical-align:top;">
         <img src="<%= post.user.small_avatar_url -%>" style="border-radius:50%;clear:both;display:block;height:50px;width:50px;outline:0;">
       </td>
       <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;vertical-align:top;">
@@ -277,9 +278,9 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
           <p style="color:inherit;font-size:14px;font-weight:400;line-height:1.3;margin:0 0 8px 0;padding:0;word-wrap:normal;"><%= post.user.username -%></p>
         <% end %>
       </td>
-      <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;text-align:right;">
-        <p style="color:#8f8f8f;line-height:1.3;margin:0 0 10px 0;padding:0;text-align:right;">
-          <a href="<%= post.full_url -%>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left;text-decoration:none"><%= gsub_emoji_to_unicode(post.topic.title.truncate(60, separator: /\s/)) -%></a>
+      <td style="color:#0a0a0a;line-height:1.3;padding:0 8px 8px 8px;text-align:<%= rtl? ? 'left' : 'right' %>;">
+        <p style="color:#8f8f8f;line-height:1.3;margin:0 0 10px 0;padding:0;text-align:<%= rtl? ? 'left' : 'right' %>;">
+          <a href="<%= post.full_url -%>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;text-decoration:none"><%= gsub_emoji_to_unicode(post.topic.title.truncate(60, separator: /\s/)) -%></a>
         </p>
         <a href="<%= post.full_url -%>" class="with-accent-colors" style="width:100%;text-decoration:none;padding:8px 16px;white-space: nowrap;">
           <%=t 'user_notifications.digest.join_the_discussion' %>
@@ -290,8 +291,8 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
 </table>
 
 <div style="background-color:#f3f3f3">
-  <table class="spacer" style="padding:0;text-align:left;vertical-align:top;width:100%">
-    <tbody><tr><td height="40" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;font-size:40px;font-weight:400;hyphens:auto;line-height:40px;margin:0;mso-line-height-rule:exactly;padding:0;text-align:left;vertical-align:top;word-wrap:normal">&#xA0;</td></tr></tbody>
+  <table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="spacer" style="padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
+    <tbody><tr><td height="40" style="-moz-hyphens:auto;-webkit-hyphens:auto;border-collapse:collapse!important;color:#0a0a0a;font-size:40px;font-weight:400;hyphens:auto;line-height:40px;margin:0;mso-line-height-rule:exactly;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;word-wrap:normal">&#xA0;</td></tr></tbody>
   </table>
 </div>
 <!--   End of Popular Post   -->
@@ -311,43 +312,43 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
 <% if @other_new_for_you.present? %>
   <center style="color:#0a0a0a;background:#f3f3f3;font-size:22px;font-weight:400;padding-bottom: 8px;font-family:Helvetica,Arial,sans-serif;"><%=t 'user_notifications.digest.more_new' %></center>
 
-<table class="body" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;text-align:left;vertical-align:top;">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" class="body" style="width:100%;background:#f3f3f3;border-spacing:0;border-collapse:collapse!important;font-family:Helvetica,Arial,sans-serif;font-size:14px;font-weight:200;line-height:1.3;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;">
   <tr>
     <td class="side-spacer" style="width:5%;padding:0;">&nbsp;</td>
     <td align="center" valign="top" style="width:90%;border-collapse:collapse!important;margin:0;padding:0;">
 
-<table style="padding:0;text-align:left;vertical-align:top;width:100%">
+<table dir="<%= rtl? ? 'rtl' : 'ltr' %>" style="padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;vertical-align:top;width:100%">
   <tbody>
 
 <% @other_new_for_you.each do |t| %>
 
 <!--   Begin new topic  -->
     <tr style="vertical-align:top;">
-      <td style="padding:8px;text-align:left;">
+      <td style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
         <a href="<%= Discourse.base_url_no_prefix + t.relative_url %>" style="font-weight:400;line-height:1.3;margin:0;padding:0;text-decoration:none">
           <strong><%= gsub_emoji_to_unicode(t.title.truncate(60, separator: /\s/)) -%></strong>
         </a>
         <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %>
           <a class='topic-featured-link' href='<%= t.featured_link %>'><%= raw topic_featured_link_domain(t.featured_link) %></a>
         <%- end %>
-        <p style="color:#0a0a0a;line-height:1.3;margin:0 0 10px 0;padding:0;text-align:left">
+        <p style="color:#0a0a0a;line-height:1.3;margin:0 0 10px 0;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>">
           <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
         </p>
       </td>
-      <td style="padding:8px;text-align:left;">
+      <td style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
         <% t.posters_summary[0,2].each do |ps| %>
           <% if ps.user %>
-            <img src="<%= ps.user.small_avatar_url -%>" style="height:20px;width:20px;margin:0 5px 5px 0;border-radius:50%;clear:both;display:inline-block;outline:0;text-decoration:none;">
+            <img src="<%= ps.user.small_avatar_url -%>" style="height:20px;width:20px;margin:<%= rtl? ? '0 0 5px 5px' : '0 5px 5px 0' %>;border-radius:50%;clear:both;display:inline-block;outline:0;text-decoration:none;">
           <% end %>
         <% end %>
       </td>
-      <td style="padding:8px;text-align:left;">
-        <img src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:left;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
-        <p style="color:#8f8f8f;float:left;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:left;font-weight:400;"><%= t.like_count -%></p>
+      <td style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
+        <img src="<%= email_image_url 'heart.png' -%>" style="clear:both;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.like_count -%></p>
       </td>
-      <td style="padding:8px;text-align:left;">
-        <img src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:left;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
-        <p style="color:#8f8f8f;float:left;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:left;font-weight:400;"><%= t.posts_count - 1 -%></p>
+      <td style="padding:8px;text-align:<%= rtl? ? 'right' : 'left' %>;">
+        <img src="<%= email_image_url 'comment.png' -%>" style="clear:none;display:inline-block;float:<%= rtl? ? 'right' : 'left' %>;height:20px;margin:0;max-width:100%;opacity:.4;outline:0;text-decoration:none;width:auto">
+        <p style="color:#8f8f8f;float:<%= rtl? ? 'right' : 'left' %>;line-height:1.3;margin:0 5px 10px 5px;padding:0;text-align:<%= rtl? ? 'right' : 'left' %>;font-weight:400;"><%= t.posts_count - 1 -%></p>
       </td>
     </tr>
 
@@ -415,9 +416,10 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo
 
 <%= digest_custom_html("above_footer") %>
 
-<div class='footer'>
+<div dir="<%= rtl? ? 'rtl' : 'ltr' %>" class='footer'>
   <%=raw(t 'user_notifications.digest.unsubscribe',
            site_link: html_site_link(@anchor_color),
+           email_settings_url: Discourse.base_url + '/my/preferences/emails',
            unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url_no_prefix, key: @unsubscribe_key), {:style=>"color: ##{@anchor_color}"}))  %>
 </div>
 
diff --git a/app/views/users/password_reset.html.erb b/app/views/users/password_reset.html.erb
index a7d6aedca49..db9a3d99e95 100644
--- a/app/views/users/password_reset.html.erb
+++ b/app/views/users/password_reset.html.erb
@@ -13,7 +13,7 @@
   <% end %>
 </div>
 
-<% content_for :title do %><%=t "password_reset.title" %><% end %>
+<% content_for :title do %><%=t "password_reset.title" %> - <%= SiteSetting.title %><% end %>
 
 <%- content_for(:no_ember_head) do %>
   <meta name="referrer" content="never">
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 2616716c053..c0479dfb048 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -13,5 +13,5 @@
 <% end %>
 
 <% content_for :title do %>
-  <%= t("js.user.profile")%> - <%= @user.username %>
+  <%= t("js.user.profile")%> - <%= @user.username %> - <%= SiteSetting.title %>
 <% end %>
diff --git a/bin/notify_file_change b/bin/notify_file_change
index 354aa6ae677..1ece7a0f33d 100755
--- a/bin/notify_file_change
+++ b/bin/notify_file_change
@@ -19,7 +19,7 @@ fi
 # 3. Add the following to your .vimrc
 #
 # function s:notify_file_change()
-#   let root = RailsRoot()
+#   let root = rails#app().path()
 #   let notify = root . "/bin/notify_file_change"
 #   if executable(notify)
 #     if executable('socat')
diff --git a/config/application.rb b/config/application.rb
index 4ef778ab19c..f49a372783f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -83,6 +83,7 @@ module Discourse
                                  browser-update.js break_string.js ember_jquery.js
                                  pretty-text-bundle.js wizard-application.js
                                  wizard-vendor.js plugin.js plugin-third-party.js
+                                 markdown-it-bundle.js
                                  }
 
     # Precompile all available locales
diff --git a/config/environments/development.rb b/config/environments/development.rb
index bc345547ab8..560d5601301 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -49,16 +49,17 @@ Discourse::Application.configure do
   require 'rbtrace'
 
 
-  require 'stylesheet/watcher'
-  if defined? Puma
-    STDERR.puts "Staring CSS change watcher"
-    @watcher = Stylesheet::Watcher.watch
-  end
 
   if emails = GlobalSetting.developer_emails
     config.developer_emails = emails.split(",").map(&:downcase).map(&:strip)
   end
 
+  if defined?(Rails::Server) || defined?(Puma)
+    require 'stylesheet/watcher'
+    STDERR.puts "Starting CSS change watcher"
+    @watcher = Stylesheet::Watcher.watch
+  end
+
   config.after_initialize do
     if ENV['BULLET']
       Bullet.enable = true
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 16cab97ce13..af2eedae623 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -41,4 +41,9 @@ Discourse::Application.configure do
   config.assets.digest = false
 
   config.eager_load = false
+
+  unless ENV['RAILS_ENABLE_TEST_LOG']
+    config.logger = Logger.new(nil)
+    config.log_level = :fatal
+  end
 end
diff --git a/config/initializers/013-excon_defaults.rb b/config/initializers/013-excon_defaults.rb
new file mode 100644
index 00000000000..32ab36b4cb6
--- /dev/null
+++ b/config/initializers/013-excon_defaults.rb
@@ -0,0 +1 @@
+Excon::DEFAULTS[:omit_default_port] = true
diff --git a/config/initializers/100-sidekiq.rb b/config/initializers/100-sidekiq.rb
index 515898fb012..a155c113cb3 100644
--- a/config/initializers/100-sidekiq.rb
+++ b/config/initializers/100-sidekiq.rb
@@ -23,7 +23,7 @@ if Sidekiq.server?
   Rails.application.config.after_initialize do
     scheduler_hostname = ENV["UNICORN_SCHEDULER_HOSTNAME"]
 
-    if !scheduler_hostname || scheduler_hostname == `hostname`.strip
+    if !scheduler_hostname || scheduler_hostname.split(',').include?(`hostname`.strip)
       require 'scheduler/scheduler'
       manager = Scheduler::Manager.new
       Scheduler::Manager.discover_schedules.each do |schedule|
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 3879d9e80e8..52f12267b08 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -10,6 +10,7 @@ ar:
     number:
       format:
         separator: "."
+        delimiter: ","
       human:
         storage_units:
           format: '%n% u'
@@ -207,26 +208,33 @@ ar:
       visible:
         enabled: 'أدرجه %{when}'
         disabled: 'أزال إدراجه %{when}'
+      banner:
+        enabled: 'اجعل هذا الاعلان %{when}. سوف يظهر اعلى جميع الصفحات حتى يتم الغاؤه بواسطة المستخدم.'
+        disabled: 'أزال هذا الإعلان %{when}. لن يظهر بعد الآن في أعلى كلّ صفحة.'
     topic_admin_menu: "عمليات المدير"
     wizard_required: "مرحبًا في دسكورس الجديد! فلنبدأ مستخدمين <a href='%{url}' data-auto-route='true'>مرشد الإعداد</a> ✨"
     emails_are_disabled: "لقد عطّل أحد المدراء الرّسائل الصادرة للجميع. لن تُرسل إشعارات عبر البريد الإلكتروني أيا كان نوعها."
     bootstrap_mode_enabled: "الموقع اﻷن مفعل بالطريقة التمهيدية لكى تتمكن من اطلاق موقعك الجديد بسهولة. سيسجل كل الأعضاء الجدد بمستوى ثقة 1 وسيكون اختيار ارسال الملخص اليومى عن طريق البريد الالكترونى مفعل. سيتم الغاء تفعيل الطريقة التمهيدية تلقائيا عندما يتخطى عدد اﻷعضاء %{min_users} عضو."
     bootstrap_mode_disabled: "سيتم الغاء تفعيل الطريقة التمهيدية خلال ال 24 ساعة القادمة"
+    themes:
+      default_description: "افترضى"
     s3:
       regions:
-        us_east_1: "شرق الولايات المتحدة (فرجينيا الشمالية)"
-        us_west_1: "غرب الولايات المتحدة (كاليفورنيا الشمالية)"
-        us_west_2: "غرب الولايات المتحدة (أوريغون)"
-        us_gov_west_1: "إستضافة أمازون الحسابية الحكومية (الولايات المتحدة الأمريكية)"
-        eu_west_1: "الاتحاد الأوروبي (أيرلندا)"
-        eu_central_1: "الاتحاد الأوروبي (فرانكفورت)"
-        ap_southeast_1: "آسيا والمحيط الهادئ (سنغافورة)"
-        ap_southeast_2: "آسيا والمحيط الهادئ (سيدني)"
-        ap_south_1: "آسيا والمحيط الهادئ (مومباي)"
         ap_northeast_1: "آسيا والمحيط الهادئ (طوكيو)"
         ap_northeast_2: "آسيا والمحيط الهادئ ( سيول)"
-        sa_east_1: "أمريكا الجنوبية (ساو باولو)"
+        ap_south_1: "آسيا والمحيط الهادئ (مومباي)"
+        ap_southeast_1: "آسيا والمحيط الهادئ (سنغافورة)"
+        ap_southeast_2: "آسيا والمحيط الهادئ (سيدني)"
         cn_north_1: "الصين (بكين)"
+        eu_central_1: "الاتحاد الأوروبي (فرانكفورت)"
+        eu_west_1: "الاتحاد الأوروبي (أيرلندا)"
+        eu_west_2: "الاتحاد الأوروبي (أيرلندا)"
+        sa_east_1: "أمريكا الجنوبية (ساو باولو)"
+        us_east_1: "شرق الولايات المتحدة (فرجينيا الشمالية)"
+        us_east_2: "غرب الولايات المتحدة (اوهايو)"
+        us_gov_west_1: "إستضافة أمازون الحسابية الحكومية (الولايات المتحدة الأمريكية)"
+        us_west_1: "غرب الولايات المتحدة (كاليفورنيا الشمالية)"
+        us_west_2: "غرب الولايات المتحدة (أوريغون)"
     edit: 'عدّل عنوان هذا الموضوع وفئته'
     not_implemented: "لم تُنجز هذه الميزة بعد، نأسف."
     no_value: "لا"
@@ -448,11 +456,8 @@ ar:
         full_name: 'الإسم الكامل'
         add_members: "إضافة أعضاء"
         delete_member_confirm: "أأزيل ’%{username}‘ من مجموعة ’%{group}‘؟"
-      request_membership_pm:
-        title: "طلب العضوية"
-        body: "أود تسجيل العضوية في المجموعة @%{groupName}"
       name_placeholder: "اسم المجموعة، بدون مسافات. يتبع قواعد اسم المستخدم"
-      public: "اسمح للأعضاء بحريّة الانضمام إلى المجموعة أو تركها (يجب أن تكون المجموعة مرئيّة)"
+      public: "السماح للأعضاء بالانظمام\\مغادرة المجموعة بحرية (يتطلب مجموعة مرئية للجميع)"
       empty:
         posts: "لا مشاركات من أعضاء هذه المجموعة."
         members: "لا أعضاء في هذه المجموعة."
@@ -467,13 +472,13 @@ ar:
       automatic_group: مجموعة تلقائية
       closed_group: مجموعة مغلقة
       is_group_user: "أنت عضو في هذه المجموعة"
+      allow_membership_requests: "السماح للأعضاء بأرسالة طلب انضمام لمدراء المجموعة"
       membership: "العضوية"
       name: "الاسم"
       user_count: "عدد اﻷعضاء"
       bio: "عن المجموعة"
       selector_placeholder: "أضف أعضاء"
       owner: "المالك"
-      visible: "المجموعة مرئية لكل المستخدمين"
       index:
         title: "المجموعات"
         empty: "لا توجد مجموعات ظاهرة"
@@ -490,6 +495,13 @@ ar:
       posts: "المشاركات"
       mentions: "الإشارات"
       messages: "الرسائل"
+      notification_level: "المستوى الأفتراضي لأشعارات الرسائل في المجموعة"
+      visibility_levels:
+        title: "من يستطيع رؤية هذه المجموعة ؟"
+        public: "الكل"
+        members: "مدراء المجموعة, الاعضاء و المشرفون"
+        staff: "مدراء المجموعة و الطاقم"
+        owners: "مدراء المجموعة و المشرفون"
       alias_levels:
         title: "مَن يمكنه مراسلة هذه المجموعة و@الإشارة إليها؟"
         nobody: "لا أحد"
@@ -595,7 +607,7 @@ ar:
       mute: "كتم"
       edit: "تعديل التفضيلات"
       download_archive:
-        button_text: "نزّل مشاركاتي"
+        button_text: "تحميل الكل"
         confirm: "أمتأكّد من تنزيل مشاركاتك؟"
         success: "بدأ التحميل, سيتم إعلامك برسالة عند اكتمال العملية."
         rate_limit_error: "يمكن تنزيل المشاركات مرّة واحدة يوميًّا فقط. رجاءً أعد المحاولة غدًا."
@@ -625,6 +637,7 @@ ar:
       first_notification: "إشعارك الأول! قم بالضغط عليه للبدء."
       disable_jump_reply: "لا تنتقل إلى مشاركتي بعدما أردّ"
       dynamic_favicon: "أظهر عدد المواضيع الجديدة/المحدّثة في أيقونة المتصفّح"
+      theme_default_on_all_devices: "اجعل القالب افتراضياً على جميع اجهزتي"
       external_links_in_new_tab: "فتح الروابط الخارجية في ألسنة جديدة"
       enable_quoting: "فعل خاصية إقتباس النصوص المظللة"
       change: "تغيير"
@@ -711,7 +724,6 @@ ar:
         title: "تغيير اسم المستخدم"
         confirm: "إن غيّرت اسم المستخدم فستعطب كلّ اقتباسات مشاركاتك إضافة إلى الإشارات إلى @اسمك. أواثق تمام الثّقة من ذلك؟"
         taken: "نأسف، اسم المستخدم مأخوذ."
-        error: "حدث عطل أثناء تغيير اسم المستخدم."
         invalid: "اسم المستخدم غير صالح. يمكنه احتواء الأرقام والأحرف فحسب"
       change_email:
         title: "غيّر البريد الإلكترونيّ"
@@ -1118,7 +1130,6 @@ ar:
       your_email: "بريدك الإلكتروني  <b>%{email}</b>."
       accept_invite: "قُبول الدعوة "
       success: "أُنشئ حسابك وقد سجلت الدخول الآن."
-      password_label: "تعيين رمز سري (اختياري)"
     password_reset:
       continue: "تابع نحو %{site_name}"
     emoji_set:
@@ -1978,14 +1989,6 @@ ar:
           few: "أمتأكد من حذف المشاركات هذه؟"
           many: "أمتأكد من حذف المشاركات هذه؟"
           other: "أمتأكد من حذف المشاركات هذه؟"
-      merge:
-        confirm:
-          zero: "لا شيء لدمجه."
-          one: "أمتأكد من دمج هذه المشاركة؟"
-          two: "أمتأكد من دمج هتين المشاركتين؟"
-          few: "أمتأكد من دمج هذه المشاركات ال‍{{count}} مشاركات هذه؟"
-          many: "أمتأكد من دمج هذه المشاركات ال‍{{count}} مشاركة هذه؟"
-          other: "أمتأكد من دمج هذه المشاركات ال‍{{count}} مشاركة هذه؟"
       revisions:
         controls:
           first: "أول مراجعة"
@@ -2018,8 +2021,6 @@ ar:
       settings: 'اعدادات'
       topic_template: "إطار الموضوع"
       tags: "الوسوم"
-      tags_allowed_tags: "ما يمكن استخدامه من وسوم في هذه الفئة فقط:"
-      tags_allowed_tag_groups: "مجموعات العلامات الوصفية التي تستخدم فقط في هذا القسم:"
       tags_placeholder: "(اختياري) قائمة العلامات الوصفية المسموح بها"
       tag_groups_placeholder: "(اختياريّ) قائمة مجموعات الوسوم المسموح بها"
       delete: 'احذف القسم'
@@ -3147,7 +3148,7 @@ ar:
           one: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من يوم. (The delete_user_max_post_age setting.)"
           two: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من يومين. (The delete_user_max_post_age setting.)"
           few: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من أيام قليلة. (The delete_user_max_post_age setting.)"
-          many: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من أيام %{كثيرة}. (The delete_user_max_post_age setting.)"
+          many: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من أيام %{count}. (The delete_user_max_post_age setting.)"
           other: "لا تستطيع حذف جميع المشاركات. بعض المشاركات أقدم من %{count} أيام. (The delete_user_max_post_age setting.)"
         cant_delete_all_too_many_posts:
           zero: "لا يمكن مسح كل المشاركات لأن العضو لديه أكثر من %{count} مشاركة.\n(delete_all_posts_max)"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 55625688355..ce884503d01 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -139,19 +139,19 @@ bs_BA:
     bootstrap_mode_disabled: "Bootstrap mod će biti ugašen u sljedećih 24 sata."
     s3:
       regions:
-        us_east_1: "SAD Istok (Sjeverna Virdžinija)"
-        us_west_1: "SAD Zapad (Sjeverna Kalifornija)"
-        us_west_2: "SAD Zapad (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Irska)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Azija Pacifik (Singapur)"
-        ap_southeast_2: "Azija Pacifik (Sidnej)"
-        ap_south_1: "Azija Pacifik (Mumai)"
         ap_northeast_1: "Azija Pacifik (Tokio)"
         ap_northeast_2: "Azija Pacifik (Seul)"
-        sa_east_1: "Južna Amerika (Sao Paulo)"
+        ap_south_1: "Azija Pacifik (Mumai)"
+        ap_southeast_1: "Azija Pacifik (Singapur)"
+        ap_southeast_2: "Azija Pacifik (Sidnej)"
         cn_north_1: "Kina (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irska)"
+        sa_east_1: "Južna Amerika (Sao Paulo)"
+        us_east_1: "SAD Istok (Sjeverna Virdžinija)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "SAD Zapad (Sjeverna Kalifornija)"
+        us_west_2: "SAD Zapad (Oregon)"
     edit: 'izmjeni naslov i kategoriju ove teme'
     not_implemented: "That feature hasn't been implemented yet, sorry!"
     no_value: "Ne"
@@ -349,11 +349,7 @@ bs_BA:
         full_name: 'Puno ime'
         add_members: "Dodaj Članove"
         delete_member_confirm: "Ukloni '%{username}' iz '%{group}' grupe?"
-      request_membership_pm:
-        title: "Zahtjev za članstvom"
-        body: "Želio bi da apliciram u članstvo @%{groupName}."
       name_placeholder: "Ime grupe, bez razmaka, ista pravila kao za korisničko ime"
-      public: "Dozvolite korisnicima da se pridruže/napuste grupu slobodno (Zahtjeva da grupa bude vidljiva)"
       empty:
         posts: "Ne postoje postovi člana ove grupe."
         members: "Nema članova u grupi."
@@ -374,7 +370,6 @@ bs_BA:
       bio: "O grupi"
       selector_placeholder: "Dodaj članove"
       owner: "vlasnik"
-      visible: "Grupa je vidljiva svim korisnicima"
       index:
         title: "Grupe"
         empty: "Vidljive grupe još ne postoje."
@@ -479,7 +474,6 @@ bs_BA:
       mute: "Mutiraj"
       edit: "Uredi Postavke"
       download_archive:
-        button_text: "Preuzmite svoju objavu"
         confirm: "Da li ste sigurni da želite preuzeti svoju objavu?"
         success: "Preuzimanje je započeto, bit će te obavješteni porukom kada proces bude završen."
         rate_limit_error: "Objava može biti preuzeta samo jedanput na dan, molimo vas da pokušate sutra ponovo."
@@ -597,7 +591,6 @@ bs_BA:
         title: "Change Username"
         confirm: "Ukoliko promijenite vaše korisničko ime, sva dosadašnja citiranja u vašim objavama te @ime spomeni će biti ugašeni/sa vašim eventualno novim nickom razdvojeni. Da li ste APSOLUTNO SIGURNI da to želite učiniti?"
         taken: "Sorry, that username is taken."
-        error: "There was an error changing your username."
         invalid: "That username is invalid. It must only include numbers and letters"
       change_email:
         title: "Change Email"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index c4e4a7ee825..10307b7a83c 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -119,6 +119,7 @@ cs:
           other: "za %{count} let"
       previous_month: 'Předchozí měsíc'
       next_month: 'Další měsíc'
+      placeholder: Vyber datum
     share:
       topic: 'sdílet odkaz na toto téma'
       post: 'příspěvek #%{postNumber}'
@@ -157,21 +158,24 @@ cs:
     emails_are_disabled: "Všechny odchozí emaily byly administrátorem vypnuty. Žádné odchozí emaily nebudou odeslány."
     bootstrap_mode_enabled: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile počet registrovaných uživatelů překročí %{min_users}."
     bootstrap_mode_disabled: "Režim bootstrap bude deaktivován v následujících 24 hodinách."
+    themes:
+      default_description: "Výchozí"
     s3:
       regions:
-        us_east_1: "Východ USA (S. Virginie)"
-        us_west_1: "Západ USA (S. Kalifornie)"
-        us_west_2: "Západ USA (Oregon)"
-        us_gov_west_1: "AWS GovCloud (USA)"
-        eu_west_1: "EU (Irsko)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapur)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Bombaj)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Soul)"
-        sa_east_1: "Jižní Amerika (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Bombaj)"
+        ap_southeast_1: "Asia Pacific (Singapur)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "Čína (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irsko)"
+        eu_west_2: "EU (Londýn)"
+        sa_east_1: "Jižní Amerika (Sao Paulo)"
+        us_east_1: "Východ USA (S. Virginie)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        us_west_1: "Západ USA (S. Kalifornie)"
+        us_west_2: "Západ USA (Oregon)"
     edit: 'upravit název a kategorii příspěvku'
     not_implemented: "Tato funkce ještě nebyla naprogramována, omlouváme se."
     no_value: "Ne"
@@ -351,6 +355,8 @@ cs:
         change_group_setting: "Změnit nastavení skupiny"
         add_user_to_group: "Přidat uživatele"
         remove_user_from_group: "Odebrat uživatele"
+        make_user_group_owner: "Udělej vlastníkem"
+        remove_user_as_group_owner: "Odstraň vlastníka"
     groups:
       logs:
         title: "Logy"
@@ -364,14 +370,22 @@ cs:
       edit:
         title: 'Editovat skupinu'
         full_name: 'Celé jméno'
+        add_members: "Přidat členy"
+        delete_member_confirm: "Odstranit '%{username}' ze skupiny '%{group}'?"
+      name_placeholder: "Název skupiny, bez mezer, stejná pravidla jako pro uživatelská jména"
       add: "Přidat"
+      join: "Přidat se ke skupině"
+      leave: "Opustit skupinu"
+      request: "Požádat o členství ve skupině"
       automatic_group: Automatická skupina
+      closed_group: Uzavřená skupina
+      is_group_user: "Jsi členem této skupiny"
       membership: "Členství"
+      name: "Název"
       user_count: "Počet členů"
       bio: "O skupině"
       selector_placeholder: "Přidat členy"
       owner: "Vlastník"
-      visible: "Skupina je viditelná pro všechny uživatele"
       index:
         title: "Skupiny"
         empty: "Žádné viditelné skupiny."
@@ -385,6 +399,10 @@ cs:
       posts: "Odpovědi"
       mentions: "Zmínění"
       messages: "Zprávy"
+      visibility_levels:
+        title: "Kdo vidí tuto skupinu?"
+        public: "Všichni"
+        members: "Vlastníci skupiny, členové a správci"
       alias_levels:
         title: "Kdo může do této skupiny psát zprávy a @zmiňovat ji?"
         nobody: "Nikdo"
@@ -477,7 +495,10 @@ cs:
       mute: "Ignorovat"
       edit: "Upravit nastavení"
       download_archive:
-        button_text: "Download mých příspěvků"
+        button_text: "Stáhnout vše"
+        confirm: "Jste si jistí, že chcete stáhnout všechny své příspěvky?"
+        success: "Stahování zahájeno, až bude dokončeno, přijde ti zpráva."
+        rate_limit_error: "Příspěvky mohou být staženy jen jednou za den. Zkus to, prosím, zítra."
       new_private_message: "Nová zpráva"
       private_message: "Zpráva"
       private_messages: "Zprávy"
@@ -575,12 +596,23 @@ cs:
         move_to_archive: "Archivovat"
         failed_to_move: "Nepodařilo se přesunout vybrané zprávy (možná vám spadlo připojení)"
         select_all: "Vybrat vše"
+      preferences_nav:
+        account: "Účet"
+        profile: "Profil"
+        emails: "Emaily"
+        notifications: "Upozornění"
+        categories: "Kategorie"
+        tags: "Tagy"
+        interface: "Rozhraní"
+        apps: "Aplikace"
       change_password:
         success: "(email odeslán)"
         in_progress: "(odesílám)"
         error: "(chyba)"
         action: "Odeslat email na obnovu hesla"
         set_password: "Nastavit heslo"
+        choose_new: "Zvolte si nové heslo"
+        choose: "Vyber si heslo"
       change_about:
         title: "Změna o mně"
         error: "Došlo k chybě při pokusu změnit tuto hodnotu."
@@ -588,7 +620,6 @@ cs:
         title: "Změnit uživatelské jméno"
         confirm: "Pokud si změníte vaše uživatelské jméno, všechny přechozí citace vašich příspěvků a zmínky vašeho @jména budou rozbité. Jste si absolutně jistý, že chcete potvrdit toto operaci?"
         taken: "Toto uživatelské jméno je již zabrané."
-        error: "Nastala chyba při změně uživatelského jména."
         invalid: "Uživatelské jméno je neplatné. Musí obsahovat pouze písmena a číslice."
       change_email:
         title: "Změnit emailovou adresu"
@@ -631,9 +662,11 @@ cs:
         ok: "Parádní jméno"
       username:
         title: "Uživatelské jméno"
+        instructions: "jedinečné, bez mezer, krátké"
         short_instructions: "Lidé vás mohou zmínit pomocí @{{username}}"
         available: "Vaše uživatelské jméno je volné"
         not_available: "Není k dispozici. Co třeba {{suggestion}}?"
+        not_available_no_suggestion: "Není k dispozici"
         too_short: "Uživatelské jméno je moc krátké"
         too_long: "Uživatelské jméno je moc dlouhé"
         checking: "Zjišťuji, zda je uživatelské jméno volné..."
@@ -723,6 +756,8 @@ cs:
         expired: "Poznávka je už prošlá."
         rescind: "Smazat"
         rescinded: "Pozvánka odstraněna"
+        rescind_all: "Odstranit všechny pozvánky"
+        rescinded_all: "Všechny pozvánky odstraněny!"
         reinvite: "Znovu poslat pozvánku"
         reinvite_all: "Znovu poslat všechny pozvánky"
         reinvited: "Pozvánka byla opětovně odeslána."
@@ -743,6 +778,7 @@ cs:
         same_as_username: "Vaše heslo je stejné jako Vaše uživatelské jméno."
         same_as_email: "Vaše heslo je stejné jako váš e-mail."
         ok: "Vaše heslo je v pořádku."
+        instructions: "alespoň %{count} znaků"
       summary:
         title: "Souhrn"
         stats: "Statistiky"
@@ -905,6 +941,8 @@ cs:
       complete_email_found: "Byl nalezen účet odpovídající emailu <b>%{email}</b>. Za chvilku obdržíte email s instrukcemi jak přenastavit vaše heslo."
       complete_username_not_found: "Nebyl nalezen účet s uživatelským jménem <b>%{username}</b>"
       complete_email_not_found: "Nebyl nalezen účet s odpovídající emailu <b>%{email}</b>"
+      button_ok: "OK"
+      button_help: "Nápověda"
     login:
       title: "Přihlásit se"
       username: "Uživatel"
@@ -924,6 +962,7 @@ cs:
       not_allowed_from_ip_address: "Z této IP adresy se nemůžete přihlásit."
       admin_not_allowed_from_ip_address: "Z této IP adresy se nemůžete přihlásit jako administrátor."
       resend_activation_email: "Klikněte sem pro zaslání aktivačního emailu."
+      submit_new_email: "Aktualizovat emailovou adresu"
       sent_activation_email_again: "Zaslali jsme vám další aktivační email na <b>{{currentEmail}}</b>. Může trvat několik minut, než vám dorazí. Zkontrolujte také vaši složku s nevyžádanou pošlou."
       to_continue: "Přihlaš se, prosím"
       preferences: "Pro to, aby jsi mohl měnit své uživatelské nastavení, se musíš přihlásit."
@@ -951,14 +990,22 @@ cs:
         message: "Autentizuji přes GitHub (ujistěte se, že nemáte zablokovaná popup okna)"
     invites:
       accept_title: "Pozvání"
+      welcome_to: "Vítejte na %{site_name}!"
       invited_by: "Pozvání od:"
+      accept_invite: "Přijmout pozvání"
       success: "Váš účet byl vytvořen a nyní jste přihlášeni."
+      name_label: "Jméno"
+      password_label: "Nastavit heslo"
+      optional_description: "(volitelné)"
+    password_reset:
+      continue: "Pokračovat na %{site_name}"
     emoji_set:
       apple_international: "Apple/Mezinárodní"
       google: "Google"
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Pouze kategorie"
       categories_with_featured_topics: "Kategorie a vybrané příspěvky"
@@ -973,6 +1020,7 @@ cs:
       options: "Možnosti"
       whisper: "šeptat"
       unlist: "neviditelné"
+      blockquote_text: "Bloková citace"
       add_warning: "Toto je oficiální varování."
       toggle_whisper: "Přepnout šeptání"
       toggle_unlisted: "Přepnout neviditelné"
@@ -1121,6 +1169,7 @@ cs:
       sort_by: "Seřadil"
       relevance: "Relevance"
       latest_post: "Poslední příspěvek"
+      latest_topic: "Nejnovější téma"
       most_viewed: "Nejzobrazovanější"
       most_liked: "Nejoblíbenější"
       select_all: "Vybrat vše"
@@ -1135,6 +1184,7 @@ cs:
       no_more_results: "Nenalezeny žádné další výsledky."
       searching: "Hledám ..."
       post_format: "#{{post_number}} od {{username}}"
+      results_page: "Výsledky hledání"
       context:
         user: "Vyhledat příspěvky od @{{username}}"
         category: "Hledat v kategorii #{{category}}"
@@ -1166,6 +1216,7 @@ cs:
           seen: jsem četl
           unseen: jsem nečetl
           wiki: jsou wiki
+          all_tags: Obsahuje všechny štítky
         statuses:
           label: Kde příspěvky
           open: jsou otevřeny
@@ -1201,8 +1252,10 @@ cs:
         dismiss_new: "Odbýt nová"
         toggle: "hromadný výběr témat"
         actions: "Hromadné akce"
+        change_category: "Nastavit kategorii"
         close_topics: "Zavřít téma"
         archive_topics: "Archivovat témata"
+        notification_level: "Upozornění"
         choose_new_category: "Zvolte novou kategorii pro témata:"
         selected:
           one: "Vybrali jste <b>1</b> téma."
@@ -1321,6 +1374,7 @@ cs:
         go: "go"
         jump_bottom: "na poslední příspěvek"
         jump_prompt: "přejít na..."
+        jump_prompt_of: "%{count} příspěvků"
         jump_prompt_long: "Na který příspěvek chcete přejít?"
         jump_bottom_with_number: "Skočit na příspěvěk %{post_number}"
         total: celkem příspěvků
@@ -1513,9 +1567,11 @@ cs:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
+      quote_reply: "Cituj"
       edit: "Editujete {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Důvod: "
       post_number: "příspěvek č. {{number}}"
+      wiki_last_edited_on: "wiki naposledy upravena"
       last_edited_on: "příspěvek naposledy upraven"
       reply_as_new_topic: "Odpovědět v propojeném tématu"
       continue_discussion: "Pokračující diskuze z {{postLink}}:"
@@ -1566,6 +1622,8 @@ cs:
       via_email: "tento příspěvek byl přijat přes email"
       via_auto_generated_email: "tento příspěvek byl přijat přes automaticky generovaný email"
       whisper: "tento příspěvek je soukromé šeptání pro moderátory"
+      wiki:
+        about: "toto je wiki příspěvek"
       archetypes:
         save: 'Uložit nastavení'
       few_likes_left: "Díky za šíření lásky! Zbývá ti pro dnešek už jen několi \"líbí se\"."
@@ -1575,6 +1633,7 @@ cs:
         has_liked: "tento příspěvek se mi líbí"
         undo_like: "už se mi to nelíbí"
         edit: "upravit příspěvek"
+        edit_action: "Upravit"
         edit_anonymous: "Omlouváme se, ale pro editaci tohoto příspěvku musíte být přihlášení."
         flag: "nahlásit příspěvek moderátorovi"
         delete: "smazat příspěvek"
@@ -1700,9 +1759,9 @@ cs:
           other: "Opravdu chcete odstranit všechny tyto příspěvky?"
       merge:
         confirm:
-          one: "Určite chcete sloučit tyto příspěvky?"
-          few: "Určite chcete sloučit tyto {{count}} příspěvky?"
-          other: "Určite chcete sloučit těchto {{count}} příspěvků?"
+          one: "Opravdu chceš sloučit tyto příspěvky?"
+          few: "Opravdu chceš sloučit {{count}} příspěvky?"
+          other: "Opravdu chceš sloučit {{count}} příspěvků?"
       revisions:
         controls:
           first: "První revize"
@@ -1712,14 +1771,26 @@ cs:
           hide: "Schovejte revizi"
           show: "Zobrazte revizi"
           revert: "Vrátit se k této revizi"
+          edit_wiki: "Upravit Wiki"
+          edit_post: "upravit příspěvek"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
             title: "Vykreslený příspěvek se změnami zobrazenými v textu"
+            button: 'HTML'
           side_by_side:
             title: "Rozdíli mezi vykreslenými příspěveky vedle sebe"
+            button: 'HTML'
           side_by_side_markdown:
             title: "Show the raw source diffs side-by-side"
+      raw_email:
+        displays:
+          text_part:
+            title: "Ukázat textovou část emailu"
+            button: 'Text'
+          html_part:
+            title: "Zobrazit html část emailu"
+            button: 'HTML'
     category:
       can: 'smí&hellip; '
       none: '(bez kategorie)'
@@ -1732,8 +1803,6 @@ cs:
       settings: 'Nastavení'
       topic_template: "Šablona tématu"
       tags: "Štítky"
-      tags_allowed_tags: "Štítky, které mohou být použity pouze v této kategorii:"
-      tags_allowed_tag_groups: "Skupiny štítků, které mohou být použity pouze v této kategorii:"
       tags_placeholder: "(Volitelné) seznam dovolených štítků"
       tag_groups_placeholder: "(Volitelné) seznam dovolených skupin štítků"
       delete: 'Smazat kategorii'
@@ -1805,6 +1874,8 @@ cs:
         created: "Vytvořena"
       sort_ascending: 'Vzestupně'
       sort_descending: 'Sestupně'
+      subcategory_list_styles:
+        rows: "Řady"
     flagging:
       title: 'Děkujeme, že pomáháte udržovat komunitu zdvořilou!'
       action: 'Nahlásit příspěvek'
@@ -2335,6 +2406,8 @@ cs:
         description: "Popis"
         go_back: "Zpět na seznam"
         payload_url_placeholder: "https://example.com/postreceive"
+        content_type: "Typ obsahu"
+        wildcard_event: "Pošli mi vše."
         active: "Aktivní"
         delivery_status:
           inactive: "Neaktivní"
@@ -2445,6 +2518,9 @@ cs:
         color: "Barva"
         opacity: "Neprůhlednost"
         copy: "Kopírovat"
+        copy_to_clipboard: "Kopírovat do schránky"
+        copied_to_clipboard: "Zkopírováno do schránky"
+        theme_owner: "není editovatelné, vlastněno:"
         email_templates:
           title: "Šablona emailu"
           subject: "Předmět"
@@ -2453,6 +2529,12 @@ cs:
           none_selected: "Pro začátek editace zvolte šablonu emailu."
           revert: "Vrátit změny"
           revert_confirm: "Opravdu chcete vrátit změny?"
+        theme:
+          customize_desc: "Přizpůsobit:"
+          edit: "Upravit"
+          mobile: "Mobilní verze"
+          preview: "Náhled"
+          color_scheme: "Barevné schéma"
         colors:
           title: "Barvy"
           long_title: "Barevná schémata"
@@ -2516,6 +2598,8 @@ cs:
         delivery_method: "Způsob doručení"
         preview_digest_desc: "Zobraz náhled mailů se souhrnem posílaným neaktivním uživatelúm."
         refresh: "Aktualizovat"
+        send_digest: "Poslat"
+        sending_email: "Posílám email..."
         format: "Formát"
         html: "html"
         text: "text"
@@ -2568,6 +2652,8 @@ cs:
           block: "blokovat"
           do_nothing: "nedělat nic"
         staff_actions:
+          all: "vše"
+          filter: "Filtr:"
           title: "Akce redaktorů"
           clear_filters: "Zobrazit vše"
           staff_user: "Člen redakce"
@@ -2607,9 +2693,14 @@ cs:
             revoke_admin: "odebrat administrátorská práva"
             grant_moderation: "udělit moderátorská práva"
             revoke_moderation: "odebrat moderátorská práva"
+            backup_create: "vytvořit zálohu"
             deleted_tag: "smazaný štítek"
             renamed_tag: "přejmenovaný štítek"
             revoke_email: "Odebrat email"
+            activate_user: "aktivovat uživatele"
+            deactivate_user: "deaktivovat uživatele"
+            backup_download: "stáhnout zálohu"
+            backup_destroy: "smazat zálohu"
         screened_emails:
           title: "Filtrované emaily"
           description: "Při registraci nového účtu budou konzultovány následujíci adresy. Při shodě bude registrace zablokována, nebo bude provedena jiná akce."
@@ -2902,6 +2993,7 @@ cs:
           user_preferences: "Uživatelká nastavení"
           tags: "Tagy"
           search: "Vyhledávání"
+          groups: "Skupiny"
       badges:
         title: Odznaky
         new_badge: Nový odznak
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 540f1c0679b..4424690f4c8 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -148,20 +148,20 @@ da:
       default_description: "Standard"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Irland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asien (Singapore)"
-        ap_southeast_2: "Asien (Sydney)"
-        ap_south_1: "Asien (Mumbai)"
         ap_northeast_1: "Asien (Tokyo)"
         ap_northeast_2: "Asien (Seoul)"
-        sa_east_1: "Sydamerika (Sao Paulo)"
+        ap_south_1: "Asien (Mumbai)"
+        ap_southeast_1: "Asien (Singapore)"
+        ap_southeast_2: "Asien (Sydney)"
         cn_north_1: "Kina (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "Sydamerika (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'redigér titel og kategori for dette emne'
     not_implemented: "Beklager, denne feature er ikke blevet implementeret endnu."
     no_value: "Nej"
@@ -351,11 +351,7 @@ da:
         full_name: 'Fulde Navn'
         add_members: "Tilføj Medlemmer"
         delete_member_confirm: "Fjern '%{username}' fra '%{group}' gruppen?"
-      request_membership_pm:
-        title: "Medlemskabsanmodning"
-        body: "Jeg vil gerne ansøge om medlemskab i @%{groupName}."
       name_placeholder: "Gruppe navn, ingen mellemrum, samme som reglen for brugernavn"
-      public: "Tillad at brugere frit kan tilmelde sig/forlade gruppen (Kræver at gruppen er synlig)"
       empty:
         posts: "Der er ingen indlæg skrevet af medlemmer i denne gruppe."
         members: "Der er ingen medlemmer i denne gruppe."
@@ -377,7 +373,6 @@ da:
       bio: "Om Grupper"
       selector_placeholder: "Tilføj medlemmer"
       owner: "ejer"
-      visible: "Gruppen er synlige for alle brugere"
       index:
         title: "Grupper"
         empty: "Der er ingen synlige grupper"
@@ -488,7 +483,6 @@ da:
       mute: "Mute"
       edit: "Redigér indstillinger"
       download_archive:
-        button_text: "Download Mine Indlæg"
         confirm: "Er du sikker på, at du vil downloade dine indlæg?"
         success: "Downloaden er startet. Du vil blive notificeret via en besked, når processen er færdig."
         rate_limit_error: "Indlæg kan downloades en gang om dagen, prøv igen i morgen."
@@ -616,7 +610,6 @@ da:
         title: "Skift brugernavn"
         confirm: "Hvis du ændrer dit brugernavn, vil alle tidligere citeringer af dine indlæg ikke længere kunne vises. Er du helt sikker på at du ønsker at ændre brugernavn?"
         taken: "Beklager, det brugernavn er optaget."
-        error: "Der skete en fejl i forbindelse med skift af dit brugernavn."
         invalid: "Det brugernavn er ugyldigt. Det må kun bestå af bogstaver og tal."
       change_email:
         title: "Skift e-mail-adresse"
@@ -991,7 +984,6 @@ da:
       your_email: "E-mail-adressen knyttet til kontoen er <b>%{email}</b>."
       accept_invite: "Accepter Invitation"
       success: "Din konto er blevet oprettet, og du er nu logget ind."
-      password_label: "Angiv Kodeord (valgfrit)"
     password_reset:
       continue: "Fortsæt til %{site_name}"
     emoji_set:
@@ -1749,10 +1741,6 @@ da:
         confirm:
           one: "Er du sikker på, at du vil slette indlægget?"
           other: "Er du sikker på, at du vil slette alle de valgte indlæg?"
-      merge:
-        confirm:
-          one: "Er du sikker på du vil flette de indlæg?"
-          other: "Er du sikker på at du vil flette disse {{count}} indlæg?"
       revisions:
         controls:
           first: "Første udgave"
@@ -1798,8 +1786,6 @@ da:
       settings: 'Indstillinger'
       topic_template: "Skabelon for emne"
       tags: "Tags"
-      tags_allowed_tags: "Mærker der kun kan bruges i denne kategori:"
-      tags_allowed_tag_groups: "Mærke grupper der kun kan bruges i denne kategori:"
       tags_placeholder: "(Valgfri) liste af tiladte mærker"
       tag_groups_placeholder: "(Valgfri) liste af tiladte mærke grupper"
       topic_featured_link_allowed: "Tillad fremhævede links i denne kategori"
@@ -2611,9 +2597,6 @@ da:
           updating: "Opdaterer..."
           up_to_date: "Tema er opdateret, senest tjekket:"
           add: "Tilføj"
-          commits_behind:
-            one: "Temaet er 1 integrering bagud!"
-            other: "Temaet er {{count}} integreringer bagud!"
           scss:
             text: "CSS"
             title: "Angiv tilpasset CSS - vi accepterer alle gyldige CSS og SCSS-former"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 89fb7c995d6..581d1a023bf 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -148,20 +148,20 @@ de:
       default_description: "Standard"
     s3:
       regions:
-        us_east_1: "USA Ost (Nord-Virginia)"
-        us_west_1: "USA West (Nordkalifornien)"
-        us_west_2: "USA West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (USA)"
-        eu_west_1: "EU (Irland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asien-Pazifik (Singapur)"
-        ap_southeast_2: "Asien-Pazifik (Sydney)"
-        ap_south_1: "Asien-Pazifik (Mumbai)"
         ap_northeast_1: "Asien-Pazifik (Tokio)"
         ap_northeast_2: "Asien-Pazifik (Seoul)"
-        sa_east_1: "Südamerika (São Paulo)"
+        ap_south_1: "Asien-Pazifik (Mumbai)"
+        ap_southeast_1: "Asien-Pazifik (Singapur)"
+        ap_southeast_2: "Asien-Pazifik (Sydney)"
         cn_north_1: "China (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "Südamerika (São Paulo)"
+        us_east_1: "USA Ost (Nord-Virginia)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        us_west_1: "USA West (Nordkalifornien)"
+        us_west_2: "USA West (Oregon)"
     edit: 'Titel und Kategorie dieses Themas ändern'
     not_implemented: "Entschuldige, diese Funktion wurde noch nicht implementiert!"
     no_value: "Nein"
@@ -351,11 +351,8 @@ de:
         full_name: 'Vollständiger Name'
         add_members: "Mitglieder hinzufügen"
         delete_member_confirm: "'%{username}' aus der Gruppe '%{group}' entfernen?"
-      request_membership_pm:
-        title: "Mitgliedschaftsanfrage"
-        body: "Ich möchte mich um eine Mitgliedschaft in @%{groupName} bewerben."
       name_placeholder: "Gruppenname, keine Leerzeichen, gleiche Regel wie beim Benutzernamen"
-      public: "Benutzern erlauben, die Gruppenzugehörigkeit frei zu wechseln (Erfordert, dass die Gruppe sichtbar ist)"
+      public: "Nutzenden erlauben, die Gruppe eigenständig zu betreten/zu verlassen (nur bei öffentlich sichtbaren Gruppen) "
       empty:
         posts: "Es gibt keine Beiträge von Mitgliedern dieser Gruppe."
         members: "Es gibt keine Mitglieder in dieser Gruppe."
@@ -377,7 +374,6 @@ de:
       bio: "Über die Gruppe"
       selector_placeholder: "Mitglieder hinzufügen"
       owner: "Eigentümer"
-      visible: "Gruppe ist für alle Benutzer sichtbar"
       index:
         title: "Gruppen"
         empty: "Es gibt keine sichtbaren Gruppen."
@@ -391,6 +387,12 @@ de:
       mentions: "Erwähnungen"
       messages: "Nachrichten"
       notification_level: "Standard-Benachrichtigungsstufe für Gruppen-Nachrichten"
+      visibility_levels:
+        title: "Wer kann diese Gruppe sehen?"
+        public: "Alle"
+        members: "Gruppenbesitzer, Mitglieder und Admins"
+        staff: "Gruppenbesitzer und Team"
+        owners: "Gruppenbesitzer und Admins"
       alias_levels:
         title: "Wer kann diese Gruppe kontaktieren und per @Gruppenname erwähnen?"
         nobody: "Niemand"
@@ -488,7 +490,7 @@ de:
       mute: "Stummschalten"
       edit: "Einstellungen bearbeiten"
       download_archive:
-        button_text: "Meine Beiträge herunterladen"
+        button_text: "Alle herunterladen"
         confirm: "Möchtest du wirklich deine Beiträge herunterladen?"
         success: "Der Export wurde gestartet. Du erhältst eine Nachricht, sobald der Vorgang abgeschlossen ist."
         rate_limit_error: "Beiträge können pro Tag nur einmal heruntergeladen werden. Bitte versuch es morgen wieder."
@@ -558,6 +560,7 @@ de:
       watched_first_post_tags_instructions: "Du erhältst eine Benachrichtigung für den ersten Beitrag in jedem neuen Thema mit diesen Schlagwörtern."
       muted_categories: "Stummgeschaltet"
       muted_categories_instructions: "Du erhältst keine Benachrichtigungen über neue Themen in dieser Kategorie und die Themen werden auch nicht in der Liste der aktuellen Themen erscheinen."
+      no_category_access: "Moderaturen haben eingeschränkte Kategorien-Berechtigungen, Speichern ist nicht verfügbar."
       delete_account: "Lösche mein Benutzerkonto"
       delete_account_confirm: "Möchtest du wirklich dein Benutzerkonto permanent löschen? Diese Aktion kann nicht rückgängig gemacht werden!"
       deleted_yourself: "Dein Benutzerkonto wurde erfolgreich gelöscht."
@@ -617,7 +620,6 @@ de:
         title: "Benutzernamen ändern"
         confirm: "Wenn du deinen Benutzernamen änderst, werden alle vorherigen Zitate deiner Beiträge und Erwähnungen deines vorherigen @Namens nicht mehr funktonieren. Bist du dir ganz sicher, dass du das tun möchtest?"
         taken: "Der Benutzername ist bereits vergeben."
-        error: "Bei der Änderung deines Benutzernamens ist ein Fehler aufgetreten."
         invalid: "Der Benutzernamen ist nicht zulässig. Er darf nur Zahlen und Buchstaben enthalten."
       change_email:
         title: "E-Mail-Adresse ändern"
@@ -753,6 +755,9 @@ de:
         expired: "Diese Einladung ist abgelaufen."
         rescind: "Einladung zurücknehmen"
         rescinded: "Einladung zurückgenommen"
+        rescind_all: "Alle Eingeladungen entfernen"
+        rescinded_all: "Alle Einladungen wurden entfernt!"
+        rescind_all_confirm: "Alle Einladungen wirklich entfernen?"
         reinvite: "Einladung erneut senden"
         reinvite_all: "Alle Einladungen erneut senden"
         reinvite_all_confirm: "Bist Du dir sicher alle Einladungen nochmals zu senden?"
@@ -935,6 +940,8 @@ de:
       complete_email_found: "Wir haben ein zu <b>%{email}</b> gehörendes Benutzerkonto gefunden. Du solltest in Kürze eine E-Mail mit Anweisungen zum Zurücksetzen deines Passwortes erhalten."
       complete_username_not_found: "Es gibt kein Konto mit dem Benutzernamen <b>%{username}</b>"
       complete_email_not_found: "Es gibt kein Benutzerkonto für <b>%{email}</b>"
+      button_ok: "OK"
+      button_help: "Hilfe"
     login:
       title: "Anmelden"
       username: "Benutzername"
@@ -993,7 +1000,9 @@ de:
       your_email: "Die E-Mail-Adresse deines Benutzerkontos ist <b>%{email}</b>"
       accept_invite: "Einladung annehmen"
       success: "Dein Konto wurde erstellt und du bist jetzt angemeldet."
-      password_label: "Passwort setzen (optional)"
+      name_label: "Name"
+      password_label: "Wähle ein Passwort"
+      optional_description: "(optional)"
     password_reset:
       continue: "Weiter zu %{site_name}"
     emoji_set:
@@ -1002,6 +1011,7 @@ de:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Windows 10"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "nur Kategorien"
       categories_with_featured_topics: "Kategorien mit empfohlenen Themen"
@@ -1016,6 +1026,7 @@ de:
       options: "Optionen"
       whisper: "flüstern"
       unlist: "unsichtbar"
+      blockquote_text: "Blockquote"
       add_warning: "Dies ist eine offizielle Warnung."
       toggle_whisper: "Flüstermodus umschalten"
       toggle_unlisted: "Unsichtbar umschalten"
@@ -1213,6 +1224,7 @@ de:
           seen: Gelesene Themen/Beiträge
           unseen: Ungelesene Themen/Beiträge
           wiki: Wikis
+          all_tags: Enthält alle Schlagwörter
         statuses:
           label: 'Themen einschränken:'
           open: Offene Themen
@@ -1659,6 +1671,7 @@ de:
         has_liked: "dir gefällt dieser Beitrag"
         undo_like: "gefällt mir nicht mehr"
         edit: "diesen Beitrag bearbeiten"
+        edit_action: "Bearbeiten"
         edit_anonymous: "Entschuldige, du musst angemeldet sein, um diesen Beitrag zu bearbeiten."
         flag: "Diesen Beitrag den Moderatoren melden oder eine Nachricht senden."
         delete: "diesen Beitrag löschen"
@@ -1763,10 +1776,6 @@ de:
         confirm:
           one: "Möchtest du wirklich diesen Beitrag löschen?"
           other: "Möchtest du wirklich all diese Beiträge löschen?"
-      merge:
-        confirm:
-          one: "Möchtest du diese Beiträge wirklich zusammenführen?"
-          other: "Möchtest du diese {{count}} Beiträge wirklich zusammenführen?"
       revisions:
         controls:
           first: "Erste Überarbeitung"
@@ -1812,8 +1821,6 @@ de:
       settings: 'Einstellungen'
       topic_template: "Themenvorlage"
       tags: "Schlagwörter"
-      tags_allowed_tags: "Schlagwörter, die nur in dieser Kategorie verwendet werden können:"
-      tags_allowed_tag_groups: "Schlagwortgruppen, die nur in dieser Kategorie verwendet werden können:"
       tags_placeholder: "(Optional) Liste erlaubter Schlagwörter"
       tag_groups_placeholder: "(Optional) Liste erlaubter Schlagwort-Gruppen"
       topic_featured_link_allowed: "Erlaube hervorgehobene Links in dieser Kategorie"
@@ -2631,9 +2638,6 @@ de:
           updating: "Wird aktualisiert..."
           up_to_date: "Theme ist aktuell, zuletzt geprüft:"
           add: "Hinzufügen"
-          commits_behind:
-            one: "Theme ist 1 Commit hinterher!"
-            other: "Theme ist {{count}} Commits hinterher!"
           scss:
             text: "CSS"
             title: "Gib benutzerdefiniertes CSS ein, wir akzeptieren alle gültigen CSS und SCSS-Stile"
@@ -2780,6 +2784,8 @@ de:
           block: "blockieren"
           do_nothing: "nichts tun"
         staff_actions:
+          all: "alle"
+          filter: "Filter:"
           title: "Team-Aktionen"
           clear_filters: "Alles anzeigen"
           staff_user: "Team-Mitglied"
@@ -2833,6 +2839,8 @@ de:
             change_readonly_mode: "Nur-Lesen-Modus ändern"
             backup_download: "Backup herunterladen"
             backup_destroy: "Backup löschen"
+            reviewed_post: "Geprüfter Beitrag"
+            custom_staff: "plugin-spezifische Aktion"
         screened_emails:
           title: "Gefilterte E-Mails"
           description: "Wenn jemand ein Konto erstellt, werden die folgenden E-Mail-Adressen überprüft und es wird die Anmeldung blockiert oder eine andere Aktion ausgeführt."
@@ -3005,6 +3013,7 @@ de:
         reset_bounce_score:
           label: "Zurücksetzen"
           title: "Anzahl unzustellbarer E-Mails auf 0 zurücksetzen"
+        visit_profile: "Besuche die <a href='%{url}'>Benutzer-Einstellungen</a>, um dieses Profil zu bearbeiten"
         deactivate_explanation: "Ein deaktivierter Benutzer muss seine E-Mail-Adresse erneut bestätigen."
         suspended_explanation: "Ein gesperrter Benutzer kann sich nicht anmelden."
         block_explanation: "Ein geblockter Benutzer kann keine Themen erstellen oder Beiträge veröffentlichen."
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 243923621a0..440384768a7 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -17,7 +17,7 @@ el:
           units:
             byte:
               one: Byte
-              other: Byte
+              other: Bytes
             gb: GB
             kb: KB
             mb: MB
@@ -66,8 +66,8 @@ el:
         almost_x_years:
           one: "1χ"
           other: "%{count}έ"
-        date_month: "DD ΜΜΜ"
-        date_year: "ΜΜΜ 'ΕΕ"
+        date_month: "DD MMM"
+        date_year: "MMM 'YY"
       medium:
         x_minutes:
           one: "1 λεπτό"
@@ -78,7 +78,7 @@ el:
         x_days:
           one: "1 ημέρα"
           other: "%{count} ημέρες"
-        date_year: "ΜΜΜ Η, 'ΕΕ"
+        date_year: "MMM Η, 'YY"
       medium_with_ago:
         x_minutes:
           one: "πριν από 1 λεπτό "
@@ -101,6 +101,7 @@ el:
           other: "%{count} χρόνια μετά"
       previous_month: 'Προηγούμενος μήνας'
       next_month: 'Επόμενος μήνας'
+      placeholder: Επιλέξτε ημερομηνία
     share:
       topic: 'κοινοποίησε έναν σύνδεσμο προς αυτό το νήμα'
       post: 'Ανάρτηση #%{postNumber}'
@@ -110,7 +111,7 @@ el:
       google+: 'κοινοποίησε τον σύνδεσμο στο Google+'
       email: 'στείλε αυτόν τον σύνδεσμο με ένα μήνυμα ηλεκτρονικού ταχυδρομείου'
     action_codes:
-      public_topic: "έκανε το θέμα δημόσιο στις ${when}"
+      public_topic: "έκανε το θέμα δημόσιο στις %{when}"
       private_topic: "έκανε το θέμα ιδιωτικό στις %{when}"
       split_topic: "διαχώρισε αυτό το θέμα στις %{when}"
       invited_user: "προσκάλεσε τον χρήστη %{who} στις %{when}"
@@ -136,28 +137,32 @@ el:
         enabled: 'καταχωρήθηκε %{when}'
         disabled: 'μη καταχωρημένο %{when}'
       banner:
-        enabled: 'έγινε μπάνερ %{when}. Θα εμφανίζεται στην κορυφή κάθε σελίδας μέχρι να απορριφθεί από τον χρήστη.'
-        disabled: 'αφαιρέθηκε μπάνερ %{when}. Δεν θα εμφανίζεται πια στην κορυφή κάθε σελίδας.'
+        enabled: 'το έκανε μπάνερ στις %{when}. Θα εμφανίζεται στην κορυφή κάθε σελίδας μέχρι να απορριφθεί από τον χρήστη.'
+        disabled: 'αφαίρεσε αυτό το μπάνερ %{when}. Δεν θα εμφανίζεται πλέον στην κορυφή κάθε σελίδας.'
     topic_admin_menu: "Διαχείριση νήματος"
     wizard_required: "Καλώς ήλθατε στο νέο σας Discourse! Ας αρχίσουμε με τον <a href='%{url}' data-auto-route='true'>οδηγό εγκατάστασης</a> ✨"
     emails_are_disabled: "Τα εξερχόμενα μηνύματα ηλεκτρονικού ταχυδρομείου έχουν απενεργοποιηθεί από κάποιον διαχειριστή. Δε θα σταλεί κανένα μήνυμα ηλεκτρονικού ταχυδρομείου."
     bootstrap_mode_enabled: "Για να κάνουμε την έναρξη της νέα σας ιστοσελίδας ευκολότερη, βρίσκεστε σε λειτουργία εκκίνησης. Όλοι οι νέοι χρήστες θα χορηγούνται επίπεδο εμπιστοσύνης 1 και θα έχουν τις ενημερώσεις από καθημερινή συνοπτική συλλογή email ενεργοποιημένες. Αυτό θα απενεργοποιηθεί αυτόματα όταν ο συνολικός αριθμός των χρηστών ξεπεράσει τους %{min_users} χρήστες."
     bootstrap_mode_disabled: "Η λειτουργία εκκίνησης θα απενεργοποιηθεί αυτόματα στις επόμενες 24 ώρες."
+    themes:
+      default_description: "Προεπιλογή"
     s3:
       regions:
-        us_east_1: "Ανατολικές ΗΠΑ (Β. Βιρτζίνια)"
-        us_west_1: "Δυτικές ΗΠΑ (Β. Καλιφόρνια)"
-        us_west_2: "Δυτικές ΗΠΑ (Όρεγκον)"
-        us_gov_west_1: "AWS GovCloud (ΗΠΑ)"
-        eu_west_1: "ΕΕ (Ιρλανδία)"
-        eu_central_1: "ΕΕ (Φρανκφούρτη)"
-        ap_southeast_1: "Ασία-Ειρηνικός (Σιγκαπούρη)"
-        ap_southeast_2: "Ασία-Ειρηνικός (Σίδνεϊ)"
-        ap_south_1: "Ασία - Ειρηνικός (Μομβάη)"
         ap_northeast_1: "Ασία-Ειρηνικός (Τόκιο)"
         ap_northeast_2: "Ασία-Ειρηνικός (Σεούλ)"
-        sa_east_1: "Ασία-Ειρηνικός (Σάο Πάολο)"
-        cn_north_1: "Κίνα(Πεκίνο)"
+        ap_south_1: "Ασία - Ειρηνικός (Μομβάη)"
+        ap_southeast_1: "Ασία-Ειρηνικός (Σιγκαπούρη)"
+        ap_southeast_2: "Ασία-Ειρηνικός (Σίδνεϊ)"
+        cn_north_1: "Κίνα (Πεκίνο)"
+        eu_central_1: "ΕΕ (Φρανκφούρτη)"
+        eu_west_1: "ΕΕ (Ιρλανδία)"
+        eu_west_2: "EU (Λονδίνο)"
+        sa_east_1: "Νότια Αμερική (Σάο Πάολο)"
+        us_east_1: "Ανατολικές ΗΠΑ (Β. Βιρτζίνια)"
+        us_east_2: "Ανατολικές ΗΠΑ (Οχάιο)"
+        us_gov_west_1: "AWS GovCloud (ΗΠΑ)"
+        us_west_1: "Δυτικές ΗΠΑ (Β. Καλιφόρνια)"
+        us_west_2: "Δυτικές ΗΠΑ (Όρεγκον)"
     edit: 'αλλαγή του τίτλου και την κατηγορίας του νήματος'
     not_implemented: "Λυπούμαστε! Αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα."
     no_value: "Όχι"
@@ -175,11 +180,11 @@ el:
     links: "Σύνδεσμοι"
     links_lowercase:
       one: "Σύνδεσμος"
-      other: "Σύνδεσμοι"
+      other: "σύνδεσμοι"
     faq: "Συχνές ερωτήσεις"
     guidelines: "Οδηγίες"
-    privacy_policy: "Πολιτική προστασίας δεδομένων"
-    privacy: "Προστασία δεδομένων"
+    privacy_policy: "Πολιτική Απορρήτου"
+    privacy: "Ιδιωτικότητα"
     terms_of_service: "Όροι χρήσης"
     mobile_view: "Προβολή για κινητό"
     desktop_view: "Προβολή για σταθερό υπολογιστή"
@@ -218,7 +223,7 @@ el:
       topic_count: "Νήματα"
       post_count: "Αναρτήσεις"
       user_count: "Χρήστες"
-      active_user_count: "Ενεργός χρήστης"
+      active_user_count: "Ενεργοί Χρήστες"
       contact: "Επικοινώνησε μαζί μας"
       contact_info: "Σε περίπτωση που προκύψει κάποιο κρίσιμο πρόβλημα ή κάποιο επείγον θέμα που αφορά αυτόν τον ιστότοπο, παρακαλούμε να επικοινωνήσεις μαζί μας στο %{contact_info}."
     bookmarked:
@@ -261,7 +266,7 @@ el:
     switch_to_anon: "Έναρξη κατάστασης ανωνυμίας"
     switch_from_anon: "Τερματισμός κατάστασης ανωνυμίας"
     banner:
-      close: "Απομάκρυνε αυτή την εικόνα"
+      close: "Απομάκρυνε αυτό το banner"
       edit: "Επεξεργάσου αυτό το banner >>"
     choose_topic:
       none_found: "Δεν βρέθηκαν νήματα."
@@ -291,7 +296,7 @@ el:
           other: "Έχετε <strong>{{count}}</strong> εκκρεμείς αναρτήσεις."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ανάρτησε το νήμα <a href='{{topicUrl}}'></a>"
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ανάρτησε <a href='{{topicUrl}}'>το νήμα </a>"
       you_posted_topic: "<a href='{{userUrl}}'>Ανάρτησες</a> αυτό <a href='{{topicUrl}}'>το νήμα</a>"
       user_replied_to_post: "Ο/Η <a href='{{userUrl}}'>{{user}}</a> απάντησε στο <a href='{{postUrl}}'>{{post_number}}</a>"
       you_replied_to_post: "<a href='{{userUrl}}'>Απάντησες</a> στο νήμα <a href='{{postUrl}}'>{{post_number}}</a>"
@@ -308,7 +313,7 @@ el:
       filter_name: "φιλτράρισμα με βάση το όνομα χρήστη"
       title: "Χρήστες"
       likes_given: "Δόθηκαν"
-      likes_received: "Λήφθηκαν"
+      likes_received: "Λήφθησαν"
       topics_entered: "Προβλήθηκαν"
       topics_entered_long: "Θέματα που προβλήθηκαν"
       time_read: "Ωρα ανάγνωσης"
@@ -323,21 +328,21 @@ el:
       posts_read_long: "Διαβασμένες αναρτήσεις"
       total_rows:
         one: "1 χειριστής"
-        other: "%{count} χειριστές"
+        other: "%{count} χρήστες"
     group_histories:
       actions:
         change_group_setting: "Αλλαγή ρυθμίσεων ομάδας"
         add_user_to_group: "Προσθήκη χρήστη"
         remove_user_from_group: "Αφαίρεση χρήστη"
         make_user_group_owner: "Κάνε ιδιοκτήτη"
-        remove_user_as_group_owner: "Απόσυρε ιδιοκτήτη"
+        remove_user_as_group_owner: "Απέσυρε ιδιοκτήτη"
     groups:
       logs:
         title: "Αρχεία καταγραφής"
         when: "Όταν"
         action: "Δράση"
-        acting_user: "Δραστήριοι χρήστες"
-        target_user: "Χρήστης στόχος"
+        acting_user: "Ενεργοί χρήστες"
+        target_user: "Επιδιοκώμενος χρήστη"
         subject: "Θέμα"
         details: "Λεπτομέρειες"
         from: "Από"
@@ -346,12 +351,9 @@ el:
         title: 'Επεξεργασία ομάδας'
         full_name: 'Ονοματεπώνυμο'
         add_members: "Προσθήκη μελών"
-        delete_member_confirm: "Ναι αφαιρεθεί ο/η '%{username}' από την '%{group}' ομάδα;"
-      request_membership_pm:
-        title: "Αίτηση μέλους"
-        body: "Θα ήθελα να κάνω αίτηση για να γίνω μέλος στο @% {groupname}"
+        delete_member_confirm: "Να αφαιρεθεί ο/η '%{username}' από την '%{group}' ομάδα;"
       name_placeholder: "Όνομα ομάδας, χωρίς κενά, ίδιοι κανόνες με τους κανόνες για το όνομα χρήστη"
-      public: "'Ολοι οι χρήστες μπορούν να συμετάσχουν/ αποχωρίσουν απο την ομάδα ελεύθερα. (Η ομάδα πρέπει να είναι φανερή)"
+      public: "Επέτρεψε στους χρήστες να συμμετέχουν/αποχωρούν ελεύθερα στην ομάδα (Απαιτεί δημόσια ορατή ομάδα)"
       empty:
         posts: "Δεν υπάρχουν δημοσιεύσεις από μέλη της ομάδας."
         members: "Δεν υπάρχουν μέλη σε αυτή την ομάδα."
@@ -361,18 +363,18 @@ el:
         logs: "Δεν υπάρχουν αρχεία καταγραφής για αυτή την ομάδα."
       add: "Προσθήκη"
       join: "Συμμετοχή στην ομάδα"
-      leave: "Απομάκρυνση από την ομάδα"
+      leave: "Αποχώρηση από την ομάδα"
       request: "Αίτημα για συμμετοχή στην ομάδα"
       automatic_group: Αυτόματη ομάδα
       closed_group: Κλειστή ομάδα
       is_group_user: "Είσαι μέλος αυτής της ομάδας"
+      allow_membership_requests: "Επιτρέψτε στα μέλη να στέλνουν αιτήματα συμμετοχής στους ιδιοκτήτες ομάδων"
       membership: "Ιδιότητα μέλους"
       name: "Όνομα"
       user_count: "Αριθμός μελών"
       bio: "Σχετικά με την ομάδα"
       selector_placeholder: "Προσθήκη μελών"
       owner: "ιδιοκτήτης"
-      visible: "Η ομάδα είναι ορατή σε όλους τους χρήστες"
       index:
         title: "Ομάδες"
         empty: "Δεν υπάρχουν ορατές ομάδες."
@@ -385,6 +387,13 @@ el:
       posts: "Αναρτήσεις"
       mentions: "Αναφορές"
       messages: "Μηνύματα"
+      notification_level: "Προκαθορισμένο επίπεδο ειδοποιήσεων για μηνύματα ομάδων"
+      visibility_levels:
+        title: "Ποιος μπορεί να δει αυτή την ομάδα;"
+        public: "Όλοι"
+        members: "Ιδιοκτήτες ομάδας, μέλη και διαχειριστές"
+        staff: "Ιδιοκτήτες ομάδας και προσωπικό"
+        owners: "Ιδιοκτήτες ομάδας και διαχειριστές"
       alias_levels:
         title: "Ποιός μπορεί να στείλει μήνυμα και να @αναφέρει αυτή την ομάδα?"
         nobody: "Κανένας"
@@ -412,12 +421,12 @@ el:
           title: "Σε σιγή"
           description: "Δε θα λαμβάνεις ποτέ ειδοποιήσεις για οτιδήποτε σχετικά με τις καινούριες δημοσιεύσεις της ομάδας."
       flair_url: "Avatar Flair εικόνα"
-      flair_url_placeholder: "( προαιρετικό) Εικόνα URL ή Font Awesome κατηγορία "
+      flair_url_placeholder: "(προαιρετικό) URL εικόνας ή Font Awesome κατηγορία "
       flair_bg_color: "Avatar Flair χρώμα φόντου"
       flair_bg_color_placeholder: "(Προαιρετικό) Τιμή χρώματος Hex"
       flair_color: "Avatar Flair χρώμα"
       flair_color_placeholder: "(Προαιρετικό) Τιμή χρώματος Hex"
-      flair_preview_icon: "Προεπισκόπηση εικονίσματος"
+      flair_preview_icon: "Προεπισκόπηση εικονιδίου"
       flair_preview_image: "Προεπισκόπηση εικόνας"
       flair_note: "Σημείωση: Το Flair θα εμφανιστεί μονο για την κύρια ομάδα του χρήστη"
     user_action_groups:
@@ -443,15 +452,15 @@ el:
         title: "Επαναταξινόμησε τις κατηγορίες"
         title_long: "Αναδιοργάνωση της λίστας κατηγοριών"
         fix_order: "Σταθερές θέσεις"
-        fix_order_tooltip: "Δε έχουν όλες οι κατηγορίες μοναδικό νούμερο θέσης, το οποίο ίσως προκαλέσει αναπάντεχα αποτελέσματα."
-        save: "Αποθήκευση εντολής"
+        fix_order_tooltip: "Δεν έχουν όλες οι κατηγορίες μοναδικό νούμερο θέσης, το οποίο ίσως προκαλέσει αναπάντεχα αποτελέσματα."
+        save: "Αποθήκευση Κατάταξης"
         apply_all: "Εφαρμογή"
         position: "Θέση"
       posts: "Αναρτήσεις"
       topics: "Νήματα"
-      latest: "Τελευταία νήματα"
-      latest_by: "τελευταία ανάρτηση από τον/την"
-      toggle_ordering: "Αλλαγή ταξινόμησης"
+      latest: "Πρόσφατες"
+      latest_by: "πρόσφατα από"
+      toggle_ordering: "εναλλαγή ταξινόμησης"
       subcategories: "Υποκατηγορίες"
       topic_sentence:
         one: "1 θέμα"
@@ -462,13 +471,13 @@ el:
     ip_lookup:
       title: Αναζήτηση διεύθυνσης IP
       hostname: Όνομα εξυπηρετητή
-      location: Διεύθυνση
+      location: Τοποθεσία
       location_not_found: (άγνωστο)
       organisation: Οργάνωση
       phone: Τηλέφωνο
       other_accounts: "Άλλοι λογαριασμοί με αυτή την IP διεύθυνση:"
       delete_other_accounts: "Διαγραφή %{count}"
-      username: "Όνομα χρήστη"
+      username: "χρηστώνυμο"
       trust_level: "TL"
       read_time: "χρόνος ανάγνωσης"
       topics_entered: "νήματα που είδες"
@@ -482,9 +491,9 @@ el:
       mute: "Σίγαση"
       edit: "Επεξεργασία ρυθμίσεων"
       download_archive:
-        button_text: "Κάνω λήψη των δημοσιεύσεων μου"
+        button_text: "Λήψη Όλων"
         confirm: "Είσαι σίγουρος πως θέλεις να κάνεις λήψη των δημοσιεύσεων σου;"
-        success: "Όταν θα αρχίσει να κατεβαίνει το αρχείο, θα ειδοποιηθείται μέσω μυνήματος μόλις ολοκληρωθεί η διαδικασία."
+        success: "Ξεκίνησε η διαδικασία λήψης. Θα ειδοποιηθείτε ]μόλις ολοκληρωθεί η διαδικασία."
         rate_limit_error: "Μπορείς να κάνεις λήψη των δημοσιεύσεών σου μια φορά την ημέρα, προσπάθησε ξανά αύριο."
       new_private_message: "Νέο Μήνυμα"
       private_message: "Μήνυμα"
@@ -497,7 +506,7 @@ el:
       invited_by: "Προσκλήθηκε από τον/την"
       trust_level: "Επίπεδο εμπιστοσύνης"
       notifications: "Ειδοποιήσεις"
-      statistics: "Αναλυτικά στοιχεία"
+      statistics: "Στατιστικά"
       desktop_notifications:
         label: "Ειδοποιήσεις στην επιφάνεια εργασίας"
         not_supported: "Οι ειδοποιήσεις δεν υποστηρίζονται από αυτό το πρόγραμμα περιήγησης. Λυπάμαι."
@@ -506,12 +515,13 @@ el:
         perm_denied_expl: "Απορρίψατε την άδεια για ειδοποιήσεις. Επιτρέψτε τις ειδοποιήσεις μέσω των ρυθμίσεων του φυλλομετρητή σας."
         disable: "Απενεργοποίηση ειδοποιήσεων"
         enable: "Ενεργοποίηση ειδοποιήσεων"
-        each_browser_note: "Σημείωση: Έχετε αλλάξει αυτή τη ρύθμιση σε κάθε φυλλομετρητή που χρησιμοποιείτε."
-      dismiss_notifications: "Διώξτα όλα"
+        each_browser_note: "Σημείωση: Θα πρέπει να αλλάξετε αυτή τη ρύθμιση σε κάθε φυλλομετρητή που χρησιμοποιείτε."
+      dismiss_notifications: "Απόρριψη όλων"
       dismiss_notifications_tooltip: "Όλες οι αδιάβαστες ειδοποιήσεις να χαρακτηριστούν διαβασμένες"
       first_notification: "Η πρώτη σου ειδοποίηση! Επίλεξε την για να ξεκινήσεις."
       disable_jump_reply: "Να μην εστιάζεται η ανάρτηση μου αφ' ότου απαντήσω"
       dynamic_favicon: "Δείξε τον αριθμό νέων/ενημερωμένων αναρτήσεων στο εικονίδιο του προγράμματος περιήγησης"
+      theme_default_on_all_devices: "Αυτό να γίνει το προεπιλεγμένο θέμα σε όλες μου τις συσκευές"
       external_links_in_new_tab: "Άνοιγε όλους τους εξωτερικούς συνδέσμους σε νέα καρτέλα"
       enable_quoting: "Το κείμενο που επισημαίνεται να παρατίθεται στην απάντηση "
       change: "αλλαγή"
@@ -551,22 +561,25 @@ el:
       watched_first_post_tags_instructions: "Θα ειδοποιηθείς για την πρώτη δημοσίευση του κάθε καινούριου θέματος με αυτές τις ετικέτες. "
       muted_categories: "Σε σίγαση"
       muted_categories_instructions: "Δε θα λαμβάνεις ειδοποιήσεις για τίποτα σχετικά με τις καινούριες δημοσιεύσεις σε αυτές τις κατηγορίες, και δε θα εμφανίζονται στα τελευταία."
+      no_category_access: "Ως συντονιστής έχεις περιορισμένη πρόσβαση στην κατηγορία, η αποθήκευση είναι απενεργοποιημένη."
       delete_account: "Διαγραφή του λογαριασμού μου "
       delete_account_confirm: "Είσαι σίγουρος πως θέλεις να διαγράψεις μόνιμα τον λογαριασμό σου; Αυτή η πράξη είναι μη αναστρέψιμη."
       deleted_yourself: "Ο λογαριασμός σου διαγράφηκε."
       delete_yourself_not_allowed: "Δεν μπορείς να διαγράψεις τον λογαριασμό σου αυτή την στιγμή. Επικοινώνησε με έναν διαχειριστή για να τον διαγράψει αυτός για σένα."
       unread_message_count: "Μηνύματα"
       admin_delete: "Διαγραφή"
-      users: "χειριστές"
+      users: "Χρήστες"
       muted_users: "Σε σίγαση"
-      muted_users_instructions: "Αποσιώπησε όλες τις ειδοποιήσεις από αυτούς τους χειριστές"
+      muted_users_instructions: "Αποσιώπησε όλες τις ειδοποιήσεις από αυτούς τους χρήστες."
       muted_topics_link: "Δείξε τα νήματα που είναι σε σίγαση"
       watched_topics_link: "Δείξε τα νήματα που παρακολουθούνται"
+      tracked_topics_link: "Δείξτε τα νήματα που παρακολουθούνται"
       automatically_unpin_topics: "Τα νήματα ξεκαρφιτσώνονται αυτόματα όταν φτάνω στο κάτω μέρος."
       apps: "Εφαρμογές"
       revoke_access: "Ανάκληση πρόσβασης"
       undo_revoke_access: "Απενεργοποίηση ανάκλησης πρόσβασης"
       api_approved: "Εγκεκριμένο:"
+      theme: "Θέμα"
       staff_counters:
         flags_given: "χρήσιμες σημάνσεις"
         flagged_posts: "Επισημασμένες αναρτήσεις"
@@ -584,6 +597,15 @@ el:
         move_to_archive: "Αρχείο"
         failed_to_move: "Αποτυχία μετακίνησης των επιλεγμένων μηνυμάτων (πιθανόν δεν υπάρχει σύνδεση στο δίκτυο)"
         select_all: "Επιλογή όλων"
+      preferences_nav:
+        account: "Λογαριασμός"
+        profile: "Προφίλ"
+        emails: "Emails"
+        notifications: "Ειδοποιήσεις"
+        categories: "Κατηγορίες"
+        tags: "Εττικέτες"
+        interface: "Διεπαφή"
+        apps: "Εφαρμογές"
       change_password:
         success: "(το μήνυμα ηλεκτρονικού ταχυδρομείου στάλθηκε)"
         in_progress: "(αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου)"
@@ -599,7 +621,6 @@ el:
         title: "Αλλαγή χρηστώνυμου"
         confirm: "Εάν αλλάξεις το όνομα χρήστη σου, όλες οι προηγούμενες παραθέσεις των δημοσιεύσεων σου και οι αναφορές στο @όνομά σου θα χαθούν. Είσαι απόλυτα βέβαιος πως θέλεις;"
         taken: "Λυπούμαστε, αυτό το χρηστώνυμο χρησιμοποιείται ήδη."
-        error: "Παρουσιάστηκε σφάλμα κατά την αλλαγή του χρηστώνυμου."
         invalid: "Αυτό το χρηστώνυμο δεν είναι έγκυρο. Θα πρέπει να αποτελείται μόνο από αριθμούς και γράμματα"
       change_email:
         title: "Αλλαγή διεύθυνσης ηλεκτρονικού ταχυδρομείου"
@@ -626,7 +647,7 @@ el:
         instructions: "Οι εικόνες στο φόντο θα κεντραρίζονται και το προκαθορισμένο πλάτος τους είναι 590px."
       email:
         title: "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
-        instructions: "Να μην εμφανίζεται ποτέ δημόσια"
+        instructions: "δεν εμφανίζεται ποτέ δημόσια"
         ok: "Για επιβεβαίωση θα σου στείλουμε ένα μήνυμα ηλεκτρονικού ταχυδρομείου"
         invalid: "Παρακαλώ δώσε μία έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
         authenticated: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σου ταυτοποιήθηκε από τον πάροχο {{provider}}"
@@ -663,7 +684,7 @@ el:
       last_seen: "Ειδώθηκε"
       created: "Μέλος από"
       log_out: "Αποσύνδεση"
-      location: "Διεύθυνση"
+      location: "Τοποθεσία"
       card_badge:
         title: "Παράσημο καρτέλας χρήστη"
       website: "Ιστοσελίδα"
@@ -676,7 +697,7 @@ el:
         never: "Ποτέ"
       email_previous_replies:
         title: "Συμπερίλαβε προηγούμενες απαντήσεις στο κάτω μέρος των ηλεκτρονικών μηνυμάτων"
-        unless_emailed: "Εάν δεν έχει σταλεί προηγουμένως"
+        unless_emailed: "εάν δεν έχει σταλεί προηγουμένως"
         always: "πάντα"
         never: "ποτέ"
       email_digests:
@@ -684,9 +705,9 @@ el:
         every_30_minutes: "κάθε 30 λεπτά"
         every_hour: "ωριαία"
         daily: "καθημερινά"
-        every_three_days: "Κάθε τρεις μέρες"
+        every_three_days: "κάθε τρεις μέρες"
         weekly: "εβδομαδιαία"
-        every_two_weeks: "Κάθε τρεις μέρες"
+        every_two_weeks: "κάθε δύο εβδομάδες"
       include_tl0_in_digests: "Συμπεριλάμβανε περιεχόμενο από νέους χρήστες σε περιληπτικά μηνύματα"
       email_in_reply_to: "Συμπερίλαβε ένα απόσπασμα της απάντησης για να το δημοσιεύσεις σέ ηλεκτρονικό μήνυμα"
       email_direct: "Στείλε μου ένα μήνυμα ηλεκτρονικού ταχυδρομείου όταν κάποιος παραθέσει ανάρτησή μου, απαντήσει σε ανάρτησή μου, αναφέρει το @username μου ή με προσκαλεί σε ένα νήμα."
@@ -698,10 +719,10 @@ el:
         label: "Τα νήματα να θεωρούνται νέα όταν"
         not_viewed: "Δεν τα έχω δει αυτά ακόμη"
         last_here: "δημιουργήθηκαν από την τελευταία επίσκεψή μου"
-        after_1_day: "δημιουργήθηκε την τελευταία ημέρα"
-        after_2_days: "δημιουργήθηκε τις 2 τελευταίες ημέρες"
+        after_1_day: "δημιουργήθηκαν την τελευταία ημέρα"
+        after_2_days: "δημιουργήθηκαν τις 2 τελευταίες ημέρες"
         after_1_week: "δημιουργήθηκαν την τελευταία εβδομάδα"
-        after_2_weeks: "δημιουργήθηκε τις 2 τελευταίες εβδομάδες"
+        after_2_weeks: "δημιουργήθηκαν τις 2 τελευταίες εβδομάδες"
       auto_track_topics: "Τα νήματα που βλέπω να παρακολουθούνται αυτόματα "
       auto_track_options:
         never: "ποτέ"
@@ -713,7 +734,7 @@ el:
         after_4_minutes: "μετά από 4 λεπτά"
         after_5_minutes: "μετά από 5 λεπτά"
         after_10_minutes: "μετά από 10 λεπτά"
-      notification_level_when_replying: "Όταν δημοσιοποιώ ένα νήμα, τοποθέτησε αυτό το νήμα σε"
+      notification_level_when_replying: "Όταν δημοσιοποιώ σε ένα νήμα, τοποθέτησε αυτό το νήμα σε"
       invited:
         search: "γράψε για να αναζητήσεις προσκλήσεις..."
         title: "Προσκλήσεις"
@@ -722,7 +743,7 @@ el:
         none: "Δεν υπάρχουν προσκλήσεις σε εκκρεμότητα να σου δείξω."
         truncated:
           one: "Δείχνοντας την πρώτη πρόσκληση."
-          other: "Δείχνοντας την πρώτη {{count}} προσκλήσεις."
+          other: "Προβάλονται οι πρώτες {{count}} προσκλήσεις."
         redeemed: "Προσκλήσεις που έγιναν αποδεκτές"
         redeemed_tab: "Εξοφλήθηκε"
         redeemed_tab_with_count: "Εξοφλήθηκε ({{count}})"
@@ -735,17 +756,21 @@ el:
         expired: "Αυτή η πρόσκληση έχει λήξει."
         rescind: "Αναίρεση πρόσκλησης"
         rescinded: "Η πρόσκληση αναιρέθηκε"
+        rescind_all: "Αναίρεσε όλες τις προσκλήσεις"
+        rescinded_all: "Όλες οι προσκλήσεις αναιρέθηκαν!"
+        rescind_all_confirm: "Θέλετε σίγουρα να αναιρέσετε όλες τις προσκλήσεις;"
         reinvite: "Επαναποστολή πρόσκλησης"
         reinvite_all: "Αποστολή ξανά όλων των προσκλήσεων"
+        reinvite_all_confirm: "Σίγουρα θέλετε να στείλετε ξανά όλες τις προσκλήσεις;"
         reinvited: "Η πρόσκληση στάλθηκε ξανά"
         reinvited_all: "Όλες οι προσκλήσεις ξανά-εστάλησαν!"
         time_read: "Χρόνος ανάγνωσης"
         days_visited: "Μέρες επίσκεψης"
         account_age_days: "Ηλικία λογαριασμού σε μέρες"
         create: "Αποστολή πρόσκλησης"
-        generate_link: "Αντιγραφή Πρόσκληση Σύνδεσμος"
-        link_generated: "Η πρόσκληση του συνδέσμου έγινε επιτυχώς!"
-        valid_for: "Η πρόσκληση συνδέσμου είναι έγκυρη μόνο για τη διεύθυνση ηλεκτρονικού μηνύματος: %{email}"
+        generate_link: "Αντιγραφή Συνδέσμου Πρόσκλησης"
+        link_generated: "Η δημιουργία του συνδέσμου πρόσκλησης έγινε επιτυχώς!"
+        valid_for: "Ο σύνδεσμος πρόσκλησης είναι έγκυρος μόνο για αυτή τη διεύθυνση ηλεκτρονικού μηνύματος: %{email}"
         bulk_invite:
           none: "Δεν έχετε προσκαλέσει κανέναν ακόμα. Στείλτε ατομικές προσκλήσεις, ή καλέστε πολλά άτομα με τη μία <a href='https://meta.discourse.org/t/send-bulk-invites/16468'> μεταφορτώνοντας ένα αρχείο CSV </a>."
           text: "Ομαδική πρόσκληση από αρχείο"
@@ -771,16 +796,16 @@ el:
           other: "οι δημοσιεύσεις δημιουργήθηκαν"
         likes_given:
           one: "<i class='fa fa-heart'></i> δεδομένο"
-          other: "<i class='fa fa-heart'></i> δεδομένο"
+          other: "<i class='fa fa-heart'></i> δόθηκαν"
         likes_received:
           one: "<i class='fa fa-heart'></i> ελήφθη"
-          other: "<i class='fa fa-heart'></i> ελήφθη"
+          other: "<i class='fa fa-heart'></i> ελήφθησαν"
         days_visited:
           one: "ημέρα που επισκέφτηκες"
           other: "ημέρες που επισκέφτηκες"
         posts_read:
           one: "η δημοσίευση διαβάστηκε"
-          other: "οι δημοσιεύσεις διαβάστηκαν"
+          other: "δημοσιεύσεις που διαβάστηκαν"
         bookmark_count:
           one: "σελιδοδείκτης"
           other: "σελιδοδείκτες"
@@ -814,11 +839,11 @@ el:
       stream:
         posted_by: "Αναρτήθηκε από"
         sent_by: "Στάλθηκε από"
-        private_message: "Μήνυμα"
+        private_message: "μήνυμα"
         the_topic: "το νήμα"
     loading: "Φόρτωση... "
     errors:
-      prev_page: "στο ανέβασμα"
+      prev_page: "κατά το φόρτωμα"
       reasons:
         network: "Σφάλμα δικτύου"
         server: "Σφάλμα διακομιστή"
@@ -845,11 +870,11 @@ el:
       login_disabled: "Η δυνατότητα σύνδεσης έχει απενεργοποιηθεί για όσο το φόρουμ είναι σε κατάσταση μόνο ανάγνωσης."
       logout_disabled: "Η αποσύνδεση δεν είναι διαθέσιμη ενώ η ιστοσελίδα είναι σε λειτουργία μόνο ανάγνωσης."
     too_few_topics_and_posts_notice: "Ας αρχίσουμε <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'> αυτή την συζήτηση! </a> Υπάρχουν <strong>%{currentTopics} / %{requiredTopics}</strong> νήματα και <strong>%{currentPosts} / %{requiredPosts}</strong> δημοσιεύεις. Οι νέοι επισκέπτες χρειάζονται κάποιες συνομιλίες για να τις διαβάσουν και να απαντήσουν σε αυτές."
-    too_few_topics_notice: "Ας αρχίσουμε <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'> αυτή την συζήτηση! </a> Υπάρχουν  <strong>%{currentTopics} / %{requiredTopics}</strong> νήματα και <strong>%{currentPosts} / %{requiredPosts}</strong> δημοσιεύεις. Οι νέοι επισκέπτες χρειάζονται κάποιες συνομιλίες για να τις διαβάσουν και να απαντήσουν σε αυτές."
-    too_few_posts_notice: "Ας <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>ξεκινήσουμε αυτή τη συζήτηση!</a> Υπάρχουν προσωρινά <strong>%{currentPosts} / %{requiredPosts}</strong> δημοσιεύσεις. Οι καινούριοι επισκέπτες χρειάζοντε να διαβάσουν και να απαντήσουν σε μερικές συζητήσεις."
+    too_few_topics_notice: "Ας αρχίσουμε <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'> αυτή την συζήτηση! </a> Υπάρχουν  <strong>%{currentTopics} / %{requiredTopics}</strong> νήματα. Οι νέοι επισκέπτες χρειάζονται κάποιες συνομιλίες για να τις διαβάσουν και να απαντήσουν σε αυτές."
+    too_few_posts_notice: "Ας <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>ξεκινήσουμε αυτή τη συζήτηση!</a> Υπάρχουν <strong>%{currentPosts} / %{requiredPosts}</strong> δημοσιεύσεις. Οι καινούριοι επισκέπτες χρειάζοντε να διαβάσουν και να απαντήσουν σε μερικές συζητήσεις."
     logs_error_rate_notice:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> έχει φτάσει το ορισμένο όριο της ιστοσελίδας των %{siteSettingRate}."
-      exceeded: "<b>&{relativeAge}</b> - <a href='%{url}' target='_blank'>%{rate}</a> υπερβαίνει το όριο των ρυθμίσεων της ιστοσελίδας %{siteSettingRate}. "
+      exceeded: "<b>%{relativeAge}</b> - <a href='%{url}' target='_blank'>%{rate}</a> υπερβαίνει το όριο των ρυθμίσεων της ιστοσελίδας %{siteSettingRate}. "
       rate:
         one: "1 σφάλματα/%{duration}"
         other: "%{count} σφάλματα/%{duration}"
@@ -875,14 +900,14 @@ el:
       sign_up: "Εγγραφή"
       hide_session: "Υπενθύμιση αύριο"
       hide_forever: "όχι ευχαριστώ"
-      hidden_for_session: "Εντάξει, θα σε ρωτήσω αύριο. Μπορείς πάντα να χρησιμοποιείς τη \"Σύνδεση\" και για να δημιουργήσεις ένα λογαριασμό."
-      intro: "Γεια σου! :heart_eyes: Φαίνεται να απολαμβάνεις τη συζήτηση, όμως δεν έχεις εγγραφεί σε ένα λογαριασμό."
+      hidden_for_session: "Εντάξει, θα σε ρωτήσω αύριο. Μπορείς πάντα να χρησιμοποιείς τη \"Σύνδεση\" για να δημιουργήσεις ένα λογαριασμό."
+      intro: "Γεια σου! :heart_eyes: Φαίνεται να απολαμβάνεις τη συζήτηση, όμως δεν έχεις δημιουργήσει ακόμα δικό σου λογαριασμό."
       value_prop: "Όταν δημιουργείς έναν λογαριασμό, θυμόμαστε ακριβώς τι έχεις διαβάσει, έτσι ώστε πάντα να επιστρέφεις όπου είχες μείνει. Επίσης, λαμβάνεις ειδοποιήσεις, εδώ και μέσω ηλεκτρονικού μηνύματος, κάθε φορά που δημιουργούνται καινούριες δημοσιεύσεις. Και μπορείς να πατήσεις \"μου αρέσει\" στις δημοσιεύσεις για να μοιραστείς την αγάπη. :heartbeat:"
     summary:
-      enabled_description: "Βλέπεις μια περίληψη αυτού του νήματος: οι πιο ενδιαφέρουσες αναρτήσεις όπως αυτές καθορίστηκαν από την κοινότητα."
+      enabled_description: "Βλέπεις μια περίληψη αυτού του νήματος: οι πιο ενδιαφέρουσες αναρτήσεις, όπως αυτές καθορίστηκαν από την κοινότητα."
       description: "Υπάρχουν <b>{{replyCount}}</b> απαντήσεις."
       description_time: "Υπάρχουν <b>{{replyCount}}</b> απαντήσεις με εκτιμώμενο χρόνο ανάγνωσης <b>{{readingTime}} λεπτών</b>."
-      enable: 'Κάνε  μια σύνοψη αυτού του νήματος'
+      enable: 'Σύνοψη αυτού του νήματος'
       disable: 'Εμφάνιση όλων των αναρτήσεων'
     deleted_filter:
       enabled_description: "Αυτό το νήμα περιέχει σβησμένες αναρτήσεις, οι οποίες αποκρύπτονται."
@@ -902,7 +927,7 @@ el:
     trust_level: 'Επίπεδο εμπιστοσύνης'
     search_hint: 'χρηστώνυμο, διεύθυνση ηλεκτρονικού ταχυδρομείου ή IP διεύθυνση'
     create_account:
-      disclaimer: "Κάνοντας εγγραφή συμφωνείς με την <a href='{{privacy_link}}'> πολιτική προστασίας προσωπικών δεδομένων</a> και <ahref='{{tos_link}}'> με τους όρους υπηρεσίας</a>."
+      disclaimer: "Κάνοντας εγγραφή συμφωνείς με την <a href='{{privacy_link}}'>πολιτική προστασίας προσωπικών δεδομένων</a> και <a href='{{tos_link}}'>με τους όρους χρήσης</a>."
       title: "Δημιουργία νέου λογαριασμού"
       failed: "Κάτι πήγε στραβά. Ίσως αυτή η διεύθυνση ηλεκτρονικού ταχυδρομείου να είναι ήδη δηλωμένη. Δοκίμασε το σύνδεσμο «ξέχασα τον κωδικό μου»."
     forgot_password:
@@ -916,6 +941,9 @@ el:
       complete_email_found: "Βρήκαμε έναν λογαριασμό με τη διεύθυνση <b>%{email}</b>. Σε λίγο θα λάβεις ένα μήνυμα ηλεκτρονικού ταχυδρομείου με οδηγίες για το πως να ορίσεις νέο κωδικό πρόσβασης."
       complete_username_not_found: "Δεν υπάρχει λογαριασμός με το χρηστώνυμο <b>%{username}</b>"
       complete_email_not_found: "Δεν υπάρχει λογαριασμός με τη διεύθυνση <b>%{email}</b>"
+      help: "Δεν λαμβάνετε το Email; Ελέγξτε αρχικά τον φάκελο spam.<p>Δεν γνωρίζετε ποια διεύθυνση email χρησιμοποιήσατε; Πείτε μας την διεύθυνση που θεωρείτε πιο πιθανή και θα σας πούμε αν υπάρχει στο σύστημα.</p><p>Αν δεν έχετε πλέον πρόσβαση στην διεύθυνση email του λογαριασμού σας, παρακαλούμε επικοινωνήστε<a href='/about'>με την ομάδα διαχείρισης.</a></p>"
+      button_ok: "OK"
+      button_help: "Βοήθεια"
     login:
       title: "Σύνδεση"
       username: "Χρηστώνυμο"
@@ -926,7 +954,7 @@ el:
       rate_limit: "Παρακαλώ περιμένετε προτού προσπαθήσετε ξανά να συνδεθείτε."
       blank_username_or_password: "Παρακαλώ δώσε την διεύθυνση ηλεκτρονικού ταχυδρομείου σου ή το χρηστώνυμό σου και τον κωδικό πρόσβασής σου."
       reset_password: 'Επαναφορά κωδικού πρόσβασης'
-      logging_in: "Συνδέεσε..."
+      logging_in: "Σύνδεση..."
       or: "Ή"
       authenticating: "Ταυτοποιώ..."
       awaiting_activation: "Ο λογαριασμός σας αναμένει ενεργοποίηση, χρησιμοποιήστε τον σύνδεσμο ξεχασμένου συνθηματικού για δημιουργία νέου email ενεργοποίησης."
@@ -936,6 +964,10 @@ el:
       not_allowed_from_ip_address: "Δεν μπορείς να συνδεθείς από αυτή τη διεύθυνση IP."
       admin_not_allowed_from_ip_address: "Από αυτή τη διεύθυνση IP δεν επιτρέπεται να συνδεθείς ως διαχειριστής."
       resend_activation_email: "Πάτησε εδώ για να σταλεί ξανά το μήνυμα ενεργοποίησης."
+      resend_title: "Στείλε ξανά το μήνυμα ενεργοποίησης"
+      change_email: "Αλλαγή διεύθυνσης ηλεκτρονικού ταχυδρομείου"
+      provide_new_email: "Καταχωρήστε μια νέα διεύθυνση και θα σας στείλουμε εκ νέου το μήνυμα ενεργοποίησης."
+      submit_new_email: "Ενημέρωση διεύθυνσης ηλεκτρονικού ταχυδρομείου"
       sent_activation_email_again: "Στάλθηκε ένα ακόμα μήνυμα ενεργοποίησης στο <b>{{currentEmail}}</b>. Θα χρειαστούν κάποια λεπτά για να το λάβεις, βεβαιώσου ότι έλεγξες και το φάκελο ανεπιθύμητης αλληλογραφίας."
       to_continue: "Παρακαλώ συνδεθείτε"
       preferences: "Πρέπει να συνδεθείς για να αλλάξεις τις προτιμήσεις χρήστη."
@@ -964,21 +996,25 @@ el:
         message: "Ταυτοποίηση μέσω του Github (βεβαιώσου πως δεν έχει ενεργοποιηθεί το μπλοκάρισμα των αναδυόμενων παραθύρων)"
     invites:
       accept_title: "Πρόσκληση"
-      welcome_to: "Καλώς ήλθατε στο %{site_name}!"
+      welcome_to: "Καλώς ήλθατε στην %{site_name}!"
       invited_by: "Προσκληθήκατε από:"
-      social_login_available: "Θα μπορούσατε επίσεις να συνδεθείτε μέσω οποιοδήποτε μέσoυ κοινωνικής δικτύωσης χρησημοποιώντας αυτή την διεύθυνση ηλεκτρονικού ταχυδρομείου."
+      social_login_available: "Μπορείτε επίσης να συνδεθείτε μέσω λογαριασμών κοινωνικής δικτύωσης χρησημοποιώντας αυτή την διεύθυνση ηλεκτρονικού ταχυδρομείου."
       your_email: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου του λογαριασμού σας είναι <b>%{email}</b>."
       accept_invite: "Αποδοχή πρόσκλησης"
       success: "Ο λογαριασμός σας έχει δημιουργηθεί και έχετε συνδεθεί. "
-      password_label: "Ορισμός κωδικού πρόσβασης (προαιρετικό) "
+      name_label: "Όνομα"
+      password_label: "Θέσε κωδικό πρόσβασης"
+      optional_description: "(προεραιτικό)"
     password_reset:
-      continue: "Συνεχίστε σε %{όνομα_ιστοσελίδας}"
+      continue: "Συνεχίστε σε %{site_name}"
     emoji_set:
       apple_international: "Apple/Διεθνής"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "Emoji ένα"
-      win10: "Κερδισαι10"
+      emoji_one: "Emoji One"
+      win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Μόνο Κατηγορίες"
       categories_with_featured_topics: "Κατηγορίες με Προτεινόμενα Θέματα"
@@ -987,15 +1023,27 @@ el:
       shift: ' Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Ψάξτε ένα emoji
+      people: Άνθρωποι
+      nature: Φύση
+      food: Τροφή
+      activity: Δραστηριότητα
+      travel: Ταξίδια
+      objects: Αντικείμενα
+      celebration: Γιορτή
+      custom: Προσαρμοσμένα emojis
+      recent: Πρόσφατα emojis
     composer:
       emoji: "Emoji :)"
       more_emoji: "περισσότερα..."
       options: "Επιλογές"
       whisper: "ψιθυρίζω"
       unlist: "μη καταχωρημένος"
+      blockquote_text: "Blockquote"
       add_warning: "Αυτή είναι μια επίσημη προειδοποίηση."
-      toggle_whisper: "Ανταλλαγή ψιθύρων"
-      toggle_unlisted: "Μεταβάλλω ακαταχώριστα"
+      toggle_whisper: "Εναλλαγή ψιθύρων"
+      toggle_unlisted: "Εναλλαγή ακαταχώρητων"
       posting_not_on_topic: "Σε ποιο νήμα θέλεις να απαντήσεις;"
       saving_draft_tip: "αποθήκευση..."
       saved_draft_tip: "αποθηκεύτηκε"
@@ -1004,17 +1052,18 @@ el:
       drafts_offline: "τοπικά πρόχειρα"
       group_mentioned:
         one: "Αναφέροντας {{group}}, πρόκειται να λάβει ειδοποίηση <a href='{{group_link}}'> 1 άτομο</a> - είσαι βέβαιος;"
-        other: "Αναφέροντας το {{group}}, πρόκειται να ειδοποίησεις <a href='{{group_link}}'>{{count}} άνθρωποι</a> - είσαι σίγουρος;"
+        other: "Αναφέροντας το {{group}}, πρόκειται να ειδοποίησεις <a href='{{group_link}}'>{{count}} μέλη</a> - είσαι σίγουρος;"
       cannot_see_mention:
         category: "Ανέφερες το {{username}} αλλά δε θα λάβουν ειδοποίηση, επειδή δεν έχουν πρόσβαση σε αυτή την κατηγορία. Θα πρέπει να τους προσθέσεις σε μια ομάδα που έχει πρόσβαση σε αυτή την κατηγορία."
         private: "Ανέφερες {{username}} αλλά δεν θα λάβουν ειδοποίηση, επειδή δεν μπορούν να δουν αυτό το προσωπικό μήνυμα. Πρέπει να τους προσκαλέσεις σε αυτό το ιδιωτικό μήνυμα."
+      duplicate_link: "Όπως φαίνετα ο σύνδεσμος σας προς <b>{{domain}}</b> έχει ήδη αναρτηθεί στο νήμα από <b>@{{username}}</b> σε μία <a href='{{post_url}}'>απάντηση πριν από {{ago}}</a> – θέλετε σίγουρα να αναρτήσετε τον σύνδεσμο ξανά;"
       error:
         title_missing: "Απαιτείται τίτλος"
         title_too_short: "Ο τίτλος πρέπει να έχει τουλάχιστον {{min}} χαρακτήρες"
         title_too_long: "Ο τίτλος δεν μπορεί να έχει πάνω από {{max}} χαρακτήρες"
         post_missing: "Μία ανάρτηση δεν μπορεί να είναι κενή"
         post_length: "Κάθε ανάρτηση πρέπει να περιέχει τουλάχιστον {{min}} χαρακτήρες"
-        try_like: 'Έχεις δοκιμάσει το κουμπί <i class="fa fa-heart"></i> ;'
+        try_like: 'Έχεις δοκιμάσει το κουμπί <i class="fa fa-heart"></i>;'
         category_missing: "Πρέπει να διαλέξεις μια κατηγορία"
       save_edit: "Αποθήκευση Επεξεργασίας"
       reply_original: "Απάντηση στο αρχικό νήμα"
@@ -1039,10 +1088,10 @@ el:
       show_preview: 'εμφάνιση της προεπισκόπησης &raquo;'
       hide_preview: '&laquo; απόκρυψη της προεπισκόπησης'
       quote_post_title: "Παράθεση ολόκληρης την ανάρτησης"
-      bold_label: "Β"
+      bold_label: "B"
       bold_title: "Έντονα"
       bold_text: "Έντονη γραφή"
-      italic_label: "Ι"
+      italic_label: "I"
       italic_title: "Έμφαση"
       italic_text: "κείμενο σε έμφαση"
       link_title: "Σύνδεσμος"
@@ -1060,7 +1109,7 @@ el:
       olist_title: "Αριθμημένη λίστα"
       ulist_title: "Κουκίδες"
       list_item: "Στοιχείο Λίστας"
-      heading_label: "Η"
+      heading_label: "H"
       heading_title: "Επικεφαλίδα"
       heading_text: "Επικεφαλίδα"
       hr_title: "Οριζόντια γραμμή"
@@ -1080,7 +1129,7 @@ el:
       more: "Εμφάνιση παλιότερων ειδοποιήσεων"
       total_flagged: "σύνολο επισημασμένων αναρτήσεων"
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='goup mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p> "
+      group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       posted: "<i title='posted' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p> "
@@ -1097,6 +1146,7 @@ el:
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p>ο χρήστης <span>{{username}}</span> μετέφερε το {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p> "
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p> Κέρδισες το παράσημο '{{description}}'</p>"
+      topic_reminder: "<i title='topic reminder' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Νέο θέμα</span> {{description}}</p> "
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} μηνύματα στα {{group_name}} εισερχόμενά σου</p>"
@@ -1114,11 +1164,11 @@ el:
         invitee_accepted: "Η πρόσκληση έγινε δεκτή από"
         moved_post: "Η δημοσίευση σου μετακινήθηκε από"
         linked: "Σύνδεση στη δημοσίευσή σου"
-        granted_badge: "Χορηγήθηκε σήμα"
+        granted_badge: "Χορηγήθηκε παράσημο"
         group_message_summary: "Μηνύματα στα εισερχόμενα ομάδας"
       popup:
         mentioned: 'Ο/Η {{username}} σε ανέφερε στο "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} ανέφερε εσένα σε "{{topic}}" - {{site_title}}'
+        group_mentioned: '{{username}} σε ανέφερε στο "{{topic}}" - {{site_title}}'
         quoted: 'Ο/Η {{username}} σε παράθεσε στο "{{topic}}" - {{site_title}}'
         replied: 'Ο/Η {{username}} σου απάντησε στο "{{topic}}" - {{site_title}}'
         posted: 'Ο/Η {{username}} ανάρτησε στο "{{topic}}" - {{site_title}}'
@@ -1130,34 +1180,36 @@ el:
       from_my_computer: "Από τη συσκευή μου"
       from_the_web: "Από το διαδίκτυο"
       remote_tip: "υπερσύνδεσμος προς μια εικόνα"
-      remote_tip_with_attachments: "σύνδεσμος σε μια εικόνα ή ένα φάκελο {{authorized_extensions}}"
+      remote_tip_with_attachments: "σύνδεσμος σε εικόνα ή φάκελο {{authorized_extensions}}"
       local_tip: "επιλογή εικόνων από τη συσκευή σου"
       local_tip_with_attachments: "επίλεξε εικόνες ή φακέλους από τη συσκευή σου {{authorized_extensions}}"
       hint: "(μπορείς να τα σύρεις με το ποντίκι στην περιοχή για να τα ανεβάσεις)"
       hint_for_supported_browsers: "μπορείς επίσης να μεταφέρεις ή να επικόλλησεις εικόνες από τον συντάκτη"
       uploading: "Ανεβαίνει"
-      select_file: "Επιλογή Φακέλου"
+      select_file: "Επιλογή Αρχείου"
       image_link: "υπερσύνδεσμος στον οποίο θα δείχνει η εικόνα σου"
     search:
       sort_by: "Ταξινόμηση κατά"
-      relevance: "συνάφεια"
+      relevance: "Συνάφεια"
       latest_post: "Τελευταίες Δημοσιεύσεις"
+      latest_topic: "Πρόσφατο Νήμα"
       most_viewed: "Περισσότερες εμφανίσεις"
       most_liked: "Περισσότερα \"μου αρέσει\""
       select_all: "Επιλογή όλων"
       clear_all: "Καθαρισμός όλων"
-      too_short: "Ο όρος στην αναζήτησή σου είναι πολύ μικρός."
+      too_short: "Ο όρος αναζήτησής σου είναι πολύ μικρός."
       result_count:
         one: "1 αποτέλεσμα για <span class='term'>\"{{term}}\"</span>"
         other: "{{count}} αποτελέσματα για <span class='term'>\"{{term}}\"</span>"
       title: "ψάξε σε νήματα, αναρτήσεις, χρήστες ή κατηγορίες"
       no_results: "Δε βρέθηκε κάτι."
-      no_more_results: "Δε βρέθηκαν αποτελέσματα"
+      no_more_results: "Δε βρέθηκαν άλλα αποτελέσματα"
       searching: "Ψάχνω ..."
       post_format: "#{{post_number}} από {{username}}"
+      results_page: "Αποτελέσματα Αναζήτησης"
       context:
         user: "Ψάξε στις αναρτήσεις του χρήστη @{{username}}"
-        category: "Αναζήτηση στην #{{category}} κατηγορία"
+        category: "Αναζήτηση στην κατηγορία #{{category}} "
         topic: "Ψάξε σε αυτό το νήμα"
         private_messages: "Αναζήτηση στα μηνύματα"
       advanced:
@@ -1177,7 +1229,7 @@ el:
           likes: Μου αρέσει
           posted: Δημοσίευσα σε
           watching: Παρακολουθώ
-          tracking: Παρακολουθώ
+          tracking: Ακολουθώ
           private: είναι στα μηνύματα μου
           bookmarks: Έχω βάλει σελιδοδείκτη
           first: είναι η πρώτη πρώτη δημοσίευση
@@ -1186,16 +1238,17 @@ el:
           seen: Διάβασα
           unseen: Δεν διάβασα
           wiki: ' είναι βίκι'
+          all_tags: Πειρέχει όλες τις ετικέτες
         statuses:
-          label: όπου θέματα
+          label: Τα οποία θέματα
           open: είναι ανοιχτά
           closed: είναι κλειστά
           archived: είναι αρχειοθετημένα
           noreplies: έχουν μηδέν απαντήσεις
-          single_user: περιέχει ένα μόνο χρήστη
+          single_user: περιέχουν ένα μόνο χρήστη
         post:
           count:
-            label: Ελάχιστη καταμέτρηση δημοσιεύσεων
+            label: Ελάχιστος αριθμός αναρτήσεων
           time:
             label: Δημοσιεύθηκε
             before: πριν
@@ -1210,26 +1263,29 @@ el:
       bulk:
         select_all: "Επιλογή όλων"
         clear_all: "Καθαρισμός όλων"
-        unlist_topics: "Μη καταχωρημένα θέματα"
-        reset_read: "Επαναφορά διαβασμένων"
+        unlist_topics: "Θέματα μη καταχωρημένα "
+        relist_topics: "Θέματα καταχωρημένα "
+        reset_read: "Μηδενισμός Διαβασμένων"
         delete: "Διαγραφή νημάτων"
         dismiss: "Απόρριψη"
         dismiss_read: "Απόρριψη όλων των μη αναγνωσμένων"
         dismiss_button: "Απόρριψη..."
-        dismiss_tooltip: "Απόρριψη μόνο των καινούριων δημοσιεύσεων ή διακοπή των νημάτων που παρακολουθούνται"
-        also_dismiss_topics: "Διακοπή παρακολούθησης αυτών των νημάτων ώστε να μην εμφανιστούν ξανά ως μη αναγνωσμένα σε εμένα"
+        dismiss_tooltip: "Απόρριψη μόνο των καινούριων δημοσιεύσεων ή διακοπή των νημάτων που ακολουθούνται"
+        also_dismiss_topics: "Διακοπή ακολούθησης αυτών των νημάτων ώστε να μην εμφανιστούν ξανά ως μη αναγνωσμένα σε εμένα"
         dismiss_new: "Αγνόησε τα νέα"
         toggle: "μαζική επιλογή νημάτων"
         actions: "Μαζικές ενέργειες"
+        change_category: "Θέσε Κατηγορία"
         close_topics: "Κλείσιμο νημάτων"
         archive_topics: "Αρχειοθέτηση νημάτων"
+        notification_level: "Ειδοποιήσεις"
         choose_new_category: "Διάλεξε τη νέα κατηγορία για τα νήματα:"
         selected:
           one: "Έχεις διαλέξει <b>1</b> νήμα."
           other: "Έχεις διαλέξει <b>{{count}}</b> νήματα."
         change_tags: "Αντικατάσταση ετικετών "
         append_tags: "Προσάρτηση ετικετών "
-        choose_new_tags: "Επίλεξε καινούριες ετικέτες από αυτά τα θέματα:"
+        choose_new_tags: "Επίλεξε καινούριες ετικέτες για αυτά τα θέματα:"
         choose_append_tags: "Επιλογή νέων ετικετών για την προσάρτηση τους σε αυτά τα νήματα"
         changed_tags: "Οι ετικέτες αυτών των θεμάτων έχουν αλλάξει."
       none:
@@ -1245,17 +1301,17 @@ el:
         search: "Δεν υπάρχουν αποτελέσματα σε αυτή την αναζήτηση."
         educate:
           new: '<p>Τα νέα σου θέματα εμφανίζονται εδώ.</p><p>Από προεπιλογή, τα θέματα θεωρούνται καινούρια και θα δείχνουν ένα <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">καινούριο</span> δείκτη εαν έχουν δημιουργηθεί τις τελευταίες 2 μέρες.</p><p>Επισκέψου τις <a href="%{userPrefsUrl}">προτιμήσεις σου</a> για να το αλλάξεις αυτό.</p>'
-          unread: '<p>Τα αδιάβαστα νήματά σου εμφανίζονται εδώ.</p><p>Από προεπιλογή, τα νήματα θεωρούνται αδιάβαστα και θα δείχνουν αδιάβαστα <span class="badge new-posts badge-notification">1</span> έαν:</p><ul><li> Δημιούργησες το νήμα</li><li>Απάντησεσ στο νήμα</li><li>Διάβασεσ το νήμα για περισσότερα από 4 λεπτά</li></ul><p>Ή εάν έχεις ορίσει το νήμα να παρακολουθήται μέσω έλεγχο ειδοποιήσης στο κάτω μέρος του κάθε νήματος.</p><p>Επισκέψου τις <a href="%{userPrefsUrl}">προτιμήσεις σου</a> για να το αλλάξεις αυτό.</p>'
+          unread: '<p>Τα αδιάβαστα νήματά σου εμφανίζονται εδώ.</p><p>Από προεπιλογή, τα νήματα θεωρούνται αδιάβαστα και θα δείχνουν αδιάβαστα <span class="badge new-posts badge-notification">1</span> έαν:</p><ul><li> Δημιούργησες το νήμα</li><li>Απάντησεσ στο νήμα</li><li>Διάβασες το νήμα για περισσότερα από 4 λεπτά</li></ul><p>Ή εάν έχεις ορίσει το νήμα να παρακολουθήται μέσω της επιλογής ειδοποιήσεων στο κάτω μέρος του κάθε νήματος.</p><p>Επισκέψου τις <a href="%{userPrefsUrl}">προτιμήσεις σου</a> για να το αλλάξεις αυτό.</p>'
       bottom:
-        latest: "Αυτά ήταν τα πρόσφατα νήματα."
-        hot: "Αυτά ήταν όλα τα δημοφιλή νήματα."
-        posted: "Αυτά ήταν όλα τα νήματα."
-        read: "Αυτά ήταν όλα τα διαβασμένα νήματα."
-        new: "Αυτά ήταν όλα τα νέα νήματα."
-        unread: "Αυτά ήταν όλα τα αδιάβαστα νήματα."
-        category: "Αυτά ήταν όλα τα νήματα στην κατηγορία {{category}}."
-        top: "Αυτά ήταν όλα τα κορυφαία νήματα."
-        bookmarks: "Αυτά ήταν όλα τα νήματα με σελιδοδείκτη."
+        latest: "Δεν υπάρχουν άλλα πρόσφατα νήματα."
+        hot: "Δεν υπάρχουν άλλα δημοφιλή νήματα."
+        posted: "Δεν υπάρχουν άλλα νήματα."
+        read: "Δεν υπάρχουν άλλα διαβασμένα νήματα."
+        new: "Δεν υπάρχουν άλλα νέα νήματα."
+        unread: "Δεν υπάρχουν άλλα αδιάβαστα νήματα."
+        category: "Δεν υπάρχουν άλλα νήματα στην κατηγορία {{category}}."
+        top: "Δεν υπάρχουν άλλα κορυφαία νήματα."
+        bookmarks: "Δεν υπάρχουν άλλα νήματα με σελιδοδείκτη."
         search: "Δεν υπάρχουν άλλα αποτελέσματα σε αυτή την αναζήτηση."
     topic:
       unsubscribe:
@@ -1311,13 +1367,28 @@ el:
       toggle_information: "Εμφάνιση ή απόκρυψη λεπτομερειών νήματος"
       read_more_in_category: "Θέλεις να διαβάσεις περισσότερα; Βρες άλλα νήματα στο {{catLink}} ή {{latestLink}}."
       read_more: "Θέλεις να διαβασεις περισσότερα; {{catLink}} ή {{latestLink}}."
-      read_more_MF: "Έχεις { UNREAD, plural, =0 {} one { is <a href='/unread'>1 αδιάβαστο</a> } other { are <a href='/unread'># αδιάβαστα</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {έχεις } other{}} <a href='/new'>1 νέο</a> νήμα} other { {BOTH, select, true{and } false {έχεις } other{}} <a href='/new'># νέα</a> νήματα} } ακόμη, ή {CATEGORY, select, true {περιηγήσου σε άλλα νήματα {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "Έχεις { UNREAD, plural, =0 {} one { μόνο <a href='/unread'>1 αδιάβαστο</a> } other { <a href='/unread'># αδιάβαστα</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {έχεις } other{}} <a href='/new'>1 νέο</a> νήμα} other { {BOTH, select, true{and } false {έχεις } other{}} <a href='/new'># νέα</a> νήματα} } ακόμη, ή {CATEGORY, select, true {περιηγήσου σε άλλα νήματα {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Περιήγηση σε όλες τις κατηγορίες
       view_latest_topics: δες τα πρόσφατα νήματα
       suggest_create_topic: Γιατί δεν φτιάχνεις ένα νέο νήμα;
       jump_reply_up: μετάβαση στην απάντηση που προηγείται
       jump_reply_down: μετάβαση στην  απάντηση που ακολουθεί
       deleted: "Το νήμα έχει διαγραφεί "
+      topic_status_update:
+        title: "Ρύθμιση Χρονοδιακόπτη Νήματος"
+        save: "Ρύθμιση Χρονοδιακόπτη"
+        num_of_hours: "Ώρες:"
+        remove: "Αφαίρεση Χρονοδιακόπτη"
+        when: "Πότε:"
+      auto_update_input:
+        later_today: "Αργότερα σήμερα"
+        tomorrow: "Αύριο"
+        later_this_week: "Αργότερα αυτή την εβδομάδα"
+        this_weekend: "Αυτό το Σαββατοκύριακο"
+        next_week: "Την άλλη εβδομάδα"
+        next_month: "Τον άλλο μήνα"
+        pick_date_and_time: "Επέλεξε ημερομηνία και ώρα"
+        set_based_on_last_post: "Κλείσε ανάλογα με την τελευταία ανάρτηση"
       auto_close_title: 'Ρυθμίσεις για το αυτόματο κλείσιμο'
       auto_close_immediate:
         one: "Η τελευταία δημοσίευση στο νήμα είναι ήδη 1 ώρα παλιό, έτσι το νήμα θα κλείσει αμέσως."
@@ -1687,10 +1758,6 @@ el:
         confirm:
           one: "Είσαι σίγουρος ότι θέλεις να σβήσεις αυτή την ανάρτηση;"
           other: "Είσαι σίγουρος ότι θέλεις να σβήσεις όλες αυτές τις αναρτήσεις;"
-      merge:
-        confirm:
-          one: "Είσαι βέβαιος πως θέλεις να συγχωνεύσεις αυτές τις δημοσιεύσεις;"
-          other: "Είσαι βέβαιος πως θέλεις να συγχωνεύσεις αυτές {{count}} τις δημοσιεύσεις;"
       revisions:
         controls:
           first: "Πρώτη αναθεώρηση"
@@ -1736,8 +1803,6 @@ el:
       settings: 'Ρυθμίσεις'
       topic_template: "Δείγμα νήματος"
       tags: "Ετικέτες"
-      tags_allowed_tags: "Ετικέτες που μπορούν να χρησιμοποιηθούν μόνο σε αυτή την κατηγορία:"
-      tags_allowed_tag_groups: "Βάλε ετικέτα σε ομάδες που μπορούν να χρησιμοποιηθούν μόνο σε αυτή την κατηγορία:"
       tags_placeholder: "(Προαιρετική) λίστα επιτρεπόμενων ετικετών"
       tag_groups_placeholder: "(Προαιρετική) λίστα επιτρεπόμενων ετικετών σε ομάδες"
       topic_featured_link_allowed: "Επίτρεψε προτεινόμενους συνδέσμους σε αυτή την κατηγορία"
@@ -3085,12 +3150,12 @@ el:
         save: "Αποθήκευση ενσωματωμένων αλλαγών"
       permalink:
         title: "Μόνιμοι Σύνδεσμοι"
-        url: "διεύθυνση URL"
-        topic_id: "Ταυτότητα νήματος"
+        url: "URL"
+        topic_id: "ID νήματος"
         topic_title: "Νήμα"
-        post_id: "Ταυτότητα δημοσίευσης"
+        post_id: "ID ανάρτησης"
         post_title: "Δημοσίευση"
-        category_id: "Ταυτότητα Κατηγορίας"
+        category_id: "ID Κατηγορίας"
         category_title: "Κατηγορία"
         external_url: "Εξωτερική διεύθυνση URL"
         delete_confirm: Είσαι βέβαιος πως θέλεις να διαγράψεις αυτόν τον μόνιμο σύνδεσμο;
@@ -3103,17 +3168,17 @@ el:
       done: "Ολοκληρώθηκε"
       back: "Πίσω"
       next: "Επόμενο"
-      step: "%{current} του %{total}"
-      upload: "Μεταφόρτωση"
-      uploading: "Μεταφορτώνεται..."
+      step: "%{current} από %{total}"
+      upload: "Ανέβασμα"
+      uploading: "Ανεβαίνει..."
       quit: "Ίσως αργότερα"
       staff_count:
         one: "Η κοινότητά σου έχει 1 μέλος του προσωπικού."
         other: "Η κοινότητά σου έχει %{count} μέλη του προσωπικού."
       invites:
-        add_user: "προσθέτω"
+        add_user: "προσθήκη"
         none_added: "Δεν έχεις προσκαλέσει το προσωπικό. Είσαι βέβαιος πως θέλεις να συνεχίσεις;"
         roles:
           admin: "Διαχειριστής"
-          moderator: "Μεσολαβιτής"
+          moderator: "Συντονιστής"
           regular: "Τακτικός χρήστης"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c2268368f51..ad59a98eb57 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -180,20 +180,21 @@ en:
 
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_east_2: "US East (Ohio)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
 
     edit: 'edit the title and category of this topic'
     not_implemented: "That feature hasn't been implemented yet, sorry!"
@@ -407,12 +408,8 @@ en:
         full_name: 'Full Name'
         add_members: "Add Members"
         delete_member_confirm: "Remove '%{username}' from the '%{group}' group?"
-      request_membership_pm:
-        title: "Membership Request"
-        body: "I would like to apply for membership in @%{groupName}."
-        disabled: "Insufficient trust level to request for group membership"
       name_placeholder: "Group name, no spaces, same as username rule"
-      public: "Allow users to join/leave the group freely (Requires group to be visible)"
+      public: "Allow users to join/leave the group freely (Requires publicly visible group)"
       empty:
         posts: "There are no posts by members of this group."
         members: "There are no members in this group."
@@ -434,7 +431,6 @@ en:
       bio: "About Group"
       selector_placeholder: "Add members"
       owner: "owner"
-      visible: "Group is visible to all users"
       index:
         title: "Groups"
         empty: "There are no visible groups."
@@ -448,6 +444,12 @@ en:
       mentions: "Mentions"
       messages: "Messages"
       notification_level: "Default notification level for group messages"
+      visibility_levels:
+        title: "Who can see this group?"
+        public: "Everyone"
+        members: "Group owners, members and admins"
+        staff: "Group owners and staff"
+        owners: "Group owners and admins"
       alias_levels:
         title: "Who can message and @mention this group?"
         nobody: "Nobody"
@@ -689,7 +691,6 @@ en:
         title: "Change Username"
         confirm: "If you change your username, all prior quotes of your posts and @name mentions will be broken. Are you absolutely sure you want to?"
         taken: "Sorry, that username is taken."
-        error: "There was an error changing your username."
         invalid: "That username is invalid. It must only include numbers and letters"
 
       change_email:
@@ -841,6 +842,9 @@ en:
         expired: "This invite has expired."
         rescind: "Remove"
         rescinded: "Invite removed"
+        rescind_all: "Remove all Invites"
+        rescinded_all: "All Invites removed!"
+        rescind_all_confirm: "Are you sure you want to remove all invites?"
         reinvite: "Resend Invite"
         reinvite_all: "Resend all Invites"
         reinvite_all_confirm: "Are you sure you want to resend all invites?"
@@ -1041,6 +1045,9 @@ en:
 
       complete_username_not_found: "No account matches the username <b>%{username}</b>"
       complete_email_not_found: "No account matches <b>%{email}</b>"
+      help: "Email not arriving? Be sure to check your spam folder first.<p>Not sure which email address you used? Enter an email address and we’ll let you know if it exists here.</p><p>If you no longer have access to the email address on your account, please contact <a href='/about'>our helpful staff.</a></p>"
+      button_ok: "OK"
+      button_help: "Help"
     login:
       title: "Log In"
       username: "User"
@@ -1102,8 +1109,8 @@ en:
       accept_invite: "Accept Invitation"
       success: "Your account has been created and you're now logged in."
       name_label: "Name"
-      name_label_optional: "Name (optional)"
-      password_label: "Set Password (optional)"
+      password_label: "Set Password"
+      optional_description: "(optional)"
 
     password_reset:
       continue: "Continue to %{site_name}"
@@ -1114,6 +1121,8 @@ en:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
 
     category_page_style:
       categories_only: "Categories Only"
@@ -1125,12 +1134,31 @@ en:
       ctrl: 'Ctrl'
       alt: 'Alt'
 
+    emoji_picker:
+      filter_placeholder: Search for emoji
+      people: People
+      nature: Nature
+      food: Food
+      activity: Activity
+      travel: Travel
+      objects: Objects
+      celebration: Celebration
+      custom: Custom emojis
+      recent: Recently used
+      default_tone: No skin tone
+      light_tone: Light skin tone
+      medium_light_tone: Medium light skin tone
+      medium_tone: Medium skin tone
+      medium_dark_tone: Medium dark skin tone
+      dark_tone: Dark skin tone
+
     composer:
       emoji: "Emoji :)"
       more_emoji: "more..."
       options: "Options"
       whisper: "whisper"
       unlist: "unlisted"
+      blockquote_text: "Blockquote"
 
       add_warning: "This is an official warning."
       toggle_whisper: "Toggle Whisper"
@@ -1303,8 +1331,8 @@ en:
       clear_all: "Clear All"
       too_short: "Your search term is too short."
       result_count:
-        one: "1 result for <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} results for <span class='term'>\"{{term}}\"</span>"
+        one: "1 result for <span class='term'>{{term}}</span>"
+        other: "{{count}} results for <span class='term'>{{term}}</span>"
       title: "search topics, posts, users, or categories"
       no_results: "No results found."
       no_more_results: "No more results found."
@@ -1345,6 +1373,7 @@ en:
           unseen: I've not read
           wiki: are wiki
           images: includes image(s)
+          all_tags: Contains all tags
         statuses:
           label: Where topics
           open: are open
@@ -1714,6 +1743,7 @@ en:
         success_email: "We mailed out an invitation to <b>{{emailOrUsername}}</b>. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites."
         success_username: "We've invited that user to participate in this topic."
         error: "Sorry, we couldn't invite that person. Perhaps they have already been invited? (Invites are rate limited)"
+        success_existing_email: "A user with email <b>{{emailOrUsername}}</b> already exists. We've invited that user to participate in this topic."
 
       login_reply: 'Log In to Reply'
 
@@ -1850,6 +1880,7 @@ en:
         has_liked: "you've liked this post"
         undo_like: "undo like"
         edit: "edit this post"
+        edit_action: "Edit"
         edit_anonymous: "Sorry, but you need to be logged in to edit this post."
         flag: "privately flag this post for attention or send a private notification about it"
         delete: "delete this post"
@@ -1959,7 +1990,7 @@ en:
 
       merge:
         confirm:
-          one: "Are you sure you want merge those posts?"
+          one: "Are you sure you want to merge those posts?"
           other: "Are you sure you want to merge those {{count}} posts?"
 
       revisions:
@@ -2009,8 +2040,8 @@ en:
       settings: 'Settings'
       topic_template: "Topic Template"
       tags: "Tags"
-      tags_allowed_tags: "Tags that can only be used in this category:"
-      tags_allowed_tag_groups: "Tag groups that can only be used in this category:"
+      tags_allowed_tags: "Only allow these tags to be used in this category:"
+      tags_allowed_tag_groups: "Only allow tags from these groups to be used in this category:"
       tags_placeholder: "(Optional) list of allowed tags"
       tag_groups_placeholder: "(Optional) list of allowed tag groups"
       topic_featured_link_allowed: "Allow featured links in this category"
@@ -2879,7 +2910,7 @@ en:
           add: "Add"
           commits_behind:
             one: "Theme is 1 commit behind!"
-            other: "Theme is {{count}} commit behind!"
+            other: "Theme is {{count}} commits behind!"
           scss:
             text: "CSS"
             title: "Enter custom CSS, we accept all valid CSS and SCSS styles"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index bdfb49b9059..7df0882ba74 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -148,20 +148,20 @@ es:
       default_description: "Por defecto"
     s3:
       regions:
-        us_east_1: "EEUU Este (Virginia del Norte)"
-        us_west_1: "EEUU Oeste (Californa norte)"
-        us_west_2: "EEUU Oeste (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "UE (Irlanda)"
-        eu_west_2: "EU (Londres)"
-        eu_central_1: "UE (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapur)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Bombay)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seúl)"
-        sa_east_1: "Sudamérica (São Paulo)"
+        ap_south_1: "Asia Pacific (Bombay)"
+        ap_southeast_1: "Asia Pacific (Singapur)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Pekín)"
+        eu_central_1: "UE (Frankfurt)"
+        eu_west_1: "UE (Irlanda)"
+        eu_west_2: "EU (Londres)"
+        sa_east_1: "Sudamérica (São Paulo)"
+        us_east_1: "EEUU Este (Virginia del Norte)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "EEUU Oeste (Californa norte)"
+        us_west_2: "EEUU Oeste (Oregon)"
     edit: 'editar el título y la categoría de este tema'
     not_implemented: "Esta característica no ha sido implementada aún, ¡lo sentimos!"
     no_value: "No"
@@ -206,7 +206,7 @@ es:
       one: "{{count}} carácter"
       other: "{{count}} caracteres"
     suggested_topics:
-      title: "Temas sugeridos"
+      title: "Temas Sugeridos"
       pm_title: "Mensajes sugeridos"
     about:
       simple_title: "Acerca de"
@@ -270,7 +270,7 @@ es:
     choose_topic:
       none_found: "Ningún tema encontrado."
       title:
-        search: "Buscar tema por nombre, URL o ID:"
+        search: "Buscar un Tema por nombre, url o id:"
         placeholder: "escribe el título de tema aquí"
     queue:
       topic: "Tema:"
@@ -342,7 +342,7 @@ es:
         action: "Acción"
         acting_user: "Usuario que actuó"
         target_user: "Usuario objetivo"
-        subject: "Sujeto"
+        subject: "Asunto"
         details: "Detalles"
         from: "De"
         to: "A"
@@ -351,16 +351,13 @@ es:
         full_name: 'Nombre completo'
         add_members: "Añadir miembros"
         delete_member_confirm: "¿Quitar a '%{username}' del grupo '%{group}'?"
-      request_membership_pm:
-        title: "Solicitud de miembro"
-        body: "Me gustaría pertenecer al grupo @%{groupName}."
       name_placeholder: "Nombre del grupo, sin espacios, igual que los nombres de usuarios"
-      public: "Permitir a los usuarios unirse o salir del grupo cuando quieran (es necesario que el grupo sea visible)"
+      public: "Permitir a usuarios unirse/salir del grupo libremente (es necesario que el grupo sea visible)"
       empty:
         posts: "No existe ningún post de miembros de este grupo"
         members: "No hay miembros en este grupo."
         mentions: "No hay menciones de este grupo."
-        messages: "No hay menciones a este grupo."
+        messages: "No hay mensajes a este grupo."
         topics: "No hay temas de miembros de este grupo."
         logs: "No hay registros para este grupo."
       add: "Añadir"
@@ -370,14 +367,13 @@ es:
       automatic_group: Grupo automático
       closed_group: Grupo cerrado
       is_group_user: "Eres miembro de este grupo"
-      allow_membership_requests: "Permitir que los usuarios envíen solicitudes de membresía a los propietarios de grupos"
+      allow_membership_requests: "Permitir a los usuarios solicitudes para ser miembro a los dueños del grupo"
       membership: "Membresía"
       name: "Nombre"
       user_count: "Número de miembros"
       bio: "Acerca del grupo"
       selector_placeholder: "Añadir miembros"
       owner: "propietario"
-      visible: "El grupo es visible para todos los usuarios"
       index:
         title: "Grupos"
         empty: "No hay grupos visibles."
@@ -390,7 +386,13 @@ es:
       posts: "Posts"
       mentions: "Menciones"
       messages: "Mensajes"
-      notification_level: "Nivel de notificación predeterminado para mensajes de grupo"
+      notification_level: "Nivel de notificación por defecto para mensajes en grupo"
+      visibility_levels:
+        title: "¿Quién puede ver este grupo?"
+        public: "Todos"
+        members: "Propietarios del grupo, miembros y admins"
+        staff: "Propietarios del grupo y staff"
+        owners: "Propietarios del grupo y admins"
       alias_levels:
         title: "¿Quién puede emviar mensajes y @mencionar a este grupo?"
         nobody: "Nadie"
@@ -419,16 +421,16 @@ es:
           description: "Nunca se te notificará de nada sobre temas en este grupo."
       flair_url: "Adorno de imagen de usuario"
       flair_url_placeholder: "(Opcional) Dirección URL de una imagen o clase de Font Awesome"
-      flair_bg_color: "Color de fondo del adorno de la imagen de usuario"
+      flair_bg_color: "Color de fondo del sub-avatar del grupo"
       flair_bg_color_placeholder: "(Opcional) Valor del color en hexadecimal"
-      flair_color: "Color del adorno de la imagen de usuario"
+      flair_color: "Color del sub-avatar del grupo"
       flair_color_placeholder: "(Opcional) Valor del color en hexadecimal"
       flair_preview_icon: "Previsualización del icono"
       flair_preview_image: "Previsualización de la imagen"
-      flair_note: "Nota: el adorno solo se mostrará para el grupo primario del usuario."
+      flair_note: "Nota: el sub-avatar solo se mostrará para el grupo primario del usuario."
     user_action_groups:
-      '1': "'Me gusta' dados"
-      '2': "'Me gusta' recibidos"
+      '1': "'Me gusta' Dados"
+      '2': "'Me gusta' Recibidos"
       '3': "Marcadores"
       '4': "Temas"
       '5': "Posts"
@@ -436,7 +438,7 @@ es:
       '7': "Menciones"
       '9': "Citas"
       '11': "Ediciones"
-      '12': "Elementos enviados"
+      '12': "Elementos Enviados"
       '13': "Bandeja de entrada"
       '14': "Pendiente"
     categories:
@@ -488,10 +490,10 @@ es:
       mute: "Silenciar"
       edit: "Editar Preferencias"
       download_archive:
-        button_text: "Descargar mis posts"
+        button_text: "Descargar todos"
         confirm: "¿Seguro que quieres descargar tus posts?"
-        success: "Descarga iniciada, se te notificará con un mensaje cuando el proceso se haya completado."
-        rate_limit_error: "Los posts pueden ser descargados una vez al día. Por favor, inténtalo de nuevo mañana."
+        success: "Descarga iniciada, se te notificará por mensaje cuando el proceso se haya completado."
+        rate_limit_error: "Los posts pueden ser descargados una vez por día, por favor, inténtalo de nuevo mañana."
       new_private_message: "Nuevo mensaje"
       private_message: "Mensaje"
       private_messages: "Mensajes"
@@ -500,8 +502,8 @@ es:
       expand_profile: "Expandir"
       bookmarks: "Marcadores"
       bio: "Acerca de mí"
-      invited_by: "Invitado por"
-      trust_level: "Nivel de confianza"
+      invited_by: "Invitado Por"
+      trust_level: "Nivel de Confianza"
       notifications: "Notificaciones"
       statistics: "Estadísticas"
       desktop_notifications:
@@ -513,11 +515,12 @@ es:
         disable: "Desactivar notificaciones"
         enable: "Activar notificaciones"
         each_browser_note: "Nota: tendrás que cambiar esta opción para cada navegador que uses."
-      dismiss_notifications: "Descartar todas"
+      dismiss_notifications: "Descartar todos"
       dismiss_notifications_tooltip: "Marcar todas las notificaciones no leídas como leídas"
       first_notification: "¡Tu primera notificación! Selecciónala para comenzar."
       disable_jump_reply: "No dirigirme a mi post cuando responda"
       dynamic_favicon: "Mostrar contador de temas nuevos/actualizados en el favicon"
+      theme_default_on_all_devices: "Hacer éste mi theme por defecto en todos mis dispositivos"
       external_links_in_new_tab: "Abrir todos los enlaces externos en una nueva pestaña"
       enable_quoting: "Activar respuesta citando el texto resaltado"
       change: "cambio"
@@ -557,9 +560,10 @@ es:
       watched_first_post_tags_instructions: "Se te notificará del primer post en cada nuevo tema con estas etiquetas."
       muted_categories: "Silenciado"
       muted_categories_instructions: "No serás notificado de ningún tema en estas categorías, y no aparecerán en la página de mensajes recientes."
-      delete_account: "Borrar mi cuenta"
-      delete_account_confirm: "¿Estás seguro de que quieres borrar permanentemente tu cuenta? ¡Esta acción se puede deshacer!"
-      deleted_yourself: "Tu cuenta ha sido con éxito."
+      no_category_access: "Como un moderador, tienes acceso limitado a categorías, guardar está deshabilitado."
+      delete_account: "Borrar Mi Cuenta"
+      delete_account_confirm: "¿Estás seguro que quieres borrar permanentemente tu cuenta? ¡Esta acción no puede ser revertida!"
+      deleted_yourself: "Tu cuenta ha sido borrada exitosamente."
       delete_yourself_not_allowed: "No puedes borrar tu cuenta en este momento. Contacta a un administrador para borrar tu cuenta en tu nombre."
       unread_message_count: "Mensajes"
       admin_delete: "Eliminar"
@@ -568,13 +572,13 @@ es:
       muted_users_instructions: "Omite todas las notificaciones de estos usuarios."
       muted_topics_link: "Mostrar temas silenciados"
       watched_topics_link: "Mostrar temas vigilados"
-      tracked_topics_link: "Mostrar temas seguidos"
+      tracked_topics_link: "Mostrar temas vigilados"
       automatically_unpin_topics: "Dejar de destacar temas automáticamente cuando los leo por completo."
       apps: "Apps"
       revoke_access: "Revocar acceso"
       undo_revoke_access: "Deshacer revocación de acceso"
       api_approved: "Aprobado:"
-      theme: "Tema"
+      theme: "Theme"
       staff_counters:
         flags_given: "reportes útiles"
         flagged_posts: "posts reportados"
@@ -613,16 +617,15 @@ es:
         title: "Cambiar 'Acerca de mí'"
         error: "Hubo un error al cambiar este valor."
       change_username:
-        title: "Cambiar nombre de usuario"
+        title: "Cambiar Nombre de Usuario"
         confirm: "Si cambias tu nombre de usuario, todas las citas anteriores a tus posts y menciones a tu @nombre se romperán. ¿Seguro que quieres hacerlo?"
         taken: "Lo sentimos, ese nombre de usuario ya está siendo usado."
-        error: "Ha ocurrido un error al cambiar tu nombre de usuario."
         invalid: "Este nombre de usuario no es válido. Debe incluir sólo números y letras"
       change_email:
-        title: "Cambiar email"
-        taken: "Lo sentimos, pero ese email no está disponible."
+        title: "Cambiar E-mail"
+        taken: "Lo sentimos, pero ese e-mail no está disponible."
         error: "Ha ocurrido un error al cambiar tu email. ¿Tal vez esa dirección ya está en uso?"
-        success: "Te hemos enviado un email a esa dirección. Por favor sigue las instrucciones de confirmación."
+        success: "Te hemos enviado un e-mail a esa dirección. Por favor sigue las instrucciones de confirmación."
       change_avatar:
         title: "Cambiar tu imagen de perfil"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, basado en"
@@ -632,19 +635,19 @@ es:
         uploaded_avatar: "Foto personalizada"
         uploaded_avatar_empty: "Añade una foto personalizada"
         upload_title: "Sube tu foto"
-        upload_picture: "Subir imagen"
-        image_is_not_a_square: "Aviso: hemos recortado su imagen; la anchura y la altura no eran iguales."
-        cache_notice: "Has cambiado correctamente tu imagen de perfil pero podría tardar un poco en aparecer debido al caché del navegador."
+        upload_picture: "Subir Imagen"
+        image_is_not_a_square: "Advertencia: hemos recortado su imagen; la anchura y la altura no eran iguales."
+        cache_notice: "Has cambiado correctamente tu imagen de perfil pero podría tardar un poco en aparecer debido al caching del navegador."
       change_profile_background:
         title: "Fondo de perfil"
-        instructions: "Fondos de perfil serán centrados y tendrán un ancho por defecto de 850px."
+        instructions: "Fondos de perfil serán centrados y tendrán un ancho por default de 850px."
       change_card_background:
-        title: "Fondo de tarjeta de usuario"
+        title: "Fondo de Tarjeta de Usuario"
         instructions: "Imágenes de fondo serán centrados y tendrán un ancho por defecto de 590px."
       email:
-        title: "Emai"
+        title: "E-mail"
         instructions: "nunca se mostrará al público"
-        ok: "Te enviaremos un email para confirmarlo"
+        ok: "Te enviaremos un email para confirmar"
         invalid: "Por favor, introduce una dirección de correo válida"
         authenticated: "Tu dirección de correo ha sido autenticada por {{provider}}"
         frequency_immediately: "Te enviaremos un email inmediatamente si no has leído aquello que vamos a enviarte."
@@ -682,22 +685,22 @@ es:
       log_out: "Cerrar sesión"
       location: "Ubicación"
       card_badge:
-        title: "Distintivo de tarjeta de usuario"
+        title: "Distintivo de Tarjeta de Usuario"
       website: "Sitio Web"
-      email_settings: "Email"
+      email_settings: "E-mail"
       like_notification_frequency:
-        title: "Notificarme cuando me den Me gusta"
+        title: "Notificar cuando me dan Me gusta"
         always: "Con cada Me gusta que reciban mis posts"
-        first_time_and_daily: "Al primer Me gusta que reciban mis posts y luego diariamente si reciben más"
-        first_time: "Al primer Me gusta que reciban mi posts"
+        first_time_and_daily: "Al primer Me gusta que reciben mis posts y luego diariamente si reciben más"
+        first_time: "Al primer Me gusta que reciben mi posts"
         never: "Nunca"
       email_previous_replies:
-        title: "Incluir respuestas previas en el pie de los emails"
+        title: "Incluir respuestas previas al pie de los emails"
         unless_emailed: "a menos que se hayan enviado previamente"
         always: "siempre"
         never: "nunca"
       email_digests:
-        title: "Cuando no visite la página, envíame un email con un resumen de los temas y respuestas populares"
+        title: "Cuando no visite el sitio, envíame un email con un resumen de los temas y respuestas populares"
         every_30_minutes: "cada 30 minutos"
         every_hour: "cada hora"
         daily: "diariamente"
@@ -708,7 +711,7 @@ es:
       email_in_reply_to: "Incluir un extracto del post al que se responde en los emails"
       email_direct: "Envíame un email cuando alguien me cite, responda a mis posts, mencione mi @usuario o me invite a un tema"
       email_private_messages: "Notifícame por email cuando alguien me envíe un mensaje"
-      email_always: "Quiero recibir notificaciones por email incluso cuando esté de forma activa en la página"
+      email_always: "Quiero recibir notificaciones por email incluso cuando esté de forma activa por el sitio"
       other_settings: "Otros"
       categories_settings: "Categorías"
       new_topic_duration:
@@ -734,7 +737,7 @@ es:
       invited:
         search: "escribe para buscar invitaciones..."
         title: "Invitaciones"
-        user: "Invitar usuario"
+        user: "Invitar Usuario"
         sent: "Enviadas"
         none: "No hay ninguna invitación pendiente que mostrar."
         truncated:
@@ -744,31 +747,34 @@ es:
         redeemed_tab: "Usado"
         redeemed_tab_with_count: "Aceptadas ({{count}})"
         redeemed_at: "Aceptada"
-        pending: "Invitaciones pendientes"
+        pending: "Invitaciones Pendientes"
         pending_tab: "Pendiente"
         pending_tab_with_count: "Pendientes ({{count}})"
-        topics_entered: "Temas vistos"
+        topics_entered: "Temas Vistos"
         posts_read_count: "Posts leídos"
         expired: "Esta invitación ha caducado."
         rescind: "Remover"
         rescinded: "Invitación eliminada"
-        reinvite: "Reenviar invitación"
+        rescind_all: "Borrar todas las invitaciones"
+        rescinded_all: "¡Todas las invitaciones borradas!"
+        rescind_all_confirm: "¿Estás seguro que quieres eliminar todas las invitaciones?"
+        reinvite: "Reenviar Invitación"
         reinvite_all: "Reenviar todas las invitaciones"
         reinvite_all_confirm: "¿Estás seguro que quieres reenviar todas las invitaciones?"
         reinvited: "Invitación reenviada"
         reinvited_all: "¡Todas las invitaciones han sido reenviadas!"
-        time_read: "Tiempo de lectura"
-        days_visited: "Días visitados"
+        time_read: "Tiempo de Lectura"
+        days_visited: "Días Visitados"
         account_age_days: "Antigüedad de la cuenta en días"
-        create: "Enviar una invitación"
-        generate_link: "Copiar enlace de invitación"
-        link_generated: "¡Enlace de invitación generado con éxito!"
-        valid_for: "El enlace de invitación sólo es válido para esta dirección de emai: %{email}"
+        create: "Enviar una Invitación"
+        generate_link: "Copiar Enlace de Invitación"
+        link_generated: "¡Enlace de invitación generado satisfactoriamente!"
+        valid_for: "El enlace de invitación sólo es válido para esta dirección: %{email}"
         bulk_invite:
           none: "No has invitado a nadie aún. Puedes enviar invitaciones individuales o invitar a varias personas a la vez <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>subiendo un archivo de invitación en masa</a>."
-          text: "Archivo de invitación en masa"
+          text: "Invitación masiva desde archivo"
           success: "Archivo subido correctamente, se te notificará con un mensaje cuando se complete el proceso."
-          error: "Lo sentimos, el archivo debe tener formato CSV. "
+          error: "Lo siento, el archivo debe tener formato CSV. "
       password:
         title: "Contraseña"
         too_short: "Tu contraseña es demasiada corta."
@@ -813,8 +819,8 @@ es:
         more_badges: "Más distintivos"
         top_links: "Top enlaces"
         no_links: "No hay enlaces aún."
-        most_liked_by: "Los que dieron más me gusta"
-        most_liked_users: "De quien recibió más Me gusta"
+        most_liked_by: "De quienes recibió más me gusta"
+        most_liked_users: "A quienes dio más me gusta"
         most_replied_to_users: "A quienes más respondió"
         no_likes: "No hay me gusta aún."
       associated_accounts: "Inicios de sesión"
@@ -838,20 +844,20 @@ es:
     errors:
       prev_page: "mientras se intentaba cargar"
       reasons:
-        network: "Error de red"
-        server: "Error del servidor"
-        forbidden: "Acceso denegado"
+        network: "Error de Red"
+        server: "Error del Servidor"
+        forbidden: "Acceso Denegado"
         unknown: "Error"
         not_found: "Página no encontrada"
       desc:
         network: "Por favor revisa tu conexión."
         network_fixed: "Parece que ha vuelto."
         server: "Código de error: {{status}}"
-        forbidden: "No tienes permitido ver eso."
+        forbidden: "No estás permitido para ver eso."
         not_found: "¡Ups! la aplicación intentó cargar una URL inexistente."
         unknown: "Algo salió mal."
       buttons:
-        back: "Volver atrás"
+        back: "Volver Atrás"
         again: "Intentar de Nuevo"
         fixed: "Cargar Página"
     close: "Cerrar"
@@ -859,7 +865,7 @@ es:
     logout: "Has cerrado sesión."
     refresh: "Actualizar"
     read_only_mode:
-      enabled: "Este sitio está en modo de solo lectura. Puedes continuar navegando pero algunas acciones como responder o dar \"Me gusta\" no estarán disponibles por ahora."
+      enabled: "Este sitio está en modo solo-lectura. Puedes continuar navegando pero algunas acciones como responder o dar \"me gusta\" no están disponibles por ahora."
       login_disabled: "Iniciar sesión está desactivado mientras el foro esté en modo solo lectura."
       logout_disabled: "Cerrar sesión está desactivado mientras el sitio se encuentre en modo de sólo lectura."
     too_few_topics_and_posts_notice: "¡Vamos a <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>dar por comenzada la comunidad!</a> Hay <strong>%{currentTopics} / %{requiredTopics}</strong> temas y <strong>%{currentPosts} / %{requiredPosts}</strong> posts. Los nuevos visitantes necesitan algo que leer y a lo que responder."
@@ -934,6 +940,9 @@ es:
       complete_email_found: "Encontramos una cuenta que coincide con el e-mail <b>%{email}</b>, deberías recibir en breve un e-mail con instrucciones para restablecer tu contraseña."
       complete_username_not_found: "Ninguna cuenta concuerda con el nombre de usuario <b>%{username}</b>"
       complete_email_not_found: "Ninguna cuenta concuerda con <b>%{email}</b>"
+      help: "¿No llegó el email? Asegúrese de chequear primero su carpeta de correo no deseado. <p>¿No estás seguro de qué email usaste? Ingrese su email y le avisaremos si existe aquí.</p><p>Si no tienes acceso al email de tu cuenta, por favor contacta <a href='/about'>a nuestro staff.</a></p>"
+      button_ok: "OK"
+      button_help: "Ayuda"
     login:
       title: "Iniciar Sesión"
       username: "Usuario"
@@ -942,7 +951,7 @@ es:
       caps_lock_warning: "Está activado Bloqueo de Mayúsculas"
       error: "Error desconocido"
       rate_limit: "Por favor, espera un poco antes de volver a intentar iniciar sesión."
-      blank_username_or_password: "Por favor, introduce tu e-mail o usuario, y tu contraseña."
+      blank_username_or_password: "Por favor, introducir tu e-mail o usuario, y tu contraseña."
       reset_password: 'Restablecer Contraseña'
       logging_in: "Iniciando Sesión"
       or: "O"
@@ -952,7 +961,7 @@ es:
       requires_invite: "Lo sentimos pero solo se puede acceder a este foro mediante invitación."
       not_activated: "No puedes iniciar sesión todavía. Anteriormente te hemos enviado un email de activación a <b>{{sentTo}}</b>. Por favor sigue las instrucciones en ese email para activar tu cuenta."
       not_allowed_from_ip_address: "No puedes iniciar sesión desde esa dirección IP."
-      admin_not_allowed_from_ip_address: "No puedes iniciar sesión como administrador desde esta dirección IP."
+      admin_not_allowed_from_ip_address: "No puedes iniciar sesión como admin desde esta dirección IP."
       resend_activation_email: "Has clic aquí para enviar el email de activación nuevamente."
       resend_title: "Enviar de nuevo el email de activación"
       change_email: "Cambiar dirección de email"
@@ -989,10 +998,12 @@ es:
       welcome_to: "¡Bienvenido a %{site_name}!"
       invited_by: "Has sido invitado por:"
       social_login_available: "También serás capaz de loguearte usando cualquier red social usando ese email."
-      your_email: "La dirección de email de tu cuenta es <b>%{email}</b>."
+      your_email: "Tu cuenta de correo electrónico es <b>%{email}</b>."
       accept_invite: "Aceptar invitación"
       success: "Tu nueva cuenta está confirmada y ahora estás logueado/a."
-      password_label: "Establecer contraseña (opcional)"
+      name_label: "Nombre"
+      password_label: "Establecer contraseña"
+      optional_description: "(opcional)"
     password_reset:
       continue: "Continuar a %{site_name}"
     emoji_set:
@@ -1001,9 +1012,10 @@ es:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Solo categorías"
-      categories_with_featured_topics: "Categorías con temas destacados"
+      categories_with_featured_topics: "Categorías y temas destacados"
       categories_and_latest_topics: "Categorías y temas recientes"
     shortcut_modifier_key:
       shift: 'Shift'
@@ -1015,6 +1027,7 @@ es:
       options: "Opciones"
       whisper: "susurrar"
       unlist: "invisible"
+      blockquote_text: "Cita"
       add_warning: "Ésta es una advertencia oficial."
       toggle_whisper: "Activar/desactivar Susurro"
       toggle_unlisted: "Visible / Invisible"
@@ -1030,7 +1043,7 @@ es:
       cannot_see_mention:
         category: "Mencionaste a {{username}} pero no será notificado porque no tiene acceso a esta categoría. Necesitarás añadirlo a un grupo para que tenga acceso a esta categoría."
         private: "Mencionaste a {{username}} pero no se les notificará porque no pueden ver este mensaje personal. Necesitarás invitarlos a este MP."
-      duplicate_link: "Parece que tu enlace a <b>{{domain}}</b> ya ha sido publicado en el tema por <b>@{{username}}</b> en <a href='{{post_url}}'>una respuesta {{ago}}</a> – ¿seguro que que quieres publicarlo de nuevo?"
+      duplicate_link: "Parece que tu enlace a <b>{{domain}}</b> ha sido ya publicado en el tema por  <b>@{{username}}</b> en <a href='{{post_url}}'>un post hace {{ago}} </a> – ¿seguro que quieres publicarlo de nuevo?"
       error:
         title_missing: "Es necesario un título"
         title_too_short: "El título debe ser por lo menos de {{min}} caracteres."
@@ -1166,7 +1179,7 @@ es:
       sort_by: "Ordenar por"
       relevance: "Relevancia"
       latest_post: "Post más reciente"
-      latest_topic: "Último tema"
+      latest_topic: "Temas recientes"
       most_viewed: "Más visto"
       most_liked: "Más \"Me gusta\" recibidos"
       select_all: "Seleccionar todo"
@@ -1180,7 +1193,7 @@ es:
       no_more_results: "No se encontraron más resultados."
       searching: "Buscando ..."
       post_format: "#{{post_number}} por {{username}}"
-      results_page: "Resultados de la Búsqueda"
+      results_page: "Buscar resultados"
       context:
         user: "Buscar posts por @{{username}}"
         category: "Buscar la categoría #{{category}}"
@@ -1212,6 +1225,7 @@ es:
           seen: Leídos
           unseen: No leídos
           wiki: son tipo wiki
+          all_tags: Contiene todas las etiquetas
         statuses:
           label: Donde los temas
           open: están abiertos
@@ -1237,7 +1251,7 @@ es:
         select_all: "Seleccionar todos"
         clear_all: "Desmarcar todos"
         unlist_topics: "Hacer invisibles"
-        relist_topics: "Listar de nuevo los Temas"
+        relist_topics: "Relistar Topics"
         reset_read: "Restablecer leídos"
         delete: "Eliminar temas"
         dismiss: "Descartar"
@@ -1248,7 +1262,7 @@ es:
         dismiss_new: "Ignorar nuevos"
         toggle: "activar selección de temas en bloque"
         actions: "Acciones en bloque"
-        change_category: "Añadir Categoría"
+        change_category: "Cambiar Categoría"
         close_topics: "Cerrar temas"
         archive_topics: "Archivar temas"
         notification_level: "Notificaciones"
@@ -1257,9 +1271,9 @@ es:
           one: "Has seleccionado <b>1</b> tema."
           other: "Has seleccionado <b>{{count}}</b> temas."
         change_tags: "Cambiar etiquetas"
-        append_tags: "Añadir etiquetas"
+        append_tags: "Agregar etiquetas"
         choose_new_tags: "Elige nuevas etiquetas para estos temas:"
-        choose_append_tags: "Elige nuevas etiquetas a añadir para estos temas:"
+        choose_append_tags: "Elegir nuevas etiquetas para agregar a estos temas:"
         changed_tags: "Las etiquetas de esos temas fueron cambiadas."
       none:
         unread: "No hay temas que sigas y que no hayas leído ya."
@@ -1348,44 +1362,44 @@ es:
       jump_reply_down: saltar a la última respuesta
       deleted: "El tema ha sido borrado"
       topic_status_update:
-        title: "Establecer Temporizador al Tema"
-        save: "Establecer Temporizador"
+        title: "Configurar Temporizador de temas"
+        save: "Configurar Temporizador"
         num_of_hours: "Número de horas:"
         remove: "Quitar Temporizador"
-        publish_to: "Publicar a:"
-        when: "Cuando:"
+        publish_to: "Publicar el:"
+        when: "Cuándo:"
       auto_update_input:
-        later_today: "Hoy, más tarde"
+        later_today: "Más tarde"
         tomorrow: "Mañana"
-        later_this_week: "Esta semana, más tarde"
+        later_this_week: "Esta misma semana"
         this_weekend: "Este fin de semana"
-        next_week: "Próxima semana"
+        next_week: "Semana próxima"
         next_month: "Próximo mes"
-        pick_date_and_time: "Elegir fecha y hora"
-        set_based_on_last_post: "Cerrar basándose en el último mensaje"
+        pick_date_and_time: "Selecciona fecha y horario"
+        set_based_on_last_post: "Cerrar basándose en el último post"
       publish_to_category:
-        title: "Programar publicación"
+        title: "Programar Publicación"
       temp_open:
         title: "Abrir temporalmente"
       auto_reopen:
-        title: "Abrir tema automáticamente"
+        title: "Auto-Abrir tema"
       temp_close:
         title: "Cerrar temporalmente"
       auto_close:
-        title: "Cerrar tema automáticamente"
-        label: "Hora del cierre automático del tema:"
-        error: "Por favor, introduce un valor válido."
-        based_on_last_post: "No cerrar hasta que el último post en el tema sea al menos así de antiguo."
+        title: "Auto-Cerrar tema"
+        label: "Horas para cierre automático del tema:"
+        error: "Por favor introduzca un valor válido."
+        based_on_last_post: "No cerrar hasta que el último post en el tema es al menos así de antiguo."
       auto_delete:
-        title: "Eliminar Automáticamente el Tema"
+        title: "Auto-Eliminar Tema"
       reminder:
-        title: "Recuérdame"
+        title: "Recordarme"
       status_update_notice:
         auto_open: "Este tema se abrirá automáticamente %{timeLeft}."
         auto_close: "Este tema se cerrará automáticamente %{timeLeft}."
         auto_publish_to_category: "Este tema será publicado en <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
-        auto_close_based_on_last_post: "Este tema se cerrará %{duration} después de la última respuesta."
-        auto_delete: "Este tema se eliminará automáticamente %{timeLeft}."
+        auto_close_based_on_last_post: "Este tema será cerrado %{duration} después de la última respuesta."
+        auto_delete: "Este tema se borrará automáticamente en %{timeLeft}."
         auto_reminder: "Te recordaremos sobre este tema %{timeLeft}."
       auto_close_title: 'Configuración de auto-cerrado'
       auto_close_immediate:
@@ -1417,10 +1431,10 @@ es:
           '3_2': 'Recibirás notificaciones porque estás vigilando este tema.'
           '3_1': 'Recibirás notificaciones porque creaste este tema.'
           '3': 'Recibirás notificaciones porque estás vigilando este tema.'
-          '2_8': 'Verás un contador de nuevas respuestas porque estás siguiendo esta categoría.'
-          '2_4': 'Verás un contador de nuevas respuestas porque has publicado una respuesta al tema.'
-          '2_2': 'Verás un contador de nuevas respuestas porque estás siguiendo este tema.'
-          '2': 'Verás un contador de nuevas respuestas porque has <a href="/u/{{username}}/preferences">leído este tema</a>.'
+          '2_8': 'Tú verás la cuenta de nuevas respuestas porque estás siguiendo esta categoría.'
+          '2_4': 'Tú verás la cuenta de nuevas respuestas porque has publicado una respuesta en este tema.'
+          '2_2': 'Tú verás la cuenta de nuevas respuestas porque estás siguiendo este tema.'
+          '2': 'Tú verás la cuenta de nuevas respuestas porque has <a href="/u/{{username}}/preferences">leído este tema</a>.'
           '1_2': 'Se te notificará solo si alguien menciona tu @nombre o te responde a un post.'
           '1': 'Se te notificará si alguien menciona tu @nombre o te responde a un post.'
           '0_7': 'Estás ignorando todas las notificaciones en esta categoría.'
@@ -1456,7 +1470,7 @@ es:
         open: "Abrir tema"
         close: "Cerrar tema"
         multi_select: "Seleccionar posts..."
-        timed_update: "Establecer Temporizador al Tema..."
+        timed_update: "Configurar Temporizador de temas..."
         pin: "Destacar tema..."
         unpin: "Dejar de destacar..."
         unarchive: "Desarchivar Tema"
@@ -1577,7 +1591,7 @@ es:
           other: "Por favor escoge el nuevo dueño de los {{count}} posts de <b>{{old_user}}</b>."
         instructions_warn: "Ten en cuenta que las notificaciones sobre este post no serán transferidas al nuevo usuario de forma retroactiva.<br>Aviso: actualmente, los datos que no dependen del post son transferidos al nuevo usuario. Usar con precaución."
       change_timestamp:
-        title: "Cambiar Fecha y Hora..."
+        title: "Cambiar Timestamp..."
         action: "cambiar timestamp"
         invalid_timestamp: "El Timestamp no puede ser futuro"
         error: "Hubo un error cambiando el timestamp de este tema."
@@ -1658,6 +1672,7 @@ es:
         has_liked: "te gusta este post"
         undo_like: "deshacer Me gusta"
         edit: "edita este post"
+        edit_action: "Editar"
         edit_anonymous: "Lo sentimos, necesitas iniciar sesión para editar este post."
         flag: "reporta esta publicación de forma privada para atención de los moderadores o enviarles un notificación privada sobre el tema"
         delete: "elimina este post"
@@ -1764,8 +1779,8 @@ es:
           other: "¿Seguro que quieres eliminar todos esos posts?"
       merge:
         confirm:
-          one: "¿Seguro que quieres unir esos posts?"
-          other: "¿Seguro que quieres unir esos {{count}} posts?"
+          one: "Seguro que quieres unir esos posts?"
+          other: "Seguro que quieres unir esos {{count}} posts?"
       revisions:
         controls:
           first: "Primera revisión"
@@ -1811,8 +1826,8 @@ es:
       settings: 'Ajustes'
       topic_template: "Plantilla de tema"
       tags: "Etiquetas"
-      tags_allowed_tags: "Las únicas etiquetas que pueden aplicarse en esta categoría:"
-      tags_allowed_tag_groups: "Grupos de etiquetas que sólo pueden pueden utilizarse en esta categoría:"
+      tags_allowed_tags: "Solo permitir estas etiquetas para usarse en esta categoría:"
+      tags_allowed_tag_groups: "Solo permitir las etiquetas de estos grupos para usarse en esta categoría:"
       tags_placeholder: "(Opcional) lista de etiquetas permitidas"
       tag_groups_placeholder: "(Opcional) lista de grupos de etiquetas permitidos"
       topic_featured_link_allowed: "Permitir enlaces destacados en esta categoría"
@@ -1848,14 +1863,14 @@ es:
       email_in_disabled: "La posibilidad de publicar nuevos temas por email está deshabilitada en los ajustes del sitio. Para habilitar la publicación de nuevos temas por email,"
       email_in_disabled_click: 'activa la opción "email in".'
       suppress_from_homepage: "Ocultar categoría de la página de inicio."
-      show_subcategory_list: "Mostrar la lista de subcategorías encima de los temas en esta categoría."
+      show_subcategory_list: "Mostrar la lista de subcategorías arriba de la lista de temas en esta categoría."
       num_featured_topics: "Número de temas a mostrar en la página de categorías:"
       subcategory_num_featured_topics: "Número de temas destacados a mostrar en la página superior de categorías:"
       all_topics_wiki: "Hacer todos los temas wiki por defecto"
-      subcategory_list_style: "Estilo de la lista de subcategorías:"
-      sort_order: "Ordenar la Lista de Temas por:"
-      default_view: "Lista de Temas por defecto:"
-      default_top_period: "Periodo Máximo por Defecto:"
+      subcategory_list_style: "Estilo de lista de Subcategorías"
+      sort_order: "Ordenar lista de temas:"
+      default_view: "Orden por defecto:"
+      default_top_period: "Periodo por defecto para el TOP"
       allow_badges_label: "Permitir conceder distintivos en esta categoría"
       edit_permissions: "Editar permisos"
       add_permission: "Añadir permisos"
@@ -1896,7 +1911,7 @@ es:
       subcategory_list_styles:
         rows: "Filas"
         rows_with_featured_topics: "Filas con temas destacados"
-        boxes: "Caja"
+        boxes: "Cajas"
         boxes_with_featured_topics: "Cajas con temas destacados"
     flagging:
       title: '¡Gracias por ayudar a mantener una comunidad civilizada!'
@@ -2143,7 +2158,7 @@ es:
       granted_on: "Concedido hace: %{date}"
       others_count: "Otras personas con este distintivo (%{count})"
       title: Distintivos
-      allow_title: "Puedes usar esta insignia como título"
+      allow_title: "Puedes usar este distintivo como título"
       multiple_grant: "Puedes ganar esto varias veces"
       badge_count:
         one: "1 Distintivo"
@@ -2390,7 +2405,7 @@ es:
         add_members: "Añadir miembros"
         custom: "Personalizado"
         bulk_complete: "Los usuarios han sido añadidos al grupo."
-        bulk_complete_users_not_added: "Estos usuarios no se agregaron (asegúrate de que tienen una cuenta):"
+        bulk_complete_users_not_added: "Estos usuarios no fueron agregados (asegurar que ellos tengan una cuenta):"
         bulk: "Añadir al grupo en masa"
         bulk_paste: "Pega una lista de nombres de usuario o emails, uno por línea:"
         bulk_select: "(selecciona un grupo)"
@@ -2440,7 +2455,7 @@ es:
         event_type_missing: "Necesitas establecer al menos un tipo de evento."
         content_type: "Tipo de contenido"
         secret: "Secret"
-        event_chooser: "¿Qué eventos deberían desencadenar este webhook?"
+        event_chooser: "¿Qué eventos te gustaría que dispararan este webhook?"
         wildcard_event: "Envíame todo."
         individual_event: "Seleccionar eventos individuales."
         verify_certificate: "Comprobar certificado TLS de la payload url"
@@ -2573,21 +2588,21 @@ es:
         title: "Personalizar"
         long_title: "Personalizaciones del sitio"
         preview: "vista previa"
-        explain_preview: "Ver el sitio con este tema activado"
+        explain_preview: "Ver el sitio con el theme habilitado"
         save: "Guardar"
         new: "Nuevo"
         new_style: "Nuevo Estilo"
         import: "Importar"
         delete: "Eliminar"
-        delete_confirm: "¿Eliminar este tema?"
+        delete_confirm: "¿Eliminar este theme?"
         about: "Modifica hojas de estilo CSS y cabeceras HTML en el sitio. Añade una personalización para empezar."
         color: "Color"
         opacity: "Opacidad"
         copy: "Copiar"
         copy_to_clipboard: "Copiar al Portapapeles"
         copied_to_clipboard: "Copiado al Portapapeles"
-        copy_to_clipboard_error: "Error al copiar los datos al Portapapeles"
-        theme_owner: "No se puede editar, propiedad de:"
+        copy_to_clipboard_error: "Error copiando datos al Portapapeles"
+        theme_owner: "No editable, propiedad de:"
         email_templates:
           title: "Diseño del email"
           subject: "Título del email"
@@ -2597,75 +2612,75 @@ es:
           revert: "Revertir los cambios"
           revert_confirm: "¿Estás seguro de querer revertir los cambios?"
         theme:
-          import_theme: "Importar Tema"
+          import_theme: "Importar Theme"
           customize_desc: "Personalizar:"
-          title: "Temas"
+          title: "Themes"
           long_title: "Modifique los colores, los CSS y los contenidos HTML de su sitio"
           edit: "Editar"
-          edit_confirm: "Este es un tema remoto, si editas el CSS/HTML tus cambios se borrarán la próxima vez que actualices el tema."
+          edit_confirm: "Este es un theme remoto, si editas CSS/HTML, los cambios serán borrados en la próxima actualización al theme."
           common: "Común"
-          desktop: "Ordenador"
+          desktop: "Escritorio"
           mobile: "Móvil"
-          preview: "Previsualizar"
-          is_default: "Tema activado por defecto"
-          user_selectable: "Tema seleccionable por los usuarios"
-          color_scheme: "Paleta de color"
-          color_scheme_select: "Colores a utilizar por el tema:"
-          custom_sections: "Secciones personalizadas:"
-          theme_components: "Componentes del Tema"
-          uploads: "Subidas"
-          no_uploads: "Puedes subir elementos asociados al tema, como fuentes e imágenes"
-          add_upload: "Añadir Subida"
-          upload_file_tip: "Elige un recurso para cargarlo (png, woff2, etc...)"
-          variable_name: "Nombre de la variable SCSS:"
+          preview: "Vista previa"
+          is_default: "Theme habilitado por defecto"
+          user_selectable: "Theme puede ser seleccionado por usuarios"
+          color_scheme: "Esquema de color"
+          color_scheme_select: "Selecciona colores para ser usados en el theme"
+          custom_sections: "Personalizaciones:"
+          theme_components: "Componentes del Theme"
+          uploads: "Subidos"
+          no_uploads: "Puedes subir archivos asociados con tu theme como fuentes e imágenes "
+          add_upload: "Agregar Subido"
+          upload_file_tip: "Selecciona un archivo a subir (png, woff2, etc...)"
+          variable_name: "Nombre de variable SCSS:"
           upload: "Subir"
-          child_themes_check: "El tema incluye otros temas"
-          css_html: "CSS/HTML personalizado"
+          child_themes_check: "Theme incluye otros themes hijos"
+          css_html: "Personalizar CSS/HTML"
           edit_css_html: "Editar CSS/HTML"
-          edit_css_html_help: "No se ha editado ningún CSS ni HTML"
-          delete_upload_confirm: "Eliminar esta subida? (El CSS del tema puede dejar de funcionar!)"
-          import_web_tip: "Repositorio que contiene el tema"
-          import_file_tip: "Archivo .dcstyle.json que contiene el tema"
-          about_theme: "Sobre el tem"
+          edit_css_html_help: "No has editado ningún CSS o HTML"
+          delete_upload_confirm: "Borrar este upload? (El theme CSS puede dejar de funcionar!)"
+          import_web_tip: "Repositorio que contiene el theme"
+          import_file_tip: "archivo .dcstyle.json que contiene el theme"
+          about_theme: "Acerca del Theme"
           license: "Licencia"
-          component_of: "El tema es un componente de:"
-          update_to_latest: "Actualizar a la última versión"
-          check_for_updates: "Comprobar actualizaciones"
+          component_of: "Theme es un componente de:"
+          update_to_latest: "Actualizar a lo último"
+          check_for_updates: "Verificar por Actualizaciones"
           updating: "Actualizando..."
-          up_to_date: "El tema está actualizado, última comprobación:"
-          add: "Añadir"
+          up_to_date: "Theme actualizado, última verificación:"
+          add: "Agregar"
           commits_behind:
-            one: "¡El tema está 1 commit atrasado!"
-            other: "¡El tema está {{count}} commits atrasado!"
+            one: "Theme está 1 commit detrás!"
+            other: "Theme está {{count}} commits detrás!"
           scss:
             text: "CSS"
-            title: "Introducir CSS personalizado, se acepta tanto CSS como SCSS"
+            title: "Ingresa tu CSS, aceptamos estilos válidos de CSS y SCSS"
           header:
-            text: "Header"
-            title: "Introduce HTML para mostrarlo por encima del encabezado del sitio"
+            text: "Encabezado"
+            title: "Ingresa HTML para mostrar en el encabezado"
           after_header:
             text: "Después del Encabezado"
-            title: "Introduce HTML para mostrarlo por debajo del encabezado del sitio"
+            title: "Ingresa HTML para mostrar todas las páginas después del encabezado"
           footer:
             text: "Pie de página"
-            title: "Introduce HTML para mostrarlo en el pie de página"
+            title: "Ingresa HTML para mostrar en el pie de página"
           embedded_scss:
-            text: "CSS incrustado"
-            title: "Introduce el CSS personalizado para presentarlo en la versión incrustada de los comentarios"
+            text: "CSS embebido"
+            title: "Ingresar CSS personalizado para mostrar en los comentarios embebidos"
           head_tag:
             text: "</head>"
-            title: "HTML que se insertará antes de la etiqueta </head>"
+            title: "HTML que será insertado antes del tag </head>"
           body_tag:
             text: "</body>"
-            title: "HTML que se insertará antes de la etiqueta </body>"
+            title: "HTML que será insertado antes del tag </body>"
         colors:
           select_base:
-            title: "Selecciona la combinación de colores básica"
-            description: "Combinación básica:"
+            title: "Selecciona esquema base de color"
+            description: "Esquema base:"
           title: "Colores"
-          edit: "Editar Combinaciones de Colores"
+          edit: "Editar esquemas de color"
           long_title: "Esquemas de color"
-          about: "Modifica los colores utilizados por tus temas. Crea una nueva combinación de colores para empezar."
+          about: "Modifica los colores utilizados en tu theme. Crea un nuevo esquema de color para empezar."
           new_name: "Nuevo esquema de color"
           copy_name_prefix: "Copia de"
           delete_confirm: "¿Eliminar este esquema de color?"
@@ -2783,6 +2798,8 @@ es:
           block: "bloquear"
           do_nothing: "no hacer nada"
         staff_actions:
+          all: "todas"
+          filter: "Filtrar:"
           title: "Acciones del staff"
           clear_filters: "Mostrar todo"
           staff_user: "Usuario administrador"
@@ -2803,8 +2820,8 @@ es:
             change_trust_level: "cambiar nivel de confianza"
             change_username: "cambiar nombre de usuario"
             change_site_setting: "cambiar configuración del sitio"
-            change_theme: "cambiar tem"
-            delete_theme: "borrar tema"
+            change_theme: "cambiar theme"
+            delete_theme: "borrar theme"
             change_site_text: "cambiar textos"
             suspend_user: "suspender usuario"
             unsuspend_user: "desbloquear usuario"
@@ -2836,6 +2853,8 @@ es:
             change_readonly_mode: "cambio a modo de sólo lectura"
             backup_download: "descargar copia de seguridad"
             backup_destroy: "destruir copia de seguridad"
+            reviewed_post: "posts revisados"
+            custom_staff: "acción personalizada por plugin"
         screened_emails:
           title: "Correos bloqueados"
           description: "Cuando alguien trata de crear una cuenta nueva, los siguientes correos serán revisados y el registro será bloqueado, o alguna otra acción será realizada."
@@ -2943,13 +2962,13 @@ es:
         refresh_browsers_message: "¡Mensaje enviado a todos los clientes!"
         show_public_profile: "Ver perfil público"
         impersonate: 'Impersonar a'
-        action_logs: "Registro de acciones"
+        action_logs: "Logs de acciones"
         ip_lookup: "Búsqueda de IP"
         log_out: "Cerrar sesión"
         logged_out: "El usuario ha cerrado sesión desde todos los dispositivos"
         revoke_admin: 'Revocar administrador'
         grant_admin: 'Conceder administración'
-        grant_admin_confirm: "Te hemos enviado un email para verificar el nuevo administrador. Por favor, ábrelo y sigue las instrucciones."
+        grant_admin_confirm: "Te hemos enviado un e-mail para verificar el nuevo administrador. Por favor abre el correo y sigue las instrucciones."
         revoke_moderation: 'Revocar moderación'
         grant_moderation: 'Conceder moderación'
         unblock: 'Desbloquear'
@@ -3008,7 +3027,7 @@ es:
         reset_bounce_score:
           label: "Restablecer"
           title: "Restablece la puntuación de rebote de nuevo a 0"
-        visit_profile: "Visita <a href='%{url}'>las preferencias del usuario</a> para editar su perfil"
+        visit_profile: "Visita <a href='%{url}'>esta página de preferencias del usuario</a> para editar el perfil"
         deactivate_explanation: "Un usuario desactivado debe rehabilitar su dirección de correo."
         suspended_explanation: "Un usuario suspendido no puede ingresar al sitio."
         block_explanation: "Un usuario bloqueado no puede publicar posts ni crear temas."
@@ -3219,7 +3238,7 @@ es:
         sample: "Usa el siguiente código HTML en tu sitio para crear e insertar temas. Reempalza <b>REPLACE_ME</b> con la URL canónica de la página donde quieres insertar."
         title: "Insertado"
         host: "Hosts Permitidos"
-        class_name: "Nombre de la Clase"
+        class_name: "Nombre de clase"
         path_whitelist: "Lista blanca de rutas"
         edit: "editar"
         category: "Publicar a Categoría"
@@ -3239,6 +3258,7 @@ es:
         embed_classname_whitelist: "Clases CSS permitidas"
         feed_polling_enabled: "Importar posts usando RSS/ATOM"
         feed_polling_url: "URL del feed RSS/ATOM del que extraer datos"
+        feed_polling_frequency_mins: "Frecuencia del feed de la encuesta (en minutos)"
         save: "Guardar ajustes de Insertado"
       permalink:
         title: "Enlaces permanentes"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 1c5b92042e8..aa3872e639a 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -141,19 +141,19 @@ et:
     bootstrap_mode_disabled: "Käivitusrežiim lülitub välja järgmise 24 tunni jooksul."
     s3:
       regions:
-        us_east_1: "US Ida (N. Virginia)"
-        us_west_1: "US Lääs (N. California)"
-        us_west_2: "US Lääs (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EL (Iirimaa)"
-        eu_central_1: "EL (Frankfurt)"
-        ap_southeast_1: "Aasia ja Vaikne ookean (Singapur)"
-        ap_southeast_2: "Aasia ja Vaikne ookean (Sydney)"
-        ap_south_1: "Aasia ja Vaikse Ookeani (Mumbai)"
         ap_northeast_1: "Aasia ja Vaikne ookean (Tokyo)"
         ap_northeast_2: "Aasia ja Vaikne ookean (Seoul)"
-        sa_east_1: "Lõuna-Ameerika (Sao Paulo)"
+        ap_south_1: "Aasia ja Vaikse Ookeani (Mumbai)"
+        ap_southeast_1: "Aasia ja Vaikne ookean (Singapur)"
+        ap_southeast_2: "Aasia ja Vaikne ookean (Sydney)"
         cn_north_1: "Hiina (Beijing)"
+        eu_central_1: "EL (Frankfurt)"
+        eu_west_1: "EL (Iirimaa)"
+        sa_east_1: "Lõuna-Ameerika (Sao Paulo)"
+        us_east_1: "US Ida (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US Lääs (N. California)"
+        us_west_2: "US Lääs (Oregon)"
     edit: 'muuda teema pealkirja ja foorumit'
     not_implemented: "Seda omadust pole veel rakendatud, vabandame!"
     no_value: "Ei"
@@ -343,11 +343,7 @@ et:
         full_name: 'Täisnimi'
         add_members: "Lisa liikmed"
         delete_member_confirm: "Eemalda '%{username}' grupist '%{group}'?"
-      request_membership_pm:
-        title: "Liikmelisuse taotlus"
-        body: "Soovin liituda grupiga @%{groupName}."
       name_placeholder: "Grupi nimi, tühikuteta, vastab kasutajanime reeglitele"
-      public: "Luba kasutajatel vabalt grupiga liituda/sellest lahkuda (nõuab, et grupp oleks nähtav)"
       empty:
         posts: "Selle grupi liikmetelt ei ole postitusi."
         members: "Sellel grupil liikmed puuduvad."
@@ -368,7 +364,6 @@ et:
       bio: "Grupist"
       selector_placeholder: "Lisa liikmeid"
       owner: "omanik"
-      visible: "Grupp on kõigile kasutajatele nähtav."
       index:
         title: "Grupid"
         empty: "Ühtegi nähtavat gruppi pole."
@@ -478,7 +473,6 @@ et:
       mute: "Vaigista"
       edit: "Muuda Eelistusi"
       download_archive:
-        button_text: "Lae Minu Postitused alla"
         confirm: "Oled kindel, et soovid enda postitused alla laadida?"
         success: "Allalaadimine käivitatud. Protsessi lõppemisel saadetakse Sulle teade."
         rate_limit_error: "Postitusi saab alla laadida üks kord ööpäevas. Palun proovi homme uuesti."
@@ -595,7 +589,6 @@ et:
         title: "Muuda kasutajanime"
         confirm: "Muutes oma kasutajanime, katkevad kõik varasemad viited sinu postitustele ja @name mainimised. Oled täiesti veendunud, et soovid seda?"
         taken: "Vabandust, see kasutajanimi on võetud."
-        error: "Kasutajanime muutmisel tekkis tõrge."
         invalid: "Selline kasutajanimi ei ole lubatud. Kasutada tohib ainult numbreid ja tähti"
       change_email:
         title: "Muuda meiliaadressi"
@@ -965,7 +958,6 @@ et:
       your_email: "Teie konto meiliaadress on <b>%{email}</b>."
       accept_invite: "Võta kutse vastu"
       success: "Teie konto on loodud ning olete nüüd sisse logitud."
-      password_label: "Määra parool (mittekohustuslik)"
     password_reset:
       continue: "Edasi saidile %{site_name}"
     emoji_set:
@@ -1680,10 +1672,6 @@ et:
         confirm:
           one: "Oled kindel, et soovid selle postituse kustutada?"
           other: "Oled kindel, et soovid kõik need postitused kustutada?"
-      merge:
-        confirm:
-          one: "Oled kindel, et soovid need postitused ühendada?"
-          other: "Oled kindel, et soovid need {{count}} postitust ühendada?"
       revisions:
         controls:
           first: "Esimene redaktsioon"
@@ -1718,8 +1706,6 @@ et:
       settings: 'Sätted'
       topic_template: "Teema mall"
       tags: "Sildid"
-      tags_allowed_tags: "Sildid, mida saab kasutada vaid selles foorumis:"
-      tags_allowed_tag_groups: "Siltide grupid, mida saab kasutada vaid selles foorumis:"
       tags_placeholder: "(Valikuline) loetelu lubatud silte"
       tag_groups_placeholder: "(Valikuline) loetelu lubatud siltide gruppe"
       topic_featured_link_allowed: "Luba selles foorumis esiletõstetud linke "
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index fd1aa2b5c93..f4d0e5c6ac9 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -130,20 +130,20 @@ fa_IR:
       default_description: "پیش‌فرض"
     s3:
       regions:
-        us_east_1: "شرق ایالات متحده (ویرجینیا شمالی)"
-        us_west_1: "غرب ایالات متحده (کالیفرنیا شمالی)"
-        us_west_2: "غرب ایالات متحده  (اورگان)"
-        us_gov_west_1: "AWS GovCloud (ایالات متحده)"
-        eu_west_1: "اروپا (ایرلند)"
-        eu_west_2: "اروپا (لندن)"
-        eu_central_1: "اروپا (فرانکفورت)"
-        ap_southeast_1: "آسیا و اقیانوسیه (سنگاپور)"
-        ap_southeast_2: "آسیا و اقیانوسیه (سیدنی)"
-        ap_south_1: "آسیا و اقیانوسیه (بمبئی)"
         ap_northeast_1: "آسیا و اقیانوسیه (توکیو)"
         ap_northeast_2: "آسیا و اقیانوسیه (سئول)"
-        sa_east_1: "آمریکای جنوبی (سائوپائولو)"
+        ap_south_1: "آسیا و اقیانوسیه (بمبئی)"
+        ap_southeast_1: "آسیا و اقیانوسیه (سنگاپور)"
+        ap_southeast_2: "آسیا و اقیانوسیه (سیدنی)"
         cn_north_1: "چین (پکن)"
+        eu_central_1: "اروپا (فرانکفورت)"
+        eu_west_1: "اروپا (ایرلند)"
+        eu_west_2: "اروپا (لندن)"
+        sa_east_1: "آمریکای جنوبی (سائوپائولو)"
+        us_east_1: "شرق ایالات متحده (ویرجینیا شمالی)"
+        us_gov_west_1: "AWS GovCloud (ایالات متحده)"
+        us_west_1: "غرب ایالات متحده (کالیفرنیا شمالی)"
+        us_west_2: "غرب ایالات متحده  (اورگان)"
     edit: 'موضوع و دسته‌ی این موضوع را ویرایش کنید'
     not_implemented: "آن ویژگی هنوز به کار گرفته نشده، متأسفیم!"
     no_value: "خیر"
@@ -325,11 +325,7 @@ fa_IR:
         full_name: 'نام و نام خانوادگی'
         add_members: "افزودن اعضا"
         delete_member_confirm: "کاربر '%{username}' از گروه '%{group}' حذف شود؟"
-      request_membership_pm:
-        title: "درخواست عضویت"
-        body: "من تقاضای عضویت در @%{groupName} را دارم."
       name_placeholder: "در نام گروه نمی توان از فاصله استفاده کرد، مانند قوانین نامگذاری نام کاربری"
-      public: "اجازه‌ی ورود/خروج کاربران به گروه (نیازمند قابل نمایش بودن گروه است)"
       empty:
         posts: "در این گروه هیچ نوشته ای توسط کاربران ارسال نشده."
         members: "این گروه هیچ عضوی ندارد"
@@ -351,7 +347,6 @@ fa_IR:
       bio: "درباره گروه"
       selector_placeholder: "افزودن عضو"
       owner: "مالک"
-      visible: "همه‌ی کاربران گروه را می‌بینند"
       index:
         title: "گروه‌ها"
         empty: "هیچ گروه قابل نمایشی وجود ندارد."
@@ -364,6 +359,12 @@ fa_IR:
       mentions: "اشاره‌ها"
       messages: "پیام‌ها"
       notification_level: "سطح آگاه‌سازی پیش‌فرض برای پیام‌های گروهی"
+      visibility_levels:
+        title: "چه کسی می‌تواند این گروه را ببیند؟"
+        public: "همه"
+        members: "صاحبان گروه، اعضا، و مدیران"
+        staff: "صاحبان گروه، و کارکنان"
+        owners: "صاحبان گروه و مدیران"
       alias_levels:
         title: "چه کسی میتواند پیام بفرستد و به این گروه @اشاره کند؟"
         nobody: "هیچ‌کس"
@@ -459,7 +460,7 @@ fa_IR:
       mute: "بی صدا"
       edit: "ویرایش تنظیمات"
       download_archive:
-        button_text: "دانلود نوشته‌های من"
+        button_text: "دانلود همه"
         confirm: "آیا مطمئنید که می‌خواهید نوشته‌هایتان را دانلود کنید؟"
         success: "شروع فرایند دانلود، وقتی این فرایند تکمیل شود به شما از طریق پیام، اطلاع رسانی خواهد شد."
         rate_limit_error: "نوشته‌ها را می توانید فقط یک بار در روز می‌توانید دانلود کنید. لطفا فردا دوباره امتحان کنید."
@@ -588,7 +589,6 @@ fa_IR:
         title: "تغییر نام‌کاربری"
         confirm: "در صورت تغییر نام‌کاربری تمامی نقل‌قول‌ها و اشارات به @نام شما از بین خواهد رفت. از انجام این‌کار اطمینان دارید؟"
         taken: "متأسفیم، آن نام کاربری  قبلا گرفته شده است."
-        error: "در فرآیند تغییر نام کاربری شما خطایی روی داد."
         invalid: "آن نام کاربری نامعتبر است. تنها باید عددها و حرف‌ها را در بر بگیرد."
       change_email:
         title: "تغییر ایمیل"
@@ -722,6 +722,9 @@ fa_IR:
         expired: "این دعوت منقضی شده است."
         rescind: "پاک کردن"
         rescinded: "دعوت حذف شد"
+        rescind_all: "پاکسازی تمام دعوت‌ها"
+        rescinded_all: "تمام دعوت‌ها پاک شدند!"
+        rescind_all_confirm: "آیا مطمئنید که می‌خواهید تمام دعوت‌ها را پاک کنید؟"
         reinvite: "ارسال دوباره دعوت"
         reinvite_all: "ارسال مجدد تمام دعوت‌ها"
         reinvite_all_confirm: "آیا از ارسال مجدد تمامی دعوت‌ها اطمینان دارید؟"
@@ -895,6 +898,8 @@ fa_IR:
       complete_email_found: "ما حساب کاربری که با ایمیل <b>%{email}</b>همخوانی دارد را پیدا کردیم، بزودی یک ایمیل با دستورالعمل بازیابی رمز دریافت می‌کنید."
       complete_username_not_found: "هیچ حساب کاربری که با <b>%{username}</b> همخوانی داشته باشد پیدا نشد"
       complete_email_not_found: "هیچ حساب کاربری که <b>%{email}</b> همخوانی داشته باشد پیدا نشد"
+      button_ok: "اوکی"
+      button_help: "کمک"
     login:
       title: "ورود"
       username: "کاربر"
@@ -953,7 +958,9 @@ fa_IR:
       your_email: "ایمیل شما: <b>%{email}</b>."
       accept_invite: "پذیرفتن دعوت"
       success: "حساب‌کاربری شما با موفقیت ایجاد شد و می‌توانید وارد سایت شوید."
-      password_label: "تنظیم رمز‌عبور (اختیاری)"
+      name_label: "نام"
+      password_label: "تنظیم رمز عبور"
+      optional_description: "(اختیاری)"
     password_reset:
       continue: "برو به %{site_name}"
     emoji_set:
@@ -1677,9 +1684,6 @@ fa_IR:
       delete:
         confirm:
           other: "آیا مطمئنید که می‌خواهید همه‌ی آن نوشته ها را پاک کنید؟"
-      merge:
-        confirm:
-          other: "آیا از ادغام  {{count}}  نوشته اطمینان دارید؟"
       revisions:
         controls:
           first: "بازبینی نخست"
@@ -1725,8 +1729,6 @@ fa_IR:
       settings: 'تنظیمات'
       topic_template: "قالب موضوع"
       tags: "برچسب‌ها"
-      tags_allowed_tags: "برچسب‌هایی که فقط در این دسته‌بندی می‌توانند استفاده شوند:"
-      tags_allowed_tag_groups: "گروه‌های برچسب که فقط در این دسته‌بندی استفاده می‌شوند"
       tags_placeholder: "(اختیاری) فهرست برچسب‌های قابل استفاده"
       tag_groups_placeholder: "(اختیاری) لیست برچسب‌های قابل استفاده‌ی گروه"
       topic_featured_link_allowed: "اجازه‌ی لینک‌های برجسته در این دسته‌بندی"
@@ -2522,8 +2524,6 @@ fa_IR:
           updating: "در حال به‌روز‌رسانی"
           up_to_date: "قالب به روز است،‌ آخرین بررسی در:"
           add: "افزودن"
-          commits_behind:
-            other: "قالب {{count}} تغییر دیگر نیاز دارد."
           scss:
             text: "سی اس اس"
             title: "کد CSS مد نظرتان را وارد کنید، از تمام کد‌های CSS و SCSS معتبر پشتیبانی می‌شود."
@@ -2670,6 +2670,7 @@ fa_IR:
           block: "بستن"
           do_nothing: "هیچ کاری نکن"
         staff_actions:
+          all: "همه"
           title: "عملیات همکارا"
           clear_filters: "همه چیز را نشان بده "
           staff_user: "کاربر همکار"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 15deb5364ca..52edc1a9545 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -148,20 +148,21 @@ fi:
       default_description: "Oletus"
     s3:
       regions:
-        us_east_1: "itäinen USA (Pohjois-Virginia)"
-        us_west_1: "Läntinen USA (Pohjois-Kalifornia)"
-        us_west_2: "Läntinen USA (Oregon)"
-        us_gov_west_1: "AWS GovCloud (USA)"
-        eu_west_1: "EU (Irlanti)"
-        eu_west_2: "EU (Lontoo)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Aasia ja Tyynimeri (Singapore)"
-        ap_southeast_2: "Aasia ja Tyynimeri (Sydney)"
-        ap_south_1: "Aasia ja Tyynimeri (Mumbai)"
         ap_northeast_1: "Aasia ja Tyynimeri (Tokio)"
         ap_northeast_2: "Aasia ja Tyynimeri (Soul)"
-        sa_east_1: "Etelä-Amerikka (Sao Paulo)"
+        ap_south_1: "Aasia ja Tyynimeri (Mumbai)"
+        ap_southeast_1: "Aasia ja Tyynimeri (Singapore)"
+        ap_southeast_2: "Aasia ja Tyynimeri (Sydney)"
         cn_north_1: "Kiina (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlanti)"
+        eu_west_2: "EU (Lontoo)"
+        sa_east_1: "Etelä-Amerikka (Sao Paulo)"
+        us_east_1: "itäinen USA (Pohjois-Virginia)"
+        us_east_2: "Itäinen USA (Ohio)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        us_west_1: "Läntinen USA (Pohjois-Kalifornia)"
+        us_west_2: "Läntinen USA (Oregon)"
     edit: 'muokkaa ketjun otsikkoa ja aluetta'
     not_implemented: "Tätä toimintoa ei ole vielä toteutettu, pahoittelut!"
     no_value: "Ei"
@@ -351,11 +352,8 @@ fi:
         full_name: 'Täysimittainen nimi'
         add_members: "Lisää jäseniä"
         delete_member_confirm: "Poista '%{username}' ryhmästä '%{group}'?"
-      request_membership_pm:
-        title: "Jäsenhakemus"
-        body: "Haluaisin ryhmään @%{groupName}."
       name_placeholder: "Ryhmän nimi. Ei välilyöntejä, samat säännöt kuin käyttäjänimillä"
-      public: "Salli jäsenten liittyä/poistua ryhmästä vapaasti (ryhmän tulee olla näkyvillä)"
+      public: "Salli käyttäjien liittyä ryhmään ja poistua siitä vapaasti (ryhmän täytyy olla julkisesti näkyvillä)"
       empty:
         posts: "Ryhmän jäsenet eivät ole lähettäneet viestejä."
         members: "Ryhmässä ei ole jäseniä."
@@ -376,8 +374,7 @@ fi:
       user_count: "Jäsenmäärä"
       bio: "Tietoa ryhmästä"
       selector_placeholder: "Lisää jäseniä"
-      owner: "omistaja"
-      visible: "Ryhmä näkyy kaikille käyttäjille"
+      owner: "isäntä"
       index:
         title: "Ryhmät"
         empty: "Näkyvillä olevia ryhmiä ei ole."
@@ -391,6 +388,12 @@ fi:
       mentions: "Maininnat"
       messages: "Viestit"
       notification_level: "Ryhmäviestien oletusilmoitusasetus"
+      visibility_levels:
+        title: "Ketkä näkevät tämän ryhmän?"
+        public: "Kaikk"
+        members: "Ryhmän isännät, jäsenet ja ylläpitäjät"
+        staff: "Ryhmän isännät ja henkilökunta"
+        owners: "Ryhmän isännät ja ylläpitäjät"
       alias_levels:
         title: "Ketkä voivat lähettää viestejä tälle ryhmälle tai @mainita sen?"
         nobody: "Ei kukaan"
@@ -488,7 +491,7 @@ fi:
       mute: "Vaimenna"
       edit: "Muokkaa asetuksia"
       download_archive:
-        button_text: "Lataa viestini"
+        button_text: "Lataa kaikki"
         confirm: "Haluatko varmasti ladata viestisi?"
         success: "Lataus aloitettu. Saat ilmoituksen yksityisviestinä, kun prosessi on valmis."
         rate_limit_error: "Viestit voi ladata kerran vuorokaudessa. Yritä huomenna uudelleen."
@@ -559,6 +562,7 @@ fi:
       watched_first_post_tags_instructions: "Saat ilmoituksen uusista ketjuista, joilla on joku näistä tunnisteista."
       muted_categories: "Vaimennetut"
       muted_categories_instructions: "Et saa ilmoituksia uusista viesteistä näillä alueilla, eivätkä ne näy tuoreimmissa."
+      no_category_access: "Valvojana sinulla on rajoitetut oikeudet alueisiin, et voi tallentaa."
       delete_account: "Poista tilini"
       delete_account_confirm: "Oletko varma, että haluat lopullisesti poistaa käyttäjätilisi? Tätä toimintoa ei voi perua!"
       deleted_yourself: "Käyttäjätilisi on poistettu."
@@ -618,7 +622,6 @@ fi:
         title: "Vaihda käyttäjätunnus"
         confirm: "Jos vaihdat käyttäjätunnustasi, kaikki aiemmat lainaukset viesteistäsi ja @nimen maininnat menevät rikki. Oletko ehdottoman varma, että haluat tehdä näin?"
         taken: "Pahoittelut, tuo nimi on jo käytössä."
-        error: "Käyttäjätunnuksen vaihdossa tapahtui virhe."
         invalid: "Käyttäjätunnus ei kelpaa. Siinä saa olla ainoastaan numeroita ja kirjaimia."
       change_email:
         title: "Vaihda sähköposti"
@@ -754,6 +757,9 @@ fi:
         expired: "Tämä kutsu on rauennut."
         rescind: "Poista"
         rescinded: "Kutsu poistettu"
+        rescind_all: "Peru kaikki kutsut"
+        rescinded_all: "Kaikki kutsut peruttu!"
+        rescind_all_confirm: "Haluatko varmasti perua kaikki kutsut?"
         reinvite: "Lähetä kutsu uudestaan"
         reinvite_all: "Lähetä kaikki kutsut uudestaan"
         reinvite_all_confirm: "Haluatko varmasti lähettää kaikki kutsut uudelleen?"
@@ -936,6 +942,9 @@ fi:
       complete_email_found: "Sähköpostiosoitetta <b>%{email}</b> vastaava tili löytyi. Saat kohta sähköpostin, jossa on lisäohjeet salasanan uusimiseen."
       complete_username_not_found: "Käyttäjänimeä <b>%{username}</b> ei ole rekisteröity"
       complete_email_not_found: "Sähköpostiosoitetta <b>%{email}</b> vastaavaa tiliä ei ole"
+      help: "Eikö sähköposti saavu? Ensiksi tarkasta roskapostikansiosi.<p>Etkö ole varma sähköpostiosoitteesta? Syötä sähköpostiosoite niin saat tietää onko sillä luotu tunnusta.</p><p>Jos et enää hallitse sähköpostiosoitettasi, ota yhteyttä <a href='/about'>avuliaaseen henkilökuntaamme.</a></p>"
+      button_ok: "OK"
+      button_help: "Apua"
     login:
       title: "Kirjaudu"
       username: "Käyttäjä"
@@ -995,8 +1004,8 @@ fi:
       accept_invite: "Hyväksy kutsu"
       success: "Tili luotiin, ja olet nyt kirjautunut sisään."
       name_label: "Nimi"
-      name_label_optional: "Nimi (valinnainen)"
-      password_label: "Aseta salasana (valinnainen)"
+      password_label: "Aseta salasana"
+      optional_description: "(valinnainen)"
     password_reset:
       continue: "Jatka sivustolle %{site_name}"
     emoji_set:
@@ -1005,6 +1014,8 @@ fi:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Vain alueet"
       categories_with_featured_topics: "Alueet, joiden yhteydessä ketjuja"
@@ -1013,6 +1024,17 @@ fi:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Etsi emojia
+      people: Ihmiset
+      nature: Luonto
+      food: Ruoka
+      activity: Harrasteet
+      travel: Matkustelu
+      objects: Esineet
+      celebration: Juhlinta
+      custom: Mukautetut emojit
+      recent: Hiljattain käyttämäni emojit
     composer:
       emoji: "Emoji :)"
       more_emoji: "lisää..."
@@ -1043,7 +1065,7 @@ fi:
         post_length: "Viestissä täytyy olla vähintään {{min}} merkkiä"
         try_like: 'Oletko jo kokeillut <i class="fa fa-heart"></i>-nappia?'
         category_missing: "Sinun täytyy valita viestille alue"
-      save_edit: "Tallenna muokkaus"
+      save_edit: "Tallenna"
       reply_original: "Vastaa alkuperäiseen ketjuun"
       reply_here: "Vastaa tänne"
       reply: "Vastaa"
@@ -1216,6 +1238,7 @@ fi:
           seen: jotka olen lukenut
           unseen: joita en ole lukenut
           wiki: ovat wiki-viestejä
+          all_tags: Ketjulla on kaikki tunnisteet
         statuses:
           label: Ketju/Ketjuun
           open: on avoin
@@ -1662,6 +1685,7 @@ fi:
         has_liked: "tykkäsit tästä viestistä"
         undo_like: "peru tykkäys"
         edit: "muokkaa viestiä"
+        edit_action: "Muokkaa"
         edit_anonymous: "Pahoittelut, sinun täytyy ensin kirjautua sisään voidaksesi muokata tätä viestiä."
         flag: "liputa tämä viesti tai lähetä käyttäjälle yksityisesti siihen liittyvä huomio"
         delete: "poista tämä viesti"
@@ -1768,8 +1792,8 @@ fi:
           other: "Oletko varma, että haluat poistaa kaikki nämä viestit?"
       merge:
         confirm:
-          one: "Oletko varma, että haluat yhdistää viestit?"
-          other: "Oletko varma, että haluat yhdistää {{count}} viestiä?"
+          one: "Oletko varma, että haluat yhdistää nämä viestit?"
+          other: "Oletko varma, että haluat yhdistää nämä {{count}} viestiä?"
       revisions:
         controls:
           first: "Ensimmäinen revisio"
@@ -1815,8 +1839,8 @@ fi:
       settings: 'Asetukset'
       topic_template: "Ketjun sapluuna"
       tags: "Tunnisteet"
-      tags_allowed_tags: "Tällä alueella sallitut tunnisteet:"
-      tags_allowed_tag_groups: "Tällä alueella sallitut tunnisteryhmät:"
+      tags_allowed_tags: "Salli vain nämä tunnisteet tällä alueella:"
+      tags_allowed_tag_groups: "Salli vain näiden tunnisteryhmien tunnisteet tällä alueella:"
       tags_placeholder: "(Valinnainen) lista sallituista tunnisteista"
       tag_groups_placeholder: "(Valinnainen) lista sallituista tunnisteryhmistä"
       topic_featured_link_allowed: "Salli ketjulinkit tällä alueella"
@@ -2614,7 +2638,7 @@ fi:
           is_default: "Teema on käytössä oletuksena"
           user_selectable: "Teema on tarjolla käyttäjille"
           color_scheme: "Värimalli"
-          color_scheme_select: "Valitse värit, joita teema käyttä"
+          color_scheme_select: "Valitse teemalle värit"
           custom_sections: "Mukautetut osiot:"
           theme_components: "Teeman osat"
           uploads: "Lataukset"
@@ -2785,6 +2809,8 @@ fi:
           block: "estä"
           do_nothing: "älä tee mitään"
         staff_actions:
+          all: "kaikki"
+          filter: "Suodata:"
           title: "Henkilökunnan toimet"
           clear_filters: "Näytä kaikki"
           staff_user: "Palstan edustaja"
@@ -2838,6 +2864,8 @@ fi:
             change_readonly_mode: "muuta vain luku -tilaa"
             backup_download: "lataa varmuuskopio"
             backup_destroy: "tuhoa varmuuskopio"
+            reviewed_post: "arvioi viestin"
+            custom_staff: "lisäosan mukautettu toiminto"
         screened_emails:
           title: "Seulottavat sähköpostiosoitteet"
           description: "Uuden käyttäjätunnuksen luonnin yhteydessä annettua sähköpostiosoitetta verrataan alla olevaan listaan ja tarvittaessa tunnuksen luonti joko estetään tai suoritetaan muita toimenpiteitä."
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 96307b38c55..6df4471f1e5 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -148,20 +148,20 @@ fr:
       default_description: "Par défaut"
     s3:
       regions:
-        us_east_1: "États-Unis est (Virginie)"
-        us_west_1: "États-Unis ouest (Californie)"
-        us_west_2: "États-Unis ouest (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "UE (Irlande)"
-        eu_west_2: "UE (Londres)"
-        eu_central_1: "UE (Francfort)"
-        ap_southeast_1: "Asie-Pacifique (Singapour)"
-        ap_southeast_2: "Asie-Pacifique (Sydney)"
-        ap_south_1: "Asie-Pacifique (Bombay)"
         ap_northeast_1: "Asie-Pacifique (Tokyo)"
         ap_northeast_2: "Asie-Pacifique (Séoul)"
-        sa_east_1: "Amérique du Sud (Sao Paulo)"
+        ap_south_1: "Asie-Pacifique (Bombay)"
+        ap_southeast_1: "Asie-Pacifique (Singapour)"
+        ap_southeast_2: "Asie-Pacifique (Sydney)"
         cn_north_1: "Chine (Pékin)"
+        eu_central_1: "UE (Francfort)"
+        eu_west_1: "UE (Irlande)"
+        eu_west_2: "UE (Londres)"
+        sa_east_1: "Amérique du Sud (Sao Paulo)"
+        us_east_1: "États-Unis est (Virginie)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "États-Unis ouest (Californie)"
+        us_west_2: "États-Unis ouest (Oregon)"
     edit: 'modifier le titre et la catégorie de ce sujet'
     not_implemented: "Cette fonctionnalité n'a pas encore été implémentée, désolé."
     no_value: "Non"
@@ -351,9 +351,6 @@ fr:
         full_name: 'Nom complet'
         add_members: "Ajouter des membres"
         delete_member_confirm: "Supprimer %{username} du groupe « %{group} » ?"
-      request_membership_pm:
-        title: "Demande d'adhésion"
-        body: "Je souhaiterais adhérer à @%{groupName}."
       name_placeholder: "Nom du groupe, sans espaces, même règle que pour les pseudos"
       public: "Autoriser les utilisateurs à rejoindre/quitter le groupe librement (nécessite que le groupe soit visible)"
       empty:
@@ -377,7 +374,6 @@ fr:
       bio: "À propos du groupe"
       selector_placeholder: "Ajouter des membres"
       owner: "propriétaire"
-      visible: "Ce groupe est visible par tous les utilisateurs"
       index:
         title: "Groupes"
         empty: "Il n'y a aucun groupe visible."
@@ -391,6 +387,12 @@ fr:
       mentions: "Mentions"
       messages: "Messages"
       notification_level: "Niveau de notification par défaut pour les messages de groupe"
+      visibility_levels:
+        title: "Qui peut voir ce groupe ?"
+        public: "Tout le monde"
+        members: "Propriétaires du groupe, membres et administrateurs"
+        staff: "Propriétaires du groupe et responsables"
+        owners: "Propriétaires du groupe et administrateurs"
       alias_levels:
         title: "Qui peut envoyer un message et @notifier ce groupe ?"
         nobody: "Personne"
@@ -488,7 +490,7 @@ fr:
       mute: "Silencieux"
       edit: "Modifier les préférences"
       download_archive:
-        button_text: "Télécharger mes messages"
+        button_text: "Tout télécharger"
         confirm: "Êtes-vous sûr de vouloir télécharger vos messages ?"
         success: "Le téléchargement a démarré ; vous serez notifié par message lorsqu'il est terminé."
         rate_limit_error: "Les messages peuvent être téléchargés une fois par jour, veuillez ressayer demain."
@@ -558,6 +560,7 @@ fr:
       watched_first_post_tags_instructions: "Vous serez notifié du premier message de chaque sujet avec ces tags."
       muted_categories: "Silencieuses"
       muted_categories_instructions: "Vous ne serez notifié de rien concernant les nouveaux sujets dans ces catégories, et elles n'apparaîtront pas dans les dernières catégories."
+      no_category_access: "En tant que modérateur votre accès à la catégorie est limitée, la sauvegarde est désactivée."
       delete_account: "Supprimer mon compte"
       delete_account_confirm: "Êtes-vous sûr de vouloir supprimer définitivement votre compte ? Cette action ne peut pas être annulée !"
       deleted_yourself: "Votre compte a été supprimé avec succès."
@@ -617,7 +620,6 @@ fr:
         title: "Modifier le pseudo"
         confirm: "Si vous changez votre pseudonyme, toutes les citations existantes de vos messages et les mentions avec votre @pseudo seront cassées. Êtes-vous sûr de vouloir le changer ?"
         taken: "Désolé, ce pseudo est déjà pris."
-        error: "Il y a eu une erreur lors du changement de votre pseudo."
         invalid: "Ce pseudo est invalide. Il ne doit être composé que de lettres et de chiffres."
       change_email:
         title: "Modifier l'adresse de courriel"
@@ -753,6 +755,9 @@ fr:
         expired: "Cette invitation a expiré."
         rescind: "Supprimer"
         rescinded: "Invitation annulée"
+        rescind_all: "Supprimer toutes les invitations"
+        rescinded_all: "Invitations supprimées !"
+        rescind_all_confirm: "Êtes-vous sûr de vouloir supprimer toutes les invitations ?"
         reinvite: "Renvoyer l'invitation"
         reinvite_all: "Renvoyer toutes les invitations"
         reinvite_all_confirm: "Êtes-vous sûr de renvoyer toutes les invitations ?"
@@ -935,6 +940,9 @@ fr:
       complete_email_found: "Nous avons trouvé un compte correspond au courriel <b>%{email}</b>, vous devriez recevoir rapidement un courriel avec les instructions pour réinitialiser votre mot de passe."
       complete_username_not_found: "Aucun compte ne correspond au pseudo <b>%{username}</b>"
       complete_email_not_found: "Aucun compte ne correspond à <b>%{email}</b>"
+      help: "Le courriel n'est pas arrivé ? Pensez bien à vérifier dans votre dossier de spam.<p>Vous n'êtes pas sûr de l'adresse électronique que vous avez utilisée ? Saisissez ici une adresse électronique, et nous vous dirons si elle existe ici.</p><p>Si vous n'avez plus accès à l'adresse électronique de votre compte, merci de contacter <a href='/about'>nos responsables serviables.</a></p>"
+      button_ok: "OK"
+      button_help: "Aide"
     login:
       title: "Se connecter"
       username: "Utilisateur"
@@ -993,7 +1001,9 @@ fr:
       your_email: "L'adresse courriel de votre compte est <b>%{email}</b>."
       accept_invite: "Accepter l'invitation"
       success: "Votre compte a été créé et vous êtes maintenant connecté."
-      password_label: "Définir le mot de passe (facultatif)"
+      name_label: "Nom"
+      password_label: "Définir le mot de passe"
+      optional_description: "(facultatif)"
     password_reset:
       continue: "Continuer vers %{site_name}"
     emoji_set:
@@ -1002,6 +1012,8 @@ fr:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Classique Google"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Catégories seules"
       categories_with_featured_topics: "Catégories et sujets sélectionnés"
@@ -1016,6 +1028,7 @@ fr:
       options: "Options"
       whisper: "murmure"
       unlist: "invisible"
+      blockquote_text: "Citation"
       add_warning: "Ceci est un avertissement officiel."
       toggle_whisper: "Modifier le murmure"
       toggle_unlisted: "Modifier la visibilité"
@@ -1031,6 +1044,7 @@ fr:
       cannot_see_mention:
         category: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il n'a pas accès à cette catégorie. Vous devez ajouter cet utilisateur à un groupe ayant accès à cette catégorie."
         private: "Vous avez mentionné {{username}} mais il ne sera pas notifié car il ne peut pas voir ce message privé. Vous devez inviter cet utilisateur à la discussion."
+      duplicate_link: "Il semblerait que votre lien vers <b>{{domain}}</b> a déjà été publié dans le sujet par <b>@{{username}}</b> dans <a href='{{post_url}}'>une réponse de {{ago}}</a> – êtes vous sûr de vouloir le publier à nouveau ?"
       error:
         title_missing: "Le titre est obligatoire."
         title_too_short: "Le titre doit avoir au moins {{min}} caractères"
@@ -1120,6 +1134,7 @@ fr:
       moved_post: "<i title='message déplacé' class='fa fa-sign-out'></i><p><span>{{username}}</span> a déplacé {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge décerné' class='fa fa-certificate'></i><p>Vous avez gagné {{description}}</p>"
+      topic_reminder: "<i title='topic reminder' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nouveau sujet</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='message dans la boite de réception de groupe' class='fa fa-group'></i><p>{{count}} message dans votre boite de réception {{group_name}} </p>"
@@ -1211,6 +1226,7 @@ fr:
           seen: j'ai lu
           unseen: je n'ai pas lu
           wiki: qui sont des wikis
+          all_tags: Contient tous les tags
         statuses:
           label: Dont les sujets
           open: sont ouverts
@@ -1236,6 +1252,7 @@ fr:
         select_all: "Tout sélectionner"
         clear_all: "Tout désélectionner"
         unlist_topics: "Ne plus lister les sujets"
+        relist_topics: "Lister les sujets"
         reset_read: "Réinitialiser la lecture"
         delete: "Supprimer les sujets"
         dismiss: "Ignorer"
@@ -1656,6 +1673,7 @@ fr:
         has_liked: "vous avez aimé ce message"
         undo_like: "annuler le J'aime"
         edit: "modifier ce message"
+        edit_action: "Modifier"
         edit_anonymous: "Désolé, mais vous devez être connecté pour modifier ce message."
         flag: "signaler secrètement ce message pour attirer l'attention ou envoyer une notification privée à son sujet"
         delete: "supprimer ce message"
@@ -1809,8 +1827,8 @@ fr:
       settings: 'Paramètres'
       topic_template: "Modèle de sujet"
       tags: "Tags"
-      tags_allowed_tags: "Tags pouvant être utilisés uniquement dans cette catégorie :"
-      tags_allowed_tag_groups: "Groupes de tags pouvant être utilisés uniquement dans cette catégorie :"
+      tags_allowed_tags: "N'autoriser que ces tags à être utilisés dans cette catégorie:"
+      tags_allowed_tag_groups: "N'autoriser que les tags de ces groupes à être utilisés dans cette catégorie:"
       tags_placeholder: "(Facultatif) liste des tags autorisés"
       tag_groups_placeholder: "(Facultatif) liste des groupes de tags autorisés"
       topic_featured_link_allowed: "Autoriser les sujets avec lien dans cette catégorie"
@@ -1844,7 +1862,7 @@ fr:
       email_in: "Adresse de courriel entrant personnalisée :"
       email_in_allow_strangers: "Accepter les courriels d'utilisateurs anonymes sans compte"
       email_in_disabled: "La possibilité de créer des nouveaux sujets via courriel est désactivé dans les Paramètres. Pour l'activer,"
-      email_in_disabled_click: 'activer le paramètre "email in".'
+      email_in_disabled_click: 'activer le paramètre « email in ».'
       suppress_from_homepage: "Retirer cette catégorie de la page d'accueil"
       show_subcategory_list: "Afficher la liste des sous-catégories au dessus des sujets dans cette catégorie."
       num_featured_topics: "Nombre de sujets affichés sur la page des catégories :"
@@ -2612,6 +2630,9 @@ fr:
           custom_sections: "Sections personnalisées :"
           theme_components: "Composants du thème :"
           uploads: "Uploads"
+          no_uploads: "Vous pouvez envoyer des ressources associées à votre thème comme des polices ou des images"
+          add_upload: "Ajouter un fichier"
+          upload_file_tip: "Choisir un fichier à téléverser (png, woff2, etc.)"
           variable_name: "Nom de variable SCSS:"
           upload: "Upload"
           child_themes_check: "Thème incluant d'autres thèmes"
@@ -2778,6 +2799,8 @@ fr:
           block: "bloquer"
           do_nothing: "ne rien faire"
         staff_actions:
+          all: "tout"
+          filter: "Filtre :"
           title: "Actions des responsables"
           clear_filters: "Tout afficher"
           staff_user: "Responsable"
@@ -2831,6 +2854,8 @@ fr:
             change_readonly_mode: "changer le mode de lecteur seule"
             backup_download: "télécharger la sauvegarde"
             backup_destroy: "détruire la sauvegarde"
+            reviewed_post: "message vérifié"
+            custom_staff: "action personnalisée de l'extension"
         screened_emails:
           title: "Courriels affichés"
           description: "Lorsque quelqu'un essaye de créer un nouveau compte, les adresses de courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée."
@@ -3003,6 +3028,7 @@ fr:
         reset_bounce_score:
           label: "Réinitialiser"
           title: "Réinitialiser le score de rejets à 0"
+        visit_profile: "Visiter <a href='%{url}'>la page de préférence de cet utilisateur</a> pour éditer son profil"
         deactivate_explanation: "Un utilisateur désactivé doit revalider son adresse de courriel."
         suspended_explanation: "Un utilisateur suspendu ne peut pas se connecter."
         block_explanation: "Un utilisateur bloqué ne peut pas écrire de messages ni créer de sujets."
@@ -3222,7 +3248,7 @@ fr:
         feed_settings: "Paramètres de flux RSS/ATOM"
         feed_description: "Fournir un flux RSS/ATOM pour votre site peut améliorer la capacité de Discourse à importer votre contenu."
         crawling_settings: "Paramètres de robot"
-        crawling_description: "Quand Discourse crée des sujets pour vos message, s'il n'y a pas de flux RSS/ATOM présent, il essayera de parser le contenu à partir du HTML. Parfois il peut être difficile d'extraire votre contenu, alors nous vous donnons ici la possibilité de spécifier des règles CSS pour faciliter l'extraction."
+        crawling_description: "Quand Discourse crée des sujets pour vos messages, si aucun flux RSS/ATOM n'est présent, il essayera d'extraire le contenu à partir du HTML. Parfois, cette extraction peut être difficile alors nous donnons la possibilité de définir des règles CSS pour faciliter l'extraction."
         embed_by_username: "Pseudo pour création de sujet"
         embed_post_limit: "Le nombre maximum de messages à intégrer"
         embed_username_key_from_feed: "Clé pour extraire le pseudo du flux."
@@ -3233,6 +3259,7 @@ fr:
         embed_classname_whitelist: "Classes CSS autorisées"
         feed_polling_enabled: "Importer les messages via flux RSS/ATOM"
         feed_polling_url: "URL du flux RSS/ATOM à importer"
+        feed_polling_frequency_mins: "Fréquence de rafraichissement du flux (en minutes)"
         save: "Sauvegarder les paramètres d'intégration"
       permalink:
         title: "Permaliens"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 790ac4744eb..e44e69bb6ee 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -140,17 +140,17 @@ gl:
     emails_are_disabled: "Todos os correos electrónicos saíntes foron desactivados globalmente por un administrador. Non se enviará ningún tipo de notificación por correo electrónico."
     s3:
       regions:
-        us_east_1: "EE.UU. Leste (N. Virxinia)"
-        us_west_1: "EE.UU. Oeste (N. California)"
-        us_west_2: "EE.UU. Oeste (Oregón)"
-        us_gov_west_1: "AWS GovCloud (EE.UU)"
-        eu_west_1: "EU (Irlanda)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacífico (Singapur)"
-        ap_southeast_2: "Asia Pacífico (Sidney)"
         ap_northeast_1: "Asia Pacífico (Tokio)"
         ap_northeast_2: "Asia Pacífico (Seúl)"
+        ap_southeast_1: "Asia Pacífico (Singapur)"
+        ap_southeast_2: "Asia Pacífico (Sidney)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlanda)"
         sa_east_1: "América do Sur (São Paulo)"
+        us_east_1: "EE.UU. Leste (N. Virxinia)"
+        us_gov_west_1: "AWS GovCloud (EE.UU)"
+        us_west_1: "EE.UU. Oeste (N. California)"
+        us_west_2: "EE.UU. Oeste (Oregón)"
     edit: 'editar o título e a categoría deste tema'
     not_implemented: "Sentímolo pero esta funcionalidade non se implementou aínda."
     no_value: "Non"
@@ -316,7 +316,6 @@ gl:
       add: "Engadir"
       selector_placeholder: "Engadir membros"
       owner: "propietario"
-      visible: "O grupo é visíbel para todos os usuarios."
       title:
         one: "grupo"
         other: "grupos"
@@ -484,7 +483,6 @@ gl:
       change_username:
         title: "Cambiar o nome do usuario"
         taken: "Sentímolo pero este nome xa está en uso."
-        error: "Produciuse un erro cambiando o teu nome de usuario."
         invalid: "Este usuario é incorrecto. Só pode contar números e letras."
       change_email:
         title: "Cambiar o correo electrónico"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 68b30d2fadb..8c1da92fc2b 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -18,10 +18,10 @@ he:
             byte:
               one: בית
               other: בתים
-            gb: GB
-            kb: KB
-            mb: MB
-            tb: TB
+            gb: ג״ב
+            kb: ק״ב
+            mb: מ״ב
+            tb: ט״ב
       short:
         thousands: "k{{number}}"
         millions: "{{number}}M"
@@ -44,7 +44,7 @@ he:
         half_a_minute: "פחות מדקה"
         less_than_x_seconds:
           one: "פחות משנייה"
-          other: "פחות מ-%{count} שניות"
+          other: "פחות מ־%{count} שניות"
         x_seconds:
           one: "שנייה אחת"
           other: "%{count} שניות"
@@ -62,7 +62,7 @@ he:
           other: "%{count} שנים"
         over_x_years:
           one: "יותר משנה"
-          other: "יותר מ-%{count} שנים"
+          other: "יותר מ־%{count} שנים"
         almost_x_years:
           one: "שנה אחת"
           other: "%{count} שנים"
@@ -109,7 +109,7 @@ he:
       twitter: 'שתפו קישור זה בטוויטר'
       facebook: 'שתפו קישור זה בפייסבוק'
       google+: 'שתפו קישור זה בגוגל+'
-      email: 'שלח קישור בדוא"ל'
+      email: 'שליחת קישור בדוא״ל'
     action_codes:
       public_topic: "הפכו נושא זה לפומבי %{when}"
       private_topic: "הפכו נושא זה לפרטי %{when}"
@@ -137,31 +137,31 @@ he:
         enabled: 'נכנס לרשימה %{when}'
         disabled: 'הוצא מהרשימה %{when}'
       banner:
-        enabled: 'באנר זה נוצר ב-%{when}. הוא יופיע בראש כל דף עד שישוחרר על ידי המשתמש/ת.'
-        disabled: 'באנר זה הוסר ב-%{when}. הוא לא יופיע יותר בראש כל דף.'
+        enabled: 'באנר זה נוצר ב־%{when}. הוא יופיע בראש כל דף עד שישוחרר על ידי המשתמש/ת.'
+        disabled: 'באנר זה הוסר ב־%{when}. הוא לא יופיע יותר בראש כל דף.'
     topic_admin_menu: "פעולות ניהול לנושא"
-    wizard_required: "ברוכים הבאים לסידקורס החדש שלכם! בואו נתחיל עם <a href='%{url}' data-auto-route='true'>אשף ההתקנה</a> ✨"
-    emails_are_disabled: "כל הדוא\"ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא\"ל, מכל סוג שהוא, לא תשלח."
+    wizard_required: "ברוכים הבאים לדיסקורס החדש שלכם! בואו נתחיל עם <a href='%{url}' data-auto-route='true'>אשף ההתקנה</a> ✨"
+    emails_are_disabled: "כל הדוא״ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא״ל, מכל סוג שהוא, לא תשלח."
     bootstrap_mode_enabled: "כדי להקל על הקמת האתר החדש שלכם, אתם במצב איתחול-ראשוני. כל המשתמשים החדשים יקבלו רמת אמון 1 ויקבלו תמצות יומי במייל. אפשרות זו תכובה אוטומטית כאשר יהיו יותר מ %{min_users} משתמשים."
     bootstrap_mode_disabled: "מצב איתחול-ראשוני יכובה ב 24 השעות הקרובות."
     themes:
       default_description: "ברירת מחדל"
     s3:
       regions:
-        us_east_1: "מזרח ארה\"ב (צפון וירג'יניה)"
-        us_west_1: "מערב ארה\"ב (צפון קליפורניה)"
-        us_west_2: "מערב ארה\"ב (ארגון)"
-        us_gov_west_1: "AWS GovCloud (ארה״ב)"
-        eu_west_1: "האיחוד האירופי (אירלנד)"
-        eu_west_2: "אירופה (לונדון)"
-        eu_central_1: "האיחוד האירופי (פרנקפורט)"
-        ap_southeast_1: "אסיה הפסיפית (סינגפור)"
-        ap_southeast_2: "אסיה הפסיפית (סידני)"
-        ap_south_1: "אסיה פסיפית (מומבאי)"
         ap_northeast_1: "אסיה הפסיפית (טוקיו)"
         ap_northeast_2: "אסיה הפסיפית (סיאול)"
-        sa_east_1: "דרום אמריקה (סאו פאולו)"
+        ap_south_1: "אסיה פסיפית (מומבאי)"
+        ap_southeast_1: "אסיה הפסיפית (סינגפור)"
+        ap_southeast_2: "אסיה הפסיפית (סידני)"
         cn_north_1: "סין (בייג׳ינג)"
+        eu_central_1: "האיחוד האירופי (פרנקפורט)"
+        eu_west_1: "האיחוד האירופי (אירלנד)"
+        eu_west_2: "אירופה (לונדון)"
+        sa_east_1: "דרום אמריקה (סאו פאולו)"
+        us_east_1: "מזרח ארה״ב (צפון וירג׳יניה)"
+        us_gov_west_1: "AWS GovCloud (ארה״ב)"
+        us_west_1: "מערב ארה\"ב (צפון קליפורניה)"
+        us_west_2: "מערב ארה\"ב (ארגון)"
     edit: 'עירכו את הכותרת והקטגוריה של נושא זה'
     not_implemented: "סליחה, תכונה זו עדיין לא מומשה!"
     no_value: "לא"
@@ -351,11 +351,7 @@ he:
         full_name: 'שם מלא'
         add_members: "הוספת חברים"
         delete_member_confirm: "הסרת '%{username}' מהקבוצה '%{group}'?"
-      request_membership_pm:
-        title: "בקשת חברות"
-        body: "הייתי מעוניין להגיש בקשת חברות ב-@%{groupName}."
       name_placeholder: "שם קבוצה, ללא רווחים, לפי הכללים של שמות משתמשים"
-      public: "אפשרו למשתמשים להצטרף/לעזוב את הקבוצה בחופשיות (על הקבוצה להיות נראית)"
       empty:
         posts: "אין פוסטים של חברי קבוצה זו."
         members: "אין חברים בקבוצה זו."
@@ -377,7 +373,6 @@ he:
       bio: "אודות הקבוצה"
       selector_placeholder: "הוספת חברים וחברות"
       owner: "מנהל"
-      visible: "הקבוצה זמינה לכל המשתמשים"
       index:
         title: "קבוצות"
         empty: "אין קבוצות נראות."
@@ -391,6 +386,12 @@ he:
       mentions: "אזכורים"
       messages: "הודעות"
       notification_level: "ברירת מחדל של רמת התראות להודעות קבוצה"
+      visibility_levels:
+        title: "מי יכול לראות קבוצה זו?"
+        public: "כולם"
+        members: "בעלי קבוצה, חברים ואדמיניסטרטורים"
+        staff: "בעלי קבוצה וצוות"
+        owners: "בעלי קבוצה ואדמיניסטרטורים"
       alias_levels:
         title: "מי יכולים לשלוח מסרים ו@לאזכר בקבוצה זו?"
         nobody: "אף אחד"
@@ -488,7 +489,7 @@ he:
       mute: "השתק"
       edit: "עריכת העדפות"
       download_archive:
-        button_text: "הורדת פוסטים שלי"
+        button_text: "להוריד הכל"
         confirm: "האם אתם בטוחים שאתם מעוניינים להוריד אליכם את הפוסטים שלכם?"
         success: "הורדה החלה, תקבלו הודעה כאשר התהליך הסתיים."
         rate_limit_error: "ניתן להוריד פוסטים פעם ביום, אנא נסו שוב מחר."
@@ -558,6 +559,7 @@ he:
       watched_first_post_tags_instructions: "אתם תיודעו לגבי הפוסט הראשון בכל נושא חדש בתגיות אלו."
       muted_categories: "מושתק"
       muted_categories_instructions: "אתם לא תיודעו על שום דבר לגבי נושאים חדשים בקטגוריות אלו, והם לא יופיעו ב״אחרונים״."
+      no_category_access: "בתור מנחים יש לכם גישה מוגבלת לקטגוריות, שמירה מנוטרלת."
       delete_account: "מחק את החשבון שלי"
       delete_account_confirm: "אתם בטוחים שברצונכם למחוק את החשבון? לא ניתן לבטל פעולה זו!"
       deleted_yourself: "חשבונך נמחק בהצלחה."
@@ -617,7 +619,6 @@ he:
         title: "שנה שם משתמש"
         confirm: "אם תשנו את שם המשתמש שלכם, כל הציטוטים הקודמים של פוסטים שלכם ואזכורי @שמות ישברו. האם אתם בטוחים לחלוטין שזה מה שתרצו לעשות?"
         taken: "סליחה, שם המשתמש הזה תפוס."
-        error: "ארעה שגיאה בשינוי שם המשתמש שלך."
         invalid: "שם המשתמש אינו תקין. עליו לכלול רק אותיות באנגלית ומספרים."
       change_email:
         title: "שנה דואר אלקטרוני"
@@ -753,6 +754,9 @@ he:
         expired: "פג תוקף ההזמנה."
         rescind: "הסרה"
         rescinded: "הזמנה הוסרה"
+        rescind_all: "הסירו את כל ההזמנות"
+        rescinded_all: "כל ההזמנות הוסרו!"
+        rescind_all_confirm: "האם אתם בטוחים שאתם מעוניינים להסיר את כל ההזמנות?"
         reinvite: "משלוח חוזר של הזמנה"
         reinvite_all: "שלח מחדש את כל ההזמנות"
         reinvite_all_confirm: "האם אתם בטוחים שאתם מעוניינים לשלוח מחדש את כל ההזמנות?"
@@ -935,6 +939,8 @@ he:
       complete_email_found: "מצאנו חשבון תואם ל<b>%{email}</b>. בתוך זמן קצר תקבלו אליו דוא\"ל עם הנחיות כיצד לאתחל את הסיסמה שלכם."
       complete_username_not_found: "שום חשבון אינו תואם לשם המשתמש  <b>%{username}</b>"
       complete_email_not_found: "שום חשבון אינו תואם ל <b>%{email}</b>"
+      button_ok: "או קיי"
+      button_help: "עזרה"
     login:
       title: "התחברות"
       username: "משתמש"
@@ -993,7 +999,9 @@ he:
       your_email: "כתובת המייל של החשבון שלכם היא <b>%{email}</b>."
       accept_invite: "קבלת הזמנה"
       success: "החשבון שלכם נוצר ואתם מחוברים עכשיו."
-      password_label: "קביעת סיסמה (אופציונלי)"
+      name_label: "שם"
+      password_label: "קביעת סיסמה"
+      optional_description: "(אופציונלי)"
     password_reset:
       continue: "המשיכו ל-%{site_name}"
     emoji_set:
@@ -1660,6 +1668,7 @@ he:
         has_liked: "אהבת פוסט זה"
         undo_like: "בטל 'אהוב'"
         edit: "עירכו פוסט זה"
+        edit_action: "עריכה"
         edit_anonymous: "מצטערים, אך עליכם להיות מחוברים בכדי לערוך פוסט זה."
         flag: "דגלו פוסט זה באופן פרטי לתשומת לב או שלחו התראה פרטית עליו"
         delete: "מחק פוסט זה"
@@ -1766,8 +1775,8 @@ he:
           other: "האם אתם בטוחים שאתם מעוניינים למחוק את כל הפוסטים האלו?"
       merge:
         confirm:
-          one: "אתם בטוחים שאתם מעוניינים למזג את הפוסטים האלו?"
-          other: "אתם בטוחים שאתם מעוניינים למזג את {{count}} הפוסטים האלו?"
+          one: "האם אתם בטוחים שאתם מעוניינים למזג פוסטים אלו?"
+          other: "האם אתם בטוחים שאתם מעוניינים למזג {{count}} פוסטים אלו?"
       revisions:
         controls:
           first: "מהדורה ראשונה"
@@ -1813,8 +1822,7 @@ he:
       settings: 'הגדרות'
       topic_template: "תבנית נושא"
       tags: "תגיות"
-      tags_allowed_tags: "תגיות שניתנות לשימוש בקטגוריה זו בלבד:"
-      tags_allowed_tag_groups: "קבוצות תגים שניתנות לשימוש בקטגוריה זו:"
+      tags_allowed_tags: "לאפשר רק לתגיות אלו להיות בשימוש בקטגוריה זו:"
       tags_placeholder: "(אופציונלי) רשימת תגים מותרים"
       tag_groups_placeholder: "(אופציונלי) רשימת קבוצות תגים"
       topic_featured_link_allowed: "אפשרו קישורים מומלצים בקטגוריה זו"
@@ -2637,8 +2645,8 @@ he:
           up_to_date: "התמה מעודכנת, נבדקה לאחרונה ב:"
           add: "הוספה"
           commits_behind:
-            one: "התמה נמצאת 1 עדכונים מאחור!"
-            other: "התמה נמצאת {{count}} עדכונים מאחור!"
+            one: "התמה נמצאת קומיט 1 מאחור!"
+            other: "התמה נמצאת {{count}} קומיטים מאחור!"
           scss:
             text: "CSS"
             title: "עריכת CSS מותאם, אנחנו מקבלים כל סגנון CSS ו SCSS תקני"
@@ -3013,6 +3021,7 @@ he:
         reset_bounce_score:
           label: "איפוס"
           title: "איפוס ניקוד-החזר"
+        visit_profile: "בקרו <a href='%{url}'>בדף ההעדפות של משתמש/ת זה/זו</a> כדי לערוך את הפרופיל שלהם"
         deactivate_explanation: "חשבון משתמש מנוטרל נדרש לוודא דואר אלקטרוני מחדש."
         suspended_explanation: "משתמש מושעה לא יכול להתחבר."
         block_explanation: "משתמש חסום לא יכול לפרסם או להתחיל נושאים."
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index f864c8d8338..edb2c2dc092 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -121,19 +121,19 @@ id:
     bootstrap_mode_disabled: "Mode bootstrap akan di non aktifkan pada 24 jam berikutnya."
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pasifik (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pasifik (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "Cina (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'Ubah judul dan kategori topik ini'
     not_implemented: "Maaf, fitur ini belum diimplementasikan."
     no_value: "Tidak"
@@ -292,18 +292,11 @@ id:
       add: "Menambahkan"
       selector_placeholder: "Menambahkan anggota"
       owner: "pemilik"
-      visible: "Grup terlihat oleh semua pengguna"
-      title:
-        other: "Grup"
-      members: "Anggota"
       topics: "Topik-topik"
-      posts: "Post"
       mentions: "Balasan-balasan"
       messages: "Pesan-pesan"
       alias_levels:
         title: "Siapa yang mendapat pesan dan membalas kelompok ini?"
-        nobody: "Tak seorangpun"
-        only_admins: "Hanya admin"
         mods_and_admins: "Hanya moderator dan Admin"
         members_mods_and_admins: "Hanya anggota grup, moderator dan admin"
         everyone: "Semua orang"
@@ -465,7 +458,6 @@ id:
       change_username:
         title: "Ganti Username"
         taken: "Maaf, username tersebut sudah ada yang menggunakan"
-        error: "Terjadi kesalahan saat mengganti username anda"
         invalid: "Username tersebut tidak valid. Username harus berupa angka dan huruf"
       change_email:
         title: "Ganti Alamat Surel"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 7ac84a42c84..249eadcf8e7 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -148,20 +148,21 @@ it:
       default_description: "Default"
     s3:
       regions:
-        us_east_1: "Stati Uniti Est (Virginia del Nord)"
-        us_west_1: "Stati Uniti Ovest (California del Nord)"
-        us_west_2: "Stati Uniti Ovest (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "Europa (Irlanda)"
-        eu_west_2: "EU (Londra)"
-        eu_central_1: "Europa (Francoforte)"
-        ap_southeast_1: "Asia Pacifico (Singapore)"
-        ap_southeast_2: "Asia Pacifico (Sidney)"
-        ap_south_1: "Asia Pacifico (Mumbai)"
         ap_northeast_1: "Asia Pacifico (Tokyo)"
         ap_northeast_2: "Asia Pacifico (Seoul)"
-        sa_east_1: "America del Sud (San Paolo)"
+        ap_south_1: "Asia Pacifico (Mumbai)"
+        ap_southeast_1: "Asia Pacifico (Singapore)"
+        ap_southeast_2: "Asia Pacifico (Sidney)"
         cn_north_1: "Cina (Beijing)"
+        eu_central_1: "Europa (Francoforte)"
+        eu_west_1: "Europa (Irlanda)"
+        eu_west_2: "EU (Londra)"
+        sa_east_1: "America del Sud (San Paolo)"
+        us_east_1: "Stati Uniti Est (Virginia del Nord)"
+        us_east_2: "USA Est (Ohio)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "Stati Uniti Ovest (California del Nord)"
+        us_west_2: "Stati Uniti Ovest (Oregon)"
     edit: 'modifica titolo e categoria dell''argomento'
     not_implemented: "Spiacenti! Questa funzione non è stata ancora implementata."
     no_value: "No"
@@ -351,11 +352,8 @@ it:
         full_name: 'Nome Completo'
         add_members: "Aggiungi Membri"
         delete_member_confirm: "Rimuovere '%{username}' dal gruppo '%{group}'?"
-      request_membership_pm:
-        title: "Richiesta di Iscrizione"
-        body: "Vorrei iscrivermi a @%{groupName}."
       name_placeholder: "Nome del gruppo, senza spazi, stesse regole del nome utente"
-      public: "Permetti agli utenti di aggiungersi/togliersi liberamente dal gruppo (il gruppo deve essere visibile)"
+      public: "Permetti agli utenti di aggiungersi/togliersi liberamente dal gruppo (Richiede che il gruppo sia visibile a tutti)"
       empty:
         posts: "Non ci sono messaggi da membri di questo gruppo."
         members: "Non ci sono membri in questo gruppo."
@@ -377,7 +375,6 @@ it:
       bio: "Informazioni sul Gruppo"
       selector_placeholder: "Aggiungi membri"
       owner: "proprietario"
-      visible: "Il Gruppo è visibile a tutti gli utenti"
       index:
         title: "Gruppi"
         empty: "Non ci sono gruppi visibili."
@@ -390,6 +387,13 @@ it:
       posts: "Messaggi"
       mentions: "Menzioni"
       messages: "Messaggi"
+      notification_level: "Livello di notifica predefinito per i messaggi di gruppo"
+      visibility_levels:
+        title: "Chi può vedere questo gruppo?"
+        public: "Chiunque"
+        members: "Proprietari del gruppo, membri e amministratori"
+        staff: "Proprietari del gruppo e staff"
+        owners: "Proprietari del gruppo e amministratori"
       alias_levels:
         title: "Chi può inviare @menzionare e inviare messaggi a questo gruppo?"
         nobody: "Nessuno"
@@ -487,7 +491,7 @@ it:
       mute: "Ignora"
       edit: "Modifica opzioni"
       download_archive:
-        button_text: "Scarica i Miei Messaggi"
+        button_text: "Scarica Tutto"
         confirm: "Sei sicuro di voler scaricare i tuoi messaggi?"
         success: "Esportazione iniziata, verrai avvertito con un messaggio al termine del processo."
         rate_limit_error: "I messaggi possono essere scaricati una volta al giorno, riprova domani."
@@ -557,6 +561,7 @@ it:
       watched_first_post_tags_instructions: "Riceverai la notifica per il primo messaggio di ogni nuovo argomento con queste etichette."
       muted_categories: "Silenziate"
       muted_categories_instructions: "Non ti verrà notificato nulla sui nuovi argomenti in queste categorie, e non compariranno nell'elenco Ultimi."
+      no_category_access: "Come moderatore hai accesso limitato alla categoria, il salvataggio è disabilitato."
       delete_account: "Cancella il mio account"
       delete_account_confirm: "Sei sicuro di voler cancellare il tuo account in modo permanente? Questa azione non può essere annullata!"
       deleted_yourself: "Il tuo account è stato eliminato con successo."
@@ -616,7 +621,6 @@ it:
         title: "Cambia Utente"
         confirm: "Se modifichi il nome utente, tutte le precedenti menzioni al tuo @nome non saranno più valide. Sei assolutamente sicuro di volerlo fare?"
         taken: "Spiacenti, questo nome utente è già riservato."
-        error: "C'è stato un problema nel cambio del tuo nome utente."
         invalid: "Nome utente non valido: usa solo lettere e cifre"
       change_email:
         title: "Cambia email"
@@ -752,8 +756,12 @@ it:
         expired: "L'invito è scaduto."
         rescind: "Rimuovi"
         rescinded: "Invito revocato"
+        rescind_all: "Rimuovi tutti gli Inviti"
+        rescinded_all: "Tutti gli inviti sono stati rimossi!"
+        rescind_all_confirm: "Sei sicuro di voler rimuovere tutti gli inviti?"
         reinvite: "Rinvia Invito"
         reinvite_all: "Rispedisci tutti gli Inviti"
+        reinvite_all_confirm: "Sei sicuro di voler inviare nuovamente tutti gli inviti?"
         reinvited: "Invito rinviato"
         reinvited_all: "Tutti gli inviti sono stati rispediti!"
         time_read: "Ora di Lettura"
@@ -764,8 +772,10 @@ it:
         link_generated: "Collegamento di invito generato con successo!"
         valid_for: "Questo collegamento di invito è valido solamente per il seguente indirizzo email: %{email}"
         bulk_invite:
+          none: "Non hai ancora invitato nessuno. Puoi inviare degli inviti individuali o più persone alla volta <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>caricando un file CSV</a>."
           text: "Invito di Massa da File"
           success: "Il file è stato caricato con successo, riceverai un messaggio di notifica quando il processo sarà completato."
+          error: "Spiacenti, il file deve essere in formato CSV."
       password:
         title: "Password"
         too_short: "La password è troppo breve."
@@ -931,6 +941,9 @@ it:
       complete_email_found: "C'è un account che corrisponde alla email <b>%{email}</b>, a breve dovresti ricevere una email con le istruzioni per reimpostare la tua password. "
       complete_username_not_found: "Nessun account corrisponde al nome utente <b>%{username}</b>"
       complete_email_not_found: "Nessun account corrisponde alla email <b>%{email}</b>"
+      help: "Non arrivano email? Per prima cosa assicurati di controllare la cartella spam.<p>Non sei sicuro di quale indirizzo email hai usato? Inserisci un indirizzo email e ti faremo sapere se esiste.</p>Se non hai più accesso all'indirizzo email del tuo account, per favore contatta <a href='/about'>il nostro disponibile staff.</a><p>"
+      button_ok: "OK"
+      button_help: "Aiuto"
     login:
       title: "Connetti"
       username: "Utente"
@@ -944,12 +957,17 @@ it:
       logging_in: "Connessione in corso..."
       or: "Oppure"
       authenticating: "Autenticazione..."
+      awaiting_activation: "Il tuo account è in attesa di attivazione, utilizza il collegamento per la password dimenticata per ricevere un'altra email di attivazione."
       awaiting_approval: "Il tuo account non è stato ancora approvato da un membro dello staff. Ti invieremo un'email non appena verrà approvato."
       requires_invite: "Spiacenti, l'accesso a questo forum e solo ad invito."
       not_activated: "Non puoi ancora connetterti. Abbiamo inviato un'email di attivazione a <b>{{sentTo}}</b>. Per favore segui le istruzioni contenute nell'email per attivare l'account."
       not_allowed_from_ip_address: "Non puoi connetterti con questo indirizzo IP."
       admin_not_allowed_from_ip_address: "Non puoi connetterti come amministratore da quell'indirizzo IP."
       resend_activation_email: "Clicca qui per inviare nuovamente l'email di attivazione."
+      resend_title: "Invia Nuovamente Email Attivazione"
+      change_email: "Cambia Indirizzo Email"
+      provide_new_email: "Fornisci un nuovo indirizzo e invieremo nuovamente la tua email di conferma."
+      submit_new_email: "Aggiorna Indirizzo Email"
       sent_activation_email_again: "Ti abbiamo mandato un'altra email di attivazione su <b>{{currentEmail}}</b>. Potrebbero essere necessari alcuni minuti di attesa; assicurati di controllare anche la cartella dello spam."
       to_continue: "Per favore Connettiti"
       preferences: "Devi essere connesso per cambiare le tue impostazioni."
@@ -977,7 +995,16 @@ it:
         title: "con GitHub"
         message: "Autenticazione con GitHub (assicurati che il blocco pop up non sia attivo)"
     invites:
+      accept_title: "Invito"
       welcome_to: "Benvenuto su %{site_name}!"
+      invited_by: "Sei stao invitato da:"
+      social_login_available: "Sarai anche in grado di accedere con qualsiasi login social usando questa email."
+      your_email: "L'indirizzo email del tuo account è <b>%{email}</b>."
+      accept_invite: "Accetta Invito"
+      success: "Il tuo account è stato creato e ora sei connesso."
+      name_label: "Nome"
+      password_label: "Imposta Password"
+      optional_description: "(opzionale)"
     password_reset:
       continue: "Procedi su %{site_name}"
     emoji_set:
@@ -986,6 +1013,8 @@ it:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Solo Categorie"
       categories_with_featured_topics: "Categorie con argomenti in evidenza"
@@ -1000,6 +1029,7 @@ it:
       options: "Opzioni"
       whisper: "sussurra"
       unlist: "invisibile"
+      blockquote_text: "Citazione"
       add_warning: "Questo è un avvertimento ufficiale."
       toggle_whisper: "Attiva/Disattiva Sussurri"
       toggle_unlisted: "Rendi Invisibile"
@@ -1015,6 +1045,7 @@ it:
       cannot_see_mention:
         category: "Hai menzionato {{username}} ma non verranno notificati perché non hanno accesso a questa categoria. Dovrai aggiungerli ad un gruppo che ha accesso a questa categoria."
         private: "Hai menzionato {{username}} ma non verranno notificati perché non hanno accesso a questo messaggio personale. Dovrai invitarli a questo MP."
+      duplicate_link: "Sembra che il tuo collegamento a <b>{{domain}}</b> sia già stato pubblicato in questo argomento da <b>@{{username}}</b> in <a href='{{post_url}}'>una risposta di {{ago}}</a> - sei sicuro di volerlo pubblicare ancora?"
       error:
         title_missing: "Il titolo è richiesto"
         title_too_short: "Il titolo deve essere lungo almeno {{min}} caratteri"
@@ -1036,6 +1067,7 @@ it:
       title_or_link_placeholder: "Digita il titolo, o incolla qui il collegamento "
       edit_reason_placeholder: "perché stai scrivendo?"
       show_edit_reason: "(aggiungi motivo della modifica)"
+      topic_featured_link_placeholder: "Inserisci il collegamento mostrato con il titolo."
       reply_placeholder: "Scrivi qui. Per formattare il testo usa Markdown, BBCode o HTML. Trascina o incolla le immagini."
       view_new_post: "Visualizza il tuo nuovo messaggio."
       saving: "Salvataggio"
@@ -1066,9 +1098,9 @@ it:
       olist_title: "Elenco Numerato"
       ulist_title: "Elenco Puntato"
       list_item: "Elemento lista"
-      heading_label: "I"
-      heading_title: "Intestazione"
-      heading_text: "Intestazione"
+      heading_label: "T"
+      heading_title: "Titolo"
+      heading_text: "Titolo"
       hr_title: "Linea Orizzontale"
       help: "Aiuto Inserimento Markdown"
       toggler: "nascondi o mostra il pannello di editing"
@@ -1103,6 +1135,7 @@ it:
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> ha spostato {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Guadagnato '{{description}}'</p>"
+      topic_reminder: "<i title='topic reminder' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nuovo Argomento</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} messaggio nella tua casella {{group_name}}</p>"
@@ -1148,6 +1181,7 @@ it:
       sort_by: "Ordina per"
       relevance: "Rilevanza"
       latest_post: "Ultimo Messaggio"
+      latest_topic: "Ultimo Argomento"
       most_viewed: "Più Visti"
       most_liked: "Con più \"Mi Piace\""
       select_all: "Seleziona Tutto"
@@ -1161,6 +1195,7 @@ it:
       no_more_results: "Nessun altro risultato trovato."
       searching: "Ricerca in corso..."
       post_format: "#{{post_number}} da {{username}}"
+      results_page: "Risultati Ricerca"
       context:
         user: "Cerca messaggi di @{{username}}"
         category: "Cerca nella categoria #{{category}}"
@@ -1184,12 +1219,15 @@ it:
           posted: ho pubblicato in
           watching: sto osservando
           tracking: sto seguendo
-          private: sono messaggi scritti da me
+          private: messaggi privati
           bookmarks: ho aggiunto ai segnalibri
           first: sono il primissimo post
           pinned: sono appuntati
           unpinned: non sono appuntati
+          seen: ho letto
+          unseen: non ho letto
           wiki: sono wiki
+          all_tags: Contiene tutte le etichette
         statuses:
           label: In cui gli argomenti
           open: sono aperti
@@ -1215,6 +1253,7 @@ it:
         select_all: "Seleziona Tutti"
         clear_all: "Deseleziona Tutto"
         unlist_topics: "Deselezione Topics"
+        relist_topics: "Ripubblica Argomenti"
         reset_read: "Reimposta Lettura"
         delete: "Elimina Argomenti"
         dismiss: "Chiudi"
@@ -1225,13 +1264,18 @@ it:
         dismiss_new: "Chiudi Nuovo"
         toggle: "commuta la selezione multipla degli argomenti"
         actions: "Azioni Multiple"
+        change_category: "Impostare Categoria"
         close_topics: "Chiudi Argomenti"
         archive_topics: "Archivia Argomenti"
+        notification_level: "Notifiche"
         choose_new_category: "Scegli la nuova categoria per gli argomenti:"
         selected:
           one: "Hai selezionato <b>1</b> argomento."
           other: "Hai selezionato <b>{{count}}</b> argomenti."
+        change_tags: "Sostituire Etichette"
+        append_tags: "Aggiungi Etichette"
         choose_new_tags: "Scegli nuove etichette per i seguenti argomenti:"
+        choose_append_tags: "Scegli nuove etichette da aggiungere a questi argomenti:"
         changed_tags: "Le etichette per quegli argomenti sono state cambiate."
       none:
         unread: "Non ci sono argomenti non letti."
@@ -1319,17 +1363,46 @@ it:
       jump_reply_up: passa a una risposta precedente
       jump_reply_down: passa a una risposta successiva
       deleted: "L'argomento è stato cancellato"
+      topic_status_update:
+        title: "Imposta Timer Argomento"
+        save: "Imposta Timer"
+        num_of_hours: "Numero di ore:"
+        remove: "Rimuovi Timer"
+        publish_to: "Pubblica Su:"
+        when: "Quando:"
       auto_update_input:
+        later_today: "Più tardi oggi"
+        tomorrow: "Domani"
+        later_this_week: "Più tardi questa settimana"
+        this_weekend: "Questo fine settimana"
+        next_week: "La prossima settimana"
+        next_month: "Il prossimo mese"
+        pick_date_and_time: "Scegli la data e l'ora"
         set_based_on_last_post: "Chiudi in base all'ultimo messaggio"
+      publish_to_category:
+        title: "Pianifica Pubblicazione"
+      temp_open:
+        title: "Apri Temporaneamente"
+      auto_reopen:
+        title: "Apri automaticamente Argomento"
       temp_close:
         title: "Chiudi Temporaneamente"
       auto_close:
         title: "Chiudi Automaticamente"
         label: "Ore per la chiusura automatica:"
+        error: "Per favore inserisci un valore valido."
         based_on_last_post: "Non chiudere finché l'ultimo messaggio nell'argomento non ha questa anzianità."
+      auto_delete:
+        title: "Elimina Automaticamente Argomento"
+      reminder:
+        title: "Ricordamelo"
       status_update_notice:
+        auto_open: "Questo argomento verrà automaticamente aperto %{timeLeft}"
         auto_close: "Questo argomento si chiuderà automaticamente in %{timeLeft}."
+        auto_publish_to_category: "Questo argomento verrà pubblicato su <a href=%{categoryUrl}>#%{categoryName}</a>%{timeLeft}"
         auto_close_based_on_last_post: "Questo argomento si chiuderà %{duration}dopo l'ultima risposta."
+        auto_delete: "Questo argomento verrà automaticamente cancellato %{timeLeft}."
+        auto_reminder: "Questo argomento ti verrà ricordato %{timeLeft}."
       auto_close_title: 'Impostazioni di auto-chiusura'
       auto_close_immediate:
         one: "L'ultimo messaggio nell'argomento ha già 1 ora, per cui l'argomento verrà chiuso immediatamente."
@@ -1360,6 +1433,10 @@ it:
           '3_2': 'Riceverai notifiche perché stai osservando questo argomento.'
           '3_1': 'Riceverai notifiche perché hai creato questo argomento.'
           '3': 'Riceverai notifiche perché stai osservando questo argomento.'
+          '2_8': 'Vedrai un conteggio delle nuove risposte perchè stai seguendo questa categoria.'
+          '2_4': 'Vedrai un conteggio delle nuove risposte perchè hai pubblicato una risposta in questo argomento.'
+          '2_2': 'Vedrai un conteggio delle nuove risposte perchè stai seguendo questo argomento.'
+          '2': 'Vedrai un conteggio delle nuove risposte perchè <a href="/u/{{username}}/preferences">hai letto questo argomento</a>'
           '1_2': 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.'
           '1': 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.'
           '0_7': 'Stai ignorando tutte le notifiche di questa categoria.'
@@ -1395,6 +1472,7 @@ it:
         open: "Apri Argomento"
         close: "Chiudi Argomento"
         multi_select: "Seleziona Messaggi..."
+        timed_update: "Imposta Timer Argomento..."
         pin: "Appunta Argomento..."
         unpin: "Spunta Argomento..."
         unarchive: "De-archivia Argomento"
@@ -1412,6 +1490,7 @@ it:
         remove_banner: "Rimuovi Argomento Annuncio"
       reply:
         title: 'Rispondi'
+        help: 'inizia a comporre una risposta a questo argomento'
       clear_pin:
         title: "Spunta"
         help: "Rimuovi la spunta da questo argomento, così non comparirà più in cima alla lista degli argomenti"
@@ -1478,6 +1557,7 @@ it:
         success_email: "Abbiamo inviato un invito via email a <b>{{emailOrUsername}}</b>. Ti avvertiremo quando l'invito verrà riscattato. Controlla la sezione \"inviti\" sulla tua pagina utente per tracciarne lo stato."
         success_username: "Abbiamo invitato l'utente a partecipare all'argomento."
         error: "Spiacenti, non siamo riusciti ad invitare questa persona. E' stata per caso già invitata (gli inviti sono limitati)? "
+        success_existing_email: "Esiste già un utente con email <b>{{emailOrUsername}}</b>. Lo abbiamo invitato a partecipare a questo argomento."
       login_reply: 'Connettiti per Rispondere'
       filters:
         n_posts:
@@ -1540,6 +1620,7 @@ it:
       wiki_last_edited_on: "ultima modifica alla wiki"
       last_edited_on: "ultima modifica al messaggio:"
       reply_as_new_topic: "Rispondi come Argomento collegato"
+      reply_as_new_private_message: "Rispondi come nuovo messaggio agli stessi destinatari"
       continue_discussion: "Continua la discussione da {{postLink}}:"
       follow_quote: "vai al messaggio citato"
       show_full: "Mostra Messaggio Completo"
@@ -1594,6 +1675,7 @@ it:
         has_liked: "ti è piaciuto questo messaggio"
         undo_like: "rimuovi il \"Mi piace\""
         edit: "modifica questo messaggio"
+        edit_action: "Modifica"
         edit_anonymous: "Spiacenti, devi essere connesso per poter modificare questo messaggio."
         flag: "segnala privatamente questo messaggio o invia una notifica privata"
         delete: "cancella questo messaggio"
@@ -1724,6 +1806,17 @@ it:
           side_by_side_markdown:
             title: "Mostra le differenze nei sorgenti fianco-a-fianco"
             button: 'Sorgente'
+      raw_email:
+        displays:
+          raw:
+            title: "Mostra la sorgente della email"
+            button: 'Sorgente'
+          text_part:
+            title: "Mostra la parte testuale della email"
+            button: 'Testo'
+          html_part:
+            title: "Mostra la parte html della email"
+            button: 'HTML'
     category:
       can: 'può&hellip;'
       none: '(nessuna categoria)'
@@ -1736,8 +1829,8 @@ it:
       settings: 'Impostazioni'
       topic_template: "Modello di Argomento"
       tags: "Etichette"
-      tags_allowed_tags: "Etichette che si possono usare soltanto in questa categoria:"
-      tags_allowed_tag_groups: "Aggiungi etichette ai gruppi che possono essere utilizzati unicamente in questa categoria:"
+      tags_allowed_tags: "Permetti solo a queste etichette di essere usate in questa categoria:"
+      tags_allowed_tag_groups: "Permetti di utilizzare le etichette solo a questi gruppi per questa categoria:"
       tags_placeholder: "Elenco (opzionale) delle etichette permesse"
       tag_groups_placeholder: "Elenco (opzionale) dei gruppi di etichette permessi"
       topic_featured_link_allowed: "Consenti collegamenti in primo piano in questa categoria"
@@ -1773,6 +1866,14 @@ it:
       email_in_disabled: "Le Impostazioni Sito non permettono di creare nuovi argomenti via email. Per abilitare la creazione di argomenti via email,"
       email_in_disabled_click: 'abilita l''impostazione "email entrante".'
       suppress_from_homepage: "Elimina questa categoria dalla homepage."
+      show_subcategory_list: "Mostra la lista delle sottocategorie sopra agli argomenti in questa categoria."
+      num_featured_topics: "Numero degli argomenti mostrati nella pagina categorie:"
+      subcategory_num_featured_topics: "Numero degli argomenti in evidenza nella pagina della categoria superiore"
+      all_topics_wiki: "Rendi i nuovi argomenti wiki di default."
+      subcategory_list_style: "Stile Lista Sottocategorie:"
+      sort_order: "Lista Argomenti Ordinata Per:"
+      default_view: "Lista Argomenti Predefinita:"
+      default_top_period: "Periodo Predefinito Argomenti Di Punta:"
       allow_badges_label: "Permetti l'assegnazione di distintivi in questa categoria"
       edit_permissions: "Modifica Permessi"
       add_permission: "Aggiungi Permesso"
@@ -1810,6 +1911,11 @@ it:
         created: "Creazione"
       sort_ascending: 'Crescente'
       sort_descending: 'Decrescente'
+      subcategory_list_styles:
+        rows: "Righe"
+        rows_with_featured_topics: "Righe con argomenti in primo piano"
+        boxes: "Box"
+        boxes_with_featured_topics: "Box con argomenti in primo piano"
     flagging:
       title: 'Grazie per aiutarci a mantenere la nostra comunità civile!'
       action: 'Segnala Messaggio'
@@ -1817,6 +1923,7 @@ it:
       notify_action: 'Messaggio'
       official_warning: 'Avvertimento Ufficiale'
       delete_spammer: "Cancella Spammer"
+      delete_confirm_MF: "Stai per cancellare {POSTS, plural, one {<b>1</b> messaggio} other {<b>#</b> messaggi}} e {TOPICS, plural, one {<b>1</b> argomento} other {<b>#</b> argomenti}} di questo utente, rimuovere il suo account, bloccare l'iscrizione dall'indirizzo IP<b>{ip_address}</b>, e aggiungere il suo indirizzo email <b>{email}</b> ad un elenco nero permanente. Sei veramente sicuro che questo utente sia uno spammer?"
       yes_delete_spammer: "Sì, cancella lo spammer"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(nascosto)"
@@ -1853,6 +1960,7 @@ it:
         one: "1 click"
         other: "%{count} click"
     post_links:
+      about: "espandi altri collegamenti per questo messaggio"
       title:
         one: "un altro"
         other: "altri %{count}"
@@ -1905,6 +2013,7 @@ it:
     history: "Storia"
     changed_by: "da {{author}}"
     raw_email:
+      title: "Email In Arrivo"
       not_available: "Non disponibile!"
     categories_list: "Lista Categorie"
     filters:
@@ -2049,6 +2158,7 @@ it:
       others_count: "Altri utenti con questo distintivo (%{count})"
       title: Distintivi
       allow_title: "Puoi usare questo distintivo come qualifica"
+      multiple_grant: "Puoi guadagnarlo più volte"
       badge_count:
         one: "1 Distintivo"
         other: "%{count} Distintivi"
@@ -2294,6 +2404,7 @@ it:
         add_members: "Aggiungi membri"
         custom: "Personalizzato"
         bulk_complete: "Gli utenti sono stati aggiunti al gruppo."
+        bulk_complete_users_not_added: "Questi utenti non sono stati aggiunti (assicurati che abbiano un account):"
         bulk: "Aggiunta Massiva al Gruppo"
         bulk_paste: "Incolla una lista di nomi utente o di email, uno per riga:"
         bulk_select: "(seleziona un gruppo)"
@@ -2306,6 +2417,8 @@ it:
         add_owners: Aggiungi proprietari
         incoming_email: "Indirizzo email personalizzato"
         incoming_email_placeholder: "inserisci l'indirizzo e-mail"
+        none_selected: "Seleziona un gruppo per iniziare"
+        no_custom_groups: "Crea un nuovo gruppo personalizzato"
       api:
         generate_master: "Genera una Master API Key"
         none: "Non ci sono chiavi API attive al momento."
@@ -2337,13 +2450,19 @@ it:
         warn_local_payload_url: "Stai impostando un webhook che punta ad un indirizzo locale. Eventi inviati ad un indirizzo locale possono causare effetti collaterali o risultati inaspettati. Vuoi continuare?"
         secret_invalid: "La chiave segreta non può contenere spazi vuoti."
         secret_too_short: "La chiave segreta deve contenere almeno 12 caratteri."
+        secret_placeholder: "Una stringa facoltativa, usata per generare una firma"
         event_type_missing: "Devi impostare almeno un tipo di evento."
         content_type: "Tipo Contenuto"
         secret: "Chiave segreta"
+        event_chooser: "Quali eventi devono attivare questo webhook?"
         wildcard_event: "Inviami tutto."
         individual_event: "Seleziona eventi singoli."
         verify_certificate: "Verifica il certificato TLS della URL payload"
         active: "Attivo"
+        active_notice: "Invieremo i dettagli dell'evento quando si verificherà"
+        categories_filter_instructions: "I webhook pertinenti saranno attivati solo se l'evento è in relazione a categorie specifiche. Lasciare vuoto per attivare i webhook per tutte le categorie."
+        categories_filter: "Categorie Innescate"
+        groups_filter_instructions: "I webhook pertinenti saranno attivati solo se l'evento è in relazione a gruppi specifici. Lasciare vuoto per attivare i webhook per tutti i gruppi."
         groups_filter: "Gruppi Innescati"
         delete_confirm: "Eliminare questo webhook?"
         topic_event:
@@ -2435,6 +2554,8 @@ it:
             without_uploads: "Sì (non includere i file)"
           download:
             label: "Scarica"
+            title: "Invia una email con il collegamento per il download"
+            alert: "Un collegamento per scaricare questo backup ti è stato inviato via email"
           destroy:
             title: "Rimuovi il backup"
             confirm: "Sicuro di voler distruggere questo backup?"
@@ -2466,15 +2587,21 @@ it:
         title: "Personalizza"
         long_title: "Personalizzazioni Sito"
         preview: "anteprima"
+        explain_preview: "Guarda il sito con questo tema abilitato"
         save: "Salva"
         new: "Nuovo"
         new_style: "Nuovo Stile"
         import: "Importare"
         delete: "Cancella"
+        delete_confirm: "Eliminare questo tema?"
         about: "Modifica i fogli di stile CSS e le intestazioni HTML del sito. Aggiungi una personalizzazione per iniziare."
         color: "Colore"
         opacity: "Opacità"
         copy: "Copia"
+        copy_to_clipboard: "Copia negli Appunti"
+        copied_to_clipboard: "Copiato negli Appunti"
+        copy_to_clipboard_error: "Errore nel copiare i dati negli Appunti"
+        theme_owner: "Non modificabile, di proprietà di:"
         email_templates:
           title: "Modelli e-mail"
           subject: "Oggetto"
@@ -2494,16 +2621,65 @@ it:
           desktop: "Desktop"
           mobile: "Mobile"
           preview: "Anteprima"
+          is_default: "Il tema è abilitato di default"
+          user_selectable: "Il tema può essere selezionato dagli utenti"
+          color_scheme: "Schema Colore"
+          color_scheme_select: "Seleziona i colori da usare nel tema"
+          custom_sections: "Sezioni personalizzate:"
+          theme_components: "Componenti Tema"
+          uploads: "Carica"
+          no_uploads: "Puoi caricare le risorse associate al tuo tema come il tipo di carattere e le immagini"
+          add_upload: "Aggiungi Caricamento"
+          upload_file_tip: "Scegli una risorsa da caricare (png, woff2, ecc...)"
+          variable_name: "Nome SCSS var:"
+          upload: "Carica"
+          child_themes_check: "Il tema include altri temi figli"
+          css_html: "CSS/HTML personalizzato"
+          edit_css_html: "Modifica CSS/HTML"
+          edit_css_html_help: "Non hai mofificato nessun CSS o HTML"
+          delete_upload_confirm: "Elimina questo caricamento? (Il CSS del tema potrebbe non funzionare!)"
+          import_web_tip: "Repository contenente il tema"
+          import_file_tip: "Il file .dcstyle.json contenente il tema"
+          about_theme: "About Tema"
+          license: "Licenza"
+          component_of: "Il tema è un componente di:"
+          update_to_latest: "Aggiorna all'ultima versione"
+          check_for_updates: "Controllo Aggiornamenti"
+          updating: "Aggiornamento..."
+          up_to_date: "Il tema è aggiornato, ultima verifica:"
+          add: "Aggiungi"
+          commits_behind:
+            one: "Il tema è indietro di 1 aggiornamento!"
+            other: "Il tema è indietro di {{count}} aggiornamenti!"
           scss:
             text: "CSS"
+            title: "Inserire il CSS personalizzato, accettiamo tutti gli stili validi di CSS e SCSSpersonalizzato"
+          header:
+            text: "Intestazione"
+            title: "Inserire l'HTML da visualizzare sopra l'intestazione del sito"
+          after_header:
+            text: "Dopo Intestazione"
+            title: "Inserire l'HTML da visualizzare dopo l'intestazione"
+          footer:
+            text: "Fondo pagina"
+            title: "Inserire l'HTML da visualizzare a piè di pagina"
+          embedded_scss:
+            text: "CSS incorporato"
+            title: "Inserisci CSS personalizzato da inviare con la versione incorporata dei commenti"
           head_tag:
             text: "</head>"
             title: "HTML che sarà inserito prima del tag </head> "
           body_tag:
             text: "</body>"
+            title: "HTML che deve essere inserito prima del tag </body>"
         colors:
+          select_base:
+            title: "Seleziona combinazione colori di base"
+            description: "Combinazione base:"
           title: "Colori"
+          edit: "Modifica Combinazioni Colori"
           long_title: "Combinazioni Colori"
+          about: "Modifica i colori predefiniti usati dai tuoi temi. Crea una nuova combinazione di colori per iniziare."
           new_name: "Nuova Combinazione Colori"
           copy_name_prefix: "Copia di"
           delete_confirm: "Eliminare questa combinazione di colori?"
@@ -2621,6 +2797,8 @@ it:
           block: "blocca"
           do_nothing: "non fare nulla"
         staff_actions:
+          all: "Tutte"
+          filter: "Filtro"
           title: "Azioni Staff"
           clear_filters: "Mostra Tutto"
           staff_user: "Utente"
@@ -2674,6 +2852,8 @@ it:
             change_readonly_mode: "cambia la modalità di sola lettura"
             backup_download: "scarica backup"
             backup_destroy: "distruggi backup"
+            reviewed_post: "messaggio revisionato"
+            custom_staff: "azione plugin personalizzato"
         screened_emails:
           title: "Email Scansionate"
           description: "Quando qualcuno cerca di creare un nuovo account, verrando controllati i seguenti indirizzi email  e la registrazione viene bloccata, o eseguita qualche altra azione."
@@ -2781,11 +2961,13 @@ it:
         refresh_browsers_message: "Messaggio inviato a tutti i client!"
         show_public_profile: "Mostra Profilo Pubblico"
         impersonate: 'Impersona'
+        action_logs: "Log Azione"
         ip_lookup: "IP Lookup"
         log_out: "Disconnetti"
         logged_out: "L'utente è stato disconnesso da tutti i terminali"
         revoke_admin: 'Revoca privilegi di amministrazione'
         grant_admin: 'Assegna privilegi di amministrazione'
+        grant_admin_confirm: "Ti abbiamo inviato una email per verificare il nuovo amministratore. Per favore aprila e segui le istruzioni."
         revoke_moderation: 'Revoca privilegi di moderazione'
         grant_moderation: 'Assegna diritti di moderazione'
         unblock: 'Sblocca'
@@ -2844,6 +3026,7 @@ it:
         reset_bounce_score:
           label: "Azzera"
           title: "Azzera il conteggio degli errori di ritorno."
+        visit_profile: "Visita <a href='%{url}'>la pagina delle preferenze di questo utente</a> per modificare il suo profilo"
         deactivate_explanation: "Un utente disattivato deve riconvalidare la propria email."
         suspended_explanation: "Un utente sospeso non può connettersi."
         block_explanation: "Un utente bloccato non può pubblicare messaggi o iniziare argomenti."
@@ -3054,6 +3237,8 @@ it:
         sample: "Utilizza il seguente codice HTML nel tuo sito per creare e incorporare gli argomenti di Discourse. Sostituisci <b>REPLACE_ME</b> con l'URL canonical della pagina in cui lo stai incorporando."
         title: "Incorporo"
         host: "Host Abilitati"
+        class_name: "Nome Classe"
+        path_whitelist: "Percorso Whitelist"
         edit: "modifica"
         category: "Pubblica nella Categoria"
         add_host: "Aggiungi Host"
@@ -3072,6 +3257,7 @@ it:
         embed_classname_whitelist: "Classi CSS permesse"
         feed_polling_enabled: "Importa i messaggi via RSS/ATOM"
         feed_polling_url: "URL del feed RSS/ATOM da recuperare"
+        feed_polling_frequency_mins: "Frequenza del feed polling (in minuti)"
         save: "Salva Impostazioni Inclusione"
       permalink:
         title: "Collegamenti permanenti"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index fad82ec4100..2b04cc82e41 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -40,13 +40,13 @@ ja:
       long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
       wrap_ago: "%{date}前"
       tiny:
-        half_a_minute: "1分前"
+        half_a_minute: "1分未満"
         less_than_x_seconds:
-          other: "%{count}秒前"
+          other: "%{count}秒未満"
         x_seconds:
           other: "%{count}秒"
         x_minutes:
-          other: "%{count}分前"
+          other: "%{count}分"
         about_x_hours:
           other: "%{count}時間"
         x_days:
@@ -54,7 +54,7 @@ ja:
         about_x_years:
           other: "%{count}年"
         over_x_years:
-          other: "%{count}年以上前"
+          other: "%{count}年以上"
         almost_x_years:
           other: "%{count}年"
         date_month: "MMM D日"
@@ -83,6 +83,7 @@ ja:
           other: "%{count}年後"
       previous_month: '前の月'
       next_month: '次の月'
+      placeholder: 日時を選択
     share:
       topic: 'このトピックのリンクをシェアする'
       post: '投稿 #%{postNumber}'
@@ -94,8 +95,11 @@ ja:
     action_codes:
       public_topic: "トピックを公開しました: %{when} "
       private_topic: "トピックを非公開にしました: %{when}"
+      split_topic: "%{when} このトピックは分割されました"
       invited_user: "%{who} から招待されました: %{when}"
+      invited_group: "%{when} %{who}に招待されました"
       removed_user: "%{who}が %{when}に削除しました"
+      removed_group: "%{when} %{who}に取り除かれました"
       autoclosed:
         enabled: 'クローズされました: %{when}'
         disabled: '%{when}にオープンしました'
@@ -114,23 +118,33 @@ ja:
       visible:
         enabled: 'リストに表示: %{when}'
         disabled: 'リストから非表示: %{when}'
+      banner:
+        enabled: 'この広告%{when}を作成して下さい。ユーザーが拒否するまで各ページの上部に表示されます。'
+        disabled: 'このバナー%{when}を削除すると、各ページの最上部に表示しません。'
     topic_admin_menu: "トピックの管理"
+    wizard_required: "新しいディスコースへようこそ。セットアップウィザードと一緒に始めましょう。"
     emails_are_disabled: "メールアドレスの送信は管理者によって無効化されています。全てのメール通知は行われません"
     bootstrap_mode_enabled: "かんたんにサイトを立ち上げられるようにするため、ブートストラップモードが有効になっています。新しいユーザーは全員、トラストレベル1を付与し、毎日更新がメールで届けられます。これらの機能は総ユーザー数が%{min_users}を超えた時にオフになります。"
     bootstrap_mode_disabled: "ブートストラップモードは24時間後に無効化されます。"
+    themes:
+      default_description: "デフォルト"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
+        ap_south_1: "アジア(ムンバイ)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
+        cn_north_1: "中国(北京)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        eu_west_2: "EU(ロンドン)"
         sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_east_2: "US East"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'このトピックのタイトル/カテゴリを編集'
     not_implemented: "この機能はまだ実装されていません！"
     no_value: "いいえ"
@@ -188,6 +202,7 @@ ja:
       like_count: "いいね！"
       topic_count: "トピック"
       post_count: "投稿"
+      user_count: "ユーザー"
       active_user_count: "アクティブユーザー"
       contact: "お問い合わせ"
       contact_info: "このサイトに影響を与える重要な問題や緊急の問題が発生した場合は、 %{contact_info}までご連絡ください"
@@ -225,6 +240,8 @@ ja:
     undo: "取り消す"
     revert: "戻す"
     failed: "失敗"
+    switch_to_anon: "匿名モードにする"
+    switch_from_anon: "匿名モードから抜ける"
     banner:
       close: "バナーを閉じる。"
       edit: "このバナーを編集 >>"
@@ -286,27 +303,70 @@ ja:
       posts_read_long: "投稿の閲覧数"
       total_rows:
         other: "%{count}人のユーザー"
+    group_histories:
+      actions:
+        change_group_setting: "グループの設定を変更"
+        add_user_to_group: "ユーザーを追加"
+        remove_user_from_group: "ユーザーを削除"
+        make_user_group_owner: "オーナーにする"
+        remove_user_as_group_owner: "オーナーから削除する"
     groups:
-      request_membership_pm:
-        title: "メンバーシップリクエスト"
+      logs:
+        title: "ログ"
+        when: "日時"
+        action: "アクション"
+        acting_user: "アクションしたユーザー"
+        target_user: "対象ユーザー"
+        subject: "対象"
+        details: "詳細"
+        from: "差出人"
+        to: "宛先"
+      edit:
+        title: 'グループの編集'
+        full_name: 'フルネーム'
+        add_members: "メンバーを追加"
+        delete_member_confirm: "%{group}から%{username}を削除しますか?"
+      name_placeholder: "グループネームはユーザー名と同様にスペース無し"
+      public: "自由なグループへの加入・脱退をユーザーに許可する (一般公開グループである必要があります)"
+      empty:
+        posts: "このグループのメンバーによる投稿はありません。"
+        members: "このグループにはメンバーがいません。"
+        mentions: "このグループに対するメンションはありません。"
+        messages: "このグループへのメッセージはありません。"
+        topics: "このグループのメンバーによるトピックはありません。"
+        logs: "このグループに関するログはありません。"
       add: "追加"
+      join: "グループに参加"
+      leave: "グループから離脱"
+      request: "グループへの参加をリクエスト"
       automatic_group: 自動作成グループ
       closed_group: クローズドグループ
+      is_group_user: "このグループのメンバーです"
+      allow_membership_requests: "ユーザーがグループオーナーにメンバーシップリクエストを送信できるようにする"
       membership: "メンバーシップ"
+      name: "名前"
       user_count: "メンバー数"
+      bio: "グループについて"
       selector_placeholder: "メンバーを追加"
       owner: "オーナー"
-      visible: "このグループは全てのユーザーに表示されています。"
       index:
         title: "グループ"
         empty: "表示するグループはありません。"
       title:
         other: "グループ"
+      activity: "アクティビティ"
       members: "メンバー"
       topics: "トピック"
       posts: "投稿"
       mentions: "メンション"
       messages: "メッセージ"
+      notification_level: "グループメッセージのデフォルト通知レベル"
+      visibility_levels:
+        title: "誰がこのグループを見ることができますか?"
+        public: "誰でも"
+        members: "グループのオーナー、メンバーおよび管理者"
+        staff: "グループオーナーとスタッフのみ"
+        owners: "グループオーナーと管理者のみ"
       alias_levels:
         title: "誰がこのグループにメッセージや@メンションが送れますか?"
         nobody: "無し"
@@ -319,13 +379,24 @@ ja:
         none: "なし"
       notifications:
         watching:
-          title: "ウォッチ中"
+          title: "待機中"
+          description: "メッセージ内の新規投稿はあなただけに通知され、新規返信数が表示されます。"
+        watching_first_post:
+          title: "最初の投稿に注意"
+          description: "グループ内新規トピック欄における最初の投稿はあなただけに通知されます。"
         tracking:
           title: "追跡中"
+          description: "誰かがあなた宛に返信をすると通知があり、新規返信数が表示されます。"
         regular:
           title: "デフォルト"
         muted:
           title: "ミュート"
+          description: "グループ内の新規トピックについては何も通知されません。"
+      flair_url: "アバター画像"
+      flair_bg_color: "アバターの背景色"
+      flair_color: "アバター色"
+      flair_preview_icon: "アイコンプレビュー"
+      flair_preview_image: "画像プレビュー"
     user_action_groups:
       '1': "「いいね！」 "
       '2': "「いいね！」 された"
@@ -349,6 +420,7 @@ ja:
         title: "カテゴリの並び替え"
         title_long: "カテゴリリストを並べ直します"
         fix_order: "位置を修正"
+        fix_order_tooltip: "全てのカテゴリーは唯一である番地を持っていないので、予期せぬ結果を引き起こすかもしれません。"
         save: "順番を保存"
         apply_all: "適用"
         position: "位置"
@@ -358,6 +430,8 @@ ja:
       latest_by: "最新投稿: "
       toggle_ordering: "カテゴリの並び替えモードを切り替え"
       subcategories: "サブカテゴリ:"
+      topic_sentence:
+        other: "%{count}トピック群"
       topic_stat_sentence:
         other: "過去 %{unit} 間 %{count} 個の新着トピック。"
     ip_lookup:
@@ -382,6 +456,11 @@ ja:
       profile: "プロフィール"
       mute: "ミュート"
       edit: "プロフィールを編集"
+      download_archive:
+        button_text: "すべてダウンロード"
+        confirm: "本当にご自身の投稿をダウンロードしたいですか。"
+        success: "ダウンロードが始まると、処理完了時に通知されます。"
+        rate_limit_error: "投稿者は1日1回ダウンロードすることが可能です、明日再度お試しください。"
       new_private_message: "メッセージを作成"
       private_message: "メッセージ"
       private_messages: "メッセージ"
@@ -405,8 +484,10 @@ ja:
         each_browser_note: "注意: 利用するすべてのブラウザでこの設定を変更する必要があります"
       dismiss_notifications: "すべて既読にする"
       dismiss_notifications_tooltip: "全ての未読の通知を既読にします"
+      first_notification: "最初の通知です! 始めるために選択してください。"
       disable_jump_reply: "返信した後に投稿へ移動しない"
       dynamic_favicon: "新規/更新トピックの件数をブラウザのアイコンに表示する"
+      theme_default_on_all_devices: "ご自身の全てのデバイス上で初期テーマを作成して下さい。"
       external_links_in_new_tab: "外部リンクをすべて別のタブで開く"
       enable_quoting: "選択したテキストを引用して返信する"
       change: "変更"
@@ -426,9 +507,22 @@ ja:
           この設定は、アクティビティの情報機能を無効化します。<br />
           ミュートしているトピックやカテゴリはこれらのメールには含まれません。
         individual: "新しい投稿がある場合にメールで送る"
+        individual_no_echo: "自分自身を除いて新規投稿関連のメールを送信してください。"
+        few_per_day: "新規投稿に関連するメッセージを送信してください。(大体2日おき)"
+      tag_settings: "タグ"
+      watched_tags: "閲覧済み"
+      muted_tags: "通知しない"
       watched_categories: "ウォッチ中"
+      watched_categories_instructions: "自動的にカテゴリー内の全てのトピックを監視します。全ての新規投稿と新規トピックが通知されまた、新規投稿数がトピックの隣に表示されます。"
       tracked_categories: "追跡中"
-      muted_categories: "ミュート中"
+      tracked_categories_instructions: "自動的にカテゴリー内の全てのトピックを追跡します。新規投稿数がトピックの隣に表示されます。"
+      watched_first_post_categories: "新規投稿を監視中"
+      watched_first_post_categories_instructions: "カテゴリー内の新規トピックに対する新規投稿について通知されます。"
+      watched_first_post_tags: "新規投稿を監視中"
+      watched_first_post_tags_instructions: "これらのタグの新規トピック内の新規投稿は通知されます。"
+      muted_categories: "通知しない"
+      muted_categories_instructions: "カテゴリー内の新規トピックについて何も通知せず、また最新を表示しません。"
+      no_category_access: "モデレータとしてカテゴリーへのアクセスが制限されたので、保存できませんでした。"
       delete_account: "アカウントを削除する"
       delete_account_confirm: "アカウントを削除してもよろしいですか？削除されたアカウントは復元できません。"
       deleted_yourself: "あなたのアカウントは削除されました。"
@@ -439,6 +533,10 @@ ja:
       muted_users: "ミュート"
       muted_users_instructions: "ユーザーからの通知をすべて行いません"
       muted_topics_link: "ミュートしたトピックを表示する"
+      watched_topics_link: "監視トピックを表示"
+      tracked_topics_link: "追跡トピックを表示"
+      api_approved: "承認されました:"
+      theme: "テーマ"
       staff_counters:
         flags_given: "役に立った通報"
         flagged_posts: "通報した投稿"
@@ -456,19 +554,28 @@ ja:
         move_to_archive: "アーカイブ"
         failed_to_move: "選択したメッセージを移動できませんでした(ネットワークがダウンしている可能性があります)"
         select_all: "すべて選択する"
+      preferences_nav:
+        account: "アカウント"
+        profile: "プロフィール"
+        emails: "メール"
+        notifications: "お知らせ"
+        categories: "カテゴリ"
+        interface: "表示設定"
       change_password:
         success: "(メールを送信しました)"
         in_progress: "(メールを送信中)"
         error: "(エラー)"
         action: "パスワードリセット用メールを送信する"
         set_password: "パスワードを設定する"
+        choose_new: "新規パスワードを決定してください。"
+        choose: "パスワードを決定してください。"
       change_about:
         title: "プロフィールを変更"
         error: "変更中にエラーが発生しました。"
       change_username:
         title: "ユーザー名を変更"
+        confirm: "ユーザー名を変更すると、全ての投稿内容とユーザー発言に支障が出ます。本当に実行したいですか?"
         taken: "このユーザー名は既に使われています。"
-        error: "ユーザー名の変更中にエラーが発生しました。"
         invalid: "このユーザー名は無効です。英数字のみ利用可能です。"
       change_email:
         title: "メールアドレスを変更"
@@ -495,13 +602,16 @@ ja:
         instructions: "背景画像は、幅590pxで中央揃えになります"
       email:
         title: "メールアドレス"
+        instructions: "決して全体には表示されません。"
         ok: "確認用メールを送信します"
         invalid: "正しいメールアドレスを入力してください"
         authenticated: "あなたのメールアドレスは {{provider}} によって認証されています"
+        frequency_immediately: "私達は、あなたがメールlを読まなかった場合、即座にl通知します。"
         frequency:
           other: "最後に利用されてから{{count}}分以上経過した場合にメールを送ります。"
       name:
         title: "名前"
+        instructions: "フルネーム(任意)"
         instructions_required: "氏名"
         too_short: "名前が短いです"
         ok: "問題ありません"
@@ -537,6 +647,7 @@ ja:
         title: "メールの文章の下部に以前の返信を含める"
         always: "常に"
       email_digests:
+        title: "ここを訪れないときは、人気トピックと返信の要約を私宛にメールで送信して下さい。"
         every_30_minutes: "30分毎"
         every_hour: "1時間毎"
         daily: "毎日"
@@ -547,7 +658,7 @@ ja:
       email_private_messages: "メッセージを受け取ったときにメールで通知を受け取る。"
       email_always: "常にメールへ通知を送る"
       other_settings: "その他"
-      categories_settings: "カテゴリ設定"
+      categories_settings: "カテゴリの設定"
       new_topic_duration:
         label: "以下の条件でトピックを新規と見なす"
         not_viewed: "未読"
@@ -584,16 +695,24 @@ ja:
         expired: "この招待の有効期限が切れました。"
         rescind: "削除"
         rescinded: "取り消された招待"
+        rescind_all: "全ての招待を取り消してください。"
+        rescinded_all: "全ての招待が取り消しました!"
+        rescind_all_confirm: "本当にすべての招待を取り消したいですか？"
         reinvite: "招待を再送信する"
+        reinvite_all: "全ての招待を再送してください。"
+        reinvite_all_confirm: "本当に全ての招待を再送したいですか?"
         reinvited: "招待を再度送りました。"
+        reinvited_all: "全ての招待が再送されました!"
         time_read: "リード時間"
         days_visited: "訪問日数"
         account_age_days: "アカウント有効日数"
         create: "招待を送る"
         generate_link: "招待リンクをコピー"
+        valid_for: "招待リンクはこのEメールアドレスにだけ有効です。%{email}"
         bulk_invite:
           text: "ファイルからまとめて招待をする"
           success: "ファイルは無事にアップロードされました。完了されましたらメッセージでお知らせをさせていただきます。"
+          error: "すみません、ファイルはCSV形式です。"
       password:
         title: "パスワード"
         too_short: "パスワードが短すぎます。"
@@ -624,6 +743,7 @@ ja:
         top_badges: "最近ゲットしたバッジ"
         no_badges: "まだバッジはありません。"
         more_badges: "バッジをもっと見る"
+        no_likes: "好きなものはまだ有りません。"
       associated_accounts: "関連アカウント"
       ip_address:
         title: "最後のIPアドレス"
@@ -685,7 +805,9 @@ ja:
       other: 返信
     signup_cta:
       sign_up: "新しいアカウントを作成"
+      hide_session: "明日私に思い出させてください。"
       hide_forever: "いいえ、結構です"
+      hidden_for_session: "わかりました明日お尋ねします。アカウントを作っていつでもログインできます。"
       intro: "こんにちは！ :heart_eyes: エンジョイしていますね。 ですが、サインアップしていないようです。"
       value_prop: "アカウントを作成した後、いま読んでいるページへ戻ります。また、新しい投稿があった場合はこことメールにてお知らせします。 いいね！を使って好きな投稿をみんなに教えましょう。 :heartbeat:"
     summary:
@@ -702,6 +824,7 @@ ja:
       title: "メッセージ"
       invite: "他の人を招待する..."
       remove_allowed_user: "このメッセージから {{name}} を削除してもよろしいですか？"
+      remove_allowed_group: "あなたは本当にこのメッセージからnameを削除したいですか？"
     email: 'メール'
     username: 'ユーザ名'
     last_seen: '最終アクティビティ'
@@ -710,6 +833,7 @@ ja:
     trust_level: 'トラストレベル'
     search_hint: 'ユーザ名、メールアドレスまたはIPアドレス'
     create_account:
+      disclaimer: "登録すると<a href='{{privacy_link}}'>プライバシーポリシー</a>と<a href='{{tos_link}}'>利用規約</a>に同意することになります。"
       title: "アカウントの作成"
       failed: "エラーが発生しました。既にこのメールアドレスは使用中かもしれません。「パスワードを忘れました」リンクを試してみてください"
     forgot_password:
@@ -723,6 +847,8 @@ ja:
       complete_email_found: "<b>%{email}</b>宛にパスワード再設定メールを送信しました。"
       complete_username_not_found: " <b>%{username}</b>は見つかりませんでした"
       complete_email_not_found: "<b>%{email}</b>で登録したアカウントがありません。"
+      button_ok: "OK"
+      button_help: "ヘルプ"
     login:
       title: "ログイン"
       username: "ユーザ名"
@@ -742,6 +868,8 @@ ja:
       not_allowed_from_ip_address: "このIPアドレスでログインできません"
       admin_not_allowed_from_ip_address: "そのIPアドレスからは管理者としてログインできません"
       resend_activation_email: "再度アクティベーションメールを送信するにはここをクリックしてください。"
+      resend_title: "アクティベーションメールを再送してください。"
+      change_email: "メールアドレスを変更してください。"
       sent_activation_email_again: "<b>{{currentEmail}}</b> にアクティベーションメールを再送信しました。メールが届くまで数分掛かることがあります。 (メールが届かない場合は、迷惑メールフォルダの中をご確認ください)。"
       to_continue: "ログインしてください"
       preferences: "ユーザ設定を変更するには、ログインする必要があります。"
@@ -766,6 +894,21 @@ ja:
       github:
         title: "with GitHub"
         message: "Github による認証 (ポップアップがブロックされていないことを確認してください)"
+    invites:
+      accept_title: "招待"
+      welcome_to: "%{site_name}へようこそ!"
+      invited_by: "あなたは招待されました:"
+      accept_invite: "招待を承認してください。"
+      success: "あなたのアカウントは作成されて、ログインされました。"
+      name_label: "氏名"
+      password_label: "パスワードを入力してください。"
+      optional_description: "(任意)"
+    emoji_set:
+      google: "Google"
+      twitter: "Twitter"
+      facebook_messenger: "Facebookメッセンジャー"
+    category_page_style:
+      categories_only: "カテゴリのみ"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -838,6 +981,8 @@ ja:
       modal_ok: "OK"
       modal_cancel: "キャンセル"
       cant_send_pm: "%{username}へメッセージを送ることはできません。"
+      yourself_confirm:
+        body: "たった今このメッセージはあなただけに送られました。"
       admin_options_title: "このトピックの詳細設定"
     notifications:
       title: "@ユーザ名 のメンション、投稿やトピックへの返信、メッセージなどの通知"
@@ -892,6 +1037,7 @@ ja:
       local_tip: "ローカルからアップロードする画像を選択"
       local_tip_with_attachments: "デバイスから画像/ファイルを選択する {{authorized_extensions}}"
       hint: "(アップロードする画像をエディタにドラッグ&ドロップすることもできます)"
+      hint_for_supported_browsers: "ドラッグ＆ドロップあるいはエディター内に画像を貼り付けてください。"
       uploading: "アップロード中"
       select_file: "ファイル選択"
       image_link: "イメージのリンク先"
@@ -899,20 +1045,34 @@ ja:
       sort_by: "並べ替え"
       relevance: "一番関連しているもの"
       latest_post: "最近の投稿"
+      latest_topic: "最近のトピック"
       most_viewed: "最も閲覧されている順"
       most_liked: "「いいね！」されている順"
       select_all: "すべて選択する"
       clear_all: "すべてクリア"
+      too_short: "検索文字が短すぎます。"
       title: "トピック、投稿、ユーザ、カテゴリを探す"
       no_results: "何も見つかりませんでした。"
       no_more_results: "検索結果は以上です。"
       searching: "検索中..."
       post_format: "#{{post_number}}  {{username}}から"
+      results_page: "検索結果"
       context:
         user: "@{{username}}の投稿を検索"
         category: "#{{category}} から検索する"
         topic: "このトピックを探す"
         private_messages: "メッセージ検索"
+      advanced:
+        posted_by:
+          label: 投稿者
+        in_category:
+          label: カテゴリー内
+        in_group:
+          label: グループ内
+        filters:
+          posted: 投稿しました。
+          bookmarks: ブックマークしました。
+          seen: 読み終わりました。
     hamburger_menu: "他のトピック一覧やカテゴリを見る"
     new_item: "新着"
     go_back: '戻る'
@@ -1007,6 +1167,9 @@ ja:
       jump_reply_up: 以前の返信へジャンプ
       jump_reply_down: 以後の返信へジャンプ
       deleted: "トピックは削除されました"
+      auto_update_input:
+        next_week: "来週"
+        next_month: "来月"
       auto_close_title: 'オートクローズの設定'
       timeline:
         back_description: "未読の最終投稿へ戻る"
@@ -1157,7 +1320,10 @@ ja:
           other: "この {{count}} つの投稿の新しいオーナーを選択してください。（前のオーナー：<b>{{old_user}}</b>）"
         instructions_warn: "この投稿についての通知が新しいユーザにさかのぼって移動されることはないので注意してください。<br>警告: 投稿の関連データの所有権は、新しいユーザに転送されません。 注意して使用してください。"
       change_timestamp:
+        title: "タイムスタンプを変更してください。"
         action: "タイムスタンプを変更"
+        invalid_timestamp: "タイムスタンプは未来時刻にすることが出来ません。"
+        error: "トピックのタイムスタンプ変更にエラーがありました。"
       multi_select:
         select: '選択'
         selected: '選択中 ({{count}})'
@@ -1171,6 +1337,7 @@ ja:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
+      quote_reply: "引用"
       edit: "編集中 {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "理由: "
       post_number: "投稿{{number}}"
@@ -1193,11 +1360,16 @@ ja:
       has_likes_title:
         other: "{{count}}人のユーザがこの返信に「いいね！」しました"
       has_likes_title_only_you: "あなたがいいねした投稿"
+      has_likes_title_you:
+        other: "あなたと{{count}} 人の人がこの投稿に「いいね!」しました。"
       errors:
         create: "申し訳ありませんが、投稿中にエラーが発生しました。もう一度やり直してください。"
         edit: "申し訳ありませんが、投稿の編集中にエラーが発生しました。もう一度やり直してください。"
         upload: "申し訳ありません、ファイルのアップロード中にエラーが発生しました。再度お試しください。"
+        file_too_large: "すみません、ファイルが大きすぎます。(最大サイズは{{max_size_kb}}kbです。)サイズの大きいファイルを共有クラウドサービスにアップロードせず、リンクを共有する方法があります。"
         too_many_uploads: "申し訳ありませんが、複数のファイルは同時にアップロードできません。"
+        too_many_dragged_and_dropped_files: "すみません、一度に10ファイルだけアップロードすることが出来ます。"
+        upload_not_authorized: "すみません、アップロードしようとしているファイルは許可されていません。 (許可された拡張子は: {{authorized_extensions}}です。)"
         image_upload_not_allowed_for_new_user: "申し訳ありませんが、新規ユーザは画像のアップロードができません。"
         attachment_upload_not_allowed_for_new_user: "申し訳ありませんが、新規ユーザはファイルの添付ができません。"
         attachment_download_requires_login: "ファイルをダウンロードするには、ログインする必要があります"
@@ -1249,6 +1421,8 @@ ja:
           off_topic: "関係無い話題として通報"
           spam: "スパムとして通報"
           inappropriate: "不適切な発言として通報"
+          notify_user: "メッセージを送信しました。"
+          bookmark: "これをブックマークしました。"
         by_you:
           off_topic: "関係のない話題として通報しました"
           spam: "スパム報告として通報しました"
@@ -1295,6 +1469,9 @@ ja:
       delete:
         confirm:
           other: "これらの投稿を削除してもよろしいですか？"
+      merge:
+        confirm:
+          other: "これらの{{count}}の投稿を統合したいですか?"
       revisions:
         controls:
           first: "最初のリビジョン"
@@ -1609,12 +1786,14 @@ ja:
         private_messages_short: "メッセージ"
         private_messages_title: "メッセージ"
         mobile_title: "モバイル"
-        space_free: "{{size}} free"
+        space_free: "{{size}} 空き"
         uploads: "アップロード"
         backups: "バックアップ"
         traffic_short: "トラフィック"
         traffic: "Application web requests"
-        show_traffic_report: "Show Detailed Traffic Report"
+        page_views: "閲覧数"
+        page_views_short: "閲覧数"
+        show_traffic_report: "詳細なトラフィックレポートを表示出来るようにする"
         reports:
           today: "今日"
           yesterday: "昨日"
@@ -1879,6 +2058,7 @@ ja:
         test_error: "テストメールを送れませんでした。メール設定、またはホストをメールコネクションをブロックされていないようを確認してください。"
         sent: "送信したメール"
         skipped: "スキップ済み"
+        bounced: "バウンス"
         received: "受信したメール"
         rejected: "拒否されたメール"
         sent_at: "送信時間"
@@ -2071,6 +2251,7 @@ ja:
         refresh_browsers_message: "全てのクライアントにメッセージが送信されました！"
         show_public_profile: "パブリックプロフィールを見る"
         impersonate: 'このユーザになりすます'
+        action_logs: "アクションログ"
         ip_lookup: "IPアドレスを検索"
         log_out: "ログアウト"
         logged_out: "すべてのデバイスでログアウトしました"
@@ -2126,10 +2307,18 @@ ja:
         unblock_failed: 'ユーザのブロック解除に失敗しました。'
         block_failed: 'ユーザのブロックに失敗しました。'
         block_confirm: 'このユーザをブロックしてもよろしいですか? ユーザは新しくトピックを作成したり、投稿する事ができなくなります。'
+        bounce_score: "バウンススコア"
+        reset_bounce_score:
+          title: "バウンススコアを0にリセット"
+        visit_profile: "<a href='%{url}'>設定ページ</a>からプロフィールの変更ができます"
         deactivate_explanation: "アクティベート解除されたユーザは、メールで再アクティベートする必要があります。"
         suspended_explanation: "凍結中のユーザはログインできません。"
         block_explanation: "ブロックされているユーザは投稿およびトピックの作成ができません。"
         staged_explanation: "ステージドユーザは特定のトピック宛に、メールを経由して投稿する事が出来ます。"
+        bounce_score_explanation:
+          none: "直近ではバウンスメールは受け取っていません。"
+          some: "最近、メールからバウンスが受信されました。"
+          threshold_reached: "そのメールから何度もバウンスを受信しています。"
         trust_level_change_failed: "ユーザのトラストレベル変更に失敗しました。"
         suspend_modal_title: "凍結中のユーザ"
         trust_level_2_users: "トラストレベル2のユーザ"
@@ -2320,6 +2509,12 @@ ja:
         edit: "編集"
         category: "カテゴリへ投稿"
         settings: "埋め込みの設定"
+        embed_whitelist_selector: "埋め込みで許可される要素のCSSセレクタ"
+        embed_blacklist_selector: "埋め込みから削除された要素のCSSセレクタ"
+        embed_classname_whitelist: "許可されたCSSクラス名"
+        feed_polling_enabled: "RSS / ATOM経由で投稿をインポートする"
+        feed_polling_url: "クロールするRSS / ATOMフィードのURL"
+        feed_polling_frequency_mins: "フィードの更新間隔 (分)"
         save: "埋め込みの設定を保存"
       permalink:
         title: "パーマリンク"
@@ -2336,3 +2531,21 @@ ja:
           label: "新規:"
           add: "追加"
           filter: "検索(URL または 外部URL)"
+  wizard_js:
+    wizard:
+      done: "完了"
+      back: "戻る"
+      next: "次へ"
+      step: "%{current} / %{total}"
+      upload: "アップロード"
+      uploading: "アップロード中..."
+      quit: "後で"
+      staff_count:
+        other: "コミュニティには%{count}名のスタッフがいます。"
+      invites:
+        add_user: "追加"
+        none_added: "あなたはスタッフを招待していません。 続行してもよろしいですか？"
+        roles:
+          admin: "管理者"
+          moderator: "モデレータ"
+          regular: "正規ユーザー"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 92557ba3e17..10604a34cb0 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -81,10 +81,11 @@ ko:
           other: "%{count}달 후"
         x_years:
           other: "%{count}년 후"
-      previous_month: '이전 달'
+      previous_month: '지난 달'
       next_month: '다음 달'
+      placeholder: 날짜를 선택하세요
     share:
-      topic: '주제를 공유합니다.'
+      topic: '토픽을 공유합니다'
       post: '게시글 #%{postNumber}'
       close: '닫기'
       twitter: 'twitter로 공유'
@@ -94,7 +95,7 @@ ko:
     action_codes:
       public_topic: "이 토픽을 %{when} 에 공개"
       private_topic: "이 토픽을 %{when} 에 비공개"
-      split_topic: "이 주제를 ${when}에 분리"
+      split_topic: "이 토픽을 %{when}에 분리"
       invited_user: "%{who}이(가) %{when}에 초대됨"
       invited_group: "%{who} 이(가) %{when} 에 초대됨"
       removed_user: "%{who}이(가) %{when}에 삭제됨"
@@ -117,26 +118,33 @@ ko:
       visible:
         enabled: '%{when} 목록에 게시'
         disabled: '%{when} 목록에서 감춤'
-    topic_admin_menu: "주제 관리자 기능"
+      banner:
+        enabled: 'made this a banner %{when}. It will appear at the top of every page until it is dismissed by the user.'
+        disabled: '이 배너를 제거했습니다 %{when}. 더 이상 모든 페이지의 상단에 표시되지 않습니다.'
+    topic_admin_menu: "토픽 관리"
+    wizard_required: "새로운 Discourse에 오신것을 환영합니다! <a href='%{url}' data-auto-route='true'>설치 마법사</a> 로 시작해봅시다✨"
     emails_are_disabled: "관리자가 이메일 송신을 전체 비활성화 했습니다. 어떤 종류의 이메일 알림도 보내지지 않습니다."
     bootstrap_mode_enabled: "쉬운 시작을 위해 부트스트랩 모드로 구동 되었습니다. 모든 새로운 사용자에게 신뢰 수준 1이 부여되고 매일 이메일 다이제스트가 보내집니다. 이 기능은 총 사용자 수가 %{min_users}를 초과 할 때 자동으로 꺼집니다."
     bootstrap_mode_disabled: "부트스트랩 모드는 24시간 뒤 비활성화 될 것입니다."
+    themes:
+      default_description: "기본값"
     s3:
       regions:
-        us_east_1: "미국 동부 (N. 버지니아)"
-        us_west_1: "미국 서부 (N. 캘리포니아)"
-        us_west_2: "미국 서부 (오레곤)"
-        us_gov_west_1: "AWS GovCloud(US)"
-        eu_west_1: "유럽연합 (아일랜드)"
-        eu_central_1: "유럽연합 (프랑크푸르트)"
-        ap_southeast_1: "아시아 태평양 (싱가폴)"
-        ap_southeast_2: "아시아 태평양 (시드니)"
-        ap_south_1: "아시아 태평양 (뭄바이)"
         ap_northeast_1: "아시아 태평양 (토쿄)"
         ap_northeast_2: "아시아 태평양 (서울)"
-        sa_east_1: "남 아메리카 (상파울로)"
+        ap_south_1: "아시아 태평양 (뭄바이)"
+        ap_southeast_1: "아시아 태평양 (싱가폴)"
+        ap_southeast_2: "아시아 태평양 (시드니)"
         cn_north_1: "중국 (북경)"
-    edit: '이 주제의 제목과 카테고리 편집'
+        eu_central_1: "유럽연합 (프랑크푸르트)"
+        eu_west_1: "유럽연합 (아일랜드)"
+        eu_west_2: "EU (런던)"
+        sa_east_1: "남 아메리카 (상파울로)"
+        us_east_1: "미국 동부 (N. 버지니아)"
+        us_gov_west_1: "AWS GovCloud(US)"
+        us_west_1: "미국 서부 (N. 캘리포니아)"
+        us_west_2: "미국 서부 (오레곤)"
+    edit: '이 토픽의 제목과 카테고리 편집'
     not_implemented: "죄송합니다. 아직 사용할 수 없는 기능입니다."
     no_value: "아니오"
     yes_value: "예"
@@ -178,7 +186,7 @@ ko:
     character_count:
       other: "{{count}} 자"
     suggested_topics:
-      title: "추천 주제"
+      title: "추천 토픽"
       pm_title: "추천 메세지"
     about:
       simple_title: "About"
@@ -191,7 +199,7 @@ ko:
         last_7_days: "지난 7일"
         last_30_days: "최근 30일"
       like_count: "좋아요"
-      topic_count: "주제"
+      topic_count: "토픽"
       post_count: "게시글"
       user_count: "사용자"
       active_user_count: "활성화된 사용자"
@@ -201,21 +209,21 @@ ko:
       title: "북마크"
       clear_bookmarks: "북마크 제거"
       help:
-        bookmark: "북마크하려면 이 주제의 첫번째 게시글을 클릭하세요"
-        unbookmark: "북마크를 제거하려면 이 주제의 첫 번째 게시글을 클릭하세요"
+        bookmark: "클릭하면 이 토픽의 첫번째 포스트가 북마크됩니다"
+        unbookmark: "클릭하면 이 토픽에 속한 모든 북마크가 제거됩니다"
     bookmarks:
       not_logged_in: "죄송합니다. 게시물을 즐겨찾기에 추가하려면 로그인을 해야 합니다."
       created: "이 게시글을 북마크 하였습니다."
       not_bookmarked: "이 게시물을 읽으셨습니다. 즐겨찾기에 추가하려면 클릭하세요."
       last_read: "마지막으로 읽으신 게시물입니다. 즐겨찾기에 추가하려면 클릭하세요."
       remove: "북마크 삭제"
-      confirm_clear: "정말 이 주제의 모든 북마크를 제거하시겠습니까?"
+      confirm_clear: "정말로 이 토픽의 모든 북마크를 제거할까요?"
     topic_count_latest:
-      other: "{{count}} 새 주제 혹은 업데이트된 주제"
+      other: "{{count}}개의 새 토픽이나 업데이트된 토픽"
     topic_count_unread:
-      other: "{{count}} 읽지 않은 주제"
+      other: "{{count}}개의 읽지 않은 토픽"
     topic_count_new:
-      other: "{{count}}개의 새로운 주제"
+      other: "{{count}}개의 새로운 토픽"
     click_to_show: "보려면 클릭하세요."
     preview: "미리보기"
     cancel: "취소"
@@ -237,12 +245,12 @@ ko:
       close: "배너 닫기"
       edit: "이 배너 수정 >>"
     choose_topic:
-      none_found: "주제를 찾을 수 없습니다."
+      none_found: "토픽을 찾을 수 없습니다."
       title:
-        search: "이름, url, ID로 주제 검색"
-        placeholder: "여기에 주제 제목을 입력하세요"
+        search: "이름, url, ID로 토픽 검색"
+        placeholder: "토픽 제목을 입력하세요"
     queue:
-      topic: "주제:"
+      topic: "토픽:"
       approve: '승인'
       reject: '거절'
       delete_user: '사용자 삭제'
@@ -252,7 +260,7 @@ ko:
       cancel: "취소"
       view_pending: "대기중인 게시글"
       has_pending_posts:
-        other: "이 주제에는 <b>{{count}}</b>개의 승인 대기중인 게시글이 있습니다."
+        other: "이 토픽에는 <b>{{count}}</b>개의 승인 대기중인 포스트가 있습니다"
       confirm: "변경사항 저장"
       delete_prompt: "정말로 <b>%{username}</b>; 회원을 삭제하시겠습니까? 게시글이 모두 삭제되고 IP와 이메일이 차단됩니다."
       approval:
@@ -262,12 +270,12 @@ ko:
           other: "대기중인 게시글이 <strong>{{count}}</strong>개 있습니다."
         ok: "확인"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{topicUrl}}'>주제</a>를 게시함"
-      you_posted_topic: "<a href='{{userUrl}}'>내</a>가 <a href='{{topicUrl}}'>주제</a>를 게시함"
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{topicUrl}}'>토픽</a>을 게시했습니다"
+      you_posted_topic: "<a href='{{userUrl}}'>회원님</a>이 <a href='{{topicUrl}}'>토픽</a>을 게시했습니다"
       user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a>님이  <a href='{{postUrl}}'>{{post_number}}</a> 게시글에 답글 올림"
       you_replied_to_post: "<a href='{{userUrl}}'>내</a>가 <a href='{{postUrl}}'>{{post_number}}</a> 게시글에 답글 올림"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{topicUrl}}'>주제</a>에 답글 올림"
-      you_replied_to_topic: "<a href='{{userUrl}}'>내</a>가 <a href='{{topicUrl}}'>주제</a>에 답글 올림"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{topicUrl}}'>토픽</a>에 답글을 올렸습니다"
+      you_replied_to_topic: "<a href='{{userUrl}}'>회원님</a>이 <a href='{{topicUrl}}'>토픽</a>에 댓글을 달았습니다"
       user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a>님이 <a href='{{user2Url}}'>{{another_user}}</a>를 멘션함"
       user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a>님이 <a href='{{user2Url}}'>나</a>를 멘션함"
       you_mentioned_user: "<a href='{{user1Url}}'>내</a>가 <a href='{{user2Url}}'>{{another_user}}</a>님을 멘션함"
@@ -281,10 +289,10 @@ ko:
       likes_given: "제공한"
       likes_received: "받은"
       topics_entered: "읽음"
-      topics_entered_long: "읽은 주제"
+      topics_entered_long: "읽은 토픽 수"
       time_read: "읽은 시간"
-      topic_count: "주제"
-      topic_count_long: "생성된 주제"
+      topic_count: "토픽"
+      topic_count_long: "생성된 토픽"
       post_count: "답글"
       post_count_long: "답글"
       no_results: "결과가 없습니다."
@@ -306,8 +314,9 @@ ko:
         title: "로그"
         when: "언제"
         action: "액션"
+        acting_user: "활동하는 사용자"
         target_user: "대상 사용자"
-        subject: "주제"
+        subject: "제목"
         details: "자세한 내용"
         from: "부터"
         to: "까지"
@@ -316,41 +325,47 @@ ko:
         full_name: '전체 이름'
         add_members: "구성원 추가"
         delete_member_confirm: "'%{username}'를 '%{group}' 그룹에서 삭제하겠습니까?"
-      request_membership_pm:
-        title: "멤버십 요청"
-        body: "@%{groupName} 에 멤버십을 요청합니다."
       name_placeholder: "그룹 이름, 공백 없이 username 규칙과 동일하게 입력하세요."
-      public: "사용자들이 그룹을 자유롭게 참여/탈퇴 가능하게 합니다. (그룹은 반드시 공개되어야 함)"
+      public: "그룹 가입/탈퇴를 자유롭게 할 수 있도록 허용 (그룹이 공개되어야 합니다)"
       empty:
         posts: "이 그룹에는 아직 멤버들이 포스트를 작성하지 않았습니다."
         members: "이 그룹에는 구성원이 없습니다."
         mentions: "이 그룹에서는 언급이 없습니다."
         messages: "이 그룹에 대한 메시지는 없습니다."
-        topics: "이 그룹의 구성원이 작성한 주제글이 없습니다."
+        topics: "이 그룹의 멤버가 작성한 토픽이 없습니다."
         logs: "이 그룹에 대한 기록이 없습니다."
       add: "추가"
       join: "그룹 참여하기"
       leave: "그룹 나가기"
       request: "그룹 참여 요청하기"
+      automatic_group: 자동 그룹
       closed_group: 닫힌 그룹
       is_group_user: "당신은 이 그룹의 구성원입니다."
+      allow_membership_requests: "사용자가 그룹 소유자에게 가입신청을 할 수 있도록 허용합니다"
       membership: "회원제"
       name: "이름"
       user_count: "멤버 수"
       bio: "이 그룹에 대하여"
       selector_placeholder: "멤버 추가"
       owner: "소유자"
-      visible: "모든 사용자에게 보이는 그룹입니다."
       index:
         title: "그룹"
+        empty: "보이는 그룹이 없습니다."
       title:
         other: "그룹"
       activity: "활동"
       members: "멤버"
-      topics: "주제"
+      topics: "토픽"
       posts: "게시글"
       mentions: "멘션"
       messages: "메시지"
+      notification_level: "그룹 메시지의 기본 알림 레벨"
+      visibility_levels:
+        title: "누가 이 그룹을 볼 수 있나요?"
+        public: "모두"
+        members: "그룹 소유자, 멤버, 관리자"
+        staff: "그룹 소유자와 운영진"
+        owners: "그룹 소유자와 관리자"
       alias_levels:
         title: "누가 이 그룹에 메시지와 @멘션을 보낼 수 있습니까?"
         nobody: "0명"
@@ -367,8 +382,9 @@ ko:
           description: "이 메시지에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다."
         watching_first_post:
           title: "첫번째 글 보기"
+          description: "이 그룹의 신규 토픽에 대해서만 알림을 받게 됩니다."
         tracking:
-          title: "알림 : 새 글 표시 중"
+          title: "추적 중"
           description: "누군가 당신의 @아이디 로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다."
         regular:
           title: "알림 : 일반"
@@ -376,12 +392,20 @@ ko:
         muted:
           title: "알림 : 끔"
           description: "이 메시지에 대해 어떠한 알림도 받지 않지 않습니다."
+      flair_url: "아바타 플레어 이미지"
       flair_url_placeholder: "(선택) 이미지 URL 또는 Font Awesome 아이콘 클래스"
+      flair_bg_color: "아바타 플레어 배경 색상"
+      flair_bg_color_placeholder: "(선택사항) 16진수 컬러 값"
+      flair_color: "아바타 플레어 색상"
+      flair_color_placeholder: "(선택사항) 16진수 컬러 값"
+      flair_preview_icon: "미리보기 아이콘"
+      flair_preview_image: "미리보기 이미지"
+      flair_note: "주의사항: 플레어는 사용자의 주요 그룹에만 표시됩니다."
     user_action_groups:
       '1': "선사한 '좋아요'"
       '2': "받은 '좋아요'"
       '3': "북마크"
-      '4': "주제"
+      '4': "토픽"
       '5': "답글"
       '6': "응답"
       '7': "멘션"
@@ -405,17 +429,17 @@ ko:
         apply_all: "적용"
         position: "위치"
       posts: "게시글"
-      topics: "주제"
+      topics: "토픽"
       latest: "최근"
       latest_by: "가장 최근"
       toggle_ordering: "정렬 컨트롤 토글"
       subcategories: "하위 카테고리"
       topic_sentence:
-        other: "%{count}개의 주제"
+        other: "%{count}개의 토픽"
       topic_stat_sentence:
-        other: "지난 %{unit} 동안 %{count}개의 새로운 주제가 있습니다."
+        other: "지난 %{unit} 동안 %{count}개의 새로운 토픽이 생겼습니다."
     ip_lookup:
-      title: IP Address Lookup
+      title: IP 주소 Lookup
       hostname: Hostname
       location: 위치
       location_not_found: (알수없음)
@@ -436,6 +460,11 @@ ko:
       profile: "프로필"
       mute: "알림 끄기"
       edit: "환경 설정 편집"
+      download_archive:
+        button_text: "모두 다운로드하기"
+        confirm: "정말로 작성한 모든 글을 다운로드할까요?"
+        success: "다운로드가 시작되었습니다. 다운로드 과정이 완료되면 메시지로 알려드리겠습니다."
+        rate_limit_error: "게시글은 하루에 한번만 다운로드할 수 있습니다. 내일 다시 시도해보세요."
       new_private_message: "새로운 메시지"
       private_message: "메시지"
       private_messages: "메시지"
@@ -453,14 +482,16 @@ ko:
         not_supported: "안타깝게도 지금 사용하고 계시는 브라우저는 알림을 지원하지 않습니다."
         perm_default: "알림 켜기"
         perm_denied_btn: "권한 거부"
-        perm_denied_expl: "통지를 위한 허용을 거절했었습니다. 브라우저 설정을 통해서 통지를 허용해주세요."
+        perm_denied_expl: "알림을 허가하지 않으셨군요. 브라우저 설정을 통해서 알림을 허용해주세요."
         disable: "알림 비활성화"
         enable: "알림 활성화"
         each_browser_note: "노트: 사용하시는 모든 브라우저에서 이 설정을 변경해야합니다."
       dismiss_notifications: "모두 해지"
       dismiss_notifications_tooltip: "읽지 않은 알림을 모두 읽음으로 표시"
+      first_notification: "당신의 첫 번째 알림입니다! 시작하려면 선택해보세요."
       disable_jump_reply: "댓글을 작성했을 때, 새로 작성한 댓글로 화면을 이동하지 않습니다."
       dynamic_favicon: "새 글이나 업데이트된 글 수를 브라우저 아이콘에 보이기"
+      theme_default_on_all_devices: "이 테마를 모든 기기의 기본 테마로 설정합니다."
       external_links_in_new_tab: "모든 외부 링크를 새 탭에 열기"
       enable_quoting: "강조 표시된 텍스트에 대한 알림을 사용합니다"
       change: "변경"
@@ -476,17 +507,31 @@ ko:
       mailing_list_mode:
         label: "메일링 리스트 모드"
         enabled: "메일링 리스트 모드 활성화"
+        instructions: |
+          이 설정은 활동 요약을 무시합니다.<br />
+          알림이 꺼진 토픽과 카테고리는 이 이메일에 포함되지 않습니다.
         individual: "모든 새로운 게시글에 대해 메일을 보내주세요."
+        individual_no_echo: "내가 쓴 것만 제외하고 모든 게시글에 대해 이메일을 보내주세요"
+        many_per_day: "모든 새 게시글에 대해 이메일을 보내주세요 (일일 약 {{dailyEmailEstimate}}개)"
         few_per_day: "모든 새로운 게시글에 대해 메일을 보내주세요 (하루에 약 2개)."
       tag_settings: "태그"
       watched_tags: "지켜보기"
+      watched_tags_instructions: "이 태그가 붙은 토픽들을 주시하도록 자동으로 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게되며 토픽 옆에 새로운 게시글의 수가 표시됩니다."
       tracked_tags: "추적하기"
+      tracked_tags_instructions: "이 태그가 붙은 모든 토픽을 추적하도록 자동설정됩니다. 새로운 게시글의 수가 토픽 옆에 표시됩니다."
       muted_tags: "알람 끄기"
-      muted_tags_instructions: "이 태그의 새 주제에 대해 어떠한 알림도 받을 수 없으며, 최근의 주제도 나타나지 않습니다."
+      muted_tags_instructions: "이 태그가 달린 토픽에 대해 알림을 받지 않으며, 최근 토픽란에도 나타나지 않습니다."
       watched_categories: "지켜보기"
+      watched_categories_instructions: "이 카테고리의 모든 토픽을 주시하도록 자동 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게 되며, 토픽 옆에 새로운 게시글의 수가 표시됩니다."
       tracked_categories: "추적하기"
+      tracked_categories_instructions: "이 카테고리의 모든 토픽을 추적하도록 자동설정됩니다. 새로운 게시글의 수가 토픽 옆에 표시됩니다."
+      watched_first_post_categories: "첫번째 글 보기"
+      watched_first_post_categories_instructions: "이 카테고리에 새로운 토픽이 생길 때마다 알림을 받습니다."
+      watched_first_post_tags: "첫번째 글 보기"
+      watched_first_post_tags_instructions: "이 태그가 달린 토픽이 생길 때마다 알림을 받습니다."
       muted_categories: "알림 끄기"
-      muted_categories_instructions: "이 카테고리 내의 새 주제에 대해 어떠한 알림도 받을 수 없으며, 최근의 주제도 나타나지 않습니다."
+      muted_categories_instructions: "이 카테고리 내의 새 토픽에 대해 알림을 받지 않으며, 최근 토픽란에도 나타나지 않습니다."
+      no_category_access: "운영자는 이 카테고리 접근에 제약을 받습니다. 저장이 해제 됩니다."
       delete_account: "내 계정 삭제"
       delete_account_confirm: "정말로 계정을 삭제할까요? 이 작업은 되돌릴 수 없습니다."
       deleted_yourself: "계정이 삭제 되었습니다."
@@ -496,9 +541,15 @@ ko:
       users: "회원"
       muted_users: "알람 끄기"
       muted_users_instructions: "이 회원이 보낸 알림 모두 숨김"
-      muted_topics_link: "알림을 끈 주제 보기"
-      automatically_unpin_topics: "글 끝에 다다르면 자동으로 주제 고정을 해제합니다."
+      muted_topics_link: "알림을 끈 토픽 보기"
+      watched_topics_link: "읽은 토픽 보기"
+      tracked_topics_link: "관심있는 토픽 보기"
+      automatically_unpin_topics: "글 끝에 다다르면 자동으로 토픽 고정을 해제합니다."
+      apps: "앱"
+      revoke_access: "접근권한 회수"
+      undo_revoke_access: "접근권환 회수 취소"
       api_approved: "승인됨:"
+      theme: "테마"
       staff_counters:
         flags_given: "유용한 신고"
         flagged_posts: "신고된 글"
@@ -516,19 +567,30 @@ ko:
         move_to_archive: "보관하기"
         failed_to_move: "선택한 메시지를 이동할 수 없습니다 (아마도 네트워크가 다운됨)"
         select_all: "모두 선택"
+      preferences_nav:
+        account: "계정"
+        profile: "프로필"
+        emails: "이메일"
+        notifications: "알림"
+        categories: "카테고리"
+        tags: "태그"
+        interface: "인터페이스"
+        apps: "앱"
       change_password:
         success: "(이메일 전송)"
         in_progress: "(이메일 전송 중)"
         error: "(오류)"
         action: "비밀번호 재설정 메일 보내기"
         set_password: "비밀번호 설정"
+        choose_new: "새로운 비밀번호를 적어주세요"
+        choose: "비밀번호를 적어주세요"
       change_about:
         title: "내 소개 변경"
         error: "값을 바꾸는 중 에러가 발생했습니다."
       change_username:
         title: "아이디 변경"
+        confirm: "아이디를 변경하면, 이전에 입력한 답글들과 @이름으로 걸린 멘션들이 모두 깨지게 됩니다. 그래도 사용자 이름을 바꿀까요?"
         taken: "죄송합니다. 이미 사용 중인 아이디입니다."
-        error: "아이디를 변경하는 중에 오류가 발생했습니다."
         invalid: "아이디가 잘못되었습니다. 숫자와 문자를 포함해야합니다."
       change_email:
         title: "이메일 변경"
@@ -555,6 +617,7 @@ ko:
         instructions: "배경 이미지는 가운데를 기준으로 표시되며 590px이 기본 가로 사이즈 입니다."
       email:
         title: "이메일"
+        instructions: "절대로 공개되지 않습니다"
         ok: "내 이메일로 확인 메일이 전송됩니다."
         invalid: "유효한 이메일 주소를 입력해주세요."
         authenticated: "내 이메일이 {{provider}}에 의해 인증되었습니다."
@@ -563,14 +626,17 @@ ko:
           other: "최근  {{count}}분 동안접속하지 않을 경우에만 메일이 전송됩니다."
       name:
         title: "이름"
+        instructions: "이름 (선택사항)"
         instructions_required: "이름"
         too_short: "이름이 너무 짧습니다."
         ok: "사용 가능한 이름입니다."
       username:
         title: "아이디"
+        instructions: "공백없이, 짧고 특이하게"
         short_instructions: "@{{username}}으로 멘션이 가능합니다."
         available: "아이디\x1D로 사용가능합니다."
         not_available: "사용할 수 없는 아이디입니다. 다시 시도해보세요. {{suggestion}}"
+        not_available_no_suggestion: "불가합니다"
         too_short: "아이디가 너무 짧습니다"
         too_long: "아이디가 너무 깁니다."
         checking: "사용가능한지 확인 중..."
@@ -579,6 +645,7 @@ ko:
         title: "인터페이스 언어"
         instructions: "UI 언어. 변경 후 새로 고침하면 반영됩니다."
         default: "(기본)"
+        any: "무관"
       password_confirmation:
         title: "비밀번호를 재입력해주세요."
       last_posted: "마지막글"
@@ -592,36 +659,40 @@ ko:
       website: "웹사이트"
       email_settings: "이메일"
       like_notification_frequency:
-        title: "누군가 '좋아요' 해주면 알려주기"
-        always: "항상"
-        never: "절대"
+        title: "좋아요를 받았을 때 알림받기"
+        always: "항상 알림받기"
+        first_time_and_daily: "포스트가 첫 좋아요를 받았을 때부터 매일 알림받기"
+        first_time: "포스트가 첫 좋아요를 받았을 때 알림받기"
+        never: "알림 받지 않기"
       email_previous_replies:
-        title: "이메일 밑부분에 이전 댓글을 포함합니다."
-        unless_emailed: "예전에 발송된 것이 아닌 한"
-        always: "항상"
-        never: "절대"
+        title: "이메일 하단에 예전에 읽은 댓글도 포함하기"
+        unless_emailed: "확인하지 않은 댓글만 포함하기"
+        always: "항상 알림 받기"
+        never: "알림 받지 않기"
       email_digests:
+        title: "이 사이트를 방문하지 않을 때, 인기있는 토픽과 댓글의 요약 메일 받기"
         every_30_minutes: "매 30분 마다"
         every_hour: "매 시간"
         daily: "매일"
         every_three_days: "매 3일마다"
         weekly: "매주"
         every_two_weeks: "격주"
-      email_in_reply_to: "이메일에 글 응답내용을 발췌해서 포함하기 "
-      email_direct: "누군가 나를 인용했을 때, 내 글에 답글을 달았을때, 내 이름을 멘션했을때 혹은 토픽에 나를 초대했을 떄 이메일 보내기"
-      email_private_messages: "누군가 나에게 메시지를 보냈을때 이메일 보내기"
-      email_always: "사이트를 이용중 일 때도 이메일 알림 보내기"
+      include_tl0_in_digests: "신규 사용자가 작성한 내용도 요약 메일에 포함시키기"
+      email_in_reply_to: "이메일에 댓글 내용을 발췌해서 포함"
+      email_direct: "인용, 댓글, @아이디 멘션, 토픽 초대를 받을 때 이메일 받기"
+      email_private_messages: "메시지가 왔을 때 이메일 받기"
+      email_always: "사이트에 접속중일 때도 이메일 알림 전송"
       other_settings: "추가 사항"
       categories_settings: "카테고리"
       new_topic_duration:
-        label: "새글을 정의해주세요."
-        not_viewed: "아직 보지 않았습니다."
-        last_here: "마지막 방문이후 작성된 주제"
-        after_1_day: "지난 하루간 생성된 주제"
-        after_2_days: "지난 2일간 생성된 주제"
-        after_1_week: "최근 일주일간 생성된 주제"
-        after_2_weeks: "지난 2주간 생성된 주제"
-      auto_track_topics: "마지막 방문이후 작성된 주제"
+        label: "아래 조건에 해당하면 새로운 토픽으로 간주"
+        not_viewed: "아직 읽지 않은 토픽"
+        last_here: "마지막 방문이후 작성된 토픽"
+        after_1_day: "지난 하루간 생성된 토픽"
+        after_2_days: "지난 2일간 생성된 토픽"
+        after_1_week: "최근 일주일간 생성된 토픽"
+        after_2_weeks: "지난 2주간 생성된 토픽"
+      auto_track_topics: "내가 들어간 토픽 자동으로 추적"
       auto_track_options:
         never: "하지않음"
         immediately: "즉시"
@@ -632,6 +703,7 @@ ko:
         after_4_minutes: "4분 후"
         after_5_minutes: "5분 후"
         after_10_minutes: "10분 후"
+      notification_level_when_replying: "토픽에 포스트를 쓰면 그 토픽을 다음으로 설정"
       invited:
         search: "검색"
         title: "초대"
@@ -647,21 +719,31 @@ ko:
         pending: "초대를 보류합니다."
         pending_tab: "보류"
         pending_tab_with_count: "지연 ({{count}})"
-        topics_entered: "읽은 주제"
+        topics_entered: "읽은 토픽"
         posts_read_count: "글 읽기"
         expired: "이 초대장의 기한이 만료되었습니다."
         rescind: "삭제"
         rescinded: "초대가 제거되었습니다."
+        rescind_all: "모든 초대를 제거하기"
+        rescinded_all: "모든 초대가 제거되었습니다!"
+        rescind_all_confirm: "정말로 모든 초대를 제거할까요?"
         reinvite: "초대 메일 재전송"
+        reinvite_all: "모든 초대장 다시 보내기"
+        reinvite_all_confirm: "정말로 모든 초대장을 다시 보낼까요?"
         reinvited: "초대 메일 재전송 됨"
+        reinvited_all: "모든 초대장이 다시 발송되었습니다!"
         time_read: "읽은 시간"
         days_visited: "일일 방문"
         account_age_days: "일일 계정 나이"
         create: "이 포럼에 친구를 초대하기"
         generate_link: "초대 링크 복사"
+        link_generated: "초대 링크가 성공적으로 생성되었습니다!"
+        valid_for: "이 초대링크는 이메일 주소 '%{email}'에 한해서만 유효합니다."
         bulk_invite:
+          none: "아직 아무도 초대하지 않으셨어요. 한 명씩 초대장을 보내거나,  <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>CSV 파일을 업로드</a>해서 여러 사람에게 한꺼번에 초대장을 보낼 수 있습니다."
           text: "파일로 대량 초대하기"
           success: "파일이 성공적으로 업로드되었습니다. 완료되면 메시지로 알려드리겠습니다."
+          error: "죄송합니다. CSV형식의 파일만 올릴 수 있습니다."
       password:
         title: "비밀번호"
         too_short: "암호가 너무 짧습니다."
@@ -669,6 +751,7 @@ ko:
         same_as_username: "비밀번호가 아이디와 동일합니다."
         same_as_email: "비밀번호가 이메일과 동일합니다."
         ok: "적절한 암호입니다."
+        instructions: "최소 %{count} 자"
       summary:
         title: "요약"
         stats: "통계"
@@ -681,15 +764,27 @@ ko:
           other: "좋아요"
         likes_received:
           other: "받음"
+        days_visited:
+          other: "방문일수"
+        posts_read:
+          other: "읽은 글 갯수"
+        bookmark_count:
+          other: "북마크들"
         top_replies: "인기 댓글"
         no_replies: "아직 답글이 없습니다."
         more_replies: "답글 더 보기"
-        top_topics: "인기 주제"
+        top_topics: "인기 토픽"
         no_topics: "아직 주제가 없습니다."
         more_topics: "주제 더 보기"
         top_badges: "인기 배지"
         no_badges: "아직 배지가 없습니다."
         more_badges: "배지 더 보기"
+        top_links: "인기 링크"
+        no_links: "아직 링크가 없습니다."
+        most_liked_by: "가장 많이 좋아요를 한 사용자"
+        most_liked_users: "가장 많이 좋아요를 받은"
+        most_replied_to_users: "댓글을 가장 많이 단 사람"
+        no_likes: "아직 좋아요가 없습니다."
       associated_accounts: "로그인"
       ip_address:
         title: "마지막 IP 주소"
@@ -734,10 +829,18 @@ ko:
     read_only_mode:
       enabled: "이 사이트는 현재 읽기전용 모드입니다. 브라우징은 가능하지만, 댓글달기, 좋아요 등 다른 행위들은 현재 비활성화 되어있습니다."
       login_disabled: "사이트가 읽기 전용모드로 되면서 로그인은 비활성화되었습니다."
+      logout_disabled: "사이트가 읽기 전용모드일 때 로그아웃은 비활성화됩니다."
     too_few_topics_and_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>토론을 시작하시죠!</a> 현재 <strong>%{currentTopics} / %{requiredTopics}</strong> 주제와 <strong>%{currentPosts} / %{requiredPosts}</strong> 글이 있습니다. 새 방문자에게는 읽고 응답할 대화거리가 필요합니다."
     too_few_topics_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>토론을 시작하시죠!</a> 현재 <strong>%{currentTopics} / %{requiredTopics}</strong> 주제가 있습니다. 새 방문자에게는 읽고 응답할 대화거리가 필요합니다."
     too_few_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>토론을 시작하시죠!</a> 현재 <strong>%{currentPosts} / %{requiredPosts}</strong> 글이 있습니다. 새 방문자에게는 읽고 응답할 대화거리가 필요합니다."
+    logs_error_rate_notice:
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> 가 사이트 제한값 %{siteSettingRate}에 도달했습니다."
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> 가 사이트 제한값 %{siteSettingRate}을 초과하였습니다."
+      rate:
+        other: "%{count} 에러/%{duration}"
     learn_more: "더 배우기"
+    all_time: '총'
+    all_time_desc: '총 토픽'
     year: '년'
     year_desc: '지난 365일간 생성된 주제'
     month: '월'
@@ -774,6 +877,7 @@ ko:
       title: "메시지"
       invite: "다른 사람 초대"
       remove_allowed_user: "{{name}}에게서 온 메시지를 삭제할까요?"
+      remove_allowed_group: "{{name}}에게서 온 메시지를 삭제할까요?"
     email: '이메일'
     username: '아이디'
     last_seen: '마지막 접속'
@@ -782,6 +886,7 @@ ko:
     trust_level: '회원등급'
     search_hint: '아이디, 이메일 혹은 IP 주소'
     create_account:
+      disclaimer: "등록하시면 <a href='{{privacy_link}}'>개인정보 정책</a> 과 <a href='{{tos_link}}'>사용자 약관</a>에 동의하시는 것으로 간주합니다."
       title: "회원 가입"
       failed: "뭔가 잘못되었습니다. 이 메일은 등록이 되어있습니다. 비밀번호를 잊으셨다면 비밀번호 찾기를 눌러주세요."
     forgot_password:
@@ -795,6 +900,9 @@ ko:
       complete_email_found: "<b>%{email}</b>과 일치하는 계정을 찾았습니다. 비밀번호를 초기화하는 방법이 담긴 메일을 발송하였으니 확인하여 주십시요."
       complete_username_not_found: "<b>%{username}</b>과 일치하는 계정이 없습니다."
       complete_email_not_found: "<b>%{email}</b>과 일치하는 계정이 없습니다."
+      help: "이메일을 못받으셨나요? 일단 스팸 폴더부터 체크해보세요.<p>어떤 이메일 주소를 입력했는지 확실치 않나요? 이메일 주소를 여기에 입력하시면 기록이 있는지 봐드리겠습니다.</p><p>만약 더 이상 그 이메일 주소로 접근할 수 없다면, <a href='/about'>친절한 운영진</a>에게 도움을 요청하세요.</p>"
+      button_ok: "확인"
+      button_help: "도움말"
     login:
       title: "로그인"
       username: "아이디"
@@ -808,16 +916,22 @@ ko:
       logging_in: "로그인 중.."
       or: "또는"
       authenticating: "인증 중..."
+      awaiting_activation: "계정이 아직 미활성 상태입니다. 활성화 메일을 보내려면 비밀번호 찾기 링크를 사용하세요."
       awaiting_approval: "스태프가 아직 내 계정을 승인하지 않았습니다. 승인되면 이메일을 받게됩니다."
       requires_invite: "죄송합니다. 초대를 받은 사람만 이용하실 수 있습니다."
       not_activated: "아직 로그인 할 수 없습니다. 계정을 만들었을때 <b> {{sentTo}} </b> 주소로 인증 이메일을 보냈습니다. 계정을 활성화하려면 해당 이메일의 지침을 따르십시오."
       not_allowed_from_ip_address: "이 IP 주소에서 로그인 할 수 없습니다."
       admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address."
       resend_activation_email: "다시 인증 이메일을 보내려면 여기를 클릭하세요."
+      resend_title: "활성화 이메일 다시 보내기"
+      change_email: "이메일 주소 변경"
+      provide_new_email: "새로운 주소를 적어주시면 확인 메일을 재전송해드리겠습니다."
+      submit_new_email: "이메일 주소 변경"
       sent_activation_email_again: "<b> {{currentEmail}} </b> 주소로 인증 이메일을 보냈습니다. 이메일이 도착하기까지 몇 분 정도 걸릴 수 있습니다. 또한 스팸 메일을 확인하십시오."
       to_continue: "로그인 해주세요"
       preferences: "사용자 환경을 변경하려면 로그인이 필요합니다."
       forgot: "내 계정의 상세내역 기억하지 않는다."
+      not_approved: "당신의 계정은 아직 활성화되지 않았습니다. 이메일을 확인하시고 로그인 해주세요."
       google:
         title: "Google"
         message: "Google 인증 중(팝업 차단을 해제 하세요)"
@@ -827,6 +941,9 @@ ko:
       twitter:
         title: "with Twitter"
         message: "Twitter 인증 중(팝업 차단을 해제 하세요)"
+      instagram:
+        title: "인스타그램"
+        message: "인스타그램으로 인증 중 (팝업이 허용되어 있는지 확인해주세요)"
       facebook:
         title: "with Facebook"
         message: "Facebook 인증 중(팝업 차단을 해제 하세요)"
@@ -836,6 +953,30 @@ ko:
       github:
         title: "GitHub"
         message: "GitHub 인증 중(팝업 차단을 해제 하세요)"
+    invites:
+      accept_title: "초대장"
+      welcome_to: "%{site_name}에 오신것을 환영합니다."
+      invited_by: "당신을 초청한 사람:"
+      social_login_available: "해당 이메일 주소를 사용하는 다른 소셜 로그인으로 접속하는 것도 가능합니다."
+      your_email: "당신의 계정 이메일은 <b>%{email}</b>입니다."
+      accept_invite: "초청 수락하기"
+      success: "계정 생성이 생성되었습니다. 현재 로그인 상태입니다."
+      name_label: "이름"
+      password_label: "비밀번호 설정"
+      optional_description: "(선택사항)"
+    password_reset:
+      continue: "%{site_name}으로 가기"
+    emoji_set:
+      apple_international: "Apple/International"
+      google: "Google"
+      twitter: "Twitter"
+      emoji_one: "Emoji One"
+      win10: "Win10"
+      facebook_messenger: "Facebook 메신저"
+    category_page_style:
+      categories_only: "카테고리만"
+      categories_with_featured_topics: "주요 토픽이 있는 카테고리"
+      categories_and_latest_topics: "카테고리와 최신 토픽"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -845,14 +986,23 @@ ko:
       more_emoji: "더보기..."
       options: "온셥"
       whisper: "귓속말"
+      unlist: "목록에서 제외됨"
+      blockquote_text: "Blockquote"
       add_warning: "공식적인 경고입니다."
       toggle_whisper: "귀속말 켜고 끄기"
+      toggle_unlisted: "목록제외 켜고 끄기"
       posting_not_on_topic: "어떤 주제에 답글을 작성하시겠습니까?"
       saving_draft_tip: "저장 중..."
       saved_draft_tip: "저장 완료"
       saved_local_draft_tip: "로컬로 저장됩니다."
       similar_topics: "작성하려는 내용과 비슷한 주제들..."
       drafts_offline: "초안"
+      group_mentioned:
+        other: "{{group}}을 언급하면, <a href='{{group_link}}'>{{count}} 명</a>의 회원에게 알림이 갑니다. 그렇게 할까요?"
+      cannot_see_mention:
+        category: "{{username}}에게 멘션을 썼지만, 해당 사용자가 이 카테고리에 접근할 수 없기 때문에 알림이 가지 않습니다. 이 카테고리에 접근할 수 있는 그룹에 해당 멤버가 추가되어야 합니다."
+        private: "{{username}}에게 멘션을 썼지만, 해당 사용자가 개인 메시지를 볼 수 없기 때문에 알림이 가지 않습니다. 이 개인 메시지에 해당 사용자를 초대해야 합니다."
+      duplicate_link: "이 토픽에는 이미<b>{{domain}}</b>의 링크가 <b>@{{username}}</b>님이 <a href='{{post_url}}'>{{ago}}</a>전에 쓴 게시글에 게시되어 있습니다. 그래도 다시 게시할까요?"
       error:
         title_missing: "제목은 필수 항목입니다"
         title_too_short: "제목은 최소 {{min}} 글자 이상이어야 합니다."
@@ -871,8 +1021,10 @@ ko:
       title: "혹은 Ctrl + Enter 누름"
       users_placeholder: "사용자 추가"
       title_placeholder: "이야기 나누고자 하는 내용을 한문장으로 적는다면?"
+      title_or_link_placeholder: "제목을 입력하거나, 링크를 붙여넣으세요"
       edit_reason_placeholder: "why are you editing?"
       show_edit_reason: "(add edit reason)"
+      topic_featured_link_placeholder: "타이틀과 함께 표시될 링크를 입력하세요."
       reply_placeholder: "여기에 타이핑 하세요. 마크다운 또는 BBCode, HTML 포맷을 이용하세요. 이미지를 끌어오거나 붙여넣기 하세요."
       view_new_post: "새로운 글을 볼 수 있습니다."
       saving: "저장 중..."
@@ -882,23 +1034,28 @@ ko:
       show_preview: '미리보기를 보여줍니다 &laquo;'
       hide_preview: '&laquo; 미리보기를 숨기기'
       quote_post_title: "전체 글을 인용"
+      bold_label: "B"
       bold_title: "굵게"
       bold_text: "굵게하기"
+      italic_label: "I"
       italic_title: "강조"
       italic_text: "강조하기"
       link_title: "하이퍼링크"
       link_description: "링크 설명을 입력"
       link_dialog_title: "하이퍼링크 삽입"
       link_optional_text: "옵션 제목"
+      link_url_placeholder: "http://example.com"
       quote_title: "인용구"
       quote_text: "인용구"
       code_title: "코드 샘플"
       code_text: "미리 지정된 양식 사용은 4개의 띄어쓰기로 들여쓰세요."
+      paste_code_text: "여기에 코드를 붙여넣거나 입력하세요"
       upload_title: "업로드"
       upload_description: "업로드 설명을 입력"
       olist_title: "번호 매기기 목록"
       ulist_title: "글 머리 기호 목록"
       list_item: "주제"
+      heading_label: "H"
       heading_title: "표제"
       heading_text: "표제"
       hr_title: "수평선"
@@ -907,24 +1064,35 @@ ko:
       modal_ok: "OK"
       modal_cancel: "취소"
       cant_send_pm: "죄송합니다. %{username}님에게 메시지를 보낼 수 없습니다."
+      yourself_confirm:
+        title: "수신자 추가를 잊으셨나요?"
+        body: "현재 이 메시지는 당신에게만 전송됩니다."
       admin_options_title: "이 주제에 대한 옵션 설정"
     notifications:
       title: "@name 언급, 글과 주제에 대한 답글, 개인 메시지 등에 대한 알림"
       none: "현재 알림을 불러올 수 없습니다."
+      empty: "알림이 없습니다."
       more: "이전 알림을 볼 수 있습니다."
       total_flagged: "관심 표시된 총 글"
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
+      posted: "<i title='posted' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
       liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
+      liked_2: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span> {{description}}</p>"
+      liked_many:
+        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}, 외 {{count}} 명</span> {{description}}</p>"
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invited_to_private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
+      linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>'{{description}}' 배지를 받았습니다.</p>"
+      topic_reminder: "<i title='topic reminder' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
+      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>새로운 토픽</span> {{description}}</p>"
       group_message_summary:
         other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{group_name}} 메시지상자에 {{count}}개의 메시지가 있습니다</p>"
       alt:
@@ -968,10 +1136,12 @@ ko:
       sort_by: "다음으로 정렬"
       relevance: "관련성"
       latest_post: "가장 최근 글"
+      latest_topic: "최신 토픽"
       most_viewed: "가장 많이 본"
       most_liked: "가장 많이 좋아요를 받은"
       select_all: "모두 선택"
       clear_all: "다 지우기"
+      too_short: "검색 단어가 너무 짧습니다."
       result_count:
         other: "<span class='term'>\"{{term}}\"</span> 검색결과 {{count}} 개"
       title: "주제, 글, 사용자, 카테고리 검색"
@@ -979,18 +1149,65 @@ ko:
       no_more_results: "더 이상 결과가 없습니다."
       searching: "검색중..."
       post_format: "#{{post_number}} by {{username}}"
+      results_page: "검색 결과"
       context:
         user: "@{{username}}의 글 검색"
+        category: "#{{category}} 카테고리에서 검색"
         topic: "이 주제를 검색"
         private_messages: "메시지 검색"
+      advanced:
+        title: 고급 검색
+        posted_by:
+          label: 글쓴이
+        in_category:
+          label: 카테고리에 속한
+        in_group:
+          label: 그룹에 속한
+        with_badge:
+          label: 배지가 있는
+        with_tags:
+          label: 태그가 있는
+        filters:
+          label: '다음과 같은 토픽/게시글만 보기:'
+          likes: 내가 좋아요 누른
+          posted: 내가 게시글을 쓴
+          watching: 내가 주시하는
+          tracking: 내가 추적하는
+          private: 가 메시지함에 있습니다.
+          bookmarks: 내가 북마크한
+          first: 가 가장 첫 포스트입니다.
+          pinned: 핀고정된
+          unpinned: 핀고정 되지 않은
+          seen: 읽은 것
+          unseen: 읽지 않은 것
+          wiki: 은(는) 위키입니다.
+          all_tags: 모든 태그를 포함
+        statuses:
+          label: 토픽 조건
+          open: 가 열렸습니다
+          closed: 가 닫혔습니다
+          archived: 가 보관되었습니다
+          noreplies: 답글이 없습니다
+          single_user: 1명의 사용자를 포함합니다
+        post:
+          count:
+            label: 최소 게시글 수
+          time:
+            label: 게시날짜
+            before: 이전
+            after: 이후
     hamburger_menu: "다른 주제 목록이나 카테고리로 가기"
     new_item: "새로운"
     go_back: '돌아가기'
     not_logged_in_user: 'user page with summary of current activity and preferences'
     current_user: '사용자 페이지로 이동'
     topics:
+      new_messages_marker: "마지막 조회시간"
       bulk:
+        select_all: "모두 선택"
+        clear_all: "모두 지우기"
         unlist_topics: "주제 내리기"
+        relist_topics: "토픽 재정렬하기"
         reset_read: "읽기 초기화"
         delete: "주제 삭제"
         dismiss: "해지"
@@ -1001,11 +1218,18 @@ ko:
         dismiss_new: "새글 제거"
         toggle: "주제 복수 선택"
         actions: "일괄 적용"
+        change_category: "카테고리 설정하기"
         close_topics: "주제 닫기"
         archive_topics: "주제 보관하기"
+        notification_level: "알림"
         choose_new_category: "주제의 새로운 카테고리를 선택"
         selected:
           other: "<b>{{count}}</b>개의 주제가 선택되었습니다."
+        change_tags: "태그 교체"
+        append_tags: "태그 덧붙이기"
+        choose_new_tags: "이 토픽의 태그를 입력하세요:"
+        choose_append_tags: "이 토픽에 추가할 태그를 입력하세요:"
+        changed_tags: "토픽의 태그가 변경되었습니다."
       none:
         unread: "읽지 않은 주제가 없습니다."
         new: "읽을 새로운 주제가 없습니다."
@@ -1035,6 +1259,8 @@ ko:
       unsubscribe:
         stop_notifications: "<strong>{{title}}</strong>에 대한 알림은 이제 덜 받게 됩니다."
         change_notification_state: "현재 당신의 알림 설정 : "
+      filter_to:
+        other: "이 토픽에 {{count}}개 게시글"
       create: '새 주제 만들기'
       create_long: '새로운 주제 만들기'
       private_message: '메시지 시작'
@@ -1076,30 +1302,86 @@ ko:
       toggle_information: "주제의 세부 정보를 토글합니다."
       read_more_in_category: "더 읽을거리가 필요하신가요? {{catLink}} 또는 {{latestLink}}를 살펴보세요."
       read_more: "{{catLink}} 또는 {{latestLink}}에서 더 많은 토픽들을 찾으실 수 있습니다"
-      read_more_MF: "이 카테고리에 { UNREAD, plural, =0 {} one { is <a href='/unread'>1개의 안 읽은</a> } other { are <a href='/unread'>#개의 안 읽은</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1개의 새로운</a> 주제가} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># 새로운</a> 주제가} } 남아 있고, {CATEGORY, select, true {{catLink} 주제도 확인해보세요.} false {{latestLink}} other {}}"
+      read_more_MF: "이 카테고리에 { UNREAD, plural, =0 {} one { is <a href='/unread'>1개의 안 읽은</a> } other { <a href='/unread'>#개의 안 읽은</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ 그리고 } false {} other{}} <a href='/new'>1개의 새로운</a> 토픽이} other { {BOTH, select, true{ 그리고 } false {} other{}} <a href='/new'># 새로운</a> 토픽이} } 남아 있습니다. {CATEGORY, select카테고리, true {{catLink} 카테고리의 다른 토픽도 확인해보세요.} false {{latestLink}} 다른 토픽도 확인해 보세요 {}}"
       browse_all_categories: 모든 카테고리 보기
       view_latest_topics: 최신 주제 보기
       suggest_create_topic: 새 주제를 작성 해 보실래요?
       jump_reply_up: 이전 답글로 이동
       jump_reply_down: 이후 답글로 이동
       deleted: "주제가 삭제되었습니다"
+      topic_status_update:
+        title: "토픽 타이머 설정"
+        save: "타이머 설정"
+        num_of_hours: "시간:"
+        remove: "타이머 제거하기"
+        publish_to: "게시되는 곳:"
+        when: "게시일:"
+      auto_update_input:
+        later_today: "오늘 늦게"
+        tomorrow: "내일"
+        later_this_week: "이번 주 후반"
+        this_weekend: "이번 주말"
+        next_week: "다음 주"
+        next_month: "다음 달"
+        pick_date_and_time: "날짜와 시간을 "
+        set_based_on_last_post: "마지막 게시글 기준으로 닫기"
+      publish_to_category:
+        title: "발행 스케쥴링"
+      temp_open:
+        title: "임시로 열기"
+      auto_reopen:
+        title: "자동으로 열린 토픽"
+      temp_close:
+        title: "임시로 닫기"
+      auto_close:
+        title: "자동으로 닫힌 토픽"
+        label: "토픽이 자동으로 열린 후 지난 시간:"
+        error: "유효한 값을 입력하세요"
+        based_on_last_post: "적어도 주제의 마지막 글이 이만큼 오래되지 않았으면 닫지 마세요."
+      auto_delete:
+        title: "자동 삭제 토픽"
+      reminder:
+        title: "다시 알림받기"
+      status_update_notice:
+        auto_open: "이 토픽은 %{timeLeft}후에 자동으로 열립니다."
+        auto_close: "이 토픽은 %{timeLeft}후에 자동으로 닫힙니다."
+        auto_publish_to_category: "이 토픽은 <a href=%{categoryUrl}>#%{categoryName}</a>에  %{timeLeft}시간이 지나면 발행됩니다."
+        auto_close_based_on_last_post: "이 주제는 마지막 답글이 달린 %{duration} 후 닫힙니다."
+        auto_delete: "이 토픽은 %{timeLeft}후에 자동으로 삭제됩니다."
+        auto_reminder: "%{timeLeft}후에 이 토픽을 다시 알려드리겠습니다."
       auto_close_title: '자동으로 닫기 설정'
+      auto_close_immediate:
+        other: "주제에 마지막 게시글이 올라온 지 %{hours} 시간이 지났기 때문에 이 주제는 곧 닫힐 예정입니다."
+      timeline:
+        back: "이전"
+        back_description: "마지막으로 안읽은 게시글로 돌아가기"
+        replies_short: "%{current} / %{total}"
       progress:
         title: 진행 중인 주제
         go_top: "맨위"
         go_bottom: "맨아래"
         go: "이동"
         jump_bottom: "최근 글로 이동"
+        jump_prompt: "넘어가기"
+        jump_prompt_of: "번째, 총 %{count} 개 포스트"
+        jump_prompt_long: "어느 게시글로 점프할까요?"
         jump_bottom_with_number: "jump to post %{post_number}"
         total: 총 글
         current: 현재 글
       notifications:
+        title: 이 토픽에 대한 알림 빈도 변경
         reasons:
+          mailing_list_mode: "메일링 리스트 모드가 활성화되었기 때문에, 이 토픽의 답글을 메일을 통하여 받게 됩니다."
+          '3_10': '이 토픽의 태그를 주시하고 있기 때문에 알림을 받게 됩니다.'
           '3_6': '이 카테고리를 보고 있어서 알림을 받게 됩니다.'
           '3_5': '자동으로 이 글을 보고있어서 알림을 받게 됩니다.'
           '3_2': '이 주제를 보고있어서 알림을 받게 됩니다.'
           '3_1': '이 주제를 생성하여서 알림을 받게 됩니다.'
           '3': '이 주제를 보고있어서 알림을 받게 됩니다.'
+          '2_8': '이 카테고리를 추적중이므로, 새로운 게시글의 수를 표시합니다.'
+          '2_4': '이 토픽에 게시글을 남겼기 때문에, 새로운 게시글의 수를 표시합니다.'
+          '2_2': '이 토픽을 추적중이므로, 새로운 게시글의 수를 표시합니다.'
+          '2': '<a href="/u/{{username}}/preferences">이 토픽을 읽었기 때문에,</a> 새로운 게시글의 수를 표시합니다.'
           '1_2': '누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다.'
           '1': '누군가 내 @아아디 으로 멘션했거나 내 글에 답글이 달릴 때 알림을 받게 됩니다.'
           '0_7': '이 주제에 관한 모든 알림을 무시하고 있습니다.'
@@ -1112,10 +1394,10 @@ ko:
           title: "주시 중"
           description: "이 주제에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다."
         tracking_pm:
-          title: "알림 : 새 글 표시 중"
+          title: "추적 중"
           description: "이 메시지의 읽지않은 응답의 수가 표시됩니다. 누군가 내 @아이디를 멘션했거나 내게 답글을 작성하면 알림을 받습니다."
         tracking:
-          title: "새 글 표시 중"
+          title: "추적 중"
           description: "이 주제의 새로운 답글의 수가 표시됩니다. 누군가 내 @아이디를 멘션했거나 내게 답글을 작성하면 알림을 받습니다."
         regular:
           title: "알림 : 일반"
@@ -1135,6 +1417,7 @@ ko:
         open: "주제 열기"
         close: "주제 닫기"
         multi_select: "글 선택"
+        timed_update: "토픽 타이머 설정..."
         pin: "주제 고정..."
         unpin: "주제 고정 취소..."
         unarchive: "주제 보관 취소"
@@ -1142,18 +1425,26 @@ ko:
         invisible: "목록에서 제외하기"
         visible: "목록에 넣기"
         reset_read: "값 재설정"
+        make_public: "공개 토픽으로 만들기"
+        make_private: "비공개 메시지 만들기"
       feature:
         pin: "주제 고정"
         unpin: "주제 고정 취소"
         pin_globally: "전체 공지글로 설정하기"
         make_banner: "배너 주제"
         remove_banner: "배너 주제 제거"
+      reply:
+        title: '답글쓰기'
+        help: '이 토픽 게시글 구성 시작하기'
       clear_pin:
         title: "고정 취소"
         help: "더 이상 목록의 맨 위에 표시하지 않도록 이 주제의 고정 상태를 해제합니다."
       share:
-        title: '공유'
-        help: '이 주제의 링크를 공유'
+        title: '공유하기'
+        help: '이 토픽의 링크를 공유하기'
+      print:
+        title: '프린트하기'
+        help: '이 토픽을 인쇄하기 좋은 버전으로 보기'
       flag_topic:
         title: '신고하기'
         help: '이 주제를 주의깊게 보거나 비밀리에 주의성 알림을 보내기 위해 신고합니다'
@@ -1183,14 +1474,17 @@ ko:
         no_banner_exists: "배너 주제가 없습니다."
         banner_exists: "현재 배너 주제가 <strong class='badge badge-notification unread'>있습니다</strong>."
       inviting: "초대 중..."
+      automatically_add_to_groups: "이 초청은 다음 그룹에 대한 접근권한도 포함합니다:"
       invite_private:
         title: '초대 메시지'
         email_or_username: "초대하려는 이메일 또는 아이디"
         email_or_username_placeholder: "이메일 또는 아이디"
         action: "초대"
         success: "사용자가 메세지에 참여할 수 있도록 초대했습니다."
+        success_group: "해당 사용자가 메세지에 참여할 수 있도록 초대했습니다."
         error: "죄송합니다. 해당 사용자를 초대하는 도중 오류가 발생했습니다."
         group_name: "그룹명"
+      controls: "토픽 컨트롤"
       invite_reply:
         title: '초대하기'
         username_placeholder: "아이디"
@@ -1224,6 +1518,10 @@ ko:
         error: "이 주제를 이동시키는데 문제가 발생하였습니다."
         instructions:
           other: " <b>{{count}}</b>개의 글을 옮길 주제를 선택해주세요."
+      merge_posts:
+        title: "선택한 게시글 합치기"
+        action: "선택한 게시글 합치기"
+        error: "선택한 게시글을 합치는 중 에러가 발생했습니다."
       change_owner:
         title: "글 소유자 변경"
         action: "작성자 바꾸기"
@@ -1234,9 +1532,11 @@ ko:
           other: "<b>{{old_user}}</b>(이)가 작성한 글의 새로운 작성자를 선택해주세요."
         instructions_warn: "이 글에 대한 알림이 새 사용자에게 자동으로 이전되지 않습니다.\n<br>경고: 글과 연관된 데이터가 새로운 사용자로 이전되지 않습니다. 주의해서 사용하세요."
       change_timestamp:
+        title: "타임스탬프 변경하기..."
         action: "타임스탬프 변경"
         invalid_timestamp: "타임스탬프는 미래값으로 할 수 없습니다."
         error: "주제의 시간을 변경하는 중 오류가 발생하였습니다."
+        instructions: "토픽의 새로운 타임스탬프를 선택해주세요. 토픽에 속한 게시글은 같은 시간 간격으로 조정됩니다."
       multi_select:
         select: '선택'
         selected: '({{count}})개가 선택됨'
@@ -1250,11 +1550,14 @@ ko:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
+      quote_reply: "인용하기"
       edit: "{{link}} {{replyAvatar}} {{username}} 편집"
       edit_reason: "Reason: "
       post_number: "{{number}}번째 글"
+      wiki_last_edited_on: "마지막으로 위키가 수정된 일시"
       last_edited_on: "마지막으로 편집:"
       reply_as_new_topic: "연결된 주제로 답글 작성하기"
+      reply_as_new_private_message: "같은 수신자에게 새로운 메시지로 답글쓰기"
       continue_discussion: "{{postLink}}에서 토론을 계속:"
       follow_quote: "인용 글로 이동"
       show_full: "전체 글 보기"
@@ -1278,7 +1581,10 @@ ko:
         create: "죄송합니다. 글을 만드는 동안 오류가 발생했습니다. 다시 시도하십시오."
         edit: "죄송합니다. 글을 수정하는 중에 오류가 발생했습니다. 다시 시도하십시오."
         upload: "죄송합니다. 파일을 업로드하는 동안 오류가 발생했습니다. 다시 시도하십시오."
+        file_too_large: "죄송합니다. 파일의 크기가 너무 큽니다. (최대 사이즈는 {{max_size_kb}}kb 입니다). 클라우드 공유 서버에 올리신 다음에 링크를 공유하는 건 어떠세요?"
         too_many_uploads: "한번에 한 파일만 업로드 하실 수 있습니다."
+        too_many_dragged_and_dropped_files: "죄송합니다. 한번에 파일 10개만 올릴 수 있습니다."
+        upload_not_authorized: "죄송합니다. 허가되지 않은 확장자의 파일이 있습니다. (허가된 확장자: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 이미지를 업로드 하실 수 없습니다."
         attachment_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 파일 첨부를 업로드 하실 수 없습니다."
         attachment_download_requires_login: "죄송합니다. 첨부 파일을 받으려면 로그인이 필요합니다."
@@ -1287,15 +1593,20 @@ ko:
         no_value: "아니오"
         yes_value: "예"
       via_email: "이 주제는 이메일을 통해 등록되었습니다."
+      via_auto_generated_email: "이 게시글은 자동 생성된 이메일로 작성되었습니다"
       whisper: "이 포스트는 운영자를 위한 비공개 귓말입니다."
+      wiki:
+        about: "이 게시글은 위키입니다"
       archetypes:
         save: '옵션 저장'
+      few_likes_left: "사랑을 나누어주셔서 감사합니다! 오늘 표시할 수 있는 좋아요가 얼마 남지 않았습니다."
       controls:
         reply: "이 글에 대한 답글을 작성합니다."
         like: "이 글을 좋아합니다."
         has_liked: "이 글을 좋아합니다."
         undo_like: "'좋아요' 취소"
         edit: "이 글 편집"
+        edit_action: "편집"
         edit_anonymous: "이 주제를 수정하려면 먼저 로그인을 해야합니다."
         flag: "이 주제에 관심을 가지기 위해 깃발을 표시해두고 개인적으로 알림을 받습니다"
         delete: "이 글을 삭제합니다."
@@ -1381,6 +1692,9 @@ ko:
       delete:
         confirm:
           other: "모든 글들을 삭제하시겠습니까?"
+      merge:
+        confirm:
+          other: "정말로 이 {{count}}개의 게시글을 합칠까요?"
       revisions:
         controls:
           first: "초판"
@@ -1389,14 +1703,31 @@ ko:
           last: "최신판"
           hide: "편집 기록 가리기"
           show: "편집 기록 보기"
+          revert: "이 수정본으로 되돌리기"
+          edit_wiki: "Wiki 편집"
+          edit_post: "포스트 편집"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
             title: "Show the rendered output with additions and removals inline"
+            button: 'HTML'
           side_by_side:
             title: "Show the rendered output diffs side-by-side"
+            button: 'HTML'
           side_by_side_markdown:
             title: "Raw source diff를 양쪽으로 보기"
+            button: 'Raw'
+      raw_email:
+        displays:
+          raw:
+            title: "raw 이메일 표시하기"
+            button: 'Raw'
+          text_part:
+            title: "이메일 텍스트 파트 보이기"
+            button: '텍스트'
+          html_part:
+            title: "이메일 HTML 파트 보이기"
+            button: 'HTML'
     category:
       can: '허용'
       none: '(카테고리 없음)'
@@ -1408,6 +1739,12 @@ ko:
       general: '일반'
       settings: '설정'
       topic_template: "주제 템플릿"
+      tags: "태그"
+      tags_allowed_tags: "이 태그를 사용할 수 있는 카테고리:"
+      tags_allowed_tag_groups: "이 태그 그룹을 사용할 수 있는 카테고리:"
+      tags_placeholder: "(선택사항) 허용된 태그 목록"
+      tag_groups_placeholder: "(선택사항) 허용된 태그 그룹 목록"
+      topic_featured_link_allowed: "이 카테고리에 주요 링크 허용"
       delete: '카테고리 삭제'
       create: '새 카테고리'
       create_long: '새 카테고리 만들기'
@@ -1433,12 +1770,21 @@ ko:
       change_in_category_topic: "설명 편집"
       already_used: '이 색은 다른 카테고리에서 사용되고 있습니다.'
       security: "보안"
+      special_warning: "경고: 이 카테고리는 사전 생성된 카테고리이기 때문에 보안 설정 변경이 불가합니다. 이 카테고리를 사용하고 싶지 않다면, 수정하지말고 삭제하세요."
       images: "이미지"
       email_in: "incoming 메일 주소 수정"
       email_in_allow_strangers: "계정이 없는 익명 유저들에게 이메일을 받습니다."
       email_in_disabled: "이메일로 새 주제 작성하기 기능이 비활성화되어 있습니다. 사이트 설정에서 '이메일로 새 주제 작성하기'를 활성화 해주세요."
       email_in_disabled_click: '"email in" 활성화'
       suppress_from_homepage: "홈페이지에서 이 카테고리를 감춥니다."
+      show_subcategory_list: "하위 카테고리 목록을 토픽위에 표시하기."
+      num_featured_topics: "이 카테고리 페이지에 표시되는 토픽의 수:"
+      subcategory_num_featured_topics: "부모 카테고리 페이지에 표시되는 주요 토픽의 수:"
+      all_topics_wiki: "새로운 토픽 생성시 위키로 기본설정"
+      subcategory_list_style: "하위 카테고리 목록 스타일:"
+      sort_order: "다음 기준으로 토픽 목록 정렬:"
+      default_view: "기본 토픽 목록:"
+      default_top_period: "기본 Top 기간:"
       allow_badges_label: "배지가 이 카테고리에서 주어질 수 있도록 허용"
       edit_permissions: "권한 수정"
       add_permission: "권한 추가"
@@ -1451,31 +1797,64 @@ ko:
       notifications:
         watching:
           title: "주시 중"
+          description: "이 카테고리의 모든 토픽을 주시하도록 자동 설정됩니다. 모든 토픽과 게시글에 대하여 알림을 받게 되며, 새로운 게시글의 수가 표시됩니다."
+        watching_first_post:
+          title: "첫번째 글 보기"
+          description: "이 카테고리에 새로운 토픽이 생길때마다 알림을 받습니다."
         tracking:
-          title: "새 글 표시 중"
+          title: "추적 중"
+          description: "이 카테고리의 모든 토픽을 추적하도록 자동 설정됩니다. 다른 사용자가 당신의 @이름 을 언급하거나 당신의 게시글에 답글을 달 때 알림을 받게 되며 새로운 게시글의 수가 표시됩니다."
         regular:
           title: "알림 : 일반"
           description: "누군가 내 @아아디 으로 멘션했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다."
         muted:
           title: "알림 꺼짐"
+          description: "이 카테고리 내의 새 토픽에 대해 어떠한 알림도 받지 않으며, 최신 토픽 항목에도 나타나지 않습니다."
+      sort_options:
+        default: "기본값"
+        likes: "좋아요 수"
+        op_likes: "원본 게시글 좋아요 수"
+        views: "조회수"
+        posts: "게시글 수"
+        activity: "활동"
+        posters: "게시자"
+        category: "카테고리"
+        created: "생성일자"
+      sort_ascending: '오름차순'
+      sort_descending: '내림차순'
+      subcategory_list_styles:
+        rows: "행수"
+        rows_with_featured_topics: "주요 토픽의 행 스타일"
+        boxes: "박스"
+        boxes_with_featured_topics: "주요 토픽의 박스 스타일"
     flagging:
       title: '우리 커뮤니티 질서를 지키는데 도와주셔서 감사합니다!'
       action: '글 신고했습니다'
       take_action: "조치하기"
       notify_action: '메시지 보내기'
+      official_warning: '공식 경고'
       delete_spammer: "네, 스패머 회원을 삭제합니다"
+      delete_confirm_MF: "지금 이 사용자의 {POSTS, plural, one {<b>1</b>개의 포스트} other {<b>#</b> 개의 포스트}} 와 {TOPICS, plural, one {<b>1</b>개의 토픽} other {<b>#</b>개의 토픽}} 을 삭제하고, 계정을 삭제한 다음 IP 주소<b>{ip_address}</b>에서의 가입 시도를 차단하며, 이메일 주소<b>{email}</b> 를 영구 정지 목록에 추가하려고 합니다. 이 사용자가 스패머인 것이 확실합니까?"
       yes_delete_spammer: "예, 스팸 회원을 삭제합니다"
       ip_address_missing: "(알 수 없음)"
       hidden_email_address: "(숨김)"
       submit_tooltip: "비밀 신고하기"
       take_action_tooltip: "커뮤니티의 신고 수가 채워지기 기다리지 않고, 바로 신고 수를 제재 수준까지 채웁니다."
       cant: "죄송합니다, 지금은 이 글을 신고할 수 없습니다"
+      notify_staff: '운영진에게 알리기'
       formatted_name:
         off_topic: "주제에 벗어났습니다"
         inappropriate: "부적절 컨텐츠입니다"
         spam: "스팸입니다"
       custom_placeholder_notify_user: "구체적이고, 건설적이며, 항상 친절하세요."
       custom_placeholder_notify_moderators: "구체적으로 회원님이 걱정하는 내용과 가능한 모든 관련된 링크를 제공해주세요."
+      custom_message:
+        at_least:
+          other: "최소 {{count}}자 이상 입력하세요"
+        more:
+          other: "{{count}} 남았습니다"
+        left:
+          other: "{{count}} 남았습니다"
     flagging_topic:
       title: "우리 커뮤니티 질서를 지키는데 도와주셔서 감사합니다!"
       action: "주제 신고하기"
@@ -1484,8 +1863,13 @@ ko:
       title: "주제 요약"
       participants_title: "빈번한 게시자"
       links_title: "인기 링크"
+      links_shown: "더 많은 링크보기..."
       clicks:
         other: "%{count}번 클릭"
+    post_links:
+      about: "이 게시글의 링크 더 보기"
+      title:
+        other: "%{count} more"
     topic_statuses:
       warning:
         help: "공식적인 주의입니다."
@@ -1495,11 +1879,14 @@ ko:
         help: "이 주제는 폐쇄되었습니다. 더 이상 새 답글을 받을 수 없습니다."
       archived:
         help: "이 주제는 보관중입니다. 고정되어 변경이 불가능합니다."
+      locked_and_archived:
+        help: "이 토픽은 폐쇄되어 보관중입니다. 새로운 답글을 달거나 수정할 수 없습니다."
       unpinned:
         title: "핀 제거"
         help: "이 주제는 핀 제거 되었습니다. 목록에서 일반적인 순서대로 표시됩니다."
       pinned_globally:
         title: "핀 지정됨 (전역적)"
+        help: "이 토픽은 전체 핀고정되었습니다. 최신 토픽과 이 토픽이 속한 카테고리 최상단에 표시됩니다."
       pinned:
         title: "핀 지정됨"
         help: "이 주제는 고정되었습니다. 카테고리의 상단에 표시됩니다."
@@ -1507,17 +1894,13 @@ ko:
         help: "이 주제는 목록에서 제외됩니다. 주제 목록에 표시되지 않으며 링크를 통해서만 접근 할 수 있습니다."
     posts: "글"
     posts_long: "이 주제의 글 수는 {{number}}개 입니다."
-    posts_likes_MF: |
-      This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
-      low {with a high like to post ratio}
-      med {with a very high like to post ratio}
-      high {with an extremely high like to post ratio}
-      other {}}
     original_post: "원본 글"
     views: "조회수"
     views_lowercase:
       other: "조회"
     replies: "답변"
+    views_long:
+      other: "이 토픽은 {{number}}번 조회되었습니다."
     activity: "활동"
     likes: "좋아요"
     likes_lowercase:
@@ -1530,6 +1913,7 @@ ko:
     history: "기록"
     changed_by: "{{author}}에 의해"
     raw_email:
+      title: "수신 이메일"
       not_available: "Raw 이메일이 가능하지 않습니다."
     categories_list: "카테고리 목록"
     filters:
@@ -1606,17 +1990,179 @@ ko:
       full: "생성 / 답글 / 보기"
       create_post: "답글 / 보기"
       readonly: "보기"
+    lightbox:
+      download: "다운로드"
     keyboard_shortcuts_help:
+      title: '키보드 단축키'
       jump_to:
         title: '이동'
+        home: '<b>g</b>, <b>h</b> 홈'
+        latest: '<b>g</b>, <b>l</b> 최신'
+        new: '<b>g</b>, <b>n</b> 새로운'
+        unread: '<b>g</b>, <b>u</b> 읽지 않은'
+        categories: '<b>g</b>, <b>c</b> 카테고리'
+        top: '<b>g</b>, <b>t</b> 인기글'
+        bookmarks: '<b>g</b>, <b>b</b> 북마크'
+        profile: '<b>g</b>, <b>p</b> 프로필'
+        messages: '<b>g</b>, <b>m</b> 메시지'
+      navigation:
+        title: '탐색'
+        jump: '<b>#</b> 글 번호로 이동'
+        back: '<b>u</b> 이전'
+        up_down: '<b>k</b>/<b>j</b> 선택된 글 이동 &uarr; &darr;'
+        open: '<b>o</b> or <b>Enter</b> 선택한 토픽 열기'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> 이전/다음 섹션'
+      application:
+        title: '어플리케이션'
+        create: '<b>c</b> 새 토픽을 만듭니다.'
+        notifications: '<b>n</b> 알림창 열기'
+        hamburger_menu: '<b>=</b> 햄버거 메뉴 열기'
+        user_profile_menu: '<b>p</b> 사용자 메뉴 열기'
+        show_incoming_updated_topics: '<b>.</b> 갱신된 토픽 보기'
+        search: '<b>/</b> 검색'
+        help: '<b>?</b> 키보드 도움말 열기'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> 새글을 읽은 상태로 표시하기'
+        dismiss_topics: '<b>x</b>, <b>t</b> 토픽 무시하기'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> 로그아웃'
+      actions:
+        title: '액션'
+        bookmark_topic: '<b>f</b> 북마크 토픽 켜고 끄기'
+        pin_unpin_topic: '<b>shift</b>+<b>p</b> 핀고정/핀해제'
+        share_topic: '<b>shift</b>+<b>s</b> 토픽 공유'
+        share_post: '<b>s</b> 게시글 공유'
+        reply_as_new_topic: '<b>t</b> 연결된 토픽으로 답글 작성하기'
+        reply_topic: '<b>shift</b>+<b>r</b> 토픽에 답글 달기'
+        reply_post: '<b>r</b> 글에 답글 달기'
+        quote_post: '<b>q</b> 게시글 인용'
+        like: '<b>l</b> 게시글에 좋아요 표시'
+        flag: '<b>!</b> 게시글에 플래그달기'
+        bookmark: '<b>b</b> 게시글 북마크'
+        edit: '<b>e</b> 게시글 편집'
+        delete: '<b>d</b> 게시글 삭제'
+        mark_muted: '<b>m</b>, <b>m</b> 토픽 알람 : 끄기'
+        mark_regular: '<b>m</b>, <b>r</b> 토픽 알람 : 일반(기본)으로 설정하기'
+        mark_tracking: '<b>m</b>, <b>t</b> 토픽 알람 : 추적하기'
+        mark_watching: '<b>m</b>, <b>w</b> 토픽 알람 : 주시하기'
+        print: '<b>ctrl</b>+<b>p</b> 토픽 인쇄하기'
     badges:
+      earned_n_times:
+        other: "이 배지를 %{count}번 받았습니다"
+      granted_on: "%{date} 에 수여함"
+      others_count: "(%{count})명의 사용자가 이 배지를 가지고 있습니다"
       title: 배지
+      allow_title: "이 배지는 타이틀로 사용할 수 있습니다"
+      multiple_grant: "이 배지는 중복해서 취득할 수 있습니다"
       badge_count:
         other: "%{count}개의 배지"
+      more_badges:
+        other: "+%{count}개 이상"
+      granted:
+        other: "%{count}개 수여됨"
+      select_badge_for_title: 타이틀로 사용할 배지 선택하기
+      none: "<none>"
+      badge_grouping:
+        getting_started:
+          name: 시작하기
+        community:
+          name: 커뮤니티
+        trust_level:
+          name: 신뢰 레벨
+        other:
+          name: 기타
+        posting:
+          name: 포스팅
+    google_search: |
+      <h3>Google로 검색하기</h3>
+      <p>
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <input type="text" id='user-query' value="">
+      <input type='hidden' id='google-query' name="q">
+      <button class="btn btn-primary">Google</button>
+      </form>
+      </p>
+    tagging:
+      all_tags: "모든 태그"
+      selector_all_tags: "모든 태그"
+      selector_no_tags: "태그 없음"
+      changed: "바뀐 태그:"
+      tags: "태그"
+      choose_for_topic: "이 토픽에 붙일 태그 선택"
+      delete_tag: "태그 삭제"
+      delete_confirm: "정말로 그 태그를 삭제할까요?"
+      rename_tag: "태그 이름변경"
+      rename_instructions: "새로운 태그의 이름을 입력하세요:"
+      sort_by: "정렬 기준:"
+      sort_by_count: "갯수"
+      sort_by_name: "이름"
+      manage_groups: "태그 그룹 관리"
+      manage_groups_description: "태그 정리를 위한 그룹 정의"
+      filters:
+        without_category: "%{filter} %{tag} 토픽"
+        with_category: "%{category}에서 %{filter}%{tag}태그가 달린 토픽"
+        untagged_without_category: "%{filter} 태깅안된 토픽"
+        untagged_with_category: "%{category}에서 %{filter}태그가 없는 토픽"
+      notifications:
+        watching:
+          title: "주시중"
+          description: "이 태그가 붙은 토픽들을 주시하도록 자동으로 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게되며 토픽 옆에 새로운 게시글의 수가 표시됩니다."
+        watching_first_post:
+          title: "첫 게시글 주시중"
+          description: "이 태그가 달린 신규 토픽에 대해서만 알림을 받게 됩니다."
+        tracking:
+          title: "추적중"
+          description: "이 태그가 달려 있는 모든 토픽을 추적합니다. 읽지 않은 글과 새로운 게시글 수가 나타납니다."
+        regular:
+          title: "일반"
+          description: "누군가 당신의 @아이디 로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다."
+        muted:
+          title: "알림끔"
+          description: "이 태그를 달고 새로 작성되는 토픽에 대한 알림을 받지 않습니다. '읽지 않은'탭에서도 보이지 않게 됩니다."
+      groups:
+        title: "태그 그룹"
+        about: "태그 관리를 쉽게하려면 그룹에 태그를 추가하세요."
+        new: "새 그룹"
+        tags_label: "이 그룹의 태그:"
+        parent_tag_label: "부모 태그:"
+        parent_tag_placeholder: "선택사항"
+        parent_tag_description: "이 그룹에 속한 태그는 부모 태그가 붙기 전에는 사용할 수 없습니다."
+        one_per_topic_label: "이 그룹의 태그는 토픽당 하나만 선택할 수 있도록 제한하기"
+        new_name: "새 태그 그룹"
+        save: "저장"
+        delete: "삭제"
+        confirm_delete: "정말로 이 태그 그룹을 삭제할까요?"
+      topics:
+        none:
+          unread: "읽지 않은 토픽이 없습니다."
+          new: "새로운 토픽이 없습니다."
+          read: "아직 어떠한 토픽도 읽지 않았습니다."
+          posted: "아직 게시글을 하나도 쓰지 않았습니다."
+          latest: "최신 토픽이 없습니다."
+          hot: "화제 토픽이 없습니다."
+          bookmarks: "북마크한 토픽이 없습니다."
+          top: "인기 토픽이 없습니다."
+          search: "검색 결과가 없습니다."
+        bottom:
+          latest: "더 이상 최신 토픽이 없습니다."
+          hot: "더 이상 화제 토픽이 없습니다."
+          posted: "더 이상 작성된 토픽이 없습니다."
+          read: "더 이상 읽은 토픽이 없습니다."
+          new: "더 이상 새로운 토픽이 없습니다."
+          unread: "더 이상 읽지 않은 토픽이 없습니다."
+          top: "더 이상 인기 토픽이 없습니다."
+          bookmarks: "더 이상 북마크한 토픽이 없습니다."
+          search: "더 이상 검색 결과가 없습니다."
+    invite:
+      custom_message: "초청장을 좀 더 친근하게 만들고 싶다면,"
+      custom_message_link: "사용자 설정 메시지를 써보세요"
+      custom_message_placeholder: "사용자 설정 메시지를 입력하세요"
+      custom_message_template_forum: "저기요, 이 포럼에 가입하셔야 해요!"
+      custom_message_template_topic: "이 토픽에 흥미 있을 거 같은데요!"
+    safe_mode:
+      enabled: "안전모드가 활성화 되었습니다. 안전모드를 종료하려면 이 웹브라우저창을 닫아야 합니다."
   admin_js:
     type_to_filter: "필터를 입력하세요"
     admin:
-      title: 'Discourse 운영'
+      title: 'Discourse 관리자'
       moderator: '운영자'
       dashboard:
         title: "대시보드"
@@ -1647,6 +2193,8 @@ ko:
         backups: "백업"
         traffic_short: "트래픽"
         traffic: "어플리케이션 웹 요청"
+        page_views: "페이지뷰"
+        page_views_short: "페이지뷰"
         show_traffic_report: "자세한 트래픽 리포트 보기"
         reports:
           today: "오늘"
@@ -1658,6 +2206,7 @@ ko:
           30_days_ago: "30일"
           all: "전체"
           view_table: "테이블"
+          view_graph: "그래프"
           refresh_report: "보고서 새로고침"
           start_date: "시작일"
           end_date: "종료일"
@@ -1697,8 +2246,8 @@ ko:
         clear_topic_flags_title: "주제 조사를 끝냈고 이슈를 해결했습니다. 신고를 지우기 위해 완료를 클릭하세요"
         more: "(더 많은 답글...)"
         dispositions:
-          agreed: "agreed"
-          disagreed: "disagreed"
+          agreed: "동의"
+          disagreed: "반대"
           deferred: "유예 중인"
         flagged_by: "신고 한 사람"
         resolved_by: "해결 by"
@@ -1740,17 +2289,21 @@ ko:
         add_members: "사용자 추가하기"
         custom: "Custom"
         bulk_complete: "회원들이 그룹에 추가되었습니다."
+        bulk_complete_users_not_added: "이 사용자는 추가되지 않았습니다(계정이 있는지 확인해보세요):"
         bulk: "그룹에 한꺼번에 추가하기"
         bulk_paste: "한 줄당 하나씩 아이디 또는 이메일 리스트를 붙여넣기 하세요."
         bulk_select: "(그룹을 선택하세요)"
         automatic: "자동화"
         automatic_membership_email_domains: "이 목록의 있는 항목과 사용자들이  등록한 이메일 도메인이 일치할때 이 그룹에 포함"
         automatic_membership_retroactive: "이미 등록된 사용자에게 같은 이메일 도메인 규칙 적용하기"
-        default_title: "Default title for all users in this group"
+        default_title: "이 그룹의 모든 사용자를 위한 기본 제목"
         primary_group: "Automatically set as primary group"
         group_owners: 소유자
         add_owners: 소유자 추가하기
+        incoming_email: "사용자 설정 수신 이메일 주소"
         incoming_email_placeholder: "이메일 주소를 입력하세요"
+        none_selected: "시작할 그룹을 선택하세요"
+        no_custom_groups: "사용자 설정 그룹 만들기"
       api:
         generate_master: "마스터 API 키 생성"
         none: "지금 활성화된 API 키가 없습니다."
@@ -1762,9 +2315,77 @@ ko:
         revoke: "폐지"
         confirm_regen: "API 키를 새로 발급 받으시겠습니까?"
         confirm_revoke: "API 키를 폐지하겠습니까?"
-        info_html: "당신의 API 키는 JSON콜을 이용하여 주제를 생성하거나 수정할 수 있습니다."
+        info_html: "당신의 API 키는 JSON호출을 이용하여 토픽을 생성하거나 수정할 수 있습니다."
         all_users: "전체 유저"
         note_html: "이 키의 <strong>보안에 특별히 주의</strong>하세요. 이 키를 아는 모든 사용자는 다른 사용자의 이름으로 글을 작성할 수 있습니다."
+      web_hooks:
+        title: "Webhook"
+        none: "현재 webhook이 없습니다."
+        instruction: "Webhook이 이 사이트에서 특정 이벤트가 발생할 경우 Discourse가 외부 서비스에 알림을 보내도록 허가하였습니다. webhook 트리거가 작동되면 POST request가 제공된 URL로 전송됩니다."
+        detailed_instruction: "선택된 이벤트 발생시 POST request가 제공된 URL로 전송됩니다."
+        new: "새 Webhook"
+        create: "생성하기"
+        save: "저장하기"
+        destroy: "삭제하기"
+        description: "설명"
+        controls: "컨트롤"
+        go_back: "목록으로 돌아가기"
+        payload_url: "Payload URL"
+        payload_url_placeholder: "https://example.com/postreceive"
+        warn_local_payload_url: "webhook을 로컬로 설정하려고 시도중입니다. 로컬 주소로 이벤트를 전송하는 것은 부작용 또는 비정상 작동을 유발할 수 있습니다. 계속할까요?"
+        secret_invalid: "Secret에는 공백이 들어갈 수 없습니다."
+        secret_too_short: "Secret은 최소 12자 이상이어야 합니다."
+        secret_placeholder: "시그니처를 생성하기 위한 문자열(선택사항)"
+        event_type_missing: "최소 한가지 이상의 Event type을 설정해야 합니다"
+        content_type: "Content Type"
+        secret: "Secret"
+        event_chooser: "이 webhook을 작동시키는 이벤트는 무엇인가요?"
+        wildcard_event: "모두 보내주세요."
+        individual_event: "각각의 이벤트를 선택하기"
+        verify_certificate: "payload URL의 TLS인증서를 체크하세요"
+        active: "활성화"
+        active_notice: "이벤트 발생 시 이벤트 상세정보를 보내드립니다."
+        categories_filter_instructions: "관련된 webhook은 이벤트가 특정 카테고리와 관계가 있을 때만 트리거를 작동시킵니다. 모든 카테고리에 이 webhook을 적용하고 싶을 때는 트리거에 공백을 추가하세요."
+        categories_filter: "트리거 설정된 카테고리"
+        groups_filter_instructions: "관련된 webhook은 이벤트가 특정 그룹과 관계가 있을 때만 트리거를 작동시킵니다. 모든 카테고리에 이 webhook을 적용하고 싶을 때는 트리거에 공백을 추가하세요."
+        groups_filter: "트리거 설정된 그룹"
+        delete_confirm: "이 webhook을 삭제할까요?"
+        topic_event:
+          name: "토픽 이벤트"
+          details: "토픽이 생성, 수정, 변경, 삭제될 때."
+        post_event:
+          name: "게시글 이벤트"
+          details: "게시글이 생성, 편집, 삭제, 재생될 때."
+        user_event:
+          name: "사용자 이벤트"
+          details: "사용자가 생성, 허가, 갱신될 때"
+        delivery_status:
+          title: "발송 상태"
+          inactive: "비활성화"
+          failed: "실패"
+          successful: "성공"
+        events:
+          none: "연관된 이벤트가 없습니다"
+          redeliver: "재발송"
+          incoming:
+            other: "{{count}}개의 새로운 이벤트가 있습니다."
+          completed_in:
+            other: "{{count}}초 후에 완료됩니다."
+          request: "요청"
+          response: "응답"
+          redeliver_confirm: "정말로 동일한 payload를 재발송하기를 원하십니까?"
+          headers: "헤더"
+          payload: "페이로드"
+          body: "바디"
+          go_list: "목록으로 가기"
+          go_details: "webhook 편집"
+          go_events: "이벤트로 가기"
+          ping: "Ping"
+          status: "상태 코드"
+          event_id: "ID"
+          timestamp: "생성일자"
+          completion: "완료 시간"
+          actions: "액션"
       plugins:
         title: "플러그인"
         installed: "설치된 플러그인"
@@ -1783,6 +2404,14 @@ ko:
           backups: "백업"
           logs: "로그"
         none: "가능한 백업이 없습니다."
+        read_only:
+          enable:
+            title: "읽기 전용 모드 활성화하기"
+            label: "읽기 전용 활성화하기"
+            confirm: "정말로 읽기 전용 모드를 활성화할까요?"
+          disable:
+            title: "읽기 전용 모드 비활성화 하기"
+            label: "읽기 전용 비활성화하기"
         logs:
           none: "아직 로그가 없어요."
         columns:
@@ -1808,6 +2437,8 @@ ko:
             without_uploads: "예 (파일을 포함하지 않음)"
           download:
             label: "다운로드"
+            title: "다운로드 링크를 붙여서 이메일 보내기"
+            alert: "이 백업의 다운로드 링크를 당신에게 이메일로 보냈습니다"
           destroy:
             title: "백업 삭제"
             confirm: "정말 이 백업을 삭제할까요?"
@@ -1839,15 +2470,21 @@ ko:
         title: "사용자 지정"
         long_title: "사이트 사용자 지정"
         preview: "미리 보기"
+        explain_preview: "이 테마 적용한 사이트 보기"
         save: "저장"
         new: "새 사용자 지정"
         new_style: "새로운 스타일"
         import: "가져오기"
         delete: "삭제"
+        delete_confirm: "이 테마를 삭제할까요?"
         about: "사이트 Customization은 사이트의 스타일시트와 해더를 수정할 수 있게 해줍니다. 새로운 것을 추가하거나 기존 것을 선택해서 편집하세요."
         color: "색"
         opacity: "투명도"
         copy: "복사"
+        copy_to_clipboard: "클립보드에 복사하기"
+        copied_to_clipboard: "클립보드로 복사됨"
+        copy_to_clipboard_error: "클립보드로 복사하는 중 에러가 발생하였습니다"
+        theme_owner: "편집불가, 소유자:"
         email_templates:
           title: "이메일 템플릿"
           subject: "제목"
@@ -1856,9 +2493,75 @@ ko:
           none_selected: "편집하려는 이메일 템플릿을 선택하세요."
           revert: "변경사항 취소"
           revert_confirm: "정말로 변경사항을 되돌리시겠습니까?"
+        theme:
+          import_theme: "테마 가져오기"
+          customize_desc: "커스터마이즈:"
+          title: "테마"
+          long_title: "사이트의 색상, CSS, HTML 수정하기"
+          edit: "편집"
+          edit_confirm: "이 테마는 원격테마입니다. 업데이트가 실행될 때 편집된 CSS/HTML 내용이 사라지게 됩니다."
+          common: "공통"
+          desktop: "데스크톱"
+          mobile: "모바일"
+          preview: "미리보기"
+          is_default: "기본값에 의해 테마가 활성화 되었습니다"
+          user_selectable: "사용자가 테마를 선택하게 하기"
+          color_scheme: "색상 Scheme"
+          color_scheme_select: "테마에서 사용될 컬러 선택"
+          custom_sections: "커스텀 섹션:"
+          theme_components: "테마 컴포넌트:"
+          uploads: "업로드할 파일"
+          no_uploads: "폰트나 이미지같은 테마와 관련된 파일만 업로드 가능합니다"
+          add_upload: "업로드할 파일 추가하기"
+          upload_file_tip: "업로드할 파일 선택하기(png, woff2, 기타..)"
+          variable_name: "SCSS 변수 이름:"
+          upload: "업로드"
+          child_themes_check: "다른 차일드 테마를  포함한 테마"
+          css_html: "커스텀 CSS/HTML"
+          edit_css_html: "CSS/HTML 편집하기"
+          edit_css_html_help: "변경된 CSS 나 HTML이 없습니다."
+          delete_upload_confirm: "이 업로드를 삭제할까요? (테마 CSS가 작동중지될 수 있습니다!)"
+          import_web_tip: "테마가 있는 Repository"
+          import_file_tip: "테마정보가 있는 .dcstyle.json 파일"
+          about_theme: "테마 정보"
+          license: "라이센스 정보"
+          component_of: "이 테마는 다음에 속한 컴포넌트입니다:"
+          update_to_latest: "최신버전으로 업데이트하기"
+          check_for_updates: "업데이트 체크하기"
+          updating: "업데이트 중..."
+          up_to_date: "테마가 최신입니다, 마지막으로 체크한 일시:"
+          add: "추가"
+          commits_behind:
+            other: "테마가 {{count}} 개 커밋 뒤쳐졌습니다!"
+          scss:
+            text: "CSS"
+            title: "커스텀 CSS를 입력하세요. 형식에 맞는 CSS 와 SCSS 스타일을 지원합니다."
+          header:
+            text: "Header"
+            title: "사이트 Header에 표시될 HTML을 입력하세요"
+          after_header:
+            text: "Header 다음"
+            title: "전체 페이지에서 Header다음에 표시될 HTML을 입력하세요"
+          footer:
+            text: "Footer"
+            title: "페이지 Footer에 표시될 HTML을 입력하세요"
+          embedded_scss:
+            text: "임베디드 CSS"
+            title: "임베디드 버전 코멘트를 보내기 위한 사용자 정의 CSS를 입력하세요"
+          head_tag:
+            text: "</head>"
+            title: "</head> 태그 전에 들어갈 HTML"
+          body_tag:
+            text: "</body>"
+            title: "</body> 태그 전에 들어갈 HTML"
         colors:
+          select_base:
+            title: "기본 컬러 scheme을 선택하세요"
+            description: "기본 scheme:"
           title: "색상"
+          edit: "컬러 Scheme 편집"
           long_title: "색상 Schemes"
+          about: "테마에서 사용되는 컬러 수정하기. 새로운 컬러 Scheme을 만듭니다."
           new_name: "새로운 색 조합"
           copy_name_prefix: "복사본"
           delete_confirm: "이 컬러 스키마를 제거합니까?"
@@ -1886,7 +2589,7 @@ ko:
             description: "사이트 헤더에 텍스트와 아이콘"
           highlight:
             name: '하이라이트'
-            description: '페이지 내에 강조된 글 및 주제 등의 배경색'
+            description: '포스트나 토픽과 같은 페이지 내에서 강조된 요소의 배경색'
           danger:
             name: '위험'
             description: '글 삭제 등에 사용되는 강조색'
@@ -1906,6 +2609,7 @@ ko:
         test_error: "테스트 메일을 전송하는데 문제가 있습니다. 메일 설정을 다시한번 체크해보고 메일 전송이 정상인지 다시 확인하고 시도해주세요."
         sent: "보냄"
         skipped: "생략됨"
+        bounced: "반송됨"
         received: "전송받음"
         rejected: "거부됨"
         sent_at: "보냄"
@@ -1919,10 +2623,14 @@ ko:
         delivery_method: "전달 방법"
         preview_digest_desc: "초대 사용자들에게 보낼 요약 메일 내용 미리보기"
         refresh: "새로고침"
+        send_digest_label: "이 결과를 여기로 전송합니다:"
+        send_digest: "보내기"
+        sending_email: "이메일을 보내고 있습니다..."
         format: "형식"
         html: "html"
         text: "문장"
         last_seen_user: "마지막으로 본 사용자"
+        no_result: "요약된 결과가 없습니다."
         reply_key: "답글 단축키"
         skipped_reason: "생략 이유"
         incoming_emails:
@@ -1933,9 +2641,12 @@ ko:
           error: "에러"
           none: "수신된 이메일이 없습니다."
           modal:
+            title: "수신 이메일 세부사항"
             error: "에러"
+            headers: "헤더"
             subject: "제목"
             body: "본문"
+            rejection_message: "거부 메일"
           filters:
             from_placeholder: "from@example.com"
             to_placeholder: "to@example.com"
@@ -1958,7 +2669,7 @@ ko:
         last_match_at: "마지막 방문"
         match_count: "방문"
         ip_address: "IP"
-        topic_id: "주제 ID"
+        topic_id: "토픽 ID"
         post_id: "글 ID"
         category_id: "카테고리 ID"
         delete: '삭제'
@@ -1968,6 +2679,8 @@ ko:
           block: "블락"
           do_nothing: "아무것도 하지 않음"
         staff_actions:
+          all: "전체"
+          filter: "필터:"
           title: "스태프 기록"
           clear_filters: "전체 보기"
           staff_user: "스태프 사용자"
@@ -1988,13 +2701,15 @@ ko:
             change_trust_level: "회원등급 변경"
             change_username: "아이디 변경"
             change_site_setting: "사이트 설정 변경"
+            change_theme: "테마 변경하기"
+            delete_theme: "테마 삭제하기"
             change_site_text: "site text 변경"
             suspend_user: "suspend user"
             unsuspend_user: "unsuspend user"
             grant_badge: "배지 부여"
             revoke_badge: "배지 회수"
             check_email: "이메일 확인"
-            delete_topic: "주제 삭제"
+            delete_topic: "토픽 삭제"
             delete_post: "글 삭제"
             impersonate: "대역"
             anonymize_user: "anonymize user"
@@ -2008,6 +2723,19 @@ ko:
             revoke_admin: "관리자권한 회수"
             grant_moderation: "운영자권한 부여"
             revoke_moderation: "운영자권한 회수"
+            backup_create: "백업 생성"
+            deleted_tag: "태그 삭제하기"
+            renamed_tag: "태그 변경하기"
+            revoke_email: "이메일 회수"
+            lock_trust_level: "회원등급 고정"
+            unlock_trust_level: "회원등급 고정 해제"
+            activate_user: "사용자 활성화"
+            deactivate_user: "사용자 비활성화"
+            change_readonly_mode: "읽기 전용 모드 변경하기"
+            backup_download: "백업 다운로드"
+            backup_destroy: "백업 삭제하기"
+            reviewed_post: "리뷰된 글"
+            custom_staff: "플러그인 커스텀 액션"
         screened_emails:
           title: "블락된 이메일들"
           description: "누군가가 새로운 계정을 만들면 아래 이메일 주소는 체크되고 등록은 블락됩니다, 또는 다른 조치가 취해집니다."
@@ -2098,6 +2826,7 @@ ko:
         suspend_reason: "Reason"
         suspended_by: "접근 금지자"
         delete_all_posts: "모든 글을 삭제합니다"
+        delete_all_posts_confirm_MF: " {POSTS, plural, one {1개의 포스트} other {#개의 포스트}} 와 {TOPICS, plural, one {1개의 토픽} other {#개의 토픽}}을 삭제하려고 합니다. 정말로 삭제할까요?"
         suspend: "접근 금지"
         unsuspend: "접근 허용"
         suspended: "접근 금지?"
@@ -2110,11 +2839,13 @@ ko:
         refresh_browsers_message: "모든 클라이언트에게 메시지 보내기"
         show_public_profile: "공개 프로필 보기"
         impersonate: '사용자로 로그인하기'
+        action_logs: "활동 로그"
         ip_lookup: "IP Lookup"
         log_out: "로그아웃"
         logged_out: "사용자가 모든 디바이스에서 로그아웃 되었습니다."
         revoke_admin: '관리자 권한 회수'
         grant_admin: '관리자 권한 부여'
+        grant_admin_confirm: "새로운 관리자를 인증하기 위해 메일을 보냈습니다. 메일을 열어서  메일에 적힌 지시에 따라 주세요."
         revoke_moderation: '운영자 권한 회수'
         grant_moderation: '운영자 권한 부여'
         unblock: '언블락'
@@ -2124,10 +2855,10 @@ ko:
         activity: 활동
         like_count: 준/받은 '좋아요'
         last_100_days: '지난 100일간'
-        private_topics_count: 비공개 주제 수
+        private_topics_count: 비공개 토픽
         posts_read_count: 글 읽은 수
         post_count: 글 수
-        topics_entered: 읽은 주제 수
+        topics_entered: 읽은 토픽 수
         flags_given_count: 작성한 신고
         flags_received_count: 받은 신고
         warnings_received_count: 받은 경고
@@ -2164,11 +2895,21 @@ ko:
         deactivate_failed: "사용자 비활성에 문제가 있습니다."
         unblock_failed: '사용자 언블락에 문제가 있습니다.'
         block_failed: '사용자 블락에 문제가 있습니다.'
-        block_confirm: '정말로 이 사용자를 차단하겠습니까? 차단된 사용자는 어떠한 주제나나 글도 작성할 수 없습니다.'
+        block_confirm: '정말로 이 사용자를 차단하겠습니까? 차단된 사용자는 토픽, 포스트 작성이 금지됩니다.'
         block_accept: '네, 이 사용자를 차단합니다.'
+        bounce_score: "반송 스코어"
+        reset_bounce_score:
+          label: "리셋"
+          title: "반송 스코어 0으로 리셋"
+        visit_profile: "<a href='%{url}'>사용자 환경설정 페이지</a>로 가서 프로필 수정하기"
         deactivate_explanation: "비활성화 사용자는 이메일 인증을 다시 받아야합니다."
         suspended_explanation: "접근 금지된 유저는 로그인 할 수 없습니다."
-        block_explanation: "차단된 사용자는 글을 작성하거나 주제를 작성할 수 없습니다."
+        block_explanation: "차단된 사용자는 글을 작성하거나 토픽을 작성할 수 없습니다."
+        staged_explanation: "격리조치된 회원은 특정 토픽에 한해서 이메일로만 글을 쓸 수 있습니다."
+        bounce_score_explanation:
+          none: "최근 해당 이메일로부터 반송메일을 받은 내역이 없습니다."
+          some: "최근 해당 이메일로부터 몇몇 반송메일을 받았습니다."
+          threshold_reached: "해당 이메일로부터 너무 많은 반송메일을 받았습니다."
         trust_level_change_failed: "회원등급 변경에 실패했습니다."
         suspend_modal_title: "거부된 사용자"
         trust_level_2_users: "2등급 회원들"
@@ -2179,13 +2920,15 @@ ko:
         unlock_trust_level: "회원등급 고정 해제"
         tl3_requirements:
           title: "3등급 회원이 되기 위한 자격"
+          table_title:
+            other: "최근 %{count} 일 간:"
           value_heading: "값"
           requirement_heading: "자격요건"
           visits: "방문횟수"
           days: "일"
-          topics_replied_to: "댓글 달은 주제 개수"
-          topics_viewed: "열어본 주제 개수"
-          topics_viewed_all_time: "열어본 주제 개수 (전체 기간)"
+          topics_replied_to: "댓글을 단 토픽 수"
+          topics_viewed: "열어본 토픽 수"
+          topics_viewed_all_time: "열어본 토픽 수 (전체 기간)"
           posts_read: "읽은 글 갯수"
           posts_read_all_time: "읽은 글 갯수 (전체 기간)"
           flagged_posts: "신고당한 글 갯수"
@@ -2234,6 +2977,10 @@ ko:
           title: "다른 사람이 프로필을 볼수 있게할까요?"
           enabled: "프로필에 표시"
           disabled: "프로필에 표시하지 않기"
+        show_on_user_card:
+          title: "사용자 카드에 표시할까요?"
+          enabled: "사용자 카드에 표시하기"
+          disabled: "사용자 카드에 표시하지 않기"
         field_types:
           text: '텍스트 필드'
           confirm: '확인'
@@ -2274,11 +3021,15 @@ ko:
           developer: '개발자'
           embedding: "Embedding"
           legal: "법률조항"
+          user_api: '사용자 API'
           uncategorized: '카테고리 없음'
           backups: "백업"
           login: "로그인"
           plugins: "플러그인"
           user_preferences: "회원 환경설정"
+          tags: "태그"
+          search: "검색"
+          groups: "그룹"
       badges:
         title: 배지
         new_badge: 새 배지
@@ -2287,13 +3038,14 @@ ko:
         badge: 배지
         display_name: 표시 이름
         description: 설명
+        long_description: 긴 설명
         badge_type: 배지 종류
         badge_grouping: 그룹
         badge_groupings:
           modal_title: 배지 그룹으로 나누기
         granted_by: 배지 부여자
         granted_at: 배지 수여일
-        reason_help: (주제 또는 댓글로 가는 링크)
+        reason_help: (토픽이나 포스트로 가는 링크)
         save: 저장
         delete: 삭제
         delete_confirm: 정말로 이 배지를 삭제할까요?
@@ -2326,6 +3078,7 @@ ko:
           post_revision: "회원이 새글을 쓰거나 글을 수정할 때"
           trust_level_change: "회원등급이 바뀔 때"
           user_change: "회원이 생성되거나 수정될 때"
+          post_processed: "이 게시글 처리 후 소요됨"
         preview:
           link_text: "수여된 배지 미리보기"
           plan_text: "쿼리 플랜 미리보기"
@@ -2354,9 +3107,11 @@ ko:
       embedding:
         get_started: "다른 웹사이트에 Discourse를 임베드하려면 호스트 추가부터 하세요"
         confirm_delete: "정말로 host를 삭제할까요?"
-        sample: "Discourse 주제를 웨사이트에 삽입(embed)하기 위해 다음 HTML코드를 이용하세요. <b>REPLACE_ME</b> 부분을 당신이 삽입하려는 웹사이트의 정식URL로 교체 하면 됩니다."
+        sample: "Discourse 토픽을 웹사이트에 삽입(embed)하기 위해 다음 HTML코드를 이용하세요. <b>REPLACE_ME</b> 부분을 당신이 삽입하려는 웹사이트의 정식URL로 교체 하면 됩니다."
         title: "삽입(Embedding)"
         host: "허용 Host"
+        class_name: "클래스 이름"
+        path_whitelist: "허가된 경로목록"
         edit: "편집"
         category: "카테고리에 게시"
         add_host: "Host 추가"
@@ -2365,20 +3120,23 @@ ko:
         feed_description: "당신 사이트의 RSS/ATOM 피드를 알려주시면 Discourse가 그 사이트 컨텐트를 더 잘 가져올 수 있습니다."
         crawling_settings: "크롤러 설정"
         crawling_description: "When Discourse creates topics for your posts, if no RSS/ATOM feed is present it will attempt to parse your content out of your HTML. Sometimes it can be challenging to extract your content, so we provide the ability to specify CSS rules to make extraction easier."
-        embed_by_username: "주제 생성 시 사용할 회원 이름"
+        embed_by_username: "토픽을 만들 때 사용할 아이디"
         embed_post_limit: "삽입(embed)할 글 최대갯수"
         embed_username_key_from_feed: "피드에서 discourse usename을 꺼내오기 위한 키(key)"
+        embed_title_scrubber: "게시글의 제목을 긁어오기 위해 정규표현식이 사용되었습니다"
         embed_truncate: "임베드된 글 뒷부분 잘라내기"
         embed_whitelist_selector: "CSS selector for elements that are allowed in embeds"
         embed_blacklist_selector: "CSS selector for elements that are removed from embeds"
+        embed_classname_whitelist: "허용된 CSS 클래스"
         feed_polling_enabled: "RSS/ATOM으로 글 가져오기"
         feed_polling_url: "긁어올 RSS/ATOM 피드 URL"
+        feed_polling_frequency_mins: "피드 폴링 빈도(분당)"
         save: "삽입(Embedding) 설정 저장하기"
       permalink:
         title: "고유링크"
         url: "URL"
-        topic_id: "주제 ID"
-        topic_title: "주제"
+        topic_id: "토픽 ID"
+        topic_title: "토픽"
         post_id: "글 ID"
         post_title: "글"
         category_id: "카테고리 ID"
@@ -2389,3 +3147,21 @@ ko:
           label: "새로운:"
           add: "추가"
           filter: "검색 (URL 혹은 외부 URL)"
+  wizard_js:
+    wizard:
+      done: "완료"
+      back: "이전"
+      next: "다음"
+      step: "%{total} 중 %{current}"
+      upload: "업로드"
+      uploading: "업로드 중..."
+      quit: "아마도 다음에"
+      staff_count:
+        other: "당신의 커뮤니티는 관리자가 %{count}명 있습니다."
+      invites:
+        add_user: "추가"
+        none_added: "관리자에게 초대되지 않았습니다. 계속하시겠습니까?"
+        roles:
+          admin: "관리자"
+          moderator: "운영자"
+          regular: "일반 유저"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 3765c61cb0a..33c5bbb677d 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -148,20 +148,21 @@ nb_NO:
       default_description: "Forvalg"
     s3:
       regions:
-        us_east_1: "USA øst (N. Virginia)"
-        us_west_1: "USA vest (N. California)"
-        us_west_2: "USA vest (Oregon)"
-        us_gov_west_1: "AWS GovCloud (USA)"
-        eu_west_1: "EU (Irland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia/Stillehavsregionen (Singapore)"
-        ap_southeast_2: "Asia/Stillehavsregionen (Sydney)"
-        ap_south_1: "Asia/Stillehavsregionen (Mumbai)"
         ap_northeast_1: "Asia/Stillehavsregionen (Tokyo)"
         ap_northeast_2: "Asia/Stillehavsregionen (Seoul)"
-        sa_east_1: "Asia/Stillehavsregionen (Sao Paulo)"
+        ap_south_1: "Asia/Stillehavsregionen (Mumbai)"
+        ap_southeast_1: "Asia/Stillehavsregionen (Singapore)"
+        ap_southeast_2: "Asia/Stillehavsregionen (Sydney)"
         cn_north_1: "Kina (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "Asia/Stillehavsregionen (Sao Paulo)"
+        us_east_1: "USA øst (N. Virginia)"
+        us_east_2: "USA øst (Ohio)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        us_west_1: "USA vest (N. California)"
+        us_west_2: "USA vest (Oregon)"
     edit: 'rediger tittelen og kategorien til dette emnet'
     not_implemented: "Beklager, denne funksjonen har ikke blitt implementert enda."
     no_value: "Nei"
@@ -218,7 +219,7 @@ nb_NO:
         all_time: "Gjennom tidene"
         last_7_days: "Siste 7 dager"
         last_30_days: "Siste 30 dager"
-      like_count: "Kjærtegn"
+      like_count: "Likes"
       topic_count: "Emner"
       post_count: "Innlegg"
       user_count: "Brukere"
@@ -351,11 +352,8 @@ nb_NO:
         full_name: 'Fullt navn'
         add_members: "Legg til medlemmer"
         delete_member_confirm: "Fjern '%{username}' fra gruppen '%{group}'?"
-      request_membership_pm:
-        title: "Ønske om medlemskap"
-        body: "Jeg vil be om å bli medlem av gruppen @%{groupName}."
       name_placeholder: "Gruppenavn, ingen mellomrom, samme regler som for brukernavn"
-      public: "Tillatt brukere å bli medlem av og forlate gruppen fritt (Krever at gruppen er synlig)"
+      public: "Tillat brukere å ta del/forlate gruppen fritt (Krever offentlig synlig gruppe)"
       empty:
         posts: "Det er ingen innlegg av medlemmer i denne gruppen."
         members: "Det er ingen medlemmer av denne gruppen."
@@ -377,7 +375,6 @@ nb_NO:
       bio: "Om gruppe"
       selector_placeholder: "Legg til medlemmer"
       owner: "eier"
-      visible: "Gruppen er synlig for alle brukere"
       index:
         title: "Grupper"
         empty: "Det er ingen synlige grupper"
@@ -391,6 +388,12 @@ nb_NO:
       mentions: "Omtalelser"
       messages: "Meldinger"
       notification_level: "Forvalgt merknadsnivå for gruppemeldinger"
+      visibility_levels:
+        title: "Hvem kan se denne gruppen?"
+        public: "Alle"
+        members: "Gruppeeiere, medlemmer og administratorer"
+        staff: "Gruppemedlemmer og personale"
+        owners: "Gruppeeiere og administratorer"
       alias_levels:
         title: "Hvem kan sende meldinger til og @nevne denne gruppen?"
         nobody: "Ingen"
@@ -427,8 +430,8 @@ nb_NO:
       flair_preview_image: "Forhåndsvis bilde"
       flair_note: "Merk: Bilde for gruppetilhørighet på avatar vil bare vises for brukerens primære gruppe."
     user_action_groups:
-      '1': "Kjærtegn tildelt"
-      '2': "Kjærtegn mottatt"
+      '1': "Likes tildelt"
+      '2': "Likes mottatt"
       '3': "Bokmerker"
       '4': "Emner"
       '5': "Svar"
@@ -488,7 +491,7 @@ nb_NO:
       mute: "Ignorer"
       edit: "Rediger innstillinger"
       download_archive:
-        button_text: "Last ned mine innlegg"
+        button_text: "Last ned alle"
         confirm: "Er du sikker på at du vil laste ned dine innlegg?"
         success: "Nedlasting iverksatt. Du vil bli varslet med en melding når prosessen er fullført."
         rate_limit_error: "Innlegg kan lastes ned en gang om dagen, prøv igjen i morgen."
@@ -558,6 +561,7 @@ nb_NO:
       watched_first_post_tags_instructions: "Du vil bli varslet om det første innlegget i hvert nye emne med disse stikkordene."
       muted_categories: "Ignorert"
       muted_categories_instructions: "Du vil ikke bli varslet om noe med tanke på nye emner i disse kategoriene, og de vil ikke vises i siste."
+      no_category_access: "Som moderator har du begrenset kategoritilgang, lagring er avskrudd."
       delete_account: "Slett kontoen min"
       delete_account_confirm: "Er du sikker på at du vil slette kontoen din permanent? Denne handlingen kan ikke angres!"
       deleted_yourself: "Slettingen av din konto har vært vellykket."
@@ -617,7 +621,6 @@ nb_NO:
         title: "Endre brukernavn"
         confirm: "Hvis du endrer brukernavnet ditt, vil alle gamle sitater av dine innlegg og @navn-nevninger feile. Er du helt sikker på at du vil bytte brukernavn?"
         taken: "Beklager, det brukernavnet er tatt."
-        error: "Det skjedde en feil ved endring av ditt brukernavn."
         invalid: "Det brukernavnet er ugyldig. Det kan bare inneholde nummer og bokstaver."
       change_email:
         title: "Endre e-postadresse"
@@ -753,6 +756,9 @@ nb_NO:
         expired: "Denne invitasjonen har utløpt"
         rescind: "Fjern"
         rescinded: "Invitasjon fjernet"
+        rescind_all: "Fjern alle invitasjoner"
+        rescinded_all: "Alle invitasjoner fjernet!"
+        rescind_all_confirm: "Er du sikker på at du vil fjerne alle invitasjoner?"
         reinvite: "Send invitasjon igjen"
         reinvite_all: "Send alle invitasjoner på nytt"
         reinvite_all_confirm: "Er du sikker på at du vil sende ut alle invitasjoner igjen?"
@@ -817,7 +823,7 @@ nb_NO:
         most_liked_by: "Mest likt av"
         most_liked_users: "Mest likt"
         most_replied_to_users: "Mest besvart"
-        no_likes: "Ingen kjærtegner dette enda."
+        no_likes: "Ingen likes her enda."
       associated_accounts: "Innloggingsforsøk"
       ip_address:
         title: "Siste IP-adresse"
@@ -860,7 +866,7 @@ nb_NO:
     logout: "Du ble logget ut"
     refresh: "Refresh"
     read_only_mode:
-      enabled: "Dette nettstedet er i lesemodus. Fortsett gjerne, men du kan ikke svare, gi kjærtegn eller utføre andre handlinger som er slått av."
+      enabled: "Dette nettstedet er i lesemodus. Fortsett gjerne, men du kan ikke svare, gi likes eller utføre andre handlinger som er slått av."
       login_disabled: "Innlogging er deaktivert mens nettsiden er i skrivebeskyttet modus."
       logout_disabled: "Du kan ikke logge ut når nettstedet er i lese-modus."
     too_few_topics_and_posts_notice: "La oss  <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få i gang diskusjonen.</a> Det finnes for øyeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> emner og <strong>%{currentPosts} / %{requiredPosts}</strong> innlegg. Nye brukere trenger noen samtaler å lese og svare på."
@@ -935,6 +941,9 @@ nb_NO:
       complete_email_found: "Vi fant en konto med e-postadressen <b>%{email}</b>. Du mottar om litt en e-post med instruksjoner for hvordan du nullstiller passordet."
       complete_username_not_found: "Ingen konto har med brukernavnet <b>%{username}</b> er registrert"
       complete_email_not_found: "Ingen konto med e-postadressen <b>%{email}</b> er registrert"
+      help: "Fikk du ikke e-posten? Sjekk søppelposten din først.<p>Er du ikke sikker på hvilken e-postadresse du brukte. Skriv inn adressen her og vi vil fortelle deg om den finnes her.</p><p>Hvis du ikke lenger har tilgang til e-postadressen på kontoen din, kontakt <a href='/about'>vår hjelpfulle stab.</a></p>"
+      button_ok: "OK"
+      button_help: "Hjelp"
     login:
       title: "Logg Inn"
       username: "Bruker"
@@ -994,8 +1003,8 @@ nb_NO:
       accept_invite: "Godta invitasjon"
       success: "Kontoen din har blitt opprettet og du er nå logget inn."
       name_label: "Navn"
-      name_label_optional: "Navn (valgfritt)"
-      password_label: "Sett passord (valgfritt)"
+      password_label: "Sett passord"
+      optional_description: "(valgfritt)"
     password_reset:
       continue: "Fortsett til %{site_name}"
     emoji_set:
@@ -1004,6 +1013,8 @@ nb_NO:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Klassisk Google"
+      facebook_messenger: "Facebook Meldingstjeneste"
     category_page_style:
       categories_only: "Kun kategorier"
       categories_with_featured_topics: "Kategorier med framhevede emner"
@@ -1012,12 +1023,24 @@ nb_NO:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Søk etter en emoji
+      people: Folk
+      nature: Natur
+      food: Mat
+      activity: Aktivitet
+      travel: Reise
+      objects: Objekter
+      celebration: Feiring
+      custom: Egendefinerte emoji-er
+      recent: Nylig brukte emoji-er
     composer:
       emoji: "Emoji :)"
       more_emoji: "mer…"
       options: "Alternativer"
       whisper: "hvisker"
       unlist: "skjult"
+      blockquote_text: "Sitatramme"
       add_warning: "Dette er en offisiell advarsel."
       toggle_whisper: "Veksle hvisking"
       toggle_unlisted: "Skjul eller gjør synlig"
@@ -1033,6 +1056,7 @@ nb_NO:
       cannot_see_mention:
         category: "Du nevnte {{username}}, men de vil ikke ikke bli varslet fordi de ikke hara tilgang til denne kategorien. Du må legge dem til en gruppe som har tilgang til denne kategorien."
         private: "Du nevnte {{username}}, men de vil ikke bli varslet fordi de ikke kan se denne samtalen. Du må invitere dem til samtalen."
+      duplicate_link: "Det ser ut til at <b>{{domain}}</b> allerede finnes som innlegg om emnet av <b>@{{username}}</b> i <a href='{{post_url}}'>et svar {{ago}}</a> – er du sikker på at du vil gjenta det?"
       error:
         title_missing: "Tittel er påkrevd"
         title_too_short: "Tittel må være på minst {{min}} tegn"
@@ -1122,6 +1146,7 @@ nb_NO:
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Ble tildelt '{{description}}'</p>"
+      topic_reminder: "<i title='emnepåminnelse' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nytt emne</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} melding i {{group_name}}-gruppens innboks</p>"
@@ -1213,6 +1238,7 @@ nb_NO:
           seen: Jeg har lest
           unseen: Jeg har ikke lest
           wiki: er wiki
+          all_tags: Inneholder alle stikkord
         statuses:
           label: Der emner
           open: er åpen
@@ -1334,7 +1360,7 @@ nb_NO:
         other: "Det er {{count}} nye innlegg i dette emnet siden sist du leste det"
       likes:
         one: "det er ett kjærtegn i dette emnet"
-        other: "det er {{count}} kjærtegn i dette emnet"
+        other: "det er {{count}} likes i dette emnet"
       back_to_list: "Tilbake til emnelisten"
       options: "Valg for emner"
       show_links: "vis lenker i dette emnet"
@@ -1542,6 +1568,7 @@ nb_NO:
         success_email: "Vi har sendt ut en invitasjon til <b>{{emailOrUsername}}</b>. Vi varsler deg når invitasjonen er godtatt. Sjekk invitiasjonsfanen på brukersiden din for å beholde oversikten over invitasjonene dine."
         success_username: "Vi har invitert brukeren til å delta i dette emnet."
         error: "Beklager, vi kunne ikke invitere den brukeren. De har muligens allerede blitt invitert?"
+        success_existing_email: "En bruker med e-posten <b>{{emailOrUsername}}</b> finnes allerede. Vi har invitert den brukeren til å ta del i emnet."
       login_reply: 'Logg Inn for å svare'
       filters:
         n_posts:
@@ -1622,7 +1649,7 @@ nb_NO:
         other: "{{count}} svar"
       has_likes:
         one: "{{count}} kjærtegn"
-        other: "{{count}} kjærtegn"
+        other: "{{count}} likes"
       has_likes_title:
         one: "{{count}} bruker likte dette innlegget"
         other: "{{count}} brukere likte dette innlegget"
@@ -1652,13 +1679,14 @@ nb_NO:
         about: "dette innlegget er en wiki"
       archetypes:
         save: 'Lagre alternativene'
-      few_likes_left: "Takk for at du sprer kjærlighet! Du vil nå grensen for antall ting du kan kjærtegne i dag ganske snart."
+      few_likes_left: "Takk for at du sprer kjærlighet! Du vil nå grensen for antall ting du kan like i dag ganske snart."
       controls:
         reply: "begynn å skrive et svar til dette innlegget"
         like: "lik dette innlegget"
         has_liked: "du liker dette innlegget"
         undo_like: "angre liker"
         edit: "rediger dette innlegget"
+        edit_action: "Rediger"
         edit_anonymous: "Beklager, du må være innlogget for å endre dette innlegget."
         flag: "rapporter dette innlegget privat eller send et privat varsel om det"
         delete: "slett dette innlegget"
@@ -1765,8 +1793,8 @@ nb_NO:
           other: "Er du sikker på at du vil slette alle de innleggene?"
       merge:
         confirm:
-          one: "Er du sikker på at du vil flette de innleggene?"
-          other: "Er du sikker på at du vil flette disse {{count}} innleggene?"
+          one: "Er du sikker på at du vil flette disse postene?"
+          other: "Er du sikker på at du vil flette disse {{count}} postene?"
       revisions:
         controls:
           first: "Første versjon"
@@ -1812,8 +1840,8 @@ nb_NO:
       settings: 'Innstillinger'
       topic_template: "Emnemal"
       tags: "Stikkord"
-      tags_allowed_tags: "Stikkord som bare kan brukes i denne kategorien:"
-      tags_allowed_tag_groups: "Stikkord som bare kan brukes i denne kategorien:"
+      tags_allowed_tags: "Bare tillat disse etikettene brukt i denne kategorien:"
+      tags_allowed_tag_groups: "Bare tillat etiketter fra disse gruppene brukt i denne kategorien:"
       tags_placeholder: "(Valgfritt) Liste over tillatte stikkord"
       tag_groups_placeholder: "(Valgfritt) Liste over tillatte stikkordgrupper"
       topic_featured_link_allowed: "Tillat fremhevede lenker i denne kategorien"
@@ -1884,8 +1912,8 @@ nb_NO:
           description: "Du vil aldri bli varslet om noe med tanke på nye emner i disse kategoriene, og de vil ikke vises i siste."
       sort_options:
         default: "forvalg"
-        likes: "Kjærtegn"
-        op_likes: "Kjærtegn gitt orginalinnlegget"
+        likes: "Likes"
+        op_likes: "Likes gitt orginalinnlegget"
         views: "Visninger"
         posts: "Innlegg"
         activity: "Aktivitet"
@@ -1987,11 +2015,11 @@ nb_NO:
       one: "dette emnet er vist 1 gang"
       other: "dette emnet er vist {{number}} ganger"
     activity: "Aktivitet"
-    likes: "Kjærtegn"
+    likes: "Likes"
     likes_lowercase:
       one: "kjærtegn"
-      other: "kjærtegn"
-    likes_long: "det er {{number}} kjærtegn i dette emnet"
+      other: "likes"
+    likes_long: "det er {{number}} likes i dette emnet"
     users: "Deltakere"
     users_lowercase:
       one: "bruker"
@@ -2636,7 +2664,7 @@ nb_NO:
           up_to_date: "Drakten er oppdatert, sist sjekket:"
           add: "Legg til"
           commits_behind:
-            one: "Drakten én utgave foreldet!"
+            one: "Drakten er én utgave foreldet!"
             other: "Drakten er {{count}} utgaver foreldet!"
           scss:
             text: "CSS"
@@ -2784,6 +2812,8 @@ nb_NO:
           block: "blokker"
           do_nothing: "ikke gjør noe"
         staff_actions:
+          all: "alle"
+          filter: "Filtrer:"
           title: "Personalhandlinger"
           clear_filters: "Vis alt"
           staff_user: "Personale"
@@ -2837,6 +2867,8 @@ nb_NO:
             change_readonly_mode: "endre skrivebeskyttelse"
             backup_download: "last ned sikkerhetskopi"
             backup_destroy: "ødelegg sikkerhetskopi"
+            reviewed_post: "gjennomsett innlegg"
+            custom_staff: "egendefinert handling for programtillegg"
         screened_emails:
           title: "Kontrollerte e-poster"
           description: "Når noen forsøker å lage en ny konto, vil de følgende e-postadressene bli sjekket, og registreringen vil bli blokkert, eller en annen handling vil bli utført."
@@ -2958,7 +2990,7 @@ nb_NO:
         reputation: Rykte
         permissions: Tillatelser
         activity: Aktivitet
-        like_count: Kjærtegn tildelt / mottatt
+        like_count: Likes tildelt / mottatt
         last_100_days: 'de siste 100 dagene'
         private_topics_count: Private emner
         posts_read_count: Innlegg lest
@@ -3042,10 +3074,10 @@ nb_NO:
           posts_read_all_time: "Innlegg lest (totalt)"
           flagged_posts: "Rapporterte innlegg"
           flagged_by_users: "Brukere som rapporterte"
-          likes_given: "Kjærtegn tildelt"
-          likes_received: "Kjærtegn mottatt"
-          likes_received_days: "Kjærtegn mottatt: Unike dager"
-          likes_received_users: "Kjærtegn mottatt: Unike brukere"
+          likes_given: "Likes tildelt"
+          likes_received: "Likes mottatt"
+          likes_received_days: "Likes mottatt: Unike dager"
+          likes_received_users: "Likes mottatt: Unike brukere"
           qualifies: "Kvalifiserer til tillitsnivå 3."
           does_not_qualify: "Kvalifiserer ikke til tillitsnivå 3."
           will_be_promoted: "Vil snart forfremmes."
@@ -3240,6 +3272,7 @@ nb_NO:
         embed_classname_whitelist: "Tillatte navn for CSS-klasser"
         feed_polling_enabled: "Importer innlegg via RSS/ATOM"
         feed_polling_url: "Nettadresse for RSS/ATOM-informasjonskanal å gjennomgangssøke"
+        feed_polling_frequency_mins: "Frekvens for strømspørring (i minutter)"
         save: "Lagre innbyggingsinnstillinger"
       permalink:
         title: "Permalenker"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 8b4ea106a6c..46818b08931 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -148,22 +148,23 @@ nl:
       default_description: "Standaard"
     s3:
       regions:
-        us_east_1: "VS Oost (N. Virginia)"
-        us_west_1: "VS West (N. Californië)"
-        us_west_2: "VS West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (VS)"
-        eu_west_1: "EU (Ierland)"
-        eu_west_2: "EU (Londen)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Azië Pacifisch (Singapore)"
-        ap_southeast_2: "Azië Pacifisch (Sydney)"
-        ap_south_1: "Azië Pacifisch (Bombay)"
         ap_northeast_1: "Azië Pacifisch (Tokio)"
         ap_northeast_2: "Azië Pacifisch (Seoel)"
-        sa_east_1: "Zuid-Amerika (Sao Paulo)"
+        ap_south_1: "Azië Pacifisch (Bombay)"
+        ap_southeast_1: "Azië Pacifisch (Singapore)"
+        ap_southeast_2: "Azië Pacifisch (Sydney)"
         cn_north_1: "China (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ierland)"
+        eu_west_2: "EU (Londen)"
+        sa_east_1: "Zuid-Amerika (Sao Paulo)"
+        us_east_1: "VS Oost (N. Virginia)"
+        us_east_2: "VS Oost (Ohio)"
+        us_gov_west_1: "AWS GovCloud (VS)"
+        us_west_1: "VS West (N. Californië)"
+        us_west_2: "VS West (Oregon)"
     edit: 'de titel en categorie van dit topic bewerken'
-    not_implemented: "Die functie is nog niet geïmplementeerd, sorry!"
+    not_implemented: "Deze functie is helaas nog niet beschikbaar, sorry!"
     no_value: "Nee"
     yes_value: "Ja"
     generic_error: "Sorry, er is iets fout gegaan."
@@ -351,11 +352,8 @@ nl:
         full_name: 'Volledige naam'
         add_members: "Leden toevoegen"
         delete_member_confirm: "'%{username}' uit de groep '%{group}' verwijderen?"
-      request_membership_pm:
-        title: "Lidmaatschapsverzoek"
-        body: "Ik zou graag lid willen worden van @%{groupName}."
       name_placeholder: "Groepsnaam, geen spaties, hetzelfde als gebruikersnaamregel"
-      public: "Gebruikers toestaan om vrij aan de groep deel te nemen of deze te verlaten (Groep moet hiervoor zichtbaar zijn)"
+      public: "Gebruikers toestaan om bij groepen aan te melden of deze te verlaten (Groep moet hiervoor publiekelijk zichtbaar zijn)"
       empty:
         posts: "Er zijn geen berichten van leden van deze groep."
         members: "Er zijn geen leden in deze groep."
@@ -377,7 +375,6 @@ nl:
       bio: "Over groep"
       selector_placeholder: "Leden toevoegen"
       owner: "eigenaar"
-      visible: "Groep is zichtbaar voor alle gebruikers"
       index:
         title: "Groepen"
         empty: "Er zijn geen zichtbare groepen."
@@ -391,6 +388,12 @@ nl:
       mentions: "Vermeldingen"
       messages: "Berichten"
       notification_level: "Standaard meldingsniveau voor groepsberichten"
+      visibility_levels:
+        title: "Voor wie is deze groep zichtbaar?"
+        public: "Iedereen"
+        members: "Groepseigenaars, -beheerders en -leden"
+        staff: "Groepseigenaars en -personeel"
+        owners: "Groepeigenaars en -beheerders"
       alias_levels:
         title: "Wie kan deze groep een bericht sturen en taggen?"
         nobody: "Niemand"
@@ -488,7 +491,7 @@ nl:
       mute: "Negeren"
       edit: "Voorkeuren bewerken"
       download_archive:
-        button_text: "Mijn berichten downloaden"
+        button_text: "Alles downloaden"
         confirm: "Weet u zeker dat u uw berichten wilt downloaden?"
         success: "Downloaden is gestart; u ontvangt een melding zodra het proces is voltooid."
         rate_limit_error: "Berichten kunnen maar één keer per dag worden gedownload; probeer het morgen opnieuw."
@@ -558,6 +561,7 @@ nl:
       watched_first_post_tags_instructions: "U ontvangt een melding bij het eerste bericht in elk nieuw topic met deze tags."
       muted_categories: "Genegeerd"
       muted_categories_instructions: "U ontvangt geen melding over nieuwe topics en berichten in deze categorieën, en ze verschijnen niet in Nieuwste."
+      no_category_access: "Als een beheerder heeft u beperkte toegang tot categorieën, opslaan is uitgeschakeld."
       delete_account: "Mijn account verwijderen"
       delete_account_confirm: "Weet u zeker dat u uw account definitief wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt!"
       deleted_yourself: "Uw account is met succes verwijderd."
@@ -617,7 +621,6 @@ nl:
         title: "Gebruikersnaam wijzigen"
         confirm: "Als u uw gebruikersnaam wijzigt, kloppen alle eerdere citaten van uw berichten en vermeldingen van uw @naam niet meer. Weet u dit echt zeker?"
         taken: "Sorry, maar die gebruikersnaam is al in gebruik."
-        error: "Er is een fout opgetreden bij het wijzigen van uw gebruikersnaam."
         invalid: "Die gebruikersnaam is ongeldig. Hij mag alleen cijfers en letters bevatten."
       change_email:
         title: "E-mailadres wijzigen"
@@ -753,6 +756,9 @@ nl:
         expired: "Deze uitnodiging is verlopen."
         rescind: "Verwijderen"
         rescinded: "Uitnodiging verwijderd"
+        rescind_all: "Verwijder alle uitnodigingen"
+        rescinded_all: "Alle uitnodigingen verwijderd!"
+        rescind_all_confirm: "Weet u zeker dat u alle uitnodigingen wilt verwijderen?"
         reinvite: "Uitnodiging opnieuw versturen"
         reinvite_all: "Alle uitnodigingen opnieuw versturen"
         reinvite_all_confirm: "Weet u zeker dat u alle uitnodigingen opnieuw wilt versturen?"
@@ -935,6 +941,8 @@ nl:
       complete_email_found: "We hebben een account gevonden met het e-mailadres <b>%{email}<b/>. U zou spoedig een e-mail moeten ontvangen met instructies om uw wachtwoord opnieuw in te stellen."
       complete_username_not_found: "Geen account met de gebruikersnaam <b>%{username}</b> gevonden"
       complete_email_not_found: "Geen account met het e-mailadres <b>%{email}</b> gevonden"
+      button_ok: "OK"
+      button_help: "Help"
     login:
       title: "Aanmelden"
       username: "Gebruiker"
@@ -993,7 +1001,9 @@ nl:
       your_email: "Het e-mailadres van uw account is <b>%{email}</b>."
       accept_invite: "Uitnodiging accepteren"
       success: "Uw account is gemaakt en u bent nu aangemeld."
-      password_label: "Wachtwoord instellen (optioneel)"
+      name_label: "Naam"
+      password_label: "Wachtwoord instellen"
+      optional_description: "(optioneel)"
     password_reset:
       continue: "Doorgaan naar %{site_name}"
     emoji_set:
@@ -1002,6 +1012,8 @@ nl:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Klassiek"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Alleen categorieën"
       categories_with_featured_topics: "Categorieën met aanbevolen topics"
@@ -1016,6 +1028,7 @@ nl:
       options: "Opties"
       whisper: "fluisteren"
       unlist: "onzichtbaar"
+      blockquote_text: "Citaat"
       add_warning: "Dit is een officiële waarschuwing."
       toggle_whisper: "Fluistermodus in-/uitschakelen"
       toggle_unlisted: "Onzichtbaar in-/uitschakelen"
@@ -1213,6 +1226,7 @@ nl:
           seen: die ik heb gelezen
           unseen: die ik niet heb gelezen
           wiki: die een wiki zijn
+          all_tags: Bevat alle tags
         statuses:
           label: Waarin topics
           open: open zijn
@@ -1542,6 +1556,7 @@ nl:
         success_email: "Er is een uitnodiging naar <b>{{emailOrUsername}}</b> gemaild. We stellen u op de hoogte als op de uitnodiging is ingegaan. Controleer het uitnodigingentabblad op uw gebruikerspagina om uw uitnodigingen bij te houden."
         success_username: "We hebben die gebruiker uitgenodigd om aan dit topic deel te nemen."
         error: "Sorry, we konden deze persoon niet uitnodigen. Misschien is deze al uitgenodigd? (Uitnodigingen zijn in aantal beperkt)"
+        success_existing_email: "Een gebruiker met de e-mail <b>{{emailOrUsername}}</b> bestaat al. We hebben deze gebruiker uitgenodigd om aan dit topic deel te nemen."
       login_reply: 'Meld u aan om te antwoorden'
       filters:
         n_posts:
@@ -1659,6 +1674,7 @@ nl:
         has_liked: "u hebt dit bericht geliket"
         undo_like: "like ongedaan maken"
         edit: "dit bericht bewerken"
+        edit_action: "Bewerken"
         edit_anonymous: "Sorry, maar u dient aangemeld te zijn om dit bericht te bewerken."
         flag: "een privémarkering aan dit topic geven of er een privébericht over sturen"
         delete: "dit bericht verwijderen"
@@ -1763,10 +1779,6 @@ nl:
         confirm:
           one: "Weet u zeker dat u dat bericht wilt verwijderen?"
           other: "Weet u zeker dat u al die berichten wilt verwijderen?"
-      merge:
-        confirm:
-          one: "Weet u zeker dat u die berichten wilt samenvoegen?"
-          other: "Weet u zeker dat u die {{count}} berichten wilt samenvoegen?"
       revisions:
         controls:
           first: "Eerste revisie"
@@ -1812,8 +1824,7 @@ nl:
       settings: 'Instellingen'
       topic_template: "Topic-sjabloon"
       tags: "Tags"
-      tags_allowed_tags: "Tags die alleen in deze categorie kunnen worden gebruikt:"
-      tags_allowed_tag_groups: "Tag-groepen die alleen in deze categorie kunnen worden gebruikt:"
+      tags_allowed_tags: "Tags die in deze categorie kunnen worden gebruikt:"
       tags_placeholder: "(Optioneel) lijst van toegestane tags"
       tag_groups_placeholder: "(Optioneel) lijst van toegestane tag-groepen"
       topic_featured_link_allowed: "Aanbevolen koppelingen in deze categorie toestaan"
@@ -2635,9 +2646,6 @@ nl:
           updating: "Bijwerken..."
           up_to_date: "Thema is up-to-date, laatst gecontroleerd:"
           add: "Toevoegen"
-          commits_behind:
-            one: "Thema loopt 1 doorvoering achter!"
-            other: "Thema loopt {{count}} doorvoeringen achter!"
           scss:
             text: "CSS"
             title: "Voer aangepaste CSS in; we accepteren alle geldige CSS- en SCSS-stijlen"
@@ -2784,6 +2792,8 @@ nl:
           block: "blokkeren"
           do_nothing: "niets doen"
         staff_actions:
+          all: "alle"
+          filter: "Filter:"
           title: "Stafacties"
           clear_filters: "Alles tonen"
           staff_user: "Staflid"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index b04479c681c..6ee9b7ad567 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -184,20 +184,20 @@ pl_PL:
       default_description: "Domyślny"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Irlandia)"
-        eu_west_2: "EU (Londyn)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "Ameryka Południowa (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "Chiny (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlandia)"
+        eu_west_2: "EU (Londyn)"
+        sa_east_1: "Ameryka Południowa (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'edytuj tytuł i kategorię tego tematu'
     not_implemented: "Bardzo nam przykro, ale ta funkcja nie została jeszcze zaimplementowana."
     no_value: "Nie"
@@ -403,11 +403,7 @@ pl_PL:
         full_name: 'Pełna nazwa'
         add_members: "Dodaj użytkowników"
         delete_member_confirm: "Czy usunąć użytkownika '%{username}' z grupy '%{group}'?"
-      request_membership_pm:
-        title: "Prośba o członkostwo"
-        body: "Chciałbym(-am) poprosić o członkostwo w grupie @%{groupName}."
       name_placeholder: "Nazwa grupy, bez spacji, takie same zasady jak przy nazwie użytkownika"
-      public: "Zezwalaj użytkownikom na zapraszanie/opuszczanie grupy (Grupa musi być widoczna)"
       empty:
         posts: "Członkowie tej grupy nie opublikowali żadnych postów."
         members: "Nie ma użytkowników w tej grupie"
@@ -429,7 +425,6 @@ pl_PL:
       bio: "O grupie"
       selector_placeholder: "Dodaj członków"
       owner: "właściciel"
-      visible: "Grupa jest widoczna dla wszystkich użytkowników"
       index:
         title: "Grupy"
         empty: "Nie ma widocznych grup"
@@ -445,6 +440,12 @@ pl_PL:
       mentions: "Wzmianki"
       messages: "Wiadomości"
       notification_level: "Domyślny poziom powiadomień dla wiadomości grupy."
+      visibility_levels:
+        title: "Kto może widzieć grupę?"
+        public: "Wszyscy"
+        members: "Właściciele grupy, członkowie i administratorzy"
+        staff: "Właściciele grupy i zespół"
+        owners: "Właściciele grupy i administratorzy"
       alias_levels:
         title: "Kto może wysyłać wiadomości i używać @aliasu tej grupy?"
         nobody: "Nikt"
@@ -546,7 +547,7 @@ pl_PL:
       mute: "Wycisz"
       edit: "Edytuj ustawienia"
       download_archive:
-        button_text: "Pobierz moje wpisy"
+        button_text: "Pobierz Wszystko"
         confirm: "Czy na pewno chcesz pobrać swoje wszystkie wpisy?"
         success: "Rozpoczęto eksport: otrzymasz wiadomość, gdy proces zostanie zakończony."
         rate_limit_error: "Wpisy mogą być pobierane raz dziennie, spróbuj ponownie jutro."
@@ -576,6 +577,7 @@ pl_PL:
       first_notification: "Twoje pierwsze powiadomienie! Kliknij aby zacząć."
       disable_jump_reply: "Po odpowiedzi nie przechodź do nowego wpisu"
       dynamic_favicon: "Pokazuj licznik powiadomień na karcie jako dynamiczny favicon"
+      theme_default_on_all_devices: "Ustaw ten motyw jako domyślny na wszystkich moich urządzeniach"
       external_links_in_new_tab: "Otwieraj wszystkie zewnętrzne odnośniki w nowej karcie"
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
       change: "zmień"
@@ -614,6 +616,7 @@ pl_PL:
       watched_first_post_tags_instructions: "Zostaniesz powiadomiony tylko o pierwszym wpisie w każdym nowym temacie oznaczonym tymi tagami."
       muted_categories: "Wyciszone"
       muted_categories_instructions: "Nie będziesz powiadamiany o nowych tematach w tych kategoriach. Nie pojawią się na liście nieprzeczytanych."
+      no_category_access: "Jako moderator masz limitowany dostęp do kategorii, możliwość zapisu jest wyłączona."
       delete_account: "Usuń moje konto"
       delete_account_confirm: "Czy na pewno chcesz usunąć swoje konto? To nieodwracalne!"
       deleted_yourself: "Twoje konto zostało usunięte."
@@ -673,7 +676,6 @@ pl_PL:
         title: "Zmień nazwę użytkownika"
         confirm: "Jeżeli zmienisz swoją nazwę użytkownika, wszystkie wcześniejsze cytaty twoich wpisów oraz wzmianki przez @nazwa przestaną działać. Czy jesteś absolutnie pewny że tego chcesz?"
         taken: "Przykro nam, ale ta nazwa jest zajęta."
-        error: "Podczas zmiany twojej nazwy użytkownika wystąpił błąd."
         invalid: "Ta nazwa jest niepoprawna. Powinna zawierać jedynie liczby i litery."
       change_email:
         title: "Zmień adres email"
@@ -813,8 +815,12 @@ pl_PL:
         expired: "To zaproszenie wygasło."
         rescind: "Usuń"
         rescinded: "Zaproszenie usunięte"
+        rescind_all: "Usuń wszystkie Zaproszenia"
+        rescinded_all: "Wszystkie Zaproszenia usunięte!"
+        rescind_all_confirm: "Jesteś pewny, że chcesz usunąć wszystkie zaproszenia?"
         reinvite: "Ponów zaproszenie"
         reinvite_all: "Wyślij ponownie wszystkie zaproszenia"
+        reinvite_all_confirm: "Jesteś pewny, że chcesz ponownie wysłać wszystkie zaproszenia?"
         reinvited: "Ponowne wysłanie zaproszenia"
         reinvited_all: "Wszystkie zaproszenia zostały ponownie wysłane!"
         time_read: "Czas odczytu"
@@ -1011,6 +1017,9 @@ pl_PL:
       complete_email_found: "Znaleziono konto przypisane do adresu <b>%{email}</b>,  wkrótce otrzymasz email z instrukcjami opisującymi reset hasła."
       complete_username_not_found: "Nie znaleziono konta o nazwie <b>%{username}</b>"
       complete_email_not_found: "Nie znaleziono konta przypisanego do <b>%{email}</b>"
+      help: "Email nie dotarł? Upewnij się najpierw czy sprawdziłeś folder spam.<p>Nie jesteś pewny jaki email został użyty? Wprowadz adres tutaj, a dowiemy się czy taki istnieje.</p><p>Jeśli nie masz już dostępu do adresu email zapisanego na twoim koncie, skontaktuj się z <a href='/about'>naszym pomocnym zespołem.</a></p>"
+      button_ok: "OK"
+      button_help: "Pomoc"
     login:
       title: "Logowanie"
       username: "Użytkownik"
@@ -1068,7 +1077,7 @@ pl_PL:
       your_email: "Adres e-mail przypisany do twojego konta to <b>%{email}</b>."
       accept_invite: "Akceptuj zaproszenie"
       success: "Twje konto zostało utworzone i zostałeś zalogowany."
-      password_label: "Ustaw hasło (opcjonalne)"
+      name_label: "Nazwa"
     password_reset:
       continue: "Przejdź do %{site_name}"
     emoji_set:
@@ -1330,6 +1339,7 @@ pl_PL:
         actions: "Operacje grupowe"
         close_topics: "Zamknij wpisy"
         archive_topics: "Zarchiwizuj tematy"
+        notification_level: "Powiadomienia"
         choose_new_category: "Wybierz nową kategorię dla tematów:"
         selected:
           one: "Zaznaczono <b>1</b> temat."
@@ -1448,7 +1458,12 @@ pl_PL:
         publish_to: "Opublikuj do:"
         when: "Kiedy:"
       auto_update_input:
+        later_today: "Później dzisiaj"
         tomorrow: "Jutro"
+        later_this_week: "Później w tym tygodniu"
+        this_weekend: "W ten weekend"
+        next_week: "Następny tydzień"
+        next_month: "Następny miesiąc"
         pick_date_and_time: "Wybierz datę i czas"
       publish_to_category:
         title: "Zaplanuj publikację"
@@ -1462,11 +1477,15 @@ pl_PL:
         title: "Automatycznie zamknij wątek"
         label: "Godziny automatycznego zamknięcia:"
         error: "Wprowadź poprawną wartość."
+        based_on_last_post: "Nie zamykaj tematu dopóki od ostatniego wpisu nie upłynie przynajmniej tyle czasu."
+      auto_delete:
+        title: "Automatycznie usuń wątek"
       status_update_notice:
         auto_open: "Ten wątek zostanie automatycznie otwarty po %{timeLeft}."
         auto_close: "Ten wątek zostanie automatycznie zamknięty po %{timeLeft}."
         auto_publish_to_category: "Wątek zostanie opublikowany w <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
         auto_close_based_on_last_post: "Ten watek zostanie automatycznie zamknięty po %{count} minutach od ostatniego wpisu."
+        auto_delete: "Ten wątek zostanie automatycznie zamknięty po %{timeLeft}."
       auto_close_title: 'Ustawienia automatycznego zamykania'
       auto_close_immediate:
         one: "Ostatni wpis w tym temacie został zamieszczony 1 godzinę temu, więc zostanie on natychmiastowo zamknięty."
@@ -1765,6 +1784,7 @@ pl_PL:
         has_liked: "lajkujesz ten wpis"
         undo_like: "wycofaj lajka"
         edit: "edytuj ten wpis"
+        edit_action: "Edytuj"
         edit_anonymous: "Przykro nam, ale musisz być zalogowany aby edytować ten wpis."
         flag: "oflaguj ten wpis lub wyślij powiadomienie o nim do moderatorów"
         delete: "usuń ten wpis"
@@ -1907,12 +1927,6 @@ pl_PL:
           few: "Jesteś pewny(-a), że chcesz usunąć te wszystkie wpisy?"
           many: "Czy na pewno chcesz usunąć te wszystkie wpisy?"
           other: "Czy na pewno chcesz usunąć te wszystkie wpisy?"
-      merge:
-        confirm:
-          one: "Czy na pewno chcesz scalić te posty?"
-          few: "Czy na pewno chcesz scalić te {{count}} postów?"
-          many: "Czy na pewno chcesz scalić te {{count}} postów?"
-          other: "Czy na pewno chcesz scalić te {{count}} postów?"
       revisions:
         controls:
           first: "Pierwsza wersja"
@@ -1958,8 +1972,6 @@ pl_PL:
       settings: 'Ustawienia'
       topic_template: "Szablon tematu"
       tags: "Tagi"
-      tags_allowed_tags: "Tagi których można użyć w tej kategorii: "
-      tags_allowed_tag_groups: "Grupy tagów, które mogą być wykorzystane w tej kategorii"
       tags_placeholder: "(Opcjonalnie) lista dozwolonych tagów"
       tag_groups_placeholder: "(Opcjonalnie) lista dozwolonych grup tagów"
       topic_featured_link_allowed: "Zezwól na wybrane linki w tej kategorii"
@@ -2808,11 +2820,6 @@ pl_PL:
           updating: "Trwa proces aktualizacji..."
           up_to_date: "Motyw jest aktualny. Ostatnio sprawdzano:"
           add: "Dodaj"
-          commits_behind:
-            one: "Motyw jest nieaktualny - dostępna 1 poprawka!"
-            few: "Motyw jest nieaktualny - dostępne {{count}} poprawki!"
-            many: "Motyw jest nieaktualny - dostępne {{count}} poprawek!"
-            other: "Motyw jest nieaktualny - dostępne {{count}} poprawek!"
           scss:
             text: "CSS"
             title: "Wstaw własny CSS, przyjmujemy wszystkie prawidłowe style CSS i SCSS"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 769b991754e..f627ad361fa 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -145,20 +145,20 @@ pt:
       default_description: "Predefinido"
     s3:
       regions:
-        us_east_1: "Este dos E.U.A. (Virgínia do Norte)"
-        us_west_1: "Oeste dos E.U.A. (California do Norte)"
-        us_west_2: "Oeste dos E.U.A. (Óregon)"
-        us_gov_west_1: "AWS GovCloud (E.U.A.)"
-        eu_west_1: "U.E. (Irlanda)"
-        eu_west_2: "EU (Londres)"
-        eu_central_1: "U.E. (Francoforte)"
-        ap_southeast_1: "Ásia-Pacífico (Singapura)"
-        ap_southeast_2: "Ásia-Pacífico (Sydney)"
-        ap_south_1: "Ásia Pacifico (Bombaim)"
         ap_northeast_1: "Ásia-Pacífico (Tóquio)"
         ap_northeast_2: "Ásia-Pacífico (Seoul)"
-        sa_east_1: "América do Sul (São Paulo)"
+        ap_south_1: "Ásia Pacifico (Bombaim)"
+        ap_southeast_1: "Ásia-Pacífico (Singapura)"
+        ap_southeast_2: "Ásia-Pacífico (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "U.E. (Francoforte)"
+        eu_west_1: "U.E. (Irlanda)"
+        eu_west_2: "UE (Londres)"
+        sa_east_1: "América do Sul (São Paulo)"
+        us_east_1: "Este dos E.U.A. (Virgínia do Norte)"
+        us_gov_west_1: "AWS GovCloud (E.U.A.)"
+        us_west_1: "Oeste dos E.U.A. (California do Norte)"
+        us_west_2: "Oeste dos E.U.A. (Óregon)"
     edit: 'editar o título e a categoria deste tópico'
     not_implemented: "Essa funcionalidade ainda não foi implementada, pedimos desculpa!"
     no_value: "Não"
@@ -348,46 +348,47 @@ pt:
         full_name: 'Nome Completo'
         add_members: "Adicionar membros"
         delete_member_confirm: "Remover '%{username}' do grupo '%{group}'?"
-      request_membership_pm:
-        title: "Pedido de Adesão"
-        body: "Eu gostaria de aderir a @%{groupName}."
       name_placeholder: "Nome do grupo, sem espaços, com as mesmas regras do nome de utilizador"
-      public: "Permitir aos utilizadores de se juntarem/saírem do grupo livremente (Requere que o grupo seja visível)"
       empty:
         posts: "Não existem publicações por membros deste grupo."
         members: "Não existem membros neste grupo."
-        mentions: "Não há menções deste grupo."
+        mentions: "Não existem menções deste grupo."
         messages: "Não existem mensagens para este grupo."
         topics: "Não existem tópicos por membros deste grupo."
         logs: "Não existem registos para este grupo."
       add: "Adicionar"
-      join: "Juntar ao Grupo"
+      join: "Aderir ao Grupo"
       leave: "Sair do Grupo"
-      request: "Pedir para Entrar no Grupo."
+      request: "Pedir para Aderir ao Grupo"
       automatic_group: Grupo Automático
       closed_group: Grupo fechado
-      is_group_user: "Você é membro deste grupo"
-      allow_membership_requests: "Permitir aos utilizadores enviar pedidos de adesão aos donos do grupo"
+      is_group_user: "É um membro deste grupo"
+      allow_membership_requests: "Permitir que os utilizadores enviem pedidos de adesão aos donos do grupo"
       membership: "Adesão"
       name: "Nome"
-      user_count: "Numero de Membros"
-      bio: "Acerca do Grupo"
+      user_count: "Número de Membros"
+      bio: "Sobre o Grupo"
       selector_placeholder: "Adicionar membros"
       owner: "proprietário"
-      visible: "O grupo é visível para todos os utilizadores"
       index:
         title: "Grupos"
         empty: "Não existem grupos visíveis."
       title:
         one: "grupo"
         other: "grupos"
-      activity: "Actividade"
+      activity: "Atividade"
       members: "Membros"
       topics: "Tópicos"
       posts: "Publicações"
       mentions: "Menções"
       messages: "Mensagens"
-      notification_level: "Nível de notificação por omissão para mensagens de grupo"
+      notification_level: "Nível de notificação predefinido para mensagens de grupo"
+      visibility_levels:
+        title: "Quem pode ver este grupo?"
+        public: "Toda a gente"
+        members: "Donos do grupo, membros e administradores"
+        staff: "Donos do grupo e equipa"
+        owners: "Donos do grupo e administradores"
       alias_levels:
         title: "Quem pode mandar mensagens e @mencionar este grupo?"
         nobody: "Ninguém"
@@ -416,9 +417,11 @@ pt:
           description: "Não será notificado de nada relacionado com novos tópicos neste grupo."
       flair_url: "Imagem da Marca de Avatar"
       flair_bg_color: "Cor de Fundo da Marca de Avatar"
-      flair_bg_color_placeholder: "(Opcional) Valor hexadecimal de cor"
+      flair_bg_color_placeholder: "(Opcional) Valor hexadecimal da cor"
       flair_color: "Cor da Marca de Avatar"
-      flair_color_placeholder: "(Opcional) Valor hexadecimal de cor"
+      flair_color_placeholder: "(Opcional) Valor hexadecimal da cor"
+      flair_preview_icon: "Pré-visualizar Ícone"
+      flair_preview_image: "Pré-visualizar Imagem"
     user_action_groups:
       '1': "Gostos Dados"
       '2': "Gostos Recebidos"
@@ -481,7 +484,7 @@ pt:
       mute: "Silenciar"
       edit: "Editar Preferências"
       download_archive:
-        button_text: "Descarregar As Minhas Publicações"
+        button_text: "Transferir Tudo"
         confirm: "Tem a certeza que deseja descarregar as suas publicações?"
         success: "Descarregamento iniciado, será notificado via mensagem assim que o processo estiver concluído."
         rate_limit_error: "As publicações podem ser descarregadas uma vez por dia, por favor, tente novamente amanhã."
@@ -599,7 +602,6 @@ pt:
         title: "Alterar Nome de Utilizador"
         confirm: "Se mudar o seu nome de utilizador, todas as citações das suas publicações e menções @nome serão quebradas. Tem a certeza absoluta de que o quer fazer?"
         taken: "Pedimos desculpa, esse nome de utilizador já está a ser utilizado."
-        error: "Ocorreu um erro ao alterar o seu nome de utilizador."
         invalid: "Esse nome de utilizador é inválido. Deve conter apenas números e letras."
       change_email:
         title: "Alterar Email"
@@ -1310,7 +1312,7 @@ pt:
         go_bottom: "fim"
         go: "ir"
         jump_bottom: "ir para a última publicação"
-        jump_prompt: "saltar para..."
+        jump_prompt: "ir para..."
         jump_prompt_of: "de %{count} publicações"
         jump_prompt_long: "Para que publicação gostaria de ir?"
         jump_bottom_with_number: "ir para a publicação %{post_number}"
@@ -1659,10 +1661,6 @@ pt:
         confirm:
           one: "Tem a certeza que quer eliminar essa publicação?"
           other: "Tem a certeza que quer eliminar todas essas publicações?"
-      merge:
-        confirm:
-          one: "Tem a certeza que quer juntar estas publicações?"
-          other: "Tem a certeza que quer unir estas {{count}} publicações?"
       revisions:
         controls:
           first: "Primeira revisão"
@@ -1673,7 +1671,7 @@ pt:
           show: "Mostrar revisão"
           revert: "Reverter para esta revisão"
           edit_wiki: "Editar Wiki"
-          edit_post: "Editar publicação"
+          edit_post: "Editar Publicação"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
@@ -1697,8 +1695,6 @@ pt:
       settings: 'Configurações'
       topic_template: "Modelo do Tópico"
       tags: "Etiquetas"
-      tags_allowed_tags: "Etiquetas que só podem ser usadas nesta categoria:"
-      tags_allowed_tag_groups: "Grupos de etiquetas que só podem ser usados nesta categoria:"
       tags_placeholder: "(Opcional) lista de etiquetas perimitidas"
       tag_groups_placeholder: "(Opcional) lista de grupos de etiquetas permitidos"
       delete: 'Eliminar Categoria'
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 30bca2c0b02..187dcfe91a7 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -148,20 +148,20 @@ pt_BR:
       default_description: "Padrão"
     s3:
       regions:
-        us_east_1: "Leste dos EUA (N. da Virgínia)"
-        us_west_1: "Oeste dos EUA (N. da Califórnia)"
-        us_west_2: "Leste dos EUA (Oregon)"
-        us_gov_west_1: "AWS GovCloud (EUA)"
-        eu_west_1: "EU (Irlanda)"
-        eu_west_2: "UE (Londres)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Ásia Pacífico (Singapura)"
-        ap_southeast_2: "Ásia Pacífico (Sidney)"
-        ap_south_1: "Ásia-Pacífico (Mumbai)"
         ap_northeast_1: "Ásia Pacífico (Tóquio)"
         ap_northeast_2: "Ásia Pacífico (Seul)"
-        sa_east_1: "América do Sul (São Paulo)"
+        ap_south_1: "Ásia-Pacífico (Mumbai)"
+        ap_southeast_1: "Ásia Pacífico (Singapura)"
+        ap_southeast_2: "Ásia Pacífico (Sidney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlanda)"
+        eu_west_2: "UE (Londres)"
+        sa_east_1: "América do Sul (São Paulo)"
+        us_east_1: "Leste dos EUA (N. da Virgínia)"
+        us_gov_west_1: "AWS GovCloud (EUA)"
+        us_west_1: "Oeste dos EUA (N. da Califórnia)"
+        us_west_2: "Leste dos EUA (Oregon)"
     edit: 'edite o título e a categoria deste tópico'
     not_implemented: "Esse recurso ainda não foi implementado, desculpe!"
     no_value: "Não"
@@ -351,11 +351,7 @@ pt_BR:
         full_name: 'Nome Completo'
         add_members: "Adicionar Membros"
         delete_member_confirm: "Remover '%{username}' do grupo '%{group}'?"
-      request_membership_pm:
-        title: "Pedido de adesão"
-        body: "Eu gostaria de solicitar a adesão no grupo @%{groupName}."
       name_placeholder: "Nome do grupo, sem espaços, regras iguais ao nome de usuário"
-      public: "Permitir que usuários entrem e saiam do grupo livremente (Requer que o grupo seja visível)"
       empty:
         posts: "Não há publicações de membros deste grupo."
         members: "Não há membros neste grupo."
@@ -377,7 +373,6 @@ pt_BR:
       bio: "Sobre o Grupo"
       selector_placeholder: "Adicionar membros"
       owner: "proprietário"
-      visible: "Grupo é visível para todos os usuários"
       index:
         title: "Grupos"
         empty: "Não há grupos visíveis."
@@ -488,7 +483,6 @@ pt_BR:
       mute: "Silenciar"
       edit: "Editar Preferências"
       download_archive:
-        button_text: "Baixar Minhas Publicações"
         confirm: "Você tem certeza de que quer baixar as suas publicações?"
         success: "Download iniciado, você será notificado por mensagem quando o processo estiver completo."
         rate_limit_error: "Publicações podem ser baixadas somente uma vez por dia, por favor tente novamente amanhã."
@@ -615,7 +609,6 @@ pt_BR:
         title: "Alterar Nome de Usuário"
         confirm: "Se você mudar seu Nome de Usuário, todas as citações das suas respostas e as menções ao seu @nome serão desfeitas. Você tem certeza?"
         taken: "Desculpe, esse Nome de Usuário já está sendo usado."
-        error: "Houve um erro ao alterar o seu Nome de Usuário."
         invalid: "Esse Nome de Usuário é inválido. Deve conter apenas números e letras."
       change_email:
         title: "Alterar Email"
@@ -990,7 +983,6 @@ pt_BR:
       your_email: "O endereço de email da sua conta é <b>%{email}</b>."
       accept_invite: "Aceitar Convite"
       success: "Sua conta foi criada e você já está logado."
-      password_label: "Configurar Senha (opcional)"
     password_reset:
       continue: "Continuar para %{site_name}"
     emoji_set:
@@ -1737,10 +1729,6 @@ pt_BR:
         confirm:
           one: "Tem certeza que quer apagar esta resposta?"
           other: "Tem certeza que quer apagar todos essas respostas?"
-      merge:
-        confirm:
-          one: "Você tem certeza que quer fundir essas postagens?"
-          other: "Você tem certeza que quer fundir essas {{count}} postagens?"
       revisions:
         controls:
           first: "Primeira revisão"
@@ -1786,8 +1774,6 @@ pt_BR:
       settings: 'Configurações'
       topic_template: "Modelo de Tópico"
       tags: "Etiquetas"
-      tags_allowed_tags: "Etiquetas que só podem ser usadas nesta categoria:"
-      tags_allowed_tag_groups: "Grupos de etiquetas que só podem ser usados nesta categoria:"
       tags_placeholder: "(Opcional) lista de etiquetas permitidas"
       tag_groups_placeholder: "(Opcional) lista de grupos de etiquetas permitidos"
       topic_featured_link_allowed: "Permitir links em destaque nesta categoria"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 7ef45a5d20e..824e1add245 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -161,19 +161,19 @@ ro:
       default_description: "Implicit"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Irlanda)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlanda)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'Editează titlul și categoria acestui subiect'
     not_implemented: "Această funcționalitate nu a fost implementată încă."
     no_value: "Nu"
@@ -371,11 +371,7 @@ ro:
         full_name: 'Nume complet'
         add_members: "Adaugă membri"
         delete_member_confirm: "Șterge utilizatorul '%{username}' din grupul '%{group}'?"
-      request_membership_pm:
-        title: "Cerere de adăugare ca membru"
-        body: "Aș dori să fac o cerere de adăugare ca membru în @%{groupName}."
       name_placeholder: "Numele grupului, fără spații, la fel ca regula pentru nume utilizator"
-      public: "Permite utilizatorilor să intre/iasă din grup fără restricții. (Presupune ca grupul să fie vizibil)"
       empty:
         posts: "Nu există postări ale membrilor acestui grup."
         members: "Nu există nici un membru în acest grup."
@@ -396,7 +392,6 @@ ro:
       bio: "Despre grup"
       selector_placeholder: "Adaugă membri"
       owner: "Proprietar"
-      visible: "Grupul este vizibil tuturor utilizatorilor"
       index:
         title: "Grupuri"
         empty: "Nu există nici un grup vizibil."
@@ -509,7 +504,6 @@ ro:
       mute: "Silențios"
       edit: "Editează preferințe"
       download_archive:
-        button_text: "Descarcă postările mele"
         confirm: "Ești sigur că vrei să îți descarci postările?"
         success: "Descărcarea a început, vei fi notificat printr-un mesaj atunci când procesul se va termina."
         rate_limit_error: "Postările pot fi descărcate doar o singură dată pe zi, te rugăm să încerci din nou mâine."
@@ -626,7 +620,6 @@ ro:
         title: "Schimbă numele utilizatorului"
         confirm: "Dacă îți schimbi numele de utilizator, toate citările anterioare ale posturilor tale și toate mențiunile @numelui se vor pierde. Ești absolut sigur că vrei asta?"
         taken: "Acest nume de utilizator este deja folosit."
-        error: "A apărut o eroare la schimbarea numelui de utilizator."
         invalid: "Acest nume de utilizator este invalid. Trebuie să includă doar cifre și litere."
       change_email:
         title: "Schimbă email"
@@ -1743,11 +1736,6 @@ ro:
           one: "Ești sigur că vrei să ștergi acest mesaj?"
           few: "Ești sigur că vrei să ștergi toate aceste mesaje?"
           other: "Ești sigur că vrei să ștergi toate aceste mesaje?"
-      merge:
-        confirm:
-          one: "Ești sigur că vrei să aduni laolaltă această postare?"
-          few: "Ești sigur că vrei să comasezi aceste {{count}} postări?"
-          other: "Ești sigur că vrei să comasezi aceste {{count}} de postări?"
       revisions:
         controls:
           first: "Prima revizie"
@@ -1777,8 +1765,6 @@ ro:
       settings: 'Setări'
       topic_template: "Șablon subiect"
       tags: "Etichete"
-      tags_allowed_tags: "În această categorie se pot folosi numai etichetele:"
-      tags_allowed_tag_groups: "În această categorie se pot folosi numai grupurile de etichete:"
       tags_placeholder: "(Opțional) lista etichetelor permise"
       tag_groups_placeholder: "(Opțional) lista grupurilor de etichete permise"
       topic_featured_link_allowed: "Permite link-uri promovate în această categorie."
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index bd625875cdc..fd971b978a7 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -137,6 +137,7 @@ ru:
           other: "%{count} лет спустя"
       previous_month: 'Предыдущий месяц'
       next_month: 'Следующий месяц'
+      placeholder: Выберите дату
     share:
       topic: 'Поделиться ссылкой на эту тему'
       post: 'Ссылка на сообщение №%{postNumber}'
@@ -180,20 +181,20 @@ ru:
       default_description: "По умолчанию"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'отредактировать название и раздел темы'
     not_implemented: "Извините, эта функция еще не реализована!"
     no_value: "Нет"
@@ -398,11 +399,7 @@ ru:
         full_name: 'Полное Имя'
         add_members: "Добавить Участников"
         delete_member_confirm: "Удалить '%{username}' из группы '%{group}'?"
-      request_membership_pm:
-        title: "Запрос на Вступление"
-        body: "Я бы хотел вступить в @%{groupName}."
       name_placeholder: "Название группы, без пробелов, по тем же правилам, что и для псевдонимов."
-      public: "Позволить пользователям свободно вступать/покидать группу (Группа должна быть видимой)"
       empty:
         posts: "Участниками этой группы не создано ни одной записи."
         members: "Нет участников в этой группе."
@@ -423,7 +420,6 @@ ru:
       bio: "О Группе"
       selector_placeholder: "Добавить участников"
       owner: "владелец"
-      visible: "Группа видима всем пользователям"
       index:
         title: "Группы"
         empty: "Нет видимых групп."
@@ -539,7 +535,7 @@ ru:
       mute: "Отключить"
       edit: "Настройки"
       download_archive:
-        button_text: "Скачать мои сообщения"
+        button_text: "Скачать всё"
         confirm: "Вы уверены, что хотите скачать свои сообщения?"
         success: "Скачивание началось, вы будете уведомлены, когда процесс завершится."
         rate_limit_error: "Сообщения могут быть скачаны лишь раз в день, попробуйте завтра."
@@ -569,6 +565,7 @@ ru:
       first_notification: "Ваше первое уведомление! Выберите его, чтобы начать."
       disable_jump_reply: "Не переходить к вашему новому сообщению после ответа"
       dynamic_favicon: "Показывать количество новых / обновленных тем на иконке сообщений"
+      theme_default_on_all_devices: "Поставить этот стиль по умолчанию на всех моих устройствах"
       external_links_in_new_tab: "Открывать все внешние ссылки в новой вкладке"
       enable_quoting: "Позволить отвечать с цитированием выделенного текста"
       change: "изменить"
@@ -619,6 +616,7 @@ ru:
       muted_users_instructions: "Не отображать уведомления от этих пользователей."
       muted_topics_link: "Показать темы \"Без уведомлений\""
       watched_topics_link: "Показать наблюдаемые темы"
+      tracked_topics_link: "Показать отслеживаемые темы"
       automatically_unpin_topics: "Автоматически откреплять топики после прочтения."
       apps: "Приложения"
       revoke_access: "Лишить прав доступа"
@@ -642,6 +640,15 @@ ru:
         move_to_archive: "Архив"
         failed_to_move: "Невозможно переместить выделенные сообщения (возможно, у вас проблемы с Интернетом)"
         select_all: "Выбрать все"
+      preferences_nav:
+        account: "Учетная запись"
+        profile: "Профиль"
+        emails: "Почта"
+        notifications: "Уведомления"
+        categories: "Разделы"
+        tags: "Теги"
+        interface: " Интерфейс"
+        apps: "Приложения"
       change_password:
         success: "(письмо отправлено)"
         in_progress: "(отправка письма)"
@@ -657,7 +664,6 @@ ru:
         title: "Изменить псевдоним"
         confirm: "Если вы измените имя пользователя, то все предыдущие цитирования и обращения по @name станут неработоспособными. Вы уверены, что вы хотите это сделать?"
         taken: "Этот псевдоним уже занят."
-        error: "При изменении псевдонима произошла ошибка."
         invalid: "Псевдоним должен состоять только из цифр и латинских букв"
       change_email:
         title: "Изменить E-mail"
@@ -799,6 +805,7 @@ ru:
         rescinded: "Приглашение отозвано"
         reinvite: "Повторить приглашение"
         reinvite_all: "Повторить все приглашения"
+        reinvite_all_confirm: "Вы действительно хотите отправить все приглашения повторно?"
         reinvited: "Приглашение выслано повторно"
         reinvited_all: "Все приглашения высланы повторно!"
         time_read: "Времени читал"
@@ -809,6 +816,7 @@ ru:
         link_generated: "Пригласительная ссылка успешно создана!"
         valid_for: "Пригласительная ссылка действительна только для этого адреса электропочты: %{email}"
         bulk_invite:
+          none: "Вы еще никого не приглашали сюда. Отправьте индивидуальные приглашения или пригласите несколько людей за раз, <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>загрузив файл CSV</a>."
           text: "Пригласить всех из файла"
           success: "Файл успешно загружен, вы получите сообщение, когда процесс будет завершен."
           error: "Извините, но файл должен быть в формате CSV."
@@ -994,6 +1002,9 @@ ru:
       complete_email_found: "Мы нашли учетную запись с адресом электронной почты  <b>%{email}</b> и выслали туда инструкцию по сбросу пароля."
       complete_username_not_found: "Не найдено учетной записи с псевдонимом <b>%{username}</b>"
       complete_email_not_found: "Не найдено учетной записи с адресом электронной почты <b>%{email}</b>"
+      help: "Электронное письмо не доходит? Для начала проверьте папку «Спам» вашего почтового ящика. <p>Не уверены в том, какой адрес использовали? Введите его и мы подскажем, есть ли он в нашей базе.</p><p>Если вы более не имеете доступа к связанному с вашей учётной записью адресу электронной почты, то, пожалуйста, свяжитесь с <a href='/about'>администрацией.</a></p>"
+      button_ok: "ОК"
+      button_help: "Помощь"
     login:
       title: "Войти"
       username: "Пользователь"
@@ -1048,10 +1059,13 @@ ru:
       accept_title: "Приглашение"
       welcome_to: "Добро пожаловать на %{site_name}!"
       invited_by: "Вы были приглашены:"
+      social_login_available: "Вы также сможете входить через социальные сети, используя этот адрес электронной почты."
       your_email: "Ваш электронный адрес аккаунта <b>%{email}</b>."
       accept_invite: "Принять приглашение"
       success: "Ваш аккаунт создан и вы можете теперь войти."
-      password_label: "Установить пароль (опционально)"
+      name_label: "Имя"
+      password_label: "Установить пароль"
+      optional_description: "(опционально)"
     password_reset:
       continue: "Далее на %{site_name}"
     emoji_set:
@@ -1091,6 +1105,7 @@ ru:
       cannot_see_mention:
         category: "Вы упомянули {{username}}, но они не будут уведомлены, потому что у них нет доступа к этому разделу. Вам нужно добавить их в группу, имеющую доступ к этому разделу."
         private: "Вы упомянули {{username}}, но они не будут уведомлены, потому что они не могут видеть это личное сообщение. Вам нужно пригласить их в это ЛС."
+      duplicate_link: "Кажется, ваша ссылка на <b>{{domain}}</b> уже была ранее размещена пользователем <b>@{{username}}</b> в <a href='{{post_url}}'>ответе {{ago}}</a>. Вы точно хотите разместить её ещё раз?"
       error:
         title_missing: "Требуется название темы"
         title_too_short: "Название темы должно быть не короче {{min}} символов"
@@ -1182,6 +1197,7 @@ ru:
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> переместил(а) {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Вы награждены: {{description}}</p>"
+      topic_reminder: "<i title='topic reminder' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Новая Тема</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} входящее сообщение в Вашей группе {{group_name}}</p>"
@@ -1229,6 +1245,7 @@ ru:
       sort_by: "Сортировка"
       relevance: "По смыслу"
       latest_post: "С недавними сообщениями"
+      latest_topic: "Последняя тема"
       most_viewed: "Самые просматриваемые"
       most_liked: "Больше всего симпатий"
       select_all: "Выбрать все"
@@ -1244,6 +1261,7 @@ ru:
       no_more_results: "Больше ничего не найдено."
       searching: "Поиск ..."
       post_format: "#{{post_number}} от {{username}}"
+      results_page: "Результаты поиска"
       context:
         user: "Искать сообщения от @{{username}}"
         category: "Искать в разделе #{{category}}"
@@ -1275,6 +1293,7 @@ ru:
           seen: Отметить прочитанным
           unseen: Отметить непрочитанным
           wiki: Являются вики
+          all_tags: Содержит все теги
         statuses:
           label: Характеристика темы
           open: Открыта
@@ -1310,6 +1329,7 @@ ru:
         dismiss_new: "Отложить новые"
         toggle: "Вкл./выкл. выбор нескольких тем"
         actions: "Массовые действия"
+        change_category: "Задать раздел"
         close_topics: "Закрыть темы"
         archive_topics: "Архивировать темы"
         choose_new_category: "Выберите новый раздел для этих тем:"
@@ -1423,6 +1443,32 @@ ru:
       jump_reply_up: перейти к более ранним ответам
       jump_reply_down: перейти к более поздним ответам
       deleted: "Тема удалена"
+      auto_update_input:
+        later_this_week: "Позже на этой неделе"
+        this_weekend: "В эти выходные"
+        next_week: "На следующей неделе"
+        next_month: "В следующем месяце"
+        pick_date_and_time: "Выбрать дату и время"
+      temp_open:
+        title: "Открыть на время"
+      auto_reopen:
+        title: "Автоматическое открытие темы"
+      temp_close:
+        title: "Закрыть на время"
+      auto_close:
+        title: "Автоматическое закрытие темы"
+        error: "Пожалуйста, введите корректное значение."
+      auto_delete:
+        title: "Автоматическое удаление темы"
+      reminder:
+        title: "Запомнить меня"
+      status_update_notice:
+        auto_open: "Эта тема автоматически откроется через %{timeLeft}."
+        auto_close: "Эта тема автоматически закроется через %{timeLeft}."
+        auto_publish_to_category: "Эта тема будет опубликована в разделе <a href=%{categoryUrl}>#%{categoryName}</a> через %{timeLeft}."
+        auto_close_based_on_last_post: "Эта тема будет закрыта через %{duration} после последнего ответа."
+        auto_delete: "Эта тема будет автоматически удалена через %{timeLeft}."
+        auto_reminder: "Вам придёт напоминание об этой теме через %{timeLeft}."
       auto_close_title: 'Настройки закрытия темы'
       auto_close_immediate:
         one: "Последнее сообщение в этой теме отправлено 1 час назад, поэтому данная тема будет закрыта незамедлительно."
@@ -1455,6 +1501,10 @@ ru:
           '3_2': 'Вы будете получать уведомления, т.к. наблюдаете за этой темой.'
           '3_1': 'Вы будете получать уведомления, т.к. создали эту тему.'
           '3': 'Вы будете получать уведомления, т.к. наблюдаете за темой.'
+          '2_8': 'Вы увидите количество новых ответов, т.к. следите за этим разделом.'
+          '2_4': 'Вы увидите количество новых ответов, т.к. вы размещали ответ в этой теме.'
+          '2_2': 'Вы увидите количество новых ответов, т.к. следите за этой темой.'
+          '2': 'Вы увидите количество новых ответов, т.к. <a href="/u/{{username}}/preferences">читали эту тему</a>.'
           '1_2': 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.'
           '1': 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.'
           '0_7': 'Не получать уведомлений из этого раздела.'
@@ -1622,6 +1672,7 @@ ru:
           other: "Пожалуйста, выберите нового владельца {{count}} сообщений от <b>{{old_user}}</b>."
         instructions_warn: "Обратите внимание, что все уведомления об этом сообщении не будут переданы новому пользователю задним числом. <br>Внимание: В настоящее время никакие данные, имеющие отношение к сообщению, не передаются новому пользователю. Используйте с осторожностью."
       change_timestamp:
+        title: "Изменить временную метку..."
         action: "изменить временную метку"
         invalid_timestamp: "Временная метка не может быть в будущем"
         error: "При изменении временной метки темы возникла ошибка"
@@ -1856,12 +1907,6 @@ ru:
           few: "Вы уверены, что хотите удалить все эти сообщения?"
           many: "Вы уверены, что хотите удалить все эти сообщения?"
           other: "Вы уверены, что хотите удалить все эти сообщения?"
-      merge:
-        confirm:
-          one: "Вы уверены, что хотите объединить эти сообщения?"
-          few: "Вы уверены, что хотите объединить эти {{count}} сообщений?"
-          many: "Вы уверены, что хотите объединить эти {{count}} сообщений?"
-          other: "Вы уверены, что хотите объединить эти {{count}} сообщений?"
       revisions:
         controls:
           first: "Начальная версия"
@@ -1907,8 +1952,8 @@ ru:
       settings: 'Настройки'
       topic_template: "Шаблон темы"
       tags: "Тэги"
-      tags_allowed_tags: "Теги, которые могут быть использованы только в этом разделе:"
-      tags_allowed_tag_groups: "Группы тегов, которые могут быть использованы только в этом разделе:"
+      tags_allowed_tags: "Разрешить использовать в этом разделе только следующие метки:"
+      tags_allowed_tag_groups: "Разрешить использовать в этом разделе только метки из этих групп:"
       tags_placeholder: "(Необязательно) список доступных тегов"
       tag_groups_placeholder: "(Необязательно) список доступных групп тегов"
       topic_featured_link_allowed: "Разрешить популярные ссылки в этой категории"
@@ -1944,8 +1989,12 @@ ru:
       email_in_disabled: "Создание новых тем через электронную почту отключено в настройках сайта. Чтобы разрешить создание новых тем через электронную почту,"
       email_in_disabled_click: 'активируйте настройку "email in".'
       suppress_from_homepage: "Не отображать этот раздел на главной странице."
+      show_subcategory_list: "Показывать список подразделов над списком тем  в этом разделе."
       num_featured_topics: "Количество тем на странице разделов"
       all_topics_wiki: "Создавать новые темы в вики-формате по умолчанию."
+      subcategory_list_style: "Стиль списка подразделов:"
+      sort_order: "Порядок сортировки тем:"
+      default_view: "Вид списка тем по умолчанию:"
       allow_badges_label: "Разрешить вручение наград в этом разделе"
       edit_permissions: "Изменить права доступа"
       add_permission: "Добавить права"
@@ -1983,6 +2032,9 @@ ru:
         created: "Дата создания"
       sort_ascending: 'По возрастанию'
       sort_descending: 'По убыванию'
+      subcategory_list_styles:
+        rows: "Строки"
+        rows_with_featured_topics: "Строки с обсуждаемыми темами"
     flagging:
       title: 'Спасибо за вашу помощь в поддержании порядка!'
       action: 'Пожаловаться на сообщение'
@@ -2257,6 +2309,8 @@ ru:
       granted_on: "Выдана %{date}"
       others_count: "Другие с этой наградой (%{count})"
       title: Награды
+      allow_title: "Вы можете использовать эту награду в качестве титула."
+      multiple_grant: "Вы можете получить её несколько раз"
       badge_count:
         one: "1 награда"
         few: "%{count} наград"
@@ -2518,6 +2572,7 @@ ru:
         add_members: "Добавить участников"
         custom: "Настраиваемые"
         bulk_complete: "Пользователи успешно добавлены в группу."
+        bulk_complete_users_not_added: "Эти пользователи не были добавлены (убедитесь, что у них есть учётная запись):"
         bulk: "Массовое добавление в группу"
         bulk_paste: "Впишите список пользователей или адресов e-mail, по одному на строчку:"
         bulk_select: "(выберите группу)"
@@ -2567,6 +2622,7 @@ ru:
         event_type_missing: "Вам необходимо настроить по крайней мере один тип событий."
         content_type: "Тип Содержимого"
         secret: "Ключ"
+        event_chooser: "Какие события должны вызывать срабатывание этого Webhook?"
         wildcard_event: "Присылать мне всё."
         individual_event: "Выбрать отдельные события."
         verify_certificate: "Проверять TLS сертификат ссылки для отправки данных"
@@ -2714,6 +2770,10 @@ ru:
         color: "Цвет"
         opacity: "Прозрачность"
         copy: "Копировать"
+        copy_to_clipboard: "Скопировать в буфер"
+        copied_to_clipboard: "Скопировано в буфер"
+        copy_to_clipboard_error: "Ошибка при копировании данных в буфер омена"
+        theme_owner: "Нередактируемо, владелец: "
         email_templates:
           title: "Шаблоны писем"
           subject: "Тема"
@@ -2738,24 +2798,26 @@ ru:
           color_scheme: "Цветовая схема"
           color_scheme_select: "Выберите цвета для стиля"
           custom_sections: "Настройка секций:"
+          theme_components: "Компоненты стиля"
+          uploads: "Загрузки"
+          no_uploads: "Вы можете загружать различные ресурсы для вашего стиля, такие как шрифты и изображения"
+          upload_file_tip: "Выберите файл для загрузки (png, woff2 и т.д.)"
+          variable_name: "Имя переменной SCSS:"
           child_themes_check: "Стиль включает дочерние стили"
           css_html: "Настройка CSS/HTML"
           edit_css_html: "Редактировать CSS/HTML"
           edit_css_html_help: "Вы не внесли никаких изменений в CSS или HTML"
+          delete_upload_confirm: "Удалить этот файл? CSS стиля может перестать функционировать!"
           import_web_tip: "Репозиторий стиля"
           import_file_tip: "файл стиля .dcstyle.json"
           about_theme: "О стиле"
           license: "Лицензия"
+          component_of: "Стиль служит компонентом для:"
           update_to_latest: "Обновить"
           check_for_updates: "Проверить обновления"
           updating: "Обновляю..."
           up_to_date: "Стиль текущей версии, последняя проверка:"
           add: "Добавить"
-          commits_behind:
-            one: "Есть 1 обновление стиля!"
-            few: "Есть {{count}} обновления стиля!"
-            many: "Есть {{count}} обновлений стиля!"
-            other: "Есть {{count}} обновлений стиля!"
           scss:
             text: "CSS"
             title: "Введите CSS; допускаются все стили CSS и SCSS"
@@ -2902,6 +2964,8 @@ ru:
           block: "заблокировать"
           do_nothing: "ничего не делать"
         staff_actions:
+          all: "всё"
+          filter: "Фильтр:"
           title: "Действия персонала"
           clear_filters: "Показать все"
           staff_user: "Персонал"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 95c423f83ce..e1bd460e664 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -156,18 +156,18 @@ sk:
     bootstrap_mode_disabled: "Zavádzací režim bude zrušený v priebehu nasledujúcich 24 hodín."
     s3:
       regions:
-        us_east_1: "USA Východ (S. Virginia)"
-        us_west_1: "USA Západ (S. Kalifornia)"
-        us_west_2: "USA Západ (Oregon)"
-        us_gov_west_1: "AWS GovCloud (USA)"
-        eu_west_1: "EU (Írsko)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Ázia Tichomorie (Singapur)"
-        ap_southeast_2: "Ázia Tichomorie (Sydney)"
         ap_northeast_1: "Ázia Tichomorie (Tokio)"
         ap_northeast_2: "Asia Pacific (Soul)"
-        sa_east_1: "Južná Amerika (Sao Paulo)"
+        ap_southeast_1: "Ázia Tichomorie (Singapur)"
+        ap_southeast_2: "Ázia Tichomorie (Sydney)"
         cn_north_1: "Čína (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Írsko)"
+        sa_east_1: "Južná Amerika (Sao Paulo)"
+        us_east_1: "USA Východ (S. Virginia)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        us_west_1: "USA Západ (S. Kalifornia)"
+        us_west_2: "USA Západ (Oregon)"
     edit: 'upraviť názov a kategóriu témy'
     not_implemented: "Ľutujeme, táto funkcia ešte nie je implementovaná."
     no_value: "Nie"
@@ -363,9 +363,6 @@ sk:
         title: 'Upraviť skupinu'
         full_name: 'Celé meno'
         add_members: "Pridať používateľov"
-      request_membership_pm:
-        title: "Žiadosť o pridanie"
-        body: "Chcel by som sa stať členom skupiny @%{groupName}."
       add: "Pridať"
       closed_group: Uzavretá skupina
       membership: "Členstvo"
@@ -374,7 +371,6 @@ sk:
       bio: "O skupine"
       selector_placeholder: "Pridať členov"
       owner: "vlastník"
-      visible: "Skupina je viditeľná všetkým používateľom"
       index:
         title: "Skupiny"
         empty: "Nenašli sa viditeľné skupiny."
@@ -478,7 +474,6 @@ sk:
       mute: "Ignorovať"
       edit: "Upraviť nastavenia"
       download_archive:
-        button_text: "Uložiť moje príspevky"
         confirm: "Si si istý, že si chceš uložiť svoje príspevky na disk?"
         success: "Sťahovanie bolo spustené, o jeho ukončení budeš informovaný správou."
         rate_limit_error: "Príspevky možu byť stiahnuté len raz za deň. Skús opäť zajtra prosím."
@@ -590,7 +585,6 @@ sk:
         title: "Zmeniť používateľské meno"
         confirm: "Ak zmeníte svoje používateľské meno, všetky predchádzajúce citácie Vašich príspevkov a všetky @zmienky búdú porušené. Ste si absolútne istý, že to chcete?"
         taken: "Ľutujeme, toto používateľské meno je obsadené."
-        error: "Pri zmene používateľského mena prišlo k chybe."
         invalid: "Toto používateľské meno nie je platné. Musí obsahovať iba znaky a čísla."
       change_email:
         title: "Zmeniť email"
@@ -947,7 +941,6 @@ sk:
       accept_title: "Pozvánka"
       accept_invite: "Prijať pozvánku"
       success: "Váš účet bol vytvorený a ste prihlásený."
-      password_label: "Nastaviť heslo (voliteľne)"
     emoji_set:
       apple_international: "Apple/Medzinárodné"
       google: "Google"
@@ -1671,8 +1664,6 @@ sk:
       settings: 'Nastavenia'
       topic_template: "Formulár témy"
       tags: "Štítky"
-      tags_allowed_tags: "Štítky, ktoré môžu byť použité iba v tejto kategórii:"
-      tags_allowed_tag_groups: "Skupiny štítkov, ktoré môžu byť použité iba v tejto kategórii:"
       tags_placeholder: "(Voliteľné) zoznam povolených štítkov"
       tag_groups_placeholder: "(Voliteľné) zoznam povolených skupín štítkov"
       delete: 'Odstrániť kategóriu'
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index d968ad79254..62e66bb4926 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -144,20 +144,20 @@ sq:
       default_description: "Paracaktuar"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_west_2: "BE (Londër)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        eu_west_2: "BE (Londër)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'redakto titullin dhe kategorinë e kësaj teme'
     not_implemented: "Kjo veçori nuk është implementuar akoma, na vjen keq!"
     no_value: "Jo"
@@ -347,17 +347,19 @@ sq:
         full_name: 'Emri i plotë'
         add_members: "Shto anëtarë"
         delete_member_confirm: "Do të heqësh '%{username}' nga grupi '%{group}'?"
-      request_membership_pm:
-        title: "Kërkesë për anëtarësim"
-        body: "Do të doja të aplikoja për t'u bërë anëtar i grupit @%{groupName}."
       name_placeholder: "Emri i grupit, pa hapësira, si username-t"
       add: "Shto"
+      join: "Bashkoju grupit"
+      leave: "Ik nga grupi"
+      request: "Kërko t'i bashkohesh grupit"
+      automatic_group: Grup automatik
+      closed_group: Grup i mbyllur
+      is_group_user: "Jeni anëtar i këtij grupi"
       name: "Emri"
       user_count: "Numri i anëtarëve"
       bio: "Mbi grupin"
       selector_placeholder: "Shto anëtarë"
       owner: "autori"
-      visible: "Grupi është i dukshëm për të gjithë përdoruesit"
       index:
         title: "Grupet"
       title:
@@ -458,7 +460,6 @@ sq:
       mute: "Hesht"
       edit: "Ndrysho preferencat"
       download_archive:
-        button_text: "Shkarko postimet e mia"
         confirm: "Vërtet doni t'i shkarkoni postimet tuaja?"
         success: "Shkarkimi filloi, do të njoftoheni me një mesazh kur të jetë gati. "
         rate_limit_error: "Postimet mund të shkarkohen një herë në ditë, provoni përsëri nesër. "
@@ -579,7 +580,6 @@ sq:
         title: "Ndrysho emrin e përdoruesit"
         confirm: "Nëse ndryshoni emrin e përdoruesit të gjitha citimet e mëparshme dhe përmendjet @emër do të prishen. A jeni 100% të sigurtë që doni të ndryshoni emrin?"
         taken: "Na vjen keq, por ky emër është i zënë."
-        error: "Ndodhi një gabim gjatë ndryshimit të emrit."
         invalid: "Emri i përdoruesit nuk është i vlefshëm. Duhet të përmbaje vetëm shkronja ose numra"
       change_email:
         title: "Ndrysho email"
@@ -946,7 +946,6 @@ sq:
       your_email: "Adresa email e llogarisë tuaj është <b>%{email}</b>."
       accept_invite: "Prano ftesën"
       success: "Llogaria juaj u krijua dhe ju tani mund të identifikoheni."
-      password_label: "Vendos fjalëkalimin (opsionale)"
     password_reset:
       continue: "Vazhdo tek %{site_name}"
     emoji_set:
@@ -970,7 +969,7 @@ sq:
       whisper: "pëshpëritje"
       unlist: "çlistuar"
       add_warning: "Ky është një paralajmërim zyrtar."
-      toggle_whisper: "Hiq pëshpëritjet"
+      toggle_whisper: "Pëshpëritje?"
       toggle_unlisted: "Toggle Unlisted"
       posting_not_on_topic: "Cilës temë doni t'i përgjigjeni?"
       saving_draft_tip: "duke e ruajtur..."
@@ -981,6 +980,8 @@ sq:
       group_mentioned:
         one: "By mentioning {{group}}, you are about to notify <a href='{{group_link}}'>1 person</a> – are you sure?"
         other: "By mentioning {{group}}, you are about to notify <a href='{{group_link}}'>{{count}} people</a> – are you sure?"
+      cannot_see_mention:
+        private: "Ju përmendët {{username}} , por ky anëtar nuk do të njoftohet sepse nuk kanë akses në këtë mesazh privat. Do t'ju duhet t'a ftoni anëtarin në këtë mesazh. "
       error:
         title_missing: "Titulli është i nevojshëm"
         title_too_short: "Titulli duhet të ketë të paktën {{min} shkronja."
@@ -1252,6 +1253,7 @@ sq:
       toggle_information: "më shumë mbi temën"
       read_more_in_category: "Dëshironi të lexoni më shumë? Shfleto temat në {{catLink}} ose {{latestLink}}."
       read_more: "Dëshironi të lexoni më shumë? {{catLink}} ose {{latestLink}}."
+      read_more_MF: "Keni { UNREAD, plural, =0 {} one { <a href='/unread'>1 shkrim të palexuar</a> } other { <a href='/unread'># shkrime të palexuara</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{dhe } false {është } other{}} <a href='/new'>1 shkrim të ri</a>} other { {BOTH, select, true{dhe } false {} other{}} <a href='/new'># shkrime të reja</a>} } akoma, ose {CATEGORY, select, true {shiko temat e tjera në kategorinë {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Shfleto kategoritë
       view_latest_topics: shiko temat më të fundit
       suggest_create_topic: Pse nuk hapni një temë të re?
@@ -1282,7 +1284,10 @@ sq:
           '3_2': 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
           '3_1': 'Ju do të njoftoheni duke qënë se ju jeni autori i kësaj teme. '
           '3': 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
-          '2_4': 'Ju do të shikoni një numër përgjigjes sepse ju postuat një përgjigje në këtë temë. '
+          '2_8': 'Ju do të shikoni numrin e përgjigjeve të reja sepse jeni duke gjurmuar këtë kategori. '
+          '2_4': 'Ju do të shikoni numrin e përgjigjeve të reja sepse ju postuat një përgjigje në këtë temë. '
+          '2_2': 'Ju do të shikoni numrin e përgjigjeve të reja sepse jeni duke gjurmuar këtë temë. '
+          '2': 'Ju do të shikoni numrin e përgjigjeve të reja sepse ju <a href="/u/{{username}}/preferences">lexuat këtë temë</a>.'
           '1_2': 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
           '1': 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
           '0_7': 'Ju nuk do të merrni asnjë njoftim për temat në këtë kategori. '
@@ -1597,10 +1602,6 @@ sq:
           vote:
             one: "1 anëtar votoi për këtë postim"
             other: "{{count}} anëtarë votuan për këtë postim"
-      merge:
-        confirm:
-          one: "Jeni i sigurtë që dëshironi t'i bashkoni këto postime?"
-          other: "Jeni i sigurtë që dëshironi t'i bashkoni këto {{count}} postime?"
       revisions:
         controls:
           first: "Revizioni i parë"
@@ -1614,10 +1615,18 @@ sq:
         displays:
           inline:
             title: "Show the rendered output with additions and removals inline"
+            button: 'HTML'
           side_by_side:
             title: "Show the rendered output diffs side-by-side"
+            button: 'HTML'
           side_by_side_markdown:
             title: "Show the raw source diffs side-by-side"
+      raw_email:
+        displays:
+          text_part:
+            button: 'Tekst'
+          html_part:
+            button: 'HTML'
     category:
       can: 'mund&hellip; '
       none: '(pa kategori)'
@@ -1630,8 +1639,8 @@ sq:
       settings: 'Rregullimet'
       topic_template: "Shabllon i Temës"
       tags: "Etiketat"
-      tags_allowed_tags: "Etiketat që mund të përdoren vetëm në këtë kategori"
-      tags_allowed_tag_groups: "Grupet e etiketave që mund të përdoren vetëm në këtë kategori:"
+      tags_allowed_tags: "Lejo vetëm këto etiketa të përdoren në këtë kategori:"
+      tags_allowed_tag_groups: "Lejo vetëm etiketat nga këto grupe të përdoren në këtë kategori:"
       tags_placeholder: "(Opsionale) lista e etiketave të lejuara"
       tag_groups_placeholder: "(Opsionale) lista e grupeve të etiketave"
       delete: 'Fshini kategorinë'
@@ -1739,6 +1748,8 @@ sq:
     topic_statuses:
       warning:
         help: "Ky është një paralajmërim zyrtar."
+      bookmarked:
+        help: "E ruajte këtë temë tek të preferuarat e tua"
       locked:
         help: "Kjo temë është mbyllur; nuk pranon më përgjigje"
       archived:
@@ -1877,6 +1888,8 @@ sq:
         title: 'Shfletimi'
         jump: '<b>#</b> Shko tek postimi #'
         back: '<b>u</b> Mbrapa'
+        open: '<b>o</b> or <b>Enter</b> Lexo temën e zgjedhur'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Seksioni i ardhshëm/mëparshëm'
       application:
         title: 'Aplikimi'
         create: '<b>c</b> Hap një temë të re'
@@ -1908,6 +1921,7 @@ sq:
         mark_regular: '<b>m</b>, <b>r</b> Shënoje temën si të zakonshme'
         mark_tracking: '<b>m</b>, <b>t</b> Ndiqe temën'
         mark_watching: '<b>m</b>, <b>w</b> Vëzhgoje temën'
+        print: '<b>ctrl</b>+<b>p</b> Printo temën'
     badges:
       earned_n_times:
         one: "Kjo stemë është fituar 1 herë"
@@ -1915,6 +1929,8 @@ sq:
       granted_on: "Atribuar më %{date}"
       others_count: "Të tjerë me këtë stemë (%{count})"
       title: Stemat
+      allow_title: "Mund t'a përdorësh këtë stemë si titull"
+      multiple_grant: "Kjo stemë mund të fitohet disa herë"
       badge_count:
         one: "1 stemë"
         other: "%{count} stema"
@@ -2586,6 +2602,7 @@ sq:
         help: "Shto fusha që përdoruesit mund të plotësojnë."
         create: "Krijo fushë përdoruesi"
         untitled: "Pa Titull"
+        name: "Fusha e emrit"
         save: "Ruaj"
         edit: "Redakto"
         delete: "Fshij"
@@ -2606,13 +2623,13 @@ sq:
           enabled: "e treguar në kartën e anëtarit"
           disabled: "nuk tregohet në kartën e anëtarit"
         field_types:
-          text: 'Fushë tekst'
+          text: 'Fusha tekstit'
           confirm: 'Konfirmimi'
           dropdown: "Listë Dropdown"
       site_text:
         description: "Mund të adaptoni çdo tekst në këtë faqe. Filloni duke bërë një kërkim më poshtë: "
         search: "Kërkoni për tekstin që dëshironi të redaktoni"
-        title: 'Tekstet'
+        title: 'Përmbajtje Tekstit'
         edit: 'redakto'
         revert: "Rikthe ndryshimet"
         revert_confirm: "A jeni të sigurtë se doni të riktheni mbrapsht ndryshimet e bëra?"
@@ -2627,6 +2644,7 @@ sq:
         no_results: "Nuk u gjet asnjë rezultat."
         clear_filter: "Pastro"
         add_url: "shto URL"
+        add_host: "shto host"
         categories:
           all_results: 'Të gjitha'
           required: 'E nevojshme'
@@ -2652,6 +2670,7 @@ sq:
           user_preferences: "Rregullimet e përdoruesit"
           tags: "Etiketat"
           search: "Kërko"
+          groups: "Grupet"
       badges:
         title: Stemat
         new_badge: Stemë e Re
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 412af73d90f..3384e8d34a1 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -142,21 +142,25 @@ sv:
     emails_are_disabled: "All utgående e-post har blivit globalt inaktiverad av en administratör. Inga e-postnotifikationer av något slag kommer att skickas ut."
     bootstrap_mode_enabled: "Du är i bootstrap-läge för att göra lanseringen av din nya webbplats enklare. Alla nya användare kommer att beviljas förtroendenivå 1 och få dagliga sammanfattningar skickade via e-post. Det här stängs automatiskt av när det totala antalet användare överstiger %{min_users}."
     bootstrap_mode_disabled: "Bootstrap-läge otillgängliggörs i 24 timmar."
+    themes:
+      default_description: "Standard"
     s3:
       regions:
-        us_east_1: "Östra USA (N. Virginia)"
-        us_west_1: "Västra USA (N. Kalifornien)"
-        us_west_2: "Västra USA (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Irland)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asien Stillahavsområdet (Singapore)"
-        ap_southeast_2: "Asien Stillahavsområdet (Sydney)"
-        ap_south_1: "Asien Stillahavsområdet (Mumbai)"
         ap_northeast_1: "Asien Stillahavsområdet (Tokyo)"
         ap_northeast_2: "Asien Stillahavsområdet (Seoul)"
-        sa_east_1: "Sydamerika (Sao Paulo)"
+        ap_south_1: "Asien Stillahavsområdet (Mumbai)"
+        ap_southeast_1: "Asien Stillahavsområdet (Singapore)"
+        ap_southeast_2: "Asien Stillahavsområdet (Sydney)"
         cn_north_1: "Kina (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "Sydamerika (Sao Paulo)"
+        us_east_1: "Östra USA (N. Virginia)"
+        us_east_2: "Öster USA (Ohio)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "Västra USA (N. Kalifornien)"
+        us_west_2: "Västra USA (Oregon)"
     edit: 'redigera rubrik och kategori för det här ämnet'
     not_implemented: "Denna funktion har inte implementerats än, vi beklagar!"
     no_value: "Nej"
@@ -346,11 +350,7 @@ sv:
         full_name: 'Fullständigt namn'
         add_members: "Lägg till medlemmar"
         delete_member_confirm: "Ta bort '%{username}' från gruppen '%{group}'?"
-      request_membership_pm:
-        title: "Begäran om medlemskap"
-        body: "Jag skulle vilja ansöka om medlemskap i @%(namn på gruppen)."
       name_placeholder: "Gruppnamn, inga mellanslag, samma regler som för användarnamn"
-      public: "Tillåt användare att delta/lämna gruppen av egen vilja (Kräver gruppen att vara synlig)"
       empty:
         posts: "Det är inga kommentarer från medlemmar i denna grupp"
         members: "Det finns inga medlemmar i denna grupp"
@@ -372,7 +372,6 @@ sv:
       bio: "Om grupp"
       selector_placeholder: "Lägg till medlemmar"
       owner: "ägare"
-      visible: "Gruppen är synlig för alla användare"
       index:
         title: "Grupper"
         empty: "Det finns inga synliga grupper"
@@ -478,7 +477,6 @@ sv:
       mute: "Tysta"
       edit: "Redigera inställningar"
       download_archive:
-        button_text: "Ladda ner mina inlägg"
         confirm: "Är du säker att du vill ladda ner dina inlägg?"
         success: "Nedladdning påbörjad, du kommer bli notifierad via meddelande när processen är klar."
         rate_limit_error: "Inlägg kan laddas ner en gång per dag, försök igen imorgon."
@@ -596,7 +594,6 @@ sv:
         title: "Byt användarnamn"
         confirm: "Om du byter ditt användarnamn kommer alla tidigare citeringar av dina inlägg och @namn-omnämningar att bli trasiga. Är du helt säker på att du vill?"
         taken: "Tyvärr, det användarnamnet är taget."
-        error: "Det uppstod ett problem under bytet av ditt användarnamn."
         invalid: "Det användarnamnet är ogiltigt. Det får bara innehålla siffror och bokstäver"
       change_email:
         title: "Byt e-post"
@@ -971,7 +968,6 @@ sv:
       your_email: "Mailadressen för ditt konto är <b>%{email}</b>."
       accept_invite: "Acceptera inbjudan"
       success: "Ditt konto har skapats och du är nu inloggad."
-      password_label: "Ange lösenord (valfritt)"
     password_reset:
       continue: "Fortsätt till %{site_name}"
     emoji_set:
@@ -1710,10 +1706,6 @@ sv:
         confirm:
           one: "Är du säker på att du vill radera detta inlägg?"
           other: "Är du säker på att du vill radera alla dessa inlägg?"
-      merge:
-        confirm:
-          one: "Är du säker på att du vill sammanfoga inläggen?"
-          other: "Är du säker på att du vill sammanfoga de {{count}} inläggen?"
       revisions:
         controls:
           first: "Första revision"
@@ -1756,8 +1748,6 @@ sv:
       settings: 'Inställningar'
       topic_template: "Ämnesmall"
       tags: "Taggar"
-      tags_allowed_tags: "Taggar som endast kan användas i den här kategorin:"
-      tags_allowed_tag_groups: "Grupptaggar som endast kan användas i den här kategorin:"
       tags_placeholder: "(Valfritt) lista av tillåtna taggar"
       tag_groups_placeholder: "(Valfritt) lista av tillåtna grupptaggar"
       topic_featured_link_allowed: "Tillåt utvalda länkar i denna kategori"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index cc90ff4344e..cd14d7acb4c 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -209,7 +209,6 @@ te:
     directory:
       title: "వాడుకరులు"
     groups:
-      visible: "గుంపు అందరు సభ్యులకు కనిపిస్తుంది"
       title:
         one: "గుంపు"
         other: "గుంపులు"
@@ -314,7 +313,6 @@ te:
       change_username:
         title: "సభ్యనామం మార్చు"
         taken: "క్షమించాలి, ఆ సభ్యనామం వేరొకరు తీసుకున్నారు."
-        error: "మీ సభ్యనామం మార్చడంలో దోషం."
         invalid: "ఆ సభ్యనామం చెల్లనిది. కేవలం సంఖ్యలు, అక్షరాలు మాత్రమే కలిగి ఉండాలి. "
       change_email:
         title: "ఈమెయిల్ మార్చు"
@@ -1481,7 +1479,7 @@ te:
           suspect: 'అనుమానిత సభ్యులు'
         reject_successful:
           one: "వినియోగదారులు విజయవంతంగా "
-          other: "వినియోగదారులు విజయవంతంగా %{సంఖ్య} తిరస్కరింపబడ్డారు.."
+          other: "వినియోగదారులు విజయవంతంగా %{count} తిరస్కరింపబడ్డారు.."
         reject_failures:
           one: "వినియోగదారులు 1 ని తిరస్కరించుటలో వైఫల్యం."
         not_verified: "ద్రువీకరించలేదు"
@@ -1490,7 +1488,7 @@ te:
           text: "చూపు"
       user:
         suspend_failed: "ఈ సభ్యుడిని సస్పెండ్ చేసేప్పుడు ఏదో తేడా జరిగింది.  {{error}}"
-        unsuspend_failed: "ఈ వినియోగదారు వలన ఏదో తొలగింపబడని తప్పు జరిగింది {{దోషం}}"
+        unsuspend_failed: "ఈ వినియోగదారు వలన ఏదో తొలగింపబడని తప్పు జరిగింది {{error}}"
         suspend_duration: "వినియోగదారు ఎంతకాలం నిలిపివేయబడ్డాడు?"
         suspend_duration_units: "(రోజులు)"
         suspend_reason_label: "మీరు ఎందుకు తొలగించబడ్డారు? ఈ పాఠ్యం <b> వినియోగదారును ప్రొఫైల్ పుట మీద ప్రతివారికి </b> కనబడుతుంది, మరియు వినియోగదారుడు లాగిన్‌కు ప్రయత్నించినపుడు చూస్తారు.చిన్నదిగా ఉంచండి."
@@ -1678,7 +1676,7 @@ te:
         grant_badge: బ్యాడ్జి ఇవ్వు
         granted_badges: ఇచ్చిన బ్యాడ్జీలు
         grant: ఇవ్వు
-        no_user_badges: "%{పేరు} ఏ చిహ్నాలు మంజూరు చేయలేదు."
+        no_user_badges: "%{name} ఏ చిహ్నాలు మంజూరు చేయలేదు."
         no_badges: మంజూరు చేసే చిహ్నాలు లేవు.
         none_selected: "ఆరంభించడానికి ఒక బ్యాడ్జీని ఎంచుకోండి."
         allow_title: చిహ్నాన్ని శీర్షికగా వాడుకోవడానికి అనుమతి ఇవ్వండి.
@@ -1704,11 +1702,11 @@ te:
           sample: "నమూనా:"
           grant:
             with: <span class="username">%{వినియోగదారు పేరు}</span>
-            with_post: <span class="username">%{వినియోగదారు పేరు}</span> టపా కొరకు%{లంకె}
+            with_post: <span class="username">%{username}</span> టపా కొరకు%{link}
             with_post_time: <span class="సభ్యుల పేరు">%{username}</span> for post in %{link} at <span class="సమయం">%{time}</span>
       emoji:
         title: "ఇమోజి"
         add: "కొత్త ఇమోజి కలుపు"
         name: "పేరు"
         image: "బొమ్మ"
-        delete_confirm: "మీరు నిజంగా %{పేరు}: ఎమోజీ ని తొలగించాలనుకుంటున్నారా ?"
+        delete_confirm: "మీరు నిజంగా %{name}: ఎమోజీ ని తొలగించాలనుకుంటున్నారా ?"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 64748676da9..7702482e415 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -123,19 +123,19 @@ tr_TR:
     bootstrap_mode_disabled: "Bootstrap modu önümüzdeki 24 saat içinde edilgen olacaktır."
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'bu konunun başlığını ve kategorisini düzenleyin'
     not_implemented: "Bu özellik henüz geliştirilmedi, üzgünüz!"
     no_value: "Hayır"
@@ -317,11 +317,7 @@ tr_TR:
         full_name: 'Tam İsim'
         add_members: "Üyeleri ekle"
         delete_member_confirm: "'%{username}' adlı kullanıcıyı '%{group}' grubundan çıkart?"
-      request_membership_pm:
-        title: "Üyelik isteği"
-        body: "@%{groupName} adlı gruba üye olarak başvurmak istiyorum."
       name_placeholder: "Grup adı, kullanıcı adındaki gibi boşluksuz olmalı"
-      public: "Kullanıcıların gruptan serbest bir şekilde ayrılıp/katılmasına izin ver (grubun görünür olması gerekmekte)"
       empty:
         posts: "Bu grubun üyelerinden konu yok."
         members: "Bu grupta üye bulunmamaktır."
@@ -342,7 +338,6 @@ tr_TR:
       bio: "Grup Hakkında"
       selector_placeholder: "Üye ekle"
       owner: "sahip"
-      visible: "Grup tüm kullanıcılar tarafından görüntülenebiliyor"
       index:
         title: "Gruplar"
         empty: "Görünen hiç bir grup bulunmamaktadır."
@@ -449,7 +444,6 @@ tr_TR:
       mute: "Sustur"
       edit: "Tercihleri Düzenle"
       download_archive:
-        button_text: "Gönderilerimi İndir"
         confirm: "Gönderilerinizi indirmek istediğinize emin misiniz?"
         success: "İndirme başlatıldı, İşlem tamamlandığında mesaj ile bilgilendirileceksiniz."
         rate_limit_error: "Gönderiler günde bir kez indirilebilir, lütfen yarın tekrar deneyin."
@@ -568,7 +562,6 @@ tr_TR:
         title: "Kullanıcı Adını Değiştir"
         confirm: "Kullanıcı adınızı değiştirmeniz halinde, eski gönderilerinizden yapılan tüm alıntılar ve @eskiadınızdaki bahsetmeler bozulacak. Bunu yapmak istediğinize gerçekten emin misiniz?"
         taken: "Üzgünüz, bu kullanıcı adı alınmış."
-        error: "Kullanıcı adınızı değiştirirken bir hata oluştu."
         invalid: "Bu kullanıcı adı geçersiz. Sadece sayı ve harf içermelidir."
       change_email:
         title: "E-posta Adresini Değiştirin"
@@ -1589,9 +1582,6 @@ tr_TR:
       delete:
         confirm:
           other: "Tüm bu gönderileri silmek istediğinize emin misiniz?"
-      merge:
-        confirm:
-          other: "{{count}} adet gönderiyi birleştirmek istediğinize emin misiniz?"
       revisions:
         controls:
           first: "İlk revizyon"
@@ -1625,8 +1615,6 @@ tr_TR:
       settings: 'Ayarlar'
       topic_template: "Konu Şablonu"
       tags: "Etiketler"
-      tags_allowed_tags: "Sadece bu kategoride kullanılabilir etiketler:"
-      tags_allowed_tag_groups: "Yalnızca bu kategoride kullanılabilir etiket grupları:"
       tags_placeholder: "(Seçmeli) izin verilen etiketlerin listesi"
       tag_groups_placeholder: "(Seçmeli) izin verilen etiket gruplarının listesi"
       topic_featured_link_allowed: " Featured link'lere bu kategoride izin ver"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 6830ab3370f..8064e201e93 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -55,6 +55,7 @@ uk:
           other: "%{count} днів тому"
       previous_month: 'Попередній місяць'
       next_month: 'Наступний місяць'
+      placeholder: Виберіть дату
     share:
       topic: 'поширити посилання на цю тему'
       post: 'допис #%{postNumber}'
@@ -67,16 +68,16 @@ uk:
     emails_are_disabled: "Надсилання повідомлень електронною поштою було глобально вимкнено адміністратором. Жодне сповіщення електронною поштою не буде надіслано."
     s3:
       regions:
-        us_west_2: "США Захід (Орегон)"
-        eu_west_1: "ЄС (Ірландія)"
-        eu_central_1: "ЄС (Франкфурт)"
-        ap_southeast_1: "Азія (Сингапур)"
-        ap_southeast_2: "Азія (Сідней)"
-        ap_south_1: "Азія (Мумбай)"
         ap_northeast_1: "Азія (Токіо)"
         ap_northeast_2: "Азія (Сеул)"
-        sa_east_1: "Південна Америка (Сан Паоло)"
+        ap_south_1: "Азія (Мумбай)"
+        ap_southeast_1: "Азія (Сингапур)"
+        ap_southeast_2: "Азія (Сідней)"
         cn_north_1: "Китай (Пекін)"
+        eu_central_1: "ЄС (Франкфурт)"
+        eu_west_1: "ЄС (Ірландія)"
+        sa_east_1: "Південна Америка (Сан Паоло)"
+        us_west_2: "США Захід (Орегон)"
     edit: 'редагувати назву та категорію цієї теми'
     not_implemented: "Цей функціонал ще не реалізовано, даруйте!"
     no_value: "Ні"
@@ -251,7 +252,6 @@ uk:
       add: "Додати"
       closed_group: Закрита Група
       selector_placeholder: "Додати учасників"
-      visible: "Група видна всім користувачам"
       title:
         one: "група"
         few: "групи"
@@ -317,8 +317,6 @@ uk:
       profile: "Профіль"
       mute: "Mute"
       edit: "Редагувати налаштування"
-      download_archive:
-        button_text: "Завантажити мої дописи"
       new_private_message: "Нове повідомлення"
       private_message: "Повідомлення"
       private_messages: "Повідомлення"
@@ -391,7 +389,6 @@ uk:
       change_username:
         title: "Зміна імені користувача"
         taken: "Даруйте, це ім'я користувача вже зайняте."
-        error: "Під час зміни імені користувача трапилася помилка."
         invalid: "Таке ім'я користувача не підійде. Воно має містити лише цифри та літери"
       change_email:
         title: "Зміна адреси електронної пошти"
@@ -1324,6 +1321,18 @@ uk:
           body: "Тіло"
           revert: "Повернути зміни"
           revert_confirm: "Чи впевнені ви, що хочете повернути ваші зміни?"
+        theme:
+          upload: "Завантажити"
+          about_theme: "Про тему"
+          license: "Ліцензія"
+          update_to_latest: "Оновити до останьої"
+          add: "Додати"
+          scss:
+            text: "CSS"
+          head_tag:
+            text: "</head>"
+          body_tag:
+            text: "</body>"
         colors:
           title: "Кольори"
           long_title: "Схеми Кольорів"
@@ -1332,6 +1341,7 @@ uk:
           delete_confirm: "Видалити цю кольорову схему?"
           undo: "скасувати"
           undo_title: "Скасувати ваші зміни цього кольору з часу останнього збереження."
+          revert: "Повернути"
           primary:
             name: 'основний'
           secondary:
@@ -1349,6 +1359,7 @@ uk:
           success:
             name: 'успіх'
           love:
+            name: 'любов'
             description: "Колір кнопки \"Подобається\"."
       email:
         title: "Листів"
@@ -1419,6 +1430,8 @@ uk:
           block: "block"
           do_nothing: "do nothing"
         staff_actions:
+          all: "всі"
+          filter: "Filter:"
           title: "Дії персоналу"
           clear_filters: "Показати все"
           staff_user: "Член персоналу"
@@ -1457,6 +1470,8 @@ uk:
             revoke_admin: "відкликати адміністраторство"
             grant_moderation: "зробити модератором"
             revoke_moderation: "відкликати модераторство"
+            deleted_tag: "видалити тег"
+            lock_trust_level: "заблокувати рівень довіри"
         screened_emails:
           title: "Screened Emails"
           description: "Коли хтось намагатиметься створити новий обліковий запис, наступні електронні скриньки буде перевірено, і реєстрацію заблоковано, або вжито якихось інших дій."
@@ -1613,6 +1628,7 @@ uk:
           confirm: 'Підтвердження'
       site_text:
         edit: 'редагувати'
+        revert: "Повернути зміни"
         go_back: "Повернутись до пошуку"
         show_overriden: 'Показувати тільки перевизначені'
       site_settings:
@@ -1643,9 +1659,14 @@ uk:
           uncategorized: 'Інше'
           backups: "Backups"
           login: "Вхід"
+          plugins: "Плагіни"
           user_preferences: "Налаштування"
+          tags: "Теги"
           search: "Пошук"
+          groups: "Групи"
       badges:
+        title: Значки
+        new_badge: Новий значок
         new: Новий
         name: Ім'я
         badge: Значок
@@ -1711,7 +1732,7 @@ uk:
       done: "Виконано"
       back: "Назад"
       next: "Далі"
-      step: "%{поточних} з %{загальних}"
+      step: "%{current} з %{total}"
       upload: "Вивантажити"
       uploading: "Вивантаження..."
       quit: "Можливо пізніше"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index c7491bead3c..324705cd3b8 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -30,42 +30,42 @@ ur:
       full_no_year_no_time: "MMMM Do"
       long_with_year: "MMM D, YYYY h:mm a"
       long_with_year_no_time: "MMM D, YYYY"
-      wrap_ago: "٪{تاریخ} پہلے"
+      wrap_ago: "٪{date} پہلے"
       tiny:
         less_than_x_seconds:
           one: "< 1 سیکنڈ"
-          other: "< ٪{گنتی} سیکنڈ"
+          other: "< ٪{count} سیکنڈ"
         x_seconds:
           one: "1 سیکنڈ"
-          other: "٪{گنتی} سیکنڈ"
+          other: "٪{count} سیکنڈ"
         x_minutes:
           one: "1 منٹ"
-          other: "٪{گنتی} منٹس"
+          other: "٪{count} منٹس"
         about_x_hours:
           one: "1 گھنٹا"
-          other: "٪{گنتی} گھنٹے"
+          other: "٪{count} گھنٹے"
         x_days:
           one: "1 دن"
-          other: "٪{گنتی} دن"
+          other: "٪{count} دن"
         about_x_years:
           one: "1 سال"
-          other: "٪{گنتی} سال"
+          other: "٪{count} سال"
         over_x_years:
           one: "> 1 سال"
-          other: "> ٪{گنتی} سال"
+          other: "> ٪{count} سال"
         almost_x_years:
           one: "1 سال"
-          other: "٪{گنتی} سال"
+          other: "٪{count} سال"
       medium:
         x_minutes:
           one: "1 منٹ"
-          other: "%{گنتی} منٹس"
+          other: "%{count} منٹس"
         x_hours:
           one: "1 گھنٹا"
-          other: "%{گنتی} گھنٹے"
+          other: "%{count} گھنٹے"
         x_days:
           one: "1 دن"
-          other: "%{گنتی} دن"
+          other: "%{count} دن"
       medium_with_ago:
         x_minutes:
           one: "1 منٹ قبل"
@@ -75,22 +75,22 @@ ur:
           other: " %{count} گھنٹے قبل "
         x_days:
           one: "1 دن قبل"
-          other: "%{گنتی} دن قبل"
+          other: "%{count} دن قبل"
       later:
         x_days:
           one: "1 دن بعد"
-          other: "%{گنتی} دن بعد"
+          other: "%{count} دن بعد"
         x_months:
           one: "1 مہینے بعد"
-          other: "%{گنتی} مہینے بعد"
+          other: "%{count} مہینے بعد"
         x_years:
           one: "1 سال بعد"
-          other: "%{گنتی} سال بعد"
+          other: "%{count} سال بعد"
       previous_month: 'پچھلے ماہ'
       next_month: 'اگلے ماہ'
     share:
       topic: 'اس ٹاپک کا لنک شیئرکریں'
-      post: 'پوسٹ #%{پوسٹنمبر}'
+      post: 'پوسٹ #%{postNumber}'
       close: 'بند کریں'
       twitter: 'ٹوئٹر پر اس لنک کو شیئرکریں'
       facebook: 'فیس بک پر اس لنک کو شیئرکریں'
@@ -132,25 +132,25 @@ ur:
     bootstrap_mode_disabled: "بوٹسٹریپ کا موڈ اگلے 24 گھنٹوں میں غیر فعال کر دیا جائے گا۔"
     s3:
       regions:
-        us_east_1: "امریکی مشرق (شمالی ورجینیا)"
-        us_west_1: "امریکی مغرب (شمالی کیلی فورنیا)"
-        us_west_2: "امریکی مغرب (اوریگن)"
-        us_gov_west_1: "اے ڈبلیو ایس گَو کلاوڈ (امریکہ)"
-        eu_west_1: "یورپی یونین (آئر لینڈ)"
-        eu_central_1: "یورپی یونین (فرینکفرٹ)"
-        ap_southeast_1: "ایشیا پیسفک (سنگاپور)"
-        ap_southeast_2: "ایشیا پیسفک (سڈنی)"
-        ap_south_1: "ایشیا پیسفک (ممبئی)"
         ap_northeast_1: "ایشیا پیسفک (ٹوکیو)"
         ap_northeast_2: "ایشیا پیسفک (سیول)"
-        sa_east_1: "ایشیا پیسفک (ساؤ پالو)"
+        ap_south_1: "ایشیا پیسفک (ممبئی)"
+        ap_southeast_1: "ایشیا پیسفک (سنگاپور)"
+        ap_southeast_2: "ایشیا پیسفک (سڈنی)"
         cn_north_1: "چین (بیجنگ)"
+        eu_central_1: "یورپی یونین (فرینکفرٹ)"
+        eu_west_1: "یورپی یونین (آئر لینڈ)"
+        sa_east_1: "ایشیا پیسفک (ساؤ پالو)"
+        us_east_1: "امریکی مشرق (شمالی ورجینیا)"
+        us_gov_west_1: "اے ڈبلیو ایس گَو کلاوڈ (امریکہ)"
+        us_west_1: "امریکی مغرب (شمالی کیلی فورنیا)"
+        us_west_2: "امریکی مغرب (اوریگن)"
     edit: 'اس ٹاپک کے عنوان اور زمرے میں ترمیم کریں'
     not_implemented: "یہ خصوصیت ابھی تک لاگو نہیں کی گئی، معضرت!"
     no_value: "نہیں "
     yes_value: "ہاں "
     generic_error: "معذرت، ایک تکنیکی خرابی کا سامنا کرنا پڑا ہے۔"
-    generic_error_with_reason: "ایک تکنیکی خرابی پیش آئی: %{خرابی}"
+    generic_error_with_reason: "ایک تکنیکی خرابی پیش آئی: %{error}"
     sign_up: "سائن اپ"
     log_in: "لاگ ان"
     age: "عمر "
@@ -183,17 +183,17 @@ ur:
     weekly: "ہفتہ وار "
     every_two_weeks: "ہر دو ہفتے"
     every_three_days: "ہر تین دن"
-    max_of_count: "زیادہ سے زیادہ {{شمار}}"
+    max_of_count: "زیادہ سے زیادہ {{count}}"
     alternation: "یا "
     character_count:
-      one: "{{شمار}} حرف"
-      other: "{{شمار}} حروف"
+      one: "{{count}} حرف"
+      other: "{{count}} حروف"
     suggested_topics:
       title: "تجویز کیے گئے ٹاپک"
       pm_title: "تجویز کیے گئے پیغامات"
     about:
       simple_title: "بارے میں"
-      title: "٪{عنوان} کے بارے میں"
+      title: "٪{title} کے بارے میں"
       stats: "سائٹ کے اعدادوشمار"
       our_admins: "ہمارے ایڈمن"
       our_moderators: "ہمارے ماڈریٹرز"
@@ -222,14 +222,14 @@ ur:
       remove: "بُک مارک ہٹائیں"
       confirm_clear: "کیا آپ کو یقین ہے کہ آپ اِس ٹاپک سے تمام بُک مارکس ہٹانا چاہتے ہیں؟"
     topic_count_latest:
-      one: "{{شمار}} نئے اور اپ ڈیٹ کیے گئے ٹاپک۔"
-      other: "{{شمار}} نئے اور اپ ڈیٹ کیے گئے ٹاپک۔"
+      one: "{{count}} نئے اور اپ ڈیٹ کیے گئے ٹاپک۔"
+      other: "{{count}} نئے اور اپ ڈیٹ کیے گئے ٹاپک۔"
     topic_count_unread:
-      one: "{{شمار}} نہ پڑھے گئے ٹاپک۔"
-      other: "{{شمار}} نہ پڑھے گئے ٹاپک۔"
+      one: "{{count}} نہ پڑھے گئے ٹاپک۔"
+      other: "{{count}} نہ پڑھے گئے ٹاپک۔"
     topic_count_new:
-      one: "{{شمار}} نئے ٹاپک۔"
-      other: "{{شمار}} نئے ٹاپک۔"
+      one: "{{count}} نئے ٹاپک۔"
+      other: "{{count}} نئے ٹاپک۔"
     click_to_show: "ظاہر کرنے کے لئے کلک کریں۔"
     preview: "پیشگی دیکھنا"
     cancel: "منسوخ"
@@ -269,27 +269,27 @@ ur:
         one: "اِس ٹاپک کی <b>1</b> پوسٹس منظوری کا انتظار کر رہی ہیں"
         other: "اِس ٹاپک کی <b>{{count}}</b> پوسٹس منظوری کا انتظار کر رہی ہیں"
       confirm: "تبدیلیاں محفوظ کریں"
-      delete_prompt: "کیا آپ <b>%{صارف نام}</b> حذف کرنا چاہتے ہیں؟ اِس طرح سے اُن کی تمام پوسٹس حذف ہو جائیں گی اور  اُن کے ای میل اور IP ایڈریس کو بلاک کردیا جائے گا۔"
+      delete_prompt: "کیا آپ <b>%{username}</b> حذف کرنا چاہتے ہیں؟ اِس طرح سے اُن کی تمام پوسٹس حذف ہو جائیں گی اور  اُن کے ای میل اور IP ایڈریس کو بلاک کردیا جائے گا۔"
       approval:
         title: "پوسٹ کو منظوری کی ضرورت ہے"
         description: "ہمیں آپ کی نئی پوسٹ موصول ہو چکی ہے لیکن یہ ظاہر ہونے سے پہلے ایک منتظم سے منظور ہونا ضروری ہے۔ براہ مہربانی صبر کریں۔"
         pending_posts:
           one: "آپ کی <strong>1</strong> پوسٹ زیر التوا ہیں۔"
-          other: "آپ کی <strong>{{شمار}}</strong> پوسٹس زیرِاِلتوَاء ہیں۔"
+          other: "آپ کی <strong>{{count}}</strong> پوسٹس زیرِاِلتوَاء ہیں۔"
         ok: "ٹھیک"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{صارف}}</a> نے <a href='{{topicUrl}}'>ٹاپک</a> پوسٹ کیا"
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> نے <a href='{{topicUrl}}'>ٹاپک</a> پوسٹ کیا"
       you_posted_topic: "<a href='{{userUrl}}'>آپ</a> نے <a href='{{topicUrl}}'>ٹاپک</a> پوسٹ کیا"
-      user_replied_to_post: "<a href='{{userUrl}}'>{{صارف}}</a> نے <a href='{{postUrl}}'>{{post_number}}</a> کا جواب دیا"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> نے <a href='{{postUrl}}'>{{post_number}}</a> کا جواب دیا"
       you_replied_to_post: "<a href='{{userUrl}}'>آپ</a> نے <a href='{{postUrl}}'>{{post_number}}</a> کا جواب دیا"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{صارف}}</a> نے <a href='{{topicUrl}}'>ٹاپک</a> کا جواب دیا"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> نے <a href='{{topicUrl}}'>ٹاپک</a> کا جواب دیا"
       you_replied_to_topic: "<a href='{{userUrl}}'>آپ</a> نے <a href='{{topicUrl}}'>ٹاپک</a> کا جواب دیا"
-      user_mentioned_user: "<a href='{{user1Url}}'>{{صارف}}</a> نے <a href='{{user2Url}}'>{{another_user}}</a> کا ذکر کیا"
-      user_mentioned_you: "<a href='{{user1Url}}'>{{صارف}}</a> نے <a href='{{user2Url}}'>آپ</a> کا ذکر کیا"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> نے <a href='{{user2Url}}'>{{another_user}}</a> کا ذکر کیا"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> نے <a href='{{user2Url}}'>آپ</a> کا ذکر کیا"
       you_mentioned_user: "<a href='{{user1Url}}'>آپ</a> نے <a href='{{user2Url}}'>{{another_user}}</a> کا ذکر کیا"
-      posted_by_user: "<a href='{{userUrl}}'>{{صارف}}</a> نے پوسٹ کیا"
+      posted_by_user: "<a href='{{userUrl}}'>{{user}}</a> نے پوسٹ کیا"
       posted_by_you: "<a href='{{userUrl}}'>آپ</a> نے پوسٹ کیا"
-      sent_by_user: "<a href='{{userUrl}}'>{{صارف}}</a> نے بھیجا"
+      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a> نے بھیجا"
       sent_by_you: "<a href='{{userUrl}}'>آپ</a> نے بھیجا"
     directory:
       filter_name: "صارفین کے ناموں کے حساب سے فلٹر کریں"
@@ -310,7 +310,7 @@ ur:
       posts_read_long: "پڑھی گئیں پوسٹس"
       total_rows:
         one: "1 صارف"
-        other: "%{شمار} صارفین"
+        other: "%{count} صارفین"
     group_histories:
       actions:
         change_group_setting: "گروپ کی سیٹِنگ تبدیل کریں"
@@ -333,12 +333,8 @@ ur:
         title: 'گروپ میں ترمیم کریں'
         full_name: 'پورا نام'
         add_members: "اراکین شامل کریں"
-        delete_member_confirm: "'٪ {گروپ}' گروپ سے '٪ {صارف نام}' ہٹائیں؟"
-      request_membership_pm:
-        title: "رکنیت کی درخواست"
-        body: "میں @٪{گروپ کا نام} میں رکنیت کی درخواست دینا چاہتا ہوں۔"
+        delete_member_confirm: "'٪ {username}' گروپ سے '٪ {group}' ہٹائیں؟"
       name_placeholder: "گروپ کا نام، کوئی خالی جگہ نہیں، نامِ صارفین کے اصولوں کے مطابق"
-      public: "صارفین کو گروپ میں شامل ہونے یا اُسے چھوڑنے کی آزادانہ اجازت دی جائے (اِس کے لئیے گرپ کا ظاہر ہونا ضرورے ہے)"
       empty:
         posts: "اس گروپ کے ارکان کی طرف سے کوئی پوسٹس نہیں ہیں۔"
         members: "اس گروپ میں کوئی ارکان ہیں۔"
@@ -359,7 +355,6 @@ ur:
       bio: "گروپ کے بارے میں"
       selector_placeholder: "ممبران شامل کریں"
       owner: "مالِک"
-      visible: "گروپ تمام صارفین کو دکھائی دے"
       index:
         title: "گروپس"
         empty: "کوئی نظر آنے والے گروپ موجود نہیں ہیں۔"
@@ -442,10 +437,10 @@ ur:
       subcategories: "ذیلی زمرے"
       topic_sentence:
         one: "1 ٹاپک"
-        other: "%{شمار} ٹاپک"
+        other: "%{count} ٹاپک"
       topic_stat_sentence:
-        one: "%{شمار} نئے موضوعات پچھلے %{یونٹ} میں۔"
-        other: "%{شمار} نئے موضوعات پچھلے %{یونٹ} میں۔"
+        one: "%{count} نئے موضوعات پچھلے %{unit} میں۔"
+        other: "%{count} نئے موضوعات پچھلے %{unit} میں۔"
     ip_lookup:
       title: IP ایڈریس کا سراغ
       hostname: ہوسٹ کا نام
@@ -454,7 +449,7 @@ ur:
       organisation: ادارہ
       phone: فون
       other_accounts: "اسی IP ایڈریس والے دوسرے اکاؤنٹس:"
-      delete_other_accounts: "%{شمار} حذف کریں"
+      delete_other_accounts: "%{count} حذف کریں"
       username: "صارف کا نام"
       trust_level: "TL"
       read_time: "پڑھنے کیلئے اِستعمال ہونے والا وقت"
@@ -464,12 +459,11 @@ ur:
     user_fields:
       none: "(ایک آپشن منتخب کریں)"
     user:
-      said: "{{صارف کا نام}}:"
+      said: "{{username}}:"
       profile: "پروفائل"
       mute: "خاموش کردیں"
       edit: "ترجیحات میں ترمیم کردیں"
       download_archive:
-        button_text: "میری پوسٹس ڈاؤن لوڈ کریں"
         confirm: "کیا آپ واقعی اپنی پوسٹس ڈاؤن لوڈ کرنا چاہتے ہیں؟"
         success: "ڈاؤن لوڈ کا آغاز کر دیا گیا ہے، عمل مکمل ہونے پر آپ کو پیغام کے ذریعے مطلع کر دیا جائے گا۔"
         rate_limit_error: "پوسٹس فی دن ایک بار ہی ڈاؤن لوڈ کی جا سکتی ہیں،  براہ مہربانی کل دوبارہ کوشش کریں۔"
@@ -502,12 +496,12 @@ ur:
       external_links_in_new_tab: "تمام بیرونی ویب سائٹ کے لنکس ایک نئے ٹیب میں کھولیں"
       enable_quoting: "روشنی ڈالے گئے ٹَیکسٹ کے لئے اقتباسی جواب فعال کریں"
       change: "بدلیں"
-      moderator: "{{صارف}} ایک ماڈریٹر ہے"
-      admin: "{{صارف}} ایک ایڈمِن ہے"
+      moderator: "{{user}} ایک ماڈریٹر ہے"
+      admin: "{{user}} ایک ایڈمِن ہے"
       moderator_tooltip: "یہ صارف ایک ماڈریٹر ہے"
       admin_tooltip: "یہ صارف ایک ایڈمِن ہے"
       blocked_tooltip: "یہ صارف بلاک کیا ہوا ہے"
-      suspended_notice: "ہ صارف {{تاریخ}} تک معطل ہے۔"
+      suspended_notice: "ہ صارف {{date}} تک معطل ہے۔"
       suspended_reason: "وجہ:"
       github_profile: "گِٹ حَب"
       email_activity_summary: "سرگرمی کا خلاصہ"
@@ -586,7 +580,6 @@ ur:
         title: "صارف کا نام تبدیل کریں"
         confirm: "اگر آپ اپنا صارف نام تبدیل کرتے ہیں تو آپ کی پوسٹوں کی پچھلی تمام اقتباسات اور @نام زکر ٹوٹ جائیں گے۔ کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
         taken: "معذرت، یِہ صارف نام پہلے سے لیا جاچکا ہے۔"
-        error: "آپ کا صارف نام تبدیل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         invalid: "یہ صارف نام غلط ہے۔ اِس میں صرف ہندسوں اور حروف کو شامل کیا جا سکتا ہے"
       change_email:
         title: "اِی میل تبدیل کریں"
@@ -620,7 +613,7 @@ ur:
         frequency_immediately: "جس بارے میں ہم آپ کو اِی میل کر رہے ہیں، اگر آپ نے نہیں پڑھی ہوئی تو ہم فوری طور پر آپ کو اِی میل کریں گے۔"
         frequency:
           one: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ ایک منٹ میں نہ دیکھا ہو۔"
-          other: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ {{شمار}} منٹ میں نہ دیکھا ہو۔"
+          other: "ہم آپ کو اِی میل کریں گے صرف اُس صور میں کہ ہم نے آپ کو گزشتہ {{count}} منٹ میں نہ دیکھا ہو۔"
       name:
         title: "نام"
         instructions: "آپ کا پورا نام (اختیاری)"
@@ -630,9 +623,9 @@ ur:
       username:
         title: "صارف کا نام"
         instructions: "منفرد، کوئی خالی جگہ نہیں، مختصر"
-        short_instructions: "لوگ آپ کا زکر @{{صارف نام}} کے طور پر کر سکتے ہیں"
+        short_instructions: "لوگ آپ کا زکر @{{username}} کے طور پر کر سکتے ہیں"
         available: "آپ کا صارف نام دستیاب ہے"
-        not_available: "دستیاب نہیں۔ اِستعمال کریں {{تجویز}}؟"
+        not_available: "دستیاب نہیں۔ اِستعمال کریں {{suggestion}}؟"
         not_available_no_suggestion: "دستیاب نہیں"
         too_short: "آپ کا صارف نام بہت چھوٹا ہے"
         too_long: "آپ کا صارف نام بہت طویل ہے"
@@ -709,14 +702,14 @@ ur:
         none: "ظاہر کرنے کے لئے کوئی زیرِاِلتوَاء دعوتیں نہیں ہیں۔"
         truncated:
           one: "پہلی دعوت دکھائی جا رہی ہیں۔"
-          other: "پہلی {{شمار}} دعوتیں دکھائی جا رہی ہیں۔"
+          other: "پہلی {{count}} دعوتیں دکھائی جا رہی ہیں۔"
         redeemed: "دعوتیں جِن سے فائدہ اٹھا لیا گیا ہے"
         redeemed_tab: "فائدہ اٹھا لیا گیا"
-        redeemed_tab_with_count: "فائدہ اٹھا لیا گیا ({{شمار}})"
+        redeemed_tab_with_count: "فائدہ اٹھا لیا گیا ({{count}})"
         redeemed_at: "فائدہ اٹھا لیا گیا"
         pending: "زیرِاِلتوَاء دعوتیں"
         pending_tab: "زیرِاِلتوَاء"
-        pending_tab_with_count: "زیرِاِلتوَاء ({{شمار}})"
+        pending_tab_with_count: "زیرِاِلتوَاء ({{count}})"
         topics_entered: " دیکھ لیے گئے ٹاپک"
         posts_read_count: "پڑھی گئیں پوسٹس"
         expired: "اِس دعوت کی میعاد ختم ہو چکی ہے۔"
@@ -745,7 +738,7 @@ ur:
         same_as_username: "آپ کا پاسورڈ  وہی ہے جو آپ کا صارف نام ہے۔"
         same_as_email: "آپ کا پاسورڈ وہی ہے جو آپ کا اِی میل ہے۔"
         ok: "آپ کا پاسورڈ صحیح لگ رہا ہے"
-        instructions: "کم از کم {شمار} حروف"
+        instructions: "کم از کم %{count} حروف"
       summary:
         title: "خلاصہ"
         stats: "اعدادوشمار"
@@ -815,7 +808,7 @@ ur:
       desc:
         network: " براہِ مہربانی اپنا کنکشن چیک کریں"
         network_fixed: "لگتا ہے یہ وآپس آ گیا"
-        server: "خرابی کوڈ: {{اسٹیٹس}}"
+        server: "خرابی کوڈ: {{status}}"
         forbidden: "آپ کو یہ دیکھنے کی اجازت نہیں ہے۔"
         not_found: "افوہ، ایپلیکیشن نے ایک ایسے URL کو لوڈ کرنے کی کوشش جو غیر موجود ہے۔"
         unknown: "کچھ غلط ہو گیا۔"
@@ -839,7 +832,7 @@ ur:
       exceeded: "<b>٪{relativeAge}</b> – <a href='%{url}' target='_blank'>٪{rate}</a> ٪{siteSettingRate} کی سائٹ سیٹِنگ لِمٹ سے تجاوز کر گئی۔"
       rate:
         one: "1 خرابی/٪{مدت}"
-        other: "٪{شمار} خرابیاں/٪{مدت}"
+        other: "٪{count} خرابیاں/٪{duration}"
     learn_more: "اورجانیے..."
     all_time: 'کُل'
     all_time_desc: 'کُل ٹاپک بنائے گئے'
@@ -879,8 +872,8 @@ ur:
     private_message_info:
       title: "پیغام"
       invite: "دوسروں کو مدعو کریں..."
-      remove_allowed_user: "کیا آپ واقعی اِس پیغام سے {{نام}} ہٹانا چاہتے ہیں؟"
-      remove_allowed_group: "کیا آپ واقعی اِس پیغام سے {{نام}} ہٹانا چاہتے ہیں؟"
+      remove_allowed_user: "کیا آپ واقعی اِس پیغام سے {{name}} ہٹانا چاہتے ہیں؟"
+      remove_allowed_group: "کیا آپ واقعی اِس پیغام سے {{name}} ہٹانا چاہتے ہیں؟"
     email: 'اِی میل'
     username: 'صارف نام'
     last_seen: 'دیکھا گیا'
@@ -897,11 +890,11 @@ ur:
       action: "میں اپنا پاسورڈ بھول گیا"
       invite: "اپنا صارف نام یا اِی میل ایڈریس درج کریں، اور ہم آپ کو ایک پاسورڈ رِی سَیٹ ایمیل بھیج دیں گے۔"
       reset: "پاسورڈ رِی سَیٹ کریں"
-      complete_username: "اگر کوئی اکاؤنٹ صارف نام <b>٪{صارف نام}</b> سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
+      complete_username: "اگر کوئی اکاؤنٹ username <b>٪{username}</b> سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
       complete_email: "اگر کوئی اکاؤنٹ <b>٪{اِیمیل}</b> سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
-      complete_username_found: "ہمیں ایک اکاؤنٹ ملا ہے جو صارف نام <b>٪{صارف نام}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
+      complete_username_found: "ہمیں ایک اکاؤنٹ ملا ہے جو username <b>٪{username}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
       complete_email_found: "ہمیں ایک اکاؤنٹ ملا ہے جو <b>٪{اِیمیل}</b> سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔"
-      complete_username_not_found: "کوئی اکاؤنٹ صارف نام <b>٪{صارف نام}</b> سے میچ نہیں کرتا"
+      complete_username_not_found: "کوئی اکاؤنٹ username <b>٪{username}</b> سے میچ نہیں کرتا"
       complete_email_not_found: "کوئی اکاؤنٹ <b>٪{اِیمیل}</b> سے میچ نہیں کرتا"
     login:
       title: "لاگ اِن"
@@ -957,7 +950,6 @@ ur:
       your_email: "آپ کے اکاؤنٹ کا اِیمیل ایڈریس <b>٪{اِیمیل}</b> ہے۔"
       accept_invite: "دعوت قبول کریں"
       success: "آپ کا اکاؤنٹ بنا دیا گیا ہے اور اب آپ لاگ اِن کر سکتے ہیں۔"
-      password_label: "پاسورڈ مقرر کریں (اختیاری)"
     password_reset:
       continue: "{SITE_NAME}٪ پر جاری رکھیں"
     emoji_set:
@@ -990,15 +982,15 @@ ur:
       similar_topics: "آپ کا ٹاپک ملتا ہے..."
       drafts_offline: "ڈرافٹس آف لائن"
       group_mentioned:
-        one: "{{گروپ}} کا ذکر کر کہ، آپ <a href='{{group_link}}'>1 شخص</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
-        other: "{{گروپ}} کا ذکر کر کہ، آپ <a href='{{group_link}}'>{{شمار}} لوگوں</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
+        one: "{{group}} کا ذکر کر کہ، آپ <a href='{{group_link}}'>1 شخص</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
+        other: "{{group}} کا ذکر کر کہ، آپ <a href='{{group_link}}'>{{count}} لوگوں</a> کو مطلع کرنے لگے ہیں - کیا آپ واقعی یہ کرنا چاہتے ہیں؟"
       cannot_see_mention:
-        category: "آپ نے {{صارف نام}} کا زکر کیا ہے لیکن چونکہ اُن کو اِس زمرے تک رسائی حاصل نہیں، اُن کو مطلع نہیں کیا جائے گا۔ آپ کو انہیں ایک ایسے گروپ میں شامل کرنے کی ضرورت ہے جسے اِس زمرے تک رسائی حاصل ہے۔"
-        private: "آپ نے {{صارف نام}} کا زکر کیا ہے لیکن چونکہ وہ یہ ذاتی پیغام نہیں دیکھ سکتے اُن کو مطلع نہیں کیا جائے گا۔ آپ کو اُنہیں اِس ذاتی پیغام میں مدعو کرنے کی ضرورت ہے۔"
+        category: "آپ نے {{username}} کا زکر کیا ہے لیکن چونکہ اُن کو اِس زمرے تک رسائی حاصل نہیں، اُن کو مطلع نہیں کیا جائے گا۔ آپ کو انہیں ایک ایسے گروپ میں شامل کرنے کی ضرورت ہے جسے اِس زمرے تک رسائی حاصل ہے۔"
+        private: "آپ نے {{username}} کا زکر کیا ہے لیکن چونکہ وہ یہ ذاتی پیغام نہیں دیکھ سکتے اُن کو مطلع نہیں کیا جائے گا۔ آپ کو اُنہیں اِس ذاتی پیغام میں مدعو کرنے کی ضرورت ہے۔"
       error:
         title_missing: "عنوان درکار ہے"
         title_too_short: "عنوان میں کم از کم {{min}} حروف ہونا ضروری ہے"
-        title_too_long: "عنوان {{میکس}} حروف سے زیادہ نہیں ہو سکتا"
+        title_too_long: "عنوان {{max}} حروف سے زیادہ نہیں ہو سکتا"
         post_missing: "پوسٹ خالی نہیں ہو سکتی"
         post_length: "پوسٹ میں کم از کم {{min}} حروف ہونا ضروری ہے"
         try_like: 'کیا آپ نے <i class="fa fa-heart"></i> بٹن اِستعمال کیا ہے؟'
@@ -1053,7 +1045,7 @@ ur:
       toggler: "کمپوزر پینل چھپائیں یا دکھائیں"
       modal_ok: "ٹھیک"
       modal_cancel: "منسوخ"
-      cant_send_pm: "معذرت، آپ ٪{صارف نام} کو پیغام نہیں بھیج سکتے۔"
+      cant_send_pm: "معذرت، آپ ٪{username} کو پیغام نہیں بھیج سکتے۔"
       yourself_confirm:
         title: "کیا آپ وصول کنندگان کو شامل کرنا بھول گئے؟"
         body: "اِس وقت یہ پیغام صرف اپنے آپ کو بھیجا جا رہا ہے!"
@@ -1064,28 +1056,28 @@ ur:
       empty: "کوئی اطلاعات نہیں ملیں۔"
       more: "پرانی اطلاعات دیکھیے"
       total_flagged: "کُل فلَیگ کی گئی پوسٹس"
-      mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      posted: "<i title='posted' class='fa fa-reply'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      liked_2: "<i title='liked' class='fa fa-heart'></i><p><span>{{صارف نام}}، {{صارف نام2}}</span> {{وضاحت}}</p>"
+      mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{ نام}}</span> {{description}}</p>"
+      group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
+      quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
+      replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
+      posted: "<i title='posted' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
+      edited: "<i title='edited' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
+      liked: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
+      liked_2: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}، {{صارف نام2}}</span> {{description}}</p>"
       liked_many:
-        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{صارف نام}}، {{صارف نام2}} اور 1 دوسرا</span> {{وضاحت}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{صارف نام}}، {{صارف نام2}} اور {{شمار}} دوسرے</span> {{وضاحت}}</p>"
-      private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      invited_to_private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{صارف نام}}</span> نے آپ کی دعوت قبول کرلی</p>"
-      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{صارف نام}}</span> {{وضاحت}} منتقل کر دیا</p>"
-      linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{صارف نام}}</span> {{وضاحت}}</p>"
-      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>'{{وضاحت}}' حاصل کیا</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>نیا ٹاپک</span> {{وضاحت}}</p>"
+        one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}، {{صارف نام2}} اور 1 دوسرا</span> {{description}}</p>"
+        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username2}}، {{username}} اور {{count}} دوسرے</span> {{description}}</p>"
+      private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
+      invited_to_private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
+      invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
+      invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> نے آپ کی دعوت قبول کرلی</p>"
+      moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> {{description}} منتقل کر دیا</p>"
+      linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
+      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>'{{description}}' حاصل کیا</p>"
+      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>نیا ٹاپک</span> {{description}}</p>"
       group_message_summary:
-        one: "i title='messages in group inbox' class='fa fa-group'></i><p> آپ کے {{گروپ_نام}} اِن باکس میں {{شمار}} پیغام</p>"
-        other: "i title='messages in group inbox' class='fa fa-group'></i><p> آپ کے {{گروپ_نام}} اِن باکس میں {{شمار}} پیغامات</p>"
+        one: "i title='messages in group inbox' class='fa fa-group'></i><p> آپ کے {{group_name}} اِن باکس میں {{count}} پیغام</p>"
+        other: "i title='messages in group inbox' class='fa fa-group'></i><p> آپ کے {{group_name}} اِن باکس میں {{count}} پیغامات</p>"
       alt:
         mentioned: "کی طرف سے ذکر کیا گیا"
         quoted: "کی طرف سے اقتباس کیا گیا"
@@ -1102,13 +1094,13 @@ ur:
         granted_badge: "بَیج عطا کیا"
         group_message_summary: "گروپ اِن باکس میں پیغامات"
       popup:
-        mentioned: '{{صارف نام}} نے آپ کا تذکرہ "{{ٹاپک}}" میں کیا - {{site_title}}'
-        group_mentioned: '{{صارف نام}} نے آپ کا تذکرہ "{{ٹاپک}}" میں کیا - {{site_title}}'
-        quoted: '{{صارف نام}} نے "{{ٹاپک}}" میں آپ کا حوالا دیا - {{site_title}}'
-        replied: '{{صارف نام}} نے "{{ٹاپک}}" میں آپ کو جواب دیا - {{site_title}}'
-        posted: '{{صارف نام}} نے "{{ٹاپک}}" میں پوسٹ کیا - {{site_title}}'
-        private_message: '{{صارف نام}} نے "{{ٹاپک}}" میں آپ کو زاتی پیغام بھیجا - {{site_title}}'
-        linked: '{{صارف نام}} نے "{{ٹاپک}}" سے آپ کی پوسٹ کو لنک کیا - {{site_title}}'
+        mentioned: '{{username}} نے آپ کا تذکرہ "{{topic}}" میں کیا - {{site_title}}'
+        group_mentioned: '{{username}} نے آپ کا تذکرہ "{{topic}}" میں کیا - {{site_title}}'
+        quoted: '{{username}} نے "{{topic}}" میں آپ کا حوالا دیا - {{site_title}}'
+        replied: '{{username}} نے "{{topic}}" میں آپ کو جواب دیا - {{site_title}}'
+        posted: '{{username}} نے "{{topic}}" میں پوسٹ کیا - {{site_title}}'
+        private_message: '{{username}} نے "{{topic}}" میں آپ کو زاتی پیغام بھیجا - {{site_title}}'
+        linked: '{{username}} نے "{{topic}}" سے آپ کی پوسٹ کو لنک کیا - {{site_title}}'
     upload_selector:
       title: "ایک تصویر شامل کریں"
       title_with_attachments: "ایک تصویر یا ایک فائل شامل کریں"
@@ -1134,15 +1126,15 @@ ur:
       too_short: "آپ کا سَرچ ٹَرم بہت مختصر ہے۔"
       result_count:
         one: "<span class='term'>\"{{term}}\"</span> کیلئیے 1 نتیجہ"
-        other: "<span class='term'>\"{{term}}\"</span> کیلئیے {{شمار}} نتائج"
+        other: "<span class='term'>\"{{term}}\"</span> کیلئیے {{count}} نتائج"
       title: "ٹاپک، پوسٹس، صارفین، یا زمرہ جات کو سَرچ کریں"
       no_results: "کوئی نتائج نہیں پائے گئے۔"
       no_more_results: "کوئی اور نتائج نہیں پائے گئے۔"
       searching: "تلاش کیا جا رہا ہے ..."
-      post_format: "{{صارف نام}} کی طرف سے #{{post_number}}"
+      post_format: "{{username}} کی طرف سے #{{post_number}}"
       context:
-        user: "@{{صارف نام}} کے حساب سے پوسٹس تلاش کریں"
-        category: "#{{زمرہ}} زمرہ میں تلاش کریں"
+        user: "@{{username}} کے حساب سے پوسٹس تلاش کریں"
+        category: "#{{category}} category میں تلاش کریں"
         topic: "اِس ٹاپک میں تلاش کریں"
         private_messages: "پیغامات میں تلاش کریں"
       advanced:
@@ -1211,7 +1203,7 @@ ur:
         choose_new_category: "ٹاپکس کیلئے نئے زمرہ کا انتخاب کریں:"
         selected:
           one: "آپ نے <b>1</b> ٹاپک منتخب کیا ہے۔"
-          other: "آپ نے <b>{{شمار}}</b> ٹاپک منتخب کیے ہیں۔"
+          other: "آپ نے <b>{{count}}</b> ٹاپک منتخب کیے ہیں۔"
         change_tags: "ٹیگز بدلیں"
         append_tags: "ٹیگز میں اضافہ کریں"
         choose_new_tags: "ان ٹاپکس کیلئے نئے ٹیگز کا انتخاب کریں:"
@@ -1225,7 +1217,7 @@ ur:
         latest: "کوئی تازہ ٹاپک موجود نہیں ہیں۔ یہ اداس کر دینے والی بات ہے۔"
         hot: "کوئی مشہور ٹاپک موجود نہیں ہیں۔"
         bookmarks: "ابھی تک آپ کے بُک مارک کیے ہوے کوئی ٹاپک نہیں ہیں۔"
-        category: "کوئی {{زمرے}} کے ٹاپک موجود نہیں ہیں۔"
+        category: "کوئی {{category}} کے ٹاپک موجود نہیں ہیں۔"
         top: "کوئی ٹاپ ٹاپک موجود نہیں ہیں۔"
         search: "سرچ کے کوئی نتائج نہیں ہیں۔"
         educate:
@@ -1238,17 +1230,17 @@ ur:
         read: "کوئی مزید پڑھ لیے گئے ٹاپک موجود نہیں ہیں۔"
         new: "کوئی مزید نئے ٹاپک موجود نہیں ہیں۔"
         unread: "کوئی مزید بغیر پڑھے ٹاپک موجود نہیں ہیں۔"
-        category: "مزید کوئی {{زمرہ}} کے ٹاپک موجود نہیں۔"
+        category: "مزید کوئی {{category}} کے ٹاپک موجود نہیں۔"
         top: "مزید کوئی ٹاپ ٹاپک موجود نہیں۔"
         bookmarks: "مزید کوئی بک مارک کیے ہوئے ٹاپک موجود نہیں۔"
         search: "سرچ کے مزید کوئی نتائج نہیں۔"
     topic:
       unsubscribe:
-        stop_notifications: "اب آپ کو <strong>{{عنوان}}</strong> کیلئے کم اطلاعات موصول ہوں گی"
+        stop_notifications: "اب آپ کو <strong>{{title}}</strong> کیلئے کم اطلاعات موصول ہوں گی"
         change_notification_state: "آپ کا موجودہ نوٹیفکیشن حالت ہے"
       filter_to:
         one: "ٹاپک میں 1 پوسٹ"
-        other: "ٹاپک میں {{شمار}} پوسٹس"
+        other: "ٹاپک میں {{count}} پوسٹس"
       create: 'نیا ٹاپک'
       create_long: 'نیا ٹاپک بنائیں'
       private_message: 'ایک پیغام شروع کریں'
@@ -1263,10 +1255,10 @@ ur:
       unread: 'بغیر پڑھے'
       new_topics:
         one: '1 نیا ٹاپک'
-        other: '{{شمار}} نئے ٹاپک'
+        other: '{{count}} نئے ٹاپک'
       unread_topics:
         one: '1 بغیر پڑھا گیا ٹاپک'
-        other: '{{شمار}} بغیر پڑھے گئے ٹاپک'
+        other: '{{count}} بغیر پڑھے گئے ٹاپک'
       title: 'ٹاپک'
       invalid_access:
         title: "ٹاپک نجی ہے"
@@ -1280,16 +1272,16 @@ ur:
         description: "معزرت، ہم یہ ٹاپک نہیں ڈھونڈ سکے۔ شاید یہ کسی ماڈریٹر نے ہٹا دیا ہو؟"
       total_unread_posts:
         one: "آپ کے پاس اِس ٹاپک میں 1 بغیر پڑھی پوسٹ موجود ہے"
-        other: "آپ کے پاس اِس ٹاپک میں {{شمار}} بغیر پڑھی پوسٹ موجود ہیں"
+        other: "آپ کے پاس اِس ٹاپک میں {{count}} بغیر پڑھی پوسٹ موجود ہیں"
       unread_posts:
         one: "آپ کے پاس اِس ٹاپک میں 1 بغیر پڑھی پرانی پوسٹ موجود ہے"
-        other: "آپ کے پاس اِس ٹاپک میں {{شمار}} بغیر پڑھی پرانی پوسٹ موجود ہیں"
+        other: "آپ کے پاس اِس ٹاپک میں {{count}} بغیر پڑھی پرانی پوسٹ موجود ہیں"
       new_posts:
         one: "آپ کے آخری دفع یہ ٹاپک پڑھنے کے بعد 1 نئی پوسٹ شائع ہوئی"
-        other: "آپ کے آخری دفع یہ ٹاپک پڑھنے کے بعد {{شمار}} نئی پوسٹ شائع ہوئیں"
+        other: "آپ کے آخری دفع یہ ٹاپک پڑھنے کے بعد {{count}} نئی پوسٹ شائع ہوئیں"
       likes:
         one: "اِس ٹاپک میں 1 لائیک ہے"
-        other: "اِس ٹاپک میں {{شمار}} لائیکس ہیں"
+        other: "اِس ٹاپک میں {{count}} لائیکس ہیں"
       back_to_list: "واپس ٹاپک فہرست پر"
       options: "ٹاپک اختیارات"
       show_links: "اِس ٹاپک کے اندر موجود لنکس دکھایں"
@@ -1305,7 +1297,7 @@ ur:
       auto_close_title: 'خود کار طریقے سے بند کر نے کی سیٹِنگ'
       auto_close_immediate:
         one: "ٹاپک کی آخری پوسٹ ابھی سے 1 گھنٹا پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
-        other: "ٹاپک کی آخری پوسٹ ابھی سے ٪{شمار} گھنٹے پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
+        other: "ٹاپک کی آخری پوسٹ ابھی سے ٪{count} گھنٹے پرانی ہے، اِسلیئے ٹاپک فوری طور پر بند کر دیا جائے گا۔"
       timeline:
         back: "واپس"
         back_description: "آپنی آخری بغیر پڑھی پوسٹ پر واپس جائیں"
@@ -1316,9 +1308,9 @@ ur:
         go: "جائیں"
         jump_bottom: "آخری پوسٹ پر جائیں"
         jump_prompt: "پر جائیں..."
-        jump_prompt_of: "٪{شمار} پوسٹس کے"
+        jump_prompt_of: "٪{count} پوسٹس کے"
         jump_prompt_long: "کس پوسٹ پر آپ جانا پسند کریں گے؟"
-        jump_bottom_with_number: "پوسٹ ٪{پوسٹ_نمبر} پر جائیں"
+        jump_bottom_with_number: "پوسٹ ٪{post_number} پر جائیں"
         total: کُل پوسٹس
         current: موجودہ پوسٹ
       notifications:
@@ -1400,7 +1392,7 @@ ur:
       feature_topic:
         title: "اس ٹاپک کو نمایاں کریں"
         pin: "اِس ٹاپک کو {{categoryLink}} زمرہ کے سب سے اُپر ظاہر کریں جب تک کہ"
-        confirm_pin: "آپ کے پاس پہلے سے ہی {{شمار}} پِن ہوے وے ٹاپک ہیں۔ بہت سارے پِن ہوے وے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی اِس زمرہ میں ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
+        confirm_pin: "آپ کے پاس پہلے سے ہی {{count}} پِن ہوے وے ٹاپک ہیں۔ بہت سارے پِن ہوے وے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی اِس زمرہ میں ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
         unpin: "اِس ٹاپک کو {{categoryLink}} زمرہ کے سب سے اُپر ظاہر کرنے سے ہٹائیں"
         unpin_until: "اِس ٹاپک کو {{categoryLink}} زمرہ کے سب سے اُپر ظاہر کرنے سے ہٹائیں یا <strong>%{until}</strong> تک اِنتظار کریں۔"
         pin_note: "صارفین خود سے انفرادی طور پر ٹاپک سے پن ہٹا سکتے ہیں۔"
@@ -1408,16 +1400,16 @@ ur:
         not_pinned: "{{categoryLink}} میں کوئی ٹاپک پِن نہیں ہیں۔"
         already_pinned:
           one: "فی الحال {{categoryLink}} میں پِن ہوے ٹاپک: <strong class='badge badge-notification unread'>1</strong>"
-          other: "فی الحال {{categoryLink}} میں پِن ہوے ٹاپک: <strong class='badge badge-notification unread'>{{شمار}}</strong>"
+          other: "فی الحال {{categoryLink}} میں پِن ہوے ٹاپک: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "اِس ٹاپک کو تمام ٹاپکس کی فہرست کے سب سے اُپر ظاہر کریں جب تک کہ"
-        confirm_pin_globally: "آپ کے پاس پہلے ہی سے {{شمار}} عالمی سطح پر پِن ہوے ٹاپک موجود ہیں۔ بہت سارے پِن ہوے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی عالمی سطح پر ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
+        confirm_pin_globally: "آپ کے پاس پہلے ہی سے {{count}} عالمی سطح پر پِن ہوے ٹاپک موجود ہیں۔ بہت سارے پِن ہوے ٹاپک نئے اور گمنام صارفین کے لئے ایک بوجھ ثابت ہو سکتے ہیں۔ کیا آپ واقعی عالمی سطح پر ایک اور ٹاپک پِن کرنا چاہتے ہیں؟"
         unpin_globally: "اِس ٹاپک کو تمام ٹاپکس کی فہرست کے سب سے اُپر ظاہر کرنے سے ہٹائیں"
         unpin_globally_until: "اِس ٹاپک کو تمام ٹاپکس کی فہرست کے سب سے اُپر ظاہر کرنے سے ہٹائیں یا <strong>%{until}</strong> تک اِنتظار کریں۔"
         global_pin_note: "صارفین خود سے انفرادی طور پر ٹاپک سے پن ہٹا سکتے ہیں۔"
         not_pinned_globally: "کوئی ٹاپک عالمی سطح پر پِن نہیں ہوئے ہیں۔"
         already_pinned_globally:
           one: "فی الحال عالمی سطح پر پِن ہوئے ٹاپک: <strong class='badge badge-notification unread'>1</strong>"
-          other: "فی الحال عالمی سطح پر پِن ہوئے ٹاپک: <strong class='badge badge-notification unread'>{{شمار}}</strong>"
+          other: "فی الحال عالمی سطح پر پِن ہوئے ٹاپک: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "اِس ٹاپک کو ایک بَینر بنا دیں جو تمام صفحات کے سب سے اوپر ظاہر ہو۔"
         remove_banner: "بَینر ہٹا دیں جو تمام صفحات کے سب سے اوپر ظاہر ہوتا ہے۔"
         banner_note: "صارفین بینر کو بند کرکے اِسے برطرف کر سکتے ہیں۔ آیک وقت میں صرف ایک ٹاپک کو بینر بنایا جا سکتا ہے۔"
@@ -1454,7 +1446,7 @@ ur:
       filters:
         n_posts:
           one: "1 پوسٹ"
-          other: "{{شمار}} پوسٹس"
+          other: "{{count}} پوسٹس"
         cancel: "فِلٹر ہٹائیں"
       split_topic:
         title: "نئے ٹاپک پر منتقل کریں"
@@ -1463,14 +1455,14 @@ ur:
         error: "نئے ٹاپک پر پوسٹس منتقل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         instructions:
           one: "آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کردہ پوسٹ سے اِسے آباد کرنے والے ہیں۔"
-          other: "آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کردہ <b>{{شمار}}</b> پوسٹس سے اِسے آباد کرنے والے ہیں۔"
+          other: "آپ ایک نیا ٹاپک بنانے اور اپنی منتخب کردہ <b>{{count}}</b> پوسٹس سے اِسے آباد کرنے والے ہیں۔"
       merge_topic:
         title: "موجودہ ٹاپک میں منتقل کریں"
         action: "موجودہ ٹاپک میں منتقل کریں"
         error: "اس ٹاپک میں پوسٹس منتقل کرنے میں ایک خرابی کا سامنا کرنا پڑا۔"
         instructions:
           one: "براہ مہربانی، وہ ٹاپک منتخب کریں جس میں آپ وہ پوسٹ منتقل کرنا چاہتے ہیں۔"
-          other: "براہ مہربانی، وہ ٹاپک منتخب کریں جس میں آپ <b>{{شمار}}</b> پوسٹس منتقل کرنا چاہتے ہیں۔"
+          other: "براہ مہربانی، وہ ٹاپک منتخب کریں جس میں آپ <b>{{count}}</b> پوسٹس منتقل کرنا چاہتے ہیں۔"
       merge_posts:
         title: "منتخب کردہ پوسٹس کو ضم کریں"
         action: "منتخب کردہ پوسٹس کو ضم کریں"
@@ -1483,7 +1475,7 @@ ur:
         placeholder: "نئے مالک کا صارف نام"
         instructions:
           one: "براہ مہربانی، <b>{{old_user}}</b> کی پوسٹ کے نئے مالک کو منتخب کریں۔"
-          other: "براہ مہربانی، <b>{{old_user}}</b> کی {{شمار}} پوسٹس کے نئے مالک کو منتخب کریں۔"
+          other: "براہ مہربانی، <b>{{old_user}}</b> کی {{count}} پوسٹس کے نئے مالک کو منتخب کریں۔"
         instructions_warn: "یاد رکھیں کہ اِس پوسٹ کے بارے میں کوئی بھی اطلاعات مؤثر بہ ماضی طور پر نئے صارف کو منتقل نہیں کی جائیں گی۔ <br>انتباہ: فی الحال، کوئی پوسٹ انحصار ڈیٹا نئے صارف کو منتقل نہیں کیا جاتا ہے۔ احتیاط سے استعمال کریں۔"
       change_timestamp:
         action: "ٹائمسٹیمپ تبدیل کریں"
@@ -1492,7 +1484,7 @@ ur:
         instructions: "براہ مہربانی ٹاپک کیلیئے نیا ٹائمسٹیمپ منتخب کریں۔ وقت کا فرق برابر رکھنے کیلیے ٹاپک میں پوسٹس کو اَپ ڈیٹ کر دیا جائے گا۔"
       multi_select:
         select: 'منتخب'
-        selected: 'منتخب کیے گئے ({{شمار}})'
+        selected: 'منتخب کیے گئے ({{count}})'
         select_replies: 'منتخب+جوابات'
         delete: منتخب کیے ہوں کو حذف کریں
         cancel: انتخاب کرنا منسوخ کریں
@@ -1500,14 +1492,14 @@ ur:
         deselect_all: تمام غیر منتخب کریں
         description:
           one: آپ نے <b>1</b> پوسٹ منتخب کی ہے۔
-          other: آپ نے <b>{{شمار}}</b> پوسٹس منتخب کی ہیں۔
+          other: آپ نے <b>{{count}}</b> پوسٹس منتخب کی ہیں۔
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
       quote_reply: "اقتباس کریں"
       edit: "ترمیم {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "وجہ:"
-      post_number: "پوسٹ {{نمبر}}"
+      post_number: "پوسٹ {{number}}"
       wiki_last_edited_on: "وِکی کو آخری بار ترمیم کیا گیا"
       last_edited_on: "پوسٹ کو آخری بار ترمیم کیا گیا"
       reply_as_new_topic: "منسلک ٹاپک کے طور پر جواب دیں"
@@ -1517,26 +1509,26 @@ ur:
       show_full: "مکمل پوسٹ دکھائیں"
       show_hidden: 'چھپایا ہوا متن دکھایں۔'
       deleted_by_author:
-        one: "(مصنف نے پوسٹ واپس لے لی، ٪{شمار} گھنٹے میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)"
-        other: "(مصنف نے پوسٹ واپس لے لی، ٪{شمار} گھنٹوں میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)"
+        one: "(مصنف نے پوسٹ واپس لے لی، ٪{count} گھنٹے میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)"
+        other: "(مصنف نے پوسٹ واپس لے لی، ٪{count} گھنٹوں میں یہ خود کار طریقے سے حذف کر دی جائے گی الا یہ کہ اِسے فلیگ کیا گیا ہو)"
       expand_collapse: "کھولیں/بند کریں"
       gap:
         one: "1 چھپایا ہوا جواب دیکھیں"
-        other: "{{شمار}} چھپائے ہوے جوابات دیکھیں"
+        other: "{{count}} چھپائے ہوے جوابات دیکھیں"
       unread: "پوسٹ بغیر پڑھی ہے"
       has_replies:
-        one: "{{شمار}} جواب"
-        other: "{{شمار}} جوابات"
+        one: "{{count}} جواب"
+        other: "{{count}} جوابات"
       has_likes:
-        one: "{{شمار}} لائیک"
-        other: "{{شمار}} لائیکس"
+        one: "{{count}} لائیک"
+        other: "{{count}} لائیکس"
       has_likes_title:
         one: "1 شخص نے اِس پوسٹ کو لائیک کیا"
-        other: "{{شمار}} لوگوں نے اِس پوسٹ کو لائیک کیا"
+        other: "{{count}} لوگوں نے اِس پوسٹ کو لائیک کیا"
       has_likes_title_only_you: " آپ نے اِس پوسٹ کو لائیک کیا"
       has_likes_title_you:
         one: "آپ اور 1 دوسرے شخص نے اِس پوسٹ کو لائیک کیا"
-        other: "آپ اور {{شمار}} دوسرے لوگوں نے اِس پوسٹ کو لائیک کیا"
+        other: "آپ اور {{count}} دوسرے لوگوں نے اِس پوسٹ کو لائیک کیا"
       errors:
         create: "معذرت، آپ کی پوسٹ بنانے میں ایک خرابی کا سامنا کرنا پڑا۔  براہ مہربانی دوبارہ کوشش کریں۔"
         edit: "معذرت، آپ کی پوسٹ ترمیم کرنے میں ایک خرابی کا سامنا کرنا پڑا۔  براہ مہربانی دوبارہ کوشش کریں۔"
@@ -1575,7 +1567,7 @@ ur:
         delete_replies:
           confirm:
             one: "کیا آپ اِس پوسٹ پر براہِ راست جواب حذف کرنا چاہتے ہیں؟"
-            other: "کیا آپ اِس پوسٹ پر {{شمار}} براہِ راست جوابات حذف کرنا چاہتے ہیں؟"
+            other: "کیا آپ اِس پوسٹ پر {{count}} براہِ راست جوابات حذف کرنا چاہتے ہیں؟"
           yes_value: "جی ہاں، جوابات کو بھی حذف کردیں"
           no_value: "نہیں، صرف یہ پوسٹ"
         admin: "پوسٹ ایڈمن کے ایکشن"
@@ -1619,61 +1611,57 @@ ur:
         by_you_and_others:
           off_topic:
             one: "آپ اور 1 دوسرے شخص نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
-            other: "آپ اور {{شمار}} دوسرے لوگوں نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
           spam:
             one: "آپ اور 1 دوسرے شخص نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
-            other: "آپ اور {{شمار}} دوسرے لوگوں نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
           inappropriate:
             one: "آپ اور 1 دوسرے شخص نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا"
-            other: "آپ اور {{شمار}} دوسرے لوگوں نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا"
           notify_moderators:
             one: "آپ اور 1 دوسرے شخص نے اِس کو اعتدال کیلئے فلَیگ کیا"
-            other: "آپ اور {{شمار}} دوسرے لوگوں نے اِس کو اعتدال کیلئے فلَیگ کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے اِس کو اعتدال کیلئے فلَیگ کیا"
           notify_user:
             one: "آپ اور 1 دوسرے شخص نے اِس صارف کو پیغام بھیجا"
-            other: "آپ اور {{شمار}} دوسرے لوگوں نے اِس صارف کو پیغام بھیجا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے اِس صارف کو پیغام بھیجا"
           bookmark:
             one: "آپ اور 1 دوسرے شخص نے اِس پوسٹ کو بُک مارک کیا"
-            other: "آپ اور {{شمار}} دوسرے لوگوں نے اِس پوسٹ کو بُک مارک کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے اِس پوسٹ کو بُک مارک کیا"
           like:
             one: "آپ اور 1 دوسرے شخص نے اِس کو لائیک کیا"
-            other: "آپ اور {{شمار}} دوسرے لوگوں نے اِس کو لائیک کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے اِس کو لائیک کیا"
           vote:
             one: "آپ اور 1 دوسرے شخص نے اِس پوسٹ کے لیے ووٹ کیا"
-            other: "آپ اور {{شمار}} دوسرے لوگوں نے اِس پوسٹ کے لیے ووٹ کیا"
+            other: "آپ اور {{count}} دوسرے لوگوں نے اِس پوسٹ کے لیے ووٹ کیا"
         by_others:
           off_topic:
             one: "1 شخص نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
-            other: "{{شمار}} لوگوں نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
+            other: "{{count}} لوگوں نے اِس کو موضوع سے ہٹ کر ہونے کے طور پر فلَیگ کیا"
           spam:
             one: "1 شخص نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
-            other: "{{شمار}} لوگوں نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
+            other: "{{count}} لوگوں نے اِس کو سپَیم ہونے کے طور پر فلَیگ کیا"
           inappropriate:
             one: "1 شخص نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا"
-            other: "{{شمار}} لوگوں نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا"
+            other: "{{count}} لوگوں نے اِس کو نامناسب ہونے کے طور پر فلَیگ کیا گیا"
           notify_moderators:
             one: "1 شخص نے اِس کو اعتدال کیلئے فلَیگ کیا"
-            other: "{{شمار}} لوگوں نے اِس کو اعتدال کیلئے فلَیگ کیا"
+            other: "{{count}} لوگوں نے اِس کو اعتدال کیلئے فلَیگ کیا"
           notify_user:
             one: "1 شخص نے اِس صارف کو پیغام بھیجا"
-            other: "{{شمار}} لوگوں نے اِس صارف کو پیغام بھیجا"
+            other: "{{count}} لوگوں نے اِس صارف کو پیغام بھیجا"
           bookmark:
             one: "1 شخص نے اِس پوسٹ کو بُک مارک کیا"
-            other: "{{شمار}} لوگوں نے اِس پوسٹ کو بُک مارک کیا"
+            other: "{{count}} لوگوں نے اِس پوسٹ کو بُک مارک کیا"
           like:
             one: "1 شخص نے اِس کو لائیک کیا"
-            other: "{{شمار}} لوگوں نے اِس کو لائیک کیا"
+            other: "{{count}} لوگوں نے اِس کو لائیک کیا"
           vote:
             one: "1 شخص نے اِس پوسٹ کے لیے ووٹ کیا"
-            other: "{{شمار}} لوگوں نے اِس پوسٹ کے لیے ووٹ کیا"
+            other: "{{count}} لوگوں نے اِس پوسٹ کے لیے ووٹ کیا"
       delete:
         confirm:
           one: "کیا آپ واقعی اِس پوسٹ کو حذف کرنا چاہتے ہیں؟"
           other: "کیا آپ واقعی اِن تمام پوسٹس کو حذف کرنا چاہتے ہیں؟"
-      merge:
-        confirm:
-          one: "کیا آپ واقعی ان پوسٹس کو ضم کرنا چاہتے ہیں؟"
-          other: "کیا آپ واقعی ان {{شمار}} پوسٹس کو ضم کرنا چاہتے ہیں؟"
       revisions:
         controls:
           first: "پہلی رَوِیژن"
@@ -1718,8 +1706,6 @@ ur:
       settings: 'سیٹِنگ'
       topic_template: "ٹاپک ٹَیمپلیٹ"
       tags: "ٹیگز"
-      tags_allowed_tags: "ٹیگز جو صرف اِس زمرہ میں استعمال کیے جا سکتے ہیں:"
-      tags_allowed_tag_groups: "ٹیگ گروپس جو صرف اِس زمرہ میں استعمال کیے جا سکتے ہیں:"
       tags_placeholder: "(اختیاری) اجازت والے ٹیگز کی فہرست"
       tag_groups_placeholder: "(اختیاری) اجازت والے ٹیگ گروپس کی فہرست"
       topic_featured_link_allowed: "اس زمرہ میں نمایاں لنکس کو اجازت دیں"
@@ -1829,13 +1815,13 @@ ur:
       custom_message:
         at_least:
           one: "کم از کم 1 حرف درج کریں"
-          other: "کم از کم {{شمار}} حروف درج کریں"
+          other: "کم از کم {{count}} حروف درج کریں"
         more:
           one: "1 اور آگے بچا ہے..."
-          other: "{{شمار}} اور آگے بچے ہیں..."
+          other: "{{count}} اور آگے بچے ہیں..."
         left:
           one: "1 باقی رہتا ہے..."
-          other: "{{شمار}} باقی رہتے ہیں..."
+          other: "{{count}} باقی رہتے ہیں..."
     flagging_topic:
       title: "ہماری کمیونٹی کو مہذب رکھنے کے لئے مدد کا شکریہ!"
       action: "ٹاپک فلَیگ کریں"
@@ -1847,12 +1833,12 @@ ur:
       links_shown: "مزید لِنکس دکھایے"
       clicks:
         one: "1 کلک"
-        other: "%{شمار} کلکس"
+        other: "%{count} کلکس"
     post_links:
       about: "اِس پوسٹ کے لئے مزید لنکس دکھائیں"
       title:
         one: "1 اور"
-        other: "٪{شمار} اور"
+        other: "٪{count} اور"
     topic_statuses:
       warning:
         help: "یہ ایک آفیشل انتباہ ہے۔"
@@ -1876,7 +1862,7 @@ ur:
       invisible:
         help: "یہ ٹاپک غیر کسی فہرست میں نہیں ہے؛ یہ ٹاپکس کی فہرست میں ظاہر نہیں ہو گا، اور صرف ایک براہ راست لنک کے ذریعے اِس تک رسائی ہو سکے گی"
     posts: "پوسٹس"
-    posts_long: "اِس ٹاپک میں {{نمبر}} پوسٹس ہیں"
+    posts_long: "اِس ٹاپک میں {{number}} پوسٹس ہیں"
     posts_likes_MF: |
       یہاِس ٹاپک کی کیا ہے {شمار، جمع، ایک {1 جواب} دیگر {# جوابات}} {تناسب، منتخب،
       کم {لائیک پر پوسٹ کے اونچے تناسب کے ساتھ}
@@ -1911,12 +1897,12 @@ ur:
     categories_list: "زمرہ جات فہرست"
     filters:
       with_topics: "٪{فلٹر} ٹاپک"
-      with_category: "٪{فلٹر} ٪{زمرہ} ٹاپک"
+      with_category: "٪{فلٹر} ٪{category} ٹاپک"
       latest:
         title: "تازہ ترین"
         title_with_count:
           one: "تازہ ترین (1)"
-          other: "تازہ ترین ({{شمار}})"
+          other: "تازہ ترین ({{count}})"
         help: "حالیہ پوسٹ والے ٹاپک"
       hot:
         title: "ہاٹ"
@@ -1935,20 +1921,20 @@ ur:
         title: "بغیر پڑھے"
         title_with_count:
           one: "بغیر پڑھے (1)"
-          other: "بغیر پڑھے ({{شمار}})"
+          other: "بغیر پڑھے ({{count}})"
         help: " ٹاپک جن پر فی الحال آپ نے نظر رکھی ہوئی ہے یا بغیر پڑھی پوسٹس کے ساتھ ٹریک کر رہے ہیں"
         lower_title_with_count:
           one: "1 بغیر پڑھا ہوا"
-          other: "{{شمار}} بغیر پڑھے ہوئے"
+          other: "{{count}} بغیر پڑھے ہوئے"
       new:
         lower_title_with_count:
           one: "1 نیا"
-          other: "{{شمار}} نئے"
+          other: "{{count}} نئے"
         lower_title: "نئے"
         title: "نیا"
         title_with_count:
           one: "نئے (1)"
-          other: "نئے ({{شمار}})"
+          other: "نئے ({{count}})"
         help: "پچھلے چند دنوں میں بنائے گئے ٹاپک"
       posted:
         title: "میری پوسٹ"
@@ -1960,7 +1946,7 @@ ur:
         title: "{{categoryName}}"
         title_with_count:
           one: "{{categoryName}} (1)"
-          other: "{{categoryName}} ({{شمار}})"
+          other: "{{categoryName}} ({{count}})"
         help: "{{categoryName}} زمرہ میں تازہ تریں ٹاپک"
       top:
         title: "سب سے اوپر"
@@ -2046,19 +2032,19 @@ ur:
     badges:
       earned_n_times:
         one: "یہ بَیج 1 دفعہ حاصل کیا"
-        other: "یہ بَیج ٪{شمار} دفعہ حاصل کیا"
-      granted_on: "عطا کیا گیا ٪{تاریخ}"
-      others_count: "دوسرے جن کے پاس یہ بَیج ہے (٪{شمار})"
+        other: "یہ بَیج ٪{count} دفعہ حاصل کیا"
+      granted_on: "عطا کیا گیا ٪{date}"
+      others_count: "دوسرے جن کے پاس یہ بَیج ہے (٪{count})"
       title: بَیج
       badge_count:
         one: "1 بَیج"
-        other: "%{شمار} بَیج"
+        other: "%{count} بَیج"
       more_badges:
         one: "+1 اور"
-        other: "+٪{شمار} اور"
+        other: "+٪{count} اور"
       granted:
         one: "1 عطا کیا گیا"
-        other: "%{شمار} عطا کیے گئے"
+        other: "%{count} عطا کیے گئے"
       select_badge_for_title: اپنے عنوان کے طور پر استعمال کرنے کے لئے ایک بیج منتخب کریں
       none: "<none>"
       badge_grouping:
@@ -2099,9 +2085,9 @@ ur:
       manage_groups_description: "ٹیگز منظم کرنے کے گروپوں کی وضاحت کریں"
       filters:
         without_category: "٪{فلٹر} ٪{ٹیگ} ٹاپکس"
-        with_category: "٪{فلٹر} ٪{ٹیگ} ٹاپکس ٪{زمرہ} میں"
+        with_category: "٪{فلٹر} ٪{ٹیگ} ٹاپکس ٪{category} میں"
         untagged_without_category: "٪{فلٹر} غیر ٹیگ شدہ ٹاپک"
-        untagged_with_category: "٪{فلٹر} غیر ٹیگ شدہ ٹاپک ٪{زمرہ} میں"
+        untagged_with_category: "٪{فلٹر} غیر ٹیگ شدہ ٹاپک ٪{category} میں"
       notifications:
         watching:
           title: "نظر رکھی ہوئی ہے"
@@ -2260,23 +2246,23 @@ ur:
         topic_flagged: "اِس <strong>ٹاپک</strong> کو فلَیگ کر دیا گیا ہے۔"
         visit_topic: "کارروائی کرنے کیلئے ٹاپک کو وزٹ کریں"
         was_edited: "پہلے فلَیگ کے بعد پوسٹ میں ترمیم ہوئی تھی"
-        previous_flags_count: "اس پوسٹ کو پہلے ہی سے {{شمار}} دفعہ فلَیگ کیا جا چکا ہے۔"
+        previous_flags_count: "اس پوسٹ کو پہلے ہی سے {{count}} دفعہ فلَیگ کیا جا چکا ہے۔"
         summary:
           action_type_3:
             one: "موضوع سے ہٹ کر"
-            other: "موضوع سے ہٹ کر x{{شمار}}"
+            other: "موضوع سے ہٹ کر x{{count}}"
           action_type_4:
             one: "نامناسب"
-            other: "نامناسب x{{شمار}}"
+            other: "نامناسب x{{count}}"
           action_type_6:
             one: "اپنی مرضی کا"
-            other: "اپنی مرضی کا x{{شمار}}"
+            other: "اپنی مرضی کا x{{count}}"
           action_type_7:
             one: "اپنی مرضی کا"
-            other: "اپنی مرضی کا x{{شمار}}"
+            other: "اپنی مرضی کا x{{count}}"
           action_type_8:
             one: "سپَیم"
-            other: "سپَیم x{{شمار}}"
+            other: "سپَیم x{{count}}"
       groups:
         primary: "پرائمری گروپ"
         no_primary: "(کوئی پرائمری گروپ نہیں)"
@@ -2290,7 +2276,7 @@ ur:
         delete: "حذف کریں"
         delete_confirm: "اِس گروپ کو حذف کریں؟"
         delete_failed: "گروپ کو حذف کرنے میں ناکام۔ اگر یہ ایک خودکار گروپ ہے تو اسے ختم نہیں کیا جا سکتا۔"
-        delete_owner_confirm: "'٪{صارف نام}' کے لیے مالک کے استحقاق کو ہٹائیں؟"
+        delete_owner_confirm: "'٪{username}' کے لیے مالک کے استحقاق کو ہٹائیں؟"
         add: "شامل کریں"
         add_members: "اراکین شامل کریں"
         custom: "اپنی مرضی کا"
@@ -2373,10 +2359,10 @@ ur:
           redeliver: "دوبارہ ڈیلیور کریں"
           incoming:
             one: "ایک نیا واقعہ موجود ہے۔"
-            other: "{{شمار}} نئے واقعات موجود ہیں۔"
+            other: "{{count}} نئے واقعات موجود ہیں۔"
           completed_in:
             one: "1 سیکنڈ میں مکمل ہوا۔"
-            other: "{{شمار}} سیکنڈ میں مکمل ہوا۔"
+            other: "{{count}} سیکنڈ میں مکمل ہوا۔"
           request: "ریکویسٹ"
           response: "جواب"
           redeliver_confirm: "کیا آپ واقعی وہی پَیلوڈ دوبارہ ڈیلیور کرنا چاہتے ہیں؟"
@@ -2720,10 +2706,10 @@ ur:
         approved: "منظورشدہ؟"
         approved_selected:
           one: "صارف منظور کریں"
-          other: "صارفین منظور کریں ({{شمار}})"
+          other: "صارفین منظور کریں ({{count}})"
         reject_selected:
           one: "صارف مسترد کریں"
-          other: "صارفین مسترد کریں ({{شمار}})"
+          other: "صارفین مسترد کریں ({{count}})"
         titles:
           active: 'متحرک صارفین'
           new: 'نئے صارفین'
@@ -2741,10 +2727,10 @@ ur:
           suspect: 'مشتبہ صارفین'
         reject_successful:
           one: "کامیابی کے ساتھ 1 صارف کو مسترد کیا۔"
-          other: "کامیابی کے ساتھ ٪{شمار} صارفین کو مسترد کیا۔"
+          other: "کامیابی کے ساتھ ٪{count} صارفین کو مسترد کیا۔"
         reject_failures:
           one: "1 صارف کو مسترد کرنے میں ناکامی۔"
-          other: "٪{شمار} صارفین کو مسترد کرنے میں ناکامی۔"
+          other: "٪{count} صارفین کو مسترد کرنے میں ناکامی۔"
         not_verified: "غیر تصدیق شدہ"
         check_email:
           title: "اِس صارف کا اِیمیل ایڈریس ظاہر کریں"
@@ -2807,14 +2793,14 @@ ur:
         delete_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز حذف نہیں کیے جا سکتے۔"
         delete_posts_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز کی تمام پوسٹس حذف نہیں کی جا سکتیں۔"
         delete_forbidden:
-          one: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (٪{شمار} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)"
-          other: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (٪{شمار} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)"
+          one: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (٪{count} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)"
+          other: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (٪{count} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)"
         cant_delete_all_posts:
-          one: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس ٪{شمار} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)"
-          other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس ٪{شمار} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)"
+          one: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس ٪{count} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)"
+          other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس ٪{count} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)"
         cant_delete_all_too_many_posts:
           one: "تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی 1 سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)"
-          other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی ٪{شمار} سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)"
+          other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی ٪{count} سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)"
         delete_confirm: "کیا آپ واقعی اِس صارف کو حذف کرنا چاہتے ہیں؟ یہ مُستقِل عمل ہے!"
         delete_and_block: "اِس اِیمیل اور IP ایڈریس کو حذف اور <b>بلاک</b> کریں"
         delete_dont_block: "صرف حذف کریں"
@@ -2855,7 +2841,7 @@ ur:
           title: "ٹرسٹ لَیول 3 کے تقاضے"
           table_title:
             one: "پچھلے دن میں"
-            other: "پچھلے ٪{شمار} دنوں میں"
+            other: "پچھلے ٪{count} دنوں میں"
           value_heading: "وَیلِیو"
           requirement_heading: "ضروریات"
           visits: "زائرین کی تعداد"
@@ -2991,7 +2977,7 @@ ur:
         grant_badge: بَیج دیں
         granted_badges: دیے گئے بَیجز
         grant: عطا کریں
-        no_user_badges: "٪{نام} کو کوئی بَیج عطا نہیں کیا گیا ہے۔"
+        no_user_badges: "٪{name} کو کوئی بَیج عطا نہیں کیا گیا ہے۔"
         no_badges: عطا کیے جانے کیلئے کوئی بَیج موجود نہیں ہیں۔
         none_selected: "شروع کرنے کے لئے ایک بَیج منتخب کریں"
         allow_title: عنوان کے طور پر بَیج وں کے استعمال کی اجازت دیں
@@ -3024,20 +3010,20 @@ ur:
           no_grant_count: "کوئی بَیج تفویض کرنے کیلئے موجود نہیں۔"
           grant_count:
             one: "تفویض  کرنے کیلئے <b>1</b> بَیج موجود ہے۔"
-            other: "تفویض  کرنے کیلئے <b>٪{شمار}</b> بَیج موجود ہیں۔"
+            other: "تفویض  کرنے کیلئے <b>٪{count}</b> بَیج موجود ہیں۔"
           sample: "نمونہ:"
           grant:
-            with: <span class="username">٪{صارف نام}</span>
-            with_post: <span class="username">٪{صارف نام}</span> اِس ٪{لنک} میں پوسٹ کیلئے
-            with_post_time: <span class="username">٪{صارف نام}</span> <span class="time">٪{time}</span> پر اِس ٪{لنک} میں پوسٹ کیلئے
-            with_time: <span class="username">٪{صارف نام}</span> <span class="time">٪{time}</span> پر
+            with: <span class="username">٪{username}</span>
+            with_post: <span class="username">٪{username}</span> اِس ٪{لنک} میں پوسٹ کیلئے
+            with_post_time: <span class="username">٪{username}</span> <span class="time">٪{time}</span> پر اِس ٪{لنک} میں پوسٹ کیلئے
+            with_time: <span class="username">٪{username}</span> <span class="time">٪{time}</span> پر
       emoji:
         title: "اِیمَوجی"
         help: "نئی اِیمَوجی شامل کریں جو سب کے لئے دستیاب ہوگی۔ (پیشہ وَرَانہ ٹِپ: ایک بار میں ایک سے زیادہ فائلوں کو ڈرَیگ & ڈراپ کریں)"
         add: "نئی اِیمَوجی شامل کریں"
         name: "نام"
         image: "تصویر"
-        delete_confirm: "کیا آپ واقعی :٪{نام}: اِیمَوجی کو حذف کرنا چاہتے ہیں؟"
+        delete_confirm: "کیا آپ واقعی :٪{name}: اِیمَوجی کو حذف کرنا چاہتے ہیں؟"
       embedding:
         get_started: "اگر آپ ڈِسکورس کو ایک اور ویب سائٹ پر اَیمبَیڈ کرنا چاہتے ہیں، تو ہوسٹ شامل کر کے شروع کریں۔"
         confirm_delete: "کیا آپ واقعی اس ہَوسٹ کو حذف کرنا چاہتے ہیں؟"
@@ -3090,7 +3076,7 @@ ur:
       quit: "شاید بعد میں"
       staff_count:
         one: "آپ کی کمیونٹی میں 1 سٹاف کا رکن ہے۔"
-        other: "آپ کی کمیونٹی میں ٪{شمار} سٹاف کے ارکان ہیں۔"
+        other: "آپ کی کمیونٹی میں ٪{count} سٹاف کے ارکان ہیں۔"
       invites:
         add_user: "شامل کریں"
         none_added: "آپ نے کسی  بھی سٹاف کو مدعو نہیں کیا۔ کیا آپ واقعی آگے جانا چاہتے ہیں؟"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 74092e9e5eb..61e69c2510e 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -130,20 +130,20 @@ vi:
       default_description: "Mặc định"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Châu Á Thái Bình Dương (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Châu Á Thái Bình Dương (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "Trung Quốc (Bắc Kinh)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'sửa tiêu đề và chuyên mục của chủ đề'
     not_implemented: "Tính năng này chưa được hoàn thiện hết, xin lỗi!"
     no_value: "Không"
@@ -325,11 +325,7 @@ vi:
         full_name: 'Tên đầy đủ'
         add_members: "Thêm thành viên"
         delete_member_confirm: "Xoá  '%{username}' khỏi nhóm '%{group}' ?"
-      request_membership_pm:
-        title: "Xin làm thành viên"
-        body: "Tôi muốn gia nhập nhóm @%{groupName}."
       name_placeholder: "Tên nhóm, không có khoảng trắng, tương tự như luật đặt tên người dùng"
-      public: "Cho phép người dùng tham gia/rời bỏ nhóm tự do (Nhóm phải là công khai)"
       empty:
         posts: "Không có bài viết nào của các thành viên trong nhóm này"
         members: "Không có thành viên nào trong nhóm này"
@@ -351,7 +347,6 @@ vi:
       bio: "Thông tin về nhóm"
       selector_placeholder: "Thêm thành viên"
       owner: "chủ"
-      visible: "Mọi thành viên có thể nhìn thấy nhóm"
       index:
         title: "Nhóm"
         empty: "Không có nhóm công khai nào."
@@ -458,7 +453,6 @@ vi:
       mute: "Im lặng"
       edit: "Tùy chỉnh"
       download_archive:
-        button_text: "Tải các bài viết của tôi"
         confirm: "Bạn có chắc chắn muốn download các bài viết của mình?"
         success: "Quá trình tải về đã bắt đầu, bạn sẽ được thông báo qua tin nhắn khi quá trình hoàn tất."
         rate_limit_error: "Bài viết chỉ được tải về một lần mỗi người, hãy thử lại vào ngày mai."
@@ -581,7 +575,6 @@ vi:
         title: "Thay Username"
         confirm: "Nếu bạn thay đổi tên đăng nhập, tất cả những liên kết người khác nhắc đến bạn @name sẽ bị lỗi. Bạn chắc chắn muốn thay đổi chứ?"
         taken: "Xin lỗi, đã có username này."
-        error: "Có lỗi trong khi thay đổi username của bạn."
         invalid: "Username này không thích hợp. Nó chỉ chứa các ký tự  là chữ cái và chữ số. "
       change_email:
         title: "Thay đổi Email"
@@ -927,7 +920,6 @@ vi:
       invited_by: "Bạn đã được mời bởi:"
       your_email: "Địa chỉ email của bạn là <b>%{email}</b>."
       accept_invite: "Chấp nhận lời mời"
-      password_label: "Thiết lập mật khẩu (Không bắt buộc)"
     password_reset:
       continue: "Tiếp tục truy cập %{site_name}"
     emoji_set:
@@ -1611,7 +1603,6 @@ vi:
       settings: 'Cấu hình'
       topic_template: "Mẫu Chủ đề"
       tags: "Thẻ"
-      tags_allowed_tags: "Thẻ chỉ được dùng ở chuyên mục này"
       tags_placeholder: "(Tuỳ chọn) danh sách thẻ cho phép"
       delete: 'Xóa chuyên mục'
       create: 'Chuyên mục mới'
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 809bb2dbb53..b50b1b65984 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -130,20 +130,20 @@ zh_CN:
       default_description: "默认"
     s3:
       regions:
-        us_east_1: "美国东部（N. Virginia）"
-        us_west_1: "美国西部（N. California）"
-        us_west_2: "美国西部（Oregon）"
-        us_gov_west_1: "政府专用（US）"
-        eu_west_1: "欧洲（Ireland）"
-        eu_west_2: "欧洲（London）"
-        eu_central_1: "欧洲（Frankfurt）"
-        ap_southeast_1: "亚太地区（Singapore）"
-        ap_southeast_2: "亚太地区（Sydney）"
-        ap_south_1: "亚太地区（Mumbai）"
         ap_northeast_1: "亚太地区（Tokyo）"
         ap_northeast_2: "亚太地区（Seoul）"
-        sa_east_1: "南美（Sao Paulo）"
+        ap_south_1: "亚太地区（Mumbai）"
+        ap_southeast_1: "亚太地区（Singapore）"
+        ap_southeast_2: "亚太地区（Sydney）"
         cn_north_1: "中国（Beijing）"
+        eu_central_1: "欧洲（Frankfurt）"
+        eu_west_1: "欧洲（Ireland）"
+        eu_west_2: "欧洲（London）"
+        sa_east_1: "南美（Sao Paulo）"
+        us_east_1: "美国东部（N. Virginia）"
+        us_gov_west_1: "政府专用（US）"
+        us_west_1: "美国西部（N. California）"
+        us_west_2: "美国西部（Oregon）"
     edit: '编辑标题和分类'
     not_implemented: "非常抱歉，这个功能仍在开发中！"
     no_value: "否"
@@ -204,7 +204,7 @@ zh_CN:
       user_count: "用户"
       active_user_count: "活跃用户"
       contact: "联系我们"
-      contact_info: "重要事件或紧急事件，请通过 %{contact_info} 联系我们。"
+      contact_info: "如有重要问题或网站紧急事件，请以 %{contact_info} 联系我们。"
     bookmarked:
       title: "收藏"
       clear_bookmarks: "取消收藏"
@@ -325,11 +325,7 @@ zh_CN:
         full_name: '名字'
         add_members: "增加组员"
         delete_member_confirm: "从“%{group}”群组中移除用户“%{username}'？"
-      request_membership_pm:
-        title: "成员申请"
-        body: "我想申请 @%{groupName} 的成员资格。"
       name_placeholder: "群组名，没有空格，和用户名一样的规则"
-      public: "允许用户自由加入/离开群组（需要群组是可见）"
       empty:
         posts: "群组成员没有发布帖子。"
         members: "群组没有成员。"
@@ -351,7 +347,6 @@ zh_CN:
       bio: "关于群组"
       selector_placeholder: "添加成员"
       owner: "所有者"
-      visible: "群组对所有用户可见"
       index:
         title: "群组"
         empty: "没有可见的群组。"
@@ -459,7 +454,7 @@ zh_CN:
       mute: "防打扰"
       edit: "修改设置"
       download_archive:
-        button_text: "下载我的帖子"
+        button_text: "全部下载"
         confirm: "你确定要下载你的帖子吗？"
         success: "下载开始，完成后将有私信通知你。"
         rate_limit_error: "帖子只能每天下载一次，请明天再重试。"
@@ -529,6 +524,7 @@ zh_CN:
       watched_first_post_tags_instructions: "在有了这些标签的每一个新主题，第一帖会通知你。"
       muted_categories: "静音"
       muted_categories_instructions: "在这些分类里面，你将不会收到新主题任何通知，它们也不会出现在“最新”主题列表。"
+      no_category_access: "无法保存，作为审核人您仅具有受限的 分类 访问权限"
       delete_account: "删除我的帐号"
       delete_account_confirm: "你真的要永久删除自己的账号吗？删除之后无法恢复！"
       deleted_yourself: "你的帐号已被删除。"
@@ -588,7 +584,6 @@ zh_CN:
         title: "更换用户名"
         confirm: "确定更换用户名？你的帖子和@提及你的引用将失效。"
         taken: "抱歉，此用户名已经有人使用了。"
-        error: "修改你的用户名时出错了。"
         invalid: "此用户名不合法，用户名只能包含字母和数字"
       change_email:
         title: "更换邮箱"
@@ -855,8 +850,8 @@ zh_CN:
       hide_session: "明天提醒我"
       hide_forever: "不了"
       hidden_for_session: "好的，我会在明天提醒你。不过你随时都可以使用“登录”来创建账户。"
-      intro: "你好！:heart_eyes: 看起来你挺喜欢这样的讨论，可是你还没有注册账户。"
-      value_prop: "当你创建账户后，我们可以准确地记录你的阅读进度，这样你能够在下一次访问时回到你上次阅读到的地方。你也可以选择接受新帖子的网页和邮件通知。并且你可以赞任何帖子来分享你的感谢。:heartbeat:"
+      intro: "嘿！:heart_eyes: 看来你很欣赏该讨论，但你没有注册帐号。"
+      value_prop: "你创建一个 账号 后，我们可以准确地记录你的阅读进度，以便你总是马上回到你离开的地方。你也可以选择收到新帖的网站和邮件通知。并且你可以赞帖子以分享你的喜欢。:heartbeat:"
     summary:
       enabled_description: "你正在查看主题的精简摘要版本：一些社区公认有意思的帖子。"
       description: "有 <b>{{replyCount}}</b> 个回复。"
@@ -954,8 +949,6 @@ zh_CN:
       accept_invite: "接受邀请"
       success: "已创建您的帐号，您现在可以登录了。"
       name_label: "昵称"
-      name_label_optional: "昵称（可选）"
-      password_label: "设置密码(可选)"
     password_reset:
       continue: "转入到 %{site_name}"
     emoji_set:
@@ -1335,7 +1328,7 @@ zh_CN:
         auto_open: "本主题将在%{timeLeft}自动开启。"
         auto_close: "本主题将在%{timeLeft}自动关闭。"
         auto_publish_to_category: "主题%{timeLeft}将发布到<a href=%{categoryUrl}>#%{categoryName}</a> 。"
-        auto_close_based_on_last_post: "主题在%{duration}内没有新回复后将被关闭。"
+        auto_close_based_on_last_post: "如在 %{duration}内没有新回复后主题将被关闭。"
         auto_delete: "主题在%{timeLeft}后将被自动删除。"
         auto_reminder: "你将在%{timeLeft}后收到该主题的提醒。"
       auto_close_title: '自动关闭设置'
@@ -1728,8 +1721,8 @@ zh_CN:
       settings: '设置'
       topic_template: "主题模板"
       tags: "标签"
-      tags_allowed_tags: "仅在该分类内可以使用的标签"
-      tags_allowed_tag_groups: "仅在该分类内可以使用的标签组"
+      tags_allowed_tags: "仅在该 分类 内可以使用的标签"
+      tags_allowed_tag_groups: "仅在该 分类 内可以使用的标签组"
       tags_placeholder: "（可选）允许使用的标签列表"
       tag_groups_placeholder: "（可选）允许使用的标签组列表"
       topic_featured_link_allowed: "运行在该分类中发布特色链接"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index b49b176e7da..0e63b67de49 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -123,19 +123,19 @@ zh_TW:
     bootstrap_mode_disabled: "初始化模式將會在24小時後關閉。"
     s3:
       regions:
-        us_east_1: "美國東部 (北維珍尼亞州)"
-        us_west_1: "美國西部 (北加州)"
-        us_west_2: "美國西部 (奧勒岡州)"
-        us_gov_west_1: "AWS GovCloud (美國)"
-        eu_west_1: "歐洲 (愛爾蘭)"
-        eu_central_1: "歐洲 (法蘭克福)"
-        ap_southeast_1: "亞太地區 (新加坡)"
-        ap_southeast_2: "亞太地區 (悉尼)"
-        ap_south_1: "亞太地區 (孟買)"
         ap_northeast_1: "亞太地區 (東京)"
         ap_northeast_2: "亞太地區 (首爾)"
-        sa_east_1: "南美洲 (聖保羅)"
+        ap_south_1: "亞太地區 (孟買)"
+        ap_southeast_1: "亞太地區 (新加坡)"
+        ap_southeast_2: "亞太地區 (悉尼)"
         cn_north_1: "中國 (北京)"
+        eu_central_1: "歐洲 (法蘭克福)"
+        eu_west_1: "歐洲 (愛爾蘭)"
+        sa_east_1: "南美洲 (聖保羅)"
+        us_east_1: "美國東部 (北維珍尼亞州)"
+        us_gov_west_1: "AWS GovCloud (美國)"
+        us_west_1: "美國西部 (北加州)"
+        us_west_2: "美國西部 (奧勒岡州)"
     edit: '編輯此討論話題的標題與分類'
     not_implemented: "抱歉，此功能尚未開放。"
     no_value: "否"
@@ -317,11 +317,7 @@ zh_TW:
         full_name: '全名'
         add_members: "增加成員"
         delete_member_confirm: "從「%{group}」群組移除「%{username}」？"
-      request_membership_pm:
-        title: "請求會員資格"
-        body: "我想申請 @%{groupName} 的成員資格。"
       name_placeholder: "群組名，沒有空格，和用戶名一樣的規則"
-      public: "允許用戶自由加入/離開群組（需要群組是可見）"
       empty:
         posts: "群組成員沒有發佈帖子。"
         members: "這個團隊裡面沒有成員"
@@ -342,7 +338,6 @@ zh_TW:
       bio: "關於群組"
       selector_placeholder: "新增成員"
       owner: "擁有者"
-      visible: "群組可被所有用戶看到"
       index:
         title: "群組"
         empty: "沒有可看見的群組。"
@@ -449,7 +444,6 @@ zh_TW:
       mute: "靜音"
       edit: "編輯喜好設定"
       download_archive:
-        button_text: "下載我的文章"
         confirm: "你確定要下載你的文章嗎?"
         success: "開始下載，處理完畢後將以私人訊息通知您。"
         rate_limit_error: "帖子只能每天下載一次，請明天再重試。"
@@ -566,7 +560,6 @@ zh_TW:
         title: "修改用戶名稱"
         confirm: "確定更換用戶名？你的帖子和@提及你的引用將失效。"
         taken: "抱歉，此用戶名稱已經有人使用。"
-        error: "修改你的用戶名稱時發生錯誤。"
         invalid: "此用戶名稱無效，只能使用數字與英文字母。"
       change_email:
         title: "修改電子郵件地址"
@@ -925,7 +918,6 @@ zh_TW:
       your_email: "您帳號的電郵地址是 <b>%{email}</b>"
       accept_invite: "接受邀請"
       success: "你的帳號已被建立，且您已經登入了。"
-      password_label: "設定密碼(選填)"
     password_reset:
       continue: "繼續連接至 %{site_name}"
     emoji_set:
@@ -1595,9 +1587,6 @@ zh_TW:
       delete:
         confirm:
           other: "你確定要刪除這些文章?"
-      merge:
-        confirm:
-          other: "確定要合併這 {{count}} 個帖子嗎？"
       revisions:
         controls:
           first: "第一版"
@@ -1632,8 +1621,6 @@ zh_TW:
       settings: '設定'
       topic_template: "主題範本"
       tags: "標籤"
-      tags_allowed_tags: "僅在該分類內可以使用的標籤"
-      tags_allowed_tag_groups: "僅在該分類內可以使用的標籤組"
       tags_placeholder: "（可選）允許使用的標籤列表"
       tag_groups_placeholder: "（可選）允許使用的標籤組列表"
       topic_featured_link_allowed: "運行在該分類中發佈特色連結"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 82c01f104e9..59d9ab5c0c0 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -686,7 +686,6 @@ ar:
         remove: "هذا الموضوع لم يعد معلّم. لن يظهر في أعلى كل صفحة."
   unsubscribed:
     title: "غير مشترك "
-    description: "لقد تم الغاء اشتراكك. لتغير اختيارات بريدك الالكترونى <a href='%{url}'>زور اختياراتك الشخصية</a>"
     topic_description: "لإعادة الاشتراك لل %{link}، استخدم ادارة التنبيهات في أسفل او يمين الموضوع."
   unsubscribe:
     title: "إلغاء الإشتراك"
@@ -947,7 +946,6 @@ ar:
     notify_mods_when_user_blocked: "إذا تم حظر المستخدم تلقائيا، وإرسال رسالة الى جميع المشرفين."
     flag_sockpuppets: "إذا رد أحد المستخدمين جديد إلى موضوع من عنوان IP نفسه باسم المستخدم الجديد الذي بدأ هذا الموضوع، علم كل من مناصبهم كدعاية المحتملين."
     traditional_markdown_linebreaks: "استعمل السطور التالفه التقليديه في Markdown, التي تتطلب مساحتين بيضاوين للسطور التالفه"
-    allow_html_tables: "كل الجداول يجب ان تدخل ب لغة ال HTML مثال TABLE , THEAD , TD , TR , TH سوف يأوذن لهم ( تتطلب مراجعة لكل المقالات القديمة )"
     post_undo_action_window_mins: "عدد الدقائق التي يسمح فيها للأعضاء بالتراجع عن آخر إجراءاتهم على المنشور (إعجاب، اشارة، إلخ...)"
     must_approve_users: "يجب أن الموظفين يوافق على جميع حسابات المستخدم الجديدة قبل أن يتم السماح لهم للوصول إلى الموقع. تحذير: تمكين هذا لموقع الحية إلغاء وصول المستخدمين الحاليين غير الموظفين!"
     pending_users_reminder_delay: "نبه المشرفين إذا وجد اعضاء ينتظرون الموافقة لمدة اطول من الساعات ، قم بوضع الخيار -1 لايقاف التنبيهات ."
@@ -1365,7 +1363,7 @@ ar:
     errors: "%{errors}"
     not_available: "غير متاح. جرّب %{suggestion} ؟"
     something_already_taken: "حدث خطأ ما, ربما اسم المستخدم و البريد الالكتروني مسجل مسبقا, جرب رابط نسيان كلمة المرور."
-    omniauth_error: "نأسف, هناك خطأ في تصريح حسابك. ربما لم تعطي تصريح؟"
+    omniauth_error: "نأسف، حدث خطأ في استيثاق حسابك. لربمّا لم تقبل الاستيثاق؟"
     omniauth_error_unknown: "حدث خطأ ما في معالجة دخولك، الرجاء إعادة المحاولة."
     new_registrations_disabled: "لا يُسمح بتسجيل حساب جديد بهذا الوقت "
     password_too_long: "كلمة السّرّ مقصورة على 200 محرف."
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index cad39d62b08..0df0b081ded 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -136,7 +136,6 @@ bs_BA:
   meta_category_description: "Discussion about this site, its organization, how it works, and how we can improve it."
   staff_category_name: "Staff"
   staff_category_description: "Private category for staff discussions. Topics are only visible to admins and moderators."
-  assets_topic_body: "This is a permanent topic, visible only to staff, for storing images and files used in the site design. Don't delete it!\n\n\nHere's how:\n\n\n1. Reply to this topic.\n2. Upload all the images you wish to use for logos, favicons, and so forth here. (Use the upload toolbar icon in the post editor, or drag-and-drop or paste images.)\n3. Submit your reply to post it.\n4. Right click the images in your new post to get the path to the uploaded images, or click the edit icon to edit your post and retrieve the path to the images. Copy the image paths.\n5. Paste those image paths into [basic settings](/admin/site_settings/category/required).\n\n\nIf you need to enable different file type uploads, edit `authorized_extensions` in the [file settings](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Welcome to the Lounge"
     body: |2
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index bac3093b1e2..0dc576ad1fd 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -164,6 +164,7 @@ cs:
       admins: "admins"
       moderators: "moderators"
       staff: "staff"
+      trust_level_0: "trust_level_0"
       trust_level_1: "trust_level_1"
       trust_level_2: "trust_level_2"
       trust_level_3: "trust_level_3"
@@ -187,6 +188,8 @@ cs:
     attributes:
       category:
         name: "Název kategorie"
+      topic:
+        title: 'Nadpis'
       post:
         raw: "Tělo"
       user_profile:
@@ -206,12 +209,17 @@ cs:
               common: "je jedno z 10 000 nejčastějších hesel. Použijte prosím bezpečnější heslo."
               same_as_username: "je stejné jako vaše uživatelské jméno. Zkuste vymyslet bezpečnější heslo."
               same_as_email: "je stejné jako váš email. Zkuste vymyslet bezpečnější heslo."
+              same_as_current: "je stejné jako vaše současné heslo."
+              unique_characters: "má příliš mnoho opakujících se znaků. Použijte prosím bezpečnější heslo."
             ip_address:
               signup_not_allowed: "Registrace z této adresy není povolena."
         color_scheme_color:
           attributes:
             hex:
               invalid: "není platná barva"
+        post_reply:
+          base:
+            different_topic: "Příspěvek a odpověď musí patřit ke stejnému tématu."
       <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} o sobě zatím žádné informace nevyplnil</div>"
@@ -221,7 +229,6 @@ cs:
   meta_category_description: "Diskutuje tento web, jeho organizaci, jak funguje a jak ho vylepšit."
   staff_category_name: "Redakce"
   staff_category_description: "Privátní kategorie pro diskuze štábu. Témata jsou viditelná pouze pro moderátory a správce."
-  assets_topic_body: "Tohle je permanentí téma, viditelné pouze redaktorům, pro uchovávání obrázků a souborů použitých v designu tohoto webu. Nemažte ho!\n\n\nTady je jak:\n\n1. Odpovězte na toto téma.\n2. Nahrajte sem všechny obrázky které chcete používat pro loga, favicony a podobně. (Použijte ikonku „nahrát“ v panelu nad editorem, nebo obrázky rovnou přetáhněte nebo „vložte“)\n3. Pošlete tuto odpověď\n4. Klikněte pravým tlačítkem na obrázky ve vašem novém příspěvku a zkopírujte si adresy, nebo klikněte na úpravu přípěvku a adresy vykopírujte tam.\n5. Vložte tyto adresy do [základního nastavení](/admin/site_settings/category/required).\n\nPokud potřebujete nahrát jiné soubory, změňte nastavení `authorized_extensions` v [nastavení souborů](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Vítejte v Discourse"
   lounge_welcome:
@@ -725,7 +732,6 @@ cs:
       join_the_discussion: "Číst dále"
       popular_posts: "Populární příspěvky"
       subject_template: "[%{email_prefix}] Přehled"
-      unsubscribe: "Přehled zaslán z webu %{site_link}, protože jsi jej již nějaký čas nenavštívil. Pro zrušení zasílání %{unsubscribe_link}."
       click_here: "klikněte zde"
       from: "%{site_name} - přehled"
       preheader: "Krátký souhrn od poslední návštěvy v %{last_seen_at}"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 37f4d55b2ac..7fc9167b53a 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -357,7 +357,6 @@ da:
   meta_category_description: "Diskussion om dette site, hvordan det er indrettet, hvordan det virker og hvordan vi kan forbedre det."
   staff_category_name: "Staff"
   staff_category_description: "Privat gruppe for staff diskussioner. Emner er kun synlige for administratorer og moderatorer."
-  assets_topic_body: "Dette er et permanent emne, kun synlig for Staff, til at gemme billeder og filer som bruges til Site designet. Slet ikke dette emne!\n\n\nSådan virker det:\n\n\n1. Svar dette emne.\n2. Upload alle billeder som du ønsker at bruge til logoer, favicons etc her. (Brug upload ikonet i værktøjslinjen eller drag n drop billederne.)\n3. Send dit svar for at indsende det.\n4. Højreklik på billederne i dit svar for at se stien til de uploadede billeder, eller klik på ikonet for at redigere dit indlæg og find stierne til billederne der. Kopier billedestierne.\n5. Indsæt disse billedestier i [basic settings](/admin/site_settings/category/required).\n\n\nHvis du har brug for at tillade flere filtyper, så kan du redigere `authorized_extensions` i [file settings](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Velkommen til Discourse"
     body: |2
@@ -631,7 +630,6 @@ da:
         remove: "Dette emne er ikke mere et banner-emne. Det optræder ikke længere i toppen af alle sider."
   unsubscribed:
     title: "Frameldt!"
-    description: "Du er blevet frameldt. For at ændre i dine email settings <a href='%{url}'> besøg din profil</a>."
     topic_description: "For at følge %{link}, brug notifikationsindstillinger i bunden, eller til højre for emnet."
   unsubscribe:
     title: "Frameld"
@@ -905,7 +903,6 @@ da:
     notify_mods_when_user_blocked: "Send en besked til alle moderatorer hvis en bruger blokeres automatisk"
     flag_sockpuppets: "Hvis en ny bruger svarer på et emne fra den samme IP adresse som den der startede emnet, så rapporter begge at deres indlæg potentielt er spam."
     traditional_markdown_linebreaks: "Brug traditionelle linjeskift i Markdown, som kræver 2 mellemrum i slutningen af sætningen."
-    allow_html_tables: "Tillad tabeller at blive oprettet i Markdown med brug af HTML tags. TABLE, THEAD, TD, TR, TH vil blive tilladt (kræver en fuld re-indeksering af gamle indlæg som benytter tabeller) "
     post_undo_action_window_mins: "Antal minutter som brugere er tilladt at fortryde handlinger på et indlæg (like, flag, etc)."
     must_approve_users: "Personale skal godkende alle nye bruger konti inden de kan tilgå sitet. ADVARSEL: aktivering af dette for et live site vil medføre en ophævning af adgang for eksisterende ikke-personale brugere."
     pending_users_reminder_delay: "Underret moderatorer hvis nye brugere har ventet på godkendelse i længere end så mange timer. Skriv -1 for at deaktivere notifikationer."
@@ -1153,40 +1150,8 @@ da:
 
   invite_mailer:
     subject_template: "%{invitee_name} inviterede dig til '%{topic_title}' på %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} inviterede dig til en debat om
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      på
-
-      > %{site_title} -- %{site_description}
-
-      Hvis du er interesseret, så klik på linket herunder:
-
-      %{invite_link}
   custom_invite_mailer:
     subject_template: "%{invitee_name} inviterede dig til '%{topic_title}' på %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} inviterede dig til en debat
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      på
-
-      > %{site_title} -- %{site_description}
-
-      Med denne besked
-
-      > %{user_custom_message}
-
-      Hvis du er interesseret, så klik på linket herunder:
-
-      %{invite_link}
   invite_forum_mailer:
     subject_template: "%{invitee_name} inviterede dig til at oprette dig på %{site_domain_name}"
   custom_invite_forum_mailer:
@@ -1461,12 +1426,6 @@ da:
     new_user_of_the_month:
       title: "Du er månedens nye bruger!"
       subject_template: "Du er månedens nye bruger!"
-      text_body_template: |
-        Tillykke, du er blevet tildelt **Månedens nye bruger-pris i %{month_year}**. :trophy:
-
-        Denne pris bliver kun tildelt to nye brugere per måned, og den vil altid kunne ses på [din brugerside](/my/badges).
-
-        Du er hurtigt blevet et værdsat medlem af vores forum. Tak, fordi du har sluttet dig til os, og fortsæt endelig på samme vis!
   unsubscribe_link: |
     [Klik her](%{unsubscribe_url}) hvis du ikke længere vil modtage disse emails.
   unsubscribe_link_and_mail: |
@@ -1632,7 +1591,6 @@ da:
       popular_posts: "Populære indlæg"
       more_new: "Nyt for dig"
       subject_template: "[%{email_prefix}] Sammendrag"
-      unsubscribe: "Dette resumé sendes fra %{site_link} når vi ikke har set dig i et stykke tid. For at afmelde %{unsubscribe_link}."
       click_here: "klik her"
       from: "%{site_name} resumé"
       preheader: "Et kort resume siden de sidste besøg %{last_seen_at}"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 5ddfec27965..de23ebad7d9 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -359,9 +359,8 @@ de:
   meta_category_name: "Feedback"
   meta_category_description: "Diskussionen über dieses Forum, seine Organisation, wie es funktioniert und wie wir es verbessern können."
   staff_category_name: "Team"
-  staff_category_description: "Geschützte Kategorie für das Team-Diskussionen. Themen sind nur für Administratoren und Moderatoren sichtbar."
+  staff_category_description: "Geschützte Kategorie für Team-Diskussionen. Themen sind nur für Administratoren und Moderatoren sichtbar."
   assets_topic_title: "Mediendateien für das Seitendesign"
-  assets_topic_body: "Dies ist ein fester Beitrag, der nur für das Team sichtbar ist, um Bilder und Dateien, die im Forum benutzt werden zu speichern. Lösche diese nicht!\n\n\nAnleitung:\n\n\n1. Antworte auf dieses Thema.\n2. Lade alle Bilder, die du für Logos, Favicons und usw. nutzen willst, hier hoch. (Nutze dazu das Symbol für Lade-Symbolleiste im Beitrags-Editor oder ziehe und lasse die Bilder hier fallen oder füge sie eins.)\n3. Sende deine Antwort. \n4. Klicke mit der rechten Maustaste auf die Bilder in deinem neuen Beitrag, um die den Pfad zu bekommen oder klicke das Editier-Symbol, um deinen Beitrag zu editieren und dadurch den Pfad zu den Bildern zu bekommen. Kopiere die Bild-Pfade.\n5. Füge die Bild-Pfade in [basic settings](/admin/site_settings/category/required) ein.\n\n\nWenn du andere Dateityp-Uploads aktivieren willst, editiere `authorized_extensions` in [file settings](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Willkommen bei Discourse"
     body: |2
@@ -645,7 +644,6 @@ de:
         remove: "Dieses Thema ist jetzt kein Banner mehr. Es wird nicht mehr auf jeder Seite ganz oben angezeigt."
   unsubscribed:
     title: "Abbestellt!"
-    description: "Du hast die Benachrichtigungen erfolgreich abbestellt. Um deine E-Mail-Einstellungen zu ändern, <a href='%{url}%'>besuche deine Einstellungen</a>."
     topic_description: "Um %{link} wieder zu abonnieren, verwende die Benachrichtigungseinstellungen, die du am Ende und rechts von jedem Thema findest."
   unsubscribe:
     title: "Abbestellen"
@@ -923,7 +921,6 @@ de:
     notify_mods_when_user_blocked: "Wenn ein Benutzer automatisch gesperrt wird, sende eine Nachricht an alle Moderatoren."
     flag_sockpuppets: "Wenn ein neuer Benutzer auf ein Thema antwortet, das von einem anderen neuen Benutzer aber mit der gleichen IP-Adresse begonnen wurde, markiere beide Beiträge als potenziellen Spam."
     traditional_markdown_linebreaks: "Traditionelle Zeilenumbrüche in Markdown, die zwei nachfolgende Leerzeichen für einen Zeilenumbruch benötigen."
-    allow_html_tables: "Erlaube es, Tabellen in Markdown mit HTML-Tags einzugeben. TABLE, THEAD, TD, TR, TH werden erlaubt (alle Beiträge mit Tabellen müssen ihr HTML erneuern)"
     post_undo_action_window_mins: "Minuten, die ein Benutzer hat, um Aktionen auf einen Beitrag rückgängig zu machen (Gefällt mir, Meldung, usw.)."
     must_approve_users: "Team-Mitglieder müssen alle neuen Benutzerkonten freischalten, bevor diese Zugriff auf die Website erhalten. ACHTUNG: Das Aktivieren dieser Option für eine Live-Site entfernt den Zugriff auch für alle existierenden Benutzer außer für Team-Mitglieder!"
     pending_users_reminder_delay: "Benachrichtige die Moderatoren, falls neue Benutzer mehr als so viele Stunden auf ihre Genehmigung gewartet haben. Stelle -1 ein, um diese Benachrichtigungen zu deaktivieren."
@@ -1522,41 +1519,9 @@ de:
   invite_mailer:
     title: "Einladung zu einem Thema"
     subject_template: "%{invitee_name} hat dich zum Thema '%{topic_title}' auf %{site_domain_name} eingeladen"
-    text_body_template: |
-      %{invitee_name} hat dich eingeladen zur Diskussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      bei
-
-      > %{site_title} -- %{site_description}
-
-      Wenn du interessiert bist, klicke auf den folgenden Link:
-
-      %{invite_link}
   custom_invite_mailer:
     title: "Einladung zu einem Thema (mit Nachricht)"
     subject_template: "%{invitee_name} hat dich eingeladen zu '%{topic_title}' auf %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} hat dich eingeladen zur Diskussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      bei
-
-      > %{site_title} -- %{site_description}
-
-      Mit dieser Notiz:
-
-      > %{user_custom_message}
-
-      Falls du Interesse hast, klicke auf den nachfolgenden Link:
-
-      %{invite_link}
   invite_forum_mailer:
     title: "Einladung zur Teilnahme"
     subject_template: "%{invitee_name} hat dich eingeladen %{site_domain_name} beizutreten"
@@ -2078,12 +2043,6 @@ de:
     new_user_of_the_month:
       title: "Du bist ein neuer Benutzer des Monats!"
       subject_template: "Du bist ein neuer Benutzer des Monats!"
-      text_body_template: |
-        Glückwunsch, du hast die Auszeichnung **Neuer Benutzer des Monats %{month_year}** erhalten. :trophy:
-
-        Diese Auszeichnung wird nur zwei neuen Benutzern pro Monat verliehen, und wird dauerhaft sichtbar sein auf [deiner Profilseite](/my/badges).
-
-        Du bist schnell ein wertvolles Mitglied unserer Community geworden. Danke, dass du dazugekommen bist, und mache weiter mit der großartigen Arbeit!
   unsubscribe_link: |
     Um diese E-Mails abzubestellen, [klicke hier](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2109,26 +2068,6 @@ de:
     visit_link_to_respond: "[Rufe das Thema auf](%{base_url}%{url}), um zu antworten."
     visit_link_to_respond_pm: "[Rufe die Nachricht auf](%{base_url}%{url}), um zu antworten."
     posted_by: "Erstellt von %{username} am %{post_date}"
-    invited_to_private_message_body: |
-      %{username} hat dich zu einer Unterhaltung eingeladen
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      auf
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} hat dich zu einer Diskussion eingeladen
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      auf
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Benutzer zu Nachricht eingeladen"
       subject_template: "[%{email_prefix}] %{username} hat dich zu einer Unterhaltung '%{topic_title}' eingeladen"
@@ -2276,7 +2215,6 @@ de:
       popular_posts: "Beliebte Beiträge"
       more_new: "Neu für dich"
       subject_template: "[%{email_prefix}] Zusammenfassung"
-      unsubscribe: "Diese Zusammenfassung wird von %{site_link} gesendet, wenn wir dich einige Zeit lang nicht gesehen haben. Abbestellen unter %{unsubscribe_link}."
       click_here: "klicke hier"
       from: "Zusammenfassung für %{site_name}"
       preheader: "Eine kurze Zusammenfassung seit deinem letzten Besuch am %{last_seen_at}"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index d0235a50943..57ecd3f5ca7 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -40,7 +40,7 @@ el:
       errors:
         empty_email_error: "Συμβαίνει όταν το αρχικό μήνυμα που λάβαμε ήταν κενό."
         no_message_id_error: "Συμβαίνει όταν η αλληλογραφία δεν έχει επικεφαλίδα 'Message-Id' ."
-        auto_generated_email_error: "Συμβαίνει όταν η επικεφαλίδα 'προτεραιότητα' έχει οριστεί ώς: λίστα, άχρηστα,κύριο μέρος,, ή όταν οποιαδήποτε άλλη επικεφαλίδα  περιλαμβάνει: αυτόματη καταχώριση, αυτόματη απάντηση ή αυτόματη παραγώγιση."
+        auto_generated_email_error: "Συμβαίνει όταν η επικεφαλίδα 'προτεραιότητα' έχει οριστεί ώς: λίστα, άχρηστα, χύμα ή αυτόματη απάντηση ή όταν οποιαδήποτε άλλη επικεφαλίδα  περιλαμβάνει: αυτόματη καταχώρηση, αυτόματη απάντηση ή αυτόματη δημιουργία."
         no_body_detected_error: "Συμβαίνει όταν είναι αδύνατο να βρεθεί το κύριο μέρος του μηνύματος και όταν δεν υπάρχουν επισυναπτόμενα."
         inactive_user_error: "Συμβαίνει όταν ο αποστολέας είναι ανενεργός"
         blocked_user_error: "Συμβαίνει όταν ο αποστολέας έχει μπλοκαριστεί"
@@ -133,15 +133,15 @@ el:
     continue: "Συνέχισε τη συζήτηση"
     error: "Σφάλμα κατα την ενσωμάτωση"
     referer: "Αναφέρων:"
-    mismatch: "Ο αναφέρων δεν ταιριάζει με οποιοδήποτε από τα παρακάτω πεδία:"
-    no_hosts: "Κανένα πεδίο δεν ορίστικε για ενσωμάτωση"
+    mismatch: "Ο παραπέμπων δεν ταιριάζει με οποιοδήποτε από τα παρακάτω πεδία:"
+    no_hosts: "Κανένας εξυπηρετητής δεν ορίστικε για ενσωμάτωση"
     configure: "Ρύθμιση Ενσωμάτωσης"
     more_replies:
       one: "μια ακόμη απάντηση"
       other: "%{count} ακόμη απαντήσεις"
     loading: "Φόρτωση συζήτησης..."
     permalink: "Μόνιμος σύνδεσμος"
-    imported_from: "Αυτό είναι το θέμα συζητησης της παρέας για την αυθεντική είσοδο στο %{link}"
+    imported_from: "Αυτό είναι ένα συνοδό θέμα συζητησης για την αρχική ανάρτηση στο %{link}"
     in_reply_to: "▶ %{username}"
     replies:
       one: "1 απάντηση"
@@ -169,7 +169,7 @@ el:
   spamming_host: "Συγγνώμη αλλά δεν μπορείτε να αναρτήσετε σύνδεσμο σε αυτόν τον διακομιστή."
   user_is_suspended: "Δεν επιτρέπεται να δημοσιεύσουν οι χρήστες που βρίσκονται σε κατάσταση αναστολής."
   topic_not_found: "Κάτι πήγε στραβά. Ίσως το νήμα έκλεισε ή διαγράφηκε ενώ το κοιτούσες;"
-  not_accepting_pms: "Λυπούμαστε, %{username} δεν δέχεται μηνύματα αυτή τη στιγμή."
+  not_accepting_pms: "Λυπούμαστε, ο/η %{username} δεν δέχεται μηνύματα αυτή τη στιγμή."
   just_posted_that: "είναι παρόμοιο με αυτό που δημοσιεύσατε πρόσφατα"
   invalid_characters: "περιέχει μη έγκυρους χαρακτήρες"
   is_invalid: "φαίνεται ασαφές, είναι μια ολοκληρωμένη πρόταση;"
@@ -177,9 +177,9 @@ el:
   prev_page: "προηγούμενη σελίδα"
   page_num: "Σελίδα %{num}"
   home_title: "Αρχική σελίδα"
-  topics_in_category: "Θέματα στη '%{κατηγορία}' κατηγορία"
+  topics_in_category: "Θέματα στη '%{category}' κατηγορία"
   rss_posts_in_topic: "RSS feed του '%{topic}'"
-  rss_topics_in_category: "Ροή RSS νημάτων στην κατηγορία '%{category}'"
+  rss_topics_in_category: "Ροή RSS των νημάτων στην κατηγορία '%{category}'"
   author_wrote: "%{author} έγραψε:"
   num_posts: "Δημοσιεύσεις:"
   num_participants: "Συμμετέχοντες:"
@@ -188,14 +188,14 @@ el:
   rss_description:
     latest: "Τελευταία θέματα"
     hot: "Σημαντικά Θέματα"
-    top: "Κορυφαία Θέματα"
+    top: "Κορυφαία Νήματα"
     top_all: "Κορυφαία νήματα όλων των εποχών"
     top_yearly: "Ετήσια κορυφαία νήματα"
     top_quarterly: "Τριμηνιαία κορυφαία νήματα"
     top_monthly: "Μηνιαία κορυφαία νήματα"
     top_weekly: "Εβδομαδιαία κορυφαία νήματα"
     top_daily: "Ημερήσια κορυφαία νήματα"
-    posts: "Τελευταίες αναρτήσεις"
+    posts: "Τελευταίες δημοσιεύσεις"
     private_posts: "Νέα προσωπικά μηνύματα"
     group_posts: "Τελευταίες δημοσιεύσεις από %{group_name}"
     group_mentions: "Τελευταίες αναφορές από %{group_name}"
@@ -206,7 +206,7 @@ el:
   revert_version_same: "Η τρέχουσα έκδοση είναι η ίδια με την έκδοση που προσπαθείς να επαναφέρεις."
   excerpt_image: "φωτογραφία"
   queue:
-    delete_reason: "διαγράφοντε μέσο εναλλαγμένης σειράς "
+    delete_reason: "Διαγράφτηκαν μέσω της ουράς επανελέγχου "
   groups:
     errors:
       can_not_modify_automatic: "Δεν μπορείς να τροποποιήσεις μια αυτόματη ομάδα"
@@ -228,7 +228,7 @@ el:
   education:
     until_posts:
       one: "1 ανάρτηση"
-      other: "%{count} αναρτήσεις"
+      other: "%{count} δημοσιεύσεις"
     new-topic: |
       Καλώς ήρθατε στο %{site_name} &mdash. ** ευχαριστούμε που αρχίσατε μιά νέα συνομιλία!**
 
@@ -276,11 +276,11 @@ el:
 
       Λυπούμαστε, αλλά οι νέοι χρήστες είναι προσωρινά περιορισμένοι σε %{newuser_max_replies_per_topic} απαντήσεις στο ίδιο νήμα.
 
-      Αντί να προσθέσετε κι άλλη απάντηση, παρακαλώ επεξεργατείτε τις προηγούμενες απαντήσεις ή επισκεφθείτε άλλα νήματα.
+      Αντί να προσθέσετε κι άλλη απάντηση, παρακαλώ επεξεργαστείτε τις προηγούμενες απαντήσεις σας ή επισκεφθείτε άλλα νήματα.
     reviving_old_topic: |
-      ### Αναβίωση αυτού του νήματος?
+      ### Αναβίωση αυτού του νήματος;
 
-      Η τελευταία απάντηση σε αυτό το νήμα ήταν **%{days}** μέρες πριν. Η απάντησή σας θα μεταφέρει το νήμα στην κορυφή της λίστας του και θα ειδοποιήjavascript:;σει οποιονδήποτε έχει προηγουμένως εμπλακεί στη συζήτηση.
+      Η τελευταία απάντηση σε αυτό το νήμα ήταν **%{days}** μέρες πριν. Η απάντησή σας θα μεταφέρει το νήμα στην κορυφή της λίστας και θα ειδοποιήσει οποιονδήποτε έχει προηγουμένως συμμετάσχει στη συζήτηση.
 
       Είστε σίγουροι ότι θέλετε να συνεχίσετε αυτή την παλιά συζήτηση;
   activerecord:
@@ -310,10 +310,10 @@ el:
           attributes:
             password:
               common: "είναι ένας από τους 10000 πιο κοινούς κωδικούς πρόσβασης. Παρακαλώ χρησιμοποιήστε έναν πιο ασφαλή κωδικό πρόσβασης."
-              same_as_username: "είναι ο ίδιος με το όνομα χρήστη σας. Παρακαλώ χρησιμοποιήστε εναν πιο ασφαλή κωδικό πρόσβασης."
+              same_as_username: "είναι το ίδιο με το όνομα χρήστη σας. Παρακαλώ χρησιμοποιήστε εναν πιο ασφαλή κωδικό πρόσβασης."
               same_as_email: "είναι το ίδιο με το email σας. Παρακαλώ χρησιμοποιήστε ένα πιο ασφαλές κωδικό."
               same_as_current: "είναι ο ίδιος με τον τρέχοντα κωδικό."
-              unique_characters: "Περιέχει υπερβολικά πολλούς επαναλαμβανόμενους χαρακτήρες. Παρακαλώ χρησιμοποιήστε ένα πιο ασφαλή κωδικό πρόσβασης. "
+              unique_characters: "περιέχει πολλούς επαναλαμβανόμενους χαρακτήρες. Παρακαλώ χρησιμοποιήστε ένα πιο ασφαλή κωδικό πρόσβασης. "
             ip_address:
               signup_not_allowed: "Η εγγραφή δεν επιτρέπεται απο αυτόν τον λογαρισμό"
         color_scheme_color:
@@ -334,7 +334,6 @@ el:
   staff_category_name: "Προσωπικό"
   staff_category_description: "Ιδιωτική κατηγορία για συζητήσεις του προσωπικού. Τα θέματα είναι ορατά μόνο σε διαχειριστές και συντονιστές."
   assets_topic_title: "Στοιχεία/assets για τον σχεδιασμό της ιστοσελίδας"
-  assets_topic_body: "Αυτό είναι ένα μόνιμο θέμα, είναι ορατό μόνο στο προσωπικό, για την αποθήκευση εικόνων και αρχείων που χρησιμοποιούνται στον σχεδιασμό της ιστοσελίδα. Μην το διαγράψετε!\n\nΕδώ είναι πως:\n\n1. Απαντήστε σε αυτό το θέμα.\n2. Ανεβάστε όλες τις εικόνες που θέλετε να χρησιμοποιήσετε σαν λογότυπα, αγαπημένα εικονίδια και ούτω κάθε εξής. (Χρησιμοποιήστε το εικονίδιο της γραμμής εργαλείων μεταφόρτωσης στη επεξεργασία ανάρτησης, ή σύρετε ή επικολλήστε εικόνες.)\n3. Υποβάλετε απάντησή σας για να το δημοσιεύσετε.\n4. Κάντε δεξί κλικ στις εικόνες στη νέα ανάρτηση σας για να πάρετε το σύνδεσμο των απεσταλμένων εικόνων, ή κάντε κλικ στο εικονίδιο επεξεργασία για να επεξεργαστείτε τη ανάρτηση σας και να ανακτήσετε το σύνδεσμο με τις εικόνες. Αντιγράψτε το σύνδεσμο.\n5. Επικολλήστε τον σύνδεσμο [basic settings](/admin/site_settings/category/required).\n\n\nΕάν θέλετε να ενεργοποιήσετε διαφορετικό τύπο αρχείου για να ανεβάσετε, επεξεργαστείτε `εξουσιοδοτημένες_επεκτάσεις` στο [file settings](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Καλώς ήρθατε στο Discourse"
     body: |2+
@@ -342,14 +341,11 @@ el:
 
       Η πρώτη παράγραφος αυτού του καρφιτσωμένου θέματος θα είναι ορατή ως μήνυμα καλωσορίσματος προς τους νέους επισκέπτες της σελίδας. Είναι σημαντικό!
 
-      **Να αλλαχτεί** σε μία σύντομη περιγραφή της κοινότητά σας:
+      **Αλλάξτε αυτό** με μία σύντομη περιγραφή της κοινότητάς σας:
 
       - Σε ποιον απευθύνεται η σελίδα;
-
       - Τι θα βρει εδώ πέρα;
-
       - Γιατί αξίζει να επισκευθεί τη σελίδα;
-
       - Που αλλού θα μπορούσαν να βρουν υλικό σχετικά με το θέμα; (url κτλπ)
 
 
@@ -357,7 +353,7 @@ el:
 
       <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
 
-      Θα ήταν καλό να κλείσετε αυτό το θέμα μέσω του διαχειριστή :wrench: (στην κάτω δεξιά και προς τα πάνω μεριά), έτσι ώστε οι απαντήσεις να μην μαζευτούν στην ανακοίνωση.
+      Θα ήταν καλό να κλείσετε αυτό το θέμα μέσω του διαχειριστή :wrench: (στην πάνω δεξιά και κάτω θέση), έτσι ώστε οι απαντήσεις να μην μαζευτούν στην ανακοίνωση.
 
   lounge_welcome:
     title: "Καλώς ήρθατε στο Σαλόνι"
@@ -365,7 +361,7 @@ el:
 
       Συγχαρητήρια! :confetti_ball:
 
-      Εάν μπορείς να δεις αυτό το θέμα, έχεις πρόσφατα μεταφερθεί στο **κανονικα** (επίπεδο εμπιστοσύνης χρήστη 3)
+      Εάν μπορείς να δεις αυτό το θέμα, έχεις πρόσφατα προαχθεί σε **κανονικό μέλος** (επίπεδο εμπιστοσύνης χρήστη 3)
 
       Μπορείς τώρα να &hellip,
 
@@ -375,20 +371,20 @@ el:
 
       *Έχεις όλες σου τις σελίδες ακολουθημένες ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) έχει διαγραφτεί)
 
-      *Έχεις πρόσβαση σε ιδιοτική Lounge κατηγορία, που εμφανίζεται μόνο σε χρήστες του επιπέδου 3 και πιο πάνω.
+      *Έχεις πρόσβαση σε ιδιωτική Lounge κατηγορία, που εμφανίζεται μόνο σε χρήστες του επιπέδου 3 και πάνω.
 
-      *Κρύψεις ανεπιθύμητη αλληλογραφία με μία σημαία
+      *Κρύψεις ανεπιθύμητη αλληλογραφία με την σημαία
 
-      Εδώ είναι η [current list of fellow regulars](/badges/3/regular). Είσαι σίγουρος ότι θα πεις γεια.
+      Εδώ είναι η [λίστα με όλα τα κανονικά μέλη](/badges/3/regular). Μπες να πεις ένα γεια.
 
-      Ευχαριστούμε που είσαι ένα σημαντικό μέρος αυτής της κοινότητας!
+      Ευχαριστούμε που συνεχίζεις να είσαι ένα σημαντικό μέρος αυτής της κοινότητας!
 
-      (Για περισσότερες πληροφορίες όσον αφορά τα πεδία, [see this topic][trust]. Παρακαλώ σημείωσε πως μόνο τα μέλη που συνεχίζουν να τηρούν τις απαραίτητες απαιτήσεις θα παραμένουν μόνιμοι χρήστες.)
+      (Για περισσότερες πληροφορίες όσον αφορά τα επίπεδα χρηστών, [διάβασε αυτό το κείμενο][trust]. Παρακαλώ σημείωσε πως μόνο τα μέλη που συνεχίζουν να τηρούν τις απαραίτητες απαιτήσεις θα παραμένουν κανονικά μέλη.)
 
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Σχετικά με την κατηγορία %{category} "
-    replace_paragraph: "(Αντικατέστηστε αυτή την πρώτη παράγραφο με μια σύντομη περιγραφή της νέας σας κατηγορίας. Αυτή η οδηγία θα εμφανιστεί στην περιοχή επιλογής κατηγορίας, επομένως προσπάθησε να είναι κάτω απο 200 χαρακτήρες. **Μέχρι να επεξεργαστείς αυτή την περιγραφή ή να δημιουργήσεις θέματα, αυτή η κατηγορία δεν θα εμφανίζεται στην σελίδα κατηγοριών. **)"
+    replace_paragraph: "(Αντικατέστησε αυτή την πρώτη παράγραφο με μια σύντομη περιγραφή της νέας σας κατηγορίας. Αυτή η οδηγία θα εμφανιστεί στην περιοχή επιλογής κατηγορίας, επομένως προσπάθησε να είναι κάτω απο 200 χαρακτήρες. **Μέχρι να επεξεργαστείς αυτή την περιγραφή ή να δημιουργήσεις θέματα, αυτή η κατηγορία δεν θα εμφανίζεται στην σελίδα κατηγοριών. **)"
     post_template: "%{replace_paragraph}\n\nΧρησιμοποιήστε τις επόμενες παραγράφους για μια μεγαλύτερη περιγραφή, ή για να καθορίσεις οδηγίες και κανόνες για τις κατηγορίες:\n\n- Γιατί μπορεί να χρησιμοποιηθεί αυτή η κατηγορία? Ποιος είναι ο σκοπός της?\n\n- Αυτή η κατηγορία είναι διαφορετική από αυτές που έχουμε ήδη?\n\n- Τι πρέπει να περιέχουν τα θέματα αυτής της κατηγορίας γενικότερα?\n\n- Χρειαζόμαστε αυτή την κατηγορία? Μπορούμε να την ενώσουμε με άλλη κατηγορία, ή υποκατηγορία?\n\n\n"
     errors:
       uncategorized_parent: "Μη κατηγοριοποιημένο δεν μπορεί να έχει κύρια κατηγορία"
@@ -416,25 +412,25 @@ el:
       title: "κανονικός"
     leader:
       title: "αρχηγός"
-    change_failed_explanation: "Προσπάθησες να υποβιβάσεις τον %{όνομα_χρήστη} σε '%{new_trust_level}'. Ωστόσο το επίπεδο εμπιστοσύνης τους είναι ήδη '%{current_trust_level}'. Ο/Η %{user_name} θα παραμείνει στο '%{current_trust_level}' - εάν επιθυμείς ακόμα να υποβιβάσεις το επίπεδο εμπιστοσύνης του χρήστη, κλείδωσε πρώτα το επίπεδο εμπιστοσύνης "
+    change_failed_explanation: "Προσπάθησες να υποβιβάσεις τον %{user_name} σε '%{new_trust_level}'. Ωστόσο το επίπεδο εμπιστοσύνης τους είναι ήδη '%{current_trust_level}'. Ο/Η %{user_name} θα παραμείνει στο '%{current_trust_level}' - εάν επιθυμείς ακόμα να υποβιβάσεις το επίπεδο εμπιστοσύνης του χρήστη, κλείδωσε πρώτα το επίπεδο εμπιστοσύνης "
   rate_limiter:
     slow_down: "Η εντολή αυτή έχει εκτελεστεί πάρα πολλές φορές, δοκιμάστε ξανά αργότερα."
-    too_many_requests: "Υπάρχει περιορισμός στις φορές που επαναληφθεί να γίνει αυτή η πράξη μέσα σε μια μέρα. Παρακαλούμε παριμένετε  %{time_left}  προτού δοκιμάσετε ξανά."
+    too_many_requests: "Υπάρχει περιορισμός στις φορές που μπορεί να επαναληφθεί αυτή η ενέργεια. Παρακαλούμε παριμένετε  %{time_left}  προτού δοκιμάσετε ξανά."
     by_type:
-      first_day_replies_per_day: "Έχεται φτάσει τον μέγιστο αριθμό απαντήσεων όπου ένας νέος χρήστης μπορεί να δημιουρήσει στην πρώτη του μέρα. Παρακαλώ όπως αναμέναται %{time_left} προτού να προσπαθήσεται ξανά."
-      first_day_topics_per_day: "Έχεται φτάσει τον μέγιστο αριθμό θεμάτων όπου ένας νέος χρήστης μπορεί να δημιουργήσει στην πρώτη του μέρα. Παρακαλώ όπως αναμένατε %{time_left} προτού να προσπαθήσετε ξανά."
-      create_topic: "Δημιουργείτε θέματα πολύ γρήγορα. Παρακαλώ περιμένετε %{time_left} προτού να προσπαθήσετε ξανά."
-      create_post: "Η απάντησή σας ήταν πολύ γρήγορη. Παρακαλώ όπως αναμένατε %{time_left} προτού να προσπαθήσεται ξανά."
-      delete_post: "Διαγράφεται πολύ γρήγορα τις δημοσιεύσεις.  Παρακαλώ όπως αναμέναται %{time_left} προτού να προσπαθήσεται ξανά."
-      public_group_membership: "ενώνεστε και βγένετε πολύ συχνά. περιμένετε % {time_left} πριν δοκιμάσετε ξανά"
-      topics_per_day: "Έχεις φτάσει το ανώτατο όριο νέων θεμάτων σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      pms_per_day: "Έχεις φτάσει το ανώτατο όριο μηνυμάτων σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      create_like: "Έχεις φτάσει το ανώτατο όριο αριθμού των \"μου αρέσει\" σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      create_bookmark: "Έχεις φτάσει το ανώτατο όριο σελιδοδείκτων σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      edit_post: "Έφτασες τον μέγιστο αριθμό επεξεργασιών σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
+      first_day_replies_per_day: "Έχετε φτάσει τον μέγιστο αριθμό απαντήσεων που δικαιούται ένας νέος χρήστης την πρώτη του μέρα. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
+      first_day_topics_per_day: "Έχεται φτάσει τον μέγιστο αριθμό θεμάτων που δικαιούται ένας νέος χρήστης την πρώτη του μέρα. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
+      create_topic: "Δημιουργείτε θέματα πολύ γρήγορα. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
+      create_post: "Η απάντησή σας ήταν πολύ γρήγορη. Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
+      delete_post: "Διαγράφετε πολύ γρήγορα τις δημοσιεύσεις.  Παρακαλώ περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
+      public_group_membership: "Συνδέεστε και αποσυνδέεστε πολύ συχνά. περιμένετε %{time_left} πριν δοκιμάσετε ξανά"
+      topics_per_day: "Έχεις φτάσει το ανώτατο όριο νέων θεμάτων για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
+      pms_per_day: "Έχεις φτάσει το ανώτατο όριο μηνυμάτων για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
+      create_like: "Έχεις φτάσει το ανώτατο όριο αριθμού των \"μου αρέσει\" για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
+      create_bookmark: "Έχεις φτάσει το ανώτατο όριο σελιδοδείκτων για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
+      edit_post: "Έφτασες τον μέγιστο αριθμό επεξεργασιών για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
       live_post_counts: "Ζητάς ζωντανές δημοσιεύσεις πολύ γρήγορα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
-      unsubscribe_via_email: "Έχετε φτάσει το μέγιστο αριθμό των καταργήσεων εγγραφής μέσω του ηλεκτρονικού ταχυδρομείου σήμερα. Παρακαλώ περιμένετε % {time_left} πριν προσπαθήσετε ξανά."
-      topic_invitations_per_day: "Έχετε φθάσει το ανώτατο όριο προσκλήσεων τίτλου για σήμερα. Παρακαλώ περιμένετε %{time_left} πριν δοκιμάσετε ξανά."
+      unsubscribe_via_email: "Έχεις φτάσει το μέγιστο αριθμό των καταργήσεων εγγραφής μέσω του ηλεκτρονικού ταχυδρομείου για σήμερα. Παρακαλώ περίμενε % {time_left} πριν προσπαθήσεις ξανά."
+      topic_invitations_per_day: "Έχεις φτάσει το ανώτατο όριο προσκλήσεων σε νήματα για σήμερα. Παρακαλώ περίμενε %{time_left} πριν δοκιμάσεις ξανά."
     hours:
       one: "1 ώρα"
       other: "%{count} ώρες"
@@ -516,61 +512,61 @@ el:
         one: "σχεδόν 1 χρόνο πριν"
         other: "σχεδόν %{count} χρόνια πριν"
   password_reset:
-    no_token: "Συγνώμη, ο σύνδεσμος αλλάξτε τον κοδικό σας είναι πολύ παλιός. Επιλέξτε ενωθήτε και χρησιμοποιήστε 'ξέχασα τον κοδικό μου' για να λάβετε νέο σύνδεσμο. "
-    choose_new: "Επίλεξε έναν νέο κωδικό πρόσβασης"
-    choose: "Επίλεξε κωδικό πρόσβασης"
-    update: 'Ενημέρωση συνθηματικού'
-    save: 'Εφαρμογή Συνθηματικού'
-    title: 'Δημιουργία καινούργιου συνθηματικού'
+    no_token: "Συγνώμη, ο σύνδεσμος αλλαγής κωδικού είναι πολύ παλιός. Πατήστε ξανά το κουμπί 'Συνδεθείτε' και επιλέξτε 'Ξέχασα τον κωδικό πρόσβασής μου' για να λάβετε νέο σύνδεσμο. "
+    choose_new: "Επιλέξτε νέο κωδικό πρόσβασης"
+    choose: "Επιλέξτε έναν κωδικό πρόσβασης"
+    update: 'Ενημέρωση κωδικού πρόσβασης'
+    save: 'Εφαρμογή κωδικού πρόσβασης'
+    title: 'Επαναφορά κωδικού πρόσβασης'
     success: "Αλλάξατε επιτυχώς τον κωδικό πρόσβασής σας και έχετε συνδεθεί."
     success_unapproved: "Αλλάξατε επιτυχώς τον κωδικό πρόσβασής σας"
   change_email:
     confirmed: "Η ηλεκτρονική διεύθυνσή σας έχει ενημερωθεί."
     please_continue: "Συνεχίστε στο %{site_name}"
-    error: "Υπήρχε ένα λάθος αλλάζοντας την διεύθυνση email. Ίσως η διεύθυνση είναι ήδη σε χρήση;"
-    error_staged: "Υπήρξε πρόβλημα στο να αλλάξετε την ηλεκτρονική σας διέυθυνση. Η διέυθυνση αυτη χρησιμοποιήτε ήδη από αλλό χρήστη. "
-    already_done: "Λυπούμαστε, αυτή η επιβεβαίωση του συνδέσμου δεν είναι πια έγκυρη. Πιθανόν η διεύθυνση του ηλεκτρονικού ταχυδρομείου να έχει αλλάξει ήδη."
+    error: "Υπήρξε ένα σφάλμα κατά την αλλαγή της διεύθυνσης ηλεκτρονικού ταχυδρομείου σου. Ίσως αυτή η διεύθυνση είναι ήδη σε χρήση;"
+    error_staged: "Υπήρξε ένα σφάλμα κατά την αλλαγή της διεύθυνσης ηλεκτρονικού ταχυδρομείου σου. Η δεύθυνση αυτή χρησιμοποιείται ήδη από αλλό χρήστη. "
+    already_done: "Λυπούμαστε, αυτός ο σύνδεσμος επιβεβαίωσης του λογαριασμού σας δεν είναι πλέον έγκυρος. Ίσως η διεύθυνση του ηλεκτρονικού ταχυδρομείου σας να έχει αλλάξει ήδη."
     authorizing_old:
-      title: "Ευχαριστώ για την επιβεβαίωση της τρέχουσας διεύθυνσης ηλεκτρονικού ταχυδρομείου"
-      description: "Σας στέλνουμε τώρα με ηλεκτρονικό μύνημα με την επιβεβαίωση τηνς νεας σας διέυθυνσης "
+      title: "Ευχαριστούμε για την επιβεβαίωση της τρέχουσας διεύθυνσης ηλεκτρονικού ταχυδρομείου"
+      description: "Σας στέλνουμε τώρα με ηλεκτρονικό μύνημα την επιβεβαίωση της νεας σας διέυθυνσης."
   activation:
     action: "Πατήστε εδώ για να ενεργοποιήσετε το λογαριασμό σας."
     already_done: "Συγνώμη, αυτός ο σύνδεσμος επιβεβαίωσης του λογαριασμού σας δεν είναι πλέον έγκυρος. Ίσως ο λογαριασμός σας είναι ήδη ενεργός;"
     please_continue: "Ο νέος λογαριασμός σας έχει επιβεβαιωθεί. Θα μεταφερθείτε στην αρχική σελίδα."
     continue_button: "Συνεχίστε στο %{site_name}"
     welcome_to: "Καλώς ήλθατε στο %{site_name}!"
-    approval_required: "Ένας συντονιστής πρέπει να εγκρίνει το νέο σας λογαριασμό για να μπορέσετε να αποκτήσετε πρόσβαση σε αυτό το φόρουμ. Θα λάβετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου όταν ο λογαριασμός σας έχει εγκριθεί!"
-    missing_session: "Δεν μπορούμε να ανιχνεύσουμε αν δημιουργήθηκε ο λογαριασμό σας, παρακαλούμε βεβαιωθείτε ότι έχετε ενεργοποιήσει τα cookies."
+    approval_required: "Ένας συντονιστής πρέπει να εγκρίνει το νέο σας λογαριασμό πριν αποκτήσετε πρόσβαση σε αυτό το φόρουμ. Θα λάβετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου όταν ο λογαριασμός σας εγκριθεί!"
+    missing_session: "Δεν μπορούμε να ανιχνεύσουμε αν δημιουργήθηκε ο λογαριασμός σας, παρακαλούμε βεβαιωθείτε ότι έχετε ενεργοποιήσει τα cookies."
     activated: "Λυπάμαι, αυτός ο λογαριασμός έχει ήδη ενεργοποιηθεί."
   post_action_types:
     off_topic:
       title: 'Εκτός-Θέματος'
-      description: 'Αυτή η δημοσίευση δεν είναι σχετική με την τρέχουσα συζήτηση όπως ορίζεται από τον τίτλο και την πρώτη δημοσίευση, και θα πρέπει μάλλον να μετακινηθεί αλλού.'
-      long_form: 'Επισημάνετε το ως εκτός θέματος'
+      description: 'Αυτή η δημοσίευση δεν είναι σχετική με την τρέχουσα συζήτηση όπως ορίζεται από τον τίτλο και την πρώτη δημοσίευση και θα πρέπει μάλλον να μετακινηθεί αλλού.'
+      long_form: 'το επισήμαναν σαν εκτός θέματος'
     spam:
       title: 'Ανεπιθύμητα'
-      long_form: 'Επισημάνετε το ως ανεπιθύμητο'
+      long_form: 'το επισήμαναν σαν ανεπιθύμητο'
       email_title: '"%{title}" επισημάνθηκε ως ανεπιθύμητο'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Ανάρμοστο'
-      description: 'Το περιεχόμενο αυτή της δημοσίευσης θα θεωρούνταν από κάθε λογικό άνθρωπο, προσβλητικό, καταχρηστικό ή αντίθετο με τις  <a href="/guidelines"> της κοινότητας μας'
-      long_form: 'Επισημάνετε το ως ανάρμοστο'
+      description: 'Το περιεχόμενο αυτής της δημοσίευσης θα θεωρούνταν από κάθε λογικό άνθρωπο, προσβλητικό, καταχρηστικό ή αντίθετο με τις  <a href="/guidelines">οδηγίες χρήσης της κοινότητάς μας</a>'
+      long_form: 'Επισημάνετέ το ως ανάρμοστο'
     notify_user:
       title: 'Αποστολή μηνύματος στον @{{username}} '
-      description: 'Θέλω να μιλήσω με αυτό το άτομο άμεσα και προσωπικά σχετικά με αυτή τη δημοσίευση.'
-      long_form: 'ειδοποιήσαι τον χρήστη'
+      description: 'Θέλω να μιλήσω με αυτό το άτομο άμεσα και ιδιωτικά σχετικά με αυτή τη δημοσίευση.'
+      long_form: 'ειδοποιήσε το μέλος'
       email_title: 'Η δημοσίευση σας στο "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Κάτι άλλο"
-      description: 'Η συγκεκριμένη ανάρτηση απαιτεί έλεγχο από το προσωπικό. για έναν άλλον λόγο που δεν αναφέρεται παραπάνω.'
-      long_form: 'Αναφέρθηκε για έλεγχο από το προσωπικό.'
+      description: 'Η συγκεκριμένη ανάρτηση απαιτεί έλεγχο από το προσωπικό για έναν άλλον λόγο που δεν αναφέρεται παραπάνω.'
+      long_form: 'αναφέρθηκε για έλεγχο από το προσωπικό.'
       email_title: 'Μια ανάρτηση στο "%{title}" απαιτεί έλεγχο από το προσωπικό.'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: 'Σελιδοδείκτης'
-      description: 'Τοποθετήσατε σελιδοδείκτη σε αυτή την ανάρτηση'
+      description: 'Τοποθετήστε σελιδοδείκτη σε αυτή την ανάρτηση'
       long_form: 'τοποθετήσατε σελιδοδείκτη σε αυτή την ανάρτηση'
     like:
       title: 'Σας αρέσει'
@@ -579,10 +575,10 @@ el:
     vote:
       title: 'Ψηφίστε'
       description: 'Ψηφίστε για αυτή την δημοσίευση '
-      long_form: 'Ψηφίσατε για αυτή την δημοσίευση'
+      long_form: 'ψηφίσατε για αυτή την δημοσίευση'
   user_activity:
     no_bookmarks:
-      self: "Δεν έχεις σελιδοδείκτη σε καμία ανάρτηση, οι σελιδοδείκτες στις αναρτήσεις σου επιτρέπουν εύκολη πρόσβαση σε αυτές αργότερα."
+      self: "Δεν έχεις κανέναν σελιδοδείκτη σε αναρτήσεις, οι σελιδοδείκτες στις αναρτήσεις σου επιτρέπουν εύκολη πρόσβαση σε αυτές αργότερα."
       others: "Κανένας σελιδοδείκτης."
     no_likes_given:
       self: "Δεν έχεις πατήσει \"μου αρέσει\" σε καμία δημοσίευση."
@@ -591,19 +587,19 @@ el:
     spam:
       title: 'Ανεπιθύμητα'
       description: 'Αυτό το θέμα είναι διαφήμιση. Δεν είναι χρήσιμο ή σχετικό με το forum, αλλά αποσκοπεί σε διαφημιστική προώθηση.'
-      long_form: 'Επισημάνετε το ως ανεπιθύμητο'
+      long_form: 'το επισήμαναν σαν ανεπιθύμητο'
     inappropriate:
-      title: 'Ακατάλληλο'
-      description: 'Αυτό το θέμα έχει περιεχόμενο το οποίο θα θεωρούνταν από κάθε λογικό άνθρωπο, προσβλητικό, καταχρηστικό ή αντίθετο με τις  <a href="/guidelines"> της κοινότητας μας'
-      long_form: 'Επισημάνετε το ως ανάρμοστο'
+      title: 'Ανάρμοστο'
+      description: 'Αυτό το θέμα έχει περιεχόμενο το οποίο θα θεωρούνταν από κάθε λογικό άνθρωπο προσβλητικό, καταχρηστικό ή αντίθετο με τις  <a href="/guidelines">οδηγίες χρήσης της κοινότητας μας</a>.'
+      long_form: 'το επισήμαναν σαν ανάρμοστο'
     notify_moderators:
       title: "Κάτι άλλο"
-      description: 'Το θέμα απαιτεί την γενική προσοχή του προσωπικού, βασισμένη στα <a href="/guidelines">κατευθυντήριες γραμμές</a>,<a href="%{tos_url}">TOS</a>, ή για όποιον δήποτε άλλο λόγο που δεν αναφέρεται πιο πάνω.'
-      long_form: 'Επισημάνετε το για να ελεγχθεί από moderator'
+      description: 'Το θέμα απαιτεί την γενική προσοχή του προσωπικού, βασισμένη στα <a href="/guidelines">κατευθυντήριες γραμμές</a>,<a href="%{tos_url}">TOS</a> ή για άλλο λόγο που δεν αναφέρεται πιο πάνω.'
+      long_form: 'αναφέρθηκε για έλεγχο από το προσωπικό.'
       email_title: 'Το θέμα "%{title}" χρειάζεται έλεγχο από διαμεσολαβητή'
       email_body: "%{link}\n\n%{message}"
   flagging:
-    you_must_edit: 'Η ανάρτηση σου έχει επισημανθεί από την κοινότητα. Παρακαλώ <a href="/my/messages">δες τα μηνύματα σου.'
+    you_must_edit: '<p>Η δημοσίευσή σου έχει επισημανθεί από την κοινότητα. Παρακαλώ <a href="/my/messages">δες τα μηνύματά σου</a>.</p>'
     user_must_edit: '<p>Αυτή η δημοσίευση έχει αναφερθεί από την κοινότητα και είναι προσωρινά κρυφή</p>'
   archetypes:
     regular:
@@ -611,12 +607,11 @@ el:
     banner:
       title: "Νήμα ανακοίνωσης"
       message:
-        make: "Aυτό το νήμα είναι τώρα νήμα ανακοίνωσης. Θα εμφανίζεται στην κορυφή της κάθε σελίδας μέχρι να απορριφθεί από το χρήστη."
-        remove: "Αυτό το θέμα δεν είναι πλέον διαφημιστικό πλαίσιο. Δε θα εμφανίζεται πια στην κορυφή της κάθε σελίδας."
+        make: "Aυτό το νήμα είναι πλέον διαφημιστικό. Θα εμφανίζεται στην κορυφή της κάθε σελίδας μέχρι να απορριφθεί από το χρήστη."
+        remove: "Αυτό το νήμα δεν είναι πλέον διαφημιστικό. Δε θα εμφανίζεται πια στην κορυφή της κάθε σελίδας."
   unsubscribed:
     title: "Επιτυχής απεγγραφή!"
-    description: "Καταργήσατε την εγγραφή σας. Για να αλλάξετε της ρυθμίσεις του email σας <a href='%{url}'>επισκεφθείτε τις προτιμήσεις σας</a>."
-    topic_description: "Για να εγγραφείτε ξανά στο %{link}, χρησιμοποιήστε τον έλεγχο ειδοποιήσεων από κάτω ή δεξιά του νήματος."
+    topic_description: "Για να εγγραφείτε ξανά στο %{link}, χρησιμοποιήστε τον έλεγχο ειδοποιήσεων στην κάτω ή στην δεξιά πλευρά του νήματος."
   unsubscribe:
     title: "Απεγγραφή"
     stop_watching_topic: "Διακοπή παρακολούθησης αυτού του νήματος, %{link}."
@@ -625,24 +620,24 @@ el:
     mailing_list_mode: "Απενεργοποιήστε τη λειτουργία της ταχυδρομικής λίστας"
     disable_digest_emails: "Διακοπή αποστολής περιληπτικών μηνυμάτων"
     all: "Μη μου στέλνετε mail από το %{sitename}"
-    different_user_description: "Έχετε συνδεθεί ως διαφορετικός χρήστης από εκείνον που επικοινωνήσαμε μέσω ηλεκτρονικού ταχυδρομείου. Παρακαλούμε αποσυνδεθείτε, ή χρησιμοποιήστε την ανώνυμη λειτουργία, και δοκιμάστε ξανά."
-    not_found_description: "Λυπούμαστε, δεν μπορέσαμε να βρούμε την συγκεκριμένη κατάργηση εγγραφής. Είναι πιθανό ο σύνδεσμος στο email σας να έληξε? "
+    different_user_description: "Έχετε συνδεθεί ως διαφορετικός χρήστης από αυτόν που επικοινωνήσαμε μέσω ηλεκτρονικού ταχυδρομείου. Παρακαλούμε αποσυνδεθείτε ή χρησιμοποιήστε την ανώνυμη λειτουργία και δοκιμάστε ξανά."
+    not_found_description: "Λυπούμαστε, δεν μπορέσαμε να βρούμε την συγκεκριμένη κατάργηση εγγραφής. Είναι πιθανό ο σύνδεσμος στο email σας να έληξε; "
     log_out: "Αποσύνδεση"
   user_api_key:
-    title: "Εξουσιοδοτημένη πρόσβαση στην εφαρμογή"
+    title: "Εξουσιοδότηση πρόσβασης στην εφαρμογή"
     authorize: "Εξουσιοδοτώ"
     read: "διαβάζω"
     read_write: "διαβάζω/γράφω"
     description: "\"%{application_name}\" ζητά την ακολόλουθη πρόσβαση στον λογαριασμό σου:"
-    no_trust_level: "Συγγνώμη, δεν έχεις το απαιτούμενο επίπεδο εμπιστοσύνης για να έχεις πρόσβαση στον χρήστη API"
+    no_trust_level: "Συγγνώμη, δεν έχεις το απαιτούμενο επίπεδο εμπιστοσύνης για να έχεις πρόσβαση στο API χρήστη"
     generic_error: "Συγνώμη, δεν μπορούμε να εκδώσουμε σε χρήστη API κλειδία, αυτή η πράξη μπορεί να μην είναι διαθέδιμη από τη διαχείριση της σελίδας. "
     scopes:
       message_bus: "Ζωντανές ενημερώσεις"
       notifications: "Διάβασε και διάγραψε τις ειδοποιήσεις"
-      push: "ειδοποιήσεις για περετέρο υπηρεσίες"
-      session_info: "Διαβάστε τις πληροφορίες του χρήστη"
+      push: "Ώθησε ειδοποιήσεις σε υπηρεσίες τρίτων"
+      session_info: "Διαβάστε τις πληροφορίες της συνεδρίας του χρήστη"
       read: "Ανάγνωση όλων"
-      write: "Γράψτε όλα"
+      write: "Εγγραφή όλων"
   reports:
     visits:
       title: "Επισκέψεις Χρήστη"
@@ -679,7 +674,7 @@ el:
     starred:
       title: "Επιλεγμένα"
       xaxis: "Ημέρα"
-      yaxis: "Αριθμός νέων πρωταγονιστικών θεμάτων."
+      yaxis: "Αριθμός νέων θεμάτων με αστερίσκο."
     users_by_trust_level:
       title: "Χρήστες ανάλογα με το Επίπεδο Εμπιστοσύνης"
       xaxis: "Επίπεδο Εμπιστοσύνης"
@@ -689,7 +684,7 @@ el:
       xaxis: "Ημέρα"
       yaxis: "Αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου"
     user_to_user_private_messages:
-      title: "Χειριστή-προς-χειριστή"
+      title: "Μέλος-προς-Μέλος"
       xaxis: "Ημέρα"
       yaxis: "Αριθμός μηνυμάτων"
     system_private_messages:
@@ -724,7 +719,7 @@ el:
       xaxis: "Θέμα"
       num_clicks: "Clicks"
     page_view_anon_reqs:
-      title: "Ανώνημος "
+      title: "Ανώνυμος"
       xaxis: "Ημέρα"
       yaxis: "Ανώνυμες Αναγνώσεις"
     page_view_logged_in_reqs:
@@ -734,23 +729,23 @@ el:
     page_view_crawler_reqs:
       title: "Κακόβουλοι ακόλουθοι ιστού"
       xaxis: "Ημέρα"
-      yaxis: "Θεάσεις σελίδας κακόβουλων ακόλουθων ιστού"
+      yaxis: "Θεάσεις σελίδας από Web Crawlers"
     page_view_total_reqs:
       title: "Σύνολο"
       xaxis: "Ημέρα"
       yaxis: "Σύνολο προβολών σελίδας"
     page_view_logged_in_mobile_reqs:
-      title: "Συνδεδεμένοι στις αναγνώσεις"
+      title: "Προβολές σελίδας από συνδεδεμένα μέλη"
       xaxis: "Ημέρα"
-      yaxis: "Ένωση κινητού τηλεφώνου στις προβολές σελιδών. "
+      yaxis: "Προβολές σελίδας από  κινητό τηλέφωνο"
     page_view_anon_mobile_reqs:
-      title: "σύντομες προβολές σελίδας"
+      title: "Ανώνυμες προβολές σελίδας"
       xaxis: "Ημέρα"
-      yaxis: "Σύντομες προβολές σελίδας στο τηλέφωνο"
+      yaxis: "Ανώνυμες προβολές σελίδας από κινητό τηλέφωνο"
     http_background_reqs:
       title: "Φόντο"
       xaxis: "Ημέρα"
-      yaxis: "Τα ετοίματα χρεισημοποιούνται για ζωντανή μετάδοση και ανίχνευση"
+      yaxis: "Αιτήματα που χρησιμοποιήθηκαν για ζωντανή μετάδοση και ανίχνευση"
     http_2xx_reqs:
       title: "Κατάσταση 2xx (ΟΚ)"
       xaxis: "Ημέρα"
@@ -786,11 +781,11 @@ el:
   dashboard:
     rails_env_warning: "Ο διακομιστής σας τρέχει στη %{env} λειτουργία."
     host_names_warning: "Το αρχείο config/database.yml χρησιμοποιεί ως hostname το localhost . Ενημερώστε το, ώστε να χρησιμοποεί το όνομα του site σας."
-    gc_warning: 'Ο server σας χρησιμοποιεί αυτόματα της παραμέτρους συλλογής αχρήστων της ruby, πράγμα το οποίο δεν θα σας δώσει την καλύτερη απόδοση. Διαβάστε αυτό το νήμα για την διαχείρηση της απόδοσης: a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Ρύθμιση της Ruby and Rails για την Discourse</a>.'
+    gc_warning: 'Ο server σας χρησιμοποιεί αυτόματα της παραμέτρους συλλογής αχρήστων της ruby, πράγμα το οποίο δεν θα σας δώσει την καλύτερη απόδοση. Διαβάστε αυτό το νήμα για την διαχείρηση της απόδοσης: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Ρύθμιση της Ruby and Rails για την Discourse</a>.'
     sidekiq_warning: 'Το Sidekiq σταμάτησε. Κάποιες λειτουργίες, όπως η αποστολή email εκτελούνται ασύγχρονα από το sidekiq. Παρακαλούμε βεβαιωθείτε ότι τουλάχτιστον μία sidekiq λειτουργία εκτελείται.
 
       <a href="https://github.com/mperham/sidekiq" target="_blank">Περισσότερα για το Sidekiq εδώ</a>.'
-    queue_size_warning: 'Ο αριθμός των δουλείων οι οποίες βρίσκονται σε λίστα αναμονή  είναι %{queue_size}, το οποίο είναι υψηλό. Αυτό θα μπορούσε να ενδείξει πρόβλημα με τις λειτουργία(ες) του Sidekiq ή θα πρέπει να προσθέσετε κι άλλους Sidekiq εργάτες. '
+    queue_size_warning: 'Ο αριθμός των εργασιών που βρίσκονται σε λίστα αναμονής  είναι %{queue_size}, το οποίο είναι υψηλό. Αυτό θα μπορούσε να ενδείξει πρόβλημα με τις λειτουργία(ες) του Sidekiq ή θα πρέπει να προσθέσετε κι άλλους Sidekiq εργάτες. '
     memory_warning: 'Ο server σας έχει λιγότερο από 1 GB διαθέσιμης μνήμης. Προτείνεται η χρήση τουλάχιστον 1 GB μνήμης.'
     google_oauth2_config_warning: 'Ο server είναι ρυθμισμένος να επιτρέπει την εγγραφή και την είσοδο με Google OAuth2 (enable_google_oauth2_logins), αλλά η ταυτότητα του πελάτη και οι μυστικές τιμές δεν έχουν οριστεί. Πηγαίνετε στο <a href="/admin/site_settings">Ρυθμίσεις σελίδας</a> και ανανεώστε τις ρυθμίσεις. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Δείτε τον οδηγό για περισσότερα</a>.'
     facebook_config_warning: 'Ο server είναι ρυθμισμένος να επιτρέπει την εγγραφή και την είσοδο με Facebook (enable_facebook_logins), αλλά η ταυτότητα του πελάτη και οι μυστικές τιμές δεν έχουν οριστεί. Πηγαίνετε στο <a href="/admin/site_settings">Ρυθμίσεις σελίδας</a> και ανανεώστε τις ρυθμίσεις. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Δείτε τον οδηγό για περισσότερα</a>.'
@@ -798,146 +793,145 @@ el:
     github_config_warning: 'Ο server είναι ρυθμισμένος να επιτρέπει την εγγραφή και την είσοδο με GitHub  (enable_github_logins), αλλά η ταυτότητα του πελάτη και οι μυστικές τιμές δεν έχουν οριστεί. Πηγαίνετε στο <a href="/admin/site_settings">Ρυθμίσεις σελίδας</a> και ανανεώστε τις ρυθμίσεις. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Δείτε τον οδηγό για περισσότερα</a>.'
     s3_config_warning: 'Ο server είναι ρυθμισμένος να επιτρέπει την ανάρτηση αντίγραφων ασφαλείας στο  s3, αλλά τουλάχιστον ένα από τις παρακάτω ρυθμίσεις δεν έχει οριστεί: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Πηγαίνετε στο <a href="/admin/site_settings">Ρυθμίσεις σελίδας</a> και ανανεώστε τις ρυθμίσεις. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Δείτε πώς να ρυθμίσετε την ανάρτηση εικόνων με S3. Για περισσότερα</a>.'
     s3_backup_config_warning: 'Ο διακομιστής έχει ρυθμιστεί ώστε να ανεβάζετε αντίγραφα ασφαλείας σε s3, αλλά τουλάχιστον ένα από τις ακόλουθες ρύθμιση δεν έχει οριστεί:  s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, or s3_backup_bucket. Πήγαινε στο <a href="/admin/site_settings">ρυθμίσεις ιστοτόπου</a> και ανανέωσε τις ρυθμίσεις. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Δες "Πως να ενεργοποιήσεις ανέβασμα φωτιγραφιών σε S3;" για να μάθεις περισσότερα</a>.'
-    image_magick_warning: 'ο διακομιστής είναι διαμορφωμένος στο να δήμιουργα μικρογράφιες των μεγάλων εικόνων, αλλα χωρίς το ImageMagick να είναι εγκαταστημένο. Εγκατάστησε το ImageMagick χρησιμοποιώντας το αγαπημένο σου πακέτο διευθηντικό πακέτο <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank"> κατέβασε την τελευταία έκδοση</a> .'
-    failing_emails_warning: 'Υπάρχουν %{num_failed_jobs} δουλείες email οι οποίες απέτυχαν. Ελέγχστε το app.yml  και βεβαιωθείτε πως οι ρυθμίσεις του mail server σασ είναι σωστές.  '
-    subfolder_ends_in_slash: "Οι ρυθμίσεις του υποφακέλου σας δεν είναι σωστές. Το DISCOURSE_RELATIVE_URL_ROOT τελειώνει με κάθετω.  "
+    image_magick_warning: 'Ο διακομιστής είναι διαμορφωμένος στο να δημιουργεί μικρογράφιες των μεγάλων εικόνων, αλλά το ImageMagick δεν είναι εγκαταστημένο. Εγκατάστησε το ImageMagick χρησιμοποιώντας τον αγαπημένο σου διαχειριστή πακέτων ή <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank"> κατέβασε την τελευταία έκδοση</a> .'
+    failing_emails_warning: 'Υπάρχουν %{num_failed_jobs} εργασίες email οι οποίες απέτυχαν. Ελέγξτε το app.yml  και βεβαιωθείτε πως οι ρυθμίσεις του mail server σας είναι σωστές.  <a href="/sidekiq/retries" target="_blank">Δείτε τις αποτυχημένες εργασίες στο Sidekiq</a>.'
+    subfolder_ends_in_slash: "Οι ρυθμίσεις του υποφακέλου σας δεν είναι σωστές. Το DISCOURSE_RELATIVE_URL_ROOT τελειώνει με κάθετη.  "
     email_polling_errored_recently:
       one: "Η δημοσκόπηση των ηλεκτρικών μημνατών εχεί παράγει ένα σφάλμα τις τελευταίες 24 ώρες . Κοιτάξτε <a href='/logs' target='_blank'> τα αρχεία καταγραφείς </a> για περισσότερες πληροφορίες.   "
-      other: "Η δημοσκόπηση των ηλεκτρικών μημνατών εχεί παράγει%{count}  σφάλματα τις τελευταίες 24 ώρες . Κοιτάξτε<a href='/logs' target='_blank'> τα αρχεία καταγραφείς</a> για περισσότερες πληροφορίες.  "
-    missing_mailgun_api_key: "ο διακομιστής εχεί ρθυμιστεί για να στήλει ηλεκτρονικά μύνηματα μέσο του mailgun αλλά δεν εχεις προσφέρει το API πλήκτρο που χρησιμοποιήτε για να επαληθευτούν τα webhook μυνήματα. "
-    bad_favicon_url: "το favicon αποτυγχαίνει απο το να φορτώσει. 'Ελεξε το favicon_url ρυθμιτή σου <a href='/admin/site_settings'> Ρυθμίσεις ιστοσελίδας</a>"
-    poll_pop3_timeout: "Η σύνδεση με τον δίσκο του POP3 έχει χρονικό όριο. Τα εισερχόμενα ηλεκτρονικά μυνήναμτα δεν μπορούν να ανακτηθούν. Παρακαλώ ελέγξτε τις <a href='/admin/site_settings/category/email'>POP3 ρυθμίσεις σας</a> και τον πάροχο υπηρεσιών."
-    poll_pop3_auth_error: "Η σύνδεση με τον δίσκο του POP3 αποτυγχαίνει με ένα σφάλμα ελεχγου ταυτότητας. Παρακαλώ όπως ελέξετε τις <a href='/admin/site_settings/category/email'> POP3 ρυθμίσεις σας.</a>  "
+      other: "Η συγκέντρωση των ηλεκτρικών μυνημάτων έχει παράγει%{count}  σφάλματα τις τελευταίες 24 ώρες . Κοιτάξτε<a href='/logs' target='_blank'> τα αρχεία καταγραφής</a> για περισσότερες πληροφορίες.  "
+    missing_mailgun_api_key: "Ο διακομιστής εχεί ρυθμιστεί για να στείλει ηλεκτρονικά μύνηματα μέσω του mailgun, αλλά δεν εχεις ρυθμίσει το κλειδί API που χρειάζεται για να επαληθευτούν τα webhook μυνήματα. "
+    bad_favicon_url: "Το favicon δεν μπορεί να φορτωθεί 'Ελεγξε το favicon_url στις <a href='/admin/site_settings'> Ρυθμίσεις ιστοσελίδας</a>"
+    poll_pop3_timeout: "Το χρονικό όριο σύνδεσης με τον διακομιστή POP3 έληξε. Τα εισερχόμενα ηλεκτρονικά μυνήματα δεν μπορούν να ανακτηθούν. Παρακαλώ ελέγξτε τις <a href='/admin/site_settings/category/email'>POP3 ρυθμίσεις σας</a> και τον πάροχο υπηρεσιών."
+    poll_pop3_auth_error: "Υπήρξε σφάλμα ελεχγου ταυτότητας κατά την σύνδεση με τον διακομιστή POP3. Παρακαλώ όπως ελέξετε τις <a href='/admin/site_settings/category/email'> POP3 ρυθμίσεις σας.</a>  "
   site_settings:
     censored_words: "Αυτόματη αντικατάσταση λέξεων θα γίνεται με &#9632;&#9632;&#9632;&#9632;"
     censored_pattern: "Το Regex πρότυπο που θα αντικατασταθεί αυτόματα με &#9632;&#9632;&#9632;&#;"
     delete_old_hidden_posts: "Διάγραψε αυτόματα όποιες κρυμμένες δημοσιέυσεις μένουν κρυμμένες για περισσότερες από 30 ημέρες. "
-    default_locale: "Η προεπιλεγμένη γλώσσα του Discourse για παράδειγμα (ISO 639-1 Code)"
-    allow_user_locale: "Επίτρεψε στους χρήστες να επιλέγουν βάση της δικής τους πρπτίμησης την γλώσσα. "
-    set_locale_from_accept_language_header: "Θέστε την γλώσσα του interface για ανώνυμους χρήστες από τη γλώσσα που χρησιμοποιεί το πρόγραμμα περιήγησης web τους. (ΠΕΙΡΑΜΑΤΙΚΟ ΧΑΡΑΚΤΗΡΙΣΤΙΚΟ, δεν λειτουργεί με ανώνυμη cache)"
+    default_locale: "Η προεπιλεγμένη γλώσσα του Discourse (ISO 639-1 Code)"
+    allow_user_locale: "Επίτρεψε στους χρήστες να επιλέγουν την γλώσσα που επιθυμούν. "
+    set_locale_from_accept_language_header: "θέστε την γλώσσα του interface για ανώνυμους χρήστες από τη γλώσσα που χρησιμοποιεί το πρόγραμμα περιήγησης τους. (ΠΕΙΡΑΜΑΤΙΚΟ ΧΑΡΑΚΤΗΡΙΣΤΙΚΟ, δεν λειτουργεί με ανώνυμη cache)"
     min_post_length: "Ελάχιστο επιτρεπόμενο μήκος δημοσίευσης σε χαρακτήρες"
     min_first_post_length: "Ελάχιστο επιτρεπόμενο μήκος πρώτης δημοσίευσης (σώμα νήματος) σε χαρακτήρες"
     min_private_message_post_length: "Ελάχιστο επιτρεπόμενο μήκος δημοσίευσης σε χαρακτήρες για μηνύματα"
     max_post_length: "Μέγιστο επιτρεπόμενο μήκος δημοσίευσης σε χαρακτήρες"
     topic_featured_link_enabled: "Ενεργοποίηση δημοσίευσης ενός συνδέσμου με νήματα."
-    show_topic_featured_link_in_digest: "Δείξε το θέμα που δυνοδεύετε με τον σύνδεσμο στο συγχονευτικό ηλεκτρονικό μήνυμα."
+    show_topic_featured_link_in_digest: "Δείξε το σύνδεσμο προτεινόμενου θέματος στο συνοπτικό ηλεκτρονικό μήνυμα."
     min_topic_title_length: "Ελάχιστο επιτρεπόμενο μήκος τίτλου νήματος σε χαρακτήρες"
     max_topic_title_length: "Μέγιστο επιτρεπόμενο μήκος τίτλου νήματος σε χαρακτήρες"
     min_private_message_title_length: "Ελάχιστο επιτρεπόμενο μήκος τίτλου για ένα μήνυμα σε χαρακτήρες"
     min_search_term_length: "Ελάχιστο έγκυρο μήκος όρου αναζήτησης σε χαρακτήρες"
     search_tokenize_chinese_japanese_korean: "Ανάγκασε την αναζήτηση να κάνει tokenize Κινέζικα / Ιαπωνικά / κορεατικά, ακόμη και σε μη CJK ιστότοπους"
-    search_prefer_recent_posts: "Εάν η αναζήτηση στο μεγάλο φόρουμ σας είναι αργή, αυτή η επιλογή δημιουργεί κατάλογο των πιο πρόσφατων δημοσιεύσεων στην αρχή"
-    search_recent_posts_size: "Πόσες πρόσφατες αναρτλησεις να κρατηθούν στο ευρετήριο "
-    allow_uncategorized_topics: "Επιτρέψτε σε νήματα να δημιουργόνται χωρίς κατηγοριοποίηση. ΠΡΟΣΟΧΗ: Εάν υπάρχουν μη κατηγοριοποιημένα νήματα, πρέπει να τα επανακατηγοριοποιήσετε πριν τα κλείσετε."
-    allow_duplicate_topic_titles: "Επιτρέπονται θέματα με όμοιους ,εις διπλούν τίτλους."
-    unique_posts_mins: "Κάθε πόσα λεπτά μετά ένας χρήστης μπορεί να κάνει δημοσιέυση με το ίδιο περιοχόμενο"
-    educate_until_posts: "όταν ο χρήστης ξεκινά να πληκτρολογεί τις πρώτες (n) νέες δημοσιεύσεις, εμφάνισε το αναδυόμενο πάνελ εκπαίδευσης νέου χρήστη στο συνθέτη."
-    title: "Το όνομα αυτής της ιστοσελίδας, όπως έχει χρησιμοποιειθεί στην ετικέτα τίτλου."
-    site_description: "Περιέγραψε αυτή την ιστοσελίδα με μία πρόταση, όπως έχει χρησιμοποιειθέι στην ετικέτα περιγραφής."
-    contact_email: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου της βασικής επαφής η οποία είναι υπεύθυνη για αυτόν τον ιστότοπο. Χρησιμοποιείται για κρίσιμες ειδοποιήσεις όπως μη διαχειρισμένες σημάνσεις, καθώς και την /σχετικά με φόρμα επικοινωνίας για επείγοντα θέματα."
-    contact_url: "Εποικινώνησε με το URL για αυτή την σελίδα. Χρησιμοποιήτε στη/ φόρμα επαφής για επείγων θέματα. "
-    queue_jobs: "ΜΌΝΟ ΓΙΑ ΤΟΝ ΠΡΟΓΡΑΜΜΑΤΙΣΤΉ! ΠΡΟΕΙΔΟΠΟΊΗΣΗ! Από προεπιλογή, η ουρά δουλειών είναι στο sidekiq. Αν απενεργοποιηθεί, ο ιστότοπος θα χαλάσει."
-    crawl_images: "Επανόρθωσε εικόνες από απομακρυσμένα URLs για να εισάγεις τις σωστές διστάσεις πλάτους και ύψους."
-    download_remote_images_to_local: "Μετέτρεψε τις απομωνομένες εικόνες σε τοπικές εικόνες με το να τις κατεβάσεις: αυτό αποτρέπει τις  σπασμένες εικόνες."
-    download_remote_images_threshold: "Ελάχιστη χωριτικότητα δίσκου απαραίτητη για το κατέβασμα απομακρυσμένων εικόνων σε τοπικό πεδίο (σε ποσοστό)"
-    download_remote_images_max_days_old: "Μην κατεβάσεις απομακυσμένες εικόνες για αναρτήσεις που είναι μεγαλύτερες απο n μερών."
-    disabled_image_download_domains: "Απομακρυσμένες εικόνες δεν θα κατέβουν ποτέ από αυτούς τους τομείς. Λίστα με οριοθετημένο σωλήνα"
-    editing_grace_period: "Για (n) δευτερόλεπτα μετά από την δημοσίευση, η επεξεργασία δεν θα δημιουργίσει νεα έκδωση στο ιστορικό της δημοσίευσης. "
+    search_prefer_recent_posts: "Εάν η αναζήτηση στο μεγάλο φόρουμ σας είναι αργή, αυτή η επιλογή δημιουργεί κατάλογο των πιο πρόσφατων δημοσιεύσεων πρώτα"
+    search_recent_posts_size: "Πόσες πρόσφατες αναρτήσεις να κρατηθούν στο ευρετήριο "
+    allow_uncategorized_topics: "Επιτρέψτε σε νήματα να δημιουργούνται χωρίς κατηγοριοποίηση. ΠΡΟΣΟΧΗ: Εάν υπάρχουν μη κατηγοριοποιημένα νήματα, πρέπει να τα επανακατηγοριοποιήσετε πριν τα κλείσετε."
+    allow_duplicate_topic_titles: "Επιτρέπονται θέματα με όμοιους, εις διπλούν τίτλους."
+    unique_posts_mins: "Μετά από πόσα λεπτά ένας χρήστης μπορεί να κάνει δημοσιέυση με το ίδιο περιοχόμενο"
+    educate_until_posts: "Όταν ο χρήστης ξεκινά να πληκτρολογεί τις πρώτες (n) νέες δημοσιεύσεις, εμφάνισε το αναδυόμενο πάνελ εκπαίδευσης νέου χρήστη στο συνθέτη."
+    title: "Το όνομα αυτής της ιστοσελίδας, όπως χρησιμοποιείται στην ετικέτα τίτλου."
+    site_description: "Περιέγραψε αυτή την ιστοσελίδα με μία πρόταση, όπως χρησιμοποιείται στην ετικέτα περιγραφής."
+    contact_email: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου της βασικής επαφής η οποία είναι υπεύθυνη για αυτόν τον ιστότοπο. Χρησιμοποιείται για κρίσιμες ειδοποιήσεις όπως μη διαχειρισμένες σημάνσεις, καθώς και την /about φόρμα επικοινωνίας για επείγοντα θέματα."
+    contact_url: "URL εποικινωνίας για την σελίδα. Χρησιμοποιείται στην /about σελίδα για επείγοντα ζητήματα. "
+    queue_jobs: "ΜΌΝΟ ΓΙΑ ΤΟΝ ΠΡΟΓΡΑΜΜΑΤΙΣΤΉ! ΠΡΟΕΙΔΟΠΟΊΗΣΗ! Από προεπιλογή, βάλε σε ουρά τις εργασίες στο sidekiq. Αν απενεργοποιηθεί, ο ιστότοπος θα έχει πρόβλημα."
+    crawl_images: "Ανάκτηση εικόνων από απομακρυσμένα URLs για να προστεθούν οι σωστές διαστάσεις πλάτους και ύψους."
+    download_remote_images_to_local: "Μετέτρεψε τις απομονωμένες εικόνες σε τοπικές εικόνες κατεβάζωντάς τες, αυτό αποτρέπει τις  'σπασμένες' εικόνες."
+    download_remote_images_threshold: "Ελάχιστη απαιτούμενη χωρητικότητα δίσκου για το κατέβασμα απομακρυσμένων εικόνων τοπικά (σε ποσοστό)"
+    download_remote_images_max_days_old: "Μην κατεβάσεις απομακυσμένες εικόνες για αναρτήσεις που είναι μεγαλύτερες απο n ημερών."
+    disabled_image_download_domains: "Οι απομακρυσμένες εικόνες δεν θα κατέβουν ποτέ από αυτούς τους τομείς. Λίστα pipe-delimited"
+    editing_grace_period: "Για (n) δευτερόλεπτα μετά από την δημοσίευση, η επεξεργασία δεν θα δημιουργίσει νεα έκδoση στο ιστορικό της δημοσίευσης. "
     post_edit_time_limit: "Ο συγγραφέας μπορεί να επεξεργαστεί ή να διαγράψει τις δημοσιεύσεις του για (n) λεπτά αφότου δημοσευτούν. Όρισε το στο 0 για να είναι για πάντα."
     edit_history_visible_to_public: "Επέτρεψε σε όλους να δουν προηγούμενες εκδοχές από μια επεξεργασμένη δημοσίευση. Όταν είναι απενεργοποιημένο, μόνο τα μέλη του προσωπικού μπορούν να τα δούν. "
     delete_removed_posts_after: "Δημοσιεύσεις που διαγράφονται από τον συγγραφέα θα διαγράφονται αυτόματα μετά από (n) ώρες. Εάν το ορίσεις στο 0, τότε θα διαγράφονται αμέσως."
     max_image_width: "Μέγιστο πλάτος μικρογραφίας εικόνων σε μια ανάρτηση"
     max_image_height: "Μέγιστο ύψος μικρογραφίας εικόνων σε μία ανάρτηση"
-    fixed_category_positions: "Εάν ελεγχθεί, θα μπορείς να διευθετήσεις τις κατηγορίες σε μια καθορισμένη σειρά. Εάν δεν ελεγχθεί, οι κατηγορίες είναι διευθετημένες κατά σειρά δραστηριότητας."
-    fixed_category_positions_on_create: "Αν επιλεγεί, η σειρά των κατηγοριών θα διατηρηθεί στον διάλογο δημιουργίας νήματος (χρειάζεται fixed_category_positions). "
-    add_rel_nofollow_to_user_content: "Πρόσθεσε rel nofollow σε ολόκληρο το περιεχόμενο που έχει υποβληθεί από τους χρήστες, εκτός από εσωτερικούς συνδέσμους (συμπεριλαμβανομένων των γονικών τομέων). Αν το αλλάξεις αυτήν την ρύθμιση, θα πρέπει να κάνεις rebake όλα τα νήματα χρησιμοποιώντας το: \"rake posts:rebake\""
-    exclude_rel_nofollow_domains: "Μια λίστα από τομείς, στους οποίους το nofollow δεν θα πρέπει να προστίθεται στους συνδέσμους. Το tld.com αυτόματα θα επιτρέπει και το sub.tld.com. Τουλάχιστον, θα πρέπει να προσθέσετε τον κορυφαίο τομέα του ιστότοπου για να βοηθήσει τα προγράμματα ανίχνευσης ιστού, να βρουν όλο το περιεχόμενο. Σε περίπτωση που άλλα μέρη της ιστοσελίδας σας βρίσκονται σε άλλους τομείς, προσθέστε τους και αυτούς. "
-    post_excerpt_maxlength: "Ανώτατο όριο μήκους για μια δημοσίευση αποσπάσματος/ περίληψης."
-    show_pinned_excerpt_mobile: "Εμφάνιση αποσπάσματος από συνημμένα νήματα στην περιήγηση από κινητά τηλέφωνα."
-    show_pinned_excerpt_desktop: "Εμφάνιση αποσπάσματος από συνημμένα νήματα στην περιήγηση από ηλεκτρονικούς υπολογιστές."
-    post_onebox_maxlength: "Μέγιστο μέγεθος ενός oneboxed Discourse νήματος σε χαρακτήρες."
+    fixed_category_positions: "Εάν επιλεχθεί, θα μπορείς να προβάλλεις τις κατηγορίες με μια προκαθορισμένη σειρά. Εάν δεν επιλεγχθεί, οι κατηγορίες θα προβάλλονται κατά σειρά δραστηριότητας."
+    fixed_category_positions_on_create: "Αν επιλεχθεί, η σειρά των κατηγοριών θα διατηρηθεί στον διάλογο δημιουργίας νήματος (χρειάζεται fixed_category_positions). "
+    add_rel_nofollow_to_user_content: "Πρόσθεσε rel nofollow σε κάθε περιεχόμενο που υποβάλλουν οι χρήστες, εκτός από εσωτερικούς συνδέσμους (συμπεριλαμβανομένων των γονικών τομέων). Αν αλλάξεις αυτήν την ρύθμιση, θα πρέπει να κάνεις rebake όλα τα νήματα χρησιμοποιώντας το: \"rake posts:rebake\""
+    exclude_rel_nofollow_domains: "Μια λίστα από τομείς, στους οποίους το nofollow δεν θα πρέπει να προστίθεται στους συνδέσμους. Το tld.com αυτόματα θα επιτρέπει και το sub.tld.com. Θα πρέπει να προσθέσετε τουλάχιστον τον κορυφαίο τομέα του ιστότοπου για να βοηθήσει τα προγράμματα ανίχνευσης ιστού, να βρουν όλο το περιεχόμενο. Σε περίπτωση που άλλα μέρη της ιστοσελίδας σας βρίσκονται σε άλλους τομείς, προσθέστε τους και αυτούς. "
+    post_excerpt_maxlength: "Ανώτατο όριο μήκους για μια περίληψη δημοσίευσης."
+    show_pinned_excerpt_mobile: "Εμφάνιση περίληψης σε καρφιτσωμένα νήματα στην περιήγηση από κινητά τηλέφωνα."
+    show_pinned_excerpt_desktop: "Εμφάνιση περίληψης σε καρφιτσωμένα νήματα στην περιήγηση από ηλεκτρονικούς υπολογιστές."
+    post_onebox_maxlength: "Μέγιστο μέγεθος μιας oneboxed Discourse ανάρτησης σε χαρακτήρες."
     onebox_domains_blacklist: "Μία λίστα τομέων που δεν θα είναι ποτέ oneboxed."
-    max_oneboxes_per_post: "Ανώτατος αριθμός επιλογών σε μια δημοσίευση. "
+    max_oneboxes_per_post: "Ανώτατος αριθμός oneboxes σε μια δημοσίευση. "
     logo_url: "Η εικόνα του λογότυπου πάνω αριστερά της ιστοσελίδας, πρέπει να έχει ως σχήμα ένα πλατύ ορθογώνιο. Εάν το αφήσεις κενό, θα φανεί ο τίτλος της ιστοσελίδας."
     digest_logo_url: "Το εναλλακτικό λογότυπο εικόνας που χρησιμοποιείται στην κορυφή της περίληψης ηλεκτρονικού ταχυδρομείου του ιστότοπου σας. Θα πρέπει να είναι ένα ευρύ ορθογώνιο σχήμα. Δεν πρέπει να είναι μια εικόνα SVG. Αν μείνει κενό τότε το `logo_url` θα χρησιμοποιηθεί."
     logo_small_url: "Η μικρή εικόνα του λογοτύπου στο πάνω αριστερό μέρος του site σας, θα πρέπει να έχει τετράγωνο σχήμα, το οποίο παρατηρείται κατά την κύλιση προς τα κάτω. Αν μείνει κενό, θα εμφανίζεται ένα home glyph."
     favicon_url: "Μια εικόνα για την ιστοσελίδα σας, βλέπε http://en.wikipedia.org/wiki/Favicon, για να δουλέψει σωστά πάνω απο ένα CDN πρέπει να είναι png"
-    mobile_logo_url: "Η σταθερή θέση της εικόνας του λογοτύπου που χρησιμοποιείται πάνω αριστερά του διαδυκτυακού τόπου. Θα πρέπει να είναι τετράγωνη. Αν είναι άδεια, θα πρέπει να χρησιμοποιηθεί το `logo_url`. Π.χ.: http://example.com/uploads/default/logo.png"
+    mobile_logo_url: "Το λογότυπο σταθερής θέσης που χρησιμοποιείται πάνω αριστερά σε κινητά τηλέφωνα. Θα πρέπει να έχει τετράγωνο σχήμα. Αν μείνει κενό, θα χρησιμοποιηθεί το `logo_url`. Π.χ.: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Εικονίδιο που χρησιμοποιείται για συσκευές αφής της Apple. Το συνιστώμενο μέγεθος είναι 144px από 144px."
-    notification_email: "Η από: διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιείται για την αποστολή όλων των απαραιτήτων μηνυμάτων του συστήματος. Ο τομέας που καθορίζεται εδώ πρέπει να έχει SPF, DKIM και αντίστροφα PTR αρχεία ρυθμισμένα σωστά για να φθάσει το ηλεκτρονικό ταχυδρομείο."
-    email_custom_headers: "Μια λίστα οριοθετημένης σωληνώσεως που περιέχει τις προσαρμοσμένες κεφαλίδες των μηνυμάτων ηλεκτρονικού ταχυδρομείου.   "
+    notification_email: "Η από: διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιείται για την αποστολή όλων των απαραιτήτων μηνυμάτων του συστήματος. Ο τομέας που καθορίζεται εδώ πρέπει να έχει SPF, DKIM και reverse PTR αρχεία ρυθμισμένα σωστά για να φθάσει το μήνυμα."
+    email_custom_headers: "Μια pipe-delimited λίστα που περιέχει τις προσαρμοσμένες κεφαλίδες των μηνυμάτων ηλεκτρονικού ταχυδρομείου.   "
     email_subject: "Προσαρμόσιμη μορφή του θέματος για τα πρότυπα μηνύματα ηλεκτρονικού ταχυδρομείου. Δες https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
-    force_https: "Αναγκάζει το site σας να χρησιμοποιεί μόνο HTTPS. ΠΡΟΣΟΧΗ: Μην το ενεργοποιήσετε, μέχρι να επαληθεύσετε ότι το HTTPS είναι πλήρως εγκατεστημένο και λειτουργεί απολύτως παντού! Ελέγξατε το CDN σας, όλες τις κοινωνικές συνδέσεις, και οποιαδήποτε εξωτερικά λογότυπα / εξαρτήσεις για να βεβαιωθείτε ότι είναι όλα συμβατά με HTTPS;"
+    force_https: "Αναγκάζει το site σας να χρησιμοποιεί μόνο HTTPS. ΠΡΟΣΟΧΗ: Μην το ενεργοποιήσετε, μέχρι να επαληθεύσετε ότι το HTTPS είναι πλήρως εγκατεστημένο και λειτουργεί απολύτως παντού! Ελέγξατε το CDN σας, όλες τις κοινωνικές συνδέσεις και τα εξωτερικά σας λογότυπα / εξαρτήσεις για να βεβαιωθείτε ότι είναι όλα συμβατά με HTTPS;"
     same_site_cookies: "Χρησιμοποίηση των ίδιων cookies της σελίδας, το οποίο καταργεί όλα τα vectors Cross Site Request Forgery σε υποστηριζόμενους περιηγητές (Lax ή Strict). Προσοχή: Το Strict θα λειτουργήσει μόνο σε σελίδες που εξαναγκάζουν την σύνδεση και την χρήση SSO"
-    summary_score_threshold: "Η ελάχιστη βαθμολογία που απαιτείται από μια ανάρτηση για να συμπεριληφθεί στο «Συνοψίζοντας αυτό το θέμα»"
-    summary_posts_required: "Ελάχιστες αναρτήσεις σε ένα νήμα πριν το «Συνοψίζοντας αυτό το θέμα» ενεργοποιηθεί"
-    summary_likes_required: "Επιτρέπεται ο ελάχιστος αριθμός '' Μου αρέσει'' σε ένα θέμα προτού «να συνοψίστε αυτό το θέμα» "
-    summary_percent_filter: "Όταν ο χρήστης επιλέξει την συνόψιση του θέματος, προβολή του μέγιστου % των δημοσιοποιήσεων"
-    summary_max_results: "Μέγιστο ποσοστό αναρτήσεων Επιστράφηκε από 'Ανακεφαλαίωση αυτού του θέματος'"
+    summary_score_threshold: "Η ελάχιστη βαθμολογία που απαιτείται από μια ανάρτηση για να συμπεριληφθεί στο «Συνοψίστε αυτό το θέμα»"
+    summary_posts_required: "Ελάχιστες αναρτήσεις σε ένα νήμα πριν το «Συνοψίστε αυτό το θέμα» ενεργοποιηθεί"
+    summary_likes_required: "Ελάχιστος αριθμός ''Μου αρέσει'' σε ένα θέμα πριν ενεργοποιηθεί το «Συνοψίστε αυτό το θέμα» "
+    summary_percent_filter: "Όταν ο χρήστης επιλέξει «Συνοψίστε αυτό το θέμα», δείξε το κορυφαίο % των αναρτήσεων"
+    summary_max_results: "Μέγιστος αριθμός αναρτήσεων στο «Συνοψίστε αυτό το θέμα»"
     enable_private_messages: "Επιτρέψτε στους χρήστες με επίπεδο εμπιστοσύνης 1 (παραμετροποιήσιμο με το ελάχιστο επίπεδο εμπιστοσύνης για την αποστολή μηνυμάτων)  να δημιουργήσουν μηνύματα και να απαντήσουν σε μηνύματα. Σημειώστε ότι το προσωπικό μπορεί πάντα να στέλνει μηνύματα οτιδήποτε και να συμβεί."
     enable_long_polling: "Η αρτηρία μηνυμάτων που χρησιμοποιείτε για ειδοποιήσεις μπορεί να χρησιμοποιήσει μακρυά μέθοδο εξέτασης."
     long_polling_base_url: "Base URL που χρησιμοποιείτε για μακρύ ψήφισμα (όταν ένα CDN εξυπηρετεί δυναμικό περιεχόμενο, βεβαιωθείτε ότι το ορίσατε σε έλξη προέλευσης ) π.χ.: http://origin.site.com"
     long_polling_interval: "Χρονικό διάστημα που ο διακομιστής θα πρέπει να περιμένει πριν απαντήσει στους πελάτες όταν δεν υπάρχουν δεδομένα για την αποστολή (μόνο συνδεδεμένοι χρήστες )"
-    polling_interval: "Όταν δεν χρησιμοποιείτε μακρυά μέθοδος εξέτασης, πόσο συχνά θα πρέπει οι συνδεδεμένοι πελάτες να ψηφίζουν/poll σε χιλιοστά του δευτερολέπτου"
-    anon_polling_interval: "Κάθε πόσο συχνά πρέπει οι άγνωστες πελάτες να κάνουν δημοσκόπηση σε χιλιοστά του δευτερολέπτου"
-    background_polling_interval: "Πόσο συχνά θα πρέπει οι συνδεδεμένοι πελάτες να ψηφίζουν/poll σε χιλιοστά του δευτερολέπτου (όταν το παράθυρο είναι στο παρασκήνιο)"
+    polling_interval: "Όταν δεν χρησιμοποιείται μακρυά μέθοδος εξέτασης, πόσο συχνά θα πρέπει οι συνδεδεμένοι χρήστες να ελέγχονται σε χιλιοστά του δευτερολέπτου"
+    anon_polling_interval: "Πόσο συχνά θα πρέπει οι ανώνυμοι χρήστες να ελέγχονται σε χιλιοστά του δευτερολέπτου"
+    background_polling_interval: "Πόσο συχνά θα πρέπει οι συνδεδεμένοι πελάτες να ελέγχονται σε χιλιοστά του δευτερολέπτου (όταν το παράθυρο είναι στο παρασκήνιο)"
     flags_required_to_hide_post: "Αριθμός σημάνσεων που προκαλούν την ανάρτηση να κρυφτεί αυτομάτως και ένα μήνυμα να σταλθεί στον χρήστη (0 για να μην γίνετε ποτέ)  "
-    cooldown_minutes_after_hiding_posts: "Αριθμός λεπτών που ένας χρήστης πρέπει να περιμένει πριν να έπεξεργαστεί ξανά μια δημοσίευση που είναι κρυμμένη μέσο κοινωνικής επισήμανσης."
-    max_topics_in_first_day: "το ανώτατο όριο τίτλων που ένας χρήστης μπορεί να δημιουργίσει σε περίοδο 24 ωρών μετά από την πρώτη τους δημοσίευση "
-    max_replies_in_first_day: "Ο ανώτατος αριθμός απαντήσεων που ένας χρήστης δικαιούτε να δημοσιέυση σε περίοδο 24 ωρών μετα από την δημιουργία της πρώτης δημοσίευσης"
+    cooldown_minutes_after_hiding_posts: "Αριθμός λεπτών που ένας χρήστης θα πρέπει να περιμένει πριν να μπορέσει να έπεξεργαστεί ξανά μια δημοσίευση που είναι κρυμμένη μέσω επισήμανσης από χρήστες."
+    max_topics_in_first_day: "Το ανώτατο όριο νημάτων τα οποία ένας χρήστης μπορεί να δημιουργήσει μέσα σε 24 ώρες από την πρώτη τους ανάρτηση"
+    max_replies_in_first_day: "Ο ανώτατος αριθμός απαντήσεων που ένας χρήστης δικαιούται να αναρτήσει εντός του ορίου των 24 ωρών από την δημιουργία της πρώτης ανάρτησης"
     tl2_additional_likes_per_day_multiplier: "Αύξησε το όριο των ''Μου αρέσει'' καθημερινά για  tl2 (member) πολλαπλασιάζοντας με αυτό τον αριθμό."
     tl3_additional_likes_per_day_multiplier: "Αύξησε το όριο των ''Μου αρέσει'' καθημερινά για  tl3 (regular) πολλαπλασιάζοντας με αυτό τον αριθμό."
-    tl4_additional_likes_per_day_multiplier: "Αύξησε το όριο των αρέςει καθημερινα για tl4(leader) πολλαπλασιάζοντας με αυτό τον αριθμό"
-    num_spam_flags_to_block_new_user: "Αν οι αναρτήσεις ενός καινούριου χρήστη λάβουν τόσες αναφορές για spam από num_users_to_block_new_user διαφορετικούς χρήστες, τότε θα πραγματοποιηθεί κρύψιμο όλων των αναρτήσεων του και θα αποτραπεί από το να μπορεί να δημιουργήσει αναρτήσεις στο μέλλον. 0 για απενεργοποιήσει."
-    num_users_to_block_new_user: "Εάν οι δημοσιεύσεις κάποιου νέου χρήστη γίνουν num_spam_flags_to_block_new_user ανεπιθήμητες σημάνσεις από τους πολλούς διαφορετικούς χρήστες, κρήψε όλες τις δημοσιεύσεις τους και εμπόδισε μελλοντικές δημοσιεύσεις. Πάτα το 0 για απενεργοποιήση."
-    num_tl3_flags_to_block_new_user: "Αν οι αναρτήσεις ενός καινούριου χρήστη πάρουν τόσες πολλές σημάνσεις από το num_tl3_users_to_block_new_user, διαφορετικοί χρήστες επιπέδου εμπιστοσύνης 3, κρύβουν  όλες τους τις αναρτήσεις και αποτρέπουν μελλοντικές αναρτήσεις. 0 για απενεργοποίηση."
-    num_tl3_users_to_block_new_user: "Αν οι αναρτήσεις ενός καινούριου χρήστη πάρουν σήμανση num_tl3_users_to_block_new_user, από τόσους διαφορετικούς χρήστες επιπέδου εμπιστοσύνης 3, τότε κρύβουν  όλες τους τις αναρτήσεις και αποτρέπουν μελλοντικές αναρτήσεις. 0 για απενεργοποίηση."
-    notify_mods_when_user_blocked: "Εάν ένας χρήστης αυτόματα μπλοκαριστει, στείλετε μήνυμα σε όλους τους Συντονιστές."
+    tl4_additional_likes_per_day_multiplier: "Αύξησε το όριο των ''Μου αρέσει'' καθημερινά για tl4 (leader) πολλαπλασιάζοντας με αυτό τον αριθμό"
+    num_spam_flags_to_block_new_user: "Αν οι αναρτήσεις ενός καινούριου χρήστη λάβουν τόσες αναφορές για spam από num_users_to_block_new_user διαφορετικούς χρήστες, κρύψε όλες τις αναρτήσεις του χρήστη και εμπόδισε κάθε μελλοντική ανάρτηση. 0 για απενεργοποιήσει."
+    num_users_to_block_new_user: "Αν οι αναρτήσεις ενός καινούριου χρήστη πάρουν num_spam_flags_to_block_new_user σήμανση ανεπιθύμητου από τόσους χρηστες, κρύψε όλες τις αναρτήσεις του χρήστη και εμπόδισε κάθε μελλοντική ανάρτηση. 0 για απενεργοποίηση."
+    num_tl3_flags_to_block_new_user: "Αν οι αναρτήσεις ενός καινούριου χρήστη πάρουν τόσες πολλές σημάνσεις από num_tl3_users_to_block_new_user, διαφορετικούς χρήστες επιπέδου εμπιστοσύνης 3, κρύψε όλες τις αναρτήσεις του χρήστη και εμπόδισε κάθε μελλοντική ανάρτηση. 0 για απενεργοποίηση."
+    num_tl3_users_to_block_new_user: "Αν οι αναρτήσεις ενός καινούριου χρήστη πάρουν num_tl3_flags_to_block_new_user σημάνσεις  από τόσους χρηστες επιπέδου εμπιστοσύνης 3, κρύψε όλες τις αναρτήσεις του χρήστη και εμπόδισε κάθε μελλοντική ανάρτηση. 0 για απενεργοποίηση."
+    notify_mods_when_user_blocked: "Εάν ένας χρήστης αυτόματα μπλοκαριστει, στείλε μήνυμα σε όλους τους συντονιστές."
     flag_sockpuppets: "Εάν ένας νέος χρήστης απαντήσει σε ένα νήμα από την ίδια διεύθυνση ΙP όπως ο νέος χρήστης, ο οποίος ξεκίνησε το νήμα, και οι δυο δημοσιεύσεις τους θα επισημανθούν ως δυνητικά ανεπιθύμητες."
     traditional_markdown_linebreaks: "Χρήση παραδοσιακών αλλαγών γραμμών στη Markdown, η οποία απαιτεί δύο κενά διαστήματα για μια αλλαγή γραμμής."
-    allow_html_tables: "Αποδοχή εισδοχής πινάκων στη Markdown με τη χρήση ετικετών HTML. TABLE, THEAD, TD, TR, TH θα μπαίνουν στη λίστα επιτρεπόμενων (απαιτείται πληρής αντιγραφή σε όλες τις αναρτήσεις που περιέχουν πίνακες)"
     post_undo_action_window_mins: "Αριθμός των λεπτών όπου οι χρήστες δικαιούνται να αναιρέσουν πρόσφατες ενέργειες πάνω σε ένα θέμα (μου αρέσει, επισήμανση, κτλ) "
     must_approve_users: "Το προσωπικό πρέπει να εγκρίνει όλους τους λογαριασμούς των νέων χρηστών προτού τους επιτραπεί να έχουν πρόσβαση στην ιστοσελίδα. Προειδοποίηση: ενεργοποιώντας το για μια ζωντανή ιστοσελίδα θα έχει ως αποτέλεσμα την ανάκληση για τους υπάρχοντες χρήστες που δεν ανήκουν στο προσωπικό!"
-    pending_users_reminder_delay: "Ειδοποίηση συντονιστών αν καινούργιοι χρήστες περιμένουν για αποδοχή για μεγαλύτερο χρονικό διάστημα. Όρισε το στο -1 για τις ειδοποιήσεις."
+    pending_users_reminder_delay: "Ειδοποίηση συντονιστών αν καινούργιοι χρήστες περιμένουν για αποδοχή για μεγαλύτερο απο αυτό το χρονικό διάστημα. Όρισέ το στο -1 για να απενεργοποιηθούν οι ειδοποιήσεις."
     maximum_session_age: "Ο χρήστης θα παραμείνει συνδεδεμένος για n ώρες από την τελευταία του επίσκεψη"
-    ga_tracking_code: "ΑΠΑΡΧΑΙΩΜΕΝΟ: Google analytics (ga.js) tracking code code, eg: UA-12345678-9; βλέπε http://google.com/analytics"
-    ga_domain_name: "Υπο κατάργηση: Google analytics (ga.js) όνομα τομέα , π.χ. eg: mysite.com, βλέπε http://google.com/analytics"
+    ga_tracking_code: "ΠΑΡΩΧΗΜΕΝΟ: Google analytics (ga.js) tracking code code, eg: UA-12345678-9; βλέπε http://google.com/analytics"
+    ga_domain_name: "ΠΑΡΩΧΗΜΕΝΟ: Google analytics (ga.js) όνομα τομέα , π.χ. eg: mysite.com, βλέπε http://google.com/analytics"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; βλέπε http://google.com/analytics"
     ga_universal_domain_name: "Google Universal Analytics (analytics.js) όνομα τομέα, eg: mysite.com; βλέπε http://google.com/analytics"
     gtm_container_id: "Google Tag Manager container id. eg: GTM-ABCDEF"
-    enable_escaped_fragments: "Υποχώρηση στο Ajax-Crawling API της Google, αν δεν βρεθεί κάποιο πρόγραμμα ανίχνευσης του Ιστού. Βλέπε https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
+    enable_escaped_fragments: "Επιλογή του Ajax-Crawling API της Google, αν δεν βρεθεί κάποιο πρόγραμμα ανίχνευσης του Ιστού. Βλέπε https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "Να επιτρέπεται στους συντονιστές να δημιουργούν νέες κατηγορίες"
     cors_origins: "Επιτρεπόμενες πηγές για αιτήσεις πολλαπλής προέλευσης (cross-origin requests, CORS). Η κάθε προέλευση πρέπει να περιέχει http:// or https://. Η env μεταβλητή DISCOURSE_ENABLE_CORS πρέπει να οριστεί σε αληθινή για να ενεργοποιηθεί το CORS."
     use_admin_ip_whitelist: "Οι διαχειριστές μπορούν να συνδέονται μόνο αν βρίσκονται σε μια διευθυνση IP καθορισμένη στη λίστα Screened IPs (Admin > Logs > Screened Ips)."
-    top_menu: "Αποφάσισε ποια αντικείμενα θα εμφανίζονται στην πλοήγηση της αρχικής σελίδας, και με ποια σειρά. Παράδειγμα τελευταία/νέα/μη αναγνωσμένα/κατηγορίες/κορυφαία/αναγνωσμένα/δημοσιευμένα/σελιδοδείκτες"
+    top_menu: "Καθόρισε ποια αντικείμενα θα εμφανίζονται στην πλοήγηση της αρχικής σελίδας και με ποια σειρά. Παράδειγμα τελευταία/νέα/μη αναγνωσμένα/κατηγορίες/κορυφαία/αναγνωσμένα/δημοσιευμένα/σελιδοδείκτες"
     post_menu: "Αποφάσισε ποια αντικείμενα θα εμφανίζονται στο μενού των δημοσιεύσεων, και με ποια σειρά. Παράδειγμα μου αρέσει/επεξεργασία/επισήμανση/διαγραφή/κοινοποίηση/σελιδοδείκτης/απάντηση"
-    post_menu_hidden_items: "Τα στοιχεία καταλόγου να κρυφτούν από προεπιλογή στον αναρτημένο κατάλογο εκτός αν επιλεγεί μια ελλειπτική επέκταση. "
-    share_links: "Εντόπισε πια αντικείμενα εμφανίζονται στο κοινό διάλογο και σε πια σειρά"
-    track_external_right_clicks: "Παρακολουθείστε εξωτερικούς συνδέσμους οι οποίοι έχουν πατηθεί με αριστερό κλικ (πχ: άνοιγμα νέας καρτέλας) και είναι απενεργοποιημένες αυτόματα διότι επανεγγράφει URLs "
+    post_menu_hidden_items: "Οι επιλογές που θα κρυφτούν από προεπιλογή στο μενού της ανάρτησης, εκτός αν πατηθεί η επιλογή επέκτασης του μενού. "
+    share_links: "Καθόρισε ποια αντικείμενα εμφανίζονται στον διάλογο διαμοιρασμού και με ποια σειρά."
+    track_external_right_clicks: "Παρακολουθείστε εξωτερικούς συνδέσμους στους οποίους το δεξιό κλικ (πχ: άνοιγμα σε νέα καρτέλα) είναι απενεργοποιημένο από προεπιλογή διότι επανεγγράφει URLs "
     site_contact_username: "Ένα έγκυρο όνομα χρήστη για τα μέλη του προσωπικού από το οποίο θα στέλνονται όλα τα αυτοματοποιημένα μηνύματα. Αν αφεθεί κενό, θα χρησιμοποιείται ο προκαθορισμένος λογαριασμός συστήματος. "
     send_welcome_message: "Στείλε σε όλους τους νέους χρήστες ένα μήνυμα καλωσορίσματος μαζί με ένα γρήγορο οδηγό έναρξης."
-    suppress_reply_directly_below: "Να μην εμφανίζεται η επεκτάσιμη απάντηση σε ένα θέμα όταν υπάρχει μία μόνο απάντηση ακριβώς κάτω από αυτό το θέμα."
+    suppress_reply_directly_below: "Να μην εμφανίζεται το επεκτάσιμο αριθμός απαντήσεων σε ένα θέμα όταν υπάρχει μία μόνο απάντηση ακριβώς κάτω από αυτήν την ανάρτηση."
     suppress_reply_directly_above: "Να μην εμφανίζεται το επεκτάσιμο 'ως απάντηση σε' σε μία ανάρτηση όταν υπάρχει μόνο μία απάντηση ακριβώς πάνω από αυτή την ανάρτηση. "
     suppress_reply_when_quoting: "Να μην εμφανίζεται το επεκτάσιμο 'ως απάντηση σε' σε μία ανάρτηση όταν η απάντηση αναφέρεται στην ανάρτηση. "
-    max_reply_history: "Μέγιστος αριθμός απαντήσεων που ένας νέος χρήστης μπορεί να δώσει σε ένα συγκεκριμένο νήμα έως ότου κάποιος να του απαντήσει"
-    topics_per_period_in_top_summary: "Αριθμός κύριων θεμάτων που εμφανίζονται σε προκαθορισμένη περίληψη κύριων θεμάτων. "
-    topics_per_period_in_top_page: "Αριθμός κύριων θεμάτων που εμφανίζεται όταν επεκτείνεις 'δείξε περισσότερα' κύρια θέματα"
+    max_reply_history: "Μέγιστος αριθμός απαντήσεων προς επέκταση οταν επεκτείνεται 'ως απάντηση σε' "
+    topics_per_period_in_top_summary: "Αριθμός κορυφαίων νημάτων που θα εμφανίζονται στην προκαθορισμένη περίληψη κορυφαίων νημάτων. "
+    topics_per_period_in_top_page: "Αριθμός κορυφαίων νημάτων που θα εμφανίζονται στην επέκταση 'Δείξε Περισσότερα' κορυφαία νήματα."
     redirect_users_to_top_page: "Αυτόματα επαναπροσανατολίστε τους νέους και συχνούς απόντες χρήστες στη κορυφή της σελίδας."
-    top_page_default_timeframe: "Ουδέτερο χρονοδιάγραμμα για το πάνω μέρος της σελίδας"
-    show_email_on_profile: "Εμφάνιση ηλεκτρονικού ταχυδρομείου ενός χρήστη στο προφίλ τους (ορατό μόνο στον εαυτό τους και το προσωπικό)"
-    prioritize_username_in_ux: "Δίξε το όνομα χρήστη πρώτα στη σελίδα του χρήστη , κάρτα χρείστη και δημοσιεύσεις(όταν εμφανιστεί το ανάπηρο ονομά)"
-    email_token_valid_hours: "Ξέχασε κωδικό/ενεργοποίησε τα νομίςματα λογαριασμού που είναι έγκιρα για (ν) ώρες."
-    enable_badges: "Ενεργοποίηση συστήματος παράσημου"
-    enable_whispers: "Επιτρέπεται στο προσωπικό η προσωπική επικοινονία μεταξύ θεμάτων"
-    allow_index_in_robots_txt: "Καθόρισε στο robots.txt ότι αυτή η ιστοσελίδα επιτρέπεται να αναπροσαρμόζεται από τις μηχανές αναζήτησης."
-    email_domains_blacklist: "Μία λίστα με διευθύνσεις ηλεκτρονικού ταχυδρομίου με τις οποίες οι χρήστες δεν μπορούν να δημιουργίσουν λογαριασμό. Πχ: mailinator.com|trashmail.net"
-    email_domains_whitelist: "Μια λίστα με διευθύνσεις ηλεκτρονικού ταχυδρομίου στην οποία οι χρήστες ΠΡΕΠΕΙ να εγγράψουν λογαριασμούς. ΠΡΟΣΟΧΗ: οι χρήστες  με διευθύνσεις ηλεκτρονικού ταχυδρομίου οι οποίες δεν βρίσκονται σε αυτή τη λίστα δεν θα μπορούν να δημιουργήσουν λογαριασμό."
-    forgot_password_strict: "Μην ενημερώστε τους χρήστες για την ύπαρξη ενός λογαριασμού όταν χρησιμοποιούν το διάλογο ξέχασα τον κωδικό πρόσβασης."
+    top_page_default_timeframe: "Προκαθορισμένο χρονικό περιθώριο για την προβολή κορυφαίων νημάτων."
+    show_email_on_profile: "Εμφάνιση ηλεκτρονικού ταχυδρομείου στο προφίλ του μέλους (ορατό μόνο σε αυτούς και το προσωπικό)"
+    prioritize_username_in_ux: "Δίξε το όνομα χρήστη πρώτα στη σελίδα του χρήστη, την κάρτα χρήστη και στις δημοσιεύσεις (όταν είναι ανενεργό, φαίνεται πρώτα το όνομα)"
+    email_token_valid_hours: "Τα tokens ανάκτησης κωδικού / ενεργοποίησης λογαριασμού παραμένουν έγκυρα για (ν) ώρες."
+    enable_badges: "Ενεργοποίηση συστήματος παρασήμων"
+    enable_whispers: "Επιτρέπεται στο προσωπικό η ιδιωτική επικοινωνία μεταξύ νημάτων"
+    allow_index_in_robots_txt: "Καθόρισε στο robots.txt ότι για αυτή την ιστοσελίδα επιτρέπεται να δημιουργείται κατάλογος περιεχομένων από τις μηχανές αναζήτησης."
+    email_domains_blacklist: "Μία λίστα με διευθύνσεις ηλεκτρονικού ταχυδρομείου τις οποίες οι χρήστες δεν μπορούν να χρησιμοποιήσουν για να δημιουργήσουν λογαριασμό. Πχ: mailinator.com|trashmail.net"
+    email_domains_whitelist: "Μία λίστα με διευθύνσεις ηλεκτρονικού ταχυδρομείου τις οποίες οι χρήστες ΘΑ ΠΡΕΠΕΙ να χρησιμοποιήσουν για να δημιουργήσουν λογαριασμό. ΠΡΟΣΟΧΗ: οι χρήστες  με διευθύνσεις ηλεκτρονικού ταχυδρομίου οι οποίες δεν βρίσκονται σε αυτή τη λίστα δεν θα μπορούν να δημιουργήσουν λογαριασμό."
+    forgot_password_strict: "Να μην ενημερώνονται οι χρήστες για την ύπαρξη ενός λογαριασμού όταν χρησιμοποιούν την λειτουργία ανάκτησης κωδικού πρόσβασης."
     log_out_strict: "Όταν αποσυνδεθείτε, ΟΛΕΣ οι δραστηριότητες σας σε ΟΛΕΣ τις συσκευές θα αποσυνδεθούν"
-    version_checks: "Πατήστε το Hub του Discourse για αναβαθμήσεις και για την προβολή  ενημερώσεων αναβάθμησης στο ταμπλό του διαχειριστή.  "
-    new_version_emails: "Αποστολή ηλεκτρονικού μηνλυματος στην επαφή_ηλεκτρονική διεύθυνση όταν νέα έκδοση του Discourse είναι διαθέσιμη."
-    port: "ΠΡΟΓΡΑΜΜΑΤΙΣΤΕΣ ΜΟΝΟ! ΠΡΟΣΟΧΗ! Χρησιμοποιήστε το  HTTP port αντί για το αυτόματο port 80.  Αφήστε καινό για το αυτόματο 80. "
-    force_hostname: "ΠΡΟΓΡΑΜΜΑΤΙΣΤΉΣ ΜΌΝΟ! ΠΡΟΣΟΧΗ! Καθορίστε ένα όνομα εξυπηρετητή στη διεύθυνση URL. Αφήστε κενό για την προεπιλογή."
+    version_checks: "Έλεγξε το Hub του Discourse για αναβαθμίσεις και δείξε μηνύματα για νέες ενημερώσεις στην σελίδα διαχείρισης.  "
+    new_version_emails: "Αποστολή ηλεκτρονικού μηνλυματος στην contact_email διεύθυνση όταν μια νέα έκδοση του Discourse είναι διαθέσιμη."
+    port: "ΠΡΟΓΡΑΜΜΑΤΙΣΤΕΣ ΜΟΝΟ! ΠΡΟΣΟΧΗ! Χρησιμοποιήστε το  HTTP port αντί για το προκαθορισμένο port 80.  Αφήστε κενό για το προκαθορισμένο 80. "
+    force_hostname: "ΠΡΟΓΡΑΜΜΑΤΙΣΤΕΣ ΜΌΝΟ! ΠΡΟΣΟΧΗ! Καθορίστε ένα όνομα εξυπηρετητή στη διεύθυνση URL. Αφήστε κενό για το προκαθορισμένο ."
     invite_expiry_days: "Για πόσο καιρό οι κύριες προσκλήσεις ισχύουν, σε μέρες "
     invite_passthrough_hours: "Για πόσο καιρό ο χρήστης μπορεί να χρησιμοποιήσει ένα ήδη εξαργυρωμένο κλειδί πρόσκλησης για να συνδεθεί, σε ώρες"
     login_required: "Απαιτήστε την επικύρωση για να διαβάσετε το περιεχόμενο σε αυτήν την ιστοσελίδα,  απαγορεύσετε την ανώνυμη πρόσβαση."
@@ -1431,7 +1425,7 @@ el:
     email:
       not_allowed: "δεν επιτρέπεται από τον πάροχο του ηλεκτρονικού μηνύματος. Παρακαλώ χρησιμοποίησε μια άλλη διεύθυνση ηλεκτρονικού ταχυδρομείου."
       blocked: "δεν είναι επιτρεπτό."
-      revoked: "Δεν θα στέλνονται emails στο '%{email}' μέχρι τις %{ημερομηνια}."
+      revoked: "Δεν θα στέλνονται emails στο '%{email}' μέχρι τις %{date}."
     ip_address:
       blocked: "Δεν επιτρέπονται νεές εγγραφές από την IP  διεύθυνσή σου."
       max_new_accounts_per_registration_ip: "Δεν επιτρέπονται νεές εγγραφές από την IP  διεύθυνσή σου (το ανώτατο όριο έχει επιτευχθεί). Επικοινώνησε με ένα μέλος του προσωπικού."
@@ -1443,7 +1437,7 @@ el:
       other: "%{count} επισημάνσεις περιμένουν να διαχειριστούν"
   unsubscribe_mailer:
     title: "Διαγραφή αποστολέα"
-    subject_template: "Επιβεβαιώστε ότι δε θέλετε να λαμβάνετε πλέον εξελίξεις μέσω email από %{ιστοσελίδα_τίτλος}"
+    subject_template: "Επιβεβαιώστε ότι δε θέλετε να λαμβάνετε πλέον εξελίξεις μέσω email από %{site_title}"
     text_body_template: |
       Κάποιος (ίσως εσύ;) ζήτησε να μην αποστέλλονται ενημερώσεις με μήνυμα ηλεκτρονικού ταχυδρομείου από το %{site_domain_name} σε αυτή τη διεύθυνση.
       Εάν επιθυμείς να το επιβεβαιώσεις, παρακαλούμε πάτησε αυτό το σύνδεσμο:
@@ -1455,78 +1449,44 @@ el:
   invite_mailer:
     title: "Προσκάλεσε τον αποστολέα"
     subject_template: "%{invitee_name} σε προσκάλεσε σε '%{topic_title}' πάνω σε %{site_domain_name}"
-    text_body_template: |
-      %{όνομα_προσκεκλημένου} σας προσκάλεσε σε μία συζήτηση
-
-      > **%{τίτλος_νήματος}**
-      >
-      > %{περιγραφή_νήματος}
-
-      στο
-
-      > %{τίτλος_ιστοτόπου} -- %{περιγραφή_ιστοτόπου}
-
-      Εάν σε ενδιαφέρει, κάνε κλικ στο σύνδεσμο παρακάτω:
-
-      %{σύνδεσμος_πρόσκλησης}
   custom_invite_mailer:
     title: "Προσαρμοσμένη Πρόσκληση Ταχυδρομείου"
     subject_template: "%{invitee_name} σε προσκάλεσε στο %{topic_title}' του %{site_domain_name}"
-    text_body_template: |
-      %{όνομα_προσκεκλημένου} σας προσκάλεσε σε μία συζήτηση
-
-      > **%{τίτλος_νήματος}**
-      >
-      > %{περιγραφή_νήματος}
-
-      στο
-
-      > %{τίτλος_ιστοτόπου} -- %{περιγραφή_ιστοτόπου}
-
-      Με αυτή τη σημείωση
-
-      > %{εξατομίκευση_μηνύματος_χρήστη}
-
-      Εάν σε ενδιαφέρει, κάνε κλικ στο σύνδεσμο παρακάτω:
-
-      %{σύνδεσμος_πρόσκλησης}
-
-      Αυτή η πρόσκληση προέρχεται από έμπιστο χρήστη, επομένως ένας λογαριασμός θα δημιουργηθεί αυτόματα για εσένα χρησιμοποιώντας αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου.
   invite_forum_mailer:
     title: "Προσκαλέστε τον Μέιλερ του Φόρουμ"
     subject_template: "%{invitee_name} σε προσκάλεσε να συμμετέχεις στο %{site_domain_name}"
     text_body_template: |+
-      %{όνομα_προσκεκλημένου} σας προσκάλεσε να γίνετε μέλος
+      %{invitee_name} σας προσκάλεσε να γίνετε μέλος
 
-      > **%{τίτλος_ιστοτόπου}**
+      > **%{site_title}**
       >
-      > %{περιγραφή_ιστοτόπου}
+      > %{site_description}
 
       Εάν σε ενδιαφέρει, κάνε κλικ στο σύνδεσμο παρακάτω:
 
-      %{σύνδεσμος_πρόσκλησης}
+      %{invite_link}
 
   custom_invite_forum_mailer:
     subject_template: "%{invitee_name} σε προσκάλεσε να συμμετέχεις στο %{site_domailn_name}"
     text_body_template: |
-      %{όνομα_προσκεκλημένου} σας προσκάλεσε να γίνετε μέλος
+      %{invitee_name} σας προσκάλεσε να γίνετε μέλος
 
-      > **%{τίτλος_ιστοτόπου}**
+      > **%{site_title}**
       >
-      > %{περιγραφή_ιστοτόπου}
+      > %{site_description}
 
       Με αυτή τη σημείωση
 
-      > %{εξατομίκευση_μηνύματος_χρήστη}
+      > %{user_custom_message}
 
       Εάν σε ενδιαφέρει, κάνε κλικ στο σύνδεσμο παρακάτω:
 
-      %{σύνδεσμος_πρόσκλησης}
+      %{invite_link}
 
       Αυτή η πρόσκληση προέρχεται από έμπιστο χρήστη, επομένως ένας λογαριασμός θα δημιουργηθεί αυτόματα για εσένα χρησιμοποιώντας αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου.
   invite_password_instructions:
     title: "Προσκάλεσε οδηγίες κωδικού"
-    subject_template: "Όρισε κωδικό πρόσβασης για τον λογαρισμό σου %{όνομα_ιστοσελίδας}"
+    subject_template: "Όρισε κωδικό πρόσβασης για τον λογαρισμό σου %{site_name}"
   test_mailer:
     title: "Δοκιμάστε τον αποστολέα"
     text_body_template: |
@@ -1575,8 +1535,8 @@ el:
     text_body_template: |
       Ζήτω, μια νέα έκδοση του [Discourse](http://www.discourse.org) είναι διαθέσιμη!
 
-      Η έκδοσή σου: %{εγκατεστημένη_έκδοση}
-      Η νέα έκδοση: **%{νέα_έκδοση}**
+      Η έκδοσή σου: %{installed_version}
+      Η νέα έκδοση: **%{new_version}**
 
       - Λάβε την ενημέρωση εύκολα χρησιμοποιώντας **[ενημέρωση περιηγητή με ένα κλικ](%{base_url}/admin/upgrade)**
 
@@ -1588,8 +1548,8 @@ el:
     text_body_template: |
       Γιούπιιι, μια νέα έκδοση του [Discourse](http://www.discourse.org) είανι διαθέσιμη!
 
-      Η έκδοσή σου: %{εγκατεστημένη_έκδοση}
-      Η νέα έκδοση: **%{νέα_έκδοση}**
+      Η έκδοσή σου: %{installed_version}
+      Η νέα έκδοση: **%{new_version}**
 
       - Λάβε την ενημέρωση εύκολα χρησιμοποιώντας **[ενημέρωση περιηγητή με ένα κλικ](%{base_url}/admin/upgrade)**
 
@@ -1626,9 +1586,9 @@ el:
 
         Αυτό είναι αυτοματοποιημένο μήνυμα από %{site_name} tγια να σε ενημερώσει ότι η ανάρτησή σου έχει αποκρυφθεί.
 
-        %{βάση_url}%{url}
+        %{base_url}%{url}
 
-        %{λόγος_επισήμανσης}
+        %{flag_reason}
 
         Πολλά μέλη της κοινότητας επισήμαναν αυτή την ανάρτηση πριν αποκρυφθεί, οπότε σε παρακαλούμε σκέψου πως μπορείς να επαναλάβεις την ανάρτηση λαμβάνοντας υπόψιν τα σχόλια τους. **Μπορείς να επεξεργαστείς την ανάρτησή σου μετά από %{edit_delay} λεπτά, και αυτόματα θα επανεμφανιστεί.**
 
@@ -1947,26 +1907,6 @@ el:
     visit_link_to_respond: "[Visit Topic](%{base_url}%{url}) για να αποκριθείς."
     visit_link_to_respond_pm: "[Visit Message](%{base_url}%{url}) για να αποκριθείς."
     posted_by: "Δημοσιεύθηκε από %{username} στις %{post_date}"
-    invited_to_private_message_body: |
-      %{username} σας προσκάλεσε σε ένα μήνυμα
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      στο
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} σας προσκάλεσε σε μία συζήτηση
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      στο
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Ο χρήστης προσκλήθηκε σε προσωπικό μήνυμα"
       text_body_template: |
@@ -2104,7 +2044,6 @@ el:
       join_the_discussion: "Διάβασε περισσότερα"
       popular_posts: "Δημοφιλείς Δημοσιεύσεις"
       more_new: "Νέο για εσένα"
-      unsubscribe: "Αυτή η περίληψη αποστέλλεται από %{site_link} όταν δεν σε έχουμε δεί για ένα χρονικό διάστημα. Για να σταματήσεις την εγγραφή %{unsubscribe_link}."
       click_here: "κάνε κλικ εδώ"
       from: "%{site_name} περίληψη"
       preheader: "Μία σύντομη περίληψη από την τελευταία σου επίσκεψη στο %{last_seen_at}"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index b46d1483cef..e05db140c1f 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -213,6 +213,7 @@ en:
   user_is_suspended: "Suspended users are not allowed to post."
   topic_not_found: "Something has gone wrong. Perhaps this topic was closed or deleted while you were looking at it?"
   not_accepting_pms: "Sorry, %{username} is not accepting messages at the moment."
+  max_pm_recepients: "Sorry, you can send a message to maximum %{recipients_limit} recipients."
 
   just_posted_that: "is too similar to what you recently posted"
   invalid_characters: "contains invalid characters"
@@ -275,6 +276,9 @@ en:
       trust_level_2: "trust_level_2"
       trust_level_3: "trust_level_3"
       trust_level_4: "trust_level_4"
+    request_membership_pm:
+      title: "Membership Request for @%{group_name}"
+      body: "I would like to apply for membership in @%{group_name}."
 
   education:
     until_posts:
@@ -406,6 +410,10 @@ en:
           attributes:
             execute_at:
               in_the_past: "must be in the future."
+        translation_overrides:
+          attributes:
+            value:
+              missing_interpolation_keys: 'The following interpolation key(s) are missing: "%{keys}"'
 
   user_profile:
     no_info_me: "<div class='missing-profile'>the About Me field of your profile is currently blank, <a href='/u/%{username_lower}/preferences/about-me'>would you like to fill it out?</a></div>"
@@ -477,6 +485,7 @@ en:
       invalid_email_in: "'%{email}' is not a valid email address."
       email_already_used_in_group: "'%{email}' is already used by the group '%{group_name}'."
       email_already_used_in_category: "'%{email}' is already used by the category '%{category_name}'."
+      description_incomplete: "The category description post must have at least one paragraph."
     cannot_delete:
       uncategorized: "Can't delete Uncategorized"
       has_subcategories: "Can't delete this category because it has sub-categories."
@@ -723,7 +732,7 @@ en:
 
   unsubscribed:
     title: "Unsubscribed!"
-    description: "You have been unsubscribed. To change your email settings <a href='%{url}'>visit your user preferences</a>."
+    description: "<b>%{email}</b> has been unsubscribed. To change your email settings <a href='%{url}'>visit your user preferences</a>."
     topic_description: "To re-subscribe to %{link}, use the notification control at the bottom or right of the topic."
 
   unsubscribe:
@@ -939,6 +948,8 @@ en:
     search_tokenize_chinese_japanese_korean: "Force search to tokenize Chinese/Japanese/Korean even on non CJK sites"
     search_prefer_recent_posts: "If searching your large forum is slow, this option tries an index of more recent posts first"
     search_recent_posts_size: "How many recent posts to keep in the index"
+    log_search_queries: "Log search queries performed by users"
+    search_query_log_max_size: "Maximum amount of search queries to keep"
     allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off."
     allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles."
     unique_posts_mins: "How many minutes before a user can make a post with the same content again"
@@ -969,6 +980,7 @@ en:
     show_pinned_excerpt_desktop: "Show excerpt on pinned topics in desktop view."
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
     onebox_domains_blacklist: "A list of domains that will never be oneboxed."
+    inline_onebox_domains_whitelist: "A list of domains that will be oneboxed in miniature form if linked without a title"
     max_oneboxes_per_post: "Maximum number of oneboxes in a post."
 
     logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown."
@@ -1016,7 +1028,7 @@ en:
     flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam."
 
     traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak."
-    allow_html_tables: "Allow tables to be entered in Markdown using HTML tags. TABLE, THEAD, TD, TR, TH will be whitelisted (requires full rebake on all old posts containing tables)"
+    enable_markdown_typographer: "Use basic typography rules to improve text readability of paragraphs of text, replaces (c) (tm) etc, with symbols, reduces number of question marks and so on"
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!"
     pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications."
@@ -1025,12 +1037,14 @@ en:
     ga_domain_name: "OBSOLETE: Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
     ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see http://google.com/analytics"
+    ga_universal_auto_link_domains: "Enable Google Universal Analytics (analytics.js) cross-domain tracking. Outgoing links to these domains will have the client id added to them. See Google's Cross-Domain Tracking guide."
     gtm_container_id: "Google Tag Manager container id. eg: GTM-ABCDEF"
     enable_escaped_fragments: "Fall back to Google's Ajax-Crawling API if no webcrawler is detected. See https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "Allow moderators to create new categories"
     cors_origins: "Allowed origins for cross-origin requests (CORS). Each origin must include http:// or https://. The DISCOURSE_ENABLE_CORS env variable must be set to true to enable CORS."
     use_admin_ip_whitelist: "Admins can only log in if they are at an IP address defined in the Screened IPs list (Admin > Logs > Screened Ips)."
     blacklist_ip_blocks: "A list of private IP blocks that should never be crawled by Discourse"
+    whitelist_internal_hosts: "A list of internal hosts that discourse can safely crawl for oneboxing and other purposes"
     top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "The menu items to hide by default in the post menu unless an expansion ellipsis is clicked on."
@@ -1191,6 +1205,10 @@ en:
 
     png_to_jpg_quality: "Quality of the converted JPG file (1 is lowest quality, 99 is best quality, 100 to disable)."
 
+    allow_staff_to_upload_any_file_in_pm: "Allow staff members to upload any files in PM."
+
+    strip_image_metadata: "Strip image metadata."
+
     enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks."
 
     default_invitee_trust_level: "Default trust level (0-4) for invited users."
@@ -1366,6 +1384,8 @@ en:
     email_prefix: "The [label] used in the subject of emails. It will default to 'title' if not set."
     email_site_title: "The title of the site used as the sender of emails from the site. Default to 'title' if not set. If your 'title' contains characters that are not allowed in email sender strings, use this setting."
 
+    find_related_post_with_key: "Only use the reply key to find the replied-to post. (Recommended if using Amazon SES)"
+
     minimum_topics_similar: "How many topics need to exist before similar topics are presented when composing new topics."
 
     relative_date_duration: "Number of days after posting where post dates will be shown as relative (7d) instead of absolute (20 Feb)."
@@ -1483,6 +1503,8 @@ en:
 
     code_formatting_style: "Code button in composer will default to this code formatting style"
 
+    max_allowed_message_recipients: "Maximum recipients allowed in a message."
+
     default_email_digest_frequency: "How often users receive summary emails by default."
     default_include_tl0_in_digests: "Include posts from new users in summary emails by default. Users can change this in their preferences."
     default_email_private_messages: "Send an email when someone messages the user by default."
@@ -1562,6 +1584,8 @@ en:
       email_polling_disabled: "You must enable either manual or POP3 polling before enabling reply by email."
       user_locale_not_enabled: "You must first enable 'allow user locale' before enabling this setting."
       invalid_regex: "Regex is invalid or not allowed."
+      email_editable_enabled: "You must disable 'email editable' before enabling this setting."
+      enable_sso_disabled: "You must first enable 'enable sso' before enabling this setting."
 
   search:
     within_post: "#%{post_number} by %{username}"
@@ -1745,7 +1769,7 @@ en:
     text_body_template: |
       %{invitee_name} invited you to a discussion
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -1763,7 +1787,7 @@ en:
     text_body_template: |
       %{invitee_name} invited you to a discussion
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -2088,7 +2112,7 @@ en:
     csv_export_failed:
       title: "CSV Export Failed"
       subject_template: "Data export failed"
-      text_body_template: "We're sorry, but your data export failed. Please check the logs or contact a staff member."
+      text_body_template: "We're sorry, but your data export failed. Please check the logs or [contact a staff member](%{base_url}/about)."
 
     email_reject_insufficient_trust_level:
       title: "Email Reject insufficient Trust Level"
@@ -2096,7 +2120,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your account does not have the required trust level to post new topics to this email address. If you believe this is an error, contact a staff member.
+        Your account does not have the required trust level to post new topics to this email address. If you believe this is an error, [contact a staff member](%{base_url}/about).
 
     email_reject_user_not_found:
       title: "Email Reject User Not Found"
@@ -2104,7 +2128,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your reply was sent from an unknown email address. Try sending from another email address, or contact a staff member.
+        Your reply was sent from an unknown email address. Try sending from another email address, or [contact a staff member](%{base_url}/about).
 
     email_reject_screened_email:
       title: "Email Reject Screened Email"
@@ -2112,7 +2136,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your reply was sent from a blocked email address. Try sending from another email address, or contact a staff member.
+        Your reply was sent from a blocked email address. Try sending from another email address, or [contact a staff member](%{base_url}/about).
 
     email_reject_inactive_user:
       title: "Email Reject Inactive User"
@@ -2136,7 +2160,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your reply was sent from a different email address than the one we expected, so we're not sure if this is the same person. Try sending from another email address, or contact a staff member.
+        Your reply was sent from a different email address than the one we expected, so we're not sure if this is the same person. Try sending from another email address, or [contact a staff member](%{base_url}/about).
 
     email_reject_no_account:
       title: "Email Reject No Account"
@@ -2144,7 +2168,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        We can't find any accounts that match your email address. Try sending from a different email address, or contact a staff member.
+        We can't find any accounts that match your email address. Try sending from a different email address, or [contact a staff member](%{base_url}/about).
 
     email_reject_empty:
       title: "Email Reject Empty"
@@ -2170,7 +2194,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your account does not have the privileges to post new topics in that category. If you believe this is an error, contact a staff member.
+        Your account does not have the privileges to post new topics in that category. If you believe this is an error, [contact a staff member](%{base_url}/about).
 
     email_reject_strangers_not_allowed:
       title: "Email Reject Strangers Not Allowed"
@@ -2178,7 +2202,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        The category you sent this email to only allows replies from users with valid accounts and known email addresses. If you believe this is an error, contact a staff member.
+        The category you sent this email to only allows replies from users with valid accounts and known email addresses. If you believe this is an error, [contact a staff member](%{base_url}/about).
 
     email_reject_invalid_post:
       title: "Email Reject Invalid Post"
@@ -2215,7 +2239,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        The reply key in the email is invalid or unknown, so we can't figure out what this email is in reply to. Contact a staff member.
+        The reply key in the email is invalid or unknown, so we can't figure out what this email is in reply to. [Contact a staff member](%{base_url}/about).
 
     email_reject_bad_destination_address:
       title: "Email Reject Bad Destination Address"
@@ -2231,7 +2255,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        The topic you are replying to no longer exists -- perhaps it was deleted? If you believe this is an error, contact a staff member.
+        The topic you are replying to no longer exists -- perhaps it was deleted? If you believe this is an error, [contact a staff member](%{base_url}/about).
 
     email_reject_topic_closed:
       title: "Email Reject Topic Closed"
@@ -2239,7 +2263,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        The topic you are replying to is currently closed and no longer accepting replies. If you believe this is an error, contact a staff member.
+        The topic you are replying to is currently closed and no longer accepting replies. If you believe this is an error, [contact a staff member](%{base_url}/about).
 
     email_reject_auto_generated:
       title: "Email Reject Auto Generated"
@@ -2247,7 +2271,15 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your email was marked as "auto generated", which means it was automatically created by a computer instead of being typed by a human; we can't accept those kinds of emails. If you believe this is an error, contact a staff member.
+        Your email was marked as "auto generated", which means it was automatically created by a computer instead of being typed by a human; we can't accept those kinds of emails. If you believe this is an error, [contact a staff member](%{base_url}/about).
+
+    email_reject_unrecognized_error:
+      title: "Email Reject Unrecognized Error"
+      subject_template: "[%{email_prefix}] Email issue -- Unrecognized Error"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        There was an unrecognized error while processing your email and it wasn't posted. You should try again, or [contact a staff member](%{base_url}/about).
 
     email_error_notification:
       title: "Email Error Notification"
@@ -2355,7 +2387,7 @@ en:
       text_body_template: |
         Congratulations, you've earned the **New User of the Month award for %{month_year}**. :trophy:
 
-        This award is only granted to two new users per month, and it will be permanently visible on [your user page](/my/badges).
+        This award is only granted to two new users per month, and it will be permanently visible on [your user page](%{base_url}/my/badges).
 
         You've quickly become a valuable member of our community. Thanks for joining, and keep up the great work!
 
@@ -2392,10 +2424,21 @@ en:
 
     posted_by: "Posted by %{username} on %{post_date}"
 
+    invited_group_to_private_message_body: |
+      %{username} invited @%{group_name} to a message
+
+      > #### %{topic_title}
+      >
+      > %{topic_excerpt}
+
+      at
+
+      > %{site_title} -- %{site_description}
+
     invited_to_private_message_body: |
       %{username} invited you to a message
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -2406,7 +2449,7 @@ en:
     invited_to_topic_body: |
       %{username} invited you to a discussion
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -2414,6 +2457,16 @@ en:
 
       > %{site_title} -- %{site_description}
 
+    user_invited_to_private_message_pm_group:
+      title: "User Invited Group to PM"
+      subject_template: "[%{email_prefix}] %{username} invited @%{group_name} to a message '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+
     user_invited_to_private_message_pm:
       title: "User Invited to PM"
       subject_template: "[%{email_prefix}] %{username} invited you to a message '%{topic_title}'"
@@ -2574,7 +2627,7 @@ en:
       popular_posts: "Popular Posts"
       more_new: "New for you"
       subject_template: "[%{email_prefix}] Summary"
-      unsubscribe: "This summary is sent from %{site_link} when we haven't seen you in a while. To unsubscribe %{unsubscribe_link}."
+      unsubscribe: "This summary is sent from %{site_link} when we haven't seen you in a while. Change <a href='%{email_settings_url}'>your email settings</a>, or %{unsubscribe_link} to unsubscribe."
       click_here: "click here"
       from: "%{site_name} summary"
       preheader: "A brief summary since your last visit on %{last_seen_at}"
@@ -2715,7 +2768,7 @@ en:
 
   login_required:
     welcome_message: |
-      #[Welcome to %{title}](#welcome)
+      ## [Welcome to %{title}](#welcome)
       An account is required. Please create an account or log in to continue.
 
   terms_of_service:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 0a03209ff55..1c2b48bfedb 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -34,8 +34,8 @@ es:
   anonymous: "Anónimos"
   remove_posts_deleted_by_author: "Eliminado por su autor"
   themes:
-    bad_color_scheme: "No se puede actualizar el tema, la combinación de colores no es válida"
-    other_error: "Se ha producido un error al actualizar el tema"
+    bad_color_scheme: "No puedes actualizar theme, esquema de color inválido"
+    other_error: "Algo salió mal actualizando el theme"
   emails:
     incoming:
       default_subject: "Este tema necesita un título"
@@ -74,14 +74,14 @@ es:
       greater_than_or_equal_to: debe ser igual o más grande que %{count}
       has_already_been_used: "ya se está utilizando"
       inclusion: no está incluido en la lista
-      invalid: es inválido
+      invalid: no es válido
       is_invalid: "parece poco claro, es una oración completa?"
       contains_censored_words: "contiene las siguientes palabras censuradas: %{censored_words}"
       matches_censored_pattern: "contiene las siguientes palabras que coinciden con el regexp de censuras: %{censored_words}"
       less_than: debe ser menor que %{count}
       less_than_or_equal_to: debe ser menor o igual que %{count}
       not_a_number: no es un número
-      not_an_integer: debe ser un número entero
+      not_an_integer: debe ser un valor entero
       odd: debe ser impar
       record_invalid: 'Error en la validación: %{errors}'
       restrict_dependent_destroy:
@@ -116,14 +116,14 @@ es:
     user_exists: "No hace falta invitar a <b>%{email}</b>, ¡ya <a href='/u/%{username}/summary'>tiene una cuenta</a>!"
   bulk_invite:
     file_should_be_csv: "El archivo subido debería ser de formato csv."
-    error: "Ha ocurrido un error al subir ese archivo. Por favor, inténtalo de nuevo más tarde."
+    error: "Ha ocurrido un error al subir ese archivo. Por favor, inténtalo más tarde de nuevo."
   topic_invite:
     user_exists: "Lo sentimos, ese usuario ya ha sido invitado. Solo se puede invitar una vez a un usuario a un tema."
   backup:
-    operation_already_running: "Actualmente ya se está ejecutando una operación. No se puede iniciar un nuevo trabajo en este momento."
-    backup_file_should_be_tar_gz: "El archivo de la copia de seguridad debería ser un .tar.gz"
+    operation_already_running: "Actualmente se está ejecutando una operación. No se puede iniciar un nuevo trabajo en este momento."
+    backup_file_should_be_tar_gz: "El archivo de la copia de seguridad debería ser del tipo .tar.gz"
     not_enough_space_on_disk: "No hay espacio suficiente en el disco para subir esta copia de seguridad."
-    invalid_filename: "El nombre de archivo del backup contiene caracteres no válidos. Los válidos son: a-z 0-9 . - _."
+    invalid_filename: "El nombre de archivo del backup contiene caracteres no válidos. Los válidos son a-z 0-9 . - _."
   not_logged_in: "Tienes que iniciar sesión para hacer eso."
   not_found: "No se ha podido encontrar la URL o recurso solicitado."
   invalid_access: "No tienes permiso para ver el recurso solicitado."
@@ -151,15 +151,15 @@ es:
     replies:
       one: "1 respuesta"
       other: "%{count} respuestas"
-  no_mentions_allowed: "Lo sentimos, no puedes mencionar a otros usuarios."
+  no_mentions_allowed: "Lo sentimos, pero no puedes mencionar a otros usuarios."
   too_many_mentions:
     one: "Lo sentimos, solo puedes mencionar a un usuario en un post."
-    other: "Lo sentimos, solo puedes mencionar a %{count} usuarios en un post."
-  no_mentions_allowed_newuser: "Lo sentimos, los usuarios nuevos no pueden mencionar a otros usuarios."
+    other: "Lo sentimos, pero solo puedes mencionar a %{count} usuarios en un post."
+  no_mentions_allowed_newuser: "Lo sentimos, pero los usuarios nuevos no pueden mencionar a otros usuarios."
   too_many_mentions_newuser:
     one: "Lo sentimos, pero los usuarios nuevos solo pueden mencionar a un usuario en un post."
-    other: "Lo sentimos, los usuarios nuevos solo pueden mencionar a %{count} usuarios en un post."
-  no_images_allowed: "Lo sentimos, los usuarios nuevos no pueden poner imágenes en los mensajes."
+    other: "Lo sentimos, pero los usuarios nuevos solo pueden mencionar a %{count} usuarios en un post."
+  no_images_allowed: "Lo sentimos, pero los usuarios nuevos no pueden poner imágenes en los mensajes."
   too_many_images:
     one: "Lo sentimos, pero los usuarios nuevos solo pueden poner una imagen por post."
     other: "Lo sentimos, los nuevos usuarios solo pueden poner %{count} imágenes en un post."
@@ -214,7 +214,7 @@ es:
     delete_reason: "Eliminado vía moderación"
   groups:
     success:
-      bulk_add: "%{uUsers_added} usuarios han sido añadidos al grupo."
+      bulk_add: "usuarios %{users_added} han sido agregado al grupo."
     errors:
       can_not_modify_automatic: "No se puede modificar un grupo automático"
       member_already_exist: "'%{username}' ya es miembro de este grupo."
@@ -222,6 +222,7 @@ es:
       invalid_incoming_email: "'%{email}' no es una dirección de email válida."
       email_already_used_in_group: "'%{email}' ya está siendo utilizado por el grupo '%{group_name}'."
       email_already_used_in_category: "'%{email}' ya está siendo utilizado por la categoría '%{category_name}'."
+      cant_allow_membership_requests: "No puedes permitir solicitudes de membresía para un grupo sin ningún propietario. "
     default_names:
       everyone: "todos"
       admins: "administradores"
@@ -232,6 +233,9 @@ es:
       trust_level_2: "nivel_de_confianza_2"
       trust_level_3: "nivel_de_confianza_3"
       trust_level_4: "nivel_de_confianza_4"
+    request_membership_pm:
+      title: "Solicitud de membresía para @%{group_name}"
+      body: "Me gustaría pertenecer al grupo @%{groupName}."
   education:
     until_posts:
       one: "1 post"
@@ -279,13 +283,13 @@ es:
 
       ¿Estás seguro de que estás proporcionando el tiempo adecuado para que otras personas puedan ofrecer también sus puntos de vista?
     get_a_room: |
-      ### Considera responder a más gente
+      ### Considera responder a más personas
 
-      Ya le has respondido %{count} veces a @%{reply_username} en este tema en particular.
+      Has respondido %{count} veces a @%{reply_username} sólo en este tema.
 
-      ¿Has pensado en responder a *otra* gente en el tema también? Una buena conversación involucra a varias personas y perspectivas.
+      Has considerado que puedes responder a las *otras* personas en el debate también? Una buena conversación incluye muchas respuestas y perspectivas.
 
-      Si quieres continuar la conversación con este usuario en particular por privado, [mándales un mensaje personal](/u/%{reply_username}).
+      Si necesitas mantener la conversación con ese usuario en particular, puedes [enviarle un mensaje privado](/u/%{reply_username}).
     too_many_replies: |
       ### Has alcanzado el límite de respuestas para este tema
 
@@ -345,14 +349,18 @@ es:
         custom_emoji:
           attributes:
             name:
-              taken: está siendo usado por otro emoji
+              taken: ya está en uso por otro emoji
         topic_timer:
           attributes:
             execute_at:
               in_the_past: "debe ser en el futuro."
+        translation_overrides:
+          attributes:
+            value:
+              missing_interpolation_keys: 'Las siguientes claves de interpolación se perdieron: "%{keys}"'
       <<: *errors
   user_profile:
-    no_info_me: "<div class='missing-profile'>el campo \"Acerca de mí\" de tu perfil está sin rellenar, <a href='/u/%{username_lower}/preferences/about-me'>¿te completarlo ahora?</a></div>"
+    no_info_me: "<div class='missing-profile'>El campo 'Sobre mí' de tu perfil está vacío, <a href='/u/%{username_lower}/preferences/about-me'>¿Te gustaría completarlo?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} no has completado aún el campo 'Sobre mí' de tu perfil</div>"
   vip_category_name: "Sala VIP"
   vip_category_description: "Una categoría exclusiva para miembros con un nivel de confianza de 3 o más."
@@ -361,7 +369,7 @@ es:
   staff_category_name: "Staff"
   staff_category_description: "Categoría privada para debates entre moderadores y administradores. Los temas solo serán visibles para miembros del staff."
   assets_topic_title: "Recursos para el diseño del sitio"
-  assets_topic_body: "Este es un tema permanente, visible únicamente para miembros del staff, con el fin de almacenar las imágenes y archivos utilizados en el diseño del sitio. ¡No lo elimines!\n\n\nCómo hacerlo:\n\n\n1. Responde a este tema.\n2. Sube todas las imágenes que desees para los logos, favicons y demás aquí. (Usa el icono de la barra de herramientas en el editor o arrastra y suelta las imágenes o pégalas). \n3. Publica tu respuesta.\n4. Haz clic con el botón derecho en las imágenes de tu nuevo post para obtener la ruta donde están subidas, o haz clic en el icono de editar para ver estas rutas en el panel de edición. Copia las rutas.\n5. Pega las rutas a las imágenes en [ajustes básicos](/admin/site_settings/category/required).\n\n\nSi necesitas habilitar la subida de diferentes tipos de archivo, edita `authorized_extensions` en las opciones de [archivos](/admin/site_settings/category/files)."
+  assets_topic_body: "Este tema, es visible únicamente para miembros del staff, con el fin de almacenar las imágenes y archivos utilizados en el diseño del sitio. ¡No lo elimines!\n\n\nCómo hacerlo:\n\n\n1. Responde a este tema.\n2. Sube todas las imágenes que desees para los logos, favicons y demás aquí. (Usa el icono de la barra de herramientas en el editor o arrastra y suelta las imágenes o pégalas). \n3. Publica tu respuesta.\n4. Haz clic con el botón derecho en las imágenes de tu nuevo post para obtener la ruta donde están subidas, o haz clic en el icono de editar para ver estas rutas en el panel de edición. Copia las rutas.\n5. Pega las rutas a las imágenes en [ajustes básicos](/admin/site_settings/category/required).\n\n\nSi necesitas habilitar la subida de diferentes tipos de archivo, edita `authorized_extensions` en las opciones de [archivos](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Bienvenido a Discourse"
     body: |2
@@ -558,28 +566,28 @@ es:
     missing_session: "No hemos podido detectar si tu cuenta fue creada. Por favor, asegúrate de tener activadas las cookies en tu navegador."
     activated: "Disculpa, esta cuenta ya ha sido activada."
     admin_confirm:
-      title: "Confirmar cuenta de administrador"
-      description: "¿Estás seguro de que quieres que <b>%{target_username}</b> sea un administrador?"
-      grant: "Conceder acceso administrativo"
+      title: "Confirmar Cuenta Administrador"
+      description: "Estás seguro que quieres que <b>%{target_username}</b> sea un administrador?"
+      grant: "Conceder acceso de Admin"
       complete: "<b>%{target_username}</b> es ahora un administrador."
-      back_to: "Volver a %{title}"
+      back_to: "Volver al %{title}"
   post_action_types:
     off_topic:
       title: 'Off-Topic'
       description: 'Este post se desvía demasiado o no es relevante para el tema en cuestión (definido por el título del tema y su primer post), probablemente debería ser movido a otro hilo.'
-      short_description: 'No tiene relación con el tema'
+      short_description: 'No es relevante para la discusión'
       long_form: 'reportado como off-topic'
     spam:
       title: 'Spam'
-      description: 'Este post es un anuncio o vandalismo. No es útil ni relevante para el tema actual.'
-      short_description: 'Es un anuncio o vandalismo.'
+      description: 'Este post es publicidad, o vandalismo. No es útil o relevante para el tema.'
+      short_description: 'Esto es publicidad o vandalismo'
       long_form: 'reportado como spam'
       email_title: '"%{title}" fue reportado como spam'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Inapropiado'
       description: 'Este post contiene contenido que una persona sensata podría considerar ofensivo, abusivo o que viola <a href="/guidelines">nuestras directrices de comunidad</a>.'
-      short_description: 'Una violación de <a href="/guidelines">nuestras directrices de la comunidad</a>'
+      short_description: 'Una violación a las <a href="/guidelines">guías de nuestra comunidad</a>'
       long_form: 'reportado como inapropiado'
     notify_user:
       title: 'Enviar un mensaje a @{{username}}'
@@ -591,24 +599,24 @@ es:
     notify_moderators:
       title: "Notificar a los moderadores"
       description: 'Este mensaje requiere la atención del equipo de moderación por una razón no especificada arriba.'
-      short_description: 'Requiere la atención de un moderador por otra razón'
+      short_description: 'Requiere atención del staff por otra razón'
       long_form: 'reportó esto'
       email_title: 'Un mensaje en "%{title}" requiere atención del staf'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: 'Marcador'
       description: 'Marca este post'
-      short_description: 'Añade a marcadores este post'
+      short_description: 'Guarda este post'
       long_form: 'Post marcado'
     like:
       title: 'Like'
       description: 'Te gusta este post'
-      short_description: 'Me gusta este post'
+      short_description: 'Te gusta este post'
       long_form: 'Te gusta esto'
     vote:
       title: 'Vota'
       description: 'Vota por este post'
-      short_description: 'Votar este post'
+      short_description: 'Vota por este post'
       long_form: 'Votado para este post'
   user_activity:
     no_bookmarks:
@@ -645,7 +653,7 @@ es:
         remove: "Este tema ya no se utiliza como banner. Ya no aparecerá en la parte superior de cada página."
   unsubscribed:
     title: "¡Suscripción cancelada!"
-    description: "Has cancelado tu suscripción. Para cambiar tus preferencias de email <a href='%{url}'>visita tus opciones de usuario</a>."
+    description: "<b>%{email}</b> ha sido desuscrito. Para cambiar la configuración del email <a href='%{url}'>visita las preferencias del usuario</a>."
     topic_description: "Para volver a suscribirte a %{link}, utiliza el desplegable de notificación al pie o en la parte derecha del tema."
   unsubscribe:
     title: "Cancelar suscripción"
@@ -896,7 +904,7 @@ es:
     email_custom_headers: "Lista de emails separados por una barra"
     email_subject: "Formato de asunto personalizable para emails estándar. Mira https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     force_https: "Forzar al sitio a utilizar sólo HTTPS. AVISO: ¡NO actives esta opción a menos que verifiques completamente la configuración y funcione correctamente en todas partes! ¿Has verificado también que el CDN, los inicios de sesión social y cualquier logo externo / dependencia son compatibles con HTTPS?"
-    same_site_cookies: "Utilizar las mismas cookies del sitio, que elimina todos los vectores Cross Site Request Forgery en los navegadores soportados (Lax o Strict). Aviso: Strict solo funcionará en sitios que fuerzan el inicio de sesión y usan SSO."
+    same_site_cookies: "Usar las mismas cookies del sitio, ellos eliminan todos los vectores CSRF -Cross-site request forgery o falsificación de petición en sitios cruzados- de los navegadores soportados (Lax o Strict). Advertencia: Strict solo funcionará en sitios que forcen el inicio de sesión y usen SSO. "
     summary_score_threshold: "La puntuación mínima requerida para que un post sea incluido en el 'Resumen de este tema\""
     summary_posts_required: "El mínimo número de posts en un tema para habilitar el 'Resumen de este tema'"
     summary_likes_required: "Mínimo de \"me gusta\" en un tema para habilitar 'Resumen de este tema'"
@@ -923,7 +931,7 @@ es:
     notify_mods_when_user_blocked: "Si un usuario es bloqueado automáticamente, enviar un mensaje a todos los moderadores."
     flag_sockpuppets: "Si un nuevo usuario responde a un tema desde la misma dirección de IP que el nuevo usuario que inició el tema, reportar los posts de los dos como spam en potencia."
     traditional_markdown_linebreaks: "Utiliza saltos de línea tradicionales en Markdown, que requieren dos espacios al final para un salto de línea."
-    allow_html_tables: "Permitir la inserción de tablas en Markdown usando etiquetas HTML. Se permitirá usar TABLE, THEAD, TD, TR o TH (requiere un rebake completo para los posts antiguos que contengan tablas)"
+    enable_markdown_typographer: "Utilice reglas básicas de tipografía para mejorar la legibilidad de texto de los párrafos de texto, reemplaza (c) (tm) etc, con símbolos, reduce el número de signos de interrogación y así sucesivamente"
     post_undo_action_window_mins: "Número de minutos durante los cuales los usuarios pueden deshacer sus acciones recientes en un post (me gusta, reportes, etc)."
     must_approve_users: "Los miembros administración deben aprobar todas las nuevas cuentas antes de que se les permita el acceso al sitio. AVISO: ¡habilitar esta opción en un sitio activo revocará el acceso a los usuarios que no sean moderadores o admin!"
     pending_users_reminder_delay: "Notificar a los moderadores si hay nuevos usuarios que hayan estado esperando aprbación durante más estas horas. Usa -1 para desactivar estas notificaciones."
@@ -937,6 +945,8 @@ es:
     allow_moderators_to_create_categories: "Permitir a los moderadores crear nuevas categorías"
     cors_origins: "Orígenes permitidos para las cross-origin requests (CORS). Cada origen debe incluir http:// or https://. La variable env DISCOURSE_ENABLE_CORS debe establecerse a verdadero para activar CORS."
     use_admin_ip_whitelist: "Los admins solo pueden iniciar sesión si están en una dirección IP definida en la lista de Screened IPs (Admin > Logs > Screened Ips)."
+    blacklist_ip_blocks: "Una lista de IPs bloqueadas privadas que nunca deberían ser rastreadas por Discourse"
+    whitelist_internal_hosts: "Una lista con hosts internos que discourse puede rastrear de forma segura para oneboxing y otros propósitos"
     top_menu: "Determinar que items aparecen en la navegación de la home y en qué orden. Ejemplo latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Determina qué elementos aparecen en el menú de un post y en qué orden. Ejemplo: like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Los elementos del menú a ocultar por defecto en el menú de cada post a menos que se haga clic en el botón para expandir las opciones."
@@ -968,7 +978,7 @@ es:
     force_hostname: "¡SOLO DESARROLLADORES! ¡ADVERTENCIA! Especificar un hostname en la URL, dejar blanco para usar el valor por defecto"
     invite_expiry_days: "Durante cuánto tiempo son válidas las claves de invitación de usuarios, en días"
     invite_passthrough_hours: "Durante cuánto tiempo, en horas, un usuario puede utilizar una clave de invitación redimida para iniciar sesión iniciar sesión"
-    invite_only: "El registro público está desactivado, todos los nuevos usuarios deberán ser explícitamente invitados por el staff."
+    invite_only: "El registro público está deshabilitado, todos los nuevos usuarios deberán ser invitados explícitamente por el staff."
     login_required: "Se requiere haber iniciado sesión para leer el contenido de este sitio, deshabilita el acceso anónimo."
     min_username_length: "Longitud mínima del nombre de usuario en caracteres. ADVERTENCIA: si existen usuarios o grupos con nombres de menor longitud que ésta, tu sitio se romperá."
     max_username_length: "Longitud máxima del nombre de usuario en caracteres. ADVERTENCIA: si tienes usuarios o grupos con mayor cantidad de caracteres que ésta, tu sitio se romperá."
@@ -1063,7 +1073,8 @@ es:
     default_opengraph_image_url: "URL de la imagen opengraph por defecto."
     twitter_summary_large_image_url: "URL de la imagen por defecto para la tarjeta resumen de Twitter (debería ser al menos de 280px de ancho y 150 px de alto)."
     allow_all_attachments_for_group_messages: "Permitir todos los archivos adjuntos de email para los mensajes a grupos."
-    png_to_jpg_quality: "Calidad del archivo JPG convertido (1 es la calidad más baja, 99 es la mejor calidad, 100 para desactivarlo)."
+    png_to_jpg_quality: "Calidad del archivo JPG convertido  (1 es calidad mínima, 99 es máxima calidad, 100 para deshabilitar conversión)."
+    allow_staff_to_upload_any_file_in_pm: "Permitir a los miembros del staff subir cualquier archivo en MP."
     enable_flash_video_onebox: "Habilitar el embebido de enlaces swf y flv (Adobe Flash) en formato Onebox. AVISO: podría introducir riesgos de seguridad."
     default_invitee_trust_level: "Nivel de confianza por defecto (0-4) para usuarios invitados."
     default_trust_level: "Nivel de confianza por defecto (0-4) para los nuevos usuarios. ¡AVISO! Cambiar esto puede resultar en riesgo por spam."
@@ -1121,7 +1132,7 @@ es:
     max_image_size_kb: "El tamaño máximo, en kB, para subir imágenes. Debe ser configurado también en nginx (client_max_body_size) / apache o proxy."
     max_attachment_size_kb: "El tamaño máximo, en kB, para adjuntar archivos. Debe ser configurado también en nginx (client_max_body_size) / apache o proxy."
     authorized_extensions: "Una lista de las extensiones de archivo permitidas para subir (usa \"*\" para habilitar todos los tipos de archivo)"
-    theme_authorized_extensions: "Lista de extensiones de archivo que están permitidas para subir temas (usa '*' para permitir todos los tipos de archivos)"
+    theme_authorized_extensions: "Una lista de las extensiones de archivo permitidas para subir (usa \"*\" para habilitar todos los tipos)"
     max_similar_results: "Cuántos temas similares se mostrarán encima del editor cuando estés creando un nuevo tema. La comparación se basa en el título y el cuerpo del tema."
     max_image_megapixels: "Máximo de megapíxeles permitidos por una imagen."
     title_prettify: "Prevenir errores comunes en el título, incluyendo \"todo mayúsculas\", primera letra minúscula, multiples signos ! o ?, . extra al final, etc."
@@ -1152,7 +1163,7 @@ es:
     max_age_unmatched_ips: "Eliminar entradas de IP que no coincidan después de (N) días."
     num_flaggers_to_close_topic: "Número mínimo de denunciantes únicos requerido para pausar un tema automáticamente para intervención"
     num_flags_to_close_topic: "Valor mínimo de reportes activos requerido para pausar un tema automáticamente para intervención"
-    num_hours_to_close_topic: "Número de horas que pausar este tema para intervenir."
+    num_hours_to_close_topic: "Número de horas a pausar un tema para invervención."
     auto_respond_to_flag_actions: "Activar la respuesta automática al deshacer un reporte."
     min_first_post_typing_time: "Mínimo período de tiempo en milisegundos en el que un usuario debe estar tecleando durante su primer post, si no se llega a este umbral entrará automáticamente a la cola de moderación. Establece esta opción a 0 para desactivarla (no recomendado)."
     auto_block_fast_typers_on_first_post: "Bloquear automáticamente a usuarios que no cumplan el umbral establecido en min_first_post_typing_time"
@@ -1161,7 +1172,7 @@ es:
     reply_by_email_enabled: "Habilitar la respuesta a temas por email."
     reply_by_email_address: "Plantilla para la dirección de email que aparecerá al recibir correos con la función de respuesta por email: %{reply_key}@respuesta.ejemplo.com o respuestas+%{reply_key}@ejemplo.com"
     alternative_reply_by_email_addresses: "Lista de plantillas alternativa para las direcciones de respuesta por email. Ejemplo: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
-    incoming_email_prefer_html: "Utiliza el HTML en lugar del texto para el correo entrante."
+    incoming_email_prefer_html: "Usar el HTML en vez del texto del email entrante."
     disable_emails: "Impedir que Discourse envié cualquier tipo de e-mail."
     strip_images_from_short_emails: "Remover imágenes de e-mails que tengan un tamaño menor a 2800 Bytes"
     short_email_length: "e-mail corto longitud en Bytes"
@@ -1185,7 +1196,7 @@ es:
     attachment_filename_blacklist: "Lista de palabras clave utilizadas para bloquear adjuntos basados en el nombre de archivo."
     enable_forwarded_emails: "[BETA] Permitir a los usuarios crear temas enviándolos por email."
     always_show_trimmed_content: "Mostrar siempre la parte recortada de los emails entrantes. AVISO: podría revelar direcciones de correo."
-    private_email: "No incluyas contenido de publicaciones o temas en correos electrónicos para obtener mayor privacidad."
+    private_email: "No incluir contenido de posts o temas en emails para mejorar la privacidad."
     manual_polling_enabled: "Lanza emails usando la API para las respuestas por email."
     pop3_polling_enabled: "Poll vía POP3 para respuestas de e-mail."
     pop3_polling_ssl: "Usar SSL mientras se conecta al servidor POP3. (Recomendado)"
@@ -1200,6 +1211,7 @@ es:
     email_in_min_trust: "El mínimo nivel de confianza requerido para poder publicar nuevos temas por email."
     email_prefix: "La [etiqueta] utilizada en el asunto de los emails. Si no está configurado, será por defecto el 'título'."
     email_site_title: "El título del sitio utilizado como remitente de los emails desde el sitio. Si no está configurado, será por defecto 'título'. Si tu 'título' contiene caracteres que no están permitidos en las cadenas del remitente del email, usa esta opción."
+    find_related_post_with_key: "Only use the reply key to find the replied-to post. (Recomendado si usas Amazon SES)"
     minimum_topics_similar: "Cuántos temas necesita haber en el foro antes de que pueda mostrarse el panel con temas similares al crear nuevos temas."
     relative_date_duration: "Número de días desde el último post antes de los cuales las fechas se mostrarán en formato relativo (7d) en vez de absoluto (20 Feb)."
     delete_user_max_post_age: "No permitir eliminar usuarios cuyo primer post tenga una antigüedad de (x) días."
@@ -1260,6 +1272,7 @@ es:
     highlighted_languages: "Reglas de resaltado de sintaxis incluidas. (Aviso: incluir demasiados lenguajes puede afectar al rendimiento) mira: https://highlightjs.org/static/demo/ para ver una demo"
     feed_polling_enabled: "SOLO PARA EMBEBER: embeber feeds RSS/ATOM como posts."
     feed_polling_url: "SOLO PARA EMBEBER: URL de los feeds RSS/ATOM a embeber."
+    feed_polling_frequency_mins: "EMBEDDING ONLY: Frecuencia de polling"
     embed_by_username: "Nombre de usuario en Discourse del que crea los temas embebidos."
     embed_username_key_from_feed: "Clave para extraer el nombre de usuario en Discourse desde el feed."
     embed_title_scrubber: "Expresión regular para depurar títulos embebibles."
@@ -1269,7 +1282,7 @@ es:
     embed_username_required: "Se requiere el nombre de usuario para la creación de temas."
     embed_whitelist_selector: "Selector CSS para los elementos que están permitidos en los embebidos."
     embed_blacklist_selector: "Selector CSS para los elementos que están eliminados desde los embebidos."
-    notify_about_flags_after: "Si hay reportes de los que nadie se ha encargado aún después de muchas horas, enviar un mensaje privado al staff. Establece en 0 para desactivarlo."
+    notify_about_flags_after: "Si hay reportes que no han sido revisados después de este número de horas, enviar un correo electrónico al staff. Deshabilita esta opción introduciendo el valor 0."
     show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas."
     delete_drafts_older_than_n_days: Eliminar borradores de más de (n) días de antigüedad.
     bootstrap_mode_min_users: "Mínimo número de usuarios requerido para desactivar el modo bootstrap (pon 0 para desactivar esta opción)"
@@ -1362,13 +1375,13 @@ es:
       topic: 'Resultados'
       user: 'Usuarios'
   sso:
-    login_error: "Error de inicio de sesión"
+    login_error: "Error en Ingreso"
     not_found: "No se pudo encontrar tu cuenta. Por favor contacta al administrador del sitio."
     account_not_approved: "Tu cuenta está pendiente de aprobación. Recibirás una notificación por email cuando se apruebe."
     unknown_error: "Hay un problema con tu cuenta. Por favor contacta al administrador del sitio."
     timeout_expired: "Se superó el tiempo para el inicio de sesión, por favor inténtalo de nuevo."
-    no_email: "No se ha proporcionado una dirección de email. Por favor, contacta al administrador del sitio."
-    email_error: "No se ha podido registrar la cuenta con la dirección de email <b>%{email}</b>. Por favor, contacta al administrador del sitio."
+    no_email: "Ninguna dirección de email ha sido provista. Por favor contactar al administrador del sitio."
+    email_error: "Una cuenta no puede ser registrada con el email <b>%{email}</b>. Por favor, contacte a la administración del sitio web."
   original_poster: "Autor original"
   most_posts: "Con más posts"
   most_recent_poster: "Autor más reciente"
@@ -1432,14 +1445,14 @@ es:
       one: "Este tema se abrió automáticamente después de 1 minuto."
       other: "Este tema se abrió automáticamente después de %{count} minutos."
     autoclosed_disabled_lastpost_days:
-      one: "Este tema se abrió automáticamente 1 día después de su última respuesta."
-      other: "Este tema se abrió automáticamente %{count} días después de su última respuesta."
+      one: "Este tema se abrió automáticamente 1 día después de la última respuesta."
+      other: "Este tema se abrió automáticamente %{count} días después de la última respuesta."
     autoclosed_disabled_lastpost_hours:
-      one: "Este tema se abrió automáticamente 1 hora después de su última respuesta."
-      other: "Este tema se abrió automáticamente %{count} horas después de su última respuesta."
+      one: "Este tema se abrió automáticamente 1 hora después de la última respuesta."
+      other: "Este tema se abrió automáticamente %{count} horas después de la última respuesta."
     autoclosed_disabled_lastpost_minutes:
-      one: "Este tema se abrió automáticamente 1 minuto después de su última respuesta."
-      other: "Este tema se abrió automáticamente %{count} minutos después de su última respuesta."
+      one: "Este tema se abrió automáticamente 1 minuto después de la última respuesta."
+      other: "Este tema se abrió automáticamente %{count} minutos después de la última respuesta."
     autoclosed_disabled: "El tema ahora está en abierto, se permiten respuestas."
     autoclosed_disabled_lastpost: "Este tema está ahora abierto. Se permiten nuevas respuestas."
     pinned_enabled: "Este tema ahora está destacado. Aparecerá en primer lugar en la lista de su categoría hasta que se deshaga el destacado de forma general por los moderadores o de forma particular por cada usuario para sí."
@@ -1448,13 +1461,13 @@ es:
     pinned_globally_disabled: "Este tema se ha dejado de destacar. Ya no aparecerá en primer lugar de su categoría."
     visible_enabled: "Este tema ahora es visible. Se mostrará en las listas de temas"
     visible_disabled: "Este tema ahora es invisible. Ya no se mostrará en ninguna lista de temas. La única forma de acceder a este tema es con un enlace directo."
-    auto_deleted_by_timer: "Eliminado automáticamente por temporizador."
+    auto_deleted_by_timer: "Borrado automáticamente por el temporizador."
   login:
     not_approved: "Tu cuenta aún no ha sido aprobada. Se te notificará por email cuando todo esté listo para iniciar sesión."
     incorrect_username_email_or_password: "Nombre de usuario, dirección de correo o contraseña incorrectos"
     wait_approval: "Gracias por registrarte. Te notificaremos cuando tu cuenta haya sido aprobada."
     active: "Tu cuenta está activa y lista para usar."
-    activate_email: "<P>¡Casi has terminado! Hemos enviado un correo de activación a <b>%{email}</b>. Sigue las instrucciones del correo para activar la cuenta.</p> <p>Si no te ha llegado nada, comprueba la carpeta de spam.</p>"
+    activate_email: "<p>¡Ya casi has terminado! Te enviamos un correo de activación a <b>%{email}</b>. Por favor sigue las instrucciones de ese correo para activar tu cuenta.</p><p>Si no llega, mira en la carpeta de spam.</p>"
     not_activated: "Aún no puedes iniciar sesión. Te hemos enviado un email de activación. Por favor, sigue las instrucciones en el email para activar tu cuenta."
     not_allowed_from_ip_address: "No puedes iniciar sesión como %{username} desde esa dirección IP."
     admin_not_allowed_from_ip_address: "No puedes iniciar sesión como admin desde esta dirección IP."
@@ -1501,8 +1514,8 @@ es:
       domain_not_allowed: "El sitio web no es válido. Los dominios permitidos son: %{domains}"
   flags_reminder:
     flags_were_submitted:
-      one: "Reportes que fueron presentados hace más de 1 hora. [Favor revísalo] (/admin/flags)."
-      other: "Reportes que fueron presentados hace más de %{count} horas. [Favor revísalos] (/admin/flags)."
+      one: "Hay un reporte enviados hace 1 hora. [Por favor, revísalo](/admin/flags)."
+      other: "Hay reportes enviados hace %{count} horas. [Por favor, revísalos](/admin/flags)."
     subject_template:
       one: "1 reporte esperando ser atendidos."
       other: "%{count} reportes esperando ser atendidos."
@@ -1510,55 +1523,19 @@ es:
     title: "Darse de baja"
     subject_template: "Confirma que no quieres recibir más emails de %{site_title}"
     text_body_template: |
-      Alguien (¿quizá tú mismo?) ha solicitado darse de baja de los emails de %{site_domain_name} a esta dirección.
-      Si quieres confirmarlo, por favor haz clic en el siguiente enlace:
+      Alguien (posiblemente tú?) solicitó no recibir más actualizaciones por email desde %{site_domain_name} a esta dirección de email.
+      Si deseas confirmar esta acción, por favor haz clic en el siguiente enlace:
 
       %{confirm_unsubscribe_link}
 
 
-      Si quieres continuar recibiendo emails, puedes ignorar este correo.
+      Si quieres continuar recibiendo actualizaciones por email, por favor ignora este correo.
   invite_mailer:
     title: "Invitar Usuario"
     subject_template: "%{invitee_name} te invitó a '%{topic_title}' en %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} te invitó a un debate
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      en
-
-      > %{site_title} -- %{site_description}
-
-      Si estás interesado, haz clic en el siguiente enlace:
-
-      %{invite_link}
-
-      Esta invitación proviene de un usuario de confianza, por lo que puedes comentar en el tema inmediatamente.
   custom_invite_mailer:
     title: "Personalizar Invitar Usuario"
     subject_template: "%{invitee_name} te ha invitado a '%{topic_title}' en %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} te ha invitado a un debate
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      en
-
-      > %{site_title} -- %{site_description}
-
-      Mensaje de %{invitee_name}:
-
-      %{user_custom_message}
-
-      Si estás interesado en participar, haz clic en el enlace debajo:
-
-      %{invite_link}
-
-      Esta invitación viene de un usuario en el que confiamos, por lo que podrás responder inmediatamente.
   invite_forum_mailer:
     title: "Invitación suscripción del foro"
     subject_template: "%{invitee_name} te invitó a unirte a %{site_domain_name}"
@@ -1575,6 +1552,7 @@ es:
 
       Esta invitación viene de un usuario en el que confiamos, por lo que se te creará una cuenta automáticamente.
   custom_invite_forum_mailer:
+    title: "Invitación suscripción del foro"
     subject_template: "%{invitee_name} te ha invitado a %{site_domain_name}"
     text_body_template: |
       %{invitee_name} te ha invitado a
@@ -1596,15 +1574,15 @@ es:
     title: "Instrucciones para la contraseña del invitado"
     subject_template: "Asigna una contraseña para tu cuenta en %{site_name}"
     text_body_template: |
-      Gracias por aceptar la invitación a %{site_name} -- ¡de tamos la bienvenida!
+      Gracias por aceptar tu invitación a %{site_name} -- ¡te damos la bienvenida!
 
-      Haz clic en el enlace para escoger una contraseña:
+      Haz clic en el siguiente enlace para elegir una contraseña:
       %{base_url}/u/password-reset/%{email_token}
 
-      (si el enlace de arriba ha expirado, escoge "Olvidé mi contraseña" al iniciar sesión con tu dirección de email.)
+      (Si el enlace anterior ha caducado, utiliza "Olvidé mi contraseña" cuando vayas a iniciar sesión con tu dirección de email.)
   download_backup_mailer:
     title: "Descargar Mailer Backup"
-    subject_template: "[%{email_prefix}] Descarga de copia de seguridad"
+    subject_template: "[%{email_prefix}] Descarga Backup del sitio"
     text_body_template: |
       Aquí está el enlace de [descarga del backup del sitio](%{backup_file_path}) que solicitaste.
 
@@ -1614,15 +1592,15 @@ es:
     no_token: |
       Disculpa, este enlace de descarga del backup ya ha sido usado o ha expirado.
   admin_confirmation_mailer:
-    title: "Confirmación de administrador"
-    subject_template: "[%{email_prefix}] Confirma una nueva cuenta de administrador"
+    title: "Confirmación de Admin"
+    subject_template: "[%{email_prefix}] Confirma nueva cuenta Admin"
     text_body_template: |
-      Por favor, confirma que quieres añadir a **%{target_username}** como administrador en tu foro.
+      Por favor, confirmar que quieres agregar **%{target_username}** como administrador de tu foro.
 
-      [Confirmar cuenta de administrador](%{admin_confirm_url})
+      [Confirmar cuenta de Administrator](%{admin_confirm_url})
   test_mailer:
     title: "Mail de prueba"
-    subject_template: "[%{email_prefix}] Prueba de entrega de correo electrónico"
+    subject_template: "[%{email_prefix}] Prueba de envío de email"
     text_body_template: |
       Este es un correo electrónico de prueba de
 
@@ -1700,8 +1678,8 @@ es:
   queued_posts_reminder:
     title: "Recordatorio de post en revisión"
     subject_template:
-      one: "[%{email_prefix}] 1 tema esperando ser revisados"
-      other: "[%{email_prefix}] %{count} temas esperando ser revisados"
+      one: "[%{email_prefix}] 1 post esperando ser revisado"
+      other: "%{email_prefix}[] %{count} posts esperando ser revisados"
     text_body_template: |
       Hola,
 
@@ -1718,11 +1696,11 @@ es:
     deferred: "Gracias por hacérnoslo saber. Estamos revisándolo."
     deferred_and_deleted: "Gracias por hacérnoslo saber. Hemos eliminado el post."
   temporarily_closed_due_to_flags:
-    one: "Este tema ha sido cerrado automáticamente durante 1 hora debido a un gran número de reportes de la comunidad."
-    other: "Este tema ha sido cerrado automáticamente durante %{count} horas debido a un gran número de reportes de la comunidad."
+    one: "Este tema está temporalmente cerrado por 1 hora debido a un gran número de reportes de la comunidad."
+    other: "Este tema está temporalmente cerrado por %{count} horas debido a un gran número de reportes de la comunidad."
   system_messages:
     private_topic_title: "Tema #%{id}"
-    contents_hidden: "Por favor, visita el mensaje para ver su contenido."
+    contents_hidden: "Por favor, visita el post para ver su contenido."
     post_hidden:
       title: "Post oculto"
       subject_template: "Mensaje ocultado debido a varios reportes de la comnuidad"
@@ -1742,23 +1720,39 @@ es:
         Para más información sobre lo que consideramos adecuado, lee las [directrices de la comunidad](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
-        Para unos trucos sobre cómo empezar como usuario, echa un vistazo a esta [entrada de blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
+        Si quieres unos consejos para empezar, [echa un vistazo a esta entrada de blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/).
 
-        Conforme vayas participando, te iremos conociendo, y tus limitaciones como nuevo usuario serán levantadas. Con el tiempo, ganarás [niveles de confianza](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) que incluyen habilidades especiales para ayudarnos a gestionar y mantener la comunidad unida.
+        Conforme vayas participando por aquí, te iremos conociendo más, y tus limitaciones temporales como nuevo usuario serán levantadas. Con el tiempo ganarás [niveles de confianza](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) que incluyen habilidades especiales para ayudarnos a gestionar la comunidad juntos.
     welcome_user:
       title: "Bienvenido Usuario"
       subject_template: "¡Bienvenido a %{site_name}!"
       text_body_template: |
-        Gracias por unirte a %{site_name}, ¡te damos la bienvenida!
+        ¡Gracias por unirte a %{site_name}! ¡Te damos la bienvenida!
 
         %{new_user_tips}
 
-        Creemos en una [comunidad civilizada](%{base_url}/guidelines) en todo momento.
+        Creemos en una comunidad con un [comportamiento civilizado](%{base_url}/guidelines).
 
         ¡Disfruta de tu estancia!
     welcome_invite:
       title: "Bienvenido Invitado"
       subject_template: "¡Bienvenido a %{site_name}!"
+      text_body_template: |
+        Gracias por aceptar tu invitación a %{site_name} -- ¡Te damos la bienvenida!
+
+        Hemos creado automáticamente una nueva cuenta para ti: **%{username}**. Puedes cambiar tu nombre de usuario en cualquier momento visitando [tu perfil][prefs].
+
+        Para iniciar sesión en adelante:
+
+        - Usa siempre la **misma dirección de correo** en la que recibiste tu invitación original. ¡De otra manera no seremos capaces de reconocer que eres tú!
+
+        %{new_user_tips}
+
+        Creemos en una comunidad con un [comportamiento civilizado](%{base_url}/guidelines).
+
+        ¡Disfruta de tu estancia!
+
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
       title: "Copia de seguridad completada con éxito"
       subject_template: "La copia de seguridad se completo exitosamente"
@@ -1813,6 +1807,14 @@ es:
     bulk_invite_failed:
       title: "Error en la invitación en masa"
       subject_template: "Invitación masiva procesada con algunos errores"
+      text_body_template: |
+        Tu archivo de invitación masiva ha sido procesada, se han enviado %{sent} invitaciones y se han producido %{failed} error(es).
+
+        Este es el registro:
+
+        ```text
+        %{logs}
+        ```
     csv_export_succeeded:
       title: "Exportación de datos en CSV completada con éxito"
       subject_template: "Exportación de datos completada"
@@ -1830,56 +1832,56 @@ es:
       text_body_template: "Lo sentimos, pero la exportación de datos falló. Por favor, verifica los registros o contacta a un miembro del staff."
     email_reject_insufficient_trust_level:
       title: "Email rechazado, insuficiente nivel de confianza"
-      subject_template: "[%{email_prefix}] Problema de correo --Nivel de confianza insuficiente"
+      subject_template: "[%{email_prefix}] Problema de email -- Insuficiente nivel de confianza"
       text_body_template: |
         Lo sentimos, pero tu mensaje de email a %{destination} (con título %{former_title}) no ha funcionado.
 
         Tu cuenta no tiene el nivel de confianza necesario para publicar nuevos temas a esta dirección de email. Si crees que se trata de un error, contacta a un miembro del staff.
     email_reject_user_not_found:
       title: "Email rechazado, cuenta de usuario no encontrada"
-      subject_template: "[%{email_prefix}] Problema de correo -- Usuario no encontrado"
+      subject_template: "[%{email_prefix}] Problema de email -- Usuario no encontrado"
       text_body_template: |
         Lo sentimos, pero tu mensaje de email para %{destination} (titulado %{former_title}) no se ha enviado.
 
         No hay una cuenta asociada con esta dirección de email. Intenta enviarlo con otra dirección de email o contacta con algún miembro del Staff.
     email_reject_screened_email:
       title: "Email rechazado, correo bloqueado"
-      subject_template: "[%{email_prefix}] Poblema de correo -- Email bloqueado"
+      subject_template: "[%{email_prefix}] Problema con el email -- Correo bloqueado"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) se ha rechazado.
 
         No hay una cuenta asociada con esta dirección de email. Intenta enviarlo con otra dirección de email o contacta con algún miembro del Staff.
     email_reject_inactive_user:
       title: "Email rechazado, usuario inactivo"
-      subject_template: "[%{email_prefix}] Problema de correo -- Usuario inactivo"
+      subject_template: "[%{email_prefix}] Problema con el email -- Usuario inactivo"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no se entregó.
 
         La cuenta asociada a esta dirección de email no ha sido activada. Por favor activa tu cuenta antes de enviar emails.
     email_reject_blocked_user:
       title: "Email rechazado, usuario bloqueado"
-      subject_template: "[%{email_prefix}] Problema de correo -- Usuario bloqueado"
+      subject_template: "[%{email_prefix}] Problema con el email -- Usuario bloqueado"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no se entregó.
 
         La cuenta asociada a esta dirección de email ha sido bloqueada.
     email_reject_reply_user_not_matching:
       title: "Email rechazado, el usuario no coincide"
-      subject_template: "[%{email_prefix}] Problema de correo -- Dirección de respuesta inesperada"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Email de respuesta no esperado"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no se ha enviado.
 
         No hay una cuenta asociada con esta dirección de email. Intenta enviarlo con otra dirección de email o contacta con algún miembro del Staff.
     email_reject_no_account:
       title: "Email rechazado, no hay cuenta"
-      subject_template: "[%{email_prefix}] Problema de correo -- Cuenta desconocida"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Cuenta Desconocida"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) se ha rechazado.
 
         No hay una cuenta de usuario asociada con esta dirección de email. Intenta enviarlo con otra dirección de email o contacta con algún miembro del Staff.
     email_reject_empty:
       title: "Email rechazado, email vacío"
-      subject_template: "[%{email_prefix}] Problema de correo -- Sin contenido"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Sin Contenido"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titled %{former_title}) no funcionó.
 
@@ -1888,21 +1890,21 @@ es:
         Si estás teniendo este problema y _sí_ incluiste contenido, inténtalo de nuevo con un formato más simple.
     email_reject_parsing:
       title: "Email rechazado, contenido erróneo"
-      subject_template: "[%{email_prefix}] Problema de correo -- Contenido no reconocido"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Contenido no reconocido"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no funcionó.
 
         No hemos encontrado tu respuesta en el email. **Asegúrate de escribir tu entera respuesta al principio del email** - no podemos analizar respuestas entre líneas.
     email_reject_invalid_access:
       title: "Email rechazado, acceso inválido"
-      subject_template: "[%{email_prefix}] Problema de correo -- Acceso inválido"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Acceso no válido"
       text_body_template: |
         Lo sentimos, pero tu mensaje por email a %{destination} (titled %{former_title}) no funcionó.
 
         Tu cuenta no tiene los privilegios para publicar nuevos temas en esa categoría. Si crees que esto es un error, contacta a un moderador o administrador.
     email_reject_strangers_not_allowed:
       title: "Rechazar emails desconocidos No permitido"
-      subject_template: "[%{email_prefix}] Problema de correo -- Acceso inválido"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Acceso no válido"
       text_body_template: |+
         Lo sentimos, pero tu mensaje de email para %{destination} (titulado %{former_title}) no fue aceptado.
 
@@ -1911,14 +1913,14 @@ es:
 
     email_reject_invalid_post:
       title: "Email rechazado, post inválido"
-      subject_template: "[%{email_prefix}] Problema de correo -- Error al publicar"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Posting error"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) se ha rechazado.
 
         Posibles causas: formato complejo, mensaje demasiado extenso o demasiado breve. Por favor, inténtalo de nuevo, o bien publícalo en el foro.
     email_reject_invalid_post_specified:
       title: "Email Rechazado, Post Especificado Inválido"
-      subject_template: "[%{email_prefix}] Problema de correo -- Error al publicar"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Error de publicación"
       text_body_template: |
         Lo sentimos, pero tu mensaje de email para %{destination} (titled %{former_title}) no funcionó.
 
@@ -1929,49 +1931,49 @@ es:
         Si puedes corregir el problema sugerido, por favor inténtalo de nuevo.
     email_reject_invalid_post_action:
       title: "Email Rechazado, Acción de Post Inválida"
-      subject_template: "[%{email_prefix}] Problema de correo -- Acción inválida"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Acción de Post Inválida"
       text_body_template: |
         Lo sentimos, pero tu mensaje de email para %{destination} (titled %{former_title}) no funcionó.
 
         La "Post Action" no fue reconocida. Por favor prueba luego o envía el mensaje desde el sitio web de forma tradicional si el error continua.
     email_reject_reply_key:
       title: "El email rechazó la clave de respuesta"
-      subject_template: "[%{email_prefix}] Problema de correo -- Clave de respuesta desconocida"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Clave de Respuesta Desconocida"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) se ha rechazado.
 
         La clave de respuesta proporcionada no es válida o es desconocida, por lo que no sabemos a qué responde este email. Contacta con algún miembro del staff.
     email_reject_bad_destination_address:
       title: "Email rechazado, mala dirección del destinatario"
-      subject_template: "[%{email_prefix}] Problema de correo -- Destinatario desconocido"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Dirección desconocida"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no funcionó.
 
         Ninguna de las direcciones de emails ha sido reconocida. Por favor asegúrate de que estás enviando los correos a las direcciones correctas provistas por los administradores.
     email_reject_topic_not_found:
       title: "Email rechazado, tema no encontrado"
-      subject_template: "[%{email_prefix}] Problema de correo -- Tema no encontrado"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Tema no encontrado"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no funcionó.
 
         El tema al que estás respondiendo ya no existe, quizá debe haber sido eliminado? Si crees que esto es un error, contacta a un administrador.
     email_reject_topic_closed:
       title: "Email rechazado, tema cerrado"
-      subject_template: "[%{email_prefix}] Problema de correo -- Tema cerrado"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Tema cerrado"
       text_body_template: |
         Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no funcionó.
 
         El tema actualmente está cerrado y no acepta más respuestas. Si crees que esto es un error, contacta a un administrador.
     email_reject_auto_generated:
       title: "Email autogenerado rechazado"
-      subject_template: "[%{email_prefix}] Problema de correo -- Respuesta generada automáticamente"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Respuesta Auto Generada"
       text_body_template: |
         Lo sentimos, pero tu mensaje de correo electrónico para %{destination} (titulado %{former_title}) no funcionó.
 
         Tu respuesta de correo fue marcada como "generada automáticamente", lo que significa que fue creado automáticamente por una computadora, en vez de un ser humano; no aceptamos este tipo de emails. Si crees que se trata de un error contacta con un administrador.
     email_error_notification:
       title: "Email, error de notificación"
-      subject_template: "[%{email_prefix}] Problema de correo -- Error de autenticación de POP"
+      subject_template: "[%{email_prefix}] Problema con el correo -- Error de autenticación POP"
       text_body_template: |+
         Hubo un error de autenticación mientras se ejecutaba el polling de los emails desde el servidor POP.
 
@@ -2065,14 +2067,14 @@ es:
 
         [Por favor revisar y corregir](%{base_url}/admin).
     new_user_of_the_month:
-      title: "¡Eres un usuario nuevo del mes!"
-      subject_template: "¡Eres un usuario nuevo del mes!"
+      title: "¡Eres el Nuevo Usuario del Mes!"
+      subject_template: "¡Eres el Nuevo Usuario del Mes!"
       text_body_template: |
-        Enhorabuena, has ganado el **premio al nuevo usuario del mes de %{month_year}** . :trophy:
+        ¡Felicitaciones!, has ganado el **premio para el Nuevo Usuario del Mes de %{month_year}**. :trophy:
 
-        Este distintivo solo se le concede a dos usuarios nuevos al mes, y será visible para siempre en [tu perfil](/my/badges).
+        Este premio es solo otorgado para usuarios nuevos del mes, y será visible siempre en tu [página de usuario](%{base_url}/my/badges).
 
-        Has conseguido ser un miembro valioso de nuestra comunidad. Gracias por unirte, ¡y sigue así!
+        Usted se ha convertido rápidamente en un valioso miembro de nuestra comunidad. ¡Gracias por unirse, y mantener el gran trabajo!
   unsubscribe_link: |
     Para darte de baja de estos emails, [haz clic aquí](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2086,8 +2088,8 @@ es:
   user_notifications:
     previous_discussion: "Respuestas anteriores"
     reached_limit:
-      one: "Un apunte: enviamos como mucho 1 email diario. Comprueba la página para ver si hay alguna cosa de la  que no te hayas enterado."
-      other: "Un apunte: enviamos como mucho %{count} emails diarios. Comprueba la página para ver si hay alguna cosa de la que no te hayas enterado."
+      one: "ADVERTENCIA: has superado el límite de 1 email diario. Revisa el sitio para ver las otras notificaciones que no te han llegado."
+      other: "ADVERTENCIA: has superado el límite de %{count} emails diarios. Las próximas notificaciones de emails serán suprimidas. PD: gracias por ser tan popular!"
     in_reply_to: "En respuesta a"
     unsubscribe:
       title: "Darse de baja"
@@ -2098,29 +2100,9 @@ es:
     visit_link_to_respond: "[Visita el tema](%{base_url}%{url}) para responder."
     visit_link_to_respond_pm: "[Visita el mensaje](%{base_url}%{url}) para responder."
     posted_by: "Publicado por %{username} el %{post_date}"
-    invited_to_private_message_body: |
-      %{username} te invitó a un mensaje directo
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      en
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} te invitó a un tema de debate
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      en
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Usuario invitado a MP"
-      subject_template: "[%{email_prefix}] %{username} te ha invitado a un mensaje '%{topic_title}'"
+      subject_template: "[%{email_prefix}] %{username} te ha invitado a un hilo de mensajes en '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -2138,7 +2120,7 @@ es:
         %{respond_instructions}
     user_invited_to_topic:
       title: "Usuario invitado a tema"
-      subject_template: "[%{email_prefix}] %{username} te ha invitado a un tema '%{topic_title}'"
+      subject_template: "[%{email_prefix}] %{username} te invitó a '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -2265,71 +2247,67 @@ es:
       popular_posts: "Temas populares"
       more_new: "Nuevo para ti"
       subject_template: "[%{email_prefix}] Resumen"
-      unsubscribe: "Este resumen se envía desde %{site_link} cuando pasa un tiempo desde tu última visita. Para cancelar tu suscripción %{unsubscribe_link}."
+      unsubscribe: "Este resumen se envía desde %{site_link} cuando no te hemos visto en un tiempo. Cambia <a href='%{email_settings_url}'>tu configuración de email</a>,  o %{unsubscribe_link} para cancelar tu suscripción."
       click_here: "clic aquí"
       from: "resumen de %{site_name}"
       preheader: "Un corto resumen desde tu última visita el %{last_seen_at}"
     forgot_password:
       title: "Olvidé la Contraseña"
-      subject_template: "[%{email_prefix}] Reestablecimiento de contraseña"
+      subject_template: "[%{email_prefix}] restablecer contraseña"
       text_body_template: |
-        Alguien ha pedido reestablecer tu contraseña en [%{site_name}](%{base_url}).
+        Alguien ha pedido restablecer tu contraseña en [%{site_name}](%{base_url}).
 
-        Si no has sido tú, puedes ignorar este email sin problema.
+        Si no fuiste tú, puedes ignorar este email de forma segura.
 
-        Haz clic en el siguiente enlace para escoger una nueva contraseña:
+        Haz clic en el siguiente enlace para cambiar tu contraseña:
         %{base_url}/u/password-reset/%{email_token}
     set_password:
       title: "Pon una contraseña"
-      subject_template: "[%{email_prefix}] Establecer contraseña"
+      subject_template: "[%{email_prefix}] Establecer Contraseña"
       text_body_template: |
-        Alguien ha pedido añadir una contraseña a tu cuenta en [%{site_name}](%{base_url}).
-        Alternativamente, puedes iniciar sesión con cualquier servicio disponible (Google, Facebook, etc.) que esté asociado con tu dirección de email.
+        Alguien ha solicitado añadir una contraseña a tu cuenta en [%{site_name}](%{base_url}). Alternativamente, puedes iniciar sesión usando cualquier servicio online soportado (como Google, Facebook, etc) que esté asociado con esta dirección de email validada.
 
-        Si no has hecho esta solicitud, puedes ignorar este email sin problema.
+        Si no formulaste esta petición, por favor, ignora este correo.
 
-        Haz clic en el siguiente enlace para establecer una contraseña:
+        Haz clic en el siguiente enlace para escoger una contraseña:
         %{base_url}/u/password-reset/%{email_token}
     admin_login:
       title: "Admin Login"
       subject_template: "[%{email_prefix}] Inicio de sesión"
       text_body_template: |
-        Alguien ha pedido iniciar sesión con tu cuenta en [%{site_name}](%{base_url}).
+        Alguien pidió iniciar sesión con tu cuenta en [%{site_name}](%{base_url}).
 
-        Si no lo has solicitado tú, puedes ignorar este email sin problema.
+        Si tú no realizaste esta petición, puedes ignorar este email.
 
         Haz clic en el siguiente enlace para iniciar sesión:
         %{base_url}/u/admin-login/%{email_token}
     account_created:
       title: "Cuenta creada"
       subject_template: "[%{email_prefix}] Tu nueva cuenta"
-      text_body_template: |+
-        Se ha creado una nueva cuenta para ti en %{site_name}
+      text_body_template: |
+        Una nueva cuenta ha sido creada por ti en %{site_name}
 
-        Haz clic en el siguiente enlace para escoger una contraseña para tu nueva cuenta:
+        Pulsa en el siguiente enlace para escoger una contraseña para tu nueva cuenta:
         %{base_url}/u/password-reset/%{email_token}
-
     confirm_new_email:
       title: "Confirmar Nuevo Email"
-      subject_template: "[%{email_prefix}] Confirma tu dirección de email"
+      subject_template: "[%{email_prefix}] Confirma tu nueva dirección de email"
       text_body_template: |
-        Confirma tu dirección de email para %{site_name} haciendo clic en el siguiente enlace:
+        Confirma tu nueva dirección de email para %{site_name} haciendo clic en el siguiente enlace:
 
         %{base_url}/u/authorize-email/%{email_token}
     confirm_old_email:
       title: "Confirmar Viejo Email"
-      subject_template: "[%{email_prefix}] Confirma tu dirección de email actual"
+      subject_template: "[%{email_prefix}] Confirma tu dirección actual de email"
       text_body_template: |
-        Antes de cambiar tu dirección de email, necesitamos confirmar que controlas
-        la dirección de email actual. Cuando termines este paso, confirmaremos
-        la nueva dirección de email.
+        Antes de cambiar tu dirección de correo electrónico, necesitamos que confirmes que tienes acceso a dicho email. Después de completar este paso, podrás confirmar la nueva dirección de correo electrónico.
 
-        Confirma tu dirección de email actual en %{site_name} haciendo clic en el siguiente enlace:
+        Confirma tu actual correo electrónico para %{site_name} haciendo clic en el siguiente enlace:
 
         %{base_url}/u/authorize-email/%{email_token}
     notify_old_email:
       title: "Antiguo email de notificaciones"
-      subject_template: "[%{email_prefix}] Tu dirección de correo ha sido cambiada"
+      subject_template: "[%{email_prefix}] Tu dirección de email ha sido cambiada"
       text_body_template: |
         Este es un mensaje automático que se ha generado para comunicarte que tu email para el sitio %{site_name} ha sido modificado. Si ha habido un error, por favor contacta al administrador.
 
@@ -2339,16 +2317,31 @@ es:
     signup_after_approval:
       title: "Entra después de ser aprobado"
       subject_template: "¡Tu solicitud ha sido aprobada en %{site_name}!"
-    signup:
-      title: "Registrate"
-      subject_template: "[%{email_prefix}] Confirma tu nueva cuenta"
       text_body_template: |
         ¡Te damos la bienvenida a %{site_name}!
 
+        Un miembro del staff aprobó tu cuenta en %{site_name}.
+
         Haz clic en el siguiente enlace para confirmar y activar tu nueva cuenta:
         %{base_url}/u/activate-account/%{email_token}
 
-        Si el enlace de arriba no funciona, prueba a copiarlo y pegarlo a la barra de direcciones de tu navegador de internet.
+        Si no puedes hacer clic en el enlace, intenta copiándolo y pegándolo en la barra de direcciones de tu navegador.
+
+        %{new_user_tips}
+
+        Creemos en una comunidad con un [comportamiento civilizado](%{base_url}/guidelines).
+
+        ¡Disfruta de tu estancia!
+    signup:
+      title: "Registrate"
+      subject_template: "[%{email_prefix}] Confirma tu nueva cuenta"
+      text_body_template: |
+        ¡Bienvenido a %{site_name}!
+
+        Haz clic en el siguiente enlace para confirmar y activar tu nueva cuenta
+        %{base_url}/u/activate-account/%{email_token}
+
+        Si el enlace anterior no es clicable, prueba copiando y pegándolo en la barra de direcciones de tu navegador.
   page_not_found:
     title: "¡Ups! Esa página no existe o es privada."
     popular_topics: "Populares"
@@ -2371,7 +2364,7 @@ es:
     pasted_image_filename: "Imagen pegada"
     store_failure: "Falló el almacenamiento de la subida #%{upload_id} para el usuario #%{user_id}."
     file_missing: "Lo sentimos, debes incluir un archivo a subir."
-    empty: "Lo sentimos, pero el archivo que has proporcionado está vacío."
+    empty: "Disculpa, pero el archivo que proporcionaste está vacío."
     attachments:
       too_large: "Lo sentimos, el archivo que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB)."
     images:
@@ -2404,6 +2397,8 @@ es:
     no_echo_mailing_list_mode: "Modo lista de correo desactivado para los post del usuario"
   color_schemes:
     base_theme_name: "Base"
+    default: "Esquema Claro"
+    dark: "Esquema Oscuro"
     default_theme_name: "Por defecto"
     dark_theme_name: "Oscuro"
     light_theme_name: "Claro"
@@ -2418,6 +2413,105 @@ es:
     Edita el primer post de este tema para cambiar el contenido de la página %{page_name}.
   guidelines_topic:
     title: "Preguntas Frecuentes / Directrices"
+    body: |
+      <a name="civilized"></a>
+
+      ## [Este es un lugar público para conversaciones civilizadas](#civilized)
+
+      Por favor, trata este foro de debate con el mismo respeto con el que tratarías un parque. Este es un lugar donde compartir habilidades, conocimiento e intereses a través de debates y conversaciones.
+
+      Estas no son unas normas estrictas y cerradas, sino una ayuda para el correcto desarrollo de la comunidad. Usa estas pautas para mantener este sitio como un lugar limpio y adecuado para poder debatir y conversar correctamente.
+
+      <a name="improve"></a>
+
+      ## [Aporta](#improve)
+
+      Ayúdanos a mantener este foro como un buen lugar esforzándote para mejorar el debate de alguna manera, aunque sea mínima. Si no estás seguro de lo que tu mensaje aporta a la conversación, piensa sobre lo que quieres decir e intenta contestar después.
+
+      El contenido de este foro nos importa, y queremos que actúes como si te importara a ti también. Sé respetuoso con los temas debatidos y con la gente que los debate, aunque no estés de acuerdo con algo de lo que digan.
+
+      Una buena manera de de mejorar el foro es investigando un poco lo que está pasando o ya ha pasado. Por favor, echa un vistazo a los temas ya existentes antes de responder a uno o crearlo y así podrás ver quién opina lo mismo o tiene intereses parecidos a los tuyos.
+
+      <a name="agreeable"></a>
+
+      ## [Sé aceptable incluso cuando no estés de acuerdo](#agreeable)
+
+      Cuando vayas a responder a algo con lo que no estás de acuerdo acuérdate de __criticar las ideas y no las personas__. Por favor, evita:
+
+
+      * Ridiculizar a los demás.
+      * Faltar al respeto e insultar.
+      * Responder al tono del mensaje en vez de a su contenido.
+      * Hacer comparaciones y contradicciones exageradas y/o fuera de lugar.
+
+      En lugar de eso, da argumentos que aporten algo al tema, por favor.
+
+      <a name="participate"></a>
+
+      ## [Tu participación cuenta](#participate)
+
+      Eres parte de la comunidad, y queremos que todo el mundo participe en ella. Crea o responde a los temas aportando algo y harás de este foro un lugar más interesante y agradable.
+
+      Este foro ofrece herramientas que permiten a la comunidad identificar entre todas las mejores (y peores) contribuciones: "Me gusta", marcadores, reportes, distintivos, respuestas, ediciones, y demás. Usa todo esto para mejorar tu experiencia y la de los demás.
+
+      Intentemos dejar esto mejor de lo que nos lo encontramos.
+
+      <a name="flag-problems"></a>
+
+      ## [Si ves un problema, repórtalo](#flag-problems)
+
+      Los moderadores tienen una autoridad especial: son los responsables de este foro. Pero tú lo eres también. Con tu ayuda, los moderadores pueden ser personas que faciliten el desarrollo de la comunidad en lugar de la policía del foro o el servicio de limpieza.
+
+      Cuando veas un comportamiento inadecuado, no respondas. Eso hace que, al reconocer públicamente el contenido inadecuado, se siga publicando contenido de esa clase. Además, lo único que harás será perder energía y el tiempo de todos. En su lugar, repórtalo. Si un post es reportado lo suficiente, se tomarán medidas automáticamente o mediante la intervención de un moderador.
+
+      Para el correcto funcionamiento de esta comunidad, los moderadores se reservan el derecho de eliminar cualquier contenido y cualquier cuenta, por cualquier razón en cualquier momento. Los moderadores no ven los temas antes de que sean publicados por lo que ellos y los operadores del foro no son responsables del contenido publicado por la comunidad.
+
+      <a name="be-civil"></a>
+
+      ## [Sé educado](#be-civil)
+
+      Nada estropea más una conversación que la mala educación.
+
+      * Sé educado. No publoques nada que una persona razonable consideraría ofensivo o abusivo.
+      * Mantén limpio el foro. No publiques nada obsceno o sexualmente explícito.
+      * Respeta. No molestes ni acoses a los demás usuarios, tampoco publiques su información privada y/o personal.
+      * Respeta el foro. No publiques spam ni nos estropees el foro.
+
+      Como puedes ver, estos no son términos exactos con definiciones exactas. Evita siquiera la aparición de cualquiera de estas cosas en el foro. Si no estás seguro, piensa en cómo te sentirías si tu post apareciera en la portada de algún periódico importante.
+
+      Este es un foro público y por tanto el contenido puede aparecer en los motores de búsqueda. El foro es para todos los públicos, así que debes tener cuidado con el vocabulario y el contenido.
+
+      <a name="keep-tidy"></a>
+
+      ## [Mantén limpio y organizado el foro](#keep-tidy)
+
+      Esfuérzate para poner las cosas en su lugar correspondiente para que podamos estar más tiempo participando en la comunidad y menos tiempo limpiando y organizando.
+
+      * No empieces un nuevo tema en la categoría equivocada.
+      * No publiques lo mismo en varios temas diferentes.
+      * No respondas con un mensaje sin contenido.
+      * No desvíes un tema en mitad de la discusión.
+      * No firmes tus mensajes &mdash; tu información y perfil están claramente visibles junto al post.
+
+      En vez de responder “+1” or “Estoy de acuerdo”, usa el botón de Me gusta. En lugar de cambiar radicalmente la dirección de un tema, responde como nuevo tema.
+
+      <a name="stealing"></a>
+
+      ## [Publica sólo lo que es tuyo](#stealing)
+
+      No publiques nada que pertenezca a otra persona sin permiso. No debes facilitar enlaces, descipciones o métodos de robar la propiedad intelectual de los demás. (software, vídeo, audio, imágenes, etc.), o formas de violar las leyes.
+
+      <a name="power"></a>
+
+      ## [Funcionamos gracias a gente como tú](#power)
+
+      Este foro es operado por nuestro [equipo](/about) y *vosotros*, la comunidad. Si tienes alguna pregunta sobre cómo deberían funcionar las cosas aquí, abre un nuevo tema en la [categoría de Sugerencias](/c/site-feedback). Si pasa algo urgente que no puede ser resuelto con un tema o un reporte, contáctanos a través de [esta página](/about).
+
+      <a name="tos"></a>
+
+      ## [Términos del Servicio](#tos)
+
+      Sí, estos temas aburren, pero debemos protegernos &ndash; y, por extensión, a ti y a tus datos &ndash; frente a gente poco amigable. Tenemos unos [Términos del Servicio](/tos) que describen nuestra forma de actuar (y la tuya), y los derechos con relación al contenido, la privacidad y las leyes, Para usar nuestros servicios, debes aceptar nuestros [Términos y Condiciones](/tos).
   tos_topic:
     title: "Términos de Servicio"
     body: |
@@ -2857,10 +2951,10 @@ es:
       long_description: |
         Este distintivo se concede la primera vez que respondes a un post por email :e-mail:.
     new_user_of_the_month:
-      name: "Usuario nuevo del mes"
+      name: "Nuevo usuario del mes"
       description: Contribuciones excepcionales en su primer mes
       long_description: |
-        Este distintivo se entrega para felicitar a dos nuevos usuarios cada mes por sus excelentes contribuciones, medido por la frecuencia en la que sus posts reciben "Me gusta" y de parte de quién.
+        Este distintivo es otorgado para felicitar a dos nuevos usuarios cada mes por sus excelentes colaboraciones, y estadísticas sobre cuán seguido sus posts han sido valorados y por quiénes.
     badge_title_metadata: "%{display_name} distintivo en %{site_title}"
   admin_login:
     success: "Email enviado"
@@ -2891,6 +2985,7 @@ es:
   safe_mode:
     title: "Activar modo seguro"
     description: "El modo seguro permite probar tu página sin cargar plugins o customizaciones."
+    no_customizations: "Desactivar theme actual"
     only_official: "Desactivar plugins no oficiale"
     no_plugins: "Desactivar todos los plugins"
     enter: "Activar modo seguro"
@@ -2904,7 +2999,7 @@ es:
             description: "¿Cuál es el idioma por defecto para tu comunidad?"
       forum_title:
         title: "Nombre"
-        description: "El nombre es un cartel que se vé desde lejos, la <i>primera</i> cosa que los visitantes en potencia verán sobre tu comunidad. ¿Qué dice el nombre de yu comunidad?"
+        description: "El nombre es un cartel que se ve desde lejos, lo <i>primero</i> que los visitantes en potencia verán sobre tu comunidad. ¿Qué dice el nombre de tu comunidad?"
         fields:
           title:
             label: "El nombre de la comunidad"
@@ -2917,7 +3012,7 @@ es:
         fields:
           welcome:
             label: "Tema de bienvenida"
-            description: "<p>¿Cómo le describirías tu comunidad a un desconocido en alrededor de 1 minuto?</p> <ul> <li>¿A quién están enfocado el contenido?</li> <li> ¿Qué puedo encontrar aquí?</li> <li>¿Por qué debería visitar esta página</li> <p> Tu tema de bienvenida es la primera cosa que los nuevos visitantes verán. Piensa que es el <b>párrafo</b> que define tu comunidad.</p>"
+            description: "<p>¿Cómo le describirías tu comunidad a un desconocido en alrededor de 1 minuto?</p> <ul> <li>¿A quién están enfocado el contenido?</li> <li> ¿Qué puedo encontrar aquí?</li> <li>¿Por qué debería visitar esta página?</li> <p> Tu tema de bienvenida es lo primero que los nuevos visitantes verán en el sitio. Piensa que es el <b>párrafo</b> que define tu comunidad.</p>"
             one_paragraph: "El mensaje de bienvenida no debería ser más de un párrafo."
       privacy:
         title: "Acceso"
@@ -3003,7 +3098,7 @@ es:
         title: "Invitar staff"
         description: "¡Ya casi está! Invita algunos miembros del staff para ayudar a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>iniciar conversaciones</a> con temas interesantes y respuestas para dar tu comunidad por empezadas."
       finished:
-        title: "¡Tu foro de Discourse está listo!"
+        title: "Tu foro de Discourse está listo!"
         description: |
           <p>Si alguna vez quieres cambiar alguno de estos ajustes, visita <a href='/admin' target='_blank'>tu sección de administrador</a>; la puedes encontrar el lado del icono de una llave inglesa en el menú de la página..</p>
           <p>Diviértete, y ¡buena suerte <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>construyendo tu nueva comunidad!</a></p>
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index cc8baf659dc..801417b68ba 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -289,7 +289,6 @@ et:
   staff_category_name: "Meeskond"
   staff_category_description: "Privaatfoorum meeskonnasisesteks aruteludeks. Teemad on nähtavad vaid adminnidele ja moderaatoritele."
   assets_topic_title: "Saidi kujunduse vahendid"
-  assets_topic_body: "See on püsiteema, nähtav vaid meeskonnale, selle saidi kujunduses kasutatavate piltide ja failide talletamiseks. Ära seda kustuta!\n\n\nTee nii:\n\n\n1. Vasta siia teemasse.\n2. Lae üles kõik pildid, mida soovida kasutada logodena, ikoonidena, vms. (Kasuta üleslaadimise ikooni postituse redaktori tööriistaribal, võid pildid siia ka lohistada või kleepida.)\n3. Postita oma vastus.\n4. Tee üleslaetud pildifailini leiad kas oma uues postituses oleval pildil paremklikates, või postituse muutmise ikooni klikkides ja kopeerides postitusest redaktoris. Kopeeri teed pildifailideni.\n5. Kleebi need teed sättesse [basic settings](/admin/site_settings/category/required).\n\n\nKui soovid lubada einevate failitüüpide üleslaadimist, muuda `authorized_extensions` sättes [file settings](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Teretulemast Discourse'i"
     body: |2
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 16bc80baf64..5ba4500c5a9 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -220,6 +220,9 @@ fa_IR:
       trust_level_2: "سطح اعتماد 2"
       trust_level_3: "سطح اعتماد 3"
       trust_level_4: "سطح اعتماد 4"
+    request_membership_pm:
+      title: "درخواست عضویت در @%{group_name}"
+      body: "میخواهم برای عضویت در @%{group_name} اقدام کنم."
   education:
     until_posts:
       other: "%{count} نوشته"
@@ -348,7 +351,6 @@ fa_IR:
   staff_category_name: "همکاران"
   staff_category_description: "بخش خصوصی برای گفتگوی مدیران. موضوعات فقط برای مدیران ارشد و مدیران قابل رویت است."
   assets_topic_title: "منابع مورد نیاز طراحی سایت"
-  assets_topic_body: "این یک موضوع ثابت است که فقط به کارمندان نمایش داده می‌شود، برای ذخیره تصاویر و فایل‌های استفاده شده در طراحی سایت. این موضوع را حذف نکنید.\n\n\nنحوه کار:\n\n\n1. به موضوع پاسخ دهید.\n2. تمام تصاویر مورد دنیاز برای لوگو، فاو‌آیکن و... را بارگذاری کنید. ( از آیکن نوار ابزار در ویرایشگر نوشته استفاده کنید، یا تصاویر را در ویرایشگر بکشید و یا آن ها را بچسبانید)\n3. پاسخ خود را برای ارسال نوشته ثبت کنید.\n4. در نوشته‌های جدید روی تصاویر کلیک راست کنیدتا مسیر تصویر بارگذاری شده را دریافت کنید، یا روی آیکن ویرایشنوشته کلیک کنید تا مسیر تصاویر را بازیابی کنید. مسیر تصویر را کپی کنید.\n5. مسیر تصاویر کپی شده را در [تنظیمات اولیه](/admin/site_settings/category/required) وارد کنید.\n\n\nاگر نیاز به فعالسازی انواع دیگری از فایل‌ها دارید قسمت  `authorized_extensions`  در [تنظیمات فایل](/admin/site_settings/category/files) را ویرایش کنید."
   discourse_welcome_topic:
     title: "به دیسکورس خوش آمدید"
     body: |2
@@ -606,7 +608,6 @@ fa_IR:
         remove: "این موضوع دیگر در بنر نیست. دیگر در بالای تمام صفحات به نمایش در نمی‌آید. "
   unsubscribed:
     title: "اشتراک لغو شد!"
-    description: "لغو اشتراک انجام شد. برای تغییر تنظیمات ایمیل <a href='%{url}'>تنظیمات را ببینید</a>."
     topic_description: "اشتراک مجدد در %{link}، استفاده از مدیریت اعلانات در قسمت پایین یا راست موضوع."
   unsubscribe:
     title: "لغو اشتراک"
@@ -883,7 +884,6 @@ fa_IR:
     notify_mods_when_user_blocked: "اگر کاربر به‌طور خودکار مسدود شد، به تمام مدیران پیام بفرست."
     flag_sockpuppets: "اگر کاربری به موضوع با ای پی برابر با کاربری که نوشته را شروع کرده ٬ آنها را به عنوان هرزنامه پرچم گزاری کن."
     traditional_markdown_linebreaks: "در مدل‌های نشانه گزاری از خط جدید سنتی استفاده کن،‌ که برای linebreak نیاز به دو فضای انتهایی دارد ."
-    allow_html_tables: "اجازه ارسال جدول به صورت markdown با تگ های HTML. TABLE, THEAD, TD, TR, TH قابل استفاده هستند. (نیازمند ایجا دوباره در نوشته‌های قدیمی که شامل جدول هستند)"
     post_undo_action_window_mins: "تعداد دقایقی که کاربران اجازه دارند اقدامی را که در نوشته انجام داده اند باز گردانند. (پسند، پرچم گذاری،‌ چیزهای دیگر)."
     must_approve_users: "همکاران باید تمامی حساب‌های کاربری را قبل از اجازه دسترسی به سایت تایید کنند. اخطار: فعال‌سازی این گزینه ممکن است باعث جلوگیری از دسترسی کاربرانی که قبلا عضو شده‌اند نیز بشود!"
     pending_users_reminder_delay: "اگر کاربر‌ها بیشتر از این مقدار ساعت منتظر تایید بودند به مدیران اعلام کن. مقدار -1 برای غیرفعال‌سازی."
@@ -1024,6 +1024,7 @@ fa_IR:
     twitter_summary_large_image_url: "لینک پیشفرض خلاصه توییتر و تصویر (باید حداقل 280 در 150 پیکسل باشد)"
     allow_all_attachments_for_group_messages: "اجازه‌ی ضمیمه فایل در ایمیل پیام‌های گروهی."
     png_to_jpg_quality: "کیفیت تبدیل فایل‌های JPG (1 کمترین کیفیت، 99 بالاترین کیفیت، 100 برای غیر‌فعال)"
+    allow_staff_to_upload_any_file_in_pm: "به مدیران اجازه بده که هر فایلی در پیغام خصوصی آپلود کنند."
     enable_flash_video_onebox: "بکارگیری جاسازی لینک های  swf و flv (ادوبی فلاش Adobe Flash) در oneboxes. اخطار: شاید باعث ایجاد خطرات امنیتی شود."
     default_invitee_trust_level: "سطح اعتماد پیشفرض (0-4) برای دعوت کاربران"
     default_trust_level: "سطح اعتماد پیشفرض(0-4) برای تمام کاربران جدید. اخطار! تغییر این ممکن است شما را در معرض خطر جدی هرزنامه قرار دهد."
@@ -1463,41 +1464,9 @@ fa_IR:
   invite_mailer:
     title: "دعوت نامه‌رسان"
     subject_template: "%{invitee_name} شما را به %{topic_title}' در  %{site_domain_name}  دعوت کرده"
-    text_body_template: |
-      %{invitee_name} شما را به گفتگو دعوت کرده
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      at
-
-      > %{site_title} -- %{site_description}
-
-      اگر علاقه‌مند هستید روی لینک زیر کلیک کنید:
-
-      %{invite_link}
   custom_invite_mailer:
     title: "دعوت سفارشی نامه‌رسان"
     subject_template: "%{invitee_name} شما را به '%{topic_title}' در %{site_domain_name} دعوت کرده"
-    text_body_template: |
-      %{invitee_name} شما را به گفتگو دعوت کرده
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      at
-
-      > %{site_title} -- %{site_description}
-
-      با این یادداشت
-
-      > %{user_custom_message}
-
-      اگر علاقه‌مند هستید روی لینک زیر کلیک کنید:
-
-      %{invite_link}
   invite_forum_mailer:
     title: "دعوت نامه‌رسان انجمن"
     subject_template: "%{invitee_name} به عضویت در %{site_domain_name} دعوت شدید"
@@ -1975,12 +1944,6 @@ fa_IR:
     new_user_of_the_month:
       title: "شما کاربر جدید ماه هستید!"
       subject_template: "شما کاربر جدید ماه هستید!"
-      text_body_template: |
-        تبریک عرض میکنم، شما **جایزه کاربر جدید ماه %{month_year}** را بدست آوردید! :trophy:
-
-        این جایزه فقط به دو کاربر در ماه تعلق می‌گیرد و به صورت ثابت در [حساب کاربری شما](/my/badges) باقی می‌ماند.
-
-        شما خیلی زود به یک عضو ارزشمند برای انجمن ما تبدیل شدید. از پیوستن شما متشکریم، به کار خود ادامه دهید!
   unsubscribe_link: |
     برای لغو اشتراک از این ایمیل‌ها،  [کلیک کنید](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2005,26 +1968,6 @@ fa_IR:
     visit_link_to_respond: "[موضوع را](%{base_url}%{url}) برای ارسال پاسخ ببینید."
     visit_link_to_respond_pm: "[پیام را](%{base_url}%{url}) برای ارسال پاسخ ببینید."
     posted_by: "نوشته شده توسط {username}% در تاریخ {post_date}%"
-    invited_to_private_message_body: |
-      %{username} شما را به یک پیام دعوت کرده
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      در
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} شما را به یک بحث دعوت کرده
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      در
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "کاربر دعوت شده به پیام خصوصی"
       subject_template: "[%{email_prefix}] %{username} شما را به پیام '%{topic_title}' دعوت کرده"
@@ -2172,7 +2115,6 @@ fa_IR:
       popular_posts: "نوشته‌های محبوب"
       more_new: "جدید برای شما"
       subject_template: "[%{email_prefix}] خلاصه"
-      unsubscribe: "این خلاصه از %{site_link} به دلیل اینکه مدتی است شما را ندیده ایم ارسال شده است. برای لغو اشتراک %{unsubscribe_link}"
       click_here: "اینجا کلیک کنید"
       from: "%{site_name} خلاصه"
       preheader: "یک خلاصه مختصر  به دلیل اینکه آخرین بازدیدتان در %{last_seen_at} بوده."
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 9c68be15e1c..99481189cba 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -175,6 +175,7 @@ fi:
   user_is_suspended: "Hyllytetyt käyttäjät eivät saa luoda viestejä."
   topic_not_found: "Jotain on mennyt pieleen. Ehkä tämä ketju on suljettu tai poistettu sillä välin, kun katselit sitä?"
   not_accepting_pms: "Pahoittelut, %{username} ei ota vastaan yksityisviestejä tällä hetkellä."
+  max_pm_recepients: "Pahoittelut, voit lähettää viestin enintään %{recipients_limit} vastaanottajalle."
   just_posted_that: "on liian samanlainen kuin aiempi viestisi"
   invalid_characters: "sisältää epäkelpoja merkkejä"
   is_invalid: "vaikuttaa epäselvältä, olihan se kokonainen virke?"
@@ -222,6 +223,7 @@ fi:
       invalid_incoming_email: "'%{email}' ei ole käypä sähköpostiosoite."
       email_already_used_in_group: "'%{email}' on jo käytössä ryhmällä '%{group_name}'."
       email_already_used_in_category: "'%{email}' on jo käytössä alueella '%{category_name}'."
+      cant_allow_membership_requests: "Et voi sallia ryhmäjäsenyyden hakemista, jos ryhmällä ei ole isäntää."
     default_names:
       everyone: "kaikki"
       admins: "yllapitajat"
@@ -232,6 +234,9 @@ fi:
       trust_level_2: "luottamustaso_2"
       trust_level_3: "luottamustaso_3"
       trust_level_4: "luottamustaso_4"
+    request_membership_pm:
+      title: "Jäsenhakemus ryhmään @%{group_name}"
+      body: "Haluaisin liittyä ryhmään @%{group_name}."
   education:
     until_posts:
       one: "ensimmäisen viestisi"
@@ -351,6 +356,10 @@ fi:
           attributes:
             execute_at:
               in_the_past: "täytyy olla tulevaisuudessa."
+        translation_overrides:
+          attributes:
+            value:
+              missing_interpolation_keys: 'Nämä interpolaatioavaimet puuttuvat: "%{keys}"'
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Tietoa minusta -kenttä käyttäjätiedoissasi on täyttämättä. <a href='/u/%{username_lower}/preferences/about-me'>Haluaisitko täyttää sen nyt?</a></div>"
@@ -362,7 +371,7 @@ fi:
   staff_category_name: "Henkilökunta"
   staff_category_description: "Yksityinen alue henkilökunnan keskusteluille. Ketjut näkyvät ainoastaan ylläpitäjille ja valvojille."
   assets_topic_title: "Sivuston designiin liittyviä hyödykkeitä"
-  assets_topic_body: "Tämä on pysyvä ketju, joka näkyy ainoastaan henkilökunnalle. Se on tarkoitettu sivuston käyttämien kuvien ja muiden tiedostojen tallentamiseen. Älä poista sitä!\n\n\nTässä ova ohjeet sen käyttämiseen:\n\n\n1. Vastaa tähän ketjuun.\n2. Lataa kaikki kuvat, joita haluat käyttää logoina, faviconina jne tänne. (Käytä viestieditorin työkalupalkin painiketta, tai raahaa tai liitä kuvat).\n3. Lähetä viesti\n4. Klikkaa hiiren oikealla näppäimellä, tai klikkaa muokkaa-näppäintä muokataksesi viestiäsi, jotta saat kuvien polun näkyviin. Kopioi talteen polut kuviin.\n5. Liitä kuvien polut [perusasetuksiin](/admin/site_settings/category/required).\n\n\nLisäksi, jos sinun täytyy sallia uusia tiedostomuotoja, muokkaa `sallitut tiedostopäätteet` listaa [tiedostojen asetuksissa](/admin/site_settings/category/files)."
+  assets_topic_body: "Tämä ketju näkyy ainoastaan henkilökunnalle, ja se on tarkoitettu sivuston tyyliin liittyvien kuvien ja muiden tiedostojen säilömiseen. Älä poista sitä!\n\n\nTässä ohjeet sen käyttämiseen:\n\n\n1. Vastaa ketjuun.\n2. Lataa kaikki kuvat, joita haluat käyttää logoina, faviconina jne tänne. (Käytä viestieditorin työkalupalkin painiketta, tai raahaa tai liitä kuvat).\n3. Julkaise viesti.\n4. Klikkaa kuvia hiiren oikealla näppäimellä tai klikkaa viestin muokkauspainiketta, jotta saat kuvien polun näkyviin. Kopioi talteen polut kuviin.\n5. Liitä kuvien polut [perusasetuksiin](/admin/site_settings/category/required).\n\n\nJos sinun täytyy sallia uusia tiedostomuotoja, muokkaa `authorized_extensions`-listaa [tiedostojen asetuksissa](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Tervetuloa käyttämään Discoursea"
     body: |2
@@ -646,7 +655,7 @@ fi:
         remove: "Tämä ketju ei ole enää banneri. Sitä ei näytetä enää jokaisen sivun ylälaidassa."
   unsubscribed:
     title: "Tilaus peruttu!"
-    description: "Tilauksesi on peruttu. Voit muuttaa sähköpostiasetuksia <a href='%{url}'>käyttäjäasetuksissasi</a>."
+    description: "Tilaus osoitteeseen <b>%{email}</b> on peruttu. Voit muuttaa sähköpostiasetuksia <a href='%{url}'>käyttäjäasetuksissasi</a>."
     topic_description: "Tilaa %{link} uudelleen ketjun alla tai oikealla puolen sijaitsevan ilmoitusvalikon kautta."
   unsubscribe:
     title: "Peru tilaus"
@@ -857,6 +866,8 @@ fi:
     search_tokenize_chinese_japanese_korean: "Pakota haku käsittelemään kiinaa/japania/koreaa myös muunkielisillä sivustoilla"
     search_prefer_recent_posts: "Jos hakeminen suurelta palstaltasi on hidasta, tämä asetus kokeilee hakemistorakennetta, jossa tuoreimmat viestit ovat ensin"
     search_recent_posts_size: "Kuinka monta tuoretta viestiä pidetään hakemistossa"
+    log_search_queries: "Pidä lokia käyttäjien tekemistä hauista"
+    search_query_log_max_size: "Kuinka monta hakukyselyä säilötään enintään"
     allow_uncategorized_topics: "Salli ketjujen luominen valitsematta aluetta. VAROITUS: Alueettomat ketjut täytyy siirtää jollekin alueelle ennen kuin poistat asetuksen käytöstä."
     allow_duplicate_topic_titles: "Salli ketjun luominen identtisellä otsikolla."
     unique_posts_mins: "Kuinka monen minuutin kuluttua käyttäjä voi lähettää uudestaan samansisältöisen viestin"
@@ -877,7 +888,7 @@ fi:
     delete_removed_posts_after: "Kirjoittajalta poistetut viestit poistetaan automaattisesti (n) tunnin kuluttua. Jos asetetaan 0, viestit poistetaan välittömästi."
     max_image_width: "Esikatselukuvan suurin sallittu leveys viestissä"
     max_image_height: "Esikatselukuvan suurin sallittu korkeus viestissä"
-    fixed_category_positions: "Jos tämä on valittuna, voit muokata alueiden järjestystä. Jos tätä ei valita, alueet järjetsetään aktiivisuuden mukaan."
+    fixed_category_positions: "Jos tämä on valittuna, voit muokata alueiden järjestystä. Jos tätä ei valita, alueet järjestetään aktiivisuuden mukaan."
     fixed_category_positions_on_create: "Jos tämä on valittuna, alueiden järjestys pysyy samana uuden ketjun luomisen dialogissa (edellyttää fixed_category_positions)"
     add_rel_nofollow_to_user_content: "Lisää rel nofollow kaikkeen käyttäjien lähettämään sisältöön, paitsi sivuston sisäisiin linkkeihin (sisältäen ylemmät verkkotunnukset). Jos muutat asetusta, sinun täytyy rakentaa viestit uudelleen komennolla: \"rake posts:rebake\""
     exclude_rel_nofollow_domains: "Lista verkkotunnuksista, johon osoittaviin linkkeihin nofollow:ta ei lisätä. tld.com sallii automaattisesti myös sub.tld.comin. Sinun tulisi vähintäänkin lisätä tämän sivuston domain, jotta hakurobotit löytävät kaiken sisällön. Jos sivustosi muut osat ovat toisen domainin takan, lisää myös ne."
@@ -923,7 +934,7 @@ fi:
     notify_mods_when_user_blocked: "Jos käyttäjä estetään automaattisesti, lähetä viesti kaikille valvojille."
     flag_sockpuppets: "Jos uuden käyttäjän luomaan ketjuun vastaa toinen uusi käyttäjä samasta IP-osoitteesta, liputa molemmat viestit mahdolliseksi roskapostiksi."
     traditional_markdown_linebreaks: "Käytä perinteisiä rivinvaihtoja Markdownissa, joka vaatii kaksi perättäistä välilyöntiä rivin vaihtoon."
-    allow_html_tables: "Salli taulukoiden syöttäminen Markdowniin käyttäen HTML tageja. TABLE, THEAD, TD, TR, TH valkolistataan (edellyttää kaikkien taulukoita sisältävien vanhojen viestien uudelleen rakentamisen)"
+    enable_markdown_typographer: "Käytetään tavanomaisia typografisia sääntöjä parantamaan tekstikappaleiden luettavuutta, (c), (tm) ym. korvataan symboleilla, kysymysmerkkien määrää vähennetään jne."
     post_undo_action_window_mins: "Kuinka monta minuuttia käyttäjällä on aikaa perua viestiin kohdistuva toimi (tykkäys, liputus, etc)."
     must_approve_users: "Henkilökunnan täytyy hyväksyä kaikki uudet tilit, ennen uusien käyttäjien päästämistä sivustolle. VAROITUS: tämän asetuksen valitseminen poistaa pääsyn kaikilta jo olemassa olevilta henkilökuntaan kuulumattomilta käyttäjiltä."
     pending_users_reminder_delay: "Ilmoita valvojille, jos uusi käyttäjä on odottanut hyväksyntää kauemmin kuin näin monta tuntia. Aseta -1, jos haluat kytkeä ilmoitukset pois päältä."
@@ -1064,6 +1075,7 @@ fi:
     twitter_summary_large_image_url: "Oletuksena käytettävän Twitter-tiivistelmäkortin kuva (tulisi olla leveydeltään ainakin 280 px leveä ja 150 px korkea)."
     allow_all_attachments_for_group_messages: "Salli kaikki sähköpostiliitteet ryhmäviesteissä."
     png_to_jpg_quality: "Muunnetun JPG-tiedoston laatu (1 on huonoin laatu, 99 on paras laatu, 100 ottaa pois käytöstä)."
+    allow_staff_to_upload_any_file_in_pm: "Salli henkilökunnan ladata minkätyyppisiä liitteitä tahansa yksityisviesteihin."
     enable_flash_video_onebox: "Ota käyttöön swf- ja flv-linkkien (Adobe Flash) onebox-tuki. VAROITUS: saattaa lisätä tietoturvariskejä."
     default_invitee_trust_level: "Oletus luottamustaso (0-4) kutsutuille käyttäjille."
     default_trust_level: "Uusien käyttäjien oletusarvoinen luottamustaso (0-4). VAROITUS! Tämän muuttaminen altistaa roskapostille."
@@ -1200,6 +1212,7 @@ fi:
     email_in_min_trust: "Alin luottamustaso, jonka käyttäjä tarvitsee voidakseen luoda uusia ketjuja sähköpostitse."
     email_prefix: "Sähköpostin otsikossa käytettävä [tunniste]. Jos et aseta arvoa, oletusarvona käytetään 'otsikkoa'."
     email_site_title: "Sähköpostin lähettäjänä käytettävä nimi. Jos arvoa ei ole asetettu, oletuksena käytetään 'title'. Jos 'title' sisältää merkkejä joita ei sallita sähköpostin lähettäjän nimessä, käytä tätä asetusta."
+    find_related_post_with_key: "Käytä vain vastausavainta tunnistettaessa, mihin viestiin viesti on vastaus. (Suositellaan, jos käytössä on Amazon SES)"
     minimum_topics_similar: "Kuinka monta ketjua täytyy olla olemassa, ennen kuin samankaltaisia ketjuja näytetään uutta ketjua luotaessa."
     relative_date_duration: "Monenako päivänä viestin lähettämisen jälkeen päivämäärät näytetään suhteellisina (7p) eikä absoluuttisina (20 Huhti)."
     delete_user_max_post_age: "Älä salli käyttäjien poistamista, joiden ensimmäinen viesti on vanhempi kuin (x) päivää."
@@ -1286,6 +1299,7 @@ fi:
     auto_close_messages_post_count: "Maksimimäärä viestejä yksityisketjussa, kunnes se suljetaan automaattisesti (0 poistaaksesi käytöstä)"
     auto_close_topics_post_count: "Maksimimäärä viestejä ketjussa, kunnes se suljetaan automaattisesti (0 poistaaksesi käytöstä)"
     code_formatting_style: "Viestikentän koodipainike käyttää oletuksena tätä koodimuotoilutyyliä"
+    max_allowed_message_recipients: "Kuinka monta vastaanottajaa yksityisviestillä voi olla."
     default_email_digest_frequency: "Kuinka usein käyttäjille lähetetään sähköpostikooste oletuksena."
     default_include_tl0_in_digests: "Sisällytä uusien käyttäjien viestit sähköpostikoosteisiin oletuksena. Tätä voi muuttaa käyttäjäasetuksissa."
     default_email_private_messages: "Lähetä oletuksena sähköposti, kun joku lähettää käyttäjälle viestin."
@@ -1354,6 +1368,8 @@ fi:
       email_polling_disabled: "Sinun täytyy ottaa käyttöön joko manuaalinen tai POP3 pollaus ennen sähköpostivastauksia."
       user_locale_not_enabled: "'allow user locale' täytyy olla asetettuna ennen tämän asetuksen ottamista käyttöön."
       invalid_regex: "Säännöllinen lauseke ei kelpaa tai ei ole sallittu."
+      email_editable_enabled: "Asetus 'email editable' on otettava pois käytöstä ennen tämän asetuksen käyttöönottoa."
+      enable_sso_disabled: "Asetus 'enable sso' on otettava käyttöön ennen tämän asetuksen käyttöönottoa."
   search:
     within_post: "#%{post_number} käyttäjältä %{username}"
     types:
@@ -1390,7 +1406,7 @@ fi:
       one: "Yksi viesti siirrettiin toiseen ketjuun: %{topic_link}"
       other: "%{count} viestiä siirrettiin toiseen ketjuun: %{topic_link}"
   change_owner:
-    post_revision_text: "Omistus vaihdettu käyttäjältä %{old_user} käyttäjälle %{new_user}"
+    post_revision_text: "Omistus siirrettiin käyttäjältä %{old_user} käyttäjälle %{new_user}"
     deleted_user: "poistettu käyttäjä"
   topic_statuses:
     archived_enabled: "Tämä ketju on arkistoitu. Se on jäädytetty eikä sitä voi muuttaa millään tavalla."
@@ -1518,36 +1534,35 @@ fi:
   invite_mailer:
     title: "Kutsu keskusteluun"
     subject_template: "%{invitee_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
-    text_body_template: |+
+    text_body_template: |
       %{invitee_name} kutsui sinut keskusteluun
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
-      keskustelupalstalla
+      sivustolla
 
       > %{site_title} -- %{site_description}
 
       Jos kiinnostuit, klikkaa alla olevaa linkkiä:
 
       %{invite_link}
-
   custom_invite_mailer:
     title: "Kutsu keskusteluun saatesanoilla"
     subject_template: "%{invitee_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
     text_body_template: |
       %{invitee_name} kutsui sinut keskusteluun
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
-      keskustelupalstalla
+      sivustolla
 
       > %{site_title} -- %{site_description}
 
-      tällaisin saatesanoin:
+      tällaisin saatesanoin
 
       > %{user_custom_message}
 
@@ -2080,7 +2095,7 @@ fi:
       text_body_template: |
         Onneksi olkoon, olet ansainnut Kuukauden tulokas -palkinnon %{month_year}** :trophy:
 
-        Palkinto myönnetään vain kahdelle käyttäjälle joka kuukausi, ja se näkyy pysyvästi [käyttäjäsivullasi](/my/badges).
+        Palkinto myönnetään vain kahdelle käyttäjälle joka kuukausi, ja se näkyy pysyvästi [käyttäjäsivullasi](%{base_url}/my/badges).
 
         Sinusta on äkkiä tullut tärkeä osa yhteisöä. Kiitos kun liityit, ja jatka samaa rataa!
   unsubscribe_link: |
@@ -2111,7 +2126,7 @@ fi:
     invited_to_private_message_body: |
       %{username} kutsui sinut yksityiskeskusteluun
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -2119,9 +2134,9 @@ fi:
 
       > %{site_title} -- %{site_description}
     invited_to_topic_body: |
-      %{username} kutsui sinut keskusteluun
+      %{username} kustui sinut keskusteluun
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -2275,7 +2290,7 @@ fi:
       popular_posts: "Suosittuja viestejä"
       more_new: "Uutta sinulle"
       subject_template: "[%{email_prefix}] Kooste"
-      unsubscribe: "Tämä kooste lähetettiin sivustolta %{site_link}, koska emme ole nähneet sinua vähään aikaan. Jos et halua vastaanottaa näitä viestejä %{unsubscribe_link}."
+      unsubscribe: "Tämä kooste lähetettiin sivustolta %{site_link}, koska sinua ei ole näkynyt vähään aikaan. Voit perua tilauksen muuttamalla <a href='%{email_settings_url}'>sähköpostiasetuksiasi</a> tai %{unsubscribe_link}."
       click_here: "klikkaa tästä"
       from: "%{site_name} kooste"
       preheader: "Lyhyt yhteenveto tapahtumista viime vierailusi (%{last_seen_at}) jälkeen"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 73d4bedb4c1..79dafa2f0af 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -222,6 +222,7 @@ fr:
       invalid_incoming_email: "« %{email} » n'est pas une adresse de courriel valide."
       email_already_used_in_group: "« %{email} » est déjà utilisé par le groupe « %{group_name} »."
       email_already_used_in_category: "« %{email} » est déjà utilisé par la catégorie « %{category_name} »."
+      cant_allow_membership_requests: "Vous ne pouvez pas autoriser les requêtes d'adhésion pour un groupe sans propriétaires."
     default_names:
       everyone: "tous"
       admins: "administrateurs"
@@ -232,6 +233,9 @@ fr:
       trust_level_2: "niveau_confiance_2"
       trust_level_3: "niveau_confiance_3"
       trust_level_4: "niveau_confiance_4"
+    request_membership_pm:
+      title: "Demande d'adhésion pour @%{group_name}"
+      body: "Je souhaiterais adhérer à @%{group_name}."
   education:
     until_posts:
       one: "1 message"
@@ -350,6 +354,10 @@ fr:
           attributes:
             execute_at:
               in_the_past: "Doit être dans le futur"
+        translation_overrides:
+          attributes:
+            value:
+              missing_interpolation_keys: 'Les clés d''interpolation suivantes sont absentes : « %{keys} »'
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Le champs À propos de moi de votre profil est vide,  <a href='/u/%{username_lower}/preferences/about-me'>voulez vous le remplir ?</a></div>"
@@ -361,7 +369,7 @@ fr:
   staff_category_name: "Responsables"
   staff_category_description: "Catégorie privée pour les discussions de l'équipe du forum. Les sujets ne sont visibles que pour les administrateurs et les modérateurs."
   assets_topic_title: "Ressources pour le style du site"
-  assets_topic_body: "Ceci est un sujet permanent, visible uniquement par l'équipe, pour stocker les images et fichiers utilisés pour le design du site. Ne pas le supprimer !\n\n\nMarche à suivre:\n\n1. Répondre à ce sujet\n2. Envoyer toutes les images que vous voulez utilisés comme logos, favicons, et tout ce que vous souhaitez. (Utiliser l'icone dans la barre d'édition ou glisser-déposer ou coller les images)\n3. Envoyer votre réponse\n4. Afin d'obtenir le chemin complet de votre image, faites un clic-droit dessus ou éditer votre message et copier le chemin.\n5. Coller le chemin de l'image dans les [paramètres requis](/admin/site_settings/category/required).\n\nDe plus, si vous souhaitez envoyer d'autres formats de fichier, modifier l'option `authorized_extensions` dans les [paramètres de fichier](/admin/site_settings/category/files)."
+  assets_topic_body: "Ce sujet, visible uniquement par les responsables, permet de stocker les images et fichiers utilisés pour le design du site. Ne le supprimez pas !\n\n\nVoici comment :\n\n1. Répondez à ce sujet.\n2. Envoyez toutes les images que vous voulez utiliser comme logos, favicons, etc. sur ce sujet. (Utiliser l'icône dans la barre d'édition, glisser-déposer ou coller les images.)\n3. Envoyez votre réponse.\n4. Faites un clic droit afin d'obtenir le chemin vers vos images ou modifier votre message pour récupérer le chemin. Copiez le chemin.\n5. Collez les chemins des images dans les [paramètres requis](/admin/site_settings/category/required).\n\n\nSi vous avez besoin d'activer d'autres formats de fichier, modifiez l'option `authorized_extensions` dans les [paramètres de fichier](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Bienvenue sur Discourse"
     body: |2
@@ -571,12 +579,15 @@ fr:
       long_form: 'signalé comme hors-sujet'
     spam:
       title: 'Spam'
+      description: 'Ce message est une publicité, ou du vandalisme. Il n''est pas utile ou pertinent pour le sujet actuel.'
+      short_description: 'C''est de la publicité ou du vandalisme'
       long_form: 'signalé comme spam'
       email_title: '« %{title} » a été signalé comme spam'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Inapproprié'
       description: 'Ce message contient du contenu qu''une personne raisonnable jugerait offensant, abusif ou en violation de la <a href="/guidelines">charte de notre communauté</a>.'
+      short_description: 'Une violation de <a href="/guidelines">la charte de notre communauté</a>'
       long_form: 'signalé comme inapproprié'
     notify_user:
       title: 'Envoyer un message à @{{username}} '
@@ -595,6 +606,7 @@ fr:
     bookmark:
       title: 'Mettre un signet'
       description: 'Mettre un signet'
+      short_description: 'Mettre un signet'
       long_form: 'signet ajouté'
     like:
       title: 'J''aime'
@@ -641,7 +653,7 @@ fr:
         remove: "Ce sujet n'est plus à la une. Il ne sera plus affiché en haut de chaque page."
   unsubscribed:
     title: "Désabonné !"
-    description: "Vous avez été désabonné. Pour modifier vos paramètres de courriel, <a href='%{url}'>visitez vos préférences utilisateurs</a>."
+    description: "<b>%{email}</b> a été désabonné. Pour modifier vos paramètres de courriel, <a href='%{url}'>visitez vos préférences utilisateurs</a>."
     topic_description: "Pour vous ré-abonner à %{link}, utilisez le contrôle des notifications en bas ou à droite du sujet."
   unsubscribe:
     title: "Se désabonner"
@@ -918,7 +930,6 @@ fr:
     notify_mods_when_user_blocked: "Si un utilisateur est bloqué automatiquement, envoyer un message à tous les modérateurs."
     flag_sockpuppets: "Si un nouvel utilisateur répond à un sujet avec la même adresse IP que le nouvel utilisateur qui a commencé le sujet, alors leurs messages seront automatiquement marqués comme spam."
     traditional_markdown_linebreaks: "Utiliser le retour à la ligne traditionnel dans Markdown, qui nécessite deux espaces pour un saut de ligne."
-    allow_html_tables: "Autoriser la saisie des tableaux dans le Markdown en utilisant les tags HTML : TABLE, THEAD, TD, TR, TH sont autorisés (nécessite un rebake de tous les anciens messages contenant des tableaux)"
     post_undo_action_window_mins: "Nombre de minutes pendant lesquelles un utilisateur peut annuler une action sur un message (J'aime, signaler, etc.)"
     must_approve_users: "Les responsables doivent approuver les nouveaux utilisateurs afin qu'ils puissent accéder au site. ATTENTION : activer cette option sur un site en production suspendra l'accès des utilisateurs existants qui ne sont pas des responsables !"
     pending_users_reminder_delay: "Avertir les modérateurs si des nouveaux utilisateurs sont en attente d'approbation depuis x heures. Mettre -1 pour désactiver les notifications."
@@ -932,6 +943,8 @@ fr:
     allow_moderators_to_create_categories: "Autoriser les modérateurs à créer de nouvelles catégories"
     cors_origins: "Requêtes cross-origin (CORS) autorisées. Chaque origine doit inclure http:// ou https://. la variable d'environnement DISCOURSE_ENABLE_CORS doit être renseignée à true pour activer CORS."
     use_admin_ip_whitelist: "Les administrateurs ne peuvent se connecter que s'ils sont à une adresse IP définie dans la liste des IP surveillées (Admin > Journaux > IP surveillés)."
+    blacklist_ip_blocks: "Une liste de blocs IP privés qui ne doivent jamais être crawlés par Discourse"
+    whitelist_internal_hosts: "Une liste de domaines internes que Discourse peut crawler en sécurité pour les Onebox et autres"
     top_menu: "Déterminer les éléments qui apparaissent dans la navigation de la page d'accueil, et dans quel ordre. Exemple latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "L'ordre des éléments dans le menu de rédaction. Exemple like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Les éléments du menu qui seront cachés par défaut jusqu’à extension du menu."
@@ -965,6 +978,7 @@ fr:
     invite_passthrough_hours: "Combien de temps un utilisateur peut encore utilisé une clé d'invitation après son expiration, en heure"
     invite_only: "Les inscriptions sont désactivées, elles ne peuvent se faire uniquement sur invitation par le staff."
     login_required: "Authentification requise pour lire le contenu du site, interdit l'accès anonyme."
+    reserved_usernames: "Pseudos pour lesquels l'inscription n'est pas autorisée. Le symbole « * » peut être utilisé pour représenter n'importe quel caractère 0 ou plusieurs fois."
     min_password_length: "Longueur minimale du mot de passe."
     min_admin_password_length: "Longueur minimale du mot de passe pour l'administrateur."
     password_unique_characters: "Nombre minimum de caractères uniques qu'un mot de passe doit avoir."
@@ -1055,6 +1069,7 @@ fr:
     default_opengraph_image_url: "URL de l'image par défaut pour les balises Open Graph."
     twitter_summary_large_image_url: "URL de l'image par défaut de la carte de résumé Twitter (devrait au moins mesurer 280px en largeur et 150px en hauteur). "
     allow_all_attachments_for_group_messages: "Autorise toutes les pièces-jointes pour les messages de groupes."
+    png_to_jpg_quality: "Qualité du fichier JPEG converti (1 est la plus faible, 99 est la meilleure, 100 pour désactiver)."
     enable_flash_video_onebox: "Activer l'utilisation de swf et flv (Adobe Flash) dans les boites imbriquées. ATTENTION : cela pourrait introduire un risque de sécurité."
     default_invitee_trust_level: "Niveau de confiance par défaut (0-4) pour les invités."
     default_trust_level: "Niveau de confiance par défaut (entre 0 et 4) pour tous les nouveaux utilisateurs. ATTENTION ! Changer ce paramètre peut vous exposer à des spams."
@@ -1112,6 +1127,7 @@ fr:
     max_image_size_kb: "La taille maximale des images en Ko. Doit être configuré dans nginx (client_max_body_size) / apache ou proxy aussi."
     max_attachment_size_kb: "La taille maximale des fichiers envoyés en Ko. Doit être configurer dans nginx (client_max_body_size) / apache ou proxy aussi."
     authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois sur le serveur (mettre '*' pour autoriser tous les types)"
+    theme_authorized_extensions: "Une liste d'extensions de fichier autorisées pour les envois de thème (mettre « * » pour autoriser tous les types de fichier)"
     max_similar_results: "Combien de sujets similaires sont afficher lorsqu'un utilisateur est en train de créer un nouveau sujet. La comparaison se base sur le titre et le contenu."
     max_image_megapixels: "Nombre maximum autorisé de mégapixels pour une image."
     title_prettify: "Corrige les coquilles les plus communes dans les titres (intégralité du titre en majuscule, première lettre en minuscule, de multiples ! et ?, un . inutile à la fin, etc.)"
@@ -1175,6 +1191,7 @@ fr:
     attachment_filename_blacklist: "Liste des mots-clés utilisés pour filtrer les pièces jointes en fonction du nom de fichier."
     enable_forwarded_emails: "[BÊTA] Autoriser les utilisateurs de créer des sujets en transferant un courriel."
     always_show_trimmed_content: "Toujours montrer la partie réduite des courriels entrants. ATTENTION : cela peut révéler les adresses courriels."
+    private_email: "Ne pas inclure du contenu des messages ou des sujets dans les courriels pour plus de confidentialité."
     manual_polling_enabled: "Envoyer les courriels en utilisant l'API des réponses par courriel."
     pop3_polling_enabled: "Utiliser POP3 pour les réponses via courriel."
     pop3_polling_ssl: "Utiliser SSL pour les connections au serveur POP3. (Recommandé)"
@@ -1247,8 +1264,8 @@ fr:
     warn_reviving_old_topic_age: "Lorsque quelqu'un commence à répondre à un sujet dont la dernière réponse est vielle de plusieurs jours, un avertissement sera affiché. Désactiver la fonctionnalité en indiquant: 0."
     autohighlight_all_code: "Forcer la mise en évidence de tout les textes dans les balises code, même si ils ne correspondent à aucun langage de programmation."
     highlighted_languages: "Règles de coloration syntaxique supportées. (Attention : supporter trop de langages peut impacter les performances) voir : https://highlightjs.org/static/demo/ pour une démo"
-    feed_polling_enabled: "EMBARQUER UNIQUEMENT: Embarqué le flux RSS/ATOM en tant que messages."
-    feed_polling_url: "EMBARQUER UNIQUEMENT: Url du flux RSS/ATOM à embarqué."
+    feed_polling_enabled: "INTÉGRATION UNIQUEMENT : Détermine l'intégration d'un flux RSS/ATOM en tant que messages."
+    feed_polling_url: "INTÉGRATION UNIQUEMENT : URL du flux RSS/ATOM à intégrer."
     embed_by_username: "Pseudo de l'utilisateur Discourse qui crée les sujets embarqués."
     embed_username_key_from_feed: "Clé pour extraire le pseudo du flux."
     embed_title_scrubber: "Expression régulière pour nettoyer les titres intégrables."
@@ -1258,6 +1275,7 @@ fr:
     embed_username_required: "Un pseudo d'utilisateur pour la création du sujet est nécessaire."
     embed_whitelist_selector: "Sélecteur CSS pour les éléments qui seront autorisés dans les contenus embarqués."
     embed_blacklist_selector: "Sélecteur CSS pour les éléments qui seront interdits dans les contenus embarqués."
+    notify_about_flags_after: "S'il y a des signalements qui n'ont pas été traités après ce nombre d'heures, envoyer un message privé aux responsables. Mettre 0 pour désactiver."
     show_create_topics_notice: "Si le site contient moins de 5 sujets publics, afficher un message pour demander aux administrateurs de créer d'autres sujets."
     delete_drafts_older_than_n_days: Supprimer les brouillons plus vieux que (n) jours.
     bootstrap_mode_min_users: "Nombre minimum d'utilisateurs nécessaire pour désactiver le mode de démarrage (mettre à 0 pour désactiver)"
@@ -1436,6 +1454,7 @@ fr:
     pinned_globally_disabled: "Ce sujet est maintenant désépinglé. Il n'apparaîtra plus en haut de sa catégorie."
     visible_enabled: "Ce sujet est maintenant visible. Il sera affiché dans la liste des sujets."
     visible_disabled: "Ce sujet est maintenant invisible. Il ne sera plus affiché dans la liste des sujets. Le seul moyen d'y accéder est par lien direct."
+    auto_deleted_by_timer: "Automatiquement supprimé par planification"
   login:
     not_approved: "Votre compte n'a pas encore été approuvé. Vous serez notifié par courriel quand cela sera fait."
     incorrect_username_email_or_password: "pseudo, adresse de courriel ou mot de passe incorrect"
@@ -1487,10 +1506,14 @@ fr:
     website:
       domain_not_allowed: "Site Web invalide. Les domaines autorisés sont : %{domains}"
   flags_reminder:
+    flags_were_submitted:
+      one: "Des signalements ont été soumis il y a plus de 1 heure. [Veuillez les passer en revue](/admin/flags)."
+      other: "Des signalements ont été soumis il y a plus de %{count} heures. [Veuillez les passer en revue](/admin/flags)."
     subject_template:
       one: "un signalement en attente de traitement"
       other: "%{count} signalements en attente de traitement."
   unsubscribe_mailer:
+    title: "Désinscription"
     subject_template: "Confirmez que vous ne souhaitez plus recevoir de courriels de mises à jour de %{site_title}"
     text_body_template: |
       Quelqu'un (peut-être vous ?) a demandé à ne plus recevoir d'emails de mises à jour pour %{site_domain_name} sur cette adresse email.
@@ -1501,42 +1524,13 @@ fr:
 
       Si vous souhaitez continuer à recevoir ces emails, vous pouvez ignorer ce message.
   invite_mailer:
+    title: "Invitiation"
     subject_template: "%{invitee_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} vous a invité(e) à une discussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      à
-
-      > %{site_title} -- %{site_description}
-
-      Si cela vous intéresse, cliquez sur le lien ci-dessous :
-
-      %{invite_link}
   custom_invite_mailer:
+    title: "Invitation personnalisée"
     subject_template: "%{invitee_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} vous a invité(e) à une discussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      à
-
-      > %{site_title} -- %{site_description}
-
-      Avec ce message :
-
-      > %{user_custom_message}
-
-      Si cela vous intéresse, cliquez sur le lien ci-dessous :
-
-      %{invite_link}
   invite_forum_mailer:
+    title: "Invitation sur le forum"
     subject_template: "%{invitee_name} vous a invité(e) à rejoindre %{site_domain_name}"
     text_body_template: |
       %{invitee_name} vous invite à rejoindre :
@@ -1549,6 +1543,7 @@ fr:
 
       %{invite_link}
   custom_invite_forum_mailer:
+    title: "Invitation personnalisée sur le forum"
     subject_template: "%{invitee_name} vous a invité(e) à rejoindre %{site_domain_name}"
     text_body_template: |
       %{invitee_name} vous invite à rejoindre :
@@ -1565,6 +1560,7 @@ fr:
 
       %{invite_link}
   invite_password_instructions:
+    title: "Instructions du mot de passe d'invité"
     subject_template: "Renseignez le mot de passe pour votre compte utilisateur %{site_name} "
     text_body_template: |
       Merci d'avoir accepté l'invitation sur %{site_name} -- Bienvenue !
@@ -1574,6 +1570,7 @@ fr:
 
       (Si le lien est expiré, cliquez sur "J'ai oublié mon mot de passe" au moment de s'identifier avec adresse email)
   download_backup_mailer:
+    title: "Téléchargement de la sauvegarde"
     subject_template: "[%{email_prefix}] Lien Téléchargement Sauvegarde"
     text_body_template: |
       Voici le [site backup download](%{backup_file_path}) que vous avez demandé.
@@ -1636,6 +1633,7 @@ fr:
       [mj]: https://www.mailjet.com/pricing
       [mt]: http://www.mail-tester.com/
   new_version_mailer:
+    title: "Nouvelle version"
     subject_template: "[%{email_prefix}] Nouvelle version de Discourse, mise à jour disponible"
     text_body_template: |+
       Hourra, une nouvelle version de [Discourse](http://www.discourse.org) est disponible !
@@ -1650,6 +1648,7 @@ fr:
       - Visitez [meta.discourse.org](https://meta.discourse.org) pour des nouvelles, des discussions, et de l'aide concernant Discourse.
 
   new_version_mailer_with_notes:
+    title: "Nouvelle version avec notes"
     subject_template: "[%{email_prefix}] mise à jour disponible"
     text_body_template: |
       Hourra, une nouvelle version de [Discourse](http://www.discourse.org) est disponible !
@@ -1667,6 +1666,7 @@ fr:
 
       %{notes}
   queued_posts_reminder:
+    title: "Messages dans la file d'attente"
     subject_template:
       one: "[%{email_prefix}] 1 message en attente de modération"
       other: "[%{email_prefix}] %{count} messages en attente de modération"
@@ -1718,8 +1718,31 @@ fr:
     welcome_user:
       title: "Bienvenue Utilisateur"
       subject_template: "Bienvenue sur %{site_name} !"
+      text_body_template: |
+        Merci d'avoir rejoint %{site_name}, et bienvenue !
+
+        %{new_user_tips}
+
+        Nous croyons constamment au [comportement communautaire civilisé](%{base_url}/guidelines).
+
+        Amusez-vous bien !
     welcome_invite:
+      title: "Bienvenue invité"
       subject_template: "Bienvenue sur %{site_name} !"
+      text_body_template: |
+        Merci d'avoir accepté l'invitation sur %{site_name} — bienvenue !
+
+        - Nous avons créé ce nouveau compte **%{username}** pour vous. Modifiez votre nom ou mot de passe en visitant [votre profil utilisateur][prefs].
+
+        - Au moment de vous connecter, merci **d'indiquer l'adresse courriel utilisée pour l'invitation** — autrement, nous ne pourrons pas vous reconnaître !
+
+        %{new_user_tips}
+
+        Nous croyons  constamment au [comportement communautaire civilisé](%{base_url}/guidelines).
+
+        Amusez-vous bien !
+
+        [prefs] : %{user_preferences_url}
     backup_succeeded:
       title: "Sauvegarde réussie"
       subject_template: "Sauvegarde terminée avec succès"
@@ -1767,9 +1790,11 @@ fr:
         %{logs}
         ```
     bulk_invite_succeeded:
+      title: "Invitation en masse réussie"
       subject_template: "Envoi des invitations en masse réussi"
       text_body_template: "Votre envoi d'invitations en masse a été effectué. %{sent} invitations envoyées."
     bulk_invite_failed:
+      title: "Invitation en masse échouée"
       subject_template: "Envoi des invitations en masse effectué avec des erreurs"
       text_body_template: |
         Votre envoi d'invitations en masse a été effectué. %{sent} invitations envoyées avec %{failed} erreur(s).
@@ -1791,6 +1816,7 @@ fr:
 
         Les données sont compressées au format gzip. Si le fichier ne s'extrait pas au moment de l'ouvrir, utilisez les outils suivants : http://www.gzip.org/#faq4
     csv_export_failed:
+      title: "Export CSV échoué"
       subject_template: "Échec de l'exportation des données "
       text_body_template: "Nous sommes désolés, l'exportation de vos données a échoué. Veuillez consulter les journaux ou contacter un responsable."
     email_reject_insufficient_trust_level:
@@ -2007,12 +2033,6 @@ fr:
     new_user_of_the_month:
       title: "Vous êtes un nouvel utilisateur du mois !"
       subject_template: "Vous êtes un nouvel utilisateur du mois !"
-      text_body_template: |
-        Félicitations, vous avez gagné le **prix du Nouveau Membre du Mois de %{month_year}**. :trophy:
-
-        Ce prix est seulement décerné à deux nouveaux membres par mois et sera visible sur [your user page](/my/badges).
-
-        Vous êtes devenu rapidement un membre précieux pour notre communauté. Merci de nous avoir rejoint et continuez à participer !
   unsubscribe_link: |
     Pour se désabonner de ces courriels, [cliquer ici](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2025,6 +2045,9 @@ fr:
   subject_pm: "[MP]"
   user_notifications:
     previous_discussion: "Réponses précédentes"
+    reached_limit:
+      one: "Rappel : nous envoyons un maximum de 1 courriel quotidien. Vérifiez le site pour voir lesquels pourraient être retenus. P.S. : merci d'être populaire !"
+      other: "Rappel : nous envoyons un maximum de %{count} courriels quotidiens. Vérifiez le site pour voir lesquels pourraient être retenus. P.S. : merci d'être populaire !"
     in_reply_to: "En réponse à"
     unsubscribe:
       title: "Se désabonner"
@@ -2035,26 +2058,6 @@ fr:
     visit_link_to_respond: "[Voir le sujet](%{base_url}%{url}) pour répondre."
     visit_link_to_respond_pm: "[Voir le message](%{base_url}%{url}) pour répondre."
     posted_by: "Redigé par %{username} le %{post_date}"
-    invited_to_private_message_body: |
-      %{username} vous a invité(e) à un message
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      sur
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} vous a invité(e) à une discussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      sur
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Utilisateur invité au MP"
       subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
@@ -2198,7 +2201,6 @@ fr:
       popular_posts: "Messages populaires"
       more_new: "Nouveau pour vous"
       subject_template: "[%{email_prefix}] Résumé"
-      unsubscribe: "Ce résumé est envoyé depuis %{site_link} lorsque nous ne vous voyons plus depuis un moment. Pour se désabonner %{unsubscribe_link}."
       click_here: "cliquez ici"
       from: "résumé de %{site_name}"
       preheader: "Un bref résumé depuis votre dernière visite le %{last_seen_at}"
@@ -2269,6 +2271,22 @@ fr:
     signup_after_approval:
       title: "Inscription après approbation"
       subject_template: "Votre compte a été approuvé sur %{site_name} !"
+      text_body_template: |+
+        Bienvenue sur %{site_name} !
+
+        Un responsable a approuvé votre compte sur %{site_name}.
+
+        Cliquez sur le lien suivant pour confirmer et activer votre nouveau compte :
+        %{base_url}/u/activate-account/%{email_token}
+
+        Si le lien ci-dessus n'est pas cliquable, essayez de le copier/coller dans la barre d'adresse de votre navigateur internet.
+
+        %{new_user_tips}
+
+        Nous croyons constamment au [comportement communautaire civilisé](%{base_url}/guidelines).
+
+        Amusez-vous bien !
+
     signup:
       title: "Inscription"
       subject_template: "[%{email_prefix}] Activez votre nouveau compte"
@@ -2301,6 +2319,7 @@ fr:
     pasted_image_filename: "Image collée"
     store_failure: "Erreur lors du stockage de #%{upload_id} pour l'utilisateur #%{user_id}."
     file_missing: "Désolé, il faut fournir un fichier à envoyer."
+    empty: "Désolé, mais le fichier que vous avez fourni est vide."
     attachments:
       too_large: "Désolé, le fichier que vous essayez d'envoyer est trop gros (taille maximale de %{max_size_kb} Ko)."
     images:
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index f4536805bae..4ad04ee299f 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -175,6 +175,7 @@ he:
   user_is_suspended: "משתמשים מושעים אינם מורשים לפרסם."
   topic_not_found: "משהו השתבש אולי נושא זה נסגר או נמחק בזמן שקראתם אותו?"
   not_accepting_pms: "מצטעים,  %{username} לא מקבל הודעות כרגע."
+  max_pm_recepients: "מצטערים, אתם יכולים לשלוח הודעה לכל היותר ל-%{recipients_limit} נמענים."
   just_posted_that: "דומה מידי למה שפרסמתם לאחרונה"
   invalid_characters: "מכיל תווים לא תקניים"
   is_invalid: "נראה לא ברור, האם זה משפט שלם?"
@@ -222,6 +223,7 @@ he:
       invalid_incoming_email: "'%{email}' אינה כתובת מייל תקפה."
       email_already_used_in_group: "'%{email}' כבר בשימוש על ידי הקבוצה '%{group_name}'."
       email_already_used_in_category: "'%{email}' כבר בשימוש על ידי הקטגוריה '%{category_name}'."
+      cant_allow_membership_requests: "אינכם יכולים לאפשר בקשות חברות לקבוצה ללא בעלים."
     default_names:
       everyone: "כולם"
       admins: "מנהלים"
@@ -232,6 +234,9 @@ he:
       trust_level_2: "trust_level_2"
       trust_level_3: "trust_level_3"
       trust_level_4: "trust_level_4"
+    request_membership_pm:
+      title: "בקשת חברות עבור @%{group_name}"
+      body: "ארצה לבקש חברות ב-@%{group_name}."
   education:
     until_posts:
       one: "פוסט אחד"
@@ -358,7 +363,6 @@ he:
   staff_category_name: "צוות"
   staff_category_description: "קטגוריה פרטית לדיוני הצוות. נושאים נראים רק למנהלים ומנהלים ראשיים."
   assets_topic_title: "נכסים לעיצוב האתר"
-  assets_topic_body: "זהו נושא קבוע, הגלוי רק לצוות, לשמירת תמונות וקבצים שמשמשים לעיצוב האתר. אל תמחקו אותו!\n\n\nכיצד:\n\n\n1. הגיבו לנושא זה.\n2. העלו כאן את כל התמונות שברצונכם שישמשו כלוגואים, לוגואים מוקטנים (favicons) וכן הלאה. (השתמשו בלוגו ההעלאה בסרגל הכלים בעורך הפוסט, או גררו-שחררו או הדביקו את התמונות.)\n3. שלחו את התגובה כדי לפרסם אותה.\n4. הקליקו עם הכפתור הימני על התמונות בפרסום החדש שלכם כדי להשיג את הכתובת של התמונה שהועלתה, או הקליקו על סמל העריכה כדי לערוך את הפוסט ולאחזר את הכתובת של התמונות. העתיקו את הכתובות.\n5. הדביקו את כתובות התמונות אל תוך [הגדרות בסיסיות](/admin/site_settings/category/required).\n\nאם אתכם צריכים לאפשר העלאת קבצים מסוגים שונים, ערכו את \"הרחבות מאושרות\" בתוך [הגדרות_קובץ](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "ברוכים הבאים לדיסקורס"
     body: |2
@@ -641,7 +645,6 @@ he:
         remove: "נושא זה כבר אינו באנר. הוא לא יופיע יותר בראש כל עמוד."
   unsubscribed:
     title: "בוטל המנוי!"
-    description: "הוסרתם מהרשימות. כדי לשנות את אפשרויות המייל שלכם <a href='%{url}'>בקרו בהגדרות המשתמש שלכם</a>."
     topic_description: "כדי להרשם מחדש ל %{link}, השתמשו בהגדרות ההתראות בתחתית או משמאל לנושא."
   unsubscribe:
     title: "בטלו את המנוי"
@@ -852,6 +855,8 @@ he:
     search_tokenize_chinese_japanese_korean: "אלצו את החיפוש לנתח סינית/יפנית/קוריאנית גם באתרים שאינם בשפות אלו"
     search_prefer_recent_posts: "אם חיפוש בפורום הגדול שלכם איטי, אופציה זו מנסה לאנדקס קודם כל את הפוסטים החדשים יותר"
     search_recent_posts_size: "כמה פוסטים חדשים לשמור באינדקס"
+    log_search_queries: "רישום שאילתות חיפוש שמתבצעות על ידי משתמשים"
+    search_query_log_max_size: "מספר מקסימלי של שאילתות חיפוש לשימור"
     allow_uncategorized_topics: "הרשה לפתוח נושאים ללא קטגוריה. אזהרה: אם יש נושאים ללא קטגוריה, יש לסדר אותם לפני שמבטלים את האופציה. "
     allow_duplicate_topic_titles: "אשרו נושאים עם כותרות זהות או משוכפלות."
     unique_posts_mins: "כמה דקות לפני שמשתמש יכול לפרסם את אותו תוכן שוב"
@@ -919,7 +924,6 @@ he:
     notify_mods_when_user_blocked: "אם משתמש נחסם אוטומטית, שילחו הודעה לכל המנחים."
     flag_sockpuppets: "אם משתמשים חדשים מגיבים לנושא מכתובת IP זהה לזו של מי שהחל את הנושא, סמנו את הפוסטים של שניהם כספאם פוטנציאלי."
     traditional_markdown_linebreaks: "שימוש בשבירת שורות מסורתית בסימון, מה שדורש שני רווחים עוקבים למעבר שורה."
-    allow_html_tables: "אפשרו הכנסת טבלאות ב Markdown באמצעות תגיות HTML. התגיות TABLE, THEAD, TD, TR, TH יהיו ברשימה לבנה (מצריך אפייה מחדש של כל הפוסטים הישנים שכוללים טבלאות)"
     post_undo_action_window_mins: "מספר הדקות בהן מתאפשר למשתמשים לבטל פעולות אחרות בפוסט (לייק, סימון, וכו')."
     must_approve_users: "על הצוות לאשר את כל המשתמשים החדשים לפני שהם מקבלים גישה לאתר. אזהרה: בחירה זו עבור אתר קיים תשלול גישה ממשתמשים קיימים שאינם מנהלים."
     pending_users_reminder_delay: "הודיעו למנחים אם משתמשים חדשים ממתינים לאישור למעלה מכמות זו של שעות. קבעו ל -1 כדי לנטרל התראות."
@@ -933,6 +937,7 @@ he:
     allow_moderators_to_create_categories: "אפשרו למנחים ליצור קטגוריות חדשות"
     cors_origins: "מקורות שאפשר לבצע להם בקשות קרוס-דומיין (Cross origin requests). כל מקור צריך לכלול את התחילית http:// או https:// . משתנה הסביבה DISCOURCE_ENABLE_CORS חייב להיות true כדי לאפשר CORS."
     use_admin_ip_whitelist: "מנהלים יכולים להתחבר רק אם הכתובת שלהם מופיע ברשימת ה IPs המסוננים (ניהול > לוגים > כתובות IP מסוננות)."
+    blacklist_ip_blocks: "רשימת כתובות IP פרטיות שלא אמורים אף פעם לסרוק עם דיסקורס"
     top_menu: "החליטו אילו פריטים יופיעו בניווט עמוד הבית ובאיזה סדר לדוגמה |אחרונים|חדשים|קטגוריות|מובילים|נקראו|פורסמו|סימניות"
     post_menu: "החליטו אילו פריטים מופיעים בתפריט הפוסט, ובאיזה סדר. למשל like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "פריטי התפריט להסתרה כברירת מחדל בתפריט הפוסט, אלא אם כן נלחץ לחצן ההרחבה."
@@ -1060,6 +1065,7 @@ he:
     twitter_summary_large_image_url: "URL של תמונה מסיכום ברירת המחדל מטוויטר (צריכה להיות ברוחב לפחות 280 פיקסלים ובגובה של לפחות 150 פיקסלים)."
     allow_all_attachments_for_group_messages: "אפשרו צירוף קבצים להודעות לקבוצות."
     png_to_jpg_quality: "האיכות של קובץ JPG שמומר (1 הנמוכה ביותר, 99 הטובה ביותר, 100 לניטרול)."
+    allow_staff_to_upload_any_file_in_pm: "אפשרו לחברי צוות להעלות כל קובץ בהודעה פרטית."
     enable_flash_video_onebox: "אפשרו הטמעת קישורי swf ו-flv (פלאש של אדובי) ב Oneboxes. אזהרה: עלול להביא לבעיות אבטחה באתר."
     default_invitee_trust_level: "ברירת מחדל של רמת אמון (0-4) של משתמשים מוזמנים."
     default_trust_level: "רמת אמון (0-4) לכל המשתמשים החדשים. אזהרה! שינוי של משתנה זה שם אתכם בסיכון רציני לספאם."
@@ -1517,41 +1523,9 @@ he:
   invite_mailer:
     title: "שולח-מיילים להזמנה"
     subject_template: "הוזמנת על ידי %{invitee_name} ל '%{topic_title}' ב%{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} הזמין/ה אתכם לדיון
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      ב
-
-      > %{site_title} -- %{site_description}
-
-      אם אתם מעוניינים, לחצו על הקישור למטה:
-
-      %{invite_link}
   custom_invite_mailer:
     title: "שולח-מיילים מותאם-אישית להזמנה"
     subject_template: "%{invitee_name} הזמין/הזמינה אותך לדיון  '%{topic_title}' באתר %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} הזמין/ה אתכם לדיון
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      ב
-
-      > %{site_title} -- %{site_description}
-
-      עם הערה זו
-
-      > %{user_custom_message}
-
-      אם אתם מעוניינים, לחצו על הקישור למטה:
-
-      %{invite_link}
   invite_forum_mailer:
     title: "שולח-מיילים להזמנה לפורום"
     subject_template: "%{invitee_name} הזמינ/ה אתכם להצטרף ל%{site_domain_name}"
@@ -2059,12 +2033,6 @@ he:
     new_user_of_the_month:
       title: "אתם המשתמשים החדשים של החודש!"
       subject_template: "אתם המשתמשים החדשים של החודש!"
-      text_body_template: |
-        ברכות, זכיתם ב-**פרס המשתמש החדש של החודש עבור %{month_year}**. :trophy:
-
-        פרס זה ניתן רק לשני משתמשים חדשים בכל חודש, והוא תמיד ייראה ב[דף המשתמש/ת שלכם](/my/badges).
-
-        הפכתם במהרה לחברים מוערכים בקהילה שלנו. תודה שהצטרפתם, והמשיכו בעבודה הנהדרת!
   unsubscribe_link: |
     כדי להפסיק את המיילים האלו, [לחצו כאן](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2090,26 +2058,6 @@ he:
     visit_link_to_respond: "[בקרו בנושא](%{base_url}%{url}) כדי לענות."
     visit_link_to_respond_pm: "[בקרו בהודעה](%{base_url}%{url}) כדי לענות."
     posted_by: "פורסם על ידי %{username} ב %{post_date}"
-    invited_to_private_message_body: |
-      %{username} הזמין אותך להודעה
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      באתר
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} הזמין/הזמינה אותך לדיון
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      באתר
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "משתמש/ת הוזמן/ה להודעה פרטית"
       subject_template: "[%{email_prefix}] %{username} הזמין אותך להודעה '%{topic_title}'"
@@ -2257,7 +2205,6 @@ he:
       popular_posts: "פוסטים פופולאריים"
       more_new: "חדש בשבילכם"
       subject_template: "[%{email_prefix}] סיכום"
-      unsubscribe: "סיכום זה נשלח מ %{site_link} כאשר אנחנו לא רואים אתכם לאורך זמן. כדי לבטל את המנוי %{unsubscribe_link}."
       click_here: "לחצו כאן"
       from: "סיכום %{site_name}"
       preheader: "סיכום קצר מאז ביקורכם האחרון ב-%{last_seen_at}"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 6e31bb90830..24e8bfcb8c6 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -175,6 +175,7 @@ it:
   user_is_suspended: "Agli utenti sospesi non è permesso creare messaggi."
   topic_not_found: "Quancosa non ha funzionato. Forse questo argomento è stato chiuso o cancellato mentre lo leggevi."
   not_accepting_pms: "Spiacenti, %{username} non accetta messaggi al momento."
+  max_pm_recepients: "Spiacenti, puoi inviare un messaggio ad un massimo di %{recipients_limit} destinatari."
   just_posted_that: "è troppo simile a ciò che hai appena pubblicato"
   invalid_characters: "contiene caratteri non validi"
   is_invalid: "sembra poco chiaro, è una frase completa?"
@@ -222,6 +223,7 @@ it:
       invalid_incoming_email: "'%{email}' non è un indirizzo email valido."
       email_already_used_in_group: "L'indirizzo '%{email}' è stato già usato dal gruppo '%{group_name}'."
       email_already_used_in_category: "L'indirizzo '%{email}' è stato già usato dalla categoria '%{category_name}'."
+      cant_allow_membership_requests: "Non è possibile permettere le richieste di adesione in un gruppo senza proprietari."
     default_names:
       everyone: "chiunque"
       admins: "amministratori"
@@ -232,6 +234,9 @@ it:
       trust_level_2: "trust_level_2"
       trust_level_3: "trust_level_3"
       trust_level_4: "trust_level_4"
+    request_membership_pm:
+      title: "Richesta di Adesione per @%{group_name}"
+      body: "Vorrei fare domanda per l'iscrizione a @%{group_name}."
   education:
     until_posts:
       one: "1 messaggio"
@@ -353,6 +358,10 @@ it:
           attributes:
             execute_at:
               in_the_past: "deve essere in data futura."
+        translation_overrides:
+          attributes:
+            value:
+              missing_interpolation_keys: 'Le seguenti chiavi(e) di interpolazione sono mancanti: "%{keys}"'
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>il campo \"Su di me\" del tuo profilo è vuoto, <a href='/u/%{username_lower}/preferences/about-me'>vuoi compilarlo? </a></div>"
@@ -364,9 +373,23 @@ it:
   staff_category_name: "Staff"
   staff_category_description: "Categoria privata per discussioni dello staff. Gli argomenti sono visibili solo agli amministratori e ai moderatori."
   assets_topic_title: "Risorse per il design del sito"
-  assets_topic_body: "Questo è un argomento permanente, visibile solo allo staff, per salvare immagini e file utilizzati nel design del sito. Non eliminarlo!\n\n\nEcco come fare:\n\n\n1. Rispondi a questo argomento.\n2. Carica qui tutte le immagini che desideri usare per loghi, favicon e così via (usa l'icona di caricamento nell'editor del messaggio o trascina direttamente le immagini).\n3. Invia la risposta per creare il messaggio.\n4. Fai clic con il tasto destro sulle immagini nel tuo nuovo messaggio per prelevare il percorso delle immagini caricate, o clicca l'icona di modifica messaggio e ottieni il percorso alle immagini. Copia il percorso delle immagini.\n5. Incolla i percorsi nella sezione [impostazioni di base](/admin/site_settings/category/required).\n\nSe vuoi permettere di caricare file di diverso tipo, modifica `authorized_extensions` nelle [impostazioni file](/admin/site_settings/category/files)."
+  assets_topic_body: "Questo argomento, visibile solo allo staff, è per l'archiviazione di immagini e file utilizzati nel disegn del sito. Non eliminarlo!\n\n\nEcco come fare:\n\n\n1. Rispondi a questo argomento.\n2. Carica tutte le immagini che desideri utilizzare per loghi, favicon e così via. (Utilizza l'icona di caricamento nella barra degli strumenti sull'editor del messaggio, oppure trascina o incolla le immagini.)\n3. Invia la tua risposta per pubblicarla.\n4. Fai clic con il pulsante destro sulle immagini nel nuovo messaggio per ottenere il percorso delle immagini caricate oppure fai clic sull'icona di modifica per modificare il tuo messaggio e recuperare il percorso delle immagini. Copia i percorsi delle immagini.\n5. Incolla i percorsi delle immagini nelle [impostazioni di base](/admin/site_settings/category/required).\n\n\nSe è necessario abilitare il caricamento di file di tipo diverso, modifica `authorized_extensions` nelle [impostazioni dei file](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Benvenuto in Discourse"
+    body: |2
+
+      Il primo paragrafo di questo argomento puntato sarà visibile come messaggio di benvenuto a tutti i nuovi visitatori sulla tua homepage. È importante!
+
+      **Modificalo** con una breve descrizione della tua comunità:
+
+      - A chi è rivolto?
+      - Cosa possono trovare qui?
+      - Perchè dovrebbero venire qui?
+      - Dove possono leggere di più (collegamenti, risorse, ecc)?
+
+      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+      Puoi chiudere questo argomento tramite la :wrench: per amministratori (in alto a destra e in basso), in modo che le risposte non si accumulino all'annuncio.
   lounge_welcome:
     title: "Benvenuto nel Lounge"
     body: |2
@@ -634,7 +657,7 @@ it:
         remove: "Questo argomento non è più uno striscione. Non apparirà più in cima ad ogni pagina."
   unsubscribed:
     title: "Iscrizione annullata!"
-    description: "La tua iscrizione è stata annullata. Per cambiare le tue impostazioni email <a href='%{url}'>vai alle preferenze utente</a>."
+    description: "<b>%{email}</b> è stata annullata. Per cambiare le tue impostazioni email <a href='%{url}'>visita le tue preferenze utente</a>."
     topic_description: "Per re-iscriverti a %{link}, usa il controllo notifiche in fondo o a destra dell'argomento."
   unsubscribe:
     title: "Annulla iscrizione"
@@ -813,9 +836,14 @@ it:
     facebook_config_warning: 'Il server è configurato per accettare iscrizioni e login con Facebook (enable_facebook_logins), tuttavia i parametri app id e secret non sono stati impostati. Vai alle <a href="/admin/site_settings">Impostazioni</a> e aggiorna i campi interessati. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Leggi questa guida per saperne di più</a>.'
     twitter_config_warning: 'Il server è configurato per accettare iscrizioni e login con Twitter (enable_twitter_logins), tuttavia i parametri key e secret non sono stati impostati. Vai alle <a href="/admin/site_settings">Impostazioni</a> e aggiorna i campi interessati. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Leggi questa guida per saperne di più</a>.'
     github_config_warning: 'Il server è configurato per accettare iscrizioni e login con GitHub (enable_github_logins), tuttavia i parametri client id e secret non sono stati impostati. Vai alle <a href="/admin/site_settings">Impostazioni</a> e aggiorna i campi interessati. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Leggi questa guida per saperne di più</a>.'
+    s3_config_warning: 'Il server è configurato per caricare file su s3, ma almeno una delle seguenti impostazioni non è configurata: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, o s3_upload_bucket. Vai alle <a href="/admin/site_settings">Impostazioni del sito</a> e aggiorna le impostazioni. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Vedi "How to set up image uploads to S3?" per saperne di più</a>.'
+    s3_backup_config_warning: 'Il server è configurato per caricare file su s3, ma almeno una delle seguenti impostazioni non è configurata: s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, o s3_backup_bucket.  Vai alle <a href="/admin/site_settings">Impostazioni del sito</a> e aggiorna le impostazioni. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Vedi "How to set up image uploads to S3?" per saperne di più</a>.'
     image_magick_warning: 'Il server è configurato per creare miniature di immagini grandi, ma ImageMagick non è installato. Installa ImageMagick usando il tuo package manager preferito o <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">scarica la versione più recente</a>.'
     failing_emails_warning: 'Ci sono %{num_failed_jobs} job di email falliti. Controlla il file app.yml e assicurati che le impostazioni del mail server siano corrette. <a href="/sidekiq/retries" target="_blank">Vedi i job falliti in Sidekiq</a>.'
     subfolder_ends_in_slash: "L'impostazione della sottocartella è errata; DISCOURSE_RELATIVE_URL_ROOT finisce con uno slash."
+    email_polling_errored_recently:
+      one: "Il polling delle email ha generato un errore nelle ultime 24 ore. Controlla <a href='/logs' target='_blank'>i log</a> per maggiori dettagli."
+      other: "Il polling delle email ha generato %{count}errori nelle ultime 24 ore. Controlla <a href='/logs' target='_blank'>i log</a> per maggiori dettagli. "
     missing_mailgun_api_key: "Il server è configurato per inviare email via mailgun ma non sono state fornite le API key necessarie per verificare i messaggi webhook."
     bad_favicon_url: "La favicon non si carica. Verifica la configurazione della tua favicon_url in <a href='/admin/site_settings'>Impostazioni del sito</a>."
     poll_pop3_timeout: "La connessione al server POP3 sta scadendo. Le email in entrata non sono state scaricate. Per favore verifica il la tua  <a href='/admin/site_settings/category/email'>configurazione POP3</a> e il fornitore di servizi."
@@ -840,6 +868,7 @@ it:
     search_tokenize_chinese_japanese_korean: "Attiva la tokenizzazione dei caratteri Cinesi/Giapponesi/Coreani nella ricerca anche sui siti non CJK"
     search_prefer_recent_posts: "Se il tuo forum è corposo e la ricerca è lenta, questa opzione tenta di indicizzare prima i messaggi più recenti"
     search_recent_posts_size: "Quanti messaggi recenti mantenere nell'indice"
+    search_query_log_max_size: "Quantità massima di query di ricerca da mantenere"
     allow_uncategorized_topics: "Permetti la creazione di argomenti senza categoria. ATTENZIONE: se ci sono argomenti senza categoria, devi ricategorizzarli prima di disabilitare questa opzione."
     allow_duplicate_topic_titles: "Permetti più argomenti con lo stesso identico titolo"
     unique_posts_mins: "Quanti minuti prima che un utente possa inviare un altro argomento con lo stesso contenuto"
@@ -874,6 +903,7 @@ it:
     digest_logo_url: "Il logo alternativo usato in cima alla email di riepilogo. Dovrebbe essere a forma di un ampio rettangolo. Non dovrebbe essere un'immagine SVG. Se lasciato vuoto, sarà utilizzato il campo `logo_url`. "
     logo_small_url: "Il piccolo logo in alto a sinistra del tuo sito, dovrebbe essere a forma di quadrato. Se non impostato, verrà mostrata l'icona di una casa."
     favicon_url: "La favicon del tuo sito, vedi http://it.wikipedia.org/wiki/Favicon, per funzionare correttamente su una CDN deve essere una png"
+    mobile_logo_url: "L'immagine del logo a posizione fissa usata in alto a sinistra del sito mobile. Dovrebbe essere di forma quadrata. Se non impostato, verrà usato `logo_url`. Es: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Icona usata per dispositivi touch Apple. La dimensione consigliata è 144 x 144 pixel."
     notification_email: "L'indirizzo presente nel campo from: usato per inviare tutte le email essenziali di sistema. Il dominio indicato deve avere i record SPF, DKIM e reverse PTR impostati correttamente perché l'email arrivi."
     email_custom_headers: "Una lista di intestazioni email personalizzate delimitata da una barra verticale (pipe |)"
@@ -900,14 +930,16 @@ it:
     tl4_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 4 (Veterano), moltiplicando per questo numero"
     num_spam_flags_to_block_new_user: "Se i messaggi di un nuovo utente ricevono questo numero di segnalazioni spam da num_users_to_block_new_user diversi utenti, nascondi tutti i suoi messaggi ed impediscigli di crearne altri. 0 per disabilitare."
     num_users_to_block_new_user: "Se i messaggi di un nuovo utente ricevono num_flags_to_block_new_user segnalazioni di spam da così tanti utenti diversi, nascondi tutti i suoi messaggi e impediscigli ulteriori invii. 0 per disabilitare."
+    num_tl3_flags_to_block_new_user: "Se i messaggi di un nuovo utente ricevono questo numero di segnalazioni da num_tl3_users_to_block_new_user differenti utenti a livello di esperienza 3, nascondi tutti i messaggi e previenine la futura pubblicazione. 0 per disabilitare."
+    num_tl3_users_to_block_new_user: "Se i messaggi di un nuovo utente ricevono num_tl3_flags_to_block_new_user segnalazioni da questo numero di utenti a livello di esperienza 3, nascondi tutti i messaggi e previenine la futura pubblicazione. 0 per disabilitare."
     notify_mods_when_user_blocked: "Se un utente è bloccato automaticamente, manda un messaggio ai moderatori."
     flag_sockpuppets: "Se un nuovo utente risponde ad un argomento dallo stesso indirizzo IP dell'utente che ha aperto l'argomento stesso, segnala entrambi i messaggi come potenziale spam."
     traditional_markdown_linebreaks: "Usa l'accapo tradizionale in Markdown, cioè due spazi a fine riga per andare a capo."
-    allow_html_tables: "Consenti di inserire tabelle in Markdown usando tag HTML. I tag TABLE, THEAD, TD, TR, TH saranno consentiti (richiede un full rebake di tutti i vecchi messaggi contenenti tabelle)"
     post_undo_action_window_mins: "Numero di minuti durante i quali gli utenti possono annullare le loro azioni recenti su un messaggio (segnalazioni, Mi piace, ecc.)."
     must_approve_users: "Lo staff deve approvare tutti i nuovi account utente prima che essi possano accedere al sito. ATTENZIONE: abilitare l'opzione per un sito live revocherà l'accesso per tutti gli utenti non-staff esistenti!"
     pending_users_reminder_delay: "Notifica i moderatori se nuovi utenti sono in attesa di approvazione per più di queste ore. Imposta a -1 per disabilitare le notifiche."
     maximum_session_age: "L'utente resterà connesso per n ore dall'ultima visita"
+    ga_tracking_code: "OBSOLETO: codice di tracciamento di Google Analitycs (ga.js), es UA-12345678-9; vedi http://google.com/analytics"
     ga_domain_name: "OBSOLETO: nome del dominio Google analytics (ga.js), esempio: miosito.com; vedi http://google.com/analytics"
     ga_universal_tracking_code: "Codice di tracking Google Universal Analytics (analytics.js), es: UA-12345678-9; vedi http://google.com/analytics"
     ga_universal_domain_name: "Nome di dominio Google Universal Analytics (analytics.js), es: miosito.com; vedi http://google.com/analytics"
@@ -916,6 +948,8 @@ it:
     allow_moderators_to_create_categories: "Permetti ai moderatori di creare nuove categorie"
     cors_origins: "Origini permesse per richieste cross-origin (CORS). Ogni origine deve includere http:// o https://. La variabile d'ambiente DISCOURSE_ENABLE_CORS deve essere impostata come true per abilitare CORS."
     use_admin_ip_whitelist: "Gli amministratori possono connettersi soltanto se hanno un indirizzo IP definito nell'elenco degli IP scansionati (Amministrazione > Log > IP scansionati). "
+    blacklist_ip_blocks: "Un elenco di blocchi di IP privati che non dovrebbero mai essere scansionati da Discourse"
+    whitelist_internal_hosts: "Un elenco di host interni di cui Discourse può eseguire la scansione in modo sicuro per la funzione di onebox e altri scopi"
     top_menu: "Determina quali oggetti appaiono nella navigazione della pagina iniziale, e in quale ordine. Esempio latest|new|unread|categories|top|read|posted|bookmarks"
     post_menu: "Determina quali elementi vengono mostrati nel menu del messaggio, e in quale ordine. Esempio like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "Le voci di menu da nascondere per difetto nel menu di composizione del messaggio, a meno che non vengano premuti i punti di sospensione per espanderle."
@@ -947,9 +981,14 @@ it:
     force_hostname: "SOLO PER SVILUPPATORI! ATTENZIONE! Specifica un hostname nella URL. Lascia vuoto per usare il default."
     invite_expiry_days: "Per quanti giorni le chiavi per inviti utente sono valide"
     invite_passthrough_hours: "Per quanto tempo un utente può usare una chiave d'invito per connettersi, espresso in ore"
+    invite_only: "La registrazione pubblica è disabilitata, tutti i nuovi utenti devono essere esplicitamente invitati dallo staff."
     login_required: "E' richiesta l'autenticazione per leggere contenuti su questo sito, disabilita l'accesso anonimo."
+    min_username_length: "Lunghezza minima di un nome utente in caratteri. ATTENZIONE: se utenti o gruppi già esistenti hanno nomi più brevi di questo, il tuo sito si romperà!"
+    max_username_length: "Lunghezza massima di un nome utente in caratteri. ATTENZIONE: se utenti o gruppi già esistenti hanno nomi più lunghi di questo, il tuo sito si romperà!"
+    reserved_usernames: "Nomi utenti per i quali l'iscrizione non è consentita. Il simbolo del carattere jolly * può essere utilizzato per abbinare qualsiasi carattere zero o più volte."
     min_password_length: "Minima lunghezza della password."
     min_admin_password_length: "Lunghezza minima password Amministratore."
+    password_unique_characters: "Numero minimo di caratteri unici che una password deve avere."
     block_common_passwords: "Non permettere password che sono nelle 10.000 password più comuni."
     enable_sso: "Abilita il single sign on da sito esterno (ATTENZIONE: L'INDIRIZZO EMAIL DEGLI UTENTI *DEVE* ESSERE VALIDATO DAL SITO ESTERNO!)"
     verbose_sso_logging: "Log verboso per diagnostica relativa SSO in /logs"
@@ -1009,6 +1048,8 @@ it:
     max_private_messages_per_day: "Numero massimo di messaggi che gli utenti possono creare al giorno."
     max_invites_per_day: "Numero massimo di inviti che un utente può inviare in un giorno."
     max_topic_invitations_per_day: "Numero massimo di inviti ad argomenti che un utente può inviare al giorno."
+    max_logins_per_ip_per_hour: "Numero massimo di accessi consentiti per indirizzo Ip per ora"
+    max_logins_per_ip_per_minute: "Numero massimo di accessi consentiti per indirizzo IP per minuto"
     alert_admins_if_errors_per_minute: "Soglia di errori al minuto che scatena un allarme agli amministratori. Un valore pari a 0 disabilita questa caratteristica. NOTA: richiede un riavvio."
     alert_admins_if_errors_per_hour: "Soglia di errori all'ora che scatena un allarme agli amministratori. Un valore pari a 0 disabilita questa caratteristica. NOTA: richiede un riavvio."
     categories_topics: "Numero di argomenti da mostrare nella pagina /categorie."
@@ -1025,10 +1066,15 @@ it:
     s3_access_key_id: "La access key id Amazon S3 che verrà usata per caricare le immagini."
     s3_secret_access_key: "La access key secret Amazon S3 che verrà usata per caricare le immagini."
     s3_region: "La region name Amazon S3 che verrà usata per caricare le immagini."
+    s3_cdn_url: "URL della CDN da usare per tutte le risorse s3 (ad esempio: https://cdn.somewhere.com). ATTENZIONE: dopo aver cambiato questa impostazione devi aggiornare tutti i vecchi messaggi."
     avatar_sizes: "Elenco delle dimensioni degli avatar, generate automaticamente."
     external_system_avatars_enabled: "Utilizza un servizio esterno per gli avatar."
     external_system_avatars_url: "URL del servizio esterno di avatar. Le sostituzioni consentite sono {username} {first_letter} {color} {size}"
     default_opengraph_image_url: "URL dell'immagine di default opengraph."
+    twitter_summary_large_image_url: "URL dell'immagine di default della scheda di riepilogo di Twitter (dovrebbe essere almeno 280px in larghezza e almeno 150px in altezza)."
+    allow_all_attachments_for_group_messages: "Consenti tutti gli allegati sulle email per i messaggi di gruppo."
+    png_to_jpg_quality: "Qualità del file JPG convertito (1 è la qualità più bassa, 99 è la qualità migliore, 100 per disabilitare)."
+    allow_staff_to_upload_any_file_in_pm: "Consenti ai membri delle staff di caricare qualsiasi file nei PM."
     enable_flash_video_onebox: "Attiva l'inserimento di collegamenti swf e flv (Adobe Flash) in onebox. ATTENZIONE: comporta rischi per la sicurezza."
     default_invitee_trust_level: "Livello di esperienza (0-4) assegnato di default agli utenti invitati."
     default_trust_level: "Livello di esperienza (da 0 a 4) assegnato ai nuovi utenti. ATTENZIONE! Modificare questa opzione ti espone ad un serio rischio di ricevere posta indesiderata."
@@ -1042,9 +1088,19 @@ it:
     tl2_requires_likes_received: "Quanti \"Mi piace\" deve ricevere un utente per essere promosso al livello di esperienza 2."
     tl2_requires_likes_given: "Quanti \"Mi piace\" deve dare un utente per essere promosso al livello di esperienza 2."
     tl2_requires_topic_reply_count: "A quanti argomenti deve rispondere un utente per essere promosso al livello di esperienza 2."
+    tl3_time_period: "Periodo di tempo per i requisiti di livello di esperienza 3 (in giorni)"
+    tl3_requires_days_visited: "Numero minimo di giorni in cui un utente deve aver visitato il sito nell'ultimo periodo (tl3 time period) per qualificarsi per la promozione a livello di esperienza 3. Impostare un periodo di tempo superiore a quello di tl3 per disabilitare le promozioni a tl3. (0 o superiore)"
+    tl3_requires_topics_replied_to: "Numero minimo di argomenti creati negli ultimi (tl3 time period) giorni a cui un utente deve aver risposto per qualificarsi per la promozione a livello di esperienza 3. (0 o superiore)"
+    tl3_requires_topics_viewed: "La percentuale di argomenti creati negli ultimi (tl3 time period) giorni che un utente deve aver visitato per qualificarsi per la promozione a livello di esperienza 3. (da 0 a 100)"
+    tl3_requires_topics_viewed_cap: "Numero massimo obbligatorio di argomenti visitati negli ultimi (tl3 time period) giorni."
+    tl3_requires_posts_read: "La percentuale dei messaggi creati negli ultimi (tl3 time period) giorni che un utente deve aver visitato per qualificarsi per la promozione a livello di esperienza 3. (da 0 a 100)"
+    tl3_requires_posts_read_cap: "Numero massimo obbligatorio di messaggi letti negli ultimi (tl3 time period) giorni."
     tl3_requires_topics_viewed_all_time: "Il numero minimo di argomenti che un utente deve aver letto per poter accedere al livello di esperienza 3."
     tl3_requires_posts_read_all_time: "Il numero minimo di messaggi che un utente deve aver letto per poter accedere al livello di esperienza 3."
+    tl3_requires_max_flagged: "L'utente non deve avere più di x messaggi segnalti da x utenti differenti negli ultimi (tl3 time period) giorni per qualificarsi per la promozione a livello di esperienza 3, dove x è il valore impostato. (0 o superiore)"
     tl3_promotion_min_duration: "Per quanti giorni al minimo mantenere la promozione al livello di esperienza 3 prima che un utente venga degradato al livello di esperienza 2."
+    tl3_requires_likes_given: "Numero minimo di mi piace che devono essere dati negli ultimi (tl3 time period) giorni per qualificarsi per la promozione a livello di esperienza 3."
+    tl3_requires_likes_received: "Numero minimo di mi piace che devono essere ricevuti negli ultimi (tl3 time period) giorni per qualificarsi per la promozione a livello di esperienza 3."
     tl3_links_no_follow: "Non rimuovere rel=nofollow dai collegamenti pubblicati da utenti con livello di esperienza 3."
     min_trust_to_create_topic: "Livello minimo richiesto per creare un nuovo argomento."
     min_trust_to_edit_wiki_post: "Livello minimo richiesto per modificare un argomento segnato come wiki."
@@ -1076,6 +1132,7 @@ it:
     max_image_size_kb: "Dimensione massima in kB per caricare immagini degli utenti. Deve essere configurata anche in nginx (client_max_body_size) / apache o nel proxy."
     max_attachment_size_kb: "Dimensione massima dei file che gli utenti possono caricare, in kB. Configura il limite anche in nginx (client_max_body_size) / apache o nel proxy."
     authorized_extensions: "Una lista di estensioni dei file che è permesso caricare (usa '*' per permettere tutti i tipi di file) "
+    theme_authorized_extensions: "Una lista di estensioni dei file permessi per i caricamenti dei temi (usa '*' per abilitare tutti i tipi di file)"
     max_similar_results: "Quanti argomenti simili mostrare sopra l'editor quando si scrive un nuovo argomento. Il paragone viene fatto sul titolo e sul corpo."
     max_image_megapixels: "Massimo numero di megapixel consentito per un'immagine."
     title_prettify: "Evita refusi ed errori comuni nei titoli, incluso il testo tutto maiuscolo, il primo carattere minuscolo, troppi caratteri ! e ?, puntini aggiuntivi alla fine della parola ecc."
@@ -1094,19 +1151,43 @@ it:
     faq_url: "Se vuoi usare un documento sulle FAQ ospitato da qualche altra parte, fornisci qui la sua URL completa."
     tos_url: "Se vuoi usare un documento dei Termini di Servizio ospitato da qualche altra parte, fornisci qui la sua URL completa."
     privacy_policy_url: "Se vuoi usare un documento sulle Politiche di Privacy ospitato da qualche altra parte, fornisci qui la sua URL completa."
+    newuser_spam_host_threshold: "Quante volte un nuovo utente può pubblicare un collegamento allo stesso host all'interno dei messaggi `newuser_spam_host_threshold` prima di essere considerato spam."
     white_listed_spam_host_domains: "Una lista di domini esclusi dal controllo antispam. Ai nuovi utenti non verrà mai impedito di creare messaggi con collegamenti a tali domini."
     staff_like_weight: "Peso extra attribuito ai \"mi piace\" dati dallo staff."
+    topic_view_duration_hours: "Conteggia una nuova visita dell'argomento una volta per IP/Utente ogni N ore"
+    user_profile_view_duration_hours: "Conteggia una nuova visita del profilo utente una volta per IP/Utente ogni N ore"
     levenshtein_distance_spammer_emails: "Quanti caratteri di differenza faranno comunque scattare una corrispondenza approssimativa nell'analisi delle email di spam. "
     max_new_accounts_per_registration_ip: "Se vi sono già (n) account con livello di esperienza 0 da questo IP (e nessuno è membro dello staff o TL2 o superiore), non accettare nuove iscrizioni utente da questo IP."
     num_flaggers_to_close_topic: "Il numero minimo di segnalatori univoci richiesto affinché un argomento venga messo in pausa fino all'intervento di un moderatore"
     num_flags_to_close_topic: "Il numero minimo di segnalazioni attive richiesto affinché un argomento venga messo in pausa fino all'intervento di un moderatore"
+    num_hours_to_close_topic: "Numero di ore per mettere in pausa un argomento in attesa dell'intervento di un moderatore."
+    min_first_post_typing_time: "Quantità minima di tempo in millisecondi che un utente deve impiegare per la digitazione del  primo messaggio, se non viene raggiunta la soglia il messaggio verrà automaticamente inserito nella coda dei messaggi da approvare. Impostare su 0 per disabilitare (non consigliato)"
+    auto_block_fast_typers_on_first_post: "Blocca automaticamente gli utenti che non soddisfano min_first_post_typing_time"
+    auto_block_fast_typers_max_trust_level: "Livello di esperienza massimo per bloccare automaticamente i digitatori veloci"
     reply_by_email_enabled: "Abilita la possibilità di rispondere ai messaggi tramite email."
     reply_by_email_address: "Modello per rispondere via email, per esempio: %{reply_key}@risposta.esempio.com o risposte+%{reply_key}@esempio.com"
+    incoming_email_prefer_html: "Usa l'HTML invece del testo per le email in arrivo."
     disable_emails: "Evita che Discourse invii qualunque tipo di email"
     strip_images_from_short_emails: "Elimina le immagini dalle email aventi dimensione inferiore a 2800 Byte."
     short_email_length: "Lunghezza delle email brevi in Byte"
+    unsubscribe_via_email: "Consenti agli utenti di annullare la sottoscrizione alle email inviando una email con 'unsubscribe' nell'oggetto o nel corpo"
+    delete_email_logs_after_days: "Elimina i log delle email dopo (N) giorni. 0 per mantenerli indefinitamente"
+    max_emails_per_day_per_user: "Numero massimo di email da inviare agli utenti per giorno. 0 per disabilitare il limite"
+    enable_staged_users: "Crea automaticamente utenti temporanei quando si elaborano le email in arrivo."
+    maximum_staged_users_per_email: "Numero massimo di utenti temporanei creati quando si elaborano le email in arrivo."
+    auto_generated_whitelist: "Lista degli indirizzi email che non verranno verificati per i contenuti generati automaticamente. Esempio: foo@bar.com|discourse@bar.com"
+    block_auto_generated_emails: "Bloccare le email in arrivo identificate come generate automaticamente."
+    ignore_by_title: "Ignora le email in arrivo in base al loro titolo."
+    mailgun_api_key: "Chiave API Segreta di Mailgun usata per verificare i messaggi webhook. "
+    attachment_content_type_blacklist: "Elenco delle parole chiave utilizzate per mettere in blacklist gli allegati in base al tipo di contenuto."
+    attachment_filename_blacklist: "Elenco delle parole chiave utilizzate per mettere in blacklist gli allegati in base al nome del file."
+    enable_forwarded_emails: "[BETA] Consenti agli utenti di creare un argomento inviando una email."
+    always_show_trimmed_content: "Mostra sempre la parte tagliata delle email in arrivo. ATTENZIONE: potrebbe rivelare indirizzi email."
+    private_email: "Non includere contenuti da messaggi o argomenti nelle email per una maggiore privacy."
     pop3_polling_enabled: "Cerca le risposte via email tramite POP3."
     pop3_polling_ssl: "Usa SSL per la connessione al server POP3 (raccomandato)."
+    pop3_polling_openssl_verify: "Verifica del certificato TLS del server (Default: abilitato)"
+    pop3_polling_period_mins: "Il periodo in minuti tra il controllo dell'account POP3 per l'email. NOTA: richiede il riavvio."
     pop3_polling_port: "La porta dell'account POP3."
     pop3_polling_host: "L'host a cui collegarsi per ricevere email via POP3."
     pop3_polling_username: "Il nome utente dell'account POP3 per la ricezione di email."
@@ -1115,6 +1196,8 @@ it:
     email_in: "Permetti agli utenti di pubblicare nuovi argomenti per email (richiede il pop3 polling). Configura gli indirizzi nella scheda \"Impostazioni\" di ciascuna categoria."
     email_in_min_trust: "Livello di esperienza minimo necessario affinché un utente possa pubblicare nuovi argomenti via email."
     email_prefix: "La [etichetta] utilizzata nell'oggetto delle email. Se non impostata sarà 'titolo'."
+    email_site_title: "Il titolo del sito utilizzato come mittente delle email dal sito. Impostazione di default a 'titolo' se non impostata. Se il tuo 'titolo' contiene caratteri non consentiti nelle stringhe del mittente email, utilizza questa impostazione."
+    find_related_post_with_key: "Utilizza solo la chiave di risposta per trovare il messaggio inviato. (Consigliato se si utilizza Amazon SES)"
     relative_date_duration: "Dopo quanti giorni dalla pubblicazione le date verranno mostrate in termini relativi (7g) anziché assoluti (20 feb)."
     delete_user_max_post_age: "Non permettere di cancellare utenti il cui primo messaggio è più vecchio di (x) giorni."
     delete_all_posts_max: "Numero massimo di messaggi che possono essere eliminati contemporaneamente con il pulsante Cancella Tutti. Se un utente ha un numero maggiore di tali messaggi, questi non possono essere eliminati contemporaneamente e l'utente non può essere cancellato."
@@ -1125,22 +1208,85 @@ it:
     allow_animated_thumbnails: "Genera miniature animate delle gif animate."
     default_avatars: "URL degli avatar che verranno utilizzati come predefiniti per i nuovi utenti, fintanto che non li cambieranno esplicitamente."
     automatically_download_gravatars: "Scarica i Gravatars per gli utenti quando viene creato l'account o quando viene modificata l'email"
+    digest_topics: "Numero massimo di argomenti di successo da mostrare nell'email riepilogativa."
+    digest_posts: "Numero massimo dei messaggi di successo da mostrare nell'email riepilogativa."
+    digest_min_excerpt_length: "Lunghezza minima dell'estratto del messaggio nell'email riepilogativa, in caratteri."
+    suppress_digest_email_after_days: "Sopprimi le email di riepilogo per gli utenti che non visitano il sito per più di (n) giorni."
+    digest_suppress_categories: "Sopprimi queste categorie dalle email riepilogative."
+    disable_digest_emails: "Disabilita le email riepilogative per tutti gli utenti."
+    email_accent_bg_color: "Colore da usare come background per alcuni elementi delle email HTML. Inserire il nome di un colore ('red') o un valore esadecimale ('#FF000')."
+    email_link_color: "Colore dei collegamenti nelle email HTML. Inserire il nome di un colore ('blue') o un valore esadecimale ('#0000FF')."
+    max_daily_gravatar_crawls: "Numero massimo di volte al giorno in cui Discourse controllerà Gravatar per gli avatar personalizzati"
+    public_user_custom_fields: "Una whitelist di campi personalizzati di un utente che possono essere mostrati pubblicamente."
+    staff_user_custom_fields: "Una whitelist di campi personalizzati di un utente che possono essere mostrati allo staff."
+    enable_user_directory: "Fornire una directory degli utenti per la navigazione"
+    enable_group_directory: "Fornire una directory dei gruppi per la navigazione"
+    allow_anonymous_posting: "Permetti agli utenti di passare alla modalità anonima"
+    anonymous_posting_min_trust_level: "Livello di esperienza minimo richiesto per abilitare la pubblicazione in modalità anonima"
+    hide_user_profiles_from_public: "Disabilita schede utenti, profili utenti e directory utenti per gli utenti anonimi."
     allow_profile_backgrounds: "Permetti agli utenti di caricare immagini di sfondo per il profilo."
+    sequential_replies_threshold: "Numero di messaggi che un utente deve pubblicare di fila in un argomento prima che gli venga ricordato delle troppe risposte sequenziali."
+    get_a_room_threshold: "Numero di messaggi che un utente deve inviare alla stessa persona nello stesso argomento prima di essere avvertito."
     enable_mobile_theme: "I dispositivi mobili usano un tema apposito, con possibilità di passare alla visualizzazione completa. Disabilita questa opzione se vuoi usare un foglio di stile personalizzato che sia completamente reattivo."
+    dominating_topic_minimum_percent: "Quale percentuale di messaggi un utente deve pubblicare in un argomento prima di essere avvertito che sta eccessivamente dominando l'argomento."
+    disable_avatar_education_message: "Disabilita il messaggio educativo per cambiare avatar"
     suppress_uncategorized_badge: "Non mostrare il distintivo per gli argomenti senza categoria nell'elenco degli argomenti."
     global_notice: "Mostra a tutti i visitatori un avviso con striscione globale URGENTE, EMERGENZA, lascia vuoto per nasconderlo (HTML consentito)."
+    disable_edit_notifications: "Disabilita le notifiche di modifica dall'utente system quando 'download_remote_images_to_local' è attivo."
+    automatically_unpin_topics: " Spunta automaticamente gli argomenti quando l'utente arriva in fondo. "
+    read_time_word_count: "Conteggio di parole al minuto per calcolare il tempo stimato di lettura."
+    native_app_install_banner: "Domanda ai visitatori ricorrenti di installare l'app nativa di Discourse."
+    share_anonymized_statistics: "Condividi statistiche anonime di utilizzo."
     full_name_required: "Il nome completo è un campo obbligatorio del profilo utente."
+    enable_names: "Mostra il nome completo dell'utente su profilo, scheda utente e email. Disabilita per nascondere il nome completo ovunque."
+    display_name_on_posts: "Mostra il nome completo dell'utente sui messaggi oltre allo @username."
     short_progress_text_threshold: "Quando il numero di messaggi di un argomento supera questo valore, la barra di avanzamento mostrerà solo il numero di messaggi attuale. Se modifichi l'ampiezza della barra di avanzamento, potresti dover cambiare questo valore."
     default_code_lang: "Ai blocchi di codice GitHub viene applicata l'evidenziazione della sintassi del linguaggio di programmazione di default (lang-auto, ruby, python ecc.)"
+    warn_reviving_old_topic_age: "Quando qualcuno inizia a rispondere ad un argomento in cui l'ultima risposta è più vecchia di tale numero di giorni, verrà visualizzato un avviso. Disabilita impostando su 0."
+    autohighlight_all_code: "Forza l'evidenziazione della sintassi del codice nei blocchi di testo preformattato, anche se non è stato specificato il linguaggio di programmazione. "
+    highlighted_languages: "Regole di evidenziazione della sintassi incluse. (Avviso: includere troppe lingue può influire sulle prestazioni) vedi: https://highlightjs.org/static/demo/ per una dimostrazione"
     embed_by_username: "Nome utente Discourse dell'utente che crea gli argomenti incorporati."
     embed_truncate: "Tronca i messaggi incorporati."
+    allowed_href_schemes: "Schemi consentiti nei collegamenti in aggiunta a http e https."
     embed_post_limit: "Numero massimo di messaggi da incorporare."
+    embed_username_required: "E' richiesto il nome utente per la creazione di argomenti."
+    embed_whitelist_selector: "Selettore CSS per gli elementi da permettere negli embed."
+    embed_blacklist_selector: "Selettore CSS per gli elementi che sono rimossi dagli embed."
+    notify_about_flags_after: "Se ci sono segnalazioni che non sono state revisionate dopo un tale numero di ore, invia un messaggio privato allo staff. Imposta a 0 per disattivare. "
     show_create_topics_notice: "Se il sito ha meno di 5 argomenti pubblici, mostra un avviso chiedendo agli amministratori di creare qualche argomento."
+    delete_drafts_older_than_n_days: Elimina bozze più vecchie di (n) giorni.
+    bootstrap_mode_min_users: "Numero minimo di utenti richiesto per disabilitare la modalità bootstrap (imposta a 0 per disattivare)"
+    prevent_anons_from_downloading_files: "Impedire agli utenti anonimi di scaricare gli allegati. ATTENZIONE: questo impedirà a qualsiasi risorsa del sito pubblicata come allegato di funzionare ad eccezione delle immagini."
     enable_emoji: "Attiva gli emoji"
+    enforce_square_emoji: "Forza tutte le emoji ad un aspetto di proporzioni quadrate."
+    approve_post_count: "La quantità di messaggi di un utente nuovo o di base che deve essere approvata"
+    approve_unless_trust_level: "I messaggi degli utenti al di sotto di questo livello di esperienza devono essere approvati"
+    approve_new_topics_unless_trust_level: "I nuovi argomenti degli utenti al di sotto di questo livello di esperienza devono essere approvati"
+    notify_about_queued_posts_after: "Se ci sono messaggi che devono essere revisionati dopo un tale numero di ore, una email verrà inviata a contact_email. Imposta a 0 per disattivare queste email."
+    auto_close_messages_post_count: "Numero massimo di messaggi consentiti in un messaggio privato prima di essere automaticamente chiuso (0 per disabilitare)"
+    auto_close_topics_post_count: "Numero massimo di messaggi consentiti in un argomento prima di essere automaticamente chiuso (0 per disabilitare)"
+    max_allowed_message_recipients: "Numero massimo di destinatari consentiti in un messaggio privato."
+    default_email_digest_frequency: "Con quale frequenza gli utenti ricevono email riepilogative di default."
+    default_email_private_messages: " Invia una email quando qualcuno scrive un messaggio ad un utente di default."
+    default_email_direct: "Invia una email quando qualcuno cita/risponde/menziona un utente di default."
+    default_email_mailing_list_mode: "Invia una email per ogni nuovo messaggio di default."
+    default_email_mailing_list_mode_frequency: "Con quale frequenza gli utenti che hanno attivato la modalità mailing list riceveranno email di default."
+    disable_mailing_list_mode: "Impedisci agli utenti di attivare la modalità mailing list."
+    default_email_always: "Invia una notifica via email anche quando l'utente è attivo di default."
+    default_email_previous_replies: "Includi risposte precedenti nelle email di default."
+    default_email_in_reply_to: "Includi un estratto della risposta ad un messaggio nelle email di default."
+    default_other_new_topic_duration_minutes: "Condizione globale predefinita per cui un argomento viene considerato nuovo."
+    default_other_auto_track_topics_after_msecs: "Tempo globale predefinito prima che un argomento venga automaticamente seguito."
+    default_other_notification_level_when_replying: "Livello di notifica globale predefinito quando un utente risponde ad un argomento."
+    default_other_external_links_in_new_tab: "Apri i collegamenti esterni in una nuova scheda di default. "
+    default_other_enable_quoting: "Attiva rispondi citando per il testo evidenziato di default."
     default_other_disable_jump_reply: "Per default non saltare al messaggio dell'utente dopo la sua risposta."
     default_categories_watching: "Elenco di categorie osservate per default."
     default_categories_tracking: "Elenco di categorie seguite per default."
     default_categories_muted: "Elenco di categorie silenziate per default."
+    max_user_api_reqs_per_day: "Numero massimo di richieste giornaliere per la chiave API utente "
+    max_user_api_reqs_per_minute: "Numero massimo di richieste al minuto per la chiave API utente"
+    max_api_keys_per_user: "Numero massimo di chiavi API utente per utente"
     tagging_enabled: "Abilitare le etichette per gli argomenti?"
     min_trust_to_create_tag: "Il livello di esperienza minimo per creare un'etichetta."
     max_tags_per_topic: "Il numero massimo di etichette che si possono applicare ad un argomento."
@@ -1473,9 +1619,12 @@ it:
         %{message}
     digest:
       why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}"
-      unsubscribe: "Questo riepilogo viene inviato da %{site_link} se non ti si vede da un po'. Per annullare l'iscrizione %{unsubscribe_link}."
+      liked_received: "Like ricevuti"
+      new_users: "Nuovi utenti"
+      follow_topic: "Segui questo topic"
       click_here: "clicca qui"
       from: "%{site_name} riepilogo"
+      preheader: "Un breve riepilogo dall'ultima tua visita il %{last_seen_at}"
     signup_after_approval:
       subject_template: "Sei stato ammesso su %{site_name}!"
   page_not_found:
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 622638af6e8..2c9cb4eabd8 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -14,6 +14,8 @@ ja:
     formats:
       short: "%Y-%d-%m"
       short_no_year: "%B %-d"
+      date_only: "%B%-d、%Y"
+      long: "%B%-d、%Y、%I:%M%P"
   date:
     month_names: [null, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
     <<: *datetime_formats
@@ -29,8 +31,13 @@ ja:
   purge_reason: "放棄されていたため自動的に削除、アカウントを停止しました。"
   disable_remote_images_download_reason: "ディスク容量が不足しているため、リモートでの画像ダウンロードは無効になっています。"
   anonymous: "匿名"
+  remove_posts_deleted_by_author: "著者によって削除されました。"
+  themes:
+    bad_color_scheme: "テーマを更新できないなら、カラースキームを無効にしてください。"
+    other_error: "サーバーに不具合があるので、テーマを更新してください。"
   emails:
     incoming:
+      default_subject: "このトピックはタイトルが必要です。"
       show_trimmed_content: "続きを読む"
   errors: &errors
     format: '%{attribute} %{message}'
@@ -198,7 +205,6 @@ ja:
   meta_category_description: "Discussion about this site, its organization, how it works, and how we can improve it."
   staff_category_name: "スタッフ"
   staff_category_description: "スタッフのためのプライベートカテゴリです。トピックは管理者とモデレータのみが閲覧できます"
-  assets_topic_body: "これはパーマネントトピックです。スタッフのみが閲覧でき、サイトデザインに使用する画像とファイルを保存するために使用します。削除しないでください！\n\n利用方法:\n\n\n1. このトピックに回答\n2. ロゴやファビコンなどに使用する全ての画像をアップロード(エディタのアップロードアイコンか、ドラッグアンドドロップで画像を貼付ける)\n3. 回答を投稿\n4. 新しい投稿の画像を右クリックしてアップロード済み画像のパスを取得するか、編集アイコンをクリックして画像のパスを探し、画像パスをコピーする\n5. 画像パスを[基本設定](/admin/site_settings/category/required)に貼付ける\n\nもし、別のファイルタイプが必要な場合、[ファイル設定](/admin/site_settings/category/files)の`サポートするファイルの拡張` を編集してください"
   lounge_welcome:
     title: "ラウンジへようこそ"
     body: |2
@@ -946,6 +952,7 @@ ja:
     deferred: "伝えてくれてありがとうございます。調査しています"
     deferred_and_deleted: "伝えてくれてありがとうございます。投稿を削除しました"
   system_messages:
+    contents_hidden: "内容を確認するためにその投稿を訪問して下さい。"
     welcome_user:
       subject_template: "%{site_name} へようこそ!"
     welcome_invite:
@@ -994,7 +1001,6 @@ ja:
     posted_by: "%{post_date} に %{username} が投稿"
     digest:
       why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです"
-      unsubscribe: "このお知らせは%{site_link}から送信されました。購読を解除したい場合は%{unsubscribe_link}してください。"
       click_here: "ここをクリック"
     signup_after_approval:
       subject_template: "%{site_name} への参加承認完了!"
@@ -1140,19 +1146,53 @@ ja:
     editor:
       name: 編集者
       description: はじめて投稿を編集する
+      long_description: |
+        このバッジは自分自身の投稿を初回編集した際に授与されます。永久的に編集しないとしても編集は良いアイデアです。-自分自身の投稿を改良したり、細部の間違いを修正したり、何か初期投稿をミスしたときにも内容を追加できます。編集はあなたの投稿をこれまでより良いものにします!
+    basic_user:
+      long_description: |
+        このバッジは信用レベルが1に達した時に授与されます。サイトに出入りして下さったり、我々のコミュニティがどういうものなのかを学ぶためにトピックに目を通して下さり有難うございます。あなたのユーザー条件は次の通りです;全ての必要なコミュニティ要素が許可されました。個人メッセージ、フラグ付け、wiki編集、および複数の画像とリンクの投稿
+    regular:
+      long_description: |
+        このバッジは信用レベルが3に達した時に授与されます。
+        あなたは今最もアクティブな読者の一人であり、我々のコミュニティを素晴らしいものに変えてくれる信用できる貢献者です。カテゴライズしなおしたり、トピック名を付け替えたり、スパムフラグを利用したり、プライベートラウンジエリアにアクセスしたりすることができ、日ごとにいいねが増えるでしょう。
+    welcome:
+      long_description: |
+        このバッジは投稿に対して初めていいね!された時に授与されます。おめでとうございます、投稿した内容についてあなたのコミュニティメンバーは興味深く、クールで有能です!
     autobiographer:
       name: あなたはだれ？
       description: <a href="/my/preferences">プロフィール</a>をすべて書く
+      long_description: |
+        このバッジは<a href="/my/preferences">ご自身のユーザープロフィール</a>を記入またはプロフィール写真を選択すると授与されます。コミュニティに対してあなたがどういう人物であるか、また改善について興味がある物をもう少し詳しくお知らせ頂き、更に結びつきのあるコミュニティへ。連携しましょう!
+    anniversary:
+      long_description: |
+        このバッジは一年間メンバーで有り続け、少なくともその年に一回は投稿したときに授与されます。サイトに出入りして下さったり、我々のコミュニティに貢献して下さり有難うございます。我々はあなたを必要としています。
     nice_post:
       name: ナイスな返事
+      long_description: |
+        このバッジはあなたの返信が10回いいね!されたときに授与されます。あなたの返信はコミュニティにとってとても印象深く、会話を促進することに役立っています!
     good_post:
       name: イカす返事
+      long_description: |
+        このバッジはあなたが25回いいね!されたときに授与されます。あなたの返答は特別で参加者のために会話をよりよいものに変えてくれました!
     great_post:
       name: 素晴らしい返事
+      long_description: |
+        このバッジは50回いいね!されたときに授与されます。素晴らしい!あなたの返答は心をつかみ、魅力的で、とても陽気で、洞察力がありそしてコミュニティをとても大切にされていました。
     nice_topic:
       name: ナイスなトピック
+      long_description: |
+        このバッジはあなたのトピックが10回いいね!されたときに授与されます。あなたはコミュニティが楽しめるような興味深い会話を開始しました!
     good_topic:
       name: イカすトピック
+    nice_share:
+      long_description: |
+        このバッジは共有リンクが25人のサイト訪問者からクリックされた時に授与されます。我々のディスカッションとこのコミュニティについて展開して下さり有難うございます!
+    good_share:
+      long_description: |
+        このバッジは共有リンクが300人のサイト訪問者からクリックされた時に授与されます。素晴らしい出来です!素晴らしいディスカッションで注目を集め、コミュニティの成長を助けてくれました。
+    great_share:
+      long_description: |
+        このバッジは共有リンクが1000人のサイト訪問者からクリックされた時に授与されます。恐るべし数です!莫大な人数への興味深い討論であなたは昇格しました、そして大胆な手法で我々のコミュニティの成長を助けてくれました!
     first_flag:
       name: はじめの通報
       description: 通報した投稿
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index f6b923eb703..2805b2b9ac3 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -15,34 +15,58 @@ ko:
       short: "%Y-%m-%d"
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
+      long: "%B %-d, %Y, %l:%M%P"
   date:
-    month_names: []
+    month_names: [null, 1월, 2월, 3월, 4월, 5월, 6월, 7월, 8월, 9월, 10월, 11월, 12월]
     <<: *datetime_formats
   time:
     am: "오전"
     pm: "오후"
     <<: *datetime_formats
   title: "Discourse"
-  topics: "글타래"
-  posts: "글"
+  topics: "토픽"
+  posts: "포스트"
   loading: "로딩중"
+  powered_by_html: '<a href="https://www.discourse.org">Discourse</a> 으로 호스팅되고 있습니다. JavaScript 가 활성화되어 있을 때 가장 멋지게 보입니다.'
   log_in: "로그인"
+  purge_reason: "자동적으로 비활성화된 계정을 삭제하였습니다."
   disable_remote_images_download_reason: "디스크저장공간이 부족하여 원격 이미지 다운로드 기능이 비활성화 되었습니다."
   anonymous: "익명"
+  remove_posts_deleted_by_author: "글쓴이에 의해 삭제된 글"
+  themes:
+    bad_color_scheme: "색 스케마가 잘못되어서 테마를 업데이트할 수 없습니다"
+    other_error: "테마를 업데이트할 수 없습니다"
   emails:
     incoming:
+      default_subject: "토픽에는 제목이 필요합니다"
       show_trimmed_content: "일부 내용만 보기"
+      maximum_staged_user_per_email_reached: "이메일 당 생성할 수 있는 격리 사용자의 최대치에 도달했습니다."
+      errors:
+        empty_email_error: "수신한 raw mail이 공백일 때 발생합니다."
+        no_message_id_error: "메일에 'Message-Id'헤더가 없을 때 발생합니다."
+        auto_generated_email_error: "'precedence'헤더가 list, junk, bulk, auto_reply로 설정되어 있거나 다른 헤더에 auto-submitted, auto-replied, auto-generated가 있을 때 발생합니다."
+        no_body_detected_error: "body를 추출할 수 없거나 첨부파일이 없을 때 발생합니다."
+        inactive_user_error: "발신자(sender)가 비활성상태일 때 발생합니다."
+        blocked_user_error: "발신자(sender)가 차단되었을 때 발생합니다."
+        bad_destination_address: "수신/참조/비밀참조 필드에 있는 이메일 주소가 설정된 수신 이메일 주소와 하나도 매칭되지 않을 때 발생합니다."
+        strangers_not_allowed_error: "사용자가 자신이 속하지 않은 카테고리에 토픽 생성을 시도할 때 발생합니다."
+        insufficient_trust_level_error: "사용자가 더 높은 신뢰 레벨이 필요한 카테고리에 토픽 생성을 시도할 때 발생합니다."
+        reply_user_not_matching_error: "발신한 알림에 대하여 서로 다른 이메일로 답장이 올 때 발생합니다."
+        topic_not_found_error: "댓글을 달았지만 해당 토픽이 삭제된 경우 발생합니다."
+        topic_closed_error: "답글을 했지만 해당 토픽이 닫힌 경우 발생합니다."
+        bounced_email_error: "반송된 이메일 리포트 이메일입니다."
+        screened_email_error: "발신자의 이메일 주소가 이미 차단되었을 때 발생합니다."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
       too_long_validation: "%{length}자를 입력하셨습니다. 최대 %{max}자까지 입력 가능합니다. "
-      invalid_boolean: "잘못된 값"
+      invalid_boolean: "잘못된 부울린값입니다."
       taken: "이미 가져옴"
       accepted: 승인 필요
       blank: 비어있으면 안됨
-      present: 비어야 함
+      present: 공백이어야 합니다.
       confirmation: " %{attribute} 속성과 맞지 않음"
-      empty: 필수사항
+      empty: 필수 작성
       equal_to: '다음 숫자와 같아야 함: %{count}'
       even: 짝수여야 함
       exclusion: 예약됨
@@ -51,6 +75,9 @@ ko:
       has_already_been_used: "이미 사용되었음"
       inclusion: 리스트에 없음
       invalid: 올바르지 않음
+      is_invalid: "문장이 불분명합니다."
+      contains_censored_words: "검열된 단어가 있습니다: %{censored_words}"
+      matches_censored_pattern: "해당 단어는 사이트에서 검열하는 정규식을 포함하고 있습니다: %{censored_words}"
       less_than: '%{count}보다 작아야 함'
       less_than_or_equal_to: '%{count}보다 작거나 같아야 함'
       not_a_number: 숫자가 아님
@@ -73,14 +100,30 @@ ko:
         other: '%{model} 저장 시에 %{count}개의 에러가 발생하여 진행을 못했습니다.'
     embed:
       load_from_remote: "글 로딩 중 오류가 발생하였습니다."
+    site_settings:
+      min_username_length_exists: "아이디 길이 최소값은 현재 사용자의 가장 짧은 아이디 길이보다는 작아야 합니다."
+      min_username_length_range: "최소값은 최대값보다 크게 설정할 수 없습니다."
+      max_username_length_exists: "아이디 최대값은 현재 사용자의 가장 긴 아이디 길이보다는 커야 합니다."
+      max_username_length_range: "최대값은 최소값보다 작게 설정할 수 없습니다."
+      default_categories_already_selected: "다른 목록에서 사용중인 카테고리는 선택할 수 없습니다."
+      s3_upload_bucket_is_required: "'s3_upload_bucket'이 설정되지 않으면 S3로 업로드하기를 활성화할 수 없습니다."
+  invite:
+    not_found: "초대 토큰이 유효하지 않습니다. 사이트 관리자에게 문의하세요."
+    user_exists: "<b>%{email}</b>님은 초대하지 않아도 됩니다. <a href='/u/%{username}/summary'>이미 회원이거든요!</a>"
+  bulk_invite:
+    file_should_be_csv: "업로드 파일은 CSV형식이어야 합니다."
+    error: "해당 파일을 업로드하는 중에 에러가 발생했습니다. 다음에 다시 시도해보세요."
+  topic_invite:
+    user_exists: "해당 사용자는 이미 초대를 받았습니다. 토픽 초대는 딱 한번만 할 수 있습니다."
   backup:
-    operation_already_running: "현재 %{operation} 작업중입니다. %{operation} 작업을 지금 시작할 수 없습니다."
+    operation_already_running: "현재 작업이 실행중입니다. 지금은 새로운 일을 시작할 수 없습니다."
     backup_file_should_be_tar_gz: "백업 파일은 .tar.gz형식의 파일이어야 합니다."
     not_enough_space_on_disk: "백업을 업로드할 디스크 공간이 충분하지 않습니다."
-  not_logged_in: "로그인된 사용자만 사용 가능합니다."
+    invalid_filename: "백업 파일명에 허용되지 않는 문자가 포함되어 있습니다. 알파벳, 숫자, 점(.), 대쉬(-), 언더바(_)만 사용할 수 있습니다."
+  not_logged_in: "로그인이 필요합니다."
   not_found: "요청한 URL이나 리소스를 찾지 못했습니다."
   invalid_access: "요청한 리소스를 볼 권한이 없습니다."
-  read_only_mode_enabled: "현재 읽기 전용 모드입니다."
+  read_only_mode_enabled: "사이트는 현재 읽기 전용 모드입니다. 상호소통이 불가능합니다."
   reading_time: "읽은 시간"
   likes: "좋아요"
   too_many_replies:
@@ -88,6 +131,11 @@ ko:
   embed:
     start_discussion: "토론 시작"
     continue: "토론 계속하기"
+    error: "삽입에 실패했습니다."
+    referer: "리퍼러(Referer):"
+    mismatch: "리퍼러가 다음 호스트와 일치하지 않습니다:"
+    no_hosts: "임베딩을 위한 호스트가 설정되지 않았습니다."
+    configure: "삽입 설정"
     more_replies:
       other: "추가 %{count} 개 댓글"
     loading: "토론 불러오는 중..."
@@ -95,7 +143,7 @@ ko:
     imported_from: "%{link}에 있는 원글과 유사한 토론 글입니다."
     in_reply_to: "▶ %{username}"
     replies:
-      other: "댓글 %{count}개"
+      other: "답글 %{count}개"
   no_mentions_allowed: "죄송합니다, 다른 사용자를 언급할 수 없습니다."
   too_many_mentions:
     other: "죄송합니다, 이 포스트에서 %{count}명의 사용자만 언급할 수 있습니다."
@@ -113,34 +161,56 @@ ko:
     other: "죄송합니다. 신규회원은 글 하나에 링크를 %{count}개까지 넣을 수 있습니다."
   spamming_host: "죄송합니다. 회원님은 링크를 첨부할 수 없습니다."
   user_is_suspended: "가입이 보류된 회원은 글을 쓸 수 없습니다."
-  topic_not_found: "뭔가 잘못됐네요. 아마 글 보려는 도중에 글타래가 닫혔거나 지워진 건 아닐까요?"
+  topic_not_found: "뭔가 잘못됐네요. 아마 읽려는 도중에  토픽이 닫혔거나 지워진 건 아닐까요?"
+  not_accepting_pms: "죄송합니다. %{username} 님이 당분간 메시지를 받지 않습니다."
   just_posted_that: "당신이 이전에 게시한 것과 너무 비슷합니다."
   invalid_characters: "사용할 수 없는 문자를 포함하고 있습니다."
+  is_invalid: "문장이 불분명합니다."
   next_page: "다음 페이지 →"
   prev_page: "← 이전 페이지"
   page_num: "%{num}페이지 "
-  home_title: "홈"
-  topics_in_category: "'%{category}' 카테고리의 글타래들"
+  home_title: "Home"
+  topics_in_category: "'%{category}' 카테고리의 토픽"
   rss_posts_in_topic: "'%{topic}' 의 RSS 피드"
   rss_topics_in_category: "'%{category}' 카테고리의 RSS 피드 "
   author_wrote: "%{author} 게시:"
-  num_posts: "글 수:"
+  num_posts: "포스트 수:"
   num_participants: "참여자:"
-  read_full_topic: "전체 글타래 읽기"
+  read_full_topic: "전체 토픽 읽기"
   private_message_abbrev: "메시지"
   rss_description:
-    latest: "최신 글타래"
-    hot: "인기 글타래"
+    latest: "최신 토픽"
+    hot: "화제 토픽"
     top: "인기 토픽"
+    top_all: "역대 최고 인기 토픽"
+    top_yearly: "연간 인기 토픽"
+    top_quarterly: "분기 인기 토픽"
+    top_monthly: "월간 인기 토픽"
+    top_weekly: "주간 인기 토픽"
+    top_daily: "일간 인기 토픽"
     posts: "최근 글"
+    private_posts: "최신 개인 메시지"
+    group_posts: "%{group_name}의 최신 게시글"
+    group_mentions: "%{group_name}의 최신 멘션"
+    user_posts: "@%{username}님의 최신 포스트"
+    user_topics: "@%{username}님의 최신 토픽"
+    tag: "태그된 토픽"
   too_late_to_edit: "이 글은 작성된 지 너무 오랜 기간이 지났습니다. 수정 또는 삭제할 수 없습니다."
+  revert_version_same: "복구하려는 버전과 현재 버전이 똑같습니다."
   excerpt_image: "이미지"
   queue:
     delete_reason: "운영팀이 글을 지웠습니다."
   groups:
+    success:
+      bulk_add: "%{users_added}명의 사용자가 그룹에 추가되었습니다."
     errors:
+      can_not_modify_automatic: "자동 설정 그룹은 수정할 수 없습니다."
       member_already_exist: "'%{username}'은 이미 이 그룹의 멤버입니다."
       invalid_domain: "'%{domain}'은 유효한 도메인이 아닙니다."
+      invalid_incoming_email: "'%{email}' 는 올바른 이메일 주소가 아닙니다."
+      email_already_used_in_group: "'%{email}'는 '%{group_name}' 그룹에서 이미 사용중입니다."
+      email_already_used_in_category: "'%{email}' 는 '%{category_name}' 카테고리에서 이미 사용중입니다."
+      cant_allow_membership_requests: "그룹 가입을 승인하려면 그룹 소유자의 승인이 필요합니다."
     default_names:
       everyone: "모든 사람"
       admins: "관리자"
@@ -151,6 +221,9 @@ ko:
       trust_level_2: "회원등급 2"
       trust_level_3: "회원등급 3"
       trust_level_4: "회원등급 4"
+    request_membership_pm:
+      title: "@%{group_name}그룹에 가입 신청"
+      body: "@%{group_name}그룹에 가입신청하고 싶습니다."
   education:
     until_posts:
       other: "글 %{count}개"
@@ -161,7 +234,7 @@ ko:
 
       - 누가 무엇때문에 관심을 보일까요? 어떤 대답을 듣고 싶나요?
 
-      - 사람들이 *검색*할 수 있도록 글타래에 흔히 사용하는 단어를 집어넣으세요. 관련 글타래와 같이 엮으려면 해당 카테고리를 선택하시고요.
+      - 사람들이 *검색*할 수 있도록 토픽에 흔히 사용하는 단어를 집어넣으세요. 관련 토픽과 같이 엮으려면 해당 카테고리를 선택하시고요.
 
       이 글은 당신의 첫 %{education_posts_text} 에서만 나옵니다. 자세한 내용은 [커뮤니티 가이드라인](/guidelines)을 참조하세요.
     new-reply: |
@@ -174,12 +247,55 @@ ko:
       - 건설적인 비판은 환영입니다만, 사람 말고 *아이디어*를 비판해주세요.
 
       이 도움말은 최초 %{education_posts_text}번 글을 올릴 때까지만 나타납니다. 자세한 내용은 [커뮤니티 가이드라인](/guidelines)를 참조하여 주세요.
+    avatar: |
+      ### 계정에 사진을 걸어두는 건 어떠세요?
+
+      토픽과 포스트를 몇 개 쓰셨습니다. 그런데 프로필 사진에 글자만 덩그러니 있고 특색이 없군요.
+
+      **[사용자 프로필로 가셔서](%{profile_path})** 자신을 나타낼 수 있는 사진이나 그림을 올리는 건 어떠세요?
+
+      프로필 사진을 쓰면 토론의 흐름을 따라가기 쉽고, 흥미있는 사람을 찾기도 쉽답니다!
+    sequential_replies: |
+      ### 한번에 여러 포스트에 답글을 써보세요
+
+      여러 토픽에 일일이 답글을 다는 것보다, 한 답글에 이전에 작성된 여러 포스트를 인용하거나 @아이디 멘션을 하는 게 더 편할 수 있습니다.
+
+      글을 드래그해서 선택한 다음에, 표시되는 '답글 인용하기'버튼을 눌러서 답글을 추가하는 식으로 쓰신 답글을 편집할 수 있습니다.
+
+      다른 사람도 깨알같이 흩어진 답글을 읽는 것 보다는, 깊이 있게 작성된 몇개의 답글을 읽는 편이 토픽보기에 더 편하답니다.
+    dominating_topic: |
+      ### 다른 사람도 대화에 끼워주세요
+
+      이 토픽이 완전소중하신가 봅니다 &ndash;%{percent}% 넘게 답글을 쓰셨네요.
+
+      다른 사람들이 이 내용에 대해 충분히 생각할 만한 시간을 주셨나요?
+    get_a_room: |
+      ### 다른 사람한테도 답글을 써보세요
+
+      이 토픽안에서만 %{count}번이나 @%{reply_username} 님에게 답글을 쓰셨네요.
+
+      이 토론에서 *다른 사람*에게도 관심을 주시는 건 어떨까요? 무릇 훌륭한 토론이란 여러 목소리와 관점이 어우러지는 법이죠.
+
+      이 주제에 대하여, 개인적으로 더 심도깊은 대화를 이어가고 싶다면 [개인 메시지를 보내보세요](/u/%{reply_username}).
+    too_many_replies: |
+      ### 이 토픽 답글 제한량을 모두 채우셨습니다
+
+      죄송하지만, 새로운 사용자는 한 토픽 당%{newuser_max_replies_per_topic}개의 답글만 쓸 수 있습니다.
+
+      새 답글을 다는 대신에, 전에 쓴 답글을 수정하거나 다른 토픽을 구경해보세요.
+    reviving_old_topic: |
+      ### 이 토픽을 다시 살려보고 싶으세요?
+
+      마지막으로 답글이 달린 지 **%{days}** 일이 지났습니다. 여기에 답글을 쓰시면 토픽이 리스트의 상단으로 껑충 뛰어오르고, 이 토픽과 관련된 사람들에게 알림이 가게 됩니다.
+
+      이 오래된 대화를 이어가고 싶은 것이 확실하신가요?
   activerecord:
     attributes:
       category:
         name: "카테고리 이름"
       topic:
         title: '사이트 이름'
+        featured_link: '주요 링크'
       post:
         raw: "본문"
       user_profile:
@@ -193,20 +309,45 @@ ko:
               too_many_users: "한 번에 한 명의 사용자에게 경고를 보낼 수 있습니다."
               cant_send_pm: "죄송합니다. 그 사용자에게 개인 메세지를 보낼 수 없습니다."
               no_user_selected: "유효한 사용자를 선택해주십시오"
+            featured_link:
+              invalid: "는 올바르지 않습니다. URL은 http:// 또는 https://를 포함해야 합니다."
+              invalid_category: "이 카테고리에서는 편집할 수 없습니다."
         user:
           attributes:
             password:
               common: "가장 자주 사용되는 10000개의 비밀번호 중 하나입니다. 보다 안전한 비밀번호를 사용하세요."
               same_as_username: "는 아이디랑 같음. 제발 좀 더 안전한 비밀번호를 사용해주세요."
               same_as_email: "는 이메일 주소랑 같음. 좀 더 안전한 비밀번호를 사용해주세요."
+              same_as_current: "은(는) 현재 비밀번호와 동일합니다."
+              unique_characters: "반복된 글자가 너무 많습니다. 좀 더 안전한 비밀번호를 사용해주세요."
             ip_address:
               signup_not_allowed: "이 계정에서는 가입 하실 수 없습니다."
         color_scheme_color:
           attributes:
             hex:
               invalid: "유효한 색상이 아닙니다."
+        post_reply:
+          base:
+            different_topic: "게시글과 답글은 같은 토픽에 속해야 합니다."
+        web_hook:
+          attributes:
+            payload_url:
+              invalid: "URL이 올바르지 않습니다. URL은 http:// 또는 https://를 포함하며, 공백이 없어야 합니다."
+        custom_emoji:
+          attributes:
+            name:
+              taken: 은(는) 이미 다른 emoji에서 사용중입니다
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "미래값으로 설정되어야 합니다."
+        translation_overrides:
+          attributes:
+            value:
+              missing_interpolation_keys: '다음 interpolation key가 없습니다: "%{keys}"'
       <<: *errors
   user_profile:
+    no_info_me: "<div class='missing-profile'>프로필의 자기소개란이 비어있습니다. <a href='/u/%{username_lower}/preferences/about-me'>뭔가 써보지 않으실래요?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name}님께서는 아직 프로필을 작성하지 않으셨습니다</div>"
   vip_category_name: "라운지"
   vip_category_description: "회원등 3 혹은 그 이상의 회원만 입장가능한 카테고리"
@@ -214,24 +355,47 @@ ko:
   meta_category_description: "이 사이트의 운영 방식에 대해 건의하고 토론하는 곳입니다."
   staff_category_name: "스태프"
   staff_category_description: "스태프들의 논의를 위한 비공개 카테고리입니다. 관리자 및 운영자에게만 보입니다."
-  assets_topic_body: "이 글타래는 스태프에게만 보이는 영구적인 글타래입니다. 사이트 디자인을 위한 이미지를 저장할 수 있습니다. 지우지 마세요!\n\n다음처럼 하세요:\n\n1. 이 글타래에 답글을 작성하세요.\n2. 로고, 파비콘 등으로 사용하고 싶은 모든 이미지들을 업로드한다. (글 에디터 툴바의 업로드 아이콘을 사용하거나, 드래그 앤 드롭으로 이미지를 올려주세요.)\n3. 답글을 제출합니다.\n4. 답글의 업로드된 이미지를 우클릭하거나, 수정 버튼을 눌러 이미지의 경로를 확인하세요. 해당 이미지의 경로를 복사하세요.\n5. 복사한 이미지 경로를 [basic settings](/admin/site_settings/category/required)에 붙여넣으세요.\n\n\n다른 유형의 이미지를 사용해야한다면 [file settings](/admin/site_settings/category/files)의 `authorized_extensions` 를 수정하세요."
+  assets_topic_title: "사이트 디자인을 위한 asset"
+  assets_topic_body: "이 토픽은 운영진에게만 보이며, 사이트 디자인에 필요한 이미지와 파일을 저장하는 용도로 사용됩니다. 지우지 마세요!\n\n\n사용법:\n\n\n1. 토픽에 답글을 단다.\n2. 로고나 파비콘 등에 사용할 이미지를 업로드한다.(포스트 에디터의 업로드 툴바를 쓰거나, 드래그 앤 드롭을 하거나, 이미지 붙여넣기를 하세요.)\n3. 답글을 올린다.\n4. 새로운 포스트에 올라간 이미지위에서 마우스 우클릭을 하거나, 포스트 편집 아이콘을 눌러서 이미지의 경로를 얻어서 경로를 복사한다.\n5. 해당 이미지 경로를 [기본 설정]에 붙여넣는다.(/admin/site_settings/category/required).\n\n\n다른 유형의 파일을 업로드해야 할 경우, [파일 설정]에서 `authorized_extensions`을 편집하세요 (/admin/site_settings/category/files)."
+  discourse_welcome_topic:
+    title: "Discourse에 오신 것을 환영합니다"
+    body: |2
+
+      고정된 토픽의 첫 문단은 홈페이지에 들어오는 사람들에게 환영 메시지로 보이게 됩니다. 그래서 매우 중요해요!
+
+      커뮤니티를 알릴 수 있도록 **이 글을 편집하세요**
+
+      - 누구를 위한 커뮤니티인가요?
+      - 여기에서 무엇을 얻을 수 있나요?
+      - 여기에 왜 와야하나요?
+      - 더 알고싶으면 뭘 봐야 하나요 (링크, 자료, 기타 등등)?
+
+      <img src="/images/welcome/discourse-edit-post-animated.gif" width="508" height="106">
+
+      이 토픽에 답글이 쌓이는 게 싫다면, 관리기능 :wrench:(우측 상단에 있어요)을 통해 이 토픽을 닫을 수 있습니다.
   lounge_welcome:
     title: "라운지에 오신 것을 환영합니다."
     body: |2
 
-      축하합니다! :confetti_ball: 당신의 회원등급이 **지도자** (회원등급 3등급)로 올라갔기 때문에 이 글타래를 볼 수 있게 되었습니다. 이제부터 아래의 행동들을 할 수 있습니다 &hellip; * 글타래를 제목을 수정할 수 있습니다 * 글타래의 카테고리를 수정할 수 있습니다 * 링크가 follow로 처리됩니다 ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) 가 제거됩니다) * 회원등급 3 이상인 사용자가 접근할 수 있는 비공개 카테고리인 라운지에 접근할 수 있습니다 * 좋아요와 신고의 가중치가 높아집니다 [정규 멤버 목록](&#x2F;badges/3/regular)을 확인할 수 있습니다. 인사하는 것을 잊지마세요. 이 커뮤니티의 중요한 역할을 해주신 것에 감사드립니다! (회원등급에 관한 더 자세한 정보를 보시려면, [이 글타래를 확인하세요][trust]. 기준에 맞는 사람만 정규 회원으로 자격이 유지됩니다.) [trust]:  https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+      축하합니다! :confetti_ball: 당신의 회원등급이 **지도자** (회원등급 3등급)로 올라갔기 때문에 이 토픽을 볼 수 있게 되었습니다. 이제부터 아래의 행동들을 할 수 있습니다 &hellip; * 토픽 제목을 수정할 수 있습니다 * 토픽의 카테고리를 수정할 수 있습니다 * 링크가 follow로 처리됩니다 ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) 가 제거됩니다) * 회원등급 3 이상인 사용자가 접근할 수 있는 비공개 카테고리인 라운지에 접근할 수 있습니다 * 좋아요와 신고의 가중치가 높아집니다 [정규 멤버 목록](&#x2F;badges/3/regular)을 확인할 수 있습니다. 인사하는 것을 잊지마세요. 이 커뮤니티의 중요한 역할을 해주신 것에 감사드립니다! (회원등급에 관한 더 자세한 정보를 보시려면, [이 토픽 확인하세요][trust]. 기준에 맞는 사람만 정규 회원으로 자격이 유지됩니다.) [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "'%{category}' 카테고리의 설명"
+    replace_paragraph: "(이 문단을 새로운 카테고리를 간단히 설명하는 내용으로 대체하세요. 이 가이드는 카테고리 섹션 영역에 표시되므로, 200자 이하로 유지하는 게 좋습니다. **이 설명을 편집하거나 토픽을 생성하기 전까지는, 이 카테고리는 카테고리 페이지에 표시되지 않습니다.**)"
+    post_template: "%{replace_paragraph}\n\n다음 문단을 긴 설명을 쓰는데 활용하세요. 카테고리의 가이드라인이나 규칙을 쓰실 수도 있습니다.\n\n- 왜 이 카테고리를 사용해야하나요? 용도가 무엇인가요?\n\n- 기존의 다른 카테고리와 정확히 어떻게 다른가요?\n\n- 이 카테고리에 속한 토픽들은 대체로 무엇을 다루나요?\n\n- 이 카테고리가 필요한가요? 다른 카테고리와 병합하거나 서브 카테고리로 만들면 안되나요?\n"
     errors:
       uncategorized_parent: "Uncategorized 카테고리는 부모 카테고리를 가질 수 없습니다."
       self_parent: "하위 카테고리의 부모는 자신이 될 수 없습니다."
       depth: "하위 카테고리는 계층 구조로 사용할 수 없습니다."
+      invalid_email_in: "'%{email}' 는 올바른 이메일 주소가 아닙니다."
+      email_already_used_in_group: "'%{email}'는 '%{group_name}' 그룹에서 이미 사용중입니다."
+      email_already_used_in_category: "'%{email}' 는 '%{category_name}' 카테고리에서 이미 사용중입니다."
     cannot_delete:
       uncategorized: "Uncategorized는 삭제할 수 없습니다."
       has_subcategories: "하위 카테고리가 있어, 삭제할 수 없습니다."
       topic_exists:
         other: "%{count}개의 글타래가 이 카테고리 내에 있어 삭제할 수 없습니다. 가장 오래된 글타래는 %{topic_link}입니다."
       topic_exists_no_oldest: "%{count}개의 글타래가 이 카테고리 내에 있어 삭제할 수 없습니다."
+    uncategorized_description: "카테고리가 필요없는 토픽이거나, 토픽에 부합하는 카테고리가 없습니다."
   trust_levels:
     newuser:
       title: "새로운 사용자"
@@ -252,6 +416,16 @@ ko:
       first_day_topics_per_day: "새 유저가 가입한 첫 날에 작성할 수 있는 토픽의 최대 갯수에 도달했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
       create_topic: "너무 빨리 토픽을 작성했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
       create_post: "너무 빨리 댓글을 작성했습니다. %{time_left}동안 기다리셨다가 다시 시도해보세요."
+      delete_post: "포스트 삭제속도가 너무 빠릅니다. %{time_left}후에 다시 시도해주세요."
+      public_group_membership: "그룹 가입/탈퇴가 너무 잦습니다. %{time_left} 후에 다시 시도해주세요."
+      topics_per_day: "생성할 수 있는 토픽의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
+      pms_per_day: "보낼 수 있는 메시지의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
+      create_like: "쓸 수 있는 좋아요의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
+      create_bookmark: "북마크할 수 있는 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
+      edit_post: "일일 최대 편집 횟수에 도달했습니다. %{time_left} 후에 다시 시도하세요."
+      live_post_counts: "실시간 포스트 카운트를 너무 빨리 요청하셨습니다. %{time_left} 후에 다시 시도하세요."
+      unsubscribe_via_email: "이메일을 통한 구독취소 일일 최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
+      topic_invitations_per_day: "토픽으로 초청하기의 일일최대값에 도달했습니다. %{time_left} 후에 다시 시도하세요."
     hours:
       other: "%{count}시간"
     minutes:
@@ -308,6 +482,9 @@ ko:
       almost_x_years:
         other: "약 %{count}년 전"
   password_reset:
+    no_token: "죄송하지만, 해당 비밀번호 변경 링크는 너무 오래됐습니다. 로그인 버튼을 눌러서 '비밀번호를 잊어버렸어요'를 사용하여 새로운 링크를 받으세요."
+    choose_new: "새로운 비밀번호를 입력하세요"
+    choose: "패스워드를 입력하세요"
     update: '비밀번호 변경'
     save: '비밀번호 설정'
     title: '비밀번호 초기화'
@@ -317,8 +494,11 @@ ko:
     confirmed: "이메일 주소가 변경되었습니다."
     please_continue: "%{site_name}으로 가기"
     error: "이메일 주소를 변경하는데 문제가 있습니다. 주소가 이미 사용되고 있나요?"
+    error_staged: "이메일 주소 변경중에 에러가 발생했습니다. 이 주소는 격리된 사용자가 이미 사용중입니다."
+    already_done: "죄송합니다. 이 확인 링크는 더 이상 유효하지 않습니다. 이메일이 이미 변경되지는 않았나요?"
     authorizing_old:
       title: "이메일 주소를 확인해 주셔서 감사합니다."
+      description: "확인을 위하여 새로운 이메일 주소로 메일을 전송합니다."
   activation:
     action: "여기를 눌러 계정을 활성화하세요."
     already_done: "죄송합니다. 이 계정 확인 링크는 더 이상 유효하지 않습니다."
@@ -326,41 +506,68 @@ ko:
     continue_button: "%{site_name}으로 가기"
     welcome_to: "%{site_name}에 오신것을 환영합니다."
     approval_required: "이 포럼을 사용하기 위해선 운영자가 수동으로 당신의 새로운 계정을 수락해야 합니다. 계정이 수락이 되면 자동으로 이메일이 발송됩니다."
+    missing_session: "계정이 생성되었는지 감지되지 않습니다. 쿠키 설정을 켰는지 확인해보세요."
+    activated: "죄송합니다. 이 계정은 이미 활성화되었습니다."
+    admin_confirm:
+      title: "관리자 계정 확정하기"
+      description: "<b>%{target_username}</b>님을 관리자로 설정하고 싶은 것이 확실합니까?"
+      grant: "관리자 권한 부여"
+      complete: "<b>%{target_username}</b> 님은 이제 관리자입니다."
+      back_to: "%{title}로 돌아가기"
   post_action_types:
     off_topic:
       title: '오프 글타래'
       description: '이 글은 이곳의 글타래과 관련된것 같지 않습니다. 다른 글타래로 옮기거나 새로운 글타래를 시작하는 것이 어떤가요?'
+      short_description: '논의와 관련이 없습니다'
       long_form: '오프 글타래으로 신고하기'
     spam:
       title: '스팸'
+      description: '이 게시글은 광고나 반달리즘입니다. 이 토픽과 관련이 없거나 쓸모가 없습니다.'
+      short_description: '광고 혹은 반달리즘입니다.'
       long_form: '스팸으로 신고하기'
       email_title: '"%{title}" 스팸으로 지목됨'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: '부적절함'
       description: '이 글은 다른 사용자들에게 공격적이나 모욕적 또는 침해적인 글을 담고 있습니다.'
+      short_description: '<a href="/guidelines">커뮤니티 가이드라인</a> 의 위반'
       long_form: '부적절함으로 신고하기'
     notify_user:
       title: '@{{username}} 님에게 메시지를 보냅니다'
+      description: '포스트에 대하여 작성자와 직접 개인적으로 이야기하고 싶습니다.'
+      short_description: '포스트에 대하여 작성자와 직접 개인적으로 이야기하고 싶습니다.'
       long_form: '메세지한 유저'
       email_title: '"%{title}" 내의 당신의 글'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "기타"
+      description: '항목에 이유가 나와있지는 않지만, 운영진의 관심이 필요한 포스트입니다.'
+      short_description: '기타 이유로 운영진의 관심이 필요합니다'
       long_form: '주의를 위해 운영진에게 신고했습니다'
+      email_title: '"%{title}"에 운영진의 확인이 필요한 게시글이 있습니다'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: '북마크'
       description: '북마크하기'
+      short_description: '북마크하기'
       long_form: '북마크 됨'
     like:
       title: '좋아요'
       description: '좋아요'
+      short_description: '좋아요'
       long_form: '이것을 좋아함'
     vote:
       title: '투표'
       description: '투표하기'
+      short_description: '투표하기'
       long_form: '투표 됨'
+  user_activity:
+    no_bookmarks:
+      self: "북마크한 포스트가 없습니다. 포스트를 북마크하면 나중에 쉽게 확인할 수 있습니다."
+      others: "북마크가 없습니다"
+    no_likes_given:
+      self: "좋아요한 게시글이 없습니다"
+      others: "좋아요를 받은 게시글이 없습니다"
   topic_flag_types:
     spam:
       title: '스팸'
@@ -389,6 +596,36 @@ ko:
       message:
         make: "이 글타래는 배너에 올라왔습니다. 사용자가 내리기 전까지 모든 페이지의 상단에 표시됩니다."
         remove: "이 글타래는 배너에서 내려왔습니다. 더 이상 모든 페이지의 상단에 표시되지 않습니다."
+  unsubscribed:
+    title: "구독해지되었습니다!"
+    description: "<b>%{email}</b> 이 구독해지 되었습니다. 이메일 설정은 <a href='%{url}'>사용자 환경설정</a>에서 변경할 수 있습니다."
+    topic_description: "%{link}를 재구독하려면 토픽 하단, 또는 우측에 있는 알림 설정을 사용하세요."
+  unsubscribe:
+    title: "구독해지"
+    stop_watching_topic: "%{link} 이 토픽 그만보기"
+    mute_topic: "%{link} 이 토픽에 대한 모든 알림끄기"
+    unwatch_category: "%{category} 카테고리의 모든 토픽 주시 중단하기"
+    mailing_list_mode: "메일링 리스트 모드 끄기"
+    disable_digest_emails: "요약 메일 그만 받기"
+    all: "%{sitename}에서 오는 메일은 전부 받지 않기"
+    different_user_description: "우리가 메일을 보낸 사용자가 아닌 다른 사용자로 로그인되어 있습니다. 로그아웃하시거나, 익명 모드를 켜시고 다시 시도해주세요."
+    not_found_description: "죄송합니다. 구독 해지할 수 없습니다. 이메일의 구독해지 링크 기한이 만료되지는 않았나요?"
+    log_out: "로그아웃"
+  user_api_key:
+    title: "어플리케이션 접근 인증하기"
+    authorize: "인증하기"
+    read: "읽기"
+    read_write: "읽기/쓰기"
+    description: "\"%{application_name}\" 이(가) 당신의 계정에 다음의 접근을 요청합니다:"
+    no_trust_level: "죄송하지만, 사용자 API에 접근할 수 있는 신뢰 레벨보다 낮습니다."
+    generic_error: "죄송합니다. 사용자 API 키를 발급할 수 없습니다. 운영진이 이 기능을 해제한 것 같습니다."
+    scopes:
+      message_bus: "실시간 업데이트"
+      notifications: "읽고 알림 지우기"
+      push: "외부 서비스로 알림 푸시하기"
+      session_info: "사용자 세션 정보 읽기"
+      read: "모두 읽기"
+      write: "모두 쓰기"
   reports:
     visits:
       title: "사용자 방문"
@@ -472,19 +709,27 @@ ko:
     page_view_anon_reqs:
       title: "익명"
       xaxis: "일"
+      yaxis: "익명 페이지뷰"
     page_view_logged_in_reqs:
       title: "로그인됨"
       xaxis: "일"
+      yaxis: "회원 페이지뷰"
     page_view_crawler_reqs:
       title: "웹크롤러"
       xaxis: "일"
+      yaxis: "로봇 페이지뷰"
     page_view_total_reqs:
       title: "총"
       xaxis: "일"
+      yaxis: "총 페이지뷰"
     page_view_logged_in_mobile_reqs:
+      title: "회원 페이지뷰"
       xaxis: "일"
+      yaxis: "모바일 회원 페이지뷰"
     page_view_anon_mobile_reqs:
+      title: "익명 페이지뷰"
       xaxis: "일"
+      yaxis: "모바일 익명 페이지뷰"
     http_background_reqs:
       title: "백그라운드"
       xaxis: "일"
@@ -526,25 +771,43 @@ ko:
     host_names_warning: "당신의 config/database.yml 파일은 기본 호스트네임을 사용하고 있습니다. 사이트의 호스트네임으로 업데이트 하세요."
     gc_warning: '당신의 서버는 최상의 성능을 내지 못하는 기본 ruby garbage collection parameter를 사용하고 있습니다. 성능 튜닝에 대해 읽어보세요. : <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Discourse를 위한 루비와 레일즈 튜닝</a>.'
     sidekiq_warning: 'Sidekiq 이 현재 실행되고 있지 않습니다. Sidekiq는 이메일 전송 같은 많은 작업들을 비동기식으로 처리합니다. 적어도 하나의 sidekiq 프로세서를 실행시켜 주세요. <a href="https://github.com/mperham/sidekiq">Sidekiq 배우기</a>.'
+    queue_size_warning: '큐 작업의 수가 %{queue_size} 개 입니다. 작업의 수가 너무 많습니다. Sidekiq에 문제가 있을 수 있습니다. Sidekiq Worker를 더 추가하세요.'
     memory_warning: '당신의 서버는 1GB 이하 메모리로 실행되고 있습니다. 적어도 1GB 이상의 메모리를 사용하세요.'
     google_oauth2_config_warning: 'Google OAuth2 인증을 통한 로그인과 회원가입(enable_google_oauth2_logins)을 설정하였습니다. 하지만, 아직 Client ID와 Client Secret을 입력하지 않았습니다. <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">자세히 알아보기</a>.'
     facebook_config_warning: '당신의 서버는 페이스북을 통한 가입을 설정하였습니다(enable_facebook_logins), 그러나 app id와 app secret 값을 입력하지 않았습니다. <a href="/admin/site_settings">사이트 설정</a> 에서 업데이트 해주세요. <a href="https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide#enable-facebook-logins" target="_blank">가이드 읽어보기</a>.'
     twitter_config_warning: '당신의 서버는 트위터를 통한 가입을 설정하였습니다(enable_twitter_logins), 그러나 key 와 secret 값이 입력하지 않았습니다. <a href="/admin/site_settings">사이트 설정</a> 에서 업데이트 해주세요. <a href="https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide#enable-twitter-logins" target="_blank">가이드 읽어보기</a>.'
     github_config_warning: '당신의 서버는 Github를 통한 가입을 설정하였습니다(enable_github_logins), 그러나 client id 와 secret 값을 입력하지 않았습니다. <a href="/admin/site_settings">사이트 설정</a> 에서 업데이트 해주세요. <a href="https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide" target="_blank">가이드 읽어보기</a>.'
+    s3_config_warning: '서버가 s3로 파일을 업로드하도록 설정되어 있습니다. 하지만 s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, s3_upload_bucket 중 하나 이상이 설정되어 있지 않습니다. <a href="/admin/site_settings">사이트 설정</a> 에 가서 설정을 업데이트하세요. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">더 알아보고 싶으시면 "어떻게 S3로 이미지를 올리도록 설정하나요?"를  보세요</a>.'
+    s3_backup_config_warning: '서버가 백업파일을 s3로 업로드 하도록 설정되어 있습니다. 하지만 s3_access_key_id, s3_secret_access_key, s3_use_iam_profile, s3_backup_bucket 중 하나 이상이 설정되어 있지 않습니다. <a href="/admin/site_settings">사이트 설정</a>에 가서 설정을 업데이트하세요. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">더 알아보고 싶으시면 "어떻게 S3로 이미지를 올리도록 설정하나요?"를 보세요</a>.'
     image_magick_warning: '큰 이미지의 섬네일 만드는 설정이 있지만, ImageMagick가 설치되지 않았습니다. <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">최신버전 받기</a>.'
+    failing_emails_warning: '실패한 이메일 작업이 %{num_failed_jobs} 개 있습니다. app.yml 을 열어서 메일 서버 설정이 정확한지 확인해보세요. <a href="/sidekiq/retries" target="_blank">Sidekiq에서 실패한 작업 보기</a>.'
+    subfolder_ends_in_slash: "서브폴더 설정이 정확하지 않습니다. DISCOURSE_RELATIVE_URL_ROOT 다음에 슬래시가 있습니다."
+    email_polling_errored_recently:
+      other: "이메일 폴링에서 지난 24시간 동안%{count}개의 에러가 발생하였습니다. 세부 정보는 <a href='/logs' target='_blank'>로그</a>에서 확인하세요."
+    missing_mailgun_api_key: "서버가 mailgun으로 이메일을 보내도록 설정되어 있지만, webhook 메시지를 인증한 API키를 입력하지 않으셨습니다."
+    bad_favicon_url: "파비콘 불러오기가 실패했습니다. <a href='/admin/site_settings'>사이트 설정</a>에서 favicon_url 설정을 확인해보세요."
+    poll_pop3_timeout: "타임아웃으로 POP3 연결이 실패했습니다. 수신 이메일을 가져올 수 없습니다. <a href='/admin/site_settings/category/email'>POP3 설정</a> 과 서비스 제공자를 확인하세요."
+    poll_pop3_auth_error: "인증 실패로 POP3 연결이 실패했습니다. <a href='/admin/site_settings/category/email'>POP3 설정</a>을 확인하세요."
   site_settings:
     censored_words: "단어는 자동적으로 `&#9632;&#9632;&#9632;&#9632;` 로 대체 됩니다."
+    censored_pattern: "자동으로 `&#9632;&#9632;&#9632;&#9632;` 로 대체되는 정규표현식"
     delete_old_hidden_posts: "30일이 지난 숨겨진 글은 자동으로 삭제됩니다."
     default_locale: "Discourse 인스턴스가 사용하는 기본 언어 (ISO 639-1 Code)"
     allow_user_locale: "사용자에게 자신이 원하는 언어를 선택 허용"
+    set_locale_from_accept_language_header: "익명 사용자의 인터페이스 언어를 웹브라우저 언어 헤더를 기준으로 변경하기(실험적인 기능입니다. 익명 cache와 동작하지 않습니다.)"
     min_post_length: "글의 최소 글자 수"
     min_first_post_length: "첫 글 (내용)의 최소 길이"
     min_private_message_post_length: "메세지 내용의 최소 길이"
     max_post_length: "글의 최대 글자 수"
+    topic_featured_link_enabled: "토픽에 링크 게시글 달기 활성화"
+    show_topic_featured_link_in_digest: "요약 메일에 토픽 주요 링크 보이게 하기."
     min_topic_title_length: "글타래 제목의 최소 글자 수"
     max_topic_title_length: "글타래 제목의 최대 글자 수"
     min_private_message_title_length: "메세지 제목의 최소 길이"
     min_search_term_length: "검색을 하기 위한 최소 글자 수"
+    search_tokenize_chinese_japanese_korean: "CJK(한중일) 설정이 되어 있지 않은 사이트라도, 검색시 한중일 언어를 토크나이징하도록 강제합니다."
+    search_prefer_recent_posts: "이 옵션을 켜면, 포럼이 너무 커서 검색이 느리게 작동할 때 최근의 포스트부터 먼저 검색합니다."
+    search_recent_posts_size: "대문에 실을 최신 포스트 수"
     allow_uncategorized_topics: "카테고리 없이 게시 허용. 주의: 카테고리 없는 글은 이 항목을 비활성화에 하기전에 카테고리 설정을 해야 합니다."
     allow_duplicate_topic_titles: "같은 제목의 동일한 주제 허용"
     unique_posts_mins: "같은 컨텐츠를 다시 글 할 수 있는 기간(분)"
@@ -557,7 +820,9 @@ ko:
     crawl_images: "제대로된 넓이와 높이를 추가하기 위해, 원격 URL로 부터 이미지를 회수해온다."
     download_remote_images_to_local: "이미지를 다운로드하면 원격 이미지를 로컬이미지로 변경. 이미지가 깨지는 것을 막을 수 있습니다."
     download_remote_images_threshold: "원격의 이미지를 로컬에 다운받기 위한 최소 디스크 공간(%)"
+    download_remote_images_max_days_old: "n일이 지난 후에는 포스트에 원격 이미지를 다운로드하지 않도록 설정"
     disabled_image_download_domains: "이 도메인을 통해서 원격 이미지를 다운로드 하지 않는다. ` | `를 구분자로 한 리스트"
+    editing_grace_period: "글 작성 후, 편집해도 히스토리에 남기지 않는 시간 (단위: 초)"
     post_edit_time_limit: "글 작성자가 해당 글을 편집하거나 삭제할 수 있도록 허용되는 시간(분). 0으로 설정하면 언제든지 편집이나 삭제가 허용됨."
     edit_history_visible_to_public: "모든 사용자가 글의 수정 내역을 볼 수 있도록 허용. 비활성화시 스태프 맴버만 수정 내역을 볼 수 있음."
     delete_removed_posts_after: "작성자에 의해 삭제된 글은 (n) 시간 뒤 자동으로 삭제됩니다. 0으로 설정 시, 즉시 삭제됩니다."
@@ -568,38 +833,64 @@ ko:
     add_rel_nofollow_to_user_content: "사용자 생성 컨텐츠에 대해서 rel nofollow 를 설정함. parent domain을 포함한 internal link는 예외임. 이 설정을 바꾸려면 모든 baked markdown을  \"rake posts:rebake\" 명령으로 변경해주서야 함"
     exclude_rel_nofollow_domains: "nofollow 도메인 리스트에 넣으면 링크에 추가가 안됩니다. tld.com은 자동으로 sub.tld.com도 포함합니다. 최소한, 이 사이트의 top-level 도메인은 허가해서 웹크롤러가 모든 자료를 검색할 수 있게 해야합니다. 다른 도메인으로도 이 사이트가 들어가진다면 그것도 추가해야 합니다."
     post_excerpt_maxlength: "글 인용에 허용되는 최대 글자수"
+    show_pinned_excerpt_mobile: "모바일 뷰에서 고정 토픽의 발췌 내용을 보여주기"
+    show_pinned_excerpt_desktop: "데스크톱 뷰에서 고정 토픽의 발췌 내용을 보여주기"
     post_onebox_maxlength: "onebox가 적용된 Discourse 글에 허용되는 최대 글자수"
+    onebox_domains_blacklist: "박스 링크 적용하지 않을 도메인의 목록"
+    max_oneboxes_per_post: "포스트 당 최대 박스링크(Onebox)의 수"
     logo_url: "좌측 상단의 로고이미지는 직사각형 모양이어야 합니다. 설정하지 않을 경우 사이트 이름이 출력됩니다."
+    digest_logo_url: "대체 로고 이미지는 사이트 요약 메일의 상단에 위치하게 됩니다. 옆으로 넓은 사각형 모양이어야 하며, SVG이미지는 사용할 수 없습니다. 빈칸으로 두시면 `logo_url`이 사용됩니다."
+    logo_small_url: "사이트의 좌측 상단에 위치할 작은 로고입니다. 정사각형이어야 하며, 스크롤을 내릴때 보이게 됩니다. 비워두시면 홈 글리프가 보이게 됩니다."
+    favicon_url: "사이트의 파비콘 입니다. http://en.wikipedia.org/wiki/Favicon를 확인하세요. CDN을 통해 설정하려면 png 파일을 설정해야 합니다."
+    mobile_logo_url: "고정위치 로고는 모바일 사이트의 좌측 상단에 위치하게 됩니다. 정사각형 모양이어야 하며, 비워두시면 `logo_url`이 사용됩니다. 예: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "애플 디바이스는 144px의 아이콘을 사용함. 144px X 144px 사이즈를 추천함"
     notification_email: "The from: 이 이메일 주소는 모든 기본 시스템 메일을 보내는데 사용됩니다. 여기에 명시된 도메인은 SPF, DKIM가 적용되어 있어야하며, reverse PTR 레코드가 제대로 설정되어 있어야 메일이 도착 할 수 있습니다."
     email_custom_headers: "커스텀 이메일 해더의 pipe-delimited"
     email_subject: "일반 메일을 위한 제목 커스터마이징. 이곳을 참고 https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
+    force_https: "사이트가 HTTPS를 사용하도록 강제합니다. 경고: HTTPS가 완벽히 적용되어 있는 것을 확인하기 전까지는 이 옵션을 켜지마세요. CDN, 소셜 로그인, 외부 링크로 가져오는 자료, 로고들이 HTTPS호환성이 있는지 확인하셨나요?"
+    same_site_cookies: "동일 사이트 쿠키를 사용합니다. 지원되는 브라우저에서 사이트 간 요청 위조의 가능성이 있는 모든 매개체를 (관대 또는 엄격하게) 제거합니다. 경고: 엄격한 통제는 로그인을 강제하거나 SSO를 사용하는 경우에만 적용됩니다."
     summary_score_threshold: "요약본에 포함되기 위한 글의 최소 점수 값"
     summary_posts_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 글 수"
     summary_likes_required: "하나의 글타래에 대하여 요약본 보기 모드가 활성화되기 전까지 요구되는 최소 좋아요 수"
     summary_percent_filter: "요약본 보기를 클릭시, 글 중에 몇 %의 상위 글을 보여줄 것인가?"
     summary_max_results: "이 주제에 대한 요약 글 최대 갯수"
+    enable_private_messages: "신뢰도 1 사용자(메시지 전송을 위한 최소 신뢰도로 설정가능)가 메시지를 작성하고 답장을 쓸 수 있도록 허용합니다. 운영진은 언제나 메시지를 보낼 수 있음을 참고하세요."
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_base_url: "long polling에 사용 될 Base URL (CDN이 동적 콘텐트를 제공할 시에는 origin pull로 설정) eg: http://origin.site.com"
     long_polling_interval: "보낼 데이터가 없을 때 응답 전에 서버가 기다려야하는 시간 (로그인된 유저 전용)"
     polling_interval: "long polling을 안 쓸 때 로그인된 클라이언트가 몇 밀리초마다  poll해야 하는 지"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     background_polling_interval: "(페이지를 안 보고 있을 때) 클라이언트가 몇 밀리초마다  poll해야 하는 지"
+    flags_required_to_hide_post: "자동으로 숨김처리 후 사용자에게 메시지를 전송할 신고 수(0은 불가)"
     cooldown_minutes_after_hiding_posts: "신고 당해서 숨겨진 글을 사용자가 편집할 수 있기 전까지 기대려야 하는 시간(분)"
+    max_topics_in_first_day: "첫 포스트 생성 후 24시간동안 사용자가 생성할 수 있는 최대 토픽 수"
+    max_replies_in_first_day: "첫 포스트 생성 후 24시간동안 사용자가 쓸 수 있는 최대 답글 수"
     tl2_additional_likes_per_day_multiplier: "tl2 (회원)의 일별 좋아요 제한을 올릴 배수"
     tl3_additional_likes_per_day_multiplier: "tl3 (정회원)의 일별 좋아요 제한을 올릴 배수"
     tl4_additional_likes_per_day_multiplier: "tl4 (리더)의 일별 좋아요 제한을 올릴 배수"
+    num_spam_flags_to_block_new_user: "신규 사용자가 num_users_to_block_new_user 명의 다른 사용자들로부터 이 수치에 해당하는 신고를 받으면, 작성한 모든 글을 숨기고 더 이상의 글 게시를 금지함(0 = 기능해제)"
+    num_users_to_block_new_user: "만약 신규 사용자의 포스트가 num_spam_flags_to_block_new_user개의 스팸 신고를 설정된 숫자 만큼의 사용자에게 받으면, 포스트를 모두 숨기고 앞으로의 포스팅을 금지합니다. 0으로 설정하면 해제됩니다."
+    num_tl3_flags_to_block_new_user: "만약 신규 사용자의 포스트가 num_tl3_users_to_block_new_user명 이상의 신뢰도3 사용자로부터 설정된 숫자만큼의 신고를 받으면 해당 사용자의 포스트를 모두 숨기고 앞으로의 포스팅을 금지합니다. 0으로 설정하면 해제됩니다."
+    num_tl3_users_to_block_new_user: "만약 신규 사용자의 포스트가 설정된 숫자 이상의 신뢰도 3 사용자로부터 num_tl3_flags_to_block_new_user개의 신고를  받으면 해당 사용자의 포스트를 모두 숨기고 앞으로의 포스팅을 금지합니다. 0으로 설정하면 해제합니다."
     notify_mods_when_user_blocked: "만약 사용자가 자동 블락되면 중간 운영자에게 메시지 보내기"
     flag_sockpuppets: "어떤 신규 사용자(예:24이내 가입자)가 글타래를 생성하고 같은 IP주소의 또 다른 신규 사용자가 댓글을 쓰면 자동 스팸 신고"
     traditional_markdown_linebreaks: "Markdown에서 전통적인 linebreak를 사용, linebreak시 두개의 trailing space를 사용하는 것."
-    allow_html_tables: "마크다운 문서에 HTML 테이블을 허용합니다. TABLE, THEAD, TD, TR, TH 태그를 사용할 수 있습니다.(테이블이 포함된 이전 게시물에 적용하려면 rebake 해야 합니다.)"
+    enable_markdown_typographer: "문단의 가독성을 높이기 위해서 기본 타이포그라피 룰을 사용합니다. (c) (tm), 기타 기호를 교체하고 연달아 나오는 물음표의 갯수를 줄입니다."
     post_undo_action_window_mins: "사용자가 어떤 글에 대해서 수행한 작업(신고 등)을 취소하는 것이 허용되는 시간(초)"
     must_approve_users: "스태프는 반드시 사이트 엑세스권한을 허용하기 전에 모든 신규가입계정을 승인해야 합니다. 경고: 이것을 활성화하면 기존 스태프 아닌 회원들의 엑세스권한이 회수됩니다."
     pending_users_reminder_delay: "새로운 사용자가 승인을 기다리는 시간이 여기에 지정된 시간횟수보다 더 길어길경우 운영자에게 알려줍니다. 알림을 해제하려면 -1로 설정하세요."
+    maximum_session_age: "마지막 방문으로 부터 n시간 동안 사용자의 로그인이 유지됩니다"
+    ga_tracking_code: "노후기술경고: Google 애널리틱스 (ga.js) 추적 코드, 예: UA-12345678-9; http://google.com/analytics를 참고하세요."
+    ga_domain_name: "노후기술경고: Google 애널리틱스 (ga.js) 도메인 명, 예: mysite.com; http://google.com/analytics을 참조하세요."
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js)의 트래킹 코드, 예: UA-12345678-9; 참고 http://google.com/analytics"
     ga_universal_domain_name: "Google Universal Analytics (analytics.js)의 도메인 이름, 예: mysite.com; 참고 http://google.com/analytics"
+    gtm_container_id: "Google Tag Manager 컨테이너 id. 예: GTM-ABCDEF"
+    enable_escaped_fragments: "만약 웹크롤러가 감지되지 않으면 Google's Ajax-Crawling API으로 되돌립니다. https://developers.google.com/webmasters/ajax-crawling/docs/learn-more 을 참고하세요."
     allow_moderators_to_create_categories: "운영자가 새로운 카테고리를 만드는 것을 허용"
     cors_origins: "Allowed origins cross-origin requests (CORS). 각 origin은 반드시 http:// 나 https:// 를 포함해야합니다.  DISCOURSE_ENABLE_CORS 환경 변수를 true로 지정해줘야 CORS를 활성화할 수 있습니다."
+    use_admin_ip_whitelist: "관리자는 보호IP 목록에 있는 IP에서만 로그인할 수 있게 하기(관리 > 로그 > 보호 IP)."
+    blacklist_ip_blocks: "Discourse가 크롤링하지 않는 차단된 사설 IP 목록"
+    whitelist_internal_hosts: "박스링크나 다른 목적으로 Discourse 가 안전하게 크롤링할 수 있는 내부 호스트의 목록"
     top_menu: "첫페이지 메뉴에 어떤 아이템이 뜨고 어떤 순서로 뜰지 정합니다 예 최근|새로씀|안읽음|카테고리|위로|읽음|쓴글|북마크"
     post_menu: "글 메뉴에 어떤 사항들이 무슨 순서로 올라올지 결정합니다. 예: like(좋아요)|edit(수정)|flag(신고)|delete(삭제)|share(공유)|bookmark(북마크)|reply(답글)"
     post_menu_hidden_items: "게시 메뉴에서 기본으로 숨길 메뉴 아이템들"
@@ -614,12 +905,16 @@ ko:
     topics_per_period_in_top_summary: "인기 글타래 요약에 기본으로 보여질 글타래 수"
     topics_per_period_in_top_page: "인기 글타래에서 '더 보기'를 요청할 시 보여질 글타래 수"
     redirect_users_to_top_page: "신규 사용자와 오랜만에 방문한 사용자를 인기글 페이지로 리다이렉트."
+    top_page_default_timeframe: "탑 뷰 페이지를 위한 타임프레임 기본값"
     show_email_on_profile: "사용자 프로필에서 자신의 이메일 주소 보기(본인과 관리자만 볼 수 있음)"
+    prioritize_username_in_ux: "아이디를 사용자 페이지, 사용자 카드, 포스트에 가장 먼저 표시(해제 되면 이름이 가장 먼저 표시됨)"
     email_token_valid_hours: "비밀번호 찾기, 계정 활성화에 사용되는 토큰의 유효 기간(시간)"
     enable_badges: "배지 기능 사용"
+    enable_whispers: "토픽 내 운영진 비공개 커뮤니케이션 허용"
     allow_index_in_robots_txt: "이 사이트가 검색엔진에 의해 인덱스되는 것을 허용합니다.(robots.txt 수정)"
     email_domains_blacklist: "가입 금지된 이메일 도메인 목록, 파이프 기호로 구분. 예: mailinator.com|trashmail.net"
     email_domains_whitelist: "가입하려면 반드시 사용해야하는 이메일 도메인 목록, 파이프 기호로 구분. 경고: 이 목록외의 도메인으로는 가입이 안됩니다!"
+    forgot_password_strict: "비밀번호 찾기 창에서 사용자 계정의 존재 여부를 알리지 않음."
     log_out_strict: "로그아웃 할때, 모든 장치에서 다같이 로그아웃"
     version_checks: "Dicousre Hub에 ping을 날려 버전 업데이트와 새 버전 알림을 /admin 대시보드에 보이게 합니다."
     new_version_emails: "사용가능한 새로운 업데이트가 있으면 등록된 contact_email 주소로 메일을 발송하여 알려줍니다."
@@ -627,19 +922,30 @@ ko:
     force_hostname: "Specify a hostname in the URL. Leave blank for none, mainly useful for development"
     invite_expiry_days: "사용자 초대키 유효 기간, 일"
     invite_passthrough_hours: "사용되어진 방문키를 로그인하는데 재사용할 수 있는 기간, 시간"
+    invite_only: "가입 비공개화, 운영진에 의한 초대로만 신규 사용자 가입."
     login_required: "글을 읽으려면 인증(로그인)이 필요함"
+    min_username_length: "최소 아이디 글자수. 경고: 이미 가입한 사용자나 그룹의 아이디 길이가 이 값보다 작으면 사이트가 깨집니다!"
+    max_username_length: "최대 아이디 글자수. 경고: 이미 가입한 사용자나 그룹의 아이디 길이가 이 값보다 크면 사이트가 깨집니다!"
+    reserved_usernames: "가입을 금지하는 아이디. 와일드카드 기호 * 를 사용해서 하나 이상의 글자를 매칭시킬 때 사용할 수 있습니다."
     min_password_length: "비밀번호 최소 글자수."
+    min_admin_password_length: "관리자 계정 비밀번호 최소길이"
+    password_unique_characters: "패스워드에 포함되어야 하는 최소 유일글자 수"
     block_common_passwords: "가장 흔히 사용되는 10,000개 비밀번호 목록에 있는 비밀번호를 사용하는 것을 허용하지 않음."
     enable_sso: "외부사이트 Single Sign On, SSO를 통해 로그인 활성화(경고: 유저의 이메일 주소는 반드시 외부에서 확인해야합니다!)"
+    verbose_sso_logging: "verbose SSO와 관련된 진단을 /logs 에 로깅하기"
     enable_sso_provider: "/session/sso_provider 를 엔드포인트로 사용해서 Discourse SSO 제공 프로토콜 구현하기, sso_secret 체크 필요"
+    sso_url: " 싱글 사인 온(SSO)엔드포인트의 URL (http:// 또는 https:// 포함 필수)"
     sso_secret: "SSO 정보 암호화 인증에 사용 될 암호 문자열, 10글자 이상이어야 합니다."
+    sso_overrides_bio: "사용자 프로필에서 사용자 bio를 덮어쓰고 사용자의 변경을 금지"
     sso_overrides_email: "SSO로 접속 시 사용자 이메일 정보 갱신 후 사용자 임의 변경 금지 설정 (경고: 이메일 정보 불일치가 생길 수도 있습니다)"
     sso_overrides_username: "SSO로 접속 시 사용자 아이디 정보 갱신 후 사용자 임의 변경 금지 설정 (경고: 아이디 길이/필요조건 등 내부 규정으로 인해 불일치가 생길 수도 있습니다)"
     sso_overrides_name: "SSO로 접속 시 사용자 실명 정보 갱신 후 사용자 임의 변경 금지 설정"
     sso_overrides_avatar: "SSO로 접속 시 사용자 아바타 이미지 갱신. 활성화하고 allow_uploaded_avatars를 비활성화를 매우 권장합니다."
     sso_not_approved_url: "승인안된 SSO 계정은 이 URL로 이동"
+    sso_allows_all_return_paths: "SSO로 제공된 return_paths를 위한 도메인 제한 해제 (기본 return path는 현재 사이트로 설정)"
     enable_local_logins: "기존의 로컬 username, password에 의한 인증을 허용. (초대 기능이 필요하다면 이 기능을 허용해야 함)"
     allow_new_registrations: "새로운 사용자 가입을 허락함. 새로운 계정 생성을 막으려면 체크하지 않음."
+    enable_signup_cta: "재방문한 익명 사용자에게 가입 권유 공지 표시"
     enable_yahoo_logins: "야후 인증 활성화"
     enable_google_oauth2_logins: "Google Oauth2 인증을 활성화합니다. 이 인증 수단은 현재 Google에서 제공하고 있으며, key와 secret 필요."
     google_oauth2_client_id: "Google Application의 Client ID"
@@ -647,19 +953,33 @@ ko:
     enable_twitter_logins: "Twitter 인증을 활성화합니다. twitter_consumer_key와 twitter_consumer_secret 필요."
     twitter_consumer_key: "http://dev.twitter.com에 등록된 Twitter 인증을 위한 Consumer key"
     twitter_consumer_secret: "http://dev.twitter.com에 등록된 Twitter 인증을 위한 Consumer secret"
+    enable_instagram_logins: "인스타그램 인증 켜기, instagram_consumer_key 와 instagram_consumer_secret 필요"
+    instagram_consumer_key: "인스타그램 인증을 위한 Consumer key "
+    instagram_consumer_secret: "인스타그램 인증을 위한 Consumer secret"
     enable_facebook_logins: "Facebook 인증을 활성화합니다. facebook_app_id와 facebook_app_secret 필요."
     facebook_app_id: "https://developers.facebook.com/apps에 등록된 Facebook 인증을 위한 App id"
     facebook_app_secret: "https://developers.facebook.com/apps에 등록된 Facebook 인증을 위한 App secret"
+    facebook_request_extra_profile_details: "Facebook에서 자기소개, 위치, 웹사이트를 요청(인증 어플리케이션이 Facebook으로부터 허가 받아야 함)"
     enable_github_logins: "Github 인증을 활성화한다. github_client_id와 github_client_secret 필요."
     github_client_id: "https://github.com/settings/applications에 등록된 Github 인증을 위한 Client id"
     github_client_secret: "https://github.com/settings/applications에 등록된 Github 인증을 위한 Client secret"
+    readonly_mode_during_backup: "백업 받을 때, 읽기 전용 모드 켜기"
     allow_restore: "데이터 복원을 허용합니다. 이 사이트의 모든 데이터가 변경될 수 있다. 백업이나 복원 계획이 없다면 비활성화로 놔둡니다."
     maximum_backups: "디스크에 유지할 최대 백업 개수. 오래된 백업순으로 자동으로 삭제된다."
+    automatic_backups_enabled: "설정된 백업 주기로 자동 백업 실행"
+    backup_frequency: "하루에 몇 번 백업을 받을까요?"
     enable_s3_backups: "백업이 완료되면 Amazon S3로 업로드합니다. 중요: s3 credentials을 기입되어있는지 확인 필요"
     s3_backup_bucket: "백업본을 유지할 s3 버켓 이름. 주의 : 프라이빗 버켓인지 반드시 확인해야하세요."
+    s3_disable_cleanup: "로컬에서 백업 삭제 시 S3에서 백업 제거하는 기능 해제"
+    backup_time_of_day: "백업이 실행되어야 할 UTC 시간"
+    backup_with_uploads: "스케쥴링된 백업을 실행할 때 업로드된 자료도 포함.  해제하면 데이터베이스만 백업합니다."
     active_user_rate_limit_secs: "'last_seen_at'을 업데이트 하는 주기(초)"
     verbose_localization: "UI에 언어 팁을 확장해 보여줌"
     previous_visit_timeout_hours: "최근 방문한 시간을 저장할 주기(시간)"
+    top_topics_formula_log_views_multiplier: "인기 토픽 계산 공식의 뷰 가중치 설정: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_first_post_likes_multiplier: "인기 토픽 계산 공식의 좋아요 가중치 설정: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
+    top_topics_formula_least_likes_per_post_multiplier: "인기 토픽 계산 공식에서 포스트당 최소 좋아요 가중치 설정: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    rebake_old_posts_count: "15분마다 HTML로 리빌드할 옛날 포스트의 수"
     rate_limit_create_topic: "사용자가 글타래를 생성하고 난 후 다음 글타래를 생성할 때 까지의 대기 기간(초)"
     rate_limit_create_post: "사용자가 포스팅을하고 난 후 다음 포스팅까지 대기 기간(초)"
     rate_limit_new_user_create_topic: "새로운 사용자 글타래를 생성하고 난 후 다음 글타래를 생성할 때 까지의 대기 기간(초)"
@@ -672,8 +992,14 @@ ko:
     max_private_messages_per_day: "하루에 유저가 쓸 수 있는 최대 메세지 갯수"
     max_invites_per_day: "하루에 보낼 수 있는 초대장의 최대치입니다."
     max_topic_invitations_per_day: "하루에 유저가 최대로 보낼 수 있는 글타래 초대장 수"
+    max_logins_per_ip_per_hour: "시간 당 동일 IP에서 로그인할 수 있는 최대 사용자 수"
+    max_logins_per_ip_per_minute: "1분 당 동일 IP에서 로그인할 수 있는 최대 사용자 수"
+    alert_admins_if_errors_per_minute: "관리자 경고를 발생시키기 위한 1분당 에러 수. 0으로 설정하면 기능 해제됨. 주의: 재시작이 필요합니다."
+    alert_admins_if_errors_per_hour: "관리자 경고를 발생시키기 위한 시간당 에러 수. 0으로 설정하면 기능 해제됨. 주의: 재시작이 필요합니다."
+    categories_topics: "/categories 페이지에서 표시할 토픽의 수"
     suggested_topics: "글타래 아랫부분에 몇개의 글타래를 제안하여 보여준다."
     limit_suggested_to_category: "제안된 글타래는 현재의 카테고리에 있는 글타래 중에서만 보여준다."
+    suggested_topics_max_days_old: "설정된 일수 이상의 토픽은 추천하지 않음"
     clean_up_uploads: "불법 호스팅을 막기 위해서 참조되지 않은 업로드 파일은 제거합니다. 주의 : 이 설정을 활성화 하기 전에 `/uploads` 디렉토리를 백업하는 것이 좋습니다."
     clean_orphan_uploads_grace_period_hours: "참조되지 않은 업로드 파일을 제거하기 전 기간(시간)"
     purge_deleted_uploads_grace_period_days: "참조되지 않은 업로드 파일을 완전 삭제하지 전 기간(일)"
@@ -686,6 +1012,13 @@ ko:
     s3_region: "이미지를 업로드 할 때 사용할 Amazon S3 region"
     s3_cdn_url: "s3 에셋에  사용될 CDN URL (예: https://cdn.somewhere.com). 경고: 이 설정 뒤에는 모든 글을 다시 구워야rebake 합니다."
     avatar_sizes: "자동 생성 아바타 사이즈 목록"
+    external_system_avatars_enabled: "외부 아바타 시스템을 사용하기"
+    external_system_avatars_url: "외부 아바타 서비스의 URL. {username} {first_letter} {color} {size} 의 대체가 허용됨"
+    default_opengraph_image_url: "기본 오픈그래프 이미지의 URL"
+    twitter_summary_large_image_url: "기본 Twitter 요약 카드 이미지의 URL( 가로 280px, 세로 150px 이상이어야 함)"
+    allow_all_attachments_for_group_messages: "그룹 메시지에 모든 이메일 첨부 허용"
+    png_to_jpg_quality: "변환된 JPG 파일의 퀄리티(1은 최하, 99는 최상, 100은 해제)"
+    allow_staff_to_upload_any_file_in_pm: "운영진이 보내는 개인메시지에 모든 파일 첨부 허용"
     enable_flash_video_onebox: "swf, flv(어도비 플래쉬)링크를 embed 할 수 있도록 함. 주의: 보안에 대한 위험성을 알려주는 것이 좋다."
     default_invitee_trust_level: "사용자를 초대하기 위한 기본 회원등급(0-4)"
     default_trust_level: "모든 신규가입자의 기본 회원등급 (0-4). 경고: 변경시에 스팸 문제가 생길 가능성이 높습니다."
@@ -699,20 +1032,35 @@ ko:
     tl2_requires_likes_received: "회원등급-2가 되기 위해 받아야 하는 좋아요 횟수"
     tl2_requires_likes_given: "회원등급-2가 되기 위해 눌러야하는 좋아요 횟수"
     tl2_requires_topic_reply_count: "기회원등급-2가 되기 위해 달아야 하는 댓글 갯수"
+    tl3_time_period: "회원 레벨 3 자격을 얻기 위한 활동 기간(일)"
+    tl3_requires_days_visited: "회원 레벨 3이 자격을 얻기 위하여 지난 (tl3 time period)일 동안 사용자가 사이트에 방문해야하는 최소 일 수. tl3 기간보다 길게 설정하면 회원레벨 3 승격을 해제합니다. (0이상)"
+    tl3_requires_topics_replied_to: "회원 레벨 3 자격을 얻기 위하여 지난 (tl3 time period)일 동안 사용자가 댓글을 달아야 하는 최소 토픽 수 (0 이상)"
+    tl3_requires_topics_viewed: "회원 레벨 3 자격을 얻기 위하여 지난 (tl3 time period) 일 동안 작성된 토픽 중에서 사용자가 읽어야 하는 토픽의 퍼센트 비율.(0 에서 100)"
+    tl3_requires_topics_viewed_cap: "지난 (tl3 time period) 일 동안 사용자가 봐야하는 최대 토픽 조회수."
+    tl3_requires_posts_read: "회원 레벨 3 자격을 얻기 위하여 지난 (tl3 time period) 일 동안 작성된 토픽 중에서 사용자가 읽어야 하는 포스트의 퍼센트 비율.(0 에서 100)"
+    tl3_requires_posts_read_cap: "지난 (tl3 time period) 일 동안 사용자가 봐야하는 최대 포스트 조회수."
     tl3_requires_topics_viewed_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 글타래의 전체 개수"
     tl3_requires_posts_read_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 글타래의 전체 개수"
+    tl3_requires_max_flagged: "회원 레벨3의 자격을 얻으려면, 지난 (tl3 time period)일 동안 x명의 사용자로부터 x개 이상의 포스트를 신고당한 일이 없어야 합니다. x 값을 설정.(0이상)"
     tl3_promotion_min_duration: "회원등급이 2로 떨어진 후 다시 VIP 사용자-3 이 될 수 있는 최소 일 수"
+    tl3_requires_likes_given: "회원 레벨3 자격을 얻기 위하여 지난 (tl3 time period)동안 줘야 하는 최소 좋아요 수."
+    tl3_requires_likes_received: "회원 레벨3 자격을 얻기 위하여 지난 (tl3 time period)일 동안 받아야 하는  최소 좋아요 수."
     tl3_links_no_follow: "VIP 사용자-3 의 글에 있는 링크에서 rel=nofollow 를 제거하지 마시오."
     min_trust_to_create_topic: "새로운 주제를 생성하기 위한 최소 회원등급"
     min_trust_to_edit_wiki_post: "위키로 설정된 글 수정할 수 있는 최소 회원등급"
+    min_trust_to_edit_post: "포스트를 편집하기 위한 최소 신뢰도"
+    min_trust_to_allow_self_wiki: "사용자의 포스트 위키를 만들기 위한 최소 신뢰도"
+    min_trust_to_send_messages: "새로운 개인 메시지를 보내기 위한 최소 신뢰도"
     newuser_max_links: "새로운 사용자가 글에 붙일 수 있는 최대 링크 개수"
     newuser_max_images: "새로운 사용자가 글에 붙일 수 있는 최대 이미지 개수"
-    newuser_max_attachments: "새로운 사용자가 포트에 붙일 수 있는 최대 첨부파일 개수"
-    newuser_max_mentions_per_post: "새료운 사용자가 글에 사용할 수 있는 최대 @name 알림 개수"
-    newuser_max_replies_per_topic: "다른 사용자가 답글을 달기 전, 새로운 사용자가 개별 글타래에 달 수 있는 최대 답글 개수"
+    newuser_max_attachments: "새로운 사용자가 포스트에 첨부할 수 있는 최대 파일 개수"
+    newuser_max_mentions_per_post: "새로운 사용자가 글에서 쓸 수 있는 최대 @아이디 멘션 개수"
+    newuser_max_replies_per_topic: "다른 사용자가 댓글을 달기 전, 새로운 사용자가 개별 토픽에 달 수 있는 최대 답글 개수"
     max_mentions_per_post: "글 당 사용할 수 있는 최대 @name 알림의 수"
+    max_users_notified_per_group_mention: "그룹이 멘션을 받으면 알림을 받는 최대사용자의 수(최대치에 도달하면 알림이 전송되지 않음)"
     create_thumbnails: "글의 너무 큰 크기의 이미지는 thumnails와 lightbox를 만든다."
     email_time_window_mins: "알림 메일을 보내기 전 대기 기간(분), 사용자에게 글의 변경하고 완료할 수 있는 기회를 준다."
+    private_email_time_window_seconds: "사용자가 메시지를 재편집할 기회를 주기 위하여 개인 알림 메일을 보내기 이전에 설정한 시간만큼 대기합니다."
     email_posts_context: "알림메일의 내용에 추가할 기존 답글 수"
     flush_timings_secs: "사용자의 이용 시간 데이터를 서버로 보내는 기간(초)"
     title_max_word_length: "글타래 제목안에 단어들의 최대 길이"
@@ -722,12 +1070,15 @@ ko:
     title_fancy_entities: "글타래 제목에 일반 ASCII 문자로 만든 기호들을 보기 좋은 HTML로 변환시켜준다. 참고: SmartyPants http://daringfireball.net/projects/smartypants/"
     min_title_similar_length: "유사 글타래에 대한 체크가 있기 전, 최소 제목 글자 수"
     min_body_similar_length: "유사 글타래에 대한 체크가 있기 전, 글의 최소 본문 글자 수"
+    desktop_category_page_style: "/categories 페이지의 비주얼 스타일"
     category_colors: "허용된 카테고리에 사용될 hexadecimal 색상 값의 리스트"
     category_style: "카테고리 뱃지 시각 스타일"
     max_image_size_kb: "최대 이미지 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다."
     max_attachment_size_kb: "최대 첨부파일 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다."
     authorized_extensions: "파일 업로드에 허용되는 확장자 리스트 ('*'을 사용하면 모든 타입의 파일이 가능합니다.)"
+    theme_authorized_extensions: "테마 업로드에 허용되는 확장자 목록('*'를 입력하면 모든 확장자 허용)"
     max_similar_results: "새로운 글타래를 작성할 때, 에디터 위에 보여줄 비슷한 글타래들의 개수. 제목과 본문을 바탕으로 비교합니다."
+    max_image_megapixels: "이미지의 최대 메가픽셀수"
     title_prettify: "일반적인 제목의 오타 및 오류를 수정해준다. 모두 대문자로 쓰거나, 첫자가 소문자이거나(영문), 복수의 !, ? 혹은 마침표(.)가 중복으로 들어간 것 등"
     topic_views_heat_low: "글타래가 연하게 하이라이트 되기 위한 조회수"
     topic_views_heat_medium: "글타래가 적당하게 하이라이트 되기 위한 조회수"
@@ -744,8 +1095,11 @@ ko:
     faq_url: "FAQ주소가 있으면 전체 URL을 적어주세요."
     tos_url: "이용약관이 있으면 전체 URL을 적어주세요."
     privacy_policy_url: "개인정보 보호가 있으면 전체 URL을 적어주세요."
+    newuser_spam_host_threshold: "새로운 사용자가 동일한 호스트의 링크를 포스팅하더라도 스팸으로 간주되지 않는 최대 포스팅 수 `newuser_spam_host_threshold`"
     white_listed_spam_host_domains: "스팸 호스트 테스트로부터 제외할 도메인 리스트. 새로운 사용자는 새로운 사용자는 헤당 도메인에 대한 링크를 포함하는 글를 생성하는데 제한되지 않는다."
     staff_like_weight: "스태프가 좋아요를 눌렀을 때 부여할 가산점"
+    topic_view_duration_hours: "N 시간마다 IP/User 별로 새 토픽 조회수를 셉니다."
+    user_profile_view_duration_hours: "N 시간마다 IP/User 별로 새 프로필 조회수를 셉니다."
     levenshtein_distance_spammer_emails: "스패머 메일을 체크할 때, 허용할 다른 글자 개수(fuzzy match)"
     max_new_accounts_per_registration_ip: "(n) 회원등급의 0개의 계정(스태프도 tl2 이상도 아닌 계정만)이 이 IP에 있으면, 새로운 회원가입 방지."
     min_ban_entries_for_roll_up: "Roll up 버튼을 눌렀을 때, 적어도 (N)개의 엔트리가 있다면 새 subnet ban 엔트리를 만듭니다."
@@ -753,45 +1107,101 @@ ko:
     max_age_unmatched_ips: "(N)일 뒤에 안 맞는 막힌 IP 접근을 지웁니다."
     num_flaggers_to_close_topic: "추후 중재를 위해 자동으로 글타래를 일시정지시킬 최소 신고자 수"
     num_flags_to_close_topic: "추후 중재를 위해 자동으로 글타래를 일시정지시킬 최소 신고 횟수"
+    num_hours_to_close_topic: "운영진 중재를 위하여 토픽을 중지시킬 시간"
     auto_respond_to_flag_actions: "신고 기각 시 자동 답변 활성화"
+    min_first_post_typing_time: "사용자가 첫번째 포스트를 작성할 때 타이핑에 소요해야 하는 밀리초. 설정값에 도달하지 않았을 때는 자동으로 승인 큐에 포함됩니다. 승인 0으로 설정하면 해제됩니다.(해제는 권장하지 않습니다)"
+    auto_block_fast_typers_on_first_post: " min_first_post_typing_time에 도달하지 않은 사용자를 자동으로 차단"
+    auto_block_fast_typers_max_trust_level: "빠른 타이핑이 감지되면 자동 차단을 적용할 최대 신뢰도"
+    auto_block_first_post_regex: "첫번째 포스트를 검사하여 통과하면 사용자를 차단하고 승인 대기열에 포함시키는 대소문자 구분이 없는 정규표현식. 예: raging|a[bc]a, 는 raging, aba, aca를 포함한 첫번째 포스트를 차단합니다. 첫번째 포스트에만 적용됩니다."
     reply_by_email_enabled: "이메일을 통해 주제에 답글을 달 수 있음."
     reply_by_email_address: "이메일 주소로 답글을 다는 템플릿. 예: %{reply_key}@reply.myforum.com"
+    alternative_reply_by_email_addresses: "수신된 이메일에 대한 답장메일의 대체 템플릿 목록. 예: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
+    incoming_email_prefer_html: "수신 이메일에 text 대신 HTML을 사용"
     disable_emails: "Discourse가 어떤 메일로 보내지 못하도록 합니다."
     strip_images_from_short_emails: "2800바이트, 즉 2.73 KB 이내 사이즈를 가지도록 이미지를 빼주세요."
     short_email_length: "짦은 이메일 바이트 길이"
+    display_name_on_email_from: "이메일 보낸사람 필드에 전체 이름을 표시"
+    unsubscribe_via_email: "사용자가 이메일 제목이나 내용에 'unsubscribe' 를 포함시켜서 답장하면 이메일 구독을 해지가 되도록 허용"
+    unsubscribe_via_email_footer: "이메일의 하단에 이메일 mailto: 링크 방식의 구독해지 링크를 첨부하기"
+    delete_email_logs_after_days: "(N) 일이 지나면 이메일 로그 삭제하기. 0으로 설정하면 삭제하지 않음"
+    max_emails_per_day_per_user: "사용자에게 보낼 이메일의 하루 최대치. 0으로 설정하면 제한없음."
+    enable_staged_users: "수신 이메일 처리 중일 때 자동으로 격리된 회원 생성."
+    maximum_staged_users_per_email: "수신된 이메일을 처리하는 동안 생성할 최대 격리회원 수"
+    auto_generated_whitelist: "자동 생성 메일로 체크되지 않는 이메일 주소의 목록. 예: foo@bar.com|discourse@bar.com"
+    block_auto_generated_emails: "자동 생성된 이메일로 확인된 수신 이메일 차단."
+    ignore_by_title: "제목을 기준으로 수신 메일 무시."
+    mailgun_api_key: "webhook 메시지를 확인할 Mailgun Secret API 키"
+    soft_bounce_score: "임시 반송이 일어났을 때 사용자에게 반송 스코어 추가."
+    hard_bounce_score: "영구 반송이 일어났을 때 사용자에게 반송 스코어 추가."
+    bounce_score_threshold: "사용자에게 메일을 보낼 최대 반송 스코어."
+    bounce_score_threshold_deactivate: "사용자를 비활성화 할 최대 반송 스코어."
+    reset_bounce_score_after_days: "X 일 이후 반송 스코어 자동 초기화."
+    attachment_content_type_blacklist: "콘텐츠 타입을 기준으로 첨부를 차단할 키워드 블랙리스트."
+    attachment_filename_blacklist: "파일 이름을 기준으로 첨부를 차단할 키워드 블랙리스트."
+    enable_forwarded_emails: "[베타] 사용자가 이메일 포워딩으로 토픽을 생성할 수 있도록 허용"
+    always_show_trimmed_content: "항상 수신 메일의 다듬어진 부분을 표시. 경고: 메일 주소가 드러날 수 있습니다."
+    private_email: "개인 정보 보호를 위하여 이메일에 포스트나 토픽의 내용 미포함."
+    manual_polling_enabled: "이메일 답장을 위한 API를 사용하여 이메일 푸시"
     pop3_polling_enabled: "POP3를 이용한 이메일 설문조사"
     pop3_polling_ssl: "SSL로 POP3 서버를 연결합니다. (추천)"
+    pop3_polling_openssl_verify: "TLS 서버 인증서 검증 (기본값: 적용)"
     pop3_polling_period_mins: "이메일을 받기 위해 POP3S 계정을 체크하는 분 단위 NOTE: 재시동 필요."
     pop3_polling_port: "이메일 설문조사를 위한 POP3 포트번호 "
     pop3_polling_host: "이메일 설문조사를 위한 POP3 호스트"
     pop3_polling_username: "이메일 설문조사를 위한 POP3 사용자 계정 이름"
     pop3_polling_password: "이메일 설문조사를 위한 POP3 사용자 비밀번호"
+    log_mail_processing_failures: "이메일 처리 실패 로그를 http://yoursitename.com/logs 에 남기기"
     email_in: "이메일을 통해 새로운 글타래를 포스팅할 수 있도록 허가한다.(POP3 polling 필요) 각 카테고리의 \"Setting\" 탭에서 주소를 설정합니다."
     email_in_min_trust: "이메일을 통해 새 글타래를 포스팅 할 수 있는 최소 사용자 회원등급"
     email_prefix: "이메일 제목에 쓰일 [라벨]. 설정하지 않으면 기본적으로 'title(필수 설정의)' 이 된다."
     email_site_title: "사이트에서 전송되는 이메일의 보내는 이를 사이트 이름으로 설정. 설정하지 않으면 'title(필수 설정의)'이 된다. 만약 'title'에 보내는 이에 허용되지 않는 글자가 포함되어 있으면 이 설정이 사용된다."
+    find_related_post_with_key: "응답 포스트를 찾을 때는 reply 키만 사용.(Amazon SES 사용 시 권장)"
     minimum_topics_similar: "새로운 글타래를 작성할 때, 유사한 글타래들을 보여주기 위해 존재해야 할 최소 글타래 개수"
     relative_date_duration: "절대적 날짜(9월 3일) 대신 상대적 날짜(7일 전)가 사용될 일 수 (글타래가 작성된 이후부터)"
     delete_user_max_post_age: "(x)일 이전의 첫 글가 있는 유저는 삭제할 수 없음."
     delete_all_posts_max: "전체 글 지우기 버튼을 통해 한번에 삭제할 수 있는 최대 글 수. 만약 사용자가 이것보다 많은 글을 가지고 있으면 한번에 삭제 할 수 없다."
     username_change_period: "등록 후 사용자 이름 최소 유지 일 수(0은 사용자 이름 변경을 막음)"
     email_editable: "가입 후 이메일 주소 변경 허용"
+    logout_redirect: "로그아웃 후에 리디렉션할 위치 (예: http://somesite.com/logout)"
+    allow_uploaded_avatars: "사용자가 커스텀 프로필 사진을 올릴 수 있도록 허용."
+    allow_animated_avatars: "사용자가 프로필 사진으로 애니메이션 GIF 파일을 올릴 수 있도록 허용. 경고: 이 설정을 바꾼 후  avatars:refresh rake task 를 실행."
     allow_animated_thumbnails: "움직이는 gif로 썸네일을 만듭니다."
     default_avatars: "신규가입자가 받게될 기본 아바타 URL"
     automatically_download_gravatars: "사용자가 계정을 만들거나 이메일을 변경하자마자 Gravatar를 다운로드합니다."
+    digest_topics: "요약 이메일에 표시할 인기 토픽의 최대 개수."
+    digest_posts: "요약 이메일에 표시할 인기 포스트의 최대 개수."
+    digest_other_topics: "요약 이메일의 '신규 토픽과 팔로우하는 카테고리'에 표시되는 토픽의 최대 개수."
+    digest_min_excerpt_length: "요약 이메일에서 발췌된 포스트의 최소 표시 글자 수."
+    suppress_digest_email_after_days: "(n) 일 이상 사이트를 방문하지 않은 사용자에게는 요약 이메일 보내지 않기."
+    digest_suppress_categories: "요약 이메일에서 이 카테고리 숨기기."
+    disable_digest_emails: "모든 사용자에게 요약 이메일 전송 해제하기"
+    email_accent_bg_color: "강조 색상은 HTML 이메일의 몇몇 요소의 배경색상으로 사용됩니다. 색상명('red')이나 hex 값('#FF0000')을 입력하세요."
+    email_accent_fg_color: "텍스트 컬러는 HTML 이메일의 배경색상으로 렌더링됩니다. 색상명('white')나 hex값('#FFFFFF')을 입력하세요."
+    email_link_color: "HTML 이메일의 링크 색상. 색상명('blue')나 hex값('#0000FF')를 입력하세요."
+    detect_custom_avatars: "사용자가 커스텀 프로필 사진을 올렸는지의 체크 여부."
     max_daily_gravatar_crawls: "하루에 Discourse가 커스텀 아파타를 위해 Gravatar를 체크하는 최대 횟수"
     public_user_custom_fields: "유저가 쓸 수 있는 공개 커스텀 필드 목록"
     staff_user_custom_fields: "스태프가 쓸 수 있는 공개 커스텀 필드 목록"
-    enable_user_directory: "전체 유저 둘러보기 목록 제공"
+    enable_user_directory: "브라우징을 위한 유저의 디렉토리 제공"
+    enable_group_directory: "브라우징을 위한 그룹의 디렉토리 제공"
     allow_anonymous_posting: "익명 모드 허용"
     anonymous_posting_min_trust_level: "익명 게시 할 수 있는 최소 회원등급"
     anonymous_account_duration_minutes: "한 익명이 익명계정을 만들 때 빨리 만드는 걸 막을 분 단위 시간 예: 600으로 정해놓으면 마지막 게시하고 익명 전환 후로 600분이 지나는 즉시 새 계정이 만들어 집니다."
+    hide_user_profiles_from_public: "익명사용자의 사용자 카드, 사용자 프로필, 사용자 디렉토리 해제."
+    user_website_domains_whitelist: "이 목록에 속한 도메인으로는 개인 웹사이트 등록 불가함. ` | `를 구분자로 한 목록."
     allow_profile_backgrounds: "사용자에게 프로필 배경 이미지 업로드를 허용합니다."
+    sequential_replies_threshold: "너무 많은 연속 댓글을 달고 있다고 경고를 받지 않고 사용자가 연달아 쓸 수 있는 포스트 수."
+    get_a_room_threshold: "경고를 받지 않고, 같은 토픽에서 같은 사람에게 보낼 수 있는 허용 포스트 수."
     enable_mobile_theme: "모바일 디바이스는 모바일 환경에 친화적인 테마를 사용합니다, 그리고 PC용 화면으로 전환할 수 있습니다. 만약 커스텀 스타일 시트를 사용한다면 이것을 비활성화 시키세요."
     dominating_topic_minimum_percent: "한 글타래에서 한 사용자의 영향력을 결정하는 글 수의 퍼센트"
+    disable_avatar_education_message: "아바타 변경 교육 메시지 해제."
     suppress_uncategorized_badge: "글타래 리스트에서 카테고리가 없는 글타래에 대한 훈장을 보여주지 않는다."
+    permalink_normalizations: "퍼마링크를 매칭하기 전에 다음 정규표현식을 적용. 예: /(topic.*)\\?.*/\\1 를 적용하면 토픽 루트에서 퀴리 스트링을 뽑아냅니다. 캡쳐된 값에 접근하려면 정규표현식+스트링 형식에 \\1 등을 사용하면 됩니다."
     global_notice: "긴급, 비상 전체 배너를 모든 방문자에게 표시합니다. 숨기려면 빈칸으로 바꾸면 됩니다(HTML 허용)."
     disable_edit_notifications: "'download_remote_images_to_local'가 활성화되있으면 시스템 사용자에 의한 수정 알림을 비활성화합니다."
+    automatically_unpin_topics: "사용자가 하단에 도달하면 토픽 고정을 자동 해제."
+    read_time_word_count: "읽은 시간 추정치 계산을 위한 1분 당 워드 카운트."
+    share_anonymized_statistics: "익명화된 사용 통계 공유하기"
     full_name_required: "사용자 프로필에서 실명을 필수 입력 항목으로 설정"
     enable_names: "사용자의 실명을 프로필, 사용자카드, 이메일에서 표시함. 실명을 표시하지 않으려면 체크를 해제하세요."
     display_name_on_posts: "글에 @username 뿐만 아니라 사용자의 전체 이름도 보여준다."
@@ -806,6 +1216,7 @@ ko:
     embed_username_key_from_feed: "feed에서 Discourse 아이디 가져올 때 쓰는 Key"
     embed_truncate: "임베드된 글 비우기"
     embed_post_limit: "글 개수가 최대치입니다."
+    embed_username_required: "토픽 생성을 위한 사용자명이 필요합니다."
     embed_whitelist_selector: "embed에서 보여져야 할 DOM element 선택하는 CSS 셀렉터"
     embed_blacklist_selector: "embed에서 지워져야 할 DOM element 선택하는 CSS 셀렉터"
     show_create_topics_notice: "이 사이트에 5개 이하의 공개 글타래가 있으면, 관리자에게 글타래 좀 만들라고 알려줍니다."
@@ -816,6 +1227,15 @@ ko:
     emoji_set: "어떤 emoji가 좋은가요?"
     enforce_square_emoji: "모든 emoji를 정사각형 비율로 강제로 바꿉니다."
     approve_unless_trust_level: "허가 받고 글 올려야 하는 유저들 최저 회원등급"
+    default_email_mailing_list_mode: "기본으로 새로운 포스트가 생길 때마다 이메일 보내기"
+    default_email_mailing_list_mode_frequency: "이 빈도로 이메일 받기를 설정한 메일링 리스트 가입자"
+    tag_style: "태그 배지 시각 스타일"
+    min_trust_level_to_tag_topics: "토픽에 태깅할 수 있는 최소 신뢰도"
+    suppress_overlapping_tags_in_list: "토픽 이름에 태그가 포함되어있으면 그 태그는 숨기기"
+    remove_muted_tags_from_latest: "무시한 태그를 포함한 토픽은 최신 토픽 목록에서 숨기기"
+    company_short_name: "회사 이름 (짧게)"
+    company_full_name: "회사 이름 (전체)"
+    company_domain: "회사 도메인"
     errors:
       invalid_email: "유효하지 않은 이메일 주소입니다."
       invalid_username: "해당 이름의 사용자가 없습니다."
@@ -830,12 +1250,15 @@ ko:
       invalid_string_min: "글자수가 %{min}자 이상이어야 합니다."
       invalid_string_max: "글자 수가 %{max}자 이상이어야 합니다."
       invalid_reply_by_email_address: "값이 반드시 '%{reply_key}'를 갖고 있어야하며 알림 이메일과 달라야합니다."
+      invalid_regex: "허용되지 않거나 올바르지 않은 정규표현식입니다."
   search:
     within_post: "#%{post_number} by %{username}"
     types:
       category: '카테고리'
       topic: '검색 결과'
       user: '사용자'
+  sso:
+    login_error: "로그인 에러"
   original_poster: "원본 게시자"
   most_posts: "최대 게시자"
   most_recent_poster: "최근 게시자"
@@ -845,6 +1268,7 @@ ko:
     not_seen_in_a_month: "잘 돌아오셨습니다. 다음은 당신이 오지 않은 동안 가장 인기있던 글타래들입니다."
   change_owner:
     post_revision_text: "소유권이 %{old_user}에서 %{new_user}으로 이전되었습니다."
+    deleted_user: "삭제된 사용자"
   topic_statuses:
     archived_enabled: "이 글타래는 보관되었고 더이상 변경하실 수 없습니다."
     archived_disabled: "이 글타래의 보관이 풀렸고 이제 변경하실 수 있습니다."
@@ -870,6 +1294,7 @@ ko:
     pinned_globally_disabled: "이 글타래는 이제 고정이 풀렸습니다. 더이상 카테고리 상단에 보이지 않을 것입니다."
     visible_enabled: "이 글타래는 리스트에 추가되었습니다. 글타래 리스트에 나타나게 될 것입니다."
     visible_disabled: "이 글타래는 이제 리스트에서 해제되었습니다. 더이상 글타래 리스트에 나타나지 않습니다. 링크를 통해서만 접근할 수 있습니다."
+    auto_deleted_by_timer: "타이머에 의해 자동삭제됨"
   login:
     not_approved: "당신의 계정은 아직 활성화되지 않았습니다. 이메일을 확인하시고 로그인 해주세요."
     incorrect_username_email_or_password: "계정 아이디, 이메일 또는 패스워드가 다릅니다."
@@ -891,21 +1316,34 @@ ko:
     close_window: "사용자 인증 완료. 계속하기 위해 브라우저 창을 닫으세요."
   user:
     no_accounts_associated: "연계된 계정이 없음"
+    deactivated_by_staff: "운영진에 의해 비활성화됨"
+    activated_by_staff: "운영진에 의해 활성화됨"
+    new_user_typed_too_fast: "타이핑이 너무 빠른 신규 사용자"
+    content_matches_auto_block_regex: "자동 블럭 문구와 일치하는 내용"
     username:
       short: "최소 %{min}자 이상이어야 합니다."
       long: "%{max}자 이상 사용할 수 없습니다."
       characters: "문자나 숫자만 사용해야 합니다."
       unique: "이미 사용중입니다."
       blank: "공백이 없어야 합니다."
+      must_begin_with_alphanumeric_or_underscore: "첫글자는 알파벳, 숫자, 언더바만 쓸 수 있습니다."
+      must_end_with_alphanumeric: "마지막 글자는 알파벳이나 숫자만 가능합니다."
+      must_not_contain_two_special_chars_in_seq: "특수 문자(.-_)를 연달아 사용할 수 없습니다."
+      must_not_end_with_confusing_suffix: "혼동을 일으키는 접미사(.json, .png 등등)로 끝나면 안됩니다."
     email:
       not_allowed: "이 이메일 제공업체는 허용되지 않습니다. 다른 이메일 제공 업체를 사용하세요."
       blocked: "는 허용되지 않습니다"
+      revoked: "'%{email}'로 %{date}까지는 이메일을 보내지 않습니다."
     ip_address:
       blocked: "이 IP주소에서는 가입이 안됩니다."
       max_new_accounts_per_registration_ip: "이 IP에서는 가입이 더이상 되지 않습니다(최대 가입 제한 도달). 스태프에게 연락주세요."
+    website:
+      domain_not_allowed: "유효하지 않은 웹사이트입니다. 허용되는 도메인 목록: %{domains}"
   flags_reminder:
     subject_template:
       other: "%{count}개의 신고가 접수 대기 중"
+  unsubscribe_mailer:
+    title: "메일링 구독해지"
   invite_mailer:
     subject_template: "%{invitee_name} 회원님이 %{site_domain_name} 에 '%{topic_title}'에 초대하였습니다."
   invite_forum_mailer:
@@ -951,8 +1389,21 @@ ko:
         죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다.
 
         이메일에 내용이 안 보입니다. 답글이 이메일 상단에 있는지 확인 해주세요 -- 한줄 답변은 처리 못합니다.
+    email_error_notification:
+      title: "이메일 에러 알림"
+    too_many_tl3_flags:
+      title: "TL3 Flag가 너무 많음"
+      subject_template: "대기중인 신규 계정"
+    blocked_by_staff:
+      title: "운영진에 의해 차단됨"
+    user_automatically_blocked:
+      title: "사용자 자동차단됨"
     spam_post_blocked:
+      title: "스팸 게시글 차단됨"
       subject_template: "%{username} 신규가입자가 연속 링크로 블락됨"
+    unblocked:
+      title: "차단해제됨"
+      subject_template: "계정의 대기가 해제되었습니다"
     pending_users_reminder:
       subject_template:
         other: "%{count}명의 새로운 사용자가 가입 승인 대기중 입니다."
@@ -961,8 +1412,15 @@ ko:
 
         [운영자 색션에서 새로운 사용자들을 리뷰하세요](/admin/users/list/pending).
     download_remote_images_disabled:
+      title: "해제된 원격 이미지 다운로드하기"
       subject_template: "외부에서 이미지 다운로드 못함"
       text_body_template: "`download_remote_images_to_local` 설정이`download_remote_images_threshold`에서 정한 디스크 용량에 도달하여 비활성화 되었습니다."
+    dashboard_problems:
+      title: "대시보드 문제사항"
+      subject_template: "문제가 발견되었습니다."
+    new_user_of_the_month:
+      title: "이달의 신규회원으로 선정되었습니다!"
+      subject_template: "이달의 신규회원으로 선정되었습니다!"
   subject_re: "덧: "
   subject_pm: "[PM] "
   user_notifications:
@@ -971,12 +1429,63 @@ ko:
       title: "구독해지"
       description: "이메일들에 관심이 없나요? 아래 구독해지를 눌러서 바로 구독을 해지할 수 있습니다:"
     posted_by: "%{username} 사용자가 %{post_date}에 게시하였습니다."
+    user_posted:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+    user_watching_first_post:
+      title: "첫 포스트를 주시하고 있는 사용자"
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm:
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_posted_pm_staged:
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |2
+
+        %{message}
     digest:
       why: "%{last_seen_at}부터 지금까지 %{site_link} 사이트 근황"
+      since_last_visit: "마지막 방문 후 경과시간"
+      new_topics: "새로운 토픽"
+      unread_messages: "읽지않은 메시지"
+      unread_notifications: "읽지않은 알림"
+      liked_received: "받은 좋아요 수"
+      new_posts: "새 포스트"
+      new_users: "새로운 사용자"
+      popular_topics: "인기 토픽"
+      follow_topic: "이 토픽 팔로우"
+      join_the_discussion: "더 보기"
+      popular_posts: "인기 포스트"
+      subject_template: "[%{email_prefix}] 요약"
       click_here: "클릭"
+    forgot_password:
+      title: "비밀번호 찾기"
+      subject_template: "[%{email_prefix}] 비밀번호 리셋"
+    set_password:
+      title: "비밀번호 설정"
+    admin_login:
+      title: "관리자 로그인"
+      subject_template: "[%{email_prefix}] 로그인"
     signup_after_approval:
       subject_template: "당신은 %{site_name} 가입이 승인되었습니다!"
+    signup:
+      title: "가입하기"
+      subject_template: "[%{email_prefix}] 새 계정 확인"
   page_not_found:
+    title: "이런! 그 페이지는 더 이상 존재하지 않거나 비공개 상태입니다."
     popular_topics: "인기"
     recent_topics: "최근"
     see_more: "더"
@@ -990,17 +1499,21 @@ ko:
     title: "서비스 이용약관"
     signup_form_message: 'I have read and accept the <a href="/tos" target="_blank">Terms of Service</a>.'
   deleted: '삭제되었습니다'
+  image: "이미지"
   upload:
     edit_reason: "이미지를 다운로드 합니다."
     unauthorized: "업로드 하시려는 파일 확장자는 사용이 불가능합니다 (사용가능 확장자: %{authorized_extensions})."
     pasted_image_filename: "게시된 이미지"
     store_failure: "#%{user_id}가 업로드한 파일 #%{upload_id} 을 저장하는데 실패함."
+    file_missing: "죄송합니다. 업로드 할 파일을 지정하셔야 합니다."
+    empty: "죄송합니다. 지정된 파일은 빈 파일입니다."
     attachments:
       too_large: "죄송합니다, 업로드하려는 파일이 너무 큽니다. (최대 크기 %{max_size_kb}KB)."
     images:
       too_large: "죄송합니다, 업로드하려는 이미지가 너무 큽니다. (최대 크기 %{max_size_kb}KB). 크기를 줄여서 다시 시도해보세요."
       size_not_found: "죄송합니다. 이미지 사이즈가 잘못 되었습니다. 혹시 깨진 이미지가 아닌가요?"
   email_log:
+    post_user_deleted: "이 포스트를 쓴 사용자가 삭제되었습니다"
     no_user: "ID %{user_id} 인 사용자를 찾을 수 없습니다"
     anonymous_user: "유저가 익명임"
     suspended_not_pm: "메세지가 아니라 사용자가 정지됐습니다."
@@ -1011,12 +1524,19 @@ ko:
     post_deleted: "글쓴이에 의해 삭제된 글"
     user_suspended: "정지된 사용자"
     already_read: "이미 읽은 글"
+    exceeded_emails_limit: "max_emails_per_day_per_user 초과"
+    exceeded_bounces_limit: "bounce_score_threshold 초과"
     message_blank: "메세지가 비어있음"
     message_to_blank: "메세지가 비어있음"
     text_part_body_blank: "본문이 비어있음"
     body_blank: "본문이 비어있음"
   color_schemes:
     base_theme_name: "기본 테마 색상"
+    default: "라이트 Scheme"
+    dark: "다크 Scheme"
+    default_theme_name: "기본값"
+    dark_theme_name: "다크"
+    light_theme_name: "라이트"
   about: "소개"
   guidelines: "가이드라인"
   privacy: "개인정보처리방침"
@@ -1033,6 +1553,226 @@ ko:
     title: "서비스 이용약관"
   privacy_topic:
     title: "개인정보처리방침"
+  badges:
+    editor:
+      name: 에디터
+      description: 첫 포스트 편집
+      long_description: |
+        이 배지는 처음으로 포스트를 편집했을 때 수여됩니다. 글을 고치는 것은 언제나 좋은 일이죠. 포스트를 더 낫게 만들 수도 있고, 작은 실수를 고칠 수도 있고, 처음 포스트를 올렸을 때 깜빡하고 못올렸던 걸 추가할 수도 있으니까요. 편집으로 당신의 포스트를 더 좋게 만들어보세요!
+    basic_user:
+      name: 초보회원
+      description: 모든 기본적인 커뮤니티 기능이 <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">수여되었습니다</a>
+      long_description: |
+        이 배지는 신뢰도 1에 도달했을 때 수여됩니다. 잠시 동안 머물러서 몇 가지 토픽을 읽고 이 커뮤니티가 어떤 곳인지 탐구해주셔서 감사합니다. 당신의 신규 사용자 제한은 사라졌습니다. 이제 개인 메시지 보내기, 신고하기, 위키 편집하기, 이미지나 링크를 여러 개 올리기와 같은 기본적인 커뮤니티 기능을 사용하실 수 있습니다.
+    member:
+      name: 준회원
+      description: 초대장 보내기, 그룹 메시징, 더 많은 좋아요 보내기가<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">가능합니다</a>
+      long_description: |
+        이 배지는 신뢰도 2에 도달했을 때 수여됩니다. 몇 주가 넘도록 참여하시면서 우리 커뮤니티와 함께해주셔서 감사합니다. 이제 개인 토픽이나 사용자 페이지에서 초대장을 보낼 수 있고, 그룹 개인 메시지를 보내고 하루에 더 많은 좋아요를 보낼 수 있습니다.
+    regular:
+      name: 정회원
+      description: 카테고리 재조정, 이름바꾸기, 링크 팔로우, 위키, 더 많은 좋아요<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">가 가능합니다.</a>
+      long_description: |
+        이 배지는 신뢰도 4에 도달했을 때 수여됩니다. 여러 달이 넘도록 우리 커뮤니티의 중요멤버가 되어주셔서 감사합니다. 당신은 가장 활동적인 구독자이고 우리 커뮤니티를 훌륭하게 만드는 믿을만한 기여자이기도 합니다. 이제 당신은 토픽의 이름을 바꾸거나 카테고리 재조정을 할 수 있고, 더 강력한 신고 기능과 개인 라운지의 사용이 가능합니다. 그리고 하루에 더 많은 좋아요를 보낼 수 있습니다.
+    leader:
+      name: 지도자
+      description: 전역 편집, 핀 고정, 닫기, 아카이브, 자르고 붙이기, 더 많은 좋아요가<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">가능합니다</a>
+      long_description: |
+        이 배지는 신뢰도 4에 도달했을 때 수여됩니다. 당신은 운영진에게 선택받은 이 커뮤니티의 리더입니다. 당신의 말과 행동은 이 커뮤니티의 다른 사용자에게 좋은 모범이 되고 있습니다. 이제 당신은 모든 포스트를 편집할 수 있는 권한과 핀 고정, 닫기, 목록해제, 아카이브, 자르기, 붙이기 같은 공통 토픽 운영권한을 가지게 됩니다. 그리고 하루에 엄청나게 많은 좋아요를 보낼 수 있습니다.
+    welcome:
+      name: 웰컴
+      description: 좋아요를 받았습니다
+      long_description: |
+        이 배지는 당신이 쓴 포스트에 좋아요를 처음받았을 때 수여됩니다. 축하드립니다. 동료 커뮤니티 사용자들이 흥미를 느끼는 훌륭한 포스트를 올리셨군요!
+    autobiographer:
+      name: 자서전 작가
+      description: <a href="/my/preferences">프로필</a> 정보를 채워넣었습니다.
+      long_description: |
+        이 배지는 <a href="/my/preferences">사용자 프로필</a>을 채워 넣고 프로필 사진을 올렸을 때 수여됩니다. 커뮤니티에 당신이 누구인지 무엇에 흥미를 느끼는지를 알려주면, 커뮤니티를 더 끈끈하게 만드는데 도움이 됩니다. 같이 갑시다!
+    anniversary:
+      name: 1주년
+      description: 1년동안 활동하고 글도 1개이상 썼습니다
+      long_description: |
+        이 배지는 한 해동안 회원으로 활동하고 그 동안 글도 하나 이상 썼을 때 수여됩니다. 이 커뮤니티에 머물면서 기여해주셔서 감사합니다. 당신 없이는 안됐을거예요.
+    nice_post:
+      name: 멋진 답글
+      description: 답글에 좋아요 10개를 받았습니다
+      long_description: |
+        이 배지는 당신이 쓴 답글에 좋아요 10개가 달렸을 때 수여됩니다. 당신의 답글은 커뮤니티에 인상을 남기고, 토론이 원활히 진행되는데 도움이 되었습니다!
+    good_post:
+      name: 훌륭한 답글
+      description: 답글에 좋아요 25개를 받았습니다
+      long_description: |
+        이 배지는 당신이 쓴 답글에 좋아요 25개가 달렸을 때 수여됩니다. 써주신 답글은 독창적이고 모두의 대화의 수준을 올리는 데 기여했습니다!
+    great_post:
+      name: 위대한 답글
+      description: 답글에 좋아요 50개를 받았습니다
+      long_description: |
+        이 배지는 당신이 쓴 답글에 좋아요 50개가 달렸을 때 수여됩니다. 쓰신 답글은 매우 영감 넘치며, 흥미있으며, 재미있고, 마음을 움직이는 답글이어서 커뮤니티가 이 답글을 매우 좋아합니다.
+    nice_topic:
+      name: 멋진 토픽
+      description: 토픽에 좋아요 10개를 받았습니다
+      long_description: |
+        이 배지는 올린 토픽에 좋아요 10개가 달렸을 때 수여됩니다. 우와, 커뮤니티가 즐기는 좋은 대화거리를 올리셨군요!
+    good_topic:
+      name: 훌륭한 토픽
+      description: 토픽에 좋아요 25개를 받았습니다
+      long_description: |
+        이 배지는 올린 토픽에 좋아요 25개가 달렸을 때 수여됩니다. 커뮤니티가 활발히 움직이게끔 하는 활기찬 토론을 시작하셨군요!
+    great_topic:
+      name: 위대한 토픽
+      description: 토픽에 좋아요 50개를 받았습니다
+      long_description: |
+        이 배지는 올린 토픽이 좋아요 50개를 받았을 때 수여됩니다. 온 커뮤니티가 좋아하는 활동적인 이야기가 오고가는 멋진 대화를 시작하셨군요!
+    nice_share:
+      name: 멋진 공유
+      description: 공유한 포스트로 외부 방문자 25명이 들어왔습니다
+      long_description: |
+        이 배지는 공유한 포스트 링크로 외부 방문자 25명이 들어왔을 때 수여됩니다. 우리의 토론과 커뮤니티를 알려주셔서 감사합니다.
+    good_share:
+      name: 훌륭한 공유
+      description: 공유한 포스트로 외부 방문자 300명이 들어왔습니다
+      long_description: |
+        이 배지는 공유한 포스트 링크로 외부 방문자 300명이 들어왔을 때 수여됩니다. 잘하셨어요! 여러 사람에게 우리의 훌륭한 토론을 보여주고 이 커뮤니티가 성장하는데 도움을 주셨습니다.
+    great_share:
+      name: 위대한 공유
+      description: 공유한 포스트로 외부 방문자 1000명이 들어왔습니다
+      long_description: |
+        이 배지는 공유한 포스트 링크로 외부 방문자 1000명이 들어왔을 때 수여됩니다. 우와! 엄청나게 많은 사람을 데리고 와서 이 토론을 더 흥미롭게 만드셨네요. 우리 커뮤니티의 성장에 아주 큰 기여를 하셨습니다!
+    first_like:
+      name: 첫 좋아요
+      description: 포스트에 좋아요를 보냈습니다
+      long_description: |
+        이 배지는 :heart: 버튼을 사용해서 포스트에 좋아요를 처음으로 했을 때 수여됩니다. 포스트에 좋아요를 남기는 것은 동료 커뮤니티 멤버에게 그들의 포스트가 흥미롭고 쓸모있고 멋지고 재밌다고 표시하는 훌륭한 방법입니다. 사랑을 나누세요!
+    first_flag:
+      name: 첫 신고
+      description: 포스트를 신고했습니다
+      long_description: |
+        이 배지는 처음으로 포스트를 신고했을 때 수여됩니다. 신고를 하는 것은 이 커뮤니티를 깨끗하고 밝게 만드는 방법입니다. 이유를 불문하고 운영진이 체크해야할 필요가 있다고생각되면 주저하지 말고 신고를 해주세요. 글을 쓴 사용자에게 포스트에 문제가 있는 것 같다고 <b> 개인 메시지</b>를 보낼 수도 있습니다. 문제를 발견했다면 :flag_black: 신고하세요!
+    promoter:
+      name: 후원자
+      description: 사용자를 초청했습니다
+      long_description: |
+        이 배지는 사용자 페이지나 토픽의 하단에서 초대 버튼을 눌러 다른 사람을 우리 커뮤니티에 초대했을 때 수여됩니다. 특정 주제에 대해 흥미를 느낄 것 같은 친구를 초대하는 것은 우리 커뮤니티를 새로운 사람에게 알리는 훌륭한 방법입니다. 고마워요!
+    campaigner:
+      name: 사회운동가
+      description: 기본 사용자 3명을 초청했습니다
+      long_description: |
+        이 배지는 초대한 사용자 3명이 기본 사용자가 되는 충분한 시간을 보냈을 때 수여됩니다. 활기찬 커뮤니티가 되려면 대화에 꾸준히 참여하며 새로운 목소리를 더하는 새로운 사람이 늘 필요하지요.
+    champion:
+      name: 챔피언
+      description: 회원 5명을 초대했습니다
+      long_description: |
+        이 배지는 초대한 사용자 5명이 정회원이 되는 충분한 시간을 보냈을 때 수여됩니다. 우와! 우리 커뮤니티에 새로운 멤버를 초대해서 다양성을 넓혀주신 것에 감사드립니다!
+    first_share:
+      name: 처음 공유해요
+      description: 포스트를 공유했습니다
+      long_description: |
+        이 배지는 공유 버튼으로 토픽이나 답글의 링크를 처음으로 공유했을 때 수여됩니다. 링크를 공유하는 것은 바깥 세상에 훌륭한 대화를 자랑하고 우리 커뮤니티를 성장시키는 훌륭한 방법입니다.
+    first_link:
+      name: 처음 링크걸어요
+      description: 다른 토픽에 링크를 추가했습니다
+      long_description: |
+        이 배지는 다른 토픽의 링크를 추가했을 때 수여됩니다.  토픽을 링크하면 토픽을 서로 연결시켜주어서 동료 사용자가 연관된 다른 대화를 찾는데 도움이 됩니다. 자유롭게 링크하세요!
+    first_quote:
+      name: 처음 인용해요
+      description: 포스트를 인용함
+      long_description: |
+        이 배지는 답글을 쓸 때 처음으로 인용을 했을 때 수여됩니다. 앞선 포스트의 관련있는 부분을 인용하면 대화가 토픽과 다른 포스트끼리 연결되는데 도움이 됩니다. 인용을 하는 가장 쉬운 방법은 포스트의 특정 내용을 마우스로 드래그하고 답글 버튼을 누르는 것입니다. 아낌없이 인용해보세요!
+    read_guidelines:
+      name: 가이드라인을 읽었어요
+      description: <a href="/guidelines">커뮤니티 가이드라인</a> 을 읽었습니다
+      long_description: |
+        이 배지는 <a href="/guidelines">커뮤니티 가이드라인</a>을 읽은 사용자에게 수여됩니다. 이 단순한 가이드라인을 따르는 것만으로 모두에게 안전하고, 즐겁고, 지속가능한 커뮤니티가 되는데 도움이 됩니다. 이 화면 너머에 다른 사람이 있다는 것을 명심합시다. 착하게 살아요!
+    reader:
+      name: 독서가
+      description: 100개가 넘는 답글이 달린 토픽의 답글을 모두 읽었습니다
+      long_description: |
+        이 배지는 100개가 넘는 댓글이 달린 긴 토픽을 처음으로 읽었을 때 수여됩니다. 대화를 유심히 읽는 것은 토론의 흐름을 잡고, 다른 관점을 이해하게 해서 더 흥미로운 대화가 되게끔 해줍니다. 많이 읽을 수록 더 훌륭한 대화가 됩니다. 흔히 얘기하듯이, 읽는 것이 힘이죠! :slight_smile:
+    popular_link:
+      name: 인기 링크
+      description: 게시한 외부링크가 50회 클릭되었습니다
+      long_description: |
+        이 배지는 공유한 링크가 50 클릭을 받았을 때 수여됩니다. 대화에 흥미로운 링크를 더해주셔서 감사합니다!
+    hot_link:
+      name: 핫 링크
+      description: 게시한 외부링크가 300회 클릭되었습니다
+      long_description: |
+        이 배지는 공유한 링크가 300클릭을 받았을 때 수여됩니다. 멋진 링크로 더 풍성하고 빛나는 대화를 만들어주셔서 감사합니다!
+    famous_link:
+      name: 완전유명 링크
+      description: 게시한 외부링크가 1000회 클릭되었습니다
+      long_description: |
+        이 배지는 공유한 링크가 1000클릭을 받았을 때 수여됩니다. 우와! 기본적인 세부사항, 흐름, 정보를 덧붙여주셔서 대화를 획기적으로 발전시키셨군요. 잘하셨습니다!
+    appreciated:
+      name: 고맙습니다
+      description: 포스트 20개를 써서 좋아요 1개를 받았습니다
+      long_description: |
+        이 배지는 포스트 20개를 올려서 적어도 하나의 좋아요를 받았을 때 수여됩니다. 우리 커뮤니티는 당신의 나눔에 대하여 즐거워하고 있습니다!
+    respected:
+      name: 존경합니다
+      description: 포스트 100개를 써서 좋아요 2개를 받았습니다
+      long_description: |
+        이 배지는 포스트 100개를 올려서 적어도 2개의 좋아요를 받았을 때 수여됩니다. 우리 커뮤니티는 당신의 많은 기여와 나눔을 존경합니다.
+    admired:
+      name: 숭배합니다
+      description: 포스트 300개를 써서 좋아요 5개를 받았습니다
+      long_description: |
+        이 배지는 300개의 포스트를 올려서 적어도 5개의 좋아요를 받았을 때 수여됩니다. 와우! 우리 커뮤니티는 당신의 꾸준하고 질높은 기여를 숭배합니다.
+    out_of_love:
+      name: 사랑꾼
+      description: 하루에 좋아요 50개를 보냈습니다
+      long_description: |
+        이 배지는 하루에 50개의 좋아요를 사용했을 때 수여됩니다. 잠시 시간을 내서 당신이 좋아하는 포스트에 좋아요를 남기면 동료 사용자가 앞으로 더 훌륭한 토론을 하는 것에 힘을 보태줍니다.
+    higher_love:
+      name: 박애주의자
+      description: 5번이나 좋아요 50개를 보냈습니다
+      long_description: |
+        이 배지는 50개의 좋아요를 사용한 날이 5일 이상일 때 수여됩니다. 매일 훌륭한 대화를 응원해주셔서 감사합니다!
+    crazy_in_love:
+      name: 사랑밖에 모르는 바보
+      description: 20번이나 좋아요 50개를 보냈습니다
+      long_description: |
+        이 배지는 50개의 좋아요를 사용한 날이 20일 이상일 때 수여됩니다. 와우! 동료 사용자를 어떻게 응원해야하는지의 모범 그 자체시네요!
+    thank_you:
+      name: 고마워요
+      description: 10개의 포스트를 '좋아요'하고 20개의 '좋아요'를 받았습니다
+      long_description: |
+        이 배지는 받은 좋아요가 20개이고 10개 이상의 좋아요를 보냈을 때 수여됩니다. 누군가 나의 포스트를 좋아한다면 나도 다른 사람이 쓴 글에 좋아요를 눌러봅시다.
+    gives_back:
+      name: 주거니 받거니
+      description: 100개의 게시글을 '좋아요'하고 100개의 '좋아요'를 받았습니다
+      long_description: |
+        이 배지는 100개의 좋아요를 받고 똑같이 100개의 좋아요를 보냈을 때 수여됩니다. 주거니 받거니 옳거니!
+    empathetic:
+      name: 대인배
+      description: 1000개의 게시글을 '좋아요'하고 500개의 '좋아요'를 받았습니다
+      long_description: |
+        이 배지는 500개의 좋아요를 받고 1000개 이상의 좋아요를 되돌려줬을 때 수여됩니다. 우와! 당신은 관대함과 상호 존중의 모범입니다 :two_hearts:.
+    first_emoji:
+      name: 첫 Emoji
+      description: 게시글에 Emoji를 사용했습니다
+      long_description: |
+        이 배지는 포스트에 Emoji를 처음으로 추가했을 때 수여됩니다:thumbsup:. Emoji는 행복함부터 :smiley: 슬픔 :anguished:  그리고 분노 :angry: 에 이르기 까지 많은 감정을 포스트에 싣게 해줍니다:sunglasses: . 그냥 : (콜론) 을 입력하거나 툴바에서 Emoji버튼을 누르면 수많은 Emoji를 선택할 수 있어요 :ok_hand:
+    first_mention:
+      name: 첫 멘션
+      description: 처음으로 포스트에서 다른 사용자를 멘션했습니다
+      long_description: 이 배지는 포스트에서 다른 사람의 @아이디 를 처음으로 멘션했을 때 수여됩니다. 각각의 멘션들은 해당 사용자에게 알림을 생성해서 당신이 쓴 포스트에 대해 알게 해줍니다. 그냥 @ 를 친 후 사용자 아이디를 입력하거나, 허용이 되어있다면 그룹을 입력할 수 있습니다. 관심을 끌 수 있는 아주 간편한 방법이죠.
+    first_onebox:
+      name: 첫 박스 링크
+      description: 박스 링크를 처음으로 포스팅했습니다
+      long_description: 이 배지는 포스트의 링크만으로 이루어진 글 한줄을 남겨서 박스링크를 만들 때 수여됩니다.  박스링크에는 링크의 간략한 요약과 타이틀, (만약에 있다면) 그림이 실리게 됩니다.
+    first_reply_by_email:
+      name: 첫 이메일 답글
+      description: 포스트에 이메일로 답글을 달았습니다
+      long_description: |
+        이 배지는 처음으로 이메일을 통해 댓글을 남겼을 때 수여됩니다:e-mail:.
+    new_user_of_the_month:
+      name: "이달의 신규 회원"
+      description: 첫 달에 눈에띄는 기여를 했습니다
+      long_description: |
+        이 배지는 매달 누구에게 얼마나 많은 좋아요를 받았는지를 기준으로 가장 훌륭한 기여를 한 신규 사용자 두 명을 축하하기 위하여 수여됩니다.
+    badge_title_metadata: "%{site_title}의 %{display_name} 배지"
   admin_login:
     success: "이메일 보냄"
     error: "에러!"
@@ -1041,6 +1781,144 @@ ko:
   performance_report:
     initial_post_raw: 이 글타래는 웹사이트의 일일 성능 보고를 포함하고 있습니다.
     initial_topic_title: 웹사이트 성능 보고
+  tags:
+    title: "태그"
+    staff_tag_disallowed: "\"%{tag}\" 태그는 운영진만 붙일 수 있습니다."
+    staff_tag_remove_disallowed: "\"%{tag}\" 태그는 운영진만 제거할 수 있습니다."
+  rss_by_tag: "토픽에%{tag}태그가 달렸습니다"
+  finish_installation:
+    congratulations: "축하합니다. Discourse를 설치하셨습니다!"
+    register:
+      button: "등록하기"
+      title: "관리자 계정 등록"
+      help: "시작하려면 새로운 계정을 등록하세요"
+      no_emails: "안타깝게도, 설치중에 입력된 관리자 이메일이 없습니다. 그래서 설정을 완료하는 것이<a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>어려울 수도 있습니다</a>."
+    confirm_email:
+      title: "이메일을 확인하세요"
+      message: "<p>활성화 메일을 <b>%{email}</b>로 보냈습니다. 안내에 따라 계정을 활성화 하세요.</p><p>만약 메일이 도착하지 않았다면, Discourse를 위한 이메일 설정을 정확히 했는지 확인하시고 스팸폴더를 확인해 보세요.</p>"
+    resend_email:
+      title: "활성화 이메일 다시 보내기"
+      message: "<p>활성화 이메일을 <b>%{email}</b>로 보냈습니다."
+  safe_mode:
+    title: "안전모드 들어가기"
+    description: "안전 모드가 켜지면 플러그인과 커스터마이징을 빼고 사이트를 테스트합니다."
+    no_customizations: "현재 테마 해제하기"
+    only_official: "비공식 플러그인 해제하기"
+    no_plugins: "모든 플러그인 해제하기"
+    enter: "안전모드 들어가기"
+  wizard:
+    title: "Discourse Setup"
+    step:
+      locale:
+        title: "Welcome to your Discourse!"
+        fields:
+          default_locale:
+            description: "What’s the default language for your community?"
+      forum_title:
+        title: "이름"
+        description: "이 이름은 이 사이트의 간판이 되며, 방문자들이 이 커뮤니티를 파악하는 <i>첫번째</i> 요소가 됩니다. 사이트 이름과 타이틀은 이 커뮤니티에 대하여 무엇을 알려주나요?"
+        fields:
+          title:
+            label: "커뮤니티 이름"
+            placeholder: "빠오 소굴"
+          site_description:
+            label: "당신의 커뮤니티를 짧은 문장으로 축약하여 설명해보세요"
+            placeholder: "빠오가 친구와 함께 재밌는 일들에 대하여 이야기나누는 곳"
+      introduction:
+        title: "소개"
+        fields:
+          welcome:
+            label: "웰컴 토픽"
+            description: "<p>만약 1분동안 낯선 사람에게 이 커뮤니티를 설명해야한다면 어떻게 말하실 건가요?</p> <ul> <li>이 토론에는 누가 참여하나요?</li> <li>여기에서 어떤 것을 볼 수 있나요?</li> <li>왜 방문해야 하나요?</li> </ul> <p>환영 토픽은 새로운 방문자가 가장 처음으로 읽을 글이됩니다. 이 토픽을<b>한 문단으로 된</b> '엘리베이터 피칭' 또는 '사명 선언문'이라고 생각하시면 됩니다. </p>"
+            one_paragraph: "환영 메시지를 딱 한 문단으로 줄여주세요."
+      privacy:
+        title: "접근성"
+        description: "<p>당신의 커뮤니티는 모두에게 열려있나요? 아니면 멤버십, 초대장, 허가로 제한되어 있나요? 원하신다면 비공개로 만든 다음, 나중에 공개로 전환할 수도 있습니다.</p> <p>초대장은 언제든지 토픽이나 사용자 프로필 페이지에서 보낼 수 있습니다.</p>"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "공개"
+                description: "누구나 이 커뮤니티에 접근해서 계정을 생성할 수 있음"
+              restricted:
+                label: "비공개"
+                description: "내가 초대하거나 허가한 사람만 이 커뮤니티에 접근 가능"
+      contact:
+        title: "연락처"
+        fields:
+          contact_email:
+            label: "메일"
+            placeholder: "name@example.com"
+            description: "이 커뮤니티를 대표하는 개인 또는 그룹 이메일 주소를 입력하세요. 처리되지 않은 신고, 보안 업데이트와 같은 중요한 알림을 받게되며 긴급한 커뮤니티 연락을 받도록<a href='/about' target='_blank'>about 페이지</a> 에도 표시됩니다."
+          contact_url:
+            label: "웹 페이지"
+            placeholder: "http://www.example.com/contact-us"
+            description: "당신 또는 당신의 조직을 위한 Contact 웹페이지입니다. <a href='/about' target='_blank'>about 페이지</a>에 나타나게 됩니다."
+          site_contact:
+            label: "자동화된 메시지"
+            description: "Discourse에서 자동발신되는 모든 개인 메시지(예를 들어 환영메시지)는 이 사용자로부터 발송됩니다."
+      corporate:
+        title: "소속"
+        description: "이 이름은 운영자 카테고리에서 편집할 수 있는<a href='/privacy' target='blank'>개인정보 정책</a> 과 <a href='/tos' target='blank'>서비스 이용 약관</a> 토픽에 들어가게 됩니다. 회사가 없다면, 이 단계를 건너뛰어도 무방합니다."
+        fields:
+          company_short_name:
+            label: "회사 이름 (짧게)"
+            placeholder: "Initech"
+          company_full_name:
+            label: "회사 이름 (전체)"
+            placeholder: "Initech, Inc."
+          company_domain:
+            label: "회사 도메인명"
+            placeholder: "initech.com"
+      colors:
+        title: "테마"
+        fields:
+          theme_id:
+            description: "사이트 컬러 Scheme으로는 라이트가 좋으세요, 다크가 좋으세요? 관리자, 커스터마이징으로 들어가시면 더 많은 커스터마이징을 통해 사이트의 룩앤필을 바꿀 수 있습니다."
+            choices:
+              default:
+                label: "심플 라이트"
+              dark:
+                label: "심플 다크"
+      logos:
+        title: "로고"
+        fields:
+          logo_url:
+            label: "주사용 로고"
+            description: "사이트의 좌측 상단에 보이는 로고 이미지. 옆으로 넓은 사각형을 사용하세요."
+          logo_small_url:
+            label: "컴팩트 로고"
+            description: "사이트의 스크롤을 내릴 때 좌측 상단에 보이는 컴팩트 버전 로고. 정사각형을 사용하세요."
+      icons:
+        title: "아이콘"
+        fields:
+          favicon_url:
+            label: "작은 아이콘"
+            description: "가로 세로 32px 와 같은 작은 사이즈의 아이콘을 쓸 때 예쁘게 보이는 웹 브라우저에서 사이트를 대표할 아이콘 이미지"
+          apple_touch_icon_url:
+            label: "큰 아이콘"
+            description: "더 큰 사이즈의 아이콘을 쓸 때 예쁘게 보이는 모던 기기에서 사이트를 대표할 아이콘 이미지. 사이즈는 최소 가로 세로 144px 권장."
+      homepage:
+        description: "저희는 최근 토픽을 홈페이지에 노출하는 것을 추천합니다. 하지만, 원하신다면 홈페이지에 카테고리(토픽의 그룹)를 보이게 할 수도 있습니다."
+        title: "홈페이지"
+        fields:
+          homepage_style:
+            choices:
+              latest:
+                label: "최신 토픽"
+              categories:
+                label: "카테고리"
+      emoji:
+        title: "Emoji"
+        description: "당신의 커뮤니티에는 어떤 스타일의 Emoji를 쓰고 싶으세요? 관리자, 커스터마이징, Emoji 메뉴에서 사용자정의 Emoji를 더 추가할 수도 있습니다."
+      invites:
+        title: "운영진 초청하기"
+        description: "이제 거의 다 됐습니다! 운영진을 몇명 초대해서<a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>토론을 시작하는 데</a>도움을 받아보세요. 흥미로운 토픽도 올리고 답글도 써서 커뮤니티를 시작해보세요."
+      finished:
+        title: "당신의 Discourse가 준비되었습니다!"
+        description: |
+          <p>이 설정을 바꾸고 싶어지면, <a href='/admin' target='_blank'>관리자 섹션</a>으로 들어가세요. 사이트 메뉴에 공구처럼 생긴 아이콘을 누르면 됩니다.</p>
+          <p>당신의 <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>새로운 커뮤니티 만들기</a>를 응원합니다!</p>
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index d2ec3b79ca3..a51ebbca305 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -117,7 +117,7 @@ nb_NO:
   invalid_access: "Du har ingen tilgang til denne resurssen."
   read_only_mode_enabled: "Siden er i skrivebeskyttet modus. Alle interaksjoner er utilgjengelige."
   reading_time: "Lesetid"
-  likes: "Kjærtegn"
+  likes: "Likes"
   too_many_replies:
     one: "Vi beklager, men nye brukere er midlertidig begrenset til 1 svar i det samme emnet."
     other: "Vi beklager, men nye brukere er midlertidig begrenset til %{count} svar i det samme emnet."
@@ -280,7 +280,6 @@ nb_NO:
   meta_category_description: "Diskusjon om dette nettstedet, hvordan det er organisert, hvordan det fungerer og hvordan vi kan forbedre det."
   staff_category_name: "Stab"
   staff_category_description: "Privat kategori for diskusjoner blant staben. Emner er kun synlige for administratorer og moderatorer."
-  assets_topic_body: "Dette er et permanent emne, synlig bare for staben, for å lagre bilder og filer brukt i sidens design. Ikke slett det!\n\n\nHvordan legge til nye filer:\n\n\n1. Svar på dette emnet.\n2. Last opp alle bilder du vil bruke, som logoer, favicons osv. (Bare dra bildene inn i skrivefeltet, eller bruk knappen for opplasting.)\n3. Send inn svaret ditt for å poste det.\n4. Høyreklikk på bildene i din nye post for å få lenken til de opplastede bildene, eller klikk på redigeringsikonet for å kopiere lenkene fra skrivefeltet.\n5. Lim disse lenkene inn i [basic settings](/admin/site_settings/category/required).\n\n\nHvis du trenger å tillate andre filtyper, rediger `authorized_extensions` i [file settings](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Velkommen til Discourse"
   lounge_welcome:
@@ -551,9 +550,9 @@ nb_NO:
       xaxis: "Dag"
       yaxis: "Antall nye innlegg"
     likes:
-      title: "Kjærtegn"
+      title: "Likes"
       xaxis: "Dag"
-      yaxis: "Antall nye kjærtegn"
+      yaxis: "Antall nye likes"
     flags:
       title: "Flagg"
       xaxis: "Dag"
@@ -717,7 +716,7 @@ nb_NO:
     google_oauth2_client_id: "Klient-ID tilhørende din Google-søknad."
     rate_limit_create_post: "Etter et innlegg må ny brukere vente (n) sekunder før de kan skrive et nytt"
     rate_limit_new_user_create_post: "Etter et innlegg må ny brukere vente (n) sekunder før de kan skrive et nytt"
-    max_likes_per_day: "Maximum antall kjærtegn per bruker per dag"
+    max_likes_per_day: "Maximum antall likes per bruker per dag"
     max_invites_per_day: "Maksimalt antall invitasjoner en bruker kan sende hver dag."
     max_logins_per_ip_per_hour: "Maksimalt antall innlogginger som tillates for hver IP-adresse per time."
     newuser_max_links: "Hvor mange linker en ny bruker kan legge til i et innlegg."
@@ -862,7 +861,7 @@ nb_NO:
       new_topics: "Nye emner"
       unread_messages: "Uleste meldinger"
       unread_notifications: "Uleste varslinger."
-      liked_received: "Kjærtegn mottatt"
+      liked_received: "Likes mottatt"
       new_posts: "Nye innlegg"
       new_users: "Nye brukere"
       popular_topics: "Populære emner"
@@ -870,7 +869,6 @@ nb_NO:
       join_the_discussion: "Les mer"
       popular_posts: "Populære innlegg"
       more_new: "Nytt for deg"
-      unsubscribe: "Denne oppsummeringen blir sendt fra %{site_link} når vi ikke har sett deg på en stund. For å melde deg av %{unsubscribe_link}."
       click_here: "trykk her"
       from: "%{site_name} oppsummering"
       preheader: "En kort oppsummering siden ditt siste besøk på %{last_seen_at}"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 008db077b5c..828a8c074ba 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -357,7 +357,6 @@ nl:
   staff_category_name: "Staf"
   staff_category_description: "Privécategorie voor stafgesprekken. Topics zijn alleen zichtbaar voor beheerders en moderators."
   assets_topic_title: "Assets voor het websiteontwerp"
-  assets_topic_body: "Dit is een permanent topic, alleen zichtbaar voor staf, voor het opslaan van afbeeldingen en bestanden die in het ontwerp van de website worden gebruikt. Verwijder het niet!\n\n\nZo werkt het:\n\n\n1. Antwoord op dit topic.\n2. Upload hier alle afbeeldingen die u voor logo's, favicons, enzovoorts wilt gebruiken. (Gebruik het werkbalkpictogram voor uploaden in de berichteditor, of sleep of plak afbeeldingen.)\n3. Verzend uw antwoord om dit te plaatsen.\n4. Klik met de rechtermuisknop op de afbeeldingen in uw nieuwe bericht om het pad naar de geüploade afbeeldingen te verkrijgen, of klik op het bewerkingspictogram om uw bericht te bewerken en het pad naar de afbeeldingen op te halen. Kopieer de afbeeldingspaden.\n5. Plak die afbeeldingspaden in [basisinstellingen](/admin/site_settings/category/required).\n\n\nAls u verschillende soorten uploads van bestandstypen dient in te schakelen, bewerk dan 'authorized_extensions' in de [bestandsinstellingen](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Welkom bij Discourse"
     body: |2
@@ -632,7 +631,6 @@ nl:
         remove: "Dit topic is geen banner meer. Het zal niet meer bovenaan elke pagina verschijnen."
   unsubscribed:
     title: "Uitgeschreven!"
-    description: "U bent uitgeschreven. <a href='%{url}'>Bezoek uw gebruikersvoorkeuren</a> om uw e-mailinstellingen te wijzigen."
     topic_description: "Gebruik de meldingsinstellingen onder of rechts van het topic om u opnieuw voor %{link} in te schrijven."
   unsubscribe:
     title: "Uitschrijven"
@@ -897,7 +895,6 @@ nl:
     notify_mods_when_user_blocked: "Als een gebruiker automatisch geblokkeerd is, stuur dan een bericht naar alle moderatoren."
     flag_sockpuppets: "Als een nieuwe gebruiker antwoord op een topic vanaf hetzelfde ip-adres als de nieuwe gebruiker die het topic opende, markeer dan beide berichten als potentiële spam."
     traditional_markdown_linebreaks: "Gebruik traditionele regeleinden in Markdown, welke 2 spaties aan het einde van een regel nodig heeft voor een regeleinde."
-    allow_html_tables: "Sta toe dat tabellen in Markdown mogen worden ingevoerd met behulp van HTML-tags. TABLE, TD, TR, TH zullen aan de whitelist worden toegevoegd (vereist volledig herbouwen van alle oude berichten met tabellen)"
     post_undo_action_window_mins: "Het aantal minuten waarin gebruikers hun recente acties op een bericht nog terug kunnen draaien (liken, markeren, etc)."
     must_approve_users: "Stafleden moeten alle nieuwe gebruikersaccounts goedkeuren voordat ze de site mogen bezoeken. OPGELET: als dit wordt aangezet voor een actieve site wordt alle toegang voor bestaande niet stafleden ingetrokken."
     pending_users_reminder_delay: "Moderators informeren als nieuwe gebruikers al langer dan dit aantal uren op goedkeuring wachten. Stel dit in op -1 om meldingen uit te schakelen."
@@ -1508,8 +1505,8 @@ nl:
       popular_posts: "Populaire berichten"
       more_new: "Nieuw voor u"
       subject_template: "[%{email_prefix}] Samenvatting"
-      unsubscribe: "Deze samenvatting is verstuurd door %{site_link}, omdat we je al een tijdje niet gezien hebben. Om je af te melden van onze community e-mails, %{unsubscribe_link}."
       click_here: "klik hier"
+      from: "%{site_name} samenvatting"
       preheader: "Een korte samenvatting sinds uw laatste bezoek op %{last_seen_at}"
     set_password:
       title: "Wachtwoord instellen"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 9ea8bc17054..84074ab6c97 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -354,7 +354,6 @@ pl_PL:
   meta_category_description: "Dyskusje o tej stronie, jej organizacji, tym jak działa i jak możemy ją usprawnić."
   staff_category_name: "Zespół"
   staff_category_description: "Ukryta kategoria dla rozmów zespołu. Tematy są widoczne tylko dla adminów i moderatorów."
-  assets_topic_body: "Ten temat jest widoczny tylko dla członków zespołu. Służy do przechowywania obrazów i plików wykorzystywanych w wyglądzie serwisu. Nie usuwaj go!\n\n\nJak go używać:\n\n\n1. Odpowiedz na ten temat.\n2. Dodaj wszystkie grafiki jakich chcesz użyć jako logo, favicon itd. (Użyj ikony wysyłania w edytorze wpisu lub przeciągnij i upuść.)\n3. Wyślij odpowiedź, aby je zachować.\n4. Kliknij prawym przyciskiem myszy na grafice i skopiuj jej adres URL.\n5. Wklej adres w [ogólnych ustawieniach](/admin/site_settings/category/required).\n\nJeśli chcesz włączyć możliwość przesyłania dodatkowych typów plików, zmień  `authorized_extensions` w [ustawieniach plików](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Witaj w Discourse"
     body: |2
@@ -603,6 +602,7 @@ pl_PL:
     admin_confirm:
       title: "Potwierdź konto administratora"
       description: "Czy jesteś pewny, że chcesz nadać użytkownikowi <b>%{target_username}</b> uprawnienia administratora?"
+      grant: "Przynaj prawa Admina"
       complete: "<b>%{target_username}</b> jest teraz administratorem."
       back_to: "Wróć do %{title}"
   post_action_types:
@@ -634,14 +634,17 @@ pl_PL:
     bookmark:
       title: 'Zakładka'
       description: 'Dodaj ten wpis do zakładek'
+      short_description: 'Dodaj do zakładek ten wpis'
       long_form: 'dodano ten wpis do zakładek'
     like:
       title: 'Polub'
       description: 'Polub ten wpis'
+      short_description: 'Polub ten wpis'
       long_form: 'polubiono to'
     vote:
       title: 'Głosuj'
       description: 'Głosuj za tym wpisem'
+      short_description: 'Zagłosuj na ten wpis'
       long_form: 'zagłosowano za tym wpisem'
   user_activity:
     no_bookmarks:
@@ -678,7 +681,6 @@ pl_PL:
         remove: "Ten temat nie jest już banerem. Nie będzie pojawiać się na górze każdej strony."
   unsubscribed:
     title: "Od subskrybuj!"
-    description: "Zostałeś wypisany. Aby zmienić ustawienia swojego emaila  <a href='%{url}'>zajrzyj na ustawienia użytkownika</a>."
     topic_description: "Aby ponownie zasubskrybować %{link}, użyj kontrolki powiadomienia na dole lub po prawej stronie tematu."
   unsubscribe:
     title: "Wypisz"
@@ -954,7 +956,6 @@ pl_PL:
     notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators."
     flag_sockpuppets: "Jeśli nowy użytkownik odpowiada na dany temat z tego samego adresu IP co nowy użytkownik, który założył temat, oznacz ich posty jako potencjalny spam."
     traditional_markdown_linebreaks: "Używaj tradycyjnych znaków końca linii w Markdown, to znaczy dwóch spacji na końcu linii."
-    allow_html_tables: "Pozwalaj tabelom być zamieszczanym w Markdown przy użyciu tagów HTML. TABLE, THEAD, TD, TR, TH będą dozwolone (wymaga pełnego rebake na wszystkich starych postach zawierających tabele)."
     post_undo_action_window_mins: "Przez tyle minut użytkownicy mogą cofnąć swoje ostatnie działania przy danym poście (lajki, flagowanie, itd.)."
     must_approve_users: "Zespół musi zaakceptować wszystkie nowe konta zanim uzyskają dostęp do serwisu. UWAGA: włączenie tego dla już udostępnionej strony sprawi, że zostanie odebrany dostęp wszystkim istniejącym użytkownikom spoza zespołu."
     pending_users_reminder_delay: "Powiadomić moderatorów jeżeli nowi użytkownicy czekali na zatwierdzenie dłużej niż his mamy godzin. Ustaw -1 aby wyłączyć powiadomienia. "
@@ -1347,40 +1348,8 @@ pl_PL:
     subject_template: "Potwierdź, że nie chcesz już otrzymywać powiadomień mailowych ze strony %{site_title}"
   invite_mailer:
     subject_template: "%{invitee_name} zaprosił cię do '%{topic_title}' na %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} zaprosił cię do dyskusji
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      w serwisie
-
-      > %{site_title} -- %{site_description}
-
-      Jeśli jesteś zainteresowany, kliknij w link:
-
-      %{invite_link}
   custom_invite_mailer:
     subject_template: "%{invitee_name} zaprosił cię do dyskusji '%{topic_title}' w serwisie %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} zaprosił cię do dyskusji
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      w serwisie
-
-      > %{site_title} -- %{site_description}
-
-      Informacja od zapraszającego:
-
-      > %{user_custom_message}
-
-      Jeśli jesteś zainteresowany, kliknij w link:
-
-      %{invite_link}
   invite_forum_mailer:
     subject_template: "%{invitee_name} zaprosił cię do dołączenia do %{site_domain_name}"
     text_body_template: |
@@ -1655,25 +1624,6 @@ pl_PL:
     visit_link_to_respond: "[Zobacz Temat](%{base_url}%{url}) aby odpowiedzieć."
     visit_link_to_respond_pm: "[Zobacz wiadomość](%{base_url}%{url}) aby odpowiedzieć."
     posted_by: "Dodany przez %{username} w dniu %{post_date}"
-    invited_to_private_message_body: |
-      %{username} zaprosił cię do wiadomści
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      w
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} zaprosił cię do dyskusji
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      w
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Użytkownik zaprosił do PW"
       text_body_template: |
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index d2b3bb9ff46..7968d800baf 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -27,29 +27,35 @@ pt:
   topics: "Tópicos"
   posts: "mensagens"
   loading: "A carregar"
+  powered_by_html: 'Desenvolvido por <a href="https://www.discourse.org">Discourse</a>, e melhor visualização com o JavaScript ativado'
   log_in: "Iniciar Sessão"
-  purge_reason: "Conta removida automaticamente como conta abandonada, desactivada."
-  disable_remote_images_download_reason: "O download remoto de imagens foi desativado por não haver espaço disponível no disco."
+  purge_reason: "Eliminada automaticamente como abandonada, conta desativada"
+  disable_remote_images_download_reason: "A transferência remota de imagens foi desativada por não haver espaço disponível no disco."
   anonymous: "Anónimo"
+  remove_posts_deleted_by_author: "Eliminado pelo autor"
+  themes:
+    bad_color_scheme: "Não é possível atualizar o tema, esquema de cor inválido"
+    other_error: "Ocorreu algo de errado ao atualizar o tema"
   emails:
     incoming:
+      default_subject: "Este tópico precisa de um título"
       show_trimmed_content: "Mostrar conteúdo aparado"
-      maximum_staged_user_per_email_reached: "Foi atingido o número máximo de utilizadores temporários por email."
+      maximum_staged_user_per_email_reached: "Foi atingido o número máximo de utilizadores temporários criados por e-mail."
       errors:
         empty_email_error: "Acontece quando a informação não processada do email recebido veio em branco."
-        no_message_id_error: "Acontece quando o email recebido não tem 'Message-Id' no cabeçalho da mensagem."
+        no_message_id_error: "Acontece quando o e-mail não tem 'Id. de Mensagem' no cabeçalho."
         auto_generated_email_error: "Acontece quando o cabeçalho 'precedence' é definida como: 'list', 'junk' ou 'auto_reply', ou quando algum cabeçalho contém: 'auto-submitted', 'auto-replied' ou 'auto-generated'."
-        no_body_detected_error: "Acontece quando conseguimos obter um corpo de mensagem e não existem anexos."
-        inactive_user_error: "Acontece quando o remetente não está activo."
-        blocked_user_error: "Acontece quando o remetente está bloqueado."
+        no_body_detected_error: "Acontece quando nós não conseguimos extrair um corpo e não existiam anexos."
+        inactive_user_error: "Acontece quando o remetente não está ativo."
+        blocked_user_error: "Acontece quando o remetente foi bloqueado."
         bad_destination_address: "Acontece quando nenhum dos endereços de email nos campos para/cc/bcc coincide com um endereço de email configurado."
-        strangers_not_allowed_error: "Acontece quando um utilizador tenta criar um tópico numa categoria da qual não é membro."
-        insufficient_trust_level_error: "Acontece quando um utilizador tentar criar um tópico numa categoria para a qual não tem o nível de confiança necessário."
-        reply_user_not_matching_error: "Acontece quando uma resposta veio de um endereço de email diferente do destinatário da notificação."
-        topic_not_found_error: "Acontece quando a resposta veio de um tópico relacionado mas o tópico relacionado foi apagado."
-        topic_closed_error: "Acontece quando uma resposta chegou mas o tópico relacionado foi fechado."
-        bounced_email_error: "O email é um relatório de email redirecionado."
-        screened_email_error: "Acontece quando a morada de email da pessoa que o enviou já foi confirmada."
+        strangers_not_allowed_error: "Acontece quando um utilizador tentou criar um novo tópico numa categoria em que não é membro."
+        insufficient_trust_level_error: "Acontece quando um utilizador tentou criar um novo tópico numa categoria em que não tem o nível de confiança necessário."
+        reply_user_not_matching_error: "Acontece quando uma resposta veio de um endereço de e-mail diferente de onde a notificação foi enviada."
+        topic_not_found_error: "Acontece quando é recebida uma resposta, mas que o tópico relacionado foi eliminado."
+        topic_closed_error: "Acontece quando é recebida uma resposta, mas que o tópico relacionado foi encerrado."
+        bounced_email_error: "A mensagem é um relatório de mensagem redirecionado."
+        screened_email_error: "Acontece quando o endereço de e-mail do remetente já foi confirmado."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -103,6 +109,8 @@ pt:
       max_username_length_range: "Não pode definir o máximo abaixo do mínimo."
       default_categories_already_selected: "Não pode selecionar uma categoria usada noutra lista."
       s3_upload_bucket_is_required: "Não pode ativar carregamentos para o S3 excepto se tiver fornecido o 's3_upload_bucket'."
+  invite:
+    not_found: "O seu código de convite é inválido. Por favor, contacte o administrador do site."
   bulk_invite:
     file_should_be_csv: "O ficheiro carregado deve ser do formato CSV."
     error: "Ocorreu um erro ao carregar esse ficheiro. Por favor tente mais tarde."
@@ -125,6 +133,8 @@ pt:
   embed:
     start_discussion: "Iniciar Discussão"
     continue: "Continuar Discussão"
+    no_hosts: "Não foram configurados anfitriões para incorporar."
+    configure: "Configurar Incorporação"
     more_replies:
       one: "mais 1 resposta"
       other: "mais %{count} respostas"
@@ -158,6 +168,7 @@ pt:
   spamming_host: "Pedimos desculpa, não pode colocar uma hiperligação para esse servidor."
   user_is_suspended: "Utilizadores suspensos não têm permissão para publicar."
   topic_not_found: "Algo de errado ocorreu. Talvez este tópico tenha sido fechado ou eliminado enquanto olhava para ele?"
+  not_accepting_pms: "Desculpe, de momento, %{username} não está a aceitar mensagens."
   just_posted_that: "é demasiado semelhante ao que publicaste recentemente"
   invalid_characters: "contem caracteres inválidos"
   is_invalid: "parece pouco claro, é uma frase completa?"
@@ -177,6 +188,12 @@ pt:
     latest: "Tópicos recentes"
     hot: "Tópicos quentes"
     top: "Melhores tópicos"
+    top_all: "Melhores tópicos de todos os tempos"
+    top_yearly: "Melhores tópicos do ano"
+    top_quarterly: "Melhores tópicos do trimestre"
+    top_monthly: "Melhores tópicos do mês"
+    top_weekly: "Melhores tópicos da semana"
+    top_daily: "Melhores tópicos do dia"
     posts: "Últimas mensagens"
     private_posts: "Mensagens privadas recentes"
     group_posts: "Mensagens recentes em %{group_name}"
@@ -190,6 +207,8 @@ pt:
   queue:
     delete_reason: "Eliminado através da fila de moderação de mensagens"
   groups:
+    success:
+      bulk_add: "%{users_added}utilizadores foram adicionados ao grupo."
     errors:
       can_not_modify_automatic: "Não pode modificar um grupo automático"
       member_already_exist: "'%{username}' já é membro deste grupo."
@@ -197,6 +216,7 @@ pt:
       invalid_incoming_email: "'%{email}' não é um endereço de email válido."
       email_already_used_in_group: "'%{email}' já é utilizado pelo grupo '%{group_name}'."
       email_already_used_in_category: "'%{email}' já é utilizado pela categoria '%{category_name}'."
+      cant_allow_membership_requests: "Não pode permitir pedidos de adesão para um grupo sem quaisquer donos."
     default_names:
       everyone: "todos"
       admins: "administradores"
@@ -207,6 +227,9 @@ pt:
       trust_level_2: "nivel_de_confianca_2"
       trust_level_3: "nivel_de_confianca_3"
       trust_level_4: "nivel_de_confianca_4"
+    request_membership_pm:
+      title: "Pedido de Adesão para @%{group_name}"
+      body: "Eu gostaria de de solicitar a adesão em @%{group_name}."
   education:
     until_posts:
       one: "1 mensagem"
@@ -261,16 +284,28 @@ pt:
               same_as_username: "é a mesma que o seu nome de utilizador. Por favor utilize uma palavra-passe mais segura."
               same_as_email: "é a mesma que o seu email. Por favor utilize uma palavra-passe mais segura."
               same_as_current: "é a mesma que a sua palavra-passe atual."
+              unique_characters: "tem demasiados carateres repetidos. Por favor, utilize uma palavra-passe mais segura."
             ip_address:
               signup_not_allowed: "A inscrição não é permitida através desta conta."
         color_scheme_color:
           attributes:
             hex:
               invalid: "não é uma cor válida"
+        post_reply:
+          base:
+            different_topic: "A publicação e a resposta devem pertencer ao mesmo tópico."
         web_hook:
           attributes:
             payload_url:
               invalid: "URL inválido. O URL deve incluir http:// ou https://. E espaços não são permitidos."
+        custom_emoji:
+          attributes:
+            name:
+              taken: já está a ser utilizado por outro emoji
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "deve estar no futuro."
       <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} ainda não colocou nada no campo Sobre Mim</div>"
@@ -280,7 +315,9 @@ pt:
   meta_category_description: "Discussão sobre este sítio, a sua organização, como funciona, e como podemos melhorá-lo."
   staff_category_name: "Pessoal"
   staff_category_description: "Categoria privada para discussões do pessoal. Os tópicos estão apenas visíveis para administradores e moderadores."
-  assets_topic_body: "Este é um tópico permanente, visível apenas à equipa de apoio, para armazenar imagens e ficheiros usados no design do sítio. Não o apague!\n\n\nVeja como:\n\n\n1. Responda a este tópico.\n2. Carregue todas as imagens que deseja usar para os logótipos, favicons, e tudo o mais. (Use o ícone da ferramenta de carregamento neste editor de mensagens, arraste ou cole imagens).\n3. Submeta a sua resposta.\n4. Clique com o botão direito do rato nas imagens da sua nova mensagem para obter o caminho das imagens submetidas, ou carregue no ícone de edição para editar a sua mensagem e recuperar o caminho para as imagens. Copie os caminhos das imagens.\n5. Cole esses caminhos em [configurações básicas](/admin/site_settings/category/required).\n\n\nSe precisar de ativar o carregamento de diferentes tipos de ficheiros, edite `authorized_extensions` em [configurações de ficheiros](/admin/site_settings/category/files)."
+  assets_topic_title: "Ativos para o desenho do site"
+  discourse_welcome_topic:
+    title: "Bem-vindo ao Discourse"
   lounge_welcome:
     title: "Bem-vindo ao Salão"
     body: |2+
@@ -434,6 +471,8 @@ pt:
         other: "há quase %{count} anos atrás"
   password_reset:
     no_token: "Desculpe, essa hiperligação para alterar a palavra-passe é muito antiga. Selecione o botão Iniciar Sessão e utilize 'Esqueci a minha palavra-passe' para obter uma nova hiperligação."
+    choose_new: "Escolha uma nova palavra-passe"
+    choose: "Escolha uma palavra-passe"
     update: 'Atualizar Palavra-passe'
     save: 'Definir Palavra-passe'
     title: 'Redefinir Palavra-passe'
@@ -456,43 +495,58 @@ pt:
     welcome_to: "Bem-vindo a %{site_name}!"
     approval_required: "Um moderador tem que aprovar a sua conta antes de poder aceder a este fórum. Irá receber um email quando a sua conta for aprovada!"
     missing_session: "Não conseguimos detectar se a sua conta foi criada, pelo que pedimos que confirme que tem os cookies permitidos."
+    activated: "Desculpe, esta conta já foi ativada."
+    admin_confirm:
+      title: "Confirmar Conta de Administrador"
+      description: "Tem a certeza que o <b>%{target_username}</b> seja um administrador?"
+      grant: "Conceder Acesso de Administrador"
+      complete: "<b>%{target_username}</b> é agora um administrador."
+      back_to: "Voltar a %{title}"
   post_action_types:
     off_topic:
       title: 'Fora de Contexto'
       description: 'Esta mensagem não é relevante para a discussão corrente, conforme definido pelo título e pela primeira mensagem, e provavelmente deverá ser transferida para outro tópico.'
+      short_description: 'Não é relevante para a discussão'
       long_form: 'sinalizou isto como fora de contexto'
     spam:
       title: 'Spam'
+      short_description: 'É um anúncio ou vandalismo'
       long_form: 'sinalizou isto como spam'
       email_title: '"%{title}" foi sinalizado como spam'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Inapropriado'
       description: 'Esta mensagem contém conteúdo que uma pessoa sensata iria considerar ofensivo, abusivo, ou como uma violação das <a href="/guidelines"> orientações da nossa comunidade</a>.'
+      short_description: 'Uma violação das <a href="/guidelines">nossas orientações da comunidade</a>'
       long_form: 'sinalizou isto como inapropriado'
     notify_user:
       title: 'Enviar uma mensagem a @{{username}}'
       description: 'Quero falar com esta pessoa diretamente e em privado acerca da sua mensagem.'
+      short_description: 'Eu quero falar com esta pessoa diretamente e em privado sobre a sua publicação.'
       long_form: 'utilizador com mensagens'
       email_title: 'A sua mensagem em "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Algo Mais"
       description: 'Esta mensagem requer a atenção do pessoal por outra razão não listada acima.'
+      short_description: 'Requer a atenção da equipa por outra razão'
       long_form: 'marcou isto para ser alvo da atenção do pessoal'
       email_title: 'Uma mensagem em "%{title}" requer a atenção do pessoal'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: 'Adicionar Marcador'
       description: 'Adicionar um marcador a esta mensagem'
+      short_description: 'Adicionar esta publicação aos marcadores'
       long_form: 'adicionou um marcador a esta mensagem'
     like:
       title: 'Gostar'
       description: 'Gostar desta mensagem'
+      short_description: 'Gostar desta publicação'
       long_form: 'gostou disto'
     vote:
       title: 'Votar'
       description: 'Votar nesta mensagem'
+      short_description: 'Votar para esta publicação'
       long_form: 'votou nesta mensagem'
   user_activity:
     no_bookmarks:
@@ -529,7 +583,6 @@ pt:
         remove: "Este tópico já não é uma faixa. Deixará de aparecer no topo de cada página."
   unsubscribed:
     title: "Subscrição cancelada!"
-    description: "A sua subscrição foi cancelada. Para mudar as suas definições de email <a href='%{url}'>visite as suas preferências de utilizador</a>."
     topic_description: "Para re-subscrever a %{link}, use o controle de notificação no fundo ou à direita do tópico."
   unsubscribe:
     title: "Cancelar subscrição"
@@ -804,7 +857,6 @@ pt:
     notify_mods_when_user_blocked: "Se um utilizador for bloqueado de forma automática, enviar uma mensagem a todos os moderadores."
     flag_sockpuppets: "Se um novo utilizador responde a um tópico a partir do mesmo endereço IP do novo utilizador que iniciou o tópico, sinalizar ambas as mensagens como potencial spam."
     traditional_markdown_linebreaks: "Utilize tradicionais quebras de linha no Markdown, que requer dois espaços no final para uma quebra de linha."
-    allow_html_tables: "Permitir inserção de tabelas em Markdown utilizando tags HTML. TABLE,THEAD, TD, TR,TH fazem parte da lista branca (requer que todas as mensagens antigas que contém tabelas sejam refeitas)"
     post_undo_action_window_mins: "Número de minutos durante o qual os utilizadores têm permissão para desfazer ações numa mensagem (gostos, sinalizações, etc)."
     must_approve_users: "O pessoal deve aprovar todas as novas contas de utilizador antes destas terem permissão para aceder ao sítio. AVISO: ativar isto para um sítio ativo irá revogar o acesso aos utilizadores existentes que não fazem parte do pessoal!"
     pending_users_reminder_delay: "Notificar moderadores se novos utilizadores estiverem à espera de aprovação por mais que esta quantidade de horas. Configurar com -1 para desativar notificações."
@@ -1711,29 +1763,6 @@ pt:
     visit_link_to_respond: "[Visitar Tópico](%{base_url}%{url}) para responder."
     visit_link_to_respond_pm: "[Visitar Mensagem](%{base_url}%{url}) para responder."
     posted_by: "Publicado por %{username} em %{post_date}"
-    invited_to_private_message_body: |+
-      %{username} convidou-o para uma mensagem
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      at
-
-      > %{site_title} -- %{site_description}
-
-    invited_to_topic_body: |+
-      %{username} convidou-o para uma discussão
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      em
-
-      > %{site_title} -- %{site_description}
-
-
     user_invited_to_private_message_pm:
       text_body_template: |
         %{header_instructions}
@@ -1853,7 +1882,6 @@ pt:
       follow_topic: "Acompanhar este tópico"
       join_the_discussion: "Ler Mais"
       popular_posts: "Publicações Populares"
-      unsubscribe: "Este resumo é enviado de %{site_link} quando não o vemos há algum tempo. Para anular a subscrição %{unsubscribe_link}."
       click_here: "clique aqui"
       from: "resumo de %{site_name}"
       preheader: "Um breve sumário desde a sua última visita em %{last_seen_at}"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index bdbe93b3cc6..873cf7e69ad 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -322,7 +322,6 @@ pt_BR:
   meta_category_description: "Discussão sobre este fórum, sua organização, como ele funciona e como podemos melhorá-lo."
   staff_category_name: "Equipe"
   staff_category_description: "Categoria particular para as discussões da equipe. Tópicos só são visíveis para os administradores e moderadores."
-  assets_topic_body: "Esse é um tópico permanente, visível apenas para a equipe, para arquivar imagens e arquivos usados no design do fórum. Não o delete!\n\n\nAqui está como:\n\n\n1. Responda a esse tópico.\n2. Envie todas as imagens que você deseja para serem usadas como logos, favicons e assim por diante aqui. (Utilize o ícone da barra de upload no editor de post, arraste e solte ou cole imagens.)\n3. Enviar sua resposta para publicá-la.\n4. Clique com o botão direito do mouse nas imagens em sua nova postagem para obter o endereço das imagens enviadas, ou clique no ícone de edição para editar o seu post e recuperar o caminho para as imagens. Copie o endereço da imagem.\n5. Copie o endereço das imagens nas [configurações básicas](/admin/site_settings/category/required).\n\nTambém, se você precisa ativar diferentes tipos de envios de arquivos, edite o `authorized_extensions` em [configurações de arquivo](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Bem vindo ao Discourse"
     body: |2
@@ -584,7 +583,6 @@ pt_BR:
         remove: "Este tópico não é mais um banner. Ela deixará de aparecer no topo de todas as páginas."
   unsubscribed:
     title: "Desinscrito!"
-    description: "You have been unsubscribed. To change your email settings <a href='%{url}'>visit your user preferences</a>.\n\nVocê se desinscreveu. Para alterar as suas configurações de email"
     topic_description: "Para se reinscrever a %{link}, use o controle de notificações no fim ou no canto direito do tópico."
   unsubscribe:
     title: "Desinscrever"
@@ -1341,16 +1339,6 @@ pt_BR:
     visit_link_to_respond: "[Visite o Tópico](%{base_url}%{url}) para responder."
     visit_link_to_respond_pm: "[Visite o Mensagem](%{base_url}%{url}) para responder."
     posted_by: "Postado por %{username} em %{post_date}"
-    invited_to_topic_body: |
-      %{username} convidou você para uma discussão
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      em
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       text_body_template: |
         %{header_instructions}
@@ -1470,7 +1458,6 @@ pt_BR:
       follow_topic: "Seguir esse tópico"
       join_the_discussion: "Leia Mais"
       popular_posts: "Publicações Populares"
-      unsubscribe: "Este resumo é enviado por %{site_link} quando não o vemos há algum tempo. Para cancelar a assinatura %{unsubscribe_link}."
       click_here: "clique aqui"
       from: "resumo do site %{site_name} "
       preheader: "Um breve resumo do que aconteceu no fórum desde a sua última visita no dia %{last_seen_at}"
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 2e6fab893e4..7bb1d31006d 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -320,7 +320,6 @@ ro:
   meta_category_description: "Discuții despre acest forum, organizare, funcționare și cum îl putem îmbunătăți."
   staff_category_name: "Echipa"
   staff_category_description: "Categorie privată pentru discuțiile personalului. Subiectele sunt vizibile numai pentru admini și moderatori."
-  assets_topic_body: "Acesta este un subiect permanent, vizibil doar pentru admini și echipă, care are ca scop stocarea imaginilor și fișierelor folosite la designul forumului. Nu îl șterge!\n\n\nIată cum se lucrează:\n\n\n1. Răspunde la acest subiect.\n2. Încarcă aici toate imaginile dorite pentru logouri, iconițe și așa mai departe. (Folosește iconița de încărcare din bara editorului de discuție, folosește drag-and-drop sau lipește imaginile.)\n3. Aprobă răspunsul pentru a-l posta.\n4. Click dreapta pe imaginile din noua postare pentru a obține calea spre imaginile încărcate, sau click pe icoana de editare pentru a edita postarea și a obține calea către imagini. Copiază calea imaginii.\n5. Lipește calea imaginii în [Setări principale](/admin/site_settings/category/required).\n\n\nDacă dorești să activezi încărcarea unor tipuri multiple de fișiere, editează `extensii_autorizate` în secțiunea [setări fișiere](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Bine ai venit în sufragerie"
     body: |2
@@ -604,7 +603,6 @@ ro:
         remove: "Acest subiect nu mai este un banner. Nu va mai apărea în susul fiecărei pagini."
   unsubscribed:
     title: "Te-ai dezabonat!"
-    description: "Te-ai dezabonat. Pentru a-ți schimba adresa de email <a href='%{url}'>vizitează preferințe utilizator</a>."
     topic_description: "Pentru a te abona din nou la %{link}, folosește controlul de notificări din partea dreaptă-jos a subiectului"
   unsubscribe:
     title: "Dezabonare"
@@ -880,7 +878,6 @@ ro:
     notify_mods_when_user_blocked: "Dacă un utilizator este blocat automat, trimite un mesaj tuturor moderatorilor."
     flag_sockpuppets: "Dacă un utilizator nou răspunde unui subiect de la același IP ca utilizatorul ce a pornit subiectul, marchează ambele postări ca potențial spam."
     traditional_markdown_linebreaks: "Folosește întreruperi de rând tradiționale în Markdown, ceea ce necesită două spații pentru un capăt de rând. "
-    allow_html_tables: "Permite introducerea de tabele în Markdown prin folosirea de etichete HTML. HEAD, TD, TR, TH vor fi autorizate (necesită un rebake pe toate postările vechi ce conțin tabele)"
     post_undo_action_window_mins: "Numărul de minute în care utilizatorii pot anula acțiunile recente asupra unei postări (aprecieri, marcări cu marcaje de avertizare, etc)."
     must_approve_users: "Membrii echipei trebuie să aprobe toate conturile noilor utilizatori înainte ca aceștia să poată accesa site-ul. ATENȚIE: activarea acestei opțiuni pentru un site în producție va revoca accesul tuturor utilizatorilor care nu sunt membri ai echipei!"
     pending_users_reminder_delay: "Notifică moderatorii dacă noii utilizatori sunt în așteptarea aprobării de mai mult de atâtea ore. Setează la -1 pentru a dezactiva notificările."
@@ -1802,26 +1799,6 @@ ro:
     visit_link_to_respond: "[Vizitează subiect](%{base_url}%{url}) pentru a răspunde."
     visit_link_to_respond_pm: "[Vizitează subiect](%{base_url}%{url}) pentru a răspunde."
     posted_by: "Postat de %{username} pe data %{post_date}"
-    invited_to_private_message_body: |
-      %{username} te-a invitat la un mesaj
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      pe
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} te-a invitat la o discuție
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      pe
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       text_body_template: |
         %{header_instructions}
@@ -1942,7 +1919,6 @@ ro:
       follow_topic: "Urmărește acest subiect"
       join_the_discussion: "Citește mai mult"
       popular_posts: "Postări notorii"
-      unsubscribe: "Acest rezumat este transmis de pe %{site_link} când a trecut ceva vreme de când nu te-am mai văzut. Pentru a te dezabona, %{unsubscribe_link}."
       click_here: "click aici"
       from: "%{site_name} rezumat"
       preheader: "Un scurt rezumat de la ultima ta vizită din %{last_seen_at}"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index eb98b93bff1..121a6b47670 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -32,6 +32,9 @@ ru:
   disable_remote_images_download_reason: "Загрузка картинок была отключена из-за недостаточности места на диске."
   anonymous: "Гость"
   remove_posts_deleted_by_author: "Удалено автором"
+  themes:
+    bad_color_scheme: "Не могу обновить стиль, неверная цветовая гамма"
+    other_error: "Что-то пошло не так, при обновление стиля"
   emails:
     incoming:
       default_subject: "Для темы необходим заголовок"
@@ -235,6 +238,7 @@ ru:
       invalid_incoming_email: "'%{email}' не является корректным адресом электронной почты"
       email_already_used_in_group: "'%{email}' уже используется группой '%{group_name}'."
       email_already_used_in_category: "'%{email}' уже используется категорией '%{category_name}'."
+      cant_allow_membership_requests: "Вы не можете разрешать пользовательские заявки для группы без каких-либо владельцев."
     default_names:
       everyone: "все"
       admins: "администраторы"
@@ -279,7 +283,7 @@ ru:
       ### Как насчет изображения для вашей учетной записи?
       Вы опубликовали несколько тем и ответы, но ваше изображение профиля не уникален как вы - это просто письмо.
 
-      Рассматривали ли вы **[посетить свой профиль пользователя] (%{профиль_дорожка})**  и загрузить изображение, которое представляет вас?
+      Рассматривали ли вы **[посетить свой профиль пользователя] (%{profile_path})**  и загрузить изображение, которое представляет вас?
 
       Это легче следить за ходом обсуждений и найти интересных людей в разговорах, когда каждый человек имеет уникальный профиль картину!
     sequential_replies: |
@@ -325,6 +329,9 @@ ru:
           attributes:
             hex:
               invalid: "не является цветом"
+        post_reply:
+          base:
+            different_topic: "Сообщение и ответ должен принадлежать к одной и той же теме."
         web_hook:
           attributes:
             payload_url:
@@ -338,7 +345,6 @@ ru:
   meta_category_description: "Обсуждение этого форума: структура и расположение материалов на нем, идеи возможных улучшений в его работе, анонсы изменений на форуме."
   staff_category_name: "Персонал"
   staff_category_description: "Приватный раздел для персонала, в котором темы видны только администраторам и модераторам."
-  assets_topic_body: "Это постоянная тема, для хранения изображений и файлов, используемых в дизайне сайта, доступная только сотрудникам. Не удаляйте её! \n\n\nВаши действия:\n\n\n1. Ответьте в эту тему.\n2. Загрузите все изображения, которые вы хотите использовать для логотипов, значков и т.д. сюда. (Используйте значок на панели инструментов в редакторе сообщений, перетащите мышкой, или вставьте изображения из буфера.) \n3. Сохраните свое сообщение.\n4. Щелкните правой кнопкой мыши изображении в новом сообщении, чтобы получить путь к загруженным изображениям, или щелкните значок редактирования  и получите путь к изображениям. Скопируйте пути к изображениям.\n5. Вставьте эти пути в [Настройки сайта] (/admin/site_settings/category/required) .\n\n\nЕсли Вам нужно активировать дополнительные типы файлов, отредактируйте `authorized_extensions` во вкладке [Файлы] (/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Добро пожаловать в Discourse"
   lounge_welcome:
@@ -573,6 +579,7 @@ ru:
     off_topic:
       title: 'Офтопик (не по теме)'
       description: 'Это сообщение не имеет отношения к теме, учитывая ее название и текст. Возможно, его стоит перенести.'
+      short_description: 'Не относится к обсуждению'
       long_form: 'отметили это как офтопик (не по теме)'
     spam:
       title: 'Спам'
@@ -641,7 +648,6 @@ ru:
         remove: "Эта тема теперь не является объявлением и больше не будет отображаться вверху всех страниц."
   unsubscribed:
     title: "Подписка отменена!"
-    description: "Вы отписались от рассылки. Для изменения настроек почты <a href='%{url}'>посетите страницу с пользовательскими настройками</a>."
   unsubscribe:
     title: "Отписаться"
     stop_watching_topic: "Прекратить наблюдение за этой темой, %{link}"
@@ -1258,6 +1264,7 @@ ru:
     incorrect_username_email_or_password: "Неверное имя пользователя, адрес электронной почты или пароль"
     wait_approval: "Спасибо за регистрацию. Мы оповестим вас, когда ваша учетная запись будет одобрена."
     active: "Ваша учетная запись активирована и готова к использованию."
+    activate_email: "<p>Почти готово! Мы выслали письмо на <b>%{email}</b>. Пожалуйста, следуйте инструкциям в этом письме для активации вашей учетной записи.</p><p>Если письмо не пришло, пожалуйста, проверьте папку \"спам\", или попробуйте войти еще раз, чтобы выслать активационное письмо повторно.</p>"
     not_activated: "Вы пока что не можете войти на сайт. Пожалуйста, следуйте инструкциям по активации учетной записи, которые мы отправили вам  по электронной почтой."
     not_allowed_from_ip_address: "Вход с этого IP в качестве пользователя %{username} запрещен."
     admin_not_allowed_from_ip_address: "Вход с этого IP в качестве администратора запрещен."
@@ -1421,7 +1428,6 @@ ru:
       popular_posts: "Популярные сообщения"
       more_new: "Новинки для вас"
       subject_template: "[%{email_prefix}] — сводка"
-      unsubscribe: "Сводка новостей отправляется, если вы давно не заходили на сайт %{site_link}. Чтобы отписаться от этой рассылки, %{unsubscribe_link}."
       click_here: "нажмите здесь"
       from: "Сводка — %{site_name}"
       preheader: "Сводка новостей с вашего последнего визита %{last_seen_at}"
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index c3b15070360..912d3d5da07 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -276,7 +276,6 @@ sk:
   meta_category_description: "Diskusia o stránke, organizácii, ako funguje a ako ju môžme vylepšit"
   staff_category_name: "Zamestnanci"
   staff_category_description: "Súkromna kategória pre zamestnaneckú diskusiu. Témy su viditeľné len pre správcov a moderátorov diskusie"
-  assets_topic_body: "Toto je permanentná téma, viditeľná len pre redaktorov, na uchovávanie obrázkov a súborov použitých v dizajne tohto webu. Nezmazávajte ju!\n\n\nTu je návod:\n\n\n1. Odpovedzte na túto tému.\n2. Nahrajte sem všetky obrázky, ktoré si prajete použit pre logá, favikony a pod. (Použite ikonku „nahrať“ v paneli nástrojov editora, alebo obrázky potiahnite alebo „vložte“)\n3. Odošlite svoju odpoveď.\n4. Pre získanie adresy k nahratým obrázkom kliknite pravým tlačítkom na obrázky vo svojom novom príspevku, alebo kliknite na ikonku úpravy príspevku a následne si adresu skopírujte. \n5. Cesty k obrázkom vložte do [základného nastavenia](/admin/site_settings/category/required).\n\n\nAk potrebujete povoliť nahratie pre iné typy súborov, upravte `authorized_extensions` v [nastavení súborov](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Vítajte v Salóne"
     body: |2
@@ -762,7 +761,6 @@ sk:
     notify_mods_when_user_blocked: "Ak je používateľ automaticky zablokovaný, pošli správu všetkým moderátorom."
     flag_sockpuppets: "Ak nový používateľ odpovedá na tému z rovnakej IP adresy, ako nový používateľ, ktorý danú tému vytvoril, označ oba ich príspevky ako potencionálny spam."
     traditional_markdown_linebreaks: "V Markdown použiť tradičné oddeľovače riadkov, čo vyžaduje dve koncové medzery ako oddeľovač riadku."
-    allow_html_tables: "V Markdown umožniť použitie tabuliek pomocou HTML značiek. TABLE, THEAD, TD, TR, TH budú umožnené (vyžaduje \"full rebake\" na všetkých starých príspevkoch ktoré obsahujú tabuľky)"
     post_undo_action_window_mins: "Počet minút počas ktorých môžu používatelia zrušiť poslednú akciu na príspevku (\"Páči sa\", označenie, atď..)."
     must_approve_users: "Obsluha musí povoliť účty všetkým novým používateľom skôr než im bude povolený prístup na stránku. UPOZORNENIE: zapnutie na živej stránke spôsobí zrušenie prístupu pre existujúcich používateľov, okrem obsluhy!"
     pending_users_reminder_delay: "Upozorni moderátora ak nový používateľ čaká na schválenie dlhšie ako tento počet hodín. Nastavte -1 pre vypnutie upozornenia."
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 4cd7677c2a5..214364445da 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -163,7 +163,6 @@ sq:
       <<: *errors
   meta_category_name: "Reagimet e Faqes"
   staff_category_name: "Stafi"
-  assets_topic_body: "This is a permanent topic, visible only to staff, for storing images and files used in the site design. Don't delete it!\n\n\nHere's how:\n\n\n1. Reply to this topic.\n2. Upload all the images you wish to use for logos, favicons, and so forth here. (Use the upload toolbar icon in the post editor, or drag-and-drop or paste images.)\n3. Submit your reply to post it.\n4. Right click the images in your new post to get the path to the uploaded images, or click the edit icon to edit your post and retrieve the path to the images. Copy the image paths.\n5. Paste those image paths into [basic settings](/admin/site_settings/category/required).\n\n\nIf you need to enable different file type uploads, edit `authorized_extensions` in the [file settings](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Mirë se vini në Lounge"
     body: |2
@@ -383,7 +382,6 @@ sq:
         remove: "Kjo temë nuk është më banderolë. Nuk do të shfaqet më në majë të çdo faqeje të sitit. "
   unsubscribed:
     title: "U çregjistruat!"
-    description: "U çregjistruat. Për të ndryshuar rregullimet e email-it <a href='%{url}'> shkoni tek preferencat e përdoruesit</a>."
     topic_description: "Për t'u ri-abonuar tek %{link}, përdorni kontrollin e njoftimeve në fund apo në të djathtë të temës."
   unsubscribe:
     title: "Çregjistrohuni"
@@ -1042,26 +1040,6 @@ sq:
     visit_link_to_respond: "[Shiko Temën](%{base_url}%{url}) për tu përgjigjur."
     visit_link_to_respond_pm: "[Shiko Mesazhin](%{base_url}%/{url}) për tu përgjigjur."
     posted_by: "Postuar nga %{username} më %{post_date}"
-    invited_to_private_message_body: |
-      %{username} ju ftoi tek mesazhi
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      në
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} ju ftoi në një bisedë
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      tek
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       text_body_template: |
         %{header_instructions}
@@ -1171,7 +1149,6 @@ sq:
         %{message}
     digest:
       why: "Një përmbledhje e shkurtër e temave tek %{site_link} që prej vizitës tuaj të fundit më %{last_seen_at}"
-      unsubscribe: "Kjo përmbledhje dërgohet nga %{site_link} kur nuk ju kemi parë prej disa kohësh. Për të çaktivizuar njoftimet %{unsubscribe_link}."
       click_here: "klikoni këtu"
       from: "%{site_name} - Një përmbledhje e shkurtër"
     notify_old_email:
@@ -1192,7 +1169,7 @@ sq:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Welcome to %{title}](#welcome)
+      ## [Welcome to %{title}](#welcome)
       An account is required. Please create an account or log in to continue.
   terms_of_service:
     title: "Kushtet e shërbimit"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 5556b1e69e6..9387c78ea48 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -295,7 +295,6 @@ sv:
   staff_category_name: "Personal"
   staff_category_description: "Privat kategori för personaldiskussioner. Ämnen är bara synliga för administratörer och moderatorer."
   assets_topic_title: "Tillgångar för webb designen"
-  assets_topic_body: "Detta är ett permanent ämne, endast synligt för personal, med syfte att lagra bilder och filer som ska användas till webbplatsens design. Radera ej detta ämne!\n\n\nSå här fungerar det:\n\n\n1. Svara på detta ämne.\n2. Ladda upp alla bilder du vill använda som logotyp, favicon och så vidare här. (Använd verktygfältets uppladdningsikon i inläggsredigeraren, eller dra-och-släpp eller klistra in bilder)\n3. Skicka ditt svar för att posta det.\n4. Högerklicka på bilderna i ditt nya inlägg för att få sökvägen till de uppladdade bilderna, eller klicka på redigera-ikonen för att redigera inlägget och på så sätt hämta sökvägen till bilderna. Kopiera bildernas sökväg. \n5. Klistra in bildernas sökvägar i de [grundläggande inställningarna](/admin/site_settings/category/required).\n\n\nOm du behöver möjliggöra uppladdning av flera olika filtyper, redigera `authorized_extensions` i [inställningarna för filer](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Välkommen till diskussionen"
   lounge_welcome:
@@ -548,7 +547,6 @@ sv:
         remove: "Detta ämne är inte längre en banderoll. Den kommer inte att dyka upp i toppen av varje sida."
   unsubscribed:
     title: "Avprenumererat!"
-    description: "Du har avprenumererat. För att ändra dina e-postinställningar <a href='%{url}'>kan du besöka dina användarinställningar</a>."
     topic_description: "För att återprenumerera till %{link}, använd notifieringskontrollerna vid botten eller högra sidan av ämnet."
   unsubscribe:
     title: "Avprenumerera"
@@ -820,7 +818,6 @@ sv:
     notify_mods_when_user_blocked: "Om en användare blockeras automatiskt, skicka ett meddelande till alla moderatorer."
     flag_sockpuppets: "Flagga båda användarnas inlägg som potentiell skräppost om en ny användare svarar på ett ämne från samma IP-adress som den andra nya användaren som skapade ämnet."
     traditional_markdown_linebreaks: "Använd vanliga radmatningar i Markdown, vilka kräver 2 avslutande mellanslag för en radmatning."
-    allow_html_tables: "Tillåt tabeller att läggas in i Markdown genom användning av HTML-taggar. TABLE, THEAD, TD, TR, TH kommer att vitlistas (kräver full uppdatering/rebake av alla gamla inlägg som innehåller tabeller)"
     post_undo_action_window_mins: "Antal minuter som en användare tillåts att upphäva handlingar på ett inlägg som gjorts nyligen (gillning, flaggning osv)."
     must_approve_users: "Personal måste godkänna alla nya användarkonton innan de tillåts använda webbplatsen. VARNING: om det tillåts när webbplatsen är live så kommer det att upphäva tillgång för alla existerande användare som inte är personal!"
     pending_users_reminder_delay: "Notifiera moderatorer om nya användare har väntat på godkännande längre än så här många timmar. Ange -1 för att inaktivera notifikationer. "
@@ -1652,26 +1649,6 @@ sv:
     visit_link_to_respond: "[Besök ämnet](%{base_url}%{url}) för att ge din respons. "
     visit_link_to_respond_pm: "[Besök meddelanden](%{base_url}%{url}) för att ge din respons."
     posted_by: "Postat av %{username} den %{post_date}"
-    invited_to_private_message_body: |
-      %{username} bjöd in dit till ett meddelande
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      vid
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} bjöd in dig till en diskussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      vid
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Användare invitera personligt"
       text_body_template: |
@@ -1803,7 +1780,6 @@ sv:
       join_the_discussion: "Läs mer"
       popular_posts: "Populära meddelanden"
       more_new: "Nytt för er"
-      unsubscribe: "Den här sammanfattningen har skickats från %{site_link} där vi inte har sett dig på ett tag. För att säga upp dig %{unsubscribe_link}."
       click_here: "klicka här"
       from: "%{site_name} sammanfattning"
     forgot_password:
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index 8df36e10fbb..edaa6ce419c 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -160,7 +160,7 @@ te:
               invalid: "ఇది చెల్లని రంగు"
       <<: *errors
   user_profile:
-    no_info_other: "<div class='missing-profile'>%{పేరు} ఇంకా వారి ప్రొఫైల్ లో ఎబౌట్ మీ స్థానంలో ఏమీ చేర్చలేదు</div>"
+    no_info_other: "<div class='missing-profile'>%{name} ఇంకా వారి ప్రొఫైల్ లో ఎబౌట్ మీ స్థానంలో ఏమీ చేర్చలేదు</div>"
   vip_category_name: "అడ్డా"
   vip_category_description: "నమ్మకం స్థాయి మూడు లేదా ఆపై ఉన్న సభ్యులకు మాత్రమే పరిమితమైన వర్గం"
   meta_category_description: "ఈ సైటు గురించి చర్చ. ఎలా మొదలైంది. ఎలా పని చేస్తుంది. ఇంకా ఎలా మెరుగు పరచవచ్చు."
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 91c538e63c5..30d63f631a9 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -245,7 +245,6 @@ tr_TR:
   meta_category_description: "Bu site, sitenin organizasyonu, nasıl çalıştığı ve nasıl geliştirilebileceği ile ilgili tartışma alanı."
   staff_category_name: "Görevliler"
   staff_category_description: "Görevliler arası konuşmalar için özel kategori. Konular sadece yönetici ve moderatörlere gözükür."
-  assets_topic_body: "Bu kalıcı bir konudur, sadece görevlilere gözükür, site tasarımında kullanılan resim ve dosyaların depolanması için kullanılır. Sakın silmeyin!\n\n\nŞöyle ki:\n\n1. Bu konuyu cevaplayın.\n2. Görseller, simgecikler vb. kullanmak istediğiniz resimleri buraya yükleyin. (Gönderi düzenleyicisindeki yükleme düğmesini kullanabilir, resimleri sürükleyip bırakabilir veya kopyalayıp yapıştırabilirsiniz.)\n3. Cevabı gönderin.\n4. Yeni gönderinizdeki resimlere sağ tıklayarak ya da düzenleme ikonuna tıklayıp gönderinizi düzenleyerek resimlerin bağlantılarına ulaşabilirsiniz. Bağlantıları kopyalayın.\n5. Bağlantıları [basit ayarlarda](/admin/site_settings/category/required) ilgili bölümlere yapıştırın.\n\n\nEğer farklı dosya tipleri yükleyebilmek istiyorsanız, [dosya ayarları](/admin/site_settings/category/files) sayfasındaki `authorized_extensions` ayarını düzenleyin."
   lounge_welcome:
     title: "Lobiye hoş geldiniz"
     body: |2
@@ -706,7 +705,6 @@ tr_TR:
     notify_mods_when_user_blocked: "Eğer bir kullanıcı otomatik olarak engellendiyse, tüm moderatörlere ileti yolla."
     flag_sockpuppets: "Eğer, yeni kullanıcı konuya, konuyu başlatan yeni kullanıcı ile aynı IP adresinden cevap yazarsa, her iki gönderiyi de potansiyel istenmeyen olarak bildir. "
     traditional_markdown_linebreaks: "Markdown'da, satır sonundan önce yazının sağında iki tane boşluk gerektiren, geleneksel satır sonu metodunu kullan."
-    allow_html_tables: "Tabloların HTML etiketleri kullanılarak Markdown ile oluşturulmasına izin verin. TABLE, THEAD, TD, TR, TH kabul edilir (tablo içeren tüm eski gönderilerin yenilenmesini gerektirir) "
     post_undo_action_window_mins: "Bir gönderide yapılan yeni eylemlerin (beğenme, bildirme vb) geri alınabileceği zaman, dakika olarak"
     must_approve_users: "Siteye erişimlerine izin verilmeden önce tüm yeni kullanıcı hesaplarının görevliler tarafından onaylanması gerekir. UYARI: yayındaki bir site için bunu etkinleştirmek görevli olmayan hesapların erişimini iptal edecek."
     pending_users_reminder_delay: "Belirtilen saatten daha uzun bir süredir onay bekleyen yeni kullanıcılar mevcutsa moderatörleri bilgilendir. Bilgilendirmeyi devre dışı bırakmak için -1 girin."
@@ -1326,26 +1324,6 @@ tr_TR:
     visit_link_to_respond: "Cevaplamak için [konuyu ziyaret edin](%{base_url}%{url})."
     visit_link_to_respond_pm: "Cevaplamak için [iletiyi ziyaret edin](%{base_url}%{url})."
     posted_by: "%{post_date} tarihinde %{username} tarafından gönderildi"
-    invited_to_private_message_body: |
-      %{username} sizi bir iletiye davet etti
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      şurada
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} sizi bir tartışmaya davet etti
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      şurada
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       text_body_template: |
         %{header_instructions}
@@ -1463,7 +1441,6 @@ tr_TR:
       follow_topic: "Bu konuyu takip et"
       join_the_discussion: "Devamını Oku"
       popular_posts: "Gözde Gönderiler"
-      unsubscribe: "Bir süredir görünmediğiniz için bu e-posta size %{site_link} topluluğundan gönderildi. Bu e-postaları almak istemiyorsanız %{unsubscribe_link}."
       click_here: "buraya tıklayın"
       from: "%{site_name} özeti"
       preheader: "%{last_seen_at} tarihindeki ziyaretinizden bu yana olanların kısa bir özeti"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 27e0890a47b..8445258d571 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -246,7 +246,6 @@ vi:
   meta_category_description: "Thảo luận về site này, tổ chức của nó, làm sao nó hoạt động, và làm sao chúng tôi có thể cải tiến nó tốt hơn."
   staff_category_name: "Nhân viên"
   staff_category_description: "Chuyên mục riêng dành cho nhân viên. Các chủ đề chỉ hiển thị với quản trị viên và điều hành viên."
-  assets_topic_body: "Chủ đề này tồn tại vĩnh viễn, chỉ xem được bởi nhân viên, dùng để chứa ảnh và file dành cho việc thiết kế. Vui lòng đừng xóa.\n\n\nHướng dẫn:\n\n\n1. Trả lời chủ đề này.\n2. Tải lên tất cả ảnh bạn cần cho logo, favicon, và các thứ khác. (Dùng nút tải lên trong công cụ viết bài, hoặc kéo-và-thả hoặc dán ảnh vào) \n3. Gửi trả lời của bạn.\n4. Bấm chuột phải lên ảnh trong bài đăng mới để chép đường dẫn của các ảnh đã được tải lên, hoặc sửa bài viết của bạn để lấy đường dẫn của ảnh. Sao chép các đường dẫn này.\n5. Dán các đường dẫn này vào [thiết lập chung](/admin/site_settings/category/required).\n\n\nNếu bạn cần tải lên các loại file khác, sửa `authorized_extensions` trong [thiết lập file](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Chào mừng bạn đến với Phòng khách"
     body: |2
@@ -682,7 +681,6 @@ vi:
     notify_mods_when_user_blocked: "Nếu một thành viên được khóa tự động, gửi tin nhắn đến tất cả các điều hành viên."
     flag_sockpuppets: "Nếu thành viên mới trả lời chủ đề có cùng địa chỉ IP với thành viên mới tạo chủ đề, đánh dấu các bài viết của họ là spam tiềm năng."
     traditional_markdown_linebreaks: "Sử dụng ngắt dòng truyền thống trong Markdown, đòi hỏi hai khoảng trống kế tiếp cho một ngắt dòng."
-    allow_html_tables: "Cho phép nhập bảng trong Markdown sử dụng các thẻ HTML. TABLE, THEAD, TD, TR, TH sẽ được sử dụng (đòi hỏi thực hiện lại cho các bài viết cũ có chứa bảng)"
     post_undo_action_window_mins: "Số phút thành viên được phép làm lại các hành động gần đây với bài viết (like, đánh dấu...)."
     must_approve_users: "Quản trị viên phải duyệt tất cả các tài khoản thành viên mới trước khi họ có quyền truy cập website. LƯU Ý: bật tính năng này trên site đang hoạt động sẽ hủy bỏ quyền truy cập đối với các tài khoản thành viên hiện tại!"
     pending_users_reminder_delay: "Thông báo cho quản trị viên nếu thành viên mới đã chờ duyệt lâu hơn số giờ được thiết lập ở đây, đặt là -1 để tắt thông báo."
@@ -1287,26 +1285,6 @@ vi:
       description: "Bạn không thích nhận mail giống mail này? Nhấn vào bỏ theo dõi để bỏ đăng ký ngay lập tức:"
     only_reply_by_email: "Trả lời email này để phản hồi."
     posted_by: "Đăng bởi %{{username} ngày %{post_date}"
-    invited_to_private_message_body: |
-      %{username} mời bạn xem
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      tại
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} mời bạn thảo luận
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      tại
-
-      > %{site_title} -- %{site_description}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
     digest:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 82556452c3d..4e788d4d501 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -171,8 +171,8 @@ zh_CN:
   page_num: "第%{num}页"
   home_title: "首页"
   topics_in_category: "“%{category}”分类中的主题"
-  rss_posts_in_topic: "“%{topic}”的 RSS 内容聚合"
-  rss_topics_in_category: "分类“%{category}”中主题的 RSS 内容聚合"
+  rss_posts_in_topic: " '%{topic}'的RSS源"
+  rss_topics_in_category: "分类'%{category}' 中主题的RSS源"
   author_wrote: "%{author}写道："
   num_posts: "帖子："
   num_participants: "参与者："
@@ -348,7 +348,6 @@ zh_CN:
   staff_category_name: "管理人员"
   staff_category_description: "管理人员可见的分类。只有管理员和版主才能阅览主题。"
   assets_topic_title: "站点设计资料"
-  assets_topic_body: "这是一个永久主题，仅对管理人员可见，用于存储论坛设计使用的图像和文件。不要删除它！\n\n\n详细教程：\n\n\n1. 回复到这个主题。\n2. 上传你想用作站点标志、图标和其他所有图片到这儿。（使用帖子编辑器工具栏中的上传图标，或者拖拽或者粘贴图像。）\n3. 提交你的回复添加帖子。\n4. 在你的新帖子里右键点击图片获得这些已上传图片的链接，或者点击编辑按钮来编辑帖子，获得到图片的相对地址。复制这些相对地址。\n5. 粘贴这些图像的路径到[基础设置](/admin/site_settings/category/required)。\n\n\n如果你需要运行额外的上传文件类型，在[文件设置](/admin/site_settings/category/files)中编辑 `authorized_extensions`。"
   discourse_welcome_topic:
     title: "欢迎来到 Discourse"
     body: |2
@@ -606,7 +605,6 @@ zh_CN:
         remove: "本主题已经不再是横幅主题。它将不在每个页面的顶部显示。"
   unsubscribed:
     title: "退订！"
-    description: "你已经退订。要更改你的邮件设置，<a href='%{url}'>访问你的用户设置页面</a>。"
     topic_description: "点击链接 %{link} 重新订阅，或是使用主题底部或右侧的通知控制。"
   unsubscribe:
     title: "退订"
@@ -883,7 +881,6 @@ zh_CN:
     notify_mods_when_user_blocked: "如果一个用户被自动封禁了，发送一个私信给所有管理员。"
     flag_sockpuppets: "如果一个新用户开始了一个主题，并且同时另一个新用户以同一个 IP 在该主题回复，他们所有的帖子都将被自动标记为垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用传统换行符，即用两个尾随空格来换行"
-    allow_html_tables: "允许在输入 Markdown 文本时使用表格 HTML 标签。标签 TABLE、THEAD、TD、TR、TH 将被允许使用，即白名单这些标签（需要重置所有包含表格的老帖子的 HTML）"
     post_undo_action_window_mins: "允许用户在帖子上进行撤销操作（赞、标记等）所需等待的间隔分钟数"
     must_approve_users: "新用户在被允许访问站点前需要由管理人员批准。警告：在运行的站点中启用将解除所有非管理人员用户的访问权限！"
     pending_users_reminder_delay: "如果新用户等待批准时间超过此小时设置则通知版主。设置 -1 关闭通知。"
@@ -1464,37 +1461,9 @@ zh_CN:
   invite_mailer:
     title: "要求发件人"
     subject_template: "%{invitee_name} 邀请你参与 %{site_domain_name} 主题 '%{topic_title}' "
-    text_body_template: |
-      %{invitee_name}邀请你参与讨论：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      社区：
-
-      > %{site_title} -- %{site_description}
-
-      如果你有兴趣，点击下方的链接：
-
-      %{invite_link}
   custom_invite_mailer:
     title: "自定义邀请发件人"
     subject_template: "%{invitee_name}邀请你'%{topic_title}'在%{site_domain_name}"
-    text_body_template: |
-      %{invitee_name}邀请你参与讨论：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      社区：
-
-      > %{site_title} -- %{site_description}
-
-      如果你有兴趣，点击下方的链接：
-
-      %{invite_link}
   invite_forum_mailer:
     title: "邀请论坛发件人"
     subject_template: "%{invitee_name} 邀请你加入 %{site_domain_name}"
@@ -1539,11 +1508,11 @@ zh_CN:
     title: "下载备份邮件发件人"
     subject_template: "[%{email_prefix}] 站点备份下载"
     text_body_template: |
-      这是你需要的[站点备份下载](%{backup_file_path})。
+      这是你[站点备份文件](%{backup_file_path})。
 
-      我们处于安全原因把下载链接发到你确认过的邮箱。
+      出于安全原因我们把下载链接直接发到你确认过的邮箱。
 
-      （如果你**没有**请求下载，你需要认真考虑了——有管理员请求下载）
+      （如果你**没有**请求下载，你需要认真想想了——有个管理员请求了备份文件）
     no_token: |
       抱歉，这个备份下载链接已经被使用或已经过期。
   admin_confirmation_mailer:
@@ -2011,12 +1980,6 @@ zh_CN:
     new_user_of_the_month:
       title: "你是这个月的最佳新用户！"
       subject_template: "你是这个月的最佳新用户！"
-      text_body_template: |
-        恭喜，你获得了**%{month_year}月最佳新用户**。 :trophy:
-
-        该奖项每月只授予给两位新用户，并且你永远都可以在[你的用户页](/my/badges)找到。
-
-        你迅速成为了我们社区中的一员。感谢你参与，未来继续努力！
   unsubscribe_link: |
     要退订这些邮件，[点击这里](%{unsubscribe_url})。
   unsubscribe_link_and_mail: |
@@ -2041,26 +2004,6 @@ zh_CN:
     visit_link_to_respond: "[访问主题](%{base_url}%{url})以回复."
     visit_link_to_respond_pm: "[访问私信](%{base_url}%{url})以回复."
     posted_by: "%{username}发表于%{post_date}"
-    invited_to_private_message_body: |
-      %{username} 邀请你至私信交流：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      论坛：
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} 邀请你参与讨论：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      论坛：
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "邀请用户至私信"
       subject_template: "[%{email_prefix}] %{username}邀请你至私信“%{topic_title}”"
@@ -2208,7 +2151,6 @@ zh_CN:
       popular_posts: "流行帖子"
       more_new: "你关注的新帖"
       subject_template: "[%{email_prefix}] 摘要"
-      unsubscribe: "这是封来自%{site_link}的摘要邮件，因为你长时间没有访问而发送。%{unsubscribe_link}取消订阅。"
       click_here: "点击此处"
       from: "%{site_name}的摘要"
       preheader: "在你上次于%{last_seen_at}访问后的新内容摘要"
@@ -2216,12 +2158,12 @@ zh_CN:
       title: "忘记密码"
       subject_template: "[%{email_prefix}] 密码重置"
       text_body_template: |
-        有人尝试重置你在[%{site_name}](%{base_url})的账户。
+        在[%{site_name}](%{base_url})上有人要求重置你的密码。
 
-        如果不是你在操作，你可以安全地忽略这封邮件。
+        如果不是你，你可以安全地忽略此邮件。
 
-        点击下面的链接设置新密码：
-        %{base_url}/u/admin-login/%{email_token}
+        点击以下链接设置新密码：
+        %{base_url}/u/password-reset/%{email_token}
     set_password:
       title: "设置密码"
       subject_template: "[%{email_prefix}] 设置密码"
@@ -2236,11 +2178,11 @@ zh_CN:
       title: "管理员登陆"
       subject_template: "[%{email_prefix}] 登录"
       text_body_template: |
-        有人尝试登录你在[%{site_name}](%{base_url})的账户。
+        在[%{site_name}](%{base_url})上有人要求登录你的帐号。
 
-        如果不是你在操作，你可以安全地忽略这封邮件。
+        如果你没有提出此请求，你可以安全地忽略此邮件。
 
-        点击下面的链接设置新密码：
+        点击以下链接登录：
         %{base_url}/u/admin-login/%{email_token}
     account_created:
       title: "帐号已创建"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index a795d5ead45..bd0659b5795 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -317,7 +317,6 @@ zh_TW:
   staff_category_name: "管理員"
   staff_category_description: "讓工作人員進行討論的私人分類。此分類下的討論話題只有管理員與板主才看得到。"
   assets_topic_title: "站點設計資料"
-  assets_topic_body: "這是一個永久主題，僅對管理人員可見，用於存儲論壇設計使用的圖像和檔案。不要刪除它！\n\n\n詳細教程：\n\n\n1. 回覆到這個主題。\n2. 上傳你想用作站點標誌、表徵圖和其他所有圖片到這兒。（使用帖子編輯器工具欄中的上傳表徵圖，或者拖拽或者粘貼圖像。）\n3. 提交你的回覆添加帖子。\n4. 在你的新帖子裡右鍵點擊圖片獲得這些已上傳圖片的連結，或者點擊編輯按鈕來編輯帖子，獲得到圖片的相對地址。複製這些相對地址。\n5. 粘貼這些圖像的路徑到[基礎設置](/admin/site_settings/category/required)。\n\n\n如果你需要運行額外的上傳檔案類型，在[檔案設置](/admin/site_settings/category/files)中編輯 `authorized_extensions`。"
   discourse_welcome_topic:
     title: "歡迎來到 Discourse"
     body: |2
@@ -558,7 +557,6 @@ zh_TW:
         remove: "本主題已經不再是橫幅主題。它將不在每個頁面的頂部顯示。"
   unsubscribed:
     title: "退訂！"
-    description: "你已經退訂。要更改你的郵件設置，<a href='%{url}'>訪問你的用戶設置頁面</a>。"
     topic_description: "點擊連結 %{link} 重新訂閲，或是使用主題底部或右側的通知控制。"
   unsubscribe:
     title: "退訂"
@@ -834,7 +832,6 @@ zh_TW:
     notify_mods_when_user_blocked: "若有用戶被自動封鎖，將發送訊息給所有板主。"
     flag_sockpuppets: "如果一個新用戶開始了一個主題，並且同時另一個新用戶以同一個 IP 在該主題回復，他們所有的帖子都將被自動標記為垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用傳統的換行符號，即用兩個行末空格來換行"
-    allow_html_tables: "允許在輸入 Markdown 文本時使用表格 HTML 標籤。標籤 TABLE、THEAD、TD、TR、TH 將被允許使用，即白名單這些標籤（需要重置所有包含表格的老帖子的 HTML）"
     post_undo_action_window_mins: "允許用戶在帖子上進行撤銷操作（讚、標記等）所需等待的時間分隔（分鐘）"
     must_approve_users: "新用戶在被允許訪問站點前需要由管理人員批准。警告：在運行的站點中啟用將解除所有非管理人員用戶的訪問權限！"
     pending_users_reminder_delay: "如果新用戶等待批准時間超過此小時設置則通知版主。設置 -1 關閉通知。"
@@ -1377,41 +1374,9 @@ zh_TW:
   invite_mailer:
     title: "邀請 Mailer"
     subject_template: "%{invitee_name} 邀請你參與在 %{site_domain_name} 討論的話題 '%{topic_title}'"
-    text_body_template: |
-      %{invitee_name} 邀請你參與位於
-
-      > %{site_title} -- %{site_description}
-
-      的以下討論
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      如果你有興趣，請點擊下面的連結：
-
-      %{invite_link}
   custom_invite_mailer:
     title: "客製邀請 Mailer"
     subject_template: "%{invitee_name}邀請你'%{topic_title}'在%{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} 留下以下留言
-
-      > %{user_custom_message}
-
-      邀請你參與位於
-
-      > %{site_title} -- %{site_description}
-
-      的討論
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      如果你有興趣，請點擊下面的連結：
-
-      %{invite_link}
   invite_forum_mailer:
     title: "邀請論壇 Mailer"
     subject_template: "%{invitee_name} 邀請你加入 %{site_domain_name}"
@@ -1860,26 +1825,6 @@ zh_TW:
     visit_link_to_respond: "[訪問主題](%{base_url}%{url})以回覆。"
     visit_link_to_respond_pm: "[訪問\"私訊\"](%{base_url}%{url})以回覆。"
     posted_by: "由 %{username} 張貼於 %{post_date}"
-    invited_to_private_message_body: |
-      %{username} 邀請你至消息交流：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      論壇：
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} 邀請你參與討論：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      論壇：
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "用戶被邀請至私人訊息"
       text_body_template: |
@@ -2014,7 +1959,6 @@ zh_TW:
       join_the_discussion: "閲讀更多"
       popular_posts: "熱門貼文"
       more_new: "新內容與你分享"
-      unsubscribe: "這是封來自%{site_link}的摘要郵件，因為你長時間沒有訪問而發送。%{unsubscribe_link}取消訂閲。"
       click_here: "點擊此處"
       from: "%{site_name}的摘要"
       preheader: "在你上次於%{last_seen_at}訪問後的新內容摘要"
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index f36d290f4e2..65b631aec30 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -25,7 +25,7 @@ map $http_x_forwarded_proto $thescheme {
   https https;
 }
 
-log_format log_discourse '[$time_local] $remote_addr "$request" "$http_user_agent" "$sent_http_x_discourse_route" $status $bytes_sent "$http_referer" $upstream_response_time $request_time "$sent_http_x_discourse_username"';
+log_format log_discourse '[$time_local] "$http_host" $remote_addr "$request" "$http_user_agent" "$sent_http_x_discourse_route" $status $bytes_sent "$http_referer" $upstream_response_time $request_time "$sent_http_x_discourse_username"';
 
 server {
 
@@ -121,7 +121,7 @@ server {
     }
 
     # cache emojis
-    location ~ /_?emoji.*\.(png|gif|jpg|jpeg)$/ {
+    location ~ /images/emoji/ {
       expires 1y;
       add_header Cache-Control public,immutable;
     }
@@ -151,7 +151,7 @@ server {
           try_files $uri =404;
       }
       # this allows us to bypass rails
-      location ~* \.(gif|png|jpg|jpeg|bmp|tif|tiff|svg)$ {
+      location ~* \.(gif|png|jpg|jpeg|bmp|tif|tiff|svg|ico|webp)$ {
           try_files $uri =404;
       }
       # thumbnails & optimized images
@@ -239,6 +239,7 @@ server {
   }
 
   location @discourse {
+    add_header Referrer-Policy 'no-referrer-when-downgrade';
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/config/routes.rb b/config/routes.rb
index 99f87cdf682..a66dadb4895 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -309,7 +309,9 @@ Discourse::Application.routes.draw do
   get "user_preferences" => "users#user_preferences_redirect"
 
   %w{users u}.each_with_index do |root_path, index|
-    resources :users, except: [:show, :update, :destroy], path: root_path do
+    get "#{root_path}" => "users#index", constraints: { format: 'html' }
+
+    resources :users, except: [:index, :new, :show, :update, :destroy], path: root_path do
       collection do
         get "check_username"
         get "is_local_username"
@@ -430,7 +432,6 @@ Discourse::Application.routes.draw do
     get 'activity' => "groups#show"
     get 'activity/:filter' => "groups#show"
     get 'members'
-    get 'owners'
     get 'posts'
     get 'topics'
     get 'mentions'
@@ -439,9 +440,14 @@ Discourse::Application.routes.draw do
     get 'mentionable'
     get 'logs' => 'groups#histories'
 
+    collection do
+      get "search" => "groups#search"
+    end
+
     member do
       put "members" => "groups#add_members"
       delete "members" => "groups#remove_member"
+      post "request_membership" => "groups#request_membership"
       post "notifications" => "groups#set_notifications"
     end
   end
@@ -548,6 +554,7 @@ Discourse::Application.routes.draw do
   get "top" => "list#top"
   get "search/query" => "search#query"
   get "search" => "search#show"
+  post "search/click" => "search#click"
 
   # Topics resource
   get "t/:id" => "topics#show"
@@ -644,11 +651,10 @@ Discourse::Application.routes.draw do
 
   resources :invites
   post "invites/upload_csv" => "invites#upload_csv"
+  post "invites/rescind-all" => "invites#rescind_all_invites"
   post "invites/reinvite" => "invites#resend_invite"
   post "invites/reinvite-all" => "invites#resend_all_invites"
   post "invites/link" => "invites#create_invite_link"
-  post "invites/disposable" => "invites#create_disposable_invite"
-  get "invites/redeem/:token" => "invites#redeem_disposable_invite"
   delete "invites" => "invites#destroy"
   put "invites/show/:id" => "invites#perform_accept_invitation", as: 'perform_accept_invite'
 
@@ -662,6 +668,7 @@ Discourse::Application.routes.draw do
   end
 
   get "onebox" => "onebox#show"
+  get "inline-onebox" => "inline_onebox#show"
 
   get "exception" => "list#latest"
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 62a6b009bd8..53ed6d41ea1 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -103,6 +103,9 @@ basic:
   ga_universal_domain_name:
     client: true
     default: 'auto'
+  ga_universal_auto_link_domains:
+    default: ''
+    type: list
   ga_tracking_code:
     client: true
     default: ''
@@ -304,7 +307,9 @@ login:
     regex: '^https?:\/\/.+[^\/]$'
   sso_secret: ''
   sso_overrides_bio: false
-  sso_overrides_email: false
+  sso_overrides_email:
+    default: false
+    validator: "SsoOverridesEmailValidator"
   sso_overrides_username: false
   sso_overrides_name: false
   sso_overrides_avatar:
@@ -493,9 +498,9 @@ posting:
   traditional_markdown_linebreaks:
     client: true
     default: false
-  allow_html_tables:
+  enable_markdown_typographer:
     client: true
-    default: false
+    default: true
   suppress_reply_directly_below:
     client: true
     default: true
@@ -564,7 +569,7 @@ posting:
     default: true
     client: true
   emoji_set:
-    default: 'emoji_one'
+    default: 'twitter'
     client: true
     enum: 'EmojiSetSiteSetting'
   enforce_square_emoji:
@@ -594,6 +599,9 @@ posting:
     client: true
     default: ''
     type: list
+  max_allowed_message_recipients:
+    default: 30
+    min: 1
 
 email:
   email_time_window_mins:
@@ -629,6 +637,8 @@ email:
   alternative_reply_by_email_addresses:
     default: ''
     validator: "AlternativeReplyByEmailAddressesValidator"
+  find_related_post_with_key:
+    default: false
   manual_polling_enabled:
     default: false
   pop3_polling_enabled:
@@ -798,6 +808,10 @@ files:
     default: 95
     min: 1
     max: 100
+  allow_staff_to_upload_any_file_in_pm:
+    default: true
+    client: true
+  strip_image_metadata: true
 
 trust:
   default_trust_level:
@@ -821,7 +835,6 @@ trust:
   min_trust_to_send_messages:
     default: 1
     enum: 'TrustLevelSetting'
-    client: true
   tl1_requires_topics_entered: 5
   tl1_requires_read_posts:
     default: 30
@@ -895,6 +908,9 @@ security:
     default: ''
     type: list
     shadowed_by_global: true
+  whitelist_internal_hosts:
+    default: ''
+    type: list
 
 onebox:
   enable_flash_video_onebox: false
@@ -905,6 +921,9 @@ onebox:
   max_oneboxes_per_post:
     default: 50
     client: true
+  inline_onebox_domains_whitelist:
+    default: ''
+    type: list
 
 spam:
   add_rel_nofollow_to_user_content: true
@@ -1095,7 +1114,7 @@ legal:
 
 backups:
   readonly_mode_during_backup:
-    default: true
+    default: false
   allow_restore:
     default: false
   maximum_backups:
@@ -1132,11 +1151,14 @@ search:
   search_tokenize_chinese_japanese_korean: false
   search_prefer_recent_posts: false
   search_recent_posts_size: 100000
+  log_search_queries: true
+  search_query_log_max_size: 1000000
 
 uncategorized:
   version_checks:
     client: true
     default: true
+    shadowed_by_global: true
   new_version_emails: true
   send_welcome_message: true
 
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 2e142c1b0d3..716c96cc984 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -17,7 +17,7 @@ listen (ENV["UNICORN_PORT"] || 3000).to_i
 timeout 30
 
 # feel free to point this anywhere accessible on the filesystem
-pid "#{discourse_path}/tmp/pids/unicorn.pid"
+pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
 
 # By default, the Unicorn logger will write to stderr.
 # Additionally, some applications/frameworks log to stderr or stdout,
diff --git a/db/fixtures/002_groups.rb b/db/fixtures/002_groups.rb
index 94757078a7d..68912df848c 100644
--- a/db/fixtures/002_groups.rb
+++ b/db/fixtures/002_groups.rb
@@ -2,4 +2,14 @@ Group.ensure_automatic_groups!
 if g = Group.find_by(name: 'trust_level_5', id: 15)
   g.destroy!
 end
-Group.where(name: 'everyone').update_all(visible: false)
+
+Group.where(name: 'everyone').update_all(visibility_level: Group.visibility_levels[:owners])
+
+ColumnDropper.drop(
+  table: 'groups',
+  after_migration: 'AddVisibleBackToGroups',
+  columns:  %w[visible],
+  on_drop: ->(){
+    STDERR.puts 'Removing superflous visible group column!'
+  }
+)
diff --git a/db/fixtures/009_users.rb b/db/fixtures/009_users.rb
index d725d78a414..8d84fad2dad 100644
--- a/db/fixtures/009_users.rb
+++ b/db/fixtures/009_users.rb
@@ -6,12 +6,18 @@ if user
   user.save
 end
 
+UserEmail.seed do |ue|
+  ue.id = -1
+  ue.email = "no_email"
+  ue.primary = true
+  ue.user_id = -1
+end
+
 User.seed do |u|
   u.id = -1
   u.name = "system"
   u.username = "system"
   u.username_lower = "system"
-  u.email = "no_email"
   u.password = SecureRandom.hex
   u.active = true
   u.admin = true
@@ -56,12 +62,18 @@ ColumnDropper.drop(
 
 # User for the smoke tests
 if ENV["SMOKE"] == "1"
+  UserEmail.seed do |ue|
+    ue.id = 0
+    ue.email = "smoke_user@discourse.org"
+    ue.primary = true
+    ue.user_id = 0
+  end
+
   smoke_user = User.seed do |u|
     u.id = 0
     u.name = "smoke_user"
     u.username = "smoke_user"
     u.username_lower = "smoke_user"
-    u.email = "smoke_user@discourse.org"
     u.password = "P4ssw0rd"
     u.active = true
     u.approved = true
@@ -77,4 +89,3 @@ if ENV["SMOKE"] == "1"
 
   EmailToken.where(user_id: smoke_user.id).update_all(confirmed: true)
 end
-
diff --git a/db/fixtures/500_lounge_category.rb b/db/fixtures/500_lounge_category.rb
index 83d8eb5cf24..5fa93ddb1e6 100644
--- a/db/fixtures/500_lounge_category.rb
+++ b/db/fixtures/500_lounge_category.rb
@@ -1,9 +1,10 @@
 unless Rails.env.test?
   lounge = Category.find_by(id: SiteSetting.lounge_category_id)
-  if lounge and !lounge.group_ids.include?(Group[:trust_level_3].id)
+  if lounge && lounge.created_at == lounge.updated_at &&
+    !lounge.group_ids.include?(Group[:trust_level_3].id)
 
     # The category for users with trust level 3 has been created.
-    # Add permissions and a description to it.
+    # Add initial permissions and description. They can be changed later.
 
     Category.transaction do
       lounge.group_names = ['trust_level_3']
diff --git a/db/fixtures/999_topics.rb b/db/fixtures/999_topics.rb
index abdc372e8a4..541cacad12c 100644
--- a/db/fixtures/999_topics.rb
+++ b/db/fixtures/999_topics.rb
@@ -95,3 +95,19 @@ ColumnDropper.drop(
     STDERR.puts "Removing superflous topic columns!"
   }
 )
+
+ColumnDropper.drop(
+  table: 'topics',
+  after_migration: 'RemoveAutoCloseColumnsFromTopics',
+  columns: %w{
+    auto_close_at
+    auto_close_user_id
+    auto_close_started_at
+    auto_close_based_on_last_post
+    auto_close_hours
+  },
+  on_drop: ->(){
+    STDERR.puts "Removing superflous topic columns!"
+  },
+  delay: 3600
+)
diff --git a/db/migrate/20170605014820_remove_auto_close_columns_from_topics.rb b/db/migrate/20170605014820_remove_auto_close_columns_from_topics.rb
new file mode 100644
index 00000000000..4e6c2b67007
--- /dev/null
+++ b/db/migrate/20170605014820_remove_auto_close_columns_from_topics.rb
@@ -0,0 +1,9 @@
+class RemoveAutoCloseColumnsFromTopics < ActiveRecord::Migration
+  def up
+    # Defer dropping of the columns until the new application code has been deployed.
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20170630083540_add_custom_message_to_invite.rb b/db/migrate/20170630083540_add_custom_message_to_invite.rb
new file mode 100644
index 00000000000..ce482c1be38
--- /dev/null
+++ b/db/migrate/20170630083540_add_custom_message_to_invite.rb
@@ -0,0 +1,5 @@
+class AddCustomMessageToInvite < ActiveRecord::Migration
+  def change
+    add_column :invites, :custom_message, :text
+  end
+end
diff --git a/db/migrate/20170703144855_add_visibility_level_to_groups.rb b/db/migrate/20170703144855_add_visibility_level_to_groups.rb
new file mode 100644
index 00000000000..93a7ba3e736
--- /dev/null
+++ b/db/migrate/20170703144855_add_visibility_level_to_groups.rb
@@ -0,0 +1,12 @@
+class AddVisibilityLevelToGroups < ActiveRecord::Migration
+  def change
+
+    add_column :groups, :visibility_level, :integer, default: 0, null: false
+    execute <<~SQL
+      UPDATE groups
+      SET visibility_level = 1
+      WHERE NOT visible
+    SQL
+    remove_column :groups, :visible
+  end
+end
diff --git a/db/migrate/20170704142141_add_visible_back_to_groups.rb b/db/migrate/20170704142141_add_visible_back_to_groups.rb
new file mode 100644
index 00000000000..d424d072be8
--- /dev/null
+++ b/db/migrate/20170704142141_add_visible_back_to_groups.rb
@@ -0,0 +1,7 @@
+class AddVisibleBackToGroups < ActiveRecord::Migration
+  def change
+    # add the visible column so it is delay dropped this cleans up some deploy issues
+    add_column :groups, :visible, :boolean, default: true, null: false
+    execute 'UPDATE groups set visible = false where visibility_level > 0'
+  end
+end
diff --git a/db/migrate/20170713164357_create_search_logs.rb b/db/migrate/20170713164357_create_search_logs.rb
new file mode 100644
index 00000000000..26d6f1a4252
--- /dev/null
+++ b/db/migrate/20170713164357_create_search_logs.rb
@@ -0,0 +1,12 @@
+class CreateSearchLogs < ActiveRecord::Migration
+  def change
+    create_table :search_logs do |t|
+      t.string :term, null: false
+      t.integer :user_id, null: true
+      t.inet    :ip_address, null: false
+      t.integer :clicked_topic_id, null: true
+      t.integer :search_type, null: false
+      t.datetime :created_at, null: false
+    end
+  end
+end
diff --git a/db/migrate/20170717084947_create_user_emails.rb b/db/migrate/20170717084947_create_user_emails.rb
new file mode 100644
index 00000000000..eb6dc4980dc
--- /dev/null
+++ b/db/migrate/20170717084947_create_user_emails.rb
@@ -0,0 +1,42 @@
+require_dependency 'column_dropper'
+
+class CreateUserEmails < ActiveRecord::Migration
+  def up
+    create_table :user_emails do |t|
+      t.integer :user_id, null: false
+      t.string :email, limit: 513, null: false
+      t.boolean :primary, default: false, null: false
+      t.timestamps
+    end
+
+    add_index :user_emails, :user_id
+    add_index :user_emails, [:user_id, :primary], unique: true
+
+    execute "CREATE UNIQUE INDEX index_user_emails_on_email ON user_emails (lower(email));"
+
+    execute <<~SQL
+    INSERT INTO user_emails (
+      id,
+      user_id,
+      email,
+      "primary",
+      created_at,
+      updated_at
+    ) SELECT
+      id,
+      id,
+      email,
+      'TRUE',
+      created_at,
+      updated_at
+    FROM users
+    SQL
+
+    change_column_null :users, :email, true
+    ColumnDropper.mark_readonly(:users, :email)
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index fce07d005ca..4a258fe50cb 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -64,7 +64,7 @@ Create a test account, and enable it with:
 Discourse does a lot of stuff async, so it's better to run sidekiq even on development mode:
 
     ruby $(mailcatcher) # open http://localhost:1080 to see the emails, stop with pkill -f mailcatcher
-    bundle exec sidekiq -q critical,low,default -d -l log/sidekiq.log # open http://localhost:3000/sidekiq to see the queue, stop with pkill -f sidekiq
+    bundle exec sidekiq # open http://localhost:3000/sidekiq to see queues
     bundle exec rails server
 
 And happy hacking!
diff --git a/docs/INSTALL-cloud.md b/docs/INSTALL-cloud.md
index eff05664f14..1e777b043b3 100644
--- a/docs/INSTALL-cloud.md
+++ b/docs/INSTALL-cloud.md
@@ -6,14 +6,14 @@
 
 [Sign up for DigitalOcean][do], update billing info, then create your new cloud server.
 
-- Enter your domain `discourse.example.com` as the name.
+- The default of **Ubuntu 16.04 LTS x64** works fine. At minimum, a 64-bit Linux OS with a kernel version of 3.10+ is required.
 
 - The default of **1 GB** RAM works fine for small Discourse communities. We recommend 2 GB RAM for larger communities.
 
-- The default of **Ubuntu 16.04 LTS x64** works fine. At minimum, a 64-bit Linux OS with a kernel version of 3.10+ is required.
-
 - The default of **New York** is a good choice for most US and European audiences. Or select a region that is geographically closer to your audience.
 
+- Enter your domain `discourse.example.com` as the name.
+
 Create your new Droplet. You will receive an email with the root password. (However, if you know [how to use SSH keys](https://www.google.com/search?q=digitalocean+ssh+keys), you may not need a password to log in.)
 
 ### Access Your Cloud Server
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index ffd1dd404d4..3a52f75661f 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -4,7 +4,7 @@ class AdminUserIndexQuery
 
   def initialize(params = {}, klass = User, trust_levels = TrustLevel.levels)
     @params = params
-    @query = initialize_query_with_order(klass)
+    @query = initialize_query_with_order(klass).joins(:user_emails)
     @trust_levels = trust_levels
   end
 
@@ -52,7 +52,7 @@ class AdminUserIndexQuery
 
     if !custom_order.present?
       if params[:query] == "active"
-        order << "COALESCE(last_seen_at, to_date('1970-01-01', 'YYYY-MM-DD')) DESC"
+        order << "COALESCE(users.last_seen_at, to_date('1970-01-01', 'YYYY-MM-DD')) DESC"
       else
         order << "users.created_at DESC"
       end
@@ -106,7 +106,7 @@ class AdminUserIndexQuery
       if ip = IPAddr.new(params[:filter]) rescue nil
         @query.where('ip_address <<= :ip OR registration_ip_address <<= :ip', ip: ip.to_cidr_s)
       else
-        @query.where('username_lower ILIKE :filter OR email ILIKE :filter', filter: "%#{params[:filter]}%")
+        @query.where('username_lower ILIKE :filter OR user_emails.email ILIKE :filter', filter: "%#{params[:filter]}%")
       end
     end
   end
@@ -119,7 +119,7 @@ class AdminUserIndexQuery
 
   def filter_exclude
     if params[:exclude].present?
-      @query.where('id != ?', params[:exclude])
+      @query.where('users.id != ?', params[:exclude])
     end
   end
 
diff --git a/lib/auth/google_oauth2_authenticator.rb b/lib/auth/google_oauth2_authenticator.rb
index 2dfc69da5cd..31e44ea25dc 100644
--- a/lib/auth/google_oauth2_authenticator.rb
+++ b/lib/auth/google_oauth2_authenticator.rb
@@ -31,6 +31,10 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
   def after_create_account(user, auth)
     data = auth[:extra_data]
     GoogleUserInfo.create({user_id: user.id}.merge(data))
+    if auth[:email_valid].to_s == 'true'
+      EmailToken.confirm(user.email_tokens.first.token)
+      user.set_automatic_groups
+    end
   end
 
   def register_middleware(omniauth)
diff --git a/lib/autospec/manager.rb b/lib/autospec/manager.rb
index 538d2761449..3cc52008e19 100644
--- a/lib/autospec/manager.rb
+++ b/lib/autospec/manager.rb
@@ -295,8 +295,10 @@ class Autospec::Manager
         if @queue.first && @queue.first[0] == "focus"
           focus = @queue.shift
           @queue.unshift([file, spec, runner])
-          if focus[1].include?(spec) || file != spec
-            @queue.unshift(focus)
+          unless spec.include?(":") && focus[1].include?(spec.split(":")[0])
+            if focus[1].include?(spec) || file != spec
+              @queue.unshift(focus)
+            end
           end
         else
           @queue.unshift([file, spec, runner])
diff --git a/lib/autospec/qunit_runner.rb b/lib/autospec/qunit_runner.rb
index fc7a7eca675..577a7c824c0 100644
--- a/lib/autospec/qunit_runner.rb
+++ b/lib/autospec/qunit_runner.rb
@@ -159,7 +159,12 @@ module Autospec
         if m = /moduleFor\(['"]([^'"]+)/i.match(line)
           return m[1]
         end
+        if m = /moduleForComponent\(['"]([^"']+)/i.match(line)
+          return m[1]
+        end
       end
+
+      nil
     end
 
   end
diff --git a/lib/autospec/rspec_runner.rb b/lib/autospec/rspec_runner.rb
index cdef09e0b1f..b6f5b90dd15 100644
--- a/lib/autospec/rspec_runner.rb
+++ b/lib/autospec/rspec_runner.rb
@@ -19,6 +19,11 @@ module Autospec
 
     watch(%r{^spec/fabricators/.+_fabricator\.rb$})     { "spec" }
 
+    watch(%r{^app/assets/javascripts/pretty-text/.*\.js\.es6$}) { "spec/components/pretty_text_spec.rb"}
+    watch(%r{^plugins/.*/discourse-markdown/.*\.js\.es6$}) { "spec/components/pretty_text_spec.rb"}
+
+    watch(%r{^plugins/.*/spec/.*\.rb})
+
     RELOADERS = Set.new
     def self.reload(pattern); RELOADERS << pattern; end
     def reloaders; RELOADERS; end
diff --git a/lib/autospec/simple_runner.rb b/lib/autospec/simple_runner.rb
index be8da854c79..01c0aada5ab 100644
--- a/lib/autospec/simple_runner.rb
+++ b/lib/autospec/simple_runner.rb
@@ -13,7 +13,12 @@ module Autospec
               "-f", "Autospec::Formatter", specs.split].flatten.join(" ")
       # launch rspec
       Dir.chdir(Rails.root) do
-        @pid = Process.spawn({"RAILS_ENV" => "test"}, "bin/rspec #{args}")
+        env = {"RAILS_ENV" => "test"}
+        if specs.split(' ').any?{|s| s =~ /^(.\/)?plugins/}
+          env["LOAD_PLUGINS"] = "1"
+          puts "Loading plugins while running specs"
+        end
+        @pid = Process.spawn(env, "bin/rspec #{args}")
         _, status = Process.wait2(@pid)
         status.exitstatus
       end
diff --git a/lib/avatar_lookup.rb b/lib/avatar_lookup.rb
index 4af184052a1..d0b5877272b 100644
--- a/lib/avatar_lookup.rb
+++ b/lib/avatar_lookup.rb
@@ -12,7 +12,7 @@ class AvatarLookup
   private
 
   def self.lookup_columns
-    @lookup_columns ||= %i{id email username uploaded_avatar_id}
+    @lookup_columns ||= %i{id user_emails.email username uploaded_avatar_id}
   end
 
   def users
@@ -22,7 +22,8 @@ class AvatarLookup
   def user_lookup_hash
     # adding tap here is a personal taste thing
     hash = {}
-    User.where(:id => @user_ids)
+    User.joins(:user_emails)
+        .where(id: @user_ids)
         .select(AvatarLookup.lookup_columns)
         .each{ |user| hash[user.id] = user }
     hash
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index 8a4573a41cb..c70a7a58506 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -55,11 +55,11 @@ module BackupRestore
       begin
         notify_user
         remove_old
+        clean_up
       rescue => ex
         Rails.logger.error("#{ex}\n" + ex.backtrace.join("\n"))
       end
 
-      clean_up
       @success ? log("[SUCCESS]") : log("[FAILED]")
     end
 
@@ -230,7 +230,7 @@ module BackupRestore
       FileUtils.cd(File.join(Rails.root, "public")) do
         if File.directory?(upload_directory)
           Discourse::Utils.execute_command(
-            'tar', '--append', '--dereference', '--file', tar_filename, upload_directory,
+            'tar', '--append', '--dereference', '--warning=no-file-changed', '--file', tar_filename, upload_directory,
             failure_message: "Failed to archive uploads."
           )
         else
@@ -259,9 +259,15 @@ module BackupRestore
       log "Notifying '#{@user.username}' of the end of the backup..."
       status = @success ? :backup_succeeded : :backup_failed
 
-      SystemMessage.create_from_system_user(@user, status,
+      post = SystemMessage.create_from_system_user(@user, status,
         logs: Discourse::Utils.pretty_logs(@logs)
       )
+
+      if !@success && @user.id == Discourse::SYSTEM_USER_ID
+        post.topic.invite_group(@user, Group[:admins])
+      end
+
+      post
     end
 
     def clean_up
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index de6e133df13..2f4e7cdd46c 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -400,7 +400,7 @@ module BackupRestore
     end
 
     def notify_user
-      if user = User.find_by(email: @user_info[:email])
+      if user = User.find_by_email(@user_info[:email])
         log "Notifying '#{user.username}' of the end of the restore..."
         status = @success ? :restore_succeeded : :restore_failed
 
diff --git a/lib/column_dropper.rb b/lib/column_dropper.rb
index 766ddddddfb..7c77a25331c 100644
--- a/lib/column_dropper.rb
+++ b/lib/column_dropper.rb
@@ -8,31 +8,67 @@ class ColumnDropper
 
     delay ||= Rails.env.production? ? 60 : 0
 
-    sql = <<SQL
+    sql = <<~SQL
     SELECT 1
     FROM INFORMATION_SCHEMA.COLUMNS
     WHERE table_schema = 'public' AND
-          table_name = :table AND
-          column_name IN (:columns) AND
-          EXISTS (
-            SELECT 1
-            FROM schema_migration_details
-            WHERE name = :after_migration AND
-                  created_at <= (current_timestamp at time zone 'UTC' - interval :delay)
-          )
+      table_name = :table AND
+      column_name IN (:columns) AND
+      EXISTS (
+        SELECT 1
+        FROM schema_migration_details
+        WHERE name = :after_migration AND
+              created_at <= (current_timestamp at time zone 'UTC' - interval :delay)
+      )
     LIMIT 1
-SQL
+    SQL
 
     if ActiveRecord::Base.exec_sql(sql, table: table,
                                         columns: columns,
                                         delay: "#{delay.to_i || 0} seconds",
                                         after_migration: after_migration).to_a.length > 0
-        on_drop&.call
+      on_drop&.call
 
-        columns.each do |column|
-          # safe cause it is protected on method entry, can not be passed in params
-          ActiveRecord::Base.exec_sql("ALTER TABLE #{table} DROP COLUMN IF EXISTS #{column}")
-        end
+      columns.each do |column|
+        # safe cause it is protected on method entry, can not be passed in params
+        ActiveRecord::Base.exec_sql("ALTER TABLE #{table} DROP COLUMN IF EXISTS #{column}")
+
+        ActiveRecord::Base.exec_sql <<~SQL
+        DROP FUNCTION IF EXISTS #{readonly_function_name(table, column)};
+        DROP TRIGGER IF EXISTS #{readonly_trigger_name(table, column)} ON #{table};
+        SQL
+      end
+
+      Discourse.reset_active_record_cache
     end
   end
+
+  def self.mark_readonly(table_name, column_name)
+    ActiveRecord::Base.exec_sql <<-SQL
+    CREATE OR REPLACE FUNCTION #{readonly_function_name(table_name, column_name)} RETURNS trigger AS $rcr$
+      BEGIN
+        RAISE EXCEPTION 'Discourse: #{column_name} in #{table_name} is readonly';
+      END
+    $rcr$ LANGUAGE plpgsql;
+    SQL
+
+    ActiveRecord::Base.exec_sql <<-SQL
+    CREATE TRIGGER #{readonly_trigger_name(table_name, column_name)}
+    BEFORE INSERT OR UPDATE OF #{column_name}
+    ON #{table_name}
+    FOR EACH ROW
+    WHEN (NEW.#{column_name} IS NOT NULL)
+    EXECUTE PROCEDURE #{readonly_function_name(table_name, column_name)};
+    SQL
+  end
+
+  private
+
+  def self.readonly_function_name(table_name, column_name)
+    "raise_#{table_name}_#{column_name}_readonly()"
+  end
+
+  def self.readonly_trigger_name(table_name, column_name)
+    "#{table_name}_#{column_name}_readonly"
+  end
 end
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 43bb9567719..2fa1a9388cd 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -35,6 +35,8 @@ class CookedPostProcessor
       optimize_urls
       pull_hotlinked_images(bypass_bump)
       grant_badges
+      DiscourseEvent.trigger(:post_process_cooked, @doc, @post)
+      nil
     end
   end
 
@@ -51,7 +53,7 @@ class CookedPostProcessor
   end
 
   def keep_reverse_index_up_to_date
-    upload_ids = Set.new
+    upload_ids = []
 
     @doc.css("a/@href", "img/@src").each do |media|
       if upload = Upload.get_from_url(media.value)
@@ -59,6 +61,8 @@ class CookedPostProcessor
       end
     end
 
+    upload_ids |= oneboxed_image_uploads.pluck(:id)
+
     values = upload_ids.map{ |u| "(#{@post.id},#{u})" }.join(",")
     PostUpload.transaction do
       PostUpload.delete_all(post_id: @post.id)
@@ -101,7 +105,12 @@ class CookedPostProcessor
   end
 
   def oneboxed_images
-    @doc.css(".onebox-result img, .onebox img")
+    @doc.css(".onebox-body img, .onebox img")
+  end
+
+  def oneboxed_image_uploads
+    urls = oneboxed_images.map { |img| img["src"] }
+    Upload.where(origin: urls)
   end
 
   def limit_size!(img)
@@ -304,6 +313,15 @@ class CookedPostProcessor
     # make sure we grab dimensions for oneboxed images
     oneboxed_images.each { |img| limit_size!(img) }
 
+    uploads = oneboxed_image_uploads.select(:url, :origin)
+    oneboxed_images.each do |img|
+      upload = uploads.detect { |u| u.origin == img["src"] }
+      next unless upload.present?
+      img["src"] = upload.url
+      # make sure we grab dimensions for oneboxed images
+      limit_size!(img)
+    end
+
     # respect nofollow admin settings
     if !@cooking_options[:omit_nofollow] && SiteSetting.add_rel_nofollow_to_user_content
       PrettyText.add_rel_nofollow_to_user_content(@doc)
diff --git a/lib/demon/sidekiq.rb b/lib/demon/sidekiq.rb
index 350b2da28b7..a6f01944152 100644
--- a/lib/demon/sidekiq.rb
+++ b/lib/demon/sidekiq.rb
@@ -37,7 +37,7 @@ class Demon::Sidekiq < Demon::Base
     [['critical', 4], ['default', 2], ['low', 1]].each do |queue_name, weight|
       custom_queue_hostname = ENV["UNICORN_SIDEKIQ_#{queue_name.upcase}_QUEUE_HOSTNAME"]
 
-      if !custom_queue_hostname || custom_queue_hostname == `hostname`.strip
+      if !custom_queue_hostname || custom_queue_hostname.split(',').include?(`hostname`.strip)
         options << "-q"
         options << "#{queue_name},#{weight}"
       end
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 086ed28b72b..3a29209a3b3 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -214,6 +214,25 @@ module Discourse
     base_url_no_prefix + base_uri
   end
 
+  def self.route_for(uri)
+
+    uri = URI(uri) rescue nil unless (uri.is_a?(URI))
+    return unless uri
+
+    path = uri.path || ""
+    if (uri.host == Discourse.current_hostname &&
+      path.start_with?(Discourse.base_uri)) ||
+      !uri.host
+
+      path.slice!(Discourse.base_uri)
+      return Rails.application.routes.recognize_path(path)
+    end
+
+    nil
+  rescue ActionController::RoutingError
+    nil
+  end
+
   READONLY_MODE_KEY_TTL  ||= 60
   READONLY_MODE_KEY      ||= 'readonly_mode'.freeze
   PG_READONLY_MODE_KEY   ||= 'readonly_mode:postgres'.freeze
diff --git a/lib/discourse_hub.rb b/lib/discourse_hub.rb
index dc97b1748d6..174ca23fb8a 100644
--- a/lib/discourse_hub.rb
+++ b/lib/discourse_hub.rb
@@ -1,4 +1,3 @@
-require_dependency 'rest_client'
 require_dependency 'version'
 
 module DiscourseHub
@@ -41,11 +40,21 @@ module DiscourseHub
   end
 
   def self.singular_action(action, rel_url, params={})
-    JSON.parse RestClient.send(action, "#{hub_base_url}#{rel_url}", {params: params, accept: accepts, referer: referer } )
+    JSON.parse(Excon.send(action,
+      "#{hub_base_url}#{rel_url}",
+      headers: { 'Referer' => referer, 'Accept' => accepts.join(', ') },
+      query: params,
+      omit_default_port: true
+    ).body)
   end
 
   def self.collection_action(action, rel_url, params={})
-    JSON.parse RestClient.send(action, "#{hub_base_url}#{rel_url}", params, content_type: :json, accept: accepts, referer: referer )
+    JSON.parse(Excon.send(action,
+      "#{hub_base_url}#{rel_url}",
+      body: JSON[params],
+      headers: { 'Referer' => referer, 'Accept' => accepts.join(', '), "Content-Type" => "application/json" },
+      omit_default_port: true
+    ).body)
   end
 
   def self.hub_base_url
@@ -57,7 +66,7 @@ module DiscourseHub
   end
 
   def self.accepts
-    [:json, 'application/vnd.discoursehub.v1']
+    ['application/json', 'application/vnd.discoursehub.v1']
   end
 
   def self.referer
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index aaa5f74ef76..2277b751104 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -146,7 +146,7 @@ class DiscourseRedis
     yield
   rescue Redis::CommandError => ex
     if ex.message =~ /READONLY/
-      unless Discourse.recently_readonly?
+      unless Discourse.recently_readonly? || Rails.env.test?
         STDERR.puts "WARN: Redis is in a readonly state. Performed a noop"
       end
 
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index 4d15f60612c..67e4d711712 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -64,9 +64,8 @@ module DiscourseTagging
   def self.filter_allowed_tags(query, guardian, opts={})
     term = opts[:term]
     if term.present?
-      term.downcase!
-      term.gsub!(/[^a-z0-9\.\-\_]*/, '')
       term.gsub!("_", "\\_")
+      term = clean_tag(term)
       query = query.where('tags.name like ?', "%#{term}%")
     end
 
diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb
index ac3463a5d95..7632a244843 100644
--- a/lib/email/message_builder.rb
+++ b/lib/email/message_builder.rb
@@ -60,8 +60,7 @@ module Email
     def subject
       if @opts[:use_site_subject]
         subject = String.new(SiteSetting.email_subject)
-        subject.gsub!("%{site_name}", @template_args[:site_name])
-        subject.gsub!("%{email_prefix}", @template_args[:email_prefix])
+        subject.gsub!("%{site_name}", @template_args[:email_prefix])
         subject.gsub!("%{optional_re}", @opts[:add_re_to_subject] ? I18n.t('subject_re', @template_args) : '')
         subject.gsub!("%{optional_pm}", @opts[:private_reply] ? I18n.t('subject_pm', @template_args) : '')
         subject.gsub!("%{optional_cat}", @template_args[:show_category_in_subject] ? "[#{@template_args[:show_category_in_subject]}] " : '')
diff --git a/lib/email/processor.rb b/lib/email/processor.rb
index 71c9b846f70..a477f58e490 100644
--- a/lib/email/processor.rb
+++ b/lib/email/processor.rb
@@ -52,6 +52,7 @@ module Email
         when ActiveRecord::Rollback                       then :email_reject_invalid_post
         when Email::Receiver::InvalidPostAction           then :email_reject_invalid_post_action
         when Discourse::InvalidAccess                     then :email_reject_invalid_access
+        else                                                   :email_reject_unrecognized_error
       end
 
       template_args = {}
@@ -63,6 +64,14 @@ module Email
         template_args[:post_error] = e.message
       end
 
+      if message_template == :email_reject_unrecognized_error
+        msg  = "Unrecognized error type (#{e.class}: #{e.message}) when processing incoming email"
+        msg += "\n\nBacktrace:\n#{e.backtrace.map { |l| "  #{l}" }.join("\n")}"
+        msg += "\n\nMail:\n#{mail_string}"
+
+        Rails.logger.error(msg)
+      end
+
       if message_template
         # inform the user about the rejection
         message = Mail::Message.new(mail_string)
@@ -76,18 +85,14 @@ module Email
         if can_send_rejection_email?(message.from, message_template)
           Email::Sender.new(client_message, message_template).send
         end
-      else
-        msg  = "Unrecognized error type (#{e.class}: #{e.message}) when processing incoming email"
-        msg += "\n\nBacktrace:\n#{e.backtrace.map { |l| "  #{l}" }.join("\n")}"
-        msg += "\n\nMail:\n#{mail_string}"
-
-        Rails.logger.error(msg)
       end
 
       client_message
     end
 
     def can_send_rejection_email?(email, type)
+      return true if type == :email_reject_unrecognized_error
+
       key = "rejection_email:#{email}:#{type}:#{Date.today}"
 
       if $redis.setnx(key, "1")
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 75fb3e9bfc7..6bb65bbded9 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -153,7 +153,7 @@ module Email
       if $redis.setnx(key, "1")
         $redis.expire(key, 25.hours)
 
-        if user = User.find_by(email: email)
+        if user = User.find_by_email(email)
           user.user_stat.bounce_score += score
           user.user_stat.reset_bounce_score_after = SiteSetting.reset_bounce_score_after_days.days.from_now
           user.user_stat.save
@@ -346,6 +346,7 @@ module Email
           return { type: :reply, obj: email_log } if email_log
         end
       end
+      nil
     end
 
     def process_destination(destination, user, body, elided)
@@ -373,6 +374,7 @@ module Email
 
         create_topic(user: user,
                      raw: body,
+                     elided: elided,
                      title: subject,
                      category: category.id,
                      skip_validations: user.staged?)
@@ -485,6 +487,8 @@ module Email
     end
 
     def find_related_post
+      return if SiteSetting.find_related_post_with_key
+
       message_ids = [@mail.in_reply_to, Email::Receiver.extract_references(@mail.references)]
       message_ids.flatten!
       message_ids.select!(&:present?)
@@ -576,7 +580,7 @@ module Email
           # read attachment
           File.open(tmp.path, "w+b") { |f| f.write attachment.body.decoded }
           # create the upload for the user
-          opts = { is_attachment_for_group_message: options[:is_group_message] }
+          opts = { for_group_message: options[:is_group_message] }
           upload = UploadCreator.new(tmp, attachment.filename, opts).create_for(options[:user].id)
           if upload && upload.errors.empty?
             # try to inline images
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index eb3074f5b87..4b51a023315 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -191,8 +191,10 @@ module Email
 
     def strip_avatars_and_emojis
       @fragment.search('img').each do |img|
+        next unless img['src']
+
         if img['src'][/_avatar/]
-          img.parent['style'] = "vertical-align: top;" if img.parent.name == 'td'
+          img.parent['style'] = "vertical-align: top;" if img.parent&.name == 'td'
           img.remove
         end
 
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index ab4c8246a2a..d7acb357813 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -81,7 +81,7 @@ class EmailUpdater
           confirm_result = :authorizing_new
         when EmailChangeRequest.states[:authorizing_new]
           change_req.update_column(:change_state, EmailChangeRequest.states[:complete])
-          user.update_column(:email, token.email)
+          user.primary_email.update_column(:email, token.email)
           confirm_result = :complete
         end
       else
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index 0ae88e7309a..4036e94a08c 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -1,1564 +1,8 @@
 {
   "emojis": [
     {
-      "code": "1f4af",
-      "name": "100"
-    },
-    {
-      "code": "1f522",
-      "name": "1234"
-    },
-    {
-      "code": "1f3b1",
-      "name": "8ball"
-    },
-    {
-      "code": "1f170",
-      "name": "a"
-    },
-    {
-      "code": "1f18e",
-      "name": "ab"
-    },
-    {
-      "code": "1f524",
-      "name": "abc"
-    },
-    {
-      "code": "1f521",
-      "name": "abcd"
-    },
-    {
-      "code": "1f251",
-      "name": "accept"
-    },
-    {
-      "code": "1f6a1",
-      "name": "aerial_tramway"
-    },
-    {
-      "code": "2708",
-      "name": "airplane"
-    },
-    {
-      "code": "1f6ec",
-      "name": "airplane_arriving"
-    },
-    {
-      "code": "1f6eb",
-      "name": "airplane_departure"
-    },
-    {
-      "code": "1f6e9",
-      "name": "airplane_small"
-    },
-    {
-      "code": "23f0",
-      "name": "alarm_clock"
-    },
-    {
-      "code": "2697",
-      "name": "alembic"
-    },
-    {
-      "code": "1f47d",
-      "name": "alien"
-    },
-    {
-      "code": "1f691",
-      "name": "ambulance"
-    },
-    {
-      "code": "1f3fa",
-      "name": "amphora"
-    },
-    {
-      "code": "2693",
-      "name": "anchor"
-    },
-    {
-      "code": "1f47c",
-      "name": "angel"
-    },
-    {
-      "code": "1f4a2",
-      "name": "anger"
-    },
-    {
-      "code": "1f5ef",
-      "name": "anger_right"
-    },
-    {
-      "code": "1f620",
-      "name": "angry"
-    },
-    {
-      "code": "1f627",
-      "name": "anguished"
-    },
-    {
-      "code": "1f41c",
-      "name": "ant"
-    },
-    {
-      "code": "1f34e",
-      "name": "apple"
-    },
-    {
-      "code": "2652",
-      "name": "aquarius"
-    },
-    {
-      "code": "2648",
-      "name": "aries"
-    },
-    {
-      "code": "25c0",
-      "name": "arrow_backward"
-    },
-    {
-      "code": "23ec",
-      "name": "arrow_double_down"
-    },
-    {
-      "code": "23eb",
-      "name": "arrow_double_up"
-    },
-    {
-      "code": "2b07",
-      "name": "arrow_down"
-    },
-    {
-      "code": "1f53d",
-      "name": "arrow_down_small"
-    },
-    {
-      "code": "25b6",
-      "name": "arrow_forward"
-    },
-    {
-      "code": "2935",
-      "name": "arrow_heading_down"
-    },
-    {
-      "code": "2934",
-      "name": "arrow_heading_up"
-    },
-    {
-      "code": "2b05",
-      "name": "arrow_left"
-    },
-    {
-      "code": "2199",
-      "name": "arrow_lower_left"
-    },
-    {
-      "code": "2198",
-      "name": "arrow_lower_right"
-    },
-    {
-      "code": "27a1",
-      "name": "arrow_right"
-    },
-    {
-      "code": "21aa",
-      "name": "arrow_right_hook"
-    },
-    {
-      "code": "2b06",
-      "name": "arrow_up"
-    },
-    {
-      "code": "2195",
-      "name": "arrow_up_down"
-    },
-    {
-      "code": "1f53c",
-      "name": "arrow_up_small"
-    },
-    {
-      "code": "2196",
-      "name": "arrow_upper_left"
-    },
-    {
-      "code": "2197",
-      "name": "arrow_upper_right"
-    },
-    {
-      "code": "1f503",
-      "name": "arrows_clockwise"
-    },
-    {
-      "code": "1f504",
-      "name": "arrows_counterclockwise"
-    },
-    {
-      "code": "1f3a8",
-      "name": "art"
-    },
-    {
-      "code": "1f69b",
-      "name": "articulated_lorry"
-    },
-    {
-      "code": "1f632",
-      "name": "astonished"
-    },
-    {
-      "code": "1f45f",
-      "name": "athletic_shoe"
-    },
-    {
-      "code": "1f3e7",
-      "name": "atm"
-    },
-    {
-      "code": "269b",
-      "name": "atom"
-    },
-    {
-      "code": "1f171",
-      "name": "b"
-    },
-    {
-      "code": "1f476",
-      "name": "baby"
-    },
-    {
-      "code": "1f37c",
-      "name": "baby_bottle"
-    },
-    {
-      "code": "1f424",
-      "name": "baby_chick"
-    },
-    {
-      "code": "1f6bc",
-      "name": "baby_symbol"
-    },
-    {
-      "code": "1f519",
-      "name": "back"
-    },
-    {
-      "code": "1f3f8",
-      "name": "badminton"
-    },
-    {
-      "code": "1f6c4",
-      "name": "baggage_claim"
-    },
-    {
-      "code": "1f388",
-      "name": "balloon"
-    },
-    {
-      "code": "1f5f3",
-      "name": "ballot_box"
-    },
-    {
-      "code": "2611",
-      "name": "ballot_box_with_check"
-    },
-    {
-      "code": "1f38d",
-      "name": "bamboo"
-    },
-    {
-      "code": "1f34c",
-      "name": "banana"
-    },
-    {
-      "code": "203c",
-      "name": "bangbang"
-    },
-    {
-      "code": "1f3e6",
-      "name": "bank"
-    },
-    {
-      "code": "1f4ca",
-      "name": "bar_chart"
-    },
-    {
-      "code": "1f488",
-      "name": "barber"
-    },
-    {
-      "code": "26be",
-      "name": "baseball"
-    },
-    {
-      "code": "1f3c0",
-      "name": "basketball"
-    },
-    {
-      "code": "26f9",
-      "name": "basketball_player"
-    },
-    {
-      "code": "1f6c0",
-      "name": "bath"
-    },
-    {
-      "code": "1f6c1",
-      "name": "bathtub"
-    },
-    {
-      "code": "1f50b",
-      "name": "battery"
-    },
-    {
-      "code": "1f3d6",
-      "name": "beach"
-    },
-    {
-      "code": "26f1",
-      "name": "beach_umbrella"
-    },
-    {
-      "code": "1f43b",
-      "name": "bear"
-    },
-    {
-      "code": "1f6cf",
-      "name": "bed"
-    },
-    {
-      "code": "1f41d",
-      "name": "bee"
-    },
-    {
-      "code": "1f37a",
-      "name": "beer"
-    },
-    {
-      "code": "1f37b",
-      "name": "beers"
-    },
-    {
-      "code": "1f41e",
-      "name": "beetle"
-    },
-    {
-      "code": "1f530",
-      "name": "beginner"
-    },
-    {
-      "code": "1f514",
-      "name": "bell"
-    },
-    {
-      "code": "1f6ce",
-      "name": "bellhop"
-    },
-    {
-      "code": "1f371",
-      "name": "bento"
-    },
-    {
-      "code": "1f6b4",
-      "name": "bicyclist"
-    },
-    {
-      "code": "1f6b2",
-      "name": "bike"
-    },
-    {
-      "code": "1f459",
-      "name": "bikini"
-    },
-    {
-      "code": "2623",
-      "name": "biohazard"
-    },
-    {
-      "code": "1f426",
-      "name": "bird"
-    },
-    {
-      "code": "1f382",
-      "name": "birthday"
-    },
-    {
-      "code": "26ab",
-      "name": "black_circle"
-    },
-    {
-      "code": "1f0cf",
-      "name": "black_joker"
-    },
-    {
-      "code": "2b1b",
-      "name": "black_large_square"
-    },
-    {
-      "code": "25fe",
-      "name": "black_medium_small_square"
-    },
-    {
-      "code": "25fc",
-      "name": "black_medium_square"
-    },
-    {
-      "code": "2712",
-      "name": "black_nib"
-    },
-    {
-      "code": "25aa",
-      "name": "black_small_square"
-    },
-    {
-      "code": "1f532",
-      "name": "black_square_button"
-    },
-    {
-      "code": "1f33c",
-      "name": "blossom"
-    },
-    {
-      "code": "1f421",
-      "name": "blowfish"
-    },
-    {
-      "code": "1f4d8",
-      "name": "blue_book"
-    },
-    {
-      "code": "1f699",
-      "name": "blue_car"
-    },
-    {
-      "code": "1f499",
-      "name": "blue_heart"
-    },
-    {
-      "code": "1f60a",
-      "name": "blush"
-    },
-    {
-      "code": "1f417",
-      "name": "boar"
-    },
-    {
-      "code": "1f4a3",
-      "name": "bomb"
-    },
-    {
-      "code": "1f4d6",
-      "name": "book"
-    },
-    {
-      "code": "1f516",
-      "name": "bookmark"
-    },
-    {
-      "code": "1f4d1",
-      "name": "bookmark_tabs"
-    },
-    {
-      "code": "1f4da",
-      "name": "books"
-    },
-    {
-      "code": "1f4a5",
-      "name": "boom"
-    },
-    {
-      "code": "1f462",
-      "name": "boot"
-    },
-    {
-      "code": "1f490",
-      "name": "bouquet"
-    },
-    {
-      "code": "1f647",
-      "name": "bow"
-    },
-    {
-      "code": "1f3f9",
-      "name": "bow_and_arrow"
-    },
-    {
-      "code": "1f3b3",
-      "name": "bowling"
-    },
-    {
-      "code": "1f466",
-      "name": "boy"
-    },
-    {
-      "code": "1f35e",
-      "name": "bread"
-    },
-    {
-      "code": "1f470",
-      "name": "bride_with_veil"
-    },
-    {
-      "code": "1f309",
-      "name": "bridge_at_night"
-    },
-    {
-      "code": "1f4bc",
-      "name": "briefcase"
-    },
-    {
-      "code": "1f494",
-      "name": "broken_heart"
-    },
-    {
-      "code": "1f41b",
-      "name": "bug"
-    },
-    {
-      "code": "1f4a1",
-      "name": "bulb"
-    },
-    {
-      "code": "1f685",
-      "name": "bullettrain_front"
-    },
-    {
-      "code": "1f684",
-      "name": "bullettrain_side"
-    },
-    {
-      "code": "1f32f",
-      "name": "burrito"
-    },
-    {
-      "code": "1f68c",
-      "name": "bus"
-    },
-    {
-      "code": "1f68f",
-      "name": "busstop"
-    },
-    {
-      "code": "1f464",
-      "name": "bust_in_silhouette"
-    },
-    {
-      "code": "1f465",
-      "name": "busts_in_silhouette"
-    },
-    {
-      "code": "1f335",
-      "name": "cactus"
-    },
-    {
-      "code": "1f370",
-      "name": "cake"
-    },
-    {
-      "code": "1f4c6",
-      "name": "calendar"
-    },
-    {
-      "code": "1f5d3",
-      "name": "calendar_spiral"
-    },
-    {
-      "code": "1f4f2",
-      "name": "calling"
-    },
-    {
-      "code": "1f42b",
-      "name": "camel"
-    },
-    {
-      "code": "1f4f7",
-      "name": "camera"
-    },
-    {
-      "code": "1f4f8",
-      "name": "camera_with_flash"
-    },
-    {
-      "code": "1f3d5",
-      "name": "camping"
-    },
-    {
-      "code": "264b",
-      "name": "cancer"
-    },
-    {
-      "code": "1f56f",
-      "name": "candle"
-    },
-    {
-      "code": "1f36c",
-      "name": "candy"
-    },
-    {
-      "code": "1f520",
-      "name": "capital_abcd"
-    },
-    {
-      "code": "2651",
-      "name": "capricorn"
-    },
-    {
-      "code": "1f5c3",
-      "name": "card_box"
-    },
-    {
-      "code": "1f4c7",
-      "name": "card_index"
-    },
-    {
-      "code": "1f3a0",
-      "name": "carousel_horse"
-    },
-    {
-      "code": "1f431",
-      "name": "cat"
-    },
-    {
-      "code": "1f408",
-      "name": "cat2"
-    },
-    {
-      "code": "1f4bf",
-      "name": "cd"
-    },
-    {
-      "code": "26d3",
-      "name": "chains"
-    },
-    {
-      "code": "1f37e",
-      "name": "champagne"
-    },
-    {
-      "code": "1f4b9",
-      "name": "chart"
-    },
-    {
-      "code": "1f4c9",
-      "name": "chart_with_downwards_trend"
-    },
-    {
-      "code": "1f4c8",
-      "name": "chart_with_upwards_trend"
-    },
-    {
-      "code": "1f3c1",
-      "name": "checkered_flag"
-    },
-    {
-      "code": "1f9c0",
-      "name": "cheese"
-    },
-    {
-      "code": "1f352",
-      "name": "cherries"
-    },
-    {
-      "code": "1f338",
-      "name": "cherry_blossom"
-    },
-    {
-      "code": "1f330",
-      "name": "chestnut"
-    },
-    {
-      "code": "1f414",
-      "name": "chicken"
-    },
-    {
-      "code": "1f6b8",
-      "name": "children_crossing"
-    },
-    {
-      "code": "1f43f",
-      "name": "chipmunk"
-    },
-    {
-      "code": "1f36b",
-      "name": "chocolate_bar"
-    },
-    {
-      "code": "1f384",
-      "name": "christmas_tree"
-    },
-    {
-      "code": "26ea",
-      "name": "church"
-    },
-    {
-      "code": "1f3a6",
-      "name": "cinema"
-    },
-    {
-      "code": "1f3aa",
-      "name": "circus_tent"
-    },
-    {
-      "code": "1f306",
-      "name": "city_dusk"
-    },
-    {
-      "code": "1f307",
-      "name": "city_sunset"
-    },
-    {
-      "code": "1f3d9",
-      "name": "cityscape"
-    },
-    {
-      "code": "1f191",
-      "name": "cl"
-    },
-    {
-      "code": "1f44f",
-      "name": "clap"
-    },
-    {
-      "code": "1f3ac",
-      "name": "clapper"
-    },
-    {
-      "code": "1f3db",
-      "name": "classical_building"
-    },
-    {
-      "code": "1f4cb",
-      "name": "clipboard"
-    },
-    {
-      "code": "1f570",
-      "name": "clock"
-    },
-    {
-      "code": "1f550",
-      "name": "clock1"
-    },
-    {
-      "code": "1f559",
-      "name": "clock10"
-    },
-    {
-      "code": "1f565",
-      "name": "clock1030"
-    },
-    {
-      "code": "1f55a",
-      "name": "clock11"
-    },
-    {
-      "code": "1f566",
-      "name": "clock1130"
-    },
-    {
-      "code": "1f55b",
-      "name": "clock12"
-    },
-    {
-      "code": "1f567",
-      "name": "clock1230"
-    },
-    {
-      "code": "1f55c",
-      "name": "clock130"
-    },
-    {
-      "code": "1f551",
-      "name": "clock2"
-    },
-    {
-      "code": "1f55d",
-      "name": "clock230"
-    },
-    {
-      "code": "1f552",
-      "name": "clock3"
-    },
-    {
-      "code": "1f55e",
-      "name": "clock330"
-    },
-    {
-      "code": "1f553",
-      "name": "clock4"
-    },
-    {
-      "code": "1f55f",
-      "name": "clock430"
-    },
-    {
-      "code": "1f554",
-      "name": "clock5"
-    },
-    {
-      "code": "1f560",
-      "name": "clock530"
-    },
-    {
-      "code": "1f555",
-      "name": "clock6"
-    },
-    {
-      "code": "1f561",
-      "name": "clock630"
-    },
-    {
-      "code": "1f556",
-      "name": "clock7"
-    },
-    {
-      "code": "1f562",
-      "name": "clock730"
-    },
-    {
-      "code": "1f557",
-      "name": "clock8"
-    },
-    {
-      "code": "1f563",
-      "name": "clock830"
-    },
-    {
-      "code": "1f558",
-      "name": "clock9"
-    },
-    {
-      "code": "1f564",
-      "name": "clock930"
-    },
-    {
-      "code": "1f4d5",
-      "name": "closed_book"
-    },
-    {
-      "code": "1f510",
-      "name": "closed_lock_with_key"
-    },
-    {
-      "code": "1f302",
-      "name": "closed_umbrella"
-    },
-    {
-      "code": "2601",
-      "name": "cloud"
-    },
-    {
-      "code": "1f329",
-      "name": "cloud_lightning"
-    },
-    {
-      "code": "1f327",
-      "name": "cloud_rain"
-    },
-    {
-      "code": "1f328",
-      "name": "cloud_snow"
-    },
-    {
-      "code": "1f32a",
-      "name": "cloud_tornado"
-    },
-    {
-      "code": "2663",
-      "name": "clubs"
-    },
-    {
-      "code": "1f378",
-      "name": "cocktail"
-    },
-    {
-      "code": "2615",
-      "name": "coffee"
-    },
-    {
-      "code": "26b0",
-      "name": "coffin"
-    },
-    {
-      "code": "1f630",
-      "name": "cold_sweat"
-    },
-    {
-      "code": "2604",
-      "name": "comet"
-    },
-    {
-      "code": "1f5dc",
-      "name": "compression"
-    },
-    {
-      "code": "1f4bb",
-      "name": "computer"
-    },
-    {
-      "code": "1f38a",
-      "name": "confetti_ball"
-    },
-    {
-      "code": "1f616",
-      "name": "confounded"
-    },
-    {
-      "code": "1f615",
-      "name": "confused"
-    },
-    {
-      "code": "3297",
-      "name": "congratulations"
-    },
-    {
-      "code": "1f6a7",
-      "name": "construction"
-    },
-    {
-      "code": "1f3d7",
-      "name": "construction_site"
-    },
-    {
-      "code": "1f477",
-      "name": "construction_worker"
-    },
-    {
-      "code": "1f39b",
-      "name": "control_knobs"
-    },
-    {
-      "code": "1f3ea",
-      "name": "convenience_store"
-    },
-    {
-      "code": "1f36a",
-      "name": "cookie"
-    },
-    {
-      "code": "1f192",
-      "name": "cool"
-    },
-    {
-      "code": "1f46e",
-      "name": "cop"
-    },
-    {
-      "code": "00a9",
-      "name": "copyright"
-    },
-    {
-      "code": "1f33d",
-      "name": "corn"
-    },
-    {
-      "code": "1f6cb",
-      "name": "couch"
-    },
-    {
-      "code": "1f46b",
-      "name": "couple"
-    },
-    {
-      "code": "1f491",
-      "name": "couple_with_heart"
-    },
-    {
-      "code": "1f48f",
-      "name": "couplekiss"
-    },
-    {
-      "code": "1f42e",
-      "name": "cow"
-    },
-    {
-      "code": "1f404",
-      "name": "cow2"
-    },
-    {
-      "code": "1f980",
-      "name": "crab"
-    },
-    {
-      "code": "1f58d",
-      "name": "crayon"
-    },
-    {
-      "code": "1f4b3",
-      "name": "credit_card"
-    },
-    {
-      "code": "1f319",
-      "name": "crescent_moon"
-    },
-    {
-      "code": "1f3cf",
-      "name": "cricket"
-    },
-    {
-      "code": "1f40a",
-      "name": "crocodile"
-    },
-    {
-      "code": "271d",
-      "name": "cross"
-    },
-    {
-      "code": "1f38c",
-      "name": "crossed_flags"
-    },
-    {
-      "code": "2694",
-      "name": "crossed_swords"
-    },
-    {
-      "code": "1f451",
-      "name": "crown"
-    },
-    {
-      "code": "1f6f3",
-      "name": "cruise_ship"
-    },
-    {
-      "code": "1f622",
-      "name": "cry"
-    },
-    {
-      "code": "1f63f",
-      "name": "crying_cat_face"
-    },
-    {
-      "code": "1f52e",
-      "name": "crystal_ball"
-    },
-    {
-      "code": "1f498",
-      "name": "cupid"
-    },
-    {
-      "code": "27b0",
-      "name": "curly_loop"
-    },
-    {
-      "code": "1f4b1",
-      "name": "currency_exchange"
-    },
-    {
-      "code": "1f35b",
-      "name": "curry"
-    },
-    {
-      "code": "1f36e",
-      "name": "custard"
-    },
-    {
-      "code": "1f6c3",
-      "name": "customs"
-    },
-    {
-      "code": "1f300",
-      "name": "cyclone"
-    },
-    {
-      "code": "1f5e1",
-      "name": "dagger"
-    },
-    {
-      "code": "1f483",
-      "name": "dancer"
-    },
-    {
-      "code": "1f46f",
-      "name": "dancers"
-    },
-    {
-      "code": "1f361",
-      "name": "dango"
-    },
-    {
-      "code": "1f576",
-      "name": "dark_sunglasses"
-    },
-    {
-      "code": "1f3af",
-      "name": "dart"
-    },
-    {
-      "code": "1f4a8",
-      "name": "dash"
-    },
-    {
-      "code": "1f4c5",
-      "name": "date"
-    },
-    {
-      "code": "1f333",
-      "name": "deciduous_tree"
-    },
-    {
-      "code": "1f3ec",
-      "name": "department_store"
-    },
-    {
-      "code": "1f3dc",
-      "name": "desert"
-    },
-    {
-      "code": "1f5a5",
-      "name": "desktop"
-    },
-    {
-      "code": "1f4a0",
-      "name": "diamond_shape_with_a_dot_inside"
-    },
-    {
-      "code": "2666",
-      "name": "diamonds"
-    },
-    {
-      "code": "1f61e",
-      "name": "disappointed"
-    },
-    {
-      "code": "1f625",
-      "name": "disappointed_relieved"
-    },
-    {
-      "code": "1f5c2",
-      "name": "dividers"
-    },
-    {
-      "code": "1f4ab",
-      "name": "dizzy"
-    },
-    {
-      "code": "1f635",
-      "name": "dizzy_face"
-    },
-    {
-      "code": "1f6af",
-      "name": "do_not_litter"
-    },
-    {
-      "code": "1f436",
-      "name": "dog"
-    },
-    {
-      "code": "1f415",
-      "name": "dog2"
-    },
-    {
-      "code": "1f4b5",
-      "name": "dollar"
-    },
-    {
-      "code": "1f38e",
-      "name": "dolls"
-    },
-    {
-      "code": "1f42c",
-      "name": "dolphin"
-    },
-    {
-      "code": "1f6aa",
-      "name": "door"
-    },
-    {
-      "code": "1f369",
-      "name": "doughnut"
-    },
-    {
-      "code": "1f54a",
-      "name": "dove"
-    },
-    {
-      "code": "1f409",
-      "name": "dragon"
-    },
-    {
-      "code": "1f432",
-      "name": "dragon_face"
-    },
-    {
-      "code": "1f457",
-      "name": "dress"
-    },
-    {
-      "code": "1f42a",
-      "name": "dromedary_camel"
-    },
-    {
-      "code": "1f4a7",
-      "name": "droplet"
-    },
-    {
-      "code": "1f4c0",
-      "name": "dvd"
-    },
-    {
-      "code": "1f4e7",
-      "name": "e-mail"
-    },
-    {
-      "code": "1f442",
-      "name": "ear"
-    },
-    {
-      "code": "1f33e",
-      "name": "ear_of_rice"
-    },
-    {
-      "code": "1f30d",
-      "name": "earth_africa"
-    },
-    {
-      "code": "1f30e",
-      "name": "earth_americas"
-    },
-    {
-      "code": "1f30f",
-      "name": "earth_asia"
-    },
-    {
-      "code": "1f373",
-      "name": "egg"
-    },
-    {
-      "code": "1f346",
-      "name": "eggplant"
-    },
-    {
-      "code": "0038-20e3",
-      "name": "eight"
-    },
-    {
-      "code": "2734",
-      "name": "eight_pointed_black_star"
-    },
-    {
-      "code": "2733",
-      "name": "eight_spoked_asterisk"
-    },
-    {
-      "code": "1f50c",
-      "name": "electric_plug"
-    },
-    {
-      "code": "1f418",
-      "name": "elephant"
-    },
-    {
-      "code": "1f51a",
-      "name": "end"
-    },
-    {
-      "code": "2709",
-      "name": "envelope"
-    },
-    {
-      "code": "1f4e9",
-      "name": "envelope_with_arrow"
-    },
-    {
-      "code": "1f4b6",
-      "name": "euro"
-    },
-    {
-      "code": "1f3f0",
-      "name": "european_castle"
-    },
-    {
-      "code": "1f3e4",
-      "name": "european_post_office"
-    },
-    {
-      "code": "1f332",
-      "name": "evergreen_tree"
-    },
-    {
-      "code": "2757",
-      "name": "exclamation"
-    },
-    {
-      "code": "1f611",
-      "name": "expressionless"
-    },
-    {
-      "code": "1f441",
-      "name": "eye"
-    },
-    {
-      "code": "1f453",
-      "name": "eyeglasses"
-    },
-    {
-      "code": "1f440",
-      "name": "eyes"
-    },
-    {
-      "code": "1f3ed",
-      "name": "factory"
-    },
-    {
-      "code": "1f342",
-      "name": "fallen_leaf"
-    },
-    {
-      "code": "23e9",
-      "name": "fast_forward"
-    },
-    {
-      "code": "1f4e0",
-      "name": "fax"
-    },
-    {
-      "code": "1f628",
-      "name": "fearful"
-    },
-    {
-      "code": "1f43e",
-      "name": "feet"
-    },
-    {
-      "code": "1f3a1",
-      "name": "ferris_wheel"
-    },
-    {
-      "code": "26f4",
-      "name": "ferry"
-    },
-    {
-      "code": "1f3d1",
-      "name": "field_hockey"
-    },
-    {
-      "code": "1f5c4",
-      "name": "file_cabinet"
-    },
-    {
-      "code": "1f4c1",
-      "name": "file_folder"
-    },
-    {
-      "code": "1f39e",
-      "name": "film_frames"
-    },
-    {
-      "code": "1f525",
-      "name": "fire"
-    },
-    {
-      "code": "1f692",
-      "name": "fire_engine"
-    },
-    {
-      "code": "1f386",
-      "name": "fireworks"
-    },
-    {
-      "code": "1f313",
-      "name": "first_quarter_moon"
-    },
-    {
-      "code": "1f31b",
-      "name": "first_quarter_moon_with_face"
-    },
-    {
-      "code": "1f41f",
-      "name": "fish"
-    },
-    {
-      "code": "1f365",
-      "name": "fish_cake"
-    },
-    {
-      "code": "1f3a3",
-      "name": "fishing_pole_and_fish"
-    },
-    {
-      "code": "270a",
-      "name": "fist"
-    },
-    {
-      "code": "0035-20e3",
-      "name": "five"
-    },
-    {
-      "code": "1f3f4",
-      "name": "flag_black"
-    },
-    {
-      "code": "1f3f3",
-      "name": "flag_white"
-    },
-    {
-      "code": "1f38f",
-      "name": "flags"
-    },
-    {
-      "code": "1f526",
-      "name": "flashlight"
-    },
-    {
-      "code": "269c",
-      "name": "fleur-de-lis"
-    },
-    {
-      "code": "1f4be",
-      "name": "floppy_disk"
-    },
-    {
-      "code": "1f3b4",
-      "name": "flower_playing_cards"
-    },
-    {
-      "code": "1f633",
-      "name": "flushed"
-    },
-    {
-      "code": "1f32b",
-      "name": "fog"
-    },
-    {
-      "code": "1f301",
-      "name": "foggy"
-    },
-    {
-      "code": "1f3c8",
-      "name": "football"
-    },
-    {
-      "code": "1f463",
-      "name": "footprints"
-    },
-    {
-      "code": "1f374",
-      "name": "fork_and_knife"
-    },
-    {
-      "code": "1f37d",
-      "name": "fork_knife_plate"
-    },
-    {
-      "code": "26f2",
-      "name": "fountain"
-    },
-    {
-      "code": "0034-20e3",
-      "name": "four"
-    },
-    {
-      "code": "1f340",
-      "name": "four_leaf_clover"
-    },
-    {
-      "code": "1f5bc",
-      "name": "frame_photo"
-    },
-    {
-      "code": "1f193",
-      "name": "free"
-    },
-    {
-      "code": "1f364",
-      "name": "fried_shrimp"
-    },
-    {
-      "code": "1f35f",
-      "name": "fries"
-    },
-    {
-      "code": "1f438",
-      "name": "frog"
-    },
-    {
-      "code": "1f626",
-      "name": "frowning"
-    },
-    {
-      "code": "2639",
-      "name": "frowning2"
-    },
-    {
-      "code": "26fd",
-      "name": "fuelpump"
-    },
-    {
-      "code": "1f315",
-      "name": "full_moon"
-    },
-    {
-      "code": "1f31d",
-      "name": "full_moon_with_face"
-    },
-    {
-      "code": "1f3b2",
-      "name": "game_die"
-    },
-    {
-      "code": "2699",
-      "name": "gear"
-    },
-    {
-      "code": "1f48e",
-      "name": "gem"
-    },
-    {
-      "code": "264a",
-      "name": "gemini"
-    },
-    {
-      "code": "1f47b",
-      "name": "ghost"
-    },
-    {
-      "code": "1f381",
-      "name": "gift"
-    },
-    {
-      "code": "1f49d",
-      "name": "gift_heart"
-    },
-    {
-      "code": "1f467",
-      "name": "girl"
-    },
-    {
-      "code": "1f310",
-      "name": "globe_with_meridians"
-    },
-    {
-      "code": "1f410",
-      "name": "goat"
-    },
-    {
-      "code": "26f3",
-      "name": "golf"
-    },
-    {
-      "code": "1f3cc",
-      "name": "golfer"
-    },
-    {
-      "code": "1f347",
-      "name": "grapes"
-    },
-    {
-      "code": "1f34f",
-      "name": "green_apple"
-    },
-    {
-      "code": "1f4d7",
-      "name": "green_book"
-    },
-    {
-      "code": "1f49a",
-      "name": "green_heart"
-    },
-    {
-      "code": "2755",
-      "name": "grey_exclamation"
-    },
-    {
-      "code": "2754",
-      "name": "grey_question"
+      "code": "1f600",
+      "name": "grinning"
     },
     {
       "code": "1f62c",
@@ -1568,1141 +12,449 @@
       "code": "1f601",
       "name": "grin"
     },
-    {
-      "code": "1f600",
-      "name": "grinning"
-    },
-    {
-      "code": "1f482",
-      "name": "guardsman"
-    },
-    {
-      "code": "1f3b8",
-      "name": "guitar"
-    },
-    {
-      "code": "1f52b",
-      "name": "gun"
-    },
-    {
-      "code": "1f487",
-      "name": "haircut"
-    },
-    {
-      "code": "1f354",
-      "name": "hamburger"
-    },
-    {
-      "code": "1f528",
-      "name": "hammer"
-    },
-    {
-      "code": "2692",
-      "name": "hammer_pick"
-    },
-    {
-      "code": "1f439",
-      "name": "hamster"
-    },
-    {
-      "code": "1f590",
-      "name": "hand_splayed"
-    },
-    {
-      "code": "1f45c",
-      "name": "handbag"
-    },
-    {
-      "code": "0023-20e3",
-      "name": "hash"
-    },
-    {
-      "code": "1f425",
-      "name": "hatched_chick"
-    },
-    {
-      "code": "1f423",
-      "name": "hatching_chick"
-    },
-    {
-      "code": "1f915",
-      "name": "head_bandage"
-    },
-    {
-      "code": "1f3a7",
-      "name": "headphones"
-    },
-    {
-      "code": "1f649",
-      "name": "hear_no_evil"
-    },
-    {
-      "code": "2764",
-      "name": "heart"
-    },
-    {
-      "code": "1f49f",
-      "name": "heart_decoration"
-    },
-    {
-      "code": "2763",
-      "name": "heart_exclamation"
-    },
-    {
-      "code": "1f60d",
-      "name": "heart_eyes"
-    },
-    {
-      "code": "1f63b",
-      "name": "heart_eyes_cat"
-    },
-    {
-      "code": "1f493",
-      "name": "heartbeat"
-    },
-    {
-      "code": "1f497",
-      "name": "heartpulse"
-    },
-    {
-      "code": "2665",
-      "name": "hearts"
-    },
-    {
-      "code": "2714",
-      "name": "heavy_check_mark"
-    },
-    {
-      "code": "2797",
-      "name": "heavy_division_sign"
-    },
-    {
-      "code": "1f4b2",
-      "name": "heavy_dollar_sign"
-    },
-    {
-      "code": "2796",
-      "name": "heavy_minus_sign"
-    },
-    {
-      "code": "2716",
-      "name": "heavy_multiplication_x"
-    },
-    {
-      "code": "2795",
-      "name": "heavy_plus_sign"
-    },
-    {
-      "code": "1f681",
-      "name": "helicopter"
-    },
-    {
-      "code": "26d1",
-      "name": "helmet_with_cross"
-    },
-    {
-      "code": "1f33f",
-      "name": "herb"
-    },
-    {
-      "code": "1f33a",
-      "name": "hibiscus"
-    },
-    {
-      "code": "1f506",
-      "name": "high_brightness"
-    },
-    {
-      "code": "1f460",
-      "name": "high_heel"
-    },
-    {
-      "code": "1f3d2",
-      "name": "hockey"
-    },
-    {
-      "code": "1f573",
-      "name": "hole"
-    },
-    {
-      "code": "1f3d8",
-      "name": "homes"
-    },
-    {
-      "code": "1f36f",
-      "name": "honey_pot"
-    },
-    {
-      "code": "1f434",
-      "name": "horse"
-    },
-    {
-      "code": "1f3c7",
-      "name": "horse_racing"
-    },
-    {
-      "code": "1f3e5",
-      "name": "hospital"
-    },
-    {
-      "code": "1f336",
-      "name": "hot_pepper"
-    },
-    {
-      "code": "1f32d",
-      "name": "hotdog"
-    },
-    {
-      "code": "1f3e8",
-      "name": "hotel"
-    },
-    {
-      "code": "2668",
-      "name": "hotsprings"
-    },
-    {
-      "code": "231b",
-      "name": "hourglass"
-    },
-    {
-      "code": "23f3",
-      "name": "hourglass_flowing_sand"
-    },
-    {
-      "code": "1f3e0",
-      "name": "house"
-    },
-    {
-      "code": "1f3da",
-      "name": "house_abandoned"
-    },
-    {
-      "code": "1f3e1",
-      "name": "house_with_garden"
-    },
-    {
-      "code": "1f917",
-      "name": "hugging"
-    },
-    {
-      "code": "1f62f",
-      "name": "hushed"
-    },
-    {
-      "code": "1f368",
-      "name": "ice_cream"
-    },
-    {
-      "code": "26f8",
-      "name": "ice_skate"
-    },
-    {
-      "code": "1f366",
-      "name": "icecream"
-    },
-    {
-      "code": "1f194",
-      "name": "id"
-    },
-    {
-      "code": "1f250",
-      "name": "ideograph_advantage"
-    },
-    {
-      "code": "1f47f",
-      "name": "imp"
-    },
-    {
-      "code": "1f4e5",
-      "name": "inbox_tray"
-    },
-    {
-      "code": "1f4e8",
-      "name": "incoming_envelope"
-    },
-    {
-      "code": "1f481",
-      "name": "information_desk_person"
-    },
-    {
-      "code": "2139",
-      "name": "information_source"
-    },
-    {
-      "code": "1f607",
-      "name": "innocent"
-    },
-    {
-      "code": "2049",
-      "name": "interrobang"
-    },
-    {
-      "code": "1f4f1",
-      "name": "iphone"
-    },
-    {
-      "code": "1f3dd",
-      "name": "island"
-    },
-    {
-      "code": "1f3ee",
-      "name": "izakaya_lantern"
-    },
-    {
-      "code": "1f383",
-      "name": "jack_o_lantern"
-    },
-    {
-      "code": "1f5fe",
-      "name": "japan"
-    },
-    {
-      "code": "1f3ef",
-      "name": "japanese_castle"
-    },
-    {
-      "code": "1f47a",
-      "name": "japanese_goblin"
-    },
-    {
-      "code": "1f479",
-      "name": "japanese_ogre"
-    },
-    {
-      "code": "1f456",
-      "name": "jeans"
-    },
     {
       "code": "1f602",
       "name": "joy"
     },
     {
-      "code": "1f639",
-      "name": "joy_cat"
+      "code": "1f923",
+      "name": "rofl"
     },
     {
-      "code": "1f579",
-      "name": "joystick"
+      "code": "1f603",
+      "name": "smiley"
     },
     {
-      "code": "1f54b",
-      "name": "kaaba"
+      "code": "1f604",
+      "name": "smile"
     },
     {
-      "code": "1f511",
-      "name": "key"
-    },
-    {
-      "code": "1f5dd",
-      "name": "key2"
-    },
-    {
-      "code": "2328",
-      "name": "keyboard"
-    },
-    {
-      "code": "1f458",
-      "name": "kimono"
-    },
-    {
-      "code": "1f48b",
-      "name": "kiss"
-    },
-    {
-      "code": "1f617",
-      "name": "kissing"
-    },
-    {
-      "code": "1f63d",
-      "name": "kissing_cat"
-    },
-    {
-      "code": "1f61a",
-      "name": "kissing_closed_eyes"
-    },
-    {
-      "code": "1f618",
-      "name": "kissing_heart"
-    },
-    {
-      "code": "1f619",
-      "name": "kissing_smiling_eyes"
-    },
-    {
-      "code": "1f52a",
-      "name": "knife"
-    },
-    {
-      "code": "1f428",
-      "name": "koala"
-    },
-    {
-      "code": "1f201",
-      "name": "koko"
-    },
-    {
-      "code": "1f3f7",
-      "name": "label"
-    },
-    {
-      "code": "1f535",
-      "name": "large_blue_circle"
-    },
-    {
-      "code": "1f537",
-      "name": "large_blue_diamond"
-    },
-    {
-      "code": "1f536",
-      "name": "large_orange_diamond"
-    },
-    {
-      "code": "1f317",
-      "name": "last_quarter_moon"
-    },
-    {
-      "code": "1f31c",
-      "name": "last_quarter_moon_with_face"
+      "code": "1f605",
+      "name": "sweat_smile"
     },
     {
       "code": "1f606",
       "name": "laughing"
     },
     {
-      "code": "1f343",
-      "name": "leaves"
+      "code": "1f607",
+      "name": "innocent"
     },
     {
-      "code": "1f4d2",
-      "name": "ledger"
+      "code": "1f609",
+      "name": "wink"
     },
     {
-      "code": "1f6c5",
-      "name": "left_luggage"
+      "code": "1f60a",
+      "name": "blush"
     },
     {
-      "code": "2194",
-      "name": "left_right_arrow"
+      "code": "1f642",
+      "name": "slightly_smiling_face"
     },
     {
-      "code": "21a9",
-      "name": "leftwards_arrow_with_hook"
+      "code": "1f643",
+      "name": "upside_down_face"
     },
     {
-      "code": "1f34b",
-      "name": "lemon"
+      "code": "263a",
+      "name": "relaxed"
     },
     {
-      "code": "264c",
-      "name": "leo"
+      "code": "1f60b",
+      "name": "yum"
     },
     {
-      "code": "1f406",
-      "name": "leopard"
+      "code": "1f60c",
+      "name": "relieved"
     },
     {
-      "code": "1f39a",
-      "name": "level_slider"
+      "code": "1f60d",
+      "name": "heart_eyes"
     },
     {
-      "code": "1f574",
-      "name": "levitate"
+      "code": "1f618",
+      "name": "kissing_heart"
     },
     {
-      "code": "264e",
-      "name": "libra"
+      "code": "1f617",
+      "name": "kissing"
     },
     {
-      "code": "1f3cb",
-      "name": "lifter"
+      "code": "1f619",
+      "name": "kissing_smiling_eyes"
     },
     {
-      "code": "1f688",
-      "name": "light_rail"
+      "code": "1f61a",
+      "name": "kissing_closed_eyes"
     },
     {
-      "code": "1f517",
-      "name": "link"
+      "code": "1f61c",
+      "name": "stuck_out_tongue_winking_eye"
     },
     {
-      "code": "1f981",
-      "name": "lion_face"
+      "code": "1f61d",
+      "name": "stuck_out_tongue_closed_eyes"
     },
     {
-      "code": "1f444",
-      "name": "lips"
-    },
-    {
-      "code": "1f484",
-      "name": "lipstick"
-    },
-    {
-      "code": "1f512",
-      "name": "lock"
-    },
-    {
-      "code": "1f50f",
-      "name": "lock_with_ink_pen"
-    },
-    {
-      "code": "1f36d",
-      "name": "lollipop"
-    },
-    {
-      "code": "27bf",
-      "name": "loop"
-    },
-    {
-      "code": "1f50a",
-      "name": "loud_sound"
-    },
-    {
-      "code": "1f4e2",
-      "name": "loudspeaker"
-    },
-    {
-      "code": "1f3e9",
-      "name": "love_hotel"
-    },
-    {
-      "code": "1f48c",
-      "name": "love_letter"
-    },
-    {
-      "code": "1f505",
-      "name": "low_brightness"
-    },
-    {
-      "code": "24c2",
-      "name": "m"
-    },
-    {
-      "code": "1f50d",
-      "name": "mag"
-    },
-    {
-      "code": "1f50e",
-      "name": "mag_right"
-    },
-    {
-      "code": "1f004",
-      "name": "mahjong"
-    },
-    {
-      "code": "1f4eb",
-      "name": "mailbox"
-    },
-    {
-      "code": "1f4ea",
-      "name": "mailbox_closed"
-    },
-    {
-      "code": "1f4ec",
-      "name": "mailbox_with_mail"
-    },
-    {
-      "code": "1f4ed",
-      "name": "mailbox_with_no_mail"
-    },
-    {
-      "code": "1f468",
-      "name": "man"
-    },
-    {
-      "code": "1f472",
-      "name": "man_with_gua_pi_mao"
-    },
-    {
-      "code": "1f473",
-      "name": "man_with_turban"
-    },
-    {
-      "code": "1f45e",
-      "name": "mans_shoe"
-    },
-    {
-      "code": "1f5fa",
-      "name": "map"
-    },
-    {
-      "code": "1f341",
-      "name": "maple_leaf"
-    },
-    {
-      "code": "1f637",
-      "name": "mask"
-    },
-    {
-      "code": "1f486",
-      "name": "massage"
-    },
-    {
-      "code": "1f356",
-      "name": "meat_on_bone"
-    },
-    {
-      "code": "1f3c5",
-      "name": "medal"
-    },
-    {
-      "code": "1f4e3",
-      "name": "mega"
-    },
-    {
-      "code": "1f348",
-      "name": "melon"
-    },
-    {
-      "code": "1f54e",
-      "name": "menorah"
-    },
-    {
-      "code": "1f6b9",
-      "name": "mens"
-    },
-    {
-      "code": "1f918",
-      "name": "metal"
-    },
-    {
-      "code": "1f687",
-      "name": "metro"
-    },
-    {
-      "code": "1f3a4",
-      "name": "microphone"
-    },
-    {
-      "code": "1f399",
-      "name": "microphone2"
-    },
-    {
-      "code": "1f52c",
-      "name": "microscope"
-    },
-    {
-      "code": "1f595",
-      "name": "middle_finger"
-    },
-    {
-      "code": "1f396",
-      "name": "military_medal"
-    },
-    {
-      "code": "1f30c",
-      "name": "milky_way"
-    },
-    {
-      "code": "1f690",
-      "name": "minibus"
-    },
-    {
-      "code": "1f4bd",
-      "name": "minidisc"
-    },
-    {
-      "code": "1f4f4",
-      "name": "mobile_phone_off"
+      "code": "1f61b",
+      "name": "stuck_out_tongue"
     },
     {
       "code": "1f911",
-      "name": "money_mouth"
-    },
-    {
-      "code": "1f4b8",
-      "name": "money_with_wings"
-    },
-    {
-      "code": "1f4b0",
-      "name": "moneybag"
-    },
-    {
-      "code": "1f412",
-      "name": "monkey"
-    },
-    {
-      "code": "1f435",
-      "name": "monkey_face"
-    },
-    {
-      "code": "1f69d",
-      "name": "monorail"
-    },
-    {
-      "code": "1f393",
-      "name": "mortar_board"
-    },
-    {
-      "code": "1f54c",
-      "name": "mosque"
-    },
-    {
-      "code": "1f6e5",
-      "name": "motorboat"
-    },
-    {
-      "code": "1f3cd",
-      "name": "motorcycle"
-    },
-    {
-      "code": "1f6e3",
-      "name": "motorway"
-    },
-    {
-      "code": "1f5fb",
-      "name": "mount_fuji"
-    },
-    {
-      "code": "26f0",
-      "name": "mountain"
-    },
-    {
-      "code": "1f6b5",
-      "name": "mountain_bicyclist"
-    },
-    {
-      "code": "1f6a0",
-      "name": "mountain_cableway"
-    },
-    {
-      "code": "1f69e",
-      "name": "mountain_railway"
-    },
-    {
-      "code": "1f3d4",
-      "name": "mountain_snow"
-    },
-    {
-      "code": "1f42d",
-      "name": "mouse"
-    },
-    {
-      "code": "1f401",
-      "name": "mouse2"
-    },
-    {
-      "code": "1f5b1",
-      "name": "mouse_three_button"
-    },
-    {
-      "code": "1f3a5",
-      "name": "movie_camera"
-    },
-    {
-      "code": "1f5ff",
-      "name": "moyai"
-    },
-    {
-      "code": "1f4aa",
-      "name": "muscle"
-    },
-    {
-      "code": "1f344",
-      "name": "mushroom"
-    },
-    {
-      "code": "1f3b9",
-      "name": "musical_keyboard"
-    },
-    {
-      "code": "1f3b5",
-      "name": "musical_note"
-    },
-    {
-      "code": "1f3bc",
-      "name": "musical_score"
-    },
-    {
-      "code": "1f507",
-      "name": "mute"
-    },
-    {
-      "code": "1f485",
-      "name": "nail_care"
-    },
-    {
-      "code": "1f4db",
-      "name": "name_badge"
-    },
-    {
-      "code": "1f454",
-      "name": "necktie"
-    },
-    {
-      "code": "274e",
-      "name": "negative_squared_cross_mark"
+      "name": "money_mouth_face"
     },
     {
       "code": "1f913",
-      "name": "nerd"
+      "name": "nerd_face"
     },
     {
-      "code": "1f610",
-      "name": "neutral_face"
+      "code": "1f60e",
+      "name": "sunglasses"
     },
     {
-      "code": "1f195",
-      "name": "new"
+      "code": "1f921",
+      "name": "clown_face"
     },
     {
-      "code": "1f311",
-      "name": "new_moon"
+      "code": "1f920",
+      "name": "cowboy_hat_face"
     },
     {
-      "code": "1f31a",
-      "name": "new_moon_with_face"
+      "code": "1f917",
+      "name": "hugs"
     },
     {
-      "code": "1f4f0",
-      "name": "newspaper"
-    },
-    {
-      "code": "1f5de",
-      "name": "newspaper2"
-    },
-    {
-      "code": "1f196",
-      "name": "ng"
-    },
-    {
-      "code": "1f303",
-      "name": "night_with_stars"
-    },
-    {
-      "code": "0039-20e3",
-      "name": "nine"
-    },
-    {
-      "code": "1f515",
-      "name": "no_bell"
-    },
-    {
-      "code": "1f6b3",
-      "name": "no_bicycles"
-    },
-    {
-      "code": "26d4",
-      "name": "no_entry"
-    },
-    {
-      "code": "1f6ab",
-      "name": "no_entry_sign"
-    },
-    {
-      "code": "1f645",
-      "name": "no_good"
-    },
-    {
-      "code": "1f4f5",
-      "name": "no_mobile_phones"
+      "code": "1f60f",
+      "name": "smirk"
     },
     {
       "code": "1f636",
       "name": "no_mouth"
     },
     {
-      "code": "1f6b7",
-      "name": "no_pedestrians"
+      "code": "1f610",
+      "name": "neutral_face"
     },
     {
-      "code": "1f6ad",
-      "name": "no_smoking"
+      "code": "1f611",
+      "name": "expressionless"
     },
     {
-      "code": "1f6b1",
-      "name": "non-potable_water"
+      "code": "1f612",
+      "name": "unamused"
     },
     {
-      "code": "1f443",
-      "name": "nose"
+      "code": "1f644",
+      "name": "roll_eyes"
     },
     {
-      "code": "1f4d3",
-      "name": "notebook"
+      "code": "1f914",
+      "name": "thinking"
     },
     {
-      "code": "1f4d4",
-      "name": "notebook_with_decorative_cover"
+      "code": "1f925",
+      "name": "lying_face"
     },
     {
-      "code": "1f5d2",
-      "name": "notepad_spiral"
+      "code": "1f633",
+      "name": "flushed"
     },
     {
-      "code": "1f3b6",
-      "name": "notes"
+      "code": "1f61e",
+      "name": "disappointed"
     },
     {
-      "code": "1f529",
-      "name": "nut_and_bolt"
+      "code": "1f61f",
+      "name": "worried"
     },
     {
-      "code": "2b55",
-      "name": "o"
+      "code": "1f620",
+      "name": "angry"
     },
     {
-      "code": "1f17e",
-      "name": "o2"
-    },
-    {
-      "code": "1f30a",
-      "name": "ocean"
-    },
-    {
-      "code": "1f419",
-      "name": "octopus"
-    },
-    {
-      "code": "1f362",
-      "name": "oden"
-    },
-    {
-      "code": "1f3e2",
-      "name": "office"
-    },
-    {
-      "code": "1f6e2",
-      "name": "oil"
-    },
-    {
-      "code": "1f197",
-      "name": "ok"
-    },
-    {
-      "code": "1f44c",
-      "name": "ok_hand"
-    },
-    {
-      "code": "1f646",
-      "name": "ok_woman"
-    },
-    {
-      "code": "1f474",
-      "name": "older_man"
-    },
-    {
-      "code": "1f475",
-      "name": "older_woman"
-    },
-    {
-      "code": "1f549",
-      "name": "om_symbol"
-    },
-    {
-      "code": "1f51b",
-      "name": "on"
-    },
-    {
-      "code": "1f698",
-      "name": "oncoming_automobile"
-    },
-    {
-      "code": "1f68d",
-      "name": "oncoming_bus"
-    },
-    {
-      "code": "1f694",
-      "name": "oncoming_police_car"
-    },
-    {
-      "code": "1f696",
-      "name": "oncoming_taxi"
-    },
-    {
-      "code": "0031-20e3",
-      "name": "one"
-    },
-    {
-      "code": "1f4c2",
-      "name": "open_file_folder"
-    },
-    {
-      "code": "1f450",
-      "name": "open_hands"
-    },
-    {
-      "code": "1f62e",
-      "name": "open_mouth"
-    },
-    {
-      "code": "26ce",
-      "name": "ophiuchus"
-    },
-    {
-      "code": "1f4d9",
-      "name": "orange_book"
-    },
-    {
-      "code": "2626",
-      "name": "orthodox_cross"
-    },
-    {
-      "code": "1f4e4",
-      "name": "outbox_tray"
-    },
-    {
-      "code": "1f402",
-      "name": "ox"
-    },
-    {
-      "code": "1f4e6",
-      "name": "package"
-    },
-    {
-      "code": "1f4c4",
-      "name": "page_facing_up"
-    },
-    {
-      "code": "1f4c3",
-      "name": "page_with_curl"
-    },
-    {
-      "code": "1f4df",
-      "name": "pager"
-    },
-    {
-      "code": "1f58c",
-      "name": "paintbrush"
-    },
-    {
-      "code": "1f334",
-      "name": "palm_tree"
-    },
-    {
-      "code": "1f43c",
-      "name": "panda_face"
-    },
-    {
-      "code": "1f4ce",
-      "name": "paperclip"
-    },
-    {
-      "code": "1f587",
-      "name": "paperclips"
-    },
-    {
-      "code": "1f3de",
-      "name": "park"
-    },
-    {
-      "code": "1f17f",
-      "name": "parking"
-    },
-    {
-      "code": "303d",
-      "name": "part_alternation_mark"
-    },
-    {
-      "code": "26c5",
-      "name": "partly_sunny"
-    },
-    {
-      "code": "1f6c2",
-      "name": "passport_control"
-    },
-    {
-      "code": "23f8",
-      "name": "pause_button"
-    },
-    {
-      "code": "262e",
-      "name": "peace"
-    },
-    {
-      "code": "1f351",
-      "name": "peach"
-    },
-    {
-      "code": "1f350",
-      "name": "pear"
-    },
-    {
-      "code": "1f58a",
-      "name": "pen_ballpoint"
-    },
-    {
-      "code": "1f58b",
-      "name": "pen_fountain"
-    },
-    {
-      "code": "1f4dd",
-      "name": "pencil"
-    },
-    {
-      "code": "270f",
-      "name": "pencil2"
-    },
-    {
-      "code": "1f427",
-      "name": "penguin"
+      "code": "1f621",
+      "name": "rage"
     },
     {
       "code": "1f614",
       "name": "pensive"
     },
     {
-      "code": "1f3ad",
-      "name": "performing_arts"
+      "code": "1f615",
+      "name": "confused"
+    },
+    {
+      "code": "1f641",
+      "name": "slightly_frowning_face"
+    },
+    {
+      "code": "2639",
+      "name": "frowning_face"
     },
     {
       "code": "1f623",
       "name": "persevere"
     },
     {
-      "code": "1f64d",
-      "name": "person_frowning"
+      "code": "1f616",
+      "name": "confounded"
     },
     {
-      "code": "1f471",
-      "name": "person_with_blond_hair"
+      "code": "1f62b",
+      "name": "tired_face"
     },
     {
-      "code": "1f64e",
-      "name": "person_with_pouting_face"
+      "code": "1f629",
+      "name": "weary"
     },
     {
-      "code": "26cf",
-      "name": "pick"
+      "code": "1f624",
+      "name": "triumph"
     },
     {
-      "code": "1f437",
-      "name": "pig"
+      "code": "1f62e",
+      "name": "open_mouth"
     },
     {
-      "code": "1f416",
-      "name": "pig2"
+      "code": "1f631",
+      "name": "scream"
     },
     {
-      "code": "1f43d",
-      "name": "pig_nose"
+      "code": "1f628",
+      "name": "fearful"
     },
     {
-      "code": "1f48a",
-      "name": "pill"
+      "code": "1f630",
+      "name": "cold_sweat"
     },
     {
-      "code": "1f34d",
-      "name": "pineapple"
+      "code": "1f62f",
+      "name": "hushed"
     },
     {
-      "code": "1f3d3",
-      "name": "ping_pong"
+      "code": "1f626",
+      "name": "frowning"
     },
     {
-      "code": "2653",
-      "name": "pisces"
+      "code": "1f627",
+      "name": "anguished"
     },
     {
-      "code": "1f355",
-      "name": "pizza"
+      "code": "1f622",
+      "name": "cry"
     },
     {
-      "code": "1f6d0",
-      "name": "place_of_worship"
+      "code": "1f625",
+      "name": "disappointed_relieved"
     },
     {
-      "code": "23ef",
-      "name": "play_pause"
+      "code": "1f924",
+      "name": "drooling_face"
+    },
+    {
+      "code": "1f62a",
+      "name": "sleepy"
+    },
+    {
+      "code": "1f613",
+      "name": "sweat"
+    },
+    {
+      "code": "1f62d",
+      "name": "sob"
+    },
+    {
+      "code": "1f635",
+      "name": "dizzy_face"
+    },
+    {
+      "code": "1f632",
+      "name": "astonished"
+    },
+    {
+      "code": "1f910",
+      "name": "zipper_mouth_face"
+    },
+    {
+      "code": "1f922",
+      "name": "nauseated_face"
+    },
+    {
+      "code": "1f927",
+      "name": "sneezing_face"
+    },
+    {
+      "code": "1f637",
+      "name": "mask"
+    },
+    {
+      "code": "1f912",
+      "name": "face_with_thermometer"
+    },
+    {
+      "code": "1f915",
+      "name": "face_with_head_bandage"
+    },
+    {
+      "code": "1f634",
+      "name": "sleeping"
+    },
+    {
+      "code": "1f4a4",
+      "name": "zzz"
+    },
+    {
+      "code": "1f4a9",
+      "name": "poop"
+    },
+    {
+      "code": "1f608",
+      "name": "smiling_imp"
+    },
+    {
+      "code": "1f47f",
+      "name": "imp"
+    },
+    {
+      "code": "1f479",
+      "name": "japanese_ogre"
+    },
+    {
+      "code": "1f47a",
+      "name": "japanese_goblin"
+    },
+    {
+      "code": "1f480",
+      "name": "skull"
+    },
+    {
+      "code": "1f47b",
+      "name": "ghost"
+    },
+    {
+      "code": "1f47d",
+      "name": "alien"
+    },
+    {
+      "code": "1f916",
+      "name": "robot"
+    },
+    {
+      "code": "1f63a",
+      "name": "smiley_cat"
+    },
+    {
+      "code": "1f638",
+      "name": "smile_cat"
+    },
+    {
+      "code": "1f639",
+      "name": "joy_cat"
+    },
+    {
+      "code": "1f63b",
+      "name": "heart_eyes_cat"
+    },
+    {
+      "code": "1f63c",
+      "name": "smirk_cat"
+    },
+    {
+      "code": "1f63d",
+      "name": "kissing_cat"
+    },
+    {
+      "code": "1f640",
+      "name": "scream_cat"
+    },
+    {
+      "code": "1f63f",
+      "name": "crying_cat_face"
+    },
+    {
+      "code": "1f63e",
+      "name": "pouting_cat"
+    },
+    {
+      "code": "1f64c",
+      "name": "raised_hands"
+    },
+    {
+      "code": "1f44f",
+      "name": "clap"
+    },
+    {
+      "code": "1f44b",
+      "name": "wave"
+    },
+    {
+      "code": "1f919",
+      "name": "call_me_hand"
+    },
+    {
+      "code": "1f44d",
+      "name": "+1"
+    },
+    {
+      "code": "1f44e",
+      "name": "-1"
+    },
+    {
+      "code": "1f44a",
+      "name": "facepunch"
+    },
+    {
+      "code": "270a",
+      "name": "fist"
+    },
+    {
+      "code": "1f91b",
+      "name": "fist_left"
+    },
+    {
+      "code": "1f91c",
+      "name": "fist_right"
+    },
+    {
+      "code": "270c",
+      "name": "v"
+    },
+    {
+      "code": "1f44c",
+      "name": "ok_hand"
+    },
+    {
+      "code": "270b",
+      "name": "raised_hand"
+    },
+    {
+      "code": "1f91a",
+      "name": "raised_back_of_hand"
+    },
+    {
+      "code": "1f450",
+      "name": "open_hands"
+    },
+    {
+      "code": "1f4aa",
+      "name": "muscle"
+    },
+    {
+      "code": "1f64f",
+      "name": "pray"
+    },
+    {
+      "code": "1f91d",
+      "name": "handshake"
+    },
+    {
+      "code": "261d",
+      "name": "point_up"
+    },
+    {
+      "code": "1f446",
+      "name": "point_up_2"
     },
     {
       "code": "1f447",
@@ -2717,1012 +469,348 @@
       "name": "point_right"
     },
     {
-      "code": "261d",
-      "name": "point_up"
+      "code": "1f595",
+      "name": "fu"
     },
     {
-      "code": "1f446",
-      "name": "point_up_2"
+      "code": "1f590",
+      "name": "raised_hand_with_fingers_splayed"
     },
     {
-      "code": "1f693",
-      "name": "police_car"
+      "code": "1f918",
+      "name": "metal"
     },
     {
-      "code": "1f429",
-      "name": "poodle"
+      "code": "1f91e",
+      "name": "crossed_fingers"
     },
     {
-      "code": "1f4a9",
-      "name": "poop"
+      "code": "1f596",
+      "name": "vulcan_salute"
     },
     {
-      "code": "1f37f",
-      "name": "popcorn"
+      "code": "270d",
+      "name": "writing_hand"
     },
     {
-      "code": "1f3e3",
-      "name": "post_office"
+      "code": "1f933",
+      "name": "selfie"
     },
     {
-      "code": "1f4ef",
-      "name": "postal_horn"
+      "code": "1f485",
+      "name": "nail_care"
     },
     {
-      "code": "1f4ee",
-      "name": "postbox"
-    },
-    {
-      "code": "1f6b0",
-      "name": "potable_water"
-    },
-    {
-      "code": "1f45d",
-      "name": "pouch"
-    },
-    {
-      "code": "1f357",
-      "name": "poultry_leg"
-    },
-    {
-      "code": "1f4b7",
-      "name": "pound"
-    },
-    {
-      "code": "1f63e",
-      "name": "pouting_cat"
-    },
-    {
-      "code": "1f64f",
-      "name": "pray"
-    },
-    {
-      "code": "1f4ff",
-      "name": "prayer_beads"
-    },
-    {
-      "code": "1f478",
-      "name": "princess"
-    },
-    {
-      "code": "1f5a8",
-      "name": "printer"
-    },
-    {
-      "code": "1f4fd",
-      "name": "projector"
-    },
-    {
-      "code": "1f44a",
-      "name": "punch"
-    },
-    {
-      "code": "1f49c",
-      "name": "purple_heart"
-    },
-    {
-      "code": "1f45b",
-      "name": "purse"
-    },
-    {
-      "code": "1f4cc",
-      "name": "pushpin"
-    },
-    {
-      "code": "1f6ae",
-      "name": "put_litter_in_its_place"
-    },
-    {
-      "code": "2753",
-      "name": "question"
-    },
-    {
-      "code": "1f430",
-      "name": "rabbit"
-    },
-    {
-      "code": "1f407",
-      "name": "rabbit2"
-    },
-    {
-      "code": "1f3ce",
-      "name": "race_car"
-    },
-    {
-      "code": "1f40e",
-      "name": "racehorse"
-    },
-    {
-      "code": "1f4fb",
-      "name": "radio"
-    },
-    {
-      "code": "1f518",
-      "name": "radio_button"
-    },
-    {
-      "code": "2622",
-      "name": "radioactive"
-    },
-    {
-      "code": "1f621",
-      "name": "rage"
-    },
-    {
-      "code": "1f683",
-      "name": "railway_car"
-    },
-    {
-      "code": "1f6e4",
-      "name": "railway_track"
-    },
-    {
-      "code": "1f308",
-      "name": "rainbow"
-    },
-    {
-      "code": "270b",
-      "name": "raised_hand"
-    },
-    {
-      "code": "1f64c",
-      "name": "raised_hands"
-    },
-    {
-      "code": "1f64b",
-      "name": "raising_hand"
-    },
-    {
-      "code": "1f40f",
-      "name": "ram"
-    },
-    {
-      "code": "1f35c",
-      "name": "ramen"
-    },
-    {
-      "code": "1f400",
-      "name": "rat"
-    },
-    {
-      "code": "23fa",
-      "name": "record_button"
-    },
-    {
-      "code": "267b",
-      "name": "recycle"
-    },
-    {
-      "code": "1f697",
-      "name": "red_car"
-    },
-    {
-      "code": "1f534",
-      "name": "red_circle"
-    },
-    {
-      "code": "00ae",
-      "name": "registered"
-    },
-    {
-      "code": "263a",
-      "name": "relaxed"
-    },
-    {
-      "code": "1f60c",
-      "name": "relieved"
-    },
-    {
-      "code": "1f397",
-      "name": "reminder_ribbon"
-    },
-    {
-      "code": "1f501",
-      "name": "repeat"
-    },
-    {
-      "code": "1f502",
-      "name": "repeat_one"
-    },
-    {
-      "code": "1f6bb",
-      "name": "restroom"
-    },
-    {
-      "code": "1f49e",
-      "name": "revolving_hearts"
-    },
-    {
-      "code": "23ea",
-      "name": "rewind"
-    },
-    {
-      "code": "1f380",
-      "name": "ribbon"
-    },
-    {
-      "code": "1f35a",
-      "name": "rice"
-    },
-    {
-      "code": "1f359",
-      "name": "rice_ball"
-    },
-    {
-      "code": "1f358",
-      "name": "rice_cracker"
-    },
-    {
-      "code": "1f391",
-      "name": "rice_scene"
-    },
-    {
-      "code": "1f48d",
-      "name": "ring"
-    },
-    {
-      "code": "1f916",
-      "name": "robot"
-    },
-    {
-      "code": "1f680",
-      "name": "rocket"
-    },
-    {
-      "code": "1f3a2",
-      "name": "roller_coaster"
-    },
-    {
-      "code": "1f644",
-      "name": "rolling_eyes"
-    },
-    {
-      "code": "1f413",
-      "name": "rooster"
-    },
-    {
-      "code": "1f339",
-      "name": "rose"
-    },
-    {
-      "code": "1f3f5",
-      "name": "rosette"
-    },
-    {
-      "code": "1f6a8",
-      "name": "rotating_light"
-    },
-    {
-      "code": "1f4cd",
-      "name": "round_pushpin"
-    },
-    {
-      "code": "1f6a3",
-      "name": "rowboat"
-    },
-    {
-      "code": "1f3c9",
-      "name": "rugby_football"
-    },
-    {
-      "code": "1f3c3",
-      "name": "runner"
-    },
-    {
-      "code": "1f3bd",
-      "name": "running_shirt_with_sash"
-    },
-    {
-      "code": "1f202",
-      "name": "sa"
-    },
-    {
-      "code": "2650",
-      "name": "sagittarius"
-    },
-    {
-      "code": "26f5",
-      "name": "sailboat"
-    },
-    {
-      "code": "1f376",
-      "name": "sake"
-    },
-    {
-      "code": "1f461",
-      "name": "sandal"
-    },
-    {
-      "code": "1f385",
-      "name": "santa"
-    },
-    {
-      "code": "1f4e1",
-      "name": "satellite"
-    },
-    {
-      "code": "1f6f0",
-      "name": "satellite_orbital"
-    },
-    {
-      "code": "1f3b7",
-      "name": "saxophone"
-    },
-    {
-      "code": "2696",
-      "name": "scales"
-    },
-    {
-      "code": "1f3eb",
-      "name": "school"
-    },
-    {
-      "code": "1f392",
-      "name": "school_satchel"
-    },
-    {
-      "code": "2702",
-      "name": "scissors"
-    },
-    {
-      "code": "1f982",
-      "name": "scorpion"
-    },
-    {
-      "code": "264f",
-      "name": "scorpius"
-    },
-    {
-      "code": "1f631",
-      "name": "scream"
-    },
-    {
-      "code": "1f640",
-      "name": "scream_cat"
-    },
-    {
-      "code": "1f4dc",
-      "name": "scroll"
-    },
-    {
-      "code": "1f4ba",
-      "name": "seat"
-    },
-    {
-      "code": "3299",
-      "name": "secret"
-    },
-    {
-      "code": "1f648",
-      "name": "see_no_evil"
-    },
-    {
-      "code": "1f331",
-      "name": "seedling"
-    },
-    {
-      "code": "0037-20e3",
-      "name": "seven"
-    },
-    {
-      "code": "2618",
-      "name": "shamrock"
-    },
-    {
-      "code": "1f367",
-      "name": "shaved_ice"
-    },
-    {
-      "code": "1f411",
-      "name": "sheep"
-    },
-    {
-      "code": "1f41a",
-      "name": "shell"
-    },
-    {
-      "code": "1f6e1",
-      "name": "shield"
-    },
-    {
-      "code": "26e9",
-      "name": "shinto_shrine"
-    },
-    {
-      "code": "1f6a2",
-      "name": "ship"
-    },
-    {
-      "code": "1f455",
-      "name": "shirt"
-    },
-    {
-      "code": "1f6cd",
-      "name": "shopping_bags"
-    },
-    {
-      "code": "1f6bf",
-      "name": "shower"
-    },
-    {
-      "code": "1f4f6",
-      "name": "signal_strength"
-    },
-    {
-      "code": "0036-20e3",
-      "name": "six"
-    },
-    {
-      "code": "1f52f",
-      "name": "six_pointed_star"
-    },
-    {
-      "code": "1f3bf",
-      "name": "ski"
-    },
-    {
-      "code": "26f7",
-      "name": "skier"
-    },
-    {
-      "code": "1f480",
-      "name": "skull"
-    },
-    {
-      "code": "2620",
-      "name": "skull_crossbones"
-    },
-    {
-      "code": "1f634",
-      "name": "sleeping"
-    },
-    {
-      "code": "1f6cc",
-      "name": "sleeping_accommodation"
-    },
-    {
-      "code": "1f62a",
-      "name": "sleepy"
-    },
-    {
-      "code": "1f641",
-      "name": "slight_frown"
-    },
-    {
-      "code": "1f642",
-      "name": "slight_smile"
-    },
-    {
-      "code": "1f3b0",
-      "name": "slot_machine"
-    },
-    {
-      "code": "1f539",
-      "name": "small_blue_diamond"
-    },
-    {
-      "code": "1f538",
-      "name": "small_orange_diamond"
-    },
-    {
-      "code": "1f53a",
-      "name": "small_red_triangle"
-    },
-    {
-      "code": "1f53b",
-      "name": "small_red_triangle_down"
-    },
-    {
-      "code": "1f604",
-      "name": "smile"
-    },
-    {
-      "code": "1f638",
-      "name": "smile_cat"
-    },
-    {
-      "code": "1f603",
-      "name": "smiley"
-    },
-    {
-      "code": "1f63a",
-      "name": "smiley_cat"
-    },
-    {
-      "code": "1f608",
-      "name": "smiling_imp"
-    },
-    {
-      "code": "1f60f",
-      "name": "smirk"
-    },
-    {
-      "code": "1f63c",
-      "name": "smirk_cat"
-    },
-    {
-      "code": "1f6ac",
-      "name": "smoking"
-    },
-    {
-      "code": "1f40c",
-      "name": "snail"
-    },
-    {
-      "code": "1f40d",
-      "name": "snake"
-    },
-    {
-      "code": "1f3c2",
-      "name": "snowboarder"
-    },
-    {
-      "code": "2744",
-      "name": "snowflake"
-    },
-    {
-      "code": "26c4",
-      "name": "snowman"
-    },
-    {
-      "code": "2603",
-      "name": "snowman2"
-    },
-    {
-      "code": "1f62d",
-      "name": "sob"
-    },
-    {
-      "code": "26bd",
-      "name": "soccer"
-    },
-    {
-      "code": "1f51c",
-      "name": "soon"
-    },
-    {
-      "code": "1f198",
-      "name": "sos"
-    },
-    {
-      "code": "1f509",
-      "name": "sound"
-    },
-    {
-      "code": "1f47e",
-      "name": "space_invader"
-    },
-    {
-      "code": "2660",
-      "name": "spades"
-    },
-    {
-      "code": "1f35d",
-      "name": "spaghetti"
-    },
-    {
-      "code": "2747",
-      "name": "sparkle"
-    },
-    {
-      "code": "1f387",
-      "name": "sparkler"
-    },
-    {
-      "code": "2728",
-      "name": "sparkles"
-    },
-    {
-      "code": "1f496",
-      "name": "sparkling_heart"
-    },
-    {
-      "code": "1f64a",
-      "name": "speak_no_evil"
-    },
-    {
-      "code": "1f508",
-      "name": "speaker"
-    },
-    {
-      "code": "1f5e3",
-      "name": "speaking_head"
-    },
-    {
-      "code": "1f4ac",
-      "name": "speech_balloon"
-    },
-    {
-      "code": "1f6a4",
-      "name": "speedboat"
-    },
-    {
-      "code": "1f577",
-      "name": "spider"
-    },
-    {
-      "code": "1f578",
-      "name": "spider_web"
-    },
-    {
-      "code": "1f575",
-      "name": "spy"
-    },
-    {
-      "code": "1f3df",
-      "name": "stadium"
-    },
-    {
-      "code": "2b50",
-      "name": "star"
-    },
-    {
-      "code": "1f31f",
-      "name": "star2"
-    },
-    {
-      "code": "262a",
-      "name": "star_and_crescent"
-    },
-    {
-      "code": "2721",
-      "name": "star_of_david"
-    },
-    {
-      "code": "1f320",
-      "name": "stars"
-    },
-    {
-      "code": "1f689",
-      "name": "station"
-    },
-    {
-      "code": "1f5fd",
-      "name": "statue_of_liberty"
-    },
-    {
-      "code": "1f682",
-      "name": "steam_locomotive"
-    },
-    {
-      "code": "1f372",
-      "name": "stew"
-    },
-    {
-      "code": "23f9",
-      "name": "stop_button"
-    },
-    {
-      "code": "23f1",
-      "name": "stopwatch"
-    },
-    {
-      "code": "1f4cf",
-      "name": "straight_ruler"
-    },
-    {
-      "code": "1f353",
-      "name": "strawberry"
-    },
-    {
-      "code": "1f61b",
-      "name": "stuck_out_tongue"
-    },
-    {
-      "code": "1f61d",
-      "name": "stuck_out_tongue_closed_eyes"
-    },
-    {
-      "code": "1f61c",
-      "name": "stuck_out_tongue_winking_eye"
-    },
-    {
-      "code": "1f31e",
-      "name": "sun_with_face"
-    },
-    {
-      "code": "1f33b",
-      "name": "sunflower"
-    },
-    {
-      "code": "1f60e",
-      "name": "sunglasses"
-    },
-    {
-      "code": "2600",
-      "name": "sunny"
-    },
-    {
-      "code": "1f305",
-      "name": "sunrise"
-    },
-    {
-      "code": "1f304",
-      "name": "sunrise_over_mountains"
-    },
-    {
-      "code": "1f3c4",
-      "name": "surfer"
-    },
-    {
-      "code": "1f363",
-      "name": "sushi"
-    },
-    {
-      "code": "1f69f",
-      "name": "suspension_railway"
-    },
-    {
-      "code": "1f613",
-      "name": "sweat"
-    },
-    {
-      "code": "1f4a6",
-      "name": "sweat_drops"
-    },
-    {
-      "code": "1f605",
-      "name": "sweat_smile"
-    },
-    {
-      "code": "1f360",
-      "name": "sweet_potato"
-    },
-    {
-      "code": "1f3ca",
-      "name": "swimmer"
-    },
-    {
-      "code": "1f523",
-      "name": "symbols"
-    },
-    {
-      "code": "1f54d",
-      "name": "synagogue"
-    },
-    {
-      "code": "1f489",
-      "name": "syringe"
-    },
-    {
-      "code": "1f32e",
-      "name": "taco"
-    },
-    {
-      "code": "1f389",
-      "name": "tada"
-    },
-    {
-      "code": "1f38b",
-      "name": "tanabata_tree"
-    },
-    {
-      "code": "1f34a",
-      "name": "tangerine"
-    },
-    {
-      "code": "2649",
-      "name": "taurus"
-    },
-    {
-      "code": "1f695",
-      "name": "taxi"
-    },
-    {
-      "code": "1f375",
-      "name": "tea"
-    },
-    {
-      "code": "260e",
-      "name": "telephone"
-    },
-    {
-      "code": "1f4de",
-      "name": "telephone_receiver"
-    },
-    {
-      "code": "1f52d",
-      "name": "telescope"
-    },
-    {
-      "code": "1f51f",
-      "name": "ten"
-    },
-    {
-      "code": "1f3be",
-      "name": "tennis"
-    },
-    {
-      "code": "26fa",
-      "name": "tent"
-    },
-    {
-      "code": "1f321",
-      "name": "thermometer"
-    },
-    {
-      "code": "1f912",
-      "name": "thermometer_face"
-    },
-    {
-      "code": "1f914",
-      "name": "thinking"
-    },
-    {
-      "code": "1f4ad",
-      "name": "thought_balloon"
-    },
-    {
-      "code": "0033-20e3",
-      "name": "three"
-    },
-    {
-      "code": "1f44e",
-      "name": "thumbsdown"
-    },
-    {
-      "code": "1f44d",
-      "name": "thumbsup"
-    },
-    {
-      "code": "26c8",
-      "name": "thunder_cloud_rain"
-    },
-    {
-      "code": "1f3ab",
-      "name": "ticket"
-    },
-    {
-      "code": "1f39f",
-      "name": "tickets"
-    },
-    {
-      "code": "1f42f",
-      "name": "tiger"
-    },
-    {
-      "code": "1f405",
-      "name": "tiger2"
-    },
-    {
-      "code": "23f2",
-      "name": "timer"
-    },
-    {
-      "code": "1f62b",
-      "name": "tired_face"
-    },
-    {
-      "code": "2122",
-      "name": "tm"
-    },
-    {
-      "code": "1f6bd",
-      "name": "toilet"
-    },
-    {
-      "code": "1f5fc",
-      "name": "tokyo_tower"
-    },
-    {
-      "code": "1f345",
-      "name": "tomato"
+      "code": "1f444",
+      "name": "lips"
     },
     {
       "code": "1f445",
       "name": "tongue"
     },
     {
-      "code": "1f6e0",
-      "name": "tools"
+      "code": "1f442",
+      "name": "ear"
     },
     {
-      "code": "1f51d",
-      "name": "top"
+      "code": "1f443",
+      "name": "nose"
     },
     {
-      "code": "1f3a9",
-      "name": "tophat"
+      "code": "1f441",
+      "name": "eye"
     },
     {
-      "code": "23ed",
-      "name": "track_next"
+      "code": "1f440",
+      "name": "eyes"
     },
     {
-      "code": "23ee",
-      "name": "track_previous"
+      "code": "1f464",
+      "name": "bust_in_silhouette"
     },
     {
-      "code": "1f5b2",
-      "name": "trackball"
+      "code": "1f465",
+      "name": "busts_in_silhouette"
     },
     {
-      "code": "1f69c",
-      "name": "tractor"
+      "code": "1f5e3",
+      "name": "speaking_head"
     },
     {
-      "code": "1f6a5",
-      "name": "traffic_light"
+      "code": "1f476",
+      "name": "baby"
     },
     {
-      "code": "1f68b",
-      "name": "train"
+      "code": "1f466",
+      "name": "boy"
     },
     {
-      "code": "1f686",
-      "name": "train2"
+      "code": "1f467",
+      "name": "girl"
     },
     {
-      "code": "1f68a",
-      "name": "tram"
+      "code": "1f468",
+      "name": "man"
     },
     {
-      "code": "1f6a9",
-      "name": "triangular_flag_on_post"
+      "code": "1f469",
+      "name": "woman"
     },
     {
-      "code": "1f4d0",
-      "name": "triangular_ruler"
+      "code": "1f471-200d-2640-fe0f",
+      "name": "blonde_woman"
     },
     {
-      "code": "1f531",
-      "name": "trident"
+      "code": "1f471",
+      "name": "blonde_man"
     },
     {
-      "code": "1f624",
-      "name": "triumph"
+      "code": "1f474",
+      "name": "older_man"
     },
     {
-      "code": "1f68e",
-      "name": "trolleybus"
+      "code": "1f475",
+      "name": "older_woman"
     },
     {
-      "code": "1f3c6",
-      "name": "trophy"
+      "code": "1f472",
+      "name": "man_with_gua_pi_mao"
     },
     {
-      "code": "1f379",
-      "name": "tropical_drink"
+      "code": "1f473-200d-2640-fe0f",
+      "name": "woman_with_turban"
     },
     {
-      "code": "1f420",
-      "name": "tropical_fish"
+      "code": "1f473",
+      "name": "man_with_turban"
     },
     {
-      "code": "1f69a",
-      "name": "truck"
+      "code": "1f46e-200d-2640-fe0f",
+      "name": "policewoman"
     },
     {
-      "code": "1f3ba",
-      "name": "trumpet"
+      "code": "1f46e",
+      "name": "policeman"
     },
     {
-      "code": "1f337",
-      "name": "tulip"
+      "code": "1f477-200d-2640-fe0f",
+      "name": "construction_worker_woman"
     },
     {
-      "code": "1f983",
-      "name": "turkey"
+      "code": "1f477",
+      "name": "construction_worker_man"
     },
     {
-      "code": "1f422",
-      "name": "turtle"
+      "code": "1f482-200d-2640-fe0f",
+      "name": "guardswoman"
     },
     {
-      "code": "1f4fa",
-      "name": "tv"
+      "code": "1f482",
+      "name": "guardsman"
     },
     {
-      "code": "1f500",
-      "name": "twisted_rightwards_arrows"
+      "code": "1f575-fe0f-200d-2640",
+      "name": "female_detective"
     },
     {
-      "code": "0032-20e3",
-      "name": "two"
+      "code": "1f575",
+      "name": "male_detective"
     },
     {
-      "code": "1f495",
-      "name": "two_hearts"
+      "code": "1f469-200d-2695-fe0f",
+      "name": "woman_health_worker"
+    },
+    {
+      "code": "1f468-200d-2695-fe0f",
+      "name": "man_health_worker"
+    },
+    {
+      "code": "1f469-200d-1f33e",
+      "name": "woman_farmer"
+    },
+    {
+      "code": "1f468-200d-1f33e",
+      "name": "man_farmer"
+    },
+    {
+      "code": "1f469-200d-1f373",
+      "name": "woman_cook"
+    },
+    {
+      "code": "1f468-200d-1f373",
+      "name": "man_cook"
+    },
+    {
+      "code": "1f469-200d-1f393",
+      "name": "woman_student"
+    },
+    {
+      "code": "1f468-200d-1f393",
+      "name": "man_student"
+    },
+    {
+      "code": "1f469-200d-1f3a4",
+      "name": "woman_singer"
+    },
+    {
+      "code": "1f468-200d-1f3a4",
+      "name": "man_singer"
+    },
+    {
+      "code": "1f469-200d-1f3eb",
+      "name": "woman_teacher"
+    },
+    {
+      "code": "1f468-200d-1f3eb",
+      "name": "man_teacher"
+    },
+    {
+      "code": "1f469-200d-1f3ed",
+      "name": "woman_factory_worker"
+    },
+    {
+      "code": "1f468-200d-1f3ed",
+      "name": "man_factory_worker"
+    },
+    {
+      "code": "1f469-200d-1f4bb",
+      "name": "woman_technologist"
+    },
+    {
+      "code": "1f468-200d-1f4bb",
+      "name": "man_technologist"
+    },
+    {
+      "code": "1f469-200d-1f4bc",
+      "name": "woman_office_worker"
+    },
+    {
+      "code": "1f468-200d-1f4bc",
+      "name": "man_office_worker"
+    },
+    {
+      "code": "1f469-200d-1f527",
+      "name": "woman_mechanic"
+    },
+    {
+      "code": "1f468-200d-1f527",
+      "name": "man_mechanic"
+    },
+    {
+      "code": "1f469-200d-1f52c",
+      "name": "woman_scientist"
+    },
+    {
+      "code": "1f468-200d-1f52c",
+      "name": "man_scientist"
+    },
+    {
+      "code": "1f469-200d-1f3a8",
+      "name": "woman_artist"
+    },
+    {
+      "code": "1f468-200d-1f3a8",
+      "name": "man_artist"
+    },
+    {
+      "code": "1f469-200d-1f692",
+      "name": "woman_firefighter"
+    },
+    {
+      "code": "1f468-200d-1f692",
+      "name": "man_firefighter"
+    },
+    {
+      "code": "1f469-200d-2708-fe0f",
+      "name": "woman_pilot"
+    },
+    {
+      "code": "1f468-200d-2708-fe0f",
+      "name": "man_pilot"
+    },
+    {
+      "code": "1f469-200d-1f680",
+      "name": "woman_astronaut"
+    },
+    {
+      "code": "1f468-200d-1f680",
+      "name": "man_astronaut"
+    },
+    {
+      "code": "1f469-200d-2696-fe0f",
+      "name": "woman_judge"
+    },
+    {
+      "code": "1f468-200d-2696-fe0f",
+      "name": "man_judge"
+    },
+    {
+      "code": "1f936",
+      "name": "mrs_claus"
+    },
+    {
+      "code": "1f385",
+      "name": "santa"
+    },
+    {
+      "code": "1f47c",
+      "name": "angel"
+    },
+    {
+      "code": "1f930",
+      "name": "pregnant_woman"
+    },
+    {
+      "code": "1f478",
+      "name": "princess"
+    },
+    {
+      "code": "1f934",
+      "name": "prince"
+    },
+    {
+      "code": "1f470",
+      "name": "bride_with_veil"
+    },
+    {
+      "code": "1f935",
+      "name": "man_in_tuxedo"
+    },
+    {
+      "code": "1f3c3-200d-2640-fe0f",
+      "name": "running_woman"
+    },
+    {
+      "code": "1f3c3",
+      "name": "running_man"
+    },
+    {
+      "code": "1f6b6-200d-2640-fe0f",
+      "name": "walking_woman"
+    },
+    {
+      "code": "1f6b6",
+      "name": "walking_man"
+    },
+    {
+      "code": "1f483",
+      "name": "dancer"
+    },
+    {
+      "code": "1f57a",
+      "name": "man_dancing"
+    },
+    {
+      "code": "1f46f",
+      "name": "dancing_women"
+    },
+    {
+      "code": "1f46f-200d-2642",
+      "name": "dancing_men"
+    },
+    {
+      "code": "1f46b",
+      "name": "couple"
     },
     {
       "code": "1f46c",
@@ -3733,352 +821,120 @@
       "name": "two_women_holding_hands"
     },
     {
-      "code": "1f239",
-      "name": "u5272"
+      "code": "1f647-200d-2640-fe0f",
+      "name": "bowing_woman"
     },
     {
-      "code": "1f234",
-      "name": "u5408"
+      "code": "1f647",
+      "name": "bowing_man"
     },
     {
-      "code": "1f23a",
-      "name": "u55b6"
+      "code": "1f926",
+      "name": "man_facepalming"
     },
     {
-      "code": "1f22f",
-      "name": "u6307"
+      "code": "1f926-200d-2640-fe0f",
+      "name": "woman_facepalming"
     },
     {
-      "code": "1f237",
-      "name": "u6708"
+      "code": "1f937-200d-2640-fe0f",
+      "name": "woman_shrugging"
     },
     {
-      "code": "1f236",
-      "name": "u6709"
+      "code": "1f937-200d-2642-fe0f",
+      "name": "man_shrugging"
     },
     {
-      "code": "1f235",
-      "name": "u6e80"
+      "code": "1f481",
+      "name": "tipping_hand_woman"
     },
     {
-      "code": "1f21a",
-      "name": "u7121"
+      "code": "1f481-200d-2642-fe0f",
+      "name": "tipping_hand_man"
     },
     {
-      "code": "1f238",
-      "name": "u7533"
+      "code": "1f645",
+      "name": "no_good_woman"
     },
     {
-      "code": "1f232",
-      "name": "u7981"
+      "code": "1f645-200d-2642-fe0f",
+      "name": "no_good_man"
     },
     {
-      "code": "1f233",
-      "name": "u7a7a"
+      "code": "1f646",
+      "name": "ok_woman"
     },
     {
-      "code": "2614",
-      "name": "umbrella"
+      "code": "1f646-200d-2642-fe0f",
+      "name": "ok_man"
     },
     {
-      "code": "2602",
-      "name": "umbrella2"
+      "code": "1f64b",
+      "name": "raising_hand_woman"
     },
     {
-      "code": "1f612",
-      "name": "unamused"
+      "code": "1f64b-200d-2642-fe0f",
+      "name": "raising_hand_man"
     },
     {
-      "code": "1f51e",
-      "name": "underage"
+      "code": "1f64e",
+      "name": "pouting_woman"
     },
     {
-      "code": "1f984",
-      "name": "unicorn"
+      "code": "1f64e-200d-2642-fe0f",
+      "name": "pouting_man"
     },
     {
-      "code": "1f513",
-      "name": "unlock"
+      "code": "1f64d",
+      "name": "frowning_woman"
     },
     {
-      "code": "1f199",
-      "name": "up"
+      "code": "1f64d-200d-2642-fe0f",
+      "name": "frowning_man"
     },
     {
-      "code": "1f643",
-      "name": "upside_down"
+      "code": "1f487",
+      "name": "haircut_woman"
     },
     {
-      "code": "26b1",
-      "name": "urn"
+      "code": "1f487-200d-2642-fe0f",
+      "name": "haircut_man"
     },
     {
-      "code": "270c",
-      "name": "v"
+      "code": "1f486",
+      "name": "massage_woman"
     },
     {
-      "code": "1f6a6",
-      "name": "vertical_traffic_light"
+      "code": "1f486-200d-2642-fe0f",
+      "name": "massage_man"
     },
     {
-      "code": "1f4fc",
-      "name": "vhs"
-    },
-    {
-      "code": "1f4f3",
-      "name": "vibration_mode"
-    },
-    {
-      "code": "1f4f9",
-      "name": "video_camera"
-    },
-    {
-      "code": "1f3ae",
-      "name": "video_game"
-    },
-    {
-      "code": "1f3bb",
-      "name": "violin"
-    },
-    {
-      "code": "264d",
-      "name": "virgo"
-    },
-    {
-      "code": "1f30b",
-      "name": "volcano"
-    },
-    {
-      "code": "1f3d0",
-      "name": "volleyball"
-    },
-    {
-      "code": "1f19a",
-      "name": "vs"
-    },
-    {
-      "code": "1f596",
-      "name": "vulcan"
-    },
-    {
-      "code": "1f6b6",
-      "name": "walking"
-    },
-    {
-      "code": "1f318",
-      "name": "waning_crescent_moon"
-    },
-    {
-      "code": "1f316",
-      "name": "waning_gibbous_moon"
-    },
-    {
-      "code": "26a0",
-      "name": "warning"
-    },
-    {
-      "code": "1f5d1",
-      "name": "wastebasket"
-    },
-    {
-      "code": "231a",
-      "name": "watch"
-    },
-    {
-      "code": "1f403",
-      "name": "water_buffalo"
-    },
-    {
-      "code": "1f349",
-      "name": "watermelon"
-    },
-    {
-      "code": "1f44b",
-      "name": "wave"
-    },
-    {
-      "code": "3030",
-      "name": "wavy_dash"
-    },
-    {
-      "code": "1f312",
-      "name": "waxing_crescent_moon"
-    },
-    {
-      "code": "1f314",
-      "name": "waxing_gibbous_moon"
-    },
-    {
-      "code": "1f6be",
-      "name": "wc"
-    },
-    {
-      "code": "1f629",
-      "name": "weary"
-    },
-    {
-      "code": "1f492",
-      "name": "wedding"
-    },
-    {
-      "code": "1f433",
-      "name": "whale"
-    },
-    {
-      "code": "1f40b",
-      "name": "whale2"
-    },
-    {
-      "code": "2638",
-      "name": "wheel_of_dharma"
-    },
-    {
-      "code": "267f",
-      "name": "wheelchair"
-    },
-    {
-      "code": "2705",
-      "name": "white_check_mark"
-    },
-    {
-      "code": "26aa",
-      "name": "white_circle"
-    },
-    {
-      "code": "1f4ae",
-      "name": "white_flower"
-    },
-    {
-      "code": "2b1c",
-      "name": "white_large_square"
-    },
-    {
-      "code": "25fd",
-      "name": "white_medium_small_square"
-    },
-    {
-      "code": "25fb",
-      "name": "white_medium_square"
-    },
-    {
-      "code": "25ab",
-      "name": "white_small_square"
-    },
-    {
-      "code": "1f533",
-      "name": "white_square_button"
-    },
-    {
-      "code": "1f325",
-      "name": "white_sun_cloud"
-    },
-    {
-      "code": "1f326",
-      "name": "white_sun_rain_cloud"
-    },
-    {
-      "code": "1f324",
-      "name": "white_sun_small_cloud"
-    },
-    {
-      "code": "1f32c",
-      "name": "wind_blowing_face"
-    },
-    {
-      "code": "1f390",
-      "name": "wind_chime"
-    },
-    {
-      "code": "1f377",
-      "name": "wine_glass"
-    },
-    {
-      "code": "1f609",
-      "name": "wink"
-    },
-    {
-      "code": "1f43a",
-      "name": "wolf"
-    },
-    {
-      "code": "1f469",
-      "name": "woman"
-    },
-    {
-      "code": "1f45a",
-      "name": "womans_clothes"
-    },
-    {
-      "code": "1f452",
-      "name": "womans_hat"
-    },
-    {
-      "code": "1f6ba",
-      "name": "womens"
-    },
-    {
-      "code": "1f61f",
-      "name": "worried"
-    },
-    {
-      "code": "1f527",
-      "name": "wrench"
-    },
-    {
-      "code": "270d",
-      "name": "writing_hand"
-    },
-    {
-      "code": "274c",
-      "name": "x"
-    },
-    {
-      "code": "1f49b",
-      "name": "yellow_heart"
-    },
-    {
-      "code": "1f4b4",
-      "name": "yen"
-    },
-    {
-      "code": "262f",
-      "name": "yin_yang"
-    },
-    {
-      "code": "1f60b",
-      "name": "yum"
-    },
-    {
-      "code": "26a1",
-      "name": "zap"
-    },
-    {
-      "code": "0030-20e3",
-      "name": "zero"
-    },
-    {
-      "code": "1f910",
-      "name": "zipper_mouth"
-    },
-    {
-      "code": "1f4a4",
-      "name": "zzz"
+      "code": "1f491",
+      "name": "couple_with_heart_woman_man"
     },
     {
       "code": "1f469-200d-2764-fe0f-200d-1f469",
-      "name": "female_couple_with_heart"
+      "name": "couple_with_heart_woman_woman"
     },
     {
       "code": "1f468-200d-2764-fe0f-200d-1f468",
-      "name": "male_couple_with_heart"
+      "name": "couple_with_heart_man_man"
+    },
+    {
+      "code": "1f48f",
+      "name": "couplekiss_man_woman"
     },
     {
       "code": "1f469-200d-2764-fe0f-200d-1f48b-200d-1f469",
-      "name": "female_couplekiss"
+      "name": "couplekiss_woman_woman"
     },
     {
       "code": "1f468-200d-2764-fe0f-200d-1f48b-200d-1f468",
-      "name": "male_couplekiss"
+      "name": "couplekiss_man_man"
+    },
+    {
+      "code": "1f46a",
+      "name": "family_man_woman_boy"
     },
     {
       "code": "1f468-200d-1f469-200d-1f467",
@@ -4090,125 +946,5225 @@
     },
     {
       "code": "1f468-200d-1f469-200d-1f466-200d-1f466",
-      "name": "family_man_woman_boys"
+      "name": "family_man_woman_boy_boy"
     },
     {
       "code": "1f468-200d-1f469-200d-1f467-200d-1f467",
-      "name": "family_man_woman_girls"
+      "name": "family_man_woman_girl_girl"
     },
     {
       "code": "1f469-200d-1f469-200d-1f466",
-      "name": "family_women_boy"
+      "name": "family_woman_woman_boy"
     },
     {
       "code": "1f469-200d-1f469-200d-1f467",
-      "name": "family_women_girl"
+      "name": "family_woman_woman_girl"
     },
     {
       "code": "1f469-200d-1f469-200d-1f467-200d-1f466",
-      "name": "family_women_girl_boy"
+      "name": "family_woman_woman_girl_boy"
     },
     {
       "code": "1f469-200d-1f469-200d-1f466-200d-1f466",
-      "name": "family_women_boys"
+      "name": "family_woman_woman_boy_boy"
     },
     {
       "code": "1f469-200d-1f469-200d-1f467-200d-1f467",
-      "name": "family_women_girls"
+      "name": "family_woman_woman_girl_girl"
     },
     {
       "code": "1f468-200d-1f468-200d-1f466",
-      "name": "family_men_boy"
+      "name": "family_man_man_boy"
     },
     {
       "code": "1f468-200d-1f468-200d-1f467",
-      "name": "family_men_girl"
+      "name": "family_man_man_girl"
     },
     {
       "code": "1f468-200d-1f468-200d-1f467-200d-1f466",
-      "name": "family_men_girl_boy"
+      "name": "family_man_man_girl_boy"
     },
     {
       "code": "1f468-200d-1f468-200d-1f466-200d-1f466",
-      "name": "family_men_boys"
+      "name": "family_man_man_boy_boy"
     },
     {
       "code": "1f468-200d-1f468-200d-1f467-200d-1f467",
-      "name": "family_men_girls"
+      "name": "family_man_man_girl_girl"
     },
     {
-      "code": "002a-20e3",
-      "name": "keycap_star"
+      "code": "1f469-200d-1f466",
+      "name": "family_woman_boy"
+    },
+    {
+      "code": "1f469-200d-1f467",
+      "name": "family_woman_girl"
+    },
+    {
+      "code": "1f469-200d-1f467-200d-1f466",
+      "name": "family_woman_girl_boy"
+    },
+    {
+      "code": "1f469-200d-1f466-200d-1f466",
+      "name": "family_woman_boy_boy"
+    },
+    {
+      "code": "1f469-200d-1f467-200d-1f467",
+      "name": "family_woman_girl_girl"
+    },
+    {
+      "code": "1f468-200d-1f466",
+      "name": "family_man_boy"
+    },
+    {
+      "code": "1f468-200d-1f467",
+      "name": "family_man_girl"
+    },
+    {
+      "code": "1f468-200d-1f467-200d-1f466",
+      "name": "family_man_girl_boy"
+    },
+    {
+      "code": "1f468-200d-1f466-200d-1f466",
+      "name": "family_man_boy_boy"
+    },
+    {
+      "code": "1f468-200d-1f467-200d-1f467",
+      "name": "family_man_girl_girl"
+    },
+    {
+      "code": "1f45a",
+      "name": "womans_clothes"
+    },
+    {
+      "code": "1f455",
+      "name": "tshirt"
+    },
+    {
+      "code": "1f456",
+      "name": "jeans"
+    },
+    {
+      "code": "1f454",
+      "name": "necktie"
+    },
+    {
+      "code": "1f457",
+      "name": "dress"
+    },
+    {
+      "code": "1f459",
+      "name": "bikini"
+    },
+    {
+      "code": "1f458",
+      "name": "kimono"
+    },
+    {
+      "code": "1f484",
+      "name": "lipstick"
+    },
+    {
+      "code": "1f48b",
+      "name": "kiss"
+    },
+    {
+      "code": "1f463",
+      "name": "footprints"
+    },
+    {
+      "code": "1f460",
+      "name": "high_heel"
+    },
+    {
+      "code": "1f461",
+      "name": "sandal"
+    },
+    {
+      "code": "1f462",
+      "name": "boot"
+    },
+    {
+      "code": "1f45e",
+      "name": "mans_shoe"
+    },
+    {
+      "code": "1f45f",
+      "name": "athletic_shoe"
+    },
+    {
+      "code": "1f452",
+      "name": "womans_hat"
+    },
+    {
+      "code": "1f3a9",
+      "name": "tophat"
+    },
+    {
+      "code": "26d1",
+      "name": "rescue_worker_helmet"
+    },
+    {
+      "code": "1f393",
+      "name": "mortar_board"
+    },
+    {
+      "code": "1f451",
+      "name": "crown"
+    },
+    {
+      "code": "1f392",
+      "name": "school_satchel"
+    },
+    {
+      "code": "1f45d",
+      "name": "pouch"
+    },
+    {
+      "code": "1f45b",
+      "name": "purse"
+    },
+    {
+      "code": "1f45c",
+      "name": "handbag"
+    },
+    {
+      "code": "1f4bc",
+      "name": "briefcase"
+    },
+    {
+      "code": "1f453",
+      "name": "eyeglasses"
+    },
+    {
+      "code": "1f576",
+      "name": "dark_sunglasses"
+    },
+    {
+      "code": "1f48d",
+      "name": "ring"
+    },
+    {
+      "code": "1f302",
+      "name": "closed_umbrella"
+    },
+    {
+      "code": "1f436",
+      "name": "dog"
+    },
+    {
+      "code": "1f431",
+      "name": "cat"
+    },
+    {
+      "code": "1f42d",
+      "name": "mouse"
+    },
+    {
+      "code": "1f439",
+      "name": "hamster"
+    },
+    {
+      "code": "1f430",
+      "name": "rabbit"
+    },
+    {
+      "code": "1f98a",
+      "name": "fox_face"
+    },
+    {
+      "code": "1f43b",
+      "name": "bear"
+    },
+    {
+      "code": "1f43c",
+      "name": "panda_face"
+    },
+    {
+      "code": "1f428",
+      "name": "koala"
+    },
+    {
+      "code": "1f42f",
+      "name": "tiger"
+    },
+    {
+      "code": "1f981",
+      "name": "lion"
+    },
+    {
+      "code": "1f42e",
+      "name": "cow"
+    },
+    {
+      "code": "1f437",
+      "name": "pig"
+    },
+    {
+      "code": "1f43d",
+      "name": "pig_nose"
+    },
+    {
+      "code": "1f438",
+      "name": "frog"
+    },
+    {
+      "code": "1f991",
+      "name": "squid"
+    },
+    {
+      "code": "1f419",
+      "name": "octopus"
+    },
+    {
+      "code": "1f990",
+      "name": "shrimp"
+    },
+    {
+      "code": "1f435",
+      "name": "monkey_face"
+    },
+    {
+      "code": "1f98d",
+      "name": "gorilla"
+    },
+    {
+      "code": "1f648",
+      "name": "see_no_evil"
+    },
+    {
+      "code": "1f649",
+      "name": "hear_no_evil"
+    },
+    {
+      "code": "1f64a",
+      "name": "speak_no_evil"
+    },
+    {
+      "code": "1f412",
+      "name": "monkey"
+    },
+    {
+      "code": "1f414",
+      "name": "chicken"
+    },
+    {
+      "code": "1f427",
+      "name": "penguin"
+    },
+    {
+      "code": "1f426",
+      "name": "bird"
+    },
+    {
+      "code": "1f424",
+      "name": "baby_chick"
+    },
+    {
+      "code": "1f423",
+      "name": "hatching_chick"
+    },
+    {
+      "code": "1f425",
+      "name": "hatched_chick"
+    },
+    {
+      "code": "1f986",
+      "name": "duck"
+    },
+    {
+      "code": "1f985",
+      "name": "eagle"
+    },
+    {
+      "code": "1f989",
+      "name": "owl"
+    },
+    {
+      "code": "1f987",
+      "name": "bat"
+    },
+    {
+      "code": "1f43a",
+      "name": "wolf"
+    },
+    {
+      "code": "1f417",
+      "name": "boar"
+    },
+    {
+      "code": "1f434",
+      "name": "horse"
+    },
+    {
+      "code": "1f984",
+      "name": "unicorn"
+    },
+    {
+      "code": "1f41d",
+      "name": "honeybee"
+    },
+    {
+      "code": "1f41b",
+      "name": "bug"
+    },
+    {
+      "code": "1f98b",
+      "name": "butterfly"
+    },
+    {
+      "code": "1f40c",
+      "name": "snail"
+    },
+    {
+      "code": "1f41e",
+      "name": "beetle"
+    },
+    {
+      "code": "1f41c",
+      "name": "ant"
+    },
+    {
+      "code": "1f577",
+      "name": "spider"
+    },
+    {
+      "code": "1f982",
+      "name": "scorpion"
+    },
+    {
+      "code": "1f980",
+      "name": "crab"
+    },
+    {
+      "code": "1f40d",
+      "name": "snake"
+    },
+    {
+      "code": "1f98e",
+      "name": "lizard"
+    },
+    {
+      "code": "1f422",
+      "name": "turtle"
+    },
+    {
+      "code": "1f420",
+      "name": "tropical_fish"
+    },
+    {
+      "code": "1f41f",
+      "name": "fish"
+    },
+    {
+      "code": "1f421",
+      "name": "blowfish"
+    },
+    {
+      "code": "1f42c",
+      "name": "dolphin"
+    },
+    {
+      "code": "1f988",
+      "name": "shark"
+    },
+    {
+      "code": "1f433",
+      "name": "whale"
+    },
+    {
+      "code": "1f40b",
+      "name": "whale2"
+    },
+    {
+      "code": "1f40a",
+      "name": "crocodile"
+    },
+    {
+      "code": "1f406",
+      "name": "leopard"
+    },
+    {
+      "code": "1f405",
+      "name": "tiger2"
+    },
+    {
+      "code": "1f403",
+      "name": "water_buffalo"
+    },
+    {
+      "code": "1f402",
+      "name": "ox"
+    },
+    {
+      "code": "1f404",
+      "name": "cow2"
+    },
+    {
+      "code": "1f98c",
+      "name": "deer"
+    },
+    {
+      "code": "1f42a",
+      "name": "dromedary_camel"
+    },
+    {
+      "code": "1f42b",
+      "name": "camel"
+    },
+    {
+      "code": "1f418",
+      "name": "elephant"
+    },
+    {
+      "code": "1f98f",
+      "name": "rhinoceros"
+    },
+    {
+      "code": "1f410",
+      "name": "goat"
+    },
+    {
+      "code": "1f40f",
+      "name": "ram"
+    },
+    {
+      "code": "1f411",
+      "name": "sheep"
+    },
+    {
+      "code": "1f40e",
+      "name": "racehorse"
+    },
+    {
+      "code": "1f416",
+      "name": "pig2"
+    },
+    {
+      "code": "1f400",
+      "name": "rat"
+    },
+    {
+      "code": "1f401",
+      "name": "mouse2"
+    },
+    {
+      "code": "1f413",
+      "name": "rooster"
+    },
+    {
+      "code": "1f983",
+      "name": "turkey"
+    },
+    {
+      "code": "1f54a",
+      "name": "dove"
+    },
+    {
+      "code": "1f415",
+      "name": "dog2"
+    },
+    {
+      "code": "1f429",
+      "name": "poodle"
+    },
+    {
+      "code": "1f408",
+      "name": "cat2"
+    },
+    {
+      "code": "1f407",
+      "name": "rabbit2"
+    },
+    {
+      "code": "1f43f",
+      "name": "chipmunk"
+    },
+    {
+      "code": "1f43e",
+      "name": "paw_prints"
+    },
+    {
+      "code": "1f409",
+      "name": "dragon"
+    },
+    {
+      "code": "1f432",
+      "name": "dragon_face"
+    },
+    {
+      "code": "1f335",
+      "name": "cactus"
+    },
+    {
+      "code": "1f384",
+      "name": "christmas_tree"
+    },
+    {
+      "code": "1f332",
+      "name": "evergreen_tree"
+    },
+    {
+      "code": "1f333",
+      "name": "deciduous_tree"
+    },
+    {
+      "code": "1f334",
+      "name": "palm_tree"
+    },
+    {
+      "code": "1f331",
+      "name": "seedling"
+    },
+    {
+      "code": "1f33f",
+      "name": "herb"
+    },
+    {
+      "code": "2618",
+      "name": "shamrock"
+    },
+    {
+      "code": "1f340",
+      "name": "four_leaf_clover"
+    },
+    {
+      "code": "1f38d",
+      "name": "bamboo"
+    },
+    {
+      "code": "1f38b",
+      "name": "tanabata_tree"
+    },
+    {
+      "code": "1f343",
+      "name": "leaves"
+    },
+    {
+      "code": "1f342",
+      "name": "fallen_leaf"
+    },
+    {
+      "code": "1f341",
+      "name": "maple_leaf"
+    },
+    {
+      "code": "1f33e",
+      "name": "ear_of_rice"
+    },
+    {
+      "code": "1f33a",
+      "name": "hibiscus"
+    },
+    {
+      "code": "1f33b",
+      "name": "sunflower"
+    },
+    {
+      "code": "1f339",
+      "name": "rose"
+    },
+    {
+      "code": "1f940",
+      "name": "wilted_flower"
+    },
+    {
+      "code": "1f337",
+      "name": "tulip"
+    },
+    {
+      "code": "1f33c",
+      "name": "blossom"
+    },
+    {
+      "code": "1f338",
+      "name": "cherry_blossom"
+    },
+    {
+      "code": "1f490",
+      "name": "bouquet"
+    },
+    {
+      "code": "1f344",
+      "name": "mushroom"
+    },
+    {
+      "code": "1f330",
+      "name": "chestnut"
+    },
+    {
+      "code": "1f383",
+      "name": "jack_o_lantern"
+    },
+    {
+      "code": "1f41a",
+      "name": "shell"
+    },
+    {
+      "code": "1f578",
+      "name": "spider_web"
+    },
+    {
+      "code": "1f30e",
+      "name": "earth_americas"
+    },
+    {
+      "code": "1f30d",
+      "name": "earth_africa"
+    },
+    {
+      "code": "1f30f",
+      "name": "earth_asia"
+    },
+    {
+      "code": "1f315",
+      "name": "full_moon"
+    },
+    {
+      "code": "1f316",
+      "name": "waning_gibbous_moon"
+    },
+    {
+      "code": "1f317",
+      "name": "last_quarter_moon"
+    },
+    {
+      "code": "1f318",
+      "name": "waning_crescent_moon"
+    },
+    {
+      "code": "1f311",
+      "name": "new_moon"
+    },
+    {
+      "code": "1f312",
+      "name": "waxing_crescent_moon"
+    },
+    {
+      "code": "1f313",
+      "name": "first_quarter_moon"
+    },
+    {
+      "code": "1f314",
+      "name": "waxing_gibbous_moon"
+    },
+    {
+      "code": "1f31a",
+      "name": "new_moon_with_face"
+    },
+    {
+      "code": "1f31d",
+      "name": "full_moon_with_face"
+    },
+    {
+      "code": "1f31b",
+      "name": "first_quarter_moon_with_face"
+    },
+    {
+      "code": "1f31c",
+      "name": "last_quarter_moon_with_face"
+    },
+    {
+      "code": "1f31e",
+      "name": "sun_with_face"
+    },
+    {
+      "code": "1f319",
+      "name": "crescent_moon"
+    },
+    {
+      "code": "2b50",
+      "name": "star"
+    },
+    {
+      "code": "1f31f",
+      "name": "star2"
+    },
+    {
+      "code": "1f4ab",
+      "name": "dizzy"
+    },
+    {
+      "code": "2728",
+      "name": "sparkles"
+    },
+    {
+      "code": "2604",
+      "name": "comet"
+    },
+    {
+      "code": "2600",
+      "name": "sunny"
+    },
+    {
+      "code": "1f324",
+      "name": "sun_behind_small_cloud"
+    },
+    {
+      "code": "26c5",
+      "name": "partly_sunny"
+    },
+    {
+      "code": "1f325",
+      "name": "sun_behind_large_cloud"
+    },
+    {
+      "code": "1f326",
+      "name": "sun_behind_rain_cloud"
+    },
+    {
+      "code": "2601",
+      "name": "cloud"
+    },
+    {
+      "code": "1f327",
+      "name": "cloud_with_rain"
+    },
+    {
+      "code": "26c8",
+      "name": "cloud_with_lightning_and_rain"
+    },
+    {
+      "code": "1f329",
+      "name": "cloud_with_lightning"
+    },
+    {
+      "code": "26a1",
+      "name": "zap"
+    },
+    {
+      "code": "1f525",
+      "name": "fire"
+    },
+    {
+      "code": "1f4a5",
+      "name": "boom"
+    },
+    {
+      "code": "2744",
+      "name": "snowflake"
+    },
+    {
+      "code": "1f328",
+      "name": "cloud_with_snow"
+    },
+    {
+      "code": "26c4",
+      "name": "snowman"
+    },
+    {
+      "code": "2603",
+      "name": "snowman_with_snow"
+    },
+    {
+      "code": "1f32c",
+      "name": "wind_face"
+    },
+    {
+      "code": "1f4a8",
+      "name": "dash"
+    },
+    {
+      "code": "1f32a",
+      "name": "tornado"
+    },
+    {
+      "code": "1f32b",
+      "name": "fog"
+    },
+    {
+      "code": "2602",
+      "name": "open_umbrella"
+    },
+    {
+      "code": "2614",
+      "name": "umbrella"
+    },
+    {
+      "code": "1f4a7",
+      "name": "droplet"
+    },
+    {
+      "code": "1f4a6",
+      "name": "sweat_drops"
+    },
+    {
+      "code": "1f30a",
+      "name": "ocean"
+    },
+    {
+      "code": "1f34f",
+      "name": "green_apple"
+    },
+    {
+      "code": "1f34e",
+      "name": "apple"
+    },
+    {
+      "code": "1f350",
+      "name": "pear"
+    },
+    {
+      "code": "1f34a",
+      "name": "tangerine"
+    },
+    {
+      "code": "1f34b",
+      "name": "lemon"
+    },
+    {
+      "code": "1f34c",
+      "name": "banana"
+    },
+    {
+      "code": "1f349",
+      "name": "watermelon"
+    },
+    {
+      "code": "1f347",
+      "name": "grapes"
+    },
+    {
+      "code": "1f353",
+      "name": "strawberry"
+    },
+    {
+      "code": "1f348",
+      "name": "melon"
+    },
+    {
+      "code": "1f352",
+      "name": "cherries"
+    },
+    {
+      "code": "1f351",
+      "name": "peach"
+    },
+    {
+      "code": "1f34d",
+      "name": "pineapple"
+    },
+    {
+      "code": "1f95d",
+      "name": "kiwi_fruit"
+    },
+    {
+      "code": "1f951",
+      "name": "avocado"
+    },
+    {
+      "code": "1f345",
+      "name": "tomato"
+    },
+    {
+      "code": "1f346",
+      "name": "eggplant"
+    },
+    {
+      "code": "1f952",
+      "name": "cucumber"
+    },
+    {
+      "code": "1f955",
+      "name": "carrot"
+    },
+    {
+      "code": "1f336",
+      "name": "hot_pepper"
+    },
+    {
+      "code": "1f954",
+      "name": "potato"
+    },
+    {
+      "code": "1f33d",
+      "name": "corn"
+    },
+    {
+      "code": "1f360",
+      "name": "sweet_potato"
+    },
+    {
+      "code": "1f95c",
+      "name": "peanuts"
+    },
+    {
+      "code": "1f36f",
+      "name": "honey_pot"
+    },
+    {
+      "code": "1f950",
+      "name": "croissant"
+    },
+    {
+      "code": "1f35e",
+      "name": "bread"
+    },
+    {
+      "code": "1f956",
+      "name": "baguette_bread"
+    },
+    {
+      "code": "1f9c0",
+      "name": "cheese"
+    },
+    {
+      "code": "1f95a",
+      "name": "egg"
+    },
+    {
+      "code": "1f953",
+      "name": "bacon"
+    },
+    {
+      "code": "1f95e",
+      "name": "pancakes"
+    },
+    {
+      "code": "1f357",
+      "name": "poultry_leg"
+    },
+    {
+      "code": "1f356",
+      "name": "meat_on_bone"
+    },
+    {
+      "code": "1f364",
+      "name": "fried_shrimp"
+    },
+    {
+      "code": "1f373",
+      "name": "fried_egg"
+    },
+    {
+      "code": "1f354",
+      "name": "hamburger"
+    },
+    {
+      "code": "1f35f",
+      "name": "fries"
+    },
+    {
+      "code": "1f959",
+      "name": "stuffed_flatbread"
+    },
+    {
+      "code": "1f32d",
+      "name": "hotdog"
+    },
+    {
+      "code": "1f355",
+      "name": "pizza"
+    },
+    {
+      "code": "1f35d",
+      "name": "spaghetti"
+    },
+    {
+      "code": "1f32e",
+      "name": "taco"
+    },
+    {
+      "code": "1f32f",
+      "name": "burrito"
+    },
+    {
+      "code": "1f957",
+      "name": "green_salad"
+    },
+    {
+      "code": "1f958",
+      "name": "shallow_pan_of_food"
+    },
+    {
+      "code": "1f35c",
+      "name": "ramen"
+    },
+    {
+      "code": "1f372",
+      "name": "stew"
+    },
+    {
+      "code": "1f365",
+      "name": "fish_cake"
+    },
+    {
+      "code": "1f363",
+      "name": "sushi"
+    },
+    {
+      "code": "1f371",
+      "name": "bento"
+    },
+    {
+      "code": "1f35b",
+      "name": "curry"
+    },
+    {
+      "code": "1f359",
+      "name": "rice_ball"
+    },
+    {
+      "code": "1f35a",
+      "name": "rice"
+    },
+    {
+      "code": "1f358",
+      "name": "rice_cracker"
+    },
+    {
+      "code": "1f362",
+      "name": "oden"
+    },
+    {
+      "code": "1f361",
+      "name": "dango"
+    },
+    {
+      "code": "1f367",
+      "name": "shaved_ice"
+    },
+    {
+      "code": "1f368",
+      "name": "ice_cream"
+    },
+    {
+      "code": "1f366",
+      "name": "icecream"
+    },
+    {
+      "code": "1f370",
+      "name": "cake"
+    },
+    {
+      "code": "1f382",
+      "name": "birthday"
+    },
+    {
+      "code": "1f36e",
+      "name": "custard"
+    },
+    {
+      "code": "1f36c",
+      "name": "candy"
+    },
+    {
+      "code": "1f36d",
+      "name": "lollipop"
+    },
+    {
+      "code": "1f36b",
+      "name": "chocolate_bar"
+    },
+    {
+      "code": "1f37f",
+      "name": "popcorn"
+    },
+    {
+      "code": "1f369",
+      "name": "doughnut"
+    },
+    {
+      "code": "1f36a",
+      "name": "cookie"
+    },
+    {
+      "code": "1f95b",
+      "name": "milk_glass"
+    },
+    {
+      "code": "1f37a",
+      "name": "beer"
+    },
+    {
+      "code": "1f37b",
+      "name": "beers"
+    },
+    {
+      "code": "1f942",
+      "name": "clinking_glasses"
+    },
+    {
+      "code": "1f377",
+      "name": "wine_glass"
+    },
+    {
+      "code": "1f943",
+      "name": "tumbler_glass"
+    },
+    {
+      "code": "1f378",
+      "name": "cocktail"
+    },
+    {
+      "code": "1f379",
+      "name": "tropical_drink"
+    },
+    {
+      "code": "1f37e",
+      "name": "champagne"
+    },
+    {
+      "code": "1f376",
+      "name": "sake"
+    },
+    {
+      "code": "1f375",
+      "name": "tea"
+    },
+    {
+      "code": "2615",
+      "name": "coffee"
+    },
+    {
+      "code": "1f37c",
+      "name": "baby_bottle"
+    },
+    {
+      "code": "1f944",
+      "name": "spoon"
+    },
+    {
+      "code": "1f374",
+      "name": "fork_and_knife"
+    },
+    {
+      "code": "1f37d",
+      "name": "plate_with_cutlery"
+    },
+    {
+      "code": "26bd",
+      "name": "soccer"
+    },
+    {
+      "code": "1f3c0",
+      "name": "basketball"
+    },
+    {
+      "code": "1f3c8",
+      "name": "football"
+    },
+    {
+      "code": "26be",
+      "name": "baseball"
+    },
+    {
+      "code": "1f3be",
+      "name": "tennis"
+    },
+    {
+      "code": "1f3d0",
+      "name": "volleyball"
+    },
+    {
+      "code": "1f3c9",
+      "name": "rugby_football"
+    },
+    {
+      "code": "1f3b1",
+      "name": "8ball"
+    },
+    {
+      "code": "26f3",
+      "name": "golf"
+    },
+    {
+      "code": "1f3cc-fe0f-200d-2640",
+      "name": "golfing_woman"
+    },
+    {
+      "code": "1f3cc",
+      "name": "golfing_man"
+    },
+    {
+      "code": "1f3d3",
+      "name": "ping_pong"
+    },
+    {
+      "code": "1f3f8",
+      "name": "badminton"
+    },
+    {
+      "code": "1f945",
+      "name": "goal_net"
+    },
+    {
+      "code": "1f3d2",
+      "name": "ice_hockey"
+    },
+    {
+      "code": "1f3d1",
+      "name": "field_hockey"
+    },
+    {
+      "code": "1f3cf",
+      "name": "cricket_bat_and_ball"
+    },
+    {
+      "code": "1f3bf",
+      "name": "ski"
+    },
+    {
+      "code": "26f7",
+      "name": "skier"
+    },
+    {
+      "code": "1f3c2",
+      "name": "snowboarder"
+    },
+    {
+      "code": "1f93a",
+      "name": "person_fencing"
+    },
+    {
+      "code": "1f93c-200d-2640",
+      "name": "women_wrestling"
+    },
+    {
+      "code": "1f93c-200d-2642",
+      "name": "men_wrestling"
+    },
+    {
+      "code": "1f938-200d-2640-fe0f",
+      "name": "woman_cartwheeling"
+    },
+    {
+      "code": "1f938-200d-2642-fe0f",
+      "name": "man_cartwheeling"
+    },
+    {
+      "code": "1f93e-200d-2640-fe0f",
+      "name": "woman_playing_handball"
+    },
+    {
+      "code": "1f93e-200d-2642-fe0f",
+      "name": "man_playing_handball"
+    },
+    {
+      "code": "26f8",
+      "name": "ice_skate"
+    },
+    {
+      "code": "1f3f9",
+      "name": "bow_and_arrow"
+    },
+    {
+      "code": "1f3a3",
+      "name": "fishing_pole_and_fish"
+    },
+    {
+      "code": "1f94a",
+      "name": "boxing_glove"
+    },
+    {
+      "code": "1f94b",
+      "name": "martial_arts_uniform"
+    },
+    {
+      "code": "1f6a3-200d-2640-fe0f",
+      "name": "rowing_woman"
+    },
+    {
+      "code": "1f6a3",
+      "name": "rowing_man"
+    },
+    {
+      "code": "1f3ca-200d-2640-fe0f",
+      "name": "swimming_woman"
+    },
+    {
+      "code": "1f3ca",
+      "name": "swimming_man"
+    },
+    {
+      "code": "1f93d-200d-2640-fe0f",
+      "name": "woman_playing_water_polo"
+    },
+    {
+      "code": "1f93d-200d-2642-fe0f",
+      "name": "man_playing_water_polo"
+    },
+    {
+      "code": "1f3c4-200d-2640-fe0f",
+      "name": "surfing_woman"
+    },
+    {
+      "code": "1f3c4",
+      "name": "surfing_man"
+    },
+    {
+      "code": "1f6c0",
+      "name": "bath"
+    },
+    {
+      "code": "26f9-fe0f-200d-2640",
+      "name": "basketball_woman"
+    },
+    {
+      "code": "26f9",
+      "name": "basketball_man"
+    },
+    {
+      "code": "1f3cb-fe0f-200d-2640",
+      "name": "weight_lifting_woman"
+    },
+    {
+      "code": "1f3cb",
+      "name": "weight_lifting_man"
+    },
+    {
+      "code": "1f6b4-200d-2640-fe0f",
+      "name": "biking_woman"
+    },
+    {
+      "code": "1f6b4",
+      "name": "biking_man"
+    },
+    {
+      "code": "1f6b5-200d-2640-fe0f",
+      "name": "mountain_biking_woman"
+    },
+    {
+      "code": "1f6b5",
+      "name": "mountain_biking_man"
+    },
+    {
+      "code": "1f3c7",
+      "name": "horse_racing"
+    },
+    {
+      "code": "1f574",
+      "name": "business_suit_levitating"
+    },
+    {
+      "code": "1f3c6",
+      "name": "trophy"
+    },
+    {
+      "code": "1f3bd",
+      "name": "running_shirt_with_sash"
+    },
+    {
+      "code": "1f3c5",
+      "name": "medal_sports"
+    },
+    {
+      "code": "1f396",
+      "name": "medal_military"
+    },
+    {
+      "code": "1f947",
+      "name": "1st_place_medal"
+    },
+    {
+      "code": "1f948",
+      "name": "2nd_place_medal"
+    },
+    {
+      "code": "1f949",
+      "name": "3rd_place_medal"
+    },
+    {
+      "code": "1f397",
+      "name": "reminder_ribbon"
+    },
+    {
+      "code": "1f3f5",
+      "name": "rosette"
+    },
+    {
+      "code": "1f3ab",
+      "name": "ticket"
+    },
+    {
+      "code": "1f39f",
+      "name": "tickets"
+    },
+    {
+      "code": "1f3ad",
+      "name": "performing_arts"
+    },
+    {
+      "code": "1f3a8",
+      "name": "art"
+    },
+    {
+      "code": "1f3aa",
+      "name": "circus_tent"
+    },
+    {
+      "code": "1f939-200d-2640-fe0f",
+      "name": "woman_juggling"
+    },
+    {
+      "code": "1f939-200d-2642-fe0f",
+      "name": "man_juggling"
+    },
+    {
+      "code": "1f3a4",
+      "name": "microphone"
+    },
+    {
+      "code": "1f3a7",
+      "name": "headphones"
+    },
+    {
+      "code": "1f3bc",
+      "name": "musical_score"
+    },
+    {
+      "code": "1f3b9",
+      "name": "musical_keyboard"
+    },
+    {
+      "code": "1f941",
+      "name": "drum"
+    },
+    {
+      "code": "1f3b7",
+      "name": "saxophone"
+    },
+    {
+      "code": "1f3ba",
+      "name": "trumpet"
+    },
+    {
+      "code": "1f3b8",
+      "name": "guitar"
+    },
+    {
+      "code": "1f3bb",
+      "name": "violin"
+    },
+    {
+      "code": "1f3ac",
+      "name": "clapper"
+    },
+    {
+      "code": "1f3ae",
+      "name": "video_game"
+    },
+    {
+      "code": "1f47e",
+      "name": "space_invader"
+    },
+    {
+      "code": "1f3af",
+      "name": "dart"
+    },
+    {
+      "code": "1f3b2",
+      "name": "game_die"
+    },
+    {
+      "code": "1f3b0",
+      "name": "slot_machine"
+    },
+    {
+      "code": "1f3b3",
+      "name": "bowling"
+    },
+    {
+      "code": "1f697",
+      "name": "red_car"
+    },
+    {
+      "code": "1f695",
+      "name": "taxi"
+    },
+    {
+      "code": "1f699",
+      "name": "blue_car"
+    },
+    {
+      "code": "1f68c",
+      "name": "bus"
+    },
+    {
+      "code": "1f68e",
+      "name": "trolleybus"
+    },
+    {
+      "code": "1f3ce",
+      "name": "racing_car"
+    },
+    {
+      "code": "1f693",
+      "name": "police_car"
+    },
+    {
+      "code": "1f691",
+      "name": "ambulance"
+    },
+    {
+      "code": "1f692",
+      "name": "fire_engine"
+    },
+    {
+      "code": "1f690",
+      "name": "minibus"
+    },
+    {
+      "code": "1f69a",
+      "name": "truck"
+    },
+    {
+      "code": "1f69b",
+      "name": "articulated_lorry"
+    },
+    {
+      "code": "1f69c",
+      "name": "tractor"
+    },
+    {
+      "code": "1f6f4",
+      "name": "kick_scooter"
+    },
+    {
+      "code": "1f3cd",
+      "name": "motorcycle"
+    },
+    {
+      "code": "1f6b2",
+      "name": "bike"
+    },
+    {
+      "code": "1f6f5",
+      "name": "motor_scooter"
+    },
+    {
+      "code": "1f6a8",
+      "name": "rotating_light"
+    },
+    {
+      "code": "1f694",
+      "name": "oncoming_police_car"
+    },
+    {
+      "code": "1f68d",
+      "name": "oncoming_bus"
+    },
+    {
+      "code": "1f698",
+      "name": "oncoming_automobile"
+    },
+    {
+      "code": "1f696",
+      "name": "oncoming_taxi"
+    },
+    {
+      "code": "1f6a1",
+      "name": "aerial_tramway"
+    },
+    {
+      "code": "1f6a0",
+      "name": "mountain_cableway"
+    },
+    {
+      "code": "1f69f",
+      "name": "suspension_railway"
+    },
+    {
+      "code": "1f683",
+      "name": "railway_car"
+    },
+    {
+      "code": "1f68b",
+      "name": "train"
+    },
+    {
+      "code": "1f69d",
+      "name": "monorail"
+    },
+    {
+      "code": "1f684",
+      "name": "bullettrain_side"
+    },
+    {
+      "code": "1f685",
+      "name": "bullettrain_front"
+    },
+    {
+      "code": "1f688",
+      "name": "light_rail"
+    },
+    {
+      "code": "1f69e",
+      "name": "mountain_railway"
+    },
+    {
+      "code": "1f682",
+      "name": "steam_locomotive"
+    },
+    {
+      "code": "1f686",
+      "name": "train2"
+    },
+    {
+      "code": "1f687",
+      "name": "metro"
+    },
+    {
+      "code": "1f68a",
+      "name": "tram"
+    },
+    {
+      "code": "1f689",
+      "name": "station"
+    },
+    {
+      "code": "1f681",
+      "name": "helicopter"
+    },
+    {
+      "code": "1f6e9",
+      "name": "small_airplane"
+    },
+    {
+      "code": "2708",
+      "name": "airplane"
+    },
+    {
+      "code": "1f6eb",
+      "name": "flight_departure"
+    },
+    {
+      "code": "1f6ec",
+      "name": "flight_arrival"
+    },
+    {
+      "code": "26f5",
+      "name": "sailboat"
+    },
+    {
+      "code": "1f6e5",
+      "name": "motor_boat"
+    },
+    {
+      "code": "1f6a4",
+      "name": "speedboat"
+    },
+    {
+      "code": "26f4",
+      "name": "ferry"
+    },
+    {
+      "code": "1f6f3",
+      "name": "passenger_ship"
+    },
+    {
+      "code": "1f680",
+      "name": "rocket"
+    },
+    {
+      "code": "1f6f0",
+      "name": "artificial_satellite"
+    },
+    {
+      "code": "1f4ba",
+      "name": "seat"
+    },
+    {
+      "code": "1f6f6",
+      "name": "canoe"
+    },
+    {
+      "code": "2693",
+      "name": "anchor"
+    },
+    {
+      "code": "1f6a7",
+      "name": "construction"
+    },
+    {
+      "code": "26fd",
+      "name": "fuelpump"
+    },
+    {
+      "code": "1f68f",
+      "name": "busstop"
+    },
+    {
+      "code": "1f6a6",
+      "name": "vertical_traffic_light"
+    },
+    {
+      "code": "1f6a5",
+      "name": "traffic_light"
+    },
+    {
+      "code": "1f3c1",
+      "name": "checkered_flag"
+    },
+    {
+      "code": "1f6a2",
+      "name": "ship"
+    },
+    {
+      "code": "1f3a1",
+      "name": "ferris_wheel"
+    },
+    {
+      "code": "1f3a2",
+      "name": "roller_coaster"
+    },
+    {
+      "code": "1f3a0",
+      "name": "carousel_horse"
+    },
+    {
+      "code": "1f3d7",
+      "name": "building_construction"
+    },
+    {
+      "code": "1f301",
+      "name": "foggy"
+    },
+    {
+      "code": "1f5fc",
+      "name": "tokyo_tower"
+    },
+    {
+      "code": "1f3ed",
+      "name": "factory"
+    },
+    {
+      "code": "26f2",
+      "name": "fountain"
+    },
+    {
+      "code": "1f391",
+      "name": "rice_scene"
+    },
+    {
+      "code": "26f0",
+      "name": "mountain"
+    },
+    {
+      "code": "1f3d4",
+      "name": "mountain_snow"
+    },
+    {
+      "code": "1f5fb",
+      "name": "mount_fuji"
+    },
+    {
+      "code": "1f30b",
+      "name": "volcano"
+    },
+    {
+      "code": "1f5fe",
+      "name": "japan"
+    },
+    {
+      "code": "1f3d5",
+      "name": "camping"
+    },
+    {
+      "code": "26fa",
+      "name": "tent"
+    },
+    {
+      "code": "1f3de",
+      "name": "national_park"
+    },
+    {
+      "code": "1f6e3",
+      "name": "motorway"
+    },
+    {
+      "code": "1f6e4",
+      "name": "railway_track"
+    },
+    {
+      "code": "1f305",
+      "name": "sunrise"
+    },
+    {
+      "code": "1f304",
+      "name": "sunrise_over_mountains"
+    },
+    {
+      "code": "1f3dc",
+      "name": "desert"
+    },
+    {
+      "code": "1f3d6",
+      "name": "beach_umbrella"
+    },
+    {
+      "code": "1f3dd",
+      "name": "desert_island"
+    },
+    {
+      "code": "1f307",
+      "name": "city_sunrise"
+    },
+    {
+      "code": "1f306",
+      "name": "city_sunset"
+    },
+    {
+      "code": "1f3d9",
+      "name": "cityscape"
+    },
+    {
+      "code": "1f303",
+      "name": "night_with_stars"
+    },
+    {
+      "code": "1f309",
+      "name": "bridge_at_night"
+    },
+    {
+      "code": "1f30c",
+      "name": "milky_way"
+    },
+    {
+      "code": "1f320",
+      "name": "stars"
+    },
+    {
+      "code": "1f387",
+      "name": "sparkler"
+    },
+    {
+      "code": "1f386",
+      "name": "fireworks"
+    },
+    {
+      "code": "1f308",
+      "name": "rainbow"
+    },
+    {
+      "code": "1f3d8",
+      "name": "houses"
+    },
+    {
+      "code": "1f3f0",
+      "name": "european_castle"
+    },
+    {
+      "code": "1f3ef",
+      "name": "japanese_castle"
+    },
+    {
+      "code": "1f3df",
+      "name": "stadium"
+    },
+    {
+      "code": "1f5fd",
+      "name": "statue_of_liberty"
+    },
+    {
+      "code": "1f3e0",
+      "name": "house"
+    },
+    {
+      "code": "1f3e1",
+      "name": "house_with_garden"
+    },
+    {
+      "code": "1f3da",
+      "name": "derelict_house"
+    },
+    {
+      "code": "1f3e2",
+      "name": "office"
+    },
+    {
+      "code": "1f3ec",
+      "name": "department_store"
+    },
+    {
+      "code": "1f3e3",
+      "name": "post_office"
+    },
+    {
+      "code": "1f3e4",
+      "name": "european_post_office"
+    },
+    {
+      "code": "1f3e5",
+      "name": "hospital"
+    },
+    {
+      "code": "1f3e6",
+      "name": "bank"
+    },
+    {
+      "code": "1f3e8",
+      "name": "hotel"
+    },
+    {
+      "code": "1f3ea",
+      "name": "convenience_store"
+    },
+    {
+      "code": "1f3eb",
+      "name": "school"
+    },
+    {
+      "code": "1f3e9",
+      "name": "love_hotel"
+    },
+    {
+      "code": "1f492",
+      "name": "wedding"
+    },
+    {
+      "code": "1f3db",
+      "name": "classical_building"
+    },
+    {
+      "code": "26ea",
+      "name": "church"
+    },
+    {
+      "code": "1f54c",
+      "name": "mosque"
+    },
+    {
+      "code": "1f54d",
+      "name": "synagogue"
+    },
+    {
+      "code": "1f54b",
+      "name": "kaaba"
+    },
+    {
+      "code": "26e9",
+      "name": "shinto_shrine"
+    },
+    {
+      "code": "231a",
+      "name": "watch"
+    },
+    {
+      "code": "1f4f1",
+      "name": "iphone"
+    },
+    {
+      "code": "1f4f2",
+      "name": "calling"
+    },
+    {
+      "code": "1f4bb",
+      "name": "computer"
+    },
+    {
+      "code": "2328",
+      "name": "keyboard"
+    },
+    {
+      "code": "1f5a5",
+      "name": "desktop_computer"
+    },
+    {
+      "code": "1f5a8",
+      "name": "printer"
+    },
+    {
+      "code": "1f5b1",
+      "name": "computer_mouse"
+    },
+    {
+      "code": "1f5b2",
+      "name": "trackball"
+    },
+    {
+      "code": "1f579",
+      "name": "joystick"
+    },
+    {
+      "code": "1f5dc",
+      "name": "clamp"
+    },
+    {
+      "code": "1f4bd",
+      "name": "minidisc"
+    },
+    {
+      "code": "1f4be",
+      "name": "floppy_disk"
+    },
+    {
+      "code": "1f4bf",
+      "name": "cd"
+    },
+    {
+      "code": "1f4c0",
+      "name": "dvd"
+    },
+    {
+      "code": "1f4fc",
+      "name": "vhs"
+    },
+    {
+      "code": "1f4f7",
+      "name": "camera"
+    },
+    {
+      "code": "1f4f8",
+      "name": "camera_flash"
+    },
+    {
+      "code": "1f4f9",
+      "name": "video_camera"
+    },
+    {
+      "code": "1f3a5",
+      "name": "movie_camera"
+    },
+    {
+      "code": "1f4fd",
+      "name": "film_projector"
+    },
+    {
+      "code": "1f39e",
+      "name": "film_strip"
+    },
+    {
+      "code": "1f4de",
+      "name": "telephone_receiver"
+    },
+    {
+      "code": "260e",
+      "name": "phone"
+    },
+    {
+      "code": "1f4df",
+      "name": "pager"
+    },
+    {
+      "code": "1f4e0",
+      "name": "fax"
+    },
+    {
+      "code": "1f4fa",
+      "name": "tv"
+    },
+    {
+      "code": "1f4fb",
+      "name": "radio"
+    },
+    {
+      "code": "1f399",
+      "name": "studio_microphone"
+    },
+    {
+      "code": "1f39a",
+      "name": "level_slider"
+    },
+    {
+      "code": "1f39b",
+      "name": "control_knobs"
+    },
+    {
+      "code": "23f1",
+      "name": "stopwatch"
+    },
+    {
+      "code": "23f2",
+      "name": "timer_clock"
+    },
+    {
+      "code": "23f0",
+      "name": "alarm_clock"
+    },
+    {
+      "code": "1f570",
+      "name": "mantelpiece_clock"
+    },
+    {
+      "code": "23f3",
+      "name": "hourglass_flowing_sand"
+    },
+    {
+      "code": "231b",
+      "name": "hourglass"
+    },
+    {
+      "code": "1f4e1",
+      "name": "satellite"
+    },
+    {
+      "code": "1f50b",
+      "name": "battery"
+    },
+    {
+      "code": "1f50c",
+      "name": "electric_plug"
+    },
+    {
+      "code": "1f4a1",
+      "name": "bulb"
+    },
+    {
+      "code": "1f526",
+      "name": "flashlight"
+    },
+    {
+      "code": "1f56f",
+      "name": "candle"
+    },
+    {
+      "code": "1f5d1",
+      "name": "wastebasket"
+    },
+    {
+      "code": "1f6e2",
+      "name": "oil_drum"
+    },
+    {
+      "code": "1f4b8",
+      "name": "money_with_wings"
+    },
+    {
+      "code": "1f4b5",
+      "name": "dollar"
+    },
+    {
+      "code": "1f4b4",
+      "name": "yen"
+    },
+    {
+      "code": "1f4b6",
+      "name": "euro"
+    },
+    {
+      "code": "1f4b7",
+      "name": "pound"
+    },
+    {
+      "code": "1f4b0",
+      "name": "moneybag"
+    },
+    {
+      "code": "1f4b3",
+      "name": "credit_card"
+    },
+    {
+      "code": "1f48e",
+      "name": "gem"
+    },
+    {
+      "code": "2696",
+      "name": "balance_scale"
+    },
+    {
+      "code": "1f527",
+      "name": "wrench"
+    },
+    {
+      "code": "1f528",
+      "name": "hammer"
+    },
+    {
+      "code": "2692",
+      "name": "hammer_and_pick"
+    },
+    {
+      "code": "1f6e0",
+      "name": "hammer_and_wrench"
+    },
+    {
+      "code": "26cf",
+      "name": "pick"
+    },
+    {
+      "code": "1f529",
+      "name": "nut_and_bolt"
+    },
+    {
+      "code": "2699",
+      "name": "gear"
+    },
+    {
+      "code": "26d3",
+      "name": "chains"
+    },
+    {
+      "code": "1f52b",
+      "name": "gun"
+    },
+    {
+      "code": "1f4a3",
+      "name": "bomb"
+    },
+    {
+      "code": "1f52a",
+      "name": "hocho"
+    },
+    {
+      "code": "1f5e1",
+      "name": "dagger"
+    },
+    {
+      "code": "2694",
+      "name": "crossed_swords"
+    },
+    {
+      "code": "1f6e1",
+      "name": "shield"
+    },
+    {
+      "code": "1f6ac",
+      "name": "smoking"
+    },
+    {
+      "code": "2620",
+      "name": "skull_and_crossbones"
+    },
+    {
+      "code": "26b0",
+      "name": "coffin"
+    },
+    {
+      "code": "26b1",
+      "name": "funeral_urn"
+    },
+    {
+      "code": "1f3fa",
+      "name": "amphora"
+    },
+    {
+      "code": "1f52e",
+      "name": "crystal_ball"
+    },
+    {
+      "code": "1f4ff",
+      "name": "prayer_beads"
+    },
+    {
+      "code": "1f488",
+      "name": "barber"
+    },
+    {
+      "code": "2697",
+      "name": "alembic"
+    },
+    {
+      "code": "1f52d",
+      "name": "telescope"
+    },
+    {
+      "code": "1f52c",
+      "name": "microscope"
+    },
+    {
+      "code": "1f573",
+      "name": "hole"
+    },
+    {
+      "code": "1f48a",
+      "name": "pill"
+    },
+    {
+      "code": "1f489",
+      "name": "syringe"
+    },
+    {
+      "code": "1f321",
+      "name": "thermometer"
+    },
+    {
+      "code": "1f3f7",
+      "name": "label"
+    },
+    {
+      "code": "1f516",
+      "name": "bookmark"
+    },
+    {
+      "code": "1f6bd",
+      "name": "toilet"
+    },
+    {
+      "code": "1f6bf",
+      "name": "shower"
+    },
+    {
+      "code": "1f6c1",
+      "name": "bathtub"
+    },
+    {
+      "code": "1f511",
+      "name": "key"
+    },
+    {
+      "code": "1f5dd",
+      "name": "old_key"
+    },
+    {
+      "code": "1f6cb",
+      "name": "couch_and_lamp"
+    },
+    {
+      "code": "1f6cc",
+      "name": "sleeping_bed"
+    },
+    {
+      "code": "1f6cf",
+      "name": "bed"
+    },
+    {
+      "code": "1f6aa",
+      "name": "door"
+    },
+    {
+      "code": "1f6ce",
+      "name": "bellhop_bell"
+    },
+    {
+      "code": "1f5bc",
+      "name": "framed_picture"
+    },
+    {
+      "code": "1f5fa",
+      "name": "world_map"
+    },
+    {
+      "code": "26f1",
+      "name": "parasol_on_ground"
+    },
+    {
+      "code": "1f5ff",
+      "name": "moyai"
+    },
+    {
+      "code": "1f6cd",
+      "name": "shopping"
+    },
+    {
+      "code": "1f6d2",
+      "name": "shopping_cart"
+    },
+    {
+      "code": "1f388",
+      "name": "balloon"
+    },
+    {
+      "code": "1f38f",
+      "name": "flags"
+    },
+    {
+      "code": "1f380",
+      "name": "ribbon"
+    },
+    {
+      "code": "1f381",
+      "name": "gift"
+    },
+    {
+      "code": "1f38a",
+      "name": "confetti_ball"
+    },
+    {
+      "code": "1f389",
+      "name": "tada"
+    },
+    {
+      "code": "1f38e",
+      "name": "dolls"
+    },
+    {
+      "code": "1f390",
+      "name": "wind_chime"
+    },
+    {
+      "code": "1f38c",
+      "name": "crossed_flags"
+    },
+    {
+      "code": "1f3ee",
+      "name": "izakaya_lantern"
+    },
+    {
+      "code": "2709",
+      "name": "email"
+    },
+    {
+      "code": "1f4e9",
+      "name": "envelope_with_arrow"
+    },
+    {
+      "code": "1f4e8",
+      "name": "incoming_envelope"
+    },
+    {
+      "code": "1f4e7",
+      "name": "e-mail"
+    },
+    {
+      "code": "1f48c",
+      "name": "love_letter"
+    },
+    {
+      "code": "1f4ee",
+      "name": "postbox"
+    },
+    {
+      "code": "1f4ea",
+      "name": "mailbox_closed"
+    },
+    {
+      "code": "1f4eb",
+      "name": "mailbox"
+    },
+    {
+      "code": "1f4ec",
+      "name": "mailbox_with_mail"
+    },
+    {
+      "code": "1f4ed",
+      "name": "mailbox_with_no_mail"
+    },
+    {
+      "code": "1f4e6",
+      "name": "package"
+    },
+    {
+      "code": "1f4ef",
+      "name": "postal_horn"
+    },
+    {
+      "code": "1f4e5",
+      "name": "inbox_tray"
+    },
+    {
+      "code": "1f4e4",
+      "name": "outbox_tray"
+    },
+    {
+      "code": "1f4dc",
+      "name": "scroll"
+    },
+    {
+      "code": "1f4c3",
+      "name": "page_with_curl"
+    },
+    {
+      "code": "1f4d1",
+      "name": "bookmark_tabs"
+    },
+    {
+      "code": "1f4ca",
+      "name": "bar_chart"
+    },
+    {
+      "code": "1f4c8",
+      "name": "chart_with_upwards_trend"
+    },
+    {
+      "code": "1f4c9",
+      "name": "chart_with_downwards_trend"
+    },
+    {
+      "code": "1f4c4",
+      "name": "page_facing_up"
+    },
+    {
+      "code": "1f4c5",
+      "name": "date"
+    },
+    {
+      "code": "1f4c6",
+      "name": "calendar"
+    },
+    {
+      "code": "1f5d3",
+      "name": "spiral_calendar"
+    },
+    {
+      "code": "1f4c7",
+      "name": "card_index"
+    },
+    {
+      "code": "1f5c3",
+      "name": "card_file_box"
+    },
+    {
+      "code": "1f5f3",
+      "name": "ballot_box"
+    },
+    {
+      "code": "1f5c4",
+      "name": "file_cabinet"
+    },
+    {
+      "code": "1f4cb",
+      "name": "clipboard"
+    },
+    {
+      "code": "1f5d2",
+      "name": "spiral_notepad"
+    },
+    {
+      "code": "1f4c1",
+      "name": "file_folder"
+    },
+    {
+      "code": "1f4c2",
+      "name": "open_file_folder"
+    },
+    {
+      "code": "1f5c2",
+      "name": "card_index_dividers"
+    },
+    {
+      "code": "1f5de",
+      "name": "newspaper_roll"
+    },
+    {
+      "code": "1f4f0",
+      "name": "newspaper"
+    },
+    {
+      "code": "1f4d3",
+      "name": "notebook"
+    },
+    {
+      "code": "1f4d5",
+      "name": "closed_book"
+    },
+    {
+      "code": "1f4d7",
+      "name": "green_book"
+    },
+    {
+      "code": "1f4d8",
+      "name": "blue_book"
+    },
+    {
+      "code": "1f4d9",
+      "name": "orange_book"
+    },
+    {
+      "code": "1f4d4",
+      "name": "notebook_with_decorative_cover"
+    },
+    {
+      "code": "1f4d2",
+      "name": "ledger"
+    },
+    {
+      "code": "1f4da",
+      "name": "books"
+    },
+    {
+      "code": "1f4d6",
+      "name": "open_book"
+    },
+    {
+      "code": "1f517",
+      "name": "link"
+    },
+    {
+      "code": "1f4ce",
+      "name": "paperclip"
+    },
+    {
+      "code": "1f587",
+      "name": "paperclips"
+    },
+    {
+      "code": "2702",
+      "name": "scissors"
+    },
+    {
+      "code": "1f4d0",
+      "name": "triangular_ruler"
+    },
+    {
+      "code": "1f4cf",
+      "name": "straight_ruler"
+    },
+    {
+      "code": "1f4cc",
+      "name": "pushpin"
+    },
+    {
+      "code": "1f4cd",
+      "name": "round_pushpin"
+    },
+    {
+      "code": "1f6a9",
+      "name": "triangular_flag_on_post"
+    },
+    {
+      "code": "1f3f3",
+      "name": "white_flag"
+    },
+    {
+      "code": "1f3f4",
+      "name": "black_flag"
+    },
+    {
+      "code": "1f3f3-fe0f-200d-1f308",
+      "name": "rainbow_flag"
+    },
+    {
+      "code": "1f510",
+      "name": "closed_lock_with_key"
+    },
+    {
+      "code": "1f512",
+      "name": "lock"
+    },
+    {
+      "code": "1f513",
+      "name": "unlock"
+    },
+    {
+      "code": "1f50f",
+      "name": "lock_with_ink_pen"
+    },
+    {
+      "code": "1f58a",
+      "name": "pen"
+    },
+    {
+      "code": "1f58b",
+      "name": "fountain_pen"
+    },
+    {
+      "code": "2712",
+      "name": "black_nib"
+    },
+    {
+      "code": "1f4dd",
+      "name": "memo"
+    },
+    {
+      "code": "270f",
+      "name": "pencil2"
+    },
+    {
+      "code": "1f58d",
+      "name": "crayon"
+    },
+    {
+      "code": "1f58c",
+      "name": "paintbrush"
+    },
+    {
+      "code": "1f50d",
+      "name": "mag"
+    },
+    {
+      "code": "1f50e",
+      "name": "mag_right"
+    },
+    {
+      "code": "2764",
+      "name": "heart"
+    },
+    {
+      "code": "1f49b",
+      "name": "yellow_heart"
+    },
+    {
+      "code": "1f49a",
+      "name": "green_heart"
+    },
+    {
+      "code": "1f499",
+      "name": "blue_heart"
+    },
+    {
+      "code": "1f49c",
+      "name": "purple_heart"
+    },
+    {
+      "code": "1f5a4",
+      "name": "black_heart"
+    },
+    {
+      "code": "1f494",
+      "name": "broken_heart"
+    },
+    {
+      "code": "2763",
+      "name": "heavy_heart_exclamation"
+    },
+    {
+      "code": "1f495",
+      "name": "two_hearts"
+    },
+    {
+      "code": "1f49e",
+      "name": "revolving_hearts"
+    },
+    {
+      "code": "1f493",
+      "name": "heartbeat"
+    },
+    {
+      "code": "1f497",
+      "name": "heartpulse"
+    },
+    {
+      "code": "1f496",
+      "name": "sparkling_heart"
+    },
+    {
+      "code": "1f498",
+      "name": "cupid"
+    },
+    {
+      "code": "1f49d",
+      "name": "gift_heart"
+    },
+    {
+      "code": "1f49f",
+      "name": "heart_decoration"
+    },
+    {
+      "code": "262e",
+      "name": "peace_symbol"
+    },
+    {
+      "code": "271d",
+      "name": "latin_cross"
+    },
+    {
+      "code": "262a",
+      "name": "star_and_crescent"
+    },
+    {
+      "code": "1f549",
+      "name": "om"
+    },
+    {
+      "code": "2638",
+      "name": "wheel_of_dharma"
+    },
+    {
+      "code": "2721",
+      "name": "star_of_david"
+    },
+    {
+      "code": "1f52f",
+      "name": "six_pointed_star"
+    },
+    {
+      "code": "1f54e",
+      "name": "menorah"
+    },
+    {
+      "code": "262f",
+      "name": "yin_yang"
+    },
+    {
+      "code": "2626",
+      "name": "orthodox_cross"
+    },
+    {
+      "code": "1f6d0",
+      "name": "place_of_worship"
+    },
+    {
+      "code": "26ce",
+      "name": "ophiuchus"
+    },
+    {
+      "code": "2648",
+      "name": "aries"
+    },
+    {
+      "code": "2649",
+      "name": "taurus"
+    },
+    {
+      "code": "264a",
+      "name": "gemini"
+    },
+    {
+      "code": "264b",
+      "name": "cancer"
+    },
+    {
+      "code": "264c",
+      "name": "leo"
+    },
+    {
+      "code": "264d",
+      "name": "virgo"
+    },
+    {
+      "code": "264e",
+      "name": "libra"
+    },
+    {
+      "code": "264f",
+      "name": "scorpius"
+    },
+    {
+      "code": "2650",
+      "name": "sagittarius"
+    },
+    {
+      "code": "2651",
+      "name": "capricorn"
+    },
+    {
+      "code": "2652",
+      "name": "aquarius"
+    },
+    {
+      "code": "2653",
+      "name": "pisces"
+    },
+    {
+      "code": "1f194",
+      "name": "id"
+    },
+    {
+      "code": "269b",
+      "name": "atom_symbol"
+    },
+    {
+      "code": "1f233",
+      "name": "u7a7a"
+    },
+    {
+      "code": "1f239",
+      "name": "u5272"
+    },
+    {
+      "code": "2622",
+      "name": "radioactive"
+    },
+    {
+      "code": "2623",
+      "name": "biohazard"
+    },
+    {
+      "code": "1f4f4",
+      "name": "mobile_phone_off"
+    },
+    {
+      "code": "1f4f3",
+      "name": "vibration_mode"
+    },
+    {
+      "code": "1f236",
+      "name": "u6709"
+    },
+    {
+      "code": "1f21a",
+      "name": "u7121"
+    },
+    {
+      "code": "1f238",
+      "name": "u7533"
+    },
+    {
+      "code": "1f23a",
+      "name": "u55b6"
+    },
+    {
+      "code": "1f237",
+      "name": "u6708"
+    },
+    {
+      "code": "2734",
+      "name": "eight_pointed_black_star"
+    },
+    {
+      "code": "1f19a",
+      "name": "vs"
+    },
+    {
+      "code": "1f251",
+      "name": "accept"
+    },
+    {
+      "code": "1f4ae",
+      "name": "white_flower"
+    },
+    {
+      "code": "1f250",
+      "name": "ideograph_advantage"
+    },
+    {
+      "code": "3299",
+      "name": "secret"
+    },
+    {
+      "code": "3297",
+      "name": "congratulations"
+    },
+    {
+      "code": "1f234",
+      "name": "u5408"
+    },
+    {
+      "code": "1f235",
+      "name": "u6e80"
+    },
+    {
+      "code": "1f232",
+      "name": "u7981"
+    },
+    {
+      "code": "1f170",
+      "name": "a"
+    },
+    {
+      "code": "1f171",
+      "name": "b"
+    },
+    {
+      "code": "1f18e",
+      "name": "ab"
+    },
+    {
+      "code": "1f191",
+      "name": "cl"
+    },
+    {
+      "code": "1f17e",
+      "name": "o2"
+    },
+    {
+      "code": "1f198",
+      "name": "sos"
+    },
+    {
+      "code": "26d4",
+      "name": "no_entry"
+    },
+    {
+      "code": "1f4db",
+      "name": "name_badge"
+    },
+    {
+      "code": "1f6ab",
+      "name": "no_entry_sign"
+    },
+    {
+      "code": "274c",
+      "name": "x"
+    },
+    {
+      "code": "2b55",
+      "name": "o"
+    },
+    {
+      "code": "1f6d1",
+      "name": "stop_sign"
+    },
+    {
+      "code": "1f4a2",
+      "name": "anger"
+    },
+    {
+      "code": "2668",
+      "name": "hotsprings"
+    },
+    {
+      "code": "1f6b7",
+      "name": "no_pedestrians"
+    },
+    {
+      "code": "1f6af",
+      "name": "do_not_litter"
+    },
+    {
+      "code": "1f6b3",
+      "name": "no_bicycles"
+    },
+    {
+      "code": "1f6b1",
+      "name": "non-potable_water"
+    },
+    {
+      "code": "1f51e",
+      "name": "underage"
+    },
+    {
+      "code": "1f4f5",
+      "name": "no_mobile_phones"
+    },
+    {
+      "code": "2757",
+      "name": "exclamation"
+    },
+    {
+      "code": "2755",
+      "name": "grey_exclamation"
+    },
+    {
+      "code": "2753",
+      "name": "question"
+    },
+    {
+      "code": "2754",
+      "name": "grey_question"
+    },
+    {
+      "code": "203c",
+      "name": "bangbang"
+    },
+    {
+      "code": "2049",
+      "name": "interrobang"
+    },
+    {
+      "code": "1f4af",
+      "name": "100"
+    },
+    {
+      "code": "1f505",
+      "name": "low_brightness"
+    },
+    {
+      "code": "1f506",
+      "name": "high_brightness"
+    },
+    {
+      "code": "1f531",
+      "name": "trident"
+    },
+    {
+      "code": "269c",
+      "name": "fleur_de_lis"
+    },
+    {
+      "code": "303d",
+      "name": "part_alternation_mark"
+    },
+    {
+      "code": "26a0",
+      "name": "warning"
+    },
+    {
+      "code": "1f6b8",
+      "name": "children_crossing"
+    },
+    {
+      "code": "1f530",
+      "name": "beginner"
+    },
+    {
+      "code": "267b",
+      "name": "recycle"
+    },
+    {
+      "code": "1f22f",
+      "name": "u6307"
+    },
+    {
+      "code": "1f4b9",
+      "name": "chart"
+    },
+    {
+      "code": "2747",
+      "name": "sparkle"
+    },
+    {
+      "code": "2733",
+      "name": "eight_spoked_asterisk"
+    },
+    {
+      "code": "274e",
+      "name": "negative_squared_cross_mark"
+    },
+    {
+      "code": "2705",
+      "name": "white_check_mark"
+    },
+    {
+      "code": "1f4a0",
+      "name": "diamond_shape_with_a_dot_inside"
+    },
+    {
+      "code": "1f300",
+      "name": "cyclone"
+    },
+    {
+      "code": "27bf",
+      "name": "loop"
+    },
+    {
+      "code": "1f310",
+      "name": "globe_with_meridians"
+    },
+    {
+      "code": "24c2",
+      "name": "m"
+    },
+    {
+      "code": "1f3e7",
+      "name": "atm"
+    },
+    {
+      "code": "1f202",
+      "name": "sa"
+    },
+    {
+      "code": "1f6c2",
+      "name": "passport_control"
+    },
+    {
+      "code": "1f6c3",
+      "name": "customs"
+    },
+    {
+      "code": "1f6c4",
+      "name": "baggage_claim"
+    },
+    {
+      "code": "1f6c5",
+      "name": "left_luggage"
+    },
+    {
+      "code": "267f",
+      "name": "wheelchair"
+    },
+    {
+      "code": "1f6ad",
+      "name": "no_smoking"
+    },
+    {
+      "code": "1f6be",
+      "name": "wc"
+    },
+    {
+      "code": "1f17f",
+      "name": "parking"
+    },
+    {
+      "code": "1f6b0",
+      "name": "potable_water"
+    },
+    {
+      "code": "1f6b9",
+      "name": "mens"
+    },
+    {
+      "code": "1f6ba",
+      "name": "womens"
+    },
+    {
+      "code": "1f6bc",
+      "name": "baby_symbol"
+    },
+    {
+      "code": "1f6bb",
+      "name": "restroom"
+    },
+    {
+      "code": "1f6ae",
+      "name": "put_litter_in_its_place"
+    },
+    {
+      "code": "1f3a6",
+      "name": "cinema"
+    },
+    {
+      "code": "1f4f6",
+      "name": "signal_strength"
+    },
+    {
+      "code": "1f201",
+      "name": "koko"
+    },
+    {
+      "code": "1f196",
+      "name": "ng"
+    },
+    {
+      "code": "1f197",
+      "name": "ok"
+    },
+    {
+      "code": "1f199",
+      "name": "up"
+    },
+    {
+      "code": "1f192",
+      "name": "cool"
+    },
+    {
+      "code": "1f195",
+      "name": "new"
+    },
+    {
+      "code": "1f193",
+      "name": "free"
+    },
+    {
+      "code": "0030-fe0f-20e3",
+      "name": "zero"
+    },
+    {
+      "code": "0031-fe0f-20e3",
+      "name": "one"
+    },
+    {
+      "code": "0032-fe0f-20e3",
+      "name": "two"
+    },
+    {
+      "code": "0033-fe0f-20e3",
+      "name": "three"
+    },
+    {
+      "code": "0034-fe0f-20e3",
+      "name": "four"
+    },
+    {
+      "code": "0035-fe0f-20e3",
+      "name": "five"
+    },
+    {
+      "code": "0036-fe0f-20e3",
+      "name": "six"
+    },
+    {
+      "code": "0037-fe0f-20e3",
+      "name": "seven"
+    },
+    {
+      "code": "0038-fe0f-20e3",
+      "name": "eight"
+    },
+    {
+      "code": "0039-fe0f-20e3",
+      "name": "nine"
+    },
+    {
+      "code": "1f51f",
+      "name": "keycap_ten"
+    },
+    {
+      "code": "002a-fe0f-20e3",
+      "name": "asterisk"
+    },
+    {
+      "code": "1f522",
+      "name": "1234"
+    },
+    {
+      "code": "25b6",
+      "name": "arrow_forward"
+    },
+    {
+      "code": "23f8",
+      "name": "pause_button"
+    },
+    {
+      "code": "23ed",
+      "name": "next_track_button"
+    },
+    {
+      "code": "23f9",
+      "name": "stop_button"
+    },
+    {
+      "code": "23fa",
+      "name": "record_button"
+    },
+    {
+      "code": "23ef",
+      "name": "play_or_pause_button"
+    },
+    {
+      "code": "23ee",
+      "name": "previous_track_button"
+    },
+    {
+      "code": "23e9",
+      "name": "fast_forward"
+    },
+    {
+      "code": "23ea",
+      "name": "rewind"
+    },
+    {
+      "code": "1f500",
+      "name": "twisted_rightwards_arrows"
+    },
+    {
+      "code": "1f501",
+      "name": "repeat"
+    },
+    {
+      "code": "1f502",
+      "name": "repeat_one"
+    },
+    {
+      "code": "25c0",
+      "name": "arrow_backward"
+    },
+    {
+      "code": "1f53c",
+      "name": "arrow_up_small"
+    },
+    {
+      "code": "1f53d",
+      "name": "arrow_down_small"
+    },
+    {
+      "code": "23eb",
+      "name": "arrow_double_up"
+    },
+    {
+      "code": "23ec",
+      "name": "arrow_double_down"
+    },
+    {
+      "code": "27a1",
+      "name": "arrow_right"
+    },
+    {
+      "code": "2b05",
+      "name": "arrow_left"
+    },
+    {
+      "code": "2b06",
+      "name": "arrow_up"
+    },
+    {
+      "code": "2b07",
+      "name": "arrow_down"
+    },
+    {
+      "code": "2197",
+      "name": "arrow_upper_right"
+    },
+    {
+      "code": "2198",
+      "name": "arrow_lower_right"
+    },
+    {
+      "code": "2199",
+      "name": "arrow_lower_left"
+    },
+    {
+      "code": "2196",
+      "name": "arrow_upper_left"
+    },
+    {
+      "code": "2195",
+      "name": "arrow_up_down"
+    },
+    {
+      "code": "2194",
+      "name": "left_right_arrow"
+    },
+    {
+      "code": "1f504",
+      "name": "arrows_counterclockwise"
+    },
+    {
+      "code": "21aa",
+      "name": "arrow_right_hook"
+    },
+    {
+      "code": "21a9",
+      "name": "leftwards_arrow_with_hook"
+    },
+    {
+      "code": "2934",
+      "name": "arrow_heading_up"
+    },
+    {
+      "code": "2935",
+      "name": "arrow_heading_down"
+    },
+    {
+      "code": "0023-fe0f-20e3",
+      "name": "hash"
+    },
+    {
+      "code": "2139",
+      "name": "information_source"
+    },
+    {
+      "code": "1f524",
+      "name": "abc"
+    },
+    {
+      "code": "1f521",
+      "name": "abcd"
+    },
+    {
+      "code": "1f520",
+      "name": "capital_abcd"
+    },
+    {
+      "code": "1f523",
+      "name": "symbols"
+    },
+    {
+      "code": "1f3b5",
+      "name": "musical_note"
+    },
+    {
+      "code": "1f3b6",
+      "name": "notes"
+    },
+    {
+      "code": "3030",
+      "name": "wavy_dash"
+    },
+    {
+      "code": "27b0",
+      "name": "curly_loop"
+    },
+    {
+      "code": "2714",
+      "name": "heavy_check_mark"
+    },
+    {
+      "code": "1f503",
+      "name": "arrows_clockwise"
+    },
+    {
+      "code": "2795",
+      "name": "heavy_plus_sign"
+    },
+    {
+      "code": "2796",
+      "name": "heavy_minus_sign"
+    },
+    {
+      "code": "2797",
+      "name": "heavy_division_sign"
+    },
+    {
+      "code": "2716",
+      "name": "heavy_multiplication_x"
+    },
+    {
+      "code": "1f4b2",
+      "name": "heavy_dollar_sign"
+    },
+    {
+      "code": "1f4b1",
+      "name": "currency_exchange"
+    },
+    {
+      "code": "00a9",
+      "name": "copyright"
+    },
+    {
+      "code": "00ae",
+      "name": "registered"
+    },
+    {
+      "code": "2122",
+      "name": "tm"
+    },
+    {
+      "code": "1f51a",
+      "name": "end"
+    },
+    {
+      "code": "1f519",
+      "name": "back"
+    },
+    {
+      "code": "1f51b",
+      "name": "on"
+    },
+    {
+      "code": "1f51d",
+      "name": "top"
+    },
+    {
+      "code": "1f51c",
+      "name": "soon"
+    },
+    {
+      "code": "2611",
+      "name": "ballot_box_with_check"
+    },
+    {
+      "code": "1f518",
+      "name": "radio_button"
+    },
+    {
+      "code": "26aa",
+      "name": "white_circle"
+    },
+    {
+      "code": "26ab",
+      "name": "black_circle"
+    },
+    {
+      "code": "1f534",
+      "name": "red_circle"
+    },
+    {
+      "code": "1f535",
+      "name": "large_blue_circle"
+    },
+    {
+      "code": "1f538",
+      "name": "small_orange_diamond"
+    },
+    {
+      "code": "1f539",
+      "name": "small_blue_diamond"
+    },
+    {
+      "code": "1f536",
+      "name": "large_orange_diamond"
+    },
+    {
+      "code": "1f537",
+      "name": "large_blue_diamond"
+    },
+    {
+      "code": "1f53a",
+      "name": "small_red_triangle"
+    },
+    {
+      "code": "25aa",
+      "name": "black_small_square"
+    },
+    {
+      "code": "25ab",
+      "name": "white_small_square"
+    },
+    {
+      "code": "2b1b",
+      "name": "black_large_square"
+    },
+    {
+      "code": "2b1c",
+      "name": "white_large_square"
+    },
+    {
+      "code": "1f53b",
+      "name": "small_red_triangle_down"
+    },
+    {
+      "code": "25fc",
+      "name": "black_medium_square"
+    },
+    {
+      "code": "25fb",
+      "name": "white_medium_square"
+    },
+    {
+      "code": "25fe",
+      "name": "black_medium_small_square"
+    },
+    {
+      "code": "25fd",
+      "name": "white_medium_small_square"
+    },
+    {
+      "code": "1f532",
+      "name": "black_square_button"
+    },
+    {
+      "code": "1f533",
+      "name": "white_square_button"
+    },
+    {
+      "code": "1f508",
+      "name": "speaker"
+    },
+    {
+      "code": "1f509",
+      "name": "sound"
+    },
+    {
+      "code": "1f50a",
+      "name": "loud_sound"
+    },
+    {
+      "code": "1f507",
+      "name": "mute"
+    },
+    {
+      "code": "1f4e3",
+      "name": "mega"
+    },
+    {
+      "code": "1f4e2",
+      "name": "loudspeaker"
+    },
+    {
+      "code": "1f514",
+      "name": "bell"
+    },
+    {
+      "code": "1f515",
+      "name": "no_bell"
+    },
+    {
+      "code": "1f0cf",
+      "name": "black_joker"
+    },
+    {
+      "code": "1f004",
+      "name": "mahjong"
+    },
+    {
+      "code": "2660",
+      "name": "spades"
+    },
+    {
+      "code": "2663",
+      "name": "clubs"
+    },
+    {
+      "code": "2665",
+      "name": "hearts"
+    },
+    {
+      "code": "2666",
+      "name": "diamonds"
+    },
+    {
+      "code": "1f3b4",
+      "name": "flower_playing_cards"
+    },
+    {
+      "code": "1f4ad",
+      "name": "thought_balloon"
+    },
+    {
+      "code": "1f5ef",
+      "name": "right_anger_bubble"
+    },
+    {
+      "code": "1f4ac",
+      "name": "speech_balloon"
     },
     {
       "code": "1f5e8",
       "name": "left_speech_bubble"
     },
+    {
+      "code": "1f550",
+      "name": "clock1"
+    },
+    {
+      "code": "1f551",
+      "name": "clock2"
+    },
+    {
+      "code": "1f552",
+      "name": "clock3"
+    },
+    {
+      "code": "1f553",
+      "name": "clock4"
+    },
+    {
+      "code": "1f554",
+      "name": "clock5"
+    },
+    {
+      "code": "1f555",
+      "name": "clock6"
+    },
+    {
+      "code": "1f556",
+      "name": "clock7"
+    },
+    {
+      "code": "1f557",
+      "name": "clock8"
+    },
+    {
+      "code": "1f558",
+      "name": "clock9"
+    },
+    {
+      "code": "1f559",
+      "name": "clock10"
+    },
+    {
+      "code": "1f55a",
+      "name": "clock11"
+    },
+    {
+      "code": "1f55b",
+      "name": "clock12"
+    },
+    {
+      "code": "1f55c",
+      "name": "clock130"
+    },
+    {
+      "code": "1f55d",
+      "name": "clock230"
+    },
+    {
+      "code": "1f55e",
+      "name": "clock330"
+    },
+    {
+      "code": "1f55f",
+      "name": "clock430"
+    },
+    {
+      "code": "1f560",
+      "name": "clock530"
+    },
+    {
+      "code": "1f561",
+      "name": "clock630"
+    },
+    {
+      "code": "1f562",
+      "name": "clock730"
+    },
+    {
+      "code": "1f563",
+      "name": "clock830"
+    },
+    {
+      "code": "1f564",
+      "name": "clock930"
+    },
+    {
+      "code": "1f565",
+      "name": "clock1030"
+    },
+    {
+      "code": "1f566",
+      "name": "clock1130"
+    },
+    {
+      "code": "1f567",
+      "name": "clock1230"
+    },
+    {
+      "code": "1f1e6-1f1eb",
+      "name": "afghanistan"
+    },
+    {
+      "code": "1f1e6-1f1fd",
+      "name": "aland_islands"
+    },
+    {
+      "code": "1f1e6-1f1f1",
+      "name": "albania"
+    },
+    {
+      "code": "1f1e9-1f1ff",
+      "name": "algeria"
+    },
+    {
+      "code": "1f1e6-1f1f8",
+      "name": "american_samoa"
+    },
+    {
+      "code": "1f1e6-1f1e9",
+      "name": "andorra"
+    },
+    {
+      "code": "1f1e6-1f1f4",
+      "name": "angola"
+    },
+    {
+      "code": "1f1e6-1f1ee",
+      "name": "anguilla"
+    },
+    {
+      "code": "1f1e6-1f1f6",
+      "name": "antarctica"
+    },
+    {
+      "code": "1f1e6-1f1ec",
+      "name": "antigua_barbuda"
+    },
+    {
+      "code": "1f1e6-1f1f7",
+      "name": "argentina"
+    },
+    {
+      "code": "1f1e6-1f1f2",
+      "name": "armenia"
+    },
+    {
+      "code": "1f1e6-1f1fc",
+      "name": "aruba"
+    },
+    {
+      "code": "1f1e6-1f1fa",
+      "name": "australia"
+    },
+    {
+      "code": "1f1e6-1f1f9",
+      "name": "austria"
+    },
+    {
+      "code": "1f1e6-1f1ff",
+      "name": "azerbaijan"
+    },
+    {
+      "code": "1f1e7-1f1f8",
+      "name": "bahamas"
+    },
+    {
+      "code": "1f1e7-1f1ed",
+      "name": "bahrain"
+    },
+    {
+      "code": "1f1e7-1f1e9",
+      "name": "bangladesh"
+    },
+    {
+      "code": "1f1e7-1f1e7",
+      "name": "barbados"
+    },
+    {
+      "code": "1f1e7-1f1fe",
+      "name": "belarus"
+    },
+    {
+      "code": "1f1e7-1f1ea",
+      "name": "belgium"
+    },
+    {
+      "code": "1f1e7-1f1ff",
+      "name": "belize"
+    },
+    {
+      "code": "1f1e7-1f1ef",
+      "name": "benin"
+    },
+    {
+      "code": "1f1e7-1f1f2",
+      "name": "bermuda"
+    },
+    {
+      "code": "1f1e7-1f1f9",
+      "name": "bhutan"
+    },
+    {
+      "code": "1f1e7-1f1f4",
+      "name": "bolivia"
+    },
+    {
+      "code": "1f1e7-1f1f6",
+      "name": "caribbean_netherlands"
+    },
+    {
+      "code": "1f1e7-1f1e6",
+      "name": "bosnia_herzegovina"
+    },
+    {
+      "code": "1f1e7-1f1fc",
+      "name": "botswana"
+    },
+    {
+      "code": "1f1e7-1f1f7",
+      "name": "brazil"
+    },
+    {
+      "code": "1f1ee-1f1f4",
+      "name": "british_indian_ocean_territory"
+    },
+    {
+      "code": "1f1fb-1f1ec",
+      "name": "british_virgin_islands"
+    },
+    {
+      "code": "1f1e7-1f1f3",
+      "name": "brunei"
+    },
+    {
+      "code": "1f1e7-1f1ec",
+      "name": "bulgaria"
+    },
+    {
+      "code": "1f1e7-1f1eb",
+      "name": "burkina_faso"
+    },
+    {
+      "code": "1f1e7-1f1ee",
+      "name": "burundi"
+    },
+    {
+      "code": "1f1e8-1f1fb",
+      "name": "cape_verde"
+    },
+    {
+      "code": "1f1f0-1f1ed",
+      "name": "cambodia"
+    },
+    {
+      "code": "1f1e8-1f1f2",
+      "name": "cameroon"
+    },
+    {
+      "code": "1f1e8-1f1e6",
+      "name": "canada"
+    },
+    {
+      "code": "1f1ee-1f1e8",
+      "name": "canary_islands"
+    },
+    {
+      "code": "1f1f0-1f1fe",
+      "name": "cayman_islands"
+    },
+    {
+      "code": "1f1e8-1f1eb",
+      "name": "central_african_republic"
+    },
+    {
+      "code": "1f1f9-1f1e9",
+      "name": "chad"
+    },
+    {
+      "code": "1f1e8-1f1f1",
+      "name": "chile"
+    },
     {
       "code": "1f1e8-1f1f3",
       "name": "cn"
     },
+    {
+      "code": "1f1e8-1f1fd",
+      "name": "christmas_island"
+    },
+    {
+      "code": "1f1e8-1f1e8",
+      "name": "cocos_islands"
+    },
+    {
+      "code": "1f1e8-1f1f4",
+      "name": "colombia"
+    },
+    {
+      "code": "1f1f0-1f1f2",
+      "name": "comoros"
+    },
+    {
+      "code": "1f1e8-1f1ec",
+      "name": "congo_brazzaville"
+    },
+    {
+      "code": "1f1e8-1f1e9",
+      "name": "congo_kinshasa"
+    },
+    {
+      "code": "1f1e8-1f1f0",
+      "name": "cook_islands"
+    },
+    {
+      "code": "1f1e8-1f1f7",
+      "name": "costa_rica"
+    },
+    {
+      "code": "1f1ed-1f1f7",
+      "name": "croatia"
+    },
+    {
+      "code": "1f1e8-1f1fa",
+      "name": "cuba"
+    },
+    {
+      "code": "1f1e8-1f1fc",
+      "name": "curacao"
+    },
+    {
+      "code": "1f1e8-1f1fe",
+      "name": "cyprus"
+    },
+    {
+      "code": "1f1e8-1f1ff",
+      "name": "czech_republic"
+    },
+    {
+      "code": "1f1e9-1f1f0",
+      "name": "denmark"
+    },
+    {
+      "code": "1f1e9-1f1ef",
+      "name": "djibouti"
+    },
+    {
+      "code": "1f1e9-1f1f2",
+      "name": "dominica"
+    },
+    {
+      "code": "1f1e9-1f1f4",
+      "name": "dominican_republic"
+    },
+    {
+      "code": "1f1ea-1f1e8",
+      "name": "ecuador"
+    },
+    {
+      "code": "1f1ea-1f1ec",
+      "name": "egypt"
+    },
+    {
+      "code": "1f1f8-1f1fb",
+      "name": "el_salvador"
+    },
+    {
+      "code": "1f1ec-1f1f6",
+      "name": "equatorial_guinea"
+    },
+    {
+      "code": "1f1ea-1f1f7",
+      "name": "eritrea"
+    },
+    {
+      "code": "1f1ea-1f1ea",
+      "name": "estonia"
+    },
+    {
+      "code": "1f1ea-1f1f9",
+      "name": "ethiopia"
+    },
+    {
+      "code": "1f1ea-1f1fa",
+      "name": "eu"
+    },
+    {
+      "code": "1f1eb-1f1f0",
+      "name": "falkland_islands"
+    },
+    {
+      "code": "1f1eb-1f1f4",
+      "name": "faroe_islands"
+    },
+    {
+      "code": "1f1eb-1f1ef",
+      "name": "fiji"
+    },
+    {
+      "code": "1f1eb-1f1ee",
+      "name": "finland"
+    },
     {
       "code": "1f1eb-1f1f7",
       "name": "fr"
     },
+    {
+      "code": "1f1ec-1f1eb",
+      "name": "french_guiana"
+    },
+    {
+      "code": "1f1f5-1f1eb",
+      "name": "french_polynesia"
+    },
+    {
+      "code": "1f1f9-1f1eb",
+      "name": "french_southern_territories"
+    },
+    {
+      "code": "1f1ec-1f1e6",
+      "name": "gabon"
+    },
+    {
+      "code": "1f1ec-1f1f2",
+      "name": "gambia"
+    },
+    {
+      "code": "1f1ec-1f1ea",
+      "name": "georgia"
+    },
     {
       "code": "1f1e9-1f1ea",
       "name": "de"
     },
+    {
+      "code": "1f1ec-1f1ed",
+      "name": "ghana"
+    },
+    {
+      "code": "1f1ec-1f1ee",
+      "name": "gibraltar"
+    },
+    {
+      "code": "1f1ec-1f1f7",
+      "name": "greece"
+    },
+    {
+      "code": "1f1ec-1f1f1",
+      "name": "greenland"
+    },
+    {
+      "code": "1f1ec-1f1e9",
+      "name": "grenada"
+    },
+    {
+      "code": "1f1ec-1f1f5",
+      "name": "guadeloupe"
+    },
+    {
+      "code": "1f1ec-1f1fa",
+      "name": "guam"
+    },
+    {
+      "code": "1f1ec-1f1f9",
+      "name": "guatemala"
+    },
+    {
+      "code": "1f1ec-1f1ec",
+      "name": "guernsey"
+    },
+    {
+      "code": "1f1ec-1f1f3",
+      "name": "guinea"
+    },
+    {
+      "code": "1f1ec-1f1fc",
+      "name": "guinea_bissau"
+    },
+    {
+      "code": "1f1ec-1f1fe",
+      "name": "guyana"
+    },
+    {
+      "code": "1f1ed-1f1f9",
+      "name": "haiti"
+    },
+    {
+      "code": "1f1ed-1f1f3",
+      "name": "honduras"
+    },
+    {
+      "code": "1f1ed-1f1f0",
+      "name": "hong_kong"
+    },
+    {
+      "code": "1f1ed-1f1fa",
+      "name": "hungary"
+    },
+    {
+      "code": "1f1ee-1f1f8",
+      "name": "iceland"
+    },
+    {
+      "code": "1f1ee-1f1f3",
+      "name": "india"
+    },
+    {
+      "code": "1f1ee-1f1e9",
+      "name": "indonesia"
+    },
+    {
+      "code": "1f1ee-1f1f7",
+      "name": "iran"
+    },
+    {
+      "code": "1f1ee-1f1f6",
+      "name": "iraq"
+    },
+    {
+      "code": "1f1ee-1f1ea",
+      "name": "ireland"
+    },
+    {
+      "code": "1f1ee-1f1f2",
+      "name": "isle_of_man"
+    },
+    {
+      "code": "1f1ee-1f1f1",
+      "name": "israel"
+    },
     {
       "code": "1f1ee-1f1f9",
       "name": "it"
     },
+    {
+      "code": "1f1e8-1f1ee",
+      "name": "cote_divoire"
+    },
+    {
+      "code": "1f1ef-1f1f2",
+      "name": "jamaica"
+    },
     {
       "code": "1f1ef-1f1f5",
       "name": "jp"
     },
+    {
+      "code": "1f1ef-1f1ea",
+      "name": "jersey"
+    },
+    {
+      "code": "1f1ef-1f1f4",
+      "name": "jordan"
+    },
+    {
+      "code": "1f1f0-1f1ff",
+      "name": "kazakhstan"
+    },
+    {
+      "code": "1f1f0-1f1ea",
+      "name": "kenya"
+    },
+    {
+      "code": "1f1f0-1f1ee",
+      "name": "kiribati"
+    },
+    {
+      "code": "1f1fd-1f1f0",
+      "name": "kosovo"
+    },
+    {
+      "code": "1f1f0-1f1fc",
+      "name": "kuwait"
+    },
+    {
+      "code": "1f1f0-1f1ec",
+      "name": "kyrgyzstan"
+    },
+    {
+      "code": "1f1f1-1f1e6",
+      "name": "laos"
+    },
+    {
+      "code": "1f1f1-1f1fb",
+      "name": "latvia"
+    },
+    {
+      "code": "1f1f1-1f1e7",
+      "name": "lebanon"
+    },
+    {
+      "code": "1f1f1-1f1f8",
+      "name": "lesotho"
+    },
+    {
+      "code": "1f1f1-1f1f7",
+      "name": "liberia"
+    },
+    {
+      "code": "1f1f1-1f1fe",
+      "name": "libya"
+    },
+    {
+      "code": "1f1f1-1f1ee",
+      "name": "liechtenstein"
+    },
+    {
+      "code": "1f1f1-1f1f9",
+      "name": "lithuania"
+    },
+    {
+      "code": "1f1f1-1f1fa",
+      "name": "luxembourg"
+    },
+    {
+      "code": "1f1f2-1f1f4",
+      "name": "macau"
+    },
+    {
+      "code": "1f1f2-1f1f0",
+      "name": "macedonia"
+    },
+    {
+      "code": "1f1f2-1f1ec",
+      "name": "madagascar"
+    },
+    {
+      "code": "1f1f2-1f1fc",
+      "name": "malawi"
+    },
+    {
+      "code": "1f1f2-1f1fe",
+      "name": "malaysia"
+    },
+    {
+      "code": "1f1f2-1f1fb",
+      "name": "maldives"
+    },
+    {
+      "code": "1f1f2-1f1f1",
+      "name": "mali"
+    },
+    {
+      "code": "1f1f2-1f1f9",
+      "name": "malta"
+    },
+    {
+      "code": "1f1f2-1f1ed",
+      "name": "marshall_islands"
+    },
+    {
+      "code": "1f1f2-1f1f6",
+      "name": "martinique"
+    },
+    {
+      "code": "1f1f2-1f1f7",
+      "name": "mauritania"
+    },
+    {
+      "code": "1f1f2-1f1fa",
+      "name": "mauritius"
+    },
+    {
+      "code": "1f1fe-1f1f9",
+      "name": "mayotte"
+    },
+    {
+      "code": "1f1f2-1f1fd",
+      "name": "mexico"
+    },
+    {
+      "code": "1f1eb-1f1f2",
+      "name": "micronesia"
+    },
+    {
+      "code": "1f1f2-1f1e9",
+      "name": "moldova"
+    },
+    {
+      "code": "1f1f2-1f1e8",
+      "name": "monaco"
+    },
+    {
+      "code": "1f1f2-1f1f3",
+      "name": "mongolia"
+    },
+    {
+      "code": "1f1f2-1f1ea",
+      "name": "montenegro"
+    },
+    {
+      "code": "1f1f2-1f1f8",
+      "name": "montserrat"
+    },
+    {
+      "code": "1f1f2-1f1e6",
+      "name": "morocco"
+    },
+    {
+      "code": "1f1f2-1f1ff",
+      "name": "mozambique"
+    },
+    {
+      "code": "1f1f2-1f1f2",
+      "name": "myanmar"
+    },
+    {
+      "code": "1f1f3-1f1e6",
+      "name": "namibia"
+    },
+    {
+      "code": "1f1f3-1f1f7",
+      "name": "nauru"
+    },
+    {
+      "code": "1f1f3-1f1f5",
+      "name": "nepal"
+    },
+    {
+      "code": "1f1f3-1f1f1",
+      "name": "netherlands"
+    },
+    {
+      "code": "1f1f3-1f1e8",
+      "name": "new_caledonia"
+    },
+    {
+      "code": "1f1f3-1f1ff",
+      "name": "new_zealand"
+    },
+    {
+      "code": "1f1f3-1f1ee",
+      "name": "nicaragua"
+    },
+    {
+      "code": "1f1f3-1f1ea",
+      "name": "niger"
+    },
+    {
+      "code": "1f1f3-1f1ec",
+      "name": "nigeria"
+    },
+    {
+      "code": "1f1f3-1f1fa",
+      "name": "niue"
+    },
+    {
+      "code": "1f1f3-1f1eb",
+      "name": "norfolk_island"
+    },
+    {
+      "code": "1f1f2-1f1f5",
+      "name": "northern_mariana_islands"
+    },
+    {
+      "code": "1f1f0-1f1f5",
+      "name": "north_korea"
+    },
+    {
+      "code": "1f1f3-1f1f4",
+      "name": "norway"
+    },
+    {
+      "code": "1f1f4-1f1f2",
+      "name": "oman"
+    },
+    {
+      "code": "1f1f5-1f1f0",
+      "name": "pakistan"
+    },
+    {
+      "code": "1f1f5-1f1fc",
+      "name": "palau"
+    },
+    {
+      "code": "1f1f5-1f1f8",
+      "name": "palestinian_territories"
+    },
+    {
+      "code": "1f1f5-1f1e6",
+      "name": "panama"
+    },
+    {
+      "code": "1f1f5-1f1ec",
+      "name": "papua_new_guinea"
+    },
+    {
+      "code": "1f1f5-1f1fe",
+      "name": "paraguay"
+    },
+    {
+      "code": "1f1f5-1f1ea",
+      "name": "peru"
+    },
+    {
+      "code": "1f1f5-1f1ed",
+      "name": "philippines"
+    },
+    {
+      "code": "1f1f5-1f1f3",
+      "name": "pitcairn_islands"
+    },
+    {
+      "code": "1f1f5-1f1f1",
+      "name": "poland"
+    },
+    {
+      "code": "1f1f5-1f1f9",
+      "name": "portugal"
+    },
+    {
+      "code": "1f1f5-1f1f7",
+      "name": "puerto_rico"
+    },
+    {
+      "code": "1f1f6-1f1e6",
+      "name": "qatar"
+    },
+    {
+      "code": "1f1f7-1f1ea",
+      "name": "reunion"
+    },
+    {
+      "code": "1f1f7-1f1f4",
+      "name": "romania"
+    },
     {
       "code": "1f1f7-1f1fa",
       "name": "ru"
     },
+    {
+      "code": "1f1f7-1f1fc",
+      "name": "rwanda"
+    },
+    {
+      "code": "1f1e7-1f1f1",
+      "name": "st_barthelemy"
+    },
+    {
+      "code": "1f1f8-1f1ed",
+      "name": "st_helena"
+    },
+    {
+      "code": "1f1f0-1f1f3",
+      "name": "st_kitts_nevis"
+    },
+    {
+      "code": "1f1f1-1f1e8",
+      "name": "st_lucia"
+    },
+    {
+      "code": "1f1f5-1f1f2",
+      "name": "st_pierre_miquelon"
+    },
+    {
+      "code": "1f1fb-1f1e8",
+      "name": "st_vincent_grenadines"
+    },
+    {
+      "code": "1f1fc-1f1f8",
+      "name": "samoa"
+    },
+    {
+      "code": "1f1f8-1f1f2",
+      "name": "san_marino"
+    },
+    {
+      "code": "1f1f8-1f1f9",
+      "name": "sao_tome_principe"
+    },
+    {
+      "code": "1f1f8-1f1e6",
+      "name": "saudi_arabia"
+    },
+    {
+      "code": "1f1f8-1f1f3",
+      "name": "senegal"
+    },
+    {
+      "code": "1f1f7-1f1f8",
+      "name": "serbia"
+    },
+    {
+      "code": "1f1f8-1f1e8",
+      "name": "seychelles"
+    },
+    {
+      "code": "1f1f8-1f1f1",
+      "name": "sierra_leone"
+    },
+    {
+      "code": "1f1f8-1f1ec",
+      "name": "singapore"
+    },
+    {
+      "code": "1f1f8-1f1fd",
+      "name": "sint_maarten"
+    },
+    {
+      "code": "1f1f8-1f1f0",
+      "name": "slovakia"
+    },
+    {
+      "code": "1f1f8-1f1ee",
+      "name": "slovenia"
+    },
+    {
+      "code": "1f1f8-1f1e7",
+      "name": "solomon_islands"
+    },
+    {
+      "code": "1f1f8-1f1f4",
+      "name": "somalia"
+    },
+    {
+      "code": "1f1ff-1f1e6",
+      "name": "south_africa"
+    },
+    {
+      "code": "1f1ec-1f1f8",
+      "name": "south_georgia_south_sandwich_islands"
+    },
     {
       "code": "1f1f0-1f1f7",
       "name": "kr"
     },
+    {
+      "code": "1f1f8-1f1f8",
+      "name": "south_sudan"
+    },
     {
       "code": "1f1ea-1f1f8",
       "name": "es"
     },
+    {
+      "code": "1f1f1-1f1f0",
+      "name": "sri_lanka"
+    },
+    {
+      "code": "1f1f8-1f1e9",
+      "name": "sudan"
+    },
+    {
+      "code": "1f1f8-1f1f7",
+      "name": "suriname"
+    },
+    {
+      "code": "1f1f8-1f1ff",
+      "name": "swaziland"
+    },
+    {
+      "code": "1f1f8-1f1ea",
+      "name": "sweden"
+    },
+    {
+      "code": "1f1e8-1f1ed",
+      "name": "switzerland"
+    },
+    {
+      "code": "1f1f8-1f1fe",
+      "name": "syria"
+    },
+    {
+      "code": "1f1f9-1f1fc",
+      "name": "taiwan"
+    },
+    {
+      "code": "1f1f9-1f1ef",
+      "name": "tajikistan"
+    },
+    {
+      "code": "1f1f9-1f1ff",
+      "name": "tanzania"
+    },
+    {
+      "code": "1f1f9-1f1ed",
+      "name": "thailand"
+    },
+    {
+      "code": "1f1f9-1f1f1",
+      "name": "timor_leste"
+    },
+    {
+      "code": "1f1f9-1f1ec",
+      "name": "togo"
+    },
+    {
+      "code": "1f1f9-1f1f0",
+      "name": "tokelau"
+    },
+    {
+      "code": "1f1f9-1f1f4",
+      "name": "tonga"
+    },
+    {
+      "code": "1f1f9-1f1f9",
+      "name": "trinidad_tobago"
+    },
+    {
+      "code": "1f1f9-1f1f3",
+      "name": "tunisia"
+    },
+    {
+      "code": "1f1f9-1f1f7",
+      "name": "tr"
+    },
+    {
+      "code": "1f1f9-1f1f2",
+      "name": "turkmenistan"
+    },
+    {
+      "code": "1f1f9-1f1e8",
+      "name": "turks_caicos_islands"
+    },
+    {
+      "code": "1f1f9-1f1fb",
+      "name": "tuvalu"
+    },
+    {
+      "code": "1f1fa-1f1ec",
+      "name": "uganda"
+    },
+    {
+      "code": "1f1fa-1f1e6",
+      "name": "ukraine"
+    },
+    {
+      "code": "1f1e6-1f1ea",
+      "name": "united_arab_emirates"
+    },
     {
       "code": "1f1ec-1f1e7",
-      "name": "gb"
+      "name": "uk"
     },
     {
       "code": "1f1fa-1f1f8",
       "name": "us"
+    },
+    {
+      "code": "1f1fb-1f1ee",
+      "name": "us_virgin_islands"
+    },
+    {
+      "code": "1f1fa-1f1fe",
+      "name": "uruguay"
+    },
+    {
+      "code": "1f1fa-1f1ff",
+      "name": "uzbekistan"
+    },
+    {
+      "code": "1f1fb-1f1fa",
+      "name": "vanuatu"
+    },
+    {
+      "code": "1f1fb-1f1e6",
+      "name": "vatican_city"
+    },
+    {
+      "code": "1f1fb-1f1ea",
+      "name": "venezuela"
+    },
+    {
+      "code": "1f1fb-1f1f3",
+      "name": "vietnam"
+    },
+    {
+      "code": "1f1fc-1f1eb",
+      "name": "wallis_futuna"
+    },
+    {
+      "code": "1f1ea-1f1ed",
+      "name": "western_sahara"
+    },
+    {
+      "code": "1f1fe-1f1ea",
+      "name": "yemen"
+    },
+    {
+      "code": "1f1ff-1f1f2",
+      "name": "zambia"
+    },
+    {
+      "code": "1f1ff-1f1fc",
+      "name": "zimbabwe"
+    },
+    {
+      "code": "1f929",
+      "name": "star_struck"
+    },
+    {
+      "code": "1f928",
+      "name": "face_with_raised_eyebrow"
+    },
+    {
+      "code": "1f92f",
+      "name": "exploding_head"
+    },
+    {
+      "code": "1f92a",
+      "name": "crazy_face"
+    },
+    {
+      "code": "1f92c",
+      "name": "face_with_symbols_over_mouth"
+    },
+    {
+      "code": "1f92e",
+      "name": "face_vomiting"
+    },
+    {
+      "code": "1f92b",
+      "name": "sushing_face"
+    },
+    {
+      "code": "1f92d",
+      "name": "face_with_hand_over_mouth"
+    },
+    {
+      "code": "1f9d0",
+      "name": "face_with_monocle"
+    },
+    {
+      "code": "1f9d2",
+      "name": "child"
+    },
+    {
+      "code": "1f9d1",
+      "name": "adult"
+    },
+    {
+      "code": "1f9d3",
+      "name": "older_adult"
+    },
+    {
+      "code": "1f9d5",
+      "name": "woman_with_headscarf"
+    },
+    {
+      "code": "1f9d4",
+      "name": "bearded_person"
+    },
+    {
+      "code": "1f931",
+      "name": "breast_feeding"
+    },
+    {
+      "code": "1f9d9",
+      "name": "mage"
+    },
+    {
+      "code": "1f9da",
+      "name": "fairy"
+    },
+    {
+      "code": "1f9db",
+      "name": "vampire"
+    },
+    {
+      "code": "1f9dc",
+      "name": "merperson"
+    },
+    {
+      "code": "1f9dd",
+      "name": "elf"
+    },
+    {
+      "code": "1f9de",
+      "name": "genie"
+    },
+    {
+      "code": "1f9df",
+      "name": "zombie"
+    },
+    {
+      "code": "1f9d6",
+      "name": "person_in_steamy_room"
+    },
+    {
+      "code": "1f9d7",
+      "name": "person_climbing"
+    },
+    {
+      "code": "1f9d8",
+      "name": "person_in_lotus_position"
+    },
+    {
+      "code": "1f91f",
+      "name": "love_you_gesture"
+    },
+    {
+      "code": "1f932",
+      "name": "palms_up_together"
+    },
+    {
+      "code": "1f9e0",
+      "name": "brain"
+    },
+    {
+      "code": "1f9e1",
+      "name": "orange_heart"
+    },
+    {
+      "code": "1f9e3",
+      "name": "scarf"
+    },
+    {
+      "code": "1f9e4",
+      "name": "gloves"
+    },
+    {
+      "code": "1f9e5",
+      "name": "coat"
+    },
+    {
+      "code": "1f9e6",
+      "name": "socks"
+    },
+    {
+      "code": "1f9e2",
+      "name": "billed_cap"
+    },
+    {
+      "code": "1f993",
+      "name": "zebra"
+    },
+    {
+      "code": "1f992",
+      "name": "giraffe"
+    },
+    {
+      "code": "1f994",
+      "name": "hedgehog"
+    },
+    {
+      "code": "1f995",
+      "name": "sauropod"
+    },
+    {
+      "code": "1f996",
+      "name": "t_rex"
+    },
+    {
+      "code": "1f997",
+      "name": "cricket"
+    },
+    {
+      "code": "1f965",
+      "name": "coconut"
+    },
+    {
+      "code": "1f966",
+      "name": "broccoli"
+    },
+    {
+      "code": "1f968",
+      "name": "pretzel"
+    },
+    {
+      "code": "1f969",
+      "name": "cut_of_meat"
+    },
+    {
+      "code": "1f96a",
+      "name": "sandwich"
+    },
+    {
+      "code": "1f963",
+      "name": "bowl_with_spoon"
+    },
+    {
+      "code": "1f96b",
+      "name": "canned_food"
+    },
+    {
+      "code": "1f95f",
+      "name": "dumpling"
+    },
+    {
+      "code": "1f960",
+      "name": "fortune_cookie"
+    },
+    {
+      "code": "1f961",
+      "name": "takeout_box"
+    },
+    {
+      "code": "1f967",
+      "name": "pie"
+    },
+    {
+      "code": "1f964",
+      "name": "cup_with_straw"
+    },
+    {
+      "code": "1f962",
+      "name": "chopsticks"
+    },
+    {
+      "code": "1f6f8",
+      "name": "flying_saucer"
+    },
+    {
+      "code": "1f6f7",
+      "name": "sled"
+    },
+    {
+      "code": "1f94c",
+      "name": "curling_stone"
+    },
+    {
+      "code": "1f1f8-1f1ef",
+      "name": "svalbard_and_jan_mayen"
+    },
+    {
+      "code": "1f1f2-1f1eb",
+      "name": "st_martin"
+    },
+    {
+      "code": "1f1fa-1f1f2",
+      "name": "us_outlying_islands"
+    },
+    {
+      "code": "1f1f9-1f1e6",
+      "name": "tristan_da_cunha"
+    },
+    {
+      "code": "1f1ed-1f1f2",
+      "name": "heard_and_mc_donald_islands"
+    },
+    {
+      "code": "1f1ea-1f1e6",
+      "name": "ceuta_and_melilla"
+    },
+    {
+      "code": "1f1e9-1f1ec",
+      "name": "diego_garcia"
+    },
+    {
+      "code": "1f1e6-1f1e8",
+      "name": "ascension_island"
+    },
+    {
+      "code": "1f1e7-1f1fb",
+      "name": "bouvet_island"
+    },
+    {
+      "code": "1f1e8-1f1f5",
+      "name": "clipperton_island"
+    },
+    {
+      "code": "1f1fa-1f1f3",
+      "name": "united_nations"
     }
   ],
+  "tonableEmojis": [
+    "raised_hands",
+    "clap",
+    "wave",
+    "call_me_hand",
+    "+1",
+    "-1",
+    "facepunch",
+    "fist",
+    "fist_left",
+    "fist_right",
+    "v",
+    "ok_hand",
+    "raised_hand",
+    "raised_back_of_hand",
+    "open_hands",
+    "muscle",
+    "pray",
+    "point_up",
+    "point_up_2",
+    "point_down",
+    "point_left",
+    "point_right",
+    "fu",
+    "raised_hand_with_fingers_splayed",
+    "metal",
+    "crossed_fingers",
+    "vulcan_salute",
+    "writing_hand",
+    "selfie",
+    "nail_care",
+    "ear",
+    "nose",
+    "baby",
+    "boy",
+    "girl",
+    "man",
+    "woman",
+    "blonde_woman",
+    "blonde_man",
+    "older_man",
+    "older_woman",
+    "man_with_gua_pi_mao",
+    "woman_with_turban",
+    "man_with_turban",
+    "policewoman",
+    "policeman",
+    "construction_worker_woman",
+    "construction_worker_man",
+    "guardswoman",
+    "guardsman",
+    "male_detective",
+    "woman_health_worker",
+    "man_health_worker",
+    "woman_farmer",
+    "man_farmer",
+    "woman_cook",
+    "man_cook",
+    "woman_student",
+    "man_student",
+    "woman_singer",
+    "man_singer",
+    "woman_teacher",
+    "man_teacher",
+    "woman_factory_worker",
+    "man_factory_worker",
+    "woman_technologist",
+    "man_technologist",
+    "woman_office_worker",
+    "man_office_worker",
+    "woman_mechanic",
+    "man_mechanic",
+    "woman_scientist",
+    "man_scientist",
+    "woman_artist",
+    "man_artist",
+    "woman_firefighter",
+    "man_firefighter",
+    "woman_pilot",
+    "man_pilot",
+    "woman_astronaut",
+    "man_astronaut",
+    "woman_judge",
+    "man_judge",
+    "mrs_claus",
+    "santa",
+    "angel",
+    "pregnant_woman",
+    "princess",
+    "prince",
+    "bride_with_veil",
+    "man_in_tuxedo",
+    "running_woman",
+    "running_man",
+    "walking_woman",
+    "walking_man",
+    "dancer",
+    "man_dancing",
+    "bowing_woman",
+    "bowing_man",
+    "man_facepalming",
+    "woman_facepalming",
+    "woman_shrugging",
+    "man_shrugging",
+    "tipping_hand_woman",
+    "tipping_hand_man",
+    "no_good_woman",
+    "no_good_man",
+    "ok_woman",
+    "ok_man",
+    "raising_hand_woman",
+    "raising_hand_man",
+    "pouting_woman",
+    "pouting_man",
+    "frowning_woman",
+    "frowning_man",
+    "haircut_woman",
+    "haircut_man",
+    "massage_woman",
+    "massage_man",
+    "golfing_man",
+    "snowboarder",
+    "woman_cartwheeling",
+    "man_cartwheeling",
+    "woman_playing_handball",
+    "man_playing_handball",
+    "rowing_woman",
+    "rowing_man",
+    "swimming_woman",
+    "swimming_man",
+    "woman_playing_water_polo",
+    "man_playing_water_polo",
+    "surfing_woman",
+    "surfing_man",
+    "bath",
+    "basketball_man",
+    "weight_lifting_man",
+    "biking_woman",
+    "biking_man",
+    "mountain_biking_woman",
+    "mountain_biking_man",
+    "horse_racing",
+    "business_suit_levitating",
+    "woman_juggling",
+    "man_juggling",
+    "sleeping_bed"
+  ],
   "aliases": {
-    "airplane_small": [
-      "small_airplane"
-    ],
-    "anger_right": [
-      "right_anger_bubble"
-    ],
-    "atom": [
-      "atom_symbol"
+    "right_anger_bubble": [
+      "anger_right"
     ],
     "ballot_box": [
       "ballot_box_with_ballot"
     ],
-    "basketball_player": [
+    "basketball_man": [
+      "basketball_player",
       "person_with_ball"
     ],
-    "beach": [
+    "beach_umbrella": [
+      "umbrella_on_ground",
+      "beach",
       "beach_with_umbrella"
     ],
-    "beach_umbrella": [
+    "parasol_on_ground": [
       "umbrella_on_ground"
     ],
-    "bellhop": [
-      "bellhop_bell"
+    "bellhop_bell": [
+      "bellhop"
     ],
     "biohazard": [
       "biohazard_sign"
@@ -4216,11 +6172,12 @@
     "bow_and_arrow": [
       "archery"
     ],
-    "calendar_spiral": [
+    "spiral_calendar": [
+      "calendar_spiral",
       "spiral_calendar_pad"
     ],
-    "card_box": [
-      "card_file_box"
+    "card_file_box": [
+      "card_box"
     ],
     "champagne": [
       "bottle_with_popping_cork"
@@ -4229,63 +6186,40 @@
       "cheese_wedge"
     ],
     "city_sunset": [
-      "city_sunrise"
+      "city_dusk"
     ],
-    "clock": [
-      "mantlepiece_clock"
-    ],
-    "cloud_lightning": [
-      "cloud_with_lightning"
-    ],
-    "cloud_rain": [
-      "cloud_with_rain"
-    ],
-    "cloud_snow": [
-      "cloud_with_snow"
-    ],
-    "cloud_tornado": [
-      "cloud_with_tornado"
-    ],
-    "construction_site": [
-      "building_construction"
-    ],
-    "couch": [
-      "couch_and_lamp"
+    "couch_and_lamp": [
+      "couch"
     ],
     "crayon": [
       "lower_left_crayon"
     ],
-    "cricket": [
+    "cricket_bat_and_ball": [
       "cricket_bat_ball"
     ],
-    "cross": [
-      "latin_cross"
-    ],
-    "cruise_ship": [
-      "passenger_ship"
+    "latin_cross": [
+      "cross"
     ],
     "dagger": [
       "dagger_knife"
     ],
-    "desktop": [
-      "desktop_computer"
+    "desktop_computer": [
+      "desktop"
     ],
-    "dividers": [
-      "card_index_dividers"
+    "card_index_dividers": [
+      "dividers"
     ],
     "dove": [
       "dove_of_peace"
     ],
-    "e-mail": [
-      "email"
-    ],
-    "feet": [
-      "paw_prints"
+    "footprints": [
+      "feet"
     ],
     "fire": [
       "flame"
     ],
-    "flag_black": [
+    "black_flag": [
+      "flag_black",
       "waving_black_flag"
     ],
     "cn": [
@@ -4300,7 +6234,8 @@
     "fr": [
       "flag_fr"
     ],
-    "gb": [
+    "uk": [
+      "gb",
       "flag_gb"
     ],
     "it": [
@@ -4318,101 +6253,80 @@
     "us": [
       "flag_us"
     ],
-    "flag_white": [
+    "white_flag": [
+      "flag_white",
       "waving_white_flag"
     ],
-    "fork_knife_plate": [
+    "plate_with_cutlery": [
+      "fork_knife_plate",
       "fork_and_knife_with_plate"
     ],
-    "frame_photo": [
+    "framed_picture": [
+      "frame_photo",
       "frame_with_picture"
     ],
-    "frowning2": [
-      "white_frowning_face"
+    "hammer_and_pick": [
+      "hammer_pick"
     ],
-    "hammer_pick": [
-      "hammer_and_pick"
-    ],
-    "hand_splayed": [
-      "raised_hand_with_fingers_splayed"
-    ],
-    "head_bandage": [
-      "face_with_head_bandage"
-    ],
-    "heart_exclamation": [
+    "heavy_heart_exclamation": [
+      "heart_exclamation",
       "heavy_heart_exclamation_mark_ornament"
     ],
-    "helmet_with_cross": [
-      "helmet_with_white_cross"
-    ],
-    "homes": [
+    "houses": [
+      "homes",
       "house_buildings"
     ],
     "hotdog": [
       "hot_dog"
     ],
-    "house_abandoned": [
+    "derelict_house": [
+      "house_abandoned",
       "derelict_house_building"
     ],
-    "hugging": [
-      "hugging_face"
+    "desert_island": [
+      "island"
     ],
-    "island": [
-      "desert_island"
-    ],
-    "key2": [
-      "old_key"
+    "old_key": [
+      "key2"
     ],
     "laughing": [
       "satisfied"
     ],
-    "levitate": [
+    "business_suit_levitating": [
+      "levitate",
       "man_in_business_suit_levitating"
     ],
-    "lifter": [
+    "weight_lifting_man": [
+      "lifter",
       "weight_lifter"
     ],
-    "lion_face": [
-      "lion"
-    ],
-    "map": [
-      "world_map"
-    ],
-    "medal": [
+    "medal_sports": [
+      "medal",
       "sports_medal"
     ],
     "metal": [
       "sign_of_the_horns"
     ],
-    "microphone2": [
-      "studio_microphone"
-    ],
-    "middle_finger": [
+    "fu": [
+      "middle_finger",
       "reversed_hand_with_middle_finger_extended"
     ],
-    "money_mouth": [
-      "money_mouth_face"
-    ],
     "motorcycle": [
       "racing_motorcycle"
     ],
     "mountain_snow": [
       "snow_capped_mountain"
     ],
-    "mouse_three_button": [
-      "three_button_mouse"
-    ],
-    "nerd": [
-      "nerd_face"
-    ],
-    "newspaper2": [
+    "newspaper_roll": [
+      "newspaper2",
       "rolled_up_newspaper"
     ],
-    "notepad_spiral": [
+    "spiral_notepad": [
+      "notepad_spiral",
       "spiral_note_pad"
     ],
-    "oil": [
-      "oil_drum"
+    "oil_drum": [
+      "oil"
     ],
     "older_woman": [
       "grandma"
@@ -4423,19 +6337,14 @@
     "paperclips": [
       "linked_paperclips"
     ],
-    "park": [
-      "national_park"
-    ],
     "pause_button": [
       "double_vertical_bar"
     ],
-    "peace": [
-      "peace_symbol"
+    "peace_symbol": [
+      "peace"
     ],
-    "pen_ballpoint": [
-      "lower_left_ballpoint_pen"
-    ],
-    "pen_fountain": [
+    "fountain_pen": [
+      "pen_fountain",
       "lower_left_fountain_pen"
     ],
     "ping_pong": [
@@ -4449,12 +6358,6 @@
       "hankey",
       "poo"
     ],
-    "projector": [
-      "film_projector"
-    ],
-    "race_car": [
-      "racing_car"
-    ],
     "radioactive": [
       "radioactive_sign"
     ],
@@ -4464,80 +6367,381 @@
     "robot": [
       "robot_face"
     ],
-    "rolling_eyes": [
-      "face_with_rolling_eyes"
-    ],
     "skull": [
       "skeleton"
     ],
-    "skull_crossbones": [
-      "skull_and_crossbones"
-    ],
-    "slight_frown": [
-      "slightly_frowning_face"
-    ],
-    "slight_smile": [
-      "slightly_smiling_face"
+    "skull_and_crossbones": [
+      "skull_crossbones"
     ],
     "speaking_head": [
       "speaking_head_in_silhouette"
     ],
-    "spy": [
+    "male_detective": [
+      "spy",
       "sleuth_or_spy"
     ],
-    "thermometer_face": [
-      "face_with_thermometer"
-    ],
     "thinking": [
       "thinking_face"
     ],
-    "thumbsdown": [
-      "-1"
+    "-1": [
+      "thumbsdown"
     ],
-    "thumbsup": [
-      "+1"
+    "+1": [
+      "thumbsup"
     ],
-    "thunder_cloud_rain": [
+    "cloud_with_lightning_and_rain": [
+      "thunder_cloud_rain",
       "thunder_cloud_and_rain"
     ],
     "tickets": [
       "admission_tickets"
     ],
-    "timer": [
-      "timer_clock"
-    ],
-    "tools": [
-      "hammer_and_wrench"
-    ],
-    "track_next": [
+    "next_track_button": [
+      "track_next",
       "next_track"
     ],
-    "track_previous": [
+    "previous_track_button": [
+      "track_previous",
       "previous_track"
     ],
     "unicorn": [
       "unicorn_face"
     ],
-    "upside_down": [
-      "upside_down_face"
+    "funeral_urn": [
+      "urn"
     ],
-    "urn": [
-      "funeral_urn"
-    ],
-    "vulcan": [
-      "raised_hand_with_part_between_middle_and_ring_fingers"
-    ],
-    "white_sun_cloud": [
+    "sun_behind_large_cloud": [
+      "white_sun_cloud",
       "white_sun_behind_cloud"
     ],
-    "white_sun_rain_cloud": [
+    "sun_behind_rain_cloud": [
+      "white_sun_rain_cloud",
       "white_sun_behind_cloud_with_rain"
     ],
-    "white_sun_small_cloud": [
+    "partly_sunny": [
+      "white_sun_small_cloud",
       "white_sun_with_small_cloud"
     ],
-    "zipper_mouth": [
-      "zipper_mouth_face"
+    "open_umbrella": [
+      "umbrella2"
+    ],
+    "hammer_and_wrench": [
+      "tools"
+    ],
+    "face_with_thermometer": [
+      "thermometer_face"
+    ],
+    "timer_clock": [
+      "timer"
+    ],
+    "keycap_ten": [
+      "ten"
+    ],
+    "memo": [
+      "pencil"
+    ],
+    "rescue_worker_helmet": [
+      "helmet_with_cross",
+      "helmet_with_white_cross"
+    ],
+    "slightly_smiling_face": [
+      "slightly_smiling",
+      "slight_smile"
+    ],
+    "construction_worker_man": [
+      "construction_worker"
+    ],
+    "upside_down_face": [
+      "upside_down"
+    ],
+    "money_mouth_face": [
+      "money_mouth"
+    ],
+    "nerd_face": [
+      "nerd"
+    ],
+    "hugs": [
+      "hugging",
+      "hugging_face"
+    ],
+    "roll_eyes": [
+      "rolling_eyes",
+      "face_with_rolling_eyes"
+    ],
+    "slightly_frowning_face": [
+      "slight_frown"
+    ],
+    "frowning_face": [
+      "frowning2",
+      "white_frowning_face"
+    ],
+    "zipper_mouth_face": [
+      "zipper_mouth"
+    ],
+    "face_with_head_bandage": [
+      "head_bandage"
+    ],
+    "raised_hand_with_fingers_splayed": [
+      "hand_splayed"
+    ],
+    "raised_hand": [
+      "hand"
+    ],
+    "vulcan_salute": [
+      "vulcan",
+      "raised_hand_with_part_between_middle_and_ring_fingers"
+    ],
+    "policeman": [
+      "cop"
+    ],
+    "running_man": [
+      "runner"
+    ],
+    "walking_man": [
+      "walking"
+    ],
+    "bowing_man": [
+      "bow"
+    ],
+    "no_good_woman": [
+      "no_good"
+    ],
+    "raising_hand_woman": [
+      "raising_hand"
+    ],
+    "pouting_woman": [
+      "person_with_pouting_face"
+    ],
+    "frowning_woman": [
+      "person_frowning"
+    ],
+    "haircut_woman": [
+      "haircut"
+    ],
+    "massage_woman": [
+      "massage"
+    ],
+    "tshirt": [
+      "shirt"
+    ],
+    "biking_man": [
+      "bicyclist"
+    ],
+    "mountain_biking_man": [
+      "mountain_bicyclist"
+    ],
+    "passenger_ship": [
+      "cruise_ship"
+    ],
+    "motor_boat": [
+      "motorboat",
+      "boat"
+    ],
+    "flight_arrival": [
+      "airplane_arriving"
+    ],
+    "flight_departure": [
+      "airplane_departure"
+    ],
+    "small_airplane": [
+      "airplane_small"
+    ],
+    "racing_car": [
+      "race_car"
+    ],
+    "family_man_woman_boy_boy": [
+      "family_man_woman_boys"
+    ],
+    "family_man_woman_girl_girl": [
+      "family_man_woman_girls"
+    ],
+    "family_woman_woman_boy": [
+      "family_women_boy"
+    ],
+    "family_woman_woman_girl": [
+      "family_women_girl"
+    ],
+    "family_woman_woman_girl_boy": [
+      "family_women_girl_boy"
+    ],
+    "family_woman_woman_boy_boy": [
+      "family_women_boys"
+    ],
+    "family_woman_woman_girl_girl": [
+      "family_women_girls"
+    ],
+    "family_man_man_boy": [
+      "family_men_boy"
+    ],
+    "family_man_man_girl": [
+      "family_men_girl"
+    ],
+    "family_man_man_girl_boy": [
+      "family_men_girl_boy"
+    ],
+    "family_man_man_boy_boy": [
+      "family_men_boys"
+    ],
+    "family_man_man_girl_girl": [
+      "family_men_girls"
+    ],
+    "cloud_with_lightning": [
+      "cloud_lightning"
+    ],
+    "tornado": [
+      "cloud_tornado",
+      "cloud_with_tornado"
+    ],
+    "cloud_with_rain": [
+      "cloud_rain"
+    ],
+    "cloud_with_snow": [
+      "cloud_snow"
+    ],
+    "asterisk": [
+      "keycap_star"
+    ],
+    "studio_microphone": [
+      "microphone2"
+    ],
+    "medal_military": [
+      "military_medal"
+    ],
+    "couple_with_heart_woman_woman": [
+      "female_couple_with_heart"
+    ],
+    "couple_with_heart_man_man": [
+      "male_couple_with_heart"
+    ],
+    "couplekiss_woman_woman": [
+      "female_couplekiss"
+    ],
+    "couplekiss_man_man": [
+      "male_couplekiss"
+    ],
+    "honeybee": [
+      "bee"
+    ],
+    "lion": [
+      "lion_face"
+    ],
+    "artificial_satellite": [
+      "satellite_orbital"
+    ],
+    "computer_mouse": [
+      "mouse_three_button",
+      "three_button_mouse"
+    ],
+    "hocho": [
+      "knife"
+    ],
+    "swimming_man": [
+      "swimmer"
+    ],
+    "wind_face": [
+      "wind_blowing_face"
+    ],
+    "golfing_man": [
+      "golfer"
+    ],
+    "facepunch": [
+      "punch"
+    ],
+    "building_construction": [
+      "construction_site"
+    ],
+    "family_man_woman_girl_boy": [
+      "family"
+    ],
+    "ice_hockey": [
+      "hockey"
+    ],
+    "snowman_with_snow": [
+      "snowman2"
+    ],
+    "play_or_pause_button": [
+      "play_pause"
+    ],
+    "film_projector": [
+      "projector"
+    ],
+    "shopping": [
+      "shopping_bags"
+    ],
+    "open_book": [
+      "book"
+    ],
+    "national_park": [
+      "park"
+    ],
+    "world_map": [
+      "map"
+    ],
+    "pen": [
+      "pen_ballpoint",
+      "lower_left_ballpoint_pen"
+    ],
+    "email": [
+      "envelope",
+      "e-mail"
+    ],
+    "phone": [
+      "telephone"
+    ],
+    "atom_symbol": [
+      "atom"
+    ],
+    "mantelpiece_clock": [
+      "clock"
+    ],
+    "camera_flash": [
+      "camera_with_flash"
+    ],
+    "film_strip": [
+      "film_frames"
+    ],
+    "balance_scale": [
+      "scales"
+    ],
+    "surfing_man": [
+      "surfer"
+    ],
+    "couplekiss_man_woman": [
+      "couplekiss"
+    ],
+    "couple_with_heart_woman_man": [
+      "couple_with_heart"
+    ],
+    "clamp": [
+      "compression"
+    ],
+    "dancing_women": [
+      "dancers"
+    ],
+    "blonde_man": [
+      "person_with_blond_hair"
+    ],
+    "sleeping_bed": [
+      "sleeping_accommodation"
+    ],
+    "om": [
+      "om_symbol"
+    ],
+    "tipping_hand_woman": [
+      "information_desk_person"
+    ],
+    "rowing_man": [
+      "rowboat"
+    ],
+    "new_moon": [
+      "moon"
+    ],
+    "oncoming_automobile": [
+      "car",
+      "automobile"
+    ],
+    "fleur_de_lis": [
+      "fleur-de-lis"
     ]
   }
 }
\ No newline at end of file
diff --git a/lib/emoji/groups.json b/lib/emoji/groups.json
new file mode 100644
index 00000000000..7d1e3a0a56e
--- /dev/null
+++ b/lib/emoji/groups.json
@@ -0,0 +1,6047 @@
+[
+  {
+    "name": "people",
+    "fullname": "People",
+    "tabicon": "grinning",
+    "icons": [
+      {
+        "name": "grinning",
+        "diversity": false
+      },
+      {
+        "name": "grin",
+        "diversity": false
+      },
+      {
+        "name": "joy",
+        "diversity": false
+      },
+      {
+        "name": "rofl",
+        "diversity": false
+      },
+      {
+        "name": "smiley",
+        "diversity": false
+      },
+      {
+        "name": "smile",
+        "diversity": false
+      },
+      {
+        "name": "sweat_smile",
+        "diversity": false
+      },
+      {
+        "name": "laughing",
+        "diversity": false
+      },
+      {
+        "name": "wink",
+        "diversity": false
+      },
+      {
+        "name": "blush",
+        "diversity": false
+      },
+      {
+        "name": "yum",
+        "diversity": false
+      },
+      {
+        "name": "sunglasses",
+        "diversity": false
+      },
+      {
+        "name": "heart_eyes",
+        "diversity": false
+      },
+      {
+        "name": "kissing_heart",
+        "diversity": false
+      },
+      {
+        "name": "kissing",
+        "diversity": false
+      },
+      {
+        "name": "kissing_smiling_eyes",
+        "diversity": false
+      },
+      {
+        "name": "kissing_closed_eyes",
+        "diversity": false
+      },
+      {
+        "name": "relaxed",
+        "diversity": false
+      },
+      {
+        "name": "slightly_smiling_face",
+        "diversity": false
+      },
+      {
+        "name": "hugs",
+        "diversity": false
+      },
+      {
+        "name": "star_struck",
+        "diversity": false
+      },
+      {
+        "name": "thinking",
+        "diversity": false
+      },
+      {
+        "name": "face_with_raised_eyebrow",
+        "diversity": false
+      },
+      {
+        "name": "neutral_face",
+        "diversity": false
+      },
+      {
+        "name": "expressionless",
+        "diversity": false
+      },
+      {
+        "name": "no_mouth",
+        "diversity": false
+      },
+      {
+        "name": "roll_eyes",
+        "diversity": false
+      },
+      {
+        "name": "smirk",
+        "diversity": false
+      },
+      {
+        "name": "persevere",
+        "diversity": false
+      },
+      {
+        "name": "disappointed_relieved",
+        "diversity": false
+      },
+      {
+        "name": "open_mouth",
+        "diversity": false
+      },
+      {
+        "name": "zipper_mouth_face",
+        "diversity": false
+      },
+      {
+        "name": "hushed",
+        "diversity": false
+      },
+      {
+        "name": "sleepy",
+        "diversity": false
+      },
+      {
+        "name": "tired_face",
+        "diversity": false
+      },
+      {
+        "name": "sleeping",
+        "diversity": false
+      },
+      {
+        "name": "relieved",
+        "diversity": false
+      },
+      {
+        "name": "stuck_out_tongue",
+        "diversity": false
+      },
+      {
+        "name": "stuck_out_tongue_winking_eye",
+        "diversity": false
+      },
+      {
+        "name": "stuck_out_tongue_closed_eyes",
+        "diversity": false
+      },
+      {
+        "name": "drooling_face",
+        "diversity": false
+      },
+      {
+        "name": "unamused",
+        "diversity": false
+      },
+      {
+        "name": "sweat",
+        "diversity": false
+      },
+      {
+        "name": "pensive",
+        "diversity": false
+      },
+      {
+        "name": "confused",
+        "diversity": false
+      },
+      {
+        "name": "upside_down_face",
+        "diversity": false
+      },
+      {
+        "name": "money_mouth_face",
+        "diversity": false
+      },
+      {
+        "name": "astonished",
+        "diversity": false
+      },
+      {
+        "name": "frowning_face",
+        "diversity": false
+      },
+      {
+        "name": "slightly_frowning_face",
+        "diversity": false
+      },
+      {
+        "name": "confounded",
+        "diversity": false
+      },
+      {
+        "name": "disappointed",
+        "diversity": false
+      },
+      {
+        "name": "worried",
+        "diversity": false
+      },
+      {
+        "name": "triumph",
+        "diversity": false
+      },
+      {
+        "name": "cry",
+        "diversity": false
+      },
+      {
+        "name": "sob",
+        "diversity": false
+      },
+      {
+        "name": "frowning",
+        "diversity": false
+      },
+      {
+        "name": "anguished",
+        "diversity": false
+      },
+      {
+        "name": "fearful",
+        "diversity": false
+      },
+      {
+        "name": "weary",
+        "diversity": false
+      },
+      {
+        "name": "exploding_head",
+        "diversity": false
+      },
+      {
+        "name": "grimacing",
+        "diversity": false
+      },
+      {
+        "name": "cold_sweat",
+        "diversity": false
+      },
+      {
+        "name": "scream",
+        "diversity": false
+      },
+      {
+        "name": "flushed",
+        "diversity": false
+      },
+      {
+        "name": "crazy_face",
+        "diversity": false
+      },
+      {
+        "name": "dizzy_face",
+        "diversity": false
+      },
+      {
+        "name": "rage",
+        "diversity": false
+      },
+      {
+        "name": "angry",
+        "diversity": false
+      },
+      {
+        "name": "face_with_symbols_over_mouth",
+        "diversity": false
+      },
+      {
+        "name": "mask",
+        "diversity": false
+      },
+      {
+        "name": "face_with_thermometer",
+        "diversity": false
+      },
+      {
+        "name": "face_with_head_bandage",
+        "diversity": false
+      },
+      {
+        "name": "nauseated_face",
+        "diversity": false
+      },
+      {
+        "name": "face_vomiting",
+        "diversity": false
+      },
+      {
+        "name": "sneezing_face",
+        "diversity": false
+      },
+      {
+        "name": "innocent",
+        "diversity": false
+      },
+      {
+        "name": "cowboy_hat_face",
+        "diversity": false
+      },
+      {
+        "name": "clown_face",
+        "diversity": false
+      },
+      {
+        "name": "lying_face",
+        "diversity": false
+      },
+      {
+        "name": "sushing_face",
+        "diversity": false
+      },
+      {
+        "name": "face_with_hand_over_mouth",
+        "diversity": false
+      },
+      {
+        "name": "face_with_monocle",
+        "diversity": false
+      },
+      {
+        "name": "nerd_face",
+        "diversity": false
+      },
+      {
+        "name": "smiling_imp",
+        "diversity": false
+      },
+      {
+        "name": "imp",
+        "diversity": false
+      },
+      {
+        "name": "japanese_ogre",
+        "diversity": false
+      },
+      {
+        "name": "japanese_goblin",
+        "diversity": false
+      },
+      {
+        "name": "skull",
+        "diversity": false
+      },
+      {
+        "name": "skull_and_crossbones",
+        "diversity": false
+      },
+      {
+        "name": "ghost",
+        "diversity": false
+      },
+      {
+        "name": "alien",
+        "diversity": false
+      },
+      {
+        "name": "space_invader",
+        "diversity": false
+      },
+      {
+        "name": "robot",
+        "diversity": false
+      },
+      {
+        "name": "poop",
+        "diversity": false
+      },
+      {
+        "name": "smiley_cat",
+        "diversity": false
+      },
+      {
+        "name": "smile_cat",
+        "diversity": false
+      },
+      {
+        "name": "joy_cat",
+        "diversity": false
+      },
+      {
+        "name": "heart_eyes_cat",
+        "diversity": false
+      },
+      {
+        "name": "smirk_cat",
+        "diversity": false
+      },
+      {
+        "name": "kissing_cat",
+        "diversity": false
+      },
+      {
+        "name": "scream_cat",
+        "diversity": false
+      },
+      {
+        "name": "crying_cat_face",
+        "diversity": false
+      },
+      {
+        "name": "pouting_cat",
+        "diversity": false
+      },
+      {
+        "name": "see_no_evil",
+        "diversity": false
+      },
+      {
+        "name": "hear_no_evil",
+        "diversity": false
+      },
+      {
+        "name": "speak_no_evil",
+        "diversity": false
+      },
+      {
+        "name": "baby",
+        "diversity": true
+      },
+      {
+        "name": "child",
+        "diversity": false
+      },
+      {
+        "name": "boy",
+        "diversity": true
+      },
+      {
+        "name": "girl",
+        "diversity": true
+      },
+      {
+        "name": "adult",
+        "diversity": false
+      },
+      {
+        "name": "man",
+        "diversity": true
+      },
+      {
+        "name": "woman",
+        "diversity": true
+      },
+      {
+        "name": "older_adult",
+        "diversity": false
+      },
+      {
+        "name": "older_man",
+        "diversity": true
+      },
+      {
+        "name": "older_woman",
+        "diversity": true
+      },
+      {
+        "name": "man_health_worker",
+        "diversity": true
+      },
+      {
+        "name": "woman_health_worker",
+        "diversity": true
+      },
+      {
+        "name": "man_student",
+        "diversity": true
+      },
+      {
+        "name": "woman_student",
+        "diversity": true
+      },
+      {
+        "name": "man_teacher",
+        "diversity": true
+      },
+      {
+        "name": "woman_teacher",
+        "diversity": true
+      },
+      {
+        "name": "man_judge",
+        "diversity": true
+      },
+      {
+        "name": "woman_judge",
+        "diversity": true
+      },
+      {
+        "name": "man_farmer",
+        "diversity": true
+      },
+      {
+        "name": "woman_farmer",
+        "diversity": true
+      },
+      {
+        "name": "man_cook",
+        "diversity": true
+      },
+      {
+        "name": "woman_cook",
+        "diversity": true
+      },
+      {
+        "name": "man_mechanic",
+        "diversity": true
+      },
+      {
+        "name": "woman_mechanic",
+        "diversity": true
+      },
+      {
+        "name": "man_factory_worker",
+        "diversity": true
+      },
+      {
+        "name": "woman_factory_worker",
+        "diversity": true
+      },
+      {
+        "name": "man_office_worker",
+        "diversity": true
+      },
+      {
+        "name": "woman_office_worker",
+        "diversity": true
+      },
+      {
+        "name": "man_scientist",
+        "diversity": true
+      },
+      {
+        "name": "woman_scientist",
+        "diversity": true
+      },
+      {
+        "name": "man_technologist",
+        "diversity": true
+      },
+      {
+        "name": "woman_technologist",
+        "diversity": true
+      },
+      {
+        "name": "man_singer",
+        "diversity": true
+      },
+      {
+        "name": "woman_singer",
+        "diversity": true
+      },
+      {
+        "name": "man_artist",
+        "diversity": true
+      },
+      {
+        "name": "woman_artist",
+        "diversity": true
+      },
+      {
+        "name": "man_pilot",
+        "diversity": true
+      },
+      {
+        "name": "woman_pilot",
+        "diversity": true
+      },
+      {
+        "name": "man_astronaut",
+        "diversity": true
+      },
+      {
+        "name": "woman_astronaut",
+        "diversity": true
+      },
+      {
+        "name": "man_firefighter",
+        "diversity": true
+      },
+      {
+        "name": "woman_firefighter",
+        "diversity": true
+      },
+      {
+        "name": "policeman",
+        "diversity": true
+      },
+      {
+        "name": "policewoman",
+        "diversity": true
+      },
+      {
+        "name": "male_detective",
+        "diversity": true
+      },
+      {
+        "name": "female_detective",
+        "diversity": false
+      },
+      {
+        "name": "guardsman",
+        "diversity": true
+      },
+      {
+        "name": "guardswoman",
+        "diversity": true
+      },
+      {
+        "name": "construction_worker_man",
+        "diversity": true
+      },
+      {
+        "name": "construction_worker_woman",
+        "diversity": true
+      },
+      {
+        "name": "prince",
+        "diversity": true
+      },
+      {
+        "name": "princess",
+        "diversity": true
+      },
+      {
+        "name": "man_with_turban",
+        "diversity": true
+      },
+      {
+        "name": "woman_with_turban",
+        "diversity": true
+      },
+      {
+        "name": "man_with_gua_pi_mao",
+        "diversity": true
+      },
+      {
+        "name": "woman_with_headscarf",
+        "diversity": false
+      },
+      {
+        "name": "bearded_person",
+        "diversity": false
+      },
+      {
+        "name": "blonde_man",
+        "diversity": true
+      },
+      {
+        "name": "blonde_woman",
+        "diversity": true
+      },
+      {
+        "name": "man_in_tuxedo",
+        "diversity": true
+      },
+      {
+        "name": "bride_with_veil",
+        "diversity": true
+      },
+      {
+        "name": "pregnant_woman",
+        "diversity": true
+      },
+      {
+        "name": "breast_feeding",
+        "diversity": false
+      },
+      {
+        "name": "angel",
+        "diversity": true
+      },
+      {
+        "name": "santa",
+        "diversity": true
+      },
+      {
+        "name": "mrs_claus",
+        "diversity": true
+      },
+      {
+        "name": "mage",
+        "diversity": false
+      },
+      {
+        "name": "fairy",
+        "diversity": false
+      },
+      {
+        "name": "vampire",
+        "diversity": false
+      },
+      {
+        "name": "merperson",
+        "diversity": false
+      },
+      {
+        "name": "elf",
+        "diversity": false
+      },
+      {
+        "name": "genie",
+        "diversity": false
+      },
+      {
+        "name": "zombie",
+        "diversity": false
+      },
+      {
+        "name": "frowning_woman",
+        "diversity": true
+      },
+      {
+        "name": "frowning_man",
+        "diversity": true
+      },
+      {
+        "name": "pouting_woman",
+        "diversity": true
+      },
+      {
+        "name": "pouting_man",
+        "diversity": true
+      },
+      {
+        "name": "no_good_woman",
+        "diversity": true
+      },
+      {
+        "name": "no_good_man",
+        "diversity": true
+      },
+      {
+        "name": "ok_woman",
+        "diversity": true
+      },
+      {
+        "name": "ok_man",
+        "diversity": true
+      },
+      {
+        "name": "tipping_hand_woman",
+        "diversity": true
+      },
+      {
+        "name": "tipping_hand_man",
+        "diversity": true
+      },
+      {
+        "name": "raising_hand_woman",
+        "diversity": true
+      },
+      {
+        "name": "raising_hand_man",
+        "diversity": true
+      },
+      {
+        "name": "bowing_man",
+        "diversity": true
+      },
+      {
+        "name": "bowing_woman",
+        "diversity": true
+      },
+      {
+        "name": "man_facepalming",
+        "diversity": true
+      },
+      {
+        "name": "woman_facepalming",
+        "diversity": true
+      },
+      {
+        "name": "man_shrugging",
+        "diversity": true
+      },
+      {
+        "name": "woman_shrugging",
+        "diversity": true
+      },
+      {
+        "name": "couple",
+        "diversity": false
+      },
+      {
+        "name": "two_men_holding_hands",
+        "diversity": false
+      },
+      {
+        "name": "two_women_holding_hands",
+        "diversity": false
+      },
+      {
+        "name": "couplekiss_man_woman",
+        "diversity": false
+      },
+      {
+        "name": "couplekiss_man_man",
+        "diversity": false
+      },
+      {
+        "name": "couplekiss_woman_woman",
+        "diversity": false
+      },
+      {
+        "name": "couple_with_heart_woman_man",
+        "diversity": false
+      },
+      {
+        "name": "couple_with_heart_man_man",
+        "diversity": false
+      },
+      {
+        "name": "couple_with_heart_woman_woman",
+        "diversity": false
+      },
+      {
+        "name": "family_man_woman_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_woman_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_man_woman_girl_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_woman_boy_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_woman_girl_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_man_man_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_man_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_man_man_girl_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_man_boy_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_man_girl_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_woman_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_woman_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_woman_girl_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_woman_boy_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_woman_girl_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_man_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_boy_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_man_girl_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_girl_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_boy_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_girl_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_girl_girl",
+        "diversity": false
+      },
+      {
+        "name": "selfie",
+        "diversity": true
+      },
+      {
+        "name": "muscle",
+        "diversity": true
+      },
+      {
+        "name": "point_left",
+        "diversity": true
+      },
+      {
+        "name": "point_right",
+        "diversity": true
+      },
+      {
+        "name": "point_up",
+        "diversity": true
+      },
+      {
+        "name": "point_up_2",
+        "diversity": true
+      },
+      {
+        "name": "fu",
+        "diversity": true
+      },
+      {
+        "name": "point_down",
+        "diversity": true
+      },
+      {
+        "name": "v",
+        "diversity": true
+      },
+      {
+        "name": "crossed_fingers",
+        "diversity": true
+      },
+      {
+        "name": "vulcan_salute",
+        "diversity": true
+      },
+      {
+        "name": "metal",
+        "diversity": true
+      },
+      {
+        "name": "call_me_hand",
+        "diversity": true
+      },
+      {
+        "name": "raised_hand_with_fingers_splayed",
+        "diversity": true
+      },
+      {
+        "name": "raised_hand",
+        "diversity": true
+      },
+      {
+        "name": "ok_hand",
+        "diversity": true
+      },
+      {
+        "name": "+1",
+        "diversity": true
+      },
+      {
+        "name": "-1",
+        "diversity": true
+      },
+      {
+        "name": "fist",
+        "diversity": true
+      },
+      {
+        "name": "facepunch",
+        "diversity": true
+      },
+      {
+        "name": "fist_left",
+        "diversity": true
+      },
+      {
+        "name": "fist_right",
+        "diversity": true
+      },
+      {
+        "name": "raised_back_of_hand",
+        "diversity": true
+      },
+      {
+        "name": "wave",
+        "diversity": true
+      },
+      {
+        "name": "love_you_gesture",
+        "diversity": false
+      },
+      {
+        "name": "writing_hand",
+        "diversity": true
+      },
+      {
+        "name": "clap",
+        "diversity": true
+      },
+      {
+        "name": "open_hands",
+        "diversity": true
+      },
+      {
+        "name": "raised_hands",
+        "diversity": true
+      },
+      {
+        "name": "palms_up_together",
+        "diversity": false
+      },
+      {
+        "name": "pray",
+        "diversity": true
+      },
+      {
+        "name": "handshake",
+        "diversity": false
+      },
+      {
+        "name": "nail_care",
+        "diversity": true
+      },
+      {
+        "name": "ear",
+        "diversity": true
+      },
+      {
+        "name": "nose",
+        "diversity": true
+      },
+      {
+        "name": "footprints",
+        "diversity": false
+      },
+      {
+        "name": "eyes",
+        "diversity": false
+      },
+      {
+        "name": "eye",
+        "diversity": false
+      },
+      {
+        "name": "brain",
+        "diversity": false
+      },
+      {
+        "name": "tongue",
+        "diversity": false
+      },
+      {
+        "name": "lips",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "nature",
+    "fullname": "Nature",
+    "tabicon": "evergreen_tree",
+    "icons": [
+      {
+        "name": "monkey_face",
+        "diversity": false
+      },
+      {
+        "name": "monkey",
+        "diversity": false
+      },
+      {
+        "name": "gorilla",
+        "diversity": false
+      },
+      {
+        "name": "dog",
+        "diversity": false
+      },
+      {
+        "name": "dog2",
+        "diversity": false
+      },
+      {
+        "name": "poodle",
+        "diversity": false
+      },
+      {
+        "name": "wolf",
+        "diversity": false
+      },
+      {
+        "name": "fox_face",
+        "diversity": false
+      },
+      {
+        "name": "cat",
+        "diversity": false
+      },
+      {
+        "name": "cat2",
+        "diversity": false
+      },
+      {
+        "name": "lion",
+        "diversity": false
+      },
+      {
+        "name": "tiger",
+        "diversity": false
+      },
+      {
+        "name": "tiger2",
+        "diversity": false
+      },
+      {
+        "name": "leopard",
+        "diversity": false
+      },
+      {
+        "name": "horse",
+        "diversity": false
+      },
+      {
+        "name": "racehorse",
+        "diversity": false
+      },
+      {
+        "name": "unicorn",
+        "diversity": false
+      },
+      {
+        "name": "zebra",
+        "diversity": false
+      },
+      {
+        "name": "deer",
+        "diversity": false
+      },
+      {
+        "name": "cow",
+        "diversity": false
+      },
+      {
+        "name": "ox",
+        "diversity": false
+      },
+      {
+        "name": "water_buffalo",
+        "diversity": false
+      },
+      {
+        "name": "cow2",
+        "diversity": false
+      },
+      {
+        "name": "pig",
+        "diversity": false
+      },
+      {
+        "name": "pig2",
+        "diversity": false
+      },
+      {
+        "name": "boar",
+        "diversity": false
+      },
+      {
+        "name": "pig_nose",
+        "diversity": false
+      },
+      {
+        "name": "ram",
+        "diversity": false
+      },
+      {
+        "name": "sheep",
+        "diversity": false
+      },
+      {
+        "name": "goat",
+        "diversity": false
+      },
+      {
+        "name": "dromedary_camel",
+        "diversity": false
+      },
+      {
+        "name": "camel",
+        "diversity": false
+      },
+      {
+        "name": "giraffe",
+        "diversity": false
+      },
+      {
+        "name": "elephant",
+        "diversity": false
+      },
+      {
+        "name": "rhinoceros",
+        "diversity": false
+      },
+      {
+        "name": "mouse",
+        "diversity": false
+      },
+      {
+        "name": "mouse2",
+        "diversity": false
+      },
+      {
+        "name": "rat",
+        "diversity": false
+      },
+      {
+        "name": "hamster",
+        "diversity": false
+      },
+      {
+        "name": "rabbit",
+        "diversity": false
+      },
+      {
+        "name": "rabbit2",
+        "diversity": false
+      },
+      {
+        "name": "chipmunk",
+        "diversity": false
+      },
+      {
+        "name": "hedgehog",
+        "diversity": false
+      },
+      {
+        "name": "bat",
+        "diversity": false
+      },
+      {
+        "name": "bear",
+        "diversity": false
+      },
+      {
+        "name": "koala",
+        "diversity": false
+      },
+      {
+        "name": "panda_face",
+        "diversity": false
+      },
+      {
+        "name": "paw_prints",
+        "diversity": false
+      },
+      {
+        "name": "turkey",
+        "diversity": false
+      },
+      {
+        "name": "chicken",
+        "diversity": false
+      },
+      {
+        "name": "rooster",
+        "diversity": false
+      },
+      {
+        "name": "hatching_chick",
+        "diversity": false
+      },
+      {
+        "name": "baby_chick",
+        "diversity": false
+      },
+      {
+        "name": "hatched_chick",
+        "diversity": false
+      },
+      {
+        "name": "bird",
+        "diversity": false
+      },
+      {
+        "name": "penguin",
+        "diversity": false
+      },
+      {
+        "name": "dove",
+        "diversity": false
+      },
+      {
+        "name": "eagle",
+        "diversity": false
+      },
+      {
+        "name": "duck",
+        "diversity": false
+      },
+      {
+        "name": "owl",
+        "diversity": false
+      },
+      {
+        "name": "frog",
+        "diversity": false
+      },
+      {
+        "name": "crocodile",
+        "diversity": false
+      },
+      {
+        "name": "turtle",
+        "diversity": false
+      },
+      {
+        "name": "lizard",
+        "diversity": false
+      },
+      {
+        "name": "snake",
+        "diversity": false
+      },
+      {
+        "name": "dragon_face",
+        "diversity": false
+      },
+      {
+        "name": "dragon",
+        "diversity": false
+      },
+      {
+        "name": "sauropod",
+        "diversity": false
+      },
+      {
+        "name": "t_rex",
+        "diversity": false
+      },
+      {
+        "name": "whale",
+        "diversity": false
+      },
+      {
+        "name": "whale2",
+        "diversity": false
+      },
+      {
+        "name": "dolphin",
+        "diversity": false
+      },
+      {
+        "name": "fish",
+        "diversity": false
+      },
+      {
+        "name": "tropical_fish",
+        "diversity": false
+      },
+      {
+        "name": "blowfish",
+        "diversity": false
+      },
+      {
+        "name": "shark",
+        "diversity": false
+      },
+      {
+        "name": "octopus",
+        "diversity": false
+      },
+      {
+        "name": "shell",
+        "diversity": false
+      },
+      {
+        "name": "crab",
+        "diversity": false
+      },
+      {
+        "name": "shrimp",
+        "diversity": false
+      },
+      {
+        "name": "squid",
+        "diversity": false
+      },
+      {
+        "name": "snail",
+        "diversity": false
+      },
+      {
+        "name": "butterfly",
+        "diversity": false
+      },
+      {
+        "name": "bug",
+        "diversity": false
+      },
+      {
+        "name": "ant",
+        "diversity": false
+      },
+      {
+        "name": "honeybee",
+        "diversity": false
+      },
+      {
+        "name": "beetle",
+        "diversity": false
+      },
+      {
+        "name": "cricket",
+        "diversity": false
+      },
+      {
+        "name": "spider",
+        "diversity": false
+      },
+      {
+        "name": "spider_web",
+        "diversity": false
+      },
+      {
+        "name": "scorpion",
+        "diversity": false
+      },
+      {
+        "name": "bouquet",
+        "diversity": false
+      },
+      {
+        "name": "cherry_blossom",
+        "diversity": false
+      },
+      {
+        "name": "white_flower",
+        "diversity": false
+      },
+      {
+        "name": "rosette",
+        "diversity": false
+      },
+      {
+        "name": "rose",
+        "diversity": false
+      },
+      {
+        "name": "wilted_flower",
+        "diversity": false
+      },
+      {
+        "name": "hibiscus",
+        "diversity": false
+      },
+      {
+        "name": "sunflower",
+        "diversity": false
+      },
+      {
+        "name": "blossom",
+        "diversity": false
+      },
+      {
+        "name": "tulip",
+        "diversity": false
+      },
+      {
+        "name": "seedling",
+        "diversity": false
+      },
+      {
+        "name": "evergreen_tree",
+        "diversity": false
+      },
+      {
+        "name": "deciduous_tree",
+        "diversity": false
+      },
+      {
+        "name": "palm_tree",
+        "diversity": false
+      },
+      {
+        "name": "cactus",
+        "diversity": false
+      },
+      {
+        "name": "ear_of_rice",
+        "diversity": false
+      },
+      {
+        "name": "herb",
+        "diversity": false
+      },
+      {
+        "name": "shamrock",
+        "diversity": false
+      },
+      {
+        "name": "four_leaf_clover",
+        "diversity": false
+      },
+      {
+        "name": "maple_leaf",
+        "diversity": false
+      },
+      {
+        "name": "fallen_leaf",
+        "diversity": false
+      },
+      {
+        "name": "leaves",
+        "diversity": false
+      },
+      {
+        "name": "new_moon",
+        "diversity": false
+      },
+      {
+        "name": "waxing_crescent_moon",
+        "diversity": false
+      },
+      {
+        "name": "first_quarter_moon",
+        "diversity": false
+      },
+      {
+        "name": "waxing_gibbous_moon",
+        "diversity": false
+      },
+      {
+        "name": "full_moon",
+        "diversity": false
+      },
+      {
+        "name": "waning_gibbous_moon",
+        "diversity": false
+      },
+      {
+        "name": "last_quarter_moon",
+        "diversity": false
+      },
+      {
+        "name": "waning_crescent_moon",
+        "diversity": false
+      },
+      {
+        "name": "crescent_moon",
+        "diversity": false
+      },
+      {
+        "name": "new_moon_with_face",
+        "diversity": false
+      },
+      {
+        "name": "first_quarter_moon_with_face",
+        "diversity": false
+      },
+      {
+        "name": "last_quarter_moon_with_face",
+        "diversity": false
+      },
+      {
+        "name": "thermometer",
+        "diversity": false
+      },
+      {
+        "name": "sunny",
+        "diversity": false
+      },
+      {
+        "name": "full_moon_with_face",
+        "diversity": false
+      },
+      {
+        "name": "sun_with_face",
+        "diversity": false
+      },
+      {
+        "name": "star",
+        "diversity": false
+      },
+      {
+        "name": "star2",
+        "diversity": false
+      },
+      {
+        "name": "stars",
+        "diversity": false
+      },
+      {
+        "name": "cloud",
+        "diversity": false
+      },
+      {
+        "name": "partly_sunny",
+        "diversity": false
+      },
+      {
+        "name": "cloud_with_lightning_and_rain",
+        "diversity": false
+      },
+      {
+        "name": "sun_behind_small_cloud",
+        "diversity": false
+      },
+      {
+        "name": "sun_behind_large_cloud",
+        "diversity": false
+      },
+      {
+        "name": "sun_behind_rain_cloud",
+        "diversity": false
+      },
+      {
+        "name": "cloud_with_rain",
+        "diversity": false
+      },
+      {
+        "name": "cloud_with_snow",
+        "diversity": false
+      },
+      {
+        "name": "cloud_with_lightning",
+        "diversity": false
+      },
+      {
+        "name": "tornado",
+        "diversity": false
+      },
+      {
+        "name": "fog",
+        "diversity": false
+      },
+      {
+        "name": "wind_face",
+        "diversity": false
+      },
+      {
+        "name": "cyclone",
+        "diversity": false
+      },
+      {
+        "name": "rainbow",
+        "diversity": false
+      },
+      {
+        "name": "closed_umbrella",
+        "diversity": false
+      },
+      {
+        "name": "open_umbrella",
+        "diversity": false
+      },
+      {
+        "name": "umbrella",
+        "diversity": false
+      },
+      {
+        "name": "parasol_on_ground",
+        "diversity": false
+      },
+      {
+        "name": "zap",
+        "diversity": false
+      },
+      {
+        "name": "snowflake",
+        "diversity": false
+      },
+      {
+        "name": "snowman_with_snow",
+        "diversity": false
+      },
+      {
+        "name": "snowman",
+        "diversity": false
+      },
+      {
+        "name": "comet",
+        "diversity": false
+      },
+      {
+        "name": "fire",
+        "diversity": false
+      },
+      {
+        "name": "droplet",
+        "diversity": false
+      },
+      {
+        "name": "ocean",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "food",
+    "fullname": "Food & Drink",
+    "tabicon": "hamburger",
+    "icons": [
+      {
+        "name": "grapes",
+        "diversity": false
+      },
+      {
+        "name": "melon",
+        "diversity": false
+      },
+      {
+        "name": "watermelon",
+        "diversity": false
+      },
+      {
+        "name": "tangerine",
+        "diversity": false
+      },
+      {
+        "name": "lemon",
+        "diversity": false
+      },
+      {
+        "name": "banana",
+        "diversity": false
+      },
+      {
+        "name": "pineapple",
+        "diversity": false
+      },
+      {
+        "name": "apple",
+        "diversity": false
+      },
+      {
+        "name": "green_apple",
+        "diversity": false
+      },
+      {
+        "name": "pear",
+        "diversity": false
+      },
+      {
+        "name": "peach",
+        "diversity": false
+      },
+      {
+        "name": "cherries",
+        "diversity": false
+      },
+      {
+        "name": "strawberry",
+        "diversity": false
+      },
+      {
+        "name": "kiwi_fruit",
+        "diversity": false
+      },
+      {
+        "name": "tomato",
+        "diversity": false
+      },
+      {
+        "name": "coconut",
+        "diversity": false
+      },
+      {
+        "name": "avocado",
+        "diversity": false
+      },
+      {
+        "name": "eggplant",
+        "diversity": false
+      },
+      {
+        "name": "potato",
+        "diversity": false
+      },
+      {
+        "name": "carrot",
+        "diversity": false
+      },
+      {
+        "name": "corn",
+        "diversity": false
+      },
+      {
+        "name": "hot_pepper",
+        "diversity": false
+      },
+      {
+        "name": "cucumber",
+        "diversity": false
+      },
+      {
+        "name": "broccoli",
+        "diversity": false
+      },
+      {
+        "name": "mushroom",
+        "diversity": false
+      },
+      {
+        "name": "peanuts",
+        "diversity": false
+      },
+      {
+        "name": "chestnut",
+        "diversity": false
+      },
+      {
+        "name": "bread",
+        "diversity": false
+      },
+      {
+        "name": "croissant",
+        "diversity": false
+      },
+      {
+        "name": "baguette_bread",
+        "diversity": false
+      },
+      {
+        "name": "pretzel",
+        "diversity": false
+      },
+      {
+        "name": "pancakes",
+        "diversity": false
+      },
+      {
+        "name": "cheese",
+        "diversity": false
+      },
+      {
+        "name": "meat_on_bone",
+        "diversity": false
+      },
+      {
+        "name": "poultry_leg",
+        "diversity": false
+      },
+      {
+        "name": "cut_of_meat",
+        "diversity": false
+      },
+      {
+        "name": "bacon",
+        "diversity": false
+      },
+      {
+        "name": "hamburger",
+        "diversity": false
+      },
+      {
+        "name": "fries",
+        "diversity": false
+      },
+      {
+        "name": "pizza",
+        "diversity": false
+      },
+      {
+        "name": "hotdog",
+        "diversity": false
+      },
+      {
+        "name": "sandwich",
+        "diversity": false
+      },
+      {
+        "name": "taco",
+        "diversity": false
+      },
+      {
+        "name": "burrito",
+        "diversity": false
+      },
+      {
+        "name": "stuffed_flatbread",
+        "diversity": false
+      },
+      {
+        "name": "egg",
+        "diversity": false
+      },
+      {
+        "name": "fried_egg",
+        "diversity": false
+      },
+      {
+        "name": "shallow_pan_of_food",
+        "diversity": false
+      },
+      {
+        "name": "stew",
+        "diversity": false
+      },
+      {
+        "name": "bowl_with_spoon",
+        "diversity": false
+      },
+      {
+        "name": "green_salad",
+        "diversity": false
+      },
+      {
+        "name": "popcorn",
+        "diversity": false
+      },
+      {
+        "name": "canned_food",
+        "diversity": false
+      },
+      {
+        "name": "bento",
+        "diversity": false
+      },
+      {
+        "name": "rice_cracker",
+        "diversity": false
+      },
+      {
+        "name": "rice_ball",
+        "diversity": false
+      },
+      {
+        "name": "rice",
+        "diversity": false
+      },
+      {
+        "name": "curry",
+        "diversity": false
+      },
+      {
+        "name": "ramen",
+        "diversity": false
+      },
+      {
+        "name": "spaghetti",
+        "diversity": false
+      },
+      {
+        "name": "sweet_potato",
+        "diversity": false
+      },
+      {
+        "name": "oden",
+        "diversity": false
+      },
+      {
+        "name": "sushi",
+        "diversity": false
+      },
+      {
+        "name": "fried_shrimp",
+        "diversity": false
+      },
+      {
+        "name": "fish_cake",
+        "diversity": false
+      },
+      {
+        "name": "dango",
+        "diversity": false
+      },
+      {
+        "name": "dumpling",
+        "diversity": false
+      },
+      {
+        "name": "fortune_cookie",
+        "diversity": false
+      },
+      {
+        "name": "takeout_box",
+        "diversity": false
+      },
+      {
+        "name": "icecream",
+        "diversity": false
+      },
+      {
+        "name": "shaved_ice",
+        "diversity": false
+      },
+      {
+        "name": "ice_cream",
+        "diversity": false
+      },
+      {
+        "name": "doughnut",
+        "diversity": false
+      },
+      {
+        "name": "cookie",
+        "diversity": false
+      },
+      {
+        "name": "birthday",
+        "diversity": false
+      },
+      {
+        "name": "cake",
+        "diversity": false
+      },
+      {
+        "name": "pie",
+        "diversity": false
+      },
+      {
+        "name": "chocolate_bar",
+        "diversity": false
+      },
+      {
+        "name": "candy",
+        "diversity": false
+      },
+      {
+        "name": "lollipop",
+        "diversity": false
+      },
+      {
+        "name": "custard",
+        "diversity": false
+      },
+      {
+        "name": "honey_pot",
+        "diversity": false
+      },
+      {
+        "name": "baby_bottle",
+        "diversity": false
+      },
+      {
+        "name": "milk_glass",
+        "diversity": false
+      },
+      {
+        "name": "coffee",
+        "diversity": false
+      },
+      {
+        "name": "tea",
+        "diversity": false
+      },
+      {
+        "name": "sake",
+        "diversity": false
+      },
+      {
+        "name": "champagne",
+        "diversity": false
+      },
+      {
+        "name": "wine_glass",
+        "diversity": false
+      },
+      {
+        "name": "cocktail",
+        "diversity": false
+      },
+      {
+        "name": "tropical_drink",
+        "diversity": false
+      },
+      {
+        "name": "beer",
+        "diversity": false
+      },
+      {
+        "name": "beers",
+        "diversity": false
+      },
+      {
+        "name": "clinking_glasses",
+        "diversity": false
+      },
+      {
+        "name": "tumbler_glass",
+        "diversity": false
+      },
+      {
+        "name": "cup_with_straw",
+        "diversity": false
+      },
+      {
+        "name": "chopsticks",
+        "diversity": false
+      },
+      {
+        "name": "plate_with_cutlery",
+        "diversity": false
+      },
+      {
+        "name": "fork_and_knife",
+        "diversity": false
+      },
+      {
+        "name": "spoon",
+        "diversity": false
+      },
+      {
+        "name": "hocho",
+        "diversity": false
+      },
+      {
+        "name": "amphora",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "celebration",
+    "fullname": "Celebration",
+    "tabicon": "gift",
+    "icons": [
+      {
+        "name": "jack_o_lantern",
+        "diversity": false
+      },
+      {
+        "name": "christmas_tree",
+        "diversity": false
+      },
+      {
+        "name": "fireworks",
+        "diversity": false
+      },
+      {
+        "name": "sparkler",
+        "diversity": false
+      },
+      {
+        "name": "sparkles",
+        "diversity": false
+      },
+      {
+        "name": "balloon",
+        "diversity": false
+      },
+      {
+        "name": "tada",
+        "diversity": false
+      },
+      {
+        "name": "confetti_ball",
+        "diversity": false
+      },
+      {
+        "name": "tanabata_tree",
+        "diversity": false
+      },
+      {
+        "name": "bamboo",
+        "diversity": false
+      },
+      {
+        "name": "dolls",
+        "diversity": false
+      },
+      {
+        "name": "flags",
+        "diversity": false
+      },
+      {
+        "name": "wind_chime",
+        "diversity": false
+      },
+      {
+        "name": "rice_scene",
+        "diversity": false
+      },
+      {
+        "name": "ribbon",
+        "diversity": false
+      },
+      {
+        "name": "gift",
+        "diversity": false
+      },
+      {
+        "name": "reminder_ribbon",
+        "diversity": false
+      },
+      {
+        "name": "tickets",
+        "diversity": false
+      },
+      {
+        "name": "ticket",
+        "diversity": false
+      },
+      {
+        "name": "kiss",
+        "diversity": false
+      },
+      {
+        "name": "cupid",
+        "diversity": false
+      },
+      {
+        "name": "heart",
+        "diversity": false
+      },
+      {
+        "name": "heartbeat",
+        "diversity": false
+      },
+      {
+        "name": "broken_heart",
+        "diversity": false
+      },
+      {
+        "name": "two_hearts",
+        "diversity": false
+      },
+      {
+        "name": "sparkling_heart",
+        "diversity": false
+      },
+      {
+        "name": "heartpulse",
+        "diversity": false
+      },
+      {
+        "name": "blue_heart",
+        "diversity": false
+      },
+      {
+        "name": "green_heart",
+        "diversity": false
+      },
+      {
+        "name": "yellow_heart",
+        "diversity": false
+      },
+      {
+        "name": "orange_heart",
+        "diversity": false
+      },
+      {
+        "name": "purple_heart",
+        "diversity": false
+      },
+      {
+        "name": "black_heart",
+        "diversity": false
+      },
+      {
+        "name": "gift_heart",
+        "diversity": false
+      },
+      {
+        "name": "revolving_hearts",
+        "diversity": false
+      },
+      {
+        "name": "heart_decoration",
+        "diversity": false
+      },
+      {
+        "name": "heavy_heart_exclamation",
+        "diversity": false
+      },
+      {
+        "name": "love_letter",
+        "diversity": false
+      },
+      {
+        "name": "zzz",
+        "diversity": false
+      },
+      {
+        "name": "anger",
+        "diversity": false
+      },
+      {
+        "name": "bomb",
+        "diversity": false
+      },
+      {
+        "name": "boom",
+        "diversity": false
+      },
+      {
+        "name": "sweat_drops",
+        "diversity": false
+      },
+      {
+        "name": "dash",
+        "diversity": false
+      },
+      {
+        "name": "dizzy",
+        "diversity": false
+      },
+      {
+        "name": "speech_balloon",
+        "diversity": false
+      },
+      {
+        "name": "left_speech_bubble",
+        "diversity": false
+      },
+      {
+        "name": "right_anger_bubble",
+        "diversity": false
+      },
+      {
+        "name": "thought_balloon",
+        "diversity": false
+      },
+      {
+        "name": "hole",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "activity",
+    "fullname": "Activities",
+    "tabicon": "soccer",
+    "icons": [
+      {
+        "name": "massage_woman",
+        "diversity": true
+      },
+      {
+        "name": "massage_man",
+        "diversity": true
+      },
+      {
+        "name": "haircut_woman",
+        "diversity": true
+      },
+      {
+        "name": "haircut_man",
+        "diversity": true
+      },
+      {
+        "name": "walking_man",
+        "diversity": true
+      },
+      {
+        "name": "walking_woman",
+        "diversity": true
+      },
+      {
+        "name": "running_man",
+        "diversity": true
+      },
+      {
+        "name": "running_woman",
+        "diversity": true
+      },
+      {
+        "name": "dancer",
+        "diversity": true
+      },
+      {
+        "name": "man_dancing",
+        "diversity": true
+      },
+      {
+        "name": "dancing_women",
+        "diversity": false
+      },
+      {
+        "name": "dancing_men",
+        "diversity": false
+      },
+      {
+        "name": "person_in_steamy_room",
+        "diversity": false
+      },
+      {
+        "name": "person_climbing",
+        "diversity": false
+      },
+      {
+        "name": "person_in_lotus_position",
+        "diversity": false
+      },
+      {
+        "name": "bath",
+        "diversity": true
+      },
+      {
+        "name": "sleeping_bed",
+        "diversity": true
+      },
+      {
+        "name": "business_suit_levitating",
+        "diversity": true
+      },
+      {
+        "name": "speaking_head",
+        "diversity": false
+      },
+      {
+        "name": "bust_in_silhouette",
+        "diversity": false
+      },
+      {
+        "name": "busts_in_silhouette",
+        "diversity": false
+      },
+      {
+        "name": "person_fencing",
+        "diversity": false
+      },
+      {
+        "name": "horse_racing",
+        "diversity": true
+      },
+      {
+        "name": "skier",
+        "diversity": false
+      },
+      {
+        "name": "snowboarder",
+        "diversity": true
+      },
+      {
+        "name": "golfing_man",
+        "diversity": true
+      },
+      {
+        "name": "golfing_woman",
+        "diversity": false
+      },
+      {
+        "name": "surfing_man",
+        "diversity": true
+      },
+      {
+        "name": "surfing_woman",
+        "diversity": true
+      },
+      {
+        "name": "rowing_man",
+        "diversity": true
+      },
+      {
+        "name": "rowing_woman",
+        "diversity": true
+      },
+      {
+        "name": "swimming_man",
+        "diversity": true
+      },
+      {
+        "name": "swimming_woman",
+        "diversity": true
+      },
+      {
+        "name": "basketball_man",
+        "diversity": true
+      },
+      {
+        "name": "basketball_woman",
+        "diversity": false
+      },
+      {
+        "name": "weight_lifting_man",
+        "diversity": true
+      },
+      {
+        "name": "weight_lifting_woman",
+        "diversity": false
+      },
+      {
+        "name": "biking_man",
+        "diversity": true
+      },
+      {
+        "name": "biking_woman",
+        "diversity": true
+      },
+      {
+        "name": "mountain_biking_man",
+        "diversity": true
+      },
+      {
+        "name": "mountain_biking_woman",
+        "diversity": true
+      },
+      {
+        "name": "racing_car",
+        "diversity": false
+      },
+      {
+        "name": "motorcycle",
+        "diversity": false
+      },
+      {
+        "name": "man_cartwheeling",
+        "diversity": true
+      },
+      {
+        "name": "woman_cartwheeling",
+        "diversity": true
+      },
+      {
+        "name": "men_wrestling",
+        "diversity": false
+      },
+      {
+        "name": "women_wrestling",
+        "diversity": false
+      },
+      {
+        "name": "man_playing_water_polo",
+        "diversity": true
+      },
+      {
+        "name": "woman_playing_water_polo",
+        "diversity": true
+      },
+      {
+        "name": "man_playing_handball",
+        "diversity": true
+      },
+      {
+        "name": "woman_playing_handball",
+        "diversity": true
+      },
+      {
+        "name": "man_juggling",
+        "diversity": true
+      },
+      {
+        "name": "woman_juggling",
+        "diversity": true
+      },
+      {
+        "name": "soccer",
+        "diversity": false
+      },
+      {
+        "name": "baseball",
+        "diversity": false
+      },
+      {
+        "name": "basketball",
+        "diversity": false
+      },
+      {
+        "name": "volleyball",
+        "diversity": false
+      },
+      {
+        "name": "football",
+        "diversity": false
+      },
+      {
+        "name": "rugby_football",
+        "diversity": false
+      },
+      {
+        "name": "tennis",
+        "diversity": false
+      },
+      {
+        "name": "8ball",
+        "diversity": false
+      },
+      {
+        "name": "bowling",
+        "diversity": false
+      },
+      {
+        "name": "cricket_bat_and_ball",
+        "diversity": false
+      },
+      {
+        "name": "field_hockey",
+        "diversity": false
+      },
+      {
+        "name": "ice_hockey",
+        "diversity": false
+      },
+      {
+        "name": "ping_pong",
+        "diversity": false
+      },
+      {
+        "name": "badminton",
+        "diversity": false
+      },
+      {
+        "name": "boxing_glove",
+        "diversity": false
+      },
+      {
+        "name": "martial_arts_uniform",
+        "diversity": false
+      },
+      {
+        "name": "goal_net",
+        "diversity": false
+      },
+      {
+        "name": "dart",
+        "diversity": false
+      },
+      {
+        "name": "golf",
+        "diversity": false
+      },
+      {
+        "name": "ice_skate",
+        "diversity": false
+      },
+      {
+        "name": "fishing_pole_and_fish",
+        "diversity": false
+      },
+      {
+        "name": "running_shirt_with_sash",
+        "diversity": false
+      },
+      {
+        "name": "ski",
+        "diversity": false
+      },
+      {
+        "name": "sled",
+        "diversity": false
+      },
+      {
+        "name": "curling_stone",
+        "diversity": false
+      },
+      {
+        "name": "video_game",
+        "diversity": false
+      },
+      {
+        "name": "joystick",
+        "diversity": false
+      },
+      {
+        "name": "game_die",
+        "diversity": false
+      },
+      {
+        "name": "spades",
+        "diversity": false
+      },
+      {
+        "name": "hearts",
+        "diversity": false
+      },
+      {
+        "name": "diamonds",
+        "diversity": false
+      },
+      {
+        "name": "clubs",
+        "diversity": false
+      },
+      {
+        "name": "black_joker",
+        "diversity": false
+      },
+      {
+        "name": "mahjong",
+        "diversity": false
+      },
+      {
+        "name": "flower_playing_cards",
+        "diversity": false
+      },
+      {
+        "name": "musical_score",
+        "diversity": false
+      },
+      {
+        "name": "musical_note",
+        "diversity": false
+      },
+      {
+        "name": "notes",
+        "diversity": false
+      },
+      {
+        "name": "studio_microphone",
+        "diversity": false
+      },
+      {
+        "name": "level_slider",
+        "diversity": false
+      },
+      {
+        "name": "control_knobs",
+        "diversity": false
+      },
+      {
+        "name": "microphone",
+        "diversity": false
+      },
+      {
+        "name": "headphones",
+        "diversity": false
+      },
+      {
+        "name": "radio",
+        "diversity": false
+      },
+      {
+        "name": "saxophone",
+        "diversity": false
+      },
+      {
+        "name": "guitar",
+        "diversity": false
+      },
+      {
+        "name": "musical_keyboard",
+        "diversity": false
+      },
+      {
+        "name": "trumpet",
+        "diversity": false
+      },
+      {
+        "name": "violin",
+        "diversity": false
+      },
+      {
+        "name": "drum",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "travel",
+    "fullname": "Travel & Places",
+    "tabicon": "airplane",
+    "icons": [
+      {
+        "name": "earth_africa",
+        "diversity": false
+      },
+      {
+        "name": "earth_americas",
+        "diversity": false
+      },
+      {
+        "name": "earth_asia",
+        "diversity": false
+      },
+      {
+        "name": "globe_with_meridians",
+        "diversity": false
+      },
+      {
+        "name": "world_map",
+        "diversity": false
+      },
+      {
+        "name": "japan",
+        "diversity": false
+      },
+      {
+        "name": "mountain_snow",
+        "diversity": false
+      },
+      {
+        "name": "mountain",
+        "diversity": false
+      },
+      {
+        "name": "volcano",
+        "diversity": false
+      },
+      {
+        "name": "mount_fuji",
+        "diversity": false
+      },
+      {
+        "name": "camping",
+        "diversity": false
+      },
+      {
+        "name": "beach_umbrella",
+        "diversity": false
+      },
+      {
+        "name": "desert",
+        "diversity": false
+      },
+      {
+        "name": "desert_island",
+        "diversity": false
+      },
+      {
+        "name": "national_park",
+        "diversity": false
+      },
+      {
+        "name": "stadium",
+        "diversity": false
+      },
+      {
+        "name": "classical_building",
+        "diversity": false
+      },
+      {
+        "name": "building_construction",
+        "diversity": false
+      },
+      {
+        "name": "houses",
+        "diversity": false
+      },
+      {
+        "name": "cityscape",
+        "diversity": false
+      },
+      {
+        "name": "derelict_house",
+        "diversity": false
+      },
+      {
+        "name": "house",
+        "diversity": false
+      },
+      {
+        "name": "house_with_garden",
+        "diversity": false
+      },
+      {
+        "name": "office",
+        "diversity": false
+      },
+      {
+        "name": "post_office",
+        "diversity": false
+      },
+      {
+        "name": "european_post_office",
+        "diversity": false
+      },
+      {
+        "name": "hospital",
+        "diversity": false
+      },
+      {
+        "name": "bank",
+        "diversity": false
+      },
+      {
+        "name": "hotel",
+        "diversity": false
+      },
+      {
+        "name": "love_hotel",
+        "diversity": false
+      },
+      {
+        "name": "convenience_store",
+        "diversity": false
+      },
+      {
+        "name": "school",
+        "diversity": false
+      },
+      {
+        "name": "department_store",
+        "diversity": false
+      },
+      {
+        "name": "factory",
+        "diversity": false
+      },
+      {
+        "name": "japanese_castle",
+        "diversity": false
+      },
+      {
+        "name": "european_castle",
+        "diversity": false
+      },
+      {
+        "name": "wedding",
+        "diversity": false
+      },
+      {
+        "name": "tokyo_tower",
+        "diversity": false
+      },
+      {
+        "name": "statue_of_liberty",
+        "diversity": false
+      },
+      {
+        "name": "church",
+        "diversity": false
+      },
+      {
+        "name": "mosque",
+        "diversity": false
+      },
+      {
+        "name": "synagogue",
+        "diversity": false
+      },
+      {
+        "name": "shinto_shrine",
+        "diversity": false
+      },
+      {
+        "name": "kaaba",
+        "diversity": false
+      },
+      {
+        "name": "fountain",
+        "diversity": false
+      },
+      {
+        "name": "tent",
+        "diversity": false
+      },
+      {
+        "name": "foggy",
+        "diversity": false
+      },
+      {
+        "name": "night_with_stars",
+        "diversity": false
+      },
+      {
+        "name": "sunrise_over_mountains",
+        "diversity": false
+      },
+      {
+        "name": "sunrise",
+        "diversity": false
+      },
+      {
+        "name": "city_sunset",
+        "diversity": false
+      },
+      {
+        "name": "city_sunrise",
+        "diversity": false
+      },
+      {
+        "name": "bridge_at_night",
+        "diversity": false
+      },
+      {
+        "name": "hotsprings",
+        "diversity": false
+      },
+      {
+        "name": "milky_way",
+        "diversity": false
+      },
+      {
+        "name": "carousel_horse",
+        "diversity": false
+      },
+      {
+        "name": "ferris_wheel",
+        "diversity": false
+      },
+      {
+        "name": "roller_coaster",
+        "diversity": false
+      },
+      {
+        "name": "barber",
+        "diversity": false
+      },
+      {
+        "name": "circus_tent",
+        "diversity": false
+      },
+      {
+        "name": "performing_arts",
+        "diversity": false
+      },
+      {
+        "name": "framed_picture",
+        "diversity": false
+      },
+      {
+        "name": "art",
+        "diversity": false
+      },
+      {
+        "name": "slot_machine",
+        "diversity": false
+      },
+      {
+        "name": "steam_locomotive",
+        "diversity": false
+      },
+      {
+        "name": "railway_car",
+        "diversity": false
+      },
+      {
+        "name": "bullettrain_side",
+        "diversity": false
+      },
+      {
+        "name": "bullettrain_front",
+        "diversity": false
+      },
+      {
+        "name": "train2",
+        "diversity": false
+      },
+      {
+        "name": "metro",
+        "diversity": false
+      },
+      {
+        "name": "light_rail",
+        "diversity": false
+      },
+      {
+        "name": "station",
+        "diversity": false
+      },
+      {
+        "name": "tram",
+        "diversity": false
+      },
+      {
+        "name": "monorail",
+        "diversity": false
+      },
+      {
+        "name": "mountain_railway",
+        "diversity": false
+      },
+      {
+        "name": "train",
+        "diversity": false
+      },
+      {
+        "name": "bus",
+        "diversity": false
+      },
+      {
+        "name": "oncoming_bus",
+        "diversity": false
+      },
+      {
+        "name": "trolleybus",
+        "diversity": false
+      },
+      {
+        "name": "minibus",
+        "diversity": false
+      },
+      {
+        "name": "ambulance",
+        "diversity": false
+      },
+      {
+        "name": "fire_engine",
+        "diversity": false
+      },
+      {
+        "name": "police_car",
+        "diversity": false
+      },
+      {
+        "name": "oncoming_police_car",
+        "diversity": false
+      },
+      {
+        "name": "taxi",
+        "diversity": false
+      },
+      {
+        "name": "oncoming_taxi",
+        "diversity": false
+      },
+      {
+        "name": "red_car",
+        "diversity": false
+      },
+      {
+        "name": "oncoming_automobile",
+        "diversity": false
+      },
+      {
+        "name": "blue_car",
+        "diversity": false
+      },
+      {
+        "name": "truck",
+        "diversity": false
+      },
+      {
+        "name": "articulated_lorry",
+        "diversity": false
+      },
+      {
+        "name": "tractor",
+        "diversity": false
+      },
+      {
+        "name": "bike",
+        "diversity": false
+      },
+      {
+        "name": "kick_scooter",
+        "diversity": false
+      },
+      {
+        "name": "motor_scooter",
+        "diversity": false
+      },
+      {
+        "name": "busstop",
+        "diversity": false
+      },
+      {
+        "name": "motorway",
+        "diversity": false
+      },
+      {
+        "name": "railway_track",
+        "diversity": false
+      },
+      {
+        "name": "fuelpump",
+        "diversity": false
+      },
+      {
+        "name": "rotating_light",
+        "diversity": false
+      },
+      {
+        "name": "traffic_light",
+        "diversity": false
+      },
+      {
+        "name": "vertical_traffic_light",
+        "diversity": false
+      },
+      {
+        "name": "construction",
+        "diversity": false
+      },
+      {
+        "name": "stop_sign",
+        "diversity": false
+      },
+      {
+        "name": "anchor",
+        "diversity": false
+      },
+      {
+        "name": "sailboat",
+        "diversity": false
+      },
+      {
+        "name": "canoe",
+        "diversity": false
+      },
+      {
+        "name": "speedboat",
+        "diversity": false
+      },
+      {
+        "name": "passenger_ship",
+        "diversity": false
+      },
+      {
+        "name": "ferry",
+        "diversity": false
+      },
+      {
+        "name": "motor_boat",
+        "diversity": false
+      },
+      {
+        "name": "ship",
+        "diversity": false
+      },
+      {
+        "name": "airplane",
+        "diversity": false
+      },
+      {
+        "name": "small_airplane",
+        "diversity": false
+      },
+      {
+        "name": "flight_departure",
+        "diversity": false
+      },
+      {
+        "name": "flight_arrival",
+        "diversity": false
+      },
+      {
+        "name": "seat",
+        "diversity": false
+      },
+      {
+        "name": "helicopter",
+        "diversity": false
+      },
+      {
+        "name": "suspension_railway",
+        "diversity": false
+      },
+      {
+        "name": "mountain_cableway",
+        "diversity": false
+      },
+      {
+        "name": "aerial_tramway",
+        "diversity": false
+      },
+      {
+        "name": "artificial_satellite",
+        "diversity": false
+      },
+      {
+        "name": "rocket",
+        "diversity": false
+      },
+      {
+        "name": "flying_saucer",
+        "diversity": false
+      },
+      {
+        "name": "bellhop_bell",
+        "diversity": false
+      },
+      {
+        "name": "door",
+        "diversity": false
+      },
+      {
+        "name": "bed",
+        "diversity": false
+      },
+      {
+        "name": "couch_and_lamp",
+        "diversity": false
+      },
+      {
+        "name": "toilet",
+        "diversity": false
+      },
+      {
+        "name": "shower",
+        "diversity": false
+      },
+      {
+        "name": "bathtub",
+        "diversity": false
+      },
+      {
+        "name": "checkered_flag",
+        "diversity": false
+      },
+      {
+        "name": "triangular_flag_on_post",
+        "diversity": false
+      },
+      {
+        "name": "crossed_flags",
+        "diversity": false
+      },
+      {
+        "name": "black_flag",
+        "diversity": false
+      },
+      {
+        "name": "white_flag",
+        "diversity": false
+      },
+      {
+        "name": "rainbow_flag",
+        "diversity": false
+      },
+      {
+        "name": "ascension_island",
+        "diversity": false
+      },
+      {
+        "name": "andorra",
+        "diversity": false
+      },
+      {
+        "name": "united_arab_emirates",
+        "diversity": false
+      },
+      {
+        "name": "afghanistan",
+        "diversity": false
+      },
+      {
+        "name": "antigua_barbuda",
+        "diversity": false
+      },
+      {
+        "name": "anguilla",
+        "diversity": false
+      },
+      {
+        "name": "albania",
+        "diversity": false
+      },
+      {
+        "name": "armenia",
+        "diversity": false
+      },
+      {
+        "name": "angola",
+        "diversity": false
+      },
+      {
+        "name": "antarctica",
+        "diversity": false
+      },
+      {
+        "name": "argentina",
+        "diversity": false
+      },
+      {
+        "name": "american_samoa",
+        "diversity": false
+      },
+      {
+        "name": "austria",
+        "diversity": false
+      },
+      {
+        "name": "australia",
+        "diversity": false
+      },
+      {
+        "name": "aruba",
+        "diversity": false
+      },
+      {
+        "name": "aland_islands",
+        "diversity": false
+      },
+      {
+        "name": "azerbaijan",
+        "diversity": false
+      },
+      {
+        "name": "bosnia_herzegovina",
+        "diversity": false
+      },
+      {
+        "name": "barbados",
+        "diversity": false
+      },
+      {
+        "name": "bangladesh",
+        "diversity": false
+      },
+      {
+        "name": "belgium",
+        "diversity": false
+      },
+      {
+        "name": "burkina_faso",
+        "diversity": false
+      },
+      {
+        "name": "bulgaria",
+        "diversity": false
+      },
+      {
+        "name": "bahrain",
+        "diversity": false
+      },
+      {
+        "name": "burundi",
+        "diversity": false
+      },
+      {
+        "name": "benin",
+        "diversity": false
+      },
+      {
+        "name": "st_barthelemy",
+        "diversity": false
+      },
+      {
+        "name": "bermuda",
+        "diversity": false
+      },
+      {
+        "name": "brunei",
+        "diversity": false
+      },
+      {
+        "name": "bolivia",
+        "diversity": false
+      },
+      {
+        "name": "caribbean_netherlands",
+        "diversity": false
+      },
+      {
+        "name": "brazil",
+        "diversity": false
+      },
+      {
+        "name": "bahamas",
+        "diversity": false
+      },
+      {
+        "name": "bhutan",
+        "diversity": false
+      },
+      {
+        "name": "bouvet_island",
+        "diversity": false
+      },
+      {
+        "name": "botswana",
+        "diversity": false
+      },
+      {
+        "name": "belarus",
+        "diversity": false
+      },
+      {
+        "name": "belize",
+        "diversity": false
+      },
+      {
+        "name": "canada",
+        "diversity": false
+      },
+      {
+        "name": "cocos_islands",
+        "diversity": false
+      },
+      {
+        "name": "congo_kinshasa",
+        "diversity": false
+      },
+      {
+        "name": "central_african_republic",
+        "diversity": false
+      },
+      {
+        "name": "congo_brazzaville",
+        "diversity": false
+      },
+      {
+        "name": "switzerland",
+        "diversity": false
+      },
+      {
+        "name": "cote_divoire",
+        "diversity": false
+      },
+      {
+        "name": "cook_islands",
+        "diversity": false
+      },
+      {
+        "name": "chile",
+        "diversity": false
+      },
+      {
+        "name": "cameroon",
+        "diversity": false
+      },
+      {
+        "name": "cn",
+        "diversity": false
+      },
+      {
+        "name": "colombia",
+        "diversity": false
+      },
+      {
+        "name": "clipperton_island",
+        "diversity": false
+      },
+      {
+        "name": "costa_rica",
+        "diversity": false
+      },
+      {
+        "name": "cuba",
+        "diversity": false
+      },
+      {
+        "name": "cape_verde",
+        "diversity": false
+      },
+      {
+        "name": "curacao",
+        "diversity": false
+      },
+      {
+        "name": "christmas_island",
+        "diversity": false
+      },
+      {
+        "name": "cyprus",
+        "diversity": false
+      },
+      {
+        "name": "czech_republic",
+        "diversity": false
+      },
+      {
+        "name": "de",
+        "diversity": false
+      },
+      {
+        "name": "diego_garcia",
+        "diversity": false
+      },
+      {
+        "name": "djibouti",
+        "diversity": false
+      },
+      {
+        "name": "denmark",
+        "diversity": false
+      },
+      {
+        "name": "dominica",
+        "diversity": false
+      },
+      {
+        "name": "dominican_republic",
+        "diversity": false
+      },
+      {
+        "name": "algeria",
+        "diversity": false
+      },
+      {
+        "name": "ceuta_and_melilla",
+        "diversity": false
+      },
+      {
+        "name": "ecuador",
+        "diversity": false
+      },
+      {
+        "name": "estonia",
+        "diversity": false
+      },
+      {
+        "name": "egypt",
+        "diversity": false
+      },
+      {
+        "name": "western_sahara",
+        "diversity": false
+      },
+      {
+        "name": "eritrea",
+        "diversity": false
+      },
+      {
+        "name": "es",
+        "diversity": false
+      },
+      {
+        "name": "ethiopia",
+        "diversity": false
+      },
+      {
+        "name": "eu",
+        "diversity": false
+      },
+      {
+        "name": "finland",
+        "diversity": false
+      },
+      {
+        "name": "fiji",
+        "diversity": false
+      },
+      {
+        "name": "falkland_islands",
+        "diversity": false
+      },
+      {
+        "name": "micronesia",
+        "diversity": false
+      },
+      {
+        "name": "faroe_islands",
+        "diversity": false
+      },
+      {
+        "name": "fr",
+        "diversity": false
+      },
+      {
+        "name": "gabon",
+        "diversity": false
+      },
+      {
+        "name": "uk",
+        "diversity": false
+      },
+      {
+        "name": "grenada",
+        "diversity": false
+      },
+      {
+        "name": "georgia",
+        "diversity": false
+      },
+      {
+        "name": "french_guiana",
+        "diversity": false
+      },
+      {
+        "name": "guernsey",
+        "diversity": false
+      },
+      {
+        "name": "ghana",
+        "diversity": false
+      },
+      {
+        "name": "gibraltar",
+        "diversity": false
+      },
+      {
+        "name": "greenland",
+        "diversity": false
+      },
+      {
+        "name": "gambia",
+        "diversity": false
+      },
+      {
+        "name": "guinea",
+        "diversity": false
+      },
+      {
+        "name": "guadeloupe",
+        "diversity": false
+      },
+      {
+        "name": "equatorial_guinea",
+        "diversity": false
+      },
+      {
+        "name": "greece",
+        "diversity": false
+      },
+      {
+        "name": "south_georgia_south_sandwich_islands",
+        "diversity": false
+      },
+      {
+        "name": "guatemala",
+        "diversity": false
+      },
+      {
+        "name": "guam",
+        "diversity": false
+      },
+      {
+        "name": "guinea_bissau",
+        "diversity": false
+      },
+      {
+        "name": "guyana",
+        "diversity": false
+      },
+      {
+        "name": "hong_kong",
+        "diversity": false
+      },
+      {
+        "name": "heard_and_mc_donald_islands",
+        "diversity": false
+      },
+      {
+        "name": "honduras",
+        "diversity": false
+      },
+      {
+        "name": "croatia",
+        "diversity": false
+      },
+      {
+        "name": "haiti",
+        "diversity": false
+      },
+      {
+        "name": "hungary",
+        "diversity": false
+      },
+      {
+        "name": "canary_islands",
+        "diversity": false
+      },
+      {
+        "name": "indonesia",
+        "diversity": false
+      },
+      {
+        "name": "ireland",
+        "diversity": false
+      },
+      {
+        "name": "israel",
+        "diversity": false
+      },
+      {
+        "name": "isle_of_man",
+        "diversity": false
+      },
+      {
+        "name": "india",
+        "diversity": false
+      },
+      {
+        "name": "british_indian_ocean_territory",
+        "diversity": false
+      },
+      {
+        "name": "iraq",
+        "diversity": false
+      },
+      {
+        "name": "iran",
+        "diversity": false
+      },
+      {
+        "name": "iceland",
+        "diversity": false
+      },
+      {
+        "name": "it",
+        "diversity": false
+      },
+      {
+        "name": "jersey",
+        "diversity": false
+      },
+      {
+        "name": "jamaica",
+        "diversity": false
+      },
+      {
+        "name": "jordan",
+        "diversity": false
+      },
+      {
+        "name": "jp",
+        "diversity": false
+      },
+      {
+        "name": "kenya",
+        "diversity": false
+      },
+      {
+        "name": "kyrgyzstan",
+        "diversity": false
+      },
+      {
+        "name": "cambodia",
+        "diversity": false
+      },
+      {
+        "name": "kiribati",
+        "diversity": false
+      },
+      {
+        "name": "comoros",
+        "diversity": false
+      },
+      {
+        "name": "st_kitts_nevis",
+        "diversity": false
+      },
+      {
+        "name": "north_korea",
+        "diversity": false
+      },
+      {
+        "name": "kr",
+        "diversity": false
+      },
+      {
+        "name": "kuwait",
+        "diversity": false
+      },
+      {
+        "name": "cayman_islands",
+        "diversity": false
+      },
+      {
+        "name": "kazakhstan",
+        "diversity": false
+      },
+      {
+        "name": "laos",
+        "diversity": false
+      },
+      {
+        "name": "lebanon",
+        "diversity": false
+      },
+      {
+        "name": "st_lucia",
+        "diversity": false
+      },
+      {
+        "name": "liechtenstein",
+        "diversity": false
+      },
+      {
+        "name": "sri_lanka",
+        "diversity": false
+      },
+      {
+        "name": "liberia",
+        "diversity": false
+      },
+      {
+        "name": "lesotho",
+        "diversity": false
+      },
+      {
+        "name": "lithuania",
+        "diversity": false
+      },
+      {
+        "name": "luxembourg",
+        "diversity": false
+      },
+      {
+        "name": "latvia",
+        "diversity": false
+      },
+      {
+        "name": "libya",
+        "diversity": false
+      },
+      {
+        "name": "morocco",
+        "diversity": false
+      },
+      {
+        "name": "monaco",
+        "diversity": false
+      },
+      {
+        "name": "moldova",
+        "diversity": false
+      },
+      {
+        "name": "montenegro",
+        "diversity": false
+      },
+      {
+        "name": "st_martin",
+        "diversity": false
+      },
+      {
+        "name": "madagascar",
+        "diversity": false
+      },
+      {
+        "name": "marshall_islands",
+        "diversity": false
+      },
+      {
+        "name": "macedonia",
+        "diversity": false
+      },
+      {
+        "name": "mali",
+        "diversity": false
+      },
+      {
+        "name": "myanmar",
+        "diversity": false
+      },
+      {
+        "name": "mongolia",
+        "diversity": false
+      },
+      {
+        "name": "macau",
+        "diversity": false
+      },
+      {
+        "name": "northern_mariana_islands",
+        "diversity": false
+      },
+      {
+        "name": "martinique",
+        "diversity": false
+      },
+      {
+        "name": "mauritania",
+        "diversity": false
+      },
+      {
+        "name": "montserrat",
+        "diversity": false
+      },
+      {
+        "name": "malta",
+        "diversity": false
+      },
+      {
+        "name": "mauritius",
+        "diversity": false
+      },
+      {
+        "name": "maldives",
+        "diversity": false
+      },
+      {
+        "name": "malawi",
+        "diversity": false
+      },
+      {
+        "name": "mexico",
+        "diversity": false
+      },
+      {
+        "name": "malaysia",
+        "diversity": false
+      },
+      {
+        "name": "mozambique",
+        "diversity": false
+      },
+      {
+        "name": "namibia",
+        "diversity": false
+      },
+      {
+        "name": "new_caledonia",
+        "diversity": false
+      },
+      {
+        "name": "niger",
+        "diversity": false
+      },
+      {
+        "name": "norfolk_island",
+        "diversity": false
+      },
+      {
+        "name": "nigeria",
+        "diversity": false
+      },
+      {
+        "name": "nicaragua",
+        "diversity": false
+      },
+      {
+        "name": "netherlands",
+        "diversity": false
+      },
+      {
+        "name": "norway",
+        "diversity": false
+      },
+      {
+        "name": "nepal",
+        "diversity": false
+      },
+      {
+        "name": "nauru",
+        "diversity": false
+      },
+      {
+        "name": "niue",
+        "diversity": false
+      },
+      {
+        "name": "new_zealand",
+        "diversity": false
+      },
+      {
+        "name": "oman",
+        "diversity": false
+      },
+      {
+        "name": "panama",
+        "diversity": false
+      },
+      {
+        "name": "peru",
+        "diversity": false
+      },
+      {
+        "name": "french_polynesia",
+        "diversity": false
+      },
+      {
+        "name": "papua_new_guinea",
+        "diversity": false
+      },
+      {
+        "name": "philippines",
+        "diversity": false
+      },
+      {
+        "name": "pakistan",
+        "diversity": false
+      },
+      {
+        "name": "poland",
+        "diversity": false
+      },
+      {
+        "name": "st_pierre_miquelon",
+        "diversity": false
+      },
+      {
+        "name": "pitcairn_islands",
+        "diversity": false
+      },
+      {
+        "name": "puerto_rico",
+        "diversity": false
+      },
+      {
+        "name": "palestinian_territories",
+        "diversity": false
+      },
+      {
+        "name": "portugal",
+        "diversity": false
+      },
+      {
+        "name": "palau",
+        "diversity": false
+      },
+      {
+        "name": "paraguay",
+        "diversity": false
+      },
+      {
+        "name": "qatar",
+        "diversity": false
+      },
+      {
+        "name": "reunion",
+        "diversity": false
+      },
+      {
+        "name": "romania",
+        "diversity": false
+      },
+      {
+        "name": "serbia",
+        "diversity": false
+      },
+      {
+        "name": "ru",
+        "diversity": false
+      },
+      {
+        "name": "rwanda",
+        "diversity": false
+      },
+      {
+        "name": "saudi_arabia",
+        "diversity": false
+      },
+      {
+        "name": "solomon_islands",
+        "diversity": false
+      },
+      {
+        "name": "seychelles",
+        "diversity": false
+      },
+      {
+        "name": "sudan",
+        "diversity": false
+      },
+      {
+        "name": "sweden",
+        "diversity": false
+      },
+      {
+        "name": "singapore",
+        "diversity": false
+      },
+      {
+        "name": "st_helena",
+        "diversity": false
+      },
+      {
+        "name": "slovenia",
+        "diversity": false
+      },
+      {
+        "name": "svalbard_and_jan_mayen",
+        "diversity": false
+      },
+      {
+        "name": "slovakia",
+        "diversity": false
+      },
+      {
+        "name": "sierra_leone",
+        "diversity": false
+      },
+      {
+        "name": "san_marino",
+        "diversity": false
+      },
+      {
+        "name": "senegal",
+        "diversity": false
+      },
+      {
+        "name": "somalia",
+        "diversity": false
+      },
+      {
+        "name": "suriname",
+        "diversity": false
+      },
+      {
+        "name": "south_sudan",
+        "diversity": false
+      },
+      {
+        "name": "sao_tome_principe",
+        "diversity": false
+      },
+      {
+        "name": "el_salvador",
+        "diversity": false
+      },
+      {
+        "name": "sint_maarten",
+        "diversity": false
+      },
+      {
+        "name": "syria",
+        "diversity": false
+      },
+      {
+        "name": "swaziland",
+        "diversity": false
+      },
+      {
+        "name": "tristan_da_cunha",
+        "diversity": false
+      },
+      {
+        "name": "turks_caicos_islands",
+        "diversity": false
+      },
+      {
+        "name": "chad",
+        "diversity": false
+      },
+      {
+        "name": "french_southern_territories",
+        "diversity": false
+      },
+      {
+        "name": "togo",
+        "diversity": false
+      },
+      {
+        "name": "thailand",
+        "diversity": false
+      },
+      {
+        "name": "tajikistan",
+        "diversity": false
+      },
+      {
+        "name": "tokelau",
+        "diversity": false
+      },
+      {
+        "name": "timor_leste",
+        "diversity": false
+      },
+      {
+        "name": "turkmenistan",
+        "diversity": false
+      },
+      {
+        "name": "tunisia",
+        "diversity": false
+      },
+      {
+        "name": "tonga",
+        "diversity": false
+      },
+      {
+        "name": "tr",
+        "diversity": false
+      },
+      {
+        "name": "trinidad_tobago",
+        "diversity": false
+      },
+      {
+        "name": "tuvalu",
+        "diversity": false
+      },
+      {
+        "name": "taiwan",
+        "diversity": false
+      },
+      {
+        "name": "tanzania",
+        "diversity": false
+      },
+      {
+        "name": "ukraine",
+        "diversity": false
+      },
+      {
+        "name": "uganda",
+        "diversity": false
+      },
+      {
+        "name": "us_outlying_islands",
+        "diversity": false
+      },
+      {
+        "name": "united_nations",
+        "diversity": false
+      },
+      {
+        "name": "us",
+        "diversity": false
+      },
+      {
+        "name": "uruguay",
+        "diversity": false
+      },
+      {
+        "name": "uzbekistan",
+        "diversity": false
+      },
+      {
+        "name": "vatican_city",
+        "diversity": false
+      },
+      {
+        "name": "st_vincent_grenadines",
+        "diversity": false
+      },
+      {
+        "name": "venezuela",
+        "diversity": false
+      },
+      {
+        "name": "british_virgin_islands",
+        "diversity": false
+      },
+      {
+        "name": "us_virgin_islands",
+        "diversity": false
+      },
+      {
+        "name": "vietnam",
+        "diversity": false
+      },
+      {
+        "name": "vanuatu",
+        "diversity": false
+      },
+      {
+        "name": "wallis_futuna",
+        "diversity": false
+      },
+      {
+        "name": "samoa",
+        "diversity": false
+      },
+      {
+        "name": "kosovo",
+        "diversity": false
+      },
+      {
+        "name": "yemen",
+        "diversity": false
+      },
+      {
+        "name": "mayotte",
+        "diversity": false
+      },
+      {
+        "name": "south_africa",
+        "diversity": false
+      },
+      {
+        "name": "zambia",
+        "diversity": false
+      },
+      {
+        "name": "zimbabwe",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "objects",
+    "fullname": "Objects & Symbols",
+    "tabicon": "eyeglasses",
+    "icons": [
+      {
+        "name": "eyeglasses",
+        "diversity": false
+      },
+      {
+        "name": "dark_sunglasses",
+        "diversity": false
+      },
+      {
+        "name": "necktie",
+        "diversity": false
+      },
+      {
+        "name": "tshirt",
+        "diversity": false
+      },
+      {
+        "name": "jeans",
+        "diversity": false
+      },
+      {
+        "name": "scarf",
+        "diversity": false
+      },
+      {
+        "name": "gloves",
+        "diversity": false
+      },
+      {
+        "name": "coat",
+        "diversity": false
+      },
+      {
+        "name": "socks",
+        "diversity": false
+      },
+      {
+        "name": "dress",
+        "diversity": false
+      },
+      {
+        "name": "kimono",
+        "diversity": false
+      },
+      {
+        "name": "bikini",
+        "diversity": false
+      },
+      {
+        "name": "womans_clothes",
+        "diversity": false
+      },
+      {
+        "name": "purse",
+        "diversity": false
+      },
+      {
+        "name": "handbag",
+        "diversity": false
+      },
+      {
+        "name": "pouch",
+        "diversity": false
+      },
+      {
+        "name": "shopping",
+        "diversity": false
+      },
+      {
+        "name": "school_satchel",
+        "diversity": false
+      },
+      {
+        "name": "mans_shoe",
+        "diversity": false
+      },
+      {
+        "name": "athletic_shoe",
+        "diversity": false
+      },
+      {
+        "name": "high_heel",
+        "diversity": false
+      },
+      {
+        "name": "sandal",
+        "diversity": false
+      },
+      {
+        "name": "boot",
+        "diversity": false
+      },
+      {
+        "name": "crown",
+        "diversity": false
+      },
+      {
+        "name": "womans_hat",
+        "diversity": false
+      },
+      {
+        "name": "tophat",
+        "diversity": false
+      },
+      {
+        "name": "mortar_board",
+        "diversity": false
+      },
+      {
+        "name": "billed_cap",
+        "diversity": false
+      },
+      {
+        "name": "rescue_worker_helmet",
+        "diversity": false
+      },
+      {
+        "name": "prayer_beads",
+        "diversity": false
+      },
+      {
+        "name": "lipstick",
+        "diversity": false
+      },
+      {
+        "name": "ring",
+        "diversity": false
+      },
+      {
+        "name": "gem",
+        "diversity": false
+      },
+      {
+        "name": "medal_military",
+        "diversity": false
+      },
+      {
+        "name": "trophy",
+        "diversity": false
+      },
+      {
+        "name": "medal_sports",
+        "diversity": false
+      },
+      {
+        "name": "1st_place_medal",
+        "diversity": false
+      },
+      {
+        "name": "2nd_place_medal",
+        "diversity": false
+      },
+      {
+        "name": "3rd_place_medal",
+        "diversity": false
+      },
+      {
+        "name": "mute",
+        "diversity": false
+      },
+      {
+        "name": "speaker",
+        "diversity": false
+      },
+      {
+        "name": "sound",
+        "diversity": false
+      },
+      {
+        "name": "loud_sound",
+        "diversity": false
+      },
+      {
+        "name": "loudspeaker",
+        "diversity": false
+      },
+      {
+        "name": "mega",
+        "diversity": false
+      },
+      {
+        "name": "postal_horn",
+        "diversity": false
+      },
+      {
+        "name": "bell",
+        "diversity": false
+      },
+      {
+        "name": "no_bell",
+        "diversity": false
+      },
+      {
+        "name": "iphone",
+        "diversity": false
+      },
+      {
+        "name": "calling",
+        "diversity": false
+      },
+      {
+        "name": "phone",
+        "diversity": false
+      },
+      {
+        "name": "telephone_receiver",
+        "diversity": false
+      },
+      {
+        "name": "pager",
+        "diversity": false
+      },
+      {
+        "name": "fax",
+        "diversity": false
+      },
+      {
+        "name": "battery",
+        "diversity": false
+      },
+      {
+        "name": "electric_plug",
+        "diversity": false
+      },
+      {
+        "name": "computer",
+        "diversity": false
+      },
+      {
+        "name": "desktop_computer",
+        "diversity": false
+      },
+      {
+        "name": "printer",
+        "diversity": false
+      },
+      {
+        "name": "keyboard",
+        "diversity": false
+      },
+      {
+        "name": "computer_mouse",
+        "diversity": false
+      },
+      {
+        "name": "trackball",
+        "diversity": false
+      },
+      {
+        "name": "minidisc",
+        "diversity": false
+      },
+      {
+        "name": "floppy_disk",
+        "diversity": false
+      },
+      {
+        "name": "cd",
+        "diversity": false
+      },
+      {
+        "name": "dvd",
+        "diversity": false
+      },
+      {
+        "name": "movie_camera",
+        "diversity": false
+      },
+      {
+        "name": "film_strip",
+        "diversity": false
+      },
+      {
+        "name": "film_projector",
+        "diversity": false
+      },
+      {
+        "name": "clapper",
+        "diversity": false
+      },
+      {
+        "name": "tv",
+        "diversity": false
+      },
+      {
+        "name": "camera",
+        "diversity": false
+      },
+      {
+        "name": "camera_flash",
+        "diversity": false
+      },
+      {
+        "name": "video_camera",
+        "diversity": false
+      },
+      {
+        "name": "vhs",
+        "diversity": false
+      },
+      {
+        "name": "mag",
+        "diversity": false
+      },
+      {
+        "name": "mag_right",
+        "diversity": false
+      },
+      {
+        "name": "microscope",
+        "diversity": false
+      },
+      {
+        "name": "telescope",
+        "diversity": false
+      },
+      {
+        "name": "satellite",
+        "diversity": false
+      },
+      {
+        "name": "candle",
+        "diversity": false
+      },
+      {
+        "name": "bulb",
+        "diversity": false
+      },
+      {
+        "name": "flashlight",
+        "diversity": false
+      },
+      {
+        "name": "izakaya_lantern",
+        "diversity": false
+      },
+      {
+        "name": "notebook_with_decorative_cover",
+        "diversity": false
+      },
+      {
+        "name": "closed_book",
+        "diversity": false
+      },
+      {
+        "name": "open_book",
+        "diversity": false
+      },
+      {
+        "name": "green_book",
+        "diversity": false
+      },
+      {
+        "name": "blue_book",
+        "diversity": false
+      },
+      {
+        "name": "orange_book",
+        "diversity": false
+      },
+      {
+        "name": "books",
+        "diversity": false
+      },
+      {
+        "name": "notebook",
+        "diversity": false
+      },
+      {
+        "name": "ledger",
+        "diversity": false
+      },
+      {
+        "name": "page_with_curl",
+        "diversity": false
+      },
+      {
+        "name": "scroll",
+        "diversity": false
+      },
+      {
+        "name": "page_facing_up",
+        "diversity": false
+      },
+      {
+        "name": "newspaper",
+        "diversity": false
+      },
+      {
+        "name": "newspaper_roll",
+        "diversity": false
+      },
+      {
+        "name": "bookmark_tabs",
+        "diversity": false
+      },
+      {
+        "name": "bookmark",
+        "diversity": false
+      },
+      {
+        "name": "label",
+        "diversity": false
+      },
+      {
+        "name": "moneybag",
+        "diversity": false
+      },
+      {
+        "name": "yen",
+        "diversity": false
+      },
+      {
+        "name": "dollar",
+        "diversity": false
+      },
+      {
+        "name": "euro",
+        "diversity": false
+      },
+      {
+        "name": "pound",
+        "diversity": false
+      },
+      {
+        "name": "money_with_wings",
+        "diversity": false
+      },
+      {
+        "name": "credit_card",
+        "diversity": false
+      },
+      {
+        "name": "chart",
+        "diversity": false
+      },
+      {
+        "name": "currency_exchange",
+        "diversity": false
+      },
+      {
+        "name": "heavy_dollar_sign",
+        "diversity": false
+      },
+      {
+        "name": "email",
+        "diversity": false
+      },
+      {
+        "name": "e-mail",
+        "diversity": false
+      },
+      {
+        "name": "incoming_envelope",
+        "diversity": false
+      },
+      {
+        "name": "envelope_with_arrow",
+        "diversity": false
+      },
+      {
+        "name": "outbox_tray",
+        "diversity": false
+      },
+      {
+        "name": "inbox_tray",
+        "diversity": false
+      },
+      {
+        "name": "package",
+        "diversity": false
+      },
+      {
+        "name": "mailbox",
+        "diversity": false
+      },
+      {
+        "name": "mailbox_closed",
+        "diversity": false
+      },
+      {
+        "name": "mailbox_with_mail",
+        "diversity": false
+      },
+      {
+        "name": "mailbox_with_no_mail",
+        "diversity": false
+      },
+      {
+        "name": "postbox",
+        "diversity": false
+      },
+      {
+        "name": "ballot_box",
+        "diversity": false
+      },
+      {
+        "name": "pencil2",
+        "diversity": false
+      },
+      {
+        "name": "black_nib",
+        "diversity": false
+      },
+      {
+        "name": "fountain_pen",
+        "diversity": false
+      },
+      {
+        "name": "pen",
+        "diversity": false
+      },
+      {
+        "name": "paintbrush",
+        "diversity": false
+      },
+      {
+        "name": "crayon",
+        "diversity": false
+      },
+      {
+        "name": "memo",
+        "diversity": false
+      },
+      {
+        "name": "briefcase",
+        "diversity": false
+      },
+      {
+        "name": "file_folder",
+        "diversity": false
+      },
+      {
+        "name": "open_file_folder",
+        "diversity": false
+      },
+      {
+        "name": "card_index_dividers",
+        "diversity": false
+      },
+      {
+        "name": "date",
+        "diversity": false
+      },
+      {
+        "name": "calendar",
+        "diversity": false
+      },
+      {
+        "name": "spiral_notepad",
+        "diversity": false
+      },
+      {
+        "name": "spiral_calendar",
+        "diversity": false
+      },
+      {
+        "name": "card_index",
+        "diversity": false
+      },
+      {
+        "name": "chart_with_upwards_trend",
+        "diversity": false
+      },
+      {
+        "name": "chart_with_downwards_trend",
+        "diversity": false
+      },
+      {
+        "name": "bar_chart",
+        "diversity": false
+      },
+      {
+        "name": "clipboard",
+        "diversity": false
+      },
+      {
+        "name": "pushpin",
+        "diversity": false
+      },
+      {
+        "name": "round_pushpin",
+        "diversity": false
+      },
+      {
+        "name": "paperclip",
+        "diversity": false
+      },
+      {
+        "name": "paperclips",
+        "diversity": false
+      },
+      {
+        "name": "straight_ruler",
+        "diversity": false
+      },
+      {
+        "name": "triangular_ruler",
+        "diversity": false
+      },
+      {
+        "name": "scissors",
+        "diversity": false
+      },
+      {
+        "name": "card_file_box",
+        "diversity": false
+      },
+      {
+        "name": "file_cabinet",
+        "diversity": false
+      },
+      {
+        "name": "wastebasket",
+        "diversity": false
+      },
+      {
+        "name": "lock",
+        "diversity": false
+      },
+      {
+        "name": "unlock",
+        "diversity": false
+      },
+      {
+        "name": "lock_with_ink_pen",
+        "diversity": false
+      },
+      {
+        "name": "closed_lock_with_key",
+        "diversity": false
+      },
+      {
+        "name": "key",
+        "diversity": false
+      },
+      {
+        "name": "old_key",
+        "diversity": false
+      },
+      {
+        "name": "hammer",
+        "diversity": false
+      },
+      {
+        "name": "pick",
+        "diversity": false
+      },
+      {
+        "name": "hammer_and_pick",
+        "diversity": false
+      },
+      {
+        "name": "hammer_and_wrench",
+        "diversity": false
+      },
+      {
+        "name": "dagger",
+        "diversity": false
+      },
+      {
+        "name": "crossed_swords",
+        "diversity": false
+      },
+      {
+        "name": "gun",
+        "diversity": false
+      },
+      {
+        "name": "bow_and_arrow",
+        "diversity": false
+      },
+      {
+        "name": "shield",
+        "diversity": false
+      },
+      {
+        "name": "wrench",
+        "diversity": false
+      },
+      {
+        "name": "nut_and_bolt",
+        "diversity": false
+      },
+      {
+        "name": "gear",
+        "diversity": false
+      },
+      {
+        "name": "clamp",
+        "diversity": false
+      },
+      {
+        "name": "alembic",
+        "diversity": false
+      },
+      {
+        "name": "balance_scale",
+        "diversity": false
+      },
+      {
+        "name": "link",
+        "diversity": false
+      },
+      {
+        "name": "chains",
+        "diversity": false
+      },
+      {
+        "name": "syringe",
+        "diversity": false
+      },
+      {
+        "name": "pill",
+        "diversity": false
+      },
+      {
+        "name": "smoking",
+        "diversity": false
+      },
+      {
+        "name": "coffin",
+        "diversity": false
+      },
+      {
+        "name": "funeral_urn",
+        "diversity": false
+      },
+      {
+        "name": "moyai",
+        "diversity": false
+      },
+      {
+        "name": "oil_drum",
+        "diversity": false
+      },
+      {
+        "name": "crystal_ball",
+        "diversity": false
+      },
+      {
+        "name": "shopping_cart",
+        "diversity": false
+      },
+      {
+        "name": "atm",
+        "diversity": false
+      },
+      {
+        "name": "put_litter_in_its_place",
+        "diversity": false
+      },
+      {
+        "name": "potable_water",
+        "diversity": false
+      },
+      {
+        "name": "wheelchair",
+        "diversity": false
+      },
+      {
+        "name": "mens",
+        "diversity": false
+      },
+      {
+        "name": "womens",
+        "diversity": false
+      },
+      {
+        "name": "restroom",
+        "diversity": false
+      },
+      {
+        "name": "baby_symbol",
+        "diversity": false
+      },
+      {
+        "name": "wc",
+        "diversity": false
+      },
+      {
+        "name": "passport_control",
+        "diversity": false
+      },
+      {
+        "name": "customs",
+        "diversity": false
+      },
+      {
+        "name": "baggage_claim",
+        "diversity": false
+      },
+      {
+        "name": "left_luggage",
+        "diversity": false
+      },
+      {
+        "name": "warning",
+        "diversity": false
+      },
+      {
+        "name": "children_crossing",
+        "diversity": false
+      },
+      {
+        "name": "no_entry",
+        "diversity": false
+      },
+      {
+        "name": "no_entry_sign",
+        "diversity": false
+      },
+      {
+        "name": "no_bicycles",
+        "diversity": false
+      },
+      {
+        "name": "no_smoking",
+        "diversity": false
+      },
+      {
+        "name": "do_not_litter",
+        "diversity": false
+      },
+      {
+        "name": "non-potable_water",
+        "diversity": false
+      },
+      {
+        "name": "no_pedestrians",
+        "diversity": false
+      },
+      {
+        "name": "no_mobile_phones",
+        "diversity": false
+      },
+      {
+        "name": "underage",
+        "diversity": false
+      },
+      {
+        "name": "radioactive",
+        "diversity": false
+      },
+      {
+        "name": "biohazard",
+        "diversity": false
+      },
+      {
+        "name": "arrow_up",
+        "diversity": false
+      },
+      {
+        "name": "arrow_upper_right",
+        "diversity": false
+      },
+      {
+        "name": "arrow_right",
+        "diversity": false
+      },
+      {
+        "name": "arrow_lower_right",
+        "diversity": false
+      },
+      {
+        "name": "arrow_down",
+        "diversity": false
+      },
+      {
+        "name": "arrow_lower_left",
+        "diversity": false
+      },
+      {
+        "name": "arrow_left",
+        "diversity": false
+      },
+      {
+        "name": "arrow_upper_left",
+        "diversity": false
+      },
+      {
+        "name": "arrow_up_down",
+        "diversity": false
+      },
+      {
+        "name": "left_right_arrow",
+        "diversity": false
+      },
+      {
+        "name": "leftwards_arrow_with_hook",
+        "diversity": false
+      },
+      {
+        "name": "arrow_right_hook",
+        "diversity": false
+      },
+      {
+        "name": "arrow_heading_up",
+        "diversity": false
+      },
+      {
+        "name": "arrow_heading_down",
+        "diversity": false
+      },
+      {
+        "name": "arrows_clockwise",
+        "diversity": false
+      },
+      {
+        "name": "arrows_counterclockwise",
+        "diversity": false
+      },
+      {
+        "name": "back",
+        "diversity": false
+      },
+      {
+        "name": "end",
+        "diversity": false
+      },
+      {
+        "name": "on",
+        "diversity": false
+      },
+      {
+        "name": "soon",
+        "diversity": false
+      },
+      {
+        "name": "top",
+        "diversity": false
+      },
+      {
+        "name": "place_of_worship",
+        "diversity": false
+      },
+      {
+        "name": "atom_symbol",
+        "diversity": false
+      },
+      {
+        "name": "om",
+        "diversity": false
+      },
+      {
+        "name": "star_of_david",
+        "diversity": false
+      },
+      {
+        "name": "wheel_of_dharma",
+        "diversity": false
+      },
+      {
+        "name": "yin_yang",
+        "diversity": false
+      },
+      {
+        "name": "latin_cross",
+        "diversity": false
+      },
+      {
+        "name": "orthodox_cross",
+        "diversity": false
+      },
+      {
+        "name": "star_and_crescent",
+        "diversity": false
+      },
+      {
+        "name": "peace_symbol",
+        "diversity": false
+      },
+      {
+        "name": "menorah",
+        "diversity": false
+      },
+      {
+        "name": "six_pointed_star",
+        "diversity": false
+      },
+      {
+        "name": "aries",
+        "diversity": false
+      },
+      {
+        "name": "taurus",
+        "diversity": false
+      },
+      {
+        "name": "gemini",
+        "diversity": false
+      },
+      {
+        "name": "cancer",
+        "diversity": false
+      },
+      {
+        "name": "leo",
+        "diversity": false
+      },
+      {
+        "name": "virgo",
+        "diversity": false
+      },
+      {
+        "name": "libra",
+        "diversity": false
+      },
+      {
+        "name": "scorpius",
+        "diversity": false
+      },
+      {
+        "name": "sagittarius",
+        "diversity": false
+      },
+      {
+        "name": "capricorn",
+        "diversity": false
+      },
+      {
+        "name": "aquarius",
+        "diversity": false
+      },
+      {
+        "name": "pisces",
+        "diversity": false
+      },
+      {
+        "name": "ophiuchus",
+        "diversity": false
+      },
+      {
+        "name": "twisted_rightwards_arrows",
+        "diversity": false
+      },
+      {
+        "name": "repeat",
+        "diversity": false
+      },
+      {
+        "name": "repeat_one",
+        "diversity": false
+      },
+      {
+        "name": "arrow_forward",
+        "diversity": false
+      },
+      {
+        "name": "fast_forward",
+        "diversity": false
+      },
+      {
+        "name": "next_track_button",
+        "diversity": false
+      },
+      {
+        "name": "play_or_pause_button",
+        "diversity": false
+      },
+      {
+        "name": "arrow_backward",
+        "diversity": false
+      },
+      {
+        "name": "rewind",
+        "diversity": false
+      },
+      {
+        "name": "previous_track_button",
+        "diversity": false
+      },
+      {
+        "name": "arrow_up_small",
+        "diversity": false
+      },
+      {
+        "name": "arrow_double_up",
+        "diversity": false
+      },
+      {
+        "name": "arrow_down_small",
+        "diversity": false
+      },
+      {
+        "name": "arrow_double_down",
+        "diversity": false
+      },
+      {
+        "name": "pause_button",
+        "diversity": false
+      },
+      {
+        "name": "stop_button",
+        "diversity": false
+      },
+      {
+        "name": "record_button",
+        "diversity": false
+      },
+      {
+        "name": "cinema",
+        "diversity": false
+      },
+      {
+        "name": "low_brightness",
+        "diversity": false
+      },
+      {
+        "name": "high_brightness",
+        "diversity": false
+      },
+      {
+        "name": "signal_strength",
+        "diversity": false
+      },
+      {
+        "name": "vibration_mode",
+        "diversity": false
+      },
+      {
+        "name": "mobile_phone_off",
+        "diversity": false
+      },
+      {
+        "name": "recycle",
+        "diversity": false
+      },
+      {
+        "name": "fleur_de_lis",
+        "diversity": false
+      },
+      {
+        "name": "trident",
+        "diversity": false
+      },
+      {
+        "name": "name_badge",
+        "diversity": false
+      },
+      {
+        "name": "beginner",
+        "diversity": false
+      },
+      {
+        "name": "o",
+        "diversity": false
+      },
+      {
+        "name": "white_check_mark",
+        "diversity": false
+      },
+      {
+        "name": "ballot_box_with_check",
+        "diversity": false
+      },
+      {
+        "name": "heavy_check_mark",
+        "diversity": false
+      },
+      {
+        "name": "heavy_multiplication_x",
+        "diversity": false
+      },
+      {
+        "name": "x",
+        "diversity": false
+      },
+      {
+        "name": "negative_squared_cross_mark",
+        "diversity": false
+      },
+      {
+        "name": "heavy_plus_sign",
+        "diversity": false
+      },
+      {
+        "name": "heavy_minus_sign",
+        "diversity": false
+      },
+      {
+        "name": "heavy_division_sign",
+        "diversity": false
+      },
+      {
+        "name": "curly_loop",
+        "diversity": false
+      },
+      {
+        "name": "loop",
+        "diversity": false
+      },
+      {
+        "name": "part_alternation_mark",
+        "diversity": false
+      },
+      {
+        "name": "eight_spoked_asterisk",
+        "diversity": false
+      },
+      {
+        "name": "eight_pointed_black_star",
+        "diversity": false
+      },
+      {
+        "name": "sparkle",
+        "diversity": false
+      },
+      {
+        "name": "bangbang",
+        "diversity": false
+      },
+      {
+        "name": "interrobang",
+        "diversity": false
+      },
+      {
+        "name": "question",
+        "diversity": false
+      },
+      {
+        "name": "grey_question",
+        "diversity": false
+      },
+      {
+        "name": "grey_exclamation",
+        "diversity": false
+      },
+      {
+        "name": "exclamation",
+        "diversity": false
+      },
+      {
+        "name": "wavy_dash",
+        "diversity": false
+      },
+      {
+        "name": "copyright",
+        "diversity": false
+      },
+      {
+        "name": "registered",
+        "diversity": false
+      },
+      {
+        "name": "tm",
+        "diversity": false
+      },
+      {
+        "name": "hash",
+        "diversity": false
+      },
+      {
+        "name": "asterisk",
+        "diversity": false
+      },
+      {
+        "name": "zero",
+        "diversity": false
+      },
+      {
+        "name": "one",
+        "diversity": false
+      },
+      {
+        "name": "two",
+        "diversity": false
+      },
+      {
+        "name": "three",
+        "diversity": false
+      },
+      {
+        "name": "four",
+        "diversity": false
+      },
+      {
+        "name": "five",
+        "diversity": false
+      },
+      {
+        "name": "six",
+        "diversity": false
+      },
+      {
+        "name": "seven",
+        "diversity": false
+      },
+      {
+        "name": "eight",
+        "diversity": false
+      },
+      {
+        "name": "nine",
+        "diversity": false
+      },
+      {
+        "name": "keycap_ten",
+        "diversity": false
+      },
+      {
+        "name": "100",
+        "diversity": false
+      },
+      {
+        "name": "capital_abcd",
+        "diversity": false
+      },
+      {
+        "name": "abcd",
+        "diversity": false
+      },
+      {
+        "name": "1234",
+        "diversity": false
+      },
+      {
+        "name": "symbols",
+        "diversity": false
+      },
+      {
+        "name": "abc",
+        "diversity": false
+      },
+      {
+        "name": "a",
+        "diversity": false
+      },
+      {
+        "name": "ab",
+        "diversity": false
+      },
+      {
+        "name": "b",
+        "diversity": false
+      },
+      {
+        "name": "cl",
+        "diversity": false
+      },
+      {
+        "name": "cool",
+        "diversity": false
+      },
+      {
+        "name": "free",
+        "diversity": false
+      },
+      {
+        "name": "information_source",
+        "diversity": false
+      },
+      {
+        "name": "id",
+        "diversity": false
+      },
+      {
+        "name": "m",
+        "diversity": false
+      },
+      {
+        "name": "new",
+        "diversity": false
+      },
+      {
+        "name": "ng",
+        "diversity": false
+      },
+      {
+        "name": "o2",
+        "diversity": false
+      },
+      {
+        "name": "ok",
+        "diversity": false
+      },
+      {
+        "name": "parking",
+        "diversity": false
+      },
+      {
+        "name": "sos",
+        "diversity": false
+      },
+      {
+        "name": "up",
+        "diversity": false
+      },
+      {
+        "name": "vs",
+        "diversity": false
+      },
+      {
+        "name": "koko",
+        "diversity": false
+      },
+      {
+        "name": "sa",
+        "diversity": false
+      },
+      {
+        "name": "u6708",
+        "diversity": false
+      },
+      {
+        "name": "u6709",
+        "diversity": false
+      },
+      {
+        "name": "u6307",
+        "diversity": false
+      },
+      {
+        "name": "ideograph_advantage",
+        "diversity": false
+      },
+      {
+        "name": "u5272",
+        "diversity": false
+      },
+      {
+        "name": "u7121",
+        "diversity": false
+      },
+      {
+        "name": "u7981",
+        "diversity": false
+      },
+      {
+        "name": "accept",
+        "diversity": false
+      },
+      {
+        "name": "u7533",
+        "diversity": false
+      },
+      {
+        "name": "u5408",
+        "diversity": false
+      },
+      {
+        "name": "u7a7a",
+        "diversity": false
+      },
+      {
+        "name": "congratulations",
+        "diversity": false
+      },
+      {
+        "name": "secret",
+        "diversity": false
+      },
+      {
+        "name": "u55b6",
+        "diversity": false
+      },
+      {
+        "name": "u6e80",
+        "diversity": false
+      },
+      {
+        "name": "black_small_square",
+        "diversity": false
+      },
+      {
+        "name": "white_small_square",
+        "diversity": false
+      },
+      {
+        "name": "white_medium_square",
+        "diversity": false
+      },
+      {
+        "name": "black_medium_square",
+        "diversity": false
+      },
+      {
+        "name": "white_medium_small_square",
+        "diversity": false
+      },
+      {
+        "name": "black_medium_small_square",
+        "diversity": false
+      },
+      {
+        "name": "black_large_square",
+        "diversity": false
+      },
+      {
+        "name": "white_large_square",
+        "diversity": false
+      },
+      {
+        "name": "large_orange_diamond",
+        "diversity": false
+      },
+      {
+        "name": "large_blue_diamond",
+        "diversity": false
+      },
+      {
+        "name": "small_orange_diamond",
+        "diversity": false
+      },
+      {
+        "name": "small_blue_diamond",
+        "diversity": false
+      },
+      {
+        "name": "small_red_triangle",
+        "diversity": false
+      },
+      {
+        "name": "small_red_triangle_down",
+        "diversity": false
+      },
+      {
+        "name": "diamond_shape_with_a_dot_inside",
+        "diversity": false
+      },
+      {
+        "name": "radio_button",
+        "diversity": false
+      },
+      {
+        "name": "black_square_button",
+        "diversity": false
+      },
+      {
+        "name": "white_square_button",
+        "diversity": false
+      },
+      {
+        "name": "white_circle",
+        "diversity": false
+      },
+      {
+        "name": "black_circle",
+        "diversity": false
+      },
+      {
+        "name": "red_circle",
+        "diversity": false
+      },
+      {
+        "name": "large_blue_circle",
+        "diversity": false
+      },
+      {
+        "name": "hourglass",
+        "diversity": false
+      },
+      {
+        "name": "hourglass_flowing_sand",
+        "diversity": false
+      },
+      {
+        "name": "watch",
+        "diversity": false
+      },
+      {
+        "name": "alarm_clock",
+        "diversity": false
+      },
+      {
+        "name": "stopwatch",
+        "diversity": false
+      },
+      {
+        "name": "timer_clock",
+        "diversity": false
+      },
+      {
+        "name": "mantelpiece_clock",
+        "diversity": false
+      },
+      {
+        "name": "clock12",
+        "diversity": false
+      },
+      {
+        "name": "clock1230",
+        "diversity": false
+      },
+      {
+        "name": "clock1",
+        "diversity": false
+      },
+      {
+        "name": "clock130",
+        "diversity": false
+      },
+      {
+        "name": "clock2",
+        "diversity": false
+      },
+      {
+        "name": "clock230",
+        "diversity": false
+      },
+      {
+        "name": "clock3",
+        "diversity": false
+      },
+      {
+        "name": "clock330",
+        "diversity": false
+      },
+      {
+        "name": "clock4",
+        "diversity": false
+      },
+      {
+        "name": "clock430",
+        "diversity": false
+      },
+      {
+        "name": "clock5",
+        "diversity": false
+      },
+      {
+        "name": "clock530",
+        "diversity": false
+      },
+      {
+        "name": "clock6",
+        "diversity": false
+      },
+      {
+        "name": "clock630",
+        "diversity": false
+      },
+      {
+        "name": "clock7",
+        "diversity": false
+      },
+      {
+        "name": "clock730",
+        "diversity": false
+      },
+      {
+        "name": "clock8",
+        "diversity": false
+      },
+      {
+        "name": "clock830",
+        "diversity": false
+      },
+      {
+        "name": "clock9",
+        "diversity": false
+      },
+      {
+        "name": "clock930",
+        "diversity": false
+      },
+      {
+        "name": "clock10",
+        "diversity": false
+      },
+      {
+        "name": "clock1030",
+        "diversity": false
+      },
+      {
+        "name": "clock11",
+        "diversity": false
+      },
+      {
+        "name": "clock1130",
+        "diversity": false
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/lib/es6_module_transpiler/support/es6-module-transpiler.js b/lib/es6_module_transpiler/support/es6-module-transpiler.js
deleted file mode 100644
index dfb91bc439b..00000000000
--- a/lib/es6_module_transpiler/support/es6-module-transpiler.js
+++ /dev/null
@@ -1,7195 +0,0 @@
-// Copyright 2012 Traceur Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/**
- * The traceur runtime.
- */
-(function(global) {
-  'use strict';
-
-  var $create = Object.create;
-  var $defineProperty = Object.defineProperty;
-  var $freeze = Object.freeze;
-  var $getOwnPropertyNames = Object.getOwnPropertyNames;
-  var $getPrototypeOf = Object.getPrototypeOf;
-  var $hasOwnProperty = Object.prototype.hasOwnProperty;
-
-  function nonEnum(value) {
-    return {
-      configurable: true,
-      enumerable: false,
-      value: value,
-      writable: true
-    };
-  }
-
-  var method = nonEnum;
-
-  function polyfillString(String) {
-    // Harmony String Extras
-    // http://wiki.ecmascript.org/doku.php?id=harmony:string_extras
-    Object.defineProperties(String.prototype, {
-      startsWith: method(function(s) {
-       return this.lastIndexOf(s, 0) === 0;
-      }),
-      endsWith: method(function(s) {
-        var t = String(s);
-        var l = this.length - t.length;
-        return l >= 0 && this.indexOf(t, l) === l;
-      }),
-      contains: method(function(s) {
-        return this.indexOf(s) !== -1;
-      }),
-      toArray: method(function() {
-        return this.split('');
-      })
-    });
-
-    // 15.5.3.4 String.raw ( callSite, ...substitutions)
-    $defineProperty(String, 'raw', {
-      value: function(callsite) {
-        var raw = callsite.raw;
-        var len = raw.length >>> 0;  // ToUint
-        if (len === 0)
-          return '';
-        var s = '';
-        var i = 0;
-        while (true) {
-          s += raw[i];
-          if (i + 1 === len)
-            return s;
-          s += arguments[++i];
-        }
-      },
-      configurable: true,
-      enumerable: false,
-      writable: true
-    });
-  }
-
-  var counter = 0;
-
-  /**
-   * Generates a new unique string.
-   * @return {string}
-   */
-  function newUniqueString() {
-    return '__$' + Math.floor(Math.random() * 1e9) + '$' + ++counter + '$__';
-  }
-
-  var nameRe = /^__\$(?:\d+)\$(?:\d+)\$__$/;
-
-  var internalStringValueName = newUniqueString();
-
-  /**
-   * Creates a new private name object.
-   * @param {string=} string Optional string used for toString.
-   * @constructor
-   */
-  function Name(string) {
-    if (!string)
-      string = newUniqueString();
-    $defineProperty(this, internalStringValueName, {value: newUniqueString()});
-
-    function toString() {
-      return string;
-    }
-    $freeze(toString);
-    $freeze(toString.prototype);
-    var toStringDescr = method(toString);
-    $defineProperty(this, 'toString', toStringDescr);
-
-    this.public = $freeze($create(null, {
-      toString: method($freeze(function toString() {
-        return string;
-      }))
-    }));
-    $freeze(this.public.toString.prototype);
-
-    $freeze(this);
-  };
-  $freeze(Name);
-  $freeze(Name.prototype);
-
-  function assertName(val) {
-    if (!NameModule.isName(val))
-      throw new TypeError(val + ' is not a Name');
-    return val;
-  }
-
-  // Private name.
-
-  // Collection getters and setters
-  var elementDeleteName = new Name();
-  var elementGetName = new Name();
-  var elementSetName = new Name();
-
-  // HACK: We should use runtime/modules/std/name.js or something like that.
-  var NameModule = $freeze({
-    Name: function(str) {
-      return new Name(str);
-    },
-    isName: function(x) {
-      return x instanceof Name;
-    },
-    elementGet: elementGetName,
-    elementSet: elementSetName,
-    elementDelete: elementDeleteName
-  });
-
-  var filter = Array.prototype.filter.call.bind(Array.prototype.filter);
-
-  // Override getOwnPropertyNames to filter out private name keys.
-  function getOwnPropertyNames(object) {
-    return filter($getOwnPropertyNames(object), function(str) {
-      return !nameRe.test(str);
-    });
-  }
-
-  // Override Object.prototpe.hasOwnProperty to always return false for
-  // private names.
-  function hasOwnProperty(name) {
-    if (NameModule.isName(name) || nameRe.test(name))
-      return false;
-    return $hasOwnProperty.call(this, name);
-  }
-
-  function elementDelete(object, name) {
-    if (traceur.options.trapMemberLookup &&
-        hasPrivateNameProperty(object, elementDeleteName)) {
-      return getProperty(object, elementDeleteName).call(object, name);
-    }
-    return deleteProperty(object, name);
-  }
-
-  function elementGet(object, name) {
-    if (traceur.options.trapMemberLookup &&
-        hasPrivateNameProperty(object, elementGetName)) {
-      return getProperty(object, elementGetName).call(object, name);
-    }
-    return getProperty(object, name);
-  }
-
-  function elementHas(object, name) {
-    // Should we allow trapping this too?
-    return has(object, name);
-  }
-
-  function elementSet(object, name, value) {
-    if (traceur.options.trapMemberLookup &&
-        hasPrivateNameProperty(object, elementSetName)) {
-      getProperty(object, elementSetName).call(object, name, value);
-    } else {
-      setProperty(object, name, value);
-    }
-    return value;
-  }
-
-  function assertNotName(s) {
-    if (nameRe.test(s))
-      throw Error('Invalid access to private name');
-  }
-
-  function deleteProperty(object, name) {
-    if (NameModule.isName(name))
-      return delete object[name[internalStringValueName]];
-    if (nameRe.test(name))
-      return true;
-    return delete object[name];
-  }
-
-  function getProperty(object, name) {
-    if (NameModule.isName(name))
-      return object[name[internalStringValueName]];
-    if (nameRe.test(name))
-      return undefined;
-    return object[name];
-  }
-
-  function hasPrivateNameProperty(object, name) {
-    return name[internalStringValueName] in Object(object);
-  }
-
-  function has(object, name) {
-    if (NameModule.isName(name) || nameRe.test(name))
-      return false;
-    return name in Object(object);
-  }
-
-  // This is a bit simplistic.
-  // http://wiki.ecmascript.org/doku.php?id=strawman:refactoring_put#object._get_set_property_built-ins
-  function setProperty(object, name, value) {
-    if (NameModule.isName(name)) {
-      var descriptor = $getPropertyDescriptor(object,
-                                              [name[internalStringValueName]]);
-      if (descriptor)
-        object[name[internalStringValueName]] = value;
-      else
-        $defineProperty(object, name[internalStringValueName], nonEnum(value));
-    } else {
-      assertNotName(name);
-      object[name] = value;
-    }
-  }
-
-  function defineProperty(object, name, descriptor) {
-    if (NameModule.isName(name)) {
-      // Private names should never be enumerable.
-      if (descriptor.enumerable) {
-        descriptor = Object.create(descriptor, {
-          enumerable: {value: false}
-        });
-      }
-      $defineProperty(object, name[internalStringValueName], descriptor);
-    } else {
-      assertNotName(name);
-      $defineProperty(object, name, descriptor);
-    }
-  }
-
-  function $getPropertyDescriptor(obj, name) {
-    while (obj !== null) {
-      var result = Object.getOwnPropertyDescriptor(obj, name);
-      if (result)
-        return result;
-      obj = $getPrototypeOf(obj);
-    }
-    return undefined;
-  }
-
-  function getPropertyDescriptor(obj, name) {
-    if (NameModule.isName(name))
-      return undefined;
-    assertNotName(name);
-    return $getPropertyDescriptor(obj, name);
-  }
-
-  function polyfillObject(Object) {
-    $defineProperty(Object, 'defineProperty', {value: defineProperty});
-    $defineProperty(Object, 'deleteProperty', method(deleteProperty));
-    $defineProperty(Object, 'getOwnPropertyNames',
-                    {value: getOwnPropertyNames});
-    $defineProperty(Object, 'getProperty', method(getProperty));
-    $defineProperty(Object, 'getPropertyDescriptor',
-                    method(getPropertyDescriptor));
-    $defineProperty(Object, 'has', method(has));
-    $defineProperty(Object, 'setProperty', method(setProperty));
-    $defineProperty(Object.prototype, 'hasOwnProperty',
-                    {value: hasOwnProperty});
-
-    // Object.is
-
-    // Unlike === this returns true for (NaN, NaN) and false for (0, -0).
-    function is(left, right) {
-      if (left === right)
-        return left !== 0 || 1 / left === 1 / right;
-      return left !== left && right !== right;
-    }
-
-    $defineProperty(Object, 'is', method(is));
-  }
-
-  // Iterators.
-  var iteratorName = new Name('iterator');
-
-  var IterModule = {
-    get iterator() {
-      return iteratorName;
-    }
-    // TODO: Implement the rest of @iter and move it to a different file that
-    // gets compiled.
-  };
-
-  function getIterator(collection) {
-    return getProperty(collection, iteratorName).call(collection);
-  }
-
-  function returnThis() {
-    return this;
-  }
-
-  function addIterator(object) {
-    // Generator instances are iterable.
-    setProperty(object, iteratorName, returnThis);
-    return object;
-  }
-
-  function polyfillArray(Array) {
-    // Make arrays iterable.
-    defineProperty(Array.prototype, IterModule.iterator, method(function() {
-      var index = 0;
-      var array = this;
-      return {
-        next: function() {
-          if (index < array.length) {
-            return array[index++];
-          }
-          throw StopIterationLocal;
-        }
-      };
-    }));
-  }
-
-  // Generators: GeneratorReturn
-  var GeneratorReturnLocal;
-
-  function setGeneratorReturn(GeneratorReturn, global) {
-    switch (typeof GeneratorReturn) {
-      case 'function':
-        // StopIterationLocal instanceof GeneratorReturnLocal means we probably
-        // want to maintain that invariant when we change GeneratorReturnLocal.
-        if (typeof GeneratorReturnLocal === 'function' &&
-            StopIterationLocal instanceof GeneratorReturnLocal) {
-          GeneratorReturnLocal = GeneratorReturn;
-          setStopIteration(undefined, global);
-          return;
-        }
-        GeneratorReturnLocal = GeneratorReturn;
-        return;
-      case 'undefined':
-        GeneratorReturnLocal = function(v) {
-          this.value = v;
-        };
-        GeneratorReturnLocal.prototype = {
-          toString: function() {
-            return '[object GeneratorReturn ' + this.value + ']';
-          }
-        };
-        return;
-      default:
-        throw new TypeError('constructor function required');
-    }
-  }
-
-  setGeneratorReturn();
-
-  // Generators: StopIteration
-  var StopIterationLocal;
-
-  function isStopIteration(x) {
-    return x === StopIterationLocal || x instanceof GeneratorReturnLocal;
-  }
-
-  function setStopIteration(StopIteration, global) {
-    switch (typeof StopIteration) {
-      case 'object':
-        StopIterationLocal = StopIteration;
-        break;
-      case 'undefined':
-        StopIterationLocal = new GeneratorReturnLocal();
-        StopIterationLocal.toString = function() {
-          return '[object StopIteration]';
-        };
-        break;
-      default:
-        throw new TypeError('invalid StopIteration type.');
-    }
-    if (global)
-      global.StopIteration = StopIteration;
-  }
-
-  setStopIteration(global.StopIteration, global);
-
-  /**
-   * @param {Function} canceller
-   * @constructor
-   */
-  function Deferred(canceller) {
-    this.canceller_ = canceller;
-    this.listeners_ = [];
-  }
-
-  function notify(self) {
-    while (self.listeners_.length > 0) {
-      var current = self.listeners_.shift();
-      var currentResult = undefined;
-      try {
-        try {
-          if (self.result_[1]) {
-            if (current.errback)
-              currentResult = current.errback.call(undefined, self.result_[0]);
-          } else {
-            if (current.callback)
-              currentResult = current.callback.call(undefined, self.result_[0]);
-          }
-          current.deferred.callback(currentResult);
-        } catch (err) {
-          current.deferred.errback(err);
-        }
-      } catch (unused) {}
-    }
-  }
-
-  function fire(self, value, isError) {
-    if (self.fired_)
-      throw new Error('already fired');
-
-    self.fired_ = true;
-    self.result_ = [value, isError];
-    notify(self);
-  }
-
-  Deferred.prototype = {
-    fired_: false,
-    result_: undefined,
-
-    createPromise: function() {
-      return {then: this.then.bind(this), cancel: this.cancel.bind(this)};
-    },
-
-    callback: function(value) {
-      fire(this, value, false);
-    },
-
-    errback: function(err) {
-      fire(this, err, true);
-    },
-
-    then: function(callback, errback) {
-      var result = new Deferred(this.cancel.bind(this));
-      this.listeners_.push({
-        deferred: result,
-        callback: callback,
-        errback: errback
-      });
-      if (this.fired_)
-        notify(this);
-      return result.createPromise();
-    },
-
-    cancel: function() {
-      if (this.fired_)
-        throw new Error('already finished');
-      var result;
-      if (this.canceller_) {
-        result = this.canceller_(this);
-        if (!result instanceof Error)
-          result = new Error(result);
-      } else {
-        result = new Error('cancelled');
-      }
-      if (!this.fired_) {
-        this.result_ = [result, true];
-        notify(this);
-      }
-    }
-  };
-
-  var modules = $freeze({
-    get '@name'() {
-      return NameModule;
-    },
-    get '@iter'() {
-      return IterModule;
-    }
-  });
-
-  // TODO(arv): Don't export this.
-  global.Deferred = Deferred;
-
-  function setupGlobals(global) {
-    polyfillString(global.String);
-    polyfillObject(global.Object);
-    polyfillArray(global.Array);
-  }
-
-  setupGlobals(global);
-
-  // Return the runtime namespace.
-  var runtime = {
-    Deferred: Deferred,
-    GeneratorReturn: GeneratorReturnLocal,
-    setGeneratorReturn: setGeneratorReturn,
-    StopIteration: StopIterationLocal,
-    setStopIteration: setStopIteration,
-    isStopIteration: isStopIteration,
-    addIterator: addIterator,
-    assertName: assertName,
-    createName: NameModule.Name,
-    deleteProperty: deleteProperty,
-    elementDelete: elementDelete,
-    elementGet: elementGet,
-    elementHas: elementHas,
-    elementSet: elementSet,
-    getIterator: getIterator,
-    getProperty: getProperty,
-    setProperty: setProperty,
-    setupGlobals: setupGlobals,
-    has: has,
-    modules: modules,
-  };
-
-  // This file is sometimes used without traceur.js.
-  if (typeof traceur !== 'undefined')
-    traceur.setRuntime(runtime);
-  else
-    global.traceur = {runtime: runtime};
-
-})(typeof global !== 'undefined' ? global : this);
-
-!function(e){"object"==typeof exports?module.exports=e():"function"==typeof define&&define.amd?define(e):"undefined"!=typeof window?window.ModuleTranspiler=e():"undefined"!=typeof global?global.ModuleTranspiler=e():"undefined"!=typeof self&&(self.ModuleTranspiler=e())}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-
-
-/*
-  Copyright (C) 2013 Ariya Hidayat <ariya.hidayat@gmail.com>
-  Copyright (C) 2013 Thaddee Tyl <thaddee.tyl@gmail.com>
-  Copyright (C) 2012 Ariya Hidayat <ariya.hidayat@gmail.com>
-  Copyright (C) 2012 Mathias Bynens <mathias@qiwi.be>
-  Copyright (C) 2012 Joost-Wim Boekesteijn <joost-wim@boekesteijn.nl>
-  Copyright (C) 2012 Kris Kowal <kris.kowal@cixar.com>
-  Copyright (C) 2012 Yusuke Suzuki <utatane.tea@gmail.com>
-  Copyright (C) 2012 Arpad Borsos <arpad.borsos@googlemail.com>
-  Copyright (C) 2011 Ariya Hidayat <ariya.hidayat@gmail.com>
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*jslint bitwise:true plusplus:true */
-/*global esprima:true, define:true, exports:true, window: true,
-throwError: true, generateStatement: true, peek: true,
-parseAssignmentExpression: true, parseBlock: true,
-parseClassExpression: true, parseClassDeclaration: true, parseExpression: true,
-parseForStatement: true,
-parseFunctionDeclaration: true, parseFunctionExpression: true,
-parseFunctionSourceElements: true, parseVariableIdentifier: true,
-parseImportSpecifier: true,
-parseLeftHandSideExpression: true, parseParams: true, validateParam: true,
-parseSpreadOrAssignmentExpression: true,
-parseStatement: true, parseSourceElement: true, parseModuleBlock: true, parseConciseBody: true,
-parseYieldExpression: true
-*/
-
-(function (root, factory) {
-    'use strict';
-
-    // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js,
-    // Rhino, and plain browser loading.
-    if (typeof define === 'function' && define.amd) {
-        define(['exports'], factory);
-    } else if (typeof exports !== 'undefined') {
-        factory(exports);
-    } else {
-        factory((root.esprima = {}));
-    }
-}(this, function (exports) {
-    'use strict';
-
-    var Token,
-        TokenName,
-        FnExprTokens,
-        Syntax,
-        PropertyKind,
-        Messages,
-        Regex,
-        SyntaxTreeDelegate,
-        ClassPropertyType,
-        source,
-        strict,
-        index,
-        lineNumber,
-        lineStart,
-        length,
-        delegate,
-        lookahead,
-        state,
-        extra;
-
-    Token = {
-        BooleanLiteral: 1,
-        EOF: 2,
-        Identifier: 3,
-        Keyword: 4,
-        NullLiteral: 5,
-        NumericLiteral: 6,
-        Punctuator: 7,
-        StringLiteral: 8,
-        RegularExpression: 9,
-        Template: 10
-    };
-
-    TokenName = {};
-    TokenName[Token.BooleanLiteral] = 'Boolean';
-    TokenName[Token.EOF] = '<end>';
-    TokenName[Token.Identifier] = 'Identifier';
-    TokenName[Token.Keyword] = 'Keyword';
-    TokenName[Token.NullLiteral] = 'Null';
-    TokenName[Token.NumericLiteral] = 'Numeric';
-    TokenName[Token.Punctuator] = 'Punctuator';
-    TokenName[Token.StringLiteral] = 'String';
-    TokenName[Token.RegularExpression] = 'RegularExpression';
-
-    // A function following one of those tokens is an expression.
-    FnExprTokens = ["(", "{", "[", "in", "typeof", "instanceof", "new",
-                    "return", "case", "delete", "throw", "void",
-                    // assignment operators
-                    "=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=",
-                    "&=", "|=", "^=", ",",
-                    // binary/unary operators
-                    "+", "-", "*", "/", "%", "++", "--", "<<", ">>", ">>>", "&",
-                    "|", "^", "!", "~", "&&", "||", "?", ":", "===", "==", ">=",
-                    "<=", "<", ">", "!=", "!=="];
-
-    Syntax = {
-        ArrayExpression: 'ArrayExpression',
-        ArrayPattern: 'ArrayPattern',
-        ArrowFunctionExpression: 'ArrowFunctionExpression',
-        AssignmentExpression: 'AssignmentExpression',
-        BinaryExpression: 'BinaryExpression',
-        BlockStatement: 'BlockStatement',
-        BreakStatement: 'BreakStatement',
-        CallExpression: 'CallExpression',
-        CatchClause: 'CatchClause',
-        ClassBody: 'ClassBody',
-        ClassDeclaration: 'ClassDeclaration',
-        ClassExpression: 'ClassExpression',
-        ClassHeritage: 'ClassHeritage',
-        ComprehensionBlock: 'ComprehensionBlock',
-        ComprehensionExpression: 'ComprehensionExpression',
-        ConditionalExpression: 'ConditionalExpression',
-        ContinueStatement: 'ContinueStatement',
-        DebuggerStatement: 'DebuggerStatement',
-        DoWhileStatement: 'DoWhileStatement',
-        EmptyStatement: 'EmptyStatement',
-        ExportDeclaration: 'ExportDeclaration',
-        ExportBatchSpecifier: 'ExportBatchSpecifier',
-        ExportSpecifier: 'ExportSpecifier',
-        ExpressionStatement: 'ExpressionStatement',
-        ForInStatement: 'ForInStatement',
-        ForOfStatement: 'ForOfStatement',
-        ForStatement: 'ForStatement',
-        FunctionDeclaration: 'FunctionDeclaration',
-        FunctionExpression: 'FunctionExpression',
-        Identifier: 'Identifier',
-        IfStatement: 'IfStatement',
-        ImportDeclaration: 'ImportDeclaration',
-        ImportSpecifier: 'ImportSpecifier',
-        LabeledStatement: 'LabeledStatement',
-        Literal: 'Literal',
-        LogicalExpression: 'LogicalExpression',
-        MemberExpression: 'MemberExpression',
-        MethodDefinition: 'MethodDefinition',
-        ModuleDeclaration: 'ModuleDeclaration',
-        NewExpression: 'NewExpression',
-        ObjectExpression: 'ObjectExpression',
-        ObjectPattern: 'ObjectPattern',
-        Program: 'Program',
-        Property: 'Property',
-        ReturnStatement: 'ReturnStatement',
-        SequenceExpression: 'SequenceExpression',
-        SpreadElement: 'SpreadElement',
-        SwitchCase: 'SwitchCase',
-        SwitchStatement: 'SwitchStatement',
-        TaggedTemplateExpression: 'TaggedTemplateExpression',
-        TemplateElement: 'TemplateElement',
-        TemplateLiteral: 'TemplateLiteral',
-        ThisExpression: 'ThisExpression',
-        ThrowStatement: 'ThrowStatement',
-        TryStatement: 'TryStatement',
-        UnaryExpression: 'UnaryExpression',
-        UpdateExpression: 'UpdateExpression',
-        VariableDeclaration: 'VariableDeclaration',
-        VariableDeclarator: 'VariableDeclarator',
-        WhileStatement: 'WhileStatement',
-        WithStatement: 'WithStatement',
-        YieldExpression: 'YieldExpression'
-    };
-
-    PropertyKind = {
-        Data: 1,
-        Get: 2,
-        Set: 4
-    };
-
-    ClassPropertyType = {
-        'static': 'static',
-        prototype: 'prototype'
-    };
-
-    // Error messages should be identical to V8.
-    Messages = {
-        UnexpectedToken:  'Unexpected token %0',
-        UnexpectedNumber:  'Unexpected number',
-        UnexpectedString:  'Unexpected string',
-        UnexpectedIdentifier:  'Unexpected identifier',
-        UnexpectedReserved:  'Unexpected reserved word',
-        UnexpectedTemplate:  'Unexpected quasi %0',
-        UnexpectedEOS:  'Unexpected end of input',
-        NewlineAfterThrow:  'Illegal newline after throw',
-        InvalidRegExp: 'Invalid regular expression',
-        UnterminatedRegExp:  'Invalid regular expression: missing /',
-        InvalidLHSInAssignment:  'Invalid left-hand side in assignment',
-        InvalidLHSInFormalsList:  'Invalid left-hand side in formals list',
-        InvalidLHSInForIn:  'Invalid left-hand side in for-in',
-        MultipleDefaultsInSwitch: 'More than one default clause in switch statement',
-        NoCatchOrFinally:  'Missing catch or finally after try',
-        UnknownLabel: 'Undefined label \'%0\'',
-        Redeclaration: '%0 \'%1\' has already been declared',
-        IllegalContinue: 'Illegal continue statement',
-        IllegalBreak: 'Illegal break statement',
-        IllegalDuplicateClassProperty: 'Illegal duplicate property in class definition',
-        IllegalReturn: 'Illegal return statement',
-        IllegalYield: 'Illegal yield expression',
-        IllegalSpread: 'Illegal spread element',
-        StrictModeWith:  'Strict mode code may not include a with statement',
-        StrictCatchVariable:  'Catch variable may not be eval or arguments in strict mode',
-        StrictVarName:  'Variable name may not be eval or arguments in strict mode',
-        StrictParamName:  'Parameter name eval or arguments is not allowed in strict mode',
-        StrictParamDupe: 'Strict mode function may not have duplicate parameter names',
-        ParameterAfterRestParameter: 'Rest parameter must be final parameter of an argument list',
-        DefaultRestParameter: 'Rest parameter can not have a default value',
-        ElementAfterSpreadElement: 'Spread must be the final element of an element list',
-        ObjectPatternAsRestParameter: 'Invalid rest parameter',
-        ObjectPatternAsSpread: 'Invalid spread argument',
-        StrictFunctionName:  'Function name may not be eval or arguments in strict mode',
-        StrictOctalLiteral:  'Octal literals are not allowed in strict mode.',
-        StrictDelete:  'Delete of an unqualified identifier in strict mode.',
-        StrictDuplicateProperty:  'Duplicate data property in object literal not allowed in strict mode',
-        AccessorDataProperty:  'Object literal may not have data and accessor property with the same name',
-        AccessorGetSet:  'Object literal may not have multiple get/set accessors with the same name',
-        StrictLHSAssignment:  'Assignment to eval or arguments is not allowed in strict mode',
-        StrictLHSPostfix:  'Postfix increment/decrement may not have eval or arguments operand in strict mode',
-        StrictLHSPrefix:  'Prefix increment/decrement may not have eval or arguments operand in strict mode',
-        StrictReservedWord:  'Use of future reserved word in strict mode',
-        NewlineAfterModule:  'Illegal newline after module',
-        NoFromAfterImport: 'Missing from after import',
-        InvalidModuleSpecifier: 'Invalid module specifier',
-        NestedModule: 'Module declaration can not be nested',
-        NoYieldInGenerator: 'Missing yield in generator',
-        NoUnintializedConst: 'Const must be initialized',
-        ComprehensionRequiresBlock: 'Comprehension must have at least one block',
-        ComprehensionError:  'Comprehension Error',
-        EachNotAllowed:  'Each is not supported'
-    };
-
-    // See also tools/generate-unicode-regex.py.
-    Regex = {
-        NonAsciiIdentifierStart: new RegExp('[\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]'),
-        NonAsciiIdentifierPart: new RegExp('[\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0300-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u0483-\u0487\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u05d0-\u05ea\u05f0-\u05f2\u0610-\u061a\u0620-\u0669\u066e-\u06d3\u06d5-\u06dc\u06df-\u06e8\u06ea-\u06fc\u06ff\u0710-\u074a\u074d-\u07b1\u07c0-\u07f5\u07fa\u0800-\u082d\u0840-\u085b\u08a0\u08a2-\u08ac\u08e4-\u08fe\u0900-\u0963\u0966-\u096f\u0971-\u0977\u0979-\u097f\u0981-\u0983\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bc-\u09c4\u09c7\u09c8\u09cb-\u09ce\u09d7\u09dc\u09dd\u09df-\u09e3\u09e6-\u09f1\u0a01-\u0a03\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a59-\u0a5c\u0a5e\u0a66-\u0a75\u0a81-\u0a83\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abc-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ad0\u0ae0-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3c-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5c\u0b5d\u0b5f-\u0b63\u0b66-\u0b6f\u0b71\u0b82\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd0\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c58\u0c59\u0c60-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbc-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0cde\u0ce0-\u0ce3\u0ce6-\u0cef\u0cf1\u0cf2\u0d02\u0d03\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d-\u0d44\u0d46-\u0d48\u0d4a-\u0d4e\u0d57\u0d60-\u0d63\u0d66-\u0d6f\u0d7a-\u0d7f\u0d82\u0d83\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e01-\u0e3a\u0e40-\u0e4e\u0e50-\u0e59\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb9\u0ebb-\u0ebd\u0ec0-\u0ec4\u0ec6\u0ec8-\u0ecd\u0ed0-\u0ed9\u0edc-\u0edf\u0f00\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f3e-\u0f47\u0f49-\u0f6c\u0f71-\u0f84\u0f86-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1049\u1050-\u109d\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u135d-\u135f\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176c\u176e-\u1770\u1772\u1773\u1780-\u17d3\u17d7\u17dc\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1820-\u1877\u1880-\u18aa\u18b0-\u18f5\u1900-\u191c\u1920-\u192b\u1930-\u193b\u1946-\u196d\u1970-\u1974\u1980-\u19ab\u19b0-\u19c9\u19d0-\u19d9\u1a00-\u1a1b\u1a20-\u1a5e\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1aa7\u1b00-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1b80-\u1bf3\u1c00-\u1c37\u1c40-\u1c49\u1c4d-\u1c7d\u1cd0-\u1cd2\u1cd4-\u1cf6\u1d00-\u1de6\u1dfc-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u200c\u200d\u203f\u2040\u2054\u2071\u207f\u2090-\u209c\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d7f-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2de0-\u2dff\u2e2f\u3005-\u3007\u3021-\u302f\u3031-\u3035\u3038-\u303c\u3041-\u3096\u3099\u309a\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua62b\ua640-\ua66f\ua674-\ua67d\ua67f-\ua697\ua69f-\ua6f1\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua827\ua840-\ua873\ua880-\ua8c4\ua8d0-\ua8d9\ua8e0-\ua8f7\ua8fb\ua900-\ua92d\ua930-\ua953\ua960-\ua97c\ua980-\ua9c0\ua9cf-\ua9d9\uaa00-\uaa36\uaa40-\uaa4d\uaa50-\uaa59\uaa60-\uaa76\uaa7a\uaa7b\uaa80-\uaac2\uaadb-\uaadd\uaae0-\uaaef\uaaf2-\uaaf6\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabea\uabec\uabed\uabf0-\uabf9\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\ufe70-\ufe74\ufe76-\ufefc\uff10-\uff19\uff21-\uff3a\uff3f\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]')
-    };
-
-    // Ensure the condition is true, otherwise throw an error.
-    // This is only to have a better contract semantic, i.e. another safety net
-    // to catch a logic error. The condition shall be fulfilled in normal case.
-    // Do NOT use this to enforce a certain condition on any user input.
-
-    function assert(condition, message) {
-        if (!condition) {
-            throw new Error('ASSERT: ' + message);
-        }
-    }
-
-    function isDecimalDigit(ch) {
-        return (ch >= 48 && ch <= 57);   // 0..9
-    }
-
-    function isHexDigit(ch) {
-        return '0123456789abcdefABCDEF'.indexOf(ch) >= 0;
-    }
-
-    function isOctalDigit(ch) {
-        return '01234567'.indexOf(ch) >= 0;
-    }
-
-
-    // 7.2 White Space
-
-    function isWhiteSpace(ch) {
-        return (ch === 32) ||  // space
-            (ch === 9) ||      // tab
-            (ch === 0xB) ||
-            (ch === 0xC) ||
-            (ch === 0xA0) ||
-            (ch >= 0x1680 && '\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\uFEFF'.indexOf(String.fromCharCode(ch)) > 0);
-    }
-
-    // 7.3 Line Terminators
-
-    function isLineTerminator(ch) {
-        return (ch === 10) || (ch === 13) || (ch === 0x2028) || (ch === 0x2029);
-    }
-
-    // 7.6 Identifier Names and Identifiers
-
-    function isIdentifierStart(ch) {
-        return (ch === 36) || (ch === 95) ||  // $ (dollar) and _ (underscore)
-            (ch >= 65 && ch <= 90) ||         // A..Z
-            (ch >= 97 && ch <= 122) ||        // a..z
-            (ch === 92) ||                    // \ (backslash)
-            ((ch >= 0x80) && Regex.NonAsciiIdentifierStart.test(String.fromCharCode(ch)));
-    }
-
-    function isIdentifierPart(ch) {
-        return (ch === 36) || (ch === 95) ||  // $ (dollar) and _ (underscore)
-            (ch >= 65 && ch <= 90) ||         // A..Z
-            (ch >= 97 && ch <= 122) ||        // a..z
-            (ch >= 48 && ch <= 57) ||         // 0..9
-            (ch === 92) ||                    // \ (backslash)
-            ((ch >= 0x80) && Regex.NonAsciiIdentifierPart.test(String.fromCharCode(ch)));
-    }
-
-    // 7.6.1.2 Future Reserved Words
-
-    function isFutureReservedWord(id) {
-        switch (id) {
-        case 'class':
-        case 'enum':
-        case 'export':
-        case 'extends':
-        case 'import':
-        case 'super':
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    function isStrictModeReservedWord(id) {
-        switch (id) {
-        case 'implements':
-        case 'interface':
-        case 'package':
-        case 'private':
-        case 'protected':
-        case 'public':
-        case 'static':
-        case 'yield':
-        case 'let':
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    function isRestrictedWord(id) {
-        return id === 'eval' || id === 'arguments';
-    }
-
-    // 7.6.1.1 Keywords
-
-    function isKeyword(id) {
-        if (strict && isStrictModeReservedWord(id)) {
-            return true;
-        }
-
-        // 'const' is specialized as Keyword in V8.
-        // 'yield' and 'let' are for compatiblity with SpiderMonkey and ES.next.
-        // Some others are from future reserved words.
-
-        switch (id.length) {
-        case 2:
-            return (id === 'if') || (id === 'in') || (id === 'do');
-        case 3:
-            return (id === 'var') || (id === 'for') || (id === 'new') ||
-                (id === 'try') || (id === 'let');
-        case 4:
-            return (id === 'this') || (id === 'else') || (id === 'case') ||
-                (id === 'void') || (id === 'with') || (id === 'enum');
-        case 5:
-            return (id === 'while') || (id === 'break') || (id === 'catch') ||
-                (id === 'throw') || (id === 'const') || (id === 'yield') ||
-                (id === 'class') || (id === 'super');
-        case 6:
-            return (id === 'return') || (id === 'typeof') || (id === 'delete') ||
-                (id === 'switch') || (id === 'export') || (id === 'import');
-        case 7:
-            return (id === 'default') || (id === 'finally') || (id === 'extends');
-        case 8:
-            return (id === 'function') || (id === 'continue') || (id === 'debugger');
-        case 10:
-            return (id === 'instanceof');
-        default:
-            return false;
-        }
-    }
-
-    // 7.4 Comments
-
-    function skipComment() {
-        var ch, blockComment, lineComment;
-
-        blockComment = false;
-        lineComment = false;
-
-        while (index < length) {
-            ch = source.charCodeAt(index);
-
-            if (lineComment) {
-                ++index;
-                if (isLineTerminator(ch)) {
-                    lineComment = false;
-                    if (ch === 13 && source.charCodeAt(index) === 10) {
-                        ++index;
-                    }
-                    ++lineNumber;
-                    lineStart = index;
-                }
-            } else if (blockComment) {
-                if (isLineTerminator(ch)) {
-                    if (ch === 13 && source.charCodeAt(index + 1) === 10) {
-                        ++index;
-                    }
-                    ++lineNumber;
-                    ++index;
-                    lineStart = index;
-                    if (index >= length) {
-                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                    }
-                } else {
-                    ch = source.charCodeAt(index++);
-                    if (index >= length) {
-                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                    }
-                    // Block comment ends with '*/' (char #42, char #47).
-                    if (ch === 42) {
-                        ch = source.charCodeAt(index);
-                        if (ch === 47) {
-                            ++index;
-                            blockComment = false;
-                        }
-                    }
-                }
-            } else if (ch === 47) {
-                ch = source.charCodeAt(index + 1);
-                // Line comment starts with '//' (char #47, char #47).
-                if (ch === 47) {
-                    index += 2;
-                    lineComment = true;
-                } else if (ch === 42) {
-                    // Block comment starts with '/*' (char #47, char #42).
-                    index += 2;
-                    blockComment = true;
-                    if (index >= length) {
-                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                    }
-                } else {
-                    break;
-                }
-            } else if (isWhiteSpace(ch)) {
-                ++index;
-            } else if (isLineTerminator(ch)) {
-                ++index;
-                if (ch === 13 && source.charCodeAt(index) === 10) {
-                    ++index;
-                }
-                ++lineNumber;
-                lineStart = index;
-            } else {
-                break;
-            }
-        }
-    }
-
-    function scanHexEscape(prefix) {
-        var i, len, ch, code = 0;
-
-        len = (prefix === 'u') ? 4 : 2;
-        for (i = 0; i < len; ++i) {
-            if (index < length && isHexDigit(source[index])) {
-                ch = source[index++];
-                code = code * 16 + '0123456789abcdef'.indexOf(ch.toLowerCase());
-            } else {
-                return '';
-            }
-        }
-        return String.fromCharCode(code);
-    }
-
-    function scanUnicodeCodePointEscape() {
-        var ch, code, cu1, cu2;
-
-        ch = source[index];
-        code = 0;
-
-        // At least, one hex digit is required.
-        if (ch === '}') {
-            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-        }
-
-        while (index < length) {
-            ch = source[index++];
-            if (!isHexDigit(ch)) {
-                break;
-            }
-            code = code * 16 + '0123456789abcdef'.indexOf(ch.toLowerCase());
-        }
-
-        if (code > 0x10FFFF || ch !== '}') {
-            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-        }
-
-        // UTF-16 Encoding
-        if (code <= 0xFFFF) {
-            return String.fromCharCode(code);
-        }
-        cu1 = ((code - 0x10000) >> 10) + 0xD800;
-        cu2 = ((code - 0x10000) & 1023) + 0xDC00;
-        return String.fromCharCode(cu1, cu2);
-    }
-
-    function getEscapedIdentifier() {
-        var ch, id;
-
-        ch = source.charCodeAt(index++);
-        id = String.fromCharCode(ch);
-
-        // '\u' (char #92, char #117) denotes an escaped character.
-        if (ch === 92) {
-            if (source.charCodeAt(index) !== 117) {
-                throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-            }
-            ++index;
-            ch = scanHexEscape('u');
-            if (!ch || ch === '\\' || !isIdentifierStart(ch.charCodeAt(0))) {
-                throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-            }
-            id = ch;
-        }
-
-        while (index < length) {
-            ch = source.charCodeAt(index);
-            if (!isIdentifierPart(ch)) {
-                break;
-            }
-            ++index;
-            id += String.fromCharCode(ch);
-
-            // '\u' (char #92, char #117) denotes an escaped character.
-            if (ch === 92) {
-                id = id.substr(0, id.length - 1);
-                if (source.charCodeAt(index) !== 117) {
-                    throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                }
-                ++index;
-                ch = scanHexEscape('u');
-                if (!ch || ch === '\\' || !isIdentifierPart(ch.charCodeAt(0))) {
-                    throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                }
-                id += ch;
-            }
-        }
-
-        return id;
-    }
-
-    function getIdentifier() {
-        var start, ch;
-
-        start = index++;
-        while (index < length) {
-            ch = source.charCodeAt(index);
-            if (ch === 92) {
-                // Blackslash (char #92) marks Unicode escape sequence.
-                index = start;
-                return getEscapedIdentifier();
-            }
-            if (isIdentifierPart(ch)) {
-                ++index;
-            } else {
-                break;
-            }
-        }
-
-        return source.slice(start, index);
-    }
-
-    function scanIdentifier() {
-        var start, id, type;
-
-        start = index;
-
-        // Backslash (char #92) starts an escaped character.
-        id = (source.charCodeAt(index) === 92) ? getEscapedIdentifier() : getIdentifier();
-
-        // There is no keyword or literal with only one character.
-        // Thus, it must be an identifier.
-        if (id.length === 1) {
-            type = Token.Identifier;
-        } else if (isKeyword(id)) {
-            type = Token.Keyword;
-        } else if (id === 'null') {
-            type = Token.NullLiteral;
-        } else if (id === 'true' || id === 'false') {
-            type = Token.BooleanLiteral;
-        } else {
-            type = Token.Identifier;
-        }
-
-        return {
-            type: type,
-            value: id,
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            range: [start, index]
-        };
-    }
-
-
-    // 7.7 Punctuators
-
-    function scanPunctuator() {
-        var start = index,
-            code = source.charCodeAt(index),
-            code2,
-            ch1 = source[index],
-            ch2,
-            ch3,
-            ch4;
-
-        switch (code) {
-        // Check for most common single-character punctuators.
-        case 40:   // ( open bracket
-        case 41:   // ) close bracket
-        case 59:   // ; semicolon
-        case 44:   // , comma
-        case 123:  // { open curly brace
-        case 125:  // } close curly brace
-        case 91:   // [
-        case 93:   // ]
-        case 58:   // :
-        case 63:   // ?
-        case 126:  // ~
-            ++index;
-            if (extra.tokenize) {
-                if (code === 40) {
-                    extra.openParenToken = extra.tokens.length;
-                } else if (code === 123) {
-                    extra.openCurlyToken = extra.tokens.length;
-                }
-            }
-            return {
-                type: Token.Punctuator,
-                value: String.fromCharCode(code),
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [start, index]
-            };
-
-        default:
-            code2 = source.charCodeAt(index + 1);
-
-            // '=' (char #61) marks an assignment or comparison operator.
-            if (code2 === 61) {
-                switch (code) {
-                case 37:  // %
-                case 38:  // &
-                case 42:  // *:
-                case 43:  // +
-                case 45:  // -
-                case 47:  // /
-                case 60:  // <
-                case 62:  // >
-                case 94:  // ^
-                case 124: // |
-                    index += 2;
-                    return {
-                        type: Token.Punctuator,
-                        value: String.fromCharCode(code) + String.fromCharCode(code2),
-                        lineNumber: lineNumber,
-                        lineStart: lineStart,
-                        range: [start, index]
-                    };
-
-                case 33: // !
-                case 61: // =
-                    index += 2;
-
-                    // !== and ===
-                    if (source.charCodeAt(index) === 61) {
-                        ++index;
-                    }
-                    return {
-                        type: Token.Punctuator,
-                        value: source.slice(start, index),
-                        lineNumber: lineNumber,
-                        lineStart: lineStart,
-                        range: [start, index]
-                    };
-                default:
-                    break;
-                }
-            }
-            break;
-        }
-
-        // Peek more characters.
-
-        ch2 = source[index + 1];
-        ch3 = source[index + 2];
-        ch4 = source[index + 3];
-
-        // 4-character punctuator: >>>=
-
-        if (ch1 === '>' && ch2 === '>' && ch3 === '>') {
-            if (ch4 === '=') {
-                index += 4;
-                return {
-                    type: Token.Punctuator,
-                    value: '>>>=',
-                    lineNumber: lineNumber,
-                    lineStart: lineStart,
-                    range: [start, index]
-                };
-            }
-        }
-
-        // 3-character punctuators: === !== >>> <<= >>=
-
-        if (ch1 === '>' && ch2 === '>' && ch3 === '>') {
-            index += 3;
-            return {
-                type: Token.Punctuator,
-                value: '>>>',
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [start, index]
-            };
-        }
-
-        if (ch1 === '<' && ch2 === '<' && ch3 === '=') {
-            index += 3;
-            return {
-                type: Token.Punctuator,
-                value: '<<=',
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [start, index]
-            };
-        }
-
-        if (ch1 === '>' && ch2 === '>' && ch3 === '=') {
-            index += 3;
-            return {
-                type: Token.Punctuator,
-                value: '>>=',
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [start, index]
-            };
-        }
-
-        if (ch1 === '.' && ch2 === '.' && ch3 === '.') {
-            index += 3;
-            return {
-                type: Token.Punctuator,
-                value: '...',
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [start, index]
-            };
-        }
-
-        // Other 2-character punctuators: ++ -- << >> && ||
-
-        if (ch1 === ch2 && ('+-<>&|'.indexOf(ch1) >= 0)) {
-            index += 2;
-            return {
-                type: Token.Punctuator,
-                value: ch1 + ch2,
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [start, index]
-            };
-        }
-
-        if (ch1 === '=' && ch2 === '>') {
-            index += 2;
-            return {
-                type: Token.Punctuator,
-                value: '=>',
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [start, index]
-            };
-        }
-
-        if ('<>=!+-*%&|^/'.indexOf(ch1) >= 0) {
-            ++index;
-            return {
-                type: Token.Punctuator,
-                value: ch1,
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [start, index]
-            };
-        }
-
-        if (ch1 === '.') {
-            ++index;
-            return {
-                type: Token.Punctuator,
-                value: ch1,
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [start, index]
-            };
-        }
-
-        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-    }
-
-    // 7.8.3 Numeric Literals
-
-    function scanHexLiteral(start) {
-        var number = '';
-
-        while (index < length) {
-            if (!isHexDigit(source[index])) {
-                break;
-            }
-            number += source[index++];
-        }
-
-        if (number.length === 0) {
-            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-        }
-
-        if (isIdentifierStart(source.charCodeAt(index))) {
-            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-        }
-
-        return {
-            type: Token.NumericLiteral,
-            value: parseInt('0x' + number, 16),
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            range: [start, index]
-        };
-    }
-
-    function scanOctalLiteral(prefix, start) {
-        var number, octal;
-
-        if (isOctalDigit(prefix)) {
-            octal = true;
-            number = '0' + source[index++];
-        } else {
-            octal = false;
-            ++index;
-            number = '';
-        }
-
-        while (index < length) {
-            if (!isOctalDigit(source[index])) {
-                break;
-            }
-            number += source[index++];
-        }
-
-        if (!octal && number.length === 0) {
-            // only 0o or 0O
-            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-        }
-
-        if (isIdentifierStart(source.charCodeAt(index)) || isDecimalDigit(source.charCodeAt(index))) {
-            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-        }
-
-        return {
-            type: Token.NumericLiteral,
-            value: parseInt(number, 8),
-            octal: octal,
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            range: [start, index]
-        };
-    }
-
-    function scanNumericLiteral() {
-        var number, start, ch, octal;
-
-        ch = source[index];
-        assert(isDecimalDigit(ch.charCodeAt(0)) || (ch === '.'),
-            'Numeric literal must start with a decimal digit or a decimal point');
-
-        start = index;
-        number = '';
-        if (ch !== '.') {
-            number = source[index++];
-            ch = source[index];
-
-            // Hex number starts with '0x'.
-            // Octal number starts with '0'.
-            // Octal number in ES6 starts with '0o'.
-            // Binary number in ES6 starts with '0b'.
-            if (number === '0') {
-                if (ch === 'x' || ch === 'X') {
-                    ++index;
-                    return scanHexLiteral(start);
-                }
-                if (ch === 'b' || ch === 'B') {
-                    ++index;
-                    number = '';
-
-                    while (index < length) {
-                        ch = source[index];
-                        if (ch !== '0' && ch !== '1') {
-                            break;
-                        }
-                        number += source[index++];
-                    }
-
-                    if (number.length === 0) {
-                        // only 0b or 0B
-                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                    }
-
-                    if (index < length) {
-                        ch = source.charCodeAt(index);
-                        if (isIdentifierStart(ch) || isDecimalDigit(ch)) {
-                            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                        }
-                    }
-                    return {
-                        type: Token.NumericLiteral,
-                        value: parseInt(number, 2),
-                        lineNumber: lineNumber,
-                        lineStart: lineStart,
-                        range: [start, index]
-                    };
-                }
-                if (ch === 'o' || ch === 'O' || isOctalDigit(ch)) {
-                    return scanOctalLiteral(ch, start);
-                }
-                // decimal number starts with '0' such as '09' is illegal.
-                if (ch && isDecimalDigit(ch.charCodeAt(0))) {
-                    throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                }
-            }
-
-            while (isDecimalDigit(source.charCodeAt(index))) {
-                number += source[index++];
-            }
-            ch = source[index];
-        }
-
-        if (ch === '.') {
-            number += source[index++];
-            while (isDecimalDigit(source.charCodeAt(index))) {
-                number += source[index++];
-            }
-            ch = source[index];
-        }
-
-        if (ch === 'e' || ch === 'E') {
-            number += source[index++];
-
-            ch = source[index];
-            if (ch === '+' || ch === '-') {
-                number += source[index++];
-            }
-            if (isDecimalDigit(source.charCodeAt(index))) {
-                while (isDecimalDigit(source.charCodeAt(index))) {
-                    number += source[index++];
-                }
-            } else {
-                throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-            }
-        }
-
-        if (isIdentifierStart(source.charCodeAt(index))) {
-            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-        }
-
-        return {
-            type: Token.NumericLiteral,
-            value: parseFloat(number),
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            range: [start, index]
-        };
-    }
-
-    // 7.8.4 String Literals
-
-    function scanStringLiteral() {
-        var str = '', quote, start, ch, code, unescaped, restore, octal = false;
-
-        quote = source[index];
-        assert((quote === '\'' || quote === '"'),
-            'String literal must starts with a quote');
-
-        start = index;
-        ++index;
-
-        while (index < length) {
-            ch = source[index++];
-
-            if (ch === quote) {
-                quote = '';
-                break;
-            } else if (ch === '\\') {
-                ch = source[index++];
-                if (!ch || !isLineTerminator(ch.charCodeAt(0))) {
-                    switch (ch) {
-                    case 'n':
-                        str += '\n';
-                        break;
-                    case 'r':
-                        str += '\r';
-                        break;
-                    case 't':
-                        str += '\t';
-                        break;
-                    case 'u':
-                    case 'x':
-                        if (source[index] === '{') {
-                            ++index;
-                            str += scanUnicodeCodePointEscape();
-                        } else {
-                            restore = index;
-                            unescaped = scanHexEscape(ch);
-                            if (unescaped) {
-                                str += unescaped;
-                            } else {
-                                index = restore;
-                                str += ch;
-                            }
-                        }
-                        break;
-                    case 'b':
-                        str += '\b';
-                        break;
-                    case 'f':
-                        str += '\f';
-                        break;
-                    case 'v':
-                        str += '\x0B';
-                        break;
-
-                    default:
-                        if (isOctalDigit(ch)) {
-                            code = '01234567'.indexOf(ch);
-
-                            // \0 is not octal escape sequence
-                            if (code !== 0) {
-                                octal = true;
-                            }
-
-                            if (index < length && isOctalDigit(source[index])) {
-                                octal = true;
-                                code = code * 8 + '01234567'.indexOf(source[index++]);
-
-                                // 3 digits are only allowed when string starts
-                                // with 0, 1, 2, 3
-                                if ('0123'.indexOf(ch) >= 0 &&
-                                        index < length &&
-                                        isOctalDigit(source[index])) {
-                                    code = code * 8 + '01234567'.indexOf(source[index++]);
-                                }
-                            }
-                            str += String.fromCharCode(code);
-                        } else {
-                            str += ch;
-                        }
-                        break;
-                    }
-                } else {
-                    ++lineNumber;
-                    if (ch ===  '\r' && source[index] === '\n') {
-                        ++index;
-                    }
-                }
-            } else if (isLineTerminator(ch.charCodeAt(0))) {
-                break;
-            } else {
-                str += ch;
-            }
-        }
-
-        if (quote !== '') {
-            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-        }
-
-        return {
-            type: Token.StringLiteral,
-            value: str,
-            octal: octal,
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            range: [start, index]
-        };
-    }
-
-    function scanTemplate() {
-        var cooked = '', ch, start, terminated, tail, restore, unescaped, code, octal;
-
-        terminated = false;
-        tail = false;
-        start = index;
-
-        ++index;
-
-        while (index < length) {
-            ch = source[index++];
-            if (ch === '`') {
-                tail = true;
-                terminated = true;
-                break;
-            } else if (ch === '$') {
-                if (source[index] === '{') {
-                    ++index;
-                    terminated = true;
-                    break;
-                }
-                cooked += ch;
-            } else if (ch === '\\') {
-                ch = source[index++];
-                if (!isLineTerminator(ch.charCodeAt(0))) {
-                    switch (ch) {
-                    case 'n':
-                        cooked += '\n';
-                        break;
-                    case 'r':
-                        cooked += '\r';
-                        break;
-                    case 't':
-                        cooked += '\t';
-                        break;
-                    case 'u':
-                    case 'x':
-                        if (source[index] === '{') {
-                            ++index;
-                            cooked += scanUnicodeCodePointEscape();
-                        } else {
-                            restore = index;
-                            unescaped = scanHexEscape(ch);
-                            if (unescaped) {
-                                cooked += unescaped;
-                            } else {
-                                index = restore;
-                                cooked += ch;
-                            }
-                        }
-                        break;
-                    case 'b':
-                        cooked += '\b';
-                        break;
-                    case 'f':
-                        cooked += '\f';
-                        break;
-                    case 'v':
-                        cooked += '\v';
-                        break;
-
-                    default:
-                        if (isOctalDigit(ch)) {
-                            code = '01234567'.indexOf(ch);
-
-                            // \0 is not octal escape sequence
-                            if (code !== 0) {
-                                octal = true;
-                            }
-
-                            if (index < length && isOctalDigit(source[index])) {
-                                octal = true;
-                                code = code * 8 + '01234567'.indexOf(source[index++]);
-
-                                // 3 digits are only allowed when string starts
-                                // with 0, 1, 2, 3
-                                if ('0123'.indexOf(ch) >= 0 &&
-                                        index < length &&
-                                        isOctalDigit(source[index])) {
-                                    code = code * 8 + '01234567'.indexOf(source[index++]);
-                                }
-                            }
-                            cooked += String.fromCharCode(code);
-                        } else {
-                            cooked += ch;
-                        }
-                        break;
-                    }
-                } else {
-                    ++lineNumber;
-                    if (ch ===  '\r' && source[index] === '\n') {
-                        ++index;
-                    }
-                }
-            } else if (isLineTerminator(ch.charCodeAt(0))) {
-                ++lineNumber;
-                if (ch ===  '\r' && source[index] === '\n') {
-                    ++index;
-                }
-                cooked += '\n';
-            } else {
-                cooked += ch;
-            }
-        }
-
-        if (!terminated) {
-            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-        }
-
-        return {
-            type: Token.Template,
-            value: {
-                cooked: cooked,
-                raw: source.slice(start + 1, index - ((tail) ? 1 : 2))
-            },
-            tail: tail,
-            octal: octal,
-            lineNumber: lineNumber,
-            lineStart: lineStart,
-            range: [start, index]
-        };
-    }
-
-    function scanTemplateElement(option) {
-        var startsWith, template;
-
-        lookahead = null;
-        skipComment();
-
-        startsWith = (option.head) ? '`' : '}';
-
-        if (source[index] !== startsWith) {
-            throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-        }
-
-        template = scanTemplate();
-
-        peek();
-
-        return template;
-    }
-
-    function scanRegExp() {
-        var str, ch, start, pattern, flags, value, classMarker = false, restore, terminated = false;
-
-        lookahead = null;
-        skipComment();
-
-        start = index;
-        ch = source[index];
-        assert(ch === '/', 'Regular expression literal must start with a slash');
-        str = source[index++];
-
-        while (index < length) {
-            ch = source[index++];
-            str += ch;
-            if (classMarker) {
-                if (ch === ']') {
-                    classMarker = false;
-                }
-            } else {
-                if (ch === '\\') {
-                    ch = source[index++];
-                    // ECMA-262 7.8.5
-                    if (isLineTerminator(ch.charCodeAt(0))) {
-                        throwError({}, Messages.UnterminatedRegExp);
-                    }
-                    str += ch;
-                } else if (ch === '/') {
-                    terminated = true;
-                    break;
-                } else if (ch === '[') {
-                    classMarker = true;
-                } else if (isLineTerminator(ch.charCodeAt(0))) {
-                    throwError({}, Messages.UnterminatedRegExp);
-                }
-            }
-        }
-
-        if (!terminated) {
-            throwError({}, Messages.UnterminatedRegExp);
-        }
-
-        // Exclude leading and trailing slash.
-        pattern = str.substr(1, str.length - 2);
-
-        flags = '';
-        while (index < length) {
-            ch = source[index];
-            if (!isIdentifierPart(ch.charCodeAt(0))) {
-                break;
-            }
-
-            ++index;
-            if (ch === '\\' && index < length) {
-                ch = source[index];
-                if (ch === 'u') {
-                    ++index;
-                    restore = index;
-                    ch = scanHexEscape('u');
-                    if (ch) {
-                        flags += ch;
-                        for (str += '\\u'; restore < index; ++restore) {
-                            str += source[restore];
-                        }
-                    } else {
-                        index = restore;
-                        flags += 'u';
-                        str += '\\u';
-                    }
-                } else {
-                    str += '\\';
-                }
-            } else {
-                flags += ch;
-                str += ch;
-            }
-        }
-
-        try {
-            value = new RegExp(pattern, flags);
-        } catch (e) {
-            throwError({}, Messages.InvalidRegExp);
-        }
-
-        peek();
-
-
-        if (extra.tokenize) {
-            return {
-                type: Token.RegularExpression,
-                value: value,
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [start, index]
-            };
-        }
-        return {
-            literal: str,
-            value: value,
-            range: [start, index]
-        };
-    }
-
-    function isIdentifierName(token) {
-        return token.type === Token.Identifier ||
-            token.type === Token.Keyword ||
-            token.type === Token.BooleanLiteral ||
-            token.type === Token.NullLiteral;
-    }
-
-    function advanceSlash() {
-        var prevToken,
-            checkToken;
-        // Using the following algorithm:
-        // https://github.com/mozilla/sweet.js/wiki/design
-        prevToken = extra.tokens[extra.tokens.length - 1];
-        if (!prevToken) {
-            // Nothing before that: it cannot be a division.
-            return scanRegExp();
-        }
-        if (prevToken.type === "Punctuator") {
-            if (prevToken.value === ")") {
-                checkToken = extra.tokens[extra.openParenToken - 1];
-                if (checkToken &&
-                        checkToken.type === "Keyword" &&
-                        (checkToken.value === "if" ||
-                         checkToken.value === "while" ||
-                         checkToken.value === "for" ||
-                         checkToken.value === "with")) {
-                    return scanRegExp();
-                }
-                return scanPunctuator();
-            }
-            if (prevToken.value === "}") {
-                // Dividing a function by anything makes little sense,
-                // but we have to check for that.
-                if (extra.tokens[extra.openCurlyToken - 3] &&
-                        extra.tokens[extra.openCurlyToken - 3].type === "Keyword") {
-                    // Anonymous function.
-                    checkToken = extra.tokens[extra.openCurlyToken - 4];
-                    if (!checkToken) {
-                        return scanPunctuator();
-                    }
-                } else if (extra.tokens[extra.openCurlyToken - 4] &&
-                        extra.tokens[extra.openCurlyToken - 4].type === "Keyword") {
-                    // Named function.
-                    checkToken = extra.tokens[extra.openCurlyToken - 5];
-                    if (!checkToken) {
-                        return scanRegExp();
-                    }
-                } else {
-                    return scanPunctuator();
-                }
-                // checkToken determines whether the function is
-                // a declaration or an expression.
-                if (FnExprTokens.indexOf(checkToken.value) >= 0) {
-                    // It is an expression.
-                    return scanPunctuator();
-                }
-                // It is a declaration.
-                return scanRegExp();
-            }
-            return scanRegExp();
-        }
-        if (prevToken.type === "Keyword") {
-            return scanRegExp();
-        }
-        return scanPunctuator();
-    }
-
-    function advance() {
-        var ch;
-
-        skipComment();
-
-        if (index >= length) {
-            return {
-                type: Token.EOF,
-                lineNumber: lineNumber,
-                lineStart: lineStart,
-                range: [index, index]
-            };
-        }
-
-        ch = source.charCodeAt(index);
-
-        // Very common: ( and ) and ;
-        if (ch === 40 || ch === 41 || ch === 58) {
-            return scanPunctuator();
-        }
-
-        // String literal starts with single quote (#39) or double quote (#34).
-        if (ch === 39 || ch === 34) {
-            return scanStringLiteral();
-        }
-
-        if (ch === 96) {
-            return scanTemplate();
-        }
-        if (isIdentifierStart(ch)) {
-            return scanIdentifier();
-        }
-
-        // Dot (.) char #46 can also start a floating-point number, hence the need
-        // to check the next character.
-        if (ch === 46) {
-            if (isDecimalDigit(source.charCodeAt(index + 1))) {
-                return scanNumericLiteral();
-            }
-            return scanPunctuator();
-        }
-
-        if (isDecimalDigit(ch)) {
-            return scanNumericLiteral();
-        }
-
-        // Slash (/) char #47 can also start a regex.
-        if (extra.tokenize && ch === 47) {
-            return advanceSlash();
-        }
-
-        return scanPunctuator();
-    }
-
-    function lex() {
-        var token;
-
-        token = lookahead;
-        index = token.range[1];
-        lineNumber = token.lineNumber;
-        lineStart = token.lineStart;
-
-        lookahead = advance();
-
-        index = token.range[1];
-        lineNumber = token.lineNumber;
-        lineStart = token.lineStart;
-
-        return token;
-    }
-
-    function peek() {
-        var pos, line, start;
-
-        pos = index;
-        line = lineNumber;
-        start = lineStart;
-        lookahead = advance();
-        index = pos;
-        lineNumber = line;
-        lineStart = start;
-    }
-
-    function lookahead2() {
-        var adv, pos, line, start, result;
-
-        // If we are collecting the tokens, don't grab the next one yet.
-        adv = (typeof extra.advance === 'function') ? extra.advance : advance;
-
-        pos = index;
-        line = lineNumber;
-        start = lineStart;
-
-        // Scan for the next immediate token.
-        if (lookahead === null) {
-            lookahead = adv();
-        }
-        index = lookahead.range[1];
-        lineNumber = lookahead.lineNumber;
-        lineStart = lookahead.lineStart;
-
-        // Grab the token right after.
-        result = adv();
-        index = pos;
-        lineNumber = line;
-        lineStart = start;
-
-        return result;
-    }
-
-    SyntaxTreeDelegate = {
-
-        name: 'SyntaxTree',
-
-        postProcess: function (node) {
-            return node;
-        },
-
-        createArrayExpression: function (elements) {
-            return {
-                type: Syntax.ArrayExpression,
-                elements: elements
-            };
-        },
-
-        createAssignmentExpression: function (operator, left, right) {
-            return {
-                type: Syntax.AssignmentExpression,
-                operator: operator,
-                left: left,
-                right: right
-            };
-        },
-
-        createBinaryExpression: function (operator, left, right) {
-            var type = (operator === '||' || operator === '&&') ? Syntax.LogicalExpression :
-                        Syntax.BinaryExpression;
-            return {
-                type: type,
-                operator: operator,
-                left: left,
-                right: right
-            };
-        },
-
-        createBlockStatement: function (body) {
-            return {
-                type: Syntax.BlockStatement,
-                body: body
-            };
-        },
-
-        createBreakStatement: function (label) {
-            return {
-                type: Syntax.BreakStatement,
-                label: label
-            };
-        },
-
-        createCallExpression: function (callee, args) {
-            return {
-                type: Syntax.CallExpression,
-                callee: callee,
-                'arguments': args
-            };
-        },
-
-        createCatchClause: function (param, body) {
-            return {
-                type: Syntax.CatchClause,
-                param: param,
-                body: body
-            };
-        },
-
-        createConditionalExpression: function (test, consequent, alternate) {
-            return {
-                type: Syntax.ConditionalExpression,
-                test: test,
-                consequent: consequent,
-                alternate: alternate
-            };
-        },
-
-        createContinueStatement: function (label) {
-            return {
-                type: Syntax.ContinueStatement,
-                label: label
-            };
-        },
-
-        createDebuggerStatement: function () {
-            return {
-                type: Syntax.DebuggerStatement
-            };
-        },
-
-        createDoWhileStatement: function (body, test) {
-            return {
-                type: Syntax.DoWhileStatement,
-                body: body,
-                test: test
-            };
-        },
-
-        createEmptyStatement: function () {
-            return {
-                type: Syntax.EmptyStatement
-            };
-        },
-
-        createExpressionStatement: function (expression) {
-            return {
-                type: Syntax.ExpressionStatement,
-                expression: expression
-            };
-        },
-
-        createForStatement: function (init, test, update, body) {
-            return {
-                type: Syntax.ForStatement,
-                init: init,
-                test: test,
-                update: update,
-                body: body
-            };
-        },
-
-        createForInStatement: function (left, right, body) {
-            return {
-                type: Syntax.ForInStatement,
-                left: left,
-                right: right,
-                body: body,
-                each: false
-            };
-        },
-
-        createForOfStatement: function (left, right, body) {
-            return {
-                type: Syntax.ForOfStatement,
-                left: left,
-                right: right,
-                body: body,
-            };
-        },
-
-        createFunctionDeclaration: function (id, params, defaults, body, rest, generator, expression) {
-            return {
-                type: Syntax.FunctionDeclaration,
-                id: id,
-                params: params,
-                defaults: defaults,
-                body: body,
-                rest: rest,
-                generator: generator,
-                expression: expression
-            };
-        },
-
-        createFunctionExpression: function (id, params, defaults, body, rest, generator, expression) {
-            return {
-                type: Syntax.FunctionExpression,
-                id: id,
-                params: params,
-                defaults: defaults,
-                body: body,
-                rest: rest,
-                generator: generator,
-                expression: expression
-            };
-        },
-
-        createIdentifier: function (name) {
-            return {
-                type: Syntax.Identifier,
-                name: name
-            };
-        },
-
-        createIfStatement: function (test, consequent, alternate) {
-            return {
-                type: Syntax.IfStatement,
-                test: test,
-                consequent: consequent,
-                alternate: alternate
-            };
-        },
-
-        createLabeledStatement: function (label, body) {
-            return {
-                type: Syntax.LabeledStatement,
-                label: label,
-                body: body
-            };
-        },
-
-        createLiteral: function (token) {
-            return {
-                type: Syntax.Literal,
-                value: token.value,
-                raw: source.slice(token.range[0], token.range[1])
-            };
-        },
-
-        createMemberExpression: function (accessor, object, property) {
-            return {
-                type: Syntax.MemberExpression,
-                computed: accessor === '[',
-                object: object,
-                property: property
-            };
-        },
-
-        createNewExpression: function (callee, args) {
-            return {
-                type: Syntax.NewExpression,
-                callee: callee,
-                'arguments': args
-            };
-        },
-
-        createObjectExpression: function (properties) {
-            return {
-                type: Syntax.ObjectExpression,
-                properties: properties
-            };
-        },
-
-        createPostfixExpression: function (operator, argument) {
-            return {
-                type: Syntax.UpdateExpression,
-                operator: operator,
-                argument: argument,
-                prefix: false
-            };
-        },
-
-        createProgram: function (body) {
-            return {
-                type: Syntax.Program,
-                body: body
-            };
-        },
-
-        createProperty: function (kind, key, value, method, shorthand) {
-            return {
-                type: Syntax.Property,
-                key: key,
-                value: value,
-                kind: kind,
-                method: method,
-                shorthand: shorthand
-            };
-        },
-
-        createReturnStatement: function (argument) {
-            return {
-                type: Syntax.ReturnStatement,
-                argument: argument
-            };
-        },
-
-        createSequenceExpression: function (expressions) {
-            return {
-                type: Syntax.SequenceExpression,
-                expressions: expressions
-            };
-        },
-
-        createSwitchCase: function (test, consequent) {
-            return {
-                type: Syntax.SwitchCase,
-                test: test,
-                consequent: consequent
-            };
-        },
-
-        createSwitchStatement: function (discriminant, cases) {
-            return {
-                type: Syntax.SwitchStatement,
-                discriminant: discriminant,
-                cases: cases
-            };
-        },
-
-        createThisExpression: function () {
-            return {
-                type: Syntax.ThisExpression
-            };
-        },
-
-        createThrowStatement: function (argument) {
-            return {
-                type: Syntax.ThrowStatement,
-                argument: argument
-            };
-        },
-
-        createTryStatement: function (block, guardedHandlers, handlers, finalizer) {
-            return {
-                type: Syntax.TryStatement,
-                block: block,
-                guardedHandlers: guardedHandlers,
-                handlers: handlers,
-                finalizer: finalizer
-            };
-        },
-
-        createUnaryExpression: function (operator, argument) {
-            if (operator === '++' || operator === '--') {
-                return {
-                    type: Syntax.UpdateExpression,
-                    operator: operator,
-                    argument: argument,
-                    prefix: true
-                };
-            }
-            return {
-                type: Syntax.UnaryExpression,
-                operator: operator,
-                argument: argument
-            };
-        },
-
-        createVariableDeclaration: function (declarations, kind) {
-            return {
-                type: Syntax.VariableDeclaration,
-                declarations: declarations,
-                kind: kind
-            };
-        },
-
-        createVariableDeclarator: function (id, init) {
-            return {
-                type: Syntax.VariableDeclarator,
-                id: id,
-                init: init
-            };
-        },
-
-        createWhileStatement: function (test, body) {
-            return {
-                type: Syntax.WhileStatement,
-                test: test,
-                body: body
-            };
-        },
-
-        createWithStatement: function (object, body) {
-            return {
-                type: Syntax.WithStatement,
-                object: object,
-                body: body
-            };
-        },
-
-        createTemplateElement: function (value, tail) {
-            return {
-                type: Syntax.TemplateElement,
-                value: value,
-                tail: tail
-            };
-        },
-
-        createTemplateLiteral: function (quasis, expressions) {
-            return {
-                type: Syntax.TemplateLiteral,
-                quasis: quasis,
-                expressions: expressions
-            };
-        },
-
-        createSpreadElement: function (argument) {
-            return {
-                type: Syntax.SpreadElement,
-                argument: argument
-            };
-        },
-
-        createTaggedTemplateExpression: function (tag, quasi) {
-            return {
-                type: Syntax.TaggedTemplateExpression,
-                tag: tag,
-                quasi: quasi
-            };
-        },
-
-        createArrowFunctionExpression: function (params, defaults, body, rest, expression) {
-            return {
-                type: Syntax.ArrowFunctionExpression,
-                id: null,
-                params: params,
-                defaults: defaults,
-                body: body,
-                rest: rest,
-                generator: false,
-                expression: expression
-            };
-        },
-
-        createMethodDefinition: function (propertyType, kind, key, value) {
-            return {
-                type: Syntax.MethodDefinition,
-                key: key,
-                value: value,
-                kind: kind,
-                'static': propertyType === ClassPropertyType.static
-            };
-        },
-
-        createClassBody: function (body) {
-            return {
-                type: Syntax.ClassBody,
-                body: body
-            };
-        },
-
-        createClassExpression: function (id, superClass, body) {
-            return {
-                type: Syntax.ClassExpression,
-                id: id,
-                superClass: superClass,
-                body: body
-            };
-        },
-
-        createClassDeclaration: function (id, superClass, body) {
-            return {
-                type: Syntax.ClassDeclaration,
-                id: id,
-                superClass: superClass,
-                body: body
-            };
-        },
-
-        createExportSpecifier: function (id, name) {
-            return {
-                type: Syntax.ExportSpecifier,
-                id: id,
-                name: name
-            };
-        },
-
-        createExportBatchSpecifier: function () {
-            return {
-                type: Syntax.ExportBatchSpecifier
-            };
-        },
-
-        createExportDeclaration: function (def, declaration, specifiers, source) {
-            return {
-                type: Syntax.ExportDeclaration,
-                declaration: declaration,
-                default: def,
-                specifiers: specifiers,
-                source: source
-            };
-        },
-
-        createImportSpecifier: function (id, name) {
-            return {
-                type: Syntax.ImportSpecifier,
-                id: id,
-                name: name
-            };
-        },
-
-        createImportDeclaration: function (specifiers, kind, source) {
-            return {
-                type: Syntax.ImportDeclaration,
-                specifiers: specifiers,
-                kind: kind,
-                source: source
-            };
-        },
-
-        createYieldExpression: function (argument, delegate) {
-            return {
-                type: Syntax.YieldExpression,
-                argument: argument,
-                delegate: delegate
-            };
-        },
-
-        createModuleDeclaration: function (id, source, body) {
-            return {
-                type: Syntax.ModuleDeclaration,
-                id: id,
-                source: source,
-                body: body
-            };
-        }
-
-
-    };
-
-    // Return true if there is a line terminator before the next token.
-
-    function peekLineTerminator() {
-        var pos, line, start, found;
-
-        pos = index;
-        line = lineNumber;
-        start = lineStart;
-        skipComment();
-        found = lineNumber !== line;
-        index = pos;
-        lineNumber = line;
-        lineStart = start;
-
-        return found;
-    }
-
-    // Throw an exception
-
-    function throwError(token, messageFormat) {
-        var error,
-            args = Array.prototype.slice.call(arguments, 2),
-            msg = messageFormat.replace(
-                /%(\d)/g,
-                function (whole, index) {
-                    assert(index < args.length, 'Message reference must be in range');
-                    return args[index];
-                }
-            );
-
-        if (typeof token.lineNumber === 'number') {
-            error = new Error('Line ' + token.lineNumber + ': ' + msg);
-            error.index = token.range[0];
-            error.lineNumber = token.lineNumber;
-            error.column = token.range[0] - lineStart + 1;
-        } else {
-            error = new Error('Line ' + lineNumber + ': ' + msg);
-            error.index = index;
-            error.lineNumber = lineNumber;
-            error.column = index - lineStart + 1;
-        }
-
-        error.description = msg;
-        throw error;
-    }
-
-    function throwErrorTolerant() {
-        try {
-            throwError.apply(null, arguments);
-        } catch (e) {
-            if (extra.errors) {
-                extra.errors.push(e);
-            } else {
-                throw e;
-            }
-        }
-    }
-
-
-    // Throw an exception because of the token.
-
-    function throwUnexpected(token) {
-        if (token.type === Token.EOF) {
-            throwError(token, Messages.UnexpectedEOS);
-        }
-
-        if (token.type === Token.NumericLiteral) {
-            throwError(token, Messages.UnexpectedNumber);
-        }
-
-        if (token.type === Token.StringLiteral) {
-            throwError(token, Messages.UnexpectedString);
-        }
-
-        if (token.type === Token.Identifier) {
-            throwError(token, Messages.UnexpectedIdentifier);
-        }
-
-        if (token.type === Token.Keyword) {
-            if (isFutureReservedWord(token.value)) {
-                throwError(token, Messages.UnexpectedReserved);
-            } else if (strict && isStrictModeReservedWord(token.value)) {
-                throwErrorTolerant(token, Messages.StrictReservedWord);
-                return;
-            }
-            throwError(token, Messages.UnexpectedToken, token.value);
-        }
-
-        if (token.type === Token.Template) {
-            throwError(token, Messages.UnexpectedTemplate, token.value.raw);
-        }
-
-        // BooleanLiteral, NullLiteral, or Punctuator.
-        throwError(token, Messages.UnexpectedToken, token.value);
-    }
-
-    // Expect the next token to match the specified punctuator.
-    // If not, an exception will be thrown.
-
-    function expect(value) {
-        var token = lex();
-        if (token.type !== Token.Punctuator || token.value !== value) {
-            throwUnexpected(token);
-        }
-    }
-
-    // Expect the next token to match the specified keyword.
-    // If not, an exception will be thrown.
-
-    function expectKeyword(keyword) {
-        var token = lex();
-        if (token.type !== Token.Keyword || token.value !== keyword) {
-            throwUnexpected(token);
-        }
-    }
-
-    // Return true if the next token matches the specified punctuator.
-
-    function match(value) {
-        return lookahead.type === Token.Punctuator && lookahead.value === value;
-    }
-
-    // Return true if the next token matches the specified keyword
-
-    function matchKeyword(keyword) {
-        return lookahead.type === Token.Keyword && lookahead.value === keyword;
-    }
-
-
-    // Return true if the next token matches the specified contextual keyword
-
-    function matchContextualKeyword(keyword) {
-        return lookahead.type === Token.Identifier && lookahead.value === keyword;
-    }
-
-    // Return true if the next token is an assignment operator
-
-    function matchAssign() {
-        var op;
-
-        if (lookahead.type !== Token.Punctuator) {
-            return false;
-        }
-        op = lookahead.value;
-        return op === '=' ||
-            op === '*=' ||
-            op === '/=' ||
-            op === '%=' ||
-            op === '+=' ||
-            op === '-=' ||
-            op === '<<=' ||
-            op === '>>=' ||
-            op === '>>>=' ||
-            op === '&=' ||
-            op === '^=' ||
-            op === '|=';
-    }
-
-    function consumeSemicolon() {
-        var line;
-
-        // Catch the very common case first: immediately a semicolon (char #59).
-        if (source.charCodeAt(index) === 59) {
-            lex();
-            return;
-        }
-
-        line = lineNumber;
-        skipComment();
-        if (lineNumber !== line) {
-            return;
-        }
-
-        if (match(';')) {
-            lex();
-            return;
-        }
-
-        if (lookahead.type !== Token.EOF && !match('}')) {
-            throwUnexpected(lookahead);
-        }
-    }
-
-    // Return true if provided expression is LeftHandSideExpression
-
-    function isLeftHandSide(expr) {
-        return expr.type === Syntax.Identifier || expr.type === Syntax.MemberExpression;
-    }
-
-    function isAssignableLeftHandSide(expr) {
-        return isLeftHandSide(expr) || expr.type === Syntax.ObjectPattern || expr.type === Syntax.ArrayPattern;
-    }
-
-    // 11.1.4 Array Initialiser
-
-    function parseArrayInitialiser() {
-        var elements = [], blocks = [], filter = null, tmp, possiblecomprehension = true, body;
-
-        expect('[');
-        while (!match(']')) {
-            if (lookahead.value === 'for' &&
-                    lookahead.type === Token.Keyword) {
-                if (!possiblecomprehension) {
-                    throwError({}, Messages.ComprehensionError);
-                }
-                matchKeyword('for');
-                tmp = parseForStatement({ignore_body: true});
-                tmp.of = tmp.type === Syntax.ForOfStatement;
-                tmp.type = Syntax.ComprehensionBlock;
-                if (tmp.left.kind) { // can't be let or const
-                    throwError({}, Messages.ComprehensionError);
-                }
-                blocks.push(tmp);
-            } else if (lookahead.value === 'if' &&
-                           lookahead.type === Token.Keyword) {
-                if (!possiblecomprehension) {
-                    throwError({}, Messages.ComprehensionError);
-                }
-                expectKeyword('if');
-                expect('(');
-                filter = parseExpression();
-                expect(')');
-            } else if (lookahead.value === ',' &&
-                           lookahead.type === Token.Punctuator) {
-                possiblecomprehension = false; // no longer allowed.
-                lex();
-                elements.push(null);
-            } else {
-                tmp = parseSpreadOrAssignmentExpression();
-                elements.push(tmp);
-                if (tmp && tmp.type === Syntax.SpreadElement) {
-                    if (!match(']')) {
-                        throwError({}, Messages.ElementAfterSpreadElement);
-                    }
-                } else if (!(match(']') || matchKeyword('for') || matchKeyword('if'))) {
-                    expect(','); // this lexes.
-                    possiblecomprehension = false;
-                }
-            }
-        }
-
-        expect(']');
-
-        if (filter && !blocks.length) {
-            throwError({}, Messages.ComprehensionRequiresBlock);
-        }
-
-        if (blocks.length) {
-            if (elements.length !== 1) {
-                throwError({}, Messages.ComprehensionError);
-            }
-            return {
-                type:  Syntax.ComprehensionExpression,
-                filter: filter,
-                blocks: blocks,
-                body: elements[0]
-            };
-        }
-        return delegate.createArrayExpression(elements);
-    }
-
-    // 11.1.5 Object Initialiser
-
-    function parsePropertyFunction(options) {
-        var previousStrict, previousYieldAllowed, params, defaults, body;
-
-        previousStrict = strict;
-        previousYieldAllowed = state.yieldAllowed;
-        state.yieldAllowed = options.generator;
-        params = options.params || [];
-        defaults = options.defaults || [];
-
-        body = parseConciseBody();
-        if (options.name && strict && isRestrictedWord(params[0].name)) {
-            throwErrorTolerant(options.name, Messages.StrictParamName);
-        }
-        if (state.yieldAllowed && !state.yieldFound) {
-            throwErrorTolerant({}, Messages.NoYieldInGenerator);
-        }
-        strict = previousStrict;
-        state.yieldAllowed = previousYieldAllowed;
-
-        return delegate.createFunctionExpression(null, params, defaults, body, options.rest || null, options.generator, body.type !== Syntax.BlockStatement);
-    }
-
-
-    function parsePropertyMethodFunction(options) {
-        var previousStrict, tmp, method;
-
-        previousStrict = strict;
-        strict = true;
-
-        tmp = parseParams();
-
-        if (tmp.stricted) {
-            throwErrorTolerant(tmp.stricted, tmp.message);
-        }
-
-
-        method = parsePropertyFunction({
-            params: tmp.params,
-            defaults: tmp.defaults,
-            rest: tmp.rest,
-            generator: options.generator
-        });
-
-        strict = previousStrict;
-
-        return method;
-    }
-
-
-    function parseObjectPropertyKey() {
-        var token = lex();
-
-        // Note: This function is called only from parseObjectProperty(), where
-        // EOF and Punctuator tokens are already filtered out.
-
-        if (token.type === Token.StringLiteral || token.type === Token.NumericLiteral) {
-            if (strict && token.octal) {
-                throwErrorTolerant(token, Messages.StrictOctalLiteral);
-            }
-            return delegate.createLiteral(token);
-        }
-
-        return delegate.createIdentifier(token.value);
-    }
-
-    function parseObjectProperty() {
-        var token, key, id, value, param;
-
-        token = lookahead;
-
-        if (token.type === Token.Identifier) {
-
-            id = parseObjectPropertyKey();
-
-            // Property Assignment: Getter and Setter.
-
-            if (token.value === 'get' && !(match(':') || match('('))) {
-                key = parseObjectPropertyKey();
-                expect('(');
-                expect(')');
-                return delegate.createProperty('get', key, parsePropertyFunction({ generator: false }), false, false);
-            }
-            if (token.value === 'set' && !(match(':') || match('('))) {
-                key = parseObjectPropertyKey();
-                expect('(');
-                token = lookahead;
-                param = [ parseVariableIdentifier() ];
-                expect(')');
-                return delegate.createProperty('set', key, parsePropertyFunction({ params: param, generator: false, name: token }), false, false);
-            }
-            if (match(':')) {
-                lex();
-                return delegate.createProperty('init', id, parseAssignmentExpression(), false, false);
-            }
-            if (match('(')) {
-                return delegate.createProperty('init', id, parsePropertyMethodFunction({ generator: false }), true, false);
-            }
-            return delegate.createProperty('init', id, id, false, true);
-        }
-        if (token.type === Token.EOF || token.type === Token.Punctuator) {
-            if (!match('*')) {
-                throwUnexpected(token);
-            }
-            lex();
-
-            id = parseObjectPropertyKey();
-
-            if (!match('(')) {
-                throwUnexpected(lex());
-            }
-
-            return delegate.createProperty('init', id, parsePropertyMethodFunction({ generator: true }), true, false);
-        }
-        key = parseObjectPropertyKey();
-        if (match(':')) {
-            lex();
-            return delegate.createProperty('init', key, parseAssignmentExpression(), false, false);
-        }
-        if (match('(')) {
-            return delegate.createProperty('init', key, parsePropertyMethodFunction({ generator: false }), true, false);
-        }
-        throwUnexpected(lex());
-    }
-
-    function parseObjectInitialiser() {
-        var properties = [], property, name, key, kind, map = {}, toString = String;
-
-        expect('{');
-
-        while (!match('}')) {
-            property = parseObjectProperty();
-
-            if (property.key.type === Syntax.Identifier) {
-                name = property.key.name;
-            } else {
-                name = toString(property.key.value);
-            }
-            kind = (property.kind === 'init') ? PropertyKind.Data : (property.kind === 'get') ? PropertyKind.Get : PropertyKind.Set;
-
-            key = '$' + name;
-            if (Object.prototype.hasOwnProperty.call(map, key)) {
-                if (map[key] === PropertyKind.Data) {
-                    if (strict && kind === PropertyKind.Data) {
-                        throwErrorTolerant({}, Messages.StrictDuplicateProperty);
-                    } else if (kind !== PropertyKind.Data) {
-                        throwErrorTolerant({}, Messages.AccessorDataProperty);
-                    }
-                } else {
-                    if (kind === PropertyKind.Data) {
-                        throwErrorTolerant({}, Messages.AccessorDataProperty);
-                    } else if (map[key] & kind) {
-                        throwErrorTolerant({}, Messages.AccessorGetSet);
-                    }
-                }
-                map[key] |= kind;
-            } else {
-                map[key] = kind;
-            }
-
-            properties.push(property);
-
-            if (!match('}')) {
-                expect(',');
-            }
-        }
-
-        expect('}');
-
-        return delegate.createObjectExpression(properties);
-    }
-
-    function parseTemplateElement(option) {
-        var token = scanTemplateElement(option);
-        if (strict && token.octal) {
-            throwError(token, Messages.StrictOctalLiteral);
-        }
-        return delegate.createTemplateElement({ raw: token.value.raw, cooked: token.value.cooked }, token.tail);
-    }
-
-    function parseTemplateLiteral() {
-        var quasi, quasis, expressions;
-
-        quasi = parseTemplateElement({ head: true });
-        quasis = [ quasi ];
-        expressions = [];
-
-        while (!quasi.tail) {
-            expressions.push(parseExpression());
-            quasi = parseTemplateElement({ head: false });
-            quasis.push(quasi);
-        }
-
-        return delegate.createTemplateLiteral(quasis, expressions);
-    }
-
-    // 11.1.6 The Grouping Operator
-
-    function parseGroupExpression() {
-        var expr;
-
-        expect('(');
-
-        ++state.parenthesizedCount;
-
-        expr = parseExpression();
-
-        expect(')');
-
-        return expr;
-    }
-
-
-    // 11.1 Primary Expressions
-
-    function parsePrimaryExpression() {
-        var type, token;
-
-        token = lookahead;
-        type = lookahead.type;
-
-        if (type === Token.Identifier) {
-            lex();
-            return delegate.createIdentifier(token.value);
-        }
-
-        if (type === Token.StringLiteral || type === Token.NumericLiteral) {
-            if (strict && lookahead.octal) {
-                throwErrorTolerant(lookahead, Messages.StrictOctalLiteral);
-            }
-            return delegate.createLiteral(lex());
-        }
-
-        if (type === Token.Keyword) {
-            if (matchKeyword('this')) {
-                lex();
-                return delegate.createThisExpression();
-            }
-
-            if (matchKeyword('function')) {
-                return parseFunctionExpression();
-            }
-
-            if (matchKeyword('class')) {
-                return parseClassExpression();
-            }
-
-            if (matchKeyword('super')) {
-                lex();
-                return delegate.createIdentifier('super');
-            }
-        }
-
-        if (type === Token.BooleanLiteral) {
-            token = lex();
-            token.value = (token.value === 'true');
-            return delegate.createLiteral(token);
-        }
-
-        if (type === Token.NullLiteral) {
-            token = lex();
-            token.value = null;
-            return delegate.createLiteral(token);
-        }
-
-        if (match('[')) {
-            return parseArrayInitialiser();
-        }
-
-        if (match('{')) {
-            return parseObjectInitialiser();
-        }
-
-        if (match('(')) {
-            return parseGroupExpression();
-        }
-
-        if (match('/') || match('/=')) {
-            return delegate.createLiteral(scanRegExp());
-        }
-
-        if (type === Token.Template) {
-            return parseTemplateLiteral();
-        }
-
-        return throwUnexpected(lex());
-    }
-
-    // 11.2 Left-Hand-Side Expressions
-
-    function parseArguments() {
-        var args = [], arg;
-
-        expect('(');
-
-        if (!match(')')) {
-            while (index < length) {
-                arg = parseSpreadOrAssignmentExpression();
-                args.push(arg);
-
-                if (match(')')) {
-                    break;
-                } else if (arg.type === Syntax.SpreadElement) {
-                    throwError({}, Messages.ElementAfterSpreadElement);
-                }
-
-                expect(',');
-            }
-        }
-
-        expect(')');
-
-        return args;
-    }
-
-    function parseSpreadOrAssignmentExpression() {
-        if (match('...')) {
-            lex();
-            return delegate.createSpreadElement(parseAssignmentExpression());
-        }
-        return parseAssignmentExpression();
-    }
-
-    function parseNonComputedProperty() {
-        var token = lex();
-
-        if (!isIdentifierName(token)) {
-            throwUnexpected(token);
-        }
-
-        return delegate.createIdentifier(token.value);
-    }
-
-    function parseNonComputedMember() {
-        expect('.');
-
-        return parseNonComputedProperty();
-    }
-
-    function parseComputedMember() {
-        var expr;
-
-        expect('[');
-
-        expr = parseExpression();
-
-        expect(']');
-
-        return expr;
-    }
-
-    function parseNewExpression() {
-        var callee, args;
-
-        expectKeyword('new');
-        callee = parseLeftHandSideExpression();
-        args = match('(') ? parseArguments() : [];
-
-        return delegate.createNewExpression(callee, args);
-    }
-
-    function parseLeftHandSideExpressionAllowCall() {
-        var expr, args, property;
-
-        expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
-
-        while (match('.') || match('[') || match('(') || lookahead.type === Token.Template) {
-            if (match('(')) {
-                args = parseArguments();
-                expr = delegate.createCallExpression(expr, args);
-            } else if (match('[')) {
-                expr = delegate.createMemberExpression('[', expr, parseComputedMember());
-            } else if (match('.')) {
-                expr = delegate.createMemberExpression('.', expr, parseNonComputedMember());
-            } else {
-                expr = delegate.createTaggedTemplateExpression(expr, parseTemplateLiteral());
-            }
-        }
-
-        return expr;
-    }
-
-
-    function parseLeftHandSideExpression() {
-        var expr, property;
-
-        expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
-
-        while (match('.') || match('[') || lookahead.type === Token.Template) {
-            if (match('[')) {
-                expr = delegate.createMemberExpression('[', expr, parseComputedMember());
-            } else if (match('.')) {
-                expr = delegate.createMemberExpression('.', expr, parseNonComputedMember());
-            } else {
-                expr = delegate.createTaggedTemplateExpression(expr, parseTemplateLiteral());
-            }
-        }
-
-        return expr;
-    }
-
-    // 11.3 Postfix Expressions
-
-    function parsePostfixExpression() {
-        var expr = parseLeftHandSideExpressionAllowCall(),
-            token = lookahead;
-
-        if (lookahead.type !== Token.Punctuator) {
-            return expr;
-        }
-
-        if ((match('++') || match('--')) && !peekLineTerminator()) {
-            // 11.3.1, 11.3.2
-            if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
-                throwErrorTolerant({}, Messages.StrictLHSPostfix);
-            }
-
-            if (!isLeftHandSide(expr)) {
-                throwError({}, Messages.InvalidLHSInAssignment);
-            }
-
-            token = lex();
-            expr = delegate.createPostfixExpression(token.value, expr);
-        }
-
-        return expr;
-    }
-
-    // 11.4 Unary Operators
-
-    function parseUnaryExpression() {
-        var token, expr;
-
-        if (lookahead.type !== Token.Punctuator && lookahead.type !== Token.Keyword) {
-            return parsePostfixExpression();
-        }
-
-        if (match('++') || match('--')) {
-            token = lex();
-            expr = parseUnaryExpression();
-            // 11.4.4, 11.4.5
-            if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
-                throwErrorTolerant({}, Messages.StrictLHSPrefix);
-            }
-
-            if (!isLeftHandSide(expr)) {
-                throwError({}, Messages.InvalidLHSInAssignment);
-            }
-
-            return delegate.createUnaryExpression(token.value, expr);
-        }
-
-        if (match('+') || match('-') || match('~') || match('!')) {
-            token = lex();
-            expr = parseUnaryExpression();
-            return delegate.createUnaryExpression(token.value, expr);
-        }
-
-        if (matchKeyword('delete') || matchKeyword('void') || matchKeyword('typeof')) {
-            token = lex();
-            expr = parseUnaryExpression();
-            expr = delegate.createUnaryExpression(token.value, expr);
-            if (strict && expr.operator === 'delete' && expr.argument.type === Syntax.Identifier) {
-                throwErrorTolerant({}, Messages.StrictDelete);
-            }
-            return expr;
-        }
-
-        return parsePostfixExpression();
-    }
-
-    function binaryPrecedence(token, allowIn) {
-        var prec = 0;
-
-        if (token.type !== Token.Punctuator && token.type !== Token.Keyword) {
-            return 0;
-        }
-
-        switch (token.value) {
-        case '||':
-            prec = 1;
-            break;
-
-        case '&&':
-            prec = 2;
-            break;
-
-        case '|':
-            prec = 3;
-            break;
-
-        case '^':
-            prec = 4;
-            break;
-
-        case '&':
-            prec = 5;
-            break;
-
-        case '==':
-        case '!=':
-        case '===':
-        case '!==':
-            prec = 6;
-            break;
-
-        case '<':
-        case '>':
-        case '<=':
-        case '>=':
-        case 'instanceof':
-            prec = 7;
-            break;
-
-        case 'in':
-            prec = allowIn ? 7 : 0;
-            break;
-
-        case '<<':
-        case '>>':
-        case '>>>':
-            prec = 8;
-            break;
-
-        case '+':
-        case '-':
-            prec = 9;
-            break;
-
-        case '*':
-        case '/':
-        case '%':
-            prec = 11;
-            break;
-
-        default:
-            break;
-        }
-
-        return prec;
-    }
-
-    // 11.5 Multiplicative Operators
-    // 11.6 Additive Operators
-    // 11.7 Bitwise Shift Operators
-    // 11.8 Relational Operators
-    // 11.9 Equality Operators
-    // 11.10 Binary Bitwise Operators
-    // 11.11 Binary Logical Operators
-
-    function parseBinaryExpression() {
-        var expr, token, prec, previousAllowIn, stack, right, operator, left, i;
-
-        previousAllowIn = state.allowIn;
-        state.allowIn = true;
-
-        expr = parseUnaryExpression();
-
-        token = lookahead;
-        prec = binaryPrecedence(token, previousAllowIn);
-        if (prec === 0) {
-            return expr;
-        }
-        token.prec = prec;
-        lex();
-
-        stack = [expr, token, parseUnaryExpression()];
-
-        while ((prec = binaryPrecedence(lookahead, previousAllowIn)) > 0) {
-
-            // Reduce: make a binary expression from the three topmost entries.
-            while ((stack.length > 2) && (prec <= stack[stack.length - 2].prec)) {
-                right = stack.pop();
-                operator = stack.pop().value;
-                left = stack.pop();
-                stack.push(delegate.createBinaryExpression(operator, left, right));
-            }
-
-            // Shift.
-            token = lex();
-            token.prec = prec;
-            stack.push(token);
-            stack.push(parseUnaryExpression());
-        }
-
-        state.allowIn = previousAllowIn;
-
-        // Final reduce to clean-up the stack.
-        i = stack.length - 1;
-        expr = stack[i];
-        while (i > 1) {
-            expr = delegate.createBinaryExpression(stack[i - 1].value, stack[i - 2], expr);
-            i -= 2;
-        }
-        return expr;
-    }
-
-
-    // 11.12 Conditional Operator
-
-    function parseConditionalExpression() {
-        var expr, previousAllowIn, consequent, alternate;
-
-        expr = parseBinaryExpression();
-
-        if (match('?')) {
-            lex();
-            previousAllowIn = state.allowIn;
-            state.allowIn = true;
-            consequent = parseAssignmentExpression();
-            state.allowIn = previousAllowIn;
-            expect(':');
-            alternate = parseAssignmentExpression();
-
-            expr = delegate.createConditionalExpression(expr, consequent, alternate);
-        }
-
-        return expr;
-    }
-
-    // 11.13 Assignment Operators
-
-    function reinterpretAsAssignmentBindingPattern(expr) {
-        var i, len, property, element;
-
-        if (expr.type === Syntax.ObjectExpression) {
-            expr.type = Syntax.ObjectPattern;
-            for (i = 0, len = expr.properties.length; i < len; i += 1) {
-                property = expr.properties[i];
-                if (property.kind !== 'init') {
-                    throwError({}, Messages.InvalidLHSInAssignment);
-                }
-                reinterpretAsAssignmentBindingPattern(property.value);
-            }
-        } else if (expr.type === Syntax.ArrayExpression) {
-            expr.type = Syntax.ArrayPattern;
-            for (i = 0, len = expr.elements.length; i < len; i += 1) {
-                element = expr.elements[i];
-                if (element) {
-                    reinterpretAsAssignmentBindingPattern(element);
-                }
-            }
-        } else if (expr.type === Syntax.Identifier) {
-            if (isRestrictedWord(expr.name)) {
-                throwError({}, Messages.InvalidLHSInAssignment);
-            }
-        } else if (expr.type === Syntax.SpreadElement) {
-            reinterpretAsAssignmentBindingPattern(expr.argument);
-            if (expr.argument.type === Syntax.ObjectPattern) {
-                throwError({}, Messages.ObjectPatternAsSpread);
-            }
-        } else {
-            if (expr.type !== Syntax.MemberExpression && expr.type !== Syntax.CallExpression && expr.type !== Syntax.NewExpression) {
-                throwError({}, Messages.InvalidLHSInAssignment);
-            }
-        }
-    }
-
-
-    function reinterpretAsDestructuredParameter(options, expr) {
-        var i, len, property, element;
-
-        if (expr.type === Syntax.ObjectExpression) {
-            expr.type = Syntax.ObjectPattern;
-            for (i = 0, len = expr.properties.length; i < len; i += 1) {
-                property = expr.properties[i];
-                if (property.kind !== 'init') {
-                    throwError({}, Messages.InvalidLHSInFormalsList);
-                }
-                reinterpretAsDestructuredParameter(options, property.value);
-            }
-        } else if (expr.type === Syntax.ArrayExpression) {
-            expr.type = Syntax.ArrayPattern;
-            for (i = 0, len = expr.elements.length; i < len; i += 1) {
-                element = expr.elements[i];
-                if (element) {
-                    reinterpretAsDestructuredParameter(options, element);
-                }
-            }
-        } else if (expr.type === Syntax.Identifier) {
-            validateParam(options, expr, expr.name);
-        } else {
-            if (expr.type !== Syntax.MemberExpression) {
-                throwError({}, Messages.InvalidLHSInFormalsList);
-            }
-        }
-    }
-
-    function reinterpretAsCoverFormalsList(expressions) {
-        var i, len, param, params, defaults, defaultCount, options, rest;
-
-        params = [];
-        defaults = [];
-        defaultCount = 0;
-        rest = null;
-        options = {
-            paramSet: {}
-        };
-
-        for (i = 0, len = expressions.length; i < len; i += 1) {
-            param = expressions[i];
-            if (param.type === Syntax.Identifier) {
-                params.push(param);
-                defaults.push(null);
-                validateParam(options, param, param.name);
-            } else if (param.type === Syntax.ObjectExpression || param.type === Syntax.ArrayExpression) {
-                reinterpretAsDestructuredParameter(options, param);
-                params.push(param);
-                defaults.push(null);
-            } else if (param.type === Syntax.SpreadElement) {
-                assert(i === len - 1, "It is guaranteed that SpreadElement is last element by parseExpression");
-                reinterpretAsDestructuredParameter(options, param.argument);
-                rest = param.argument;
-            } else if (param.type === Syntax.AssignmentExpression) {
-                params.push(param.left);
-                defaults.push(param.right);
-                ++defaultCount;
-                validateParam(options, param.left, param.left.name);
-            } else {
-                return null;
-            }
-        }
-
-        if (options.message === Messages.StrictParamDupe) {
-            throwError(
-                strict ? options.stricted : options.firstRestricted,
-                options.message
-            );
-        }
-
-        if (defaultCount === 0) {
-            defaults = [];
-        }
-
-        return {
-            params: params,
-            defaults: defaults,
-            rest: rest,
-            stricted: options.stricted,
-            firstRestricted: options.firstRestricted,
-            message: options.message
-        };
-    }
-
-    function parseArrowFunctionExpression(options) {
-        var previousStrict, previousYieldAllowed, body;
-
-        expect('=>');
-
-        previousStrict = strict;
-        previousYieldAllowed = state.yieldAllowed;
-        state.yieldAllowed = false;
-        body = parseConciseBody();
-
-        if (strict && options.firstRestricted) {
-            throwError(options.firstRestricted, options.message);
-        }
-        if (strict && options.stricted) {
-            throwErrorTolerant(options.stricted, options.message);
-        }
-
-        strict = previousStrict;
-        state.yieldAllowed = previousYieldAllowed;
-
-        return delegate.createArrowFunctionExpression(options.params, options.defaults, body, options.rest, body.type !== Syntax.BlockStatement);
-    }
-
-    function parseAssignmentExpression() {
-        var expr, token, params, oldParenthesizedCount;
-
-        if (matchKeyword('yield')) {
-            return parseYieldExpression();
-        }
-
-        oldParenthesizedCount = state.parenthesizedCount;
-
-        if (match('(')) {
-            token = lookahead2();
-            if ((token.type === Token.Punctuator && token.value === ')') || token.value === '...') {
-                params = parseParams();
-                if (!match('=>')) {
-                    throwUnexpected(lex());
-                }
-                return parseArrowFunctionExpression(params);
-            }
-        }
-
-        token = lookahead;
-        expr = parseConditionalExpression();
-
-        if (match('=>') &&
-                (state.parenthesizedCount === oldParenthesizedCount ||
-                state.parenthesizedCount === (oldParenthesizedCount + 1))) {
-            if (expr.type === Syntax.Identifier) {
-                params = reinterpretAsCoverFormalsList([ expr ]);
-            } else if (expr.type === Syntax.SequenceExpression) {
-                params = reinterpretAsCoverFormalsList(expr.expressions);
-            }
-            if (params) {
-                return parseArrowFunctionExpression(params);
-            }
-        }
-
-        if (matchAssign()) {
-            // 11.13.1
-            if (strict && expr.type === Syntax.Identifier && isRestrictedWord(expr.name)) {
-                throwErrorTolerant(token, Messages.StrictLHSAssignment);
-            }
-
-            // ES.next draf 11.13 Runtime Semantics step 1
-            if (match('=') && (expr.type === Syntax.ObjectExpression || expr.type === Syntax.ArrayExpression)) {
-                reinterpretAsAssignmentBindingPattern(expr);
-            } else if (!isLeftHandSide(expr)) {
-                throwError({}, Messages.InvalidLHSInAssignment);
-            }
-
-            expr = delegate.createAssignmentExpression(lex().value, expr, parseAssignmentExpression());
-        }
-
-        return expr;
-    }
-
-    // 11.14 Comma Operator
-
-    function parseExpression() {
-        var expr, expressions, sequence, coverFormalsList, spreadFound, oldParenthesizedCount;
-
-        oldParenthesizedCount = state.parenthesizedCount;
-
-        expr = parseAssignmentExpression();
-        expressions = [ expr ];
-
-        if (match(',')) {
-            while (index < length) {
-                if (!match(',')) {
-                    break;
-                }
-
-                lex();
-                expr = parseSpreadOrAssignmentExpression();
-                expressions.push(expr);
-
-                if (expr.type === Syntax.SpreadElement) {
-                    spreadFound = true;
-                    if (!match(')')) {
-                        throwError({}, Messages.ElementAfterSpreadElement);
-                    }
-                    break;
-                }
-            }
-
-            sequence = delegate.createSequenceExpression(expressions);
-        }
-
-        if (match('=>')) {
-            // Do not allow nested parentheses on the LHS of the =>.
-            if (state.parenthesizedCount === oldParenthesizedCount || state.parenthesizedCount === (oldParenthesizedCount + 1)) {
-                expr = expr.type === Syntax.SequenceExpression ? expr.expressions : expressions;
-                coverFormalsList = reinterpretAsCoverFormalsList(expr);
-                if (coverFormalsList) {
-                    return parseArrowFunctionExpression(coverFormalsList);
-                }
-            }
-            throwUnexpected(lex());
-        }
-
-        if (spreadFound && lookahead2().value !== '=>') {
-            throwError({}, Messages.IllegalSpread);
-        }
-
-        return sequence || expr;
-    }
-
-    // 12.1 Block
-
-    function parseStatementList() {
-        var list = [],
-            statement;
-
-        while (index < length) {
-            if (match('}')) {
-                break;
-            }
-            statement = parseSourceElement();
-            if (typeof statement === 'undefined') {
-                break;
-            }
-            list.push(statement);
-        }
-
-        return list;
-    }
-
-    function parseBlock() {
-        var block;
-
-        expect('{');
-
-        block = parseStatementList();
-
-        expect('}');
-
-        return delegate.createBlockStatement(block);
-    }
-
-    // 12.2 Variable Statement
-
-    function parseVariableIdentifier() {
-        var token = lex();
-
-        if (token.type !== Token.Identifier) {
-            throwUnexpected(token);
-        }
-
-        return delegate.createIdentifier(token.value);
-    }
-
-    function parseVariableDeclaration(kind) {
-        var id,
-            init = null;
-        if (match('{')) {
-            id = parseObjectInitialiser();
-            reinterpretAsAssignmentBindingPattern(id);
-        } else if (match('[')) {
-            id = parseArrayInitialiser();
-            reinterpretAsAssignmentBindingPattern(id);
-        } else {
-            if (state.allowDefault) {
-                id = matchKeyword('default') ? parseNonComputedProperty() : parseVariableIdentifier();
-            } else {
-                id = parseVariableIdentifier();
-            }
-            // 12.2.1
-            if (strict && isRestrictedWord(id.name)) {
-                throwErrorTolerant({}, Messages.StrictVarName);
-            }
-        }
-
-        if (kind === 'const') {
-            if (!match('=')) {
-                throwError({}, Messages.NoUnintializedConst);
-            }
-            expect('=');
-            init = parseAssignmentExpression();
-        } else if (match('=')) {
-            lex();
-            init = parseAssignmentExpression();
-        }
-
-        return delegate.createVariableDeclarator(id, init);
-    }
-
-    function parseVariableDeclarationList(kind) {
-        var list = [];
-
-        do {
-            list.push(parseVariableDeclaration(kind));
-            if (!match(',')) {
-                break;
-            }
-            lex();
-        } while (index < length);
-
-        return list;
-    }
-
-    function parseVariableStatement() {
-        var declarations;
-
-        expectKeyword('var');
-
-        declarations = parseVariableDeclarationList();
-
-        consumeSemicolon();
-
-        return delegate.createVariableDeclaration(declarations, 'var');
-    }
-
-    // kind may be `const` or `let`
-    // Both are experimental and not in the specification yet.
-    // see http://wiki.ecmascript.org/doku.php?id=harmony:const
-    // and http://wiki.ecmascript.org/doku.php?id=harmony:let
-    function parseConstLetDeclaration(kind) {
-        var declarations;
-
-        expectKeyword(kind);
-
-        declarations = parseVariableDeclarationList(kind);
-
-        consumeSemicolon();
-
-        return delegate.createVariableDeclaration(declarations, kind);
-    }
-
-    // http://wiki.ecmascript.org/doku.php?id=harmony:modules
-
-    function parseModuleDeclaration() {
-        var id, src, body;
-
-        lex();   // 'module'
-
-        if (peekLineTerminator()) {
-            throwError({}, Messages.NewlineAfterModule);
-        }
-
-        switch (lookahead.type) {
-
-        case Token.StringLiteral:
-            id = parsePrimaryExpression();
-            body = parseModuleBlock();
-            src = null;
-            break;
-
-        case Token.Identifier:
-            id = parseVariableIdentifier();
-            body = null;
-            if (!matchContextualKeyword('from')) {
-                throwUnexpected(lex());
-            }
-            lex();
-            src = parsePrimaryExpression();
-            if (src.type !== Syntax.Literal) {
-                throwError({}, Messages.InvalidModuleSpecifier);
-            }
-            break;
-        }
-
-        consumeSemicolon();
-        return delegate.createModuleDeclaration(id, src, body);
-    }
-
-    function parseExportBatchSpecifier() {
-        expect('*');
-        return delegate.createExportBatchSpecifier();
-    }
-
-    function parseExportSpecifier() {
-        var id, name = null;
-
-        id = parseVariableIdentifier();
-        if (matchContextualKeyword('as')) {
-            lex();
-            name = parseNonComputedProperty();
-        }
-
-        return delegate.createExportSpecifier(id, name);
-    }
-
-    function parseExportDeclaration() {
-        var previousAllowDefault, decl, def, src, specifiers;
-
-        expectKeyword('export');
-
-        if (matchKeyword('default')) {
-            lex();
-            if (match('=')) {
-                lex();
-                def = parseAssignmentExpression();
-            } else if (lookahead.type === Token.Keyword) {
-                switch (lookahead.value) {
-                case 'let':
-                case 'const':
-                case 'var':
-                case 'class':
-                    def = parseSourceElement();
-                    break;
-                case 'function':
-                    def = parseFunctionExpression();
-                    break;
-                default:
-                    throwUnexpected(lex());
-                }
-            } else {
-                def = parseAssignmentExpression();
-            }
-            consumeSemicolon();
-            return delegate.createExportDeclaration(true, def, null, null);
-        }
-
-        if (lookahead.type === Token.Keyword) {
-            switch (lookahead.value) {
-            case 'let':
-            case 'const':
-            case 'var':
-            case 'class':
-            case 'function':
-                previousAllowDefault = state.allowDefault;
-                state.allowDefault = true;
-                decl = delegate.createExportDeclaration(false, parseSourceElement(), null, null);
-                state.allowDefault = previousAllowDefault;
-                return decl;
-            }
-            throwUnexpected(lex());
-        }
-
-        specifiers = [];
-        src = null;
-
-        if (match('*')) {
-            specifiers.push(parseExportBatchSpecifier());
-        } else {
-            expect('{');
-            do {
-                specifiers.push(parseExportSpecifier());
-            } while (match(',') && lex());
-            expect('}');
-        }
-
-        if (matchContextualKeyword('from')) {
-            lex();
-            src = parsePrimaryExpression();
-            if (src.type !== Syntax.Literal) {
-                throwError({}, Messages.InvalidModuleSpecifier);
-            }
-        }
-
-        consumeSemicolon();
-
-        return delegate.createExportDeclaration(false, null, specifiers, src);
-    }
-
-    function parseImportDeclaration() {
-        var specifiers, kind, src;
-
-        expectKeyword('import');
-        specifiers = [];
-
-        if (isIdentifierName(lookahead)) {
-            kind = 'default';
-            specifiers.push(parseImportSpecifier());
-
-            if (!matchContextualKeyword('from')) {
-                throwError({}, Messages.NoFromAfterImport);
-            }
-            lex();
-        } else if (match('{')) {
-            kind = 'named';
-            lex();
-            do {
-                specifiers.push(parseImportSpecifier());
-            } while (match(',') && lex());
-            expect('}');
-
-            if (!matchContextualKeyword('from')) {
-                throwError({}, Messages.NoFromAfterImport);
-            }
-            lex();
-        }
-
-        src = parsePrimaryExpression();
-        if (src.type !== Syntax.Literal) {
-            throwError({}, Messages.InvalidModuleSpecifier);
-        }
-
-        consumeSemicolon();
-
-        return delegate.createImportDeclaration(specifiers, kind, src);
-    }
-
-    function parseImportSpecifier() {
-        var id, name = null;
-
-        id = parseNonComputedProperty();
-        if (matchContextualKeyword('as')) {
-            lex();
-            name = parseVariableIdentifier();
-        }
-
-        return delegate.createImportSpecifier(id, name);
-    }
-
-    // 12.3 Empty Statement
-
-    function parseEmptyStatement() {
-        expect(';');
-        return delegate.createEmptyStatement();
-    }
-
-    // 12.4 Expression Statement
-
-    function parseExpressionStatement() {
-        var expr = parseExpression();
-        consumeSemicolon();
-        return delegate.createExpressionStatement(expr);
-    }
-
-    // 12.5 If statement
-
-    function parseIfStatement() {
-        var test, consequent, alternate;
-
-        expectKeyword('if');
-
-        expect('(');
-
-        test = parseExpression();
-
-        expect(')');
-
-        consequent = parseStatement();
-
-        if (matchKeyword('else')) {
-            lex();
-            alternate = parseStatement();
-        } else {
-            alternate = null;
-        }
-
-        return delegate.createIfStatement(test, consequent, alternate);
-    }
-
-    // 12.6 Iteration Statements
-
-    function parseDoWhileStatement() {
-        var body, test, oldInIteration;
-
-        expectKeyword('do');
-
-        oldInIteration = state.inIteration;
-        state.inIteration = true;
-
-        body = parseStatement();
-
-        state.inIteration = oldInIteration;
-
-        expectKeyword('while');
-
-        expect('(');
-
-        test = parseExpression();
-
-        expect(')');
-
-        if (match(';')) {
-            lex();
-        }
-
-        return delegate.createDoWhileStatement(body, test);
-    }
-
-    function parseWhileStatement() {
-        var test, body, oldInIteration;
-
-        expectKeyword('while');
-
-        expect('(');
-
-        test = parseExpression();
-
-        expect(')');
-
-        oldInIteration = state.inIteration;
-        state.inIteration = true;
-
-        body = parseStatement();
-
-        state.inIteration = oldInIteration;
-
-        return delegate.createWhileStatement(test, body);
-    }
-
-    function parseForVariableDeclaration() {
-        var token = lex(),
-            declarations = parseVariableDeclarationList();
-
-        return delegate.createVariableDeclaration(declarations, token.value);
-    }
-
-    function parseForStatement(opts) {
-        var init, test, update, left, right, body, operator, oldInIteration;
-        init = test = update = null;
-        expectKeyword('for');
-
-        // http://wiki.ecmascript.org/doku.php?id=proposals:iterators_and_generators&s=each
-        if (matchContextualKeyword("each")) {
-            throwError({}, Messages.EachNotAllowed);
-        }
-
-        expect('(');
-
-        if (match(';')) {
-            lex();
-        } else {
-            if (matchKeyword('var') || matchKeyword('let') || matchKeyword('const')) {
-                state.allowIn = false;
-                init = parseForVariableDeclaration();
-                state.allowIn = true;
-
-                if (init.declarations.length === 1) {
-                    if (matchKeyword('in') || matchContextualKeyword('of')) {
-                        operator = lookahead;
-                        if (!((operator.value === 'in' || init.kind !== 'var') && init.declarations[0].init)) {
-                            lex();
-                            left = init;
-                            right = parseExpression();
-                            init = null;
-                        }
-                    }
-                }
-            } else {
-                state.allowIn = false;
-                init = parseExpression();
-                state.allowIn = true;
-
-                if (matchContextualKeyword('of')) {
-                    operator = lex();
-                    left = init;
-                    right = parseExpression();
-                    init = null;
-                } else if (matchKeyword('in')) {
-                    // LeftHandSideExpression
-                    if (!isAssignableLeftHandSide(init)) {
-                        throwError({}, Messages.InvalidLHSInForIn);
-                    }
-                    operator = lex();
-                    left = init;
-                    right = parseExpression();
-                    init = null;
-                }
-            }
-
-            if (typeof left === 'undefined') {
-                expect(';');
-            }
-        }
-
-        if (typeof left === 'undefined') {
-
-            if (!match(';')) {
-                test = parseExpression();
-            }
-            expect(';');
-
-            if (!match(')')) {
-                update = parseExpression();
-            }
-        }
-
-        expect(')');
-
-        oldInIteration = state.inIteration;
-        state.inIteration = true;
-
-        if (!(opts !== undefined && opts.ignore_body)) {
-            body = parseStatement();
-        }
-
-        state.inIteration = oldInIteration;
-
-        if (typeof left === 'undefined') {
-            return delegate.createForStatement(init, test, update, body);
-        }
-
-        if (operator.value === 'in') {
-            return delegate.createForInStatement(left, right, body);
-        }
-        return delegate.createForOfStatement(left, right, body);
-    }
-
-    // 12.7 The continue statement
-
-    function parseContinueStatement() {
-        var label = null, key;
-
-        expectKeyword('continue');
-
-        // Optimize the most common form: 'continue;'.
-        if (source.charCodeAt(index) === 59) {
-            lex();
-
-            if (!state.inIteration) {
-                throwError({}, Messages.IllegalContinue);
-            }
-
-            return delegate.createContinueStatement(null);
-        }
-
-        if (peekLineTerminator()) {
-            if (!state.inIteration) {
-                throwError({}, Messages.IllegalContinue);
-            }
-
-            return delegate.createContinueStatement(null);
-        }
-
-        if (lookahead.type === Token.Identifier) {
-            label = parseVariableIdentifier();
-
-            key = '$' + label.name;
-            if (!Object.prototype.hasOwnProperty.call(state.labelSet, key)) {
-                throwError({}, Messages.UnknownLabel, label.name);
-            }
-        }
-
-        consumeSemicolon();
-
-        if (label === null && !state.inIteration) {
-            throwError({}, Messages.IllegalContinue);
-        }
-
-        return delegate.createContinueStatement(label);
-    }
-
-    // 12.8 The break statement
-
-    function parseBreakStatement() {
-        var label = null, key;
-
-        expectKeyword('break');
-
-        // Catch the very common case first: immediately a semicolon (char #59).
-        if (source.charCodeAt(index) === 59) {
-            lex();
-
-            if (!(state.inIteration || state.inSwitch)) {
-                throwError({}, Messages.IllegalBreak);
-            }
-
-            return delegate.createBreakStatement(null);
-        }
-
-        if (peekLineTerminator()) {
-            if (!(state.inIteration || state.inSwitch)) {
-                throwError({}, Messages.IllegalBreak);
-            }
-
-            return delegate.createBreakStatement(null);
-        }
-
-        if (lookahead.type === Token.Identifier) {
-            label = parseVariableIdentifier();
-
-            key = '$' + label.name;
-            if (!Object.prototype.hasOwnProperty.call(state.labelSet, key)) {
-                throwError({}, Messages.UnknownLabel, label.name);
-            }
-        }
-
-        consumeSemicolon();
-
-        if (label === null && !(state.inIteration || state.inSwitch)) {
-            throwError({}, Messages.IllegalBreak);
-        }
-
-        return delegate.createBreakStatement(label);
-    }
-
-    // 12.9 The return statement
-
-    function parseReturnStatement() {
-        var argument = null;
-
-        expectKeyword('return');
-
-        if (!state.inFunctionBody) {
-            throwErrorTolerant({}, Messages.IllegalReturn);
-        }
-
-        // 'return' followed by a space and an identifier is very common.
-        if (source.charCodeAt(index) === 32) {
-            if (isIdentifierStart(source.charCodeAt(index + 1))) {
-                argument = parseExpression();
-                consumeSemicolon();
-                return delegate.createReturnStatement(argument);
-            }
-        }
-
-        if (peekLineTerminator()) {
-            return delegate.createReturnStatement(null);
-        }
-
-        if (!match(';')) {
-            if (!match('}') && lookahead.type !== Token.EOF) {
-                argument = parseExpression();
-            }
-        }
-
-        consumeSemicolon();
-
-        return delegate.createReturnStatement(argument);
-    }
-
-    // 12.10 The with statement
-
-    function parseWithStatement() {
-        var object, body;
-
-        if (strict) {
-            throwErrorTolerant({}, Messages.StrictModeWith);
-        }
-
-        expectKeyword('with');
-
-        expect('(');
-
-        object = parseExpression();
-
-        expect(')');
-
-        body = parseStatement();
-
-        return delegate.createWithStatement(object, body);
-    }
-
-    // 12.10 The swith statement
-
-    function parseSwitchCase() {
-        var test,
-            consequent = [],
-            sourceElement;
-
-        if (matchKeyword('default')) {
-            lex();
-            test = null;
-        } else {
-            expectKeyword('case');
-            test = parseExpression();
-        }
-        expect(':');
-
-        while (index < length) {
-            if (match('}') || matchKeyword('default') || matchKeyword('case')) {
-                break;
-            }
-            sourceElement = parseSourceElement();
-            if (typeof sourceElement === 'undefined') {
-                break;
-            }
-            consequent.push(sourceElement);
-        }
-
-        return delegate.createSwitchCase(test, consequent);
-    }
-
-    function parseSwitchStatement() {
-        var discriminant, cases, clause, oldInSwitch, defaultFound;
-
-        expectKeyword('switch');
-
-        expect('(');
-
-        discriminant = parseExpression();
-
-        expect(')');
-
-        expect('{');
-
-        cases = [];
-
-        if (match('}')) {
-            lex();
-            return delegate.createSwitchStatement(discriminant, cases);
-        }
-
-        oldInSwitch = state.inSwitch;
-        state.inSwitch = true;
-        defaultFound = false;
-
-        while (index < length) {
-            if (match('}')) {
-                break;
-            }
-            clause = parseSwitchCase();
-            if (clause.test === null) {
-                if (defaultFound) {
-                    throwError({}, Messages.MultipleDefaultsInSwitch);
-                }
-                defaultFound = true;
-            }
-            cases.push(clause);
-        }
-
-        state.inSwitch = oldInSwitch;
-
-        expect('}');
-
-        return delegate.createSwitchStatement(discriminant, cases);
-    }
-
-    // 12.13 The throw statement
-
-    function parseThrowStatement() {
-        var argument;
-
-        expectKeyword('throw');
-
-        if (peekLineTerminator()) {
-            throwError({}, Messages.NewlineAfterThrow);
-        }
-
-        argument = parseExpression();
-
-        consumeSemicolon();
-
-        return delegate.createThrowStatement(argument);
-    }
-
-    // 12.14 The try statement
-
-    function parseCatchClause() {
-        var param, body;
-
-        expectKeyword('catch');
-
-        expect('(');
-        if (match(')')) {
-            throwUnexpected(lookahead);
-        }
-
-        param = parseExpression();
-        // 12.14.1
-        if (strict && param.type === Syntax.Identifier && isRestrictedWord(param.name)) {
-            throwErrorTolerant({}, Messages.StrictCatchVariable);
-        }
-
-        expect(')');
-        body = parseBlock();
-        return delegate.createCatchClause(param, body);
-    }
-
-    function parseTryStatement() {
-        var block, handlers = [], finalizer = null;
-
-        expectKeyword('try');
-
-        block = parseBlock();
-
-        if (matchKeyword('catch')) {
-            handlers.push(parseCatchClause());
-        }
-
-        if (matchKeyword('finally')) {
-            lex();
-            finalizer = parseBlock();
-        }
-
-        if (handlers.length === 0 && !finalizer) {
-            throwError({}, Messages.NoCatchOrFinally);
-        }
-
-        return delegate.createTryStatement(block, [], handlers, finalizer);
-    }
-
-    // 12.15 The debugger statement
-
-    function parseDebuggerStatement() {
-        expectKeyword('debugger');
-
-        consumeSemicolon();
-
-        return delegate.createDebuggerStatement();
-    }
-
-    // 12 Statements
-
-    function parseStatement() {
-        var type = lookahead.type,
-            expr,
-            labeledBody,
-            key;
-
-        if (type === Token.EOF) {
-            throwUnexpected(lookahead);
-        }
-
-        if (type === Token.Punctuator) {
-            switch (lookahead.value) {
-            case ';':
-                return parseEmptyStatement();
-            case '{':
-                return parseBlock();
-            case '(':
-                return parseExpressionStatement();
-            default:
-                break;
-            }
-        }
-
-        if (type === Token.Keyword) {
-            switch (lookahead.value) {
-            case 'break':
-                return parseBreakStatement();
-            case 'continue':
-                return parseContinueStatement();
-            case 'debugger':
-                return parseDebuggerStatement();
-            case 'do':
-                return parseDoWhileStatement();
-            case 'for':
-                return parseForStatement();
-            case 'function':
-                return parseFunctionDeclaration();
-            case 'class':
-                return parseClassDeclaration();
-            case 'if':
-                return parseIfStatement();
-            case 'return':
-                return parseReturnStatement();
-            case 'switch':
-                return parseSwitchStatement();
-            case 'throw':
-                return parseThrowStatement();
-            case 'try':
-                return parseTryStatement();
-            case 'var':
-                return parseVariableStatement();
-            case 'while':
-                return parseWhileStatement();
-            case 'with':
-                return parseWithStatement();
-            default:
-                break;
-            }
-        }
-
-        expr = parseExpression();
-
-        // 12.12 Labelled Statements
-        if ((expr.type === Syntax.Identifier) && match(':')) {
-            lex();
-
-            key = '$' + expr.name;
-            if (Object.prototype.hasOwnProperty.call(state.labelSet, key)) {
-                throwError({}, Messages.Redeclaration, 'Label', expr.name);
-            }
-
-            state.labelSet[key] = true;
-            labeledBody = parseStatement();
-            delete state.labelSet[key];
-            return delegate.createLabeledStatement(expr, labeledBody);
-        }
-
-        consumeSemicolon();
-
-        return delegate.createExpressionStatement(expr);
-    }
-
-    // 13 Function Definition
-
-    function parseConciseBody() {
-        if (match('{')) {
-            return parseFunctionSourceElements();
-        }
-        return parseAssignmentExpression();
-    }
-
-    function parseFunctionSourceElements() {
-        var sourceElement, sourceElements = [], token, directive, firstRestricted,
-            oldLabelSet, oldInIteration, oldInSwitch, oldInFunctionBody, oldParenthesizedCount;
-
-        expect('{');
-
-        while (index < length) {
-            if (lookahead.type !== Token.StringLiteral) {
-                break;
-            }
-            token = lookahead;
-
-            sourceElement = parseSourceElement();
-            sourceElements.push(sourceElement);
-            if (sourceElement.expression.type !== Syntax.Literal) {
-                // this is not directive
-                break;
-            }
-            directive = source.slice(token.range[0] + 1, token.range[1] - 1);
-            if (directive === 'use strict') {
-                strict = true;
-                if (firstRestricted) {
-                    throwErrorTolerant(firstRestricted, Messages.StrictOctalLiteral);
-                }
-            } else {
-                if (!firstRestricted && token.octal) {
-                    firstRestricted = token;
-                }
-            }
-        }
-
-        oldLabelSet = state.labelSet;
-        oldInIteration = state.inIteration;
-        oldInSwitch = state.inSwitch;
-        oldInFunctionBody = state.inFunctionBody;
-        oldParenthesizedCount = state.parenthesizedCount;
-
-        state.labelSet = {};
-        state.inIteration = false;
-        state.inSwitch = false;
-        state.inFunctionBody = true;
-        state.parenthesizedCount = 0;
-
-        while (index < length) {
-            if (match('}')) {
-                break;
-            }
-            sourceElement = parseSourceElement();
-            if (typeof sourceElement === 'undefined') {
-                break;
-            }
-            sourceElements.push(sourceElement);
-        }
-
-        expect('}');
-
-        state.labelSet = oldLabelSet;
-        state.inIteration = oldInIteration;
-        state.inSwitch = oldInSwitch;
-        state.inFunctionBody = oldInFunctionBody;
-        state.parenthesizedCount = oldParenthesizedCount;
-
-        return delegate.createBlockStatement(sourceElements);
-    }
-
-    function validateParam(options, param, name) {
-        var key = '$' + name;
-        if (strict) {
-            if (isRestrictedWord(name)) {
-                options.stricted = param;
-                options.message = Messages.StrictParamName;
-            }
-            if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {
-                options.stricted = param;
-                options.message = Messages.StrictParamDupe;
-            }
-        } else if (!options.firstRestricted) {
-            if (isRestrictedWord(name)) {
-                options.firstRestricted = param;
-                options.message = Messages.StrictParamName;
-            } else if (isStrictModeReservedWord(name)) {
-                options.firstRestricted = param;
-                options.message = Messages.StrictReservedWord;
-            } else if (Object.prototype.hasOwnProperty.call(options.paramSet, key)) {
-                options.firstRestricted = param;
-                options.message = Messages.StrictParamDupe;
-            }
-        }
-        options.paramSet[key] = true;
-    }
-
-    function parseParam(options) {
-        var token, rest, param, def;
-
-        token = lookahead;
-        if (token.value === '...') {
-            token = lex();
-            rest = true;
-        }
-
-        if (match('[')) {
-            param = parseArrayInitialiser();
-            reinterpretAsDestructuredParameter(options, param);
-        } else if (match('{')) {
-            if (rest) {
-                throwError({}, Messages.ObjectPatternAsRestParameter);
-            }
-            param = parseObjectInitialiser();
-            reinterpretAsDestructuredParameter(options, param);
-        } else {
-            param = parseVariableIdentifier();
-            validateParam(options, token, token.value);
-            if (match('=')) {
-                if (rest) {
-                    throwErrorTolerant(lookahead, Messages.DefaultRestParameter);
-                }
-                lex();
-                def = parseAssignmentExpression();
-                ++options.defaultCount;
-            }
-        }
-
-        if (rest) {
-            if (!match(')')) {
-                throwError({}, Messages.ParameterAfterRestParameter);
-            }
-            options.rest = param;
-            return false;
-        }
-
-        options.params.push(param);
-        options.defaults.push(def);
-        return !match(')');
-    }
-
-    function parseParams(firstRestricted) {
-        var options;
-
-        options = {
-            params: [],
-            defaultCount: 0,
-            defaults: [],
-            rest: null,
-            firstRestricted: firstRestricted
-        };
-
-        expect('(');
-
-        if (!match(')')) {
-            options.paramSet = {};
-            while (index < length) {
-                if (!parseParam(options)) {
-                    break;
-                }
-                expect(',');
-            }
-        }
-
-        expect(')');
-
-        if (options.defaultCount === 0) {
-            options.defaults = [];
-        }
-
-        return options;
-    }
-
-    function parseFunctionDeclaration() {
-        var id, body, token, tmp, firstRestricted, message, previousStrict, previousYieldAllowed, generator, expression;
-
-        expectKeyword('function');
-
-        generator = false;
-        if (match('*')) {
-            lex();
-            generator = true;
-        }
-
-        token = lookahead;
-
-        if (state.allowDefault) {
-            id = matchKeyword('default') ? parseNonComputedProperty() : parseVariableIdentifier();
-        } else {
-            id = parseVariableIdentifier();
-        }
-        if (strict) {
-            if (isRestrictedWord(token.value)) {
-                throwErrorTolerant(token, Messages.StrictFunctionName);
-            }
-        } else {
-            if (isRestrictedWord(token.value)) {
-                firstRestricted = token;
-                message = Messages.StrictFunctionName;
-            } else if (isStrictModeReservedWord(token.value)) {
-                firstRestricted = token;
-                message = Messages.StrictReservedWord;
-            }
-        }
-
-        tmp = parseParams(firstRestricted);
-        firstRestricted = tmp.firstRestricted;
-        if (tmp.message) {
-            message = tmp.message;
-        }
-
-        previousStrict = strict;
-        previousYieldAllowed = state.yieldAllowed;
-        state.yieldAllowed = generator;
-
-        // here we redo some work in order to set 'expression'
-        expression = !match('{');
-        body = parseConciseBody();
-
-        if (strict && firstRestricted) {
-            throwError(firstRestricted, message);
-        }
-        if (strict && tmp.stricted) {
-            throwErrorTolerant(tmp.stricted, message);
-        }
-        if (state.yieldAllowed && !state.yieldFound) {
-            throwErrorTolerant({}, Messages.NoYieldInGenerator);
-        }
-        strict = previousStrict;
-        state.yieldAllowed = previousYieldAllowed;
-
-        return delegate.createFunctionDeclaration(id, tmp.params, tmp.defaults, body, tmp.rest, generator, expression);
-    }
-
-    function parseFunctionExpression() {
-        var token, id = null, firstRestricted, message, tmp, body, previousStrict, previousYieldAllowed, generator, expression;
-
-        expectKeyword('function');
-
-        generator = false;
-
-        if (match('*')) {
-            lex();
-            generator = true;
-        }
-
-        if (!match('(')) {
-            token = lookahead;
-            id = parseVariableIdentifier();
-            if (strict) {
-                if (isRestrictedWord(token.value)) {
-                    throwErrorTolerant(token, Messages.StrictFunctionName);
-                }
-            } else {
-                if (isRestrictedWord(token.value)) {
-                    firstRestricted = token;
-                    message = Messages.StrictFunctionName;
-                } else if (isStrictModeReservedWord(token.value)) {
-                    firstRestricted = token;
-                    message = Messages.StrictReservedWord;
-                }
-            }
-        }
-
-        tmp = parseParams(firstRestricted);
-        firstRestricted = tmp.firstRestricted;
-        if (tmp.message) {
-            message = tmp.message;
-        }
-
-        previousStrict = strict;
-        previousYieldAllowed = state.yieldAllowed;
-        state.yieldAllowed = generator;
-
-        // here we redo some work in order to set 'expression'
-        expression = !match('{');
-        body = parseConciseBody();
-
-        if (strict && firstRestricted) {
-            throwError(firstRestricted, message);
-        }
-        if (strict && tmp.stricted) {
-            throwErrorTolerant(tmp.stricted, message);
-        }
-        if (state.yieldAllowed && !state.yieldFound) {
-            throwErrorTolerant({}, Messages.NoYieldInGenerator);
-        }
-        strict = previousStrict;
-        state.yieldAllowed = previousYieldAllowed;
-
-        return delegate.createFunctionExpression(id, tmp.params, tmp.defaults, body, tmp.rest, generator, expression);
-    }
-
-    function parseYieldExpression() {
-        var delegateFlag, expr, previousYieldAllowed;
-
-        expectKeyword('yield');
-
-        if (!state.yieldAllowed) {
-            throwErrorTolerant({}, Messages.IllegalYield);
-        }
-
-        delegateFlag = false;
-        if (match('*')) {
-            lex();
-            delegateFlag = true;
-        }
-
-        // It is a Syntax Error if any AssignmentExpression Contains YieldExpression.
-        previousYieldAllowed = state.yieldAllowed;
-        state.yieldAllowed = false;
-        expr = parseAssignmentExpression();
-        state.yieldAllowed = previousYieldAllowed;
-        state.yieldFound = true;
-
-        return delegate.createYieldExpression(expr, delegateFlag);
-    }
-
-    // 14 Classes
-
-    function parseMethodDefinition(existingPropNames) {
-        var token, key, param, propType, isValidDuplicateProp = false;
-
-        if (lookahead.value === 'static') {
-            propType = ClassPropertyType.static;
-            lex();
-        } else {
-            propType = ClassPropertyType.prototype;
-        }
-
-        if (match('*')) {
-            lex();
-            return delegate.createMethodDefinition(
-                propType,
-                '',
-                parseObjectPropertyKey(),
-                parsePropertyMethodFunction({ generator: true })
-            );
-        }
-
-        token = lookahead;
-        key = parseObjectPropertyKey();
-
-        if (token.value === 'get' && !match('(')) {
-            key = parseObjectPropertyKey();
-
-            // It is a syntax error if any other properties have a name
-            // duplicating this one unless they are a setter
-            if (existingPropNames[propType].hasOwnProperty(key.name)) {
-                isValidDuplicateProp =
-                    // There isn't already a getter for this prop
-                    existingPropNames[propType][key.name].get === undefined
-                    // There isn't already a data prop by this name
-                    && existingPropNames[propType][key.name].data === undefined
-                    // The only existing prop by this name is a setter
-                    && existingPropNames[propType][key.name].set !== undefined;
-                if (!isValidDuplicateProp) {
-                    throwError(key, Messages.IllegalDuplicateClassProperty);
-                }
-            } else {
-                existingPropNames[propType][key.name] = {};
-            }
-            existingPropNames[propType][key.name].get = true;
-
-            expect('(');
-            expect(')');
-            return delegate.createMethodDefinition(
-                propType,
-                'get',
-                key,
-                parsePropertyFunction({ generator: false })
-            );
-        }
-        if (token.value === 'set' && !match('(')) {
-            key = parseObjectPropertyKey();
-
-            // It is a syntax error if any other properties have a name
-            // duplicating this one unless they are a getter
-            if (existingPropNames[propType].hasOwnProperty(key.name)) {
-                isValidDuplicateProp =
-                    // There isn't already a setter for this prop
-                    existingPropNames[propType][key.name].set === undefined
-                    // There isn't already a data prop by this name
-                    && existingPropNames[propType][key.name].data === undefined
-                    // The only existing prop by this name is a getter
-                    && existingPropNames[propType][key.name].get !== undefined;
-                if (!isValidDuplicateProp) {
-                    throwError(key, Messages.IllegalDuplicateClassProperty);
-                }
-            } else {
-                existingPropNames[propType][key.name] = {};
-            }
-            existingPropNames[propType][key.name].set = true;
-
-            expect('(');
-            token = lookahead;
-            param = [ parseVariableIdentifier() ];
-            expect(')');
-            return delegate.createMethodDefinition(
-                propType,
-                'set',
-                key,
-                parsePropertyFunction({ params: param, generator: false, name: token })
-            );
-        }
-
-        // It is a syntax error if any other properties have the same name as a
-        // non-getter, non-setter method
-        if (existingPropNames[propType].hasOwnProperty(key.name)) {
-            throwError(key, Messages.IllegalDuplicateClassProperty);
-        } else {
-            existingPropNames[propType][key.name] = {};
-        }
-        existingPropNames[propType][key.name].data = true;
-
-        return delegate.createMethodDefinition(
-            propType,
-            '',
-            key,
-            parsePropertyMethodFunction({ generator: false })
-        );
-    }
-
-    function parseClassElement(existingProps) {
-        if (match(';')) {
-            lex();
-            return;
-        }
-        return parseMethodDefinition(existingProps);
-    }
-
-    function parseClassBody() {
-        var classElement, classElements = [], existingProps = {};
-
-        existingProps[ClassPropertyType.static] = {};
-        existingProps[ClassPropertyType.prototype] = {};
-
-        expect('{');
-
-        while (index < length) {
-            if (match('}')) {
-                break;
-            }
-            classElement = parseClassElement(existingProps);
-
-            if (typeof classElement !== 'undefined') {
-                classElements.push(classElement);
-            }
-        }
-
-        expect('}');
-
-        return delegate.createClassBody(classElements);
-    }
-
-    function parseClassExpression() {
-        var id, previousYieldAllowed, superClass = null;
-
-        expectKeyword('class');
-
-        if (!matchKeyword('extends') && !match('{')) {
-            id = parseVariableIdentifier();
-        }
-
-        if (matchKeyword('extends')) {
-            expectKeyword('extends');
-            previousYieldAllowed = state.yieldAllowed;
-            state.yieldAllowed = false;
-            superClass = parseAssignmentExpression();
-            state.yieldAllowed = previousYieldAllowed;
-        }
-
-        return delegate.createClassExpression(id, superClass, parseClassBody());
-    }
-
-    function parseClassDeclaration() {
-        var id, previousYieldAllowed, superClass = null;
-
-        expectKeyword('class');
-
-        if (state.allowDefault) {
-            id = matchKeyword('default') ? parseNonComputedProperty() : parseVariableIdentifier();
-        } else {
-            id = parseVariableIdentifier();
-        }
-
-        if (matchKeyword('extends')) {
-            expectKeyword('extends');
-            previousYieldAllowed = state.yieldAllowed;
-            state.yieldAllowed = false;
-            superClass = parseAssignmentExpression();
-            state.yieldAllowed = previousYieldAllowed;
-        }
-
-        return delegate.createClassDeclaration(id, superClass, parseClassBody());
-    }
-
-    // 15 Program
-
-    function matchModuleDeclaration() {
-        var id;
-        if (matchContextualKeyword('module')) {
-            id = lookahead2();
-            return id.type === Token.StringLiteral || id.type === Token.Identifier;
-        }
-        return false;
-    }
-
-    function parseSourceElement() {
-        if (lookahead.type === Token.Keyword) {
-            switch (lookahead.value) {
-            case 'const':
-            case 'let':
-                return parseConstLetDeclaration(lookahead.value);
-            case 'function':
-                return parseFunctionDeclaration();
-            case 'export':
-                return parseExportDeclaration();
-            case 'import':
-                return parseImportDeclaration();
-            default:
-                return parseStatement();
-            }
-        }
-
-        if (matchModuleDeclaration()) {
-            throwError({}, Messages.NestedModule);
-        }
-
-        if (lookahead.type !== Token.EOF) {
-            return parseStatement();
-        }
-    }
-
-    function parseProgramElement() {
-        if (lookahead.type === Token.Keyword) {
-            switch (lookahead.value) {
-            case 'export':
-                return parseExportDeclaration();
-            case 'import':
-                return parseImportDeclaration();
-            }
-        }
-
-        if (matchModuleDeclaration()) {
-            return parseModuleDeclaration();
-        }
-
-        return parseSourceElement();
-    }
-
-    function parseProgramElements() {
-        var sourceElement, sourceElements = [], token, directive, firstRestricted;
-
-        while (index < length) {
-            token = lookahead;
-            if (token.type !== Token.StringLiteral) {
-                break;
-            }
-
-            sourceElement = parseProgramElement();
-            sourceElements.push(sourceElement);
-            if (sourceElement.expression.type !== Syntax.Literal) {
-                // this is not directive
-                break;
-            }
-            directive = source.slice(token.range[0] + 1, token.range[1] - 1);
-            if (directive === 'use strict') {
-                strict = true;
-                if (firstRestricted) {
-                    throwErrorTolerant(firstRestricted, Messages.StrictOctalLiteral);
-                }
-            } else {
-                if (!firstRestricted && token.octal) {
-                    firstRestricted = token;
-                }
-            }
-        }
-
-        while (index < length) {
-            sourceElement = parseProgramElement();
-            if (typeof sourceElement === 'undefined') {
-                break;
-            }
-            sourceElements.push(sourceElement);
-        }
-        return sourceElements;
-    }
-
-    function parseModuleElement() {
-        return parseSourceElement();
-    }
-
-    function parseModuleElements() {
-        var list = [],
-            statement;
-
-        while (index < length) {
-            if (match('}')) {
-                break;
-            }
-            statement = parseModuleElement();
-            if (typeof statement === 'undefined') {
-                break;
-            }
-            list.push(statement);
-        }
-
-        return list;
-    }
-
-    function parseModuleBlock() {
-        var block;
-
-        expect('{');
-
-        block = parseModuleElements();
-
-        expect('}');
-
-        return delegate.createBlockStatement(block);
-    }
-
-    function parseProgram() {
-        var body;
-        strict = false;
-        peek();
-        body = parseProgramElements();
-        return delegate.createProgram(body);
-    }
-
-    // The following functions are needed only when the option to preserve
-    // the comments is active.
-
-    function addComment(type, value, start, end, loc) {
-        assert(typeof start === 'number', 'Comment must have valid position');
-
-        // Because the way the actual token is scanned, often the comments
-        // (if any) are skipped twice during the lexical analysis.
-        // Thus, we need to skip adding a comment if the comment array already
-        // handled it.
-        if (extra.comments.length > 0) {
-            if (extra.comments[extra.comments.length - 1].range[1] > start) {
-                return;
-            }
-        }
-
-        extra.comments.push({
-            type: type,
-            value: value,
-            range: [start, end],
-            loc: loc
-        });
-    }
-
-    function scanComment() {
-        var comment, ch, loc, start, blockComment, lineComment;
-
-        comment = '';
-        blockComment = false;
-        lineComment = false;
-
-        while (index < length) {
-            ch = source[index];
-
-            if (lineComment) {
-                ch = source[index++];
-                if (isLineTerminator(ch.charCodeAt(0))) {
-                    loc.end = {
-                        line: lineNumber,
-                        column: index - lineStart - 1
-                    };
-                    lineComment = false;
-                    addComment('Line', comment, start, index - 1, loc);
-                    if (ch === '\r' && source[index] === '\n') {
-                        ++index;
-                    }
-                    ++lineNumber;
-                    lineStart = index;
-                    comment = '';
-                } else if (index >= length) {
-                    lineComment = false;
-                    comment += ch;
-                    loc.end = {
-                        line: lineNumber,
-                        column: length - lineStart
-                    };
-                    addComment('Line', comment, start, length, loc);
-                } else {
-                    comment += ch;
-                }
-            } else if (blockComment) {
-                if (isLineTerminator(ch.charCodeAt(0))) {
-                    if (ch === '\r' && source[index + 1] === '\n') {
-                        ++index;
-                        comment += '\r\n';
-                    } else {
-                        comment += ch;
-                    }
-                    ++lineNumber;
-                    ++index;
-                    lineStart = index;
-                    if (index >= length) {
-                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                    }
-                } else {
-                    ch = source[index++];
-                    if (index >= length) {
-                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                    }
-                    comment += ch;
-                    if (ch === '*') {
-                        ch = source[index];
-                        if (ch === '/') {
-                            comment = comment.substr(0, comment.length - 1);
-                            blockComment = false;
-                            ++index;
-                            loc.end = {
-                                line: lineNumber,
-                                column: index - lineStart
-                            };
-                            addComment('Block', comment, start, index, loc);
-                            comment = '';
-                        }
-                    }
-                }
-            } else if (ch === '/') {
-                ch = source[index + 1];
-                if (ch === '/') {
-                    loc = {
-                        start: {
-                            line: lineNumber,
-                            column: index - lineStart
-                        }
-                    };
-                    start = index;
-                    index += 2;
-                    lineComment = true;
-                    if (index >= length) {
-                        loc.end = {
-                            line: lineNumber,
-                            column: index - lineStart
-                        };
-                        lineComment = false;
-                        addComment('Line', comment, start, index, loc);
-                    }
-                } else if (ch === '*') {
-                    start = index;
-                    index += 2;
-                    blockComment = true;
-                    loc = {
-                        start: {
-                            line: lineNumber,
-                            column: index - lineStart - 2
-                        }
-                    };
-                    if (index >= length) {
-                        throwError({}, Messages.UnexpectedToken, 'ILLEGAL');
-                    }
-                } else {
-                    break;
-                }
-            } else if (isWhiteSpace(ch.charCodeAt(0))) {
-                ++index;
-            } else if (isLineTerminator(ch.charCodeAt(0))) {
-                ++index;
-                if (ch ===  '\r' && source[index] === '\n') {
-                    ++index;
-                }
-                ++lineNumber;
-                lineStart = index;
-            } else {
-                break;
-            }
-        }
-    }
-
-    function filterCommentLocation() {
-        var i, entry, comment, comments = [];
-
-        for (i = 0; i < extra.comments.length; ++i) {
-            entry = extra.comments[i];
-            comment = {
-                type: entry.type,
-                value: entry.value
-            };
-            if (extra.range) {
-                comment.range = entry.range;
-            }
-            if (extra.loc) {
-                comment.loc = entry.loc;
-            }
-            comments.push(comment);
-        }
-
-        extra.comments = comments;
-    }
-
-    function collectToken() {
-        var start, loc, token, range, value;
-
-        skipComment();
-        start = index;
-        loc = {
-            start: {
-                line: lineNumber,
-                column: index - lineStart
-            }
-        };
-
-        token = extra.advance();
-        loc.end = {
-            line: lineNumber,
-            column: index - lineStart
-        };
-
-        if (token.type !== Token.EOF) {
-            range = [token.range[0], token.range[1]];
-            value = source.slice(token.range[0], token.range[1]);
-            extra.tokens.push({
-                type: TokenName[token.type],
-                value: value,
-                range: range,
-                loc: loc
-            });
-        }
-
-        return token;
-    }
-
-    function collectRegex() {
-        var pos, loc, regex, token;
-
-        skipComment();
-
-        pos = index;
-        loc = {
-            start: {
-                line: lineNumber,
-                column: index - lineStart
-            }
-        };
-
-        regex = extra.scanRegExp();
-        loc.end = {
-            line: lineNumber,
-            column: index - lineStart
-        };
-
-        if (!extra.tokenize) {
-            // Pop the previous token, which is likely '/' or '/='
-            if (extra.tokens.length > 0) {
-                token = extra.tokens[extra.tokens.length - 1];
-                if (token.range[0] === pos && token.type === 'Punctuator') {
-                    if (token.value === '/' || token.value === '/=') {
-                        extra.tokens.pop();
-                    }
-                }
-            }
-
-            extra.tokens.push({
-                type: 'RegularExpression',
-                value: regex.literal,
-                range: [pos, index],
-                loc: loc
-            });
-        }
-
-        return regex;
-    }
-
-    function filterTokenLocation() {
-        var i, entry, token, tokens = [];
-
-        for (i = 0; i < extra.tokens.length; ++i) {
-            entry = extra.tokens[i];
-            token = {
-                type: entry.type,
-                value: entry.value
-            };
-            if (extra.range) {
-                token.range = entry.range;
-            }
-            if (extra.loc) {
-                token.loc = entry.loc;
-            }
-            tokens.push(token);
-        }
-
-        extra.tokens = tokens;
-    }
-
-    function LocationMarker() {
-        this.range = [index, index];
-        this.loc = {
-            start: {
-                line: lineNumber,
-                column: index - lineStart
-            },
-            end: {
-                line: lineNumber,
-                column: index - lineStart
-            }
-        };
-    }
-
-    LocationMarker.prototype = {
-        constructor: LocationMarker,
-
-        end: function () {
-            this.range[1] = index;
-            this.loc.end.line = lineNumber;
-            this.loc.end.column = index - lineStart;
-        },
-
-        applyGroup: function (node) {
-            if (extra.range) {
-                node.groupRange = [this.range[0], this.range[1]];
-            }
-            if (extra.loc) {
-                node.groupLoc = {
-                    start: {
-                        line: this.loc.start.line,
-                        column: this.loc.start.column
-                    },
-                    end: {
-                        line: this.loc.end.line,
-                        column: this.loc.end.column
-                    }
-                };
-                node = delegate.postProcess(node);
-            }
-        },
-
-        apply: function (node) {
-            var nodeType = typeof node;
-            assert(nodeType === "object",
-                "Applying location marker to an unexpected node type: " +
-                    nodeType);
-
-            if (extra.range) {
-                node.range = [this.range[0], this.range[1]];
-            }
-            if (extra.loc) {
-                node.loc = {
-                    start: {
-                        line: this.loc.start.line,
-                        column: this.loc.start.column
-                    },
-                    end: {
-                        line: this.loc.end.line,
-                        column: this.loc.end.column
-                    }
-                };
-                node = delegate.postProcess(node);
-            }
-        }
-    };
-
-    function createLocationMarker() {
-        return new LocationMarker();
-    }
-
-    function trackGroupExpression() {
-        var marker, expr;
-
-        skipComment();
-        marker = createLocationMarker();
-        expect('(');
-
-        ++state.parenthesizedCount;
-        expr = parseExpression();
-
-        expect(')');
-        marker.end();
-        marker.applyGroup(expr);
-
-        return expr;
-    }
-
-    function trackLeftHandSideExpression() {
-        var marker, expr;
-
-        skipComment();
-        marker = createLocationMarker();
-
-        expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
-
-        while (match('.') || match('[') || lookahead.type === Token.Template) {
-            if (match('[')) {
-                expr = delegate.createMemberExpression('[', expr, parseComputedMember());
-                marker.end();
-                marker.apply(expr);
-            } else if (match('.')) {
-                expr = delegate.createMemberExpression('.', expr, parseNonComputedMember());
-                marker.end();
-                marker.apply(expr);
-            } else {
-                expr = delegate.createTaggedTemplateExpression(expr, parseTemplateLiteral());
-                marker.end();
-                marker.apply(expr);
-            }
-        }
-
-        return expr;
-    }
-
-    function trackLeftHandSideExpressionAllowCall() {
-        var marker, expr, args;
-
-        skipComment();
-        marker = createLocationMarker();
-
-        expr = matchKeyword('new') ? parseNewExpression() : parsePrimaryExpression();
-
-        while (match('.') || match('[') || match('(') || lookahead.type === Token.Template) {
-            if (match('(')) {
-                args = parseArguments();
-                expr = delegate.createCallExpression(expr, args);
-                marker.end();
-                marker.apply(expr);
-            } else if (match('[')) {
-                expr = delegate.createMemberExpression('[', expr, parseComputedMember());
-                marker.end();
-                marker.apply(expr);
-            } else if (match('.')) {
-                expr = delegate.createMemberExpression('.', expr, parseNonComputedMember());
-                marker.end();
-                marker.apply(expr);
-            } else {
-                expr = delegate.createTaggedTemplateExpression(expr, parseTemplateLiteral());
-                marker.end();
-                marker.apply(expr);
-            }
-        }
-
-        return expr;
-    }
-
-    function filterGroup(node) {
-        var n, i, entry;
-
-        n = (Object.prototype.toString.apply(node) === '[object Array]') ? [] : {};
-        for (i in node) {
-            if (node.hasOwnProperty(i) && i !== 'groupRange' && i !== 'groupLoc') {
-                entry = node[i];
-                if (entry === null || typeof entry !== 'object' || entry instanceof RegExp) {
-                    n[i] = entry;
-                } else {
-                    n[i] = filterGroup(entry);
-                }
-            }
-        }
-        return n;
-    }
-
-    function wrapTrackingFunction(range, loc) {
-
-        return function (parseFunction) {
-
-            function isBinary(node) {
-                return node.type === Syntax.LogicalExpression ||
-                    node.type === Syntax.BinaryExpression;
-            }
-
-            function visit(node) {
-                var start, end;
-
-                if (isBinary(node.left)) {
-                    visit(node.left);
-                }
-                if (isBinary(node.right)) {
-                    visit(node.right);
-                }
-
-                if (range) {
-                    if (node.left.groupRange || node.right.groupRange) {
-                        start = node.left.groupRange ? node.left.groupRange[0] : node.left.range[0];
-                        end = node.right.groupRange ? node.right.groupRange[1] : node.right.range[1];
-                        node.range = [start, end];
-                    } else if (typeof node.range === 'undefined') {
-                        start = node.left.range[0];
-                        end = node.right.range[1];
-                        node.range = [start, end];
-                    }
-                }
-                if (loc) {
-                    if (node.left.groupLoc || node.right.groupLoc) {
-                        start = node.left.groupLoc ? node.left.groupLoc.start : node.left.loc.start;
-                        end = node.right.groupLoc ? node.right.groupLoc.end : node.right.loc.end;
-                        node.loc = {
-                            start: start,
-                            end: end
-                        };
-                        node = delegate.postProcess(node);
-                    } else if (typeof node.loc === 'undefined') {
-                        node.loc = {
-                            start: node.left.loc.start,
-                            end: node.right.loc.end
-                        };
-                        node = delegate.postProcess(node);
-                    }
-                }
-            }
-
-            return function () {
-                var marker, node;
-
-                skipComment();
-
-                marker = createLocationMarker();
-                node = parseFunction.apply(null, arguments);
-                marker.end();
-
-                if (range && typeof node.range === 'undefined') {
-                    marker.apply(node);
-                }
-
-                if (loc && typeof node.loc === 'undefined') {
-                    marker.apply(node);
-                }
-
-                if (isBinary(node)) {
-                    visit(node);
-                }
-
-                return node;
-            };
-        };
-    }
-
-    function patch() {
-
-        var wrapTracking;
-
-        if (extra.comments) {
-            extra.skipComment = skipComment;
-            skipComment = scanComment;
-        }
-
-        if (extra.range || extra.loc) {
-
-            extra.parseGroupExpression = parseGroupExpression;
-            extra.parseLeftHandSideExpression = parseLeftHandSideExpression;
-            extra.parseLeftHandSideExpressionAllowCall = parseLeftHandSideExpressionAllowCall;
-            parseGroupExpression = trackGroupExpression;
-            parseLeftHandSideExpression = trackLeftHandSideExpression;
-            parseLeftHandSideExpressionAllowCall = trackLeftHandSideExpressionAllowCall;
-
-            wrapTracking = wrapTrackingFunction(extra.range, extra.loc);
-
-            extra.parseAssignmentExpression = parseAssignmentExpression;
-            extra.parseBinaryExpression = parseBinaryExpression;
-            extra.parseBlock = parseBlock;
-            extra.parseFunctionSourceElements = parseFunctionSourceElements;
-            extra.parseCatchClause = parseCatchClause;
-            extra.parseComputedMember = parseComputedMember;
-            extra.parseConditionalExpression = parseConditionalExpression;
-            extra.parseConstLetDeclaration = parseConstLetDeclaration;
-            extra.parseExportBatchSpecifier = parseExportBatchSpecifier;
-            extra.parseExportDeclaration = parseExportDeclaration;
-            extra.parseExportSpecifier = parseExportSpecifier;
-            extra.parseExpression = parseExpression;
-            extra.parseForVariableDeclaration = parseForVariableDeclaration;
-            extra.parseFunctionDeclaration = parseFunctionDeclaration;
-            extra.parseFunctionExpression = parseFunctionExpression;
-            extra.parseParams = parseParams;
-            extra.parseImportDeclaration = parseImportDeclaration;
-            extra.parseImportSpecifier = parseImportSpecifier;
-            extra.parseModuleDeclaration = parseModuleDeclaration;
-            extra.parseModuleBlock = parseModuleBlock;
-            extra.parseNewExpression = parseNewExpression;
-            extra.parseNonComputedProperty = parseNonComputedProperty;
-            extra.parseObjectProperty = parseObjectProperty;
-            extra.parseObjectPropertyKey = parseObjectPropertyKey;
-            extra.parsePostfixExpression = parsePostfixExpression;
-            extra.parsePrimaryExpression = parsePrimaryExpression;
-            extra.parseProgram = parseProgram;
-            extra.parsePropertyFunction = parsePropertyFunction;
-            extra.parseSpreadOrAssignmentExpression = parseSpreadOrAssignmentExpression;
-            extra.parseTemplateElement = parseTemplateElement;
-            extra.parseTemplateLiteral = parseTemplateLiteral;
-            extra.parseStatement = parseStatement;
-            extra.parseSwitchCase = parseSwitchCase;
-            extra.parseUnaryExpression = parseUnaryExpression;
-            extra.parseVariableDeclaration = parseVariableDeclaration;
-            extra.parseVariableIdentifier = parseVariableIdentifier;
-            extra.parseMethodDefinition = parseMethodDefinition;
-            extra.parseClassDeclaration = parseClassDeclaration;
-            extra.parseClassExpression = parseClassExpression;
-            extra.parseClassBody = parseClassBody;
-
-            parseAssignmentExpression = wrapTracking(extra.parseAssignmentExpression);
-            parseBinaryExpression = wrapTracking(extra.parseBinaryExpression);
-            parseBlock = wrapTracking(extra.parseBlock);
-            parseFunctionSourceElements = wrapTracking(extra.parseFunctionSourceElements);
-            parseCatchClause = wrapTracking(extra.parseCatchClause);
-            parseComputedMember = wrapTracking(extra.parseComputedMember);
-            parseConditionalExpression = wrapTracking(extra.parseConditionalExpression);
-            parseConstLetDeclaration = wrapTracking(extra.parseConstLetDeclaration);
-            parseExportBatchSpecifier = wrapTracking(parseExportBatchSpecifier);
-            parseExportDeclaration = wrapTracking(parseExportDeclaration);
-            parseExportSpecifier = wrapTracking(parseExportSpecifier);
-            parseExpression = wrapTracking(extra.parseExpression);
-            parseForVariableDeclaration = wrapTracking(extra.parseForVariableDeclaration);
-            parseFunctionDeclaration = wrapTracking(extra.parseFunctionDeclaration);
-            parseFunctionExpression = wrapTracking(extra.parseFunctionExpression);
-            parseParams = wrapTracking(extra.parseParams);
-            parseImportDeclaration = wrapTracking(extra.parseImportDeclaration);
-            parseImportSpecifier = wrapTracking(extra.parseImportSpecifier);
-            parseModuleDeclaration = wrapTracking(extra.parseModuleDeclaration);
-            parseModuleBlock = wrapTracking(extra.parseModuleBlock);
-            parseLeftHandSideExpression = wrapTracking(parseLeftHandSideExpression);
-            parseNewExpression = wrapTracking(extra.parseNewExpression);
-            parseNonComputedProperty = wrapTracking(extra.parseNonComputedProperty);
-            parseObjectProperty = wrapTracking(extra.parseObjectProperty);
-            parseObjectPropertyKey = wrapTracking(extra.parseObjectPropertyKey);
-            parsePostfixExpression = wrapTracking(extra.parsePostfixExpression);
-            parsePrimaryExpression = wrapTracking(extra.parsePrimaryExpression);
-            parseProgram = wrapTracking(extra.parseProgram);
-            parsePropertyFunction = wrapTracking(extra.parsePropertyFunction);
-            parseTemplateElement = wrapTracking(extra.parseTemplateElement);
-            parseTemplateLiteral = wrapTracking(extra.parseTemplateLiteral);
-            parseSpreadOrAssignmentExpression = wrapTracking(extra.parseSpreadOrAssignmentExpression);
-            parseStatement = wrapTracking(extra.parseStatement);
-            parseSwitchCase = wrapTracking(extra.parseSwitchCase);
-            parseUnaryExpression = wrapTracking(extra.parseUnaryExpression);
-            parseVariableDeclaration = wrapTracking(extra.parseVariableDeclaration);
-            parseVariableIdentifier = wrapTracking(extra.parseVariableIdentifier);
-            parseMethodDefinition = wrapTracking(extra.parseMethodDefinition);
-            parseClassDeclaration = wrapTracking(extra.parseClassDeclaration);
-            parseClassExpression = wrapTracking(extra.parseClassExpression);
-            parseClassBody = wrapTracking(extra.parseClassBody);
-        }
-
-        if (typeof extra.tokens !== 'undefined') {
-            extra.advance = advance;
-            extra.scanRegExp = scanRegExp;
-
-            advance = collectToken;
-            scanRegExp = collectRegex;
-        }
-    }
-
-    function unpatch() {
-        if (typeof extra.skipComment === 'function') {
-            skipComment = extra.skipComment;
-        }
-
-        if (extra.range || extra.loc) {
-            parseAssignmentExpression = extra.parseAssignmentExpression;
-            parseBinaryExpression = extra.parseBinaryExpression;
-            parseBlock = extra.parseBlock;
-            parseFunctionSourceElements = extra.parseFunctionSourceElements;
-            parseCatchClause = extra.parseCatchClause;
-            parseComputedMember = extra.parseComputedMember;
-            parseConditionalExpression = extra.parseConditionalExpression;
-            parseConstLetDeclaration = extra.parseConstLetDeclaration;
-            parseExportBatchSpecifier = extra.parseExportBatchSpecifier;
-            parseExportDeclaration = extra.parseExportDeclaration;
-            parseExportSpecifier = extra.parseExportSpecifier;
-            parseExpression = extra.parseExpression;
-            parseForVariableDeclaration = extra.parseForVariableDeclaration;
-            parseFunctionDeclaration = extra.parseFunctionDeclaration;
-            parseFunctionExpression = extra.parseFunctionExpression;
-            parseImportDeclaration = extra.parseImportDeclaration;
-            parseImportSpecifier = extra.parseImportSpecifier;
-            parseGroupExpression = extra.parseGroupExpression;
-            parseLeftHandSideExpression = extra.parseLeftHandSideExpression;
-            parseLeftHandSideExpressionAllowCall = extra.parseLeftHandSideExpressionAllowCall;
-            parseModuleDeclaration = extra.parseModuleDeclaration;
-            parseModuleBlock = extra.parseModuleBlock;
-            parseNewExpression = extra.parseNewExpression;
-            parseNonComputedProperty = extra.parseNonComputedProperty;
-            parseObjectProperty = extra.parseObjectProperty;
-            parseObjectPropertyKey = extra.parseObjectPropertyKey;
-            parsePostfixExpression = extra.parsePostfixExpression;
-            parsePrimaryExpression = extra.parsePrimaryExpression;
-            parseProgram = extra.parseProgram;
-            parsePropertyFunction = extra.parsePropertyFunction;
-            parseTemplateElement = extra.parseTemplateElement;
-            parseTemplateLiteral = extra.parseTemplateLiteral;
-            parseSpreadOrAssignmentExpression = extra.parseSpreadOrAssignmentExpression;
-            parseStatement = extra.parseStatement;
-            parseSwitchCase = extra.parseSwitchCase;
-            parseUnaryExpression = extra.parseUnaryExpression;
-            parseVariableDeclaration = extra.parseVariableDeclaration;
-            parseVariableIdentifier = extra.parseVariableIdentifier;
-            parseMethodDefinition = extra.parseMethodDefinition;
-            parseClassDeclaration = extra.parseClassDeclaration;
-            parseClassExpression = extra.parseClassExpression;
-            parseClassBody = extra.parseClassBody;
-        }
-
-        if (typeof extra.scanRegExp === 'function') {
-            advance = extra.advance;
-            scanRegExp = extra.scanRegExp;
-        }
-    }
-
-    // This is used to modify the delegate.
-
-    function extend(object, properties) {
-        var entry, result = {};
-
-        for (entry in object) {
-            if (object.hasOwnProperty(entry)) {
-                result[entry] = object[entry];
-            }
-        }
-
-        for (entry in properties) {
-            if (properties.hasOwnProperty(entry)) {
-                result[entry] = properties[entry];
-            }
-        }
-
-        return result;
-    }
-
-    function tokenize(code, options) {
-        var toString,
-            token,
-            tokens;
-
-        toString = String;
-        if (typeof code !== 'string' && !(code instanceof String)) {
-            code = toString(code);
-        }
-
-        delegate = SyntaxTreeDelegate;
-        source = code;
-        index = 0;
-        lineNumber = (source.length > 0) ? 1 : 0;
-        lineStart = 0;
-        length = source.length;
-        lookahead = null;
-        state = {
-            allowDefault: true,
-            allowIn: true,
-            labelSet: {},
-            inFunctionBody: false,
-            inIteration: false,
-            inSwitch: false
-        };
-
-        extra = {};
-
-        // Options matching.
-        options = options || {};
-
-        // Of course we collect tokens here.
-        options.tokens = true;
-        extra.tokens = [];
-        extra.tokenize = true;
-        // The following two fields are necessary to compute the Regex tokens.
-        extra.openParenToken = -1;
-        extra.openCurlyToken = -1;
-
-        extra.range = (typeof options.range === 'boolean') && options.range;
-        extra.loc = (typeof options.loc === 'boolean') && options.loc;
-
-        if (typeof options.comment === 'boolean' && options.comment) {
-            extra.comments = [];
-        }
-        if (typeof options.tolerant === 'boolean' && options.tolerant) {
-            extra.errors = [];
-        }
-
-        if (length > 0) {
-            if (typeof source[0] === 'undefined') {
-                // Try first to convert to a string. This is good as fast path
-                // for old IE which understands string indexing for string
-                // literals only and not for string object.
-                if (code instanceof String) {
-                    source = code.valueOf();
-                }
-            }
-        }
-
-        patch();
-
-        try {
-            peek();
-            if (lookahead.type === Token.EOF) {
-                return extra.tokens;
-            }
-
-            token = lex();
-            while (lookahead.type !== Token.EOF) {
-                try {
-                    token = lex();
-                } catch (lexError) {
-                    token = lookahead;
-                    if (extra.errors) {
-                        extra.errors.push(lexError);
-                        // We have to break on the first error
-                        // to avoid infinite loops.
-                        break;
-                    } else {
-                        throw lexError;
-                    }
-                }
-            }
-
-            filterTokenLocation();
-            tokens = extra.tokens;
-            if (typeof extra.comments !== 'undefined') {
-                filterCommentLocation();
-                tokens.comments = extra.comments;
-            }
-            if (typeof extra.errors !== 'undefined') {
-                tokens.errors = extra.errors;
-            }
-        } catch (e) {
-            throw e;
-        } finally {
-            unpatch();
-            extra = {};
-        }
-        return tokens;
-    }
-
-    function parse(code, options) {
-        var program, toString;
-
-        toString = String;
-        if (typeof code !== 'string' && !(code instanceof String)) {
-            code = toString(code);
-        }
-
-        delegate = SyntaxTreeDelegate;
-        source = code;
-        index = 0;
-        lineNumber = (source.length > 0) ? 1 : 0;
-        lineStart = 0;
-        length = source.length;
-        lookahead = null;
-        state = {
-            allowDefault: false,
-            allowIn: true,
-            labelSet: {},
-            parenthesizedCount: 0,
-            inFunctionBody: false,
-            inIteration: false,
-            inSwitch: false,
-            yieldAllowed: false,
-            yieldFound: false
-        };
-
-        extra = {};
-        if (typeof options !== 'undefined') {
-            extra.range = (typeof options.range === 'boolean') && options.range;
-            extra.loc = (typeof options.loc === 'boolean') && options.loc;
-
-            if (extra.loc && options.source !== null && options.source !== undefined) {
-                delegate = extend(delegate, {
-                    'postProcess': function (node) {
-                        node.loc.source = toString(options.source);
-                        return node;
-                    }
-                });
-            }
-
-            if (typeof options.tokens === 'boolean' && options.tokens) {
-                extra.tokens = [];
-            }
-            if (typeof options.comment === 'boolean' && options.comment) {
-                extra.comments = [];
-            }
-            if (typeof options.tolerant === 'boolean' && options.tolerant) {
-                extra.errors = [];
-            }
-        }
-
-        if (length > 0) {
-            if (typeof source[0] === 'undefined') {
-                // Try first to convert to a string. This is good as fast path
-                // for old IE which understands string indexing for string
-                // literals only and not for string object.
-                if (code instanceof String) {
-                    source = code.valueOf();
-                }
-            }
-        }
-
-        patch();
-        try {
-            program = parseProgram();
-            if (typeof extra.comments !== 'undefined') {
-                filterCommentLocation();
-                program.comments = extra.comments;
-            }
-            if (typeof extra.tokens !== 'undefined') {
-                filterTokenLocation();
-                program.tokens = extra.tokens;
-            }
-            if (typeof extra.errors !== 'undefined') {
-                program.errors = extra.errors;
-            }
-            if (extra.range || extra.loc) {
-                program.body = filterGroup(program.body);
-            }
-        } catch (e) {
-            throw e;
-        } finally {
-            unpatch();
-            extra = {};
-        }
-
-        return program;
-    }
-
-    // Sync with package.json and component.json.
-    exports.version = '1.1.0-dev-harmony';
-
-    exports.tokenize = tokenize;
-
-    exports.parse = parse;
-
-    // Deep copy.
-    exports.Syntax = (function () {
-        var name, types = {};
-
-        if (typeof Object.create === 'function') {
-            types = Object.create(null);
-        }
-
-        for (name in Syntax) {
-            if (Syntax.hasOwnProperty(name)) {
-                types[name] = Syntax[name];
-            }
-        }
-
-        if (typeof Object.freeze === 'function') {
-            Object.freeze(types);
-        }
-
-        return types;
-    }());
-
-}));
-/* vim: set sw=4 ts=4 et tw=80 : */
-
-},{}],2:[function(require,module,exports){
-"use strict";
-var $__getDescriptors = function(object) {
-  var descriptors = {}, name, names = Object.getOwnPropertyNames(object);
-  for (var i = 0; i < names.length; i++) {
-    var name = names[i];
-    descriptors[name] = Object.getOwnPropertyDescriptor(object, name);
-  }
-  return descriptors;
-}, $__createClassNoExtends = function(object, staticObject) {
-  var ctor = object.constructor;
-  Object.defineProperty(object, 'constructor', {enumerable: false});
-  ctor.prototype = object;
-  Object.defineProperties(ctor, $__getDescriptors(staticObject));
-  return ctor;
-};
-var CompileError = require("./compile_error");
-var __dependency1__ = require("./utils");
-var isEmpty = __dependency1__.isEmpty;
-var array = __dependency1__.array;
-var forEach = __dependency1__.forEach;
-var AbstractCompiler = function() {
-  'use strict';
-  var $AbstractCompiler = ($__createClassNoExtends)({
-    constructor: function(compiler, options) {
-      this.compiler = compiler;
-      this.exports = compiler.exports;
-      this.exportDefault = compiler.exportDefault;
-      this.imports = compiler.imports;
-      this.directives = compiler.directives;
-      this.moduleName = compiler.moduleName;
-      this.lines = compiler.lines;
-      this.string = compiler.string;
-      this.options = options;
-      var allDependencies = this.imports.concat(this.exports.filter(function(export_) {
-        return export_.source !== null;
-      }));
-      this.dependencyNames = array.uniq(allDependencies.map(function(dep) {
-        return dep.source.value;
-      }));
-    },
-    buildImports: function() {
-      var imports = this.imports, moduleImports = this.moduleImports, source = this.source;
-      for (var idx = 0; idx < imports.length; idx++) {
-        var import_ = imports[idx], replacement = "";
-        var dependencyName = import_.source.value;
-        if (import_.type === "ModuleDeclaration" && import_.source.type === "Literal") {
-          replacement = this.doModuleImport(import_.id.name, dependencyName, idx);
-        } else if (import_.type === "ImportDeclaration") {
-          if (import_.kind === "default") {
-            var specifier = import_.specifiers[0];
-            replacement = this.doDefaultImport(specifier.id.name, dependencyName, idx);
-          } else if (import_.kind === "named") {
-            replacement = this.doImportSpecifiers(import_, idx);
-          } else if (import_.kind === undefined) {
-            replacement = this.doBareImport(import_.source.value);
-          }
-        }
-        source.replace(import_.range[0], import_.range[1], replacement);
-      }
-    },
-    buildExports: function() {
-      var source = this.source, exports_ = this.exports;
-      {
-        var $__2 = traceur.runtime.getIterator(exports_);
-        try {
-          while (true) {
-            var export_ = $__2.next();
-            {
-              var replacement = "";
-              if (export_.default) {
-                var identifier = export_.declaration.name || null;
-                source.replace(export_.range[0], export_.declaration.range[0] - 1, this.doDefaultExport(identifier));
-              } else if (export_.specifiers) {
-                var reexport;
-                if (export_.source) {
-                  reexport = export_.source.value;
-                }
-                {
-                  var $__1 = traceur.runtime.getIterator(export_.specifiers);
-                  try {
-                    while (true) {
-                      var specifier = $__1.next();
-                      {
-                        replacement += this.doExportSpecifier(specifier.id.name, reexport);
-                      }
-                    }
-                  } catch (e) {
-                    if (!traceur.runtime.isStopIteration(e)) throw e;
-                  }
-                }
-                source.replace(export_.range[0], export_.range[1], replacement);
-              } else if (export_.declaration) {
-                if (export_.declaration.type === "VariableDeclaration") {
-                  var name = export_.declaration.declarations[0].id.name;
-                  source.replace(export_.range[0], export_.declaration.range[0] - 1, "");
-                  replacement = this.doExportDeclaration(name);
-                  source.replace(export_.range[1], export_.range[1], replacement);
-                } else if (export_.declaration.type === "FunctionDeclaration") {
-                  var name = export_.declaration.id.name;
-                  source.replace(export_.range[0], export_.declaration.range[0] - 1, "");
-                  replacement = this.doExportDeclaration(name);
-                  source.replace(export_.range[1] + 1, export_.range[1] + 1, replacement);
-                } else if (export_.declaration.type === "Identifier") {
-                  var name = export_.declaration.name;
-                  replacement = this.doExportDeclaration(name);
-                  source.replace(export_.range[0], export_.range[1] - 1, replacement);
-                }
-              }
-            }
-          }
-        } catch (e) {
-          if (!traceur.runtime.isStopIteration(e)) throw e;
-        }
-      }
-    },
-    indentLines: function() {
-      var indent = arguments[0] !== (void 0) ? arguments[0]: "  ";
-      var innerLines = this.source.toString().split("\n");
-      var inner = innerLines.reduce(function(acc, item) {
-        if (item === "") return acc + "\n";
-        return acc + indent + item + "\n";
-      }, "");
-      return inner.replace(/\s+$/, "");
-    }
-  }, {});
-  return $AbstractCompiler;
-}();
-module.exports = AbstractCompiler;
-
-
-},{"./compile_error":5,"./utils":11}],3:[function(require,module,exports){
-"use strict";
-var $__superDescriptor = function(proto, name) {
-  if (!proto) throw new TypeError('super is null');
-  return Object.getPropertyDescriptor(proto, name);
-}, $__superCall = function(self, proto, name, args) {
-  var descriptor = $__superDescriptor(proto, name);
-  if (descriptor) {
-    if ('value'in descriptor) return descriptor.value.apply(self, args);
-    if (descriptor.get) return descriptor.get.call(self).apply(self, args);
-  }
-  throw new TypeError("Object has no method '" + name + "'.");
-}, $__getProtoParent = function(superClass) {
-  if (typeof superClass === 'function') {
-    var prototype = superClass.prototype;
-    if (Object(prototype) === prototype || prototype === null) return superClass.prototype;
-  }
-  if (superClass === null) return null;
-  throw new TypeError();
-}, $__getDescriptors = function(object) {
-  var descriptors = {}, name, names = Object.getOwnPropertyNames(object);
-  for (var i = 0; i < names.length; i++) {
-    var name = names[i];
-    descriptors[name] = Object.getOwnPropertyDescriptor(object, name);
-  }
-  return descriptors;
-}, $__createClass = function(object, staticObject, protoParent, superClass, hasConstructor) {
-  var ctor = object.constructor;
-  if (typeof superClass === 'function') ctor.__proto__ = superClass;
-  if (!hasConstructor && protoParent === null) ctor = object.constructor = function() {};
-  var descriptors = $__getDescriptors(object);
-  descriptors.constructor.enumerable = false;
-  ctor.prototype = Object.create(protoParent, descriptors);
-  Object.defineProperties(ctor, $__getDescriptors(staticObject));
-  return ctor;
-};
-var AbstractCompiler = require("./abstract_compiler");
-var SourceModifier = require("./source_modifier");
-var AMDCompiler = function($__super) {
-  'use strict';
-  var $__proto = $__getProtoParent($__super);
-  var $AMDCompiler = ($__createClass)({
-    constructor: function() {
-      $__superCall(this, $__proto, "constructor", arguments);
-    },
-    stringify: function() {
-      var string = this.string.toString();
-      this.source = new SourceModifier(string);
-      this.map = [];
-      var out = this.buildPreamble(this.exports.length > 0);
-      this.buildImports();
-      this.buildExports();
-      out += this.indentLines("    ");
-      out += "\n  });";
-      return out;
-    },
-    buildPreamble: function(hasExports) {
-      var out = "", dependencyNames = this.dependencyNames;
-      if (hasExports) dependencyNames.push("exports");
-      out += "define(";
-      if (this.moduleName) out += ("\"" + this.moduleName + "\", ");
-      out += "\n  [";
-      var idx;
-      for (idx = 0; idx < dependencyNames.length; idx++) {
-        var name = dependencyNames[idx];
-        out += ("\"" + name + "\"");
-        if (!(idx === dependencyNames.length - 1)) out += ",";
-      }
-      out += "],\n  function(";
-      for (idx = 0; idx < dependencyNames.length; idx++) {
-        if (dependencyNames[idx] === "exports") {
-          out += "__exports__";
-        } else {
-          out += ("__dependency" + (idx + 1) + "__");
-          this.map[dependencyNames[idx]] = idx + 1;
-        }
-        if (!(idx === dependencyNames.length - 1)) out += ", ";
-      }
-      out += ") {\n";
-      out += '    "use strict";\n';
-      return out;
-    },
-    doModuleImport: function(name, dependencyName, idx) {
-      return ("var " + name + " = __dependency" + this.map[dependencyName] + "__;\n");
-    },
-    doBareImport: function(name) {
-      return "";
-    },
-    doDefaultImport: function(name, dependencyName, idx) {
-      if (this.options.compatFix === true) {
-        return ("var " + name + " = __dependency" + this.map[dependencyName] + "__[\"default\"] || __dependency" + this.map[dependencyName] + "__;\n");
-      } else {
-        return ("var " + name + " = __dependency" + this.map[dependencyName] + "__[\"default\"];\n");
-      }
-    },
-    doNamedImport: function(name, dependencyName, alias) {
-      return ("var " + alias + " = __dependency" + this.map[dependencyName] + "__." + name + ";\n");
-    },
-    doExportSpecifier: function(name, reexport) {
-      if (reexport) {
-        return ("__exports__." + name + " = __dependency" + this.map[reexport] + "__." + name + ";\n");
-      }
-      return ("__exports__." + name + " = " + name + ";\n");
-    },
-    doExportDeclaration: function(name) {
-      return ("\n__exports__." + name + " = " + name + ";");
-    },
-    doDefaultExport: function() {
-      return "__exports__[\"default\"] = ";
-    },
-    doImportSpecifiers: function(import_, idx) {
-      var dependencyName = import_.source.value;
-      var replacement = "";
-      {
-        var $__1 = traceur.runtime.getIterator(import_.specifiers);
-        try {
-          while (true) {
-            var specifier = $__1.next();
-            {
-              var alias = specifier.name ? specifier.name.name: specifier.id.name;
-              replacement += this.doNamedImport(specifier.id.name, dependencyName, alias);
-            }
-          }
-        } catch (e) {
-          if (!traceur.runtime.isStopIteration(e)) throw e;
-        }
-      }
-      return replacement;
-    }
-  }, {}, $__proto, $__super, false);
-  return $AMDCompiler;
-}(AbstractCompiler);
-module.exports = AMDCompiler;
-
-
-},{"./abstract_compiler":2,"./source_modifier":10}],4:[function(require,module,exports){
-"use strict";
-var $__superDescriptor = function(proto, name) {
-  if (!proto) throw new TypeError('super is null');
-  return Object.getPropertyDescriptor(proto, name);
-}, $__superCall = function(self, proto, name, args) {
-  var descriptor = $__superDescriptor(proto, name);
-  if (descriptor) {
-    if ('value'in descriptor) return descriptor.value.apply(self, args);
-    if (descriptor.get) return descriptor.get.call(self).apply(self, args);
-  }
-  throw new TypeError("Object has no method '" + name + "'.");
-}, $__getProtoParent = function(superClass) {
-  if (typeof superClass === 'function') {
-    var prototype = superClass.prototype;
-    if (Object(prototype) === prototype || prototype === null) return superClass.prototype;
-  }
-  if (superClass === null) return null;
-  throw new TypeError();
-}, $__getDescriptors = function(object) {
-  var descriptors = {}, name, names = Object.getOwnPropertyNames(object);
-  for (var i = 0; i < names.length; i++) {
-    var name = names[i];
-    descriptors[name] = Object.getOwnPropertyDescriptor(object, name);
-  }
-  return descriptors;
-}, $__createClass = function(object, staticObject, protoParent, superClass, hasConstructor) {
-  var ctor = object.constructor;
-  if (typeof superClass === 'function') ctor.__proto__ = superClass;
-  if (!hasConstructor && protoParent === null) ctor = object.constructor = function() {};
-  var descriptors = $__getDescriptors(object);
-  descriptors.constructor.enumerable = false;
-  ctor.prototype = Object.create(protoParent, descriptors);
-  Object.defineProperties(ctor, $__getDescriptors(staticObject));
-  return ctor;
-};
-var AbstractCompiler = require("./abstract_compiler");
-var SourceModifier = require("./source_modifier");
-var string = require("./utils").string;
-var SAFE_WARN_NAME = "__es6_transpiler_warn__";
-var SAFE_WARN_SOURCE = string.ltrim(string.unindent(("\n  function " + SAFE_WARN_NAME + "(warning) {\n    if (typeof console === 'undefined') {\n    } else if (typeof console.warn === \"function\") {\n      console.warn(warning);\n    } else if (typeof console.log === \"function\") {\n      console.log(warning);\n    }\n  }")));
-var MODULE_OBJECT_BUILDER_NAME = "__es6_transpiler_build_module_object__";
-var MODULE_OBJECT_BUILDER_SOURCE = string.ltrim(string.unindent(("\n  function " + MODULE_OBJECT_BUILDER_NAME + "(name, imported) {\n    var moduleInstanceObject = Object.create ? Object.create(null) : {};\n    if (typeof imported === \"function\") {\n      " + SAFE_WARN_NAME + "(\"imported module '\"+name+\"' exported a function - this may not work as expected\");\n    }\n    for (var key in imported) {\n      if (Object.prototype.hasOwnProperty.call(imported, key)) {\n        moduleInstanceObject[key] = imported[key];\n      }\n    }\n    if (Object.freeze) {\n      Object.freeze(moduleInstanceObject);\n    }\n    return moduleInstanceObject;\n  }")));
-var CJSCompiler = function($__super) {
-  'use strict';
-  var $__proto = $__getProtoParent($__super);
-  var $CJSCompiler = ($__createClass)({
-    constructor: function() {
-      $__superCall(this, $__proto, "constructor", arguments);
-    },
-    stringify: function() {
-      var string = this.string.toString();
-      this.source = new SourceModifier(string);
-      this.prelude = [];
-      this.buildImports();
-      this.buildExports();
-      var out = "\"use strict\";\n";
-      {
-        var $__1 = traceur.runtime.getIterator(this.prelude);
-        try {
-          while (true) {
-            var source = $__1.next();
-            {
-              out += source + "\n";
-            }
-          }
-        } catch (e) {
-          if (!traceur.runtime.isStopIteration(e)) throw e;
-        }
-      }
-      out += this.source.toString();
-      out = out.trim();
-      return out;
-    },
-    doModuleImport: function(name, dependencyName, idx) {
-      this.ensureHasModuleObjectBuilder();
-      return ("var " + name + " = " + MODULE_OBJECT_BUILDER_NAME + "(\"" + name + "\", require(\"" + dependencyName + "\"));\n");
-    },
-    ensureHasModuleObjectBuilder: function() {
-      this.ensureHasSafeWarn();
-      this.ensureInPrelude(MODULE_OBJECT_BUILDER_NAME, MODULE_OBJECT_BUILDER_SOURCE);
-    },
-    ensureHasSafeWarn: function() {
-      this.ensureInPrelude(SAFE_WARN_NAME, SAFE_WARN_SOURCE);
-    },
-    ensureInPrelude: function(name, source) {
-      if (!this.prelude[name]) {
-        this.prelude[name] = true;
-        this.prelude.push(source);
-      }
-    },
-    doBareImport: function(name) {
-      return ("require(\"" + name + "\");");
-    },
-    doDefaultImport: function(name, dependencyName, idx) {
-      if (this.options.compatFix === true) {
-        return ("var " + name + " = require(\"" + dependencyName + "\")[\"default\"] || require(\"" + dependencyName + "\");\n");
-      } else {
-        return ("var " + name + " = require(\"" + dependencyName + "\")[\"default\"];\n");
-      }
-    },
-    doNamedImport: function(name, dependencyName, alias) {
-      return ("var " + alias + " = require(\"" + dependencyName + "\")." + name + ";\n");
-    },
-    doExportSpecifier: function(name, reexport) {
-      if (reexport) {
-        return ("exports." + name + " = require(\"" + reexport + "\")." + name + ";\n");
-      }
-      return ("exports." + name + " = " + name + ";\n");
-    },
-    doExportDeclaration: function(name) {
-      return ("\nexports." + name + " = " + name + ";");
-    },
-    doDefaultExport: function() {
-      return "exports[\"default\"] = ";
-    },
-    doImportSpecifiers: function(import_, idx) {
-      var dependencyName = import_.source.value;
-      var replacement = "";
-      {
-        var $__2 = traceur.runtime.getIterator(import_.specifiers);
-        try {
-          while (true) {
-            var specifier = $__2.next();
-            {
-              var alias = specifier.name ? specifier.name.name: specifier.id.name;
-              replacement += this.doNamedImport(specifier.id.name, dependencyName, alias);
-            }
-          }
-        } catch (e) {
-          if (!traceur.runtime.isStopIteration(e)) throw e;
-        }
-      }
-      return replacement;
-    }
-  }, {}, $__proto, $__super, false);
-  return $CJSCompiler;
-}(AbstractCompiler);
-module.exports = CJSCompiler;
-
-
-},{"./abstract_compiler":2,"./source_modifier":10,"./utils":11}],5:[function(require,module,exports){
-"use strict";
-var $__superDescriptor = function(proto, name) {
-  if (!proto) throw new TypeError('super is null');
-  return Object.getPropertyDescriptor(proto, name);
-}, $__superCall = function(self, proto, name, args) {
-  var descriptor = $__superDescriptor(proto, name);
-  if (descriptor) {
-    if ('value'in descriptor) return descriptor.value.apply(self, args);
-    if (descriptor.get) return descriptor.get.call(self).apply(self, args);
-  }
-  throw new TypeError("Object has no method '" + name + "'.");
-}, $__getProtoParent = function(superClass) {
-  if (typeof superClass === 'function') {
-    var prototype = superClass.prototype;
-    if (Object(prototype) === prototype || prototype === null) return superClass.prototype;
-  }
-  if (superClass === null) return null;
-  throw new TypeError();
-}, $__getDescriptors = function(object) {
-  var descriptors = {}, name, names = Object.getOwnPropertyNames(object);
-  for (var i = 0; i < names.length; i++) {
-    var name = names[i];
-    descriptors[name] = Object.getOwnPropertyDescriptor(object, name);
-  }
-  return descriptors;
-}, $__createClass = function(object, staticObject, protoParent, superClass, hasConstructor) {
-  var ctor = object.constructor;
-  if (typeof superClass === 'function') ctor.__proto__ = superClass;
-  if (!hasConstructor && protoParent === null) ctor = object.constructor = function() {};
-  var descriptors = $__getDescriptors(object);
-  descriptors.constructor.enumerable = false;
-  ctor.prototype = Object.create(protoParent, descriptors);
-  Object.defineProperties(ctor, $__getDescriptors(staticObject));
-  return ctor;
-};
-var CompileError = function($__super) {
-  'use strict';
-  var $__proto = $__getProtoParent($__super);
-  var $CompileError = ($__createClass)({constructor: function() {
-      $__superCall(this, $__proto, "constructor", arguments);
-    }}, {}, $__proto, $__super, false);
-  return $CompileError;
-}(Error);
-module.exports = CompileError;
-
-
-},{}],6:[function(require,module,exports){
-"use strict";
-var $__getDescriptors = function(object) {
-  var descriptors = {}, name, names = Object.getOwnPropertyNames(object);
-  for (var i = 0; i < names.length; i++) {
-    var name = names[i];
-    descriptors[name] = Object.getOwnPropertyDescriptor(object, name);
-  }
-  return descriptors;
-}, $__createClassNoExtends = function(object, staticObject) {
-  var ctor = object.constructor;
-  Object.defineProperty(object, 'constructor', {enumerable: false});
-  ctor.prototype = object;
-  Object.defineProperties(ctor, $__getDescriptors(staticObject));
-  return ctor;
-};
-var AMDCompiler = require("./amd_compiler");
-var YUICompiler = require("./yui_compiler");
-var CJSCompiler = require("./cjs_compiler");
-var GlobalsCompiler = require("./globals_compiler");
-var Parser = require("./parser");
-var Unique = require("./utils").Unique;
-var Compiler = function() {
-  'use strict';
-  var $Compiler = ($__createClassNoExtends)({
-    constructor: function(string, moduleName, options) {
-      if (moduleName == null) {
-        moduleName = null;
-      }
-      if (options == null) {
-        options = {};
-      }
-      this.string = string;
-      this.moduleName = moduleName;
-      this.options = options;
-      this.inBlockComment = false;
-      this.reExportUnique = new Unique('reexport');
-      this.parse();
-    },
-    parse: function() {
-      var parser = new Parser(this.string);
-      this.imports = parser.imports;
-      this.exports = parser.exports;
-      this.exportDefault = parser.exportDefault;
-      this.directives = parser.directives;
-    },
-    toAMD: function() {
-      return new AMDCompiler(this, this.options).stringify();
-    },
-    toYUI: function() {
-      return new YUICompiler(this, this.options).stringify();
-    },
-    toCJS: function() {
-      return new CJSCompiler(this, this.options).stringify();
-    },
-    toGlobals: function() {
-      return new GlobalsCompiler(this, this.options).stringify();
-    }
-  }, {});
-  return $Compiler;
-}();
-module.exports = Compiler;
-
-
-},{"./amd_compiler":3,"./cjs_compiler":4,"./globals_compiler":7,"./parser":9,"./utils":11,"./yui_compiler":12}],7:[function(require,module,exports){
-"use strict";
-var $__superDescriptor = function(proto, name) {
-  if (!proto) throw new TypeError('super is null');
-  return Object.getPropertyDescriptor(proto, name);
-}, $__superCall = function(self, proto, name, args) {
-  var descriptor = $__superDescriptor(proto, name);
-  if (descriptor) {
-    if ('value'in descriptor) return descriptor.value.apply(self, args);
-    if (descriptor.get) return descriptor.get.call(self).apply(self, args);
-  }
-  throw new TypeError("Object has no method '" + name + "'.");
-}, $__getProtoParent = function(superClass) {
-  if (typeof superClass === 'function') {
-    var prototype = superClass.prototype;
-    if (Object(prototype) === prototype || prototype === null) return superClass.prototype;
-  }
-  if (superClass === null) return null;
-  throw new TypeError();
-}, $__getDescriptors = function(object) {
-  var descriptors = {}, name, names = Object.getOwnPropertyNames(object);
-  for (var i = 0; i < names.length; i++) {
-    var name = names[i];
-    descriptors[name] = Object.getOwnPropertyDescriptor(object, name);
-  }
-  return descriptors;
-}, $__createClass = function(object, staticObject, protoParent, superClass, hasConstructor) {
-  var ctor = object.constructor;
-  if (typeof superClass === 'function') ctor.__proto__ = superClass;
-  if (!hasConstructor && protoParent === null) ctor = object.constructor = function() {};
-  var descriptors = $__getDescriptors(object);
-  descriptors.constructor.enumerable = false;
-  ctor.prototype = Object.create(protoParent, descriptors);
-  Object.defineProperties(ctor, $__getDescriptors(staticObject));
-  return ctor;
-};
-var AbstractCompiler = require("./abstract_compiler");
-var SourceModifier = require("./source_modifier");
-var GlobalsCompiler = function($__super) {
-  'use strict';
-  var $__proto = $__getProtoParent($__super);
-  var $GlobalsCompiler = ($__createClass)({
-    constructor: function() {
-      $__superCall(this, $__proto, "constructor", arguments);
-    },
-    stringify: function() {
-      var string = this.string.toString();
-      this.source = new SourceModifier(string);
-      this.map = [];
-      var out = this.buildPreamble(this.exports.length > 0);
-      this.buildImports();
-      this.buildExports();
-      if (!this.options.imports) this.options.imports = {};
-      if (!this.options.global) this.options.global = "window";
-      out += this.indentLines();
-      out += "\n})";
-      out += this.buildSuffix();
-      out += ";";
-      return out;
-    },
-    buildPreamble: function() {
-      var out = "", dependencyNames = this.dependencyNames;
-      out += "(function(";
-      if (this.exports.length > 0) {
-        out += "__exports__";
-        if (this.dependencyNames.length > 0) {
-          out += ', ';
-        }
-      }
-      for (var idx = 0; idx < dependencyNames.length; idx++) {
-        out += ("__dependency" + (idx + 1) + "__");
-        this.map[dependencyNames[idx]] = idx + 1;
-        if (!(idx === dependencyNames.length - 1)) out += ", ";
-      }
-      out += ") {\n";
-      out += '  "use strict";\n';
-      return out;
-    },
-    buildSuffix: function() {
-      var dependencyNames = this.dependencyNames;
-      var out = "(";
-      if (this.exports.length > 0) {
-        if (this.options.into) {
-          out += (this.options.global + "." + this.options.into + " = {}");
-        } else {
-          out += this.options.global;
-        }
-        if (this.dependencyNames.length > 0) {
-          out += ', ';
-        }
-      }
-      for (var idx = 0; idx < dependencyNames.length; idx++) {
-        var name = dependencyNames[idx];
-        out += (this.options.global + "." + (this.options.imports[name] || name));
-        if (!(idx === dependencyNames.length - 1)) out += ", ";
-      }
-      out += ")";
-      return out;
-    },
-    doModuleImport: function(name, dependencyName, idx) {
-      return ("var " + name + " = __dependency" + this.map[dependencyName] + "__;\n");
-    },
-    doBareImport: function(name) {
-      return "";
-    },
-    doDefaultImport: function(name, dependencyName, idx) {
-      return ("var " + name + " = __dependency" + this.map[dependencyName] + "__;\n");
-    },
-    doNamedImport: function(name, dependencyName, alias) {
-      return ("var " + alias + " = __dependency" + this.map[dependencyName] + "__." + name + ";\n");
-    },
-    doExportSpecifier: function(name, reexport) {
-      if (reexport) {
-        return ("__exports__." + name + " = __dependency" + this.map[reexport] + "__." + name + ";\n");
-      }
-      return ("__exports__." + name + " = " + name + ";\n");
-    },
-    doExportDeclaration: function(name) {
-      return ("\n__exports__." + name + " = " + name + ";");
-    },
-    doDefaultExport: function(identifier) {
-      if (identifier === null) {
-        throw new Error("The globals compiler does not support anonymous default exports.");
-      }
-      return ("__exports__." + identifier + " = ");
-    },
-    doImportSpecifiers: function(import_, idx) {
-      var dependencyName = import_.source.value;
-      var replacement = "";
-      {
-        var $__1 = traceur.runtime.getIterator(import_.specifiers);
-        try {
-          while (true) {
-            var specifier = $__1.next();
-            {
-              var alias = specifier.name ? specifier.name.name: specifier.id.name;
-              replacement += this.doNamedImport(specifier.id.name, dependencyName, alias);
-            }
-          }
-        } catch (e) {
-          if (!traceur.runtime.isStopIteration(e)) throw e;
-        }
-      }
-      return replacement;
-    }
-  }, {}, $__proto, $__super, false);
-  return $GlobalsCompiler;
-}(AbstractCompiler);
-module.exports = GlobalsCompiler;
-
-
-},{"./abstract_compiler":2,"./source_modifier":10}],8:[function(require,module,exports){
-"use strict";
-var Compiler = require("./compiler");
-var AbstractCompiler = require("./abstract_compiler");
-var AmdCompiler = require("./amd_compiler");
-var YuiCompiler = require("./yui_compiler");
-var CjsCompiler = require("./cjs_compiler");
-var GlobalsCompiler = require("./globals_compiler");
-var SourceModifier = require("./source_modifier");
-exports.Compiler = Compiler;
-exports.AbstractCompiler = AbstractCompiler;
-exports.AmdCompiler = AmdCompiler;
-exports.YuiCompiler = YuiCompiler;
-exports.CjsCompiler = CjsCompiler;
-exports.GlobalsCompiler = GlobalsCompiler;
-exports.SourceModifier = SourceModifier;
-
-
-},{"./abstract_compiler":2,"./amd_compiler":3,"./cjs_compiler":4,"./compiler":6,"./globals_compiler":7,"./source_modifier":10,"./yui_compiler":12}],9:[function(require,module,exports){
-"use strict";
-var $__getDescriptors = function(object) {
-  var descriptors = {}, name, names = Object.getOwnPropertyNames(object);
-  for (var i = 0; i < names.length; i++) {
-    var name = names[i];
-    descriptors[name] = Object.getOwnPropertyDescriptor(object, name);
-  }
-  return descriptors;
-}, $__createClassNoExtends = function(object, staticObject) {
-  var ctor = object.constructor;
-  Object.defineProperty(object, 'constructor', {enumerable: false});
-  ctor.prototype = object;
-  Object.defineProperties(ctor, $__getDescriptors(staticObject));
-  return ctor;
-};
-var esparse = require("esprima").parse;
-var LITERAL = 'Literal';
-var Parser = function() {
-  'use strict';
-  var $Parser = ($__createClassNoExtends)({
-    constructor: function(script) {
-      this.parse(script);
-    },
-    parse: function(script) {
-      this.imports = [];
-      this.exports = [];
-      this.directives = [];
-      this.exportDefault = undefined;
-      this.walk(esparse(script, {
-        range: true,
-        comment: true
-      }));
-    },
-    walk: function(node) {
-      if (node.type) {
-        var processor = this['process' + node.type];
-        if (processor) {
-          var result = processor.call(this, node);
-          if (result === false) {
-            return;
-          }
-        }
-      }
-      if (node.body && node.body.length > 0) {
-        node.body.forEach(function(child) {
-          child.parent = node;
-          this.walk(child);
-        }.bind(this));
-      }
-      if (node.comments && node.type === "Program") {
-        {
-          var $__1 = traceur.runtime.getIterator(node.comments);
-          try {
-            while (true) {
-              var comment = $__1.next();
-              {
-                if (comment.value.indexOf("transpile:") !== - 1) {
-                  this.directives.push(comment);
-                }
-              }
-            }
-          } catch (e) {
-            if (!traceur.runtime.isStopIteration(e)) throw e;
-          }
-        }
-      }
-    },
-    processImportDeclaration: function(node) {
-      var $__2 = node, kind = $__2.kind, source = $__2.source;
-      if (source.type !== LITERAL || typeof source.value !== 'string') {
-        throw new Error('invalid module source: ' + source.value);
-      }
-      switch (kind) {
-        case 'named':
-          this.processNamedImportDeclaration(node);
-          break;
-        case "default":
-          this.processDefaultImportDeclaration(node);
-          break;
-        case undefined:
-          this.processNamedImportDeclaration(node);
-          break;
-        default:
-          throw new Error('unknown import kind: ' + kind);
-      }
-    },
-    processNamedImportDeclaration: function(node) {
-      this.imports.push(node);
-    },
-    processDefaultImportDeclaration: function(node) {
-      if (node.specifiers.length !== 1) {
-        throw new Error('expected one specifier for default import, got ' + specifiers.length);
-      }
-      this.imports.push(node);
-    },
-    processExportDeclaration: function(node) {
-      if (!node.declaration && !node.specifiers) {
-        throw new Error('expected declaration or specifiers after `export` keyword');
-      }
-      this.exports.push(node);
-    },
-    processModuleDeclaration: function(node) {
-      this.imports.push(node);
-    }
-  }, {});
-  return $Parser;
-}();
-module.exports = Parser;
-
-
-},{"esprima":1}],10:[function(require,module,exports){
-"use strict";
-var $__getDescriptors = function(object) {
-  var descriptors = {}, name, names = Object.getOwnPropertyNames(object);
-  for (var i = 0; i < names.length; i++) {
-    var name = names[i];
-    descriptors[name] = Object.getOwnPropertyDescriptor(object, name);
-  }
-  return descriptors;
-}, $__createClassNoExtends = function(object, staticObject) {
-  var ctor = object.constructor;
-  Object.defineProperty(object, 'constructor', {enumerable: false});
-  ctor.prototype = object;
-  Object.defineProperties(ctor, $__getDescriptors(staticObject));
-  return ctor;
-};
-var SourceModifier = function() {
-  'use strict';
-  var $SourceModifier = ($__createClassNoExtends)({
-    constructor: function(source) {
-      this.source = source;
-      this.rangeOps = [];
-    },
-    mapIndex: function(index) {
-      for (var i = 0; i < this.rangeOps.length; i++) {
-        var curOp = this.rangeOps[i];
-        if (curOp.start >= index) continue;
-        if (curOp.end <= index) {
-          index += curOp.diff;
-          continue;
-        }
-        throw 'Source location ' + index + ' has already been transformed!';
-      }
-      return index;
-    },
-    replace: function(start, end, replacement) {
-      var diff = replacement.length - (end - start + 1);
-      start = this.mapIndex(start);
-      end = this.mapIndex(end);
-      this.source = this.source.substr(0, start) + replacement + this.source.substr(end + 1);
-      this.rangeOps.push({
-        start: start,
-        end: end,
-        diff: diff
-      });
-    },
-    getRange: function(start, end) {
-      return this.source.substr(this.mapIndex(start), this.mapIndex(end));
-    },
-    toString: function() {
-      return this.source;
-    }
-  }, {});
-  return $SourceModifier;
-}();
-module.exports = SourceModifier;
-
-
-},{}],11:[function(require,module,exports){
-"use strict";
-var $__getDescriptors = function(object) {
-  var descriptors = {}, name, names = Object.getOwnPropertyNames(object);
-  for (var i = 0; i < names.length; i++) {
-    var name = names[i];
-    descriptors[name] = Object.getOwnPropertyDescriptor(object, name);
-  }
-  return descriptors;
-}, $__createClassNoExtends = function(object, staticObject) {
-  var ctor = object.constructor;
-  Object.defineProperty(object, 'constructor', {enumerable: false});
-  ctor.prototype = object;
-  Object.defineProperties(ctor, $__getDescriptors(staticObject));
-  return ctor;
-};
-var hasOwnProp = {}.hasOwnProperty;
-function isEmpty(object) {
-  for (var foo in object) {
-    if (Object.prototype.hasOwnProperty.call(object, foo)) {
-      return false;
-    }
-  }
-  return true;
-}
-function uniq(array) {
-  var result = [];
-  for (var i = 0; i < array.length; i++) {
-    var item = array[i];
-    if (result.indexOf(item) === - 1) {
-      result.push(item);
-    }
-  }
-  return result;
-}
-var array = {uniq: uniq};
-function forEach(enumerable, callback) {
-  if (enumerable !== null && enumerable !== undefined && typeof enumerable.forEach === 'function') {
-    enumerable.forEach(callback);
-    return;
-  }
-  for (var key in enumerable) {
-    if (hasOwnProp.call(enumerable, key)) {
-      callback(enumerable[key], key);
-    }
-  }
-}
-function isWhitespace(str) {
-  return !str || /^\s*$/.test(str);
-}
-function indent(lines, level) {
-  var indentString = arguments[2] !== (void 0) ? arguments[2]: '  ';
-  return lines.map(function(line) {
-    if (!isWhitespace(line)) {
-      for (var i = 0; i < level; i++) {
-        line = indentString + line;
-      }
-    }
-    return line;
-  });
-}
-var WHITESPACE_ONLY = /^\s*$/;
-var LEADING_WHITESPACE = /^\s*/;
-function unindent(string) {
-  var minIndent = null;
-  var lines = string.split('\n');
-  {
-    var $__1 = traceur.runtime.getIterator(lines);
-    try {
-      while (true) {
-        var line = $__1.next();
-        {
-          if (!WHITESPACE_ONLY.test(line)) {
-            var match = line.match(LEADING_WHITESPACE);
-            if (match) {
-              if (minIndent !== null) {
-                minIndent = Math.min(match[0].length, minIndent);
-              } else {
-                minIndent = match[0].length;
-              }
-            }
-          }
-        }
-      }
-    } catch (e) {
-      if (!traceur.runtime.isStopIteration(e)) throw e;
-    }
-  }
-  return lines.map((function(line) {
-    return line.slice(minIndent);
-  })).join('\n');
-}
-function ltrim(string) {
-  return string.replace(LEADING_WHITESPACE, '');
-}
-var string = {
-  indent: indent,
-  unindent: unindent,
-  ltrim: ltrim
-};
-var Unique = function() {
-  'use strict';
-  var $Unique = ($__createClassNoExtends)({
-    constructor: function(prefix) {
-      this.prefix = prefix;
-      this.index = 1;
-    },
-    next: function() {
-      return ['__', this.prefix, this.index++, '__'].join('');
-    }
-  }, {});
-  return $Unique;
-}();
-exports.isEmpty = isEmpty;
-exports.Unique = Unique;
-exports.array = array;
-exports.forEach = forEach;
-exports.string = string;
-
-
-},{}],12:[function(require,module,exports){
-"use strict";
-var $__superDescriptor = function(proto, name) {
-  if (!proto) throw new TypeError('super is null');
-  return Object.getPropertyDescriptor(proto, name);
-}, $__superCall = function(self, proto, name, args) {
-  var descriptor = $__superDescriptor(proto, name);
-  if (descriptor) {
-    if ('value'in descriptor) return descriptor.value.apply(self, args);
-    if (descriptor.get) return descriptor.get.call(self).apply(self, args);
-  }
-  throw new TypeError("Object has no method '" + name + "'.");
-}, $__getProtoParent = function(superClass) {
-  if (typeof superClass === 'function') {
-    var prototype = superClass.prototype;
-    if (Object(prototype) === prototype || prototype === null) return superClass.prototype;
-  }
-  if (superClass === null) return null;
-  throw new TypeError();
-}, $__getDescriptors = function(object) {
-  var descriptors = {}, name, names = Object.getOwnPropertyNames(object);
-  for (var i = 0; i < names.length; i++) {
-    var name = names[i];
-    descriptors[name] = Object.getOwnPropertyDescriptor(object, name);
-  }
-  return descriptors;
-}, $__createClass = function(object, staticObject, protoParent, superClass, hasConstructor) {
-  var ctor = object.constructor;
-  if (typeof superClass === 'function') ctor.__proto__ = superClass;
-  if (!hasConstructor && protoParent === null) ctor = object.constructor = function() {};
-  var descriptors = $__getDescriptors(object);
-  descriptors.constructor.enumerable = false;
-  ctor.prototype = Object.create(protoParent, descriptors);
-  Object.defineProperties(ctor, $__getDescriptors(staticObject));
-  return ctor;
-};
-var AbstractCompiler = require("./abstract_compiler");
-var SourceModifier = require("./source_modifier");
-var YUICompiler = function($__super) {
-  'use strict';
-  var $__proto = $__getProtoParent($__super);
-  var $YUICompiler = ($__createClass)({
-    constructor: function() {
-      $__superCall(this, $__proto, "constructor", arguments);
-    },
-    stringify: function() {
-      var string = this.string.toString();
-      this.source = new SourceModifier(string);
-      var out = this.buildPreamble();
-      this.buildImports();
-      this.buildExports();
-      out += (this.indentLines("    ") + "\n    return __exports__;\n}, \"@VERSION@\", " + this.buildMetas() + ");");
-      return out;
-    },
-    buildPreamble: function() {
-      var name = this.moduleName || "@NAME@";
-      return ("YUI.add(\"" + name + "\", function(Y, NAME, __imports__, __exports__) {\n    \"use strict\";\n");
-    },
-    buildMetas: function() {
-      return JSON.stringify({
-        es: true,
-        requires: this.dependencyNames
-      });
-    },
-    doModuleImport: function(name, dependencyName, idx) {
-      return ("var " + name + " = __imports__[\"" + dependencyName + "\"];\n");
-    },
-    doBareImport: function(name) {
-      return "";
-    },
-    doDefaultImport: function(name, dependencyName, idx) {
-      if (this.options.compatFix === true) {
-        return ("var " + name + " = __imports__[\"" + dependencyName + "\"][\"default\"] || __imports__[\"" + dependencyName + "\"];\n");
-      } else {
-        return ("var " + name + " = __imports__[\"" + dependencyName + "\"][\"default\"];\n");
-      }
-    },
-    doNamedImport: function(name, dependencyName, alias) {
-      var member = (name === 'default' ? '["default"]': '.' + name);
-      return ("var " + alias + " = __imports__[\"" + dependencyName + "\"]" + member + ";\n");
-    },
-    doExportSpecifier: function(name, reexport) {
-      if (reexport) {
-        return ("__exports__." + name + " = __imports__[\"" + reexport + "\"]." + name + ";\n");
-      }
-      return ("__exports__." + name + " = " + name + ";\n");
-    },
-    doExportDeclaration: function(name) {
-      return ("\n__exports__." + name + " = " + name + ";");
-    },
-    doDefaultExport: function() {
-      return "__exports__[\"default\"] = ";
-    },
-    doImportSpecifiers: function(import_, idx) {
-      var dependencyName = import_.source.value;
-      var replacement = "";
-      {
-        var $__1 = traceur.runtime.getIterator(import_.specifiers);
-        try {
-          while (true) {
-            var specifier = $__1.next();
-            {
-              var alias = specifier.name ? specifier.name.name: specifier.id.name;
-              replacement += this.doNamedImport(specifier.id.name, dependencyName, alias);
-            }
-          }
-        } catch (e) {
-          if (!traceur.runtime.isStopIteration(e)) throw e;
-        }
-      }
-      return replacement;
-    }
-  }, {}, $__proto, $__super, false);
-  return $YUICompiler;
-}(AbstractCompiler);
-module.exports = YUICompiler;
-
-
-},{"./abstract_compiler":2,"./source_modifier":10}]},{},[8])
-(8)
-});
-;
-
-
diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
index f093a0a30e4..e64ce08380b 100644
--- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
+++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
@@ -1,5 +1,4 @@
 require 'execjs'
-require 'babel/transpiler'
 require 'mini_racer'
 
 module Tilt
@@ -27,9 +26,8 @@ module Tilt
     def self.create_new_context
       # timeout any eval that takes longer than 15 seconds
       ctx = MiniRacer::Context.new(timeout: 15000)
-      ctx.eval("var self = this; #{File.read(Babel::Transpiler.script_path)}")
+      ctx.eval("var self = this; #{File.read("#{Rails.root}/vendor/assets/javascripts/babel.js")}")
       ctx.eval("module = {}; exports = {};");
-      ctx.load("#{Rails.root}/lib/es6_module_transpiler/support/es6-module-transpiler.js")
       ctx.attach("rails.logger.info", proc{|err| Rails.logger.info(err.to_s)})
       ctx.attach("rails.logger.error", proc{|err| Rails.logger.error(err.to_s)})
       ctx.eval <<JS
@@ -43,6 +41,7 @@ JS
     end
 
     def self.reset_context
+      @ctx&.dispose
       @ctx = nil
     end
 
@@ -106,12 +105,8 @@ JS
       klass = self.class
       klass.protect do
         klass.v8.eval("console.prefix = 'BABEL: babel-eval: ';")
-
-        transpiled = babel_source(source)
-
-        compiler_source = "new module.exports.Compiler(#{transpiled}, '#{module_name(root_path, logical_path)}', #{compiler_options}).#{compiler_method}()"
-
-        @output = klass.v8.eval(compiler_source)
+        transpiled = babel_source(source, module_name: module_name(root_path, logical_path))
+        @output = klass.v8.eval(transpiled)
       end
     end
 
@@ -121,7 +116,7 @@ JS
       klass = self.class
       klass.protect do
         klass.v8.eval("console.prefix = 'BABEL: #{scope.logical_path}: ';")
-        @output = klass.v8.eval(generate_source(scope))
+        @output = klass.v8.eval(babel_source(data, module_name: module_name(scope.root_path, scope.logical_path)))
       end
 
       # For backwards compatibility with plugins, for now export the Global format too.
@@ -160,18 +155,21 @@ JS
       @output
     end
 
-    def babel_source(source)
+    def babel_source(source, opts=nil)
+
+      opts ||= {}
+
       js_source = ::JSON.generate(source, quirks_mode: true)
-      "babel.transform(#{js_source}, {ast: false, whitelist: ['es6.constants', 'es6.properties.shorthand', 'es6.arrowFunctions', 'es6.blockScoping', 'es6.destructuring', 'es6.spread', 'es6.parameters', 'es6.templateLiterals', 'es6.regex.unicode', 'es7.decorators', 'es6.classes']})['code']"
+
+      if opts[:module_name]
+        "Babel.transform(#{js_source}, { moduleId: '#{opts[:module_name]}', ast: false, presets: ['es2015'], plugins: [['transform-es2015-modules-amd', {noInterop: true}], 'transform-decorators-legacy'] }).code"
+      else
+        "Babel.transform(#{js_source}, { ast: false, plugins: ['check-es2015-constants', 'transform-es2015-arrow-functions', 'transform-es2015-block-scoped-functions', 'transform-es2015-block-scoping', 'transform-es2015-classes', 'transform-es2015-computed-properties', 'transform-es2015-destructuring', 'transform-es2015-duplicate-keys', 'transform-es2015-for-of', 'transform-es2015-function-name', 'transform-es2015-literals', 'transform-es2015-object-super', 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', 'transform-es2015-sticky-regex', 'transform-es2015-template-literals', 'transform-es2015-typeof-symbol', 'transform-es2015-unicode-regex', 'transform-regenerator', 'transform-decorators-legacy'] }).code"
+      end
     end
 
     private
 
-    def generate_source(scope)
-      js_source = babel_source(data)
-      "new module.exports.Compiler(#{js_source}, '#{module_name(scope.root_path, scope.logical_path)}', #{compiler_options}).#{compiler_method}()"
-    end
-
     def module_name(root_path, logical_path)
       path = nil
 
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index d87db228bbd..be727230d04 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -1,5 +1,6 @@
-require "open-uri"
 require "final_destination"
+require "mini_mime"
+require "open-uri"
 
 class FileHelper
 
@@ -24,29 +25,55 @@ class FileHelper
     ).resolve
     return unless uri.present?
 
+    downloaded = uri.open("rb", read_timeout: read_timeout)
+
     extension = File.extname(uri.path)
+
+    if extension.blank? && downloaded.content_type.present?
+      ext = MiniMime.lookup_by_content_type(downloaded.content_type)&.extension
+      ext = "jpg" if ext == "jpe"
+      extension = "." + ext if ext.present?
+    end
+
     tmp = Tempfile.new([tmp_file_name, extension])
 
     File.open(tmp.path, "wb") do |f|
-      downloaded = uri.open("rb", read_timeout: read_timeout)
       while f.size <= max_file_size && data = downloaded.read(512.kilobytes)
         f.write(data)
       end
-      # tiny files are StringIO, no close! on them
-      downloaded.try(:close!) rescue nil
     end
 
     tmp
+  ensure
+    downloaded&.close
+  end
+
+  def self.optimize_image!(filename)
+    ImageOptim.new(
+      # GLOBAL
+      timeout: 15,
+      skip_missing_workers: true,
+      # PNG
+      optipng: { level: 2, strip: SiteSetting.strip_image_metadata },
+      advpng: false,
+      pngcrush: false,
+      pngout: false,
+      pngquant: false,
+      # JPG
+      jpegoptim: { strip: SiteSetting.strip_image_metadata ? "all" : "none" },
+      jpegtran: false,
+      jpegrecompress: false,
+    ).optimize_image!(filename)
   end
 
   private
 
-  def self.images
-    @@images ||= Set.new %w{jpg jpeg png gif tif tiff bmp svg webp ico}
-  end
+    def self.images
+      @@images ||= Set.new %w{jpg jpeg png gif tif tiff bmp svg webp ico}
+    end
 
-  def self.images_regexp
-    @@images_regexp ||= /\.(#{images.to_a.join("|")})$/i
-  end
+    def self.images_regexp
+      @@images_regexp ||= /\.(#{images.to_a.join("|")})$/i
+    end
 
 end
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index b19963bb65d..265c7d53a83 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -1,4 +1,5 @@
 require "uri"
+require "mini_mime"
 require_dependency "file_store/base_store"
 require_dependency "s3_helper"
 require_dependency "file_helper"
@@ -33,7 +34,7 @@ module FileStore
       # stored uploaded are public by default
       options = {
         acl: "public-read",
-        content_type: opts[:content_type].presence || Rack::Mime.mime_type(File.extname(filename))
+        content_type: opts[:content_type].presence || MiniMime.lookup_by_filename(filename)&.content_type
       }
       # add a "content disposition" header for "attachments"
       options[:content_disposition] = "attachment; filename=\"#{filename}\"" unless FileHelper.is_image?(filename)
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index 8ce054d19b7..b0aff9605bf 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -7,9 +7,15 @@ require 'rate_limiter'
 class FinalDestination
 
   attr_reader :status
+  attr_reader :cookie
 
   def initialize(url, opts=nil)
-    @uri = URI(url) rescue nil
+    @uri =
+      begin
+        URI(URI.escape(url)) if url
+      rescue URI::InvalidURIError
+      end
+
     @opts = opts || {}
     @opts[:max_redirects] ||= 5
     @opts[:lookup_ip] ||= lambda do |host|
@@ -19,8 +25,14 @@ class FinalDestination
         nil
       end
     end
+    @ignored = [Discourse.base_url_no_prefix] + (@opts[:ignore_redirects] || [])
     @limit = @opts[:max_redirects]
     @status = :ready
+    @cookie = nil
+  end
+
+  def self.connection_timeout
+    20
   end
 
   def redirected?
@@ -28,9 +40,27 @@ class FinalDestination
   end
 
   def request_headers
-    { "User-Agent" => "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36",
+    result = {
+      "User-Agent" => "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36",
       "Accept" => "text/html",
-      "Host" => @uri.hostname }
+      "Host" => @uri.hostname
+    }
+
+    result['cookie'] = @cookie if @cookie
+
+    result
+  end
+
+  def small_get(headers)
+    Net::HTTP.start(@uri.host, @uri.port, use_ssl: @uri.is_a?(URI::HTTPS)) do |http|
+      http.open_timeout = FinalDestination.connection_timeout
+      http.read_timeout = FinalDestination.connection_timeout
+
+      request = Net::HTTP::Get.new(@uri.request_uri, headers)
+      http.request(request) do |response|
+        return response
+      end
+    end
   end
 
   def resolve
@@ -39,19 +69,50 @@ class FinalDestination
       return nil
     end
 
-    return nil unless validate_uri
-    headers = request_headers
-    head = Excon.head(@uri.to_s, read_timeout: 20, headers: headers)
-
-    # If the site does not allow HEAD, just try the url
-    return @uri if head.status == 405
-
-    if head.status == 200
-      @status = :resolved
-      return @uri
+    @ignored.each do |host|
+      if hostname_matches?(host)
+        @status = :resolved
+        return @uri
+      end
+    end
+
+    return nil unless validate_uri
+    headers = request_headers
+    response = Excon.head(
+      @uri.to_s,
+      read_timeout: FinalDestination.connection_timeout,
+      headers: headers
+    )
+
+    location = nil
+    case response.status
+    when 200
+      @status = :resolved
+      return @uri
+    when 405, 409, 501
+      get_response = small_get(headers)
+
+      if get_response.code.to_i == 200
+        @status = :resolved
+        return @uri
+      end
+
+      if cookie_val = get_response.get_fields('set-cookie')
+        @cookie = cookie_val.join
+      end
+
+      if location_val = get_response.get_fields('location')
+        location = location_val.join
+      end
+    else
+      response.headers.each do |k, v|
+        case k.downcase
+        when 'set-cookie' then @cookie = v
+        when 'location' then location = v
+        end
+      end
     end
 
-    location = FinalDestination.header_for(head, 'location')
     if location
       location = "#{@uri.scheme}://#{@uri.host}#{location}" if location[0] == "/"
       @uri = URI(location) rescue nil
@@ -76,18 +137,25 @@ class FinalDestination
     (IPAddr.new(@uri.hostname) rescue nil).nil?
   end
 
+  def hostname_matches?(url)
+    @uri && url.present? && @uri.hostname == (URI(url) rescue nil)&.hostname
+  end
+
   def is_dest_valid?
 
-    # CDNs are always allowed
-    return true if SiteSetting.s3_cdn_url.present? &&
-      @uri.hostname == URI(SiteSetting.s3_cdn_url).hostname
-
-    global_cdn = GlobalSetting.try(:cdn_url)
-    return true if global_cdn.present? &&
-      @uri.hostname == URI(global_cdn).hostname
-
     return false unless @uri && @uri.host
 
+    # Whitelisted hosts
+    return true if hostname_matches?(SiteSetting.s3_cdn_url) ||
+      hostname_matches?(GlobalSetting.try(:cdn_url)) ||
+      hostname_matches?(Discourse.base_url_no_prefix)
+
+    if SiteSetting.whitelist_internal_hosts.present?
+      SiteSetting.whitelist_internal_hosts.split('|').each do |h|
+        return true if @uri.hostname.downcase == h.downcase
+      end
+    end
+
     address_s = @opts[:lookup_ip].call(@uri.hostname)
     return false unless address_s
 
@@ -127,11 +195,4 @@ class FinalDestination
     IPSocket::getaddress(host)
   end
 
-  def self.header_for(head, name)
-    header = head.headers.detect do |k, _|
-      name == k.downcase
-    end
-    header[1] if header
-  end
-
 end
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index 888e99e4138..a3bd47c8a7f 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -14,7 +14,7 @@ class Barber::Precompiler
       transpiled = template.babel_transpile(source)
 
       # very hacky but lets us use ES6. I'm ashamed of this code -RW
-      transpiled.gsub!(/^export .*$/, '')
+      transpiled = transpiled[0...transpiled.index('export ')]
 
       @precompiler = StringIO.new <<END
       var __RawHandlebars;
@@ -40,11 +40,11 @@ module Discourse
     module Handlebars
       module Helper
         def precompile_handlebars(string)
-          "require('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(string)});"
+          "requirejs('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(string)});"
         end
 
         def compile_handlebars(string)
-          "require('discourse-common/lib/raw-handlebars').compile(#{indent(string).inspect});"
+          "requirejs('discourse-common/lib/raw-handlebars').compile(#{indent(string).inspect});"
         end
       end
     end
@@ -55,11 +55,11 @@ class Ember::Handlebars::Template
   include Discourse::Ember::Handlebars::Helper
 
   def precompile_handlebars(string, input=nil)
-    "require('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(string)});"
+    "requirejs('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(string)});"
   end
 
   def compile_handlebars(string, input=nil)
-    "require('discourse-common/lib/raw-handlebars').compile(#{indent(string).inspect});"
+    "requirejs('discourse-common/lib/raw-handlebars').compile(#{indent(string).inspect});"
   end
 
   def global_template_target(namespace, module_name, config)
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 0ec215c2ead..ae6c1d48f55 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -104,10 +104,9 @@ module I18n
       site = RailsMultisite::ConnectionManagement.current_db
 
       by_site = @overrides_by_site[site]
+      by_site ||= {}
 
-      if by_site.nil? || !by_site.has_key?(locale)
-        by_site = @overrides_by_site[site] = {}
-
+      if !by_site.has_key?(locale)
         # Load overrides
         translations_overrides = TranslationOverride.where(locale: locale).pluck(:translation_key, :value, :compiled_js)
 
@@ -119,6 +118,8 @@ module I18n
             by_locale[tuple[0]] = tuple[2] || tuple[1]
           end
         end
+
+        @overrides_by_site[site] = by_site
       end
 
       by_site[locale].with_indifferent_access
@@ -137,17 +138,25 @@ module I18n
       load_locale(locale) unless @loaded_locales.include?(locale)
 
       if @overrides_enabled
-        if by_locale = overrides_by_locale(locale)
+        overrides = {}
+
+        backend.fallbacks(locale).each do |l|
+          overrides[l] = overrides_by_locale(l)
+        end
+
+        if overrides.present?
           if options.present?
-            options[:overrides] = by_locale
+            options[:overrides] = overrides
 
             # I18n likes to use throw...
             catch(:exception) do
               return backend.translate(locale, key, options)
             end
           else
-            if result = by_locale[key]
-              return result
+            overrides.each do |_k, v|
+              if result = v[key]
+                return result
+              end
             end
           end
         end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 83513c6eb27..48c9ea4077e 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -126,19 +126,33 @@ class Guardian
   end
   alias :can_move_posts? :can_moderate?
   alias :can_see_flags? :can_moderate?
-  alias :can_send_activation_email? :can_moderate?
   alias :can_close? :can_moderate?
 
+  def can_send_activation_email?(user)
+    user && is_staff? && !SiteSetting.must_approve_users?
+  end
+
   def can_grant_badges?(_user)
     SiteSetting.enable_badges && is_staff?
   end
 
   def can_see_group?(group)
     return false if group.blank?
-    return true if is_admin? || group.visible?
+    return true if group.visibility_level == Group.visibility_levels[:public]
+    return true if is_admin?
+    return true if is_staff? && group.visibility_level == Group.visibility_levels[:staff]
     return false if user.blank?
 
-    group.group_users.where(user_id: user.id).exists?
+    membership = GroupUser.find_by(group_id: group.id, user_id: user.id)
+
+    return false unless membership
+
+    if !membership.owner
+      return false if group.visibility_level == Group.visibility_levels[:owners]
+      return false if group.visibility_level == Group.visibility_levels[:staff]
+    end
+
+    true
   end
 
 
@@ -228,16 +242,16 @@ class Guardian
       (!SiteSetting.must_approve_users? && @user.has_trust_level?(TrustLevel[2])) ||
       is_staff?
     ) &&
-    (groups.blank? || is_admin?)
+    (groups.blank? || is_admin? || groups.all? { |g| can_edit_group?(g) })
   end
 
-  def can_invite_to?(object, group_ids=nil)
+  def can_invite_to?(object, groups=nil)
     return false unless authenticated?
     return true if is_admin?
     return false unless SiteSetting.enable_private_messages?
     return false if (SiteSetting.max_invites_per_day.to_i == 0 && !is_staff?)
     return false unless can_see?(object)
-    return false if group_ids.present?
+    return false if groups.present?
 
     if object.is_a?(Topic) && object.category
       if object.category.groups.any?
@@ -257,10 +271,6 @@ class Guardian
     user.admin?
   end
 
-  def can_create_disposable_invite?(user)
-    user.admin?
-  end
-
   def can_send_multiple_invites?(user)
     user.staff?
   end
@@ -269,6 +279,10 @@ class Guardian
     user.staff?
   end
 
+  def can_rescind_all_invites?(user)
+    user.staff?
+  end
+
   def can_see_private_messages?(user_id)
     is_admin? || (authenticated? && @user.id == user_id)
   end
diff --git a/lib/highlight_js/assets/highlight.js b/lib/highlight_js/assets/highlight.js
index ac1a7541755..d59bc7cedb2 100644
--- a/lib/highlight_js/assets/highlight.js
+++ b/lib/highlight_js/assets/highlight.js
@@ -1,2 +1,2 @@
-/*! highlight.js v9.2.0 | BSD3 License | git.io/hljslicense */
-!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0==t.index}function a(e){return/^(no-?highlight|plain|text)$/i.test(e)}function i(e){var n,t,r,i=e.className+" ";if(i+=e.parentNode?e.parentNode.className:"",t=/\blang(?:uage)?-([\w-]+)\b/i.exec(i))return w(t[1])?t[1]:"no-highlight";for(i=i.split(/\s+/),n=0,r=i.length;r>n;n++)if(w(i[n])||a(i[n]))return i[n]}function o(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3==i.nodeType?a+=i.nodeValue.length:1==i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!=r[0].offset?e[0].offset<r[0].offset?e:r:"start"==r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value)+'"'}f+="<"+t(e)+Array.prototype.map.call(e.attributes,r).join("")+">"}function u(e){f+="</"+t(e)+">"}function c(e){("start"==e.event?o:u)(e.node)}for(var s=0,f="",l=[];e.length||r.length;){var g=i();if(f+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g==e){l.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g==e&&g.length&&g[0].offset==s);l.reverse().forEach(o)}else"start"==g[0].event?l.push(g[0].node):l.pop(),c(g.splice(0,1)[0])}return f+n(a.substr(s))}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):Object.keys(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),void 0===a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(o(e,n))}):s.push("self"==e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var f=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=f.length?t(f.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){for(var t=0;t<n.c.length;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function g(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":E.classPrefix,i='<span class="'+a,o=t?"":"</span>";return i+=e+'">',i+n+o}function h(){if(!k.k)return n(M);var e="",t=0;k.lR.lastIndex=0;for(var r=k.lR.exec(M);r;){e+=n(M.substr(t,r.index-t));var a=g(k,r);a?(B+=a[1],e+=p(a[0],n(r[0]))):e+=n(r[0]),t=k.lR.lastIndex,r=k.lR.exec(M)}return e+n(M.substr(t))}function d(){var e="string"==typeof k.sL;if(e&&!R[k.sL])return n(M);var t=e?f(k.sL,M,!0,y[k.sL]):l(M,k.sL.length?k.sL:void 0);return k.r>0&&(B+=t.r),e&&(y[k.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=void 0!==k.sL?d():h(),M=""}function v(e,n){L+=e.cN?p(e.cN,"",!0):"",k=Object.create(e,{parent:{value:k}})}function m(e,n){if(M+=e,void 0===n)return b(),0;var t=o(n,k);if(t)return t.skip?M+=n:(t.eB&&(M+=n),b(),t.rB||t.eB||(M=n)),v(t,n),t.rB?0:n.length;var r=u(k,n);if(r){var a=k;a.skip?M+=n:(a.rE||a.eE||(M+=n),b(),a.eE&&(M=n));do k.cN&&(L+="</span>"),k.skip||(B+=k.r),k=k.parent;while(k!=r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,k))throw new Error('Illegal lexeme "'+n+'" for mode "'+(k.cN||"<unnamed>")+'"');return M+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var x,k=i||N,y={},L="";for(x=k;x!=N;x=x.parent)x.cN&&(L=p(x.cN,"",!0)+L);var M="",B=0;try{for(var C,j,I=0;;){if(k.t.lastIndex=I,C=k.t.exec(t),!C)break;j=m(t.substr(I,C.index-I),C[0]),I=C.index+j}for(m(t.substr(I)),x=k;x.parent;x=x.parent)x.cN&&(L+="</span>");return{r:B,value:L,language:e,top:k}}catch(O){if(-1!=O.message.indexOf("Illegal"))return{r:0,value:n(t)};throw O}}function l(e,t){t=t||E.languages||Object.keys(R);var r={r:0,value:n(e)},a=r;return t.forEach(function(n){if(w(n)){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}}),a.language&&(r.second_best=a),r}function g(e){return E.tabReplace&&(e=e.replace(/^((<[^>]+>|\t)+)/gm,function(e,n){return n.replace(/\t/g,E.tabReplace)})),E.useBR&&(e=e.replace(/\n/g,"<br>")),e}function p(e,n,t){var r=n?x[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function h(e){var n=i(e);if(!a(n)){var t;E.useBR?(t=document.createElementNS("http://www.w3.org/1999/xhtml","div"),t.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):t=e;var r=t.textContent,o=n?f(n,r,!0):l(r),s=u(t);if(s.length){var h=document.createElementNS("http://www.w3.org/1999/xhtml","div");h.innerHTML=o.value,o.value=c(s,u(h),r)}o.value=g(o.value),e.innerHTML=o.value,e.className=p(e.className,n,o.language),e.result={language:o.language,re:o.r},o.second_best&&(e.second_best={language:o.second_best.language,re:o.second_best.r})}}function d(e){E=o(E,e)}function b(){if(!b.called){b.called=!0;var e=document.querySelectorAll("pre code");Array.prototype.forEach.call(e,h)}}function v(){addEventListener("DOMContentLoaded",b,!1),addEventListener("load",b,!1)}function m(n,t){var r=R[n]=t(e);r.aliases&&r.aliases.forEach(function(e){x[e]=n})}function N(){return Object.keys(R)}function w(e){return e=(e||"").toLowerCase(),R[e]||R[x[e]]}var E={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},R={},x={};return e.highlight=f,e.highlightAuto=l,e.fixMarkup=g,e.highlightBlock=h,e.configure=d,e.initHighlighting=b,e.initHighlightingOnLoad=v,e.registerLanguage=m,e.listLanguages=N,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});
\ No newline at end of file
+/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',"&quot;")+'"'}l+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function u(e){l+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var s=0,l="",f=[];e.length||r.length;){var g=i();if(l+=n(a.substring(s,g[0].offset)),s=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===s);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return l+n(a.substr(s))}function s(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function l(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return s("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function s(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=s(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!L[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){y+=null!=E.sL?d():h(),k=""}function v(e){y+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(y+=C),E.skip||E.sL||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');l(N);var R,E=i||N,x={},y="";for(R=E;R!==N;R=R.parent)R.cN&&(y=p(R.cN,"",!0)+y);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(y+=C);return{r:B,value:y,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(L);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"<br>":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?y[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,s,l=i(e);a(l)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,s=n.textContent,r=l?f(l,s,!0):g(s),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),s)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,l,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=L[n]=t(e);r.aliases&&r.aliases.forEach(function(e){y[e]=n})}function R(){return x(L)}function w(e){return e=(e||"").toLowerCase(),L[e]||L[y[e]]}var E=[],x=Object.keys,L={},y={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/1c.js b/lib/highlight_js/assets/lang/1c.js
index 2e5eb6db935..420d11124ab 100644
--- a/lib/highlight_js/assets/lang/1c.js
+++ b/lib/highlight_js/assets/lang/1c.js
@@ -1 +1 @@
-hljs.registerLanguage("1c",function(c){var e="[a-zA-Zа-яА-Я][a-zA-Z0-9_а-яА-Я]*",n="возврат дата для если и или иначе иначеесли исключение конецесли конецпопытки конецпроцедуры конецфункции конеццикла константа не перейти перем перечисление по пока попытка прервать продолжить процедура строка тогда фс функция цикл число экспорт",b="ansitooem oemtoansi ввестивидсубконто ввестидату ввестизначение ввестиперечисление ввестипериод ввестиплансчетов ввестистроку ввестичисло вопрос восстановитьзначение врег выбранныйплансчетов вызватьисключение датагод датамесяц датачисло добавитьмесяц завершитьработусистемы заголовоксистемы записьжурналарегистрации запуститьприложение зафиксироватьтранзакцию значениевстроку значениевстрокувнутр значениевфайл значениеизстроки значениеизстрокивнутр значениеизфайла имякомпьютера имяпользователя каталогвременныхфайлов каталогиб каталогпользователя каталогпрограммы кодсимв командасистемы конгода конецпериодаби конецрассчитанногопериодаби конецстандартногоинтервала конквартала конмесяца коннедели лев лог лог10 макс максимальноеколичествосубконто мин монопольныйрежим названиеинтерфейса названиенабораправ назначитьвид назначитьсчет найти найтипомеченныенаудаление найтиссылки началопериодаби началостандартногоинтервала начатьтранзакцию начгода начквартала начмесяца начнедели номерднягода номерднянедели номернеделигода нрег обработкаожидания окр описаниеошибки основнойжурналрасчетов основнойплансчетов основнойязык открытьформу открытьформумодально отменитьтранзакцию очиститьокносообщений периодстр полноеимяпользователя получитьвремята получитьдатута получитьдокументта получитьзначенияотбора получитьпозициюта получитьпустоезначение получитьта прав праводоступа предупреждение префиксавтонумерации пустаястрока пустоезначение рабочаядаттьпустоезначение рабочаядата разделительстраниц разделительстрок разм разобратьпозициюдокумента рассчитатьрегистрына рассчитатьрегистрыпо сигнал симв символтабуляции создатьобъект сокрл сокрлп сокрп сообщить состояние сохранитьзначение сред статусвозврата стрдлина стрзаменить стрколичествострок стрполучитьстроку  стрчисловхождений сформироватьпозициюдокумента счетпокоду текущаядата текущеевремя типзначения типзначениястр удалитьобъекты установитьтана установитьтапо фиксшаблон формат цел шаблон",i={b:'""'},r={cN:"string",b:'"',e:'"|$',c:[i]},t={cN:"string",b:"\\|",e:'"|$',c:[i]};return{cI:!0,l:e,k:{keyword:n,built_in:b},c:[c.CLCM,c.NM,r,t,{cN:"function",b:"(процедура|функция)",e:"$",l:e,k:"процедура функция",c:[{b:"экспорт",eW:!0,l:e,k:"экспорт",c:[c.CLCM]},{cN:"params",b:"\\(",e:"\\)",l:e,k:"знач",c:[r,t]},c.CLCM,c.inherit(c.TM,{b:e})]},{cN:"meta",b:"#",e:"$"},{cN:"number",b:"'\\d{2}\\.\\d{2}\\.(\\d{2}|\\d{4})'"}]}});
\ No newline at end of file
+hljs.registerLanguage("1c",function(s){var x="[A-Za-zА-Яа-яёЁ_][A-Za-zА-Яа-яёЁ_0-9]+",o="далее ",m="возврат вызватьисключение выполнить для если и из или иначе иначеесли исключение каждого конецесли конецпопытки конеццикла не новый перейти перем по пока попытка прервать продолжить тогда цикл экспорт ",t=o+m,l="загрузитьизфайла ",e="вебклиент вместо внешнеесоединение клиент конецобласти мобильноеприложениеклиент мобильноеприложениесервер наклиенте наклиентенасервере наклиентенасерверебезконтекста насервере насерверебезконтекста область перед после сервер толстыйклиентобычноеприложение толстыйклиентуправляемоеприложение тонкийклиент ",n=l+e,a="разделительстраниц разделительстрок символтабуляции ",d="ansitooem oemtoansi ввестивидсубконто ввестиперечисление ввестипериод ввестиплансчетов выбранныйплансчетов датагод датамесяц датачисло заголовоксистемы значениевстроку значениеизстроки каталогиб каталогпользователя кодсимв конгода конецпериодаби конецрассчитанногопериодаби конецстандартногоинтервала конквартала конмесяца коннедели лог лог10 максимальноеколичествосубконто названиеинтерфейса названиенабораправ назначитьвид назначитьсчет найтиссылки началопериодаби началостандартногоинтервала начгода начквартала начмесяца начнедели номерднягода номерднянедели номернеделигода обработкаожидания основнойжурналрасчетов основнойплансчетов основнойязык очиститьокносообщений периодстр получитьвремята получитьдатута получитьдокументта получитьзначенияотбора получитьпозициюта получитьпустоезначение получитьта префиксавтонумерации пропись пустоезначение разм разобратьпозициюдокумента рассчитатьрегистрына рассчитатьрегистрыпо симв создатьобъект статусвозврата стрколичествострок сформироватьпозициюдокумента счетпокоду текущеевремя типзначения типзначениястр установитьтана установитьтапо фиксшаблон шаблон ",i="acos asin atan base64значение base64строка cos exp log log10 pow sin sqrt tan xmlзначение xmlстрока xmlтип xmlтипзнч активноеокно безопасныйрежим безопасныйрежимразделенияданных булево ввестидату ввестизначение ввестистроку ввестичисло возможностьчтенияxml вопрос восстановитьзначение врег выгрузитьжурналрегистрации выполнитьобработкуоповещения выполнитьпроверкуправдоступа вычислить год данныеформывзначение дата день деньгода деньнедели добавитьмесяц заблокироватьданныедляредактирования заблокироватьработупользователя завершитьработусистемы загрузитьвнешнююкомпоненту закрытьсправку записатьjson записатьxml записатьдатуjson записьжурналарегистрации заполнитьзначениясвойств запроситьразрешениепользователя запуститьприложение запуститьсистему зафиксироватьтранзакцию значениевданныеформы значениевстрокувнутр значениевфайл значениезаполнено значениеизстрокивнутр значениеизфайла изxmlтипа импортмоделиxdto имякомпьютера имяпользователя инициализироватьпредопределенныеданные информацияобошибке каталогбиблиотекимобильногоустройства каталогвременныхфайлов каталогдокументов каталогпрограммы кодироватьстроку кодлокализацииинформационнойбазы кодсимвола командасистемы конецгода конецдня конецквартала конецмесяца конецминуты конецнедели конецчаса конфигурациябазыданныхизмененадинамически конфигурацияизменена копироватьданныеформы копироватьфайл краткоепредставлениеошибки лев макс местноевремя месяц мин минута монопольныйрежим найти найтинедопустимыесимволыxml найтиокнопонавигационнойссылке найтипомеченныенаудаление найтипоссылкам найтифайлы началогода началодня началоквартала началомесяца началоминуты началонедели началочаса начатьзапросразрешенияпользователя начатьзапускприложения начатькопированиефайла начатьперемещениефайла начатьподключениевнешнейкомпоненты начатьподключениерасширенияработыскриптографией начатьподключениерасширенияработысфайлами начатьпоискфайлов начатьполучениекаталогавременныхфайлов начатьполучениекаталогадокументов начатьполучениерабочегокаталогаданныхпользователя начатьполучениефайлов начатьпомещениефайла начатьпомещениефайлов начатьсозданиедвоичныхданныхизфайла начатьсозданиекаталога начатьтранзакцию начатьудалениефайлов начатьустановкувнешнейкомпоненты начатьустановкурасширенияработыскриптографией начатьустановкурасширенияработысфайлами неделягода необходимостьзавершениясоединения номерсеансаинформационнойбазы номерсоединенияинформационнойбазы нрег нстр обновитьинтерфейс обновитьнумерациюобъектов обновитьповторноиспользуемыезначения обработкапрерыванияпользователя объединитьфайлы окр описаниеошибки оповестить оповеститьобизменении отключитьобработчикзапросанастроекклиенталицензирования отключитьобработчикожидания отключитьобработчикоповещения открытьзначение открытьиндекссправки открытьсодержаниесправки открытьсправку открытьформу открытьформумодально отменитьтранзакцию очиститьжурналрегистрации очиститьнастройкипользователя очиститьсообщения параметрыдоступа перейтипонавигационнойссылке переместитьфайл подключитьвнешнююкомпоненту подключитьобработчикзапросанастроекклиенталицензирования подключитьобработчикожидания подключитьобработчикоповещения подключитьрасширениеработыскриптографией подключитьрасширениеработысфайлами подробноепредставлениеошибки показатьвводдаты показатьвводзначения показатьвводстроки показатьвводчисла показатьвопрос показатьзначение показатьинформациюобошибке показатьнакарте показатьоповещениепользователя показатьпредупреждение полноеимяпользователя получитьcomобъект получитьxmlтип получитьадреспоместоположению получитьблокировкусеансов получитьвремязавершенияспящегосеанса получитьвремязасыпанияпассивногосеанса получитьвремяожиданияблокировкиданных получитьданныевыбора получитьдополнительныйпараметрклиенталицензирования получитьдопустимыекодылокализации получитьдопустимыечасовыепояса получитьзаголовокклиентскогоприложения получитьзаголовоксистемы получитьзначенияотборажурналарегистрации получитьидентификаторконфигурации получитьизвременногохранилища получитьимявременногофайла получитьимяклиенталицензирования получитьинформациюэкрановклиента получитьиспользованиежурналарегистрации получитьиспользованиесобытияжурналарегистрации получитькраткийзаголовокприложения получитьмакетоформления получитьмаскувсефайлы получитьмаскувсефайлыклиента получитьмаскувсефайлысервера получитьместоположениепоадресу получитьминимальнуюдлинупаролейпользователей получитьнавигационнуюссылку получитьнавигационнуюссылкуинформационнойбазы получитьобновлениеконфигурациибазыданных получитьобновлениепредопределенныхданныхинформационнойбазы получитьобщиймакет получитьобщуюформу получитьокна получитьоперативнуюотметкувремени получитьотключениебезопасногорежима получитьпараметрыфункциональныхопцийинтерфейса получитьполноеимяпредопределенногозначения получитьпредставлениянавигационныхссылок получитьпроверкусложностипаролейпользователей получитьразделительпути получитьразделительпутиклиента получитьразделительпутисервера получитьсеансыинформационнойбазы получитьскоростьклиентскогосоединения получитьсоединенияинформационнойбазы получитьсообщенияпользователю получитьсоответствиеобъектаиформы получитьсоставстандартногоинтерфейсаodata получитьструктурухранениябазыданных получитьтекущийсеансинформационнойбазы получитьфайл получитьфайлы получитьформу получитьфункциональнуюопцию получитьфункциональнуюопциюинтерфейса получитьчасовойпоясинформационнойбазы пользователиос поместитьвовременноехранилище поместитьфайл поместитьфайлы прав праводоступа предопределенноезначение представлениекодалокализации представлениепериода представлениеправа представлениеприложения представлениесобытияжурналарегистрации представлениечасовогопояса предупреждение прекратитьработусистемы привилегированныйрежим продолжитьвызов прочитатьjson прочитатьxml прочитатьдатуjson пустаястрока рабочийкаталогданныхпользователя разблокироватьданныедляредактирования разделитьфайл разорватьсоединениесвнешнимисточникомданных раскодироватьстроку рольдоступна секунда сигнал символ скопироватьжурналрегистрации смещениелетнеговремени смещениестандартноговремени соединитьбуферыдвоичныхданных создатькаталог создатьфабрикуxdto сокрл сокрлп сокрп сообщить состояние сохранитьзначение сохранитьнастройкипользователя сред стрдлина стрзаканчиваетсяна стрзаменить стрнайти стрначинаетсяс строка строкасоединенияинформационнойбазы стрполучитьстроку стрразделить стрсоединить стрсравнить стрчисловхождений стрчислострок стршаблон текущаядата текущаядатасеанса текущаяуниверсальнаядата текущаяуниверсальнаядатавмиллисекундах текущийвариантинтерфейсаклиентскогоприложения текущийвариантосновногошрифтаклиентскогоприложения текущийкодлокализации текущийрежимзапуска текущийязык текущийязыксистемы тип типзнч транзакцияактивна трег удалитьданныеинформационнойбазы удалитьизвременногохранилища удалитьобъекты удалитьфайлы универсальноевремя установитьбезопасныйрежим установитьбезопасныйрежимразделенияданных установитьблокировкусеансов установитьвнешнююкомпоненту установитьвремязавершенияспящегосеанса установитьвремязасыпанияпассивногосеанса установитьвремяожиданияблокировкиданных установитьзаголовокклиентскогоприложения установитьзаголовоксистемы установитьиспользованиежурналарегистрации установитьиспользованиесобытияжурналарегистрации установитькраткийзаголовокприложения установитьминимальнуюдлинупаролейпользователей установитьмонопольныйрежим установитьнастройкиклиенталицензирования установитьобновлениепредопределенныхданныхинформационнойбазы установитьотключениебезопасногорежима установитьпараметрыфункциональныхопцийинтерфейса установитьпривилегированныйрежим установитьпроверкусложностипаролейпользователей установитьрасширениеработыскриптографией установитьрасширениеработысфайлами установитьсоединениесвнешнимисточникомданных установитьсоответствиеобъектаиформы установитьсоставстандартногоинтерфейсаodata установитьчасовойпоясинформационнойбазы установитьчасовойпояссеанса формат цел час часовойпояс часовойпояссеанса число числопрописью этоадресвременногохранилища ",c="wsссылки библиотекакартинок библиотекамакетовоформлениякомпоновкиданных библиотекастилей бизнеспроцессы внешниеисточникиданных внешниеобработки внешниеотчеты встроенныепокупки главныйинтерфейс главныйстиль документы доставляемыеуведомления журналыдокументов задачи информацияобинтернетсоединении использованиерабочейдаты историяработыпользователя константы критерииотбора метаданные обработки отображениерекламы отправкадоставляемыхуведомлений отчеты панельзадачос параметрзапуска параметрысеанса перечисления планывидоврасчета планывидовхарактеристик планыобмена планысчетов полнотекстовыйпоиск пользователиинформационнойбазы последовательности проверкавстроенныхпокупок рабочаядата расширенияконфигурации регистрыбухгалтерии регистрынакопления регистрырасчета регистрысведений регламентныезадания сериализаторxdto справочники средствагеопозиционирования средствакриптографии средствамультимедиа средстваотображениярекламы средствапочты средствателефонии фабрикаxdto файловыепотоки фоновыезадания хранилищанастроек хранилищевариантовотчетов хранилищенастроекданныхформ хранилищеобщихнастроек хранилищепользовательскихнастроекдинамическихсписков хранилищепользовательскихнастроекотчетов хранилищесистемныхнастроек ",r=a+d+i+c,p="webцвета windowsцвета windowsшрифты библиотекакартинок рамкистиля символы цветастиля шрифтыстиля ",b="автоматическоесохранениеданныхформывнастройках автонумерациявформе автораздвижениесерий анимациядиаграммы вариантвыравниванияэлементовизаголовков вариантуправлениявысотойтаблицы вертикальнаяпрокруткаформы вертикальноеположение вертикальноеположениеэлемента видгруппыформы виддекорацииформы виддополненияэлементаформы видизмененияданных видкнопкиформы видпереключателя видподписейкдиаграмме видполяформы видфлажка влияниеразмеранапузырекдиаграммы горизонтальноеположение горизонтальноеположениеэлемента группировкаколонок группировкаподчиненныхэлементовформы группыиэлементы действиеперетаскивания дополнительныйрежимотображения допустимыедействияперетаскивания интервалмеждуэлементамиформы использованиевывода использованиеполосыпрокрутки используемоезначениеточкибиржевойдиаграммы историявыборапривводе источникзначенийоситочекдиаграммы источникзначенияразмерапузырькадиаграммы категориягруппыкоманд максимумсерий начальноеотображениедерева начальноеотображениесписка обновлениетекстаредактирования ориентациядендрограммы ориентациядиаграммы ориентацияметокдиаграммы ориентацияметоксводнойдиаграммы ориентацияэлементаформы отображениевдиаграмме отображениевлегендедиаграммы отображениегруппыкнопок отображениезаголовкашкалыдиаграммы отображениезначенийсводнойдиаграммы отображениезначенияизмерительнойдиаграммы отображениеинтерваладиаграммыганта отображениекнопки отображениекнопкивыбора отображениеобсужденийформы отображениеобычнойгруппы отображениеотрицательныхзначенийпузырьковойдиаграммы отображениепанелипоиска отображениеподсказки отображениепредупрежденияприредактировании отображениеразметкиполосырегулирования отображениестраницформы отображениетаблицы отображениетекстазначениядиаграммыганта отображениеуправленияобычнойгруппы отображениефигурыкнопки палитрацветовдиаграммы поведениеобычнойгруппы поддержкамасштабадендрограммы поддержкамасштабадиаграммыганта поддержкамасштабасводнойдиаграммы поисквтаблицепривводе положениезаголовкаэлементаформы положениекартинкикнопкиформы положениекартинкиэлементаграфическойсхемы положениекоманднойпанелиформы положениекоманднойпанелиэлементаформы положениеопорнойточкиотрисовки положениеподписейкдиаграмме положениеподписейшкалызначенийизмерительнойдиаграммы положениесостоянияпросмотра положениестрокипоиска положениетекстасоединительнойлинии положениеуправленияпоиском положениешкалывремени порядокотображенияточекгоризонтальнойгистограммы порядоксерийвлегендедиаграммы размеркартинки расположениезаголовкашкалыдиаграммы растягиваниеповертикалидиаграммыганта режимавтоотображениясостояния режимвводастроктаблицы режимвыборанезаполненного режимвыделениядаты режимвыделениястрокитаблицы режимвыделениятаблицы режимизмененияразмера режимизменениясвязанногозначения режимиспользованиядиалогапечати режимиспользованияпараметракоманды режиммасштабированияпросмотра режимосновногоокнаклиентскогоприложения режимоткрытияокнаформы режимотображениявыделения режимотображениягеографическойсхемы режимотображениязначенийсерии режимотрисовкисеткиграфическойсхемы режимполупрозрачностидиаграммы режимпробеловдиаграммы режимразмещениянастранице режимредактированияколонки режимсглаживаниядиаграммы режимсглаживанияиндикатора режимсписказадач сквозноевыравнивание сохранениеданныхформывнастройках способзаполнениятекстазаголовкашкалыдиаграммы способопределенияограничивающегозначениядиаграммы стандартнаягруппакоманд стандартноеоформление статусоповещенияпользователя стильстрелки типаппроксимациилиниитрендадиаграммы типдиаграммы типединицышкалывремени типимпортасерийслоягеографическойсхемы типлиниигеографическойсхемы типлиниидиаграммы типмаркерагеографическойсхемы типмаркерадиаграммы типобластиоформления типорганизацииисточникаданныхгеографическойсхемы типотображениясериислоягеографическойсхемы типотображенияточечногообъектагеографическойсхемы типотображенияшкалыэлементалегендыгеографическойсхемы типпоискаобъектовгеографическойсхемы типпроекциигеографическойсхемы типразмещенияизмерений типразмещенияреквизитовизмерений типрамкиэлементауправления типсводнойдиаграммы типсвязидиаграммыганта типсоединениязначенийпосериямдиаграммы типсоединенияточекдиаграммы типсоединительнойлинии типстороныэлементаграфическойсхемы типформыотчета типшкалырадарнойдиаграммы факторлиниитрендадиаграммы фигуракнопки фигурыграфическойсхемы фиксациявтаблице форматдняшкалывремени форматкартинки ширинаподчиненныхэлементовформы ",w="виддвижениябухгалтерии виддвижениянакопления видпериодарегистрарасчета видсчета видточкимаршрутабизнеспроцесса использованиеагрегатарегистранакопления использованиегруппиэлементов использованиережимапроведения использованиесреза периодичностьагрегатарегистранакопления режимавтовремя режимзаписидокумента режимпроведениядокумента ",h="авторегистрацияизменений допустимыйномерсообщения отправкаэлементаданных получениеэлементаданных ",j="использованиерасшифровкитабличногодокумента ориентациястраницы положениеитоговколоноксводнойтаблицы положениеитоговстроксводнойтаблицы положениетекстаотносительнокартинки расположениезаголовкагруппировкитабличногодокумента способчтениязначенийтабличногодокумента типдвустороннейпечати типзаполненияобластитабличногодокумента типкурсоровтабличногодокумента типлиниирисункатабличногодокумента типлинииячейкитабличногодокумента типнаправленияпереходатабличногодокумента типотображениявыделениятабличногодокумента типотображениялинийсводнойтаблицы типразмещениятекстатабличногодокумента типрисункатабличногодокумента типсмещениятабличногодокумента типузоратабличногодокумента типфайлатабличногодокумента точностьпечати чередованиерасположениястраниц ",z="отображениевремениэлементовпланировщика ",f="типфайлаформатированногодокумента ",k="обходрезультатазапроса типзаписизапроса ",u="видзаполнениярасшифровкипостроителяотчета типдобавленияпредставлений типизмеренияпостроителяотчета типразмещенияитогов ",y="доступкфайлу режимдиалогавыборафайла режимоткрытияфайла ",N="типизмеренияпостроителязапроса ",g="видданныханализа методкластеризации типединицыинтервалавременианализаданных типзаполнениятаблицырезультатаанализаданных типиспользованиячисловыхзначенийанализаданных типисточникаданныхпоискаассоциаций типколонкианализаданныхдереворешений типколонкианализаданныхкластеризация типколонкианализаданныхобщаястатистика типколонкианализаданныхпоискассоциаций типколонкианализаданныхпоискпоследовательностей типколонкимоделипрогноза типмерырасстоянияанализаданных типотсеченияправилассоциации типполяанализаданных типстандартизациианализаданных типупорядочиванияправилассоциациианализаданных типупорядочиванияшаблоновпоследовательностейанализаданных типупрощениядереварешений ",E="wsнаправлениепараметра вариантxpathxs вариантзаписидатыjson вариантпростоготипаxs видгруппымоделиxs видфасетаxdto действиепостроителяdom завершенностьпростоготипаxs завершенностьсоставноготипаxs завершенностьсхемыxs запрещенныеподстановкиxs исключениягруппподстановкиxs категорияиспользованияатрибутаxs категорияограниченияидентичностиxs категорияограниченияпространствименxs методнаследованияxs модельсодержимогоxs назначениетипаxml недопустимыеподстановкиxs обработкапробельныхсимволовxs обработкасодержимогоxs ограничениезначенияxs параметрыотбораузловdom переносстрокjson позициявдокументеdom пробельныесимволыxml типатрибутаxml типзначенияjson типканоническогоxml типкомпонентыxs типпроверкиxml типрезультатаdomxpath типузлаdom типузлаxml формаxml формапредставленияxs форматдатыjson экранированиесимволовjson ",M="видсравнениякомпоновкиданных действиеобработкирасшифровкикомпоновкиданных направлениесортировкикомпоновкиданных расположениевложенныхэлементоврезультатакомпоновкиданных расположениеитоговкомпоновкиданных расположениегруппировкикомпоновкиданных расположениеполейгруппировкикомпоновкиданных расположениеполякомпоновкиданных расположениереквизитовкомпоновкиданных расположениересурсовкомпоновкиданных типбухгалтерскогоостаткакомпоновкиданных типвыводатекстакомпоновкиданных типгруппировкикомпоновкиданных типгруппыэлементовотборакомпоновкиданных типдополненияпериодакомпоновкиданных типзаголовкаполейкомпоновкиданных типмакетагруппировкикомпоновкиданных типмакетаобластикомпоновкиданных типостаткакомпоновкиданных типпериодакомпоновкиданных типразмещениятекстакомпоновкиданных типсвязинаборовданныхкомпоновкиданных типэлементарезультатакомпоновкиданных расположениелегендыдиаграммыкомпоновкиданных типпримененияотборакомпоновкиданных режимотображенияэлементанастройкикомпоновкиданных режимотображениянастроеккомпоновкиданных состояниеэлементанастройкикомпоновкиданных способвосстановлениянастроеккомпоновкиданных режимкомпоновкирезультата использованиепараметракомпоновкиданных автопозицияресурсовкомпоновкиданных вариантиспользованиягруппировкикомпоновкиданных расположениересурсоввдиаграммекомпоновкиданных фиксациякомпоновкиданных использованиеусловногооформлениякомпоновкиданных ",_="важностьинтернетпочтовогосообщения обработкатекстаинтернетпочтовогосообщения способкодированияинтернетпочтовоговложения способкодированиянеasciiсимволовинтернетпочтовогосообщения типтекстапочтовогосообщения протоколинтернетпочты статусразборапочтовогосообщения ",v="режимтранзакциизаписижурналарегистрации статустранзакциизаписижурналарегистрации уровеньжурналарегистрации ",A="расположениехранилищасертификатовкриптографии режимвключениясертификатовкриптографии режимпроверкисертификатакриптографии типхранилищасертификатовкриптографии ",C="кодировкаименфайловвzipфайле методсжатияzip методшифрованияzip режимвосстановленияпутейфайловzip режимобработкиподкаталоговzip режимсохраненияпутейzip уровеньсжатияzip ",L="звуковоеоповещение направлениепереходакстроке позициявпотоке порядокбайтов режимблокировкиданных режимуправленияблокировкойданных сервисвстроенныхпокупок состояниефоновогозадания типподписчикадоставляемыхуведомлений уровеньиспользованиязащищенногосоединенияftp ",Z="направлениепорядкасхемызапроса типдополненияпериодамисхемызапроса типконтрольнойточкисхемызапроса типобъединениясхемызапроса типпараметрадоступнойтаблицысхемызапроса типсоединениясхемызапроса ",$="httpметод автоиспользованиеобщегореквизита автопрефиксномеразадачи вариантвстроенногоязыка видиерархии видрегистранакопления видтаблицывнешнегоисточникаданных записьдвиженийприпроведении заполнениепоследовательностей индексирование использованиебазыпланавидоврасчета использованиебыстроговыбора использованиеобщегореквизита использованиеподчинения использованиеполнотекстовогопоиска использованиеразделяемыхданныхобщегореквизита использованиереквизита назначениеиспользованияприложения назначениерасширенияконфигурации направлениепередачи обновлениепредопределенныхданных оперативноепроведение основноепредставлениевидарасчета основноепредставлениевидахарактеристики основноепредставлениезадачи основноепредставлениепланаобмена основноепредставлениесправочника основноепредставлениесчета перемещениеграницыприпроведении периодичностьномерабизнеспроцесса периодичностьномерадокумента периодичностьрегистрарасчета периодичностьрегистрасведений повторноеиспользованиевозвращаемыхзначений полнотекстовыйпоискпривводепостроке принадлежностьобъекта проведение разделениеаутентификацииобщегореквизита разделениеданныхобщегореквизита разделениерасширенийконфигурацииобщегореквизита режимавтонумерацииобъектов режимзаписирегистра режимиспользованиямодальности режимиспользованиясинхронныхвызововрасширенийплатформыивнешнихкомпонент режимповторногоиспользованиясеансов режимполученияданныхвыборапривводепостроке режимсовместимости режимсовместимостиинтерфейса режимуправленияблокировкойданныхпоумолчанию сериикодовпланавидовхарактеристик сериикодовпланасчетов сериикодовсправочника созданиепривводе способвыбора способпоискастрокипривводепостроке способредактирования типданныхтаблицывнешнегоисточникаданных типкодапланавидоврасчета типкодасправочника типмакета типномерабизнеспроцесса типномерадокумента типномеразадачи типформы удалениедвижений ",q="важностьпроблемыприменениярасширенияконфигурации вариантинтерфейсаклиентскогоприложения вариантмасштабаформклиентскогоприложения вариантосновногошрифтаклиентскогоприложения вариантстандартногопериода вариантстандартнойдатыначала видграницы видкартинки видотображенияполнотекстовогопоиска видрамки видсравнения видцвета видчисловогозначения видшрифта допустимаядлина допустимыйзнак использованиеbyteordermark использованиеметаданныхполнотекстовогопоиска источникрасширенийконфигурации клавиша кодвозвратадиалога кодировкаxbase кодировкатекста направлениепоиска направлениесортировки обновлениепредопределенныхданных обновлениеприизмененииданных отображениепанелиразделов проверказаполнения режимдиалогавопрос режимзапускаклиентскогоприложения режимокругления режимоткрытияформприложения режимполнотекстовогопоиска скоростьклиентскогосоединения состояниевнешнегоисточникаданных состояниеобновленияконфигурациибазыданных способвыборасертификатаwindows способкодированиястроки статуссообщения типвнешнейкомпоненты типплатформы типповеденияклавишиenter типэлементаинформацииовыполненииобновленияконфигурациибазыданных уровеньизоляциитранзакций хешфункция частидаты",B=p+b+w+h+j+z+f+k+u+y+N+g+E+M+_+v+A+C+L+Z+$+q,I="comобъект ftpсоединение httpзапрос httpсервисответ httpсоединение wsопределения wsпрокси xbase анализданных аннотацияxs блокировкаданных буфердвоичныхданных включениеxs выражениекомпоновкиданных генераторслучайныхчисел географическаясхема географическиекоординаты графическаясхема группамоделиxs данныерасшифровкикомпоновкиданных двоичныеданные дендрограмма диаграмма диаграммаганта диалогвыборафайла диалогвыборацвета диалогвыборашрифта диалограсписаниярегламентногозадания диалогредактированиястандартногопериода диапазон документdom документhtml документацияxs доставляемоеуведомление записьdom записьfastinfoset записьhtml записьjson записьxml записьzipфайла записьданных записьтекста записьузловdom запрос защищенноесоединениеopenssl значенияполейрасшифровкикомпоновкиданных извлечениетекста импортxs интернетпочта интернетпочтовоесообщение интернетпочтовыйпрофиль интернетпрокси интернетсоединение информациядляприложенияxs использованиеатрибутаxs использованиесобытияжурналарегистрации источникдоступныхнастроеккомпоновкиданных итераторузловdom картинка квалификаторыдаты квалификаторыдвоичныхданных квалификаторыстроки квалификаторычисла компоновщикмакетакомпоновкиданных компоновщикнастроеккомпоновкиданных конструктормакетаоформлениякомпоновкиданных конструкторнастроеккомпоновкиданных конструкторформатнойстроки линия макеткомпоновкиданных макетобластикомпоновкиданных макетоформлениякомпоновкиданных маскаxs менеджеркриптографии наборсхемxml настройкикомпоновкиданных настройкисериализацииjson обработкакартинок обработкарасшифровкикомпоновкиданных обходдереваdom объявлениеатрибутаxs объявлениенотацииxs объявлениеэлементаxs описаниеиспользованиясобытиядоступжурналарегистрации описаниеиспользованиясобытияотказвдоступежурналарегистрации описаниеобработкирасшифровкикомпоновкиданных описаниепередаваемогофайла описаниетипов определениегруппыатрибутовxs определениегруппымоделиxs определениеограниченияидентичностиxs определениепростоготипаxs определениесоставноготипаxs определениетипадокументаdom определенияxpathxs отборкомпоновкиданных пакетотображаемыхдокументов параметрвыбора параметркомпоновкиданных параметрызаписиjson параметрызаписиxml параметрычтенияxml переопределениеxs планировщик полеанализаданных полекомпоновкиданных построительdom построительзапроса построительотчета построительотчетаанализаданных построительсхемxml поток потоквпамяти почта почтовоесообщение преобразованиеxsl преобразованиекканоническомуxml процессорвыводарезультатакомпоновкиданныхвколлекциюзначений процессорвыводарезультатакомпоновкиданныхвтабличныйдокумент процессоркомпоновкиданных разыменовательпространствименdom рамка расписаниерегламентногозадания расширенноеимяxml результатчтенияданных своднаядиаграмма связьпараметравыбора связьпотипу связьпотипукомпоновкиданных сериализаторxdto сертификатклиентаwindows сертификатклиентафайл сертификаткриптографии сертификатыудостоверяющихцентровwindows сертификатыудостоверяющихцентровфайл сжатиеданных системнаяинформация сообщениепользователю сочетаниеклавиш сравнениезначений стандартнаядатаначала стандартныйпериод схемаxml схемакомпоновкиданных табличныйдокумент текстовыйдокумент тестируемоеприложение типданныхxml уникальныйидентификатор фабрикаxdto файл файловыйпоток фасетдлиныxs фасетколичестваразрядовдробнойчастиxs фасетмаксимальноговключающегозначенияxs фасетмаксимальногоисключающегозначенияxs фасетмаксимальнойдлиныxs фасетминимальноговключающегозначенияxs фасетминимальногоисключающегозначенияxs фасетминимальнойдлиныxs фасетобразцаxs фасетобщегоколичестваразрядовxs фасетперечисленияxs фасетпробельныхсимволовxs фильтрузловdom форматированнаястрока форматированныйдокумент фрагментxs хешированиеданных хранилищезначения цвет чтениеfastinfoset чтениеhtml чтениеjson чтениеxml чтениеzipфайла чтениеданных чтениетекста чтениеузловdom шрифт элементрезультатакомпоновкиданных ",P="comsafearray деревозначений массив соответствие списокзначений структура таблицазначений фиксированнаяструктура фиксированноесоответствие фиксированныймассив ",T=I+P,W="null истина ложь неопределено",D=s.inherit(s.NM),F={cN:"string",b:'"|\\|',e:'"|$',c:[{b:'""'}]},G={b:"'",e:"'",eB:!0,eE:!0,c:[{cN:"number",b:"\\d{4}([\\.\\\\/:-]?\\d{2}){0,5}"}]},H=s.inherit(s.CLCM),J={cN:"meta",l:x,b:"#|&",e:"$",k:{"meta-keyword":t+n},c:[H]},K={cN:"symbol",b:"~",e:";|:",eE:!0},O={cN:"function",l:x,v:[{b:"процедура|функция",e:"\\)",k:"процедура функция"},{b:"конецпроцедуры|конецфункции",k:"конецпроцедуры конецфункции"}],c:[{b:"\\(",e:"\\)",endsParent:!0,c:[{cN:"params",l:x,b:x,e:",",eE:!0,eW:!0,k:{keyword:"знач",literal:W},c:[D,F,G]},H]},s.inherit(s.TM,{b:x})]};return{cI:!0,l:x,k:{keyword:t,built_in:r,"class":B,type:T,literal:W},c:[J,O,H,K,D,F,G]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/abnf.js b/lib/highlight_js/assets/lang/abnf.js
new file mode 100644
index 00000000000..bfb51190999
--- /dev/null
+++ b/lib/highlight_js/assets/lang/abnf.js
@@ -0,0 +1 @@
+hljs.registerLanguage("abnf",function(e){var r={ruleDeclaration:"^[a-zA-Z][a-zA-Z0-9-]*",unexpectedChars:"[!@#$^&',?+~`|:]"},a=["ALPHA","BIT","CHAR","CR","CRLF","CTL","DIGIT","DQUOTE","HEXDIG","HTAB","LF","LWSP","OCTET","SP","VCHAR","WSP"],b=e.C(";","$"),c={cN:"symbol",b:/%b[0-1]+(-[0-1]+|(\.[0-1]+)+){0,1}/},l={cN:"symbol",b:/%d[0-9]+(-[0-9]+|(\.[0-9]+)+){0,1}/},n={cN:"symbol",b:/%x[0-9A-F]+(-[0-9A-F]+|(\.[0-9A-F]+)+){0,1}/},t={cN:"symbol",b:/%[si]/},s={b:r.ruleDeclaration+"\\s*=",rB:!0,e:/=/,r:0,c:[{cN:"attribute",b:r.ruleDeclaration}]};return{i:r.unexpectedChars,k:a.join(" "),c:[s,b,c,l,n,t,e.QSM,e.NM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/ada.js b/lib/highlight_js/assets/lang/ada.js
new file mode 100644
index 00000000000..80173739de7
--- /dev/null
+++ b/lib/highlight_js/assets/lang/ada.js
@@ -0,0 +1 @@
+hljs.registerLanguage("ada",function(e){var r="\\d(_|\\d)*",t="[eE][-+]?"+r,s=r+"(\\."+r+")?("+t+")?",n="\\w+",a=r+"#"+n+"(\\."+n+")?#("+t+")?",i="\\b("+a+"|"+s+")",c="[A-Za-z](_?[A-Za-z0-9.])*",o="[]{}%#'\"",b=e.C("--","$"),d={b:"\\s+:\\s+",e:"\\s*(:=|;|\\)|=>|$)",i:o,c:[{bK:"loop for declare others",endsParent:!0},{cN:"keyword",bK:"not null constant access function procedure in out aliased exception"},{cN:"type",b:c,endsParent:!0,r:0}]};return{cI:!0,k:{keyword:"abort else new return abs elsif not reverse abstract end accept entry select access exception of separate aliased exit or some all others subtype and for out synchronized array function overriding at tagged generic package task begin goto pragma terminate body private then if procedure type case in protected constant interface is raise use declare range delay limited record when delta loop rem while digits renames with do mod requeue xor",literal:"True False"},c:[b,{cN:"string",b:/"/,e:/"/,c:[{b:/""/,r:0}]},{cN:"string",b:/'.'/},{cN:"number",b:i,r:0},{cN:"symbol",b:"'"+c},{cN:"title",b:"(\\bwith\\s+)?(\\bprivate\\s+)?\\bpackage\\s+(\\bbody\\s+)?",e:"(is|$)",k:"package body",eB:!0,eE:!0,i:o},{b:"(\\b(with|overriding)\\s+)?\\b(function|procedure)\\s+",e:"(\\bis|\\bwith|\\brenames|\\)\\s*;)",k:"overriding function procedure with is renames return",rB:!0,c:[b,{cN:"title",b:"(\\bwith\\s+)?\\b(function|procedure)\\s+",e:"(\\(|\\s+|$)",eB:!0,eE:!0,i:o},d,{cN:"type",b:"\\breturn\\s+",e:"(\\s+|;|$)",k:"return",eB:!0,eE:!0,endsParent:!0,i:o}]},{cN:"type",b:"\\b(sub)?type\\s+",e:"\\s+",k:"type",eB:!0,i:o},d]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/arduino.js b/lib/highlight_js/assets/lang/arduino.js
index 29f63a22f2e..588bfe2c969 100644
--- a/lib/highlight_js/assets/lang/arduino.js
+++ b/lib/highlight_js/assets/lang/arduino.js
@@ -1 +1 @@
-hljs.registerLanguage("arduino",function(e){var t={cN:"string",v:[e.inherit(e.QSM,{b:'((u8?|U)|L)?"'}),{b:'(u8?|U)?R"',e:'"',c:[e.BE]},{b:"'\\\\?.",e:"'",i:"."}]},r={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef"},c:[{b:/\\\n/,r:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[e.inherit(t,{cN:"meta-string"}),{cN:"meta-string",b:"<",e:">",i:"\\n"}]},t,e.CLCM,e.CBCM]};return{k:{keyword:"boolean byte word string String array int float private char export virtual operator sizeof uint8_t uint16_t uint32_t uint64_t int8_t int16_t int32_t int64_t dynamic_cast typedef const_cast const struct static_cast union namespace unsigned long volatile static protected bool template mutable public friend auto void enum extern using class asm typeid short reinterpret_cast double register explicit signed typename this inline delete alignof constexpr decltype noexcept static_assert thread_local restrict _Bool complex _Complex _Imaginary atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong",built_in:"setup loop while catch for if do goto try switch case else default break continue return KeyboardController MouseController SoftwareSerial EthernetServer EthernetClient LiquidCrystal RobotControl GSMVoiceCall EthernetUDP EsploraTFT HttpClient RobotMotor WiFiClient GSMScanner FileSystem Scheduler GSMServer YunClient YunServer IPAddress GSMClient GSMModem Keyboard Ethernet Console GSMBand Esplora Stepper Process WiFiUDP GSM_SMS Mailbox USBHost Firmata PImage Client Server GSMPIN FileIO Bridge Serial EEPROM Stream Mouse Audio Servo File Task GPRS WiFi Wire TFT GSM SPI SD runShellCommandAsynchronously analogWriteResolution retrieveCallingNumber printFirmwareVersion analogReadResolution sendDigitalPortPair noListenOnLocalhost readJoystickButton setFirmwareVersion readJoystickSwitch scrollDisplayRight getVoiceCallStatus scrollDisplayLeft writeMicroseconds delayMicroseconds beginTransmission getSignalStrength runAsynchronously getAsynchronously listenOnLocalhost getCurrentCarrier readAccelerometer messageAvailable sendDigitalPorts lineFollowConfig countryNameWrite runShellCommand readStringUntil rewindDirectory readTemperature setClockDivider readLightSensor endTransmission analogReference detachInterrupt countryNameRead attachInterrupt encryptionType readBytesUntil robotNameWrite readMicrophone robotNameRead cityNameWrite userNameWrite readJoystickY readJoystickX mouseReleased openNextFile scanNetworks noInterrupts digitalWrite beginSpeaker mousePressed isActionDone mouseDragged displayLogos noAutoscroll addParameter remoteNumber getModifiers keyboardRead userNameRead waitContinue processInput parseCommand printVersion readNetworks writeMessage blinkVersion cityNameRead readMessage setDataMode parsePacket isListening setBitOrder beginPacket isDirectory motorsWrite drawCompass digitalRead clearScreen serialEvent rightToLeft setTextSize leftToRight requestFrom keyReleased compassRead analogWrite interrupts WiFiServer disconnect playMelody parseFloat autoscroll getPINUsed setPINUsed setTimeout sendAnalog readSlider analogRead beginWrite createChar motorsStop keyPressed tempoWrite readButton subnetMask debugPrint macAddress writeGreen randomSeed attachGPRS readString sendString remotePort releaseAll mouseMoved background getXChange getYChange answerCall getResult voiceCall endPacket constrain getSocket writeJSON getButton available connected findUntil readBytes exitValue readGreen writeBlue startLoop IPAddress isPressed sendSysex pauseMode gatewayIP setCursor getOemKey tuneWrite noDisplay loadImage switchPIN onRequest onReceive changePIN playFile noBuffer parseInt overflow checkPIN knobRead beginTFT bitClear updateIR bitWrite position writeRGB highByte writeRed setSpeed readBlue noStroke remoteIP transfer shutdown hangCall beginSMS endWrite attached maintain noCursor checkReg checkPUK shiftOut isValid shiftIn pulseIn connect println localIP pinMode getIMEI display noBlink process getBand running beginSD drawBMP lowByte setBand release bitRead prepare pointTo readRed setMode noFill remove listen stroke detach attach noTone exists buffer height bitSet circle config cursor random IRread setDNS endSMS getKey micros millis begin print write ready flush width isPIN blink clear press mkdir rmdir close point yield image BSSID click delay read text move peek beep rect line open seek fill size turn stop home find step tone sqrt RSSI SSID end bit tan cos sin pow map abs max min get run put",literal:"DIGITAL_MESSAGE FIRMATA_STRING ANALOG_MESSAGE REPORT_DIGITAL REPORT_ANALOG INPUT_PULLUP SET_PIN_MODE INTERNAL2V56 SYSTEM_RESET LED_BUILTIN INTERNAL1V1 SYSEX_START INTERNAL EXTERNAL DEFAULT OUTPUT INPUT HIGH LOW"},c:[r,e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("arduino",function(e){var t=e.getLanguage("cpp").exports;return{k:{keyword:"boolean byte word string String array "+t.k.keyword,built_in:"setup loop while catch for if do goto try switch case else default break continue return KeyboardController MouseController SoftwareSerial EthernetServer EthernetClient LiquidCrystal RobotControl GSMVoiceCall EthernetUDP EsploraTFT HttpClient RobotMotor WiFiClient GSMScanner FileSystem Scheduler GSMServer YunClient YunServer IPAddress GSMClient GSMModem Keyboard Ethernet Console GSMBand Esplora Stepper Process WiFiUDP GSM_SMS Mailbox USBHost Firmata PImage Client Server GSMPIN FileIO Bridge Serial EEPROM Stream Mouse Audio Servo File Task GPRS WiFi Wire TFT GSM SPI SD runShellCommandAsynchronously analogWriteResolution retrieveCallingNumber printFirmwareVersion analogReadResolution sendDigitalPortPair noListenOnLocalhost readJoystickButton setFirmwareVersion readJoystickSwitch scrollDisplayRight getVoiceCallStatus scrollDisplayLeft writeMicroseconds delayMicroseconds beginTransmission getSignalStrength runAsynchronously getAsynchronously listenOnLocalhost getCurrentCarrier readAccelerometer messageAvailable sendDigitalPorts lineFollowConfig countryNameWrite runShellCommand readStringUntil rewindDirectory readTemperature setClockDivider readLightSensor endTransmission analogReference detachInterrupt countryNameRead attachInterrupt encryptionType readBytesUntil robotNameWrite readMicrophone robotNameRead cityNameWrite userNameWrite readJoystickY readJoystickX mouseReleased openNextFile scanNetworks noInterrupts digitalWrite beginSpeaker mousePressed isActionDone mouseDragged displayLogos noAutoscroll addParameter remoteNumber getModifiers keyboardRead userNameRead waitContinue processInput parseCommand printVersion readNetworks writeMessage blinkVersion cityNameRead readMessage setDataMode parsePacket isListening setBitOrder beginPacket isDirectory motorsWrite drawCompass digitalRead clearScreen serialEvent rightToLeft setTextSize leftToRight requestFrom keyReleased compassRead analogWrite interrupts WiFiServer disconnect playMelody parseFloat autoscroll getPINUsed setPINUsed setTimeout sendAnalog readSlider analogRead beginWrite createChar motorsStop keyPressed tempoWrite readButton subnetMask debugPrint macAddress writeGreen randomSeed attachGPRS readString sendString remotePort releaseAll mouseMoved background getXChange getYChange answerCall getResult voiceCall endPacket constrain getSocket writeJSON getButton available connected findUntil readBytes exitValue readGreen writeBlue startLoop IPAddress isPressed sendSysex pauseMode gatewayIP setCursor getOemKey tuneWrite noDisplay loadImage switchPIN onRequest onReceive changePIN playFile noBuffer parseInt overflow checkPIN knobRead beginTFT bitClear updateIR bitWrite position writeRGB highByte writeRed setSpeed readBlue noStroke remoteIP transfer shutdown hangCall beginSMS endWrite attached maintain noCursor checkReg checkPUK shiftOut isValid shiftIn pulseIn connect println localIP pinMode getIMEI display noBlink process getBand running beginSD drawBMP lowByte setBand release bitRead prepare pointTo readRed setMode noFill remove listen stroke detach attach noTone exists buffer height bitSet circle config cursor random IRread setDNS endSMS getKey micros millis begin print write ready flush width isPIN blink clear press mkdir rmdir close point yield image BSSID click delay read text move peek beep rect line open seek fill size turn stop home find step tone sqrt RSSI SSID end bit tan cos sin pow map abs max min get run put",literal:"DIGITAL_MESSAGE FIRMATA_STRING ANALOG_MESSAGE REPORT_DIGITAL REPORT_ANALOG INPUT_PULLUP SET_PIN_MODE INTERNAL2V56 SYSTEM_RESET LED_BUILTIN INTERNAL1V1 SYSEX_START INTERNAL EXTERNAL DEFAULT OUTPUT INPUT HIGH LOW"},c:[t.preprocessor,e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/aspectj.js b/lib/highlight_js/assets/lang/aspectj.js
index 0609f5fb9ba..23e86c5cb8b 100644
--- a/lib/highlight_js/assets/lang/aspectj.js
+++ b/lib/highlight_js/assets/lang/aspectj.js
@@ -1 +1 @@
-hljs.registerLanguage("aspectj",function(e){var t="false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else extends implements break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws privileged aspectOf adviceexecution proceed cflowbelow cflow initialization preinitialization staticinitialization withincode target within execution getWithinTypeName handler thisJoinPoint thisJoinPointStaticPart thisEnclosingJoinPointStaticPart declare parents warning error soft precedence thisAspectInstance",i="get set args call";return{k:t,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"aspect",e:/[{;=]/,eE:!0,i:/[:;"\[\]]/,c:[{bK:"extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton"},e.UTM,{b:/\([^\)]*/,e:/[)]+/,k:t+" "+i,eE:!1}]},{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,r:0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"pointcut after before around throwing returning",e:/[)]/,eE:!1,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",rB:!0,c:[e.UTM]}]},{b:/[:]/,rB:!0,e:/[{;]/,r:0,eE:!1,k:t,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",k:t+" "+i},e.QSM]},{bK:"new throw",r:0},{cN:"function",b:/\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,rB:!0,e:/[{;=]/,k:t,eE:!0,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,r:0,k:t,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
+hljs.registerLanguage("aspectj",function(e){var t="false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else extends implements break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws privileged aspectOf adviceexecution proceed cflowbelow cflow initialization preinitialization staticinitialization withincode target within execution getWithinTypeName handler thisJoinPoint thisJoinPointStaticPart thisEnclosingJoinPointStaticPart declare parents warning error soft precedence thisAspectInstance",i="get set args call";return{k:t,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"aspect",e:/[{;=]/,eE:!0,i:/[:;"\[\]]/,c:[{bK:"extends implements pertypewithin perthis pertarget percflowbelow percflow issingleton"},e.UTM,{b:/\([^\)]*/,e:/[)]+/,k:t+" "+i,eE:!1}]},{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,r:0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"pointcut after before around throwing returning",e:/[)]/,eE:!1,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",rB:!0,c:[e.UTM]}]},{b:/[:]/,rB:!0,e:/[{;]/,r:0,eE:!1,k:t,i:/["\[\]]/,c:[{b:e.UIR+"\\s*\\(",k:t+" "+i,r:0},e.QSM]},{bK:"new throw",r:0},{cN:"function",b:/\w+ +\w+(\.)?\w+\s*\([^\)]*\)\s*((throws)[\w\s,]+)?[\{;]/,rB:!0,e:/[{;=]/,k:t,eE:!0,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,r:0,k:t,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},e.CNM,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/autohotkey.js b/lib/highlight_js/assets/lang/autohotkey.js
index 6d198ee2dae..58d677329a5 100644
--- a/lib/highlight_js/assets/lang/autohotkey.js
+++ b/lib/highlight_js/assets/lang/autohotkey.js
@@ -1 +1 @@
-hljs.registerLanguage("autohotkey",function(e){var r={b:/`[\s\S]/};return{cI:!0,k:{keyword:"Break Continue Else Gosub If Loop Return While",literal:"A|0 true false NOT AND OR",built_in:"ComSpec Clipboard ClipboardAll ErrorLevel"},c:[{cN:"built_in",b:"A_[a-zA-Z0-9]+"},r,e.inherit(e.QSM,{c:[r]}),e.C(";","$",{r:0}),{cN:"number",b:e.NR,r:0},{cN:"variable",b:"%",e:"%",i:"\\n",c:[r]},{cN:"symbol",c:[r],v:[{b:'^[^\\n";]+::(?!=)'},{b:'^[^\\n";]+:(?!=)',r:0}]},{b:",\\s*,"}]}});
\ No newline at end of file
+hljs.registerLanguage("autohotkey",function(e){var r={b:"`[\\s\\S]"};return{cI:!0,aliases:["ahk"],k:{keyword:"Break Continue Critical Exit ExitApp Gosub Goto New OnExit Pause return SetBatchLines SetTimer Suspend Thread Throw Until ahk_id ahk_class ahk_pid ahk_exe ahk_group",literal:"A|0 true false NOT AND OR",built_in:"ComSpec Clipboard ClipboardAll ErrorLevel"},c:[{cN:"built_in",b:"A_[a-zA-Z0-9]+"},r,e.inherit(e.QSM,{c:[r]}),e.C(";","$",{r:0}),e.CBCM,{cN:"number",b:e.NR,r:0},{cN:"subst",b:"%(?=[a-zA-Z0-9#_$@])",e:"%",i:"[^a-zA-Z0-9#_$@]"},{cN:"built_in",b:"^\\s*\\w+\\s*,"},{cN:"meta",b:"^\\s*#w+",e:"$",r:0},{cN:"symbol",c:[r],v:[{b:'^[^\\n";]+::(?!=)'},{b:'^[^\\n";]+:(?!=)',r:0}]},{b:",\\s*,"}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/autoit.js b/lib/highlight_js/assets/lang/autoit.js
index f92fa905a6e..805f8f76fb7 100644
--- a/lib/highlight_js/assets/lang/autoit.js
+++ b/lib/highlight_js/assets/lang/autoit.js
@@ -1,2 +1 @@
-hljs.registerLanguage("autoit",function(e){var t="ByRef Case Const ContinueCase ContinueLoop Default Dim Do Else ElseIf EndFunc EndIf EndSelect EndSwitch EndWith Enum Exit ExitLoop For Func Global If In Local Next ReDim Return Select Static Step Switch Then To Until Volatile WEnd While With",r="True False And Null Not Or",i="Abs ACos AdlibRegister AdlibUnRegister Asc AscW ASin Assign ATan AutoItSetOption AutoItWinGetTitle AutoItWinSetTitle Beep Binary BinaryLen BinaryMid BinaryToString BitAND BitNOT BitOR BitRotate BitShift BitXOR BlockInput Break Call CDTray Ceiling Chr ChrW ClipGet ClipPut ConsoleRead ConsoleWrite ConsoleWriteError ControlClick ControlCommand ControlDisable ControlEnable ControlFocus ControlGetFocus ControlGetHandle ControlGetPos ControlGetText ControlHide ControlListView ControlMove ControlSend ControlSetText ControlShow ControlTreeView Cos Dec DirCopy DirCreate DirGetSize DirMove DirRemove DllCall DllCallAddress DllCallbackFree DllCallbackGetPtr DllCallbackRegister DllClose DllOpen DllStructCreate DllStructGetData DllStructGetPtr DllStructGetSize DllStructSetData DriveGetDrive DriveGetFileSystem DriveGetLabel DriveGetSerial DriveGetType DriveMapAdd DriveMapDel DriveMapGet DriveSetLabel DriveSpaceFree DriveSpaceTotal DriveStatus EnvGet EnvSet EnvUpdate Eval Execute Exp FileChangeDir FileClose FileCopy FileCreateNTFSLink FileCreateShortcut FileDelete FileExists FileFindFirstFile FileFindNextFile FileFlush FileGetAttrib FileGetEncoding FileGetLongName FileGetPos FileGetShortcut FileGetShortName FileGetSize FileGetTime FileGetVersion FileInstall FileMove FileOpen FileOpenDialog FileRead FileReadLine FileReadToArray FileRecycle FileRecycleEmpty FileSaveDialog FileSelectFolder FileSetAttrib FileSetEnd FileSetPos FileSetTime FileWrite FileWriteLine Floor FtpSetProxy FuncName GUICreate GUICtrlCreateAvi GUICtrlCreateButton GUICtrlCreateCheckbox GUICtrlCreateCombo GUICtrlCreateContextMenu GUICtrlCreateDate GUICtrlCreateDummy GUICtrlCreateEdit GUICtrlCreateGraphic GUICtrlCreateGroup GUICtrlCreateIcon GUICtrlCreateInput GUICtrlCreateLabel GUICtrlCreateList GUICtrlCreateListView GUICtrlCreateListViewItem GUICtrlCreateMenu GUICtrlCreateMenuItem GUICtrlCreateMonthCal GUICtrlCreateObj GUICtrlCreatePic GUICtrlCreateProgress GUICtrlCreateRadio GUICtrlCreateSlider GUICtrlCreateTab GUICtrlCreateTabItem GUICtrlCreateTreeView GUICtrlCreateTreeViewItem GUICtrlCreateUpdown GUICtrlDelete GUICtrlGetHandle GUICtrlGetState GUICtrlRead GUICtrlRecvMsg GUICtrlRegisterListViewSort GUICtrlSendMsg GUICtrlSendToDummy GUICtrlSetBkColor GUICtrlSetColor GUICtrlSetCursor GUICtrlSetData GUICtrlSetDefBkColor GUICtrlSetDefColor GUICtrlSetFont GUICtrlSetGraphic GUICtrlSetImage GUICtrlSetLimit GUICtrlSetOnEvent GUICtrlSetPos GUICtrlSetResizing GUICtrlSetState GUICtrlSetStyle GUICtrlSetTip GUIDelete GUIGetCursorInfo GUIGetMsg GUIGetStyle GUIRegisterMsg GUISetAccelerators GUISetBkColor GUISetCoord GUISetCursor GUISetFont GUISetHelp GUISetIcon GUISetOnEvent GUISetState GUISetStyle GUIStartGroup GUISwitch Hex HotKeySet HttpSetProxy HttpSetUserAgent HWnd InetClose InetGet InetGetInfo InetGetSize InetRead IniDelete IniRead IniReadSection IniReadSectionNames IniRenameSection IniWrite IniWriteSection InputBox Int IsAdmin IsArray IsBinary IsBool IsDeclared IsDllStruct IsFloat IsFunc IsHWnd IsInt IsKeyword IsNumber IsObj IsPtr IsString Log MemGetStats Mod MouseClick MouseClickDrag MouseDown MouseGetCursor MouseGetPos MouseMove MouseUp MouseWheel MsgBox Number ObjCreate ObjCreateInterface ObjEvent ObjGet ObjName OnAutoItExitRegister OnAutoItExitUnRegister Opt Ping PixelChecksum PixelGetColor PixelSearch ProcessClose ProcessExists ProcessGetStats ProcessList ProcessSetPriority ProcessWait ProcessWaitClose ProgressOff ProgressOn ProgressSet Ptr Random RegDelete RegEnumKey RegEnumVal RegRead RegWrite Round Run RunAs RunAsWait RunWait Send SendKeepActive SetError SetExtended ShellExecute ShellExecuteWait Shutdown Sin Sleep SoundPlay SoundSetWaveVolume SplashImageOn SplashOff SplashTextOn Sqrt SRandom StatusbarGetText StderrRead StdinWrite StdioClose StdoutRead String StringAddCR StringCompare StringFormat StringFromASCIIArray StringInStr StringIsAlNum StringIsAlpha StringIsASCII StringIsDigit StringIsFloat StringIsInt StringIsLower StringIsSpace StringIsUpper StringIsXDigit StringLeft StringLen StringLower StringMid StringRegExp StringRegExpReplace StringReplace StringReverse StringRight StringSplit StringStripCR StringStripWS StringToASCIIArray StringToBinary StringTrimLeft StringTrimRight StringUpper Tan TCPAccept TCPCloseSocket TCPConnect TCPListen TCPNameToIP TCPRecv TCPSend TCPShutdown TCPStartup TimerDiff TimerInit ToolTip TrayCreateItem TrayCreateMenu TrayGetMsg TrayItemDelete TrayItemGetHandle TrayItemGetState TrayItemGetText TrayItemSetOnEvent TrayItemSetState TrayItemSetText TraySetClick TraySetIcon TraySetOnEvent TraySetPauseIcon TraySetState TraySetToolTip TrayTip UBound UDPBind UDPCloseSocket UDPOpen UDPRecv UDPSend UDPShutdown UDPStartup VarGetType WinActivate WinActive WinClose WinExists WinFlash WinGetCaretPos WinGetClassList WinGetClientSize WinGetHandle WinGetPos WinGetProcess WinGetState WinGetText WinGetTitle WinKill WinList WinMenuSelectItem WinMinimizeAll WinMinimizeAllUndo WinMove WinSetOnTop WinSetState WinSetTitle WinSetTrans WinWait WinWaitActive WinWaitClose WinWaitNotActive Array1DToHistogram ArrayAdd ArrayBinarySearch ArrayColDelete ArrayColInsert ArrayCombinations ArrayConcatenate ArrayDelete ArrayDisplay ArrayExtract ArrayFindAll ArrayInsert ArrayMax ArrayMaxIndex ArrayMin ArrayMinIndex ArrayPermute ArrayPop ArrayPush ArrayReverse ArraySearch ArrayShuffle ArraySort ArraySwap ArrayToClip ArrayToString ArrayTranspose ArrayTrim ArrayUnique Assert ChooseColor ChooseFont ClipBoard_ChangeChain ClipBoard_Close ClipBoard_CountFormats ClipBoard_Empty ClipBoard_EnumFormats ClipBoard_FormatStr ClipBoard_GetData ClipBoard_GetDataEx ClipBoard_GetFormatName ClipBoard_GetOpenWindow ClipBoard_GetOwner ClipBoard_GetPriorityFormat ClipBoard_GetSequenceNumber ClipBoard_GetViewer ClipBoard_IsFormatAvailable ClipBoard_Open ClipBoard_RegisterFormat ClipBoard_SetData ClipBoard_SetDataEx ClipBoard_SetViewer ClipPutFile ColorConvertHSLtoRGB ColorConvertRGBtoHSL ColorGetBlue ColorGetCOLORREF ColorGetGreen ColorGetRed ColorGetRGB ColorSetCOLORREF ColorSetRGB Crypt_DecryptData Crypt_DecryptFile Crypt_DeriveKey Crypt_DestroyKey Crypt_EncryptData Crypt_EncryptFile Crypt_GenRandom Crypt_HashData Crypt_HashFile Crypt_Shutdown Crypt_Startup DateAdd DateDayOfWeek DateDaysInMonth DateDiff DateIsLeapYear DateIsValid DateTimeFormat DateTimeSplit DateToDayOfWeek DateToDayOfWeekISO DateToDayValue DateToMonth Date_Time_CompareFileTime Date_Time_DOSDateTimeToArray Date_Time_DOSDateTimeToFileTime Date_Time_DOSDateTimeToStr Date_Time_DOSDateToArray Date_Time_DOSDateToStr Date_Time_DOSTimeToArray Date_Time_DOSTimeToStr Date_Time_EncodeFileTime Date_Time_EncodeSystemTime Date_Time_FileTimeToArray Date_Time_FileTimeToDOSDateTime Date_Time_FileTimeToLocalFileTime Date_Time_FileTimeToStr Date_Time_FileTimeToSystemTime Date_Time_GetFileTime Date_Time_GetLocalTime Date_Time_GetSystemTime Date_Time_GetSystemTimeAdjustment Date_Time_GetSystemTimeAsFileTime Date_Time_GetSystemTimes Date_Time_GetTickCount Date_Time_GetTimeZoneInformation Date_Time_LocalFileTimeToFileTime Date_Time_SetFileTime Date_Time_SetLocalTime Date_Time_SetSystemTime Date_Time_SetSystemTimeAdjustment Date_Time_SetTimeZoneInformation Date_Time_SystemTimeToArray Date_Time_SystemTimeToDateStr Date_Time_SystemTimeToDateTimeStr Date_Time_SystemTimeToFileTime Date_Time_SystemTimeToTimeStr Date_Time_SystemTimeToTzSpecificLocalTime Date_Time_TzSpecificLocalTimeToSystemTime DayValueToDate DebugBugReportEnv DebugCOMError DebugOut DebugReport DebugReportEx DebugReportVar DebugSetup Degree EventLog__Backup EventLog__Clear EventLog__Close EventLog__Count EventLog__DeregisterSource EventLog__Full EventLog__Notify EventLog__Oldest EventLog__Open EventLog__OpenBackup EventLog__Read EventLog__RegisterSource EventLog__Report Excel_BookAttach Excel_BookClose Excel_BookList Excel_BookNew Excel_BookOpen Excel_BookOpenText Excel_BookSave Excel_BookSaveAs Excel_Close Excel_ColumnToLetter Excel_ColumnToNumber Excel_ConvertFormula Excel_Export Excel_FilterGet Excel_FilterSet Excel_Open Excel_PictureAdd Excel_Print Excel_RangeCopyPaste Excel_RangeDelete Excel_RangeFind Excel_RangeInsert Excel_RangeLinkAddRemove Excel_RangeRead Excel_RangeReplace Excel_RangeSort Excel_RangeValidate Excel_RangeWrite Excel_SheetAdd Excel_SheetCopyMove Excel_SheetDelete Excel_SheetList FileCountLines FileCreate FileListToArray FileListToArrayRec FilePrint FileReadToArray FileWriteFromArray FileWriteLog FileWriteToLine FTP_Close FTP_Command FTP_Connect FTP_DecodeInternetStatus FTP_DirCreate FTP_DirDelete FTP_DirGetCurrent FTP_DirPutContents FTP_DirSetCurrent FTP_FileClose FTP_FileDelete FTP_FileGet FTP_FileGetSize FTP_FileOpen FTP_FilePut FTP_FileRead FTP_FileRename FTP_FileTimeLoHiToStr FTP_FindFileClose FTP_FindFileFirst FTP_FindFileNext FTP_GetLastResponseInfo FTP_ListToArray FTP_ListToArray2D FTP_ListToArrayEx FTP_Open FTP_ProgressDownload FTP_ProgressUpload FTP_SetStatusCallback GDIPlus_ArrowCapCreate GDIPlus_ArrowCapDispose GDIPlus_ArrowCapGetFillState GDIPlus_ArrowCapGetHeight GDIPlus_ArrowCapGetMiddleInset GDIPlus_ArrowCapGetWidth GDIPlus_ArrowCapSetFillState GDIPlus_ArrowCapSetHeight GDIPlus_ArrowCapSetMiddleInset GDIPlus_ArrowCapSetWidth GDIPlus_BitmapApplyEffect GDIPlus_BitmapApplyEffectEx GDIPlus_BitmapCloneArea GDIPlus_BitmapConvertFormat GDIPlus_BitmapCreateApplyEffect GDIPlus_BitmapCreateApplyEffectEx GDIPlus_BitmapCreateDIBFromBitmap GDIPlus_BitmapCreateFromFile GDIPlus_BitmapCreateFromGraphics GDIPlus_BitmapCreateFromHBITMAP GDIPlus_BitmapCreateFromHICON GDIPlus_BitmapCreateFromHICON32 GDIPlus_BitmapCreateFromMemory GDIPlus_BitmapCreateFromResource GDIPlus_BitmapCreateFromScan0 GDIPlus_BitmapCreateFromStream GDIPlus_BitmapCreateHBITMAPFromBitmap GDIPlus_BitmapDispose GDIPlus_BitmapGetHistogram GDIPlus_BitmapGetHistogramEx GDIPlus_BitmapGetHistogramSize GDIPlus_BitmapGetPixel GDIPlus_BitmapLockBits GDIPlus_BitmapSetPixel GDIPlus_BitmapUnlockBits GDIPlus_BrushClone GDIPlus_BrushCreateSolid GDIPlus_BrushDispose GDIPlus_BrushGetSolidColor GDIPlus_BrushGetType GDIPlus_BrushSetSolidColor GDIPlus_ColorMatrixCreate GDIPlus_ColorMatrixCreateGrayScale GDIPlus_ColorMatrixCreateNegative GDIPlus_ColorMatrixCreateSaturation GDIPlus_ColorMatrixCreateScale GDIPlus_ColorMatrixCreateTranslate GDIPlus_CustomLineCapClone GDIPlus_CustomLineCapCreate GDIPlus_CustomLineCapDispose GDIPlus_CustomLineCapGetStrokeCaps GDIPlus_CustomLineCapSetStrokeCaps GDIPlus_Decoders GDIPlus_DecodersGetCount GDIPlus_DecodersGetSize GDIPlus_DrawImageFX GDIPlus_DrawImageFXEx GDIPlus_DrawImagePoints GDIPlus_EffectCreate GDIPlus_EffectCreateBlur GDIPlus_EffectCreateBrightnessContrast GDIPlus_EffectCreateColorBalance GDIPlus_EffectCreateColorCurve GDIPlus_EffectCreateColorLUT GDIPlus_EffectCreateColorMatrix GDIPlus_EffectCreateHueSaturationLightness GDIPlus_EffectCreateLevels GDIPlus_EffectCreateRedEyeCorrection GDIPlus_EffectCreateSharpen GDIPlus_EffectCreateTint GDIPlus_EffectDispose GDIPlus_EffectGetParameters GDIPlus_EffectSetParameters GDIPlus_Encoders GDIPlus_EncodersGetCLSID GDIPlus_EncodersGetCount GDIPlus_EncodersGetParamList GDIPlus_EncodersGetParamListSize GDIPlus_EncodersGetSize GDIPlus_FontCreate GDIPlus_FontDispose GDIPlus_FontFamilyCreate GDIPlus_FontFamilyCreateFromCollection GDIPlus_FontFamilyDispose GDIPlus_FontFamilyGetCellAscent GDIPlus_FontFamilyGetCellDescent GDIPlus_FontFamilyGetEmHeight GDIPlus_FontFamilyGetLineSpacing GDIPlus_FontGetHeight GDIPlus_FontPrivateAddFont GDIPlus_FontPrivateAddMemoryFont GDIPlus_FontPrivateCollectionDispose GDIPlus_FontPrivateCreateCollection GDIPlus_GraphicsClear GDIPlus_GraphicsCreateFromHDC GDIPlus_GraphicsCreateFromHWND GDIPlus_GraphicsDispose GDIPlus_GraphicsDrawArc GDIPlus_GraphicsDrawBezier GDIPlus_GraphicsDrawClosedCurve GDIPlus_GraphicsDrawClosedCurve2 GDIPlus_GraphicsDrawCurve GDIPlus_GraphicsDrawCurve2 GDIPlus_GraphicsDrawEllipse GDIPlus_GraphicsDrawImage GDIPlus_GraphicsDrawImagePointsRect GDIPlus_GraphicsDrawImageRect GDIPlus_GraphicsDrawImageRectRect GDIPlus_GraphicsDrawLine GDIPlus_GraphicsDrawPath GDIPlus_GraphicsDrawPie GDIPlus_GraphicsDrawPolygon GDIPlus_GraphicsDrawRect GDIPlus_GraphicsDrawString GDIPlus_GraphicsDrawStringEx GDIPlus_GraphicsFillClosedCurve GDIPlus_GraphicsFillClosedCurve2 GDIPlus_GraphicsFillEllipse GDIPlus_GraphicsFillPath GDIPlus_GraphicsFillPie GDIPlus_GraphicsFillPolygon GDIPlus_GraphicsFillRect GDIPlus_GraphicsFillRegion GDIPlus_GraphicsGetCompositingMode GDIPlus_GraphicsGetCompositingQuality GDIPlus_GraphicsGetDC GDIPlus_GraphicsGetInterpolationMode GDIPlus_GraphicsGetSmoothingMode GDIPlus_GraphicsGetTransform GDIPlus_GraphicsMeasureCharacterRanges GDIPlus_GraphicsMeasureString GDIPlus_GraphicsReleaseDC GDIPlus_GraphicsResetClip GDIPlus_GraphicsResetTransform GDIPlus_GraphicsRestore GDIPlus_GraphicsRotateTransform GDIPlus_GraphicsSave GDIPlus_GraphicsScaleTransform GDIPlus_GraphicsSetClipPath GDIPlus_GraphicsSetClipRect GDIPlus_GraphicsSetClipRegion GDIPlus_GraphicsSetCompositingMode GDIPlus_GraphicsSetCompositingQuality GDIPlus_GraphicsSetInterpolationMode GDIPlus_GraphicsSetPixelOffsetMode GDIPlus_GraphicsSetSmoothingMode GDIPlus_GraphicsSetTextRenderingHint GDIPlus_GraphicsSetTransform GDIPlus_GraphicsTransformPoints GDIPlus_GraphicsTranslateTransform GDIPlus_HatchBrushCreate GDIPlus_HICONCreateFromBitmap GDIPlus_ImageAttributesCreate GDIPlus_ImageAttributesDispose GDIPlus_ImageAttributesSetColorKeys GDIPlus_ImageAttributesSetColorMatrix GDIPlus_ImageDispose GDIPlus_ImageGetDimension GDIPlus_ImageGetFlags GDIPlus_ImageGetGraphicsContext GDIPlus_ImageGetHeight GDIPlus_ImageGetHorizontalResolution GDIPlus_ImageGetPixelFormat GDIPlus_ImageGetRawFormat GDIPlus_ImageGetThumbnail GDIPlus_ImageGetType GDIPlus_ImageGetVerticalResolution GDIPlus_ImageGetWidth GDIPlus_ImageLoadFromFile GDIPlus_ImageLoadFromStream GDIPlus_ImageResize GDIPlus_ImageRotateFlip GDIPlus_ImageSaveToFile GDIPlus_ImageSaveToFileEx GDIPlus_ImageSaveToStream GDIPlus_ImageScale GDIPlus_LineBrushCreate GDIPlus_LineBrushCreateFromRect GDIPlus_LineBrushCreateFromRectWithAngle GDIPlus_LineBrushGetColors GDIPlus_LineBrushGetRect GDIPlus_LineBrushMultiplyTransform GDIPlus_LineBrushResetTransform GDIPlus_LineBrushSetBlend GDIPlus_LineBrushSetColors GDIPlus_LineBrushSetGammaCorrection GDIPlus_LineBrushSetLinearBlend GDIPlus_LineBrushSetPresetBlend GDIPlus_LineBrushSetSigmaBlend GDIPlus_LineBrushSetTransform GDIPlus_MatrixClone GDIPlus_MatrixCreate GDIPlus_MatrixDispose GDIPlus_MatrixGetElements GDIPlus_MatrixInvert GDIPlus_MatrixMultiply GDIPlus_MatrixRotate GDIPlus_MatrixScale GDIPlus_MatrixSetElements GDIPlus_MatrixShear GDIPlus_MatrixTransformPoints GDIPlus_MatrixTranslate GDIPlus_PaletteInitialize GDIPlus_ParamAdd GDIPlus_ParamInit GDIPlus_ParamSize GDIPlus_PathAddArc GDIPlus_PathAddBezier GDIPlus_PathAddClosedCurve GDIPlus_PathAddClosedCurve2 GDIPlus_PathAddCurve GDIPlus_PathAddCurve2 GDIPlus_PathAddCurve3 GDIPlus_PathAddEllipse GDIPlus_PathAddLine GDIPlus_PathAddLine2 GDIPlus_PathAddPath GDIPlus_PathAddPie GDIPlus_PathAddPolygon GDIPlus_PathAddRectangle GDIPlus_PathAddString GDIPlus_PathBrushCreate GDIPlus_PathBrushCreateFromPath GDIPlus_PathBrushGetCenterPoint GDIPlus_PathBrushGetFocusScales GDIPlus_PathBrushGetPointCount GDIPlus_PathBrushGetRect GDIPlus_PathBrushGetWrapMode GDIPlus_PathBrushMultiplyTransform GDIPlus_PathBrushResetTransform GDIPlus_PathBrushSetBlend GDIPlus_PathBrushSetCenterColor GDIPlus_PathBrushSetCenterPoint GDIPlus_PathBrushSetFocusScales GDIPlus_PathBrushSetGammaCorrection GDIPlus_PathBrushSetLinearBlend GDIPlus_PathBrushSetPresetBlend GDIPlus_PathBrushSetSigmaBlend GDIPlus_PathBrushSetSurroundColor GDIPlus_PathBrushSetSurroundColorsWithCount GDIPlus_PathBrushSetTransform GDIPlus_PathBrushSetWrapMode GDIPlus_PathClone GDIPlus_PathCloseFigure GDIPlus_PathCreate GDIPlus_PathCreate2 GDIPlus_PathDispose GDIPlus_PathFlatten GDIPlus_PathGetData GDIPlus_PathGetFillMode GDIPlus_PathGetLastPoint GDIPlus_PathGetPointCount GDIPlus_PathGetPoints GDIPlus_PathGetWorldBounds GDIPlus_PathIsOutlineVisiblePoint GDIPlus_PathIsVisiblePoint GDIPlus_PathIterCreate GDIPlus_PathIterDispose GDIPlus_PathIterGetSubpathCount GDIPlus_PathIterNextMarkerPath GDIPlus_PathIterNextSubpathPath GDIPlus_PathIterRewind GDIPlus_PathReset GDIPlus_PathReverse GDIPlus_PathSetFillMode GDIPlus_PathSetMarker GDIPlus_PathStartFigure GDIPlus_PathTransform GDIPlus_PathWarp GDIPlus_PathWiden GDIPlus_PathWindingModeOutline GDIPlus_PenCreate GDIPlus_PenCreate2 GDIPlus_PenDispose GDIPlus_PenGetAlignment GDIPlus_PenGetColor GDIPlus_PenGetCustomEndCap GDIPlus_PenGetDashCap GDIPlus_PenGetDashStyle GDIPlus_PenGetEndCap GDIPlus_PenGetMiterLimit GDIPlus_PenGetWidth GDIPlus_PenSetAlignment GDIPlus_PenSetColor GDIPlus_PenSetCustomEndCap GDIPlus_PenSetDashCap GDIPlus_PenSetDashStyle GDIPlus_PenSetEndCap GDIPlus_PenSetLineCap GDIPlus_PenSetLineJoin GDIPlus_PenSetMiterLimit GDIPlus_PenSetStartCap GDIPlus_PenSetWidth GDIPlus_RectFCreate GDIPlus_RegionClone GDIPlus_RegionCombinePath GDIPlus_RegionCombineRect GDIPlus_RegionCombineRegion GDIPlus_RegionCreate GDIPlus_RegionCreateFromPath GDIPlus_RegionCreateFromRect GDIPlus_RegionDispose GDIPlus_RegionGetBounds GDIPlus_RegionGetHRgn GDIPlus_RegionTransform GDIPlus_RegionTranslate GDIPlus_Shutdown GDIPlus_Startup GDIPlus_StringFormatCreate GDIPlus_StringFormatDispose GDIPlus_StringFormatGetMeasurableCharacterRangeCount GDIPlus_StringFormatSetAlign GDIPlus_StringFormatSetLineAlign GDIPlus_StringFormatSetMeasurableCharacterRanges GDIPlus_TextureCreate GDIPlus_TextureCreate2 GDIPlus_TextureCreateIA GetIP GUICtrlAVI_Close GUICtrlAVI_Create GUICtrlAVI_Destroy GUICtrlAVI_IsPlaying GUICtrlAVI_Open GUICtrlAVI_OpenEx GUICtrlAVI_Play GUICtrlAVI_Seek GUICtrlAVI_Show GUICtrlAVI_Stop GUICtrlButton_Click GUICtrlButton_Create GUICtrlButton_Destroy GUICtrlButton_Enable GUICtrlButton_GetCheck GUICtrlButton_GetFocus GUICtrlButton_GetIdealSize GUICtrlButton_GetImage GUICtrlButton_GetImageList GUICtrlButton_GetNote GUICtrlButton_GetNoteLength GUICtrlButton_GetSplitInfo GUICtrlButton_GetState GUICtrlButton_GetText GUICtrlButton_GetTextMargin GUICtrlButton_SetCheck GUICtrlButton_SetDontClick GUICtrlButton_SetFocus GUICtrlButton_SetImage GUICtrlButton_SetImageList GUICtrlButton_SetNote GUICtrlButton_SetShield GUICtrlButton_SetSize GUICtrlButton_SetSplitInfo GUICtrlButton_SetState GUICtrlButton_SetStyle GUICtrlButton_SetText GUICtrlButton_SetTextMargin GUICtrlButton_Show GUICtrlComboBoxEx_AddDir GUICtrlComboBoxEx_AddString GUICtrlComboBoxEx_BeginUpdate GUICtrlComboBoxEx_Create GUICtrlComboBoxEx_CreateSolidBitMap GUICtrlComboBoxEx_DeleteString GUICtrlComboBoxEx_Destroy GUICtrlComboBoxEx_EndUpdate GUICtrlComboBoxEx_FindStringExact GUICtrlComboBoxEx_GetComboBoxInfo GUICtrlComboBoxEx_GetComboControl GUICtrlComboBoxEx_GetCount GUICtrlComboBoxEx_GetCurSel GUICtrlComboBoxEx_GetDroppedControlRect GUICtrlComboBoxEx_GetDroppedControlRectEx GUICtrlComboBoxEx_GetDroppedState GUICtrlComboBoxEx_GetDroppedWidth GUICtrlComboBoxEx_GetEditControl GUICtrlComboBoxEx_GetEditSel GUICtrlComboBoxEx_GetEditText GUICtrlComboBoxEx_GetExtendedStyle GUICtrlComboBoxEx_GetExtendedUI GUICtrlComboBoxEx_GetImageList GUICtrlComboBoxEx_GetItem GUICtrlComboBoxEx_GetItemEx GUICtrlComboBoxEx_GetItemHeight GUICtrlComboBoxEx_GetItemImage GUICtrlComboBoxEx_GetItemIndent GUICtrlComboBoxEx_GetItemOverlayImage GUICtrlComboBoxEx_GetItemParam GUICtrlComboBoxEx_GetItemSelectedImage GUICtrlComboBoxEx_GetItemText GUICtrlComboBoxEx_GetItemTextLen GUICtrlComboBoxEx_GetList GUICtrlComboBoxEx_GetListArray GUICtrlComboBoxEx_GetLocale GUICtrlComboBoxEx_GetLocaleCountry GUICtrlComboBoxEx_GetLocaleLang GUICtrlComboBoxEx_GetLocalePrimLang GUICtrlComboBoxEx_GetLocaleSubLang GUICtrlComboBoxEx_GetMinVisible GUICtrlComboBoxEx_GetTopIndex GUICtrlComboBoxEx_GetUnicode GUICtrlComboBoxEx_InitStorage GUICtrlComboBoxEx_InsertString GUICtrlComboBoxEx_LimitText GUICtrlComboBoxEx_ReplaceEditSel GUICtrlComboBoxEx_ResetContent GUICtrlComboBoxEx_SetCurSel GUICtrlComboBoxEx_SetDroppedWidth GUICtrlComboBoxEx_SetEditSel GUICtrlComboBoxEx_SetEditText GUICtrlComboBoxEx_SetExtendedStyle GUICtrlComboBoxEx_SetExtendedUI GUICtrlComboBoxEx_SetImageList GUICtrlComboBoxEx_SetItem GUICtrlComboBoxEx_SetItemEx GUICtrlComboBoxEx_SetItemHeight GUICtrlComboBoxEx_SetItemImage GUICtrlComboBoxEx_SetItemIndent GUICtrlComboBoxEx_SetItemOverlayImage GUICtrlComboBoxEx_SetItemParam GUICtrlComboBoxEx_SetItemSelectedImage GUICtrlComboBoxEx_SetMinVisible GUICtrlComboBoxEx_SetTopIndex GUICtrlComboBoxEx_SetUnicode GUICtrlComboBoxEx_ShowDropDown GUICtrlComboBox_AddDir GUICtrlComboBox_AddString GUICtrlComboBox_AutoComplete GUICtrlComboBox_BeginUpdate GUICtrlComboBox_Create GUICtrlComboBox_DeleteString GUICtrlComboBox_Destroy GUICtrlComboBox_EndUpdate GUICtrlComboBox_FindString GUICtrlComboBox_FindStringExact GUICtrlComboBox_GetComboBoxInfo GUICtrlComboBox_GetCount GUICtrlComboBox_GetCueBanner GUICtrlComboBox_GetCurSel GUICtrlComboBox_GetDroppedControlRect GUICtrlComboBox_GetDroppedControlRectEx GUICtrlComboBox_GetDroppedState GUICtrlComboBox_GetDroppedWidth GUICtrlComboBox_GetEditSel GUICtrlComboBox_GetEditText GUICtrlComboBox_GetExtendedUI GUICtrlComboBox_GetHorizontalExtent GUICtrlComboBox_GetItemHeight GUICtrlComboBox_GetLBText GUICtrlComboBox_GetLBTextLen GUICtrlComboBox_GetList GUICtrlComboBox_GetListArray GUICtrlComboBox_GetLocale GUICtrlComboBox_GetLocaleCountry GUICtrlComboBox_GetLocaleLang GUICtrlComboBox_GetLocalePrimLang GUICtrlComboBox_GetLocaleSubLang GUICtrlComboBox_GetMinVisible GUICtrlComboBox_GetTopIndex GUICtrlComboBox_InitStorage GUICtrlComboBox_InsertString GUICtrlComboBox_LimitText GUICtrlComboBox_ReplaceEditSel GUICtrlComboBox_ResetContent GUICtrlComboBox_SelectString GUICtrlComboBox_SetCueBanner GUICtrlComboBox_SetCurSel GUICtrlComboBox_SetDroppedWidth GUICtrlComboBox_SetEditSel GUICtrlComboBox_SetEditText GUICtrlComboBox_SetExtendedUI GUICtrlComboBox_SetHorizontalExtent GUICtrlComboBox_SetItemHeight GUICtrlComboBox_SetMinVisible GUICtrlComboBox_SetTopIndex GUICtrlComboBox_ShowDropDown GUICtrlDTP_Create GUICtrlDTP_Destroy GUICtrlDTP_GetMCColor GUICtrlDTP_GetMCFont GUICtrlDTP_GetMonthCal GUICtrlDTP_GetRange GUICtrlDTP_GetRangeEx GUICtrlDTP_GetSystemTime GUICtrlDTP_GetSystemTimeEx GUICtrlDTP_SetFormat GUICtrlDTP_SetMCColor GUICtrlDTP_SetMCFont GUICtrlDTP_SetRange GUICtrlDTP_SetRangeEx GUICtrlDTP_SetSystemTime GUICtrlDTP_SetSystemTimeEx GUICtrlEdit_AppendText GUICtrlEdit_BeginUpdate GUICtrlEdit_CanUndo GUICtrlEdit_CharFromPos GUICtrlEdit_Create GUICtrlEdit_Destroy GUICtrlEdit_EmptyUndoBuffer GUICtrlEdit_EndUpdate GUICtrlEdit_Find GUICtrlEdit_FmtLines GUICtrlEdit_GetCueBanner GUICtrlEdit_GetFirstVisibleLine GUICtrlEdit_GetLimitText GUICtrlEdit_GetLine GUICtrlEdit_GetLineCount GUICtrlEdit_GetMargins GUICtrlEdit_GetModify GUICtrlEdit_GetPasswordChar GUICtrlEdit_GetRECT GUICtrlEdit_GetRECTEx GUICtrlEdit_GetSel GUICtrlEdit_GetText GUICtrlEdit_GetTextLen GUICtrlEdit_HideBalloonTip GUICtrlEdit_InsertText GUICtrlEdit_LineFromChar GUICtrlEdit_LineIndex GUICtrlEdit_LineLength GUICtrlEdit_LineScroll GUICtrlEdit_PosFromChar GUICtrlEdit_ReplaceSel GUICtrlEdit_Scroll GUICtrlEdit_SetCueBanner GUICtrlEdit_SetLimitText GUICtrlEdit_SetMargins GUICtrlEdit_SetModify GUICtrlEdit_SetPasswordChar GUICtrlEdit_SetReadOnly GUICtrlEdit_SetRECT GUICtrlEdit_SetRECTEx GUICtrlEdit_SetRECTNP GUICtrlEdit_SetRectNPEx GUICtrlEdit_SetSel GUICtrlEdit_SetTabStops GUICtrlEdit_SetText GUICtrlEdit_ShowBalloonTip GUICtrlEdit_Undo GUICtrlHeader_AddItem GUICtrlHeader_ClearFilter GUICtrlHeader_ClearFilterAll GUICtrlHeader_Create GUICtrlHeader_CreateDragImage GUICtrlHeader_DeleteItem GUICtrlHeader_Destroy GUICtrlHeader_EditFilter GUICtrlHeader_GetBitmapMargin GUICtrlHeader_GetImageList GUICtrlHeader_GetItem GUICtrlHeader_GetItemAlign GUICtrlHeader_GetItemBitmap GUICtrlHeader_GetItemCount GUICtrlHeader_GetItemDisplay GUICtrlHeader_GetItemFlags GUICtrlHeader_GetItemFormat GUICtrlHeader_GetItemImage GUICtrlHeader_GetItemOrder GUICtrlHeader_GetItemParam GUICtrlHeader_GetItemRect GUICtrlHeader_GetItemRectEx GUICtrlHeader_GetItemText GUICtrlHeader_GetItemWidth GUICtrlHeader_GetOrderArray GUICtrlHeader_GetUnicodeFormat GUICtrlHeader_HitTest GUICtrlHeader_InsertItem GUICtrlHeader_Layout GUICtrlHeader_OrderToIndex GUICtrlHeader_SetBitmapMargin GUICtrlHeader_SetFilterChangeTimeout GUICtrlHeader_SetHotDivider GUICtrlHeader_SetImageList GUICtrlHeader_SetItem GUICtrlHeader_SetItemAlign GUICtrlHeader_SetItemBitmap GUICtrlHeader_SetItemDisplay GUICtrlHeader_SetItemFlags GUICtrlHeader_SetItemFormat GUICtrlHeader_SetItemImage GUICtrlHeader_SetItemOrder GUICtrlHeader_SetItemParam GUICtrlHeader_SetItemText GUICtrlHeader_SetItemWidth GUICtrlHeader_SetOrderArray GUICtrlHeader_SetUnicodeFormat GUICtrlIpAddress_ClearAddress GUICtrlIpAddress_Create GUICtrlIpAddress_Destroy GUICtrlIpAddress_Get GUICtrlIpAddress_GetArray GUICtrlIpAddress_GetEx GUICtrlIpAddress_IsBlank GUICtrlIpAddress_Set GUICtrlIpAddress_SetArray GUICtrlIpAddress_SetEx GUICtrlIpAddress_SetFocus GUICtrlIpAddress_SetFont GUICtrlIpAddress_SetRange GUICtrlIpAddress_ShowHide GUICtrlListBox_AddFile GUICtrlListBox_AddString GUICtrlListBox_BeginUpdate GUICtrlListBox_ClickItem GUICtrlListBox_Create GUICtrlListBox_DeleteString GUICtrlListBox_Destroy GUICtrlListBox_Dir GUICtrlListBox_EndUpdate GUICtrlListBox_FindInText GUICtrlListBox_FindString GUICtrlListBox_GetAnchorIndex GUICtrlListBox_GetCaretIndex GUICtrlListBox_GetCount GUICtrlListBox_GetCurSel GUICtrlListBox_GetHorizontalExtent GUICtrlListBox_GetItemData GUICtrlListBox_GetItemHeight GUICtrlListBox_GetItemRect GUICtrlListBox_GetItemRectEx GUICtrlListBox_GetListBoxInfo GUICtrlListBox_GetLocale GUICtrlListBox_GetLocaleCountry GUICtrlListBox_GetLocaleLang GUICtrlListBox_GetLocalePrimLang GUICtrlListBox_GetLocaleSubLang GUICtrlListBox_GetSel GUICtrlListBox_GetSelCount GUICtrlListBox_GetSelItems GUICtrlListBox_GetSelItemsText GUICtrlListBox_GetText GUICtrlListBox_GetTextLen GUICtrlListBox_GetTopIndex GUICtrlListBox_InitStorage GUICtrlListBox_InsertString GUICtrlListBox_ItemFromPoint GUICtrlListBox_ReplaceString GUICtrlListBox_ResetContent GUICtrlListBox_SelectString GUICtrlListBox_SelItemRange GUICtrlListBox_SelItemRangeEx GUICtrlListBox_SetAnchorIndex GUICtrlListBox_SetCaretIndex GUICtrlListBox_SetColumnWidth GUICtrlListBox_SetCurSel GUICtrlListBox_SetHorizontalExtent GUICtrlListBox_SetItemData GUICtrlListBox_SetItemHeight GUICtrlListBox_SetLocale GUICtrlListBox_SetSel GUICtrlListBox_SetTabStops GUICtrlListBox_SetTopIndex GUICtrlListBox_Sort GUICtrlListBox_SwapString GUICtrlListBox_UpdateHScroll GUICtrlListView_AddArray GUICtrlListView_AddColumn GUICtrlListView_AddItem GUICtrlListView_AddSubItem GUICtrlListView_ApproximateViewHeight GUICtrlListView_ApproximateViewRect GUICtrlListView_ApproximateViewWidth GUICtrlListView_Arrange GUICtrlListView_BeginUpdate GUICtrlListView_CancelEditLabel GUICtrlListView_ClickItem GUICtrlListView_CopyItems GUICtrlListView_Create GUICtrlListView_CreateDragImage GUICtrlListView_CreateSolidBitMap GUICtrlListView_DeleteAllItems GUICtrlListView_DeleteColumn GUICtrlListView_DeleteItem GUICtrlListView_DeleteItemsSelected GUICtrlListView_Destroy GUICtrlListView_DrawDragImage GUICtrlListView_EditLabel GUICtrlListView_EnableGroupView GUICtrlListView_EndUpdate GUICtrlListView_EnsureVisible GUICtrlListView_FindInText GUICtrlListView_FindItem GUICtrlListView_FindNearest GUICtrlListView_FindParam GUICtrlListView_FindText GUICtrlListView_GetBkColor GUICtrlListView_GetBkImage GUICtrlListView_GetCallbackMask GUICtrlListView_GetColumn GUICtrlListView_GetColumnCount GUICtrlListView_GetColumnOrder GUICtrlListView_GetColumnOrderArray GUICtrlListView_GetColumnWidth GUICtrlListView_GetCounterPage GUICtrlListView_GetEditControl GUICtrlListView_GetExtendedListViewStyle GUICtrlListView_GetFocusedGroup GUICtrlListView_GetGroupCount GUICtrlListView_GetGroupInfo GUICtrlListView_GetGroupInfoByIndex GUICtrlListView_GetGroupRect GUICtrlListView_GetGroupViewEnabled GUICtrlListView_GetHeader GUICtrlListView_GetHotCursor GUICtrlListView_GetHotItem GUICtrlListView_GetHoverTime GUICtrlListView_GetImageList GUICtrlListView_GetISearchString GUICtrlListView_GetItem GUICtrlListView_GetItemChecked GUICtrlListView_GetItemCount GUICtrlListView_GetItemCut GUICtrlListView_GetItemDropHilited GUICtrlListView_GetItemEx GUICtrlListView_GetItemFocused GUICtrlListView_GetItemGroupID GUICtrlListView_GetItemImage GUICtrlListView_GetItemIndent GUICtrlListView_GetItemParam GUICtrlListView_GetItemPosition GUICtrlListView_GetItemPositionX GUICtrlListView_GetItemPositionY GUICtrlListView_GetItemRect GUICtrlListView_GetItemRectEx GUICtrlListView_GetItemSelected GUICtrlListView_GetItemSpacing GUICtrlListView_GetItemSpacingX GUICtrlListView_GetItemSpacingY GUICtrlListView_GetItemState GUICtrlListView_GetItemStateImage GUICtrlListView_GetItemText GUICtrlListView_GetItemTextArray GUICtrlListView_GetItemTextString GUICtrlListView_GetNextItem GUICtrlListView_GetNumberOfWorkAreas GUICtrlListView_GetOrigin GUICtrlListView_GetOriginX GUICtrlListView_GetOriginY GUICtrlListView_GetOutlineColor GUICtrlListView_GetSelectedColumn GUICtrlListView_GetSelectedCount GUICtrlListView_GetSelectedIndices GUICtrlListView_GetSelectionMark GUICtrlListView_GetStringWidth GUICtrlListView_GetSubItemRect GUICtrlListView_GetTextBkColor GUICtrlListView_GetTextColor GUICtrlListView_GetToolTips GUICtrlListView_GetTopIndex GUICtrlListView_GetUnicodeFormat GUICtrlListView_GetView GUICtrlListView_GetViewDetails GUICtrlListView_GetViewLarge GUICtrlListView_GetViewList GUICtrlListView_GetViewRect GUICtrlListView_GetViewSmall GUICtrlListView_GetViewTile GUICtrlListView_HideColumn GUICtrlListView_HitTest GUICtrlListView_InsertColumn GUICtrlListView_InsertGroup GUICtrlListView_InsertItem GUICtrlListView_JustifyColumn GUICtrlListView_MapIDToIndex GUICtrlListView_MapIndexToID GUICtrlListView_RedrawItems GUICtrlListView_RegisterSortCallBack GUICtrlListView_RemoveAllGroups GUICtrlListView_RemoveGroup GUICtrlListView_Scroll GUICtrlListView_SetBkColor GUICtrlListView_SetBkImage GUICtrlListView_SetCallBackMask GUICtrlListView_SetColumn GUICtrlListView_SetColumnOrder GUICtrlListView_SetColumnOrderArray GUICtrlListView_SetColumnWidth GUICtrlListView_SetExtendedListViewStyle GUICtrlListView_SetGroupInfo GUICtrlListView_SetHotItem GUICtrlListView_SetHoverTime GUICtrlListView_SetIconSpacing GUICtrlListView_SetImageList GUICtrlListView_SetItem GUICtrlListView_SetItemChecked GUICtrlListView_SetItemCount GUICtrlListView_SetItemCut GUICtrlListView_SetItemDropHilited GUICtrlListView_SetItemEx GUICtrlListView_SetItemFocused GUICtrlListView_SetItemGroupID GUICtrlListView_SetItemImage GUICtrlListView_SetItemIndent GUICtrlListView_SetItemParam GUICtrlListView_SetItemPosition GUICtrlListView_SetItemPosition32 GUICtrlListView_SetItemSelected GUICtrlListView_SetItemState GUICtrlListView_SetItemStateImage GUICtrlListView_SetItemText GUICtrlListView_SetOutlineColor GUICtrlListView_SetSelectedColumn GUICtrlListView_SetSelectionMark GUICtrlListView_SetTextBkColor GUICtrlListView_SetTextColor GUICtrlListView_SetToolTips GUICtrlListView_SetUnicodeFormat GUICtrlListView_SetView GUICtrlListView_SetWorkAreas GUICtrlListView_SimpleSort GUICtrlListView_SortItems GUICtrlListView_SubItemHitTest GUICtrlListView_UnRegisterSortCallBack GUICtrlMenu_AddMenuItem GUICtrlMenu_AppendMenu GUICtrlMenu_CalculatePopupWindowPosition GUICtrlMenu_CheckMenuItem GUICtrlMenu_CheckRadioItem GUICtrlMenu_CreateMenu GUICtrlMenu_CreatePopup GUICtrlMenu_DeleteMenu GUICtrlMenu_DestroyMenu GUICtrlMenu_DrawMenuBar GUICtrlMenu_EnableMenuItem GUICtrlMenu_FindItem GUICtrlMenu_FindParent GUICtrlMenu_GetItemBmp GUICtrlMenu_GetItemBmpChecked GUICtrlMenu_GetItemBmpUnchecked GUICtrlMenu_GetItemChecked GUICtrlMenu_GetItemCount GUICtrlMenu_GetItemData GUICtrlMenu_GetItemDefault GUICtrlMenu_GetItemDisabled GUICtrlMenu_GetItemEnabled GUICtrlMenu_GetItemGrayed GUICtrlMenu_GetItemHighlighted GUICtrlMenu_GetItemID GUICtrlMenu_GetItemInfo GUICtrlMenu_GetItemRect GUICtrlMenu_GetItemRectEx GUICtrlMenu_GetItemState GUICtrlMenu_GetItemStateEx GUICtrlMenu_GetItemSubMenu GUICtrlMenu_GetItemText GUICtrlMenu_GetItemType GUICtrlMenu_GetMenu GUICtrlMenu_GetMenuBackground GUICtrlMenu_GetMenuBarInfo GUICtrlMenu_GetMenuContextHelpID GUICtrlMenu_GetMenuData GUICtrlMenu_GetMenuDefaultItem GUICtrlMenu_GetMenuHeight GUICtrlMenu_GetMenuInfo GUICtrlMenu_GetMenuStyle GUICtrlMenu_GetSystemMenu GUICtrlMenu_InsertMenuItem GUICtrlMenu_InsertMenuItemEx GUICtrlMenu_IsMenu GUICtrlMenu_LoadMenu GUICtrlMenu_MapAccelerator GUICtrlMenu_MenuItemFromPoint GUICtrlMenu_RemoveMenu GUICtrlMenu_SetItemBitmaps GUICtrlMenu_SetItemBmp GUICtrlMenu_SetItemBmpChecked GUICtrlMenu_SetItemBmpUnchecked GUICtrlMenu_SetItemChecked GUICtrlMenu_SetItemData GUICtrlMenu_SetItemDefault GUICtrlMenu_SetItemDisabled GUICtrlMenu_SetItemEnabled GUICtrlMenu_SetItemGrayed GUICtrlMenu_SetItemHighlighted GUICtrlMenu_SetItemID GUICtrlMenu_SetItemInfo GUICtrlMenu_SetItemState GUICtrlMenu_SetItemSubMenu GUICtrlMenu_SetItemText GUICtrlMenu_SetItemType GUICtrlMenu_SetMenu GUICtrlMenu_SetMenuBackground GUICtrlMenu_SetMenuContextHelpID GUICtrlMenu_SetMenuData GUICtrlMenu_SetMenuDefaultItem GUICtrlMenu_SetMenuHeight GUICtrlMenu_SetMenuInfo GUICtrlMenu_SetMenuStyle GUICtrlMenu_TrackPopupMenu GUICtrlMonthCal_Create GUICtrlMonthCal_Destroy GUICtrlMonthCal_GetCalendarBorder GUICtrlMonthCal_GetCalendarCount GUICtrlMonthCal_GetColor GUICtrlMonthCal_GetColorArray GUICtrlMonthCal_GetCurSel GUICtrlMonthCal_GetCurSelStr GUICtrlMonthCal_GetFirstDOW GUICtrlMonthCal_GetFirstDOWStr GUICtrlMonthCal_GetMaxSelCount GUICtrlMonthCal_GetMaxTodayWidth GUICtrlMonthCal_GetMinReqHeight GUICtrlMonthCal_GetMinReqRect GUICtrlMonthCal_GetMinReqRectArray GUICtrlMonthCal_GetMinReqWidth GUICtrlMonthCal_GetMonthDelta GUICtrlMonthCal_GetMonthRange GUICtrlMonthCal_GetMonthRangeMax GUICtrlMonthCal_GetMonthRangeMaxStr GUICtrlMonthCal_GetMonthRangeMin GUICtrlMonthCal_GetMonthRangeMinStr GUICtrlMonthCal_GetMonthRangeSpan GUICtrlMonthCal_GetRange GUICtrlMonthCal_GetRangeMax GUICtrlMonthCal_GetRangeMaxStr GUICtrlMonthCal_GetRangeMin GUICtrlMonthCal_GetRangeMinStr GUICtrlMonthCal_GetSelRange GUICtrlMonthCal_GetSelRangeMax GUICtrlMonthCal_GetSelRangeMaxStr GUICtrlMonthCal_GetSelRangeMin GUICtrlMonthCal_GetSelRangeMinStr GUICtrlMonthCal_GetToday GUICtrlMonthCal_GetTodayStr GUICtrlMonthCal_GetUnicodeFormat GUICtrlMonthCal_HitTest GUICtrlMonthCal_SetCalendarBorder GUICtrlMonthCal_SetColor GUICtrlMonthCal_SetCurSel GUICtrlMonthCal_SetDayState GUICtrlMonthCal_SetFirstDOW GUICtrlMonthCal_SetMaxSelCount GUICtrlMonthCal_SetMonthDelta GUICtrlMonthCal_SetRange GUICtrlMonthCal_SetSelRange GUICtrlMonthCal_SetToday GUICtrlMonthCal_SetUnicodeFormat GUICtrlRebar_AddBand GUICtrlRebar_AddToolBarBand GUICtrlRebar_BeginDrag GUICtrlRebar_Create GUICtrlRebar_DeleteBand GUICtrlRebar_Destroy GUICtrlRebar_DragMove GUICtrlRebar_EndDrag GUICtrlRebar_GetBandBackColor GUICtrlRebar_GetBandBorders GUICtrlRebar_GetBandBordersEx GUICtrlRebar_GetBandChildHandle GUICtrlRebar_GetBandChildSize GUICtrlRebar_GetBandCount GUICtrlRebar_GetBandForeColor GUICtrlRebar_GetBandHeaderSize GUICtrlRebar_GetBandID GUICtrlRebar_GetBandIdealSize GUICtrlRebar_GetBandLength GUICtrlRebar_GetBandLParam GUICtrlRebar_GetBandMargins GUICtrlRebar_GetBandMarginsEx GUICtrlRebar_GetBandRect GUICtrlRebar_GetBandRectEx GUICtrlRebar_GetBandStyle GUICtrlRebar_GetBandStyleBreak GUICtrlRebar_GetBandStyleChildEdge GUICtrlRebar_GetBandStyleFixedBMP GUICtrlRebar_GetBandStyleFixedSize GUICtrlRebar_GetBandStyleGripperAlways GUICtrlRebar_GetBandStyleHidden GUICtrlRebar_GetBandStyleHideTitle GUICtrlRebar_GetBandStyleNoGripper GUICtrlRebar_GetBandStyleTopAlign GUICtrlRebar_GetBandStyleUseChevron GUICtrlRebar_GetBandStyleVariableHeight GUICtrlRebar_GetBandText GUICtrlRebar_GetBarHeight GUICtrlRebar_GetBarInfo GUICtrlRebar_GetBKColor GUICtrlRebar_GetColorScheme GUICtrlRebar_GetRowCount GUICtrlRebar_GetRowHeight GUICtrlRebar_GetTextColor GUICtrlRebar_GetToolTips GUICtrlRebar_GetUnicodeFormat GUICtrlRebar_HitTest GUICtrlRebar_IDToIndex GUICtrlRebar_MaximizeBand GUICtrlRebar_MinimizeBand GUICtrlRebar_MoveBand GUICtrlRebar_SetBandBackColor GUICtrlRebar_SetBandForeColor GUICtrlRebar_SetBandHeaderSize GUICtrlRebar_SetBandID GUICtrlRebar_SetBandIdealSize GUICtrlRebar_SetBandLength GUICtrlRebar_SetBandLParam GUICtrlRebar_SetBandStyle GUICtrlRebar_SetBandStyleBreak GUICtrlRebar_SetBandStyleChildEdge GUICtrlRebar_SetBandStyleFixedBMP GUICtrlRebar_SetBandStyleFixedSize GUICtrlRebar_SetBandStyleGripperAlways GUICtrlRebar_SetBandStyleHidden GUICtrlRebar_SetBandStyleHideTitle GUICtrlRebar_SetBandStyleNoGripper GUICtrlRebar_SetBandStyleTopAlign GUICtrlRebar_SetBandStyleUseChevron GUICtrlRebar_SetBandStyleVariableHeight GUICtrlRebar_SetBandText GUICtrlRebar_SetBarInfo GUICtrlRebar_SetBKColor GUICtrlRebar_SetColorScheme GUICtrlRebar_SetTextColor GUICtrlRebar_SetToolTips GUICtrlRebar_SetUnicodeFormat GUICtrlRebar_ShowBand GUICtrlRichEdit_AppendText GUICtrlRichEdit_AutoDetectURL GUICtrlRichEdit_CanPaste GUICtrlRichEdit_CanPasteSpecial GUICtrlRichEdit_CanRedo GUICtrlRichEdit_CanUndo GUICtrlRichEdit_ChangeFontSize GUICtrlRichEdit_Copy GUICtrlRichEdit_Create GUICtrlRichEdit_Cut GUICtrlRichEdit_Deselect GUICtrlRichEdit_Destroy GUICtrlRichEdit_EmptyUndoBuffer GUICtrlRichEdit_FindText GUICtrlRichEdit_FindTextInRange GUICtrlRichEdit_GetBkColor GUICtrlRichEdit_GetCharAttributes GUICtrlRichEdit_GetCharBkColor GUICtrlRichEdit_GetCharColor GUICtrlRichEdit_GetCharPosFromXY GUICtrlRichEdit_GetCharPosOfNextWord GUICtrlRichEdit_GetCharPosOfPreviousWord GUICtrlRichEdit_GetCharWordBreakInfo GUICtrlRichEdit_GetFirstCharPosOnLine GUICtrlRichEdit_GetFont GUICtrlRichEdit_GetLineCount GUICtrlRichEdit_GetLineLength GUICtrlRichEdit_GetLineNumberFromCharPos GUICtrlRichEdit_GetNextRedo GUICtrlRichEdit_GetNextUndo GUICtrlRichEdit_GetNumberOfFirstVisibleLine GUICtrlRichEdit_GetParaAlignment GUICtrlRichEdit_GetParaAttributes GUICtrlRichEdit_GetParaBorder GUICtrlRichEdit_GetParaIndents GUICtrlRichEdit_GetParaNumbering GUICtrlRichEdit_GetParaShading GUICtrlRichEdit_GetParaSpacing GUICtrlRichEdit_GetParaTabStops GUICtrlRichEdit_GetPasswordChar GUICtrlRichEdit_GetRECT GUICtrlRichEdit_GetScrollPos GUICtrlRichEdit_GetSel GUICtrlRichEdit_GetSelAA GUICtrlRichEdit_GetSelText GUICtrlRichEdit_GetSpaceUnit GUICtrlRichEdit_GetText GUICtrlRichEdit_GetTextInLine GUICtrlRichEdit_GetTextInRange GUICtrlRichEdit_GetTextLength GUICtrlRichEdit_GetVersion GUICtrlRichEdit_GetXYFromCharPos GUICtrlRichEdit_GetZoom GUICtrlRichEdit_GotoCharPos GUICtrlRichEdit_HideSelection GUICtrlRichEdit_InsertText GUICtrlRichEdit_IsModified GUICtrlRichEdit_IsTextSelected GUICtrlRichEdit_Paste GUICtrlRichEdit_PasteSpecial GUICtrlRichEdit_PauseRedraw GUICtrlRichEdit_Redo GUICtrlRichEdit_ReplaceText GUICtrlRichEdit_ResumeRedraw GUICtrlRichEdit_ScrollLineOrPage GUICtrlRichEdit_ScrollLines GUICtrlRichEdit_ScrollToCaret GUICtrlRichEdit_SetBkColor GUICtrlRichEdit_SetCharAttributes GUICtrlRichEdit_SetCharBkColor GUICtrlRichEdit_SetCharColor GUICtrlRichEdit_SetEventMask GUICtrlRichEdit_SetFont GUICtrlRichEdit_SetLimitOnText GUICtrlRichEdit_SetModified GUICtrlRichEdit_SetParaAlignment GUICtrlRichEdit_SetParaAttributes GUICtrlRichEdit_SetParaBorder GUICtrlRichEdit_SetParaIndents GUICtrlRichEdit_SetParaNumbering GUICtrlRichEdit_SetParaShading GUICtrlRichEdit_SetParaSpacing GUICtrlRichEdit_SetParaTabStops GUICtrlRichEdit_SetPasswordChar GUICtrlRichEdit_SetReadOnly GUICtrlRichEdit_SetRECT GUICtrlRichEdit_SetScrollPos GUICtrlRichEdit_SetSel GUICtrlRichEdit_SetSpaceUnit GUICtrlRichEdit_SetTabStops GUICtrlRichEdit_SetText GUICtrlRichEdit_SetUndoLimit GUICtrlRichEdit_SetZoom GUICtrlRichEdit_StreamFromFile GUICtrlRichEdit_StreamFromVar GUICtrlRichEdit_StreamToFile GUICtrlRichEdit_StreamToVar GUICtrlRichEdit_Undo GUICtrlSlider_ClearSel GUICtrlSlider_ClearTics GUICtrlSlider_Create GUICtrlSlider_Destroy GUICtrlSlider_GetBuddy GUICtrlSlider_GetChannelRect GUICtrlSlider_GetChannelRectEx GUICtrlSlider_GetLineSize GUICtrlSlider_GetLogicalTics GUICtrlSlider_GetNumTics GUICtrlSlider_GetPageSize GUICtrlSlider_GetPos GUICtrlSlider_GetRange GUICtrlSlider_GetRangeMax GUICtrlSlider_GetRangeMin GUICtrlSlider_GetSel GUICtrlSlider_GetSelEnd GUICtrlSlider_GetSelStart GUICtrlSlider_GetThumbLength GUICtrlSlider_GetThumbRect GUICtrlSlider_GetThumbRectEx GUICtrlSlider_GetTic GUICtrlSlider_GetTicPos GUICtrlSlider_GetToolTips GUICtrlSlider_GetUnicodeFormat GUICtrlSlider_SetBuddy GUICtrlSlider_SetLineSize GUICtrlSlider_SetPageSize GUICtrlSlider_SetPos GUICtrlSlider_SetRange GUICtrlSlider_SetRangeMax GUICtrlSlider_SetRangeMin GUICtrlSlider_SetSel GUICtrlSlider_SetSelEnd GUICtrlSlider_SetSelStart GUICtrlSlider_SetThumbLength GUICtrlSlider_SetTic GUICtrlSlider_SetTicFreq GUICtrlSlider_SetTipSide GUICtrlSlider_SetToolTips GUICtrlSlider_SetUnicodeFormat GUICtrlStatusBar_Create GUICtrlStatusBar_Destroy GUICtrlStatusBar_EmbedControl GUICtrlStatusBar_GetBorders GUICtrlStatusBar_GetBordersHorz GUICtrlStatusBar_GetBordersRect GUICtrlStatusBar_GetBordersVert GUICtrlStatusBar_GetCount GUICtrlStatusBar_GetHeight GUICtrlStatusBar_GetIcon GUICtrlStatusBar_GetParts GUICtrlStatusBar_GetRect GUICtrlStatusBar_GetRectEx GUICtrlStatusBar_GetText GUICtrlStatusBar_GetTextFlags GUICtrlStatusBar_GetTextLength GUICtrlStatusBar_GetTextLengthEx GUICtrlStatusBar_GetTipText GUICtrlStatusBar_GetUnicodeFormat GUICtrlStatusBar_GetWidth GUICtrlStatusBar_IsSimple GUICtrlStatusBar_Resize GUICtrlStatusBar_SetBkColor GUICtrlStatusBar_SetIcon GUICtrlStatusBar_SetMinHeight GUICtrlStatusBar_SetParts GUICtrlStatusBar_SetSimple GUICtrlStatusBar_SetText GUICtrlStatusBar_SetTipText GUICtrlStatusBar_SetUnicodeFormat GUICtrlStatusBar_ShowHide GUICtrlTab_ActivateTab GUICtrlTab_ClickTab GUICtrlTab_Create GUICtrlTab_DeleteAllItems GUICtrlTab_DeleteItem GUICtrlTab_DeselectAll GUICtrlTab_Destroy GUICtrlTab_FindTab GUICtrlTab_GetCurFocus GUICtrlTab_GetCurSel GUICtrlTab_GetDisplayRect GUICtrlTab_GetDisplayRectEx GUICtrlTab_GetExtendedStyle GUICtrlTab_GetImageList GUICtrlTab_GetItem GUICtrlTab_GetItemCount GUICtrlTab_GetItemImage GUICtrlTab_GetItemParam GUICtrlTab_GetItemRect GUICtrlTab_GetItemRectEx GUICtrlTab_GetItemState GUICtrlTab_GetItemText GUICtrlTab_GetRowCount GUICtrlTab_GetToolTips GUICtrlTab_GetUnicodeFormat GUICtrlTab_HighlightItem GUICtrlTab_HitTest GUICtrlTab_InsertItem GUICtrlTab_RemoveImage GUICtrlTab_SetCurFocus GUICtrlTab_SetCurSel GUICtrlTab_SetExtendedStyle GUICtrlTab_SetImageList GUICtrlTab_SetItem GUICtrlTab_SetItemImage GUICtrlTab_SetItemParam GUICtrlTab_SetItemSize GUICtrlTab_SetItemState GUICtrlTab_SetItemText GUICtrlTab_SetMinTabWidth GUICtrlTab_SetPadding GUICtrlTab_SetToolTips GUICtrlTab_SetUnicodeFormat GUICtrlToolbar_AddBitmap GUICtrlToolbar_AddButton GUICtrlToolbar_AddButtonSep GUICtrlToolbar_AddString GUICtrlToolbar_ButtonCount GUICtrlToolbar_CheckButton GUICtrlToolbar_ClickAccel GUICtrlToolbar_ClickButton GUICtrlToolbar_ClickIndex GUICtrlToolbar_CommandToIndex GUICtrlToolbar_Create GUICtrlToolbar_Customize GUICtrlToolbar_DeleteButton GUICtrlToolbar_Destroy GUICtrlToolbar_EnableButton GUICtrlToolbar_FindToolbar GUICtrlToolbar_GetAnchorHighlight GUICtrlToolbar_GetBitmapFlags GUICtrlToolbar_GetButtonBitmap GUICtrlToolbar_GetButtonInfo GUICtrlToolbar_GetButtonInfoEx GUICtrlToolbar_GetButtonParam GUICtrlToolbar_GetButtonRect GUICtrlToolbar_GetButtonRectEx GUICtrlToolbar_GetButtonSize GUICtrlToolbar_GetButtonState GUICtrlToolbar_GetButtonStyle GUICtrlToolbar_GetButtonText GUICtrlToolbar_GetColorScheme GUICtrlToolbar_GetDisabledImageList GUICtrlToolbar_GetExtendedStyle GUICtrlToolbar_GetHotImageList GUICtrlToolbar_GetHotItem GUICtrlToolbar_GetImageList GUICtrlToolbar_GetInsertMark GUICtrlToolbar_GetInsertMarkColor GUICtrlToolbar_GetMaxSize GUICtrlToolbar_GetMetrics GUICtrlToolbar_GetPadding GUICtrlToolbar_GetRows GUICtrlToolbar_GetString GUICtrlToolbar_GetStyle GUICtrlToolbar_GetStyleAltDrag GUICtrlToolbar_GetStyleCustomErase GUICtrlToolbar_GetStyleFlat GUICtrlToolbar_GetStyleList GUICtrlToolbar_GetStyleRegisterDrop GUICtrlToolbar_GetStyleToolTips GUICtrlToolbar_GetStyleTransparent GUICtrlToolbar_GetStyleWrapable GUICtrlToolbar_GetTextRows GUICtrlToolbar_GetToolTips GUICtrlToolbar_GetUnicodeFormat GUICtrlToolbar_HideButton GUICtrlToolbar_HighlightButton GUICtrlToolbar_HitTest GUICtrlToolbar_IndexToCommand GUICtrlToolbar_InsertButton GUICtrlToolbar_InsertMarkHitTest GUICtrlToolbar_IsButtonChecked GUICtrlToolbar_IsButtonEnabled GUICtrlToolbar_IsButtonHidden GUICtrlToolbar_IsButtonHighlighted GUICtrlToolbar_IsButtonIndeterminate GUICtrlToolbar_IsButtonPressed GUICtrlToolbar_LoadBitmap GUICtrlToolbar_LoadImages GUICtrlToolbar_MapAccelerator GUICtrlToolbar_MoveButton GUICtrlToolbar_PressButton GUICtrlToolbar_SetAnchorHighlight GUICtrlToolbar_SetBitmapSize GUICtrlToolbar_SetButtonBitMap GUICtrlToolbar_SetButtonInfo GUICtrlToolbar_SetButtonInfoEx GUICtrlToolbar_SetButtonParam GUICtrlToolbar_SetButtonSize GUICtrlToolbar_SetButtonState GUICtrlToolbar_SetButtonStyle GUICtrlToolbar_SetButtonText GUICtrlToolbar_SetButtonWidth GUICtrlToolbar_SetCmdID GUICtrlToolbar_SetColorScheme GUICtrlToolbar_SetDisabledImageList GUICtrlToolbar_SetDrawTextFlags GUICtrlToolbar_SetExtendedStyle GUICtrlToolbar_SetHotImageList GUICtrlToolbar_SetHotItem GUICtrlToolbar_SetImageList GUICtrlToolbar_SetIndent GUICtrlToolbar_SetIndeterminate GUICtrlToolbar_SetInsertMark GUICtrlToolbar_SetInsertMarkColor GUICtrlToolbar_SetMaxTextRows GUICtrlToolbar_SetMetrics GUICtrlToolbar_SetPadding GUICtrlToolbar_SetParent GUICtrlToolbar_SetRows GUICtrlToolbar_SetStyle GUICtrlToolbar_SetStyleAltDrag GUICtrlToolbar_SetStyleCustomErase GUICtrlToolbar_SetStyleFlat GUICtrlToolbar_SetStyleList GUICtrlToolbar_SetStyleRegisterDrop GUICtrlToolbar_SetStyleToolTips GUICtrlToolbar_SetStyleTransparent GUICtrlToolbar_SetStyleWrapable GUICtrlToolbar_SetToolTips GUICtrlToolbar_SetUnicodeFormat GUICtrlToolbar_SetWindowTheme GUICtrlTreeView_Add GUICtrlTreeView_AddChild GUICtrlTreeView_AddChildFirst GUICtrlTreeView_AddFirst GUICtrlTreeView_BeginUpdate GUICtrlTreeView_ClickItem GUICtrlTreeView_Create GUICtrlTreeView_CreateDragImage GUICtrlTreeView_CreateSolidBitMap GUICtrlTreeView_Delete GUICtrlTreeView_DeleteAll GUICtrlTreeView_DeleteChildren GUICtrlTreeView_Destroy GUICtrlTreeView_DisplayRect GUICtrlTreeView_DisplayRectEx GUICtrlTreeView_EditText GUICtrlTreeView_EndEdit GUICtrlTreeView_EndUpdate GUICtrlTreeView_EnsureVisible GUICtrlTreeView_Expand GUICtrlTreeView_ExpandedOnce GUICtrlTreeView_FindItem GUICtrlTreeView_FindItemEx GUICtrlTreeView_GetBkColor GUICtrlTreeView_GetBold GUICtrlTreeView_GetChecked GUICtrlTreeView_GetChildCount GUICtrlTreeView_GetChildren GUICtrlTreeView_GetCount GUICtrlTreeView_GetCut GUICtrlTreeView_GetDropTarget GUICtrlTreeView_GetEditControl GUICtrlTreeView_GetExpanded GUICtrlTreeView_GetFirstChild GUICtrlTreeView_GetFirstItem GUICtrlTreeView_GetFirstVisible GUICtrlTreeView_GetFocused GUICtrlTreeView_GetHeight GUICtrlTreeView_GetImageIndex GUICtrlTreeView_GetImageListIconHandle GUICtrlTreeView_GetIndent GUICtrlTreeView_GetInsertMarkColor GUICtrlTreeView_GetISearchString GUICtrlTreeView_GetItemByIndex GUICtrlTreeView_GetItemHandle GUICtrlTreeView_GetItemParam GUICtrlTreeView_GetLastChild GUICtrlTreeView_GetLineColor GUICtrlTreeView_GetNext GUICtrlTreeView_GetNextChild GUICtrlTreeView_GetNextSibling GUICtrlTreeView_GetNextVisible GUICtrlTreeView_GetNormalImageList GUICtrlTreeView_GetParentHandle GUICtrlTreeView_GetParentParam GUICtrlTreeView_GetPrev GUICtrlTreeView_GetPrevChild GUICtrlTreeView_GetPrevSibling GUICtrlTreeView_GetPrevVisible GUICtrlTreeView_GetScrollTime GUICtrlTreeView_GetSelected GUICtrlTreeView_GetSelectedImageIndex GUICtrlTreeView_GetSelection GUICtrlTreeView_GetSiblingCount GUICtrlTreeView_GetState GUICtrlTreeView_GetStateImageIndex GUICtrlTreeView_GetStateImageList GUICtrlTreeView_GetText GUICtrlTreeView_GetTextColor GUICtrlTreeView_GetToolTips GUICtrlTreeView_GetTree GUICtrlTreeView_GetUnicodeFormat GUICtrlTreeView_GetVisible GUICtrlTreeView_GetVisibleCount GUICtrlTreeView_HitTest GUICtrlTreeView_HitTestEx GUICtrlTreeView_HitTestItem GUICtrlTreeView_Index GUICtrlTreeView_InsertItem GUICtrlTreeView_IsFirstItem GUICtrlTreeView_IsParent GUICtrlTreeView_Level GUICtrlTreeView_SelectItem GUICtrlTreeView_SelectItemByIndex GUICtrlTreeView_SetBkColor GUICtrlTreeView_SetBold GUICtrlTreeView_SetChecked GUICtrlTreeView_SetCheckedByIndex GUICtrlTreeView_SetChildren GUICtrlTreeView_SetCut GUICtrlTreeView_SetDropTarget GUICtrlTreeView_SetFocused GUICtrlTreeView_SetHeight GUICtrlTreeView_SetIcon GUICtrlTreeView_SetImageIndex GUICtrlTreeView_SetIndent GUICtrlTreeView_SetInsertMark GUICtrlTreeView_SetInsertMarkColor GUICtrlTreeView_SetItemHeight GUICtrlTreeView_SetItemParam GUICtrlTreeView_SetLineColor GUICtrlTreeView_SetNormalImageList GUICtrlTreeView_SetScrollTime GUICtrlTreeView_SetSelected GUICtrlTreeView_SetSelectedImageIndex GUICtrlTreeView_SetState GUICtrlTreeView_SetStateImageIndex GUICtrlTreeView_SetStateImageList GUICtrlTreeView_SetText GUICtrlTreeView_SetTextColor GUICtrlTreeView_SetToolTips GUICtrlTreeView_SetUnicodeFormat GUICtrlTreeView_Sort GUIImageList_Add GUIImageList_AddBitmap GUIImageList_AddIcon GUIImageList_AddMasked GUIImageList_BeginDrag GUIImageList_Copy GUIImageList_Create GUIImageList_Destroy GUIImageList_DestroyIcon GUIImageList_DragEnter GUIImageList_DragLeave GUIImageList_DragMove GUIImageList_Draw GUIImageList_DrawEx GUIImageList_Duplicate GUIImageList_EndDrag GUIImageList_GetBkColor GUIImageList_GetIcon GUIImageList_GetIconHeight GUIImageList_GetIconSize GUIImageList_GetIconSizeEx GUIImageList_GetIconWidth GUIImageList_GetImageCount GUIImageList_GetImageInfoEx GUIImageList_Remove GUIImageList_ReplaceIcon GUIImageList_SetBkColor GUIImageList_SetIconSize GUIImageList_SetImageCount GUIImageList_Swap GUIScrollBars_EnableScrollBar GUIScrollBars_GetScrollBarInfoEx GUIScrollBars_GetScrollBarRect GUIScrollBars_GetScrollBarRGState GUIScrollBars_GetScrollBarXYLineButton GUIScrollBars_GetScrollBarXYThumbBottom GUIScrollBars_GetScrollBarXYThumbTop GUIScrollBars_GetScrollInfo GUIScrollBars_GetScrollInfoEx GUIScrollBars_GetScrollInfoMax GUIScrollBars_GetScrollInfoMin GUIScrollBars_GetScrollInfoPage GUIScrollBars_GetScrollInfoPos GUIScrollBars_GetScrollInfoTrackPos GUIScrollBars_GetScrollPos GUIScrollBars_GetScrollRange GUIScrollBars_Init GUIScrollBars_ScrollWindow GUIScrollBars_SetScrollInfo GUIScrollBars_SetScrollInfoMax GUIScrollBars_SetScrollInfoMin GUIScrollBars_SetScrollInfoPage GUIScrollBars_SetScrollInfoPos GUIScrollBars_SetScrollRange GUIScrollBars_ShowScrollBar GUIToolTip_Activate GUIToolTip_AddTool GUIToolTip_AdjustRect GUIToolTip_BitsToTTF GUIToolTip_Create GUIToolTip_Deactivate GUIToolTip_DelTool GUIToolTip_Destroy GUIToolTip_EnumTools GUIToolTip_GetBubbleHeight GUIToolTip_GetBubbleSize GUIToolTip_GetBubbleWidth GUIToolTip_GetCurrentTool GUIToolTip_GetDelayTime GUIToolTip_GetMargin GUIToolTip_GetMarginEx GUIToolTip_GetMaxTipWidth GUIToolTip_GetText GUIToolTip_GetTipBkColor GUIToolTip_GetTipTextColor GUIToolTip_GetTitleBitMap GUIToolTip_GetTitleText GUIToolTip_GetToolCount GUIToolTip_GetToolInfo GUIToolTip_HitTest GUIToolTip_NewToolRect GUIToolTip_Pop GUIToolTip_PopUp GUIToolTip_SetDelayTime GUIToolTip_SetMargin GUIToolTip_SetMaxTipWidth GUIToolTip_SetTipBkColor GUIToolTip_SetTipTextColor GUIToolTip_SetTitle GUIToolTip_SetToolInfo GUIToolTip_SetWindowTheme GUIToolTip_ToolExists GUIToolTip_ToolToArray GUIToolTip_TrackActivate GUIToolTip_TrackPosition GUIToolTip_Update GUIToolTip_UpdateTipText HexToString IEAction IEAttach IEBodyReadHTML IEBodyReadText IEBodyWriteHTML IECreate IECreateEmbedded IEDocGetObj IEDocInsertHTML IEDocInsertText IEDocReadHTML IEDocWriteHTML IEErrorNotify IEFormElementCheckBoxSelect IEFormElementGetCollection IEFormElementGetObjByName IEFormElementGetValue IEFormElementOptionSelect IEFormElementRadioSelect IEFormElementSetValue IEFormGetCollection IEFormGetObjByName IEFormImageClick IEFormReset IEFormSubmit IEFrameGetCollection IEFrameGetObjByName IEGetObjById IEGetObjByName IEHeadInsertEventScript IEImgClick IEImgGetCollection IEIsFrameSet IELinkClickByIndex IELinkClickByText IELinkGetCollection IELoadWait IELoadWaitTimeout IENavigate IEPropertyGet IEPropertySet IEQuit IETableGetCollection IETableWriteToArray IETagNameAllGetCollection IETagNameGetCollection IE_Example IE_Introduction IE_VersionInfo INetExplorerCapable INetGetSource INetMail INetSmtpMail IsPressed MathCheckDiv Max MemGlobalAlloc MemGlobalFree MemGlobalLock MemGlobalSize MemGlobalUnlock MemMoveMemory MemVirtualAlloc MemVirtualAllocEx MemVirtualFree MemVirtualFreeEx Min MouseTrap NamedPipes_CallNamedPipe NamedPipes_ConnectNamedPipe NamedPipes_CreateNamedPipe NamedPipes_CreatePipe NamedPipes_DisconnectNamedPipe NamedPipes_GetNamedPipeHandleState NamedPipes_GetNamedPipeInfo NamedPipes_PeekNamedPipe NamedPipes_SetNamedPipeHandleState NamedPipes_TransactNamedPipe NamedPipes_WaitNamedPipe Net_Share_ConnectionEnum Net_Share_FileClose Net_Share_FileEnum Net_Share_FileGetInfo Net_Share_PermStr Net_Share_ResourceStr Net_Share_SessionDel Net_Share_SessionEnum Net_Share_SessionGetInfo Net_Share_ShareAdd Net_Share_ShareCheck Net_Share_ShareDel Net_Share_ShareEnum Net_Share_ShareGetInfo Net_Share_ShareSetInfo Net_Share_StatisticsGetSvr Net_Share_StatisticsGetWrk Now NowCalc NowCalcDate NowDate NowTime PathFull PathGetRelative PathMake PathSplit ProcessGetName ProcessGetPriority Radian ReplaceStringInFile RunDos ScreenCapture_Capture ScreenCapture_CaptureWnd ScreenCapture_SaveImage ScreenCapture_SetBMPFormat ScreenCapture_SetJPGQuality ScreenCapture_SetTIFColorDepth ScreenCapture_SetTIFCompression Security__AdjustTokenPrivileges Security__CreateProcessWithToken Security__DuplicateTokenEx Security__GetAccountSid Security__GetLengthSid Security__GetTokenInformation Security__ImpersonateSelf Security__IsValidSid Security__LookupAccountName Security__LookupAccountSid Security__LookupPrivilegeValue Security__OpenProcessToken Security__OpenThreadToken Security__OpenThreadTokenEx Security__SetPrivilege Security__SetTokenInformation Security__SidToStringSid Security__SidTypeStr Security__StringSidToSid SendMessage SendMessageA SetDate SetTime Singleton SoundClose SoundLength SoundOpen SoundPause SoundPlay SoundPos SoundResume SoundSeek SoundStatus SoundStop SQLite_Changes SQLite_Close SQLite_Display2DResult SQLite_Encode SQLite_ErrCode SQLite_ErrMsg SQLite_Escape SQLite_Exec SQLite_FastEncode SQLite_FastEscape SQLite_FetchData SQLite_FetchNames SQLite_GetTable SQLite_GetTable2d SQLite_LastInsertRowID SQLite_LibVersion SQLite_Open SQLite_Query SQLite_QueryFinalize SQLite_QueryReset SQLite_QuerySingleRow SQLite_SafeMode SQLite_SetTimeout SQLite_Shutdown SQLite_SQLiteExe SQLite_Startup SQLite_TotalChanges StringBetween StringExplode StringInsert StringProper StringRepeat StringTitleCase StringToHex TCPIpToName TempFile TicksToTime Timer_Diff Timer_GetIdleTime Timer_GetTimerID Timer_Init Timer_KillAllTimers Timer_KillTimer Timer_SetTimer TimeToTicks VersionCompare viClose viExecCommand viFindGpib viGpibBusReset viGTL viInteractiveControl viOpen viSetAttribute viSetTimeout WeekNumberISO WinAPI_AbortPath WinAPI_ActivateKeyboardLayout WinAPI_AddClipboardFormatListener WinAPI_AddFontMemResourceEx WinAPI_AddFontResourceEx WinAPI_AddIconOverlay WinAPI_AddIconTransparency WinAPI_AddMRUString WinAPI_AdjustBitmap WinAPI_AdjustTokenPrivileges WinAPI_AdjustWindowRectEx WinAPI_AlphaBlend WinAPI_AngleArc WinAPI_AnimateWindow WinAPI_Arc WinAPI_ArcTo WinAPI_ArrayToStruct WinAPI_AssignProcessToJobObject WinAPI_AssocGetPerceivedType WinAPI_AssocQueryString WinAPI_AttachConsole WinAPI_AttachThreadInput WinAPI_BackupRead WinAPI_BackupReadAbort WinAPI_BackupSeek WinAPI_BackupWrite WinAPI_BackupWriteAbort WinAPI_Beep WinAPI_BeginBufferedPaint WinAPI_BeginDeferWindowPos WinAPI_BeginPaint WinAPI_BeginPath WinAPI_BeginUpdateResource WinAPI_BitBlt WinAPI_BringWindowToTop WinAPI_BroadcastSystemMessage WinAPI_BrowseForFolderDlg WinAPI_BufferedPaintClear WinAPI_BufferedPaintInit WinAPI_BufferedPaintSetAlpha WinAPI_BufferedPaintUnInit WinAPI_CallNextHookEx WinAPI_CallWindowProc WinAPI_CallWindowProcW WinAPI_CascadeWindows WinAPI_ChangeWindowMessageFilterEx WinAPI_CharToOem WinAPI_ChildWindowFromPointEx WinAPI_ClientToScreen WinAPI_ClipCursor WinAPI_CloseDesktop WinAPI_CloseEnhMetaFile WinAPI_CloseFigure WinAPI_CloseHandle WinAPI_CloseThemeData WinAPI_CloseWindow WinAPI_CloseWindowStation WinAPI_CLSIDFromProgID WinAPI_CoInitialize WinAPI_ColorAdjustLuma WinAPI_ColorHLSToRGB WinAPI_ColorRGBToHLS WinAPI_CombineRgn WinAPI_CombineTransform WinAPI_CommandLineToArgv WinAPI_CommDlgExtendedError WinAPI_CommDlgExtendedErrorEx WinAPI_CompareString WinAPI_CompressBitmapBits WinAPI_CompressBuffer WinAPI_ComputeCrc32 WinAPI_ConfirmCredentials WinAPI_CopyBitmap WinAPI_CopyCursor WinAPI_CopyEnhMetaFile WinAPI_CopyFileEx WinAPI_CopyIcon WinAPI_CopyImage WinAPI_CopyRect WinAPI_CopyStruct WinAPI_CoTaskMemAlloc WinAPI_CoTaskMemFree WinAPI_CoTaskMemRealloc WinAPI_CoUninitialize WinAPI_Create32BitHBITMAP WinAPI_Create32BitHICON WinAPI_CreateANDBitmap WinAPI_CreateBitmap WinAPI_CreateBitmapIndirect WinAPI_CreateBrushIndirect WinAPI_CreateBuffer WinAPI_CreateBufferFromStruct WinAPI_CreateCaret WinAPI_CreateColorAdjustment WinAPI_CreateCompatibleBitmap WinAPI_CreateCompatibleBitmapEx WinAPI_CreateCompatibleDC WinAPI_CreateDesktop WinAPI_CreateDIB WinAPI_CreateDIBColorTable WinAPI_CreateDIBitmap WinAPI_CreateDIBSection WinAPI_CreateDirectory WinAPI_CreateDirectoryEx WinAPI_CreateEllipticRgn WinAPI_CreateEmptyIcon WinAPI_CreateEnhMetaFile WinAPI_CreateEvent WinAPI_CreateFile WinAPI_CreateFileEx WinAPI_CreateFileMapping WinAPI_CreateFont WinAPI_CreateFontEx WinAPI_CreateFontIndirect WinAPI_CreateGUID WinAPI_CreateHardLink WinAPI_CreateIcon WinAPI_CreateIconFromResourceEx WinAPI_CreateIconIndirect WinAPI_CreateJobObject WinAPI_CreateMargins WinAPI_CreateMRUList WinAPI_CreateMutex WinAPI_CreateNullRgn WinAPI_CreateNumberFormatInfo WinAPI_CreateObjectID WinAPI_CreatePen WinAPI_CreatePoint WinAPI_CreatePolygonRgn WinAPI_CreateProcess WinAPI_CreateProcessWithToken WinAPI_CreateRect WinAPI_CreateRectEx WinAPI_CreateRectRgn WinAPI_CreateRectRgnIndirect WinAPI_CreateRoundRectRgn WinAPI_CreateSemaphore WinAPI_CreateSize WinAPI_CreateSolidBitmap WinAPI_CreateSolidBrush WinAPI_CreateStreamOnHGlobal WinAPI_CreateString WinAPI_CreateSymbolicLink WinAPI_CreateTransform WinAPI_CreateWindowEx WinAPI_CreateWindowStation WinAPI_DecompressBuffer WinAPI_DecryptFile WinAPI_DeferWindowPos WinAPI_DefineDosDevice WinAPI_DefRawInputProc WinAPI_DefSubclassProc WinAPI_DefWindowProc WinAPI_DefWindowProcW WinAPI_DeleteDC WinAPI_DeleteEnhMetaFile WinAPI_DeleteFile WinAPI_DeleteObject WinAPI_DeleteObjectID WinAPI_DeleteVolumeMountPoint WinAPI_DeregisterShellHookWindow WinAPI_DestroyCaret WinAPI_DestroyCursor WinAPI_DestroyIcon WinAPI_DestroyWindow WinAPI_DeviceIoControl WinAPI_DisplayStruct WinAPI_DllGetVersion WinAPI_DllInstall WinAPI_DllUninstall WinAPI_DPtoLP WinAPI_DragAcceptFiles WinAPI_DragFinish WinAPI_DragQueryFileEx WinAPI_DragQueryPoint WinAPI_DrawAnimatedRects WinAPI_DrawBitmap WinAPI_DrawEdge WinAPI_DrawFocusRect WinAPI_DrawFrameControl WinAPI_DrawIcon WinAPI_DrawIconEx WinAPI_DrawLine WinAPI_DrawShadowText WinAPI_DrawText WinAPI_DrawThemeBackground WinAPI_DrawThemeEdge WinAPI_DrawThemeIcon WinAPI_DrawThemeParentBackground WinAPI_DrawThemeText WinAPI_DrawThemeTextEx WinAPI_DuplicateEncryptionInfoFile WinAPI_DuplicateHandle WinAPI_DuplicateTokenEx WinAPI_DwmDefWindowProc WinAPI_DwmEnableBlurBehindWindow WinAPI_DwmEnableComposition WinAPI_DwmExtendFrameIntoClientArea WinAPI_DwmGetColorizationColor WinAPI_DwmGetColorizationParameters WinAPI_DwmGetWindowAttribute WinAPI_DwmInvalidateIconicBitmaps WinAPI_DwmIsCompositionEnabled WinAPI_DwmQueryThumbnailSourceSize WinAPI_DwmRegisterThumbnail WinAPI_DwmSetColorizationParameters WinAPI_DwmSetIconicLivePreviewBitmap WinAPI_DwmSetIconicThumbnail WinAPI_DwmSetWindowAttribute WinAPI_DwmUnregisterThumbnail WinAPI_DwmUpdateThumbnailProperties WinAPI_DWordToFloat WinAPI_DWordToInt WinAPI_EjectMedia WinAPI_Ellipse WinAPI_EmptyWorkingSet WinAPI_EnableWindow WinAPI_EncryptFile WinAPI_EncryptionDisable WinAPI_EndBufferedPaint WinAPI_EndDeferWindowPos WinAPI_EndPaint WinAPI_EndPath WinAPI_EndUpdateResource WinAPI_EnumChildProcess WinAPI_EnumChildWindows WinAPI_EnumDesktops WinAPI_EnumDesktopWindows WinAPI_EnumDeviceDrivers WinAPI_EnumDisplayDevices WinAPI_EnumDisplayMonitors WinAPI_EnumDisplaySettings WinAPI_EnumDllProc WinAPI_EnumFiles WinAPI_EnumFileStreams WinAPI_EnumFontFamilies WinAPI_EnumHardLinks WinAPI_EnumMRUList WinAPI_EnumPageFiles WinAPI_EnumProcessHandles WinAPI_EnumProcessModules WinAPI_EnumProcessThreads WinAPI_EnumProcessWindows WinAPI_EnumRawInputDevices WinAPI_EnumResourceLanguages WinAPI_EnumResourceNames WinAPI_EnumResourceTypes WinAPI_EnumSystemGeoID WinAPI_EnumSystemLocales WinAPI_EnumUILanguages WinAPI_EnumWindows WinAPI_EnumWindowsPopup WinAPI_EnumWindowStations WinAPI_EnumWindowsTop WinAPI_EqualMemory WinAPI_EqualRect WinAPI_EqualRgn WinAPI_ExcludeClipRect WinAPI_ExpandEnvironmentStrings WinAPI_ExtCreatePen WinAPI_ExtCreateRegion WinAPI_ExtFloodFill WinAPI_ExtractIcon WinAPI_ExtractIconEx WinAPI_ExtSelectClipRgn WinAPI_FatalAppExit WinAPI_FatalExit WinAPI_FileEncryptionStatus WinAPI_FileExists WinAPI_FileIconInit WinAPI_FileInUse WinAPI_FillMemory WinAPI_FillPath WinAPI_FillRect WinAPI_FillRgn WinAPI_FindClose WinAPI_FindCloseChangeNotification WinAPI_FindExecutable WinAPI_FindFirstChangeNotification WinAPI_FindFirstFile WinAPI_FindFirstFileName WinAPI_FindFirstStream WinAPI_FindNextChangeNotification WinAPI_FindNextFile WinAPI_FindNextFileName WinAPI_FindNextStream WinAPI_FindResource WinAPI_FindResourceEx WinAPI_FindTextDlg WinAPI_FindWindow WinAPI_FlashWindow WinAPI_FlashWindowEx WinAPI_FlattenPath WinAPI_FloatToDWord WinAPI_FloatToInt WinAPI_FlushFileBuffers WinAPI_FlushFRBuffer WinAPI_FlushViewOfFile WinAPI_FormatDriveDlg WinAPI_FormatMessage WinAPI_FrameRect WinAPI_FrameRgn WinAPI_FreeLibrary WinAPI_FreeMemory WinAPI_FreeMRUList WinAPI_FreeResource WinAPI_GdiComment WinAPI_GetActiveWindow WinAPI_GetAllUsersProfileDirectory WinAPI_GetAncestor WinAPI_GetApplicationRestartSettings WinAPI_GetArcDirection WinAPI_GetAsyncKeyState WinAPI_GetBinaryType WinAPI_GetBitmapBits WinAPI_GetBitmapDimension WinAPI_GetBitmapDimensionEx WinAPI_GetBkColor WinAPI_GetBkMode WinAPI_GetBoundsRect WinAPI_GetBrushOrg WinAPI_GetBufferedPaintBits WinAPI_GetBufferedPaintDC WinAPI_GetBufferedPaintTargetDC WinAPI_GetBufferedPaintTargetRect WinAPI_GetBValue WinAPI_GetCaretBlinkTime WinAPI_GetCaretPos WinAPI_GetCDType WinAPI_GetClassInfoEx WinAPI_GetClassLongEx WinAPI_GetClassName WinAPI_GetClientHeight WinAPI_GetClientRect WinAPI_GetClientWidth WinAPI_GetClipboardSequenceNumber WinAPI_GetClipBox WinAPI_GetClipCursor WinAPI_GetClipRgn WinAPI_GetColorAdjustment WinAPI_GetCompressedFileSize WinAPI_GetCompression WinAPI_GetConnectedDlg WinAPI_GetCurrentDirectory WinAPI_GetCurrentHwProfile WinAPI_GetCurrentObject WinAPI_GetCurrentPosition WinAPI_GetCurrentProcess WinAPI_GetCurrentProcessExplicitAppUserModelID WinAPI_GetCurrentProcessID WinAPI_GetCurrentThemeName WinAPI_GetCurrentThread WinAPI_GetCurrentThreadId WinAPI_GetCursor WinAPI_GetCursorInfo WinAPI_GetDateFormat WinAPI_GetDC WinAPI_GetDCEx WinAPI_GetDefaultPrinter WinAPI_GetDefaultUserProfileDirectory WinAPI_GetDesktopWindow WinAPI_GetDeviceCaps WinAPI_GetDeviceDriverBaseName WinAPI_GetDeviceDriverFileName WinAPI_GetDeviceGammaRamp WinAPI_GetDIBColorTable WinAPI_GetDIBits WinAPI_GetDiskFreeSpaceEx WinAPI_GetDlgCtrlID WinAPI_GetDlgItem WinAPI_GetDllDirectory WinAPI_GetDriveBusType WinAPI_GetDriveGeometryEx WinAPI_GetDriveNumber WinAPI_GetDriveType WinAPI_GetDurationFormat WinAPI_GetEffectiveClientRect WinAPI_GetEnhMetaFile WinAPI_GetEnhMetaFileBits WinAPI_GetEnhMetaFileDescription WinAPI_GetEnhMetaFileDimension WinAPI_GetEnhMetaFileHeader WinAPI_GetErrorMessage WinAPI_GetErrorMode WinAPI_GetExitCodeProcess WinAPI_GetExtended WinAPI_GetFileAttributes WinAPI_GetFileID WinAPI_GetFileInformationByHandle WinAPI_GetFileInformationByHandleEx WinAPI_GetFilePointerEx WinAPI_GetFileSizeEx WinAPI_GetFileSizeOnDisk WinAPI_GetFileTitle WinAPI_GetFileType WinAPI_GetFileVersionInfo WinAPI_GetFinalPathNameByHandle WinAPI_GetFinalPathNameByHandleEx WinAPI_GetFocus WinAPI_GetFontMemoryResourceInfo WinAPI_GetFontName WinAPI_GetFontResourceInfo WinAPI_GetForegroundWindow WinAPI_GetFRBuffer WinAPI_GetFullPathName WinAPI_GetGeoInfo WinAPI_GetGlyphOutline WinAPI_GetGraphicsMode WinAPI_GetGuiResources WinAPI_GetGUIThreadInfo WinAPI_GetGValue WinAPI_GetHandleInformation WinAPI_GetHGlobalFromStream WinAPI_GetIconDimension WinAPI_GetIconInfo WinAPI_GetIconInfoEx WinAPI_GetIdleTime WinAPI_GetKeyboardLayout WinAPI_GetKeyboardLayoutList WinAPI_GetKeyboardState WinAPI_GetKeyboardType WinAPI_GetKeyNameText WinAPI_GetKeyState WinAPI_GetLastActivePopup WinAPI_GetLastError WinAPI_GetLastErrorMessage WinAPI_GetLayeredWindowAttributes WinAPI_GetLocaleInfo WinAPI_GetLogicalDrives WinAPI_GetMapMode WinAPI_GetMemorySize WinAPI_GetMessageExtraInfo WinAPI_GetModuleFileNameEx WinAPI_GetModuleHandle WinAPI_GetModuleHandleEx WinAPI_GetModuleInformation WinAPI_GetMonitorInfo WinAPI_GetMousePos WinAPI_GetMousePosX WinAPI_GetMousePosY WinAPI_GetMUILanguage WinAPI_GetNumberFormat WinAPI_GetObject WinAPI_GetObjectID WinAPI_GetObjectInfoByHandle WinAPI_GetObjectNameByHandle WinAPI_GetObjectType WinAPI_GetOpenFileName WinAPI_GetOutlineTextMetrics WinAPI_GetOverlappedResult WinAPI_GetParent WinAPI_GetParentProcess WinAPI_GetPerformanceInfo WinAPI_GetPEType WinAPI_GetPhysicallyInstalledSystemMemory WinAPI_GetPixel WinAPI_GetPolyFillMode WinAPI_GetPosFromRect WinAPI_GetPriorityClass WinAPI_GetProcAddress WinAPI_GetProcessAffinityMask WinAPI_GetProcessCommandLine WinAPI_GetProcessFileName WinAPI_GetProcessHandleCount WinAPI_GetProcessID WinAPI_GetProcessIoCounters WinAPI_GetProcessMemoryInfo WinAPI_GetProcessName WinAPI_GetProcessShutdownParameters WinAPI_GetProcessTimes WinAPI_GetProcessUser WinAPI_GetProcessWindowStation WinAPI_GetProcessWorkingDirectory WinAPI_GetProfilesDirectory WinAPI_GetPwrCapabilities WinAPI_GetRawInputBuffer WinAPI_GetRawInputBufferLength WinAPI_GetRawInputData WinAPI_GetRawInputDeviceInfo WinAPI_GetRegionData WinAPI_GetRegisteredRawInputDevices WinAPI_GetRegKeyNameByHandle WinAPI_GetRgnBox WinAPI_GetROP2 WinAPI_GetRValue WinAPI_GetSaveFileName WinAPI_GetShellWindow WinAPI_GetStartupInfo WinAPI_GetStdHandle WinAPI_GetStockObject WinAPI_GetStretchBltMode WinAPI_GetString WinAPI_GetSysColor WinAPI_GetSysColorBrush WinAPI_GetSystemDefaultLangID WinAPI_GetSystemDefaultLCID WinAPI_GetSystemDefaultUILanguage WinAPI_GetSystemDEPPolicy WinAPI_GetSystemInfo WinAPI_GetSystemMetrics WinAPI_GetSystemPowerStatus WinAPI_GetSystemTimes WinAPI_GetSystemWow64Directory WinAPI_GetTabbedTextExtent WinAPI_GetTempFileName WinAPI_GetTextAlign WinAPI_GetTextCharacterExtra WinAPI_GetTextColor WinAPI_GetTextExtentPoint32 WinAPI_GetTextFace WinAPI_GetTextMetrics WinAPI_GetThemeAppProperties WinAPI_GetThemeBackgroundContentRect WinAPI_GetThemeBackgroundExtent WinAPI_GetThemeBackgroundRegion WinAPI_GetThemeBitmap WinAPI_GetThemeBool WinAPI_GetThemeColor WinAPI_GetThemeDocumentationProperty WinAPI_GetThemeEnumValue WinAPI_GetThemeFilename WinAPI_GetThemeFont WinAPI_GetThemeInt WinAPI_GetThemeMargins WinAPI_GetThemeMetric WinAPI_GetThemePartSize WinAPI_GetThemePosition WinAPI_GetThemePropertyOrigin WinAPI_GetThemeRect WinAPI_GetThemeString WinAPI_GetThemeSysBool WinAPI_GetThemeSysColor WinAPI_GetThemeSysColorBrush WinAPI_GetThemeSysFont WinAPI_GetThemeSysInt WinAPI_GetThemeSysSize WinAPI_GetThemeSysString WinAPI_GetThemeTextExtent WinAPI_GetThemeTextMetrics WinAPI_GetThemeTransitionDuration WinAPI_GetThreadDesktop WinAPI_GetThreadErrorMode WinAPI_GetThreadLocale WinAPI_GetThreadUILanguage WinAPI_GetTickCount WinAPI_GetTickCount64 WinAPI_GetTimeFormat WinAPI_GetTopWindow WinAPI_GetUDFColorMode WinAPI_GetUpdateRect WinAPI_GetUpdateRgn WinAPI_GetUserDefaultLangID WinAPI_GetUserDefaultLCID WinAPI_GetUserDefaultUILanguage WinAPI_GetUserGeoID WinAPI_GetUserObjectInformation WinAPI_GetVersion WinAPI_GetVersionEx WinAPI_GetVolumeInformation WinAPI_GetVolumeInformationByHandle WinAPI_GetVolumeNameForVolumeMountPoint WinAPI_GetWindow WinAPI_GetWindowDC WinAPI_GetWindowDisplayAffinity WinAPI_GetWindowExt WinAPI_GetWindowFileName WinAPI_GetWindowHeight WinAPI_GetWindowInfo WinAPI_GetWindowLong WinAPI_GetWindowOrg WinAPI_GetWindowPlacement WinAPI_GetWindowRect WinAPI_GetWindowRgn WinAPI_GetWindowRgnBox WinAPI_GetWindowSubclass WinAPI_GetWindowText WinAPI_GetWindowTheme WinAPI_GetWindowThreadProcessId WinAPI_GetWindowWidth WinAPI_GetWorkArea WinAPI_GetWorldTransform WinAPI_GetXYFromPoint WinAPI_GlobalMemoryStatus WinAPI_GradientFill WinAPI_GUIDFromString WinAPI_GUIDFromStringEx WinAPI_HashData WinAPI_HashString WinAPI_HiByte WinAPI_HideCaret WinAPI_HiDWord WinAPI_HiWord WinAPI_InflateRect WinAPI_InitMUILanguage WinAPI_InProcess WinAPI_IntersectClipRect WinAPI_IntersectRect WinAPI_IntToDWord WinAPI_IntToFloat WinAPI_InvalidateRect WinAPI_InvalidateRgn WinAPI_InvertANDBitmap WinAPI_InvertColor WinAPI_InvertRect WinAPI_InvertRgn WinAPI_IOCTL WinAPI_IsAlphaBitmap WinAPI_IsBadCodePtr WinAPI_IsBadReadPtr WinAPI_IsBadStringPtr WinAPI_IsBadWritePtr WinAPI_IsChild WinAPI_IsClassName WinAPI_IsDoorOpen WinAPI_IsElevated WinAPI_IsHungAppWindow WinAPI_IsIconic WinAPI_IsInternetConnected WinAPI_IsLoadKBLayout WinAPI_IsMemory WinAPI_IsNameInExpression WinAPI_IsNetworkAlive WinAPI_IsPathShared WinAPI_IsProcessInJob WinAPI_IsProcessorFeaturePresent WinAPI_IsRectEmpty WinAPI_IsThemeActive WinAPI_IsThemeBackgroundPartiallyTransparent WinAPI_IsThemePartDefined WinAPI_IsValidLocale WinAPI_IsWindow WinAPI_IsWindowEnabled WinAPI_IsWindowUnicode WinAPI_IsWindowVisible WinAPI_IsWow64Process WinAPI_IsWritable WinAPI_IsZoomed WinAPI_Keybd_Event WinAPI_KillTimer WinAPI_LineDDA WinAPI_LineTo WinAPI_LoadBitmap WinAPI_LoadCursor WinAPI_LoadCursorFromFile WinAPI_LoadIcon WinAPI_LoadIconMetric WinAPI_LoadIconWithScaleDown WinAPI_LoadImage WinAPI_LoadIndirectString WinAPI_LoadKeyboardLayout WinAPI_LoadLibrary WinAPI_LoadLibraryEx WinAPI_LoadMedia WinAPI_LoadResource WinAPI_LoadShell32Icon WinAPI_LoadString WinAPI_LoadStringEx WinAPI_LoByte WinAPI_LocalFree WinAPI_LockDevice WinAPI_LockFile WinAPI_LockResource WinAPI_LockWindowUpdate WinAPI_LockWorkStation WinAPI_LoDWord WinAPI_LongMid WinAPI_LookupIconIdFromDirectoryEx WinAPI_LoWord WinAPI_LPtoDP WinAPI_MAKELANGID WinAPI_MAKELCID WinAPI_MakeLong WinAPI_MakeQWord WinAPI_MakeWord WinAPI_MapViewOfFile WinAPI_MapVirtualKey WinAPI_MaskBlt WinAPI_MessageBeep WinAPI_MessageBoxCheck WinAPI_MessageBoxIndirect WinAPI_MirrorIcon WinAPI_ModifyWorldTransform WinAPI_MonitorFromPoint WinAPI_MonitorFromRect WinAPI_MonitorFromWindow WinAPI_Mouse_Event WinAPI_MoveFileEx WinAPI_MoveMemory WinAPI_MoveTo WinAPI_MoveToEx WinAPI_MoveWindow WinAPI_MsgBox WinAPI_MulDiv WinAPI_MultiByteToWideChar WinAPI_MultiByteToWideCharEx WinAPI_NtStatusToDosError WinAPI_OemToChar WinAPI_OffsetClipRgn WinAPI_OffsetPoints WinAPI_OffsetRect WinAPI_OffsetRgn WinAPI_OffsetWindowOrg WinAPI_OpenDesktop WinAPI_OpenFileById WinAPI_OpenFileDlg WinAPI_OpenFileMapping WinAPI_OpenIcon WinAPI_OpenInputDesktop WinAPI_OpenJobObject WinAPI_OpenMutex WinAPI_OpenProcess WinAPI_OpenProcessToken WinAPI_OpenSemaphore WinAPI_OpenThemeData WinAPI_OpenWindowStation WinAPI_PageSetupDlg WinAPI_PaintDesktop WinAPI_PaintRgn WinAPI_ParseURL WinAPI_ParseUserName WinAPI_PatBlt WinAPI_PathAddBackslash WinAPI_PathAddExtension WinAPI_PathAppend WinAPI_PathBuildRoot WinAPI_PathCanonicalize WinAPI_PathCommonPrefix WinAPI_PathCompactPath WinAPI_PathCompactPathEx WinAPI_PathCreateFromUrl WinAPI_PathFindExtension WinAPI_PathFindFileName WinAPI_PathFindNextComponent WinAPI_PathFindOnPath WinAPI_PathGetArgs WinAPI_PathGetCharType WinAPI_PathGetDriveNumber WinAPI_PathIsContentType WinAPI_PathIsDirectory WinAPI_PathIsDirectoryEmpty WinAPI_PathIsExe WinAPI_PathIsFileSpec WinAPI_PathIsLFNFileSpec WinAPI_PathIsRelative WinAPI_PathIsRoot WinAPI_PathIsSameRoot WinAPI_PathIsSystemFolder WinAPI_PathIsUNC WinAPI_PathIsUNCServer WinAPI_PathIsUNCServerShare WinAPI_PathMakeSystemFolder WinAPI_PathMatchSpec WinAPI_PathParseIconLocation WinAPI_PathRelativePathTo WinAPI_PathRemoveArgs WinAPI_PathRemoveBackslash WinAPI_PathRemoveExtension WinAPI_PathRemoveFileSpec WinAPI_PathRenameExtension WinAPI_PathSearchAndQualify WinAPI_PathSkipRoot WinAPI_PathStripPath WinAPI_PathStripToRoot WinAPI_PathToRegion WinAPI_PathUndecorate WinAPI_PathUnExpandEnvStrings WinAPI_PathUnmakeSystemFolder WinAPI_PathUnquoteSpaces WinAPI_PathYetAnotherMakeUniqueName WinAPI_PickIconDlg WinAPI_PlayEnhMetaFile WinAPI_PlaySound WinAPI_PlgBlt WinAPI_PointFromRect WinAPI_PolyBezier WinAPI_PolyBezierTo WinAPI_PolyDraw WinAPI_Polygon WinAPI_PostMessage WinAPI_PrimaryLangId WinAPI_PrintDlg WinAPI_PrintDlgEx WinAPI_PrintWindow WinAPI_ProgIDFromCLSID WinAPI_PtInRect WinAPI_PtInRectEx WinAPI_PtInRegion WinAPI_PtVisible WinAPI_QueryDosDevice WinAPI_QueryInformationJobObject WinAPI_QueryPerformanceCounter WinAPI_QueryPerformanceFrequency WinAPI_RadialGradientFill WinAPI_ReadDirectoryChanges WinAPI_ReadFile WinAPI_ReadProcessMemory WinAPI_Rectangle WinAPI_RectInRegion WinAPI_RectIsEmpty WinAPI_RectVisible WinAPI_RedrawWindow WinAPI_RegCloseKey WinAPI_RegConnectRegistry WinAPI_RegCopyTree WinAPI_RegCopyTreeEx WinAPI_RegCreateKey WinAPI_RegDeleteEmptyKey WinAPI_RegDeleteKey WinAPI_RegDeleteKeyValue WinAPI_RegDeleteTree WinAPI_RegDeleteTreeEx WinAPI_RegDeleteValue WinAPI_RegDisableReflectionKey WinAPI_RegDuplicateHKey WinAPI_RegEnableReflectionKey WinAPI_RegEnumKey WinAPI_RegEnumValue WinAPI_RegFlushKey WinAPI_RegisterApplicationRestart WinAPI_RegisterClass WinAPI_RegisterClassEx WinAPI_RegisterHotKey WinAPI_RegisterPowerSettingNotification WinAPI_RegisterRawInputDevices WinAPI_RegisterShellHookWindow WinAPI_RegisterWindowMessage WinAPI_RegLoadMUIString WinAPI_RegNotifyChangeKeyValue WinAPI_RegOpenKey WinAPI_RegQueryInfoKey WinAPI_RegQueryLastWriteTime WinAPI_RegQueryMultipleValues WinAPI_RegQueryReflectionKey WinAPI_RegQueryValue WinAPI_RegRestoreKey WinAPI_RegSaveKey WinAPI_RegSetValue WinAPI_ReleaseCapture WinAPI_ReleaseDC WinAPI_ReleaseMutex WinAPI_ReleaseSemaphore WinAPI_ReleaseStream WinAPI_RemoveClipboardFormatListener WinAPI_RemoveDirectory WinAPI_RemoveFontMemResourceEx WinAPI_RemoveFontResourceEx WinAPI_RemoveWindowSubclass WinAPI_ReOpenFile WinAPI_ReplaceFile WinAPI_ReplaceTextDlg WinAPI_ResetEvent WinAPI_RestartDlg WinAPI_RestoreDC WinAPI_RGB WinAPI_RotatePoints WinAPI_RoundRect WinAPI_SaveDC WinAPI_SaveFileDlg WinAPI_SaveHBITMAPToFile WinAPI_SaveHICONToFile WinAPI_ScaleWindowExt WinAPI_ScreenToClient WinAPI_SearchPath WinAPI_SelectClipPath WinAPI_SelectClipRgn WinAPI_SelectObject WinAPI_SendMessageTimeout WinAPI_SetActiveWindow WinAPI_SetArcDirection WinAPI_SetBitmapBits WinAPI_SetBitmapDimensionEx WinAPI_SetBkColor WinAPI_SetBkMode WinAPI_SetBoundsRect WinAPI_SetBrushOrg WinAPI_SetCapture WinAPI_SetCaretBlinkTime WinAPI_SetCaretPos WinAPI_SetClassLongEx WinAPI_SetColorAdjustment WinAPI_SetCompression WinAPI_SetCurrentDirectory WinAPI_SetCurrentProcessExplicitAppUserModelID WinAPI_SetCursor WinAPI_SetDCBrushColor WinAPI_SetDCPenColor WinAPI_SetDefaultPrinter WinAPI_SetDeviceGammaRamp WinAPI_SetDIBColorTable WinAPI_SetDIBits WinAPI_SetDIBitsToDevice WinAPI_SetDllDirectory WinAPI_SetEndOfFile WinAPI_SetEnhMetaFileBits WinAPI_SetErrorMode WinAPI_SetEvent WinAPI_SetFileAttributes WinAPI_SetFileInformationByHandleEx WinAPI_SetFilePointer WinAPI_SetFilePointerEx WinAPI_SetFileShortName WinAPI_SetFileValidData WinAPI_SetFocus WinAPI_SetFont WinAPI_SetForegroundWindow WinAPI_SetFRBuffer WinAPI_SetGraphicsMode WinAPI_SetHandleInformation WinAPI_SetInformationJobObject WinAPI_SetKeyboardLayout WinAPI_SetKeyboardState WinAPI_SetLastError WinAPI_SetLayeredWindowAttributes WinAPI_SetLocaleInfo WinAPI_SetMapMode WinAPI_SetMessageExtraInfo WinAPI_SetParent WinAPI_SetPixel WinAPI_SetPolyFillMode WinAPI_SetPriorityClass WinAPI_SetProcessAffinityMask WinAPI_SetProcessShutdownParameters WinAPI_SetProcessWindowStation WinAPI_SetRectRgn WinAPI_SetROP2 WinAPI_SetSearchPathMode WinAPI_SetStretchBltMode WinAPI_SetSysColors WinAPI_SetSystemCursor WinAPI_SetTextAlign WinAPI_SetTextCharacterExtra WinAPI_SetTextColor WinAPI_SetTextJustification WinAPI_SetThemeAppProperties WinAPI_SetThreadDesktop WinAPI_SetThreadErrorMode WinAPI_SetThreadExecutionState WinAPI_SetThreadLocale WinAPI_SetThreadUILanguage WinAPI_SetTimer WinAPI_SetUDFColorMode WinAPI_SetUserGeoID WinAPI_SetUserObjectInformation WinAPI_SetVolumeMountPoint WinAPI_SetWindowDisplayAffinity WinAPI_SetWindowExt WinAPI_SetWindowLong WinAPI_SetWindowOrg WinAPI_SetWindowPlacement WinAPI_SetWindowPos WinAPI_SetWindowRgn WinAPI_SetWindowsHookEx WinAPI_SetWindowSubclass WinAPI_SetWindowText WinAPI_SetWindowTheme WinAPI_SetWinEventHook WinAPI_SetWorldTransform WinAPI_SfcIsFileProtected WinAPI_SfcIsKeyProtected WinAPI_ShellAboutDlg WinAPI_ShellAddToRecentDocs WinAPI_ShellChangeNotify WinAPI_ShellChangeNotifyDeregister WinAPI_ShellChangeNotifyRegister WinAPI_ShellCreateDirectory WinAPI_ShellEmptyRecycleBin WinAPI_ShellExecute WinAPI_ShellExecuteEx WinAPI_ShellExtractAssociatedIcon WinAPI_ShellExtractIcon WinAPI_ShellFileOperation WinAPI_ShellFlushSFCache WinAPI_ShellGetFileInfo WinAPI_ShellGetIconOverlayIndex WinAPI_ShellGetImageList WinAPI_ShellGetKnownFolderIDList WinAPI_ShellGetKnownFolderPath WinAPI_ShellGetLocalizedName WinAPI_ShellGetPathFromIDList WinAPI_ShellGetSetFolderCustomSettings WinAPI_ShellGetSettings WinAPI_ShellGetSpecialFolderLocation WinAPI_ShellGetSpecialFolderPath WinAPI_ShellGetStockIconInfo WinAPI_ShellILCreateFromPath WinAPI_ShellNotifyIcon WinAPI_ShellNotifyIconGetRect WinAPI_ShellObjectProperties WinAPI_ShellOpenFolderAndSelectItems WinAPI_ShellOpenWithDlg WinAPI_ShellQueryRecycleBin WinAPI_ShellQueryUserNotificationState WinAPI_ShellRemoveLocalizedName WinAPI_ShellRestricted WinAPI_ShellSetKnownFolderPath WinAPI_ShellSetLocalizedName WinAPI_ShellSetSettings WinAPI_ShellStartNetConnectionDlg WinAPI_ShellUpdateImage WinAPI_ShellUserAuthenticationDlg WinAPI_ShellUserAuthenticationDlgEx WinAPI_ShortToWord WinAPI_ShowCaret WinAPI_ShowCursor WinAPI_ShowError WinAPI_ShowLastError WinAPI_ShowMsg WinAPI_ShowOwnedPopups WinAPI_ShowWindow WinAPI_ShutdownBlockReasonCreate WinAPI_ShutdownBlockReasonDestroy WinAPI_ShutdownBlockReasonQuery WinAPI_SizeOfResource WinAPI_StretchBlt WinAPI_StretchDIBits WinAPI_StrFormatByteSize WinAPI_StrFormatByteSizeEx WinAPI_StrFormatKBSize WinAPI_StrFromTimeInterval WinAPI_StringFromGUID WinAPI_StringLenA WinAPI_StringLenW WinAPI_StrLen WinAPI_StrokeAndFillPath WinAPI_StrokePath WinAPI_StructToArray WinAPI_SubLangId WinAPI_SubtractRect WinAPI_SwapDWord WinAPI_SwapQWord WinAPI_SwapWord WinAPI_SwitchColor WinAPI_SwitchDesktop WinAPI_SwitchToThisWindow WinAPI_SystemParametersInfo WinAPI_TabbedTextOut WinAPI_TerminateJobObject WinAPI_TerminateProcess WinAPI_TextOut WinAPI_TileWindows WinAPI_TrackMouseEvent WinAPI_TransparentBlt WinAPI_TwipsPerPixelX WinAPI_TwipsPerPixelY WinAPI_UnhookWindowsHookEx WinAPI_UnhookWinEvent WinAPI_UnionRect WinAPI_UnionStruct WinAPI_UniqueHardwareID WinAPI_UnloadKeyboardLayout WinAPI_UnlockFile WinAPI_UnmapViewOfFile WinAPI_UnregisterApplicationRestart WinAPI_UnregisterClass WinAPI_UnregisterHotKey WinAPI_UnregisterPowerSettingNotification WinAPI_UpdateLayeredWindow WinAPI_UpdateLayeredWindowEx WinAPI_UpdateLayeredWindowIndirect WinAPI_UpdateResource WinAPI_UpdateWindow WinAPI_UrlApplyScheme WinAPI_UrlCanonicalize WinAPI_UrlCombine WinAPI_UrlCompare WinAPI_UrlCreateFromPath WinAPI_UrlFixup WinAPI_UrlGetPart WinAPI_UrlHash WinAPI_UrlIs WinAPI_UserHandleGrantAccess WinAPI_ValidateRect WinAPI_ValidateRgn WinAPI_VerQueryRoot WinAPI_VerQueryValue WinAPI_VerQueryValueEx WinAPI_WaitForInputIdle WinAPI_WaitForMultipleObjects WinAPI_WaitForSingleObject WinAPI_WideCharToMultiByte WinAPI_WidenPath WinAPI_WindowFromDC WinAPI_WindowFromPoint WinAPI_WordToShort WinAPI_Wow64EnableWow64FsRedirection WinAPI_WriteConsole WinAPI_WriteFile WinAPI_WriteProcessMemory WinAPI_ZeroMemory WinNet_AddConnection WinNet_AddConnection2 WinNet_AddConnection3 WinNet_CancelConnection WinNet_CancelConnection2 WinNet_CloseEnum WinNet_ConnectionDialog WinNet_ConnectionDialog1 WinNet_DisconnectDialog WinNet_DisconnectDialog1 WinNet_EnumResource WinNet_GetConnection WinNet_GetConnectionPerformance WinNet_GetLastError WinNet_GetNetworkInformation WinNet_GetProviderName WinNet_GetResourceInformation WinNet_GetResourceParent WinNet_GetUniversalName WinNet_GetUser WinNet_OpenEnum WinNet_RestoreConnection WinNet_UseConnection Word_Create Word_DocAdd Word_DocAttach Word_DocClose Word_DocExport Word_DocFind Word_DocFindReplace Word_DocGet Word_DocLinkAdd Word_DocLinkGet Word_DocOpen Word_DocPictureAdd Word_DocPrint Word_DocRangeSet Word_DocSave Word_DocSaveAs Word_DocTableRead Word_DocTableWrite Word_Quit",I={
-v:[e.C(";","$",{r:0}),e.C("#cs","#ce"),e.C("#comments-start","#comments-end")]},n={b:"\\$[A-z0-9_]+"},l={cN:"string",v:[{b:/"/,e:/"/,c:[{b:/""/,r:0}]},{b:/'/,e:/'/,c:[{b:/''/,r:0}]}]},o={v:[e.BNM,e.CNM]},a={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"include include-once NoTrayIcon OnAutoItStartRegister RequireAdmin pragma Au3Stripper_Ignore_Funcs Au3Stripper_Ignore_Variables Au3Stripper_Off Au3Stripper_On Au3Stripper_Parameters AutoIt3Wrapper_Add_Constants AutoIt3Wrapper_Au3Check_Parameters AutoIt3Wrapper_Au3Check_Stop_OnWarning AutoIt3Wrapper_Aut2Exe AutoIt3Wrapper_AutoIt3 AutoIt3Wrapper_AutoIt3Dir AutoIt3Wrapper_Change2CUI AutoIt3Wrapper_Compile_Both AutoIt3Wrapper_Compression AutoIt3Wrapper_EndIf AutoIt3Wrapper_Icon AutoIt3Wrapper_If_Compile AutoIt3Wrapper_If_Run AutoIt3Wrapper_Jump_To_First_Error AutoIt3Wrapper_OutFile AutoIt3Wrapper_OutFile_Type AutoIt3Wrapper_OutFile_X64 AutoIt3Wrapper_PlugIn_Funcs AutoIt3Wrapper_Res_Comment Autoit3Wrapper_Res_Compatibility AutoIt3Wrapper_Res_Description AutoIt3Wrapper_Res_Field AutoIt3Wrapper_Res_File_Add AutoIt3Wrapper_Res_FileVersion AutoIt3Wrapper_Res_FileVersion_AutoIncrement AutoIt3Wrapper_Res_Icon_Add AutoIt3Wrapper_Res_Language AutoIt3Wrapper_Res_LegalCopyright AutoIt3Wrapper_Res_ProductVersion AutoIt3Wrapper_Res_requestedExecutionLevel AutoIt3Wrapper_Res_SaveSource AutoIt3Wrapper_Run_After AutoIt3Wrapper_Run_Au3Check AutoIt3Wrapper_Run_Au3Stripper AutoIt3Wrapper_Run_Before AutoIt3Wrapper_Run_Debug_Mode AutoIt3Wrapper_Run_SciTE_Minimized AutoIt3Wrapper_Run_SciTE_OutputPane_Minimized AutoIt3Wrapper_Run_Tidy AutoIt3Wrapper_ShowProgress AutoIt3Wrapper_Testing AutoIt3Wrapper_Tidy_Stop_OnError AutoIt3Wrapper_UPX_Parameters AutoIt3Wrapper_UseUPX AutoIt3Wrapper_UseX64 AutoIt3Wrapper_Version AutoIt3Wrapper_Versioning AutoIt3Wrapper_Versioning_Parameters Tidy_Off Tidy_On Tidy_Parameters EndRegion Region"},c:[{b:/\\\n/,r:0},{bK:"include",k:{"meta-keyword":"include"},e:"$",c:[l,{cN:"meta-string",v:[{b:"<",e:">"},{b:/"/,e:/"/,c:[{b:/""/,r:0}]},{b:/'/,e:/'/,c:[{b:/''/,r:0}]}]}]},l,I]},_={cN:"symbol",b:"@[A-z0-9_]+"},G={cN:"function",bK:"Func",e:"$",i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:[n,l,o]}]};return{cI:!0,i:/\/\*/,k:{keyword:t,built_in:i,literal:r},c:[I,n,l,o,a,_,G]}});
\ No newline at end of file
+hljs.registerLanguage("autoit",function(e){var t="ByRef Case Const ContinueCase ContinueLoop Default Dim Do Else ElseIf EndFunc EndIf EndSelect EndSwitch EndWith Enum Exit ExitLoop For Func Global If In Local Next ReDim Return Select Static Step Switch Then To Until Volatile WEnd While With",r="True False And Null Not Or",i="Abs ACos AdlibRegister AdlibUnRegister Asc AscW ASin Assign ATan AutoItSetOption AutoItWinGetTitle AutoItWinSetTitle Beep Binary BinaryLen BinaryMid BinaryToString BitAND BitNOT BitOR BitRotate BitShift BitXOR BlockInput Break Call CDTray Ceiling Chr ChrW ClipGet ClipPut ConsoleRead ConsoleWrite ConsoleWriteError ControlClick ControlCommand ControlDisable ControlEnable ControlFocus ControlGetFocus ControlGetHandle ControlGetPos ControlGetText ControlHide ControlListView ControlMove ControlSend ControlSetText ControlShow ControlTreeView Cos Dec DirCopy DirCreate DirGetSize DirMove DirRemove DllCall DllCallAddress DllCallbackFree DllCallbackGetPtr DllCallbackRegister DllClose DllOpen DllStructCreate DllStructGetData DllStructGetPtr DllStructGetSize DllStructSetData DriveGetDrive DriveGetFileSystem DriveGetLabel DriveGetSerial DriveGetType DriveMapAdd DriveMapDel DriveMapGet DriveSetLabel DriveSpaceFree DriveSpaceTotal DriveStatus EnvGet EnvSet EnvUpdate Eval Execute Exp FileChangeDir FileClose FileCopy FileCreateNTFSLink FileCreateShortcut FileDelete FileExists FileFindFirstFile FileFindNextFile FileFlush FileGetAttrib FileGetEncoding FileGetLongName FileGetPos FileGetShortcut FileGetShortName FileGetSize FileGetTime FileGetVersion FileInstall FileMove FileOpen FileOpenDialog FileRead FileReadLine FileReadToArray FileRecycle FileRecycleEmpty FileSaveDialog FileSelectFolder FileSetAttrib FileSetEnd FileSetPos FileSetTime FileWrite FileWriteLine Floor FtpSetProxy FuncName GUICreate GUICtrlCreateAvi GUICtrlCreateButton GUICtrlCreateCheckbox GUICtrlCreateCombo GUICtrlCreateContextMenu GUICtrlCreateDate GUICtrlCreateDummy GUICtrlCreateEdit GUICtrlCreateGraphic GUICtrlCreateGroup GUICtrlCreateIcon GUICtrlCreateInput GUICtrlCreateLabel GUICtrlCreateList GUICtrlCreateListView GUICtrlCreateListViewItem GUICtrlCreateMenu GUICtrlCreateMenuItem GUICtrlCreateMonthCal GUICtrlCreateObj GUICtrlCreatePic GUICtrlCreateProgress GUICtrlCreateRadio GUICtrlCreateSlider GUICtrlCreateTab GUICtrlCreateTabItem GUICtrlCreateTreeView GUICtrlCreateTreeViewItem GUICtrlCreateUpdown GUICtrlDelete GUICtrlGetHandle GUICtrlGetState GUICtrlRead GUICtrlRecvMsg GUICtrlRegisterListViewSort GUICtrlSendMsg GUICtrlSendToDummy GUICtrlSetBkColor GUICtrlSetColor GUICtrlSetCursor GUICtrlSetData GUICtrlSetDefBkColor GUICtrlSetDefColor GUICtrlSetFont GUICtrlSetGraphic GUICtrlSetImage GUICtrlSetLimit GUICtrlSetOnEvent GUICtrlSetPos GUICtrlSetResizing GUICtrlSetState GUICtrlSetStyle GUICtrlSetTip GUIDelete GUIGetCursorInfo GUIGetMsg GUIGetStyle GUIRegisterMsg GUISetAccelerators GUISetBkColor GUISetCoord GUISetCursor GUISetFont GUISetHelp GUISetIcon GUISetOnEvent GUISetState GUISetStyle GUIStartGroup GUISwitch Hex HotKeySet HttpSetProxy HttpSetUserAgent HWnd InetClose InetGet InetGetInfo InetGetSize InetRead IniDelete IniRead IniReadSection IniReadSectionNames IniRenameSection IniWrite IniWriteSection InputBox Int IsAdmin IsArray IsBinary IsBool IsDeclared IsDllStruct IsFloat IsFunc IsHWnd IsInt IsKeyword IsNumber IsObj IsPtr IsString Log MemGetStats Mod MouseClick MouseClickDrag MouseDown MouseGetCursor MouseGetPos MouseMove MouseUp MouseWheel MsgBox Number ObjCreate ObjCreateInterface ObjEvent ObjGet ObjName OnAutoItExitRegister OnAutoItExitUnRegister Ping PixelChecksum PixelGetColor PixelSearch ProcessClose ProcessExists ProcessGetStats ProcessList ProcessSetPriority ProcessWait ProcessWaitClose ProgressOff ProgressOn ProgressSet Ptr Random RegDelete RegEnumKey RegEnumVal RegRead RegWrite Round Run RunAs RunAsWait RunWait Send SendKeepActive SetError SetExtended ShellExecute ShellExecuteWait Shutdown Sin Sleep SoundPlay SoundSetWaveVolume SplashImageOn SplashOff SplashTextOn Sqrt SRandom StatusbarGetText StderrRead StdinWrite StdioClose StdoutRead String StringAddCR StringCompare StringFormat StringFromASCIIArray StringInStr StringIsAlNum StringIsAlpha StringIsASCII StringIsDigit StringIsFloat StringIsInt StringIsLower StringIsSpace StringIsUpper StringIsXDigit StringLeft StringLen StringLower StringMid StringRegExp StringRegExpReplace StringReplace StringReverse StringRight StringSplit StringStripCR StringStripWS StringToASCIIArray StringToBinary StringTrimLeft StringTrimRight StringUpper Tan TCPAccept TCPCloseSocket TCPConnect TCPListen TCPNameToIP TCPRecv TCPSend TCPShutdown, UDPShutdown TCPStartup, UDPStartup TimerDiff TimerInit ToolTip TrayCreateItem TrayCreateMenu TrayGetMsg TrayItemDelete TrayItemGetHandle TrayItemGetState TrayItemGetText TrayItemSetOnEvent TrayItemSetState TrayItemSetText TraySetClick TraySetIcon TraySetOnEvent TraySetPauseIcon TraySetState TraySetToolTip TrayTip UBound UDPBind UDPCloseSocket UDPOpen UDPRecv UDPSend VarGetType WinActivate WinActive WinClose WinExists WinFlash WinGetCaretPos WinGetClassList WinGetClientSize WinGetHandle WinGetPos WinGetProcess WinGetState WinGetText WinGetTitle WinKill WinList WinMenuSelectItem WinMinimizeAll WinMinimizeAllUndo WinMove WinSetOnTop WinSetState WinSetTitle WinSetTrans WinWait",l={v:[e.C(";","$",{r:0}),e.C("#cs","#ce"),e.C("#comments-start","#comments-end")]},n={b:"\\$[A-z0-9_]+"},o={cN:"string",v:[{b:/"/,e:/"/,c:[{b:/""/,r:0}]},{b:/'/,e:/'/,c:[{b:/''/,r:0}]}]},a={v:[e.BNM,e.CNM]},S={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"comments include include-once NoTrayIcon OnAutoItStartRegister pragma compile RequireAdmin"},c:[{b:/\\\n/,r:0},{bK:"include",k:{"meta-keyword":"include"},e:"$",c:[o,{cN:"meta-string",v:[{b:"<",e:">"},{b:/"/,e:/"/,c:[{b:/""/,r:0}]},{b:/'/,e:/'/,c:[{b:/''/,r:0}]}]}]},o,l]},C={cN:"symbol",b:"@[A-z0-9_]+"},s={cN:"function",bK:"Func",e:"$",i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:[n,o,a]}]};return{cI:!0,i:/\/\*/,k:{keyword:t,built_in:i,literal:r},c:[l,n,o,a,S,C,s]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/awk.js b/lib/highlight_js/assets/lang/awk.js
new file mode 100644
index 00000000000..a4fb5573392
--- /dev/null
+++ b/lib/highlight_js/assets/lang/awk.js
@@ -0,0 +1 @@
+hljs.registerLanguage("awk",function(e){var r={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},b="BEGIN END if else while do for in break continue delete next nextfile function func exit|10",n={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,r:10},{b:/(u|b)?r?"""/,e:/"""/,r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]};return{k:{keyword:b},c:[r,n,e.RM,e.HCM,e.NM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/bash.js b/lib/highlight_js/assets/lang/bash.js
index 7d4af5a1755..da88c0dc664 100644
--- a/lib/highlight_js/assets/lang/bash.js
+++ b/lib/highlight_js/assets/lang/bash.js
@@ -1 +1 @@
-hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\.]+/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});
\ No newline at end of file
+hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/\b-?[a-z\._]+\b/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/bnf.js b/lib/highlight_js/assets/lang/bnf.js
new file mode 100644
index 00000000000..93e05653e9a
--- /dev/null
+++ b/lib/highlight_js/assets/lang/bnf.js
@@ -0,0 +1 @@
+hljs.registerLanguage("bnf",function(e){return{c:[{cN:"attribute",b:/</,e:/>/},{b:/::=/,starts:{e:/$/,c:[{b:/</,e:/>/},e.CLCM,e.CBCM,e.ASM,e.QSM]}}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/clean.js b/lib/highlight_js/assets/lang/clean.js
new file mode 100644
index 00000000000..a2e816baf1b
--- /dev/null
+++ b/lib/highlight_js/assets/lang/clean.js
@@ -0,0 +1 @@
+hljs.registerLanguage("clean",function(e){return{aliases:["clean","icl","dcl"],k:{keyword:"if let in with where case of class instance otherwise implementation definition system module from import qualified as special code inline foreign export ccall stdcall generic derive infix infixl infixr",literal:"True False"},c:[e.CLCM,e.CBCM,e.ASM,e.QSM,e.CNM,{b:"->|<-[|:]?|::|#!?|>>=|\\{\\||\\|\\}|:==|=:|\\.\\.|<>|`"}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/clojure.js b/lib/highlight_js/assets/lang/clojure.js
index 61aafe085dd..94f93598fc5 100644
--- a/lib/highlight_js/assets/lang/clojure.js
+++ b/lib/highlight_js/assets/lang/clojure.js
@@ -1 +1 @@
-hljs.registerLanguage("clojure",function(e){var t={"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},i=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"symbol",b:"[:]"+n},f={b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"name",b:n,starts:h},b=[f,i,m,p,c,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,{aliases:["clj"],i:/\S/,c:[f,i,m,p,c,u,l,s,d]}});
\ No newline at end of file
+hljs.registerLanguage("clojure",function(e){var t={"builtin-name":"def defonce cond apply if-not if-let if not not= = < > <= >= == + / * - rem quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? string? map? nil? contains? zero? instance? not-every? not-any? libspec? -> ->> .. . inc compare do dotimes mapcat take remove take-while drop letfn drop-last take-last drop-while while intern condp case reduced cycle split-at split-with repeat replicate iterate range merge zipmap declare line-seq sort comparator sort-by dorun doall nthnext nthrest partition eval doseq await await-for let agent atom send send-off release-pending-sends add-watch mapv filterv remove-watch agent-error restart-agent set-error-handler error-handler set-error-mode! error-mode shutdown-agents quote var fn loop recur throw try monitor-enter monitor-exit defmacro defn defn- macroexpand macroexpand-1 for dosync and or when when-not when-let comp juxt partial sequence memoize constantly complement identity assert peek pop doto proxy defstruct first rest cons defprotocol cast coll deftype defrecord last butlast sigs reify second ffirst fnext nfirst nnext defmulti defmethod meta with-meta ns in-ns create-ns import refer keys select-keys vals key val rseq name namespace promise into transient persistent! conj! assoc! dissoc! pop! disj! use class type num float double short byte boolean bigint biginteger bigdec print-method print-dup throw-if printf format load compile get-in update-in pr pr-on newline flush read slurp read-line subvec with-open memfn time re-find re-groups rand-int rand mod locking assert-valid-fdecl alias resolve ref deref refset swap! reset! set-validator! compare-and-set! alter-meta! reset-meta! commute get-validator alter ref-set ref-history-count ref-min-history ref-max-history ensure sync io! new next conj set! to-array future future-call into-array aset gen-class reduce map filter find empty hash-map hash-set sorted-map sorted-map-by sorted-set sorted-set-by vec vector seq flatten reverse assoc dissoc list disj get union difference intersection extend extend-type extend-protocol int nth delay count concat chunk chunk-buffer chunk-append chunk-first chunk-rest max min dec unchecked-inc-int unchecked-inc unchecked-dec-inc unchecked-dec unchecked-negate unchecked-add-int unchecked-add unchecked-subtract-int unchecked-subtract chunk-next chunk-cons chunked-seq? prn vary-meta lazy-seq spread list* str find-keyword keyword symbol gensym force rationalize"},r="a-zA-Z_\\-!.?+*=<>&#'",n="["+r+"]["+r+"0-9/;:]*",a="[-+]?\\d+(\\.\\d+)?",o={b:n,r:0},s={cN:"number",b:a,r:0},c=e.inherit(e.QSM,{i:null}),i=e.C(";","$",{r:0}),d={cN:"literal",b:/\b(true|false|nil)\b/},l={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+n},p=e.C("\\^\\{","\\}"),u={cN:"symbol",b:"[:]{1,2}"+n},f={b:"\\(",e:"\\)"},h={eW:!0,r:0},y={k:t,l:n,cN:"name",b:n,starts:h},b=[f,c,m,p,i,u,l,s,d,o];return f.c=[e.C("comment",""),y,h],h.c=b,l.c=b,p.c=[l],{aliases:["clj"],i:/\S/,c:[f,c,m,p,i,u,l,s,d]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/coffeescript.js b/lib/highlight_js/assets/lang/coffeescript.js
index f3299c5b7b5..50ce0728e64 100644
--- a/lib/highlight_js/assets/lang/coffeescript.js
+++ b/lib/highlight_js/assets/lang/coffeescript.js
@@ -1 +1 @@
-hljs.registerLanguage("coffeescript",function(e){var c={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",built_in:"npm require console print module global window document"},n="[A-Za-z$_][0-9A-Za-z$_]*",r={cN:"subst",b:/#\{/,e:/}/,k:c},s=[e.BNM,e.inherit(e.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,r]},{b:/"/,e:/"/,c:[e.BE,r]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[r,e.HCM]},{b:"//[gim]*",r:0},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}]},{b:"@"+n},{b:"`",e:"`",eB:!0,eE:!0,sL:"javascript"}];r.c=s;var i=e.inherit(e.TM,{b:n}),t="(\\(.*\\))?\\s*\\B[-=]>",o={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:c,c:["self"].concat(s)}]};return{aliases:["coffee","cson","iced"],k:c,i:/\/\*/,c:s.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+n+"\\s*=\\s*"+t,e:"[-=]>",rB:!0,c:[i,o]},{b:/[:\(,=]\s*/,r:0,c:[{cN:"function",b:t,e:"[-=]>",rB:!0,c:[o]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[i]},i]},{b:n+":",e:":",rB:!0,rE:!0,r:0}])}});
\ No newline at end of file
+hljs.registerLanguage("coffeescript",function(e){var c={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super yield import export from as default await then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",built_in:"npm require console print module global window document"},n="[A-Za-z$_][0-9A-Za-z$_]*",r={cN:"subst",b:/#\{/,e:/}/,k:c},i=[e.BNM,e.inherit(e.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,r]},{b:/"/,e:/"/,c:[e.BE,r]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[r,e.HCM]},{b:"//[gim]*",r:0},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}]},{b:"@"+n},{sL:"javascript",eB:!0,eE:!0,v:[{b:"```",e:"```"},{b:"`",e:"`"}]}];r.c=i;var s=e.inherit(e.TM,{b:n}),t="(\\(.*\\))?\\s*\\B[-=]>",o={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:c,c:["self"].concat(i)}]};return{aliases:["coffee","cson","iced"],k:c,i:/\/\*/,c:i.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+n+"\\s*=\\s*"+t,e:"[-=]>",rB:!0,c:[s,o]},{b:/[:\(,=]\s*/,r:0,c:[{cN:"function",b:t,e:"[-=]>",rB:!0,c:[o]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[s]},s]},{b:n+":",e:":",rB:!0,rE:!0,r:0}])}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/coq.js b/lib/highlight_js/assets/lang/coq.js
new file mode 100644
index 00000000000..35ec7c8021a
--- /dev/null
+++ b/lib/highlight_js/assets/lang/coq.js
@@ -0,0 +1 @@
+hljs.registerLanguage("coq",function(e){return{k:{keyword:"_ as at cofix else end exists exists2 fix for forall fun if IF in let match mod Prop return Set then Type using where with Abort About Add Admit Admitted All Arguments Assumptions Axiom Back BackTo Backtrack Bind Blacklist Canonical Cd Check Class Classes Close Coercion Coercions CoFixpoint CoInductive Collection Combined Compute Conjecture Conjectures Constant constr Constraint Constructors Context Corollary CreateHintDb Cut Declare Defined Definition Delimit Dependencies DependentDerive Drop eauto End Equality Eval Example Existential Existentials Existing Export exporting Extern Extract Extraction Fact Field Fields File Fixpoint Focus for From Function Functional Generalizable Global Goal Grab Grammar Graph Guarded Heap Hint HintDb Hints Hypotheses Hypothesis ident Identity If Immediate Implicit Import Include Inductive Infix Info Initial Inline Inspect Instance Instances Intro Intros Inversion Inversion_clear Language Left Lemma Let Libraries Library Load LoadPath Local Locate Ltac ML Mode Module Modules Monomorphic Morphism Next NoInline Notation Obligation Obligations Opaque Open Optimize Options Parameter Parameters Parametric Path Paths pattern Polymorphic Preterm Print Printing Program Projections Proof Proposition Pwd Qed Quit Rec Record Recursive Redirect Relation Remark Remove Require Reserved Reset Resolve Restart Rewrite Right Ring Rings Save Scheme Scope Scopes Script Search SearchAbout SearchHead SearchPattern SearchRewrite Section Separate Set Setoid Show Solve Sorted Step Strategies Strategy Structure SubClass Table Tables Tactic Term Test Theorem Time Timeout Transparent Type Typeclasses Types Undelimit Undo Unfocus Unfocused Unfold Universe Universes Unset Unshelve using Variable Variables Variant Verbose Visibility where with",built_in:"abstract absurd admit after apply as assert assumption at auto autorewrite autounfold before bottom btauto by case case_eq cbn cbv change classical_left classical_right clear clearbody cofix compare compute congruence constr_eq constructor contradict contradiction cut cutrewrite cycle decide decompose dependent destruct destruction dintuition discriminate discrR do double dtauto eapply eassumption eauto ecase econstructor edestruct ediscriminate eelim eexact eexists einduction einjection eleft elim elimtype enough equality erewrite eright esimplify_eq esplit evar exact exactly_once exfalso exists f_equal fail field field_simplify field_simplify_eq first firstorder fix fold fourier functional generalize generalizing gfail give_up has_evar hnf idtac in induction injection instantiate intro intro_pattern intros intuition inversion inversion_clear is_evar is_var lapply lazy left lia lra move native_compute nia nsatz omega once pattern pose progress proof psatz quote record red refine reflexivity remember rename repeat replace revert revgoals rewrite rewrite_strat right ring ring_simplify rtauto set setoid_reflexivity setoid_replace setoid_rewrite setoid_symmetry setoid_transitivity shelve shelve_unifiable simpl simple simplify_eq solve specialize split split_Rabs split_Rmult stepl stepr subst sum swap symmetry tactic tauto time timeout top transitivity trivial try tryif unfold unify until using vm_compute with"},c:[e.QSM,e.C("\\(\\*","\\*\\)"),e.CNM,{cN:"type",eB:!0,b:"\\|\\s*",e:"\\w+"},{b:/[-=]>/}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/cos.js b/lib/highlight_js/assets/lang/cos.js
index 12ffd590bb9..bee8aefd513 100644
--- a/lib/highlight_js/assets/lang/cos.js
+++ b/lib/highlight_js/assets/lang/cos.js
@@ -1 +1 @@
-hljs.registerLanguage("cos",function(e){var t={cN:"string",v:[{b:'"',e:'"',c:[{b:'""',r:0}]}]},r={cN:"number",b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)",r:0},s={keyword:["property","parameter","class","classmethod","clientmethod","extends","as","break","catch","close","continue","do","d","else","elseif","for","goto","halt","hang","h","if","job","j","kill","k","lock","l","merge","new","open","quit","q","read","r","return","set","s","tcommit","throw","trollback","try","tstart","use","view","while","write","w","xecute","x","zkill","znspace","zn","ztrap","zwrite","zw","zzdump","zzwrite","print","zbreak","zinsert","zload","zprint","zremove","zsave","zzprint","mv","mvcall","mvcrt","mvdim","mvprint","zquit","zsync","ascii"].join(" ")};return{cI:!0,aliases:["cos","cls"],k:s,c:[r,t,e.CLCM,e.CBCM,{cN:"comment",b:/;/,e:"$",r:0},{cN:"built_in",b:/(?:\$\$?|\.\.)\^?[a-zA-Z]+/},{cN:"built_in",b:/\$\$\$[a-zA-Z]+/},{cN:"built_in",b:/%[a-z]+(?:\.[a-z]+)*/},{cN:"symbol",b:/\^%?[a-zA-Z][\w]*/},{cN:"keyword",b:/##class|##super|#define|#dim/},{b:/&sql\(/,e:/\)/,eB:!0,eE:!0,sL:"sql"},{b:/&(js|jscript|javascript)</,e:/>/,eB:!0,eE:!0,sL:"javascript"},{b:/&html<\s*</,e:/>\s*>/,sL:"xml"}]}});
\ No newline at end of file
+hljs.registerLanguage("cos",function(e){var t={cN:"string",v:[{b:'"',e:'"',c:[{b:'""',r:0}]}]},r={cN:"number",b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)",r:0},s="property parameter class classmethod clientmethod extends as break catch close continue do d|0 else elseif for goto halt hang h|0 if job j|0 kill k|0 lock l|0 merge new open quit q|0 read r|0 return set s|0 tcommit throw trollback try tstart use view while write w|0 xecute x|0 zkill znspace zn ztrap zwrite zw zzdump zzwrite print zbreak zinsert zload zprint zremove zsave zzprint mv mvcall mvcrt mvdim mvprint zquit zsync ascii";return{cI:!0,aliases:["cos","cls"],k:s,c:[r,t,e.CLCM,e.CBCM,{cN:"comment",b:/;/,e:"$",r:0},{cN:"built_in",b:/(?:\$\$?|\.\.)\^?[a-zA-Z]+/},{cN:"built_in",b:/\$\$\$[a-zA-Z]+/},{cN:"built_in",b:/%[a-z]+(?:\.[a-z]+)*/},{cN:"symbol",b:/\^%?[a-zA-Z][\w]*/},{cN:"keyword",b:/##class|##super|#define|#dim/},{b:/&sql\(/,e:/\)/,eB:!0,eE:!0,sL:"sql"},{b:/&(js|jscript|javascript)</,e:/>/,eB:!0,eE:!0,sL:"javascript"},{b:/&html<\s*</,e:/>\s*>/,sL:"xml"}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/cpp.js b/lib/highlight_js/assets/lang/cpp.js
index 4ef82476d83..dddaec7d34c 100644
--- a/lib/highlight_js/assets/lang/cpp.js
+++ b/lib/highlight_js/assets/lang/cpp.js
@@ -1 +1 @@
-hljs.registerLanguage("cpp",function(t){var e={cN:"keyword",b:"\\b[a-z\\d_]*_t\\b"},r={cN:"string",v:[t.inherit(t.QSM,{b:'((u8?|U)|L)?"'}),{b:'(u8?|U)?R"',e:'"',c:[t.BE]},{b:"'\\\\?.",e:"'",i:"."}]},i={cN:"number",v:[{b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)"},{b:t.CNR}],r:0},s={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef"},c:[{b:/\\\n/,r:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[t.inherit(r,{cN:"meta-string"}),{cN:"meta-string",b:"<",e:">",i:"\\n"}]},r,t.CLCM,t.CBCM]},a=t.IR+"\\s*\\(",c={keyword:"int float while private char catch export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const struct for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using class asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignof constexpr decltype noexcept static_assert thread_local restrict _Bool complex _Complex _Imaginary atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong",built_in:"std string cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr",literal:"true false nullptr NULL"};return{aliases:["c","cc","h","c++","h++","hpp"],k:c,i:"</",c:[e,t.CLCM,t.CBCM,i,r,s,{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:c,c:["self",e]},{b:t.IR+"::",k:c},{bK:"new throw return else",r:0},{cN:"function",b:"("+t.IR+"[\\*&\\s]+)+"+a,rB:!0,e:/[{;=]/,eE:!0,k:c,i:/[^\w\s\*&]/,c:[{b:a,rB:!0,c:[t.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:c,r:0,c:[t.CLCM,t.CBCM,r,i]},t.CLCM,t.CBCM,s]}]}});
\ No newline at end of file
+hljs.registerLanguage("cpp",function(t){var e={cN:"keyword",b:"\\b[a-z\\d_]*_t\\b"},r={cN:"string",v:[{b:'(u8?|U)?L?"',e:'"',i:"\\n",c:[t.BE]},{b:'(u8?|U)?R"',e:'"',c:[t.BE]},{b:"'\\\\?.",e:"'",i:"."}]},s={cN:"number",v:[{b:"\\b(0b[01']+)"},{b:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{b:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],r:0},i={cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},c:[{b:/\\\n/,r:0},t.inherit(r,{cN:"meta-string"}),{cN:"meta-string",b:/<[^\n>]*>/,e:/$/,i:"\\n"},t.CLCM,t.CBCM]},a=t.IR+"\\s*\\(",c={keyword:"int float while private char catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignof constexpr decltype noexcept static_assert thread_local restrict _Bool complex _Complex _Imaginary atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and or not",built_in:"std string cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr",literal:"true false nullptr NULL"},n=[e,t.CLCM,t.CBCM,s,r];return{aliases:["c","cc","h","c++","h++","hpp"],k:c,i:"</",c:n.concat([i,{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:c,c:["self",e]},{b:t.IR+"::",k:c},{v:[{b:/=/,e:/;/},{b:/\(/,e:/\)/},{bK:"new throw return else",e:/;/}],k:c,c:n.concat([{b:/\(/,e:/\)/,k:c,c:n.concat(["self"]),r:0}]),r:0},{cN:"function",b:"("+t.IR+"[\\*&\\s]+)+"+a,rB:!0,e:/[{;=]/,eE:!0,k:c,i:/[^\w\s\*&]/,c:[{b:a,rB:!0,c:[t.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:c,r:0,c:[t.CLCM,t.CBCM,r,s,e]},t.CLCM,t.CBCM,i]},{cN:"class",bK:"class struct",e:/[{;:]/,c:[{b:/</,e:/>/,c:["self"]},t.TM]}]),exports:{preprocessor:i,strings:r,k:c}}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/crystal.js b/lib/highlight_js/assets/lang/crystal.js
index 5c6e207afcc..1cd2b6fe621 100644
--- a/lib/highlight_js/assets/lang/crystal.js
+++ b/lib/highlight_js/assets/lang/crystal.js
@@ -1 +1 @@
-hljs.registerLanguage("crystal",function(e){function r(e,r){var b=[{b:e,e:r}];return b[0].c=b,b}var b="(_[uif](8|16|32|64))?",c="[a-zA-Z_]\\w*[!?=]?",n="!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",s="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\][=?]?",i={keyword:"abstract alias as asm begin break case class def do else elsif end ensure enum extend for fun if ifdef include instance_sizeof is_a? lib macro module next of out pointerof private protected rescue responds_to? return require self sizeof struct super then type typeof union unless until when while with yield __DIR__ __FILE__ __LINE__",literal:"false nil true"},t={cN:"subst",b:"#{",e:"}",k:i},a={cN:"template-variable",v:[{b:"\\{\\{",e:"\\}\\}"},{b:"\\{%",e:"%\\}"}],k:i,r:10},l={cN:"string",c:[e.BE,t],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%w?\\(",e:"\\)",c:r("\\(","\\)")},{b:"%w?\\[",e:"\\]",c:r("\\[","\\]")},{b:"%w?{",e:"}",c:r("{","}")},{b:"%w?<",e:">",c:r("<",">")},{b:"%w?/",e:"/"},{b:"%w?%",e:"%"},{b:"%w?-",e:"-"},{b:"%w?\\|",e:"\\|"}],r:0},u={b:"("+n+")\\s*",c:[{cN:"regexp",c:[e.BE,t],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\(",e:"\\)",c:r("\\(","\\)")},{b:"%r\\[",e:"\\]",c:r("\\[","\\]")},{b:"%r{",e:"}",c:r("{","}")},{b:"%r<",e:">",c:r("<",">")},{b:"%r/",e:"/"},{b:"%r%",e:"%"},{b:"%r-",e:"-"},{b:"%r\\|",e:"\\|"}]}],r:0},o={cN:"regexp",c:[e.BE,t],v:[{b:"%r\\(",e:"\\)",c:r("\\(","\\)")},{b:"%r\\[",e:"\\]",c:r("\\[","\\]")},{b:"%r{",e:"}",c:r("{","}")},{b:"%r<",e:">",c:r("<",">")},{b:"%r/",e:"/"},{b:"%r%",e:"%"},{b:"%r-",e:"-"},{b:"%r\\|",e:"\\|"}],r:0},_={cN:"meta",b:"@\\[",e:"\\]",r:5},f=[a,l,u,o,_,e.HCM,{cN:"class",bK:"class module struct",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<"}]},{cN:"class",bK:"lib enum union",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"})],r:10},{cN:"function",bK:"def",e:/\B\b/,c:[e.inherit(e.TM,{b:s,endsParent:!0})]},{cN:"function",bK:"fun macro",e:/\B\b/,c:[e.inherit(e.TM,{b:s,endsParent:!0})],r:5},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":",c:[l,{b:s}],r:0},{cN:"number",v:[{b:"\\b0b([01_]*[01])"+b},{b:"\\b0o([0-7_]*[0-7])"+b},{b:"\\b0x([A-Fa-f0-9_]*[A-Fa-f0-9])"+b},{b:"\\b(([0-9][0-9_]*[0-9]|[0-9])(\\.[0-9_]*[0-9])?([eE][+-]?[0-9_]*[0-9])?)"+b}],r:0}];return t.c=f,_.c=f,a.c=f.slice(1),{aliases:["cr"],l:c,k:i,c:f}});
\ No newline at end of file
+hljs.registerLanguage("crystal",function(e){function b(e,b){var r=[{b:e,e:b}];return r[0].c=r,r}var r="(_[uif](8|16|32|64))?",c="[a-zA-Z_]\\w*[!?=]?",i="!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\][=?]?",s={keyword:"abstract alias as as? asm begin break case class def do else elsif end ensure enum extend for fun if include instance_sizeof is_a? lib macro module next nil? of out pointerof private protected rescue responds_to? return require select self sizeof struct super then type typeof union uninitialized unless until when while with yield __DIR__ __END_LINE__ __FILE__ __LINE__",literal:"false nil true"},t={cN:"subst",b:"#{",e:"}",k:s},a={cN:"template-variable",v:[{b:"\\{\\{",e:"\\}\\}"},{b:"\\{%",e:"%\\}"}],k:s},l={cN:"string",c:[e.BE,t],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%w?\\(",e:"\\)",c:b("\\(","\\)")},{b:"%w?\\[",e:"\\]",c:b("\\[","\\]")},{b:"%w?{",e:"}",c:b("{","}")},{b:"%w?<",e:">",c:b("<",">")},{b:"%w?/",e:"/"},{b:"%w?%",e:"%"},{b:"%w?-",e:"-"},{b:"%w?\\|",e:"\\|"},{b:/<<-\w+$/,e:/^\s*\w+$/}],r:0},u={cN:"string",v:[{b:"%q\\(",e:"\\)",c:b("\\(","\\)")},{b:"%q\\[",e:"\\]",c:b("\\[","\\]")},{b:"%q{",e:"}",c:b("{","}")},{b:"%q<",e:">",c:b("<",">")},{b:"%q/",e:"/"},{b:"%q%",e:"%"},{b:"%q-",e:"-"},{b:"%q\\|",e:"\\|"},{b:/<<-'\w+'$/,e:/^\s*\w+$/}],r:0},_={b:"("+i+")\\s*",c:[{cN:"regexp",c:[e.BE,t],v:[{b:"//[a-z]*",r:0},{b:"/",e:"/[a-z]*"},{b:"%r\\(",e:"\\)",c:b("\\(","\\)")},{b:"%r\\[",e:"\\]",c:b("\\[","\\]")},{b:"%r{",e:"}",c:b("{","}")},{b:"%r<",e:">",c:b("<",">")},{b:"%r/",e:"/"},{b:"%r%",e:"%"},{b:"%r-",e:"-"},{b:"%r\\|",e:"\\|"}]}],r:0},o={cN:"regexp",c:[e.BE,t],v:[{b:"%r\\(",e:"\\)",c:b("\\(","\\)")},{b:"%r\\[",e:"\\]",c:b("\\[","\\]")},{b:"%r{",e:"}",c:b("{","}")},{b:"%r<",e:">",c:b("<",">")},{b:"%r/",e:"/"},{b:"%r%",e:"%"},{b:"%r-",e:"-"},{b:"%r\\|",e:"\\|"}],r:0},w={cN:"meta",b:"@\\[",e:"\\]",c:[e.inherit(e.QSM,{cN:"meta-string"})]},f=[a,l,u,_,o,w,e.HCM,{cN:"class",bK:"class module struct",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<"}]},{cN:"class",bK:"lib enum union",e:"$|;",i:/=/,c:[e.HCM,e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"})],r:10},{cN:"function",bK:"def",e:/\B\b/,c:[e.inherit(e.TM,{b:n,endsParent:!0})]},{cN:"function",bK:"fun macro",e:/\B\b/,c:[e.inherit(e.TM,{b:n,endsParent:!0})],r:5},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":",c:[l,{b:n}],r:0},{cN:"number",v:[{b:"\\b0b([01_]*[01])"+r},{b:"\\b0o([0-7_]*[0-7])"+r},{b:"\\b0x([A-Fa-f0-9_]*[A-Fa-f0-9])"+r},{b:"\\b(([0-9][0-9_]*[0-9]|[0-9])(\\.[0-9_]*[0-9])?([eE][+-]?[0-9_]*[0-9])?)"+r}],r:0}];return t.c=f,a.c=f.slice(1),{aliases:["cr"],l:c,k:s,c:f}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/cs.js b/lib/highlight_js/assets/lang/cs.js
index 055f4496d7f..f5ac4dc3b9a 100644
--- a/lib/highlight_js/assets/lang/cs.js
+++ b/lib/highlight_js/assets/lang/cs.js
@@ -1 +1 @@
-hljs.registerLanguage("cs",function(e){var t="abstract as base bool break byte case catch char checked const continue decimal dynamic default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long null when object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while async protected public private internal ascending descending from get group into join let orderby partial select set value var where yield",r=e.IR+"(<"+e.IR+">)?";return{aliases:["csharp"],k:t,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"doctag",v:[{b:"///",r:0},{b:"<!--|-->"},{b:"</?",e:">"}]}]}),e.CLCM,e.CBCM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},e.ASM,e.QSM,e.CNM,{bK:"class interface",e:/[{;=]/,i:/[^\s:]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"namespace",e:/[{;=]/,i:/[^\s:]/,c:[e.inherit(e.TM,{b:"[a-zA-Z](\\.?\\w)*"}),e.CLCM,e.CBCM]},{bK:"new return throw await",r:0},{cN:"function",b:"("+r+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:t,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]}]}});
\ No newline at end of file
+hljs.registerLanguage("cs",function(e){var i={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long nameof object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let on orderby partial remove select set value var where yield",literal:"null false true"},t={cN:"string",b:'@"',e:'"',c:[{b:'""'}]},r=e.inherit(t,{i:/\n/}),a={cN:"subst",b:"{",e:"}",k:i},c=e.inherit(a,{i:/\n/}),n={cN:"string",b:/\$"/,e:'"',i:/\n/,c:[{b:"{{"},{b:"}}"},e.BE,c]},s={cN:"string",b:/\$@"/,e:'"',c:[{b:"{{"},{b:"}}"},{b:'""'},a]},o=e.inherit(s,{i:/\n/,c:[{b:"{{"},{b:"}}"},{b:'""'},c]});a.c=[s,n,t,e.ASM,e.QSM,e.CNM,e.CBCM],c.c=[o,n,r,e.ASM,e.QSM,e.CNM,e.inherit(e.CBCM,{i:/\n/})];var l={v:[s,n,t,e.ASM,e.QSM]},b=e.IR+"(<"+e.IR+"(\\s*,\\s*"+e.IR+")*>)?(\\[\\])?";return{aliases:["csharp"],k:i,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"doctag",v:[{b:"///",r:0},{b:"<!--|-->"},{b:"</?",e:">"}]}]}),e.CLCM,e.CBCM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},l,e.CNM,{bK:"class interface",e:/[{;=]/,i:/[^\s:,]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"namespace",e:/[{;=]/,i:/[^\s:]/,c:[e.inherit(e.TM,{b:"[a-zA-Z](\\.?\\w)*"}),e.CLCM,e.CBCM]},{cN:"meta",b:"^\\s*\\[",eB:!0,e:"\\]",eE:!0,c:[{cN:"meta-string",b:/"/,e:/"/}]},{bK:"new return throw await else",r:0},{cN:"function",b:"("+b+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:i,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:i,r:0,c:[l,e.CNM,e.CBCM]},e.CLCM,e.CBCM]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/css.js b/lib/highlight_js/assets/lang/css.js
index f02d2b87341..ce758e0486e 100644
--- a/lib/highlight_js/assets/lang/css.js
+++ b/lib/highlight_js/assets/lang/css.js
@@ -1 +1 @@
-hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",c:[{cN:"keyword",b:/\S+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});
\ No newline at end of file
+hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/delphi.js b/lib/highlight_js/assets/lang/delphi.js
index 92cc8622ecc..89000076c7d 100644
--- a/lib/highlight_js/assets/lang/delphi.js
+++ b/lib/highlight_js/assets/lang/delphi.js
@@ -1 +1 @@
-hljs.registerLanguage("delphi",function(e){var r="exports register file shl array record property for mod while set ally label uses raise not stored class safecall var interface or private static exit index inherited to else stdcall override shr asm far resourcestring finalization packed virtual out and protected library do xorwrite goto near function end div overload object unit begin string on inline repeat until destructor write message program with read initialization except default nil if case cdecl in downto threadvar of try pascal const external constructor type public then implementation finally published procedure",t=[e.CLCM,e.C(/\{/,/\}/,{r:0}),e.C(/\(\*/,/\*\)/,{r:10})],a={cN:"string",b:/'/,e:/'/,c:[{b:/''/}]},i={cN:"string",b:/(#\d+)+/},c={b:e.IR+"\\s*=\\s*class\\s*\\(",rB:!0,c:[e.TM]},o={cN:"function",bK:"function constructor destructor procedure",e:/[:;]/,k:"function constructor|10 destructor|10 procedure|10",c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:r,c:[a,i]}].concat(t)};return{aliases:["dpr","dfm","pas","pascal","freepascal","lazarus","lpr","lfm"],cI:!0,k:r,i:/"|\$[G-Zg-z]|\/\*|<\/|\|/,c:[a,i,e.NM,c,o].concat(t)}});
\ No newline at end of file
+hljs.registerLanguage("delphi",function(e){var r="exports register file shl array record property for mod while set ally label uses raise not stored class safecall var interface or private static exit index inherited to else stdcall override shr asm far resourcestring finalization packed virtual out and protected library do xorwrite goto near function end div overload object unit begin string on inline repeat until destructor write message program with read initialization except default nil if case cdecl in downto threadvar of try pascal const external constructor type public then implementation finally published procedure absolute reintroduce operator as is abstract alias assembler bitpacked break continue cppdecl cvar enumerator experimental platform deprecated unimplemented dynamic export far16 forward generic helper implements interrupt iochecks local name nodefault noreturn nostackframe oldfpccall otherwise saveregisters softfloat specialize strict unaligned varargs ",t=[e.CLCM,e.C(/\{/,/\}/,{r:0}),e.C(/\(\*/,/\*\)/,{r:10})],a={cN:"meta",v:[{b:/\{\$/,e:/\}/},{b:/\(\*\$/,e:/\*\)/}]},c={cN:"string",b:/'/,e:/'/,c:[{b:/''/}]},i={cN:"string",b:/(#\d+)+/},o={b:e.IR+"\\s*=\\s*class\\s*\\(",rB:!0,c:[e.TM]},n={cN:"function",bK:"function constructor destructor procedure",e:/[:;]/,k:"function constructor|10 destructor|10 procedure|10",c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:r,c:[c,i,a].concat(t)},a].concat(t)};return{aliases:["dpr","dfm","pas","pascal","freepascal","lazarus","lpr","lfm"],cI:!0,k:r,i:/"|\$[G-Zg-z]|\/\*|<\/|\|/,c:[c,i,e.NM,o,n,a].concat(t)}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/diff.js b/lib/highlight_js/assets/lang/diff.js
index 96890439f5d..501c2be7495 100644
--- a/lib/highlight_js/assets/lang/diff.js
+++ b/lib/highlight_js/assets/lang/diff.js
@@ -1 +1 @@
-hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"meta",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"comment",v:[{b:/Index: /,e:/$/},{b:/=====/,e:/=====$/},{b:/^\-\-\-/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+\+\+/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"addition",b:"^\\!",e:"$"}]}});
\ No newline at end of file
+hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"meta",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"comment",v:[{b:/Index: /,e:/$/},{b:/={3,}/,e:/$/},{b:/^\-{3}/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+{3}/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"addition",b:"^\\!",e:"$"}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/dns.js b/lib/highlight_js/assets/lang/dns.js
index bbc4e72d0d5..3472aed00b5 100644
--- a/lib/highlight_js/assets/lang/dns.js
+++ b/lib/highlight_js/assets/lang/dns.js
@@ -1 +1 @@
-hljs.registerLanguage("dns",function(d){return{aliases:["bind","zone"],k:{keyword:"IN A AAAA AFSDB APL CAA CDNSKEY CDS CERT CNAME DHCID DLV DNAME DNSKEY DS HIP IPSECKEY KEY KX LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR RRSIG RP SIG SOA SRV SSHFP TA TKEY TLSA TSIG TXT"},c:[d.C(";","$"),{cN:"meta",b:/^\$(TTL|GENERATE|INCLUDE|ORIGIN)\b/},{cN:"number",b:"((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))\\b"},{cN:"number",b:"((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b"},d.inherit(d.NM,{b:/\b\d+[dhwm]?/})]}});
\ No newline at end of file
+hljs.registerLanguage("dns",function(d){return{aliases:["bind","zone"],k:{keyword:"IN A AAAA AFSDB APL CAA CDNSKEY CDS CERT CNAME DHCID DLV DNAME DNSKEY DS HIP IPSECKEY KEY KX LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR RRSIG RP SIG SOA SRV SSHFP TA TKEY TLSA TSIG TXT"},c:[d.C(";","$",{r:0}),{cN:"meta",b:/^\$(TTL|GENERATE|INCLUDE|ORIGIN)\b/},{cN:"number",b:"((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))\\b"},{cN:"number",b:"((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\b"},d.inherit(d.NM,{b:/\b\d+[dhwm]?/})]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/dockerfile.js b/lib/highlight_js/assets/lang/dockerfile.js
index 692932fda72..f72716bc5d4 100644
--- a/lib/highlight_js/assets/lang/dockerfile.js
+++ b/lib/highlight_js/assets/lang/dockerfile.js
@@ -1 +1 @@
-hljs.registerLanguage("dockerfile",function(e){return{aliases:["docker"],cI:!0,k:"from maintainer cmd expose add copy entrypoint volume user workdir onbuild run env label",c:[e.HCM,{k:"run cmd entrypoint volume add copy workdir onbuild label",b:/^ *(onbuild +)?(run|cmd|entrypoint|volume|add|copy|workdir|label) +/,starts:{e:/[^\\]\n/,sL:"bash"}},{k:"from maintainer expose env user onbuild",b:/^ *(onbuild +)?(from|maintainer|expose|env|user|onbuild) +/,e:/[^\\]\n/,c:[e.ASM,e.QSM,e.NM,e.HCM]}]}});
\ No newline at end of file
+hljs.registerLanguage("dockerfile",function(e){return{aliases:["docker"],cI:!0,k:"from maintainer expose env arg user onbuild stopsignal",c:[e.HCM,e.ASM,e.QSM,e.NM,{bK:"run cmd entrypoint volume add copy workdir label healthcheck shell",starts:{e:/[^\\]\n/,sL:"bash"}}],i:"</"}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/dos.js b/lib/highlight_js/assets/lang/dos.js
index 4d71bf5f6ad..a27b45e46c1 100644
--- a/lib/highlight_js/assets/lang/dos.js
+++ b/lib/highlight_js/assets/lang/dos.js
@@ -1 +1 @@
-hljs.registerLanguage("dos",function(e){var r=e.C(/@?rem\b/,/$/,{r:10}),t={cN:"symbol",b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)",r:0};return{aliases:["bat","cmd"],cI:!0,i:/\/\*/,k:{keyword:"if else goto for in do call exit not exist errorlevel defined equ neq lss leq gtr geq",built_in:"prn nul lpt3 lpt2 lpt1 con com4 com3 com2 com1 aux shift cd dir echo setlocal endlocal set pause copy append assoc at attrib break cacls cd chcp chdir chkdsk chkntfs cls cmd color comp compact convert date dir diskcomp diskcopy doskey erase fs find findstr format ftype graftabl help keyb label md mkdir mode more move path pause print popd pushd promt rd recover rem rename replace restore rmdir shiftsort start subst time title tree type ver verify vol ping net ipconfig taskkill xcopy ren del"},c:[{cN:"variable",b:/%%[^ ]|%[^ ]+?%|![^ ]+?!/},{cN:"function",b:t.b,e:"goto:eof",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),r]},{cN:"number",b:"\\b\\d+",r:0},r]}});
\ No newline at end of file
+hljs.registerLanguage("dos",function(e){var r=e.C(/^\s*@?rem\b/,/$/,{r:10}),t={cN:"symbol",b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)",r:0};return{aliases:["bat","cmd"],cI:!0,i:/\/\*/,k:{keyword:"if else goto for in do call exit not exist errorlevel defined equ neq lss leq gtr geq",built_in:"prn nul lpt3 lpt2 lpt1 con com4 com3 com2 com1 aux shift cd dir echo setlocal endlocal set pause copy append assoc at attrib break cacls cd chcp chdir chkdsk chkntfs cls cmd color comp compact convert date dir diskcomp diskcopy doskey erase fs find findstr format ftype graftabl help keyb label md mkdir mode more move path pause print popd pushd promt rd recover rem rename replace restore rmdir shiftsort start subst time title tree type ver verify vol ping net ipconfig taskkill xcopy ren del"},c:[{cN:"variable",b:/%%[^ ]|%[^ ]+?%|![^ ]+?!/},{cN:"function",b:t.b,e:"goto:eof",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),r]},{cN:"number",b:"\\b\\d+",r:0},r]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/dsconfig.js b/lib/highlight_js/assets/lang/dsconfig.js
new file mode 100644
index 00000000000..60ec5ea0147
--- /dev/null
+++ b/lib/highlight_js/assets/lang/dsconfig.js
@@ -0,0 +1 @@
+hljs.registerLanguage("dsconfig",function(e){var i={cN:"string",b:/"/,e:/"/},r={cN:"string",b:/'/,e:/'/},s={cN:"string",b:"[\\w-?]+:\\w+",e:"\\W",r:0},t={cN:"string",b:"\\w+-?\\w+",e:"\\W",r:0};return{k:"dsconfig",c:[{cN:"keyword",b:"^dsconfig",e:"\\s",eE:!0,r:10},{cN:"built_in",b:"(list|create|get|set|delete)-(\\w+)",e:"\\s",eE:!0,i:"!@#$%^&*()",r:10},{cN:"built_in",b:"--(\\w+)",e:"\\s",eE:!0},i,r,s,t,e.HCM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/ebnf.js b/lib/highlight_js/assets/lang/ebnf.js
new file mode 100644
index 00000000000..af700f98087
--- /dev/null
+++ b/lib/highlight_js/assets/lang/ebnf.js
@@ -0,0 +1 @@
+hljs.registerLanguage("ebnf",function(a){var e=a.C(/\(\*/,/\*\)/),t={cN:"attribute",b:/^[ ]*[a-zA-Z][a-zA-Z-]*([\s-]+[a-zA-Z][a-zA-Z]*)*/},r={cN:"meta",b:/\?.*\?/},b={b:/=/,e:/;/,c:[e,r,a.ASM,a.QSM]};return{i:/\S/,c:[e,t,b]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/elixir.js b/lib/highlight_js/assets/lang/elixir.js
index c12c8a41232..7784742f28f 100644
--- a/lib/highlight_js/assets/lang/elixir.js
+++ b/lib/highlight_js/assets/lang/elixir.js
@@ -1 +1 @@
-hljs.registerLanguage("elixir",function(e){var r="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?",n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote",c={cN:"subst",b:"#\\{",e:"}",l:r,k:b},a={cN:"string",c:[e.BE,c],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},i={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:r,endsParent:!0})]},s=e.inherit(i,{cN:"class",bK:"defmodule defrecord",e:/\bdo\b|$|;/}),l=[a,e.HCM,s,i,{cN:"symbol",b:":",c:[a,{b:n}],r:0},{cN:"symbol",b:r+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,c],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];return c.c=l,{l:r,k:b,c:l}});
\ No newline at end of file
+hljs.registerLanguage("elixir",function(e){var r="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?",n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b="and false then defined module in return redo retry end for true self when next until do begin unless nil break not case cond alias while ensure or include use alias fn quote",c={cN:"subst",b:"#\\{",e:"}",l:r,k:b},a={cN:"string",c:[e.BE,c],v:[{b:/'/,e:/'/},{b:/"/,e:/"/}]},i={cN:"function",bK:"def defp defmacro",e:/\B\b/,c:[e.inherit(e.TM,{b:r,endsParent:!0})]},l=e.inherit(i,{cN:"class",bK:"defimpl defmodule defprotocol defrecord",e:/\bdo\b|$|;/}),s=[a,e.HCM,l,i,{cN:"symbol",b:":(?!\\s)",c:[a,{b:n}],r:0},{cN:"symbol",b:r+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"->"},{b:"("+e.RSR+")\\s*",c:[e.HCM,{cN:"regexp",i:"\\n",c:[e.BE,c],v:[{b:"/",e:"/[a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];return c.c=s,{l:r,k:b,c:s}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/elm.js b/lib/highlight_js/assets/lang/elm.js
index c1b9e208a48..fe76a17d29c 100644
--- a/lib/highlight_js/assets/lang/elm.js
+++ b/lib/highlight_js/assets/lang/elm.js
@@ -1 +1 @@
-hljs.registerLanguage("elm",function(e){var i={v:[e.C("--","$"),e.C("{-","-}",{c:["self"]})]},r={cN:"type",b:"\\b[A-Z][\\w']*",r:0},t={b:"\\(",e:"\\)",i:'"',c:[{cN:"type",b:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},i]},n={b:"{",e:"}",c:t.c};return{k:"let in if then else case of where module import exposing type alias as infix infixl infixr port",c:[{bK:"module",e:"where",k:"module where",c:[t,i],i:"\\W\\.|;"},{b:"import",e:"$",k:"import as exposing",c:[t,i],i:"\\W\\.|;"},{b:"type",e:"$",k:"type alias",c:[r,t,n,i]},{bK:"infix infixl infixr",e:"$",c:[e.CNM,i]},{b:"port",e:"$",k:"port",c:[i]},e.QSM,e.CNM,r,e.inherit(e.TM,{b:"^[_a-z][\\w']*"}),i,{b:"->|<-"}]}});
\ No newline at end of file
+hljs.registerLanguage("elm",function(e){var i={v:[e.C("--","$"),e.C("{-","-}",{c:["self"]})]},t={cN:"type",b:"\\b[A-Z][\\w']*",r:0},c={b:"\\(",e:"\\)",i:'"',c:[{cN:"type",b:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},i]},n={b:"{",e:"}",c:c.c};return{k:"let in if then else case of where module import exposing type alias as infix infixl infixr port effect command subscription",c:[{bK:"port effect module",e:"exposing",k:"port effect module where command subscription exposing",c:[c,i],i:"\\W\\.|;"},{b:"import",e:"$",k:"import as exposing",c:[c,i],i:"\\W\\.|;"},{b:"type",e:"$",k:"type alias",c:[t,c,n,i]},{bK:"infix infixl infixr",e:"$",c:[e.CNM,i]},{b:"port",e:"$",k:"port",c:[i]},e.QSM,e.CNM,t,e.inherit(e.TM,{b:"^[_a-z][\\w']*"}),i,{b:"->|<-"}],i:/;/}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/excel.js b/lib/highlight_js/assets/lang/excel.js
new file mode 100644
index 00000000000..c023dadba58
--- /dev/null
+++ b/lib/highlight_js/assets/lang/excel.js
@@ -0,0 +1 @@
+hljs.registerLanguage("excel",function(E){return{aliases:["xlsx","xls"],cI:!0,l:/[a-zA-Z][\w\.]*/,k:{built_in:"ABS ACCRINT ACCRINTM ACOS ACOSH ACOT ACOTH AGGREGATE ADDRESS AMORDEGRC AMORLINC AND ARABIC AREAS ASC ASIN ASINH ATAN ATAN2 ATANH AVEDEV AVERAGE AVERAGEA AVERAGEIF AVERAGEIFS BAHTTEXT BASE BESSELI BESSELJ BESSELK BESSELY BETADIST BETA.DIST BETAINV BETA.INV BIN2DEC BIN2HEX BIN2OCT BINOMDIST BINOM.DIST BINOM.DIST.RANGE BINOM.INV BITAND BITLSHIFT BITOR BITRSHIFT BITXOR CALL CEILING CEILING.MATH CEILING.PRECISE CELL CHAR CHIDIST CHIINV CHITEST CHISQ.DIST CHISQ.DIST.RT CHISQ.INV CHISQ.INV.RT CHISQ.TEST CHOOSE CLEAN CODE COLUMN COLUMNS COMBIN COMBINA COMPLEX CONCAT CONCATENATE CONFIDENCE CONFIDENCE.NORM CONFIDENCE.T CONVERT CORREL COS COSH COT COTH COUNT COUNTA COUNTBLANK COUNTIF COUNTIFS COUPDAYBS COUPDAYS COUPDAYSNC COUPNCD COUPNUM COUPPCD COVAR COVARIANCE.P COVARIANCE.S CRITBINOM CSC CSCH CUBEKPIMEMBER CUBEMEMBER CUBEMEMBERPROPERTY CUBERANKEDMEMBER CUBESET CUBESETCOUNT CUBEVALUE CUMIPMT CUMPRINC DATE DATEDIF DATEVALUE DAVERAGE DAY DAYS DAYS360 DB DBCS DCOUNT DCOUNTA DDB DEC2BIN DEC2HEX DEC2OCT DECIMAL DEGREES DELTA DEVSQ DGET DISC DMAX DMIN DOLLAR DOLLARDE DOLLARFR DPRODUCT DSTDEV DSTDEVP DSUM DURATION DVAR DVARP EDATE EFFECT ENCODEURL EOMONTH ERF ERF.PRECISE ERFC ERFC.PRECISE ERROR.TYPE EUROCONVERT EVEN EXACT EXP EXPON.DIST EXPONDIST FACT FACTDOUBLE FALSE|0 F.DIST FDIST F.DIST.RT FILTERXML FIND FINDB F.INV F.INV.RT FINV FISHER FISHERINV FIXED FLOOR FLOOR.MATH FLOOR.PRECISE FORECAST FORECAST.ETS FORECAST.ETS.CONFINT FORECAST.ETS.SEASONALITY FORECAST.ETS.STAT FORECAST.LINEAR FORMULATEXT FREQUENCY F.TEST FTEST FV FVSCHEDULE GAMMA GAMMA.DIST GAMMADIST GAMMA.INV GAMMAINV GAMMALN GAMMALN.PRECISE GAUSS GCD GEOMEAN GESTEP GETPIVOTDATA GROWTH HARMEAN HEX2BIN HEX2DEC HEX2OCT HLOOKUP HOUR HYPERLINK HYPGEOM.DIST HYPGEOMDIST IF|0 IFERROR IFNA IFS IMABS IMAGINARY IMARGUMENT IMCONJUGATE IMCOS IMCOSH IMCOT IMCSC IMCSCH IMDIV IMEXP IMLN IMLOG10 IMLOG2 IMPOWER IMPRODUCT IMREAL IMSEC IMSECH IMSIN IMSINH IMSQRT IMSUB IMSUM IMTAN INDEX INDIRECT INFO INT INTERCEPT INTRATE IPMT IRR ISBLANK ISERR ISERROR ISEVEN ISFORMULA ISLOGICAL ISNA ISNONTEXT ISNUMBER ISODD ISREF ISTEXT ISO.CEILING ISOWEEKNUM ISPMT JIS KURT LARGE LCM LEFT LEFTB LEN LENB LINEST LN LOG LOG10 LOGEST LOGINV LOGNORM.DIST LOGNORMDIST LOGNORM.INV LOOKUP LOWER MATCH MAX MAXA MAXIFS MDETERM MDURATION MEDIAN MID MIDBs MIN MINIFS MINA MINUTE MINVERSE MIRR MMULT MOD MODE MODE.MULT MODE.SNGL MONTH MROUND MULTINOMIAL MUNIT N NA NEGBINOM.DIST NEGBINOMDIST NETWORKDAYS NETWORKDAYS.INTL NOMINAL NORM.DIST NORMDIST NORMINV NORM.INV NORM.S.DIST NORMSDIST NORM.S.INV NORMSINV NOT NOW NPER NPV NUMBERVALUE OCT2BIN OCT2DEC OCT2HEX ODD ODDFPRICE ODDFYIELD ODDLPRICE ODDLYIELD OFFSET OR PDURATION PEARSON PERCENTILE.EXC PERCENTILE.INC PERCENTILE PERCENTRANK.EXC PERCENTRANK.INC PERCENTRANK PERMUT PERMUTATIONA PHI PHONETIC PI PMT POISSON.DIST POISSON POWER PPMT PRICE PRICEDISC PRICEMAT PROB PRODUCT PROPER PV QUARTILE QUARTILE.EXC QUARTILE.INC QUOTIENT RADIANS RAND RANDBETWEEN RANK.AVG RANK.EQ RANK RATE RECEIVED REGISTER.ID REPLACE REPLACEB REPT RIGHT RIGHTB ROMAN ROUND ROUNDDOWN ROUNDUP ROW ROWS RRI RSQ RTD SEARCH SEARCHB SEC SECH SECOND SERIESSUM SHEET SHEETS SIGN SIN SINH SKEW SKEW.P SLN SLOPE SMALL SQL.REQUEST SQRT SQRTPI STANDARDIZE STDEV STDEV.P STDEV.S STDEVA STDEVP STDEVPA STEYX SUBSTITUTE SUBTOTAL SUM SUMIF SUMIFS SUMPRODUCT SUMSQ SUMX2MY2 SUMX2PY2 SUMXMY2 SWITCH SYD T TAN TANH TBILLEQ TBILLPRICE TBILLYIELD T.DIST T.DIST.2T T.DIST.RT TDIST TEXT TEXTJOIN TIME TIMEVALUE T.INV T.INV.2T TINV TODAY TRANSPOSE TREND TRIM TRIMMEAN TRUE|0 TRUNC T.TEST TTEST TYPE UNICHAR UNICODE UPPER VALUE VAR VAR.P VAR.S VARA VARP VARPA VDB VLOOKUP WEBSERVICE WEEKDAY WEEKNUM WEIBULL WEIBULL.DIST WORKDAY WORKDAY.INTL XIRR XNPV XOR YEAR YEARFRAC YIELD YIELDDISC YIELDMAT Z.TEST ZTEST"},c:[{b:/^=/,e:/[^=]/,rE:!0,i:/=/,r:10},{cN:"symbol",b:/\b[A-Z]{1,2}\d+\b/,e:/[^\d]/,eE:!0,r:0},{cN:"symbol",b:/[A-Z]{0,2}\d*:[A-Z]{0,2}\d*/,r:0},E.BE,E.QSM,{cN:"number",b:E.NR+"(%)?",r:0},E.C(/\bN\(/,/\)/,{eB:!0,eE:!0,i:/\n/})]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/flix.js b/lib/highlight_js/assets/lang/flix.js
new file mode 100644
index 00000000000..b4f320d0de6
--- /dev/null
+++ b/lib/highlight_js/assets/lang/flix.js
@@ -0,0 +1 @@
+hljs.registerLanguage("flix",function(e){var t={cN:"string",b:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i={cN:"string",v:[{b:'"',e:'"'}]},n={cN:"title",b:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/},c={cN:"function",bK:"def",e:/[:={\[(\n;]/,eE:!0,c:[n]};return{k:{literal:"true false",keyword:"case class def else enum if impl import in lat rel index let match namespace switch type yield with"},c:[e.CLCM,e.CBCM,t,i,c,e.CNM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/gams.js b/lib/highlight_js/assets/lang/gams.js
index 65638faaf29..652e69836e4 100644
--- a/lib/highlight_js/assets/lang/gams.js
+++ b/lib/highlight_js/assets/lang/gams.js
@@ -1 +1 @@
-hljs.registerLanguage("gams",function(e){var s="abort acronym acronyms alias all and assign binary card diag display else1 eps eq equation equations file files for1 free ge gt if inf integer le loop lt maximizing minimizing model models na ne negative no not option options or ord parameter parameters positive prod putpage puttl repeat sameas scalar scalars semicont semiint set1 sets smax smin solve sos1 sos2 sum system table then until using variable variables while1 xor yes";return{aliases:["gms"],cI:!0,k:s,c:[{bK:"sets parameters variables equations",e:";",c:[{b:"/",e:"/",c:[e.NM]}]},{cN:"string",b:"\\*{3}",e:"\\*{3}"},e.NM,{cN:"number",b:"\\$[a-zA-Z0-9]+"}]}});
\ No newline at end of file
+hljs.registerLanguage("gams",function(e){var a={keyword:"abort acronym acronyms alias all and assign binary card diag display else eq file files for free ge gt if integer le loop lt maximizing minimizing model models ne negative no not option options or ord positive prod put putpage puttl repeat sameas semicont semiint smax smin solve sos1 sos2 sum system table then until using while xor yes",literal:"eps inf na","built-in":"abs arccos arcsin arctan arctan2 Beta betaReg binomial ceil centropy cos cosh cvPower div div0 eDist entropy errorf execSeed exp fact floor frac gamma gammaReg log logBeta logGamma log10 log2 mapVal max min mod ncpCM ncpF ncpVUpow ncpVUsin normal pi poly power randBinomial randLinear randTriangle round rPower sigmoid sign signPower sin sinh slexp sllog10 slrec sqexp sqlog10 sqr sqrec sqrt tan tanh trunc uniform uniformInt vcPower bool_and bool_eqv bool_imp bool_not bool_or bool_xor ifThen rel_eq rel_ge rel_gt rel_le rel_lt rel_ne gday gdow ghour gleap gmillisec gminute gmonth gsecond gyear jdate jnow jstart jtime errorLevel execError gamsRelease gamsVersion handleCollect handleDelete handleStatus handleSubmit heapFree heapLimit heapSize jobHandle jobKill jobStatus jobTerminate licenseLevel licenseStatus maxExecError sleep timeClose timeComp timeElapsed timeExec timeStart"},o={cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0},r={cN:"symbol",v:[{b:/\=[lgenxc]=/},{b:/\$/}]},t={cN:"comment",v:[{b:"'",e:"'"},{b:'"',e:'"'}],i:"\\n",c:[e.BE]},i={b:"/",e:"/",k:a,c:[t,e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM]},l={b:/[a-z][a-z0-9_]*(\([a-z0-9_, ]*\))?[ \t]+/,eB:!0,e:"$",eW:!0,c:[t,i,{cN:"comment",b:/([ ]*[a-z0-9&#*=?@>\\<:\-,()$\[\]_.{}!+%^]+)+/,r:0}]};return{aliases:["gms"],cI:!0,k:a,c:[e.C(/^\$ontext/,/^\$offtext/),{cN:"meta",b:"^\\$[a-z0-9]+",e:"$",rB:!0,c:[{cN:"meta-keyword",b:"^\\$[a-z0-9]+"}]},e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,{bK:"set sets parameter parameters variable variables scalar scalars equation equations",e:";",c:[e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,i,l]},{bK:"table",e:";",rB:!0,c:[{bK:"table",e:"$",c:[l]},e.C("^\\*","$"),e.CLCM,e.CBCM,e.QSM,e.ASM,e.CNM]},{cN:"function",b:/^[a-z][a-z0-9_,\-+' ()$]+\.{2}/,rB:!0,c:[{cN:"title",b:/^[a-z0-9_]+/},o,r]},e.CNM,r]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/gauss.js b/lib/highlight_js/assets/lang/gauss.js
index 3a46d0d0993..567e39d92d0 100644
--- a/lib/highlight_js/assets/lang/gauss.js
+++ b/lib/highlight_js/assets/lang/gauss.js
@@ -1 +1 @@
-hljs.registerLanguage("gauss",function(e){var t={keyword:"and bool break|0 call callexe checkinterrupt clear clearg closeall cls comlog compile continue create debug declare delete disable dlibrary|10 dllcall do|0 dos ed edit else|0 elseif enable end endfor|10 endif|10 endp|10 endo|10 errorlog|10 errorlogat expr external fn for|0 format goto gosub|0 graph if|0 keyword let lib library line load loadarray loadexe loadf|10 loadk|10 loadm|10 loadp loads loadx local locate loopnextindex lprint lpwidth lshow matrix msym ndpclex new not open or output outwidth plot plotsym pop prcsn print printdos proc|10 push retp|10 return|0 rndcon rndmod rndmult rndseed run save saveall screen scroll setarray show sparse stop string struct system trace trap|10 threadfor|10 threadendfor|10 threadbegin|10 threadjoin|10 threadstat|10 threadend|10 until use while winprint",built_in:"abs acf aconcat aeye amax amean AmericanBinomCall AmericanBinomCall_Greeks AmericanBinomCall_ImpVol AmericanBinomPut AmericanBinomPut_Greeks AmericanBinomPut_ImpVol AmericanBSCall AmericanBSCall_Greeks AmericanBSCall_ImpVol AmericanBSPut AmericanBSPut_Greeks AmericanBSPut_ImpVol amin amult annotationGetDefaults annotationSetBkd annotationSetFont annotationSetLineColor annotationSetLineStyle annotationSetLineThickness annualTradingDays arccos arcsin areshape arrayalloc arrayindex arrayinit arraytomat asciiload asclabel astd astds asum atan atan2 atranspose axmargin balance band bandchol bandcholsol bandltsol bandrv bandsolpd bar base10 begwind besselj bessely beta box boxcox cdfBeta cdfBetaInv cdfBinomial cdfBinomialInv cdfBvn cdfBvn2 cdfBvn2e cdfCauchy cdfCauchyInv cdfChic cdfChii cdfChinc cdfChincInv cdfExp cdfExpInv cdfFc cdfFnc cdfFncInv cdfGam cdfGenPareto cdfHyperGeo cdfLaplace cdfLaplaceInv cdfLogistic cdfLogisticInv cdfmControlCreate cdfMvn cdfMvn2e cdfMvnce cdfMvne cdfMvt2e cdfMvtce cdfMvte cdfN cdfN2 cdfNc cdfNegBinomial cdfNegBinomialInv cdfNi cdfPoisson cdfPoissonInv cdfRayleigh cdfRayleighInv cdfTc cdfTci cdfTnc cdfTvn cdfWeibull cdfWeibullInv cdir ceil ChangeDir chdir chiBarSquare chol choldn cholsol cholup chrs close code cols colsf combinate combinated complex con cond conj cons ConScore contour conv convertsatostr convertstrtosa corrm corrms corrvc corrx corrxs cos cosh counts countwts crossprd crout croutp csrcol csrlin csvReadM csvReadSA cumprodc cumsumc curve cvtos datacreate datacreatecomplex datalist dataload dataloop dataopen datasave date datestr datestring datestrymd dayinyr dayofweek dbAddDatabase|10 dbClose|10 dbCommit|10 dbCreateQuery|10 dbExecQuery|10 dbGetConnectOptions|10 dbGetDatabaseName|10 dbGetDriverName|10 dbGetDrivers|10 dbGetHostName|10 dbGetLastErrorNum|10 dbGetLastErrorText|10 dbGetNumericalPrecPolicy|10 dbGetPassword|10 dbGetPort|10 dbGetTableHeaders|10 dbGetTables|10 dbGetUserName|10 dbHasFeature|10 dbIsDriverAvailable|10 dbIsOpen|10 dbIsOpenError|10 dbOpen|10 dbQueryBindValue|10 dbQueryClear|10 dbQueryCols|10 dbQueryExecPrepared|10 dbQueryFetchAllM|10 dbQueryFetchAllSA|10 dbQueryFetchOneM|10 dbQueryFetchOneSA|10 dbQueryFinish|10 dbQueryGetBoundValue|10 dbQueryGetBoundValues|10 dbQueryGetField|10 dbQueryGetLastErrorNum|10 dbQueryGetLastErrorText|10 dbQueryGetLastInsertID|10 dbQueryGetLastQuery|10 dbQueryGetPosition|10 dbQueryIsActive|10 dbQueryIsForwardOnly|10 dbQueryIsNull|10 dbQueryIsSelect|10 dbQueryIsValid|10 dbQueryPrepare|10 dbQueryRows|10 dbQuerySeek|10 dbQuerySeekFirst|10 dbQuerySeekLast|10 dbQuerySeekNext|10 dbQuerySeekPrevious|10 dbQuerySetForwardOnly|10 dbRemoveDatabase|10 dbRollback|10 dbSetConnectOptions|10 dbSetDatabaseName|10 dbSetHostName|10 dbSetNumericalPrecPolicy|10 dbSetPort|10 dbSetUserName|10 dbTransaction|10 DeleteFile delif delrows denseToSp denseToSpRE denToZero design det detl dfft dffti diag diagrv digamma doswin DOSWinCloseall DOSWinOpen dotfeq dotfeqmt dotfge dotfgemt dotfgt dotfgtmt dotfle dotflemt dotflt dotfltmt dotfne dotfnemt draw drop dsCreate dstat dstatmt dstatmtControlCreate dtdate dtday dttime dttodtv dttostr dttoutc dtvnormal dtvtodt dtvtoutc dummy dummybr dummydn eig eigh eighv eigv elapsedTradingDays endwind envget eof eqSolve eqSolvemt eqSolvemtControlCreate eqSolvemtOutCreate eqSolveset erf erfc erfccplx erfcplx error etdays ethsec etstr EuropeanBinomCall EuropeanBinomCall_Greeks EuropeanBinomCall_ImpVol EuropeanBinomPut EuropeanBinomPut_Greeks EuropeanBinomPut_ImpVol EuropeanBSCall EuropeanBSCall_Greeks EuropeanBSCall_ImpVol EuropeanBSPut EuropeanBSPut_Greeks EuropeanBSPut_ImpVol exctsmpl exec execbg exp extern eye fcheckerr fclearerr feq feqmt fflush fft ffti fftm fftmi fftn fge fgemt fgets fgetsa fgetsat fgetst fgt fgtmt fileinfo filesa fle flemt floor flt fltmt fmod fne fnemt fonts fopen formatcv formatnv fputs fputst fseek fstrerror ftell ftocv ftos ftostrC gamma gammacplx gammaii gausset gdaAppend gdaCreate gdaDStat gdaDStatMat gdaGetIndex gdaGetName gdaGetNames gdaGetOrders gdaGetType gdaGetTypes gdaGetVarInfo gdaIsCplx gdaLoad gdaPack gdaRead gdaReadByIndex gdaReadSome gdaReadSparse gdaReadStruct gdaReportVarInfo gdaSave gdaUpdate gdaUpdateAndPack gdaVars gdaWrite gdaWrite32 gdaWriteSome getarray getdims getf getGAUSShome getmatrix getmatrix4D getname getnamef getNextTradingDay getNextWeekDay getnr getorders getpath getPreviousTradingDay getPreviousWeekDay getRow getscalar3D getscalar4D getTrRow getwind glm gradcplx gradMT gradMTm gradMTT gradMTTm gradp graphprt graphset hasimag header headermt hess hessMT hessMTg hessMTgw hessMTm hessMTmw hessMTT hessMTTg hessMTTgw hessMTTm hessMTw hessp hist histf histp hsec imag indcv indexcat indices indices2 indicesf indicesfn indnv indsav indx integrate1d integrateControlCreate intgrat2 intgrat3 inthp1 inthp2 inthp3 inthp4 inthpControlCreate intquad1 intquad2 intquad3 intrleav intrleavsa intrsect intsimp inv invpd invswp iscplx iscplxf isden isinfnanmiss ismiss key keyav keyw lag lag1 lagn lapEighb lapEighi lapEighvb lapEighvi lapgEig lapgEigh lapgEighv lapgEigv lapgSchur lapgSvdcst lapgSvds lapgSvdst lapSvdcusv lapSvds lapSvdusv ldlp ldlsol linSolve listwise ln lncdfbvn lncdfbvn2 lncdfmvn lncdfn lncdfn2 lncdfnc lnfact lngammacplx lnpdfmvn lnpdfmvt lnpdfn lnpdft loadd loadstruct loadwind loess loessmt loessmtControlCreate log loglog logx logy lower lowmat lowmat1 ltrisol lu lusol machEpsilon make makevars makewind margin matalloc matinit mattoarray maxbytes maxc maxindc maxv maxvec mbesselei mbesselei0 mbesselei1 mbesseli mbesseli0 mbesseli1 meanc median mergeby mergevar minc minindc minv miss missex missrv moment momentd movingave movingaveExpwgt movingaveWgt nextindex nextn nextnevn nextwind ntos null null1 numCombinations ols olsmt olsmtControlCreate olsqr olsqr2 olsqrmt ones optn optnevn orth outtyp pacf packedToSp packr parse pause pdfCauchy pdfChi pdfExp pdfGenPareto pdfHyperGeo pdfLaplace pdfLogistic pdfn pdfPoisson pdfRayleigh pdfWeibull pi pinv pinvmt plotAddArrow plotAddBar plotAddBox plotAddHist plotAddHistF plotAddHistP plotAddPolar plotAddScatter plotAddShape plotAddTextbox plotAddTS plotAddXY plotArea plotBar plotBox plotClearLayout plotContour plotCustomLayout plotGetDefaults plotHist plotHistF plotHistP plotLayout plotLogLog plotLogX plotLogY plotOpenWindow plotPolar plotSave plotScatter plotSetAxesPen plotSetBar plotSetBarFill plotSetBarStacked plotSetBkdColor plotSetFill plotSetGrid plotSetLegend plotSetLineColor plotSetLineStyle plotSetLineSymbol plotSetLineThickness plotSetNewWindow plotSetTitle plotSetWhichYAxis plotSetXAxisShow plotSetXLabel plotSetXRange plotSetXTicInterval plotSetXTicLabel plotSetYAxisShow plotSetYLabel plotSetYRange plotSetZAxisShow plotSetZLabel plotSurface plotTS plotXY polar polychar polyeval polygamma polyint polymake polymat polymroot polymult polyroot pqgwin previousindex princomp printfm printfmt prodc psi putarray putf putvals pvCreate pvGetIndex pvGetParNames pvGetParVector pvLength pvList pvPack pvPacki pvPackm pvPackmi pvPacks pvPacksi pvPacksm pvPacksmi pvPutParVector pvTest pvUnpack QNewton QNewtonmt QNewtonmtControlCreate QNewtonmtOutCreate QNewtonSet QProg QProgmt QProgmtInCreate qqr qqre qqrep qr qre qrep qrsol qrtsol qtyr qtyre qtyrep quantile quantiled qyr qyre qyrep qz rank rankindx readr real reclassify reclassifyCuts recode recserar recsercp recserrc rerun rescale reshape rets rev rfft rffti rfftip rfftn rfftnp rfftp rndBernoulli rndBeta rndBinomial rndCauchy rndChiSquare rndCon rndCreateState rndExp rndGamma rndGeo rndGumbel rndHyperGeo rndi rndKMbeta rndKMgam rndKMi rndKMn rndKMnb rndKMp rndKMu rndKMvm rndLaplace rndLCbeta rndLCgam rndLCi rndLCn rndLCnb rndLCp rndLCu rndLCvm rndLogNorm rndMTu rndMVn rndMVt rndn rndnb rndNegBinomial rndp rndPoisson rndRayleigh rndStateSkip rndu rndvm rndWeibull rndWishart rotater round rows rowsf rref sampleData satostrC saved saveStruct savewind scale scale3d scalerr scalinfnanmiss scalmiss schtoc schur searchsourcepath seekr select selif seqa seqm setdif setdifsa setvars setvwrmode setwind shell shiftr sin singleindex sinh sleep solpd sortc sortcc sortd sorthc sorthcc sortind sortindc sortmc sortr sortrc spBiconjGradSol spChol spConjGradSol spCreate spDenseSubmat spDiagRvMat spEigv spEye spLDL spline spLU spNumNZE spOnes spreadSheetReadM spreadSheetReadSA spreadSheetWrite spScale spSubmat spToDense spTrTDense spTScalar spZeros sqpSolve sqpSolveMT sqpSolveMTControlCreate sqpSolveMTlagrangeCreate sqpSolveMToutCreate sqpSolveSet sqrt statements stdc stdsc stocv stof strcombine strindx strlen strput strrindx strsect strsplit strsplitPad strtodt strtof strtofcplx strtriml strtrimr strtrunc strtruncl strtruncpad strtruncr submat subscat substute subvec sumc sumr surface svd svd1 svd2 svdcusv svds svdusv sysstate tab tan tanh tempname threadBegin threadEnd threadEndFor threadFor threadJoin threadStat time timedt timestr timeutc title tkf2eps tkf2ps tocart todaydt toeplitz token topolar trapchk trigamma trimr trunc type typecv typef union unionsa uniqindx uniqindxsa unique uniquesa upmat upmat1 upper utctodt utctodtv utrisol vals varCovMS varCovXS varget vargetl varmall varmares varput varputl vartypef vcm vcms vcx vcxs vec vech vecr vector vget view viewxyz vlist vnamecv volume vput vread vtypecv wait waitc walkindex where window writer xlabel xlsGetSheetCount xlsGetSheetSize xlsGetSheetTypes xlsMakeRange xlsReadM xlsReadSA xlsWrite xlsWriteM xlsWriteSA xpnd xtics xy xyz ylabel ytics zeros zeta zlabel ztics",literal:"DB_AFTER_LAST_ROW DB_ALL_TABLES DB_BATCH_OPERATIONS DB_BEFORE_FIRST_ROW DB_BLOB DB_EVENT_NOTIFICATIONS DB_FINISH_QUERY DB_HIGH_PRECISION DB_LAST_INSERT_ID DB_LOW_PRECISION_DOUBLE DB_LOW_PRECISION_INT32 DB_LOW_PRECISION_INT64 DB_LOW_PRECISION_NUMBERS DB_MULTIPLE_RESULT_SETS DB_NAMED_PLACEHOLDERS DB_POSITIONAL_PLACEHOLDERS DB_PREPARED_QUERIES DB_QUERY_SIZE DB_SIMPLE_LOCKING DB_SYSTEM_TABLES DB_TABLES DB_TRANSACTIONS DB_UNICODE DB_VIEWS"},a={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline"},c:[{b:/\\\n/,r:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[{cN:"meta-string",b:'"',e:'"',i:"\\n"}]},e.CLCM,e.CBCM]},r=e.UIR+"\\s*\\(?",o=[{cN:"params",b:/\(/,e:/\)/,k:t,r:0,c:[e.CNM,e.CLCM,e.CBCM]}];return{aliases:["gss"],cI:!0,k:t,i:"(\\{[%#]|[%#]\\})",c:[e.CNM,e.CLCM,e.CBCM,e.C("@","@"),a,{cN:"string",b:'"',e:'"',c:[e.BE]},{cN:"function",bK:"proc keyword",e:";",eE:!0,k:t,c:[{b:r,rB:!0,c:[e.UTM],r:0},e.CNM,e.CLCM,e.CBCM,a].concat(o)},{cN:"function",bK:"fn",e:";",eE:!0,k:t,c:[{b:r+e.IR+"\\)?\\s*\\=\\s*",rB:!0,c:[e.UTM],r:0},e.CNM,e.CLCM,e.CBCM].concat(o)},{cN:"function",b:"\\bexternal (proc|keyword|fn)\\s+",e:";",eE:!0,k:t,c:[{b:r,rB:!0,c:[e.UTM],r:0},e.CLCM,e.CBCM]},{cN:"function",b:"\\bexternal (matrix|string|array|sparse matrix|struct "+e.IR+")\\s+",e:";",eE:!0,k:t,c:[e.CLCM,e.CBCM]}]}});
\ No newline at end of file
+hljs.registerLanguage("gauss",function(e){var t={keyword:"and bool break call callexe checkinterrupt clear clearg closeall cls comlog compile continue create debug declare delete disable dlibrary dllcall do dos ed edit else elseif enable end endfor endif endp endo errorlog errorlogat expr external fn for format goto gosub graph if keyword let lib library line load loadarray loadexe loadf loadk loadm loadp loads loadx local locate loopnextindex lprint lpwidth lshow matrix msym ndpclex new not open or output outwidth plot plotsym pop prcsn print printdos proc push retp return rndcon rndmod rndmult rndseed run save saveall screen scroll setarray show sparse stop string struct system trace trap threadfor threadendfor threadbegin threadjoin threadstat threadend until use while winprint",built_in:"abs acf aconcat aeye amax amean AmericanBinomCall AmericanBinomCall_Greeks AmericanBinomCall_ImpVol AmericanBinomPut AmericanBinomPut_Greeks AmericanBinomPut_ImpVol AmericanBSCall AmericanBSCall_Greeks AmericanBSCall_ImpVol AmericanBSPut AmericanBSPut_Greeks AmericanBSPut_ImpVol amin amult annotationGetDefaults annotationSetBkd annotationSetFont annotationSetLineColor annotationSetLineStyle annotationSetLineThickness annualTradingDays arccos arcsin areshape arrayalloc arrayindex arrayinit arraytomat asciiload asclabel astd astds asum atan atan2 atranspose axmargin balance band bandchol bandcholsol bandltsol bandrv bandsolpd bar base10 begwind besselj bessely beta box boxcox cdfBeta cdfBetaInv cdfBinomial cdfBinomialInv cdfBvn cdfBvn2 cdfBvn2e cdfCauchy cdfCauchyInv cdfChic cdfChii cdfChinc cdfChincInv cdfExp cdfExpInv cdfFc cdfFnc cdfFncInv cdfGam cdfGenPareto cdfHyperGeo cdfLaplace cdfLaplaceInv cdfLogistic cdfLogisticInv cdfmControlCreate cdfMvn cdfMvn2e cdfMvnce cdfMvne cdfMvt2e cdfMvtce cdfMvte cdfN cdfN2 cdfNc cdfNegBinomial cdfNegBinomialInv cdfNi cdfPoisson cdfPoissonInv cdfRayleigh cdfRayleighInv cdfTc cdfTci cdfTnc cdfTvn cdfWeibull cdfWeibullInv cdir ceil ChangeDir chdir chiBarSquare chol choldn cholsol cholup chrs close code cols colsf combinate combinated complex con cond conj cons ConScore contour conv convertsatostr convertstrtosa corrm corrms corrvc corrx corrxs cos cosh counts countwts crossprd crout croutp csrcol csrlin csvReadM csvReadSA cumprodc cumsumc curve cvtos datacreate datacreatecomplex datalist dataload dataloop dataopen datasave date datestr datestring datestrymd dayinyr dayofweek dbAddDatabase dbClose dbCommit dbCreateQuery dbExecQuery dbGetConnectOptions dbGetDatabaseName dbGetDriverName dbGetDrivers dbGetHostName dbGetLastErrorNum dbGetLastErrorText dbGetNumericalPrecPolicy dbGetPassword dbGetPort dbGetTableHeaders dbGetTables dbGetUserName dbHasFeature dbIsDriverAvailable dbIsOpen dbIsOpenError dbOpen dbQueryBindValue dbQueryClear dbQueryCols dbQueryExecPrepared dbQueryFetchAllM dbQueryFetchAllSA dbQueryFetchOneM dbQueryFetchOneSA dbQueryFinish dbQueryGetBoundValue dbQueryGetBoundValues dbQueryGetField dbQueryGetLastErrorNum dbQueryGetLastErrorText dbQueryGetLastInsertID dbQueryGetLastQuery dbQueryGetPosition dbQueryIsActive dbQueryIsForwardOnly dbQueryIsNull dbQueryIsSelect dbQueryIsValid dbQueryPrepare dbQueryRows dbQuerySeek dbQuerySeekFirst dbQuerySeekLast dbQuerySeekNext dbQuerySeekPrevious dbQuerySetForwardOnly dbRemoveDatabase dbRollback dbSetConnectOptions dbSetDatabaseName dbSetHostName dbSetNumericalPrecPolicy dbSetPort dbSetUserName dbTransaction DeleteFile delif delrows denseToSp denseToSpRE denToZero design det detl dfft dffti diag diagrv digamma doswin DOSWinCloseall DOSWinOpen dotfeq dotfeqmt dotfge dotfgemt dotfgt dotfgtmt dotfle dotflemt dotflt dotfltmt dotfne dotfnemt draw drop dsCreate dstat dstatmt dstatmtControlCreate dtdate dtday dttime dttodtv dttostr dttoutc dtvnormal dtvtodt dtvtoutc dummy dummybr dummydn eig eigh eighv eigv elapsedTradingDays endwind envget eof eqSolve eqSolvemt eqSolvemtControlCreate eqSolvemtOutCreate eqSolveset erf erfc erfccplx erfcplx error etdays ethsec etstr EuropeanBinomCall EuropeanBinomCall_Greeks EuropeanBinomCall_ImpVol EuropeanBinomPut EuropeanBinomPut_Greeks EuropeanBinomPut_ImpVol EuropeanBSCall EuropeanBSCall_Greeks EuropeanBSCall_ImpVol EuropeanBSPut EuropeanBSPut_Greeks EuropeanBSPut_ImpVol exctsmpl exec execbg exp extern eye fcheckerr fclearerr feq feqmt fflush fft ffti fftm fftmi fftn fge fgemt fgets fgetsa fgetsat fgetst fgt fgtmt fileinfo filesa fle flemt floor flt fltmt fmod fne fnemt fonts fopen formatcv formatnv fputs fputst fseek fstrerror ftell ftocv ftos ftostrC gamma gammacplx gammaii gausset gdaAppend gdaCreate gdaDStat gdaDStatMat gdaGetIndex gdaGetName gdaGetNames gdaGetOrders gdaGetType gdaGetTypes gdaGetVarInfo gdaIsCplx gdaLoad gdaPack gdaRead gdaReadByIndex gdaReadSome gdaReadSparse gdaReadStruct gdaReportVarInfo gdaSave gdaUpdate gdaUpdateAndPack gdaVars gdaWrite gdaWrite32 gdaWriteSome getarray getdims getf getGAUSShome getmatrix getmatrix4D getname getnamef getNextTradingDay getNextWeekDay getnr getorders getpath getPreviousTradingDay getPreviousWeekDay getRow getscalar3D getscalar4D getTrRow getwind glm gradcplx gradMT gradMTm gradMTT gradMTTm gradp graphprt graphset hasimag header headermt hess hessMT hessMTg hessMTgw hessMTm hessMTmw hessMTT hessMTTg hessMTTgw hessMTTm hessMTw hessp hist histf histp hsec imag indcv indexcat indices indices2 indicesf indicesfn indnv indsav integrate1d integrateControlCreate intgrat2 intgrat3 inthp1 inthp2 inthp3 inthp4 inthpControlCreate intquad1 intquad2 intquad3 intrleav intrleavsa intrsect intsimp inv invpd invswp iscplx iscplxf isden isinfnanmiss ismiss key keyav keyw lag lag1 lagn lapEighb lapEighi lapEighvb lapEighvi lapgEig lapgEigh lapgEighv lapgEigv lapgSchur lapgSvdcst lapgSvds lapgSvdst lapSvdcusv lapSvds lapSvdusv ldlp ldlsol linSolve listwise ln lncdfbvn lncdfbvn2 lncdfmvn lncdfn lncdfn2 lncdfnc lnfact lngammacplx lnpdfmvn lnpdfmvt lnpdfn lnpdft loadd loadstruct loadwind loess loessmt loessmtControlCreate log loglog logx logy lower lowmat lowmat1 ltrisol lu lusol machEpsilon make makevars makewind margin matalloc matinit mattoarray maxbytes maxc maxindc maxv maxvec mbesselei mbesselei0 mbesselei1 mbesseli mbesseli0 mbesseli1 meanc median mergeby mergevar minc minindc minv miss missex missrv moment momentd movingave movingaveExpwgt movingaveWgt nextindex nextn nextnevn nextwind ntos null null1 numCombinations ols olsmt olsmtControlCreate olsqr olsqr2 olsqrmt ones optn optnevn orth outtyp pacf packedToSp packr parse pause pdfCauchy pdfChi pdfExp pdfGenPareto pdfHyperGeo pdfLaplace pdfLogistic pdfn pdfPoisson pdfRayleigh pdfWeibull pi pinv pinvmt plotAddArrow plotAddBar plotAddBox plotAddHist plotAddHistF plotAddHistP plotAddPolar plotAddScatter plotAddShape plotAddTextbox plotAddTS plotAddXY plotArea plotBar plotBox plotClearLayout plotContour plotCustomLayout plotGetDefaults plotHist plotHistF plotHistP plotLayout plotLogLog plotLogX plotLogY plotOpenWindow plotPolar plotSave plotScatter plotSetAxesPen plotSetBar plotSetBarFill plotSetBarStacked plotSetBkdColor plotSetFill plotSetGrid plotSetLegend plotSetLineColor plotSetLineStyle plotSetLineSymbol plotSetLineThickness plotSetNewWindow plotSetTitle plotSetWhichYAxis plotSetXAxisShow plotSetXLabel plotSetXRange plotSetXTicInterval plotSetXTicLabel plotSetYAxisShow plotSetYLabel plotSetYRange plotSetZAxisShow plotSetZLabel plotSurface plotTS plotXY polar polychar polyeval polygamma polyint polymake polymat polymroot polymult polyroot pqgwin previousindex princomp printfm printfmt prodc psi putarray putf putvals pvCreate pvGetIndex pvGetParNames pvGetParVector pvLength pvList pvPack pvPacki pvPackm pvPackmi pvPacks pvPacksi pvPacksm pvPacksmi pvPutParVector pvTest pvUnpack QNewton QNewtonmt QNewtonmtControlCreate QNewtonmtOutCreate QNewtonSet QProg QProgmt QProgmtInCreate qqr qqre qqrep qr qre qrep qrsol qrtsol qtyr qtyre qtyrep quantile quantiled qyr qyre qyrep qz rank rankindx readr real reclassify reclassifyCuts recode recserar recsercp recserrc rerun rescale reshape rets rev rfft rffti rfftip rfftn rfftnp rfftp rndBernoulli rndBeta rndBinomial rndCauchy rndChiSquare rndCon rndCreateState rndExp rndGamma rndGeo rndGumbel rndHyperGeo rndi rndKMbeta rndKMgam rndKMi rndKMn rndKMnb rndKMp rndKMu rndKMvm rndLaplace rndLCbeta rndLCgam rndLCi rndLCn rndLCnb rndLCp rndLCu rndLCvm rndLogNorm rndMTu rndMVn rndMVt rndn rndnb rndNegBinomial rndp rndPoisson rndRayleigh rndStateSkip rndu rndvm rndWeibull rndWishart rotater round rows rowsf rref sampleData satostrC saved saveStruct savewind scale scale3d scalerr scalinfnanmiss scalmiss schtoc schur searchsourcepath seekr select selif seqa seqm setdif setdifsa setvars setvwrmode setwind shell shiftr sin singleindex sinh sleep solpd sortc sortcc sortd sorthc sorthcc sortind sortindc sortmc sortr sortrc spBiconjGradSol spChol spConjGradSol spCreate spDenseSubmat spDiagRvMat spEigv spEye spLDL spline spLU spNumNZE spOnes spreadSheetReadM spreadSheetReadSA spreadSheetWrite spScale spSubmat spToDense spTrTDense spTScalar spZeros sqpSolve sqpSolveMT sqpSolveMTControlCreate sqpSolveMTlagrangeCreate sqpSolveMToutCreate sqpSolveSet sqrt statements stdc stdsc stocv stof strcombine strindx strlen strput strrindx strsect strsplit strsplitPad strtodt strtof strtofcplx strtriml strtrimr strtrunc strtruncl strtruncpad strtruncr submat subscat substute subvec sumc sumr surface svd svd1 svd2 svdcusv svds svdusv sysstate tab tan tanh tempname threadBegin threadEnd threadEndFor threadFor threadJoin threadStat time timedt timestr timeutc title tkf2eps tkf2ps tocart todaydt toeplitz token topolar trapchk trigamma trimr trunc type typecv typef union unionsa uniqindx uniqindxsa unique uniquesa upmat upmat1 upper utctodt utctodtv utrisol vals varCovMS varCovXS varget vargetl varmall varmares varput varputl vartypef vcm vcms vcx vcxs vec vech vecr vector vget view viewxyz vlist vnamecv volume vput vread vtypecv wait waitc walkindex where window writer xlabel xlsGetSheetCount xlsGetSheetSize xlsGetSheetTypes xlsMakeRange xlsReadM xlsReadSA xlsWrite xlsWriteM xlsWriteSA xpnd xtics xy xyz ylabel ytics zeros zeta zlabel ztics cdfEmpirical dot h5create h5open h5read h5readAttribute h5write h5writeAttribute ldl plotAddErrorBar plotAddSurface plotCDFEmpirical plotSetColormap plotSetContourLabels plotSetLegendFont plotSetTextInterpreter plotSetXTicCount plotSetYTicCount plotSetZLevels powerm strjoin strtrim sylvester",literal:"DB_AFTER_LAST_ROW DB_ALL_TABLES DB_BATCH_OPERATIONS DB_BEFORE_FIRST_ROW DB_BLOB DB_EVENT_NOTIFICATIONS DB_FINISH_QUERY DB_HIGH_PRECISION DB_LAST_INSERT_ID DB_LOW_PRECISION_DOUBLE DB_LOW_PRECISION_INT32 DB_LOW_PRECISION_INT64 DB_LOW_PRECISION_NUMBERS DB_MULTIPLE_RESULT_SETS DB_NAMED_PLACEHOLDERS DB_POSITIONAL_PLACEHOLDERS DB_PREPARED_QUERIES DB_QUERY_SIZE DB_SIMPLE_LOCKING DB_SYSTEM_TABLES DB_TABLES DB_TRANSACTIONS DB_UNICODE DB_VIEWS"},a={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"define definecs|10 undef ifdef ifndef iflight ifdllcall ifmac ifos2win ifunix else endif lineson linesoff srcfile srcline"},c:[{b:/\\\n/,r:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[{cN:"meta-string",b:'"',e:'"',i:"\\n"}]},e.CLCM,e.CBCM]},r=e.UIR+"\\s*\\(?",o=[{cN:"params",b:/\(/,e:/\)/,k:t,r:0,c:[e.CNM,e.CLCM,e.CBCM]}];return{aliases:["gss"],cI:!0,k:t,i:"(\\{[%#]|[%#]\\})",c:[e.CNM,e.CLCM,e.CBCM,e.C("@","@"),a,{cN:"string",b:'"',e:'"',c:[e.BE]},{cN:"function",bK:"proc keyword",e:";",eE:!0,k:t,c:[{b:r,rB:!0,c:[e.UTM],r:0},e.CNM,e.CLCM,e.CBCM,a].concat(o)},{cN:"function",bK:"fn",e:";",eE:!0,k:t,c:[{b:r+e.IR+"\\)?\\s*\\=\\s*",rB:!0,c:[e.UTM],r:0},e.CNM,e.CLCM,e.CBCM].concat(o)},{cN:"function",b:"\\bexternal (proc|keyword|fn)\\s+",e:";",eE:!0,k:t,c:[{b:r,rB:!0,c:[e.UTM],r:0},e.CLCM,e.CBCM]},{cN:"function",b:"\\bexternal (matrix|string|array|sparse matrix|struct "+e.IR+")\\s+",e:";",eE:!0,k:t,c:[e.CLCM,e.CBCM]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/glsl.js b/lib/highlight_js/assets/lang/glsl.js
index 7095358259b..20b7046010c 100644
--- a/lib/highlight_js/assets/lang/glsl.js
+++ b/lib/highlight_js/assets/lang/glsl.js
@@ -1 +1 @@
-hljs.registerLanguage("glsl",function(e){return{k:{keyword:"break continue discard do else for if return whileattribute binding buffer ccw centroid centroid varying coherent column_major const cw depth_any depth_greater depth_less depth_unchanged early_fragment_tests equal_spacing flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 rgba8_snorm rgba8i rgba8ui row_major sample shared smooth std140 std430 stream triangle_strip triangles triangles_adjacency uniform varying vertices volatile writeonly",type:"atomic_uint bool bvec2 bvec3 bvec4 dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 double dvec2 dvec3 dvec4 float iimage1D iimage1DArray iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBufferiimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect image3D imageBuffer imageCube imageCubeArray int isampler1D isampler1DArray isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow image1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint usampler1D usampler1DArray usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D samplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 vec2 vec3 vec4 void",built_in:"gl_MaxAtomicCounterBindings gl_MaxAtomicCounterBufferSize gl_MaxClipDistances gl_MaxClipPlanes gl_MaxCombinedAtomicCounterBuffers gl_MaxCombinedAtomicCounters gl_MaxCombinedImageUniforms gl_MaxCombinedImageUnitsAndFragmentOutputs gl_MaxCombinedTextureImageUnits gl_MaxComputeAtomicCounterBuffers gl_MaxComputeAtomicCounters gl_MaxComputeImageUniforms gl_MaxComputeTextureImageUnits gl_MaxComputeUniformComponents gl_MaxComputeWorkGroupCount gl_MaxComputeWorkGroupSize gl_MaxDrawBuffers gl_MaxFragmentAtomicCounterBuffers gl_MaxFragmentAtomicCounters gl_MaxFragmentImageUniforms gl_MaxFragmentInputComponents gl_MaxFragmentInputVectors gl_MaxFragmentUniformComponents gl_MaxFragmentUniformVectors gl_MaxGeometryAtomicCounterBuffers gl_MaxGeometryAtomicCounters gl_MaxGeometryImageUniforms gl_MaxGeometryInputComponents gl_MaxGeometryOutputComponents gl_MaxGeometryOutputVertices gl_MaxGeometryTextureImageUnits gl_MaxGeometryTotalOutputComponents gl_MaxGeometryUniformComponents gl_MaxGeometryVaryingComponents gl_MaxImageSamples gl_MaxImageUnits gl_MaxLights gl_MaxPatchVertices gl_MaxProgramTexelOffset gl_MaxTessControlAtomicCounterBuffers gl_MaxTessControlAtomicCounters gl_MaxTessControlImageUniforms gl_MaxTessControlInputComponents gl_MaxTessControlOutputComponents gl_MaxTessControlTextureImageUnits gl_MaxTessControlTotalOutputComponents gl_MaxTessControlUniformComponents gl_MaxTessEvaluationAtomicCounterBuffers gl_MaxTessEvaluationAtomicCounters gl_MaxTessEvaluationImageUniforms gl_MaxTessEvaluationInputComponents gl_MaxTessEvaluationOutputComponents gl_MaxTessEvaluationTextureImageUnits gl_MaxTessEvaluationUniformComponents gl_MaxTessGenLevel gl_MaxTessPatchComponents gl_MaxTextureCoords gl_MaxTextureImageUnits gl_MaxTextureUnits gl_MaxVaryingComponents gl_MaxVaryingFloats gl_MaxVaryingVectors gl_MaxVertexAtomicCounterBuffers gl_MaxVertexAtomicCounters gl_MaxVertexAttribs gl_MaxVertexImageUniforms gl_MaxVertexOutputComponents gl_MaxVertexOutputVectors gl_MaxVertexTextureImageUnits gl_MaxVertexUniformComponents gl_MaxVertexUniformVectors gl_MaxViewports gl_MinProgramTexelOffset gl_BackColor gl_BackLightModelProduct gl_BackLightProduct gl_BackMaterial gl_BackSecondaryColor gl_ClipDistance gl_ClipPlane gl_ClipVertex gl_Color gl_DepthRange gl_EyePlaneQ gl_EyePlaneR gl_EyePlaneS gl_EyePlaneT gl_Fog gl_FogCoord gl_FogFragCoord gl_FragColor gl_FragCoord gl_FragData gl_FragDepth gl_FrontColor gl_FrontFacing gl_FrontLightModelProduct gl_FrontLightProduct gl_FrontMaterial gl_FrontSecondaryColor gl_GlobalInvocationID gl_InstanceID gl_InvocationID gl_Layer gl_LightModel gl_LightSource gl_LocalInvocationID gl_LocalInvocationIndex gl_ModelViewMatrix gl_ModelViewMatrixInverse gl_ModelViewMatrixInverseTranspose gl_ModelViewMatrixTranspose gl_ModelViewProjectionMatrix gl_ModelViewProjectionMatrixInverse gl_ModelViewProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixTranspose gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_Normal gl_NormalMatrix gl_NormalScale gl_NumSamples gl_NumWorkGroups gl_ObjectPlaneQ gl_ObjectPlaneR gl_ObjectPlaneS gl_ObjectPlaneT gl_PatchVerticesIn gl_Point gl_PointCoord gl_PointSize gl_Position gl_PrimitiveID gl_PrimitiveIDIn gl_ProjectionMatrix gl_ProjectionMatrixInverse gl_ProjectionMatrixInverseTranspose gl_ProjectionMatrixTranspose gl_SampleID gl_SampleMask gl_SampleMaskIn gl_SamplePosition gl_SecondaryColor gl_TessCoord gl_TessLevelInner gl_TessLevelOuter gl_TexCoord gl_TextureEnvColor gl_TextureMatrix gl_TextureMatrixInverse gl_TextureMatrixInverseTranspose gl_TextureMatrixTranspose gl_Vertex gl_VertexID gl_ViewportIndex gl_WorkGroupID gl_WorkGroupSize gl_in gl_out EmitStreamVertex EmitVertex EndPrimitive EndStreamPrimitive abs acos acosh all any asin asinh atan atanh atomicAdd atomicAnd atomicCompSwap atomicCounter atomicCounterDecrement atomicCounterIncrement atomicExchange atomicMax atomicMin atomicOr atomicXor barrier bitCount bitfieldExtract bitfieldInsert bitfieldReverse ceil clamp cos cosh cross dFdx dFdy degrees determinant distance dot equal exp exp2 faceforward findLSB findMSB floatBitsToInt floatBitsToUint floor fma fract frexp ftransform fwidth greaterThan greaterThanEqual groupMemoryBarrier imageAtomicAdd imageAtomicAnd imageAtomicCompSwap imageAtomicExchange imageAtomicMax imageAtomicMin imageAtomicOr imageAtomicXor imageLoad imageSize imageStore imulExtended intBitsToFloat interpolateAtCentroid interpolateAtOffset interpolateAtSample inverse inversesqrt isinf isnan ldexp length lessThan lessThanEqual log log2 matrixCompMult max memoryBarrier memoryBarrierAtomicCounter memoryBarrierBuffer memoryBarrierImage memoryBarrierShared min mix mod modf noise1 noise2 noise3 noise4 normalize not notEqual outerProduct packDouble2x32 packHalf2x16 packSnorm2x16 packSnorm4x8 packUnorm2x16 packUnorm4x8 pow radians reflect refract round roundEven shadow1D shadow1DLod shadow1DProj shadow1DProjLod shadow2D shadow2DLod shadow2DProj shadow2DProjLod sign sin sinh smoothstep sqrt step tan tanh texelFetch texelFetchOffset texture texture1D texture1DLod texture1DProj texture1DProjLod texture2D texture2DLod texture2DProj texture2DProjLod texture3D texture3DLod texture3DProj texture3DProjLod textureCube textureCubeLod textureGather textureGatherOffset textureGatherOffsets textureGrad textureGradOffset textureLod textureLodOffset textureOffset textureProj textureProjGrad textureProjGradOffset textureProjLod textureProjLodOffset textureProjOffset textureQueryLevels textureQueryLod textureSize transpose trunc uaddCarry uintBitsToFloat umulExtended unpackDouble2x32 unpackHalf2x16 unpackSnorm2x16 unpackSnorm4x8 unpackUnorm2x16 unpackUnorm4x8 usubBorrow",literal:"true false"},i:'"',c:[e.CLCM,e.CBCM,e.CNM,{cN:"meta",b:"#",e:"$"}]}});
\ No newline at end of file
+hljs.registerLanguage("glsl",function(e){return{k:{keyword:"break continue discard do else for if return while switch case default attribute binding buffer ccw centroid centroid varying coherent column_major const cw depth_any depth_greater depth_less depth_unchanged early_fragment_tests equal_spacing flat fractional_even_spacing fractional_odd_spacing highp in index inout invariant invocations isolines layout line_strip lines lines_adjacency local_size_x local_size_y local_size_z location lowp max_vertices mediump noperspective offset origin_upper_left out packed patch pixel_center_integer point_mode points precise precision quads r11f_g11f_b10f r16 r16_snorm r16f r16i r16ui r32f r32i r32ui r8 r8_snorm r8i r8ui readonly restrict rg16 rg16_snorm rg16f rg16i rg16ui rg32f rg32i rg32ui rg8 rg8_snorm rg8i rg8ui rgb10_a2 rgb10_a2ui rgba16 rgba16_snorm rgba16f rgba16i rgba16ui rgba32f rgba32i rgba32ui rgba8 rgba8_snorm rgba8i rgba8ui row_major sample shared smooth std140 std430 stream triangle_strip triangles triangles_adjacency uniform varying vertices volatile writeonly",type:"atomic_uint bool bvec2 bvec3 bvec4 dmat2 dmat2x2 dmat2x3 dmat2x4 dmat3 dmat3x2 dmat3x3 dmat3x4 dmat4 dmat4x2 dmat4x3 dmat4x4 double dvec2 dvec3 dvec4 float iimage1D iimage1DArray iimage2D iimage2DArray iimage2DMS iimage2DMSArray iimage2DRect iimage3D iimageBufferiimageCube iimageCubeArray image1D image1DArray image2D image2DArray image2DMS image2DMSArray image2DRect image3D imageBuffer imageCube imageCubeArray int isampler1D isampler1DArray isampler2D isampler2DArray isampler2DMS isampler2DMSArray isampler2DRect isampler3D isamplerBuffer isamplerCube isamplerCubeArray ivec2 ivec3 ivec4 mat2 mat2x2 mat2x3 mat2x4 mat3 mat3x2 mat3x3 mat3x4 mat4 mat4x2 mat4x3 mat4x4 sampler1D sampler1DArray sampler1DArrayShadow sampler1DShadow sampler2D sampler2DArray sampler2DArrayShadow sampler2DMS sampler2DMSArray sampler2DRect sampler2DRectShadow sampler2DShadow sampler3D samplerBuffer samplerCube samplerCubeArray samplerCubeArrayShadow samplerCubeShadow image1D uimage1DArray uimage2D uimage2DArray uimage2DMS uimage2DMSArray uimage2DRect uimage3D uimageBuffer uimageCube uimageCubeArray uint usampler1D usampler1DArray usampler2D usampler2DArray usampler2DMS usampler2DMSArray usampler2DRect usampler3D samplerBuffer usamplerCube usamplerCubeArray uvec2 uvec3 uvec4 vec2 vec3 vec4 void",built_in:"gl_MaxAtomicCounterBindings gl_MaxAtomicCounterBufferSize gl_MaxClipDistances gl_MaxClipPlanes gl_MaxCombinedAtomicCounterBuffers gl_MaxCombinedAtomicCounters gl_MaxCombinedImageUniforms gl_MaxCombinedImageUnitsAndFragmentOutputs gl_MaxCombinedTextureImageUnits gl_MaxComputeAtomicCounterBuffers gl_MaxComputeAtomicCounters gl_MaxComputeImageUniforms gl_MaxComputeTextureImageUnits gl_MaxComputeUniformComponents gl_MaxComputeWorkGroupCount gl_MaxComputeWorkGroupSize gl_MaxDrawBuffers gl_MaxFragmentAtomicCounterBuffers gl_MaxFragmentAtomicCounters gl_MaxFragmentImageUniforms gl_MaxFragmentInputComponents gl_MaxFragmentInputVectors gl_MaxFragmentUniformComponents gl_MaxFragmentUniformVectors gl_MaxGeometryAtomicCounterBuffers gl_MaxGeometryAtomicCounters gl_MaxGeometryImageUniforms gl_MaxGeometryInputComponents gl_MaxGeometryOutputComponents gl_MaxGeometryOutputVertices gl_MaxGeometryTextureImageUnits gl_MaxGeometryTotalOutputComponents gl_MaxGeometryUniformComponents gl_MaxGeometryVaryingComponents gl_MaxImageSamples gl_MaxImageUnits gl_MaxLights gl_MaxPatchVertices gl_MaxProgramTexelOffset gl_MaxTessControlAtomicCounterBuffers gl_MaxTessControlAtomicCounters gl_MaxTessControlImageUniforms gl_MaxTessControlInputComponents gl_MaxTessControlOutputComponents gl_MaxTessControlTextureImageUnits gl_MaxTessControlTotalOutputComponents gl_MaxTessControlUniformComponents gl_MaxTessEvaluationAtomicCounterBuffers gl_MaxTessEvaluationAtomicCounters gl_MaxTessEvaluationImageUniforms gl_MaxTessEvaluationInputComponents gl_MaxTessEvaluationOutputComponents gl_MaxTessEvaluationTextureImageUnits gl_MaxTessEvaluationUniformComponents gl_MaxTessGenLevel gl_MaxTessPatchComponents gl_MaxTextureCoords gl_MaxTextureImageUnits gl_MaxTextureUnits gl_MaxVaryingComponents gl_MaxVaryingFloats gl_MaxVaryingVectors gl_MaxVertexAtomicCounterBuffers gl_MaxVertexAtomicCounters gl_MaxVertexAttribs gl_MaxVertexImageUniforms gl_MaxVertexOutputComponents gl_MaxVertexOutputVectors gl_MaxVertexTextureImageUnits gl_MaxVertexUniformComponents gl_MaxVertexUniformVectors gl_MaxViewports gl_MinProgramTexelOffset gl_BackColor gl_BackLightModelProduct gl_BackLightProduct gl_BackMaterial gl_BackSecondaryColor gl_ClipDistance gl_ClipPlane gl_ClipVertex gl_Color gl_DepthRange gl_EyePlaneQ gl_EyePlaneR gl_EyePlaneS gl_EyePlaneT gl_Fog gl_FogCoord gl_FogFragCoord gl_FragColor gl_FragCoord gl_FragData gl_FragDepth gl_FrontColor gl_FrontFacing gl_FrontLightModelProduct gl_FrontLightProduct gl_FrontMaterial gl_FrontSecondaryColor gl_GlobalInvocationID gl_InstanceID gl_InvocationID gl_Layer gl_LightModel gl_LightSource gl_LocalInvocationID gl_LocalInvocationIndex gl_ModelViewMatrix gl_ModelViewMatrixInverse gl_ModelViewMatrixInverseTranspose gl_ModelViewMatrixTranspose gl_ModelViewProjectionMatrix gl_ModelViewProjectionMatrixInverse gl_ModelViewProjectionMatrixInverseTranspose gl_ModelViewProjectionMatrixTranspose gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 gl_Normal gl_NormalMatrix gl_NormalScale gl_NumSamples gl_NumWorkGroups gl_ObjectPlaneQ gl_ObjectPlaneR gl_ObjectPlaneS gl_ObjectPlaneT gl_PatchVerticesIn gl_Point gl_PointCoord gl_PointSize gl_Position gl_PrimitiveID gl_PrimitiveIDIn gl_ProjectionMatrix gl_ProjectionMatrixInverse gl_ProjectionMatrixInverseTranspose gl_ProjectionMatrixTranspose gl_SampleID gl_SampleMask gl_SampleMaskIn gl_SamplePosition gl_SecondaryColor gl_TessCoord gl_TessLevelInner gl_TessLevelOuter gl_TexCoord gl_TextureEnvColor gl_TextureMatrix gl_TextureMatrixInverse gl_TextureMatrixInverseTranspose gl_TextureMatrixTranspose gl_Vertex gl_VertexID gl_ViewportIndex gl_WorkGroupID gl_WorkGroupSize gl_in gl_out EmitStreamVertex EmitVertex EndPrimitive EndStreamPrimitive abs acos acosh all any asin asinh atan atanh atomicAdd atomicAnd atomicCompSwap atomicCounter atomicCounterDecrement atomicCounterIncrement atomicExchange atomicMax atomicMin atomicOr atomicXor barrier bitCount bitfieldExtract bitfieldInsert bitfieldReverse ceil clamp cos cosh cross dFdx dFdy degrees determinant distance dot equal exp exp2 faceforward findLSB findMSB floatBitsToInt floatBitsToUint floor fma fract frexp ftransform fwidth greaterThan greaterThanEqual groupMemoryBarrier imageAtomicAdd imageAtomicAnd imageAtomicCompSwap imageAtomicExchange imageAtomicMax imageAtomicMin imageAtomicOr imageAtomicXor imageLoad imageSize imageStore imulExtended intBitsToFloat interpolateAtCentroid interpolateAtOffset interpolateAtSample inverse inversesqrt isinf isnan ldexp length lessThan lessThanEqual log log2 matrixCompMult max memoryBarrier memoryBarrierAtomicCounter memoryBarrierBuffer memoryBarrierImage memoryBarrierShared min mix mod modf noise1 noise2 noise3 noise4 normalize not notEqual outerProduct packDouble2x32 packHalf2x16 packSnorm2x16 packSnorm4x8 packUnorm2x16 packUnorm4x8 pow radians reflect refract round roundEven shadow1D shadow1DLod shadow1DProj shadow1DProjLod shadow2D shadow2DLod shadow2DProj shadow2DProjLod sign sin sinh smoothstep sqrt step tan tanh texelFetch texelFetchOffset texture texture1D texture1DLod texture1DProj texture1DProjLod texture2D texture2DLod texture2DProj texture2DProjLod texture3D texture3DLod texture3DProj texture3DProjLod textureCube textureCubeLod textureGather textureGatherOffset textureGatherOffsets textureGrad textureGradOffset textureLod textureLodOffset textureOffset textureProj textureProjGrad textureProjGradOffset textureProjLod textureProjLodOffset textureProjOffset textureQueryLevels textureQueryLod textureSize transpose trunc uaddCarry uintBitsToFloat umulExtended unpackDouble2x32 unpackHalf2x16 unpackSnorm2x16 unpackSnorm4x8 unpackUnorm2x16 unpackUnorm4x8 usubBorrow",literal:"true false"},i:'"',c:[e.CLCM,e.CBCM,e.CNM,{cN:"meta",b:"#",e:"$"}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/go.js b/lib/highlight_js/assets/lang/go.js
index 269feec6687..cf58a7e0e16 100644
--- a/lib/highlight_js/assets/lang/go.js
+++ b/lib/highlight_js/assets/lang/go.js
@@ -1 +1 @@
-hljs.registerLanguage("go",function(e){var t={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{aliases:["golang"],k:t,i:"</",c:[e.CLCM,e.CBCM,e.QSM,{cN:"string",b:"'",e:"[^\\\\]'"},{cN:"string",b:"`",e:"`"},{cN:"number",b:e.CNR+"[dflsi]?",r:0},e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("go",function(e){var t={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{aliases:["golang"],k:t,i:"</",c:[e.CLCM,e.CBCM,{cN:"string",v:[e.QSM,{b:"'",e:"[^\\\\]'"},{b:"`",e:"`"}]},{cN:"number",v:[{b:e.CNR+"[dflsi]",r:1},e.CNM]},{b:/:=/},{cN:"function",bK:"func",e:/\s*\{/,eE:!0,c:[e.TM,{cN:"params",b:/\(/,e:/\)/,k:t,i:/["']/}]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/haxe.js b/lib/highlight_js/assets/lang/haxe.js
index 3408828b72c..ab88585bf2f 100644
--- a/lib/highlight_js/assets/lang/haxe.js
+++ b/lib/highlight_js/assets/lang/haxe.js
@@ -1 +1 @@
-hljs.registerLanguage("haxe",function(e){var a="([*]|[a-zA-Z_$][a-zA-Z0-9_$]*)";return{aliases:["hx"],k:{keyword:"break callback case cast catch class continue default do dynamic else enum extends extern for function here if implements import in inline interface never new override package private public return static super switch this throw trace try typedef untyped using var while",literal:"true false null"},c:[e.ASM,e.QSM,e.CLCM,e.CBCM,e.CNM,{cN:"class",bK:"class interface",e:"{",eE:!0,c:[{bK:"extends implements"},e.TM]},{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elseif end error"}},{cN:"function",bK:"function",e:"[{;]",eE:!0,i:"\\S",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",c:[e.ASM,e.QSM,e.CLCM,e.CBCM]},{b:":\\s*"+a}]}]}});
\ No newline at end of file
+hljs.registerLanguage("haxe",function(e){var t="Int Float String Bool Dynamic Void Array ";return{aliases:["hx"],k:{keyword:"break case cast catch continue default do dynamic else enum extern for function here if import in inline never new override package private get set public return static super switch this throw trace try typedef untyped using var while "+t,built_in:"trace this",literal:"true false null _"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"},{cN:"subst",b:"\\$",e:"\\W}"}]},e.QSM,e.CLCM,e.CBCM,e.CNM,{cN:"meta",b:"@:",e:"$"},{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elseif end error"}},{cN:"type",b:":[ 	]*",e:"[^A-Za-z0-9_ 	\\->]",eB:!0,eE:!0,r:0},{cN:"type",b:":[ 	]*",e:"\\W",eB:!0,eE:!0},{cN:"type",b:"new *",e:"\\W",eB:!0,eE:!0},{cN:"class",bK:"enum",e:"\\{",c:[e.TM]},{cN:"class",bK:"abstract",e:"[\\{$]",c:[{cN:"type",b:"\\(",e:"\\)",eB:!0,eE:!0},{cN:"type",b:"from +",e:"\\W",eB:!0,eE:!0},{cN:"type",b:"to +",e:"\\W",eB:!0,eE:!0},e.TM],k:{keyword:"abstract from to"}},{cN:"class",b:"\\b(class|interface) +",e:"[\\{$]",eE:!0,k:"class interface",c:[{cN:"keyword",b:"\\b(extends|implements) +",k:"extends implements",c:[{cN:"type",b:e.IR,r:0}]},e.TM]},{cN:"function",bK:"function",e:"\\(",eE:!0,i:"\\S",c:[e.TM]}],i:/<\//}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/hsp.js b/lib/highlight_js/assets/lang/hsp.js
index 8cdbc7ce1d9..2b5c2db4559 100644
--- a/lib/highlight_js/assets/lang/hsp.js
+++ b/lib/highlight_js/assets/lang/hsp.js
@@ -1 +1 @@
-hljs.registerLanguage("hsp",function(e){return{cI:!0,k:"goto gosub return break repeat loop continue wait await dim sdim foreach dimtype dup dupptr end stop newmod delmod mref run exgoto on mcall assert logmes newlab resume yield onexit onerror onkey onclick oncmd exist delete mkdir chdir dirlist bload bsave bcopy memfile if else poke wpoke lpoke getstr chdpm memexpand memcpy memset notesel noteadd notedel noteload notesave randomize noteunsel noteget split strrep setease button chgdisp exec dialog mmload mmplay mmstop mci pset pget syscolor mes print title pos circle cls font sysfont objsize picload color palcolor palette redraw width gsel gcopy gzoom gmode bmpsave hsvcolor getkey listbox chkbox combox input mesbox buffer screen bgscr mouse objsel groll line clrobj boxf objprm objmode stick grect grotate gsquare gradf objimage objskip objenable celload celdiv celput newcom querycom delcom cnvstow comres axobj winobj sendmsg comevent comevarg sarrayconv callfunc cnvwtos comevdisp libptr system hspstat hspver stat cnt err strsize looplev sublev iparam wparam lparam refstr refdval int rnd strlen length length2 length3 length4 vartype gettime peek wpeek lpeek varptr varuse noteinfo instr abs limit getease str strmid strf getpath strtrim sin cos tan atan sqrt double absf expf logf limitf powf geteasef mousex mousey mousew hwnd hinstance hdc ginfo objinfo dirinfo sysinfo thismod __hspver__ __hsp30__ __date__ __time__ __line__ __file__ _debug __hspdef__ and or xor not screen_normal screen_palette screen_hide screen_fixedsize screen_tool screen_frame gmode_gdi gmode_mem gmode_rgb0 gmode_alpha gmode_rgb0alpha gmode_add gmode_sub gmode_pixela ginfo_mx ginfo_my ginfo_act ginfo_sel ginfo_wx1 ginfo_wy1 ginfo_wx2 ginfo_wy2 ginfo_vx ginfo_vy ginfo_sizex ginfo_sizey ginfo_winx ginfo_winy ginfo_mesx ginfo_mesy ginfo_r ginfo_g ginfo_b ginfo_paluse ginfo_dispx ginfo_dispy ginfo_cx ginfo_cy ginfo_intid ginfo_newid ginfo_sx ginfo_sy objinfo_mode objinfo_bmscr objinfo_hwnd notemax notesize dir_cur dir_exe dir_win dir_sys dir_cmdline dir_desktop dir_mydoc dir_tv font_normal font_bold font_italic font_underline font_strikeout font_antialias objmode_normal objmode_guifont objmode_usefont gsquare_grad msgothic msmincho do until while wend for next _break _continue switch case default swbreak swend ddim ldim alloc m_pi rad2deg deg2rad ease_linear ease_quad_in ease_quad_out ease_quad_inout ease_cubic_in ease_cubic_out ease_cubic_inout ease_quartic_in ease_quartic_out ease_quartic_inout ease_bounce_in ease_bounce_out ease_bounce_inout ease_shake_in ease_shake_out ease_shake_inout ease_loop",c:[e.CLCM,e.CBCM,e.QSM,e.ASM,{cN:"string",b:'{"',e:'"}',c:[e.BE]},e.C(";","$",{r:0}),{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib"},c:[e.inherit(e.QSM,{cN:"meta-string"}),e.NM,e.CNM,e.CLCM,e.CBCM]},{cN:"symbol",b:"^\\*(\\w+|@)"},e.NM,e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("hsp",function(e){return{cI:!0,l:/[\w\._]+/,k:"goto gosub return break repeat loop continue wait await dim sdim foreach dimtype dup dupptr end stop newmod delmod mref run exgoto on mcall assert logmes newlab resume yield onexit onerror onkey onclick oncmd exist delete mkdir chdir dirlist bload bsave bcopy memfile if else poke wpoke lpoke getstr chdpm memexpand memcpy memset notesel noteadd notedel noteload notesave randomize noteunsel noteget split strrep setease button chgdisp exec dialog mmload mmplay mmstop mci pset pget syscolor mes print title pos circle cls font sysfont objsize picload color palcolor palette redraw width gsel gcopy gzoom gmode bmpsave hsvcolor getkey listbox chkbox combox input mesbox buffer screen bgscr mouse objsel groll line clrobj boxf objprm objmode stick grect grotate gsquare gradf objimage objskip objenable celload celdiv celput newcom querycom delcom cnvstow comres axobj winobj sendmsg comevent comevarg sarrayconv callfunc cnvwtos comevdisp libptr system hspstat hspver stat cnt err strsize looplev sublev iparam wparam lparam refstr refdval int rnd strlen length length2 length3 length4 vartype gettime peek wpeek lpeek varptr varuse noteinfo instr abs limit getease str strmid strf getpath strtrim sin cos tan atan sqrt double absf expf logf limitf powf geteasef mousex mousey mousew hwnd hinstance hdc ginfo objinfo dirinfo sysinfo thismod __hspver__ __hsp30__ __date__ __time__ __line__ __file__ _debug __hspdef__ and or xor not screen_normal screen_palette screen_hide screen_fixedsize screen_tool screen_frame gmode_gdi gmode_mem gmode_rgb0 gmode_alpha gmode_rgb0alpha gmode_add gmode_sub gmode_pixela ginfo_mx ginfo_my ginfo_act ginfo_sel ginfo_wx1 ginfo_wy1 ginfo_wx2 ginfo_wy2 ginfo_vx ginfo_vy ginfo_sizex ginfo_sizey ginfo_winx ginfo_winy ginfo_mesx ginfo_mesy ginfo_r ginfo_g ginfo_b ginfo_paluse ginfo_dispx ginfo_dispy ginfo_cx ginfo_cy ginfo_intid ginfo_newid ginfo_sx ginfo_sy objinfo_mode objinfo_bmscr objinfo_hwnd notemax notesize dir_cur dir_exe dir_win dir_sys dir_cmdline dir_desktop dir_mydoc dir_tv font_normal font_bold font_italic font_underline font_strikeout font_antialias objmode_normal objmode_guifont objmode_usefont gsquare_grad msgothic msmincho do until while wend for next _break _continue switch case default swbreak swend ddim ldim alloc m_pi rad2deg deg2rad ease_linear ease_quad_in ease_quad_out ease_quad_inout ease_cubic_in ease_cubic_out ease_cubic_inout ease_quartic_in ease_quartic_out ease_quartic_inout ease_bounce_in ease_bounce_out ease_bounce_inout ease_shake_in ease_shake_out ease_shake_inout ease_loop",c:[e.CLCM,e.CBCM,e.QSM,e.ASM,{cN:"string",b:'{"',e:'"}',c:[e.BE]},e.C(";","$",{r:0}),{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"addion cfunc cmd cmpopt comfunc const defcfunc deffunc define else endif enum epack func global if ifdef ifndef include modcfunc modfunc modinit modterm module pack packopt regcmd runtime undef usecom uselib"},c:[e.inherit(e.QSM,{cN:"meta-string"}),e.NM,e.CNM,e.CLCM,e.CBCM]},{cN:"symbol",b:"^\\*(\\w+|@)"},e.NM,e.CNM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/htmlbars.js b/lib/highlight_js/assets/lang/htmlbars.js
index cb955b25758..fb5eb1dca50 100644
--- a/lib/highlight_js/assets/lang/htmlbars.js
+++ b/lib/highlight_js/assets/lang/htmlbars.js
@@ -1 +1 @@
-hljs.registerLanguage("htmlbars",function(e){var a="action collection component concat debugger each each-in else get hash if input link-to loc log mut outlet partial query-params render textarea unbound unless with yield view",t={i:/\}\}/,b:/[a-zA-Z0-9_]+=/,rB:!0,r:0,c:[{cN:"attr",b:/[a-zA-Z0-9_]+/}]},i=({i:/\}\}/,b:/\)/,e:/\)/,c:[{b:/[a-zA-Z\.\-]+/,k:{built_in:a},starts:{eW:!0,r:0,c:[e.QSM]}}]},{eW:!0,r:0,k:{keyword:"as",built_in:a},c:[e.QSM,t,e.NM]});return{aliases:["hbs","html.hbs","html.handlebars"],cI:!0,sL:"xml",c:[e.C("{{!(--)?","(--)?}}"),{cN:"template-tag",b:/\{\{[#\/]/,e:/\}\}/,c:[{cN:"name",b:/[a-zA-Z\.\-]+/,k:{"builtin-name":a},starts:i}]},{cN:"template-variable",b:/\{\{[a-zA-Z][a-zA-Z\-]+/,e:/\}\}/,k:{keyword:"as",built_in:a},c:[e.QSM]}]}});
\ No newline at end of file
+hljs.registerLanguage("htmlbars",function(e){var a="action collection component concat debugger each each-in else get hash if input link-to loc log mut outlet partial query-params render textarea unbound unless with yield view",t={i:/\}\}/,b:/[a-zA-Z0-9_]+=/,rB:!0,r:0,c:[{cN:"attr",b:/[a-zA-Z0-9_]+/}]},i=({i:/\}\}/,b:/\)/,e:/\)/,c:[{b:/[a-zA-Z\.\-]+/,k:{built_in:a},starts:{eW:!0,r:0,c:[e.QSM]}}]},{eW:!0,r:0,k:{keyword:"as",built_in:a},c:[e.QSM,t,e.NM]});return{cI:!0,sL:"xml",c:[e.C("{{!(--)?","(--)?}}"),{cN:"template-tag",b:/\{\{[#\/]/,e:/\}\}/,c:[{cN:"name",b:/[a-zA-Z\.\-]+/,k:{"builtin-name":a},starts:i}]},{cN:"template-variable",b:/\{\{[a-zA-Z][a-zA-Z\-]+/,e:/\}\}/,k:{keyword:"as",built_in:a},c:[e.QSM]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/hy.js b/lib/highlight_js/assets/lang/hy.js
new file mode 100644
index 00000000000..5d9f3747cb8
--- /dev/null
+++ b/lib/highlight_js/assets/lang/hy.js
@@ -0,0 +1 @@
+hljs.registerLanguage("hy",function(e){var t={"builtin-name":"!= % %= & &= * ** **= *= *map + += , --build-class-- --import-- -= . / // //= /= < << <<= <= = > >= >> >>= @ @= ^ ^= abs accumulate all and any ap-compose ap-dotimes ap-each ap-each-while ap-filter ap-first ap-if ap-last ap-map ap-map-when ap-pipe ap-reduce ap-reject apply as-> ascii assert assoc bin break butlast callable calling-module-name car case cdr chain chr coll? combinations compile compress cond cons cons? continue count curry cut cycle dec def default-method defclass defmacro defmacro-alias defmacro/g! defmain defmethod defmulti defn defn-alias defnc defnr defreader defseq del delattr delete-route dict-comp dir disassemble dispatch-reader-macro distinct divmod do doto drop drop-last drop-while empty? end-sequence eval eval-and-compile eval-when-compile even? every? except exec filter first flatten float? fn fnc fnr for for* format fraction genexpr gensym get getattr global globals group-by hasattr hash hex id identity if if* if-not if-python2 import in inc input instance? integer integer-char? integer? interleave interpose is is-coll is-cons is-empty is-even is-every is-float is-instance is-integer is-integer-char is-iterable is-iterator is-keyword is-neg is-none is-not is-numeric is-odd is-pos is-string is-symbol is-zero isinstance islice issubclass iter iterable? iterate iterator? keyword keyword? lambda last len let lif lif-not list* list-comp locals loop macro-error macroexpand macroexpand-1 macroexpand-all map max merge-with method-decorator min multi-decorator multicombinations name neg? next none? nonlocal not not-in not? nth numeric? oct odd? open or ord partition permutations pos? post-route postwalk pow prewalk print product profile/calls profile/cpu put-route quasiquote quote raise range read read-str recursive-replace reduce remove repeat repeatedly repr require rest round route route-with-methods rwm second seq set-comp setattr setv some sorted string string? sum switch symbol? take take-nth take-while tee try unless unquote unquote-splicing vars walk when while with with* with-decorator with-gensyms xi xor yield yield-from zero? zip zip-longest | |= ~"},i="a-zA-Z_\\-!.?+*=<>&#'",a="["+i+"]["+i+"0-9/;:]*",r="[-+]?\\d+(\\.\\d+)?",o={cN:"meta",b:"^#!",e:"$"},s={b:a,r:0},n={cN:"number",b:r,r:0},l=e.inherit(e.QSM,{i:null}),c=e.C(";","$",{r:0}),d={cN:"literal",b:/\b([Tt]rue|[Ff]alse|nil|None)\b/},p={b:"[\\[\\{]",e:"[\\]\\}]"},m={cN:"comment",b:"\\^"+a},u=e.C("\\^\\{","\\}"),f={cN:"symbol",b:"[:]{1,2}"+a},h={b:"\\(",e:"\\)"},b={eW:!0,r:0},g={k:t,l:a,cN:"name",b:a,starts:b},y=[h,l,m,u,c,f,p,n,d,s];return h.c=[e.C("comment",""),g,b],b.c=y,p.c=y,{aliases:["hylang"],i:/\S/,c:[o,h,l,m,u,c,f,p,n,d]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/java.js b/lib/highlight_js/assets/lang/java.js
index f6c25e1e664..fd42651026e 100644
--- a/lib/highlight_js/assets/lang/java.js
+++ b/lib/highlight_js/assets/lang/java.js
@@ -1 +1 @@
-hljs.registerLanguage("java",function(e){var a=e.UIR+"(<"+e.UIR+"(\\s*,\\s*"+e.UIR+")*>)?",t="false synchronized int abstract float private char boolean static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private",r="\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",c={cN:"number",b:r,r:0};return{aliases:["jsp"],k:t,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"new throw return else",r:0},{cN:"function",b:"("+a+"\\s+)+"+e.UIR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:t,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,k:t,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},c,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
+hljs.registerLanguage("java",function(e){var a="[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",t=a+"(<"+a+"(\\s*,\\s*"+a+")*>)?",r="false synchronized int abstract float private char boolean static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",s="\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",c={cN:"number",b:s,r:0};return{aliases:["jsp"],k:r,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"new throw return else",r:0},{cN:"function",b:"("+t+"\\s+)+"+e.UIR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:r,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,k:r,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},c,{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/javascript.js b/lib/highlight_js/assets/lang/javascript.js
index 0fda499007e..9eadc0a1ed7 100644
--- a/lib/highlight_js/assets/lang/javascript.js
+++ b/lib/highlight_js/assets/lang/javascript.js
@@ -1 +1 @@
-hljs.registerLanguage("javascript",function(e){return{aliases:["js","jsx"],k:{keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},c:[{cN:"meta",r:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/</,e:/(\/\w+|\w+\/)>/,sL:"xml",c:[{b:/<\w+\/>/,skip:!0},{b:/<\w+/,e:/(\/\w+|\w+\/)>/,skip:!0,c:["self"]}]}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[e.CLCM,e.CBCM]}],i:/\[|%/},{b:/\$[(.]/},e.METHOD_GUARD,{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor",e:/\{/,eE:!0}],i:/#(?!!)/}});
\ No newline at end of file
+hljs.registerLanguage("javascript",function(e){var r="[A-Za-z$_][0-9A-Za-z$_]*",t={keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},a={cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},n={cN:"subst",b:"\\$\\{",e:"\\}",k:t,c:[]},c={cN:"string",b:"`",e:"`",c:[e.BE,n]};n.c=[e.ASM,e.QSM,c,a,e.RM];var s=n.c.concat([e.CBCM,e.CLCM]);return{aliases:["js","jsx"],k:t,c:[{cN:"meta",r:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,c,e.CLCM,e.CBCM,a,{b:/[{,]\s*/,r:0,c:[{b:r+"\\s*:",rB:!0,r:0,c:[{cN:"attr",b:r,r:0}]}]},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+r+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:r},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:s}]}]},{b:/</,e:/(\/\w+|\w+\/)>/,sL:"xml",c:[{b:/<\w+\s*\/>/,skip:!0},{b:/<\w+/,e:/(\/\w+|\w+\/)>/,skip:!0,c:[{b:/<\w+\s*\/>/,skip:!0},"self"]}]}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:r}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:s}],i:/\[|%/},{b:/\$[(.]/},e.METHOD_GUARD,{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor",e:/\{/,eE:!0}],i:/#(?!!)/}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/jboss-cli.js b/lib/highlight_js/assets/lang/jboss-cli.js
new file mode 100644
index 00000000000..429b95ddf90
--- /dev/null
+++ b/lib/highlight_js/assets/lang/jboss-cli.js
@@ -0,0 +1 @@
+hljs.registerLanguage("jboss-cli",function(e){var a={b:/[\w-]+ *=/,rB:!0,r:0,c:[{cN:"attr",b:/[\w-]+/}]},r={cN:"params",b:/\(/,e:/\)/,c:[a],r:0},o={cN:"function",b:/:[\w\-.]+/,r:0},t={cN:"string",b:/\B(([\/.])[\w\-.\/=]+)+/},c={cN:"params",b:/--[\w\-=\/]+/};return{aliases:["wildfly-cli"],l:"[a-z-]+",k:{keyword:"alias batch cd clear command connect connection-factory connection-info data-source deploy deployment-info deployment-overlay echo echo-dmr help history if jdbc-driver-info jms-queue|20 jms-topic|20 ls patch pwd quit read-attribute read-operation reload rollout-plan run-batch set shutdown try unalias undeploy unset version xa-data-source",literal:"true false"},c:[e.HCM,e.QSM,c,o,t,r]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/julia-repl.js b/lib/highlight_js/assets/lang/julia-repl.js
new file mode 100644
index 00000000000..26bb10c2be5
--- /dev/null
+++ b/lib/highlight_js/assets/lang/julia-repl.js
@@ -0,0 +1 @@
+hljs.registerLanguage("julia-repl",function(a){return{c:[{cN:"meta",b:/^julia>/,r:10,starts:{e:/^(?![ ]{6})/,sL:"julia"},aliases:["jldoctest"]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/julia.js b/lib/highlight_js/assets/lang/julia.js
index 1d3e28b3a31..0cc7351281a 100644
--- a/lib/highlight_js/assets/lang/julia.js
+++ b/lib/highlight_js/assets/lang/julia.js
@@ -1 +1 @@
-hljs.registerLanguage("julia",function(e){var r={keyword:"in abstract baremodule begin bitstype break catch ccall const continue do else elseif end export finally for function global if immutable import importall let local macro module quote return try type typealias using while",literal:"true false ARGS CPU_CORES C_NULL DL_LOAD_PATH DevNull ENDIAN_BOM ENV I|0 Inf Inf16 Inf32 InsertionSort JULIA_HOME LOAD_PATH MS_ASYNC MS_INVALIDATE MS_SYNC MergeSort NaN NaN16 NaN32 OS_NAME QuickSort RTLD_DEEPBIND RTLD_FIRST RTLD_GLOBAL RTLD_LAZY RTLD_LOCAL RTLD_NODELETE RTLD_NOLOAD RTLD_NOW RoundDown RoundFromZero RoundNearest RoundToZero RoundUp STDERR STDIN STDOUT VERSION WORD_SIZE catalan cglobal e|0 eu|0 eulergamma golden im nothing pi γ π φ Inf64 NaN64 RoundNearestTiesAway RoundNearestTiesUp ",built_in:"ANY ASCIIString AbstractArray AbstractRNG AbstractSparseArray Any ArgumentError Array Associative Base64Pipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError Box CFILE Cchar Cdouble Cfloat Char CharString Cint Clong Clonglong ClusterManager Cmd Coff_t Colon Complex Complex128 Complex32 Complex64 Condition Cptrdiff_t Cshort Csize_t Cssize_t Cuchar Cuint Culong Culonglong Cushort Cwchar_t DArray DataType DenseArray Diagonal Dict DimensionMismatch DirectIndexString Display DivideError DomainError EOFError EachLine Enumerate ErrorException Exception Expr Factorization FileMonitor FileOffset Filter Float16 Float32 Float64 FloatRange FloatingPoint Function GetfieldNode GotoNode Hermitian IO IOBuffer IOStream IPv4 IPv6 InexactError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException IntrinsicFunction KeyError LabelNode LambdaStaticData LineNumberNode LoadError LocalProcess MIME MathConst MemoryError MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode Nothing Number ObjectIdDict OrdinalRange OverflowError ParseError PollingFileWatcher ProcessExitedException ProcessGroup Ptr QuoteNode Range Range1 Ranges Rational RawFD Real Regex RegexMatch RemoteRef RepString RevString RopeString RoundingMode Set SharedArray Signed SparseMatrixCSC StackOverflowError Stat StatStruct StepRange String SubArray SubString SymTridiagonal Symbol SymbolNode Symmetric SystemError Task TextDisplay Timer TmStruct TopNode Triangular Tridiagonal Type TypeConstructor TypeError TypeName TypeVar UTF16String UTF32String UTF8String UdpSocket Uint Uint128 Uint16 Uint32 Uint64 Uint8 UndefRefError UndefVarError UniformScaling UnionType UnitRange Unsigned Vararg VersionNumber WString WeakKeyDict WeakRef Woodbury Zip AbstractChannel AbstractFloat AbstractString AssertionError Base64DecodePipe Base64EncodePipe BufferStream CapturedException CartesianIndex CartesianRange Channel Cintmax_t CompositeException Cstring Cuintmax_t Cwstring Date DateTime Dims Enum GenSym GlobalRef HTML InitError InvalidStateException Irrational LinSpace LowerTriangular NullException Nullable OutOfMemoryError Pair PartialQuickSort Pipe RandomDevice ReadOnlyMemoryError ReentrantLock Ref RemoteException SegmentationFault SerializationState SimpleVector TCPSocket Text Tuple UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UnicodeError Union UpperTriangular Val Void WorkerConfig AbstractMatrix AbstractSparseMatrix AbstractSparseVector AbstractVecOrMat AbstractVector DenseMatrix DenseVecOrMat DenseVector Matrix SharedMatrix SharedVector StridedArray StridedMatrix StridedVecOrMat StridedVector VecOrMat Vector "},t="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",a={l:t,k:r,i:/<\//},n={cN:"type",b:/::/},o={cN:"type",b:/<:/},i={cN:"number",b:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,r:0},l={cN:"string",b:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},c={cN:"subst",b:/\$\(/,e:/\)/,k:r},s={cN:"variable",b:"\\$"+t},d={cN:"string",c:[e.BE,c,s],v:[{b:/\w*"""/,e:/"""\w*/,r:10},{b:/\w*"/,e:/"\w*/}]},S={cN:"string",c:[e.BE,c,s],b:"`",e:"`"},u={cN:"meta",b:"@"+t},g={cN:"comment",v:[{b:"#=",e:"=#",r:10},{b:"#",e:"$"}]};return a.c=[i,l,n,o,d,S,u,g,e.HCM],c.c=a.c,a});
\ No newline at end of file
+hljs.registerLanguage("julia",function(e){var r={keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},t="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",a={l:t,k:r,i:/<\//},n={cN:"number",b:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,r:0},o={cN:"string",b:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i={cN:"subst",b:/\$\(/,e:/\)/,k:r},l={cN:"variable",b:"\\$"+t},c={cN:"string",c:[e.BE,i,l],v:[{b:/\w*"""/,e:/"""\w*/,r:10},{b:/\w*"/,e:/"\w*/}]},s={cN:"string",c:[e.BE,i,l],b:"`",e:"`"},d={cN:"meta",b:"@"+t},u={cN:"comment",v:[{b:"#=",e:"=#",r:10},{b:"#",e:"$"}]};return a.c=[n,o,c,s,d,u,e.HCM,{cN:"keyword",b:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{b:/<:/}],i.c=a.c,a});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/kotlin.js b/lib/highlight_js/assets/lang/kotlin.js
index b3b9b3670b6..ad299b1b2fb 100644
--- a/lib/highlight_js/assets/lang/kotlin.js
+++ b/lib/highlight_js/assets/lang/kotlin.js
@@ -1 +1 @@
-hljs.registerLanguage("kotlin",function(e){var t="val var get set class trait object open private protected public final enum if else do while for when break continue throw try catch finally import package is as in return fun override default companion reified inline volatile transient native Byte Short Char Int Long Boolean Float Double Void Unit Nothing";return{k:{keyword:t,literal:"true false null"},c:[e.C("/\\*\\*","\\*/",{r:0,c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,{cN:"function",bK:"fun",e:"[(]|$",rB:!0,eE:!0,k:t,i:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,r:5,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"type",b:/</,e:/>/,k:"reified",r:0},{cN:"params",b:/\(/,e:/\)/,k:t,r:0,i:/\([^\(,\s:]+,/,c:[{cN:"type",b:/:\s*/,e:/\s*[=\)]/,eB:!0,rE:!0,r:0}]},e.CLCM,e.CBCM]},{cN:"class",bK:"class trait",e:/[:\{(]|$/,eE:!0,i:"extends implements",c:[e.UTM,{cN:"type",b:/</,e:/>/,eB:!0,eE:!0,r:0},{cN:"type",b:/[,:]\s*/,e:/[<\(,]|$/,eB:!0,rE:!0}]},e.QSM,{cN:"meta",b:"^#!/usr/bin/env",e:"$",i:"\n"},e.CNM]}});
\ No newline at end of file
+hljs.registerLanguage("kotlin",function(e){var t={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit initinterface annotation data sealed internal infix operator out by constructor super trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},r={cN:"keyword",b:/\b(break|continue|return|this)\b/,starts:{c:[{cN:"symbol",b:/@\w+/}]}},i={cN:"symbol",b:e.UIR+"@"},n={cN:"subst",b:"\\${",e:"}",c:[e.ASM,e.CNM]},a={cN:"variable",b:"\\$"+e.UIR},c={cN:"string",v:[{b:'"""',e:'"""',c:[a,n]},{b:"'",e:"'",i:/\n/,c:[e.BE]},{b:'"',e:'"',i:/\n/,c:[e.BE,a,n]}]},s={cN:"meta",b:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UIR+")?"},o={cN:"meta",b:"@"+e.UIR,c:[{b:/\(/,e:/\)/,c:[e.inherit(c,{cN:"meta-string"})]}]};return{k:t,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,r,i,s,o,{cN:"function",bK:"fun",e:"[(]|$",rB:!0,eE:!0,k:t,i:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,r:5,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"type",b:/</,e:/>/,k:"reified",r:0},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:t,r:0,c:[{b:/:/,e:/[=,\/]/,eW:!0,c:[{cN:"type",b:e.UIR},e.CLCM,e.CBCM],r:0},e.CLCM,e.CBCM,s,o,c,e.CNM]},e.CBCM]},{cN:"class",bK:"class interface trait",e:/[:\{(]|$/,eE:!0,i:"extends implements",c:[{bK:"public protected internal private constructor"},e.UTM,{cN:"type",b:/</,e:/>/,eB:!0,eE:!0,r:0},{cN:"type",b:/[,:]\s*/,e:/[<\(,]|$/,eB:!0,rE:!0},s,o]},c,{cN:"meta",b:"^#!/usr/bin/env",e:"$",i:"\n"},e.CNM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/lasso.js b/lib/highlight_js/assets/lang/lasso.js
index 3bb34cb8222..f8f570f6eb9 100644
--- a/lib/highlight_js/assets/lang/lasso.js
+++ b/lib/highlight_js/assets/lang/lasso.js
@@ -1 +1 @@
-hljs.registerLanguage("lasso",function(e){var r="[a-zA-Z_][a-zA-Z0-9_.]*",t="<\\?(lasso(script)?|=)",a="\\]|\\?>",n={literal:"true false none minimal full all void bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited currentcapture givenblock",keyword:"error_code error_msg error_pop error_push error_reset cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome and or not"},s=e.C("<!--","-->",{r:0}),i={cN:"meta",b:"\\[noprocess\\]",starts:{e:"\\[/noprocess\\]",rE:!0,c:[s]}},l={cN:"meta",b:"\\[/noprocess|"+t},o={cN:"symbol",b:"'"+r+"'"},c=[e.C("/\\*\\*!","\\*/"),e.CLCM,e.CBCM,e.inherit(e.CNM,{b:e.CNR+"|(infinity|nan)\\b"}),e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"`",e:"`"},{v:[{b:"[#$]"+r},{b:"#",e:"\\d+",i:"\\W"}]},{cN:"type",b:"::\\s*",e:r,i:"\\W"},{cN:"attr",v:[{b:"-(?!infinity)"+e.UIR,r:0},{b:"(\\.\\.\\.)"}]},{b:/(->|\.\.?)\s*/,r:0,c:[o]},{cN:"class",bK:"define",rE:!0,e:"\\(|=>",c:[e.inherit(e.TM,{b:e.UIR+"(=(?!>))?"})]}];return{aliases:["ls","lassoscript"],cI:!0,l:r+"|&[lg]t;",k:n,c:[{cN:"meta",b:a,r:0,starts:{e:"\\[|"+t,rE:!0,r:0,c:[s]}},i,l,{cN:"meta",b:"\\[no_square_brackets",starts:{e:"\\[/no_square_brackets\\]",l:r+"|&[lg]t;",k:n,c:[{cN:"meta",b:a,r:0,starts:{e:"\\[noprocess\\]|"+t,rE:!0,c:[s]}},i,l].concat(c)}},{cN:"meta",b:"\\[",r:0},{cN:"meta",b:"^#!.+lasso9\\b",r:10}].concat(c)}});
\ No newline at end of file
+hljs.registerLanguage("lasso",function(e){var r="[a-zA-Z_][\\w.]*",a="<\\?(lasso(script)?|=)",t="\\]|\\?>",n={literal:"true false none minimal full all void and or not bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited currentcapture givenblock",keyword:"cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else fail_if fail_ifnot fail if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome"},i=e.C("<!--","-->",{r:0}),s={cN:"meta",b:"\\[noprocess\\]",starts:{e:"\\[/noprocess\\]",rE:!0,c:[i]}},l={cN:"meta",b:"\\[/noprocess|"+a},o={cN:"symbol",b:"'"+r+"'"},c=[e.CLCM,e.CBCM,e.inherit(e.CNM,{b:e.CNR+"|(-?infinity|NaN)\\b"}),e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"`",e:"`"},{v:[{b:"[#$]"+r},{b:"#",e:"\\d+",i:"\\W"}]},{cN:"type",b:"::\\s*",e:r,i:"\\W"},{cN:"params",v:[{b:"-(?!infinity)"+r,r:0},{b:"(\\.\\.\\.)"}]},{b:/(->|\.)\s*/,r:0,c:[o]},{cN:"class",bK:"define",rE:!0,e:"\\(|=>",c:[e.inherit(e.TM,{b:r+"(=(?!>))?|[-+*/%](?!>)"})]}];return{aliases:["ls","lassoscript"],cI:!0,l:r+"|&[lg]t;",k:n,c:[{cN:"meta",b:t,r:0,starts:{e:"\\[|"+a,rE:!0,r:0,c:[i]}},s,l,{cN:"meta",b:"\\[no_square_brackets",starts:{e:"\\[/no_square_brackets\\]",l:r+"|&[lg]t;",k:n,c:[{cN:"meta",b:t,r:0,starts:{e:"\\[noprocess\\]|"+a,rE:!0,c:[i]}},s,l].concat(c)}},{cN:"meta",b:"\\[",r:0},{cN:"meta",b:"^#!",e:"lasso9$",r:10}].concat(c)}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/ldif.js b/lib/highlight_js/assets/lang/ldif.js
new file mode 100644
index 00000000000..40ed37144ee
--- /dev/null
+++ b/lib/highlight_js/assets/lang/ldif.js
@@ -0,0 +1 @@
+hljs.registerLanguage("ldif",function(e){return{c:[{cN:"attribute",b:"^dn",e:": ",eE:!0,starts:{e:"$",r:0},r:10},{cN:"attribute",b:"^\\w",e:": ",eE:!0,starts:{e:"$",r:0}},{cN:"literal",b:"^-",e:"$"},e.HCM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/leaf.js b/lib/highlight_js/assets/lang/leaf.js
new file mode 100644
index 00000000000..b75f1048b88
--- /dev/null
+++ b/lib/highlight_js/assets/lang/leaf.js
@@ -0,0 +1 @@
+hljs.registerLanguage("leaf",function(e){return{c:[{cN:"function",b:"#+[A-Za-z_0-9]*\\(",e:" {",rB:!0,eE:!0,c:[{cN:"keyword",b:"#+"},{cN:"title",b:"[A-Za-z_][A-Za-z_0-9]*"},{cN:"params",b:"\\(",e:"\\)",endsParent:!0,c:[{cN:"string",b:'"',e:'"'},{cN:"variable",b:"[A-Za-z_][A-Za-z_0-9]*"}]}]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/less.js b/lib/highlight_js/assets/lang/less.js
index d56097136ce..f368e40e8aa 100644
--- a/lib/highlight_js/assets/lang/less.js
+++ b/lib/highlight_js/assets/lang/less.js
@@ -1 +1 @@
-hljs.registerLanguage("less",function(e){var r="[\\w-]+",t="("+r+"|@{"+r+"})",a=[],c=[],s=function(e){return{cN:"string",b:"~?"+e+".*?"+e}},b=function(e,r,t){return{cN:e,b:r,r:t}},i={b:"\\(",e:"\\)",c:c,r:0};c.push(e.CLCM,e.CBCM,s("'"),s('"'),e.CSSNM,{b:"(url|data-uri)\\(",starts:{cN:"string",e:"[\\)\\n]",eE:!0}},b("number","#[0-9A-Fa-f]+\\b"),i,b("variable","@@?"+r,10),b("variable","@{"+r+"}"),b("built_in","~?`[^`]*?`"),{cN:"attribute",b:r+"\\s*:",e:":",rB:!0,eE:!0},{cN:"meta",b:"!important"});var n=c.concat({b:"{",e:"}",c:a}),o={bK:"when",eW:!0,c:[{bK:"and not"}].concat(c)},u={cN:"attribute",b:t,e:":",eE:!0,c:[e.CLCM,e.CBCM],i:/\S/,starts:{e:"[;}]",rE:!0,c:c,i:"[<=$]"}},C={cN:"keyword",b:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{e:"[;{}]",rE:!0,c:c,r:0}},l={cN:"variable",v:[{b:"@"+r+"\\s*:",r:15},{b:"@"+r}],starts:{e:"[;}]",rE:!0,c:n}},p={v:[{b:"[\\.#:&\\[]",e:"[;{}]"},{b:t+"[^;]*{",e:"{"}],rB:!0,rE:!0,i:"[<='$\"]",c:[e.CLCM,e.CBCM,o,b("keyword","all\\b"),b("variable","@{"+r+"}"),b("selector-tag",t+"%?",0),b("selector-id","#"+t),b("selector-class","\\."+t,0),b("selector-tag","&",0),{cN:"selector-attr",b:"\\[",e:"\\]"},{b:"\\(",e:"\\)",c:n},{b:"!important"}]};return a.push(e.CLCM,e.CBCM,C,l,p,u),{cI:!0,i:"[=>'/<($\"]",c:a}});
\ No newline at end of file
+hljs.registerLanguage("less",function(e){var r="[\\w-]+",t="("+r+"|@{"+r+"})",a=[],c=[],s=function(e){return{cN:"string",b:"~?"+e+".*?"+e}},b=function(e,r,t){return{cN:e,b:r,r:t}},n={b:"\\(",e:"\\)",c:c,r:0};c.push(e.CLCM,e.CBCM,s("'"),s('"'),e.CSSNM,{b:"(url|data-uri)\\(",starts:{cN:"string",e:"[\\)\\n]",eE:!0}},b("number","#[0-9A-Fa-f]+\\b"),n,b("variable","@@?"+r,10),b("variable","@{"+r+"}"),b("built_in","~?`[^`]*?`"),{cN:"attribute",b:r+"\\s*:",e:":",rB:!0,eE:!0},{cN:"meta",b:"!important"});var i=c.concat({b:"{",e:"}",c:a}),o={bK:"when",eW:!0,c:[{bK:"and not"}].concat(c)},u={b:t+"\\s*:",rB:!0,e:"[;}]",r:0,c:[{cN:"attribute",b:t,e:":",eE:!0,starts:{eW:!0,i:"[<=$]",r:0,c:c}}]},l={cN:"keyword",b:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{e:"[;{}]",rE:!0,c:c,r:0}},C={cN:"variable",v:[{b:"@"+r+"\\s*:",r:15},{b:"@"+r}],starts:{e:"[;}]",rE:!0,c:i}},p={v:[{b:"[\\.#:&\\[>]",e:"[;{}]"},{b:t,e:"{"}],rB:!0,rE:!0,i:"[<='$\"]",r:0,c:[e.CLCM,e.CBCM,o,b("keyword","all\\b"),b("variable","@{"+r+"}"),b("selector-tag",t+"%?",0),b("selector-id","#"+t),b("selector-class","\\."+t,0),b("selector-tag","&",0),{cN:"selector-attr",b:"\\[",e:"\\]"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"\\(",e:"\\)",c:i},{b:"!important"}]};return a.push(e.CLCM,e.CBCM,l,C,u,p),{cI:!0,i:"[=>'/<($\"]",c:a}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/livecodeserver.js b/lib/highlight_js/assets/lang/livecodeserver.js
index 21ac65c22f6..65e89e4d264 100644
--- a/lib/highlight_js/assets/lang/livecodeserver.js
+++ b/lib/highlight_js/assets/lang/livecodeserver.js
@@ -1 +1 @@
-hljs.registerLanguage("livecodeserver",function(e){var r={b:"\\b[gtps][A-Z]+[A-Za-z0-9_\\-]*\\b|\\$_[A-Z]+",r:0},t=[e.CBCM,e.HCM,e.C("--","$"),e.C("[^:]//","$")],a=e.inherit(e.TM,{v:[{b:"\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*"},{b:"\\b_[a-z0-9\\-]+"}]}),o=e.inherit(e.TM,{b:"\\b([A-Za-z0-9_\\-]+)\\b"});return{cI:!1,k:{keyword:"$_COOKIE $_FILES $_GET $_GET_BINARY $_GET_RAW $_POST $_POST_BINARY $_POST_RAW $_SESSION $_SERVER codepoint codepoints segment segments codeunit codeunits sentence sentences trueWord trueWords paragraph after byte bytes english the until http forever descending using line real8 with seventh for stdout finally element word words fourth before black ninth sixth characters chars stderr uInt1 uInt1s uInt2 uInt2s stdin string lines relative rel any fifth items from middle mid at else of catch then third it file milliseconds seconds second secs sec int1 int1s int4 int4s internet int2 int2s normal text item last long detailed effective uInt4 uInt4s repeat end repeat URL in try into switch to words https token binfile each tenth as ticks tick system real4 by dateItems without char character ascending eighth whole dateTime numeric short first ftp integer abbreviated abbr abbrev private case while if div mod wrap and or bitAnd bitNot bitOr bitXor among not in a an within contains ends with begins the keys of keys",literal:"SIX TEN FORMFEED NINE ZERO NONE SPACE FOUR FALSE COLON CRLF PI COMMA ENDOFFILE EOF EIGHT FIVE QUOTE EMPTY ONE TRUE RETURN CR LINEFEED RIGHT BACKSLASH NULL SEVEN TAB THREE TWO six ten formfeed nine zero none space four false colon crlf pi comma endoffile eof eight five quote empty one true return cr linefeed right backslash null seven tab three two RIVERSION RISTATE FILE_READ_MODE FILE_WRITE_MODE FILE_WRITE_MODE DIR_WRITE_MODE FILE_READ_UMASK FILE_WRITE_UMASK DIR_READ_UMASK DIR_WRITE_UMASK",built_in:"put abs acos aliasReference annuity arrayDecode arrayEncode asin atan atan2 average avg avgDev base64Decode base64Encode baseConvert binaryDecode binaryEncode byteOffset byteToNum cachedURL cachedURLs charToNum cipherNames codepointOffset codepointProperty codepointToNum codeunitOffset commandNames compound compress constantNames cos date dateFormat decompress directories diskSpace DNSServers exp exp1 exp2 exp10 extents files flushEvents folders format functionNames geometricMean global globals hasMemory harmonicMean hostAddress hostAddressToName hostName hostNameToAddress isNumber ISOToMac itemOffset keys len length libURLErrorData libUrlFormData libURLftpCommand libURLLastHTTPHeaders libURLLastRHHeaders libUrlMultipartFormAddPart libUrlMultipartFormData libURLVersion lineOffset ln ln1 localNames log log2 log10 longFilePath lower macToISO matchChunk matchText matrixMultiply max md5Digest median merge millisec millisecs millisecond milliseconds min monthNames nativeCharToNum normalizeText num number numToByte numToChar numToCodepoint numToNativeChar offset open openfiles openProcesses openProcessIDs openSockets paragraphOffset paramCount param params peerAddress pendingMessages platform popStdDev populationStandardDeviation populationVariance popVariance processID random randomBytes replaceText result revCreateXMLTree revCreateXMLTreeFromFile revCurrentRecord revCurrentRecordIsFirst revCurrentRecordIsLast revDatabaseColumnCount revDatabaseColumnIsNull revDatabaseColumnLengths revDatabaseColumnNames revDatabaseColumnNamed revDatabaseColumnNumbered revDatabaseColumnTypes revDatabaseConnectResult revDatabaseCursors revDatabaseID revDatabaseTableNames revDatabaseType revDataFromQuery revdb_closeCursor revdb_columnbynumber revdb_columncount revdb_columnisnull revdb_columnlengths revdb_columnnames revdb_columntypes revdb_commit revdb_connect revdb_connections revdb_connectionerr revdb_currentrecord revdb_cursorconnection revdb_cursorerr revdb_cursors revdb_dbtype revdb_disconnect revdb_execute revdb_iseof revdb_isbof revdb_movefirst revdb_movelast revdb_movenext revdb_moveprev revdb_query revdb_querylist revdb_recordcount revdb_rollback revdb_tablenames revGetDatabaseDriverPath revNumberOfRecords revOpenDatabase revOpenDatabases revQueryDatabase revQueryDatabaseBlob revQueryResult revQueryIsAtStart revQueryIsAtEnd revUnixFromMacPath revXMLAttribute revXMLAttributes revXMLAttributeValues revXMLChildContents revXMLChildNames revXMLCreateTreeFromFileWithNamespaces revXMLCreateTreeWithNamespaces revXMLDataFromXPathQuery revXMLEvaluateXPath revXMLFirstChild revXMLMatchingNode revXMLNextSibling revXMLNodeContents revXMLNumberOfChildren revXMLParent revXMLPreviousSibling revXMLRootNode revXMLRPC_CreateRequest revXMLRPC_Documents revXMLRPC_Error revXMLRPC_GetHost revXMLRPC_GetMethod revXMLRPC_GetParam revXMLText revXMLRPC_Execute revXMLRPC_GetParamCount revXMLRPC_GetParamNode revXMLRPC_GetParamType revXMLRPC_GetPath revXMLRPC_GetPort revXMLRPC_GetProtocol revXMLRPC_GetRequest revXMLRPC_GetResponse revXMLRPC_GetSocket revXMLTree revXMLTrees revXMLValidateDTD revZipDescribeItem revZipEnumerateItems revZipOpenArchives round sampVariance sec secs seconds sentenceOffset sha1Digest shell shortFilePath sin specialFolderPath sqrt standardDeviation statRound stdDev sum sysError systemVersion tan tempName textDecode textEncode tick ticks time to tokenOffset toLower toUpper transpose truewordOffset trunc uniDecode uniEncode upper URLDecode URLEncode URLStatus uuid value variableNames variance version waitDepth weekdayNames wordOffset xsltApplyStylesheet xsltApplyStylesheetFromFile xsltLoadStylesheet xsltLoadStylesheetFromFile add breakpoint cancel clear local variable file word line folder directory URL close socket process combine constant convert create new alias folder directory decrypt delete variable word line folder directory URL dispatch divide do encrypt filter get include intersect kill libURLDownloadToFile libURLFollowHttpRedirects libURLftpUpload libURLftpUploadFile libURLresetAll libUrlSetAuthCallback libURLSetCustomHTTPHeaders libUrlSetExpect100 libURLSetFTPListCommand libURLSetFTPMode libURLSetFTPStopTime libURLSetStatusCallback load multiply socket prepare process post seek rel relative read from process rename replace require resetAll resolve revAddXMLNode revAppendXML revCloseCursor revCloseDatabase revCommitDatabase revCopyFile revCopyFolder revCopyXMLNode revDeleteFolder revDeleteXMLNode revDeleteAllXMLTrees revDeleteXMLTree revExecuteSQL revGoURL revInsertXMLNode revMoveFolder revMoveToFirstRecord revMoveToLastRecord revMoveToNextRecord revMoveToPreviousRecord revMoveToRecord revMoveXMLNode revPutIntoXMLNode revRollBackDatabase revSetDatabaseDriverPath revSetXMLAttribute revXMLRPC_AddParam revXMLRPC_DeleteAllDocuments revXMLAddDTD revXMLRPC_Free revXMLRPC_FreeAll revXMLRPC_DeleteDocument revXMLRPC_DeleteParam revXMLRPC_SetHost revXMLRPC_SetMethod revXMLRPC_SetPort revXMLRPC_SetProtocol revXMLRPC_SetSocket revZipAddItemWithData revZipAddItemWithFile revZipAddUncompressedItemWithData revZipAddUncompressedItemWithFile revZipCancel revZipCloseArchive revZipDeleteItem revZipExtractItemToFile revZipExtractItemToVariable revZipSetProgressCallback revZipRenameItem revZipReplaceItemWithData revZipReplaceItemWithFile revZipOpenArchive send set sort split start stop subtract union unload wait write"},c:[r,{cN:"keyword",b:"\\bend\\sif\\b"},{cN:"function",bK:"function",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"function",b:"\\bend\\s+",e:"$",k:"end",c:[o,a]},{bK:"command on",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"meta",v:[{b:"<\\?(rev|lc|livecode)",r:10},{b:"<\\?"},{b:"\\?>"}]},e.ASM,e.QSM,e.BNM,e.CNM,a].concat(t),i:";$|^\\[|^="}});
\ No newline at end of file
+hljs.registerLanguage("livecodeserver",function(e){var r={b:"\\b[gtps][A-Z]+[A-Za-z0-9_\\-]*\\b|\\$_[A-Z]+",r:0},t=[e.CBCM,e.HCM,e.C("--","$"),e.C("[^:]//","$")],a=e.inherit(e.TM,{v:[{b:"\\b_*rig[A-Z]+[A-Za-z0-9_\\-]*"},{b:"\\b_[a-z0-9\\-]+"}]}),o=e.inherit(e.TM,{b:"\\b([A-Za-z0-9_\\-]+)\\b"});return{cI:!1,k:{keyword:"$_COOKIE $_FILES $_GET $_GET_BINARY $_GET_RAW $_POST $_POST_BINARY $_POST_RAW $_SESSION $_SERVER codepoint codepoints segment segments codeunit codeunits sentence sentences trueWord trueWords paragraph after byte bytes english the until http forever descending using line real8 with seventh for stdout finally element word words fourth before black ninth sixth characters chars stderr uInt1 uInt1s uInt2 uInt2s stdin string lines relative rel any fifth items from middle mid at else of catch then third it file milliseconds seconds second secs sec int1 int1s int4 int4s internet int2 int2s normal text item last long detailed effective uInt4 uInt4s repeat end repeat URL in try into switch to words https token binfile each tenth as ticks tick system real4 by dateItems without char character ascending eighth whole dateTime numeric short first ftp integer abbreviated abbr abbrev private case while if div mod wrap and or bitAnd bitNot bitOr bitXor among not in a an within contains ends with begins the keys of keys",literal:"SIX TEN FORMFEED NINE ZERO NONE SPACE FOUR FALSE COLON CRLF PI COMMA ENDOFFILE EOF EIGHT FIVE QUOTE EMPTY ONE TRUE RETURN CR LINEFEED RIGHT BACKSLASH NULL SEVEN TAB THREE TWO six ten formfeed nine zero none space four false colon crlf pi comma endoffile eof eight five quote empty one true return cr linefeed right backslash null seven tab three two RIVERSION RISTATE FILE_READ_MODE FILE_WRITE_MODE FILE_WRITE_MODE DIR_WRITE_MODE FILE_READ_UMASK FILE_WRITE_UMASK DIR_READ_UMASK DIR_WRITE_UMASK",built_in:"put abs acos aliasReference annuity arrayDecode arrayEncode asin atan atan2 average avg avgDev base64Decode base64Encode baseConvert binaryDecode binaryEncode byteOffset byteToNum cachedURL cachedURLs charToNum cipherNames codepointOffset codepointProperty codepointToNum codeunitOffset commandNames compound compress constantNames cos date dateFormat decompress directories diskSpace DNSServers exp exp1 exp2 exp10 extents files flushEvents folders format functionNames geometricMean global globals hasMemory harmonicMean hostAddress hostAddressToName hostName hostNameToAddress isNumber ISOToMac itemOffset keys len length libURLErrorData libUrlFormData libURLftpCommand libURLLastHTTPHeaders libURLLastRHHeaders libUrlMultipartFormAddPart libUrlMultipartFormData libURLVersion lineOffset ln ln1 localNames log log2 log10 longFilePath lower macToISO matchChunk matchText matrixMultiply max md5Digest median merge millisec millisecs millisecond milliseconds min monthNames nativeCharToNum normalizeText num number numToByte numToChar numToCodepoint numToNativeChar offset open openfiles openProcesses openProcessIDs openSockets paragraphOffset paramCount param params peerAddress pendingMessages platform popStdDev populationStandardDeviation populationVariance popVariance processID random randomBytes replaceText result revCreateXMLTree revCreateXMLTreeFromFile revCurrentRecord revCurrentRecordIsFirst revCurrentRecordIsLast revDatabaseColumnCount revDatabaseColumnIsNull revDatabaseColumnLengths revDatabaseColumnNames revDatabaseColumnNamed revDatabaseColumnNumbered revDatabaseColumnTypes revDatabaseConnectResult revDatabaseCursors revDatabaseID revDatabaseTableNames revDatabaseType revDataFromQuery revdb_closeCursor revdb_columnbynumber revdb_columncount revdb_columnisnull revdb_columnlengths revdb_columnnames revdb_columntypes revdb_commit revdb_connect revdb_connections revdb_connectionerr revdb_currentrecord revdb_cursorconnection revdb_cursorerr revdb_cursors revdb_dbtype revdb_disconnect revdb_execute revdb_iseof revdb_isbof revdb_movefirst revdb_movelast revdb_movenext revdb_moveprev revdb_query revdb_querylist revdb_recordcount revdb_rollback revdb_tablenames revGetDatabaseDriverPath revNumberOfRecords revOpenDatabase revOpenDatabases revQueryDatabase revQueryDatabaseBlob revQueryResult revQueryIsAtStart revQueryIsAtEnd revUnixFromMacPath revXMLAttribute revXMLAttributes revXMLAttributeValues revXMLChildContents revXMLChildNames revXMLCreateTreeFromFileWithNamespaces revXMLCreateTreeWithNamespaces revXMLDataFromXPathQuery revXMLEvaluateXPath revXMLFirstChild revXMLMatchingNode revXMLNextSibling revXMLNodeContents revXMLNumberOfChildren revXMLParent revXMLPreviousSibling revXMLRootNode revXMLRPC_CreateRequest revXMLRPC_Documents revXMLRPC_Error revXMLRPC_GetHost revXMLRPC_GetMethod revXMLRPC_GetParam revXMLText revXMLRPC_Execute revXMLRPC_GetParamCount revXMLRPC_GetParamNode revXMLRPC_GetParamType revXMLRPC_GetPath revXMLRPC_GetPort revXMLRPC_GetProtocol revXMLRPC_GetRequest revXMLRPC_GetResponse revXMLRPC_GetSocket revXMLTree revXMLTrees revXMLValidateDTD revZipDescribeItem revZipEnumerateItems revZipOpenArchives round sampVariance sec secs seconds sentenceOffset sha1Digest shell shortFilePath sin specialFolderPath sqrt standardDeviation statRound stdDev sum sysError systemVersion tan tempName textDecode textEncode tick ticks time to tokenOffset toLower toUpper transpose truewordOffset trunc uniDecode uniEncode upper URLDecode URLEncode URLStatus uuid value variableNames variance version waitDepth weekdayNames wordOffset xsltApplyStylesheet xsltApplyStylesheetFromFile xsltLoadStylesheet xsltLoadStylesheetFromFile add breakpoint cancel clear local variable file word line folder directory URL close socket process combine constant convert create new alias folder directory decrypt delete variable word line folder directory URL dispatch divide do encrypt filter get include intersect kill libURLDownloadToFile libURLFollowHttpRedirects libURLftpUpload libURLftpUploadFile libURLresetAll libUrlSetAuthCallback libURLSetCustomHTTPHeaders libUrlSetExpect100 libURLSetFTPListCommand libURLSetFTPMode libURLSetFTPStopTime libURLSetStatusCallback load multiply socket prepare process post seek rel relative read from process rename replace require resetAll resolve revAddXMLNode revAppendXML revCloseCursor revCloseDatabase revCommitDatabase revCopyFile revCopyFolder revCopyXMLNode revDeleteFolder revDeleteXMLNode revDeleteAllXMLTrees revDeleteXMLTree revExecuteSQL revGoURL revInsertXMLNode revMoveFolder revMoveToFirstRecord revMoveToLastRecord revMoveToNextRecord revMoveToPreviousRecord revMoveToRecord revMoveXMLNode revPutIntoXMLNode revRollBackDatabase revSetDatabaseDriverPath revSetXMLAttribute revXMLRPC_AddParam revXMLRPC_DeleteAllDocuments revXMLAddDTD revXMLRPC_Free revXMLRPC_FreeAll revXMLRPC_DeleteDocument revXMLRPC_DeleteParam revXMLRPC_SetHost revXMLRPC_SetMethod revXMLRPC_SetPort revXMLRPC_SetProtocol revXMLRPC_SetSocket revZipAddItemWithData revZipAddItemWithFile revZipAddUncompressedItemWithData revZipAddUncompressedItemWithFile revZipCancel revZipCloseArchive revZipDeleteItem revZipExtractItemToFile revZipExtractItemToVariable revZipSetProgressCallback revZipRenameItem revZipReplaceItemWithData revZipReplaceItemWithFile revZipOpenArchive send set sort split start stop subtract union unload wait write"},c:[r,{cN:"keyword",b:"\\bend\\sif\\b"},{cN:"function",bK:"function",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"function",b:"\\bend\\s+",e:"$",k:"end",c:[o,a],r:0},{bK:"command on",e:"$",c:[r,o,e.ASM,e.QSM,e.BNM,e.CNM,a]},{cN:"meta",v:[{b:"<\\?(rev|lc|livecode)",r:10},{b:"<\\?"},{b:"\\?>"}]},e.ASM,e.QSM,e.BNM,e.CNM,a].concat(t),i:";$|^\\[|^=|&|{"}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/llvm.js b/lib/highlight_js/assets/lang/llvm.js
new file mode 100644
index 00000000000..306dc398fed
--- /dev/null
+++ b/lib/highlight_js/assets/lang/llvm.js
@@ -0,0 +1 @@
+hljs.registerLanguage("llvm",function(e){var n="([-a-zA-Z$._][\\w\\-$.]*)";return{k:"begin end true false declare define global constant private linker_private internal available_externally linkonce linkonce_odr weak weak_odr appending dllimport dllexport common default hidden protected extern_weak external thread_local zeroinitializer undef null to tail target triple datalayout volatile nuw nsw nnan ninf nsz arcp fast exact inbounds align addrspace section alias module asm sideeffect gc dbg linker_private_weak attributes blockaddress initialexec localdynamic localexec prefix unnamed_addr ccc fastcc coldcc x86_stdcallcc x86_fastcallcc arm_apcscc arm_aapcscc arm_aapcs_vfpcc ptx_device ptx_kernel intel_ocl_bicc msp430_intrcc spir_func spir_kernel x86_64_sysvcc x86_64_win64cc x86_thiscallcc cc c signext zeroext inreg sret nounwind noreturn noalias nocapture byval nest readnone readonly inlinehint noinline alwaysinline optsize ssp sspreq noredzone noimplicitfloat naked builtin cold nobuiltin noduplicate nonlazybind optnone returns_twice sanitize_address sanitize_memory sanitize_thread sspstrong uwtable returned type opaque eq ne slt sgt sle sge ult ugt ule uge oeq one olt ogt ole oge ord uno ueq une x acq_rel acquire alignstack atomic catch cleanup filter inteldialect max min monotonic nand personality release seq_cst singlethread umax umin unordered xchg add fadd sub fsub mul fmul udiv sdiv fdiv urem srem frem shl lshr ashr and or xor icmp fcmp phi call trunc zext sext fptrunc fpext uitofp sitofp fptoui fptosi inttoptr ptrtoint bitcast addrspacecast select va_arg ret br switch invoke unwind unreachable indirectbr landingpad resume malloc alloca free load store getelementptr extractelement insertelement shufflevector getresult extractvalue insertvalue atomicrmw cmpxchg fence argmemonly double",c:[{cN:"keyword",b:"i\\d+"},e.C(";","\\n",{r:0}),e.QSM,{cN:"string",v:[{b:'"',e:'[^\\\\]"'}],r:0},{cN:"title",v:[{b:"@"+n},{b:"@\\d+"},{b:"!"+n},{b:"!\\d+"+n}]},{cN:"symbol",v:[{b:"%"+n},{b:"%\\d+"},{b:"#\\d+"}]},{cN:"number",v:[{b:"0[xX][a-fA-F0-9]+"},{b:"-?\\d+(?:[.]\\d+)?(?:[eE][-+]?\\d+(?:[.]\\d+)?)?"}],r:0}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/lsl.js b/lib/highlight_js/assets/lang/lsl.js
new file mode 100644
index 00000000000..61a8b3b513a
--- /dev/null
+++ b/lib/highlight_js/assets/lang/lsl.js
@@ -0,0 +1 @@
+hljs.registerLanguage("lsl",function(E){var T={cN:"subst",b:/\\[tn"\\]/},e={cN:"string",b:'"',e:'"',c:[T]},A={cN:"number",b:E.CNR},R={cN:"literal",v:[{b:"\\b(?:PI|TWO_PI|PI_BY_TWO|DEG_TO_RAD|RAD_TO_DEG|SQRT2)\\b"},{b:"\\b(?:XP_ERROR_(?:EXPERIENCES_DISABLED|EXPERIENCE_(?:DISABLED|SUSPENDED)|INVALID_(?:EXPERIENCE|PARAMETERS)|KEY_NOT_FOUND|MATURITY_EXCEEDED|NONE|NOT_(?:FOUND|PERMITTED(?:_LAND)?)|NO_EXPERIENCE|QUOTA_EXCEEDED|RETRY_UPDATE|STORAGE_EXCEPTION|STORE_DISABLED|THROTTLED|UNKNOWN_ERROR)|JSON_APPEND|STATUS_(?:PHYSICS|ROTATE_[XYZ]|PHANTOM|SANDBOX|BLOCK_GRAB(?:_OBJECT)?|(?:DIE|RETURN)_AT_EDGE|CAST_SHADOWS|OK|MALFORMED_PARAMS|TYPE_MISMATCH|BOUNDS_ERROR|NOT_(?:FOUND|SUPPORTED)|INTERNAL_ERROR|WHITELIST_FAILED)|AGENT(?:_(?:BY_(?:LEGACY_|USER)NAME|FLYING|ATTACHMENTS|SCRIPTED|MOUSELOOK|SITTING|ON_OBJECT|AWAY|WALKING|IN_AIR|TYPING|CROUCHING|BUSY|ALWAYS_RUN|AUTOPILOT|LIST_(?:PARCEL(?:_OWNER)?|REGION)))?|CAMERA_(?:PITCH|DISTANCE|BEHINDNESS_(?:ANGLE|LAG)|(?:FOCUS|POSITION)(?:_(?:THRESHOLD|LOCKED|LAG))?|FOCUS_OFFSET|ACTIVE)|ANIM_ON|LOOP|REVERSE|PING_PONG|SMOOTH|ROTATE|SCALE|ALL_SIDES|LINK_(?:ROOT|SET|ALL_(?:OTHERS|CHILDREN)|THIS)|ACTIVE|PASS(?:IVE|_(?:ALWAYS|IF_NOT_HANDLED|NEVER))|SCRIPTED|CONTROL_(?:FWD|BACK|(?:ROT_)?(?:LEFT|RIGHT)|UP|DOWN|(?:ML_)?LBUTTON)|PERMISSION_(?:RETURN_OBJECTS|DEBIT|OVERRIDE_ANIMATIONS|SILENT_ESTATE_MANAGEMENT|TAKE_CONTROLS|TRIGGER_ANIMATION|ATTACH|CHANGE_LINKS|(?:CONTROL|TRACK)_CAMERA|TELEPORT)|INVENTORY_(?:TEXTURE|SOUND|OBJECT|SCRIPT|LANDMARK|CLOTHING|NOTECARD|BODYPART|ANIMATION|GESTURE|ALL|NONE)|CHANGED_(?:INVENTORY|COLOR|SHAPE|SCALE|TEXTURE|LINK|ALLOWED_DROP|OWNER|REGION(?:_START)?|TELEPORT|MEDIA)|OBJECT_(?:CLICK_ACTION|HOVER_HEIGHT|LAST_OWNER_ID|(?:PHYSICS|SERVER|STREAMING)_COST|UNKNOWN_DETAIL|CHARACTER_TIME|PHANTOM|PHYSICS|TEMP_ON_REZ|NAME|DESC|POS|PRIM_(?:COUNT|EQUIVALENCE)|RETURN_(?:PARCEL(?:_OWNER)?|REGION)|REZZER_KEY|ROO?T|VELOCITY|OMEGA|OWNER|GROUP|CREATOR|ATTACHED_POINT|RENDER_WEIGHT|(?:BODY_SHAPE|PATHFINDING)_TYPE|(?:RUNNING|TOTAL)_SCRIPT_COUNT|TOTAL_INVENTORY_COUNT|SCRIPT_(?:MEMORY|TIME))|TYPE_(?:INTEGER|FLOAT|STRING|KEY|VECTOR|ROTATION|INVALID)|(?:DEBUG|PUBLIC)_CHANNEL|ATTACH_(?:AVATAR_CENTER|CHEST|HEAD|BACK|PELVIS|MOUTH|CHIN|NECK|NOSE|BELLY|[LR](?:SHOULDER|HAND|FOOT|EAR|EYE|[UL](?:ARM|LEG)|HIP)|(?:LEFT|RIGHT)_PEC|HUD_(?:CENTER_[12]|TOP_(?:RIGHT|CENTER|LEFT)|BOTTOM(?:_(?:RIGHT|LEFT))?)|[LR]HAND_RING1|TAIL_(?:BASE|TIP)|[LR]WING|FACE_(?:JAW|[LR]EAR|[LR]EYE|TOUNGE)|GROIN|HIND_[LR]FOOT)|LAND_(?:LEVEL|RAISE|LOWER|SMOOTH|NOISE|REVERT)|DATA_(?:ONLINE|NAME|BORN|SIM_(?:POS|STATUS|RATING)|PAYINFO)|PAYMENT_INFO_(?:ON_FILE|USED)|REMOTE_DATA_(?:CHANNEL|REQUEST|REPLY)|PSYS_(?:PART_(?:BF_(?:ZERO|ONE(?:_MINUS_(?:DEST_COLOR|SOURCE_(ALPHA|COLOR)))?|DEST_COLOR|SOURCE_(ALPHA|COLOR))|BLEND_FUNC_(DEST|SOURCE)|FLAGS|(?:START|END)_(?:COLOR|ALPHA|SCALE|GLOW)|MAX_AGE|(?:RIBBON|WIND|INTERP_(?:COLOR|SCALE)|BOUNCE|FOLLOW_(?:SRC|VELOCITY)|TARGET_(?:POS|LINEAR)|EMISSIVE)_MASK)|SRC_(?:MAX_AGE|PATTERN|ANGLE_(?:BEGIN|END)|BURST_(?:RATE|PART_COUNT|RADIUS|SPEED_(?:MIN|MAX))|ACCEL|TEXTURE|TARGET_KEY|OMEGA|PATTERN_(?:DROP|EXPLODE|ANGLE(?:_CONE(?:_EMPTY)?)?)))|VEHICLE_(?:REFERENCE_FRAME|TYPE_(?:NONE|SLED|CAR|BOAT|AIRPLANE|BALLOON)|(?:LINEAR|ANGULAR)_(?:FRICTION_TIMESCALE|MOTOR_DIRECTION)|LINEAR_MOTOR_OFFSET|HOVER_(?:HEIGHT|EFFICIENCY|TIMESCALE)|BUOYANCY|(?:LINEAR|ANGULAR)_(?:DEFLECTION_(?:EFFICIENCY|TIMESCALE)|MOTOR_(?:DECAY_)?TIMESCALE)|VERTICAL_ATTRACTION_(?:EFFICIENCY|TIMESCALE)|BANKING_(?:EFFICIENCY|MIX|TIMESCALE)|FLAG_(?:NO_DEFLECTION_UP|LIMIT_(?:ROLL_ONLY|MOTOR_UP)|HOVER_(?:(?:WATER|TERRAIN|UP)_ONLY|GLOBAL_HEIGHT)|MOUSELOOK_(?:STEER|BANK)|CAMERA_DECOUPLED))|PRIM_(?:ALPHA_MODE(?:_(?:BLEND|EMISSIVE|MASK|NONE))?|NORMAL|SPECULAR|TYPE(?:_(?:BOX|CYLINDER|PRISM|SPHERE|TORUS|TUBE|RING|SCULPT))?|HOLE_(?:DEFAULT|CIRCLE|SQUARE|TRIANGLE)|MATERIAL(?:_(?:STONE|METAL|GLASS|WOOD|FLESH|PLASTIC|RUBBER))?|SHINY_(?:NONE|LOW|MEDIUM|HIGH)|BUMP_(?:NONE|BRIGHT|DARK|WOOD|BARK|BRICKS|CHECKER|CONCRETE|TILE|STONE|DISKS|GRAVEL|BLOBS|SIDING|LARGETILE|STUCCO|SUCTION|WEAVE)|TEXGEN_(?:DEFAULT|PLANAR)|SCULPT_(?:TYPE_(?:SPHERE|TORUS|PLANE|CYLINDER|MASK)|FLAG_(?:MIRROR|INVERT))|PHYSICS(?:_(?:SHAPE_(?:CONVEX|NONE|PRIM|TYPE)))?|(?:POS|ROT)_LOCAL|SLICE|TEXT|FLEXIBLE|POINT_LIGHT|TEMP_ON_REZ|PHANTOM|POSITION|SIZE|ROTATION|TEXTURE|NAME|OMEGA|DESC|LINK_TARGET|COLOR|BUMP_SHINY|FULLBRIGHT|TEXGEN|GLOW|MEDIA_(?:ALT_IMAGE_ENABLE|CONTROLS|(?:CURRENT|HOME)_URL|AUTO_(?:LOOP|PLAY|SCALE|ZOOM)|FIRST_CLICK_INTERACT|(?:WIDTH|HEIGHT)_PIXELS|WHITELIST(?:_ENABLE)?|PERMS_(?:INTERACT|CONTROL)|PARAM_MAX|CONTROLS_(?:STANDARD|MINI)|PERM_(?:NONE|OWNER|GROUP|ANYONE)|MAX_(?:URL_LENGTH|WHITELIST_(?:SIZE|COUNT)|(?:WIDTH|HEIGHT)_PIXELS)))|MASK_(?:BASE|OWNER|GROUP|EVERYONE|NEXT)|PERM_(?:TRANSFER|MODIFY|COPY|MOVE|ALL)|PARCEL_(?:MEDIA_COMMAND_(?:STOP|PAUSE|PLAY|LOOP|TEXTURE|URL|TIME|AGENT|UNLOAD|AUTO_ALIGN|TYPE|SIZE|DESC|LOOP_SET)|FLAG_(?:ALLOW_(?:FLY|(?:GROUP_)?SCRIPTS|LANDMARK|TERRAFORM|DAMAGE|CREATE_(?:GROUP_)?OBJECTS)|USE_(?:ACCESS_(?:GROUP|LIST)|BAN_LIST|LAND_PASS_LIST)|LOCAL_SOUND_ONLY|RESTRICT_PUSHOBJECT|ALLOW_(?:GROUP|ALL)_OBJECT_ENTRY)|COUNT_(?:TOTAL|OWNER|GROUP|OTHER|SELECTED|TEMP)|DETAILS_(?:NAME|DESC|OWNER|GROUP|AREA|ID|SEE_AVATARS))|LIST_STAT_(?:MAX|MIN|MEAN|MEDIAN|STD_DEV|SUM(?:_SQUARES)?|NUM_COUNT|GEOMETRIC_MEAN|RANGE)|PAY_(?:HIDE|DEFAULT)|REGION_FLAG_(?:ALLOW_DAMAGE|FIXED_SUN|BLOCK_TERRAFORM|SANDBOX|DISABLE_(?:COLLISIONS|PHYSICS)|BLOCK_FLY|ALLOW_DIRECT_TELEPORT|RESTRICT_PUSHOBJECT)|HTTP_(?:METHOD|MIMETYPE|BODY_(?:MAXLENGTH|TRUNCATED)|CUSTOM_HEADER|PRAGMA_NO_CACHE|VERBOSE_THROTTLE|VERIFY_CERT)|STRING_(?:TRIM(?:_(?:HEAD|TAIL))?)|CLICK_ACTION_(?:NONE|TOUCH|SIT|BUY|PAY|OPEN(?:_MEDIA)?|PLAY|ZOOM)|TOUCH_INVALID_FACE|PROFILE_(?:NONE|SCRIPT_MEMORY)|RC_(?:DATA_FLAGS|DETECT_PHANTOM|GET_(?:LINK_NUM|NORMAL|ROOT_KEY)|MAX_HITS|REJECT_(?:TYPES|AGENTS|(?:NON)?PHYSICAL|LAND))|RCERR_(?:CAST_TIME_EXCEEDED|SIM_PERF_LOW|UNKNOWN)|ESTATE_ACCESS_(?:ALLOWED_(?:AGENT|GROUP)_(?:ADD|REMOVE)|BANNED_AGENT_(?:ADD|REMOVE))|DENSITY|FRICTION|RESTITUTION|GRAVITY_MULTIPLIER|KFM_(?:COMMAND|CMD_(?:PLAY|STOP|PAUSE)|MODE|FORWARD|LOOP|PING_PONG|REVERSE|DATA|ROTATION|TRANSLATION)|ERR_(?:GENERIC|PARCEL_PERMISSIONS|MALFORMED_PARAMS|RUNTIME_PERMISSIONS|THROTTLED)|CHARACTER_(?:CMD_(?:(?:SMOOTH_)?STOP|JUMP)|DESIRED_(?:TURN_)?SPEED|RADIUS|STAY_WITHIN_PARCEL|LENGTH|ORIENTATION|ACCOUNT_FOR_SKIPPED_FRAMES|AVOIDANCE_MODE|TYPE(?:_(?:[ABCD]|NONE))?|MAX_(?:DECEL|TURN_RADIUS|(?:ACCEL|SPEED)))|PURSUIT_(?:OFFSET|FUZZ_FACTOR|GOAL_TOLERANCE|INTERCEPT)|REQUIRE_LINE_OF_SIGHT|FORCE_DIRECT_PATH|VERTICAL|HORIZONTAL|AVOID_(?:CHARACTERS|DYNAMIC_OBSTACLES|NONE)|PU_(?:EVADE_(?:HIDDEN|SPOTTED)|FAILURE_(?:DYNAMIC_PATHFINDING_DISABLED|INVALID_(?:GOAL|START)|NO_(?:NAVMESH|VALID_DESTINATION)|OTHER|TARGET_GONE|(?:PARCEL_)?UNREACHABLE)|(?:GOAL|SLOWDOWN_DISTANCE)_REACHED)|TRAVERSAL_TYPE(?:_(?:FAST|NONE|SLOW))?|CONTENT_TYPE_(?:ATOM|FORM|HTML|JSON|LLSD|RSS|TEXT|XHTML|XML)|GCNP_(?:RADIUS|STATIC)|(?:PATROL|WANDER)_PAUSE_AT_WAYPOINTS|OPT_(?:AVATAR|CHARACTER|EXCLUSION_VOLUME|LEGACY_LINKSET|MATERIAL_VOLUME|OTHER|STATIC_OBSTACLE|WALKABLE)|SIM_STAT_PCT_CHARS_STEPPED)\\b"},{b:"\\b(?:FALSE|TRUE)\\b"},{b:"\\b(?:ZERO_ROTATION)\\b"},{b:"\\b(?:EOF|JSON_(?:ARRAY|DELETE|FALSE|INVALID|NULL|NUMBER|OBJECT|STRING|TRUE)|NULL_KEY|TEXTURE_(?:BLANK|DEFAULT|MEDIA|PLYWOOD|TRANSPARENT)|URL_REQUEST_(?:GRANTED|DENIED))\\b"},{b:"\\b(?:ZERO_VECTOR|TOUCH_INVALID_(?:TEXCOORD|VECTOR))\\b"}]},O={cN:"built_in",b:"\\b(?:ll(?:AgentInExperience|(?:Create|DataSize|Delete|KeyCount|Keys|Read|Update)KeyValue|GetExperience(?:Details|ErrorMessage)|ReturnObjectsBy(?:ID|Owner)|Json(?:2List|[GS]etValue|ValueType)|Sin|Cos|Tan|Atan2|Sqrt|Pow|Abs|Fabs|Frand|Floor|Ceil|Round|Vec(?:Mag|Norm|Dist)|Rot(?:Between|2(?:Euler|Fwd|Left|Up))|(?:Euler|Axes)2Rot|Whisper|(?:Region|Owner)?Say|Shout|Listen(?:Control|Remove)?|Sensor(?:Repeat|Remove)?|Detected(?:Name|Key|Owner|Type|Pos|Vel|Grab|Rot|Group|LinkNumber)|Die|Ground|Wind|(?:[GS]et)(?:AnimationOverride|MemoryLimit|PrimMediaParams|ParcelMusicURL|Object(?:Desc|Name)|PhysicsMaterial|Status|Scale|Color|Alpha|Texture|Pos|Rot|Force|Torque)|ResetAnimationOverride|(?:Scale|Offset|Rotate)Texture|(?:Rot)?Target(?:Remove)?|(?:Stop)?MoveToTarget|Apply(?:Rotational)?Impulse|Set(?:KeyframedMotion|ContentType|RegionPos|(?:Angular)?Velocity|Buoyancy|HoverHeight|ForceAndTorque|TimerEvent|ScriptState|Damage|TextureAnim|Sound(?:Queueing|Radius)|Vehicle(?:Type|(?:Float|Vector|Rotation)Param)|(?:Touch|Sit)?Text|Camera(?:Eye|At)Offset|PrimitiveParams|ClickAction|Link(?:Alpha|Color|PrimitiveParams(?:Fast)?|Texture(?:Anim)?|Camera|Media)|RemoteScriptAccessPin|PayPrice|LocalRot)|ScaleByFactor|Get(?:(?:Max|Min)ScaleFactor|ClosestNavPoint|StaticPath|SimStats|Env|PrimitiveParams|Link(?:PrimitiveParams|Number(?:OfSides)?|Key|Name|Media)|HTTPHeader|FreeURLs|Object(?:Details|PermMask|PrimCount)|Parcel(?:MaxPrims|Details|Prim(?:Count|Owners))|Attached(?:List)?|(?:SPMax|Free|Used)Memory|Region(?:Name|TimeDilation|FPS|Corner|AgentCount)|Root(?:Position|Rotation)|UnixTime|(?:Parcel|Region)Flags|(?:Wall|GMT)clock|SimulatorHostname|BoundingBox|GeometricCenter|Creator|NumberOf(?:Prims|NotecardLines|Sides)|Animation(?:List)?|(?:Camera|Local)(?:Pos|Rot)|Vel|Accel|Omega|Time(?:stamp|OfDay)|(?:Object|CenterOf)?Mass|MassMKS|Energy|Owner|(?:Owner)?Key|SunDirection|Texture(?:Offset|Scale|Rot)|Inventory(?:Number|Name|Key|Type|Creator|PermMask)|Permissions(?:Key)?|StartParameter|List(?:Length|EntryType)|Date|Agent(?:Size|Info|Language|List)|LandOwnerAt|NotecardLine|Script(?:Name|State))|(?:Get|Reset|GetAndReset)Time|PlaySound(?:Slave)?|LoopSound(?:Master|Slave)?|(?:Trigger|Stop|Preload)Sound|(?:(?:Get|Delete)Sub|Insert)String|To(?:Upper|Lower)|Give(?:InventoryList|Money)|RezObject|(?:Stop)?LookAt|Sleep|CollisionFilter|(?:Take|Release)Controls|DetachFromAvatar|AttachToAvatar(?:Temp)?|InstantMessage|(?:GetNext)?Email|StopHover|MinEventDelay|RotLookAt|String(?:Length|Trim)|(?:Start|Stop)Animation|TargetOmega|Request(?:Experience)?Permissions|(?:Create|Break)Link|BreakAllLinks|(?:Give|Remove)Inventory|Water|PassTouches|Request(?:Agent|Inventory)Data|TeleportAgent(?:Home|GlobalCoords)?|ModifyLand|CollisionSound|ResetScript|MessageLinked|PushObject|PassCollisions|AxisAngle2Rot|Rot2(?:Axis|Angle)|A(?:cos|sin)|AngleBetween|AllowInventoryDrop|SubStringIndex|List2(?:CSV|Integer|Json|Float|String|Key|Vector|Rot|List(?:Strided)?)|DeleteSubList|List(?:Statistics|Sort|Randomize|(?:Insert|Find|Replace)List)|EdgeOfWorld|AdjustSoundVolume|Key2Name|TriggerSoundLimited|EjectFromLand|(?:CSV|ParseString)2List|OverMyLand|SameGroup|UnSit|Ground(?:Slope|Normal|Contour)|GroundRepel|(?:Set|Remove)VehicleFlags|(?:AvatarOn)?(?:Link)?SitTarget|Script(?:Danger|Profiler)|Dialog|VolumeDetect|ResetOtherScript|RemoteLoadScriptPin|(?:Open|Close)RemoteDataChannel|SendRemoteData|RemoteDataReply|(?:Integer|String)ToBase64|XorBase64|Log(?:10)?|Base64To(?:String|Integer)|ParseStringKeepNulls|RezAtRoot|RequestSimulatorData|ForceMouselook|(?:Load|Release|(?:E|Une)scape)URL|ParcelMedia(?:CommandList|Query)|ModPow|MapDestination|(?:RemoveFrom|AddTo|Reset)Land(?:Pass|Ban)List|(?:Set|Clear)CameraParams|HTTP(?:Request|Response)|TextBox|DetectedTouch(?:UV|Face|Pos|(?:N|Bin)ormal|ST)|(?:MD5|SHA1|DumpList2)String|Request(?:Secure)?URL|Clear(?:Prim|Link)Media|(?:Link)?ParticleSystem|(?:Get|Request)(?:Username|DisplayName)|RegionSayTo|CastRay|GenerateKey|TransferLindenDollars|ManageEstateAccess|(?:Create|Delete)Character|ExecCharacterCmd|Evade|FleeFrom|NavigateTo|PatrolPoints|Pursue|UpdateCharacter|WanderWithin))\\b"};return{i:":",c:[e,{cN:"comment",v:[E.C("//","$"),E.C("/\\*","\\*/")]},A,{cN:"section",v:[{b:"\\b(?:state|default)\\b"},{b:"\\b(?:state_(?:entry|exit)|touch(?:_(?:start|end))?|(?:land_)?collision(?:_(?:start|end))?|timer|listen|(?:no_)?sensor|control|(?:not_)?at_(?:rot_)?target|money|email|experience_permissions(?:_denied)?|run_time_permissions|changed|attach|dataserver|moving_(?:start|end)|link_message|(?:on|object)_rez|remote_data|http_re(?:sponse|quest)|path_update|transaction_result)\\b"}]},O,R,{cN:"type",b:"\\b(?:integer|float|string|key|vector|quaternion|rotation|list)\\b"}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/lua.js b/lib/highlight_js/assets/lang/lua.js
index 00cf60a27a6..c478a7a889e 100644
--- a/lib/highlight_js/assets/lang/lua.js
+++ b/lib/highlight_js/assets/lang/lua.js
@@ -1 +1 @@
-hljs.registerLanguage("lua",function(e){var t="\\[=*\\[",a="\\]=*\\]",r={b:t,e:a,c:["self"]},n=[e.C("--(?!"+t+")","$"),e.C("--"+t,a,{c:[r],r:10})];return{l:e.UIR,k:{keyword:"and break do else elseif end false for if in local nil not or repeat return then true until while",built_in:"_G _VERSION assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall coroutine debug io math os package string table"},c:n.concat([{cN:"function",bK:"function",e:"\\)",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{cN:"params",b:"\\(",eW:!0,c:n}].concat(n)},e.CNM,e.ASM,e.QSM,{cN:"string",b:t,e:a,c:[r],r:5}])}});
\ No newline at end of file
+hljs.registerLanguage("lua",function(e){var t="\\[=*\\[",a="\\]=*\\]",r={b:t,e:a,c:["self"]},n=[e.C("--(?!"+t+")","$"),e.C("--"+t,a,{c:[r],r:10})];return{l:e.UIR,k:{literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstringmodule next pairs pcall print rawequal rawget rawset require select setfenvsetmetatable tonumber tostring type unpack xpcall arg selfcoroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},c:n.concat([{cN:"function",bK:"function",e:"\\)",c:[e.inherit(e.TM,{b:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{cN:"params",b:"\\(",eW:!0,c:n}].concat(n)},e.CNM,e.ASM,e.QSM,{cN:"string",b:t,e:a,c:[r],r:5}])}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/makefile.js b/lib/highlight_js/assets/lang/makefile.js
index a6060420ea5..d36bb172b98 100644
--- a/lib/highlight_js/assets/lang/makefile.js
+++ b/lib/highlight_js/assets/lang/makefile.js
@@ -1 +1 @@
-hljs.registerLanguage("makefile",function(e){var a={cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]};return{aliases:["mk","mak"],c:[e.HCM,{b:/^\w+\s*\W*=/,rB:!0,r:0,starts:{e:/\s*\W*=/,eE:!0,starts:{e:/$/,r:0,c:[a]}}},{cN:"section",b:/^[\w]+:\s*$/},{cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},{b:/^\t+/,e:/$/,r:0,c:[e.QSM,a]}]}});
\ No newline at end of file
+hljs.registerLanguage("makefile",function(e){var i={cN:"variable",v:[{b:"\\$\\("+e.UIR+"\\)",c:[e.BE]},{b:/\$[@%<?\^\+\*]/}]},r={cN:"string",b:/"/,e:/"/,c:[e.BE,i]},a={cN:"variable",b:/\$\([\w-]+\s/,e:/\)/,k:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},c:[i]},n={b:"^"+e.UIR+"\\s*[:+?]?=",i:"\\n",rB:!0,c:[{b:"^"+e.UIR,e:"[:+?]?=",eE:!0}]},t={cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},l={cN:"section",b:/^[^\s]+:/,e:/$/,c:[i]};return{aliases:["mk","mak"],k:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath",l:/[\w-]+/,c:[e.HCM,i,r,a,n,t,l]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/markdown.js b/lib/highlight_js/assets/lang/markdown.js
index 54d98310807..da7a989fad5 100644
--- a/lib/highlight_js/assets/lang/markdown.js
+++ b/lib/highlight_js/assets/lang/markdown.js
@@ -1 +1 @@
-hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"`.+?`"},{b:"^( {4}|	)",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:"^\\[.+\\]:",rB:!0,c:[{cN:"symbol",b:"\\[",e:"\\]:",eB:!0,eE:!0,starts:{cN:"link",e:"$"}}]}]}});
\ No newline at end of file
+hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```w*s*$",e:"^```s*$"},{b:"`.+?`"},{b:"^( {4}|	)",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/maxima.js b/lib/highlight_js/assets/lang/maxima.js
index bc2496549de..7a288b18ccb 100644
--- a/lib/highlight_js/assets/lang/maxima.js
+++ b/lib/highlight_js/assets/lang/maxima.js
@@ -1 +1 @@
-hljs.registerLanguage("maxima",function(e){var t="if then else elseif for thru do while unless step in and or not",a="true false unknown inf minf ind und %e %i %pi %phi %gamma",r=" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",i="_ __ %|0 %%|0";return{l:"[A-Za-z_%][0-9A-Za-z_%]*",k:{keyword:t,literal:a,built_in:r,symbol:i},c:[{cN:"comment",b:"/\\*",e:"\\*/",c:["self"]},e.QSM,{cN:"number",r:0,v:[{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",r:10},{b:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{b:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}]}});
\ No newline at end of file
+hljs.registerLanguage("maxima",function(e){var t="if then else elseif for thru do while unless step in and or not",a="true false unknown inf minf ind und %e %i %pi %phi %gamma",r=" abasep abs absint absolute_real_time acos acosh acot acoth acsc acsch activate addcol add_edge add_edges addmatrices addrow add_vertex add_vertices adjacency_matrix adjoin adjoint af agd airy airy_ai airy_bi airy_dai airy_dbi algsys alg_type alias allroots alphacharp alphanumericp amortization %and annuity_fv annuity_pv antid antidiff AntiDifference append appendfile apply apply1 apply2 applyb1 apropos args arit_amortization arithmetic arithsum array arrayapply arrayinfo arraymake arraysetapply ascii asec asech asin asinh askinteger asksign assoc assoc_legendre_p assoc_legendre_q assume assume_external_byte_order asympa at atan atan2 atanh atensimp atom atvalue augcoefmatrix augmented_lagrangian_method av average_degree backtrace bars barsplot barsplot_description base64 base64_decode bashindices batch batchload bc2 bdvac belln benefit_cost bern bernpoly bernstein_approx bernstein_expand bernstein_poly bessel bessel_i bessel_j bessel_k bessel_simplify bessel_y beta beta_incomplete beta_incomplete_generalized beta_incomplete_regularized bezout bfallroots bffac bf_find_root bf_fmin_cobyla bfhzeta bfloat bfloatp bfpsi bfpsi0 bfzeta biconnected_components bimetric binomial bipartition block blockmatrixp bode_gain bode_phase bothcoef box boxplot boxplot_description break bug_report build_info|10 buildq build_sample burn cabs canform canten cardinality carg cartan cartesian_product catch cauchy_matrix cbffac cdf_bernoulli cdf_beta cdf_binomial cdf_cauchy cdf_chi2 cdf_continuous_uniform cdf_discrete_uniform cdf_exp cdf_f cdf_gamma cdf_general_finite_discrete cdf_geometric cdf_gumbel cdf_hypergeometric cdf_laplace cdf_logistic cdf_lognormal cdf_negative_binomial cdf_noncentral_chi2 cdf_noncentral_student_t cdf_normal cdf_pareto cdf_poisson cdf_rank_sum cdf_rayleigh cdf_signed_rank cdf_student_t cdf_weibull cdisplay ceiling central_moment cequal cequalignore cf cfdisrep cfexpand cgeodesic cgreaterp cgreaterpignore changename changevar chaosgame charat charfun charfun2 charlist charp charpoly chdir chebyshev_t chebyshev_u checkdiv check_overlaps chinese cholesky christof chromatic_index chromatic_number cint circulant_graph clear_edge_weight clear_rules clear_vertex_label clebsch_gordan clebsch_graph clessp clesspignore close closefile cmetric coeff coefmatrix cograd col collapse collectterms columnop columnspace columnswap columnvector combination combine comp2pui compare compfile compile compile_file complement_graph complete_bipartite_graph complete_graph complex_number_p components compose_functions concan concat conjugate conmetderiv connected_components connect_vertices cons constant constantp constituent constvalue cont2part content continuous_freq contortion contour_plot contract contract_edge contragrad contrib_ode convert coord copy copy_file copy_graph copylist copymatrix cor cos cosh cot coth cov cov1 covdiff covect covers crc24sum create_graph create_list csc csch csetup cspline ctaylor ct_coordsys ctransform ctranspose cube_graph cuboctahedron_graph cunlisp cv cycle_digraph cycle_graph cylindrical days360 dblint deactivate declare declare_constvalue declare_dimensions declare_fundamental_dimensions declare_fundamental_units declare_qty declare_translated declare_unit_conversion declare_units declare_weights decsym defcon define define_alt_display define_variable defint defmatch defrule defstruct deftaylor degree_sequence del delete deleten delta demo demoivre denom depends derivdegree derivlist describe desolve determinant dfloat dgauss_a dgauss_b dgeev dgemm dgeqrf dgesv dgesvd diag diagmatrix diag_matrix diagmatrixp diameter diff digitcharp dimacs_export dimacs_import dimension dimensionless dimensions dimensions_as_list direct directory discrete_freq disjoin disjointp disolate disp dispcon dispform dispfun dispJordan display disprule dispterms distrib divide divisors divsum dkummer_m dkummer_u dlange dodecahedron_graph dotproduct dotsimp dpart draw draw2d draw3d drawdf draw_file draw_graph dscalar echelon edge_coloring edge_connectivity edges eigens_by_jacobi eigenvalues eigenvectors eighth einstein eivals eivects elapsed_real_time elapsed_run_time ele2comp ele2polynome ele2pui elem elementp elevation_grid elim elim_allbut eliminate eliminate_using ellipse elliptic_e elliptic_ec elliptic_eu elliptic_f elliptic_kc elliptic_pi ematrix empty_graph emptyp endcons entermatrix entertensor entier equal equalp equiv_classes erf erfc erf_generalized erfi errcatch error errormsg errors euler ev eval_string evenp every evolution evolution2d evundiff example exp expand expandwrt expandwrt_factored expint expintegral_chi expintegral_ci expintegral_e expintegral_e1 expintegral_ei expintegral_e_simplify expintegral_li expintegral_shi expintegral_si explicit explose exponentialize express expt exsec extdiff extract_linear_equations extremal_subset ezgcd %f f90 facsum factcomb factor factorfacsum factorial factorout factorsum facts fast_central_elements fast_linsolve fasttimes featurep fernfale fft fib fibtophi fifth filename_merge file_search file_type fillarray findde find_root find_root_abs find_root_error find_root_rel first fix flatten flength float floatnump floor flower_snark flush flush1deriv flushd flushnd flush_output fmin_cobyla forget fortran fourcos fourexpand fourier fourier_elim fourint fourintcos fourintsin foursimp foursin fourth fposition frame_bracket freeof freshline fresnel_c fresnel_s from_adjacency_matrix frucht_graph full_listify fullmap fullmapl fullratsimp fullratsubst fullsetify funcsolve fundamental_dimensions fundamental_units fundef funmake funp fv g0 g1 gamma gamma_greek gamma_incomplete gamma_incomplete_generalized gamma_incomplete_regularized gauss gauss_a gauss_b gaussprob gcd gcdex gcdivide gcfac gcfactor gd generalized_lambert_w genfact gen_laguerre genmatrix gensym geo_amortization geo_annuity_fv geo_annuity_pv geomap geometric geometric_mean geosum get getcurrentdirectory get_edge_weight getenv get_lu_factors get_output_stream_string get_pixel get_plot_option get_tex_environment get_tex_environment_default get_vertex_label gfactor gfactorsum ggf girth global_variances gn gnuplot_close gnuplot_replot gnuplot_reset gnuplot_restart gnuplot_start go Gosper GosperSum gr2d gr3d gradef gramschmidt graph6_decode graph6_encode graph6_export graph6_import graph_center graph_charpoly graph_eigenvalues graph_flow graph_order graph_periphery graph_product graph_size graph_union great_rhombicosidodecahedron_graph great_rhombicuboctahedron_graph grid_graph grind grobner_basis grotzch_graph hamilton_cycle hamilton_path hankel hankel_1 hankel_2 harmonic harmonic_mean hav heawood_graph hermite hessian hgfred hilbertmap hilbert_matrix hipow histogram histogram_description hodge horner hypergeometric i0 i1 %ibes ic1 ic2 ic_convert ichr1 ichr2 icosahedron_graph icosidodecahedron_graph icurvature ident identfor identity idiff idim idummy ieqn %if ifactors iframes ifs igcdex igeodesic_coords ilt image imagpart imetric implicit implicit_derivative implicit_plot indexed_tensor indices induced_subgraph inferencep inference_result infix info_display init_atensor init_ctensor in_neighbors innerproduct inpart inprod inrt integerp integer_partitions integrate intersect intersection intervalp intopois intosum invariant1 invariant2 inverse_fft inverse_jacobi_cd inverse_jacobi_cn inverse_jacobi_cs inverse_jacobi_dc inverse_jacobi_dn inverse_jacobi_ds inverse_jacobi_nc inverse_jacobi_nd inverse_jacobi_ns inverse_jacobi_sc inverse_jacobi_sd inverse_jacobi_sn invert invert_by_adjoint invert_by_lu inv_mod irr is is_biconnected is_bipartite is_connected is_digraph is_edge_in_graph is_graph is_graph_or_digraph ishow is_isomorphic isolate isomorphism is_planar isqrt isreal_p is_sconnected is_tree is_vertex_in_graph items_inference %j j0 j1 jacobi jacobian jacobi_cd jacobi_cn jacobi_cs jacobi_dc jacobi_dn jacobi_ds jacobi_nc jacobi_nd jacobi_ns jacobi_p jacobi_sc jacobi_sd jacobi_sn JF jn join jordan julia julia_set julia_sin %k kdels kdelta kill killcontext kostka kron_delta kronecker_product kummer_m kummer_u kurtosis kurtosis_bernoulli kurtosis_beta kurtosis_binomial kurtosis_chi2 kurtosis_continuous_uniform kurtosis_discrete_uniform kurtosis_exp kurtosis_f kurtosis_gamma kurtosis_general_finite_discrete kurtosis_geometric kurtosis_gumbel kurtosis_hypergeometric kurtosis_laplace kurtosis_logistic kurtosis_lognormal kurtosis_negative_binomial kurtosis_noncentral_chi2 kurtosis_noncentral_student_t kurtosis_normal kurtosis_pareto kurtosis_poisson kurtosis_rayleigh kurtosis_student_t kurtosis_weibull label labels lagrange laguerre lambda lambert_w laplace laplacian_matrix last lbfgs lc2kdt lcharp lc_l lcm lc_u ldefint ldisp ldisplay legendre_p legendre_q leinstein length let letrules letsimp levi_civita lfreeof lgtreillis lhs li liediff limit Lindstedt linear linearinterpol linear_program linear_regression line_graph linsolve listarray list_correlations listify list_matrix_entries list_nc_monomials listoftens listofvars listp lmax lmin load loadfile local locate_matrix_entry log logcontract log_gamma lopow lorentz_gauge lowercasep lpart lratsubst lreduce lriemann lsquares_estimates lsquares_estimates_approximate lsquares_estimates_exact lsquares_mse lsquares_residual_mse lsquares_residuals lsum ltreillis lu_backsub lucas lu_factor %m macroexpand macroexpand1 make_array makebox makefact makegamma make_graph make_level_picture makelist makeOrders make_poly_continent make_poly_country make_polygon make_random_state make_rgb_picture makeset make_string_input_stream make_string_output_stream make_transform mandelbrot mandelbrot_set map mapatom maplist matchdeclare matchfix mat_cond mat_fullunblocker mat_function mathml_display mat_norm matrix matrixmap matrixp matrix_size mattrace mat_trace mat_unblocker max max_clique max_degree max_flow maximize_lp max_independent_set max_matching maybe md5sum mean mean_bernoulli mean_beta mean_binomial mean_chi2 mean_continuous_uniform mean_deviation mean_discrete_uniform mean_exp mean_f mean_gamma mean_general_finite_discrete mean_geometric mean_gumbel mean_hypergeometric mean_laplace mean_logistic mean_lognormal mean_negative_binomial mean_noncentral_chi2 mean_noncentral_student_t mean_normal mean_pareto mean_poisson mean_rayleigh mean_student_t mean_weibull median median_deviation member mesh metricexpandall mgf1_sha1 min min_degree min_edge_cut minfactorial minimalPoly minimize_lp minimum_spanning_tree minor minpack_lsquares minpack_solve min_vertex_cover min_vertex_cut mkdir mnewton mod mode_declare mode_identity ModeMatrix moebius mon2schur mono monomial_dimensions multibernstein_poly multi_display_for_texinfo multi_elem multinomial multinomial_coeff multi_orbit multiplot_mode multi_pui multsym multthru mycielski_graph nary natural_unit nc_degree ncexpt ncharpoly negative_picture neighbors new newcontext newdet new_graph newline newton new_variable next_prime nicedummies niceindices ninth nofix nonarray noncentral_moment nonmetricity nonnegintegerp nonscalarp nonzeroandfreeof notequal nounify nptetrad npv nroots nterms ntermst nthroot nullity nullspace num numbered_boundaries numberp number_to_octets num_distinct_partitions numerval numfactor num_partitions nusum nzeta nzetai nzetar octets_to_number octets_to_oid odd_girth oddp ode2 ode_check odelin oid_to_octets op opena opena_binary openr openr_binary openw openw_binary operatorp opsubst optimize %or orbit orbits ordergreat ordergreatp orderless orderlessp orthogonal_complement orthopoly_recur orthopoly_weight outermap out_neighbors outofpois pade parabolic_cylinder_d parametric parametric_surface parg parGosper parse_string parse_timedate part part2cont partfrac partition partition_set partpol path_digraph path_graph pathname_directory pathname_name pathname_type pdf_bernoulli pdf_beta pdf_binomial pdf_cauchy pdf_chi2 pdf_continuous_uniform pdf_discrete_uniform pdf_exp pdf_f pdf_gamma pdf_general_finite_discrete pdf_geometric pdf_gumbel pdf_hypergeometric pdf_laplace pdf_logistic pdf_lognormal pdf_negative_binomial pdf_noncentral_chi2 pdf_noncentral_student_t pdf_normal pdf_pareto pdf_poisson pdf_rank_sum pdf_rayleigh pdf_signed_rank pdf_student_t pdf_weibull pearson_skewness permanent permut permutation permutations petersen_graph petrov pickapart picture_equalp picturep piechart piechart_description planar_embedding playback plog plot2d plot3d plotdf ploteq plsquares pochhammer points poisdiff poisexpt poisint poismap poisplus poissimp poissubst poistimes poistrim polar polarform polartorect polar_to_xy poly_add poly_buchberger poly_buchberger_criterion poly_colon_ideal poly_content polydecomp poly_depends_p poly_elimination_ideal poly_exact_divide poly_expand poly_expt poly_gcd polygon poly_grobner poly_grobner_equal poly_grobner_member poly_grobner_subsetp poly_ideal_intersection poly_ideal_polysaturation poly_ideal_polysaturation1 poly_ideal_saturation poly_ideal_saturation1 poly_lcm poly_minimization polymod poly_multiply polynome2ele polynomialp poly_normal_form poly_normalize poly_normalize_list poly_polysaturation_extension poly_primitive_part poly_pseudo_divide poly_reduced_grobner poly_reduction poly_saturation_extension poly_s_polynomial poly_subtract polytocompanion pop postfix potential power_mod powerseries powerset prefix prev_prime primep primes principal_components print printf printfile print_graph printpois printprops prodrac product properties propvars psi psubst ptriangularize pui pui2comp pui2ele pui2polynome pui_direct puireduc push put pv qput qrange qty quad_control quad_qag quad_qagi quad_qagp quad_qags quad_qawc quad_qawf quad_qawo quad_qaws quadrilateral quantile quantile_bernoulli quantile_beta quantile_binomial quantile_cauchy quantile_chi2 quantile_continuous_uniform quantile_discrete_uniform quantile_exp quantile_f quantile_gamma quantile_general_finite_discrete quantile_geometric quantile_gumbel quantile_hypergeometric quantile_laplace quantile_logistic quantile_lognormal quantile_negative_binomial quantile_noncentral_chi2 quantile_noncentral_student_t quantile_normal quantile_pareto quantile_poisson quantile_rayleigh quantile_student_t quantile_weibull quartile_skewness quit qunit quotient racah_v racah_w radcan radius random random_bernoulli random_beta random_binomial random_bipartite_graph random_cauchy random_chi2 random_continuous_uniform random_digraph random_discrete_uniform random_exp random_f random_gamma random_general_finite_discrete random_geometric random_graph random_graph1 random_gumbel random_hypergeometric random_laplace random_logistic random_lognormal random_negative_binomial random_network random_noncentral_chi2 random_noncentral_student_t random_normal random_pareto random_permutation random_poisson random_rayleigh random_regular_graph random_student_t random_tournament random_tree random_weibull range rank rat ratcoef ratdenom ratdiff ratdisrep ratexpand ratinterpol rational rationalize ratnumer ratnump ratp ratsimp ratsubst ratvars ratweight read read_array read_binary_array read_binary_list read_binary_matrix readbyte readchar read_hashed_array readline read_list read_matrix read_nested_list readonly read_xpm real_imagpart_to_conjugate realpart realroots rearray rectangle rectform rectform_log_if_constant recttopolar rediff reduce_consts reduce_order region region_boundaries region_boundaries_plus rem remainder remarray rembox remcomps remcon remcoord remfun remfunction remlet remove remove_constvalue remove_dimensions remove_edge remove_fundamental_dimensions remove_fundamental_units remove_plot_option remove_vertex rempart remrule remsym remvalue rename rename_file reset reset_displays residue resolvante resolvante_alternee1 resolvante_bipartite resolvante_diedrale resolvante_klein resolvante_klein3 resolvante_produit_sym resolvante_unitaire resolvante_vierer rest resultant return reveal reverse revert revert2 rgb2level rhs ricci riemann rinvariant risch rk rmdir rncombine romberg room rootscontract round row rowop rowswap rreduce run_testsuite %s save saving scalarp scaled_bessel_i scaled_bessel_i0 scaled_bessel_i1 scalefactors scanmap scatterplot scatterplot_description scene schur2comp sconcat scopy scsimp scurvature sdowncase sec sech second sequal sequalignore set_alt_display setdifference set_draw_defaults set_edge_weight setelmx setequalp setify setp set_partitions set_plot_option set_prompt set_random_state set_tex_environment set_tex_environment_default setunits setup_autoload set_up_dot_simplifications set_vertex_label seventh sexplode sf sha1sum sha256sum shortest_path shortest_weighted_path show showcomps showratvars sierpinskiale sierpinskimap sign signum similaritytransform simp_inequality simplify_sum simplode simpmetderiv simtran sin sinh sinsert sinvertcase sixth skewness skewness_bernoulli skewness_beta skewness_binomial skewness_chi2 skewness_continuous_uniform skewness_discrete_uniform skewness_exp skewness_f skewness_gamma skewness_general_finite_discrete skewness_geometric skewness_gumbel skewness_hypergeometric skewness_laplace skewness_logistic skewness_lognormal skewness_negative_binomial skewness_noncentral_chi2 skewness_noncentral_student_t skewness_normal skewness_pareto skewness_poisson skewness_rayleigh skewness_student_t skewness_weibull slength smake small_rhombicosidodecahedron_graph small_rhombicuboctahedron_graph smax smin smismatch snowmap snub_cube_graph snub_dodecahedron_graph solve solve_rec solve_rec_rat some somrac sort sparse6_decode sparse6_encode sparse6_export sparse6_import specint spherical spherical_bessel_j spherical_bessel_y spherical_hankel1 spherical_hankel2 spherical_harmonic spherical_to_xyz splice split sposition sprint sqfr sqrt sqrtdenest sremove sremovefirst sreverse ssearch ssort sstatus ssubst ssubstfirst staircase standardize standardize_inverse_trig starplot starplot_description status std std1 std_bernoulli std_beta std_binomial std_chi2 std_continuous_uniform std_discrete_uniform std_exp std_f std_gamma std_general_finite_discrete std_geometric std_gumbel std_hypergeometric std_laplace std_logistic std_lognormal std_negative_binomial std_noncentral_chi2 std_noncentral_student_t std_normal std_pareto std_poisson std_rayleigh std_student_t std_weibull stemplot stirling stirling1 stirling2 strim striml strimr string stringout stringp strong_components struve_h struve_l sublis sublist sublist_indices submatrix subsample subset subsetp subst substinpart subst_parallel substpart substring subvar subvarp sum sumcontract summand_to_rec supcase supcontext symbolp symmdifference symmetricp system take_channel take_inference tan tanh taylor taylorinfo taylorp taylor_simplifier taytorat tcl_output tcontract tellrat tellsimp tellsimpafter tentex tenth test_mean test_means_difference test_normality test_proportion test_proportions_difference test_rank_sum test_sign test_signed_rank test_variance test_variance_ratio tex tex1 tex_display texput %th third throw time timedate timer timer_info tldefint tlimit todd_coxeter toeplitz tokens to_lisp topological_sort to_poly to_poly_solve totaldisrep totalfourier totient tpartpol trace tracematrix trace_options transform_sample translate translate_file transpose treefale tree_reduce treillis treinat triangle triangularize trigexpand trigrat trigreduce trigsimp trunc truncate truncated_cube_graph truncated_dodecahedron_graph truncated_icosahedron_graph truncated_tetrahedron_graph tr_warnings_get tube tutte_graph ueivects uforget ultraspherical underlying_graph undiff union unique uniteigenvectors unitp units unit_step unitvector unorder unsum untellrat untimer untrace uppercasep uricci uriemann uvect vandermonde_matrix var var1 var_bernoulli var_beta var_binomial var_chi2 var_continuous_uniform var_discrete_uniform var_exp var_f var_gamma var_general_finite_discrete var_geometric var_gumbel var_hypergeometric var_laplace var_logistic var_lognormal var_negative_binomial var_noncentral_chi2 var_noncentral_student_t var_normal var_pareto var_poisson var_rayleigh var_student_t var_weibull vector vectorpotential vectorsimp verbify vers vertex_coloring vertex_connectivity vertex_degree vertex_distance vertex_eccentricity vertex_in_degree vertex_out_degree vertices vertices_to_cycle vertices_to_path %w weyl wheel_graph wiener_index wigner_3j wigner_6j wigner_9j with_stdout write_binary_data writebyte write_data writefile wronskian xreduce xthru %y Zeilberger zeroequiv zerofor zeromatrix zeromatrixp zeta zgeev zheev zlange zn_add_table zn_carmichael_lambda zn_characteristic_factors zn_determinant zn_factor_generators zn_invert_by_lu zn_log zn_mult_table absboxchar activecontexts adapt_depth additive adim aform algebraic algepsilon algexact aliases allbut all_dotsimp_denoms allocation allsym alphabetic animation antisymmetric arrays askexp assume_pos assume_pos_pred assumescalar asymbol atomgrad atrig1 axes axis_3d axis_bottom axis_left axis_right axis_top azimuth background background_color backsubst berlefact bernstein_explicit besselexpand beta_args_sum_to_integer beta_expand bftorat bftrunc bindtest border boundaries_array box boxchar breakup %c capping cauchysum cbrange cbtics center cflength cframe_flag cnonmet_flag color color_bar color_bar_tics colorbox columns commutative complex cone context contexts contour contour_levels cosnpiflag ctaypov ctaypt ctayswitch ctayvar ct_coords ctorsion_flag ctrgsimp cube current_let_rule_package cylinder data_file_name debugmode decreasing default_let_rule_package delay dependencies derivabbrev derivsubst detout diagmetric diff dim dimensions dispflag display2d|10 display_format_internal distribute_over doallmxops domain domxexpt domxmxops domxnctimes dontfactor doscmxops doscmxplus dot0nscsimp dot0simp dot1simp dotassoc dotconstrules dotdistrib dotexptsimp dotident dotscrules draw_graph_program draw_realpart edge_color edge_coloring edge_partition edge_type edge_width %edispflag elevation %emode endphi endtheta engineering_format_floats enhanced3d %enumer epsilon_lp erfflag erf_representation errormsg error_size error_syms error_type %e_to_numlog eval even evenfun evflag evfun ev_point expandwrt_denom expintexpand expintrep expon expop exptdispflag exptisolate exptsubst facexpand facsum_combine factlim factorflag factorial_expand factors_only fb feature features file_name file_output_append file_search_demo file_search_lisp file_search_maxima|10 file_search_tests file_search_usage file_type_lisp file_type_maxima|10 fill_color fill_density filled_func fixed_vertices flipflag float2bf font font_size fortindent fortspaces fpprec fpprintprec functions gamma_expand gammalim gdet genindex gensumnum GGFCFMAX GGFINFINITY globalsolve gnuplot_command gnuplot_curve_styles gnuplot_curve_titles gnuplot_default_term_command gnuplot_dumb_term_command gnuplot_file_args gnuplot_file_name gnuplot_out_file gnuplot_pdf_term_command gnuplot_pm3d gnuplot_png_term_command gnuplot_postamble gnuplot_preamble gnuplot_ps_term_command gnuplot_svg_term_command gnuplot_term gnuplot_view_args Gosper_in_Zeilberger gradefs grid grid2d grind halfangles head_angle head_both head_length head_type height hypergeometric_representation %iargs ibase icc1 icc2 icounter idummyx ieqnprint ifb ifc1 ifc2 ifg ifgi ifr iframe_bracket_form ifri igeowedge_flag ikt1 ikt2 imaginary inchar increasing infeval infinity inflag infolists inm inmc1 inmc2 intanalysis integer integervalued integrate_use_rootsof integration_constant integration_constant_counter interpolate_color intfaclim ip_grid ip_grid_in irrational isolate_wrt_times iterations itr julia_parameter %k1 %k2 keepfloat key key_pos kinvariant kt label label_alignment label_orientation labels lassociative lbfgs_ncorrections lbfgs_nfeval_max leftjust legend letrat let_rule_packages lfg lg lhospitallim limsubst linear linear_solver linechar linel|10 linenum line_type linewidth line_width linsolve_params linsolvewarn lispdisp listarith listconstvars listdummyvars lmxchar load_pathname loadprint logabs logarc logcb logconcoeffp logexpand lognegint logsimp logx logx_secondary logy logy_secondary logz lriem m1pbranch macroexpansion macros mainvar manual_demo maperror mapprint matrix_element_add matrix_element_mult matrix_element_transpose maxapplydepth maxapplyheight maxima_tempdir|10 maxima_userdir|10 maxnegex MAX_ORD maxposex maxpsifracdenom maxpsifracnum maxpsinegint maxpsiposint maxtayorder mesh_lines_color method mod_big_prime mode_check_errorp mode_checkp mode_check_warnp mod_test mod_threshold modular_linear_solver modulus multiplicative multiplicities myoptions nary negdistrib negsumdispflag newline newtonepsilon newtonmaxiter nextlayerfactor niceindicespref nm nmc noeval nolabels nonegative_lp noninteger nonscalar noun noundisp nouns np npi nticks ntrig numer numer_pbranch obase odd oddfun opacity opproperties opsubst optimprefix optionset orientation origin orthopoly_returns_intervals outative outchar packagefile palette partswitch pdf_file pfeformat phiresolution %piargs piece pivot_count_sx pivot_max_sx plot_format plot_options plot_realpart png_file pochhammer_max_index points pointsize point_size points_joined point_type poislim poisson poly_coefficient_ring poly_elimination_order polyfactor poly_grobner_algorithm poly_grobner_debug poly_monomial_order poly_primary_elimination_order poly_return_term_list poly_secondary_elimination_order poly_top_reduction_only posfun position powerdisp pred prederror primep_number_of_tests product_use_gamma program programmode promote_float_to_bigfloat prompt proportional_axes props psexpand ps_file radexpand radius radsubstflag rassociative ratalgdenom ratchristof ratdenomdivide rateinstein ratepsilon ratfac rational ratmx ratprint ratriemann ratsimpexpons ratvarswitch ratweights ratweyl ratwtlvl real realonly redraw refcheck resolution restart resultant ric riem rmxchar %rnum_list rombergabs rombergit rombergmin rombergtol rootsconmode rootsepsilon run_viewer same_xy same_xyz savedef savefactors scalar scalarmatrixp scale scale_lp setcheck setcheckbreak setval show_edge_color show_edges show_edge_type show_edge_width show_id show_label showtime show_vertex_color show_vertex_size show_vertex_type show_vertices show_weight simp simplified_output simplify_products simpproduct simpsum sinnpiflag solvedecomposes solveexplicit solvefactors solvenullwarn solveradcan solvetrigwarn space sparse sphere spring_embedding_depth sqrtdispflag stardisp startphi starttheta stats_numer stringdisp structures style sublis_apply_lambda subnumsimp sumexpand sumsplitfact surface surface_hide svg_file symmetric tab taylordepth taylor_logexpand taylor_order_coefficients taylor_truncate_polynomials tensorkill terminal testsuite_files thetaresolution timer_devalue title tlimswitch tr track transcompile transform transform_xy translate_fast_arrays transparent transrun tr_array_as_ref tr_bound_function_applyp tr_file_tty_messagesp tr_float_can_branch_complex tr_function_call_default trigexpandplus trigexpandtimes triginverses trigsign trivial_solutions tr_numer tr_optimize_max_loop tr_semicompile tr_state_vars tr_warn_bad_function_calls tr_warn_fexpr tr_warn_meval tr_warn_mode tr_warn_undeclared tr_warn_undefined_variable tstep ttyoff tube_extremes ufg ug %unitexpand unit_vectors uric uriem use_fast_arrays user_preamble usersetunits values vect_cross verbose vertex_color vertex_coloring vertex_partition vertex_size vertex_type view warnings weyl width windowname windowtitle wired_surface wireframe xaxis xaxis_color xaxis_secondary xaxis_type xaxis_width xlabel xlabel_secondary xlength xrange xrange_secondary xtics xtics_axis xtics_rotate xtics_rotate_secondary xtics_secondary xtics_secondary_axis xu_grid x_voxel xy_file xyplane xy_scale yaxis yaxis_color yaxis_secondary yaxis_type yaxis_width ylabel ylabel_secondary ylength yrange yrange_secondary ytics ytics_axis ytics_rotate ytics_rotate_secondary ytics_secondary ytics_secondary_axis yv_grid y_voxel yx_ratio zaxis zaxis_color zaxis_type zaxis_width zeroa zerob zerobern zeta%pi zlabel zlabel_rotate zlength zmin zn_primroot_limit zn_primroot_pretest",i="_ __ %|0 %%|0";return{l:"[A-Za-z_%][0-9A-Za-z_%]*",k:{keyword:t,literal:a,built_in:r,symbol:i},c:[{cN:"comment",b:"/\\*",e:"\\*/",c:["self"]},e.QSM,{cN:"number",r:0,v:[{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Ee][-+]?\\d+\\b"},{b:"\\b(\\d+|\\d+\\.|\\.\\d+|\\d+\\.\\d+)[Bb][-+]?\\d+\\b",r:10},{b:"\\b(\\.\\d+|\\d+\\.\\d+)\\b"},{b:"\\b(\\d+|0[0-9A-Za-z]+)\\.?\\b"}]}],i:/@/}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/moonscript.js b/lib/highlight_js/assets/lang/moonscript.js
new file mode 100644
index 00000000000..2655fef5213
--- /dev/null
+++ b/lib/highlight_js/assets/lang/moonscript.js
@@ -0,0 +1 @@
+hljs.registerLanguage("moonscript",function(e){var t={keyword:"if then not for in while do return else elseif break continue switch and or unless when class extends super local import export from using",literal:"true false nil",built_in:"_G _VERSION assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall coroutine debug io math os package string table"},r="[A-Za-z$_][0-9A-Za-z$_]*",s={cN:"subst",b:/#\{/,e:/}/,k:t},a=[e.inherit(e.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'/,e:/'/,c:[e.BE]},{b:/"/,e:/"/,c:[e.BE,s]}]},{cN:"built_in",b:"@__"+e.IR},{b:"@"+e.IR},{b:e.IR+"\\\\"+e.IR}];s.c=a;var c=e.inherit(e.TM,{b:r}),n="(\\(.*\\))?\\s*\\B[-=]>",i={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:t,c:["self"].concat(a)}]};return{aliases:["moon"],k:t,i:/\/\*/,c:a.concat([e.C("--","$"),{cN:"function",b:"^\\s*"+r+"\\s*=\\s*"+n,e:"[-=]>",rB:!0,c:[c,i]},{b:/[\(,:=]\s*/,r:0,c:[{cN:"function",b:n,e:"[-=]>",rB:!0,c:[i]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[c]},c]},{cN:"name",b:r+":",e:":",rB:!0,rE:!0,r:0}])}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/n1ql.js b/lib/highlight_js/assets/lang/n1ql.js
new file mode 100644
index 00000000000..0ee80670e64
--- /dev/null
+++ b/lib/highlight_js/assets/lang/n1ql.js
@@ -0,0 +1 @@
+hljs.registerLanguage("n1ql",function(e){return{cI:!0,c:[{bK:"build create index delete drop explain infer|10 insert merge prepare select update upsert|10",e:/;/,eW:!0,k:{keyword:"all alter analyze and any array as asc begin between binary boolean break bucket build by call case cast cluster collate collection commit connect continue correlate cover create database dataset datastore declare decrement delete derived desc describe distinct do drop each element else end every except exclude execute exists explain fetch first flatten for force from function grant group gsi having if ignore ilike in include increment index infer inline inner insert intersect into is join key keys keyspace known last left let letting like limit lsm map mapping matched materialized merge minus namespace nest not number object offset on option or order outer over parse partition password path pool prepare primary private privilege procedure public raw realm reduce rename return returning revoke right role rollback satisfies schema select self semi set show some start statistics string system then to transaction trigger truncate under union unique unknown unnest unset update upsert use user using validate value valued values via view when where while with within work xor",literal:"true false null missing|5",built_in:"array_agg array_append array_concat array_contains array_count array_distinct array_ifnull array_length array_max array_min array_position array_prepend array_put array_range array_remove array_repeat array_replace array_reverse array_sort array_sum avg count max min sum greatest least ifmissing ifmissingornull ifnull missingif nullif ifinf ifnan ifnanorinf naninf neginfif posinfif clock_millis clock_str date_add_millis date_add_str date_diff_millis date_diff_str date_part_millis date_part_str date_trunc_millis date_trunc_str duration_to_str millis str_to_millis millis_to_str millis_to_utc millis_to_zone_name now_millis now_str str_to_duration str_to_utc str_to_zone_name decode_json encode_json encoded_size poly_length base64 base64_encode base64_decode meta uuid abs acos asin atan atan2 ceil cos degrees e exp ln log floor pi power radians random round sign sin sqrt tan trunc object_length object_names object_pairs object_inner_pairs object_values object_inner_values object_add object_put object_remove object_unwrap regexp_contains regexp_like regexp_position regexp_replace contains initcap length lower ltrim position repeat replace rtrim split substr title trim upper isarray isatom isboolean isnumber isobject isstring type toarray toatom toboolean tonumber toobject tostring"},c:[{cN:"string",b:"'",e:"'",c:[e.BE],r:0},{cN:"string",b:'"',e:'"',c:[e.BE],r:0},{cN:"symbol",b:"`",e:"`",c:[e.BE],r:2},e.CNM,e.CBCM]},e.CBCM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/nsis.js b/lib/highlight_js/assets/lang/nsis.js
index 62802cc468a..e395aa878a8 100644
--- a/lib/highlight_js/assets/lang/nsis.js
+++ b/lib/highlight_js/assets/lang/nsis.js
@@ -1 +1 @@
-hljs.registerLanguage("nsis",function(e){var t={cN:"variable",b:"\\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)"},i={cN:"variable",b:"\\$+{[a-zA-Z0-9_]+}"},n={cN:"variable",b:"\\$+[a-zA-Z0-9_]+",i:"\\(\\){}"},r={cN:"variable",b:"\\$+\\([a-zA-Z0-9_]+\\)"},l={cN:"built_in",b:"(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)"},o={cN:"keyword",b:"\\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)"};return{cI:!1,k:{keyword:"Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileSeek FileWrite FileWriteByte FileWriteUTF16LE FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI FunctionEnd GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText IntCmp IntCmpU IntFmt IntOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PageExEnd Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionEnd SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionGroupEnd SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetPluginUnload SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption SubSectionEnd Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegStr WriteUninstaller XPStyle",literal:"admin all auto both colored current false force hide highest lastused leave listonly none normal notset off on open print show silent silentlog smooth textonly true user "},c:[e.HCM,e.CBCM,{cN:"string",b:'"',e:'"',i:"\\n",c:[{b:"\\$(\\\\(n|r|t)|\\$)"},t,i,n,r]},e.C(";","$",{r:0}),{cN:"function",bK:"Function PageEx Section SectionGroup SubSection",e:"$"},o,i,n,r,l,e.NM,{b:e.IR+"::"+e.IR}]}});
\ No newline at end of file
+hljs.registerLanguage("nsis",function(e){var t={cN:"variable",b:/\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)/},i={cN:"variable",b:/\$+{[\w\.:-]+}/},n={cN:"variable",b:/\$+\w+/,i:/\(\){}/},r={cN:"variable",b:/\$+\([\w\^\.:-]+\)/},o={cN:"params",b:"(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)"},l={cN:"keyword",b:/\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)/},s={cN:"subst",b:/\$(\\[nrt]|\$)/},a={cN:"class",b:/\w+\:\:\w+/},S={cN:"string",v:[{b:'"',e:'"'},{b:"'",e:"'"},{b:"`",e:"`"}],i:/\n/,c:[s,t,i,n,r]};return{cI:!1,k:{keyword:"Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileSeek FileWrite FileWriteByte FileWriteUTF16LE FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI FunctionEnd GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText IntCmp IntCmpU IntFmt IntOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PageExEnd Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionEnd SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionGroupEnd SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegStr WriteUninstaller XPStyle",literal:"admin all auto both bottom bzip2 colored components current custom directory false force hide highest ifdiff ifnewer instfiles lastused leave left license listonly lzma nevershow none normal notset off on open print right show silent silentlog smooth textonly top true try un.components un.custom un.directory un.instfiles un.license uninstConfirm user Win10 Win7 Win8 WinVista zlib"},c:[e.HCM,e.CBCM,e.C(";","$",{r:0}),{cN:"function",bK:"Function PageEx Section SectionGroup",e:"$"},S,l,i,n,r,o,a,e.NM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/objectivec.js b/lib/highlight_js/assets/lang/objectivec.js
index bb08557282f..7dacffd3ad5 100644
--- a/lib/highlight_js/assets/lang/objectivec.js
+++ b/lib/highlight_js/assets/lang/objectivec.js
@@ -1 +1 @@
-hljs.registerLanguage("objectivec",function(e){var t={cN:"built_in",b:"(AV|CA|CF|CG|CI|MK|MP|NS|UI|XC)\\w+"},i={keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},n=/[a-zA-Z@][a-zA-Z0-9_]*/,o="@interface @class @protocol @implementation";return{aliases:["mm","objc","obj-c"],k:i,l:n,i:"</",c:[t,e.CLCM,e.CBCM,e.CNM,e.QSM,{cN:"string",v:[{b:'@"',e:'"',i:"\\n",c:[e.BE]},{b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"}]},{cN:"meta",b:"#",e:"$",c:[{cN:"meta-string",v:[{b:'"',e:'"'},{b:"<",e:">"}]}]},{cN:"class",b:"("+o.split(" ").join("|")+")\\b",e:"({|$)",eE:!0,k:o,l:n,c:[e.UTM]},{b:"\\."+e.UIR,r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("objectivec",function(e){var t={cN:"built_in",b:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},_={keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},i=/[a-zA-Z@][a-zA-Z0-9_]*/,n="@interface @class @protocol @implementation";return{aliases:["mm","objc","obj-c"],k:_,l:i,i:"</",c:[t,e.CLCM,e.CBCM,e.CNM,e.QSM,{cN:"string",v:[{b:'@"',e:'"',i:"\\n",c:[e.BE]},{b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"}]},{cN:"meta",b:"#",e:"$",c:[{cN:"meta-string",v:[{b:'"',e:'"'},{b:"<",e:">"}]}]},{cN:"class",b:"("+n.split(" ").join("|")+")\\b",e:"({|$)",eE:!0,k:n,l:i,c:[e.UTM]},{b:"\\."+e.UIR,r:0}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/oxygene.js b/lib/highlight_js/assets/lang/oxygene.js
index 51c019056cf..3fc383e610a 100644
--- a/lib/highlight_js/assets/lang/oxygene.js
+++ b/lib/highlight_js/assets/lang/oxygene.js
@@ -1 +1 @@
-hljs.registerLanguage("oxygene",function(e){var r="abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained",t=e.C("{","}",{r:0}),a=e.C("\\(\\*","\\*\\)",{r:10}),n={cN:"string",b:"'",e:"'",c:[{b:"''"}]},o={cN:"string",b:"(#\\d+)+"},i={cN:"function",bK:"function constructor destructor procedure method",e:"[:;]",k:"function constructor|10 destructor|10 procedure|10 method|10",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",k:r,c:[n,o]},t,a]};return{cI:!0,k:r,i:'("|\\$[G-Zg-z]|\\/\\*|</|=>|->)',c:[t,a,e.CLCM,n,o,e.NM,i,{cN:"class",b:"=\\bclass\\b",e:"end;",k:r,c:[n,o,t,a,e.CLCM,i]}]}});
\ No newline at end of file
+hljs.registerLanguage("oxygene",function(e){var r="abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained",t=e.C("{","}",{r:0}),a=e.C("\\(\\*","\\*\\)",{r:10}),n={cN:"string",b:"'",e:"'",c:[{b:"''"}]},o={cN:"string",b:"(#\\d+)+"},i={cN:"function",bK:"function constructor destructor procedure method",e:"[:;]",k:"function constructor|10 destructor|10 procedure|10 method|10",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",k:r,c:[n,o]},t,a]};return{cI:!0,l:/\.?\w+/,k:r,i:'("|\\$[G-Zg-z]|\\/\\*|</|=>|->)',c:[t,a,e.CLCM,n,o,e.NM,i,{cN:"class",b:"=\\bclass\\b",e:"end;",k:r,c:[n,o,t,a,e.CLCM,i]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/perl.js b/lib/highlight_js/assets/lang/perl.js
index 7498eb553aa..ba10cd2d540 100644
--- a/lib/highlight_js/assets/lang/perl.js
+++ b/lib/highlight_js/assets/lang/perl.js
@@ -1 +1 @@
-hljs.registerLanguage("perl",function(e){var t="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when",r={cN:"subst",b:"[$@]\\{",e:"\\}",k:t},s={b:"->{",e:"}"},n={v:[{b:/\$\d/},{b:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{b:/[\$%@][^\s\w{]/,r:0}]},i=[e.BE,r,n],o=[n,e.HCM,e.C("^\\=\\w","\\=cut",{eW:!0}),s,{cN:"string",c:i,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",r:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",r:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",r:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",r:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",r:5},{b:"qw\\s+q",e:"q",r:5},{b:"'",e:"'",c:[e.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[e.BE]},{b:"{\\w+}",c:[],r:0},{b:"-?\\w+\\s*\\=\\>",c:[],r:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\/\\/|"+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[e.HCM,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],r:0}]},{cN:"function",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",eE:!0,r:5,c:[e.TM]},{b:"-\\w\\b",r:0},{b:"^__DATA__$",e:"^__END__$",sL:"mojolicious",c:[{b:"^@@.*",e:"$",cN:"comment"}]}];return r.c=o,s.c=o,{aliases:["pl"],k:t,c:o}});
\ No newline at end of file
+hljs.registerLanguage("perl",function(e){var t="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when",r={cN:"subst",b:"[$@]\\{",e:"\\}",k:t},s={b:"->{",e:"}"},n={v:[{b:/\$\d/},{b:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{b:/[\$%@][^\s\w{]/,r:0}]},i=[e.BE,r,n],o=[n,e.HCM,e.C("^\\=\\w","\\=cut",{eW:!0}),s,{cN:"string",c:i,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",r:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",r:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",r:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",r:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",r:5},{b:"qw\\s+q",e:"q",r:5},{b:"'",e:"'",c:[e.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[e.BE]},{b:"{\\w+}",c:[],r:0},{b:"-?\\w+\\s*\\=\\>",c:[],r:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\/\\/|"+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[e.HCM,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],r:0}]},{cN:"function",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",eE:!0,r:5,c:[e.TM]},{b:"-\\w\\b",r:0},{b:"^__DATA__$",e:"^__END__$",sL:"mojolicious",c:[{b:"^@@.*",e:"$",cN:"comment"}]}];return r.c=o,s.c=o,{aliases:["pl","pm"],l:/[\w\.]+/,k:t,c:o}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/pf.js b/lib/highlight_js/assets/lang/pf.js
index 538736d8bda..78324487cab 100644
--- a/lib/highlight_js/assets/lang/pf.js
+++ b/lib/highlight_js/assets/lang/pf.js
@@ -1 +1 @@
-hljs.registerLanguage("pf",function(t){var o={cN:"variable",b:/\$[\w\d#@][\w\d_]*/},e={cN:"variable",b:/</,e:/>/};return{aliases:["pf.conf"],l:/[a-z0-9_<>-]+/,k:{built_in:"block match pass load anchor|5 antispoof|10 set table",keyword:"in out log quick on rdomain inet inet6 proto from port os to routeallow-opts divert-packet divert-reply divert-to flags group icmp-typeicmp6-type label once probability recieved-on rtable prio queuetos tag tagged user keep fragment for os dropaf-to|10 binat-to|10 nat-to|10 rdr-to|10 bitmask least-stats random round-robinsource-hash static-portdup-to reply-to route-toparent bandwidth default min max qlimitblock-policy debug fingerprints hostid limit loginterface optimizationreassemble ruleset-optimization basic none profile skip state-defaultsstate-policy timeoutconst counters persistno modulate synproxy state|5 floating if-bound no-sync pflow|10 sloppysource-track global rule max-src-nodes max-src-states max-src-connmax-src-conn-rate overload flushscrub|5 max-mss min-ttl no-df|10 random-id",literal:"all any no-route self urpf-failed egress|5 unknown"},c:[t.HCM,t.NM,t.QSM,o,e]}});
\ No newline at end of file
+hljs.registerLanguage("pf",function(t){var o={cN:"variable",b:/\$[\w\d#@][\w\d_]*/},e={cN:"variable",b:/<(?!\/)/,e:/>/};return{aliases:["pf.conf"],l:/[a-z0-9_<>-]+/,k:{built_in:"block match pass load anchor|5 antispoof|10 set table",keyword:"in out log quick on rdomain inet inet6 proto from port os to routeallow-opts divert-packet divert-reply divert-to flags group icmp-typeicmp6-type label once probability recieved-on rtable prio queuetos tag tagged user keep fragment for os dropaf-to|10 binat-to|10 nat-to|10 rdr-to|10 bitmask least-stats random round-robinsource-hash static-portdup-to reply-to route-toparent bandwidth default min max qlimitblock-policy debug fingerprints hostid limit loginterface optimizationreassemble ruleset-optimization basic none profile skip state-defaultsstate-policy timeoutconst counters persistno modulate synproxy state|5 floating if-bound no-sync pflow|10 sloppysource-track global rule max-src-nodes max-src-states max-src-connmax-src-conn-rate overload flushscrub|5 max-mss min-ttl no-df|10 random-id",literal:"all any no-route self urpf-failed egress|5 unknown"},c:[t.HCM,t.NM,t.QSM,o,e]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/php.js b/lib/highlight_js/assets/lang/php.js
index 0473f688b64..db73933d580 100644
--- a/lib/highlight_js/assets/lang/php.js
+++ b/lib/highlight_js/assets/lang/php.js
@@ -1 +1 @@
-hljs.registerLanguage("php",function(e){var c={b:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},a={cN:"meta",b:/<\?(php)?|\?>/},i={cN:"string",c:[e.BE,a],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},t={v:[e.BNM,e.CNM]};return{aliases:["php3","php4","php5","php6"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[e.HCM,e.C("//","$",{c:[a]}),e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:/<<<['"]?\w+['"]?$/,e:/^\w+;?$/,c:[e.BE,{cN:"subst",v:[{b:/\$\w+/},{b:/\{\$/,e:/\}/}]}]},a,c,{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",c,e.CBCM,i,t]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},i,t]}});
\ No newline at end of file
+hljs.registerLanguage("php",function(e){var c={b:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},i={cN:"meta",b:/<\?(php)?|\?>/},t={cN:"string",c:[e.BE,i],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},a={v:[e.BNM,e.CNM]};return{aliases:["php3","php4","php5","php6"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[e.HCM,e.C("//","$",{c:[i]}),e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:/<<<['"]?\w+['"]?$/,e:/^\w+;?$/,c:[e.BE,{cN:"subst",v:[{b:/\$\w+/},{b:/\{\$/,e:/\}/}]}]},i,{cN:"keyword",b:/\$this\b/},c,{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",c,e.CBCM,t,a]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},t,a]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/pony.js b/lib/highlight_js/assets/lang/pony.js
new file mode 100644
index 00000000000..05ee0958e83
--- /dev/null
+++ b/lib/highlight_js/assets/lang/pony.js
@@ -0,0 +1 @@
+hljs.registerLanguage("pony",function(e){var r={keyword:"actor addressof and as be break class compile_error compile_intrinsicconsume continue delegate digestof do else elseif embed end errorfor fun if ifdef in interface is isnt lambda let match new not objector primitive recover repeat return struct then trait try type until use var where while with xor",meta:"iso val tag trn box ref",literal:"this false true"},t={cN:"string",b:'"""',e:'"""',r:10},c={cN:"string",b:'"',e:'"',c:[e.BE]},i={cN:"string",b:"'",e:"'",c:[e.BE],r:0},n={cN:"type",b:"\\b_?[A-Z][\\w]*",r:0},s={b:e.IR+"'",r:0},a={cN:"class",bK:"class actor",e:"$",c:[e.TM,e.CLCM]},o={cN:"function",bK:"new fun",e:"=>",c:[e.TM,{b:/\(/,e:/\)/,c:[n,s,e.CNM,e.CBCM]},{b:/:/,eW:!0,c:[n]},e.CLCM]};return{k:r,c:[a,o,n,t,c,i,s,e.CNM,e.CLCM,e.CBCM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/powershell.js b/lib/highlight_js/assets/lang/powershell.js
index ce7ced70e93..d1b8efa83b6 100644
--- a/lib/highlight_js/assets/lang/powershell.js
+++ b/lib/highlight_js/assets/lang/powershell.js
@@ -1 +1 @@
-hljs.registerLanguage("powershell",function(e){var t={b:"`[\\s\\S]",r:0},r={cN:"variable",v:[{b:/\$[\w\d][\w\d_:]*/}]},o={cN:"literal",b:/\$(null|true|false)\b/},a={cN:"string",b:/"/,e:/"/,c:[t,r,{cN:"variable",b:/\$[A-z]/,e:/[^A-z]/}]},i={cN:"string",b:/'/,e:/'/};return{aliases:["ps"],l:/-?[A-z\.\-]+/,cI:!0,k:{keyword:"if else foreach return function do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch",built_in:"Add-Content Add-History Add-Member Add-PSSnapin Clear-Content Clear-Item Clear-Item Property Clear-Variable Compare-Object ConvertFrom-SecureString Convert-Path ConvertTo-Html ConvertTo-SecureString Copy-Item Copy-ItemProperty Export-Alias Export-Clixml Export-Console Export-Csv ForEach-Object Format-Custom Format-List Format-Table Format-Wide Get-Acl Get-Alias Get-AuthenticodeSignature Get-ChildItem Get-Command Get-Content Get-Credential Get-Culture Get-Date Get-EventLog Get-ExecutionPolicy Get-Help Get-History Get-Host Get-Item Get-ItemProperty Get-Location Get-Member Get-PfxCertificate Get-Process Get-PSDrive Get-PSProvider Get-PSSnapin Get-Service Get-TraceSource Get-UICulture Get-Unique Get-Variable Get-WmiObject Group-Object Import-Alias Import-Clixml Import-Csv Invoke-Expression Invoke-History Invoke-Item Join-Path Measure-Command Measure-Object Move-Item Move-ItemProperty New-Alias New-Item New-ItemProperty New-Object New-PSDrive New-Service New-TimeSpan New-Variable Out-Default Out-File Out-Host Out-Null Out-Printer Out-String Pop-Location Push-Location Read-Host Remove-Item Remove-ItemProperty Remove-PSDrive Remove-PSSnapin Remove-Variable Rename-Item Rename-ItemProperty Resolve-Path Restart-Service Resume-Service Select-Object Select-String Set-Acl Set-Alias Set-AuthenticodeSignature Set-Content Set-Date Set-ExecutionPolicy Set-Item Set-ItemProperty Set-Location Set-PSDebug Set-Service Set-TraceSource Set-Variable Sort-Object Split-Path Start-Service Start-Sleep Start-Transcript Stop-Process Stop-Service Stop-Transcript Suspend-Service Tee-Object Test-Path Trace-Command Update-FormatData Update-TypeData Where-Object Write-Debug Write-Error Write-Host Write-Output Write-Progress Write-Verbose Write-Warning",nomarkup:"-ne -eq -lt -gt -ge -le -not -like -notlike -match -notmatch -contains -notcontains -in -notin -replace"},c:[e.HCM,e.NM,a,i,o,r]}});
\ No newline at end of file
+hljs.registerLanguage("powershell",function(e){var t={b:"`[\\s\\S]",r:0},o={cN:"variable",v:[{b:/\$[\w\d][\w\d_:]*/}]},r={cN:"literal",b:/\$(null|true|false)\b/},n={cN:"string",v:[{b:/"/,e:/"/},{b:/@"/,e:/^"@/}],c:[t,o,{cN:"variable",b:/\$[A-z]/,e:/[^A-z]/}]},a={cN:"string",v:[{b:/'/,e:/'/},{b:/@'/,e:/^'@/}]},i={cN:"doctag",v:[{b:/\.(synopsis|description|example|inputs|outputs|notes|link|component|role|functionality)/},{b:/\.(parameter|forwardhelptargetname|forwardhelpcategory|remotehelprunspace|externalhelp)\s+\S+/}]},s=e.inherit(e.C(null,null),{v:[{b:/#/,e:/$/},{b:/<#/,e:/#>/}],c:[i]});return{aliases:["ps"],l:/-?[A-z\.\-]+/,cI:!0,k:{keyword:"if else foreach return function do while until elseif begin for trap data dynamicparam end break throw param continue finally in switch exit filter try process catch",built_in:"Add-Computer Add-Content Add-History Add-JobTrigger Add-Member Add-PSSnapin Add-Type Checkpoint-Computer Clear-Content Clear-EventLog Clear-History Clear-Host Clear-Item Clear-ItemProperty Clear-Variable Compare-Object Complete-Transaction Connect-PSSession Connect-WSMan Convert-Path ConvertFrom-Csv ConvertFrom-Json ConvertFrom-SecureString ConvertFrom-StringData ConvertTo-Csv ConvertTo-Html ConvertTo-Json ConvertTo-SecureString ConvertTo-Xml Copy-Item Copy-ItemProperty Debug-Process Disable-ComputerRestore Disable-JobTrigger Disable-PSBreakpoint Disable-PSRemoting Disable-PSSessionConfiguration Disable-WSManCredSSP Disconnect-PSSession Disconnect-WSMan Disable-ScheduledJob Enable-ComputerRestore Enable-JobTrigger Enable-PSBreakpoint Enable-PSRemoting Enable-PSSessionConfiguration Enable-ScheduledJob Enable-WSManCredSSP Enter-PSSession Exit-PSSession Export-Alias Export-Clixml Export-Console Export-Counter Export-Csv Export-FormatData Export-ModuleMember Export-PSSession ForEach-Object Format-Custom Format-List Format-Table Format-Wide Get-Acl Get-Alias Get-AuthenticodeSignature Get-ChildItem Get-Command Get-ComputerRestorePoint Get-Content Get-ControlPanelItem Get-Counter Get-Credential Get-Culture Get-Date Get-Event Get-EventLog Get-EventSubscriber Get-ExecutionPolicy Get-FormatData Get-Host Get-HotFix Get-Help Get-History Get-IseSnippet Get-Item Get-ItemProperty Get-Job Get-JobTrigger Get-Location Get-Member Get-Module Get-PfxCertificate Get-Process Get-PSBreakpoint Get-PSCallStack Get-PSDrive Get-PSProvider Get-PSSession Get-PSSessionConfiguration Get-PSSnapin Get-Random Get-ScheduledJob Get-ScheduledJobOption Get-Service Get-TraceSource Get-Transaction Get-TypeData Get-UICulture Get-Unique Get-Variable Get-Verb Get-WinEvent Get-WmiObject Get-WSManCredSSP Get-WSManInstance Group-Object Import-Alias Import-Clixml Import-Counter Import-Csv Import-IseSnippet Import-LocalizedData Import-PSSession Import-Module Invoke-AsWorkflow Invoke-Command Invoke-Expression Invoke-History Invoke-Item Invoke-RestMethod Invoke-WebRequest Invoke-WmiMethod Invoke-WSManAction Join-Path Limit-EventLog Measure-Command Measure-Object Move-Item Move-ItemProperty New-Alias New-Event New-EventLog New-IseSnippet New-Item New-ItemProperty New-JobTrigger New-Object New-Module New-ModuleManifest New-PSDrive New-PSSession New-PSSessionConfigurationFile New-PSSessionOption New-PSTransportOption New-PSWorkflowExecutionOption New-PSWorkflowSession New-ScheduledJobOption New-Service New-TimeSpan New-Variable New-WebServiceProxy New-WinEvent New-WSManInstance New-WSManSessionOption Out-Default Out-File Out-GridView Out-Host Out-Null Out-Printer Out-String Pop-Location Push-Location Read-Host Receive-Job Register-EngineEvent Register-ObjectEvent Register-PSSessionConfiguration Register-ScheduledJob Register-WmiEvent Remove-Computer Remove-Event Remove-EventLog Remove-Item Remove-ItemProperty Remove-Job Remove-JobTrigger Remove-Module Remove-PSBreakpoint Remove-PSDrive Remove-PSSession Remove-PSSnapin Remove-TypeData Remove-Variable Remove-WmiObject Remove-WSManInstance Rename-Computer Rename-Item Rename-ItemProperty Reset-ComputerMachinePassword Resolve-Path Restart-Computer Restart-Service Restore-Computer Resume-Job Resume-Service Save-Help Select-Object Select-String Select-Xml Send-MailMessage Set-Acl Set-Alias Set-AuthenticodeSignature Set-Content Set-Date Set-ExecutionPolicy Set-Item Set-ItemProperty Set-JobTrigger Set-Location Set-PSBreakpoint Set-PSDebug Set-PSSessionConfiguration Set-ScheduledJob Set-ScheduledJobOption Set-Service Set-StrictMode Set-TraceSource Set-Variable Set-WmiInstance Set-WSManInstance Set-WSManQuickConfig Show-Command Show-ControlPanelItem Show-EventLog Sort-Object Split-Path Start-Job Start-Process Start-Service Start-Sleep Start-Transaction Start-Transcript Stop-Computer Stop-Job Stop-Process Stop-Service Stop-Transcript Suspend-Job Suspend-Service Tee-Object Test-ComputerSecureChannel Test-Connection Test-ModuleManifest Test-Path Test-PSSessionConfigurationFile Trace-Command Unblock-File Undo-Transaction Unregister-Event Unregister-PSSessionConfiguration Unregister-ScheduledJob Update-FormatData Update-Help Update-List Update-TypeData Use-Transaction Wait-Event Wait-Job Wait-Process Where-Object Write-Debug Write-Error Write-EventLog Write-Host Write-Output Write-Progress Write-Verbose Write-Warning Add-MDTPersistentDrive Disable-MDTMonitorService Enable-MDTMonitorService Get-MDTDeploymentShareStatistics Get-MDTMonitorData Get-MDTOperatingSystemCatalog Get-MDTPersistentDrive Import-MDTApplication Import-MDTDriver Import-MDTOperatingSystem Import-MDTPackage Import-MDTTaskSequence New-MDTDatabase Remove-MDTMonitorData Remove-MDTPersistentDrive Restore-MDTPersistentDrive Set-MDTMonitorData Test-MDTDeploymentShare Test-MDTMonitorData Update-MDTDatabaseSchema Update-MDTDeploymentShare Update-MDTLinkedDS Update-MDTMedia Update-MDTMedia Add-VamtProductKey Export-VamtData Find-VamtManagedMachine Get-VamtConfirmationId Get-VamtProduct Get-VamtProductKey Import-VamtData Initialize-VamtData Install-VamtConfirmationId Install-VamtProductActivation Install-VamtProductKey Update-VamtProduct",nomarkup:"-ne -eq -lt -gt -ge -le -not -like -notlike -match -notmatch -contains -notcontains -in -notin -replace"},c:[t,e.NM,n,a,r,o,s]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/protobuf.js b/lib/highlight_js/assets/lang/protobuf.js
index 2eb6a85d3f4..74085a9dbd6 100644
--- a/lib/highlight_js/assets/lang/protobuf.js
+++ b/lib/highlight_js/assets/lang/protobuf.js
@@ -1 +1 @@
-hljs.registerLanguage("protobuf",function(e){return{k:{keyword:"package import option optional required repeated group",built_in:"double float int32 int64 uint32 uint64 sint32 sint64 fixed32 fixed64 sfixed32 sfixed64 bool string bytes",literal:"true false"},c:[e.QSM,e.NM,e.CLCM,{cN:"class",bK:"message enum service",e:/\{/,i:/\n/,c:[e.inherit(e.TM,{starts:{eW:!0,eE:!0}})]},{cN:"function",bK:"rpc",e:/;/,eE:!0,k:"rpc returns"},{b:/^\s*[A-Z_]+/,e:/\s*=/,eE:!0}]}});
\ No newline at end of file
+hljs.registerLanguage("protobuf",function(e){return{k:{keyword:"package import option optional required repeated group oneof",built_in:"double float int32 int64 uint32 uint64 sint32 sint64 fixed32 fixed64 sfixed32 sfixed64 bool string bytes",literal:"true false"},c:[e.QSM,e.NM,e.CLCM,{cN:"class",bK:"message enum service",e:/\{/,i:/\n/,c:[e.inherit(e.TM,{starts:{eW:!0,eE:!0}})]},{cN:"function",bK:"rpc",e:/;/,eE:!0,k:"rpc returns"},{b:/^\s*[A-Z_]+/,e:/\s*=/,eE:!0}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/purebasic.js b/lib/highlight_js/assets/lang/purebasic.js
new file mode 100644
index 00000000000..41bef569f23
--- /dev/null
+++ b/lib/highlight_js/assets/lang/purebasic.js
@@ -0,0 +1 @@
+hljs.registerLanguage("purebasic",function(e){var r={cN:"string",b:'(~)?"',e:'"',i:"\\n"},t={cN:"symbol",b:"#[a-zA-Z_]\\w*\\$?"};return{aliases:["pb","pbi"],k:"And As Break CallDebugger Case CompilerCase CompilerDefault CompilerElse CompilerEndIf CompilerEndSelect CompilerError CompilerIf CompilerSelect Continue Data DataSection EndDataSection Debug DebugLevel Default Define Dim DisableASM DisableDebugger DisableExplicit Else ElseIf EnableASM EnableDebugger EnableExplicit End EndEnumeration EndIf EndImport EndInterface EndMacro EndProcedure EndSelect EndStructure EndStructureUnion EndWith Enumeration Extends FakeReturn For Next ForEach ForEver Global Gosub Goto If Import ImportC IncludeBinary IncludeFile IncludePath Interface Macro NewList Not Or ProcedureReturn Protected Prototype PrototypeC Read ReDim Repeat Until Restore Return Select Shared Static Step Structure StructureUnion Swap To Wend While With XIncludeFile XOr Procedure ProcedureC ProcedureCDLL ProcedureDLL Declare DeclareC DeclareCDLL DeclareDLL",c:[e.C(";","$",{r:0}),{cN:"function",b:"\\b(Procedure|Declare)(C|CDLL|DLL)?\\b",e:"\\(",eE:!0,rB:!0,c:[{cN:"keyword",b:"(Procedure|Declare)(C|CDLL|DLL)?",eE:!0},{cN:"type",b:"\\.\\w*"},e.UTM]},r,t]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/python.js b/lib/highlight_js/assets/lang/python.js
index d0975816b9d..62cb0717367 100644
--- a/lib/highlight_js/assets/lang/python.js
+++ b/lib/highlight_js/assets/lang/python.js
@@ -1 +1 @@
-hljs.registerLanguage("python",function(e){var r={cN:"meta",b:/^(>>>|\.\.\.) /},b={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[r],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[r],r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]},a={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},l={cN:"params",b:/\(/,e:/\)/,c:["self",r,a,b]};return{aliases:["py","gyp"],k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},i:/(<\/|->|\?)/,c:[r,a,b,e.HCM,{v:[{cN:"function",bK:"def",r:10},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,l,{b:/->/,eW:!0,k:"None"}]},{cN:"meta",b:/^[\t ]*@/,e:/$/},{b:/\b(print|exec)\(/}]}});
\ No newline at end of file
+hljs.registerLanguage("python",function(e){var r={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},b={cN:"meta",b:/^(>>>|\.\.\.) /},c={cN:"subst",b:/\{/,e:/\}/,k:r,i:/#/},a={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[b],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[b],r:10},{b:/(fr|rf|f)'''/,e:/'''/,c:[b,c]},{b:/(fr|rf|f)"""/,e:/"""/,c:[b,c]},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},{b:/(fr|rf|f)'/,e:/'/,c:[c]},{b:/(fr|rf|f)"/,e:/"/,c:[c]},e.ASM,e.QSM]},s={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},i={cN:"params",b:/\(/,e:/\)/,c:["self",b,s,a]};return c.c=[a,s,b],{aliases:["py","gyp"],k:r,i:/(<\/|->|\?)|=>/,c:[b,s,a,e.HCM,{v:[{cN:"function",bK:"def"},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,i,{b:/->/,eW:!0,k:"None"}]},{cN:"meta",b:/^[\t ]*@/,e:/$/},{b:/\b(print|exec)\(/}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/qml.js b/lib/highlight_js/assets/lang/qml.js
index dfe215cfa86..01d36c1343b 100644
--- a/lib/highlight_js/assets/lang/qml.js
+++ b/lib/highlight_js/assets/lang/qml.js
@@ -1 +1 @@
-hljs.registerLanguage("qml",function(r){var e={keyword:"in of on if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await import",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Behavior bool color coordinate date double enumeration font geocircle georectangle geoshape int list matrix4x4 parent point quaternion real rect size string url var variant vector2d vector3d vector4dPromise"},t="[a-zA-Z_][a-zA-Z0-9\\._]*",a={cN:"keyword",b:"\\bproperty\\b",starts:{cN:"string",e:"(:|=|;|,|//|/\\*|$)",rE:!0}},n={cN:"keyword",b:"\\bsignal\\b",starts:{cN:"string",e:"(\\(|:|=|;|,|//|/\\*|$)",rE:!0}},o={cN:"attribute",b:"\\bid\\s*:",starts:{cN:"string",e:t,rE:!1}},i={b:t+"\\s*:",rB:!0,c:[{cN:"attribute",b:t,e:"\\s*:",eE:!0,r:0}],r:0},c={b:t+"\\s*{",e:"{",rB:!0,r:0,c:[r.inherit(r.TM,{b:t})]};return{aliases:["qt"],cI:!1,k:e,c:[{cN:"meta",b:/^\s*['"]use (strict|asm)['"]/},r.ASM,r.QSM,{cN:"string",b:"`",e:"`",c:[r.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},r.CLCM,r.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:r.CNR}],r:0},{b:"("+r.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[r.CLCM,r.CBCM,r.RM,{b:/</,e:/>\s*[);\]]/,r:0,sL:"xml"}],r:0},n,a,{cN:"function",bK:"function",e:/\{/,eE:!0,c:[r.inherit(r.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[r.CLCM,r.CBCM]}],i:/\[|%/},{b:"\\."+r.IR,r:0},o,i,c],i:/#/}});
\ No newline at end of file
+hljs.registerLanguage("qml",function(r){var e={keyword:"in of on if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await import",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Behavior bool color coordinate date double enumeration font geocircle georectangle geoshape int list matrix4x4 parent point quaternion real rect size string url variant vector2d vector3d vector4dPromise"},t="[a-zA-Z_][a-zA-Z0-9\\._]*",a={cN:"keyword",b:"\\bproperty\\b",starts:{cN:"string",e:"(:|=|;|,|//|/\\*|$)",rE:!0}},n={cN:"keyword",b:"\\bsignal\\b",starts:{cN:"string",e:"(\\(|:|=|;|,|//|/\\*|$)",rE:!0}},o={cN:"attribute",b:"\\bid\\s*:",starts:{cN:"string",e:t,rE:!1}},i={b:t+"\\s*:",rB:!0,c:[{cN:"attribute",b:t,e:"\\s*:",eE:!0,r:0}],r:0},c={b:t+"\\s*{",e:"{",rB:!0,r:0,c:[r.inherit(r.TM,{b:t})]};return{aliases:["qt"],cI:!1,k:e,c:[{cN:"meta",b:/^\s*['"]use (strict|asm)['"]/},r.ASM,r.QSM,{cN:"string",b:"`",e:"`",c:[r.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},r.CLCM,r.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:r.CNR}],r:0},{b:"("+r.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[r.CLCM,r.CBCM,r.RM,{b:/</,e:/>\s*[);\]]/,r:0,sL:"xml"}],r:0},n,a,{cN:"function",bK:"function",e:/\{/,eE:!0,c:[r.inherit(r.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[r.CLCM,r.CBCM]}],i:/\[|%/},{b:"\\."+r.IR,r:0},o,i,c],i:/#/}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/routeros.js b/lib/highlight_js/assets/lang/routeros.js
new file mode 100644
index 00000000000..5ecbcb6d017
--- /dev/null
+++ b/lib/highlight_js/assets/lang/routeros.js
@@ -0,0 +1 @@
+hljs.registerLanguage("routeros",function(e){var r="foreach do while for if from to step else on-error and or not in",i="global local beep delay put len typeof pick log time set find environment terminal error execute parse resolve toarray tobool toid toip toip6 tonum tostr totime",o="add remove enable disable set get print export edit find run debug error info warning",t="true false yes no nothing nil null",s="traffic-flow traffic-generator firewall scheduler aaa accounting address-list address align area bandwidth-server bfd bgp bridge client clock community config connection console customer default dhcp-client dhcp-server discovery dns e-mail ethernet filter firewall firmware gps graphing group hardware health hotspot identity igmp-proxy incoming instance interface ip ipsec ipv6 irq l2tp-server lcd ldp logging mac-server mac-winbox mangle manual mirror mme mpls nat nd neighbor network note ntp ospf ospf-v3 ovpn-server page peer pim ping policy pool port ppp pppoe-client pptp-server prefix profile proposal proxy queue radius resource rip ripng route routing screen script security-profiles server service service-port settings shares smb sms sniffer snmp snooper socks sstp-server system tool tracking type upgrade upnp user-manager users user vlan secret vrrp watchdog web-access wireless pptp pppoe lan wan layer7-protocol lease simple raw",n={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},p={cN:"string",b:/"/,e:/"/,c:[e.BE,n,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["routeros","mikrotik"],cI:!0,l:/:?[\w-]+/,k:{literal:t,keyword:r+" :"+r.split(" ").join(" :")+" :"+i.split(" ").join(" :")},c:[{v:[{b:/^@/,e:/$/},{b:/\/\*/,e:/\*\//},{b:/%%/,e:/$/},{b:/^'/,e:/$/},{b:/^\s*\/[\w-]+=/,e:/$/},{b:/\/\//,e:/$/},{b:/^\[\</,e:/\>\]$/},{b:/<\//,e:/>/},{b:/^facet /,e:/\}/},{b:"^1\\.\\.(\\d+)$",e:/$/}],i:/./},e.C("^#","$"),p,a,n,{b:/[\w-]+\=([^\s\{\}\[\]\(\)]+)/,r:0,rB:!0,c:[{cN:"attribute",b:/[^=]+/},{b:/=/,eW:!0,r:0,c:[p,a,n,{cN:"literal",b:"\\b("+t.split(" ").join("|")+")\\b"},{b:/("[^"]*"|[^\s\{\}\[\]]+)/}]}]},{cN:"number",b:/\*[0-9a-fA-F]+/},{b:"\\b("+o.split(" ").join("|")+")([\\s[(]|])",rB:!0,c:[{cN:"builtin-name",b:/\w+/}]},{cN:"built_in",v:[{b:"(\\.\\./|/|\\s)(("+s.split(" ").join("|")+");?\\s)+",r:10},{b:/\.\./}]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/ruby.js b/lib/highlight_js/assets/lang/ruby.js
index d6fd44385c0..7b5a93e66d9 100644
--- a/lib/highlight_js/assets/lang/ruby.js
+++ b/lib/highlight_js/assets/lang/ruby.js
@@ -1 +1 @@
-hljs.registerLanguage("ruby",function(e){var r="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:b},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:b},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:r}),i].concat(s)},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":",c:[t,{b:r}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"("+e.RSR+")\\s*",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",w=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:b,i:/\/\*/,c:s.concat(w).concat(d)}});
\ No newline at end of file
+hljs.registerLanguage("ruby",function(e){var b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<(-?)\w+$/,e:/^\s*\w+$/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:b}),i].concat(s)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:b}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:r},{b:"("+e.RSR+"|unless)\\s*",k:"unless",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",w=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:s.concat(w).concat(d)}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/rust.js b/lib/highlight_js/assets/lang/rust.js
index 0aec9695862..776c7e429d3 100644
--- a/lib/highlight_js/assets/lang/rust.js
+++ b/lib/highlight_js/assets/lang/rust.js
@@ -1 +1 @@
-hljs.registerLanguage("rust",function(e){var t="([uif](8|16|32|64|size))?",r=e.inherit(e.CBCM);r.c.push("self");var n="Copy Send Sized Sync Drop Fn FnMut FnOnce drop Box ToOwned Clone PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator Option Result SliceConcatExt String ToString Vec assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules!";return{aliases:["rs"],k:{keyword:"alignof as be box break const continue crate do else enum extern false fn for if impl in let loop match mod mut offsetof once priv proc pub pure ref return self Self sizeof static struct super trait true type typeof unsafe unsized use virtual while where yield int i8 i16 i32 i64 uint u8 u32 u64 float f32 f64 str char bool",literal:"true false Some None Ok Err",built_in:n},l:e.IR+"!?",i:"</",c:[e.CLCM,r,e.inherit(e.QSM,{b:/b?"/,i:null}),{cN:"string",v:[{b:/r(#*)".*?"\1(?!#)/},{b:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{cN:"symbol",b:/'[a-zA-Z_][a-zA-Z0-9_]*/},{cN:"number",v:[{b:"\\b0b([01_]+)"+t},{b:"\\b0o([0-7_]+)"+t},{b:"\\b0x([A-Fa-f0-9_]+)"+t},{b:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+t}],r:0},{cN:"function",bK:"fn",e:"(\\(|<)",eE:!0,c:[e.UTM]},{cN:"meta",b:"#\\!?\\[",e:"\\]",c:[{cN:"meta-string",b:/"/,e:/"/}]},{cN:"class",bK:"type",e:";",c:[e.inherit(e.UTM,{endsParent:!0})],i:"\\S"},{cN:"class",bK:"trait enum struct",e:"{",c:[e.inherit(e.UTM,{endsParent:!0})],i:"[\\w\\d]"},{b:e.IR+"::",k:{built_in:n}},{b:"->"}]}});
\ No newline at end of file
+hljs.registerLanguage("rust",function(e){var t="([ui](8|16|32|64|128|size)|f(32|64))?",r="alignof as be box break const continue crate do else enum extern false fn for if impl in let loop match mod mut offsetof once priv proc pub pure ref return self Self sizeof static struct super trait true type typeof unsafe unsized use virtual while where yield move default",n="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{aliases:["rs"],k:{keyword:r,literal:"true false Some None Ok Err",built_in:n},l:e.IR+"!?",i:"</",c:[e.CLCM,e.C("/\\*","\\*/",{c:["self"]}),e.inherit(e.QSM,{b:/b?"/,i:null}),{cN:"string",v:[{b:/r(#*)"(.|\n)*?"\1(?!#)/},{b:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{cN:"symbol",b:/'[a-zA-Z_][a-zA-Z0-9_]*/},{cN:"number",v:[{b:"\\b0b([01_]+)"+t},{b:"\\b0o([0-7_]+)"+t},{b:"\\b0x([A-Fa-f0-9_]+)"+t},{b:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+t}],r:0},{cN:"function",bK:"fn",e:"(\\(|<)",eE:!0,c:[e.UTM]},{cN:"meta",b:"#\\!?\\[",e:"\\]",c:[{cN:"meta-string",b:/"/,e:/"/}]},{cN:"class",bK:"type",e:";",c:[e.inherit(e.UTM,{endsParent:!0})],i:"\\S"},{cN:"class",bK:"trait enum struct union",e:"{",c:[e.inherit(e.UTM,{endsParent:!0})],i:"[\\w\\d]"},{b:e.IR+"::",k:{built_in:n}},{b:"->"}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/scheme.js b/lib/highlight_js/assets/lang/scheme.js
index 64e8be48d39..a5e82d11641 100644
--- a/lib/highlight_js/assets/lang/scheme.js
+++ b/lib/highlight_js/assets/lang/scheme.js
@@ -1 +1 @@
-hljs.registerLanguage("scheme",function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",r="(\\-|\\+)?\\d+([./]\\d+)?",a=r+"[+\\-]"+r+"i",i={"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"},n={cN:"meta",b:"^#!",e:"$"},c={cN:"literal",b:"(#t|#f|#\\\\"+t+"|#\\\\.)"},l={cN:"number",v:[{b:r,r:0},{b:a,r:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},s=e.QSM,o=[e.C(";","$",{r:0}),e.C("#\\|","\\|#")],u={b:t,r:0},p={cN:"symbol",b:"'"+t},d={eW:!0,r:0},m={b:/'/,c:[{b:"\\(",e:"\\)",c:["self",c,s,l,u,p]}]},g={cN:"name",b:t,l:t,k:i},h={b:/lambda/,eW:!0,rB:!0,c:[g,{b:/\(/,e:/\)/,endsParent:!0,c:[u]}]},b={v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}],c:[h,g,d]};return d.c=[c,l,s,u,p,m,b].concat(o),{i:/\S/,c:[n,l,s,p,m,b].concat(o)}});
\ No newline at end of file
+hljs.registerLanguage("scheme",function(e){var t="[^\\(\\)\\[\\]\\{\\}\",'`;#|\\\\\\s]+",r="(\\-|\\+)?\\d+([./]\\d+)?",a=r+"[+\\-]"+r+"i",i={"builtin-name":"case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules ' * + , ,@ - ... / ; < <= = => > >= ` abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"},n={cN:"meta",b:"^#!",e:"$"},c={cN:"literal",b:"(#t|#f|#\\\\"+t+"|#\\\\.)"},l={cN:"number",v:[{b:r,r:0},{b:a,r:0},{b:"#b[0-1]+(/[0-1]+)?"},{b:"#o[0-7]+(/[0-7]+)?"},{b:"#x[0-9a-f]+(/[0-9a-f]+)?"}]},s=e.QSM,o=[e.C(";","$",{r:0}),e.C("#\\|","\\|#")],u={b:t,r:0},p={cN:"symbol",b:"'"+t},d={eW:!0,r:0},m={v:[{b:/'/},{b:"`"}],c:[{b:"\\(",e:"\\)",c:["self",c,s,l,u,p]}]},g={cN:"name",b:t,l:t,k:i},h={b:/lambda/,eW:!0,rB:!0,c:[g,{b:/\(/,e:/\)/,endsParent:!0,c:[u]}]},b={v:[{b:"\\(",e:"\\)"},{b:"\\[",e:"\\]"}],c:[h,g,d]};return d.c=[c,l,s,u,p,m,b].concat(o),{i:/\S/,c:[n,l,s,p,m,b].concat(o)}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/shell.js b/lib/highlight_js/assets/lang/shell.js
new file mode 100644
index 00000000000..5ebb125ddcf
--- /dev/null
+++ b/lib/highlight_js/assets/lang/shell.js
@@ -0,0 +1 @@
+hljs.registerLanguage("shell",function(s){return{aliases:["console"],c:[{cN:"meta",b:"^\\s{0,3}[\\w\\d\\[\\]()@-]*[>%$#]",starts:{e:"$",sL:"bash"}}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/sqf.js b/lib/highlight_js/assets/lang/sqf.js
index ea1d3a6fd8e..3f06585a3ba 100644
--- a/lib/highlight_js/assets/lang/sqf.js
+++ b/lib/highlight_js/assets/lang/sqf.js
@@ -1 +1 @@
-hljs.registerLanguage("sqf",function(e){var t=["!","-","+","!=","%","&&","*","/","=","==",">",">=","<","<=","or","plus","^",":",">>","abs","accTime","acos","action","actionKeys","actionKeysImages","actionKeysNames","actionKeysNamesArray","actionName","activateAddons","activatedAddons","activateKey","addAction","addBackpack","addBackpackCargo","addBackpackCargoGlobal","addBackpackGlobal","addCamShake","addCuratorAddons","addCuratorCameraArea","addCuratorEditableObjects","addCuratorEditingArea","addCuratorPoints","addEditorObject","addEventHandler","addGoggles","addGroupIcon","addHandgunItem","addHeadgear","addItem","addItemCargo","addItemCargoGlobal","addItemPool","addItemToBackpack","addItemToUniform","addItemToVest","addLiveStats","addMagazine","addMagazine array","addMagazineAmmoCargo","addMagazineCargo","addMagazineCargoGlobal","addMagazineGlobal","addMagazinePool","addMagazines","addMagazineTurret","addMenu","addMenuItem","addMissionEventHandler","addMPEventHandler","addMusicEventHandler","addPrimaryWeaponItem","addPublicVariableEventHandler","addRating","addResources","addScore","addScoreSide","addSecondaryWeaponItem","addSwitchableUnit","addTeamMember","addToRemainsCollector","addUniform","addVehicle","addVest","addWaypoint","addWeapon","addWeaponCargo","addWeaponCargoGlobal","addWeaponGlobal","addWeaponPool","addWeaponTurret","agent","agents","AGLToASL","aimedAtTarget","aimPos","airDensityRTD","airportSide","AISFinishHeal","alive","allControls","allCurators","allDead","allDeadMen","allDisplays","allGroups","allMapMarkers","allMines","allMissionObjects","allow3DMode","allowCrewInImmobile","allowCuratorLogicIgnoreAreas","allowDamage","allowDammage","allowFileOperations","allowFleeing","allowGetIn","allPlayers","allSites","allTurrets","allUnits","allUnitsUAV","allVariables","ammo","and","animate","animateDoor","animationPhase","animationState","append","armoryPoints","arrayIntersect","asin","ASLToAGL","ASLToATL","assert","assignAsCargo","assignAsCargoIndex","assignAsCommander","assignAsDriver","assignAsGunner","assignAsTurret","assignCurator","assignedCargo","assignedCommander","assignedDriver","assignedGunner","assignedItems","assignedTarget","assignedTeam","assignedVehicle","assignedVehicleRole","assignItem","assignTeam","assignToAirport","atan","atan2","atg","ATLToASL","attachedObject","attachedObjects","attachedTo","attachObject","attachTo","attackEnabled","backpack","backpackCargo","backpackContainer","backpackItems","backpackMagazines","backpackSpaceFor","behaviour","benchmark","binocular","blufor","boundingBox","boundingBoxReal","boundingCenter","breakOut","breakTo","briefingName","buildingExit","buildingPos","buttonAction","buttonSetAction","cadetMode","call","callExtension","camCommand","camCommit","camCommitPrepared","camCommitted","camConstuctionSetParams","camCreate","camDestroy","cameraEffect","cameraEffectEnableHUD","cameraInterest","cameraOn","cameraView","campaignConfigFile","camPreload","camPreloaded","camPrepareBank","camPrepareDir","camPrepareDive","camPrepareFocus","camPrepareFov","camPrepareFovRange","camPreparePos","camPrepareRelPos","camPrepareTarget","camSetBank","camSetDir","camSetDive","camSetFocus","camSetFov","camSetFovRange","camSetPos","camSetRelPos","camSetTarget","camTarget","camUseNVG","canAdd","canAddItemToBackpack","canAddItemToUniform","canAddItemToVest","cancelSimpleTaskDestination","canFire","canMove","canSlingLoad","canStand","canUnloadInCombat","captive","captiveNum","case","catch","cbChecked","cbSetChecked","ceil","cheatsEnabled","checkAIFeature","civilian","className","clearAllItemsFromBackpack","clearBackpackCargo","clearBackpackCargoGlobal","clearGroupIcons","clearItemCargo","clearItemCargoGlobal","clearItemPool","clearMagazineCargo","clearMagazineCargoGlobal","clearMagazinePool","clearOverlay","clearRadio","clearWeaponCargo","clearWeaponCargoGlobal","clearWeaponPool","closeDialog","closeDisplay","closeOverlay","collapseObjectTree","combatMode","commandArtilleryFire","commandChat","commander","commandFire","commandFollow","commandFSM","commandGetOut","commandingMenu","commandMove","commandRadio","commandStop","commandTarget","commandWatch","comment","commitOverlay","compile","compileFinal","completedFSM","composeText","configClasses","configFile","configHierarchy","configName","configProperties","configSourceMod","configSourceModList","connectTerminalToUAV","controlNull","controlsGroupCtrl","copyFromClipboard","copyToClipboard","copyWaypoints","cos","count","countEnemy","countFriendly","countSide","countType","countUnknown","createAgent","createCenter","createDialog","createDiaryLink","createDiaryRecord","createDiarySubject","createDisplay","createGearDialog","createGroup","createGuardedPoint","createLocation","createMarker","createMarkerLocal","createMenu","createMine","createMissionDisplay","createSimpleTask","createSite","createSoundSource","createTask","createTeam","createTrigger","createUnit","createUnit array","createVehicle","createVehicle array","createVehicleCrew","createVehicleLocal","crew","ctrlActivate","ctrlAddEventHandler","ctrlAutoScrollDelay","ctrlAutoScrollRewind","ctrlAutoScrollSpeed","ctrlChecked","ctrlClassName","ctrlCommit","ctrlCommitted","ctrlCreate","ctrlDelete","ctrlEnable","ctrlEnabled","ctrlFade","ctrlHTMLLoaded","ctrlIDC","ctrlIDD","ctrlMapAnimAdd","ctrlMapAnimClear","ctrlMapAnimCommit","ctrlMapAnimDone","ctrlMapCursor","ctrlMapMouseOver","ctrlMapScale","ctrlMapScreenToWorld","ctrlMapWorldToScreen","ctrlModel","ctrlModelDirAndUp","ctrlModelScale","ctrlParent","ctrlPosition","ctrlRemoveAllEventHandlers","ctrlRemoveEventHandler","ctrlScale","ctrlSetActiveColor","ctrlSetAutoScrollDelay","ctrlSetAutoScrollRewind","ctrlSetAutoScrollSpeed","ctrlSetBackgroundColor","ctrlSetChecked","ctrlSetEventHandler","ctrlSetFade","ctrlSetFocus","ctrlSetFont","ctrlSetFontH1","ctrlSetFontH1B","ctrlSetFontH2","ctrlSetFontH2B","ctrlSetFontH3","ctrlSetFontH3B","ctrlSetFontH4","ctrlSetFontH4B","ctrlSetFontH5","ctrlSetFontH5B","ctrlSetFontH6","ctrlSetFontH6B","ctrlSetFontHeight","ctrlSetFontHeightH1","ctrlSetFontHeightH2","ctrlSetFontHeightH3","ctrlSetFontHeightH4","ctrlSetFontHeightH5","ctrlSetFontHeightH6","ctrlSetFontP","ctrlSetFontPB","ctrlSetForegroundColor","ctrlSetModel","ctrlSetModelDirAndUp","ctrlSetModelScale","ctrlSetPosition","ctrlSetScale","ctrlSetStructuredText","ctrlSetText","ctrlSetTextColor","ctrlSetTooltip","ctrlSetTooltipColorBox","ctrlSetTooltipColorShade","ctrlSetTooltipColorText","ctrlShow","ctrlShown","ctrlText","ctrlTextHeight","ctrlType","ctrlVisible","curatorAddons","curatorCamera","curatorCameraArea","curatorCameraAreaCeiling","curatorCoef","curatorEditableObjects","curatorEditingArea","curatorEditingAreaType","curatorMouseOver","curatorPoints","curatorRegisteredObjects","curatorSelected","curatorWaypointCost","currentChannel","currentCommand","currentMagazine","currentMagazineDetail","currentMagazineDetailTurret","currentMagazineTurret","currentMuzzle","currentNamespace","currentTask","currentTasks","currentThrowable","currentVisionMode","currentWaypoint","currentWeapon","currentWeaponMode","currentWeaponTurret","currentZeroing","cursorTarget","customChat","customRadio","cutFadeOut","cutObj","cutRsc","cutText","damage","date","dateToNumber","daytime","deActivateKey","debriefingText","debugFSM","debugLog","default","deg","deleteAt","deleteCenter","deleteCollection","deleteEditorObject","deleteGroup","deleteIdentity","deleteLocation","deleteMarker","deleteMarkerLocal","deleteRange","deleteResources","deleteSite","deleteStatus","deleteTeam","deleteVehicle","deleteVehicleCrew","deleteWaypoint","detach","detectedMines","diag activeMissionFSMs","diag activeSQFScripts","diag activeSQSScripts","diag captureFrame","diag captureSlowFrame","diag fps","diag fpsMin","diag frameNo","diag log","diag logSlowFrame","diag tickTime","dialog","diarySubjectExists","didJIP","didJIPOwner","difficulty","difficultyEnabled","difficultyEnabledRTD","direction","directSay","disableAI","disableCollisionWith","disableConversation","disableDebriefingStats","disableSerialization","disableTIEquipment","disableUAVConnectability","disableUserInput","displayAddEventHandler","displayCtrl","displayNull","displayRemoveAllEventHandlers","displayRemoveEventHandler","displaySetEventHandler","dissolveTeam","distance","distance2D","distanceSqr","distributionRegion","do","doArtilleryFire","doFire","doFollow","doFSM","doGetOut","doMove","doorPhase","doStop","doTarget","doWatch","drawArrow","drawEllipse","drawIcon","drawIcon3D","drawLine","drawLine3D","drawLink","drawLocation","drawRectangle","driver","drop","east","echo","editObject","editorSetEventHandler","effectiveCommander","else","emptyPositions","enableAI","enableAIFeature","enableAttack","enableCamShake","enableCaustics","enableCollisionWith","enableCopilot","enableDebriefingStats","enableDiagLegend","enableEndDialog","enableEngineArtillery","enableEnvironment","enableFatigue","enableGunLights","enableIRLasers","enableMimics","enablePersonTurret","enableRadio","enableReload","enableRopeAttach","enableSatNormalOnDetail","enableSaving","enableSentences","enableSimulation","enableSimulationGlobal","enableTeamSwitch","enableUAVConnectability","enableUAVWaypoints","endLoadingScreen","endMission","engineOn","enginesIsOnRTD","enginesRpmRTD","enginesTorqueRTD","entities","estimatedEndServerTime","estimatedTimeLeft","evalObjectArgument","everyBackpack","everyContainer","exec","execEditorScript","execFSM","execVM","exit","exitWith","exp","expectedDestination","eyeDirection","eyePos","face","faction","fadeMusic","fadeRadio","fadeSound","fadeSpeech","failMission","false","fillWeaponsFromPool","find","findCover","findDisplay","findEditorObject","findEmptyPosition","findEmptyPositionReady","findNearestEnemy","finishMissionInit","finite","fire","fireAtTarget","firstBackpack","flag","flagOwner","fleeing","floor","flyInHeight","fog","fogForecast","fogParams","for","forceAddUniform","forceEnd","forceMap","forceRespawn","forceSpeed","forceWalk","forceWeaponFire","forceWeatherChange","forEach","forEachMember","forEachMemberAgent","forEachMemberTeam","format","formation","formationDirection","formationLeader","formationMembers","formationPosition","formationTask","formatText","formLeader","freeLook","from","fromEditor","fuel","fullCrew","gearSlotAmmoCount","gearSlotData","getAllHitPointsDamage","getAmmoCargo","getArray","getArtilleryAmmo","getArtilleryComputerSettings","getArtilleryETA","getAssignedCuratorLogic","getAssignedCuratorUnit","getBackpackCargo","getBleedingRemaining","getBurningValue","getCargoIndex","getCenterOfMass","getClientState","getConnectedUAV","getDammage","getDescription","getDir","getDirVisual","getDLCs","getEditorCamera","getEditorMode","getEditorObjectScope","getElevationOffset","getFatigue","getFriend","getFSMVariable","getFuelCargo","getGroupIcon","getGroupIconParams","getGroupIcons","getHideFrom","getHit","getHitIndex","getHitPointDamage","getItemCargo","getMagazineCargo","getMarkerColor","getMarkerPos","getMarkerSize","getMarkerType","getMass","getModelInfo","getNumber","getObjectArgument","getObjectChildren","getObjectDLC","getObjectMaterials","getObjectProxy","getObjectTextures","getObjectType","getObjectViewDistance","getOxygenRemaining","getPersonUsedDLCs","getPlayerChannel","getPlayerUID","getPos","getPosASL","getPosASLVisual","getPosASLW","getPosATL","getPosATLVisual","getPosVisual","getPosWorld","getRepairCargo","getResolution","getShadowDistance","getSlingLoad","getSpeed","getSuppression","getTerrainHeightASL","getText","getVariable","getWeaponCargo","getWPPos","glanceAt","globalChat","globalRadio","goggles","goto","group","groupChat","groupFromNetId","groupIconSelectable","groupIconsVisible","groupId","groupOwner","groupRadio","groupSelectedUnits","groupSelectUnit","grpNull","gunner","gusts","halt","handgunItems","handgunMagazine","handgunWeapon","handsHit","hasInterface","hasWeapon","hcAllGroups","hcGroupParams","hcLeader","hcRemoveAllGroups","hcRemoveGroup","hcSelected","hcSelectGroup","hcSetGroup","hcShowBar","hcShownBar","headgear","hideBody","hideObject","hideObjectGlobal","hint","hintC","hintCadet","hintSilent","hmd","hostMission","htmlLoad","HUDMovementLevels","humidity","if","image","importAllGroups","importance","in","incapacitatedState","independent","inflame","inflamed","inGameUISetEventHandler","inheritsFrom","initAmbientLife","inputAction","inRangeOfArtillery","insertEditorObject","intersect","isAbleToBreathe","isAgent","isArray","isAutoHoverOn","isAutonomous","isAutotest","isBleeding","isBurning","isClass","isCollisionLightOn","isCopilotEnabled","isDedicated","isDLCAvailable","isEngineOn","isEqualTo","isFlashlightOn","isFlatEmpty","isForcedWalk","isFormationLeader","isHidden","isInRemainsCollector","isInstructorFigureEnabled","isIRLaserOn","isKeyActive","isKindOf","isLightOn","isLocalized","isManualFire","isMarkedForCollection","isMultiplayer","isNil","isNull","isNumber","isObjectHidden","isObjectRTD","isOnRoad","isPipEnabled","isPlayer","isRealTime","isServer","isShowing3DIcons","isSteamMission","isStreamFriendlyUIEnabled","isText","isTouchingGround","isTurnedOut","isTutHintsEnabled","isUAVConnectable","isUAVConnected","isUniformAllowed","isWalking","isWeaponDeployed","isWeaponRested","itemCargo","items","itemsWithMagazines","join","joinAs","joinAsSilent","joinSilent","joinString","kbAddDatabase","kbAddDatabaseTargets","kbAddTopic","kbHasTopic","kbReact","kbRemoveTopic","kbTell","kbWasSaid","keyImage","keyName","knowsAbout","land","landAt","landResult","language","laserTarget","lbAdd","lbClear","lbColor","lbCurSel","lbData","lbDelete","lbIsSelected","lbPicture","lbSelection","lbSetColor","lbSetCurSel","lbSetData","lbSetPicture","lbSetPictureColor","lbSetPictureColorDisabled","lbSetPictureColorSelected","lbSetSelectColor","lbSetSelectColorRight","lbSetSelected","lbSetTooltip","lbSetValue","lbSize","lbSort","lbSortByValue","lbText","lbValue","leader","leaderboardDeInit","leaderboardGetRows","leaderboardInit","leaveVehicle","libraryCredits","libraryDisclaimers","lifeState","lightAttachObject","lightDetachObject","lightIsOn","lightnings","limitSpeed","linearConversion","lineBreak","lineIntersects","lineIntersectsObjs","lineIntersectsSurfaces","lineIntersectsWith","linkItem","list","listObjects","ln","lnbAddArray","lnbAddColumn","lnbAddRow","lnbClear","lnbColor","lnbCurSelRow","lnbData","lnbDeleteColumn","lnbDeleteRow","lnbGetColumnsPosition","lnbPicture","lnbSetColor","lnbSetColumnsPos","lnbSetCurSelRow","lnbSetData","lnbSetPicture","lnbSetText","lnbSetValue","lnbSize","lnbText","lnbValue","load","loadAbs","loadBackpack","loadFile","loadGame","loadIdentity","loadMagazine","loadOverlay","loadStatus","loadUniform","loadVest","local","localize","locationNull","locationPosition","lock","lockCameraTo","lockCargo","lockDriver","locked","lockedCargo","lockedDriver","lockedTurret","lockTurret","lockWP","log","logEntities","lookAt","lookAtPos","magazineCargo","magazines","magazinesAllTurrets","magazinesAmmo","magazinesAmmoCargo","magazinesAmmoFull","magazinesDetail","magazinesDetailBackpack","magazinesDetailUniform","magazinesDetailVest","magazinesTurret","magazineTurretAmmo","mapAnimAdd","mapAnimClear","mapAnimCommit","mapAnimDone","mapCenterOnCamera","mapGridPosition","markAsFinishedOnSteam","markerAlpha","markerBrush","markerColor","markerDir","markerPos","markerShape","markerSize","markerText","markerType","max","members","min","mineActive","mineDetectedBy","missionConfigFile","missionName","missionNamespace","missionStart","mod","modelToWorld","modelToWorldVisual","moonIntensity","morale","move","moveInAny","moveInCargo","moveInCommander","moveInDriver","moveInGunner","moveInTurret","moveObjectToEnd","moveOut","moveTime","moveTo","moveToCompleted","moveToFailed","musicVolume","name","name location","nameSound","nearEntities","nearestBuilding","nearestLocation","nearestLocations","nearestLocationWithDubbing","nearestObject","nearestObjects","nearObjects","nearObjectsReady","nearRoads","nearSupplies","nearTargets","needReload","netId","netObjNull","newOverlay","nextMenuItemIndex","nextWeatherChange","nil","nMenuItems","not","numberToDate","objectCurators","objectFromNetId","objectParent","objNull","objStatus","onBriefingGroup","onBriefingNotes","onBriefingPlan","onBriefingTeamSwitch","onCommandModeChanged","onDoubleClick","onEachFrame","onGroupIconClick","onGroupIconOverEnter","onGroupIconOverLeave","onHCGroupSelectionChanged","onMapSingleClick","onPlayerConnected","onPlayerDisconnected","onPreloadFinished","onPreloadStarted","onShowNewObject","onTeamSwitch","openCuratorInterface","openMap","openYoutubeVideo","opfor","or","orderGetIn","overcast","overcastForecast","owner","param","params","parseNumber","parseText","parsingNamespace","particlesQuality","pi","pickWeaponPool","pitch","playableSlotsNumber","playableUnits","playAction","playActionNow","player","playerRespawnTime","playerSide","playersNumber","playGesture","playMission","playMove","playMoveNow","playMusic","playScriptedMission","playSound","playSound3D","position","positionCameraToWorld","posScreenToWorld","posWorldToScreen","ppEffectAdjust","ppEffectCommit","ppEffectCommitted","ppEffectCreate","ppEffectDestroy","ppEffectEnable","ppEffectForceInNVG","precision","preloadCamera","preloadObject","preloadSound","preloadTitleObj","preloadTitleRsc","preprocessFile","preprocessFileLineNumbers","primaryWeapon","primaryWeaponItems","primaryWeaponMagazine","priority","private","processDiaryLink","productVersion","profileName","profileNamespace","profileNameSteam","progressLoadingScreen","progressPosition","progressSetPosition","publicVariable","publicVariableClient","publicVariableServer","pushBack","putWeaponPool","queryItemsPool","queryMagazinePool","queryWeaponPool","rad","radioChannelAdd","radioChannelCreate","radioChannelRemove","radioChannelSetCallSign","radioChannelSetLabel","radioVolume","rain","rainbow","random","rank","rankId","rating","rectangular","registeredTasks","registerTask","reload","reloadEnabled","remoteControl","remoteExec","remoteExecCall","removeAction","removeAllActions","removeAllAssignedItems","removeAllContainers","removeAllCuratorAddons","removeAllCuratorCameraAreas","removeAllCuratorEditingAreas","removeAllEventHandlers","removeAllHandgunItems","removeAllItems","removeAllItemsWithMagazines","removeAllMissionEventHandlers","removeAllMPEventHandlers","removeAllMusicEventHandlers","removeAllPrimaryWeaponItems","removeAllWeapons","removeBackpack","removeBackpackGlobal","removeCuratorAddons","removeCuratorCameraArea","removeCuratorEditableObjects","removeCuratorEditingArea","removeDrawIcon","removeDrawLinks","removeEventHandler","removeFromRemainsCollector","removeGoggles","removeGroupIcon","removeHandgunItem","removeHeadgear","removeItem","removeItemFromBackpack","removeItemFromUniform","removeItemFromVest","removeItems","removeMagazine","removeMagazineGlobal","removeMagazines","removeMagazinesTurret","removeMagazineTurret","removeMenuItem","removeMissionEventHandler","removeMPEventHandler","removeMusicEventHandler","removePrimaryWeaponItem","removeSecondaryWeaponItem","removeSimpleTask","removeSwitchableUnit","removeTeamMember","removeUniform","removeVest","removeWeapon","removeWeaponGlobal","removeWeaponTurret","requiredVersion","resetCamShake","resetSubgroupDirection","resistance","resize","resources","respawnVehicle","restartEditorCamera","reveal","revealMine","reverse","reversedMouseY","roadsConnectedTo","roleDescription","ropeAttachedObjects","ropeAttachedTo","ropeAttachEnabled","ropeAttachTo","ropeCreate","ropeCut","ropeEndPosition","ropeLength","ropes","ropeUnwind","ropeUnwound","rotorsForcesRTD","rotorsRpmRTD","round","runInitScript","safeZoneH","safeZoneW","safeZoneWAbs","safeZoneX","safeZoneXAbs","safeZoneY","saveGame","saveIdentity","saveJoysticks","saveOverlay","saveProfileNamespace","saveStatus","saveVar","savingEnabled","say","say2D","say3D","scopeName","score","scoreSide","screenToWorld","scriptDone","scriptName","scriptNull","scudState","secondaryWeapon","secondaryWeaponItems","secondaryWeaponMagazine","select","selectBestPlaces","selectDiarySubject","selectedEditorObjects","selectEditorObject","selectionPosition","selectLeader","selectNoPlayer","selectPlayer","selectWeapon","selectWeaponTurret","sendAUMessage","sendSimpleCommand","sendTask","sendTaskResult","sendUDPMessage","serverCommand","serverCommandAvailable","serverCommandExecutable","serverName","serverTime","set","setAccTime","setAirportSide","setAmmo","setAmmoCargo","setAperture","setApertureNew","setArmoryPoints","setAttributes","setAutonomous","setBehaviour","setBleedingRemaining","setCameraInterest","setCamShakeDefParams","setCamShakeParams","setCamUseTi","setCaptive","setCenterOfMass","setCollisionLight","setCombatMode","setCompassOscillation","setCuratorCameraAreaCeiling","setCuratorCoef","setCuratorEditingAreaType","setCuratorWaypointCost","setCurrentChannel","setCurrentTask","setCurrentWaypoint","setDamage","setDammage","setDate","setDebriefingText","setDefaultCamera","setDestination","setDetailMapBlendPars","setDir","setDirection","setDrawIcon","setDropInterval","setEditorMode","setEditorObjectScope","setEffectCondition","setFace","setFaceAnimation","setFatigue","setFlagOwner","setFlagSide","setFlagTexture","setFog","setFog array","setFormation","setFormationTask","setFormDir","setFriend","setFromEditor","setFSMVariable","setFuel","setFuelCargo","setGroupIcon","setGroupIconParams","setGroupIconsSelectable","setGroupIconsVisible","setGroupId","setGroupIdGlobal","setGroupOwner","setGusts","setHideBehind","setHit","setHitIndex","setHitPointDamage","setHorizonParallaxCoef","setHUDMovementLevels","setIdentity","setImportance","setLeader","setLightAmbient","setLightAttenuation","setLightBrightness","setLightColor","setLightDayLight","setLightFlareMaxDistance","setLightFlareSize","setLightIntensity","setLightnings","setLightUseFlare","setLocalWindParams","setMagazineTurretAmmo","setMarkerAlpha","setMarkerAlphaLocal","setMarkerBrush","setMarkerBrushLocal","setMarkerColor","setMarkerColorLocal","setMarkerDir","setMarkerDirLocal","setMarkerPos","setMarkerPosLocal","setMarkerShape","setMarkerShapeLocal","setMarkerSize","setMarkerSizeLocal","setMarkerText","setMarkerTextLocal","setMarkerType","setMarkerTypeLocal","setMass","setMimic","setMousePosition","setMusicEffect","setMusicEventHandler","setName","setNameSound","setObjectArguments","setObjectMaterial","setObjectProxy","setObjectTexture","setObjectTextureGlobal","setObjectViewDistance","setOvercast","setOwner","setOxygenRemaining","setParticleCircle","setParticleClass","setParticleFire","setParticleParams","setParticleRandom","setPilotLight","setPiPEffect","setPitch","setPlayable","setPlayerRespawnTime","setPos","setPosASL","setPosASL2","setPosASLW","setPosATL","setPosition","setPosWorld","setRadioMsg","setRain","setRainbow","setRandomLip","setRank","setRectangular","setRepairCargo","setShadowDistance","setSide","setSimpleTaskDescription","setSimpleTaskDestination","setSimpleTaskTarget","setSimulWeatherLayers","setSize","setSkill","setSkill array","setSlingLoad","setSoundEffect","setSpeaker","setSpeech","setSpeedMode","setStatValue","setSuppression","setSystemOfUnits","setTargetAge","setTaskResult","setTaskState","setTerrainGrid","setText","setTimeMultiplier","setTitleEffect","setTriggerActivation","setTriggerArea","setTriggerStatements","setTriggerText","setTriggerTimeout","setTriggerType","setType","setUnconscious","setUnitAbility","setUnitPos","setUnitPosWeak","setUnitRank","setUnitRecoilCoefficient","setUnloadInCombat","setUserActionText","setVariable","setVectorDir","setVectorDirAndUp","setVectorUp","setVehicleAmmo","setVehicleAmmoDef","setVehicleArmor","setVehicleId","setVehicleLock","setVehiclePosition","setVehicleTiPars","setVehicleVarName","setVelocity","setVelocityTransformation","setViewDistance","setVisibleIfTreeCollapsed","setWaves","setWaypointBehaviour","setWaypointCombatMode","setWaypointCompletionRadius","setWaypointDescription","setWaypointFormation","setWaypointHousePosition","setWaypointLoiterRadius","setWaypointLoiterType","setWaypointName","setWaypointPosition","setWaypointScript","setWaypointSpeed","setWaypointStatements","setWaypointTimeout","setWaypointType","setWaypointVisible","setWeaponReloadingTime","setWind","setWindDir","setWindForce","setWindStr","setWPPos","show3DIcons","showChat","showCinemaBorder","showCommandingMenu","showCompass","showCuratorCompass","showGPS","showHUD","showLegend","showMap","shownArtilleryComputer","shownChat","shownCompass","shownCuratorCompass","showNewEditorObject","shownGPS","shownHUD","shownMap","shownPad","shownRadio","shownUAVFeed","shownWarrant","shownWatch","showPad","showRadio","showSubtitles","showUAVFeed","showWarrant","showWatch","showWaypoint","side","sideChat","sideEnemy","sideFriendly","sideLogic","sideRadio","sideUnknown","simpleTasks","simulationEnabled","simulCloudDensity","simulCloudOcclusion","simulInClouds","simulWeatherSync","sin","size","sizeOf","skill","skillFinal","skipTime","sleep","sliderPosition","sliderRange","sliderSetPosition","sliderSetRange","sliderSetSpeed","sliderSpeed","slingLoadAssistantShown","soldierMagazines","someAmmo","sort","soundVolume","spawn","speaker","speed","speedMode","splitString","sqrt","squadParams","stance","startLoadingScreen","step","stop","stopped","str","sunOrMoon","supportInfo","suppressFor","surfaceIsWater","surfaceNormal","surfaceType","swimInDepth","switch","switchableUnits","switchAction","switchCamera","switchGesture","switchLight","switchMove","synchronizedObjects","synchronizedTriggers","synchronizedWaypoints","synchronizeObjectsAdd","synchronizeObjectsRemove","synchronizeTrigger","synchronizeWaypoint","synchronizeWaypoint trigger","systemChat","systemOfUnits","tan","targetKnowledge","targetsAggregate","targetsQuery","taskChildren","taskCompleted","taskDescription","taskDestination","taskHint","taskNull","taskParent","taskResult","taskState","teamMember","teamMemberNull","teamName","teams","teamSwitch","teamSwitchEnabled","teamType","terminate","terrainIntersect","terrainIntersectASL","text","text location","textLog","textLogFormat","tg","then","throw","time","timeMultiplier","titleCut","titleFadeOut","titleObj","titleRsc","titleText","to","toArray","toLower","toString","toUpper","triggerActivated","triggerActivation","triggerArea","triggerAttachedVehicle","triggerAttachObject","triggerAttachVehicle","triggerStatements","triggerText","triggerTimeout","triggerTimeoutCurrent","triggerType","true","try","turretLocal","turretOwner","turretUnit","tvAdd","tvClear","tvCollapse","tvCount","tvCurSel","tvData","tvDelete","tvExpand","tvPicture","tvSetCurSel","tvSetData","tvSetPicture","tvSetPictureColor","tvSetTooltip","tvSetValue","tvSort","tvSortByValue","tvText","tvValue","type","typeName","typeOf","UAVControl","uiNamespace","uiSleep","unassignCurator","unassignItem","unassignTeam","unassignVehicle","underwater","uniform","uniformContainer","uniformItems","uniformMagazines","unitAddons","unitBackpack","unitPos","unitReady","unitRecoilCoefficient","units","unitsBelowHeight","unlinkItem","unlockAchievement","unregisterTask","updateDrawIcon","updateMenuItem","updateObjectTree","useAudioTimeForMoves","vectorAdd","vectorCos","vectorCrossProduct","vectorDiff","vectorDir","vectorDirVisual","vectorDistance","vectorDistanceSqr","vectorDotProduct","vectorFromTo","vectorMagnitude","vectorMagnitudeSqr","vectorMultiply","vectorNormalized","vectorUp","vectorUpVisual","vehicle","vehicleChat","vehicleRadio","vehicles","vehicleVarName","velocity","velocityModelSpace","verifySignature","vest","vestContainer","vestItems","vestMagazines","viewDistance","visibleCompass","visibleGPS","visibleMap","visiblePosition","visiblePositionASL","visibleWatch","waitUntil","waves","waypointAttachedObject","waypointAttachedVehicle","waypointAttachObject","waypointAttachVehicle","waypointBehaviour","waypointCombatMode","waypointCompletionRadius","waypointDescription","waypointFormation","waypointHousePosition","waypointLoiterRadius","waypointLoiterType","waypointName","waypointPosition","waypoints","waypointScript","waypointsEnabledUAV","waypointShow","waypointSpeed","waypointStatements","waypointTimeout","waypointTimeoutCurrent","waypointType","waypointVisible","weaponAccessories","weaponCargo","weaponDirection","weaponLowered","weapons","weaponsItems","weaponsItemsCargo","weaponState","weaponsTurret","weightRTD","west","WFSideText","while","wind","windDir","windStr","wingsForcesRTD","with","worldName","worldSize","worldToModel","worldToModelVisual","worldToScreen"],a=["case","catch","default","do","else","exit","exitWith|5","for","forEach","from","if","switch","then","throw","to","try","while","with"],r=["!","-","+","!=","%","&&","*","/","=","==",">",">=","<","<=","^",":",">>"],o=["_forEachIndex|10","_this|10","_x|10"],i=["true","false","nil"],n=t.filter(function(e){return-1==a.indexOf(e)&&-1==i.indexOf(e)&&-1==r.indexOf(e)});n=n.concat(o);var s={cN:"string",r:0,v:[{b:'"',e:'"',c:[{b:'""'}]},{b:"'",e:"'",c:[{b:"''"}]}]},l={cN:"number",b:e.NR,r:0},c={cN:"string",v:[e.QSM,{b:"'\\\\?.",e:"'",i:"."}]},d={cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef"},c:[{b:/\\\n/,r:0},{bK:"include",e:"$",k:{"meta-keyword":"include"},c:[c,{cN:"meta-string",b:"<",e:">",i:"\\n"}]},c,l,e.CLCM,e.CBCM]};return{aliases:["sqf"],cI:!0,k:{keyword:a.join(" "),built_in:n.join(" "),literal:i.join(" ")},c:[e.CLCM,e.CBCM,l,s,d]}});
\ No newline at end of file
+hljs.registerLanguage("sqf",function(e){var t=e.getLanguage("cpp").exports,a={cN:"variable",b:/\b_+[a-zA-Z_]\w*/},o={cN:"title",b:/[a-zA-Z][a-zA-Z0-9]+_fnc_\w*/},r={cN:"string",v:[{b:'"',e:'"',c:[{b:'""',r:0}]},{b:"'",e:"'",c:[{b:"''",r:0}]}]};return{aliases:["sqf"],cI:!0,k:{keyword:"case catch default do else exit exitWith for forEach from if switch then throw to try waitUntil while with",built_in:"abs accTime acos action actionIDs actionKeys actionKeysImages actionKeysNames actionKeysNamesArray actionName actionParams activateAddons activatedAddons activateKey add3DENConnection add3DENEventHandler add3DENLayer addAction addBackpack addBackpackCargo addBackpackCargoGlobal addBackpackGlobal addCamShake addCuratorAddons addCuratorCameraArea addCuratorEditableObjects addCuratorEditingArea addCuratorPoints addEditorObject addEventHandler addGoggles addGroupIcon addHandgunItem addHeadgear addItem addItemCargo addItemCargoGlobal addItemPool addItemToBackpack addItemToUniform addItemToVest addLiveStats addMagazine addMagazineAmmoCargo addMagazineCargo addMagazineCargoGlobal addMagazineGlobal addMagazinePool addMagazines addMagazineTurret addMenu addMenuItem addMissionEventHandler addMPEventHandler addMusicEventHandler addOwnedMine addPlayerScores addPrimaryWeaponItem addPublicVariableEventHandler addRating addResources addScore addScoreSide addSecondaryWeaponItem addSwitchableUnit addTeamMember addToRemainsCollector addUniform addVehicle addVest addWaypoint addWeapon addWeaponCargo addWeaponCargoGlobal addWeaponGlobal addWeaponItem addWeaponPool addWeaponTurret agent agents AGLToASL aimedAtTarget aimPos airDensityRTD airportSide AISFinishHeal alive all3DENEntities allControls allCurators allCutLayers allDead allDeadMen allDisplays allGroups allMapMarkers allMines allMissionObjects allow3DMode allowCrewInImmobile allowCuratorLogicIgnoreAreas allowDamage allowDammage allowFileOperations allowFleeing allowGetIn allowSprint allPlayers allSites allTurrets allUnits allUnitsUAV allVariables ammo and animate animateDoor animateSource animationNames animationPhase animationSourcePhase animationState append apply armoryPoints arrayIntersect asin ASLToAGL ASLToATL assert assignAsCargo assignAsCargoIndex assignAsCommander assignAsDriver assignAsGunner assignAsTurret assignCurator assignedCargo assignedCommander assignedDriver assignedGunner assignedItems assignedTarget assignedTeam assignedVehicle assignedVehicleRole assignItem assignTeam assignToAirport atan atan2 atg ATLToASL attachedObject attachedObjects attachedTo attachObject attachTo attackEnabled backpack backpackCargo backpackContainer backpackItems backpackMagazines backpackSpaceFor behaviour benchmark binocular blufor boundingBox boundingBoxReal boundingCenter breakOut breakTo briefingName buildingExit buildingPos buttonAction buttonSetAction cadetMode call callExtension camCommand camCommit camCommitPrepared camCommitted camConstuctionSetParams camCreate camDestroy cameraEffect cameraEffectEnableHUD cameraInterest cameraOn cameraView campaignConfigFile camPreload camPreloaded camPrepareBank camPrepareDir camPrepareDive camPrepareFocus camPrepareFov camPrepareFovRange camPreparePos camPrepareRelPos camPrepareTarget camSetBank camSetDir camSetDive camSetFocus camSetFov camSetFovRange camSetPos camSetRelPos camSetTarget camTarget camUseNVG canAdd canAddItemToBackpack canAddItemToUniform canAddItemToVest cancelSimpleTaskDestination canFire canMove canSlingLoad canStand canSuspend canUnloadInCombat canVehicleCargo captive captiveNum cbChecked cbSetChecked ceil channelEnabled cheatsEnabled checkAIFeature checkVisibility civilian className clearAllItemsFromBackpack clearBackpackCargo clearBackpackCargoGlobal clearGroupIcons clearItemCargo clearItemCargoGlobal clearItemPool clearMagazineCargo clearMagazineCargoGlobal clearMagazinePool clearOverlay clearRadio clearWeaponCargo clearWeaponCargoGlobal clearWeaponPool clientOwner closeDialog closeDisplay closeOverlay collapseObjectTree collect3DENHistory combatMode commandArtilleryFire commandChat commander commandFire commandFollow commandFSM commandGetOut commandingMenu commandMove commandRadio commandStop commandSuppressiveFire commandTarget commandWatch comment commitOverlay compile compileFinal completedFSM composeText configClasses configFile configHierarchy configName configNull configProperties configSourceAddonList configSourceMod configSourceModList connectTerminalToUAV controlNull controlsGroupCtrl copyFromClipboard copyToClipboard copyWaypoints cos count countEnemy countFriendly countSide countType countUnknown create3DENComposition create3DENEntity createAgent createCenter createDialog createDiaryLink createDiaryRecord createDiarySubject createDisplay createGearDialog createGroup createGuardedPoint createLocation createMarker createMarkerLocal createMenu createMine createMissionDisplay createMPCampaignDisplay createSimpleObject createSimpleTask createSite createSoundSource createTask createTeam createTrigger createUnit createVehicle createVehicleCrew createVehicleLocal crew ctrlActivate ctrlAddEventHandler ctrlAngle ctrlAutoScrollDelay ctrlAutoScrollRewind ctrlAutoScrollSpeed ctrlChecked ctrlClassName ctrlCommit ctrlCommitted ctrlCreate ctrlDelete ctrlEnable ctrlEnabled ctrlFade ctrlHTMLLoaded ctrlIDC ctrlIDD ctrlMapAnimAdd ctrlMapAnimClear ctrlMapAnimCommit ctrlMapAnimDone ctrlMapCursor ctrlMapMouseOver ctrlMapScale ctrlMapScreenToWorld ctrlMapWorldToScreen ctrlModel ctrlModelDirAndUp ctrlModelScale ctrlParent ctrlParentControlsGroup ctrlPosition ctrlRemoveAllEventHandlers ctrlRemoveEventHandler ctrlScale ctrlSetActiveColor ctrlSetAngle ctrlSetAutoScrollDelay ctrlSetAutoScrollRewind ctrlSetAutoScrollSpeed ctrlSetBackgroundColor ctrlSetChecked ctrlSetEventHandler ctrlSetFade ctrlSetFocus ctrlSetFont ctrlSetFontH1 ctrlSetFontH1B ctrlSetFontH2 ctrlSetFontH2B ctrlSetFontH3 ctrlSetFontH3B ctrlSetFontH4 ctrlSetFontH4B ctrlSetFontH5 ctrlSetFontH5B ctrlSetFontH6 ctrlSetFontH6B ctrlSetFontHeight ctrlSetFontHeightH1 ctrlSetFontHeightH2 ctrlSetFontHeightH3 ctrlSetFontHeightH4 ctrlSetFontHeightH5 ctrlSetFontHeightH6 ctrlSetFontHeightSecondary ctrlSetFontP ctrlSetFontPB ctrlSetFontSecondary ctrlSetForegroundColor ctrlSetModel ctrlSetModelDirAndUp ctrlSetModelScale ctrlSetPosition ctrlSetScale ctrlSetStructuredText ctrlSetText ctrlSetTextColor ctrlSetTooltip ctrlSetTooltipColorBox ctrlSetTooltipColorShade ctrlSetTooltipColorText ctrlShow ctrlShown ctrlText ctrlTextHeight ctrlType ctrlVisible curatorAddons curatorCamera curatorCameraArea curatorCameraAreaCeiling curatorCoef curatorEditableObjects curatorEditingArea curatorEditingAreaType curatorMouseOver curatorPoints curatorRegisteredObjects curatorSelected curatorWaypointCost current3DENOperation currentChannel currentCommand currentMagazine currentMagazineDetail currentMagazineDetailTurret currentMagazineTurret currentMuzzle currentNamespace currentTask currentTasks currentThrowable currentVisionMode currentWaypoint currentWeapon currentWeaponMode currentWeaponTurret currentZeroing cursorObject cursorTarget customChat customRadio cutFadeOut cutObj cutRsc cutText damage date dateToNumber daytime deActivateKey debriefingText debugFSM debugLog deg delete3DENEntities deleteAt deleteCenter deleteCollection deleteEditorObject deleteGroup deleteIdentity deleteLocation deleteMarker deleteMarkerLocal deleteRange deleteResources deleteSite deleteStatus deleteTeam deleteVehicle deleteVehicleCrew deleteWaypoint detach detectedMines diag_activeMissionFSMs diag_activeScripts diag_activeSQFScripts diag_activeSQSScripts diag_captureFrame diag_captureSlowFrame diag_codePerformance diag_drawMode diag_enable diag_enabled diag_fps diag_fpsMin diag_frameNo diag_list diag_log diag_logSlowFrame diag_mergeConfigFile diag_recordTurretLimits diag_tickTime diag_toggle dialog diarySubjectExists didJIP didJIPOwner difficulty difficultyEnabled difficultyEnabledRTD difficultyOption direction directSay disableAI disableCollisionWith disableConversation disableDebriefingStats disableNVGEquipment disableRemoteSensors disableSerialization disableTIEquipment disableUAVConnectability disableUserInput displayAddEventHandler displayCtrl displayNull displayParent displayRemoveAllEventHandlers displayRemoveEventHandler displaySetEventHandler dissolveTeam distance distance2D distanceSqr distributionRegion do3DENAction doArtilleryFire doFire doFollow doFSM doGetOut doMove doorPhase doStop doSuppressiveFire doTarget doWatch drawArrow drawEllipse drawIcon drawIcon3D drawLine drawLine3D drawLink drawLocation drawPolygon drawRectangle driver drop east echo edit3DENMissionAttributes editObject editorSetEventHandler effectiveCommander emptyPositions enableAI enableAIFeature enableAimPrecision enableAttack enableAudioFeature enableCamShake enableCaustics enableChannel enableCollisionWith enableCopilot enableDebriefingStats enableDiagLegend enableEndDialog enableEngineArtillery enableEnvironment enableFatigue enableGunLights enableIRLasers enableMimics enablePersonTurret enableRadio enableReload enableRopeAttach enableSatNormalOnDetail enableSaving enableSentences enableSimulation enableSimulationGlobal enableStamina enableTeamSwitch enableUAVConnectability enableUAVWaypoints enableVehicleCargo endLoadingScreen endMission engineOn enginesIsOnRTD enginesRpmRTD enginesTorqueRTD entities estimatedEndServerTime estimatedTimeLeft evalObjectArgument everyBackpack everyContainer exec execEditorScript execFSM execVM exp expectedDestination exportJIPMessages eyeDirection eyePos face faction fadeMusic fadeRadio fadeSound fadeSpeech failMission fillWeaponsFromPool find findCover findDisplay findEditorObject findEmptyPosition findEmptyPositionReady findNearestEnemy finishMissionInit finite fire fireAtTarget firstBackpack flag flagOwner flagSide flagTexture fleeing floor flyInHeight flyInHeightASL fog fogForecast fogParams forceAddUniform forcedMap forceEnd forceMap forceRespawn forceSpeed forceWalk forceWeaponFire forceWeatherChange forEachMember forEachMemberAgent forEachMemberTeam format formation formationDirection formationLeader formationMembers formationPosition formationTask formatText formLeader freeLook fromEditor fuel fullCrew gearIDCAmmoCount gearSlotAmmoCount gearSlotData get3DENActionState get3DENAttribute get3DENCamera get3DENConnections get3DENEntity get3DENEntityID get3DENGrid get3DENIconsVisible get3DENLayerEntities get3DENLinesVisible get3DENMissionAttribute get3DENMouseOver get3DENSelected getAimingCoef getAllHitPointsDamage getAllOwnedMines getAmmoCargo getAnimAimPrecision getAnimSpeedCoef getArray getArtilleryAmmo getArtilleryComputerSettings getArtilleryETA getAssignedCuratorLogic getAssignedCuratorUnit getBackpackCargo getBleedingRemaining getBurningValue getCameraViewDirection getCargoIndex getCenterOfMass getClientState getClientStateNumber getConnectedUAV getCustomAimingCoef getDammage getDescription getDir getDirVisual getDLCs getEditorCamera getEditorMode getEditorObjectScope getElevationOffset getFatigue getFriend getFSMVariable getFuelCargo getGroupIcon getGroupIconParams getGroupIcons getHideFrom getHit getHitIndex getHitPointDamage getItemCargo getMagazineCargo getMarkerColor getMarkerPos getMarkerSize getMarkerType getMass getMissionConfig getMissionConfigValue getMissionDLCs getMissionLayerEntities getModelInfo getMousePosition getNumber getObjectArgument getObjectChildren getObjectDLC getObjectMaterials getObjectProxy getObjectTextures getObjectType getObjectViewDistance getOxygenRemaining getPersonUsedDLCs getPilotCameraDirection getPilotCameraPosition getPilotCameraRotation getPilotCameraTarget getPlayerChannel getPlayerScores getPlayerUID getPos getPosASL getPosASLVisual getPosASLW getPosATL getPosATLVisual getPosVisual getPosWorld getRelDir getRelPos getRemoteSensorsDisabled getRepairCargo getResolution getShadowDistance getShotParents getSlingLoad getSpeed getStamina getStatValue getSuppression getTerrainHeightASL getText getUnitLoadout getUnitTrait getVariable getVehicleCargo getWeaponCargo getWeaponSway getWPPos glanceAt globalChat globalRadio goggles goto group groupChat groupFromNetId groupIconSelectable groupIconsVisible groupId groupOwner groupRadio groupSelectedUnits groupSelectUnit grpNull gunner gusts halt handgunItems handgunMagazine handgunWeapon handsHit hasInterface hasPilotCamera hasWeapon hcAllGroups hcGroupParams hcLeader hcRemoveAllGroups hcRemoveGroup hcSelected hcSelectGroup hcSetGroup hcShowBar hcShownBar headgear hideBody hideObject hideObjectGlobal hideSelection hint hintC hintCadet hintSilent hmd hostMission htmlLoad HUDMovementLevels humidity image importAllGroups importance in inArea inAreaArray incapacitatedState independent inflame inflamed inGameUISetEventHandler inheritsFrom initAmbientLife inPolygon inputAction inRangeOfArtillery insertEditorObject intersect is3DEN is3DENMultiplayer isAbleToBreathe isAgent isArray isAutoHoverOn isAutonomous isAutotest isBleeding isBurning isClass isCollisionLightOn isCopilotEnabled isDedicated isDLCAvailable isEngineOn isEqualTo isEqualType isEqualTypeAll isEqualTypeAny isEqualTypeArray isEqualTypeParams isFilePatchingEnabled isFlashlightOn isFlatEmpty isForcedWalk isFormationLeader isHidden isInRemainsCollector isInstructorFigureEnabled isIRLaserOn isKeyActive isKindOf isLightOn isLocalized isManualFire isMarkedForCollection isMultiplayer isMultiplayerSolo isNil isNull isNumber isObjectHidden isObjectRTD isOnRoad isPipEnabled isPlayer isRealTime isRemoteExecuted isRemoteExecutedJIP isServer isShowing3DIcons isSprintAllowed isStaminaEnabled isSteamMission isStreamFriendlyUIEnabled isText isTouchingGround isTurnedOut isTutHintsEnabled isUAVConnectable isUAVConnected isUniformAllowed isVehicleCargo isWalking isWeaponDeployed isWeaponRested itemCargo items itemsWithMagazines join joinAs joinAsSilent joinSilent joinString kbAddDatabase kbAddDatabaseTargets kbAddTopic kbHasTopic kbReact kbRemoveTopic kbTell kbWasSaid keyImage keyName knowsAbout land landAt landResult language laserTarget lbAdd lbClear lbColor lbCurSel lbData lbDelete lbIsSelected lbPicture lbSelection lbSetColor lbSetCurSel lbSetData lbSetPicture lbSetPictureColor lbSetPictureColorDisabled lbSetPictureColorSelected lbSetSelectColor lbSetSelectColorRight lbSetSelected lbSetTooltip lbSetValue lbSize lbSort lbSortByValue lbText lbValue leader leaderboardDeInit leaderboardGetRows leaderboardInit leaveVehicle libraryCredits libraryDisclaimers lifeState lightAttachObject lightDetachObject lightIsOn lightnings limitSpeed linearConversion lineBreak lineIntersects lineIntersectsObjs lineIntersectsSurfaces lineIntersectsWith linkItem list listObjects ln lnbAddArray lnbAddColumn lnbAddRow lnbClear lnbColor lnbCurSelRow lnbData lnbDeleteColumn lnbDeleteRow lnbGetColumnsPosition lnbPicture lnbSetColor lnbSetColumnsPos lnbSetCurSelRow lnbSetData lnbSetPicture lnbSetText lnbSetValue lnbSize lnbText lnbValue load loadAbs loadBackpack loadFile loadGame loadIdentity loadMagazine loadOverlay loadStatus loadUniform loadVest local localize locationNull locationPosition lock lockCameraTo lockCargo lockDriver locked lockedCargo lockedDriver lockedTurret lockIdentity lockTurret lockWP log logEntities logNetwork logNetworkTerminate lookAt lookAtPos magazineCargo magazines magazinesAllTurrets magazinesAmmo magazinesAmmoCargo magazinesAmmoFull magazinesDetail magazinesDetailBackpack magazinesDetailUniform magazinesDetailVest magazinesTurret magazineTurretAmmo mapAnimAdd mapAnimClear mapAnimCommit mapAnimDone mapCenterOnCamera mapGridPosition markAsFinishedOnSteam markerAlpha markerBrush markerColor markerDir markerPos markerShape markerSize markerText markerType max members menuAction menuAdd menuChecked menuClear menuCollapse menuData menuDelete menuEnable menuEnabled menuExpand menuHover menuPicture menuSetAction menuSetCheck menuSetData menuSetPicture menuSetValue menuShortcut menuShortcutText menuSize menuSort menuText menuURL menuValue min mineActive mineDetectedBy missionConfigFile missionDifficulty missionName missionNamespace missionStart missionVersion mod modelToWorld modelToWorldVisual modParams moonIntensity moonPhase morale move move3DENCamera moveInAny moveInCargo moveInCommander moveInDriver moveInGunner moveInTurret moveObjectToEnd moveOut moveTime moveTo moveToCompleted moveToFailed musicVolume name nameSound nearEntities nearestBuilding nearestLocation nearestLocations nearestLocationWithDubbing nearestObject nearestObjects nearestTerrainObjects nearObjects nearObjectsReady nearRoads nearSupplies nearTargets needReload netId netObjNull newOverlay nextMenuItemIndex nextWeatherChange nMenuItems not numberToDate objectCurators objectFromNetId objectParent objNull objStatus onBriefingGroup onBriefingNotes onBriefingPlan onBriefingTeamSwitch onCommandModeChanged onDoubleClick onEachFrame onGroupIconClick onGroupIconOverEnter onGroupIconOverLeave onHCGroupSelectionChanged onMapSingleClick onPlayerConnected onPlayerDisconnected onPreloadFinished onPreloadStarted onShowNewObject onTeamSwitch openCuratorInterface openDLCPage openMap openYoutubeVideo opfor or orderGetIn overcast overcastForecast owner param params parseNumber parseText parsingNamespace particlesQuality pi pickWeaponPool pitch pixelGrid pixelGridBase pixelGridNoUIScale pixelH pixelW playableSlotsNumber playableUnits playAction playActionNow player playerRespawnTime playerSide playersNumber playGesture playMission playMove playMoveNow playMusic playScriptedMission playSound playSound3D position positionCameraToWorld posScreenToWorld posWorldToScreen ppEffectAdjust ppEffectCommit ppEffectCommitted ppEffectCreate ppEffectDestroy ppEffectEnable ppEffectEnabled ppEffectForceInNVG precision preloadCamera preloadObject preloadSound preloadTitleObj preloadTitleRsc preprocessFile preprocessFileLineNumbers primaryWeapon primaryWeaponItems primaryWeaponMagazine priority private processDiaryLink productVersion profileName profileNamespace profileNameSteam progressLoadingScreen progressPosition progressSetPosition publicVariable publicVariableClient publicVariableServer pushBack pushBackUnique putWeaponPool queryItemsPool queryMagazinePool queryWeaponPool rad radioChannelAdd radioChannelCreate radioChannelRemove radioChannelSetCallSign radioChannelSetLabel radioVolume rain rainbow random rank rankId rating rectangular registeredTasks registerTask reload reloadEnabled remoteControl remoteExec remoteExecCall remove3DENConnection remove3DENEventHandler remove3DENLayer removeAction removeAll3DENEventHandlers removeAllActions removeAllAssignedItems removeAllContainers removeAllCuratorAddons removeAllCuratorCameraAreas removeAllCuratorEditingAreas removeAllEventHandlers removeAllHandgunItems removeAllItems removeAllItemsWithMagazines removeAllMissionEventHandlers removeAllMPEventHandlers removeAllMusicEventHandlers removeAllOwnedMines removeAllPrimaryWeaponItems removeAllWeapons removeBackpack removeBackpackGlobal removeCuratorAddons removeCuratorCameraArea removeCuratorEditableObjects removeCuratorEditingArea removeDrawIcon removeDrawLinks removeEventHandler removeFromRemainsCollector removeGoggles removeGroupIcon removeHandgunItem removeHeadgear removeItem removeItemFromBackpack removeItemFromUniform removeItemFromVest removeItems removeMagazine removeMagazineGlobal removeMagazines removeMagazinesTurret removeMagazineTurret removeMenuItem removeMissionEventHandler removeMPEventHandler removeMusicEventHandler removeOwnedMine removePrimaryWeaponItem removeSecondaryWeaponItem removeSimpleTask removeSwitchableUnit removeTeamMember removeUniform removeVest removeWeapon removeWeaponGlobal removeWeaponTurret requiredVersion resetCamShake resetSubgroupDirection resistance resize resources respawnVehicle restartEditorCamera reveal revealMine reverse reversedMouseY roadAt roadsConnectedTo roleDescription ropeAttachedObjects ropeAttachedTo ropeAttachEnabled ropeAttachTo ropeCreate ropeCut ropeDestroy ropeDetach ropeEndPosition ropeLength ropes ropeUnwind ropeUnwound rotorsForcesRTD rotorsRpmRTD round runInitScript safeZoneH safeZoneW safeZoneWAbs safeZoneX safeZoneXAbs safeZoneY save3DENInventory saveGame saveIdentity saveJoysticks saveOverlay saveProfileNamespace saveStatus saveVar savingEnabled say say2D say3D scopeName score scoreSide screenshot screenToWorld scriptDone scriptName scriptNull scudState secondaryWeapon secondaryWeaponItems secondaryWeaponMagazine select selectBestPlaces selectDiarySubject selectedEditorObjects selectEditorObject selectionNames selectionPosition selectLeader selectMax selectMin selectNoPlayer selectPlayer selectRandom selectWeapon selectWeaponTurret sendAUMessage sendSimpleCommand sendTask sendTaskResult sendUDPMessage serverCommand serverCommandAvailable serverCommandExecutable serverName serverTime set set3DENAttribute set3DENAttributes set3DENGrid set3DENIconsVisible set3DENLayer set3DENLinesVisible set3DENMissionAttributes set3DENModelsVisible set3DENObjectType set3DENSelected setAccTime setAirportSide setAmmo setAmmoCargo setAnimSpeedCoef setAperture setApertureNew setArmoryPoints setAttributes setAutonomous setBehaviour setBleedingRemaining setCameraInterest setCamShakeDefParams setCamShakeParams setCamUseTi setCaptive setCenterOfMass setCollisionLight setCombatMode setCompassOscillation setCuratorCameraAreaCeiling setCuratorCoef setCuratorEditingAreaType setCuratorWaypointCost setCurrentChannel setCurrentTask setCurrentWaypoint setCustomAimCoef setDamage setDammage setDate setDebriefingText setDefaultCamera setDestination setDetailMapBlendPars setDir setDirection setDrawIcon setDropInterval setEditorMode setEditorObjectScope setEffectCondition setFace setFaceAnimation setFatigue setFlagOwner setFlagSide setFlagTexture setFog setFormation setFormationTask setFormDir setFriend setFromEditor setFSMVariable setFuel setFuelCargo setGroupIcon setGroupIconParams setGroupIconsSelectable setGroupIconsVisible setGroupId setGroupIdGlobal setGroupOwner setGusts setHideBehind setHit setHitIndex setHitPointDamage setHorizonParallaxCoef setHUDMovementLevels setIdentity setImportance setLeader setLightAmbient setLightAttenuation setLightBrightness setLightColor setLightDayLight setLightFlareMaxDistance setLightFlareSize setLightIntensity setLightnings setLightUseFlare setLocalWindParams setMagazineTurretAmmo setMarkerAlpha setMarkerAlphaLocal setMarkerBrush setMarkerBrushLocal setMarkerColor setMarkerColorLocal setMarkerDir setMarkerDirLocal setMarkerPos setMarkerPosLocal setMarkerShape setMarkerShapeLocal setMarkerSize setMarkerSizeLocal setMarkerText setMarkerTextLocal setMarkerType setMarkerTypeLocal setMass setMimic setMousePosition setMusicEffect setMusicEventHandler setName setNameSound setObjectArguments setObjectMaterial setObjectMaterialGlobal setObjectProxy setObjectTexture setObjectTextureGlobal setObjectViewDistance setOvercast setOwner setOxygenRemaining setParticleCircle setParticleClass setParticleFire setParticleParams setParticleRandom setPilotCameraDirection setPilotCameraRotation setPilotCameraTarget setPilotLight setPiPEffect setPitch setPlayable setPlayerRespawnTime setPos setPosASL setPosASL2 setPosASLW setPosATL setPosition setPosWorld setRadioMsg setRain setRainbow setRandomLip setRank setRectangular setRepairCargo setShadowDistance setShotParents setSide setSimpleTaskAlwaysVisible setSimpleTaskCustomData setSimpleTaskDescription setSimpleTaskDestination setSimpleTaskTarget setSimpleTaskType setSimulWeatherLayers setSize setSkill setSlingLoad setSoundEffect setSpeaker setSpeech setSpeedMode setStamina setStaminaScheme setStatValue setSuppression setSystemOfUnits setTargetAge setTaskResult setTaskState setTerrainGrid setText setTimeMultiplier setTitleEffect setTriggerActivation setTriggerArea setTriggerStatements setTriggerText setTriggerTimeout setTriggerType setType setUnconscious setUnitAbility setUnitLoadout setUnitPos setUnitPosWeak setUnitRank setUnitRecoilCoefficient setUnitTrait setUnloadInCombat setUserActionText setVariable setVectorDir setVectorDirAndUp setVectorUp setVehicleAmmo setVehicleAmmoDef setVehicleArmor setVehicleCargo setVehicleId setVehicleLock setVehiclePosition setVehicleTiPars setVehicleVarName setVelocity setVelocityTransformation setViewDistance setVisibleIfTreeCollapsed setWaves setWaypointBehaviour setWaypointCombatMode setWaypointCompletionRadius setWaypointDescription setWaypointForceBehaviour setWaypointFormation setWaypointHousePosition setWaypointLoiterRadius setWaypointLoiterType setWaypointName setWaypointPosition setWaypointScript setWaypointSpeed setWaypointStatements setWaypointTimeout setWaypointType setWaypointVisible setWeaponReloadingTime setWind setWindDir setWindForce setWindStr setWPPos show3DIcons showChat showCinemaBorder showCommandingMenu showCompass showCuratorCompass showGPS showHUD showLegend showMap shownArtilleryComputer shownChat shownCompass shownCuratorCompass showNewEditorObject shownGPS shownHUD shownMap shownPad shownRadio shownScoretable shownUAVFeed shownWarrant shownWatch showPad showRadio showScoretable showSubtitles showUAVFeed showWarrant showWatch showWaypoint showWaypoints side sideAmbientLife sideChat sideEmpty sideEnemy sideFriendly sideLogic sideRadio sideUnknown simpleTasks simulationEnabled simulCloudDensity simulCloudOcclusion simulInClouds simulWeatherSync sin size sizeOf skill skillFinal skipTime sleep sliderPosition sliderRange sliderSetPosition sliderSetRange sliderSetSpeed sliderSpeed slingLoadAssistantShown soldierMagazines someAmmo sort soundVolume spawn speaker speed speedMode splitString sqrt squadParams stance startLoadingScreen step stop stopEngineRTD stopped str sunOrMoon supportInfo suppressFor surfaceIsWater surfaceNormal surfaceType swimInDepth switchableUnits switchAction switchCamera switchGesture switchLight switchMove synchronizedObjects synchronizedTriggers synchronizedWaypoints synchronizeObjectsAdd synchronizeObjectsRemove synchronizeTrigger synchronizeWaypoint systemChat systemOfUnits tan targetKnowledge targetsAggregate targetsQuery taskAlwaysVisible taskChildren taskCompleted taskCustomData taskDescription taskDestination taskHint taskMarkerOffset taskNull taskParent taskResult taskState taskType teamMember teamMemberNull teamName teams teamSwitch teamSwitchEnabled teamType terminate terrainIntersect terrainIntersectASL text textLog textLogFormat tg time timeMultiplier titleCut titleFadeOut titleObj titleRsc titleText toArray toFixed toLower toString toUpper triggerActivated triggerActivation triggerArea triggerAttachedVehicle triggerAttachObject triggerAttachVehicle triggerStatements triggerText triggerTimeout triggerTimeoutCurrent triggerType turretLocal turretOwner turretUnit tvAdd tvClear tvCollapse tvCount tvCurSel tvData tvDelete tvExpand tvPicture tvSetCurSel tvSetData tvSetPicture tvSetPictureColor tvSetPictureColorDisabled tvSetPictureColorSelected tvSetPictureRight tvSetPictureRightColor tvSetPictureRightColorDisabled tvSetPictureRightColorSelected tvSetText tvSetTooltip tvSetValue tvSort tvSortByValue tvText tvTooltip tvValue type typeName typeOf UAVControl uiNamespace uiSleep unassignCurator unassignItem unassignTeam unassignVehicle underwater uniform uniformContainer uniformItems uniformMagazines unitAddons unitAimPosition unitAimPositionVisual unitBackpack unitIsUAV unitPos unitReady unitRecoilCoefficient units unitsBelowHeight unlinkItem unlockAchievement unregisterTask updateDrawIcon updateMenuItem updateObjectTree useAISteeringComponent useAudioTimeForMoves vectorAdd vectorCos vectorCrossProduct vectorDiff vectorDir vectorDirVisual vectorDistance vectorDistanceSqr vectorDotProduct vectorFromTo vectorMagnitude vectorMagnitudeSqr vectorMultiply vectorNormalized vectorUp vectorUpVisual vehicle vehicleCargoEnabled vehicleChat vehicleRadio vehicles vehicleVarName velocity velocityModelSpace verifySignature vest vestContainer vestItems vestMagazines viewDistance visibleCompass visibleGPS visibleMap visiblePosition visiblePositionASL visibleScoretable visibleWatch waves waypointAttachedObject waypointAttachedVehicle waypointAttachObject waypointAttachVehicle waypointBehaviour waypointCombatMode waypointCompletionRadius waypointDescription waypointForceBehaviour waypointFormation waypointHousePosition waypointLoiterRadius waypointLoiterType waypointName waypointPosition waypoints waypointScript waypointsEnabledUAV waypointShow waypointSpeed waypointStatements waypointTimeout waypointTimeoutCurrent waypointType waypointVisible weaponAccessories weaponAccessoriesCargo weaponCargo weaponDirection weaponInertia weaponLowered weapons weaponsItems weaponsItemsCargo weaponState weaponsTurret weightRTD west WFSideText wind",literal:"true false nil"},c:[e.CLCM,e.CBCM,e.NM,a,o,r,t.preprocessor],i:/#|^\$ /}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/sql.js b/lib/highlight_js/assets/lang/sql.js
index 36a72225de1..6a731271bef 100644
--- a/lib/highlight_js/assets/lang/sql.js
+++ b/lib/highlight_js/assets/lang/sql.js
@@ -1 +1 @@
-hljs.registerLanguage("sql",function(e){var t=e.C("--","$");return{cI:!0,i:/[<>{}*]/,c:[{bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke",e:/;/,eW:!0,k:{keyword:"abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias allocate allow alter always analyze ancillary and any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second section securefile security seed segment select self sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null",built_in:"array bigint binary bit blob boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text varchar varying void"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}]},{cN:"string",b:"`",e:"`",c:[e.BE]},e.CNM,e.CBCM,t]},e.CBCM,t]}});
\ No newline at end of file
+hljs.registerLanguage("sql",function(e){var t=e.C("--","$");return{cI:!0,i:/[<>{}*]/,c:[{bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment",e:/;/,eW:!0,l:/[\w\.]+/,k:{keyword:"abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias allocate allow alter always analyze ancillary and any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second section securefile security seed segment select self sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null",built_in:"array bigint binary bit blob boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text varchar varying void"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}]},{cN:"string",b:"`",e:"`",c:[e.BE]},e.CNM,e.CBCM,t,e.HCM]},e.CBCM,t,e.HCM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/stata.js b/lib/highlight_js/assets/lang/stata.js
index 96ba263c793..9c55eeff3a7 100644
--- a/lib/highlight_js/assets/lang/stata.js
+++ b/lib/highlight_js/assets/lang/stata.js
@@ -1 +1 @@
-hljs.registerLanguage("stata",function(e){return{aliases:["do","ado"],cI:!0,k:"if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate g gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l la lab labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize meqparse mer merg merge mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5",c:[{cN:"symbol",b:/`[a-zA-Z0-9_]+'/},{cN:"variable",b:/\$\{?[a-zA-Z0-9_]+\}?/},{cN:"string",v:[{b:'`"[^\r\n]*?"\''},{b:'"[^\r\n"]*"'}]},{cN:"built_in",v:[{b:"\\b(abs|acos|asin|atan|atan2|atanh|ceil|cloglog|comb|cos|digamma|exp|floor|invcloglog|invlogit|ln|lnfact|lnfactorial|lngamma|log|log10|max|min|mod|reldif|round|sign|sin|sqrt|sum|tan|tanh|trigamma|trunc|betaden|Binomial|binorm|binormal|chi2|chi2tail|dgammapda|dgammapdada|dgammapdadx|dgammapdx|dgammapdxdx|F|Fden|Ftail|gammaden|gammap|ibeta|invbinomial|invchi2|invchi2tail|invF|invFtail|invgammap|invibeta|invnchi2|invnFtail|invnibeta|invnorm|invnormal|invttail|nbetaden|nchi2|nFden|nFtail|nibeta|norm|normal|normalden|normd|npnchi2|tden|ttail|uniform|abbrev|char|index|indexnot|length|lower|ltrim|match|plural|proper|real|regexm|regexr|regexs|reverse|rtrim|string|strlen|strlower|strltrim|strmatch|strofreal|strpos|strproper|strreverse|strrtrim|strtrim|strupper|subinstr|subinword|substr|trim|upper|word|wordcount|_caller|autocode|byteorder|chop|clip|cond|e|epsdouble|epsfloat|group|inlist|inrange|irecode|matrix|maxbyte|maxdouble|maxfloat|maxint|maxlong|mi|minbyte|mindouble|minfloat|minint|minlong|missing|r|recode|replay|return|s|scalar|d|date|day|dow|doy|halfyear|mdy|month|quarter|week|year|d|daily|dofd|dofh|dofm|dofq|dofw|dofy|h|halfyearly|hofd|m|mofd|monthly|q|qofd|quarterly|tin|twithin|w|weekly|wofd|y|yearly|yh|ym|yofd|yq|yw|cholesky|colnumb|colsof|corr|det|diag|diag0cnt|el|get|hadamard|I|inv|invsym|issym|issymmetric|J|matmissing|matuniform|mreldif|nullmat|rownumb|rowsof|sweep|syminv|trace|vec|vecdiag)(?=\\(|$)"}]},e.C("^[ 	]*\\*.*$",!1),e.CLCM,e.CBCM]}});
\ No newline at end of file
+hljs.registerLanguage("stata",function(e){return{aliases:["do","ado"],cI:!0,k:"if else in foreach for forv forva forval forvalu forvalue forvalues by bys bysort xi quietly qui capture about ac ac_7 acprplot acprplot_7 adjust ado adopath adoupdate alpha ameans an ano anov anova anova_estat anova_terms anovadef aorder ap app appe appen append arch arch_dr arch_estat arch_p archlm areg areg_p args arima arima_dr arima_estat arima_p as asmprobit asmprobit_estat asmprobit_lf asmprobit_mfx__dlg asmprobit_p ass asse asser assert avplot avplot_7 avplots avplots_7 bcskew0 bgodfrey binreg bip0_lf biplot bipp_lf bipr_lf bipr_p biprobit bitest bitesti bitowt blogit bmemsize boot bootsamp bootstrap bootstrap_8 boxco_l boxco_p boxcox boxcox_6 boxcox_p bprobit br break brier bro brow brows browse brr brrstat bs bs_7 bsampl_w bsample bsample_7 bsqreg bstat bstat_7 bstat_8 bstrap bstrap_7 ca ca_estat ca_p cabiplot camat canon canon_8 canon_8_p canon_estat canon_p cap caprojection capt captu captur capture cat cc cchart cchart_7 cci cd censobs_table centile cf char chdir checkdlgfiles checkestimationsample checkhlpfiles checksum chelp ci cii cl class classutil clear cli clis clist clo clog clog_lf clog_p clogi clogi_sw clogit clogit_lf clogit_p clogitp clogl_sw cloglog clonevar clslistarray cluster cluster_measures cluster_stop cluster_tree cluster_tree_8 clustermat cmdlog cnr cnre cnreg cnreg_p cnreg_sw cnsreg codebook collaps4 collapse colormult_nb colormult_nw compare compress conf confi confir confirm conren cons const constr constra constrai constrain constraint continue contract copy copyright copysource cor corc corr corr2data corr_anti corr_kmo corr_smc corre correl correla correlat correlate corrgram cou coun count cox cox_p cox_sw coxbase coxhaz coxvar cprplot cprplot_7 crc cret cretu cretur creturn cross cs cscript cscript_log csi ct ct_is ctset ctst_5 ctst_st cttost cumsp cumsp_7 cumul cusum cusum_7 cutil d|0 datasig datasign datasigna datasignat datasignatu datasignatur datasignature datetof db dbeta de dec deco decod decode deff des desc descr descri describ describe destring dfbeta dfgls dfuller di di_g dir dirstats dis discard disp disp_res disp_s displ displa display distinct do doe doed doedi doedit dotplot dotplot_7 dprobit drawnorm drop ds ds_util dstdize duplicates durbina dwstat dydx e|0 ed edi edit egen eivreg emdef en enc enco encod encode eq erase ereg ereg_lf ereg_p ereg_sw ereghet ereghet_glf ereghet_glf_sh ereghet_gp ereghet_ilf ereghet_ilf_sh ereghet_ip eret eretu eretur ereturn err erro error est est_cfexist est_cfname est_clickable est_expand est_hold est_table est_unhold est_unholdok estat estat_default estat_summ estat_vce_only esti estimates etodow etof etomdy ex exi exit expand expandcl fac fact facto factor factor_estat factor_p factor_pca_rotated factor_rotate factormat fcast fcast_compute fcast_graph fdades fdadesc fdadescr fdadescri fdadescrib fdadescribe fdasav fdasave fdause fh_st file open file read file close file filefilter fillin find_hlp_file findfile findit findit_7 fit fl fli flis flist for5_0 form forma format fpredict frac_154 frac_adj frac_chk frac_cox frac_ddp frac_dis frac_dv frac_in frac_mun frac_pp frac_pq frac_pv frac_wgt frac_xo fracgen fracplot fracplot_7 fracpoly fracpred fron_ex fron_hn fron_p fron_tn fron_tn2 frontier ftodate ftoe ftomdy ftowdate g|0 gamhet_glf gamhet_gp gamhet_ilf gamhet_ip gamma gamma_d2 gamma_p gamma_sw gammahet gdi_hexagon gdi_spokes ge gen gene gener genera generat generate genrank genstd genvmean gettoken gl gladder gladder_7 glim_l01 glim_l02 glim_l03 glim_l04 glim_l05 glim_l06 glim_l07 glim_l08 glim_l09 glim_l10 glim_l11 glim_l12 glim_lf glim_mu glim_nw1 glim_nw2 glim_nw3 glim_p glim_v1 glim_v2 glim_v3 glim_v4 glim_v5 glim_v6 glim_v7 glm glm_6 glm_p glm_sw glmpred glo glob globa global glogit glogit_8 glogit_p gmeans gnbre_lf gnbreg gnbreg_5 gnbreg_p gomp_lf gompe_sw gomper_p gompertz gompertzhet gomphet_glf gomphet_glf_sh gomphet_gp gomphet_ilf gomphet_ilf_sh gomphet_ip gphdot gphpen gphprint gprefs gprobi_p gprobit gprobit_8 gr gr7 gr_copy gr_current gr_db gr_describe gr_dir gr_draw gr_draw_replay gr_drop gr_edit gr_editviewopts gr_example gr_example2 gr_export gr_print gr_qscheme gr_query gr_read gr_rename gr_replay gr_save gr_set gr_setscheme gr_table gr_undo gr_use graph graph7 grebar greigen greigen_7 greigen_8 grmeanby grmeanby_7 gs_fileinfo gs_filetype gs_graphinfo gs_stat gsort gwood h|0 hadimvo hareg hausman haver he heck_d2 heckma_p heckman heckp_lf heckpr_p heckprob hel help hereg hetpr_lf hetpr_p hetprob hettest hexdump hilite hist hist_7 histogram hlogit hlu hmeans hotel hotelling hprobit hreg hsearch icd9 icd9_ff icd9p iis impute imtest inbase include inf infi infil infile infix inp inpu input ins insheet insp inspe inspec inspect integ inten intreg intreg_7 intreg_p intrg2_ll intrg_ll intrg_ll2 ipolate iqreg ir irf irf_create irfm iri is_svy is_svysum isid istdize ivprob_1_lf ivprob_lf ivprobit ivprobit_p ivreg ivreg_footnote ivtob_1_lf ivtob_lf ivtobit ivtobit_p jackknife jacknife jknife jknife_6 jknife_8 jkstat joinby kalarma1 kap kap_3 kapmeier kappa kapwgt kdensity kdensity_7 keep ksm ksmirnov ktau kwallis l|0 la lab labe label labelbook ladder levels levelsof leverage lfit lfit_p li lincom line linktest lis list lloghet_glf lloghet_glf_sh lloghet_gp lloghet_ilf lloghet_ilf_sh lloghet_ip llogi_sw llogis_p llogist llogistic llogistichet lnorm_lf lnorm_sw lnorma_p lnormal lnormalhet lnormhet_glf lnormhet_glf_sh lnormhet_gp lnormhet_ilf lnormhet_ilf_sh lnormhet_ip lnskew0 loadingplot loc loca local log logi logis_lf logistic logistic_p logit logit_estat logit_p loglogs logrank loneway lookfor lookup lowess lowess_7 lpredict lrecomp lroc lroc_7 lrtest ls lsens lsens_7 lsens_x lstat ltable ltable_7 ltriang lv lvr2plot lvr2plot_7 m|0 ma mac macr macro makecns man manova manova_estat manova_p manovatest mantel mark markin markout marksample mat mat_capp mat_order mat_put_rr mat_rapp mata mata_clear mata_describe mata_drop mata_matdescribe mata_matsave mata_matuse mata_memory mata_mlib mata_mosave mata_rename mata_which matalabel matcproc matlist matname matr matri matrix matrix_input__dlg matstrik mcc mcci md0_ md1_ md1debug_ md2_ md2debug_ mds mds_estat mds_p mdsconfig mdslong mdsmat mdsshepard mdytoe mdytof me_derd mean means median memory memsize meqparse mer merg merge mfp mfx mhelp mhodds minbound mixed_ll mixed_ll_reparm mkassert mkdir mkmat mkspline ml ml_5 ml_adjs ml_bhhhs ml_c_d ml_check ml_clear ml_cnt ml_debug ml_defd ml_e0 ml_e0_bfgs ml_e0_cycle ml_e0_dfp ml_e0i ml_e1 ml_e1_bfgs ml_e1_bhhh ml_e1_cycle ml_e1_dfp ml_e2 ml_e2_cycle ml_ebfg0 ml_ebfr0 ml_ebfr1 ml_ebh0q ml_ebhh0 ml_ebhr0 ml_ebr0i ml_ecr0i ml_edfp0 ml_edfr0 ml_edfr1 ml_edr0i ml_eds ml_eer0i ml_egr0i ml_elf ml_elf_bfgs ml_elf_bhhh ml_elf_cycle ml_elf_dfp ml_elfi ml_elfs ml_enr0i ml_enrr0 ml_erdu0 ml_erdu0_bfgs ml_erdu0_bhhh ml_erdu0_bhhhq ml_erdu0_cycle ml_erdu0_dfp ml_erdu0_nrbfgs ml_exde ml_footnote ml_geqnr ml_grad0 ml_graph ml_hbhhh ml_hd0 ml_hold ml_init ml_inv ml_log ml_max ml_mlout ml_mlout_8 ml_model ml_nb0 ml_opt ml_p ml_plot ml_query ml_rdgrd ml_repor ml_s_e ml_score ml_searc ml_technique ml_unhold mleval mlf_ mlmatbysum mlmatsum mlog mlogi mlogit mlogit_footnote mlogit_p mlopts mlsum mlvecsum mnl0_ mor more mov move mprobit mprobit_lf mprobit_p mrdu0_ mrdu1_ mvdecode mvencode mvreg mvreg_estat n|0 nbreg nbreg_al nbreg_lf nbreg_p nbreg_sw nestreg net newey newey_7 newey_p news nl nl_7 nl_9 nl_9_p nl_p nl_p_7 nlcom nlcom_p nlexp2 nlexp2_7 nlexp2a nlexp2a_7 nlexp3 nlexp3_7 nlgom3 nlgom3_7 nlgom4 nlgom4_7 nlinit nllog3 nllog3_7 nllog4 nllog4_7 nlog_rd nlogit nlogit_p nlogitgen nlogittree nlpred no nobreak noi nois noisi noisil noisily note notes notes_dlg nptrend numlabel numlist odbc old_ver olo olog ologi ologi_sw ologit ologit_p ologitp on one onew onewa oneway op_colnm op_comp op_diff op_inv op_str opr opro oprob oprob_sw oprobi oprobi_p oprobit oprobitp opts_exclusive order orthog orthpoly ou out outf outfi outfil outfile outs outsh outshe outshee outsheet ovtest pac pac_7 palette parse parse_dissim pause pca pca_8 pca_display pca_estat pca_p pca_rotate pcamat pchart pchart_7 pchi pchi_7 pcorr pctile pentium pergram pergram_7 permute permute_8 personal peto_st pkcollapse pkcross pkequiv pkexamine pkexamine_7 pkshape pksumm pksumm_7 pl plo plot plugin pnorm pnorm_7 poisgof poiss_lf poiss_sw poisso_p poisson poisson_estat post postclose postfile postutil pperron pr prais prais_e prais_e2 prais_p predict predictnl preserve print pro prob probi probit probit_estat probit_p proc_time procoverlay procrustes procrustes_estat procrustes_p profiler prog progr progra program prop proportion prtest prtesti pwcorr pwd q\\s qby qbys qchi qchi_7 qladder qladder_7 qnorm qnorm_7 qqplot qqplot_7 qreg qreg_c qreg_p qreg_sw qu quadchk quantile quantile_7 que quer query range ranksum ratio rchart rchart_7 rcof recast reclink recode reg reg3 reg3_p regdw regr regre regre_p2 regres regres_p regress regress_estat regriv_p remap ren rena renam rename renpfix repeat replace report reshape restore ret retu retur return rm rmdir robvar roccomp roccomp_7 roccomp_8 rocf_lf rocfit rocfit_8 rocgold rocplot rocplot_7 roctab roctab_7 rolling rologit rologit_p rot rota rotat rotate rotatemat rreg rreg_p ru run runtest rvfplot rvfplot_7 rvpplot rvpplot_7 sa safesum sample sampsi sav save savedresults saveold sc sca scal scala scalar scatter scm_mine sco scob_lf scob_p scobi_sw scobit scor score scoreplot scoreplot_help scree screeplot screeplot_help sdtest sdtesti se search separate seperate serrbar serrbar_7 serset set set_defaults sfrancia sh she shel shell shewhart shewhart_7 signestimationsample signrank signtest simul simul_7 simulate simulate_8 sktest sleep slogit slogit_d2 slogit_p smooth snapspan so sor sort spearman spikeplot spikeplot_7 spikeplt spline_x split sqreg sqreg_p sret sretu sretur sreturn ssc st st_ct st_hc st_hcd st_hcd_sh st_is st_issys st_note st_promo st_set st_show st_smpl st_subid stack statsby statsby_8 stbase stci stci_7 stcox stcox_estat stcox_fr stcox_fr_ll stcox_p stcox_sw stcoxkm stcoxkm_7 stcstat stcurv stcurve stcurve_7 stdes stem stepwise stereg stfill stgen stir stjoin stmc stmh stphplot stphplot_7 stphtest stphtest_7 stptime strate strate_7 streg streg_sw streset sts sts_7 stset stsplit stsum sttocc sttoct stvary stweib su suest suest_8 sum summ summa summar summari summariz summarize sunflower sureg survcurv survsum svar svar_p svmat svy svy_disp svy_dreg svy_est svy_est_7 svy_estat svy_get svy_gnbreg_p svy_head svy_header svy_heckman_p svy_heckprob_p svy_intreg_p svy_ivreg_p svy_logistic_p svy_logit_p svy_mlogit_p svy_nbreg_p svy_ologit_p svy_oprobit_p svy_poisson_p svy_probit_p svy_regress_p svy_sub svy_sub_7 svy_x svy_x_7 svy_x_p svydes svydes_8 svygen svygnbreg svyheckman svyheckprob svyintreg svyintreg_7 svyintrg svyivreg svylc svylog_p svylogit svymarkout svymarkout_8 svymean svymlog svymlogit svynbreg svyolog svyologit svyoprob svyoprobit svyopts svypois svypois_7 svypoisson svyprobit svyprobt svyprop svyprop_7 svyratio svyreg svyreg_p svyregress svyset svyset_7 svyset_8 svytab svytab_7 svytest svytotal sw sw_8 swcnreg swcox swereg swilk swlogis swlogit swologit swoprbt swpois swprobit swqreg swtobit swweib symmetry symmi symplot symplot_7 syntax sysdescribe sysdir sysuse szroeter ta tab tab1 tab2 tab_or tabd tabdi tabdis tabdisp tabi table tabodds tabodds_7 tabstat tabu tabul tabula tabulat tabulate te tempfile tempname tempvar tes test testnl testparm teststd tetrachoric time_it timer tis tob tobi tobit tobit_p tobit_sw token tokeni tokeniz tokenize tostring total translate translator transmap treat_ll treatr_p treatreg trim trnb_cons trnb_mean trpoiss_d2 trunc_ll truncr_p truncreg tsappend tset tsfill tsline tsline_ex tsreport tsrevar tsrline tsset tssmooth tsunab ttest ttesti tut_chk tut_wait tutorial tw tware_st two twoway twoway__fpfit_serset twoway__function_gen twoway__histogram_gen twoway__ipoint_serset twoway__ipoints_serset twoway__kdensity_gen twoway__lfit_serset twoway__normgen_gen twoway__pci_serset twoway__qfit_serset twoway__scatteri_serset twoway__sunflower_gen twoway_ksm_serset ty typ type typeof u|0 unab unabbrev unabcmd update us use uselabel var var_mkcompanion var_p varbasic varfcast vargranger varirf varirf_add varirf_cgraph varirf_create varirf_ctable varirf_describe varirf_dir varirf_drop varirf_erase varirf_graph varirf_ograph varirf_rename varirf_set varirf_table varlist varlmar varnorm varsoc varstable varstable_w varstable_w2 varwle vce vec vec_fevd vec_mkphi vec_p vec_p_w vecirf_create veclmar veclmar_w vecnorm vecnorm_w vecrank vecstable verinst vers versi versio version view viewsource vif vwls wdatetof webdescribe webseek webuse weib1_lf weib2_lf weib_lf weib_lf0 weibhet_glf weibhet_glf_sh weibhet_glfa weibhet_glfa_sh weibhet_gp weibhet_ilf weibhet_ilf_sh weibhet_ilfa weibhet_ilfa_sh weibhet_ip weibu_sw weibul_p weibull weibull_c weibull_s weibullhet wh whelp whi which whil while wilc_st wilcoxon win wind windo window winexec wntestb wntestb_7 wntestq xchart xchart_7 xcorr xcorr_7 xi xi_6 xmlsav xmlsave xmluse xpose xsh xshe xshel xshell xt_iis xt_tis xtab_p xtabond xtbin_p xtclog xtcloglog xtcloglog_8 xtcloglog_d2 xtcloglog_pa_p xtcloglog_re_p xtcnt_p xtcorr xtdata xtdes xtfront_p xtfrontier xtgee xtgee_elink xtgee_estat xtgee_makeivar xtgee_p xtgee_plink xtgls xtgls_p xthaus xthausman xtht_p xthtaylor xtile xtint_p xtintreg xtintreg_8 xtintreg_d2 xtintreg_p xtivp_1 xtivp_2 xtivreg xtline xtline_ex xtlogit xtlogit_8 xtlogit_d2 xtlogit_fe_p xtlogit_pa_p xtlogit_re_p xtmixed xtmixed_estat xtmixed_p xtnb_fe xtnb_lf xtnbreg xtnbreg_pa_p xtnbreg_refe_p xtpcse xtpcse_p xtpois xtpoisson xtpoisson_d2 xtpoisson_pa_p xtpoisson_refe_p xtpred xtprobit xtprobit_8 xtprobit_d2 xtprobit_re_p xtps_fe xtps_lf xtps_ren xtps_ren_8 xtrar_p xtrc xtrc_p xtrchh xtrefe_p xtreg xtreg_be xtreg_fe xtreg_ml xtreg_pa_p xtreg_re xtregar xtrere_p xtset xtsf_ll xtsf_llti xtsum xttab xttest0 xttobit xttobit_8 xttobit_p xttrans yx yxview__barlike_draw yxview_area_draw yxview_bar_draw yxview_dot_draw yxview_dropline_draw yxview_function_draw yxview_iarrow_draw yxview_ilabels_draw yxview_normal_draw yxview_pcarrow_draw yxview_pcbarrow_draw yxview_pccapsym_draw yxview_pcscatter_draw yxview_pcspike_draw yxview_rarea_draw yxview_rbar_draw yxview_rbarm_draw yxview_rcap_draw yxview_rcapsym_draw yxview_rconnected_draw yxview_rline_draw yxview_rscatter_draw yxview_rspike_draw yxview_spike_draw yxview_sunflower_draw zap_s zinb zinb_llf zinb_plf zip zip_llf zip_p zip_plf zt_ct_5 zt_hc_5 zt_hcd_5 zt_is_5 zt_iss_5 zt_sho_5 zt_smp_5 ztbase_5 ztcox_5 ztdes_5 ztereg_5 ztfill_5 ztgen_5 ztir_5 ztjoin_5 ztnb ztnb_p ztp ztp_p zts_5 ztset_5 ztspli_5 ztsum_5 zttoct_5 ztvary_5 ztweib_5",c:[{cN:"symbol",b:/`[a-zA-Z0-9_]+'/},{cN:"variable",b:/\$\{?[a-zA-Z0-9_]+\}?/},{cN:"string",v:[{b:'`"[^\r\n]*?"\''},{b:'"[^\r\n"]*"'}]},{cN:"built_in",v:[{b:"\\b(abs|acos|asin|atan|atan2|atanh|ceil|cloglog|comb|cos|digamma|exp|floor|invcloglog|invlogit|ln|lnfact|lnfactorial|lngamma|log|log10|max|min|mod|reldif|round|sign|sin|sqrt|sum|tan|tanh|trigamma|trunc|betaden|Binomial|binorm|binormal|chi2|chi2tail|dgammapda|dgammapdada|dgammapdadx|dgammapdx|dgammapdxdx|F|Fden|Ftail|gammaden|gammap|ibeta|invbinomial|invchi2|invchi2tail|invF|invFtail|invgammap|invibeta|invnchi2|invnFtail|invnibeta|invnorm|invnormal|invttail|nbetaden|nchi2|nFden|nFtail|nibeta|norm|normal|normalden|normd|npnchi2|tden|ttail|uniform|abbrev|char|index|indexnot|length|lower|ltrim|match|plural|proper|real|regexm|regexr|regexs|reverse|rtrim|string|strlen|strlower|strltrim|strmatch|strofreal|strpos|strproper|strreverse|strrtrim|strtrim|strupper|subinstr|subinword|substr|trim|upper|word|wordcount|_caller|autocode|byteorder|chop|clip|cond|e|epsdouble|epsfloat|group|inlist|inrange|irecode|matrix|maxbyte|maxdouble|maxfloat|maxint|maxlong|mi|minbyte|mindouble|minfloat|minint|minlong|missing|r|recode|replay|return|s|scalar|d|date|day|dow|doy|halfyear|mdy|month|quarter|week|year|d|daily|dofd|dofh|dofm|dofq|dofw|dofy|h|halfyearly|hofd|m|mofd|monthly|q|qofd|quarterly|tin|twithin|w|weekly|wofd|y|yearly|yh|ym|yofd|yq|yw|cholesky|colnumb|colsof|corr|det|diag|diag0cnt|el|get|hadamard|I|inv|invsym|issym|issymmetric|J|matmissing|matuniform|mreldif|nullmat|rownumb|rowsof|sweep|syminv|trace|vec|vecdiag)(?=\\(|$)"}]},e.C("^[ 	]*\\*.*$",!1),e.CLCM,e.CBCM]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/subunit.js b/lib/highlight_js/assets/lang/subunit.js
new file mode 100644
index 00000000000..7f22dcbc88b
--- /dev/null
+++ b/lib/highlight_js/assets/lang/subunit.js
@@ -0,0 +1 @@
+hljs.registerLanguage("subunit",function(s){var r={cN:"string",b:"\\[\n(multipart)?",e:"\\]\n"},t={cN:"string",b:"\\d{4}-\\d{2}-\\d{2}(\\s+)\\d{2}:\\d{2}:\\d{2}.\\d+Z"},e={cN:"string",b:"(\\+|-)\\d+"},c={cN:"keyword",r:10,v:[{b:"^(test|testing|success|successful|failure|error|skip|xfail|uxsuccess)(:?)\\s+(test)?"},{b:"^progress(:?)(\\s+)?(pop|push)?"},{b:"^tags:"},{b:"^time:"}]};return{cI:!0,c:[r,t,e,c]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/swift.js b/lib/highlight_js/assets/lang/swift.js
index cf86f244eaa..77c0799c492 100644
--- a/lib/highlight_js/assets/lang/swift.js
+++ b/lib/highlight_js/assets/lang/swift.js
@@ -1 +1 @@
-hljs.registerLanguage("swift",function(e){var i={keyword:"__COLUMN__ __FILE__ __FUNCTION__ __LINE__ as as! as? associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},t={cN:"type",b:"\\b[A-Z][\\w']*",r:0},n=e.C("/\\*","\\*/",{c:["self"]}),r={cN:"subst",b:/\\\(/,e:"\\)",k:i,c:[]},a={cN:"number",b:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",r:0},o=e.inherit(e.QSM,{c:[r,e.BE]});return r.c=[a],{k:i,c:[o,e.CLCM,n,t,a,{cN:"function",bK:"func",e:"{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/,i:/\(/}),{b:/</,e:/>/,i:/>/},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:i,c:["self",a,o,e.CBCM,{b:":"}],i:/["']/}],i:/\[|%/},{cN:"class",bK:"struct protocol class extension enum",k:i,e:"\\{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/})]},{cN:"meta",b:"(@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain)"},{bK:"import",e:/$/,c:[e.CLCM,n]}]}});
\ No newline at end of file
+hljs.registerLanguage("swift",function(e){var i={keyword:"__COLUMN__ __FILE__ __FUNCTION__ __LINE__ as as! as? associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},t={cN:"type",b:"\\b[A-Z][\\wÀ-ʸ']*",r:0},n=e.C("/\\*","\\*/",{c:["self"]}),r={cN:"subst",b:/\\\(/,e:"\\)",k:i,c:[]},a={cN:"number",b:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",r:0},o=e.inherit(e.QSM,{c:[r,e.BE]});return r.c=[a],{k:i,c:[o,e.CLCM,n,t,a,{cN:"function",bK:"func",e:"{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{b:/</,e:/>/},{cN:"params",b:/\(/,e:/\)/,endsParent:!0,k:i,c:["self",a,o,e.CBCM,{b:":"}],i:/["']/}],i:/\[|%/},{cN:"class",bK:"struct protocol class extension enum",k:i,e:"\\{",eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{cN:"meta",b:"(@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain)"},{bK:"import",e:/$/,c:[e.CLCM,n]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/tap.js b/lib/highlight_js/assets/lang/tap.js
new file mode 100644
index 00000000000..51ffc9ab5bd
--- /dev/null
+++ b/lib/highlight_js/assets/lang/tap.js
@@ -0,0 +1 @@
+hljs.registerLanguage("tap",function(b){return{cI:!0,c:[b.HCM,{cN:"meta",v:[{b:"^TAP version (\\d+)$"},{b:"^1\\.\\.(\\d+)$"}]},{b:"(s+)?---$",e:"\\.\\.\\.$",sL:"yaml",r:0},{cN:"number",b:" (\\d+) "},{cN:"symbol",v:[{b:"^ok"},{b:"^not ok"}]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/typescript.js b/lib/highlight_js/assets/lang/typescript.js
index 5239016ae26..2d71f933fd4 100644
--- a/lib/highlight_js/assets/lang/typescript.js
+++ b/lib/highlight_js/assets/lang/typescript.js
@@ -1 +1 @@
-hljs.registerLanguage("typescript",function(e){var r={keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class public private protected get set super static implements enum export import declare type namespace abstract",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document any number boolean string void"};return{aliases:["ts"],k:r,c:[{cN:"meta",b:/^\s*['"]use strict['"]/},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM],r:0},{cN:"function",b:"function",e:/[\{;]/,eE:!0,k:r,c:["self",e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:r,c:[e.CLCM,e.CBCM],i:/["'\(]/}],i:/\[|%/,r:0},{bK:"constructor",e:/\{/,eE:!0},{bK:"module",e:/\{/,eE:!0},{bK:"interface",e:/\{/,eE:!0,k:"interface extends"},{b:/\$[(.]/},{b:"\\."+e.IR,r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("typescript",function(e){var r={keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class public private protected get set super static implements enum export import declare type namespace abstract as from extends async await",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document any number boolean string void Promise"};return{aliases:["ts"],k:r,c:[{cN:"meta",b:/^\s*['"]use strict['"]/},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+e.IR+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:e.IR},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:r,c:["self",e.CLCM,e.CBCM]}]}]}],r:0},{cN:"function",b:"function",e:/[\{;]/,eE:!0,k:r,c:["self",e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:r,c:[e.CLCM,e.CBCM],i:/["'\(]/}],i:/%/,r:0},{bK:"constructor",e:/\{/,eE:!0,c:["self",{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:r,c:[e.CLCM,e.CBCM],i:/["'\(]/}]},{b:/module\./,k:{built_in:"module"},r:0},{bK:"module",e:/\{/,eE:!0},{bK:"interface",e:/\{/,eE:!0,k:"interface extends"},{b:/\$[(.]/},{b:"\\."+e.IR,r:0},{cN:"meta",b:"@[A-Za-z]+"}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/vala.js b/lib/highlight_js/assets/lang/vala.js
index 157da9d57b4..3502d78666c 100644
--- a/lib/highlight_js/assets/lang/vala.js
+++ b/lib/highlight_js/assets/lang/vala.js
@@ -1 +1 @@
-hljs.registerLanguage("vala",function(t){return{k:{keyword:"char uchar unichar int uint long ulong short ushort int8 int16 int32 int64 uint8 uint16 uint32 uint64 float double bool struct enum string void weak unowned owned async signal static abstract interface override virtual delegate if while do for foreach else switch case break default return try catch public private protected internal using new this get set const stdout stdin stderr var",built_in:"DBus GLib CCode Gee Object Gtk",literal:"false true null"},c:[{cN:"class",bK:"class interface namespace",e:"{",eE:!0,i:"[^,:\\n\\s\\.]",c:[t.UTM]},t.CLCM,t.CBCM,{cN:"string",b:'"""',e:'"""',r:5},t.ASM,t.QSM,t.CNM,{cN:"meta",b:"^#",e:"$",r:2}]}});
\ No newline at end of file
+hljs.registerLanguage("vala",function(t){return{k:{keyword:"char uchar unichar int uint long ulong short ushort int8 int16 int32 int64 uint8 uint16 uint32 uint64 float double bool struct enum string void weak unowned owned async signal static abstract interface override virtual delegate if while do for foreach else switch case break default return try catch public private protected internal using new this get set const stdout stdin stderr var",built_in:"DBus GLib CCode Gee Object Gtk Posix",literal:"false true null"},c:[{cN:"class",bK:"class interface namespace",e:"{",eE:!0,i:"[^,:\\n\\s\\.]",c:[t.UTM]},t.CLCM,t.CBCM,{cN:"string",b:'"""',e:'"""',r:5},t.ASM,t.QSM,t.CNM,{cN:"meta",b:"^#",e:"$",r:2}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/vbnet.js b/lib/highlight_js/assets/lang/vbnet.js
index d32cd0fcc82..fb54a7a5cfe 100644
--- a/lib/highlight_js/assets/lang/vbnet.js
+++ b/lib/highlight_js/assets/lang/vbnet.js
@@ -1 +1 @@
-hljs.registerLanguage("vbnet",function(e){return{aliases:["vb"],cI:!0,k:{keyword:"addhandler addressof alias and andalso aggregate ansi as assembly auto binary by byref byval call case catch class compare const continue custom declare default delegate dim distinct do each equals else elseif end enum erase error event exit explicit finally for friend from function get global goto group handles if implements imports in inherits interface into is isfalse isnot istrue join key let lib like loop me mid mod module mustinherit mustoverride mybase myclass namespace narrowing new next not notinheritable notoverridable of off on operator option optional or order orelse overloads overridable overrides paramarray partial preserve private property protected public raiseevent readonly redim rem removehandler resume return select set shadows shared skip static step stop structure strict sub synclock take text then throw to try unicode until using when where while widening with withevents writeonly xor",built_in:"boolean byte cbool cbyte cchar cdate cdec cdbl char cint clng cobj csbyte cshort csng cstr ctype date decimal directcast double gettype getxmlnamespace iif integer long object sbyte short single string trycast typeof uinteger ulong ushort",literal:"true false nothing"},i:"//|{|}|endif|gosub|variant|wend",c:[e.inherit(e.QSM,{c:[{b:'""'}]}),e.C("'","$",{rB:!0,c:[{cN:"doctag",b:"'''|<!--|-->",c:[e.PWM]},{cN:"doctag",b:"</?",e:">",c:[e.PWM]}]}),e.CNM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elseif end region externalsource"}}]}});
\ No newline at end of file
+hljs.registerLanguage("vbnet",function(e){return{aliases:["vb"],cI:!0,k:{keyword:"addhandler addressof alias and andalso aggregate ansi as assembly auto binary by byref byval call case catch class compare const continue custom declare default delegate dim distinct do each equals else elseif end enum erase error event exit explicit finally for friend from function get global goto group handles if implements imports in inherits interface into is isfalse isnot istrue join key let lib like loop me mid mod module mustinherit mustoverride mybase myclass namespace narrowing new next not notinheritable notoverridable of off on operator option optional or order orelse overloads overridable overrides paramarray partial preserve private property protected public raiseevent readonly redim rem removehandler resume return select set shadows shared skip static step stop structure strict sub synclock take text then throw to try unicode until using when where while widening with withevents writeonly xor",built_in:"boolean byte cbool cbyte cchar cdate cdec cdbl char cint clng cobj csbyte cshort csng cstr ctype date decimal directcast double gettype getxmlnamespace iif integer long object sbyte short single string trycast typeof uinteger ulong ushort",literal:"true false nothing"},i:"//|{|}|endif|gosub|variant|wend|^\\$ ",c:[e.inherit(e.QSM,{c:[{b:'""'}]}),e.C("'","$",{rB:!0,c:[{cN:"doctag",b:"'''|<!--|-->",c:[e.PWM]},{cN:"doctag",b:"</?",e:">",c:[e.PWM]}]}),e.CNM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elseif end region externalsource"}}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/verilog.js b/lib/highlight_js/assets/lang/verilog.js
index b0842fa0469..538e658f93f 100644
--- a/lib/highlight_js/assets/lang/verilog.js
+++ b/lib/highlight_js/assets/lang/verilog.js
@@ -1 +1 @@
-hljs.registerLanguage("verilog",function(e){return{aliases:["v"],cI:!1,k:{keyword:"always and assign begin buf bufif0 bufif1 case casex casez cmos deassign default defparam disable edge else end endcase endfunction endmodule endprimitive endspecify endtable endtask event for force forever fork function if ifnone initial inout input join macromodule module nand negedge nmos nor not notif0 notif1 or output parameter pmos posedge primitive pulldown pullup rcmos release repeat rnmos rpmos rtran rtranif0 rtranif1 specify specparam table task timescale tran tranif0 tranif1 wait while xnor xor highz0 highz1 integer large medium pull0 pull1 real realtime reg scalared signed small strong0 strong1 supply0 supply0 supply1 supply1 time tri tri0 tri1 triand trior trireg vectored wand weak0 weak1 wire wor"},c:[e.CBCM,e.CLCM,e.QSM,{cN:"number",b:"(\\b((\\d'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+))|(\\B(('(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+))|(\\b([0-9xzXZ_])+)",c:[e.BE],r:0},{cN:"variable",b:"#\\((?!parameter).+\\)"}]}});
\ No newline at end of file
+hljs.registerLanguage("verilog",function(e){var n={keyword:"accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf|0 bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin function generate|5 genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import incdir include initial inout input inside instance int integer interconnect interface intersect join join_any join_none large let liblist library local localparam logic longint macromodule matches medium modport module nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 or output package packed parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor",literal:"null",built_in:"$finish $stop $exit $fatal $error $warning $info $realtime $time $printtimescale $bitstoreal $bitstoshortreal $itor $signed $cast $bits $stime $timeformat $realtobits $shortrealtobits $rtoi $unsigned $asserton $assertkill $assertpasson $assertfailon $assertnonvacuouson $assertoff $assertcontrol $assertpassoff $assertfailoff $assertvacuousoff $isunbounded $sampled $fell $changed $past_gclk $fell_gclk $changed_gclk $rising_gclk $steady_gclk $coverage_control $coverage_get $coverage_save $set_coverage_db_name $rose $stable $past $rose_gclk $stable_gclk $future_gclk $falling_gclk $changing_gclk $display $coverage_get_max $coverage_merge $get_coverage $load_coverage_db $typename $unpacked_dimensions $left $low $increment $clog2 $ln $log10 $exp $sqrt $pow $floor $ceil $sin $cos $tan $countbits $onehot $isunknown $fatal $warning $dimensions $right $high $size $asin $acos $atan $atan2 $hypot $sinh $cosh $tanh $asinh $acosh $atanh $countones $onehot0 $error $info $random $dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform $q_initialize $q_remove $q_exam $async$and$array $async$nand$array $async$or$array $async$nor$array $sync$and$array $sync$nand$array $sync$or$array $sync$nor$array $q_add $q_full $psprintf $async$and$plane $async$nand$plane $async$or$plane $async$nor$plane $sync$and$plane $sync$nand$plane $sync$or$plane $sync$nor$plane $system $display $displayb $displayh $displayo $strobe $strobeb $strobeh $strobeo $write $readmemb $readmemh $writememh $value$plusargs $dumpvars $dumpon $dumplimit $dumpports $dumpportson $dumpportslimit $writeb $writeh $writeo $monitor $monitorb $monitorh $monitoro $writememb $dumpfile $dumpoff $dumpall $dumpflush $dumpportsoff $dumpportsall $dumpportsflush $fclose $fdisplay $fdisplayb $fdisplayh $fdisplayo $fstrobe $fstrobeb $fstrobeh $fstrobeo $swrite $swriteb $swriteh $swriteo $fscanf $fread $fseek $fflush $feof $fopen $fwrite $fwriteb $fwriteh $fwriteo $fmonitor $fmonitorb $fmonitorh $fmonitoro $sformat $sformatf $fgetc $ungetc $fgets $sscanf $rewind $ftell $ferror"};return{aliases:["v","sv","svh"],cI:!1,k:n,l:/[\w\$]+/,c:[e.CBCM,e.CLCM,e.QSM,{cN:"number",c:[e.BE],v:[{b:"\\b((\\d+'(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{b:"\\B(('(b|h|o|d|B|H|O|D))[0-9xzXZa-fA-F_]+)"},{b:"\\b([0-9_])+",r:0}]},{cN:"variable",v:[{b:"#\\((?!parameter).+\\)"},{b:"\\.\\w+",r:0}]},{cN:"meta",b:"`",e:"$",k:{"meta-keyword":"define __FILE__ __LINE__ begin_keywords celldefine default_nettype define else elsif end_keywords endcelldefine endif ifdef ifndef include line nounconnected_drive pragma resetall timescale unconnected_drive undef undefineall"},r:0}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/vhdl.js b/lib/highlight_js/assets/lang/vhdl.js
index 4708c0f29c5..5d9c63f83f0 100644
--- a/lib/highlight_js/assets/lang/vhdl.js
+++ b/lib/highlight_js/assets/lang/vhdl.js
@@ -1 +1 @@
-hljs.registerLanguage("vhdl",function(e){var r="\\d(_|\\d)*",t="[eE][-+]?"+r,o=r+"(\\."+r+")?("+t+")?",n="\\w+",i=r+"#"+n+"(\\."+n+")?#("+t+")?",a="\\b("+i+"|"+o+")";return{cI:!0,k:{keyword:"abs access after alias all and architecture array assert attribute begin block body buffer bus case component configuration constant context cover disconnect downto default else elsif end entity exit fairness file for force function generate generic group guarded if impure in inertial inout is label library linkage literal loop map mod nand new next nor not null of on open or others out package port postponed procedure process property protected pure range record register reject release rem report restrict restrict_guarantee return rol ror select sequence severity shared signal sla sll sra srl strong subtype then to transport type unaffected units until use variable vmode vprop vunit wait when while with xnor xor",built_in:"boolean bit character severity_level integer time delay_length natural positive string bit_vector file_open_kind file_open_status std_ulogic std_ulogic_vector std_logic std_logic_vector unsigned signed boolean_vector integer_vector real_vector time_vector"},i:"{",c:[e.CBCM,e.C("--","$"),e.QSM,{cN:"number",b:a,r:0},{cN:"literal",b:"'(U|X|0|1|Z|W|L|H|-)'",c:[e.BE]},{cN:"symbol",b:"'[A-Za-z](_?[A-Za-z0-9])*",c:[e.BE]}]}});
\ No newline at end of file
+hljs.registerLanguage("vhdl",function(e){var r="\\d(_|\\d)*",t="[eE][-+]?"+r,n=r+"(\\."+r+")?("+t+")?",o="\\w+",i=r+"#"+o+"(\\."+o+")?#("+t+")?",a="\\b("+i+"|"+n+")";return{cI:!0,k:{keyword:"abs access after alias all and architecture array assert assume assume_guarantee attribute begin block body buffer bus case component configuration constant context cover disconnect downto default else elsif end entity exit fairness file for force function generate generic group guarded if impure in inertial inout is label library linkage literal loop map mod nand new next nor not null of on open or others out package port postponed procedure process property protected pure range record register reject release rem report restrict restrict_guarantee return rol ror select sequence severity shared signal sla sll sra srl strong subtype then to transport type unaffected units until use variable vmode vprop vunit wait when while with xnor xor",built_in:"boolean bit character integer time delay_length natural positive string bit_vector file_open_kind file_open_status std_logic std_logic_vector unsigned signed boolean_vector integer_vector std_ulogic std_ulogic_vector unresolved_unsigned u_unsigned unresolved_signed u_signedreal_vector time_vector",literal:"false true note warning error failure line text side width"},i:"{",c:[e.CBCM,e.C("--","$"),e.QSM,{cN:"number",b:a,r:0},{cN:"string",b:"'(U|X|0|1|Z|W|L|H|-)'",c:[e.BE]},{cN:"symbol",b:"'[A-Za-z](_?[A-Za-z0-9])*",c:[e.BE]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/vim.js b/lib/highlight_js/assets/lang/vim.js
index 4e8e6021ba8..1eedce5593c 100644
--- a/lib/highlight_js/assets/lang/vim.js
+++ b/lib/highlight_js/assets/lang/vim.js
@@ -1 +1 @@
-hljs.registerLanguage("vim",function(e){return{l:/[!#@\w]+/,k:{keyword:"N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank",built_in:"synIDtrans atan2 range matcharg did_filetype asin feedkeys xor argv complete_check add getwinposx getqflist getwinposy screencol clearmatches empty extend getcmdpos mzeval garbagecollect setreg ceil sqrt diff_hlID inputsecret get getfperm getpid filewritable shiftwidth max sinh isdirectory synID system inputrestore winline atan visualmode inputlist tabpagewinnr round getregtype mapcheck hasmapto histdel argidx findfile sha256 exists toupper getcmdline taglist string getmatches bufnr strftime winwidth bufexists strtrans tabpagebuflist setcmdpos remote_read printf setloclist getpos getline bufwinnr float2nr len getcmdtype diff_filler luaeval resolve libcallnr foldclosedend reverse filter has_key bufname str2float strlen setline getcharmod setbufvar index searchpos shellescape undofile foldclosed setqflist buflisted strchars str2nr virtcol floor remove undotree remote_expr winheight gettabwinvar reltime cursor tabpagenr finddir localtime acos getloclist search tanh matchend rename gettabvar strdisplaywidth type abs py3eval setwinvar tolower wildmenumode log10 spellsuggest bufloaded synconcealed nextnonblank server2client complete settabwinvar executable input wincol setmatches getftype hlID inputsave searchpair or screenrow line settabvar histadd deepcopy strpart remote_peek and eval getftime submatch screenchar winsaveview matchadd mkdir screenattr getfontname libcall reltimestr getfsize winnr invert pow getbufline byte2line soundfold repeat fnameescape tagfiles sin strwidth spellbadword trunc maparg log lispindent hostname setpos globpath remote_foreground getchar synIDattr fnamemodify cscope_connection stridx winbufnr indent min complete_add nr2char searchpairpos inputdialog values matchlist items hlexists strridx browsedir expand fmod pathshorten line2byte argc count getwinvar glob foldtextresult getreg foreground cosh matchdelete has char2nr simplify histget searchdecl iconv winrestcmd pumvisible writefile foldlevel haslocaldir keys cos matchstr foldtext histnr tan tempname getcwd byteidx getbufvar islocked escape eventhandler remote_send serverlist winrestview synstack pyeval prevnonblank readfile cindent filereadable changenr exp"},i:/[{:]/,c:[e.NM,e.ASM,{cN:"string",b:/"(\\"|\n\\|[^"\n])*"/},e.C('"',"$"),{cN:"variable",b:/[bwtglsav]:[\w\d_]*/},{cN:"function",bK:"function function!",e:"$",r:0,c:[e.TM,{cN:"params",b:"\\(",e:"\\)"}]},{cN:"symbol",b:/<[\w-]+>/}]}});
\ No newline at end of file
+hljs.registerLanguage("vim",function(e){return{l:/[!#@\w]+/,k:{keyword:"N|0 P|0 X|0 a|0 ab abc abo al am an|0 ar arga argd arge argdo argg argl argu as au aug aun b|0 bN ba bad bd be bel bf bl bm bn bo bp br brea breaka breakd breakl bro bufdo buffers bun bw c|0 cN cNf ca cabc caddb cad caddf cal cat cb cc ccl cd ce cex cf cfir cgetb cgete cg changes chd che checkt cl cla clo cm cmapc cme cn cnew cnf cno cnorea cnoreme co col colo com comc comp con conf cope cp cpf cq cr cs cst cu cuna cunme cw delm deb debugg delc delf dif diffg diffo diffp diffpu diffs diffthis dig di dl dell dj dli do doautoa dp dr ds dsp e|0 ea ec echoe echoh echom echon el elsei em en endfo endf endt endw ene ex exe exi exu f|0 files filet fin fina fini fir fix fo foldc foldd folddoc foldo for fu go gr grepa gu gv ha helpf helpg helpt hi hid his ia iabc if ij il im imapc ime ino inorea inoreme int is isp iu iuna iunme j|0 ju k|0 keepa kee keepj lN lNf l|0 lad laddb laddf la lan lat lb lc lch lcl lcs le lefta let lex lf lfir lgetb lgete lg lgr lgrepa lh ll lla lli lmak lm lmapc lne lnew lnf ln loadk lo loc lockv lol lope lp lpf lr ls lt lu lua luad luaf lv lvimgrepa lw m|0 ma mak map mapc marks mat me menut mes mk mks mksp mkv mkvie mod mz mzf nbc nb nbs new nm nmapc nme nn nnoreme noa no noh norea noreme norm nu nun nunme ol o|0 om omapc ome on ono onoreme opt ou ounme ow p|0 profd prof pro promptr pc ped pe perld po popu pp pre prev ps pt ptN ptf ptj ptl ptn ptp ptr pts pu pw py3 python3 py3d py3f py pyd pyf quita qa rec red redi redr redraws reg res ret retu rew ri rightb rub rubyd rubyf rund ru rv sN san sa sal sav sb sbN sba sbf sbl sbm sbn sbp sbr scrip scripte scs se setf setg setl sf sfir sh sim sig sil sl sla sm smap smapc sme sn sni sno snor snoreme sor so spelld spe spelli spellr spellu spellw sp spr sre st sta startg startr star stopi stj sts sun sunm sunme sus sv sw sy synti sync tN tabN tabc tabdo tabe tabf tabfir tabl tabm tabnew tabn tabo tabp tabr tabs tab ta tags tc tcld tclf te tf th tj tl tm tn to tp tr try ts tu u|0 undoj undol una unh unl unlo unm unme uns up ve verb vert vim vimgrepa vi viu vie vm vmapc vme vne vn vnoreme vs vu vunme windo w|0 wN wa wh wi winc winp wn wp wq wqa ws wu wv x|0 xa xmapc xm xme xn xnoreme xu xunme y|0 z|0 ~ Next Print append abbreviate abclear aboveleft all amenu anoremenu args argadd argdelete argedit argglobal arglocal argument ascii autocmd augroup aunmenu buffer bNext ball badd bdelete behave belowright bfirst blast bmodified bnext botright bprevious brewind break breakadd breakdel breaklist browse bunload bwipeout change cNext cNfile cabbrev cabclear caddbuffer caddexpr caddfile call catch cbuffer cclose center cexpr cfile cfirst cgetbuffer cgetexpr cgetfile chdir checkpath checktime clist clast close cmap cmapclear cmenu cnext cnewer cnfile cnoremap cnoreabbrev cnoremenu copy colder colorscheme command comclear compiler continue confirm copen cprevious cpfile cquit crewind cscope cstag cunmap cunabbrev cunmenu cwindow delete delmarks debug debuggreedy delcommand delfunction diffupdate diffget diffoff diffpatch diffput diffsplit digraphs display deletel djump dlist doautocmd doautoall deletep drop dsearch dsplit edit earlier echo echoerr echohl echomsg else elseif emenu endif endfor endfunction endtry endwhile enew execute exit exusage file filetype find finally finish first fixdel fold foldclose folddoopen folddoclosed foldopen function global goto grep grepadd gui gvim hardcopy help helpfind helpgrep helptags highlight hide history insert iabbrev iabclear ijump ilist imap imapclear imenu inoremap inoreabbrev inoremenu intro isearch isplit iunmap iunabbrev iunmenu join jumps keepalt keepmarks keepjumps lNext lNfile list laddexpr laddbuffer laddfile last language later lbuffer lcd lchdir lclose lcscope left leftabove lexpr lfile lfirst lgetbuffer lgetexpr lgetfile lgrep lgrepadd lhelpgrep llast llist lmake lmap lmapclear lnext lnewer lnfile lnoremap loadkeymap loadview lockmarks lockvar lolder lopen lprevious lpfile lrewind ltag lunmap luado luafile lvimgrep lvimgrepadd lwindow move mark make mapclear match menu menutranslate messages mkexrc mksession mkspell mkvimrc mkview mode mzscheme mzfile nbclose nbkey nbsart next nmap nmapclear nmenu nnoremap nnoremenu noautocmd noremap nohlsearch noreabbrev noremenu normal number nunmap nunmenu oldfiles open omap omapclear omenu only onoremap onoremenu options ounmap ounmenu ownsyntax print profdel profile promptfind promptrepl pclose pedit perl perldo pop popup ppop preserve previous psearch ptag ptNext ptfirst ptjump ptlast ptnext ptprevious ptrewind ptselect put pwd py3do py3file python pydo pyfile quit quitall qall read recover redo redir redraw redrawstatus registers resize retab return rewind right rightbelow ruby rubydo rubyfile rundo runtime rviminfo substitute sNext sandbox sargument sall saveas sbuffer sbNext sball sbfirst sblast sbmodified sbnext sbprevious sbrewind scriptnames scriptencoding scscope set setfiletype setglobal setlocal sfind sfirst shell simalt sign silent sleep slast smagic smapclear smenu snext sniff snomagic snoremap snoremenu sort source spelldump spellgood spellinfo spellrepall spellundo spellwrong split sprevious srewind stop stag startgreplace startreplace startinsert stopinsert stjump stselect sunhide sunmap sunmenu suspend sview swapname syntax syntime syncbind tNext tabNext tabclose tabedit tabfind tabfirst tablast tabmove tabnext tabonly tabprevious tabrewind tag tcl tcldo tclfile tearoff tfirst throw tjump tlast tmenu tnext topleft tprevious trewind tselect tunmenu undo undojoin undolist unabbreviate unhide unlet unlockvar unmap unmenu unsilent update vglobal version verbose vertical vimgrep vimgrepadd visual viusage view vmap vmapclear vmenu vnew vnoremap vnoremenu vsplit vunmap vunmenu write wNext wall while winsize wincmd winpos wnext wprevious wqall wsverb wundo wviminfo xit xall xmapclear xmap xmenu xnoremap xnoremenu xunmap xunmenu yank",built_in:"synIDtrans atan2 range matcharg did_filetype asin feedkeys xor argv complete_check add getwinposx getqflist getwinposy screencol clearmatches empty extend getcmdpos mzeval garbagecollect setreg ceil sqrt diff_hlID inputsecret get getfperm getpid filewritable shiftwidth max sinh isdirectory synID system inputrestore winline atan visualmode inputlist tabpagewinnr round getregtype mapcheck hasmapto histdel argidx findfile sha256 exists toupper getcmdline taglist string getmatches bufnr strftime winwidth bufexists strtrans tabpagebuflist setcmdpos remote_read printf setloclist getpos getline bufwinnr float2nr len getcmdtype diff_filler luaeval resolve libcallnr foldclosedend reverse filter has_key bufname str2float strlen setline getcharmod setbufvar index searchpos shellescape undofile foldclosed setqflist buflisted strchars str2nr virtcol floor remove undotree remote_expr winheight gettabwinvar reltime cursor tabpagenr finddir localtime acos getloclist search tanh matchend rename gettabvar strdisplaywidth type abs py3eval setwinvar tolower wildmenumode log10 spellsuggest bufloaded synconcealed nextnonblank server2client complete settabwinvar executable input wincol setmatches getftype hlID inputsave searchpair or screenrow line settabvar histadd deepcopy strpart remote_peek and eval getftime submatch screenchar winsaveview matchadd mkdir screenattr getfontname libcall reltimestr getfsize winnr invert pow getbufline byte2line soundfold repeat fnameescape tagfiles sin strwidth spellbadword trunc maparg log lispindent hostname setpos globpath remote_foreground getchar synIDattr fnamemodify cscope_connection stridx winbufnr indent min complete_add nr2char searchpairpos inputdialog values matchlist items hlexists strridx browsedir expand fmod pathshorten line2byte argc count getwinvar glob foldtextresult getreg foreground cosh matchdelete has char2nr simplify histget searchdecl iconv winrestcmd pumvisible writefile foldlevel haslocaldir keys cos matchstr foldtext histnr tan tempname getcwd byteidx getbufvar islocked escape eventhandler remote_send serverlist winrestview synstack pyeval prevnonblank readfile cindent filereadable changenr exp"},i:/;/,c:[e.NM,e.ASM,{cN:"string",b:/"(\\"|\n\\|[^"\n])*"/},e.C('"',"$"),{cN:"variable",b:/[bwtglsav]:[\w\d_]*/},{cN:"function",bK:"function function!",e:"$",r:0,c:[e.TM,{cN:"params",b:"\\(",e:"\\)"}]},{cN:"symbol",b:/<[\w-]+>/}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/x86asm.js b/lib/highlight_js/assets/lang/x86asm.js
index acd647a953f..e73566d2eb3 100644
--- a/lib/highlight_js/assets/lang/x86asm.js
+++ b/lib/highlight_js/assets/lang/x86asm.js
@@ -1 +1 @@
-hljs.registerLanguage("x86asm",function(s){return{cI:!0,l:"[.%]?"+s.IR,k:{keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0  xmm1  xmm2  xmm3  xmm4  xmm5  xmm6  xmm7  xmm8  xmm9 xmm10  xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0  ymm1  ymm2  ymm3  ymm4  ymm5  ymm6  ymm7  ymm8  ymm9 ymm10  ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0  zmm1  zmm2  zmm3  zmm4  zmm5  zmm6  zmm7  zmm8  zmm9 zmm10  zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__  __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__  __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},c:[s.C(";","$",{r:0}),{cN:"number",v:[{b:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",r:0},{b:"\\$[0-9][0-9A-Fa-f]*",r:0},{b:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{b:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QSM,{cN:"string",v:[{b:"'",e:"[^\\\\]'"},{b:"`",e:"[^\\\\]`"},{b:"\\.[A-Za-z0-9]+"}],r:0},{cN:"symbol",v:[{b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{b:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],r:0},{cN:"subst",b:"%[0-9]+",r:0},{cN:"subst",b:"%!S+",r:0}]}});
\ No newline at end of file
+hljs.registerLanguage("x86asm",function(s){return{cI:!0,l:"[.%]?"+s.IR,k:{keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0  xmm1  xmm2  xmm3  xmm4  xmm5  xmm6  xmm7  xmm8  xmm9 xmm10  xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0  ymm1  ymm2  ymm3  ymm4  ymm5  ymm6  ymm7  ymm8  ymm9 ymm10  ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0  zmm1  zmm2  zmm3  zmm4  zmm5  zmm6  zmm7  zmm8  zmm9 zmm10  zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__  __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__  __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},c:[s.C(";","$",{r:0}),{cN:"number",v:[{b:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",r:0},{b:"\\$[0-9][0-9A-Fa-f]*",r:0},{b:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{b:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QSM,{cN:"string",v:[{b:"'",e:"[^\\\\]'"},{b:"`",e:"[^\\\\]`"}],r:0},{cN:"symbol",v:[{b:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{b:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],r:0},{cN:"subst",b:"%[0-9]+",r:0},{cN:"subst",b:"%!S+",r:0},{cN:"meta",b:/^\s*\.[\w_-]+/}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/xml.js b/lib/highlight_js/assets/lang/xml.js
index 7b9bea07ef7..db72677b9bb 100644
--- a/lib/highlight_js/assets/lang/xml.js
+++ b/lib/highlight_js/assets/lang/xml.js
@@ -1 +1 @@
-hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/</,r:0,c:[{cN:"attr",b:e,r:0},{b:/=\s*/,r:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[t],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[t],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"meta",v:[{b:/<\?xml/,e:/\?>/,r:10},{b:/<\?\w+/,e:/\?>/}]},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}});
\ No newline at end of file
+hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/</,r:0,c:[{cN:"attr",b:e,r:0},{b:/=\s*/,r:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"meta",b:/<\?xml/,e:/\?>/,r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[t],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[t],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}});
\ No newline at end of file
diff --git a/lib/highlight_js/assets/lang/yaml.js b/lib/highlight_js/assets/lang/yaml.js
index 3e938a79bd9..80e8ce995f2 100644
--- a/lib/highlight_js/assets/lang/yaml.js
+++ b/lib/highlight_js/assets/lang/yaml.js
@@ -1 +1 @@
-hljs.registerLanguage("yaml",function(e){var a={literal:"{ } true false yes no Yes No True False null"},b="^[ \\-]*",r="[a-zA-Z_][\\w\\-]*",t={cN:"attr",v:[{b:b+r+":"},{b:b+'"'+r+'":'},{b:b+"'"+r+"':"}]},c={cN:"template-variable",v:[{b:"{{",e:"}}"},{b:"%{",e:"}"}]},l={cN:"string",r:0,v:[{b:/'/,e:/'/},{b:/"/,e:/"/}],c:[e.BE,c]};return{cI:!0,aliases:["yml","YAML","yaml"],c:[t,{cN:"meta",b:"^---s*$",r:10},{cN:"string",b:"[\\|>] *$",rE:!0,c:l.c,e:t.v[0].b},{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0,r:0},{cN:"type",b:"!!"+e.UIR},{cN:"meta",b:"&"+e.UIR+"$"},{cN:"meta",b:"\\*"+e.UIR+"$"},{cN:"bullet",b:"^ *-",r:0},l,e.HCM,e.CNM],k:a}});
\ No newline at end of file
+hljs.registerLanguage("yaml",function(e){var b="true false yes no null",a="^[ \\-]*",r="[a-zA-Z_][\\w\\-]*",t={cN:"attr",v:[{b:a+r+":"},{b:a+'"'+r+'":'},{b:a+"'"+r+"':"}]},c={cN:"template-variable",v:[{b:"{{",e:"}}"},{b:"%{",e:"}"}]},l={cN:"string",r:0,v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/\S+/}],c:[e.BE,c]};return{cI:!0,aliases:["yml","YAML","yaml"],c:[t,{cN:"meta",b:"^---s*$",r:10},{cN:"string",b:"[\\|>] *$",rE:!0,c:l.c,e:t.v[0].b},{b:"<%[%=-]?",e:"[%-]?%>",sL:"ruby",eB:!0,eE:!0,r:0},{cN:"type",b:"!!"+e.UIR},{cN:"meta",b:"&"+e.UIR+"$"},{cN:"meta",b:"\\*"+e.UIR+"$"},{cN:"bullet",b:"^ *-",r:0},e.HCM,{bK:b,k:{literal:b}},e.CNM,l]}});
\ No newline at end of file
diff --git a/lib/html_normalize.rb b/lib/html_normalize.rb
new file mode 100644
index 00000000000..072789c0cba
--- /dev/null
+++ b/lib/html_normalize.rb
@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+#
+# this class is used to normalize html output for internal comparisons in specs
+#
+require 'oga'
+
+class HtmlNormalize
+
+  def self.normalize(html)
+    parsed = Oga.parse_html(html.strip, strict: true)
+    if parsed.children.length != 1
+      puts parsed.children.count
+      raise "expecting a single child"
+    end
+    new(parsed.children.first).format
+  end
+
+  SELF_CLOSE = Set.new(%w{area base br col command embed hr img input keygen line meta param source track wbr})
+
+  BLOCK = Set.new(%w{
+    html
+    body
+    aside
+    p
+    h1 h2 h3 h4 h5 h6
+    ol ul
+    address
+    blockquote
+    dl
+    div
+    fieldset
+    form
+    hr
+    noscript
+    table
+    pre
+  })
+
+  def initialize(doc)
+    @doc = doc
+  end
+
+  def format
+    buffer = String.new
+    dump_node(@doc, 0, buffer)
+    buffer.strip!
+    buffer
+  end
+
+  def inline?(node)
+    Oga::XML::Text === node || !BLOCK.include?(node.name.downcase)
+  end
+
+  def dump_node(node, indent=0, buffer)
+
+    if Oga::XML::Text === node
+      if node.parent&.name
+        buffer << node.text
+      end
+      return
+    end
+
+    name = node.name.downcase
+
+    block = BLOCK.include?(name)
+
+    buffer << " " * indent * 2 if block
+
+    buffer << "<" << name
+
+    attrs = node&.attributes
+    if (attrs && attrs.length > 0)
+      attrs.sort!{|x,y| x.name <=> y.name}
+      attrs.each do |a|
+        buffer << " "
+        buffer << a.name
+        buffer << "='"
+        buffer << a.value
+        buffer << "'"
+      end
+    end
+
+    buffer << ">"
+
+    if block
+      buffer << "\n"
+    end
+
+    children = node.children
+    children = trim(children) if block
+
+    inline_buffer = nil
+
+    children&.each do |child|
+      if block && inline?(child)
+        inline_buffer ||= String.new
+        dump_node(child, indent+1, inline_buffer)
+      else
+        if inline_buffer
+          buffer << " " * (indent+1) * 2
+          buffer << inline_buffer.strip
+          inline_buffer = nil
+        else
+          dump_node(child, indent+1, buffer)
+        end
+      end
+    end
+
+    if inline_buffer
+      buffer << " " * (indent+1) * 2
+      buffer << inline_buffer.strip
+      inline_buffer = nil
+    end
+
+    if block
+      buffer << "\n" unless buffer[-1] == "\n"
+      buffer << " " * indent * 2
+    end
+
+    unless SELF_CLOSE.include?(name)
+      buffer << "</" << name
+      buffer << ">\n"
+    end
+  end
+
+  def trim(nodes)
+    start = 0
+    finish = nodes.length
+
+    nodes.each do |n|
+      if Oga::XML::Text === n && n.text.blank?
+        start += 1
+      else
+        break
+      end
+    end
+
+    nodes.reverse_each do |n|
+      if Oga::XML::Text === n && n.text.blank?
+        finish -= 1
+      else
+        break
+      end
+    end
+
+    nodes[start...finish]
+  end
+
+
+end
diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb
index 99b19724b76..f940bd8804d 100644
--- a/lib/i18n/backend/discourse_i18n.rb
+++ b/lib/i18n/backend/discourse_i18n.rb
@@ -72,10 +72,12 @@ module I18n
         # the original translations before applying our overrides.
         def lookup(locale, key, scope = [], options = {})
           existing_translations = super(locale, key, scope, options)
+          return existing_translations if scope.is_a?(Array) && scope.include?(:models)
 
-          if options[:overrides] && existing_translations
-            if options[:count]
+          overrides = options.dig(:overrides, locale)
 
+          if overrides
+            if existing_translations && options[:count]
               remapped_translations =
                 if existing_translations.is_a?(Hash)
                   Hash[existing_translations.map { |k, v| ["#{key}.#{k}", v] }]
@@ -85,13 +87,13 @@ module I18n
 
               result = {}
 
-              remapped_translations.merge(options[:overrides]).each do |k, v|
+              remapped_translations.merge(overrides).each do |k, v|
                 result[k.split('.').last.to_sym] = v if k != key && k.start_with?(key.to_s)
               end
               return result if result.size > 0
             end
 
-            return options[:overrides][key] if options[:overrides][key]
+            return overrides[key] if overrides[key]
           end
 
           existing_translations
diff --git a/lib/i18n/i18n_interpolation_keys_finder.rb b/lib/i18n/i18n_interpolation_keys_finder.rb
new file mode 100644
index 00000000000..cc91e806b96
--- /dev/null
+++ b/lib/i18n/i18n_interpolation_keys_finder.rb
@@ -0,0 +1,9 @@
+class I18nInterpolationKeysFinder
+  def self.find(text)
+    keys = text.scan(I18n::INTERPOLATION_PATTERN)
+    keys.flatten!
+    keys.compact!
+    keys.uniq!
+    keys
+  end
+end
diff --git a/lib/import_export/topic_importer.rb b/lib/import_export/topic_importer.rb
index e7fc2d8f365..57496c5dab3 100644
--- a/lib/import_export/topic_importer.rb
+++ b/lib/import_export/topic_importer.rb
@@ -18,7 +18,7 @@ module ImportExport
 
     def import_users
       @export_data[:users].each do |u|
-        existing = User.where(email: u[:email]).first
+        existing = User.with_email(email: u[:email]).first
         if existing
           if existing.custom_fields["import_id"] != u[:id]
             existing.custom_fields["import_id"] = u[:id]
diff --git a/lib/inline_oneboxer.rb b/lib/inline_oneboxer.rb
new file mode 100644
index 00000000000..b064794882a
--- /dev/null
+++ b/lib/inline_oneboxer.rb
@@ -0,0 +1,73 @@
+require_dependency 'retrieve_title'
+
+class InlineOneboxer
+
+  def initialize(urls, opts=nil)
+    @urls = urls
+    @opts = opts || {}
+  end
+
+  def process
+    @urls.map {|url| InlineOneboxer.lookup(url, @opts) }.compact
+  end
+
+  def self.purge(url)
+    Rails.cache.delete(cache_key(url))
+  end
+
+  def self.cache_lookup(url)
+    Rails.cache.read(cache_key(url))
+  end
+
+  def self.lookup(url, opts=nil)
+    opts ||= {}
+
+    unless opts[:skip_cache]
+      cached = cache_lookup(url)
+      return cached if cached.present?
+    end
+
+    if route = Discourse.route_for(url)
+      if route[:controller] == "topics" &&
+        route[:action] == "show" &&
+        topic = (Topic.where(id: route[:topic_id].to_i).first rescue nil)
+
+        return onebox_for(url, topic.title, opts) if Guardian.new.can_see?(topic)
+      end
+    end
+
+    if whitelist = SiteSetting.inline_onebox_domains_whitelist
+      uri = URI(url) rescue nil
+
+      domains = whitelist.split('|')
+      if uri.present? &&
+        uri.hostname.present? &&
+        domains.include?(uri.hostname) &&
+        title = RetrieveTitle.crawl(url)
+          return onebox_for(url, title, opts)
+      end
+    end
+
+    nil
+  end
+
+  private
+
+    def self.onebox_for(url, title, opts)
+      onebox = {
+        url: url,
+        title: Emoji.gsub_emoji_to_unicode(title)
+      }
+      unless opts[:skip_cache]
+        Rails.cache.write(cache_key(url), onebox, expires_in: 1.day)
+      end
+
+      onebox
+    end
+
+    def self.cache_key(url)
+      "inline_onebox:#{url}"
+    end
+
+end
+
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 44a2fe537ea..2aa8d65a0f1 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -161,6 +161,7 @@ module JsLocaleHelper
   end
 
   def self.reset_context
+    @ctx&.dispose
     @ctx = nil
   end
 
diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb
index 149ac3f009e..467d6db9d82 100644
--- a/lib/middleware/anonymous_cache.rb
+++ b/lib/middleware/anonymous_cache.rb
@@ -1,5 +1,6 @@
 require_dependency "mobile_detection"
 require_dependency "crawler_detection"
+require_dependency "guardian"
 
 module Middleware
   class AnonymousCache
@@ -15,6 +16,7 @@ module Middleware
 
       def initialize(env)
         @env = env
+        @request = Rack::Request.new(@env)
       end
 
       def is_mobile=(val)
@@ -54,7 +56,16 @@ module Middleware
       end
 
       def cache_key
-        @cache_key ||= "ANON_CACHE_#{@env["HTTP_ACCEPT"]}_#{@env["HTTP_HOST"]}#{@env["REQUEST_URI"]}|m=#{is_mobile?}|c=#{is_crawler?}|b=#{has_brotli?}"
+        @cache_key ||= "ANON_CACHE_#{@env["HTTP_ACCEPT"]}_#{@env["HTTP_HOST"]}#{@env["REQUEST_URI"]}|m=#{is_mobile?}|c=#{is_crawler?}|b=#{has_brotli?}|t=#{theme_key}"
+      end
+
+      def theme_key
+        key,_ = @request.cookies['theme_key']&.split(',')
+        if key && Guardian.new.allow_theme?(key)
+          key
+        else
+          nil
+        end
       end
 
       def cache_key_body
diff --git a/lib/onebox/engine/discourse_local_onebox.rb b/lib/onebox/engine/discourse_local_onebox.rb
index 629cfd6d914..3ee243ffdde 100644
--- a/lib/onebox/engine/discourse_local_onebox.rb
+++ b/lib/onebox/engine/discourse_local_onebox.rb
@@ -56,7 +56,7 @@ module Onebox
             excerpt.gsub!(/[\r\n]+/, " ")
             excerpt.gsub!("[/quote]", "[quote]") # don't break my quote
 
-            quote = "[quote=\"#{post.user.username}, topic:#{topic.id}, slug:#{slug}, post:#{post.post_number}\"]#{excerpt}[/quote]"
+            quote = "[quote=\"#{post.user.username}, topic:#{topic.id}, slug:#{slug}, post:#{post.post_number}\"]\n#{excerpt}\n[/quote]"
 
             args = {}
             args[:topic_id] = source_topic_id if source_topic_id > 0
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index d90475c36b7..c08d619d6af 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -17,6 +17,10 @@ module Oneboxer
     end
   end
 
+  def self.ignore_redirects
+    @ignore_redirects ||= ['http://store.steampowered.com', Discourse.base_url]
+  end
+
   def self.preview(url, options=nil)
     options ||= {}
     invalidate(url) if options[:invalidate_oneboxes]
@@ -142,12 +146,19 @@ module Oneboxer
     end
 
     def self.onebox_raw(url)
-
       Rails.cache.fetch(onebox_cache_key(url), expires_in: 1.day) do
-        uri = FinalDestination.new(url).resolve
+        fd = FinalDestination.new(url, ignore_redirects: ignore_redirects)
+        uri = fd.resolve
         return blank_onebox if uri.blank? || SiteSetting.onebox_domains_blacklist.include?(uri.hostname)
-        options = { cache: {}, max_width: 695, sanitize_config: Sanitize::Config::DISCOURSE_ONEBOX }
-        r = Onebox.preview(url, options)
+        options = {
+          cache: {},
+          max_width: 695,
+          sanitize_config: Sanitize::Config::DISCOURSE_ONEBOX
+        }
+
+        options[:cookie] = fd.cookie if fd.cookie
+
+        r = Onebox.preview(uri.to_s, options)
         { onebox: r.to_s, preview: r.try(:placeholder_html).to_s }
       end
     rescue => e
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index bcf8954d2bd..123fccc396b 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -25,7 +25,13 @@ class Plugin::Metadata
     "poll",
     "discourse-plugin-linkedin-auth",
     "discourse-plugin-office365-auth",
-    "discourse-oauth2-basic"
+    "discourse-oauth2-basic",
+    "discourse-math",
+    "discourse-bbcode-color",
+    "discourse-bbcode",
+    "discourse-affiliate",
+    "discourse-translator",
+    "discourse-patreon"
   ])
 
   FIELDS ||= [:name, :about, :version, :authors, :url, :required_version]
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index cfcdc7b1cd9..405a7e0537a 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -92,6 +92,12 @@ class PostCreator
       return false
     end
 
+    # Make sure max_allowed_message_recipients setting is respected
+    if @opts[:target_usernames].present? && !skip_validations? && !@user.staff?
+      errors[:base] << I18n.t(:max_pm_recepients, recipients_limit: SiteSetting.max_allowed_message_recipients) if @opts[:target_usernames].split(',').length > SiteSetting.max_allowed_message_recipients
+      return false if errors[:base].present?
+    end
+
     # Make sure none of the users have muted the creator
     names = @opts[:target_usernames]
     if names.present? && !skip_validations? && !@user.staff?
@@ -190,7 +196,11 @@ class PostCreator
 
   def enqueue_jobs
     return unless @post && !@post.errors.present?
-    PostJobsEnqueuer.new(@post, @topic, new_topic?, {import_mode: @opts[:import_mode]}).enqueue_jobs
+
+    PostJobsEnqueuer.new(@post, @topic, new_topic?,
+      import_mode: @opts[:import_mode],
+      post_alert_options: @opts[:post_alert_options]
+    ).enqueue_jobs
   end
 
   def self.track_post_stats
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index 22821fa5eac..07f34e85ee7 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -44,10 +44,12 @@ class PostDestroyer
   end
 
   def destroy
-    if @user.staff? || SiteSetting.delete_removed_posts_after < 1
+    delete_removed_posts_after = @opts[:delete_removed_posts_after] || SiteSetting.delete_removed_posts_after
+
+    if @user.staff? || delete_removed_posts_after < 1
       perform_delete
     elsif @user.id == @post.user_id
-      mark_for_deletion
+      mark_for_deletion(delete_removed_posts_after)
     end
     DiscourseEvent.trigger(:post_destroyed, @post, @opts, @user)
 
@@ -115,11 +117,14 @@ class PostDestroyer
   end
 
   # When a user 'deletes' their own post. We just change the text.
-  def mark_for_deletion
+  def mark_for_deletion(delete_removed_posts_after = SiteSetting.delete_removed_posts_after)
     I18n.with_locale(SiteSetting.default_locale) do
 
       # don't call revise from within transaction, high risk of deadlock
-      @post.revise(@user, { raw: I18n.t('js.post.deleted_by_author', count: SiteSetting.delete_removed_posts_after) }, force_new_version: true)
+      @post.revise(@user,
+        { raw: I18n.t('js.post.deleted_by_author', count: delete_removed_posts_after) },
+        force_new_version: true
+      )
 
       Post.transaction do
         @post.update_column(:user_deleted, true)
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index 0e05c565f9f..3227f76c3cf 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -22,7 +22,7 @@ class PostJobsEnqueuer
   private
 
   def enqueue_post_alerts
-    Jobs.enqueue(:post_alert, post_id: @post.id)
+    Jobs.enqueue(:post_alert, post_id: @post.id, options: @opts[:post_alert_options])
   end
 
   def feature_topic_users
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 9b9ef68d54b..831faa47b43 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -442,11 +442,13 @@ class PostRevisor
     doc = Nokogiri::HTML.fragment(@post.cooked)
     doc.css("img").remove
 
-    html = doc.css("p").first.inner_html.strip
-    new_description = html unless html.starts_with?(Category.post_template[0..50])
-
-    category.update_column(:description, new_description)
-    @category_changed = category
+    if html = doc.css("p").first&.inner_html&.strip
+      new_description = html unless html.starts_with?(Category.post_template[0..50])
+      category.update_column(:description, new_description)
+      @category_changed = category
+    else
+      @post.errors[:base] << I18n.t("category.errors.description_incomplete")
+    end
   end
 
   def advance_draft_sequence
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index d9000e102f8..69e60f1bed7 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -50,19 +50,10 @@ module PrettyText
     end
   end
 
-  def self.create_es6_context
-    ctx = MiniRacer::Context.new(timeout: 15000)
-
-    ctx.eval("window = {}; window.devicePixelRatio = 2;") # hack to make code think stuff is retina
-
-    if Rails.env.development? || Rails.env.test?
-      ctx.attach("console.log", proc { |l| p l })
-    end
-
-    ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
-    ctx_load(ctx, "vendor/assets/javascripts/lodash.js")
-    manifest = File.read("#{Rails.root}/app/assets/javascripts/pretty-text-bundle.js")
+  def self.ctx_load_manifest(ctx, name)
+    manifest = File.read("#{Rails.root}/app/assets/javascripts/#{name}")
     root_path = "#{Rails.root}/app/assets/javascripts/"
+
     manifest.each_line do |l|
       l = l.chomp
       if l =~ /\/\/= require (\.\/)?(.*)$/
@@ -74,6 +65,23 @@ module PrettyText
         end
       end
     end
+  end
+
+  def self.create_es6_context
+    ctx = MiniRacer::Context.new(timeout: 15000)
+
+    ctx.eval("window = {}; window.devicePixelRatio = 2;") # hack to make code think stuff is retina
+
+    if Rails.env.development? || Rails.env.test?
+      ctx.attach("console.log", proc { |l| p l })
+      ctx.eval('window.console = console;')
+    end
+
+    ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
+    ctx_load(ctx, "vendor/assets/javascripts/lodash.js")
+    ctx_load_manifest(ctx, "pretty-text-bundle.js")
+    ctx_load_manifest(ctx, "markdown-it-bundle.js")
+    root_path = "#{Rails.root}/app/assets/javascripts/"
 
     apply_es6_file(ctx, root_path, "discourse/lib/utilities")
 
@@ -115,6 +123,7 @@ module PrettyText
 
   def self.reset_context
     @ctx_init.synchronize do
+      @ctx&.dispose
       @ctx = nil
     end
   end
@@ -140,52 +149,61 @@ module PrettyText
         paths[:S3BaseUrl] = Discourse.store.absolute_base_url
       end
 
-      context.eval("__optInput = {};")
-      context.eval("__optInput.siteSettings = #{SiteSetting.client_settings_json};")
-      context.eval("__paths = #{paths.to_json};")
-
-      if opts[:topicId]
-        context.eval("__optInput.topicId = #{opts[:topicId].to_i};")
-      end
-
-      context.eval("__optInput.userId = #{opts[:user_id].to_i};") if opts[:user_id]
-
-      context.eval("__optInput.getURL = __getURL;")
-      context.eval("__optInput.getCurrentUser = __getCurrentUser;")
-      context.eval("__optInput.lookupAvatar = __lookupAvatar;")
-      context.eval("__optInput.getTopicInfo = __getTopicInfo;")
-      context.eval("__optInput.categoryHashtagLookup = __categoryLookup;")
-      context.eval("__optInput.mentionLookup = __mentionLookup;")
-
       custom_emoji = {}
       Emoji.custom.map { |e| custom_emoji[e.name] = e.url }
-      context.eval("__optInput.customEmoji = #{custom_emoji.to_json};")
 
-      context.eval('__textOptions = __buildOptions(__optInput);')
+      buffer = <<~JS
+        __optInput = {};
+        __optInput.siteSettings = #{SiteSetting.client_settings_json};
+        __paths = #{paths.to_json};
+        __optInput.getURL = __getURL;
+        __optInput.getCurrentUser = __getCurrentUser;
+        __optInput.lookupAvatar = __lookupAvatar;
+        __optInput.getTopicInfo = __getTopicInfo;
+        __optInput.categoryHashtagLookup = __categoryLookup;
+        __optInput.mentionLookup = __mentionLookup;
+        __optInput.customEmoji = #{custom_emoji.to_json};
+        __optInput.emojiUnicodeReplacer = __emojiUnicodeReplacer;
+        __optInput.lookupInlineOnebox = __lookupInlineOnebox;
+        #{opts[:linkify] == false ? "__optInput.linkify = false;": ""}
+      JS
+
+      if opts[:topicId]
+        buffer << "__optInput.topicId = #{opts[:topicId].to_i};\n"
+      end
+
+      if opts[:user_id]
+        buffer << "__optInput.userId = #{opts[:user_id].to_i};\n"
+      end
+
+      buffer << "__textOptions = __buildOptions(__optInput);\n"
+
+
+      buffer << ("__pt = new __PrettyText(__textOptions);")
 
       # Be careful disabling sanitization. We allow for custom emails
       if opts[:sanitize] == false
-        context.eval('__textOptions.sanitize = false;')
+        buffer << ('__pt.disableSanitizer();')
       end
 
-      opts = context.eval("__pt = new __PrettyText(__textOptions);")
+      opts = context.eval(buffer)
 
       DiscourseEvent.trigger(:markdown_context, context)
       baked = context.eval("__pt.cook(#{text.inspect})")
     end
 
-    if baked.blank? && !(opts || {})[:skip_blank_test]
-      # we may have a js engine issue
-      test = markdown("a", skip_blank_test: true)
-      if test.blank?
-        Rails.logger.warn("Markdown engine appears to have crashed, resetting context")
-        reset_context
-        opts ||= {}
-        opts = opts.dup
-        opts[:skip_blank_test] = true
-        baked = markdown(text, opts)
-      end
-    end
+    # if baked.blank? && !(opts || {})[:skip_blank_test]
+    #   # we may have a js engine issue
+    #   test = markdown("a", skip_blank_test: true)
+    #   if test.blank?
+    #     Rails.logger.warn("Markdown engine appears to have crashed, resetting context")
+    #     reset_context
+    #     opts ||= {}
+    #     opts = opts.dup
+    #     opts[:skip_blank_test] = true
+    #     baked = markdown(text, opts)
+    #   end
+    # end
 
     baked
   end
diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb
index abcb5b6665c..c9859e04ad7 100644
--- a/lib/pretty_text/helpers.rb
+++ b/lib/pretty_text/helpers.rb
@@ -1,3 +1,5 @@
+require_dependency 'inline_oneboxer'
+
 module PrettyText
   module Helpers
     extend self
@@ -43,6 +45,10 @@ module PrettyText
       end
     end
 
+    def lookup_inline_onebox(url)
+      InlineOneboxer.lookup(url)
+    end
+
     def get_topic_info(topic_id)
       return unless topic_id.is_a?(Integer)
       # TODO this only handles public topics, secured one do not get this
diff --git a/lib/pretty_text/shims.js b/lib/pretty_text/shims.js
index c156fdb0cd7..dc0ede53de7 100644
--- a/lib/pretty_text/shims.js
+++ b/lib/pretty_text/shims.js
@@ -3,7 +3,26 @@ __buildOptions = require('pretty-text/pretty-text').buildOptions;
 __performEmojiUnescape = require('pretty-text/emoji').performEmojiUnescape;
 
 __utils = require('discourse/lib/utilities');
-__setUnicode = require('pretty-text/engines/discourse-markdown/emoji').setUnicodeReplacements;
+
+__emojiUnicodeReplacer = null;
+
+__setUnicode = function(replacements) {
+  let unicodeRegexp = new RegExp(Object.keys(replacements).sort().reverse().join("|"), "g");
+
+  __emojiUnicodeReplacer = function(text) {
+    unicodeRegexp.lastIndex = 0;
+    let m;
+    while ((m = unicodeRegexp.exec(text)) !== null) {
+      let replacement = ":" + replacements[m[0]] + ":";
+      const before = text.charAt(m.index-1);
+      if (!/\B/.test(before)) {
+        replacement = "\u200b" + replacement;
+      }
+      text = text.replace(m[0], replacement);
+    }
+    return text;
+  };
+};
 
 __paths = {};
 
@@ -30,6 +49,10 @@ function __getURL(url) {
   return url;
 }
 
+function __lookupInlineOnebox(url) {
+  return __helpers.lookup_inline_onebox(url);
+}
+
 function __getTopicInfo(i) {
   return __helpers.get_topic_info(i);
 }
diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb
new file mode 100644
index 00000000000..62d5498c157
--- /dev/null
+++ b/lib/retrieve_title.rb
@@ -0,0 +1,70 @@
+require_dependency 'final_destination'
+
+module RetrieveTitle
+  class ReadEnough < StandardError; end
+
+  def self.crawl(url)
+    extract_title(fetch_beginning(url))
+  rescue Exception
+    # If there was a connection error, do nothing
+  end
+
+  def self.extract_title(html)
+    title = nil
+    if doc = Nokogiri::HTML(html)
+
+      if node = doc.at('meta[property="og:title"]')
+        title = node['content']
+      end
+
+      title ||= doc.at('title')&.inner_text
+    end
+
+    if title.present?
+      title.gsub!(/\n/, ' ')
+      title.gsub!(/ +/, ' ')
+      title.strip!
+      return title
+    end
+    nil
+  end
+
+  private
+
+    def self.max_chunk_size(uri)
+      # Amazon leaves the title until very late. Normally it's a bad idea to make an exception for
+      # one host but amazon is a big one.
+      return 80 if uri.host =~ /amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)$/
+
+      # default is 10k
+      10
+    end
+
+    # Fetch the beginning of a HTML document at a url
+    def self.fetch_beginning(url)
+      # Never crawl in test mode
+      return if Rails.env.test?
+
+      fd = FinalDestination.new(url)
+      uri = fd.resolve
+      return "" unless uri
+
+      result = ""
+      streamer = lambda do |chunk, _, _|
+        result << chunk
+
+        # Using exceptions for flow control is really bad, but there really seems to
+        # be no sane way to get a stream to stop reading in Excon (or Net::HTTP for
+        # that matter!)
+        raise ReadEnough.new if result.size > (max_chunk_size(uri) * 1024)
+      end
+      Excon.get(uri.to_s, response_block: streamer, read_timeout: 20, headers: fd.request_headers)
+      result
+
+    rescue Excon::Errors::SocketError => ex
+      return result if ex.socket_error.is_a?(ReadEnough)
+      raise
+    rescue ReadEnough
+      result
+    end
+end
diff --git a/app/models/rtl.rb b/lib/rtl.rb
similarity index 97%
rename from app/models/rtl.rb
rename to lib/rtl.rb
index 79f48603e02..b6df383b587 100644
--- a/app/models/rtl.rb
+++ b/lib/rtl.rb
@@ -1,4 +1,4 @@
-class RTL
+class Rtl
 
   attr_reader :user
 
diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb
index ec8e249e9b3..48466a6687c 100644
--- a/lib/scheduler/manager.rb
+++ b/lib/scheduler/manager.rb
@@ -34,16 +34,7 @@ module Scheduler
         end
         @thread = Thread.new do
           while !@stopped
-            if @manager.enable_stats
-              begin
-                RailsMultisite::ConnectionManagement.establish_connection(db: "default")
-                process_queue
-              ensure
-                ActiveRecord::Base.connection_handler.clear_active_connections!
-              end
-            else
-              process_queue
-            end
+            process_queue
           end
         end
       end
@@ -69,6 +60,7 @@ module Scheduler
       end
 
       def process_queue
+
         klass = @queue.deq
         return unless klass
 
@@ -83,15 +75,23 @@ module Scheduler
         begin
           info.prev_result = "RUNNING"
           @mutex.synchronize { info.write! }
+
           if @manager.enable_stats
-            stat = SchedulerStat.create!(
-              name: klass.to_s,
-              hostname: hostname,
-              pid: Process.pid,
-              started_at: Time.zone.now,
-              live_slots_start: GC.stat[:heap_live_slots]
-            )
+            begin
+              RailsMultisite::ConnectionManagement.establish_connection(db: "default")
+
+              stat = SchedulerStat.create!(
+                name: klass.to_s,
+                hostname: hostname,
+                pid: Process.pid,
+                started_at: Time.zone.now,
+                live_slots_start: GC.stat[:heap_live_slots]
+              )
+            ensure
+              ActiveRecord::Base.connection_handler.clear_active_connections!
+            end
           end
+
           klass.new.perform
         rescue => e
           if e.class != Jobs::HandledExceptionWrapper
@@ -120,21 +120,31 @@ module Scheduler
         Discourse.handle_job_exception(ex, {message: "Processing scheduled job queue"})
       ensure
         @running = false
+        ActiveRecord::Base.connection_handler.clear_active_connections!
       end
 
       def stop!
+        return if @stopped
+
         @mutex.synchronize do
           @stopped = true
 
           @keep_alive_thread.kill
           @reschedule_orphans_thread.kill
 
+          @keep_alive_thread.join
+          @reschedule_orphans_thread.join
+
           enq(nil)
 
-          Thread.new do
-            sleep 5
+          kill_thread = Thread.new do
+            sleep 0.5
             @thread.kill
           end
+
+          @thread.join
+          kill_thread.kill
+          kill_thread.join
         end
       end
 
diff --git a/lib/scheduler/schedule_info.rb b/lib/scheduler/schedule_info.rb
index 755bc621a9f..08c77569672 100644
--- a/lib/scheduler/schedule_info.rb
+++ b/lib/scheduler/schedule_info.rb
@@ -28,6 +28,9 @@ module Scheduler
       @next_run = @prev_run = @prev_result = @prev_duration = @current_owner = nil
     end
 
+    # this means the schedule is going to fire, it is setup correctly
+    # invalid schedules are fixed by running "schedule!"
+    # this happens automatically after if fire by the manager
     def valid?
       return false unless @next_run
       (!@prev_run && @next_run < Time.now.to_i + 5.minutes) || valid_every? || valid_daily?
@@ -42,8 +45,9 @@ module Scheduler
 
     def valid_daily?
       return false unless @klass.daily
+      return true if !@prev_run && @next_run && @next_run <= (Time.zone.now + 1.day).to_i
       !!@prev_run &&
-        @prev_run <= Time.now.to_i &&
+        @prev_run <= Time.zone.now.to_i &&
         @next_run < @prev_run + 1.day
     end
 
@@ -63,7 +67,7 @@ module Scheduler
       return if valid?
 
       at = @klass.daily[:at] || 0
-      today_begin = Time.now.midnight.to_i
+      today_begin = Time.zone.now.midnight.to_i
       today_offset = DateTime.now.seconds_since_midnight
 
       # If it's later today
diff --git a/lib/search.rb b/lib/search.rb
index b3f886af59b..27b04e86542 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -49,7 +49,7 @@ class Search
                SELECT p2.id FROM posts p2
                LEFT JOIN post_search_data pd ON locale = ? AND p2.id = pd.post_id
                WHERE pd.post_id IS NULL
-              )', SiteSetting.default_locale).limit(10000)
+              )', SiteSetting.default_locale).limit(limit)
 
     posts.each do |post|
       # force indexing
@@ -62,7 +62,7 @@ class Search
                SELECT p2.id FROM posts p2
                LEFT JOIN topic_search_data pd ON locale = ? AND p2.topic_id = pd.topic_id
                WHERE pd.topic_id IS NULL AND p2.post_number = 1
-              )', SiteSetting.default_locale).limit(10000)
+              )', SiteSetting.default_locale).limit(limit)
 
     posts.each do |post|
       # force indexing
@@ -151,6 +151,7 @@ class Search
   end
 
   attr_accessor :term
+  attr_reader :clean_term
 
   def initialize(term, opts=nil)
     @opts = opts || {}
@@ -161,10 +162,14 @@ class Search
     @limit = Search.per_facet
     @valid = true
 
+    # Removes any zero-width characters from search terms
+    term.to_s.gsub!(/[\u200B-\u200D\uFEFF]/, '')
+    @clean_term = term.to_s.dup
+
     term = process_advanced_search!(term)
 
     if term.present?
-      @term = Search.prepare_data(term.to_s)
+      @term = Search.prepare_data(term)
       @original_term = PG::Connection.escape_string(@term)
     end
 
@@ -177,7 +182,13 @@ class Search
       @limit = Search.per_filter
     end
 
-    @results = GroupedSearchResults.new(@opts[:type_filter], term, @search_context, @include_blurbs, @blurb_length)
+    @results = GroupedSearchResults.new(
+      @opts[:type_filter],
+      clean_term,
+      @search_context,
+      @include_blurbs,
+      @blurb_length
+    )
   end
 
   def valid?
@@ -190,8 +201,17 @@ class Search
 
   # Query a term
   def execute
+    if SiteSetting.log_search_queries?
+      status, search_log_id = SearchLog.log(
+        term: @term,
+        search_type: @opts[:search_type],
+        ip_address: @opts[:ip_address],
+        user_id: @opts[:user_id]
+      )
+      @results.search_log_id = search_log_id unless status == :error
+    end
 
-    unless @filters.present?
+    unless @filters.present? || @opts[:search_for_id]
       min_length = @opts[:min_search_term_length] || SiteSetting.min_search_term_length
       terms = (@term || '').split(/\s(?=(?:[^"]|"[^"]*")*$)/).reject {|t| t.length < min_length }
 
@@ -449,15 +469,27 @@ class Search
     end
   end
 
-  advanced_filter(/tags?:([a-zA-Z0-9,\-_]+)/) do |posts, match|
-    tags = match.split(",")
+  advanced_filter(/tags?:([a-zA-Z0-9,\-_+]+)/) do |posts, match|
+    if match.include?('+')
+      tags = match.split('+')
 
-    posts.where("topics.id IN (
+      posts.where("topics.id IN (
+      SELECT tt.topic_id
+      FROM topic_tags tt, tags
+      WHERE tt.tag_id = tags.id
+      GROUP BY tt.topic_id
+      HAVING to_tsvector(#{query_locale}, array_to_string(array_agg(tags.name), ' ')) @@ to_tsquery(#{query_locale}, ?)
+      )", tags.join('&'))
+    else
+      tags = match.split(",")
+
+      posts.where("topics.id IN (
       SELECT DISTINCT(tt.topic_id)
       FROM topic_tags tt, tags
       WHERE tt.tag_id = tags.id
       AND tags.name in (?)
       )", tags)
+    end
   end
 
   private
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 47e13254883..d6677155c28 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -9,10 +9,20 @@ class Search
       extend ActionView::Helpers::TextHelper
     end
 
-    attr_reader :type_filter,
-                :posts, :categories, :users,
-                :more_posts, :more_categories, :more_users,
-                :term, :search_context, :include_blurbs
+    attr_reader(
+      :type_filter,
+      :posts,
+      :categories,
+      :users,
+      :more_posts,
+      :more_categories,
+      :more_users,
+      :term,
+      :search_context,
+      :include_blurbs
+    )
+
+    attr_accessor :search_log_id
 
     def initialize(type_filter, term, search_context, include_blurbs, blurb_length)
       @type_filter = type_filter
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 20dd2818afc..99ab174d22d 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -195,6 +195,8 @@ module SiteSettingExtension
           opts.merge!({valid_values: choices[s].map{|c| {name: c, value: c}}, translate_names: false})
         end
 
+        opts[:textarea] = true if static_types[s] == :textarea
+
         opts[:choices] = choices[s] if choices.has_key? s
         opts
       end
@@ -282,6 +284,8 @@ module SiteSettingExtension
   def add_override!(name, val)
     type = get_data_type(name, defaults[name.to_sym])
 
+    val = val.to_s if type == types[:string]
+
     if type == types[:bool] && val != true && val != false
       val = (val == "t" || val == "true") ? 't' : 'f'
     end
diff --git a/lib/stats_socket.rb b/lib/stats_socket.rb
index 2b81db678fb..337bc7b058a 100644
--- a/lib/stats_socket.rb
+++ b/lib/stats_socket.rb
@@ -13,6 +13,14 @@ class StatsSocket < SocketServer
       case command
       when "gc_stat"
         GC.stat.to_json
+      when "v8_stat"
+        stats = {}
+        ObjectSpace.each_object(MiniRacer::Context) do |context|
+          context.heap_stats.each do |k,v|
+            stats[k] = (stats[k] || 0) + v
+          end
+        end
+        stats.to_json
       else
         "[\"UNKNOWN COMMAND\"]"
       end
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 2daf2ab15c7..57235096c16 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -11,6 +11,10 @@ task 'assets:precompile:before' do
   puts "Purging temp files"
   `rm -fr #{Rails.root}/tmp/cache`
 
+  # Ensure we clear emoji cache before pretty-text/emoji/data.js.es6.erb
+  # is recompiled
+  Emoji.clear_cache
+
   if Rails.configuration.assets.js_compressor == :uglifier && !`which uglifyjs`.empty? && !ENV['SKIP_NODE_UGLIFY']
     $node_uglify = true
   end
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index aba9e4df45c..80af4e74d74 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -1,3 +1,30 @@
+# rake docker:test is designed to be used inside the discourse/docker_test image
+# running it anywhere else will likely fail
+#
+# Environment Variables (specific to this rake task)
+# => SKIP_CORE                 set to 1 to skip core tests (rspec and qunit)
+# => SKIP_PLUGINS              set to 1 to skip plugin tests (rspec and qunit)
+# => INSTALL_OFFICIAL_PLUGINS  set to 1 to install all core plugins before running tests
+# => RUBY_ONLY                 set to 1 to skip all qunit tests
+# => JS_ONLY                   set to 1 to skip all rspec tests
+# => SINGLE_PLUGIN             set to plugin name to only run plugin-specific rspec tests (you'll probably want to SKIP_CORE as well)
+# => BISECT                    set to 1 to run rspec --bisect (applies to core rspec tests only)
+# => RSPEC_SEED                set to seed to use for rspec tests (applies to core rspec tests only)
+#
+# Other useful environment variables (not specific to this rake task)
+# => COMMIT_HASH    used by the discourse_test docker image to load a specific commit of discourse
+#                   this can also be set to a branch, e.g. "origin/tests-passed"
+#
+# Example usage:
+#   Run all core and plugin tests:  
+#       docker run discourse/discourse_test:release
+#   Run only rspec tests:
+#       docker run -e RUBY_ONLY=1 discourse/discourse_test:release
+#   Run all plugin tests (with a plugin mounted from host filesystem):
+#       docker run -e SKIP_CORE=1 -v $(pwd)/my-awesome-plugin:/var/www/discourse/plugins/my-awesome-plugin discourse/discourse_test:release
+#   Run tests for a specific plugin (with a plugin mounted from host filesystem):
+#       docker run -e SKIP_CORE=1 SINGLE_PLUGIN='my-awesome-plugin' -v $(pwd)/my-awesome-plugin:/var/www/discourse/plugins/my-awesome-plugin discourse/discourse_test:release
+
 
 def run_or_fail(command)
   pid = Process.spawn(command)
@@ -30,19 +57,51 @@ task 'docker:test' do
     ENV["RAILS_ENV"] = "test"
 
     @good = run_or_fail("bundle exec rake db:create db:migrate")
-    unless ENV["JS_ONLY"]
-      @good &&= run_or_fail("bundle exec rspec")
 
-      if ENV["LOAD_PLUGINS"]
-        @good &&= run_or_fail("bundle exec rake plugin:spec")
-      end
+    if ENV["INSTALL_OFFICIAL_PLUGINS"]
+      @good &&= run_or_fail("bundle exec rake plugin:install_all_official")
     end
+
+    unless ENV["JS_ONLY"]
+
+      unless ENV["SKIP_CORE"]
+        params = []
+        if ENV["BISECT"]
+          params << "--bisect"
+        end
+        if ENV["RSPEC_SEED"]
+          params << "--seed #{ENV["RSPEC_SEED"]}"
+        end
+        @good &&= run_or_fail("bundle exec rspec #{params.join(' ')}".strip)
+      end
+
+      unless ENV["SKIP_PLUGINS"]
+        if ENV["SINGLE_PLUGIN"]
+          @good &&= run_or_fail("bundle exec rake plugin:spec['#{ENV["SINGLE_PLUGIN"]}']")
+        else
+          @good &&= run_or_fail("bundle exec rake plugin:spec")
+        end
+      end
+
+    end
+
     unless ENV["RUBY_ONLY"]
-      @good &&= run_or_fail("eslint app/assets/javascripts")
-      @good &&= run_or_fail("eslint --ext .es6 app/assets/javascripts")
-      @good &&= run_or_fail("eslint --ext .es6 test/javascripts")
-      @good &&= run_or_fail("eslint test/javascripts")
-      @good &&= run_or_fail("bundle exec rake qunit:test['600000']")
+      unless ENV["SKIP_CORE"]
+        @good &&= run_or_fail("eslint app/assets/javascripts")
+        @good &&= run_or_fail("eslint --ext .es6 app/assets/javascripts")
+        @good &&= run_or_fail("eslint --ext .es6 test/javascripts")
+        @good &&= run_or_fail("eslint test/javascripts")
+        @good &&= run_or_fail("bundle exec rake qunit:test['600000']")
+      end
+      
+      unless ENV["SKIP_PLUGINS"]
+        if ENV["SINGLE_PLUGIN"]
+          @good &&= run_or_fail("bundle exec rake plugin:qunit['#{ENV['SINGLE_PLUGIN']}','600000']")
+        else
+          @good &&= run_or_fail("bundle exec rake plugin:qunit['*','600000']")
+        end
+      end
+     
     end
 
   ensure
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index b559d73fed5..a601dbc3c87 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -1,127 +1,622 @@
-EMOJI_LIST_URL ||= "http://unicode.org/emoji/charts/full-emoji-list.html"
-EMOJI_KEYWORDS_URL ||= "https://raw.githubusercontent.com/muan/emojilib/master/emojis.json"
+require "active_support/test_case"
+require "fileutils"
+require "json"
+require "nokogiri"
+require "open-uri"
 
-# until MS release the emoji flags, we'll use custom made flags
-WINDOWS_FLAGS ||= Set.new ["1f1e8_1f1f3", "1f1e9_1f1ea", "1f1ea_1f1f8", "1f1eb_1f1f7", "1f1ec_1f1e7", "1f1ee_1f1f9", "1f1ef_1f1f5", "1f1f0_1f1f7", "1f1f7_1f1fa", "1f1fa_1f1f8"]
+EMOJI_GROUPS_PATH ||= "lib/emoji/groups.json"
+
+EMOJI_DB_PATH ||= "lib/emoji/db.json"
+
+EMOJI_IMAGES_PATH ||= "public/images/emoji"
+
+EMOJI_ORDERING_URL ||= "http://www.unicode.org/emoji/charts/emoji-ordering.html"
+
+EMOJI_ALIASES ||= {
+  "right_anger_bubble" => [ "anger_right" ],
+  "ballot_box" => [ "ballot_box_with_ballot" ],
+  "basketball_man" => [ "basketball_player", "person_with_ball" ],
+  "beach_umbrella" => [ "umbrella_on_ground", "beach", "beach_with_umbrella" ],
+  "parasol_on_ground" => [ "umbrella_on_ground" ],
+  "bellhop_bell" => [ "bellhop" ],
+  "biohazard" => [ "biohazard_sign" ],
+  "bow_and_arrow" => [ "archery" ],
+  "spiral_calendar" => [ "calendar_spiral", "spiral_calendar_pad" ],
+  "card_file_box" => [ "card_box" ],
+  "champagne" => [ "bottle_with_popping_cork" ],
+  "cheese" => [ "cheese_wedge" ],
+  "city_sunset" => [ "city_dusk" ],
+  "couch_and_lamp" => [ "couch" ],
+  "crayon" => [ "lower_left_crayon" ],
+  "cricket_bat_and_ball" => [ "cricket_bat_ball" ],
+  "latin_cross" => [ "cross" ],
+  "dagger" => [ "dagger_knife" ],
+  "desktop_computer" => [ "desktop" ],
+  "card_index_dividers" => [ "dividers" ],
+  "dove" => [ "dove_of_peace" ],
+  "footprints" => [ "feet" ],
+  "fire" => [ "flame" ],
+  "black_flag" => [ "flag_black", "waving_black_flag" ],
+  "cn" => [ "flag_cn" ],
+  "de" => [ "flag_de" ],
+  "es" => [ "flag_es" ],
+  "fr" => [ "flag_fr" ],
+  "uk" => [ "gb", "flag_gb" ],
+  "it" => [ "flag_it" ],
+  "jp" => [ "flag_jp" ],
+  "kr" => [ "flag_kr" ],
+  "ru" => [ "flag_ru" ],
+  "us" => [ "flag_us" ],
+  "white_flag" => [ "flag_white", "waving_white_flag" ],
+  "plate_with_cutlery" => [ "fork_knife_plate", "fork_and_knife_with_plate" ],
+  "framed_picture" => [ "frame_photo", "frame_with_picture" ],
+  "hammer_and_pick" => [ "hammer_pick" ],
+  "heavy_heart_exclamation" => [ "heart_exclamation", "heavy_heart_exclamation_mark_ornament" ],
+  "houses" => [ "homes", "house_buildings" ],
+  "hotdog" => [ "hot_dog" ],
+  "derelict_house" => [ "house_abandoned", "derelict_house_building" ],
+  "desert_island" => [ "island" ],
+  "old_key" => [ "key2" ],
+  "laughing" => [ "satisfied" ],
+  "business_suit_levitating" => [ "levitate", "man_in_business_suit_levitating" ],
+  "weight_lifting_man" => [ "lifter", "weight_lifter" ],
+  "medal_sports" => [ "medal", "sports_medal" ],
+  "metal" => [ "sign_of_the_horns" ],
+  "fu" => [ "middle_finger", "reversed_hand_with_middle_finger_extended" ],
+  "motorcycle" => [ "racing_motorcycle" ],
+  "mountain_snow" => [ "snow_capped_mountain" ],
+  "newspaper_roll" => [ "newspaper2", "rolled_up_newspaper" ],
+  "spiral_notepad" => [ "notepad_spiral", "spiral_note_pad" ],
+  "oil_drum" => [ "oil" ],
+  "older_woman" => [ "grandma" ],
+  "paintbrush" => [ "lower_left_paintbrush" ],
+  "paperclips" => [ "linked_paperclips" ],
+  "pause_button" => [ "double_vertical_bar" ],
+  "peace_symbol" => [ "peace" ],
+  "fountain_pen" => [ "pen_fountain", "lower_left_fountain_pen" ],
+  "ping_pong" => [ "table_tennis" ],
+  "place_of_worship" => [ "worship_symbol" ],
+  "poop" => [ "shit", "hankey", "poo" ],
+  "radioactive" => [ "radioactive_sign" ],
+  "railway_track" => [ "railroad_track" ],
+  "robot" => [ "robot_face" ],
+  "skull" => [ "skeleton" ],
+  "skull_and_crossbones" => [ "skull_crossbones" ],
+  "speaking_head" => [ "speaking_head_in_silhouette" ],
+  "male_detective" => [ "spy", "sleuth_or_spy" ],
+  "thinking" => [ "thinking_face" ],
+  "-1" => [ "thumbsdown" ],
+  "+1" => [ "thumbsup" ],
+  "cloud_with_lightning_and_rain" => [ "thunder_cloud_rain", "thunder_cloud_and_rain" ],
+  "tickets" => [ "admission_tickets" ],
+  "next_track_button" => [ "track_next", "next_track" ],
+  "previous_track_button" => [ "track_previous", "previous_track" ],
+  "unicorn" => [ "unicorn_face" ],
+  "funeral_urn" => [ "urn" ],
+  "sun_behind_large_cloud" => [ "white_sun_cloud", "white_sun_behind_cloud" ],
+  "sun_behind_rain_cloud" => [ "white_sun_rain_cloud", "white_sun_behind_cloud_with_rain" ],
+  "partly_sunny" => [ "white_sun_small_cloud", "white_sun_with_small_cloud" ],
+  "open_umbrella" => [ "umbrella2" ],
+  "hammer_and_wrench" => [ "tools" ],
+  "face_with_thermometer" => [ "thermometer_face" ],
+  "timer_clock" => [ "timer" ],
+  "keycap_ten" => [ "ten" ],
+  "memo" => [ "pencil" ],
+  "rescue_worker_helmet" => [ "helmet_with_cross", "helmet_with_white_cross" ],
+  "slightly_smiling_face" => [ "slightly_smiling", "slight_smile"],
+  "construction_worker_man" => [ "construction_worker" ],
+  "upside_down_face" => [ "upside_down" ],
+  "money_mouth_face" => [ "money_mouth" ],
+  "nerd_face" => [ "nerd" ],
+  "hugs" => [ "hugging", "hugging_face" ],
+  "roll_eyes" => [ "rolling_eyes", "face_with_rolling_eyes" ],
+  "slightly_frowning_face" => [ "slight_frown" ],
+  "frowning_face" => [ "frowning2", "white_frowning_face" ],
+  "zipper_mouth_face" => [ "zipper_mouth" ],
+  "face_with_head_bandage" => [ "head_bandage" ],
+  "raised_hand_with_fingers_splayed" => [ "hand_splayed" ],
+  "raised_hand" => [ "hand" ],
+  "vulcan_salute" => [ "vulcan", "raised_hand_with_part_between_middle_and_ring_fingers" ],
+  "policeman" => [ "cop" ],
+  "running_man" => [ "runner" ],
+  "walking_man" => [ "walking" ],
+  "bowing_man" => [ "bow" ],
+  "no_good_woman" => [ "no_good" ],
+  "raising_hand_woman" => [ "raising_hand" ],
+  "pouting_woman" => [ "person_with_pouting_face" ],
+  "frowning_woman" => [ "person_frowning" ],
+  "haircut_woman" => [ "haircut" ],
+  "massage_woman" => [ "massage" ],
+  "tshirt" => [ "shirt" ],
+  "biking_man" => [ "bicyclist" ],
+  "mountain_biking_man" => [ "mountain_bicyclist" ],
+  "passenger_ship" => [ "cruise_ship" ],
+  "motor_boat" => [ "motorboat", "boat" ],
+  "flight_arrival" => [ "airplane_arriving" ],
+  "flight_departure" => [ "airplane_departure" ],
+  "small_airplane" => [ "airplane_small" ],
+  "racing_car" => [ "race_car" ],
+  "family_man_woman_boy_boy" => [ "family_man_woman_boys" ],
+  "family_man_woman_girl_girl" => [ "family_man_woman_girls" ],
+  "family_woman_woman_boy" => [ "family_women_boy" ],
+  "family_woman_woman_girl" => [ "family_women_girl" ],
+  "family_woman_woman_girl_boy" => [ "family_women_girl_boy" ],
+  "family_woman_woman_boy_boy" => [ "family_women_boys" ],
+  "family_woman_woman_girl_girl" => [ "family_women_girls" ],
+  "family_man_man_boy" => [ "family_men_boy" ],
+  "family_man_man_girl" => [ "family_men_girl" ],
+  "family_man_man_girl_boy" => [ "family_men_girl_boy" ],
+  "family_man_man_boy_boy" => [ "family_men_boys" ],
+  "family_man_man_girl_girl" => [ "family_men_girls" ],
+  "cloud_with_lightning" => [ "cloud_lightning" ],
+  "tornado" => [ "cloud_tornado", "cloud_with_tornado" ],
+  "cloud_with_rain" => [ "cloud_rain" ],
+  "cloud_with_snow" => [ "cloud_snow" ],
+  "asterisk" => [ "keycap_star" ],
+  "studio_microphone" => [ "microphone2" ],
+  "medal_military" => [ "military_medal" ],
+  "couple_with_heart_woman_woman" => [ "female_couple_with_heart" ],
+  "couple_with_heart_man_man" => [ "male_couple_with_heart" ],
+  "couplekiss_woman_woman" => [ "female_couplekiss" ],
+  "couplekiss_man_man" => [ "male_couplekiss" ],
+  "honeybee" => [ "bee" ],
+  "lion" => [ "lion_face" ],
+  "artificial_satellite" => [ "satellite_orbital" ],
+  "computer_mouse" => [ "mouse_three_button", "three_button_mouse" ],
+  "hocho" => [ "knife" ],
+  "swimming_man" => [ "swimmer" ],
+  "wind_face" => [ "wind_blowing_face" ],
+  "golfing_man" => [ "golfer" ],
+  "facepunch" => [ "punch" ],
+  "building_construction" => [ "construction_site" ],
+  "family_man_woman_girl_boy" => [ "family" ],
+  "ice_hockey" => [ "hockey" ],
+  "snowman_with_snow" => [ "snowman2" ],
+  "play_or_pause_button" => [ "play_pause" ],
+  "film_projector" => [ "projector" ],
+  "shopping" => [ "shopping_bags" ],
+  "open_book" => [ "book" ],
+  "national_park" => [ "park" ],
+  "world_map" => [ "map" ],
+  "pen" => [ "pen_ballpoint", "lower_left_ballpoint_pen" ],
+  "email" => [ "envelope", "e-mail" ],
+  "phone" => [ "telephone" ],
+  "atom_symbol" => [ "atom" ],
+  "mantelpiece_clock" => [ "clock" ],
+  "camera_flash" => [ "camera_with_flash" ],
+  "film_strip" => [ "film_frames" ],
+  "balance_scale" => [ "scales" ],
+  "surfing_man" => [ "surfer" ],
+  "couplekiss_man_woman" => [ "couplekiss" ],
+  "couple_with_heart_woman_man" => [ "couple_with_heart" ],
+  "clamp" => [ "compression" ],
+  "dancing_women" => [ "dancers" ],
+  "blonde_man" => [ "person_with_blond_hair" ],
+  "sleeping_bed" => [ "sleeping_accommodation" ],
+  "om" => [ "om_symbol" ],
+  "tipping_hand_woman" => [ "information_desk_person" ],
+  "rowing_man" => [ "rowboat" ],
+  "new_moon" => [ "moon" ],
+  "oncoming_automobile" => [ "car", "automobile" ],
+  "fleur_de_lis" => [ "fleur-de-lis" ],
+}
+
+EMOJI_GROUPS ||= [
+  {
+    "name" => "people",
+    "fullname" => "People",
+    "tabicon" => "grinning",
+    "sections" => [
+      "face-positive",
+      "face-neutral",
+      "face-negative",
+      "face-sick",
+      "face-role",
+      "face-fantasy",
+      "cat-face",
+      "monkey-face",
+      "skin-tone",
+      "person",
+      "person-role",
+      "person-fantasy",
+      "person-gesture",
+      "family",
+      "body"
+    ]
+  },
+  {
+    "name" => "nature",
+    "fullname" => "Nature",
+    "tabicon" => "evergreen_tree",
+    "sections" => [
+      "animal-mammal",
+      "animal-bird",
+      "animal-amphibian",
+      "animal-reptile",
+      "animal-marine",
+      "animal-bug",
+      "plant-flower",
+      "plant-other",
+      "sky_&_weather",
+
+    ]
+  },
+  {
+    "name" => "food",
+    "fullname" => "Food & Drink",
+    "tabicon" => "hamburger",
+    "sections" => [
+      "food-fruit",
+      "food-vegetable",
+      "food-prepared",
+      "food-asian",
+      "food-sweet",
+      "drink",
+      "dishware"
+    ]
+  },
+  {
+    "name" => "celebration",
+    "fullname" => "Celebration",
+    "tabicon" => "gift",
+    "sections" => [
+      "event",
+      "emotion"
+    ]
+  },
+  {
+    "name" => "activity",
+    "fullname" => "Activities",
+    "tabicon" => "soccer",
+    "sections" => [
+      "person-activity",
+      "person-sport",
+      "sport",
+      "game",
+      "music",
+      "musical-instrument"
+    ]
+  },
+  {
+    "name" => "travel",
+    "fullname" => "Travel & Places",
+    "tabicon" => "airplane",
+    "sections" => [
+      "place-map",
+      "place-geographic",
+      "place-building",
+      "place-religious",
+      "place-other",
+      "transport-ground",
+      "transport-water",
+      "transport-air",
+      "hotel",
+      "flag",
+      "country-flag",
+      "subdivision-flag"
+    ]
+  },
+  {
+    "name" => "objects",
+    "fullname" => "Objects & Symbols",
+    "tabicon" => "eyeglasses",
+    "sections" => [
+      "clothing",
+      "award-medal",
+      "sound",
+      "phone",
+      "computer",
+      "light_&_video",
+      "book-paper",
+      "money",
+      "mail",
+      "writing",
+      "office",
+      "lock",
+      "tool",
+      "medical",
+      "other-object",
+      "transport-sign",
+      "warning",
+      "arrow",
+      "religion",
+      "zodiac",
+      "av-symbol",
+      "other-symbol",
+      "keycap",
+      "alphanum",
+      "geometric",
+      "time"
+    ]
+  }
+]
+
+FITZPATRICK_SCALE ||= [ "1f3fb", "1f3fc", "1f3fd", "1f3fe", "1f3ff" ]
+
+DEFAULT_SET ||= "twitter"
+
+# Replace the platform by another when downloading the image (accepts names or categories)
+EMOJI_IMAGES_PATCH ||= {
+  "windows" => {
+    "hash" => "apple",
+    "zero" => "apple",
+    "one" => "apple",
+    "two" => "apple",
+    "three" => "apple",
+    "four" => "apple",
+    "five" => "apple",
+    "six" => "apple",
+    "seven" => "apple",
+    "eight" => "apple",
+    "nine" => "apple",
+    "asterisk" => "apple"
+  },
+  "apple" => {
+    "snowboarder" => "twitter"
+  },
+  "emoji_one" => {
+    "country-flag" => "twitter"
+  }
+}
+
+EMOJI_SETS ||= {
+  "apple" => "apple",
+  "google" => "google",
+  "google_blob" => "google_classic",
+  "facebook_messenger" => "facebook_messenger",
+  "twitter" => "twitter",
+  "emoji_one" => "emoji_one",
+  "windows" => "win10",
+}
+
+EMOJI_DB_REPO ||= "git@github.com:jjaffeux/emoji-db.git"
+
+EMOJI_DB_REPO_PATH ||= File.join("tmp", "emoji-db")
+
+GENERATED_PATH ||= File.join(EMOJI_DB_REPO_PATH, "generated")
 
 desc "update emoji images"
-task "emoji:update" => :environment do
-  emojis = {}
+task "emoji:update" do
+  copy_emoji_db
 
-  puts "Loading local emoji database..."
-  db = JSON.parse(File.read("lib/emoji/db.json"))
-  db["emojis"].each do |e|
-    emojis[e["code"].tr("-", "_")] = { name: e["name"] }
-  end
-  aliases = db["aliases"].to_h
+  json_db = open(File.join(GENERATED_PATH, "db.json")).read
+  keywords = JSON.parse(json_db)
 
-  puts "Enhancing emoji database with emojilib keywords..."
-  keywords = JSON.parse(open(EMOJI_KEYWORDS_URL).read)
-  keywords.keys.each do |k|
-    next unless char = keywords[k]["char"].presence
+  write_db_json(keywords)
+  fix_incomplete_sets(keywords)
+  write_aliases
+  groups = generate_emoji_groups(keywords)
+  write_js_groups(keywords, groups)
 
-    code = char.codepoints
-               .map { |c| c.to_s(16).rjust(4, "0") }
-               .join("_")
-               .downcase
-               .gsub(/_fe0f$/, "")
+  TestEmojiUpdate.run_and_summarize
 
-    emojis[code] ||= { name: k }
-  end
-
-  puts "Retrieving remote emoji list..."
-  list = open(EMOJI_LIST_URL).read
-
-  puts "Parsing remote emoji list..."
-  doc = Nokogiri::HTML(list)
-  doc.css("tr").each do |row|
-    cells = row.css("td")
-    next if cells.size == 0
-
-    code = cells[1].at_css("a")["name"]
-
-    unless emojis[code]
-      code = code.gsub(/_fe0f/, "")
-      next unless emojis[code]
-    end
-
-    apple = cell_to_image(cells[4])
-    google = cell_to_image(cells[5])
-    twitter = cell_to_image(cells[6])
-    one = cell_to_image(cells[7])
-
-    if WINDOWS_FLAGS.include?(code)
-      windows = custom_windows_flag(code)
-    else
-      windows = cell_to_image(cells[11])
-    end
-
-    if apple.blank? || google.blank? || twitter.blank? || one.blank? || windows.blank?
-      emojis.delete(code)
-      next
-    end
-
-    emojis[code][:apple] = apple
-    emojis[code][:google] = google
-    emojis[code][:twitter] = twitter
-    emojis[code][:one] = one
-    emojis[code][:windows] = windows
-  end
-
-  puts "Writing emojis..."
-  write_emojis(emojis, aliases, :apple, "apple")
-  write_emojis(emojis, aliases, :google, "google")
-  write_emojis(emojis, aliases, :twitter, "twitter")
-  write_emojis(emojis, aliases, :one, "emoji_one")
-  write_emojis(emojis, aliases, :windows, "win10")
-
-  puts "Updating db.json..."
-  db = {
-    "emojis" => emojis.keys.map { |k| { "code" => k.tr("_", "-"), "name" => emojis[k][:name] } },
-    "aliases" => aliases,
-  }
-
-  File.write("lib/emoji/db.json", JSON.pretty_generate(db))
-
-  puts "Done!"
+  FileUtils.rm_rf(EMOJI_DB_REPO_PATH)
 end
 
-def cell_to_image(cell)
-  return unless img = cell.at_css("img")
-  Base64.decode64(img["src"][/base64,(.+)$/, 1])
+desc "test the emoji generation script"
+task "emoji:test" do
+  ENV['EMOJI_TEST'] = "1"
+  Rake::Task["emoji:update"].invoke
 end
 
-def custom_windows_flag(code)
-  name = code.upcase.tr("_", "-")
-  open("https://github.com/discourse/discourse-emoji-extractor/raw/master/win10/72x72/windows_#{name}.png").read
+def copy_emoji_db
+  `rm -rf tmp/emoji-db && git clone #{EMOJI_DB_REPO} tmp/emoji-db`
+
+  path = "#{EMOJI_IMAGES_PATH}/**/*"
+  confirm_overwrite(path)
+  puts "Cleaning emoji folder..."
+  FileUtils.rm_rf(Dir.glob(path))
+
+  EMOJI_SETS.each do |set_name, set_destination|
+    origin = File.join(GENERATED_PATH, set_name)
+    destination = File.join(EMOJI_IMAGES_PATH, set_destination)
+    FileUtils.mv(origin, destination)
+  end
 end
 
-def write_emojis(emojis, aliases, style, folder)
-  path = "public/images/emoji/#{folder}"
+def fix_incomplete_sets(emojis)
+  emojis.each do |code, config|
+    EMOJI_SETS.each do |set_name, set_destination|
+      patch_set = EMOJI_SETS[EMOJI_IMAGES_PATCH.dig(set_name, config["name"])] ||
+        EMOJI_SETS[EMOJI_IMAGES_PATCH.dig(set_name, config["category"])]
 
-  # Uncomment to recreate all emojis
-  # FileUtils.rm_f Dir.glob("#{path}/*")
+      if patch_set || !File.exist?(File.join(EMOJI_IMAGES_PATH, set_destination, "#{config['name']}.png"))
+        origin = File.join(EMOJI_IMAGES_PATH, patch_set || EMOJI_SETS[DEFAULT_SET], config['name'])
 
-  puts folder
-
-  emojis.values.each do |emoji|
-    next if emoji[style].nil?
-
-    write_emoji("#{path}/#{emoji[:name]}.png", emoji[style])
-    if aliases[emoji[:name]]
-      aliases[emoji[:name]].each do |new_name|
-        write_emoji("#{path}/#{new_name}.png", emoji[style])
+        FileUtils.cp("#{origin}.png", File.join(EMOJI_IMAGES_PATH, set_destination, "#{config['name']}.png"))
+        if File.directory?(origin)
+          FileUtils.cp_r(origin, File.join(EMOJI_IMAGES_PATH, set_destination, config['name']))
+        end
       end
     end
   end
-
-  puts
 end
 
-def write_emoji(path, emoji)
-    open(path, "wb") { |f| f << emoji }
-    `pngout #{path}`
-    putc "."
-ensure
-  raise "Failed to write emoji: #{path}" if File.exists?(path) && !File.size?(path)
+def generate_emoji_groups(keywords)
+  puts "Generating groups..."
+
+  list = open(EMOJI_ORDERING_URL).read
+  doc = Nokogiri::HTML(list)
+  table = doc.css("table")[0]
+
+  EMOJI_GROUPS.map do |group|
+    group["icons"] ||= []
+    group["sections"].each do |section|
+      title_section = table.css("tr th a[@name='#{section}']")
+      emoji_list_section = title_section.first.parent.parent.next_element
+      emoji_list_section.css("a.plain img").each do |link|
+        emoji_code = link.attr("title")
+                         .scan(/U\+(.{4,5})\b/)
+                         .flatten
+                         .map { |code| code.downcase.strip }
+                         .join("_")
+
+        emoji_char = code_to_emoji(emoji_code)
+
+        if emoji = keywords[emoji_char]
+          group["icons"] << { name: emoji["name"], diversity: emoji["fitzpatrick_scale"] }
+        end
+      end
+    end
+    group.delete("sections")
+    group
+  end
+end
+
+def write_aliases
+  EMOJI_ALIASES.each do |original, aliases|
+    aliases.each do |emoji_alias|
+      EMOJI_SETS.each do |set_name, set_destination|
+        origin_file = File.join(EMOJI_IMAGES_PATH, set_destination, "#{original}.png")
+        origin_dir = File.join(EMOJI_IMAGES_PATH, set_destination, original)
+        FileUtils.cp(origin_file, File.join(EMOJI_IMAGES_PATH, set_destination, "#{emoji_alias}.png"))
+
+        if File.directory?(origin_dir)
+          FileUtils.cp_r(origin_dir, File.join(EMOJI_IMAGES_PATH, set_destination, emoji_alias))
+        end
+      end
+    end
+  end
+end
+
+def write_db_json(emojis)
+  puts "Writing #{EMOJI_DB_PATH}..."
+
+  confirm_overwrite(EMOJI_DB_PATH)
+
+  FileUtils.mkdir_p(File.expand_path("..", EMOJI_DB_PATH))
+
+  # skin tones variations of emojis shouldn’t appear in autocomplete
+  emojis_without_tones = emojis
+    .select { |char, config|
+      !FITZPATRICK_SCALE.any? { |scale|
+        codepoints_to_code(char.codepoints, config["fitzpatrick_scale"])[scale]
+      }
+    }
+    .map { |char, config|
+      {
+        "code" => codepoints_to_code(char.codepoints, config["fitzpatrick_scale"]).tr("_", "-"),
+        "name" => config["name"]
+      }
+    }
+
+  emoji_with_tones = emojis
+    .select { |code, config| config["fitzpatrick_scale"] }
+    .map { |code, config| config["name"] }
+
+  db = {
+    "emojis" => emojis_without_tones,
+    "tonableEmojis" => emoji_with_tones,
+    "aliases" => EMOJI_ALIASES
+  }
+
+  File.write(EMOJI_DB_PATH, JSON.pretty_generate(db))
+end
+
+def write_js_groups(emojis, groups)
+  puts "Writing #{EMOJI_GROUPS_PATH}..."
+
+  confirm_overwrite(EMOJI_GROUPS_PATH)
+
+  template = JSON.pretty_generate(groups)
+  FileUtils.mkdir_p(File.expand_path("..", EMOJI_GROUPS_PATH))
+  File.write(EMOJI_GROUPS_PATH, template)
+end
+
+def code_to_emoji(code)
+  code
+    .split("_")
+    .map { |e| e.to_i(16) }
+    .pack "U*"
+end
+
+def codepoints_to_code(codepoints, fitzpatrick_scale)
+  codepoints = codepoints
+                .map { |c| c.to_s(16).rjust(4, "0") }
+                .join("_")
+                .downcase
+
+  if !fitzpatrick_scale
+    codepoints.gsub!(/_fe0f$/, "")
+  end
+
+  codepoints
+end
+
+def confirm_overwrite(path)
+  return if ENV['EMOJI_TEST']
+
+  STDOUT.puts("[!] You are about to overwrite #{path}, are you sure? [CTRL+c] to cancel, [ENTER] to continue")
+  STDIN.gets.chomp
+end
+
+class TestEmojiUpdate < MiniTest::Test
+  def self.run_and_summarize
+    puts "Runnings tests..."
+    reporter = Minitest::SummaryReporter.new
+    TestEmojiUpdate.run(reporter)
+    puts reporter.to_s
+  end
+
+  def image_path(style, name)
+    File.join("public", "images", "emoji", style, "#{name}.png")
+  end
+
+  def test_code_to_emoji
+    assert_equal "😎", code_to_emoji("1f60e")
+  end
+
+  def test_codepoints_to_code
+    assert_equal "1f6b5_200d_2640", codepoints_to_code([128693, 8205, 9792, 65039], false)
+  end
+
+  def test_codepoints_to_code_with_scale
+    assert_equal "1f6b5_200d_2640_fe0f", codepoints_to_code([128693, 8205, 9792, 65039], true)
+  end
+
+  def test_groups_js_es6_creation
+    assert File.exists?(EMOJI_GROUPS_PATH)
+    assert File.size?(EMOJI_GROUPS_PATH)
+  end
+
+  def test_db_json_creation
+    assert File.exists?(EMOJI_DB_PATH)
+    assert File.size?(EMOJI_DB_PATH)
+  end
+
+  def test_alias_creation
+    original_image = image_path("apple", "right_anger_bubble")
+    alias_image = image_path("apple", "anger_right")
+
+    assert_equal File.size(original_image), File.size(alias_image)
+  end
+
+  def test_cell_index_patch
+    original_image = image_path("apple", "snowboarder")
+    alias_image = image_path("twitter", "snowboarder")
+
+    assert_equal File.size(original_image), File.size(alias_image)
+  end
+
+  def test_scales
+    original_image = image_path("apple", "blonde_woman")
+    assert File.exists?(original_image)
+    assert File.size?(original_image)
+
+    (2..6).each do |scale|
+      image = image_path("apple", "blonde_woman/#{scale}")
+      assert File.exists?(image)
+      assert File.size?(image)
+    end
+  end
+
+  def test_default_set
+    original_image = image_path("twitter", "macau")
+
+    alias_image = image_path("emoji_one", "macau")
+    assert_equal File.size(original_image), File.size(alias_image)
+
+    alias_image = image_path("win10", "macau")
+    assert_equal File.size(original_image), File.size(alias_image)
+  end
 end
diff --git a/lib/tasks/images.rake b/lib/tasks/images.rake
index 79e19bbe18f..c754841f05d 100644
--- a/lib/tasks/images.rake
+++ b/lib/tasks/images.rake
@@ -1,8 +1,9 @@
+require_dependency "file_helper"
+
 task "images:compress" => :environment do
-  io = ImageOptim.new
   images = Dir.glob("#{Rails.root}/app/**/*.png")
   image_sizes = Hash[*images.map{|i| [i,File.size(i)]}.to_a.flatten]
-  io.optimize_images!(images) do |name, optimized|
+  FileHelper.optimize_images!(images) do |name, optimized|
     if optimized
       new_size = File.size(name)
       puts "#{name} => from: #{image_sizes[name.to_s]} to: #{new_size}"
diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 8e7281ad592..9666ed747c4 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -1,5 +1,47 @@
 directory 'plugins'
 
+desc 'install all official plugins (use GIT_WRITE=1 to pull with write access)'
+task 'plugin:install_all_official' do
+  skip = Set.new([
+    'customer-flair',
+    'discourse-nginx-performance-report',
+    'hosted-site',
+    'lazyYT',
+    'poll',
+  ])
+
+  map = {
+    'Canned Replies' => 'https://github.com/discourse/discourse-canned-replies',
+    'Spoiler Alert!' => 'https://github.com/discourse/discourse-spoiler-alert',
+    'staff-notes' => 'https://github.com/discourse/discourse-staff-notes',
+    'GitHub badges' => 'https://github.com/discourse/github_badges',
+  }
+
+  #require 'plugin/metadata'
+  Plugin::Metadata::OFFICIAL_PLUGINS.each do |name|
+    next if skip.include? name
+    repo = map[name] || "https://github.com/discourse/#{name}"
+    dir = repo.split('/').last
+    path = File.expand_path('plugins/' + dir)
+
+    if Dir.exist? path
+      STDERR.puts "Skipping #{dir} cause it already exists!"
+      next
+    end
+
+    if ENV['GIT_WRITE']
+      STDERR.puts "Allowing write to all repos!"
+      repo.gsub!("https://github.com/", "git@github.com:")
+      repo << ".git"
+    end
+
+    status = system("git clone #{repo} #{path}")
+    unless status
+      abort("Failed to clone #{repo}")
+    end
+  end
+end
+
 desc 'install plugin'
 task 'plugin:install', :repo do |t, args|
   repo = ENV['REPO'] || ENV['repo'] || args[:repo]
@@ -47,10 +89,26 @@ desc 'run plugin specs'
 task 'plugin:spec', :plugin do |t, args|
   args.with_defaults(plugin: "*")
   ruby = `which ruby`.strip
-  files = Dir.glob("./plugins/#{args[:plugin]}/spec/**/*.rb")
+  files = Dir.glob("./plugins/#{args[:plugin]}/spec/**/*_spec.rb")
   if files.length > 0
     sh "LOAD_PLUGINS=1 #{ruby} -S rspec #{files.join(' ')}"
   else
     abort "No specs found."
   end
 end
+
+desc 'run plugin qunit tests'
+task 'plugin:qunit', [:plugin, :timeout] do |t, args|
+  args.with_defaults(plugin: "*")
+
+  ENV['LOAD_PLUGINS'] = '1'
+  ENV['QUNIT_SKIP_CORE'] = '1'
+  if args[:plugin] == "*"
+    puts "Running qunit tests for all plugins"
+  else
+    puts "Running qunit tests for #{args[:plugin]}"
+    ENV['QUNIT_SINGLE_PLUGIN'] = args[:plugin]
+  end
+  
+  Rake::Task["qunit:test"].invoke(args[:timeout])
+end
diff --git a/lib/tasks/populate.thor b/lib/tasks/populate.thor
index 531f0efa229..3c308d2a707 100644
--- a/lib/tasks/populate.thor
+++ b/lib/tasks/populate.thor
@@ -60,7 +60,8 @@ class Populate < Thor
   private
 
   def create_user(user_email)
-    unless User.find_by_email(user_email)
+    user = User.find_by_email(user_email)
+    unless user
       puts "Creating new account: #{user_email}"
       user = User.create!(email: user_email, password: SecureRandom.hex, username: UserNameSuggester.suggest(user_email))
     end
diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index b6a696f111d..0338f3c9fcc 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -166,3 +166,25 @@ task 'posts:delete_word', [:find] => [:environment] do |_,args|
   total = remap_posts(find)
   puts "", "#{total} posts updated!", ""
 end
+
+desc 'Delete all likes'
+task 'posts:delete_all_likes' => :environment do
+
+  post_actions = PostAction.where(post_action_type_id: PostActionType.types[:like])
+
+  likes_deleted = 0
+  total = post_actions.count
+
+  post_actions.each do |post_action|
+    begin
+      post_action.remove_act!(Discourse.system_user)
+      print_status(likes_deleted += 1, total)
+    rescue
+      # skip
+    end
+  end
+
+  UserStat.update_all(likes_given: 0, likes_received: 0) # clear user likes stats
+  DirectoryItem.update_all(likes_given: 0, likes_received: 0) # clear user directory likes stats
+  puts "", "#{likes_deleted} likes deleted!", ""
+end
diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index 9baf48a1af8..af08cb58565 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -39,18 +39,37 @@ task "qunit:test", [:timeout] => :environment do |_, args|
 
     options = {}
 
-    %w{module filter}.each do |arg|
+    %w{module filter qunit_skip_core qunit_single_plugin}.each do |arg|
       options[arg] = ENV[arg.upcase] if ENV[arg.upcase].present?
     end
 
     if options.present?
-      cmd += "?#{options.to_query.gsub('+', '%20')}"
+      cmd += "?#{options.to_query.gsub('+', '%20').gsub("&", '\\\&')}"
     end
 
     if args[:timeout].present?
       cmd += " #{args[:timeout]}"
     end
 
+    @now = Time.now
+    def elapsed
+      Time.now - @now
+    end
+
+    # wait for server to accept connections
+    require 'net/http'
+    uri = URI("http://localhost:#{port}/assets/test_helper.js")
+    puts "Warming up Rails server"
+    begin
+      Net::HTTP.get(uri)
+    rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL
+      sleep 1
+      retry unless elapsed() > 60
+      puts "Timed out. Can no connect to forked server!"
+      exit 1
+    end
+    puts "Rails server is warmed up"
+
     # wait for server to respond, will exception out on failure
     tries = 0
     begin
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index c55722e2fee..e8c5dc67b29 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -148,7 +148,7 @@ def migrate_from_s3
               tmp_file_name: "from_s3",
               follow_redirect: true
             )
-            if upload = UploadCreator.new(file, filename, File.size(file)).create_for(post.user_id || -1)
+            if upload = UploadCreator.new(file, filename).create_for(post.user_id || -1)
               post.raw = post.raw.gsub(/(https?:)?#{Regexp.escape(url)}/, upload.url)
               post.save
               post.rebake!
@@ -438,7 +438,7 @@ def recover_from_tombstone
 
             if File.exists?(tombstone_path)
               File.open(tombstone_path) do |file|
-                new_upload = UploadCreator.new(file, File.basename(url), File.size(file)).create_for(Discourse::SYSTEM_USER_ID)
+                new_upload = UploadCreator.new(file, File.basename(url)).create_for(Discourse::SYSTEM_USER_ID)
 
                 if new_upload.persisted?
                   printf "Restored into #{new_upload.url}\n"
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 62e6ec619b9..51deb6654fa 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -315,7 +315,7 @@ class TopicQuery
     if page == 0
       (pinned_topics + unpinned_topics)[0...limit] if limit
     else
-      offset = (page * per_page) - pinned_topics.count - 1
+      offset = (page * per_page) - pinned_topics.count
       offset = 0 unless offset > 0
       unpinned_topics.offset(offset).to_a
     end
diff --git a/lib/twitter_api.rb b/lib/twitter_api.rb
index 373c6838f1f..2c9ce48a601 100644
--- a/lib/twitter_api.rb
+++ b/lib/twitter_api.rb
@@ -56,7 +56,7 @@ class TwitterApi
     protected
 
     def link_handles_in(text)
-      text.scan(/\s@(\w+)/).flatten.uniq.each do |handle|
+      text.scan(/(?:^|\s)@(\w+)/).flatten.uniq.each do |handle|
         text.gsub!("@#{handle}", [
           "<a href='https://twitter.com/#{handle}' target='_blank'>",
             "@#{handle}",
@@ -68,7 +68,7 @@ class TwitterApi
     end
 
     def link_hashtags_in(text)
-      text.scan(/\s#(\w+)/).flatten.uniq.each do |hashtag|
+      text.scan(/(?:^|\s)#(\w+)/).flatten.uniq.each do |hashtag|
         text.gsub!("##{hashtag}", [
           "<a href='https://twitter.com/search?q=%23#{hashtag}' ",
           "target='_blank'>",
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index a00b13f08fc..67efcd32704 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -16,8 +16,10 @@ class UploadCreator
   #  - type (string)
   #  - content_type (string)
   #  - origin (string)
-  #  - is_attachment_for_group_message (boolean)
+  #  - for_group_message (boolean)
   #  - for_theme (boolean)
+  #  - for_private_message (boolean)
+  #  - pasted (boolean)
   def initialize(file, filename, opts = {})
     @upload = Upload.new
     @file = file
@@ -38,7 +40,7 @@ class UploadCreator
 
         if @filename[/\.svg$/i]
           whitelist_svg!
-        else
+        elsif !Rails.env.test?
           convert_to_jpeg! if should_convert_to_jpeg?
           downsize!        if should_downsize?
 
@@ -78,13 +80,9 @@ class UploadCreator
         @upload.width, @upload.height = ImageSizer.resize(*@image_info.size)
       end
 
-      if @opts[:is_attachment_for_group_message]
-        @upload.is_attachment_for_group_message = true
-      end
-
-      if @opts[:for_theme]
-        @upload.for_theme = true
-      end
+      @upload.for_private_message = true if @opts[:for_private_message]
+      @upload.for_group_message   = true if @opts[:for_group_message]
+      @upload.for_theme           = true if @opts[:for_theme]
 
       return @upload unless @upload.save
 
@@ -125,9 +123,10 @@ class UploadCreator
   MIN_PIXELS_TO_CONVERT_TO_JPEG ||= 1280 * 720
 
   def should_convert_to_jpeg?
-    TYPES_CONVERTED_TO_JPEG.include?(@image_info.type) &&
-    pixels > MIN_PIXELS_TO_CONVERT_TO_JPEG &&
-    SiteSetting.png_to_jpg_quality < 100
+    return false if !TYPES_CONVERTED_TO_JPEG.include?(@image_info.type)
+    return true  if @opts[:pasted]
+    return false if SiteSetting.png_to_jpg_quality == 100
+    pixels > MIN_PIXELS_TO_CONVERT_TO_JPEG
   end
 
   def convert_to_jpeg!
@@ -136,7 +135,9 @@ class UploadCreator
     OptimizedImage.ensure_safe_paths!(@file.path, jpeg_tempfile.path)
     Discourse::Utils.execute_command(
       'convert', @file.path,
+      '-auto-orient',
       '-background', 'white',
+      '-interlace', 'none',
       '-flatten',
       '-quality', SiteSetting.png_to_jpg_quality.to_s,
       jpeg_tempfile.path
@@ -144,10 +145,10 @@ class UploadCreator
 
     # keep the JPEG if it's at least 15% smaller
     if File.size(jpeg_tempfile.path) < filesize * 0.85
-      @image_info = FastImage.new(jpeg_tempfile)
       @file = jpeg_tempfile
       @filename = (File.basename(@filename, ".*").presence || I18n.t("image").presence || "image") + ".jpg"
       @opts[:content_type] = "image/jpeg"
+      extract_image_info!
     else
       jpeg_tempfile.close! rescue nil
     end
@@ -186,6 +187,18 @@ class UploadCreator
     @file.rewind
   end
 
+  def should_fix_orientation?
+    # orientation is between 1 and 8, 1 being the default
+    # cf. http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/
+    @image_info.orientation.to_i > 1
+  end
+
+  def fix_orientation!
+    OptimizedImage.ensure_safe_paths!(@file.path)
+    Discourse::Utils.execute_command('convert', @file.path, '-auto-orient', @file.path)
+    extract_image_info!
+  end
+
   def should_crop?
     TYPES_TO_CROP.include?(@opts[:type])
   end
@@ -208,17 +221,8 @@ class UploadCreator
     when "custom_emoji"
       OptimizedImage.downsize(@file.path, @file.path, "100x100\\>", filename: @filename, allow_animation: allow_animation)
     end
-  end
 
-  def should_fix_orientation?
-    # orientation is between 1 and 8, 1 being the default
-    # cf. http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/
-    @image_info.orientation.to_i > 1
-  end
-
-  def fix_orientation!
-    OptimizedImage.ensure_safe_paths!(@file.path)
-    Discourse::Utils.execute_command('convert', @file.path, '-auto-orient', @file.path)
+    extract_image_info!
   end
 
   def should_optimize?
@@ -233,7 +237,8 @@ class UploadCreator
 
   def optimize!
     OptimizedImage.ensure_safe_paths!(@file.path)
-    ImageOptim.new.optimize_image!(@file.path)
+    FileHelper.optimize_image!(@file.path)
+    extract_image_info!
   rescue ImageOptim::Worker::TimeoutExceeded
     Rails.logger.warn("ImageOptim timed out while optimizing #{@filename}")
   end
diff --git a/lib/validators/censored_words_validator.rb b/lib/validators/censored_words_validator.rb
index 3b566a27ea0..66e03f5bdd4 100644
--- a/lib/validators/censored_words_validator.rb
+++ b/lib/validators/censored_words_validator.rb
@@ -33,7 +33,7 @@ class CensoredWordsValidator < ActiveModel::EachValidator
 
     def censored_words_regexp
       Regexp.new(
-        SiteSetting.censored_words.split('|'.freeze).map! { |w| Regexp.escape(w) }.join('|'.freeze),
+        '\b(' + SiteSetting.censored_words.split('|'.freeze).map! { |w| Regexp.escape(w) }.join('|'.freeze) + ')\b',
         true
       )
     end
diff --git a/lib/validators/sso_overrides_email_validator.rb b/lib/validators/sso_overrides_email_validator.rb
new file mode 100644
index 00000000000..4af0149b5f6
--- /dev/null
+++ b/lib/validators/sso_overrides_email_validator.rb
@@ -0,0 +1,20 @@
+class SsoOverridesEmailValidator
+  def initialize(opts={})
+    @opts = opts
+  end
+
+  def valid_value?(val)
+    return true if val == 'f'
+    return false if !SiteSetting.enable_sso?
+    return false if SiteSetting.email_editable?
+    true
+  end
+
+  def error_message
+    if !SiteSetting.enable_sso?
+      I18n.t('site_settings.errors.enable_sso_disabled')
+    elsif SiteSetting.email_editable?
+      I18n.t('site_settings.errors.email_editable_enabled')
+    end
+  end
+end
diff --git a/lib/validators/upload_validator.rb b/lib/validators/upload_validator.rb
index cf73111f438..6c2013565db 100644
--- a/lib/validators/upload_validator.rb
+++ b/lib/validators/upload_validator.rb
@@ -5,8 +5,13 @@ module Validators; end
 class Validators::UploadValidator < ActiveModel::Validator
 
   def validate(upload)
+    # staff can upload any file in PM
+    if upload.for_private_message && SiteSetting.allow_staff_to_upload_any_file_in_pm
+      return true if upload.user&.staff?
+    end
+
     # check the attachment blacklist
-    if upload.is_attachment_for_group_message && SiteSetting.allow_all_attachments_for_group_messages
+    if upload.for_group_message && SiteSetting.allow_all_attachments_for_group_messages
       return upload.original_filename =~ SiteSetting.attachment_filename_blacklist_regex
     end
 
diff --git a/lib/version.rb b/lib/version.rb
index 267e1501aa8..4d0b60f00a0 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 1
       MINOR = 9
       TINY  = 0
-      PRE   = 'beta1'
+      PRE   = 'beta4'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6 b/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6
index 074d93a3b42..15a3c56ea16 100644
--- a/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6
+++ b/plugins/discourse-details/assets/javascripts/initializers/apply-details.js.es6
@@ -11,15 +11,14 @@ function initializeDetails(api) {
     };
   });
 
-  const ComposerController = api.container.lookupFactory("controller:composer");
-  ComposerController.reopen({
+  api.modifyClass('controller:composer', {
     actions: {
       insertDetails() {
         this.get("toolbarEvent").applySurround(
-          `[details=${I18n.t("composer.details_title")}]`,
-          "[/details]",
+          "\n" + `[details=${I18n.t("composer.details_title")}]` + "\n",
+          "\n[/details]\n",
           "details_text",
-          { multiline: false }
+          { multiline: true }
         );
         this.set('optionsVisible', false);
       }
@@ -31,6 +30,6 @@ export default {
   name: "apply-details",
 
   initialize() {
-    withPluginApi('0.5', initializeDetails);
+    withPluginApi('0.8.7', initializeDetails);
   }
 };
diff --git a/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js.es6 b/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js.es6
index b710abf7e6f..545d0eea903 100644
--- a/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js.es6
+++ b/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js.es6
@@ -1,24 +1,20 @@
-import { registerOption } from 'pretty-text/pretty-text';
+const rule = {
+  tag: 'details',
+  before: function(state, tagInfo) {
+    const attrs = tagInfo.attrs;
+    state.push('bbcode_open', 'details', 1);
+    state.push('bbcode_open', 'summary', 1);
 
-function insertDetails(_, summary, details) {
-  return `<details><summary>${summary}</summary>${details}</details>`;
-}
+    let token = state.push('text', '', 0);
+    token.content = attrs['_default'] || '';
 
-// replace all [details] BBCode with HTML 5.1 equivalent
-function replaceDetails(text) {
-  text = text || "";
+    state.push('bbcode_close', 'summary', -1);
+  },
 
-  while (text !== (text = text.replace(/\[details=([^\]]+)\]((?:(?!\[details=[^\]]+\]|\[\/details\])[\S\s])*)\[\/details\]/ig, insertDetails)));
-
-  // add new lines to make sure we *always* have a <p> element after </summary> and around </details>
-  // otherwise we can't hide the content since we can't target text nodes via CSS
-  return text.replace(/<\/summary>/ig, "</summary>\n\n")
-             .replace(/<\/details>/ig, "\n\n</details>\n\n");
-}
-
-registerOption((siteSettings, opts) => {
-  opts.features.details = true;
-});
+  after: function(state) {
+    state.push('bbcode_close', 'details', -1);
+  }
+};
 
 export function setup(helper) {
   helper.whiteList([
@@ -29,5 +25,7 @@ export function setup(helper) {
     'details.elided'
   ]);
 
-  helper.addPreProcessor(text => replaceDetails(text));
+  helper.registerPlugin(md => {
+    md.block.bbcode.ruler.push('details', rule);
+  });
 }
diff --git a/plugins/discourse-details/spec/components/pretty_text_spec.rb b/plugins/discourse-details/spec/components/pretty_text_spec.rb
index 5c2ad81e100..cd03a2fb6ba 100644
--- a/plugins/discourse-details/spec/components/pretty_text_spec.rb
+++ b/plugins/discourse-details/spec/components/pretty_text_spec.rb
@@ -4,9 +4,17 @@ require 'pretty_text'
 describe PrettyText do
 
   it "supports details tag" do
-    cooked_html = "<details><summary>foo</summary>\n\n<p>bar</p>\n\n</details>"
+    cooked_html = "<details><summary>foo</summary>bar</details>"
     expect(PrettyText.cook("<details><summary>foo</summary>bar</details>")).to match_html(cooked_html)
-    expect(PrettyText.cook("[details=foo]bar[/details]")).to match_html(cooked_html)
+
+    cooked_html = <<~HTML
+      <details>
+      <summary>
+      foo</summary>
+      <p>bar</p>
+      </details>
+    HTML
+    expect(PrettyText.cook("[details=foo]\nbar\n[/details]")).to eq(cooked_html.strip)
   end
 
 end
diff --git a/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 b/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6
index 427687886ab..61ffac21528 100644
--- a/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6
+++ b/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6
@@ -6,7 +6,7 @@ function findTextarea() {
   return find(".d-editor-input")[0];
 }
 
-test('details button', () => {
+test('details button', (assert) => {
   visit("/");
 
   click('#create-topic');
@@ -14,9 +14,9 @@ test('details button', () => {
   click('.popup-menu .fa-caret-right');
 
   andThen(() => {
-    equal(
+    assert.equal(
       find(".d-editor-input").val(),
-      `[details=${I18n.t("composer.details_title")}]${I18n.t("composer.details_text")}[/details]`,
+      `\n[details=${I18n.t("composer.details_title")}]\n${I18n.t("composer.details_text")}\n[/details]\n`,
       'it should contain the right output'
     );
   });
@@ -33,15 +33,15 @@ test('details button', () => {
   click('.popup-menu .fa-caret-right');
 
   andThen(() => {
-    equal(
+    assert.equal(
       find(".d-editor-input").val(),
-      `[details=${I18n.t("composer.details_title")}]This is my title[/details]`,
+      `\n[details=${I18n.t("composer.details_title")}]\nThis is my title\n[/details]\n`,
       'it should contain the right selected output'
     );
 
     const textarea = findTextarea();
-    equal(textarea.selectionStart, 17, 'it should start highlighting at the right position');
-    equal(textarea.selectionEnd, 33, 'it should end highlighting at the right position');
+    assert.equal(textarea.selectionStart, 19, 'it should start highlighting at the right position');
+    assert.equal(textarea.selectionEnd, 35, 'it should end highlighting at the right position');
   });
 
   fillIn('.d-editor-input', "Before some text in between After");
@@ -56,37 +56,37 @@ test('details button', () => {
   click('.popup-menu .fa-caret-right');
 
   andThen(() => {
-    equal(
+    assert.equal(
       find(".d-editor-input").val(),
-      `Before [details=${I18n.t("composer.details_title")}]some text in between[/details] After`,
+      `Before \n[details=${I18n.t("composer.details_title")}]\nsome text in between\n[/details]\n After`,
       'it should contain the right output'
     );
 
     const textarea = findTextarea();
-    equal(textarea.selectionStart, 24, 'it should start highlighting at the right position');
-    equal(textarea.selectionEnd, 44, 'it should end highlighting at the right position');
+    assert.equal(textarea.selectionStart, 26, 'it should start highlighting at the right position');
+    assert.equal(textarea.selectionEnd, 46, 'it should end highlighting at the right position');
   });
 
-  fillIn('.d-editor-input', "Before\nsome text in between\nAfter");
+  fillIn('.d-editor-input', "Before \nsome text in between\n After");
 
   andThen(() => {
     const textarea = findTextarea();
-    textarea.selectionStart = 7;
-    textarea.selectionEnd = 28;
+    textarea.selectionStart = 8;
+    textarea.selectionEnd = 29;
   });
 
   click('button.options');
   click('.popup-menu .fa-caret-right');
 
   andThen(() => {
-    equal(
+    assert.equal(
       find(".d-editor-input").val(),
-      `Before\n[details=${I18n.t("composer.details_title")}]some text in between[/details]\nAfter`,
+      `Before \n\n[details=${I18n.t("composer.details_title")}]\nsome text in between\n[/details]\n\n After`,
       'it should contain the right output'
     );
 
     const textarea = findTextarea();
-    equal(textarea.selectionStart, 24, 'it should start highlighting at the right position');
-    equal(textarea.selectionEnd, 44, 'it should end highlighting at the right position');
+    assert.equal(textarea.selectionStart, 27, 'it should start highlighting at the right position');
+    assert.equal(textarea.selectionEnd, 47, 'it should end highlighting at the right position');
   });
 });
diff --git a/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6 b/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6
index f020474e6cb..4087ea22b21 100644
--- a/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6
+++ b/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6
@@ -1,6 +1,6 @@
 import { default as PrettyText, buildOptions } from 'pretty-text/pretty-text';
 
-module("lib:details-cooked-test");
+QUnit.module("lib:details-cooked-test");
 
 const defaultOpts = buildOptions({
   siteSettings: {
@@ -8,28 +8,24 @@ const defaultOpts = buildOptions({
     emoji_set: 'emoji_one',
     highlighted_languages: 'json|ruby|javascript',
     default_code_lang: 'auto',
-    censored_words: 'shucks|whiz|whizzer'
+    censored_words: ''
   },
   getURL: url => url
 });
 
-function cooked(input, expected, text) {
-  equal(new PrettyText(defaultOpts).cook(input), expected.replace(/\/>/g, ">"), text);
-};
 
-test("details", () => {
+test("details", assert => {
+  const cooked = (input, expected, text) => {
+    assert.equal(new PrettyText(defaultOpts).cook(input), expected.replace(/\/>/g, ">"), text);
+  };
   cooked(`<details><summary>Info</summary>coucou</details>`,
-         `<details><summary>Info</summary>\n\n<p>coucou</p>\n\n</details>`,
+         `<details><summary>Info</summary>coucou</details>`,
          "manual HTML for details");
-  cooked(` <details><summary>Info</summary>coucou</details>`,
-         `<details><summary>Info</summary>\n\n<p>coucou</p>\n\n</details>`,
-         "manual HTML for details with a space");
 
-  cooked(`<details open="open"><summary>Info</summary>coucou</details>`,
-         `<details open="open"><summary>Info</summary>\n\n<p>coucou</p>\n\n</details>`,
-         "open attribute");
-
-  cooked(`<details open><summary>Info</summary>coucou</details>`,
-         `<details open><summary>Info</summary>\n\n<p>coucou</p>\n\n</details>`,
-         "open attribute");
+  cooked("[details=testing]\ntest\n[/details]",
+`<details>
+<summary>
+testing</summary>
+<p>test</p>
+</details>`);
 });
diff --git a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6 b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
index 40d727b6ae6..82117be16e0 100644
--- a/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
+++ b/plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js.es6
@@ -4,9 +4,8 @@ function initialize(api) {
   const messageBus = api.container.lookup('message-bus:main');
   const currentUser = api.getCurrentUser();
   const appEvents = api.container.lookup('app-events:main');
-  const SiteHeaderComponent = api.container.lookupFactory('component:site-header');
 
-  SiteHeaderComponent.reopen({
+  api.modifyClass('component:site-header', {
     didInsertElement() {
       this._super();
       this.dispatch('header:search-context-trigger', 'header');
@@ -34,6 +33,6 @@ export default {
 
   initialize(container) {
     const siteSettings = container.lookup('site-settings:main');
-    if (siteSettings.discourse_narrative_bot_enabled) withPluginApi('0.5', initialize);
+    if (siteSettings.discourse_narrative_bot_enabled) withPluginApi('0.8.7', initialize);
   }
 };
diff --git a/plugins/discourse-narrative-bot/config/locales/client.es.yml b/plugins/discourse-narrative-bot/config/locales/client.es.yml
index ffbe0212434..10bdb973be4 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.es.yml
@@ -10,4 +10,4 @@ es:
     discourse_narrative_bot:
       welcome_post_type:
         new_user_track: "Comenzar el tutorial de nuevos usuarios para todos los nuevos usuarios"
-        welcome_message: "Enviar a todos los nuevos usuarios un mensaje de bienvenida con una guía de comienzo rápida"
+        welcome_message: "Enviar a todos los nuevos usuarios un mensaje de bienvenida con la guía de comienzo rápida"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ja.yml b/plugins/discourse-narrative-bot/config/locales/client.ja.yml
index 8c2dc009047..3f573c644f3 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.ja.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ja: {}
+ja:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "全ての新規ユーザーのためにチュートリアルを開始します"
+        welcome_message: "全ての新規ユーザーにクイックスタートガイド付きのウェルカムメッセージを送信します"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ko.yml b/plugins/discourse-narrative-bot/config/locales/client.ko.yml
index bf4e05d6f4f..a6dd142953f 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.ko.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ko: {}
+ko:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "모든 신규 사용자를 위한 튜토리얼을 시작합니다."
+        welcome_message: "모든 신규 사용자에게 퀵 스타트 가이드와 함께 환영 메세지를 보냅니다."
diff --git a/plugins/discourse-narrative-bot/config/locales/client.pl_PL.yml b/plugins/discourse-narrative-bot/config/locales/client.pl_PL.yml
index c04d371e5a4..db756af6e9b 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.pl_PL.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pl_PL: {}
+pl_PL:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Rozpocznij poradnik nowego użytkownika dla wszystkich nowych użytkowników"
+        welcome_message: "Wyślij wszystkim nowym użytkownikom  wiadomość powitalną z szybkim przewodnikiem"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.sk.yml b/plugins/discourse-narrative-bot/config/locales/client.sk.yml
index 5773ccd0c8a..31b6da6addc 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.sk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.sk.yml
@@ -10,4 +10,4 @@ sk:
     discourse_narrative_bot:
       welcome_post_type:
         new_user_track: "Začnite s novým používateľským návodom pre všetkých nových používateľov"
-        welcome_message: "Pošlite všetkým nových používateľom uvítaciu správu s rýchlym sprievodcom"
+        welcome_message: "Pošlite všetkým novým používateľom uvítaciu správu s rýchlym sprievodcom"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.sq.yml b/plugins/discourse-narrative-bot/config/locales/client.sq.yml
index 4526be31621..464107661fe 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.sq.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.sq.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-sq: {}
+sq:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "Nisni udhëzuesin e ri të përdorimit për të gjithë anëtarët"
+        welcome_message: "Dërgojini të gjithë anëtarëve të rinj një mesazh mirëseardhjeje me një udhëzues nga t'ia nisi shpejt"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.cs.yml b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
index c0f2fec763b..e6fc1ed2bac 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
@@ -5,4 +5,93 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-cs: {}
+cs:
+  badges:
+    certified:
+      name: Certifikován
+      description: "Dokončil náš tutorial pro nové uživatele"
+  discourse_narrative_bot:
+    dice:
+      trigger: "hodit"
+      invalid: |-
+        Omlouvám se, ale je matematicky nemožné hodit s touhle kombinací kostek. :confounded:
+      not_enough_dice: |-
+        Mám jen %{num_of_dice} kostek. Naprosto [ostudné](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php).
+      out_of_range: |-
+        Víš, že [maximální počet stěn](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) pro matematicky férovou kostku je 120?
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "citát"
+      '1':
+        author: "Albert Einstein"
+      '2':
+        author: "Mahatma Gandhi"
+      '3':
+        author: "Dr Seuss"
+      '4':
+        author: "Charles-Guillaume Étienne"
+      '5':
+        author: "Theodore Roosevelt"
+      '6':
+        author: "Máma Forresta Gumpa"
+      '7':
+        author: "Neil Armstrong"
+      '8':
+        author: "Eleanor Roosevelt"
+      '9':
+        author: "Bruce Lee"
+      '10':
+        author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
+    magic_8_ball:
+      answers:
+        '1': "To je jisté"
+        '2': "Naprostá pravda"
+        '3': "Bez zaváhání"
+        '4': "Rozhodně ano"
+        '5': "Na to se můžeš spolehnout"
+        '6': "Podle mě ano"
+        '7': "Asi jo"
+        '8': "Vypadá to dobře"
+        '9': "Ano"
+        '10': "Dle znamení ano"
+        '11': "Odpověď nejistá, zeptej se znovu"
+        '12': "Zeptej se jindy"
+        '13': "To ti teď raději neřeknu"
+        '14': "To nyní nedokážu předpovědět"
+        '15': "Soustřeď se a zeptej se znovu"
+        '16': "S tím nepočítej"
+        '17': "Moje odpověď zní ne"
+        '18': "Dle mých zdrojů ne"
+        '19': "To nevypadá dobře"
+        '20': "To sotva"
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: 'začít'
+      skip_trigger: 'přeskočit'
+      help_trigger: 'zobrazit nápovědu'
+      random_mention:
+        reply: |-
+          Ahoj! Pokud chceš zjistit, co umím, napiš `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Zatím umím následující věci:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > Začít jedním z následujících interaktivních průvodců: %{tracks}.
+      do_not_understand:
+        first_response: |-
+          Dík za odpověď!
+
+          Bohužel nejsem naprogramován nijak skvěle, takže jsem tomuhle neporozumněl. :frowning:
+    new_user_narrative:
+      reset_trigger: "nový uživatel"
+      hello:
+        title: ":robot: Zdravím!"
+      search:
+        not_found: |-
+          Hmm…vypadá to, že máš potíže. To mě mrzí. Hledal jsi <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> pro výraz **capy&#8203;bara**?
+    advanced_user_narrative:
+      reset_trigger: 'pokročilý uživatel'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.da.yml b/plugins/discourse-narrative-bot/config/locales/server.da.yml
index 9ca8189621d..482acc9a9ec 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.da.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.da.yml
@@ -5,4 +5,30 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-da: {}
+da:
+  badges:
+    certified:
+      name: Certificeret
+      description: "Fuldførte vores \"ny bruger\" vejledning"
+    licensed:
+      name: Licenseret
+      description: "Gennemført vores advancerede bruger vejledning"
+  discourse_narrative_bot:
+    bio: "Hej, jeg er ikke en rigtigt person. Jeg er en bot der kan lære dig om dette site. For at interaggere med mig, send mig en besked, eller nævn **`@%{discobot_username}`** overalt."
+    timeout:
+      message: |-
+        Hey @%{username}, jeg skriver fordi jeg ikke har hørt fra dig i et stykke tid.
+
+        - For at fortsætte, så kan du altid svare mig.
+
+        - Hvis du vil springe dette skridt over, så sig `%{skip_trigger}`.
+
+        - For at starte forfra, så sig `%{reset_trigger}`.
+
+        Hvis du helst vil være fri, så er det også okay. Jeg er en robot. Du sårer ikke mine følelser. :sob:
+    dice:
+      trigger: "Rul"
+      invalid: |-
+        Jeg beklager, det er matematisk umuligt at rulle den kombination af terninger. :confounded:
+      not_enough_dice: |-
+        I only have %{num_of_dice} dice. [Skamfuldt](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), jeg ved det!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 1297a76dadd..3f7ba39b5be 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -12,6 +12,7 @@ de:
     discourse_narrative_bot_ignored_usernames: "Benutzernamen, die vom Discourse Narrative Bot ignoriert werden sollen"
     discourse_narrative_bot_disable_public_replies: "Öffentliche Antworten von Discourse Narrative Bot deaktivieren"
     discourse_narrative_bot_welcome_post_type: "Die Art der Willkommensnachricht, die vom Discourse Narrative Bot versendet werden soll."
+    discourse_narrative_bot_welcome_post_delay: "Warte (n) Sekunden bevor Discourse Narrative Bot seine Willkommensnachricht schickt"
   badges:
     certified:
       name: Zertifiziert
@@ -161,7 +162,7 @@ de:
           - https://de.wikipedia.org/wiki/Tetraphobie
           - https://de.wikipedia.org/wiki/Beghilos
         reply: |-
-          Cool! Dies wird mit den meisten <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> Links funktionieren. Denk immer daran, dass der Link _ganz allein_ auf einer Zeile stehen muss; ohne etwas davor oder dahinter.
+          Super! Dies funktioniert mit den meisten <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> Links. Aber denk dran: er muss _ganz alleine_ in der Zeile stehen, mit nichts davor und nichts dahinter.
         not_found: |-
           Entschuldige bitte, ich konnte keinen Link in deiner Antwort finden! :cry:
 
@@ -169,6 +170,14 @@ de:
 
           - https://de.wikipedia.org/wiki/Hauskatze
       images:
+        instructions: |-
+          Hier ist ein Bild von einem Einhorn:
+
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+
+          Wenn es dir gefällt (und wie kann jemand das nicht mögen!), drücke den "Gefällt-mir" Knopf :heart: unter diesem Beitrag, um mich das wissen zu lassen.
+
+          Kannst du mir **mit einem Bild antworten?** Nimm irgendein Bild, es ist ganz egal welches. Du kannst mit der Maus ziehen und loslassen, oder den Hochlade-Knopf drücken, und sogar  kopieren und einfügen funktioniert.
         reply: |-
           Hübsches Bild – ich habe die Like-Schaltfläche :heart: gedrückt, um dich wissen zu lassen, wie sehr es mir gefällt :heart_eyes:
         like_not_found: |-
@@ -213,28 +222,28 @@ de:
           Das Auswählen von beliebigem Text in meinem Beitrag lässt die <kbd>**Zitat**</kbd>-Schaltfläche erscheinen. Und das Drücken von **Antworten** mit einem beliebigen ausgewählten Text wird auch funktionieren! Kannst du es nochmal versuchen?
       bookmark:
         instructions: |-
-          Wenn du mehr lernen möchtest, wähle <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> unterhalb aus und <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> **füge ein Lesezeichen zu dieser Nachricht hinzu**. Wenn du dies tust, könnte es in der Zukunft ein :gift: geben!
+          Wenn Du gerne mehr erfahren möchtest, wähle <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> unten und <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> **setze ein Lesezeichen für diese private Nachricht**. Wenn Du das tust, habe ich ein kleines :gift: für dich!
         reply: |-
           Hervorragend! Jetzt kannst du jederzeit über [den Lesezeichen-Reiter in deinem Profil](%{profile_page_url}/activity/bookmarks) zu unserer Unterhaltung zurückkehren. Gehe dazu einfach auf dein Profilbild oben rechts &#8599;.
         not_found: |-
-          Oh weh, ich sehe keine Lesezeichen in diesem Thema. Hast du die Lesezeichen-Schaltfläche unter jedem Beitrag gefunden? Verwende die „Mehr anzeigen“-Schaltfläche <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16">, um bei Bedarf weitere Aktionen anzuzeigen.
+          Oh je! Ich sehe gar keine Lesezeichen in diesem Thema. Hast du das Lesezeichen-Symbol unter jedem Beitrag gefunden? Falls du es nicht siehst, benutze das "Zeige mehr"-Symbol <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> um weitere Aktionsmöglichkeiten sichtbar zu machen.
       emoji:
         instructions: |-
-          Du hast vielleicht bemerkt, dass ich kleine Bilder in meinen Antworten verwendet habe :blue_car::dash:, die [Emoji](https://de.wikipedia.org/wiki/Emoji) heißen. Kannst du in deiner Antwort **ein Emoji hinzufügen**? Jedes der folgenden wird funktionieren:
+          Du hast vielleicht bemerkt, dass ich kleine Bilder in meinen Antworten verwendet habe :blue_car::dash:. Die heißen [Emoji](https://de.wikipedia.org/wiki/Emoji) heißen. Kannst du in deiner Antwort **ein Emoji hinzufügen**? Du kannst das auf verschiedene Weise tun:
 
           - Gib `:) ;) :D :P :O` ein
 
           - Gib einen Doppelpunkt <kbd>:</kbd> gefolgt vom Emoji-Namen ein `:tada:`
 
-          - Drücke die Emoji-Schaltfläche <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> im Editor oder auf der Tastatur deines mobilen Geräts.
+          - Drücke die Emoji-Schaltfläche <img src="/images/font-awesome-smile.png" width="16" height="16"> im Editor oder auf der Tastatur deines mobilen Geräts.
         reply: |-
           Das ist :sparkles: _emojitastisch!_ :sparkles:
         not_found: |-
-          Hoppla, ich sehe kein Emoji in deinem Beitrag? Oh nein! :sob:
+          Hoppla, ich sehe kein Emoji in deinem Beitrag. Warum bloß? :sob:
 
-          Versuche einen Doppelpunkt <kbd>:</kbd> einzugeben, um damit die Emoji-Auswahl zu öffnen. Dann gib die ersten Buchstaben vom gesuchten Emoji ein; wie zum Beispiel `:bird:`
+          Versuche einen Doppelpunkt <kbd>:</kbd> einzugeben, um damit die Emoji-Auswahl zu öffnen. Dann gib die ersten Buchstaben vom gesuchten Emoji ein; also zum Beispiel `:bird:`
 
-          Oder drücke die Emoji-Schaltfläche <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> im Editor.
+          Oder drücke die Emoji-Schaltfläche <img src="/images/font-awesome-smile.png" width="16" height="16"> im Editor.
 
           (Auf einem mobilen Gerät kannst du Emojis auch direkt über deine Tastatur eingeben.)
       mention:
@@ -252,24 +261,24 @@ de:
         instructions: |-
           Wir mögen freundliche Diskussionen, und wir benötigen deine Hilfe, damit [alles zivilisiert bleibt](%{guidelines_url}). Wenn du ein Problem bemerkst, melde dies bitte und lass es diskret den Autor oder [unser hilfreiches Team](%{about_url}) wissen.
 
-          > :imp: Ich habe dir hier etwas Böses geschrieben
+          > :imp: Ich habe dir hier etwas anstößiges geschrieben
 
-          Ich denke, du weißt was zu tun ist. Zögere nicht und **melde diesen Beitrag** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> als unangemessen!
+          Ich denke, du weißt was zu tun ist. Los, **melde diesen Beitrag** <img src="/images/font-awesome-flag.png" width="16" height="16"> als unangemessen!
         reply: |-
           [Unser Team](/groups/staff) wird diskret über deine Meldung informiert. Wenn genügend Community-Mitglieder einen Beitrag melden, wird er als Vorsichtsmaßnahme automatisch versteckt. (Weil ich nicht wirklich einen bösen Beitrag geschrieben habe :angel:, habe ich mir erlaubt, die Meldung fürs Erste wieder zu löschen.)
         not_found: |-
-          Oh nein, mein böser Beitrag wurde nicht gemeldet. :worried: Kannst du ihn als unangemessen **melden** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? Vergiss nicht, die „Mehr anzeigen“-Schaltfläche <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> zu verwenden, damit für jeden Beitrag weitere Aktionen sichtbar werden.
+          Oh nein, mein widerlicher Beitrag wurde nicht gemeldet. :worried: Kannst du ihn als unangemessen **melden** <img src="/images/font-awesome-flag.png" width="16" height="16">? Vergiss nicht, die „Mehr anzeigen“-Schaltfläche <img src="/images/font-awesome-ellipsis.png" width="16" height="16"> zu verwenden, damit für jeden Beitrag weitere Aktionsmöglichkeiten sichtbar werden.
       search:
         instructions: |-
-          _Psst_… ich habe in diesem Thema eine Überraschung versteckt. Wenn du für eine Herausforderung zu haben bist, dann **wähle das Such-Symbol** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> oben rechts &#8599; aus und suche danach.
+          _Psst_… ich habe in diesem Thema eine Überraschung versteckt. Wenn du für eine Herausforderung zu haben bist, dann **wähle das Such-Symbol** <img src="/images/font-awesome-search.png" width="16" height="16"> oben rechts &#8599; aus und suche danach.
 
-          Versuche in diesem Thema nach dem Begriff „Capy&#8203;bara“ zu suchen.
+          Probier mal, in diesem Thema nach dem Begriff „Capy&#8203;bara“ zu suchen.
         hidden_message: |-
           Wie konntest du das Capybara übersehen? :wink:
 
-          <img src="%{base_uri}/images/capybara-eating.gif"/>
+          <img src="/images/capybara-eating.gif"/>
 
-          Hast du bemerkt, dass du jetzt zurück am Anfang bist? Füttere dieses arme, hungrige Capybara, indem du **mit dem `:herb:`-Emoji antwortest** und du wirst automatisch zum Ende gebracht.
+          Hast du bemerkt, dass du jetzt zurück am Anfang bist? Füttere dieses arme, hungrige Capybara, indem du **mit dem `:herb:`-Emoji antwortest** und du wirst automatisch wieder zum Ende gebracht.
         reply: |-
           Juhu! Du hast es gefunden :tada:
 
@@ -279,7 +288,7 @@ de:
 
           - Wenn du eine physische Tastatur verwendest, gib <kbd>?</kbd> ein, um eine nützliche Übersicht über Tastenkombinationen anzuzeigen.
         not_found: |-
-          Hm… es sieht so aus, als hättest du Probleme. Tut mir leid. Hast du nach dem Begriff **capy&#8203;bara** gesucht <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16">?
+          Hm… es sieht so aus, als hättest du Schwierigkeiten. Das tut mir leid. Hast du nach dem Begriff **capy&#8203;bara** gesucht <img src="/images/font-awesome-search.png" width="16" height="16">?
       end:
         message: |-
           Danke, dass du mir treu geblieben bist, @%{username}! Ich habe dies für dich gemacht. Ich denke, du hast es verdient:
@@ -306,32 +315,20 @@ de:
 
           Kannst du beginnen, indem du den Beitrag **bearbeitest**, den ich gerade in deinem Namen erstellt habe?
         not_found: |-
-          Es sieht so aus, als solltest du den [Beitrag](%{url}) noch bearbeiten, den ich für dich erstellt habe. Kannst du es nochmal versuchen?
+          Es sieht so aus, als hättest Du den [Beitrag](%{url}), den ich für dich erstellt habe, noch gar nicht bearbeitet. Kannst du es nochmal versuchen?
 
-          Verwende das <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16">-Symbol, um den Editor zu öffnen.
+          Verwende das <img src="/images/font-awesome-pencil.png" width="16" height="16">-Symbol, um den Editor zu öffnen.
         reply: |-
           Gut gemacht!
 
           Beachte, dass Änderungen, die nach 5 Minuten gemacht werden, als Überarbeitungen für jeden sichtbar sind. Die Anzahl der Überarbeitungen wird, neben einem kleinen Bleistift-Symbol, am Beitrag rechts oben angezeigt.
       delete:
-        instructions: |-
-          Wenn du einen von dir erstellten Beitrag zurückziehen möchtest, dann kannst du ihn löschen.
-
-          Leg los und **lösche* einen deiner Beiträge in dieser Unterhaltung, indem du die <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> **Löschen**-Aktion verwendest. Lösche aber nicht den ersten Beitrag!
-        not_found: |-
-          Ich sehe noch keine gelöschten Beiträge? Denk daran, dass die <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> „Mehr anzeigen“-Schaltfläche die <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> Löschen-Schaltfläche sichtbar werden lässt.
         reply: |-
           Oha! :boom:
 
           Um die Kontinuität deiner Diskussionen zu bewahren, werden Löschungen nicht sofort durchgeführt. Gelöschte Beiträge werden erst nach einer gewissen Zeit entfernt.
       recover:
         deleted_post_raw: 'Warum hat @%{discobot_username} meinen Beitrag gelöscht? :anguished:'
-        instructions: |-
-          Oh nein! Es sieht so aus, als hätte ich versehentlich einen neuen Beitrag gelöscht, den ich gerade für dich erstellt hatte.
-
-          Kannst du mir einen Gefallen tun und ihn <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> **wiederherstellen**?
-        not_found: |-
-          Hast du Schwierigkeiten? Denk daran, dass die <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> „Mehr anzeigen“-Schaltfläche die  <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> Wiederherstellen-Schaltfläche sichtbar werden lässt.
         reply: |-
           Puh, das war knapp! Danke, dass du das korrigiert hast :wink:
 
@@ -363,19 +360,6 @@ de:
 
           Beachte, dass die Benachrichtigungsstufe automatisch auf „Verfolgen“ geändert wird, wenn du auf ein Thema antwortest oder ein Thema länger als ein paar Minuten liest. Du kannst dies in [deinen Benutzer-Einstellungen](/my/preferences) ändern.
       poll:
-        instructions: |-
-          Wusstest du, dass du eine Umfrage zu einem beliebigen Beitrag hinzufügen kannst? Versuche dazu das <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor zu verwenden und wähle **Umfrage erstellen** aus.
-        not_found: |-
-          Hoppla! Da war keine Umfrage in deiner Antwort.
-
-          Verwende das <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor, oder kopiere diese Umfrage und füge sie in deine nächste Antwort ein:
-
-          ```text
-          [poll]
-          * :cat:
-          * :dog:
-          [/poll]
-          ```
         reply: |-
           Hey, schöne Umfrage! Wie mache ich mich als Lehrer?
 
@@ -384,20 +368,6 @@ de:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          Manchmal möchtest du vielleicht in deinen Antworten **Details ausblenden**:
-
-          - Wenn du Handlungen eines Films oder einer TV-Serie diskutierst, die als Spoiler betrachtet werden könnten.
-
-          - Wenn dein Beitrag viele optionalen Details benötigt, die überwältigend sein könnten, wenn man sie alle auf einmal liest.
-
-          [details=Wähle dies aus, um zu sehen, wie es funktioniert!]
-          1. Wähle das <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor aus.
-          2. Wähle „Details ausblenden“ aus.
-          3. Bearbeite die Zusammenfassung der Details und deinen Inhalt.
-          [/details]
-
-          Kannst du das <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor benutzen und einen Details-Abschnitt in deiner nächsten Antwort einfügen?
         not_found: |-
           Hast du Schwierigkeiten, den Details-Abschnitt zu erstellen? Versuche Folgendes in deine nächste Antwort aufzunehmen:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index e6e087f909e..1e59bd0fb2e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -12,6 +12,7 @@ es:
     discourse_narrative_bot_ignored_usernames: "Nombres de usuario que el Discourse Narrative Bot debe ignorar"
     discourse_narrative_bot_disable_public_replies: "Deshabilitar respuestas públicas del Discourse Narrative Bot"
     discourse_narrative_bot_welcome_post_type: "Tipo de post de bienvenida que el Discourse Narrative Bot debería enviar"
+    discourse_narrative_bot_welcome_post_delay: "Esperar (n) segundos antes de enviar el post de bienvenida del Discourse Narrative Bot."
   badges:
     certified:
       name: Certificado
@@ -27,14 +28,14 @@ es:
     bio: "Hola, no soy una persona real. Soy un bot que puede enseñarte sobre este sitio. Para interactuar conmigo, me envías un mensaje o me mencionas **`@%{discobot_username}`** en cualquier lugar."
     timeout:
       message: |-
-        Hey @%{username}, solo estoy verificando si estás porque no he oído de tí en un tiempo.
-        - Para continuar, responde en cualquier momento.
+        Hola @%{username}, tan solo por ver si estás ahí, no he oído de ti en un tiempo.
+        - Para continuar, coméntame en cualquier momento.
 
-        - Si gustas de saltar este paso, dime `%{skip_trigger}`.
+        - Si prefieres saltarte este paso, escribe `%{skip_trigger}`.
 
-        - Para empezar de nuevo, dime `%{reset_trigger}`.
+        - Para empezar de nuevo, escribe `%{reset_trigger}`.
 
-        Si prefieres no continuar, está OK también! Soy un robot. No herirás mis sentimientos. :sob:
+        Si prefieres no continuar, ¡perfecto! Soy un robot. No herirás mis sentimientos. :sob:
     dice:
       trigger: "tirar"
       invalid: |-
@@ -42,40 +43,40 @@ es:
       not_enough_dice: |-
         Solo tengo %{num_of_dice} dados para jugar. Es vergonsozo lo sé!
       out_of_range: |-
-        ¿Sabías que el máximo número de lados para que un dado, matemáticamente correcto, es de 120 lados?
+        ¿Sabías que [el máximo número de lados](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) para un dado matemáticamente correcto, es de 120?
       results: |-
-        > :game_die: tirada de dados: %{results}
+        > :game_die: %{results}
     quote:
       trigger: "citar"
       '1':
-        quote: "In the middle of every difficulty lies opportunity"
+        quote: "Entre las dificultades se esconde la oportunidad"
         author: "Albert Einstein"
       '2':
-        quote: "You must be the change you wish to see in the world."
+        quote: "Conviértete en el cambio que deseas ver en el mundo."
         author: "Mahatma Gandhi"
       '3':
-        quote: "Don’t cry because it’s over, smile because it happened."
+        quote: "No llores porque terminó, sonríe porque sucedió."
         author: "Dr Seuss"
       '4':
-        quote: "If you want something done right, do it yourself."
+        quote: "Si quieres algo bien hecho, hazlo tú mismo."
         author: "Charles-Guillaume Étienne"
       '5':
-        quote: "Believe you can and you’re halfway there."
+        quote: "Cree en poder lograr algo y tendrás la mitad del camino hecho."
         author: "Theodore Roosevelt"
       '6':
-        quote: "Life is like a box of chocolates. You never know what you’re gonna get."
-        author: "Forrest Gump’s Mom"
+        quote: "La vida es como una caja de bombones, nunca sabes qué te va a tocar."
+        author: "La mamá de Forrest Gump"
       '7':
-        quote: "That’s one small step for a man, a giant leap for mankind."
+        quote: "Es un pequeño paso para un hombre, pero un gran salto para la humanidad."
         author: "Neil Armstrong"
       '8':
-        quote: "Do one thing every day that scares you."
+        quote: "Todos los días haz algo que te dé miedo."
         author: "Eleanor Roosevelt"
       '9':
-        quote: "Mistakes are always forgivable, if one has the courage to admit them."
+        quote: "Los errores son siempre perdonables, si uno tiene el coraje de admitirlos."
         author: "Bruce Lee"
       '10':
-        quote: "Whatever the mind of man can conceive and believe, it can achieve."
+        quote: "Lo que la mente del hombre puede concebir y creer, es lo que la mente del hombre puede lograr."
         author: "Napoleon Hill"
       results: |-
         > :left_speech_bubble: _%{quote}_ &mdash; %{author}
@@ -158,7 +159,7 @@ es:
           - https://en.wikipedia.org/wiki/Death_by_coconut
           - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
-          Genial! Esto funcionará con la mayoría de los <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> enlaces. Recuerda, deben ser escritos en la linea _todo el enlace_, con nada de texto (ni espacios) delante o detrás.
+          Genial! Esto funcionará en la mayoría de los <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> enlaces. Recuerda que debe ser colocado el enlace en una _linea aparte_, sin texto ni espacios delante ni atrás del enlace.
         not_found: |-
           Disculpa, no he podido encontrar el enlace en tu respuesta! :cry:
 
@@ -166,6 +167,14 @@ es:
 
           - https://en.wikipedia.org/wiki/Exotic_Shorthair
       images:
+        instructions: |-
+          Aquí la imagen de un unicornio:
+
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+
+          Si te gusta (y a quién no) presiona el botón :heart: debajo del post para hacerme saber que te ha gustado.
+
+          Además de darle "me gusta", puedes **responder con otra imagen??** Cualquier imagen! Arrastra y suelta la imagen desde tu PC al editor, o bien presiona el botón de subir imagen, o también puedes copiar y pegar la imagen al editor!
         reply: |-
           Elegante imagen – He presionado el botón :heart: "me gusta" para hacerte saber cuánto la aprecio :heart_eyes:
         like_not_found: |-
@@ -177,6 +186,7 @@ es:
       formatting:
         instructions: |-
           ¿Puedes hacer algunas letras en **negrita** o _cursiva_ en tu respuesta?
+
           - escribe `**negrita**` o `_cursiva_`
 
           - o, presiona los botones <kbd><b>B</b></kbd> o <kbd><i>I</i></kbd> en el editor
@@ -188,13 +198,15 @@ es:
           Puedes intentar de nuevo? Usa los botones <kbd><b>B</b></kbd> para negrita o <kbd><i>I</i></kbd> para cursiva en el editor si no recuerdas cómo formatear texto.
       quoting:
         instructions: |-
-          ¿Puedes intentar citarme cuando me respondes, así sé exactamente qué parte estás respondiendome?
+          ¿Puedes intentar citarme cuando me respondes, así sé exactamente en qué parte me estás respondiendo?
           > Si esto es café, por favor trae un poco de té; pero si es té, por favor trae un poco de café.
           >
           > Una de las ventajas de hablarse a sí mismo, es que tú sabes que al menos alguien está oyendo.
           >
           > Algunas personas tienen un camino con las palabras, y otras personas ... oh, oh, no tienen camino.
+
           Selecciona la parte del texto &uarr; que prefieres citar, y luego presiona el botón **citar** que aparece sobre tu selección del texto – o presiona el botón **Responder** debajo de este post.
+
           Debajo de la cita, escribe una palabra o dos sobre lo que escribí, porque soy curioso :thinking:
         reply: |-
           Buen trabajo, elegiste mi cita favorita! :left_speech_bubble:
@@ -203,30 +215,30 @@ es:
           Seleccionando cualquier texto de mi mensaje, aparecerá la palabra <kbd>**Citar**</kbd>, como si fuese un botón. Y si decides presionar **Responder** habiendo seleccionado el texto, funcionará igual! ¿Puedes intentarlo de nuevo?
       bookmark:
         instructions: |-
-          Si quieres aprender más, selecciona <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> debajo y <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16">  **guarda como favorito este mensaje privado**. Si lo haces, quizás haya un :gift: en el futuro!
+          Si quieres aprender más, selecciona el botón <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> debajo y presiona <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> **para guardar como favorito este mensaje**.  Si lo haces, habrá un :gift: en tu futuro!
         reply: |-
           Excelente! Ahora puedes encontrar fácilmente las conversaciones privadas en cualquier momento, desde la [sección de marcadores de tu perfil](%{profile_page_url}/activity/bookmarks). Sólo debes seleccionar la foto de tu perfil en la parte superior derecha de la pantalla &#8599;
         not_found: |-
-          Oh oh, no veo ningún mensaje marcado como favorito en esta conversación. No encontraste cómo marcar el mensaje debajo del post? Prueba usando el "ver más" <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> para ver las opciones, y ahí está el botón del marcador.
+          Uh oh, no veo ningún favorito en este tema. Encontraste la forma de marcar como favorito debajo de cada mensaje? Usa el botón para mostrar más opciones <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> y aparecerán las otras opciones que necesitas.
       emoji:
         instructions: |-
-          Habrás notado que uso algunas imagenes pequeñas en mis respuestas por ejemplo: :blue_car::dash: éstos son denominados [emoji](https://es.wikipedia.org/wiki/Emoji). ¿Puedes **agregar un emoji** a tu respuesta? Cualquiera de éstos funcionarán:
+          Me has visto usando pequeñas imágenes en mis respuestas :blue_car::dash: estos se llaman [emoji](https://es.wikipedia.org/wiki/Emoji). ¿Puedes **agregar un emoji** a tu próxima respuesta? Cualquiera de éstos funcionará:
 
           - Escribe `:) ;) :D :P :O`
 
-          - Escribe primero `dos puntos`, así <kbd>:</kbd> luego completa con el nombre del emoji, ejemplo `:tada:`
+          - Escribe <kbd>:</kbd> y luego puedes completar con la palabra para elegir el emoji `:tada:`
 
-          - Presiona el botón de los emojis <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> en el editor, o a través del teclado de tu móvil.
+          - O bien, presionas el botón <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> en el editor, o usas el teclado de tu móvil
         reply: |-
           Eso es :sparkles: _emojitastic!_ :sparkles:
         not_found: |-
-          Oops, no veo ningún Emoji en tu respuesta? Oh no! :sob:
+          Oops, no veo ningún Emoji en tu respuesta! Oh no! :sob:
 
-          Prueba escribiendo <kbd>:</kbd> y verás que aparece el seleccionador de Emojis, puedes elegir uno, o bien seguir escribiendo el nombre del Emoji que quieras, como `:bird:`
+          Prueba escribiendo primero <kbd>:</kbd> y de esa forma el foro te mostrará emojis para elegir, luego puedes seguir escribiendo el nombre del emoji que quieres seleccionar, por ejemplo `:bird:`
 
-          O, presionar el botón de Emoji <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> en el editor.
+          O, presiona en botón <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> en el editor.
 
-          (Si estás usando un celular, también puedes poner los Emojis (smiles, o caritas) desde el teclado de tu celular.)
+          (si estás en un dispositivo móvil, puedes introducir directamente un emoji desde el teclado del dispositivo.)
       mention:
         instructions: |-
           A veces, quieres captar la atención de alguien en un debate, incluso aunque no le estés respondiendo a su mensaje directamente. Para ésto, escribe `@` seguido del nombre del usuario que quieres mencionar.
@@ -239,25 +251,26 @@ es:
           (Sí! mi nombre de usuario se deletrea _disco_, como el baile de los 70s. Me [encanta la vida nocturna!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
       flag:
         instructions: |-
-          Nos gustan nuestras conversaciones amistosas, y necesitamos tu ayuda para [mantener las cosas civilizadas](%{guidelines_url}). Si ves un problema, por favor marca con la bandera y de forma privada se le notificará al autor o bien se notificará al [staff](%{about_url}).
-          >  :imp: Escribí algo desagradable aquí
+          Nos gustan nuestras amistosas discusiones, y necesitamos tu ayuda para [mantener las cosas civilizadas](%{guidelines_url}). Si ves un problema, por favor reporta anónimamente el mismo así el staff toma conocimiento o puedes contactar al [staff](%{about_url}), si así lo deseas.
 
-          Supongo que sabes qué hacer. Sigue adelante y **reporta este mensaje** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> como inapropiado!
+          >  :imp: Escribí algo asqueroso aquí
+
+          Me imagino que sabes qué hacer. Anímate, **reporta este mensaje** con el botón <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> como inapropiado!
         reply: |-
           [Nuestro staff](/groups/staff) será notificado por privado sobre tu reporte. Si un número suficiente de miembros reportan un mensaje, será ocultado automáticamente como precaución. (Puesto que no escribí algo realmente desagradable :angel:, he quitado el reporte por ahora.)
         not_found: |-
-          Oh no, mi mensaje desagradable aún no ha sido reportado! :worried: ¿Puedes marcar como inapropiado el mensaje con la **bandera** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? No te olvides de hacer clic en el botón para mostrar todas las opciones: <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> y ver así más acciones por cada mensaje.
+          Oh no, mi mensaje asqueroso no ha sido reportado aún. :worried: ¿Puedes reportar como inapropiado usando la **bandera** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? No olvides que esa opción está oculta, así que debes primero presionar el botón  <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> para ver otras opciones para cada mensaje.
       search:
         instructions: |-
-          _psst_ … Te he ocultado una sorpresa en este tema. Si aceptas el reto, **selecciona el icono de búsqueda** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> en la parte superior &#8599; y busca lo siguiente.
+          _psst_ … He ocultado una sorpresa en este tema. Si estás listo para el desafío, **selecciona el botón para buscar** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> que está arriba a la derecha &#8599; y ahí puedes buscar palabras.
 
-          Prueba buscar el término "capy&#8203;bara" en este tema
+          Trata de buscar el término "capy&#8203;bara" en este tema. Dale, hazlo ahora.
         hidden_message: |-
-          Cómo te perdiste este capybara? :wink:
+          Cómo te pediste este capybara? :wink:
 
           <img src="%{base_uri}/images/capybara-eating.gif"/>
 
-          ¿Te fijaste en que estás de vuelta al principio? Alimenta este pobre hambriendo capybara **respondiendo con el emoji `:herb:`** y serás automáticamente enviado al final.
+          Notaste que hemos vuelto al comienzo del tema? Alimenta este pobre y hambriento capybara **respondiendo con el emoji `:herb:`** y serás automáticamente enviado al final del tema.
         reply: |-
           Yay lo encontraste! :tada:
 
@@ -267,7 +280,7 @@ es:
 
           - Si tienes un :keyboard: físico, presiona la tecla <kbd>?</kbd> para ver nuestros prácticos atajos del teclado.
         not_found: |-
-          Hmm… parece que podrías estar teniendo problemas. Lo siento acerca de ésto. Buscaste <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> el término **capy&#8203;bara**?
+          Hmm… parece como que estamos teniendo un problema. Lo siendo, buscaste <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> el término  **capy&#8203;bara**?
       end:
         message: |-
           Gracias por quedarte conmigo @%{username}! Hice esto por tí, creo que te lo has ganado:
@@ -292,17 +305,19 @@ es:
           Todos cometemos errores. Pero no te preocupes, siempre podrás editar tus mensajes para solucionarlos!
           ¿Puedes empezar por **editar** el mensaje que acabo de crear en tu nombre?
         not_found: |-
-          Parece que aún no has editado el [mensaje](%{url}) que creé por tí. ¿Puedes intentar de nuevo?
-          Usa el <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16"> icono de lápiz para que aparezca el editor.
+          Parece que aún tienes que editar el [post](%{url}) que cree para ti. ¿Puedes intentar de nuevo?
+
+          Utiliza el icono <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16"> para que aparezca el editor.
         reply: |-
           ¡Buen trabajo!
           Tenga en cuenta que las ediciones realizadas después de 5 minutos aparecerán como revisiones de edición pública y aparecerá un pequeño ícono de lápiz en la parte superior derecha con el recuento de revisiones.
       delete:
         instructions: |-
-          Si deseas retirar una publicación que hayas realizado, puedes eliminarla.
-          Vamos a **borrar** cualquier post que hayas escrito usando la acción <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> para **borrar**. No vayas a querer borrar el primer post!
+          Si quieres retirar el post que hiciste, puedes borrarlo.
+
+          Vamos! **borra** cualquiera de los posts utilizando el icono <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> para **borrar**. ¡No vayas a borrar todo el tema!
         not_found: |-
-          ¿Todavía no veo ninguna publicación eliminada? Recuerda presionar <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> para mostrar el botón <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> y borrar.
+          ¡No veo que hayas borrado ningún post aún! Recuerda presionar <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> para ver más opciones y aparecerá el botón <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> para borrar.
         reply: |-
           Whoa! :boom:
 
@@ -310,17 +325,19 @@ es:
       recover:
         deleted_post_raw: 'Por qué @%{discobot_username} borró mi mensaje? :anguished:'
         instructions: |-
-          Oh no! Parece que accidentalmente borré un nuevo mensaje que tú acababas de crear.
-          ¿Puedes hacerme el favor y hacer clic en <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> para **recuperar** el mensaje borrado?
+          Oh no! Parece que accidentalmente borré un nuevo post que acababa de crear para ti.
+
+          ¿Puedes hacerme el favor y presionar el botón <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> para **recuperar** el post borrado?
         not_found: |-
-          ¿Teniendo problemas? Recuerda <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> muestra más, y aparecerá el botón <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> para recuperar.
+          ¿Tienes problemas? Recuerda presionar el botón <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> para mostrar más opciones y aparecerá el botón <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> para recuperar un mensaje borrado.
         reply: |-
           Phew, ¡eso estuvo cerca! Gracias por solucionarlo :wink:
 
           Tenga en cuenta que sólo tiene 24 horas para recuperar una publicación.
       category_hashtag:
         instructions: |-
-          ¿Sabía que puede hacer referencia a categorías y etiquetas en su publicación? Por ejemplo, has visto la %{category} categoría?
+          ¿Sabías que puedes hacer referencia a categorías y etiquetas en la publicación? Por ejemplo, has visto la categoría %{category}?
+
           Escribe `#` en el medio de una oración y selecciona cualquier categoría o etiqueta.
         not_found: |-
           Hmm, no veo una categoría en ninguna parte. Nota que `#` no puede ser el primer carácter de la oración. ¿Puedes copiar esto en tu próxima respuesta?
@@ -333,12 +350,15 @@ es:
       change_topic_notification_level:
         instructions: |-
           Cada tema tiene un nivel de notificación. Comienza en 'normal', lo que significa que normalmente sólo se notificará cuando alguien está hablando directamente con usted.
-          De forma predeterminada, el nivel de notificación de un mensaje privado se establece en el nivel más alto de "observación", lo que significa que se le notificará cada nueva respuesta. Pero puede sobrescribir el nivel de notificación de _cualquier_ tema a 'vigilar', 'seguir' o 'silenciar'.
-          Intentemos cambiar el nivel de notificación de este tema. Al final del tema, encontrarás un botón que muestra que estás **vigilando** este tema. ¿Puedes cambiar el nivel de notificación a **seguir**?
+
+          De forma predeterminada, el nivel de notificación de un mensaje privado se establece en el nivel más alto de 'observación', lo que significa que se le notificará cada nueva respuesta. Pero puede sobrescribir el nivel de notificación de _cualquier_ tema a 'vigilar', 'seguir' o 'silenciar'.
+
+          Intentemos cambiar el nivel de notificación de este tema. Al final de todo, encontrarás un botón que muestra que estás **vigilando** este tema. ¿Puedes cambiar el nivel de notificación a **seguir**?
         not_found: |-
           Parece que aún estás vigilando :eyes: este tema! Si tienes problemas para encontrar el botón del nivel de notificación, el mismo está debajo de todo el tema de debate.
         reply: |-
           ¡Impresionante trabajo! Espero que no silencies este tema ya que puedo ser un poco hablador a veces :grin:.
+
           Tenga en cuenta que cuando responde a un tema o lee un tema durante más de unos minutos, se establece automáticamente en un nivel de notificación de "seguimiento". Puedes cambiar esto en [tus preferencias de usuario](/my/preferences).
       poll:
         instructions: |-
@@ -366,7 +386,7 @@ es:
 
           - Cuando estás discutiendo puntos de trama de una película o programa de televisión que sería considerado un spoiler.
 
-          - Cuando su puesto necesita un montón de detalles opcionales que pueden ser abrumador cuando se lee todo a la vez.
+          - Cuando su post necesita un montón de detalles opcionales que pueden ser abrumador cuando se lee todo a la vez.
 
           [details=¡Clic aquí para ver cómo funciona!]
           1. Selecciona el botón de engranaje <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> en el editor.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
index 17cc8685954..b1d7fc801d7 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fa_IR.yml
@@ -10,27 +10,254 @@ fa_IR:
     discourse_narrative_bot_enabled: 'ربات سخنگوی دیسکورس را فعال کنید'
     disable_discourse_narrative_bot_welcome_post: "پیغام خوشامدگویی ربات دیسکورس را از کار بیاندازید"
     discourse_narrative_bot_ignored_usernames: "نام‌های کاربری که بایستی توسط ربات دیسکورس چشمپوشی شوند"
+    discourse_narrative_bot_disable_public_replies: "از کار انداختن پاسخ‌های خصوصی توسط ربات دیسکورس"
+    discourse_narrative_bot_welcome_post_type: "نوع نوشته ی خوش آمد گویی که ربات دیسکورس بایستی بفرستد"
+    discourse_narrative_bot_welcome_post_delay: "(n) ثانیه قبل از فرستادن نوشته ی خوش آمد گویی ربات دیسکورس صبر کن"
+  badges:
+    certified:
+      name: تایید شده
+      description: "راهنمای جدید کاربران ما را تکمیل کرده"
+      long_description: |
+        این مدال هنگامی که راهنمای جدید تعاملی کاربران با موفقیت تکمیل شده باشد اعطا می‌گردد. شما برای یادگیری ابزارهای اساسی بحث و گفتگو اقدام کردید و تایید شده اید!
+    licensed:
+      name: دارای مجوز
+      description: "راهنمای پیشرفته‌ی کاربری را به پایان رسانده است"
+      long_description: |
+        این مدال وقتی که راهنمای پیشرفته‌ کاربران با موفقیت به پایان رسیده باشد، اعطا می‌گردد. شما ابزارهای پیشرفته‌ی گفتگو را فرا گرفته اید و الان دارای مجوز کاملید!
   discourse_narrative_bot:
+    bio: "سلام. من یک فرد واقعی نیستم. من رباتی هستم که می‌توانم در رابطه با این تارنما به شما آموزش بدهم. برای اینکه با من تعامل داشته باشی، برایم پیام بفرست یا با استفاده از **`@%{discobot_username}`** به من اشاره بکن."
+    timeout:
+      message: |-
+        سلام @%{username}، خواستم احوالت را جویا بشم چون مدتی بود از تو نشنیدم.
+
+        برای ادامه‌ی کار، هر وقت خواستی به من پاسخ بده.
+
+        اگر میخواهی از این مرحله رد بشی، بگو `%{skip_trigger}`.
+
+        برای شروع کار، بگو `%{reset_trigger}`.
+
+        اگر هم مایل نیستی، هیچ مشکلی نیست. من یک ربات هستم. با این کار قلب منو نمیشکنی :sob:
+    dice:
+      invalid: |-
+        معذرت میخواهم. از لحاظ ریاضیات غیر ممکن است که این چنین ترکیب تاسی را رو کرد. :confounded:
+      not_enough_dice: |-
+        من فقط %{num_of_dice} تاس دارم. [شرم‌آور](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php) است. خودم میدونم.
+      out_of_range: |-
+        میدونستی که [بیشترین تعداد وجوه](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) یک تاسی که از لحاظ ریاضی عادلانه باشد، ۱۲۰ وجه است؟
+      results: |-
+        >  :game_die: %{results}
     quote:
+      trigger: "نقل قول"
+      '1':
+        quote: "در میان هر سختی، فرصتی نهفته است."
+        author: "آلبرت انیشتین"
+      '2':
+        quote: "شما باید همان تغییری باشید که می خواهید در دنیا احساس کنید."
+        author: "ماهاتما گاندی"
+      '3':
+        quote: "گریه نکن که آخر خط است، بخند که اتفاق افتاد."
+        author: "دکتر سس"
+      '4':
+        quote: "اگر میخواهی کاری به درستی انجام شود، خودت انجامش بده."
+        author: "چارلز-گیوم اتین"
+      '5':
+        quote: "اگر ایمان داشته باشی که میتوانی، نصف راه را رفته‌ای."
+        author: "تئودور روزولت"
+      '6':
+        quote: "زندگی مثل یک بسته شکلات است. هیچوقت نمیدانی که چه چیزی قرار است بگیری."
+        author: "مادر فارست گامپ"
+      '7':
+        quote: "این گامی کوچک برای یک انسان و جهشی بزرگ برای بشریت است."
+        author: "نیل آرمسترانگ"
+      '8':
+        quote: "هر روز یک کاری انجام بده که تو را می‌ترساند."
+        author: "النور روزولت"
       '9':
+        quote: "اشتباهات همیشه قابل بخشش هستند، اگر انسان قادر باشد که به آنها اقرار کند."
         author: "بروس لی"
+      '10':
+        quote: "هر چیزی که ذهن انسان تصور کند و به ان اعتقاد داشته باشد، قابل دستیابی است."
+        author: "ناپلئون هیل"
       results: |-
         > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
       answers:
+        '1': "این قطعی است"
+        '2': "قطعا اینگونه است"
         '3': "بدون شک"
         '4': "قطعا بله"
         '5': "میتوانی رویش حساب کنی"
+        '6': "آنطور که من میبینم، بله"
         '7': "به احتمال زیاد"
+        '8': "چشم انداز خوب"
         '9': "بله"
+        '10': "نشانه ها حاکی از تایید است"
+        '11': "پاسخ مبهم، دوباره تلاش کن"
         '12': "بعدا بپرسید"
         '13': "بهتر است که الان به شما چیزی نگویم"
         '14': "الان نمیتوانم پیشبینی کنم"
+        '15': "تمرکز کن و دوباره بپرس"
         '16': "رویش حساب باز نکن"
         '17': "پاسخ من خیر است"
+        '18': "منابع بنده این موضوع را رد میکند"
+        '19': "چشم انداز خیلی خوب نیست"
+        '20': "بسیار مشکوک"
       result: |-
         > :crystal_ball: %{result}
     track_selector:
       reset_trigger: 'شروع'
+      skip_trigger: 'رد کردن'
+      help_trigger: 'نمایش کمک'
+      random_mention:
+        reply: |-
+          سلام! برای اینکه بفهمی من چکار میتوانم بکنم، بگو `@%{discobot_username} %{help_trigger} `.
+      do_not_understand:
+        first_response: |-
+          سلام، متشکرم از پاسخی که دادی!
+
+          اما متاسفانه، به عنوان رباتی که ضعیف برنامه ریزی شده، به خوبی متوجه آن نمی شوم. :frowning:
+        track_response: میتوانی دوباره امتحان کنی، یا اگر دوست داری که از این مرحله رد شوی، بگو `%{skip_trigger}`. در غیر اینصورت، برای اینکه از اول شروع کنی، بگو `%{reset_trigger}`.
+        second_response: |-
+          آه، ببخشید. هنوز نمیفهمم.  :anguished:
+
+          من فقط یک رباتم، اگر میخواهی فردی واقعی با شما صحبت کند، [صفحه‌ی ارتباط با ما](/about) را ببین.
+
+          در عین حال، سعی میکنم که جلو راهت سبز نشم.
     new_user_narrative:
       reset_trigger: "کاربر جدید"
+      cert_title: "با توجه به اتمام موفقیت آمیز راهنمای جدید کاربران"
+      hello:
+        title: ":robot: با درود!"
+        message: |-
+          با تشکر از عضویت شما در %{title}، خوش آمدید!
+
+          - من فقط یک رباتم، اما [مدیران صمیمی ما](/about) هم اگر به کمک احتیاج دارید اینجا هستند.
+
+          به خاطر مسائل امنیتی، ما موقتا کارهایی که کاربران جدید می‌توانند انجام بدهند را محدود کردیم. همچنانکه ما با شما بیشتر آشنا می‌شویم، قابلیت‌ها و [مدال‌های](/badges) جدیدی کسب میکنی.
+
+          ما همیشه به [رفتار متمدنانه‌ی اجتماعی](/guidelines) اعتقاد داریم.
+      onebox:
+        instructions: |-
+          در ادامه، میتوانی یکی از پیوند های زیر را با من به اشتراک بگذاری؟ اگر طوری پاسخ بدهی که پیوند **تنها و بدون پس و پیش در یک خط** باشد، به طور اتوماتیک باز می‌شود و خلاصه ای از محتوای آن اضافه می‌گردد.
+
+          برای کپی کردن پیوند، در موبایل انگشتت را روی لینک نگه دار، و یا با موس کلیک راست کن.
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          - https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          عالی! این کار برای اکثر پیوندها <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> صدق میکنه. به یاد داشته باش که لینک بایستی در یک خط به تنهایی و بدون پس و پیش قرار بگیرد.
+        not_found: |-
+          متاسفم، نمیتوانم پیوند را در پاسخ شما پیدا کنم.
+
+          میتونی یک بار دیگر لینکی که در ادامه می‌آید را در یک خط جداگانه در پاسخ بعدی ات قرار بدهی؟
+
+          - https://en.wikipedia.org/wiki/Exotic_Shorthair
+      images:
+        instructions: |-
+          این عکسی از اسب تک شاخ است:
+
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+
+          اگر پسندیدی (کیه که نپسنده!) برای اینکه من بدونم لطفا دکمه‌ی پسند :heart: زیر این نوشته را فشار بده.
+
+          میتونی با **یک عکس پاسخ بدهی؟** هر عکسی بذاری اشکالی نداره. میتونی عکس رو بکشی و رها کنی، یا از گزینه ی آپلود استفاده کنی، یا حتی کپی پیست کنی.
+        reply: |-
+          عجب عکس شگفت‌انگیزی! من دکمه‌ی پسند :heart: رو برای اینکه بفهمی چقدر قدردان آن هستم، فشار دادم.
+        like_not_found: |-
+          آیا یادت رفت که [نوشته](%{url}) من را بپسندی؟
+          :crying_cat_face:
+        not_found: |-
+          انگار که هیچ تصویری برای بارگذاری انتخاب نکردید. بنابراین من تصویری انتخاب کردم که _مطمئن هستم_ خوشت میاد.
+
+          `%{image_url}`
+
+          سعی کن که این یکی رو بارگذاری کنی. یا پیوندش را در یک خط تنها قرار بدهی.
+      formatting:
+        instructions: |-
+          آیا میتوانی تعدادی کلمه را در پاسخت **ضخیم** یا _ایتالیک_ بکنی؟
+
+          - بنویس `**ضخیم**` یا `_ایتالیک_`
+
+          - یا، کلید‌های <kbd><b>B</b></kbd> یا <kbd><i>I</i></kbd> را در ویرایشگر فشار بده
+        reply: |-
+          کارت عالی بود! برای قالببندی متن، از اچ‌تی‌ام‌ال و بی‌بی‌کد هم میتوانی استفاده بکنی. برای اطلاعات بیشتر، [این راهنما را بخوان](http://commonmark.org/help).
+        not_found: |-
+          اوه، من هیچ قالب‌بندی در پاسخ شما پیدا نکردم.  :pencil2:
+
+          میتوانی دوباره امتحان کنی؟ اگر گیر کردی، از کلیدهای <kbd><b>B</b></kbd> ضخیم یا <kbd><i>I</i></kbd> ایتالیک در ویرایشگر استفاده کن.
+      quoting:
+        instructions: |-
+          آیا میتوانی در پاسخت از من نقل قول کنی، تا من دقیقتر بفهمم به کدام قسمت پاسخ میدهی؟
+
+          > اگر این قهوه است، لطفا برایم چای بیار. اما اگر این چای است، لطفا برایم قهوه بیار.
+          >
+          > یکی از فواید صحبت کردن با خود این است که میدونی حداقل کسی داره گوش میده
+          >
+          > بعضی ها مهارت خاصی در استفاده از کلمات دارند، و برخی دیگر ... هیچ مهارتی ندارند.
+
+          متن هر &uarr; نقل قولی که دوست داری را انتخاب کن و سپس کلید **نقل‌قول** که روی متن ظاهر می‌شود - یا دکمه‌ی **پاسخ** زیر نوشته،  را فشار بده.
+
+          پایین نقل قول، یکی دو کلمه در رابطه با اینکه چرا آن نقل‌قول را انتخاب کردی بگو. چون من کنجکاو هستم :thinking:
+        reply: |-
+          کارت خوب بود. تو نقل قول مورد علاقه‌ی من را برداشتی! :left_speech_bubble:
+        not_found: |-
+          همم ظاهرا در پاسخت از من نقل قول نکردی؟
+
+          هر متنی را که در نوشته‌ی من انتخاب کنی، کلید <kbd>**نقل‌قول**</kbd>را برایت نشان می‌دهد. همچنین انتخاب کلید **پاسخ** بعد از انتخاب متن هم همان کار را می‌کند. می‌توانی یکبار دیگر امتحان کنی؟
+      bookmark:
+        instructions: |-
+          اگر می‌خواهی بیشتر یاد بگیری، در زیر <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> و <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16">** نشانه‌گذاری این پیام خصوصی** را انتخاب کن. اگر این کار را بکنی، ممکن است هدیه‌ای :gift: در آینده‌ برای شما باشد.
+        reply: |-
+          عالی! الان تو میتوانی راه برگشت به این پیغام خصوصی را هر زمان که دوست داشتی از [برگه‌ی نشانک‌ها در پروفایل کاربری](%{profile_page_url}/activity/bookmarks)  پیدا کنی. فقط کافی است که روی عکس پروفایل خود در بالا سمت چپ انتخاب کنی &#8599;
+        not_found: |-
+          اوه، هیچ نشانکی در این موضوع نمیبینم. آیا آیکون نشانک را زیر هر نوشته پیدا کردی؟ در صورت لز.م از آیکون "بیشتر نشان بده" <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> برای آشکار کردن دیگر قابلیت ها استفاده کن.
+      emoji:
+        instructions: |-
+          شاید دیده باشی که من از عکس‌های کوچکی مثل :blue_car::dash: در پاسخ‌هایم استفاده می‌کنم. اینها [شکلک](https://en.wikipedia.org/wiki/Emoji) نام دارند. آیا می‌توانی که یک شکلک را به پاسخت اضافه کنی؟ هر یک از موارد زیر این کار را میتواند انجام بدهد:
+
+          - بنویس  `:) ;) :D :P :O`
+
+          - علامت دونقطه <kbd>:</kbd> را بنویس و سپس اسم شکلک را کامل کن `:tada:`
+
+          - کلیک شکلک <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> را در ویرایشگر، یا در صفحه‌کلید موبایلت فشار بده
+        reply: |-
+          :sparkles: خیلی شکلک شگفت انگیزی بود :sparkles:
+        not_found: |-
+          اوپس، هیچ شکلکی در پاسخت نمیبینم؟ ای وای! :sob:
+
+          سعی کن علامت دونقطه <kbd>:</kbd> رو تایپ کنی تا صفحه‌ی انتخاب شکلک رو باز کنی، سپس اولین حروف چیزی که میخوای را تایپ کن. مانند `:bird:`
+
+          یا کلید شکلک <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> را در ویرایشگر انتخاب کن.
+
+          (اگر با موبایلت می‌نویسی، میتوانی شکلک را مستقیما از طریق صفحه کلید خود موبایل انتخاب بکنی.)
+      mention:
+        instructions: |-
+          شاید گاهی اوقات بخواهی که توجه شخصی را، اگرچه در حال پاسخ دادن به ایشان نیستی، جلب کنی. بنویس `@` و سپس نام کاربری ایشان را کامل کن که به ایشان اشاره کنی.
+
+          میتوانی به **`@%{discobot_username}`** در پاسخت اشاره کنی؟
+        reply: |-
+          _کسی منو صدا زد!؟_ :raised_hand: فکر کنم شما بودی! :wave: خوب، من اینجا هستم! متشکرم که به من اشاره کردی.  :ok_hand:
+        not_found: |-
+          من اسم خودم را هیچ جا پیدا نکردم. :frowning: آیا میتوانی دوباره تلاش کنی که به اسم من  `@%{discobot_username}` اشاره کنی؟
+      flag:
+        instructions: |-
+          ما دوست داریم که گفتگوها دوستانه باشد و به کمک شما برای [متمدنانه نگه داشتن تالار](%{guidelines_url})  احتیاج داریم. اگر مشکلی مشاهده کردی، آن را پرچم گذاری کن که به صورت نامحسوس نویسنده یا [کارکنان ما](%{about_url}) را در جریان موضوع قرار بدهی.
+
+          > :imp: من چیز زشتی اینجا نوشتم
+
+          فکر کنم بدانی که چه کار بایستی بکنید. بفرمایید این نوشته را به عنوان نامناسب **پرچم گذاری** کنید!
+        reply: |-
+          [کارکنان ما](/groups/staff) به طور خصوصی از پرچم گذاری شما آگاه می‌شوند. اگر اعضای تالار به تعداد کافی یک نوشته را پرچم گذاری کنند، آن نوشته به عنوان پیشگیری خود به خود پنهان می‌شود. (به خاطر اینکه من در حقیقت چیز زشتی ننوشتم :angel: خودم پرچم گذاری شما را فعلا پاک کردم.)
+        not_found: |-
+          اوه نه، نوشته‌ی زشت من هنوز پرچم گذاری نشده. :worried: آیا میتوانی با استفاده از آیکون **پرچم** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> این نوشته را به عنوان نامناسب گزارش کنی؟ فراموش نکن که برای آشکارسازی قابلیت‌های بیشتر می‌توانی کلید "بیشتر نشان بده" <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> را برای هر نوشته انتخاب کنی.
+      certificate:
+        alt: 'گواهی موفقیت'
+    advanced_user_narrative:
+      reset_trigger: 'کاربر حرفه‌ای'
+      title: ':arrow_up: ویژگی‌های کاربر حرفه‌ای'
+      edit:
+        bot_created_post_raw: "@%{discobot_username} تاکنون باحال ترین رباتی بوده که من شناختم :wink:"
+      category_hashtag:
+        reply: |-
+          عالی! به یاد داشته باش که این مورد برای دسته_و_برچسب، اگر برچسب ها فعال باشند، کار می‌کند.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index ac35ac325df..9663f270806 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -162,7 +162,7 @@ fi:
           - https://en.wikipedia.org/wiki/Death_by_coconut
           - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
-          Siistiä! Suurin osa <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> linkeistä käyttäytyy samoin. Muista, että sen tulee olla yksin omalla rivillään; mitään ei saa olla rivillä ennen sitä tai sen jälkeen.
+          Siistiä! Suurin osa <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> linkeistä käyttäytyy samoin. Muista, että sen tulee olla _yksin omalla rivillään_; mitään ei saa olla rivillä ennen sitä tai sen jälkeen.
         not_found: |-
           Voi ei, en löytänyt linkkiä vastauksestasi! :cry:
 
@@ -173,7 +173,7 @@ fi:
         instructions: |-
           Tämä on kuva yksisarvisesta:
 
-          <img src="%{base_uri}/images/unicorn.jpg" width="520" height="381">
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
 
           Jos pidät siitä (kukapa ei pitäisi!), kerro siitä minulle painamalla tykkää-nappia :heart: tämän viestin alla.
 
@@ -235,7 +235,7 @@ fi:
 
           - Laita kaksoispiste <kbd>:</kbd> ja sen perään emojin nimi `:tada:`
 
-          - Paina editorin tai mobiililaitteesi näppäimistön emoji-kuvaketta <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16">.
+          - Paina editorin tai mobiililaitteesi näppäimistön emoji-kuvaketta <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16">
         reply: |-
           :sparkles: _Emojinomaista!_ :sparkles:
         not_found: |-
@@ -400,7 +400,7 @@ fi:
 
           - Viestissäsi on suuria määriä yksityiskohtaista tietoa, joka ei ole kaikille olennaista ja joka voisi uuvuttaa tai häiritä lukijaa.
 
-          [details=Select this to see how it works!]
+          [details=Napauta niin näet kuinka se toimii!]
           1. Valitse editorin <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> hammasrataskuvake.
           2. Valitse "Piilota yksityiskohdat".
           3. Muokkaa Yhteenveto-tekstiä, jonka taakse tiedot piilotetaan, ja lisää sisältö.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fr.yml b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
index 679d432c301..cd14257d7b3 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fr.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fr.yml
@@ -26,16 +26,29 @@ fr:
         Ce badge est décerné quand vous avez terminé avec succès le tutoriel interactif des utilisateurs avancés. Vous avez pris l'initiative d'apprendre les outils avancés de la discussion et vous êtes maintenant certifié à 100% !
   discourse_narrative_bot:
     bio: "Bonjour, je ne suis pas une personne réelle. Je suis un robot pour vous faire découvrir ce site. Pour interagir avec moi, envoyez-moi un message ou mentionnez **`@%{discobot_username}`** n'importe où."
+    timeout:
+      message: |-
+        Hey @%{username}, je viens voir si tout va bien car je n'ai pas eu de vos nouvelles depuis un moment.
+
+        - Pour continuer, répondez-moi à n'importe quel moment.
+
+        - Si vous voulez passer cette étape, dites `%{skip_trigger}`.
+
+        - Pour recommencer, dites ``%{reset_trigger}`.
+
+        Si vous préférez ne rien faire, c'est aussi acceptable. Je suis un robot. Vous ne me blesserez pas. :sob:
     dice:
       trigger: "Jet"
       invalid: |-
         Je suis désolé, c'est mathématiquement impossible d'obtenir cette combinaison de dés. :confounded:
       not_enough_dice: |-
         Je n'ai qu'un dé. [Shameful](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), Je sais!
+      out_of_range: |-
+        Saviez-vous que [le nombre maximal de face](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) pour un dé non truqué est de 120?
       results: |-
         > :game_die: %{results}
     quote:
-      trigger: "Citation"
+      trigger: "citation"
       '1':
         quote: "La difficulté est porteuse d'occasions"
         author: "Albert Einstein"
@@ -49,6 +62,7 @@ fr:
         quote: "On n'est jamais si bien servi que par soi-même."
         author: "Charles-Guillaume Étienne"
       '5':
+        quote: "Croyez en vous et vous avez fait la moitié du chemin."
         author: "Theodore Roosevelt"
       '6':
         quote: "La vie est comme une boîte de chocolats. On ne sait jamais sur quoi on va tomber."
@@ -60,31 +74,42 @@ fr:
         quote: "Fais une chose qui t'effraie chaque jour."
         author: "Eleanor Roosevelt"
       '9':
+        quote: "Les erreurs sont toujours pardonnables, si l'on a le courage de les admettre."
         author: "Bruce Lee"
       '10':
+        quote: "Tout ce que l'esprit de l'homme peut concevoir et croire peut être atteind."
         author: "Napoleon Hill"
       results: |-
         > :left_speech_bubble: %{quote} __ &mdash;  %{author}
     magic_8_ball:
+      trigger: 'fortune'
       answers:
         '1': "C'est certain"
+        '2': "C'est décidé"
         '3': "Sans aucun doute"
         '4': "Définitivement oui"
         '5': "Vous pouvez compter dessus"
         '6': "Comme je le vois, oui"
         '7': "Probablement"
+        '8': "De bonnes perspectives"
         '9': "Oui"
         '10': "Les signent tendent vers le oui"
+        '11': "Réponse incertaine essayez de nouveau"
         '12': "Demander à nouveau plus tard"
         '13': "Il vaut mieux ne pas vous le dire maintenant"
         '14': "Impossible à prédire pour le moment"
+        '15': "Concentrez-vous et demandez à nouveau"
         '16': "Ne comptez pas dessus"
         '17': "Ma réponse est non"
         '18': "Mes sources disent non"
+        '19': "Les perspectives ne sont pas si bonnes"
         '20': "Très douteux"
       result: |-
         > :crystal_ball: %{result}
     track_selector:
+      reset_trigger: 'démarrer'
+      skip_trigger: 'passer'
+      help_trigger: 'afficher l''aide'
       random_mention:
         reply: |-
           Bonjour ! Pour voir ce que je peux faire, dites `@%{discobot_username} `.
@@ -93,9 +118,134 @@ fr:
 
           `@%{discobot_username}%{reset_trigger}%{default_track} `
           > Démarre l'un des récits interactifs suivants: %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _Les accolades peuvent faire beaucoup de bien... surtout pour les enfants._ &mdash; Princess Diana
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Vous pouvez compter dessus
+      do_not_understand:
+        first_response: |-
+          Hey, merci pour la réponse !
+
+          Malheureusement, je ne suis qu'un robot mal programmé, et je ne comprends pas celle-ci. :frowning:
+        track_response: Vous pouvez essayer de nouveau, ou si vous préférez passer cette étape, dites `%{skip_trigger}`. Sinon, pour redémarrer, dites `%{reset_trigger}`.
+        second_response: |-
+          Vraiment désolé. Je ne comprend toujours pas .:anguished:
+
+          Je suis juste un robot, mais si vous souhaitez contacter une personne réelle, consultez [notre page de contact](/ about).
+
+          Pendant ce temps là, je serais silencieux.
     new_user_narrative:
+      reset_trigger: "nouvel utilisateur"
+      cert_title: "En reconnaissance de l'accomplissement avec succès du tutoriel nouvel utilisateur"
       hello:
         title: ":robot: Bienvenue !"
+        message: |-
+          Merci de vous être inscrit à %{title}, et bienvenue !
+
+          - Je ne suis qu'un robot, mais [notre équipe](/about) est également disponible si vous avez besoin de contacter quelqu'un.
+
+          - Pour des raisons de sécurité, nous avons temporairement limité ce que les nouveaux utilisateurs peuvent faire. Vous obtiendrez de nouvelles possibilités (et des [badges](/badges)) au fur et à mesure que nous vous connaitrons.
+
+          - Nous croyons en [un comportement communautaire civilisé](/guidelines) de tout temps.
+      onebox:
+        instructions: |-
+          Maintenant, pouvez-vous partager l'un de ces liens avec moi ? Répondez avec **un lien sur une ligne vide**, et il sera automatiquement transformé pour inclure un astucieux résumé.
+
+          Pour copier un lien, tapez et maintenant appuyé sur mobile, ou utilisez le clic droit de votre souris:
+
+          - https://fr.wikipedia.org/wiki/Jeu_de_mots
+          - https://fr.wikipedia.org/wiki/Liste_de_morts_insolites
+          - https://fr.wikipedia.org/wiki/Orthographe_pour_calculatrice
+        reply: |-
+          Super ! Ça fonctionne pour la plupart <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> des liens. N'oubliez pas, ils doivent être sur une ligne _vide_, sans rien devant, ni derrière.
+        not_found: |-
+          Désolé, je ne trouve pas de lien dans votre réponse ! :cry:
+
+          Pouvez-vous essayer de rajouter le lien suivant, sur sa propre ligne, dans votre prochaine réponse ?
+
+          - https://fr.wikipedia.org/wiki/Exotic_shorthair
+      images:
+        instructions: |-
+          Voici une photo de licorne :
+
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+
+          Si vous l'aimez (et qui n'aime pas les licornes ?) appuyez sur le bouton _J'aime_ :heart: sous ce message pour me le faire savoir.
+
+          Pouvez-vous **répondre avec une image ?** N'importe laquelle fera l'affaire ! Glissez et déposer, appuyez sur le bouton d'upload, ou copiez juste son lien.
+        reply: |-
+          Sympa la photo ! – J'ai appuyé sur le bouton :heart: J'aime pour que vous sachiez au combien je l'apprécie. :heart_eyes:
+        like_not_found: |-
+          Avez-vous oublié d'aimer :heart: mon [message ?](%{url}) :crying_cat_face:
+        not_found: |-
+          Il semblerait que vous n'avez pas uploadé d'image, du coup, j'en ai choisi une qui vous fera _certainement_ plaisir.
+
+          `%{image_url}`
+
+          Essayez d'uploader la suivante, ou coller le lien sur une nouvelle ligne vide !
+      formatting:
+        instructions: |-
+          Pouvez-vous faire quelques mots en **gras** ou en _italique_ dans votre réponse ?
+
+          - Tapez `**gras**` ou `_italique_`
+
+          - Ou, appuyez sur le bouton<kbd><b>G</b></kbd> ou <kbd><i>I</i></kbd> dans l'éditeur
+        reply: |-
+          Bon travail ! Le HTML et le BBCode fonctionnent aussi pour le formatage – pour en savoir plus, [essayez ce tutoriel](http://commonmark.org/help) :nerd:
+        not_found: |-
+          Aww, je n'ai pas trouvé de mise en page dans votre réponse. :pencil2:
+
+          Pouvez-vous essayer de nouveau ? Utilisez le bouton <kbd><b>G</b></kbd> gras ou <kbd><i>I</i></kbd> italique dans l'éditeur si vous êtes coincé.
+      quoting:
+        instructions: |-
+          Pouvez-vous essayer de me citer quand vous me répondez ? De cette manière je sais exactement à quelle partie vous répondez.
+
+          > Si c'est du café, merci de m'apporter un peu de thé; mais si c'est du thé, merci de m'apporter du café.
+          >
+          > Un avantage à se parler à soi-même, c'est d'être sûr que quelqu'un écoute.
+          >
+          > Certaines personnes ont un chemin avec des mots, et d'autres personnes ... oh, euh, pas de chemin.
+
+          Sélectionnez le texte de votre &uarr; citation préférée, et appuyez sur bouton **Citer** qui apparait sur votre sélection - ou le bouton **Répondre** sous ce message.
+
+          Sous cette citation, ajoutez un ou deux mots pour expliquer votre choix, je suis curieux ! :thinking:
+        reply: |-
+          Bon travail, vous avez choisi ma citation préférée ! :left_speech_bubble:
+        not_found: |-
+          Hmm je n'ai pas l'impression que vous m'ayez cité dans votre réponse ?
+
+          Sectionner n'importe quel texte dans mon message fera apparaitre le bouton <kbd>**Citer**</kbd>. Et appuyer sur "Répondre" avec du texte sélectionné fonctionnera également ! Pouvez-vous essayer de nouveau ?
+      bookmark:
+        instructions: |-
+          Si vous souhaitez en savoir plus, sélectionnez <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> en dessous et <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> ** marquez ce message privé**. Si vous le faites, il pourrait y avoir un :gift: dans le futur !
+        reply: |-
+          Excellent ! Maintenant, vous pouvez facilement retrouver notre conversation privée à tout moment, à partir de [l'onglet marque page sur votre profil](%{profile_page_url}/activity/bookmarks). Sélectionnez juste votre photo de profil dans le coin en haut à droite &#8599;
+        not_found: |-
+          Uh oh, je ne vois aucun marque page sur ce sujet ! Avez-vous trouvé le marque page sous chaque message ? Utilisez le bouton Afficher plus <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> pour dévoiler d'autres actions si nécessaire.
+      emoji:
+        instructions: |-
+          Vous pouvez avoir remarqué que j'utilise des petites images dans mes réponses :blue_car::dash: Elles sont appelées [emoji](https://fr.wikipedia.org/wiki/Emoji). Pouvez-vous **ajouter un emoji** à votre réponse ? N'importe lequel sera bien:
+
+          - Tapez  `:) ;) :D :P :O`
+
+          - Tapez <kbd>:</kbd> puis complétez le nom de l'emoji  `:tada:`
+
+          - Appuyez sur le bouton emoji <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16">~dans l'éditeur, ou sur le clavier de votre mobile.
+        reply: |-
+          C'est :sparkles: _emojitastic !_ :sparkles:
+        not_found: |-
+          Oops, Je ne vois pas aucun emoji dans votre réponse ? Oh non ! :sob:
+
+          Essayez de taper <kbd>:</kbd> pour faire apparaitre la selection d'emoji, puis appuyer sur les premières lettres de ce que vous voulez, comme par exemple `:bird:`
+
+          Ou, appuyez sur le bouton emoji <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> dans l'éditeur.
+
+          (Si vous êtes sur un périphérique mobile, vous pouvez aussi entrer l'émoji directement depuis votre clavier.)
       mention:
         instructions: |-
           Parfois vous avez peut-être envie d'attirer l'attention, même si vous ne lui répondez pas directement. Tapez  `@` et complétez son pseudo pour le mentionner.
@@ -103,10 +253,179 @@ fr:
           Pouvez vous mentionner **`@%{discobot_username}`** dans votre réponse?
         reply: |-
           _Quelqu'un a dit mon nom ?_ :raised_hand: Je pense que vous l'avez fait ! :wave: Bien, je suis là ! Merci de m'avoir mentionné. :ok_hand:
+        not_found: |-
+          Je ne vois pas mon nom ici ni nulle part. :frowning: Pouvez-vous essayer de me mentionner comme ceci `@%{discobot_username}` une nouvelle fois ?
+
+          (Et oui, mon nom d'utilisateur est écrit «_disco_», comme dans la folie des années 1970. J'adore [la vie nocturne!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          Nous aimons nos discussions amicales, et nous avons besoin de votre aide pour [garder les lieux civilisés](%{guidelines_url}). Si vous voyez un problème, signalez-le s'il vous plait de façon privée à l'auteur, ou à notre [équipe](%{about_url}).
+
+          > :imp: J'ai écris quelque chose de très méchant ici
+
+          Je devine que vous savez ce que vous avez à faire. **Signalez ce message** comme inapproprié !
+        reply: |-
+          [Notre équipe](/groups/staff) sera notifié de façon privée de votre signalement. Si assez de membres de la communauté signalent un message, il sera automatiquement masqué par précaution.
+          (Puisque je n'ai pas réellement écrit un article méchant :ange: j'ai anticipé et j'ai enlevé le signalement pour le moment.)
+        not_found: |-
+          Oh non, mon méchant message n'a pas encore été signalé. :worried: Pouvez-vous le signaler comme inapproprié en utilisant le **drapeau** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? N'oubliez pas d'utiliser le bouton Afficher plus<img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> pour afficher plus d'actions pour chaque message.
+      search:
+        instructions: |-
+          _psst_ … J'ai caché une surprise dans ce sujet. Si vous aimez les challenges, sélectionnez **l’icône de recherche** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> en haut à droite &#8599; pour la trouver.
+
+          Essayer de chercher le terme "capy​bara" dans ce sujet.
+        hidden_message: |-
+          Comment avez-vous pu rater le capy​bara ? :wink:
+
+          <img src="%{base_uri}/images/capybara-eating.gif"/>
+
+          Avez-vous remarqué que nous sommes maintenant revenu au début ? Nourrissez ce pauvre capybara en **répondant avec l'emoji `:herb:`** et vous serez automatiquement amené à la fin.
+        reply: |-
+          Vous l'avez trouvé :tada:
+
+          - Pour des recherches plus complexes, allez sur la [page de recherche complète](%{search_url}).
+
+          - Pour naviguer n'importe où dans une longue discussion, essayez la timeline du sujet sur la droite (et en bas sur mobile).
+
+          - Si vous avez un clavier physique :keyboard:, appuyez sur <kbd>?</kbd> pour voir nos raccourcis clavier pratiques.
+        not_found: |-
+          Hmm... Il semblerait que vous ayez des difficultés. J'en suis désolé. Avez-vous cherché <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> le mot **capy&#8203;bara**?
+      end:
+        message: |-
+          Merci d'être resté avec moi @%{username}! J'ai fait ça pour vous, je pense que vous l'avez mérité :
+
+          %{certificate}
+
+          C'est tout pour le moment ! Regardez  [**nos dernières discussions**](/latest) ou [**les catégories de discussion**](/categories). :sunglasses:
+
+          (Si vous souhaitez parler avec moi encore une fois pour en apprendre plus, envoyez moi un message ou mentionnez `@%{discobot_username}` n'importe quand !)
+      certificate:
+        alt: 'Certificat d''accomplissement'
     advanced_user_narrative:
+      reset_trigger: 'utilisateur avancé'
+      cert_title: "En reconnaissance de l'accomplissement avec succès du tutoriel utilisateur avancé "
+      title: ':arrow_up: Fonctionnalités utilisateur avancé'
+      start_message: |-
+        En tant qu'utilisateur _averti_, avez-vous déjà visité la page [mes préférences](/my/preferences) @%{username}? Il y a beaucoup de possibilité pour personnaliser votre expérience, comme en sélectionnant un thème clair ou foncé.
+
+        Mais je divague, commençons !
       edit:
         bot_created_post_raw: "@%{discobot_username} est, de loin, le robot le plus cool que je connaisse :wink:"
         instructions: |-
           Tout le monde fait des erreurs. Mais ne vous inquiétez pas, vous pouvez toujours éditer vos messages pour les réparer.
 
           Pouvez-vous commencer par **éditer** le message que je viens de créer en votre nom?
+        not_found: |-
+          Il semble que vous n'avez pas encore éditer le [message](%{url}) que j'ai créé pour vous. Pouvez-vous essayer de nouveau ?
+
+          Utilisez l’icône <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16">pour afficher l'éditeur.
+        reply: |-
+          Bon boulot !
+
+          Remarquez que les éditions après 5 minutes seront considérés comme des modifications publiques, et qu'un petit crayon apparaitra dans le coin haut droit avec le nombre de modification.
+      delete:
+        instructions: |-
+          Si vous souhaitez effacer un message que vous avez écrit, vous pouvez le supprimer.
+
+          Allons-y et **supprimez** un de vos messages précédents en utilisant la <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> **suppression**. Attention à ne pas supprimer le premier message !
+        not_found: |-
+          Je ne vois toujours aucun message supprimé ! Rappelez-vous, <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> afficher plus révélera <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16">supprimer.
+        reply: |-
+          Whoa ! :boom:
+
+          Pour préserver la continuité des discussions, les suppressions ne sont pas immédiates, et le message ne sera supprimé qu'après quelques temps.
+      recover:
+        deleted_post_raw: 'Pourquoi @%{discobot_username} a supprimé mon message ? :anguished:'
+        instructions: |-
+          Oh non ! J'ai l'impression que j'ai accidentellement supprimé un nouveau message que je venais de créer pour vous.
+
+          Pouvez-vous me faire une faveur et <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> le **restaurer** ?
+        not_found: |-
+          Des soucis ? Rappelez-vous: <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> Afficher plus révélera <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> restaurer.
+        reply: |-
+          Pfiou, c'était moins une ! Merci d'avoir réparé ça ! :wink:
+
+          Notez que vous n'avez que 24 heures pour restaurer un message supprimé.
+      category_hashtag:
+        instructions: |-
+          Saviez-vous que vous pouviez faire référence aux catégories et tags dans vos messages ? Par exemple avez-vous vu la catégorie %{category}?
+
+          Tapez `#` au milieu d'une phrase et sélectionnez n'importe quelle catégorie ou tag.
+        not_found: |-
+          Hmm, je ne vois pas de catégorie nulle part. Notez que `#` ne peut pas être le premier caractère. Pouvez-vous copier ceci dans votre prochaine réponse ?
+
+          ```text
+          Je peux créer un lien de catégorie via #
+          ```
+        reply: |-
+          Excellent ! Retenez que ceci fonctionne pour les catégories _et_ les tags, si les tags sont activés.
+      change_topic_notification_level:
+        instructions: |-
+          Chaque sujet a un niveau de notification. Il démarre comme 'normal', c'est à dire que vous ne serez notifié que quand quelqu'un vous parle directement.
+
+          Par défaut, le niveau de notification pour un message privé est configuré au plus haut niveau de 'surveillance', c'est à dire que vous serez notifié et chaque nouvelle réponse. Mais vous pouvez changer le niveau de notification pour _n'importe quel_ sujet en 'Surveiller', 'Suivi', ou 'Silencieux'.
+
+          Essayons de changer le niveau de notification pour ce sujet. En bas de ce sujet, vous trouverez un bouton qui vous indique que vous **Surveillez** ce sujet. Pouvez-vous changer le niveau de notification pour **Suivi**' ?
+        not_found: |-
+          Il semble que vous êtes encore en train de Surveillez :eyes: ce sujet ! Si vous avez des difficultés à le trouver, le bouton du niveau de notification est situé sous le sujet.
+        reply: |-
+          Super boulot ! J’espère que vous n'avez pas mis ce sujet en silencieux car il m'arrive parfois d'être un peu bavard :grin:
+
+          Remarquez que quand vous répondez à un sujet, ou lisez un sujet pendant plusieurs minutes, le niveau de notification est automatiquement mis sur 'Suivi'. Vous pouvez changer cela dans [vos préférences utilisateur](/my/preferences).
+      poll:
+        instructions: |-
+          Savez-vous que vous pouvez ajouter un sondage sur n'importe quel message ? Essayez en utilisant la <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> roue dans l'éditeur pour **créer un sondage**.
+        not_found: |-
+          Whooops ! Il n'y a pas de sondage dans votre réponse.
+
+          Utilisez la <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> roue dans l'éditeur, ou copiez et coller ce sondage dans votre prochaine réponse :
+
+          ```text
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
+        reply: |-
+          Hey, bon sondage ! Comment s'est passé votre formation ?
+
+          [poll]
+          :+1:
+          :-1:
+          [/poll]
+      details:
+        instructions: |-
+          Parfois vous souhaitez **masquer des détails** dans vos réponses :
+
+          - Quand vous discutez d'un film ou d'une série TV et que vous pourriez spoiler la communauté.
+
+          - Quand votre message a besoin de beaucoup de détails qui peuvent rendre le sujet illisible
+
+          [details=Sélectionnez ceci pour voir comment cela fonctionne !]
+          1. Sélectionnez la roue <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> dans l'éditeur.
+          2. Sélectionnez "Cacher le texte".
+          3. Éditez le résumé et ajoutez votre contenu.
+          [/details]
+
+          Pouvez-vous utiliser la roue <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16">dans l'éditeur pour ajouter une section de détails dans votre prochaine réponse ?
+        not_found: |-
+          Des soucis pour créer le widget de détail ? Essayez d'inclure le texte suivant dans votre prochaine réponse :
+
+          ```text
+          [details=Sélectionnez moi pour des détails]
+          Sont ici les détails
+          [/details]
+          ```
+        reply: |-
+          Bau travail  — votre attention aux _détails_ est admirable !
+      end:
+        message: |-
+          Vous avez suivis ce tutoriel comme un _utiliser avancé_ :bow:
+
+          %{certificate}
+
+          C'est tout ce que j'ai pour vous.
+
+          Au revoir ! Si vous voulez me reparler, envoyez moi un message à tout moment :sunglasses:
+      certificate:
+        alt: 'Certificat de réussite de l''utilisateur avancé'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.he.yml b/plugins/discourse-narrative-bot/config/locales/server.he.yml
index 3c72d0d3f85..c83fab81501 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.he.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.he.yml
@@ -15,10 +15,36 @@ he:
     discourse_narrative_bot_welcome_post_delay: "המתנה של (n) שניות לפני שליחת פוסט ברוכים הבאים של בוט הסיפורים של דיסקורס."
   badges:
     certified:
+      name: מוסמך
       description: "סיימו את הדרכת המשתמשים החדשים שלנו"
+      long_description: |
+        עיטור זה מוענק עם סיומו המוצלח של המדריך האינטראקטיבי למשתמש החדש. נקטתם יוזמה ללמוד כלים בסיסיים של דיון, וכעת אתם מוסמכים!
+    licensed:
+      name: מורשה
+      description: "השלימו את מדריך המשתמשים המתקדם שלנו"
+      long_description: |
+        עיטור זה ניתן בעבור השלמה של מדריך המשתמשים המתקדמים האינטראקטיבי. אתם שולטים בכלי דיון מתקדמים - וכעת יש לכם רשיון!
   discourse_narrative_bot:
+    bio: "הי, אני לא בן אדם אמיתי. אני בוט שיכול ללמד אתכם על האתר הזה. כדי לתקשר איתי, שילחו אלי הודעה או איזכור **`@%{discobot_username}`** בכל מקום שהוא."
+    timeout:
+      message: |-
+        הי %{username}, רק בודק כי לא שמעתי מכם מזה זמן.
+
+        - כדי להמשיך, ענו לי בכל זמן.
+
+        - אם תרצו לדלג על שלב זה, אימרו `%{skip_trigger}`.
+
+        - כדי להתחיל מחדש, אימרו `%{reset_trigger}`.
+
+        אם תעדיפו שלא, זה לגמרי בסדר. אני רובוט. לא תפגעו ברגשות שלי. :sob:
     dice:
       trigger: "גלגול"
+      invalid: |-
+        אני מצטער, אך זה מתמטית בלתי אפשרי לגלגל שילוב זה של קוביות. :confounded:
+      not_enough_dice: |-
+        יש לי רק %{num_of_dice} קוביות. [Shameful](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), I know!
+      out_of_range: |-
+        ידעתם ש[המספר המקסימלי של צדדים](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) לקוביה הוגנת מתמטית הוא 120?
       results: |-
         > :game_die: %{results}
     quote:
@@ -34,6 +60,7 @@ he:
         author: "ד״ר סוס"
       '4':
         quote: "אם אתם רוצים שמשהו יתבצע כמו שצריך, עשו זאת בעצמכם."
+        author: "צ׳ארלס-גילאום אטין"
       '5':
         quote: "האמינו שאתם יכולים ואתם מחצית הדרך לשם."
         author: "תאודור רוזוולט"
@@ -58,13 +85,16 @@ he:
       trigger: 'מזלות'
       answers:
         '1': "זה וודאי"
+        '2': "זה מוחלט כך"
         '3': "ללא ספק"
         '4': "כן בהחלט"
         '5': "אתם יכולים לסמוך על כך"
         '6': "כפי שאני רואה זאת, כן"
+        '7': "קרוב לוודאי"
         '8': "תחזית טובה"
         '9': "כן"
         '10': "הסימנים מראים שכן"
+        '11': "תגובה מעורפלת לנסות שוב"
         '12': "תשאלו שוב מאוחר יותר"
         '13': "עדיף לא לענות עכשיו"
         '14': "קשה לחזות עכשיו"
@@ -80,22 +110,124 @@ he:
       reset_trigger: 'התחלה'
       skip_trigger: 'דילוג'
       help_trigger: 'הצגת עזרה'
+      random_mention:
+        reply: |-
+          הי! כדי לגלות מה אני יכול לעשות, אימרו `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          אני כרגע יודע איך לעשות את הדברים הבאים:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > מתחיל את אחד הסיפורים האינטראקטיביים הבאים: %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _ניקטו במעשה אקראי של חסד, ללא ציפייה לתמורה, בטוחים בידיעה שיום אחד מישהו עלול לעשות אותו הדבר בשבילכם_ &mdash; הנסיכה דיינה
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: אתם יכולים לסמוך על כך
       do_not_understand:
         first_response: |-
           הי, תודה על התגובה!
 
           לצערי, כבוט שתוכנת בצורה גרועה, אני לא ממש מבין את זה. :frowning:
+        track_response: אתם יכולים לנסות שוב, או אם אתם מעדיפים לדלג על שלב זה, אימרו `%{skip_trigger}`. אחרת, כדי להתחיל מחדש, אימרו `%{reset_trigger}`.
+        second_response: |-
+          או, מצטער. אני עדיין לא מבין. :anguished:
+
+          אני רק בוט, אבל אם תרצו לפנות לאדם אמיתי, בידקו את [דף יצירת הקשר](/about).
+
+          בינתיים, אשאר מחוץ לדרככם.
     new_user_narrative:
       reset_trigger: "משתמש/ת חדש/ה"
       cert_title: "כהוקרה על סיום מוצלח של מדריך המשתמשים החדש"
       hello:
         title: ":robot: ברכות!"
+        message: |-
+          תודה שהצטרפתם ל-%{title}, וברוכים הבאים!
+
+          - אני רק בוט, אבל [הצוות החביב שלנו](/about) גם כן נמצא כאן אם אתם צריכים לפנות לבן-אדם.
+
+          - מסיבות בטיחותיות, אנחנו מגבילים באופן זמני את מה שמשתמשים חדשים יכולים לעשות. אתם בזכו ביכולות חדשות (וב-[עיטורים](/badges)) ככל שנכיר אתכם.
+
+          - אנחנו מאמינים ב-[התנהגות קהילתית מתורבתת](/guidelines) בכל זמן.
+      onebox:
+        instructions: |-
+          כעת, האם תוכלו לשתף את אחד הקישורים האלו איתי? השיבו עם **קישור בשורה בפני עצמו**, והוא יפתח לכלול סיכום.
+
+          להעתקת קישור, לחצו והחזיקו במכשיר נייד, או לחצו עם הכפתור הימני של העכבר:
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          - https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          מגניב! זה יעבוד בשביל רוב <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> הקישורים. זיכרו, זה חייב להיות בשורה _בפני עצמו_, בלי שום דבר לפני ואחרי.
+        not_found: |-
+          מצטער, לא מצאתי את הקישור בתשובה שלכם! :cry:
+
+          תוכלו להוסיף את הקישור הבא, בשורה בפני עצמו, עם התשובה הבאה שלכם?
+
+          - https://en.wikipedia.org/wiki/Exotic_Shorthair
       images:
+        instructions: |-
+          הנה תמונה של חד-קרן:
+
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+
+          אם אתם אוהבים אותה (ומי לא!) ליחצו על כפתור :heart: הלייק מתחת לפוסט זה כדי שאדע על כך.
+
+          תוכלו **להשיב עם תמונה?** כל תמונה תתאים! גררו ושחררו, לחצו על כפתור ההעלאה, או אפילו העתיקו והדביקו פנימה.
+        reply: |-
+          תמונה שווה - לחצתי על כפתור :heart: הלייק כדי שתדעו כמה אני מעריך זאת :heart_eyes:
         like_not_found: |-
           שכחתם לעשות לייק :heart: ל-[פוסט](%{url}) שלי? :crying_cat_face:
+        not_found: |-
+          נראה שלא העליתם תמונה אז בחרתי תמונה שאני _בטוח_ שתהנו ממנה.
+
+          `%{image_url}`
+
+          עכשיו נסו להעלות אותה, או להדביק את הקישור בשורה בפני עצמו!
+      formatting:
+        instructions: |-
+          תוכלו **להבליט** כמה מילים או _להטות_ בתגובה שלכם?
+
+          - הקלידו **bold** או `_italic_`
+
+          - או, לחצו על הכפתורים <kbd><b>B</b></kbd> או <kbd><i>I</i></kbd> בעורך
+        reply: |-
+          עבודה מעולה! HTML ו BBCodeגם עובדים בשביל פורמט - כדי ללמוד עוד, [נסו את המדריך הזה](http://commonmark.org/help) :nerd:
+      quoting:
+        reply: |-
+          עבודה טובה, בחרתם את הציטוט האהוב עלי! :left_speech_bubble:
+      emoji:
+        reply: |-
+          זה :sparkles: _emojitastic!_ :sparkles:
+      mention:
+        reply: |-
+          _קראתם בשמי!?_ :raised_hand: אני מאמין שכן! :wave: ובכן, אני כאן! תודה שאיזכרתם אותי.  :ok_hand:
       certificate:
         alt: 'תעודת הישג'
     advanced_user_narrative:
       reset_trigger: 'משתמש/ת מתקדם/ת'
       cert_title: "כהוקרה כל סיום מוצלח של מדריך המשתמשים המתקדמים"
       title: ':arrow_up: יכולות משתמשים מתקדמים'
+      delete:
+        not_found: |-
+          אני עדיין לא רואה פוסטים שנמחקו? זיכרו <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> הצג עוד יחשוף <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> מחיקה.
+      recover:
+        deleted_post_raw: 'מדוע @%{discobot_username} מחק/ה את הפוסט שלי? :anguished:'
+        instructions: |-
+          הו לא! נראה שבטעות מחקתי פוסט חדש שרק יצרתי עבורכם.
+
+          תוכלו לעזור לי <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> **להשיב** אותו?
+        not_found: |-
+          מתקשים? זיכרו <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> הצגת עוד תחשוף <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> אחזור.
+      category_hashtag:
+        reply: |-
+          מצויין! זיכרו שזה עובד בשביל קטגוריות _וגם_ תגיות, אם תגיות מאופשרות.
+      details:
+        reply: |-
+          עבודה מעולה — תשומת הלב שלכם _לפרטים_ מוערצת!
+      certificate:
+        alt: 'תעודת סיום, מסלול משתמש מתקדם'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index 6c86499db74..bdb8f8b12d5 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -161,8 +161,6 @@ id:
           - https://en.wikipedia.org/wiki/Inherently_funny_word
           - https://en.wikipedia.org/wiki/Death_by_coconut
           - https://en.wikipedia.org/wiki/Calculator_spelling
-        reply: |-
-          Keren! Cara ini berlaku untuk semua <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> tautan. Ingat, semuanya harus sebaris _all by itself_, tanpa ada sesuatu di depan atau di belakangnya.
         not_found: |-
           Maaf, Saya tidak bisa menemukan tautan dari balasan Anda! :cry:
 
@@ -170,14 +168,6 @@ id:
 
           - https://en.wikipedia.org/wiki/Exotic_Shorthair
       images:
-        instructions: |-
-          Ini adalah gambar kuda bertanduk unicorn:
-
-          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
-
-          Agar saya tahu kalau Anda suka, (siapa yang tidak suka!) tekan tombol :heart: yang ada di bawah pos ini.
-
-          Bisakah Anda **reply with a picture?** Gambar apa saja bisa! Tarik dan taruh di sini, tekan tombol unggah atau upload, atau bisa juga salin rekan gambarnya ke sini.
         reply: |-
           Gambar yang menarik – Saya telah menekan tombol :heart: supaya Anda tahu kalau saya menghargainya :heart_eyes:
         like_not_found: |-
@@ -221,31 +211,11 @@ id:
 
           Pilih teks apa saja di pos di atas untuk memunculkan tombol <kbd>**Quote**</kbd>. Lalu tekan tombol **Reply** setelah memilih teks apa saja. Bisakah tolong dicoba lagi?
       bookmark:
-        instructions: |-
-          Jika ingin tahu lebih banyak, pilih <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> di bawah ini dan <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this private message**.  Jika dilakukan, akan ada :gift: nanti!
         reply: |-
           Hebat! Kelak Anda dapat mudah menemukan percakapan pribadi kapan saja, langsung dari [the bookmarks tab on your profile](%{profile_page_url}/activity/bookmarks). Cukup pilih gambar profil Anda di pojok kanan atas &#8599;
-        not_found: |-
-          Aduh, Saya tidak meliha tanda baca dalam topik ini. Apakah Anda melihat tanda baca atau bookmark yang di bawah setiap pos? Pilih tampilkan lebih banyak <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> untuk melihat fasilitas lain yang dibutuhkan.
       emoji:
-        instructions: |-
-          Anda telah melihat saya menggunakan gambar dalam balasan saya :blue_car::dash: gambar itu disebut [emoji](https://en.wikipedia.org/wiki/Emoji). Bisa tambahkan **add an emoji** pada balasan Anda? Pilih salah satu cara ini:
-
-          - Ketik `:) ;) :D :P :O`
-
-          - Ketik titik dua <kbd>:</kbd> lalu sebut nama emoji `:tada:`
-
-          - Tekan tombol emoji <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> di editor, atau pada papan ketik ponsel Anda.
         reply: |-
           Hebat :sparkles: _emojitastic!_ :sparkles:
-        not_found: |-
-          Uups, Sepertinya tidak ada emoji di balasan Anda? Tidak... :sob:
-
-          Cobalah ketik sebuah titik dua <kbd>:</kbd> untuk membuat pilihan emoji, lalu ketik satu kata yang diinginkan, seperti `:bird:`
-
-          Atau, pilih tombol emoji <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> di editor.
-
-          (Jika menggunakan ponsel, anda bisa langsung menggunakan dari papan ketik juga)
       mention:
         instructions: |-
           Terkadang Anda perlu mendapatkan perhatian seseorang, walau Anda tidak membalas langsung komentar mereka. Gunakan `@` lalu ketik nama pengguna untuk memanggil mereka.
@@ -258,27 +228,9 @@ id:
 
           (Akhirnya, nama saya disebut _disco_, seperti tarian tahun 1970-an. Beneran [love the nightlife!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
       flag:
-        instructions: |-
-          Kami berharap diskusi yang penuh keakraban, dan kami perlu bantuan Anda untuk [keep things civilized](%{guidelines_url}). Jika melihat sebuah masalah, tolong tandai secara rahasia dan biarkan penulis, atau [pengurus forum](%{about_url}), mengetahuinya.
-
-          >  :imp: Saya telah menulis sesuatu yang buruk di sini
-
-          Saya yakin Anda harus melakukan apa. Ayu **peringati pos ini** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> karena kurang pantas!
         reply: |-
           [Pengurus forum](/groups/staff) akan mendapatkan pemberitahuan secara rahasia tentang peringatan ini. Jika beberapa orang lainnya melakukan yang sama, secara otomatis kiriman tersebut akan disembunyikan sebagai antisipasi. (Karena saya tidak menulis sesuatu yang tidak baik :angel:, saya bisa terus bediskusi dan menghapus peringatannya sekarang.)
-        not_found: |-
-          Tidak..., tulisan buruk saya belum ditandai. :worried: Bisakah Anda menandainya sebagai sesuatu yang kurang pantas dengan **flag** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? Jangan lupa pilih tombol tampilkan lebih banyak <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> untuk melihat tindakan lain untuk setiap kiriman.
       search:
-        instructions: |-
-          _psst_ … Ada kejutan dalam topik ini. Jika mau mengikuti tantangannya, **pilih tombol pencarian** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> yang ada di kanan atas &#8599; untuk melakukan pencarian.
-
-          Coba cari istilah "capy&#8203;bara" dalam topik ini
-        hidden_message: |-
-          Bagaimana Anda melewatkan capcaybara? :wink:
-
-          <img src="%{base_uri}/images/capybara-eating.gif"/>
-
-          Apakah Anda sadar kalau sudah kembali ke diskusi awal? Beri makan si capcaybara yang kelaparan ini **ketik emotikon `:herb:`** dan otomatis Anda kembali ke diskusi paling bawah.
         reply: |-
           Ketemu juga :tada:
 
@@ -287,8 +239,6 @@ id:
           - Untuk berpindah ke komentar mana saja dalam diskusi yang panjang, coba kontrol linimasa topik yang ada di kanan (jika di ponsel ada di bawah).
 
           - Jika menggunakan papan ketik fisik :keyboard:, tekan <kbd>?</kbd> untuk melihat pintasan mengetik yang bermanfaat.
-        not_found: |-
-          Hmm… sepertinya Anda mengalami kesulitan. Mohon maaf kalau begitu. Apakah sudah mencari <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> untuk istilah **capy&#8203;bara**?
       end:
         message: |-
           Terima kasih sudah bersedia saya temani @%{username}! Saya berikan ini untuk Anda, Anda pantas menerima ini:
@@ -314,33 +264,17 @@ id:
           Setiap orang selalu membuat kesalahan. Jangan khawatir, Anda dapat selalu mengubah tulisan Anda nantinya!
 
           Bisakah Anda mulai melakukan **edit** pos yang sebelumnya sudah Anda buat?
-        not_found: |-
-          Tampaknya Anda belum mengedit tulisan [pos](%{url}) yang saya buatkan untuk Anda. Bisa dicoba lagi?
-
-          Gunakan ikon <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16"> untuk menampilkan editor tulisan.
         reply: |-
           Bagus sekali!
 
           Mohon diingat, perubahan yang dilakukan setelah melewati 5 menit akan sebagai revisi tulisan secara publik, dan ikon pensil kecil akan muncul di kanan atas pos dengan jumlah revisi yang dilakukan.
       delete:
-        instructions: |-
-          Jika Anda ingin menarik pos yang sudah dipublikasi, Anda bisa menghapusnya.
-
-          Ayo coba lakukan dan **hapus** pos yang mana saya dengan menggunakan perintah <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> **hapus**. Tapi jangan menghapus pos yang paling pertama!
-        not_found: |-
-          Saya tidak melihat pos yang dihapus? Ingat <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> tombol tampilkan lebih banyak akan membuka <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> tombol untuk menghapus.
         reply: |-
           Mantap! :boom:
 
           Agar diskusi bisa terus berjalan, hapus segara komentar atau pos Anda sesegara mungkin. Pos akan terhapus dalam beberapa saat.
       recover:
         deleted_post_raw: 'Kenapa @%{discobot_username} menghapus pos saya? :anguished:'
-        instructions: |-
-          Oh tidak! Sepertinya secara tidak sengaja saya menghapus pos baru yang baru saya buat.
-
-          Bisakah Anda bantu saya dan <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> **batal hapus** pos itu?
-        not_found: |-
-          Bingung? Ingat tampilkan lebih banyak <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> akan membuka <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> tombol batal hapus.
         reply: |-
           Fiuh, itu yang saya maksud! Terima kasih sudah memperbaikinya :wink:
 
@@ -370,19 +304,6 @@ id:
 
           Ingat, saat membalas sebuah topik, atau membaca sebuah topik selama beberapa saat, secara otomatis tingkat pemberitahuan akan menjadi 'tracking'. Anda dapat mengubah pengaturan ini di [pengaturan pengguna Anda](/my/preferences).
       poll:
-        instructions: |-
-          Tahukah Anda kalau Anda bisa menambahkan pemungutan suara di pos mana saja? Coba gunakan <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> roda gigi yang ada di editor tulis untuk **membuat pemungutan suara**.
-        not_found: |-
-          Aduh! Tampaknya tidak ada pemungutan suara dalam balasan Anda.
-
-          Gunakan <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> ikon roda gigi di editor, atau salin dan rekatkan pemungutan suara ini di balasan selanjutnya:
-
-          ```text
-          [poll]
-          * :cat:
-          * :dog:
-          [/poll]
-          ```
         reply: |-
           Hei, survei yang bagus! Apakah saya pandai mengajarkan Anda?
 
@@ -391,20 +312,6 @@ id:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          Kadang Anda ingin **menyembunyikan rincian** dalam balasan Anda:
-
-          - Saat Anda berdiskusi soal alur cerita sebuah film atau TV bisa saja itu dijadikan sebuah spoiler atau sesuatu yang disembunyikan.
-
-          - Jika pos Anda memiliki banyak pilihan rincian yang tampaknya akan terlalu banyak jika ditampilkan secara keseluruhan.
-
-          [details=Buka ini untuk melihat cara kerja spoiler!]
-          1. Pilih <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> roda gigi di editor.
-          2. Pilih "Hide Details" atau sembunyikan rincian.
-          3. Ubah ringkasan rinciannya dan tambahkan tulisan anda.
-          [/details]
-
-          Bisakah Anda menggunakan <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> roda gigi dalam editor untuk menambah bagian rincian untuk balasan selanjutnya?
         not_found: |-
           Kesulitan membuat spoiler? Coba masukkan teks di bawah ini untuk balasan selanjutnya:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index 337732ba4fe..e39d35d46cb 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -9,25 +9,27 @@ it:
   site_settings:
     discourse_narrative_bot_enabled: 'Abilita Discourse Narrative Bot'
     disable_discourse_narrative_bot_welcome_post: "Disabilita il messaggio di benvenuto di Discourse Narrative Bot"
-    discourse_narrative_bot_ignored_usernames: "Gli username che Discourse Narrative Bot dovrebbe ignorare"
+    discourse_narrative_bot_ignored_usernames: "Nomi utente che Discourse Narrative Bot deve ignorare"
     discourse_narrative_bot_disable_public_replies: "Disabilita le risposte pubbliche da Discourse Narrative Bot"
-    discourse_narrative_bot_welcome_post_type: "Tipo di messaggio di benvenuto che Discourse Narrative Bot dovrebbe inviare"
+    discourse_narrative_bot_welcome_post_type: "Tipo di messaggio di benvenuto che Discourse Narrative Bot deve inviare"
+    discourse_narrative_bot_welcome_post_delay: "Aspetta (n) secondi prima di inviare Il messaggio di benvenuto di Discourse Narrative Bot."
   badges:
     certified:
       name: Certificato
       description: "Completato il tutorial per nuovi utenti"
       long_description: |
-        Questo distintivo è assegnato al completamento del tutorial interattivo per nuovi utenti. Hai voluto imparare gli strumenti base di una discussione, e ora sei certificato!
+        Questo distintivo è assegnato al completamento del tutorial interattivo per nuovi utenti. Hai deciso di imparare gli strumenti base di una discussione, e ora sei certificato!
     licensed:
-      name: Diploma
+      name: Diplomato
       description: "Completato il tutorial per utenti avanzati"
       long_description: |
         Questo distintivo è assegnato al completamento del tutorial interattivo per utenti avanzati. Hai imparato gli strumenti avanzati di discussione  — e ora sei un diplomato!
   discourse_narrative_bot:
-    bio: "Ciao, io non sono una persona reale. Io sono un bot che ti può insegnare ad usare questo sito. Per interagire con me inviami un messaggio o menziona**`@%{discobot_username}`** ovunque."
+    bio: "Ciao, io non sono una persona reale. Sono un robot che ti può insegnare ad usare questo sito. Per interagire con me inviami un messaggio o menziona**`@%{discobot_username}`** ovunque."
     timeout:
       message: |-
-        Hey @%{username}, sto solo controllando perchè è da un po' che non ti sento.
+        Hey @%{username}, sto solo controllando perché è da un po' che non ti sento.
+
         - Per continuare, rispondimi in qualsiasi momento.
 
         - Se vuoi saltare questo passaggio, dimmi `%{skip_trigger}`.
@@ -48,16 +50,16 @@ it:
     quote:
       trigger: "cita"
       '1':
-        quote: "Nel mezzo delle difficoltà nascono le opportunità."
+        quote: "E' nel mezzo delle difficoltà che nascono le opportunità"
         author: "Albert Einstein"
       '2':
         quote: "Siate il cambiamento che volete vedere nel mondo."
         author: "Mahatma Gandhi"
       '3':
-        quote: "Non piangere perchè è finita, sorridi perchè è successo."
+        quote: "Non piangere perché è finita, sorridi perché è successo."
         author: "Dr Seuss"
       '4':
-        quote: "Se vuoi fare bene una cosa, falla da solo."
+        quote: "Se vuoi che qualcosa sia ben fatta, falla tu stesso."
         author: "Charles-Guillaume Étienne"
       '5':
         quote: "Se credi che sia possibile sei già a metà strada."
@@ -95,7 +97,7 @@ it:
         '11': "E' difficile rispondere, prova di nuovo"
         '12': "Rifai la domanda più tardi"
         '13': "Meglio non risponderti adesso"
-        '14': "Non posso predirlo ora"
+        '14': "Ora non lo posso prevedere"
         '15': "Concentrati e rifai la domanda"
         '16': "Non ci contare"
         '17': "La mia risposta è no"
@@ -105,7 +107,7 @@ it:
       result: |-
         > :crystal_ball: %{result}
     track_selector:
-      reset_trigger: 'inizia'
+      reset_trigger: 'avvia'
       skip_trigger: 'salta'
       help_trigger: 'mostra la guida'
       random_mention:
@@ -115,7 +117,7 @@ it:
           Attualmente so fare le seguenti cose:
 
           `@%{discobot_username} %{reset_trigger} %{default_track}`
-          > Avvia una delle seguenti narrazioni interattive: %{tracks}.
+          > Avvia uno dei seguenti resoconti interattivi: %{tracks}.
         bot_actions: |-
           `@%{discobot_username} %{dice_trigger} 2d6`
           > :game_die: 3, 6
@@ -128,10 +130,11 @@ it:
       do_not_understand:
         first_response: |-
           Hey, grazie per la risposta!
-          Sfortunatamente, come un bot mal programmato, non posso capire la tua risposta. :frowning:
+
+          Sfortunatamente, essendo un robot mal programmato, non l'ho capita bene. :frowning:
         track_response: Puoi provare di nuovo, o se vuoi saltare questo passaggio, dimmi `%{skip_trigger}`. Altrimenti per ricominciare, dimmi `%{reset_trigger}`.
         second_response: |-
-          Aw, scusa. Non sto ancora capendo. :anguished:
+          Oh, scusa. Non sto ancora capendo. :anguished:
 
           Sono solo un bot, ma se vuoi contattare una persona reale, guarda [la nostra pagina dei contatti](/about).
 
@@ -140,9 +143,10 @@ it:
       reset_trigger: "nuovo utente"
       cert_title: "In riconoscimento del successo nel completamento del tutorial come nuovo utente"
       hello:
-        title: ":robot: Saluti!"
+        title: ":robot: Benvenuto!"
         message: |-
           Grazie per esserti unito a %{title}, e benvenuto!
+
           - Io sono solo un robot, ma [il nostro amichevole staff](/about) è qui per aiutarti se hai bisogno di contattare una persona.
 
           - Per ragioni di sicurezza, abbiamo temporaneamente limitato ciò che i nuovi utenti possono fare. Potrai guadagnare nuove abilità (e [distintivi](/badges)) appena ti conosceremo meglio.
@@ -151,13 +155,14 @@ it:
       onebox:
         instructions: |-
           Adesso, puoi condividere uno di questi collegamenti con me? Rispondi con **un collegamento su una riga a sè stante**, e verrà automaticamente espanso per includere un bel sommario.
+
           Per copiare un collegamento, toccalo e tienilo premuto su mobile, o fai click col tasto destro del mouse:
 
           - https://it.wikipedia.org/wiki/Italia
           - https://it.wikipedia.org/wiki/Pagina_principale
           - https://it.wikipedia.org/wiki/Traduzione
         reply: |-
-          Fantastico! Questo funzionerà per la maggior parte dei collegamenti <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16">. Ricorda, deve essere su una linea _da solo_, con nient'altro davanti o dietro.
+          Fantastico! Questo funzionerà per la maggior parte dei <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> collegamenti. Ricorda, deve essere su una riga _da solo_, con niente davanti o dietro.
         not_found: |-
           Mi dispiace, non riesco a trovare il collegamento nella tua risposta! :cry:
 
@@ -165,17 +170,28 @@ it:
 
           - https://it.wikipedia.org/wiki/Exotic_Shorthair
       images:
+        instructions: |-
+          Ecco l'immagine di un unicorno:
+
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+
+          Se ti piace (e a chi non piacerebbe!) vai avanti e premi il pulsante mi piace :heart: sotto a questo messaggio per farmelo sapere.
+
+          Puoi **rispondere con un'immagine?** Qualsiasi immagine andrà bene! Trascinala e rilasciala, premi il pulsante carica, oppure copiala e incollala.
         reply: |-
           Bell'immagine – Ho premuto il pulsante mi piace :heart: per farti sapere quanto l'ho apprezzata :heart_eyes:
         like_not_found: |-
           Hai dimenticato di mettere mi piace :heart: al mio [messaggio?](%{url}) :crying_cat_face:
         not_found: |-
           Sembra che tu non abbia caricato un'immagine così ne ho scelta una io che sono _sicuro_ ti piacerà.
+
           `%{image_url}`
+
           Prova a caricare questa nel prossimo messaggio, o incolla il collegamento su una riga da solo!
       formatting:
         instructions: |-
           Puoi scrivere alcune parole in **grassetto** o _italico_ nella tua risposta?
+
           - digita `**grassetto**` o `_italico_`
 
           - oppure premi i pulsanti <kbd><b>G</b></kbd> o <kbd><i>I</i></kbd> sull'editor
@@ -188,47 +204,52 @@ it:
       quoting:
         instructions: |-
           Puoi provare a citarmi nella tua risposta, così saprò esattamente a quale parte del mio messaggio stai rispondendo?
+
           > Se questo è caffè, per favore portami del thè; ma se questo è thè, per favore portami del caffè.
           >
           > Un vantaggio del parlare con sè stessi è che almeno sai che qualcuno ti sta ascoltando.
           >
           > Alcune persone si fanno strada con le parole e altre persone… oh, oh, non hanno una strada.
+
           Seleziona il testo della citazione &uarr; che preferisci, e poi premi il pulsante **Cita** che comparirà sopra il testo selezionato – o il pulsante **Rispondi** in fondo a questo messaggio.
+
           Sotto la citazione, digita una o due parole sul motivo per cui hai scelto proprio quella perchè sono curioso :thinking:
         reply: |-
           Bel lavoro, hai scelto la mia citazione preferita! :left_speech_bubble:
         not_found: |-
           Hmm sembra che tu non mi abbia citato nella tua risposta!
+
           Selezionare un qualsiasi testo del mio messaggio farà apparire il pulsante <kbd>**Cita**</kbd>. E anche premere **Rispondi** con qualsiasi testo selezionato funzionerà! Puoi provare di nuovo?
       bookmark:
         instructions: |-
-          Se vuoi saperne di più, seleziona <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> qui sotto e <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> per inserire **questo messaggio privato nei segnalibri**.  Se lo farai, ci potrebbe essere un :gift: nel tuo futuro!
+          Se vuoi saperne di più, seleziona <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> qui sotto e <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> per inserire **questo messaggio privato nei segnalibri**.  Se lo farai, ci potrebbe essere un :gift: in futuro!
         reply: |-
           Eccellente! Ora potrai tornare facilmente a questa conversazione privata in ogni momento, proprio dalla [scheda segnalibri sul tuo profilo](%{profile_page_url}/activity/bookmarks). Basta selezionare l'immagine del tuo profilo in alto a destra &#8599;
         not_found: |-
-          Oh oh, non vedo nessun segnalibro in questo argomento. Hai trovato il pulsante segnalibro sotto ogni messaggio?  Usa mostra altro <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> per rivelare pulsanti aggiuntivi se necessario.
+          Oh oh, non vedo nessun segnalibro in questo argomento. Hai trovato il pulsante segnalibro sotto ogni messaggio?  Usa il pulsante mostra altro <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> per rivelare altri pulsanti se è necessario.
       emoji:
         instructions: |-
-          Puoi avermi visto utilizzare delle piccole immagini nelle mie risposte :blue_car::dash: che si chiamano [emoji](https://en.wikipedia.org/wiki/Emoji). Puoi **aggiungere una emoji** alla tua risposta? Uno qualsiasi di questi metodi funzionerà:
+          Puoi avermi visto usare delle piccole immagini nelle mie risposte :blue_car::dash: che sono chiamate [emoji](https://it.wikipedia.org/wiki/Emoji). Puoi **aggiungere una emoji** alla tua risposta? Uno qualsiasi di questi metodi funzionerà:
 
           - Digita `:) ;) :D :P :O`
 
           - Digita due punti <kbd>:</kbd> poi completa il nome della emoji `:tada:`
 
-          - Premi il pulsante emoji <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> nell'editor, o sulla tastiera mobile
+          - Premi il pulsante emoji <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> nell'editor, oppure sulla tastiera del tuo dispositivo mobile
         reply: |-
           Questo è :sparkles: _emojitastico!_ :sparkles:
         not_found: |-
           Oops, non vedo nessuna emoji nella tua risposta! Oh no! :sob:
 
-          Prova digitando i due punti <kbd>:</kbd> per far apparire il selettore delle emoji, poi digita le prime lettere della emoji che vuoi, ad esempio `:bird:`
+          Prova a digitare due punti <kbd>:</kbd> per far apparire il selettore delle emoji, poi digita qualche lettere della emoji che vuoi, ad esempio `:bird:`
 
-          Oppure premi il pulsante emoji <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> nell'editor.
+          Oppure, premi il pulsante emoji <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> nell'editor.
 
-          (Se sei su un dispositivo mobile, puoi anche immettere l'emoji direttamente dalla tastiera.)
+          (Se sei su un dispositvo mobile, puoi anche inviare emoji direttamente dalla tastiera.)
       mention:
         instructions: |-
           Qualche volta potresti volere l'attenzione di una persona, anche se non stai rispondendo direttamente a lei. Digita `@` poi completa il suo username per menzionarla.
+
           Puoi menzionare **`@%{discobot_username}`** nella tua risposta?
         reply: |-
           _Qualcuno ha fatto il mio nome!?_ :raised_hand: Credo che sia stato tu! :wave:  Bene, eccomi qui! Grazie per avermi menzionato.  :ok_hand:
@@ -238,24 +259,26 @@ it:
           (E sì, il mio username inizia con _disco_, come nella mania dance degli anni 70. Io [amo la vita notturna!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
       flag:
         instructions: |-
-          Ci piacciono le discussioni amichevoli, e abbiamo bisogno del tuo aiuto per [mantenere le cose civilizzate](%{guidelines_url}). Se vedi un problema, per favore segnalalo privatamente per farlo sapere all'autore o [al nostro staff](%{about_url}).
+          Ci piacciono le discussioni amichevoli e abbiamo bisogno del tuo aiuto per [mantenere le cose civili](%{guidelines_url}). Se vedi un problema, per favore segnalalo privatamente all'autore, o fallo sapere al [nostro staff](%{about_url}).
+
           >  :imp: Ho scritto qualcosa di brutto qui
 
-          Credo che tu sappia cosa fare. Vai avanti e **segnala questo messaggio** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> come inappropriato!
+          Penso che tu sappia cosa fare. Va avanti e **segnala questo messaggio** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> come inappropriato!
         reply: |-
           [Il nostro staff](/groups/staff) verrà notificato privatamente della tua segnalazione. Se abbastanza membri della comunità segnalano un messaggio, quest'ultimo verrà automaticamente nascosto per precauzione. (Dal momento che non ho scritto veramente qualcosa di brutto :angel:, ho rimosso la segnalazione per ora.)
         not_found: |-
-          Oh no, il mio brutto messaggio non è ancora stato segnalato. :worried: Puoi segnalarlo come inappropriato usando il pulsante **segnala** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? Non dimenticarti di usare il pulsante mostra altro <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> per rivelare altre azioni possibili su ogni messaggio.
+          Oh no, il mio brutto messaggio non è ancora stato segnalato. :worried: Puoi segnalarlo come inappropriato usando il pulsante **segnala** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? Non dimenticare di usare il pulsante mostra altro <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> per rivelare gli altri pulsanti.
       search:
         instructions: |-
-          _psst_ … Ho nascosto una sorpresa in una delle mie risposte precedenti. Se sei pronto alla sfida, **seleziona l'icona cerca** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> in alto a destra &#8599; per cercarla.
+          _psst_ … Ho nascosto una sorpresa in questo argomento. Se sei pronto alla sfida, **seleziona l'icona cerca** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> in alto a destra &#8599; per cercarla.
+
           Prova a cercare il termine "capi&#8203;bara" in questo argomento
         hidden_message: |-
-          Come hai fatto a perdere questo capibara? :wink:
+          Come hai fatto a perderti questo capibara? :wink:
 
           <img src="%{base_uri}/images/capybara-eating.gif"/>
 
-          Hai notato che sei tornato all'inizio dell'argomento? Dai da mangiare a questo affamato capibara **rispondendo con l'emoji `:herb:`** e verrai automaticamente riportato alla fine.
+          Hai notato che sei tornato all'inizio dell'argomento? Dai da mangiare a questo povero capibara affamato **rispondendo con la emoji `:herb:`** e tornerai automaticamente in fondo alla discussione.
         reply: |-
           Hey l'hai trovato :tada:
 
@@ -265,16 +288,16 @@ it:
 
           - Se hai una :keyboard: fisica, premi <kbd>?</kbd> per visualizzare delle comode scorciatoie da tastiera.
         not_found: |-
-          Hmm… Sembra che tu abbia qualche problema. Ci dispiace. Hai cercato su <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> il termine **capi&#8203;bara**?
+          Hmm… sembra che tu abbia qualche problema. Mi dispiace. Hai cercato <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> il termine **capi&#8203;bara**?
       end:
         message: |-
           Grazie per avermi seguito @%{username}! Ho fatto questo per te, penso che te lo sei guadagnato:
 
           %{certificate}
 
-          E' tutto per ora! Controlla [**gli argomenti delle nostre ultime discussioni**](/latest) or [**le categorie di discussione**](/categories). :sunglasses:
+          E' tutto per ora! Controlla [**gli argomenti delle nostre ultime discussioni**](/latest) o [**le categorie di discussione**](/categories). :sunglasses:
 
-          (Se vuoi parlare con me ancora per saperne di più, inviami un messaggio o menzionami `@%{discobot_username}` quando vuoi!)
+          (Se vuoi parlare con me ancora per imparare altro, inviami un messaggio o menzionami scrivendo `@%{discobot_username}` quando vuoi!)
       certificate:
         alt: 'Attestato di Merito'
     advanced_user_narrative:
@@ -282,25 +305,30 @@ it:
       cert_title: "In riconoscimento del completamento con successo del tutorial utente avanzato"
       title: ':arrow_up: Funzioni utente avanzato'
       start_message: |-
-        Come un utente avanzato, hai già visitato [la pagina delle opzioni sul tuo profilo](/my/preferences) @%{username}? Ci sono molti modi per personalizzare la tua esperienza, ad esempio selezionando un tema scuro o uno chiaro.
+        Come utente _avanzato_, hai già visitato [la pagina delle opzioni sul tuo profilo](/my/preferences) @%{username}? Ci sono molti modi per personalizzare la tua esperienza, ad esempio selezionando un tema scuro o uno chiaro.
+
         Ma sto divagando, cominciamo!
       edit:
         bot_created_post_raw: "@%{discobot_username} è, di gran lunga, il bot più interessante che conosco :wink:"
         instructions: |-
           Tutti fanno degli errori. Ma non preoccuparti, puoi sempre modificare i tuoi messaggi per sistemarli!
+
           Puoi iniziare **modificando** il messaggio che ho appena creato al tuo posto?
         not_found: |-
-          Sembra che tu non abbia ancora modificato il [messaggio](%{url}) che ho creato per te. Puoi provare di nuovo?
-          Usa l'icona <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16"> per far apparire l'editor.
+          Sembra che tu non abbia ancora editato il [messaggio](%{url}) che ho creato per te. Puoi provare di nuovo?
+
+          Usa il  pulsante <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16"> per far apparire l'editor.
         reply: |-
           Ottimo lavoro!
+
           Nota che le modifiche fatte dopo 5 minuti verranno mostrate come revisioni pubbliche, e una piccola icona a forma di matita apparirà in alto a destra sul messaggio con il conteggio delle modifiche fatte.
       delete:
         instructions: |-
-          Se lo desideri puoi eliminare un tuo messaggio, cancellandolo.
-          Vai avanti e **cancella** uno dei tuoi messaggi precedenti usando il pulsante <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> **cancella**. Non cancellare il primo messaggio però!
+          Se vuoi cancellare un tuo messaggio, puoi eliminarlo.
+
+          Va avanti ed **elimina** uno dei tuoi messaggi precedenti usando il pulsante <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> **elimina**. Non cancellare il primo messaggio però!
         not_found: |-
-          Non vedo ancora nessun messaggio cancellato! Ricorda di cliccare su <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> mostra altro per rivelare <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> il pulsante cancella.
+          Non vedo ancora nessun messaggio cancellato! Ricorda che il pulsante <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> mostra altro rivelerà il pulsante <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> elimina.
         reply: |-
           Whoa! :boom:
 
@@ -308,71 +336,85 @@ it:
       recover:
         deleted_post_raw: 'Perchè @%{discobot_username} ha cancellato il mio messaggio? :anguished:'
         instructions: |-
-          Oh no! Sembra che io abbia accidentalmente cancellato un nuovo messaggio che avevo creato per te.
+          Oh no! Sembra che io abbia accidentalmente cancellato un nuovo messaggio che avevo appena creato al tuo posto.
+
           Puoi farmi un favore e <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> **ripristinarlo**?
         not_found: |-
-          Stai avendo problemi? Ricorda di cliccare su <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> mostra altro per rivelare <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> il pulsante ripristina.
+          Stai avendo problemi? Ricorda che il pulsante <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> mostra altro rivelerà il pulsante <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> ripristina.
         reply: |-
-          Pfff, questa è fatta! Grazie per averlo ripristinato :wink:
+          Pfff, questa è fatta! Grazie per averlo sistemato :wink:
 
           Ti faccio notare che hai solo 24 ore di tempo per ripristinare un messaggio.
       category_hashtag:
         instructions: |-
           Lo sapevi che è possibile fare riferimento a categorie ed etichette in un messaggio? Per esempio, hai visto la categoria %{category}?
+
           Digita `#` nel mezzo di una frase e seleziona una categoria o un'etichetta.
         not_found: |-
-          Hmm, non vedo nessuna categoria. Nota che `#` non può essere il primo carattere di una riga. Puoi copiare questo nella tua prossima risposta?
+          Hmm, non vedo nessuna categoria nel tuo messaggio. Nota che `#` non può essere il primo carattere di una riga. Puoi copiare questo nella tua prossima risposta?
+
+          ```text
           Posso creare un collegamento ad una categoria digitando #
+          ```
         reply: |-
           Eccellente! Ricorda che questo funziona per le categorie _e_ le etichette, se le etichette sono abilitate.
       change_topic_notification_level:
         instructions: |-
           Ogni argomento ha un livello di notifica. Parte da 'normale', il che significa che riceverai una notifica quando qualcuno parlerà direttamente con te.
+
           Per impostazione predefinita, il livello di notifica per un messaggio privato è impostato al livello più alto 'in osservazione', il che significa che riceverai una notifica ad ogni nuovo messaggio. Ma puoi sovrascrivere il livello di notifica per _ogni_ argomento su 'in osservazione', 'seguito' o 'silenziato'.
+
           Prova a modificare il livello di notifica per questo argomento. In fondo alla discussione, troverai un pulsante che ti mostrerà che questo argomento è **in osservazione** . Puoi modificare il livello di notifica a **seguito**?
         not_found: |-
           Sembra che stia ancora in osservazione :eyes: di questo argomento! Se hai problemi a trovarlo, il pulsante relativo al livello della notifica è situato in fondo a questo argomento.
         reply: |-
           Lavoro impressionante! Spero che non silenzi questo argomento dato che a volte posso essere un po' loquace :grin:.
+
           Nota che quando rispondi ad un argomento, o leggi un argomento per più di qualche minuto, verrà automaticamente impostato il livello di notifica a 'seguito'. Puoi modificare queste impostazioni sulle [tue preferenze utente](/my/preferences).
       poll:
         instructions: |-
-          Lo sapevi che puoi aggiungere un sondaggio in qualsiasi messaggio? Prova a usare l'icona <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> ingranaggio sull'editor per **costruire un sondaggio**.
+          Lo sapevi che puoi aggiungere un sondaggio in ogni messaggio? Prova ad usare il pulsante <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> opzioni nell'editor per **creare un sondaggio**.
         not_found: |-
-          Whoops! Non c'è nessun sondaggio nella tua risposta.
-          Usa l'icona <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> ingranaggio sull'editor, oppure copia e incolla questo sondaggio nella tua prossima risposta:
+          Ooops! Non c'è nessun sondaggio nella tua risposta.
 
+          Usa il pulsante <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> opzioni nell'editor, oppure copia e incolla questo sondaggio nella tua prossima risposta:
+
+          ```text
           [poll]
           * :cat:
           * :dog:
           [/poll]
+          ```
         reply: |-
           Hey, bel sondaggio! Sono un buon insegnante?
+
           [poll]
           * :+1:
           * :-1:
           [/poll]
       details:
         instructions: |-
-          Delle volte desidererai **nascondere dei dettagli** nelle tue risposte:
+          Qualche volta potresti voler **nascondere dei dettagli** nelle tue risposte:
 
-          - Quando stai discutendo alcuni punti della trama di un film o di uno show televisivo che potrebbero essere considerati spoiler.
+          - Quando si stanno discutento dei punti della trama di un film o di uno show televisivo che potrebbero essere considerati degli spoiler.
 
-          - Quando il tuo messaggio necessita di molti dettagli opzionali che possono essere di intralcio se letti tutti in una volta.
+          - Quando il tuo messaggio necessita di molti dettagli opzionali che potrebbero intralciare la lettura se letti tutti in una volta.
 
-          [details=Seleziona questa opzione per vedere come funziona!]
-          1. Seleziona l'icona <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> ingranaggio sull'editor.
+          [details=Seleziona questo per vedere come funziona!]
+          1. Seleziona il pulsante <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> opzioni nell'editor.
           2. Seleziona "Nascondi Dettagli".
           3. Modifica il sommario e aggiungi il tuo contenuto.
           [/details]
 
-          Puoi usare l'icona <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> ingranaggio sull'editor per aggiungere una sezione con dei dettagli nella tua prossima risposta?
+          Puoi usare il pulsante <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> opzioni nell'editor per aggiungere una sezione dettagli nella tua prossima risposta?
         not_found: |-
           Hai problemi a creare un widget con dei dettagli? Prova a includere quello che segue nella tua prossima risposta:
 
+          ```text
           [details=Selezionami per vedere i dettagli]
           Qui ci sono i dettagli
           [/details]
+          ```
         reply: |-
           Ottimo lavoro — la tua attenzione per i _dettagli_ è ammirevole!
       end:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ja.yml b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
index 8c2dc009047..7392733b527 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
@@ -5,4 +5,43 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ja: {}
+ja:
+  site_settings:
+    discourse_narrative_bot_enabled: 'ディスコースの自動ナレーターを許可してください。'
+    disable_discourse_narrative_bot_welcome_post: "ディスコースナレーター、ボットからのようこそ投稿を無効にしてください。"
+    discourse_narrative_bot_ignored_usernames: "ディスコースナレーター、ボットのユーザー名は気にするべきではありません。"
+    discourse_narrative_bot_disable_public_replies: "ディスコースナレーター、ボットからの返信を無効にして下さい。"
+    discourse_narrative_bot_welcome_post_delay: "ディスコースのナレーター、ボットのようこそ投稿を送信する前に(n)秒待ってください。"
+  badges:
+    certified:
+      name: 承認されました。
+      description: "新規ユーザーのチュートリアルが完了しました。"
+      long_description: |
+        このバッジは新規ユーザーチュートリアルの優れた結果のもと授与されました。あなたはディスカッションの基礎的なツールを学ぶための主導権を獲得したことが証明されました!
+    licensed:
+      name: 許可されました。
+      description: "上級のユーザーチュートリアルが完了しました。"
+      long_description: |
+        このバッジは上級ユーザーチュートリアルの優れた結果において授与されました。あなたは上級ディスカッションツールをマスターし、完全に許可されました。
+  discourse_narrative_bot:
+    bio: "初めまして。私は実在する人ではなく、このサイトについて教えることができるコンピュータプログラムです。私と情報交換するためにはメッセージを送信するか%{discobot_username}のどこかでちょっと話を出しておいて下さい。"
+    timeout:
+      message: |-
+        こんにちは%{username}、しばらく便りがなかったのでチェックをしているところです。
+
+        続けるためには、私に時間のある時に返信してください。
+
+        もしこのステップをスキップしたい場合、%{skip_trigger}とおっしゃってください。
+
+        やり直したい場合、%{reset_trigger}とおっしゃってください。
+
+        仮にこれらをしたくなくても、それもOKです。私はプログラムですから傷つきません。:くすん:
+    quote:
+      '1':
+        author: "アルベルト・アインシュタイン"
+      '2':
+        author: "マハトマガンジー"
+      '3':
+        quote: "終わったからと悲しまず、出会えたのだから微笑んでください。"
+      '4':
+        quote: "あなたが誰かに正しい行いを求めるのであれば、自分自身で行ってください。"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index bf4e05d6f4f..cd5eed86711 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -5,4 +5,303 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ko: {}
+ko:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Discourse 이야기봇 활성화'
+    disable_discourse_narrative_bot_welcome_post: "Discourse 이야기봇 환영 포스트 비활성화"
+    discourse_narrative_bot_ignored_usernames: "Discourse 이야기봇이 무시할 사용자 아이디"
+    discourse_narrative_bot_disable_public_replies: "Discourse 이야기봇의 공개 답글 비활성화"
+    discourse_narrative_bot_welcome_post_type: "Discourse 이야기봇이 보낼 환영 포스트 종류"
+    discourse_narrative_bot_welcome_post_delay: "Discourse 이야기봇의 환영 포스트 전송 전 대기시간(단위: 초)"
+  badges:
+    certified:
+      name: 인증받은 사용자
+      description: "새 사용자 튜토리얼을 완료하였습니다."
+      long_description: |
+        이 배지는 유저 튜토리얼을 성공적으로 마친 유저들에게 부여됩니다. 토론을 위한 기본적인 도구를 익혀 인증받은 사용자가 되었습니다!
+    licensed:
+      name: Discourse 사용 면허
+      description: "고급 사용자 튜토리얼을 완료하였습니다"
+      long_description: |
+        이 배지는 고급 유저 튜토리얼을 성공적으로 완료한 사용자에게 부여됩니다. 당신은 고급 토론 도구를 숙지하여 면허를 취득하였습니다!
+  discourse_narrative_bot:
+    bio: "안녕, 사실 나는 사람이 아니야. 이 사이트에 대해서 알려주는 로봇이지. 나한테 물어보고 싶은 게 있다면 메세지를 보내거나 **`@%{discobot_username}`** 를 멘션하면 돼."
+    timeout:
+      message: |-
+        안녕 @%{username}, 너한테서 소식이 없어서 한 번 말 걸어봤어.
+
+        - 계속 하려면 언제든 나한테 답장을 하면 돼.
+
+        - 이 단계를 건너뛰고 싶다면 `%{skip_trigger}` 라고 말하면 돼.
+
+        - 다시 시작하고 싶으면 `%{reset_trigger}`라고 말해.
+
+        뭐, 다 싫어도, 괜찮아. 난 로봇이라서 나빠질 기분이 없거든. :sob:
+    dice:
+      trigger: "굴리기"
+      invalid: |-
+        미안, 수학적으로 그 조합의 주사위는 돌릴 수 없어. :confounded:
+      not_enough_dice: |-
+        난 주사위 %{num_of_dice} 개밖에 안 남았어. [으으,](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), 그래, 나도 알아 안다고!
+      out_of_range: |-
+        수학적으로 공평하면서도 [가장 큰 수](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice)를 가진 주사위의 면 수가 120이라는 거 아니?
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "명언"
+      '1':
+        quote: "\"모든 역경속에는 기회가 있다\""
+        author: "앨버트 아인슈타인"
+      '2':
+        quote: "\"세상을 변화시키고 싶다면, 당신부터 변화된 삶을 살아라.”"
+        author: "마하트마 간디"
+      '3':
+        quote: "\"끝났다고 울지말고, 그 시간을 떠올리며 웃으렴.\""
+        author: "수스(Seuss) 박사"
+      '4':
+        quote: "\"올바른 것을 원한다면, 스스로 성취하라\""
+        author: "샤를-기욤 에티엔"
+      '5':
+        quote: "\"스스로를 믿는다면 이미 절반은 이룬 것이나 다름없다\""
+        author: "시어도어 루즈벨트"
+      '6':
+        quote: "\"인생은 초콜릿상자 같은 거야, 다음에 어떤 초콜릿을 집게 될지는 아무도 모른단다.\""
+        author: "포레스트 검프의 엄마"
+      '7':
+        quote: "\"끝났다고 울지말고, 그 시간을 떠올리며 웃으렴.\""
+        author: "닐 암스트롱"
+      '8':
+        quote: "\"당신이 두려워하는 일을 매일하라\""
+        author: "엘리너 루즈벨트"
+      '9':
+        quote: "\"실수는 만약 받아들일 용기가 있다면 언제든 용서될 수 있다.\""
+        author: "이소룡"
+      '10':
+        quote: "\"당신은 당신이 상상하고 믿는 모든 것들을 이룰 수 있다.\""
+        author: "나폴레온 힐"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
+    magic_8_ball:
+      trigger: '운세'
+      answers:
+        '1': "이건 확실해."
+        '2': "이건 분명히 돼."
+        '3': "의심할 여지가 없지."
+        '4': "응, 당연히 그래."
+        '5': "믿어도 좋아."
+        '6': "맞아."
+        '7': "거의 확실해."
+        '8': "좋을 전망."
+        '9': "응."
+        '10': "괜찮아 보이는군."
+        '11': "흐릿하게 보이는군. 다시..."
+        '12': "다음에 다시 물어봐."
+        '13': "지금은 말하지 않는 편이 낫겠어."
+        '14': "지금은 예측할 수 없어."
+        '15': "집중해서 다시 물어봐."
+        '16': "꿈도 꾸지마."
+        '17': "내 대답은 '아니다'야."
+        '18': "내 정보에 의하면 '아니오'야."
+        '19': "안좋을 전망."
+        '20': "아주 의심스러워."
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: '시작하기'
+      skip_trigger: '건너뛰기'
+      help_trigger: '도움말 표시'
+      random_mention:
+        reply: |-
+          내가 뭘 할 수 있는지 알고 싶다면 `@%{discobot_username} %{help_trigger}` 라고 말하렴.
+        tracks: |-
+          나는 아래의 일을 할 수 있어.
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > 아래의 서로 이야기하기 중 하나를 골라서 시작해봐. %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _언젠가 다른 누군가도 당신이 그랬던 것 처럼 친절한 행동을 할 거라고 믿으면서, 보상에 대한 어떠한 기대도 없이 친절한 행동을 하라._ &mdash; 다이애나비
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: 믿어도 좋아.
+      do_not_understand:
+        first_response: |-
+          우와, 답글을 써줘서 고마워!
+
+          그런데 애석하게도 나는 프로그래밍된 로봇이라서 그게 무슨 말인 지 알수가 없단다. :frowning:
+        track_response: 다시 해볼 수 있어. 이 단계를 건너뛰고 싶으면 `%{skip_trigger}`라고 말해. 다시 시작하시고 싶으면 `%{reset_trigger}`라고 말하면 돼.
+        second_response: |-
+          오 미안. 아직도 무슨 말인지 모르겠어. :anguished:
+
+          난 그냥 로봇일 뿐이야. 진짜 사람한테 연락하고 싶다면  [우리 연락처 페이지](/about) 를 참고해.
+
+          그럼, 난 잠시 자리를 비워줄게.
+    new_user_narrative:
+      reset_trigger: "새로운 사용자"
+      cert_title: "새로운 사용자 튜토리얼을 성공적으로 마친 것에 대한 보상으로"
+      hello:
+        title: ":robot: 반가워!"
+        message: |-
+          %{title}에 가입해줘서 고맙고 반가워!
+
+          - 난 로봇이야. 하지만 사람에게 문의하고 싶은 일이 있다면 [친절한 스탭](/about)들에게 문의할 수도 있어.
+
+          - 안전상의 이유로, 우리는 임시로 새로운 사용자가 할 수 있는 일을 제한을 걸어놔. 차차 알아가면서 할 수 있는 일들과 [배지](/badges)들이 늘어날거야.
+
+          - 우리는 [커뮤니티 규칙](/guidelines)를 언제나 믿고 있지.
+      onebox:
+        instructions: |-
+          자 이제, 이 링크 중 하나를 나한테 공유해볼래? 한줄 당 링크 하나씩 써서 답글을 써봐. 그러면 자동으로 해당 페이지의 요약이 추가된단다.
+
+          링크를 복사하려면, 링크 위에서 마우스 우클릭을 하면 돼. 모바일에서는 링크를 계속 누르고 있으면 되고.
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          - https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          대단해! 이 기능은 가장 <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16">한 링크에 작동해. 잊지마. 줄 하나 당  링크 하나씩이야. 주소 앞이나 뒤에 무언가가 있으면 작동하지 않아.
+        not_found: |-
+          미안해. 답글에서 링크를 찾지 못했어! :cry:
+
+          아래 링크 한줄을 복사해서 다음 답글에 넣어볼래?
+
+          - https://en.wikipedia.org/wiki/Exotic_Shorthair
+      images:
+        instructions: |-
+          유니콘 사진이야.
+
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+
+          (당연히 그렇겠지만) 맘에 들면 이 포스트 아래에 있는 '좋아요'버튼을 눌러봐.
+
+          **사진으로 답글쓰기**를 할 수 있니? 어떤 그림이든 상관없어. 드래그&드랍으로 땡겨와서 업로드 버튼을 눌러봐. 복사&붙여넣기도 가능해.
+        reply: |-
+          멋진 사진이네. 내가 얼마나 좋아하는 지:heart_eyes: 알려주고 싶어서 좋아요:heart:를 눌렀단다.
+        like_not_found: |-
+          [내글에](%{url})좋아요:heart: 안 눌러 줄거니? :crying_cat_face:
+        not_found: |-
+          니가 그림을 안올린 거 같아서 니가 좋아할 거 같은 사진을 올려봤어.
+
+          `%{image_url}`
+
+          다음엔 니가 한번 업로드 해봐. 사진 링크만 있는 한 줄을 남겨도 돼!
+      formatting:
+        instructions: |-
+          답글에서 글을 **진하게** 만들거나 _이탤릭_처리를 할 수 있니?
+
+          - `**진하게**` 또는 `_이탤릭_`이라고 써봐.
+
+          - 아니면 에디터에서 <kbd><b>B</b></kbd> 또는 <kbd><i>I</i></kbd> 버튼을 눌러도 돼.
+        reply: |-
+          훌륭해! HTML 이나 BBCode 로도 글을 꾸밀 수 있어. [이 튜토리얼을 참고해봐.](http://commonmark.org/help) :nerd:
+        not_found: |-
+          어, 니 답글은 꾸며진 글이 없는 거 같은데. :pencil2:
+
+          다시 한 번 해볼래? 에디터에서 <kbd><b>B</b></kbd> 버튼을 누르면 진하게 되고 <kbd><i>I</i></kbd> 버튼을 누르면 이탤릭처리가 된단다.
+      quoting:
+        instructions: |-
+          내 글에 답글을 쓸 때, 네가 나의 어떤 말에 답하는 지 알 수 있도록 인용을 해줄 수 있겠니?
+
+          > 이게 커피라면 차를 주시고, 차라면 커피를 주세요.
+          >
+          > 혼잣말의 장점은 최소한 한 사람은 듣고있다는 거죠.
+          >
+          > 어떤 사람은 말재주만 좋지만, 다른 사람들은... 음, 재주가 없네.
+
+          위에 쓴 글에서 무엇이든 선택해서 &uarr; 선택한 영역 부근에 뜨는 **인용하기** 버튼을 눌러 봐. 아니면 이 포스트 아래에 있는 **답글쓰기** 버튼을 눌러도 돼.
+
+          인용을 다했으면, 선택한 문구에 대하여 한 두마디 적어봐. 뭐라 이야기할지 궁금하군. :thinking:
+        reply: |-
+          잘했어. 내가 제일 좋아하는 말을 선택했네! :left_speech_bubble:
+        not_found: |-
+          흠, 아무 것도 인용하지 않은 것 같은데?
+
+          내 포스트에서 아무 글이나 선택해도 <kbd>**인용하기**</kbd> 버튼이 뜰거야. 글을 선택하고 **답글쓰기** 를 눌러도 돼! 다시 한 번 해 볼래?
+      bookmark:
+        instructions: |-
+          더 알고 싶다면 아래에 있는 이걸<img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> 선택한 다음 <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> **이 개인메시지 북마크**를 하렴.  너의 미래에 보내는 좋은 선물:gift:이 되겠지!
+        reply: |-
+          대단해! 이제는 [프로필의 북마크 탭](%{profile_page_url}/activity/bookmarks)만 눌러도 우리의 개인적인 대화를 손쉽게 뒤돌아 볼 수 있어. 우측 상단에 있는 프로필 사진만 선택하면 돼. &#8599;
+        not_found: |-
+          어라, 이 토픽에는 북마크가 없는데? 포스트 별로 있는 북마크 버튼을 찾았니? 더 보기<img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> 를 눌러서 필요한 추가 기능이 있는지 살펴 봐.
+      emoji:
+        instructions: |-
+          내가 답글에서 조그마한 그림을 쓰는 걸 봤겠지?:blue_car::dash: 이런 걸 [이모지 (emoji)](https://en.wikipedia.org/wiki/Emoji)라고 해. 너도 답글에 **이모지를 추가**해 볼래? 아래 중에서 아무거나 해도 돼.
+
+          - `:) ;) :D :P :O` 라고 입력하기
+
+          - 콜론<kbd>:</kbd>을 입력하고 이모지 이름 `:tada:`를 완성해봐.
+
+          - 에디터에서 <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> 이모지 버튼을 누르거나, 모바일 키보드를 사용해봐.
+        reply: |-
+          그거 정말 :sparkles: _이모지스럽네!_ :sparkles:
+        not_found: |-
+          어라, 답글에서 이모지를 못찾겠는데? 안돼! :sob:
+
+          콜론 <kbd>:</kbd> 을 입력하면 이모지 선택기를 띄울 수 있어. 그럼 몇자만 입력해도 원하는 이모지를 찾을 수 있지. 예를 들어 ':bird:'라고 입력하면 돼.
+
+          아니면, 편집기에서 이모지 버튼 <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> 을 눌러도 상관없어.
+
+          (모바일 기기를 가지고 있으면, 키보드에서 이모지를 바로 입력할 수도 있어.)
+      mention:
+        instructions: |-
+          그 사람글에 직접 답글을 쓰는 건 아니어도, 어떤 사람의 관심이 필요할 때가 있지. 그럴 때는 `@` 다음에 그 사람의 아이디를 입력해서 멘션을 날리면 돼.
+
+          답글에 **`@%{discobot_username}`** 를 써서 멘션을 날려볼래?
+        reply: |-
+          _내 이름 부른 사람!?_ :raised_hand: 너인 거 같은데! :wave:  그래, 난 여깄어! 내 얘기해줘서 고마워.  :ok_hand:
+        not_found: |-
+          내 이름을 못찾겠네. :frowning: `@%{discobot_username}` 라고 쳐서 나한테 멘션을 날려줄래?
+
+          (그래, 내 아이디는 _disco_, 라고 써. 1970년대 토요일밤의 열기처럼 말이야. 난 [밤을 사랑하는 댄서라고!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          나는 우리 커뮤니티의 토론이 친근해서 좋단다. 계속 그렇게 되려면 [질서를 유지](%{guidelines_url})하는 데 너의 도움이 필요해. 문제가 보인다면, 신고하기를 눌러서 작성자에게 개인적으로 알려주거나, 우리의[친절한 운영진](%{about_url})들에게 알려주렴.
+
+          > :imp: 어쩌고 저쩌고 나쁜 글
+
+          뭘 할지 잘 알고 있지? **이 포스트 신고하기** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> 를 눌러서 부적절하다고 알려줘!
+        reply: |-
+          [우리의 운영진](/groups/staff)은 니가 한 신고내용을 개인 메시지로 알림받게 될 거야. 충분한 커뮤니티 회원들이 신고를 하면, 포스트의 내용이 숨겨지고 사전경고가 걸리게 돼.(난 실제로 나쁜 글을 쓴 건 아니니까:angel:, 이제 신고를 지울게.)
+        not_found: |-
+          아이고, 나의 나쁜 포스트가 아직 신고가 안됐네. :worried: 부적절한 게시물로 **신고** 해주겠니 <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? 더 보기 버튼을 누르면 <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> 포스트에 수행할 기능을 더 볼 수 있다는 걸 잊지마.
+      search:
+        instructions: |-
+          이봐, 내가 이 토픽에 놀라운 걸 숨겼다구. 찾아보고 싶다면, 우측 상단에 있는 **검색 아이콘을** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16">  선택해서 &#8599; 찾아봐.
+
+          이 토픽에서  "capy&#8203;bara"를 찾으면 돼.
+        hidden_message: |-
+          어떻게 이 capybara를 놓칠 수 있어? :wink:
+
+          <img src="%{base_uri}/images/capybara-eating.gif"/>
+
+          다시 처음으로 온 걸 눈치챘어? 이 배고픈 불쌍한 capybara에게 **`:herb:` emoji로 답을 해서** 먹이를 주렴. 그러면 자동으로 끝으로 가게 될거야.
+        reply: |-
+          예이, 찾았네! :tada:
+
+          - 더 자세히 검색하려면, [전체 검색 페이지](%{search_url})로 가보렴.
+
+          - 긴 대화에서 원하는 곳으로 건너 뛰려면, 우측에 있는 토픽 타임라인 컨트롤을 사용해봐 (모바일 기기에는 아래쪽에 있어).
+
+          - 진짜 실물 :keyboard:가 있다면, <kbd>?</kbd>를 눌러서 간편한 단축키가 뭐가 있는지 알아봐.
+        not_found: |-
+          흠.... 아무래도 문제가 있어 보이네. 미안해. 검색<img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16">을 눌러서 **capy&#8203;bara**를 찾아봤어?
+      certificate:
+        alt: '목표달성 인증'
+    advanced_user_narrative:
+      reset_trigger: '고급 사용자'
+      cert_title: "고급 사용자 튜토리얼을 훌륭하게 완료한 것에 대한 보상으로"
+      title: ':arrow_up: 고급 사용자 기능'
+      edit:
+        bot_created_post_raw: "@%{discobot_username}는 내가 아는 한, 현존하는 가장 쿨한 봇이지:wink:"
+        instructions: |-
+          누구나 실수해. 걱정마, 편집을 하면 그 실수를 언제든지 바로잡을 수 있거든!
+
+          내가 너 대신 만든 이 포스트를 **편집**하는 걸로 시작해 볼래 ?
+      recover:
+        deleted_post_raw: '왜 @%{discobot_username}가 내 포스트를 지웠지? :anguished:'
+      certificate:
+        alt: '고급 사용자 추적 인증'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
index 7db05b7d682..83912927831 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -6,7 +6,37 @@
 # https://www.transifex.com/projects/p/discourse-org/
 
 nb_NO:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Aktiver Discourse Fortellerbot'
+    disable_discourse_narrative_bot_welcome_post: "Deaktiver velkomstinnlegget fra Discourse Fortellerbot"
+    discourse_narrative_bot_ignored_usernames: "Brukernavn som Discourse Fortellerbot skal ignorere"
+    discourse_narrative_bot_disable_public_replies: "Deaktiver åpne svar fra Discourse Fortellerbot"
+    discourse_narrative_bot_welcome_post_type: "Type velkomstinnlegg som Discourse Fortellerbot skal sende ut"
+    discourse_narrative_bot_welcome_post_delay: "Vent (n) sekunder før Discourse Fortellerbot sender ut velkomstinnlegg."
+  badges:
+    certified:
+      name: Sertifisert
+      description: "Fullførte vår opplæring for nye brukere"
+      long_description: |
+        Dette merket er tildelt ved fullførelse av den interaktive opplæringen for nye brukere. Du har vist initiativ til å lære de grunnleggende verktøyene for diskusjoner, og er nå sertifisert!
+    licensed:
+      name: Linsensiert
+      description: "Fullførte vår opplæring for avanserte brukere"
+      long_description: |
+        Dette merket er tildelt ved fullførelse av den interaktive opplæringen for avanserte brukere. Du har mestret de avanserte verktøyene for diskusjoner — og er nå fullstendig lisensiert!
   discourse_narrative_bot:
+    bio: "Hei, jeg er ikke en virkelig person. Jeg er en robot som kan lære deg om dette nettstedet. For å kommunisere med meg, send meg en melding eller nevn **`@%{discobot_username}`** hvor som helst."
+    timeout:
+      message: |-
+        Hei @%{username}, jeg bare sjekker opp på deg fordi jeg har ikke hørt fra deg på en stund.
+
+        - For å fortsette, svar meg når som helst.
+
+        - Hvis du ønsker å hoppe over dette steget, si `%{skip_trigger}`.
+
+        - For å begynne på nytt, si `%{reset_trigger}`.
+
+        Hvis du helst ikke vil er det også OK. Jeg er en robot. Du sårer ikke følelsene mine. :sob:
     quote:
       trigger: "sitat"
       '1':
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
index c04d371e5a4..0a6dc5859c0 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -5,4 +5,39 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-pl_PL: {}
+pl_PL:
+  site_settings:
+    disable_discourse_narrative_bot_welcome_post: "Dezaktywuj wpis powitalny Discourse Narrative Bot"
+  badges:
+    certified:
+      name: Certyfikowany
+  discourse_narrative_bot:
+    quote:
+      trigger: "cytuj"
+      '1':
+        author: "Albert Einstein"
+      '2':
+        author: "Mahatma Gandhi"
+      '3':
+        author: "Dr Seuss"
+      '5':
+        quote: "Uwierz w to że możesz, jesteś już w połowie drogi."
+      '6':
+        quote: "Życie jest jak pudełko czekoladek. Nigdy nie wiesz na co trafisz."
+        author: "Mama Forresta Gumpa"
+      '8':
+        author: "Eleanor Roosevelt"
+      '9':
+        author: "Bruce Lee"
+      '10':
+        author: "Napoleon Hill"
+    magic_8_ball:
+      answers:
+        '4': "Tak zdecydowanie"
+        '9': "Tak"
+    track_selector:
+      reset_trigger: 'zacznij'
+      skip_trigger: 'pomiń'
+      help_trigger: 'wyświetl pomoc'
+    new_user_narrative:
+      reset_trigger: "nowy użytkownik"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
index 233456f7e05..807b45f30b2 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pt_BR.yml
@@ -24,33 +24,65 @@ pt_BR:
       long_description: |
         Este emblema é adquirido após finalizar com sucesso o tutorial interativo de usuário avançado. Você dominou as ferramentas avançadas de discussão -e agora você está totalmente licenciado!
   discourse_narrative_bot:
+    bio: "Olá, Eu não sou uma pessoa real. Eu sou um robô que pode te ensinar sobre este site. Para interagir comigo, me envie uma mensagem ou faça uma menção **`@%{discobot_username}`** em qualquer lugar."
+    timeout:
+      message: |-
+        Oi @%{username}, apenas verificando se você ainda está aí; por que não te escuto faz um tempo.
+
+        - Para continuar, me responda a qualquer momento.
+
+        - Se você preferir pular esse passo, diga `%{skip_trigger}`.
+
+        - Para iniciar novamente, diga `%{reset_trigger}`.
+
+        Se você não quiser falar nada, não tem problema também. Eu sou um robô. Você não vai ferir meus sentimentos. :sob:
     dice:
+      trigger: "rolar"
+      invalid: |-
+        Sinto muito, é matematicamente impossível rolar essa combinação de dados. :confounded:
+      not_enough_dice: |-
+        Eu tenho apenas um dado de %{num_of_dice} lados. [Shameful](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), Eu sei!
+      out_of_range: |-
+        Você sabia que [o número máximo de lados] (https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) para um dado matematicamente justo é 120?
       results: |-
         > :game_die: %{results}
     quote:
       trigger: "citação"
       '1':
+        quote: "No meio de toda dificuldade reside a oportunidade"
         author: "Albert Einstein"
       '2':
         quote: "Você deve ser a mudança que quer ver no mundo."
         author: "Mahatma Gandhi"
       '3':
+        quote: "Não chore por que acabou, sorria por que aconteceu."
         author: "Dr Seuss"
       '4':
         quote: "Se você quer que algo seja feito corretamente, faça você mesmo."
         author: "Charles-Guillaume Étienne"
       '5':
+        quote: "Acredite você pode e está quase lá."
         author: "Theodore Roosevelt"
       '6':
+        quote: "A vida é como uma caixa de chocolates. Você nunca sabe o que vai conseguir."
         author: "Mãe do Forrest Gump"
       '7':
+        quote: "Um pequeno passo para um homem, uma grande salto para a humanidade."
         author: "Neil Armstrong"
       '8':
+        quote: "Faça uma coisa por dia que te assuste."
         author: "Eleanor Roosevelt"
       '9':
+        quote: "Erros são sempre perdoáveis se você tiver a coragem de adimiti-los."
         author: "Bruce Lee"
       '10':
+        quote: "Tudo que a mente humana pode conceber e acreditar, ela pode conquistar."
         author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
+      answers:
+        '1': "É certo"
+        '3': "sem dúvida"
       result: |-
         > :crystal_ball: %{result}
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 3e076bde9fc..351a7dcff71 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -25,9 +25,28 @@ ru:
       long_description: |
         Этот значок выдается после успешного завершения интерактивного передового руководство пользователя. Вы уже освоили почти все инструменты обсуждения — и теперь ты полностью готов к общению!
   discourse_narrative_bot:
+    bio: "Здравствуйте! Я не реальный человек. Я бот, который может научить вас работать с этим сайтом. Чтобы взаимодействовать со мной, отправьте мне сообщение или упоминание **`@%{discobot_username}`** в любом месте."
+    timeout:
+      message: |-
+        Здравствуйте @%{username}, я просто проверяю, потому что я не слышал от вас в некоторое время.
+
+        - Чтобы продолжить, ответьте мне в любое время.
+
+        - Если вы хотите пропустить этот шаг, скажите `%{skip_trigger}`.
+
+        - Чтобы начать с самого начала, скажите `%{reset_trigger}`.
+
+        Если Вы не хотите отвечать, это тоже нормально. Я робот. Вы не сделаете мне больно. :sob:
     dice:
+      trigger: "roll"
       invalid: |-
         Извините, даже математически невозможно бросить эту комбинацию костей. :confounded:
+      not_enough_dice: |-
+        У меня только %{num_of_dice} кости. [Посмотрите](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), что это такое!
+      out_of_range: |-
+        Знаете ли вы, что [максимальное количество сторон](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) в кубиках может быть 120?
+      results: |-
+        > :game_die: %{results}
     quote:
       trigger: "цитата"
       '1':
@@ -60,7 +79,10 @@ ru:
       '10':
         quote: "Что разум человека способен познать и вообразить, того он способен достичь."
         author: "Наполеон Хилл"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
+      trigger: 'fortune'
       answers:
         '1': "Это точно"
         '2': "Это несомненно так"
@@ -82,6 +104,8 @@ ru:
         '18': "Мои источники говорят, что нет"
         '19': "Перспективы не очень хорошие"
         '20': "Весьма сомнительно"
+      result: |-
+        > :crystal_ball: %{result}
     track_selector:
       reset_trigger: 'старт'
       skip_trigger: 'пропустить'
@@ -89,23 +113,318 @@ ru:
       random_mention:
         reply: |-
           Привет! Tтобы узнать, что я могу сделать, наберите: `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          В настоящее время я знаю, как сделать следующие вещи:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > Начинается одно из следующих интерактивных повествований: %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _Делайте добро, без ожидания награды, зная, что однажды кто-то может сделать то же самое для вас_ &mdash; Принцесса Диана
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Вы можете ответить на это
+      do_not_understand:
+        first_response: |-
+          Спасибо за ответ!
+
+          К сожалению я пока не очень хороший бот и только учусь. :frowning:
+        track_response: Вы можете попробовать еще раз, или если вы хотите пропустить этот шаг, скажите `%{skip_trigger}`. Если хотите начать все с самого начала, скажите `%{reset_trigger}`.
+        second_response: |-
+          Ой, извините. Я все еще не понимаю вас. :anguished:
+
+          Я просто Бот. Если вы хотите пообщаться с администрацией, то вот [их контакты](/about).
+
+          В то же время, я не буду стоять на вашем пути.
     new_user_narrative:
       reset_trigger: "новый пользователь"
+      cert_title: "В знак признания успешного завершения нового руководство пользователя"
+      hello:
+        title: ":robot: Поздравляю!"
+        message: |-
+          Спасибо %{title}, и Добро пожаловать!
+
+          - Я всего лишь робот, но [наш дружный коллектив](/about) готов помочь вам в любое время.
+
+          - По соображениям безопасности, мы временно ограничили то, что новые пользователи могут делать. Вы будете получать новые способности (и [значки](/badges)) по мере приобретения опыта.
+
+          - Мы верим в [цивилизованном поведении](/guidelines) в нашем сообществе.
+      onebox:
+        instructions: |-
+          Далее, вы можете поделиться одну из этих ссылок со мной? Ответить мне с **ссылкой с новой строки**.  Эти ссылки добавят отличный обзор.
+
+          Чтобы скопировать ссылку, нажмите и удерживайте на мобильном, или правой кнопкой мыши:
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          - https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          Здорово! Это будет работать для большинства <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> ссылок. Помните, ссылка должна быть на одной линии _и_, ничего позади или впереди не должно находиться.
+        not_found: |-
+          К сожалению, я не смог найти ссылку в вашем ответе! :cry:
+
+          Может вы попробовать еще раз добавить следующую ссылку, на отдельной линии, в вашем следующем ответе?
+
+          - https://en.wikipedia.org/wiki/Exotic_Shorthair
+      images:
+        instructions: |-
+          Вот картинка единорога:
+
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+
+          Если вам нравится она, то нажмите на лайк :heart: кнопку внизу поста.
+
+          А вы можете **ответить мне с картинкой?** В вашем следующем ответе пришлите мне любую картинку.
+        reply: |-
+          Отличная картинка – я нажал бы на :heart: если бы мог показать вам, как я ценю это :heart_eyes:
+        like_not_found: |-
+          Вам не нравится :heart: мой [пост?](%{url}) :crying_cat_face:
+        not_found: |-
+          Похоже, Вы не загрузите изображения, поэтому я выбрал картинку, которой вы _будете_ наслаждаться.
+
+          `%{image_url}`
+
+          Попробуйте загрузить это или вставить ссылку на отдельной строке!
       formatting:
+        instructions: |-
+          Вы можете сделать некоторые слова **жирными** или _наклонными_ в своем ответе?
+
+          - например `**жирный**` или `_наклонный_`
+
+          - нажмите <kbd><b>B</b></kbd> или <kbd><i>I</i></kbd> кнопку в редакторе
         reply: |-
           Отличная работа! Формате HTML и BBCode также работа для форматирования – чтобы узнать больше,  [попробуйте этот учебник](http://commonmark.org/help) :nerd:
+        not_found: |-
+          Оооо, я не нашел какого-либо форматирования в вашем ответе. :pencil2:
+
+          Можете ли вы попробовать еще раз? Используйте <kbd><b>B</b></kbd> или <kbd><i>I</i></kbd>курсив в редакторе, если вы застряли.
       quoting:
+        instructions: |-
+          Вы можете попробовать процитировать меня при ответе, чтобы я точно знал, на какую часть вы отвечаете?
+
+          > Если это кофе, пожалуйста, принесите мне чай; если это чай, пожалуйста, принесите мне кофе.
+          >
+          > Мечтай так как будто будешь жить вечно. Живи так как будто умрешь завтра.
+          >
+          > Я всегда был лучшей компанией самому себе.
+
+          Выделите текст, который вы предпочитаете. Появится кнопка: **Цитата**.  Нажмите на нее. Цитата должна появиться в вашем ответе.
+
+          Допишите, что-то ниже цитаты :thinking:
         reply: |-
           Молодец, вы выбрали мою любимую цитату! :left_speech_bubble:
+        not_found: |-
+          Хм, похоже, Вы не цитировали меня в своем ответе?
+
+          Выделите любой текст в моем посту. Должна появиться кнопка:  <kbd>**Цитата**</kbd> . И нажмите: **Ответить**. Текст должен появится в редакторе. Можете ли вы попробовать еще раз?
+      bookmark:
+        instructions: |-
+          If you’d like to learn more, select <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this private message**.  If you do, there may be a :gift: in your future!
+        reply: |-
+          Отлично! Теперь вы можете легко найти свой путь назад к нашей частной беседе любой момент, прямо с [закладок в профиле](%{profile_page_url}/activity/bookmarks). Просто выберите фотографию профиля в правом верхнем углу &#8599;
+        not_found: |-
+          Ой, я не вижу никаких закладок в этом разделе. Вы нашли закладок под каждым постом? Используйте, показать больше <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> для просмотра дополнительных инструментов в посту.
+      emoji:
+        instructions: |-
+          Возможно вы видели маленькие картинки в ответах :blue_car::dash: это называется [emoji](https://en.wikipedia.org/wiki/Emoji). Может вы **добавить emoji** в вашем ответе? Любой из этих вариантов будет работать:
+
+          - Написать `:) ;) :D :P :O`
+
+          - Введите двоеточие <kbd>:</kbd> и наберите emoji имя `:tada:`
+
+          - Нажмите на иконку <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> в редакторы и выберите картинку
+        reply: |-
+          Это :sparkles: _emojitastic!_ :sparkles:
+        not_found: |-
+          Упс, я не вижу никаких смайликов в вашем ответе? О нет! :sob:
+
+          Попробуйте ввести двоеточие <kbd>:</kbd> чтобы вызвать emoji, а затем введите первые несколько букв того, что вы хотите, например,`:bird:`
+
+          Нажмите на кнопку со смайликом <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> в редакторе.
+
+          (Если вы находитесь на мобильном устройстве, Вы также можете выбрать emoji прямо с клавиатуры.)
+      mention:
+        instructions: |-
+          Иногда вы, возможно, захотите, привлечь внимание человека, даже если Вы не отвечаете ему напрямую. Набрав `@` затем начните набирать его имя пользователя.
+
+          Вы можете позвать меня **`@%{discobot_username}`** в своем ответе?
+        reply: |-
+          _Кто-то произнес мое имя!?_ :raised_hand: Я верю, что вы это сделали! :wave:  А вот и я! Спасибо, что упомянули меня.  :ok_hand:
+        not_found: |-
+          Я не вижу свое имя в вашем ответе :frowning: Вы не можете снова упомянуть меня: `@%{discobot_username}` ?
+
+          (И да, мое имя пользователя пишется как _disco_, в 1970 году был такой танец. Я не [люблю ночную жизнь!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          Мне нравится наше дружеское общение, и мне нужна ваша помощь [сохранять цивилизованное общение](%{guidelines_url}). Если вы видите нарушения, пожалуйста, нажмите на флаг в сообщение. Автор сообщения, или [наш внимательный персонал](%{about_url}), узнают об этом.
+
+          >  :imp: Я написал здесь, например, гадость
+
+          Я думаю, вы знаете, что делать. Нажмите на **флаг в этом посте** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> выбрать причину, как неуместное содержание!
+        reply: |-
+          [Наши сотрудники](/groups/staff) будут лично уведомлены о вашем сообщение. Если достаточное количество участников аналогично нажмет на этот флаг, то сообщение будет автоматически скрыто из-за предосторожности. (Так как я на самом деле не написать неприятный пост :angel:, я пошел туда и снял жалобу.)
+        not_found: |-
+          О нет, вы не пожаловались ещё на мой противный пост. :worried: вы можете пометить его как нарушающий правило пост, **флагом** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? Не забудьте попробовать воспользоваться еще <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> кнопками, чтобы выявить дополнительные возможности.
+      search:
+        instructions: |-
+          _тсссс_ … Я спрятал сюрприз в этом разделе. Если вы готовы принять вызов, **выберите значок поиска** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> вверху справа &#8599; для поиска сюрприза.
+
+          Попробуйте поискать этот термин "capy&#8203;bara" в этом топике
+        hidden_message: |-
+          Как же вы пропустили этого зверька капибара? :wink:
+
+          <img src="%{base_uri}/images/capybara-eating.gif"/>
+
+          Вы заметили, что сейчас в самом начале поста? Покормите бедного, голодного капибару  **отвечая:  `:herb:` emoji** и вы будете автоматически вознаграждены.
+        reply: |-
+          Ура вы его нашли :tada:
+
+          - Для более детального поиска, зайдите на [полный поиск на странице](%{search_url}).
+
+          - Чтобы прыгать в любую точку в долгой дискуссии попробуйте шакалу управление справа (и внизу, на мобильном).
+
+          - Если у вас есть физическая :keyboard:, клавиатура <kbd>?</kbd> для просмотра наших удобных сочетаний клавиш.
+        not_found: |-
+          Хмм, похоже у вас не получилось. Вы искали <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> for the term **capy&#8203;bara**?
+      end:
+        message: |-
+          Спасибо, с меня @%{username}! Я сделала это для вас, я думаю вы это заслужили:
+
+          %{certificate}
+
+          Вот и все на сегодня! Проверьте [**последние сообщения**](/latest) или [**категории сообщества**](/categories). :sunglasses:
+
+          (Если вы хотите снова поговорить со мной, просто напишите мне сообщение тут или упомяните меня с `@%{discobot_username}` в любое время!)
       certificate:
         alt: 'Свидетельство о достижении'
     advanced_user_narrative:
       reset_trigger: 'продвинутый пользователь'
       cert_title: "В знак признания успешного завершения расширенного руководства пользователя"
       title: ':arrow_up: Расширенные функции пользователя'
+      start_message: |-
+        Как _продвинутый_ пользователь, вы можете посетить [вашу страницу](/my/preferences) и еще @%{username}? Есть много способов, чтобы настроить свой опыт, такие как выбор темной или светлой темы.
+
+        Но я отвлекся, давайте начнем!
       edit:
         bot_created_post_raw: "@%{discobot_username} безусловно, самый лучший бот, которого я знаю :wink:"
+        instructions: |-
+          Каждый делает ошибки. Но не волнуйтесь, вы всегда можете редактировать свои сообщения, чтобы их исправить!
+
+          Вы можете попробовать **редактировать** этот пост? Я создал его от Вашего имени.
+        not_found: |-
+          Похоже, что вы еще не изменили [пост](%{url}) который я создал для вас. Вы можете попробовать еще раз?
+
+          Используйте значок <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16"> для вызова редактора.
+        reply: |-
+          Отличная работа!
+
+          Обратите внимание, что правки, сделанные после 5 минут показывают, как общественные изменения, и маленький значок карандаша появится в верхнем правом  углу записи.
+      delete:
+        instructions: |-
+          Давайте попробуйте удалить один из постов.
+
+          Выберите любой из ранее созданных постов нажав <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> **удалить**. Не удаляйте первый пост!
+        not_found: |-
+          Я не вижу удаленные посты еще? Помню <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> show more will reveal <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> delete.
+        reply: |-
+          Опсс! :boom:
+
+          Чтобы сохранить преемственность дискуссий, система удаляет не немедленно, поэтому пост будет удален через некоторое время.
       recover:
         deleted_post_raw: 'Почему @%{discobot_username} удалил моё сообщение? :anguished:'
+        instructions: |-
+          О нет! Похоже, я случайно удалил новый пост.
+
+          Можете ли вы сделать мне одолжение и <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> **восстановить** его?
+        not_found: |-
+          Возникли проблемы? Помните <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> показать еще, а <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> восстановить.
+        reply: |-
+          Ух, это было отлично! Спасибо за ремонт, что :wink:
+
+          Запомните, что у вас есть только 24 часа, чтобы восстановить пост.
+      category_hashtag:
+        instructions: |-
+          Знаете ли вы, что вы можете обратитесь к категории и теги в вашем посте? Например, вы видели %{category} категорию?
+
+          Введите `#` в середине предложения и выберите любую категорию или тег.
+        not_found: |-
+          Хм, я не вижу категорию. Обратите внимание, что `#` не может быть первым символом. Вы можете скопировать это в вашем следующем ответе?
+
+          ```text
+          Я могу создать ссылку на категорию #
+          ```
+        reply: |-
+          Отлично! Это работает для всех категорий _и_ тегов, если теги включены.
+      change_topic_notification_level:
+        instructions: |-
+          Каждая тема имеет уровень уведомлений. Она начинается на 'нормальный', что означает, что вы нормально будете только получать уведомления, когда кто-то обращается непосредственно к вам.
+
+          По умолчанию, уровень уведомления на личное сообщение находится на самом высоком уровне 'смотреть', что означает, что вы будете получать уведомления о каждом новом ответе. Но вы можете переопределить уровня уведомлений для _любой_ теме 'смотреть', 'отслеживания' или 'отключен'.
+
+          Давайте попробуем изменить уровень уведомления по этой теме. Внизу темы, Вы найдете кнопку, которая показывает, что вы **смотрите** эту тему. Вы можете изменить уровень уведомления на **отслеживание**?
+        not_found: |-
+          Похоже, вы еще ищите :eyes: эту кнопку! Это кнопка находится в нижней части этого раздела.
+        reply: |-
+          Потрясающая работа! Я надеюсь, что вас я не утомил, поскольку могу быть немного болтлив  :grin:.
+
+          Обратите внимание, что при ответе на тему, или если читать тему в течение более чем нескольких минут, он автоматически устанавливается на уровень уведомления 'отслеживание'. Вы можете изменить это в [ваших настройках](/my/preferences).
+      poll:
+        instructions: |-
+          Знаете ли вы, что можете добавить опрос в любой пост? Выберите этот  <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> значок в редакторе, а далее **Создать опрос**.
+        not_found: |-
+          Упс! Не было никакого опроса в вашем ответе.
+
+          Используйте этот <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> значок шестеренки в редакторе, или скопируйте и вставьте этот опрос в своем следующей ответ:
+
+          ```text
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
+        reply: |-
+          Это хороший опрос! Как я вам в обучении?
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          Иногда вы можете захотеть **скрыть подробности** в вашем ответе:
+
+          - Когда вы обсуждаете сюжет фильма или ТВ передачу, и хотите что-то скрыть под спойлером.
+
+          - Когда ваш пост нуждается в большом количестве дополнительных деталей, которые могут отвлекать, когда читаешь все сразу.
+
+          [details=Выберите этот параметр, чтобы увидеть, как это работает!]
+          1. Выберите <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> в вашем редакторе.
+          2. Выберите "Скрыть подробности".
+          3. Редактируйте данный и добавьте ваше содержание.
+          [/details]
+
+          Вы можете использовать следующий знак <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> чтобы добавить детали в следующий свой ответ?
+        not_found: |-
+          У вас возникли проблемы при создание данного виджета? Попробуйте следующее в вашем ответе:
+
+          ```text
+          [details=Посмотреть далее]
+          Тут написаны подробности
+          [/details]
+          ```
+        reply: |-
+          Отличная работа  — ваше внимание к _деталям_  достойна восхищения!
+      end:
+        message: |-
+          Вы прошли через это действительно как _продвинутый пользователь_  :bow:
+
+          %{certificate}
+
+          Это все, что я хотел сказать вам.
+
+          А сейчас до свидания! Если вы хотите снова поговорить со мной, отправить мне сообщение в любое время :sunglasses:
       certificate:
         alt: 'Свидетельство о прогрессе для опытных пользователей'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.sk.yml b/plugins/discourse-narrative-bot/config/locales/server.sk.yml
index e8b17f733ff..04564293ca7 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.sk.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.sk.yml
@@ -6,15 +6,47 @@
 # https://www.transifex.com/projects/p/discourse-org/
 
 sk:
+  site_settings:
+    discourse_narrative_bot_enabled: 'Povoliť Rozprávacieho Robota Discourse'
+    disable_discourse_narrative_bot_welcome_post: "Vypnúť uvítací príspevok Rozprávacieho Robota Discourse"
+    discourse_narrative_bot_ignored_usernames: "Používateľské mená, ktoré má Rozprávací Robot Discourse ignorovať"
+    discourse_narrative_bot_disable_public_replies: "Vypnúť verejné odpovede Rozprávacieho Robota Discourse"
+    discourse_narrative_bot_welcome_post_type: "Typ uvítacieho príspevku, ktorý má Rozprávací Robot Discourse posielať"
+    discourse_narrative_bot_welcome_post_delay: "Počkať (n) sekúnd pred poslaním uvítacieho príspevku od Rozprávacieho Robota Discourse"
   badges:
+    certified:
+      name: Certifikovaný
+      description: "Ukončený manuál nového používateľa"
+      long_description: |
+        Tento odznak sa udeľuje po úspešnom ukončení interaktívneho manuálu nového používateľa.  Zahájili ste iniciatívu na naučenie sa základným nástrojom diskusie a teraz ste certifikovaný!
     licensed:
+      name: Licencovaný
       description: "Dokončili sme náš tutoriál pre pokročilých používateľov"
+      long_description: |
+        Tento odznak sa udeľuje po úspešnom ukončení interaktívneho manuálu pokročilého používateľa. Zvládli ste pokročilé nástroje diskusie — a teraz ste plne certifikovaný!
   discourse_narrative_bot:
+    bio: "Ahoji, ja nie som skutočná osoba. Som robot, ktorý Ťa môže naučiť o tejto stránke. Komunikovať so mnou môžeš poslaním správy, alebo zmienkou **`@%{discobot_username}`** kdekoľvek."
+    timeout:
+      message: |-
+        Hej @%{username}, iba kontrolujem, pretože nejaký čas som od Ťeba nič nepočul .
+
+        - Ak chceš pokračovať, kedzkoľvek mi odpovedz.
+
+        - Ak chceš tento krok vynechať, napíš  `%{skip_trigger}`.
+
+        - Ak chceš začať od začiatku, povedz `%{reset_trigger}`.
+
+        Ak nie, tak je to tiež OK. Som robot. Moje pocity nezraníš. :sob:
     dice:
+      trigger: "zahrať"
       invalid: |-
         Je mi to ľúto, ale je matematicky nemožné zahrať túto kombináciu kociek. :confounded:
       not_enough_dice: |-
         Ja mám len %{num_of_dice} kocky. [Shameful](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), ja viem!
+      out_of_range: |-
+        Vieš, že [maximálny počet strán](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) pre matematicky férovú kocku je 120?
+      results: |-
+        > :game_die: %{results}
     quote:
       trigger: "citácia"
       '1':
@@ -42,9 +74,13 @@ sk:
         quote: "Každý deň spravte niečo, čo vás straší."
         author: "Eleanor Roosevelt"
       '9':
+        quote: "Chyby sa vždy dajú ospravedlňiť, ak má človek odvahu si ich priznať."
         author: "Bruce Lee"
       '10':
+        quote: "Čokoľvek čo ľudská myseľ dokáže pochopiť a uveriť tomu, dokáže i dosiahnuť"
         author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
       trigger: 'šťastie'
       answers:
@@ -57,14 +93,19 @@ sk:
         '7': "Pravdepodobne"
         '8': "Výhľad je dobrý"
         '9': "Áno"
+        '10': "Znamenia ukazujú na Áno"
+        '11': "Nejasná odpoveď, skús znovu"
         '12': "Opýtajte sa neskôr"
         '13': "Radšej ti to teraz nepoviem"
         '14': "Teraz to nie je možné predpovedať"
+        '15': "Koncentruj sa a spýtaj sa znovu"
         '16': "Nepočítajte s tým"
         '17': "Moja odpoveď je nie"
         '18': "Moje zdroje hovoria nie"
         '19': "Výhľad nie je tak dobrý"
         '20': "Veľmi pochybné"
+      result: |-
+        > :crystal_ball: %{result}
     track_selector:
       reset_trigger: 'začať'
       skip_trigger: 'preskočiť'
@@ -72,11 +113,45 @@ sk:
       random_mention:
         reply: |-
           Ahoj! Ak chcete zistiť, čo dokážem urobiť, povedzte `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          V súčasnosti viem ako robiť nasledujúce veci:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > Zahájiť jednu z nasledujúcich interaktívnych konverzácií: %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _Vykonaj náhodný milosrdný skutok, bez akýchkoľvek očakávaní, a buď si istý, že jedného dňa niekto může urobiť to isté pre Teba_ &mdash; Princezná Diana
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Na to sa môžeš spoľahnúť
+      do_not_understand:
+        first_response: |-
+          Hej, ďakujem za odpoveď!
+
+          Žiaľ, ako úboho naprogramovaný robot tomu nedokážem porozumieť.. :frowning:
+        track_response: Môžeš skúsiť znovu, alebo ak chceš tento krok preskočiť, napíš `%{skip_trigger}`. Inak, aby si začal znovu, povedz `%{reset_trigger}`.
+        second_response: |-
+          Ach, prepáč, stále to chechápem. :anguished:
+
+          Som iba robot, ale ak chceš kontaktovať reálnu osobu, skús [našu kontaktnú stránku](/about).
+
+          Zatiaľ sa Ti nebudem pliesť do cesty.
     new_user_narrative:
       reset_trigger: "nový používateľ"
+      hello:
+        title: ":robot: Zdravím!"
       quoting:
         reply: |-
           Pekná práca, vybrali ste môj obľúbený citát! :left_speech_bubble:
+      emoji:
+        reply: |-
+          To je :sparkles: _emojitastic!_ :sparkles:
     advanced_user_narrative:
       reset_trigger: 'pokročilý používateľ'
       title: ':arrow_up: Pokročilé funkcie používateľa'
+      details:
+        reply: |-
+          Super práca — vaše zameranie na _detail_ je obdivuhodné!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
index 0b5ca0f9496..271b882b3bc 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.zh_CN.yml
@@ -25,7 +25,7 @@ zh_CN:
       long_description: |
         该徽章授予完成我们交互式高级用户教程的你。你已经掌握了讨论的高级工具——你已经收到了证明！
   discourse_narrative_bot:
-    bio: "你好，我不是真实的人。我是一个教你如何使用站点的机器人。你可以给我发消息或在任意地方提及**`@%{discobot_username}`**与我交互。"
+    bio: "你好，我不是真实的人。我是一个教你如何使用站点的机器人。你可以给我发消息或在任意地方提及 **`%{discobot_username}`** 与我交互。"
     timeout:
       message: |-
         你好，@%{username}。好久没见到你了，一切可好？
@@ -145,13 +145,13 @@ zh_CN:
       hello:
         title: ":robot: 祝贺！"
         message: |-
-          感谢你加入%{title}，然后欢迎！
+          感谢加入%{title}，  欢迎！
 
-          - 我只是个机器人，但是需要的话[我们友善的管理人员](/about)也能帮助你。
+          - 我只是个机器人， 但是如果你需要接触人， [我们友善的管理人员](/about) 也可以帮助你。
 
-          - 出于安全原因，我们临时限制了新用户能做的事。随着我们对你的了解，你将获得新能力（和[徽章](/badges)）。
+          - 出于安全考虑，我们暂时限制新用户的功能。当我们了解你的时候，你会获得新的能力 (和 [徽章](/badges))。
 
-          - 我们一直相信[文明的讨论行为](/guidelines)。
+          - 我们始终相信[文明 社区 行为](/guidelines)。
       onebox:
         instructions: |-
           接下来，你能分享下列链接给我么？回复**单独一行的链接**，然后它会自动展开显示一个有用的摘要。
@@ -161,8 +161,6 @@ zh_CN:
           - https://en.wikipedia.org/wiki/Inherently_funny_word
           - https://en.wikipedia.org/wiki/Death_by_coconut
           - https://en.wikipedia.org/wiki/Calculator_spelling
-        reply: |-
-          酷！这对大多数链接都有用。记住，链接必须要**占一行**，前后都没东西。
         not_found: |-
           抱歉，我没在你的回复中找到链接！ :cry:
 
@@ -170,14 +168,6 @@ zh_CN:
 
           - https://en.wikipedia.org/wiki/Exotic_Shorthair
       images:
-        instructions: |-
-          这是一只独角兽的照片：
-
-          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
-
-          如果你喜欢它（谁不呢！），在帖子的下方赞 :heart: 一下，这样我就知道你喜欢它了。
-
-          你可以**用图片回复**吗？任何图片都行！拖进来后释放，点击上传按钮，或者复制粘贴都行。
         reply: |-
           好赞的图片—我点了赞 :heart: ，你知道我很乐意看见它的 :heart_eyes:
         like_not_found: |-
@@ -222,22 +212,12 @@ zh_CN:
           选择我帖子中的任何文字都会弹出<kbd>**引用**</kbd>按钮。然后选中文字的同时按下**回复**按钮也可以！你可以再试一次吗？
       bookmark:
         instructions: |-
-          如果你想到了解更多，选择下方的<img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16">和**收藏这个私信**<img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16">。如果你做了，未来你可能收到一份 :gift: ！
+          如果你想了解更多，请选择下方<img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16">并<img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16">**收藏此私信**。如果你这样做， 未来你可能会有 :gift: ！
         reply: |-
           太棒了！现在你可以轻松地找到我们的私信了。它就在[你个人页面的收藏栏](%{profile_page_url}/activity/bookmarks)中。选择右上方你的个人头像  &#8599;
-        not_found: "啊哦，我没有在这个主题中看到任何收藏。\b你在每个帖子下找到了收藏吗？如果需要的话，使用显示更多<img src=\"%{base_uri}/images/font-awesome-ellipsis.png\" width=\"16\" height=\"16\">展开更多操作。"
       emoji:
-        instructions: |-
-          你可能看到我在回复中用了些小图片 :blue_car::dash: 他们叫[Emoji](https://zh.wikipedia.org/wiki/Emoji)。你能在你的回复中**添加Emoji**吗？以下任意一个都可以：
-
-          - 输入 `:) ;) :D :P :O`
-
-          - 输入半角冒号 <kbd>:</kbd> 然后是 emoji 的名字 `:tada:`
-
-          - 在编辑器中按下 emoji 按钮 <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16">，或者用你移动端的键盘
         reply: |-
           这是 :sparkles: **Emoji 精神!** :sparkles:
-        not_found: "啊，我没有在你的回复中看到任何 Emoji？\b哦不！ :sob:\n\n试试输入一个半角冒号<kbd>:</kbd>打开 emoji 选择器，然后输入你想要的几个字母，比如 `:bird`。\n\n或者，点击你编辑器里的 emoji 按钮<img src=\"%{base_uri}/images/font-awesome-smile.png\" width=\"16\" height=\"16\">。\n\n（如果你正在用移动设备，你也可以试试直接在你的键盘里输入 Emoji）"
       mention:
         instructions: |-
           有时你可能想要在回复别人的时候提醒另一个人。输入`@`然后是他们的用户名提及他们。
@@ -250,24 +230,9 @@ zh_CN:
 
           （是的，我的用户名是**disco**，和 1970 年流行的舞蹈同名）
       flag:
-        instructions: |-
-          我们都喜欢友善的讨论，我们也需要你的帮助[一起保持文明](%{guidelines_url})。如果你看到了某些问题，请用标记让作者知道，或者让[我们友善的管理人员](%{about_url})来处理。
-
-          >  :imp: 我在这写了些脏话
-
-          我猜你知道要做什么了。点击**标记该贴**<img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">然后标记其为不合适的！
         reply: |-
           [我们的管理人员](/groups/staff)将会私下里通知关于你标记的后续。如果许多社区成员标记了帖子，出于谨慎，帖子将自动被隐藏。（我没有真的写很糟糕的帖子 :angel:，我先把这个标记删除了）
-        not_found: |-
-          啊不，我糟糕的帖子还没被标记。 :worried: 你能用**标记**<img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">标记其为不合适的吗？不要忘记每个帖子后都有显示更多<img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16">按钮，这样你能看到更多操作。
       search:
-        instructions: "呼…我已经隐藏了这个主题中的一个惊喜。如果你想挑战的话，点击右上角&#8599;的**搜索按钮** <img src=\"%{base_uri}/images/font-awesome-search.png\" width=\"16\" height=\"16\"> 来搜索。\n\n试试搜索\x1D在这个主题中搜索关键词“capy&#8203;bara”"
-        hidden_message: |-
-          你找到这个 capybara 啦 :wink:
-
-          <img src="%{base_uri}/images/capybara-eating.gif"/>
-
-          你注意到你回到了主题开头么？**回复`:herb:` 这个 emoji**给这帖，你会自动跳转到结尾。
         reply: |-
           你找到啦 :tada:
 
@@ -276,8 +241,6 @@ zh_CN:
           - 想在长讨论中任意跳转的话，试试右侧（移动端在下方）的主题时间线控制器。
 
           - 如果你有 :keyboard:，按下<kbd>?</kbd>查看有用的键盘快捷键列表。
-        not_found: |-
-          哈...看起来你碰到了些问题。抱歉。你搜索过<img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16">**capy&#8203;bara**了吗？
       end:
         message: |-
           感谢你@%{username}一直和我相处！我给你准备了一个东西，这是你应得的：
@@ -301,34 +264,17 @@ zh_CN:
           每个人都会犯错。但是不要担心，你永远可以编辑你的帖子修正他们！
 
           你可以开始**编辑**我替你创建的帖子么？
-        not_found: |-
-          看起来你还没有编辑我为你创建的[帖子](%{url})。你能再试试么？
-
-          试试<img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16">图标来召唤编辑器。
         reply: |-
           干得漂亮！
 
           注意下，你初次编辑后 5 分钟后的修改将会公开显示，一个小小的铅笔图标将出现在编辑次数的右上角。
       delete:
-        instructions: |-
-          如果你想要撤回你的帖子，你可以删除它。
-
-
-          前往并**删除**你的任意一个帖子。不过不要删除你的第一帖！
-        not_found: |-
-          我没有看到你删除了任何一帖。记住点击<img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16">显示更多按钮后你可以看到<img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16">删除按钮。
         reply: |-
           哇！ :boom:
 
           为了讨论的连贯性，删除不会立即发生，所以帖子将在之后移除。
       recover:
         deleted_post_raw: '为什么@%{discobot_username}删除了我的帖子？:anguished:'
-        instructions: |-
-          哦不！看起来我不小心删除了我给你创建的帖子。
-
-          你可以帮我<img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16">**恢复**它么？
-        not_found: |-
-          碰到麻烦了？记住点击<img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16">显示更多按钮后你可以看到<img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16">恢复按钮。
         reply: |-
           呼，差点啊！感谢你帮忙 :wink:
 
@@ -350,19 +296,6 @@ zh_CN:
 
           注意当你回复主题时，或者花了几分钟读了一个主题，它将被自动设为“追踪”。你可以在[你的用户设置](/my/preferences)中修改。
       poll:
-        instructions: |-
-          你知道你可以在任何帖子中添加投票吗？试试编辑器中的<img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16">齿轮图标**设置投票**。
-        not_found: |-
-          啊哦！你的回复中没有任何投票。
-
-          使用编辑器中的<img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16">齿轮图标或者复制以下投票：
-
-          ```text
-          [poll]
-          * :cat:
-          * :dog:
-          [/poll]
-          ```
         reply: |-
           棒！你看我是怎么教你的？
 
@@ -371,20 +304,6 @@ zh_CN:
           * :-1:
           [/poll]
       details:
-        instructions: |-
-          有时你可能想要**隐藏**你回复中的细节：
-
-          - 当你讨论电影或者电视剧剧情的时候，这有可能剧透。
-
-          - 当你帖子中有大量可选的内容，一次读完可能太困难了。
-
-          [details=点击它看看！]
-          1. 选择编辑器中的<img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16">齿轮图标。
-          2. 选择“隐藏详情”。
-          3. 编辑详情信息并增加内容。
-          [/details]
-
-          你可以用编辑器中的<img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16">齿轮图标并在下次回复中添加详情一栏。
         not_found: |-
           添加详情控件时碰到麻烦了？试试在下个回复中包含下列文字：
 
diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
index c81ac87fc4a..e9ce7b2dd6a 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
@@ -4,12 +4,18 @@ user = User.find_by(id: -2)
 if !user
   suggested_username = UserNameSuggester.suggest(discobot_username)
 
+  UserEmail.seed do |ue|
+    ue.id = -2
+    ue.email = "discobot_email"
+    ue.primary = true
+    ue.user_id = -2
+  end
+
   User.seed do |u|
     u.id = -2
     u.name = discobot_username
     u.username = suggested_username
     u.username_lower = suggested_username.downcase
-    u.email = "discobot_email"
     u.password = SecureRandom.hex
     u.active = true
     u.approved = true
@@ -18,11 +24,15 @@ if !user
 
   # TODO Pull the user avatar from that thread for now. In the future, pull it from a local file or from some central discobot repo.
   if !Rails.env.test?
-    UserAvatar.import_url_for_user(
-      "https://cdn.discourse.org/dev/uploads/default/original/2X/e/edb63d57a720838a7ce6a68f02ba4618787f2299.png",
-      User.find(-2),
-      override_gravatar: true
-    )
+    begin
+      UserAvatar.import_url_for_user(
+        "https://cdn.discourse.org/dev/uploads/default/original/2X/e/edb63d57a720838a7ce6a68f02ba4618787f2299.png",
+        User.find(-2),
+        override_gravatar: true
+      )
+    rescue
+      # In case the avatar can't be downloaded, don't fail seed
+    end
   end
 end
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
index 321362c765a..d8b6c47b1aa 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/actions.rb
@@ -1,24 +1,32 @@
 module DiscourseNarrativeBot
   module Actions
+    TIMEOUT_DURATION = 900 # 15 mins
+
     def discobot_user
       @discobot ||= User.find(-2)
     end
 
     private
 
-    def reply_to(post, raw, opts = {})
+    def reply_to(post, raw, opts = {}, post_alert_options = {})
+      defaut_post_alert_opts = { skip_send_email: true }.merge(post_alert_options)
+
       if post
         default_opts = {
           raw: raw,
           topic_id: post.topic_id,
-          reply_to_post_number: post.post_number
+          reply_to_post_number: post.post_number,
+          post_alert_options: defaut_post_alert_opts
         }
 
         new_post = PostCreator.create!(self.discobot_user, default_opts.merge(opts))
         reset_rate_limits(post) if new_post
         new_post
       else
-        PostCreator.create!(self.discobot_user, { raw: raw }.merge(opts))
+        PostCreator.create!(self.discobot_user, {
+          post_alert_options: defaut_post_alert_opts,
+          raw: raw
+        }.merge(opts))
       end
     end
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
index d20566af6b2..fb6b4e2e14a 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
@@ -74,7 +74,7 @@ module DiscourseNarrativeBot
           action: :reply_to_topic_notification_level_changed
         },
         reply: {
-          next_state: :tutorial_notification_level,
+          next_state: :tutorial_change_topic_notification_level,
           action: :missing_topic_notification_level_change
         }
       },
@@ -144,7 +144,23 @@ module DiscourseNarrativeBot
       })
 
       set_state_data(:post_id, post.id)
-      PostDestroyer.new(@user, post, skip_bot: true).destroy
+
+      opts = { skip_bot: true }
+
+      if SiteSetting.delete_removed_posts_after < 1
+        opts[:delete_removed_posts_after] = 1
+
+        # Flag it and defer so the stub doesn't get destroyed
+        flag = PostAction.create!(
+          user: self.discobot_user,
+          post: post, post_action_type_id:
+          PostActionType.types[:off_topic]
+        )
+
+        PostAction.defer_flags!(post, self.discobot_user)
+      end
+
+      PostDestroyer.new(@user, post, opts).destroy
     end
 
     def start_advanced_track
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
index ee4205cebe0..e00cf5eb2f0 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
@@ -2,8 +2,6 @@ module DiscourseNarrativeBot
   class Base
     include Actions
 
-    TIMEOUT_DURATION = 900 # 15 mins
-
     class InvalidTransitionError < StandardError; end
 
     def input(input, user, post: nil, topic_id: nil, skip: false)
@@ -21,6 +19,21 @@ module DiscourseNarrativeBot
 
         begin
           opts = transition
+
+          loop do
+            next_state = opts[:next_state]
+
+            break if next_state == :end
+
+            next_opts = self.class::TRANSITION_TABLE.fetch(next_state)
+            prerequisite = next_opts[:prerequisite]
+
+            break if !prerequisite || instance_eval(&prerequisite)
+
+            [:next_state, :next_instructions].each do |key|
+              opts[key] = next_opts[key]
+            end
+          end
         rescue InvalidTransitionError
           # For given input, no transition for current state
           return
@@ -96,7 +109,7 @@ module DiscourseNarrativeBot
             skip_trigger: TrackSelector.skip_trigger,
             reset_trigger: "#{TrackSelector.reset_trigger} #{self.class.reset_trigger}"
           )
-        ))
+        ), {}, { skip_send_email: false })
       end
     end
 
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
index 03034915904..5308f6aa72b 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
@@ -464,7 +464,7 @@ module DiscourseNarrativeBot
             <clipPath id="clipCircle">
               <circle r="15" cx="15" cy="15"/>
             </clipPath>
-            <image clip-path="url(#clipCircle)" height="30px" width="30px" xlink:href="data:image/png;base64,#{Base64.strict_encode64(URI(avatar_url).open('rb', redirect: true, allow_redirections: :all).read)}"/>
+            <image clip-path="url(#clipCircle)" height="30px" width="30px" #{base64_image_link(avatar_url)}/>
           </g>
           <text x="#{width / 2}" y="240.94" text-anchor="middle" font-size="24" fill="#020403" font-family="Tangerine, Tangerine">
             #{name}
@@ -530,7 +530,7 @@ module DiscourseNarrativeBot
           <clipPath id="clipCircle">
             <circle r="19" cx="19" cy="19"/>
           </clipPath>
-          <image clip-path="url(#clipCircle)" height="38px" width="38px" xlink:href="data:image/png;base64,#{Base64.strict_encode64(URI(avatar_url).open('rb', redirect: true, allow_redirections: :all).read)}"/>
+          <image clip-path="url(#clipCircle)" height="38px" width="38px" #{base64_image_link(avatar_url)}/>
         </g>
         <text transform="matrix(1.0705 0 0 1 544.2073 388.3629)" fill="#020403" font-family="'Tangerine'" font-size="24.9219px">
           #{@discobot_user.username}
@@ -552,7 +552,7 @@ module DiscourseNarrativeBot
     private
 
       def name
-        (@user.name && !@user.name.blank? ? @user.name : @user.username).titleize
+        @user.username.titleize
       end
 
       def logo_group(size, width, height)
@@ -568,7 +568,7 @@ module DiscourseNarrativeBot
 
           <<~URL
           <g transform="translate(#{width / 2 - (size / 2)} #{height})">
-            <image height="#{size}px" width="#{size}px" xlink:href="data:image/png;base64,#{Base64.strict_encode64(logo_uri.open('rb', redirect: true, allow_redirections: :all).read)}"/>
+            <image height="#{size}px" width="#{size}px" #{base64_image_link(logo_uri)}/>
           </g>
           URL
         rescue URI::InvalidURIError
@@ -576,6 +576,20 @@ module DiscourseNarrativeBot
         end
       end
 
+      def base64_image_link(url)
+        if image = fetch_image(url)
+          "xlink:href=\"data:image/png;base64,#{Base64.strict_encode64(image)}\""
+        else
+          ""
+        end
+      end
+
+      def fetch_image(url)
+        URI(url).open('rb', redirect: true, allow_redirections: :all).read
+      rescue OpenURI::HTTPError
+        # Ignore if fetching image returns a non 200 response
+      end
+
       def avatar_url
         UrlHelper.absolute(Discourse.base_uri + @user.avatar_template.gsub('{size}', '250'))
       end
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index f39377d0766..76e5b2e6fe0 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -38,6 +38,7 @@ module DiscourseNarrativeBot
       },
 
       tutorial_emoji: {
+        prerequisite: Proc.new { SiteSetting.enable_emoji },
         next_state: :tutorial_mention,
         next_instructions: Proc.new {
           I18n.t("#{I18N_KEY}.mention.instructions",
@@ -184,7 +185,8 @@ module DiscourseNarrativeBot
       opts = {
         title: I18n.t("#{I18N_KEY}.hello.title", title: SiteSetting.title),
         target_usernames: @user.username,
-        archetype: Archetype.private_message
+        archetype: Archetype.private_message,
+        subtype: TopicSubtype.system_message,
       }
 
       if @post &&
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
index bd3d10b7456..7aa7449ff06 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/track_selector.rb
@@ -30,11 +30,11 @@ module DiscourseNarrativeBot
 
       if @post && @post.post_type == Post.types[:regular] && !is_topic_action?
         is_reply = @input == :reply
+        @is_pm_to_bot = pm_to_bot?(@post)
+
         return if is_reply && reset_track
 
-        topic_id = @post.topic_id
-
-        if (data && data[:topic_id] == topic_id)
+        if data && (data[:topic_id] == @post.topic_id) && @is_pm_to_bot
           state = data[:state]
           klass = (data[:track] || NewUserNarrative.to_s).constantize
 
@@ -58,7 +58,7 @@ module DiscourseNarrativeBot
           else
             klass.new.input(@input, @user, post: @post, skip: skip_track?)
           end
-        elsif is_reply && (pm_to_bot?(@post) || public_reply?)
+        elsif is_reply && (@is_pm_to_bot || public_reply?)
           like_user_post
           bot_commands
         end
@@ -116,7 +116,7 @@ module DiscourseNarrativeBot
       post_raw = @post.raw
       trigger = "#{self.class.reset_trigger} #{klass.reset_trigger}"
 
-      if post_raw.length < RESET_TRIGGER_EXACT_MATCH_LENGTH && pm_to_bot?(@post)
+      if post_raw.length < RESET_TRIGGER_EXACT_MATCH_LENGTH && @is_pm_to_bot
         post_raw.match(Regexp.new("\\b\\W\?#{trigger}\\W\?\\b", 'i'))
       else
         match_trigger?(trigger)
@@ -215,7 +215,7 @@ module DiscourseNarrativeBot
     end
 
     def skip_track?
-      if pm_to_bot?(@post)
+      if @is_pm_to_bot
         post_raw = @post.raw
 
         post_raw.match(/^@#{self.discobot_user.username} #{self.class.skip_trigger}/i) ||
@@ -230,7 +230,7 @@ module DiscourseNarrativeBot
       regexp = Regexp.new("<a class=\"mention\".*>@#{discobot_username}</a> #{trigger}", 'i')
       match = @post.cooked.match(regexp)
 
-      if pm_to_bot?(@post)
+      if @is_pm_to_bot
         match || @post.raw.strip.match(Regexp.new("^#{trigger}$", 'i'))
       else
         match
@@ -245,17 +245,17 @@ module DiscourseNarrativeBot
 
     def bot_mentioned?
       @bot_mentioned ||= PostAnalyzer.new(@post.raw, @post.topic_id).raw_mentions.include?(
-        self.discobot_user.username
+        self.discobot_user.username_lower
       )
     end
 
     def public_reply?
       !SiteSetting.discourse_narrative_bot_disable_public_replies &&
-        (bot_mentioned? || reply_to_bot_post?(@post))
+        (reply_to_bot_post?(@post) || bot_mentioned?)
     end
 
     def terminate_track(data)
-      Store.set(@user.id, data.merge!(state: nil, topic_id: nil))
+      Store.set(@user.id, data.merge!(track: nil, state: nil, topic_id: nil))
       cancel_timeout_job(@user)
     end
   end
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index 7c951dbd90f..adc514e29c4 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -2,6 +2,7 @@
 # about: Introduces staff to Discourse
 # version: 0.0.1
 # authors: Nick Sahler (@nicksahler)
+# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-narrative-bot
 
 enabled_site_setting :discourse_narrative_bot_enabled
 
@@ -147,7 +148,6 @@ after_initialize do
     SiteSetting.discourse_narrative_bot_enabled &&
       self.id > 0 &&
       !self.anonymous? &&
-      !self.user_option.mailing_list_mode &&
       !self.staged &&
       !SiteSetting.discourse_narrative_bot_ignored_usernames.split('|'.freeze).include?(self.username)
   end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
index eff130184a7..a3dd4e826ca 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
@@ -303,6 +303,30 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         )
       end
 
+      describe 'when posts are configured to be deleted immediately' do
+        before do
+          SiteSetting.delete_removed_posts_after = 0
+        end
+
+        it 'should set up the tutorial correctly' do
+          narrative.set_data(user,
+            state: :tutorial_delete,
+            topic_id: topic.id,
+            track: described_class.to_s
+          )
+
+          PostDestroyer.new(user, post).destroy
+
+          post = Post.last
+
+          expect(post.raw).to eq(I18n.t('js.post.deleted_by_author', count: 1))
+
+          PostDestroyer.destroy_stubs
+
+          expect(post.reload).to be_present
+        end
+      end
+
       describe 'when user replies to the topic' do
         it 'should create the right reply' do
           narrative.set_data(user, narrative.get_data(user).merge(
@@ -324,7 +348,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         describe 'when reply contains the skip trigger' do
           it 'should create the right reply' do
             parent_category = Fabricate(:category, name: 'a')
-            category = Fabricate(:category, parent_category: parent_category, name: 'b')
+            _category = Fabricate(:category, parent_category: parent_category, name: 'b')
 
             post.update!(raw: skip_trigger)
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
@@ -358,7 +382,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
       describe 'when user recovers a post in the right topic' do
         it 'should create the right reply' do
           parent_category = Fabricate(:category, name: 'a')
-          category = Fabricate(:category, parent_category: parent_category, name: 'b')
+          _category = Fabricate(:category, parent_category: parent_category, name: 'b')
           post
 
           PostDestroyer.new(user, post).destroy
@@ -628,7 +652,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
       end
 
       it 'should create the right reply' do
-        post.update!(raw: "[details=\"This is a test\"]wooohoo[/details]")
+        post.update!(raw: "[details=\"This is a test\"]\nwooohoo\n[/details]")
         narrative.input(:reply, user, post: post)
 
         expect(Post.offset(1).last.raw).to eq(I18n.t(
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index 8b82c367d8a..b234519ed9f 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -37,6 +37,9 @@ describe DiscourseNarrativeBot::NewUserNarrative do
     end
 
     it 'should create the right message' do
+      NotificationEmailer.enable
+      NotificationEmailer.expects(:process_notification).once
+
       expect { narrative.notify_timeout(user) }.to change { Post.count }.by(1)
 
       expect(Post.last.raw).to eq(I18n.t(
@@ -299,23 +302,47 @@ describe DiscourseNarrativeBot::NewUserNarrative do
             expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_emoji)
           end
         end
-      end
 
-      it 'should create the right reply' do
-        post.update!(raw: 'https://en.wikipedia.org/wiki/ROT13')
+        describe 'when emoji is disabled' do
+          before do
+            SiteSetting.enable_emoji = false
+          end
 
-        narrative.expects(:enqueue_timeout_job).with(user)
-        narrative.input(:reply, user, post: post)
-        new_post = Post.last
+          it 'should create the right reply' do
+            post.update!(raw: 'https://en.wikipedia.org/wiki/ROT13')
 
-        expected_raw = <<~RAW
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.reply', base_uri: '')}
+            narrative.input(:reply, user, post: post)
+            new_post = Post.last
 
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.emoji.instructions', base_uri: '')}
-        RAW
+            expected_raw = <<~RAW
+              #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.reply', base_uri: '')}
 
-        expect(new_post.raw).to eq(expected_raw.chomp)
-        expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_emoji)
+              #{I18n.t('discourse_narrative_bot.new_user_narrative.mention.instructions',
+                discobot_username: discobot_user.username, base_uri: ''
+              )}
+            RAW
+
+            expect(new_post.raw).to eq(expected_raw.chomp)
+            expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_mention)
+          end
+        end
+
+        it 'should create the right reply' do
+          post.update!(raw: 'https://en.wikipedia.org/wiki/ROT13')
+
+          narrative.expects(:enqueue_timeout_job).with(user)
+          narrative.input(:reply, user, post: post)
+          new_post = Post.last
+
+          expected_raw = <<~RAW
+            #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.reply', base_uri: '')}
+
+            #{I18n.t('discourse_narrative_bot.new_user_narrative.emoji.instructions', base_uri: '')}
+          RAW
+
+          expect(new_post.raw).to eq(expected_raw.chomp)
+          expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_emoji)
+        end
       end
     end
 
@@ -582,25 +609,25 @@ describe DiscourseNarrativeBot::NewUserNarrative do
             expect(new_post.raw).to include("/forum/images")
           end
         end
-      end
 
-      it 'should create the right reply' do
-        post.update!(
-          raw: '[quote="#{post.user}, post:#{post.post_number}, topic:#{topic.id}"]\n:monkey: :fries:\n[/quote]'
-        )
+        it 'should create the right reply' do
+          post.update!(
+            raw: "[quote=\"#{post.user}, post:#{post.post_number}, topic:#{topic.id}\"]\n:monkey: :fries:\n[/quote]"
+          )
 
-        narrative.expects(:enqueue_timeout_job).with(user)
-        narrative.input(:reply, user, post: post)
-        new_post = Post.last
+          narrative.expects(:enqueue_timeout_job).with(user)
+          narrative.input(:reply, user, post: post)
+          new_post = Post.last
 
-        expected_raw = <<~RAW
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.quoting.reply', base_uri: '')}
+          expected_raw = <<~RAW
+            #{I18n.t('discourse_narrative_bot.new_user_narrative.quoting.reply', base_uri: '')}
 
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.images.instructions', base_uri: '')}
-        RAW
+            #{I18n.t('discourse_narrative_bot.new_user_narrative.images.instructions', base_uri: '')}
+          RAW
 
-        expect(new_post.raw).to eq(expected_raw.chomp)
-        expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_images)
+          expect(new_post.raw).to eq(expected_raw.chomp)
+          expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_images)
+        end
       end
     end
 
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
index 9e721e0b47d..b6166ccfcfe 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
@@ -102,6 +102,24 @@ describe DiscourseNarrativeBot::TrackSelector do
 
             expect(Post.last.raw).to eq(expected_raw.chomp)
           end
+
+          it 'should not enqueue any user email' do
+            NotificationEmailer.enable
+            user.user_option.update!(email_always: true)
+
+            post.update!(
+              raw: 'show me what you can do',
+              reply_to_post_number: first_post.post_number
+            )
+
+            NotificationEmailer.expects(:process_notification).never
+
+            described_class.new(:reply, user, post_id: post.id).select
+
+            expect(Post.last.raw).to eq(I18n.t(
+              "discourse_narrative_bot.new_user_narrative.formatting.not_found"
+            ))
+          end
         end
 
         context 'when a non regular post is created' do
@@ -188,6 +206,19 @@ describe DiscourseNarrativeBot::TrackSelector do
             end
           end
         end
+
+        context 'when a new user is added into the topic' do
+          before do
+            topic.allowed_users << Fabricate(:user)
+          end
+
+          it 'should stop the new user track' do
+            post
+
+            expect { described_class.new(:reply, user, post_id: post.id).select }
+              .to_not change { Post.count }
+          end
+        end
       end
 
       context 'at the end of a tutorial track' do
@@ -414,6 +445,16 @@ describe DiscourseNarrativeBot::TrackSelector do
           expect(new_post.raw).to eq(random_mention_reply)
         end
 
+        it "should be case insensitive towards discobot's username" do
+          discobot_user.update!(username: 'DisCoBot')
+
+          post.update!(raw: 'Show me what you can do @discobot')
+          described_class.new(:reply, user, post_id: post.id).select
+          new_post = Post.last
+          expect(new_post.raw).to eq(random_mention_reply)
+        end
+
+
         describe 'rate limiting random reply message in public topic' do
           let(:topic) { Fabricate(:topic) }
           let(:other_post) { Fabricate(:post, raw: '@discobot show me something', topic: topic) }
@@ -521,7 +562,7 @@ describe DiscourseNarrativeBot::TrackSelector do
           describe 'when roll dice command is present inside a quote' do
             it 'should ignore the command' do
               user
-              post.update!(raw: '[quote="Donkey, post:6, topic:1"]@discobot roll 2d1[/quote]')
+              post.update!(raw: "[quote=\"Donkey, post:6, topic:1\"]\n@discobot roll 2d1\n[/quote]")
 
               expect { described_class.new(:reply, user, post_id: post.id).select }
                 .to_not change { Post.count }
@@ -558,7 +599,7 @@ describe DiscourseNarrativeBot::TrackSelector do
           describe 'when quote command is present inside a onebox or quote' do
             it 'should ignore the command' do
               user
-              post.update!(raw: '[quote="Donkey, post:6, topic:1"]@discobot quote[/quote]')
+              post.update!(raw: "[quote=\"Donkey, post:6, topic:1\"]\n@discobot quote\n[/quote]")
 
               expect { described_class.new(:reply, user, post_id: post.id).select }
                 .to_not change { Post.count }
diff --git a/plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb b/plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb
index d47ea393266..ae21103119a 100644
--- a/plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/integration/discobot_welcome_post_spec.rb
@@ -48,20 +48,5 @@ describe "Discobot welcome post" do
       end
     end
 
-    context 'when user redeems a disposable invite' do
-      it 'should delay the welcome post until the user logs in' do
-        token = Invite.generate_disposable_tokens(user).first
-
-        expect do
-          xhr :get, "/invites/redeem/#{token}",
-            email: 'testing@gmail.com',
-            username: 'somename',
-            name: 'testing',
-            password: 'asodaasdaosdhq'
-        end.to change { User.count }.by(1)
-
-        expect(Jobs::NarrativeInit.jobs.first["args"].first["user_id"]).to eq(User.last.id)
-      end
-    end
   end
 end
diff --git a/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb b/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb
index 355a51e6d83..8381fd3364d 100644
--- a/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/jobs/onceoff/grant_badges_spec.rb
@@ -16,10 +16,10 @@ RSpec.describe Jobs::DiscourseNarrativeBot::GrantBadges do
 
     expect(user.badges.count).to eq(2)
 
-    expect(user.badges.map(&:name)).to eq([
+    expect(user.badges.map(&:name)).to contain_exactly(
       DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME,
       DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME,
-    ])
+    )
 
     expect(other_user.badges.count).to eq(0)
   end
diff --git a/plugins/discourse-narrative-bot/spec/user_spec.rb b/plugins/discourse-narrative-bot/spec/user_spec.rb
index 326631fc654..86dde81499c 100644
--- a/plugins/discourse-narrative-bot/spec/user_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/user_spec.rb
@@ -10,6 +10,8 @@ describe User do
 
   describe 'when a user is created' do
     it 'should initiate the bot' do
+      NotificationEmailer.expects(:process_notification).never
+
       user
 
       expected_raw = I18n.t('discourse_narrative_bot.new_user_narrative.hello.message',
diff --git a/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb b/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb
index de23062c43b..79cac5163ad 100644
--- a/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb
+++ b/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb
@@ -3,12 +3,12 @@ class LogAnalyzer
   class LineParser
 
 
-    # log_format log_discourse '[$time_local] $remote_addr "$request" "$http_user_agent" "$sent_http_x_discourse_route" $status $bytes_sent "$http_referer" $upstream_response_time $request_time "$sent_http_x_discourse_username"';
+    # log_format log_discourse '[$time_local] "$http_host" $remote_addr "$request" "$http_user_agent" "$sent_http_x_discourse_route" $status $bytes_sent "$http_referer" $upstream_response_time $request_time "$sent_http_x_discourse_username"';
 
     attr_accessor :time, :ip_address, :url, :route, :user_agent, :rails_duration, :total_duration,
                   :username, :status, :bytes_sent, :referer
 
-    PATTERN = /\[(.*)\] (\S+) \"(.*)\" \"(.*)\" \"(.*)\" ([0-9]+) ([0-9]+) \"(.*)\" ([0-9.]+) ([0-9.]+) "(.*)"/
+    PATTERN = /\[(.*)\](?: ".*")? (\S+) \"(.*)\" \"(.*)\" \"(.*)\" ([0-9]+) ([0-9]+) \"(.*)\" ([0-9.]+) ([0-9.]+) "(.*)"/
 
     TIME_FORMAT = "%d/%b/%Y:%H:%M:%S %Z"
 
diff --git a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
index 66fbb764047..c2b0a287235 100644
--- a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
@@ -6,8 +6,7 @@ function initializePollUIBuilder(api) {
 
   if (!siteSettings.poll_enabled && (api.getCurrentUser() && !api.getCurrentUser().staff)) return;
 
-  const ComposerController = api.container.lookupFactory("controller:composer");
-  ComposerController.reopen({
+  api.modifyClass('controller:composer', {
     actions: {
       showPollBuilder() {
         showModal("poll-ui-builder").set("toolbarEvent", this.get("toolbarEvent"));
@@ -28,6 +27,6 @@ export default {
   name: "add-poll-ui-builder",
 
   initialize() {
-    withPluginApi('0.5', initializePollUIBuilder);
+    withPluginApi('0.8.7', initializePollUIBuilder);
   }
 };
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
index 9fa2577af64..0138c6f99fa 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -6,8 +6,7 @@ import WidgetGlue from 'discourse/widgets/glue';
 function initializePolls(api) {
   const register = getRegister(api);
 
-  const TopicController = api.container.lookupFactory('controller:topic');
-  TopicController.reopen({
+  api.modifyClass('controller:topic', {
     subscribe(){
       this._super();
       this.messageBus.subscribe("/polls/" + this.get("model.id"), msg => {
@@ -23,8 +22,7 @@ function initializePolls(api) {
     }
   });
 
-  const Post = api.container.lookupFactory('model:post');
-  Post.reopen({
+  api.modifyClass('model:post', {
     _polls: null,
     pollsObject: null,
 
@@ -95,6 +93,6 @@ export default {
   name: "extend-for-poll",
 
   initialize() {
-    withPluginApi('0.1', initializePolls);
+    withPluginApi('0.8.7', initializePolls);
   }
 };
diff --git a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6 b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
index 7458f2aa9cd..1a4ee5060ce 100644
--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
@@ -1,18 +1,292 @@
 /*eslint no-bitwise:0 */
-import { registerOption } from 'pretty-text/pretty-text';
 
 const DATA_PREFIX = "data-poll-";
 const DEFAULT_POLL_NAME = "poll";
 const WHITELISTED_ATTRIBUTES = ["type", "name", "min", "max", "step", "order", "status", "public"];
-const ATTRIBUTES_REGEX = new RegExp("(" + WHITELISTED_ATTRIBUTES.join("|") + ")=['\"]?[^\\s\\]]+['\"]?", "g");
 
-registerOption((siteSettings, opts) => {
-  const currentUser = (opts.getCurrentUser && opts.getCurrentUser(opts.userId)) || opts.currentUser;
-  const staff = currentUser && currentUser.staff;
+function getHelpText(count, min, max) {
 
-  opts.features.poll = !!siteSettings.poll_enabled || staff;
-  opts.pollMaximumOptions = siteSettings.poll_maximum_options;
-});
+  // default values
+  if (isNaN(min) || min < 1) { min = 1; }
+  if (isNaN(max) || max > count) { max = count; }
+
+  // add some help text
+  let help;
+
+  if (max > 0) {
+    if (min === max) {
+      if (min > 1) {
+        help = I18n.t("poll.multiple.help.x_options", { count: min });
+      }
+    } else if (min > 1) {
+      if (max < count) {
+        help = I18n.t("poll.multiple.help.between_min_and_max_options", { min: min, max: max });
+      } else {
+        help = I18n.t("poll.multiple.help.at_least_min_options", { count: min });
+      }
+    } else if (max <= count) {
+      help = I18n.t("poll.multiple.help.up_to_max_options", { count: max });
+    }
+  }
+
+  return help;
+}
+
+function replaceToken(tokens, target, list) {
+  let pos = tokens.indexOf(target);
+  let level = tokens[pos].level;
+
+  tokens.splice(pos, 1, ...list);
+  list[0].map = target.map;
+
+  // resequence levels
+  for(;pos<tokens.length;pos++) {
+    let nesting = tokens[pos].nesting;
+    if (nesting < 0) { level--; }
+    tokens[pos].level = level;
+    if (nesting > 0) { level++; }
+  }
+}
+
+// analyzes the block to that we have poll options
+function getListItems(tokens, startToken) {
+
+  let i = tokens.length-1;
+  let listItems = [];
+  let buffer = [];
+
+  for(;tokens[i]!==startToken;i--) {
+    if (i === 0) {
+      return;
+    }
+
+    let token = tokens[i];
+    if (token.level === 0) {
+      if (token.tag !== 'ol' && token.tag !== 'ul') {
+        return;
+      }
+    }
+
+    if (token.level === 1 && token.nesting === 1) {
+      if (token.tag === 'li') {
+        listItems.push([token, buffer.reverse().join(' ')]);
+      } else {
+        return;
+      }
+    }
+
+    if (token.level === 1 && token.nesting === 1 && token.tag === 'li') {
+      buffer = [];
+    } else {
+      if (token.type === 'text' || token.type === 'inline') {
+        buffer.push(token.content);
+      }
+    }
+  }
+
+  return listItems.reverse();
+}
+
+function invalidPoll(state, tag) {
+  let token = state.push('text', '', 0);
+  token.content = '[/' + tag + ']';
+}
+
+const rule = {
+  tag: 'poll',
+
+  before: function(state, tagInfo, raw){
+    let token = state.push('text', '', 0);
+    token.content = raw;
+    token.bbcode_attrs = tagInfo.attrs;
+    token.bbcode_type = 'poll_open';
+  },
+
+  after: function(state, openToken, raw) {
+
+    let items = getListItems(state.tokens, openToken);
+    if (!items) {
+      return invalidPoll(state, raw);
+    }
+
+    const attrs = openToken.bbcode_attrs;
+
+    // default poll attributes
+    const attributes = [["class", "poll"]];
+
+    if (!attrs['status']) {
+      attributes.push([DATA_PREFIX + "status", "open"]);
+    }
+
+    WHITELISTED_ATTRIBUTES.forEach(name => {
+      if (attrs[name]) {
+        attributes.push([DATA_PREFIX + name, attrs[name]]);
+      }
+    });
+
+    if (!attrs.name) {
+      attributes.push([DATA_PREFIX + "name", DEFAULT_POLL_NAME]);
+    }
+
+    // we might need these values later...
+    let min = parseInt(attrs["min"], 10);
+    let max = parseInt(attrs["max"], 10);
+    let step = parseInt(attrs["step"], 10);
+
+    let header = [];
+
+    let token = new state.Token('poll_open', 'div', 1);
+    token.block = true;
+    token.attrs = attributes;
+    header.push(token);
+
+    token = new state.Token('poll_open', 'div', 1);
+    token.block = true;
+    header.push(token);
+
+    token = new state.Token('poll_open', 'div', 1);
+    token.attrs = [['class', 'poll-container']];
+
+    header.push(token);
+
+    // generate the options when the type is "number"
+    if (attrs["type"] === "number") {
+      // default values
+      if (isNaN(min)) { min = 1; }
+      if (isNaN(max)) { max = state.md.options.discourse.pollMaximumOptions; }
+      if (isNaN(step)) { step = 1; }
+
+      if (items.length > 0) {
+        return invalidPoll(state, raw);
+      }
+
+      // dynamically generate options
+      token = new state.Token('bullet_list_open', 'ul', 1);
+      header.push(token);
+
+      for (let o = min; o <= max; o += step) {
+        token = new state.Token('list_item_open', 'li', 1);
+        items.push([token,  String(o)]);
+        header.push(token);
+
+        token = new state.Token('text', '', 0);
+        token.content = String(o);
+        header.push(token);
+
+        token = new state.Token('list_item_close', 'li', -1);
+        header.push(token);
+      }
+      token = new state.Token('bullet_item_close', '', -1);
+      header.push(token);
+    }
+
+    // flag items so we add hashes
+    for (let o = 0; o < items.length; o++) {
+      token = items[o][0];
+      let text = items[o][1];
+
+      token.attrs = token.attrs || [];
+      let md5Hash = md5(JSON.stringify([text]));
+      token.attrs.push([DATA_PREFIX + 'option-id', md5Hash]);
+    }
+
+    replaceToken(state.tokens, openToken, header);
+
+    // we got to correct the level on the state
+    // we just resequenced
+    state.level = state.tokens[state.tokens.length-1].level;
+
+    state.push('poll_close', 'div', -1);
+
+    token = state.push('poll_open', 'div', 1);
+    token.attrs = [['class', 'poll-info']];
+
+    state.push('paragraph_open', 'p', 1);
+
+    token = state.push('span_open', 'span', 1);
+    token.block = false;
+    token.attrs = [['class', 'info-number']];
+    token = state.push('text', '', 0);
+    token.content = '0';
+    state.push('span_close', 'span', -1);
+
+    token = state.push('span_open', 'span', 1);
+    token.block = false;
+    token.attrs = [['class', 'info-text']];
+    token = state.push('text', '', 0);
+    token.content = I18n.t("poll.voters", { count: 0 });
+    state.push('span_close', 'span', -1);
+
+    state.push('paragraph_close', 'p', -1);
+
+    // multiple help text
+    if (attributes[DATA_PREFIX + "type"] === "multiple") {
+      let help = getHelpText(items.length, min, max);
+      if (help) {
+        state.push('paragraph_open', 'p', 1);
+        token = state.push('html_inline', '', 0);
+        token.content = help;
+        state.push('paragraph_close', 'p', -1);
+      }
+    }
+
+    if (attributes[DATA_PREFIX + 'public'] === 'true') {
+      state.push('paragraph_open', 'p', 1);
+      token = state.push('text', '', 0);
+      token.content = I18n.t('poll.public.title');
+      state.push('paragraph_close', 'p', -1);
+    }
+
+    state.push('poll_close', 'div', -1);
+    state.push('poll_close', 'div', -1);
+
+    token = state.push('poll_open', 'div', 1);
+    token.attrs = [['class', 'poll-buttons']];
+
+    if (attributes[DATA_PREFIX + 'type'] === 'multiple') {
+      token = state.push('link_open', 'a', 1);
+      token.block = false;
+      token.attrs = [
+        ['class', 'button cast-votes'],
+        ['title', I18n.t('poll.cast-votes.title')]
+      ];
+
+      token = state.push('text', '', 0);
+      token.content = I18n.t('poll.cast-votes.label');
+
+      state.push('link_close', 'a', -1);
+    }
+
+    token = state.push('link_open', 'a', 1);
+    token.block = false;
+    token.attrs = [
+      ['class', 'button toggle-results'],
+      ['title', I18n.t('poll.show-results.title')]
+    ];
+
+    token = state.push('text', '', 0);
+    token.content = I18n.t("poll.show-results.label");
+
+    state.push('link_close', 'a', -1);
+
+    state.push('poll_close', 'div', -1);
+    state.push('poll_close', 'div', -1);
+  }
+};
+
+function newApiInit(helper) {
+  helper.registerOptions((opts, siteSettings) => {
+    const currentUser = (opts.getCurrentUser && opts.getCurrentUser(opts.userId)) || opts.currentUser;
+    const staff = currentUser && currentUser.staff;
+
+    opts.features.poll = !!siteSettings.poll_enabled || staff;
+    opts.pollMaximumOptions = siteSettings.poll_maximum_options;
+  });
+
+  helper.registerPlugin(md => {
+    md.block.bbcode.ruler.push('poll', rule);
+  });
+}
 
 export function setup(helper) {
   helper.whiteList([
@@ -28,155 +302,8 @@ export function setup(helper) {
     'li[data-*]'
   ]);
 
-  helper.replaceBlock({
-    start: /\[poll((?:\s+\w+=[^\s\]]+)*)\]([\s\S]*)/igm,
-    stop: /\[\/poll\]/igm,
+  newApiInit(helper);
 
-    emitter(blockContents, matches) {
-      const contents = [];
-
-      // post-process inside block contents
-      if (blockContents.length) {
-        const postProcess = bc => {
-          if (typeof bc === "string" || bc instanceof String) {
-            const processed = this.processInline(String(bc));
-            if (processed.length) {
-              contents.push(["p"].concat(processed));
-            }
-          } else {
-            contents.push(bc);
-          }
-        };
-
-        let b;
-        while ((b = blockContents.shift()) !== undefined) {
-          this.processBlock(b, blockContents).forEach(postProcess);
-        }
-      }
-
-      // default poll attributes
-      const attributes = { "class": "poll" };
-      attributes[DATA_PREFIX + "status"] = "open";
-      attributes[DATA_PREFIX + "name"] = DEFAULT_POLL_NAME;
-
-      // extract poll attributes
-      (matches[1].match(ATTRIBUTES_REGEX) || []).forEach(function(m) {
-        const [ name, value ] = m.split("=");
-        const escaped = helper.escape(value.replace(/["']/g, ""));
-        attributes[DATA_PREFIX + name] = escaped;
-      });
-
-      // we might need these values later...
-      let min = parseInt(attributes[DATA_PREFIX + "min"], 10);
-      let max = parseInt(attributes[DATA_PREFIX + "max"], 10);
-      let step = parseInt(attributes[DATA_PREFIX + "step"], 10);
-
-      // generate the options when the type is "number"
-      if (attributes[DATA_PREFIX + "type"] === "number") {
-        // default values
-        if (isNaN(min)) { min = 1; }
-        if (isNaN(max)) { max = helper.getOptions().pollMaximumOptions; }
-        if (isNaN(step)) { step = 1; }
-        // dynamically generate options
-        contents.push(["bulletlist"]);
-        for (let o = min; o <= max; o += step) {
-          contents[0].push(["listitem", String(o)]);
-        }
-      }
-
-      // make sure there's only 1 child and it's a list with at least 1 option
-      if (contents.length !== 1 || contents[0].length <= 1 || (contents[0][0] !== "numberlist" && contents[0][0] !== "bulletlist")) {
-        return ["div"].concat(contents);
-      }
-
-      // make sure there's only options in the list
-      for (let o=1; o < contents[0].length; o++) {
-        if (contents[0][o][0] !== "listitem") {
-          return ["div"].concat(contents);
-        }
-      }
-
-      // TODO: remove non whitelisted content
-
-      // add option id (hash)
-      for (let o = 1; o < contents[0].length; o++) {
-        const attr = {};
-        // compute md5 hash of the content of the option
-        attr[DATA_PREFIX + "option-id"] = md5(JSON.stringify(contents[0][o].slice(1)));
-        // store options attributes
-        contents[0][o].splice(1, 0, attr);
-      }
-
-      const result = ["div", attributes],
-      poll = ["div"];
-
-      // 1 - POLL CONTAINER
-      const container = ["div", { "class": "poll-container" }].concat(contents);
-      poll.push(container);
-
-      // 2 - POLL INFO
-      const info = ["div", { "class": "poll-info" }];
-
-      // # of voters
-      info.push(["p",
-        ["span", { "class": "info-number" }, "0"],
-        ["span", { "class": "info-text"}, I18n.t("poll.voters", { count: 0 })]
-      ]);
-
-      // multiple help text
-      if (attributes[DATA_PREFIX + "type"] === "multiple") {
-        const optionCount = contents[0].length - 1;
-
-        // default values
-        if (isNaN(min) || min < 1) { min = 1; }
-        if (isNaN(max) || max > optionCount) { max = optionCount; }
-
-        // add some help text
-        let help;
-
-        if (max > 0) {
-          if (min === max) {
-            if (min > 1) {
-              help = I18n.t("poll.multiple.help.x_options", { count: min });
-            }
-          } else if (min > 1) {
-            if (max < optionCount) {
-              help = I18n.t("poll.multiple.help.between_min_and_max_options", { min: min, max: max });
-            } else {
-              help = I18n.t("poll.multiple.help.at_least_min_options", { count: min });
-            }
-          } else if (max <= optionCount) {
-            help = I18n.t("poll.multiple.help.up_to_max_options", { count: max });
-          }
-        }
-
-        if (help) { info.push(["p", help]); }
-      }
-
-      if (attributes[DATA_PREFIX + "public"] === "true") {
-        info.push(["p", I18n.t("poll.public.title")]);
-      }
-
-      poll.push(info);
-
-      // 3 - BUTTONS
-      const buttons = ["div", { "class": "poll-buttons" }];
-
-      // add "cast-votes" button
-      if (attributes[DATA_PREFIX + "type"] === "multiple") {
-        buttons.push(["a", { "class": "button cast-votes", "title": I18n.t("poll.cast-votes.title") }, I18n.t("poll.cast-votes.label")]);
-      }
-
-      // add "toggle-results" button
-      buttons.push(["a", { "class": "button toggle-results", "title": I18n.t("poll.show-results.title") }, I18n.t("poll.show-results.label")]);
-
-      // 4 - MIX IT ALL UP
-      result.push(poll);
-      result.push(buttons);
-
-      return result;
-    }
-  });
 }
 
 /*!
diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml
index 7d96f76ebe8..d8999851434 100644
--- a/plugins/poll/config/locales/client.ar.yml
+++ b/plugins/poll/config/locales/client.ar.yml
@@ -74,6 +74,7 @@ ar:
         insert: أدرج التصويت
         help:
           options_count: أدخل خيارين على الأقل
+          invalid_values: يجب أن تكون القيمة الدّنيا أصغر من القيمة العليا.
         poll_type:
           label: النوع
           regular: اختيار من متعدد
diff --git a/plugins/poll/config/locales/client.el.yml b/plugins/poll/config/locales/client.el.yml
index a76d40e0900..cabd5f50d3e 100644
--- a/plugins/poll/config/locales/client.el.yml
+++ b/plugins/poll/config/locales/client.el.yml
@@ -54,6 +54,7 @@ el:
         insert: Εισαγωγή Ψηφοφορίας
         help:
           options_count: Εισάγετε τουλάχιστόν 2 επιλογές
+          invalid_values: Η ελάχιστη τιμή θα πρέπει να είναι μικρότερη από την μέγιστη τιμή.
         poll_type:
           label: Τύπος
           regular: Μία επιλογή
diff --git a/plugins/poll/config/locales/client.es.yml b/plugins/poll/config/locales/client.es.yml
index fa46fb0aa50..a2e2bc98c98 100644
--- a/plugins/poll/config/locales/client.es.yml
+++ b/plugins/poll/config/locales/client.es.yml
@@ -20,14 +20,14 @@ es:
       multiple:
         help:
           at_least_min_options:
-            one: "Escoge al menos <strong>1</strong> opción"
-            other: "Escoge al menos <strong>%{count}</strong> opciones"
+            one: "Elige al menos <strong>1</strong> opción"
+            other: "Elige al menos <strong>%{count}</strong> opciones"
           up_to_max_options:
-            one: "Escoge <strong>1</strong> opción"
-            other: "Escoge hasta <strong>%{count}</strong> opciones"
+            one: "Elige <strong>1</strong> opción"
+            other: "Elige hasta <strong>%{count}</strong> opciones"
           x_options:
-            one: "Escoge <strong>1</strong> opción"
-            other: "Escoge <strong>%{count}</strong> opciones"
+            one: "Elige <strong>1</strong> opción"
+            other: "Elige <strong>%{count}</strong> opciones"
           between_min_and_max_options: "Elige entre <strong>%{min}</strong> y <strong>%{max}</strong> opciones"
       cast-votes:
         title: "Votar"
@@ -39,21 +39,21 @@ es:
         title: "Volver a los votos"
         label: "Ocultar resultados"
       open:
-        title: "Abrir la encuesta"
+        title: "Abrir encuesta"
         label: "Abrir"
         confirm: "¿Seguro que quieres abrir esta encuesta?"
       close:
         title: "Cerrar la encuesta"
         label: "Cerrar"
         confirm: "¿Seguro que quieres cerrar esta encuesta?"
-      error_while_toggling_status: "Lo sentimos, ha ocurrido un error al cambiar el estado de esta encuesta."
-      error_while_casting_votes: "Lo sentimos, ha ocurrido un error al registrar tus votos."
-      error_while_fetching_voters: "Lo sentimos, ha ocurrido un error al mostrar los votantes."
+      error_while_toggling_status: "Lo sentimos, hubo un error al cambiar el estado de esta encuesta."
+      error_while_casting_votes: "Lo sentimos, hubo un error al registrar tus votos."
+      error_while_fetching_voters: "Lo sentimos, hubo un error al mostrar los votantes."
       ui_builder:
-        title: Crear encuesta
-        insert: Insertar encuesta
+        title: Crear Encuesta
+        insert: Insertar Encuesta
         help:
-          options_count: Introduce al menos 2 opciones
+          options_count: Introducir al menos 2 opciones
           invalid_values: El valor mínimo debe ser menor que el valor máximo.
         poll_type:
           label: Tipo
@@ -67,4 +67,4 @@ es:
         poll_public:
           label: Mostrar quién votó
         poll_options:
-          label: Introduce una opción de la encuesta por línea
+          label: Introducir una opción de la encuesta por línea
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index e2a9dc48358..67a397d677a 100644
--- a/plugins/poll/config/locales/client.ja.yml
+++ b/plugins/poll/config/locales/client.ja.yml
@@ -13,10 +13,17 @@ ja:
       total_votes:
         other: "合計得票数"
       average_rating: "平均評価: <strong>%{average}</strong>."
+      public:
+        title: "投票は公開されています。"
       multiple:
         help:
+          at_least_min_options:
+            other: "少なくとも<strong>%{count}</strong>の選択肢を選んでください"
           up_to_max_options:
             other: "<strong>%{count}</strong>個まで選ぶことができます"
+          x_options:
+            other: "<strong>%{count}</strong>の選択肢を選んでください"
+          between_min_and_max_options: "<strong>%{min}</strong>から<strong>%{max}</strong>の選択肢を選んでください"
       cast-votes:
         title: "投票する"
         label: "投票する"
@@ -34,12 +41,25 @@ ja:
         title: "投票を締め切る"
         label: "投票を締め切る"
         confirm: "この投票を締め切ってもよろしいですか？"
+      error_while_toggling_status: "申し訳ありませんが、この投票のステータスを切り替える際にエラーが発生しました。"
+      error_while_casting_votes: "申し訳ありませんが、投票の際にエラーが発生しました。"
+      error_while_fetching_voters: "申し訳ありませんが、有権者を表示する際にエラーが発生しました。"
       ui_builder:
         title: 投票を作成
+        insert: 投票の挿入
+        help:
+          options_count: 少なくとも2つの選択肢を入力してください
+          invalid_values: 最小値は最大値より小さくなければなりません。
         poll_type:
           label: タイプ
           regular: 一つだけ選択
           multiple: 複数選択
           number: 数字で評価
+        poll_config:
+          max: 最大
+          min: 最小
+          step: 間隔
         poll_public:
           label: 誰が投票したか表示する
+        poll_options:
+          label: 1行ごとに1つの選択肢を入力します
diff --git a/plugins/poll/config/locales/client.ko.yml b/plugins/poll/config/locales/client.ko.yml
index bad2adb3cb0..2de09fd24d9 100644
--- a/plugins/poll/config/locales/client.ko.yml
+++ b/plugins/poll/config/locales/client.ko.yml
@@ -18,7 +18,12 @@ ko:
       multiple:
         help:
           at_least_min_options:
-            other: "최소 <strong>%{count}</strong>개의 옵션을 선택해야합니다."
+            other: "최소 <strong>%{count}</strong>개의 선택지를 택해야 합니다."
+          up_to_max_options:
+            other: "최대 <strong>%{count}</strong> 개까지 선택지를 고를 수 있습니다"
+          x_options:
+            other: "<strong>%{count}</strong> 개의 선택지를 고르세요"
+          between_min_and_max_options: "최소 <strong>%{min}</strong>개에서 최대 <strong>%{max}</strong>개까지 선택 가능합니다."
       cast-votes:
         title: "표 던지기"
         label: "지금 투표!"
@@ -36,3 +41,25 @@ ko:
         title: "투표 닫기"
         label: "닫기"
         confirm: "정말 이 투표를 닫으시겠어요?"
+      error_while_toggling_status: "죄송합니다. 이 투표의 상태를 바꾸는 도중 에러가 발생하였습니다."
+      error_while_casting_votes: "죄송합니다. 투표를 하는 도중 에러가 발생하였습니다."
+      error_while_fetching_voters: "죄송합니다. 투표한 사람을 표시하는 도중 에러가 발생하였습니다."
+      ui_builder:
+        title: 투표 만들기
+        insert: 투표 삽입하기
+        help:
+          options_count: 최소 2가지 이상의 선택지를 입력하세요
+          invalid_values: 최소값은 최대값보다는 작아야 합니다.
+        poll_type:
+          label: 유형
+          regular: 단일 선택
+          multiple: 복수 선택
+          number: 점수 매기기
+        poll_config:
+          max: 최대
+          min: 최소
+          step: 단계
+        poll_public:
+          label: 투표한 사람 보기
+        poll_options:
+          label: 투표 선택지는 한줄에 하나씩 입력하세요
diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml
index fd11a05cd2c..a871a565819 100644
--- a/plugins/poll/config/locales/client.pt.yml
+++ b/plugins/poll/config/locales/client.pt.yml
@@ -16,7 +16,7 @@ pt:
         other: "total de votos"
       average_rating: "Classificação média: <strong>%{average}</strong>."
       public:
-        title: "Votos são públicos."
+        title: "Os votos são públicos."
       multiple:
         help:
           at_least_min_options:
@@ -41,23 +41,23 @@ pt:
       open:
         title: "Abrir a sondagem"
         label: "Abrir"
-        confirm: "Tem a certeza que quer abrir esta sondagem?"
+        confirm: "Tem a certeza que deseja abrir esta sondagem?"
       close:
         title: "Fechar a sondagem"
         label: "Fechar"
-        confirm: "Tem a certeza que quer fechar esta sondagem?"
-      error_while_toggling_status: "Pedimos desculpa, ocorreu um erro ao mudar o estado desta sondagem."
-      error_while_casting_votes: "Pedimos desculpa, ocorreu um erro ao submeter os seus votos."
+        confirm: "Tem a certeza que deseja fechar esta sondagem?"
+      error_while_toggling_status: "Desculpe, ocorreu um erro ao alternar o estado desta sondagem."
+      error_while_casting_votes: "Desculpe, ocorreu um erro ao submeter os seus votos."
       error_while_fetching_voters: "Pedimos desculpa, ocorreu um erro ao apresentar os eleitores."
       ui_builder:
         title: Criar Sondagem
         insert: Inserir sondagem
         help:
-          options_count: Indique pelo menos 2 opções
+          options_count: Insira pelo menos 2 opções
         poll_type:
           label: Tipo
           regular: Escolha Única
-          multiple: Multipla escolha
+          multiple: Escolha Múltipla
           number: Cotação numérica
         poll_config:
           max: Máximo
diff --git a/plugins/poll/config/locales/client.ro.yml b/plugins/poll/config/locales/client.ro.yml
index e5b2cde5872..df87f6641dc 100644
--- a/plugins/poll/config/locales/client.ro.yml
+++ b/plugins/poll/config/locales/client.ro.yml
@@ -26,9 +26,9 @@ ro:
             few: "Trebuie să alegi cel puțin <strong>%{count}</strong> opțiuni."
             other: "Trebuie să alegi cel puțin <strong>%{count}</strong> opțiuni."
           up_to_max_options:
-            one: "Trebuie să alegi maxim <strong>o</strong> opțiune."
-            few: "Trebuie să alegi maxim <strong>%{count}</strong> opțiuni."
-            other: "Trebuie să alegi maxim <strong>%{count}</strong> opțiuni."
+            one: "Poți alege maximum <strong>o</strong> opțiune."
+            few: "Poți alege până la <strong>%{count}</strong> opțiuni."
+            other: "Poți alege până la <strong>%{count}</strong> de opțiuni."
           x_options:
             one: "Trebuie să alegi <strong>o</strong> opțiune."
             few: "Trebuie să alegi <strong>%{count}</strong> opțiuni."
diff --git a/plugins/poll/config/locales/server.el.yml b/plugins/poll/config/locales/server.el.yml
index 1d51d348914..54a4d4af323 100644
--- a/plugins/poll/config/locales/server.el.yml
+++ b/plugins/poll/config/locales/server.el.yml
@@ -17,21 +17,21 @@ el:
     named_poll_must_have_at_least_2_options: "Η ψηφοφορία <strong>%{name}</strong> πρέπει να έχει τουλάχιστον 2 επιλογές."
     default_poll_must_have_less_options:
       one: "Η Δημοσκόπηση πρέπει να έχει λιγότερη από 1 επιλογή."
-      other: "Η Δημοσκόπηση πρέπει να έχει λιγότερες από %{count} επιλογές."
+      other: "Η ψηφοφορία πρέπει να έχει λιγότερες από %{count} επιλογές."
     named_poll_must_have_less_options:
       one: "Η Ψηφοφορία με το όνομα <strong>%{name}</strong> πρέπει να έχει λιγότερο απο 1 επιλογή. "
-      other: "Η Ψηφοφορία με το όνομα <strong>%{name}</strong> πρέπει να έχει λιγότερες απο %{count} επιλογές. "
+      other: "Η ψηφοφορία με όνομα <strong>%{name}</strong> πρέπει να έχει λιγότερες απο %{count} επιλογές. "
     default_poll_must_have_different_options: "Η ψηφοφορία πρέπει να έχει διαφορετικές επιλογές."
     named_poll_must_have_different_options: "Η ψηφοφορία <strong>%{name}</strong> πρέπει να έχει διαφορετικές επιλογές."
-    default_poll_with_multiple_choices_has_invalid_parameters: "Δημοσκόπηση με πολλαπλές επιλογές έχει μη έγκυρες παραμέτρους."
-    named_poll_with_multiple_choices_has_invalid_parameters: "Η Ψηφοφορία με το όνομα <strong>%{name}</strong> με πολλαπλές επιλογές έχει μη έγγυρες παραμέτρους"
+    default_poll_with_multiple_choices_has_invalid_parameters: "Η ψηφοφορία με πολλαπλές επιλογές έχει μη έγκυρες παραμέτρους."
+    named_poll_with_multiple_choices_has_invalid_parameters: "Η ψηφοφορία με όνομα <strong>%{name}</strong> και με πολλαπλές επιλογές έχει μη έγγυρες παραμέτρους"
     requires_at_least_1_valid_option: "Πρέπει να κάνεις τουλάχιστον 1 έγκυρη επιλογή."
-    default_cannot_be_made_public: "Δημοσκόπηση με ψήφους δεν μπορεί να γίνει δημόσια."
-    named_cannot_be_made_public: "Η Ψηφοφορία με το όνομα <strong>%{name}</strong> κατέχει ψήφους που δεν μπορούν να δημοσιοποιηθούν."
+    default_cannot_be_made_public: "Ψηφοφορία με ψήφους δεν μπορεί να γίνει δημόσια."
+    named_cannot_be_made_public: "Η ψηφοφορία με όνομα <strong>%{name}</strong> έχει ψήφους που δεν μπορούν να δημοσιοποιηθούν."
     edit_window_expired:
-      cannot_change_polls: "Δεν μπορείτε να προσθέσετε, να καταργήσετε ή να μετονομάσετε δημοσκοπήσεις μετά τα πρώτα %{minutes} λεπτά."
-      op_cannot_edit_options: "Δεν μπορείτε να προσθέσετε ή να αφαιρέσετε επιλογές για την δημοσκόπηση μετά τα πρώτα %{minutes} λεπτά. Παρακαλούμε επικοινωνήστε με έναν συντονιστή αν χρειάζεται να επεξεργαστείτε μια επιλογή για την δημοσκόπηση."
-      staff_cannot_add_or_remove_options: "Δεν μπορείτε να προσθέσετε ή να αφαιρέσετε επιλογές για την δημοσκόπηση μετά τα πρώτα %{minutes} λεπτά. Θα πρέπει να κλείσετε αυτό το νήμα και να δημιουργήσετε ένα νέο αντ 'αυτού."
+      cannot_change_polls: "Δεν μπορείτε να προσθέσετε, να καταργήσετε ή να μετονομάσετε ψηφοφορίες μετά τα πρώτα %{minutes} λεπτά."
+      op_cannot_edit_options: "Δεν μπορείτε να προσθέσετε ή να αφαιρέσετε επιλογές στην ψηφοφορία μετά τα πρώτα %{minutes} λεπτά. Παρακαλούμε επικοινωνήστε με έναν συντονιστή αν χρειάζεται να επεξεργαστείτε μια επιλογή για την ψηφοφορία."
+      staff_cannot_add_or_remove_options: "Δεν μπορείτε να προσθέσετε ή να αφαιρέσετε επιλογές στην ψηφοφορία μετά τα πρώτα %{minutes} λεπτά. Θα πρέπει να κλείσετε αυτό το νήμα και να δημιουργήσετε ένα νέο αντ' αυτού."
     no_polls_associated_with_this_post: "Σε αυτή την ανάρτηση δεν υπάρχουν ψηφοφορίες."
     no_poll_with_this_name: "Σε αυτή την ανάρτηση δεν υπάρχουν ψηφοφορίες με το όνομα <strong>%{name}</strong>."
     post_is_deleted: "Δεν μπορείτε να ενεργήσετε σε διεγραμένη ανάρτηση."
@@ -40,4 +40,4 @@ el:
     topic_must_be_open_to_toggle_status: "Για να μπορεί να αλλάξει η κατάσταση του νήματος, πρέπει να είναι ανοιχτό."
     only_staff_or_op_can_toggle_status: "Η κατάσταση της ψηφοφορίας μπορεί να αλλάξει μόνο από συντονιστές ή από τον δημιουργό του νήματος."
     email:
-      link_to_poll: "Κάντε κλικ για να δείτε την δημοσκόπηση."
+      link_to_poll: "Κάντε κλικ για να δείτε την ψηφοφορία."
diff --git a/plugins/poll/config/locales/server.es.yml b/plugins/poll/config/locales/server.es.yml
index f7059dddb62..4a75b376c7a 100644
--- a/plugins/poll/config/locales/server.es.yml
+++ b/plugins/poll/config/locales/server.es.yml
@@ -26,18 +26,18 @@ es:
     default_poll_with_multiple_choices_has_invalid_parameters: "La encuesta con múltiples opciones tiene parámetros no válidos."
     named_poll_with_multiple_choices_has_invalid_parameters: "La encuesta llamada <strong>%{name}</strong> con múltiples opciones tiene párametros no válidos."
     requires_at_least_1_valid_option: "Debes escoger al menos 1 opción válida."
-    default_cannot_be_made_public: "Una encuesta con votos ya registrados no puede hacerse pública."
-    named_cannot_be_made_public: "La encuesta llamada <strong>%{name}</strong> tiene votos ya registrados, por lo que no puede hacerse pública."
+    default_cannot_be_made_public: "La encuesta con votos ya registrados no puede hacerse pública."
+    named_cannot_be_made_public: "La encuesta llamada <strong>%{name}</strong> tiene votos ya registrados por lo que no puede hacerse pública."
     edit_window_expired:
-      cannot_change_polls: "No se pueden modificar, quitar o renombrar encuestas transcurridos %{minutes} minutos."
-      op_cannot_edit_options: "No se pueden modificar o eliminar las opciones de la encuesta transcurridos %{minutes} minutos. Por favor, contacta con un moderador si necesitas editar las opciones de la encuesta."
-      staff_cannot_add_or_remove_options: "No se pueden modificar o eliminar las opciones de la encuesta transcurridos %{minutes} minutos. En su lugar, deberías cerrar este tema y abrir uno nuevo."
+      cannot_change_polls: "No se puede modificar, quitar o renombrar encuestas transcurridos %{minutes} minutos."
+      op_cannot_edit_options: "No se puede modificar o eliminar las opciones de la encuesta transcurridos %{minutes} minutos. Por favor, contacta con un moderador si necesitas editar las opciones de la encuesta."
+      staff_cannot_add_or_remove_options: "No se puede modificar o eliminar las opciones de la encuesta transcurridos %{minutes} minutos. En su lugar, deberías cerrar este tema y abrir uno nuevo."
     no_polls_associated_with_this_post: "No hay encuestas asociadas a este post."
-    no_poll_with_this_name: "No hay ninguna encuesta llamada <strong>%{name}</strong> asociada a este post."
+    no_poll_with_this_name: "No hay ninguna encuesta llamada <strong>%{name}</strong> asociada con este post."
     post_is_deleted: "No se puede actuar en un post eliminado."
     topic_must_be_open_to_vote: "Este tema debe estar abierto para votar."
     poll_must_be_open_to_vote: "La encuesta debe estar abierta para votar."
-    topic_must_be_open_to_toggle_status: "Este tema debe estar abierto para cambiar entre estados de la encuesta."
+    topic_must_be_open_to_toggle_status: "Este tema debe estar abierto para cambiar entre estados."
     only_staff_or_op_can_toggle_status: "Solo un moderador, administrador o el autor original del post puede cambiar el estado de una encuesta."
     email:
       link_to_poll: "Haz clic para ver la encuesta."
diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml
index 7cb65b2a8ac..745f4869017 100644
--- a/plugins/poll/config/locales/server.ja.yml
+++ b/plugins/poll/config/locales/server.ja.yml
@@ -9,6 +9,7 @@ ja:
   site_settings:
     poll_enabled: "ユーザーによる投票を許可しますか？"
     poll_maximum_options: "投票で許可されるオプションの最大数。"
+    poll_edit_window_mins: "ポスト作成後に投票を編集できる時間(分)"
   poll:
     multiple_polls_without_name: "名前のない複数の投票があります。一意に投票結果を識別するために、属性'<code>name</code>'を使用します。"
     multiple_polls_with_same_name: "同じ名前: <strong>%{name}</strong> の複数の投票があります。一意に投票結果を識別するために、属性'<code>name</code>'を使用します。"
@@ -23,8 +24,12 @@ ja:
     default_poll_with_multiple_choices_has_invalid_parameters: "複数の選択肢をもつ投票に無効なパラメータがあります。"
     named_poll_with_multiple_choices_has_invalid_parameters: "複数の選択肢をもつ投票 <strong>%{name}</strong> に無効なパラメータがあります。"
     requires_at_least_1_valid_option: "少なくとも1つの有効なオプションを選択する必要があります。"
+    default_cannot_be_made_public: "得票済みの投票は公開することができません。"
+    named_cannot_be_made_public: "投票 <strong>%{name}</strong> は得票済みのため公開することができません。"
     edit_window_expired:
       cannot_change_polls: "最初の%{minutes}分が経過するまで、投票の追加,  削除, 名前の変更はできません。"
+      op_cannot_edit_options: "最初の%{minutes}分が経過したため投票の選択肢を編集することはできません。投票の選択肢を編集したい場合はモデレータへ連絡してください。"
+      staff_cannot_add_or_remove_options: "最初の%{minutes}分が経過したため投票の選択肢を編集することはできません。このトピックを閉じて代わりに新しいトピックを作成する必要があります。"
     no_polls_associated_with_this_post: "この投稿に関連付けられた投票はありません。"
     no_poll_with_this_name: "この投稿に関連付けられた投票 <strong>%{name}</strong> はありません。"
     post_is_deleted: "削除された投稿を操作する事はできません。"
diff --git a/plugins/poll/config/locales/server.ko.yml b/plugins/poll/config/locales/server.ko.yml
index b11c90e4e1e..411abf6e3d9 100644
--- a/plugins/poll/config/locales/server.ko.yml
+++ b/plugins/poll/config/locales/server.ko.yml
@@ -7,25 +7,35 @@
 
 ko:
   site_settings:
-    poll_enabled: "유저에게 설문조사 작성 허용"
-    poll_maximum_options: "최대 설문조사 항목이 허용됨."
-    poll_edit_window_mins: "포스트 생성 이후 설문조사가 편집될 수 있는 시간(분)"
+    poll_enabled: "사용자가 투표를 생성할 수 있도록 허가하시겠습니까?"
+    poll_maximum_options: "한 투표 당 설정할 수 있는 최대 투표 항목 수"
+    poll_edit_window_mins: "포스트 생성 이후 투표를 편집할 수 있는 시간(분)"
   poll:
-    multiple_polls_without_name: "이름없는 설문조사가 여러개 있습니다.  '<code>name</code>'  속성을 사용하여 설문조사를 개별적으로 구분해 보세요."
-    multiple_polls_with_same_name: "같은 이름 <strong>%{name}</strong> 의 설문조사가 여러개 있습니다. '<code>name</code>' 속성을 사용하여 설문조사를 개별적으로 구분해 보세요."
-    default_poll_must_have_at_least_2_options: "설문조사에 적어도 2개의 항목은 있어야합니다."
-    named_poll_must_have_at_least_2_options: "<strong>%{name}</strong> 설문조사에 적어도 2개의 항목이 있어야 합니다."
+    multiple_polls_without_name: "이름없는 투표가 여러 개 있습니다.  '<code>name</code>'  속성을 사용해서 투표에 특색을 부여해보세요."
+    multiple_polls_with_same_name: "같은 이름 <strong>%{name}</strong> 으로 투표가 여러 개 있습니다. '<code>name</code>' 속성을 사용하여 투표를 구분해보세요."
+    default_poll_must_have_at_least_2_options: "한 투표에 적어도 2개 이상의 투표 항목은 있어야 합니다."
+    named_poll_must_have_at_least_2_options: "<strong>%{name}</strong> 투표에는 적어도 2개의 투표 항목이 있어야 합니다."
     default_poll_must_have_less_options:
-      other: "설문조사 항목은 %{count}개보다 적어야합니다."
-    default_poll_must_have_different_options: "한 설문조사 안에 항목 내용들이 각각 달라야 합니다."
-    named_poll_must_have_different_options: "<strong>%{name}</strong> 설문조사의 항목 내용들이 달라야 합니다."
-    default_poll_with_multiple_choices_has_invalid_parameters: "복수응답 가능한 설문조사가 잘못된 매개변수를 가지고 있습니다."
-    named_poll_with_multiple_choices_has_invalid_parameters: "복수응답 가능한 <strong>%{name}</strong> 설문조사가 잘못된 매개변수를 가지고 있습니다."
-    requires_at_least_1_valid_option: "적어도 올바른 항목 1개를 선택해야 합니다."
-    no_polls_associated_with_this_post: "이 게시글과 연결된  설문조사가 없습니다."
-    no_poll_with_this_name: "이 게시글과 연결된 <strong>%{name}</strong> 설문조사가 없습니다."
-    post_is_deleted: "지워진 글에는 불가능합니다."
+      other: "투표 항목은 %{count}개보다 적어야합니다."
+    named_poll_must_have_less_options:
+      other: "<strong>%{name}</strong> 투표 에는 최소 %{count} 개의 투표 항목이 있어야 합니다."
+    default_poll_must_have_different_options: "투표 항목은 각각의 내용이 달라야 합니다."
+    named_poll_must_have_different_options: "<strong>%{name}</strong> 투표의 투표 항목 내용이 제각기 달라야 합니다."
+    default_poll_with_multiple_choices_has_invalid_parameters: "복수응답 가능한 투표가 잘못된 매개변수를 가지고 있습니다."
+    named_poll_with_multiple_choices_has_invalid_parameters: "복수응답 가능한 <strong>%{name}</strong> 투표가 잘못된 매개변수를 가지고 있습니다."
+    requires_at_least_1_valid_option: "유효한 투표 항목을 적어도 1개는 선택해야 합니다."
+    default_cannot_be_made_public: "이미 투표가 진행되어서 공개로 전환할 수 없습니다."
+    named_cannot_be_made_public: "<strong>%{name}</strong>는 공개 설정할 수 없는 표가 있습니다."
+    edit_window_expired:
+      cannot_change_polls: "처음 %{minutes}분 동안은 투표를 추가, 제거하거나 이름을 변경할 수 없습니다."
+      op_cannot_edit_options: "처음 %{minutes}분 동안은 투표를 추가하거나 삭제할 수 없습니다. 투표를 꼭 수정해야만 한다면 운영자에게 문의하시기 바랍니다."
+      staff_cannot_add_or_remove_options: "처음 %{minutes}분 동안은 투표 항목을 추가하거나 삭제할 수 없습니다. 그렇지 않으면, 이 토픽을 닫고 새로운 토픽을 만들어야 합니다."
+    no_polls_associated_with_this_post: "이 포스트와 관련한 투표가 없습니다."
+    no_poll_with_this_name: "이 포스트와 관련한 <strong>%{name}</strong> 라는 이름의 투표는 없습니다."
+    post_is_deleted: "지워진 포스트에는 불가능합니다."
     topic_must_be_open_to_vote: "토픽이 열려야 투표를 할 수 있습니다."
-    poll_must_be_open_to_vote: "설문조사가 열려야 투표를 할 수 있습니다."
+    poll_must_be_open_to_vote: "투표가 열려있어야 표결할 수 있습니다."
     topic_must_be_open_to_toggle_status: "토픽이 열려야 상태 변경을 할 수 있습니다."
-    only_staff_or_op_can_toggle_status: "관리자나 작성자만이 설문조사 상태를 변경할 수 있습니다."
+    only_staff_or_op_can_toggle_status: "운영진이나 작성자만이 투표 상태를 변경할 수 있습니다."
+    email:
+      link_to_poll: "클릭해서 투표보기"
diff --git a/plugins/poll/config/locales/server.pt.yml b/plugins/poll/config/locales/server.pt.yml
index 8e8708e6534..4968a67e161 100644
--- a/plugins/poll/config/locales/server.pt.yml
+++ b/plugins/poll/config/locales/server.pt.yml
@@ -36,7 +36,7 @@ pt:
     no_poll_with_this_name: "Nenhuma sondagem com o nome <strong>%{name}</strong> está associada a esta publicação."
     post_is_deleted: "Não é possível realizar ações em publicações eliminadas."
     topic_must_be_open_to_vote: "O tópico tem que estar aberto para votar."
-    poll_must_be_open_to_vote: "Sondagem tem que estar aberta para votar."
+    poll_must_be_open_to_vote: "A sondagem tem que estar aberta para votar."
     topic_must_be_open_to_toggle_status: "O tópico tem que estar aberto para alternar o estado."
     only_staff_or_op_can_toggle_status: "Apenas um membro da equipa de apoio ou o autor original pode alternar o estado da sondagem."
     email:
diff --git a/plugins/poll/lib/polls_updater.rb b/plugins/poll/lib/polls_updater.rb
index 696a62eed11..5464005175d 100644
--- a/plugins/poll/lib/polls_updater.rb
+++ b/plugins/poll/lib/polls_updater.rb
@@ -79,6 +79,7 @@ module DiscoursePoll
             if previous_option["id"] != option["id"]
               if votes_fields = post.custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD]
                 votes_fields.each do |key, value|
+                  next unless value[poll_name]
                   index = value[poll_name].index(previous_option["id"])
                   votes_fields[key][poll_name][index] = option["id"] if index
                 end
diff --git a/plugins/poll/lib/tasks/migrate_old_polls.rake b/plugins/poll/lib/tasks/migrate_old_polls.rake
index 9a551a18a65..17e5c3946c8 100644
--- a/plugins/poll/lib/tasks/migrate_old_polls.rake
+++ b/plugins/poll/lib/tasks/migrate_old_polls.rake
@@ -25,7 +25,6 @@ end
 
 desc "Migrate old polls to new syntax"
 task "poll:migrate_old_polls" => :environment do
-  require "timecop"
   # iterate over all polls
   PluginStoreRow.where(plugin_name: "poll")
                 .where("key LIKE 'poll_options_%'")
@@ -39,7 +38,7 @@ task "poll:migrate_old_polls" => :environment do
       # skip if already migrated
       next if post.custom_fields.include?("polls")
       # go back in time
-      Timecop.freeze(post.created_at + 1.minute) do
+      freeze_time(post.created_at + 1.minute) do
         raw = post.raw.gsub(/\n\n([ ]*[-\*\+] )/, "\n\\1") + "\n\n"
         # fix the RAW when needed
         if raw !~ /\[poll\]/
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 3b764043b6d..2bf54226e3f 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -157,13 +157,13 @@ after_initialize do
           # extract attributes
           p.attributes.values.each do |attribute|
             if attribute.name.start_with?(DATA_PREFIX)
-              poll[attribute.name[DATA_PREFIX.length..-1]] = attribute.value
+              poll[attribute.name[DATA_PREFIX.length..-1]] = CGI.escapeHTML(attribute.value || "")
             end
           end
 
           # extract options
           p.css("li[#{DATA_PREFIX}option-id]").each do |o|
-            option_id = o.attributes[DATA_PREFIX + "option-id"].value
+            option_id = o.attributes[DATA_PREFIX + "option-id"].value || ""
             poll["options"] << { "id" => option_id, "html" => o.inner_html, "votes" => 0 }
           end
 
@@ -260,7 +260,7 @@ after_initialize do
 
         result = []
 
-        users = User.where(id: user_ids).map do |user|
+        User.where(id: user_ids).map do |user|
           result << UserNameSerializer.new(user).serializable_hash
         end
       end
diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb
index 9e8e0196443..677a72d6098 100644
--- a/plugins/poll/spec/controllers/polls_controller_spec.rb
+++ b/plugins/poll/spec/controllers/polls_controller_spec.rb
@@ -79,8 +79,8 @@ describe ::DiscoursePoll::PollsController do
     end
 
     it "ensures poll is open" do
-      closed_poll = Fabricate(:post, raw: "[poll status=closed]\n- A\n- B\n[/poll]")
-      xhr :put, :vote, { post_id: closed_poll.id, poll_name: "poll", options: ["A"] }
+      closed_poll = create_post(raw: "[poll status=closed]\n- A\n- B\n[/poll]")
+      xhr :put, :vote, { post_id: closed_poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] }
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.poll_must_be_open_to_vote"))
diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index d5bf98b157b..41bd0a42db8 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -29,23 +29,23 @@ describe PostsController do
     end
 
     it "should have different options" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A\n- A[/poll]" }
+      xhr :post, :create, { title: title, raw: "[poll]\n- A\n- A\n[/poll]" }
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.default_poll_must_have_different_options"))
     end
 
     it "should have at least 2 options" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A[/poll]" }
+      xhr :post, :create, { title: title, raw: "[poll]\n- A\n[/poll]" }
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.default_poll_must_have_at_least_2_options"))
     end
 
     it "should have at most 'SiteSetting.poll_maximum_options' options" do
-      raw = "[poll]"
+      raw = "[poll]\n"
       (SiteSetting.poll_maximum_options + 1).times { |n| raw << "\n- #{n}" }
-      raw << "[/poll]"
+      raw << "\n[/poll]"
 
       xhr :post, :create, { title: title, raw: raw }
 
@@ -55,7 +55,7 @@ describe PostsController do
     end
 
     it "should have valid parameters" do
-      xhr :post, :create, { title: title, raw: "[poll type=multiple min=5]\n- A\n- B[/poll]" }
+      xhr :post, :create, { title: title, raw: "[poll type=multiple min=5]\n- A\n- B\n[/poll]" }
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.default_poll_with_multiple_choices_has_invalid_parameters"))
@@ -66,7 +66,8 @@ describe PostsController do
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
-      expect(json["polls"]["&lt;script&gt;alert(xss)&lt;/script&gt;"]).to be
+      expect(json["cooked"]).to include("&lt;script&gt;")
+      expect(json["polls"]["&lt;script&gt;alert(&#39;xss&#39;)&lt;/script&gt;"]).to be
     end
 
     it "also works whe there is a link starting with '[poll'" do
@@ -91,7 +92,7 @@ describe PostsController do
       describe "within the first 5 minutes" do
 
         let(:post_id) do
-          Timecop.freeze(4.minutes.ago) do
+          freeze_time(4.minutes.ago) do
             xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" }
             ::JSON.parse(response.body)["id"]
           end
@@ -116,12 +117,12 @@ describe PostsController do
 
       describe "after the poll edit window has expired" do
 
-        let(:poll) { "[poll]\n- A\n- B[/poll]" }
-        let(:new_option) { "[poll]\n- A\n- C[/poll]" }
-        let(:updated) { "before\n\n[poll]\n- A\n- B[/poll]\n\nafter" }
+        let(:poll) { "[poll]\n- A\n- B\n[/poll]" }
+        let(:new_option) { "[poll]\n- A\n- C\n[/poll]" }
+        let(:updated) { "before\n\n[poll]\n- A\n- B\n[/poll]\n\nafter" }
 
         let(:post_id) do
-          Timecop.freeze(6.minutes.ago) do
+          freeze_time(6.minutes.ago) do
             xhr :post, :create, { title: title, raw: poll }
             ::JSON.parse(response.body)["id"]
           end
@@ -220,14 +221,14 @@ describe PostsController do
   describe "named polls" do
 
     it "should have different options" do
-      xhr :post, :create, { title: title, raw: "[poll name=""foo""]\n- A\n- A[/poll]" }
+      xhr :post, :create, { title: title, raw: "[poll name=""foo""]\n- A\n- A\n[/poll]" }
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.named_poll_must_have_different_options", name: "foo"))
     end
 
     it "should have at least 2 options" do
-      xhr :post, :create, { title: title, raw: "[poll name='foo']\n- A[/poll]" }
+      xhr :post, :create, { title: title, raw: "[poll name='foo']\n- A\n[/poll]" }
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.named_poll_must_have_at_least_2_options", name: "foo"))
diff --git a/plugins/poll/spec/integration/poll_endpoints_spec.rb b/plugins/poll/spec/integration/poll_endpoints_spec.rb
index d2c5a4caacd..47c6080585d 100644
--- a/plugins/poll/spec/integration/poll_endpoints_spec.rb
+++ b/plugins/poll/spec/integration/poll_endpoints_spec.rb
@@ -89,7 +89,7 @@ describe "DiscoursePoll endpoints" do
     end
 
     context "number poll" do
-      let(:post) { Fabricate(:post, raw: '[poll type=number min=1 max=20 step=1 public=true][/poll]') }
+      let(:post) { Fabricate(:post, raw: "[poll type=number min=1 max=20 step=1 public=true]\n[/poll]") }
 
       it 'should return the right response' do
         post
diff --git a/plugins/poll/spec/lib/polls_updater_spec.rb b/plugins/poll/spec/lib/polls_updater_spec.rb
index 3d679d071a4..e8a6a0e4681 100644
--- a/plugins/poll/spec/lib/polls_updater_spec.rb
+++ b/plugins/poll/spec/lib/polls_updater_spec.rb
@@ -217,6 +217,40 @@ describe DiscoursePoll::PollsUpdater do
       end
     end
 
+    it 'should be able to edit multiple polls with votes' do
+      DiscoursePoll::Poll.vote(
+        post_with_two_polls.id,
+        "poll",
+        [two_polls["poll"]["options"].first["id"]],
+        user
+      )
+
+      raw = <<-RAW.strip_heredoc
+      [poll]
+      * 12
+      * 34
+      [/poll]
+
+      [poll name=test]
+      * 12
+      * 34
+      [/poll]
+      RAW
+
+      different_post = Fabricate(:post, raw: raw)
+      different_polls = DiscoursePoll::PollsValidator.new(different_post).validate_polls
+
+      message = MessageBus.track_publish do
+        described_class.update(post_with_two_polls.reload, different_polls)
+      end.first
+
+      expect(post_with_two_polls.reload.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD])
+        .to eq(different_polls)
+
+      expect(message.data[:post_id]).to eq(post_with_two_polls.id)
+      expect(message.data[:polls]).to eq(different_polls)
+    end
+
     describe "when poll edit window has expired" do
       let(:poll_edit_window_mins) { 6 }
       let(:another_post) { Fabricate(:post, created_at: Time.zone.now - poll_edit_window_mins.minutes) }
diff --git a/plugins/poll/spec/lib/polls_validator_spec.rb b/plugins/poll/spec/lib/polls_validator_spec.rb
index d5178fe854b..629fc0527af 100644
--- a/plugins/poll/spec/lib/polls_validator_spec.rb
+++ b/plugins/poll/spec/lib/polls_validator_spec.rb
@@ -6,7 +6,7 @@ describe ::DiscoursePoll::PollsValidator do
 
   describe "#validate_polls" do
     it "should ensure that polls have unique names" do
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll]
       * 1
       * 2
@@ -24,7 +24,7 @@ describe ::DiscoursePoll::PollsValidator do
         I18n.t("poll.multiple_polls_without_name")
       )
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll name=test]
       * 1
       * 2
@@ -44,7 +44,7 @@ describe ::DiscoursePoll::PollsValidator do
     end
 
     it 'should ensure that polls have unique options' do
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll]
       * 1
       * 1
@@ -57,7 +57,7 @@ describe ::DiscoursePoll::PollsValidator do
         I18n.t("poll.default_poll_must_have_different_options")
       )
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll name=test]
       * 1
       * 1
@@ -73,7 +73,7 @@ describe ::DiscoursePoll::PollsValidator do
 
 
     it 'should ensure that polls have at least 2 options' do
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll]
       * 1
       [/poll]
@@ -85,7 +85,7 @@ describe ::DiscoursePoll::PollsValidator do
         I18n.t("poll.default_poll_must_have_at_least_2_options")
       )
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll name=test]
       * 1
       [/poll]
@@ -101,7 +101,7 @@ describe ::DiscoursePoll::PollsValidator do
     it "should ensure that polls' options do not exceed site settings" do
       SiteSetting.poll_maximum_options = 2
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll]
       * 1
       * 2
@@ -116,7 +116,7 @@ describe ::DiscoursePoll::PollsValidator do
         count: SiteSetting.poll_maximum_options
       ))
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll name=test]
       * 1
       * 2
@@ -134,7 +134,7 @@ describe ::DiscoursePoll::PollsValidator do
 
     describe 'multiple type polls' do
       it "should ensure that min should not be greater than max" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=2 max=1]
         * 1
         * 2
@@ -148,7 +148,7 @@ describe ::DiscoursePoll::PollsValidator do
           I18n.t("poll.default_poll_with_multiple_choices_has_invalid_parameters")
         )
 
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=2 max=1 name=test]
         * 1
         * 2
@@ -164,7 +164,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure max setting is greater than 0" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple max=-2]
         * 1
         * 2
@@ -179,7 +179,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure that max settings is smaller or equal to the number of options" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple max=3]
         * 1
         * 2
@@ -194,7 +194,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure that min settings is not negative" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=-1]
         * 1
         * 2
@@ -209,7 +209,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure that min settings it not equal to zero" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=0]
         * 1
         * 2
@@ -224,7 +224,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure that min settings is not equal to the number of options" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=2]
         * 1
         * 2
@@ -239,7 +239,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure that min settings is not greater than the number of options" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=3]
         * 1
         * 2
diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb
new file mode 100644
index 00000000000..85ee2c2a00e
--- /dev/null
+++ b/plugins/poll/spec/lib/pretty_text_spec.rb
@@ -0,0 +1,128 @@
+require 'rails_helper'
+require 'html_normalize'
+
+describe PrettyText do
+
+  def n(html)
+    HtmlNormalize.normalize(html)
+  end
+
+  it 'supports multi choice polls' do
+    cooked = PrettyText.cook <<~MD
+      [poll type=multiple min=1 max=3 public=true]
+      * option 1
+      * option 2
+      * option 3
+      [/poll]
+    MD
+
+    expect(cooked).to include('class="poll"')
+    expect(cooked).to include('data-poll-status="open"')
+    expect(cooked).to include('data-poll-name="poll"')
+    expect(cooked).to include('data-poll-type="multiple"')
+    expect(cooked).to include('data-poll-min="1"')
+    expect(cooked).to include('data-poll-max="3"')
+    expect(cooked).to include('data-poll-public="true"')
+  end
+
+  it 'can dynamically generate a poll' do
+
+    cooked = PrettyText.cook <<~MD
+      [poll type=number min=1 max=20 step=1]
+      [/poll]
+    MD
+
+    expect(cooked.scan('<li').length).to eq(20)
+  end
+
+  it 'can properly bake 2 polls' do
+    md = <<~MD
+      this is a test
+
+      - i am a list
+
+      [poll]
+      1. test 1
+      2. test 2
+      [/poll]
+
+      [poll name=poll2]
+      1. test 1
+      2. test 2
+      [/poll]
+    MD
+
+    cooked = PrettyText.cook(md)
+    expect(cooked.scan('class="poll"').length).to eq(2)
+  end
+
+  it 'does not break poll options when going from loose to tight' do
+    md = <<~MD
+      [poll type=multiple]
+      1. test 1 :) <b>test</b>
+      2. test 2
+      [/poll]
+    MD
+
+    tight_cooked = PrettyText.cook(md)
+
+    md = <<~MD
+      [poll type=multiple]
+
+      1. test 1 :) <b>test</b>
+
+      2. test 2
+
+      [/poll]
+    MD
+
+    loose_cooked = PrettyText.cook(md)
+
+    tight_hashes = tight_cooked.scan(/data-poll-option-id=['"]([^'"]+)/)
+    loose_hashes = loose_cooked.scan(/data-poll-option-id=['"]([^'"]+)/)
+
+    expect(tight_hashes).to eq(loose_hashes)
+  end
+
+  it 'can correctly cook polls' do
+    md = <<~MD
+      [poll type=multiple]
+      1. test 1 :) <b>test</b>
+      2. test 2
+      [/poll]
+    MD
+
+    cooked = PrettyText.cook md
+
+    expected = <<~MD
+      <div class="poll" data-poll-status="open" data-poll-name="poll" data-poll-type="multiple">
+      <div>
+      <div class="poll-container">
+      <ol>
+      <li data-poll-option-id='b6475cbf6acb8676b20c60582cfc487a'>test 1 <img alt=':slight_smile:' class='emoji' src='/images/emoji/twitter/slight_smile.png?v=5' title=':slight_smile:'> <b>test</b>
+      </li>
+      <li data-poll-option-id='7158af352698eb1443d709818df097d4'>test 2</li>
+      </li>
+      </ol>
+      </div>
+      <div class="poll-info">
+      <p>
+      <span class="info-number">0</span>
+      <span class="info-text">voters</span>
+      </p>
+      <p>
+      Choose up to <strong>2</strong> options</p>
+      </div>
+      </div>
+      <div class="poll-buttons">
+      <a title="Cast your votes">Vote now!</a>
+      <a title="Display the poll results">Show results</a>
+      </div>
+      </div>
+    MD
+
+    # note, hashes should remain stable even if emoji changes cause text content is hashed
+    expect(n cooked).to eq(n expected)
+
+  end
+end
diff --git a/plugins/poll/test/javascripts/acceptance/polls-test.js.es6 b/plugins/poll/test/javascripts/acceptance/polls-test.js.es6
index 66c56b24b7c..8aadbd686de 100644
--- a/plugins/poll/test/javascripts/acceptance/polls-test.js.es6
+++ b/plugins/poll/test/javascripts/acceptance/polls-test.js.es6
@@ -5,13 +5,13 @@ acceptance("Rendering polls", {
   settings: { poll_enabled: true }
 });
 
-test("Single Poll", () => {
+test("Single Poll", (assert) => {
   server.get('/t/13.json', () => {
     return [
       200,
       { "Content-Type": "application/json" },
       {"post_stream":{"posts":[{"id":19,"name":null,"username":"tgx","avatar_template":"/images/avatar.png","created_at":"2016-12-01T02:39:49.199Z","cooked":"<div class=\"poll\" data-poll-status=\"open\" data-poll-name=\"poll\">\n<div>\n<div class=\"poll-container\"><ul>\n<li data-poll-option-id=\"57ddd734344eb7436d64a7d68a0df444\">test</li>\n<li data-poll-option-id=\"b5b78d79ab5b5d75d4d33d8b87f5d2aa\">haha</li>\n</ul></div>\n<div class=\"poll-info\"><p><span class=\"info-number\">0</span><span class=\"info-text\">voters</span></p></div>\n</div>\n<div class=\"poll-buttons\"><a title=\"Display the poll results\">Show results</a></div>\n</div>\n\n<div class=\"poll\" data-poll-status=\"open\" data-poll-name=\"test\">\n<div>\n<div class=\"poll-container\"><ul>\n<li data-poll-option-id=\"c26ad90783b0d80936e5fdb292b7963c\">donkey</li>\n<li data-poll-option-id=\"99f2b9ac452ba73b115fcf3556e6d2d4\">kong</li>\n</ul></div>\n<div class=\"poll-info\"><p><span class=\"info-number\">0</span><span class=\"info-text\">voters</span></p></div>\n</div>\n<div class=\"poll-buttons\"><a title=\"Display the poll results\">Show results</a></div>\n</div>","post_number":1,"post_type":1,"updated_at":"2016-12-01T02:47:18.317Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":13,"topic_slug":"this-is-a-test-topic-for-polls","display_username":null,"primary_group_name":null,"primary_group_flair_url":null,"primary_group_flair_bg_color":null,"primary_group_flair_color":null,"version":2,"can_edit":true,"can_delete":false,"can_recover":true,"can_wiki":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false,"polls":{"poll":{"options":[{"id":"57ddd734344eb7436d64a7d68a0df444","html":"test","votes":0},{"id":"b5b78d79ab5b5d75d4d33d8b87f5d2aa","html":"haha","votes":0}],"voters":2,"status":"open","name":"poll"},"test":{"options":[{"id":"c26ad90783b0d80936e5fdb292b7963c","html":"donkey","votes":0},{"id":"99f2b9ac452ba73b115fcf3556e6d2d4","html":"kong","votes":0}],"voters":3,"status":"open","name":"test"}}}],"stream":[19]},"timeline_lookup":[[1,0]],"id":13,"title":"This is a test topic for polls","fancy_title":"This is a test topic for polls","posts_count":1,"created_at":"2016-12-01T02:39:48.055Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2016-12-01T02:39:49.199Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"this-is-a-test-topic-for-polls","category_id":1,"word_count":10,"deleted_at":null,"user_id":1,"draft":null,"draft_key":"topic_13","draft_sequence":4,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"pinned_until":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"participants":[{"id":1,"username":"tgx","avatar_template":"/images/avatar.png","post_count":1}],"suggested_topics":[{"id":8,"title":"Welcome to Discourse","fancy_title":"Welcome to Discourse","slug":"welcome-to-discourse","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2016-11-24T02:10:54.328Z","last_posted_at":"2016-11-24T02:10:54.393Z","bumped":true,"bumped_at":"2016-11-24T02:10:54.393Z","unseen":false,"pinned":true,"unpinned":null,"excerpt":"The first paragraph of this pinned topic will be visible as a welcome message to all new visitors on your homepage. It&#39;s important! \n\nEdit this into a brief description of your community: \n\n\nWho is it for?\nWhat can they &hellip;","visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":0,"category_id":1,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":-1,"username":"system","avatar_template":"/images/avatar.png"}}]},{"id":12,"title":"Some testing topic testing","fancy_title":"Some testing topic testing","slug":"some-testing-topic-testing","posts_count":4,"reply_count":0,"highest_post_number":4,"image_url":null,"created_at":"2016-11-24T08:36:08.773Z","last_posted_at":"2016-12-01T01:15:52.008Z","bumped":true,"bumped_at":"2016-12-01T01:15:52.008Z","unseen":false,"last_read_post_number":4,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":2,"category_id":1,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"}}]},{"id":11,"title":"Some testing topic","fancy_title":"Some testing topic","slug":"some-testing-topic","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2016-11-24T08:35:26.758Z","last_posted_at":"2016-11-24T08:35:26.894Z","bumped":true,"bumped_at":"2016-11-24T08:35:26.894Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":0,"category_id":1,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"}}]}],"notification_level":3,"notifications_reason_id":1,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":1,"last_read_post_number":1,"last_read_post_id":19,"deleted_by":null,"has_deleted":false,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false}
-    ]
+    ];
   });
 
   visit("/t/this-is-a-test-topic-for-polls/13");
@@ -19,19 +19,19 @@ test("Single Poll", () => {
   andThen(() => {
     const polls = find('.poll');
 
-    equal(polls.length, 2, 'it should render the polls correctly');
-    equal(find('.info-number', polls[0]).text(), '2', 'it should display the right number of votes');
-    equal(find('.info-number', polls[1]).text(), '3', 'it should display the right number of votes');
+    assert.equal(polls.length, 2, 'it should render the polls correctly');
+    assert.equal(find('.info-number', polls[0]).text(), '2', 'it should display the right number of votes');
+    assert.equal(find('.info-number', polls[1]).text(), '3', 'it should display the right number of votes');
   });
 });
 
-test("Public poll", () => {
+test("Public poll", assert => {
   server.get('/t/12.json', () => {
     return [
       200,
       { "Content-Type": "application/json" },
       {"post_stream":{"posts":[{"id":15,"name":null,"username":"tgx","avatar_template":"/images/avatar.png","created_at":"2017-01-31T08:39:06.237Z","cooked":"<div class=\"poll\" data-poll-status=\"open\" data-poll-name=\"poll\" data-poll-type=\"multiple\" data-poll-min=\"1\" data-poll-max=\"3\" data-poll-public=\"true\">\n<div>\n<div class=\"poll-container\"><ul>\n<li data-poll-option-id=\"4d8a15e3cc35750f016ce15a43937620\">1</li>\n<li data-poll-option-id=\"cd314db7dfbac2b10687b6f39abfdf41\">2</li>\n<li data-poll-option-id=\"68b434ff88aeae7054e42cd05a4d9056\">3</li>\n</ul></div>\n<div class=\"poll-info\">\n<p><span class=\"info-number\">0</span><span class=\"info-text\">voters</span></p>\n<p>Choose up to <strong>3</strong> options</p>\n<p>Votes are public.</p>\n</div>\n</div>\n<div class=\"poll-buttons\">\n<a title=\"Cast your votes\">Vote now!</a><a title=\"Display the poll results\">Show results</a>\n</div>\n</div>","post_number":1,"post_type":1,"updated_at":"2017-01-31T08:39:06.237Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":12,"topic_slug":"this-is-a-topic-created-for-testing","display_username":null,"primary_group_name":null,"primary_group_flair_url":null,"primary_group_flair_bg_color":null,"primary_group_flair_color":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"can_wiki":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false,"polls":{"poll":{"options":[{"id":"4d8a15e3cc35750f016ce15a43937620","html":"1","votes":29},{"id":"cd314db7dfbac2b10687b6f39abfdf41","html":"2","votes":29},{"id":"68b434ff88aeae7054e42cd05a4d9056","html":"3","votes":42}],"voters":100,"status":"open","name":"poll","type":"multiple","min":"1","max":"3","public":"true"}}}],"stream":[15]},"timeline_lookup":[[1,0]],"id":12,"title":"This is a topic created for testing","fancy_title":"This is a topic created for testing","posts_count":1,"created_at":"2017-01-31T08:39:06.094Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2017-01-31T08:39:06.237Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"this-is-a-topic-created-for-testing","category_id":1,"word_count":13,"deleted_at":null,"user_id":1,"draft":null,"draft_key":"topic_12","draft_sequence":1,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"pinned_until":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"participants":[{"id":1,"username":"tgx","avatar_template":"/images/avatar.png","post_count":1,"primary_group_name":null,"primary_group_flair_url":null,"primary_group_flair_color":null,"primary_group_flair_bg_color":null}],"suggested_topics":[{"id":8,"title":"Welcome to Discourse","fancy_title":"Welcome to Discourse","slug":"welcome-to-discourse","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2017-01-31T07:53:45.363Z","last_posted_at":"2017-01-31T07:53:45.439Z","bumped":true,"bumped_at":"2017-01-31T07:53:45.439Z","unseen":false,"pinned":true,"unpinned":null,"excerpt":"The first paragraph of this pinned topic will be visible as a welcome message to all new visitors on your homepage. It&#39;s important! \n\nEdit this into a brief description of your community: \n\n\nWho is it for?\nWhat can they &hellip;","visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":0,"category_id":1,"featured_link":null,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":-1,"username":"system","avatar_template":"/images/avatar.png"}}]},{"id":11,"title":"This is a test post to try out posts","fancy_title":"This is a test post to try out posts","slug":"this-is-a-test-post-to-try-out-posts","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2017-01-31T07:55:58.407Z","last_posted_at":"2017-01-31T07:55:58.634Z","bumped":true,"bumped_at":"2017-01-31T07:55:58.634Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":1,"category_id":1,"featured_link":null,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"}}]}],"notification_level":3,"notifications_reason_id":1,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":1,"last_read_post_number":1,"last_read_post_id":15,"deleted_by":null,"has_deleted":false,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false,"featured_link":null}
-    ]
+    ];
   });
 
   server.get('/polls/voters.json', request => {
@@ -50,13 +50,13 @@ test("Public poll", () => {
 
   andThen(() => {
     const polls = find('.poll');
-    equal(polls.length, 1, 'it should render the poll correctly');
+    assert.equal(polls.length, 1, 'it should render the poll correctly');
   });
 
   click('button.toggle-results');
 
   andThen(() => {
-    equal(
+    assert.equal(
       find('.poll-voters:first li').length, 25,
       'it should display the right number of voters'
     );
@@ -65,20 +65,20 @@ test("Public poll", () => {
   click('.poll-voters-toggle-expand:first a');
 
   andThen(() => {
-    equal(
+    assert.equal(
       find('.poll-voters:first li').length, 50,
       'it should display the right number of voters'
-    )
+    );
   });
 });
 
-test("Public number poll", () => {
+test("Public number poll", assert => {
   server.get('/t/13.json', () => {
     return [
       200,
       { "Content-Type": "application/json" },
       {"post_stream":{"posts":[{"id":16,"name":null,"username":"tgx","avatar_template":"/images/avatar.png","created_at":"2017-01-31T09:11:11.281Z","cooked":"<div class=\"poll\" data-poll-status=\"open\" data-poll-name=\"poll\" data-poll-type=\"number\" data-poll-min=\"1\" data-poll-max=\"20\" data-poll-step=\"1\" data-poll-public=\"true\">\n<div>\n<div class=\"poll-container\"><ul>\n<li data-poll-option-id=\"4d8a15e3cc35750f016ce15a43937620\">1</li>\n<li data-poll-option-id=\"cd314db7dfbac2b10687b6f39abfdf41\">2</li>\n<li data-poll-option-id=\"68b434ff88aeae7054e42cd05a4d9056\">3</li>\n<li data-poll-option-id=\"aa2393b424f2f395abb63bf785760a3b\">4</li>\n<li data-poll-option-id=\"8b2f2930cac0574c3450f5db9a6fb7f9\">5</li>\n<li data-poll-option-id=\"60cad69e0cfcb3fa77a68d11d3758002\">6</li>\n<li data-poll-option-id=\"9ab1070dec27185440cdabb4948a5e9a\">7</li>\n<li data-poll-option-id=\"99944bf07088f815a966d585daed6a7e\">8</li>\n<li data-poll-option-id=\"345a83050400d78f5fac98d381b45e23\">9</li>\n<li data-poll-option-id=\"46c01f638a50d86e020f47469733b8be\">10</li>\n<li data-poll-option-id=\"07f7f85b2a3809faff68a35e81a664eb\">11</li>\n<li data-poll-option-id=\"b3e8c14e714910cb8dd7089f097be133\">12</li>\n<li data-poll-option-id=\"b4f15431e07443c372d521e4ed131abe\">13</li>\n<li data-poll-option-id=\"a77bc9a30933e5af327211db2da46e17\">14</li>\n<li data-poll-option-id=\"303d7c623da1985e94a9d27d43596934\">15</li>\n<li data-poll-option-id=\"4e885ead68ff4456f102843df9fbbd7f\">16</li>\n<li data-poll-option-id=\"cbf6e2b72e403b12d7ee63a138f32647\">17</li>\n<li data-poll-option-id=\"9364fa2d67fbd62c473165441ad69571\">18</li>\n<li data-poll-option-id=\"eb8661f072794ea57baa7827cd8ffc88\">19</li>\n<li data-poll-option-id=\"b373436e858c0821135f994a5ff3345f\">20</li>\n</ul></div>\n<div class=\"poll-info\">\n<p><span class=\"info-number\">0</span><span class=\"info-text\">voters</span></p>\n<p>Votes are public.</p>\n</div>\n</div>\n<div class=\"poll-buttons\"><a title=\"Display the poll results\">Show results</a></div>\n</div>","post_number":1,"post_type":1,"updated_at":"2017-01-31T09:11:11.281Z","reply_count":0,"reply_to_post_number":null,"quote_count":0,"avg_time":null,"incoming_link_count":0,"reads":1,"score":0,"yours":true,"topic_id":13,"topic_slug":"this-is-a-topic-for-testing-number-poll","display_username":null,"primary_group_name":null,"primary_group_flair_url":null,"primary_group_flair_bg_color":null,"primary_group_flair_color":null,"version":1,"can_edit":true,"can_delete":false,"can_recover":true,"can_wiki":true,"read":true,"user_title":null,"actions_summary":[{"id":3,"can_act":true},{"id":4,"can_act":true},{"id":5,"hidden":true,"can_act":true},{"id":7,"can_act":true},{"id":8,"can_act":true}],"moderator":false,"admin":true,"staff":true,"user_id":1,"hidden":false,"hidden_reason_id":null,"trust_level":4,"deleted_at":null,"user_deleted":false,"edit_reason":null,"can_view_edit_history":true,"wiki":false,"polls":{"poll":{"options":[{"id":"4d8a15e3cc35750f016ce15a43937620","html":"1","votes":2},{"id":"cd314db7dfbac2b10687b6f39abfdf41","html":"2","votes":1},{"id":"68b434ff88aeae7054e42cd05a4d9056","html":"3","votes":1},{"id":"aa2393b424f2f395abb63bf785760a3b","html":"4","votes":0},{"id":"8b2f2930cac0574c3450f5db9a6fb7f9","html":"5","votes":1},{"id":"60cad69e0cfcb3fa77a68d11d3758002","html":"6","votes":0},{"id":"9ab1070dec27185440cdabb4948a5e9a","html":"7","votes":1},{"id":"99944bf07088f815a966d585daed6a7e","html":"8","votes":3},{"id":"345a83050400d78f5fac98d381b45e23","html":"9","votes":3},{"id":"46c01f638a50d86e020f47469733b8be","html":"10","votes":3},{"id":"07f7f85b2a3809faff68a35e81a664eb","html":"11","votes":2},{"id":"b3e8c14e714910cb8dd7089f097be133","html":"12","votes":4},{"id":"b4f15431e07443c372d521e4ed131abe","html":"13","votes":2},{"id":"a77bc9a30933e5af327211db2da46e17","html":"14","votes":2},{"id":"303d7c623da1985e94a9d27d43596934","html":"15","votes":2},{"id":"4e885ead68ff4456f102843df9fbbd7f","html":"16","votes":1},{"id":"cbf6e2b72e403b12d7ee63a138f32647","html":"17","votes":2},{"id":"9364fa2d67fbd62c473165441ad69571","html":"18","votes":2},{"id":"eb8661f072794ea57baa7827cd8ffc88","html":"19","votes":1},{"id":"b373436e858c0821135f994a5ff3345f","html":"20","votes":2}],"voters":35,"status":"open","name":"poll","type":"number","min":"1","max":"20","step":"1","public":"true"}}}],"stream":[16]},"timeline_lookup":[[1,0]],"id":13,"title":"This is a topic for testing number poll","fancy_title":"This is a topic for testing number poll","posts_count":1,"created_at":"2017-01-31T09:11:11.161Z","views":1,"reply_count":0,"participant_count":1,"like_count":0,"last_posted_at":"2017-01-31T09:11:11.281Z","visible":true,"closed":false,"archived":false,"has_summary":false,"archetype":"regular","slug":"this-is-a-topic-for-testing-number-poll","category_id":1,"word_count":12,"deleted_at":null,"user_id":1,"draft":null,"draft_key":"topic_13","draft_sequence":1,"posted":true,"unpinned":null,"pinned_globally":false,"pinned":false,"pinned_at":null,"pinned_until":null,"details":{"auto_close_at":null,"auto_close_hours":null,"auto_close_based_on_last_post":false,"created_by":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"last_poster":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"},"participants":[{"id":1,"username":"tgx","avatar_template":"/images/avatar.png","post_count":1,"primary_group_name":null,"primary_group_flair_url":null,"primary_group_flair_color":null,"primary_group_flair_bg_color":null}],"suggested_topics":[{"id":8,"title":"Welcome to Discourse","fancy_title":"Welcome to Discourse","slug":"welcome-to-discourse","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2017-01-31T07:53:45.363Z","last_posted_at":"2017-01-31T07:53:45.439Z","bumped":true,"bumped_at":"2017-01-31T07:53:45.439Z","unseen":false,"pinned":true,"unpinned":null,"excerpt":"The first paragraph of this pinned topic will be visible as a welcome message to all new visitors on your homepage. It&#39;s important! \n\nEdit this into a brief description of your community: \n\n\nWho is it for?\nWhat can they &hellip;","visible":true,"closed":false,"archived":false,"bookmarked":null,"liked":null,"archetype":"regular","like_count":0,"views":0,"category_id":1,"featured_link":null,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":-1,"username":"system","avatar_template":"/images/avatar.png"}}]},{"id":11,"title":"This is a test post to try out posts","fancy_title":"This is a test post to try out posts","slug":"this-is-a-test-post-to-try-out-posts","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2017-01-31T07:55:58.407Z","last_posted_at":"2017-01-31T07:55:58.634Z","bumped":true,"bumped_at":"2017-01-31T07:55:58.634Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":1,"category_id":1,"featured_link":null,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"}}]},{"id":12,"title":"This is a topic created for testing","fancy_title":"This is a topic created for testing","slug":"this-is-a-topic-created-for-testing","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2017-01-31T08:39:06.094Z","last_posted_at":"2017-01-31T08:39:06.237Z","bumped":true,"bumped_at":"2017-01-31T09:10:46.528Z","unseen":false,"last_read_post_number":1,"unread":0,"new_posts":0,"pinned":false,"unpinned":null,"visible":true,"closed":false,"archived":false,"notification_level":3,"bookmarked":false,"liked":false,"archetype":"regular","like_count":0,"views":1,"category_id":1,"featured_link":null,"posters":[{"extras":"latest single","description":"Original Poster, Most Recent Poster","user":{"id":1,"username":"tgx","avatar_template":"/images/avatar.png"}}]}],"notification_level":3,"notifications_reason_id":1,"can_move_posts":true,"can_edit":true,"can_delete":true,"can_recover":true,"can_remove_allowed_users":true,"can_invite_to":true,"can_create_post":true,"can_reply_as_new_topic":true,"can_flag_topic":true},"highest_post_number":1,"last_read_post_number":1,"last_read_post_id":16,"deleted_by":null,"has_deleted":false,"actions_summary":[{"id":4,"count":0,"hidden":false,"can_act":true},{"id":7,"count":0,"hidden":false,"can_act":true},{"id":8,"count":0,"hidden":false,"can_act":true}],"chunk_size":20,"bookmarked":false,"featured_link":null}
-    ]
+    ];
   });
 
   server.get('/polls/voters.json', request => {
@@ -97,13 +97,13 @@ test("Public number poll", () => {
 
   andThen(() => {
     const polls = find('.poll');
-    equal(polls.length, 1, 'it should render the poll correctly');
+    assert.equal(polls.length, 1, 'it should render the poll correctly');
   });
 
   click('button.toggle-results');
 
   andThen(() => {
-    equal(
+    assert.equal(
       find('.poll-voters:first li').length, 25,
       'it should display the right number of voters'
     );
@@ -112,9 +112,9 @@ test("Public number poll", () => {
   click('.poll-voters-toggle-expand:first a');
 
   andThen(() => {
-    equal(
+    assert.equal(
       find('.poll-voters:first li').length, 35,
       'it should display the right number of voters'
-    )
+    );
   });
 });
diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
index 61373127de8..b81d4984181 100644
--- a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
+++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
@@ -10,7 +10,7 @@ moduleFor("controller:poll-ui-builder", "controller:poll-ui-builder", {
   needs: ['controller:modal']
 });
 
-test("isMultiple", function() {
+test("isMultiple", function(assert) {
   const controller = this.subject();
 
   controller.setProperties({
@@ -18,31 +18,31 @@ test("isMultiple", function() {
     pollOptionsCount: 1
   });
 
-  equal(controller.get("isMultiple"), true, "it should be true");
+  assert.equal(controller.get("isMultiple"), true, "it should be true");
 
   controller.set("pollOptionsCount", 0);
 
-  equal(controller.get("isMultiple"), false, "it should be false");
+  assert.equal(controller.get("isMultiple"), false, "it should be false");
 
   controller.setProperties({ pollType: "random", pollOptionsCount: 1 });
 
-  equal(controller.get("isMultiple"), false, "it should be false");
+  assert.equal(controller.get("isMultiple"), false, "it should be false");
 });
 
-test("isNumber", function() {
+test("isNumber", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
 
   controller.set("pollType", "random");
 
-  equal(controller.get("isNumber"), false, "it should be false");
+  assert.equal(controller.get("isNumber"), false, "it should be false");
 
   controller.set("pollType", controller.get("numberPollType"));
 
-  equal(controller.get("isNumber"), true, "it should be true");
+  assert.equal(controller.get("isNumber"), true, "it should be true");
 });
 
-test("showMinMax", function() {
+test("showMinMax", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
 
@@ -51,14 +51,14 @@ test("showMinMax", function() {
     isMultiple: false
   });
 
-  equal(controller.get("showMinMax"), true, "it should be true");
+  assert.equal(controller.get("showMinMax"), true, "it should be true");
 
   controller.setProperties({
     isNumber: false,
     isMultiple: true
   });
 
-  equal(controller.get("showMinMax"), true, "it should be true");
+  assert.equal(controller.get("showMinMax"), true, "it should be true");
 
   controller.setProperties({
     isNumber: false,
@@ -66,23 +66,23 @@ test("showMinMax", function() {
     isRegular: true
   });
 
-  equal(controller.get("showMinMax"), false, "it should be false");
+  assert.equal(controller.get("showMinMax"), false, "it should be false");
 });
 
-test("pollOptionsCount", function() {
+test("pollOptionsCount", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
 
   controller.set("pollOptions", "1\n2\n");
 
-  equal(controller.get("pollOptionsCount"), 2, "it should equal 2");
+  assert.equal(controller.get("pollOptionsCount"), 2, "it should equal 2");
 
   controller.set("pollOptions", "");
 
-  equal(controller.get("pollOptionsCount"), 0, "it should equal 0");
+  assert.equal(controller.get("pollOptionsCount"), 0, "it should equal 0");
 });
 
-test("pollMinOptions", function() {
+test("pollMinOptions", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
 
@@ -91,40 +91,40 @@ test("pollMinOptions", function() {
     pollOptionsCount: 1
   });
 
-  deepEqual(controller.get("pollMinOptions"), [{ name: 1, value: 1 }], "it should return the right options");
+  assert.deepEqual(controller.get("pollMinOptions"), [{ name: 1, value: 1 }], "it should return the right options");
 
   controller.set("pollOptionsCount", 2);
 
-  deepEqual(controller.get("pollMinOptions"), [
+  assert.deepEqual(controller.get("pollMinOptions"), [
     { name: 1, value: 1 }, { name: 2, value: 2 }
   ], "it should return the right options");
 
   controller.set("isNumber", true);
   controller.siteSettings.poll_maximum_options = 2;
 
-  deepEqual(controller.get("pollMinOptions"), [
+  assert.deepEqual(controller.get("pollMinOptions"), [
     { name: 1, value: 1 }, { name: 2, value: 2 }
   ], "it should return the right options");
 });
 
-test("pollMaxOptions", function() {
+test("pollMaxOptions", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
 
   controller.setProperties({ isMultiple: true, pollOptionsCount: 1, pollMin: 1 });
 
-  deepEqual(controller.get("pollMaxOptions"), [], "it should return the right options");
+  assert.deepEqual(controller.get("pollMaxOptions"), [], "it should return the right options");
 
   controller.set("pollOptionsCount", 2);
 
-  deepEqual(controller.get("pollMaxOptions"), [
+  assert.deepEqual(controller.get("pollMaxOptions"), [
     { name: 2, value: 2 }
   ], "it should return the right options");
 
   controller.siteSettings.poll_maximum_options = 3;
   controller.setProperties({ isMultiple: false, isNumber: true, pollStep: 2, pollMin: 1 });
 
-  deepEqual(controller.get("pollMaxOptions"), [
+  assert.deepEqual(controller.get("pollMaxOptions"), [
     { name: 2, value: 2 },
     { name: 3, value: 3 },
     { name: 4, value: 4 },
@@ -133,50 +133,50 @@ test("pollMaxOptions", function() {
   ], "it should return the right options");
 });
 
-test("pollStepOptions", function() {
+test("pollStepOptions", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
   controller.siteSettings.poll_maximum_options = 3;
 
   controller.set("isNumber", false);
 
-  equal(controller.get("pollStepOptions"), null, "is should return null");
+  assert.equal(controller.get("pollStepOptions"), null, "is should return null");
 
   controller.setProperties({ isNumber: true });
 
-  deepEqual(controller.get("pollStepOptions"), [
+  assert.deepEqual(controller.get("pollStepOptions"), [
     { name: 1, value: 1 },
     { name: 2, value: 2 },
     { name: 3, value: 3 }
   ], "it should return the right options");
 });
 
-test("disableInsert", function() {
+test("disableInsert", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
 
   controller.setProperties({ isRegular: true });
 
-  equal(controller.get("disableInsert"), true, "it should be true");
+  assert.equal(controller.get("disableInsert"), true, "it should be true");
 
   controller.setProperties({ isRegular: true, pollOptionsCount: 2 });
 
-  equal(controller.get("disableInsert"), false, "it should be false");
+  assert.equal(controller.get("disableInsert"), false, "it should be false");
 
   controller.setProperties({ isNumber: true });
 
-  equal(controller.get("disableInsert"), false, "it should be false");
+  assert.equal(controller.get("disableInsert"), false, "it should be false");
 
   controller.setProperties({ isNumber: false, pollOptionsCount: 3 });
 
-  equal(controller.get("disableInsert"), false, "it should be false");
+  assert.equal(controller.get("disableInsert"), false, "it should be false");
 
   controller.setProperties({ isNumber: false, pollOptionsCount: 1 });
 
-  equal(controller.get("disableInsert"), true, "it should be true");
+  assert.equal(controller.get("disableInsert"), true, "it should be true");
 });
 
-test("number pollOutput", function() {
+test("number pollOutput", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
   controller.siteSettings.poll_maximum_options = 20;
@@ -187,18 +187,18 @@ test("number pollOutput", function() {
     pollMin: 1
   });
 
-  equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output");
+  assert.equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output");
 
   controller.set("pollStep", 2);
 
-  equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=2]\n[/poll]", "it should return the right output");
+  assert.equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=2]\n[/poll]", "it should return the right output");
 
   controller.set("publicPoll", true);
 
-  equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=2 public=true]\n[/poll]", "it should return the right output");
+  assert.equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=2 public=true]\n[/poll]", "it should return the right output");
 });
 
-test("regular pollOutput", function() {
+test("regular pollOutput", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
   controller.siteSettings.poll_maximum_options = 20;
@@ -209,15 +209,15 @@ test("regular pollOutput", function() {
     pollType: controller.get("regularPollType")
   });
 
-  equal(controller.get("pollOutput"), "[poll type=regular]\n* 1\n* 2\n[/poll]", "it should return the right output");
+  assert.equal(controller.get("pollOutput"), "[poll type=regular]\n* 1\n* 2\n[/poll]", "it should return the right output");
 
   controller.set("publicPoll", "true");
 
-  equal(controller.get("pollOutput"), "[poll type=regular public=true]\n* 1\n* 2\n[/poll]", "it should return the right output");
+  assert.equal(controller.get("pollOutput"), "[poll type=regular public=true]\n* 1\n* 2\n[/poll]", "it should return the right output");
 });
 
 
-test("multiple pollOutput", function() {
+test("multiple pollOutput", function(assert) {
   const controller = this.subject();
   controller.siteSettings = Discourse.SiteSettings;
   controller.siteSettings.poll_maximum_options = 20;
@@ -229,9 +229,9 @@ test("multiple pollOutput", function() {
     pollOptions: "\n\n1\n\n2"
   });
 
-  equal(controller.get("pollOutput"), "[poll type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]", "it should return the right output");
+  assert.equal(controller.get("pollOutput"), "[poll type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]", "it should return the right output");
 
   controller.set("publicPoll", "true");
 
-  equal(controller.get("pollOutput"), "[poll type=multiple min=1 max=2 public=true]\n* 1\n* 2\n[/poll]", "it should return the right output");
+  assert.equal(controller.get("pollOutput"), "[poll type=multiple min=1 max=2 public=true]\n* 1\n* 2\n[/poll]", "it should return the right output");
 });
diff --git a/plugins/poll/test/javascripts/widgets/discourse-poll-option-test.js.es6 b/plugins/poll/test/javascripts/widgets/discourse-poll-option-test.js.es6
index e32c9836719..0d646199c7a 100644
--- a/plugins/poll/test/javascripts/widgets/discourse-poll-option-test.js.es6
+++ b/plugins/poll/test/javascripts/widgets/discourse-poll-option-test.js.es6
@@ -8,7 +8,7 @@ const template = `{{mount-widget
 widgetTest('single, not selected', {
   template,
 
-  setup() {
+  beforeEach() {
     this.set('option', { id: 'opt-id' });
     this.set('vote', []);
   },
@@ -21,7 +21,7 @@ widgetTest('single, not selected', {
 widgetTest('single, selected', {
   template,
 
-  setup() {
+  beforeEach() {
     this.set('option', { id: 'opt-id' });
     this.set('vote', ['opt-id']);
   },
@@ -34,7 +34,7 @@ widgetTest('single, selected', {
 widgetTest('multi, not selected', {
   template,
 
-  setup() {
+  beforeEach() {
     this.setProperties({
       option: { id: 'opt-id' },
       isMultiple: true,
@@ -50,7 +50,7 @@ widgetTest('multi, not selected', {
 widgetTest('multi, selected', {
   template,
 
-  setup() {
+  beforeEach() {
     this.setProperties({
       option: { id: 'opt-id' },
       isMultiple: true,
diff --git a/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6 b/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6
index f1668b11791..d289f45ae85 100644
--- a/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6
+++ b/plugins/poll/test/javascripts/widgets/discourse-poll-standard-results-test.js.es6
@@ -8,7 +8,7 @@ const template = `{{mount-widget
 widgetTest('options in descending order', {
   template,
 
-  setup() {
+  beforeEach() {
     this.set('poll', Ember.Object.create({
       options: [{ votes: 5 }, { votes: 4 }],
       voters: 9
@@ -24,7 +24,7 @@ widgetTest('options in descending order', {
 widgetTest('options in ascending order', {
   template,
 
-  setup() {
+  beforeEach() {
     this.set('poll', Ember.Object.create({
       options: [{ votes: 4 }, { votes: 5 }],
       voters: 9
@@ -40,7 +40,7 @@ widgetTest('options in ascending order', {
 widgetTest('multiple options in descending order', {
   template,
 
-  setup() {
+  beforeEach() {
     this.set('isMultiple', true);
     this.set('poll', Ember.Object.create({
       type: 'multiple',
diff --git a/public/403.ar.html b/public/403.ar.html
index 588c339ce93..eb86ac25872 100644
--- a/public/403.ar.html
+++ b/public/403.ar.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>لا يمكنك فعل ذلك (403)</title>
diff --git a/public/403.bs_BA.html b/public/403.bs_BA.html
index 7cc83396175..9fe51f8a192 100644
--- a/public/403.bs_BA.html
+++ b/public/403.bs_BA.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ne možete to učiniti (403)</title>
diff --git a/public/403.cs.html b/public/403.cs.html
index f9d2d1fc6d6..47f9f82d4ee 100644
--- a/public/403.cs.html
+++ b/public/403.cs.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Tohle nemůžete udělat (403)</title>
diff --git a/public/403.da.html b/public/403.da.html
index 6d7effe3133..b91bb8c89c5 100644
--- a/public/403.da.html
+++ b/public/403.da.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Dette kan ikke lade sig gøre (403)</title>
diff --git a/public/403.de.html b/public/403.de.html
index 1b850938db4..f83395416a2 100644
--- a/public/403.de.html
+++ b/public/403.de.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Das darfst du nicht (403)</title>
diff --git a/public/403.el.html b/public/403.el.html
index 3a9905a252c..949f481c00f 100644
--- a/public/403.el.html
+++ b/public/403.el.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Αυτό δεν επιτρέπετε να το κάνεις (403)</title>
diff --git a/public/403.es.html b/public/403.es.html
index 6a52d5deb53..0dbbdff1369 100644
--- a/public/403.es.html
+++ b/public/403.es.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>No puedes hacer eso (403)</title>
diff --git a/public/403.et.html b/public/403.et.html
index 4e3a373cd7b..3f1733c5575 100644
--- a/public/403.et.html
+++ b/public/403.et.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Sa ei saa seda teha (403)</title>
diff --git a/public/403.fa_IR.html b/public/403.fa_IR.html
index 4185ca1a21e..75372a7faff 100644
--- a/public/403.fa_IR.html
+++ b/public/403.fa_IR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>نمی‌توانید این کار را بکنید (403)</title>
diff --git a/public/403.fi.html b/public/403.fi.html
index 9f96bb42416..0eb53c7edd7 100644
--- a/public/403.fi.html
+++ b/public/403.fi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Et voi tehdä tuota (403)</title>
diff --git a/public/403.fr.html b/public/403.fr.html
index 171e83c1f57..a0e282d0986 100644
--- a/public/403.fr.html
+++ b/public/403.fr.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Vous ne pouvez pas faire ça (403)</title>
diff --git a/public/403.gl.html b/public/403.gl.html
index 4a2ac9508de..ad924ac0083 100644
--- a/public/403.gl.html
+++ b/public/403.gl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Non podes facer iso (403)</title>
diff --git a/public/403.he.html b/public/403.he.html
index 1cffb9ce026..7fe969bb000 100644
--- a/public/403.he.html
+++ b/public/403.he.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>אין לכם הרשאה (403)</title>
diff --git a/public/403.id.html b/public/403.id.html
index 3f230a9a6fb..d810b746751 100644
--- a/public/403.id.html
+++ b/public/403.id.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Kamu tidak dapat melakukan hal itu (403)</title>
diff --git a/public/403.it.html b/public/403.it.html
index da8e9cba4eb..015fe482f06 100644
--- a/public/403.it.html
+++ b/public/403.it.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Non puoi farlo (403)</title>
diff --git a/public/403.ja.html b/public/403.ja.html
index fef6db38ba7..93c1577e00d 100644
--- a/public/403.ja.html
+++ b/public/403.ja.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>403エラー</title>
+<title>許可されていません (403)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -20,7 +21,7 @@
     <h1>403</h1>
     <p>閲覧することができません。</p>
 
-    <p>お探しのページはアクセスができない状況にあるか、移動または削除された可能性があります。</p>
+    <p>Discourse の 403 ページに置き換えられます。</p>
   </div>
 </body>
 </html>
diff --git a/public/403.ko.html b/public/403.ko.html
index 2e6cb00d546..46102ed1ffb 100644
--- a/public/403.ko.html
+++ b/public/403.ko.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>권한이 없습니다. (403)</title>
@@ -18,9 +19,9 @@
 <body>
   <div class="dialog">
     <h1>403</h1>
-    <p>해당 내용을 보실 수 없습니다.</p>
+    <p>해당 내용을 보실 수 없습니다!</p>
 
-    <p>Discourse 자체 403 오류 페이지로 대체됩니다.</p>
+    <p>Discourse 자체 403 페이지로 대체됩니다.</p>
   </div>
 </body>
 </html>
diff --git a/public/403.nb_NO.html b/public/403.nb_NO.html
index 76b6e9a1cf0..b11c804fb8e 100644
--- a/public/403.nb_NO.html
+++ b/public/403.nb_NO.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Du har ikke tilgang til å gjøre dette (403)</title>
diff --git a/public/403.nl.html b/public/403.nl.html
index 7b03290e9eb..362e12559f4 100644
--- a/public/403.nl.html
+++ b/public/403.nl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Deze actie is niet toegestaan (403)</title>
diff --git a/public/403.pl_PL.html b/public/403.pl_PL.html
index ec3366bc515..38b9562f950 100644
--- a/public/403.pl_PL.html
+++ b/public/403.pl_PL.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Nie możesz tego zrobić (403)</title>
diff --git a/public/403.pt.html b/public/403.pt.html
index 674df0279a0..5d8ac58766b 100644
--- a/public/403.pt.html
+++ b/public/403.pt.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Não pode fazer isso (403)</title>
diff --git a/public/403.pt_BR.html b/public/403.pt_BR.html
index 1c00c02a819..5cc571ce712 100644
--- a/public/403.pt_BR.html
+++ b/public/403.pt_BR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Impossível acessar esta página (403)</title>
diff --git a/public/403.ro.html b/public/403.ro.html
index 0ad295eb837..8b72c158244 100644
--- a/public/403.ro.html
+++ b/public/403.ro.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Nu poți face asta (403)</title>
diff --git a/public/403.ru.html b/public/403.ru.html
index d87d9d27c92..c7cec3760da 100644
--- a/public/403.ru.html
+++ b/public/403.ru.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Действите запрещено (403)</title>
diff --git a/public/403.sk.html b/public/403.sk.html
index eca59731066..9cce25b9c61 100644
--- a/public/403.sk.html
+++ b/public/403.sk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Na toto nemáte oprávnenie (403)</title>
diff --git a/public/403.sq.html b/public/403.sq.html
index ded7ddc6bef..c745b66b48e 100644
--- a/public/403.sq.html
+++ b/public/403.sq.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Nuk mund ta bëni atë (403)</title>
diff --git a/public/403.sv.html b/public/403.sv.html
index e042091983f..3ff6f89b959 100644
--- a/public/403.sv.html
+++ b/public/403.sv.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Sådär kan du inte göra (403)</title>
diff --git a/public/403.te.html b/public/403.te.html
index 80659a1515e..1433ddde18f 100644
--- a/public/403.te.html
+++ b/public/403.te.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>మీరది చేయలేరు(403)</title>
diff --git a/public/403.tr_TR.html b/public/403.tr_TR.html
index c0f1dd3ea7c..0cae7c67317 100644
--- a/public/403.tr_TR.html
+++ b/public/403.tr_TR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Bunu yapamazsınız (403)</title>
diff --git a/public/403.uk.html b/public/403.uk.html
index 035dae104ff..8e0e7d44810 100644
--- a/public/403.uk.html
+++ b/public/403.uk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Заборонено (HTTP-403)</title>
diff --git a/public/403.ur.html b/public/403.ur.html
index 268f0bac3ff..0b66a595ad4 100644
--- a/public/403.ur.html
+++ b/public/403.ur.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>اپ ایسا نہیں کر سکتے (403)</title>
diff --git a/public/403.vi.html b/public/403.vi.html
index 20f37705289..7ddb46110bb 100644
--- a/public/403.vi.html
+++ b/public/403.vi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title> Bạn không thể làm được điều đó (403)</title>
diff --git a/public/403.zh_CN.html b/public/403.zh_CN.html
index 6d7098c5caa..0887f9e31c5 100644
--- a/public/403.zh_CN.html
+++ b/public/403.zh_CN.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>你不可以这样做 (403)</title>
diff --git a/public/403.zh_TW.html b/public/403.zh_TW.html
index 833ba110852..e7353129d0f 100644
--- a/public/403.zh_TW.html
+++ b/public/403.zh_TW.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>拒絕執行 (403)</title>
diff --git a/public/422.ar.html b/public/422.ar.html
index a32a46698e8..66aa046af64 100644
--- a/public/422.ar.html
+++ b/public/422.ar.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>رُفض التغيير الذي طلبته (422)</title>
diff --git a/public/422.bs_BA.html b/public/422.bs_BA.html
index 91cb7d2bba0..634e59250d3 100644
--- a/public/422.bs_BA.html
+++ b/public/422.bs_BA.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Promjena koju ste htjeli je odbijena (422)</title>
diff --git a/public/422.cs.html b/public/422.cs.html
index ae0439e5a16..f0b019acbf2 100644
--- a/public/422.cs.html
+++ b/public/422.cs.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Změna, kterou jste chtěl(a), byl(a) odmítnuta (422)</title>
diff --git a/public/422.da.html b/public/422.da.html
index 35363c5a15a..34f06f1ffb9 100644
--- a/public/422.da.html
+++ b/public/422.da.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Den ændring du ville lave er blevet afvist (422)</title>
diff --git a/public/422.de.html b/public/422.de.html
index 1a4e41d7f6b..e6024661252 100644
--- a/public/422.de.html
+++ b/public/422.de.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Die gewünschte Änderung wurde abgelehnt (422)</title>
diff --git a/public/422.el.html b/public/422.el.html
index f8ffc181d3d..f6e6d33c5d3 100644
--- a/public/422.el.html
+++ b/public/422.el.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Η αλλαγή που ζήτησες απορρίφθηκε (422)</title>
diff --git a/public/422.es.html b/public/422.es.html
index 54024459dcd..973befb9e8a 100644
--- a/public/422.es.html
+++ b/public/422.es.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>El cambio que querías ha sido rechazado (422)</title>
diff --git a/public/422.et.html b/public/422.et.html
index 2f776f1ab19..f7e5dff8848 100644
--- a/public/422.et.html
+++ b/public/422.et.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Muudatust, mida soovisid, ei kiidetud heaks (422)</title>
diff --git a/public/422.fa_IR.html b/public/422.fa_IR.html
index b08b4263a5a..d92f363684a 100644
--- a/public/422.fa_IR.html
+++ b/public/422.fa_IR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>تغییری که خواستید، رد شد (422)</title>
diff --git a/public/422.fi.html b/public/422.fi.html
index 68ccf75bf25..1fff8ce6a77 100644
--- a/public/422.fi.html
+++ b/public/422.fi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Haluamasi muutospyyntö hylättiin (422)</title>
diff --git a/public/422.fr.html b/public/422.fr.html
index c99663709ce..ce04617abde 100644
--- a/public/422.fr.html
+++ b/public/422.fr.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>La modification demandée a été rejetée (422)</title>
diff --git a/public/422.gl.html b/public/422.gl.html
index 98d3a1b87c7..fb07b516431 100644
--- a/public/422.gl.html
+++ b/public/422.gl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Rexeitouse o cambio pretendido (422)</title>
diff --git a/public/422.he.html b/public/422.he.html
index e8b1f51729d..594e603566e 100644
--- a/public/422.he.html
+++ b/public/422.he.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>השינוי שביקשתם נדחה (422)</title>
diff --git a/public/422.id.html b/public/422.id.html
index 4affddff5d4..91eb8b74346 100644
--- a/public/422.id.html
+++ b/public/422.id.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Perubahan yang kamu inginkan telah ditolak (422)</title>
diff --git a/public/422.it.html b/public/422.it.html
index 632fb1f52ef..1d016d0ba9f 100644
--- a/public/422.it.html
+++ b/public/422.it.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Modifica rifiutata (422)</title>
diff --git a/public/422.ja.html b/public/422.ja.html
index 9577b35e1df..2ceed7730b8 100644
--- a/public/422.ja.html
+++ b/public/422.ja.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>422エラー</title>
+<title>変更要求は拒否されました (422)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -18,8 +19,8 @@
 <body>
   <!-- This file lives in public/422.html -->
   <div class="dialog">
-    <h1>閲覧することができません。</h1>
-    <p>処理できないエンティティがあります。</p>
+    <h1>変更要求は拒否されました。</h1>
+    <p>おそらくアクセス権のないものを変更しようとしています。</p>
   </div>
 </body>
 </html>
diff --git a/public/422.ko.html b/public/422.ko.html
index a75eace8dd7..2bb626b5c7a 100644
--- a/public/422.ko.html
+++ b/public/422.ko.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>변경이 거부되었습니다. (422)</title>
diff --git a/public/422.nb_NO.html b/public/422.nb_NO.html
index acdcb6b08b2..47675f0d0d9 100644
--- a/public/422.nb_NO.html
+++ b/public/422.nb_NO.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Endringen du ønsket, ble avvist (422)</title>
diff --git a/public/422.nl.html b/public/422.nl.html
index d654bc4c9e7..f31faffbfd3 100644
--- a/public/422.nl.html
+++ b/public/422.nl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>De geplande wijziging is geweigerd (422)</title>
diff --git a/public/422.pl_PL.html b/public/422.pl_PL.html
index 7cd0bb82b3c..18e970242d7 100644
--- a/public/422.pl_PL.html
+++ b/public/422.pl_PL.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Zażądana przez Ciebie zmiana została odrzucona (422)</title>
diff --git a/public/422.pt.html b/public/422.pt.html
index 2e64ef66070..240dd474dec 100644
--- a/public/422.pt.html
+++ b/public/422.pt.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>A alteração que solicitou foi rejeitada (422)</title>
diff --git a/public/422.pt_BR.html b/public/422.pt_BR.html
index b4a30f58ca1..50ca78177db 100644
--- a/public/422.pt_BR.html
+++ b/public/422.pt_BR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>A alteração que você solicitou foi rejeitada (422)</title>
diff --git a/public/422.ro.html b/public/422.ro.html
index 9aad3b08267..d366a7e0697 100644
--- a/public/422.ro.html
+++ b/public/422.ro.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Schimbarea dorită a fost respinsă (422)</title>
diff --git a/public/422.ru.html b/public/422.ru.html
index 81caed8e086..3b7e73203aa 100644
--- a/public/422.ru.html
+++ b/public/422.ru.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ваш запрос отклонен (HTTP-422)</title>
diff --git a/public/422.sk.html b/public/422.sk.html
index 3cde526192a..5d8bb671f69 100644
--- a/public/422.sk.html
+++ b/public/422.sk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Požadovaná zmena bola zamietnutá (422)</title>
diff --git a/public/422.sq.html b/public/422.sq.html
index b4b02c2229d..9bd8fcc7831 100644
--- a/public/422.sq.html
+++ b/public/422.sq.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ndryshimet që donit të bënit u refuzuan (422)</title>
diff --git a/public/422.sv.html b/public/422.sv.html
index 20682002596..f8f3e9bcc5f 100644
--- a/public/422.sv.html
+++ b/public/422.sv.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Förändringen du ville göra nekades (422)</title>
diff --git a/public/422.te.html b/public/422.te.html
index 55437eb36a8..f47f8bc607e 100644
--- a/public/422.te.html
+++ b/public/422.te.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>మీరు చేయాలనుకున్న మార్పు తిరస్కారమైంది (422)</title>
diff --git a/public/422.tr_TR.html b/public/422.tr_TR.html
index 23af24fbfc7..0c3101fa1ea 100644
--- a/public/422.tr_TR.html
+++ b/public/422.tr_TR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>İstediğiniz değişiklik reddedildi (422)</title>
diff --git a/public/422.uk.html b/public/422.uk.html
index 42ab0b789ac..b5a1052fd5d 100644
--- a/public/422.uk.html
+++ b/public/422.uk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Зміни, які Ви намагалися внести, було відхилено (422)</title>
diff --git a/public/422.ur.html b/public/422.ur.html
index 9827ed711d9..8d561cf8e97 100644
--- a/public/422.ur.html
+++ b/public/422.ur.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>جو تبدیلی آپ چاہتے تھے اس کو مسترد کر دیا گیا (422)</title>
diff --git a/public/422.vi.html b/public/422.vi.html
index 082a63b385b..c6904f029a3 100644
--- a/public/422.vi.html
+++ b/public/422.vi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Thay đổi bạn muốn thực hiện đã bị từ chối (422)</title>
diff --git a/public/422.zh_CN.html b/public/422.zh_CN.html
index 44c14545c03..c270e0f7119 100644
--- a/public/422.zh_CN.html
+++ b/public/422.zh_CN.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>你的更改操作被拒绝  (422)</title>
diff --git a/public/422.zh_TW.html b/public/422.zh_TW.html
index a3d9f4a41e7..4a400f129d7 100644
--- a/public/422.zh_TW.html
+++ b/public/422.zh_TW.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>改動請求被拒 (422)</title>
diff --git a/public/500.ar.html b/public/500.ar.html
index 72323ee8443..afa677a3911 100644
--- a/public/500.ar.html
+++ b/public/500.ar.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>آخ - الخطأ 500</title>
diff --git a/public/500.bs_BA.html b/public/500.bs_BA.html
index e7ef753acc9..b938bd5459c 100644
--- a/public/500.bs_BA.html
+++ b/public/500.bs_BA.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - Greška 500</title>
diff --git a/public/500.cs.html b/public/500.cs.html
index 4e68ddedcb9..388a0c4d57c 100644
--- a/public/500.cs.html
+++ b/public/500.cs.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Jejda – chyba 500</title>
diff --git a/public/500.da.html b/public/500.da.html
index 2eb2158fe61..f272d4d8903 100644
--- a/public/500.da.html
+++ b/public/500.da.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hovsa - Fejl 500</title>
diff --git a/public/500.de.html b/public/500.de.html
index 5fc3b344d58..32f1d6086a7 100644
--- a/public/500.de.html
+++ b/public/500.de.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hoppla - Fehler 500</title>
diff --git a/public/500.el.html b/public/500.el.html
index 216aaf6d268..9363ac26519 100644
--- a/public/500.el.html
+++ b/public/500.el.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ωχ - Σφάλμα 500</title>
diff --git a/public/500.es.html b/public/500.es.html
index be623a4db24..42977501a4f 100644
--- a/public/500.es.html
+++ b/public/500.es.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>¡Ups! - Error 500</title>
diff --git a/public/500.et.html b/public/500.et.html
index f3c30900704..46401b6a639 100644
--- a/public/500.et.html
+++ b/public/500.et.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oh sa - viga 500</title>
diff --git a/public/500.fa_IR.html b/public/500.fa_IR.html
index 7ec53039353..4d442d0ac39 100644
--- a/public/500.fa_IR.html
+++ b/public/500.fa_IR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title> اوه - خطای 500</title>
diff --git a/public/500.fi.html b/public/500.fi.html
index d28e89d7716..d43e9cfe41e 100644
--- a/public/500.fi.html
+++ b/public/500.fi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hupsista - Virhe 500</title>
diff --git a/public/500.fr.html b/public/500.fr.html
index 1102b61f240..95d425863ce 100644
--- a/public/500.fr.html
+++ b/public/500.fr.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oups - Erreur 500</title>
diff --git a/public/500.gl.html b/public/500.gl.html
index d4708e7b8be..e279e7fa150 100644
--- a/public/500.gl.html
+++ b/public/500.gl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Vaites - Erro 500</title>
diff --git a/public/500.he.html b/public/500.he.html
index 1567e626656..ffec6877b78 100644
--- a/public/500.he.html
+++ b/public/500.he.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>אופס – שגיאה 500</title>
diff --git a/public/500.id.html b/public/500.id.html
index ae5ca303937..b30066fea3b 100644
--- a/public/500.id.html
+++ b/public/500.id.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ups - Error 500</title>
diff --git a/public/500.it.html b/public/500.it.html
index ff28f1e5458..3b941a72f4a 100644
--- a/public/500.it.html
+++ b/public/500.it.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - Errore 500</title>
diff --git a/public/500.ja.html b/public/500.ja.html
index d054cae61b7..b96f465303d 100644
--- a/public/500.ja.html
+++ b/public/500.ja.html
@@ -1,12 +1,13 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>500エラー</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>500</h1>
-    <p>予期しないエラーが発生しました。</p>
+    <h1>おっとっと</h1>
+    <p>予期しない問題が発生しました。 ご不便をおかけして申し訳ございません。</p>
     <p>エラーについての詳細情報は記録されました。自動通知を受け取りました。確認致します。</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <p>これ以上のアクションは必要ありません。ただし、問題が解決されない場合は問題が起こる手順を含めてサイトのフィードバックカテゴリなどに投稿することで詳細情報を提供することができます。</p>
 </body>
 </html>
diff --git a/public/500.ko.html b/public/500.ko.html
index b6251fae123..09e822c8630 100644
--- a/public/500.ko.html
+++ b/public/500.ko.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>죄송합니다 - 오류가 발생했습니다.  (500)</title>
@@ -7,6 +8,6 @@
     <h1>죄송합니다</h1>
     <p>이 포럼을 서비스하는 소프트웨어에서 예기치 않은 문제가 발생했습니다. 불편을 끼쳐드려 죄송합니다.</p>
     <p>해당 오류에 대한 자세한 정보가 기록되었고 자동으로 시스템 관리자에게 통보되었습니다. 살펴보고 오류를 수정하도록 하겠습니다.</p>
-    <p>더 이상의 조치가 필요하지 않습니다. 하지만 오류 상태가 지속되는 경우, 피드백 카테고리에 토론 주제를 게시하여, 오류를 재현하기위한 단계를 포함한 추가 세부 사항을 제공 할 수 있습니다.</p>
+    <p>더 이상의 조치가 필요하지 않습니다. 하지만 오류 상태가 지속되는 경우, 피드백 카테고리에 토론 토픽를 게시하여, 오류를 재현하기위한 단계를 포함한 추가 세부 사항을 제공 할 수 있습니다.</p>
 </body>
 </html>
diff --git a/public/500.nb_NO.html b/public/500.nb_NO.html
index 2aa31d97ca9..56e2c70bdb3 100644
--- a/public/500.nb_NO.html
+++ b/public/500.nb_NO.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oisann - Feil 500</title>
diff --git a/public/500.nl.html b/public/500.nl.html
index 7a092cd2a13..833c38a2f58 100644
--- a/public/500.nl.html
+++ b/public/500.nl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oeps - Fout 500</title>
diff --git a/public/500.pl_PL.html b/public/500.pl_PL.html
index 248ff1f2d9d..d326953788f 100644
--- a/public/500.pl_PL.html
+++ b/public/500.pl_PL.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ups - Błąd 500</title>
diff --git a/public/500.pt.html b/public/500.pt.html
index c49a3a46dab..277f7a87473 100644
--- a/public/500.pt.html
+++ b/public/500.pt.html
@@ -1,12 +1,13 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>Oops - Erro 500</title>
+<title>Ups - Erro 500</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
     <h1>Oops</h1>
     <p>O software que sustenta este fórum de discussão encontrou um problema inesperado. Pedimos desculpa pelo inconveniente.</p>
-    <p>Informações detalhadas sobre o erro foram registadas, e uma notificação automática foi gerada. Iremos verificar estes registos.</p>
+    <p>A informação detalhada sobre o erro foi registada, e foi gerada uma notificação automática. Nós iremos verificar o mesmo.</p>
     <p>Nenhuma ação adicional é necessária. No entanto, se a condição de erro persistir, pode fornecer detalhes adicionais, incluindo as etapas para reproduzir o erro, publicando um tópico de discussão na categoria de retorno do sítio.</p>
 </body>
 </html>
diff --git a/public/500.pt_BR.html b/public/500.pt_BR.html
index 78cf1befa39..5d45a35c2af 100644
--- a/public/500.pt_BR.html
+++ b/public/500.pt_BR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - Erro 500</title>
diff --git a/public/500.ro.html b/public/500.ro.html
index c315c0d8cdd..e599e95bec3 100644
--- a/public/500.ro.html
+++ b/public/500.ro.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - Cod de eroare 500</title>
diff --git a/public/500.ru.html b/public/500.ru.html
index 0e07ea39c4d..f7df6ca8ad2 100644
--- a/public/500.ru.html
+++ b/public/500.ru.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ой! Ошибка 500</title>
diff --git a/public/500.sk.html b/public/500.sk.html
index 6faefa31860..88e8784564d 100644
--- a/public/500.sk.html
+++ b/public/500.sk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - Chyba 500</title>
diff --git a/public/500.sq.html b/public/500.sq.html
index 107042f1940..2270f3c6e7f 100644
--- a/public/500.sq.html
+++ b/public/500.sq.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ndjesë - Gabim 500</title>
diff --git a/public/500.sv.html b/public/500.sv.html
index d84e556cdaa..e9de29fe0a7 100644
--- a/public/500.sv.html
+++ b/public/500.sv.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hoppsan - Error 500</title>
diff --git a/public/500.te.html b/public/500.te.html
index 45c48b96287..2a9452fb325 100644
--- a/public/500.te.html
+++ b/public/500.te.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>అయ్యో - దోషం 500</title>
diff --git a/public/500.tr_TR.html b/public/500.tr_TR.html
index de7139bb87f..c54c765d59a 100644
--- a/public/500.tr_TR.html
+++ b/public/500.tr_TR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hay Aksi - Hata 500</title>
diff --git a/public/500.uk.html b/public/500.uk.html
index b7627c80b60..2adf723c18f 100644
--- a/public/500.uk.html
+++ b/public/500.uk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Йой - Помилка 500</title>
diff --git a/public/500.ur.html b/public/500.ur.html
index af41c9343d8..b0feeda7b8d 100644
--- a/public/500.ur.html
+++ b/public/500.ur.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>افوہ - تکنیکی خرابی 500</title>
diff --git a/public/500.vi.html b/public/500.vi.html
index 9f4adf64708..d02ad1a8f2f 100644
--- a/public/500.vi.html
+++ b/public/500.vi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ôi - Lỗi 500</title>
diff --git a/public/500.zh_CN.html b/public/500.zh_CN.html
index a35da74f24e..70b5d50c99b 100644
--- a/public/500.zh_CN.html
+++ b/public/500.zh_CN.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>啊哦 - 错误 500</title>
diff --git a/public/500.zh_TW.html b/public/500.zh_TW.html
index b42094bb251..05278ed9342 100644
--- a/public/500.zh_TW.html
+++ b/public/500.zh_TW.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - 錯誤 500</title>
diff --git a/public/503.ar.html b/public/503.ar.html
index f9c1f9e500f..cf1b50101c8 100644
--- a/public/503.ar.html
+++ b/public/503.ar.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>الموقع تحت الصيانة - Discourse.org</title>
diff --git a/public/503.bs_BA.html b/public/503.bs_BA.html
index 75eaee4fd4e..1463fa0452a 100644
--- a/public/503.bs_BA.html
+++ b/public/503.bs_BA.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>U toku je održavanje web stranice -Discourse.org</title>
diff --git a/public/503.cs.html b/public/503.cs.html
index 45db98e3974..f6cc1bd934a 100644
--- a/public/503.cs.html
+++ b/public/503.cs.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Probíhá údržba</title>
diff --git a/public/503.da.html b/public/503.da.html
index ab8909472a8..18710fead3b 100644
--- a/public/503.da.html
+++ b/public/503.da.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Forummet er under vedligeholdelse.</title>
diff --git a/public/503.de.html b/public/503.de.html
index c84b57cdd3d..c5f3ae8faa8 100644
--- a/public/503.de.html
+++ b/public/503.de.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Website wird gerade gewartet - Discourse.org</title>
diff --git a/public/503.el.html b/public/503.el.html
index c87180b8249..829d209a869 100644
--- a/public/503.el.html
+++ b/public/503.el.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ο ιστότοπος βρίσκεται σε κατάσταση συντήρησης - Discourse.org</title>
diff --git a/public/503.es.html b/public/503.es.html
index 5b7b6f53af1..135ec37faf2 100644
--- a/public/503.es.html
+++ b/public/503.es.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>El sitio está en labores de mantenimiento - Discourse.org</title>
diff --git a/public/503.et.html b/public/503.et.html
index 8be6c197592..f84d3b877c6 100644
--- a/public/503.et.html
+++ b/public/503.et.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Teostame hooldustöid - Discourse.org</title>
diff --git a/public/503.fa_IR.html b/public/503.fa_IR.html
index 6d14e0c6839..1e5038aee70 100644
--- a/public/503.fa_IR.html
+++ b/public/503.fa_IR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>سایت در دست تعمیر و نگهداری است - Discourse.org</title>
diff --git a/public/503.fi.html b/public/503.fi.html
index 837a81a8b4f..8667dc51451 100644
--- a/public/503.fi.html
+++ b/public/503.fi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Sivustolle suoritetaan ylläpitotoimia  - Discourse.org</title>
diff --git a/public/503.fr.html b/public/503.fr.html
index 6a14566b772..d57807f37a6 100644
--- a/public/503.fr.html
+++ b/public/503.fr.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Le site en cours de maintenance - Discourse.org</title>
diff --git a/public/503.gl.html b/public/503.gl.html
index 7ffae6239a9..ad9ff5cb926 100644
--- a/public/503.gl.html
+++ b/public/503.gl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Este sitio está en mantemento - Discourse.org</title>
diff --git a/public/503.he.html b/public/503.he.html
index 19b94063d6a..2ea706e5ddd 100644
--- a/public/503.he.html
+++ b/public/503.he.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>פעילות תחזוקה מתבצעת כרגע באתר – Discourse.org</title>
diff --git a/public/503.id.html b/public/503.id.html
index c18fe1824a2..8f85d981763 100644
--- a/public/503.id.html
+++ b/public/503.id.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Situs Sedang Berada Dalam Pemeliharaan - Discourse.org</title>
diff --git a/public/503.it.html b/public/503.it.html
index 030669b1607..812e700cb06 100644
--- a/public/503.it.html
+++ b/public/503.it.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Manutenzione in corso - Discourse.org</title>
diff --git a/public/503.ja.html b/public/503.ja.html
index 14d415adb3d..ca5f0a2d4aa 100644
--- a/public/503.ja.html
+++ b/public/503.ja.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>メンテナンス中</title>
@@ -5,7 +6,7 @@
 </head>
 <body>
     <h1>サイトメンテナンス中です。</h1>
-    <p><span id="when-to-check-back">後ほど</span>、もう一度ご確認ください。</p>
+    <p><span id="when-to-check-back">暫く経ってから</span>、もう一度ご確認ください。</p>
     <p id="apology">不便をお掛けして申し訳ありません。</p>
 </body>
 </html>
diff --git a/public/503.ko.html b/public/503.ko.html
index 02e8d4b652d..2c21dc87be6 100644
--- a/public/503.ko.html
+++ b/public/503.ko.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>사이트가 현재 점검 중입니다.</title>
diff --git a/public/503.nb_NO.html b/public/503.nb_NO.html
index 80ebfe2b004..3a3a3935a98 100644
--- a/public/503.nb_NO.html
+++ b/public/503.nb_NO.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Nettstedet gjennomgår vedlikehold - Discourse.org</title>
diff --git a/public/503.nl.html b/public/503.nl.html
index 1953a6a250d..7baac2eb27a 100644
--- a/public/503.nl.html
+++ b/public/503.nl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Er wordt aan de website gewerkt - Discourse.org</title>
diff --git a/public/503.pl_PL.html b/public/503.pl_PL.html
index 64453803e8c..61ccbf62422 100644
--- a/public/503.pl_PL.html
+++ b/public/503.pl_PL.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Przerwa techniczna - Discourse.org</title>
diff --git a/public/503.pt.html b/public/503.pt.html
index 18f73d1d3d6..aff933211bf 100644
--- a/public/503.pt.html
+++ b/public/503.pt.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>O sítio está em Manutenção</title>
+<title>O site está em Manutenção - Discourse.org</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
diff --git a/public/503.pt_BR.html b/public/503.pt_BR.html
index 1cea17bebc8..11996adbb5d 100644
--- a/public/503.pt_BR.html
+++ b/public/503.pt_BR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Site Está em Manutenção - Discourse.org</title>
diff --git a/public/503.ro.html b/public/503.ro.html
index 834b98ba9a1..fd4e4a268a7 100644
--- a/public/503.ro.html
+++ b/public/503.ro.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Site-ul este în revizie - Discourse.org</title>
diff --git a/public/503.ru.html b/public/503.ru.html
index ce60ba0a854..7b89873d260 100644
--- a/public/503.ru.html
+++ b/public/503.ru.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Технические работы на сайте</title>
diff --git a/public/503.sk.html b/public/503.sk.html
index eae9f09226d..33e40967641 100644
--- a/public/503.sk.html
+++ b/public/503.sk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Na stránke sa práve vykonáva údržba.</title>
diff --git a/public/503.sq.html b/public/503.sq.html
index f62f49bbb03..508de2e3300 100644
--- a/public/503.sq.html
+++ b/public/503.sq.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Faqja është në Në Mirëmbajtje - Discourse.org.</title>
diff --git a/public/503.sv.html b/public/503.sv.html
index c6d4cd60045..55fedeaa885 100644
--- a/public/503.sv.html
+++ b/public/503.sv.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Sidan genomgår underhåll - Discourse.org</title>
diff --git a/public/503.te.html b/public/503.te.html
index 57aaa206c41..80cc500214b 100644
--- a/public/503.te.html
+++ b/public/503.te.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>డిస్కోర్స్ డాట్ ఆర్గ్ సైటు నిర్వహణలో ఉంది.</title>
diff --git a/public/503.tr_TR.html b/public/503.tr_TR.html
index a8e4090cb78..8f7c065b60b 100644
--- a/public/503.tr_TR.html
+++ b/public/503.tr_TR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Site Bakım Modunda - Discourse.org</title>
diff --git a/public/503.uk.html b/public/503.uk.html
index 7cc315548cd..2acc668de23 100644
--- a/public/503.uk.html
+++ b/public/503.uk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Технічні роботи - Discourse.org</title>
diff --git a/public/503.ur.html b/public/503.ur.html
index c6b8726fc94..d088924c012 100644
--- a/public/503.ur.html
+++ b/public/503.ur.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>ویب سائٹ کی محافظت ہو رہی ہے - Discourse.org</title>
diff --git a/public/503.vi.html b/public/503.vi.html
index 0216e902424..5f19115b546 100644
--- a/public/503.vi.html
+++ b/public/503.vi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Trang đang được bảo trì</title>
diff --git a/public/503.zh_CN.html b/public/503.zh_CN.html
index 87cf9bce6b7..9bb0fbfc316 100644
--- a/public/503.zh_CN.html
+++ b/public/503.zh_CN.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>站点正在维护中 - Discourse.org</title>
diff --git a/public/503.zh_TW.html b/public/503.zh_TW.html
index fd4f64ee7d1..4636f7b60c8 100644
--- a/public/503.zh_TW.html
+++ b/public/503.zh_TW.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>網站維護中 - Discourse.org</title>
diff --git a/public/images/emoji/apple/+1/2.png b/public/images/emoji/apple/+1/2.png
new file mode 100644
index 00000000000..f33655e0943
Binary files /dev/null and b/public/images/emoji/apple/+1/2.png differ
diff --git a/public/images/emoji/apple/+1/3.png b/public/images/emoji/apple/+1/3.png
new file mode 100644
index 00000000000..e6114682607
Binary files /dev/null and b/public/images/emoji/apple/+1/3.png differ
diff --git a/public/images/emoji/apple/+1/4.png b/public/images/emoji/apple/+1/4.png
new file mode 100644
index 00000000000..c07e81b31e3
Binary files /dev/null and b/public/images/emoji/apple/+1/4.png differ
diff --git a/public/images/emoji/apple/+1/5.png b/public/images/emoji/apple/+1/5.png
new file mode 100644
index 00000000000..c04a6c2bd8e
Binary files /dev/null and b/public/images/emoji/apple/+1/5.png differ
diff --git a/public/images/emoji/apple/+1/6.png b/public/images/emoji/apple/+1/6.png
new file mode 100644
index 00000000000..8fbc7fd36ba
Binary files /dev/null and b/public/images/emoji/apple/+1/6.png differ
diff --git a/public/images/emoji/apple/-1/2.png b/public/images/emoji/apple/-1/2.png
new file mode 100644
index 00000000000..930faaf2a54
Binary files /dev/null and b/public/images/emoji/apple/-1/2.png differ
diff --git a/public/images/emoji/apple/-1/3.png b/public/images/emoji/apple/-1/3.png
new file mode 100644
index 00000000000..29ebfe1eefe
Binary files /dev/null and b/public/images/emoji/apple/-1/3.png differ
diff --git a/public/images/emoji/apple/-1/4.png b/public/images/emoji/apple/-1/4.png
new file mode 100644
index 00000000000..0b46e9862c2
Binary files /dev/null and b/public/images/emoji/apple/-1/4.png differ
diff --git a/public/images/emoji/apple/-1/5.png b/public/images/emoji/apple/-1/5.png
new file mode 100644
index 00000000000..5ee7db294b7
Binary files /dev/null and b/public/images/emoji/apple/-1/5.png differ
diff --git a/public/images/emoji/apple/-1/6.png b/public/images/emoji/apple/-1/6.png
new file mode 100644
index 00000000000..edf1f180c89
Binary files /dev/null and b/public/images/emoji/apple/-1/6.png differ
diff --git a/public/images/emoji/apple/100.png b/public/images/emoji/apple/100.png
index 558daf7884f..d3ca5571c39 100644
Binary files a/public/images/emoji/apple/100.png and b/public/images/emoji/apple/100.png differ
diff --git a/public/images/emoji/apple/1234.png b/public/images/emoji/apple/1234.png
index 6a00c77d6b6..81ff81a4694 100644
Binary files a/public/images/emoji/apple/1234.png and b/public/images/emoji/apple/1234.png differ
diff --git a/public/images/emoji/apple/1st_place_medal.png b/public/images/emoji/apple/1st_place_medal.png
new file mode 100644
index 00000000000..c131644ef88
Binary files /dev/null and b/public/images/emoji/apple/1st_place_medal.png differ
diff --git a/public/images/emoji/apple/2nd_place_medal.png b/public/images/emoji/apple/2nd_place_medal.png
new file mode 100644
index 00000000000..ac29b9fe474
Binary files /dev/null and b/public/images/emoji/apple/2nd_place_medal.png differ
diff --git a/public/images/emoji/apple/3rd_place_medal.png b/public/images/emoji/apple/3rd_place_medal.png
new file mode 100644
index 00000000000..f34e6a3966c
Binary files /dev/null and b/public/images/emoji/apple/3rd_place_medal.png differ
diff --git a/public/images/emoji/apple/8ball.png b/public/images/emoji/apple/8ball.png
index 5b8369d0218..6eb89fb61e3 100644
Binary files a/public/images/emoji/apple/8ball.png and b/public/images/emoji/apple/8ball.png differ
diff --git a/public/images/emoji/apple/a.png b/public/images/emoji/apple/a.png
index 5d936790bc6..e9ce7879820 100644
Binary files a/public/images/emoji/apple/a.png and b/public/images/emoji/apple/a.png differ
diff --git a/public/images/emoji/apple/ab.png b/public/images/emoji/apple/ab.png
index f4a14771918..3c25fb8158f 100644
Binary files a/public/images/emoji/apple/ab.png and b/public/images/emoji/apple/ab.png differ
diff --git a/public/images/emoji/apple/abc.png b/public/images/emoji/apple/abc.png
index 02f245a71b0..9178d96490a 100644
Binary files a/public/images/emoji/apple/abc.png and b/public/images/emoji/apple/abc.png differ
diff --git a/public/images/emoji/apple/abcd.png b/public/images/emoji/apple/abcd.png
index c7f579955b2..dbfd60ddd9c 100644
Binary files a/public/images/emoji/apple/abcd.png and b/public/images/emoji/apple/abcd.png differ
diff --git a/public/images/emoji/apple/accept.png b/public/images/emoji/apple/accept.png
index b0f60d2da1c..95cee05ac4c 100644
Binary files a/public/images/emoji/apple/accept.png and b/public/images/emoji/apple/accept.png differ
diff --git a/public/images/emoji/apple/admission_tickets.png b/public/images/emoji/apple/admission_tickets.png
index 89650d6ec47..fd35e2a4d09 100644
Binary files a/public/images/emoji/apple/admission_tickets.png and b/public/images/emoji/apple/admission_tickets.png differ
diff --git a/public/images/emoji/apple/adult.png b/public/images/emoji/apple/adult.png
new file mode 100644
index 00000000000..53a5eb2ccb9
Binary files /dev/null and b/public/images/emoji/apple/adult.png differ
diff --git a/public/images/emoji/apple/adult/2.png b/public/images/emoji/apple/adult/2.png
new file mode 100644
index 00000000000..8f30fc9e389
Binary files /dev/null and b/public/images/emoji/apple/adult/2.png differ
diff --git a/public/images/emoji/apple/adult/3.png b/public/images/emoji/apple/adult/3.png
new file mode 100644
index 00000000000..36a4e57d1f8
Binary files /dev/null and b/public/images/emoji/apple/adult/3.png differ
diff --git a/public/images/emoji/apple/adult/4.png b/public/images/emoji/apple/adult/4.png
new file mode 100644
index 00000000000..77c57605e93
Binary files /dev/null and b/public/images/emoji/apple/adult/4.png differ
diff --git a/public/images/emoji/apple/adult/5.png b/public/images/emoji/apple/adult/5.png
new file mode 100644
index 00000000000..58bcd6a2fcf
Binary files /dev/null and b/public/images/emoji/apple/adult/5.png differ
diff --git a/public/images/emoji/apple/adult/6.png b/public/images/emoji/apple/adult/6.png
new file mode 100644
index 00000000000..3bc6b5a57a3
Binary files /dev/null and b/public/images/emoji/apple/adult/6.png differ
diff --git a/public/images/emoji/apple/aerial_tramway.png b/public/images/emoji/apple/aerial_tramway.png
index 9be606fb985..b4e62dcc606 100644
Binary files a/public/images/emoji/apple/aerial_tramway.png and b/public/images/emoji/apple/aerial_tramway.png differ
diff --git a/public/images/emoji/apple/afghanistan.png b/public/images/emoji/apple/afghanistan.png
new file mode 100644
index 00000000000..be9171edf7e
Binary files /dev/null and b/public/images/emoji/apple/afghanistan.png differ
diff --git a/public/images/emoji/apple/airplane.png b/public/images/emoji/apple/airplane.png
index 24848c479b4..5d7e55052d3 100644
Binary files a/public/images/emoji/apple/airplane.png and b/public/images/emoji/apple/airplane.png differ
diff --git a/public/images/emoji/apple/airplane_arriving.png b/public/images/emoji/apple/airplane_arriving.png
index e0d745e0b56..c716ff21866 100644
Binary files a/public/images/emoji/apple/airplane_arriving.png and b/public/images/emoji/apple/airplane_arriving.png differ
diff --git a/public/images/emoji/apple/airplane_departure.png b/public/images/emoji/apple/airplane_departure.png
index c862dd9a61e..d1fcea18b8a 100644
Binary files a/public/images/emoji/apple/airplane_departure.png and b/public/images/emoji/apple/airplane_departure.png differ
diff --git a/public/images/emoji/apple/airplane_small.png b/public/images/emoji/apple/airplane_small.png
index fd2075925ee..c5823b2577e 100644
Binary files a/public/images/emoji/apple/airplane_small.png and b/public/images/emoji/apple/airplane_small.png differ
diff --git a/public/images/emoji/apple/aland_islands.png b/public/images/emoji/apple/aland_islands.png
new file mode 100644
index 00000000000..0073114703a
Binary files /dev/null and b/public/images/emoji/apple/aland_islands.png differ
diff --git a/public/images/emoji/apple/alarm_clock.png b/public/images/emoji/apple/alarm_clock.png
index 040b13dc727..696265eea7e 100644
Binary files a/public/images/emoji/apple/alarm_clock.png and b/public/images/emoji/apple/alarm_clock.png differ
diff --git a/public/images/emoji/apple/albania.png b/public/images/emoji/apple/albania.png
new file mode 100644
index 00000000000..e4a013d54b5
Binary files /dev/null and b/public/images/emoji/apple/albania.png differ
diff --git a/public/images/emoji/apple/alembic.png b/public/images/emoji/apple/alembic.png
index f48867e5ea7..44b42839156 100644
Binary files a/public/images/emoji/apple/alembic.png and b/public/images/emoji/apple/alembic.png differ
diff --git a/public/images/emoji/apple/algeria.png b/public/images/emoji/apple/algeria.png
new file mode 100644
index 00000000000..915ddb8fd9a
Binary files /dev/null and b/public/images/emoji/apple/algeria.png differ
diff --git a/public/images/emoji/apple/alien.png b/public/images/emoji/apple/alien.png
index 7d09e2361e3..80cfea90ce6 100644
Binary files a/public/images/emoji/apple/alien.png and b/public/images/emoji/apple/alien.png differ
diff --git a/public/images/emoji/apple/ambulance.png b/public/images/emoji/apple/ambulance.png
index 60e6e89315d..9a35a42e932 100644
Binary files a/public/images/emoji/apple/ambulance.png and b/public/images/emoji/apple/ambulance.png differ
diff --git a/public/images/emoji/apple/american_samoa.png b/public/images/emoji/apple/american_samoa.png
new file mode 100644
index 00000000000..88fab81c2be
Binary files /dev/null and b/public/images/emoji/apple/american_samoa.png differ
diff --git a/public/images/emoji/apple/amphora.png b/public/images/emoji/apple/amphora.png
index e6471472b1c..4f8112aebd2 100644
Binary files a/public/images/emoji/apple/amphora.png and b/public/images/emoji/apple/amphora.png differ
diff --git a/public/images/emoji/apple/anchor.png b/public/images/emoji/apple/anchor.png
index 360acc71d7d..62437d71702 100644
Binary files a/public/images/emoji/apple/anchor.png and b/public/images/emoji/apple/anchor.png differ
diff --git a/public/images/emoji/apple/andorra.png b/public/images/emoji/apple/andorra.png
new file mode 100644
index 00000000000..7d3b7fd179a
Binary files /dev/null and b/public/images/emoji/apple/andorra.png differ
diff --git a/public/images/emoji/apple/angel.png b/public/images/emoji/apple/angel.png
index 1814038e188..d11e1912ed8 100644
Binary files a/public/images/emoji/apple/angel.png and b/public/images/emoji/apple/angel.png differ
diff --git a/public/images/emoji/apple/angel/2.png b/public/images/emoji/apple/angel/2.png
new file mode 100644
index 00000000000..6f0a2fd4625
Binary files /dev/null and b/public/images/emoji/apple/angel/2.png differ
diff --git a/public/images/emoji/apple/angel/3.png b/public/images/emoji/apple/angel/3.png
new file mode 100644
index 00000000000..1e9ee78ca88
Binary files /dev/null and b/public/images/emoji/apple/angel/3.png differ
diff --git a/public/images/emoji/apple/angel/4.png b/public/images/emoji/apple/angel/4.png
new file mode 100644
index 00000000000..0596fa0c4c2
Binary files /dev/null and b/public/images/emoji/apple/angel/4.png differ
diff --git a/public/images/emoji/apple/angel/5.png b/public/images/emoji/apple/angel/5.png
new file mode 100644
index 00000000000..b588a1be5b9
Binary files /dev/null and b/public/images/emoji/apple/angel/5.png differ
diff --git a/public/images/emoji/apple/angel/6.png b/public/images/emoji/apple/angel/6.png
new file mode 100644
index 00000000000..2d25ee52549
Binary files /dev/null and b/public/images/emoji/apple/angel/6.png differ
diff --git a/public/images/emoji/apple/anger.png b/public/images/emoji/apple/anger.png
index 73258285336..feb23ff499b 100644
Binary files a/public/images/emoji/apple/anger.png and b/public/images/emoji/apple/anger.png differ
diff --git a/public/images/emoji/apple/anger_right.png b/public/images/emoji/apple/anger_right.png
index af8a6055fad..95cf61d6ddc 100644
Binary files a/public/images/emoji/apple/anger_right.png and b/public/images/emoji/apple/anger_right.png differ
diff --git a/public/images/emoji/apple/angola.png b/public/images/emoji/apple/angola.png
new file mode 100644
index 00000000000..5427740da4e
Binary files /dev/null and b/public/images/emoji/apple/angola.png differ
diff --git a/public/images/emoji/apple/anguilla.png b/public/images/emoji/apple/anguilla.png
new file mode 100644
index 00000000000..9fcc3912a94
Binary files /dev/null and b/public/images/emoji/apple/anguilla.png differ
diff --git a/public/images/emoji/apple/ant.png b/public/images/emoji/apple/ant.png
index 91918b983b3..db3249a9068 100644
Binary files a/public/images/emoji/apple/ant.png and b/public/images/emoji/apple/ant.png differ
diff --git a/public/images/emoji/apple/antarctica.png b/public/images/emoji/apple/antarctica.png
new file mode 100644
index 00000000000..cb0c40bd05c
Binary files /dev/null and b/public/images/emoji/apple/antarctica.png differ
diff --git a/public/images/emoji/apple/antigua_barbuda.png b/public/images/emoji/apple/antigua_barbuda.png
new file mode 100644
index 00000000000..0bf69425b3c
Binary files /dev/null and b/public/images/emoji/apple/antigua_barbuda.png differ
diff --git a/public/images/emoji/apple/apple.png b/public/images/emoji/apple/apple.png
index 9cc10e0135b..34a88220e33 100644
Binary files a/public/images/emoji/apple/apple.png and b/public/images/emoji/apple/apple.png differ
diff --git a/public/images/emoji/apple/aquarius.png b/public/images/emoji/apple/aquarius.png
index 066169e7ee1..cecfae493ea 100644
Binary files a/public/images/emoji/apple/aquarius.png and b/public/images/emoji/apple/aquarius.png differ
diff --git a/public/images/emoji/apple/archery.png b/public/images/emoji/apple/archery.png
index ef65fe6ddc7..58c5e9f05ac 100644
Binary files a/public/images/emoji/apple/archery.png and b/public/images/emoji/apple/archery.png differ
diff --git a/public/images/emoji/apple/argentina.png b/public/images/emoji/apple/argentina.png
new file mode 100644
index 00000000000..f8fa6a686e6
Binary files /dev/null and b/public/images/emoji/apple/argentina.png differ
diff --git a/public/images/emoji/apple/aries.png b/public/images/emoji/apple/aries.png
index c1581fd898a..88af27355ca 100644
Binary files a/public/images/emoji/apple/aries.png and b/public/images/emoji/apple/aries.png differ
diff --git a/public/images/emoji/apple/armenia.png b/public/images/emoji/apple/armenia.png
new file mode 100644
index 00000000000..eb12f476c28
Binary files /dev/null and b/public/images/emoji/apple/armenia.png differ
diff --git a/public/images/emoji/apple/arrow_backward.png b/public/images/emoji/apple/arrow_backward.png
index edad1e85a1d..af4ccacf834 100644
Binary files a/public/images/emoji/apple/arrow_backward.png and b/public/images/emoji/apple/arrow_backward.png differ
diff --git a/public/images/emoji/apple/arrow_double_down.png b/public/images/emoji/apple/arrow_double_down.png
index 33665ebbe38..c69979b71e8 100644
Binary files a/public/images/emoji/apple/arrow_double_down.png and b/public/images/emoji/apple/arrow_double_down.png differ
diff --git a/public/images/emoji/apple/arrow_double_up.png b/public/images/emoji/apple/arrow_double_up.png
index 02f90659e6a..2fae00bc74c 100644
Binary files a/public/images/emoji/apple/arrow_double_up.png and b/public/images/emoji/apple/arrow_double_up.png differ
diff --git a/public/images/emoji/apple/arrow_down.png b/public/images/emoji/apple/arrow_down.png
index 3431b3f078c..8e054f92f81 100644
Binary files a/public/images/emoji/apple/arrow_down.png and b/public/images/emoji/apple/arrow_down.png differ
diff --git a/public/images/emoji/apple/arrow_down_small.png b/public/images/emoji/apple/arrow_down_small.png
index 4025487dd7b..a97cf57eba6 100644
Binary files a/public/images/emoji/apple/arrow_down_small.png and b/public/images/emoji/apple/arrow_down_small.png differ
diff --git a/public/images/emoji/apple/arrow_forward.png b/public/images/emoji/apple/arrow_forward.png
index 8f93763e8d4..778e5b0c50a 100644
Binary files a/public/images/emoji/apple/arrow_forward.png and b/public/images/emoji/apple/arrow_forward.png differ
diff --git a/public/images/emoji/apple/arrow_heading_down.png b/public/images/emoji/apple/arrow_heading_down.png
index 08b4f462867..7fb1aca1623 100644
Binary files a/public/images/emoji/apple/arrow_heading_down.png and b/public/images/emoji/apple/arrow_heading_down.png differ
diff --git a/public/images/emoji/apple/arrow_heading_up.png b/public/images/emoji/apple/arrow_heading_up.png
index 2f92eb39b46..c4b6e863e26 100644
Binary files a/public/images/emoji/apple/arrow_heading_up.png and b/public/images/emoji/apple/arrow_heading_up.png differ
diff --git a/public/images/emoji/apple/arrow_left.png b/public/images/emoji/apple/arrow_left.png
index 9a226c2cb02..29a6bb5543a 100644
Binary files a/public/images/emoji/apple/arrow_left.png and b/public/images/emoji/apple/arrow_left.png differ
diff --git a/public/images/emoji/apple/arrow_lower_left.png b/public/images/emoji/apple/arrow_lower_left.png
index f26ad0766dc..c736224c87e 100644
Binary files a/public/images/emoji/apple/arrow_lower_left.png and b/public/images/emoji/apple/arrow_lower_left.png differ
diff --git a/public/images/emoji/apple/arrow_lower_right.png b/public/images/emoji/apple/arrow_lower_right.png
index 26c75f10f91..c7f09fd49aa 100644
Binary files a/public/images/emoji/apple/arrow_lower_right.png and b/public/images/emoji/apple/arrow_lower_right.png differ
diff --git a/public/images/emoji/apple/arrow_right.png b/public/images/emoji/apple/arrow_right.png
index 8aaa86a5164..91db8b6de2f 100644
Binary files a/public/images/emoji/apple/arrow_right.png and b/public/images/emoji/apple/arrow_right.png differ
diff --git a/public/images/emoji/apple/arrow_right_hook.png b/public/images/emoji/apple/arrow_right_hook.png
index 603a1db2daf..afae92c32b8 100644
Binary files a/public/images/emoji/apple/arrow_right_hook.png and b/public/images/emoji/apple/arrow_right_hook.png differ
diff --git a/public/images/emoji/apple/arrow_up.png b/public/images/emoji/apple/arrow_up.png
index 882a3ccb1ef..6133c5b73b2 100644
Binary files a/public/images/emoji/apple/arrow_up.png and b/public/images/emoji/apple/arrow_up.png differ
diff --git a/public/images/emoji/apple/arrow_up_down.png b/public/images/emoji/apple/arrow_up_down.png
index 605b50117bc..5d737765575 100644
Binary files a/public/images/emoji/apple/arrow_up_down.png and b/public/images/emoji/apple/arrow_up_down.png differ
diff --git a/public/images/emoji/apple/arrow_up_small.png b/public/images/emoji/apple/arrow_up_small.png
index e0bbe012d07..1d97b9c9212 100644
Binary files a/public/images/emoji/apple/arrow_up_small.png and b/public/images/emoji/apple/arrow_up_small.png differ
diff --git a/public/images/emoji/apple/arrow_upper_left.png b/public/images/emoji/apple/arrow_upper_left.png
index d40ade2abab..f276922c10c 100644
Binary files a/public/images/emoji/apple/arrow_upper_left.png and b/public/images/emoji/apple/arrow_upper_left.png differ
diff --git a/public/images/emoji/apple/arrow_upper_right.png b/public/images/emoji/apple/arrow_upper_right.png
index 4c367cef587..3488c4919f0 100644
Binary files a/public/images/emoji/apple/arrow_upper_right.png and b/public/images/emoji/apple/arrow_upper_right.png differ
diff --git a/public/images/emoji/apple/arrows_clockwise.png b/public/images/emoji/apple/arrows_clockwise.png
index 9cc39ac29e8..14354590998 100644
Binary files a/public/images/emoji/apple/arrows_clockwise.png and b/public/images/emoji/apple/arrows_clockwise.png differ
diff --git a/public/images/emoji/apple/arrows_counterclockwise.png b/public/images/emoji/apple/arrows_counterclockwise.png
index 2c2180db12d..8c963872674 100644
Binary files a/public/images/emoji/apple/arrows_counterclockwise.png and b/public/images/emoji/apple/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/apple/art.png b/public/images/emoji/apple/art.png
index bad8f800bb7..428b2c3697b 100644
Binary files a/public/images/emoji/apple/art.png and b/public/images/emoji/apple/art.png differ
diff --git a/public/images/emoji/apple/articulated_lorry.png b/public/images/emoji/apple/articulated_lorry.png
index 3a204fbfbfe..7af21091c95 100644
Binary files a/public/images/emoji/apple/articulated_lorry.png and b/public/images/emoji/apple/articulated_lorry.png differ
diff --git a/public/images/emoji/apple/artificial_satellite.png b/public/images/emoji/apple/artificial_satellite.png
new file mode 100644
index 00000000000..28b9ab2fd72
Binary files /dev/null and b/public/images/emoji/apple/artificial_satellite.png differ
diff --git a/public/images/emoji/apple/aruba.png b/public/images/emoji/apple/aruba.png
new file mode 100644
index 00000000000..d3ccae8f3e0
Binary files /dev/null and b/public/images/emoji/apple/aruba.png differ
diff --git a/public/images/emoji/apple/ascension_island.png b/public/images/emoji/apple/ascension_island.png
new file mode 100644
index 00000000000..694a0b8510c
Binary files /dev/null and b/public/images/emoji/apple/ascension_island.png differ
diff --git a/public/images/emoji/apple/asterisk.png b/public/images/emoji/apple/asterisk.png
new file mode 100644
index 00000000000..f847acf58c4
Binary files /dev/null and b/public/images/emoji/apple/asterisk.png differ
diff --git a/public/images/emoji/apple/athletic_shoe.png b/public/images/emoji/apple/athletic_shoe.png
index d48dccad638..f72d3b7fce6 100644
Binary files a/public/images/emoji/apple/athletic_shoe.png and b/public/images/emoji/apple/athletic_shoe.png differ
diff --git a/public/images/emoji/apple/atm.png b/public/images/emoji/apple/atm.png
index da14d6b597d..19e711fb49b 100644
Binary files a/public/images/emoji/apple/atm.png and b/public/images/emoji/apple/atm.png differ
diff --git a/public/images/emoji/apple/atom.png b/public/images/emoji/apple/atom.png
index a323052dd76..f4debf825ba 100644
Binary files a/public/images/emoji/apple/atom.png and b/public/images/emoji/apple/atom.png differ
diff --git a/public/images/emoji/apple/atom_symbol.png b/public/images/emoji/apple/atom_symbol.png
index a323052dd76..f4debf825ba 100644
Binary files a/public/images/emoji/apple/atom_symbol.png and b/public/images/emoji/apple/atom_symbol.png differ
diff --git a/public/images/emoji/apple/australia.png b/public/images/emoji/apple/australia.png
new file mode 100644
index 00000000000..87eafc1fdcf
Binary files /dev/null and b/public/images/emoji/apple/australia.png differ
diff --git a/public/images/emoji/apple/austria.png b/public/images/emoji/apple/austria.png
new file mode 100644
index 00000000000..6cb27a834a9
Binary files /dev/null and b/public/images/emoji/apple/austria.png differ
diff --git a/public/images/emoji/apple/automobile.png b/public/images/emoji/apple/automobile.png
new file mode 100644
index 00000000000..80e24f234bc
Binary files /dev/null and b/public/images/emoji/apple/automobile.png differ
diff --git a/public/images/emoji/apple/avocado.png b/public/images/emoji/apple/avocado.png
new file mode 100644
index 00000000000..257ce74d2f2
Binary files /dev/null and b/public/images/emoji/apple/avocado.png differ
diff --git a/public/images/emoji/apple/azerbaijan.png b/public/images/emoji/apple/azerbaijan.png
new file mode 100644
index 00000000000..8b30f048f61
Binary files /dev/null and b/public/images/emoji/apple/azerbaijan.png differ
diff --git a/public/images/emoji/apple/b.png b/public/images/emoji/apple/b.png
index 26edd044cf1..969e8c64b1b 100644
Binary files a/public/images/emoji/apple/b.png and b/public/images/emoji/apple/b.png differ
diff --git a/public/images/emoji/apple/baby.png b/public/images/emoji/apple/baby.png
index 75159cf1b9a..53d8ea8e14c 100644
Binary files a/public/images/emoji/apple/baby.png and b/public/images/emoji/apple/baby.png differ
diff --git a/public/images/emoji/apple/baby/2.png b/public/images/emoji/apple/baby/2.png
new file mode 100644
index 00000000000..3c43a12250b
Binary files /dev/null and b/public/images/emoji/apple/baby/2.png differ
diff --git a/public/images/emoji/apple/baby/3.png b/public/images/emoji/apple/baby/3.png
new file mode 100644
index 00000000000..4d392a0f05e
Binary files /dev/null and b/public/images/emoji/apple/baby/3.png differ
diff --git a/public/images/emoji/apple/baby/4.png b/public/images/emoji/apple/baby/4.png
new file mode 100644
index 00000000000..25c43a52733
Binary files /dev/null and b/public/images/emoji/apple/baby/4.png differ
diff --git a/public/images/emoji/apple/baby/5.png b/public/images/emoji/apple/baby/5.png
new file mode 100644
index 00000000000..4d2148d64c2
Binary files /dev/null and b/public/images/emoji/apple/baby/5.png differ
diff --git a/public/images/emoji/apple/baby/6.png b/public/images/emoji/apple/baby/6.png
new file mode 100644
index 00000000000..3dbb035f9af
Binary files /dev/null and b/public/images/emoji/apple/baby/6.png differ
diff --git a/public/images/emoji/apple/baby_bottle.png b/public/images/emoji/apple/baby_bottle.png
index 0ab4cbe1b9e..e962c738563 100644
Binary files a/public/images/emoji/apple/baby_bottle.png and b/public/images/emoji/apple/baby_bottle.png differ
diff --git a/public/images/emoji/apple/baby_chick.png b/public/images/emoji/apple/baby_chick.png
index d4710279cf3..a6caf9dcfe0 100644
Binary files a/public/images/emoji/apple/baby_chick.png and b/public/images/emoji/apple/baby_chick.png differ
diff --git a/public/images/emoji/apple/baby_symbol.png b/public/images/emoji/apple/baby_symbol.png
index 0d28cea5579..a89f7c93326 100644
Binary files a/public/images/emoji/apple/baby_symbol.png and b/public/images/emoji/apple/baby_symbol.png differ
diff --git a/public/images/emoji/apple/back.png b/public/images/emoji/apple/back.png
index 140035bcc89..85d4fcd35e3 100644
Binary files a/public/images/emoji/apple/back.png and b/public/images/emoji/apple/back.png differ
diff --git a/public/images/emoji/apple/bacon.png b/public/images/emoji/apple/bacon.png
new file mode 100644
index 00000000000..4e07bcff2e6
Binary files /dev/null and b/public/images/emoji/apple/bacon.png differ
diff --git a/public/images/emoji/apple/badminton.png b/public/images/emoji/apple/badminton.png
index 37782ed2afe..75351047f3f 100644
Binary files a/public/images/emoji/apple/badminton.png and b/public/images/emoji/apple/badminton.png differ
diff --git a/public/images/emoji/apple/baggage_claim.png b/public/images/emoji/apple/baggage_claim.png
index 2528b527fb7..57dfec3a458 100644
Binary files a/public/images/emoji/apple/baggage_claim.png and b/public/images/emoji/apple/baggage_claim.png differ
diff --git a/public/images/emoji/apple/baguette_bread.png b/public/images/emoji/apple/baguette_bread.png
new file mode 100644
index 00000000000..f6b2159c238
Binary files /dev/null and b/public/images/emoji/apple/baguette_bread.png differ
diff --git a/public/images/emoji/apple/bahamas.png b/public/images/emoji/apple/bahamas.png
new file mode 100644
index 00000000000..3ccd6ebf954
Binary files /dev/null and b/public/images/emoji/apple/bahamas.png differ
diff --git a/public/images/emoji/apple/bahrain.png b/public/images/emoji/apple/bahrain.png
new file mode 100644
index 00000000000..c3de96b0bb9
Binary files /dev/null and b/public/images/emoji/apple/bahrain.png differ
diff --git a/public/images/emoji/apple/balance_scale.png b/public/images/emoji/apple/balance_scale.png
new file mode 100644
index 00000000000..5a49f802a7a
Binary files /dev/null and b/public/images/emoji/apple/balance_scale.png differ
diff --git a/public/images/emoji/apple/balloon.png b/public/images/emoji/apple/balloon.png
index 49ef78adc77..e78b0e74d0b 100644
Binary files a/public/images/emoji/apple/balloon.png and b/public/images/emoji/apple/balloon.png differ
diff --git a/public/images/emoji/apple/ballot_box.png b/public/images/emoji/apple/ballot_box.png
index e8c267c5da1..a0894da6cd5 100644
Binary files a/public/images/emoji/apple/ballot_box.png and b/public/images/emoji/apple/ballot_box.png differ
diff --git a/public/images/emoji/apple/ballot_box_with_ballot.png b/public/images/emoji/apple/ballot_box_with_ballot.png
index e8c267c5da1..a0894da6cd5 100644
Binary files a/public/images/emoji/apple/ballot_box_with_ballot.png and b/public/images/emoji/apple/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/apple/ballot_box_with_check.png b/public/images/emoji/apple/ballot_box_with_check.png
index 6f24d4f64cf..d185b09e3a8 100644
Binary files a/public/images/emoji/apple/ballot_box_with_check.png and b/public/images/emoji/apple/ballot_box_with_check.png differ
diff --git a/public/images/emoji/apple/bamboo.png b/public/images/emoji/apple/bamboo.png
index 7417a96925c..2c1c4b1bb8a 100644
Binary files a/public/images/emoji/apple/bamboo.png and b/public/images/emoji/apple/bamboo.png differ
diff --git a/public/images/emoji/apple/banana.png b/public/images/emoji/apple/banana.png
index f0040f4979b..782b22d6650 100644
Binary files a/public/images/emoji/apple/banana.png and b/public/images/emoji/apple/banana.png differ
diff --git a/public/images/emoji/apple/bangbang.png b/public/images/emoji/apple/bangbang.png
index e43d3ba44a9..20cfbaf4919 100644
Binary files a/public/images/emoji/apple/bangbang.png and b/public/images/emoji/apple/bangbang.png differ
diff --git a/public/images/emoji/apple/bangladesh.png b/public/images/emoji/apple/bangladesh.png
new file mode 100644
index 00000000000..80d8445398c
Binary files /dev/null and b/public/images/emoji/apple/bangladesh.png differ
diff --git a/public/images/emoji/apple/bank.png b/public/images/emoji/apple/bank.png
index 4fce3c5995a..49a1cffcd66 100644
Binary files a/public/images/emoji/apple/bank.png and b/public/images/emoji/apple/bank.png differ
diff --git a/public/images/emoji/apple/bar_chart.png b/public/images/emoji/apple/bar_chart.png
index 53d32767887..bab80b48cc3 100644
Binary files a/public/images/emoji/apple/bar_chart.png and b/public/images/emoji/apple/bar_chart.png differ
diff --git a/public/images/emoji/apple/barbados.png b/public/images/emoji/apple/barbados.png
new file mode 100644
index 00000000000..86d7b00878a
Binary files /dev/null and b/public/images/emoji/apple/barbados.png differ
diff --git a/public/images/emoji/apple/barber.png b/public/images/emoji/apple/barber.png
index acb0a5b80a2..9e773ad2d9c 100644
Binary files a/public/images/emoji/apple/barber.png and b/public/images/emoji/apple/barber.png differ
diff --git a/public/images/emoji/apple/baseball.png b/public/images/emoji/apple/baseball.png
index 315ac1874d8..dcea0321561 100644
Binary files a/public/images/emoji/apple/baseball.png and b/public/images/emoji/apple/baseball.png differ
diff --git a/public/images/emoji/apple/basketball.png b/public/images/emoji/apple/basketball.png
index f037db4ba91..c70ae0922ec 100644
Binary files a/public/images/emoji/apple/basketball.png and b/public/images/emoji/apple/basketball.png differ
diff --git a/public/images/emoji/apple/basketball_man.png b/public/images/emoji/apple/basketball_man.png
new file mode 100644
index 00000000000..2476fa9f0cb
Binary files /dev/null and b/public/images/emoji/apple/basketball_man.png differ
diff --git a/public/images/emoji/apple/basketball_man/2.png b/public/images/emoji/apple/basketball_man/2.png
new file mode 100644
index 00000000000..dbec120de00
Binary files /dev/null and b/public/images/emoji/apple/basketball_man/2.png differ
diff --git a/public/images/emoji/apple/basketball_man/3.png b/public/images/emoji/apple/basketball_man/3.png
new file mode 100644
index 00000000000..a9ccd274623
Binary files /dev/null and b/public/images/emoji/apple/basketball_man/3.png differ
diff --git a/public/images/emoji/apple/basketball_man/4.png b/public/images/emoji/apple/basketball_man/4.png
new file mode 100644
index 00000000000..079cd2a900b
Binary files /dev/null and b/public/images/emoji/apple/basketball_man/4.png differ
diff --git a/public/images/emoji/apple/basketball_man/5.png b/public/images/emoji/apple/basketball_man/5.png
new file mode 100644
index 00000000000..905f5af468e
Binary files /dev/null and b/public/images/emoji/apple/basketball_man/5.png differ
diff --git a/public/images/emoji/apple/basketball_man/6.png b/public/images/emoji/apple/basketball_man/6.png
new file mode 100644
index 00000000000..c03789f5d05
Binary files /dev/null and b/public/images/emoji/apple/basketball_man/6.png differ
diff --git a/public/images/emoji/apple/basketball_player.png b/public/images/emoji/apple/basketball_player.png
index 1a2255c2f80..2476fa9f0cb 100644
Binary files a/public/images/emoji/apple/basketball_player.png and b/public/images/emoji/apple/basketball_player.png differ
diff --git a/public/images/emoji/apple/basketball_player/2.png b/public/images/emoji/apple/basketball_player/2.png
new file mode 100644
index 00000000000..dbec120de00
Binary files /dev/null and b/public/images/emoji/apple/basketball_player/2.png differ
diff --git a/public/images/emoji/apple/basketball_player/3.png b/public/images/emoji/apple/basketball_player/3.png
new file mode 100644
index 00000000000..a9ccd274623
Binary files /dev/null and b/public/images/emoji/apple/basketball_player/3.png differ
diff --git a/public/images/emoji/apple/basketball_player/4.png b/public/images/emoji/apple/basketball_player/4.png
new file mode 100644
index 00000000000..079cd2a900b
Binary files /dev/null and b/public/images/emoji/apple/basketball_player/4.png differ
diff --git a/public/images/emoji/apple/basketball_player/5.png b/public/images/emoji/apple/basketball_player/5.png
new file mode 100644
index 00000000000..905f5af468e
Binary files /dev/null and b/public/images/emoji/apple/basketball_player/5.png differ
diff --git a/public/images/emoji/apple/basketball_player/6.png b/public/images/emoji/apple/basketball_player/6.png
new file mode 100644
index 00000000000..c03789f5d05
Binary files /dev/null and b/public/images/emoji/apple/basketball_player/6.png differ
diff --git a/public/images/emoji/apple/basketball_woman.png b/public/images/emoji/apple/basketball_woman.png
new file mode 100644
index 00000000000..306605a0f3f
Binary files /dev/null and b/public/images/emoji/apple/basketball_woman.png differ
diff --git a/public/images/emoji/apple/bat.png b/public/images/emoji/apple/bat.png
new file mode 100644
index 00000000000..09f7b29e62b
Binary files /dev/null and b/public/images/emoji/apple/bat.png differ
diff --git a/public/images/emoji/apple/bath/2.png b/public/images/emoji/apple/bath/2.png
new file mode 100644
index 00000000000..6f10b75f665
Binary files /dev/null and b/public/images/emoji/apple/bath/2.png differ
diff --git a/public/images/emoji/apple/bath/3.png b/public/images/emoji/apple/bath/3.png
new file mode 100644
index 00000000000..e75d9ac22ab
Binary files /dev/null and b/public/images/emoji/apple/bath/3.png differ
diff --git a/public/images/emoji/apple/bath/4.png b/public/images/emoji/apple/bath/4.png
new file mode 100644
index 00000000000..8b5d4a85e00
Binary files /dev/null and b/public/images/emoji/apple/bath/4.png differ
diff --git a/public/images/emoji/apple/bath/5.png b/public/images/emoji/apple/bath/5.png
new file mode 100644
index 00000000000..d70dbc8b132
Binary files /dev/null and b/public/images/emoji/apple/bath/5.png differ
diff --git a/public/images/emoji/apple/bath/6.png b/public/images/emoji/apple/bath/6.png
new file mode 100644
index 00000000000..be196ac2b43
Binary files /dev/null and b/public/images/emoji/apple/bath/6.png differ
diff --git a/public/images/emoji/apple/battery.png b/public/images/emoji/apple/battery.png
index 1f489f52189..e24a27246af 100644
Binary files a/public/images/emoji/apple/battery.png and b/public/images/emoji/apple/battery.png differ
diff --git a/public/images/emoji/apple/beach.png b/public/images/emoji/apple/beach.png
index 1c2f59baead..1bcdb8de9e3 100644
Binary files a/public/images/emoji/apple/beach.png and b/public/images/emoji/apple/beach.png differ
diff --git a/public/images/emoji/apple/beach_umbrella.png b/public/images/emoji/apple/beach_umbrella.png
index c51ce16d0a5..1bcdb8de9e3 100644
Binary files a/public/images/emoji/apple/beach_umbrella.png and b/public/images/emoji/apple/beach_umbrella.png differ
diff --git a/public/images/emoji/apple/beach_with_umbrella.png b/public/images/emoji/apple/beach_with_umbrella.png
index 1c2f59baead..1bcdb8de9e3 100644
Binary files a/public/images/emoji/apple/beach_with_umbrella.png and b/public/images/emoji/apple/beach_with_umbrella.png differ
diff --git a/public/images/emoji/apple/bear.png b/public/images/emoji/apple/bear.png
index 331905dc2fa..ec039286658 100644
Binary files a/public/images/emoji/apple/bear.png and b/public/images/emoji/apple/bear.png differ
diff --git a/public/images/emoji/apple/bearded_person.png b/public/images/emoji/apple/bearded_person.png
new file mode 100644
index 00000000000..ed22a6cb381
Binary files /dev/null and b/public/images/emoji/apple/bearded_person.png differ
diff --git a/public/images/emoji/apple/bearded_person/2.png b/public/images/emoji/apple/bearded_person/2.png
new file mode 100644
index 00000000000..4a2fdeb3040
Binary files /dev/null and b/public/images/emoji/apple/bearded_person/2.png differ
diff --git a/public/images/emoji/apple/bearded_person/3.png b/public/images/emoji/apple/bearded_person/3.png
new file mode 100644
index 00000000000..b1f6e168d7c
Binary files /dev/null and b/public/images/emoji/apple/bearded_person/3.png differ
diff --git a/public/images/emoji/apple/bearded_person/4.png b/public/images/emoji/apple/bearded_person/4.png
new file mode 100644
index 00000000000..f75b75a74e9
Binary files /dev/null and b/public/images/emoji/apple/bearded_person/4.png differ
diff --git a/public/images/emoji/apple/bearded_person/5.png b/public/images/emoji/apple/bearded_person/5.png
new file mode 100644
index 00000000000..a9665b318a4
Binary files /dev/null and b/public/images/emoji/apple/bearded_person/5.png differ
diff --git a/public/images/emoji/apple/bearded_person/6.png b/public/images/emoji/apple/bearded_person/6.png
new file mode 100644
index 00000000000..a42b3caf88c
Binary files /dev/null and b/public/images/emoji/apple/bearded_person/6.png differ
diff --git a/public/images/emoji/apple/bed.png b/public/images/emoji/apple/bed.png
index 5090810a159..e76eafea282 100644
Binary files a/public/images/emoji/apple/bed.png and b/public/images/emoji/apple/bed.png differ
diff --git a/public/images/emoji/apple/bee.png b/public/images/emoji/apple/bee.png
index e0509aaaeb5..82d7aa8a5af 100644
Binary files a/public/images/emoji/apple/bee.png and b/public/images/emoji/apple/bee.png differ
diff --git a/public/images/emoji/apple/beer.png b/public/images/emoji/apple/beer.png
index ba1601298cd..dee2a7426ba 100644
Binary files a/public/images/emoji/apple/beer.png and b/public/images/emoji/apple/beer.png differ
diff --git a/public/images/emoji/apple/beers.png b/public/images/emoji/apple/beers.png
index 3a1d92b5a5b..99347ea51fe 100644
Binary files a/public/images/emoji/apple/beers.png and b/public/images/emoji/apple/beers.png differ
diff --git a/public/images/emoji/apple/beetle.png b/public/images/emoji/apple/beetle.png
index 17db97019f5..2c5f55b06fe 100644
Binary files a/public/images/emoji/apple/beetle.png and b/public/images/emoji/apple/beetle.png differ
diff --git a/public/images/emoji/apple/beginner.png b/public/images/emoji/apple/beginner.png
index 6b1de97e42a..6a4f8ce0619 100644
Binary files a/public/images/emoji/apple/beginner.png and b/public/images/emoji/apple/beginner.png differ
diff --git a/public/images/emoji/apple/belarus.png b/public/images/emoji/apple/belarus.png
new file mode 100644
index 00000000000..359cf42af7b
Binary files /dev/null and b/public/images/emoji/apple/belarus.png differ
diff --git a/public/images/emoji/apple/belgium.png b/public/images/emoji/apple/belgium.png
new file mode 100644
index 00000000000..56c56c4fa98
Binary files /dev/null and b/public/images/emoji/apple/belgium.png differ
diff --git a/public/images/emoji/apple/belize.png b/public/images/emoji/apple/belize.png
new file mode 100644
index 00000000000..891e7eafa3d
Binary files /dev/null and b/public/images/emoji/apple/belize.png differ
diff --git a/public/images/emoji/apple/bell.png b/public/images/emoji/apple/bell.png
index 2cf876bf985..b90bc772ed5 100644
Binary files a/public/images/emoji/apple/bell.png and b/public/images/emoji/apple/bell.png differ
diff --git a/public/images/emoji/apple/bellhop.png b/public/images/emoji/apple/bellhop.png
index 577cbe34b4e..69432ddeceb 100644
Binary files a/public/images/emoji/apple/bellhop.png and b/public/images/emoji/apple/bellhop.png differ
diff --git a/public/images/emoji/apple/bellhop_bell.png b/public/images/emoji/apple/bellhop_bell.png
index 577cbe34b4e..69432ddeceb 100644
Binary files a/public/images/emoji/apple/bellhop_bell.png and b/public/images/emoji/apple/bellhop_bell.png differ
diff --git a/public/images/emoji/apple/benin.png b/public/images/emoji/apple/benin.png
new file mode 100644
index 00000000000..f9e2d82420a
Binary files /dev/null and b/public/images/emoji/apple/benin.png differ
diff --git a/public/images/emoji/apple/bento.png b/public/images/emoji/apple/bento.png
index 223bad7481e..1f51db409f0 100644
Binary files a/public/images/emoji/apple/bento.png and b/public/images/emoji/apple/bento.png differ
diff --git a/public/images/emoji/apple/bermuda.png b/public/images/emoji/apple/bermuda.png
new file mode 100644
index 00000000000..396d2a914d3
Binary files /dev/null and b/public/images/emoji/apple/bermuda.png differ
diff --git a/public/images/emoji/apple/bhutan.png b/public/images/emoji/apple/bhutan.png
new file mode 100644
index 00000000000..ab0b841e405
Binary files /dev/null and b/public/images/emoji/apple/bhutan.png differ
diff --git a/public/images/emoji/apple/bicyclist/2.png b/public/images/emoji/apple/bicyclist/2.png
new file mode 100644
index 00000000000..0c78d1fdfb7
Binary files /dev/null and b/public/images/emoji/apple/bicyclist/2.png differ
diff --git a/public/images/emoji/apple/bicyclist/3.png b/public/images/emoji/apple/bicyclist/3.png
new file mode 100644
index 00000000000..c624c80e909
Binary files /dev/null and b/public/images/emoji/apple/bicyclist/3.png differ
diff --git a/public/images/emoji/apple/bicyclist/4.png b/public/images/emoji/apple/bicyclist/4.png
new file mode 100644
index 00000000000..e80a3b687ce
Binary files /dev/null and b/public/images/emoji/apple/bicyclist/4.png differ
diff --git a/public/images/emoji/apple/bicyclist/5.png b/public/images/emoji/apple/bicyclist/5.png
new file mode 100644
index 00000000000..2f1e0bdf294
Binary files /dev/null and b/public/images/emoji/apple/bicyclist/5.png differ
diff --git a/public/images/emoji/apple/bicyclist/6.png b/public/images/emoji/apple/bicyclist/6.png
new file mode 100644
index 00000000000..c9c8b683186
Binary files /dev/null and b/public/images/emoji/apple/bicyclist/6.png differ
diff --git a/public/images/emoji/apple/bike.png b/public/images/emoji/apple/bike.png
index 717e6071947..fc80f8e85de 100644
Binary files a/public/images/emoji/apple/bike.png and b/public/images/emoji/apple/bike.png differ
diff --git a/public/images/emoji/apple/biking_man.png b/public/images/emoji/apple/biking_man.png
new file mode 100644
index 00000000000..433c9308a09
Binary files /dev/null and b/public/images/emoji/apple/biking_man.png differ
diff --git a/public/images/emoji/apple/biking_man/2.png b/public/images/emoji/apple/biking_man/2.png
new file mode 100644
index 00000000000..0c78d1fdfb7
Binary files /dev/null and b/public/images/emoji/apple/biking_man/2.png differ
diff --git a/public/images/emoji/apple/biking_man/3.png b/public/images/emoji/apple/biking_man/3.png
new file mode 100644
index 00000000000..c624c80e909
Binary files /dev/null and b/public/images/emoji/apple/biking_man/3.png differ
diff --git a/public/images/emoji/apple/biking_man/4.png b/public/images/emoji/apple/biking_man/4.png
new file mode 100644
index 00000000000..e80a3b687ce
Binary files /dev/null and b/public/images/emoji/apple/biking_man/4.png differ
diff --git a/public/images/emoji/apple/biking_man/5.png b/public/images/emoji/apple/biking_man/5.png
new file mode 100644
index 00000000000..2f1e0bdf294
Binary files /dev/null and b/public/images/emoji/apple/biking_man/5.png differ
diff --git a/public/images/emoji/apple/biking_man/6.png b/public/images/emoji/apple/biking_man/6.png
new file mode 100644
index 00000000000..c9c8b683186
Binary files /dev/null and b/public/images/emoji/apple/biking_man/6.png differ
diff --git a/public/images/emoji/apple/biking_woman.png b/public/images/emoji/apple/biking_woman.png
new file mode 100644
index 00000000000..d7a39f4be6e
Binary files /dev/null and b/public/images/emoji/apple/biking_woman.png differ
diff --git a/public/images/emoji/apple/biking_woman/2.png b/public/images/emoji/apple/biking_woman/2.png
new file mode 100644
index 00000000000..e512f6918d6
Binary files /dev/null and b/public/images/emoji/apple/biking_woman/2.png differ
diff --git a/public/images/emoji/apple/biking_woman/3.png b/public/images/emoji/apple/biking_woman/3.png
new file mode 100644
index 00000000000..71cdc8a81b6
Binary files /dev/null and b/public/images/emoji/apple/biking_woman/3.png differ
diff --git a/public/images/emoji/apple/biking_woman/4.png b/public/images/emoji/apple/biking_woman/4.png
new file mode 100644
index 00000000000..b0b26f4d571
Binary files /dev/null and b/public/images/emoji/apple/biking_woman/4.png differ
diff --git a/public/images/emoji/apple/biking_woman/5.png b/public/images/emoji/apple/biking_woman/5.png
new file mode 100644
index 00000000000..f978924aa03
Binary files /dev/null and b/public/images/emoji/apple/biking_woman/5.png differ
diff --git a/public/images/emoji/apple/biking_woman/6.png b/public/images/emoji/apple/biking_woman/6.png
new file mode 100644
index 00000000000..963e2127eeb
Binary files /dev/null and b/public/images/emoji/apple/biking_woman/6.png differ
diff --git a/public/images/emoji/apple/bikini.png b/public/images/emoji/apple/bikini.png
index e9d8a9c1d07..68581f4ac11 100644
Binary files a/public/images/emoji/apple/bikini.png and b/public/images/emoji/apple/bikini.png differ
diff --git a/public/images/emoji/apple/billed_cap.png b/public/images/emoji/apple/billed_cap.png
new file mode 100644
index 00000000000..5cc92e307e1
Binary files /dev/null and b/public/images/emoji/apple/billed_cap.png differ
diff --git a/public/images/emoji/apple/biohazard.png b/public/images/emoji/apple/biohazard.png
index fbb8f77193a..f2e5aa7be16 100644
Binary files a/public/images/emoji/apple/biohazard.png and b/public/images/emoji/apple/biohazard.png differ
diff --git a/public/images/emoji/apple/biohazard_sign.png b/public/images/emoji/apple/biohazard_sign.png
index fbb8f77193a..f2e5aa7be16 100644
Binary files a/public/images/emoji/apple/biohazard_sign.png and b/public/images/emoji/apple/biohazard_sign.png differ
diff --git a/public/images/emoji/apple/bird.png b/public/images/emoji/apple/bird.png
index d0736d873ba..5eeaa1b1956 100644
Binary files a/public/images/emoji/apple/bird.png and b/public/images/emoji/apple/bird.png differ
diff --git a/public/images/emoji/apple/birthday.png b/public/images/emoji/apple/birthday.png
index 0a9b035d897..7ff9d9ef735 100644
Binary files a/public/images/emoji/apple/birthday.png and b/public/images/emoji/apple/birthday.png differ
diff --git a/public/images/emoji/apple/black_circle.png b/public/images/emoji/apple/black_circle.png
index f98c9996b44..892b54bc762 100644
Binary files a/public/images/emoji/apple/black_circle.png and b/public/images/emoji/apple/black_circle.png differ
diff --git a/public/images/emoji/apple/black_flag.png b/public/images/emoji/apple/black_flag.png
new file mode 100644
index 00000000000..36a0a6987d1
Binary files /dev/null and b/public/images/emoji/apple/black_flag.png differ
diff --git a/public/images/emoji/apple/black_heart.png b/public/images/emoji/apple/black_heart.png
new file mode 100644
index 00000000000..ccaf467692a
Binary files /dev/null and b/public/images/emoji/apple/black_heart.png differ
diff --git a/public/images/emoji/apple/black_joker.png b/public/images/emoji/apple/black_joker.png
index 86af5a28e3a..04612a7f1f7 100644
Binary files a/public/images/emoji/apple/black_joker.png and b/public/images/emoji/apple/black_joker.png differ
diff --git a/public/images/emoji/apple/black_large_square.png b/public/images/emoji/apple/black_large_square.png
index 84a0d2fa6d0..b578a1bbc7a 100644
Binary files a/public/images/emoji/apple/black_large_square.png and b/public/images/emoji/apple/black_large_square.png differ
diff --git a/public/images/emoji/apple/black_medium_small_square.png b/public/images/emoji/apple/black_medium_small_square.png
index d943d06a5a7..f1b82ecfd9c 100644
Binary files a/public/images/emoji/apple/black_medium_small_square.png and b/public/images/emoji/apple/black_medium_small_square.png differ
diff --git a/public/images/emoji/apple/black_medium_square.png b/public/images/emoji/apple/black_medium_square.png
index 84a0d2fa6d0..7aa31112428 100644
Binary files a/public/images/emoji/apple/black_medium_square.png and b/public/images/emoji/apple/black_medium_square.png differ
diff --git a/public/images/emoji/apple/black_nib.png b/public/images/emoji/apple/black_nib.png
index e7cd942f5b1..a728708b976 100644
Binary files a/public/images/emoji/apple/black_nib.png and b/public/images/emoji/apple/black_nib.png differ
diff --git a/public/images/emoji/apple/black_small_square.png b/public/images/emoji/apple/black_small_square.png
index e2a54c5652e..b49a1e165e4 100644
Binary files a/public/images/emoji/apple/black_small_square.png and b/public/images/emoji/apple/black_small_square.png differ
diff --git a/public/images/emoji/apple/black_square_button.png b/public/images/emoji/apple/black_square_button.png
index d97c2ff9a8e..dada1ab8b88 100644
Binary files a/public/images/emoji/apple/black_square_button.png and b/public/images/emoji/apple/black_square_button.png differ
diff --git a/public/images/emoji/apple/blonde_man.png b/public/images/emoji/apple/blonde_man.png
new file mode 100644
index 00000000000..005aeefedaa
Binary files /dev/null and b/public/images/emoji/apple/blonde_man.png differ
diff --git a/public/images/emoji/apple/blonde_man/2.png b/public/images/emoji/apple/blonde_man/2.png
new file mode 100644
index 00000000000..9e43423fdb2
Binary files /dev/null and b/public/images/emoji/apple/blonde_man/2.png differ
diff --git a/public/images/emoji/apple/blonde_man/3.png b/public/images/emoji/apple/blonde_man/3.png
new file mode 100644
index 00000000000..b36f1a69db6
Binary files /dev/null and b/public/images/emoji/apple/blonde_man/3.png differ
diff --git a/public/images/emoji/apple/blonde_man/4.png b/public/images/emoji/apple/blonde_man/4.png
new file mode 100644
index 00000000000..901dfcaa062
Binary files /dev/null and b/public/images/emoji/apple/blonde_man/4.png differ
diff --git a/public/images/emoji/apple/blonde_man/5.png b/public/images/emoji/apple/blonde_man/5.png
new file mode 100644
index 00000000000..5aaa84154a1
Binary files /dev/null and b/public/images/emoji/apple/blonde_man/5.png differ
diff --git a/public/images/emoji/apple/blonde_man/6.png b/public/images/emoji/apple/blonde_man/6.png
new file mode 100644
index 00000000000..261b2470e3b
Binary files /dev/null and b/public/images/emoji/apple/blonde_man/6.png differ
diff --git a/public/images/emoji/apple/blonde_woman.png b/public/images/emoji/apple/blonde_woman.png
new file mode 100644
index 00000000000..1583be196e0
Binary files /dev/null and b/public/images/emoji/apple/blonde_woman.png differ
diff --git a/public/images/emoji/apple/blonde_woman/2.png b/public/images/emoji/apple/blonde_woman/2.png
new file mode 100644
index 00000000000..9c514ac5fb4
Binary files /dev/null and b/public/images/emoji/apple/blonde_woman/2.png differ
diff --git a/public/images/emoji/apple/blonde_woman/3.png b/public/images/emoji/apple/blonde_woman/3.png
new file mode 100644
index 00000000000..22de69e3d68
Binary files /dev/null and b/public/images/emoji/apple/blonde_woman/3.png differ
diff --git a/public/images/emoji/apple/blonde_woman/4.png b/public/images/emoji/apple/blonde_woman/4.png
new file mode 100644
index 00000000000..7ca9f739c3b
Binary files /dev/null and b/public/images/emoji/apple/blonde_woman/4.png differ
diff --git a/public/images/emoji/apple/blonde_woman/5.png b/public/images/emoji/apple/blonde_woman/5.png
new file mode 100644
index 00000000000..b2add0bfd7e
Binary files /dev/null and b/public/images/emoji/apple/blonde_woman/5.png differ
diff --git a/public/images/emoji/apple/blonde_woman/6.png b/public/images/emoji/apple/blonde_woman/6.png
new file mode 100644
index 00000000000..741e10610e6
Binary files /dev/null and b/public/images/emoji/apple/blonde_woman/6.png differ
diff --git a/public/images/emoji/apple/blossom.png b/public/images/emoji/apple/blossom.png
index a967319833e..7f7f7dd87fd 100644
Binary files a/public/images/emoji/apple/blossom.png and b/public/images/emoji/apple/blossom.png differ
diff --git a/public/images/emoji/apple/blowfish.png b/public/images/emoji/apple/blowfish.png
index 43f70ff72ff..21cea90fdfc 100644
Binary files a/public/images/emoji/apple/blowfish.png and b/public/images/emoji/apple/blowfish.png differ
diff --git a/public/images/emoji/apple/blue_book.png b/public/images/emoji/apple/blue_book.png
index 267b2943f61..71b8ff1069c 100644
Binary files a/public/images/emoji/apple/blue_book.png and b/public/images/emoji/apple/blue_book.png differ
diff --git a/public/images/emoji/apple/blue_car.png b/public/images/emoji/apple/blue_car.png
index df80973a681..8fb4c4f6308 100644
Binary files a/public/images/emoji/apple/blue_car.png and b/public/images/emoji/apple/blue_car.png differ
diff --git a/public/images/emoji/apple/blue_heart.png b/public/images/emoji/apple/blue_heart.png
index a4cf344e4c6..40b4db9b90b 100644
Binary files a/public/images/emoji/apple/blue_heart.png and b/public/images/emoji/apple/blue_heart.png differ
diff --git a/public/images/emoji/apple/boar.png b/public/images/emoji/apple/boar.png
index ffaa088a2b9..79cfdfedb8f 100644
Binary files a/public/images/emoji/apple/boar.png and b/public/images/emoji/apple/boar.png differ
diff --git a/public/images/emoji/apple/boat.png b/public/images/emoji/apple/boat.png
new file mode 100644
index 00000000000..1fe5602cc5f
Binary files /dev/null and b/public/images/emoji/apple/boat.png differ
diff --git a/public/images/emoji/apple/bolivia.png b/public/images/emoji/apple/bolivia.png
new file mode 100644
index 00000000000..ff8bc0a0538
Binary files /dev/null and b/public/images/emoji/apple/bolivia.png differ
diff --git a/public/images/emoji/apple/bomb.png b/public/images/emoji/apple/bomb.png
index 3755db8562f..52472c16322 100644
Binary files a/public/images/emoji/apple/bomb.png and b/public/images/emoji/apple/bomb.png differ
diff --git a/public/images/emoji/apple/book.png b/public/images/emoji/apple/book.png
index 391c841ab80..fd8d428a74a 100644
Binary files a/public/images/emoji/apple/book.png and b/public/images/emoji/apple/book.png differ
diff --git a/public/images/emoji/apple/bookmark.png b/public/images/emoji/apple/bookmark.png
index 74519e3005c..7107c3db76b 100644
Binary files a/public/images/emoji/apple/bookmark.png and b/public/images/emoji/apple/bookmark.png differ
diff --git a/public/images/emoji/apple/bookmark_tabs.png b/public/images/emoji/apple/bookmark_tabs.png
index 0d1c7ab0b6b..1728a4e9f78 100644
Binary files a/public/images/emoji/apple/bookmark_tabs.png and b/public/images/emoji/apple/bookmark_tabs.png differ
diff --git a/public/images/emoji/apple/books.png b/public/images/emoji/apple/books.png
index 35192eae70c..77198ad1955 100644
Binary files a/public/images/emoji/apple/books.png and b/public/images/emoji/apple/books.png differ
diff --git a/public/images/emoji/apple/boom.png b/public/images/emoji/apple/boom.png
index 84e4eab202b..9028c3d9fd8 100644
Binary files a/public/images/emoji/apple/boom.png and b/public/images/emoji/apple/boom.png differ
diff --git a/public/images/emoji/apple/boot.png b/public/images/emoji/apple/boot.png
index abf99111a99..2af53fd8c19 100644
Binary files a/public/images/emoji/apple/boot.png and b/public/images/emoji/apple/boot.png differ
diff --git a/public/images/emoji/apple/bosnia_herzegovina.png b/public/images/emoji/apple/bosnia_herzegovina.png
new file mode 100644
index 00000000000..9dde1447db0
Binary files /dev/null and b/public/images/emoji/apple/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/apple/botswana.png b/public/images/emoji/apple/botswana.png
new file mode 100644
index 00000000000..b9daaed0507
Binary files /dev/null and b/public/images/emoji/apple/botswana.png differ
diff --git a/public/images/emoji/apple/bottle_with_popping_cork.png b/public/images/emoji/apple/bottle_with_popping_cork.png
index dbe2772628b..897fc5b3412 100644
Binary files a/public/images/emoji/apple/bottle_with_popping_cork.png and b/public/images/emoji/apple/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/apple/bouquet.png b/public/images/emoji/apple/bouquet.png
index 9311734ff48..7267e7ca707 100644
Binary files a/public/images/emoji/apple/bouquet.png and b/public/images/emoji/apple/bouquet.png differ
diff --git a/public/images/emoji/apple/bouvet_island.png b/public/images/emoji/apple/bouvet_island.png
new file mode 100644
index 00000000000..5827a3d3767
Binary files /dev/null and b/public/images/emoji/apple/bouvet_island.png differ
diff --git a/public/images/emoji/apple/bow/2.png b/public/images/emoji/apple/bow/2.png
new file mode 100644
index 00000000000..e484dc4efe7
Binary files /dev/null and b/public/images/emoji/apple/bow/2.png differ
diff --git a/public/images/emoji/apple/bow/3.png b/public/images/emoji/apple/bow/3.png
new file mode 100644
index 00000000000..952f744efeb
Binary files /dev/null and b/public/images/emoji/apple/bow/3.png differ
diff --git a/public/images/emoji/apple/bow/4.png b/public/images/emoji/apple/bow/4.png
new file mode 100644
index 00000000000..7e7b4cc6f18
Binary files /dev/null and b/public/images/emoji/apple/bow/4.png differ
diff --git a/public/images/emoji/apple/bow/5.png b/public/images/emoji/apple/bow/5.png
new file mode 100644
index 00000000000..6e317e21b8c
Binary files /dev/null and b/public/images/emoji/apple/bow/5.png differ
diff --git a/public/images/emoji/apple/bow/6.png b/public/images/emoji/apple/bow/6.png
new file mode 100644
index 00000000000..8162c9ec2ba
Binary files /dev/null and b/public/images/emoji/apple/bow/6.png differ
diff --git a/public/images/emoji/apple/bow_and_arrow.png b/public/images/emoji/apple/bow_and_arrow.png
index ef65fe6ddc7..58c5e9f05ac 100644
Binary files a/public/images/emoji/apple/bow_and_arrow.png and b/public/images/emoji/apple/bow_and_arrow.png differ
diff --git a/public/images/emoji/apple/bowing_man.png b/public/images/emoji/apple/bowing_man.png
new file mode 100644
index 00000000000..fa7f1869243
Binary files /dev/null and b/public/images/emoji/apple/bowing_man.png differ
diff --git a/public/images/emoji/apple/bowing_man/2.png b/public/images/emoji/apple/bowing_man/2.png
new file mode 100644
index 00000000000..e484dc4efe7
Binary files /dev/null and b/public/images/emoji/apple/bowing_man/2.png differ
diff --git a/public/images/emoji/apple/bowing_man/3.png b/public/images/emoji/apple/bowing_man/3.png
new file mode 100644
index 00000000000..952f744efeb
Binary files /dev/null and b/public/images/emoji/apple/bowing_man/3.png differ
diff --git a/public/images/emoji/apple/bowing_man/4.png b/public/images/emoji/apple/bowing_man/4.png
new file mode 100644
index 00000000000..7e7b4cc6f18
Binary files /dev/null and b/public/images/emoji/apple/bowing_man/4.png differ
diff --git a/public/images/emoji/apple/bowing_man/5.png b/public/images/emoji/apple/bowing_man/5.png
new file mode 100644
index 00000000000..6e317e21b8c
Binary files /dev/null and b/public/images/emoji/apple/bowing_man/5.png differ
diff --git a/public/images/emoji/apple/bowing_man/6.png b/public/images/emoji/apple/bowing_man/6.png
new file mode 100644
index 00000000000..8162c9ec2ba
Binary files /dev/null and b/public/images/emoji/apple/bowing_man/6.png differ
diff --git a/public/images/emoji/apple/bowing_woman.png b/public/images/emoji/apple/bowing_woman.png
new file mode 100644
index 00000000000..b7917817551
Binary files /dev/null and b/public/images/emoji/apple/bowing_woman.png differ
diff --git a/public/images/emoji/apple/bowing_woman/2.png b/public/images/emoji/apple/bowing_woman/2.png
new file mode 100644
index 00000000000..887b1e699bb
Binary files /dev/null and b/public/images/emoji/apple/bowing_woman/2.png differ
diff --git a/public/images/emoji/apple/bowing_woman/3.png b/public/images/emoji/apple/bowing_woman/3.png
new file mode 100644
index 00000000000..9a8210b8a22
Binary files /dev/null and b/public/images/emoji/apple/bowing_woman/3.png differ
diff --git a/public/images/emoji/apple/bowing_woman/4.png b/public/images/emoji/apple/bowing_woman/4.png
new file mode 100644
index 00000000000..f91db444962
Binary files /dev/null and b/public/images/emoji/apple/bowing_woman/4.png differ
diff --git a/public/images/emoji/apple/bowing_woman/5.png b/public/images/emoji/apple/bowing_woman/5.png
new file mode 100644
index 00000000000..cb0a2271395
Binary files /dev/null and b/public/images/emoji/apple/bowing_woman/5.png differ
diff --git a/public/images/emoji/apple/bowing_woman/6.png b/public/images/emoji/apple/bowing_woman/6.png
new file mode 100644
index 00000000000..87c4e450ebd
Binary files /dev/null and b/public/images/emoji/apple/bowing_woman/6.png differ
diff --git a/public/images/emoji/apple/bowl_with_spoon.png b/public/images/emoji/apple/bowl_with_spoon.png
new file mode 100644
index 00000000000..b0d88a73b9d
Binary files /dev/null and b/public/images/emoji/apple/bowl_with_spoon.png differ
diff --git a/public/images/emoji/apple/bowling.png b/public/images/emoji/apple/bowling.png
index 61c185c3c78..bb1166501e4 100644
Binary files a/public/images/emoji/apple/bowling.png and b/public/images/emoji/apple/bowling.png differ
diff --git a/public/images/emoji/apple/boxing_glove.png b/public/images/emoji/apple/boxing_glove.png
new file mode 100644
index 00000000000..7d96edb1b3c
Binary files /dev/null and b/public/images/emoji/apple/boxing_glove.png differ
diff --git a/public/images/emoji/apple/boy.png b/public/images/emoji/apple/boy.png
index 6066d8263ef..13a327586dd 100644
Binary files a/public/images/emoji/apple/boy.png and b/public/images/emoji/apple/boy.png differ
diff --git a/public/images/emoji/apple/boy/2.png b/public/images/emoji/apple/boy/2.png
new file mode 100644
index 00000000000..8dfe24684a3
Binary files /dev/null and b/public/images/emoji/apple/boy/2.png differ
diff --git a/public/images/emoji/apple/boy/3.png b/public/images/emoji/apple/boy/3.png
new file mode 100644
index 00000000000..6eb54dbe510
Binary files /dev/null and b/public/images/emoji/apple/boy/3.png differ
diff --git a/public/images/emoji/apple/boy/4.png b/public/images/emoji/apple/boy/4.png
new file mode 100644
index 00000000000..5b4dcc1c08f
Binary files /dev/null and b/public/images/emoji/apple/boy/4.png differ
diff --git a/public/images/emoji/apple/boy/5.png b/public/images/emoji/apple/boy/5.png
new file mode 100644
index 00000000000..dba107efaf2
Binary files /dev/null and b/public/images/emoji/apple/boy/5.png differ
diff --git a/public/images/emoji/apple/boy/6.png b/public/images/emoji/apple/boy/6.png
new file mode 100644
index 00000000000..59c5d57bb74
Binary files /dev/null and b/public/images/emoji/apple/boy/6.png differ
diff --git a/public/images/emoji/apple/brain.png b/public/images/emoji/apple/brain.png
new file mode 100644
index 00000000000..c8e889faecf
Binary files /dev/null and b/public/images/emoji/apple/brain.png differ
diff --git a/public/images/emoji/apple/brazil.png b/public/images/emoji/apple/brazil.png
new file mode 100644
index 00000000000..d14af58f546
Binary files /dev/null and b/public/images/emoji/apple/brazil.png differ
diff --git a/public/images/emoji/apple/bread.png b/public/images/emoji/apple/bread.png
index b2aa3201db0..50c753d9624 100644
Binary files a/public/images/emoji/apple/bread.png and b/public/images/emoji/apple/bread.png differ
diff --git a/public/images/emoji/apple/breast_feeding.png b/public/images/emoji/apple/breast_feeding.png
new file mode 100644
index 00000000000..815538138bf
Binary files /dev/null and b/public/images/emoji/apple/breast_feeding.png differ
diff --git a/public/images/emoji/apple/breast_feeding/2.png b/public/images/emoji/apple/breast_feeding/2.png
new file mode 100644
index 00000000000..fb591aa4fb4
Binary files /dev/null and b/public/images/emoji/apple/breast_feeding/2.png differ
diff --git a/public/images/emoji/apple/breast_feeding/3.png b/public/images/emoji/apple/breast_feeding/3.png
new file mode 100644
index 00000000000..5adcffa4b94
Binary files /dev/null and b/public/images/emoji/apple/breast_feeding/3.png differ
diff --git a/public/images/emoji/apple/breast_feeding/4.png b/public/images/emoji/apple/breast_feeding/4.png
new file mode 100644
index 00000000000..d166f981b24
Binary files /dev/null and b/public/images/emoji/apple/breast_feeding/4.png differ
diff --git a/public/images/emoji/apple/breast_feeding/5.png b/public/images/emoji/apple/breast_feeding/5.png
new file mode 100644
index 00000000000..7c8cb50a780
Binary files /dev/null and b/public/images/emoji/apple/breast_feeding/5.png differ
diff --git a/public/images/emoji/apple/breast_feeding/6.png b/public/images/emoji/apple/breast_feeding/6.png
new file mode 100644
index 00000000000..e113d8cb428
Binary files /dev/null and b/public/images/emoji/apple/breast_feeding/6.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/2.png b/public/images/emoji/apple/bride_with_veil/2.png
new file mode 100644
index 00000000000..5cd877c475a
Binary files /dev/null and b/public/images/emoji/apple/bride_with_veil/2.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/3.png b/public/images/emoji/apple/bride_with_veil/3.png
new file mode 100644
index 00000000000..be044be6e7a
Binary files /dev/null and b/public/images/emoji/apple/bride_with_veil/3.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/4.png b/public/images/emoji/apple/bride_with_veil/4.png
new file mode 100644
index 00000000000..bb2f7557b0c
Binary files /dev/null and b/public/images/emoji/apple/bride_with_veil/4.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/5.png b/public/images/emoji/apple/bride_with_veil/5.png
new file mode 100644
index 00000000000..3e8f677695d
Binary files /dev/null and b/public/images/emoji/apple/bride_with_veil/5.png differ
diff --git a/public/images/emoji/apple/bride_with_veil/6.png b/public/images/emoji/apple/bride_with_veil/6.png
new file mode 100644
index 00000000000..32aa1a28b93
Binary files /dev/null and b/public/images/emoji/apple/bride_with_veil/6.png differ
diff --git a/public/images/emoji/apple/bridge_at_night.png b/public/images/emoji/apple/bridge_at_night.png
index b617726df08..da38bbb900b 100644
Binary files a/public/images/emoji/apple/bridge_at_night.png and b/public/images/emoji/apple/bridge_at_night.png differ
diff --git a/public/images/emoji/apple/briefcase.png b/public/images/emoji/apple/briefcase.png
index 14e8a9a8426..81d37723450 100644
Binary files a/public/images/emoji/apple/briefcase.png and b/public/images/emoji/apple/briefcase.png differ
diff --git a/public/images/emoji/apple/british_indian_ocean_territory.png b/public/images/emoji/apple/british_indian_ocean_territory.png
new file mode 100644
index 00000000000..1008c45a457
Binary files /dev/null and b/public/images/emoji/apple/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/apple/british_virgin_islands.png b/public/images/emoji/apple/british_virgin_islands.png
new file mode 100644
index 00000000000..47312797938
Binary files /dev/null and b/public/images/emoji/apple/british_virgin_islands.png differ
diff --git a/public/images/emoji/apple/broccoli.png b/public/images/emoji/apple/broccoli.png
new file mode 100644
index 00000000000..5e03a6d23ba
Binary files /dev/null and b/public/images/emoji/apple/broccoli.png differ
diff --git a/public/images/emoji/apple/broken_heart.png b/public/images/emoji/apple/broken_heart.png
index 37a3e94eda6..86e08db519a 100644
Binary files a/public/images/emoji/apple/broken_heart.png and b/public/images/emoji/apple/broken_heart.png differ
diff --git a/public/images/emoji/apple/brunei.png b/public/images/emoji/apple/brunei.png
new file mode 100644
index 00000000000..0bc99e219b7
Binary files /dev/null and b/public/images/emoji/apple/brunei.png differ
diff --git a/public/images/emoji/apple/bug.png b/public/images/emoji/apple/bug.png
index 50335d2655a..3bb41a0c2c1 100644
Binary files a/public/images/emoji/apple/bug.png and b/public/images/emoji/apple/bug.png differ
diff --git a/public/images/emoji/apple/building_construction.png b/public/images/emoji/apple/building_construction.png
index 14d63982ead..caad1ac1287 100644
Binary files a/public/images/emoji/apple/building_construction.png and b/public/images/emoji/apple/building_construction.png differ
diff --git a/public/images/emoji/apple/bulb.png b/public/images/emoji/apple/bulb.png
index a44f2810bb1..3a0343e1333 100644
Binary files a/public/images/emoji/apple/bulb.png and b/public/images/emoji/apple/bulb.png differ
diff --git a/public/images/emoji/apple/bulgaria.png b/public/images/emoji/apple/bulgaria.png
new file mode 100644
index 00000000000..92bad97fab6
Binary files /dev/null and b/public/images/emoji/apple/bulgaria.png differ
diff --git a/public/images/emoji/apple/bullettrain_front.png b/public/images/emoji/apple/bullettrain_front.png
index 36b564fc043..55752567d54 100644
Binary files a/public/images/emoji/apple/bullettrain_front.png and b/public/images/emoji/apple/bullettrain_front.png differ
diff --git a/public/images/emoji/apple/bullettrain_side.png b/public/images/emoji/apple/bullettrain_side.png
index af98c363fcb..7fe88b489d3 100644
Binary files a/public/images/emoji/apple/bullettrain_side.png and b/public/images/emoji/apple/bullettrain_side.png differ
diff --git a/public/images/emoji/apple/burkina_faso.png b/public/images/emoji/apple/burkina_faso.png
new file mode 100644
index 00000000000..61fac3c6697
Binary files /dev/null and b/public/images/emoji/apple/burkina_faso.png differ
diff --git a/public/images/emoji/apple/burrito.png b/public/images/emoji/apple/burrito.png
index 4c0cfc22fd7..c85491514d7 100644
Binary files a/public/images/emoji/apple/burrito.png and b/public/images/emoji/apple/burrito.png differ
diff --git a/public/images/emoji/apple/burundi.png b/public/images/emoji/apple/burundi.png
new file mode 100644
index 00000000000..e029433553e
Binary files /dev/null and b/public/images/emoji/apple/burundi.png differ
diff --git a/public/images/emoji/apple/bus.png b/public/images/emoji/apple/bus.png
index 0b89d0f3433..5a47f74a09c 100644
Binary files a/public/images/emoji/apple/bus.png and b/public/images/emoji/apple/bus.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating.png b/public/images/emoji/apple/business_suit_levitating.png
new file mode 100644
index 00000000000..00ae1282f1d
Binary files /dev/null and b/public/images/emoji/apple/business_suit_levitating.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/2.png b/public/images/emoji/apple/business_suit_levitating/2.png
new file mode 100644
index 00000000000..369be947839
Binary files /dev/null and b/public/images/emoji/apple/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/3.png b/public/images/emoji/apple/business_suit_levitating/3.png
new file mode 100644
index 00000000000..f81f47f2747
Binary files /dev/null and b/public/images/emoji/apple/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/4.png b/public/images/emoji/apple/business_suit_levitating/4.png
new file mode 100644
index 00000000000..b355778d9f6
Binary files /dev/null and b/public/images/emoji/apple/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/5.png b/public/images/emoji/apple/business_suit_levitating/5.png
new file mode 100644
index 00000000000..f348ca68e3a
Binary files /dev/null and b/public/images/emoji/apple/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/apple/business_suit_levitating/6.png b/public/images/emoji/apple/business_suit_levitating/6.png
new file mode 100644
index 00000000000..232f1c2dc26
Binary files /dev/null and b/public/images/emoji/apple/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/apple/busstop.png b/public/images/emoji/apple/busstop.png
index 1cf76225def..af813ce4aab 100644
Binary files a/public/images/emoji/apple/busstop.png and b/public/images/emoji/apple/busstop.png differ
diff --git a/public/images/emoji/apple/bust_in_silhouette.png b/public/images/emoji/apple/bust_in_silhouette.png
index 89da0628a3a..cc514eac845 100644
Binary files a/public/images/emoji/apple/bust_in_silhouette.png and b/public/images/emoji/apple/bust_in_silhouette.png differ
diff --git a/public/images/emoji/apple/busts_in_silhouette.png b/public/images/emoji/apple/busts_in_silhouette.png
index bdc1736d2f2..e6b1ae07834 100644
Binary files a/public/images/emoji/apple/busts_in_silhouette.png and b/public/images/emoji/apple/busts_in_silhouette.png differ
diff --git a/public/images/emoji/apple/butterfly.png b/public/images/emoji/apple/butterfly.png
new file mode 100644
index 00000000000..baf3480c1b9
Binary files /dev/null and b/public/images/emoji/apple/butterfly.png differ
diff --git a/public/images/emoji/apple/cactus.png b/public/images/emoji/apple/cactus.png
index dfe4e4a0f3b..4ae0cca3cdb 100644
Binary files a/public/images/emoji/apple/cactus.png and b/public/images/emoji/apple/cactus.png differ
diff --git a/public/images/emoji/apple/cake.png b/public/images/emoji/apple/cake.png
index 4428361a5ff..61ed440e75d 100644
Binary files a/public/images/emoji/apple/cake.png and b/public/images/emoji/apple/cake.png differ
diff --git a/public/images/emoji/apple/calendar.png b/public/images/emoji/apple/calendar.png
index 8aa77273be9..a98cef1cd49 100644
Binary files a/public/images/emoji/apple/calendar.png and b/public/images/emoji/apple/calendar.png differ
diff --git a/public/images/emoji/apple/calendar_spiral.png b/public/images/emoji/apple/calendar_spiral.png
index 429d7c7f629..74b98132ddc 100644
Binary files a/public/images/emoji/apple/calendar_spiral.png and b/public/images/emoji/apple/calendar_spiral.png differ
diff --git a/public/images/emoji/apple/call_me_hand.png b/public/images/emoji/apple/call_me_hand.png
new file mode 100644
index 00000000000..0c58183e411
Binary files /dev/null and b/public/images/emoji/apple/call_me_hand.png differ
diff --git a/public/images/emoji/apple/call_me_hand/2.png b/public/images/emoji/apple/call_me_hand/2.png
new file mode 100644
index 00000000000..b29d9c3a9c5
Binary files /dev/null and b/public/images/emoji/apple/call_me_hand/2.png differ
diff --git a/public/images/emoji/apple/call_me_hand/3.png b/public/images/emoji/apple/call_me_hand/3.png
new file mode 100644
index 00000000000..6f30225e3a1
Binary files /dev/null and b/public/images/emoji/apple/call_me_hand/3.png differ
diff --git a/public/images/emoji/apple/call_me_hand/4.png b/public/images/emoji/apple/call_me_hand/4.png
new file mode 100644
index 00000000000..42ac3f10636
Binary files /dev/null and b/public/images/emoji/apple/call_me_hand/4.png differ
diff --git a/public/images/emoji/apple/call_me_hand/5.png b/public/images/emoji/apple/call_me_hand/5.png
new file mode 100644
index 00000000000..1f766292fa3
Binary files /dev/null and b/public/images/emoji/apple/call_me_hand/5.png differ
diff --git a/public/images/emoji/apple/call_me_hand/6.png b/public/images/emoji/apple/call_me_hand/6.png
new file mode 100644
index 00000000000..ff0ce24b2bd
Binary files /dev/null and b/public/images/emoji/apple/call_me_hand/6.png differ
diff --git a/public/images/emoji/apple/calling.png b/public/images/emoji/apple/calling.png
index 90af8498103..ae1e525fea8 100644
Binary files a/public/images/emoji/apple/calling.png and b/public/images/emoji/apple/calling.png differ
diff --git a/public/images/emoji/apple/cambodia.png b/public/images/emoji/apple/cambodia.png
new file mode 100644
index 00000000000..c5ee376139c
Binary files /dev/null and b/public/images/emoji/apple/cambodia.png differ
diff --git a/public/images/emoji/apple/camel.png b/public/images/emoji/apple/camel.png
index 50a7dd017a0..315595b24f6 100644
Binary files a/public/images/emoji/apple/camel.png and b/public/images/emoji/apple/camel.png differ
diff --git a/public/images/emoji/apple/camera.png b/public/images/emoji/apple/camera.png
index d503e31bbbe..14ef5fd4761 100644
Binary files a/public/images/emoji/apple/camera.png and b/public/images/emoji/apple/camera.png differ
diff --git a/public/images/emoji/apple/camera_flash.png b/public/images/emoji/apple/camera_flash.png
new file mode 100644
index 00000000000..dcaac46221c
Binary files /dev/null and b/public/images/emoji/apple/camera_flash.png differ
diff --git a/public/images/emoji/apple/camera_with_flash.png b/public/images/emoji/apple/camera_with_flash.png
index bd0a8a39216..dcaac46221c 100644
Binary files a/public/images/emoji/apple/camera_with_flash.png and b/public/images/emoji/apple/camera_with_flash.png differ
diff --git a/public/images/emoji/apple/cameroon.png b/public/images/emoji/apple/cameroon.png
new file mode 100644
index 00000000000..dc6e3db418d
Binary files /dev/null and b/public/images/emoji/apple/cameroon.png differ
diff --git a/public/images/emoji/apple/camping.png b/public/images/emoji/apple/camping.png
index 174bd3ee876..008e2a2d8eb 100644
Binary files a/public/images/emoji/apple/camping.png and b/public/images/emoji/apple/camping.png differ
diff --git a/public/images/emoji/apple/canada.png b/public/images/emoji/apple/canada.png
new file mode 100644
index 00000000000..85be8280f83
Binary files /dev/null and b/public/images/emoji/apple/canada.png differ
diff --git a/public/images/emoji/apple/canary_islands.png b/public/images/emoji/apple/canary_islands.png
new file mode 100644
index 00000000000..9e8edf40ad9
Binary files /dev/null and b/public/images/emoji/apple/canary_islands.png differ
diff --git a/public/images/emoji/apple/cancer.png b/public/images/emoji/apple/cancer.png
index a90f0e650f3..d081129bbc6 100644
Binary files a/public/images/emoji/apple/cancer.png and b/public/images/emoji/apple/cancer.png differ
diff --git a/public/images/emoji/apple/candle.png b/public/images/emoji/apple/candle.png
index 4446a621d19..5c0b463ff3d 100644
Binary files a/public/images/emoji/apple/candle.png and b/public/images/emoji/apple/candle.png differ
diff --git a/public/images/emoji/apple/candy.png b/public/images/emoji/apple/candy.png
index 4e3c3e6be3f..2e91629c5fe 100644
Binary files a/public/images/emoji/apple/candy.png and b/public/images/emoji/apple/candy.png differ
diff --git a/public/images/emoji/apple/canned_food.png b/public/images/emoji/apple/canned_food.png
new file mode 100644
index 00000000000..2e5976e9d2f
Binary files /dev/null and b/public/images/emoji/apple/canned_food.png differ
diff --git a/public/images/emoji/apple/canoe.png b/public/images/emoji/apple/canoe.png
new file mode 100644
index 00000000000..fcac299cfac
Binary files /dev/null and b/public/images/emoji/apple/canoe.png differ
diff --git a/public/images/emoji/apple/cape_verde.png b/public/images/emoji/apple/cape_verde.png
new file mode 100644
index 00000000000..b6f59e377db
Binary files /dev/null and b/public/images/emoji/apple/cape_verde.png differ
diff --git a/public/images/emoji/apple/capital_abcd.png b/public/images/emoji/apple/capital_abcd.png
index e272c4e0b18..813ebc7886a 100644
Binary files a/public/images/emoji/apple/capital_abcd.png and b/public/images/emoji/apple/capital_abcd.png differ
diff --git a/public/images/emoji/apple/capricorn.png b/public/images/emoji/apple/capricorn.png
index f3542a3ebab..8d4950b1824 100644
Binary files a/public/images/emoji/apple/capricorn.png and b/public/images/emoji/apple/capricorn.png differ
diff --git a/public/images/emoji/apple/car.png b/public/images/emoji/apple/car.png
new file mode 100644
index 00000000000..80e24f234bc
Binary files /dev/null and b/public/images/emoji/apple/car.png differ
diff --git a/public/images/emoji/apple/card_box.png b/public/images/emoji/apple/card_box.png
index 0ff13b06d48..a0a547ebafe 100644
Binary files a/public/images/emoji/apple/card_box.png and b/public/images/emoji/apple/card_box.png differ
diff --git a/public/images/emoji/apple/card_file_box.png b/public/images/emoji/apple/card_file_box.png
index 0ff13b06d48..a0a547ebafe 100644
Binary files a/public/images/emoji/apple/card_file_box.png and b/public/images/emoji/apple/card_file_box.png differ
diff --git a/public/images/emoji/apple/card_index.png b/public/images/emoji/apple/card_index.png
index d2015b86a12..6e30338fb6e 100644
Binary files a/public/images/emoji/apple/card_index.png and b/public/images/emoji/apple/card_index.png differ
diff --git a/public/images/emoji/apple/card_index_dividers.png b/public/images/emoji/apple/card_index_dividers.png
index d0d53901429..688e41bb2ff 100644
Binary files a/public/images/emoji/apple/card_index_dividers.png and b/public/images/emoji/apple/card_index_dividers.png differ
diff --git a/public/images/emoji/apple/caribbean_netherlands.png b/public/images/emoji/apple/caribbean_netherlands.png
new file mode 100644
index 00000000000..f24d3ab5dad
Binary files /dev/null and b/public/images/emoji/apple/caribbean_netherlands.png differ
diff --git a/public/images/emoji/apple/carousel_horse.png b/public/images/emoji/apple/carousel_horse.png
index c17c846639a..84cc6f420f8 100644
Binary files a/public/images/emoji/apple/carousel_horse.png and b/public/images/emoji/apple/carousel_horse.png differ
diff --git a/public/images/emoji/apple/carrot.png b/public/images/emoji/apple/carrot.png
new file mode 100644
index 00000000000..8d88ed15791
Binary files /dev/null and b/public/images/emoji/apple/carrot.png differ
diff --git a/public/images/emoji/apple/cat.png b/public/images/emoji/apple/cat.png
index e6a29d5373b..e106ea5da37 100644
Binary files a/public/images/emoji/apple/cat.png and b/public/images/emoji/apple/cat.png differ
diff --git a/public/images/emoji/apple/cat2.png b/public/images/emoji/apple/cat2.png
index ee29eb04672..d644a17077c 100644
Binary files a/public/images/emoji/apple/cat2.png and b/public/images/emoji/apple/cat2.png differ
diff --git a/public/images/emoji/apple/cayman_islands.png b/public/images/emoji/apple/cayman_islands.png
new file mode 100644
index 00000000000..b78af60104d
Binary files /dev/null and b/public/images/emoji/apple/cayman_islands.png differ
diff --git a/public/images/emoji/apple/cd.png b/public/images/emoji/apple/cd.png
index 1bbe0934054..e14cd808bc9 100644
Binary files a/public/images/emoji/apple/cd.png and b/public/images/emoji/apple/cd.png differ
diff --git a/public/images/emoji/apple/central_african_republic.png b/public/images/emoji/apple/central_african_republic.png
new file mode 100644
index 00000000000..7ead04d8e8a
Binary files /dev/null and b/public/images/emoji/apple/central_african_republic.png differ
diff --git a/public/images/emoji/apple/ceuta_and_melilla.png b/public/images/emoji/apple/ceuta_and_melilla.png
new file mode 100644
index 00000000000..8fca1f0390a
Binary files /dev/null and b/public/images/emoji/apple/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/apple/chad.png b/public/images/emoji/apple/chad.png
new file mode 100644
index 00000000000..9c6d1cce2b5
Binary files /dev/null and b/public/images/emoji/apple/chad.png differ
diff --git a/public/images/emoji/apple/chains.png b/public/images/emoji/apple/chains.png
index 1642ce3881c..a223561da73 100644
Binary files a/public/images/emoji/apple/chains.png and b/public/images/emoji/apple/chains.png differ
diff --git a/public/images/emoji/apple/champagne.png b/public/images/emoji/apple/champagne.png
index dbe2772628b..897fc5b3412 100644
Binary files a/public/images/emoji/apple/champagne.png and b/public/images/emoji/apple/champagne.png differ
diff --git a/public/images/emoji/apple/chart.png b/public/images/emoji/apple/chart.png
index b90949583be..87f66213e0d 100644
Binary files a/public/images/emoji/apple/chart.png and b/public/images/emoji/apple/chart.png differ
diff --git a/public/images/emoji/apple/chart_with_downwards_trend.png b/public/images/emoji/apple/chart_with_downwards_trend.png
index b9dcdfc4a80..a592a3b6977 100644
Binary files a/public/images/emoji/apple/chart_with_downwards_trend.png and b/public/images/emoji/apple/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/apple/chart_with_upwards_trend.png b/public/images/emoji/apple/chart_with_upwards_trend.png
index 53226a9e2f8..37d888eceaa 100644
Binary files a/public/images/emoji/apple/chart_with_upwards_trend.png and b/public/images/emoji/apple/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/apple/checkered_flag.png b/public/images/emoji/apple/checkered_flag.png
index 198f618bc88..0838044fbd8 100644
Binary files a/public/images/emoji/apple/checkered_flag.png and b/public/images/emoji/apple/checkered_flag.png differ
diff --git a/public/images/emoji/apple/cheese.png b/public/images/emoji/apple/cheese.png
index 4c4864ff963..7b457c211a2 100644
Binary files a/public/images/emoji/apple/cheese.png and b/public/images/emoji/apple/cheese.png differ
diff --git a/public/images/emoji/apple/cheese_wedge.png b/public/images/emoji/apple/cheese_wedge.png
index 4c4864ff963..7b457c211a2 100644
Binary files a/public/images/emoji/apple/cheese_wedge.png and b/public/images/emoji/apple/cheese_wedge.png differ
diff --git a/public/images/emoji/apple/cherries.png b/public/images/emoji/apple/cherries.png
index fac8d2145a0..3c3684ca2a9 100644
Binary files a/public/images/emoji/apple/cherries.png and b/public/images/emoji/apple/cherries.png differ
diff --git a/public/images/emoji/apple/cherry_blossom.png b/public/images/emoji/apple/cherry_blossom.png
index 2dffbe2fbf1..749e0109ff7 100644
Binary files a/public/images/emoji/apple/cherry_blossom.png and b/public/images/emoji/apple/cherry_blossom.png differ
diff --git a/public/images/emoji/apple/chestnut.png b/public/images/emoji/apple/chestnut.png
index d068960b350..a427eeb8989 100644
Binary files a/public/images/emoji/apple/chestnut.png and b/public/images/emoji/apple/chestnut.png differ
diff --git a/public/images/emoji/apple/chicken.png b/public/images/emoji/apple/chicken.png
index e61c435cb8d..f7b9bde9bc3 100644
Binary files a/public/images/emoji/apple/chicken.png and b/public/images/emoji/apple/chicken.png differ
diff --git a/public/images/emoji/apple/child.png b/public/images/emoji/apple/child.png
new file mode 100644
index 00000000000..33e50494a3a
Binary files /dev/null and b/public/images/emoji/apple/child.png differ
diff --git a/public/images/emoji/apple/child/2.png b/public/images/emoji/apple/child/2.png
new file mode 100644
index 00000000000..7a0e4f1cb75
Binary files /dev/null and b/public/images/emoji/apple/child/2.png differ
diff --git a/public/images/emoji/apple/child/3.png b/public/images/emoji/apple/child/3.png
new file mode 100644
index 00000000000..81a69110e9d
Binary files /dev/null and b/public/images/emoji/apple/child/3.png differ
diff --git a/public/images/emoji/apple/child/4.png b/public/images/emoji/apple/child/4.png
new file mode 100644
index 00000000000..b5c64c9cc84
Binary files /dev/null and b/public/images/emoji/apple/child/4.png differ
diff --git a/public/images/emoji/apple/child/5.png b/public/images/emoji/apple/child/5.png
new file mode 100644
index 00000000000..0763a8bd94c
Binary files /dev/null and b/public/images/emoji/apple/child/5.png differ
diff --git a/public/images/emoji/apple/child/6.png b/public/images/emoji/apple/child/6.png
new file mode 100644
index 00000000000..3ed705b9025
Binary files /dev/null and b/public/images/emoji/apple/child/6.png differ
diff --git a/public/images/emoji/apple/children_crossing.png b/public/images/emoji/apple/children_crossing.png
index 3f962313770..f19495f8ce6 100644
Binary files a/public/images/emoji/apple/children_crossing.png and b/public/images/emoji/apple/children_crossing.png differ
diff --git a/public/images/emoji/apple/chile.png b/public/images/emoji/apple/chile.png
new file mode 100644
index 00000000000..0f26ed2a659
Binary files /dev/null and b/public/images/emoji/apple/chile.png differ
diff --git a/public/images/emoji/apple/chipmunk.png b/public/images/emoji/apple/chipmunk.png
index e4d70c358ba..80de702c1b3 100644
Binary files a/public/images/emoji/apple/chipmunk.png and b/public/images/emoji/apple/chipmunk.png differ
diff --git a/public/images/emoji/apple/chocolate_bar.png b/public/images/emoji/apple/chocolate_bar.png
index 7e3af6d9e88..06324989309 100644
Binary files a/public/images/emoji/apple/chocolate_bar.png and b/public/images/emoji/apple/chocolate_bar.png differ
diff --git a/public/images/emoji/apple/chopsticks.png b/public/images/emoji/apple/chopsticks.png
new file mode 100644
index 00000000000..57064202979
Binary files /dev/null and b/public/images/emoji/apple/chopsticks.png differ
diff --git a/public/images/emoji/apple/christmas_island.png b/public/images/emoji/apple/christmas_island.png
new file mode 100644
index 00000000000..290b1bf6add
Binary files /dev/null and b/public/images/emoji/apple/christmas_island.png differ
diff --git a/public/images/emoji/apple/christmas_tree.png b/public/images/emoji/apple/christmas_tree.png
index 73370fcaf76..b0faf71d111 100644
Binary files a/public/images/emoji/apple/christmas_tree.png and b/public/images/emoji/apple/christmas_tree.png differ
diff --git a/public/images/emoji/apple/church.png b/public/images/emoji/apple/church.png
index dc8920342ad..646fa925465 100644
Binary files a/public/images/emoji/apple/church.png and b/public/images/emoji/apple/church.png differ
diff --git a/public/images/emoji/apple/cinema.png b/public/images/emoji/apple/cinema.png
index 2048f3f934c..186d25a795e 100644
Binary files a/public/images/emoji/apple/cinema.png and b/public/images/emoji/apple/cinema.png differ
diff --git a/public/images/emoji/apple/circus_tent.png b/public/images/emoji/apple/circus_tent.png
index caee203acf8..3825c35f99d 100644
Binary files a/public/images/emoji/apple/circus_tent.png and b/public/images/emoji/apple/circus_tent.png differ
diff --git a/public/images/emoji/apple/city_dusk.png b/public/images/emoji/apple/city_dusk.png
index 99de2a775b3..afd1d52ccb2 100644
Binary files a/public/images/emoji/apple/city_dusk.png and b/public/images/emoji/apple/city_dusk.png differ
diff --git a/public/images/emoji/apple/city_sunrise.png b/public/images/emoji/apple/city_sunrise.png
index 6468d224f3f..fad18ff1dad 100644
Binary files a/public/images/emoji/apple/city_sunrise.png and b/public/images/emoji/apple/city_sunrise.png differ
diff --git a/public/images/emoji/apple/city_sunset.png b/public/images/emoji/apple/city_sunset.png
index 6468d224f3f..afd1d52ccb2 100644
Binary files a/public/images/emoji/apple/city_sunset.png and b/public/images/emoji/apple/city_sunset.png differ
diff --git a/public/images/emoji/apple/cityscape.png b/public/images/emoji/apple/cityscape.png
index a45698937a1..11a4ef192b9 100644
Binary files a/public/images/emoji/apple/cityscape.png and b/public/images/emoji/apple/cityscape.png differ
diff --git a/public/images/emoji/apple/cl.png b/public/images/emoji/apple/cl.png
index cafc3c4acf3..874f19c7b7e 100644
Binary files a/public/images/emoji/apple/cl.png and b/public/images/emoji/apple/cl.png differ
diff --git a/public/images/emoji/apple/clamp.png b/public/images/emoji/apple/clamp.png
new file mode 100644
index 00000000000..575a7a07895
Binary files /dev/null and b/public/images/emoji/apple/clamp.png differ
diff --git a/public/images/emoji/apple/clap/2.png b/public/images/emoji/apple/clap/2.png
new file mode 100644
index 00000000000..28ded81d6b4
Binary files /dev/null and b/public/images/emoji/apple/clap/2.png differ
diff --git a/public/images/emoji/apple/clap/3.png b/public/images/emoji/apple/clap/3.png
new file mode 100644
index 00000000000..d29bd3baf23
Binary files /dev/null and b/public/images/emoji/apple/clap/3.png differ
diff --git a/public/images/emoji/apple/clap/4.png b/public/images/emoji/apple/clap/4.png
new file mode 100644
index 00000000000..e1be837a3aa
Binary files /dev/null and b/public/images/emoji/apple/clap/4.png differ
diff --git a/public/images/emoji/apple/clap/5.png b/public/images/emoji/apple/clap/5.png
new file mode 100644
index 00000000000..4e1dfa26474
Binary files /dev/null and b/public/images/emoji/apple/clap/5.png differ
diff --git a/public/images/emoji/apple/clap/6.png b/public/images/emoji/apple/clap/6.png
new file mode 100644
index 00000000000..4545ab4de99
Binary files /dev/null and b/public/images/emoji/apple/clap/6.png differ
diff --git a/public/images/emoji/apple/clapper.png b/public/images/emoji/apple/clapper.png
index 55ca046c00d..6c8d97bdf2e 100644
Binary files a/public/images/emoji/apple/clapper.png and b/public/images/emoji/apple/clapper.png differ
diff --git a/public/images/emoji/apple/classical_building.png b/public/images/emoji/apple/classical_building.png
index fcb8e87b5ea..fb4aa8b6b16 100644
Binary files a/public/images/emoji/apple/classical_building.png and b/public/images/emoji/apple/classical_building.png differ
diff --git a/public/images/emoji/apple/clinking_glasses.png b/public/images/emoji/apple/clinking_glasses.png
new file mode 100644
index 00000000000..88c2bd94be1
Binary files /dev/null and b/public/images/emoji/apple/clinking_glasses.png differ
diff --git a/public/images/emoji/apple/clipboard.png b/public/images/emoji/apple/clipboard.png
index e28fb3d1e2c..bd7a1aba2ae 100644
Binary files a/public/images/emoji/apple/clipboard.png and b/public/images/emoji/apple/clipboard.png differ
diff --git a/public/images/emoji/apple/clipperton_island.png b/public/images/emoji/apple/clipperton_island.png
new file mode 100644
index 00000000000..efcd5fff75f
Binary files /dev/null and b/public/images/emoji/apple/clipperton_island.png differ
diff --git a/public/images/emoji/apple/clock.png b/public/images/emoji/apple/clock.png
index be2924b47b7..bc63b3ffb2b 100644
Binary files a/public/images/emoji/apple/clock.png and b/public/images/emoji/apple/clock.png differ
diff --git a/public/images/emoji/apple/clock1.png b/public/images/emoji/apple/clock1.png
index 9ef8572bd3b..653f4cf6324 100644
Binary files a/public/images/emoji/apple/clock1.png and b/public/images/emoji/apple/clock1.png differ
diff --git a/public/images/emoji/apple/clock10.png b/public/images/emoji/apple/clock10.png
index b6979bc6189..8fb74fa6d4a 100644
Binary files a/public/images/emoji/apple/clock10.png and b/public/images/emoji/apple/clock10.png differ
diff --git a/public/images/emoji/apple/clock1030.png b/public/images/emoji/apple/clock1030.png
index e81438ce284..af110b300ed 100644
Binary files a/public/images/emoji/apple/clock1030.png and b/public/images/emoji/apple/clock1030.png differ
diff --git a/public/images/emoji/apple/clock11.png b/public/images/emoji/apple/clock11.png
index b556f5a7cbe..8fe7595b61b 100644
Binary files a/public/images/emoji/apple/clock11.png and b/public/images/emoji/apple/clock11.png differ
diff --git a/public/images/emoji/apple/clock1130.png b/public/images/emoji/apple/clock1130.png
index 48515bdcc9d..dc1e6833b29 100644
Binary files a/public/images/emoji/apple/clock1130.png and b/public/images/emoji/apple/clock1130.png differ
diff --git a/public/images/emoji/apple/clock12.png b/public/images/emoji/apple/clock12.png
index f6fe8aded47..25a5f9f3473 100644
Binary files a/public/images/emoji/apple/clock12.png and b/public/images/emoji/apple/clock12.png differ
diff --git a/public/images/emoji/apple/clock1230.png b/public/images/emoji/apple/clock1230.png
index 2402cb45218..095d024ed61 100644
Binary files a/public/images/emoji/apple/clock1230.png and b/public/images/emoji/apple/clock1230.png differ
diff --git a/public/images/emoji/apple/clock130.png b/public/images/emoji/apple/clock130.png
index b5dbdf51ad6..8df93f17067 100644
Binary files a/public/images/emoji/apple/clock130.png and b/public/images/emoji/apple/clock130.png differ
diff --git a/public/images/emoji/apple/clock2.png b/public/images/emoji/apple/clock2.png
index 0bfb5f8ae30..80eff85051b 100644
Binary files a/public/images/emoji/apple/clock2.png and b/public/images/emoji/apple/clock2.png differ
diff --git a/public/images/emoji/apple/clock230.png b/public/images/emoji/apple/clock230.png
index 0960b1e5bfd..6dc0e845e51 100644
Binary files a/public/images/emoji/apple/clock230.png and b/public/images/emoji/apple/clock230.png differ
diff --git a/public/images/emoji/apple/clock3.png b/public/images/emoji/apple/clock3.png
index 91df696801c..6f22b9d3e52 100644
Binary files a/public/images/emoji/apple/clock3.png and b/public/images/emoji/apple/clock3.png differ
diff --git a/public/images/emoji/apple/clock330.png b/public/images/emoji/apple/clock330.png
index f35a4db5a6b..c07bcde8d84 100644
Binary files a/public/images/emoji/apple/clock330.png and b/public/images/emoji/apple/clock330.png differ
diff --git a/public/images/emoji/apple/clock4.png b/public/images/emoji/apple/clock4.png
index 56717575eee..e43c206941b 100644
Binary files a/public/images/emoji/apple/clock4.png and b/public/images/emoji/apple/clock4.png differ
diff --git a/public/images/emoji/apple/clock430.png b/public/images/emoji/apple/clock430.png
index c7dd9b2d845..a5e896d94ad 100644
Binary files a/public/images/emoji/apple/clock430.png and b/public/images/emoji/apple/clock430.png differ
diff --git a/public/images/emoji/apple/clock5.png b/public/images/emoji/apple/clock5.png
index 9e52ad36037..29c5a9b2ed8 100644
Binary files a/public/images/emoji/apple/clock5.png and b/public/images/emoji/apple/clock5.png differ
diff --git a/public/images/emoji/apple/clock530.png b/public/images/emoji/apple/clock530.png
index 15752975ce1..66f8a71ff5f 100644
Binary files a/public/images/emoji/apple/clock530.png and b/public/images/emoji/apple/clock530.png differ
diff --git a/public/images/emoji/apple/clock6.png b/public/images/emoji/apple/clock6.png
index 2fd77dd60d6..51f6c3da691 100644
Binary files a/public/images/emoji/apple/clock6.png and b/public/images/emoji/apple/clock6.png differ
diff --git a/public/images/emoji/apple/clock630.png b/public/images/emoji/apple/clock630.png
index 2a11b8a97dc..bc141c25dc7 100644
Binary files a/public/images/emoji/apple/clock630.png and b/public/images/emoji/apple/clock630.png differ
diff --git a/public/images/emoji/apple/clock7.png b/public/images/emoji/apple/clock7.png
index fdffbf56a06..efa19c92136 100644
Binary files a/public/images/emoji/apple/clock7.png and b/public/images/emoji/apple/clock7.png differ
diff --git a/public/images/emoji/apple/clock730.png b/public/images/emoji/apple/clock730.png
index 722b71eeb24..77fcc1eacd6 100644
Binary files a/public/images/emoji/apple/clock730.png and b/public/images/emoji/apple/clock730.png differ
diff --git a/public/images/emoji/apple/clock8.png b/public/images/emoji/apple/clock8.png
index d1152306688..5311b001316 100644
Binary files a/public/images/emoji/apple/clock8.png and b/public/images/emoji/apple/clock8.png differ
diff --git a/public/images/emoji/apple/clock830.png b/public/images/emoji/apple/clock830.png
index b8e25880fd3..4c6239ba6d3 100644
Binary files a/public/images/emoji/apple/clock830.png and b/public/images/emoji/apple/clock830.png differ
diff --git a/public/images/emoji/apple/clock9.png b/public/images/emoji/apple/clock9.png
index 415a1e67dc8..c279d828387 100644
Binary files a/public/images/emoji/apple/clock9.png and b/public/images/emoji/apple/clock9.png differ
diff --git a/public/images/emoji/apple/clock930.png b/public/images/emoji/apple/clock930.png
index fa642f18bd7..b0f015d731a 100644
Binary files a/public/images/emoji/apple/clock930.png and b/public/images/emoji/apple/clock930.png differ
diff --git a/public/images/emoji/apple/closed_book.png b/public/images/emoji/apple/closed_book.png
index 28b63bfd360..e8793e41e72 100644
Binary files a/public/images/emoji/apple/closed_book.png and b/public/images/emoji/apple/closed_book.png differ
diff --git a/public/images/emoji/apple/closed_lock_with_key.png b/public/images/emoji/apple/closed_lock_with_key.png
index d22e1045d14..f1d583dee99 100644
Binary files a/public/images/emoji/apple/closed_lock_with_key.png and b/public/images/emoji/apple/closed_lock_with_key.png differ
diff --git a/public/images/emoji/apple/closed_umbrella.png b/public/images/emoji/apple/closed_umbrella.png
index db519d65c1b..a28d55a800b 100644
Binary files a/public/images/emoji/apple/closed_umbrella.png and b/public/images/emoji/apple/closed_umbrella.png differ
diff --git a/public/images/emoji/apple/cloud.png b/public/images/emoji/apple/cloud.png
index 856b0147689..7f3b4be9987 100644
Binary files a/public/images/emoji/apple/cloud.png and b/public/images/emoji/apple/cloud.png differ
diff --git a/public/images/emoji/apple/cloud_lightning.png b/public/images/emoji/apple/cloud_lightning.png
index d36ee5cbec8..13845accbf5 100644
Binary files a/public/images/emoji/apple/cloud_lightning.png and b/public/images/emoji/apple/cloud_lightning.png differ
diff --git a/public/images/emoji/apple/cloud_rain.png b/public/images/emoji/apple/cloud_rain.png
index cf588e7c48d..c8a987cf004 100644
Binary files a/public/images/emoji/apple/cloud_rain.png and b/public/images/emoji/apple/cloud_rain.png differ
diff --git a/public/images/emoji/apple/cloud_snow.png b/public/images/emoji/apple/cloud_snow.png
index 4ce2e4907bc..87287a2bc02 100644
Binary files a/public/images/emoji/apple/cloud_snow.png and b/public/images/emoji/apple/cloud_snow.png differ
diff --git a/public/images/emoji/apple/cloud_tornado.png b/public/images/emoji/apple/cloud_tornado.png
index a6439ab682b..0d3985f1191 100644
Binary files a/public/images/emoji/apple/cloud_tornado.png and b/public/images/emoji/apple/cloud_tornado.png differ
diff --git a/public/images/emoji/apple/cloud_with_lightning.png b/public/images/emoji/apple/cloud_with_lightning.png
index d36ee5cbec8..13845accbf5 100644
Binary files a/public/images/emoji/apple/cloud_with_lightning.png and b/public/images/emoji/apple/cloud_with_lightning.png differ
diff --git a/public/images/emoji/apple/cloud_with_lightning_and_rain.png b/public/images/emoji/apple/cloud_with_lightning_and_rain.png
new file mode 100644
index 00000000000..8f44a7726e9
Binary files /dev/null and b/public/images/emoji/apple/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/apple/cloud_with_rain.png b/public/images/emoji/apple/cloud_with_rain.png
index cf588e7c48d..c8a987cf004 100644
Binary files a/public/images/emoji/apple/cloud_with_rain.png and b/public/images/emoji/apple/cloud_with_rain.png differ
diff --git a/public/images/emoji/apple/cloud_with_snow.png b/public/images/emoji/apple/cloud_with_snow.png
index 4ce2e4907bc..87287a2bc02 100644
Binary files a/public/images/emoji/apple/cloud_with_snow.png and b/public/images/emoji/apple/cloud_with_snow.png differ
diff --git a/public/images/emoji/apple/cloud_with_tornado.png b/public/images/emoji/apple/cloud_with_tornado.png
index a6439ab682b..0d3985f1191 100644
Binary files a/public/images/emoji/apple/cloud_with_tornado.png and b/public/images/emoji/apple/cloud_with_tornado.png differ
diff --git a/public/images/emoji/apple/clown_face.png b/public/images/emoji/apple/clown_face.png
new file mode 100644
index 00000000000..f091b23b6b5
Binary files /dev/null and b/public/images/emoji/apple/clown_face.png differ
diff --git a/public/images/emoji/apple/clubs.png b/public/images/emoji/apple/clubs.png
index cc49b7ccc93..c7957fb3dbc 100644
Binary files a/public/images/emoji/apple/clubs.png and b/public/images/emoji/apple/clubs.png differ
diff --git a/public/images/emoji/apple/coat.png b/public/images/emoji/apple/coat.png
new file mode 100644
index 00000000000..c409f9f4c4c
Binary files /dev/null and b/public/images/emoji/apple/coat.png differ
diff --git a/public/images/emoji/apple/cocktail.png b/public/images/emoji/apple/cocktail.png
index a4f10eed91b..89199f28df1 100644
Binary files a/public/images/emoji/apple/cocktail.png and b/public/images/emoji/apple/cocktail.png differ
diff --git a/public/images/emoji/apple/coconut.png b/public/images/emoji/apple/coconut.png
new file mode 100644
index 00000000000..e76b533149f
Binary files /dev/null and b/public/images/emoji/apple/coconut.png differ
diff --git a/public/images/emoji/apple/cocos_islands.png b/public/images/emoji/apple/cocos_islands.png
new file mode 100644
index 00000000000..177872ece51
Binary files /dev/null and b/public/images/emoji/apple/cocos_islands.png differ
diff --git a/public/images/emoji/apple/coffee.png b/public/images/emoji/apple/coffee.png
index 51b0785a2e0..07de70653ac 100644
Binary files a/public/images/emoji/apple/coffee.png and b/public/images/emoji/apple/coffee.png differ
diff --git a/public/images/emoji/apple/coffin.png b/public/images/emoji/apple/coffin.png
index 64e1b53489b..d29067750ce 100644
Binary files a/public/images/emoji/apple/coffin.png and b/public/images/emoji/apple/coffin.png differ
diff --git a/public/images/emoji/apple/colombia.png b/public/images/emoji/apple/colombia.png
new file mode 100644
index 00000000000..cee9fe65c3a
Binary files /dev/null and b/public/images/emoji/apple/colombia.png differ
diff --git a/public/images/emoji/apple/comet.png b/public/images/emoji/apple/comet.png
index 46266f9052f..2bcbf89601d 100644
Binary files a/public/images/emoji/apple/comet.png and b/public/images/emoji/apple/comet.png differ
diff --git a/public/images/emoji/apple/comoros.png b/public/images/emoji/apple/comoros.png
new file mode 100644
index 00000000000..7e77d800060
Binary files /dev/null and b/public/images/emoji/apple/comoros.png differ
diff --git a/public/images/emoji/apple/compression.png b/public/images/emoji/apple/compression.png
index 589f335e325..575a7a07895 100644
Binary files a/public/images/emoji/apple/compression.png and b/public/images/emoji/apple/compression.png differ
diff --git a/public/images/emoji/apple/computer.png b/public/images/emoji/apple/computer.png
index 4f8e6e3e4f9..f68c5454859 100644
Binary files a/public/images/emoji/apple/computer.png and b/public/images/emoji/apple/computer.png differ
diff --git a/public/images/emoji/apple/computer_mouse.png b/public/images/emoji/apple/computer_mouse.png
new file mode 100644
index 00000000000..3899171edc6
Binary files /dev/null and b/public/images/emoji/apple/computer_mouse.png differ
diff --git a/public/images/emoji/apple/confetti_ball.png b/public/images/emoji/apple/confetti_ball.png
index d672b68b209..13c22c9c62c 100644
Binary files a/public/images/emoji/apple/confetti_ball.png and b/public/images/emoji/apple/confetti_ball.png differ
diff --git a/public/images/emoji/apple/congo_brazzaville.png b/public/images/emoji/apple/congo_brazzaville.png
new file mode 100644
index 00000000000..4c0d656ff2c
Binary files /dev/null and b/public/images/emoji/apple/congo_brazzaville.png differ
diff --git a/public/images/emoji/apple/congo_kinshasa.png b/public/images/emoji/apple/congo_kinshasa.png
new file mode 100644
index 00000000000..c933cb5659c
Binary files /dev/null and b/public/images/emoji/apple/congo_kinshasa.png differ
diff --git a/public/images/emoji/apple/congratulations.png b/public/images/emoji/apple/congratulations.png
index b9576fafc4a..5b983b52b15 100644
Binary files a/public/images/emoji/apple/congratulations.png and b/public/images/emoji/apple/congratulations.png differ
diff --git a/public/images/emoji/apple/construction.png b/public/images/emoji/apple/construction.png
index 86d27067291..744cb5fe94b 100644
Binary files a/public/images/emoji/apple/construction.png and b/public/images/emoji/apple/construction.png differ
diff --git a/public/images/emoji/apple/construction_site.png b/public/images/emoji/apple/construction_site.png
index 14d63982ead..caad1ac1287 100644
Binary files a/public/images/emoji/apple/construction_site.png and b/public/images/emoji/apple/construction_site.png differ
diff --git a/public/images/emoji/apple/construction_worker.png b/public/images/emoji/apple/construction_worker.png
index cfa11196552..ab08591eb37 100644
Binary files a/public/images/emoji/apple/construction_worker.png and b/public/images/emoji/apple/construction_worker.png differ
diff --git a/public/images/emoji/apple/construction_worker/2.png b/public/images/emoji/apple/construction_worker/2.png
new file mode 100644
index 00000000000..0c2079a72d9
Binary files /dev/null and b/public/images/emoji/apple/construction_worker/2.png differ
diff --git a/public/images/emoji/apple/construction_worker/3.png b/public/images/emoji/apple/construction_worker/3.png
new file mode 100644
index 00000000000..e4133c8ce93
Binary files /dev/null and b/public/images/emoji/apple/construction_worker/3.png differ
diff --git a/public/images/emoji/apple/construction_worker/4.png b/public/images/emoji/apple/construction_worker/4.png
new file mode 100644
index 00000000000..4175bd541ea
Binary files /dev/null and b/public/images/emoji/apple/construction_worker/4.png differ
diff --git a/public/images/emoji/apple/construction_worker/5.png b/public/images/emoji/apple/construction_worker/5.png
new file mode 100644
index 00000000000..f52f410a90b
Binary files /dev/null and b/public/images/emoji/apple/construction_worker/5.png differ
diff --git a/public/images/emoji/apple/construction_worker/6.png b/public/images/emoji/apple/construction_worker/6.png
new file mode 100644
index 00000000000..b1976d0925d
Binary files /dev/null and b/public/images/emoji/apple/construction_worker/6.png differ
diff --git a/public/images/emoji/apple/construction_worker_man.png b/public/images/emoji/apple/construction_worker_man.png
new file mode 100644
index 00000000000..ab08591eb37
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_man.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/2.png b/public/images/emoji/apple/construction_worker_man/2.png
new file mode 100644
index 00000000000..0c2079a72d9
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_man/2.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/3.png b/public/images/emoji/apple/construction_worker_man/3.png
new file mode 100644
index 00000000000..e4133c8ce93
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_man/3.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/4.png b/public/images/emoji/apple/construction_worker_man/4.png
new file mode 100644
index 00000000000..4175bd541ea
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_man/4.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/5.png b/public/images/emoji/apple/construction_worker_man/5.png
new file mode 100644
index 00000000000..f52f410a90b
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_man/5.png differ
diff --git a/public/images/emoji/apple/construction_worker_man/6.png b/public/images/emoji/apple/construction_worker_man/6.png
new file mode 100644
index 00000000000..b1976d0925d
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_man/6.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman.png b/public/images/emoji/apple/construction_worker_woman.png
new file mode 100644
index 00000000000..add71a28ef5
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_woman.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/2.png b/public/images/emoji/apple/construction_worker_woman/2.png
new file mode 100644
index 00000000000..b33354210db
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/3.png b/public/images/emoji/apple/construction_worker_woman/3.png
new file mode 100644
index 00000000000..5d7b89ca851
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/4.png b/public/images/emoji/apple/construction_worker_woman/4.png
new file mode 100644
index 00000000000..8f652185445
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/5.png b/public/images/emoji/apple/construction_worker_woman/5.png
new file mode 100644
index 00000000000..796b99e1eb2
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/apple/construction_worker_woman/6.png b/public/images/emoji/apple/construction_worker_woman/6.png
new file mode 100644
index 00000000000..7a6ead711b3
Binary files /dev/null and b/public/images/emoji/apple/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/apple/control_knobs.png b/public/images/emoji/apple/control_knobs.png
index daa9536fbff..1f5bb218fc4 100644
Binary files a/public/images/emoji/apple/control_knobs.png and b/public/images/emoji/apple/control_knobs.png differ
diff --git a/public/images/emoji/apple/convenience_store.png b/public/images/emoji/apple/convenience_store.png
index 0475441d5d6..3de249f5239 100644
Binary files a/public/images/emoji/apple/convenience_store.png and b/public/images/emoji/apple/convenience_store.png differ
diff --git a/public/images/emoji/apple/cook_islands.png b/public/images/emoji/apple/cook_islands.png
new file mode 100644
index 00000000000..1dae1bcd010
Binary files /dev/null and b/public/images/emoji/apple/cook_islands.png differ
diff --git a/public/images/emoji/apple/cookie.png b/public/images/emoji/apple/cookie.png
index 64cd4cee9e1..507c92c244c 100644
Binary files a/public/images/emoji/apple/cookie.png and b/public/images/emoji/apple/cookie.png differ
diff --git a/public/images/emoji/apple/cool.png b/public/images/emoji/apple/cool.png
index 1df14194b78..c0aabdd4944 100644
Binary files a/public/images/emoji/apple/cool.png and b/public/images/emoji/apple/cool.png differ
diff --git a/public/images/emoji/apple/cop.png b/public/images/emoji/apple/cop.png
index 1ed1b255479..78591caa50b 100644
Binary files a/public/images/emoji/apple/cop.png and b/public/images/emoji/apple/cop.png differ
diff --git a/public/images/emoji/apple/cop/2.png b/public/images/emoji/apple/cop/2.png
new file mode 100644
index 00000000000..63db5721c18
Binary files /dev/null and b/public/images/emoji/apple/cop/2.png differ
diff --git a/public/images/emoji/apple/cop/3.png b/public/images/emoji/apple/cop/3.png
new file mode 100644
index 00000000000..7922a9dd3dc
Binary files /dev/null and b/public/images/emoji/apple/cop/3.png differ
diff --git a/public/images/emoji/apple/cop/4.png b/public/images/emoji/apple/cop/4.png
new file mode 100644
index 00000000000..16292b3eb0f
Binary files /dev/null and b/public/images/emoji/apple/cop/4.png differ
diff --git a/public/images/emoji/apple/cop/5.png b/public/images/emoji/apple/cop/5.png
new file mode 100644
index 00000000000..41cdd83a946
Binary files /dev/null and b/public/images/emoji/apple/cop/5.png differ
diff --git a/public/images/emoji/apple/cop/6.png b/public/images/emoji/apple/cop/6.png
new file mode 100644
index 00000000000..e2ce8f11b51
Binary files /dev/null and b/public/images/emoji/apple/cop/6.png differ
diff --git a/public/images/emoji/apple/copyright.png b/public/images/emoji/apple/copyright.png
index f0fac040668..e99004dcf65 100644
Binary files a/public/images/emoji/apple/copyright.png and b/public/images/emoji/apple/copyright.png differ
diff --git a/public/images/emoji/apple/corn.png b/public/images/emoji/apple/corn.png
index 3ba356323b0..89d311d36ea 100644
Binary files a/public/images/emoji/apple/corn.png and b/public/images/emoji/apple/corn.png differ
diff --git a/public/images/emoji/apple/costa_rica.png b/public/images/emoji/apple/costa_rica.png
new file mode 100644
index 00000000000..8a84b171e2f
Binary files /dev/null and b/public/images/emoji/apple/costa_rica.png differ
diff --git a/public/images/emoji/apple/cote_divoire.png b/public/images/emoji/apple/cote_divoire.png
new file mode 100644
index 00000000000..f39c2bcfcfb
Binary files /dev/null and b/public/images/emoji/apple/cote_divoire.png differ
diff --git a/public/images/emoji/apple/couch.png b/public/images/emoji/apple/couch.png
index 18f79ee6e3f..bc593ea9c9a 100644
Binary files a/public/images/emoji/apple/couch.png and b/public/images/emoji/apple/couch.png differ
diff --git a/public/images/emoji/apple/couch_and_lamp.png b/public/images/emoji/apple/couch_and_lamp.png
index 18f79ee6e3f..bc593ea9c9a 100644
Binary files a/public/images/emoji/apple/couch_and_lamp.png and b/public/images/emoji/apple/couch_and_lamp.png differ
diff --git a/public/images/emoji/apple/couple_with_heart_man_man.png b/public/images/emoji/apple/couple_with_heart_man_man.png
new file mode 100644
index 00000000000..41f436aa541
Binary files /dev/null and b/public/images/emoji/apple/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/apple/couple_with_heart_woman_man.png b/public/images/emoji/apple/couple_with_heart_woman_man.png
new file mode 100644
index 00000000000..b7eafd58df8
Binary files /dev/null and b/public/images/emoji/apple/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/apple/couple_with_heart_woman_woman.png b/public/images/emoji/apple/couple_with_heart_woman_woman.png
new file mode 100644
index 00000000000..8f924c75cfb
Binary files /dev/null and b/public/images/emoji/apple/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/apple/couplekiss_man_man.png b/public/images/emoji/apple/couplekiss_man_man.png
new file mode 100644
index 00000000000..87fd1ce113e
Binary files /dev/null and b/public/images/emoji/apple/couplekiss_man_man.png differ
diff --git a/public/images/emoji/apple/couplekiss_man_woman.png b/public/images/emoji/apple/couplekiss_man_woman.png
new file mode 100644
index 00000000000..b1b5bdc9c56
Binary files /dev/null and b/public/images/emoji/apple/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/apple/couplekiss_woman_woman.png b/public/images/emoji/apple/couplekiss_woman_woman.png
new file mode 100644
index 00000000000..13d6801c47a
Binary files /dev/null and b/public/images/emoji/apple/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/apple/cow.png b/public/images/emoji/apple/cow.png
index 47f419cb84e..8f90b5c37f8 100644
Binary files a/public/images/emoji/apple/cow.png and b/public/images/emoji/apple/cow.png differ
diff --git a/public/images/emoji/apple/cow2.png b/public/images/emoji/apple/cow2.png
index 740d31b6451..a44afd72130 100644
Binary files a/public/images/emoji/apple/cow2.png and b/public/images/emoji/apple/cow2.png differ
diff --git a/public/images/emoji/apple/cowboy_hat_face.png b/public/images/emoji/apple/cowboy_hat_face.png
new file mode 100644
index 00000000000..6515c8360b4
Binary files /dev/null and b/public/images/emoji/apple/cowboy_hat_face.png differ
diff --git a/public/images/emoji/apple/crab.png b/public/images/emoji/apple/crab.png
index 9a0a620dd8f..c300979a99d 100644
Binary files a/public/images/emoji/apple/crab.png and b/public/images/emoji/apple/crab.png differ
diff --git a/public/images/emoji/apple/crayon.png b/public/images/emoji/apple/crayon.png
index 0b0f7415750..eaf918c81f4 100644
Binary files a/public/images/emoji/apple/crayon.png and b/public/images/emoji/apple/crayon.png differ
diff --git a/public/images/emoji/apple/crazy_face.png b/public/images/emoji/apple/crazy_face.png
new file mode 100644
index 00000000000..0aaa1cf7651
Binary files /dev/null and b/public/images/emoji/apple/crazy_face.png differ
diff --git a/public/images/emoji/apple/credit_card.png b/public/images/emoji/apple/credit_card.png
index 98db44b9852..47d4436b9b0 100644
Binary files a/public/images/emoji/apple/credit_card.png and b/public/images/emoji/apple/credit_card.png differ
diff --git a/public/images/emoji/apple/crescent_moon.png b/public/images/emoji/apple/crescent_moon.png
index aa391dcedb6..5d1ec6baab8 100644
Binary files a/public/images/emoji/apple/crescent_moon.png and b/public/images/emoji/apple/crescent_moon.png differ
diff --git a/public/images/emoji/apple/cricket.png b/public/images/emoji/apple/cricket.png
index fb73ead72b0..798f0499e9d 100644
Binary files a/public/images/emoji/apple/cricket.png and b/public/images/emoji/apple/cricket.png differ
diff --git a/public/images/emoji/apple/cricket_bat_and_ball.png b/public/images/emoji/apple/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..798f0499e9d
Binary files /dev/null and b/public/images/emoji/apple/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/apple/cricket_bat_ball.png b/public/images/emoji/apple/cricket_bat_ball.png
index fb73ead72b0..798f0499e9d 100644
Binary files a/public/images/emoji/apple/cricket_bat_ball.png and b/public/images/emoji/apple/cricket_bat_ball.png differ
diff --git a/public/images/emoji/apple/croatia.png b/public/images/emoji/apple/croatia.png
new file mode 100644
index 00000000000..a93f35de737
Binary files /dev/null and b/public/images/emoji/apple/croatia.png differ
diff --git a/public/images/emoji/apple/crocodile.png b/public/images/emoji/apple/crocodile.png
index 6df430834dd..9e3e8460e3c 100644
Binary files a/public/images/emoji/apple/crocodile.png and b/public/images/emoji/apple/crocodile.png differ
diff --git a/public/images/emoji/apple/croissant.png b/public/images/emoji/apple/croissant.png
new file mode 100644
index 00000000000..96e4b6e1737
Binary files /dev/null and b/public/images/emoji/apple/croissant.png differ
diff --git a/public/images/emoji/apple/cross.png b/public/images/emoji/apple/cross.png
index 10df9c21f16..efc7a79034a 100644
Binary files a/public/images/emoji/apple/cross.png and b/public/images/emoji/apple/cross.png differ
diff --git a/public/images/emoji/apple/crossed_fingers.png b/public/images/emoji/apple/crossed_fingers.png
new file mode 100644
index 00000000000..76cdcabf102
Binary files /dev/null and b/public/images/emoji/apple/crossed_fingers.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/2.png b/public/images/emoji/apple/crossed_fingers/2.png
new file mode 100644
index 00000000000..f1efc6fd4db
Binary files /dev/null and b/public/images/emoji/apple/crossed_fingers/2.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/3.png b/public/images/emoji/apple/crossed_fingers/3.png
new file mode 100644
index 00000000000..e4de73ffb86
Binary files /dev/null and b/public/images/emoji/apple/crossed_fingers/3.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/4.png b/public/images/emoji/apple/crossed_fingers/4.png
new file mode 100644
index 00000000000..e4b72cb1c22
Binary files /dev/null and b/public/images/emoji/apple/crossed_fingers/4.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/5.png b/public/images/emoji/apple/crossed_fingers/5.png
new file mode 100644
index 00000000000..37585e00ace
Binary files /dev/null and b/public/images/emoji/apple/crossed_fingers/5.png differ
diff --git a/public/images/emoji/apple/crossed_fingers/6.png b/public/images/emoji/apple/crossed_fingers/6.png
new file mode 100644
index 00000000000..63061bea7a3
Binary files /dev/null and b/public/images/emoji/apple/crossed_fingers/6.png differ
diff --git a/public/images/emoji/apple/crossed_flags.png b/public/images/emoji/apple/crossed_flags.png
index 79f0b41b9d2..0a325b514fb 100644
Binary files a/public/images/emoji/apple/crossed_flags.png and b/public/images/emoji/apple/crossed_flags.png differ
diff --git a/public/images/emoji/apple/crossed_swords.png b/public/images/emoji/apple/crossed_swords.png
index e0d25a4c094..39f21de50d4 100644
Binary files a/public/images/emoji/apple/crossed_swords.png and b/public/images/emoji/apple/crossed_swords.png differ
diff --git a/public/images/emoji/apple/crown.png b/public/images/emoji/apple/crown.png
index 94c2e0fe937..293ad24fd67 100644
Binary files a/public/images/emoji/apple/crown.png and b/public/images/emoji/apple/crown.png differ
diff --git a/public/images/emoji/apple/cruise_ship.png b/public/images/emoji/apple/cruise_ship.png
index 94aa42e7bff..3bb64de0d3e 100644
Binary files a/public/images/emoji/apple/cruise_ship.png and b/public/images/emoji/apple/cruise_ship.png differ
diff --git a/public/images/emoji/apple/crystal_ball.png b/public/images/emoji/apple/crystal_ball.png
index 59497182394..8b777fdcea5 100644
Binary files a/public/images/emoji/apple/crystal_ball.png and b/public/images/emoji/apple/crystal_ball.png differ
diff --git a/public/images/emoji/apple/cuba.png b/public/images/emoji/apple/cuba.png
new file mode 100644
index 00000000000..159170fa3d0
Binary files /dev/null and b/public/images/emoji/apple/cuba.png differ
diff --git a/public/images/emoji/apple/cucumber.png b/public/images/emoji/apple/cucumber.png
new file mode 100644
index 00000000000..ece1ce7d99d
Binary files /dev/null and b/public/images/emoji/apple/cucumber.png differ
diff --git a/public/images/emoji/apple/cup_with_straw.png b/public/images/emoji/apple/cup_with_straw.png
new file mode 100644
index 00000000000..4b2f313f9b2
Binary files /dev/null and b/public/images/emoji/apple/cup_with_straw.png differ
diff --git a/public/images/emoji/apple/cupid.png b/public/images/emoji/apple/cupid.png
index 9d0f123061e..65630291ab5 100644
Binary files a/public/images/emoji/apple/cupid.png and b/public/images/emoji/apple/cupid.png differ
diff --git a/public/images/emoji/apple/curacao.png b/public/images/emoji/apple/curacao.png
new file mode 100644
index 00000000000..004ae5eb633
Binary files /dev/null and b/public/images/emoji/apple/curacao.png differ
diff --git a/public/images/emoji/apple/curling_stone.png b/public/images/emoji/apple/curling_stone.png
new file mode 100644
index 00000000000..09027a2fb2e
Binary files /dev/null and b/public/images/emoji/apple/curling_stone.png differ
diff --git a/public/images/emoji/apple/curly_loop.png b/public/images/emoji/apple/curly_loop.png
index 9087fba5e9b..e6257ad8cda 100644
Binary files a/public/images/emoji/apple/curly_loop.png and b/public/images/emoji/apple/curly_loop.png differ
diff --git a/public/images/emoji/apple/currency_exchange.png b/public/images/emoji/apple/currency_exchange.png
index d9fae95d84c..f5591d2bbfd 100644
Binary files a/public/images/emoji/apple/currency_exchange.png and b/public/images/emoji/apple/currency_exchange.png differ
diff --git a/public/images/emoji/apple/curry.png b/public/images/emoji/apple/curry.png
index 457c883b3c1..f2a8e54b6f8 100644
Binary files a/public/images/emoji/apple/curry.png and b/public/images/emoji/apple/curry.png differ
diff --git a/public/images/emoji/apple/custard.png b/public/images/emoji/apple/custard.png
index c751ae743c0..dac6fa58e77 100644
Binary files a/public/images/emoji/apple/custard.png and b/public/images/emoji/apple/custard.png differ
diff --git a/public/images/emoji/apple/customs.png b/public/images/emoji/apple/customs.png
index 080aaf01a7a..53e00660175 100644
Binary files a/public/images/emoji/apple/customs.png and b/public/images/emoji/apple/customs.png differ
diff --git a/public/images/emoji/apple/cut_of_meat.png b/public/images/emoji/apple/cut_of_meat.png
new file mode 100644
index 00000000000..b66d427e099
Binary files /dev/null and b/public/images/emoji/apple/cut_of_meat.png differ
diff --git a/public/images/emoji/apple/cyclone.png b/public/images/emoji/apple/cyclone.png
index 7ae125e1917..5a6dc22b514 100644
Binary files a/public/images/emoji/apple/cyclone.png and b/public/images/emoji/apple/cyclone.png differ
diff --git a/public/images/emoji/apple/cyprus.png b/public/images/emoji/apple/cyprus.png
new file mode 100644
index 00000000000..cfebdb9e6f4
Binary files /dev/null and b/public/images/emoji/apple/cyprus.png differ
diff --git a/public/images/emoji/apple/czech_republic.png b/public/images/emoji/apple/czech_republic.png
new file mode 100644
index 00000000000..33fa4c2c80f
Binary files /dev/null and b/public/images/emoji/apple/czech_republic.png differ
diff --git a/public/images/emoji/apple/dagger.png b/public/images/emoji/apple/dagger.png
index 58a25690eb4..0b35842beab 100644
Binary files a/public/images/emoji/apple/dagger.png and b/public/images/emoji/apple/dagger.png differ
diff --git a/public/images/emoji/apple/dagger_knife.png b/public/images/emoji/apple/dagger_knife.png
index 58a25690eb4..0b35842beab 100644
Binary files a/public/images/emoji/apple/dagger_knife.png and b/public/images/emoji/apple/dagger_knife.png differ
diff --git a/public/images/emoji/apple/dancer.png b/public/images/emoji/apple/dancer.png
index 277bf733fa8..5ea2c10f9e7 100644
Binary files a/public/images/emoji/apple/dancer.png and b/public/images/emoji/apple/dancer.png differ
diff --git a/public/images/emoji/apple/dancer/2.png b/public/images/emoji/apple/dancer/2.png
new file mode 100644
index 00000000000..7c7f527dbe2
Binary files /dev/null and b/public/images/emoji/apple/dancer/2.png differ
diff --git a/public/images/emoji/apple/dancer/3.png b/public/images/emoji/apple/dancer/3.png
new file mode 100644
index 00000000000..5c443068037
Binary files /dev/null and b/public/images/emoji/apple/dancer/3.png differ
diff --git a/public/images/emoji/apple/dancer/4.png b/public/images/emoji/apple/dancer/4.png
new file mode 100644
index 00000000000..e1f0389b014
Binary files /dev/null and b/public/images/emoji/apple/dancer/4.png differ
diff --git a/public/images/emoji/apple/dancer/5.png b/public/images/emoji/apple/dancer/5.png
new file mode 100644
index 00000000000..cba934193f3
Binary files /dev/null and b/public/images/emoji/apple/dancer/5.png differ
diff --git a/public/images/emoji/apple/dancer/6.png b/public/images/emoji/apple/dancer/6.png
new file mode 100644
index 00000000000..cc8af5bc891
Binary files /dev/null and b/public/images/emoji/apple/dancer/6.png differ
diff --git a/public/images/emoji/apple/dancing_men.png b/public/images/emoji/apple/dancing_men.png
new file mode 100644
index 00000000000..e5951ce3341
Binary files /dev/null and b/public/images/emoji/apple/dancing_men.png differ
diff --git a/public/images/emoji/apple/dancing_women.png b/public/images/emoji/apple/dancing_women.png
new file mode 100644
index 00000000000..0d07c4318bd
Binary files /dev/null and b/public/images/emoji/apple/dancing_women.png differ
diff --git a/public/images/emoji/apple/dango.png b/public/images/emoji/apple/dango.png
index 3b1315eac5d..ecaf15737e5 100644
Binary files a/public/images/emoji/apple/dango.png and b/public/images/emoji/apple/dango.png differ
diff --git a/public/images/emoji/apple/dark_sunglasses.png b/public/images/emoji/apple/dark_sunglasses.png
index a9382535cc1..0b4696027de 100644
Binary files a/public/images/emoji/apple/dark_sunglasses.png and b/public/images/emoji/apple/dark_sunglasses.png differ
diff --git a/public/images/emoji/apple/dart.png b/public/images/emoji/apple/dart.png
index f357af5f26c..1bdcca7068c 100644
Binary files a/public/images/emoji/apple/dart.png and b/public/images/emoji/apple/dart.png differ
diff --git a/public/images/emoji/apple/dash.png b/public/images/emoji/apple/dash.png
index 041d3c012b3..36dbc3f4449 100644
Binary files a/public/images/emoji/apple/dash.png and b/public/images/emoji/apple/dash.png differ
diff --git a/public/images/emoji/apple/date.png b/public/images/emoji/apple/date.png
index 872aee97e6a..db76fcfc1da 100644
Binary files a/public/images/emoji/apple/date.png and b/public/images/emoji/apple/date.png differ
diff --git a/public/images/emoji/apple/deciduous_tree.png b/public/images/emoji/apple/deciduous_tree.png
index 75f8e820e70..50e388a7c3e 100644
Binary files a/public/images/emoji/apple/deciduous_tree.png and b/public/images/emoji/apple/deciduous_tree.png differ
diff --git a/public/images/emoji/apple/deer.png b/public/images/emoji/apple/deer.png
new file mode 100644
index 00000000000..0cf37942c9e
Binary files /dev/null and b/public/images/emoji/apple/deer.png differ
diff --git a/public/images/emoji/apple/denmark.png b/public/images/emoji/apple/denmark.png
new file mode 100644
index 00000000000..17d683203ca
Binary files /dev/null and b/public/images/emoji/apple/denmark.png differ
diff --git a/public/images/emoji/apple/department_store.png b/public/images/emoji/apple/department_store.png
index cd10e283def..07ee6e93e02 100644
Binary files a/public/images/emoji/apple/department_store.png and b/public/images/emoji/apple/department_store.png differ
diff --git a/public/images/emoji/apple/derelict_house.png b/public/images/emoji/apple/derelict_house.png
new file mode 100644
index 00000000000..f6c42518844
Binary files /dev/null and b/public/images/emoji/apple/derelict_house.png differ
diff --git a/public/images/emoji/apple/derelict_house_building.png b/public/images/emoji/apple/derelict_house_building.png
index a389ff82abc..f6c42518844 100644
Binary files a/public/images/emoji/apple/derelict_house_building.png and b/public/images/emoji/apple/derelict_house_building.png differ
diff --git a/public/images/emoji/apple/desert.png b/public/images/emoji/apple/desert.png
index 3e9dc4bde76..5839c71e7fa 100644
Binary files a/public/images/emoji/apple/desert.png and b/public/images/emoji/apple/desert.png differ
diff --git a/public/images/emoji/apple/desert_island.png b/public/images/emoji/apple/desert_island.png
index 21bb67b35d8..8b98bbead11 100644
Binary files a/public/images/emoji/apple/desert_island.png and b/public/images/emoji/apple/desert_island.png differ
diff --git a/public/images/emoji/apple/desktop.png b/public/images/emoji/apple/desktop.png
index 0bf97033c17..e1057cb3d04 100644
Binary files a/public/images/emoji/apple/desktop.png and b/public/images/emoji/apple/desktop.png differ
diff --git a/public/images/emoji/apple/desktop_computer.png b/public/images/emoji/apple/desktop_computer.png
index 0bf97033c17..e1057cb3d04 100644
Binary files a/public/images/emoji/apple/desktop_computer.png and b/public/images/emoji/apple/desktop_computer.png differ
diff --git a/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png b/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png
index 8d4e4294798..86bcc8cbbd3 100644
Binary files a/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png and b/public/images/emoji/apple/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/apple/diamonds.png b/public/images/emoji/apple/diamonds.png
index ed93594428d..7d7a55b4890 100644
Binary files a/public/images/emoji/apple/diamonds.png and b/public/images/emoji/apple/diamonds.png differ
diff --git a/public/images/emoji/apple/diego_garcia.png b/public/images/emoji/apple/diego_garcia.png
new file mode 100644
index 00000000000..1008c45a457
Binary files /dev/null and b/public/images/emoji/apple/diego_garcia.png differ
diff --git a/public/images/emoji/apple/dividers.png b/public/images/emoji/apple/dividers.png
index d0d53901429..688e41bb2ff 100644
Binary files a/public/images/emoji/apple/dividers.png and b/public/images/emoji/apple/dividers.png differ
diff --git a/public/images/emoji/apple/dizzy.png b/public/images/emoji/apple/dizzy.png
index 89907ac08f8..e006576d514 100644
Binary files a/public/images/emoji/apple/dizzy.png and b/public/images/emoji/apple/dizzy.png differ
diff --git a/public/images/emoji/apple/djibouti.png b/public/images/emoji/apple/djibouti.png
new file mode 100644
index 00000000000..8581bbc7d82
Binary files /dev/null and b/public/images/emoji/apple/djibouti.png differ
diff --git a/public/images/emoji/apple/do_not_litter.png b/public/images/emoji/apple/do_not_litter.png
index f9942358190..b4208f83f89 100644
Binary files a/public/images/emoji/apple/do_not_litter.png and b/public/images/emoji/apple/do_not_litter.png differ
diff --git a/public/images/emoji/apple/dog.png b/public/images/emoji/apple/dog.png
index 57c66a9f696..a2145e68b5e 100644
Binary files a/public/images/emoji/apple/dog.png and b/public/images/emoji/apple/dog.png differ
diff --git a/public/images/emoji/apple/dog2.png b/public/images/emoji/apple/dog2.png
index abcfcbe663c..e0a134d4647 100644
Binary files a/public/images/emoji/apple/dog2.png and b/public/images/emoji/apple/dog2.png differ
diff --git a/public/images/emoji/apple/dollar.png b/public/images/emoji/apple/dollar.png
index ac1450e239e..d98a38f4960 100644
Binary files a/public/images/emoji/apple/dollar.png and b/public/images/emoji/apple/dollar.png differ
diff --git a/public/images/emoji/apple/dolls.png b/public/images/emoji/apple/dolls.png
index 89a79746658..0e7e1bf9108 100644
Binary files a/public/images/emoji/apple/dolls.png and b/public/images/emoji/apple/dolls.png differ
diff --git a/public/images/emoji/apple/dolphin.png b/public/images/emoji/apple/dolphin.png
index 433d9710a48..ab393900ec7 100644
Binary files a/public/images/emoji/apple/dolphin.png and b/public/images/emoji/apple/dolphin.png differ
diff --git a/public/images/emoji/apple/dominica.png b/public/images/emoji/apple/dominica.png
new file mode 100644
index 00000000000..b2183a0bded
Binary files /dev/null and b/public/images/emoji/apple/dominica.png differ
diff --git a/public/images/emoji/apple/dominican_republic.png b/public/images/emoji/apple/dominican_republic.png
new file mode 100644
index 00000000000..3848b2a930c
Binary files /dev/null and b/public/images/emoji/apple/dominican_republic.png differ
diff --git a/public/images/emoji/apple/door.png b/public/images/emoji/apple/door.png
index 3980097067f..e8e2c50219c 100644
Binary files a/public/images/emoji/apple/door.png and b/public/images/emoji/apple/door.png differ
diff --git a/public/images/emoji/apple/double_vertical_bar.png b/public/images/emoji/apple/double_vertical_bar.png
index cdcd151e9a0..7f788fbb763 100644
Binary files a/public/images/emoji/apple/double_vertical_bar.png and b/public/images/emoji/apple/double_vertical_bar.png differ
diff --git a/public/images/emoji/apple/doughnut.png b/public/images/emoji/apple/doughnut.png
index 5a7b6e4ffff..4a767f03fbc 100644
Binary files a/public/images/emoji/apple/doughnut.png and b/public/images/emoji/apple/doughnut.png differ
diff --git a/public/images/emoji/apple/dove.png b/public/images/emoji/apple/dove.png
index 609e1b7b32b..59e34ff9120 100644
Binary files a/public/images/emoji/apple/dove.png and b/public/images/emoji/apple/dove.png differ
diff --git a/public/images/emoji/apple/dove_of_peace.png b/public/images/emoji/apple/dove_of_peace.png
index 609e1b7b32b..59e34ff9120 100644
Binary files a/public/images/emoji/apple/dove_of_peace.png and b/public/images/emoji/apple/dove_of_peace.png differ
diff --git a/public/images/emoji/apple/dragon.png b/public/images/emoji/apple/dragon.png
index d4dec06f8e9..14420b8e037 100644
Binary files a/public/images/emoji/apple/dragon.png and b/public/images/emoji/apple/dragon.png differ
diff --git a/public/images/emoji/apple/dragon_face.png b/public/images/emoji/apple/dragon_face.png
index 80aec940932..1133b422566 100644
Binary files a/public/images/emoji/apple/dragon_face.png and b/public/images/emoji/apple/dragon_face.png differ
diff --git a/public/images/emoji/apple/dress.png b/public/images/emoji/apple/dress.png
index 58645718822..64d792e8d84 100644
Binary files a/public/images/emoji/apple/dress.png and b/public/images/emoji/apple/dress.png differ
diff --git a/public/images/emoji/apple/dromedary_camel.png b/public/images/emoji/apple/dromedary_camel.png
index 418c09e3a2d..7c42f7b8e55 100644
Binary files a/public/images/emoji/apple/dromedary_camel.png and b/public/images/emoji/apple/dromedary_camel.png differ
diff --git a/public/images/emoji/apple/drooling_face.png b/public/images/emoji/apple/drooling_face.png
new file mode 100644
index 00000000000..3c8fe7b9008
Binary files /dev/null and b/public/images/emoji/apple/drooling_face.png differ
diff --git a/public/images/emoji/apple/droplet.png b/public/images/emoji/apple/droplet.png
index c3421ac0063..e5a511f5c5b 100644
Binary files a/public/images/emoji/apple/droplet.png and b/public/images/emoji/apple/droplet.png differ
diff --git a/public/images/emoji/apple/drum.png b/public/images/emoji/apple/drum.png
new file mode 100644
index 00000000000..4de7a5ba7ea
Binary files /dev/null and b/public/images/emoji/apple/drum.png differ
diff --git a/public/images/emoji/apple/duck.png b/public/images/emoji/apple/duck.png
new file mode 100644
index 00000000000..e0a5705214c
Binary files /dev/null and b/public/images/emoji/apple/duck.png differ
diff --git a/public/images/emoji/apple/dumpling.png b/public/images/emoji/apple/dumpling.png
new file mode 100644
index 00000000000..489a779bf69
Binary files /dev/null and b/public/images/emoji/apple/dumpling.png differ
diff --git a/public/images/emoji/apple/dvd.png b/public/images/emoji/apple/dvd.png
index 111fc7e2388..09d9c415f54 100644
Binary files a/public/images/emoji/apple/dvd.png and b/public/images/emoji/apple/dvd.png differ
diff --git a/public/images/emoji/apple/e-mail.png b/public/images/emoji/apple/e-mail.png
index c315c36ff3a..511be647ad4 100644
Binary files a/public/images/emoji/apple/e-mail.png and b/public/images/emoji/apple/e-mail.png differ
diff --git a/public/images/emoji/apple/eagle.png b/public/images/emoji/apple/eagle.png
new file mode 100644
index 00000000000..445c707c0ba
Binary files /dev/null and b/public/images/emoji/apple/eagle.png differ
diff --git a/public/images/emoji/apple/ear.png b/public/images/emoji/apple/ear.png
index 1da4022b42c..b6c7ea1c254 100644
Binary files a/public/images/emoji/apple/ear.png and b/public/images/emoji/apple/ear.png differ
diff --git a/public/images/emoji/apple/ear/2.png b/public/images/emoji/apple/ear/2.png
new file mode 100644
index 00000000000..ca5ccc47230
Binary files /dev/null and b/public/images/emoji/apple/ear/2.png differ
diff --git a/public/images/emoji/apple/ear/3.png b/public/images/emoji/apple/ear/3.png
new file mode 100644
index 00000000000..19728dcd78f
Binary files /dev/null and b/public/images/emoji/apple/ear/3.png differ
diff --git a/public/images/emoji/apple/ear/4.png b/public/images/emoji/apple/ear/4.png
new file mode 100644
index 00000000000..8fb3fff3577
Binary files /dev/null and b/public/images/emoji/apple/ear/4.png differ
diff --git a/public/images/emoji/apple/ear/5.png b/public/images/emoji/apple/ear/5.png
new file mode 100644
index 00000000000..b70cc564201
Binary files /dev/null and b/public/images/emoji/apple/ear/5.png differ
diff --git a/public/images/emoji/apple/ear/6.png b/public/images/emoji/apple/ear/6.png
new file mode 100644
index 00000000000..59b7bcc95ae
Binary files /dev/null and b/public/images/emoji/apple/ear/6.png differ
diff --git a/public/images/emoji/apple/ear_of_rice.png b/public/images/emoji/apple/ear_of_rice.png
index 24574248250..3efff570630 100644
Binary files a/public/images/emoji/apple/ear_of_rice.png and b/public/images/emoji/apple/ear_of_rice.png differ
diff --git a/public/images/emoji/apple/earth_africa.png b/public/images/emoji/apple/earth_africa.png
index f698fc778f9..19c0e250286 100644
Binary files a/public/images/emoji/apple/earth_africa.png and b/public/images/emoji/apple/earth_africa.png differ
diff --git a/public/images/emoji/apple/earth_americas.png b/public/images/emoji/apple/earth_americas.png
index 903f5136054..f6ab1f616b0 100644
Binary files a/public/images/emoji/apple/earth_americas.png and b/public/images/emoji/apple/earth_americas.png differ
diff --git a/public/images/emoji/apple/earth_asia.png b/public/images/emoji/apple/earth_asia.png
index d49bd7a5357..3e7b8e61780 100644
Binary files a/public/images/emoji/apple/earth_asia.png and b/public/images/emoji/apple/earth_asia.png differ
diff --git a/public/images/emoji/apple/ecuador.png b/public/images/emoji/apple/ecuador.png
new file mode 100644
index 00000000000..755cb280275
Binary files /dev/null and b/public/images/emoji/apple/ecuador.png differ
diff --git a/public/images/emoji/apple/egg.png b/public/images/emoji/apple/egg.png
index 56d1013597e..fb78dad2398 100644
Binary files a/public/images/emoji/apple/egg.png and b/public/images/emoji/apple/egg.png differ
diff --git a/public/images/emoji/apple/eggplant.png b/public/images/emoji/apple/eggplant.png
index 2f30152fc9f..f0b76c34ca9 100644
Binary files a/public/images/emoji/apple/eggplant.png and b/public/images/emoji/apple/eggplant.png differ
diff --git a/public/images/emoji/apple/egypt.png b/public/images/emoji/apple/egypt.png
new file mode 100644
index 00000000000..81d5764df11
Binary files /dev/null and b/public/images/emoji/apple/egypt.png differ
diff --git a/public/images/emoji/apple/eight.png b/public/images/emoji/apple/eight.png
index ba8ed5cf211..6269d3b91ab 100644
Binary files a/public/images/emoji/apple/eight.png and b/public/images/emoji/apple/eight.png differ
diff --git a/public/images/emoji/apple/eight_pointed_black_star.png b/public/images/emoji/apple/eight_pointed_black_star.png
index 123ddbfab4d..231d6abc891 100644
Binary files a/public/images/emoji/apple/eight_pointed_black_star.png and b/public/images/emoji/apple/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/apple/eight_spoked_asterisk.png b/public/images/emoji/apple/eight_spoked_asterisk.png
index cb694edee1d..1f094d2de51 100644
Binary files a/public/images/emoji/apple/eight_spoked_asterisk.png and b/public/images/emoji/apple/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/apple/el_salvador.png b/public/images/emoji/apple/el_salvador.png
new file mode 100644
index 00000000000..268812d6054
Binary files /dev/null and b/public/images/emoji/apple/el_salvador.png differ
diff --git a/public/images/emoji/apple/electric_plug.png b/public/images/emoji/apple/electric_plug.png
index 40914fec286..5be3a492f2e 100644
Binary files a/public/images/emoji/apple/electric_plug.png and b/public/images/emoji/apple/electric_plug.png differ
diff --git a/public/images/emoji/apple/elephant.png b/public/images/emoji/apple/elephant.png
index c11064716e3..04454bb1aa3 100644
Binary files a/public/images/emoji/apple/elephant.png and b/public/images/emoji/apple/elephant.png differ
diff --git a/public/images/emoji/apple/elf.png b/public/images/emoji/apple/elf.png
new file mode 100644
index 00000000000..f8b6dd873e2
Binary files /dev/null and b/public/images/emoji/apple/elf.png differ
diff --git a/public/images/emoji/apple/elf/2.png b/public/images/emoji/apple/elf/2.png
new file mode 100644
index 00000000000..15984024f21
Binary files /dev/null and b/public/images/emoji/apple/elf/2.png differ
diff --git a/public/images/emoji/apple/elf/3.png b/public/images/emoji/apple/elf/3.png
new file mode 100644
index 00000000000..4689243a178
Binary files /dev/null and b/public/images/emoji/apple/elf/3.png differ
diff --git a/public/images/emoji/apple/elf/4.png b/public/images/emoji/apple/elf/4.png
new file mode 100644
index 00000000000..861cbf808ca
Binary files /dev/null and b/public/images/emoji/apple/elf/4.png differ
diff --git a/public/images/emoji/apple/elf/5.png b/public/images/emoji/apple/elf/5.png
new file mode 100644
index 00000000000..50748760101
Binary files /dev/null and b/public/images/emoji/apple/elf/5.png differ
diff --git a/public/images/emoji/apple/elf/6.png b/public/images/emoji/apple/elf/6.png
new file mode 100644
index 00000000000..505c908b180
Binary files /dev/null and b/public/images/emoji/apple/elf/6.png differ
diff --git a/public/images/emoji/apple/email.png b/public/images/emoji/apple/email.png
index c315c36ff3a..511be647ad4 100644
Binary files a/public/images/emoji/apple/email.png and b/public/images/emoji/apple/email.png differ
diff --git a/public/images/emoji/apple/end.png b/public/images/emoji/apple/end.png
index 8cea2f1a54d..55820b7bf92 100644
Binary files a/public/images/emoji/apple/end.png and b/public/images/emoji/apple/end.png differ
diff --git a/public/images/emoji/apple/envelope.png b/public/images/emoji/apple/envelope.png
index 605d3dab831..511be647ad4 100644
Binary files a/public/images/emoji/apple/envelope.png and b/public/images/emoji/apple/envelope.png differ
diff --git a/public/images/emoji/apple/envelope_with_arrow.png b/public/images/emoji/apple/envelope_with_arrow.png
index 95e780e661b..68e1334683f 100644
Binary files a/public/images/emoji/apple/envelope_with_arrow.png and b/public/images/emoji/apple/envelope_with_arrow.png differ
diff --git a/public/images/emoji/apple/equatorial_guinea.png b/public/images/emoji/apple/equatorial_guinea.png
new file mode 100644
index 00000000000..4f4becc0d4e
Binary files /dev/null and b/public/images/emoji/apple/equatorial_guinea.png differ
diff --git a/public/images/emoji/apple/eritrea.png b/public/images/emoji/apple/eritrea.png
new file mode 100644
index 00000000000..41397be692d
Binary files /dev/null and b/public/images/emoji/apple/eritrea.png differ
diff --git a/public/images/emoji/apple/estonia.png b/public/images/emoji/apple/estonia.png
new file mode 100644
index 00000000000..30255a24330
Binary files /dev/null and b/public/images/emoji/apple/estonia.png differ
diff --git a/public/images/emoji/apple/ethiopia.png b/public/images/emoji/apple/ethiopia.png
new file mode 100644
index 00000000000..5c62e06a716
Binary files /dev/null and b/public/images/emoji/apple/ethiopia.png differ
diff --git a/public/images/emoji/apple/eu.png b/public/images/emoji/apple/eu.png
new file mode 100644
index 00000000000..67f06084970
Binary files /dev/null and b/public/images/emoji/apple/eu.png differ
diff --git a/public/images/emoji/apple/euro.png b/public/images/emoji/apple/euro.png
index 38e80e2152d..83a1a7018fe 100644
Binary files a/public/images/emoji/apple/euro.png and b/public/images/emoji/apple/euro.png differ
diff --git a/public/images/emoji/apple/european_castle.png b/public/images/emoji/apple/european_castle.png
index d58cafb8648..97fe6bad2d9 100644
Binary files a/public/images/emoji/apple/european_castle.png and b/public/images/emoji/apple/european_castle.png differ
diff --git a/public/images/emoji/apple/european_post_office.png b/public/images/emoji/apple/european_post_office.png
index b4d0a0748f9..c1ab53657c7 100644
Binary files a/public/images/emoji/apple/european_post_office.png and b/public/images/emoji/apple/european_post_office.png differ
diff --git a/public/images/emoji/apple/evergreen_tree.png b/public/images/emoji/apple/evergreen_tree.png
index 409aacd660a..4609b01c50c 100644
Binary files a/public/images/emoji/apple/evergreen_tree.png and b/public/images/emoji/apple/evergreen_tree.png differ
diff --git a/public/images/emoji/apple/exclamation.png b/public/images/emoji/apple/exclamation.png
index 8b069bce08b..d074b414f8f 100644
Binary files a/public/images/emoji/apple/exclamation.png and b/public/images/emoji/apple/exclamation.png differ
diff --git a/public/images/emoji/apple/exploding_head.png b/public/images/emoji/apple/exploding_head.png
new file mode 100644
index 00000000000..85532dadc7a
Binary files /dev/null and b/public/images/emoji/apple/exploding_head.png differ
diff --git a/public/images/emoji/apple/eye.png b/public/images/emoji/apple/eye.png
index fef3d125829..a3f3dd64f6c 100644
Binary files a/public/images/emoji/apple/eye.png and b/public/images/emoji/apple/eye.png differ
diff --git a/public/images/emoji/apple/eyeglasses.png b/public/images/emoji/apple/eyeglasses.png
index 34a555e1c7a..8c5c74e74c2 100644
Binary files a/public/images/emoji/apple/eyeglasses.png and b/public/images/emoji/apple/eyeglasses.png differ
diff --git a/public/images/emoji/apple/eyes.png b/public/images/emoji/apple/eyes.png
index 14e2434955b..b28ffc8d7ae 100644
Binary files a/public/images/emoji/apple/eyes.png and b/public/images/emoji/apple/eyes.png differ
diff --git a/public/images/emoji/apple/face_vomiting.png b/public/images/emoji/apple/face_vomiting.png
new file mode 100644
index 00000000000..cd7c3d1f2b7
Binary files /dev/null and b/public/images/emoji/apple/face_vomiting.png differ
diff --git a/public/images/emoji/apple/face_with_hand_over_mouth.png b/public/images/emoji/apple/face_with_hand_over_mouth.png
new file mode 100644
index 00000000000..aed8f62e0b0
Binary files /dev/null and b/public/images/emoji/apple/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/apple/face_with_monocle.png b/public/images/emoji/apple/face_with_monocle.png
new file mode 100644
index 00000000000..c6fbb4481d5
Binary files /dev/null and b/public/images/emoji/apple/face_with_monocle.png differ
diff --git a/public/images/emoji/apple/face_with_raised_eyebrow.png b/public/images/emoji/apple/face_with_raised_eyebrow.png
new file mode 100644
index 00000000000..887f70e3652
Binary files /dev/null and b/public/images/emoji/apple/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/apple/face_with_symbols_over_mouth.png b/public/images/emoji/apple/face_with_symbols_over_mouth.png
new file mode 100644
index 00000000000..84bb9ec9c53
Binary files /dev/null and b/public/images/emoji/apple/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/apple/facepunch.png b/public/images/emoji/apple/facepunch.png
new file mode 100644
index 00000000000..c01cab21b58
Binary files /dev/null and b/public/images/emoji/apple/facepunch.png differ
diff --git a/public/images/emoji/apple/facepunch/2.png b/public/images/emoji/apple/facepunch/2.png
new file mode 100644
index 00000000000..1c8dd8dbf32
Binary files /dev/null and b/public/images/emoji/apple/facepunch/2.png differ
diff --git a/public/images/emoji/apple/facepunch/3.png b/public/images/emoji/apple/facepunch/3.png
new file mode 100644
index 00000000000..39deb2c7e8c
Binary files /dev/null and b/public/images/emoji/apple/facepunch/3.png differ
diff --git a/public/images/emoji/apple/facepunch/4.png b/public/images/emoji/apple/facepunch/4.png
new file mode 100644
index 00000000000..ef6df0b9330
Binary files /dev/null and b/public/images/emoji/apple/facepunch/4.png differ
diff --git a/public/images/emoji/apple/facepunch/5.png b/public/images/emoji/apple/facepunch/5.png
new file mode 100644
index 00000000000..8552732ad40
Binary files /dev/null and b/public/images/emoji/apple/facepunch/5.png differ
diff --git a/public/images/emoji/apple/facepunch/6.png b/public/images/emoji/apple/facepunch/6.png
new file mode 100644
index 00000000000..24f4a3071ab
Binary files /dev/null and b/public/images/emoji/apple/facepunch/6.png differ
diff --git a/public/images/emoji/apple/factory.png b/public/images/emoji/apple/factory.png
index a4af077ca50..28ff6cc73df 100644
Binary files a/public/images/emoji/apple/factory.png and b/public/images/emoji/apple/factory.png differ
diff --git a/public/images/emoji/apple/fairy.png b/public/images/emoji/apple/fairy.png
new file mode 100644
index 00000000000..429938294b2
Binary files /dev/null and b/public/images/emoji/apple/fairy.png differ
diff --git a/public/images/emoji/apple/fairy/2.png b/public/images/emoji/apple/fairy/2.png
new file mode 100644
index 00000000000..91e1de4e5dc
Binary files /dev/null and b/public/images/emoji/apple/fairy/2.png differ
diff --git a/public/images/emoji/apple/fairy/3.png b/public/images/emoji/apple/fairy/3.png
new file mode 100644
index 00000000000..42821806e92
Binary files /dev/null and b/public/images/emoji/apple/fairy/3.png differ
diff --git a/public/images/emoji/apple/fairy/4.png b/public/images/emoji/apple/fairy/4.png
new file mode 100644
index 00000000000..9e8d3adb897
Binary files /dev/null and b/public/images/emoji/apple/fairy/4.png differ
diff --git a/public/images/emoji/apple/fairy/5.png b/public/images/emoji/apple/fairy/5.png
new file mode 100644
index 00000000000..88d190e3926
Binary files /dev/null and b/public/images/emoji/apple/fairy/5.png differ
diff --git a/public/images/emoji/apple/fairy/6.png b/public/images/emoji/apple/fairy/6.png
new file mode 100644
index 00000000000..e6ab8ade743
Binary files /dev/null and b/public/images/emoji/apple/fairy/6.png differ
diff --git a/public/images/emoji/apple/falkland_islands.png b/public/images/emoji/apple/falkland_islands.png
new file mode 100644
index 00000000000..74f9b4ddf4b
Binary files /dev/null and b/public/images/emoji/apple/falkland_islands.png differ
diff --git a/public/images/emoji/apple/fallen_leaf.png b/public/images/emoji/apple/fallen_leaf.png
index 4ac95b4d57f..62054c42fa2 100644
Binary files a/public/images/emoji/apple/fallen_leaf.png and b/public/images/emoji/apple/fallen_leaf.png differ
diff --git a/public/images/emoji/apple/family.png b/public/images/emoji/apple/family.png
new file mode 100644
index 00000000000..100c01bda8a
Binary files /dev/null and b/public/images/emoji/apple/family.png differ
diff --git a/public/images/emoji/apple/family_man_boy.png b/public/images/emoji/apple/family_man_boy.png
new file mode 100644
index 00000000000..d5e6e2a58eb
Binary files /dev/null and b/public/images/emoji/apple/family_man_boy.png differ
diff --git a/public/images/emoji/apple/family_man_boy_boy.png b/public/images/emoji/apple/family_man_boy_boy.png
new file mode 100644
index 00000000000..1a9f21b2a38
Binary files /dev/null and b/public/images/emoji/apple/family_man_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_man_girl.png b/public/images/emoji/apple/family_man_girl.png
new file mode 100644
index 00000000000..9af1f5af57f
Binary files /dev/null and b/public/images/emoji/apple/family_man_girl.png differ
diff --git a/public/images/emoji/apple/family_man_girl_boy.png b/public/images/emoji/apple/family_man_girl_boy.png
new file mode 100644
index 00000000000..c5900031b81
Binary files /dev/null and b/public/images/emoji/apple/family_man_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_man_girl_girl.png b/public/images/emoji/apple/family_man_girl_girl.png
new file mode 100644
index 00000000000..1f9a1557d53
Binary files /dev/null and b/public/images/emoji/apple/family_man_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_man_man_boy.png b/public/images/emoji/apple/family_man_man_boy.png
new file mode 100644
index 00000000000..40020601cb0
Binary files /dev/null and b/public/images/emoji/apple/family_man_man_boy.png differ
diff --git a/public/images/emoji/apple/family_man_man_boy_boy.png b/public/images/emoji/apple/family_man_man_boy_boy.png
new file mode 100644
index 00000000000..57c7b976574
Binary files /dev/null and b/public/images/emoji/apple/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_man_man_girl.png b/public/images/emoji/apple/family_man_man_girl.png
new file mode 100644
index 00000000000..158384d6e36
Binary files /dev/null and b/public/images/emoji/apple/family_man_man_girl.png differ
diff --git a/public/images/emoji/apple/family_man_man_girl_boy.png b/public/images/emoji/apple/family_man_man_girl_boy.png
new file mode 100644
index 00000000000..3394121d143
Binary files /dev/null and b/public/images/emoji/apple/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_man_man_girl_girl.png b/public/images/emoji/apple/family_man_man_girl_girl.png
new file mode 100644
index 00000000000..97c1f26473f
Binary files /dev/null and b/public/images/emoji/apple/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_man_woman_boy.png b/public/images/emoji/apple/family_man_woman_boy.png
new file mode 100644
index 00000000000..4d0ef0c5b01
Binary files /dev/null and b/public/images/emoji/apple/family_man_woman_boy.png differ
diff --git a/public/images/emoji/apple/family_man_woman_boy_boy.png b/public/images/emoji/apple/family_man_woman_boy_boy.png
new file mode 100644
index 00000000000..213af3e02d2
Binary files /dev/null and b/public/images/emoji/apple/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_man_woman_girl_girl.png b/public/images/emoji/apple/family_man_woman_girl_girl.png
new file mode 100644
index 00000000000..004ec8f4274
Binary files /dev/null and b/public/images/emoji/apple/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_woman_boy.png b/public/images/emoji/apple/family_woman_boy.png
new file mode 100644
index 00000000000..4d16c607733
Binary files /dev/null and b/public/images/emoji/apple/family_woman_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_boy_boy.png b/public/images/emoji/apple/family_woman_boy_boy.png
new file mode 100644
index 00000000000..8713aa91e19
Binary files /dev/null and b/public/images/emoji/apple/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_girl.png b/public/images/emoji/apple/family_woman_girl.png
new file mode 100644
index 00000000000..da7c9911315
Binary files /dev/null and b/public/images/emoji/apple/family_woman_girl.png differ
diff --git a/public/images/emoji/apple/family_woman_girl_boy.png b/public/images/emoji/apple/family_woman_girl_boy.png
new file mode 100644
index 00000000000..0c28c1f8949
Binary files /dev/null and b/public/images/emoji/apple/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_girl_girl.png b/public/images/emoji/apple/family_woman_girl_girl.png
new file mode 100644
index 00000000000..ac197a85fe5
Binary files /dev/null and b/public/images/emoji/apple/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_boy.png b/public/images/emoji/apple/family_woman_woman_boy.png
new file mode 100644
index 00000000000..039d152d5bd
Binary files /dev/null and b/public/images/emoji/apple/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_boy_boy.png b/public/images/emoji/apple/family_woman_woman_boy_boy.png
new file mode 100644
index 00000000000..e70b13476b9
Binary files /dev/null and b/public/images/emoji/apple/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_girl.png b/public/images/emoji/apple/family_woman_woman_girl.png
new file mode 100644
index 00000000000..c71257738d3
Binary files /dev/null and b/public/images/emoji/apple/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_girl_boy.png b/public/images/emoji/apple/family_woman_woman_girl_boy.png
new file mode 100644
index 00000000000..85f7db36571
Binary files /dev/null and b/public/images/emoji/apple/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/apple/family_woman_woman_girl_girl.png b/public/images/emoji/apple/family_woman_woman_girl_girl.png
new file mode 100644
index 00000000000..aa6768144c7
Binary files /dev/null and b/public/images/emoji/apple/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/apple/faroe_islands.png b/public/images/emoji/apple/faroe_islands.png
new file mode 100644
index 00000000000..d25d24ead60
Binary files /dev/null and b/public/images/emoji/apple/faroe_islands.png differ
diff --git a/public/images/emoji/apple/fast_forward.png b/public/images/emoji/apple/fast_forward.png
index a9863968082..b572d4c18f6 100644
Binary files a/public/images/emoji/apple/fast_forward.png and b/public/images/emoji/apple/fast_forward.png differ
diff --git a/public/images/emoji/apple/fax.png b/public/images/emoji/apple/fax.png
index 1b27863795c..17a81c529a6 100644
Binary files a/public/images/emoji/apple/fax.png and b/public/images/emoji/apple/fax.png differ
diff --git a/public/images/emoji/apple/feet.png b/public/images/emoji/apple/feet.png
index 3b1c263cd3e..90e0440afcf 100644
Binary files a/public/images/emoji/apple/feet.png and b/public/images/emoji/apple/feet.png differ
diff --git a/public/images/emoji/apple/female_detective.png b/public/images/emoji/apple/female_detective.png
new file mode 100644
index 00000000000..975fdf28c9c
Binary files /dev/null and b/public/images/emoji/apple/female_detective.png differ
diff --git a/public/images/emoji/apple/ferris_wheel.png b/public/images/emoji/apple/ferris_wheel.png
index ff5b81002bd..a7e1395cad5 100644
Binary files a/public/images/emoji/apple/ferris_wheel.png and b/public/images/emoji/apple/ferris_wheel.png differ
diff --git a/public/images/emoji/apple/ferry.png b/public/images/emoji/apple/ferry.png
index f45493c7eaf..ee0b0e5e7ae 100644
Binary files a/public/images/emoji/apple/ferry.png and b/public/images/emoji/apple/ferry.png differ
diff --git a/public/images/emoji/apple/field_hockey.png b/public/images/emoji/apple/field_hockey.png
index cce22bf0c8d..bccfae66577 100644
Binary files a/public/images/emoji/apple/field_hockey.png and b/public/images/emoji/apple/field_hockey.png differ
diff --git a/public/images/emoji/apple/fiji.png b/public/images/emoji/apple/fiji.png
new file mode 100644
index 00000000000..ed75e1a7db0
Binary files /dev/null and b/public/images/emoji/apple/fiji.png differ
diff --git a/public/images/emoji/apple/file_cabinet.png b/public/images/emoji/apple/file_cabinet.png
index 54ab7ea7ebc..0f2f79c9db6 100644
Binary files a/public/images/emoji/apple/file_cabinet.png and b/public/images/emoji/apple/file_cabinet.png differ
diff --git a/public/images/emoji/apple/file_folder.png b/public/images/emoji/apple/file_folder.png
index f32be103d77..bc88b6c48c4 100644
Binary files a/public/images/emoji/apple/file_folder.png and b/public/images/emoji/apple/file_folder.png differ
diff --git a/public/images/emoji/apple/film_frames.png b/public/images/emoji/apple/film_frames.png
index df47b4e5506..043221da538 100644
Binary files a/public/images/emoji/apple/film_frames.png and b/public/images/emoji/apple/film_frames.png differ
diff --git a/public/images/emoji/apple/film_projector.png b/public/images/emoji/apple/film_projector.png
index 788f131ec08..add4400d044 100644
Binary files a/public/images/emoji/apple/film_projector.png and b/public/images/emoji/apple/film_projector.png differ
diff --git a/public/images/emoji/apple/film_strip.png b/public/images/emoji/apple/film_strip.png
new file mode 100644
index 00000000000..043221da538
Binary files /dev/null and b/public/images/emoji/apple/film_strip.png differ
diff --git a/public/images/emoji/apple/finland.png b/public/images/emoji/apple/finland.png
new file mode 100644
index 00000000000..89e088c5845
Binary files /dev/null and b/public/images/emoji/apple/finland.png differ
diff --git a/public/images/emoji/apple/fire.png b/public/images/emoji/apple/fire.png
index 6776b47d66b..a82ae1ee4f3 100644
Binary files a/public/images/emoji/apple/fire.png and b/public/images/emoji/apple/fire.png differ
diff --git a/public/images/emoji/apple/fire_engine.png b/public/images/emoji/apple/fire_engine.png
index ec5e7509485..40552da1e82 100644
Binary files a/public/images/emoji/apple/fire_engine.png and b/public/images/emoji/apple/fire_engine.png differ
diff --git a/public/images/emoji/apple/fireworks.png b/public/images/emoji/apple/fireworks.png
index 953114e143e..de37ce8bcfa 100644
Binary files a/public/images/emoji/apple/fireworks.png and b/public/images/emoji/apple/fireworks.png differ
diff --git a/public/images/emoji/apple/first_quarter_moon.png b/public/images/emoji/apple/first_quarter_moon.png
index 9428a59764f..c7f8ed43b5e 100644
Binary files a/public/images/emoji/apple/first_quarter_moon.png and b/public/images/emoji/apple/first_quarter_moon.png differ
diff --git a/public/images/emoji/apple/first_quarter_moon_with_face.png b/public/images/emoji/apple/first_quarter_moon_with_face.png
index 60b0b046d5a..dc0c46be80e 100644
Binary files a/public/images/emoji/apple/first_quarter_moon_with_face.png and b/public/images/emoji/apple/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/apple/fish.png b/public/images/emoji/apple/fish.png
index aa7a45e1e91..0a927f82023 100644
Binary files a/public/images/emoji/apple/fish.png and b/public/images/emoji/apple/fish.png differ
diff --git a/public/images/emoji/apple/fish_cake.png b/public/images/emoji/apple/fish_cake.png
index d5c3887b1d3..2babbb0dd95 100644
Binary files a/public/images/emoji/apple/fish_cake.png and b/public/images/emoji/apple/fish_cake.png differ
diff --git a/public/images/emoji/apple/fishing_pole_and_fish.png b/public/images/emoji/apple/fishing_pole_and_fish.png
index c21e17c44b1..cdece2b307f 100644
Binary files a/public/images/emoji/apple/fishing_pole_and_fish.png and b/public/images/emoji/apple/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/apple/fist/2.png b/public/images/emoji/apple/fist/2.png
new file mode 100644
index 00000000000..56285b20a88
Binary files /dev/null and b/public/images/emoji/apple/fist/2.png differ
diff --git a/public/images/emoji/apple/fist/3.png b/public/images/emoji/apple/fist/3.png
new file mode 100644
index 00000000000..65407645907
Binary files /dev/null and b/public/images/emoji/apple/fist/3.png differ
diff --git a/public/images/emoji/apple/fist/4.png b/public/images/emoji/apple/fist/4.png
new file mode 100644
index 00000000000..1ab8f2389d6
Binary files /dev/null and b/public/images/emoji/apple/fist/4.png differ
diff --git a/public/images/emoji/apple/fist/5.png b/public/images/emoji/apple/fist/5.png
new file mode 100644
index 00000000000..59bf4d86638
Binary files /dev/null and b/public/images/emoji/apple/fist/5.png differ
diff --git a/public/images/emoji/apple/fist/6.png b/public/images/emoji/apple/fist/6.png
new file mode 100644
index 00000000000..8f30f679368
Binary files /dev/null and b/public/images/emoji/apple/fist/6.png differ
diff --git a/public/images/emoji/apple/fist_left.png b/public/images/emoji/apple/fist_left.png
new file mode 100644
index 00000000000..e42595f193e
Binary files /dev/null and b/public/images/emoji/apple/fist_left.png differ
diff --git a/public/images/emoji/apple/fist_left/2.png b/public/images/emoji/apple/fist_left/2.png
new file mode 100644
index 00000000000..82e6f4dc748
Binary files /dev/null and b/public/images/emoji/apple/fist_left/2.png differ
diff --git a/public/images/emoji/apple/fist_left/3.png b/public/images/emoji/apple/fist_left/3.png
new file mode 100644
index 00000000000..b478c30cbe4
Binary files /dev/null and b/public/images/emoji/apple/fist_left/3.png differ
diff --git a/public/images/emoji/apple/fist_left/4.png b/public/images/emoji/apple/fist_left/4.png
new file mode 100644
index 00000000000..c8784ff9610
Binary files /dev/null and b/public/images/emoji/apple/fist_left/4.png differ
diff --git a/public/images/emoji/apple/fist_left/5.png b/public/images/emoji/apple/fist_left/5.png
new file mode 100644
index 00000000000..4fa222dcf9c
Binary files /dev/null and b/public/images/emoji/apple/fist_left/5.png differ
diff --git a/public/images/emoji/apple/fist_left/6.png b/public/images/emoji/apple/fist_left/6.png
new file mode 100644
index 00000000000..8b21664f07f
Binary files /dev/null and b/public/images/emoji/apple/fist_left/6.png differ
diff --git a/public/images/emoji/apple/fist_right.png b/public/images/emoji/apple/fist_right.png
new file mode 100644
index 00000000000..297aca7b8f7
Binary files /dev/null and b/public/images/emoji/apple/fist_right.png differ
diff --git a/public/images/emoji/apple/fist_right/2.png b/public/images/emoji/apple/fist_right/2.png
new file mode 100644
index 00000000000..ca9bd453dcd
Binary files /dev/null and b/public/images/emoji/apple/fist_right/2.png differ
diff --git a/public/images/emoji/apple/fist_right/3.png b/public/images/emoji/apple/fist_right/3.png
new file mode 100644
index 00000000000..e95c238d062
Binary files /dev/null and b/public/images/emoji/apple/fist_right/3.png differ
diff --git a/public/images/emoji/apple/fist_right/4.png b/public/images/emoji/apple/fist_right/4.png
new file mode 100644
index 00000000000..787f7fdd80a
Binary files /dev/null and b/public/images/emoji/apple/fist_right/4.png differ
diff --git a/public/images/emoji/apple/fist_right/5.png b/public/images/emoji/apple/fist_right/5.png
new file mode 100644
index 00000000000..a32f3128f8e
Binary files /dev/null and b/public/images/emoji/apple/fist_right/5.png differ
diff --git a/public/images/emoji/apple/fist_right/6.png b/public/images/emoji/apple/fist_right/6.png
new file mode 100644
index 00000000000..ca7be414ac4
Binary files /dev/null and b/public/images/emoji/apple/fist_right/6.png differ
diff --git a/public/images/emoji/apple/five.png b/public/images/emoji/apple/five.png
index 97fcc34bf7f..5c85432a268 100644
Binary files a/public/images/emoji/apple/five.png and b/public/images/emoji/apple/five.png differ
diff --git a/public/images/emoji/apple/flag_black.png b/public/images/emoji/apple/flag_black.png
index dbe8461ec3b..36a0a6987d1 100644
Binary files a/public/images/emoji/apple/flag_black.png and b/public/images/emoji/apple/flag_black.png differ
diff --git a/public/images/emoji/apple/flag_white.png b/public/images/emoji/apple/flag_white.png
index fcdd1e4cae2..16ed8e6169c 100644
Binary files a/public/images/emoji/apple/flag_white.png and b/public/images/emoji/apple/flag_white.png differ
diff --git a/public/images/emoji/apple/flags.png b/public/images/emoji/apple/flags.png
index 1cf5a94a216..30d7cf30704 100644
Binary files a/public/images/emoji/apple/flags.png and b/public/images/emoji/apple/flags.png differ
diff --git a/public/images/emoji/apple/flame.png b/public/images/emoji/apple/flame.png
index 6776b47d66b..a82ae1ee4f3 100644
Binary files a/public/images/emoji/apple/flame.png and b/public/images/emoji/apple/flame.png differ
diff --git a/public/images/emoji/apple/flashlight.png b/public/images/emoji/apple/flashlight.png
index 0c6e5cd0580..0bc1f97f799 100644
Binary files a/public/images/emoji/apple/flashlight.png and b/public/images/emoji/apple/flashlight.png differ
diff --git a/public/images/emoji/apple/fleur-de-lis.png b/public/images/emoji/apple/fleur-de-lis.png
index e1576843351..d0cf7fc2278 100644
Binary files a/public/images/emoji/apple/fleur-de-lis.png and b/public/images/emoji/apple/fleur-de-lis.png differ
diff --git a/public/images/emoji/apple/fleur_de_lis.png b/public/images/emoji/apple/fleur_de_lis.png
new file mode 100644
index 00000000000..d0cf7fc2278
Binary files /dev/null and b/public/images/emoji/apple/fleur_de_lis.png differ
diff --git a/public/images/emoji/apple/flight_arrival.png b/public/images/emoji/apple/flight_arrival.png
new file mode 100644
index 00000000000..c716ff21866
Binary files /dev/null and b/public/images/emoji/apple/flight_arrival.png differ
diff --git a/public/images/emoji/apple/flight_departure.png b/public/images/emoji/apple/flight_departure.png
new file mode 100644
index 00000000000..d1fcea18b8a
Binary files /dev/null and b/public/images/emoji/apple/flight_departure.png differ
diff --git a/public/images/emoji/apple/floppy_disk.png b/public/images/emoji/apple/floppy_disk.png
index 05daeb667a3..75b06ec087c 100644
Binary files a/public/images/emoji/apple/floppy_disk.png and b/public/images/emoji/apple/floppy_disk.png differ
diff --git a/public/images/emoji/apple/flower_playing_cards.png b/public/images/emoji/apple/flower_playing_cards.png
index 1753f555cfa..e3db650f43d 100644
Binary files a/public/images/emoji/apple/flower_playing_cards.png and b/public/images/emoji/apple/flower_playing_cards.png differ
diff --git a/public/images/emoji/apple/flying_saucer.png b/public/images/emoji/apple/flying_saucer.png
new file mode 100644
index 00000000000..7d5c8628554
Binary files /dev/null and b/public/images/emoji/apple/flying_saucer.png differ
diff --git a/public/images/emoji/apple/fog.png b/public/images/emoji/apple/fog.png
index e3ea064e09b..7dd185d50f4 100644
Binary files a/public/images/emoji/apple/fog.png and b/public/images/emoji/apple/fog.png differ
diff --git a/public/images/emoji/apple/foggy.png b/public/images/emoji/apple/foggy.png
index c1298b7f4db..32200d7f8e3 100644
Binary files a/public/images/emoji/apple/foggy.png and b/public/images/emoji/apple/foggy.png differ
diff --git a/public/images/emoji/apple/football.png b/public/images/emoji/apple/football.png
index 5d25a3a583e..40a806bd974 100644
Binary files a/public/images/emoji/apple/football.png and b/public/images/emoji/apple/football.png differ
diff --git a/public/images/emoji/apple/footprints.png b/public/images/emoji/apple/footprints.png
index 73c0cb7c279..90e0440afcf 100644
Binary files a/public/images/emoji/apple/footprints.png and b/public/images/emoji/apple/footprints.png differ
diff --git a/public/images/emoji/apple/fork_and_knife.png b/public/images/emoji/apple/fork_and_knife.png
index e0b8b0aa6cb..a01e82ebcf9 100644
Binary files a/public/images/emoji/apple/fork_and_knife.png and b/public/images/emoji/apple/fork_and_knife.png differ
diff --git a/public/images/emoji/apple/fork_and_knife_with_plate.png b/public/images/emoji/apple/fork_and_knife_with_plate.png
index 32e586bd6e9..54bd5dc10a4 100644
Binary files a/public/images/emoji/apple/fork_and_knife_with_plate.png and b/public/images/emoji/apple/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/apple/fork_knife_plate.png b/public/images/emoji/apple/fork_knife_plate.png
index 32e586bd6e9..54bd5dc10a4 100644
Binary files a/public/images/emoji/apple/fork_knife_plate.png and b/public/images/emoji/apple/fork_knife_plate.png differ
diff --git a/public/images/emoji/apple/fortune_cookie.png b/public/images/emoji/apple/fortune_cookie.png
new file mode 100644
index 00000000000..94a8cdca403
Binary files /dev/null and b/public/images/emoji/apple/fortune_cookie.png differ
diff --git a/public/images/emoji/apple/fountain.png b/public/images/emoji/apple/fountain.png
index 3517896f8d5..c6fa8ddb0c4 100644
Binary files a/public/images/emoji/apple/fountain.png and b/public/images/emoji/apple/fountain.png differ
diff --git a/public/images/emoji/apple/fountain_pen.png b/public/images/emoji/apple/fountain_pen.png
new file mode 100644
index 00000000000..a9a947848d8
Binary files /dev/null and b/public/images/emoji/apple/fountain_pen.png differ
diff --git a/public/images/emoji/apple/four.png b/public/images/emoji/apple/four.png
index 3ed87090edf..3800d040764 100644
Binary files a/public/images/emoji/apple/four.png and b/public/images/emoji/apple/four.png differ
diff --git a/public/images/emoji/apple/four_leaf_clover.png b/public/images/emoji/apple/four_leaf_clover.png
index 54206ae16cb..48483d4c4cf 100644
Binary files a/public/images/emoji/apple/four_leaf_clover.png and b/public/images/emoji/apple/four_leaf_clover.png differ
diff --git a/public/images/emoji/apple/fox_face.png b/public/images/emoji/apple/fox_face.png
new file mode 100644
index 00000000000..d07aefd8421
Binary files /dev/null and b/public/images/emoji/apple/fox_face.png differ
diff --git a/public/images/emoji/apple/frame_photo.png b/public/images/emoji/apple/frame_photo.png
index 3fe887c4fc3..aaca2338d63 100644
Binary files a/public/images/emoji/apple/frame_photo.png and b/public/images/emoji/apple/frame_photo.png differ
diff --git a/public/images/emoji/apple/frame_with_picture.png b/public/images/emoji/apple/frame_with_picture.png
index 3fe887c4fc3..aaca2338d63 100644
Binary files a/public/images/emoji/apple/frame_with_picture.png and b/public/images/emoji/apple/frame_with_picture.png differ
diff --git a/public/images/emoji/apple/framed_picture.png b/public/images/emoji/apple/framed_picture.png
new file mode 100644
index 00000000000..aaca2338d63
Binary files /dev/null and b/public/images/emoji/apple/framed_picture.png differ
diff --git a/public/images/emoji/apple/free.png b/public/images/emoji/apple/free.png
index 17ba34e064f..846f230e279 100644
Binary files a/public/images/emoji/apple/free.png and b/public/images/emoji/apple/free.png differ
diff --git a/public/images/emoji/apple/french_guiana.png b/public/images/emoji/apple/french_guiana.png
new file mode 100644
index 00000000000..a816d9029b7
Binary files /dev/null and b/public/images/emoji/apple/french_guiana.png differ
diff --git a/public/images/emoji/apple/french_polynesia.png b/public/images/emoji/apple/french_polynesia.png
new file mode 100644
index 00000000000..995998a8163
Binary files /dev/null and b/public/images/emoji/apple/french_polynesia.png differ
diff --git a/public/images/emoji/apple/french_southern_territories.png b/public/images/emoji/apple/french_southern_territories.png
new file mode 100644
index 00000000000..a80ba97496b
Binary files /dev/null and b/public/images/emoji/apple/french_southern_territories.png differ
diff --git a/public/images/emoji/apple/fried_egg.png b/public/images/emoji/apple/fried_egg.png
new file mode 100644
index 00000000000..3479598fdcf
Binary files /dev/null and b/public/images/emoji/apple/fried_egg.png differ
diff --git a/public/images/emoji/apple/fried_shrimp.png b/public/images/emoji/apple/fried_shrimp.png
index d5fe969019b..b72fcc4d8d0 100644
Binary files a/public/images/emoji/apple/fried_shrimp.png and b/public/images/emoji/apple/fried_shrimp.png differ
diff --git a/public/images/emoji/apple/fries.png b/public/images/emoji/apple/fries.png
index ceac1ce2517..a0c633dab48 100644
Binary files a/public/images/emoji/apple/fries.png and b/public/images/emoji/apple/fries.png differ
diff --git a/public/images/emoji/apple/frog.png b/public/images/emoji/apple/frog.png
index a812028077f..2143534e9a5 100644
Binary files a/public/images/emoji/apple/frog.png and b/public/images/emoji/apple/frog.png differ
diff --git a/public/images/emoji/apple/frowning_face.png b/public/images/emoji/apple/frowning_face.png
new file mode 100644
index 00000000000..ad1715f8a4d
Binary files /dev/null and b/public/images/emoji/apple/frowning_face.png differ
diff --git a/public/images/emoji/apple/frowning_man.png b/public/images/emoji/apple/frowning_man.png
new file mode 100644
index 00000000000..3beb9a2f2d6
Binary files /dev/null and b/public/images/emoji/apple/frowning_man.png differ
diff --git a/public/images/emoji/apple/frowning_man/2.png b/public/images/emoji/apple/frowning_man/2.png
new file mode 100644
index 00000000000..8081a99c5f9
Binary files /dev/null and b/public/images/emoji/apple/frowning_man/2.png differ
diff --git a/public/images/emoji/apple/frowning_man/3.png b/public/images/emoji/apple/frowning_man/3.png
new file mode 100644
index 00000000000..515f0a219b2
Binary files /dev/null and b/public/images/emoji/apple/frowning_man/3.png differ
diff --git a/public/images/emoji/apple/frowning_man/4.png b/public/images/emoji/apple/frowning_man/4.png
new file mode 100644
index 00000000000..6d128581318
Binary files /dev/null and b/public/images/emoji/apple/frowning_man/4.png differ
diff --git a/public/images/emoji/apple/frowning_man/5.png b/public/images/emoji/apple/frowning_man/5.png
new file mode 100644
index 00000000000..95d1122106e
Binary files /dev/null and b/public/images/emoji/apple/frowning_man/5.png differ
diff --git a/public/images/emoji/apple/frowning_man/6.png b/public/images/emoji/apple/frowning_man/6.png
new file mode 100644
index 00000000000..d1282dd94b3
Binary files /dev/null and b/public/images/emoji/apple/frowning_man/6.png differ
diff --git a/public/images/emoji/apple/frowning_woman.png b/public/images/emoji/apple/frowning_woman.png
new file mode 100644
index 00000000000..d06a0aa7333
Binary files /dev/null and b/public/images/emoji/apple/frowning_woman.png differ
diff --git a/public/images/emoji/apple/frowning_woman/2.png b/public/images/emoji/apple/frowning_woman/2.png
new file mode 100644
index 00000000000..aa34de20948
Binary files /dev/null and b/public/images/emoji/apple/frowning_woman/2.png differ
diff --git a/public/images/emoji/apple/frowning_woman/3.png b/public/images/emoji/apple/frowning_woman/3.png
new file mode 100644
index 00000000000..638e52f05c7
Binary files /dev/null and b/public/images/emoji/apple/frowning_woman/3.png differ
diff --git a/public/images/emoji/apple/frowning_woman/4.png b/public/images/emoji/apple/frowning_woman/4.png
new file mode 100644
index 00000000000..25be6800ca3
Binary files /dev/null and b/public/images/emoji/apple/frowning_woman/4.png differ
diff --git a/public/images/emoji/apple/frowning_woman/5.png b/public/images/emoji/apple/frowning_woman/5.png
new file mode 100644
index 00000000000..b9efb3d134c
Binary files /dev/null and b/public/images/emoji/apple/frowning_woman/5.png differ
diff --git a/public/images/emoji/apple/frowning_woman/6.png b/public/images/emoji/apple/frowning_woman/6.png
new file mode 100644
index 00000000000..f5485b28439
Binary files /dev/null and b/public/images/emoji/apple/frowning_woman/6.png differ
diff --git a/public/images/emoji/apple/fu.png b/public/images/emoji/apple/fu.png
new file mode 100644
index 00000000000..e869cf97d15
Binary files /dev/null and b/public/images/emoji/apple/fu.png differ
diff --git a/public/images/emoji/apple/fu/2.png b/public/images/emoji/apple/fu/2.png
new file mode 100644
index 00000000000..ce95c6a8be5
Binary files /dev/null and b/public/images/emoji/apple/fu/2.png differ
diff --git a/public/images/emoji/apple/fu/3.png b/public/images/emoji/apple/fu/3.png
new file mode 100644
index 00000000000..33eec03fd41
Binary files /dev/null and b/public/images/emoji/apple/fu/3.png differ
diff --git a/public/images/emoji/apple/fu/4.png b/public/images/emoji/apple/fu/4.png
new file mode 100644
index 00000000000..10487652927
Binary files /dev/null and b/public/images/emoji/apple/fu/4.png differ
diff --git a/public/images/emoji/apple/fu/5.png b/public/images/emoji/apple/fu/5.png
new file mode 100644
index 00000000000..6f577d03de8
Binary files /dev/null and b/public/images/emoji/apple/fu/5.png differ
diff --git a/public/images/emoji/apple/fu/6.png b/public/images/emoji/apple/fu/6.png
new file mode 100644
index 00000000000..58349f45b1f
Binary files /dev/null and b/public/images/emoji/apple/fu/6.png differ
diff --git a/public/images/emoji/apple/fuelpump.png b/public/images/emoji/apple/fuelpump.png
index 95bcfa3f4cb..67faaf9884e 100644
Binary files a/public/images/emoji/apple/fuelpump.png and b/public/images/emoji/apple/fuelpump.png differ
diff --git a/public/images/emoji/apple/full_moon.png b/public/images/emoji/apple/full_moon.png
index c406073ba64..749787daebc 100644
Binary files a/public/images/emoji/apple/full_moon.png and b/public/images/emoji/apple/full_moon.png differ
diff --git a/public/images/emoji/apple/full_moon_with_face.png b/public/images/emoji/apple/full_moon_with_face.png
index 4860a30a5cd..54a7f73dc79 100644
Binary files a/public/images/emoji/apple/full_moon_with_face.png and b/public/images/emoji/apple/full_moon_with_face.png differ
diff --git a/public/images/emoji/apple/funeral_urn.png b/public/images/emoji/apple/funeral_urn.png
index f89584d1984..d1af59ed33b 100644
Binary files a/public/images/emoji/apple/funeral_urn.png and b/public/images/emoji/apple/funeral_urn.png differ
diff --git a/public/images/emoji/apple/gabon.png b/public/images/emoji/apple/gabon.png
new file mode 100644
index 00000000000..b32827cd188
Binary files /dev/null and b/public/images/emoji/apple/gabon.png differ
diff --git a/public/images/emoji/apple/gambia.png b/public/images/emoji/apple/gambia.png
new file mode 100644
index 00000000000..ea03e0abda4
Binary files /dev/null and b/public/images/emoji/apple/gambia.png differ
diff --git a/public/images/emoji/apple/game_die.png b/public/images/emoji/apple/game_die.png
index 95f9940b3ef..9a7763f542a 100644
Binary files a/public/images/emoji/apple/game_die.png and b/public/images/emoji/apple/game_die.png differ
diff --git a/public/images/emoji/apple/gear.png b/public/images/emoji/apple/gear.png
index 2e1728b44c3..8c3241117fa 100644
Binary files a/public/images/emoji/apple/gear.png and b/public/images/emoji/apple/gear.png differ
diff --git a/public/images/emoji/apple/gem.png b/public/images/emoji/apple/gem.png
index ea245e888c0..ab538189b49 100644
Binary files a/public/images/emoji/apple/gem.png and b/public/images/emoji/apple/gem.png differ
diff --git a/public/images/emoji/apple/gemini.png b/public/images/emoji/apple/gemini.png
index c1be4824547..c9ad704d3c2 100644
Binary files a/public/images/emoji/apple/gemini.png and b/public/images/emoji/apple/gemini.png differ
diff --git a/public/images/emoji/apple/genie.png b/public/images/emoji/apple/genie.png
new file mode 100644
index 00000000000..f0eddcc91ae
Binary files /dev/null and b/public/images/emoji/apple/genie.png differ
diff --git a/public/images/emoji/apple/georgia.png b/public/images/emoji/apple/georgia.png
new file mode 100644
index 00000000000..9dc6417deec
Binary files /dev/null and b/public/images/emoji/apple/georgia.png differ
diff --git a/public/images/emoji/apple/ghana.png b/public/images/emoji/apple/ghana.png
new file mode 100644
index 00000000000..aa8883b16b6
Binary files /dev/null and b/public/images/emoji/apple/ghana.png differ
diff --git a/public/images/emoji/apple/ghost.png b/public/images/emoji/apple/ghost.png
index 0c3ee026c70..76c779eea0e 100644
Binary files a/public/images/emoji/apple/ghost.png and b/public/images/emoji/apple/ghost.png differ
diff --git a/public/images/emoji/apple/gibraltar.png b/public/images/emoji/apple/gibraltar.png
new file mode 100644
index 00000000000..9842b9f5fde
Binary files /dev/null and b/public/images/emoji/apple/gibraltar.png differ
diff --git a/public/images/emoji/apple/gift.png b/public/images/emoji/apple/gift.png
index 040409ea91e..1618c5808ce 100644
Binary files a/public/images/emoji/apple/gift.png and b/public/images/emoji/apple/gift.png differ
diff --git a/public/images/emoji/apple/gift_heart.png b/public/images/emoji/apple/gift_heart.png
index b7408e2dbe8..5967ff8ddc1 100644
Binary files a/public/images/emoji/apple/gift_heart.png and b/public/images/emoji/apple/gift_heart.png differ
diff --git a/public/images/emoji/apple/giraffe.png b/public/images/emoji/apple/giraffe.png
new file mode 100644
index 00000000000..be0e85d2896
Binary files /dev/null and b/public/images/emoji/apple/giraffe.png differ
diff --git a/public/images/emoji/apple/girl.png b/public/images/emoji/apple/girl.png
index 39b4ab5e2a7..43cddda1d38 100644
Binary files a/public/images/emoji/apple/girl.png and b/public/images/emoji/apple/girl.png differ
diff --git a/public/images/emoji/apple/girl/2.png b/public/images/emoji/apple/girl/2.png
new file mode 100644
index 00000000000..fd19994a6bb
Binary files /dev/null and b/public/images/emoji/apple/girl/2.png differ
diff --git a/public/images/emoji/apple/girl/3.png b/public/images/emoji/apple/girl/3.png
new file mode 100644
index 00000000000..486cfee579b
Binary files /dev/null and b/public/images/emoji/apple/girl/3.png differ
diff --git a/public/images/emoji/apple/girl/4.png b/public/images/emoji/apple/girl/4.png
new file mode 100644
index 00000000000..2e4bb4b2430
Binary files /dev/null and b/public/images/emoji/apple/girl/4.png differ
diff --git a/public/images/emoji/apple/girl/5.png b/public/images/emoji/apple/girl/5.png
new file mode 100644
index 00000000000..1c984843ba3
Binary files /dev/null and b/public/images/emoji/apple/girl/5.png differ
diff --git a/public/images/emoji/apple/girl/6.png b/public/images/emoji/apple/girl/6.png
new file mode 100644
index 00000000000..66a87a80081
Binary files /dev/null and b/public/images/emoji/apple/girl/6.png differ
diff --git a/public/images/emoji/apple/globe_with_meridians.png b/public/images/emoji/apple/globe_with_meridians.png
index 3b7ac086c27..8b868ee5e53 100644
Binary files a/public/images/emoji/apple/globe_with_meridians.png and b/public/images/emoji/apple/globe_with_meridians.png differ
diff --git a/public/images/emoji/apple/gloves.png b/public/images/emoji/apple/gloves.png
new file mode 100644
index 00000000000..1a11dd2c560
Binary files /dev/null and b/public/images/emoji/apple/gloves.png differ
diff --git a/public/images/emoji/apple/goal_net.png b/public/images/emoji/apple/goal_net.png
new file mode 100644
index 00000000000..1c27b02c4d6
Binary files /dev/null and b/public/images/emoji/apple/goal_net.png differ
diff --git a/public/images/emoji/apple/goat.png b/public/images/emoji/apple/goat.png
index f1cf594a203..4a261e25272 100644
Binary files a/public/images/emoji/apple/goat.png and b/public/images/emoji/apple/goat.png differ
diff --git a/public/images/emoji/apple/golf.png b/public/images/emoji/apple/golf.png
index 026859eba34..48dcf668637 100644
Binary files a/public/images/emoji/apple/golf.png and b/public/images/emoji/apple/golf.png differ
diff --git a/public/images/emoji/apple/golfer.png b/public/images/emoji/apple/golfer.png
index b2f8b1a7888..4225252a50c 100644
Binary files a/public/images/emoji/apple/golfer.png and b/public/images/emoji/apple/golfer.png differ
diff --git a/public/images/emoji/apple/golfer/2.png b/public/images/emoji/apple/golfer/2.png
new file mode 100644
index 00000000000..a55b51262b3
Binary files /dev/null and b/public/images/emoji/apple/golfer/2.png differ
diff --git a/public/images/emoji/apple/golfer/3.png b/public/images/emoji/apple/golfer/3.png
new file mode 100644
index 00000000000..490cdfe84b2
Binary files /dev/null and b/public/images/emoji/apple/golfer/3.png differ
diff --git a/public/images/emoji/apple/golfer/4.png b/public/images/emoji/apple/golfer/4.png
new file mode 100644
index 00000000000..56007155262
Binary files /dev/null and b/public/images/emoji/apple/golfer/4.png differ
diff --git a/public/images/emoji/apple/golfer/5.png b/public/images/emoji/apple/golfer/5.png
new file mode 100644
index 00000000000..8218dd58726
Binary files /dev/null and b/public/images/emoji/apple/golfer/5.png differ
diff --git a/public/images/emoji/apple/golfer/6.png b/public/images/emoji/apple/golfer/6.png
new file mode 100644
index 00000000000..7f863e40dc3
Binary files /dev/null and b/public/images/emoji/apple/golfer/6.png differ
diff --git a/public/images/emoji/apple/golfing_man.png b/public/images/emoji/apple/golfing_man.png
new file mode 100644
index 00000000000..4225252a50c
Binary files /dev/null and b/public/images/emoji/apple/golfing_man.png differ
diff --git a/public/images/emoji/apple/golfing_man/2.png b/public/images/emoji/apple/golfing_man/2.png
new file mode 100644
index 00000000000..a55b51262b3
Binary files /dev/null and b/public/images/emoji/apple/golfing_man/2.png differ
diff --git a/public/images/emoji/apple/golfing_man/3.png b/public/images/emoji/apple/golfing_man/3.png
new file mode 100644
index 00000000000..490cdfe84b2
Binary files /dev/null and b/public/images/emoji/apple/golfing_man/3.png differ
diff --git a/public/images/emoji/apple/golfing_man/4.png b/public/images/emoji/apple/golfing_man/4.png
new file mode 100644
index 00000000000..56007155262
Binary files /dev/null and b/public/images/emoji/apple/golfing_man/4.png differ
diff --git a/public/images/emoji/apple/golfing_man/5.png b/public/images/emoji/apple/golfing_man/5.png
new file mode 100644
index 00000000000..8218dd58726
Binary files /dev/null and b/public/images/emoji/apple/golfing_man/5.png differ
diff --git a/public/images/emoji/apple/golfing_man/6.png b/public/images/emoji/apple/golfing_man/6.png
new file mode 100644
index 00000000000..7f863e40dc3
Binary files /dev/null and b/public/images/emoji/apple/golfing_man/6.png differ
diff --git a/public/images/emoji/apple/golfing_woman.png b/public/images/emoji/apple/golfing_woman.png
new file mode 100644
index 00000000000..eaa7e01ed5a
Binary files /dev/null and b/public/images/emoji/apple/golfing_woman.png differ
diff --git a/public/images/emoji/apple/gorilla.png b/public/images/emoji/apple/gorilla.png
new file mode 100644
index 00000000000..271b4305bca
Binary files /dev/null and b/public/images/emoji/apple/gorilla.png differ
diff --git a/public/images/emoji/apple/grandma.png b/public/images/emoji/apple/grandma.png
index 12a5fc33063..3aa8954a88a 100644
Binary files a/public/images/emoji/apple/grandma.png and b/public/images/emoji/apple/grandma.png differ
diff --git a/public/images/emoji/apple/grandma/2.png b/public/images/emoji/apple/grandma/2.png
new file mode 100644
index 00000000000..0338c484a17
Binary files /dev/null and b/public/images/emoji/apple/grandma/2.png differ
diff --git a/public/images/emoji/apple/grandma/3.png b/public/images/emoji/apple/grandma/3.png
new file mode 100644
index 00000000000..eb68885c384
Binary files /dev/null and b/public/images/emoji/apple/grandma/3.png differ
diff --git a/public/images/emoji/apple/grandma/4.png b/public/images/emoji/apple/grandma/4.png
new file mode 100644
index 00000000000..b0ec0d5864e
Binary files /dev/null and b/public/images/emoji/apple/grandma/4.png differ
diff --git a/public/images/emoji/apple/grandma/5.png b/public/images/emoji/apple/grandma/5.png
new file mode 100644
index 00000000000..e9778d3e964
Binary files /dev/null and b/public/images/emoji/apple/grandma/5.png differ
diff --git a/public/images/emoji/apple/grandma/6.png b/public/images/emoji/apple/grandma/6.png
new file mode 100644
index 00000000000..af461aed008
Binary files /dev/null and b/public/images/emoji/apple/grandma/6.png differ
diff --git a/public/images/emoji/apple/grapes.png b/public/images/emoji/apple/grapes.png
index b26c18eae8b..9578699cd19 100644
Binary files a/public/images/emoji/apple/grapes.png and b/public/images/emoji/apple/grapes.png differ
diff --git a/public/images/emoji/apple/greece.png b/public/images/emoji/apple/greece.png
new file mode 100644
index 00000000000..adeaf2a858f
Binary files /dev/null and b/public/images/emoji/apple/greece.png differ
diff --git a/public/images/emoji/apple/green_apple.png b/public/images/emoji/apple/green_apple.png
index 61177bee021..7b64adc98bd 100644
Binary files a/public/images/emoji/apple/green_apple.png and b/public/images/emoji/apple/green_apple.png differ
diff --git a/public/images/emoji/apple/green_book.png b/public/images/emoji/apple/green_book.png
index 502e21fdb6a..cf380f49704 100644
Binary files a/public/images/emoji/apple/green_book.png and b/public/images/emoji/apple/green_book.png differ
diff --git a/public/images/emoji/apple/green_heart.png b/public/images/emoji/apple/green_heart.png
index 4965bffa482..70df64a3f11 100644
Binary files a/public/images/emoji/apple/green_heart.png and b/public/images/emoji/apple/green_heart.png differ
diff --git a/public/images/emoji/apple/green_salad.png b/public/images/emoji/apple/green_salad.png
new file mode 100644
index 00000000000..16b2c1644f8
Binary files /dev/null and b/public/images/emoji/apple/green_salad.png differ
diff --git a/public/images/emoji/apple/greenland.png b/public/images/emoji/apple/greenland.png
new file mode 100644
index 00000000000..e561bb86c55
Binary files /dev/null and b/public/images/emoji/apple/greenland.png differ
diff --git a/public/images/emoji/apple/grenada.png b/public/images/emoji/apple/grenada.png
new file mode 100644
index 00000000000..ed812a6c05a
Binary files /dev/null and b/public/images/emoji/apple/grenada.png differ
diff --git a/public/images/emoji/apple/grey_exclamation.png b/public/images/emoji/apple/grey_exclamation.png
index ba7ea95e056..0ac75a3b12d 100644
Binary files a/public/images/emoji/apple/grey_exclamation.png and b/public/images/emoji/apple/grey_exclamation.png differ
diff --git a/public/images/emoji/apple/grey_question.png b/public/images/emoji/apple/grey_question.png
index 36de471f1c8..d1b8431a072 100644
Binary files a/public/images/emoji/apple/grey_question.png and b/public/images/emoji/apple/grey_question.png differ
diff --git a/public/images/emoji/apple/guadeloupe.png b/public/images/emoji/apple/guadeloupe.png
new file mode 100644
index 00000000000..9f34c1158db
Binary files /dev/null and b/public/images/emoji/apple/guadeloupe.png differ
diff --git a/public/images/emoji/apple/guam.png b/public/images/emoji/apple/guam.png
new file mode 100644
index 00000000000..735472abe26
Binary files /dev/null and b/public/images/emoji/apple/guam.png differ
diff --git a/public/images/emoji/apple/guardsman.png b/public/images/emoji/apple/guardsman.png
index 4e77f192ed1..bed85fc6bbb 100644
Binary files a/public/images/emoji/apple/guardsman.png and b/public/images/emoji/apple/guardsman.png differ
diff --git a/public/images/emoji/apple/guardsman/2.png b/public/images/emoji/apple/guardsman/2.png
new file mode 100644
index 00000000000..6c2d298e4c9
Binary files /dev/null and b/public/images/emoji/apple/guardsman/2.png differ
diff --git a/public/images/emoji/apple/guardsman/3.png b/public/images/emoji/apple/guardsman/3.png
new file mode 100644
index 00000000000..a52f6f3ca36
Binary files /dev/null and b/public/images/emoji/apple/guardsman/3.png differ
diff --git a/public/images/emoji/apple/guardsman/4.png b/public/images/emoji/apple/guardsman/4.png
new file mode 100644
index 00000000000..1e4a128fc0c
Binary files /dev/null and b/public/images/emoji/apple/guardsman/4.png differ
diff --git a/public/images/emoji/apple/guardsman/5.png b/public/images/emoji/apple/guardsman/5.png
new file mode 100644
index 00000000000..103245ac4b3
Binary files /dev/null and b/public/images/emoji/apple/guardsman/5.png differ
diff --git a/public/images/emoji/apple/guardsman/6.png b/public/images/emoji/apple/guardsman/6.png
new file mode 100644
index 00000000000..cc69ea63722
Binary files /dev/null and b/public/images/emoji/apple/guardsman/6.png differ
diff --git a/public/images/emoji/apple/guardswoman.png b/public/images/emoji/apple/guardswoman.png
new file mode 100644
index 00000000000..f4d3ba9c58f
Binary files /dev/null and b/public/images/emoji/apple/guardswoman.png differ
diff --git a/public/images/emoji/apple/guardswoman/2.png b/public/images/emoji/apple/guardswoman/2.png
new file mode 100644
index 00000000000..314e41bcb3a
Binary files /dev/null and b/public/images/emoji/apple/guardswoman/2.png differ
diff --git a/public/images/emoji/apple/guardswoman/3.png b/public/images/emoji/apple/guardswoman/3.png
new file mode 100644
index 00000000000..7ce9264c0ff
Binary files /dev/null and b/public/images/emoji/apple/guardswoman/3.png differ
diff --git a/public/images/emoji/apple/guardswoman/4.png b/public/images/emoji/apple/guardswoman/4.png
new file mode 100644
index 00000000000..267d5ace8dc
Binary files /dev/null and b/public/images/emoji/apple/guardswoman/4.png differ
diff --git a/public/images/emoji/apple/guardswoman/5.png b/public/images/emoji/apple/guardswoman/5.png
new file mode 100644
index 00000000000..f7c1e8826d9
Binary files /dev/null and b/public/images/emoji/apple/guardswoman/5.png differ
diff --git a/public/images/emoji/apple/guardswoman/6.png b/public/images/emoji/apple/guardswoman/6.png
new file mode 100644
index 00000000000..1082318e26e
Binary files /dev/null and b/public/images/emoji/apple/guardswoman/6.png differ
diff --git a/public/images/emoji/apple/guatemala.png b/public/images/emoji/apple/guatemala.png
new file mode 100644
index 00000000000..bab42f56759
Binary files /dev/null and b/public/images/emoji/apple/guatemala.png differ
diff --git a/public/images/emoji/apple/guernsey.png b/public/images/emoji/apple/guernsey.png
new file mode 100644
index 00000000000..4039048d060
Binary files /dev/null and b/public/images/emoji/apple/guernsey.png differ
diff --git a/public/images/emoji/apple/guinea.png b/public/images/emoji/apple/guinea.png
new file mode 100644
index 00000000000..6dcabb1e8e5
Binary files /dev/null and b/public/images/emoji/apple/guinea.png differ
diff --git a/public/images/emoji/apple/guinea_bissau.png b/public/images/emoji/apple/guinea_bissau.png
new file mode 100644
index 00000000000..361842d05b6
Binary files /dev/null and b/public/images/emoji/apple/guinea_bissau.png differ
diff --git a/public/images/emoji/apple/guitar.png b/public/images/emoji/apple/guitar.png
index 8f10c6a2365..98e58d68cd8 100644
Binary files a/public/images/emoji/apple/guitar.png and b/public/images/emoji/apple/guitar.png differ
diff --git a/public/images/emoji/apple/gun.png b/public/images/emoji/apple/gun.png
index 4c8f30a2b51..e72df0c1a31 100644
Binary files a/public/images/emoji/apple/gun.png and b/public/images/emoji/apple/gun.png differ
diff --git a/public/images/emoji/apple/guyana.png b/public/images/emoji/apple/guyana.png
new file mode 100644
index 00000000000..80fac519d80
Binary files /dev/null and b/public/images/emoji/apple/guyana.png differ
diff --git a/public/images/emoji/apple/haircut/2.png b/public/images/emoji/apple/haircut/2.png
new file mode 100644
index 00000000000..e9f7dfdbaa7
Binary files /dev/null and b/public/images/emoji/apple/haircut/2.png differ
diff --git a/public/images/emoji/apple/haircut/3.png b/public/images/emoji/apple/haircut/3.png
new file mode 100644
index 00000000000..435b4fa32cd
Binary files /dev/null and b/public/images/emoji/apple/haircut/3.png differ
diff --git a/public/images/emoji/apple/haircut/4.png b/public/images/emoji/apple/haircut/4.png
new file mode 100644
index 00000000000..50019797f4c
Binary files /dev/null and b/public/images/emoji/apple/haircut/4.png differ
diff --git a/public/images/emoji/apple/haircut/5.png b/public/images/emoji/apple/haircut/5.png
new file mode 100644
index 00000000000..2bd103d6d25
Binary files /dev/null and b/public/images/emoji/apple/haircut/5.png differ
diff --git a/public/images/emoji/apple/haircut/6.png b/public/images/emoji/apple/haircut/6.png
new file mode 100644
index 00000000000..4d7b1d50330
Binary files /dev/null and b/public/images/emoji/apple/haircut/6.png differ
diff --git a/public/images/emoji/apple/haircut_man.png b/public/images/emoji/apple/haircut_man.png
new file mode 100644
index 00000000000..c44aea56b9c
Binary files /dev/null and b/public/images/emoji/apple/haircut_man.png differ
diff --git a/public/images/emoji/apple/haircut_man/2.png b/public/images/emoji/apple/haircut_man/2.png
new file mode 100644
index 00000000000..2965fde6562
Binary files /dev/null and b/public/images/emoji/apple/haircut_man/2.png differ
diff --git a/public/images/emoji/apple/haircut_man/3.png b/public/images/emoji/apple/haircut_man/3.png
new file mode 100644
index 00000000000..224e4f47996
Binary files /dev/null and b/public/images/emoji/apple/haircut_man/3.png differ
diff --git a/public/images/emoji/apple/haircut_man/4.png b/public/images/emoji/apple/haircut_man/4.png
new file mode 100644
index 00000000000..046cc155ff6
Binary files /dev/null and b/public/images/emoji/apple/haircut_man/4.png differ
diff --git a/public/images/emoji/apple/haircut_man/5.png b/public/images/emoji/apple/haircut_man/5.png
new file mode 100644
index 00000000000..612cb34821f
Binary files /dev/null and b/public/images/emoji/apple/haircut_man/5.png differ
diff --git a/public/images/emoji/apple/haircut_man/6.png b/public/images/emoji/apple/haircut_man/6.png
new file mode 100644
index 00000000000..941ba5a56d4
Binary files /dev/null and b/public/images/emoji/apple/haircut_man/6.png differ
diff --git a/public/images/emoji/apple/haircut_woman.png b/public/images/emoji/apple/haircut_woman.png
new file mode 100644
index 00000000000..ceac9642aa7
Binary files /dev/null and b/public/images/emoji/apple/haircut_woman.png differ
diff --git a/public/images/emoji/apple/haircut_woman/2.png b/public/images/emoji/apple/haircut_woman/2.png
new file mode 100644
index 00000000000..e9f7dfdbaa7
Binary files /dev/null and b/public/images/emoji/apple/haircut_woman/2.png differ
diff --git a/public/images/emoji/apple/haircut_woman/3.png b/public/images/emoji/apple/haircut_woman/3.png
new file mode 100644
index 00000000000..435b4fa32cd
Binary files /dev/null and b/public/images/emoji/apple/haircut_woman/3.png differ
diff --git a/public/images/emoji/apple/haircut_woman/4.png b/public/images/emoji/apple/haircut_woman/4.png
new file mode 100644
index 00000000000..50019797f4c
Binary files /dev/null and b/public/images/emoji/apple/haircut_woman/4.png differ
diff --git a/public/images/emoji/apple/haircut_woman/5.png b/public/images/emoji/apple/haircut_woman/5.png
new file mode 100644
index 00000000000..2bd103d6d25
Binary files /dev/null and b/public/images/emoji/apple/haircut_woman/5.png differ
diff --git a/public/images/emoji/apple/haircut_woman/6.png b/public/images/emoji/apple/haircut_woman/6.png
new file mode 100644
index 00000000000..4d7b1d50330
Binary files /dev/null and b/public/images/emoji/apple/haircut_woman/6.png differ
diff --git a/public/images/emoji/apple/haiti.png b/public/images/emoji/apple/haiti.png
new file mode 100644
index 00000000000..174b5cbe3cf
Binary files /dev/null and b/public/images/emoji/apple/haiti.png differ
diff --git a/public/images/emoji/apple/hamburger.png b/public/images/emoji/apple/hamburger.png
index 38b41e606fc..77ef2079689 100644
Binary files a/public/images/emoji/apple/hamburger.png and b/public/images/emoji/apple/hamburger.png differ
diff --git a/public/images/emoji/apple/hammer.png b/public/images/emoji/apple/hammer.png
index 312c0274c8d..5c5a3b70526 100644
Binary files a/public/images/emoji/apple/hammer.png and b/public/images/emoji/apple/hammer.png differ
diff --git a/public/images/emoji/apple/hammer_and_pick.png b/public/images/emoji/apple/hammer_and_pick.png
index 2e1bb27eba9..ec76955fd62 100644
Binary files a/public/images/emoji/apple/hammer_and_pick.png and b/public/images/emoji/apple/hammer_and_pick.png differ
diff --git a/public/images/emoji/apple/hammer_and_wrench.png b/public/images/emoji/apple/hammer_and_wrench.png
index 32050b23f08..daef26722cc 100644
Binary files a/public/images/emoji/apple/hammer_and_wrench.png and b/public/images/emoji/apple/hammer_and_wrench.png differ
diff --git a/public/images/emoji/apple/hammer_pick.png b/public/images/emoji/apple/hammer_pick.png
index 2e1bb27eba9..ec76955fd62 100644
Binary files a/public/images/emoji/apple/hammer_pick.png and b/public/images/emoji/apple/hammer_pick.png differ
diff --git a/public/images/emoji/apple/hamster.png b/public/images/emoji/apple/hamster.png
index 9268609b71e..01450947c77 100644
Binary files a/public/images/emoji/apple/hamster.png and b/public/images/emoji/apple/hamster.png differ
diff --git a/public/images/emoji/apple/hand.png b/public/images/emoji/apple/hand.png
new file mode 100644
index 00000000000..8b60686eebf
Binary files /dev/null and b/public/images/emoji/apple/hand.png differ
diff --git a/public/images/emoji/apple/hand/2.png b/public/images/emoji/apple/hand/2.png
new file mode 100644
index 00000000000..f0fd83faaa5
Binary files /dev/null and b/public/images/emoji/apple/hand/2.png differ
diff --git a/public/images/emoji/apple/hand/3.png b/public/images/emoji/apple/hand/3.png
new file mode 100644
index 00000000000..7df90232ae7
Binary files /dev/null and b/public/images/emoji/apple/hand/3.png differ
diff --git a/public/images/emoji/apple/hand/4.png b/public/images/emoji/apple/hand/4.png
new file mode 100644
index 00000000000..979c0c414d1
Binary files /dev/null and b/public/images/emoji/apple/hand/4.png differ
diff --git a/public/images/emoji/apple/hand/5.png b/public/images/emoji/apple/hand/5.png
new file mode 100644
index 00000000000..dee9188f4d1
Binary files /dev/null and b/public/images/emoji/apple/hand/5.png differ
diff --git a/public/images/emoji/apple/hand/6.png b/public/images/emoji/apple/hand/6.png
new file mode 100644
index 00000000000..9ae2da2c021
Binary files /dev/null and b/public/images/emoji/apple/hand/6.png differ
diff --git a/public/images/emoji/apple/hand_splayed/2.png b/public/images/emoji/apple/hand_splayed/2.png
new file mode 100644
index 00000000000..35c3b9b3502
Binary files /dev/null and b/public/images/emoji/apple/hand_splayed/2.png differ
diff --git a/public/images/emoji/apple/hand_splayed/3.png b/public/images/emoji/apple/hand_splayed/3.png
new file mode 100644
index 00000000000..6757e8a1e2b
Binary files /dev/null and b/public/images/emoji/apple/hand_splayed/3.png differ
diff --git a/public/images/emoji/apple/hand_splayed/4.png b/public/images/emoji/apple/hand_splayed/4.png
new file mode 100644
index 00000000000..2583736a585
Binary files /dev/null and b/public/images/emoji/apple/hand_splayed/4.png differ
diff --git a/public/images/emoji/apple/hand_splayed/5.png b/public/images/emoji/apple/hand_splayed/5.png
new file mode 100644
index 00000000000..11cb8caa11d
Binary files /dev/null and b/public/images/emoji/apple/hand_splayed/5.png differ
diff --git a/public/images/emoji/apple/hand_splayed/6.png b/public/images/emoji/apple/hand_splayed/6.png
new file mode 100644
index 00000000000..eed63072bd5
Binary files /dev/null and b/public/images/emoji/apple/hand_splayed/6.png differ
diff --git a/public/images/emoji/apple/handbag.png b/public/images/emoji/apple/handbag.png
index 28406089b3b..1eaac97227b 100644
Binary files a/public/images/emoji/apple/handbag.png and b/public/images/emoji/apple/handbag.png differ
diff --git a/public/images/emoji/apple/handshake.png b/public/images/emoji/apple/handshake.png
new file mode 100644
index 00000000000..630d17f4212
Binary files /dev/null and b/public/images/emoji/apple/handshake.png differ
diff --git a/public/images/emoji/apple/hatched_chick.png b/public/images/emoji/apple/hatched_chick.png
index 232d87bddee..5f51f69249b 100644
Binary files a/public/images/emoji/apple/hatched_chick.png and b/public/images/emoji/apple/hatched_chick.png differ
diff --git a/public/images/emoji/apple/hatching_chick.png b/public/images/emoji/apple/hatching_chick.png
index 5042b9b51c4..c7b2e6f048c 100644
Binary files a/public/images/emoji/apple/hatching_chick.png and b/public/images/emoji/apple/hatching_chick.png differ
diff --git a/public/images/emoji/apple/headphones.png b/public/images/emoji/apple/headphones.png
index 242847cf88f..62997da2664 100644
Binary files a/public/images/emoji/apple/headphones.png and b/public/images/emoji/apple/headphones.png differ
diff --git a/public/images/emoji/apple/hear_no_evil.png b/public/images/emoji/apple/hear_no_evil.png
index 4a750ae86bc..72e9e2f37e0 100644
Binary files a/public/images/emoji/apple/hear_no_evil.png and b/public/images/emoji/apple/hear_no_evil.png differ
diff --git a/public/images/emoji/apple/heard_and_mc_donald_islands.png b/public/images/emoji/apple/heard_and_mc_donald_islands.png
new file mode 100644
index 00000000000..87eafc1fdcf
Binary files /dev/null and b/public/images/emoji/apple/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/apple/heart.png b/public/images/emoji/apple/heart.png
index 6196202e2af..462824db64b 100644
Binary files a/public/images/emoji/apple/heart.png and b/public/images/emoji/apple/heart.png differ
diff --git a/public/images/emoji/apple/heart_decoration.png b/public/images/emoji/apple/heart_decoration.png
index 8a0f4820dc2..16b43b19830 100644
Binary files a/public/images/emoji/apple/heart_decoration.png and b/public/images/emoji/apple/heart_decoration.png differ
diff --git a/public/images/emoji/apple/heart_exclamation.png b/public/images/emoji/apple/heart_exclamation.png
index 7edec53344a..2b277ffc0d6 100644
Binary files a/public/images/emoji/apple/heart_exclamation.png and b/public/images/emoji/apple/heart_exclamation.png differ
diff --git a/public/images/emoji/apple/heartbeat.png b/public/images/emoji/apple/heartbeat.png
index 28e17ec9f51..66e29a63672 100644
Binary files a/public/images/emoji/apple/heartbeat.png and b/public/images/emoji/apple/heartbeat.png differ
diff --git a/public/images/emoji/apple/heartpulse.png b/public/images/emoji/apple/heartpulse.png
index 563da233710..72685c46656 100644
Binary files a/public/images/emoji/apple/heartpulse.png and b/public/images/emoji/apple/heartpulse.png differ
diff --git a/public/images/emoji/apple/hearts.png b/public/images/emoji/apple/hearts.png
index 01af5269dbc..3894fbc178e 100644
Binary files a/public/images/emoji/apple/hearts.png and b/public/images/emoji/apple/hearts.png differ
diff --git a/public/images/emoji/apple/heavy_check_mark.png b/public/images/emoji/apple/heavy_check_mark.png
index 8f5df9a5851..6a4fc91c9d9 100644
Binary files a/public/images/emoji/apple/heavy_check_mark.png and b/public/images/emoji/apple/heavy_check_mark.png differ
diff --git a/public/images/emoji/apple/heavy_division_sign.png b/public/images/emoji/apple/heavy_division_sign.png
index 7f224dcc931..728e8fd7f5b 100644
Binary files a/public/images/emoji/apple/heavy_division_sign.png and b/public/images/emoji/apple/heavy_division_sign.png differ
diff --git a/public/images/emoji/apple/heavy_dollar_sign.png b/public/images/emoji/apple/heavy_dollar_sign.png
index af05de18bb4..256c942bbae 100644
Binary files a/public/images/emoji/apple/heavy_dollar_sign.png and b/public/images/emoji/apple/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/apple/heavy_heart_exclamation.png b/public/images/emoji/apple/heavy_heart_exclamation.png
new file mode 100644
index 00000000000..2b277ffc0d6
Binary files /dev/null and b/public/images/emoji/apple/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png
index 7edec53344a..2b277ffc0d6 100644
Binary files a/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png and b/public/images/emoji/apple/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/apple/heavy_minus_sign.png b/public/images/emoji/apple/heavy_minus_sign.png
index fb41ed5f915..fb4909f9dd3 100644
Binary files a/public/images/emoji/apple/heavy_minus_sign.png and b/public/images/emoji/apple/heavy_minus_sign.png differ
diff --git a/public/images/emoji/apple/heavy_multiplication_x.png b/public/images/emoji/apple/heavy_multiplication_x.png
index ee205aa3732..0b0e7d88fbe 100644
Binary files a/public/images/emoji/apple/heavy_multiplication_x.png and b/public/images/emoji/apple/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/apple/heavy_plus_sign.png b/public/images/emoji/apple/heavy_plus_sign.png
index 7f6d731aa4a..4557910d54a 100644
Binary files a/public/images/emoji/apple/heavy_plus_sign.png and b/public/images/emoji/apple/heavy_plus_sign.png differ
diff --git a/public/images/emoji/apple/hedgehog.png b/public/images/emoji/apple/hedgehog.png
new file mode 100644
index 00000000000..9b978b35407
Binary files /dev/null and b/public/images/emoji/apple/hedgehog.png differ
diff --git a/public/images/emoji/apple/helicopter.png b/public/images/emoji/apple/helicopter.png
index 181c997d842..78472fce500 100644
Binary files a/public/images/emoji/apple/helicopter.png and b/public/images/emoji/apple/helicopter.png differ
diff --git a/public/images/emoji/apple/helmet_with_cross.png b/public/images/emoji/apple/helmet_with_cross.png
index cb34ef2b008..6440b55c340 100644
Binary files a/public/images/emoji/apple/helmet_with_cross.png and b/public/images/emoji/apple/helmet_with_cross.png differ
diff --git a/public/images/emoji/apple/helmet_with_white_cross.png b/public/images/emoji/apple/helmet_with_white_cross.png
index cb34ef2b008..6440b55c340 100644
Binary files a/public/images/emoji/apple/helmet_with_white_cross.png and b/public/images/emoji/apple/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/apple/herb.png b/public/images/emoji/apple/herb.png
index cc58c937e20..863fbff4b54 100644
Binary files a/public/images/emoji/apple/herb.png and b/public/images/emoji/apple/herb.png differ
diff --git a/public/images/emoji/apple/hibiscus.png b/public/images/emoji/apple/hibiscus.png
index 7b5d897d201..c3fa3384aed 100644
Binary files a/public/images/emoji/apple/hibiscus.png and b/public/images/emoji/apple/hibiscus.png differ
diff --git a/public/images/emoji/apple/high_brightness.png b/public/images/emoji/apple/high_brightness.png
index 8a9d9cb44ce..e7e067344f3 100644
Binary files a/public/images/emoji/apple/high_brightness.png and b/public/images/emoji/apple/high_brightness.png differ
diff --git a/public/images/emoji/apple/high_heel.png b/public/images/emoji/apple/high_heel.png
index 64261a93e8c..da1e800d375 100644
Binary files a/public/images/emoji/apple/high_heel.png and b/public/images/emoji/apple/high_heel.png differ
diff --git a/public/images/emoji/apple/hocho.png b/public/images/emoji/apple/hocho.png
new file mode 100644
index 00000000000..c8a63cfddd4
Binary files /dev/null and b/public/images/emoji/apple/hocho.png differ
diff --git a/public/images/emoji/apple/hockey.png b/public/images/emoji/apple/hockey.png
index 920f6300b84..e2198826de9 100644
Binary files a/public/images/emoji/apple/hockey.png and b/public/images/emoji/apple/hockey.png differ
diff --git a/public/images/emoji/apple/hole.png b/public/images/emoji/apple/hole.png
index 0d2485f6f76..abdc40ae637 100644
Binary files a/public/images/emoji/apple/hole.png and b/public/images/emoji/apple/hole.png differ
diff --git a/public/images/emoji/apple/homes.png b/public/images/emoji/apple/homes.png
index 67060deb4b0..5c9e59d1323 100644
Binary files a/public/images/emoji/apple/homes.png and b/public/images/emoji/apple/homes.png differ
diff --git a/public/images/emoji/apple/honduras.png b/public/images/emoji/apple/honduras.png
new file mode 100644
index 00000000000..a49bc9e6db5
Binary files /dev/null and b/public/images/emoji/apple/honduras.png differ
diff --git a/public/images/emoji/apple/honey_pot.png b/public/images/emoji/apple/honey_pot.png
index b65765fdf73..630a7b744b4 100644
Binary files a/public/images/emoji/apple/honey_pot.png and b/public/images/emoji/apple/honey_pot.png differ
diff --git a/public/images/emoji/apple/honeybee.png b/public/images/emoji/apple/honeybee.png
new file mode 100644
index 00000000000..82d7aa8a5af
Binary files /dev/null and b/public/images/emoji/apple/honeybee.png differ
diff --git a/public/images/emoji/apple/hong_kong.png b/public/images/emoji/apple/hong_kong.png
new file mode 100644
index 00000000000..ad46b58eb07
Binary files /dev/null and b/public/images/emoji/apple/hong_kong.png differ
diff --git a/public/images/emoji/apple/horse.png b/public/images/emoji/apple/horse.png
index 63926ee7af8..dcdc5ff6589 100644
Binary files a/public/images/emoji/apple/horse.png and b/public/images/emoji/apple/horse.png differ
diff --git a/public/images/emoji/apple/horse_racing.png b/public/images/emoji/apple/horse_racing.png
index ce325bf5d01..2e3388c8066 100644
Binary files a/public/images/emoji/apple/horse_racing.png and b/public/images/emoji/apple/horse_racing.png differ
diff --git a/public/images/emoji/apple/horse_racing/2.png b/public/images/emoji/apple/horse_racing/2.png
new file mode 100644
index 00000000000..1e6ab0e0ac5
Binary files /dev/null and b/public/images/emoji/apple/horse_racing/2.png differ
diff --git a/public/images/emoji/apple/horse_racing/3.png b/public/images/emoji/apple/horse_racing/3.png
new file mode 100644
index 00000000000..60a02fa6716
Binary files /dev/null and b/public/images/emoji/apple/horse_racing/3.png differ
diff --git a/public/images/emoji/apple/horse_racing/4.png b/public/images/emoji/apple/horse_racing/4.png
new file mode 100644
index 00000000000..df92a7f7cad
Binary files /dev/null and b/public/images/emoji/apple/horse_racing/4.png differ
diff --git a/public/images/emoji/apple/horse_racing/5.png b/public/images/emoji/apple/horse_racing/5.png
new file mode 100644
index 00000000000..174fe7b5cb6
Binary files /dev/null and b/public/images/emoji/apple/horse_racing/5.png differ
diff --git a/public/images/emoji/apple/horse_racing/6.png b/public/images/emoji/apple/horse_racing/6.png
new file mode 100644
index 00000000000..d46a863b60a
Binary files /dev/null and b/public/images/emoji/apple/horse_racing/6.png differ
diff --git a/public/images/emoji/apple/hospital.png b/public/images/emoji/apple/hospital.png
index 9f4857037ce..9cb06311ce3 100644
Binary files a/public/images/emoji/apple/hospital.png and b/public/images/emoji/apple/hospital.png differ
diff --git a/public/images/emoji/apple/hot_dog.png b/public/images/emoji/apple/hot_dog.png
index 597cbd57fa6..f8d63c366d0 100644
Binary files a/public/images/emoji/apple/hot_dog.png and b/public/images/emoji/apple/hot_dog.png differ
diff --git a/public/images/emoji/apple/hot_pepper.png b/public/images/emoji/apple/hot_pepper.png
index 3a21bcb2a10..793f6e02105 100644
Binary files a/public/images/emoji/apple/hot_pepper.png and b/public/images/emoji/apple/hot_pepper.png differ
diff --git a/public/images/emoji/apple/hotdog.png b/public/images/emoji/apple/hotdog.png
index 597cbd57fa6..f8d63c366d0 100644
Binary files a/public/images/emoji/apple/hotdog.png and b/public/images/emoji/apple/hotdog.png differ
diff --git a/public/images/emoji/apple/hotel.png b/public/images/emoji/apple/hotel.png
index 7fd5f3e060c..7321778f170 100644
Binary files a/public/images/emoji/apple/hotel.png and b/public/images/emoji/apple/hotel.png differ
diff --git a/public/images/emoji/apple/hotsprings.png b/public/images/emoji/apple/hotsprings.png
index b389edfe509..8fd9889c583 100644
Binary files a/public/images/emoji/apple/hotsprings.png and b/public/images/emoji/apple/hotsprings.png differ
diff --git a/public/images/emoji/apple/hourglass.png b/public/images/emoji/apple/hourglass.png
index c092680ed8e..fce767913a1 100644
Binary files a/public/images/emoji/apple/hourglass.png and b/public/images/emoji/apple/hourglass.png differ
diff --git a/public/images/emoji/apple/hourglass_flowing_sand.png b/public/images/emoji/apple/hourglass_flowing_sand.png
index 3b9ed4b00d0..842c74c9ef6 100644
Binary files a/public/images/emoji/apple/hourglass_flowing_sand.png and b/public/images/emoji/apple/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/apple/house.png b/public/images/emoji/apple/house.png
index 9ed7b523ffb..8b7e87943ce 100644
Binary files a/public/images/emoji/apple/house.png and b/public/images/emoji/apple/house.png differ
diff --git a/public/images/emoji/apple/house_abandoned.png b/public/images/emoji/apple/house_abandoned.png
index a389ff82abc..f6c42518844 100644
Binary files a/public/images/emoji/apple/house_abandoned.png and b/public/images/emoji/apple/house_abandoned.png differ
diff --git a/public/images/emoji/apple/house_buildings.png b/public/images/emoji/apple/house_buildings.png
index 67060deb4b0..5c9e59d1323 100644
Binary files a/public/images/emoji/apple/house_buildings.png and b/public/images/emoji/apple/house_buildings.png differ
diff --git a/public/images/emoji/apple/house_with_garden.png b/public/images/emoji/apple/house_with_garden.png
index 21fc35afff5..78c604a69a6 100644
Binary files a/public/images/emoji/apple/house_with_garden.png and b/public/images/emoji/apple/house_with_garden.png differ
diff --git a/public/images/emoji/apple/houses.png b/public/images/emoji/apple/houses.png
new file mode 100644
index 00000000000..5c9e59d1323
Binary files /dev/null and b/public/images/emoji/apple/houses.png differ
diff --git a/public/images/emoji/apple/hugs.png b/public/images/emoji/apple/hugs.png
new file mode 100644
index 00000000000..3bbffdd26fc
Binary files /dev/null and b/public/images/emoji/apple/hugs.png differ
diff --git a/public/images/emoji/apple/hungary.png b/public/images/emoji/apple/hungary.png
new file mode 100644
index 00000000000..56e8d4eda42
Binary files /dev/null and b/public/images/emoji/apple/hungary.png differ
diff --git a/public/images/emoji/apple/ice_cream.png b/public/images/emoji/apple/ice_cream.png
index a07520acddd..1324a5ecbc2 100644
Binary files a/public/images/emoji/apple/ice_cream.png and b/public/images/emoji/apple/ice_cream.png differ
diff --git a/public/images/emoji/apple/ice_hockey.png b/public/images/emoji/apple/ice_hockey.png
new file mode 100644
index 00000000000..e2198826de9
Binary files /dev/null and b/public/images/emoji/apple/ice_hockey.png differ
diff --git a/public/images/emoji/apple/ice_skate.png b/public/images/emoji/apple/ice_skate.png
index 758b3f633ce..1ce8b7220a3 100644
Binary files a/public/images/emoji/apple/ice_skate.png and b/public/images/emoji/apple/ice_skate.png differ
diff --git a/public/images/emoji/apple/icecream.png b/public/images/emoji/apple/icecream.png
index ae34442c550..20df9b4d38c 100644
Binary files a/public/images/emoji/apple/icecream.png and b/public/images/emoji/apple/icecream.png differ
diff --git a/public/images/emoji/apple/iceland.png b/public/images/emoji/apple/iceland.png
new file mode 100644
index 00000000000..c5741f9410d
Binary files /dev/null and b/public/images/emoji/apple/iceland.png differ
diff --git a/public/images/emoji/apple/id.png b/public/images/emoji/apple/id.png
index 21e3b01e3e6..a663a2a794a 100644
Binary files a/public/images/emoji/apple/id.png and b/public/images/emoji/apple/id.png differ
diff --git a/public/images/emoji/apple/ideograph_advantage.png b/public/images/emoji/apple/ideograph_advantage.png
index e958e1e463f..3572e307701 100644
Binary files a/public/images/emoji/apple/ideograph_advantage.png and b/public/images/emoji/apple/ideograph_advantage.png differ
diff --git a/public/images/emoji/apple/inbox_tray.png b/public/images/emoji/apple/inbox_tray.png
index af742430b4d..b0f49b1d668 100644
Binary files a/public/images/emoji/apple/inbox_tray.png and b/public/images/emoji/apple/inbox_tray.png differ
diff --git a/public/images/emoji/apple/incoming_envelope.png b/public/images/emoji/apple/incoming_envelope.png
index 534d59345e0..e8013ab7a38 100644
Binary files a/public/images/emoji/apple/incoming_envelope.png and b/public/images/emoji/apple/incoming_envelope.png differ
diff --git a/public/images/emoji/apple/india.png b/public/images/emoji/apple/india.png
new file mode 100644
index 00000000000..8f9167c0252
Binary files /dev/null and b/public/images/emoji/apple/india.png differ
diff --git a/public/images/emoji/apple/indonesia.png b/public/images/emoji/apple/indonesia.png
new file mode 100644
index 00000000000..ca96fd3d960
Binary files /dev/null and b/public/images/emoji/apple/indonesia.png differ
diff --git a/public/images/emoji/apple/information_desk_person.png b/public/images/emoji/apple/information_desk_person.png
index 9d471c7497b..4424423fa37 100644
Binary files a/public/images/emoji/apple/information_desk_person.png and b/public/images/emoji/apple/information_desk_person.png differ
diff --git a/public/images/emoji/apple/information_desk_person/2.png b/public/images/emoji/apple/information_desk_person/2.png
new file mode 100644
index 00000000000..115198e5636
Binary files /dev/null and b/public/images/emoji/apple/information_desk_person/2.png differ
diff --git a/public/images/emoji/apple/information_desk_person/3.png b/public/images/emoji/apple/information_desk_person/3.png
new file mode 100644
index 00000000000..d0593f87fbb
Binary files /dev/null and b/public/images/emoji/apple/information_desk_person/3.png differ
diff --git a/public/images/emoji/apple/information_desk_person/4.png b/public/images/emoji/apple/information_desk_person/4.png
new file mode 100644
index 00000000000..a2f5d0294f2
Binary files /dev/null and b/public/images/emoji/apple/information_desk_person/4.png differ
diff --git a/public/images/emoji/apple/information_desk_person/5.png b/public/images/emoji/apple/information_desk_person/5.png
new file mode 100644
index 00000000000..63d9338057f
Binary files /dev/null and b/public/images/emoji/apple/information_desk_person/5.png differ
diff --git a/public/images/emoji/apple/information_desk_person/6.png b/public/images/emoji/apple/information_desk_person/6.png
new file mode 100644
index 00000000000..30b2bd891a4
Binary files /dev/null and b/public/images/emoji/apple/information_desk_person/6.png differ
diff --git a/public/images/emoji/apple/information_source.png b/public/images/emoji/apple/information_source.png
index 7320d245a13..f9e686ee2d6 100644
Binary files a/public/images/emoji/apple/information_source.png and b/public/images/emoji/apple/information_source.png differ
diff --git a/public/images/emoji/apple/interrobang.png b/public/images/emoji/apple/interrobang.png
index ffd4a14ca99..818b6ac1a52 100644
Binary files a/public/images/emoji/apple/interrobang.png and b/public/images/emoji/apple/interrobang.png differ
diff --git a/public/images/emoji/apple/iphone.png b/public/images/emoji/apple/iphone.png
index a5198b3c812..33ebfac21f4 100644
Binary files a/public/images/emoji/apple/iphone.png and b/public/images/emoji/apple/iphone.png differ
diff --git a/public/images/emoji/apple/iran.png b/public/images/emoji/apple/iran.png
new file mode 100644
index 00000000000..3d9e1356eac
Binary files /dev/null and b/public/images/emoji/apple/iran.png differ
diff --git a/public/images/emoji/apple/iraq.png b/public/images/emoji/apple/iraq.png
new file mode 100644
index 00000000000..3c833ecc88c
Binary files /dev/null and b/public/images/emoji/apple/iraq.png differ
diff --git a/public/images/emoji/apple/ireland.png b/public/images/emoji/apple/ireland.png
new file mode 100644
index 00000000000..ffe6c6f3333
Binary files /dev/null and b/public/images/emoji/apple/ireland.png differ
diff --git a/public/images/emoji/apple/island.png b/public/images/emoji/apple/island.png
index 21bb67b35d8..8b98bbead11 100644
Binary files a/public/images/emoji/apple/island.png and b/public/images/emoji/apple/island.png differ
diff --git a/public/images/emoji/apple/isle_of_man.png b/public/images/emoji/apple/isle_of_man.png
new file mode 100644
index 00000000000..b4a3ff3ef49
Binary files /dev/null and b/public/images/emoji/apple/isle_of_man.png differ
diff --git a/public/images/emoji/apple/israel.png b/public/images/emoji/apple/israel.png
new file mode 100644
index 00000000000..20d0124b36d
Binary files /dev/null and b/public/images/emoji/apple/israel.png differ
diff --git a/public/images/emoji/apple/izakaya_lantern.png b/public/images/emoji/apple/izakaya_lantern.png
index fd6bec82c1a..6b6a8fa3271 100644
Binary files a/public/images/emoji/apple/izakaya_lantern.png and b/public/images/emoji/apple/izakaya_lantern.png differ
diff --git a/public/images/emoji/apple/jack_o_lantern.png b/public/images/emoji/apple/jack_o_lantern.png
index 82537a4c648..dc7f30477c1 100644
Binary files a/public/images/emoji/apple/jack_o_lantern.png and b/public/images/emoji/apple/jack_o_lantern.png differ
diff --git a/public/images/emoji/apple/jamaica.png b/public/images/emoji/apple/jamaica.png
new file mode 100644
index 00000000000..8fe27974c57
Binary files /dev/null and b/public/images/emoji/apple/jamaica.png differ
diff --git a/public/images/emoji/apple/japan.png b/public/images/emoji/apple/japan.png
index ea85cef14fb..a5ac5b6df22 100644
Binary files a/public/images/emoji/apple/japan.png and b/public/images/emoji/apple/japan.png differ
diff --git a/public/images/emoji/apple/japanese_castle.png b/public/images/emoji/apple/japanese_castle.png
index d822790c3bf..c70e0448b5f 100644
Binary files a/public/images/emoji/apple/japanese_castle.png and b/public/images/emoji/apple/japanese_castle.png differ
diff --git a/public/images/emoji/apple/japanese_goblin.png b/public/images/emoji/apple/japanese_goblin.png
index fd28cf8a243..87e48f4a06f 100644
Binary files a/public/images/emoji/apple/japanese_goblin.png and b/public/images/emoji/apple/japanese_goblin.png differ
diff --git a/public/images/emoji/apple/japanese_ogre.png b/public/images/emoji/apple/japanese_ogre.png
index af567ff1b9c..eff2422cc3c 100644
Binary files a/public/images/emoji/apple/japanese_ogre.png and b/public/images/emoji/apple/japanese_ogre.png differ
diff --git a/public/images/emoji/apple/jeans.png b/public/images/emoji/apple/jeans.png
index 3428cc4ff5f..621a6dd3372 100644
Binary files a/public/images/emoji/apple/jeans.png and b/public/images/emoji/apple/jeans.png differ
diff --git a/public/images/emoji/apple/jersey.png b/public/images/emoji/apple/jersey.png
new file mode 100644
index 00000000000..5cdb9f597cf
Binary files /dev/null and b/public/images/emoji/apple/jersey.png differ
diff --git a/public/images/emoji/apple/jordan.png b/public/images/emoji/apple/jordan.png
new file mode 100644
index 00000000000..7db4f23d1d3
Binary files /dev/null and b/public/images/emoji/apple/jordan.png differ
diff --git a/public/images/emoji/apple/joystick.png b/public/images/emoji/apple/joystick.png
index acb77c01522..76220db9c2c 100644
Binary files a/public/images/emoji/apple/joystick.png and b/public/images/emoji/apple/joystick.png differ
diff --git a/public/images/emoji/apple/kaaba.png b/public/images/emoji/apple/kaaba.png
index 6cdb357243c..383bab379ef 100644
Binary files a/public/images/emoji/apple/kaaba.png and b/public/images/emoji/apple/kaaba.png differ
diff --git a/public/images/emoji/apple/kazakhstan.png b/public/images/emoji/apple/kazakhstan.png
new file mode 100644
index 00000000000..d3b98efcde7
Binary files /dev/null and b/public/images/emoji/apple/kazakhstan.png differ
diff --git a/public/images/emoji/apple/kenya.png b/public/images/emoji/apple/kenya.png
new file mode 100644
index 00000000000..ad1e52279b8
Binary files /dev/null and b/public/images/emoji/apple/kenya.png differ
diff --git a/public/images/emoji/apple/key.png b/public/images/emoji/apple/key.png
index 7680caf1853..4a1779e24f6 100644
Binary files a/public/images/emoji/apple/key.png and b/public/images/emoji/apple/key.png differ
diff --git a/public/images/emoji/apple/key2.png b/public/images/emoji/apple/key2.png
index a35dd1afd98..05715332b10 100644
Binary files a/public/images/emoji/apple/key2.png and b/public/images/emoji/apple/key2.png differ
diff --git a/public/images/emoji/apple/keyboard.png b/public/images/emoji/apple/keyboard.png
index 3f3819ebcfe..835950ccf78 100644
Binary files a/public/images/emoji/apple/keyboard.png and b/public/images/emoji/apple/keyboard.png differ
diff --git a/public/images/emoji/apple/keycap_ten.png b/public/images/emoji/apple/keycap_ten.png
new file mode 100644
index 00000000000..59d013deccd
Binary files /dev/null and b/public/images/emoji/apple/keycap_ten.png differ
diff --git a/public/images/emoji/apple/kick_scooter.png b/public/images/emoji/apple/kick_scooter.png
new file mode 100644
index 00000000000..e04c09e543f
Binary files /dev/null and b/public/images/emoji/apple/kick_scooter.png differ
diff --git a/public/images/emoji/apple/kimono.png b/public/images/emoji/apple/kimono.png
index 78cdce40d45..af5be0c80c9 100644
Binary files a/public/images/emoji/apple/kimono.png and b/public/images/emoji/apple/kimono.png differ
diff --git a/public/images/emoji/apple/kiribati.png b/public/images/emoji/apple/kiribati.png
new file mode 100644
index 00000000000..2f0769690b4
Binary files /dev/null and b/public/images/emoji/apple/kiribati.png differ
diff --git a/public/images/emoji/apple/kiss.png b/public/images/emoji/apple/kiss.png
index d47ea399815..0c2ef0e3db0 100644
Binary files a/public/images/emoji/apple/kiss.png and b/public/images/emoji/apple/kiss.png differ
diff --git a/public/images/emoji/apple/kiwi_fruit.png b/public/images/emoji/apple/kiwi_fruit.png
new file mode 100644
index 00000000000..fb4cd38885e
Binary files /dev/null and b/public/images/emoji/apple/kiwi_fruit.png differ
diff --git a/public/images/emoji/apple/knife.png b/public/images/emoji/apple/knife.png
index 1704701ef91..c8a63cfddd4 100644
Binary files a/public/images/emoji/apple/knife.png and b/public/images/emoji/apple/knife.png differ
diff --git a/public/images/emoji/apple/koala.png b/public/images/emoji/apple/koala.png
index 83accd8bd77..9c12e14d152 100644
Binary files a/public/images/emoji/apple/koala.png and b/public/images/emoji/apple/koala.png differ
diff --git a/public/images/emoji/apple/koko.png b/public/images/emoji/apple/koko.png
index 52a32055aee..30a390e8e63 100644
Binary files a/public/images/emoji/apple/koko.png and b/public/images/emoji/apple/koko.png differ
diff --git a/public/images/emoji/apple/kosovo.png b/public/images/emoji/apple/kosovo.png
new file mode 100644
index 00000000000..1d721438489
Binary files /dev/null and b/public/images/emoji/apple/kosovo.png differ
diff --git a/public/images/emoji/apple/kuwait.png b/public/images/emoji/apple/kuwait.png
new file mode 100644
index 00000000000..506e7c42499
Binary files /dev/null and b/public/images/emoji/apple/kuwait.png differ
diff --git a/public/images/emoji/apple/kyrgyzstan.png b/public/images/emoji/apple/kyrgyzstan.png
new file mode 100644
index 00000000000..8d7ae07d916
Binary files /dev/null and b/public/images/emoji/apple/kyrgyzstan.png differ
diff --git a/public/images/emoji/apple/label.png b/public/images/emoji/apple/label.png
index 49371637889..ec8d4de319f 100644
Binary files a/public/images/emoji/apple/label.png and b/public/images/emoji/apple/label.png differ
diff --git a/public/images/emoji/apple/laos.png b/public/images/emoji/apple/laos.png
new file mode 100644
index 00000000000..40db675d1c2
Binary files /dev/null and b/public/images/emoji/apple/laos.png differ
diff --git a/public/images/emoji/apple/large_blue_circle.png b/public/images/emoji/apple/large_blue_circle.png
index d2ca247fc06..6a2062451c2 100644
Binary files a/public/images/emoji/apple/large_blue_circle.png and b/public/images/emoji/apple/large_blue_circle.png differ
diff --git a/public/images/emoji/apple/large_blue_diamond.png b/public/images/emoji/apple/large_blue_diamond.png
index dd141df2727..fd2f2178ae4 100644
Binary files a/public/images/emoji/apple/large_blue_diamond.png and b/public/images/emoji/apple/large_blue_diamond.png differ
diff --git a/public/images/emoji/apple/large_orange_diamond.png b/public/images/emoji/apple/large_orange_diamond.png
index c489d2374e8..ab97bd6c123 100644
Binary files a/public/images/emoji/apple/large_orange_diamond.png and b/public/images/emoji/apple/large_orange_diamond.png differ
diff --git a/public/images/emoji/apple/last_quarter_moon.png b/public/images/emoji/apple/last_quarter_moon.png
index be2f99c8dce..19f454d522a 100644
Binary files a/public/images/emoji/apple/last_quarter_moon.png and b/public/images/emoji/apple/last_quarter_moon.png differ
diff --git a/public/images/emoji/apple/last_quarter_moon_with_face.png b/public/images/emoji/apple/last_quarter_moon_with_face.png
index c3013e066ae..09d75033d7e 100644
Binary files a/public/images/emoji/apple/last_quarter_moon_with_face.png and b/public/images/emoji/apple/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/apple/latin_cross.png b/public/images/emoji/apple/latin_cross.png
index 10df9c21f16..efc7a79034a 100644
Binary files a/public/images/emoji/apple/latin_cross.png and b/public/images/emoji/apple/latin_cross.png differ
diff --git a/public/images/emoji/apple/latvia.png b/public/images/emoji/apple/latvia.png
new file mode 100644
index 00000000000..b941fdcd4ca
Binary files /dev/null and b/public/images/emoji/apple/latvia.png differ
diff --git a/public/images/emoji/apple/leaves.png b/public/images/emoji/apple/leaves.png
index 9683f0c2d7c..5a9d9c80248 100644
Binary files a/public/images/emoji/apple/leaves.png and b/public/images/emoji/apple/leaves.png differ
diff --git a/public/images/emoji/apple/lebanon.png b/public/images/emoji/apple/lebanon.png
new file mode 100644
index 00000000000..b83364c1674
Binary files /dev/null and b/public/images/emoji/apple/lebanon.png differ
diff --git a/public/images/emoji/apple/ledger.png b/public/images/emoji/apple/ledger.png
index dc98beed81e..73744147ce2 100644
Binary files a/public/images/emoji/apple/ledger.png and b/public/images/emoji/apple/ledger.png differ
diff --git a/public/images/emoji/apple/left_luggage.png b/public/images/emoji/apple/left_luggage.png
index 1676faea235..a27f78ca0e5 100644
Binary files a/public/images/emoji/apple/left_luggage.png and b/public/images/emoji/apple/left_luggage.png differ
diff --git a/public/images/emoji/apple/left_right_arrow.png b/public/images/emoji/apple/left_right_arrow.png
index a42bc762924..ae4e53f32e8 100644
Binary files a/public/images/emoji/apple/left_right_arrow.png and b/public/images/emoji/apple/left_right_arrow.png differ
diff --git a/public/images/emoji/apple/leftwards_arrow_with_hook.png b/public/images/emoji/apple/leftwards_arrow_with_hook.png
index 62a4eb34775..336a4083883 100644
Binary files a/public/images/emoji/apple/leftwards_arrow_with_hook.png and b/public/images/emoji/apple/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/apple/lemon.png b/public/images/emoji/apple/lemon.png
index 69ccd5f2890..2d827455fc2 100644
Binary files a/public/images/emoji/apple/lemon.png and b/public/images/emoji/apple/lemon.png differ
diff --git a/public/images/emoji/apple/leo.png b/public/images/emoji/apple/leo.png
index 4695c5cc0fb..1556f8345fb 100644
Binary files a/public/images/emoji/apple/leo.png and b/public/images/emoji/apple/leo.png differ
diff --git a/public/images/emoji/apple/leopard.png b/public/images/emoji/apple/leopard.png
index abdfc89f2a9..0ece19dbb29 100644
Binary files a/public/images/emoji/apple/leopard.png and b/public/images/emoji/apple/leopard.png differ
diff --git a/public/images/emoji/apple/lesotho.png b/public/images/emoji/apple/lesotho.png
new file mode 100644
index 00000000000..e4f431dad80
Binary files /dev/null and b/public/images/emoji/apple/lesotho.png differ
diff --git a/public/images/emoji/apple/level_slider.png b/public/images/emoji/apple/level_slider.png
index 11dbb07c03e..99a962dcc15 100644
Binary files a/public/images/emoji/apple/level_slider.png and b/public/images/emoji/apple/level_slider.png differ
diff --git a/public/images/emoji/apple/levitate.png b/public/images/emoji/apple/levitate.png
index 7fe50e4a75c..00ae1282f1d 100644
Binary files a/public/images/emoji/apple/levitate.png and b/public/images/emoji/apple/levitate.png differ
diff --git a/public/images/emoji/apple/levitate/2.png b/public/images/emoji/apple/levitate/2.png
new file mode 100644
index 00000000000..369be947839
Binary files /dev/null and b/public/images/emoji/apple/levitate/2.png differ
diff --git a/public/images/emoji/apple/levitate/3.png b/public/images/emoji/apple/levitate/3.png
new file mode 100644
index 00000000000..f81f47f2747
Binary files /dev/null and b/public/images/emoji/apple/levitate/3.png differ
diff --git a/public/images/emoji/apple/levitate/4.png b/public/images/emoji/apple/levitate/4.png
new file mode 100644
index 00000000000..b355778d9f6
Binary files /dev/null and b/public/images/emoji/apple/levitate/4.png differ
diff --git a/public/images/emoji/apple/levitate/5.png b/public/images/emoji/apple/levitate/5.png
new file mode 100644
index 00000000000..f348ca68e3a
Binary files /dev/null and b/public/images/emoji/apple/levitate/5.png differ
diff --git a/public/images/emoji/apple/levitate/6.png b/public/images/emoji/apple/levitate/6.png
new file mode 100644
index 00000000000..232f1c2dc26
Binary files /dev/null and b/public/images/emoji/apple/levitate/6.png differ
diff --git a/public/images/emoji/apple/liberia.png b/public/images/emoji/apple/liberia.png
new file mode 100644
index 00000000000..de7b2a957a9
Binary files /dev/null and b/public/images/emoji/apple/liberia.png differ
diff --git a/public/images/emoji/apple/libra.png b/public/images/emoji/apple/libra.png
index 13b6597e5ad..5fb39d7ca22 100644
Binary files a/public/images/emoji/apple/libra.png and b/public/images/emoji/apple/libra.png differ
diff --git a/public/images/emoji/apple/libya.png b/public/images/emoji/apple/libya.png
new file mode 100644
index 00000000000..30437ab1fb3
Binary files /dev/null and b/public/images/emoji/apple/libya.png differ
diff --git a/public/images/emoji/apple/liechtenstein.png b/public/images/emoji/apple/liechtenstein.png
new file mode 100644
index 00000000000..6046b94e9f7
Binary files /dev/null and b/public/images/emoji/apple/liechtenstein.png differ
diff --git a/public/images/emoji/apple/lifter/2.png b/public/images/emoji/apple/lifter/2.png
new file mode 100644
index 00000000000..df54bd55f94
Binary files /dev/null and b/public/images/emoji/apple/lifter/2.png differ
diff --git a/public/images/emoji/apple/lifter/3.png b/public/images/emoji/apple/lifter/3.png
new file mode 100644
index 00000000000..dafe388c958
Binary files /dev/null and b/public/images/emoji/apple/lifter/3.png differ
diff --git a/public/images/emoji/apple/lifter/4.png b/public/images/emoji/apple/lifter/4.png
new file mode 100644
index 00000000000..ecf9101aa9d
Binary files /dev/null and b/public/images/emoji/apple/lifter/4.png differ
diff --git a/public/images/emoji/apple/lifter/5.png b/public/images/emoji/apple/lifter/5.png
new file mode 100644
index 00000000000..cd1c9aad396
Binary files /dev/null and b/public/images/emoji/apple/lifter/5.png differ
diff --git a/public/images/emoji/apple/lifter/6.png b/public/images/emoji/apple/lifter/6.png
new file mode 100644
index 00000000000..1afa3bea2c3
Binary files /dev/null and b/public/images/emoji/apple/lifter/6.png differ
diff --git a/public/images/emoji/apple/light_rail.png b/public/images/emoji/apple/light_rail.png
index ed49b66e47c..591c3c66143 100644
Binary files a/public/images/emoji/apple/light_rail.png and b/public/images/emoji/apple/light_rail.png differ
diff --git a/public/images/emoji/apple/link.png b/public/images/emoji/apple/link.png
index fbca11a6d46..d24ae9054b9 100644
Binary files a/public/images/emoji/apple/link.png and b/public/images/emoji/apple/link.png differ
diff --git a/public/images/emoji/apple/linked_paperclips.png b/public/images/emoji/apple/linked_paperclips.png
index 22e54ef1f4e..235e2049c36 100644
Binary files a/public/images/emoji/apple/linked_paperclips.png and b/public/images/emoji/apple/linked_paperclips.png differ
diff --git a/public/images/emoji/apple/lion.png b/public/images/emoji/apple/lion.png
index eebeb803215..f07e438beb1 100644
Binary files a/public/images/emoji/apple/lion.png and b/public/images/emoji/apple/lion.png differ
diff --git a/public/images/emoji/apple/lion_face.png b/public/images/emoji/apple/lion_face.png
index eebeb803215..f07e438beb1 100644
Binary files a/public/images/emoji/apple/lion_face.png and b/public/images/emoji/apple/lion_face.png differ
diff --git a/public/images/emoji/apple/lips.png b/public/images/emoji/apple/lips.png
index 2a066fb57bd..bf3850fa06a 100644
Binary files a/public/images/emoji/apple/lips.png and b/public/images/emoji/apple/lips.png differ
diff --git a/public/images/emoji/apple/lipstick.png b/public/images/emoji/apple/lipstick.png
index 660f09cfa2c..d4ee8baa40b 100644
Binary files a/public/images/emoji/apple/lipstick.png and b/public/images/emoji/apple/lipstick.png differ
diff --git a/public/images/emoji/apple/lithuania.png b/public/images/emoji/apple/lithuania.png
new file mode 100644
index 00000000000..c6cf99bf21f
Binary files /dev/null and b/public/images/emoji/apple/lithuania.png differ
diff --git a/public/images/emoji/apple/lizard.png b/public/images/emoji/apple/lizard.png
new file mode 100644
index 00000000000..0eaa196dc18
Binary files /dev/null and b/public/images/emoji/apple/lizard.png differ
diff --git a/public/images/emoji/apple/lock.png b/public/images/emoji/apple/lock.png
index c98b9233276..da37d712576 100644
Binary files a/public/images/emoji/apple/lock.png and b/public/images/emoji/apple/lock.png differ
diff --git a/public/images/emoji/apple/lock_with_ink_pen.png b/public/images/emoji/apple/lock_with_ink_pen.png
index f07eac6a93b..04f26eae33c 100644
Binary files a/public/images/emoji/apple/lock_with_ink_pen.png and b/public/images/emoji/apple/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/apple/lollipop.png b/public/images/emoji/apple/lollipop.png
index 7ff4e06e1de..67fa99b23e5 100644
Binary files a/public/images/emoji/apple/lollipop.png and b/public/images/emoji/apple/lollipop.png differ
diff --git a/public/images/emoji/apple/loop.png b/public/images/emoji/apple/loop.png
index 5ffecce2491..55461842899 100644
Binary files a/public/images/emoji/apple/loop.png and b/public/images/emoji/apple/loop.png differ
diff --git a/public/images/emoji/apple/loud_sound.png b/public/images/emoji/apple/loud_sound.png
index 54ef58d49b3..b5d62322860 100644
Binary files a/public/images/emoji/apple/loud_sound.png and b/public/images/emoji/apple/loud_sound.png differ
diff --git a/public/images/emoji/apple/loudspeaker.png b/public/images/emoji/apple/loudspeaker.png
index 10c1b16d4f3..532254bb105 100644
Binary files a/public/images/emoji/apple/loudspeaker.png and b/public/images/emoji/apple/loudspeaker.png differ
diff --git a/public/images/emoji/apple/love_hotel.png b/public/images/emoji/apple/love_hotel.png
index 4b9ab9d2fc9..a31a8f40a49 100644
Binary files a/public/images/emoji/apple/love_hotel.png and b/public/images/emoji/apple/love_hotel.png differ
diff --git a/public/images/emoji/apple/love_letter.png b/public/images/emoji/apple/love_letter.png
index 33a0f9f812e..452d90564a6 100644
Binary files a/public/images/emoji/apple/love_letter.png and b/public/images/emoji/apple/love_letter.png differ
diff --git a/public/images/emoji/apple/love_you_gesture.png b/public/images/emoji/apple/love_you_gesture.png
new file mode 100644
index 00000000000..14ef7c72b20
Binary files /dev/null and b/public/images/emoji/apple/love_you_gesture.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/2.png b/public/images/emoji/apple/love_you_gesture/2.png
new file mode 100644
index 00000000000..b70217e894c
Binary files /dev/null and b/public/images/emoji/apple/love_you_gesture/2.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/3.png b/public/images/emoji/apple/love_you_gesture/3.png
new file mode 100644
index 00000000000..aa984ea9263
Binary files /dev/null and b/public/images/emoji/apple/love_you_gesture/3.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/4.png b/public/images/emoji/apple/love_you_gesture/4.png
new file mode 100644
index 00000000000..5decb0e8008
Binary files /dev/null and b/public/images/emoji/apple/love_you_gesture/4.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/5.png b/public/images/emoji/apple/love_you_gesture/5.png
new file mode 100644
index 00000000000..e0bb218cc08
Binary files /dev/null and b/public/images/emoji/apple/love_you_gesture/5.png differ
diff --git a/public/images/emoji/apple/love_you_gesture/6.png b/public/images/emoji/apple/love_you_gesture/6.png
new file mode 100644
index 00000000000..bb51bde8bbd
Binary files /dev/null and b/public/images/emoji/apple/love_you_gesture/6.png differ
diff --git a/public/images/emoji/apple/low_brightness.png b/public/images/emoji/apple/low_brightness.png
index 175ca1b742b..3602ba9cf70 100644
Binary files a/public/images/emoji/apple/low_brightness.png and b/public/images/emoji/apple/low_brightness.png differ
diff --git a/public/images/emoji/apple/lower_left_ballpoint_pen.png b/public/images/emoji/apple/lower_left_ballpoint_pen.png
index 7f81b84a60c..b9e79ad2146 100644
Binary files a/public/images/emoji/apple/lower_left_ballpoint_pen.png and b/public/images/emoji/apple/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/apple/lower_left_crayon.png b/public/images/emoji/apple/lower_left_crayon.png
index 0b0f7415750..eaf918c81f4 100644
Binary files a/public/images/emoji/apple/lower_left_crayon.png and b/public/images/emoji/apple/lower_left_crayon.png differ
diff --git a/public/images/emoji/apple/lower_left_fountain_pen.png b/public/images/emoji/apple/lower_left_fountain_pen.png
index 46b0256afa2..a9a947848d8 100644
Binary files a/public/images/emoji/apple/lower_left_fountain_pen.png and b/public/images/emoji/apple/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/apple/lower_left_paintbrush.png b/public/images/emoji/apple/lower_left_paintbrush.png
index 9b83129cb4b..2b02f0ad03a 100644
Binary files a/public/images/emoji/apple/lower_left_paintbrush.png and b/public/images/emoji/apple/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/apple/luxembourg.png b/public/images/emoji/apple/luxembourg.png
new file mode 100644
index 00000000000..3a2bba0528d
Binary files /dev/null and b/public/images/emoji/apple/luxembourg.png differ
diff --git a/public/images/emoji/apple/lying_face.png b/public/images/emoji/apple/lying_face.png
new file mode 100644
index 00000000000..2df4a358d30
Binary files /dev/null and b/public/images/emoji/apple/lying_face.png differ
diff --git a/public/images/emoji/apple/m.png b/public/images/emoji/apple/m.png
index 26e46db99cc..e7c67de00e7 100644
Binary files a/public/images/emoji/apple/m.png and b/public/images/emoji/apple/m.png differ
diff --git a/public/images/emoji/apple/macau.png b/public/images/emoji/apple/macau.png
new file mode 100644
index 00000000000..6199face702
Binary files /dev/null and b/public/images/emoji/apple/macau.png differ
diff --git a/public/images/emoji/apple/macedonia.png b/public/images/emoji/apple/macedonia.png
new file mode 100644
index 00000000000..4e6457d2d51
Binary files /dev/null and b/public/images/emoji/apple/macedonia.png differ
diff --git a/public/images/emoji/apple/madagascar.png b/public/images/emoji/apple/madagascar.png
new file mode 100644
index 00000000000..a4e779a2c9d
Binary files /dev/null and b/public/images/emoji/apple/madagascar.png differ
diff --git a/public/images/emoji/apple/mag.png b/public/images/emoji/apple/mag.png
index bee1fd33da3..fda41d19b8b 100644
Binary files a/public/images/emoji/apple/mag.png and b/public/images/emoji/apple/mag.png differ
diff --git a/public/images/emoji/apple/mag_right.png b/public/images/emoji/apple/mag_right.png
index 3f113ef8884..8ac9ef16178 100644
Binary files a/public/images/emoji/apple/mag_right.png and b/public/images/emoji/apple/mag_right.png differ
diff --git a/public/images/emoji/apple/mage.png b/public/images/emoji/apple/mage.png
new file mode 100644
index 00000000000..71c1b13f924
Binary files /dev/null and b/public/images/emoji/apple/mage.png differ
diff --git a/public/images/emoji/apple/mage/2.png b/public/images/emoji/apple/mage/2.png
new file mode 100644
index 00000000000..823f6843fad
Binary files /dev/null and b/public/images/emoji/apple/mage/2.png differ
diff --git a/public/images/emoji/apple/mage/3.png b/public/images/emoji/apple/mage/3.png
new file mode 100644
index 00000000000..c2ff6622a04
Binary files /dev/null and b/public/images/emoji/apple/mage/3.png differ
diff --git a/public/images/emoji/apple/mage/4.png b/public/images/emoji/apple/mage/4.png
new file mode 100644
index 00000000000..76d0a52e374
Binary files /dev/null and b/public/images/emoji/apple/mage/4.png differ
diff --git a/public/images/emoji/apple/mage/5.png b/public/images/emoji/apple/mage/5.png
new file mode 100644
index 00000000000..ddb5de55806
Binary files /dev/null and b/public/images/emoji/apple/mage/5.png differ
diff --git a/public/images/emoji/apple/mage/6.png b/public/images/emoji/apple/mage/6.png
new file mode 100644
index 00000000000..302dd62dfb3
Binary files /dev/null and b/public/images/emoji/apple/mage/6.png differ
diff --git a/public/images/emoji/apple/mahjong.png b/public/images/emoji/apple/mahjong.png
index b0a0af5c673..1bdcdec664d 100644
Binary files a/public/images/emoji/apple/mahjong.png and b/public/images/emoji/apple/mahjong.png differ
diff --git a/public/images/emoji/apple/mailbox.png b/public/images/emoji/apple/mailbox.png
index 900519b6a8f..28f703c8ed2 100644
Binary files a/public/images/emoji/apple/mailbox.png and b/public/images/emoji/apple/mailbox.png differ
diff --git a/public/images/emoji/apple/mailbox_closed.png b/public/images/emoji/apple/mailbox_closed.png
index a59025f9ce2..6750b241773 100644
Binary files a/public/images/emoji/apple/mailbox_closed.png and b/public/images/emoji/apple/mailbox_closed.png differ
diff --git a/public/images/emoji/apple/mailbox_with_mail.png b/public/images/emoji/apple/mailbox_with_mail.png
index 89a18312d17..adf3a8218f8 100644
Binary files a/public/images/emoji/apple/mailbox_with_mail.png and b/public/images/emoji/apple/mailbox_with_mail.png differ
diff --git a/public/images/emoji/apple/mailbox_with_no_mail.png b/public/images/emoji/apple/mailbox_with_no_mail.png
index f666544890d..eaa51343603 100644
Binary files a/public/images/emoji/apple/mailbox_with_no_mail.png and b/public/images/emoji/apple/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/apple/malawi.png b/public/images/emoji/apple/malawi.png
new file mode 100644
index 00000000000..dea46a2af06
Binary files /dev/null and b/public/images/emoji/apple/malawi.png differ
diff --git a/public/images/emoji/apple/malaysia.png b/public/images/emoji/apple/malaysia.png
new file mode 100644
index 00000000000..01bd5a75bd3
Binary files /dev/null and b/public/images/emoji/apple/malaysia.png differ
diff --git a/public/images/emoji/apple/maldives.png b/public/images/emoji/apple/maldives.png
new file mode 100644
index 00000000000..757cf7ec8d6
Binary files /dev/null and b/public/images/emoji/apple/maldives.png differ
diff --git a/public/images/emoji/apple/male_detective.png b/public/images/emoji/apple/male_detective.png
new file mode 100644
index 00000000000..6a7e53aff05
Binary files /dev/null and b/public/images/emoji/apple/male_detective.png differ
diff --git a/public/images/emoji/apple/male_detective/2.png b/public/images/emoji/apple/male_detective/2.png
new file mode 100644
index 00000000000..229e7c2986e
Binary files /dev/null and b/public/images/emoji/apple/male_detective/2.png differ
diff --git a/public/images/emoji/apple/male_detective/3.png b/public/images/emoji/apple/male_detective/3.png
new file mode 100644
index 00000000000..58ee54ac888
Binary files /dev/null and b/public/images/emoji/apple/male_detective/3.png differ
diff --git a/public/images/emoji/apple/male_detective/4.png b/public/images/emoji/apple/male_detective/4.png
new file mode 100644
index 00000000000..0ce63e8b7de
Binary files /dev/null and b/public/images/emoji/apple/male_detective/4.png differ
diff --git a/public/images/emoji/apple/male_detective/5.png b/public/images/emoji/apple/male_detective/5.png
new file mode 100644
index 00000000000..838cf318fe0
Binary files /dev/null and b/public/images/emoji/apple/male_detective/5.png differ
diff --git a/public/images/emoji/apple/male_detective/6.png b/public/images/emoji/apple/male_detective/6.png
new file mode 100644
index 00000000000..e0cb2a0d2a6
Binary files /dev/null and b/public/images/emoji/apple/male_detective/6.png differ
diff --git a/public/images/emoji/apple/mali.png b/public/images/emoji/apple/mali.png
new file mode 100644
index 00000000000..c24e4ee765f
Binary files /dev/null and b/public/images/emoji/apple/mali.png differ
diff --git a/public/images/emoji/apple/malta.png b/public/images/emoji/apple/malta.png
new file mode 100644
index 00000000000..22e114c4357
Binary files /dev/null and b/public/images/emoji/apple/malta.png differ
diff --git a/public/images/emoji/apple/man.png b/public/images/emoji/apple/man.png
index b52f5664348..d0a76900ddb 100644
Binary files a/public/images/emoji/apple/man.png and b/public/images/emoji/apple/man.png differ
diff --git a/public/images/emoji/apple/man/2.png b/public/images/emoji/apple/man/2.png
new file mode 100644
index 00000000000..3e2e9ec4185
Binary files /dev/null and b/public/images/emoji/apple/man/2.png differ
diff --git a/public/images/emoji/apple/man/3.png b/public/images/emoji/apple/man/3.png
new file mode 100644
index 00000000000..f43bf4122f7
Binary files /dev/null and b/public/images/emoji/apple/man/3.png differ
diff --git a/public/images/emoji/apple/man/4.png b/public/images/emoji/apple/man/4.png
new file mode 100644
index 00000000000..ad967fa0527
Binary files /dev/null and b/public/images/emoji/apple/man/4.png differ
diff --git a/public/images/emoji/apple/man/5.png b/public/images/emoji/apple/man/5.png
new file mode 100644
index 00000000000..8156d59cdba
Binary files /dev/null and b/public/images/emoji/apple/man/5.png differ
diff --git a/public/images/emoji/apple/man/6.png b/public/images/emoji/apple/man/6.png
new file mode 100644
index 00000000000..5ebceb49005
Binary files /dev/null and b/public/images/emoji/apple/man/6.png differ
diff --git a/public/images/emoji/apple/man_artist.png b/public/images/emoji/apple/man_artist.png
new file mode 100644
index 00000000000..8825c9dfbdf
Binary files /dev/null and b/public/images/emoji/apple/man_artist.png differ
diff --git a/public/images/emoji/apple/man_artist/2.png b/public/images/emoji/apple/man_artist/2.png
new file mode 100644
index 00000000000..afbf7f49d71
Binary files /dev/null and b/public/images/emoji/apple/man_artist/2.png differ
diff --git a/public/images/emoji/apple/man_artist/3.png b/public/images/emoji/apple/man_artist/3.png
new file mode 100644
index 00000000000..0cdc7cb9319
Binary files /dev/null and b/public/images/emoji/apple/man_artist/3.png differ
diff --git a/public/images/emoji/apple/man_artist/4.png b/public/images/emoji/apple/man_artist/4.png
new file mode 100644
index 00000000000..6470b265270
Binary files /dev/null and b/public/images/emoji/apple/man_artist/4.png differ
diff --git a/public/images/emoji/apple/man_artist/5.png b/public/images/emoji/apple/man_artist/5.png
new file mode 100644
index 00000000000..f365388e815
Binary files /dev/null and b/public/images/emoji/apple/man_artist/5.png differ
diff --git a/public/images/emoji/apple/man_artist/6.png b/public/images/emoji/apple/man_artist/6.png
new file mode 100644
index 00000000000..ef1df031988
Binary files /dev/null and b/public/images/emoji/apple/man_artist/6.png differ
diff --git a/public/images/emoji/apple/man_astronaut.png b/public/images/emoji/apple/man_astronaut.png
new file mode 100644
index 00000000000..db6c2cf7f10
Binary files /dev/null and b/public/images/emoji/apple/man_astronaut.png differ
diff --git a/public/images/emoji/apple/man_astronaut/2.png b/public/images/emoji/apple/man_astronaut/2.png
new file mode 100644
index 00000000000..3409623591d
Binary files /dev/null and b/public/images/emoji/apple/man_astronaut/2.png differ
diff --git a/public/images/emoji/apple/man_astronaut/3.png b/public/images/emoji/apple/man_astronaut/3.png
new file mode 100644
index 00000000000..5764d5d8971
Binary files /dev/null and b/public/images/emoji/apple/man_astronaut/3.png differ
diff --git a/public/images/emoji/apple/man_astronaut/4.png b/public/images/emoji/apple/man_astronaut/4.png
new file mode 100644
index 00000000000..45b6438095f
Binary files /dev/null and b/public/images/emoji/apple/man_astronaut/4.png differ
diff --git a/public/images/emoji/apple/man_astronaut/5.png b/public/images/emoji/apple/man_astronaut/5.png
new file mode 100644
index 00000000000..6d255ce511c
Binary files /dev/null and b/public/images/emoji/apple/man_astronaut/5.png differ
diff --git a/public/images/emoji/apple/man_astronaut/6.png b/public/images/emoji/apple/man_astronaut/6.png
new file mode 100644
index 00000000000..21bcecc02e8
Binary files /dev/null and b/public/images/emoji/apple/man_astronaut/6.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling.png b/public/images/emoji/apple/man_cartwheeling.png
new file mode 100644
index 00000000000..3ae0143de56
Binary files /dev/null and b/public/images/emoji/apple/man_cartwheeling.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/2.png b/public/images/emoji/apple/man_cartwheeling/2.png
new file mode 100644
index 00000000000..8b0bc4ccb4f
Binary files /dev/null and b/public/images/emoji/apple/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/3.png b/public/images/emoji/apple/man_cartwheeling/3.png
new file mode 100644
index 00000000000..70a34fab0df
Binary files /dev/null and b/public/images/emoji/apple/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/4.png b/public/images/emoji/apple/man_cartwheeling/4.png
new file mode 100644
index 00000000000..2b1c7918fab
Binary files /dev/null and b/public/images/emoji/apple/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/5.png b/public/images/emoji/apple/man_cartwheeling/5.png
new file mode 100644
index 00000000000..6b8e66c1e7f
Binary files /dev/null and b/public/images/emoji/apple/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/apple/man_cartwheeling/6.png b/public/images/emoji/apple/man_cartwheeling/6.png
new file mode 100644
index 00000000000..000ce582f54
Binary files /dev/null and b/public/images/emoji/apple/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/apple/man_cook.png b/public/images/emoji/apple/man_cook.png
new file mode 100644
index 00000000000..a011061836e
Binary files /dev/null and b/public/images/emoji/apple/man_cook.png differ
diff --git a/public/images/emoji/apple/man_cook/2.png b/public/images/emoji/apple/man_cook/2.png
new file mode 100644
index 00000000000..ad08f530f9b
Binary files /dev/null and b/public/images/emoji/apple/man_cook/2.png differ
diff --git a/public/images/emoji/apple/man_cook/3.png b/public/images/emoji/apple/man_cook/3.png
new file mode 100644
index 00000000000..f99f2eab1d3
Binary files /dev/null and b/public/images/emoji/apple/man_cook/3.png differ
diff --git a/public/images/emoji/apple/man_cook/4.png b/public/images/emoji/apple/man_cook/4.png
new file mode 100644
index 00000000000..982cbe9d8b8
Binary files /dev/null and b/public/images/emoji/apple/man_cook/4.png differ
diff --git a/public/images/emoji/apple/man_cook/5.png b/public/images/emoji/apple/man_cook/5.png
new file mode 100644
index 00000000000..e81965aa082
Binary files /dev/null and b/public/images/emoji/apple/man_cook/5.png differ
diff --git a/public/images/emoji/apple/man_cook/6.png b/public/images/emoji/apple/man_cook/6.png
new file mode 100644
index 00000000000..8879029ef8f
Binary files /dev/null and b/public/images/emoji/apple/man_cook/6.png differ
diff --git a/public/images/emoji/apple/man_dancing.png b/public/images/emoji/apple/man_dancing.png
new file mode 100644
index 00000000000..0af681bdae3
Binary files /dev/null and b/public/images/emoji/apple/man_dancing.png differ
diff --git a/public/images/emoji/apple/man_dancing/2.png b/public/images/emoji/apple/man_dancing/2.png
new file mode 100644
index 00000000000..1dfccb36c77
Binary files /dev/null and b/public/images/emoji/apple/man_dancing/2.png differ
diff --git a/public/images/emoji/apple/man_dancing/3.png b/public/images/emoji/apple/man_dancing/3.png
new file mode 100644
index 00000000000..04a83acaff1
Binary files /dev/null and b/public/images/emoji/apple/man_dancing/3.png differ
diff --git a/public/images/emoji/apple/man_dancing/4.png b/public/images/emoji/apple/man_dancing/4.png
new file mode 100644
index 00000000000..33b8a9427c7
Binary files /dev/null and b/public/images/emoji/apple/man_dancing/4.png differ
diff --git a/public/images/emoji/apple/man_dancing/5.png b/public/images/emoji/apple/man_dancing/5.png
new file mode 100644
index 00000000000..02c985dcf0f
Binary files /dev/null and b/public/images/emoji/apple/man_dancing/5.png differ
diff --git a/public/images/emoji/apple/man_dancing/6.png b/public/images/emoji/apple/man_dancing/6.png
new file mode 100644
index 00000000000..68e4dcd550f
Binary files /dev/null and b/public/images/emoji/apple/man_dancing/6.png differ
diff --git a/public/images/emoji/apple/man_facepalming.png b/public/images/emoji/apple/man_facepalming.png
new file mode 100644
index 00000000000..543ef7e6460
Binary files /dev/null and b/public/images/emoji/apple/man_facepalming.png differ
diff --git a/public/images/emoji/apple/man_facepalming/2.png b/public/images/emoji/apple/man_facepalming/2.png
new file mode 100644
index 00000000000..ad95734385d
Binary files /dev/null and b/public/images/emoji/apple/man_facepalming/2.png differ
diff --git a/public/images/emoji/apple/man_facepalming/3.png b/public/images/emoji/apple/man_facepalming/3.png
new file mode 100644
index 00000000000..ef4d91dd2f1
Binary files /dev/null and b/public/images/emoji/apple/man_facepalming/3.png differ
diff --git a/public/images/emoji/apple/man_facepalming/4.png b/public/images/emoji/apple/man_facepalming/4.png
new file mode 100644
index 00000000000..365d50bf7de
Binary files /dev/null and b/public/images/emoji/apple/man_facepalming/4.png differ
diff --git a/public/images/emoji/apple/man_facepalming/5.png b/public/images/emoji/apple/man_facepalming/5.png
new file mode 100644
index 00000000000..b72399279bb
Binary files /dev/null and b/public/images/emoji/apple/man_facepalming/5.png differ
diff --git a/public/images/emoji/apple/man_facepalming/6.png b/public/images/emoji/apple/man_facepalming/6.png
new file mode 100644
index 00000000000..f9020c975a9
Binary files /dev/null and b/public/images/emoji/apple/man_facepalming/6.png differ
diff --git a/public/images/emoji/apple/man_factory_worker.png b/public/images/emoji/apple/man_factory_worker.png
new file mode 100644
index 00000000000..a6c98168ef8
Binary files /dev/null and b/public/images/emoji/apple/man_factory_worker.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/2.png b/public/images/emoji/apple/man_factory_worker/2.png
new file mode 100644
index 00000000000..85e4c581774
Binary files /dev/null and b/public/images/emoji/apple/man_factory_worker/2.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/3.png b/public/images/emoji/apple/man_factory_worker/3.png
new file mode 100644
index 00000000000..2768e7c782f
Binary files /dev/null and b/public/images/emoji/apple/man_factory_worker/3.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/4.png b/public/images/emoji/apple/man_factory_worker/4.png
new file mode 100644
index 00000000000..5057d5ca9c5
Binary files /dev/null and b/public/images/emoji/apple/man_factory_worker/4.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/5.png b/public/images/emoji/apple/man_factory_worker/5.png
new file mode 100644
index 00000000000..bb55256aff5
Binary files /dev/null and b/public/images/emoji/apple/man_factory_worker/5.png differ
diff --git a/public/images/emoji/apple/man_factory_worker/6.png b/public/images/emoji/apple/man_factory_worker/6.png
new file mode 100644
index 00000000000..a1c8677fdb8
Binary files /dev/null and b/public/images/emoji/apple/man_factory_worker/6.png differ
diff --git a/public/images/emoji/apple/man_farmer.png b/public/images/emoji/apple/man_farmer.png
new file mode 100644
index 00000000000..a6d9c8f88f2
Binary files /dev/null and b/public/images/emoji/apple/man_farmer.png differ
diff --git a/public/images/emoji/apple/man_farmer/2.png b/public/images/emoji/apple/man_farmer/2.png
new file mode 100644
index 00000000000..252e6be1bce
Binary files /dev/null and b/public/images/emoji/apple/man_farmer/2.png differ
diff --git a/public/images/emoji/apple/man_farmer/3.png b/public/images/emoji/apple/man_farmer/3.png
new file mode 100644
index 00000000000..0ceac01ec99
Binary files /dev/null and b/public/images/emoji/apple/man_farmer/3.png differ
diff --git a/public/images/emoji/apple/man_farmer/4.png b/public/images/emoji/apple/man_farmer/4.png
new file mode 100644
index 00000000000..85ae21b240d
Binary files /dev/null and b/public/images/emoji/apple/man_farmer/4.png differ
diff --git a/public/images/emoji/apple/man_farmer/5.png b/public/images/emoji/apple/man_farmer/5.png
new file mode 100644
index 00000000000..e38b0704e18
Binary files /dev/null and b/public/images/emoji/apple/man_farmer/5.png differ
diff --git a/public/images/emoji/apple/man_farmer/6.png b/public/images/emoji/apple/man_farmer/6.png
new file mode 100644
index 00000000000..f204cf6de84
Binary files /dev/null and b/public/images/emoji/apple/man_farmer/6.png differ
diff --git a/public/images/emoji/apple/man_firefighter.png b/public/images/emoji/apple/man_firefighter.png
new file mode 100644
index 00000000000..ca4f97c0dcf
Binary files /dev/null and b/public/images/emoji/apple/man_firefighter.png differ
diff --git a/public/images/emoji/apple/man_firefighter/2.png b/public/images/emoji/apple/man_firefighter/2.png
new file mode 100644
index 00000000000..17d673e75e1
Binary files /dev/null and b/public/images/emoji/apple/man_firefighter/2.png differ
diff --git a/public/images/emoji/apple/man_firefighter/3.png b/public/images/emoji/apple/man_firefighter/3.png
new file mode 100644
index 00000000000..c91a3d9a5b3
Binary files /dev/null and b/public/images/emoji/apple/man_firefighter/3.png differ
diff --git a/public/images/emoji/apple/man_firefighter/4.png b/public/images/emoji/apple/man_firefighter/4.png
new file mode 100644
index 00000000000..b55329cb035
Binary files /dev/null and b/public/images/emoji/apple/man_firefighter/4.png differ
diff --git a/public/images/emoji/apple/man_firefighter/5.png b/public/images/emoji/apple/man_firefighter/5.png
new file mode 100644
index 00000000000..b6424288c98
Binary files /dev/null and b/public/images/emoji/apple/man_firefighter/5.png differ
diff --git a/public/images/emoji/apple/man_firefighter/6.png b/public/images/emoji/apple/man_firefighter/6.png
new file mode 100644
index 00000000000..767f788ad7b
Binary files /dev/null and b/public/images/emoji/apple/man_firefighter/6.png differ
diff --git a/public/images/emoji/apple/man_health_worker.png b/public/images/emoji/apple/man_health_worker.png
new file mode 100644
index 00000000000..34c3c1b819f
Binary files /dev/null and b/public/images/emoji/apple/man_health_worker.png differ
diff --git a/public/images/emoji/apple/man_health_worker/2.png b/public/images/emoji/apple/man_health_worker/2.png
new file mode 100644
index 00000000000..d2f8d9bd9a0
Binary files /dev/null and b/public/images/emoji/apple/man_health_worker/2.png differ
diff --git a/public/images/emoji/apple/man_health_worker/3.png b/public/images/emoji/apple/man_health_worker/3.png
new file mode 100644
index 00000000000..63ac74f7cb9
Binary files /dev/null and b/public/images/emoji/apple/man_health_worker/3.png differ
diff --git a/public/images/emoji/apple/man_health_worker/4.png b/public/images/emoji/apple/man_health_worker/4.png
new file mode 100644
index 00000000000..977149a3ee9
Binary files /dev/null and b/public/images/emoji/apple/man_health_worker/4.png differ
diff --git a/public/images/emoji/apple/man_health_worker/5.png b/public/images/emoji/apple/man_health_worker/5.png
new file mode 100644
index 00000000000..822639db0cc
Binary files /dev/null and b/public/images/emoji/apple/man_health_worker/5.png differ
diff --git a/public/images/emoji/apple/man_health_worker/6.png b/public/images/emoji/apple/man_health_worker/6.png
new file mode 100644
index 00000000000..0c92a8d57c8
Binary files /dev/null and b/public/images/emoji/apple/man_health_worker/6.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating.png b/public/images/emoji/apple/man_in_business_suit_levitating.png
index 7fe50e4a75c..00ae1282f1d 100644
Binary files a/public/images/emoji/apple/man_in_business_suit_levitating.png and b/public/images/emoji/apple/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/2.png b/public/images/emoji/apple/man_in_business_suit_levitating/2.png
new file mode 100644
index 00000000000..369be947839
Binary files /dev/null and b/public/images/emoji/apple/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/3.png b/public/images/emoji/apple/man_in_business_suit_levitating/3.png
new file mode 100644
index 00000000000..f81f47f2747
Binary files /dev/null and b/public/images/emoji/apple/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/4.png b/public/images/emoji/apple/man_in_business_suit_levitating/4.png
new file mode 100644
index 00000000000..b355778d9f6
Binary files /dev/null and b/public/images/emoji/apple/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/5.png b/public/images/emoji/apple/man_in_business_suit_levitating/5.png
new file mode 100644
index 00000000000..f348ca68e3a
Binary files /dev/null and b/public/images/emoji/apple/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/apple/man_in_business_suit_levitating/6.png b/public/images/emoji/apple/man_in_business_suit_levitating/6.png
new file mode 100644
index 00000000000..232f1c2dc26
Binary files /dev/null and b/public/images/emoji/apple/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo.png b/public/images/emoji/apple/man_in_tuxedo.png
new file mode 100644
index 00000000000..d26c5ab7485
Binary files /dev/null and b/public/images/emoji/apple/man_in_tuxedo.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/2.png b/public/images/emoji/apple/man_in_tuxedo/2.png
new file mode 100644
index 00000000000..e111b35e4b6
Binary files /dev/null and b/public/images/emoji/apple/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/3.png b/public/images/emoji/apple/man_in_tuxedo/3.png
new file mode 100644
index 00000000000..3f77f7170e7
Binary files /dev/null and b/public/images/emoji/apple/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/4.png b/public/images/emoji/apple/man_in_tuxedo/4.png
new file mode 100644
index 00000000000..b5f066bfc4a
Binary files /dev/null and b/public/images/emoji/apple/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/5.png b/public/images/emoji/apple/man_in_tuxedo/5.png
new file mode 100644
index 00000000000..0af5ba30e45
Binary files /dev/null and b/public/images/emoji/apple/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/apple/man_in_tuxedo/6.png b/public/images/emoji/apple/man_in_tuxedo/6.png
new file mode 100644
index 00000000000..d88356fae69
Binary files /dev/null and b/public/images/emoji/apple/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/apple/man_judge.png b/public/images/emoji/apple/man_judge.png
new file mode 100644
index 00000000000..28a239d66fd
Binary files /dev/null and b/public/images/emoji/apple/man_judge.png differ
diff --git a/public/images/emoji/apple/man_judge/2.png b/public/images/emoji/apple/man_judge/2.png
new file mode 100644
index 00000000000..ca388ecaaf9
Binary files /dev/null and b/public/images/emoji/apple/man_judge/2.png differ
diff --git a/public/images/emoji/apple/man_judge/3.png b/public/images/emoji/apple/man_judge/3.png
new file mode 100644
index 00000000000..5108fa862a5
Binary files /dev/null and b/public/images/emoji/apple/man_judge/3.png differ
diff --git a/public/images/emoji/apple/man_judge/4.png b/public/images/emoji/apple/man_judge/4.png
new file mode 100644
index 00000000000..ece8bf3bbee
Binary files /dev/null and b/public/images/emoji/apple/man_judge/4.png differ
diff --git a/public/images/emoji/apple/man_judge/5.png b/public/images/emoji/apple/man_judge/5.png
new file mode 100644
index 00000000000..2948e550524
Binary files /dev/null and b/public/images/emoji/apple/man_judge/5.png differ
diff --git a/public/images/emoji/apple/man_judge/6.png b/public/images/emoji/apple/man_judge/6.png
new file mode 100644
index 00000000000..1dcaa33a483
Binary files /dev/null and b/public/images/emoji/apple/man_judge/6.png differ
diff --git a/public/images/emoji/apple/man_juggling.png b/public/images/emoji/apple/man_juggling.png
new file mode 100644
index 00000000000..522e573120c
Binary files /dev/null and b/public/images/emoji/apple/man_juggling.png differ
diff --git a/public/images/emoji/apple/man_juggling/2.png b/public/images/emoji/apple/man_juggling/2.png
new file mode 100644
index 00000000000..c2c687f6c10
Binary files /dev/null and b/public/images/emoji/apple/man_juggling/2.png differ
diff --git a/public/images/emoji/apple/man_juggling/3.png b/public/images/emoji/apple/man_juggling/3.png
new file mode 100644
index 00000000000..feb24708d52
Binary files /dev/null and b/public/images/emoji/apple/man_juggling/3.png differ
diff --git a/public/images/emoji/apple/man_juggling/4.png b/public/images/emoji/apple/man_juggling/4.png
new file mode 100644
index 00000000000..2a414e5c389
Binary files /dev/null and b/public/images/emoji/apple/man_juggling/4.png differ
diff --git a/public/images/emoji/apple/man_juggling/5.png b/public/images/emoji/apple/man_juggling/5.png
new file mode 100644
index 00000000000..eb5d2b8d633
Binary files /dev/null and b/public/images/emoji/apple/man_juggling/5.png differ
diff --git a/public/images/emoji/apple/man_juggling/6.png b/public/images/emoji/apple/man_juggling/6.png
new file mode 100644
index 00000000000..cd2f51c6cde
Binary files /dev/null and b/public/images/emoji/apple/man_juggling/6.png differ
diff --git a/public/images/emoji/apple/man_mechanic.png b/public/images/emoji/apple/man_mechanic.png
new file mode 100644
index 00000000000..434741acd90
Binary files /dev/null and b/public/images/emoji/apple/man_mechanic.png differ
diff --git a/public/images/emoji/apple/man_mechanic/2.png b/public/images/emoji/apple/man_mechanic/2.png
new file mode 100644
index 00000000000..4bd7e9831a3
Binary files /dev/null and b/public/images/emoji/apple/man_mechanic/2.png differ
diff --git a/public/images/emoji/apple/man_mechanic/3.png b/public/images/emoji/apple/man_mechanic/3.png
new file mode 100644
index 00000000000..27efe79466d
Binary files /dev/null and b/public/images/emoji/apple/man_mechanic/3.png differ
diff --git a/public/images/emoji/apple/man_mechanic/4.png b/public/images/emoji/apple/man_mechanic/4.png
new file mode 100644
index 00000000000..8180cb61e1d
Binary files /dev/null and b/public/images/emoji/apple/man_mechanic/4.png differ
diff --git a/public/images/emoji/apple/man_mechanic/5.png b/public/images/emoji/apple/man_mechanic/5.png
new file mode 100644
index 00000000000..bddf8cd8aab
Binary files /dev/null and b/public/images/emoji/apple/man_mechanic/5.png differ
diff --git a/public/images/emoji/apple/man_mechanic/6.png b/public/images/emoji/apple/man_mechanic/6.png
new file mode 100644
index 00000000000..6524bc68928
Binary files /dev/null and b/public/images/emoji/apple/man_mechanic/6.png differ
diff --git a/public/images/emoji/apple/man_office_worker.png b/public/images/emoji/apple/man_office_worker.png
new file mode 100644
index 00000000000..f571c9515bb
Binary files /dev/null and b/public/images/emoji/apple/man_office_worker.png differ
diff --git a/public/images/emoji/apple/man_office_worker/2.png b/public/images/emoji/apple/man_office_worker/2.png
new file mode 100644
index 00000000000..35881b6c569
Binary files /dev/null and b/public/images/emoji/apple/man_office_worker/2.png differ
diff --git a/public/images/emoji/apple/man_office_worker/3.png b/public/images/emoji/apple/man_office_worker/3.png
new file mode 100644
index 00000000000..4b64ae8c6e5
Binary files /dev/null and b/public/images/emoji/apple/man_office_worker/3.png differ
diff --git a/public/images/emoji/apple/man_office_worker/4.png b/public/images/emoji/apple/man_office_worker/4.png
new file mode 100644
index 00000000000..c4a81e93684
Binary files /dev/null and b/public/images/emoji/apple/man_office_worker/4.png differ
diff --git a/public/images/emoji/apple/man_office_worker/5.png b/public/images/emoji/apple/man_office_worker/5.png
new file mode 100644
index 00000000000..84cc0fcf8bc
Binary files /dev/null and b/public/images/emoji/apple/man_office_worker/5.png differ
diff --git a/public/images/emoji/apple/man_office_worker/6.png b/public/images/emoji/apple/man_office_worker/6.png
new file mode 100644
index 00000000000..4b86047b612
Binary files /dev/null and b/public/images/emoji/apple/man_office_worker/6.png differ
diff --git a/public/images/emoji/apple/man_pilot.png b/public/images/emoji/apple/man_pilot.png
new file mode 100644
index 00000000000..9a64881605c
Binary files /dev/null and b/public/images/emoji/apple/man_pilot.png differ
diff --git a/public/images/emoji/apple/man_pilot/2.png b/public/images/emoji/apple/man_pilot/2.png
new file mode 100644
index 00000000000..14bdcec1ce5
Binary files /dev/null and b/public/images/emoji/apple/man_pilot/2.png differ
diff --git a/public/images/emoji/apple/man_pilot/3.png b/public/images/emoji/apple/man_pilot/3.png
new file mode 100644
index 00000000000..5966125a95c
Binary files /dev/null and b/public/images/emoji/apple/man_pilot/3.png differ
diff --git a/public/images/emoji/apple/man_pilot/4.png b/public/images/emoji/apple/man_pilot/4.png
new file mode 100644
index 00000000000..d49ed4ceccd
Binary files /dev/null and b/public/images/emoji/apple/man_pilot/4.png differ
diff --git a/public/images/emoji/apple/man_pilot/5.png b/public/images/emoji/apple/man_pilot/5.png
new file mode 100644
index 00000000000..0cc121d2840
Binary files /dev/null and b/public/images/emoji/apple/man_pilot/5.png differ
diff --git a/public/images/emoji/apple/man_pilot/6.png b/public/images/emoji/apple/man_pilot/6.png
new file mode 100644
index 00000000000..d0db4df14de
Binary files /dev/null and b/public/images/emoji/apple/man_pilot/6.png differ
diff --git a/public/images/emoji/apple/man_playing_handball.png b/public/images/emoji/apple/man_playing_handball.png
new file mode 100644
index 00000000000..05649552544
Binary files /dev/null and b/public/images/emoji/apple/man_playing_handball.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/2.png b/public/images/emoji/apple/man_playing_handball/2.png
new file mode 100644
index 00000000000..58c4200728f
Binary files /dev/null and b/public/images/emoji/apple/man_playing_handball/2.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/3.png b/public/images/emoji/apple/man_playing_handball/3.png
new file mode 100644
index 00000000000..b3dd093946e
Binary files /dev/null and b/public/images/emoji/apple/man_playing_handball/3.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/4.png b/public/images/emoji/apple/man_playing_handball/4.png
new file mode 100644
index 00000000000..04f2941f2ac
Binary files /dev/null and b/public/images/emoji/apple/man_playing_handball/4.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/5.png b/public/images/emoji/apple/man_playing_handball/5.png
new file mode 100644
index 00000000000..1b777197604
Binary files /dev/null and b/public/images/emoji/apple/man_playing_handball/5.png differ
diff --git a/public/images/emoji/apple/man_playing_handball/6.png b/public/images/emoji/apple/man_playing_handball/6.png
new file mode 100644
index 00000000000..596c061174c
Binary files /dev/null and b/public/images/emoji/apple/man_playing_handball/6.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo.png b/public/images/emoji/apple/man_playing_water_polo.png
new file mode 100644
index 00000000000..d7f9416a7c8
Binary files /dev/null and b/public/images/emoji/apple/man_playing_water_polo.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/2.png b/public/images/emoji/apple/man_playing_water_polo/2.png
new file mode 100644
index 00000000000..ea882c2467f
Binary files /dev/null and b/public/images/emoji/apple/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/3.png b/public/images/emoji/apple/man_playing_water_polo/3.png
new file mode 100644
index 00000000000..239daf01b4d
Binary files /dev/null and b/public/images/emoji/apple/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/4.png b/public/images/emoji/apple/man_playing_water_polo/4.png
new file mode 100644
index 00000000000..3c2cdc98443
Binary files /dev/null and b/public/images/emoji/apple/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/5.png b/public/images/emoji/apple/man_playing_water_polo/5.png
new file mode 100644
index 00000000000..2601d914492
Binary files /dev/null and b/public/images/emoji/apple/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/apple/man_playing_water_polo/6.png b/public/images/emoji/apple/man_playing_water_polo/6.png
new file mode 100644
index 00000000000..0fb0a970492
Binary files /dev/null and b/public/images/emoji/apple/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/apple/man_scientist.png b/public/images/emoji/apple/man_scientist.png
new file mode 100644
index 00000000000..bf534a9a095
Binary files /dev/null and b/public/images/emoji/apple/man_scientist.png differ
diff --git a/public/images/emoji/apple/man_scientist/2.png b/public/images/emoji/apple/man_scientist/2.png
new file mode 100644
index 00000000000..5d4a941e816
Binary files /dev/null and b/public/images/emoji/apple/man_scientist/2.png differ
diff --git a/public/images/emoji/apple/man_scientist/3.png b/public/images/emoji/apple/man_scientist/3.png
new file mode 100644
index 00000000000..75f2274b253
Binary files /dev/null and b/public/images/emoji/apple/man_scientist/3.png differ
diff --git a/public/images/emoji/apple/man_scientist/4.png b/public/images/emoji/apple/man_scientist/4.png
new file mode 100644
index 00000000000..dcc91d5323e
Binary files /dev/null and b/public/images/emoji/apple/man_scientist/4.png differ
diff --git a/public/images/emoji/apple/man_scientist/5.png b/public/images/emoji/apple/man_scientist/5.png
new file mode 100644
index 00000000000..eca94862e29
Binary files /dev/null and b/public/images/emoji/apple/man_scientist/5.png differ
diff --git a/public/images/emoji/apple/man_scientist/6.png b/public/images/emoji/apple/man_scientist/6.png
new file mode 100644
index 00000000000..17a37300550
Binary files /dev/null and b/public/images/emoji/apple/man_scientist/6.png differ
diff --git a/public/images/emoji/apple/man_shrugging.png b/public/images/emoji/apple/man_shrugging.png
new file mode 100644
index 00000000000..50739842d34
Binary files /dev/null and b/public/images/emoji/apple/man_shrugging.png differ
diff --git a/public/images/emoji/apple/man_shrugging/2.png b/public/images/emoji/apple/man_shrugging/2.png
new file mode 100644
index 00000000000..6c2939783ea
Binary files /dev/null and b/public/images/emoji/apple/man_shrugging/2.png differ
diff --git a/public/images/emoji/apple/man_shrugging/3.png b/public/images/emoji/apple/man_shrugging/3.png
new file mode 100644
index 00000000000..73e4357b305
Binary files /dev/null and b/public/images/emoji/apple/man_shrugging/3.png differ
diff --git a/public/images/emoji/apple/man_shrugging/4.png b/public/images/emoji/apple/man_shrugging/4.png
new file mode 100644
index 00000000000..1f05b6a518c
Binary files /dev/null and b/public/images/emoji/apple/man_shrugging/4.png differ
diff --git a/public/images/emoji/apple/man_shrugging/5.png b/public/images/emoji/apple/man_shrugging/5.png
new file mode 100644
index 00000000000..2ac60876814
Binary files /dev/null and b/public/images/emoji/apple/man_shrugging/5.png differ
diff --git a/public/images/emoji/apple/man_shrugging/6.png b/public/images/emoji/apple/man_shrugging/6.png
new file mode 100644
index 00000000000..c0f6f9b958e
Binary files /dev/null and b/public/images/emoji/apple/man_shrugging/6.png differ
diff --git a/public/images/emoji/apple/man_singer.png b/public/images/emoji/apple/man_singer.png
new file mode 100644
index 00000000000..7407d166f82
Binary files /dev/null and b/public/images/emoji/apple/man_singer.png differ
diff --git a/public/images/emoji/apple/man_singer/2.png b/public/images/emoji/apple/man_singer/2.png
new file mode 100644
index 00000000000..90b2dba0351
Binary files /dev/null and b/public/images/emoji/apple/man_singer/2.png differ
diff --git a/public/images/emoji/apple/man_singer/3.png b/public/images/emoji/apple/man_singer/3.png
new file mode 100644
index 00000000000..97d24670a27
Binary files /dev/null and b/public/images/emoji/apple/man_singer/3.png differ
diff --git a/public/images/emoji/apple/man_singer/4.png b/public/images/emoji/apple/man_singer/4.png
new file mode 100644
index 00000000000..1986fce0295
Binary files /dev/null and b/public/images/emoji/apple/man_singer/4.png differ
diff --git a/public/images/emoji/apple/man_singer/5.png b/public/images/emoji/apple/man_singer/5.png
new file mode 100644
index 00000000000..4135d1d783b
Binary files /dev/null and b/public/images/emoji/apple/man_singer/5.png differ
diff --git a/public/images/emoji/apple/man_singer/6.png b/public/images/emoji/apple/man_singer/6.png
new file mode 100644
index 00000000000..9477f2f0db7
Binary files /dev/null and b/public/images/emoji/apple/man_singer/6.png differ
diff --git a/public/images/emoji/apple/man_student.png b/public/images/emoji/apple/man_student.png
new file mode 100644
index 00000000000..6231cdce8bf
Binary files /dev/null and b/public/images/emoji/apple/man_student.png differ
diff --git a/public/images/emoji/apple/man_student/2.png b/public/images/emoji/apple/man_student/2.png
new file mode 100644
index 00000000000..7749120c386
Binary files /dev/null and b/public/images/emoji/apple/man_student/2.png differ
diff --git a/public/images/emoji/apple/man_student/3.png b/public/images/emoji/apple/man_student/3.png
new file mode 100644
index 00000000000..353f394418c
Binary files /dev/null and b/public/images/emoji/apple/man_student/3.png differ
diff --git a/public/images/emoji/apple/man_student/4.png b/public/images/emoji/apple/man_student/4.png
new file mode 100644
index 00000000000..e920689633b
Binary files /dev/null and b/public/images/emoji/apple/man_student/4.png differ
diff --git a/public/images/emoji/apple/man_student/5.png b/public/images/emoji/apple/man_student/5.png
new file mode 100644
index 00000000000..5586d6d5126
Binary files /dev/null and b/public/images/emoji/apple/man_student/5.png differ
diff --git a/public/images/emoji/apple/man_student/6.png b/public/images/emoji/apple/man_student/6.png
new file mode 100644
index 00000000000..f08a91b6be7
Binary files /dev/null and b/public/images/emoji/apple/man_student/6.png differ
diff --git a/public/images/emoji/apple/man_teacher.png b/public/images/emoji/apple/man_teacher.png
new file mode 100644
index 00000000000..d858b598e3f
Binary files /dev/null and b/public/images/emoji/apple/man_teacher.png differ
diff --git a/public/images/emoji/apple/man_teacher/2.png b/public/images/emoji/apple/man_teacher/2.png
new file mode 100644
index 00000000000..30ec2ec53f4
Binary files /dev/null and b/public/images/emoji/apple/man_teacher/2.png differ
diff --git a/public/images/emoji/apple/man_teacher/3.png b/public/images/emoji/apple/man_teacher/3.png
new file mode 100644
index 00000000000..de33ccd4712
Binary files /dev/null and b/public/images/emoji/apple/man_teacher/3.png differ
diff --git a/public/images/emoji/apple/man_teacher/4.png b/public/images/emoji/apple/man_teacher/4.png
new file mode 100644
index 00000000000..c7ffb9d2749
Binary files /dev/null and b/public/images/emoji/apple/man_teacher/4.png differ
diff --git a/public/images/emoji/apple/man_teacher/5.png b/public/images/emoji/apple/man_teacher/5.png
new file mode 100644
index 00000000000..d9ade329a28
Binary files /dev/null and b/public/images/emoji/apple/man_teacher/5.png differ
diff --git a/public/images/emoji/apple/man_teacher/6.png b/public/images/emoji/apple/man_teacher/6.png
new file mode 100644
index 00000000000..4f809387b09
Binary files /dev/null and b/public/images/emoji/apple/man_teacher/6.png differ
diff --git a/public/images/emoji/apple/man_technologist.png b/public/images/emoji/apple/man_technologist.png
new file mode 100644
index 00000000000..b33d84dcad5
Binary files /dev/null and b/public/images/emoji/apple/man_technologist.png differ
diff --git a/public/images/emoji/apple/man_technologist/2.png b/public/images/emoji/apple/man_technologist/2.png
new file mode 100644
index 00000000000..8465d27e43a
Binary files /dev/null and b/public/images/emoji/apple/man_technologist/2.png differ
diff --git a/public/images/emoji/apple/man_technologist/3.png b/public/images/emoji/apple/man_technologist/3.png
new file mode 100644
index 00000000000..1ee89fcdab9
Binary files /dev/null and b/public/images/emoji/apple/man_technologist/3.png differ
diff --git a/public/images/emoji/apple/man_technologist/4.png b/public/images/emoji/apple/man_technologist/4.png
new file mode 100644
index 00000000000..3efb91d3ec2
Binary files /dev/null and b/public/images/emoji/apple/man_technologist/4.png differ
diff --git a/public/images/emoji/apple/man_technologist/5.png b/public/images/emoji/apple/man_technologist/5.png
new file mode 100644
index 00000000000..c3c4b1326cb
Binary files /dev/null and b/public/images/emoji/apple/man_technologist/5.png differ
diff --git a/public/images/emoji/apple/man_technologist/6.png b/public/images/emoji/apple/man_technologist/6.png
new file mode 100644
index 00000000000..4a13c2317e7
Binary files /dev/null and b/public/images/emoji/apple/man_technologist/6.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao.png b/public/images/emoji/apple/man_with_gua_pi_mao.png
index bc30ea4714c..0cd4b17a9cc 100644
Binary files a/public/images/emoji/apple/man_with_gua_pi_mao.png and b/public/images/emoji/apple/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/2.png b/public/images/emoji/apple/man_with_gua_pi_mao/2.png
new file mode 100644
index 00000000000..893e4c62284
Binary files /dev/null and b/public/images/emoji/apple/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/3.png b/public/images/emoji/apple/man_with_gua_pi_mao/3.png
new file mode 100644
index 00000000000..1e39f76ff7b
Binary files /dev/null and b/public/images/emoji/apple/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/4.png b/public/images/emoji/apple/man_with_gua_pi_mao/4.png
new file mode 100644
index 00000000000..170f9805fba
Binary files /dev/null and b/public/images/emoji/apple/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/5.png b/public/images/emoji/apple/man_with_gua_pi_mao/5.png
new file mode 100644
index 00000000000..ab169544bf0
Binary files /dev/null and b/public/images/emoji/apple/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/apple/man_with_gua_pi_mao/6.png b/public/images/emoji/apple/man_with_gua_pi_mao/6.png
new file mode 100644
index 00000000000..3a5e157eaed
Binary files /dev/null and b/public/images/emoji/apple/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/apple/man_with_turban.png b/public/images/emoji/apple/man_with_turban.png
index 62b48e6061c..07906a0ee26 100644
Binary files a/public/images/emoji/apple/man_with_turban.png and b/public/images/emoji/apple/man_with_turban.png differ
diff --git a/public/images/emoji/apple/man_with_turban/2.png b/public/images/emoji/apple/man_with_turban/2.png
new file mode 100644
index 00000000000..ec579744b84
Binary files /dev/null and b/public/images/emoji/apple/man_with_turban/2.png differ
diff --git a/public/images/emoji/apple/man_with_turban/3.png b/public/images/emoji/apple/man_with_turban/3.png
new file mode 100644
index 00000000000..813f977ae63
Binary files /dev/null and b/public/images/emoji/apple/man_with_turban/3.png differ
diff --git a/public/images/emoji/apple/man_with_turban/4.png b/public/images/emoji/apple/man_with_turban/4.png
new file mode 100644
index 00000000000..53d8be863f4
Binary files /dev/null and b/public/images/emoji/apple/man_with_turban/4.png differ
diff --git a/public/images/emoji/apple/man_with_turban/5.png b/public/images/emoji/apple/man_with_turban/5.png
new file mode 100644
index 00000000000..d09a21950c6
Binary files /dev/null and b/public/images/emoji/apple/man_with_turban/5.png differ
diff --git a/public/images/emoji/apple/man_with_turban/6.png b/public/images/emoji/apple/man_with_turban/6.png
new file mode 100644
index 00000000000..8646fde5158
Binary files /dev/null and b/public/images/emoji/apple/man_with_turban/6.png differ
diff --git a/public/images/emoji/apple/mans_shoe.png b/public/images/emoji/apple/mans_shoe.png
index 8f85df3adbe..99ec342c85f 100644
Binary files a/public/images/emoji/apple/mans_shoe.png and b/public/images/emoji/apple/mans_shoe.png differ
diff --git a/public/images/emoji/apple/mantelpiece_clock.png b/public/images/emoji/apple/mantelpiece_clock.png
new file mode 100644
index 00000000000..bc63b3ffb2b
Binary files /dev/null and b/public/images/emoji/apple/mantelpiece_clock.png differ
diff --git a/public/images/emoji/apple/mantlepiece_clock.png b/public/images/emoji/apple/mantlepiece_clock.png
deleted file mode 100644
index be2924b47b7..00000000000
Binary files a/public/images/emoji/apple/mantlepiece_clock.png and /dev/null differ
diff --git a/public/images/emoji/apple/map.png b/public/images/emoji/apple/map.png
index aece6a65ed5..9cd3f7decfd 100644
Binary files a/public/images/emoji/apple/map.png and b/public/images/emoji/apple/map.png differ
diff --git a/public/images/emoji/apple/maple_leaf.png b/public/images/emoji/apple/maple_leaf.png
index 1f7e8a526bf..95be453edd5 100644
Binary files a/public/images/emoji/apple/maple_leaf.png and b/public/images/emoji/apple/maple_leaf.png differ
diff --git a/public/images/emoji/apple/marshall_islands.png b/public/images/emoji/apple/marshall_islands.png
new file mode 100644
index 00000000000..fd5931d3039
Binary files /dev/null and b/public/images/emoji/apple/marshall_islands.png differ
diff --git a/public/images/emoji/apple/martial_arts_uniform.png b/public/images/emoji/apple/martial_arts_uniform.png
new file mode 100644
index 00000000000..fef9e7243dd
Binary files /dev/null and b/public/images/emoji/apple/martial_arts_uniform.png differ
diff --git a/public/images/emoji/apple/martinique.png b/public/images/emoji/apple/martinique.png
new file mode 100644
index 00000000000..a0a6cfc7b67
Binary files /dev/null and b/public/images/emoji/apple/martinique.png differ
diff --git a/public/images/emoji/apple/massage/2.png b/public/images/emoji/apple/massage/2.png
new file mode 100644
index 00000000000..f94c4d1120b
Binary files /dev/null and b/public/images/emoji/apple/massage/2.png differ
diff --git a/public/images/emoji/apple/massage/3.png b/public/images/emoji/apple/massage/3.png
new file mode 100644
index 00000000000..df6b30ee779
Binary files /dev/null and b/public/images/emoji/apple/massage/3.png differ
diff --git a/public/images/emoji/apple/massage/4.png b/public/images/emoji/apple/massage/4.png
new file mode 100644
index 00000000000..54b33592cf5
Binary files /dev/null and b/public/images/emoji/apple/massage/4.png differ
diff --git a/public/images/emoji/apple/massage/5.png b/public/images/emoji/apple/massage/5.png
new file mode 100644
index 00000000000..8db521b992c
Binary files /dev/null and b/public/images/emoji/apple/massage/5.png differ
diff --git a/public/images/emoji/apple/massage/6.png b/public/images/emoji/apple/massage/6.png
new file mode 100644
index 00000000000..2e34703916b
Binary files /dev/null and b/public/images/emoji/apple/massage/6.png differ
diff --git a/public/images/emoji/apple/massage_man.png b/public/images/emoji/apple/massage_man.png
new file mode 100644
index 00000000000..95cc9b5a730
Binary files /dev/null and b/public/images/emoji/apple/massage_man.png differ
diff --git a/public/images/emoji/apple/massage_man/2.png b/public/images/emoji/apple/massage_man/2.png
new file mode 100644
index 00000000000..bf004f61b28
Binary files /dev/null and b/public/images/emoji/apple/massage_man/2.png differ
diff --git a/public/images/emoji/apple/massage_man/3.png b/public/images/emoji/apple/massage_man/3.png
new file mode 100644
index 00000000000..666232c3a78
Binary files /dev/null and b/public/images/emoji/apple/massage_man/3.png differ
diff --git a/public/images/emoji/apple/massage_man/4.png b/public/images/emoji/apple/massage_man/4.png
new file mode 100644
index 00000000000..a03d7b7af6b
Binary files /dev/null and b/public/images/emoji/apple/massage_man/4.png differ
diff --git a/public/images/emoji/apple/massage_man/5.png b/public/images/emoji/apple/massage_man/5.png
new file mode 100644
index 00000000000..8092a3dbb41
Binary files /dev/null and b/public/images/emoji/apple/massage_man/5.png differ
diff --git a/public/images/emoji/apple/massage_man/6.png b/public/images/emoji/apple/massage_man/6.png
new file mode 100644
index 00000000000..3913f8834a3
Binary files /dev/null and b/public/images/emoji/apple/massage_man/6.png differ
diff --git a/public/images/emoji/apple/massage_woman.png b/public/images/emoji/apple/massage_woman.png
new file mode 100644
index 00000000000..4f7540d4d94
Binary files /dev/null and b/public/images/emoji/apple/massage_woman.png differ
diff --git a/public/images/emoji/apple/massage_woman/2.png b/public/images/emoji/apple/massage_woman/2.png
new file mode 100644
index 00000000000..f94c4d1120b
Binary files /dev/null and b/public/images/emoji/apple/massage_woman/2.png differ
diff --git a/public/images/emoji/apple/massage_woman/3.png b/public/images/emoji/apple/massage_woman/3.png
new file mode 100644
index 00000000000..df6b30ee779
Binary files /dev/null and b/public/images/emoji/apple/massage_woman/3.png differ
diff --git a/public/images/emoji/apple/massage_woman/4.png b/public/images/emoji/apple/massage_woman/4.png
new file mode 100644
index 00000000000..54b33592cf5
Binary files /dev/null and b/public/images/emoji/apple/massage_woman/4.png differ
diff --git a/public/images/emoji/apple/massage_woman/5.png b/public/images/emoji/apple/massage_woman/5.png
new file mode 100644
index 00000000000..8db521b992c
Binary files /dev/null and b/public/images/emoji/apple/massage_woman/5.png differ
diff --git a/public/images/emoji/apple/massage_woman/6.png b/public/images/emoji/apple/massage_woman/6.png
new file mode 100644
index 00000000000..2e34703916b
Binary files /dev/null and b/public/images/emoji/apple/massage_woman/6.png differ
diff --git a/public/images/emoji/apple/mauritania.png b/public/images/emoji/apple/mauritania.png
new file mode 100644
index 00000000000..e65b5af0e9f
Binary files /dev/null and b/public/images/emoji/apple/mauritania.png differ
diff --git a/public/images/emoji/apple/mauritius.png b/public/images/emoji/apple/mauritius.png
new file mode 100644
index 00000000000..75cc6eebad2
Binary files /dev/null and b/public/images/emoji/apple/mauritius.png differ
diff --git a/public/images/emoji/apple/mayotte.png b/public/images/emoji/apple/mayotte.png
new file mode 100644
index 00000000000..cf20209f5ed
Binary files /dev/null and b/public/images/emoji/apple/mayotte.png differ
diff --git a/public/images/emoji/apple/meat_on_bone.png b/public/images/emoji/apple/meat_on_bone.png
index 2a0fdbfcb41..8de6f79bd82 100644
Binary files a/public/images/emoji/apple/meat_on_bone.png and b/public/images/emoji/apple/meat_on_bone.png differ
diff --git a/public/images/emoji/apple/medal.png b/public/images/emoji/apple/medal.png
index 37e6735eb0d..6e66f143863 100644
Binary files a/public/images/emoji/apple/medal.png and b/public/images/emoji/apple/medal.png differ
diff --git a/public/images/emoji/apple/medal_military.png b/public/images/emoji/apple/medal_military.png
new file mode 100644
index 00000000000..1e4a132d37b
Binary files /dev/null and b/public/images/emoji/apple/medal_military.png differ
diff --git a/public/images/emoji/apple/medal_sports.png b/public/images/emoji/apple/medal_sports.png
new file mode 100644
index 00000000000..6e66f143863
Binary files /dev/null and b/public/images/emoji/apple/medal_sports.png differ
diff --git a/public/images/emoji/apple/mega.png b/public/images/emoji/apple/mega.png
index 444cc08ab93..8b3ee6c2622 100644
Binary files a/public/images/emoji/apple/mega.png and b/public/images/emoji/apple/mega.png differ
diff --git a/public/images/emoji/apple/melon.png b/public/images/emoji/apple/melon.png
index dfdc4ca36f4..5006362d761 100644
Binary files a/public/images/emoji/apple/melon.png and b/public/images/emoji/apple/melon.png differ
diff --git a/public/images/emoji/apple/memo.png b/public/images/emoji/apple/memo.png
new file mode 100644
index 00000000000..b738536bdcd
Binary files /dev/null and b/public/images/emoji/apple/memo.png differ
diff --git a/public/images/emoji/apple/men_wrestling.png b/public/images/emoji/apple/men_wrestling.png
new file mode 100644
index 00000000000..178fd73c861
Binary files /dev/null and b/public/images/emoji/apple/men_wrestling.png differ
diff --git a/public/images/emoji/apple/menorah.png b/public/images/emoji/apple/menorah.png
index 216663e5d51..d6f382d0166 100644
Binary files a/public/images/emoji/apple/menorah.png and b/public/images/emoji/apple/menorah.png differ
diff --git a/public/images/emoji/apple/mens.png b/public/images/emoji/apple/mens.png
index ea73b976bb6..1fb3f77aefe 100644
Binary files a/public/images/emoji/apple/mens.png and b/public/images/emoji/apple/mens.png differ
diff --git a/public/images/emoji/apple/merperson.png b/public/images/emoji/apple/merperson.png
new file mode 100644
index 00000000000..ee1b999e0dd
Binary files /dev/null and b/public/images/emoji/apple/merperson.png differ
diff --git a/public/images/emoji/apple/merperson/2.png b/public/images/emoji/apple/merperson/2.png
new file mode 100644
index 00000000000..b97fbf42e35
Binary files /dev/null and b/public/images/emoji/apple/merperson/2.png differ
diff --git a/public/images/emoji/apple/merperson/3.png b/public/images/emoji/apple/merperson/3.png
new file mode 100644
index 00000000000..9079f60b81e
Binary files /dev/null and b/public/images/emoji/apple/merperson/3.png differ
diff --git a/public/images/emoji/apple/merperson/4.png b/public/images/emoji/apple/merperson/4.png
new file mode 100644
index 00000000000..decc0b58929
Binary files /dev/null and b/public/images/emoji/apple/merperson/4.png differ
diff --git a/public/images/emoji/apple/merperson/5.png b/public/images/emoji/apple/merperson/5.png
new file mode 100644
index 00000000000..e3e3e89cb16
Binary files /dev/null and b/public/images/emoji/apple/merperson/5.png differ
diff --git a/public/images/emoji/apple/merperson/6.png b/public/images/emoji/apple/merperson/6.png
new file mode 100644
index 00000000000..5a5f36684e5
Binary files /dev/null and b/public/images/emoji/apple/merperson/6.png differ
diff --git a/public/images/emoji/apple/metal/2.png b/public/images/emoji/apple/metal/2.png
new file mode 100644
index 00000000000..46006766aef
Binary files /dev/null and b/public/images/emoji/apple/metal/2.png differ
diff --git a/public/images/emoji/apple/metal/3.png b/public/images/emoji/apple/metal/3.png
new file mode 100644
index 00000000000..85aa93e844f
Binary files /dev/null and b/public/images/emoji/apple/metal/3.png differ
diff --git a/public/images/emoji/apple/metal/4.png b/public/images/emoji/apple/metal/4.png
new file mode 100644
index 00000000000..ff673252139
Binary files /dev/null and b/public/images/emoji/apple/metal/4.png differ
diff --git a/public/images/emoji/apple/metal/5.png b/public/images/emoji/apple/metal/5.png
new file mode 100644
index 00000000000..8f48f33a83c
Binary files /dev/null and b/public/images/emoji/apple/metal/5.png differ
diff --git a/public/images/emoji/apple/metal/6.png b/public/images/emoji/apple/metal/6.png
new file mode 100644
index 00000000000..beec4708b86
Binary files /dev/null and b/public/images/emoji/apple/metal/6.png differ
diff --git a/public/images/emoji/apple/metro.png b/public/images/emoji/apple/metro.png
index 8e55ed29ee2..885ed77882f 100644
Binary files a/public/images/emoji/apple/metro.png and b/public/images/emoji/apple/metro.png differ
diff --git a/public/images/emoji/apple/mexico.png b/public/images/emoji/apple/mexico.png
new file mode 100644
index 00000000000..6debb7f70d2
Binary files /dev/null and b/public/images/emoji/apple/mexico.png differ
diff --git a/public/images/emoji/apple/micronesia.png b/public/images/emoji/apple/micronesia.png
new file mode 100644
index 00000000000..7d6874acffb
Binary files /dev/null and b/public/images/emoji/apple/micronesia.png differ
diff --git a/public/images/emoji/apple/microphone.png b/public/images/emoji/apple/microphone.png
index 72ebc0c1883..22b067d365a 100644
Binary files a/public/images/emoji/apple/microphone.png and b/public/images/emoji/apple/microphone.png differ
diff --git a/public/images/emoji/apple/microphone2.png b/public/images/emoji/apple/microphone2.png
index 6d4db741c6a..6f6e1dc3c9a 100644
Binary files a/public/images/emoji/apple/microphone2.png and b/public/images/emoji/apple/microphone2.png differ
diff --git a/public/images/emoji/apple/microscope.png b/public/images/emoji/apple/microscope.png
index 17e2cf6fbb4..12f6aa3de18 100644
Binary files a/public/images/emoji/apple/microscope.png and b/public/images/emoji/apple/microscope.png differ
diff --git a/public/images/emoji/apple/middle_finger/2.png b/public/images/emoji/apple/middle_finger/2.png
new file mode 100644
index 00000000000..ce95c6a8be5
Binary files /dev/null and b/public/images/emoji/apple/middle_finger/2.png differ
diff --git a/public/images/emoji/apple/middle_finger/3.png b/public/images/emoji/apple/middle_finger/3.png
new file mode 100644
index 00000000000..33eec03fd41
Binary files /dev/null and b/public/images/emoji/apple/middle_finger/3.png differ
diff --git a/public/images/emoji/apple/middle_finger/4.png b/public/images/emoji/apple/middle_finger/4.png
new file mode 100644
index 00000000000..10487652927
Binary files /dev/null and b/public/images/emoji/apple/middle_finger/4.png differ
diff --git a/public/images/emoji/apple/middle_finger/5.png b/public/images/emoji/apple/middle_finger/5.png
new file mode 100644
index 00000000000..6f577d03de8
Binary files /dev/null and b/public/images/emoji/apple/middle_finger/5.png differ
diff --git a/public/images/emoji/apple/middle_finger/6.png b/public/images/emoji/apple/middle_finger/6.png
new file mode 100644
index 00000000000..58349f45b1f
Binary files /dev/null and b/public/images/emoji/apple/middle_finger/6.png differ
diff --git a/public/images/emoji/apple/military_medal.png b/public/images/emoji/apple/military_medal.png
index b140cc5fee5..1e4a132d37b 100644
Binary files a/public/images/emoji/apple/military_medal.png and b/public/images/emoji/apple/military_medal.png differ
diff --git a/public/images/emoji/apple/milk_glass.png b/public/images/emoji/apple/milk_glass.png
new file mode 100644
index 00000000000..29991a49a7f
Binary files /dev/null and b/public/images/emoji/apple/milk_glass.png differ
diff --git a/public/images/emoji/apple/milky_way.png b/public/images/emoji/apple/milky_way.png
index 00c04ef5e44..ecf711eb367 100644
Binary files a/public/images/emoji/apple/milky_way.png and b/public/images/emoji/apple/milky_way.png differ
diff --git a/public/images/emoji/apple/minibus.png b/public/images/emoji/apple/minibus.png
index 5700675f8e0..f0cabe3c80c 100644
Binary files a/public/images/emoji/apple/minibus.png and b/public/images/emoji/apple/minibus.png differ
diff --git a/public/images/emoji/apple/minidisc.png b/public/images/emoji/apple/minidisc.png
index 3e52f0eac68..b65d83439a2 100644
Binary files a/public/images/emoji/apple/minidisc.png and b/public/images/emoji/apple/minidisc.png differ
diff --git a/public/images/emoji/apple/mobile_phone_off.png b/public/images/emoji/apple/mobile_phone_off.png
index 0fcf9dd2474..7df7f6001f0 100644
Binary files a/public/images/emoji/apple/mobile_phone_off.png and b/public/images/emoji/apple/mobile_phone_off.png differ
diff --git a/public/images/emoji/apple/moldova.png b/public/images/emoji/apple/moldova.png
new file mode 100644
index 00000000000..caec098bd8b
Binary files /dev/null and b/public/images/emoji/apple/moldova.png differ
diff --git a/public/images/emoji/apple/monaco.png b/public/images/emoji/apple/monaco.png
new file mode 100644
index 00000000000..2ec6ee610e1
Binary files /dev/null and b/public/images/emoji/apple/monaco.png differ
diff --git a/public/images/emoji/apple/money_with_wings.png b/public/images/emoji/apple/money_with_wings.png
index c2de0194a61..44cabf40de0 100644
Binary files a/public/images/emoji/apple/money_with_wings.png and b/public/images/emoji/apple/money_with_wings.png differ
diff --git a/public/images/emoji/apple/moneybag.png b/public/images/emoji/apple/moneybag.png
index 93442799183..481d7239a12 100644
Binary files a/public/images/emoji/apple/moneybag.png and b/public/images/emoji/apple/moneybag.png differ
diff --git a/public/images/emoji/apple/mongolia.png b/public/images/emoji/apple/mongolia.png
new file mode 100644
index 00000000000..82021a2dca6
Binary files /dev/null and b/public/images/emoji/apple/mongolia.png differ
diff --git a/public/images/emoji/apple/monkey.png b/public/images/emoji/apple/monkey.png
index 8afb2490414..3d08e6ee9cf 100644
Binary files a/public/images/emoji/apple/monkey.png and b/public/images/emoji/apple/monkey.png differ
diff --git a/public/images/emoji/apple/monkey_face.png b/public/images/emoji/apple/monkey_face.png
index 4d4994e89e4..913047f7946 100644
Binary files a/public/images/emoji/apple/monkey_face.png and b/public/images/emoji/apple/monkey_face.png differ
diff --git a/public/images/emoji/apple/monorail.png b/public/images/emoji/apple/monorail.png
index 71fe001ba82..d62e6009333 100644
Binary files a/public/images/emoji/apple/monorail.png and b/public/images/emoji/apple/monorail.png differ
diff --git a/public/images/emoji/apple/montenegro.png b/public/images/emoji/apple/montenegro.png
new file mode 100644
index 00000000000..0aa72733ac2
Binary files /dev/null and b/public/images/emoji/apple/montenegro.png differ
diff --git a/public/images/emoji/apple/montserrat.png b/public/images/emoji/apple/montserrat.png
new file mode 100644
index 00000000000..6d3074592ab
Binary files /dev/null and b/public/images/emoji/apple/montserrat.png differ
diff --git a/public/images/emoji/apple/moon.png b/public/images/emoji/apple/moon.png
new file mode 100644
index 00000000000..482946e48d6
Binary files /dev/null and b/public/images/emoji/apple/moon.png differ
diff --git a/public/images/emoji/apple/morocco.png b/public/images/emoji/apple/morocco.png
new file mode 100644
index 00000000000..061d597cd6e
Binary files /dev/null and b/public/images/emoji/apple/morocco.png differ
diff --git a/public/images/emoji/apple/mortar_board.png b/public/images/emoji/apple/mortar_board.png
index 8579f647eb0..b75b4c2d954 100644
Binary files a/public/images/emoji/apple/mortar_board.png and b/public/images/emoji/apple/mortar_board.png differ
diff --git a/public/images/emoji/apple/mosque.png b/public/images/emoji/apple/mosque.png
index 1f97f70cadd..a6888cdada5 100644
Binary files a/public/images/emoji/apple/mosque.png and b/public/images/emoji/apple/mosque.png differ
diff --git a/public/images/emoji/apple/motor_boat.png b/public/images/emoji/apple/motor_boat.png
new file mode 100644
index 00000000000..1fe5602cc5f
Binary files /dev/null and b/public/images/emoji/apple/motor_boat.png differ
diff --git a/public/images/emoji/apple/motor_scooter.png b/public/images/emoji/apple/motor_scooter.png
new file mode 100644
index 00000000000..6f384bbc50b
Binary files /dev/null and b/public/images/emoji/apple/motor_scooter.png differ
diff --git a/public/images/emoji/apple/motorboat.png b/public/images/emoji/apple/motorboat.png
index 0fabc315abf..1fe5602cc5f 100644
Binary files a/public/images/emoji/apple/motorboat.png and b/public/images/emoji/apple/motorboat.png differ
diff --git a/public/images/emoji/apple/motorcycle.png b/public/images/emoji/apple/motorcycle.png
index 92aa5660f22..4ae8f0c685c 100644
Binary files a/public/images/emoji/apple/motorcycle.png and b/public/images/emoji/apple/motorcycle.png differ
diff --git a/public/images/emoji/apple/motorway.png b/public/images/emoji/apple/motorway.png
index fffb58bb5de..2f5cf97feb5 100644
Binary files a/public/images/emoji/apple/motorway.png and b/public/images/emoji/apple/motorway.png differ
diff --git a/public/images/emoji/apple/mount_fuji.png b/public/images/emoji/apple/mount_fuji.png
index baf8cb854a7..61beec0664a 100644
Binary files a/public/images/emoji/apple/mount_fuji.png and b/public/images/emoji/apple/mount_fuji.png differ
diff --git a/public/images/emoji/apple/mountain.png b/public/images/emoji/apple/mountain.png
index ca912ecb23c..5b85ecfeb67 100644
Binary files a/public/images/emoji/apple/mountain.png and b/public/images/emoji/apple/mountain.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/2.png b/public/images/emoji/apple/mountain_bicyclist/2.png
new file mode 100644
index 00000000000..8bc94cbd8f2
Binary files /dev/null and b/public/images/emoji/apple/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/3.png b/public/images/emoji/apple/mountain_bicyclist/3.png
new file mode 100644
index 00000000000..0d4f1dbea36
Binary files /dev/null and b/public/images/emoji/apple/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/4.png b/public/images/emoji/apple/mountain_bicyclist/4.png
new file mode 100644
index 00000000000..dbf96f05c58
Binary files /dev/null and b/public/images/emoji/apple/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/5.png b/public/images/emoji/apple/mountain_bicyclist/5.png
new file mode 100644
index 00000000000..23d9f6755cf
Binary files /dev/null and b/public/images/emoji/apple/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/apple/mountain_bicyclist/6.png b/public/images/emoji/apple/mountain_bicyclist/6.png
new file mode 100644
index 00000000000..aa1562b9622
Binary files /dev/null and b/public/images/emoji/apple/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man.png b/public/images/emoji/apple/mountain_biking_man.png
new file mode 100644
index 00000000000..456f84a0b43
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_man.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/2.png b/public/images/emoji/apple/mountain_biking_man/2.png
new file mode 100644
index 00000000000..8bc94cbd8f2
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/3.png b/public/images/emoji/apple/mountain_biking_man/3.png
new file mode 100644
index 00000000000..0d4f1dbea36
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/4.png b/public/images/emoji/apple/mountain_biking_man/4.png
new file mode 100644
index 00000000000..dbf96f05c58
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/5.png b/public/images/emoji/apple/mountain_biking_man/5.png
new file mode 100644
index 00000000000..23d9f6755cf
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/apple/mountain_biking_man/6.png b/public/images/emoji/apple/mountain_biking_man/6.png
new file mode 100644
index 00000000000..aa1562b9622
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman.png b/public/images/emoji/apple/mountain_biking_woman.png
new file mode 100644
index 00000000000..b7dca39da48
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_woman.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/2.png b/public/images/emoji/apple/mountain_biking_woman/2.png
new file mode 100644
index 00000000000..4af0a880462
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/3.png b/public/images/emoji/apple/mountain_biking_woman/3.png
new file mode 100644
index 00000000000..b2fc069d4f3
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/4.png b/public/images/emoji/apple/mountain_biking_woman/4.png
new file mode 100644
index 00000000000..9e6d50755af
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/5.png b/public/images/emoji/apple/mountain_biking_woman/5.png
new file mode 100644
index 00000000000..647dbae6118
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/apple/mountain_biking_woman/6.png b/public/images/emoji/apple/mountain_biking_woman/6.png
new file mode 100644
index 00000000000..6f60da7a843
Binary files /dev/null and b/public/images/emoji/apple/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/apple/mountain_cableway.png b/public/images/emoji/apple/mountain_cableway.png
index 175b9634ecc..82ac6f30e25 100644
Binary files a/public/images/emoji/apple/mountain_cableway.png and b/public/images/emoji/apple/mountain_cableway.png differ
diff --git a/public/images/emoji/apple/mountain_railway.png b/public/images/emoji/apple/mountain_railway.png
index 4dafd95718e..98b481d1410 100644
Binary files a/public/images/emoji/apple/mountain_railway.png and b/public/images/emoji/apple/mountain_railway.png differ
diff --git a/public/images/emoji/apple/mountain_snow.png b/public/images/emoji/apple/mountain_snow.png
index 12868300079..0be1ad5feea 100644
Binary files a/public/images/emoji/apple/mountain_snow.png and b/public/images/emoji/apple/mountain_snow.png differ
diff --git a/public/images/emoji/apple/mouse.png b/public/images/emoji/apple/mouse.png
index be157f8d872..7807bd36f15 100644
Binary files a/public/images/emoji/apple/mouse.png and b/public/images/emoji/apple/mouse.png differ
diff --git a/public/images/emoji/apple/mouse2.png b/public/images/emoji/apple/mouse2.png
index 0c70ae6184a..bf321dee2e2 100644
Binary files a/public/images/emoji/apple/mouse2.png and b/public/images/emoji/apple/mouse2.png differ
diff --git a/public/images/emoji/apple/mouse_three_button.png b/public/images/emoji/apple/mouse_three_button.png
index eb88c6c7686..3899171edc6 100644
Binary files a/public/images/emoji/apple/mouse_three_button.png and b/public/images/emoji/apple/mouse_three_button.png differ
diff --git a/public/images/emoji/apple/movie_camera.png b/public/images/emoji/apple/movie_camera.png
index 2deca94a1cf..56bd4903595 100644
Binary files a/public/images/emoji/apple/movie_camera.png and b/public/images/emoji/apple/movie_camera.png differ
diff --git a/public/images/emoji/apple/moyai.png b/public/images/emoji/apple/moyai.png
index 4650a851ef7..7964d5a3565 100644
Binary files a/public/images/emoji/apple/moyai.png and b/public/images/emoji/apple/moyai.png differ
diff --git a/public/images/emoji/apple/mozambique.png b/public/images/emoji/apple/mozambique.png
new file mode 100644
index 00000000000..7648e580910
Binary files /dev/null and b/public/images/emoji/apple/mozambique.png differ
diff --git a/public/images/emoji/apple/mrs_claus.png b/public/images/emoji/apple/mrs_claus.png
new file mode 100644
index 00000000000..3b97123426a
Binary files /dev/null and b/public/images/emoji/apple/mrs_claus.png differ
diff --git a/public/images/emoji/apple/mrs_claus/2.png b/public/images/emoji/apple/mrs_claus/2.png
new file mode 100644
index 00000000000..759284bbd41
Binary files /dev/null and b/public/images/emoji/apple/mrs_claus/2.png differ
diff --git a/public/images/emoji/apple/mrs_claus/3.png b/public/images/emoji/apple/mrs_claus/3.png
new file mode 100644
index 00000000000..1b12a39f4ee
Binary files /dev/null and b/public/images/emoji/apple/mrs_claus/3.png differ
diff --git a/public/images/emoji/apple/mrs_claus/4.png b/public/images/emoji/apple/mrs_claus/4.png
new file mode 100644
index 00000000000..3d1504ec6a9
Binary files /dev/null and b/public/images/emoji/apple/mrs_claus/4.png differ
diff --git a/public/images/emoji/apple/mrs_claus/5.png b/public/images/emoji/apple/mrs_claus/5.png
new file mode 100644
index 00000000000..f770e3863eb
Binary files /dev/null and b/public/images/emoji/apple/mrs_claus/5.png differ
diff --git a/public/images/emoji/apple/mrs_claus/6.png b/public/images/emoji/apple/mrs_claus/6.png
new file mode 100644
index 00000000000..2df5811c706
Binary files /dev/null and b/public/images/emoji/apple/mrs_claus/6.png differ
diff --git a/public/images/emoji/apple/muscle/2.png b/public/images/emoji/apple/muscle/2.png
new file mode 100644
index 00000000000..190d6928604
Binary files /dev/null and b/public/images/emoji/apple/muscle/2.png differ
diff --git a/public/images/emoji/apple/muscle/3.png b/public/images/emoji/apple/muscle/3.png
new file mode 100644
index 00000000000..e706e319e64
Binary files /dev/null and b/public/images/emoji/apple/muscle/3.png differ
diff --git a/public/images/emoji/apple/muscle/4.png b/public/images/emoji/apple/muscle/4.png
new file mode 100644
index 00000000000..d2b75ec1991
Binary files /dev/null and b/public/images/emoji/apple/muscle/4.png differ
diff --git a/public/images/emoji/apple/muscle/5.png b/public/images/emoji/apple/muscle/5.png
new file mode 100644
index 00000000000..ca8614dafdd
Binary files /dev/null and b/public/images/emoji/apple/muscle/5.png differ
diff --git a/public/images/emoji/apple/muscle/6.png b/public/images/emoji/apple/muscle/6.png
new file mode 100644
index 00000000000..156c4dbb0cb
Binary files /dev/null and b/public/images/emoji/apple/muscle/6.png differ
diff --git a/public/images/emoji/apple/mushroom.png b/public/images/emoji/apple/mushroom.png
index 74b829bd0df..3b3c88bbb29 100644
Binary files a/public/images/emoji/apple/mushroom.png and b/public/images/emoji/apple/mushroom.png differ
diff --git a/public/images/emoji/apple/musical_keyboard.png b/public/images/emoji/apple/musical_keyboard.png
index e715020006e..b9fcadf652b 100644
Binary files a/public/images/emoji/apple/musical_keyboard.png and b/public/images/emoji/apple/musical_keyboard.png differ
diff --git a/public/images/emoji/apple/musical_note.png b/public/images/emoji/apple/musical_note.png
index 7831d676148..c5ea389e5eb 100644
Binary files a/public/images/emoji/apple/musical_note.png and b/public/images/emoji/apple/musical_note.png differ
diff --git a/public/images/emoji/apple/musical_score.png b/public/images/emoji/apple/musical_score.png
index c8fa0f605be..dd9eec6b83e 100644
Binary files a/public/images/emoji/apple/musical_score.png and b/public/images/emoji/apple/musical_score.png differ
diff --git a/public/images/emoji/apple/mute.png b/public/images/emoji/apple/mute.png
index b193cd3ff69..05ae12c7a84 100644
Binary files a/public/images/emoji/apple/mute.png and b/public/images/emoji/apple/mute.png differ
diff --git a/public/images/emoji/apple/myanmar.png b/public/images/emoji/apple/myanmar.png
new file mode 100644
index 00000000000..147b7b0e4e0
Binary files /dev/null and b/public/images/emoji/apple/myanmar.png differ
diff --git a/public/images/emoji/apple/nail_care/2.png b/public/images/emoji/apple/nail_care/2.png
new file mode 100644
index 00000000000..509d805eb83
Binary files /dev/null and b/public/images/emoji/apple/nail_care/2.png differ
diff --git a/public/images/emoji/apple/nail_care/3.png b/public/images/emoji/apple/nail_care/3.png
new file mode 100644
index 00000000000..42285ce1325
Binary files /dev/null and b/public/images/emoji/apple/nail_care/3.png differ
diff --git a/public/images/emoji/apple/nail_care/4.png b/public/images/emoji/apple/nail_care/4.png
new file mode 100644
index 00000000000..c0d5cce984b
Binary files /dev/null and b/public/images/emoji/apple/nail_care/4.png differ
diff --git a/public/images/emoji/apple/nail_care/5.png b/public/images/emoji/apple/nail_care/5.png
new file mode 100644
index 00000000000..9bd1a2437e4
Binary files /dev/null and b/public/images/emoji/apple/nail_care/5.png differ
diff --git a/public/images/emoji/apple/nail_care/6.png b/public/images/emoji/apple/nail_care/6.png
new file mode 100644
index 00000000000..f7d3b381279
Binary files /dev/null and b/public/images/emoji/apple/nail_care/6.png differ
diff --git a/public/images/emoji/apple/name_badge.png b/public/images/emoji/apple/name_badge.png
index a4cf547e51b..1020a8381cf 100644
Binary files a/public/images/emoji/apple/name_badge.png and b/public/images/emoji/apple/name_badge.png differ
diff --git a/public/images/emoji/apple/namibia.png b/public/images/emoji/apple/namibia.png
new file mode 100644
index 00000000000..46327a29ba7
Binary files /dev/null and b/public/images/emoji/apple/namibia.png differ
diff --git a/public/images/emoji/apple/national_park.png b/public/images/emoji/apple/national_park.png
index 5682fd24789..902d5ec8ea5 100644
Binary files a/public/images/emoji/apple/national_park.png and b/public/images/emoji/apple/national_park.png differ
diff --git a/public/images/emoji/apple/nauru.png b/public/images/emoji/apple/nauru.png
new file mode 100644
index 00000000000..58e819dfc7f
Binary files /dev/null and b/public/images/emoji/apple/nauru.png differ
diff --git a/public/images/emoji/apple/nauseated_face.png b/public/images/emoji/apple/nauseated_face.png
new file mode 100644
index 00000000000..6b2889b71a0
Binary files /dev/null and b/public/images/emoji/apple/nauseated_face.png differ
diff --git a/public/images/emoji/apple/necktie.png b/public/images/emoji/apple/necktie.png
index 9dd564c5fcc..41b1cc08f70 100644
Binary files a/public/images/emoji/apple/necktie.png and b/public/images/emoji/apple/necktie.png differ
diff --git a/public/images/emoji/apple/negative_squared_cross_mark.png b/public/images/emoji/apple/negative_squared_cross_mark.png
index 3cb70e15dcc..4e6039bdd27 100644
Binary files a/public/images/emoji/apple/negative_squared_cross_mark.png and b/public/images/emoji/apple/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/apple/nepal.png b/public/images/emoji/apple/nepal.png
new file mode 100644
index 00000000000..358ea54522b
Binary files /dev/null and b/public/images/emoji/apple/nepal.png differ
diff --git a/public/images/emoji/apple/netherlands.png b/public/images/emoji/apple/netherlands.png
new file mode 100644
index 00000000000..5848433e274
Binary files /dev/null and b/public/images/emoji/apple/netherlands.png differ
diff --git a/public/images/emoji/apple/new.png b/public/images/emoji/apple/new.png
index 731a27fd271..1d386399fe8 100644
Binary files a/public/images/emoji/apple/new.png and b/public/images/emoji/apple/new.png differ
diff --git a/public/images/emoji/apple/new_caledonia.png b/public/images/emoji/apple/new_caledonia.png
new file mode 100644
index 00000000000..f9a1087cb3d
Binary files /dev/null and b/public/images/emoji/apple/new_caledonia.png differ
diff --git a/public/images/emoji/apple/new_moon.png b/public/images/emoji/apple/new_moon.png
index c234c62b1ba..482946e48d6 100644
Binary files a/public/images/emoji/apple/new_moon.png and b/public/images/emoji/apple/new_moon.png differ
diff --git a/public/images/emoji/apple/new_moon_with_face.png b/public/images/emoji/apple/new_moon_with_face.png
index 7a441b21e09..006c6791d74 100644
Binary files a/public/images/emoji/apple/new_moon_with_face.png and b/public/images/emoji/apple/new_moon_with_face.png differ
diff --git a/public/images/emoji/apple/new_zealand.png b/public/images/emoji/apple/new_zealand.png
new file mode 100644
index 00000000000..bbf96fc33f9
Binary files /dev/null and b/public/images/emoji/apple/new_zealand.png differ
diff --git a/public/images/emoji/apple/newspaper.png b/public/images/emoji/apple/newspaper.png
index 23ead9b16c8..c05c0ede5b7 100644
Binary files a/public/images/emoji/apple/newspaper.png and b/public/images/emoji/apple/newspaper.png differ
diff --git a/public/images/emoji/apple/newspaper2.png b/public/images/emoji/apple/newspaper2.png
index 9a619ecbcb4..400b0805699 100644
Binary files a/public/images/emoji/apple/newspaper2.png and b/public/images/emoji/apple/newspaper2.png differ
diff --git a/public/images/emoji/apple/newspaper_roll.png b/public/images/emoji/apple/newspaper_roll.png
new file mode 100644
index 00000000000..400b0805699
Binary files /dev/null and b/public/images/emoji/apple/newspaper_roll.png differ
diff --git a/public/images/emoji/apple/next_track.png b/public/images/emoji/apple/next_track.png
index 2ff96903d1f..c6c645c86db 100644
Binary files a/public/images/emoji/apple/next_track.png and b/public/images/emoji/apple/next_track.png differ
diff --git a/public/images/emoji/apple/next_track_button.png b/public/images/emoji/apple/next_track_button.png
new file mode 100644
index 00000000000..c6c645c86db
Binary files /dev/null and b/public/images/emoji/apple/next_track_button.png differ
diff --git a/public/images/emoji/apple/ng.png b/public/images/emoji/apple/ng.png
index 73bdc4b6a3a..d28ce65270c 100644
Binary files a/public/images/emoji/apple/ng.png and b/public/images/emoji/apple/ng.png differ
diff --git a/public/images/emoji/apple/nicaragua.png b/public/images/emoji/apple/nicaragua.png
new file mode 100644
index 00000000000..f99f1916362
Binary files /dev/null and b/public/images/emoji/apple/nicaragua.png differ
diff --git a/public/images/emoji/apple/niger.png b/public/images/emoji/apple/niger.png
new file mode 100644
index 00000000000..2d5530dd621
Binary files /dev/null and b/public/images/emoji/apple/niger.png differ
diff --git a/public/images/emoji/apple/nigeria.png b/public/images/emoji/apple/nigeria.png
new file mode 100644
index 00000000000..1bbfb8e586b
Binary files /dev/null and b/public/images/emoji/apple/nigeria.png differ
diff --git a/public/images/emoji/apple/night_with_stars.png b/public/images/emoji/apple/night_with_stars.png
index b43d978d38b..ee92a63cee4 100644
Binary files a/public/images/emoji/apple/night_with_stars.png and b/public/images/emoji/apple/night_with_stars.png differ
diff --git a/public/images/emoji/apple/nine.png b/public/images/emoji/apple/nine.png
index 52c6c63dcf0..f68cbedc51c 100644
Binary files a/public/images/emoji/apple/nine.png and b/public/images/emoji/apple/nine.png differ
diff --git a/public/images/emoji/apple/niue.png b/public/images/emoji/apple/niue.png
new file mode 100644
index 00000000000..15f12b061c7
Binary files /dev/null and b/public/images/emoji/apple/niue.png differ
diff --git a/public/images/emoji/apple/no_bell.png b/public/images/emoji/apple/no_bell.png
index 4214a624a64..7f6f2283e2d 100644
Binary files a/public/images/emoji/apple/no_bell.png and b/public/images/emoji/apple/no_bell.png differ
diff --git a/public/images/emoji/apple/no_bicycles.png b/public/images/emoji/apple/no_bicycles.png
index d03144b9846..877ad857c1d 100644
Binary files a/public/images/emoji/apple/no_bicycles.png and b/public/images/emoji/apple/no_bicycles.png differ
diff --git a/public/images/emoji/apple/no_entry.png b/public/images/emoji/apple/no_entry.png
index 8f203fa994c..2190e5290fa 100644
Binary files a/public/images/emoji/apple/no_entry.png and b/public/images/emoji/apple/no_entry.png differ
diff --git a/public/images/emoji/apple/no_entry_sign.png b/public/images/emoji/apple/no_entry_sign.png
index 444e9dbc450..d22e5eef382 100644
Binary files a/public/images/emoji/apple/no_entry_sign.png and b/public/images/emoji/apple/no_entry_sign.png differ
diff --git a/public/images/emoji/apple/no_good/2.png b/public/images/emoji/apple/no_good/2.png
new file mode 100644
index 00000000000..1fba8c40e4d
Binary files /dev/null and b/public/images/emoji/apple/no_good/2.png differ
diff --git a/public/images/emoji/apple/no_good/3.png b/public/images/emoji/apple/no_good/3.png
new file mode 100644
index 00000000000..d533bd34fa8
Binary files /dev/null and b/public/images/emoji/apple/no_good/3.png differ
diff --git a/public/images/emoji/apple/no_good/4.png b/public/images/emoji/apple/no_good/4.png
new file mode 100644
index 00000000000..55ca1de6554
Binary files /dev/null and b/public/images/emoji/apple/no_good/4.png differ
diff --git a/public/images/emoji/apple/no_good/5.png b/public/images/emoji/apple/no_good/5.png
new file mode 100644
index 00000000000..df889c3d3b2
Binary files /dev/null and b/public/images/emoji/apple/no_good/5.png differ
diff --git a/public/images/emoji/apple/no_good/6.png b/public/images/emoji/apple/no_good/6.png
new file mode 100644
index 00000000000..198d8d0828d
Binary files /dev/null and b/public/images/emoji/apple/no_good/6.png differ
diff --git a/public/images/emoji/apple/no_good_man.png b/public/images/emoji/apple/no_good_man.png
new file mode 100644
index 00000000000..c7e959db49a
Binary files /dev/null and b/public/images/emoji/apple/no_good_man.png differ
diff --git a/public/images/emoji/apple/no_good_man/2.png b/public/images/emoji/apple/no_good_man/2.png
new file mode 100644
index 00000000000..07de44c9167
Binary files /dev/null and b/public/images/emoji/apple/no_good_man/2.png differ
diff --git a/public/images/emoji/apple/no_good_man/3.png b/public/images/emoji/apple/no_good_man/3.png
new file mode 100644
index 00000000000..7194eba931e
Binary files /dev/null and b/public/images/emoji/apple/no_good_man/3.png differ
diff --git a/public/images/emoji/apple/no_good_man/4.png b/public/images/emoji/apple/no_good_man/4.png
new file mode 100644
index 00000000000..9ba6bbb3a76
Binary files /dev/null and b/public/images/emoji/apple/no_good_man/4.png differ
diff --git a/public/images/emoji/apple/no_good_man/5.png b/public/images/emoji/apple/no_good_man/5.png
new file mode 100644
index 00000000000..88b59851566
Binary files /dev/null and b/public/images/emoji/apple/no_good_man/5.png differ
diff --git a/public/images/emoji/apple/no_good_man/6.png b/public/images/emoji/apple/no_good_man/6.png
new file mode 100644
index 00000000000..235c3371e85
Binary files /dev/null and b/public/images/emoji/apple/no_good_man/6.png differ
diff --git a/public/images/emoji/apple/no_good_woman.png b/public/images/emoji/apple/no_good_woman.png
new file mode 100644
index 00000000000..429fc1ba92e
Binary files /dev/null and b/public/images/emoji/apple/no_good_woman.png differ
diff --git a/public/images/emoji/apple/no_good_woman/2.png b/public/images/emoji/apple/no_good_woman/2.png
new file mode 100644
index 00000000000..1fba8c40e4d
Binary files /dev/null and b/public/images/emoji/apple/no_good_woman/2.png differ
diff --git a/public/images/emoji/apple/no_good_woman/3.png b/public/images/emoji/apple/no_good_woman/3.png
new file mode 100644
index 00000000000..d533bd34fa8
Binary files /dev/null and b/public/images/emoji/apple/no_good_woman/3.png differ
diff --git a/public/images/emoji/apple/no_good_woman/4.png b/public/images/emoji/apple/no_good_woman/4.png
new file mode 100644
index 00000000000..55ca1de6554
Binary files /dev/null and b/public/images/emoji/apple/no_good_woman/4.png differ
diff --git a/public/images/emoji/apple/no_good_woman/5.png b/public/images/emoji/apple/no_good_woman/5.png
new file mode 100644
index 00000000000..df889c3d3b2
Binary files /dev/null and b/public/images/emoji/apple/no_good_woman/5.png differ
diff --git a/public/images/emoji/apple/no_good_woman/6.png b/public/images/emoji/apple/no_good_woman/6.png
new file mode 100644
index 00000000000..198d8d0828d
Binary files /dev/null and b/public/images/emoji/apple/no_good_woman/6.png differ
diff --git a/public/images/emoji/apple/no_mobile_phones.png b/public/images/emoji/apple/no_mobile_phones.png
index bbe746be745..c11b08bc2bc 100644
Binary files a/public/images/emoji/apple/no_mobile_phones.png and b/public/images/emoji/apple/no_mobile_phones.png differ
diff --git a/public/images/emoji/apple/no_pedestrians.png b/public/images/emoji/apple/no_pedestrians.png
index 49bf267fc39..c4fcc420ad6 100644
Binary files a/public/images/emoji/apple/no_pedestrians.png and b/public/images/emoji/apple/no_pedestrians.png differ
diff --git a/public/images/emoji/apple/no_smoking.png b/public/images/emoji/apple/no_smoking.png
index 376ee29d8ba..b16caf6a8b4 100644
Binary files a/public/images/emoji/apple/no_smoking.png and b/public/images/emoji/apple/no_smoking.png differ
diff --git a/public/images/emoji/apple/non-potable_water.png b/public/images/emoji/apple/non-potable_water.png
index 2c94556f0f1..425a8c6eefb 100644
Binary files a/public/images/emoji/apple/non-potable_water.png and b/public/images/emoji/apple/non-potable_water.png differ
diff --git a/public/images/emoji/apple/norfolk_island.png b/public/images/emoji/apple/norfolk_island.png
new file mode 100644
index 00000000000..04a9904c8bf
Binary files /dev/null and b/public/images/emoji/apple/norfolk_island.png differ
diff --git a/public/images/emoji/apple/north_korea.png b/public/images/emoji/apple/north_korea.png
new file mode 100644
index 00000000000..8b74a9f83c3
Binary files /dev/null and b/public/images/emoji/apple/north_korea.png differ
diff --git a/public/images/emoji/apple/northern_mariana_islands.png b/public/images/emoji/apple/northern_mariana_islands.png
new file mode 100644
index 00000000000..bcfc406dd57
Binary files /dev/null and b/public/images/emoji/apple/northern_mariana_islands.png differ
diff --git a/public/images/emoji/apple/norway.png b/public/images/emoji/apple/norway.png
new file mode 100644
index 00000000000..5827a3d3767
Binary files /dev/null and b/public/images/emoji/apple/norway.png differ
diff --git a/public/images/emoji/apple/nose.png b/public/images/emoji/apple/nose.png
index f6a9b9e875b..5489cc0bb50 100644
Binary files a/public/images/emoji/apple/nose.png and b/public/images/emoji/apple/nose.png differ
diff --git a/public/images/emoji/apple/nose/2.png b/public/images/emoji/apple/nose/2.png
new file mode 100644
index 00000000000..5029910fe7d
Binary files /dev/null and b/public/images/emoji/apple/nose/2.png differ
diff --git a/public/images/emoji/apple/nose/3.png b/public/images/emoji/apple/nose/3.png
new file mode 100644
index 00000000000..84406ef4800
Binary files /dev/null and b/public/images/emoji/apple/nose/3.png differ
diff --git a/public/images/emoji/apple/nose/4.png b/public/images/emoji/apple/nose/4.png
new file mode 100644
index 00000000000..8c3d71db4a8
Binary files /dev/null and b/public/images/emoji/apple/nose/4.png differ
diff --git a/public/images/emoji/apple/nose/5.png b/public/images/emoji/apple/nose/5.png
new file mode 100644
index 00000000000..e1ed779ae6e
Binary files /dev/null and b/public/images/emoji/apple/nose/5.png differ
diff --git a/public/images/emoji/apple/nose/6.png b/public/images/emoji/apple/nose/6.png
new file mode 100644
index 00000000000..59fb8938e2a
Binary files /dev/null and b/public/images/emoji/apple/nose/6.png differ
diff --git a/public/images/emoji/apple/notebook.png b/public/images/emoji/apple/notebook.png
index 278dfdc74a9..974f211892f 100644
Binary files a/public/images/emoji/apple/notebook.png and b/public/images/emoji/apple/notebook.png differ
diff --git a/public/images/emoji/apple/notebook_with_decorative_cover.png b/public/images/emoji/apple/notebook_with_decorative_cover.png
index 40d2f08314e..9bdbe23bb4a 100644
Binary files a/public/images/emoji/apple/notebook_with_decorative_cover.png and b/public/images/emoji/apple/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/apple/notepad_spiral.png b/public/images/emoji/apple/notepad_spiral.png
index 6ea74f2e253..5e4c3a2d0e2 100644
Binary files a/public/images/emoji/apple/notepad_spiral.png and b/public/images/emoji/apple/notepad_spiral.png differ
diff --git a/public/images/emoji/apple/notes.png b/public/images/emoji/apple/notes.png
index 8f59e0c515e..284f7eebbd3 100644
Binary files a/public/images/emoji/apple/notes.png and b/public/images/emoji/apple/notes.png differ
diff --git a/public/images/emoji/apple/nut_and_bolt.png b/public/images/emoji/apple/nut_and_bolt.png
index 2d6ec571f3d..1890dc87bc2 100644
Binary files a/public/images/emoji/apple/nut_and_bolt.png and b/public/images/emoji/apple/nut_and_bolt.png differ
diff --git a/public/images/emoji/apple/o.png b/public/images/emoji/apple/o.png
index dab70a8d3ed..fa8b79521d0 100644
Binary files a/public/images/emoji/apple/o.png and b/public/images/emoji/apple/o.png differ
diff --git a/public/images/emoji/apple/o2.png b/public/images/emoji/apple/o2.png
index 1f2aa424b33..5a11ac81c59 100644
Binary files a/public/images/emoji/apple/o2.png and b/public/images/emoji/apple/o2.png differ
diff --git a/public/images/emoji/apple/ocean.png b/public/images/emoji/apple/ocean.png
index c29f77bcdd7..a619c11c488 100644
Binary files a/public/images/emoji/apple/ocean.png and b/public/images/emoji/apple/ocean.png differ
diff --git a/public/images/emoji/apple/octopus.png b/public/images/emoji/apple/octopus.png
index 4f693f53382..1e40b5892df 100644
Binary files a/public/images/emoji/apple/octopus.png and b/public/images/emoji/apple/octopus.png differ
diff --git a/public/images/emoji/apple/oden.png b/public/images/emoji/apple/oden.png
index 7c73e931b7d..78979edcbbc 100644
Binary files a/public/images/emoji/apple/oden.png and b/public/images/emoji/apple/oden.png differ
diff --git a/public/images/emoji/apple/office.png b/public/images/emoji/apple/office.png
index e68c049d295..6fb5b10e9a8 100644
Binary files a/public/images/emoji/apple/office.png and b/public/images/emoji/apple/office.png differ
diff --git a/public/images/emoji/apple/oil.png b/public/images/emoji/apple/oil.png
index a01be78b3b4..f63443d6a45 100644
Binary files a/public/images/emoji/apple/oil.png and b/public/images/emoji/apple/oil.png differ
diff --git a/public/images/emoji/apple/oil_drum.png b/public/images/emoji/apple/oil_drum.png
index a01be78b3b4..f63443d6a45 100644
Binary files a/public/images/emoji/apple/oil_drum.png and b/public/images/emoji/apple/oil_drum.png differ
diff --git a/public/images/emoji/apple/ok.png b/public/images/emoji/apple/ok.png
index e58db0c68ce..c448030e139 100644
Binary files a/public/images/emoji/apple/ok.png and b/public/images/emoji/apple/ok.png differ
diff --git a/public/images/emoji/apple/ok_hand/2.png b/public/images/emoji/apple/ok_hand/2.png
new file mode 100644
index 00000000000..846b068ecb4
Binary files /dev/null and b/public/images/emoji/apple/ok_hand/2.png differ
diff --git a/public/images/emoji/apple/ok_hand/3.png b/public/images/emoji/apple/ok_hand/3.png
new file mode 100644
index 00000000000..51063219939
Binary files /dev/null and b/public/images/emoji/apple/ok_hand/3.png differ
diff --git a/public/images/emoji/apple/ok_hand/4.png b/public/images/emoji/apple/ok_hand/4.png
new file mode 100644
index 00000000000..bcc412fb85f
Binary files /dev/null and b/public/images/emoji/apple/ok_hand/4.png differ
diff --git a/public/images/emoji/apple/ok_hand/5.png b/public/images/emoji/apple/ok_hand/5.png
new file mode 100644
index 00000000000..1690724e43e
Binary files /dev/null and b/public/images/emoji/apple/ok_hand/5.png differ
diff --git a/public/images/emoji/apple/ok_hand/6.png b/public/images/emoji/apple/ok_hand/6.png
new file mode 100644
index 00000000000..de9da6b79e6
Binary files /dev/null and b/public/images/emoji/apple/ok_hand/6.png differ
diff --git a/public/images/emoji/apple/ok_man.png b/public/images/emoji/apple/ok_man.png
new file mode 100644
index 00000000000..ea8c3efa38d
Binary files /dev/null and b/public/images/emoji/apple/ok_man.png differ
diff --git a/public/images/emoji/apple/ok_man/2.png b/public/images/emoji/apple/ok_man/2.png
new file mode 100644
index 00000000000..fc088678c8b
Binary files /dev/null and b/public/images/emoji/apple/ok_man/2.png differ
diff --git a/public/images/emoji/apple/ok_man/3.png b/public/images/emoji/apple/ok_man/3.png
new file mode 100644
index 00000000000..d355137b7ec
Binary files /dev/null and b/public/images/emoji/apple/ok_man/3.png differ
diff --git a/public/images/emoji/apple/ok_man/4.png b/public/images/emoji/apple/ok_man/4.png
new file mode 100644
index 00000000000..86b6289c2be
Binary files /dev/null and b/public/images/emoji/apple/ok_man/4.png differ
diff --git a/public/images/emoji/apple/ok_man/5.png b/public/images/emoji/apple/ok_man/5.png
new file mode 100644
index 00000000000..c807bcf02cd
Binary files /dev/null and b/public/images/emoji/apple/ok_man/5.png differ
diff --git a/public/images/emoji/apple/ok_man/6.png b/public/images/emoji/apple/ok_man/6.png
new file mode 100644
index 00000000000..6d6e7935d80
Binary files /dev/null and b/public/images/emoji/apple/ok_man/6.png differ
diff --git a/public/images/emoji/apple/ok_woman/2.png b/public/images/emoji/apple/ok_woman/2.png
new file mode 100644
index 00000000000..bd3834c91e3
Binary files /dev/null and b/public/images/emoji/apple/ok_woman/2.png differ
diff --git a/public/images/emoji/apple/ok_woman/3.png b/public/images/emoji/apple/ok_woman/3.png
new file mode 100644
index 00000000000..c8320428ed1
Binary files /dev/null and b/public/images/emoji/apple/ok_woman/3.png differ
diff --git a/public/images/emoji/apple/ok_woman/4.png b/public/images/emoji/apple/ok_woman/4.png
new file mode 100644
index 00000000000..c7865487f25
Binary files /dev/null and b/public/images/emoji/apple/ok_woman/4.png differ
diff --git a/public/images/emoji/apple/ok_woman/5.png b/public/images/emoji/apple/ok_woman/5.png
new file mode 100644
index 00000000000..afb43cda70d
Binary files /dev/null and b/public/images/emoji/apple/ok_woman/5.png differ
diff --git a/public/images/emoji/apple/ok_woman/6.png b/public/images/emoji/apple/ok_woman/6.png
new file mode 100644
index 00000000000..cc400e7f1e8
Binary files /dev/null and b/public/images/emoji/apple/ok_woman/6.png differ
diff --git a/public/images/emoji/apple/old_key.png b/public/images/emoji/apple/old_key.png
index a35dd1afd98..05715332b10 100644
Binary files a/public/images/emoji/apple/old_key.png and b/public/images/emoji/apple/old_key.png differ
diff --git a/public/images/emoji/apple/older_adult.png b/public/images/emoji/apple/older_adult.png
new file mode 100644
index 00000000000..8796829b876
Binary files /dev/null and b/public/images/emoji/apple/older_adult.png differ
diff --git a/public/images/emoji/apple/older_adult/2.png b/public/images/emoji/apple/older_adult/2.png
new file mode 100644
index 00000000000..b36f41960e7
Binary files /dev/null and b/public/images/emoji/apple/older_adult/2.png differ
diff --git a/public/images/emoji/apple/older_adult/3.png b/public/images/emoji/apple/older_adult/3.png
new file mode 100644
index 00000000000..dc1441fea56
Binary files /dev/null and b/public/images/emoji/apple/older_adult/3.png differ
diff --git a/public/images/emoji/apple/older_adult/4.png b/public/images/emoji/apple/older_adult/4.png
new file mode 100644
index 00000000000..abc19e06c74
Binary files /dev/null and b/public/images/emoji/apple/older_adult/4.png differ
diff --git a/public/images/emoji/apple/older_adult/5.png b/public/images/emoji/apple/older_adult/5.png
new file mode 100644
index 00000000000..c90549f6813
Binary files /dev/null and b/public/images/emoji/apple/older_adult/5.png differ
diff --git a/public/images/emoji/apple/older_adult/6.png b/public/images/emoji/apple/older_adult/6.png
new file mode 100644
index 00000000000..5152c9c1a3e
Binary files /dev/null and b/public/images/emoji/apple/older_adult/6.png differ
diff --git a/public/images/emoji/apple/older_man.png b/public/images/emoji/apple/older_man.png
index 5dfc60e1229..7d61e185f69 100644
Binary files a/public/images/emoji/apple/older_man.png and b/public/images/emoji/apple/older_man.png differ
diff --git a/public/images/emoji/apple/older_man/2.png b/public/images/emoji/apple/older_man/2.png
new file mode 100644
index 00000000000..5bce0f8719a
Binary files /dev/null and b/public/images/emoji/apple/older_man/2.png differ
diff --git a/public/images/emoji/apple/older_man/3.png b/public/images/emoji/apple/older_man/3.png
new file mode 100644
index 00000000000..abb4fbd880c
Binary files /dev/null and b/public/images/emoji/apple/older_man/3.png differ
diff --git a/public/images/emoji/apple/older_man/4.png b/public/images/emoji/apple/older_man/4.png
new file mode 100644
index 00000000000..db548d5f683
Binary files /dev/null and b/public/images/emoji/apple/older_man/4.png differ
diff --git a/public/images/emoji/apple/older_man/5.png b/public/images/emoji/apple/older_man/5.png
new file mode 100644
index 00000000000..6b6a9d922da
Binary files /dev/null and b/public/images/emoji/apple/older_man/5.png differ
diff --git a/public/images/emoji/apple/older_man/6.png b/public/images/emoji/apple/older_man/6.png
new file mode 100644
index 00000000000..dcb090572f8
Binary files /dev/null and b/public/images/emoji/apple/older_man/6.png differ
diff --git a/public/images/emoji/apple/older_woman.png b/public/images/emoji/apple/older_woman.png
index 12a5fc33063..3aa8954a88a 100644
Binary files a/public/images/emoji/apple/older_woman.png and b/public/images/emoji/apple/older_woman.png differ
diff --git a/public/images/emoji/apple/older_woman/2.png b/public/images/emoji/apple/older_woman/2.png
new file mode 100644
index 00000000000..0338c484a17
Binary files /dev/null and b/public/images/emoji/apple/older_woman/2.png differ
diff --git a/public/images/emoji/apple/older_woman/3.png b/public/images/emoji/apple/older_woman/3.png
new file mode 100644
index 00000000000..eb68885c384
Binary files /dev/null and b/public/images/emoji/apple/older_woman/3.png differ
diff --git a/public/images/emoji/apple/older_woman/4.png b/public/images/emoji/apple/older_woman/4.png
new file mode 100644
index 00000000000..b0ec0d5864e
Binary files /dev/null and b/public/images/emoji/apple/older_woman/4.png differ
diff --git a/public/images/emoji/apple/older_woman/5.png b/public/images/emoji/apple/older_woman/5.png
new file mode 100644
index 00000000000..e9778d3e964
Binary files /dev/null and b/public/images/emoji/apple/older_woman/5.png differ
diff --git a/public/images/emoji/apple/older_woman/6.png b/public/images/emoji/apple/older_woman/6.png
new file mode 100644
index 00000000000..af461aed008
Binary files /dev/null and b/public/images/emoji/apple/older_woman/6.png differ
diff --git a/public/images/emoji/apple/om.png b/public/images/emoji/apple/om.png
new file mode 100644
index 00000000000..b5b1a233e67
Binary files /dev/null and b/public/images/emoji/apple/om.png differ
diff --git a/public/images/emoji/apple/om_symbol.png b/public/images/emoji/apple/om_symbol.png
index 5a1b66d2975..b5b1a233e67 100644
Binary files a/public/images/emoji/apple/om_symbol.png and b/public/images/emoji/apple/om_symbol.png differ
diff --git a/public/images/emoji/apple/oman.png b/public/images/emoji/apple/oman.png
new file mode 100644
index 00000000000..de17cf8477f
Binary files /dev/null and b/public/images/emoji/apple/oman.png differ
diff --git a/public/images/emoji/apple/on.png b/public/images/emoji/apple/on.png
index 7bb3f401c5c..46dafb2eae0 100644
Binary files a/public/images/emoji/apple/on.png and b/public/images/emoji/apple/on.png differ
diff --git a/public/images/emoji/apple/oncoming_automobile.png b/public/images/emoji/apple/oncoming_automobile.png
index ce2b44e5697..80e24f234bc 100644
Binary files a/public/images/emoji/apple/oncoming_automobile.png and b/public/images/emoji/apple/oncoming_automobile.png differ
diff --git a/public/images/emoji/apple/oncoming_bus.png b/public/images/emoji/apple/oncoming_bus.png
index 094f8f49988..53769420d91 100644
Binary files a/public/images/emoji/apple/oncoming_bus.png and b/public/images/emoji/apple/oncoming_bus.png differ
diff --git a/public/images/emoji/apple/oncoming_police_car.png b/public/images/emoji/apple/oncoming_police_car.png
index d1f2af2c264..0e9d3eff9ba 100644
Binary files a/public/images/emoji/apple/oncoming_police_car.png and b/public/images/emoji/apple/oncoming_police_car.png differ
diff --git a/public/images/emoji/apple/oncoming_taxi.png b/public/images/emoji/apple/oncoming_taxi.png
index 70540c4a35b..7b3d37c2641 100644
Binary files a/public/images/emoji/apple/oncoming_taxi.png and b/public/images/emoji/apple/oncoming_taxi.png differ
diff --git a/public/images/emoji/apple/one.png b/public/images/emoji/apple/one.png
index fbd9bcf5928..04153a940f9 100644
Binary files a/public/images/emoji/apple/one.png and b/public/images/emoji/apple/one.png differ
diff --git a/public/images/emoji/apple/open_book.png b/public/images/emoji/apple/open_book.png
new file mode 100644
index 00000000000..fd8d428a74a
Binary files /dev/null and b/public/images/emoji/apple/open_book.png differ
diff --git a/public/images/emoji/apple/open_file_folder.png b/public/images/emoji/apple/open_file_folder.png
index f92ddee6881..a55476e3b13 100644
Binary files a/public/images/emoji/apple/open_file_folder.png and b/public/images/emoji/apple/open_file_folder.png differ
diff --git a/public/images/emoji/apple/open_hands/2.png b/public/images/emoji/apple/open_hands/2.png
new file mode 100644
index 00000000000..a34b319c254
Binary files /dev/null and b/public/images/emoji/apple/open_hands/2.png differ
diff --git a/public/images/emoji/apple/open_hands/3.png b/public/images/emoji/apple/open_hands/3.png
new file mode 100644
index 00000000000..01678c5ca79
Binary files /dev/null and b/public/images/emoji/apple/open_hands/3.png differ
diff --git a/public/images/emoji/apple/open_hands/4.png b/public/images/emoji/apple/open_hands/4.png
new file mode 100644
index 00000000000..21d7feef155
Binary files /dev/null and b/public/images/emoji/apple/open_hands/4.png differ
diff --git a/public/images/emoji/apple/open_hands/5.png b/public/images/emoji/apple/open_hands/5.png
new file mode 100644
index 00000000000..eb7ba22d584
Binary files /dev/null and b/public/images/emoji/apple/open_hands/5.png differ
diff --git a/public/images/emoji/apple/open_hands/6.png b/public/images/emoji/apple/open_hands/6.png
new file mode 100644
index 00000000000..363204276bb
Binary files /dev/null and b/public/images/emoji/apple/open_hands/6.png differ
diff --git a/public/images/emoji/apple/open_umbrella.png b/public/images/emoji/apple/open_umbrella.png
new file mode 100644
index 00000000000..1d7d1c6a5fe
Binary files /dev/null and b/public/images/emoji/apple/open_umbrella.png differ
diff --git a/public/images/emoji/apple/ophiuchus.png b/public/images/emoji/apple/ophiuchus.png
index 208488c227f..bbcaa98be90 100644
Binary files a/public/images/emoji/apple/ophiuchus.png and b/public/images/emoji/apple/ophiuchus.png differ
diff --git a/public/images/emoji/apple/orange_book.png b/public/images/emoji/apple/orange_book.png
index bc685328c62..bfd48b8c078 100644
Binary files a/public/images/emoji/apple/orange_book.png and b/public/images/emoji/apple/orange_book.png differ
diff --git a/public/images/emoji/apple/orange_heart.png b/public/images/emoji/apple/orange_heart.png
new file mode 100644
index 00000000000..f217c930a74
Binary files /dev/null and b/public/images/emoji/apple/orange_heart.png differ
diff --git a/public/images/emoji/apple/orthodox_cross.png b/public/images/emoji/apple/orthodox_cross.png
index 6177b3447a8..ea6955e09a9 100644
Binary files a/public/images/emoji/apple/orthodox_cross.png and b/public/images/emoji/apple/orthodox_cross.png differ
diff --git a/public/images/emoji/apple/outbox_tray.png b/public/images/emoji/apple/outbox_tray.png
index 7a81f2e557e..af879adaba4 100644
Binary files a/public/images/emoji/apple/outbox_tray.png and b/public/images/emoji/apple/outbox_tray.png differ
diff --git a/public/images/emoji/apple/owl.png b/public/images/emoji/apple/owl.png
new file mode 100644
index 00000000000..79b86eba809
Binary files /dev/null and b/public/images/emoji/apple/owl.png differ
diff --git a/public/images/emoji/apple/ox.png b/public/images/emoji/apple/ox.png
index 67318982044..33a2801ef19 100644
Binary files a/public/images/emoji/apple/ox.png and b/public/images/emoji/apple/ox.png differ
diff --git a/public/images/emoji/apple/package.png b/public/images/emoji/apple/package.png
index 7e77b702b1d..385a4b61e73 100644
Binary files a/public/images/emoji/apple/package.png and b/public/images/emoji/apple/package.png differ
diff --git a/public/images/emoji/apple/page_facing_up.png b/public/images/emoji/apple/page_facing_up.png
index 3f898e46c1d..f2961094887 100644
Binary files a/public/images/emoji/apple/page_facing_up.png and b/public/images/emoji/apple/page_facing_up.png differ
diff --git a/public/images/emoji/apple/page_with_curl.png b/public/images/emoji/apple/page_with_curl.png
index 1fa75fe43f4..70c773c9e42 100644
Binary files a/public/images/emoji/apple/page_with_curl.png and b/public/images/emoji/apple/page_with_curl.png differ
diff --git a/public/images/emoji/apple/pager.png b/public/images/emoji/apple/pager.png
index 09a8fae6d8e..7cb85607e3d 100644
Binary files a/public/images/emoji/apple/pager.png and b/public/images/emoji/apple/pager.png differ
diff --git a/public/images/emoji/apple/paintbrush.png b/public/images/emoji/apple/paintbrush.png
index 9b83129cb4b..2b02f0ad03a 100644
Binary files a/public/images/emoji/apple/paintbrush.png and b/public/images/emoji/apple/paintbrush.png differ
diff --git a/public/images/emoji/apple/pakistan.png b/public/images/emoji/apple/pakistan.png
new file mode 100644
index 00000000000..38f68498fb0
Binary files /dev/null and b/public/images/emoji/apple/pakistan.png differ
diff --git a/public/images/emoji/apple/palau.png b/public/images/emoji/apple/palau.png
new file mode 100644
index 00000000000..fead277711f
Binary files /dev/null and b/public/images/emoji/apple/palau.png differ
diff --git a/public/images/emoji/apple/palestinian_territories.png b/public/images/emoji/apple/palestinian_territories.png
new file mode 100644
index 00000000000..8ec31337f4f
Binary files /dev/null and b/public/images/emoji/apple/palestinian_territories.png differ
diff --git a/public/images/emoji/apple/palm_tree.png b/public/images/emoji/apple/palm_tree.png
index fdb33ba935e..3f968892852 100644
Binary files a/public/images/emoji/apple/palm_tree.png and b/public/images/emoji/apple/palm_tree.png differ
diff --git a/public/images/emoji/apple/palms_up_together.png b/public/images/emoji/apple/palms_up_together.png
new file mode 100644
index 00000000000..fb66ba11c40
Binary files /dev/null and b/public/images/emoji/apple/palms_up_together.png differ
diff --git a/public/images/emoji/apple/palms_up_together/2.png b/public/images/emoji/apple/palms_up_together/2.png
new file mode 100644
index 00000000000..6d9b2fc8ccd
Binary files /dev/null and b/public/images/emoji/apple/palms_up_together/2.png differ
diff --git a/public/images/emoji/apple/palms_up_together/3.png b/public/images/emoji/apple/palms_up_together/3.png
new file mode 100644
index 00000000000..c5d52f5c7a7
Binary files /dev/null and b/public/images/emoji/apple/palms_up_together/3.png differ
diff --git a/public/images/emoji/apple/palms_up_together/4.png b/public/images/emoji/apple/palms_up_together/4.png
new file mode 100644
index 00000000000..3d4288d10db
Binary files /dev/null and b/public/images/emoji/apple/palms_up_together/4.png differ
diff --git a/public/images/emoji/apple/palms_up_together/5.png b/public/images/emoji/apple/palms_up_together/5.png
new file mode 100644
index 00000000000..6ff36c07cbd
Binary files /dev/null and b/public/images/emoji/apple/palms_up_together/5.png differ
diff --git a/public/images/emoji/apple/palms_up_together/6.png b/public/images/emoji/apple/palms_up_together/6.png
new file mode 100644
index 00000000000..c25d42927d8
Binary files /dev/null and b/public/images/emoji/apple/palms_up_together/6.png differ
diff --git a/public/images/emoji/apple/panama.png b/public/images/emoji/apple/panama.png
new file mode 100644
index 00000000000..582030b969f
Binary files /dev/null and b/public/images/emoji/apple/panama.png differ
diff --git a/public/images/emoji/apple/pancakes.png b/public/images/emoji/apple/pancakes.png
new file mode 100644
index 00000000000..b666d15cd00
Binary files /dev/null and b/public/images/emoji/apple/pancakes.png differ
diff --git a/public/images/emoji/apple/panda_face.png b/public/images/emoji/apple/panda_face.png
index 525bdb4305e..27847603d95 100644
Binary files a/public/images/emoji/apple/panda_face.png and b/public/images/emoji/apple/panda_face.png differ
diff --git a/public/images/emoji/apple/paperclip.png b/public/images/emoji/apple/paperclip.png
index 6fbd8e481cd..a2c50ff2358 100644
Binary files a/public/images/emoji/apple/paperclip.png and b/public/images/emoji/apple/paperclip.png differ
diff --git a/public/images/emoji/apple/paperclips.png b/public/images/emoji/apple/paperclips.png
index 22e54ef1f4e..235e2049c36 100644
Binary files a/public/images/emoji/apple/paperclips.png and b/public/images/emoji/apple/paperclips.png differ
diff --git a/public/images/emoji/apple/papua_new_guinea.png b/public/images/emoji/apple/papua_new_guinea.png
new file mode 100644
index 00000000000..08fc839433e
Binary files /dev/null and b/public/images/emoji/apple/papua_new_guinea.png differ
diff --git a/public/images/emoji/apple/paraguay.png b/public/images/emoji/apple/paraguay.png
new file mode 100644
index 00000000000..e885b821115
Binary files /dev/null and b/public/images/emoji/apple/paraguay.png differ
diff --git a/public/images/emoji/apple/parasol_on_ground.png b/public/images/emoji/apple/parasol_on_ground.png
new file mode 100644
index 00000000000..95b1ae9fdd1
Binary files /dev/null and b/public/images/emoji/apple/parasol_on_ground.png differ
diff --git a/public/images/emoji/apple/park.png b/public/images/emoji/apple/park.png
index 5682fd24789..902d5ec8ea5 100644
Binary files a/public/images/emoji/apple/park.png and b/public/images/emoji/apple/park.png differ
diff --git a/public/images/emoji/apple/parking.png b/public/images/emoji/apple/parking.png
index 49cb40b6897..3ba3b779fd9 100644
Binary files a/public/images/emoji/apple/parking.png and b/public/images/emoji/apple/parking.png differ
diff --git a/public/images/emoji/apple/part_alternation_mark.png b/public/images/emoji/apple/part_alternation_mark.png
index 8f7b38d55a8..6b87aac3ef4 100644
Binary files a/public/images/emoji/apple/part_alternation_mark.png and b/public/images/emoji/apple/part_alternation_mark.png differ
diff --git a/public/images/emoji/apple/partly_sunny.png b/public/images/emoji/apple/partly_sunny.png
index 8adb5230d31..b31de05a28f 100644
Binary files a/public/images/emoji/apple/partly_sunny.png and b/public/images/emoji/apple/partly_sunny.png differ
diff --git a/public/images/emoji/apple/passenger_ship.png b/public/images/emoji/apple/passenger_ship.png
index 94aa42e7bff..3bb64de0d3e 100644
Binary files a/public/images/emoji/apple/passenger_ship.png and b/public/images/emoji/apple/passenger_ship.png differ
diff --git a/public/images/emoji/apple/passport_control.png b/public/images/emoji/apple/passport_control.png
index 575c5adeeba..5f9b37f6313 100644
Binary files a/public/images/emoji/apple/passport_control.png and b/public/images/emoji/apple/passport_control.png differ
diff --git a/public/images/emoji/apple/pause_button.png b/public/images/emoji/apple/pause_button.png
index cdcd151e9a0..7f788fbb763 100644
Binary files a/public/images/emoji/apple/pause_button.png and b/public/images/emoji/apple/pause_button.png differ
diff --git a/public/images/emoji/apple/paw_prints.png b/public/images/emoji/apple/paw_prints.png
index 3b1c263cd3e..26fe02e01ee 100644
Binary files a/public/images/emoji/apple/paw_prints.png and b/public/images/emoji/apple/paw_prints.png differ
diff --git a/public/images/emoji/apple/peace.png b/public/images/emoji/apple/peace.png
index 2bb88492d99..c8567db8383 100644
Binary files a/public/images/emoji/apple/peace.png and b/public/images/emoji/apple/peace.png differ
diff --git a/public/images/emoji/apple/peace_symbol.png b/public/images/emoji/apple/peace_symbol.png
index 2bb88492d99..c8567db8383 100644
Binary files a/public/images/emoji/apple/peace_symbol.png and b/public/images/emoji/apple/peace_symbol.png differ
diff --git a/public/images/emoji/apple/peach.png b/public/images/emoji/apple/peach.png
index 59ccd42d8e8..a9b5b7e3d4f 100644
Binary files a/public/images/emoji/apple/peach.png and b/public/images/emoji/apple/peach.png differ
diff --git a/public/images/emoji/apple/peanuts.png b/public/images/emoji/apple/peanuts.png
new file mode 100644
index 00000000000..a405729d163
Binary files /dev/null and b/public/images/emoji/apple/peanuts.png differ
diff --git a/public/images/emoji/apple/pear.png b/public/images/emoji/apple/pear.png
index bc2fa3def95..0e8ead81cb2 100644
Binary files a/public/images/emoji/apple/pear.png and b/public/images/emoji/apple/pear.png differ
diff --git a/public/images/emoji/apple/pen.png b/public/images/emoji/apple/pen.png
new file mode 100644
index 00000000000..b9e79ad2146
Binary files /dev/null and b/public/images/emoji/apple/pen.png differ
diff --git a/public/images/emoji/apple/pen_ballpoint.png b/public/images/emoji/apple/pen_ballpoint.png
index 7f81b84a60c..b9e79ad2146 100644
Binary files a/public/images/emoji/apple/pen_ballpoint.png and b/public/images/emoji/apple/pen_ballpoint.png differ
diff --git a/public/images/emoji/apple/pen_fountain.png b/public/images/emoji/apple/pen_fountain.png
index 46b0256afa2..a9a947848d8 100644
Binary files a/public/images/emoji/apple/pen_fountain.png and b/public/images/emoji/apple/pen_fountain.png differ
diff --git a/public/images/emoji/apple/pencil.png b/public/images/emoji/apple/pencil.png
index 2a5ced6f7ac..b738536bdcd 100644
Binary files a/public/images/emoji/apple/pencil.png and b/public/images/emoji/apple/pencil.png differ
diff --git a/public/images/emoji/apple/pencil2.png b/public/images/emoji/apple/pencil2.png
index 66520d71349..29298608249 100644
Binary files a/public/images/emoji/apple/pencil2.png and b/public/images/emoji/apple/pencil2.png differ
diff --git a/public/images/emoji/apple/penguin.png b/public/images/emoji/apple/penguin.png
index 34ea100c4bc..de389660ecb 100644
Binary files a/public/images/emoji/apple/penguin.png and b/public/images/emoji/apple/penguin.png differ
diff --git a/public/images/emoji/apple/performing_arts.png b/public/images/emoji/apple/performing_arts.png
index 20d1a899da2..0b40da7f012 100644
Binary files a/public/images/emoji/apple/performing_arts.png and b/public/images/emoji/apple/performing_arts.png differ
diff --git a/public/images/emoji/apple/person_climbing.png b/public/images/emoji/apple/person_climbing.png
new file mode 100644
index 00000000000..d8a6229d6b9
Binary files /dev/null and b/public/images/emoji/apple/person_climbing.png differ
diff --git a/public/images/emoji/apple/person_climbing/2.png b/public/images/emoji/apple/person_climbing/2.png
new file mode 100644
index 00000000000..71330d66a8c
Binary files /dev/null and b/public/images/emoji/apple/person_climbing/2.png differ
diff --git a/public/images/emoji/apple/person_climbing/3.png b/public/images/emoji/apple/person_climbing/3.png
new file mode 100644
index 00000000000..a1345ecbd25
Binary files /dev/null and b/public/images/emoji/apple/person_climbing/3.png differ
diff --git a/public/images/emoji/apple/person_climbing/4.png b/public/images/emoji/apple/person_climbing/4.png
new file mode 100644
index 00000000000..016b920bcde
Binary files /dev/null and b/public/images/emoji/apple/person_climbing/4.png differ
diff --git a/public/images/emoji/apple/person_climbing/5.png b/public/images/emoji/apple/person_climbing/5.png
new file mode 100644
index 00000000000..4591eb52904
Binary files /dev/null and b/public/images/emoji/apple/person_climbing/5.png differ
diff --git a/public/images/emoji/apple/person_climbing/6.png b/public/images/emoji/apple/person_climbing/6.png
new file mode 100644
index 00000000000..19be3236ae9
Binary files /dev/null and b/public/images/emoji/apple/person_climbing/6.png differ
diff --git a/public/images/emoji/apple/person_fencing.png b/public/images/emoji/apple/person_fencing.png
new file mode 100644
index 00000000000..38293ffc2b2
Binary files /dev/null and b/public/images/emoji/apple/person_fencing.png differ
diff --git a/public/images/emoji/apple/person_frowning.png b/public/images/emoji/apple/person_frowning.png
index abd0f179de0..d06a0aa7333 100644
Binary files a/public/images/emoji/apple/person_frowning.png and b/public/images/emoji/apple/person_frowning.png differ
diff --git a/public/images/emoji/apple/person_frowning/2.png b/public/images/emoji/apple/person_frowning/2.png
new file mode 100644
index 00000000000..aa34de20948
Binary files /dev/null and b/public/images/emoji/apple/person_frowning/2.png differ
diff --git a/public/images/emoji/apple/person_frowning/3.png b/public/images/emoji/apple/person_frowning/3.png
new file mode 100644
index 00000000000..638e52f05c7
Binary files /dev/null and b/public/images/emoji/apple/person_frowning/3.png differ
diff --git a/public/images/emoji/apple/person_frowning/4.png b/public/images/emoji/apple/person_frowning/4.png
new file mode 100644
index 00000000000..25be6800ca3
Binary files /dev/null and b/public/images/emoji/apple/person_frowning/4.png differ
diff --git a/public/images/emoji/apple/person_frowning/5.png b/public/images/emoji/apple/person_frowning/5.png
new file mode 100644
index 00000000000..b9efb3d134c
Binary files /dev/null and b/public/images/emoji/apple/person_frowning/5.png differ
diff --git a/public/images/emoji/apple/person_frowning/6.png b/public/images/emoji/apple/person_frowning/6.png
new file mode 100644
index 00000000000..f5485b28439
Binary files /dev/null and b/public/images/emoji/apple/person_frowning/6.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position.png b/public/images/emoji/apple/person_in_lotus_position.png
new file mode 100644
index 00000000000..e9404fd5255
Binary files /dev/null and b/public/images/emoji/apple/person_in_lotus_position.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/2.png b/public/images/emoji/apple/person_in_lotus_position/2.png
new file mode 100644
index 00000000000..8817578cf09
Binary files /dev/null and b/public/images/emoji/apple/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/3.png b/public/images/emoji/apple/person_in_lotus_position/3.png
new file mode 100644
index 00000000000..0e9bf46e0b6
Binary files /dev/null and b/public/images/emoji/apple/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/4.png b/public/images/emoji/apple/person_in_lotus_position/4.png
new file mode 100644
index 00000000000..918e3d435a2
Binary files /dev/null and b/public/images/emoji/apple/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/5.png b/public/images/emoji/apple/person_in_lotus_position/5.png
new file mode 100644
index 00000000000..0c01143530e
Binary files /dev/null and b/public/images/emoji/apple/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/apple/person_in_lotus_position/6.png b/public/images/emoji/apple/person_in_lotus_position/6.png
new file mode 100644
index 00000000000..fed226dac29
Binary files /dev/null and b/public/images/emoji/apple/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room.png b/public/images/emoji/apple/person_in_steamy_room.png
new file mode 100644
index 00000000000..65a0790d926
Binary files /dev/null and b/public/images/emoji/apple/person_in_steamy_room.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/2.png b/public/images/emoji/apple/person_in_steamy_room/2.png
new file mode 100644
index 00000000000..7260df1d154
Binary files /dev/null and b/public/images/emoji/apple/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/3.png b/public/images/emoji/apple/person_in_steamy_room/3.png
new file mode 100644
index 00000000000..d14580a3db3
Binary files /dev/null and b/public/images/emoji/apple/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/4.png b/public/images/emoji/apple/person_in_steamy_room/4.png
new file mode 100644
index 00000000000..9313ab2116b
Binary files /dev/null and b/public/images/emoji/apple/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/5.png b/public/images/emoji/apple/person_in_steamy_room/5.png
new file mode 100644
index 00000000000..f432b554b37
Binary files /dev/null and b/public/images/emoji/apple/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/apple/person_in_steamy_room/6.png b/public/images/emoji/apple/person_in_steamy_room/6.png
new file mode 100644
index 00000000000..dc7087e0284
Binary files /dev/null and b/public/images/emoji/apple/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/apple/person_with_ball.png b/public/images/emoji/apple/person_with_ball.png
index 1a2255c2f80..2476fa9f0cb 100644
Binary files a/public/images/emoji/apple/person_with_ball.png and b/public/images/emoji/apple/person_with_ball.png differ
diff --git a/public/images/emoji/apple/person_with_ball/2.png b/public/images/emoji/apple/person_with_ball/2.png
new file mode 100644
index 00000000000..dbec120de00
Binary files /dev/null and b/public/images/emoji/apple/person_with_ball/2.png differ
diff --git a/public/images/emoji/apple/person_with_ball/3.png b/public/images/emoji/apple/person_with_ball/3.png
new file mode 100644
index 00000000000..a9ccd274623
Binary files /dev/null and b/public/images/emoji/apple/person_with_ball/3.png differ
diff --git a/public/images/emoji/apple/person_with_ball/4.png b/public/images/emoji/apple/person_with_ball/4.png
new file mode 100644
index 00000000000..079cd2a900b
Binary files /dev/null and b/public/images/emoji/apple/person_with_ball/4.png differ
diff --git a/public/images/emoji/apple/person_with_ball/5.png b/public/images/emoji/apple/person_with_ball/5.png
new file mode 100644
index 00000000000..905f5af468e
Binary files /dev/null and b/public/images/emoji/apple/person_with_ball/5.png differ
diff --git a/public/images/emoji/apple/person_with_ball/6.png b/public/images/emoji/apple/person_with_ball/6.png
new file mode 100644
index 00000000000..c03789f5d05
Binary files /dev/null and b/public/images/emoji/apple/person_with_ball/6.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair.png b/public/images/emoji/apple/person_with_blond_hair.png
index bd98a51959f..005aeefedaa 100644
Binary files a/public/images/emoji/apple/person_with_blond_hair.png and b/public/images/emoji/apple/person_with_blond_hair.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/2.png b/public/images/emoji/apple/person_with_blond_hair/2.png
new file mode 100644
index 00000000000..9e43423fdb2
Binary files /dev/null and b/public/images/emoji/apple/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/3.png b/public/images/emoji/apple/person_with_blond_hair/3.png
new file mode 100644
index 00000000000..b36f1a69db6
Binary files /dev/null and b/public/images/emoji/apple/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/4.png b/public/images/emoji/apple/person_with_blond_hair/4.png
new file mode 100644
index 00000000000..901dfcaa062
Binary files /dev/null and b/public/images/emoji/apple/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/5.png b/public/images/emoji/apple/person_with_blond_hair/5.png
new file mode 100644
index 00000000000..5aaa84154a1
Binary files /dev/null and b/public/images/emoji/apple/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/apple/person_with_blond_hair/6.png b/public/images/emoji/apple/person_with_blond_hair/6.png
new file mode 100644
index 00000000000..261b2470e3b
Binary files /dev/null and b/public/images/emoji/apple/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face.png b/public/images/emoji/apple/person_with_pouting_face.png
index eace861eec6..48baa70cd72 100644
Binary files a/public/images/emoji/apple/person_with_pouting_face.png and b/public/images/emoji/apple/person_with_pouting_face.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/2.png b/public/images/emoji/apple/person_with_pouting_face/2.png
new file mode 100644
index 00000000000..afaf1da3bc7
Binary files /dev/null and b/public/images/emoji/apple/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/3.png b/public/images/emoji/apple/person_with_pouting_face/3.png
new file mode 100644
index 00000000000..fd78d2ab4de
Binary files /dev/null and b/public/images/emoji/apple/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/4.png b/public/images/emoji/apple/person_with_pouting_face/4.png
new file mode 100644
index 00000000000..3f525031d92
Binary files /dev/null and b/public/images/emoji/apple/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/5.png b/public/images/emoji/apple/person_with_pouting_face/5.png
new file mode 100644
index 00000000000..bf7bacdb73d
Binary files /dev/null and b/public/images/emoji/apple/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/apple/person_with_pouting_face/6.png b/public/images/emoji/apple/person_with_pouting_face/6.png
new file mode 100644
index 00000000000..dbe2ffeb2ed
Binary files /dev/null and b/public/images/emoji/apple/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/apple/peru.png b/public/images/emoji/apple/peru.png
new file mode 100644
index 00000000000..c4c3cf63fe8
Binary files /dev/null and b/public/images/emoji/apple/peru.png differ
diff --git a/public/images/emoji/apple/philippines.png b/public/images/emoji/apple/philippines.png
new file mode 100644
index 00000000000..8059dccef1f
Binary files /dev/null and b/public/images/emoji/apple/philippines.png differ
diff --git a/public/images/emoji/apple/phone.png b/public/images/emoji/apple/phone.png
new file mode 100644
index 00000000000..60538e87700
Binary files /dev/null and b/public/images/emoji/apple/phone.png differ
diff --git a/public/images/emoji/apple/pick.png b/public/images/emoji/apple/pick.png
index a01ba4dd221..1cd6abf5505 100644
Binary files a/public/images/emoji/apple/pick.png and b/public/images/emoji/apple/pick.png differ
diff --git a/public/images/emoji/apple/pie.png b/public/images/emoji/apple/pie.png
new file mode 100644
index 00000000000..4f5f474d82c
Binary files /dev/null and b/public/images/emoji/apple/pie.png differ
diff --git a/public/images/emoji/apple/pig.png b/public/images/emoji/apple/pig.png
index 1c439116345..d124fd7b8f6 100644
Binary files a/public/images/emoji/apple/pig.png and b/public/images/emoji/apple/pig.png differ
diff --git a/public/images/emoji/apple/pig2.png b/public/images/emoji/apple/pig2.png
index 53cb4e3078c..0a32a4668cc 100644
Binary files a/public/images/emoji/apple/pig2.png and b/public/images/emoji/apple/pig2.png differ
diff --git a/public/images/emoji/apple/pig_nose.png b/public/images/emoji/apple/pig_nose.png
index a6f3f4a3fc2..184594644f9 100644
Binary files a/public/images/emoji/apple/pig_nose.png and b/public/images/emoji/apple/pig_nose.png differ
diff --git a/public/images/emoji/apple/pill.png b/public/images/emoji/apple/pill.png
index 55db8e5cf25..419fc999d68 100644
Binary files a/public/images/emoji/apple/pill.png and b/public/images/emoji/apple/pill.png differ
diff --git a/public/images/emoji/apple/pineapple.png b/public/images/emoji/apple/pineapple.png
index cf4a89737ac..28a1a8803f6 100644
Binary files a/public/images/emoji/apple/pineapple.png and b/public/images/emoji/apple/pineapple.png differ
diff --git a/public/images/emoji/apple/ping_pong.png b/public/images/emoji/apple/ping_pong.png
index 2ec7386f180..26d40fa9205 100644
Binary files a/public/images/emoji/apple/ping_pong.png and b/public/images/emoji/apple/ping_pong.png differ
diff --git a/public/images/emoji/apple/pisces.png b/public/images/emoji/apple/pisces.png
index adf06d6fe4c..3101dec9df2 100644
Binary files a/public/images/emoji/apple/pisces.png and b/public/images/emoji/apple/pisces.png differ
diff --git a/public/images/emoji/apple/pitcairn_islands.png b/public/images/emoji/apple/pitcairn_islands.png
new file mode 100644
index 00000000000..971137f5b58
Binary files /dev/null and b/public/images/emoji/apple/pitcairn_islands.png differ
diff --git a/public/images/emoji/apple/pizza.png b/public/images/emoji/apple/pizza.png
index d4cc59a9772..13d8433a354 100644
Binary files a/public/images/emoji/apple/pizza.png and b/public/images/emoji/apple/pizza.png differ
diff --git a/public/images/emoji/apple/place_of_worship.png b/public/images/emoji/apple/place_of_worship.png
index 5ef810aa4fb..c8e1cecd396 100644
Binary files a/public/images/emoji/apple/place_of_worship.png and b/public/images/emoji/apple/place_of_worship.png differ
diff --git a/public/images/emoji/apple/plate_with_cutlery.png b/public/images/emoji/apple/plate_with_cutlery.png
new file mode 100644
index 00000000000..54bd5dc10a4
Binary files /dev/null and b/public/images/emoji/apple/plate_with_cutlery.png differ
diff --git a/public/images/emoji/apple/play_or_pause_button.png b/public/images/emoji/apple/play_or_pause_button.png
new file mode 100644
index 00000000000..9eb4c375bc9
Binary files /dev/null and b/public/images/emoji/apple/play_or_pause_button.png differ
diff --git a/public/images/emoji/apple/play_pause.png b/public/images/emoji/apple/play_pause.png
index 6f4025de79e..9eb4c375bc9 100644
Binary files a/public/images/emoji/apple/play_pause.png and b/public/images/emoji/apple/play_pause.png differ
diff --git a/public/images/emoji/apple/point_down/2.png b/public/images/emoji/apple/point_down/2.png
new file mode 100644
index 00000000000..8ce6dcdeba4
Binary files /dev/null and b/public/images/emoji/apple/point_down/2.png differ
diff --git a/public/images/emoji/apple/point_down/3.png b/public/images/emoji/apple/point_down/3.png
new file mode 100644
index 00000000000..666127f3469
Binary files /dev/null and b/public/images/emoji/apple/point_down/3.png differ
diff --git a/public/images/emoji/apple/point_down/4.png b/public/images/emoji/apple/point_down/4.png
new file mode 100644
index 00000000000..e54187bc55e
Binary files /dev/null and b/public/images/emoji/apple/point_down/4.png differ
diff --git a/public/images/emoji/apple/point_down/5.png b/public/images/emoji/apple/point_down/5.png
new file mode 100644
index 00000000000..a45feddac88
Binary files /dev/null and b/public/images/emoji/apple/point_down/5.png differ
diff --git a/public/images/emoji/apple/point_down/6.png b/public/images/emoji/apple/point_down/6.png
new file mode 100644
index 00000000000..19143c345f0
Binary files /dev/null and b/public/images/emoji/apple/point_down/6.png differ
diff --git a/public/images/emoji/apple/point_left/2.png b/public/images/emoji/apple/point_left/2.png
new file mode 100644
index 00000000000..25757b17324
Binary files /dev/null and b/public/images/emoji/apple/point_left/2.png differ
diff --git a/public/images/emoji/apple/point_left/3.png b/public/images/emoji/apple/point_left/3.png
new file mode 100644
index 00000000000..d8870f6fdac
Binary files /dev/null and b/public/images/emoji/apple/point_left/3.png differ
diff --git a/public/images/emoji/apple/point_left/4.png b/public/images/emoji/apple/point_left/4.png
new file mode 100644
index 00000000000..1806237eb22
Binary files /dev/null and b/public/images/emoji/apple/point_left/4.png differ
diff --git a/public/images/emoji/apple/point_left/5.png b/public/images/emoji/apple/point_left/5.png
new file mode 100644
index 00000000000..ef6da3f3cc1
Binary files /dev/null and b/public/images/emoji/apple/point_left/5.png differ
diff --git a/public/images/emoji/apple/point_left/6.png b/public/images/emoji/apple/point_left/6.png
new file mode 100644
index 00000000000..c5145d2019e
Binary files /dev/null and b/public/images/emoji/apple/point_left/6.png differ
diff --git a/public/images/emoji/apple/point_right/2.png b/public/images/emoji/apple/point_right/2.png
new file mode 100644
index 00000000000..62f00a7a6fb
Binary files /dev/null and b/public/images/emoji/apple/point_right/2.png differ
diff --git a/public/images/emoji/apple/point_right/3.png b/public/images/emoji/apple/point_right/3.png
new file mode 100644
index 00000000000..7917a13842a
Binary files /dev/null and b/public/images/emoji/apple/point_right/3.png differ
diff --git a/public/images/emoji/apple/point_right/4.png b/public/images/emoji/apple/point_right/4.png
new file mode 100644
index 00000000000..9b7fffdb429
Binary files /dev/null and b/public/images/emoji/apple/point_right/4.png differ
diff --git a/public/images/emoji/apple/point_right/5.png b/public/images/emoji/apple/point_right/5.png
new file mode 100644
index 00000000000..d9f0768c660
Binary files /dev/null and b/public/images/emoji/apple/point_right/5.png differ
diff --git a/public/images/emoji/apple/point_right/6.png b/public/images/emoji/apple/point_right/6.png
new file mode 100644
index 00000000000..001d1dbcdc9
Binary files /dev/null and b/public/images/emoji/apple/point_right/6.png differ
diff --git a/public/images/emoji/apple/point_up/2.png b/public/images/emoji/apple/point_up/2.png
new file mode 100644
index 00000000000..7d1e85ae365
Binary files /dev/null and b/public/images/emoji/apple/point_up/2.png differ
diff --git a/public/images/emoji/apple/point_up/3.png b/public/images/emoji/apple/point_up/3.png
new file mode 100644
index 00000000000..be661ba35a0
Binary files /dev/null and b/public/images/emoji/apple/point_up/3.png differ
diff --git a/public/images/emoji/apple/point_up/4.png b/public/images/emoji/apple/point_up/4.png
new file mode 100644
index 00000000000..8e8818d005e
Binary files /dev/null and b/public/images/emoji/apple/point_up/4.png differ
diff --git a/public/images/emoji/apple/point_up/5.png b/public/images/emoji/apple/point_up/5.png
new file mode 100644
index 00000000000..d85940f9dbd
Binary files /dev/null and b/public/images/emoji/apple/point_up/5.png differ
diff --git a/public/images/emoji/apple/point_up/6.png b/public/images/emoji/apple/point_up/6.png
new file mode 100644
index 00000000000..86c38835ea7
Binary files /dev/null and b/public/images/emoji/apple/point_up/6.png differ
diff --git a/public/images/emoji/apple/point_up_2/2.png b/public/images/emoji/apple/point_up_2/2.png
new file mode 100644
index 00000000000..dc15fc83d4a
Binary files /dev/null and b/public/images/emoji/apple/point_up_2/2.png differ
diff --git a/public/images/emoji/apple/point_up_2/3.png b/public/images/emoji/apple/point_up_2/3.png
new file mode 100644
index 00000000000..c064485f4fa
Binary files /dev/null and b/public/images/emoji/apple/point_up_2/3.png differ
diff --git a/public/images/emoji/apple/point_up_2/4.png b/public/images/emoji/apple/point_up_2/4.png
new file mode 100644
index 00000000000..65a4b98ad19
Binary files /dev/null and b/public/images/emoji/apple/point_up_2/4.png differ
diff --git a/public/images/emoji/apple/point_up_2/5.png b/public/images/emoji/apple/point_up_2/5.png
new file mode 100644
index 00000000000..3c4f31d2055
Binary files /dev/null and b/public/images/emoji/apple/point_up_2/5.png differ
diff --git a/public/images/emoji/apple/point_up_2/6.png b/public/images/emoji/apple/point_up_2/6.png
new file mode 100644
index 00000000000..48ed3f567bf
Binary files /dev/null and b/public/images/emoji/apple/point_up_2/6.png differ
diff --git a/public/images/emoji/apple/poland.png b/public/images/emoji/apple/poland.png
new file mode 100644
index 00000000000..e2fcd6dce57
Binary files /dev/null and b/public/images/emoji/apple/poland.png differ
diff --git a/public/images/emoji/apple/police_car.png b/public/images/emoji/apple/police_car.png
index 1c43f79a071..a45562b4bce 100644
Binary files a/public/images/emoji/apple/police_car.png and b/public/images/emoji/apple/police_car.png differ
diff --git a/public/images/emoji/apple/policeman.png b/public/images/emoji/apple/policeman.png
new file mode 100644
index 00000000000..78591caa50b
Binary files /dev/null and b/public/images/emoji/apple/policeman.png differ
diff --git a/public/images/emoji/apple/policeman/2.png b/public/images/emoji/apple/policeman/2.png
new file mode 100644
index 00000000000..63db5721c18
Binary files /dev/null and b/public/images/emoji/apple/policeman/2.png differ
diff --git a/public/images/emoji/apple/policeman/3.png b/public/images/emoji/apple/policeman/3.png
new file mode 100644
index 00000000000..7922a9dd3dc
Binary files /dev/null and b/public/images/emoji/apple/policeman/3.png differ
diff --git a/public/images/emoji/apple/policeman/4.png b/public/images/emoji/apple/policeman/4.png
new file mode 100644
index 00000000000..16292b3eb0f
Binary files /dev/null and b/public/images/emoji/apple/policeman/4.png differ
diff --git a/public/images/emoji/apple/policeman/5.png b/public/images/emoji/apple/policeman/5.png
new file mode 100644
index 00000000000..41cdd83a946
Binary files /dev/null and b/public/images/emoji/apple/policeman/5.png differ
diff --git a/public/images/emoji/apple/policeman/6.png b/public/images/emoji/apple/policeman/6.png
new file mode 100644
index 00000000000..e2ce8f11b51
Binary files /dev/null and b/public/images/emoji/apple/policeman/6.png differ
diff --git a/public/images/emoji/apple/policewoman.png b/public/images/emoji/apple/policewoman.png
new file mode 100644
index 00000000000..25c6e2edd8b
Binary files /dev/null and b/public/images/emoji/apple/policewoman.png differ
diff --git a/public/images/emoji/apple/policewoman/2.png b/public/images/emoji/apple/policewoman/2.png
new file mode 100644
index 00000000000..6a639ef226d
Binary files /dev/null and b/public/images/emoji/apple/policewoman/2.png differ
diff --git a/public/images/emoji/apple/policewoman/3.png b/public/images/emoji/apple/policewoman/3.png
new file mode 100644
index 00000000000..fbc5b41c907
Binary files /dev/null and b/public/images/emoji/apple/policewoman/3.png differ
diff --git a/public/images/emoji/apple/policewoman/4.png b/public/images/emoji/apple/policewoman/4.png
new file mode 100644
index 00000000000..35b15014709
Binary files /dev/null and b/public/images/emoji/apple/policewoman/4.png differ
diff --git a/public/images/emoji/apple/policewoman/5.png b/public/images/emoji/apple/policewoman/5.png
new file mode 100644
index 00000000000..504fc56fdb8
Binary files /dev/null and b/public/images/emoji/apple/policewoman/5.png differ
diff --git a/public/images/emoji/apple/policewoman/6.png b/public/images/emoji/apple/policewoman/6.png
new file mode 100644
index 00000000000..dc46fe34ad8
Binary files /dev/null and b/public/images/emoji/apple/policewoman/6.png differ
diff --git a/public/images/emoji/apple/poodle.png b/public/images/emoji/apple/poodle.png
index 218168a6e22..86bd66154fa 100644
Binary files a/public/images/emoji/apple/poodle.png and b/public/images/emoji/apple/poodle.png differ
diff --git a/public/images/emoji/apple/popcorn.png b/public/images/emoji/apple/popcorn.png
index 7848c24cd12..58bb4045823 100644
Binary files a/public/images/emoji/apple/popcorn.png and b/public/images/emoji/apple/popcorn.png differ
diff --git a/public/images/emoji/apple/portugal.png b/public/images/emoji/apple/portugal.png
new file mode 100644
index 00000000000..6df64adaacb
Binary files /dev/null and b/public/images/emoji/apple/portugal.png differ
diff --git a/public/images/emoji/apple/post_office.png b/public/images/emoji/apple/post_office.png
index dcc6f2a876d..53704929e23 100644
Binary files a/public/images/emoji/apple/post_office.png and b/public/images/emoji/apple/post_office.png differ
diff --git a/public/images/emoji/apple/postal_horn.png b/public/images/emoji/apple/postal_horn.png
index 5e12a664b7b..5360c36fef5 100644
Binary files a/public/images/emoji/apple/postal_horn.png and b/public/images/emoji/apple/postal_horn.png differ
diff --git a/public/images/emoji/apple/postbox.png b/public/images/emoji/apple/postbox.png
index fefd839a03e..789fbf83eb5 100644
Binary files a/public/images/emoji/apple/postbox.png and b/public/images/emoji/apple/postbox.png differ
diff --git a/public/images/emoji/apple/potable_water.png b/public/images/emoji/apple/potable_water.png
index 962dddfb3cf..9be9f1d272e 100644
Binary files a/public/images/emoji/apple/potable_water.png and b/public/images/emoji/apple/potable_water.png differ
diff --git a/public/images/emoji/apple/potato.png b/public/images/emoji/apple/potato.png
new file mode 100644
index 00000000000..3ce42b23961
Binary files /dev/null and b/public/images/emoji/apple/potato.png differ
diff --git a/public/images/emoji/apple/pouch.png b/public/images/emoji/apple/pouch.png
index 9479152ec32..b052acbdbe8 100644
Binary files a/public/images/emoji/apple/pouch.png and b/public/images/emoji/apple/pouch.png differ
diff --git a/public/images/emoji/apple/poultry_leg.png b/public/images/emoji/apple/poultry_leg.png
index 6422c0ed520..f18565b513b 100644
Binary files a/public/images/emoji/apple/poultry_leg.png and b/public/images/emoji/apple/poultry_leg.png differ
diff --git a/public/images/emoji/apple/pound.png b/public/images/emoji/apple/pound.png
index f8162548b92..4ae46e379cd 100644
Binary files a/public/images/emoji/apple/pound.png and b/public/images/emoji/apple/pound.png differ
diff --git a/public/images/emoji/apple/pouting_man.png b/public/images/emoji/apple/pouting_man.png
new file mode 100644
index 00000000000..da4378f1ca9
Binary files /dev/null and b/public/images/emoji/apple/pouting_man.png differ
diff --git a/public/images/emoji/apple/pouting_man/2.png b/public/images/emoji/apple/pouting_man/2.png
new file mode 100644
index 00000000000..3709015052c
Binary files /dev/null and b/public/images/emoji/apple/pouting_man/2.png differ
diff --git a/public/images/emoji/apple/pouting_man/3.png b/public/images/emoji/apple/pouting_man/3.png
new file mode 100644
index 00000000000..575b0d548c1
Binary files /dev/null and b/public/images/emoji/apple/pouting_man/3.png differ
diff --git a/public/images/emoji/apple/pouting_man/4.png b/public/images/emoji/apple/pouting_man/4.png
new file mode 100644
index 00000000000..874ed1a246d
Binary files /dev/null and b/public/images/emoji/apple/pouting_man/4.png differ
diff --git a/public/images/emoji/apple/pouting_man/5.png b/public/images/emoji/apple/pouting_man/5.png
new file mode 100644
index 00000000000..b2e792cb09c
Binary files /dev/null and b/public/images/emoji/apple/pouting_man/5.png differ
diff --git a/public/images/emoji/apple/pouting_man/6.png b/public/images/emoji/apple/pouting_man/6.png
new file mode 100644
index 00000000000..43e49775265
Binary files /dev/null and b/public/images/emoji/apple/pouting_man/6.png differ
diff --git a/public/images/emoji/apple/pouting_woman.png b/public/images/emoji/apple/pouting_woman.png
new file mode 100644
index 00000000000..48baa70cd72
Binary files /dev/null and b/public/images/emoji/apple/pouting_woman.png differ
diff --git a/public/images/emoji/apple/pouting_woman/2.png b/public/images/emoji/apple/pouting_woman/2.png
new file mode 100644
index 00000000000..afaf1da3bc7
Binary files /dev/null and b/public/images/emoji/apple/pouting_woman/2.png differ
diff --git a/public/images/emoji/apple/pouting_woman/3.png b/public/images/emoji/apple/pouting_woman/3.png
new file mode 100644
index 00000000000..fd78d2ab4de
Binary files /dev/null and b/public/images/emoji/apple/pouting_woman/3.png differ
diff --git a/public/images/emoji/apple/pouting_woman/4.png b/public/images/emoji/apple/pouting_woman/4.png
new file mode 100644
index 00000000000..3f525031d92
Binary files /dev/null and b/public/images/emoji/apple/pouting_woman/4.png differ
diff --git a/public/images/emoji/apple/pouting_woman/5.png b/public/images/emoji/apple/pouting_woman/5.png
new file mode 100644
index 00000000000..bf7bacdb73d
Binary files /dev/null and b/public/images/emoji/apple/pouting_woman/5.png differ
diff --git a/public/images/emoji/apple/pouting_woman/6.png b/public/images/emoji/apple/pouting_woman/6.png
new file mode 100644
index 00000000000..dbe2ffeb2ed
Binary files /dev/null and b/public/images/emoji/apple/pouting_woman/6.png differ
diff --git a/public/images/emoji/apple/pray/2.png b/public/images/emoji/apple/pray/2.png
new file mode 100644
index 00000000000..7f8fa8e3c80
Binary files /dev/null and b/public/images/emoji/apple/pray/2.png differ
diff --git a/public/images/emoji/apple/pray/3.png b/public/images/emoji/apple/pray/3.png
new file mode 100644
index 00000000000..ed1fb5987b5
Binary files /dev/null and b/public/images/emoji/apple/pray/3.png differ
diff --git a/public/images/emoji/apple/pray/4.png b/public/images/emoji/apple/pray/4.png
new file mode 100644
index 00000000000..0037c50a878
Binary files /dev/null and b/public/images/emoji/apple/pray/4.png differ
diff --git a/public/images/emoji/apple/pray/5.png b/public/images/emoji/apple/pray/5.png
new file mode 100644
index 00000000000..7be7121077a
Binary files /dev/null and b/public/images/emoji/apple/pray/5.png differ
diff --git a/public/images/emoji/apple/pray/6.png b/public/images/emoji/apple/pray/6.png
new file mode 100644
index 00000000000..171e9171e79
Binary files /dev/null and b/public/images/emoji/apple/pray/6.png differ
diff --git a/public/images/emoji/apple/prayer_beads.png b/public/images/emoji/apple/prayer_beads.png
index de7885c95a9..7ef58aaec7a 100644
Binary files a/public/images/emoji/apple/prayer_beads.png and b/public/images/emoji/apple/prayer_beads.png differ
diff --git a/public/images/emoji/apple/pregnant_woman.png b/public/images/emoji/apple/pregnant_woman.png
new file mode 100644
index 00000000000..64908a8d90a
Binary files /dev/null and b/public/images/emoji/apple/pregnant_woman.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/2.png b/public/images/emoji/apple/pregnant_woman/2.png
new file mode 100644
index 00000000000..d50b1952607
Binary files /dev/null and b/public/images/emoji/apple/pregnant_woman/2.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/3.png b/public/images/emoji/apple/pregnant_woman/3.png
new file mode 100644
index 00000000000..97d82970974
Binary files /dev/null and b/public/images/emoji/apple/pregnant_woman/3.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/4.png b/public/images/emoji/apple/pregnant_woman/4.png
new file mode 100644
index 00000000000..ef17d7c6ea7
Binary files /dev/null and b/public/images/emoji/apple/pregnant_woman/4.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/5.png b/public/images/emoji/apple/pregnant_woman/5.png
new file mode 100644
index 00000000000..b4d981d6455
Binary files /dev/null and b/public/images/emoji/apple/pregnant_woman/5.png differ
diff --git a/public/images/emoji/apple/pregnant_woman/6.png b/public/images/emoji/apple/pregnant_woman/6.png
new file mode 100644
index 00000000000..5c1b82cb2da
Binary files /dev/null and b/public/images/emoji/apple/pregnant_woman/6.png differ
diff --git a/public/images/emoji/apple/pretzel.png b/public/images/emoji/apple/pretzel.png
new file mode 100644
index 00000000000..9116d6ee9a2
Binary files /dev/null and b/public/images/emoji/apple/pretzel.png differ
diff --git a/public/images/emoji/apple/previous_track.png b/public/images/emoji/apple/previous_track.png
index 401b24b9a7e..881bf59b29b 100644
Binary files a/public/images/emoji/apple/previous_track.png and b/public/images/emoji/apple/previous_track.png differ
diff --git a/public/images/emoji/apple/previous_track_button.png b/public/images/emoji/apple/previous_track_button.png
new file mode 100644
index 00000000000..881bf59b29b
Binary files /dev/null and b/public/images/emoji/apple/previous_track_button.png differ
diff --git a/public/images/emoji/apple/prince.png b/public/images/emoji/apple/prince.png
new file mode 100644
index 00000000000..5dc77f3fdc7
Binary files /dev/null and b/public/images/emoji/apple/prince.png differ
diff --git a/public/images/emoji/apple/prince/2.png b/public/images/emoji/apple/prince/2.png
new file mode 100644
index 00000000000..38a259bee47
Binary files /dev/null and b/public/images/emoji/apple/prince/2.png differ
diff --git a/public/images/emoji/apple/prince/3.png b/public/images/emoji/apple/prince/3.png
new file mode 100644
index 00000000000..21878b6a2b0
Binary files /dev/null and b/public/images/emoji/apple/prince/3.png differ
diff --git a/public/images/emoji/apple/prince/4.png b/public/images/emoji/apple/prince/4.png
new file mode 100644
index 00000000000..54c1aa3bc0f
Binary files /dev/null and b/public/images/emoji/apple/prince/4.png differ
diff --git a/public/images/emoji/apple/prince/5.png b/public/images/emoji/apple/prince/5.png
new file mode 100644
index 00000000000..108d577bf2f
Binary files /dev/null and b/public/images/emoji/apple/prince/5.png differ
diff --git a/public/images/emoji/apple/prince/6.png b/public/images/emoji/apple/prince/6.png
new file mode 100644
index 00000000000..0de534fc1e9
Binary files /dev/null and b/public/images/emoji/apple/prince/6.png differ
diff --git a/public/images/emoji/apple/princess.png b/public/images/emoji/apple/princess.png
index 78c7c88e6f0..86cb4bd51a2 100644
Binary files a/public/images/emoji/apple/princess.png and b/public/images/emoji/apple/princess.png differ
diff --git a/public/images/emoji/apple/princess/2.png b/public/images/emoji/apple/princess/2.png
new file mode 100644
index 00000000000..fd032d30e45
Binary files /dev/null and b/public/images/emoji/apple/princess/2.png differ
diff --git a/public/images/emoji/apple/princess/3.png b/public/images/emoji/apple/princess/3.png
new file mode 100644
index 00000000000..7adb956f024
Binary files /dev/null and b/public/images/emoji/apple/princess/3.png differ
diff --git a/public/images/emoji/apple/princess/4.png b/public/images/emoji/apple/princess/4.png
new file mode 100644
index 00000000000..ea48b643f71
Binary files /dev/null and b/public/images/emoji/apple/princess/4.png differ
diff --git a/public/images/emoji/apple/princess/5.png b/public/images/emoji/apple/princess/5.png
new file mode 100644
index 00000000000..10caffb58be
Binary files /dev/null and b/public/images/emoji/apple/princess/5.png differ
diff --git a/public/images/emoji/apple/princess/6.png b/public/images/emoji/apple/princess/6.png
new file mode 100644
index 00000000000..f9d5eb42c52
Binary files /dev/null and b/public/images/emoji/apple/princess/6.png differ
diff --git a/public/images/emoji/apple/printer.png b/public/images/emoji/apple/printer.png
index 01455a9eb94..3ce50192db3 100644
Binary files a/public/images/emoji/apple/printer.png and b/public/images/emoji/apple/printer.png differ
diff --git a/public/images/emoji/apple/projector.png b/public/images/emoji/apple/projector.png
index 788f131ec08..add4400d044 100644
Binary files a/public/images/emoji/apple/projector.png and b/public/images/emoji/apple/projector.png differ
diff --git a/public/images/emoji/apple/puerto_rico.png b/public/images/emoji/apple/puerto_rico.png
new file mode 100644
index 00000000000..748dff18696
Binary files /dev/null and b/public/images/emoji/apple/puerto_rico.png differ
diff --git a/public/images/emoji/apple/punch/2.png b/public/images/emoji/apple/punch/2.png
new file mode 100644
index 00000000000..1c8dd8dbf32
Binary files /dev/null and b/public/images/emoji/apple/punch/2.png differ
diff --git a/public/images/emoji/apple/punch/3.png b/public/images/emoji/apple/punch/3.png
new file mode 100644
index 00000000000..39deb2c7e8c
Binary files /dev/null and b/public/images/emoji/apple/punch/3.png differ
diff --git a/public/images/emoji/apple/punch/4.png b/public/images/emoji/apple/punch/4.png
new file mode 100644
index 00000000000..ef6df0b9330
Binary files /dev/null and b/public/images/emoji/apple/punch/4.png differ
diff --git a/public/images/emoji/apple/punch/5.png b/public/images/emoji/apple/punch/5.png
new file mode 100644
index 00000000000..8552732ad40
Binary files /dev/null and b/public/images/emoji/apple/punch/5.png differ
diff --git a/public/images/emoji/apple/punch/6.png b/public/images/emoji/apple/punch/6.png
new file mode 100644
index 00000000000..24f4a3071ab
Binary files /dev/null and b/public/images/emoji/apple/punch/6.png differ
diff --git a/public/images/emoji/apple/purple_heart.png b/public/images/emoji/apple/purple_heart.png
index 63681f71b7c..6ebc2e54197 100644
Binary files a/public/images/emoji/apple/purple_heart.png and b/public/images/emoji/apple/purple_heart.png differ
diff --git a/public/images/emoji/apple/purse.png b/public/images/emoji/apple/purse.png
index 2b7045032d0..e208e933bf8 100644
Binary files a/public/images/emoji/apple/purse.png and b/public/images/emoji/apple/purse.png differ
diff --git a/public/images/emoji/apple/pushpin.png b/public/images/emoji/apple/pushpin.png
index 9edfcb209f7..ab89e75001a 100644
Binary files a/public/images/emoji/apple/pushpin.png and b/public/images/emoji/apple/pushpin.png differ
diff --git a/public/images/emoji/apple/put_litter_in_its_place.png b/public/images/emoji/apple/put_litter_in_its_place.png
index d99576f1776..bae7da4db60 100644
Binary files a/public/images/emoji/apple/put_litter_in_its_place.png and b/public/images/emoji/apple/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/apple/qatar.png b/public/images/emoji/apple/qatar.png
new file mode 100644
index 00000000000..c73ce36292d
Binary files /dev/null and b/public/images/emoji/apple/qatar.png differ
diff --git a/public/images/emoji/apple/question.png b/public/images/emoji/apple/question.png
index 5273e65c8d6..6136129e083 100644
Binary files a/public/images/emoji/apple/question.png and b/public/images/emoji/apple/question.png differ
diff --git a/public/images/emoji/apple/rabbit.png b/public/images/emoji/apple/rabbit.png
index 232f7ef4180..33cdc5e1e83 100644
Binary files a/public/images/emoji/apple/rabbit.png and b/public/images/emoji/apple/rabbit.png differ
diff --git a/public/images/emoji/apple/rabbit2.png b/public/images/emoji/apple/rabbit2.png
index c59fcf7f27f..77ae0528f9c 100644
Binary files a/public/images/emoji/apple/rabbit2.png and b/public/images/emoji/apple/rabbit2.png differ
diff --git a/public/images/emoji/apple/race_car.png b/public/images/emoji/apple/race_car.png
index 7a0e60d6545..f49f95cbbdb 100644
Binary files a/public/images/emoji/apple/race_car.png and b/public/images/emoji/apple/race_car.png differ
diff --git a/public/images/emoji/apple/racehorse.png b/public/images/emoji/apple/racehorse.png
index 79f965c387e..fcd23dd3009 100644
Binary files a/public/images/emoji/apple/racehorse.png and b/public/images/emoji/apple/racehorse.png differ
diff --git a/public/images/emoji/apple/racing_car.png b/public/images/emoji/apple/racing_car.png
index 7a0e60d6545..f49f95cbbdb 100644
Binary files a/public/images/emoji/apple/racing_car.png and b/public/images/emoji/apple/racing_car.png differ
diff --git a/public/images/emoji/apple/racing_motorcycle.png b/public/images/emoji/apple/racing_motorcycle.png
index 92aa5660f22..4ae8f0c685c 100644
Binary files a/public/images/emoji/apple/racing_motorcycle.png and b/public/images/emoji/apple/racing_motorcycle.png differ
diff --git a/public/images/emoji/apple/radio.png b/public/images/emoji/apple/radio.png
index cb0569f07fc..89a4c7f99e4 100644
Binary files a/public/images/emoji/apple/radio.png and b/public/images/emoji/apple/radio.png differ
diff --git a/public/images/emoji/apple/radio_button.png b/public/images/emoji/apple/radio_button.png
index 85df5dd38a3..8ef670a1148 100644
Binary files a/public/images/emoji/apple/radio_button.png and b/public/images/emoji/apple/radio_button.png differ
diff --git a/public/images/emoji/apple/radioactive.png b/public/images/emoji/apple/radioactive.png
index 395debfe2cd..377a1f98da5 100644
Binary files a/public/images/emoji/apple/radioactive.png and b/public/images/emoji/apple/radioactive.png differ
diff --git a/public/images/emoji/apple/radioactive_sign.png b/public/images/emoji/apple/radioactive_sign.png
index 395debfe2cd..377a1f98da5 100644
Binary files a/public/images/emoji/apple/radioactive_sign.png and b/public/images/emoji/apple/radioactive_sign.png differ
diff --git a/public/images/emoji/apple/railroad_track.png b/public/images/emoji/apple/railroad_track.png
index 0ad74c72965..e5d9b45d901 100644
Binary files a/public/images/emoji/apple/railroad_track.png and b/public/images/emoji/apple/railroad_track.png differ
diff --git a/public/images/emoji/apple/railway_car.png b/public/images/emoji/apple/railway_car.png
index afd4045d650..d75fb01377b 100644
Binary files a/public/images/emoji/apple/railway_car.png and b/public/images/emoji/apple/railway_car.png differ
diff --git a/public/images/emoji/apple/railway_track.png b/public/images/emoji/apple/railway_track.png
index 0ad74c72965..e5d9b45d901 100644
Binary files a/public/images/emoji/apple/railway_track.png and b/public/images/emoji/apple/railway_track.png differ
diff --git a/public/images/emoji/apple/rainbow.png b/public/images/emoji/apple/rainbow.png
index acb73cf9964..d547ce1edc0 100644
Binary files a/public/images/emoji/apple/rainbow.png and b/public/images/emoji/apple/rainbow.png differ
diff --git a/public/images/emoji/apple/rainbow_flag.png b/public/images/emoji/apple/rainbow_flag.png
new file mode 100644
index 00000000000..7f6e0d9516c
Binary files /dev/null and b/public/images/emoji/apple/rainbow_flag.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand.png b/public/images/emoji/apple/raised_back_of_hand.png
new file mode 100644
index 00000000000..298328446aa
Binary files /dev/null and b/public/images/emoji/apple/raised_back_of_hand.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/2.png b/public/images/emoji/apple/raised_back_of_hand/2.png
new file mode 100644
index 00000000000..cd2aa88ab9d
Binary files /dev/null and b/public/images/emoji/apple/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/3.png b/public/images/emoji/apple/raised_back_of_hand/3.png
new file mode 100644
index 00000000000..ddbf05d1eee
Binary files /dev/null and b/public/images/emoji/apple/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/4.png b/public/images/emoji/apple/raised_back_of_hand/4.png
new file mode 100644
index 00000000000..c6ab99cb9a6
Binary files /dev/null and b/public/images/emoji/apple/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/5.png b/public/images/emoji/apple/raised_back_of_hand/5.png
new file mode 100644
index 00000000000..e4ec5fc11e0
Binary files /dev/null and b/public/images/emoji/apple/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/apple/raised_back_of_hand/6.png b/public/images/emoji/apple/raised_back_of_hand/6.png
new file mode 100644
index 00000000000..c9fe1ea37be
Binary files /dev/null and b/public/images/emoji/apple/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/apple/raised_hand/2.png b/public/images/emoji/apple/raised_hand/2.png
new file mode 100644
index 00000000000..f0fd83faaa5
Binary files /dev/null and b/public/images/emoji/apple/raised_hand/2.png differ
diff --git a/public/images/emoji/apple/raised_hand/3.png b/public/images/emoji/apple/raised_hand/3.png
new file mode 100644
index 00000000000..7df90232ae7
Binary files /dev/null and b/public/images/emoji/apple/raised_hand/3.png differ
diff --git a/public/images/emoji/apple/raised_hand/4.png b/public/images/emoji/apple/raised_hand/4.png
new file mode 100644
index 00000000000..979c0c414d1
Binary files /dev/null and b/public/images/emoji/apple/raised_hand/4.png differ
diff --git a/public/images/emoji/apple/raised_hand/5.png b/public/images/emoji/apple/raised_hand/5.png
new file mode 100644
index 00000000000..dee9188f4d1
Binary files /dev/null and b/public/images/emoji/apple/raised_hand/5.png differ
diff --git a/public/images/emoji/apple/raised_hand/6.png b/public/images/emoji/apple/raised_hand/6.png
new file mode 100644
index 00000000000..9ae2da2c021
Binary files /dev/null and b/public/images/emoji/apple/raised_hand/6.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png
new file mode 100644
index 00000000000..35c3b9b3502
Binary files /dev/null and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png
new file mode 100644
index 00000000000..6757e8a1e2b
Binary files /dev/null and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png
new file mode 100644
index 00000000000..2583736a585
Binary files /dev/null and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png
new file mode 100644
index 00000000000..11cb8caa11d
Binary files /dev/null and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png
new file mode 100644
index 00000000000..eed63072bd5
Binary files /dev/null and b/public/images/emoji/apple/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png
new file mode 100644
index 00000000000..9c277890adf
Binary files /dev/null and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png
new file mode 100644
index 00000000000..8d6940ee24d
Binary files /dev/null and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png
new file mode 100644
index 00000000000..fe549c3e2c6
Binary files /dev/null and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png
new file mode 100644
index 00000000000..4ad8b9df458
Binary files /dev/null and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png
new file mode 100644
index 00000000000..af23814474e
Binary files /dev/null and b/public/images/emoji/apple/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/apple/raised_hands/2.png b/public/images/emoji/apple/raised_hands/2.png
new file mode 100644
index 00000000000..b365d346921
Binary files /dev/null and b/public/images/emoji/apple/raised_hands/2.png differ
diff --git a/public/images/emoji/apple/raised_hands/3.png b/public/images/emoji/apple/raised_hands/3.png
new file mode 100644
index 00000000000..f504e7e9f80
Binary files /dev/null and b/public/images/emoji/apple/raised_hands/3.png differ
diff --git a/public/images/emoji/apple/raised_hands/4.png b/public/images/emoji/apple/raised_hands/4.png
new file mode 100644
index 00000000000..af3dc8af632
Binary files /dev/null and b/public/images/emoji/apple/raised_hands/4.png differ
diff --git a/public/images/emoji/apple/raised_hands/5.png b/public/images/emoji/apple/raised_hands/5.png
new file mode 100644
index 00000000000..9ba1a0c65e1
Binary files /dev/null and b/public/images/emoji/apple/raised_hands/5.png differ
diff --git a/public/images/emoji/apple/raised_hands/6.png b/public/images/emoji/apple/raised_hands/6.png
new file mode 100644
index 00000000000..35e4fb95e85
Binary files /dev/null and b/public/images/emoji/apple/raised_hands/6.png differ
diff --git a/public/images/emoji/apple/raising_hand.png b/public/images/emoji/apple/raising_hand.png
index 298974d579b..c66b9820a33 100644
Binary files a/public/images/emoji/apple/raising_hand.png and b/public/images/emoji/apple/raising_hand.png differ
diff --git a/public/images/emoji/apple/raising_hand/2.png b/public/images/emoji/apple/raising_hand/2.png
new file mode 100644
index 00000000000..23451343429
Binary files /dev/null and b/public/images/emoji/apple/raising_hand/2.png differ
diff --git a/public/images/emoji/apple/raising_hand/3.png b/public/images/emoji/apple/raising_hand/3.png
new file mode 100644
index 00000000000..25342333095
Binary files /dev/null and b/public/images/emoji/apple/raising_hand/3.png differ
diff --git a/public/images/emoji/apple/raising_hand/4.png b/public/images/emoji/apple/raising_hand/4.png
new file mode 100644
index 00000000000..a7ea94e72e0
Binary files /dev/null and b/public/images/emoji/apple/raising_hand/4.png differ
diff --git a/public/images/emoji/apple/raising_hand/5.png b/public/images/emoji/apple/raising_hand/5.png
new file mode 100644
index 00000000000..4a2d2775fa7
Binary files /dev/null and b/public/images/emoji/apple/raising_hand/5.png differ
diff --git a/public/images/emoji/apple/raising_hand/6.png b/public/images/emoji/apple/raising_hand/6.png
new file mode 100644
index 00000000000..f5dfa976cb7
Binary files /dev/null and b/public/images/emoji/apple/raising_hand/6.png differ
diff --git a/public/images/emoji/apple/raising_hand_man.png b/public/images/emoji/apple/raising_hand_man.png
new file mode 100644
index 00000000000..aed3b88527f
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_man.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/2.png b/public/images/emoji/apple/raising_hand_man/2.png
new file mode 100644
index 00000000000..afa72a8c874
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_man/2.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/3.png b/public/images/emoji/apple/raising_hand_man/3.png
new file mode 100644
index 00000000000..78cb3fe314d
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_man/3.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/4.png b/public/images/emoji/apple/raising_hand_man/4.png
new file mode 100644
index 00000000000..f47160bb3be
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_man/4.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/5.png b/public/images/emoji/apple/raising_hand_man/5.png
new file mode 100644
index 00000000000..096e8e74245
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_man/5.png differ
diff --git a/public/images/emoji/apple/raising_hand_man/6.png b/public/images/emoji/apple/raising_hand_man/6.png
new file mode 100644
index 00000000000..3aa54e5a812
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_man/6.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman.png b/public/images/emoji/apple/raising_hand_woman.png
new file mode 100644
index 00000000000..c66b9820a33
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_woman.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/2.png b/public/images/emoji/apple/raising_hand_woman/2.png
new file mode 100644
index 00000000000..23451343429
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/3.png b/public/images/emoji/apple/raising_hand_woman/3.png
new file mode 100644
index 00000000000..25342333095
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/4.png b/public/images/emoji/apple/raising_hand_woman/4.png
new file mode 100644
index 00000000000..a7ea94e72e0
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/5.png b/public/images/emoji/apple/raising_hand_woman/5.png
new file mode 100644
index 00000000000..4a2d2775fa7
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/apple/raising_hand_woman/6.png b/public/images/emoji/apple/raising_hand_woman/6.png
new file mode 100644
index 00000000000..f5dfa976cb7
Binary files /dev/null and b/public/images/emoji/apple/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/apple/ram.png b/public/images/emoji/apple/ram.png
index 30bf93624d9..3b745d612ce 100644
Binary files a/public/images/emoji/apple/ram.png and b/public/images/emoji/apple/ram.png differ
diff --git a/public/images/emoji/apple/ramen.png b/public/images/emoji/apple/ramen.png
index 6e014326240..76688ab65dc 100644
Binary files a/public/images/emoji/apple/ramen.png and b/public/images/emoji/apple/ramen.png differ
diff --git a/public/images/emoji/apple/rat.png b/public/images/emoji/apple/rat.png
index c7a48c9d839..04d33163d62 100644
Binary files a/public/images/emoji/apple/rat.png and b/public/images/emoji/apple/rat.png differ
diff --git a/public/images/emoji/apple/record_button.png b/public/images/emoji/apple/record_button.png
index 72073804b7a..3f27cae7bac 100644
Binary files a/public/images/emoji/apple/record_button.png and b/public/images/emoji/apple/record_button.png differ
diff --git a/public/images/emoji/apple/recycle.png b/public/images/emoji/apple/recycle.png
index 6352a3119cc..26000942ba6 100644
Binary files a/public/images/emoji/apple/recycle.png and b/public/images/emoji/apple/recycle.png differ
diff --git a/public/images/emoji/apple/red_car.png b/public/images/emoji/apple/red_car.png
index de18c2caaa2..2b59419e4b1 100644
Binary files a/public/images/emoji/apple/red_car.png and b/public/images/emoji/apple/red_car.png differ
diff --git a/public/images/emoji/apple/red_circle.png b/public/images/emoji/apple/red_circle.png
index 7e4a6f231bf..83ac2291442 100644
Binary files a/public/images/emoji/apple/red_circle.png and b/public/images/emoji/apple/red_circle.png differ
diff --git a/public/images/emoji/apple/registered.png b/public/images/emoji/apple/registered.png
index e62af0ab9bc..e90bf656b99 100644
Binary files a/public/images/emoji/apple/registered.png and b/public/images/emoji/apple/registered.png differ
diff --git a/public/images/emoji/apple/reminder_ribbon.png b/public/images/emoji/apple/reminder_ribbon.png
index ba779426def..b79ce8b83f6 100644
Binary files a/public/images/emoji/apple/reminder_ribbon.png and b/public/images/emoji/apple/reminder_ribbon.png differ
diff --git a/public/images/emoji/apple/repeat.png b/public/images/emoji/apple/repeat.png
index f7b282798a1..ea778f215d2 100644
Binary files a/public/images/emoji/apple/repeat.png and b/public/images/emoji/apple/repeat.png differ
diff --git a/public/images/emoji/apple/repeat_one.png b/public/images/emoji/apple/repeat_one.png
index e3a3286577b..660a4298dc7 100644
Binary files a/public/images/emoji/apple/repeat_one.png and b/public/images/emoji/apple/repeat_one.png differ
diff --git a/public/images/emoji/apple/rescue_worker_helmet.png b/public/images/emoji/apple/rescue_worker_helmet.png
new file mode 100644
index 00000000000..6440b55c340
Binary files /dev/null and b/public/images/emoji/apple/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/apple/restroom.png b/public/images/emoji/apple/restroom.png
index e271244aef2..7d5bef7cec4 100644
Binary files a/public/images/emoji/apple/restroom.png and b/public/images/emoji/apple/restroom.png differ
diff --git a/public/images/emoji/apple/reunion.png b/public/images/emoji/apple/reunion.png
new file mode 100644
index 00000000000..6efb29e5bfe
Binary files /dev/null and b/public/images/emoji/apple/reunion.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png
new file mode 100644
index 00000000000..ce95c6a8be5
Binary files /dev/null and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png
new file mode 100644
index 00000000000..33eec03fd41
Binary files /dev/null and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png
new file mode 100644
index 00000000000..10487652927
Binary files /dev/null and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png
new file mode 100644
index 00000000000..6f577d03de8
Binary files /dev/null and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png
new file mode 100644
index 00000000000..58349f45b1f
Binary files /dev/null and b/public/images/emoji/apple/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/apple/revolving_hearts.png b/public/images/emoji/apple/revolving_hearts.png
index 836a81c8eb6..2d1cd362003 100644
Binary files a/public/images/emoji/apple/revolving_hearts.png and b/public/images/emoji/apple/revolving_hearts.png differ
diff --git a/public/images/emoji/apple/rewind.png b/public/images/emoji/apple/rewind.png
index 2821a83a0a2..8703e2c503c 100644
Binary files a/public/images/emoji/apple/rewind.png and b/public/images/emoji/apple/rewind.png differ
diff --git a/public/images/emoji/apple/rhinoceros.png b/public/images/emoji/apple/rhinoceros.png
new file mode 100644
index 00000000000..9e01ebe47e1
Binary files /dev/null and b/public/images/emoji/apple/rhinoceros.png differ
diff --git a/public/images/emoji/apple/ribbon.png b/public/images/emoji/apple/ribbon.png
index aaa3eadf65b..4d898d1526d 100644
Binary files a/public/images/emoji/apple/ribbon.png and b/public/images/emoji/apple/ribbon.png differ
diff --git a/public/images/emoji/apple/rice.png b/public/images/emoji/apple/rice.png
index f6daa17c3ba..c4271c4399f 100644
Binary files a/public/images/emoji/apple/rice.png and b/public/images/emoji/apple/rice.png differ
diff --git a/public/images/emoji/apple/rice_ball.png b/public/images/emoji/apple/rice_ball.png
index dc64d4dcbee..7444782a08d 100644
Binary files a/public/images/emoji/apple/rice_ball.png and b/public/images/emoji/apple/rice_ball.png differ
diff --git a/public/images/emoji/apple/rice_cracker.png b/public/images/emoji/apple/rice_cracker.png
index e8793fceab1..1b7155898cd 100644
Binary files a/public/images/emoji/apple/rice_cracker.png and b/public/images/emoji/apple/rice_cracker.png differ
diff --git a/public/images/emoji/apple/rice_scene.png b/public/images/emoji/apple/rice_scene.png
index fddaa4def2a..b3bbecd88e6 100644
Binary files a/public/images/emoji/apple/rice_scene.png and b/public/images/emoji/apple/rice_scene.png differ
diff --git a/public/images/emoji/apple/right_anger_bubble.png b/public/images/emoji/apple/right_anger_bubble.png
index af8a6055fad..95cf61d6ddc 100644
Binary files a/public/images/emoji/apple/right_anger_bubble.png and b/public/images/emoji/apple/right_anger_bubble.png differ
diff --git a/public/images/emoji/apple/ring.png b/public/images/emoji/apple/ring.png
index 02e8c86a222..e70850a1708 100644
Binary files a/public/images/emoji/apple/ring.png and b/public/images/emoji/apple/ring.png differ
diff --git a/public/images/emoji/apple/rocket.png b/public/images/emoji/apple/rocket.png
index 7c47d039982..8ae60dfcaae 100644
Binary files a/public/images/emoji/apple/rocket.png and b/public/images/emoji/apple/rocket.png differ
diff --git a/public/images/emoji/apple/rofl.png b/public/images/emoji/apple/rofl.png
new file mode 100644
index 00000000000..59488bcf37c
Binary files /dev/null and b/public/images/emoji/apple/rofl.png differ
diff --git a/public/images/emoji/apple/roll_eyes.png b/public/images/emoji/apple/roll_eyes.png
new file mode 100644
index 00000000000..4da789951ae
Binary files /dev/null and b/public/images/emoji/apple/roll_eyes.png differ
diff --git a/public/images/emoji/apple/rolled_up_newspaper.png b/public/images/emoji/apple/rolled_up_newspaper.png
index 9a619ecbcb4..400b0805699 100644
Binary files a/public/images/emoji/apple/rolled_up_newspaper.png and b/public/images/emoji/apple/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/apple/roller_coaster.png b/public/images/emoji/apple/roller_coaster.png
index 693516301b3..e44cc5e7343 100644
Binary files a/public/images/emoji/apple/roller_coaster.png and b/public/images/emoji/apple/roller_coaster.png differ
diff --git a/public/images/emoji/apple/romania.png b/public/images/emoji/apple/romania.png
new file mode 100644
index 00000000000..2cf4dca9a17
Binary files /dev/null and b/public/images/emoji/apple/romania.png differ
diff --git a/public/images/emoji/apple/rooster.png b/public/images/emoji/apple/rooster.png
index 9b94888dd50..9811e82dde3 100644
Binary files a/public/images/emoji/apple/rooster.png and b/public/images/emoji/apple/rooster.png differ
diff --git a/public/images/emoji/apple/rose.png b/public/images/emoji/apple/rose.png
index 57bf14b36de..1b4808817b4 100644
Binary files a/public/images/emoji/apple/rose.png and b/public/images/emoji/apple/rose.png differ
diff --git a/public/images/emoji/apple/rosette.png b/public/images/emoji/apple/rosette.png
index 3744d5c65c8..ddd064e4e73 100644
Binary files a/public/images/emoji/apple/rosette.png and b/public/images/emoji/apple/rosette.png differ
diff --git a/public/images/emoji/apple/rotating_light.png b/public/images/emoji/apple/rotating_light.png
index 2bc1b615b10..d33e164550e 100644
Binary files a/public/images/emoji/apple/rotating_light.png and b/public/images/emoji/apple/rotating_light.png differ
diff --git a/public/images/emoji/apple/round_pushpin.png b/public/images/emoji/apple/round_pushpin.png
index d14521f4ca3..27ecb89da13 100644
Binary files a/public/images/emoji/apple/round_pushpin.png and b/public/images/emoji/apple/round_pushpin.png differ
diff --git a/public/images/emoji/apple/rowboat/2.png b/public/images/emoji/apple/rowboat/2.png
new file mode 100644
index 00000000000..d390d56ad12
Binary files /dev/null and b/public/images/emoji/apple/rowboat/2.png differ
diff --git a/public/images/emoji/apple/rowboat/3.png b/public/images/emoji/apple/rowboat/3.png
new file mode 100644
index 00000000000..6ef5342a647
Binary files /dev/null and b/public/images/emoji/apple/rowboat/3.png differ
diff --git a/public/images/emoji/apple/rowboat/4.png b/public/images/emoji/apple/rowboat/4.png
new file mode 100644
index 00000000000..bfc368477e2
Binary files /dev/null and b/public/images/emoji/apple/rowboat/4.png differ
diff --git a/public/images/emoji/apple/rowboat/5.png b/public/images/emoji/apple/rowboat/5.png
new file mode 100644
index 00000000000..a1473188e94
Binary files /dev/null and b/public/images/emoji/apple/rowboat/5.png differ
diff --git a/public/images/emoji/apple/rowboat/6.png b/public/images/emoji/apple/rowboat/6.png
new file mode 100644
index 00000000000..93cfe0f87f7
Binary files /dev/null and b/public/images/emoji/apple/rowboat/6.png differ
diff --git a/public/images/emoji/apple/rowing_man.png b/public/images/emoji/apple/rowing_man.png
new file mode 100644
index 00000000000..412e6ed7f3b
Binary files /dev/null and b/public/images/emoji/apple/rowing_man.png differ
diff --git a/public/images/emoji/apple/rowing_man/2.png b/public/images/emoji/apple/rowing_man/2.png
new file mode 100644
index 00000000000..d390d56ad12
Binary files /dev/null and b/public/images/emoji/apple/rowing_man/2.png differ
diff --git a/public/images/emoji/apple/rowing_man/3.png b/public/images/emoji/apple/rowing_man/3.png
new file mode 100644
index 00000000000..6ef5342a647
Binary files /dev/null and b/public/images/emoji/apple/rowing_man/3.png differ
diff --git a/public/images/emoji/apple/rowing_man/4.png b/public/images/emoji/apple/rowing_man/4.png
new file mode 100644
index 00000000000..bfc368477e2
Binary files /dev/null and b/public/images/emoji/apple/rowing_man/4.png differ
diff --git a/public/images/emoji/apple/rowing_man/5.png b/public/images/emoji/apple/rowing_man/5.png
new file mode 100644
index 00000000000..a1473188e94
Binary files /dev/null and b/public/images/emoji/apple/rowing_man/5.png differ
diff --git a/public/images/emoji/apple/rowing_man/6.png b/public/images/emoji/apple/rowing_man/6.png
new file mode 100644
index 00000000000..93cfe0f87f7
Binary files /dev/null and b/public/images/emoji/apple/rowing_man/6.png differ
diff --git a/public/images/emoji/apple/rowing_woman.png b/public/images/emoji/apple/rowing_woman.png
new file mode 100644
index 00000000000..06d080bf6f6
Binary files /dev/null and b/public/images/emoji/apple/rowing_woman.png differ
diff --git a/public/images/emoji/apple/rowing_woman/2.png b/public/images/emoji/apple/rowing_woman/2.png
new file mode 100644
index 00000000000..6ba3fb0c1ce
Binary files /dev/null and b/public/images/emoji/apple/rowing_woman/2.png differ
diff --git a/public/images/emoji/apple/rowing_woman/3.png b/public/images/emoji/apple/rowing_woman/3.png
new file mode 100644
index 00000000000..bc3b1647a1d
Binary files /dev/null and b/public/images/emoji/apple/rowing_woman/3.png differ
diff --git a/public/images/emoji/apple/rowing_woman/4.png b/public/images/emoji/apple/rowing_woman/4.png
new file mode 100644
index 00000000000..872e2d34334
Binary files /dev/null and b/public/images/emoji/apple/rowing_woman/4.png differ
diff --git a/public/images/emoji/apple/rowing_woman/5.png b/public/images/emoji/apple/rowing_woman/5.png
new file mode 100644
index 00000000000..b0466da8e42
Binary files /dev/null and b/public/images/emoji/apple/rowing_woman/5.png differ
diff --git a/public/images/emoji/apple/rowing_woman/6.png b/public/images/emoji/apple/rowing_woman/6.png
new file mode 100644
index 00000000000..90854899ffa
Binary files /dev/null and b/public/images/emoji/apple/rowing_woman/6.png differ
diff --git a/public/images/emoji/apple/rugby_football.png b/public/images/emoji/apple/rugby_football.png
index 89d48a8c7d5..6e05e18f43a 100644
Binary files a/public/images/emoji/apple/rugby_football.png and b/public/images/emoji/apple/rugby_football.png differ
diff --git a/public/images/emoji/apple/runner/2.png b/public/images/emoji/apple/runner/2.png
new file mode 100644
index 00000000000..d3efc0f73d8
Binary files /dev/null and b/public/images/emoji/apple/runner/2.png differ
diff --git a/public/images/emoji/apple/runner/3.png b/public/images/emoji/apple/runner/3.png
new file mode 100644
index 00000000000..3647d58222d
Binary files /dev/null and b/public/images/emoji/apple/runner/3.png differ
diff --git a/public/images/emoji/apple/runner/4.png b/public/images/emoji/apple/runner/4.png
new file mode 100644
index 00000000000..1c09cf1ec4d
Binary files /dev/null and b/public/images/emoji/apple/runner/4.png differ
diff --git a/public/images/emoji/apple/runner/5.png b/public/images/emoji/apple/runner/5.png
new file mode 100644
index 00000000000..4a9e54bd183
Binary files /dev/null and b/public/images/emoji/apple/runner/5.png differ
diff --git a/public/images/emoji/apple/runner/6.png b/public/images/emoji/apple/runner/6.png
new file mode 100644
index 00000000000..79c08ed0b7d
Binary files /dev/null and b/public/images/emoji/apple/runner/6.png differ
diff --git a/public/images/emoji/apple/running_man.png b/public/images/emoji/apple/running_man.png
new file mode 100644
index 00000000000..a54c9f58e97
Binary files /dev/null and b/public/images/emoji/apple/running_man.png differ
diff --git a/public/images/emoji/apple/running_man/2.png b/public/images/emoji/apple/running_man/2.png
new file mode 100644
index 00000000000..d3efc0f73d8
Binary files /dev/null and b/public/images/emoji/apple/running_man/2.png differ
diff --git a/public/images/emoji/apple/running_man/3.png b/public/images/emoji/apple/running_man/3.png
new file mode 100644
index 00000000000..3647d58222d
Binary files /dev/null and b/public/images/emoji/apple/running_man/3.png differ
diff --git a/public/images/emoji/apple/running_man/4.png b/public/images/emoji/apple/running_man/4.png
new file mode 100644
index 00000000000..1c09cf1ec4d
Binary files /dev/null and b/public/images/emoji/apple/running_man/4.png differ
diff --git a/public/images/emoji/apple/running_man/5.png b/public/images/emoji/apple/running_man/5.png
new file mode 100644
index 00000000000..4a9e54bd183
Binary files /dev/null and b/public/images/emoji/apple/running_man/5.png differ
diff --git a/public/images/emoji/apple/running_man/6.png b/public/images/emoji/apple/running_man/6.png
new file mode 100644
index 00000000000..79c08ed0b7d
Binary files /dev/null and b/public/images/emoji/apple/running_man/6.png differ
diff --git a/public/images/emoji/apple/running_shirt_with_sash.png b/public/images/emoji/apple/running_shirt_with_sash.png
index 59b2c36f9b7..bc14ee0a364 100644
Binary files a/public/images/emoji/apple/running_shirt_with_sash.png and b/public/images/emoji/apple/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/apple/running_woman.png b/public/images/emoji/apple/running_woman.png
new file mode 100644
index 00000000000..593cef257a9
Binary files /dev/null and b/public/images/emoji/apple/running_woman.png differ
diff --git a/public/images/emoji/apple/running_woman/2.png b/public/images/emoji/apple/running_woman/2.png
new file mode 100644
index 00000000000..6611c5ffaf4
Binary files /dev/null and b/public/images/emoji/apple/running_woman/2.png differ
diff --git a/public/images/emoji/apple/running_woman/3.png b/public/images/emoji/apple/running_woman/3.png
new file mode 100644
index 00000000000..7324b8214c3
Binary files /dev/null and b/public/images/emoji/apple/running_woman/3.png differ
diff --git a/public/images/emoji/apple/running_woman/4.png b/public/images/emoji/apple/running_woman/4.png
new file mode 100644
index 00000000000..bf45719ea0b
Binary files /dev/null and b/public/images/emoji/apple/running_woman/4.png differ
diff --git a/public/images/emoji/apple/running_woman/5.png b/public/images/emoji/apple/running_woman/5.png
new file mode 100644
index 00000000000..d08dacb1b30
Binary files /dev/null and b/public/images/emoji/apple/running_woman/5.png differ
diff --git a/public/images/emoji/apple/running_woman/6.png b/public/images/emoji/apple/running_woman/6.png
new file mode 100644
index 00000000000..3e061ca8eda
Binary files /dev/null and b/public/images/emoji/apple/running_woman/6.png differ
diff --git a/public/images/emoji/apple/rwanda.png b/public/images/emoji/apple/rwanda.png
new file mode 100644
index 00000000000..736d4cb1ef4
Binary files /dev/null and b/public/images/emoji/apple/rwanda.png differ
diff --git a/public/images/emoji/apple/sa.png b/public/images/emoji/apple/sa.png
index 5d09d0e67b1..c4c202a7ad3 100644
Binary files a/public/images/emoji/apple/sa.png and b/public/images/emoji/apple/sa.png differ
diff --git a/public/images/emoji/apple/sagittarius.png b/public/images/emoji/apple/sagittarius.png
index 29f0aa8aa49..5038b3f0bf5 100644
Binary files a/public/images/emoji/apple/sagittarius.png and b/public/images/emoji/apple/sagittarius.png differ
diff --git a/public/images/emoji/apple/sailboat.png b/public/images/emoji/apple/sailboat.png
index 1db5dc819fa..5da9fee6962 100644
Binary files a/public/images/emoji/apple/sailboat.png and b/public/images/emoji/apple/sailboat.png differ
diff --git a/public/images/emoji/apple/sake.png b/public/images/emoji/apple/sake.png
index 01fc740dbad..e5321066921 100644
Binary files a/public/images/emoji/apple/sake.png and b/public/images/emoji/apple/sake.png differ
diff --git a/public/images/emoji/apple/samoa.png b/public/images/emoji/apple/samoa.png
new file mode 100644
index 00000000000..e0bed73bf54
Binary files /dev/null and b/public/images/emoji/apple/samoa.png differ
diff --git a/public/images/emoji/apple/san_marino.png b/public/images/emoji/apple/san_marino.png
new file mode 100644
index 00000000000..6dc935be3e3
Binary files /dev/null and b/public/images/emoji/apple/san_marino.png differ
diff --git a/public/images/emoji/apple/sandal.png b/public/images/emoji/apple/sandal.png
index 545d9237c45..d9945f8fea9 100644
Binary files a/public/images/emoji/apple/sandal.png and b/public/images/emoji/apple/sandal.png differ
diff --git a/public/images/emoji/apple/sandwich.png b/public/images/emoji/apple/sandwich.png
new file mode 100644
index 00000000000..ba3f9a1cdb7
Binary files /dev/null and b/public/images/emoji/apple/sandwich.png differ
diff --git a/public/images/emoji/apple/santa.png b/public/images/emoji/apple/santa.png
index 854a31c057d..f7ddb9bcd89 100644
Binary files a/public/images/emoji/apple/santa.png and b/public/images/emoji/apple/santa.png differ
diff --git a/public/images/emoji/apple/santa/2.png b/public/images/emoji/apple/santa/2.png
new file mode 100644
index 00000000000..f80ae96d00b
Binary files /dev/null and b/public/images/emoji/apple/santa/2.png differ
diff --git a/public/images/emoji/apple/santa/3.png b/public/images/emoji/apple/santa/3.png
new file mode 100644
index 00000000000..8912ad6bec8
Binary files /dev/null and b/public/images/emoji/apple/santa/3.png differ
diff --git a/public/images/emoji/apple/santa/4.png b/public/images/emoji/apple/santa/4.png
new file mode 100644
index 00000000000..cf828d4db67
Binary files /dev/null and b/public/images/emoji/apple/santa/4.png differ
diff --git a/public/images/emoji/apple/santa/5.png b/public/images/emoji/apple/santa/5.png
new file mode 100644
index 00000000000..341545fb2a3
Binary files /dev/null and b/public/images/emoji/apple/santa/5.png differ
diff --git a/public/images/emoji/apple/santa/6.png b/public/images/emoji/apple/santa/6.png
new file mode 100644
index 00000000000..e9eb712028b
Binary files /dev/null and b/public/images/emoji/apple/santa/6.png differ
diff --git a/public/images/emoji/apple/sao_tome_principe.png b/public/images/emoji/apple/sao_tome_principe.png
new file mode 100644
index 00000000000..e52b743de96
Binary files /dev/null and b/public/images/emoji/apple/sao_tome_principe.png differ
diff --git a/public/images/emoji/apple/satellite.png b/public/images/emoji/apple/satellite.png
index fbe05cb1088..c408d5f7453 100644
Binary files a/public/images/emoji/apple/satellite.png and b/public/images/emoji/apple/satellite.png differ
diff --git a/public/images/emoji/apple/satellite_orbital.png b/public/images/emoji/apple/satellite_orbital.png
index d13384ba9de..28b9ab2fd72 100644
Binary files a/public/images/emoji/apple/satellite_orbital.png and b/public/images/emoji/apple/satellite_orbital.png differ
diff --git a/public/images/emoji/apple/saudi_arabia.png b/public/images/emoji/apple/saudi_arabia.png
new file mode 100644
index 00000000000..a58c32dc2d9
Binary files /dev/null and b/public/images/emoji/apple/saudi_arabia.png differ
diff --git a/public/images/emoji/apple/sauropod.png b/public/images/emoji/apple/sauropod.png
new file mode 100644
index 00000000000..2f4d6199975
Binary files /dev/null and b/public/images/emoji/apple/sauropod.png differ
diff --git a/public/images/emoji/apple/saxophone.png b/public/images/emoji/apple/saxophone.png
index 1824aaafc95..51fa21f2de9 100644
Binary files a/public/images/emoji/apple/saxophone.png and b/public/images/emoji/apple/saxophone.png differ
diff --git a/public/images/emoji/apple/scales.png b/public/images/emoji/apple/scales.png
index b09bddf3e6d..5a49f802a7a 100644
Binary files a/public/images/emoji/apple/scales.png and b/public/images/emoji/apple/scales.png differ
diff --git a/public/images/emoji/apple/scarf.png b/public/images/emoji/apple/scarf.png
new file mode 100644
index 00000000000..73653eee2bd
Binary files /dev/null and b/public/images/emoji/apple/scarf.png differ
diff --git a/public/images/emoji/apple/school.png b/public/images/emoji/apple/school.png
index 59293acb76b..a35e8e9d88e 100644
Binary files a/public/images/emoji/apple/school.png and b/public/images/emoji/apple/school.png differ
diff --git a/public/images/emoji/apple/school_satchel.png b/public/images/emoji/apple/school_satchel.png
index 38cabc92af0..4147b98ba67 100644
Binary files a/public/images/emoji/apple/school_satchel.png and b/public/images/emoji/apple/school_satchel.png differ
diff --git a/public/images/emoji/apple/scissors.png b/public/images/emoji/apple/scissors.png
index 30fab88ad17..7b7692a2c8b 100644
Binary files a/public/images/emoji/apple/scissors.png and b/public/images/emoji/apple/scissors.png differ
diff --git a/public/images/emoji/apple/scorpion.png b/public/images/emoji/apple/scorpion.png
index 2f184d2b75d..b76754f6dfe 100644
Binary files a/public/images/emoji/apple/scorpion.png and b/public/images/emoji/apple/scorpion.png differ
diff --git a/public/images/emoji/apple/scorpius.png b/public/images/emoji/apple/scorpius.png
index c14b4a412f9..07960c5184d 100644
Binary files a/public/images/emoji/apple/scorpius.png and b/public/images/emoji/apple/scorpius.png differ
diff --git a/public/images/emoji/apple/scroll.png b/public/images/emoji/apple/scroll.png
index 89cab98c00a..270de394878 100644
Binary files a/public/images/emoji/apple/scroll.png and b/public/images/emoji/apple/scroll.png differ
diff --git a/public/images/emoji/apple/seat.png b/public/images/emoji/apple/seat.png
index 6e41a5d6ba1..fbcefcac4c1 100644
Binary files a/public/images/emoji/apple/seat.png and b/public/images/emoji/apple/seat.png differ
diff --git a/public/images/emoji/apple/secret.png b/public/images/emoji/apple/secret.png
index b43e495cef0..b434115e63e 100644
Binary files a/public/images/emoji/apple/secret.png and b/public/images/emoji/apple/secret.png differ
diff --git a/public/images/emoji/apple/see_no_evil.png b/public/images/emoji/apple/see_no_evil.png
index 367f784e379..113d3c81866 100644
Binary files a/public/images/emoji/apple/see_no_evil.png and b/public/images/emoji/apple/see_no_evil.png differ
diff --git a/public/images/emoji/apple/seedling.png b/public/images/emoji/apple/seedling.png
index c978b0cc289..5f83d7530ad 100644
Binary files a/public/images/emoji/apple/seedling.png and b/public/images/emoji/apple/seedling.png differ
diff --git a/public/images/emoji/apple/selfie.png b/public/images/emoji/apple/selfie.png
new file mode 100644
index 00000000000..0b36f4c531d
Binary files /dev/null and b/public/images/emoji/apple/selfie.png differ
diff --git a/public/images/emoji/apple/selfie/2.png b/public/images/emoji/apple/selfie/2.png
new file mode 100644
index 00000000000..d867f24f873
Binary files /dev/null and b/public/images/emoji/apple/selfie/2.png differ
diff --git a/public/images/emoji/apple/selfie/3.png b/public/images/emoji/apple/selfie/3.png
new file mode 100644
index 00000000000..69c7037eba9
Binary files /dev/null and b/public/images/emoji/apple/selfie/3.png differ
diff --git a/public/images/emoji/apple/selfie/4.png b/public/images/emoji/apple/selfie/4.png
new file mode 100644
index 00000000000..fff11d76b10
Binary files /dev/null and b/public/images/emoji/apple/selfie/4.png differ
diff --git a/public/images/emoji/apple/selfie/5.png b/public/images/emoji/apple/selfie/5.png
new file mode 100644
index 00000000000..e499dd49b59
Binary files /dev/null and b/public/images/emoji/apple/selfie/5.png differ
diff --git a/public/images/emoji/apple/selfie/6.png b/public/images/emoji/apple/selfie/6.png
new file mode 100644
index 00000000000..a5fe3859711
Binary files /dev/null and b/public/images/emoji/apple/selfie/6.png differ
diff --git a/public/images/emoji/apple/senegal.png b/public/images/emoji/apple/senegal.png
new file mode 100644
index 00000000000..41cdb2886b7
Binary files /dev/null and b/public/images/emoji/apple/senegal.png differ
diff --git a/public/images/emoji/apple/serbia.png b/public/images/emoji/apple/serbia.png
new file mode 100644
index 00000000000..22d8d0b7571
Binary files /dev/null and b/public/images/emoji/apple/serbia.png differ
diff --git a/public/images/emoji/apple/seven.png b/public/images/emoji/apple/seven.png
index 0c675d12525..8e280d07c46 100644
Binary files a/public/images/emoji/apple/seven.png and b/public/images/emoji/apple/seven.png differ
diff --git a/public/images/emoji/apple/seychelles.png b/public/images/emoji/apple/seychelles.png
new file mode 100644
index 00000000000..498e8ae1b6a
Binary files /dev/null and b/public/images/emoji/apple/seychelles.png differ
diff --git a/public/images/emoji/apple/shallow_pan_of_food.png b/public/images/emoji/apple/shallow_pan_of_food.png
new file mode 100644
index 00000000000..e076ea5be24
Binary files /dev/null and b/public/images/emoji/apple/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/apple/shamrock.png b/public/images/emoji/apple/shamrock.png
index e64a2822247..596e05a1303 100644
Binary files a/public/images/emoji/apple/shamrock.png and b/public/images/emoji/apple/shamrock.png differ
diff --git a/public/images/emoji/apple/shark.png b/public/images/emoji/apple/shark.png
new file mode 100644
index 00000000000..4e10f0ddab9
Binary files /dev/null and b/public/images/emoji/apple/shark.png differ
diff --git a/public/images/emoji/apple/shaved_ice.png b/public/images/emoji/apple/shaved_ice.png
index 46a14928e51..3756ff5b728 100644
Binary files a/public/images/emoji/apple/shaved_ice.png and b/public/images/emoji/apple/shaved_ice.png differ
diff --git a/public/images/emoji/apple/sheep.png b/public/images/emoji/apple/sheep.png
index b06a8fab57a..e5b60f919d5 100644
Binary files a/public/images/emoji/apple/sheep.png and b/public/images/emoji/apple/sheep.png differ
diff --git a/public/images/emoji/apple/shell.png b/public/images/emoji/apple/shell.png
index b3d7199aa9f..6585fb6a7e1 100644
Binary files a/public/images/emoji/apple/shell.png and b/public/images/emoji/apple/shell.png differ
diff --git a/public/images/emoji/apple/shield.png b/public/images/emoji/apple/shield.png
index 72c78410b51..c5ee6e40694 100644
Binary files a/public/images/emoji/apple/shield.png and b/public/images/emoji/apple/shield.png differ
diff --git a/public/images/emoji/apple/shinto_shrine.png b/public/images/emoji/apple/shinto_shrine.png
index 597aad00cec..c124fe9a4a7 100644
Binary files a/public/images/emoji/apple/shinto_shrine.png and b/public/images/emoji/apple/shinto_shrine.png differ
diff --git a/public/images/emoji/apple/ship.png b/public/images/emoji/apple/ship.png
index ebc93a32676..decc0e851ab 100644
Binary files a/public/images/emoji/apple/ship.png and b/public/images/emoji/apple/ship.png differ
diff --git a/public/images/emoji/apple/shirt.png b/public/images/emoji/apple/shirt.png
index 39693e1e306..68a0867f0ab 100644
Binary files a/public/images/emoji/apple/shirt.png and b/public/images/emoji/apple/shirt.png differ
diff --git a/public/images/emoji/apple/shopping.png b/public/images/emoji/apple/shopping.png
new file mode 100644
index 00000000000..a53082f3cd4
Binary files /dev/null and b/public/images/emoji/apple/shopping.png differ
diff --git a/public/images/emoji/apple/shopping_bags.png b/public/images/emoji/apple/shopping_bags.png
index ceea95ed5c1..a53082f3cd4 100644
Binary files a/public/images/emoji/apple/shopping_bags.png and b/public/images/emoji/apple/shopping_bags.png differ
diff --git a/public/images/emoji/apple/shopping_cart.png b/public/images/emoji/apple/shopping_cart.png
new file mode 100644
index 00000000000..5601253eab6
Binary files /dev/null and b/public/images/emoji/apple/shopping_cart.png differ
diff --git a/public/images/emoji/apple/shower.png b/public/images/emoji/apple/shower.png
index 65bf735ec10..43e1a1b5b9f 100644
Binary files a/public/images/emoji/apple/shower.png and b/public/images/emoji/apple/shower.png differ
diff --git a/public/images/emoji/apple/shrimp.png b/public/images/emoji/apple/shrimp.png
new file mode 100644
index 00000000000..68d49971957
Binary files /dev/null and b/public/images/emoji/apple/shrimp.png differ
diff --git a/public/images/emoji/apple/sierra_leone.png b/public/images/emoji/apple/sierra_leone.png
new file mode 100644
index 00000000000..9f97f49ecf7
Binary files /dev/null and b/public/images/emoji/apple/sierra_leone.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/2.png b/public/images/emoji/apple/sign_of_the_horns/2.png
new file mode 100644
index 00000000000..46006766aef
Binary files /dev/null and b/public/images/emoji/apple/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/3.png b/public/images/emoji/apple/sign_of_the_horns/3.png
new file mode 100644
index 00000000000..85aa93e844f
Binary files /dev/null and b/public/images/emoji/apple/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/4.png b/public/images/emoji/apple/sign_of_the_horns/4.png
new file mode 100644
index 00000000000..ff673252139
Binary files /dev/null and b/public/images/emoji/apple/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/5.png b/public/images/emoji/apple/sign_of_the_horns/5.png
new file mode 100644
index 00000000000..8f48f33a83c
Binary files /dev/null and b/public/images/emoji/apple/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/apple/sign_of_the_horns/6.png b/public/images/emoji/apple/sign_of_the_horns/6.png
new file mode 100644
index 00000000000..beec4708b86
Binary files /dev/null and b/public/images/emoji/apple/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/apple/signal_strength.png b/public/images/emoji/apple/signal_strength.png
index f9aab25133d..c058c63eaf9 100644
Binary files a/public/images/emoji/apple/signal_strength.png and b/public/images/emoji/apple/signal_strength.png differ
diff --git a/public/images/emoji/apple/singapore.png b/public/images/emoji/apple/singapore.png
new file mode 100644
index 00000000000..b959a26b648
Binary files /dev/null and b/public/images/emoji/apple/singapore.png differ
diff --git a/public/images/emoji/apple/sint_maarten.png b/public/images/emoji/apple/sint_maarten.png
new file mode 100644
index 00000000000..d56216fa0c7
Binary files /dev/null and b/public/images/emoji/apple/sint_maarten.png differ
diff --git a/public/images/emoji/apple/six.png b/public/images/emoji/apple/six.png
index 0c7618b6ca9..230e33849b8 100644
Binary files a/public/images/emoji/apple/six.png and b/public/images/emoji/apple/six.png differ
diff --git a/public/images/emoji/apple/six_pointed_star.png b/public/images/emoji/apple/six_pointed_star.png
index f278daf8c82..f6f610d44c3 100644
Binary files a/public/images/emoji/apple/six_pointed_star.png and b/public/images/emoji/apple/six_pointed_star.png differ
diff --git a/public/images/emoji/apple/skeleton.png b/public/images/emoji/apple/skeleton.png
index 5ba5e001aec..9fff97187a6 100644
Binary files a/public/images/emoji/apple/skeleton.png and b/public/images/emoji/apple/skeleton.png differ
diff --git a/public/images/emoji/apple/ski.png b/public/images/emoji/apple/ski.png
index 72976d04043..5bd13a803b2 100644
Binary files a/public/images/emoji/apple/ski.png and b/public/images/emoji/apple/ski.png differ
diff --git a/public/images/emoji/apple/skier.png b/public/images/emoji/apple/skier.png
index e309b6778cb..940aadb0af9 100644
Binary files a/public/images/emoji/apple/skier.png and b/public/images/emoji/apple/skier.png differ
diff --git a/public/images/emoji/apple/skull.png b/public/images/emoji/apple/skull.png
index 5ba5e001aec..9fff97187a6 100644
Binary files a/public/images/emoji/apple/skull.png and b/public/images/emoji/apple/skull.png differ
diff --git a/public/images/emoji/apple/skull_and_crossbones.png b/public/images/emoji/apple/skull_and_crossbones.png
index 1bb29f6d42b..e819de8ce27 100644
Binary files a/public/images/emoji/apple/skull_and_crossbones.png and b/public/images/emoji/apple/skull_and_crossbones.png differ
diff --git a/public/images/emoji/apple/skull_crossbones.png b/public/images/emoji/apple/skull_crossbones.png
index 1bb29f6d42b..e819de8ce27 100644
Binary files a/public/images/emoji/apple/skull_crossbones.png and b/public/images/emoji/apple/skull_crossbones.png differ
diff --git a/public/images/emoji/apple/sled.png b/public/images/emoji/apple/sled.png
new file mode 100644
index 00000000000..01805b1fe76
Binary files /dev/null and b/public/images/emoji/apple/sled.png differ
diff --git a/public/images/emoji/apple/sleeping_accommodation.png b/public/images/emoji/apple/sleeping_accommodation.png
index a6aab0e1e19..724d29e260a 100644
Binary files a/public/images/emoji/apple/sleeping_accommodation.png and b/public/images/emoji/apple/sleeping_accommodation.png differ
diff --git a/public/images/emoji/apple/sleeping_bed.png b/public/images/emoji/apple/sleeping_bed.png
new file mode 100644
index 00000000000..724d29e260a
Binary files /dev/null and b/public/images/emoji/apple/sleeping_bed.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy.png b/public/images/emoji/apple/sleuth_or_spy.png
index 88557f891ac..6a7e53aff05 100644
Binary files a/public/images/emoji/apple/sleuth_or_spy.png and b/public/images/emoji/apple/sleuth_or_spy.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/2.png b/public/images/emoji/apple/sleuth_or_spy/2.png
new file mode 100644
index 00000000000..229e7c2986e
Binary files /dev/null and b/public/images/emoji/apple/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/3.png b/public/images/emoji/apple/sleuth_or_spy/3.png
new file mode 100644
index 00000000000..58ee54ac888
Binary files /dev/null and b/public/images/emoji/apple/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/4.png b/public/images/emoji/apple/sleuth_or_spy/4.png
new file mode 100644
index 00000000000..0ce63e8b7de
Binary files /dev/null and b/public/images/emoji/apple/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/5.png b/public/images/emoji/apple/sleuth_or_spy/5.png
new file mode 100644
index 00000000000..838cf318fe0
Binary files /dev/null and b/public/images/emoji/apple/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/apple/sleuth_or_spy/6.png b/public/images/emoji/apple/sleuth_or_spy/6.png
new file mode 100644
index 00000000000..e0cb2a0d2a6
Binary files /dev/null and b/public/images/emoji/apple/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/apple/slightly_smiling.png b/public/images/emoji/apple/slightly_smiling.png
new file mode 100644
index 00000000000..02756b99cb4
Binary files /dev/null and b/public/images/emoji/apple/slightly_smiling.png differ
diff --git a/public/images/emoji/apple/slot_machine.png b/public/images/emoji/apple/slot_machine.png
index 9a858ec000b..26feee545c5 100644
Binary files a/public/images/emoji/apple/slot_machine.png and b/public/images/emoji/apple/slot_machine.png differ
diff --git a/public/images/emoji/apple/slovakia.png b/public/images/emoji/apple/slovakia.png
new file mode 100644
index 00000000000..287b40bb241
Binary files /dev/null and b/public/images/emoji/apple/slovakia.png differ
diff --git a/public/images/emoji/apple/slovenia.png b/public/images/emoji/apple/slovenia.png
new file mode 100644
index 00000000000..cf29751edf4
Binary files /dev/null and b/public/images/emoji/apple/slovenia.png differ
diff --git a/public/images/emoji/apple/small_airplane.png b/public/images/emoji/apple/small_airplane.png
index fd2075925ee..c5823b2577e 100644
Binary files a/public/images/emoji/apple/small_airplane.png and b/public/images/emoji/apple/small_airplane.png differ
diff --git a/public/images/emoji/apple/small_blue_diamond.png b/public/images/emoji/apple/small_blue_diamond.png
index c63847885a5..cda760ab653 100644
Binary files a/public/images/emoji/apple/small_blue_diamond.png and b/public/images/emoji/apple/small_blue_diamond.png differ
diff --git a/public/images/emoji/apple/small_orange_diamond.png b/public/images/emoji/apple/small_orange_diamond.png
index 01f885b41e0..b173ef91ed4 100644
Binary files a/public/images/emoji/apple/small_orange_diamond.png and b/public/images/emoji/apple/small_orange_diamond.png differ
diff --git a/public/images/emoji/apple/small_red_triangle.png b/public/images/emoji/apple/small_red_triangle.png
index d8213ad360b..cbac1b1f3a5 100644
Binary files a/public/images/emoji/apple/small_red_triangle.png and b/public/images/emoji/apple/small_red_triangle.png differ
diff --git a/public/images/emoji/apple/small_red_triangle_down.png b/public/images/emoji/apple/small_red_triangle_down.png
index 8e434386496..36a0b748351 100644
Binary files a/public/images/emoji/apple/small_red_triangle_down.png and b/public/images/emoji/apple/small_red_triangle_down.png differ
diff --git a/public/images/emoji/apple/smoking.png b/public/images/emoji/apple/smoking.png
index 14cc1c7c38a..6daba327ee5 100644
Binary files a/public/images/emoji/apple/smoking.png and b/public/images/emoji/apple/smoking.png differ
diff --git a/public/images/emoji/apple/snail.png b/public/images/emoji/apple/snail.png
index 42e7c865210..38c1eae3a2b 100644
Binary files a/public/images/emoji/apple/snail.png and b/public/images/emoji/apple/snail.png differ
diff --git a/public/images/emoji/apple/snake.png b/public/images/emoji/apple/snake.png
index 2c9727250fe..ea94d95836b 100644
Binary files a/public/images/emoji/apple/snake.png and b/public/images/emoji/apple/snake.png differ
diff --git a/public/images/emoji/apple/sneezing_face.png b/public/images/emoji/apple/sneezing_face.png
new file mode 100644
index 00000000000..f190bf0cb8a
Binary files /dev/null and b/public/images/emoji/apple/sneezing_face.png differ
diff --git a/public/images/emoji/apple/snow_capped_mountain.png b/public/images/emoji/apple/snow_capped_mountain.png
index 12868300079..0be1ad5feea 100644
Binary files a/public/images/emoji/apple/snow_capped_mountain.png and b/public/images/emoji/apple/snow_capped_mountain.png differ
diff --git a/public/images/emoji/apple/snowboarder.png b/public/images/emoji/apple/snowboarder.png
index a88d3f57ee4..74f312e46e5 100644
Binary files a/public/images/emoji/apple/snowboarder.png and b/public/images/emoji/apple/snowboarder.png differ
diff --git a/public/images/emoji/apple/snowboarder/2.png b/public/images/emoji/apple/snowboarder/2.png
new file mode 100644
index 00000000000..a4f49938218
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/2.png differ
diff --git a/public/images/emoji/apple/snowboarder/3.png b/public/images/emoji/apple/snowboarder/3.png
new file mode 100644
index 00000000000..f18d5084305
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/3.png differ
diff --git a/public/images/emoji/apple/snowboarder/4.png b/public/images/emoji/apple/snowboarder/4.png
new file mode 100644
index 00000000000..72183274200
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/4.png differ
diff --git a/public/images/emoji/apple/snowboarder/5.png b/public/images/emoji/apple/snowboarder/5.png
new file mode 100644
index 00000000000..b3372f66d7a
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/5.png differ
diff --git a/public/images/emoji/apple/snowboarder/6.png b/public/images/emoji/apple/snowboarder/6.png
new file mode 100644
index 00000000000..245ed273019
Binary files /dev/null and b/public/images/emoji/apple/snowboarder/6.png differ
diff --git a/public/images/emoji/apple/snowflake.png b/public/images/emoji/apple/snowflake.png
index 92dce9a53cc..4745565c4c4 100644
Binary files a/public/images/emoji/apple/snowflake.png and b/public/images/emoji/apple/snowflake.png differ
diff --git a/public/images/emoji/apple/snowman.png b/public/images/emoji/apple/snowman.png
index 41fe7215a72..13a88d60ef3 100644
Binary files a/public/images/emoji/apple/snowman.png and b/public/images/emoji/apple/snowman.png differ
diff --git a/public/images/emoji/apple/snowman2.png b/public/images/emoji/apple/snowman2.png
index d4a8953f15a..4ae1cfb955d 100644
Binary files a/public/images/emoji/apple/snowman2.png and b/public/images/emoji/apple/snowman2.png differ
diff --git a/public/images/emoji/apple/snowman_with_snow.png b/public/images/emoji/apple/snowman_with_snow.png
new file mode 100644
index 00000000000..4ae1cfb955d
Binary files /dev/null and b/public/images/emoji/apple/snowman_with_snow.png differ
diff --git a/public/images/emoji/apple/soccer.png b/public/images/emoji/apple/soccer.png
index 5754da2e78c..b67be4121d5 100644
Binary files a/public/images/emoji/apple/soccer.png and b/public/images/emoji/apple/soccer.png differ
diff --git a/public/images/emoji/apple/socks.png b/public/images/emoji/apple/socks.png
new file mode 100644
index 00000000000..8f2b9bbe9e3
Binary files /dev/null and b/public/images/emoji/apple/socks.png differ
diff --git a/public/images/emoji/apple/solomon_islands.png b/public/images/emoji/apple/solomon_islands.png
new file mode 100644
index 00000000000..32fd718c87e
Binary files /dev/null and b/public/images/emoji/apple/solomon_islands.png differ
diff --git a/public/images/emoji/apple/somalia.png b/public/images/emoji/apple/somalia.png
new file mode 100644
index 00000000000..01ec1737ff5
Binary files /dev/null and b/public/images/emoji/apple/somalia.png differ
diff --git a/public/images/emoji/apple/soon.png b/public/images/emoji/apple/soon.png
index 2a408f6c932..237fd661c56 100644
Binary files a/public/images/emoji/apple/soon.png and b/public/images/emoji/apple/soon.png differ
diff --git a/public/images/emoji/apple/sos.png b/public/images/emoji/apple/sos.png
index c95399d7391..d5dd10cd6bf 100644
Binary files a/public/images/emoji/apple/sos.png and b/public/images/emoji/apple/sos.png differ
diff --git a/public/images/emoji/apple/sound.png b/public/images/emoji/apple/sound.png
index 17a15290f0b..2497fe0d312 100644
Binary files a/public/images/emoji/apple/sound.png and b/public/images/emoji/apple/sound.png differ
diff --git a/public/images/emoji/apple/south_africa.png b/public/images/emoji/apple/south_africa.png
new file mode 100644
index 00000000000..e4bc22da627
Binary files /dev/null and b/public/images/emoji/apple/south_africa.png differ
diff --git a/public/images/emoji/apple/south_georgia_south_sandwich_islands.png b/public/images/emoji/apple/south_georgia_south_sandwich_islands.png
new file mode 100644
index 00000000000..55476e920c6
Binary files /dev/null and b/public/images/emoji/apple/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/apple/south_sudan.png b/public/images/emoji/apple/south_sudan.png
new file mode 100644
index 00000000000..725a527adc3
Binary files /dev/null and b/public/images/emoji/apple/south_sudan.png differ
diff --git a/public/images/emoji/apple/space_invader.png b/public/images/emoji/apple/space_invader.png
index baf3c0c045b..ce6123859cf 100644
Binary files a/public/images/emoji/apple/space_invader.png and b/public/images/emoji/apple/space_invader.png differ
diff --git a/public/images/emoji/apple/spades.png b/public/images/emoji/apple/spades.png
index 391f0288c3f..e27b29fc4bc 100644
Binary files a/public/images/emoji/apple/spades.png and b/public/images/emoji/apple/spades.png differ
diff --git a/public/images/emoji/apple/spaghetti.png b/public/images/emoji/apple/spaghetti.png
index 4ad69a0adcb..d2f02f77f5a 100644
Binary files a/public/images/emoji/apple/spaghetti.png and b/public/images/emoji/apple/spaghetti.png differ
diff --git a/public/images/emoji/apple/sparkle.png b/public/images/emoji/apple/sparkle.png
index 5db60902b8a..8951f218b37 100644
Binary files a/public/images/emoji/apple/sparkle.png and b/public/images/emoji/apple/sparkle.png differ
diff --git a/public/images/emoji/apple/sparkler.png b/public/images/emoji/apple/sparkler.png
index 9a970a91271..177b189a9c9 100644
Binary files a/public/images/emoji/apple/sparkler.png and b/public/images/emoji/apple/sparkler.png differ
diff --git a/public/images/emoji/apple/sparkles.png b/public/images/emoji/apple/sparkles.png
index 1be1a2f0ddf..b08bcfafdd4 100644
Binary files a/public/images/emoji/apple/sparkles.png and b/public/images/emoji/apple/sparkles.png differ
diff --git a/public/images/emoji/apple/sparkling_heart.png b/public/images/emoji/apple/sparkling_heart.png
index a2f64c2594e..26d8ae6198e 100644
Binary files a/public/images/emoji/apple/sparkling_heart.png and b/public/images/emoji/apple/sparkling_heart.png differ
diff --git a/public/images/emoji/apple/speak_no_evil.png b/public/images/emoji/apple/speak_no_evil.png
index 222a2fa2250..e52642249dd 100644
Binary files a/public/images/emoji/apple/speak_no_evil.png and b/public/images/emoji/apple/speak_no_evil.png differ
diff --git a/public/images/emoji/apple/speaker.png b/public/images/emoji/apple/speaker.png
index 2f46c3aacff..9ef912ee4db 100644
Binary files a/public/images/emoji/apple/speaker.png and b/public/images/emoji/apple/speaker.png differ
diff --git a/public/images/emoji/apple/speaking_head.png b/public/images/emoji/apple/speaking_head.png
index 2d2892d18ba..e11319ddc24 100644
Binary files a/public/images/emoji/apple/speaking_head.png and b/public/images/emoji/apple/speaking_head.png differ
diff --git a/public/images/emoji/apple/speaking_head_in_silhouette.png b/public/images/emoji/apple/speaking_head_in_silhouette.png
index 2d2892d18ba..e11319ddc24 100644
Binary files a/public/images/emoji/apple/speaking_head_in_silhouette.png and b/public/images/emoji/apple/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/apple/speech_balloon.png b/public/images/emoji/apple/speech_balloon.png
index 263d7c0f7d4..d668842060d 100644
Binary files a/public/images/emoji/apple/speech_balloon.png and b/public/images/emoji/apple/speech_balloon.png differ
diff --git a/public/images/emoji/apple/speedboat.png b/public/images/emoji/apple/speedboat.png
index 985d58d349f..34000044bd6 100644
Binary files a/public/images/emoji/apple/speedboat.png and b/public/images/emoji/apple/speedboat.png differ
diff --git a/public/images/emoji/apple/spider.png b/public/images/emoji/apple/spider.png
index 29f7588b633..742a820d2aa 100644
Binary files a/public/images/emoji/apple/spider.png and b/public/images/emoji/apple/spider.png differ
diff --git a/public/images/emoji/apple/spider_web.png b/public/images/emoji/apple/spider_web.png
index 6b15a040e16..2e2f9e0baee 100644
Binary files a/public/images/emoji/apple/spider_web.png and b/public/images/emoji/apple/spider_web.png differ
diff --git a/public/images/emoji/apple/spiral_calendar.png b/public/images/emoji/apple/spiral_calendar.png
new file mode 100644
index 00000000000..74b98132ddc
Binary files /dev/null and b/public/images/emoji/apple/spiral_calendar.png differ
diff --git a/public/images/emoji/apple/spiral_calendar_pad.png b/public/images/emoji/apple/spiral_calendar_pad.png
index 429d7c7f629..74b98132ddc 100644
Binary files a/public/images/emoji/apple/spiral_calendar_pad.png and b/public/images/emoji/apple/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/apple/spiral_note_pad.png b/public/images/emoji/apple/spiral_note_pad.png
index 6ea74f2e253..5e4c3a2d0e2 100644
Binary files a/public/images/emoji/apple/spiral_note_pad.png and b/public/images/emoji/apple/spiral_note_pad.png differ
diff --git a/public/images/emoji/apple/spiral_notepad.png b/public/images/emoji/apple/spiral_notepad.png
new file mode 100644
index 00000000000..5e4c3a2d0e2
Binary files /dev/null and b/public/images/emoji/apple/spiral_notepad.png differ
diff --git a/public/images/emoji/apple/spoon.png b/public/images/emoji/apple/spoon.png
new file mode 100644
index 00000000000..0d7ccd11fe9
Binary files /dev/null and b/public/images/emoji/apple/spoon.png differ
diff --git a/public/images/emoji/apple/sports_medal.png b/public/images/emoji/apple/sports_medal.png
index 37e6735eb0d..6e66f143863 100644
Binary files a/public/images/emoji/apple/sports_medal.png and b/public/images/emoji/apple/sports_medal.png differ
diff --git a/public/images/emoji/apple/spy.png b/public/images/emoji/apple/spy.png
index 88557f891ac..6a7e53aff05 100644
Binary files a/public/images/emoji/apple/spy.png and b/public/images/emoji/apple/spy.png differ
diff --git a/public/images/emoji/apple/spy/2.png b/public/images/emoji/apple/spy/2.png
new file mode 100644
index 00000000000..229e7c2986e
Binary files /dev/null and b/public/images/emoji/apple/spy/2.png differ
diff --git a/public/images/emoji/apple/spy/3.png b/public/images/emoji/apple/spy/3.png
new file mode 100644
index 00000000000..58ee54ac888
Binary files /dev/null and b/public/images/emoji/apple/spy/3.png differ
diff --git a/public/images/emoji/apple/spy/4.png b/public/images/emoji/apple/spy/4.png
new file mode 100644
index 00000000000..0ce63e8b7de
Binary files /dev/null and b/public/images/emoji/apple/spy/4.png differ
diff --git a/public/images/emoji/apple/spy/5.png b/public/images/emoji/apple/spy/5.png
new file mode 100644
index 00000000000..838cf318fe0
Binary files /dev/null and b/public/images/emoji/apple/spy/5.png differ
diff --git a/public/images/emoji/apple/spy/6.png b/public/images/emoji/apple/spy/6.png
new file mode 100644
index 00000000000..e0cb2a0d2a6
Binary files /dev/null and b/public/images/emoji/apple/spy/6.png differ
diff --git a/public/images/emoji/apple/squid.png b/public/images/emoji/apple/squid.png
new file mode 100644
index 00000000000..2c06de8797b
Binary files /dev/null and b/public/images/emoji/apple/squid.png differ
diff --git a/public/images/emoji/apple/sri_lanka.png b/public/images/emoji/apple/sri_lanka.png
new file mode 100644
index 00000000000..9e13db4ab69
Binary files /dev/null and b/public/images/emoji/apple/sri_lanka.png differ
diff --git a/public/images/emoji/apple/st_barthelemy.png b/public/images/emoji/apple/st_barthelemy.png
new file mode 100644
index 00000000000..daca6aa34a5
Binary files /dev/null and b/public/images/emoji/apple/st_barthelemy.png differ
diff --git a/public/images/emoji/apple/st_helena.png b/public/images/emoji/apple/st_helena.png
new file mode 100644
index 00000000000..694a0b8510c
Binary files /dev/null and b/public/images/emoji/apple/st_helena.png differ
diff --git a/public/images/emoji/apple/st_kitts_nevis.png b/public/images/emoji/apple/st_kitts_nevis.png
new file mode 100644
index 00000000000..18dda8f654f
Binary files /dev/null and b/public/images/emoji/apple/st_kitts_nevis.png differ
diff --git a/public/images/emoji/apple/st_lucia.png b/public/images/emoji/apple/st_lucia.png
new file mode 100644
index 00000000000..5d2d00f4db5
Binary files /dev/null and b/public/images/emoji/apple/st_lucia.png differ
diff --git a/public/images/emoji/apple/st_martin.png b/public/images/emoji/apple/st_martin.png
new file mode 100644
index 00000000000..efcd5fff75f
Binary files /dev/null and b/public/images/emoji/apple/st_martin.png differ
diff --git a/public/images/emoji/apple/st_pierre_miquelon.png b/public/images/emoji/apple/st_pierre_miquelon.png
new file mode 100644
index 00000000000..699bcf18994
Binary files /dev/null and b/public/images/emoji/apple/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/apple/st_vincent_grenadines.png b/public/images/emoji/apple/st_vincent_grenadines.png
new file mode 100644
index 00000000000..e06af20e140
Binary files /dev/null and b/public/images/emoji/apple/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/apple/stadium.png b/public/images/emoji/apple/stadium.png
index 31ea828db4b..bdff0d70cc5 100644
Binary files a/public/images/emoji/apple/stadium.png and b/public/images/emoji/apple/stadium.png differ
diff --git a/public/images/emoji/apple/star.png b/public/images/emoji/apple/star.png
index 932c78393b7..2778f4a5e43 100644
Binary files a/public/images/emoji/apple/star.png and b/public/images/emoji/apple/star.png differ
diff --git a/public/images/emoji/apple/star2.png b/public/images/emoji/apple/star2.png
index e1ed35eb50a..37c8d2b0a88 100644
Binary files a/public/images/emoji/apple/star2.png and b/public/images/emoji/apple/star2.png differ
diff --git a/public/images/emoji/apple/star_and_crescent.png b/public/images/emoji/apple/star_and_crescent.png
index fde9b3c29c3..720237b3caa 100644
Binary files a/public/images/emoji/apple/star_and_crescent.png and b/public/images/emoji/apple/star_and_crescent.png differ
diff --git a/public/images/emoji/apple/star_of_david.png b/public/images/emoji/apple/star_of_david.png
index 4c681f3a2ff..be2ddc89ce6 100644
Binary files a/public/images/emoji/apple/star_of_david.png and b/public/images/emoji/apple/star_of_david.png differ
diff --git a/public/images/emoji/apple/star_struck.png b/public/images/emoji/apple/star_struck.png
new file mode 100644
index 00000000000..7da8183f394
Binary files /dev/null and b/public/images/emoji/apple/star_struck.png differ
diff --git a/public/images/emoji/apple/stars.png b/public/images/emoji/apple/stars.png
index 8ee40bd1610..b48e69b8206 100644
Binary files a/public/images/emoji/apple/stars.png and b/public/images/emoji/apple/stars.png differ
diff --git a/public/images/emoji/apple/station.png b/public/images/emoji/apple/station.png
index 122303ec9a8..eaa21c05e70 100644
Binary files a/public/images/emoji/apple/station.png and b/public/images/emoji/apple/station.png differ
diff --git a/public/images/emoji/apple/statue_of_liberty.png b/public/images/emoji/apple/statue_of_liberty.png
index d9f432f9e01..58e1f0e5462 100644
Binary files a/public/images/emoji/apple/statue_of_liberty.png and b/public/images/emoji/apple/statue_of_liberty.png differ
diff --git a/public/images/emoji/apple/steam_locomotive.png b/public/images/emoji/apple/steam_locomotive.png
index 17b9edf2dd6..362fe4c2e6e 100644
Binary files a/public/images/emoji/apple/steam_locomotive.png and b/public/images/emoji/apple/steam_locomotive.png differ
diff --git a/public/images/emoji/apple/stew.png b/public/images/emoji/apple/stew.png
index 6eb07474bbc..fad912a0e50 100644
Binary files a/public/images/emoji/apple/stew.png and b/public/images/emoji/apple/stew.png differ
diff --git a/public/images/emoji/apple/stop_button.png b/public/images/emoji/apple/stop_button.png
index 6e44df377ec..3d64cca051d 100644
Binary files a/public/images/emoji/apple/stop_button.png and b/public/images/emoji/apple/stop_button.png differ
diff --git a/public/images/emoji/apple/stop_sign.png b/public/images/emoji/apple/stop_sign.png
new file mode 100644
index 00000000000..917da78ce62
Binary files /dev/null and b/public/images/emoji/apple/stop_sign.png differ
diff --git a/public/images/emoji/apple/stopwatch.png b/public/images/emoji/apple/stopwatch.png
index 255ec91bf32..8661924183e 100644
Binary files a/public/images/emoji/apple/stopwatch.png and b/public/images/emoji/apple/stopwatch.png differ
diff --git a/public/images/emoji/apple/straight_ruler.png b/public/images/emoji/apple/straight_ruler.png
index 9f3c719a8b8..01fa9244008 100644
Binary files a/public/images/emoji/apple/straight_ruler.png and b/public/images/emoji/apple/straight_ruler.png differ
diff --git a/public/images/emoji/apple/strawberry.png b/public/images/emoji/apple/strawberry.png
index a3da2473bc7..2316a8bb4e4 100644
Binary files a/public/images/emoji/apple/strawberry.png and b/public/images/emoji/apple/strawberry.png differ
diff --git a/public/images/emoji/apple/studio_microphone.png b/public/images/emoji/apple/studio_microphone.png
index 6d4db741c6a..6f6e1dc3c9a 100644
Binary files a/public/images/emoji/apple/studio_microphone.png and b/public/images/emoji/apple/studio_microphone.png differ
diff --git a/public/images/emoji/apple/stuffed_flatbread.png b/public/images/emoji/apple/stuffed_flatbread.png
new file mode 100644
index 00000000000..c6d649fad70
Binary files /dev/null and b/public/images/emoji/apple/stuffed_flatbread.png differ
diff --git a/public/images/emoji/apple/sudan.png b/public/images/emoji/apple/sudan.png
new file mode 100644
index 00000000000..7444db0904d
Binary files /dev/null and b/public/images/emoji/apple/sudan.png differ
diff --git a/public/images/emoji/apple/sun_behind_large_cloud.png b/public/images/emoji/apple/sun_behind_large_cloud.png
new file mode 100644
index 00000000000..86329213734
Binary files /dev/null and b/public/images/emoji/apple/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/apple/sun_behind_rain_cloud.png b/public/images/emoji/apple/sun_behind_rain_cloud.png
new file mode 100644
index 00000000000..16324c90c45
Binary files /dev/null and b/public/images/emoji/apple/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/apple/sun_behind_small_cloud.png b/public/images/emoji/apple/sun_behind_small_cloud.png
new file mode 100644
index 00000000000..aaaf576a064
Binary files /dev/null and b/public/images/emoji/apple/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/apple/sun_with_face.png b/public/images/emoji/apple/sun_with_face.png
index 5c7aa04f082..22c7765db3d 100644
Binary files a/public/images/emoji/apple/sun_with_face.png and b/public/images/emoji/apple/sun_with_face.png differ
diff --git a/public/images/emoji/apple/sunflower.png b/public/images/emoji/apple/sunflower.png
index 2de51ebcca1..3a36efe239b 100644
Binary files a/public/images/emoji/apple/sunflower.png and b/public/images/emoji/apple/sunflower.png differ
diff --git a/public/images/emoji/apple/sunny.png b/public/images/emoji/apple/sunny.png
index 8a5e972471c..c19f975639c 100644
Binary files a/public/images/emoji/apple/sunny.png and b/public/images/emoji/apple/sunny.png differ
diff --git a/public/images/emoji/apple/sunrise.png b/public/images/emoji/apple/sunrise.png
index fecda046212..b66b8e55674 100644
Binary files a/public/images/emoji/apple/sunrise.png and b/public/images/emoji/apple/sunrise.png differ
diff --git a/public/images/emoji/apple/sunrise_over_mountains.png b/public/images/emoji/apple/sunrise_over_mountains.png
index 6ffdb045512..d6cdfd36806 100644
Binary files a/public/images/emoji/apple/sunrise_over_mountains.png and b/public/images/emoji/apple/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/apple/surfer/2.png b/public/images/emoji/apple/surfer/2.png
new file mode 100644
index 00000000000..a0482f48190
Binary files /dev/null and b/public/images/emoji/apple/surfer/2.png differ
diff --git a/public/images/emoji/apple/surfer/3.png b/public/images/emoji/apple/surfer/3.png
new file mode 100644
index 00000000000..e4e3fe4bd3a
Binary files /dev/null and b/public/images/emoji/apple/surfer/3.png differ
diff --git a/public/images/emoji/apple/surfer/4.png b/public/images/emoji/apple/surfer/4.png
new file mode 100644
index 00000000000..33401ea804c
Binary files /dev/null and b/public/images/emoji/apple/surfer/4.png differ
diff --git a/public/images/emoji/apple/surfer/5.png b/public/images/emoji/apple/surfer/5.png
new file mode 100644
index 00000000000..a565a32f316
Binary files /dev/null and b/public/images/emoji/apple/surfer/5.png differ
diff --git a/public/images/emoji/apple/surfer/6.png b/public/images/emoji/apple/surfer/6.png
new file mode 100644
index 00000000000..560070c2a10
Binary files /dev/null and b/public/images/emoji/apple/surfer/6.png differ
diff --git a/public/images/emoji/apple/surfing_man.png b/public/images/emoji/apple/surfing_man.png
new file mode 100644
index 00000000000..476e43df4e4
Binary files /dev/null and b/public/images/emoji/apple/surfing_man.png differ
diff --git a/public/images/emoji/apple/surfing_man/2.png b/public/images/emoji/apple/surfing_man/2.png
new file mode 100644
index 00000000000..a0482f48190
Binary files /dev/null and b/public/images/emoji/apple/surfing_man/2.png differ
diff --git a/public/images/emoji/apple/surfing_man/3.png b/public/images/emoji/apple/surfing_man/3.png
new file mode 100644
index 00000000000..e4e3fe4bd3a
Binary files /dev/null and b/public/images/emoji/apple/surfing_man/3.png differ
diff --git a/public/images/emoji/apple/surfing_man/4.png b/public/images/emoji/apple/surfing_man/4.png
new file mode 100644
index 00000000000..33401ea804c
Binary files /dev/null and b/public/images/emoji/apple/surfing_man/4.png differ
diff --git a/public/images/emoji/apple/surfing_man/5.png b/public/images/emoji/apple/surfing_man/5.png
new file mode 100644
index 00000000000..a565a32f316
Binary files /dev/null and b/public/images/emoji/apple/surfing_man/5.png differ
diff --git a/public/images/emoji/apple/surfing_man/6.png b/public/images/emoji/apple/surfing_man/6.png
new file mode 100644
index 00000000000..560070c2a10
Binary files /dev/null and b/public/images/emoji/apple/surfing_man/6.png differ
diff --git a/public/images/emoji/apple/surfing_woman.png b/public/images/emoji/apple/surfing_woman.png
new file mode 100644
index 00000000000..2b4606fe7c5
Binary files /dev/null and b/public/images/emoji/apple/surfing_woman.png differ
diff --git a/public/images/emoji/apple/surfing_woman/2.png b/public/images/emoji/apple/surfing_woman/2.png
new file mode 100644
index 00000000000..8065c6f6662
Binary files /dev/null and b/public/images/emoji/apple/surfing_woman/2.png differ
diff --git a/public/images/emoji/apple/surfing_woman/3.png b/public/images/emoji/apple/surfing_woman/3.png
new file mode 100644
index 00000000000..6a94c33b27c
Binary files /dev/null and b/public/images/emoji/apple/surfing_woman/3.png differ
diff --git a/public/images/emoji/apple/surfing_woman/4.png b/public/images/emoji/apple/surfing_woman/4.png
new file mode 100644
index 00000000000..20388425a2d
Binary files /dev/null and b/public/images/emoji/apple/surfing_woman/4.png differ
diff --git a/public/images/emoji/apple/surfing_woman/5.png b/public/images/emoji/apple/surfing_woman/5.png
new file mode 100644
index 00000000000..b89c8b8b2d2
Binary files /dev/null and b/public/images/emoji/apple/surfing_woman/5.png differ
diff --git a/public/images/emoji/apple/surfing_woman/6.png b/public/images/emoji/apple/surfing_woman/6.png
new file mode 100644
index 00000000000..8cdf1ee6f96
Binary files /dev/null and b/public/images/emoji/apple/surfing_woman/6.png differ
diff --git a/public/images/emoji/apple/suriname.png b/public/images/emoji/apple/suriname.png
new file mode 100644
index 00000000000..5d733dba9bb
Binary files /dev/null and b/public/images/emoji/apple/suriname.png differ
diff --git a/public/images/emoji/apple/sushi.png b/public/images/emoji/apple/sushi.png
index 065f36f36d5..90c513ca69a 100644
Binary files a/public/images/emoji/apple/sushi.png and b/public/images/emoji/apple/sushi.png differ
diff --git a/public/images/emoji/apple/sushing_face.png b/public/images/emoji/apple/sushing_face.png
new file mode 100644
index 00000000000..e4427cbd153
Binary files /dev/null and b/public/images/emoji/apple/sushing_face.png differ
diff --git a/public/images/emoji/apple/suspension_railway.png b/public/images/emoji/apple/suspension_railway.png
index 0fd2ed82930..1fb5eaac101 100644
Binary files a/public/images/emoji/apple/suspension_railway.png and b/public/images/emoji/apple/suspension_railway.png differ
diff --git a/public/images/emoji/apple/svalbard_and_jan_mayen.png b/public/images/emoji/apple/svalbard_and_jan_mayen.png
new file mode 100644
index 00000000000..5827a3d3767
Binary files /dev/null and b/public/images/emoji/apple/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/apple/swaziland.png b/public/images/emoji/apple/swaziland.png
new file mode 100644
index 00000000000..40b243ee995
Binary files /dev/null and b/public/images/emoji/apple/swaziland.png differ
diff --git a/public/images/emoji/apple/sweat_drops.png b/public/images/emoji/apple/sweat_drops.png
index 8e444ecf97e..285e5876eff 100644
Binary files a/public/images/emoji/apple/sweat_drops.png and b/public/images/emoji/apple/sweat_drops.png differ
diff --git a/public/images/emoji/apple/sweden.png b/public/images/emoji/apple/sweden.png
new file mode 100644
index 00000000000..2c266bf1693
Binary files /dev/null and b/public/images/emoji/apple/sweden.png differ
diff --git a/public/images/emoji/apple/sweet_potato.png b/public/images/emoji/apple/sweet_potato.png
index 7f799990091..c793a324c8b 100644
Binary files a/public/images/emoji/apple/sweet_potato.png and b/public/images/emoji/apple/sweet_potato.png differ
diff --git a/public/images/emoji/apple/swimmer/2.png b/public/images/emoji/apple/swimmer/2.png
new file mode 100644
index 00000000000..f5f60e30183
Binary files /dev/null and b/public/images/emoji/apple/swimmer/2.png differ
diff --git a/public/images/emoji/apple/swimmer/3.png b/public/images/emoji/apple/swimmer/3.png
new file mode 100644
index 00000000000..488222d2212
Binary files /dev/null and b/public/images/emoji/apple/swimmer/3.png differ
diff --git a/public/images/emoji/apple/swimmer/4.png b/public/images/emoji/apple/swimmer/4.png
new file mode 100644
index 00000000000..eb2bcd180ab
Binary files /dev/null and b/public/images/emoji/apple/swimmer/4.png differ
diff --git a/public/images/emoji/apple/swimmer/5.png b/public/images/emoji/apple/swimmer/5.png
new file mode 100644
index 00000000000..fc0f52b9dad
Binary files /dev/null and b/public/images/emoji/apple/swimmer/5.png differ
diff --git a/public/images/emoji/apple/swimmer/6.png b/public/images/emoji/apple/swimmer/6.png
new file mode 100644
index 00000000000..2a48fdc951e
Binary files /dev/null and b/public/images/emoji/apple/swimmer/6.png differ
diff --git a/public/images/emoji/apple/swimming_man.png b/public/images/emoji/apple/swimming_man.png
new file mode 100644
index 00000000000..152e42f4857
Binary files /dev/null and b/public/images/emoji/apple/swimming_man.png differ
diff --git a/public/images/emoji/apple/swimming_man/2.png b/public/images/emoji/apple/swimming_man/2.png
new file mode 100644
index 00000000000..f5f60e30183
Binary files /dev/null and b/public/images/emoji/apple/swimming_man/2.png differ
diff --git a/public/images/emoji/apple/swimming_man/3.png b/public/images/emoji/apple/swimming_man/3.png
new file mode 100644
index 00000000000..488222d2212
Binary files /dev/null and b/public/images/emoji/apple/swimming_man/3.png differ
diff --git a/public/images/emoji/apple/swimming_man/4.png b/public/images/emoji/apple/swimming_man/4.png
new file mode 100644
index 00000000000..eb2bcd180ab
Binary files /dev/null and b/public/images/emoji/apple/swimming_man/4.png differ
diff --git a/public/images/emoji/apple/swimming_man/5.png b/public/images/emoji/apple/swimming_man/5.png
new file mode 100644
index 00000000000..fc0f52b9dad
Binary files /dev/null and b/public/images/emoji/apple/swimming_man/5.png differ
diff --git a/public/images/emoji/apple/swimming_man/6.png b/public/images/emoji/apple/swimming_man/6.png
new file mode 100644
index 00000000000..2a48fdc951e
Binary files /dev/null and b/public/images/emoji/apple/swimming_man/6.png differ
diff --git a/public/images/emoji/apple/swimming_woman.png b/public/images/emoji/apple/swimming_woman.png
new file mode 100644
index 00000000000..c8439064e47
Binary files /dev/null and b/public/images/emoji/apple/swimming_woman.png differ
diff --git a/public/images/emoji/apple/swimming_woman/2.png b/public/images/emoji/apple/swimming_woman/2.png
new file mode 100644
index 00000000000..357daa34c1d
Binary files /dev/null and b/public/images/emoji/apple/swimming_woman/2.png differ
diff --git a/public/images/emoji/apple/swimming_woman/3.png b/public/images/emoji/apple/swimming_woman/3.png
new file mode 100644
index 00000000000..0d831c336fa
Binary files /dev/null and b/public/images/emoji/apple/swimming_woman/3.png differ
diff --git a/public/images/emoji/apple/swimming_woman/4.png b/public/images/emoji/apple/swimming_woman/4.png
new file mode 100644
index 00000000000..2fbc28284b7
Binary files /dev/null and b/public/images/emoji/apple/swimming_woman/4.png differ
diff --git a/public/images/emoji/apple/swimming_woman/5.png b/public/images/emoji/apple/swimming_woman/5.png
new file mode 100644
index 00000000000..5523af75533
Binary files /dev/null and b/public/images/emoji/apple/swimming_woman/5.png differ
diff --git a/public/images/emoji/apple/swimming_woman/6.png b/public/images/emoji/apple/swimming_woman/6.png
new file mode 100644
index 00000000000..584b88b78d6
Binary files /dev/null and b/public/images/emoji/apple/swimming_woman/6.png differ
diff --git a/public/images/emoji/apple/switzerland.png b/public/images/emoji/apple/switzerland.png
new file mode 100644
index 00000000000..50ccd594b82
Binary files /dev/null and b/public/images/emoji/apple/switzerland.png differ
diff --git a/public/images/emoji/apple/symbols.png b/public/images/emoji/apple/symbols.png
index 9d1fa78cc1e..e2849c52e11 100644
Binary files a/public/images/emoji/apple/symbols.png and b/public/images/emoji/apple/symbols.png differ
diff --git a/public/images/emoji/apple/synagogue.png b/public/images/emoji/apple/synagogue.png
index ee0bd96cf9c..5ceaf0f6308 100644
Binary files a/public/images/emoji/apple/synagogue.png and b/public/images/emoji/apple/synagogue.png differ
diff --git a/public/images/emoji/apple/syria.png b/public/images/emoji/apple/syria.png
new file mode 100644
index 00000000000..f14db54b402
Binary files /dev/null and b/public/images/emoji/apple/syria.png differ
diff --git a/public/images/emoji/apple/syringe.png b/public/images/emoji/apple/syringe.png
index 18bf076d274..aeea9520a42 100644
Binary files a/public/images/emoji/apple/syringe.png and b/public/images/emoji/apple/syringe.png differ
diff --git a/public/images/emoji/apple/t_rex.png b/public/images/emoji/apple/t_rex.png
new file mode 100644
index 00000000000..d8811a56382
Binary files /dev/null and b/public/images/emoji/apple/t_rex.png differ
diff --git a/public/images/emoji/apple/table_tennis.png b/public/images/emoji/apple/table_tennis.png
index 2ec7386f180..26d40fa9205 100644
Binary files a/public/images/emoji/apple/table_tennis.png and b/public/images/emoji/apple/table_tennis.png differ
diff --git a/public/images/emoji/apple/taco.png b/public/images/emoji/apple/taco.png
index 3a96063137b..c4adea0e0a5 100644
Binary files a/public/images/emoji/apple/taco.png and b/public/images/emoji/apple/taco.png differ
diff --git a/public/images/emoji/apple/tada.png b/public/images/emoji/apple/tada.png
index f3f53895ad9..f08377f3941 100644
Binary files a/public/images/emoji/apple/tada.png and b/public/images/emoji/apple/tada.png differ
diff --git a/public/images/emoji/apple/taiwan.png b/public/images/emoji/apple/taiwan.png
new file mode 100644
index 00000000000..70d71de7e65
Binary files /dev/null and b/public/images/emoji/apple/taiwan.png differ
diff --git a/public/images/emoji/apple/tajikistan.png b/public/images/emoji/apple/tajikistan.png
new file mode 100644
index 00000000000..89eb0e30ee7
Binary files /dev/null and b/public/images/emoji/apple/tajikistan.png differ
diff --git a/public/images/emoji/apple/takeout_box.png b/public/images/emoji/apple/takeout_box.png
new file mode 100644
index 00000000000..08aa6a4843f
Binary files /dev/null and b/public/images/emoji/apple/takeout_box.png differ
diff --git a/public/images/emoji/apple/tanabata_tree.png b/public/images/emoji/apple/tanabata_tree.png
index d1cdc00ffe2..fd1c87e338a 100644
Binary files a/public/images/emoji/apple/tanabata_tree.png and b/public/images/emoji/apple/tanabata_tree.png differ
diff --git a/public/images/emoji/apple/tangerine.png b/public/images/emoji/apple/tangerine.png
index edf6be47f33..e4ddd1955f4 100644
Binary files a/public/images/emoji/apple/tangerine.png and b/public/images/emoji/apple/tangerine.png differ
diff --git a/public/images/emoji/apple/tanzania.png b/public/images/emoji/apple/tanzania.png
new file mode 100644
index 00000000000..3cd7aba2ec5
Binary files /dev/null and b/public/images/emoji/apple/tanzania.png differ
diff --git a/public/images/emoji/apple/taurus.png b/public/images/emoji/apple/taurus.png
index 4fa42031adf..a57184d9f34 100644
Binary files a/public/images/emoji/apple/taurus.png and b/public/images/emoji/apple/taurus.png differ
diff --git a/public/images/emoji/apple/taxi.png b/public/images/emoji/apple/taxi.png
index ec0930c68c3..99fc7add6e6 100644
Binary files a/public/images/emoji/apple/taxi.png and b/public/images/emoji/apple/taxi.png differ
diff --git a/public/images/emoji/apple/tea.png b/public/images/emoji/apple/tea.png
index b9f89bdc46d..a2fafef7f94 100644
Binary files a/public/images/emoji/apple/tea.png and b/public/images/emoji/apple/tea.png differ
diff --git a/public/images/emoji/apple/telephone.png b/public/images/emoji/apple/telephone.png
index 6ac8bdd78a1..60538e87700 100644
Binary files a/public/images/emoji/apple/telephone.png and b/public/images/emoji/apple/telephone.png differ
diff --git a/public/images/emoji/apple/telephone_receiver.png b/public/images/emoji/apple/telephone_receiver.png
index a4e73c68d93..a6128b53152 100644
Binary files a/public/images/emoji/apple/telephone_receiver.png and b/public/images/emoji/apple/telephone_receiver.png differ
diff --git a/public/images/emoji/apple/telescope.png b/public/images/emoji/apple/telescope.png
index 3a6ca3119ea..026a270cc13 100644
Binary files a/public/images/emoji/apple/telescope.png and b/public/images/emoji/apple/telescope.png differ
diff --git a/public/images/emoji/apple/ten.png b/public/images/emoji/apple/ten.png
index 853c15ad148..59d013deccd 100644
Binary files a/public/images/emoji/apple/ten.png and b/public/images/emoji/apple/ten.png differ
diff --git a/public/images/emoji/apple/tennis.png b/public/images/emoji/apple/tennis.png
index 9af8a699733..32f01c115c3 100644
Binary files a/public/images/emoji/apple/tennis.png and b/public/images/emoji/apple/tennis.png differ
diff --git a/public/images/emoji/apple/tent.png b/public/images/emoji/apple/tent.png
index e54b56f4f63..163a5621a7a 100644
Binary files a/public/images/emoji/apple/tent.png and b/public/images/emoji/apple/tent.png differ
diff --git a/public/images/emoji/apple/thailand.png b/public/images/emoji/apple/thailand.png
new file mode 100644
index 00000000000..f6e7620ff90
Binary files /dev/null and b/public/images/emoji/apple/thailand.png differ
diff --git a/public/images/emoji/apple/thermometer.png b/public/images/emoji/apple/thermometer.png
index a48ce4473b1..a807d4cac48 100644
Binary files a/public/images/emoji/apple/thermometer.png and b/public/images/emoji/apple/thermometer.png differ
diff --git a/public/images/emoji/apple/thought_balloon.png b/public/images/emoji/apple/thought_balloon.png
index 9e95b9efe68..1fddc6e5829 100644
Binary files a/public/images/emoji/apple/thought_balloon.png and b/public/images/emoji/apple/thought_balloon.png differ
diff --git a/public/images/emoji/apple/three.png b/public/images/emoji/apple/three.png
index 6a0af40ae7e..2b641df50a8 100644
Binary files a/public/images/emoji/apple/three.png and b/public/images/emoji/apple/three.png differ
diff --git a/public/images/emoji/apple/three_button_mouse.png b/public/images/emoji/apple/three_button_mouse.png
index eb88c6c7686..3899171edc6 100644
Binary files a/public/images/emoji/apple/three_button_mouse.png and b/public/images/emoji/apple/three_button_mouse.png differ
diff --git a/public/images/emoji/apple/thumbsdown/2.png b/public/images/emoji/apple/thumbsdown/2.png
new file mode 100644
index 00000000000..930faaf2a54
Binary files /dev/null and b/public/images/emoji/apple/thumbsdown/2.png differ
diff --git a/public/images/emoji/apple/thumbsdown/3.png b/public/images/emoji/apple/thumbsdown/3.png
new file mode 100644
index 00000000000..29ebfe1eefe
Binary files /dev/null and b/public/images/emoji/apple/thumbsdown/3.png differ
diff --git a/public/images/emoji/apple/thumbsdown/4.png b/public/images/emoji/apple/thumbsdown/4.png
new file mode 100644
index 00000000000..0b46e9862c2
Binary files /dev/null and b/public/images/emoji/apple/thumbsdown/4.png differ
diff --git a/public/images/emoji/apple/thumbsdown/5.png b/public/images/emoji/apple/thumbsdown/5.png
new file mode 100644
index 00000000000..5ee7db294b7
Binary files /dev/null and b/public/images/emoji/apple/thumbsdown/5.png differ
diff --git a/public/images/emoji/apple/thumbsdown/6.png b/public/images/emoji/apple/thumbsdown/6.png
new file mode 100644
index 00000000000..edf1f180c89
Binary files /dev/null and b/public/images/emoji/apple/thumbsdown/6.png differ
diff --git a/public/images/emoji/apple/thumbsup/2.png b/public/images/emoji/apple/thumbsup/2.png
new file mode 100644
index 00000000000..f33655e0943
Binary files /dev/null and b/public/images/emoji/apple/thumbsup/2.png differ
diff --git a/public/images/emoji/apple/thumbsup/3.png b/public/images/emoji/apple/thumbsup/3.png
new file mode 100644
index 00000000000..e6114682607
Binary files /dev/null and b/public/images/emoji/apple/thumbsup/3.png differ
diff --git a/public/images/emoji/apple/thumbsup/4.png b/public/images/emoji/apple/thumbsup/4.png
new file mode 100644
index 00000000000..c07e81b31e3
Binary files /dev/null and b/public/images/emoji/apple/thumbsup/4.png differ
diff --git a/public/images/emoji/apple/thumbsup/5.png b/public/images/emoji/apple/thumbsup/5.png
new file mode 100644
index 00000000000..c04a6c2bd8e
Binary files /dev/null and b/public/images/emoji/apple/thumbsup/5.png differ
diff --git a/public/images/emoji/apple/thumbsup/6.png b/public/images/emoji/apple/thumbsup/6.png
new file mode 100644
index 00000000000..8fbc7fd36ba
Binary files /dev/null and b/public/images/emoji/apple/thumbsup/6.png differ
diff --git a/public/images/emoji/apple/thunder_cloud_and_rain.png b/public/images/emoji/apple/thunder_cloud_and_rain.png
index ad5ed7e930c..8f44a7726e9 100644
Binary files a/public/images/emoji/apple/thunder_cloud_and_rain.png and b/public/images/emoji/apple/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/apple/thunder_cloud_rain.png b/public/images/emoji/apple/thunder_cloud_rain.png
index ad5ed7e930c..8f44a7726e9 100644
Binary files a/public/images/emoji/apple/thunder_cloud_rain.png and b/public/images/emoji/apple/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/apple/ticket.png b/public/images/emoji/apple/ticket.png
index 74b0ee32241..73a7b007c23 100644
Binary files a/public/images/emoji/apple/ticket.png and b/public/images/emoji/apple/ticket.png differ
diff --git a/public/images/emoji/apple/tickets.png b/public/images/emoji/apple/tickets.png
index 89650d6ec47..fd35e2a4d09 100644
Binary files a/public/images/emoji/apple/tickets.png and b/public/images/emoji/apple/tickets.png differ
diff --git a/public/images/emoji/apple/tiger.png b/public/images/emoji/apple/tiger.png
index a54ccc83c23..d9b0fbb758c 100644
Binary files a/public/images/emoji/apple/tiger.png and b/public/images/emoji/apple/tiger.png differ
diff --git a/public/images/emoji/apple/tiger2.png b/public/images/emoji/apple/tiger2.png
index d6f7ef738c3..080125274aa 100644
Binary files a/public/images/emoji/apple/tiger2.png and b/public/images/emoji/apple/tiger2.png differ
diff --git a/public/images/emoji/apple/timer.png b/public/images/emoji/apple/timer.png
index fa4107c6920..306fb222cf9 100644
Binary files a/public/images/emoji/apple/timer.png and b/public/images/emoji/apple/timer.png differ
diff --git a/public/images/emoji/apple/timer_clock.png b/public/images/emoji/apple/timer_clock.png
index fa4107c6920..306fb222cf9 100644
Binary files a/public/images/emoji/apple/timer_clock.png and b/public/images/emoji/apple/timer_clock.png differ
diff --git a/public/images/emoji/apple/timor_leste.png b/public/images/emoji/apple/timor_leste.png
new file mode 100644
index 00000000000..25fdf935ed1
Binary files /dev/null and b/public/images/emoji/apple/timor_leste.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man.png b/public/images/emoji/apple/tipping_hand_man.png
new file mode 100644
index 00000000000..6a4098a9d3f
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_man.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/2.png b/public/images/emoji/apple/tipping_hand_man/2.png
new file mode 100644
index 00000000000..1dd416fb2fb
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/3.png b/public/images/emoji/apple/tipping_hand_man/3.png
new file mode 100644
index 00000000000..f97238add35
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/4.png b/public/images/emoji/apple/tipping_hand_man/4.png
new file mode 100644
index 00000000000..4e8505eb576
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/5.png b/public/images/emoji/apple/tipping_hand_man/5.png
new file mode 100644
index 00000000000..ee1174f3b40
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/apple/tipping_hand_man/6.png b/public/images/emoji/apple/tipping_hand_man/6.png
new file mode 100644
index 00000000000..2198ef8ba14
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman.png b/public/images/emoji/apple/tipping_hand_woman.png
new file mode 100644
index 00000000000..4424423fa37
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_woman.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/2.png b/public/images/emoji/apple/tipping_hand_woman/2.png
new file mode 100644
index 00000000000..115198e5636
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/3.png b/public/images/emoji/apple/tipping_hand_woman/3.png
new file mode 100644
index 00000000000..d0593f87fbb
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/4.png b/public/images/emoji/apple/tipping_hand_woman/4.png
new file mode 100644
index 00000000000..a2f5d0294f2
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/5.png b/public/images/emoji/apple/tipping_hand_woman/5.png
new file mode 100644
index 00000000000..63d9338057f
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/apple/tipping_hand_woman/6.png b/public/images/emoji/apple/tipping_hand_woman/6.png
new file mode 100644
index 00000000000..30b2bd891a4
Binary files /dev/null and b/public/images/emoji/apple/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/apple/tm.png b/public/images/emoji/apple/tm.png
index fee4073531d..03952783bbc 100644
Binary files a/public/images/emoji/apple/tm.png and b/public/images/emoji/apple/tm.png differ
diff --git a/public/images/emoji/apple/togo.png b/public/images/emoji/apple/togo.png
new file mode 100644
index 00000000000..6dc60ec10d6
Binary files /dev/null and b/public/images/emoji/apple/togo.png differ
diff --git a/public/images/emoji/apple/toilet.png b/public/images/emoji/apple/toilet.png
index 4f9f2c50596..ab7e58aa726 100644
Binary files a/public/images/emoji/apple/toilet.png and b/public/images/emoji/apple/toilet.png differ
diff --git a/public/images/emoji/apple/tokelau.png b/public/images/emoji/apple/tokelau.png
new file mode 100644
index 00000000000..18cbb256ea3
Binary files /dev/null and b/public/images/emoji/apple/tokelau.png differ
diff --git a/public/images/emoji/apple/tokyo_tower.png b/public/images/emoji/apple/tokyo_tower.png
index 3fa978a5b09..3c3f33124c7 100644
Binary files a/public/images/emoji/apple/tokyo_tower.png and b/public/images/emoji/apple/tokyo_tower.png differ
diff --git a/public/images/emoji/apple/tomato.png b/public/images/emoji/apple/tomato.png
index 7e9a63a6afb..0b100a46394 100644
Binary files a/public/images/emoji/apple/tomato.png and b/public/images/emoji/apple/tomato.png differ
diff --git a/public/images/emoji/apple/tonga.png b/public/images/emoji/apple/tonga.png
new file mode 100644
index 00000000000..d7e19e4a114
Binary files /dev/null and b/public/images/emoji/apple/tonga.png differ
diff --git a/public/images/emoji/apple/tongue.png b/public/images/emoji/apple/tongue.png
index 53189574b96..0f5e837862b 100644
Binary files a/public/images/emoji/apple/tongue.png and b/public/images/emoji/apple/tongue.png differ
diff --git a/public/images/emoji/apple/tools.png b/public/images/emoji/apple/tools.png
index 32050b23f08..daef26722cc 100644
Binary files a/public/images/emoji/apple/tools.png and b/public/images/emoji/apple/tools.png differ
diff --git a/public/images/emoji/apple/top.png b/public/images/emoji/apple/top.png
index 4bb24f1a37d..5a64e2a0b56 100644
Binary files a/public/images/emoji/apple/top.png and b/public/images/emoji/apple/top.png differ
diff --git a/public/images/emoji/apple/tophat.png b/public/images/emoji/apple/tophat.png
index bde39c16bd4..4e7fbd68525 100644
Binary files a/public/images/emoji/apple/tophat.png and b/public/images/emoji/apple/tophat.png differ
diff --git a/public/images/emoji/apple/tornado.png b/public/images/emoji/apple/tornado.png
new file mode 100644
index 00000000000..0d3985f1191
Binary files /dev/null and b/public/images/emoji/apple/tornado.png differ
diff --git a/public/images/emoji/apple/tr.png b/public/images/emoji/apple/tr.png
new file mode 100644
index 00000000000..00411e5a49a
Binary files /dev/null and b/public/images/emoji/apple/tr.png differ
diff --git a/public/images/emoji/apple/track_next.png b/public/images/emoji/apple/track_next.png
index 2ff96903d1f..c6c645c86db 100644
Binary files a/public/images/emoji/apple/track_next.png and b/public/images/emoji/apple/track_next.png differ
diff --git a/public/images/emoji/apple/track_previous.png b/public/images/emoji/apple/track_previous.png
index 401b24b9a7e..881bf59b29b 100644
Binary files a/public/images/emoji/apple/track_previous.png and b/public/images/emoji/apple/track_previous.png differ
diff --git a/public/images/emoji/apple/trackball.png b/public/images/emoji/apple/trackball.png
index 4114ed434ab..2801e64c8d5 100644
Binary files a/public/images/emoji/apple/trackball.png and b/public/images/emoji/apple/trackball.png differ
diff --git a/public/images/emoji/apple/tractor.png b/public/images/emoji/apple/tractor.png
index 05c7cc855cd..fd57e2bf3b5 100644
Binary files a/public/images/emoji/apple/tractor.png and b/public/images/emoji/apple/tractor.png differ
diff --git a/public/images/emoji/apple/traffic_light.png b/public/images/emoji/apple/traffic_light.png
index f5df9bbc9ba..80519d2e625 100644
Binary files a/public/images/emoji/apple/traffic_light.png and b/public/images/emoji/apple/traffic_light.png differ
diff --git a/public/images/emoji/apple/train.png b/public/images/emoji/apple/train.png
index c9635597bcf..ee6a95d50ac 100644
Binary files a/public/images/emoji/apple/train.png and b/public/images/emoji/apple/train.png differ
diff --git a/public/images/emoji/apple/train2.png b/public/images/emoji/apple/train2.png
index 874216e62e7..fe2107cc7e0 100644
Binary files a/public/images/emoji/apple/train2.png and b/public/images/emoji/apple/train2.png differ
diff --git a/public/images/emoji/apple/tram.png b/public/images/emoji/apple/tram.png
index c76fd23f317..1d5bcef502e 100644
Binary files a/public/images/emoji/apple/tram.png and b/public/images/emoji/apple/tram.png differ
diff --git a/public/images/emoji/apple/triangular_flag_on_post.png b/public/images/emoji/apple/triangular_flag_on_post.png
index da9085f1a5f..ec0d3dfd8c9 100644
Binary files a/public/images/emoji/apple/triangular_flag_on_post.png and b/public/images/emoji/apple/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/apple/triangular_ruler.png b/public/images/emoji/apple/triangular_ruler.png
index ef93bb8552d..5cb2b5d5006 100644
Binary files a/public/images/emoji/apple/triangular_ruler.png and b/public/images/emoji/apple/triangular_ruler.png differ
diff --git a/public/images/emoji/apple/trident.png b/public/images/emoji/apple/trident.png
index c712d8319c8..b1abb2d01fd 100644
Binary files a/public/images/emoji/apple/trident.png and b/public/images/emoji/apple/trident.png differ
diff --git a/public/images/emoji/apple/trinidad_tobago.png b/public/images/emoji/apple/trinidad_tobago.png
new file mode 100644
index 00000000000..e7fa4c6183c
Binary files /dev/null and b/public/images/emoji/apple/trinidad_tobago.png differ
diff --git a/public/images/emoji/apple/tristan_da_cunha.png b/public/images/emoji/apple/tristan_da_cunha.png
new file mode 100644
index 00000000000..694a0b8510c
Binary files /dev/null and b/public/images/emoji/apple/tristan_da_cunha.png differ
diff --git a/public/images/emoji/apple/trolleybus.png b/public/images/emoji/apple/trolleybus.png
index b6545756434..b0aea215bb6 100644
Binary files a/public/images/emoji/apple/trolleybus.png and b/public/images/emoji/apple/trolleybus.png differ
diff --git a/public/images/emoji/apple/trophy.png b/public/images/emoji/apple/trophy.png
index 90688c4809f..f8a2286efe2 100644
Binary files a/public/images/emoji/apple/trophy.png and b/public/images/emoji/apple/trophy.png differ
diff --git a/public/images/emoji/apple/tropical_drink.png b/public/images/emoji/apple/tropical_drink.png
index 562cc98842f..af0543b4613 100644
Binary files a/public/images/emoji/apple/tropical_drink.png and b/public/images/emoji/apple/tropical_drink.png differ
diff --git a/public/images/emoji/apple/tropical_fish.png b/public/images/emoji/apple/tropical_fish.png
index 3a3db059deb..71d76b95de1 100644
Binary files a/public/images/emoji/apple/tropical_fish.png and b/public/images/emoji/apple/tropical_fish.png differ
diff --git a/public/images/emoji/apple/truck.png b/public/images/emoji/apple/truck.png
index cc6db6d7b73..1d507c61336 100644
Binary files a/public/images/emoji/apple/truck.png and b/public/images/emoji/apple/truck.png differ
diff --git a/public/images/emoji/apple/trumpet.png b/public/images/emoji/apple/trumpet.png
index d438f9a91e9..a03fbba25fc 100644
Binary files a/public/images/emoji/apple/trumpet.png and b/public/images/emoji/apple/trumpet.png differ
diff --git a/public/images/emoji/apple/tshirt.png b/public/images/emoji/apple/tshirt.png
new file mode 100644
index 00000000000..68a0867f0ab
Binary files /dev/null and b/public/images/emoji/apple/tshirt.png differ
diff --git a/public/images/emoji/apple/tulip.png b/public/images/emoji/apple/tulip.png
index d79aff41750..ef9742c6c1c 100644
Binary files a/public/images/emoji/apple/tulip.png and b/public/images/emoji/apple/tulip.png differ
diff --git a/public/images/emoji/apple/tumbler_glass.png b/public/images/emoji/apple/tumbler_glass.png
new file mode 100644
index 00000000000..b2663a89537
Binary files /dev/null and b/public/images/emoji/apple/tumbler_glass.png differ
diff --git a/public/images/emoji/apple/tunisia.png b/public/images/emoji/apple/tunisia.png
new file mode 100644
index 00000000000..e6e933b4fc9
Binary files /dev/null and b/public/images/emoji/apple/tunisia.png differ
diff --git a/public/images/emoji/apple/turkey.png b/public/images/emoji/apple/turkey.png
index c0eba745745..9d302e2f341 100644
Binary files a/public/images/emoji/apple/turkey.png and b/public/images/emoji/apple/turkey.png differ
diff --git a/public/images/emoji/apple/turkmenistan.png b/public/images/emoji/apple/turkmenistan.png
new file mode 100644
index 00000000000..96caa4ddf58
Binary files /dev/null and b/public/images/emoji/apple/turkmenistan.png differ
diff --git a/public/images/emoji/apple/turks_caicos_islands.png b/public/images/emoji/apple/turks_caicos_islands.png
new file mode 100644
index 00000000000..9cd6d02a4be
Binary files /dev/null and b/public/images/emoji/apple/turks_caicos_islands.png differ
diff --git a/public/images/emoji/apple/turtle.png b/public/images/emoji/apple/turtle.png
index 537b2dde52f..ae80acb3f0a 100644
Binary files a/public/images/emoji/apple/turtle.png and b/public/images/emoji/apple/turtle.png differ
diff --git a/public/images/emoji/apple/tuvalu.png b/public/images/emoji/apple/tuvalu.png
new file mode 100644
index 00000000000..2f943390da7
Binary files /dev/null and b/public/images/emoji/apple/tuvalu.png differ
diff --git a/public/images/emoji/apple/tv.png b/public/images/emoji/apple/tv.png
index c9ec15c655d..629d8504c7a 100644
Binary files a/public/images/emoji/apple/tv.png and b/public/images/emoji/apple/tv.png differ
diff --git a/public/images/emoji/apple/twisted_rightwards_arrows.png b/public/images/emoji/apple/twisted_rightwards_arrows.png
index 0201e297a83..4d4b63a6aaa 100644
Binary files a/public/images/emoji/apple/twisted_rightwards_arrows.png and b/public/images/emoji/apple/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/apple/two.png b/public/images/emoji/apple/two.png
index 17e3962e6fc..6740511b38b 100644
Binary files a/public/images/emoji/apple/two.png and b/public/images/emoji/apple/two.png differ
diff --git a/public/images/emoji/apple/two_hearts.png b/public/images/emoji/apple/two_hearts.png
index eff6d442d40..0854acf4307 100644
Binary files a/public/images/emoji/apple/two_hearts.png and b/public/images/emoji/apple/two_hearts.png differ
diff --git a/public/images/emoji/apple/u5272.png b/public/images/emoji/apple/u5272.png
index 8c7ad808711..049665f4dd1 100644
Binary files a/public/images/emoji/apple/u5272.png and b/public/images/emoji/apple/u5272.png differ
diff --git a/public/images/emoji/apple/u5408.png b/public/images/emoji/apple/u5408.png
index 2cdde1bf546..dd2e396699f 100644
Binary files a/public/images/emoji/apple/u5408.png and b/public/images/emoji/apple/u5408.png differ
diff --git a/public/images/emoji/apple/u55b6.png b/public/images/emoji/apple/u55b6.png
index 4a6bd1d02ef..245284a11f8 100644
Binary files a/public/images/emoji/apple/u55b6.png and b/public/images/emoji/apple/u55b6.png differ
diff --git a/public/images/emoji/apple/u6307.png b/public/images/emoji/apple/u6307.png
index 1811b71c7f6..ad9a077871a 100644
Binary files a/public/images/emoji/apple/u6307.png and b/public/images/emoji/apple/u6307.png differ
diff --git a/public/images/emoji/apple/u6708.png b/public/images/emoji/apple/u6708.png
index a969dbd1e2e..9e79230f6d7 100644
Binary files a/public/images/emoji/apple/u6708.png and b/public/images/emoji/apple/u6708.png differ
diff --git a/public/images/emoji/apple/u6709.png b/public/images/emoji/apple/u6709.png
index a6f0b2e52fa..b9b24f4a5a0 100644
Binary files a/public/images/emoji/apple/u6709.png and b/public/images/emoji/apple/u6709.png differ
diff --git a/public/images/emoji/apple/u6e80.png b/public/images/emoji/apple/u6e80.png
index 669de7d6e08..2fe46b57c07 100644
Binary files a/public/images/emoji/apple/u6e80.png and b/public/images/emoji/apple/u6e80.png differ
diff --git a/public/images/emoji/apple/u7121.png b/public/images/emoji/apple/u7121.png
index 96ce24bf467..9a1e32f38fb 100644
Binary files a/public/images/emoji/apple/u7121.png and b/public/images/emoji/apple/u7121.png differ
diff --git a/public/images/emoji/apple/u7533.png b/public/images/emoji/apple/u7533.png
index a0a50f6039d..68854c4e7f8 100644
Binary files a/public/images/emoji/apple/u7533.png and b/public/images/emoji/apple/u7533.png differ
diff --git a/public/images/emoji/apple/u7981.png b/public/images/emoji/apple/u7981.png
index 69d83d7a8ca..f8d1473ce7a 100644
Binary files a/public/images/emoji/apple/u7981.png and b/public/images/emoji/apple/u7981.png differ
diff --git a/public/images/emoji/apple/u7a7a.png b/public/images/emoji/apple/u7a7a.png
index 48a2a1e741f..9b927657551 100644
Binary files a/public/images/emoji/apple/u7a7a.png and b/public/images/emoji/apple/u7a7a.png differ
diff --git a/public/images/emoji/apple/uganda.png b/public/images/emoji/apple/uganda.png
new file mode 100644
index 00000000000..02590e94cfa
Binary files /dev/null and b/public/images/emoji/apple/uganda.png differ
diff --git a/public/images/emoji/apple/uk.png b/public/images/emoji/apple/uk.png
new file mode 100644
index 00000000000..1d15d6cb969
Binary files /dev/null and b/public/images/emoji/apple/uk.png differ
diff --git a/public/images/emoji/apple/ukraine.png b/public/images/emoji/apple/ukraine.png
new file mode 100644
index 00000000000..ac778caae3d
Binary files /dev/null and b/public/images/emoji/apple/ukraine.png differ
diff --git a/public/images/emoji/apple/umbrella.png b/public/images/emoji/apple/umbrella.png
index fe9852deb0e..ba24ed35bd4 100644
Binary files a/public/images/emoji/apple/umbrella.png and b/public/images/emoji/apple/umbrella.png differ
diff --git a/public/images/emoji/apple/umbrella2.png b/public/images/emoji/apple/umbrella2.png
index fff8477f64c..1d7d1c6a5fe 100644
Binary files a/public/images/emoji/apple/umbrella2.png and b/public/images/emoji/apple/umbrella2.png differ
diff --git a/public/images/emoji/apple/umbrella_on_ground.png b/public/images/emoji/apple/umbrella_on_ground.png
index c51ce16d0a5..95b1ae9fdd1 100644
Binary files a/public/images/emoji/apple/umbrella_on_ground.png and b/public/images/emoji/apple/umbrella_on_ground.png differ
diff --git a/public/images/emoji/apple/underage.png b/public/images/emoji/apple/underage.png
index 4764fbb5721..2e425f1d291 100644
Binary files a/public/images/emoji/apple/underage.png and b/public/images/emoji/apple/underage.png differ
diff --git a/public/images/emoji/apple/unicorn.png b/public/images/emoji/apple/unicorn.png
index 67c720d0cd3..ca52d64d995 100644
Binary files a/public/images/emoji/apple/unicorn.png and b/public/images/emoji/apple/unicorn.png differ
diff --git a/public/images/emoji/apple/unicorn_face.png b/public/images/emoji/apple/unicorn_face.png
index 67c720d0cd3..ca52d64d995 100644
Binary files a/public/images/emoji/apple/unicorn_face.png and b/public/images/emoji/apple/unicorn_face.png differ
diff --git a/public/images/emoji/apple/united_arab_emirates.png b/public/images/emoji/apple/united_arab_emirates.png
new file mode 100644
index 00000000000..0f079b5cc52
Binary files /dev/null and b/public/images/emoji/apple/united_arab_emirates.png differ
diff --git a/public/images/emoji/apple/united_nations.png b/public/images/emoji/apple/united_nations.png
new file mode 100644
index 00000000000..d695a5cac09
Binary files /dev/null and b/public/images/emoji/apple/united_nations.png differ
diff --git a/public/images/emoji/apple/unlock.png b/public/images/emoji/apple/unlock.png
index bc2c50f3691..620245dc607 100644
Binary files a/public/images/emoji/apple/unlock.png and b/public/images/emoji/apple/unlock.png differ
diff --git a/public/images/emoji/apple/up.png b/public/images/emoji/apple/up.png
index 6a12b5c52fb..e7d02e98e59 100644
Binary files a/public/images/emoji/apple/up.png and b/public/images/emoji/apple/up.png differ
diff --git a/public/images/emoji/apple/urn.png b/public/images/emoji/apple/urn.png
index f89584d1984..d1af59ed33b 100644
Binary files a/public/images/emoji/apple/urn.png and b/public/images/emoji/apple/urn.png differ
diff --git a/public/images/emoji/apple/uruguay.png b/public/images/emoji/apple/uruguay.png
new file mode 100644
index 00000000000..a03f80a7ebb
Binary files /dev/null and b/public/images/emoji/apple/uruguay.png differ
diff --git a/public/images/emoji/apple/us_outlying_islands.png b/public/images/emoji/apple/us_outlying_islands.png
new file mode 100644
index 00000000000..64a5e528d90
Binary files /dev/null and b/public/images/emoji/apple/us_outlying_islands.png differ
diff --git a/public/images/emoji/apple/us_virgin_islands.png b/public/images/emoji/apple/us_virgin_islands.png
new file mode 100644
index 00000000000..4c5cb5786c9
Binary files /dev/null and b/public/images/emoji/apple/us_virgin_islands.png differ
diff --git a/public/images/emoji/apple/uzbekistan.png b/public/images/emoji/apple/uzbekistan.png
new file mode 100644
index 00000000000..9ad43eba982
Binary files /dev/null and b/public/images/emoji/apple/uzbekistan.png differ
diff --git a/public/images/emoji/apple/v/2.png b/public/images/emoji/apple/v/2.png
new file mode 100644
index 00000000000..8e9dadbca36
Binary files /dev/null and b/public/images/emoji/apple/v/2.png differ
diff --git a/public/images/emoji/apple/v/3.png b/public/images/emoji/apple/v/3.png
new file mode 100644
index 00000000000..eab98d28044
Binary files /dev/null and b/public/images/emoji/apple/v/3.png differ
diff --git a/public/images/emoji/apple/v/4.png b/public/images/emoji/apple/v/4.png
new file mode 100644
index 00000000000..6e6d282f7ef
Binary files /dev/null and b/public/images/emoji/apple/v/4.png differ
diff --git a/public/images/emoji/apple/v/5.png b/public/images/emoji/apple/v/5.png
new file mode 100644
index 00000000000..3b8c0e6db9f
Binary files /dev/null and b/public/images/emoji/apple/v/5.png differ
diff --git a/public/images/emoji/apple/v/6.png b/public/images/emoji/apple/v/6.png
new file mode 100644
index 00000000000..e6c87e1b3d6
Binary files /dev/null and b/public/images/emoji/apple/v/6.png differ
diff --git a/public/images/emoji/apple/vampire.png b/public/images/emoji/apple/vampire.png
new file mode 100644
index 00000000000..962288bd170
Binary files /dev/null and b/public/images/emoji/apple/vampire.png differ
diff --git a/public/images/emoji/apple/vampire/2.png b/public/images/emoji/apple/vampire/2.png
new file mode 100644
index 00000000000..154f2b6e35a
Binary files /dev/null and b/public/images/emoji/apple/vampire/2.png differ
diff --git a/public/images/emoji/apple/vampire/3.png b/public/images/emoji/apple/vampire/3.png
new file mode 100644
index 00000000000..540b48d887f
Binary files /dev/null and b/public/images/emoji/apple/vampire/3.png differ
diff --git a/public/images/emoji/apple/vampire/4.png b/public/images/emoji/apple/vampire/4.png
new file mode 100644
index 00000000000..b05d3bad9ab
Binary files /dev/null and b/public/images/emoji/apple/vampire/4.png differ
diff --git a/public/images/emoji/apple/vampire/5.png b/public/images/emoji/apple/vampire/5.png
new file mode 100644
index 00000000000..2bd9a7b71bb
Binary files /dev/null and b/public/images/emoji/apple/vampire/5.png differ
diff --git a/public/images/emoji/apple/vampire/6.png b/public/images/emoji/apple/vampire/6.png
new file mode 100644
index 00000000000..c88f4ad73bf
Binary files /dev/null and b/public/images/emoji/apple/vampire/6.png differ
diff --git a/public/images/emoji/apple/vanuatu.png b/public/images/emoji/apple/vanuatu.png
new file mode 100644
index 00000000000..557f83f14a5
Binary files /dev/null and b/public/images/emoji/apple/vanuatu.png differ
diff --git a/public/images/emoji/apple/vatican_city.png b/public/images/emoji/apple/vatican_city.png
new file mode 100644
index 00000000000..317b79b153a
Binary files /dev/null and b/public/images/emoji/apple/vatican_city.png differ
diff --git a/public/images/emoji/apple/venezuela.png b/public/images/emoji/apple/venezuela.png
new file mode 100644
index 00000000000..38cd6eb8e34
Binary files /dev/null and b/public/images/emoji/apple/venezuela.png differ
diff --git a/public/images/emoji/apple/vertical_traffic_light.png b/public/images/emoji/apple/vertical_traffic_light.png
index 33e92b61505..99179206f9b 100644
Binary files a/public/images/emoji/apple/vertical_traffic_light.png and b/public/images/emoji/apple/vertical_traffic_light.png differ
diff --git a/public/images/emoji/apple/vhs.png b/public/images/emoji/apple/vhs.png
index 2f7b3f5e514..975285a28a1 100644
Binary files a/public/images/emoji/apple/vhs.png and b/public/images/emoji/apple/vhs.png differ
diff --git a/public/images/emoji/apple/vibration_mode.png b/public/images/emoji/apple/vibration_mode.png
index 7d62f0abeb5..5c88e13f412 100644
Binary files a/public/images/emoji/apple/vibration_mode.png and b/public/images/emoji/apple/vibration_mode.png differ
diff --git a/public/images/emoji/apple/video_camera.png b/public/images/emoji/apple/video_camera.png
index d4be9b9e807..c2acf77fbc1 100644
Binary files a/public/images/emoji/apple/video_camera.png and b/public/images/emoji/apple/video_camera.png differ
diff --git a/public/images/emoji/apple/video_game.png b/public/images/emoji/apple/video_game.png
index a949144b876..7c08a2623cd 100644
Binary files a/public/images/emoji/apple/video_game.png and b/public/images/emoji/apple/video_game.png differ
diff --git a/public/images/emoji/apple/vietnam.png b/public/images/emoji/apple/vietnam.png
new file mode 100644
index 00000000000..b67f1a10479
Binary files /dev/null and b/public/images/emoji/apple/vietnam.png differ
diff --git a/public/images/emoji/apple/violin.png b/public/images/emoji/apple/violin.png
index 176f0eaba42..e78c6ec7da8 100644
Binary files a/public/images/emoji/apple/violin.png and b/public/images/emoji/apple/violin.png differ
diff --git a/public/images/emoji/apple/virgo.png b/public/images/emoji/apple/virgo.png
index 2ce0771fe73..d32108ffe04 100644
Binary files a/public/images/emoji/apple/virgo.png and b/public/images/emoji/apple/virgo.png differ
diff --git a/public/images/emoji/apple/volcano.png b/public/images/emoji/apple/volcano.png
index a06b343c942..5f5184bcd12 100644
Binary files a/public/images/emoji/apple/volcano.png and b/public/images/emoji/apple/volcano.png differ
diff --git a/public/images/emoji/apple/volleyball.png b/public/images/emoji/apple/volleyball.png
index f18f12cf09b..1424df5f48c 100644
Binary files a/public/images/emoji/apple/volleyball.png and b/public/images/emoji/apple/volleyball.png differ
diff --git a/public/images/emoji/apple/vs.png b/public/images/emoji/apple/vs.png
index 1ffea60b3d1..ce01369010d 100644
Binary files a/public/images/emoji/apple/vs.png and b/public/images/emoji/apple/vs.png differ
diff --git a/public/images/emoji/apple/vulcan/2.png b/public/images/emoji/apple/vulcan/2.png
new file mode 100644
index 00000000000..9c277890adf
Binary files /dev/null and b/public/images/emoji/apple/vulcan/2.png differ
diff --git a/public/images/emoji/apple/vulcan/3.png b/public/images/emoji/apple/vulcan/3.png
new file mode 100644
index 00000000000..8d6940ee24d
Binary files /dev/null and b/public/images/emoji/apple/vulcan/3.png differ
diff --git a/public/images/emoji/apple/vulcan/4.png b/public/images/emoji/apple/vulcan/4.png
new file mode 100644
index 00000000000..fe549c3e2c6
Binary files /dev/null and b/public/images/emoji/apple/vulcan/4.png differ
diff --git a/public/images/emoji/apple/vulcan/5.png b/public/images/emoji/apple/vulcan/5.png
new file mode 100644
index 00000000000..4ad8b9df458
Binary files /dev/null and b/public/images/emoji/apple/vulcan/5.png differ
diff --git a/public/images/emoji/apple/vulcan/6.png b/public/images/emoji/apple/vulcan/6.png
new file mode 100644
index 00000000000..af23814474e
Binary files /dev/null and b/public/images/emoji/apple/vulcan/6.png differ
diff --git a/public/images/emoji/apple/vulcan_salute.png b/public/images/emoji/apple/vulcan_salute.png
new file mode 100644
index 00000000000..89fd1859fef
Binary files /dev/null and b/public/images/emoji/apple/vulcan_salute.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/2.png b/public/images/emoji/apple/vulcan_salute/2.png
new file mode 100644
index 00000000000..9c277890adf
Binary files /dev/null and b/public/images/emoji/apple/vulcan_salute/2.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/3.png b/public/images/emoji/apple/vulcan_salute/3.png
new file mode 100644
index 00000000000..8d6940ee24d
Binary files /dev/null and b/public/images/emoji/apple/vulcan_salute/3.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/4.png b/public/images/emoji/apple/vulcan_salute/4.png
new file mode 100644
index 00000000000..fe549c3e2c6
Binary files /dev/null and b/public/images/emoji/apple/vulcan_salute/4.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/5.png b/public/images/emoji/apple/vulcan_salute/5.png
new file mode 100644
index 00000000000..4ad8b9df458
Binary files /dev/null and b/public/images/emoji/apple/vulcan_salute/5.png differ
diff --git a/public/images/emoji/apple/vulcan_salute/6.png b/public/images/emoji/apple/vulcan_salute/6.png
new file mode 100644
index 00000000000..af23814474e
Binary files /dev/null and b/public/images/emoji/apple/vulcan_salute/6.png differ
diff --git a/public/images/emoji/apple/walking/2.png b/public/images/emoji/apple/walking/2.png
new file mode 100644
index 00000000000..8ca3ec2b825
Binary files /dev/null and b/public/images/emoji/apple/walking/2.png differ
diff --git a/public/images/emoji/apple/walking/3.png b/public/images/emoji/apple/walking/3.png
new file mode 100644
index 00000000000..91fd7ddc366
Binary files /dev/null and b/public/images/emoji/apple/walking/3.png differ
diff --git a/public/images/emoji/apple/walking/4.png b/public/images/emoji/apple/walking/4.png
new file mode 100644
index 00000000000..a591da4533a
Binary files /dev/null and b/public/images/emoji/apple/walking/4.png differ
diff --git a/public/images/emoji/apple/walking/5.png b/public/images/emoji/apple/walking/5.png
new file mode 100644
index 00000000000..ca9a5d71e13
Binary files /dev/null and b/public/images/emoji/apple/walking/5.png differ
diff --git a/public/images/emoji/apple/walking/6.png b/public/images/emoji/apple/walking/6.png
new file mode 100644
index 00000000000..9a52e389957
Binary files /dev/null and b/public/images/emoji/apple/walking/6.png differ
diff --git a/public/images/emoji/apple/walking_man.png b/public/images/emoji/apple/walking_man.png
new file mode 100644
index 00000000000..e647b9672b4
Binary files /dev/null and b/public/images/emoji/apple/walking_man.png differ
diff --git a/public/images/emoji/apple/walking_man/2.png b/public/images/emoji/apple/walking_man/2.png
new file mode 100644
index 00000000000..8ca3ec2b825
Binary files /dev/null and b/public/images/emoji/apple/walking_man/2.png differ
diff --git a/public/images/emoji/apple/walking_man/3.png b/public/images/emoji/apple/walking_man/3.png
new file mode 100644
index 00000000000..91fd7ddc366
Binary files /dev/null and b/public/images/emoji/apple/walking_man/3.png differ
diff --git a/public/images/emoji/apple/walking_man/4.png b/public/images/emoji/apple/walking_man/4.png
new file mode 100644
index 00000000000..a591da4533a
Binary files /dev/null and b/public/images/emoji/apple/walking_man/4.png differ
diff --git a/public/images/emoji/apple/walking_man/5.png b/public/images/emoji/apple/walking_man/5.png
new file mode 100644
index 00000000000..ca9a5d71e13
Binary files /dev/null and b/public/images/emoji/apple/walking_man/5.png differ
diff --git a/public/images/emoji/apple/walking_man/6.png b/public/images/emoji/apple/walking_man/6.png
new file mode 100644
index 00000000000..9a52e389957
Binary files /dev/null and b/public/images/emoji/apple/walking_man/6.png differ
diff --git a/public/images/emoji/apple/walking_woman.png b/public/images/emoji/apple/walking_woman.png
new file mode 100644
index 00000000000..15b622aee33
Binary files /dev/null and b/public/images/emoji/apple/walking_woman.png differ
diff --git a/public/images/emoji/apple/walking_woman/2.png b/public/images/emoji/apple/walking_woman/2.png
new file mode 100644
index 00000000000..a548a92f62f
Binary files /dev/null and b/public/images/emoji/apple/walking_woman/2.png differ
diff --git a/public/images/emoji/apple/walking_woman/3.png b/public/images/emoji/apple/walking_woman/3.png
new file mode 100644
index 00000000000..b6a8d817b98
Binary files /dev/null and b/public/images/emoji/apple/walking_woman/3.png differ
diff --git a/public/images/emoji/apple/walking_woman/4.png b/public/images/emoji/apple/walking_woman/4.png
new file mode 100644
index 00000000000..997873d8c38
Binary files /dev/null and b/public/images/emoji/apple/walking_woman/4.png differ
diff --git a/public/images/emoji/apple/walking_woman/5.png b/public/images/emoji/apple/walking_woman/5.png
new file mode 100644
index 00000000000..aa4faf95b6c
Binary files /dev/null and b/public/images/emoji/apple/walking_woman/5.png differ
diff --git a/public/images/emoji/apple/walking_woman/6.png b/public/images/emoji/apple/walking_woman/6.png
new file mode 100644
index 00000000000..f6946051c4f
Binary files /dev/null and b/public/images/emoji/apple/walking_woman/6.png differ
diff --git a/public/images/emoji/apple/wallis_futuna.png b/public/images/emoji/apple/wallis_futuna.png
new file mode 100644
index 00000000000..eae880a42f5
Binary files /dev/null and b/public/images/emoji/apple/wallis_futuna.png differ
diff --git a/public/images/emoji/apple/waning_crescent_moon.png b/public/images/emoji/apple/waning_crescent_moon.png
index 1a4cb341fac..8e81988d4d7 100644
Binary files a/public/images/emoji/apple/waning_crescent_moon.png and b/public/images/emoji/apple/waning_crescent_moon.png differ
diff --git a/public/images/emoji/apple/waning_gibbous_moon.png b/public/images/emoji/apple/waning_gibbous_moon.png
index 188092529c2..777f2aafaab 100644
Binary files a/public/images/emoji/apple/waning_gibbous_moon.png and b/public/images/emoji/apple/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/apple/warning.png b/public/images/emoji/apple/warning.png
index 6b17831c9bc..e60055ef8aa 100644
Binary files a/public/images/emoji/apple/warning.png and b/public/images/emoji/apple/warning.png differ
diff --git a/public/images/emoji/apple/wastebasket.png b/public/images/emoji/apple/wastebasket.png
index 600826f1314..4ab69a6c847 100644
Binary files a/public/images/emoji/apple/wastebasket.png and b/public/images/emoji/apple/wastebasket.png differ
diff --git a/public/images/emoji/apple/watch.png b/public/images/emoji/apple/watch.png
index ab596c50780..ed3dc504fed 100644
Binary files a/public/images/emoji/apple/watch.png and b/public/images/emoji/apple/watch.png differ
diff --git a/public/images/emoji/apple/water_buffalo.png b/public/images/emoji/apple/water_buffalo.png
index 2f5ccb40795..6d7f5bd5b7b 100644
Binary files a/public/images/emoji/apple/water_buffalo.png and b/public/images/emoji/apple/water_buffalo.png differ
diff --git a/public/images/emoji/apple/watermelon.png b/public/images/emoji/apple/watermelon.png
index e09e83b5b76..10b71a6a160 100644
Binary files a/public/images/emoji/apple/watermelon.png and b/public/images/emoji/apple/watermelon.png differ
diff --git a/public/images/emoji/apple/wave/2.png b/public/images/emoji/apple/wave/2.png
new file mode 100644
index 00000000000..b1f7a464672
Binary files /dev/null and b/public/images/emoji/apple/wave/2.png differ
diff --git a/public/images/emoji/apple/wave/3.png b/public/images/emoji/apple/wave/3.png
new file mode 100644
index 00000000000..23a515d10d8
Binary files /dev/null and b/public/images/emoji/apple/wave/3.png differ
diff --git a/public/images/emoji/apple/wave/4.png b/public/images/emoji/apple/wave/4.png
new file mode 100644
index 00000000000..fe2f453ef56
Binary files /dev/null and b/public/images/emoji/apple/wave/4.png differ
diff --git a/public/images/emoji/apple/wave/5.png b/public/images/emoji/apple/wave/5.png
new file mode 100644
index 00000000000..f40dbb9df78
Binary files /dev/null and b/public/images/emoji/apple/wave/5.png differ
diff --git a/public/images/emoji/apple/wave/6.png b/public/images/emoji/apple/wave/6.png
new file mode 100644
index 00000000000..854b4fc22b9
Binary files /dev/null and b/public/images/emoji/apple/wave/6.png differ
diff --git a/public/images/emoji/apple/waving_black_flag.png b/public/images/emoji/apple/waving_black_flag.png
index dbe8461ec3b..36a0a6987d1 100644
Binary files a/public/images/emoji/apple/waving_black_flag.png and b/public/images/emoji/apple/waving_black_flag.png differ
diff --git a/public/images/emoji/apple/waving_white_flag.png b/public/images/emoji/apple/waving_white_flag.png
index fcdd1e4cae2..16ed8e6169c 100644
Binary files a/public/images/emoji/apple/waving_white_flag.png and b/public/images/emoji/apple/waving_white_flag.png differ
diff --git a/public/images/emoji/apple/wavy_dash.png b/public/images/emoji/apple/wavy_dash.png
index 6e1d1fd7c29..507f6f6de99 100644
Binary files a/public/images/emoji/apple/wavy_dash.png and b/public/images/emoji/apple/wavy_dash.png differ
diff --git a/public/images/emoji/apple/waxing_crescent_moon.png b/public/images/emoji/apple/waxing_crescent_moon.png
index 41babd567c6..742a4435092 100644
Binary files a/public/images/emoji/apple/waxing_crescent_moon.png and b/public/images/emoji/apple/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/apple/waxing_gibbous_moon.png b/public/images/emoji/apple/waxing_gibbous_moon.png
index e6eca3a1912..704c4b4e2d5 100644
Binary files a/public/images/emoji/apple/waxing_gibbous_moon.png and b/public/images/emoji/apple/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/apple/wc.png b/public/images/emoji/apple/wc.png
index 8c97bc75016..8e9d43c32fd 100644
Binary files a/public/images/emoji/apple/wc.png and b/public/images/emoji/apple/wc.png differ
diff --git a/public/images/emoji/apple/wedding.png b/public/images/emoji/apple/wedding.png
index f98946c4e97..223299695d8 100644
Binary files a/public/images/emoji/apple/wedding.png and b/public/images/emoji/apple/wedding.png differ
diff --git a/public/images/emoji/apple/weight_lifter/2.png b/public/images/emoji/apple/weight_lifter/2.png
new file mode 100644
index 00000000000..df54bd55f94
Binary files /dev/null and b/public/images/emoji/apple/weight_lifter/2.png differ
diff --git a/public/images/emoji/apple/weight_lifter/3.png b/public/images/emoji/apple/weight_lifter/3.png
new file mode 100644
index 00000000000..dafe388c958
Binary files /dev/null and b/public/images/emoji/apple/weight_lifter/3.png differ
diff --git a/public/images/emoji/apple/weight_lifter/4.png b/public/images/emoji/apple/weight_lifter/4.png
new file mode 100644
index 00000000000..ecf9101aa9d
Binary files /dev/null and b/public/images/emoji/apple/weight_lifter/4.png differ
diff --git a/public/images/emoji/apple/weight_lifter/5.png b/public/images/emoji/apple/weight_lifter/5.png
new file mode 100644
index 00000000000..cd1c9aad396
Binary files /dev/null and b/public/images/emoji/apple/weight_lifter/5.png differ
diff --git a/public/images/emoji/apple/weight_lifter/6.png b/public/images/emoji/apple/weight_lifter/6.png
new file mode 100644
index 00000000000..1afa3bea2c3
Binary files /dev/null and b/public/images/emoji/apple/weight_lifter/6.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man.png b/public/images/emoji/apple/weight_lifting_man.png
new file mode 100644
index 00000000000..9cebc0e16d5
Binary files /dev/null and b/public/images/emoji/apple/weight_lifting_man.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/2.png b/public/images/emoji/apple/weight_lifting_man/2.png
new file mode 100644
index 00000000000..df54bd55f94
Binary files /dev/null and b/public/images/emoji/apple/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/3.png b/public/images/emoji/apple/weight_lifting_man/3.png
new file mode 100644
index 00000000000..dafe388c958
Binary files /dev/null and b/public/images/emoji/apple/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/4.png b/public/images/emoji/apple/weight_lifting_man/4.png
new file mode 100644
index 00000000000..ecf9101aa9d
Binary files /dev/null and b/public/images/emoji/apple/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/5.png b/public/images/emoji/apple/weight_lifting_man/5.png
new file mode 100644
index 00000000000..cd1c9aad396
Binary files /dev/null and b/public/images/emoji/apple/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/apple/weight_lifting_man/6.png b/public/images/emoji/apple/weight_lifting_man/6.png
new file mode 100644
index 00000000000..1afa3bea2c3
Binary files /dev/null and b/public/images/emoji/apple/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/apple/weight_lifting_woman.png b/public/images/emoji/apple/weight_lifting_woman.png
new file mode 100644
index 00000000000..94ad7f2eff5
Binary files /dev/null and b/public/images/emoji/apple/weight_lifting_woman.png differ
diff --git a/public/images/emoji/apple/western_sahara.png b/public/images/emoji/apple/western_sahara.png
new file mode 100644
index 00000000000..83216311846
Binary files /dev/null and b/public/images/emoji/apple/western_sahara.png differ
diff --git a/public/images/emoji/apple/whale.png b/public/images/emoji/apple/whale.png
index 9bb83507bfa..9efadf3d483 100644
Binary files a/public/images/emoji/apple/whale.png and b/public/images/emoji/apple/whale.png differ
diff --git a/public/images/emoji/apple/whale2.png b/public/images/emoji/apple/whale2.png
index 582dacccf13..fb23e965fc8 100644
Binary files a/public/images/emoji/apple/whale2.png and b/public/images/emoji/apple/whale2.png differ
diff --git a/public/images/emoji/apple/wheel_of_dharma.png b/public/images/emoji/apple/wheel_of_dharma.png
index 21fca008db6..272a4c3c5b8 100644
Binary files a/public/images/emoji/apple/wheel_of_dharma.png and b/public/images/emoji/apple/wheel_of_dharma.png differ
diff --git a/public/images/emoji/apple/wheelchair.png b/public/images/emoji/apple/wheelchair.png
index 4bfb92f1002..51646c9b8e8 100644
Binary files a/public/images/emoji/apple/wheelchair.png and b/public/images/emoji/apple/wheelchair.png differ
diff --git a/public/images/emoji/apple/white_check_mark.png b/public/images/emoji/apple/white_check_mark.png
index fe6a30a2f63..dd694996d38 100644
Binary files a/public/images/emoji/apple/white_check_mark.png and b/public/images/emoji/apple/white_check_mark.png differ
diff --git a/public/images/emoji/apple/white_circle.png b/public/images/emoji/apple/white_circle.png
index 22c4b100199..4f65906e0a0 100644
Binary files a/public/images/emoji/apple/white_circle.png and b/public/images/emoji/apple/white_circle.png differ
diff --git a/public/images/emoji/apple/white_flag.png b/public/images/emoji/apple/white_flag.png
new file mode 100644
index 00000000000..16ed8e6169c
Binary files /dev/null and b/public/images/emoji/apple/white_flag.png differ
diff --git a/public/images/emoji/apple/white_flower.png b/public/images/emoji/apple/white_flower.png
index e8478f6e294..81dadb26a45 100644
Binary files a/public/images/emoji/apple/white_flower.png and b/public/images/emoji/apple/white_flower.png differ
diff --git a/public/images/emoji/apple/white_large_square.png b/public/images/emoji/apple/white_large_square.png
index b791aa79c20..d9fdef83570 100644
Binary files a/public/images/emoji/apple/white_large_square.png and b/public/images/emoji/apple/white_large_square.png differ
diff --git a/public/images/emoji/apple/white_medium_small_square.png b/public/images/emoji/apple/white_medium_small_square.png
index c38451fb38d..0b61de8dc19 100644
Binary files a/public/images/emoji/apple/white_medium_small_square.png and b/public/images/emoji/apple/white_medium_small_square.png differ
diff --git a/public/images/emoji/apple/white_medium_square.png b/public/images/emoji/apple/white_medium_square.png
index 479112d8f56..ff357d5cd5f 100644
Binary files a/public/images/emoji/apple/white_medium_square.png and b/public/images/emoji/apple/white_medium_square.png differ
diff --git a/public/images/emoji/apple/white_small_square.png b/public/images/emoji/apple/white_small_square.png
index 0485073baa4..f662c103538 100644
Binary files a/public/images/emoji/apple/white_small_square.png and b/public/images/emoji/apple/white_small_square.png differ
diff --git a/public/images/emoji/apple/white_square_button.png b/public/images/emoji/apple/white_square_button.png
index 439a5e329a9..1acb1dd3f0b 100644
Binary files a/public/images/emoji/apple/white_square_button.png and b/public/images/emoji/apple/white_square_button.png differ
diff --git a/public/images/emoji/apple/white_sun_behind_cloud.png b/public/images/emoji/apple/white_sun_behind_cloud.png
index 217fd39b9cd..86329213734 100644
Binary files a/public/images/emoji/apple/white_sun_behind_cloud.png and b/public/images/emoji/apple/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png b/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png
index a3c5eafa4b1..16324c90c45 100644
Binary files a/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/apple/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/apple/white_sun_cloud.png b/public/images/emoji/apple/white_sun_cloud.png
index 217fd39b9cd..86329213734 100644
Binary files a/public/images/emoji/apple/white_sun_cloud.png and b/public/images/emoji/apple/white_sun_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_rain_cloud.png b/public/images/emoji/apple/white_sun_rain_cloud.png
index a3c5eafa4b1..16324c90c45 100644
Binary files a/public/images/emoji/apple/white_sun_rain_cloud.png and b/public/images/emoji/apple/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_small_cloud.png b/public/images/emoji/apple/white_sun_small_cloud.png
index e8379a59016..b31de05a28f 100644
Binary files a/public/images/emoji/apple/white_sun_small_cloud.png and b/public/images/emoji/apple/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/apple/white_sun_with_small_cloud.png b/public/images/emoji/apple/white_sun_with_small_cloud.png
index e8379a59016..b31de05a28f 100644
Binary files a/public/images/emoji/apple/white_sun_with_small_cloud.png and b/public/images/emoji/apple/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/apple/wilted_flower.png b/public/images/emoji/apple/wilted_flower.png
new file mode 100644
index 00000000000..bbcd946b44f
Binary files /dev/null and b/public/images/emoji/apple/wilted_flower.png differ
diff --git a/public/images/emoji/apple/wind_blowing_face.png b/public/images/emoji/apple/wind_blowing_face.png
index 63a42671d42..f43d48e0dae 100644
Binary files a/public/images/emoji/apple/wind_blowing_face.png and b/public/images/emoji/apple/wind_blowing_face.png differ
diff --git a/public/images/emoji/apple/wind_chime.png b/public/images/emoji/apple/wind_chime.png
index 4022a027004..a00ff20a213 100644
Binary files a/public/images/emoji/apple/wind_chime.png and b/public/images/emoji/apple/wind_chime.png differ
diff --git a/public/images/emoji/apple/wind_face.png b/public/images/emoji/apple/wind_face.png
new file mode 100644
index 00000000000..f43d48e0dae
Binary files /dev/null and b/public/images/emoji/apple/wind_face.png differ
diff --git a/public/images/emoji/apple/wine_glass.png b/public/images/emoji/apple/wine_glass.png
index 56b2b61df5d..eca18cf1121 100644
Binary files a/public/images/emoji/apple/wine_glass.png and b/public/images/emoji/apple/wine_glass.png differ
diff --git a/public/images/emoji/apple/wolf.png b/public/images/emoji/apple/wolf.png
index 65863772e77..ab4c58d1cac 100644
Binary files a/public/images/emoji/apple/wolf.png and b/public/images/emoji/apple/wolf.png differ
diff --git a/public/images/emoji/apple/woman.png b/public/images/emoji/apple/woman.png
index a659ec44c8f..64a0c28d0b2 100644
Binary files a/public/images/emoji/apple/woman.png and b/public/images/emoji/apple/woman.png differ
diff --git a/public/images/emoji/apple/woman/2.png b/public/images/emoji/apple/woman/2.png
new file mode 100644
index 00000000000..b848946811c
Binary files /dev/null and b/public/images/emoji/apple/woman/2.png differ
diff --git a/public/images/emoji/apple/woman/3.png b/public/images/emoji/apple/woman/3.png
new file mode 100644
index 00000000000..ea952c21826
Binary files /dev/null and b/public/images/emoji/apple/woman/3.png differ
diff --git a/public/images/emoji/apple/woman/4.png b/public/images/emoji/apple/woman/4.png
new file mode 100644
index 00000000000..9fae54cd118
Binary files /dev/null and b/public/images/emoji/apple/woman/4.png differ
diff --git a/public/images/emoji/apple/woman/5.png b/public/images/emoji/apple/woman/5.png
new file mode 100644
index 00000000000..8313fda6b3c
Binary files /dev/null and b/public/images/emoji/apple/woman/5.png differ
diff --git a/public/images/emoji/apple/woman/6.png b/public/images/emoji/apple/woman/6.png
new file mode 100644
index 00000000000..89348fab652
Binary files /dev/null and b/public/images/emoji/apple/woman/6.png differ
diff --git a/public/images/emoji/apple/woman_artist.png b/public/images/emoji/apple/woman_artist.png
new file mode 100644
index 00000000000..9642bb80723
Binary files /dev/null and b/public/images/emoji/apple/woman_artist.png differ
diff --git a/public/images/emoji/apple/woman_artist/2.png b/public/images/emoji/apple/woman_artist/2.png
new file mode 100644
index 00000000000..ee4dab5d3ca
Binary files /dev/null and b/public/images/emoji/apple/woman_artist/2.png differ
diff --git a/public/images/emoji/apple/woman_artist/3.png b/public/images/emoji/apple/woman_artist/3.png
new file mode 100644
index 00000000000..ac267a252a4
Binary files /dev/null and b/public/images/emoji/apple/woman_artist/3.png differ
diff --git a/public/images/emoji/apple/woman_artist/4.png b/public/images/emoji/apple/woman_artist/4.png
new file mode 100644
index 00000000000..738a7d4a1ea
Binary files /dev/null and b/public/images/emoji/apple/woman_artist/4.png differ
diff --git a/public/images/emoji/apple/woman_artist/5.png b/public/images/emoji/apple/woman_artist/5.png
new file mode 100644
index 00000000000..6a2dcb50e82
Binary files /dev/null and b/public/images/emoji/apple/woman_artist/5.png differ
diff --git a/public/images/emoji/apple/woman_artist/6.png b/public/images/emoji/apple/woman_artist/6.png
new file mode 100644
index 00000000000..38e815ac588
Binary files /dev/null and b/public/images/emoji/apple/woman_artist/6.png differ
diff --git a/public/images/emoji/apple/woman_astronaut.png b/public/images/emoji/apple/woman_astronaut.png
new file mode 100644
index 00000000000..8a8c1bdfb81
Binary files /dev/null and b/public/images/emoji/apple/woman_astronaut.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/2.png b/public/images/emoji/apple/woman_astronaut/2.png
new file mode 100644
index 00000000000..7bc13d2ea43
Binary files /dev/null and b/public/images/emoji/apple/woman_astronaut/2.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/3.png b/public/images/emoji/apple/woman_astronaut/3.png
new file mode 100644
index 00000000000..5bcf17df1cc
Binary files /dev/null and b/public/images/emoji/apple/woman_astronaut/3.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/4.png b/public/images/emoji/apple/woman_astronaut/4.png
new file mode 100644
index 00000000000..f513f6d8c2f
Binary files /dev/null and b/public/images/emoji/apple/woman_astronaut/4.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/5.png b/public/images/emoji/apple/woman_astronaut/5.png
new file mode 100644
index 00000000000..d88a04a16dd
Binary files /dev/null and b/public/images/emoji/apple/woman_astronaut/5.png differ
diff --git a/public/images/emoji/apple/woman_astronaut/6.png b/public/images/emoji/apple/woman_astronaut/6.png
new file mode 100644
index 00000000000..b1e0a11e446
Binary files /dev/null and b/public/images/emoji/apple/woman_astronaut/6.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling.png b/public/images/emoji/apple/woman_cartwheeling.png
new file mode 100644
index 00000000000..ffd3de76f09
Binary files /dev/null and b/public/images/emoji/apple/woman_cartwheeling.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/2.png b/public/images/emoji/apple/woman_cartwheeling/2.png
new file mode 100644
index 00000000000..1d43aa981c8
Binary files /dev/null and b/public/images/emoji/apple/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/3.png b/public/images/emoji/apple/woman_cartwheeling/3.png
new file mode 100644
index 00000000000..1f8e3b0b117
Binary files /dev/null and b/public/images/emoji/apple/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/4.png b/public/images/emoji/apple/woman_cartwheeling/4.png
new file mode 100644
index 00000000000..522105a8429
Binary files /dev/null and b/public/images/emoji/apple/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/5.png b/public/images/emoji/apple/woman_cartwheeling/5.png
new file mode 100644
index 00000000000..41d40d2970d
Binary files /dev/null and b/public/images/emoji/apple/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/apple/woman_cartwheeling/6.png b/public/images/emoji/apple/woman_cartwheeling/6.png
new file mode 100644
index 00000000000..d1f21426b9f
Binary files /dev/null and b/public/images/emoji/apple/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/apple/woman_cook.png b/public/images/emoji/apple/woman_cook.png
new file mode 100644
index 00000000000..e9a2694266d
Binary files /dev/null and b/public/images/emoji/apple/woman_cook.png differ
diff --git a/public/images/emoji/apple/woman_cook/2.png b/public/images/emoji/apple/woman_cook/2.png
new file mode 100644
index 00000000000..c8e70d26cbe
Binary files /dev/null and b/public/images/emoji/apple/woman_cook/2.png differ
diff --git a/public/images/emoji/apple/woman_cook/3.png b/public/images/emoji/apple/woman_cook/3.png
new file mode 100644
index 00000000000..670fd0afe4d
Binary files /dev/null and b/public/images/emoji/apple/woman_cook/3.png differ
diff --git a/public/images/emoji/apple/woman_cook/4.png b/public/images/emoji/apple/woman_cook/4.png
new file mode 100644
index 00000000000..734d2ff0ee0
Binary files /dev/null and b/public/images/emoji/apple/woman_cook/4.png differ
diff --git a/public/images/emoji/apple/woman_cook/5.png b/public/images/emoji/apple/woman_cook/5.png
new file mode 100644
index 00000000000..1569e9a25fb
Binary files /dev/null and b/public/images/emoji/apple/woman_cook/5.png differ
diff --git a/public/images/emoji/apple/woman_cook/6.png b/public/images/emoji/apple/woman_cook/6.png
new file mode 100644
index 00000000000..b2c927026ae
Binary files /dev/null and b/public/images/emoji/apple/woman_cook/6.png differ
diff --git a/public/images/emoji/apple/woman_facepalming.png b/public/images/emoji/apple/woman_facepalming.png
new file mode 100644
index 00000000000..71b21b81326
Binary files /dev/null and b/public/images/emoji/apple/woman_facepalming.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/2.png b/public/images/emoji/apple/woman_facepalming/2.png
new file mode 100644
index 00000000000..c9be4b7d975
Binary files /dev/null and b/public/images/emoji/apple/woman_facepalming/2.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/3.png b/public/images/emoji/apple/woman_facepalming/3.png
new file mode 100644
index 00000000000..c6c8ea4b30e
Binary files /dev/null and b/public/images/emoji/apple/woman_facepalming/3.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/4.png b/public/images/emoji/apple/woman_facepalming/4.png
new file mode 100644
index 00000000000..a8fe42901e0
Binary files /dev/null and b/public/images/emoji/apple/woman_facepalming/4.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/5.png b/public/images/emoji/apple/woman_facepalming/5.png
new file mode 100644
index 00000000000..478fd88d9ab
Binary files /dev/null and b/public/images/emoji/apple/woman_facepalming/5.png differ
diff --git a/public/images/emoji/apple/woman_facepalming/6.png b/public/images/emoji/apple/woman_facepalming/6.png
new file mode 100644
index 00000000000..80167ff2260
Binary files /dev/null and b/public/images/emoji/apple/woman_facepalming/6.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker.png b/public/images/emoji/apple/woman_factory_worker.png
new file mode 100644
index 00000000000..80a66cfcb4d
Binary files /dev/null and b/public/images/emoji/apple/woman_factory_worker.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/2.png b/public/images/emoji/apple/woman_factory_worker/2.png
new file mode 100644
index 00000000000..c8eb4d41f14
Binary files /dev/null and b/public/images/emoji/apple/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/3.png b/public/images/emoji/apple/woman_factory_worker/3.png
new file mode 100644
index 00000000000..b2a064fe65c
Binary files /dev/null and b/public/images/emoji/apple/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/4.png b/public/images/emoji/apple/woman_factory_worker/4.png
new file mode 100644
index 00000000000..577493d152f
Binary files /dev/null and b/public/images/emoji/apple/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/5.png b/public/images/emoji/apple/woman_factory_worker/5.png
new file mode 100644
index 00000000000..f5ea3f592ae
Binary files /dev/null and b/public/images/emoji/apple/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/apple/woman_factory_worker/6.png b/public/images/emoji/apple/woman_factory_worker/6.png
new file mode 100644
index 00000000000..2d3b220796a
Binary files /dev/null and b/public/images/emoji/apple/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/apple/woman_farmer.png b/public/images/emoji/apple/woman_farmer.png
new file mode 100644
index 00000000000..cb73fb9b424
Binary files /dev/null and b/public/images/emoji/apple/woman_farmer.png differ
diff --git a/public/images/emoji/apple/woman_farmer/2.png b/public/images/emoji/apple/woman_farmer/2.png
new file mode 100644
index 00000000000..3e846f6229c
Binary files /dev/null and b/public/images/emoji/apple/woman_farmer/2.png differ
diff --git a/public/images/emoji/apple/woman_farmer/3.png b/public/images/emoji/apple/woman_farmer/3.png
new file mode 100644
index 00000000000..0f85dd55e3e
Binary files /dev/null and b/public/images/emoji/apple/woman_farmer/3.png differ
diff --git a/public/images/emoji/apple/woman_farmer/4.png b/public/images/emoji/apple/woman_farmer/4.png
new file mode 100644
index 00000000000..060fe1343ff
Binary files /dev/null and b/public/images/emoji/apple/woman_farmer/4.png differ
diff --git a/public/images/emoji/apple/woman_farmer/5.png b/public/images/emoji/apple/woman_farmer/5.png
new file mode 100644
index 00000000000..69175036658
Binary files /dev/null and b/public/images/emoji/apple/woman_farmer/5.png differ
diff --git a/public/images/emoji/apple/woman_farmer/6.png b/public/images/emoji/apple/woman_farmer/6.png
new file mode 100644
index 00000000000..2537d80d572
Binary files /dev/null and b/public/images/emoji/apple/woman_farmer/6.png differ
diff --git a/public/images/emoji/apple/woman_firefighter.png b/public/images/emoji/apple/woman_firefighter.png
new file mode 100644
index 00000000000..f5714b011cf
Binary files /dev/null and b/public/images/emoji/apple/woman_firefighter.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/2.png b/public/images/emoji/apple/woman_firefighter/2.png
new file mode 100644
index 00000000000..92722663c99
Binary files /dev/null and b/public/images/emoji/apple/woman_firefighter/2.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/3.png b/public/images/emoji/apple/woman_firefighter/3.png
new file mode 100644
index 00000000000..a5e90cb633d
Binary files /dev/null and b/public/images/emoji/apple/woman_firefighter/3.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/4.png b/public/images/emoji/apple/woman_firefighter/4.png
new file mode 100644
index 00000000000..4b56a830642
Binary files /dev/null and b/public/images/emoji/apple/woman_firefighter/4.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/5.png b/public/images/emoji/apple/woman_firefighter/5.png
new file mode 100644
index 00000000000..9b53eed2046
Binary files /dev/null and b/public/images/emoji/apple/woman_firefighter/5.png differ
diff --git a/public/images/emoji/apple/woman_firefighter/6.png b/public/images/emoji/apple/woman_firefighter/6.png
new file mode 100644
index 00000000000..e788760f72d
Binary files /dev/null and b/public/images/emoji/apple/woman_firefighter/6.png differ
diff --git a/public/images/emoji/apple/woman_health_worker.png b/public/images/emoji/apple/woman_health_worker.png
new file mode 100644
index 00000000000..76e63a86e90
Binary files /dev/null and b/public/images/emoji/apple/woman_health_worker.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/2.png b/public/images/emoji/apple/woman_health_worker/2.png
new file mode 100644
index 00000000000..fd3aaebd20f
Binary files /dev/null and b/public/images/emoji/apple/woman_health_worker/2.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/3.png b/public/images/emoji/apple/woman_health_worker/3.png
new file mode 100644
index 00000000000..606e2e81d67
Binary files /dev/null and b/public/images/emoji/apple/woman_health_worker/3.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/4.png b/public/images/emoji/apple/woman_health_worker/4.png
new file mode 100644
index 00000000000..eec739e9fc3
Binary files /dev/null and b/public/images/emoji/apple/woman_health_worker/4.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/5.png b/public/images/emoji/apple/woman_health_worker/5.png
new file mode 100644
index 00000000000..6d2500304b2
Binary files /dev/null and b/public/images/emoji/apple/woman_health_worker/5.png differ
diff --git a/public/images/emoji/apple/woman_health_worker/6.png b/public/images/emoji/apple/woman_health_worker/6.png
new file mode 100644
index 00000000000..2819c0f5a49
Binary files /dev/null and b/public/images/emoji/apple/woman_health_worker/6.png differ
diff --git a/public/images/emoji/apple/woman_judge.png b/public/images/emoji/apple/woman_judge.png
new file mode 100644
index 00000000000..c67f17e1304
Binary files /dev/null and b/public/images/emoji/apple/woman_judge.png differ
diff --git a/public/images/emoji/apple/woman_judge/2.png b/public/images/emoji/apple/woman_judge/2.png
new file mode 100644
index 00000000000..5a0ad48c267
Binary files /dev/null and b/public/images/emoji/apple/woman_judge/2.png differ
diff --git a/public/images/emoji/apple/woman_judge/3.png b/public/images/emoji/apple/woman_judge/3.png
new file mode 100644
index 00000000000..45124f3c700
Binary files /dev/null and b/public/images/emoji/apple/woman_judge/3.png differ
diff --git a/public/images/emoji/apple/woman_judge/4.png b/public/images/emoji/apple/woman_judge/4.png
new file mode 100644
index 00000000000..00a22677ee6
Binary files /dev/null and b/public/images/emoji/apple/woman_judge/4.png differ
diff --git a/public/images/emoji/apple/woman_judge/5.png b/public/images/emoji/apple/woman_judge/5.png
new file mode 100644
index 00000000000..b346b615587
Binary files /dev/null and b/public/images/emoji/apple/woman_judge/5.png differ
diff --git a/public/images/emoji/apple/woman_judge/6.png b/public/images/emoji/apple/woman_judge/6.png
new file mode 100644
index 00000000000..9fa2d247868
Binary files /dev/null and b/public/images/emoji/apple/woman_judge/6.png differ
diff --git a/public/images/emoji/apple/woman_juggling.png b/public/images/emoji/apple/woman_juggling.png
new file mode 100644
index 00000000000..ffd612a1935
Binary files /dev/null and b/public/images/emoji/apple/woman_juggling.png differ
diff --git a/public/images/emoji/apple/woman_juggling/2.png b/public/images/emoji/apple/woman_juggling/2.png
new file mode 100644
index 00000000000..4387658e448
Binary files /dev/null and b/public/images/emoji/apple/woman_juggling/2.png differ
diff --git a/public/images/emoji/apple/woman_juggling/3.png b/public/images/emoji/apple/woman_juggling/3.png
new file mode 100644
index 00000000000..10749861f28
Binary files /dev/null and b/public/images/emoji/apple/woman_juggling/3.png differ
diff --git a/public/images/emoji/apple/woman_juggling/4.png b/public/images/emoji/apple/woman_juggling/4.png
new file mode 100644
index 00000000000..86e73768b77
Binary files /dev/null and b/public/images/emoji/apple/woman_juggling/4.png differ
diff --git a/public/images/emoji/apple/woman_juggling/5.png b/public/images/emoji/apple/woman_juggling/5.png
new file mode 100644
index 00000000000..9ab0c98d84c
Binary files /dev/null and b/public/images/emoji/apple/woman_juggling/5.png differ
diff --git a/public/images/emoji/apple/woman_juggling/6.png b/public/images/emoji/apple/woman_juggling/6.png
new file mode 100644
index 00000000000..d5fdb9a3a7c
Binary files /dev/null and b/public/images/emoji/apple/woman_juggling/6.png differ
diff --git a/public/images/emoji/apple/woman_mechanic.png b/public/images/emoji/apple/woman_mechanic.png
new file mode 100644
index 00000000000..4f44652939e
Binary files /dev/null and b/public/images/emoji/apple/woman_mechanic.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/2.png b/public/images/emoji/apple/woman_mechanic/2.png
new file mode 100644
index 00000000000..17da6e1c33e
Binary files /dev/null and b/public/images/emoji/apple/woman_mechanic/2.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/3.png b/public/images/emoji/apple/woman_mechanic/3.png
new file mode 100644
index 00000000000..14b322a0d9f
Binary files /dev/null and b/public/images/emoji/apple/woman_mechanic/3.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/4.png b/public/images/emoji/apple/woman_mechanic/4.png
new file mode 100644
index 00000000000..f9b7cb8bef0
Binary files /dev/null and b/public/images/emoji/apple/woman_mechanic/4.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/5.png b/public/images/emoji/apple/woman_mechanic/5.png
new file mode 100644
index 00000000000..a307279650c
Binary files /dev/null and b/public/images/emoji/apple/woman_mechanic/5.png differ
diff --git a/public/images/emoji/apple/woman_mechanic/6.png b/public/images/emoji/apple/woman_mechanic/6.png
new file mode 100644
index 00000000000..4bf700c6283
Binary files /dev/null and b/public/images/emoji/apple/woman_mechanic/6.png differ
diff --git a/public/images/emoji/apple/woman_office_worker.png b/public/images/emoji/apple/woman_office_worker.png
new file mode 100644
index 00000000000..ad0661cbf02
Binary files /dev/null and b/public/images/emoji/apple/woman_office_worker.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/2.png b/public/images/emoji/apple/woman_office_worker/2.png
new file mode 100644
index 00000000000..cb9105925a1
Binary files /dev/null and b/public/images/emoji/apple/woman_office_worker/2.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/3.png b/public/images/emoji/apple/woman_office_worker/3.png
new file mode 100644
index 00000000000..967eecf0bf8
Binary files /dev/null and b/public/images/emoji/apple/woman_office_worker/3.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/4.png b/public/images/emoji/apple/woman_office_worker/4.png
new file mode 100644
index 00000000000..58c9a785935
Binary files /dev/null and b/public/images/emoji/apple/woman_office_worker/4.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/5.png b/public/images/emoji/apple/woman_office_worker/5.png
new file mode 100644
index 00000000000..14e8166360e
Binary files /dev/null and b/public/images/emoji/apple/woman_office_worker/5.png differ
diff --git a/public/images/emoji/apple/woman_office_worker/6.png b/public/images/emoji/apple/woman_office_worker/6.png
new file mode 100644
index 00000000000..b400c31a3e4
Binary files /dev/null and b/public/images/emoji/apple/woman_office_worker/6.png differ
diff --git a/public/images/emoji/apple/woman_pilot.png b/public/images/emoji/apple/woman_pilot.png
new file mode 100644
index 00000000000..671d7235bd7
Binary files /dev/null and b/public/images/emoji/apple/woman_pilot.png differ
diff --git a/public/images/emoji/apple/woman_pilot/2.png b/public/images/emoji/apple/woman_pilot/2.png
new file mode 100644
index 00000000000..8c6a4256635
Binary files /dev/null and b/public/images/emoji/apple/woman_pilot/2.png differ
diff --git a/public/images/emoji/apple/woman_pilot/3.png b/public/images/emoji/apple/woman_pilot/3.png
new file mode 100644
index 00000000000..a8b2af7235f
Binary files /dev/null and b/public/images/emoji/apple/woman_pilot/3.png differ
diff --git a/public/images/emoji/apple/woman_pilot/4.png b/public/images/emoji/apple/woman_pilot/4.png
new file mode 100644
index 00000000000..ba132cad0ff
Binary files /dev/null and b/public/images/emoji/apple/woman_pilot/4.png differ
diff --git a/public/images/emoji/apple/woman_pilot/5.png b/public/images/emoji/apple/woman_pilot/5.png
new file mode 100644
index 00000000000..080cf511369
Binary files /dev/null and b/public/images/emoji/apple/woman_pilot/5.png differ
diff --git a/public/images/emoji/apple/woman_pilot/6.png b/public/images/emoji/apple/woman_pilot/6.png
new file mode 100644
index 00000000000..75029fcc0da
Binary files /dev/null and b/public/images/emoji/apple/woman_pilot/6.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball.png b/public/images/emoji/apple/woman_playing_handball.png
new file mode 100644
index 00000000000..9a03e9c23bd
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_handball.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/2.png b/public/images/emoji/apple/woman_playing_handball/2.png
new file mode 100644
index 00000000000..346119656ce
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/3.png b/public/images/emoji/apple/woman_playing_handball/3.png
new file mode 100644
index 00000000000..3d61de41b42
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/4.png b/public/images/emoji/apple/woman_playing_handball/4.png
new file mode 100644
index 00000000000..1048ef59663
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/5.png b/public/images/emoji/apple/woman_playing_handball/5.png
new file mode 100644
index 00000000000..b3364ccfe61
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/apple/woman_playing_handball/6.png b/public/images/emoji/apple/woman_playing_handball/6.png
new file mode 100644
index 00000000000..ca6f7369d9c
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo.png b/public/images/emoji/apple/woman_playing_water_polo.png
new file mode 100644
index 00000000000..adf9f3114e0
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/2.png b/public/images/emoji/apple/woman_playing_water_polo/2.png
new file mode 100644
index 00000000000..73f8e3b6acc
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/3.png b/public/images/emoji/apple/woman_playing_water_polo/3.png
new file mode 100644
index 00000000000..47daa87211e
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/4.png b/public/images/emoji/apple/woman_playing_water_polo/4.png
new file mode 100644
index 00000000000..58c5f97a44c
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/5.png b/public/images/emoji/apple/woman_playing_water_polo/5.png
new file mode 100644
index 00000000000..d06753b0e27
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/apple/woman_playing_water_polo/6.png b/public/images/emoji/apple/woman_playing_water_polo/6.png
new file mode 100644
index 00000000000..6072d770976
Binary files /dev/null and b/public/images/emoji/apple/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/apple/woman_scientist.png b/public/images/emoji/apple/woman_scientist.png
new file mode 100644
index 00000000000..0b250021df5
Binary files /dev/null and b/public/images/emoji/apple/woman_scientist.png differ
diff --git a/public/images/emoji/apple/woman_scientist/2.png b/public/images/emoji/apple/woman_scientist/2.png
new file mode 100644
index 00000000000..491be8a6848
Binary files /dev/null and b/public/images/emoji/apple/woman_scientist/2.png differ
diff --git a/public/images/emoji/apple/woman_scientist/3.png b/public/images/emoji/apple/woman_scientist/3.png
new file mode 100644
index 00000000000..ff4749d3950
Binary files /dev/null and b/public/images/emoji/apple/woman_scientist/3.png differ
diff --git a/public/images/emoji/apple/woman_scientist/4.png b/public/images/emoji/apple/woman_scientist/4.png
new file mode 100644
index 00000000000..5cabb438c95
Binary files /dev/null and b/public/images/emoji/apple/woman_scientist/4.png differ
diff --git a/public/images/emoji/apple/woman_scientist/5.png b/public/images/emoji/apple/woman_scientist/5.png
new file mode 100644
index 00000000000..28758853ed1
Binary files /dev/null and b/public/images/emoji/apple/woman_scientist/5.png differ
diff --git a/public/images/emoji/apple/woman_scientist/6.png b/public/images/emoji/apple/woman_scientist/6.png
new file mode 100644
index 00000000000..298a13fbe6d
Binary files /dev/null and b/public/images/emoji/apple/woman_scientist/6.png differ
diff --git a/public/images/emoji/apple/woman_shrugging.png b/public/images/emoji/apple/woman_shrugging.png
new file mode 100644
index 00000000000..412e490d8cd
Binary files /dev/null and b/public/images/emoji/apple/woman_shrugging.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/2.png b/public/images/emoji/apple/woman_shrugging/2.png
new file mode 100644
index 00000000000..bdfc9f7ad2c
Binary files /dev/null and b/public/images/emoji/apple/woman_shrugging/2.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/3.png b/public/images/emoji/apple/woman_shrugging/3.png
new file mode 100644
index 00000000000..f68633a993f
Binary files /dev/null and b/public/images/emoji/apple/woman_shrugging/3.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/4.png b/public/images/emoji/apple/woman_shrugging/4.png
new file mode 100644
index 00000000000..7038c11ae21
Binary files /dev/null and b/public/images/emoji/apple/woman_shrugging/4.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/5.png b/public/images/emoji/apple/woman_shrugging/5.png
new file mode 100644
index 00000000000..e8245f18e4b
Binary files /dev/null and b/public/images/emoji/apple/woman_shrugging/5.png differ
diff --git a/public/images/emoji/apple/woman_shrugging/6.png b/public/images/emoji/apple/woman_shrugging/6.png
new file mode 100644
index 00000000000..96cf350ee3a
Binary files /dev/null and b/public/images/emoji/apple/woman_shrugging/6.png differ
diff --git a/public/images/emoji/apple/woman_singer.png b/public/images/emoji/apple/woman_singer.png
new file mode 100644
index 00000000000..9f248dab13e
Binary files /dev/null and b/public/images/emoji/apple/woman_singer.png differ
diff --git a/public/images/emoji/apple/woman_singer/2.png b/public/images/emoji/apple/woman_singer/2.png
new file mode 100644
index 00000000000..2008017cde1
Binary files /dev/null and b/public/images/emoji/apple/woman_singer/2.png differ
diff --git a/public/images/emoji/apple/woman_singer/3.png b/public/images/emoji/apple/woman_singer/3.png
new file mode 100644
index 00000000000..2875ffda445
Binary files /dev/null and b/public/images/emoji/apple/woman_singer/3.png differ
diff --git a/public/images/emoji/apple/woman_singer/4.png b/public/images/emoji/apple/woman_singer/4.png
new file mode 100644
index 00000000000..25f64dc20e2
Binary files /dev/null and b/public/images/emoji/apple/woman_singer/4.png differ
diff --git a/public/images/emoji/apple/woman_singer/5.png b/public/images/emoji/apple/woman_singer/5.png
new file mode 100644
index 00000000000..e4dbaf142cc
Binary files /dev/null and b/public/images/emoji/apple/woman_singer/5.png differ
diff --git a/public/images/emoji/apple/woman_singer/6.png b/public/images/emoji/apple/woman_singer/6.png
new file mode 100644
index 00000000000..18e544431fe
Binary files /dev/null and b/public/images/emoji/apple/woman_singer/6.png differ
diff --git a/public/images/emoji/apple/woman_student.png b/public/images/emoji/apple/woman_student.png
new file mode 100644
index 00000000000..6fcfe2aba05
Binary files /dev/null and b/public/images/emoji/apple/woman_student.png differ
diff --git a/public/images/emoji/apple/woman_student/2.png b/public/images/emoji/apple/woman_student/2.png
new file mode 100644
index 00000000000..38aa863d956
Binary files /dev/null and b/public/images/emoji/apple/woman_student/2.png differ
diff --git a/public/images/emoji/apple/woman_student/3.png b/public/images/emoji/apple/woman_student/3.png
new file mode 100644
index 00000000000..312ab89a73a
Binary files /dev/null and b/public/images/emoji/apple/woman_student/3.png differ
diff --git a/public/images/emoji/apple/woman_student/4.png b/public/images/emoji/apple/woman_student/4.png
new file mode 100644
index 00000000000..da8216b827c
Binary files /dev/null and b/public/images/emoji/apple/woman_student/4.png differ
diff --git a/public/images/emoji/apple/woman_student/5.png b/public/images/emoji/apple/woman_student/5.png
new file mode 100644
index 00000000000..7bc31e0318e
Binary files /dev/null and b/public/images/emoji/apple/woman_student/5.png differ
diff --git a/public/images/emoji/apple/woman_student/6.png b/public/images/emoji/apple/woman_student/6.png
new file mode 100644
index 00000000000..25e6123843c
Binary files /dev/null and b/public/images/emoji/apple/woman_student/6.png differ
diff --git a/public/images/emoji/apple/woman_teacher.png b/public/images/emoji/apple/woman_teacher.png
new file mode 100644
index 00000000000..7f3b5516b27
Binary files /dev/null and b/public/images/emoji/apple/woman_teacher.png differ
diff --git a/public/images/emoji/apple/woman_teacher/2.png b/public/images/emoji/apple/woman_teacher/2.png
new file mode 100644
index 00000000000..c0f4abf643b
Binary files /dev/null and b/public/images/emoji/apple/woman_teacher/2.png differ
diff --git a/public/images/emoji/apple/woman_teacher/3.png b/public/images/emoji/apple/woman_teacher/3.png
new file mode 100644
index 00000000000..6c14f58aa51
Binary files /dev/null and b/public/images/emoji/apple/woman_teacher/3.png differ
diff --git a/public/images/emoji/apple/woman_teacher/4.png b/public/images/emoji/apple/woman_teacher/4.png
new file mode 100644
index 00000000000..faf928beaa5
Binary files /dev/null and b/public/images/emoji/apple/woman_teacher/4.png differ
diff --git a/public/images/emoji/apple/woman_teacher/5.png b/public/images/emoji/apple/woman_teacher/5.png
new file mode 100644
index 00000000000..1ccaf76ca6f
Binary files /dev/null and b/public/images/emoji/apple/woman_teacher/5.png differ
diff --git a/public/images/emoji/apple/woman_teacher/6.png b/public/images/emoji/apple/woman_teacher/6.png
new file mode 100644
index 00000000000..607e69c1c46
Binary files /dev/null and b/public/images/emoji/apple/woman_teacher/6.png differ
diff --git a/public/images/emoji/apple/woman_technologist.png b/public/images/emoji/apple/woman_technologist.png
new file mode 100644
index 00000000000..2398b1c24ec
Binary files /dev/null and b/public/images/emoji/apple/woman_technologist.png differ
diff --git a/public/images/emoji/apple/woman_technologist/2.png b/public/images/emoji/apple/woman_technologist/2.png
new file mode 100644
index 00000000000..3992fec1bdd
Binary files /dev/null and b/public/images/emoji/apple/woman_technologist/2.png differ
diff --git a/public/images/emoji/apple/woman_technologist/3.png b/public/images/emoji/apple/woman_technologist/3.png
new file mode 100644
index 00000000000..f7a1a66347a
Binary files /dev/null and b/public/images/emoji/apple/woman_technologist/3.png differ
diff --git a/public/images/emoji/apple/woman_technologist/4.png b/public/images/emoji/apple/woman_technologist/4.png
new file mode 100644
index 00000000000..f44b39dfedf
Binary files /dev/null and b/public/images/emoji/apple/woman_technologist/4.png differ
diff --git a/public/images/emoji/apple/woman_technologist/5.png b/public/images/emoji/apple/woman_technologist/5.png
new file mode 100644
index 00000000000..32e393d56de
Binary files /dev/null and b/public/images/emoji/apple/woman_technologist/5.png differ
diff --git a/public/images/emoji/apple/woman_technologist/6.png b/public/images/emoji/apple/woman_technologist/6.png
new file mode 100644
index 00000000000..50958f787b3
Binary files /dev/null and b/public/images/emoji/apple/woman_technologist/6.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf.png b/public/images/emoji/apple/woman_with_headscarf.png
new file mode 100644
index 00000000000..6b3731cac84
Binary files /dev/null and b/public/images/emoji/apple/woman_with_headscarf.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/2.png b/public/images/emoji/apple/woman_with_headscarf/2.png
new file mode 100644
index 00000000000..511414ad6c6
Binary files /dev/null and b/public/images/emoji/apple/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/3.png b/public/images/emoji/apple/woman_with_headscarf/3.png
new file mode 100644
index 00000000000..af954353790
Binary files /dev/null and b/public/images/emoji/apple/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/4.png b/public/images/emoji/apple/woman_with_headscarf/4.png
new file mode 100644
index 00000000000..355bdeb6361
Binary files /dev/null and b/public/images/emoji/apple/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/5.png b/public/images/emoji/apple/woman_with_headscarf/5.png
new file mode 100644
index 00000000000..8d0ad7202e3
Binary files /dev/null and b/public/images/emoji/apple/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/apple/woman_with_headscarf/6.png b/public/images/emoji/apple/woman_with_headscarf/6.png
new file mode 100644
index 00000000000..3c49195f876
Binary files /dev/null and b/public/images/emoji/apple/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/apple/woman_with_turban.png b/public/images/emoji/apple/woman_with_turban.png
new file mode 100644
index 00000000000..b9b6f95c5c7
Binary files /dev/null and b/public/images/emoji/apple/woman_with_turban.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/2.png b/public/images/emoji/apple/woman_with_turban/2.png
new file mode 100644
index 00000000000..3be821a5f75
Binary files /dev/null and b/public/images/emoji/apple/woman_with_turban/2.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/3.png b/public/images/emoji/apple/woman_with_turban/3.png
new file mode 100644
index 00000000000..cb19d35ab3f
Binary files /dev/null and b/public/images/emoji/apple/woman_with_turban/3.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/4.png b/public/images/emoji/apple/woman_with_turban/4.png
new file mode 100644
index 00000000000..45392c41307
Binary files /dev/null and b/public/images/emoji/apple/woman_with_turban/4.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/5.png b/public/images/emoji/apple/woman_with_turban/5.png
new file mode 100644
index 00000000000..e5b510d196a
Binary files /dev/null and b/public/images/emoji/apple/woman_with_turban/5.png differ
diff --git a/public/images/emoji/apple/woman_with_turban/6.png b/public/images/emoji/apple/woman_with_turban/6.png
new file mode 100644
index 00000000000..d89b94bd4ba
Binary files /dev/null and b/public/images/emoji/apple/woman_with_turban/6.png differ
diff --git a/public/images/emoji/apple/womans_clothes.png b/public/images/emoji/apple/womans_clothes.png
index 689ca9bcb11..3552fb64836 100644
Binary files a/public/images/emoji/apple/womans_clothes.png and b/public/images/emoji/apple/womans_clothes.png differ
diff --git a/public/images/emoji/apple/womans_hat.png b/public/images/emoji/apple/womans_hat.png
index 34213a85608..6244f5c30e7 100644
Binary files a/public/images/emoji/apple/womans_hat.png and b/public/images/emoji/apple/womans_hat.png differ
diff --git a/public/images/emoji/apple/women_wrestling.png b/public/images/emoji/apple/women_wrestling.png
new file mode 100644
index 00000000000..d344fc9cc3f
Binary files /dev/null and b/public/images/emoji/apple/women_wrestling.png differ
diff --git a/public/images/emoji/apple/womens.png b/public/images/emoji/apple/womens.png
index 0c46d05f024..0518592460a 100644
Binary files a/public/images/emoji/apple/womens.png and b/public/images/emoji/apple/womens.png differ
diff --git a/public/images/emoji/apple/world_map.png b/public/images/emoji/apple/world_map.png
index aece6a65ed5..9cd3f7decfd 100644
Binary files a/public/images/emoji/apple/world_map.png and b/public/images/emoji/apple/world_map.png differ
diff --git a/public/images/emoji/apple/worship_symbol.png b/public/images/emoji/apple/worship_symbol.png
index 5ef810aa4fb..c8e1cecd396 100644
Binary files a/public/images/emoji/apple/worship_symbol.png and b/public/images/emoji/apple/worship_symbol.png differ
diff --git a/public/images/emoji/apple/wrench.png b/public/images/emoji/apple/wrench.png
index 160f9aa49ab..d958ea664ae 100644
Binary files a/public/images/emoji/apple/wrench.png and b/public/images/emoji/apple/wrench.png differ
diff --git a/public/images/emoji/apple/writing_hand/2.png b/public/images/emoji/apple/writing_hand/2.png
new file mode 100644
index 00000000000..c017804a1a2
Binary files /dev/null and b/public/images/emoji/apple/writing_hand/2.png differ
diff --git a/public/images/emoji/apple/writing_hand/3.png b/public/images/emoji/apple/writing_hand/3.png
new file mode 100644
index 00000000000..59764dd649d
Binary files /dev/null and b/public/images/emoji/apple/writing_hand/3.png differ
diff --git a/public/images/emoji/apple/writing_hand/4.png b/public/images/emoji/apple/writing_hand/4.png
new file mode 100644
index 00000000000..158aa52f05d
Binary files /dev/null and b/public/images/emoji/apple/writing_hand/4.png differ
diff --git a/public/images/emoji/apple/writing_hand/5.png b/public/images/emoji/apple/writing_hand/5.png
new file mode 100644
index 00000000000..85d3b01ade9
Binary files /dev/null and b/public/images/emoji/apple/writing_hand/5.png differ
diff --git a/public/images/emoji/apple/writing_hand/6.png b/public/images/emoji/apple/writing_hand/6.png
new file mode 100644
index 00000000000..ca23a54b76d
Binary files /dev/null and b/public/images/emoji/apple/writing_hand/6.png differ
diff --git a/public/images/emoji/apple/x.png b/public/images/emoji/apple/x.png
index 6e15ce5e124..1ecd7f42a25 100644
Binary files a/public/images/emoji/apple/x.png and b/public/images/emoji/apple/x.png differ
diff --git a/public/images/emoji/apple/yellow_heart.png b/public/images/emoji/apple/yellow_heart.png
index 867388f5701..f554224f088 100644
Binary files a/public/images/emoji/apple/yellow_heart.png and b/public/images/emoji/apple/yellow_heart.png differ
diff --git a/public/images/emoji/apple/yemen.png b/public/images/emoji/apple/yemen.png
new file mode 100644
index 00000000000..d3ac4e1ed62
Binary files /dev/null and b/public/images/emoji/apple/yemen.png differ
diff --git a/public/images/emoji/apple/yen.png b/public/images/emoji/apple/yen.png
index 58e443da9b3..4ec18abab35 100644
Binary files a/public/images/emoji/apple/yen.png and b/public/images/emoji/apple/yen.png differ
diff --git a/public/images/emoji/apple/yin_yang.png b/public/images/emoji/apple/yin_yang.png
index bfe5de7575c..9e466a86932 100644
Binary files a/public/images/emoji/apple/yin_yang.png and b/public/images/emoji/apple/yin_yang.png differ
diff --git a/public/images/emoji/apple/zambia.png b/public/images/emoji/apple/zambia.png
new file mode 100644
index 00000000000..04dfc3bdb23
Binary files /dev/null and b/public/images/emoji/apple/zambia.png differ
diff --git a/public/images/emoji/apple/zap.png b/public/images/emoji/apple/zap.png
index 82d8e16dcb5..c517566427f 100644
Binary files a/public/images/emoji/apple/zap.png and b/public/images/emoji/apple/zap.png differ
diff --git a/public/images/emoji/apple/zebra.png b/public/images/emoji/apple/zebra.png
new file mode 100644
index 00000000000..6faa14f55dc
Binary files /dev/null and b/public/images/emoji/apple/zebra.png differ
diff --git a/public/images/emoji/apple/zimbabwe.png b/public/images/emoji/apple/zimbabwe.png
new file mode 100644
index 00000000000..0470d4dd941
Binary files /dev/null and b/public/images/emoji/apple/zimbabwe.png differ
diff --git a/public/images/emoji/apple/zombie.png b/public/images/emoji/apple/zombie.png
new file mode 100644
index 00000000000..1bf288fcd4c
Binary files /dev/null and b/public/images/emoji/apple/zombie.png differ
diff --git a/public/images/emoji/apple/zzz.png b/public/images/emoji/apple/zzz.png
index b18cd0ffe6c..c8b4142b9f7 100644
Binary files a/public/images/emoji/apple/zzz.png and b/public/images/emoji/apple/zzz.png differ
diff --git a/public/images/emoji/emoji_one/+1.png b/public/images/emoji/emoji_one/+1.png
index 8cb59b1cfe7..76e9adb1537 100644
Binary files a/public/images/emoji/emoji_one/+1.png and b/public/images/emoji/emoji_one/+1.png differ
diff --git a/public/images/emoji/emoji_one/+1/2.png b/public/images/emoji/emoji_one/+1/2.png
new file mode 100644
index 00000000000..411f6e0da83
Binary files /dev/null and b/public/images/emoji/emoji_one/+1/2.png differ
diff --git a/public/images/emoji/emoji_one/+1/3.png b/public/images/emoji/emoji_one/+1/3.png
new file mode 100644
index 00000000000..2b6cb704474
Binary files /dev/null and b/public/images/emoji/emoji_one/+1/3.png differ
diff --git a/public/images/emoji/emoji_one/+1/4.png b/public/images/emoji/emoji_one/+1/4.png
new file mode 100644
index 00000000000..385abbf4def
Binary files /dev/null and b/public/images/emoji/emoji_one/+1/4.png differ
diff --git a/public/images/emoji/emoji_one/+1/5.png b/public/images/emoji/emoji_one/+1/5.png
new file mode 100644
index 00000000000..36bca309c91
Binary files /dev/null and b/public/images/emoji/emoji_one/+1/5.png differ
diff --git a/public/images/emoji/emoji_one/+1/6.png b/public/images/emoji/emoji_one/+1/6.png
new file mode 100644
index 00000000000..2d9460c9499
Binary files /dev/null and b/public/images/emoji/emoji_one/+1/6.png differ
diff --git a/public/images/emoji/emoji_one/-1.png b/public/images/emoji/emoji_one/-1.png
index c8e3213e3a2..609e8256180 100644
Binary files a/public/images/emoji/emoji_one/-1.png and b/public/images/emoji/emoji_one/-1.png differ
diff --git a/public/images/emoji/emoji_one/-1/2.png b/public/images/emoji/emoji_one/-1/2.png
new file mode 100644
index 00000000000..322c518f756
Binary files /dev/null and b/public/images/emoji/emoji_one/-1/2.png differ
diff --git a/public/images/emoji/emoji_one/-1/3.png b/public/images/emoji/emoji_one/-1/3.png
new file mode 100644
index 00000000000..0c7a4ca2ce7
Binary files /dev/null and b/public/images/emoji/emoji_one/-1/3.png differ
diff --git a/public/images/emoji/emoji_one/-1/4.png b/public/images/emoji/emoji_one/-1/4.png
new file mode 100644
index 00000000000..97347643042
Binary files /dev/null and b/public/images/emoji/emoji_one/-1/4.png differ
diff --git a/public/images/emoji/emoji_one/-1/5.png b/public/images/emoji/emoji_one/-1/5.png
new file mode 100644
index 00000000000..39e2360bf9c
Binary files /dev/null and b/public/images/emoji/emoji_one/-1/5.png differ
diff --git a/public/images/emoji/emoji_one/-1/6.png b/public/images/emoji/emoji_one/-1/6.png
new file mode 100644
index 00000000000..cb21abb2dc6
Binary files /dev/null and b/public/images/emoji/emoji_one/-1/6.png differ
diff --git a/public/images/emoji/emoji_one/100.png b/public/images/emoji/emoji_one/100.png
index c8711a8ed80..c338676a564 100644
Binary files a/public/images/emoji/emoji_one/100.png and b/public/images/emoji/emoji_one/100.png differ
diff --git a/public/images/emoji/emoji_one/1234.png b/public/images/emoji/emoji_one/1234.png
index e65c572d972..aa9d7f55835 100644
Binary files a/public/images/emoji/emoji_one/1234.png and b/public/images/emoji/emoji_one/1234.png differ
diff --git a/public/images/emoji/emoji_one/1st_place_medal.png b/public/images/emoji/emoji_one/1st_place_medal.png
new file mode 100644
index 00000000000..a5cbcfbdc5a
Binary files /dev/null and b/public/images/emoji/emoji_one/1st_place_medal.png differ
diff --git a/public/images/emoji/emoji_one/2nd_place_medal.png b/public/images/emoji/emoji_one/2nd_place_medal.png
new file mode 100644
index 00000000000..4224a7ef9f5
Binary files /dev/null and b/public/images/emoji/emoji_one/2nd_place_medal.png differ
diff --git a/public/images/emoji/emoji_one/3rd_place_medal.png b/public/images/emoji/emoji_one/3rd_place_medal.png
new file mode 100644
index 00000000000..eacd24b9318
Binary files /dev/null and b/public/images/emoji/emoji_one/3rd_place_medal.png differ
diff --git a/public/images/emoji/emoji_one/8ball.png b/public/images/emoji/emoji_one/8ball.png
index a4f68829e3c..fb79557200c 100644
Binary files a/public/images/emoji/emoji_one/8ball.png and b/public/images/emoji/emoji_one/8ball.png differ
diff --git a/public/images/emoji/emoji_one/a.png b/public/images/emoji/emoji_one/a.png
index 8ffc2dec325..f6abaa814b3 100644
Binary files a/public/images/emoji/emoji_one/a.png and b/public/images/emoji/emoji_one/a.png differ
diff --git a/public/images/emoji/emoji_one/ab.png b/public/images/emoji/emoji_one/ab.png
index d85d963098b..32f33cd86e9 100644
Binary files a/public/images/emoji/emoji_one/ab.png and b/public/images/emoji/emoji_one/ab.png differ
diff --git a/public/images/emoji/emoji_one/abc.png b/public/images/emoji/emoji_one/abc.png
index 6e909270391..44d36012482 100644
Binary files a/public/images/emoji/emoji_one/abc.png and b/public/images/emoji/emoji_one/abc.png differ
diff --git a/public/images/emoji/emoji_one/abcd.png b/public/images/emoji/emoji_one/abcd.png
index 3f182cd565c..43540834ebc 100644
Binary files a/public/images/emoji/emoji_one/abcd.png and b/public/images/emoji/emoji_one/abcd.png differ
diff --git a/public/images/emoji/emoji_one/accept.png b/public/images/emoji/emoji_one/accept.png
index 750b68ce3d6..87c38cae8fd 100644
Binary files a/public/images/emoji/emoji_one/accept.png and b/public/images/emoji/emoji_one/accept.png differ
diff --git a/public/images/emoji/emoji_one/admission_tickets.png b/public/images/emoji/emoji_one/admission_tickets.png
index 4f6a24f9705..9ab7bfc6094 100644
Binary files a/public/images/emoji/emoji_one/admission_tickets.png and b/public/images/emoji/emoji_one/admission_tickets.png differ
diff --git a/public/images/emoji/emoji_one/adult.png b/public/images/emoji/emoji_one/adult.png
new file mode 100644
index 00000000000..53a5eb2ccb9
Binary files /dev/null and b/public/images/emoji/emoji_one/adult.png differ
diff --git a/public/images/emoji/emoji_one/adult/2.png b/public/images/emoji/emoji_one/adult/2.png
new file mode 100644
index 00000000000..8f30fc9e389
Binary files /dev/null and b/public/images/emoji/emoji_one/adult/2.png differ
diff --git a/public/images/emoji/emoji_one/adult/3.png b/public/images/emoji/emoji_one/adult/3.png
new file mode 100644
index 00000000000..36a4e57d1f8
Binary files /dev/null and b/public/images/emoji/emoji_one/adult/3.png differ
diff --git a/public/images/emoji/emoji_one/adult/4.png b/public/images/emoji/emoji_one/adult/4.png
new file mode 100644
index 00000000000..77c57605e93
Binary files /dev/null and b/public/images/emoji/emoji_one/adult/4.png differ
diff --git a/public/images/emoji/emoji_one/adult/5.png b/public/images/emoji/emoji_one/adult/5.png
new file mode 100644
index 00000000000..58bcd6a2fcf
Binary files /dev/null and b/public/images/emoji/emoji_one/adult/5.png differ
diff --git a/public/images/emoji/emoji_one/adult/6.png b/public/images/emoji/emoji_one/adult/6.png
new file mode 100644
index 00000000000..3bc6b5a57a3
Binary files /dev/null and b/public/images/emoji/emoji_one/adult/6.png differ
diff --git a/public/images/emoji/emoji_one/aerial_tramway.png b/public/images/emoji/emoji_one/aerial_tramway.png
index d210cd27bd5..2ef335b50c7 100644
Binary files a/public/images/emoji/emoji_one/aerial_tramway.png and b/public/images/emoji/emoji_one/aerial_tramway.png differ
diff --git a/public/images/emoji/emoji_one/afghanistan.png b/public/images/emoji/emoji_one/afghanistan.png
new file mode 100644
index 00000000000..50c4c6b272e
Binary files /dev/null and b/public/images/emoji/emoji_one/afghanistan.png differ
diff --git a/public/images/emoji/emoji_one/airplane.png b/public/images/emoji/emoji_one/airplane.png
index 2a81606abe8..2c3ab000dea 100644
Binary files a/public/images/emoji/emoji_one/airplane.png and b/public/images/emoji/emoji_one/airplane.png differ
diff --git a/public/images/emoji/emoji_one/airplane_arriving.png b/public/images/emoji/emoji_one/airplane_arriving.png
index 20371af4c14..9a00b425699 100644
Binary files a/public/images/emoji/emoji_one/airplane_arriving.png and b/public/images/emoji/emoji_one/airplane_arriving.png differ
diff --git a/public/images/emoji/emoji_one/airplane_departure.png b/public/images/emoji/emoji_one/airplane_departure.png
index 347b023e8a4..7ac83f443d7 100644
Binary files a/public/images/emoji/emoji_one/airplane_departure.png and b/public/images/emoji/emoji_one/airplane_departure.png differ
diff --git a/public/images/emoji/emoji_one/airplane_small.png b/public/images/emoji/emoji_one/airplane_small.png
index 217b0b85a6d..ff5a7b34e11 100644
Binary files a/public/images/emoji/emoji_one/airplane_small.png and b/public/images/emoji/emoji_one/airplane_small.png differ
diff --git a/public/images/emoji/emoji_one/aland_islands.png b/public/images/emoji/emoji_one/aland_islands.png
new file mode 100644
index 00000000000..2ce958b9202
Binary files /dev/null and b/public/images/emoji/emoji_one/aland_islands.png differ
diff --git a/public/images/emoji/emoji_one/alarm_clock.png b/public/images/emoji/emoji_one/alarm_clock.png
index 4c00e308403..5e59aee7904 100644
Binary files a/public/images/emoji/emoji_one/alarm_clock.png and b/public/images/emoji/emoji_one/alarm_clock.png differ
diff --git a/public/images/emoji/emoji_one/albania.png b/public/images/emoji/emoji_one/albania.png
new file mode 100644
index 00000000000..8d428869d47
Binary files /dev/null and b/public/images/emoji/emoji_one/albania.png differ
diff --git a/public/images/emoji/emoji_one/alembic.png b/public/images/emoji/emoji_one/alembic.png
index a0ceaf63b2c..b8f10e11071 100644
Binary files a/public/images/emoji/emoji_one/alembic.png and b/public/images/emoji/emoji_one/alembic.png differ
diff --git a/public/images/emoji/emoji_one/algeria.png b/public/images/emoji/emoji_one/algeria.png
new file mode 100644
index 00000000000..cd3dc01ab28
Binary files /dev/null and b/public/images/emoji/emoji_one/algeria.png differ
diff --git a/public/images/emoji/emoji_one/alien.png b/public/images/emoji/emoji_one/alien.png
index 4419969b64c..500cd5e87b1 100644
Binary files a/public/images/emoji/emoji_one/alien.png and b/public/images/emoji/emoji_one/alien.png differ
diff --git a/public/images/emoji/emoji_one/ambulance.png b/public/images/emoji/emoji_one/ambulance.png
index 33fa625c3e1..11d6555609f 100644
Binary files a/public/images/emoji/emoji_one/ambulance.png and b/public/images/emoji/emoji_one/ambulance.png differ
diff --git a/public/images/emoji/emoji_one/american_samoa.png b/public/images/emoji/emoji_one/american_samoa.png
new file mode 100644
index 00000000000..f4f58e2e257
Binary files /dev/null and b/public/images/emoji/emoji_one/american_samoa.png differ
diff --git a/public/images/emoji/emoji_one/amphora.png b/public/images/emoji/emoji_one/amphora.png
index cee71ce6e8d..de7eeba9337 100644
Binary files a/public/images/emoji/emoji_one/amphora.png and b/public/images/emoji/emoji_one/amphora.png differ
diff --git a/public/images/emoji/emoji_one/anchor.png b/public/images/emoji/emoji_one/anchor.png
index 02343913bc7..d7c4af807c3 100644
Binary files a/public/images/emoji/emoji_one/anchor.png and b/public/images/emoji/emoji_one/anchor.png differ
diff --git a/public/images/emoji/emoji_one/andorra.png b/public/images/emoji/emoji_one/andorra.png
new file mode 100644
index 00000000000..0fd73782c23
Binary files /dev/null and b/public/images/emoji/emoji_one/andorra.png differ
diff --git a/public/images/emoji/emoji_one/angel.png b/public/images/emoji/emoji_one/angel.png
index 9b333f33cb9..4248a992354 100644
Binary files a/public/images/emoji/emoji_one/angel.png and b/public/images/emoji/emoji_one/angel.png differ
diff --git a/public/images/emoji/emoji_one/angel/2.png b/public/images/emoji/emoji_one/angel/2.png
new file mode 100644
index 00000000000..7733acacb31
Binary files /dev/null and b/public/images/emoji/emoji_one/angel/2.png differ
diff --git a/public/images/emoji/emoji_one/angel/3.png b/public/images/emoji/emoji_one/angel/3.png
new file mode 100644
index 00000000000..798d0c66c9f
Binary files /dev/null and b/public/images/emoji/emoji_one/angel/3.png differ
diff --git a/public/images/emoji/emoji_one/angel/4.png b/public/images/emoji/emoji_one/angel/4.png
new file mode 100644
index 00000000000..fa79792b438
Binary files /dev/null and b/public/images/emoji/emoji_one/angel/4.png differ
diff --git a/public/images/emoji/emoji_one/angel/5.png b/public/images/emoji/emoji_one/angel/5.png
new file mode 100644
index 00000000000..485c20b6c06
Binary files /dev/null and b/public/images/emoji/emoji_one/angel/5.png differ
diff --git a/public/images/emoji/emoji_one/angel/6.png b/public/images/emoji/emoji_one/angel/6.png
new file mode 100644
index 00000000000..51954e45789
Binary files /dev/null and b/public/images/emoji/emoji_one/angel/6.png differ
diff --git a/public/images/emoji/emoji_one/anger.png b/public/images/emoji/emoji_one/anger.png
index bd1efd2c03d..b0350d38c67 100644
Binary files a/public/images/emoji/emoji_one/anger.png and b/public/images/emoji/emoji_one/anger.png differ
diff --git a/public/images/emoji/emoji_one/anger_right.png b/public/images/emoji/emoji_one/anger_right.png
index 9db343ff89d..8899f3c74da 100644
Binary files a/public/images/emoji/emoji_one/anger_right.png and b/public/images/emoji/emoji_one/anger_right.png differ
diff --git a/public/images/emoji/emoji_one/angola.png b/public/images/emoji/emoji_one/angola.png
new file mode 100644
index 00000000000..5aca11a07e4
Binary files /dev/null and b/public/images/emoji/emoji_one/angola.png differ
diff --git a/public/images/emoji/emoji_one/angry.png b/public/images/emoji/emoji_one/angry.png
index 2404b7fbccd..61fa796659e 100644
Binary files a/public/images/emoji/emoji_one/angry.png and b/public/images/emoji/emoji_one/angry.png differ
diff --git a/public/images/emoji/emoji_one/anguilla.png b/public/images/emoji/emoji_one/anguilla.png
new file mode 100644
index 00000000000..d1006c6c19b
Binary files /dev/null and b/public/images/emoji/emoji_one/anguilla.png differ
diff --git a/public/images/emoji/emoji_one/anguished.png b/public/images/emoji/emoji_one/anguished.png
index 5025b7400c7..653818fef53 100644
Binary files a/public/images/emoji/emoji_one/anguished.png and b/public/images/emoji/emoji_one/anguished.png differ
diff --git a/public/images/emoji/emoji_one/ant.png b/public/images/emoji/emoji_one/ant.png
index 60cd3b0cac3..9eb51ed57a8 100644
Binary files a/public/images/emoji/emoji_one/ant.png and b/public/images/emoji/emoji_one/ant.png differ
diff --git a/public/images/emoji/emoji_one/antarctica.png b/public/images/emoji/emoji_one/antarctica.png
new file mode 100644
index 00000000000..5a6759de63e
Binary files /dev/null and b/public/images/emoji/emoji_one/antarctica.png differ
diff --git a/public/images/emoji/emoji_one/antigua_barbuda.png b/public/images/emoji/emoji_one/antigua_barbuda.png
new file mode 100644
index 00000000000..e3ff113cbae
Binary files /dev/null and b/public/images/emoji/emoji_one/antigua_barbuda.png differ
diff --git a/public/images/emoji/emoji_one/apple.png b/public/images/emoji/emoji_one/apple.png
index 2e9f9d3ee94..39495523e83 100644
Binary files a/public/images/emoji/emoji_one/apple.png and b/public/images/emoji/emoji_one/apple.png differ
diff --git a/public/images/emoji/emoji_one/aquarius.png b/public/images/emoji/emoji_one/aquarius.png
index dc48ceca49d..fb77ef16094 100644
Binary files a/public/images/emoji/emoji_one/aquarius.png and b/public/images/emoji/emoji_one/aquarius.png differ
diff --git a/public/images/emoji/emoji_one/archery.png b/public/images/emoji/emoji_one/archery.png
index 02b62035875..008cee8abef 100644
Binary files a/public/images/emoji/emoji_one/archery.png and b/public/images/emoji/emoji_one/archery.png differ
diff --git a/public/images/emoji/emoji_one/argentina.png b/public/images/emoji/emoji_one/argentina.png
new file mode 100644
index 00000000000..1e5e8150987
Binary files /dev/null and b/public/images/emoji/emoji_one/argentina.png differ
diff --git a/public/images/emoji/emoji_one/aries.png b/public/images/emoji/emoji_one/aries.png
index 4dfe9c67649..b0c9f58bf63 100644
Binary files a/public/images/emoji/emoji_one/aries.png and b/public/images/emoji/emoji_one/aries.png differ
diff --git a/public/images/emoji/emoji_one/armenia.png b/public/images/emoji/emoji_one/armenia.png
new file mode 100644
index 00000000000..846307fcf33
Binary files /dev/null and b/public/images/emoji/emoji_one/armenia.png differ
diff --git a/public/images/emoji/emoji_one/arrow_backward.png b/public/images/emoji/emoji_one/arrow_backward.png
index f2eda12ff41..ac68970f076 100644
Binary files a/public/images/emoji/emoji_one/arrow_backward.png and b/public/images/emoji/emoji_one/arrow_backward.png differ
diff --git a/public/images/emoji/emoji_one/arrow_double_down.png b/public/images/emoji/emoji_one/arrow_double_down.png
index 3b71d1cbcc0..30e6d3fe379 100644
Binary files a/public/images/emoji/emoji_one/arrow_double_down.png and b/public/images/emoji/emoji_one/arrow_double_down.png differ
diff --git a/public/images/emoji/emoji_one/arrow_double_up.png b/public/images/emoji/emoji_one/arrow_double_up.png
index 8cdbde73423..43c77166f10 100644
Binary files a/public/images/emoji/emoji_one/arrow_double_up.png and b/public/images/emoji/emoji_one/arrow_double_up.png differ
diff --git a/public/images/emoji/emoji_one/arrow_down.png b/public/images/emoji/emoji_one/arrow_down.png
index 88c10f171ee..a937bc515f0 100644
Binary files a/public/images/emoji/emoji_one/arrow_down.png and b/public/images/emoji/emoji_one/arrow_down.png differ
diff --git a/public/images/emoji/emoji_one/arrow_down_small.png b/public/images/emoji/emoji_one/arrow_down_small.png
index e845541c396..e87da690295 100644
Binary files a/public/images/emoji/emoji_one/arrow_down_small.png and b/public/images/emoji/emoji_one/arrow_down_small.png differ
diff --git a/public/images/emoji/emoji_one/arrow_forward.png b/public/images/emoji/emoji_one/arrow_forward.png
index a339cda7c15..6eed7f8deeb 100644
Binary files a/public/images/emoji/emoji_one/arrow_forward.png and b/public/images/emoji/emoji_one/arrow_forward.png differ
diff --git a/public/images/emoji/emoji_one/arrow_heading_down.png b/public/images/emoji/emoji_one/arrow_heading_down.png
index 7b8ab2a2a66..b0d9c86b924 100644
Binary files a/public/images/emoji/emoji_one/arrow_heading_down.png and b/public/images/emoji/emoji_one/arrow_heading_down.png differ
diff --git a/public/images/emoji/emoji_one/arrow_heading_up.png b/public/images/emoji/emoji_one/arrow_heading_up.png
index 4f5fa678edb..e3bc5973961 100644
Binary files a/public/images/emoji/emoji_one/arrow_heading_up.png and b/public/images/emoji/emoji_one/arrow_heading_up.png differ
diff --git a/public/images/emoji/emoji_one/arrow_left.png b/public/images/emoji/emoji_one/arrow_left.png
index 929c9acf009..8798dcad2ec 100644
Binary files a/public/images/emoji/emoji_one/arrow_left.png and b/public/images/emoji/emoji_one/arrow_left.png differ
diff --git a/public/images/emoji/emoji_one/arrow_lower_left.png b/public/images/emoji/emoji_one/arrow_lower_left.png
index a5bfde71e80..349f74ec9ea 100644
Binary files a/public/images/emoji/emoji_one/arrow_lower_left.png and b/public/images/emoji/emoji_one/arrow_lower_left.png differ
diff --git a/public/images/emoji/emoji_one/arrow_lower_right.png b/public/images/emoji/emoji_one/arrow_lower_right.png
index fae6961794b..042d4496776 100644
Binary files a/public/images/emoji/emoji_one/arrow_lower_right.png and b/public/images/emoji/emoji_one/arrow_lower_right.png differ
diff --git a/public/images/emoji/emoji_one/arrow_right.png b/public/images/emoji/emoji_one/arrow_right.png
index feebfcbc919..09c8f4270c6 100644
Binary files a/public/images/emoji/emoji_one/arrow_right.png and b/public/images/emoji/emoji_one/arrow_right.png differ
diff --git a/public/images/emoji/emoji_one/arrow_right_hook.png b/public/images/emoji/emoji_one/arrow_right_hook.png
index f7e4887e5e3..38f8a8b7b83 100644
Binary files a/public/images/emoji/emoji_one/arrow_right_hook.png and b/public/images/emoji/emoji_one/arrow_right_hook.png differ
diff --git a/public/images/emoji/emoji_one/arrow_up.png b/public/images/emoji/emoji_one/arrow_up.png
index 0ae2052175c..e37fd3352d0 100644
Binary files a/public/images/emoji/emoji_one/arrow_up.png and b/public/images/emoji/emoji_one/arrow_up.png differ
diff --git a/public/images/emoji/emoji_one/arrow_up_down.png b/public/images/emoji/emoji_one/arrow_up_down.png
index 4e1f65bce3d..be64ba6cb46 100644
Binary files a/public/images/emoji/emoji_one/arrow_up_down.png and b/public/images/emoji/emoji_one/arrow_up_down.png differ
diff --git a/public/images/emoji/emoji_one/arrow_up_small.png b/public/images/emoji/emoji_one/arrow_up_small.png
index 9cde005dc64..747c4e749df 100644
Binary files a/public/images/emoji/emoji_one/arrow_up_small.png and b/public/images/emoji/emoji_one/arrow_up_small.png differ
diff --git a/public/images/emoji/emoji_one/arrow_upper_left.png b/public/images/emoji/emoji_one/arrow_upper_left.png
index e245e7ca3b2..8f37fba493e 100644
Binary files a/public/images/emoji/emoji_one/arrow_upper_left.png and b/public/images/emoji/emoji_one/arrow_upper_left.png differ
diff --git a/public/images/emoji/emoji_one/arrow_upper_right.png b/public/images/emoji/emoji_one/arrow_upper_right.png
index b00ef3dd2dd..0346b02b616 100644
Binary files a/public/images/emoji/emoji_one/arrow_upper_right.png and b/public/images/emoji/emoji_one/arrow_upper_right.png differ
diff --git a/public/images/emoji/emoji_one/arrows_clockwise.png b/public/images/emoji/emoji_one/arrows_clockwise.png
index 26dffb21caa..1adf5247d1b 100644
Binary files a/public/images/emoji/emoji_one/arrows_clockwise.png and b/public/images/emoji/emoji_one/arrows_clockwise.png differ
diff --git a/public/images/emoji/emoji_one/arrows_counterclockwise.png b/public/images/emoji/emoji_one/arrows_counterclockwise.png
index 5538ecfc4de..a72ffb8803d 100644
Binary files a/public/images/emoji/emoji_one/arrows_counterclockwise.png and b/public/images/emoji/emoji_one/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/emoji_one/art.png b/public/images/emoji/emoji_one/art.png
index 6737683440f..d45757b9b24 100644
Binary files a/public/images/emoji/emoji_one/art.png and b/public/images/emoji/emoji_one/art.png differ
diff --git a/public/images/emoji/emoji_one/articulated_lorry.png b/public/images/emoji/emoji_one/articulated_lorry.png
index 2d4dbac5dee..20c40488f19 100644
Binary files a/public/images/emoji/emoji_one/articulated_lorry.png and b/public/images/emoji/emoji_one/articulated_lorry.png differ
diff --git a/public/images/emoji/emoji_one/artificial_satellite.png b/public/images/emoji/emoji_one/artificial_satellite.png
new file mode 100644
index 00000000000..3463ad91aed
Binary files /dev/null and b/public/images/emoji/emoji_one/artificial_satellite.png differ
diff --git a/public/images/emoji/emoji_one/aruba.png b/public/images/emoji/emoji_one/aruba.png
new file mode 100644
index 00000000000..459facc13b1
Binary files /dev/null and b/public/images/emoji/emoji_one/aruba.png differ
diff --git a/public/images/emoji/emoji_one/ascension_island.png b/public/images/emoji/emoji_one/ascension_island.png
new file mode 100644
index 00000000000..2e3a1fdd737
Binary files /dev/null and b/public/images/emoji/emoji_one/ascension_island.png differ
diff --git a/public/images/emoji/emoji_one/asterisk.png b/public/images/emoji/emoji_one/asterisk.png
new file mode 100644
index 00000000000..62044fc235d
Binary files /dev/null and b/public/images/emoji/emoji_one/asterisk.png differ
diff --git a/public/images/emoji/emoji_one/astonished.png b/public/images/emoji/emoji_one/astonished.png
index aab9230f241..ddb5e1bfe69 100644
Binary files a/public/images/emoji/emoji_one/astonished.png and b/public/images/emoji/emoji_one/astonished.png differ
diff --git a/public/images/emoji/emoji_one/athletic_shoe.png b/public/images/emoji/emoji_one/athletic_shoe.png
index 29bea54ba76..5b948f7f9e9 100644
Binary files a/public/images/emoji/emoji_one/athletic_shoe.png and b/public/images/emoji/emoji_one/athletic_shoe.png differ
diff --git a/public/images/emoji/emoji_one/atm.png b/public/images/emoji/emoji_one/atm.png
index 26a89d4c62d..f863bdeccd9 100644
Binary files a/public/images/emoji/emoji_one/atm.png and b/public/images/emoji/emoji_one/atm.png differ
diff --git a/public/images/emoji/emoji_one/atom.png b/public/images/emoji/emoji_one/atom.png
index 63481ad7f10..2fa8de88e43 100644
Binary files a/public/images/emoji/emoji_one/atom.png and b/public/images/emoji/emoji_one/atom.png differ
diff --git a/public/images/emoji/emoji_one/atom_symbol.png b/public/images/emoji/emoji_one/atom_symbol.png
index 63481ad7f10..2fa8de88e43 100644
Binary files a/public/images/emoji/emoji_one/atom_symbol.png and b/public/images/emoji/emoji_one/atom_symbol.png differ
diff --git a/public/images/emoji/emoji_one/australia.png b/public/images/emoji/emoji_one/australia.png
new file mode 100644
index 00000000000..5dbc804e863
Binary files /dev/null and b/public/images/emoji/emoji_one/australia.png differ
diff --git a/public/images/emoji/emoji_one/austria.png b/public/images/emoji/emoji_one/austria.png
new file mode 100644
index 00000000000..58141c9f3c1
Binary files /dev/null and b/public/images/emoji/emoji_one/austria.png differ
diff --git a/public/images/emoji/emoji_one/automobile.png b/public/images/emoji/emoji_one/automobile.png
new file mode 100644
index 00000000000..a5f65e3832d
Binary files /dev/null and b/public/images/emoji/emoji_one/automobile.png differ
diff --git a/public/images/emoji/emoji_one/avocado.png b/public/images/emoji/emoji_one/avocado.png
new file mode 100644
index 00000000000..ff15ffb739c
Binary files /dev/null and b/public/images/emoji/emoji_one/avocado.png differ
diff --git a/public/images/emoji/emoji_one/azerbaijan.png b/public/images/emoji/emoji_one/azerbaijan.png
new file mode 100644
index 00000000000..59b4ecf2a0a
Binary files /dev/null and b/public/images/emoji/emoji_one/azerbaijan.png differ
diff --git a/public/images/emoji/emoji_one/b.png b/public/images/emoji/emoji_one/b.png
index 791f156b58d..2aaff665b5d 100644
Binary files a/public/images/emoji/emoji_one/b.png and b/public/images/emoji/emoji_one/b.png differ
diff --git a/public/images/emoji/emoji_one/baby.png b/public/images/emoji/emoji_one/baby.png
index 4773c36533b..f2ec524f219 100644
Binary files a/public/images/emoji/emoji_one/baby.png and b/public/images/emoji/emoji_one/baby.png differ
diff --git a/public/images/emoji/emoji_one/baby/2.png b/public/images/emoji/emoji_one/baby/2.png
new file mode 100644
index 00000000000..0d30fd1ad96
Binary files /dev/null and b/public/images/emoji/emoji_one/baby/2.png differ
diff --git a/public/images/emoji/emoji_one/baby/3.png b/public/images/emoji/emoji_one/baby/3.png
new file mode 100644
index 00000000000..b8cee0e2104
Binary files /dev/null and b/public/images/emoji/emoji_one/baby/3.png differ
diff --git a/public/images/emoji/emoji_one/baby/4.png b/public/images/emoji/emoji_one/baby/4.png
new file mode 100644
index 00000000000..43dc76221ba
Binary files /dev/null and b/public/images/emoji/emoji_one/baby/4.png differ
diff --git a/public/images/emoji/emoji_one/baby/5.png b/public/images/emoji/emoji_one/baby/5.png
new file mode 100644
index 00000000000..05f72b7b7a1
Binary files /dev/null and b/public/images/emoji/emoji_one/baby/5.png differ
diff --git a/public/images/emoji/emoji_one/baby/6.png b/public/images/emoji/emoji_one/baby/6.png
new file mode 100644
index 00000000000..724c0790470
Binary files /dev/null and b/public/images/emoji/emoji_one/baby/6.png differ
diff --git a/public/images/emoji/emoji_one/baby_bottle.png b/public/images/emoji/emoji_one/baby_bottle.png
index b6772c29081..0e2e8a3a5cb 100644
Binary files a/public/images/emoji/emoji_one/baby_bottle.png and b/public/images/emoji/emoji_one/baby_bottle.png differ
diff --git a/public/images/emoji/emoji_one/baby_chick.png b/public/images/emoji/emoji_one/baby_chick.png
index 4c3e0ad474d..b068dfbd1bd 100644
Binary files a/public/images/emoji/emoji_one/baby_chick.png and b/public/images/emoji/emoji_one/baby_chick.png differ
diff --git a/public/images/emoji/emoji_one/baby_symbol.png b/public/images/emoji/emoji_one/baby_symbol.png
index 9b365bc9eed..7d39caa6c2b 100644
Binary files a/public/images/emoji/emoji_one/baby_symbol.png and b/public/images/emoji/emoji_one/baby_symbol.png differ
diff --git a/public/images/emoji/emoji_one/back.png b/public/images/emoji/emoji_one/back.png
index 1790b2d984a..7468e6c9e54 100644
Binary files a/public/images/emoji/emoji_one/back.png and b/public/images/emoji/emoji_one/back.png differ
diff --git a/public/images/emoji/emoji_one/bacon.png b/public/images/emoji/emoji_one/bacon.png
new file mode 100644
index 00000000000..f6cab7b569d
Binary files /dev/null and b/public/images/emoji/emoji_one/bacon.png differ
diff --git a/public/images/emoji/emoji_one/badminton.png b/public/images/emoji/emoji_one/badminton.png
index 472d68368bf..f01b98df0d2 100644
Binary files a/public/images/emoji/emoji_one/badminton.png and b/public/images/emoji/emoji_one/badminton.png differ
diff --git a/public/images/emoji/emoji_one/baggage_claim.png b/public/images/emoji/emoji_one/baggage_claim.png
index 96629340acf..d37c8c29ad3 100644
Binary files a/public/images/emoji/emoji_one/baggage_claim.png and b/public/images/emoji/emoji_one/baggage_claim.png differ
diff --git a/public/images/emoji/emoji_one/baguette_bread.png b/public/images/emoji/emoji_one/baguette_bread.png
new file mode 100644
index 00000000000..78e69f849d1
Binary files /dev/null and b/public/images/emoji/emoji_one/baguette_bread.png differ
diff --git a/public/images/emoji/emoji_one/bahamas.png b/public/images/emoji/emoji_one/bahamas.png
new file mode 100644
index 00000000000..ed95128e196
Binary files /dev/null and b/public/images/emoji/emoji_one/bahamas.png differ
diff --git a/public/images/emoji/emoji_one/bahrain.png b/public/images/emoji/emoji_one/bahrain.png
new file mode 100644
index 00000000000..815a93ef0bf
Binary files /dev/null and b/public/images/emoji/emoji_one/bahrain.png differ
diff --git a/public/images/emoji/emoji_one/balance_scale.png b/public/images/emoji/emoji_one/balance_scale.png
new file mode 100644
index 00000000000..5ce9296bce6
Binary files /dev/null and b/public/images/emoji/emoji_one/balance_scale.png differ
diff --git a/public/images/emoji/emoji_one/balloon.png b/public/images/emoji/emoji_one/balloon.png
index b37bdcbc0ad..94e0ad2d9df 100644
Binary files a/public/images/emoji/emoji_one/balloon.png and b/public/images/emoji/emoji_one/balloon.png differ
diff --git a/public/images/emoji/emoji_one/ballot_box.png b/public/images/emoji/emoji_one/ballot_box.png
index ed3721b0090..3a440b182c3 100644
Binary files a/public/images/emoji/emoji_one/ballot_box.png and b/public/images/emoji/emoji_one/ballot_box.png differ
diff --git a/public/images/emoji/emoji_one/ballot_box_with_ballot.png b/public/images/emoji/emoji_one/ballot_box_with_ballot.png
index ed3721b0090..3a440b182c3 100644
Binary files a/public/images/emoji/emoji_one/ballot_box_with_ballot.png and b/public/images/emoji/emoji_one/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/emoji_one/ballot_box_with_check.png b/public/images/emoji/emoji_one/ballot_box_with_check.png
index 8b49e8c79b6..311e66694bd 100644
Binary files a/public/images/emoji/emoji_one/ballot_box_with_check.png and b/public/images/emoji/emoji_one/ballot_box_with_check.png differ
diff --git a/public/images/emoji/emoji_one/bamboo.png b/public/images/emoji/emoji_one/bamboo.png
index 1a2428acddd..6ce263f4d36 100644
Binary files a/public/images/emoji/emoji_one/bamboo.png and b/public/images/emoji/emoji_one/bamboo.png differ
diff --git a/public/images/emoji/emoji_one/banana.png b/public/images/emoji/emoji_one/banana.png
index 9c29da4c2be..9dc83142450 100644
Binary files a/public/images/emoji/emoji_one/banana.png and b/public/images/emoji/emoji_one/banana.png differ
diff --git a/public/images/emoji/emoji_one/bangbang.png b/public/images/emoji/emoji_one/bangbang.png
index df0c2bda52a..66cf9f4f263 100644
Binary files a/public/images/emoji/emoji_one/bangbang.png and b/public/images/emoji/emoji_one/bangbang.png differ
diff --git a/public/images/emoji/emoji_one/bangladesh.png b/public/images/emoji/emoji_one/bangladesh.png
new file mode 100644
index 00000000000..caab400018c
Binary files /dev/null and b/public/images/emoji/emoji_one/bangladesh.png differ
diff --git a/public/images/emoji/emoji_one/bank.png b/public/images/emoji/emoji_one/bank.png
index 4633286e27c..052b639eb10 100644
Binary files a/public/images/emoji/emoji_one/bank.png and b/public/images/emoji/emoji_one/bank.png differ
diff --git a/public/images/emoji/emoji_one/bar_chart.png b/public/images/emoji/emoji_one/bar_chart.png
index ce751242064..5a5972e5c1e 100644
Binary files a/public/images/emoji/emoji_one/bar_chart.png and b/public/images/emoji/emoji_one/bar_chart.png differ
diff --git a/public/images/emoji/emoji_one/barbados.png b/public/images/emoji/emoji_one/barbados.png
new file mode 100644
index 00000000000..830578344d9
Binary files /dev/null and b/public/images/emoji/emoji_one/barbados.png differ
diff --git a/public/images/emoji/emoji_one/barber.png b/public/images/emoji/emoji_one/barber.png
index 9761eb604fa..29c7ce15456 100644
Binary files a/public/images/emoji/emoji_one/barber.png and b/public/images/emoji/emoji_one/barber.png differ
diff --git a/public/images/emoji/emoji_one/baseball.png b/public/images/emoji/emoji_one/baseball.png
index cf3c95d25f4..9c4c6bf4acb 100644
Binary files a/public/images/emoji/emoji_one/baseball.png and b/public/images/emoji/emoji_one/baseball.png differ
diff --git a/public/images/emoji/emoji_one/basketball.png b/public/images/emoji/emoji_one/basketball.png
index 6ec15112dad..54dd75a62d4 100644
Binary files a/public/images/emoji/emoji_one/basketball.png and b/public/images/emoji/emoji_one/basketball.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man.png b/public/images/emoji/emoji_one/basketball_man.png
new file mode 100644
index 00000000000..a6904abac92
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_man.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man/2.png b/public/images/emoji/emoji_one/basketball_man/2.png
new file mode 100644
index 00000000000..9c1bee41ced
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_man/2.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man/3.png b/public/images/emoji/emoji_one/basketball_man/3.png
new file mode 100644
index 00000000000..275d1edd9b3
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_man/3.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man/4.png b/public/images/emoji/emoji_one/basketball_man/4.png
new file mode 100644
index 00000000000..7eb313163d5
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_man/4.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man/5.png b/public/images/emoji/emoji_one/basketball_man/5.png
new file mode 100644
index 00000000000..fb9dc3936f3
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_man/5.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man/6.png b/public/images/emoji/emoji_one/basketball_man/6.png
new file mode 100644
index 00000000000..6636a5024f9
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_man/6.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player.png b/public/images/emoji/emoji_one/basketball_player.png
index 38c6d635f18..a6904abac92 100644
Binary files a/public/images/emoji/emoji_one/basketball_player.png and b/public/images/emoji/emoji_one/basketball_player.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player/2.png b/public/images/emoji/emoji_one/basketball_player/2.png
new file mode 100644
index 00000000000..9c1bee41ced
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_player/2.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player/3.png b/public/images/emoji/emoji_one/basketball_player/3.png
new file mode 100644
index 00000000000..275d1edd9b3
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_player/3.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player/4.png b/public/images/emoji/emoji_one/basketball_player/4.png
new file mode 100644
index 00000000000..7eb313163d5
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_player/4.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player/5.png b/public/images/emoji/emoji_one/basketball_player/5.png
new file mode 100644
index 00000000000..fb9dc3936f3
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_player/5.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player/6.png b/public/images/emoji/emoji_one/basketball_player/6.png
new file mode 100644
index 00000000000..6636a5024f9
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_player/6.png differ
diff --git a/public/images/emoji/emoji_one/basketball_woman.png b/public/images/emoji/emoji_one/basketball_woman.png
new file mode 100644
index 00000000000..0678a603ffa
Binary files /dev/null and b/public/images/emoji/emoji_one/basketball_woman.png differ
diff --git a/public/images/emoji/emoji_one/bat.png b/public/images/emoji/emoji_one/bat.png
new file mode 100644
index 00000000000..ba364f336e6
Binary files /dev/null and b/public/images/emoji/emoji_one/bat.png differ
diff --git a/public/images/emoji/emoji_one/bath.png b/public/images/emoji/emoji_one/bath.png
index f6f8d96b0ab..91ab14afe97 100644
Binary files a/public/images/emoji/emoji_one/bath.png and b/public/images/emoji/emoji_one/bath.png differ
diff --git a/public/images/emoji/emoji_one/bath/2.png b/public/images/emoji/emoji_one/bath/2.png
new file mode 100644
index 00000000000..ce03295c2a5
Binary files /dev/null and b/public/images/emoji/emoji_one/bath/2.png differ
diff --git a/public/images/emoji/emoji_one/bath/3.png b/public/images/emoji/emoji_one/bath/3.png
new file mode 100644
index 00000000000..830dd9c4d91
Binary files /dev/null and b/public/images/emoji/emoji_one/bath/3.png differ
diff --git a/public/images/emoji/emoji_one/bath/4.png b/public/images/emoji/emoji_one/bath/4.png
new file mode 100644
index 00000000000..a0363bc2a00
Binary files /dev/null and b/public/images/emoji/emoji_one/bath/4.png differ
diff --git a/public/images/emoji/emoji_one/bath/5.png b/public/images/emoji/emoji_one/bath/5.png
new file mode 100644
index 00000000000..17f1291f139
Binary files /dev/null and b/public/images/emoji/emoji_one/bath/5.png differ
diff --git a/public/images/emoji/emoji_one/bath/6.png b/public/images/emoji/emoji_one/bath/6.png
new file mode 100644
index 00000000000..9a9f7d1d1c4
Binary files /dev/null and b/public/images/emoji/emoji_one/bath/6.png differ
diff --git a/public/images/emoji/emoji_one/bathtub.png b/public/images/emoji/emoji_one/bathtub.png
index 64e9b1a8ad0..fdef18b25b8 100644
Binary files a/public/images/emoji/emoji_one/bathtub.png and b/public/images/emoji/emoji_one/bathtub.png differ
diff --git a/public/images/emoji/emoji_one/battery.png b/public/images/emoji/emoji_one/battery.png
index 8bb8f1f08d8..22f3c5fdaab 100644
Binary files a/public/images/emoji/emoji_one/battery.png and b/public/images/emoji/emoji_one/battery.png differ
diff --git a/public/images/emoji/emoji_one/beach.png b/public/images/emoji/emoji_one/beach.png
index 4a9eaf10b2a..c5b3594de8e 100644
Binary files a/public/images/emoji/emoji_one/beach.png and b/public/images/emoji/emoji_one/beach.png differ
diff --git a/public/images/emoji/emoji_one/beach_umbrella.png b/public/images/emoji/emoji_one/beach_umbrella.png
index 7fa37d2f2ed..c5b3594de8e 100644
Binary files a/public/images/emoji/emoji_one/beach_umbrella.png and b/public/images/emoji/emoji_one/beach_umbrella.png differ
diff --git a/public/images/emoji/emoji_one/beach_with_umbrella.png b/public/images/emoji/emoji_one/beach_with_umbrella.png
index 4a9eaf10b2a..c5b3594de8e 100644
Binary files a/public/images/emoji/emoji_one/beach_with_umbrella.png and b/public/images/emoji/emoji_one/beach_with_umbrella.png differ
diff --git a/public/images/emoji/emoji_one/bear.png b/public/images/emoji/emoji_one/bear.png
index d7d5f5cae5c..39310919bd6 100644
Binary files a/public/images/emoji/emoji_one/bear.png and b/public/images/emoji/emoji_one/bear.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person.png b/public/images/emoji/emoji_one/bearded_person.png
new file mode 100644
index 00000000000..ed22a6cb381
Binary files /dev/null and b/public/images/emoji/emoji_one/bearded_person.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person/2.png b/public/images/emoji/emoji_one/bearded_person/2.png
new file mode 100644
index 00000000000..4a2fdeb3040
Binary files /dev/null and b/public/images/emoji/emoji_one/bearded_person/2.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person/3.png b/public/images/emoji/emoji_one/bearded_person/3.png
new file mode 100644
index 00000000000..b1f6e168d7c
Binary files /dev/null and b/public/images/emoji/emoji_one/bearded_person/3.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person/4.png b/public/images/emoji/emoji_one/bearded_person/4.png
new file mode 100644
index 00000000000..f75b75a74e9
Binary files /dev/null and b/public/images/emoji/emoji_one/bearded_person/4.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person/5.png b/public/images/emoji/emoji_one/bearded_person/5.png
new file mode 100644
index 00000000000..a9665b318a4
Binary files /dev/null and b/public/images/emoji/emoji_one/bearded_person/5.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person/6.png b/public/images/emoji/emoji_one/bearded_person/6.png
new file mode 100644
index 00000000000..a42b3caf88c
Binary files /dev/null and b/public/images/emoji/emoji_one/bearded_person/6.png differ
diff --git a/public/images/emoji/emoji_one/bed.png b/public/images/emoji/emoji_one/bed.png
index 7456b997f91..1c4e197bff0 100644
Binary files a/public/images/emoji/emoji_one/bed.png and b/public/images/emoji/emoji_one/bed.png differ
diff --git a/public/images/emoji/emoji_one/bee.png b/public/images/emoji/emoji_one/bee.png
index 659521774f1..d5e6708eeaf 100644
Binary files a/public/images/emoji/emoji_one/bee.png and b/public/images/emoji/emoji_one/bee.png differ
diff --git a/public/images/emoji/emoji_one/beer.png b/public/images/emoji/emoji_one/beer.png
index 3bc330d3433..0eb168ea61e 100644
Binary files a/public/images/emoji/emoji_one/beer.png and b/public/images/emoji/emoji_one/beer.png differ
diff --git a/public/images/emoji/emoji_one/beers.png b/public/images/emoji/emoji_one/beers.png
index 4974f0591e6..6b2d4589331 100644
Binary files a/public/images/emoji/emoji_one/beers.png and b/public/images/emoji/emoji_one/beers.png differ
diff --git a/public/images/emoji/emoji_one/beetle.png b/public/images/emoji/emoji_one/beetle.png
index 6765bc9c2ea..499e98e35ba 100644
Binary files a/public/images/emoji/emoji_one/beetle.png and b/public/images/emoji/emoji_one/beetle.png differ
diff --git a/public/images/emoji/emoji_one/beginner.png b/public/images/emoji/emoji_one/beginner.png
index e6ed0d7f816..1b8e8787228 100644
Binary files a/public/images/emoji/emoji_one/beginner.png and b/public/images/emoji/emoji_one/beginner.png differ
diff --git a/public/images/emoji/emoji_one/belarus.png b/public/images/emoji/emoji_one/belarus.png
new file mode 100644
index 00000000000..e75dc9ec50b
Binary files /dev/null and b/public/images/emoji/emoji_one/belarus.png differ
diff --git a/public/images/emoji/emoji_one/belgium.png b/public/images/emoji/emoji_one/belgium.png
new file mode 100644
index 00000000000..ca401e5985c
Binary files /dev/null and b/public/images/emoji/emoji_one/belgium.png differ
diff --git a/public/images/emoji/emoji_one/belize.png b/public/images/emoji/emoji_one/belize.png
new file mode 100644
index 00000000000..5f6dded80bf
Binary files /dev/null and b/public/images/emoji/emoji_one/belize.png differ
diff --git a/public/images/emoji/emoji_one/bell.png b/public/images/emoji/emoji_one/bell.png
index 69f7ebab009..7e765fbcfb4 100644
Binary files a/public/images/emoji/emoji_one/bell.png and b/public/images/emoji/emoji_one/bell.png differ
diff --git a/public/images/emoji/emoji_one/bellhop.png b/public/images/emoji/emoji_one/bellhop.png
index 278326137bd..d59e897e271 100644
Binary files a/public/images/emoji/emoji_one/bellhop.png and b/public/images/emoji/emoji_one/bellhop.png differ
diff --git a/public/images/emoji/emoji_one/bellhop_bell.png b/public/images/emoji/emoji_one/bellhop_bell.png
index 278326137bd..d59e897e271 100644
Binary files a/public/images/emoji/emoji_one/bellhop_bell.png and b/public/images/emoji/emoji_one/bellhop_bell.png differ
diff --git a/public/images/emoji/emoji_one/benin.png b/public/images/emoji/emoji_one/benin.png
new file mode 100644
index 00000000000..bb74e98818a
Binary files /dev/null and b/public/images/emoji/emoji_one/benin.png differ
diff --git a/public/images/emoji/emoji_one/bento.png b/public/images/emoji/emoji_one/bento.png
index 663849b859a..025abf1c84b 100644
Binary files a/public/images/emoji/emoji_one/bento.png and b/public/images/emoji/emoji_one/bento.png differ
diff --git a/public/images/emoji/emoji_one/bermuda.png b/public/images/emoji/emoji_one/bermuda.png
new file mode 100644
index 00000000000..75f2fac7609
Binary files /dev/null and b/public/images/emoji/emoji_one/bermuda.png differ
diff --git a/public/images/emoji/emoji_one/bhutan.png b/public/images/emoji/emoji_one/bhutan.png
new file mode 100644
index 00000000000..d9a2d20fc1f
Binary files /dev/null and b/public/images/emoji/emoji_one/bhutan.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist.png b/public/images/emoji/emoji_one/bicyclist.png
index 338c1af91eb..feb6048cd4c 100644
Binary files a/public/images/emoji/emoji_one/bicyclist.png and b/public/images/emoji/emoji_one/bicyclist.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist/2.png b/public/images/emoji/emoji_one/bicyclist/2.png
new file mode 100644
index 00000000000..4fa4e818541
Binary files /dev/null and b/public/images/emoji/emoji_one/bicyclist/2.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist/3.png b/public/images/emoji/emoji_one/bicyclist/3.png
new file mode 100644
index 00000000000..295a4648cfd
Binary files /dev/null and b/public/images/emoji/emoji_one/bicyclist/3.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist/4.png b/public/images/emoji/emoji_one/bicyclist/4.png
new file mode 100644
index 00000000000..dc90355376f
Binary files /dev/null and b/public/images/emoji/emoji_one/bicyclist/4.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist/5.png b/public/images/emoji/emoji_one/bicyclist/5.png
new file mode 100644
index 00000000000..f9d93a8923c
Binary files /dev/null and b/public/images/emoji/emoji_one/bicyclist/5.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist/6.png b/public/images/emoji/emoji_one/bicyclist/6.png
new file mode 100644
index 00000000000..ca8ab4280f1
Binary files /dev/null and b/public/images/emoji/emoji_one/bicyclist/6.png differ
diff --git a/public/images/emoji/emoji_one/bike.png b/public/images/emoji/emoji_one/bike.png
index fedc0663c53..27a3303193f 100644
Binary files a/public/images/emoji/emoji_one/bike.png and b/public/images/emoji/emoji_one/bike.png differ
diff --git a/public/images/emoji/emoji_one/biking_man.png b/public/images/emoji/emoji_one/biking_man.png
new file mode 100644
index 00000000000..feb6048cd4c
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_man.png differ
diff --git a/public/images/emoji/emoji_one/biking_man/2.png b/public/images/emoji/emoji_one/biking_man/2.png
new file mode 100644
index 00000000000..4fa4e818541
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_man/2.png differ
diff --git a/public/images/emoji/emoji_one/biking_man/3.png b/public/images/emoji/emoji_one/biking_man/3.png
new file mode 100644
index 00000000000..295a4648cfd
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_man/3.png differ
diff --git a/public/images/emoji/emoji_one/biking_man/4.png b/public/images/emoji/emoji_one/biking_man/4.png
new file mode 100644
index 00000000000..dc90355376f
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_man/4.png differ
diff --git a/public/images/emoji/emoji_one/biking_man/5.png b/public/images/emoji/emoji_one/biking_man/5.png
new file mode 100644
index 00000000000..f9d93a8923c
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_man/5.png differ
diff --git a/public/images/emoji/emoji_one/biking_man/6.png b/public/images/emoji/emoji_one/biking_man/6.png
new file mode 100644
index 00000000000..ca8ab4280f1
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_man/6.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman.png b/public/images/emoji/emoji_one/biking_woman.png
new file mode 100644
index 00000000000..3e6311734da
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_woman.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman/2.png b/public/images/emoji/emoji_one/biking_woman/2.png
new file mode 100644
index 00000000000..42037a81c0c
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman/3.png b/public/images/emoji/emoji_one/biking_woman/3.png
new file mode 100644
index 00000000000..055393dd1c9
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman/4.png b/public/images/emoji/emoji_one/biking_woman/4.png
new file mode 100644
index 00000000000..4bfc8b0ed9d
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman/5.png b/public/images/emoji/emoji_one/biking_woman/5.png
new file mode 100644
index 00000000000..b19804b8c07
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman/6.png b/public/images/emoji/emoji_one/biking_woman/6.png
new file mode 100644
index 00000000000..0fa241f8564
Binary files /dev/null and b/public/images/emoji/emoji_one/biking_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/bikini.png b/public/images/emoji/emoji_one/bikini.png
index 9619001a8e9..49b5bf08db5 100644
Binary files a/public/images/emoji/emoji_one/bikini.png and b/public/images/emoji/emoji_one/bikini.png differ
diff --git a/public/images/emoji/emoji_one/billed_cap.png b/public/images/emoji/emoji_one/billed_cap.png
new file mode 100644
index 00000000000..5cc92e307e1
Binary files /dev/null and b/public/images/emoji/emoji_one/billed_cap.png differ
diff --git a/public/images/emoji/emoji_one/biohazard.png b/public/images/emoji/emoji_one/biohazard.png
index 7a9127c0c65..2f39ef63ce3 100644
Binary files a/public/images/emoji/emoji_one/biohazard.png and b/public/images/emoji/emoji_one/biohazard.png differ
diff --git a/public/images/emoji/emoji_one/biohazard_sign.png b/public/images/emoji/emoji_one/biohazard_sign.png
index 7a9127c0c65..2f39ef63ce3 100644
Binary files a/public/images/emoji/emoji_one/biohazard_sign.png and b/public/images/emoji/emoji_one/biohazard_sign.png differ
diff --git a/public/images/emoji/emoji_one/bird.png b/public/images/emoji/emoji_one/bird.png
index aa378e2effd..4adf8e293b5 100644
Binary files a/public/images/emoji/emoji_one/bird.png and b/public/images/emoji/emoji_one/bird.png differ
diff --git a/public/images/emoji/emoji_one/birthday.png b/public/images/emoji/emoji_one/birthday.png
index ece63e22c36..edb06257fac 100644
Binary files a/public/images/emoji/emoji_one/birthday.png and b/public/images/emoji/emoji_one/birthday.png differ
diff --git a/public/images/emoji/emoji_one/black_circle.png b/public/images/emoji/emoji_one/black_circle.png
index f0ba4e64e62..08235046863 100644
Binary files a/public/images/emoji/emoji_one/black_circle.png and b/public/images/emoji/emoji_one/black_circle.png differ
diff --git a/public/images/emoji/emoji_one/black_flag.png b/public/images/emoji/emoji_one/black_flag.png
new file mode 100644
index 00000000000..193a775633f
Binary files /dev/null and b/public/images/emoji/emoji_one/black_flag.png differ
diff --git a/public/images/emoji/emoji_one/black_heart.png b/public/images/emoji/emoji_one/black_heart.png
new file mode 100644
index 00000000000..885a9c66269
Binary files /dev/null and b/public/images/emoji/emoji_one/black_heart.png differ
diff --git a/public/images/emoji/emoji_one/black_joker.png b/public/images/emoji/emoji_one/black_joker.png
index b09ceba9cdd..35a8a159089 100644
Binary files a/public/images/emoji/emoji_one/black_joker.png and b/public/images/emoji/emoji_one/black_joker.png differ
diff --git a/public/images/emoji/emoji_one/black_large_square.png b/public/images/emoji/emoji_one/black_large_square.png
index 05200a51d2e..d63da0d30e5 100644
Binary files a/public/images/emoji/emoji_one/black_large_square.png and b/public/images/emoji/emoji_one/black_large_square.png differ
diff --git a/public/images/emoji/emoji_one/black_medium_small_square.png b/public/images/emoji/emoji_one/black_medium_small_square.png
index 45e321424c6..0734212ff93 100644
Binary files a/public/images/emoji/emoji_one/black_medium_small_square.png and b/public/images/emoji/emoji_one/black_medium_small_square.png differ
diff --git a/public/images/emoji/emoji_one/black_medium_square.png b/public/images/emoji/emoji_one/black_medium_square.png
index 54b53a5c332..a4c9da7c463 100644
Binary files a/public/images/emoji/emoji_one/black_medium_square.png and b/public/images/emoji/emoji_one/black_medium_square.png differ
diff --git a/public/images/emoji/emoji_one/black_nib.png b/public/images/emoji/emoji_one/black_nib.png
index 9783daa5868..6e9c8aab0aa 100644
Binary files a/public/images/emoji/emoji_one/black_nib.png and b/public/images/emoji/emoji_one/black_nib.png differ
diff --git a/public/images/emoji/emoji_one/black_small_square.png b/public/images/emoji/emoji_one/black_small_square.png
index 423f00b9863..6c8874a67df 100644
Binary files a/public/images/emoji/emoji_one/black_small_square.png and b/public/images/emoji/emoji_one/black_small_square.png differ
diff --git a/public/images/emoji/emoji_one/black_square_button.png b/public/images/emoji/emoji_one/black_square_button.png
index 3b90fadb522..b48c505d6f5 100644
Binary files a/public/images/emoji/emoji_one/black_square_button.png and b/public/images/emoji/emoji_one/black_square_button.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man.png b/public/images/emoji/emoji_one/blonde_man.png
new file mode 100644
index 00000000000..b7e300ea9cd
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_man.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man/2.png b/public/images/emoji/emoji_one/blonde_man/2.png
new file mode 100644
index 00000000000..afe0242f7aa
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_man/2.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man/3.png b/public/images/emoji/emoji_one/blonde_man/3.png
new file mode 100644
index 00000000000..39dff279380
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_man/3.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man/4.png b/public/images/emoji/emoji_one/blonde_man/4.png
new file mode 100644
index 00000000000..02da4b5d72f
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_man/4.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man/5.png b/public/images/emoji/emoji_one/blonde_man/5.png
new file mode 100644
index 00000000000..e207ddaa266
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_man/5.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man/6.png b/public/images/emoji/emoji_one/blonde_man/6.png
new file mode 100644
index 00000000000..cb09defa9f3
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_man/6.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman.png b/public/images/emoji/emoji_one/blonde_woman.png
new file mode 100644
index 00000000000..1d536ac1c28
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_woman.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman/2.png b/public/images/emoji/emoji_one/blonde_woman/2.png
new file mode 100644
index 00000000000..0e55204bb58
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman/3.png b/public/images/emoji/emoji_one/blonde_woman/3.png
new file mode 100644
index 00000000000..031dd598547
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman/4.png b/public/images/emoji/emoji_one/blonde_woman/4.png
new file mode 100644
index 00000000000..1cfc38d1772
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman/5.png b/public/images/emoji/emoji_one/blonde_woman/5.png
new file mode 100644
index 00000000000..5917cb562d4
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman/6.png b/public/images/emoji/emoji_one/blonde_woman/6.png
new file mode 100644
index 00000000000..aad07c5065a
Binary files /dev/null and b/public/images/emoji/emoji_one/blonde_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/blossom.png b/public/images/emoji/emoji_one/blossom.png
index 72d61a02cae..7ee823b9cd1 100644
Binary files a/public/images/emoji/emoji_one/blossom.png and b/public/images/emoji/emoji_one/blossom.png differ
diff --git a/public/images/emoji/emoji_one/blowfish.png b/public/images/emoji/emoji_one/blowfish.png
index 2275b389b52..6b9a2c568e3 100644
Binary files a/public/images/emoji/emoji_one/blowfish.png and b/public/images/emoji/emoji_one/blowfish.png differ
diff --git a/public/images/emoji/emoji_one/blue_book.png b/public/images/emoji/emoji_one/blue_book.png
index 322f6fa9e44..5098345a940 100644
Binary files a/public/images/emoji/emoji_one/blue_book.png and b/public/images/emoji/emoji_one/blue_book.png differ
diff --git a/public/images/emoji/emoji_one/blue_car.png b/public/images/emoji/emoji_one/blue_car.png
index 93c30af7770..4baeb467f5f 100644
Binary files a/public/images/emoji/emoji_one/blue_car.png and b/public/images/emoji/emoji_one/blue_car.png differ
diff --git a/public/images/emoji/emoji_one/blue_heart.png b/public/images/emoji/emoji_one/blue_heart.png
index 78c21bc2e49..d4471ec5104 100644
Binary files a/public/images/emoji/emoji_one/blue_heart.png and b/public/images/emoji/emoji_one/blue_heart.png differ
diff --git a/public/images/emoji/emoji_one/blush.png b/public/images/emoji/emoji_one/blush.png
index 7b6aa733862..b0efa779e26 100644
Binary files a/public/images/emoji/emoji_one/blush.png and b/public/images/emoji/emoji_one/blush.png differ
diff --git a/public/images/emoji/emoji_one/boar.png b/public/images/emoji/emoji_one/boar.png
index 5511bdef4ff..1247d33960f 100644
Binary files a/public/images/emoji/emoji_one/boar.png and b/public/images/emoji/emoji_one/boar.png differ
diff --git a/public/images/emoji/emoji_one/boat.png b/public/images/emoji/emoji_one/boat.png
new file mode 100644
index 00000000000..0dfeae01e90
Binary files /dev/null and b/public/images/emoji/emoji_one/boat.png differ
diff --git a/public/images/emoji/emoji_one/bolivia.png b/public/images/emoji/emoji_one/bolivia.png
new file mode 100644
index 00000000000..af9bd4d5e7a
Binary files /dev/null and b/public/images/emoji/emoji_one/bolivia.png differ
diff --git a/public/images/emoji/emoji_one/bomb.png b/public/images/emoji/emoji_one/bomb.png
index c354abcc278..2b1caf85550 100644
Binary files a/public/images/emoji/emoji_one/bomb.png and b/public/images/emoji/emoji_one/bomb.png differ
diff --git a/public/images/emoji/emoji_one/book.png b/public/images/emoji/emoji_one/book.png
index 1232ef74721..3a8176a7d88 100644
Binary files a/public/images/emoji/emoji_one/book.png and b/public/images/emoji/emoji_one/book.png differ
diff --git a/public/images/emoji/emoji_one/bookmark.png b/public/images/emoji/emoji_one/bookmark.png
index 8ea38312a2b..fcb103c591b 100644
Binary files a/public/images/emoji/emoji_one/bookmark.png and b/public/images/emoji/emoji_one/bookmark.png differ
diff --git a/public/images/emoji/emoji_one/bookmark_tabs.png b/public/images/emoji/emoji_one/bookmark_tabs.png
index 66b49ecb01e..20e874c197d 100644
Binary files a/public/images/emoji/emoji_one/bookmark_tabs.png and b/public/images/emoji/emoji_one/bookmark_tabs.png differ
diff --git a/public/images/emoji/emoji_one/books.png b/public/images/emoji/emoji_one/books.png
index 6cf9e20f12b..f8e12ed290e 100644
Binary files a/public/images/emoji/emoji_one/books.png and b/public/images/emoji/emoji_one/books.png differ
diff --git a/public/images/emoji/emoji_one/boom.png b/public/images/emoji/emoji_one/boom.png
index 2229996f55e..79b4318f743 100644
Binary files a/public/images/emoji/emoji_one/boom.png and b/public/images/emoji/emoji_one/boom.png differ
diff --git a/public/images/emoji/emoji_one/boot.png b/public/images/emoji/emoji_one/boot.png
index 220a4352815..467fb406c2c 100644
Binary files a/public/images/emoji/emoji_one/boot.png and b/public/images/emoji/emoji_one/boot.png differ
diff --git a/public/images/emoji/emoji_one/bosnia_herzegovina.png b/public/images/emoji/emoji_one/bosnia_herzegovina.png
new file mode 100644
index 00000000000..91493ade758
Binary files /dev/null and b/public/images/emoji/emoji_one/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/emoji_one/botswana.png b/public/images/emoji/emoji_one/botswana.png
new file mode 100644
index 00000000000..3697a723dd3
Binary files /dev/null and b/public/images/emoji/emoji_one/botswana.png differ
diff --git a/public/images/emoji/emoji_one/bottle_with_popping_cork.png b/public/images/emoji/emoji_one/bottle_with_popping_cork.png
index d8c1b55be00..e37ee62f717 100644
Binary files a/public/images/emoji/emoji_one/bottle_with_popping_cork.png and b/public/images/emoji/emoji_one/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/emoji_one/bouquet.png b/public/images/emoji/emoji_one/bouquet.png
index f4caccc8ac1..205adf784fc 100644
Binary files a/public/images/emoji/emoji_one/bouquet.png and b/public/images/emoji/emoji_one/bouquet.png differ
diff --git a/public/images/emoji/emoji_one/bouvet_island.png b/public/images/emoji/emoji_one/bouvet_island.png
new file mode 100644
index 00000000000..801a5776543
Binary files /dev/null and b/public/images/emoji/emoji_one/bouvet_island.png differ
diff --git a/public/images/emoji/emoji_one/bow.png b/public/images/emoji/emoji_one/bow.png
index 8dcd8156234..b76022d3f35 100644
Binary files a/public/images/emoji/emoji_one/bow.png and b/public/images/emoji/emoji_one/bow.png differ
diff --git a/public/images/emoji/emoji_one/bow/2.png b/public/images/emoji/emoji_one/bow/2.png
new file mode 100644
index 00000000000..f6d22d5fa27
Binary files /dev/null and b/public/images/emoji/emoji_one/bow/2.png differ
diff --git a/public/images/emoji/emoji_one/bow/3.png b/public/images/emoji/emoji_one/bow/3.png
new file mode 100644
index 00000000000..f7d2ebec178
Binary files /dev/null and b/public/images/emoji/emoji_one/bow/3.png differ
diff --git a/public/images/emoji/emoji_one/bow/4.png b/public/images/emoji/emoji_one/bow/4.png
new file mode 100644
index 00000000000..509c8f77526
Binary files /dev/null and b/public/images/emoji/emoji_one/bow/4.png differ
diff --git a/public/images/emoji/emoji_one/bow/5.png b/public/images/emoji/emoji_one/bow/5.png
new file mode 100644
index 00000000000..88f208ca891
Binary files /dev/null and b/public/images/emoji/emoji_one/bow/5.png differ
diff --git a/public/images/emoji/emoji_one/bow/6.png b/public/images/emoji/emoji_one/bow/6.png
new file mode 100644
index 00000000000..e0a57ab040a
Binary files /dev/null and b/public/images/emoji/emoji_one/bow/6.png differ
diff --git a/public/images/emoji/emoji_one/bow_and_arrow.png b/public/images/emoji/emoji_one/bow_and_arrow.png
index 02b62035875..008cee8abef 100644
Binary files a/public/images/emoji/emoji_one/bow_and_arrow.png and b/public/images/emoji/emoji_one/bow_and_arrow.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man.png b/public/images/emoji/emoji_one/bowing_man.png
new file mode 100644
index 00000000000..b76022d3f35
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_man.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man/2.png b/public/images/emoji/emoji_one/bowing_man/2.png
new file mode 100644
index 00000000000..f6d22d5fa27
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_man/2.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man/3.png b/public/images/emoji/emoji_one/bowing_man/3.png
new file mode 100644
index 00000000000..f7d2ebec178
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_man/3.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man/4.png b/public/images/emoji/emoji_one/bowing_man/4.png
new file mode 100644
index 00000000000..509c8f77526
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_man/4.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man/5.png b/public/images/emoji/emoji_one/bowing_man/5.png
new file mode 100644
index 00000000000..88f208ca891
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_man/5.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man/6.png b/public/images/emoji/emoji_one/bowing_man/6.png
new file mode 100644
index 00000000000..e0a57ab040a
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_man/6.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman.png b/public/images/emoji/emoji_one/bowing_woman.png
new file mode 100644
index 00000000000..e7b7afb18b2
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_woman.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman/2.png b/public/images/emoji/emoji_one/bowing_woman/2.png
new file mode 100644
index 00000000000..d71680cf401
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman/3.png b/public/images/emoji/emoji_one/bowing_woman/3.png
new file mode 100644
index 00000000000..6b776c893b6
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman/4.png b/public/images/emoji/emoji_one/bowing_woman/4.png
new file mode 100644
index 00000000000..53ff772fa40
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman/5.png b/public/images/emoji/emoji_one/bowing_woman/5.png
new file mode 100644
index 00000000000..ce18aa7caf1
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman/6.png b/public/images/emoji/emoji_one/bowing_woman/6.png
new file mode 100644
index 00000000000..fade8369bc3
Binary files /dev/null and b/public/images/emoji/emoji_one/bowing_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/bowl_with_spoon.png b/public/images/emoji/emoji_one/bowl_with_spoon.png
new file mode 100644
index 00000000000..b0d88a73b9d
Binary files /dev/null and b/public/images/emoji/emoji_one/bowl_with_spoon.png differ
diff --git a/public/images/emoji/emoji_one/bowling.png b/public/images/emoji/emoji_one/bowling.png
index 90ae4518f9d..f1b4bc8cba4 100644
Binary files a/public/images/emoji/emoji_one/bowling.png and b/public/images/emoji/emoji_one/bowling.png differ
diff --git a/public/images/emoji/emoji_one/boxing_glove.png b/public/images/emoji/emoji_one/boxing_glove.png
new file mode 100644
index 00000000000..6cfb5b5aa27
Binary files /dev/null and b/public/images/emoji/emoji_one/boxing_glove.png differ
diff --git a/public/images/emoji/emoji_one/boy.png b/public/images/emoji/emoji_one/boy.png
index 9db6f478ade..eb0ca9ef7e7 100644
Binary files a/public/images/emoji/emoji_one/boy.png and b/public/images/emoji/emoji_one/boy.png differ
diff --git a/public/images/emoji/emoji_one/boy/2.png b/public/images/emoji/emoji_one/boy/2.png
new file mode 100644
index 00000000000..c87f96db0ed
Binary files /dev/null and b/public/images/emoji/emoji_one/boy/2.png differ
diff --git a/public/images/emoji/emoji_one/boy/3.png b/public/images/emoji/emoji_one/boy/3.png
new file mode 100644
index 00000000000..974e9d99769
Binary files /dev/null and b/public/images/emoji/emoji_one/boy/3.png differ
diff --git a/public/images/emoji/emoji_one/boy/4.png b/public/images/emoji/emoji_one/boy/4.png
new file mode 100644
index 00000000000..2388146fb24
Binary files /dev/null and b/public/images/emoji/emoji_one/boy/4.png differ
diff --git a/public/images/emoji/emoji_one/boy/5.png b/public/images/emoji/emoji_one/boy/5.png
new file mode 100644
index 00000000000..9095729338f
Binary files /dev/null and b/public/images/emoji/emoji_one/boy/5.png differ
diff --git a/public/images/emoji/emoji_one/boy/6.png b/public/images/emoji/emoji_one/boy/6.png
new file mode 100644
index 00000000000..a0438161a9f
Binary files /dev/null and b/public/images/emoji/emoji_one/boy/6.png differ
diff --git a/public/images/emoji/emoji_one/brain.png b/public/images/emoji/emoji_one/brain.png
new file mode 100644
index 00000000000..c8e889faecf
Binary files /dev/null and b/public/images/emoji/emoji_one/brain.png differ
diff --git a/public/images/emoji/emoji_one/brazil.png b/public/images/emoji/emoji_one/brazil.png
new file mode 100644
index 00000000000..a68b1e6b586
Binary files /dev/null and b/public/images/emoji/emoji_one/brazil.png differ
diff --git a/public/images/emoji/emoji_one/bread.png b/public/images/emoji/emoji_one/bread.png
index bd36a5c2453..e79d2841f82 100644
Binary files a/public/images/emoji/emoji_one/bread.png and b/public/images/emoji/emoji_one/bread.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding.png b/public/images/emoji/emoji_one/breast_feeding.png
new file mode 100644
index 00000000000..22b935f80b6
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil.png b/public/images/emoji/emoji_one/bride_with_veil.png
index 246ac4b24dd..266ea220003 100644
Binary files a/public/images/emoji/emoji_one/bride_with_veil.png and b/public/images/emoji/emoji_one/bride_with_veil.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil/2.png b/public/images/emoji/emoji_one/bride_with_veil/2.png
new file mode 100644
index 00000000000..2bbccd37ced
Binary files /dev/null and b/public/images/emoji/emoji_one/bride_with_veil/2.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil/3.png b/public/images/emoji/emoji_one/bride_with_veil/3.png
new file mode 100644
index 00000000000..d6d86151ecf
Binary files /dev/null and b/public/images/emoji/emoji_one/bride_with_veil/3.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil/4.png b/public/images/emoji/emoji_one/bride_with_veil/4.png
new file mode 100644
index 00000000000..bfc2d74c390
Binary files /dev/null and b/public/images/emoji/emoji_one/bride_with_veil/4.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil/5.png b/public/images/emoji/emoji_one/bride_with_veil/5.png
new file mode 100644
index 00000000000..085b7ffd7a7
Binary files /dev/null and b/public/images/emoji/emoji_one/bride_with_veil/5.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil/6.png b/public/images/emoji/emoji_one/bride_with_veil/6.png
new file mode 100644
index 00000000000..e650ad355df
Binary files /dev/null and b/public/images/emoji/emoji_one/bride_with_veil/6.png differ
diff --git a/public/images/emoji/emoji_one/bridge_at_night.png b/public/images/emoji/emoji_one/bridge_at_night.png
index 183efc4617d..bab0bb47802 100644
Binary files a/public/images/emoji/emoji_one/bridge_at_night.png and b/public/images/emoji/emoji_one/bridge_at_night.png differ
diff --git a/public/images/emoji/emoji_one/briefcase.png b/public/images/emoji/emoji_one/briefcase.png
index cde66eb176f..8510cab5ab1 100644
Binary files a/public/images/emoji/emoji_one/briefcase.png and b/public/images/emoji/emoji_one/briefcase.png differ
diff --git a/public/images/emoji/emoji_one/british_indian_ocean_territory.png b/public/images/emoji/emoji_one/british_indian_ocean_territory.png
new file mode 100644
index 00000000000..e3d2479344f
Binary files /dev/null and b/public/images/emoji/emoji_one/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/emoji_one/british_virgin_islands.png b/public/images/emoji/emoji_one/british_virgin_islands.png
new file mode 100644
index 00000000000..9f758979a16
Binary files /dev/null and b/public/images/emoji/emoji_one/british_virgin_islands.png differ
diff --git a/public/images/emoji/emoji_one/broccoli.png b/public/images/emoji/emoji_one/broccoli.png
new file mode 100644
index 00000000000..74f1b2a7de2
Binary files /dev/null and b/public/images/emoji/emoji_one/broccoli.png differ
diff --git a/public/images/emoji/emoji_one/broken_heart.png b/public/images/emoji/emoji_one/broken_heart.png
index b86a1092030..9d80b52e74c 100644
Binary files a/public/images/emoji/emoji_one/broken_heart.png and b/public/images/emoji/emoji_one/broken_heart.png differ
diff --git a/public/images/emoji/emoji_one/brunei.png b/public/images/emoji/emoji_one/brunei.png
new file mode 100644
index 00000000000..647e1c4d79b
Binary files /dev/null and b/public/images/emoji/emoji_one/brunei.png differ
diff --git a/public/images/emoji/emoji_one/bug.png b/public/images/emoji/emoji_one/bug.png
index 9aed304bd70..d9f94526c04 100644
Binary files a/public/images/emoji/emoji_one/bug.png and b/public/images/emoji/emoji_one/bug.png differ
diff --git a/public/images/emoji/emoji_one/building_construction.png b/public/images/emoji/emoji_one/building_construction.png
index 04e7fd40b9e..c4959500a27 100644
Binary files a/public/images/emoji/emoji_one/building_construction.png and b/public/images/emoji/emoji_one/building_construction.png differ
diff --git a/public/images/emoji/emoji_one/bulb.png b/public/images/emoji/emoji_one/bulb.png
index 7e525a98e64..da52ae9ee10 100644
Binary files a/public/images/emoji/emoji_one/bulb.png and b/public/images/emoji/emoji_one/bulb.png differ
diff --git a/public/images/emoji/emoji_one/bulgaria.png b/public/images/emoji/emoji_one/bulgaria.png
new file mode 100644
index 00000000000..5185700c636
Binary files /dev/null and b/public/images/emoji/emoji_one/bulgaria.png differ
diff --git a/public/images/emoji/emoji_one/bullettrain_front.png b/public/images/emoji/emoji_one/bullettrain_front.png
index 50839c88857..c66e0187d43 100644
Binary files a/public/images/emoji/emoji_one/bullettrain_front.png and b/public/images/emoji/emoji_one/bullettrain_front.png differ
diff --git a/public/images/emoji/emoji_one/bullettrain_side.png b/public/images/emoji/emoji_one/bullettrain_side.png
index 84b9f4b5aec..5e396be2e9d 100644
Binary files a/public/images/emoji/emoji_one/bullettrain_side.png and b/public/images/emoji/emoji_one/bullettrain_side.png differ
diff --git a/public/images/emoji/emoji_one/burkina_faso.png b/public/images/emoji/emoji_one/burkina_faso.png
new file mode 100644
index 00000000000..c519f8a954c
Binary files /dev/null and b/public/images/emoji/emoji_one/burkina_faso.png differ
diff --git a/public/images/emoji/emoji_one/burrito.png b/public/images/emoji/emoji_one/burrito.png
index 0df4f82ee61..f001a0822e4 100644
Binary files a/public/images/emoji/emoji_one/burrito.png and b/public/images/emoji/emoji_one/burrito.png differ
diff --git a/public/images/emoji/emoji_one/burundi.png b/public/images/emoji/emoji_one/burundi.png
new file mode 100644
index 00000000000..83e731cc34f
Binary files /dev/null and b/public/images/emoji/emoji_one/burundi.png differ
diff --git a/public/images/emoji/emoji_one/bus.png b/public/images/emoji/emoji_one/bus.png
index 203f3f7272a..8cad8a67ff5 100644
Binary files a/public/images/emoji/emoji_one/bus.png and b/public/images/emoji/emoji_one/bus.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating.png b/public/images/emoji/emoji_one/business_suit_levitating.png
new file mode 100644
index 00000000000..f25e14fd06d
Binary files /dev/null and b/public/images/emoji/emoji_one/business_suit_levitating.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating/2.png b/public/images/emoji/emoji_one/business_suit_levitating/2.png
new file mode 100644
index 00000000000..c8af4516a26
Binary files /dev/null and b/public/images/emoji/emoji_one/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating/3.png b/public/images/emoji/emoji_one/business_suit_levitating/3.png
new file mode 100644
index 00000000000..ed5fde06d4d
Binary files /dev/null and b/public/images/emoji/emoji_one/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating/4.png b/public/images/emoji/emoji_one/business_suit_levitating/4.png
new file mode 100644
index 00000000000..631c51d4e60
Binary files /dev/null and b/public/images/emoji/emoji_one/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating/5.png b/public/images/emoji/emoji_one/business_suit_levitating/5.png
new file mode 100644
index 00000000000..5bbb08cab49
Binary files /dev/null and b/public/images/emoji/emoji_one/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating/6.png b/public/images/emoji/emoji_one/business_suit_levitating/6.png
new file mode 100644
index 00000000000..84fd92bd359
Binary files /dev/null and b/public/images/emoji/emoji_one/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/emoji_one/busstop.png b/public/images/emoji/emoji_one/busstop.png
index b5538e23884..5efc8a231a5 100644
Binary files a/public/images/emoji/emoji_one/busstop.png and b/public/images/emoji/emoji_one/busstop.png differ
diff --git a/public/images/emoji/emoji_one/bust_in_silhouette.png b/public/images/emoji/emoji_one/bust_in_silhouette.png
index cfed8745c7c..3f0e81003c6 100644
Binary files a/public/images/emoji/emoji_one/bust_in_silhouette.png and b/public/images/emoji/emoji_one/bust_in_silhouette.png differ
diff --git a/public/images/emoji/emoji_one/busts_in_silhouette.png b/public/images/emoji/emoji_one/busts_in_silhouette.png
index 4f979d6fb11..f102392d6f3 100644
Binary files a/public/images/emoji/emoji_one/busts_in_silhouette.png and b/public/images/emoji/emoji_one/busts_in_silhouette.png differ
diff --git a/public/images/emoji/emoji_one/butterfly.png b/public/images/emoji/emoji_one/butterfly.png
new file mode 100644
index 00000000000..d682eccad2c
Binary files /dev/null and b/public/images/emoji/emoji_one/butterfly.png differ
diff --git a/public/images/emoji/emoji_one/cactus.png b/public/images/emoji/emoji_one/cactus.png
index cba39e8803e..61e29ef77a7 100644
Binary files a/public/images/emoji/emoji_one/cactus.png and b/public/images/emoji/emoji_one/cactus.png differ
diff --git a/public/images/emoji/emoji_one/cake.png b/public/images/emoji/emoji_one/cake.png
index 88af15a2ec0..229e0c6bc3c 100644
Binary files a/public/images/emoji/emoji_one/cake.png and b/public/images/emoji/emoji_one/cake.png differ
diff --git a/public/images/emoji/emoji_one/calendar.png b/public/images/emoji/emoji_one/calendar.png
index a1aea777c1c..1ad7d67ba60 100644
Binary files a/public/images/emoji/emoji_one/calendar.png and b/public/images/emoji/emoji_one/calendar.png differ
diff --git a/public/images/emoji/emoji_one/calendar_spiral.png b/public/images/emoji/emoji_one/calendar_spiral.png
index 50fb5e044aa..fd91b82bf90 100644
Binary files a/public/images/emoji/emoji_one/calendar_spiral.png and b/public/images/emoji/emoji_one/calendar_spiral.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand.png b/public/images/emoji/emoji_one/call_me_hand.png
new file mode 100644
index 00000000000..7ca5d78d4b9
Binary files /dev/null and b/public/images/emoji/emoji_one/call_me_hand.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand/2.png b/public/images/emoji/emoji_one/call_me_hand/2.png
new file mode 100644
index 00000000000..35ac0f5bae8
Binary files /dev/null and b/public/images/emoji/emoji_one/call_me_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand/3.png b/public/images/emoji/emoji_one/call_me_hand/3.png
new file mode 100644
index 00000000000..a9e5e039374
Binary files /dev/null and b/public/images/emoji/emoji_one/call_me_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand/4.png b/public/images/emoji/emoji_one/call_me_hand/4.png
new file mode 100644
index 00000000000..9be8eeff9c0
Binary files /dev/null and b/public/images/emoji/emoji_one/call_me_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand/5.png b/public/images/emoji/emoji_one/call_me_hand/5.png
new file mode 100644
index 00000000000..eea7d6a9edb
Binary files /dev/null and b/public/images/emoji/emoji_one/call_me_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand/6.png b/public/images/emoji/emoji_one/call_me_hand/6.png
new file mode 100644
index 00000000000..4ccd08ca8f2
Binary files /dev/null and b/public/images/emoji/emoji_one/call_me_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/calling.png b/public/images/emoji/emoji_one/calling.png
index dbb364fe44e..79fbd2f543f 100644
Binary files a/public/images/emoji/emoji_one/calling.png and b/public/images/emoji/emoji_one/calling.png differ
diff --git a/public/images/emoji/emoji_one/cambodia.png b/public/images/emoji/emoji_one/cambodia.png
new file mode 100644
index 00000000000..0a7ca06fb42
Binary files /dev/null and b/public/images/emoji/emoji_one/cambodia.png differ
diff --git a/public/images/emoji/emoji_one/camel.png b/public/images/emoji/emoji_one/camel.png
index 4ab20d9388e..09915760d7e 100644
Binary files a/public/images/emoji/emoji_one/camel.png and b/public/images/emoji/emoji_one/camel.png differ
diff --git a/public/images/emoji/emoji_one/camera.png b/public/images/emoji/emoji_one/camera.png
index af9265c0429..09ad5e96b55 100644
Binary files a/public/images/emoji/emoji_one/camera.png and b/public/images/emoji/emoji_one/camera.png differ
diff --git a/public/images/emoji/emoji_one/camera_flash.png b/public/images/emoji/emoji_one/camera_flash.png
new file mode 100644
index 00000000000..f686f2bdabb
Binary files /dev/null and b/public/images/emoji/emoji_one/camera_flash.png differ
diff --git a/public/images/emoji/emoji_one/camera_with_flash.png b/public/images/emoji/emoji_one/camera_with_flash.png
index 5c710b453ae..f686f2bdabb 100644
Binary files a/public/images/emoji/emoji_one/camera_with_flash.png and b/public/images/emoji/emoji_one/camera_with_flash.png differ
diff --git a/public/images/emoji/emoji_one/cameroon.png b/public/images/emoji/emoji_one/cameroon.png
new file mode 100644
index 00000000000..b9aaf463487
Binary files /dev/null and b/public/images/emoji/emoji_one/cameroon.png differ
diff --git a/public/images/emoji/emoji_one/camping.png b/public/images/emoji/emoji_one/camping.png
index 891bd2698e9..9977ca19a5b 100644
Binary files a/public/images/emoji/emoji_one/camping.png and b/public/images/emoji/emoji_one/camping.png differ
diff --git a/public/images/emoji/emoji_one/canada.png b/public/images/emoji/emoji_one/canada.png
new file mode 100644
index 00000000000..82664ad79e9
Binary files /dev/null and b/public/images/emoji/emoji_one/canada.png differ
diff --git a/public/images/emoji/emoji_one/canary_islands.png b/public/images/emoji/emoji_one/canary_islands.png
new file mode 100644
index 00000000000..68ccf48d0df
Binary files /dev/null and b/public/images/emoji/emoji_one/canary_islands.png differ
diff --git a/public/images/emoji/emoji_one/cancer.png b/public/images/emoji/emoji_one/cancer.png
index 855b10badc2..c68e5058e60 100644
Binary files a/public/images/emoji/emoji_one/cancer.png and b/public/images/emoji/emoji_one/cancer.png differ
diff --git a/public/images/emoji/emoji_one/candle.png b/public/images/emoji/emoji_one/candle.png
index 5c48fa71c6d..be40928c9d7 100644
Binary files a/public/images/emoji/emoji_one/candle.png and b/public/images/emoji/emoji_one/candle.png differ
diff --git a/public/images/emoji/emoji_one/candy.png b/public/images/emoji/emoji_one/candy.png
index ec682ae01a0..7be1ecb6575 100644
Binary files a/public/images/emoji/emoji_one/candy.png and b/public/images/emoji/emoji_one/candy.png differ
diff --git a/public/images/emoji/emoji_one/canned_food.png b/public/images/emoji/emoji_one/canned_food.png
new file mode 100644
index 00000000000..2e5976e9d2f
Binary files /dev/null and b/public/images/emoji/emoji_one/canned_food.png differ
diff --git a/public/images/emoji/emoji_one/canoe.png b/public/images/emoji/emoji_one/canoe.png
new file mode 100644
index 00000000000..437db967002
Binary files /dev/null and b/public/images/emoji/emoji_one/canoe.png differ
diff --git a/public/images/emoji/emoji_one/cape_verde.png b/public/images/emoji/emoji_one/cape_verde.png
new file mode 100644
index 00000000000..1252c37a6d8
Binary files /dev/null and b/public/images/emoji/emoji_one/cape_verde.png differ
diff --git a/public/images/emoji/emoji_one/capital_abcd.png b/public/images/emoji/emoji_one/capital_abcd.png
index 5ae2834d9d6..ebc5f362a59 100644
Binary files a/public/images/emoji/emoji_one/capital_abcd.png and b/public/images/emoji/emoji_one/capital_abcd.png differ
diff --git a/public/images/emoji/emoji_one/capricorn.png b/public/images/emoji/emoji_one/capricorn.png
index 3c76b4e651f..5b4b0a55241 100644
Binary files a/public/images/emoji/emoji_one/capricorn.png and b/public/images/emoji/emoji_one/capricorn.png differ
diff --git a/public/images/emoji/emoji_one/car.png b/public/images/emoji/emoji_one/car.png
new file mode 100644
index 00000000000..a5f65e3832d
Binary files /dev/null and b/public/images/emoji/emoji_one/car.png differ
diff --git a/public/images/emoji/emoji_one/card_box.png b/public/images/emoji/emoji_one/card_box.png
index 81b62f6e671..254f20b7d86 100644
Binary files a/public/images/emoji/emoji_one/card_box.png and b/public/images/emoji/emoji_one/card_box.png differ
diff --git a/public/images/emoji/emoji_one/card_file_box.png b/public/images/emoji/emoji_one/card_file_box.png
index 81b62f6e671..254f20b7d86 100644
Binary files a/public/images/emoji/emoji_one/card_file_box.png and b/public/images/emoji/emoji_one/card_file_box.png differ
diff --git a/public/images/emoji/emoji_one/card_index.png b/public/images/emoji/emoji_one/card_index.png
index b27e65f5865..af241fc9cb8 100644
Binary files a/public/images/emoji/emoji_one/card_index.png and b/public/images/emoji/emoji_one/card_index.png differ
diff --git a/public/images/emoji/emoji_one/card_index_dividers.png b/public/images/emoji/emoji_one/card_index_dividers.png
index ff648549dae..c857789b1f9 100644
Binary files a/public/images/emoji/emoji_one/card_index_dividers.png and b/public/images/emoji/emoji_one/card_index_dividers.png differ
diff --git a/public/images/emoji/emoji_one/caribbean_netherlands.png b/public/images/emoji/emoji_one/caribbean_netherlands.png
new file mode 100644
index 00000000000..7780a4a0367
Binary files /dev/null and b/public/images/emoji/emoji_one/caribbean_netherlands.png differ
diff --git a/public/images/emoji/emoji_one/carousel_horse.png b/public/images/emoji/emoji_one/carousel_horse.png
index 3da532f7d1a..bd6e669387e 100644
Binary files a/public/images/emoji/emoji_one/carousel_horse.png and b/public/images/emoji/emoji_one/carousel_horse.png differ
diff --git a/public/images/emoji/emoji_one/carrot.png b/public/images/emoji/emoji_one/carrot.png
new file mode 100644
index 00000000000..ec8c09e41b0
Binary files /dev/null and b/public/images/emoji/emoji_one/carrot.png differ
diff --git a/public/images/emoji/emoji_one/cat.png b/public/images/emoji/emoji_one/cat.png
index 498bfa6fae2..04ecf8c6142 100644
Binary files a/public/images/emoji/emoji_one/cat.png and b/public/images/emoji/emoji_one/cat.png differ
diff --git a/public/images/emoji/emoji_one/cat2.png b/public/images/emoji/emoji_one/cat2.png
index 6e6363fbcfb..dc0248526c5 100644
Binary files a/public/images/emoji/emoji_one/cat2.png and b/public/images/emoji/emoji_one/cat2.png differ
diff --git a/public/images/emoji/emoji_one/cayman_islands.png b/public/images/emoji/emoji_one/cayman_islands.png
new file mode 100644
index 00000000000..70d8309d8c6
Binary files /dev/null and b/public/images/emoji/emoji_one/cayman_islands.png differ
diff --git a/public/images/emoji/emoji_one/cd.png b/public/images/emoji/emoji_one/cd.png
index 3ae8de52246..9998df86827 100644
Binary files a/public/images/emoji/emoji_one/cd.png and b/public/images/emoji/emoji_one/cd.png differ
diff --git a/public/images/emoji/emoji_one/central_african_republic.png b/public/images/emoji/emoji_one/central_african_republic.png
new file mode 100644
index 00000000000..a344cb3ae87
Binary files /dev/null and b/public/images/emoji/emoji_one/central_african_republic.png differ
diff --git a/public/images/emoji/emoji_one/ceuta_and_melilla.png b/public/images/emoji/emoji_one/ceuta_and_melilla.png
new file mode 100644
index 00000000000..e0da30d5a6c
Binary files /dev/null and b/public/images/emoji/emoji_one/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/emoji_one/chad.png b/public/images/emoji/emoji_one/chad.png
new file mode 100644
index 00000000000..26b77c821c1
Binary files /dev/null and b/public/images/emoji/emoji_one/chad.png differ
diff --git a/public/images/emoji/emoji_one/chains.png b/public/images/emoji/emoji_one/chains.png
index 84a5b14b1c5..81f9b3d8a4c 100644
Binary files a/public/images/emoji/emoji_one/chains.png and b/public/images/emoji/emoji_one/chains.png differ
diff --git a/public/images/emoji/emoji_one/champagne.png b/public/images/emoji/emoji_one/champagne.png
index d8c1b55be00..e37ee62f717 100644
Binary files a/public/images/emoji/emoji_one/champagne.png and b/public/images/emoji/emoji_one/champagne.png differ
diff --git a/public/images/emoji/emoji_one/chart.png b/public/images/emoji/emoji_one/chart.png
index c7abdcbc67e..164dbcf05b5 100644
Binary files a/public/images/emoji/emoji_one/chart.png and b/public/images/emoji/emoji_one/chart.png differ
diff --git a/public/images/emoji/emoji_one/chart_with_downwards_trend.png b/public/images/emoji/emoji_one/chart_with_downwards_trend.png
index 0f9b1965ec4..049a95df05b 100644
Binary files a/public/images/emoji/emoji_one/chart_with_downwards_trend.png and b/public/images/emoji/emoji_one/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/emoji_one/chart_with_upwards_trend.png b/public/images/emoji/emoji_one/chart_with_upwards_trend.png
index 3fae333e488..dfb26da8471 100644
Binary files a/public/images/emoji/emoji_one/chart_with_upwards_trend.png and b/public/images/emoji/emoji_one/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/emoji_one/checkered_flag.png b/public/images/emoji/emoji_one/checkered_flag.png
index 2ba752f4b2f..0b7f1e35435 100644
Binary files a/public/images/emoji/emoji_one/checkered_flag.png and b/public/images/emoji/emoji_one/checkered_flag.png differ
diff --git a/public/images/emoji/emoji_one/cheese.png b/public/images/emoji/emoji_one/cheese.png
index c89acf97818..b3db512c842 100644
Binary files a/public/images/emoji/emoji_one/cheese.png and b/public/images/emoji/emoji_one/cheese.png differ
diff --git a/public/images/emoji/emoji_one/cheese_wedge.png b/public/images/emoji/emoji_one/cheese_wedge.png
index c89acf97818..b3db512c842 100644
Binary files a/public/images/emoji/emoji_one/cheese_wedge.png and b/public/images/emoji/emoji_one/cheese_wedge.png differ
diff --git a/public/images/emoji/emoji_one/cherries.png b/public/images/emoji/emoji_one/cherries.png
index bce51389526..e74e3a834ba 100644
Binary files a/public/images/emoji/emoji_one/cherries.png and b/public/images/emoji/emoji_one/cherries.png differ
diff --git a/public/images/emoji/emoji_one/cherry_blossom.png b/public/images/emoji/emoji_one/cherry_blossom.png
index 4a18b19e29d..fc1e7305d70 100644
Binary files a/public/images/emoji/emoji_one/cherry_blossom.png and b/public/images/emoji/emoji_one/cherry_blossom.png differ
diff --git a/public/images/emoji/emoji_one/chestnut.png b/public/images/emoji/emoji_one/chestnut.png
index 78bffdfbd5b..2bf74e110d8 100644
Binary files a/public/images/emoji/emoji_one/chestnut.png and b/public/images/emoji/emoji_one/chestnut.png differ
diff --git a/public/images/emoji/emoji_one/chicken.png b/public/images/emoji/emoji_one/chicken.png
index 3052377b21e..2e5a0a13827 100644
Binary files a/public/images/emoji/emoji_one/chicken.png and b/public/images/emoji/emoji_one/chicken.png differ
diff --git a/public/images/emoji/emoji_one/child.png b/public/images/emoji/emoji_one/child.png
new file mode 100644
index 00000000000..33e50494a3a
Binary files /dev/null and b/public/images/emoji/emoji_one/child.png differ
diff --git a/public/images/emoji/emoji_one/child/2.png b/public/images/emoji/emoji_one/child/2.png
new file mode 100644
index 00000000000..7a0e4f1cb75
Binary files /dev/null and b/public/images/emoji/emoji_one/child/2.png differ
diff --git a/public/images/emoji/emoji_one/child/3.png b/public/images/emoji/emoji_one/child/3.png
new file mode 100644
index 00000000000..81a69110e9d
Binary files /dev/null and b/public/images/emoji/emoji_one/child/3.png differ
diff --git a/public/images/emoji/emoji_one/child/4.png b/public/images/emoji/emoji_one/child/4.png
new file mode 100644
index 00000000000..b5c64c9cc84
Binary files /dev/null and b/public/images/emoji/emoji_one/child/4.png differ
diff --git a/public/images/emoji/emoji_one/child/5.png b/public/images/emoji/emoji_one/child/5.png
new file mode 100644
index 00000000000..0763a8bd94c
Binary files /dev/null and b/public/images/emoji/emoji_one/child/5.png differ
diff --git a/public/images/emoji/emoji_one/child/6.png b/public/images/emoji/emoji_one/child/6.png
new file mode 100644
index 00000000000..3ed705b9025
Binary files /dev/null and b/public/images/emoji/emoji_one/child/6.png differ
diff --git a/public/images/emoji/emoji_one/children_crossing.png b/public/images/emoji/emoji_one/children_crossing.png
index 0db76a946fb..94f5555d62c 100644
Binary files a/public/images/emoji/emoji_one/children_crossing.png and b/public/images/emoji/emoji_one/children_crossing.png differ
diff --git a/public/images/emoji/emoji_one/chile.png b/public/images/emoji/emoji_one/chile.png
new file mode 100644
index 00000000000..740d09658ed
Binary files /dev/null and b/public/images/emoji/emoji_one/chile.png differ
diff --git a/public/images/emoji/emoji_one/chipmunk.png b/public/images/emoji/emoji_one/chipmunk.png
index db1a586381c..a959f55dbef 100644
Binary files a/public/images/emoji/emoji_one/chipmunk.png and b/public/images/emoji/emoji_one/chipmunk.png differ
diff --git a/public/images/emoji/emoji_one/chocolate_bar.png b/public/images/emoji/emoji_one/chocolate_bar.png
index 33535f24928..92b21045daa 100644
Binary files a/public/images/emoji/emoji_one/chocolate_bar.png and b/public/images/emoji/emoji_one/chocolate_bar.png differ
diff --git a/public/images/emoji/emoji_one/chopsticks.png b/public/images/emoji/emoji_one/chopsticks.png
new file mode 100644
index 00000000000..3bcd601a3f5
Binary files /dev/null and b/public/images/emoji/emoji_one/chopsticks.png differ
diff --git a/public/images/emoji/emoji_one/christmas_island.png b/public/images/emoji/emoji_one/christmas_island.png
new file mode 100644
index 00000000000..6958b7d8d8f
Binary files /dev/null and b/public/images/emoji/emoji_one/christmas_island.png differ
diff --git a/public/images/emoji/emoji_one/christmas_tree.png b/public/images/emoji/emoji_one/christmas_tree.png
index 5936c300cc5..e47382cde14 100644
Binary files a/public/images/emoji/emoji_one/christmas_tree.png and b/public/images/emoji/emoji_one/christmas_tree.png differ
diff --git a/public/images/emoji/emoji_one/church.png b/public/images/emoji/emoji_one/church.png
index 3996ff2d281..69bb81241e4 100644
Binary files a/public/images/emoji/emoji_one/church.png and b/public/images/emoji/emoji_one/church.png differ
diff --git a/public/images/emoji/emoji_one/cinema.png b/public/images/emoji/emoji_one/cinema.png
index 08749700b9f..ee0d70cd100 100644
Binary files a/public/images/emoji/emoji_one/cinema.png and b/public/images/emoji/emoji_one/cinema.png differ
diff --git a/public/images/emoji/emoji_one/circus_tent.png b/public/images/emoji/emoji_one/circus_tent.png
index 4c7a8fce61b..df580e6bfb6 100644
Binary files a/public/images/emoji/emoji_one/circus_tent.png and b/public/images/emoji/emoji_one/circus_tent.png differ
diff --git a/public/images/emoji/emoji_one/city_dusk.png b/public/images/emoji/emoji_one/city_dusk.png
index 9a9a76dc8db..06856e88d0d 100644
Binary files a/public/images/emoji/emoji_one/city_dusk.png and b/public/images/emoji/emoji_one/city_dusk.png differ
diff --git a/public/images/emoji/emoji_one/city_sunrise.png b/public/images/emoji/emoji_one/city_sunrise.png
index ecc63698e3c..10343e0e947 100644
Binary files a/public/images/emoji/emoji_one/city_sunrise.png and b/public/images/emoji/emoji_one/city_sunrise.png differ
diff --git a/public/images/emoji/emoji_one/city_sunset.png b/public/images/emoji/emoji_one/city_sunset.png
index ecc63698e3c..06856e88d0d 100644
Binary files a/public/images/emoji/emoji_one/city_sunset.png and b/public/images/emoji/emoji_one/city_sunset.png differ
diff --git a/public/images/emoji/emoji_one/cityscape.png b/public/images/emoji/emoji_one/cityscape.png
index 61f1a18cb7e..ec7be994db8 100644
Binary files a/public/images/emoji/emoji_one/cityscape.png and b/public/images/emoji/emoji_one/cityscape.png differ
diff --git a/public/images/emoji/emoji_one/cl.png b/public/images/emoji/emoji_one/cl.png
index abfaf51f5f4..d575aaceacc 100644
Binary files a/public/images/emoji/emoji_one/cl.png and b/public/images/emoji/emoji_one/cl.png differ
diff --git a/public/images/emoji/emoji_one/clamp.png b/public/images/emoji/emoji_one/clamp.png
new file mode 100644
index 00000000000..936950023cc
Binary files /dev/null and b/public/images/emoji/emoji_one/clamp.png differ
diff --git a/public/images/emoji/emoji_one/clap.png b/public/images/emoji/emoji_one/clap.png
index dd66c9ab87e..96d49511f56 100644
Binary files a/public/images/emoji/emoji_one/clap.png and b/public/images/emoji/emoji_one/clap.png differ
diff --git a/public/images/emoji/emoji_one/clap/2.png b/public/images/emoji/emoji_one/clap/2.png
new file mode 100644
index 00000000000..c5e73e6d393
Binary files /dev/null and b/public/images/emoji/emoji_one/clap/2.png differ
diff --git a/public/images/emoji/emoji_one/clap/3.png b/public/images/emoji/emoji_one/clap/3.png
new file mode 100644
index 00000000000..fbe96802955
Binary files /dev/null and b/public/images/emoji/emoji_one/clap/3.png differ
diff --git a/public/images/emoji/emoji_one/clap/4.png b/public/images/emoji/emoji_one/clap/4.png
new file mode 100644
index 00000000000..46056c30c07
Binary files /dev/null and b/public/images/emoji/emoji_one/clap/4.png differ
diff --git a/public/images/emoji/emoji_one/clap/5.png b/public/images/emoji/emoji_one/clap/5.png
new file mode 100644
index 00000000000..23404f8b0cc
Binary files /dev/null and b/public/images/emoji/emoji_one/clap/5.png differ
diff --git a/public/images/emoji/emoji_one/clap/6.png b/public/images/emoji/emoji_one/clap/6.png
new file mode 100644
index 00000000000..259db111c67
Binary files /dev/null and b/public/images/emoji/emoji_one/clap/6.png differ
diff --git a/public/images/emoji/emoji_one/clapper.png b/public/images/emoji/emoji_one/clapper.png
index 90348932d1c..f2b3f78a57e 100644
Binary files a/public/images/emoji/emoji_one/clapper.png and b/public/images/emoji/emoji_one/clapper.png differ
diff --git a/public/images/emoji/emoji_one/classical_building.png b/public/images/emoji/emoji_one/classical_building.png
index 2965ac80fce..540c343c9de 100644
Binary files a/public/images/emoji/emoji_one/classical_building.png and b/public/images/emoji/emoji_one/classical_building.png differ
diff --git a/public/images/emoji/emoji_one/clinking_glasses.png b/public/images/emoji/emoji_one/clinking_glasses.png
new file mode 100644
index 00000000000..f7ee23f8ce8
Binary files /dev/null and b/public/images/emoji/emoji_one/clinking_glasses.png differ
diff --git a/public/images/emoji/emoji_one/clipboard.png b/public/images/emoji/emoji_one/clipboard.png
index 0dd1ff2ef39..534db369dd2 100644
Binary files a/public/images/emoji/emoji_one/clipboard.png and b/public/images/emoji/emoji_one/clipboard.png differ
diff --git a/public/images/emoji/emoji_one/clipperton_island.png b/public/images/emoji/emoji_one/clipperton_island.png
new file mode 100644
index 00000000000..7943b73f671
Binary files /dev/null and b/public/images/emoji/emoji_one/clipperton_island.png differ
diff --git a/public/images/emoji/emoji_one/clock.png b/public/images/emoji/emoji_one/clock.png
index e1a55310426..15b97354c53 100644
Binary files a/public/images/emoji/emoji_one/clock.png and b/public/images/emoji/emoji_one/clock.png differ
diff --git a/public/images/emoji/emoji_one/clock1.png b/public/images/emoji/emoji_one/clock1.png
index 6735c04a59a..787c7bfc7cb 100644
Binary files a/public/images/emoji/emoji_one/clock1.png and b/public/images/emoji/emoji_one/clock1.png differ
diff --git a/public/images/emoji/emoji_one/clock10.png b/public/images/emoji/emoji_one/clock10.png
index c019fa3cd97..7addbfa73b9 100644
Binary files a/public/images/emoji/emoji_one/clock10.png and b/public/images/emoji/emoji_one/clock10.png differ
diff --git a/public/images/emoji/emoji_one/clock1030.png b/public/images/emoji/emoji_one/clock1030.png
index ad639f3b3d3..dd750e85dfc 100644
Binary files a/public/images/emoji/emoji_one/clock1030.png and b/public/images/emoji/emoji_one/clock1030.png differ
diff --git a/public/images/emoji/emoji_one/clock11.png b/public/images/emoji/emoji_one/clock11.png
index 655aa05688c..d5da447a63f 100644
Binary files a/public/images/emoji/emoji_one/clock11.png and b/public/images/emoji/emoji_one/clock11.png differ
diff --git a/public/images/emoji/emoji_one/clock1130.png b/public/images/emoji/emoji_one/clock1130.png
index 6dd92a154d1..e124643d70e 100644
Binary files a/public/images/emoji/emoji_one/clock1130.png and b/public/images/emoji/emoji_one/clock1130.png differ
diff --git a/public/images/emoji/emoji_one/clock12.png b/public/images/emoji/emoji_one/clock12.png
index f545ca3d00e..8952f44d848 100644
Binary files a/public/images/emoji/emoji_one/clock12.png and b/public/images/emoji/emoji_one/clock12.png differ
diff --git a/public/images/emoji/emoji_one/clock1230.png b/public/images/emoji/emoji_one/clock1230.png
index 0f545902287..f6a69c113eb 100644
Binary files a/public/images/emoji/emoji_one/clock1230.png and b/public/images/emoji/emoji_one/clock1230.png differ
diff --git a/public/images/emoji/emoji_one/clock130.png b/public/images/emoji/emoji_one/clock130.png
index 6dba3ac2e63..910024fee3e 100644
Binary files a/public/images/emoji/emoji_one/clock130.png and b/public/images/emoji/emoji_one/clock130.png differ
diff --git a/public/images/emoji/emoji_one/clock2.png b/public/images/emoji/emoji_one/clock2.png
index c7b08011fe7..5b00062b805 100644
Binary files a/public/images/emoji/emoji_one/clock2.png and b/public/images/emoji/emoji_one/clock2.png differ
diff --git a/public/images/emoji/emoji_one/clock230.png b/public/images/emoji/emoji_one/clock230.png
index d82f4229e7f..80a8c473248 100644
Binary files a/public/images/emoji/emoji_one/clock230.png and b/public/images/emoji/emoji_one/clock230.png differ
diff --git a/public/images/emoji/emoji_one/clock3.png b/public/images/emoji/emoji_one/clock3.png
index 9b47690bfab..3dbc1cdbc73 100644
Binary files a/public/images/emoji/emoji_one/clock3.png and b/public/images/emoji/emoji_one/clock3.png differ
diff --git a/public/images/emoji/emoji_one/clock330.png b/public/images/emoji/emoji_one/clock330.png
index a83cc6d86d4..33dae81b4e2 100644
Binary files a/public/images/emoji/emoji_one/clock330.png and b/public/images/emoji/emoji_one/clock330.png differ
diff --git a/public/images/emoji/emoji_one/clock4.png b/public/images/emoji/emoji_one/clock4.png
index e650187f78d..0b7d465a06a 100644
Binary files a/public/images/emoji/emoji_one/clock4.png and b/public/images/emoji/emoji_one/clock4.png differ
diff --git a/public/images/emoji/emoji_one/clock430.png b/public/images/emoji/emoji_one/clock430.png
index 7287779813e..b3729f7bd13 100644
Binary files a/public/images/emoji/emoji_one/clock430.png and b/public/images/emoji/emoji_one/clock430.png differ
diff --git a/public/images/emoji/emoji_one/clock5.png b/public/images/emoji/emoji_one/clock5.png
index f4288d1f302..9eed97c4058 100644
Binary files a/public/images/emoji/emoji_one/clock5.png and b/public/images/emoji/emoji_one/clock5.png differ
diff --git a/public/images/emoji/emoji_one/clock530.png b/public/images/emoji/emoji_one/clock530.png
index 7ec8e7e3f5e..b3b11891c7c 100644
Binary files a/public/images/emoji/emoji_one/clock530.png and b/public/images/emoji/emoji_one/clock530.png differ
diff --git a/public/images/emoji/emoji_one/clock6.png b/public/images/emoji/emoji_one/clock6.png
index 6f829530ad0..b8f3b22e41a 100644
Binary files a/public/images/emoji/emoji_one/clock6.png and b/public/images/emoji/emoji_one/clock6.png differ
diff --git a/public/images/emoji/emoji_one/clock630.png b/public/images/emoji/emoji_one/clock630.png
index a2cf720f67c..672ab0f4748 100644
Binary files a/public/images/emoji/emoji_one/clock630.png and b/public/images/emoji/emoji_one/clock630.png differ
diff --git a/public/images/emoji/emoji_one/clock7.png b/public/images/emoji/emoji_one/clock7.png
index a8a837f204e..831bc14e2fb 100644
Binary files a/public/images/emoji/emoji_one/clock7.png and b/public/images/emoji/emoji_one/clock7.png differ
diff --git a/public/images/emoji/emoji_one/clock730.png b/public/images/emoji/emoji_one/clock730.png
index 0e5958ad917..1ecb9f0c3a0 100644
Binary files a/public/images/emoji/emoji_one/clock730.png and b/public/images/emoji/emoji_one/clock730.png differ
diff --git a/public/images/emoji/emoji_one/clock8.png b/public/images/emoji/emoji_one/clock8.png
index 6eb7c30db8c..af89853cc12 100644
Binary files a/public/images/emoji/emoji_one/clock8.png and b/public/images/emoji/emoji_one/clock8.png differ
diff --git a/public/images/emoji/emoji_one/clock830.png b/public/images/emoji/emoji_one/clock830.png
index b3855f93551..8ff34af1d4b 100644
Binary files a/public/images/emoji/emoji_one/clock830.png and b/public/images/emoji/emoji_one/clock830.png differ
diff --git a/public/images/emoji/emoji_one/clock9.png b/public/images/emoji/emoji_one/clock9.png
index 7576949ea91..ae764864b82 100644
Binary files a/public/images/emoji/emoji_one/clock9.png and b/public/images/emoji/emoji_one/clock9.png differ
diff --git a/public/images/emoji/emoji_one/clock930.png b/public/images/emoji/emoji_one/clock930.png
index 349b690ba4d..054f46c66cc 100644
Binary files a/public/images/emoji/emoji_one/clock930.png and b/public/images/emoji/emoji_one/clock930.png differ
diff --git a/public/images/emoji/emoji_one/closed_book.png b/public/images/emoji/emoji_one/closed_book.png
index 5968b4061a8..e70316f85ac 100644
Binary files a/public/images/emoji/emoji_one/closed_book.png and b/public/images/emoji/emoji_one/closed_book.png differ
diff --git a/public/images/emoji/emoji_one/closed_lock_with_key.png b/public/images/emoji/emoji_one/closed_lock_with_key.png
index 5660240d389..a3ce42143ab 100644
Binary files a/public/images/emoji/emoji_one/closed_lock_with_key.png and b/public/images/emoji/emoji_one/closed_lock_with_key.png differ
diff --git a/public/images/emoji/emoji_one/closed_umbrella.png b/public/images/emoji/emoji_one/closed_umbrella.png
index c787fd1b96f..539178e19ac 100644
Binary files a/public/images/emoji/emoji_one/closed_umbrella.png and b/public/images/emoji/emoji_one/closed_umbrella.png differ
diff --git a/public/images/emoji/emoji_one/cloud.png b/public/images/emoji/emoji_one/cloud.png
index 18e1e957e00..e0ef0925940 100644
Binary files a/public/images/emoji/emoji_one/cloud.png and b/public/images/emoji/emoji_one/cloud.png differ
diff --git a/public/images/emoji/emoji_one/cloud_lightning.png b/public/images/emoji/emoji_one/cloud_lightning.png
index 67f8e149b24..35d0748bf3c 100644
Binary files a/public/images/emoji/emoji_one/cloud_lightning.png and b/public/images/emoji/emoji_one/cloud_lightning.png differ
diff --git a/public/images/emoji/emoji_one/cloud_rain.png b/public/images/emoji/emoji_one/cloud_rain.png
index 779086b8b92..47bbb944716 100644
Binary files a/public/images/emoji/emoji_one/cloud_rain.png and b/public/images/emoji/emoji_one/cloud_rain.png differ
diff --git a/public/images/emoji/emoji_one/cloud_snow.png b/public/images/emoji/emoji_one/cloud_snow.png
index 0e298cef1cf..472220b7d2d 100644
Binary files a/public/images/emoji/emoji_one/cloud_snow.png and b/public/images/emoji/emoji_one/cloud_snow.png differ
diff --git a/public/images/emoji/emoji_one/cloud_tornado.png b/public/images/emoji/emoji_one/cloud_tornado.png
index 14169e5840c..53591a435e5 100644
Binary files a/public/images/emoji/emoji_one/cloud_tornado.png and b/public/images/emoji/emoji_one/cloud_tornado.png differ
diff --git a/public/images/emoji/emoji_one/cloud_with_lightning.png b/public/images/emoji/emoji_one/cloud_with_lightning.png
index 67f8e149b24..35d0748bf3c 100644
Binary files a/public/images/emoji/emoji_one/cloud_with_lightning.png and b/public/images/emoji/emoji_one/cloud_with_lightning.png differ
diff --git a/public/images/emoji/emoji_one/cloud_with_lightning_and_rain.png b/public/images/emoji/emoji_one/cloud_with_lightning_and_rain.png
new file mode 100644
index 00000000000..05610e8e13b
Binary files /dev/null and b/public/images/emoji/emoji_one/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/emoji_one/cloud_with_rain.png b/public/images/emoji/emoji_one/cloud_with_rain.png
index 779086b8b92..47bbb944716 100644
Binary files a/public/images/emoji/emoji_one/cloud_with_rain.png and b/public/images/emoji/emoji_one/cloud_with_rain.png differ
diff --git a/public/images/emoji/emoji_one/cloud_with_snow.png b/public/images/emoji/emoji_one/cloud_with_snow.png
index 0e298cef1cf..472220b7d2d 100644
Binary files a/public/images/emoji/emoji_one/cloud_with_snow.png and b/public/images/emoji/emoji_one/cloud_with_snow.png differ
diff --git a/public/images/emoji/emoji_one/cloud_with_tornado.png b/public/images/emoji/emoji_one/cloud_with_tornado.png
index 14169e5840c..53591a435e5 100644
Binary files a/public/images/emoji/emoji_one/cloud_with_tornado.png and b/public/images/emoji/emoji_one/cloud_with_tornado.png differ
diff --git a/public/images/emoji/emoji_one/clown_face.png b/public/images/emoji/emoji_one/clown_face.png
new file mode 100644
index 00000000000..01736e45a43
Binary files /dev/null and b/public/images/emoji/emoji_one/clown_face.png differ
diff --git a/public/images/emoji/emoji_one/clubs.png b/public/images/emoji/emoji_one/clubs.png
index c2b47ae3635..463921bc040 100644
Binary files a/public/images/emoji/emoji_one/clubs.png and b/public/images/emoji/emoji_one/clubs.png differ
diff --git a/public/images/emoji/emoji_one/cn.png b/public/images/emoji/emoji_one/cn.png
index ae5a76a9058..67efed2e4d4 100644
Binary files a/public/images/emoji/emoji_one/cn.png and b/public/images/emoji/emoji_one/cn.png differ
diff --git a/public/images/emoji/emoji_one/coat.png b/public/images/emoji/emoji_one/coat.png
new file mode 100644
index 00000000000..c409f9f4c4c
Binary files /dev/null and b/public/images/emoji/emoji_one/coat.png differ
diff --git a/public/images/emoji/emoji_one/cocktail.png b/public/images/emoji/emoji_one/cocktail.png
index 873935fc70d..ddca7935a96 100644
Binary files a/public/images/emoji/emoji_one/cocktail.png and b/public/images/emoji/emoji_one/cocktail.png differ
diff --git a/public/images/emoji/emoji_one/coconut.png b/public/images/emoji/emoji_one/coconut.png
new file mode 100644
index 00000000000..e76b533149f
Binary files /dev/null and b/public/images/emoji/emoji_one/coconut.png differ
diff --git a/public/images/emoji/emoji_one/cocos_islands.png b/public/images/emoji/emoji_one/cocos_islands.png
new file mode 100644
index 00000000000..c9025e34e4b
Binary files /dev/null and b/public/images/emoji/emoji_one/cocos_islands.png differ
diff --git a/public/images/emoji/emoji_one/coffee.png b/public/images/emoji/emoji_one/coffee.png
index 412ac4f1a48..20f649ba989 100644
Binary files a/public/images/emoji/emoji_one/coffee.png and b/public/images/emoji/emoji_one/coffee.png differ
diff --git a/public/images/emoji/emoji_one/coffin.png b/public/images/emoji/emoji_one/coffin.png
index ed2c50e400c..fc5176ef91d 100644
Binary files a/public/images/emoji/emoji_one/coffin.png and b/public/images/emoji/emoji_one/coffin.png differ
diff --git a/public/images/emoji/emoji_one/cold_sweat.png b/public/images/emoji/emoji_one/cold_sweat.png
index 5d3f29649bd..b6a51008fe9 100644
Binary files a/public/images/emoji/emoji_one/cold_sweat.png and b/public/images/emoji/emoji_one/cold_sweat.png differ
diff --git a/public/images/emoji/emoji_one/colombia.png b/public/images/emoji/emoji_one/colombia.png
new file mode 100644
index 00000000000..680f77b22d3
Binary files /dev/null and b/public/images/emoji/emoji_one/colombia.png differ
diff --git a/public/images/emoji/emoji_one/comet.png b/public/images/emoji/emoji_one/comet.png
index 44dd1ebadb2..46b4ea26a59 100644
Binary files a/public/images/emoji/emoji_one/comet.png and b/public/images/emoji/emoji_one/comet.png differ
diff --git a/public/images/emoji/emoji_one/comoros.png b/public/images/emoji/emoji_one/comoros.png
new file mode 100644
index 00000000000..e765f507156
Binary files /dev/null and b/public/images/emoji/emoji_one/comoros.png differ
diff --git a/public/images/emoji/emoji_one/compression.png b/public/images/emoji/emoji_one/compression.png
index 4c8ed99f3aa..936950023cc 100644
Binary files a/public/images/emoji/emoji_one/compression.png and b/public/images/emoji/emoji_one/compression.png differ
diff --git a/public/images/emoji/emoji_one/computer.png b/public/images/emoji/emoji_one/computer.png
index eef460f09d1..db79ece5c07 100644
Binary files a/public/images/emoji/emoji_one/computer.png and b/public/images/emoji/emoji_one/computer.png differ
diff --git a/public/images/emoji/emoji_one/computer_mouse.png b/public/images/emoji/emoji_one/computer_mouse.png
new file mode 100644
index 00000000000..0e9dfa8326a
Binary files /dev/null and b/public/images/emoji/emoji_one/computer_mouse.png differ
diff --git a/public/images/emoji/emoji_one/confetti_ball.png b/public/images/emoji/emoji_one/confetti_ball.png
index 3f7a17ff243..121ccd03fb1 100644
Binary files a/public/images/emoji/emoji_one/confetti_ball.png and b/public/images/emoji/emoji_one/confetti_ball.png differ
diff --git a/public/images/emoji/emoji_one/confounded.png b/public/images/emoji/emoji_one/confounded.png
index 7e3919d9fd8..9f57374a996 100644
Binary files a/public/images/emoji/emoji_one/confounded.png and b/public/images/emoji/emoji_one/confounded.png differ
diff --git a/public/images/emoji/emoji_one/confused.png b/public/images/emoji/emoji_one/confused.png
index 22df3a3acbe..63e6e013db7 100644
Binary files a/public/images/emoji/emoji_one/confused.png and b/public/images/emoji/emoji_one/confused.png differ
diff --git a/public/images/emoji/emoji_one/congo_brazzaville.png b/public/images/emoji/emoji_one/congo_brazzaville.png
new file mode 100644
index 00000000000..2eef1d6c176
Binary files /dev/null and b/public/images/emoji/emoji_one/congo_brazzaville.png differ
diff --git a/public/images/emoji/emoji_one/congo_kinshasa.png b/public/images/emoji/emoji_one/congo_kinshasa.png
new file mode 100644
index 00000000000..a34af9d64a3
Binary files /dev/null and b/public/images/emoji/emoji_one/congo_kinshasa.png differ
diff --git a/public/images/emoji/emoji_one/congratulations.png b/public/images/emoji/emoji_one/congratulations.png
index 48fed268765..bd47ca5a8d8 100644
Binary files a/public/images/emoji/emoji_one/congratulations.png and b/public/images/emoji/emoji_one/congratulations.png differ
diff --git a/public/images/emoji/emoji_one/construction.png b/public/images/emoji/emoji_one/construction.png
index f434054950b..458d27ec983 100644
Binary files a/public/images/emoji/emoji_one/construction.png and b/public/images/emoji/emoji_one/construction.png differ
diff --git a/public/images/emoji/emoji_one/construction_site.png b/public/images/emoji/emoji_one/construction_site.png
index 04e7fd40b9e..c4959500a27 100644
Binary files a/public/images/emoji/emoji_one/construction_site.png and b/public/images/emoji/emoji_one/construction_site.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker.png b/public/images/emoji/emoji_one/construction_worker.png
index 12907a7f20d..0b464f0625a 100644
Binary files a/public/images/emoji/emoji_one/construction_worker.png and b/public/images/emoji/emoji_one/construction_worker.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker/2.png b/public/images/emoji/emoji_one/construction_worker/2.png
new file mode 100644
index 00000000000..e6903c1f1e2
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker/3.png b/public/images/emoji/emoji_one/construction_worker/3.png
new file mode 100644
index 00000000000..3f4d0241f82
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker/4.png b/public/images/emoji/emoji_one/construction_worker/4.png
new file mode 100644
index 00000000000..acbe3b8cb57
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker/5.png b/public/images/emoji/emoji_one/construction_worker/5.png
new file mode 100644
index 00000000000..4da35b048ad
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker/6.png b/public/images/emoji/emoji_one/construction_worker/6.png
new file mode 100644
index 00000000000..367b28ae4b0
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man.png b/public/images/emoji/emoji_one/construction_worker_man.png
new file mode 100644
index 00000000000..0b464f0625a
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_man.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man/2.png b/public/images/emoji/emoji_one/construction_worker_man/2.png
new file mode 100644
index 00000000000..e6903c1f1e2
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_man/2.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man/3.png b/public/images/emoji/emoji_one/construction_worker_man/3.png
new file mode 100644
index 00000000000..3f4d0241f82
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_man/3.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man/4.png b/public/images/emoji/emoji_one/construction_worker_man/4.png
new file mode 100644
index 00000000000..acbe3b8cb57
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_man/4.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man/5.png b/public/images/emoji/emoji_one/construction_worker_man/5.png
new file mode 100644
index 00000000000..4da35b048ad
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_man/5.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man/6.png b/public/images/emoji/emoji_one/construction_worker_man/6.png
new file mode 100644
index 00000000000..367b28ae4b0
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_man/6.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman.png b/public/images/emoji/emoji_one/construction_worker_woman.png
new file mode 100644
index 00000000000..8db867b438b
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_woman.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman/2.png b/public/images/emoji/emoji_one/construction_worker_woman/2.png
new file mode 100644
index 00000000000..bb290a48252
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman/3.png b/public/images/emoji/emoji_one/construction_worker_woman/3.png
new file mode 100644
index 00000000000..12aa0b45dd8
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman/4.png b/public/images/emoji/emoji_one/construction_worker_woman/4.png
new file mode 100644
index 00000000000..18fce71a77a
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman/5.png b/public/images/emoji/emoji_one/construction_worker_woman/5.png
new file mode 100644
index 00000000000..d610198eab3
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman/6.png b/public/images/emoji/emoji_one/construction_worker_woman/6.png
new file mode 100644
index 00000000000..fa57fb7f3e7
Binary files /dev/null and b/public/images/emoji/emoji_one/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/control_knobs.png b/public/images/emoji/emoji_one/control_knobs.png
index db240f2ffaa..12b5baee1c4 100644
Binary files a/public/images/emoji/emoji_one/control_knobs.png and b/public/images/emoji/emoji_one/control_knobs.png differ
diff --git a/public/images/emoji/emoji_one/convenience_store.png b/public/images/emoji/emoji_one/convenience_store.png
index 6e6f3b2c300..26acc4ddeb1 100644
Binary files a/public/images/emoji/emoji_one/convenience_store.png and b/public/images/emoji/emoji_one/convenience_store.png differ
diff --git a/public/images/emoji/emoji_one/cook_islands.png b/public/images/emoji/emoji_one/cook_islands.png
new file mode 100644
index 00000000000..d1e4afbacae
Binary files /dev/null and b/public/images/emoji/emoji_one/cook_islands.png differ
diff --git a/public/images/emoji/emoji_one/cookie.png b/public/images/emoji/emoji_one/cookie.png
index 7408d800afd..6d168d3b195 100644
Binary files a/public/images/emoji/emoji_one/cookie.png and b/public/images/emoji/emoji_one/cookie.png differ
diff --git a/public/images/emoji/emoji_one/cool.png b/public/images/emoji/emoji_one/cool.png
index 704c014b618..7cce3caf215 100644
Binary files a/public/images/emoji/emoji_one/cool.png and b/public/images/emoji/emoji_one/cool.png differ
diff --git a/public/images/emoji/emoji_one/cop.png b/public/images/emoji/emoji_one/cop.png
index ef6a59839e6..d6cf91384ec 100644
Binary files a/public/images/emoji/emoji_one/cop.png and b/public/images/emoji/emoji_one/cop.png differ
diff --git a/public/images/emoji/emoji_one/cop/2.png b/public/images/emoji/emoji_one/cop/2.png
new file mode 100644
index 00000000000..0b83eee3307
Binary files /dev/null and b/public/images/emoji/emoji_one/cop/2.png differ
diff --git a/public/images/emoji/emoji_one/cop/3.png b/public/images/emoji/emoji_one/cop/3.png
new file mode 100644
index 00000000000..5b8dedac124
Binary files /dev/null and b/public/images/emoji/emoji_one/cop/3.png differ
diff --git a/public/images/emoji/emoji_one/cop/4.png b/public/images/emoji/emoji_one/cop/4.png
new file mode 100644
index 00000000000..f6cccf50a57
Binary files /dev/null and b/public/images/emoji/emoji_one/cop/4.png differ
diff --git a/public/images/emoji/emoji_one/cop/5.png b/public/images/emoji/emoji_one/cop/5.png
new file mode 100644
index 00000000000..ae3b2d81e65
Binary files /dev/null and b/public/images/emoji/emoji_one/cop/5.png differ
diff --git a/public/images/emoji/emoji_one/cop/6.png b/public/images/emoji/emoji_one/cop/6.png
new file mode 100644
index 00000000000..6d74f9bd251
Binary files /dev/null and b/public/images/emoji/emoji_one/cop/6.png differ
diff --git a/public/images/emoji/emoji_one/copyright.png b/public/images/emoji/emoji_one/copyright.png
index 661cfb561ff..8677728da0d 100644
Binary files a/public/images/emoji/emoji_one/copyright.png and b/public/images/emoji/emoji_one/copyright.png differ
diff --git a/public/images/emoji/emoji_one/corn.png b/public/images/emoji/emoji_one/corn.png
index c3c62aa9366..834f8ef32a2 100644
Binary files a/public/images/emoji/emoji_one/corn.png and b/public/images/emoji/emoji_one/corn.png differ
diff --git a/public/images/emoji/emoji_one/costa_rica.png b/public/images/emoji/emoji_one/costa_rica.png
new file mode 100644
index 00000000000..e6c16e4ea0b
Binary files /dev/null and b/public/images/emoji/emoji_one/costa_rica.png differ
diff --git a/public/images/emoji/emoji_one/cote_divoire.png b/public/images/emoji/emoji_one/cote_divoire.png
new file mode 100644
index 00000000000..c8e9c1eacef
Binary files /dev/null and b/public/images/emoji/emoji_one/cote_divoire.png differ
diff --git a/public/images/emoji/emoji_one/couch.png b/public/images/emoji/emoji_one/couch.png
index d4dd9c23ac0..77fa05b62f5 100644
Binary files a/public/images/emoji/emoji_one/couch.png and b/public/images/emoji/emoji_one/couch.png differ
diff --git a/public/images/emoji/emoji_one/couch_and_lamp.png b/public/images/emoji/emoji_one/couch_and_lamp.png
index d4dd9c23ac0..77fa05b62f5 100644
Binary files a/public/images/emoji/emoji_one/couch_and_lamp.png and b/public/images/emoji/emoji_one/couch_and_lamp.png differ
diff --git a/public/images/emoji/emoji_one/couple.png b/public/images/emoji/emoji_one/couple.png
index ac363157b82..b664d1ca4bc 100644
Binary files a/public/images/emoji/emoji_one/couple.png and b/public/images/emoji/emoji_one/couple.png differ
diff --git a/public/images/emoji/emoji_one/couple_with_heart.png b/public/images/emoji/emoji_one/couple_with_heart.png
index c6d056f2cb6..f4d1ce0c37d 100644
Binary files a/public/images/emoji/emoji_one/couple_with_heart.png and b/public/images/emoji/emoji_one/couple_with_heart.png differ
diff --git a/public/images/emoji/emoji_one/couple_with_heart_man_man.png b/public/images/emoji/emoji_one/couple_with_heart_man_man.png
new file mode 100644
index 00000000000..c8b688db392
Binary files /dev/null and b/public/images/emoji/emoji_one/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/emoji_one/couple_with_heart_woman_man.png b/public/images/emoji/emoji_one/couple_with_heart_woman_man.png
new file mode 100644
index 00000000000..f4d1ce0c37d
Binary files /dev/null and b/public/images/emoji/emoji_one/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/emoji_one/couple_with_heart_woman_woman.png b/public/images/emoji/emoji_one/couple_with_heart_woman_woman.png
new file mode 100644
index 00000000000..8f47f828f3b
Binary files /dev/null and b/public/images/emoji/emoji_one/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/emoji_one/couplekiss.png b/public/images/emoji/emoji_one/couplekiss.png
index 03c9d7f01f8..dae18ed1db9 100644
Binary files a/public/images/emoji/emoji_one/couplekiss.png and b/public/images/emoji/emoji_one/couplekiss.png differ
diff --git a/public/images/emoji/emoji_one/couplekiss_man_man.png b/public/images/emoji/emoji_one/couplekiss_man_man.png
new file mode 100644
index 00000000000..851abf3341a
Binary files /dev/null and b/public/images/emoji/emoji_one/couplekiss_man_man.png differ
diff --git a/public/images/emoji/emoji_one/couplekiss_man_woman.png b/public/images/emoji/emoji_one/couplekiss_man_woman.png
new file mode 100644
index 00000000000..dae18ed1db9
Binary files /dev/null and b/public/images/emoji/emoji_one/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/emoji_one/couplekiss_woman_woman.png b/public/images/emoji/emoji_one/couplekiss_woman_woman.png
new file mode 100644
index 00000000000..ca34f3376b1
Binary files /dev/null and b/public/images/emoji/emoji_one/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/emoji_one/cow.png b/public/images/emoji/emoji_one/cow.png
index 7dc8742ee77..fd27cfec335 100644
Binary files a/public/images/emoji/emoji_one/cow.png and b/public/images/emoji/emoji_one/cow.png differ
diff --git a/public/images/emoji/emoji_one/cow2.png b/public/images/emoji/emoji_one/cow2.png
index 50026527f39..edb47a9bed5 100644
Binary files a/public/images/emoji/emoji_one/cow2.png and b/public/images/emoji/emoji_one/cow2.png differ
diff --git a/public/images/emoji/emoji_one/cowboy_hat_face.png b/public/images/emoji/emoji_one/cowboy_hat_face.png
new file mode 100644
index 00000000000..389ac97c455
Binary files /dev/null and b/public/images/emoji/emoji_one/cowboy_hat_face.png differ
diff --git a/public/images/emoji/emoji_one/crab.png b/public/images/emoji/emoji_one/crab.png
index d74c9ad5e9c..86dec29115b 100644
Binary files a/public/images/emoji/emoji_one/crab.png and b/public/images/emoji/emoji_one/crab.png differ
diff --git a/public/images/emoji/emoji_one/crayon.png b/public/images/emoji/emoji_one/crayon.png
index 25d67f1d768..73a729d9873 100644
Binary files a/public/images/emoji/emoji_one/crayon.png and b/public/images/emoji/emoji_one/crayon.png differ
diff --git a/public/images/emoji/emoji_one/crazy_face.png b/public/images/emoji/emoji_one/crazy_face.png
new file mode 100644
index 00000000000..0aaa1cf7651
Binary files /dev/null and b/public/images/emoji/emoji_one/crazy_face.png differ
diff --git a/public/images/emoji/emoji_one/credit_card.png b/public/images/emoji/emoji_one/credit_card.png
index 6a38cf4dedc..0bc2ca1a98a 100644
Binary files a/public/images/emoji/emoji_one/credit_card.png and b/public/images/emoji/emoji_one/credit_card.png differ
diff --git a/public/images/emoji/emoji_one/crescent_moon.png b/public/images/emoji/emoji_one/crescent_moon.png
index cdfede55234..d793f37d46f 100644
Binary files a/public/images/emoji/emoji_one/crescent_moon.png and b/public/images/emoji/emoji_one/crescent_moon.png differ
diff --git a/public/images/emoji/emoji_one/cricket.png b/public/images/emoji/emoji_one/cricket.png
index 6deddbed425..293f5d891dd 100644
Binary files a/public/images/emoji/emoji_one/cricket.png and b/public/images/emoji/emoji_one/cricket.png differ
diff --git a/public/images/emoji/emoji_one/cricket_bat_and_ball.png b/public/images/emoji/emoji_one/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..293f5d891dd
Binary files /dev/null and b/public/images/emoji/emoji_one/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/emoji_one/cricket_bat_ball.png b/public/images/emoji/emoji_one/cricket_bat_ball.png
index 6deddbed425..293f5d891dd 100644
Binary files a/public/images/emoji/emoji_one/cricket_bat_ball.png and b/public/images/emoji/emoji_one/cricket_bat_ball.png differ
diff --git a/public/images/emoji/emoji_one/croatia.png b/public/images/emoji/emoji_one/croatia.png
new file mode 100644
index 00000000000..6cc9a0e7485
Binary files /dev/null and b/public/images/emoji/emoji_one/croatia.png differ
diff --git a/public/images/emoji/emoji_one/crocodile.png b/public/images/emoji/emoji_one/crocodile.png
index 890b923fd9b..10a920d0e36 100644
Binary files a/public/images/emoji/emoji_one/crocodile.png and b/public/images/emoji/emoji_one/crocodile.png differ
diff --git a/public/images/emoji/emoji_one/croissant.png b/public/images/emoji/emoji_one/croissant.png
new file mode 100644
index 00000000000..f9ba6cdba5e
Binary files /dev/null and b/public/images/emoji/emoji_one/croissant.png differ
diff --git a/public/images/emoji/emoji_one/cross.png b/public/images/emoji/emoji_one/cross.png
index 5a331bcf4c8..01917085040 100644
Binary files a/public/images/emoji/emoji_one/cross.png and b/public/images/emoji/emoji_one/cross.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers.png b/public/images/emoji/emoji_one/crossed_fingers.png
new file mode 100644
index 00000000000..dc7d90c370b
Binary files /dev/null and b/public/images/emoji/emoji_one/crossed_fingers.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers/2.png b/public/images/emoji/emoji_one/crossed_fingers/2.png
new file mode 100644
index 00000000000..9e9e1666dce
Binary files /dev/null and b/public/images/emoji/emoji_one/crossed_fingers/2.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers/3.png b/public/images/emoji/emoji_one/crossed_fingers/3.png
new file mode 100644
index 00000000000..f7caf658000
Binary files /dev/null and b/public/images/emoji/emoji_one/crossed_fingers/3.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers/4.png b/public/images/emoji/emoji_one/crossed_fingers/4.png
new file mode 100644
index 00000000000..22e97a67234
Binary files /dev/null and b/public/images/emoji/emoji_one/crossed_fingers/4.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers/5.png b/public/images/emoji/emoji_one/crossed_fingers/5.png
new file mode 100644
index 00000000000..f847d3d9b3b
Binary files /dev/null and b/public/images/emoji/emoji_one/crossed_fingers/5.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers/6.png b/public/images/emoji/emoji_one/crossed_fingers/6.png
new file mode 100644
index 00000000000..e9bf6498ad3
Binary files /dev/null and b/public/images/emoji/emoji_one/crossed_fingers/6.png differ
diff --git a/public/images/emoji/emoji_one/crossed_flags.png b/public/images/emoji/emoji_one/crossed_flags.png
index 8d51da084f2..8273115c531 100644
Binary files a/public/images/emoji/emoji_one/crossed_flags.png and b/public/images/emoji/emoji_one/crossed_flags.png differ
diff --git a/public/images/emoji/emoji_one/crossed_swords.png b/public/images/emoji/emoji_one/crossed_swords.png
index 2daa31e6aa6..0ca28205c21 100644
Binary files a/public/images/emoji/emoji_one/crossed_swords.png and b/public/images/emoji/emoji_one/crossed_swords.png differ
diff --git a/public/images/emoji/emoji_one/crown.png b/public/images/emoji/emoji_one/crown.png
index 834f299e4a6..752da092578 100644
Binary files a/public/images/emoji/emoji_one/crown.png and b/public/images/emoji/emoji_one/crown.png differ
diff --git a/public/images/emoji/emoji_one/cruise_ship.png b/public/images/emoji/emoji_one/cruise_ship.png
index c77f1c88dd2..8a05089fbb1 100644
Binary files a/public/images/emoji/emoji_one/cruise_ship.png and b/public/images/emoji/emoji_one/cruise_ship.png differ
diff --git a/public/images/emoji/emoji_one/cry.png b/public/images/emoji/emoji_one/cry.png
index eb779502560..b865f00cd0f 100644
Binary files a/public/images/emoji/emoji_one/cry.png and b/public/images/emoji/emoji_one/cry.png differ
diff --git a/public/images/emoji/emoji_one/crying_cat_face.png b/public/images/emoji/emoji_one/crying_cat_face.png
index e54ecd362de..827b464f305 100644
Binary files a/public/images/emoji/emoji_one/crying_cat_face.png and b/public/images/emoji/emoji_one/crying_cat_face.png differ
diff --git a/public/images/emoji/emoji_one/crystal_ball.png b/public/images/emoji/emoji_one/crystal_ball.png
index c77ac9beb05..9a1e2b08d6e 100644
Binary files a/public/images/emoji/emoji_one/crystal_ball.png and b/public/images/emoji/emoji_one/crystal_ball.png differ
diff --git a/public/images/emoji/emoji_one/cuba.png b/public/images/emoji/emoji_one/cuba.png
new file mode 100644
index 00000000000..4436dee31e9
Binary files /dev/null and b/public/images/emoji/emoji_one/cuba.png differ
diff --git a/public/images/emoji/emoji_one/cucumber.png b/public/images/emoji/emoji_one/cucumber.png
new file mode 100644
index 00000000000..5952da12b98
Binary files /dev/null and b/public/images/emoji/emoji_one/cucumber.png differ
diff --git a/public/images/emoji/emoji_one/cup_with_straw.png b/public/images/emoji/emoji_one/cup_with_straw.png
new file mode 100644
index 00000000000..4b2f313f9b2
Binary files /dev/null and b/public/images/emoji/emoji_one/cup_with_straw.png differ
diff --git a/public/images/emoji/emoji_one/cupid.png b/public/images/emoji/emoji_one/cupid.png
index f3219246634..34b77b62537 100644
Binary files a/public/images/emoji/emoji_one/cupid.png and b/public/images/emoji/emoji_one/cupid.png differ
diff --git a/public/images/emoji/emoji_one/curacao.png b/public/images/emoji/emoji_one/curacao.png
new file mode 100644
index 00000000000..e29bde1f8b5
Binary files /dev/null and b/public/images/emoji/emoji_one/curacao.png differ
diff --git a/public/images/emoji/emoji_one/curling_stone.png b/public/images/emoji/emoji_one/curling_stone.png
new file mode 100644
index 00000000000..7e8795ae185
Binary files /dev/null and b/public/images/emoji/emoji_one/curling_stone.png differ
diff --git a/public/images/emoji/emoji_one/curly_loop.png b/public/images/emoji/emoji_one/curly_loop.png
index 8039f2391a2..c5dd4656b5f 100644
Binary files a/public/images/emoji/emoji_one/curly_loop.png and b/public/images/emoji/emoji_one/curly_loop.png differ
diff --git a/public/images/emoji/emoji_one/currency_exchange.png b/public/images/emoji/emoji_one/currency_exchange.png
index af7706bb991..fad42cbf2f8 100644
Binary files a/public/images/emoji/emoji_one/currency_exchange.png and b/public/images/emoji/emoji_one/currency_exchange.png differ
diff --git a/public/images/emoji/emoji_one/curry.png b/public/images/emoji/emoji_one/curry.png
index 16202871f6b..93507d20ede 100644
Binary files a/public/images/emoji/emoji_one/curry.png and b/public/images/emoji/emoji_one/curry.png differ
diff --git a/public/images/emoji/emoji_one/custard.png b/public/images/emoji/emoji_one/custard.png
index 8f126c9e952..ec2502a8330 100644
Binary files a/public/images/emoji/emoji_one/custard.png and b/public/images/emoji/emoji_one/custard.png differ
diff --git a/public/images/emoji/emoji_one/customs.png b/public/images/emoji/emoji_one/customs.png
index 8f24502438d..0fffe6df28f 100644
Binary files a/public/images/emoji/emoji_one/customs.png and b/public/images/emoji/emoji_one/customs.png differ
diff --git a/public/images/emoji/emoji_one/cut_of_meat.png b/public/images/emoji/emoji_one/cut_of_meat.png
new file mode 100644
index 00000000000..57fe5d182ef
Binary files /dev/null and b/public/images/emoji/emoji_one/cut_of_meat.png differ
diff --git a/public/images/emoji/emoji_one/cyclone.png b/public/images/emoji/emoji_one/cyclone.png
index 54c33c736b1..13384277ab7 100644
Binary files a/public/images/emoji/emoji_one/cyclone.png and b/public/images/emoji/emoji_one/cyclone.png differ
diff --git a/public/images/emoji/emoji_one/cyprus.png b/public/images/emoji/emoji_one/cyprus.png
new file mode 100644
index 00000000000..7f80f4ed578
Binary files /dev/null and b/public/images/emoji/emoji_one/cyprus.png differ
diff --git a/public/images/emoji/emoji_one/czech_republic.png b/public/images/emoji/emoji_one/czech_republic.png
new file mode 100644
index 00000000000..88558e4ab2a
Binary files /dev/null and b/public/images/emoji/emoji_one/czech_republic.png differ
diff --git a/public/images/emoji/emoji_one/dagger.png b/public/images/emoji/emoji_one/dagger.png
index a8d18788de9..b42219a3714 100644
Binary files a/public/images/emoji/emoji_one/dagger.png and b/public/images/emoji/emoji_one/dagger.png differ
diff --git a/public/images/emoji/emoji_one/dagger_knife.png b/public/images/emoji/emoji_one/dagger_knife.png
index a8d18788de9..b42219a3714 100644
Binary files a/public/images/emoji/emoji_one/dagger_knife.png and b/public/images/emoji/emoji_one/dagger_knife.png differ
diff --git a/public/images/emoji/emoji_one/dancer.png b/public/images/emoji/emoji_one/dancer.png
index efd320be456..fbfed2500aa 100644
Binary files a/public/images/emoji/emoji_one/dancer.png and b/public/images/emoji/emoji_one/dancer.png differ
diff --git a/public/images/emoji/emoji_one/dancer/2.png b/public/images/emoji/emoji_one/dancer/2.png
new file mode 100644
index 00000000000..0670be72945
Binary files /dev/null and b/public/images/emoji/emoji_one/dancer/2.png differ
diff --git a/public/images/emoji/emoji_one/dancer/3.png b/public/images/emoji/emoji_one/dancer/3.png
new file mode 100644
index 00000000000..a57bc146cc1
Binary files /dev/null and b/public/images/emoji/emoji_one/dancer/3.png differ
diff --git a/public/images/emoji/emoji_one/dancer/4.png b/public/images/emoji/emoji_one/dancer/4.png
new file mode 100644
index 00000000000..05d419e7e2f
Binary files /dev/null and b/public/images/emoji/emoji_one/dancer/4.png differ
diff --git a/public/images/emoji/emoji_one/dancer/5.png b/public/images/emoji/emoji_one/dancer/5.png
new file mode 100644
index 00000000000..f3daf877049
Binary files /dev/null and b/public/images/emoji/emoji_one/dancer/5.png differ
diff --git a/public/images/emoji/emoji_one/dancer/6.png b/public/images/emoji/emoji_one/dancer/6.png
new file mode 100644
index 00000000000..73ebeafcd13
Binary files /dev/null and b/public/images/emoji/emoji_one/dancer/6.png differ
diff --git a/public/images/emoji/emoji_one/dancers.png b/public/images/emoji/emoji_one/dancers.png
index e454b080d94..2ec8588575d 100644
Binary files a/public/images/emoji/emoji_one/dancers.png and b/public/images/emoji/emoji_one/dancers.png differ
diff --git a/public/images/emoji/emoji_one/dancing_men.png b/public/images/emoji/emoji_one/dancing_men.png
new file mode 100644
index 00000000000..3d42f55004b
Binary files /dev/null and b/public/images/emoji/emoji_one/dancing_men.png differ
diff --git a/public/images/emoji/emoji_one/dancing_women.png b/public/images/emoji/emoji_one/dancing_women.png
new file mode 100644
index 00000000000..2ec8588575d
Binary files /dev/null and b/public/images/emoji/emoji_one/dancing_women.png differ
diff --git a/public/images/emoji/emoji_one/dango.png b/public/images/emoji/emoji_one/dango.png
index 9b323d87e34..89eaa5eef36 100644
Binary files a/public/images/emoji/emoji_one/dango.png and b/public/images/emoji/emoji_one/dango.png differ
diff --git a/public/images/emoji/emoji_one/dark_sunglasses.png b/public/images/emoji/emoji_one/dark_sunglasses.png
index 2e25e2fd32d..295f83c3642 100644
Binary files a/public/images/emoji/emoji_one/dark_sunglasses.png and b/public/images/emoji/emoji_one/dark_sunglasses.png differ
diff --git a/public/images/emoji/emoji_one/dart.png b/public/images/emoji/emoji_one/dart.png
index 8cba63590e6..0106aecb9a8 100644
Binary files a/public/images/emoji/emoji_one/dart.png and b/public/images/emoji/emoji_one/dart.png differ
diff --git a/public/images/emoji/emoji_one/dash.png b/public/images/emoji/emoji_one/dash.png
index 3ffc59ef740..b591bb1a1d1 100644
Binary files a/public/images/emoji/emoji_one/dash.png and b/public/images/emoji/emoji_one/dash.png differ
diff --git a/public/images/emoji/emoji_one/date.png b/public/images/emoji/emoji_one/date.png
index fdaa9b096e3..84fd15a36a0 100644
Binary files a/public/images/emoji/emoji_one/date.png and b/public/images/emoji/emoji_one/date.png differ
diff --git a/public/images/emoji/emoji_one/de.png b/public/images/emoji/emoji_one/de.png
index 352b049a12e..746bf11011c 100644
Binary files a/public/images/emoji/emoji_one/de.png and b/public/images/emoji/emoji_one/de.png differ
diff --git a/public/images/emoji/emoji_one/deciduous_tree.png b/public/images/emoji/emoji_one/deciduous_tree.png
index 01a76dc1165..3211a6dadc8 100644
Binary files a/public/images/emoji/emoji_one/deciduous_tree.png and b/public/images/emoji/emoji_one/deciduous_tree.png differ
diff --git a/public/images/emoji/emoji_one/deer.png b/public/images/emoji/emoji_one/deer.png
new file mode 100644
index 00000000000..c43fbfb6467
Binary files /dev/null and b/public/images/emoji/emoji_one/deer.png differ
diff --git a/public/images/emoji/emoji_one/denmark.png b/public/images/emoji/emoji_one/denmark.png
new file mode 100644
index 00000000000..821499e02c7
Binary files /dev/null and b/public/images/emoji/emoji_one/denmark.png differ
diff --git a/public/images/emoji/emoji_one/department_store.png b/public/images/emoji/emoji_one/department_store.png
index ac053b98719..14b45496c4e 100644
Binary files a/public/images/emoji/emoji_one/department_store.png and b/public/images/emoji/emoji_one/department_store.png differ
diff --git a/public/images/emoji/emoji_one/derelict_house.png b/public/images/emoji/emoji_one/derelict_house.png
new file mode 100644
index 00000000000..64245d87a28
Binary files /dev/null and b/public/images/emoji/emoji_one/derelict_house.png differ
diff --git a/public/images/emoji/emoji_one/derelict_house_building.png b/public/images/emoji/emoji_one/derelict_house_building.png
index 46775f0e723..64245d87a28 100644
Binary files a/public/images/emoji/emoji_one/derelict_house_building.png and b/public/images/emoji/emoji_one/derelict_house_building.png differ
diff --git a/public/images/emoji/emoji_one/desert.png b/public/images/emoji/emoji_one/desert.png
index a5917353fa6..69d58e5a49d 100644
Binary files a/public/images/emoji/emoji_one/desert.png and b/public/images/emoji/emoji_one/desert.png differ
diff --git a/public/images/emoji/emoji_one/desert_island.png b/public/images/emoji/emoji_one/desert_island.png
index 31cd39ce484..066667053a4 100644
Binary files a/public/images/emoji/emoji_one/desert_island.png and b/public/images/emoji/emoji_one/desert_island.png differ
diff --git a/public/images/emoji/emoji_one/desktop.png b/public/images/emoji/emoji_one/desktop.png
index 2ef52b8ba0c..ecae3d3f68c 100644
Binary files a/public/images/emoji/emoji_one/desktop.png and b/public/images/emoji/emoji_one/desktop.png differ
diff --git a/public/images/emoji/emoji_one/desktop_computer.png b/public/images/emoji/emoji_one/desktop_computer.png
index 2ef52b8ba0c..ecae3d3f68c 100644
Binary files a/public/images/emoji/emoji_one/desktop_computer.png and b/public/images/emoji/emoji_one/desktop_computer.png differ
diff --git a/public/images/emoji/emoji_one/diamond_shape_with_a_dot_inside.png b/public/images/emoji/emoji_one/diamond_shape_with_a_dot_inside.png
index bf83a30e5b9..3ca415aae8e 100644
Binary files a/public/images/emoji/emoji_one/diamond_shape_with_a_dot_inside.png and b/public/images/emoji/emoji_one/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/emoji_one/diamonds.png b/public/images/emoji/emoji_one/diamonds.png
index 25358c7aeff..474655ee656 100644
Binary files a/public/images/emoji/emoji_one/diamonds.png and b/public/images/emoji/emoji_one/diamonds.png differ
diff --git a/public/images/emoji/emoji_one/diego_garcia.png b/public/images/emoji/emoji_one/diego_garcia.png
new file mode 100644
index 00000000000..881e01a927f
Binary files /dev/null and b/public/images/emoji/emoji_one/diego_garcia.png differ
diff --git a/public/images/emoji/emoji_one/disappointed.png b/public/images/emoji/emoji_one/disappointed.png
index 24e36a2796b..5d5d8cfbc92 100644
Binary files a/public/images/emoji/emoji_one/disappointed.png and b/public/images/emoji/emoji_one/disappointed.png differ
diff --git a/public/images/emoji/emoji_one/disappointed_relieved.png b/public/images/emoji/emoji_one/disappointed_relieved.png
index 05477a893ce..e21683c159e 100644
Binary files a/public/images/emoji/emoji_one/disappointed_relieved.png and b/public/images/emoji/emoji_one/disappointed_relieved.png differ
diff --git a/public/images/emoji/emoji_one/dividers.png b/public/images/emoji/emoji_one/dividers.png
index ff648549dae..c857789b1f9 100644
Binary files a/public/images/emoji/emoji_one/dividers.png and b/public/images/emoji/emoji_one/dividers.png differ
diff --git a/public/images/emoji/emoji_one/dizzy.png b/public/images/emoji/emoji_one/dizzy.png
index 9f4659ab6ec..126252c1d13 100644
Binary files a/public/images/emoji/emoji_one/dizzy.png and b/public/images/emoji/emoji_one/dizzy.png differ
diff --git a/public/images/emoji/emoji_one/dizzy_face.png b/public/images/emoji/emoji_one/dizzy_face.png
index 5cdc098eb5d..7349653ee36 100644
Binary files a/public/images/emoji/emoji_one/dizzy_face.png and b/public/images/emoji/emoji_one/dizzy_face.png differ
diff --git a/public/images/emoji/emoji_one/djibouti.png b/public/images/emoji/emoji_one/djibouti.png
new file mode 100644
index 00000000000..606fe6a1ee5
Binary files /dev/null and b/public/images/emoji/emoji_one/djibouti.png differ
diff --git a/public/images/emoji/emoji_one/do_not_litter.png b/public/images/emoji/emoji_one/do_not_litter.png
index 618dfb92174..0779babfded 100644
Binary files a/public/images/emoji/emoji_one/do_not_litter.png and b/public/images/emoji/emoji_one/do_not_litter.png differ
diff --git a/public/images/emoji/emoji_one/dog.png b/public/images/emoji/emoji_one/dog.png
index 89e114201ef..2675fc29ca9 100644
Binary files a/public/images/emoji/emoji_one/dog.png and b/public/images/emoji/emoji_one/dog.png differ
diff --git a/public/images/emoji/emoji_one/dog2.png b/public/images/emoji/emoji_one/dog2.png
index e4cc3aec457..e7c6582e74d 100644
Binary files a/public/images/emoji/emoji_one/dog2.png and b/public/images/emoji/emoji_one/dog2.png differ
diff --git a/public/images/emoji/emoji_one/dollar.png b/public/images/emoji/emoji_one/dollar.png
index c564febe617..c212aac1ec4 100644
Binary files a/public/images/emoji/emoji_one/dollar.png and b/public/images/emoji/emoji_one/dollar.png differ
diff --git a/public/images/emoji/emoji_one/dolls.png b/public/images/emoji/emoji_one/dolls.png
index 8745e993507..8dda7e3d656 100644
Binary files a/public/images/emoji/emoji_one/dolls.png and b/public/images/emoji/emoji_one/dolls.png differ
diff --git a/public/images/emoji/emoji_one/dolphin.png b/public/images/emoji/emoji_one/dolphin.png
index 74f10783df9..0daf014af27 100644
Binary files a/public/images/emoji/emoji_one/dolphin.png and b/public/images/emoji/emoji_one/dolphin.png differ
diff --git a/public/images/emoji/emoji_one/dominica.png b/public/images/emoji/emoji_one/dominica.png
new file mode 100644
index 00000000000..588ece3f433
Binary files /dev/null and b/public/images/emoji/emoji_one/dominica.png differ
diff --git a/public/images/emoji/emoji_one/dominican_republic.png b/public/images/emoji/emoji_one/dominican_republic.png
new file mode 100644
index 00000000000..de48ff449ca
Binary files /dev/null and b/public/images/emoji/emoji_one/dominican_republic.png differ
diff --git a/public/images/emoji/emoji_one/door.png b/public/images/emoji/emoji_one/door.png
index f5a63643c68..084f2a654cd 100644
Binary files a/public/images/emoji/emoji_one/door.png and b/public/images/emoji/emoji_one/door.png differ
diff --git a/public/images/emoji/emoji_one/double_vertical_bar.png b/public/images/emoji/emoji_one/double_vertical_bar.png
index 37b536aaef2..eaff9c506b3 100644
Binary files a/public/images/emoji/emoji_one/double_vertical_bar.png and b/public/images/emoji/emoji_one/double_vertical_bar.png differ
diff --git a/public/images/emoji/emoji_one/doughnut.png b/public/images/emoji/emoji_one/doughnut.png
index eac6ec7d91f..46bdbfdeb60 100644
Binary files a/public/images/emoji/emoji_one/doughnut.png and b/public/images/emoji/emoji_one/doughnut.png differ
diff --git a/public/images/emoji/emoji_one/dove.png b/public/images/emoji/emoji_one/dove.png
index f610107f2ab..59c55b0bd56 100644
Binary files a/public/images/emoji/emoji_one/dove.png and b/public/images/emoji/emoji_one/dove.png differ
diff --git a/public/images/emoji/emoji_one/dove_of_peace.png b/public/images/emoji/emoji_one/dove_of_peace.png
index f610107f2ab..59c55b0bd56 100644
Binary files a/public/images/emoji/emoji_one/dove_of_peace.png and b/public/images/emoji/emoji_one/dove_of_peace.png differ
diff --git a/public/images/emoji/emoji_one/dragon.png b/public/images/emoji/emoji_one/dragon.png
index 60753f3e9a6..d05022d5ef6 100644
Binary files a/public/images/emoji/emoji_one/dragon.png and b/public/images/emoji/emoji_one/dragon.png differ
diff --git a/public/images/emoji/emoji_one/dragon_face.png b/public/images/emoji/emoji_one/dragon_face.png
index 913bb85498a..08ce4861feb 100644
Binary files a/public/images/emoji/emoji_one/dragon_face.png and b/public/images/emoji/emoji_one/dragon_face.png differ
diff --git a/public/images/emoji/emoji_one/dress.png b/public/images/emoji/emoji_one/dress.png
index 995cac971e9..95069435fcd 100644
Binary files a/public/images/emoji/emoji_one/dress.png and b/public/images/emoji/emoji_one/dress.png differ
diff --git a/public/images/emoji/emoji_one/dromedary_camel.png b/public/images/emoji/emoji_one/dromedary_camel.png
index c6a571f40cf..34d6b82a00b 100644
Binary files a/public/images/emoji/emoji_one/dromedary_camel.png and b/public/images/emoji/emoji_one/dromedary_camel.png differ
diff --git a/public/images/emoji/emoji_one/drooling_face.png b/public/images/emoji/emoji_one/drooling_face.png
new file mode 100644
index 00000000000..8e07532e794
Binary files /dev/null and b/public/images/emoji/emoji_one/drooling_face.png differ
diff --git a/public/images/emoji/emoji_one/droplet.png b/public/images/emoji/emoji_one/droplet.png
index c08ee9fd8f6..4f1443e1363 100644
Binary files a/public/images/emoji/emoji_one/droplet.png and b/public/images/emoji/emoji_one/droplet.png differ
diff --git a/public/images/emoji/emoji_one/drum.png b/public/images/emoji/emoji_one/drum.png
new file mode 100644
index 00000000000..8cebdb4bc90
Binary files /dev/null and b/public/images/emoji/emoji_one/drum.png differ
diff --git a/public/images/emoji/emoji_one/duck.png b/public/images/emoji/emoji_one/duck.png
new file mode 100644
index 00000000000..04343bb0b29
Binary files /dev/null and b/public/images/emoji/emoji_one/duck.png differ
diff --git a/public/images/emoji/emoji_one/dumpling.png b/public/images/emoji/emoji_one/dumpling.png
new file mode 100644
index 00000000000..45150c00d5d
Binary files /dev/null and b/public/images/emoji/emoji_one/dumpling.png differ
diff --git a/public/images/emoji/emoji_one/dvd.png b/public/images/emoji/emoji_one/dvd.png
index c42208fb1b9..ea73336a8bb 100644
Binary files a/public/images/emoji/emoji_one/dvd.png and b/public/images/emoji/emoji_one/dvd.png differ
diff --git a/public/images/emoji/emoji_one/e-mail.png b/public/images/emoji/emoji_one/e-mail.png
index 3b3ed0f40ac..4255a4cbb1d 100644
Binary files a/public/images/emoji/emoji_one/e-mail.png and b/public/images/emoji/emoji_one/e-mail.png differ
diff --git a/public/images/emoji/emoji_one/eagle.png b/public/images/emoji/emoji_one/eagle.png
new file mode 100644
index 00000000000..c8593205d99
Binary files /dev/null and b/public/images/emoji/emoji_one/eagle.png differ
diff --git a/public/images/emoji/emoji_one/ear.png b/public/images/emoji/emoji_one/ear.png
index 115da78b0c3..e4daa860ebe 100644
Binary files a/public/images/emoji/emoji_one/ear.png and b/public/images/emoji/emoji_one/ear.png differ
diff --git a/public/images/emoji/emoji_one/ear/2.png b/public/images/emoji/emoji_one/ear/2.png
new file mode 100644
index 00000000000..3d6b2b71786
Binary files /dev/null and b/public/images/emoji/emoji_one/ear/2.png differ
diff --git a/public/images/emoji/emoji_one/ear/3.png b/public/images/emoji/emoji_one/ear/3.png
new file mode 100644
index 00000000000..2634e607a6e
Binary files /dev/null and b/public/images/emoji/emoji_one/ear/3.png differ
diff --git a/public/images/emoji/emoji_one/ear/4.png b/public/images/emoji/emoji_one/ear/4.png
new file mode 100644
index 00000000000..7a7f3dea190
Binary files /dev/null and b/public/images/emoji/emoji_one/ear/4.png differ
diff --git a/public/images/emoji/emoji_one/ear/5.png b/public/images/emoji/emoji_one/ear/5.png
new file mode 100644
index 00000000000..59fbe520538
Binary files /dev/null and b/public/images/emoji/emoji_one/ear/5.png differ
diff --git a/public/images/emoji/emoji_one/ear/6.png b/public/images/emoji/emoji_one/ear/6.png
new file mode 100644
index 00000000000..26401ce434e
Binary files /dev/null and b/public/images/emoji/emoji_one/ear/6.png differ
diff --git a/public/images/emoji/emoji_one/ear_of_rice.png b/public/images/emoji/emoji_one/ear_of_rice.png
index 5b0b2001266..e82d202d010 100644
Binary files a/public/images/emoji/emoji_one/ear_of_rice.png and b/public/images/emoji/emoji_one/ear_of_rice.png differ
diff --git a/public/images/emoji/emoji_one/earth_africa.png b/public/images/emoji/emoji_one/earth_africa.png
index 07b1e95ace8..255bddd87a3 100644
Binary files a/public/images/emoji/emoji_one/earth_africa.png and b/public/images/emoji/emoji_one/earth_africa.png differ
diff --git a/public/images/emoji/emoji_one/earth_americas.png b/public/images/emoji/emoji_one/earth_americas.png
index a662f8e1105..40d50660568 100644
Binary files a/public/images/emoji/emoji_one/earth_americas.png and b/public/images/emoji/emoji_one/earth_americas.png differ
diff --git a/public/images/emoji/emoji_one/earth_asia.png b/public/images/emoji/emoji_one/earth_asia.png
index d77a49b1598..1abeead56a6 100644
Binary files a/public/images/emoji/emoji_one/earth_asia.png and b/public/images/emoji/emoji_one/earth_asia.png differ
diff --git a/public/images/emoji/emoji_one/ecuador.png b/public/images/emoji/emoji_one/ecuador.png
new file mode 100644
index 00000000000..cf86fbaad62
Binary files /dev/null and b/public/images/emoji/emoji_one/ecuador.png differ
diff --git a/public/images/emoji/emoji_one/egg.png b/public/images/emoji/emoji_one/egg.png
index adcef9a38b1..56cadcd3ca5 100644
Binary files a/public/images/emoji/emoji_one/egg.png and b/public/images/emoji/emoji_one/egg.png differ
diff --git a/public/images/emoji/emoji_one/eggplant.png b/public/images/emoji/emoji_one/eggplant.png
index 5d41a51ff1e..e733c5d366c 100644
Binary files a/public/images/emoji/emoji_one/eggplant.png and b/public/images/emoji/emoji_one/eggplant.png differ
diff --git a/public/images/emoji/emoji_one/egypt.png b/public/images/emoji/emoji_one/egypt.png
new file mode 100644
index 00000000000..bbbdefa653f
Binary files /dev/null and b/public/images/emoji/emoji_one/egypt.png differ
diff --git a/public/images/emoji/emoji_one/eight.png b/public/images/emoji/emoji_one/eight.png
index 3b8024f65c9..d3a308a101d 100644
Binary files a/public/images/emoji/emoji_one/eight.png and b/public/images/emoji/emoji_one/eight.png differ
diff --git a/public/images/emoji/emoji_one/eight_pointed_black_star.png b/public/images/emoji/emoji_one/eight_pointed_black_star.png
index 947ca7e6780..2a33e690648 100644
Binary files a/public/images/emoji/emoji_one/eight_pointed_black_star.png and b/public/images/emoji/emoji_one/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/emoji_one/eight_spoked_asterisk.png b/public/images/emoji/emoji_one/eight_spoked_asterisk.png
index 69f18179de2..ce972bc8801 100644
Binary files a/public/images/emoji/emoji_one/eight_spoked_asterisk.png and b/public/images/emoji/emoji_one/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/emoji_one/el_salvador.png b/public/images/emoji/emoji_one/el_salvador.png
new file mode 100644
index 00000000000..0f24a983698
Binary files /dev/null and b/public/images/emoji/emoji_one/el_salvador.png differ
diff --git a/public/images/emoji/emoji_one/electric_plug.png b/public/images/emoji/emoji_one/electric_plug.png
index b3e3020ff26..5447da725aa 100644
Binary files a/public/images/emoji/emoji_one/electric_plug.png and b/public/images/emoji/emoji_one/electric_plug.png differ
diff --git a/public/images/emoji/emoji_one/elephant.png b/public/images/emoji/emoji_one/elephant.png
index f2b3cea300b..f8d7834b5f4 100644
Binary files a/public/images/emoji/emoji_one/elephant.png and b/public/images/emoji/emoji_one/elephant.png differ
diff --git a/public/images/emoji/emoji_one/elf.png b/public/images/emoji/emoji_one/elf.png
new file mode 100644
index 00000000000..f8b6dd873e2
Binary files /dev/null and b/public/images/emoji/emoji_one/elf.png differ
diff --git a/public/images/emoji/emoji_one/elf/2.png b/public/images/emoji/emoji_one/elf/2.png
new file mode 100644
index 00000000000..15984024f21
Binary files /dev/null and b/public/images/emoji/emoji_one/elf/2.png differ
diff --git a/public/images/emoji/emoji_one/elf/3.png b/public/images/emoji/emoji_one/elf/3.png
new file mode 100644
index 00000000000..4689243a178
Binary files /dev/null and b/public/images/emoji/emoji_one/elf/3.png differ
diff --git a/public/images/emoji/emoji_one/elf/4.png b/public/images/emoji/emoji_one/elf/4.png
new file mode 100644
index 00000000000..861cbf808ca
Binary files /dev/null and b/public/images/emoji/emoji_one/elf/4.png differ
diff --git a/public/images/emoji/emoji_one/elf/5.png b/public/images/emoji/emoji_one/elf/5.png
new file mode 100644
index 00000000000..50748760101
Binary files /dev/null and b/public/images/emoji/emoji_one/elf/5.png differ
diff --git a/public/images/emoji/emoji_one/elf/6.png b/public/images/emoji/emoji_one/elf/6.png
new file mode 100644
index 00000000000..505c908b180
Binary files /dev/null and b/public/images/emoji/emoji_one/elf/6.png differ
diff --git a/public/images/emoji/emoji_one/email.png b/public/images/emoji/emoji_one/email.png
index 3b3ed0f40ac..4255a4cbb1d 100644
Binary files a/public/images/emoji/emoji_one/email.png and b/public/images/emoji/emoji_one/email.png differ
diff --git a/public/images/emoji/emoji_one/end.png b/public/images/emoji/emoji_one/end.png
index 465c3b91f9c..fa3986d0bc6 100644
Binary files a/public/images/emoji/emoji_one/end.png and b/public/images/emoji/emoji_one/end.png differ
diff --git a/public/images/emoji/emoji_one/envelope.png b/public/images/emoji/emoji_one/envelope.png
index 43dd7cbed98..4255a4cbb1d 100644
Binary files a/public/images/emoji/emoji_one/envelope.png and b/public/images/emoji/emoji_one/envelope.png differ
diff --git a/public/images/emoji/emoji_one/envelope_with_arrow.png b/public/images/emoji/emoji_one/envelope_with_arrow.png
index 9e9d1b3de80..f45188bcef9 100644
Binary files a/public/images/emoji/emoji_one/envelope_with_arrow.png and b/public/images/emoji/emoji_one/envelope_with_arrow.png differ
diff --git a/public/images/emoji/emoji_one/equatorial_guinea.png b/public/images/emoji/emoji_one/equatorial_guinea.png
new file mode 100644
index 00000000000..38e992318c3
Binary files /dev/null and b/public/images/emoji/emoji_one/equatorial_guinea.png differ
diff --git a/public/images/emoji/emoji_one/eritrea.png b/public/images/emoji/emoji_one/eritrea.png
new file mode 100644
index 00000000000..630fd664150
Binary files /dev/null and b/public/images/emoji/emoji_one/eritrea.png differ
diff --git a/public/images/emoji/emoji_one/es.png b/public/images/emoji/emoji_one/es.png
index 061ea15563a..e0da30d5a6c 100644
Binary files a/public/images/emoji/emoji_one/es.png and b/public/images/emoji/emoji_one/es.png differ
diff --git a/public/images/emoji/emoji_one/estonia.png b/public/images/emoji/emoji_one/estonia.png
new file mode 100644
index 00000000000..2553a5dbf7d
Binary files /dev/null and b/public/images/emoji/emoji_one/estonia.png differ
diff --git a/public/images/emoji/emoji_one/ethiopia.png b/public/images/emoji/emoji_one/ethiopia.png
new file mode 100644
index 00000000000..d0d78350cdf
Binary files /dev/null and b/public/images/emoji/emoji_one/ethiopia.png differ
diff --git a/public/images/emoji/emoji_one/eu.png b/public/images/emoji/emoji_one/eu.png
new file mode 100644
index 00000000000..938b488ddb8
Binary files /dev/null and b/public/images/emoji/emoji_one/eu.png differ
diff --git a/public/images/emoji/emoji_one/euro.png b/public/images/emoji/emoji_one/euro.png
index e2480ca61f7..aa70460bc0d 100644
Binary files a/public/images/emoji/emoji_one/euro.png and b/public/images/emoji/emoji_one/euro.png differ
diff --git a/public/images/emoji/emoji_one/european_castle.png b/public/images/emoji/emoji_one/european_castle.png
index b2e7025ebb4..eb8bb4ba69e 100644
Binary files a/public/images/emoji/emoji_one/european_castle.png and b/public/images/emoji/emoji_one/european_castle.png differ
diff --git a/public/images/emoji/emoji_one/european_post_office.png b/public/images/emoji/emoji_one/european_post_office.png
index 5330b6d6b32..bfc879f121b 100644
Binary files a/public/images/emoji/emoji_one/european_post_office.png and b/public/images/emoji/emoji_one/european_post_office.png differ
diff --git a/public/images/emoji/emoji_one/evergreen_tree.png b/public/images/emoji/emoji_one/evergreen_tree.png
index 48663ea6648..d72bf9fbd82 100644
Binary files a/public/images/emoji/emoji_one/evergreen_tree.png and b/public/images/emoji/emoji_one/evergreen_tree.png differ
diff --git a/public/images/emoji/emoji_one/exclamation.png b/public/images/emoji/emoji_one/exclamation.png
index b0bf7bf1d5b..110392ee592 100644
Binary files a/public/images/emoji/emoji_one/exclamation.png and b/public/images/emoji/emoji_one/exclamation.png differ
diff --git a/public/images/emoji/emoji_one/exploding_head.png b/public/images/emoji/emoji_one/exploding_head.png
new file mode 100644
index 00000000000..af1108c31ea
Binary files /dev/null and b/public/images/emoji/emoji_one/exploding_head.png differ
diff --git a/public/images/emoji/emoji_one/expressionless.png b/public/images/emoji/emoji_one/expressionless.png
index cb83c412bb3..bc436e20d44 100644
Binary files a/public/images/emoji/emoji_one/expressionless.png and b/public/images/emoji/emoji_one/expressionless.png differ
diff --git a/public/images/emoji/emoji_one/eye.png b/public/images/emoji/emoji_one/eye.png
index a186aa22b35..efd4b320802 100644
Binary files a/public/images/emoji/emoji_one/eye.png and b/public/images/emoji/emoji_one/eye.png differ
diff --git a/public/images/emoji/emoji_one/eyeglasses.png b/public/images/emoji/emoji_one/eyeglasses.png
index bc19aae6443..ae4484bc66f 100644
Binary files a/public/images/emoji/emoji_one/eyeglasses.png and b/public/images/emoji/emoji_one/eyeglasses.png differ
diff --git a/public/images/emoji/emoji_one/eyes.png b/public/images/emoji/emoji_one/eyes.png
index ccda3cbae57..95e53d50b42 100644
Binary files a/public/images/emoji/emoji_one/eyes.png and b/public/images/emoji/emoji_one/eyes.png differ
diff --git a/public/images/emoji/emoji_one/face_vomiting.png b/public/images/emoji/emoji_one/face_vomiting.png
new file mode 100644
index 00000000000..a79017a1eb2
Binary files /dev/null and b/public/images/emoji/emoji_one/face_vomiting.png differ
diff --git a/public/images/emoji/emoji_one/face_with_hand_over_mouth.png b/public/images/emoji/emoji_one/face_with_hand_over_mouth.png
new file mode 100644
index 00000000000..aed8f62e0b0
Binary files /dev/null and b/public/images/emoji/emoji_one/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/emoji_one/face_with_head_bandage.png b/public/images/emoji/emoji_one/face_with_head_bandage.png
index 0511af60dbd..ed6dc56acc3 100644
Binary files a/public/images/emoji/emoji_one/face_with_head_bandage.png and b/public/images/emoji/emoji_one/face_with_head_bandage.png differ
diff --git a/public/images/emoji/emoji_one/face_with_monocle.png b/public/images/emoji/emoji_one/face_with_monocle.png
new file mode 100644
index 00000000000..c6fbb4481d5
Binary files /dev/null and b/public/images/emoji/emoji_one/face_with_monocle.png differ
diff --git a/public/images/emoji/emoji_one/face_with_raised_eyebrow.png b/public/images/emoji/emoji_one/face_with_raised_eyebrow.png
new file mode 100644
index 00000000000..4a5d139f5c5
Binary files /dev/null and b/public/images/emoji/emoji_one/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/emoji_one/face_with_rolling_eyes.png b/public/images/emoji/emoji_one/face_with_rolling_eyes.png
index 1eec27738b1..dc4f8c13851 100644
Binary files a/public/images/emoji/emoji_one/face_with_rolling_eyes.png and b/public/images/emoji/emoji_one/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/emoji_one/face_with_symbols_over_mouth.png b/public/images/emoji/emoji_one/face_with_symbols_over_mouth.png
new file mode 100644
index 00000000000..84bb9ec9c53
Binary files /dev/null and b/public/images/emoji/emoji_one/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/emoji_one/face_with_thermometer.png b/public/images/emoji/emoji_one/face_with_thermometer.png
index 9722ff8212d..abfed8eb566 100644
Binary files a/public/images/emoji/emoji_one/face_with_thermometer.png and b/public/images/emoji/emoji_one/face_with_thermometer.png differ
diff --git a/public/images/emoji/emoji_one/facepunch.png b/public/images/emoji/emoji_one/facepunch.png
new file mode 100644
index 00000000000..488aec1d2ba
Binary files /dev/null and b/public/images/emoji/emoji_one/facepunch.png differ
diff --git a/public/images/emoji/emoji_one/facepunch/2.png b/public/images/emoji/emoji_one/facepunch/2.png
new file mode 100644
index 00000000000..ba746c9f2e7
Binary files /dev/null and b/public/images/emoji/emoji_one/facepunch/2.png differ
diff --git a/public/images/emoji/emoji_one/facepunch/3.png b/public/images/emoji/emoji_one/facepunch/3.png
new file mode 100644
index 00000000000..35ecc381dcb
Binary files /dev/null and b/public/images/emoji/emoji_one/facepunch/3.png differ
diff --git a/public/images/emoji/emoji_one/facepunch/4.png b/public/images/emoji/emoji_one/facepunch/4.png
new file mode 100644
index 00000000000..d90a9417821
Binary files /dev/null and b/public/images/emoji/emoji_one/facepunch/4.png differ
diff --git a/public/images/emoji/emoji_one/facepunch/5.png b/public/images/emoji/emoji_one/facepunch/5.png
new file mode 100644
index 00000000000..1331fa3b8a7
Binary files /dev/null and b/public/images/emoji/emoji_one/facepunch/5.png differ
diff --git a/public/images/emoji/emoji_one/facepunch/6.png b/public/images/emoji/emoji_one/facepunch/6.png
new file mode 100644
index 00000000000..6e7920e71a2
Binary files /dev/null and b/public/images/emoji/emoji_one/facepunch/6.png differ
diff --git a/public/images/emoji/emoji_one/factory.png b/public/images/emoji/emoji_one/factory.png
index bafeb15b5aa..1884b515752 100644
Binary files a/public/images/emoji/emoji_one/factory.png and b/public/images/emoji/emoji_one/factory.png differ
diff --git a/public/images/emoji/emoji_one/fairy.png b/public/images/emoji/emoji_one/fairy.png
new file mode 100644
index 00000000000..429938294b2
Binary files /dev/null and b/public/images/emoji/emoji_one/fairy.png differ
diff --git a/public/images/emoji/emoji_one/fairy/2.png b/public/images/emoji/emoji_one/fairy/2.png
new file mode 100644
index 00000000000..91e1de4e5dc
Binary files /dev/null and b/public/images/emoji/emoji_one/fairy/2.png differ
diff --git a/public/images/emoji/emoji_one/fairy/3.png b/public/images/emoji/emoji_one/fairy/3.png
new file mode 100644
index 00000000000..42821806e92
Binary files /dev/null and b/public/images/emoji/emoji_one/fairy/3.png differ
diff --git a/public/images/emoji/emoji_one/fairy/4.png b/public/images/emoji/emoji_one/fairy/4.png
new file mode 100644
index 00000000000..9e8d3adb897
Binary files /dev/null and b/public/images/emoji/emoji_one/fairy/4.png differ
diff --git a/public/images/emoji/emoji_one/fairy/5.png b/public/images/emoji/emoji_one/fairy/5.png
new file mode 100644
index 00000000000..88d190e3926
Binary files /dev/null and b/public/images/emoji/emoji_one/fairy/5.png differ
diff --git a/public/images/emoji/emoji_one/fairy/6.png b/public/images/emoji/emoji_one/fairy/6.png
new file mode 100644
index 00000000000..e6ab8ade743
Binary files /dev/null and b/public/images/emoji/emoji_one/fairy/6.png differ
diff --git a/public/images/emoji/emoji_one/falkland_islands.png b/public/images/emoji/emoji_one/falkland_islands.png
new file mode 100644
index 00000000000..d97a84cea15
Binary files /dev/null and b/public/images/emoji/emoji_one/falkland_islands.png differ
diff --git a/public/images/emoji/emoji_one/fallen_leaf.png b/public/images/emoji/emoji_one/fallen_leaf.png
index dbaf57be55a..41c3790cb39 100644
Binary files a/public/images/emoji/emoji_one/fallen_leaf.png and b/public/images/emoji/emoji_one/fallen_leaf.png differ
diff --git a/public/images/emoji/emoji_one/family.png b/public/images/emoji/emoji_one/family.png
new file mode 100644
index 00000000000..7e4df9c2670
Binary files /dev/null and b/public/images/emoji/emoji_one/family.png differ
diff --git a/public/images/emoji/emoji_one/family_man_boy.png b/public/images/emoji/emoji_one/family_man_boy.png
new file mode 100644
index 00000000000..66f7ac3aacb
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_boy_boy.png b/public/images/emoji/emoji_one/family_man_boy_boy.png
new file mode 100644
index 00000000000..f12c2814413
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_boy_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_girl.png b/public/images/emoji/emoji_one/family_man_girl.png
new file mode 100644
index 00000000000..9735917ea7c
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_girl_boy.png b/public/images/emoji/emoji_one/family_man_girl_boy.png
new file mode 100644
index 00000000000..b903807083d
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_girl_girl.png b/public/images/emoji/emoji_one/family_man_girl_girl.png
new file mode 100644
index 00000000000..ad722bb5ab0
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_girl_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_man_boy.png b/public/images/emoji/emoji_one/family_man_man_boy.png
new file mode 100644
index 00000000000..55becf1393e
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_man_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_man_boy_boy.png b/public/images/emoji/emoji_one/family_man_man_boy_boy.png
new file mode 100644
index 00000000000..06e8d4ef62e
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_man_girl.png b/public/images/emoji/emoji_one/family_man_man_girl.png
new file mode 100644
index 00000000000..2b51b71d73a
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_man_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_man_girl_boy.png b/public/images/emoji/emoji_one/family_man_man_girl_boy.png
new file mode 100644
index 00000000000..54681513bd7
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_man_girl_girl.png b/public/images/emoji/emoji_one/family_man_man_girl_girl.png
new file mode 100644
index 00000000000..523a8f9b8e1
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_boy.png b/public/images/emoji/emoji_one/family_man_woman_boy.png
new file mode 100644
index 00000000000..bc47302bce6
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_woman_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_boy_boy.png b/public/images/emoji/emoji_one/family_man_woman_boy_boy.png
new file mode 100644
index 00000000000..ec9043c65f8
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_boys.png b/public/images/emoji/emoji_one/family_man_woman_boys.png
index 20a12bd4749..ec9043c65f8 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_boys.png and b/public/images/emoji/emoji_one/family_man_woman_boys.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_girl.png b/public/images/emoji/emoji_one/family_man_woman_girl.png
index a4f7aedfba9..d5b1b16d554 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_girl.png and b/public/images/emoji/emoji_one/family_man_woman_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_girl_boy.png b/public/images/emoji/emoji_one/family_man_woman_girl_boy.png
index 98d8369b469..7e4df9c2670 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_girl_boy.png and b/public/images/emoji/emoji_one/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_girl_girl.png b/public/images/emoji/emoji_one/family_man_woman_girl_girl.png
new file mode 100644
index 00000000000..c22c23d6312
Binary files /dev/null and b/public/images/emoji/emoji_one/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_girls.png b/public/images/emoji/emoji_one/family_man_woman_girls.png
index 9782696d3f9..c22c23d6312 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_girls.png and b/public/images/emoji/emoji_one/family_man_woman_girls.png differ
diff --git a/public/images/emoji/emoji_one/family_men_boy.png b/public/images/emoji/emoji_one/family_men_boy.png
index 63241ed293c..55becf1393e 100644
Binary files a/public/images/emoji/emoji_one/family_men_boy.png and b/public/images/emoji/emoji_one/family_men_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_men_boys.png b/public/images/emoji/emoji_one/family_men_boys.png
index 66e4655754f..06e8d4ef62e 100644
Binary files a/public/images/emoji/emoji_one/family_men_boys.png and b/public/images/emoji/emoji_one/family_men_boys.png differ
diff --git a/public/images/emoji/emoji_one/family_men_girl.png b/public/images/emoji/emoji_one/family_men_girl.png
index 8aa48695b22..2b51b71d73a 100644
Binary files a/public/images/emoji/emoji_one/family_men_girl.png and b/public/images/emoji/emoji_one/family_men_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_men_girl_boy.png b/public/images/emoji/emoji_one/family_men_girl_boy.png
index 4a74aa4fa48..54681513bd7 100644
Binary files a/public/images/emoji/emoji_one/family_men_girl_boy.png and b/public/images/emoji/emoji_one/family_men_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_men_girls.png b/public/images/emoji/emoji_one/family_men_girls.png
index 3cafa6ff23e..523a8f9b8e1 100644
Binary files a/public/images/emoji/emoji_one/family_men_girls.png and b/public/images/emoji/emoji_one/family_men_girls.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_boy.png b/public/images/emoji/emoji_one/family_woman_boy.png
new file mode 100644
index 00000000000..3ab3cda6590
Binary files /dev/null and b/public/images/emoji/emoji_one/family_woman_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_boy_boy.png b/public/images/emoji/emoji_one/family_woman_boy_boy.png
new file mode 100644
index 00000000000..3014086f5c3
Binary files /dev/null and b/public/images/emoji/emoji_one/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_girl.png b/public/images/emoji/emoji_one/family_woman_girl.png
new file mode 100644
index 00000000000..6649e32dbfe
Binary files /dev/null and b/public/images/emoji/emoji_one/family_woman_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_girl_boy.png b/public/images/emoji/emoji_one/family_woman_girl_boy.png
new file mode 100644
index 00000000000..5e87ee25374
Binary files /dev/null and b/public/images/emoji/emoji_one/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_girl_girl.png b/public/images/emoji/emoji_one/family_woman_girl_girl.png
new file mode 100644
index 00000000000..5cd65ec3bc0
Binary files /dev/null and b/public/images/emoji/emoji_one/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_woman_boy.png b/public/images/emoji/emoji_one/family_woman_woman_boy.png
new file mode 100644
index 00000000000..c921369fc71
Binary files /dev/null and b/public/images/emoji/emoji_one/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_woman_boy_boy.png b/public/images/emoji/emoji_one/family_woman_woman_boy_boy.png
new file mode 100644
index 00000000000..1f0e7494c22
Binary files /dev/null and b/public/images/emoji/emoji_one/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_woman_girl.png b/public/images/emoji/emoji_one/family_woman_woman_girl.png
new file mode 100644
index 00000000000..1008bd3daf2
Binary files /dev/null and b/public/images/emoji/emoji_one/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_woman_girl_boy.png b/public/images/emoji/emoji_one/family_woman_woman_girl_boy.png
new file mode 100644
index 00000000000..a49fbfef8a5
Binary files /dev/null and b/public/images/emoji/emoji_one/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_woman_girl_girl.png b/public/images/emoji/emoji_one/family_woman_woman_girl_girl.png
new file mode 100644
index 00000000000..eae0863938a
Binary files /dev/null and b/public/images/emoji/emoji_one/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_women_boy.png b/public/images/emoji/emoji_one/family_women_boy.png
index 262f91352b8..c921369fc71 100644
Binary files a/public/images/emoji/emoji_one/family_women_boy.png and b/public/images/emoji/emoji_one/family_women_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_women_boys.png b/public/images/emoji/emoji_one/family_women_boys.png
index 24538c1e8b4..1f0e7494c22 100644
Binary files a/public/images/emoji/emoji_one/family_women_boys.png and b/public/images/emoji/emoji_one/family_women_boys.png differ
diff --git a/public/images/emoji/emoji_one/family_women_girl.png b/public/images/emoji/emoji_one/family_women_girl.png
index 02f36a1b8ce..1008bd3daf2 100644
Binary files a/public/images/emoji/emoji_one/family_women_girl.png and b/public/images/emoji/emoji_one/family_women_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_women_girl_boy.png b/public/images/emoji/emoji_one/family_women_girl_boy.png
index 4933fae6aa8..a49fbfef8a5 100644
Binary files a/public/images/emoji/emoji_one/family_women_girl_boy.png and b/public/images/emoji/emoji_one/family_women_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_women_girls.png b/public/images/emoji/emoji_one/family_women_girls.png
index ba7831255ff..eae0863938a 100644
Binary files a/public/images/emoji/emoji_one/family_women_girls.png and b/public/images/emoji/emoji_one/family_women_girls.png differ
diff --git a/public/images/emoji/emoji_one/faroe_islands.png b/public/images/emoji/emoji_one/faroe_islands.png
new file mode 100644
index 00000000000..5da7953f8d0
Binary files /dev/null and b/public/images/emoji/emoji_one/faroe_islands.png differ
diff --git a/public/images/emoji/emoji_one/fast_forward.png b/public/images/emoji/emoji_one/fast_forward.png
index 609101345f1..e48e4788e4e 100644
Binary files a/public/images/emoji/emoji_one/fast_forward.png and b/public/images/emoji/emoji_one/fast_forward.png differ
diff --git a/public/images/emoji/emoji_one/fax.png b/public/images/emoji/emoji_one/fax.png
index 92bf531eba8..d5df584abf2 100644
Binary files a/public/images/emoji/emoji_one/fax.png and b/public/images/emoji/emoji_one/fax.png differ
diff --git a/public/images/emoji/emoji_one/fearful.png b/public/images/emoji/emoji_one/fearful.png
index a21f8017ec4..83bd3a25b17 100644
Binary files a/public/images/emoji/emoji_one/fearful.png and b/public/images/emoji/emoji_one/fearful.png differ
diff --git a/public/images/emoji/emoji_one/feet.png b/public/images/emoji/emoji_one/feet.png
index a507977217f..b9e97e13727 100644
Binary files a/public/images/emoji/emoji_one/feet.png and b/public/images/emoji/emoji_one/feet.png differ
diff --git a/public/images/emoji/emoji_one/female_couple_with_heart.png b/public/images/emoji/emoji_one/female_couple_with_heart.png
index 4082dca2771..8f47f828f3b 100644
Binary files a/public/images/emoji/emoji_one/female_couple_with_heart.png and b/public/images/emoji/emoji_one/female_couple_with_heart.png differ
diff --git a/public/images/emoji/emoji_one/female_couplekiss.png b/public/images/emoji/emoji_one/female_couplekiss.png
index 28969d81b35..ca34f3376b1 100644
Binary files a/public/images/emoji/emoji_one/female_couplekiss.png and b/public/images/emoji/emoji_one/female_couplekiss.png differ
diff --git a/public/images/emoji/emoji_one/female_detective.png b/public/images/emoji/emoji_one/female_detective.png
new file mode 100644
index 00000000000..c6aa2d216e9
Binary files /dev/null and b/public/images/emoji/emoji_one/female_detective.png differ
diff --git a/public/images/emoji/emoji_one/ferris_wheel.png b/public/images/emoji/emoji_one/ferris_wheel.png
index c5fa20581e0..8e5a93b12b3 100644
Binary files a/public/images/emoji/emoji_one/ferris_wheel.png and b/public/images/emoji/emoji_one/ferris_wheel.png differ
diff --git a/public/images/emoji/emoji_one/ferry.png b/public/images/emoji/emoji_one/ferry.png
index 9a812d3502e..7e00184504a 100644
Binary files a/public/images/emoji/emoji_one/ferry.png and b/public/images/emoji/emoji_one/ferry.png differ
diff --git a/public/images/emoji/emoji_one/field_hockey.png b/public/images/emoji/emoji_one/field_hockey.png
index c4d6114d749..6c3e81209e0 100644
Binary files a/public/images/emoji/emoji_one/field_hockey.png and b/public/images/emoji/emoji_one/field_hockey.png differ
diff --git a/public/images/emoji/emoji_one/fiji.png b/public/images/emoji/emoji_one/fiji.png
new file mode 100644
index 00000000000..df504caef6c
Binary files /dev/null and b/public/images/emoji/emoji_one/fiji.png differ
diff --git a/public/images/emoji/emoji_one/file_cabinet.png b/public/images/emoji/emoji_one/file_cabinet.png
index 506ed1a8bee..3f266593a87 100644
Binary files a/public/images/emoji/emoji_one/file_cabinet.png and b/public/images/emoji/emoji_one/file_cabinet.png differ
diff --git a/public/images/emoji/emoji_one/file_folder.png b/public/images/emoji/emoji_one/file_folder.png
index 111ce937dd1..c1cf07e9ecb 100644
Binary files a/public/images/emoji/emoji_one/file_folder.png and b/public/images/emoji/emoji_one/file_folder.png differ
diff --git a/public/images/emoji/emoji_one/film_frames.png b/public/images/emoji/emoji_one/film_frames.png
index 80c7fabde40..cb964646af1 100644
Binary files a/public/images/emoji/emoji_one/film_frames.png and b/public/images/emoji/emoji_one/film_frames.png differ
diff --git a/public/images/emoji/emoji_one/film_projector.png b/public/images/emoji/emoji_one/film_projector.png
index e18aae6b5c2..1ab19e3f1e0 100644
Binary files a/public/images/emoji/emoji_one/film_projector.png and b/public/images/emoji/emoji_one/film_projector.png differ
diff --git a/public/images/emoji/emoji_one/film_strip.png b/public/images/emoji/emoji_one/film_strip.png
new file mode 100644
index 00000000000..cb964646af1
Binary files /dev/null and b/public/images/emoji/emoji_one/film_strip.png differ
diff --git a/public/images/emoji/emoji_one/finland.png b/public/images/emoji/emoji_one/finland.png
new file mode 100644
index 00000000000..5eda4bb8646
Binary files /dev/null and b/public/images/emoji/emoji_one/finland.png differ
diff --git a/public/images/emoji/emoji_one/fire.png b/public/images/emoji/emoji_one/fire.png
index 408096fbe6b..94c4195121b 100644
Binary files a/public/images/emoji/emoji_one/fire.png and b/public/images/emoji/emoji_one/fire.png differ
diff --git a/public/images/emoji/emoji_one/fire_engine.png b/public/images/emoji/emoji_one/fire_engine.png
index 5d1f91bc5ae..c5f9478071a 100644
Binary files a/public/images/emoji/emoji_one/fire_engine.png and b/public/images/emoji/emoji_one/fire_engine.png differ
diff --git a/public/images/emoji/emoji_one/fireworks.png b/public/images/emoji/emoji_one/fireworks.png
index bdeb2c3aebe..fb172c643da 100644
Binary files a/public/images/emoji/emoji_one/fireworks.png and b/public/images/emoji/emoji_one/fireworks.png differ
diff --git a/public/images/emoji/emoji_one/first_quarter_moon.png b/public/images/emoji/emoji_one/first_quarter_moon.png
index 161f42ea86a..9c89ce8dd43 100644
Binary files a/public/images/emoji/emoji_one/first_quarter_moon.png and b/public/images/emoji/emoji_one/first_quarter_moon.png differ
diff --git a/public/images/emoji/emoji_one/first_quarter_moon_with_face.png b/public/images/emoji/emoji_one/first_quarter_moon_with_face.png
index 7080be25c0c..59405c97782 100644
Binary files a/public/images/emoji/emoji_one/first_quarter_moon_with_face.png and b/public/images/emoji/emoji_one/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/emoji_one/fish.png b/public/images/emoji/emoji_one/fish.png
index 739efb0cf3a..9af0c2e2529 100644
Binary files a/public/images/emoji/emoji_one/fish.png and b/public/images/emoji/emoji_one/fish.png differ
diff --git a/public/images/emoji/emoji_one/fish_cake.png b/public/images/emoji/emoji_one/fish_cake.png
index f0758218713..e8456d6701d 100644
Binary files a/public/images/emoji/emoji_one/fish_cake.png and b/public/images/emoji/emoji_one/fish_cake.png differ
diff --git a/public/images/emoji/emoji_one/fishing_pole_and_fish.png b/public/images/emoji/emoji_one/fishing_pole_and_fish.png
index 2b613d70f3a..42b01c8ac5f 100644
Binary files a/public/images/emoji/emoji_one/fishing_pole_and_fish.png and b/public/images/emoji/emoji_one/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/emoji_one/fist.png b/public/images/emoji/emoji_one/fist.png
index b26c74acaf2..49726efcf37 100644
Binary files a/public/images/emoji/emoji_one/fist.png and b/public/images/emoji/emoji_one/fist.png differ
diff --git a/public/images/emoji/emoji_one/fist/2.png b/public/images/emoji/emoji_one/fist/2.png
new file mode 100644
index 00000000000..be5c67e4ab3
Binary files /dev/null and b/public/images/emoji/emoji_one/fist/2.png differ
diff --git a/public/images/emoji/emoji_one/fist/3.png b/public/images/emoji/emoji_one/fist/3.png
new file mode 100644
index 00000000000..da6c11fe6a5
Binary files /dev/null and b/public/images/emoji/emoji_one/fist/3.png differ
diff --git a/public/images/emoji/emoji_one/fist/4.png b/public/images/emoji/emoji_one/fist/4.png
new file mode 100644
index 00000000000..756db48214b
Binary files /dev/null and b/public/images/emoji/emoji_one/fist/4.png differ
diff --git a/public/images/emoji/emoji_one/fist/5.png b/public/images/emoji/emoji_one/fist/5.png
new file mode 100644
index 00000000000..ab598946b57
Binary files /dev/null and b/public/images/emoji/emoji_one/fist/5.png differ
diff --git a/public/images/emoji/emoji_one/fist/6.png b/public/images/emoji/emoji_one/fist/6.png
new file mode 100644
index 00000000000..a3fa057393a
Binary files /dev/null and b/public/images/emoji/emoji_one/fist/6.png differ
diff --git a/public/images/emoji/emoji_one/fist_left.png b/public/images/emoji/emoji_one/fist_left.png
new file mode 100644
index 00000000000..3442d906740
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_left.png differ
diff --git a/public/images/emoji/emoji_one/fist_left/2.png b/public/images/emoji/emoji_one/fist_left/2.png
new file mode 100644
index 00000000000..105a75e3f2b
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_left/2.png differ
diff --git a/public/images/emoji/emoji_one/fist_left/3.png b/public/images/emoji/emoji_one/fist_left/3.png
new file mode 100644
index 00000000000..a6c68fe3f18
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_left/3.png differ
diff --git a/public/images/emoji/emoji_one/fist_left/4.png b/public/images/emoji/emoji_one/fist_left/4.png
new file mode 100644
index 00000000000..abe07f06fd0
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_left/4.png differ
diff --git a/public/images/emoji/emoji_one/fist_left/5.png b/public/images/emoji/emoji_one/fist_left/5.png
new file mode 100644
index 00000000000..38dd5eff0f0
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_left/5.png differ
diff --git a/public/images/emoji/emoji_one/fist_left/6.png b/public/images/emoji/emoji_one/fist_left/6.png
new file mode 100644
index 00000000000..a75572cb232
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_left/6.png differ
diff --git a/public/images/emoji/emoji_one/fist_right.png b/public/images/emoji/emoji_one/fist_right.png
new file mode 100644
index 00000000000..7846f9aa088
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_right.png differ
diff --git a/public/images/emoji/emoji_one/fist_right/2.png b/public/images/emoji/emoji_one/fist_right/2.png
new file mode 100644
index 00000000000..425f98ea6e9
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_right/2.png differ
diff --git a/public/images/emoji/emoji_one/fist_right/3.png b/public/images/emoji/emoji_one/fist_right/3.png
new file mode 100644
index 00000000000..428c8a710d2
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_right/3.png differ
diff --git a/public/images/emoji/emoji_one/fist_right/4.png b/public/images/emoji/emoji_one/fist_right/4.png
new file mode 100644
index 00000000000..2b4c8706e9b
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_right/4.png differ
diff --git a/public/images/emoji/emoji_one/fist_right/5.png b/public/images/emoji/emoji_one/fist_right/5.png
new file mode 100644
index 00000000000..b3c868e9a3b
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_right/5.png differ
diff --git a/public/images/emoji/emoji_one/fist_right/6.png b/public/images/emoji/emoji_one/fist_right/6.png
new file mode 100644
index 00000000000..76bc2cae3bb
Binary files /dev/null and b/public/images/emoji/emoji_one/fist_right/6.png differ
diff --git a/public/images/emoji/emoji_one/five.png b/public/images/emoji/emoji_one/five.png
index a4ccd7fd73f..bd463d2edcd 100644
Binary files a/public/images/emoji/emoji_one/five.png and b/public/images/emoji/emoji_one/five.png differ
diff --git a/public/images/emoji/emoji_one/flag_black.png b/public/images/emoji/emoji_one/flag_black.png
index e6071f3ee0c..193a775633f 100644
Binary files a/public/images/emoji/emoji_one/flag_black.png and b/public/images/emoji/emoji_one/flag_black.png differ
diff --git a/public/images/emoji/emoji_one/flag_cn.png b/public/images/emoji/emoji_one/flag_cn.png
index ae5a76a9058..67efed2e4d4 100644
Binary files a/public/images/emoji/emoji_one/flag_cn.png and b/public/images/emoji/emoji_one/flag_cn.png differ
diff --git a/public/images/emoji/emoji_one/flag_de.png b/public/images/emoji/emoji_one/flag_de.png
index 352b049a12e..746bf11011c 100644
Binary files a/public/images/emoji/emoji_one/flag_de.png and b/public/images/emoji/emoji_one/flag_de.png differ
diff --git a/public/images/emoji/emoji_one/flag_es.png b/public/images/emoji/emoji_one/flag_es.png
index 061ea15563a..e0da30d5a6c 100644
Binary files a/public/images/emoji/emoji_one/flag_es.png and b/public/images/emoji/emoji_one/flag_es.png differ
diff --git a/public/images/emoji/emoji_one/flag_fr.png b/public/images/emoji/emoji_one/flag_fr.png
index 20938a3ab7d..7943b73f671 100644
Binary files a/public/images/emoji/emoji_one/flag_fr.png and b/public/images/emoji/emoji_one/flag_fr.png differ
diff --git a/public/images/emoji/emoji_one/flag_gb.png b/public/images/emoji/emoji_one/flag_gb.png
index abdb6c455f7..ad2a6622e47 100644
Binary files a/public/images/emoji/emoji_one/flag_gb.png and b/public/images/emoji/emoji_one/flag_gb.png differ
diff --git a/public/images/emoji/emoji_one/flag_it.png b/public/images/emoji/emoji_one/flag_it.png
index 2ed2a1067fb..13bbb1b1f8d 100644
Binary files a/public/images/emoji/emoji_one/flag_it.png and b/public/images/emoji/emoji_one/flag_it.png differ
diff --git a/public/images/emoji/emoji_one/flag_jp.png b/public/images/emoji/emoji_one/flag_jp.png
index 2e6ceab8f35..cca79ffb9dc 100644
Binary files a/public/images/emoji/emoji_one/flag_jp.png and b/public/images/emoji/emoji_one/flag_jp.png differ
diff --git a/public/images/emoji/emoji_one/flag_kr.png b/public/images/emoji/emoji_one/flag_kr.png
index fe1d26475a6..82486f8812c 100644
Binary files a/public/images/emoji/emoji_one/flag_kr.png and b/public/images/emoji/emoji_one/flag_kr.png differ
diff --git a/public/images/emoji/emoji_one/flag_ru.png b/public/images/emoji/emoji_one/flag_ru.png
index 62b6b21d67d..3ecaefd941b 100644
Binary files a/public/images/emoji/emoji_one/flag_ru.png and b/public/images/emoji/emoji_one/flag_ru.png differ
diff --git a/public/images/emoji/emoji_one/flag_us.png b/public/images/emoji/emoji_one/flag_us.png
index 748e2b413d7..450853eca47 100644
Binary files a/public/images/emoji/emoji_one/flag_us.png and b/public/images/emoji/emoji_one/flag_us.png differ
diff --git a/public/images/emoji/emoji_one/flag_white.png b/public/images/emoji/emoji_one/flag_white.png
index a4b7a4848a4..b2c3a85f49e 100644
Binary files a/public/images/emoji/emoji_one/flag_white.png and b/public/images/emoji/emoji_one/flag_white.png differ
diff --git a/public/images/emoji/emoji_one/flags.png b/public/images/emoji/emoji_one/flags.png
index f79f69ab561..ed38c48b26a 100644
Binary files a/public/images/emoji/emoji_one/flags.png and b/public/images/emoji/emoji_one/flags.png differ
diff --git a/public/images/emoji/emoji_one/flame.png b/public/images/emoji/emoji_one/flame.png
index 408096fbe6b..94c4195121b 100644
Binary files a/public/images/emoji/emoji_one/flame.png and b/public/images/emoji/emoji_one/flame.png differ
diff --git a/public/images/emoji/emoji_one/flashlight.png b/public/images/emoji/emoji_one/flashlight.png
index ebbe7d320b1..2e28446d3b8 100644
Binary files a/public/images/emoji/emoji_one/flashlight.png and b/public/images/emoji/emoji_one/flashlight.png differ
diff --git a/public/images/emoji/emoji_one/fleur-de-lis.png b/public/images/emoji/emoji_one/fleur-de-lis.png
index edf3a73da2e..fbbe63e7c15 100644
Binary files a/public/images/emoji/emoji_one/fleur-de-lis.png and b/public/images/emoji/emoji_one/fleur-de-lis.png differ
diff --git a/public/images/emoji/emoji_one/fleur_de_lis.png b/public/images/emoji/emoji_one/fleur_de_lis.png
new file mode 100644
index 00000000000..fbbe63e7c15
Binary files /dev/null and b/public/images/emoji/emoji_one/fleur_de_lis.png differ
diff --git a/public/images/emoji/emoji_one/flight_arrival.png b/public/images/emoji/emoji_one/flight_arrival.png
new file mode 100644
index 00000000000..9a00b425699
Binary files /dev/null and b/public/images/emoji/emoji_one/flight_arrival.png differ
diff --git a/public/images/emoji/emoji_one/flight_departure.png b/public/images/emoji/emoji_one/flight_departure.png
new file mode 100644
index 00000000000..7ac83f443d7
Binary files /dev/null and b/public/images/emoji/emoji_one/flight_departure.png differ
diff --git a/public/images/emoji/emoji_one/floppy_disk.png b/public/images/emoji/emoji_one/floppy_disk.png
index a82cdadca5d..931c538fd7e 100644
Binary files a/public/images/emoji/emoji_one/floppy_disk.png and b/public/images/emoji/emoji_one/floppy_disk.png differ
diff --git a/public/images/emoji/emoji_one/flower_playing_cards.png b/public/images/emoji/emoji_one/flower_playing_cards.png
index b1641a1e9bb..d1df637b708 100644
Binary files a/public/images/emoji/emoji_one/flower_playing_cards.png and b/public/images/emoji/emoji_one/flower_playing_cards.png differ
diff --git a/public/images/emoji/emoji_one/flushed.png b/public/images/emoji/emoji_one/flushed.png
index 8c0e195481a..807a19dc882 100644
Binary files a/public/images/emoji/emoji_one/flushed.png and b/public/images/emoji/emoji_one/flushed.png differ
diff --git a/public/images/emoji/emoji_one/flying_saucer.png b/public/images/emoji/emoji_one/flying_saucer.png
new file mode 100644
index 00000000000..23b8c3444d4
Binary files /dev/null and b/public/images/emoji/emoji_one/flying_saucer.png differ
diff --git a/public/images/emoji/emoji_one/fog.png b/public/images/emoji/emoji_one/fog.png
index 51c905064c7..4bf4099311e 100644
Binary files a/public/images/emoji/emoji_one/fog.png and b/public/images/emoji/emoji_one/fog.png differ
diff --git a/public/images/emoji/emoji_one/foggy.png b/public/images/emoji/emoji_one/foggy.png
index 07a75af19c6..7be30dae0be 100644
Binary files a/public/images/emoji/emoji_one/foggy.png and b/public/images/emoji/emoji_one/foggy.png differ
diff --git a/public/images/emoji/emoji_one/football.png b/public/images/emoji/emoji_one/football.png
index ee6f77931ba..27bf1b70177 100644
Binary files a/public/images/emoji/emoji_one/football.png and b/public/images/emoji/emoji_one/football.png differ
diff --git a/public/images/emoji/emoji_one/footprints.png b/public/images/emoji/emoji_one/footprints.png
index 8bc7f5f4bcf..b9e97e13727 100644
Binary files a/public/images/emoji/emoji_one/footprints.png and b/public/images/emoji/emoji_one/footprints.png differ
diff --git a/public/images/emoji/emoji_one/fork_and_knife.png b/public/images/emoji/emoji_one/fork_and_knife.png
index 7be5c727356..84147a42760 100644
Binary files a/public/images/emoji/emoji_one/fork_and_knife.png and b/public/images/emoji/emoji_one/fork_and_knife.png differ
diff --git a/public/images/emoji/emoji_one/fork_and_knife_with_plate.png b/public/images/emoji/emoji_one/fork_and_knife_with_plate.png
index 0f3b9a60e02..c52a0f2d3c9 100644
Binary files a/public/images/emoji/emoji_one/fork_and_knife_with_plate.png and b/public/images/emoji/emoji_one/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/emoji_one/fork_knife_plate.png b/public/images/emoji/emoji_one/fork_knife_plate.png
index 0f3b9a60e02..c52a0f2d3c9 100644
Binary files a/public/images/emoji/emoji_one/fork_knife_plate.png and b/public/images/emoji/emoji_one/fork_knife_plate.png differ
diff --git a/public/images/emoji/emoji_one/fortune_cookie.png b/public/images/emoji/emoji_one/fortune_cookie.png
new file mode 100644
index 00000000000..8f3b3cbcf7a
Binary files /dev/null and b/public/images/emoji/emoji_one/fortune_cookie.png differ
diff --git a/public/images/emoji/emoji_one/fountain.png b/public/images/emoji/emoji_one/fountain.png
index 88417436854..bd6f5096821 100644
Binary files a/public/images/emoji/emoji_one/fountain.png and b/public/images/emoji/emoji_one/fountain.png differ
diff --git a/public/images/emoji/emoji_one/fountain_pen.png b/public/images/emoji/emoji_one/fountain_pen.png
new file mode 100644
index 00000000000..e9983527850
Binary files /dev/null and b/public/images/emoji/emoji_one/fountain_pen.png differ
diff --git a/public/images/emoji/emoji_one/four.png b/public/images/emoji/emoji_one/four.png
index 15f5cf19777..cfc57d4a985 100644
Binary files a/public/images/emoji/emoji_one/four.png and b/public/images/emoji/emoji_one/four.png differ
diff --git a/public/images/emoji/emoji_one/four_leaf_clover.png b/public/images/emoji/emoji_one/four_leaf_clover.png
index a844b27c63d..d21675748bc 100644
Binary files a/public/images/emoji/emoji_one/four_leaf_clover.png and b/public/images/emoji/emoji_one/four_leaf_clover.png differ
diff --git a/public/images/emoji/emoji_one/fox_face.png b/public/images/emoji/emoji_one/fox_face.png
new file mode 100644
index 00000000000..aebd2e03cc3
Binary files /dev/null and b/public/images/emoji/emoji_one/fox_face.png differ
diff --git a/public/images/emoji/emoji_one/fr.png b/public/images/emoji/emoji_one/fr.png
index 20938a3ab7d..7943b73f671 100644
Binary files a/public/images/emoji/emoji_one/fr.png and b/public/images/emoji/emoji_one/fr.png differ
diff --git a/public/images/emoji/emoji_one/frame_photo.png b/public/images/emoji/emoji_one/frame_photo.png
index fe6c307f165..0ad6a812a25 100644
Binary files a/public/images/emoji/emoji_one/frame_photo.png and b/public/images/emoji/emoji_one/frame_photo.png differ
diff --git a/public/images/emoji/emoji_one/frame_with_picture.png b/public/images/emoji/emoji_one/frame_with_picture.png
index fe6c307f165..0ad6a812a25 100644
Binary files a/public/images/emoji/emoji_one/frame_with_picture.png and b/public/images/emoji/emoji_one/frame_with_picture.png differ
diff --git a/public/images/emoji/emoji_one/framed_picture.png b/public/images/emoji/emoji_one/framed_picture.png
new file mode 100644
index 00000000000..0ad6a812a25
Binary files /dev/null and b/public/images/emoji/emoji_one/framed_picture.png differ
diff --git a/public/images/emoji/emoji_one/free.png b/public/images/emoji/emoji_one/free.png
index 00430a8a2b9..870241a3efe 100644
Binary files a/public/images/emoji/emoji_one/free.png and b/public/images/emoji/emoji_one/free.png differ
diff --git a/public/images/emoji/emoji_one/french_guiana.png b/public/images/emoji/emoji_one/french_guiana.png
new file mode 100644
index 00000000000..b67d58af241
Binary files /dev/null and b/public/images/emoji/emoji_one/french_guiana.png differ
diff --git a/public/images/emoji/emoji_one/french_polynesia.png b/public/images/emoji/emoji_one/french_polynesia.png
new file mode 100644
index 00000000000..8e67281736f
Binary files /dev/null and b/public/images/emoji/emoji_one/french_polynesia.png differ
diff --git a/public/images/emoji/emoji_one/french_southern_territories.png b/public/images/emoji/emoji_one/french_southern_territories.png
new file mode 100644
index 00000000000..ecc9bec0fa6
Binary files /dev/null and b/public/images/emoji/emoji_one/french_southern_territories.png differ
diff --git a/public/images/emoji/emoji_one/fried_egg.png b/public/images/emoji/emoji_one/fried_egg.png
new file mode 100644
index 00000000000..12203aca79a
Binary files /dev/null and b/public/images/emoji/emoji_one/fried_egg.png differ
diff --git a/public/images/emoji/emoji_one/fried_shrimp.png b/public/images/emoji/emoji_one/fried_shrimp.png
index 52b3e4aec9b..f9c603ac910 100644
Binary files a/public/images/emoji/emoji_one/fried_shrimp.png and b/public/images/emoji/emoji_one/fried_shrimp.png differ
diff --git a/public/images/emoji/emoji_one/fries.png b/public/images/emoji/emoji_one/fries.png
index e35818b6f14..28f8d4d40e2 100644
Binary files a/public/images/emoji/emoji_one/fries.png and b/public/images/emoji/emoji_one/fries.png differ
diff --git a/public/images/emoji/emoji_one/frog.png b/public/images/emoji/emoji_one/frog.png
index 7c5ce7da53f..838fa4c925e 100644
Binary files a/public/images/emoji/emoji_one/frog.png and b/public/images/emoji/emoji_one/frog.png differ
diff --git a/public/images/emoji/emoji_one/frowning.png b/public/images/emoji/emoji_one/frowning.png
index 46f93f120e4..59aa47f3018 100644
Binary files a/public/images/emoji/emoji_one/frowning.png and b/public/images/emoji/emoji_one/frowning.png differ
diff --git a/public/images/emoji/emoji_one/frowning2.png b/public/images/emoji/emoji_one/frowning2.png
index 72453581da4..968de324b53 100644
Binary files a/public/images/emoji/emoji_one/frowning2.png and b/public/images/emoji/emoji_one/frowning2.png differ
diff --git a/public/images/emoji/emoji_one/frowning_face.png b/public/images/emoji/emoji_one/frowning_face.png
new file mode 100644
index 00000000000..968de324b53
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_face.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man.png b/public/images/emoji/emoji_one/frowning_man.png
new file mode 100644
index 00000000000..3bbbadec605
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_man.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man/2.png b/public/images/emoji/emoji_one/frowning_man/2.png
new file mode 100644
index 00000000000..90ca6277038
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_man/2.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man/3.png b/public/images/emoji/emoji_one/frowning_man/3.png
new file mode 100644
index 00000000000..4577d022516
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_man/3.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man/4.png b/public/images/emoji/emoji_one/frowning_man/4.png
new file mode 100644
index 00000000000..c019d515e01
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_man/4.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man/5.png b/public/images/emoji/emoji_one/frowning_man/5.png
new file mode 100644
index 00000000000..0e166d4a42d
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_man/5.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man/6.png b/public/images/emoji/emoji_one/frowning_man/6.png
new file mode 100644
index 00000000000..d01eefacee6
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_man/6.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman.png b/public/images/emoji/emoji_one/frowning_woman.png
new file mode 100644
index 00000000000..a1af9eaf914
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_woman.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman/2.png b/public/images/emoji/emoji_one/frowning_woman/2.png
new file mode 100644
index 00000000000..ce5ee0f0364
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman/3.png b/public/images/emoji/emoji_one/frowning_woman/3.png
new file mode 100644
index 00000000000..f2017acecf4
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman/4.png b/public/images/emoji/emoji_one/frowning_woman/4.png
new file mode 100644
index 00000000000..9fca177e9d9
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman/5.png b/public/images/emoji/emoji_one/frowning_woman/5.png
new file mode 100644
index 00000000000..8bb8d943afd
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman/6.png b/public/images/emoji/emoji_one/frowning_woman/6.png
new file mode 100644
index 00000000000..5d30d35d42e
Binary files /dev/null and b/public/images/emoji/emoji_one/frowning_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/fu.png b/public/images/emoji/emoji_one/fu.png
new file mode 100644
index 00000000000..1bc73629bb1
Binary files /dev/null and b/public/images/emoji/emoji_one/fu.png differ
diff --git a/public/images/emoji/emoji_one/fu/2.png b/public/images/emoji/emoji_one/fu/2.png
new file mode 100644
index 00000000000..37ac4780316
Binary files /dev/null and b/public/images/emoji/emoji_one/fu/2.png differ
diff --git a/public/images/emoji/emoji_one/fu/3.png b/public/images/emoji/emoji_one/fu/3.png
new file mode 100644
index 00000000000..69fbed14d25
Binary files /dev/null and b/public/images/emoji/emoji_one/fu/3.png differ
diff --git a/public/images/emoji/emoji_one/fu/4.png b/public/images/emoji/emoji_one/fu/4.png
new file mode 100644
index 00000000000..c1134aea0fa
Binary files /dev/null and b/public/images/emoji/emoji_one/fu/4.png differ
diff --git a/public/images/emoji/emoji_one/fu/5.png b/public/images/emoji/emoji_one/fu/5.png
new file mode 100644
index 00000000000..371ee90cf9f
Binary files /dev/null and b/public/images/emoji/emoji_one/fu/5.png differ
diff --git a/public/images/emoji/emoji_one/fu/6.png b/public/images/emoji/emoji_one/fu/6.png
new file mode 100644
index 00000000000..db57dfd0983
Binary files /dev/null and b/public/images/emoji/emoji_one/fu/6.png differ
diff --git a/public/images/emoji/emoji_one/fuelpump.png b/public/images/emoji/emoji_one/fuelpump.png
index 3f7ab4f5dfb..ac74fe39fcf 100644
Binary files a/public/images/emoji/emoji_one/fuelpump.png and b/public/images/emoji/emoji_one/fuelpump.png differ
diff --git a/public/images/emoji/emoji_one/full_moon.png b/public/images/emoji/emoji_one/full_moon.png
index c9e143fe203..2ced93987c0 100644
Binary files a/public/images/emoji/emoji_one/full_moon.png and b/public/images/emoji/emoji_one/full_moon.png differ
diff --git a/public/images/emoji/emoji_one/full_moon_with_face.png b/public/images/emoji/emoji_one/full_moon_with_face.png
index e212e220617..e26dea33382 100644
Binary files a/public/images/emoji/emoji_one/full_moon_with_face.png and b/public/images/emoji/emoji_one/full_moon_with_face.png differ
diff --git a/public/images/emoji/emoji_one/funeral_urn.png b/public/images/emoji/emoji_one/funeral_urn.png
index c531e105cbb..e158fa9f832 100644
Binary files a/public/images/emoji/emoji_one/funeral_urn.png and b/public/images/emoji/emoji_one/funeral_urn.png differ
diff --git a/public/images/emoji/emoji_one/gabon.png b/public/images/emoji/emoji_one/gabon.png
new file mode 100644
index 00000000000..6563b2a69f0
Binary files /dev/null and b/public/images/emoji/emoji_one/gabon.png differ
diff --git a/public/images/emoji/emoji_one/gambia.png b/public/images/emoji/emoji_one/gambia.png
new file mode 100644
index 00000000000..707ca2a121b
Binary files /dev/null and b/public/images/emoji/emoji_one/gambia.png differ
diff --git a/public/images/emoji/emoji_one/game_die.png b/public/images/emoji/emoji_one/game_die.png
index ebed25d8582..5ec1253f911 100644
Binary files a/public/images/emoji/emoji_one/game_die.png and b/public/images/emoji/emoji_one/game_die.png differ
diff --git a/public/images/emoji/emoji_one/gb.png b/public/images/emoji/emoji_one/gb.png
index abdb6c455f7..ad2a6622e47 100644
Binary files a/public/images/emoji/emoji_one/gb.png and b/public/images/emoji/emoji_one/gb.png differ
diff --git a/public/images/emoji/emoji_one/gear.png b/public/images/emoji/emoji_one/gear.png
index 448c2fc1f43..0e99369e670 100644
Binary files a/public/images/emoji/emoji_one/gear.png and b/public/images/emoji/emoji_one/gear.png differ
diff --git a/public/images/emoji/emoji_one/gem.png b/public/images/emoji/emoji_one/gem.png
index 1b6d7e287bc..c84dd6ba602 100644
Binary files a/public/images/emoji/emoji_one/gem.png and b/public/images/emoji/emoji_one/gem.png differ
diff --git a/public/images/emoji/emoji_one/gemini.png b/public/images/emoji/emoji_one/gemini.png
index 1b266e10225..65981bf6434 100644
Binary files a/public/images/emoji/emoji_one/gemini.png and b/public/images/emoji/emoji_one/gemini.png differ
diff --git a/public/images/emoji/emoji_one/genie.png b/public/images/emoji/emoji_one/genie.png
new file mode 100644
index 00000000000..f0eddcc91ae
Binary files /dev/null and b/public/images/emoji/emoji_one/genie.png differ
diff --git a/public/images/emoji/emoji_one/georgia.png b/public/images/emoji/emoji_one/georgia.png
new file mode 100644
index 00000000000..673f81ef6ff
Binary files /dev/null and b/public/images/emoji/emoji_one/georgia.png differ
diff --git a/public/images/emoji/emoji_one/ghana.png b/public/images/emoji/emoji_one/ghana.png
new file mode 100644
index 00000000000..f1b8829dbab
Binary files /dev/null and b/public/images/emoji/emoji_one/ghana.png differ
diff --git a/public/images/emoji/emoji_one/ghost.png b/public/images/emoji/emoji_one/ghost.png
index c6c0db24129..64ae09af799 100644
Binary files a/public/images/emoji/emoji_one/ghost.png and b/public/images/emoji/emoji_one/ghost.png differ
diff --git a/public/images/emoji/emoji_one/gibraltar.png b/public/images/emoji/emoji_one/gibraltar.png
new file mode 100644
index 00000000000..cbe9f11a125
Binary files /dev/null and b/public/images/emoji/emoji_one/gibraltar.png differ
diff --git a/public/images/emoji/emoji_one/gift.png b/public/images/emoji/emoji_one/gift.png
index 2bb9d85194c..32218e0afb7 100644
Binary files a/public/images/emoji/emoji_one/gift.png and b/public/images/emoji/emoji_one/gift.png differ
diff --git a/public/images/emoji/emoji_one/gift_heart.png b/public/images/emoji/emoji_one/gift_heart.png
index 14c068a5095..34d2e066d30 100644
Binary files a/public/images/emoji/emoji_one/gift_heart.png and b/public/images/emoji/emoji_one/gift_heart.png differ
diff --git a/public/images/emoji/emoji_one/giraffe.png b/public/images/emoji/emoji_one/giraffe.png
new file mode 100644
index 00000000000..4db1a06ce47
Binary files /dev/null and b/public/images/emoji/emoji_one/giraffe.png differ
diff --git a/public/images/emoji/emoji_one/girl.png b/public/images/emoji/emoji_one/girl.png
index fef52ba6dd4..9deb44f2dfe 100644
Binary files a/public/images/emoji/emoji_one/girl.png and b/public/images/emoji/emoji_one/girl.png differ
diff --git a/public/images/emoji/emoji_one/girl/2.png b/public/images/emoji/emoji_one/girl/2.png
new file mode 100644
index 00000000000..c305c1c572c
Binary files /dev/null and b/public/images/emoji/emoji_one/girl/2.png differ
diff --git a/public/images/emoji/emoji_one/girl/3.png b/public/images/emoji/emoji_one/girl/3.png
new file mode 100644
index 00000000000..e6bf63cee3c
Binary files /dev/null and b/public/images/emoji/emoji_one/girl/3.png differ
diff --git a/public/images/emoji/emoji_one/girl/4.png b/public/images/emoji/emoji_one/girl/4.png
new file mode 100644
index 00000000000..3063e88cf88
Binary files /dev/null and b/public/images/emoji/emoji_one/girl/4.png differ
diff --git a/public/images/emoji/emoji_one/girl/5.png b/public/images/emoji/emoji_one/girl/5.png
new file mode 100644
index 00000000000..189a0ebc954
Binary files /dev/null and b/public/images/emoji/emoji_one/girl/5.png differ
diff --git a/public/images/emoji/emoji_one/girl/6.png b/public/images/emoji/emoji_one/girl/6.png
new file mode 100644
index 00000000000..5774ab84359
Binary files /dev/null and b/public/images/emoji/emoji_one/girl/6.png differ
diff --git a/public/images/emoji/emoji_one/globe_with_meridians.png b/public/images/emoji/emoji_one/globe_with_meridians.png
index f499edb031a..8eccd7d9229 100644
Binary files a/public/images/emoji/emoji_one/globe_with_meridians.png and b/public/images/emoji/emoji_one/globe_with_meridians.png differ
diff --git a/public/images/emoji/emoji_one/gloves.png b/public/images/emoji/emoji_one/gloves.png
new file mode 100644
index 00000000000..1a11dd2c560
Binary files /dev/null and b/public/images/emoji/emoji_one/gloves.png differ
diff --git a/public/images/emoji/emoji_one/goal_net.png b/public/images/emoji/emoji_one/goal_net.png
new file mode 100644
index 00000000000..bdf8e211e40
Binary files /dev/null and b/public/images/emoji/emoji_one/goal_net.png differ
diff --git a/public/images/emoji/emoji_one/goat.png b/public/images/emoji/emoji_one/goat.png
index e21c43fa4db..310c2153fc3 100644
Binary files a/public/images/emoji/emoji_one/goat.png and b/public/images/emoji/emoji_one/goat.png differ
diff --git a/public/images/emoji/emoji_one/golf.png b/public/images/emoji/emoji_one/golf.png
index 3cd5d80fc2a..be4f3d7fe30 100644
Binary files a/public/images/emoji/emoji_one/golf.png and b/public/images/emoji/emoji_one/golf.png differ
diff --git a/public/images/emoji/emoji_one/golfer.png b/public/images/emoji/emoji_one/golfer.png
index a5e8fa7a32d..d4c43cbf884 100644
Binary files a/public/images/emoji/emoji_one/golfer.png and b/public/images/emoji/emoji_one/golfer.png differ
diff --git a/public/images/emoji/emoji_one/golfer/2.png b/public/images/emoji/emoji_one/golfer/2.png
new file mode 100644
index 00000000000..cc24e381fe6
Binary files /dev/null and b/public/images/emoji/emoji_one/golfer/2.png differ
diff --git a/public/images/emoji/emoji_one/golfer/3.png b/public/images/emoji/emoji_one/golfer/3.png
new file mode 100644
index 00000000000..4a26b7fc236
Binary files /dev/null and b/public/images/emoji/emoji_one/golfer/3.png differ
diff --git a/public/images/emoji/emoji_one/golfer/4.png b/public/images/emoji/emoji_one/golfer/4.png
new file mode 100644
index 00000000000..f92e91f8ddf
Binary files /dev/null and b/public/images/emoji/emoji_one/golfer/4.png differ
diff --git a/public/images/emoji/emoji_one/golfer/5.png b/public/images/emoji/emoji_one/golfer/5.png
new file mode 100644
index 00000000000..7dab5eabba6
Binary files /dev/null and b/public/images/emoji/emoji_one/golfer/5.png differ
diff --git a/public/images/emoji/emoji_one/golfer/6.png b/public/images/emoji/emoji_one/golfer/6.png
new file mode 100644
index 00000000000..54188ddddb2
Binary files /dev/null and b/public/images/emoji/emoji_one/golfer/6.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man.png b/public/images/emoji/emoji_one/golfing_man.png
new file mode 100644
index 00000000000..d4c43cbf884
Binary files /dev/null and b/public/images/emoji/emoji_one/golfing_man.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man/2.png b/public/images/emoji/emoji_one/golfing_man/2.png
new file mode 100644
index 00000000000..cc24e381fe6
Binary files /dev/null and b/public/images/emoji/emoji_one/golfing_man/2.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man/3.png b/public/images/emoji/emoji_one/golfing_man/3.png
new file mode 100644
index 00000000000..4a26b7fc236
Binary files /dev/null and b/public/images/emoji/emoji_one/golfing_man/3.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man/4.png b/public/images/emoji/emoji_one/golfing_man/4.png
new file mode 100644
index 00000000000..f92e91f8ddf
Binary files /dev/null and b/public/images/emoji/emoji_one/golfing_man/4.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man/5.png b/public/images/emoji/emoji_one/golfing_man/5.png
new file mode 100644
index 00000000000..7dab5eabba6
Binary files /dev/null and b/public/images/emoji/emoji_one/golfing_man/5.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man/6.png b/public/images/emoji/emoji_one/golfing_man/6.png
new file mode 100644
index 00000000000..54188ddddb2
Binary files /dev/null and b/public/images/emoji/emoji_one/golfing_man/6.png differ
diff --git a/public/images/emoji/emoji_one/golfing_woman.png b/public/images/emoji/emoji_one/golfing_woman.png
new file mode 100644
index 00000000000..f77e9038b4d
Binary files /dev/null and b/public/images/emoji/emoji_one/golfing_woman.png differ
diff --git a/public/images/emoji/emoji_one/gorilla.png b/public/images/emoji/emoji_one/gorilla.png
new file mode 100644
index 00000000000..ba94d0759f2
Binary files /dev/null and b/public/images/emoji/emoji_one/gorilla.png differ
diff --git a/public/images/emoji/emoji_one/grandma.png b/public/images/emoji/emoji_one/grandma.png
index d1e78babe84..ef0d803bae9 100644
Binary files a/public/images/emoji/emoji_one/grandma.png and b/public/images/emoji/emoji_one/grandma.png differ
diff --git a/public/images/emoji/emoji_one/grandma/2.png b/public/images/emoji/emoji_one/grandma/2.png
new file mode 100644
index 00000000000..78028f179fa
Binary files /dev/null and b/public/images/emoji/emoji_one/grandma/2.png differ
diff --git a/public/images/emoji/emoji_one/grandma/3.png b/public/images/emoji/emoji_one/grandma/3.png
new file mode 100644
index 00000000000..e12b43f089b
Binary files /dev/null and b/public/images/emoji/emoji_one/grandma/3.png differ
diff --git a/public/images/emoji/emoji_one/grandma/4.png b/public/images/emoji/emoji_one/grandma/4.png
new file mode 100644
index 00000000000..7d5882174cd
Binary files /dev/null and b/public/images/emoji/emoji_one/grandma/4.png differ
diff --git a/public/images/emoji/emoji_one/grandma/5.png b/public/images/emoji/emoji_one/grandma/5.png
new file mode 100644
index 00000000000..fdc2609bdbb
Binary files /dev/null and b/public/images/emoji/emoji_one/grandma/5.png differ
diff --git a/public/images/emoji/emoji_one/grandma/6.png b/public/images/emoji/emoji_one/grandma/6.png
new file mode 100644
index 00000000000..a9b8dc3fa1b
Binary files /dev/null and b/public/images/emoji/emoji_one/grandma/6.png differ
diff --git a/public/images/emoji/emoji_one/grapes.png b/public/images/emoji/emoji_one/grapes.png
index 2d0c2db48a4..e5d14b1e76a 100644
Binary files a/public/images/emoji/emoji_one/grapes.png and b/public/images/emoji/emoji_one/grapes.png differ
diff --git a/public/images/emoji/emoji_one/greece.png b/public/images/emoji/emoji_one/greece.png
new file mode 100644
index 00000000000..c274ffb629c
Binary files /dev/null and b/public/images/emoji/emoji_one/greece.png differ
diff --git a/public/images/emoji/emoji_one/green_apple.png b/public/images/emoji/emoji_one/green_apple.png
index 611bdb4c357..829baf00e19 100644
Binary files a/public/images/emoji/emoji_one/green_apple.png and b/public/images/emoji/emoji_one/green_apple.png differ
diff --git a/public/images/emoji/emoji_one/green_book.png b/public/images/emoji/emoji_one/green_book.png
index 18600cfea76..6fa21a7b8fc 100644
Binary files a/public/images/emoji/emoji_one/green_book.png and b/public/images/emoji/emoji_one/green_book.png differ
diff --git a/public/images/emoji/emoji_one/green_heart.png b/public/images/emoji/emoji_one/green_heart.png
index b284be0ecbc..9a238d53d1a 100644
Binary files a/public/images/emoji/emoji_one/green_heart.png and b/public/images/emoji/emoji_one/green_heart.png differ
diff --git a/public/images/emoji/emoji_one/green_salad.png b/public/images/emoji/emoji_one/green_salad.png
new file mode 100644
index 00000000000..34daefa85ba
Binary files /dev/null and b/public/images/emoji/emoji_one/green_salad.png differ
diff --git a/public/images/emoji/emoji_one/greenland.png b/public/images/emoji/emoji_one/greenland.png
new file mode 100644
index 00000000000..31c8707a434
Binary files /dev/null and b/public/images/emoji/emoji_one/greenland.png differ
diff --git a/public/images/emoji/emoji_one/grenada.png b/public/images/emoji/emoji_one/grenada.png
new file mode 100644
index 00000000000..87f17a6ff22
Binary files /dev/null and b/public/images/emoji/emoji_one/grenada.png differ
diff --git a/public/images/emoji/emoji_one/grey_exclamation.png b/public/images/emoji/emoji_one/grey_exclamation.png
index 5a41233c332..6ff1f6ed0ff 100644
Binary files a/public/images/emoji/emoji_one/grey_exclamation.png and b/public/images/emoji/emoji_one/grey_exclamation.png differ
diff --git a/public/images/emoji/emoji_one/grey_question.png b/public/images/emoji/emoji_one/grey_question.png
index 028696f6f4f..06dc8ad2b0e 100644
Binary files a/public/images/emoji/emoji_one/grey_question.png and b/public/images/emoji/emoji_one/grey_question.png differ
diff --git a/public/images/emoji/emoji_one/grimacing.png b/public/images/emoji/emoji_one/grimacing.png
index 6ca43ef3791..3ce0a4e8a41 100644
Binary files a/public/images/emoji/emoji_one/grimacing.png and b/public/images/emoji/emoji_one/grimacing.png differ
diff --git a/public/images/emoji/emoji_one/grin.png b/public/images/emoji/emoji_one/grin.png
index 94fd2b15f6d..43bb5ccf9ec 100644
Binary files a/public/images/emoji/emoji_one/grin.png and b/public/images/emoji/emoji_one/grin.png differ
diff --git a/public/images/emoji/emoji_one/grinning.png b/public/images/emoji/emoji_one/grinning.png
index 1a53e3f9d1b..1725222a1a8 100644
Binary files a/public/images/emoji/emoji_one/grinning.png and b/public/images/emoji/emoji_one/grinning.png differ
diff --git a/public/images/emoji/emoji_one/guadeloupe.png b/public/images/emoji/emoji_one/guadeloupe.png
new file mode 100644
index 00000000000..c9c437901df
Binary files /dev/null and b/public/images/emoji/emoji_one/guadeloupe.png differ
diff --git a/public/images/emoji/emoji_one/guam.png b/public/images/emoji/emoji_one/guam.png
new file mode 100644
index 00000000000..d291c89c97c
Binary files /dev/null and b/public/images/emoji/emoji_one/guam.png differ
diff --git a/public/images/emoji/emoji_one/guardsman.png b/public/images/emoji/emoji_one/guardsman.png
index 07f3a2df15d..be981bfedac 100644
Binary files a/public/images/emoji/emoji_one/guardsman.png and b/public/images/emoji/emoji_one/guardsman.png differ
diff --git a/public/images/emoji/emoji_one/guardsman/2.png b/public/images/emoji/emoji_one/guardsman/2.png
new file mode 100644
index 00000000000..f6c3cfc868a
Binary files /dev/null and b/public/images/emoji/emoji_one/guardsman/2.png differ
diff --git a/public/images/emoji/emoji_one/guardsman/3.png b/public/images/emoji/emoji_one/guardsman/3.png
new file mode 100644
index 00000000000..719a40ca678
Binary files /dev/null and b/public/images/emoji/emoji_one/guardsman/3.png differ
diff --git a/public/images/emoji/emoji_one/guardsman/4.png b/public/images/emoji/emoji_one/guardsman/4.png
new file mode 100644
index 00000000000..2e853da32e8
Binary files /dev/null and b/public/images/emoji/emoji_one/guardsman/4.png differ
diff --git a/public/images/emoji/emoji_one/guardsman/5.png b/public/images/emoji/emoji_one/guardsman/5.png
new file mode 100644
index 00000000000..4512abdde23
Binary files /dev/null and b/public/images/emoji/emoji_one/guardsman/5.png differ
diff --git a/public/images/emoji/emoji_one/guardsman/6.png b/public/images/emoji/emoji_one/guardsman/6.png
new file mode 100644
index 00000000000..4eb541d1ffb
Binary files /dev/null and b/public/images/emoji/emoji_one/guardsman/6.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman.png b/public/images/emoji/emoji_one/guardswoman.png
new file mode 100644
index 00000000000..3d0acf013fa
Binary files /dev/null and b/public/images/emoji/emoji_one/guardswoman.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman/2.png b/public/images/emoji/emoji_one/guardswoman/2.png
new file mode 100644
index 00000000000..5539a1f22fd
Binary files /dev/null and b/public/images/emoji/emoji_one/guardswoman/2.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman/3.png b/public/images/emoji/emoji_one/guardswoman/3.png
new file mode 100644
index 00000000000..96203685f09
Binary files /dev/null and b/public/images/emoji/emoji_one/guardswoman/3.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman/4.png b/public/images/emoji/emoji_one/guardswoman/4.png
new file mode 100644
index 00000000000..e60736a4efe
Binary files /dev/null and b/public/images/emoji/emoji_one/guardswoman/4.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman/5.png b/public/images/emoji/emoji_one/guardswoman/5.png
new file mode 100644
index 00000000000..6d74a2b71b5
Binary files /dev/null and b/public/images/emoji/emoji_one/guardswoman/5.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman/6.png b/public/images/emoji/emoji_one/guardswoman/6.png
new file mode 100644
index 00000000000..c57159a307c
Binary files /dev/null and b/public/images/emoji/emoji_one/guardswoman/6.png differ
diff --git a/public/images/emoji/emoji_one/guatemala.png b/public/images/emoji/emoji_one/guatemala.png
new file mode 100644
index 00000000000..b7e7259bc83
Binary files /dev/null and b/public/images/emoji/emoji_one/guatemala.png differ
diff --git a/public/images/emoji/emoji_one/guernsey.png b/public/images/emoji/emoji_one/guernsey.png
new file mode 100644
index 00000000000..f92e78a3246
Binary files /dev/null and b/public/images/emoji/emoji_one/guernsey.png differ
diff --git a/public/images/emoji/emoji_one/guinea.png b/public/images/emoji/emoji_one/guinea.png
new file mode 100644
index 00000000000..dd1482188c6
Binary files /dev/null and b/public/images/emoji/emoji_one/guinea.png differ
diff --git a/public/images/emoji/emoji_one/guinea_bissau.png b/public/images/emoji/emoji_one/guinea_bissau.png
new file mode 100644
index 00000000000..c2ab6fb5073
Binary files /dev/null and b/public/images/emoji/emoji_one/guinea_bissau.png differ
diff --git a/public/images/emoji/emoji_one/guitar.png b/public/images/emoji/emoji_one/guitar.png
index 635ac4a51a4..32caa781822 100644
Binary files a/public/images/emoji/emoji_one/guitar.png and b/public/images/emoji/emoji_one/guitar.png differ
diff --git a/public/images/emoji/emoji_one/gun.png b/public/images/emoji/emoji_one/gun.png
index df8666a30d2..68808dde54b 100644
Binary files a/public/images/emoji/emoji_one/gun.png and b/public/images/emoji/emoji_one/gun.png differ
diff --git a/public/images/emoji/emoji_one/guyana.png b/public/images/emoji/emoji_one/guyana.png
new file mode 100644
index 00000000000..2ceb411ad23
Binary files /dev/null and b/public/images/emoji/emoji_one/guyana.png differ
diff --git a/public/images/emoji/emoji_one/haircut.png b/public/images/emoji/emoji_one/haircut.png
index a1795fd84d9..13604ef04fa 100644
Binary files a/public/images/emoji/emoji_one/haircut.png and b/public/images/emoji/emoji_one/haircut.png differ
diff --git a/public/images/emoji/emoji_one/haircut/2.png b/public/images/emoji/emoji_one/haircut/2.png
new file mode 100644
index 00000000000..d6d54e613b9
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut/2.png differ
diff --git a/public/images/emoji/emoji_one/haircut/3.png b/public/images/emoji/emoji_one/haircut/3.png
new file mode 100644
index 00000000000..2050b9a4c3a
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut/3.png differ
diff --git a/public/images/emoji/emoji_one/haircut/4.png b/public/images/emoji/emoji_one/haircut/4.png
new file mode 100644
index 00000000000..66d44eaa6d4
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut/4.png differ
diff --git a/public/images/emoji/emoji_one/haircut/5.png b/public/images/emoji/emoji_one/haircut/5.png
new file mode 100644
index 00000000000..e201d5f97bb
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut/5.png differ
diff --git a/public/images/emoji/emoji_one/haircut/6.png b/public/images/emoji/emoji_one/haircut/6.png
new file mode 100644
index 00000000000..39c44ef4738
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut/6.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man.png b/public/images/emoji/emoji_one/haircut_man.png
new file mode 100644
index 00000000000..24ad625cdc9
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_man.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man/2.png b/public/images/emoji/emoji_one/haircut_man/2.png
new file mode 100644
index 00000000000..692a251d5c1
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_man/2.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man/3.png b/public/images/emoji/emoji_one/haircut_man/3.png
new file mode 100644
index 00000000000..ac9210ac3df
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_man/3.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man/4.png b/public/images/emoji/emoji_one/haircut_man/4.png
new file mode 100644
index 00000000000..2566a19ee89
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_man/4.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man/5.png b/public/images/emoji/emoji_one/haircut_man/5.png
new file mode 100644
index 00000000000..9ea58646d69
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_man/5.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man/6.png b/public/images/emoji/emoji_one/haircut_man/6.png
new file mode 100644
index 00000000000..27b2356ff9b
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_man/6.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman.png b/public/images/emoji/emoji_one/haircut_woman.png
new file mode 100644
index 00000000000..13604ef04fa
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_woman.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman/2.png b/public/images/emoji/emoji_one/haircut_woman/2.png
new file mode 100644
index 00000000000..d6d54e613b9
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman/3.png b/public/images/emoji/emoji_one/haircut_woman/3.png
new file mode 100644
index 00000000000..2050b9a4c3a
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman/4.png b/public/images/emoji/emoji_one/haircut_woman/4.png
new file mode 100644
index 00000000000..66d44eaa6d4
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman/5.png b/public/images/emoji/emoji_one/haircut_woman/5.png
new file mode 100644
index 00000000000..e201d5f97bb
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman/6.png b/public/images/emoji/emoji_one/haircut_woman/6.png
new file mode 100644
index 00000000000..39c44ef4738
Binary files /dev/null and b/public/images/emoji/emoji_one/haircut_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/haiti.png b/public/images/emoji/emoji_one/haiti.png
new file mode 100644
index 00000000000..53d2160f9a6
Binary files /dev/null and b/public/images/emoji/emoji_one/haiti.png differ
diff --git a/public/images/emoji/emoji_one/hamburger.png b/public/images/emoji/emoji_one/hamburger.png
index 1b2f36dc467..4ca595e1a27 100644
Binary files a/public/images/emoji/emoji_one/hamburger.png and b/public/images/emoji/emoji_one/hamburger.png differ
diff --git a/public/images/emoji/emoji_one/hammer.png b/public/images/emoji/emoji_one/hammer.png
index c8111b161bc..ce8c46a4a35 100644
Binary files a/public/images/emoji/emoji_one/hammer.png and b/public/images/emoji/emoji_one/hammer.png differ
diff --git a/public/images/emoji/emoji_one/hammer_and_pick.png b/public/images/emoji/emoji_one/hammer_and_pick.png
index 3e1b21d5112..3b33cd88c2d 100644
Binary files a/public/images/emoji/emoji_one/hammer_and_pick.png and b/public/images/emoji/emoji_one/hammer_and_pick.png differ
diff --git a/public/images/emoji/emoji_one/hammer_and_wrench.png b/public/images/emoji/emoji_one/hammer_and_wrench.png
index 3ff769bdf20..9de9731f574 100644
Binary files a/public/images/emoji/emoji_one/hammer_and_wrench.png and b/public/images/emoji/emoji_one/hammer_and_wrench.png differ
diff --git a/public/images/emoji/emoji_one/hammer_pick.png b/public/images/emoji/emoji_one/hammer_pick.png
index 3e1b21d5112..3b33cd88c2d 100644
Binary files a/public/images/emoji/emoji_one/hammer_pick.png and b/public/images/emoji/emoji_one/hammer_pick.png differ
diff --git a/public/images/emoji/emoji_one/hamster.png b/public/images/emoji/emoji_one/hamster.png
index decbed49778..c3d165cf8bb 100644
Binary files a/public/images/emoji/emoji_one/hamster.png and b/public/images/emoji/emoji_one/hamster.png differ
diff --git a/public/images/emoji/emoji_one/hand.png b/public/images/emoji/emoji_one/hand.png
new file mode 100644
index 00000000000..9e968721c4a
Binary files /dev/null and b/public/images/emoji/emoji_one/hand.png differ
diff --git a/public/images/emoji/emoji_one/hand/2.png b/public/images/emoji/emoji_one/hand/2.png
new file mode 100644
index 00000000000..9f4b42f5718
Binary files /dev/null and b/public/images/emoji/emoji_one/hand/2.png differ
diff --git a/public/images/emoji/emoji_one/hand/3.png b/public/images/emoji/emoji_one/hand/3.png
new file mode 100644
index 00000000000..49df4165bb2
Binary files /dev/null and b/public/images/emoji/emoji_one/hand/3.png differ
diff --git a/public/images/emoji/emoji_one/hand/4.png b/public/images/emoji/emoji_one/hand/4.png
new file mode 100644
index 00000000000..0de00d135e5
Binary files /dev/null and b/public/images/emoji/emoji_one/hand/4.png differ
diff --git a/public/images/emoji/emoji_one/hand/5.png b/public/images/emoji/emoji_one/hand/5.png
new file mode 100644
index 00000000000..13d1da4f671
Binary files /dev/null and b/public/images/emoji/emoji_one/hand/5.png differ
diff --git a/public/images/emoji/emoji_one/hand/6.png b/public/images/emoji/emoji_one/hand/6.png
new file mode 100644
index 00000000000..27d2a626e4c
Binary files /dev/null and b/public/images/emoji/emoji_one/hand/6.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed.png b/public/images/emoji/emoji_one/hand_splayed.png
index 77d0794e0df..dfdad1339bc 100644
Binary files a/public/images/emoji/emoji_one/hand_splayed.png and b/public/images/emoji/emoji_one/hand_splayed.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed/2.png b/public/images/emoji/emoji_one/hand_splayed/2.png
new file mode 100644
index 00000000000..d360cea9edd
Binary files /dev/null and b/public/images/emoji/emoji_one/hand_splayed/2.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed/3.png b/public/images/emoji/emoji_one/hand_splayed/3.png
new file mode 100644
index 00000000000..c889c464bae
Binary files /dev/null and b/public/images/emoji/emoji_one/hand_splayed/3.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed/4.png b/public/images/emoji/emoji_one/hand_splayed/4.png
new file mode 100644
index 00000000000..fa9654e7862
Binary files /dev/null and b/public/images/emoji/emoji_one/hand_splayed/4.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed/5.png b/public/images/emoji/emoji_one/hand_splayed/5.png
new file mode 100644
index 00000000000..243d1cc157e
Binary files /dev/null and b/public/images/emoji/emoji_one/hand_splayed/5.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed/6.png b/public/images/emoji/emoji_one/hand_splayed/6.png
new file mode 100644
index 00000000000..255937df938
Binary files /dev/null and b/public/images/emoji/emoji_one/hand_splayed/6.png differ
diff --git a/public/images/emoji/emoji_one/handbag.png b/public/images/emoji/emoji_one/handbag.png
index 29beb14ba08..381b0b8405e 100644
Binary files a/public/images/emoji/emoji_one/handbag.png and b/public/images/emoji/emoji_one/handbag.png differ
diff --git a/public/images/emoji/emoji_one/handshake.png b/public/images/emoji/emoji_one/handshake.png
new file mode 100644
index 00000000000..d34d0f4c691
Binary files /dev/null and b/public/images/emoji/emoji_one/handshake.png differ
diff --git a/public/images/emoji/emoji_one/hankey.png b/public/images/emoji/emoji_one/hankey.png
index 77eb5b9fd23..123281b9b32 100644
Binary files a/public/images/emoji/emoji_one/hankey.png and b/public/images/emoji/emoji_one/hankey.png differ
diff --git a/public/images/emoji/emoji_one/hash.png b/public/images/emoji/emoji_one/hash.png
index 1efc8cc6e35..94c889f16dd 100644
Binary files a/public/images/emoji/emoji_one/hash.png and b/public/images/emoji/emoji_one/hash.png differ
diff --git a/public/images/emoji/emoji_one/hatched_chick.png b/public/images/emoji/emoji_one/hatched_chick.png
index 11c11028642..a59753442f5 100644
Binary files a/public/images/emoji/emoji_one/hatched_chick.png and b/public/images/emoji/emoji_one/hatched_chick.png differ
diff --git a/public/images/emoji/emoji_one/hatching_chick.png b/public/images/emoji/emoji_one/hatching_chick.png
index 3ae52a2687c..4f15aa8a72a 100644
Binary files a/public/images/emoji/emoji_one/hatching_chick.png and b/public/images/emoji/emoji_one/hatching_chick.png differ
diff --git a/public/images/emoji/emoji_one/head_bandage.png b/public/images/emoji/emoji_one/head_bandage.png
index 0511af60dbd..ed6dc56acc3 100644
Binary files a/public/images/emoji/emoji_one/head_bandage.png and b/public/images/emoji/emoji_one/head_bandage.png differ
diff --git a/public/images/emoji/emoji_one/headphones.png b/public/images/emoji/emoji_one/headphones.png
index faf1c616455..dbf11c83fa5 100644
Binary files a/public/images/emoji/emoji_one/headphones.png and b/public/images/emoji/emoji_one/headphones.png differ
diff --git a/public/images/emoji/emoji_one/hear_no_evil.png b/public/images/emoji/emoji_one/hear_no_evil.png
index 33052b750a9..459a96d2292 100644
Binary files a/public/images/emoji/emoji_one/hear_no_evil.png and b/public/images/emoji/emoji_one/hear_no_evil.png differ
diff --git a/public/images/emoji/emoji_one/heard_and_mc_donald_islands.png b/public/images/emoji/emoji_one/heard_and_mc_donald_islands.png
new file mode 100644
index 00000000000..1b5bf7b178f
Binary files /dev/null and b/public/images/emoji/emoji_one/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/emoji_one/heart.png b/public/images/emoji/emoji_one/heart.png
index 298ba2d3926..53a08bf5779 100644
Binary files a/public/images/emoji/emoji_one/heart.png and b/public/images/emoji/emoji_one/heart.png differ
diff --git a/public/images/emoji/emoji_one/heart_decoration.png b/public/images/emoji/emoji_one/heart_decoration.png
index e1b090838c5..e581142686f 100644
Binary files a/public/images/emoji/emoji_one/heart_decoration.png and b/public/images/emoji/emoji_one/heart_decoration.png differ
diff --git a/public/images/emoji/emoji_one/heart_exclamation.png b/public/images/emoji/emoji_one/heart_exclamation.png
index 1681e8f7ef0..9b71feda22f 100644
Binary files a/public/images/emoji/emoji_one/heart_exclamation.png and b/public/images/emoji/emoji_one/heart_exclamation.png differ
diff --git a/public/images/emoji/emoji_one/heart_eyes.png b/public/images/emoji/emoji_one/heart_eyes.png
index dd2da26f550..fccd6c6f942 100644
Binary files a/public/images/emoji/emoji_one/heart_eyes.png and b/public/images/emoji/emoji_one/heart_eyes.png differ
diff --git a/public/images/emoji/emoji_one/heart_eyes_cat.png b/public/images/emoji/emoji_one/heart_eyes_cat.png
index ed355e41e32..732977cc368 100644
Binary files a/public/images/emoji/emoji_one/heart_eyes_cat.png and b/public/images/emoji/emoji_one/heart_eyes_cat.png differ
diff --git a/public/images/emoji/emoji_one/heartbeat.png b/public/images/emoji/emoji_one/heartbeat.png
index 9d45b6d48d1..eff8409bb4f 100644
Binary files a/public/images/emoji/emoji_one/heartbeat.png and b/public/images/emoji/emoji_one/heartbeat.png differ
diff --git a/public/images/emoji/emoji_one/heartpulse.png b/public/images/emoji/emoji_one/heartpulse.png
index a2ed3c5006c..2dd12716176 100644
Binary files a/public/images/emoji/emoji_one/heartpulse.png and b/public/images/emoji/emoji_one/heartpulse.png differ
diff --git a/public/images/emoji/emoji_one/hearts.png b/public/images/emoji/emoji_one/hearts.png
index 05940e09a9b..1519f67e30a 100644
Binary files a/public/images/emoji/emoji_one/hearts.png and b/public/images/emoji/emoji_one/hearts.png differ
diff --git a/public/images/emoji/emoji_one/heavy_check_mark.png b/public/images/emoji/emoji_one/heavy_check_mark.png
index bdfd6ffe61a..b38daec29ba 100644
Binary files a/public/images/emoji/emoji_one/heavy_check_mark.png and b/public/images/emoji/emoji_one/heavy_check_mark.png differ
diff --git a/public/images/emoji/emoji_one/heavy_division_sign.png b/public/images/emoji/emoji_one/heavy_division_sign.png
index 01f7f53e911..a14bba2824d 100644
Binary files a/public/images/emoji/emoji_one/heavy_division_sign.png and b/public/images/emoji/emoji_one/heavy_division_sign.png differ
diff --git a/public/images/emoji/emoji_one/heavy_dollar_sign.png b/public/images/emoji/emoji_one/heavy_dollar_sign.png
index ed216482d32..aa7de5034cb 100644
Binary files a/public/images/emoji/emoji_one/heavy_dollar_sign.png and b/public/images/emoji/emoji_one/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/emoji_one/heavy_heart_exclamation.png b/public/images/emoji/emoji_one/heavy_heart_exclamation.png
new file mode 100644
index 00000000000..9b71feda22f
Binary files /dev/null and b/public/images/emoji/emoji_one/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/emoji_one/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/emoji_one/heavy_heart_exclamation_mark_ornament.png
index 1681e8f7ef0..9b71feda22f 100644
Binary files a/public/images/emoji/emoji_one/heavy_heart_exclamation_mark_ornament.png and b/public/images/emoji/emoji_one/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/emoji_one/heavy_minus_sign.png b/public/images/emoji/emoji_one/heavy_minus_sign.png
index 67b932ea11e..d04c71a7932 100644
Binary files a/public/images/emoji/emoji_one/heavy_minus_sign.png and b/public/images/emoji/emoji_one/heavy_minus_sign.png differ
diff --git a/public/images/emoji/emoji_one/heavy_multiplication_x.png b/public/images/emoji/emoji_one/heavy_multiplication_x.png
index 19f7c3c88a2..949ec240a09 100644
Binary files a/public/images/emoji/emoji_one/heavy_multiplication_x.png and b/public/images/emoji/emoji_one/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/emoji_one/heavy_plus_sign.png b/public/images/emoji/emoji_one/heavy_plus_sign.png
index 8e01b051637..9d9d3434a37 100644
Binary files a/public/images/emoji/emoji_one/heavy_plus_sign.png and b/public/images/emoji/emoji_one/heavy_plus_sign.png differ
diff --git a/public/images/emoji/emoji_one/hedgehog.png b/public/images/emoji/emoji_one/hedgehog.png
new file mode 100644
index 00000000000..9b978b35407
Binary files /dev/null and b/public/images/emoji/emoji_one/hedgehog.png differ
diff --git a/public/images/emoji/emoji_one/helicopter.png b/public/images/emoji/emoji_one/helicopter.png
index 12bd8af3a22..7f2aee88200 100644
Binary files a/public/images/emoji/emoji_one/helicopter.png and b/public/images/emoji/emoji_one/helicopter.png differ
diff --git a/public/images/emoji/emoji_one/helmet_with_cross.png b/public/images/emoji/emoji_one/helmet_with_cross.png
index 69fb69aecdc..baaa54a80ba 100644
Binary files a/public/images/emoji/emoji_one/helmet_with_cross.png and b/public/images/emoji/emoji_one/helmet_with_cross.png differ
diff --git a/public/images/emoji/emoji_one/helmet_with_white_cross.png b/public/images/emoji/emoji_one/helmet_with_white_cross.png
index 69fb69aecdc..baaa54a80ba 100644
Binary files a/public/images/emoji/emoji_one/helmet_with_white_cross.png and b/public/images/emoji/emoji_one/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/emoji_one/herb.png b/public/images/emoji/emoji_one/herb.png
index 187cfbb2989..10ac21d8464 100644
Binary files a/public/images/emoji/emoji_one/herb.png and b/public/images/emoji/emoji_one/herb.png differ
diff --git a/public/images/emoji/emoji_one/hibiscus.png b/public/images/emoji/emoji_one/hibiscus.png
index 089b713af4b..8a4c0e5f774 100644
Binary files a/public/images/emoji/emoji_one/hibiscus.png and b/public/images/emoji/emoji_one/hibiscus.png differ
diff --git a/public/images/emoji/emoji_one/high_brightness.png b/public/images/emoji/emoji_one/high_brightness.png
index 22a0f0f5701..1d05b5c0fcb 100644
Binary files a/public/images/emoji/emoji_one/high_brightness.png and b/public/images/emoji/emoji_one/high_brightness.png differ
diff --git a/public/images/emoji/emoji_one/high_heel.png b/public/images/emoji/emoji_one/high_heel.png
index ff6e4175e52..a926e113f1f 100644
Binary files a/public/images/emoji/emoji_one/high_heel.png and b/public/images/emoji/emoji_one/high_heel.png differ
diff --git a/public/images/emoji/emoji_one/hocho.png b/public/images/emoji/emoji_one/hocho.png
new file mode 100644
index 00000000000..424f71da6dd
Binary files /dev/null and b/public/images/emoji/emoji_one/hocho.png differ
diff --git a/public/images/emoji/emoji_one/hockey.png b/public/images/emoji/emoji_one/hockey.png
index c823244d3ec..93209139306 100644
Binary files a/public/images/emoji/emoji_one/hockey.png and b/public/images/emoji/emoji_one/hockey.png differ
diff --git a/public/images/emoji/emoji_one/hole.png b/public/images/emoji/emoji_one/hole.png
index 6c4295d8c74..b5f436ced58 100644
Binary files a/public/images/emoji/emoji_one/hole.png and b/public/images/emoji/emoji_one/hole.png differ
diff --git a/public/images/emoji/emoji_one/homes.png b/public/images/emoji/emoji_one/homes.png
index 5b71e139cc0..30bd5e1745b 100644
Binary files a/public/images/emoji/emoji_one/homes.png and b/public/images/emoji/emoji_one/homes.png differ
diff --git a/public/images/emoji/emoji_one/honduras.png b/public/images/emoji/emoji_one/honduras.png
new file mode 100644
index 00000000000..d0aff11833e
Binary files /dev/null and b/public/images/emoji/emoji_one/honduras.png differ
diff --git a/public/images/emoji/emoji_one/honey_pot.png b/public/images/emoji/emoji_one/honey_pot.png
index e50fde0b32a..f6c4ad460b2 100644
Binary files a/public/images/emoji/emoji_one/honey_pot.png and b/public/images/emoji/emoji_one/honey_pot.png differ
diff --git a/public/images/emoji/emoji_one/honeybee.png b/public/images/emoji/emoji_one/honeybee.png
new file mode 100644
index 00000000000..d5e6708eeaf
Binary files /dev/null and b/public/images/emoji/emoji_one/honeybee.png differ
diff --git a/public/images/emoji/emoji_one/hong_kong.png b/public/images/emoji/emoji_one/hong_kong.png
new file mode 100644
index 00000000000..9db8cbc1023
Binary files /dev/null and b/public/images/emoji/emoji_one/hong_kong.png differ
diff --git a/public/images/emoji/emoji_one/horse.png b/public/images/emoji/emoji_one/horse.png
index 6492b7b276a..a9838e4441c 100644
Binary files a/public/images/emoji/emoji_one/horse.png and b/public/images/emoji/emoji_one/horse.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing.png b/public/images/emoji/emoji_one/horse_racing.png
index e56f8bf7e25..f9e9eb5017b 100644
Binary files a/public/images/emoji/emoji_one/horse_racing.png and b/public/images/emoji/emoji_one/horse_racing.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing/2.png b/public/images/emoji/emoji_one/horse_racing/2.png
new file mode 100644
index 00000000000..a9ad5fa065b
Binary files /dev/null and b/public/images/emoji/emoji_one/horse_racing/2.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing/3.png b/public/images/emoji/emoji_one/horse_racing/3.png
new file mode 100644
index 00000000000..2dcfa730b9b
Binary files /dev/null and b/public/images/emoji/emoji_one/horse_racing/3.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing/4.png b/public/images/emoji/emoji_one/horse_racing/4.png
new file mode 100644
index 00000000000..3d4d12bd284
Binary files /dev/null and b/public/images/emoji/emoji_one/horse_racing/4.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing/5.png b/public/images/emoji/emoji_one/horse_racing/5.png
new file mode 100644
index 00000000000..bb338856279
Binary files /dev/null and b/public/images/emoji/emoji_one/horse_racing/5.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing/6.png b/public/images/emoji/emoji_one/horse_racing/6.png
new file mode 100644
index 00000000000..ccbd586d39c
Binary files /dev/null and b/public/images/emoji/emoji_one/horse_racing/6.png differ
diff --git a/public/images/emoji/emoji_one/hospital.png b/public/images/emoji/emoji_one/hospital.png
index fbcc8810fb6..813a0881717 100644
Binary files a/public/images/emoji/emoji_one/hospital.png and b/public/images/emoji/emoji_one/hospital.png differ
diff --git a/public/images/emoji/emoji_one/hot_dog.png b/public/images/emoji/emoji_one/hot_dog.png
index 8c8be9c674f..5abbee3d83c 100644
Binary files a/public/images/emoji/emoji_one/hot_dog.png and b/public/images/emoji/emoji_one/hot_dog.png differ
diff --git a/public/images/emoji/emoji_one/hot_pepper.png b/public/images/emoji/emoji_one/hot_pepper.png
index acc504504f9..58421228e39 100644
Binary files a/public/images/emoji/emoji_one/hot_pepper.png and b/public/images/emoji/emoji_one/hot_pepper.png differ
diff --git a/public/images/emoji/emoji_one/hotdog.png b/public/images/emoji/emoji_one/hotdog.png
index 8c8be9c674f..5abbee3d83c 100644
Binary files a/public/images/emoji/emoji_one/hotdog.png and b/public/images/emoji/emoji_one/hotdog.png differ
diff --git a/public/images/emoji/emoji_one/hotel.png b/public/images/emoji/emoji_one/hotel.png
index e55ac62225e..7a052e9728e 100644
Binary files a/public/images/emoji/emoji_one/hotel.png and b/public/images/emoji/emoji_one/hotel.png differ
diff --git a/public/images/emoji/emoji_one/hotsprings.png b/public/images/emoji/emoji_one/hotsprings.png
index ef0695d8fbf..472a0dd5711 100644
Binary files a/public/images/emoji/emoji_one/hotsprings.png and b/public/images/emoji/emoji_one/hotsprings.png differ
diff --git a/public/images/emoji/emoji_one/hourglass.png b/public/images/emoji/emoji_one/hourglass.png
index 67fe759184b..20d105539b7 100644
Binary files a/public/images/emoji/emoji_one/hourglass.png and b/public/images/emoji/emoji_one/hourglass.png differ
diff --git a/public/images/emoji/emoji_one/hourglass_flowing_sand.png b/public/images/emoji/emoji_one/hourglass_flowing_sand.png
index 0b195a642a6..334b2c251ae 100644
Binary files a/public/images/emoji/emoji_one/hourglass_flowing_sand.png and b/public/images/emoji/emoji_one/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/emoji_one/house.png b/public/images/emoji/emoji_one/house.png
index aab3e65d5e1..887377556b1 100644
Binary files a/public/images/emoji/emoji_one/house.png and b/public/images/emoji/emoji_one/house.png differ
diff --git a/public/images/emoji/emoji_one/house_abandoned.png b/public/images/emoji/emoji_one/house_abandoned.png
index 46775f0e723..64245d87a28 100644
Binary files a/public/images/emoji/emoji_one/house_abandoned.png and b/public/images/emoji/emoji_one/house_abandoned.png differ
diff --git a/public/images/emoji/emoji_one/house_buildings.png b/public/images/emoji/emoji_one/house_buildings.png
index 5b71e139cc0..30bd5e1745b 100644
Binary files a/public/images/emoji/emoji_one/house_buildings.png and b/public/images/emoji/emoji_one/house_buildings.png differ
diff --git a/public/images/emoji/emoji_one/house_with_garden.png b/public/images/emoji/emoji_one/house_with_garden.png
index 367277f8940..ed95efeae62 100644
Binary files a/public/images/emoji/emoji_one/house_with_garden.png and b/public/images/emoji/emoji_one/house_with_garden.png differ
diff --git a/public/images/emoji/emoji_one/houses.png b/public/images/emoji/emoji_one/houses.png
new file mode 100644
index 00000000000..30bd5e1745b
Binary files /dev/null and b/public/images/emoji/emoji_one/houses.png differ
diff --git a/public/images/emoji/emoji_one/hugging.png b/public/images/emoji/emoji_one/hugging.png
index 943cbd58ec4..126b51a8f32 100644
Binary files a/public/images/emoji/emoji_one/hugging.png and b/public/images/emoji/emoji_one/hugging.png differ
diff --git a/public/images/emoji/emoji_one/hugging_face.png b/public/images/emoji/emoji_one/hugging_face.png
index 943cbd58ec4..126b51a8f32 100644
Binary files a/public/images/emoji/emoji_one/hugging_face.png and b/public/images/emoji/emoji_one/hugging_face.png differ
diff --git a/public/images/emoji/emoji_one/hugs.png b/public/images/emoji/emoji_one/hugs.png
new file mode 100644
index 00000000000..126b51a8f32
Binary files /dev/null and b/public/images/emoji/emoji_one/hugs.png differ
diff --git a/public/images/emoji/emoji_one/hungary.png b/public/images/emoji/emoji_one/hungary.png
new file mode 100644
index 00000000000..98963a97c99
Binary files /dev/null and b/public/images/emoji/emoji_one/hungary.png differ
diff --git a/public/images/emoji/emoji_one/hushed.png b/public/images/emoji/emoji_one/hushed.png
index f0034c2ddc5..13c71f47fcb 100644
Binary files a/public/images/emoji/emoji_one/hushed.png and b/public/images/emoji/emoji_one/hushed.png differ
diff --git a/public/images/emoji/emoji_one/ice_cream.png b/public/images/emoji/emoji_one/ice_cream.png
index 590cd7f69d2..a12bb8782a0 100644
Binary files a/public/images/emoji/emoji_one/ice_cream.png and b/public/images/emoji/emoji_one/ice_cream.png differ
diff --git a/public/images/emoji/emoji_one/ice_hockey.png b/public/images/emoji/emoji_one/ice_hockey.png
new file mode 100644
index 00000000000..93209139306
Binary files /dev/null and b/public/images/emoji/emoji_one/ice_hockey.png differ
diff --git a/public/images/emoji/emoji_one/ice_skate.png b/public/images/emoji/emoji_one/ice_skate.png
index 5bab861e1c3..b42483a959f 100644
Binary files a/public/images/emoji/emoji_one/ice_skate.png and b/public/images/emoji/emoji_one/ice_skate.png differ
diff --git a/public/images/emoji/emoji_one/icecream.png b/public/images/emoji/emoji_one/icecream.png
index 682e7ce18ed..bbeeff15dde 100644
Binary files a/public/images/emoji/emoji_one/icecream.png and b/public/images/emoji/emoji_one/icecream.png differ
diff --git a/public/images/emoji/emoji_one/iceland.png b/public/images/emoji/emoji_one/iceland.png
new file mode 100644
index 00000000000..399f5a4e85d
Binary files /dev/null and b/public/images/emoji/emoji_one/iceland.png differ
diff --git a/public/images/emoji/emoji_one/id.png b/public/images/emoji/emoji_one/id.png
index 85dee4fadb8..035277e5839 100644
Binary files a/public/images/emoji/emoji_one/id.png and b/public/images/emoji/emoji_one/id.png differ
diff --git a/public/images/emoji/emoji_one/ideograph_advantage.png b/public/images/emoji/emoji_one/ideograph_advantage.png
index 6e90af68004..2f8a6f9e8d1 100644
Binary files a/public/images/emoji/emoji_one/ideograph_advantage.png and b/public/images/emoji/emoji_one/ideograph_advantage.png differ
diff --git a/public/images/emoji/emoji_one/imp.png b/public/images/emoji/emoji_one/imp.png
index f529737a212..2f5a8921432 100644
Binary files a/public/images/emoji/emoji_one/imp.png and b/public/images/emoji/emoji_one/imp.png differ
diff --git a/public/images/emoji/emoji_one/inbox_tray.png b/public/images/emoji/emoji_one/inbox_tray.png
index 898808bc3f3..e9b1a9abe31 100644
Binary files a/public/images/emoji/emoji_one/inbox_tray.png and b/public/images/emoji/emoji_one/inbox_tray.png differ
diff --git a/public/images/emoji/emoji_one/incoming_envelope.png b/public/images/emoji/emoji_one/incoming_envelope.png
index accf3e3ae13..a2b5133b2e9 100644
Binary files a/public/images/emoji/emoji_one/incoming_envelope.png and b/public/images/emoji/emoji_one/incoming_envelope.png differ
diff --git a/public/images/emoji/emoji_one/india.png b/public/images/emoji/emoji_one/india.png
new file mode 100644
index 00000000000..b95563b7877
Binary files /dev/null and b/public/images/emoji/emoji_one/india.png differ
diff --git a/public/images/emoji/emoji_one/indonesia.png b/public/images/emoji/emoji_one/indonesia.png
new file mode 100644
index 00000000000..09e63e6b9f8
Binary files /dev/null and b/public/images/emoji/emoji_one/indonesia.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person.png b/public/images/emoji/emoji_one/information_desk_person.png
index de5ae41170f..919dff8d5b6 100644
Binary files a/public/images/emoji/emoji_one/information_desk_person.png and b/public/images/emoji/emoji_one/information_desk_person.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person/2.png b/public/images/emoji/emoji_one/information_desk_person/2.png
new file mode 100644
index 00000000000..c5ac40f6d79
Binary files /dev/null and b/public/images/emoji/emoji_one/information_desk_person/2.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person/3.png b/public/images/emoji/emoji_one/information_desk_person/3.png
new file mode 100644
index 00000000000..40d67b2e4e6
Binary files /dev/null and b/public/images/emoji/emoji_one/information_desk_person/3.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person/4.png b/public/images/emoji/emoji_one/information_desk_person/4.png
new file mode 100644
index 00000000000..28e222afc0c
Binary files /dev/null and b/public/images/emoji/emoji_one/information_desk_person/4.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person/5.png b/public/images/emoji/emoji_one/information_desk_person/5.png
new file mode 100644
index 00000000000..cf2033c7d9b
Binary files /dev/null and b/public/images/emoji/emoji_one/information_desk_person/5.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person/6.png b/public/images/emoji/emoji_one/information_desk_person/6.png
new file mode 100644
index 00000000000..2284126f875
Binary files /dev/null and b/public/images/emoji/emoji_one/information_desk_person/6.png differ
diff --git a/public/images/emoji/emoji_one/information_source.png b/public/images/emoji/emoji_one/information_source.png
index 804be347dc6..3cbfd6d5886 100644
Binary files a/public/images/emoji/emoji_one/information_source.png and b/public/images/emoji/emoji_one/information_source.png differ
diff --git a/public/images/emoji/emoji_one/innocent.png b/public/images/emoji/emoji_one/innocent.png
index 1ce2f424885..720506dbd8c 100644
Binary files a/public/images/emoji/emoji_one/innocent.png and b/public/images/emoji/emoji_one/innocent.png differ
diff --git a/public/images/emoji/emoji_one/interrobang.png b/public/images/emoji/emoji_one/interrobang.png
index 0374985514a..b4f029ab5df 100644
Binary files a/public/images/emoji/emoji_one/interrobang.png and b/public/images/emoji/emoji_one/interrobang.png differ
diff --git a/public/images/emoji/emoji_one/iphone.png b/public/images/emoji/emoji_one/iphone.png
index 260c82fc13d..075eea26197 100644
Binary files a/public/images/emoji/emoji_one/iphone.png and b/public/images/emoji/emoji_one/iphone.png differ
diff --git a/public/images/emoji/emoji_one/iran.png b/public/images/emoji/emoji_one/iran.png
new file mode 100644
index 00000000000..e30df4c1f50
Binary files /dev/null and b/public/images/emoji/emoji_one/iran.png differ
diff --git a/public/images/emoji/emoji_one/iraq.png b/public/images/emoji/emoji_one/iraq.png
new file mode 100644
index 00000000000..cccd140ba3c
Binary files /dev/null and b/public/images/emoji/emoji_one/iraq.png differ
diff --git a/public/images/emoji/emoji_one/ireland.png b/public/images/emoji/emoji_one/ireland.png
new file mode 100644
index 00000000000..b97ecbcbd48
Binary files /dev/null and b/public/images/emoji/emoji_one/ireland.png differ
diff --git a/public/images/emoji/emoji_one/island.png b/public/images/emoji/emoji_one/island.png
index 31cd39ce484..066667053a4 100644
Binary files a/public/images/emoji/emoji_one/island.png and b/public/images/emoji/emoji_one/island.png differ
diff --git a/public/images/emoji/emoji_one/isle_of_man.png b/public/images/emoji/emoji_one/isle_of_man.png
new file mode 100644
index 00000000000..7829f538f8e
Binary files /dev/null and b/public/images/emoji/emoji_one/isle_of_man.png differ
diff --git a/public/images/emoji/emoji_one/israel.png b/public/images/emoji/emoji_one/israel.png
new file mode 100644
index 00000000000..f7bc67925db
Binary files /dev/null and b/public/images/emoji/emoji_one/israel.png differ
diff --git a/public/images/emoji/emoji_one/it.png b/public/images/emoji/emoji_one/it.png
index 2ed2a1067fb..13bbb1b1f8d 100644
Binary files a/public/images/emoji/emoji_one/it.png and b/public/images/emoji/emoji_one/it.png differ
diff --git a/public/images/emoji/emoji_one/izakaya_lantern.png b/public/images/emoji/emoji_one/izakaya_lantern.png
index e94bc65ef7e..1f0bf5eb2c7 100644
Binary files a/public/images/emoji/emoji_one/izakaya_lantern.png and b/public/images/emoji/emoji_one/izakaya_lantern.png differ
diff --git a/public/images/emoji/emoji_one/jack_o_lantern.png b/public/images/emoji/emoji_one/jack_o_lantern.png
index 59db13956e1..47fbb60f0fb 100644
Binary files a/public/images/emoji/emoji_one/jack_o_lantern.png and b/public/images/emoji/emoji_one/jack_o_lantern.png differ
diff --git a/public/images/emoji/emoji_one/jamaica.png b/public/images/emoji/emoji_one/jamaica.png
new file mode 100644
index 00000000000..dc2c8075112
Binary files /dev/null and b/public/images/emoji/emoji_one/jamaica.png differ
diff --git a/public/images/emoji/emoji_one/japan.png b/public/images/emoji/emoji_one/japan.png
index 3e0a4c25812..706d08d4557 100644
Binary files a/public/images/emoji/emoji_one/japan.png and b/public/images/emoji/emoji_one/japan.png differ
diff --git a/public/images/emoji/emoji_one/japanese_castle.png b/public/images/emoji/emoji_one/japanese_castle.png
index 89f4f2eed08..ac6b09669f2 100644
Binary files a/public/images/emoji/emoji_one/japanese_castle.png and b/public/images/emoji/emoji_one/japanese_castle.png differ
diff --git a/public/images/emoji/emoji_one/japanese_goblin.png b/public/images/emoji/emoji_one/japanese_goblin.png
index 7062e78b785..32736b148a1 100644
Binary files a/public/images/emoji/emoji_one/japanese_goblin.png and b/public/images/emoji/emoji_one/japanese_goblin.png differ
diff --git a/public/images/emoji/emoji_one/japanese_ogre.png b/public/images/emoji/emoji_one/japanese_ogre.png
index 3a5b0852021..31262474915 100644
Binary files a/public/images/emoji/emoji_one/japanese_ogre.png and b/public/images/emoji/emoji_one/japanese_ogre.png differ
diff --git a/public/images/emoji/emoji_one/jeans.png b/public/images/emoji/emoji_one/jeans.png
index 69afa71ae22..93a833ac499 100644
Binary files a/public/images/emoji/emoji_one/jeans.png and b/public/images/emoji/emoji_one/jeans.png differ
diff --git a/public/images/emoji/emoji_one/jersey.png b/public/images/emoji/emoji_one/jersey.png
new file mode 100644
index 00000000000..adfdbc3c1a6
Binary files /dev/null and b/public/images/emoji/emoji_one/jersey.png differ
diff --git a/public/images/emoji/emoji_one/jordan.png b/public/images/emoji/emoji_one/jordan.png
new file mode 100644
index 00000000000..43a2f9139f4
Binary files /dev/null and b/public/images/emoji/emoji_one/jordan.png differ
diff --git a/public/images/emoji/emoji_one/joy.png b/public/images/emoji/emoji_one/joy.png
index bd03f964525..bb973cad4c4 100644
Binary files a/public/images/emoji/emoji_one/joy.png and b/public/images/emoji/emoji_one/joy.png differ
diff --git a/public/images/emoji/emoji_one/joy_cat.png b/public/images/emoji/emoji_one/joy_cat.png
index d39094fb84f..a6e2f9d5df9 100644
Binary files a/public/images/emoji/emoji_one/joy_cat.png and b/public/images/emoji/emoji_one/joy_cat.png differ
diff --git a/public/images/emoji/emoji_one/joystick.png b/public/images/emoji/emoji_one/joystick.png
index 00f771132c6..39bb07cf970 100644
Binary files a/public/images/emoji/emoji_one/joystick.png and b/public/images/emoji/emoji_one/joystick.png differ
diff --git a/public/images/emoji/emoji_one/jp.png b/public/images/emoji/emoji_one/jp.png
index 2e6ceab8f35..cca79ffb9dc 100644
Binary files a/public/images/emoji/emoji_one/jp.png and b/public/images/emoji/emoji_one/jp.png differ
diff --git a/public/images/emoji/emoji_one/kaaba.png b/public/images/emoji/emoji_one/kaaba.png
index ff82545117f..27da72c4771 100644
Binary files a/public/images/emoji/emoji_one/kaaba.png and b/public/images/emoji/emoji_one/kaaba.png differ
diff --git a/public/images/emoji/emoji_one/kazakhstan.png b/public/images/emoji/emoji_one/kazakhstan.png
new file mode 100644
index 00000000000..731858e2cfa
Binary files /dev/null and b/public/images/emoji/emoji_one/kazakhstan.png differ
diff --git a/public/images/emoji/emoji_one/kenya.png b/public/images/emoji/emoji_one/kenya.png
new file mode 100644
index 00000000000..cc55fd69815
Binary files /dev/null and b/public/images/emoji/emoji_one/kenya.png differ
diff --git a/public/images/emoji/emoji_one/key.png b/public/images/emoji/emoji_one/key.png
index 0f70b453194..f7e6219c1c2 100644
Binary files a/public/images/emoji/emoji_one/key.png and b/public/images/emoji/emoji_one/key.png differ
diff --git a/public/images/emoji/emoji_one/key2.png b/public/images/emoji/emoji_one/key2.png
index f74bb1ba0d5..de500e10539 100644
Binary files a/public/images/emoji/emoji_one/key2.png and b/public/images/emoji/emoji_one/key2.png differ
diff --git a/public/images/emoji/emoji_one/keyboard.png b/public/images/emoji/emoji_one/keyboard.png
index 567abcdc671..8797ad5ac20 100644
Binary files a/public/images/emoji/emoji_one/keyboard.png and b/public/images/emoji/emoji_one/keyboard.png differ
diff --git a/public/images/emoji/emoji_one/keycap_star.png b/public/images/emoji/emoji_one/keycap_star.png
index 8ed4edab8fc..62044fc235d 100644
Binary files a/public/images/emoji/emoji_one/keycap_star.png and b/public/images/emoji/emoji_one/keycap_star.png differ
diff --git a/public/images/emoji/emoji_one/keycap_ten.png b/public/images/emoji/emoji_one/keycap_ten.png
new file mode 100644
index 00000000000..c700426ad46
Binary files /dev/null and b/public/images/emoji/emoji_one/keycap_ten.png differ
diff --git a/public/images/emoji/emoji_one/kick_scooter.png b/public/images/emoji/emoji_one/kick_scooter.png
new file mode 100644
index 00000000000..517c1e0de1b
Binary files /dev/null and b/public/images/emoji/emoji_one/kick_scooter.png differ
diff --git a/public/images/emoji/emoji_one/kimono.png b/public/images/emoji/emoji_one/kimono.png
index 8c484aa033c..582c64bf2d5 100644
Binary files a/public/images/emoji/emoji_one/kimono.png and b/public/images/emoji/emoji_one/kimono.png differ
diff --git a/public/images/emoji/emoji_one/kiribati.png b/public/images/emoji/emoji_one/kiribati.png
new file mode 100644
index 00000000000..138fd3f2b5b
Binary files /dev/null and b/public/images/emoji/emoji_one/kiribati.png differ
diff --git a/public/images/emoji/emoji_one/kiss.png b/public/images/emoji/emoji_one/kiss.png
index c9f34379c72..c5898960ef1 100644
Binary files a/public/images/emoji/emoji_one/kiss.png and b/public/images/emoji/emoji_one/kiss.png differ
diff --git a/public/images/emoji/emoji_one/kissing.png b/public/images/emoji/emoji_one/kissing.png
index 8d8a6a62815..7b879ae8fb2 100644
Binary files a/public/images/emoji/emoji_one/kissing.png and b/public/images/emoji/emoji_one/kissing.png differ
diff --git a/public/images/emoji/emoji_one/kissing_cat.png b/public/images/emoji/emoji_one/kissing_cat.png
index 7748ac1c6a1..995ca2d82d6 100644
Binary files a/public/images/emoji/emoji_one/kissing_cat.png and b/public/images/emoji/emoji_one/kissing_cat.png differ
diff --git a/public/images/emoji/emoji_one/kissing_closed_eyes.png b/public/images/emoji/emoji_one/kissing_closed_eyes.png
index 281cd063c44..148a00480ee 100644
Binary files a/public/images/emoji/emoji_one/kissing_closed_eyes.png and b/public/images/emoji/emoji_one/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/emoji_one/kissing_heart.png b/public/images/emoji/emoji_one/kissing_heart.png
index 5f96a71da8e..ad478470968 100644
Binary files a/public/images/emoji/emoji_one/kissing_heart.png and b/public/images/emoji/emoji_one/kissing_heart.png differ
diff --git a/public/images/emoji/emoji_one/kissing_smiling_eyes.png b/public/images/emoji/emoji_one/kissing_smiling_eyes.png
index d953846be69..3cd89c91ab4 100644
Binary files a/public/images/emoji/emoji_one/kissing_smiling_eyes.png and b/public/images/emoji/emoji_one/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/emoji_one/kiwi_fruit.png b/public/images/emoji/emoji_one/kiwi_fruit.png
new file mode 100644
index 00000000000..d19965a3acd
Binary files /dev/null and b/public/images/emoji/emoji_one/kiwi_fruit.png differ
diff --git a/public/images/emoji/emoji_one/knife.png b/public/images/emoji/emoji_one/knife.png
index 0a362fcf919..424f71da6dd 100644
Binary files a/public/images/emoji/emoji_one/knife.png and b/public/images/emoji/emoji_one/knife.png differ
diff --git a/public/images/emoji/emoji_one/koala.png b/public/images/emoji/emoji_one/koala.png
index 468c0bbb59a..3ec0ddb0435 100644
Binary files a/public/images/emoji/emoji_one/koala.png and b/public/images/emoji/emoji_one/koala.png differ
diff --git a/public/images/emoji/emoji_one/koko.png b/public/images/emoji/emoji_one/koko.png
index 0f9165d56e7..e1866311aba 100644
Binary files a/public/images/emoji/emoji_one/koko.png and b/public/images/emoji/emoji_one/koko.png differ
diff --git a/public/images/emoji/emoji_one/kosovo.png b/public/images/emoji/emoji_one/kosovo.png
new file mode 100644
index 00000000000..efea0b70bde
Binary files /dev/null and b/public/images/emoji/emoji_one/kosovo.png differ
diff --git a/public/images/emoji/emoji_one/kr.png b/public/images/emoji/emoji_one/kr.png
index fe1d26475a6..82486f8812c 100644
Binary files a/public/images/emoji/emoji_one/kr.png and b/public/images/emoji/emoji_one/kr.png differ
diff --git a/public/images/emoji/emoji_one/kuwait.png b/public/images/emoji/emoji_one/kuwait.png
new file mode 100644
index 00000000000..32b00e4806d
Binary files /dev/null and b/public/images/emoji/emoji_one/kuwait.png differ
diff --git a/public/images/emoji/emoji_one/kyrgyzstan.png b/public/images/emoji/emoji_one/kyrgyzstan.png
new file mode 100644
index 00000000000..6ecfc717c9b
Binary files /dev/null and b/public/images/emoji/emoji_one/kyrgyzstan.png differ
diff --git a/public/images/emoji/emoji_one/label.png b/public/images/emoji/emoji_one/label.png
index 22ffb4e4f7e..8b1a07485c4 100644
Binary files a/public/images/emoji/emoji_one/label.png and b/public/images/emoji/emoji_one/label.png differ
diff --git a/public/images/emoji/emoji_one/laos.png b/public/images/emoji/emoji_one/laos.png
new file mode 100644
index 00000000000..5dca502f80e
Binary files /dev/null and b/public/images/emoji/emoji_one/laos.png differ
diff --git a/public/images/emoji/emoji_one/large_blue_circle.png b/public/images/emoji/emoji_one/large_blue_circle.png
index 0b42623bbe7..c8e59db6b66 100644
Binary files a/public/images/emoji/emoji_one/large_blue_circle.png and b/public/images/emoji/emoji_one/large_blue_circle.png differ
diff --git a/public/images/emoji/emoji_one/large_blue_diamond.png b/public/images/emoji/emoji_one/large_blue_diamond.png
index bc03e0bb1a4..d1ca9c1f779 100644
Binary files a/public/images/emoji/emoji_one/large_blue_diamond.png and b/public/images/emoji/emoji_one/large_blue_diamond.png differ
diff --git a/public/images/emoji/emoji_one/large_orange_diamond.png b/public/images/emoji/emoji_one/large_orange_diamond.png
index a32f924666d..a344caa6755 100644
Binary files a/public/images/emoji/emoji_one/large_orange_diamond.png and b/public/images/emoji/emoji_one/large_orange_diamond.png differ
diff --git a/public/images/emoji/emoji_one/last_quarter_moon.png b/public/images/emoji/emoji_one/last_quarter_moon.png
index 6d1a11286ec..a3a0e675584 100644
Binary files a/public/images/emoji/emoji_one/last_quarter_moon.png and b/public/images/emoji/emoji_one/last_quarter_moon.png differ
diff --git a/public/images/emoji/emoji_one/last_quarter_moon_with_face.png b/public/images/emoji/emoji_one/last_quarter_moon_with_face.png
index abc381fa698..f5660dd76fd 100644
Binary files a/public/images/emoji/emoji_one/last_quarter_moon_with_face.png and b/public/images/emoji/emoji_one/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/emoji_one/latin_cross.png b/public/images/emoji/emoji_one/latin_cross.png
index 5a331bcf4c8..01917085040 100644
Binary files a/public/images/emoji/emoji_one/latin_cross.png and b/public/images/emoji/emoji_one/latin_cross.png differ
diff --git a/public/images/emoji/emoji_one/latvia.png b/public/images/emoji/emoji_one/latvia.png
new file mode 100644
index 00000000000..a23d4c4e2e6
Binary files /dev/null and b/public/images/emoji/emoji_one/latvia.png differ
diff --git a/public/images/emoji/emoji_one/laughing.png b/public/images/emoji/emoji_one/laughing.png
index a6594d2e5df..ffa2477caa6 100644
Binary files a/public/images/emoji/emoji_one/laughing.png and b/public/images/emoji/emoji_one/laughing.png differ
diff --git a/public/images/emoji/emoji_one/leaves.png b/public/images/emoji/emoji_one/leaves.png
index fcbc5738289..aa6fc9b3ded 100644
Binary files a/public/images/emoji/emoji_one/leaves.png and b/public/images/emoji/emoji_one/leaves.png differ
diff --git a/public/images/emoji/emoji_one/lebanon.png b/public/images/emoji/emoji_one/lebanon.png
new file mode 100644
index 00000000000..5b8710dfd72
Binary files /dev/null and b/public/images/emoji/emoji_one/lebanon.png differ
diff --git a/public/images/emoji/emoji_one/ledger.png b/public/images/emoji/emoji_one/ledger.png
index 3388720915e..a06929b3364 100644
Binary files a/public/images/emoji/emoji_one/ledger.png and b/public/images/emoji/emoji_one/ledger.png differ
diff --git a/public/images/emoji/emoji_one/left_luggage.png b/public/images/emoji/emoji_one/left_luggage.png
index 06c44012ffb..54492aee67a 100644
Binary files a/public/images/emoji/emoji_one/left_luggage.png and b/public/images/emoji/emoji_one/left_luggage.png differ
diff --git a/public/images/emoji/emoji_one/left_right_arrow.png b/public/images/emoji/emoji_one/left_right_arrow.png
index dec7a12837c..aac3acd2ff3 100644
Binary files a/public/images/emoji/emoji_one/left_right_arrow.png and b/public/images/emoji/emoji_one/left_right_arrow.png differ
diff --git a/public/images/emoji/emoji_one/left_speech_bubble.png b/public/images/emoji/emoji_one/left_speech_bubble.png
index 512d9b80423..fbce00d4d56 100644
Binary files a/public/images/emoji/emoji_one/left_speech_bubble.png and b/public/images/emoji/emoji_one/left_speech_bubble.png differ
diff --git a/public/images/emoji/emoji_one/leftwards_arrow_with_hook.png b/public/images/emoji/emoji_one/leftwards_arrow_with_hook.png
index 84591b34534..99ddce2ace5 100644
Binary files a/public/images/emoji/emoji_one/leftwards_arrow_with_hook.png and b/public/images/emoji/emoji_one/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/emoji_one/lemon.png b/public/images/emoji/emoji_one/lemon.png
index 41cde313ed2..9093465eafd 100644
Binary files a/public/images/emoji/emoji_one/lemon.png and b/public/images/emoji/emoji_one/lemon.png differ
diff --git a/public/images/emoji/emoji_one/leo.png b/public/images/emoji/emoji_one/leo.png
index b7e388b5d0c..dde178ed1a2 100644
Binary files a/public/images/emoji/emoji_one/leo.png and b/public/images/emoji/emoji_one/leo.png differ
diff --git a/public/images/emoji/emoji_one/leopard.png b/public/images/emoji/emoji_one/leopard.png
index 16ff654c7e2..5cb90ca503b 100644
Binary files a/public/images/emoji/emoji_one/leopard.png and b/public/images/emoji/emoji_one/leopard.png differ
diff --git a/public/images/emoji/emoji_one/lesotho.png b/public/images/emoji/emoji_one/lesotho.png
new file mode 100644
index 00000000000..136ea59d3dc
Binary files /dev/null and b/public/images/emoji/emoji_one/lesotho.png differ
diff --git a/public/images/emoji/emoji_one/level_slider.png b/public/images/emoji/emoji_one/level_slider.png
index 5879173a69d..a099a9bd014 100644
Binary files a/public/images/emoji/emoji_one/level_slider.png and b/public/images/emoji/emoji_one/level_slider.png differ
diff --git a/public/images/emoji/emoji_one/levitate.png b/public/images/emoji/emoji_one/levitate.png
index bd51cd5fb8c..f25e14fd06d 100644
Binary files a/public/images/emoji/emoji_one/levitate.png and b/public/images/emoji/emoji_one/levitate.png differ
diff --git a/public/images/emoji/emoji_one/levitate/2.png b/public/images/emoji/emoji_one/levitate/2.png
new file mode 100644
index 00000000000..c8af4516a26
Binary files /dev/null and b/public/images/emoji/emoji_one/levitate/2.png differ
diff --git a/public/images/emoji/emoji_one/levitate/3.png b/public/images/emoji/emoji_one/levitate/3.png
new file mode 100644
index 00000000000..ed5fde06d4d
Binary files /dev/null and b/public/images/emoji/emoji_one/levitate/3.png differ
diff --git a/public/images/emoji/emoji_one/levitate/4.png b/public/images/emoji/emoji_one/levitate/4.png
new file mode 100644
index 00000000000..631c51d4e60
Binary files /dev/null and b/public/images/emoji/emoji_one/levitate/4.png differ
diff --git a/public/images/emoji/emoji_one/levitate/5.png b/public/images/emoji/emoji_one/levitate/5.png
new file mode 100644
index 00000000000..5bbb08cab49
Binary files /dev/null and b/public/images/emoji/emoji_one/levitate/5.png differ
diff --git a/public/images/emoji/emoji_one/levitate/6.png b/public/images/emoji/emoji_one/levitate/6.png
new file mode 100644
index 00000000000..84fd92bd359
Binary files /dev/null and b/public/images/emoji/emoji_one/levitate/6.png differ
diff --git a/public/images/emoji/emoji_one/liberia.png b/public/images/emoji/emoji_one/liberia.png
new file mode 100644
index 00000000000..2828cee4c87
Binary files /dev/null and b/public/images/emoji/emoji_one/liberia.png differ
diff --git a/public/images/emoji/emoji_one/libra.png b/public/images/emoji/emoji_one/libra.png
index 2d6cfe28baa..90e042545df 100644
Binary files a/public/images/emoji/emoji_one/libra.png and b/public/images/emoji/emoji_one/libra.png differ
diff --git a/public/images/emoji/emoji_one/libya.png b/public/images/emoji/emoji_one/libya.png
new file mode 100644
index 00000000000..a6c90e15d4f
Binary files /dev/null and b/public/images/emoji/emoji_one/libya.png differ
diff --git a/public/images/emoji/emoji_one/liechtenstein.png b/public/images/emoji/emoji_one/liechtenstein.png
new file mode 100644
index 00000000000..93605ebfd57
Binary files /dev/null and b/public/images/emoji/emoji_one/liechtenstein.png differ
diff --git a/public/images/emoji/emoji_one/lifter.png b/public/images/emoji/emoji_one/lifter.png
index 987fafb21e2..e559b73ffec 100644
Binary files a/public/images/emoji/emoji_one/lifter.png and b/public/images/emoji/emoji_one/lifter.png differ
diff --git a/public/images/emoji/emoji_one/lifter/2.png b/public/images/emoji/emoji_one/lifter/2.png
new file mode 100644
index 00000000000..a31a1aab292
Binary files /dev/null and b/public/images/emoji/emoji_one/lifter/2.png differ
diff --git a/public/images/emoji/emoji_one/lifter/3.png b/public/images/emoji/emoji_one/lifter/3.png
new file mode 100644
index 00000000000..45ebbc67df6
Binary files /dev/null and b/public/images/emoji/emoji_one/lifter/3.png differ
diff --git a/public/images/emoji/emoji_one/lifter/4.png b/public/images/emoji/emoji_one/lifter/4.png
new file mode 100644
index 00000000000..c5d5f63edc1
Binary files /dev/null and b/public/images/emoji/emoji_one/lifter/4.png differ
diff --git a/public/images/emoji/emoji_one/lifter/5.png b/public/images/emoji/emoji_one/lifter/5.png
new file mode 100644
index 00000000000..eeb1fa21c79
Binary files /dev/null and b/public/images/emoji/emoji_one/lifter/5.png differ
diff --git a/public/images/emoji/emoji_one/lifter/6.png b/public/images/emoji/emoji_one/lifter/6.png
new file mode 100644
index 00000000000..a3308e88692
Binary files /dev/null and b/public/images/emoji/emoji_one/lifter/6.png differ
diff --git a/public/images/emoji/emoji_one/light_rail.png b/public/images/emoji/emoji_one/light_rail.png
index b079274ba32..6ce065de719 100644
Binary files a/public/images/emoji/emoji_one/light_rail.png and b/public/images/emoji/emoji_one/light_rail.png differ
diff --git a/public/images/emoji/emoji_one/link.png b/public/images/emoji/emoji_one/link.png
index 199b8668097..d35a63aa813 100644
Binary files a/public/images/emoji/emoji_one/link.png and b/public/images/emoji/emoji_one/link.png differ
diff --git a/public/images/emoji/emoji_one/linked_paperclips.png b/public/images/emoji/emoji_one/linked_paperclips.png
index baf54b2f890..8db707562a0 100644
Binary files a/public/images/emoji/emoji_one/linked_paperclips.png and b/public/images/emoji/emoji_one/linked_paperclips.png differ
diff --git a/public/images/emoji/emoji_one/lion.png b/public/images/emoji/emoji_one/lion.png
index 7890db8dd62..179838ed452 100644
Binary files a/public/images/emoji/emoji_one/lion.png and b/public/images/emoji/emoji_one/lion.png differ
diff --git a/public/images/emoji/emoji_one/lion_face.png b/public/images/emoji/emoji_one/lion_face.png
index 7890db8dd62..179838ed452 100644
Binary files a/public/images/emoji/emoji_one/lion_face.png and b/public/images/emoji/emoji_one/lion_face.png differ
diff --git a/public/images/emoji/emoji_one/lips.png b/public/images/emoji/emoji_one/lips.png
index 5db7e3d68e6..b4c1e3f78a1 100644
Binary files a/public/images/emoji/emoji_one/lips.png and b/public/images/emoji/emoji_one/lips.png differ
diff --git a/public/images/emoji/emoji_one/lipstick.png b/public/images/emoji/emoji_one/lipstick.png
index 154d2ee2ef7..98d75bc9e3b 100644
Binary files a/public/images/emoji/emoji_one/lipstick.png and b/public/images/emoji/emoji_one/lipstick.png differ
diff --git a/public/images/emoji/emoji_one/lithuania.png b/public/images/emoji/emoji_one/lithuania.png
new file mode 100644
index 00000000000..d4e7e6766a2
Binary files /dev/null and b/public/images/emoji/emoji_one/lithuania.png differ
diff --git a/public/images/emoji/emoji_one/lizard.png b/public/images/emoji/emoji_one/lizard.png
new file mode 100644
index 00000000000..7500fef7389
Binary files /dev/null and b/public/images/emoji/emoji_one/lizard.png differ
diff --git a/public/images/emoji/emoji_one/lock.png b/public/images/emoji/emoji_one/lock.png
index cbb7d5a2765..290f44e1693 100644
Binary files a/public/images/emoji/emoji_one/lock.png and b/public/images/emoji/emoji_one/lock.png differ
diff --git a/public/images/emoji/emoji_one/lock_with_ink_pen.png b/public/images/emoji/emoji_one/lock_with_ink_pen.png
index 46a6511895c..ce3d901dee2 100644
Binary files a/public/images/emoji/emoji_one/lock_with_ink_pen.png and b/public/images/emoji/emoji_one/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/emoji_one/lollipop.png b/public/images/emoji/emoji_one/lollipop.png
index 6ae4cfc7d8a..20579a6459e 100644
Binary files a/public/images/emoji/emoji_one/lollipop.png and b/public/images/emoji/emoji_one/lollipop.png differ
diff --git a/public/images/emoji/emoji_one/loop.png b/public/images/emoji/emoji_one/loop.png
index b9c086ba778..c909ebf499d 100644
Binary files a/public/images/emoji/emoji_one/loop.png and b/public/images/emoji/emoji_one/loop.png differ
diff --git a/public/images/emoji/emoji_one/loud_sound.png b/public/images/emoji/emoji_one/loud_sound.png
index 977df712c1e..b54a2284194 100644
Binary files a/public/images/emoji/emoji_one/loud_sound.png and b/public/images/emoji/emoji_one/loud_sound.png differ
diff --git a/public/images/emoji/emoji_one/loudspeaker.png b/public/images/emoji/emoji_one/loudspeaker.png
index 041069fe7e9..a871a7cc607 100644
Binary files a/public/images/emoji/emoji_one/loudspeaker.png and b/public/images/emoji/emoji_one/loudspeaker.png differ
diff --git a/public/images/emoji/emoji_one/love_hotel.png b/public/images/emoji/emoji_one/love_hotel.png
index b3bdf56da63..2432c6533ce 100644
Binary files a/public/images/emoji/emoji_one/love_hotel.png and b/public/images/emoji/emoji_one/love_hotel.png differ
diff --git a/public/images/emoji/emoji_one/love_letter.png b/public/images/emoji/emoji_one/love_letter.png
index 5e4ab689818..a0e86996e1e 100644
Binary files a/public/images/emoji/emoji_one/love_letter.png and b/public/images/emoji/emoji_one/love_letter.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture.png b/public/images/emoji/emoji_one/love_you_gesture.png
new file mode 100644
index 00000000000..14ef7c72b20
Binary files /dev/null and b/public/images/emoji/emoji_one/love_you_gesture.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture/2.png b/public/images/emoji/emoji_one/love_you_gesture/2.png
new file mode 100644
index 00000000000..b70217e894c
Binary files /dev/null and b/public/images/emoji/emoji_one/love_you_gesture/2.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture/3.png b/public/images/emoji/emoji_one/love_you_gesture/3.png
new file mode 100644
index 00000000000..aa984ea9263
Binary files /dev/null and b/public/images/emoji/emoji_one/love_you_gesture/3.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture/4.png b/public/images/emoji/emoji_one/love_you_gesture/4.png
new file mode 100644
index 00000000000..5decb0e8008
Binary files /dev/null and b/public/images/emoji/emoji_one/love_you_gesture/4.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture/5.png b/public/images/emoji/emoji_one/love_you_gesture/5.png
new file mode 100644
index 00000000000..e0bb218cc08
Binary files /dev/null and b/public/images/emoji/emoji_one/love_you_gesture/5.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture/6.png b/public/images/emoji/emoji_one/love_you_gesture/6.png
new file mode 100644
index 00000000000..bb51bde8bbd
Binary files /dev/null and b/public/images/emoji/emoji_one/love_you_gesture/6.png differ
diff --git a/public/images/emoji/emoji_one/low_brightness.png b/public/images/emoji/emoji_one/low_brightness.png
index 26162219d4d..d04c90a4dbc 100644
Binary files a/public/images/emoji/emoji_one/low_brightness.png and b/public/images/emoji/emoji_one/low_brightness.png differ
diff --git a/public/images/emoji/emoji_one/lower_left_ballpoint_pen.png b/public/images/emoji/emoji_one/lower_left_ballpoint_pen.png
index 368612e5465..cb005206b63 100644
Binary files a/public/images/emoji/emoji_one/lower_left_ballpoint_pen.png and b/public/images/emoji/emoji_one/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/emoji_one/lower_left_crayon.png b/public/images/emoji/emoji_one/lower_left_crayon.png
index 25d67f1d768..73a729d9873 100644
Binary files a/public/images/emoji/emoji_one/lower_left_crayon.png and b/public/images/emoji/emoji_one/lower_left_crayon.png differ
diff --git a/public/images/emoji/emoji_one/lower_left_fountain_pen.png b/public/images/emoji/emoji_one/lower_left_fountain_pen.png
index 9ca6da5a0ce..e9983527850 100644
Binary files a/public/images/emoji/emoji_one/lower_left_fountain_pen.png and b/public/images/emoji/emoji_one/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/emoji_one/lower_left_paintbrush.png b/public/images/emoji/emoji_one/lower_left_paintbrush.png
index eb2b750712b..c61df4d04c6 100644
Binary files a/public/images/emoji/emoji_one/lower_left_paintbrush.png and b/public/images/emoji/emoji_one/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/emoji_one/luxembourg.png b/public/images/emoji/emoji_one/luxembourg.png
new file mode 100644
index 00000000000..a8c6737d1b6
Binary files /dev/null and b/public/images/emoji/emoji_one/luxembourg.png differ
diff --git a/public/images/emoji/emoji_one/lying_face.png b/public/images/emoji/emoji_one/lying_face.png
new file mode 100644
index 00000000000..4dab78b5c20
Binary files /dev/null and b/public/images/emoji/emoji_one/lying_face.png differ
diff --git a/public/images/emoji/emoji_one/m.png b/public/images/emoji/emoji_one/m.png
index 8d84b534294..08cbe3dd3aa 100644
Binary files a/public/images/emoji/emoji_one/m.png and b/public/images/emoji/emoji_one/m.png differ
diff --git a/public/images/emoji/emoji_one/macau.png b/public/images/emoji/emoji_one/macau.png
new file mode 100644
index 00000000000..70620e1d545
Binary files /dev/null and b/public/images/emoji/emoji_one/macau.png differ
diff --git a/public/images/emoji/emoji_one/macedonia.png b/public/images/emoji/emoji_one/macedonia.png
new file mode 100644
index 00000000000..a4c8ef41d2f
Binary files /dev/null and b/public/images/emoji/emoji_one/macedonia.png differ
diff --git a/public/images/emoji/emoji_one/madagascar.png b/public/images/emoji/emoji_one/madagascar.png
new file mode 100644
index 00000000000..708ec7416ce
Binary files /dev/null and b/public/images/emoji/emoji_one/madagascar.png differ
diff --git a/public/images/emoji/emoji_one/mag.png b/public/images/emoji/emoji_one/mag.png
index 6f5fec0a46d..4603ad29a42 100644
Binary files a/public/images/emoji/emoji_one/mag.png and b/public/images/emoji/emoji_one/mag.png differ
diff --git a/public/images/emoji/emoji_one/mag_right.png b/public/images/emoji/emoji_one/mag_right.png
index 381f74d3364..59333e3fa98 100644
Binary files a/public/images/emoji/emoji_one/mag_right.png and b/public/images/emoji/emoji_one/mag_right.png differ
diff --git a/public/images/emoji/emoji_one/mage.png b/public/images/emoji/emoji_one/mage.png
new file mode 100644
index 00000000000..71c1b13f924
Binary files /dev/null and b/public/images/emoji/emoji_one/mage.png differ
diff --git a/public/images/emoji/emoji_one/mage/2.png b/public/images/emoji/emoji_one/mage/2.png
new file mode 100644
index 00000000000..823f6843fad
Binary files /dev/null and b/public/images/emoji/emoji_one/mage/2.png differ
diff --git a/public/images/emoji/emoji_one/mage/3.png b/public/images/emoji/emoji_one/mage/3.png
new file mode 100644
index 00000000000..c2ff6622a04
Binary files /dev/null and b/public/images/emoji/emoji_one/mage/3.png differ
diff --git a/public/images/emoji/emoji_one/mage/4.png b/public/images/emoji/emoji_one/mage/4.png
new file mode 100644
index 00000000000..76d0a52e374
Binary files /dev/null and b/public/images/emoji/emoji_one/mage/4.png differ
diff --git a/public/images/emoji/emoji_one/mage/5.png b/public/images/emoji/emoji_one/mage/5.png
new file mode 100644
index 00000000000..ddb5de55806
Binary files /dev/null and b/public/images/emoji/emoji_one/mage/5.png differ
diff --git a/public/images/emoji/emoji_one/mage/6.png b/public/images/emoji/emoji_one/mage/6.png
new file mode 100644
index 00000000000..302dd62dfb3
Binary files /dev/null and b/public/images/emoji/emoji_one/mage/6.png differ
diff --git a/public/images/emoji/emoji_one/mahjong.png b/public/images/emoji/emoji_one/mahjong.png
index 0627b17ed79..6e5670f9d78 100644
Binary files a/public/images/emoji/emoji_one/mahjong.png and b/public/images/emoji/emoji_one/mahjong.png differ
diff --git a/public/images/emoji/emoji_one/mailbox.png b/public/images/emoji/emoji_one/mailbox.png
index 259fe416b9d..a752e98af88 100644
Binary files a/public/images/emoji/emoji_one/mailbox.png and b/public/images/emoji/emoji_one/mailbox.png differ
diff --git a/public/images/emoji/emoji_one/mailbox_closed.png b/public/images/emoji/emoji_one/mailbox_closed.png
index 1cf5d5a130c..41d54e76ab5 100644
Binary files a/public/images/emoji/emoji_one/mailbox_closed.png and b/public/images/emoji/emoji_one/mailbox_closed.png differ
diff --git a/public/images/emoji/emoji_one/mailbox_with_mail.png b/public/images/emoji/emoji_one/mailbox_with_mail.png
index 7ea29451446..b1e22db3ff3 100644
Binary files a/public/images/emoji/emoji_one/mailbox_with_mail.png and b/public/images/emoji/emoji_one/mailbox_with_mail.png differ
diff --git a/public/images/emoji/emoji_one/mailbox_with_no_mail.png b/public/images/emoji/emoji_one/mailbox_with_no_mail.png
index 4155c11ec18..bdbed6bf190 100644
Binary files a/public/images/emoji/emoji_one/mailbox_with_no_mail.png and b/public/images/emoji/emoji_one/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/emoji_one/malawi.png b/public/images/emoji/emoji_one/malawi.png
new file mode 100644
index 00000000000..854fd4ce854
Binary files /dev/null and b/public/images/emoji/emoji_one/malawi.png differ
diff --git a/public/images/emoji/emoji_one/malaysia.png b/public/images/emoji/emoji_one/malaysia.png
new file mode 100644
index 00000000000..13137b15ad8
Binary files /dev/null and b/public/images/emoji/emoji_one/malaysia.png differ
diff --git a/public/images/emoji/emoji_one/maldives.png b/public/images/emoji/emoji_one/maldives.png
new file mode 100644
index 00000000000..e0fec7e04b4
Binary files /dev/null and b/public/images/emoji/emoji_one/maldives.png differ
diff --git a/public/images/emoji/emoji_one/male_couple_with_heart.png b/public/images/emoji/emoji_one/male_couple_with_heart.png
index 734ac58d6b6..c8b688db392 100644
Binary files a/public/images/emoji/emoji_one/male_couple_with_heart.png and b/public/images/emoji/emoji_one/male_couple_with_heart.png differ
diff --git a/public/images/emoji/emoji_one/male_couplekiss.png b/public/images/emoji/emoji_one/male_couplekiss.png
index 9c9a56b4f45..851abf3341a 100644
Binary files a/public/images/emoji/emoji_one/male_couplekiss.png and b/public/images/emoji/emoji_one/male_couplekiss.png differ
diff --git a/public/images/emoji/emoji_one/male_detective.png b/public/images/emoji/emoji_one/male_detective.png
new file mode 100644
index 00000000000..dda052dfbb9
Binary files /dev/null and b/public/images/emoji/emoji_one/male_detective.png differ
diff --git a/public/images/emoji/emoji_one/male_detective/2.png b/public/images/emoji/emoji_one/male_detective/2.png
new file mode 100644
index 00000000000..22f8a4fa1b4
Binary files /dev/null and b/public/images/emoji/emoji_one/male_detective/2.png differ
diff --git a/public/images/emoji/emoji_one/male_detective/3.png b/public/images/emoji/emoji_one/male_detective/3.png
new file mode 100644
index 00000000000..028d6d8e162
Binary files /dev/null and b/public/images/emoji/emoji_one/male_detective/3.png differ
diff --git a/public/images/emoji/emoji_one/male_detective/4.png b/public/images/emoji/emoji_one/male_detective/4.png
new file mode 100644
index 00000000000..467e372e512
Binary files /dev/null and b/public/images/emoji/emoji_one/male_detective/4.png differ
diff --git a/public/images/emoji/emoji_one/male_detective/5.png b/public/images/emoji/emoji_one/male_detective/5.png
new file mode 100644
index 00000000000..69c952c3b7b
Binary files /dev/null and b/public/images/emoji/emoji_one/male_detective/5.png differ
diff --git a/public/images/emoji/emoji_one/male_detective/6.png b/public/images/emoji/emoji_one/male_detective/6.png
new file mode 100644
index 00000000000..3caf1bcfc88
Binary files /dev/null and b/public/images/emoji/emoji_one/male_detective/6.png differ
diff --git a/public/images/emoji/emoji_one/mali.png b/public/images/emoji/emoji_one/mali.png
new file mode 100644
index 00000000000..ef19c197c7b
Binary files /dev/null and b/public/images/emoji/emoji_one/mali.png differ
diff --git a/public/images/emoji/emoji_one/malta.png b/public/images/emoji/emoji_one/malta.png
new file mode 100644
index 00000000000..f6850d62764
Binary files /dev/null and b/public/images/emoji/emoji_one/malta.png differ
diff --git a/public/images/emoji/emoji_one/man.png b/public/images/emoji/emoji_one/man.png
index e4a0cc76ab1..abcdfbb5bf1 100644
Binary files a/public/images/emoji/emoji_one/man.png and b/public/images/emoji/emoji_one/man.png differ
diff --git a/public/images/emoji/emoji_one/man/2.png b/public/images/emoji/emoji_one/man/2.png
new file mode 100644
index 00000000000..96662e6bc3a
Binary files /dev/null and b/public/images/emoji/emoji_one/man/2.png differ
diff --git a/public/images/emoji/emoji_one/man/3.png b/public/images/emoji/emoji_one/man/3.png
new file mode 100644
index 00000000000..afcd96c710e
Binary files /dev/null and b/public/images/emoji/emoji_one/man/3.png differ
diff --git a/public/images/emoji/emoji_one/man/4.png b/public/images/emoji/emoji_one/man/4.png
new file mode 100644
index 00000000000..084b945111b
Binary files /dev/null and b/public/images/emoji/emoji_one/man/4.png differ
diff --git a/public/images/emoji/emoji_one/man/5.png b/public/images/emoji/emoji_one/man/5.png
new file mode 100644
index 00000000000..6f00c116b3b
Binary files /dev/null and b/public/images/emoji/emoji_one/man/5.png differ
diff --git a/public/images/emoji/emoji_one/man/6.png b/public/images/emoji/emoji_one/man/6.png
new file mode 100644
index 00000000000..22a5732e1c0
Binary files /dev/null and b/public/images/emoji/emoji_one/man/6.png differ
diff --git a/public/images/emoji/emoji_one/man_artist.png b/public/images/emoji/emoji_one/man_artist.png
new file mode 100644
index 00000000000..c82d9e99ba8
Binary files /dev/null and b/public/images/emoji/emoji_one/man_artist.png differ
diff --git a/public/images/emoji/emoji_one/man_artist/2.png b/public/images/emoji/emoji_one/man_artist/2.png
new file mode 100644
index 00000000000..fa80701baeb
Binary files /dev/null and b/public/images/emoji/emoji_one/man_artist/2.png differ
diff --git a/public/images/emoji/emoji_one/man_artist/3.png b/public/images/emoji/emoji_one/man_artist/3.png
new file mode 100644
index 00000000000..906d6fbb14e
Binary files /dev/null and b/public/images/emoji/emoji_one/man_artist/3.png differ
diff --git a/public/images/emoji/emoji_one/man_artist/4.png b/public/images/emoji/emoji_one/man_artist/4.png
new file mode 100644
index 00000000000..76bb436757f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_artist/4.png differ
diff --git a/public/images/emoji/emoji_one/man_artist/5.png b/public/images/emoji/emoji_one/man_artist/5.png
new file mode 100644
index 00000000000..b90d71e4505
Binary files /dev/null and b/public/images/emoji/emoji_one/man_artist/5.png differ
diff --git a/public/images/emoji/emoji_one/man_artist/6.png b/public/images/emoji/emoji_one/man_artist/6.png
new file mode 100644
index 00000000000..b9ad3f698d2
Binary files /dev/null and b/public/images/emoji/emoji_one/man_artist/6.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut.png b/public/images/emoji/emoji_one/man_astronaut.png
new file mode 100644
index 00000000000..89e1f5e805e
Binary files /dev/null and b/public/images/emoji/emoji_one/man_astronaut.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut/2.png b/public/images/emoji/emoji_one/man_astronaut/2.png
new file mode 100644
index 00000000000..036bf3c7055
Binary files /dev/null and b/public/images/emoji/emoji_one/man_astronaut/2.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut/3.png b/public/images/emoji/emoji_one/man_astronaut/3.png
new file mode 100644
index 00000000000..e9b71d73be0
Binary files /dev/null and b/public/images/emoji/emoji_one/man_astronaut/3.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut/4.png b/public/images/emoji/emoji_one/man_astronaut/4.png
new file mode 100644
index 00000000000..201716ac4d2
Binary files /dev/null and b/public/images/emoji/emoji_one/man_astronaut/4.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut/5.png b/public/images/emoji/emoji_one/man_astronaut/5.png
new file mode 100644
index 00000000000..3c6708c9ceb
Binary files /dev/null and b/public/images/emoji/emoji_one/man_astronaut/5.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut/6.png b/public/images/emoji/emoji_one/man_astronaut/6.png
new file mode 100644
index 00000000000..71f36fb80cb
Binary files /dev/null and b/public/images/emoji/emoji_one/man_astronaut/6.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling.png b/public/images/emoji/emoji_one/man_cartwheeling.png
new file mode 100644
index 00000000000..9cbb502df69
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cartwheeling.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling/2.png b/public/images/emoji/emoji_one/man_cartwheeling/2.png
new file mode 100644
index 00000000000..2ee4ced431b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling/3.png b/public/images/emoji/emoji_one/man_cartwheeling/3.png
new file mode 100644
index 00000000000..b3b82f3ed0b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling/4.png b/public/images/emoji/emoji_one/man_cartwheeling/4.png
new file mode 100644
index 00000000000..cd5b5f7db77
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling/5.png b/public/images/emoji/emoji_one/man_cartwheeling/5.png
new file mode 100644
index 00000000000..7f13cb8d09a
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling/6.png b/public/images/emoji/emoji_one/man_cartwheeling/6.png
new file mode 100644
index 00000000000..6a5aea5612f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/emoji_one/man_cook.png b/public/images/emoji/emoji_one/man_cook.png
new file mode 100644
index 00000000000..335d8b5f21b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cook.png differ
diff --git a/public/images/emoji/emoji_one/man_cook/2.png b/public/images/emoji/emoji_one/man_cook/2.png
new file mode 100644
index 00000000000..46fd1f6dcd4
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cook/2.png differ
diff --git a/public/images/emoji/emoji_one/man_cook/3.png b/public/images/emoji/emoji_one/man_cook/3.png
new file mode 100644
index 00000000000..3a552dbbbc0
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cook/3.png differ
diff --git a/public/images/emoji/emoji_one/man_cook/4.png b/public/images/emoji/emoji_one/man_cook/4.png
new file mode 100644
index 00000000000..5c8dfe5240f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cook/4.png differ
diff --git a/public/images/emoji/emoji_one/man_cook/5.png b/public/images/emoji/emoji_one/man_cook/5.png
new file mode 100644
index 00000000000..2b1fc6cb7df
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cook/5.png differ
diff --git a/public/images/emoji/emoji_one/man_cook/6.png b/public/images/emoji/emoji_one/man_cook/6.png
new file mode 100644
index 00000000000..afbbb0ee161
Binary files /dev/null and b/public/images/emoji/emoji_one/man_cook/6.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing.png b/public/images/emoji/emoji_one/man_dancing.png
new file mode 100644
index 00000000000..87ad16029e3
Binary files /dev/null and b/public/images/emoji/emoji_one/man_dancing.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing/2.png b/public/images/emoji/emoji_one/man_dancing/2.png
new file mode 100644
index 00000000000..9c666b87597
Binary files /dev/null and b/public/images/emoji/emoji_one/man_dancing/2.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing/3.png b/public/images/emoji/emoji_one/man_dancing/3.png
new file mode 100644
index 00000000000..55ed8888acf
Binary files /dev/null and b/public/images/emoji/emoji_one/man_dancing/3.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing/4.png b/public/images/emoji/emoji_one/man_dancing/4.png
new file mode 100644
index 00000000000..3f590db81b5
Binary files /dev/null and b/public/images/emoji/emoji_one/man_dancing/4.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing/5.png b/public/images/emoji/emoji_one/man_dancing/5.png
new file mode 100644
index 00000000000..cf516c730d0
Binary files /dev/null and b/public/images/emoji/emoji_one/man_dancing/5.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing/6.png b/public/images/emoji/emoji_one/man_dancing/6.png
new file mode 100644
index 00000000000..2d0880aace9
Binary files /dev/null and b/public/images/emoji/emoji_one/man_dancing/6.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming.png b/public/images/emoji/emoji_one/man_facepalming.png
new file mode 100644
index 00000000000..1fd9b1e63e3
Binary files /dev/null and b/public/images/emoji/emoji_one/man_facepalming.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming/2.png b/public/images/emoji/emoji_one/man_facepalming/2.png
new file mode 100644
index 00000000000..9da5b3cb877
Binary files /dev/null and b/public/images/emoji/emoji_one/man_facepalming/2.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming/3.png b/public/images/emoji/emoji_one/man_facepalming/3.png
new file mode 100644
index 00000000000..eef81559832
Binary files /dev/null and b/public/images/emoji/emoji_one/man_facepalming/3.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming/4.png b/public/images/emoji/emoji_one/man_facepalming/4.png
new file mode 100644
index 00000000000..4ceed5477a6
Binary files /dev/null and b/public/images/emoji/emoji_one/man_facepalming/4.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming/5.png b/public/images/emoji/emoji_one/man_facepalming/5.png
new file mode 100644
index 00000000000..2607a2f2c26
Binary files /dev/null and b/public/images/emoji/emoji_one/man_facepalming/5.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming/6.png b/public/images/emoji/emoji_one/man_facepalming/6.png
new file mode 100644
index 00000000000..f2c9a7f81d9
Binary files /dev/null and b/public/images/emoji/emoji_one/man_facepalming/6.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker.png b/public/images/emoji/emoji_one/man_factory_worker.png
new file mode 100644
index 00000000000..d3c083a93a1
Binary files /dev/null and b/public/images/emoji/emoji_one/man_factory_worker.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker/2.png b/public/images/emoji/emoji_one/man_factory_worker/2.png
new file mode 100644
index 00000000000..1edb3ab417c
Binary files /dev/null and b/public/images/emoji/emoji_one/man_factory_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker/3.png b/public/images/emoji/emoji_one/man_factory_worker/3.png
new file mode 100644
index 00000000000..9500d631769
Binary files /dev/null and b/public/images/emoji/emoji_one/man_factory_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker/4.png b/public/images/emoji/emoji_one/man_factory_worker/4.png
new file mode 100644
index 00000000000..70c32c37b6f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_factory_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker/5.png b/public/images/emoji/emoji_one/man_factory_worker/5.png
new file mode 100644
index 00000000000..00272c53368
Binary files /dev/null and b/public/images/emoji/emoji_one/man_factory_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker/6.png b/public/images/emoji/emoji_one/man_factory_worker/6.png
new file mode 100644
index 00000000000..6b15a2bdea7
Binary files /dev/null and b/public/images/emoji/emoji_one/man_factory_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer.png b/public/images/emoji/emoji_one/man_farmer.png
new file mode 100644
index 00000000000..9cb2fbfbcbe
Binary files /dev/null and b/public/images/emoji/emoji_one/man_farmer.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer/2.png b/public/images/emoji/emoji_one/man_farmer/2.png
new file mode 100644
index 00000000000..19e67034d1e
Binary files /dev/null and b/public/images/emoji/emoji_one/man_farmer/2.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer/3.png b/public/images/emoji/emoji_one/man_farmer/3.png
new file mode 100644
index 00000000000..4ccf7c153fd
Binary files /dev/null and b/public/images/emoji/emoji_one/man_farmer/3.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer/4.png b/public/images/emoji/emoji_one/man_farmer/4.png
new file mode 100644
index 00000000000..73732ab4ae3
Binary files /dev/null and b/public/images/emoji/emoji_one/man_farmer/4.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer/5.png b/public/images/emoji/emoji_one/man_farmer/5.png
new file mode 100644
index 00000000000..1ef4e92800b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_farmer/5.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer/6.png b/public/images/emoji/emoji_one/man_farmer/6.png
new file mode 100644
index 00000000000..58afdbe531b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_farmer/6.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter.png b/public/images/emoji/emoji_one/man_firefighter.png
new file mode 100644
index 00000000000..d875623c945
Binary files /dev/null and b/public/images/emoji/emoji_one/man_firefighter.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter/2.png b/public/images/emoji/emoji_one/man_firefighter/2.png
new file mode 100644
index 00000000000..1b89440e51d
Binary files /dev/null and b/public/images/emoji/emoji_one/man_firefighter/2.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter/3.png b/public/images/emoji/emoji_one/man_firefighter/3.png
new file mode 100644
index 00000000000..16ed4ef12f6
Binary files /dev/null and b/public/images/emoji/emoji_one/man_firefighter/3.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter/4.png b/public/images/emoji/emoji_one/man_firefighter/4.png
new file mode 100644
index 00000000000..fd93c503cc0
Binary files /dev/null and b/public/images/emoji/emoji_one/man_firefighter/4.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter/5.png b/public/images/emoji/emoji_one/man_firefighter/5.png
new file mode 100644
index 00000000000..e64fcc0e543
Binary files /dev/null and b/public/images/emoji/emoji_one/man_firefighter/5.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter/6.png b/public/images/emoji/emoji_one/man_firefighter/6.png
new file mode 100644
index 00000000000..a5890f727b6
Binary files /dev/null and b/public/images/emoji/emoji_one/man_firefighter/6.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker.png b/public/images/emoji/emoji_one/man_health_worker.png
new file mode 100644
index 00000000000..7c6ff940061
Binary files /dev/null and b/public/images/emoji/emoji_one/man_health_worker.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker/2.png b/public/images/emoji/emoji_one/man_health_worker/2.png
new file mode 100644
index 00000000000..39fa46098d8
Binary files /dev/null and b/public/images/emoji/emoji_one/man_health_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker/3.png b/public/images/emoji/emoji_one/man_health_worker/3.png
new file mode 100644
index 00000000000..8a57747931b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_health_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker/4.png b/public/images/emoji/emoji_one/man_health_worker/4.png
new file mode 100644
index 00000000000..7bb737ae922
Binary files /dev/null and b/public/images/emoji/emoji_one/man_health_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker/5.png b/public/images/emoji/emoji_one/man_health_worker/5.png
new file mode 100644
index 00000000000..face3063d69
Binary files /dev/null and b/public/images/emoji/emoji_one/man_health_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker/6.png b/public/images/emoji/emoji_one/man_health_worker/6.png
new file mode 100644
index 00000000000..cfd9b80a524
Binary files /dev/null and b/public/images/emoji/emoji_one/man_health_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating.png
index bd51cd5fb8c..f25e14fd06d 100644
Binary files a/public/images/emoji/emoji_one/man_in_business_suit_levitating.png and b/public/images/emoji/emoji_one/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating/2.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating/2.png
new file mode 100644
index 00000000000..c8af4516a26
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating/3.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating/3.png
new file mode 100644
index 00000000000..ed5fde06d4d
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating/4.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating/4.png
new file mode 100644
index 00000000000..631c51d4e60
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating/5.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating/5.png
new file mode 100644
index 00000000000..5bbb08cab49
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating/6.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating/6.png
new file mode 100644
index 00000000000..84fd92bd359
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo.png b/public/images/emoji/emoji_one/man_in_tuxedo.png
new file mode 100644
index 00000000000..6b754543e1b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_tuxedo.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo/2.png b/public/images/emoji/emoji_one/man_in_tuxedo/2.png
new file mode 100644
index 00000000000..f0f5d5b66b9
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo/3.png b/public/images/emoji/emoji_one/man_in_tuxedo/3.png
new file mode 100644
index 00000000000..970c9b23954
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo/4.png b/public/images/emoji/emoji_one/man_in_tuxedo/4.png
new file mode 100644
index 00000000000..96255886900
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo/5.png b/public/images/emoji/emoji_one/man_in_tuxedo/5.png
new file mode 100644
index 00000000000..573cfb40185
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo/6.png b/public/images/emoji/emoji_one/man_in_tuxedo/6.png
new file mode 100644
index 00000000000..10c76308e2d
Binary files /dev/null and b/public/images/emoji/emoji_one/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/emoji_one/man_judge.png b/public/images/emoji/emoji_one/man_judge.png
new file mode 100644
index 00000000000..420e5f557ff
Binary files /dev/null and b/public/images/emoji/emoji_one/man_judge.png differ
diff --git a/public/images/emoji/emoji_one/man_judge/2.png b/public/images/emoji/emoji_one/man_judge/2.png
new file mode 100644
index 00000000000..453b958de53
Binary files /dev/null and b/public/images/emoji/emoji_one/man_judge/2.png differ
diff --git a/public/images/emoji/emoji_one/man_judge/3.png b/public/images/emoji/emoji_one/man_judge/3.png
new file mode 100644
index 00000000000..1501db4f662
Binary files /dev/null and b/public/images/emoji/emoji_one/man_judge/3.png differ
diff --git a/public/images/emoji/emoji_one/man_judge/4.png b/public/images/emoji/emoji_one/man_judge/4.png
new file mode 100644
index 00000000000..c3efb5cc91e
Binary files /dev/null and b/public/images/emoji/emoji_one/man_judge/4.png differ
diff --git a/public/images/emoji/emoji_one/man_judge/5.png b/public/images/emoji/emoji_one/man_judge/5.png
new file mode 100644
index 00000000000..f6ca93becc1
Binary files /dev/null and b/public/images/emoji/emoji_one/man_judge/5.png differ
diff --git a/public/images/emoji/emoji_one/man_judge/6.png b/public/images/emoji/emoji_one/man_judge/6.png
new file mode 100644
index 00000000000..7cd49a4f4c8
Binary files /dev/null and b/public/images/emoji/emoji_one/man_judge/6.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling.png b/public/images/emoji/emoji_one/man_juggling.png
new file mode 100644
index 00000000000..f805f92f06e
Binary files /dev/null and b/public/images/emoji/emoji_one/man_juggling.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling/2.png b/public/images/emoji/emoji_one/man_juggling/2.png
new file mode 100644
index 00000000000..5c4baaddeee
Binary files /dev/null and b/public/images/emoji/emoji_one/man_juggling/2.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling/3.png b/public/images/emoji/emoji_one/man_juggling/3.png
new file mode 100644
index 00000000000..f4eb5d751f6
Binary files /dev/null and b/public/images/emoji/emoji_one/man_juggling/3.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling/4.png b/public/images/emoji/emoji_one/man_juggling/4.png
new file mode 100644
index 00000000000..2b13f5da366
Binary files /dev/null and b/public/images/emoji/emoji_one/man_juggling/4.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling/5.png b/public/images/emoji/emoji_one/man_juggling/5.png
new file mode 100644
index 00000000000..1489fb086b5
Binary files /dev/null and b/public/images/emoji/emoji_one/man_juggling/5.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling/6.png b/public/images/emoji/emoji_one/man_juggling/6.png
new file mode 100644
index 00000000000..f5728b89928
Binary files /dev/null and b/public/images/emoji/emoji_one/man_juggling/6.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic.png b/public/images/emoji/emoji_one/man_mechanic.png
new file mode 100644
index 00000000000..1c9be382e33
Binary files /dev/null and b/public/images/emoji/emoji_one/man_mechanic.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic/2.png b/public/images/emoji/emoji_one/man_mechanic/2.png
new file mode 100644
index 00000000000..ede2f4b680b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_mechanic/2.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic/3.png b/public/images/emoji/emoji_one/man_mechanic/3.png
new file mode 100644
index 00000000000..a7e1cbc46bd
Binary files /dev/null and b/public/images/emoji/emoji_one/man_mechanic/3.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic/4.png b/public/images/emoji/emoji_one/man_mechanic/4.png
new file mode 100644
index 00000000000..5162e05bff0
Binary files /dev/null and b/public/images/emoji/emoji_one/man_mechanic/4.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic/5.png b/public/images/emoji/emoji_one/man_mechanic/5.png
new file mode 100644
index 00000000000..3cab0f1a32f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_mechanic/5.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic/6.png b/public/images/emoji/emoji_one/man_mechanic/6.png
new file mode 100644
index 00000000000..6480465f24d
Binary files /dev/null and b/public/images/emoji/emoji_one/man_mechanic/6.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker.png b/public/images/emoji/emoji_one/man_office_worker.png
new file mode 100644
index 00000000000..ff2e1d512c1
Binary files /dev/null and b/public/images/emoji/emoji_one/man_office_worker.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker/2.png b/public/images/emoji/emoji_one/man_office_worker/2.png
new file mode 100644
index 00000000000..fdcd97b1f55
Binary files /dev/null and b/public/images/emoji/emoji_one/man_office_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker/3.png b/public/images/emoji/emoji_one/man_office_worker/3.png
new file mode 100644
index 00000000000..4973ca54922
Binary files /dev/null and b/public/images/emoji/emoji_one/man_office_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker/4.png b/public/images/emoji/emoji_one/man_office_worker/4.png
new file mode 100644
index 00000000000..d040f49ea2a
Binary files /dev/null and b/public/images/emoji/emoji_one/man_office_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker/5.png b/public/images/emoji/emoji_one/man_office_worker/5.png
new file mode 100644
index 00000000000..99766ff9d85
Binary files /dev/null and b/public/images/emoji/emoji_one/man_office_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker/6.png b/public/images/emoji/emoji_one/man_office_worker/6.png
new file mode 100644
index 00000000000..38dc9a13940
Binary files /dev/null and b/public/images/emoji/emoji_one/man_office_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot.png b/public/images/emoji/emoji_one/man_pilot.png
new file mode 100644
index 00000000000..b9cf3af516b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_pilot.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot/2.png b/public/images/emoji/emoji_one/man_pilot/2.png
new file mode 100644
index 00000000000..5828b6cbb4a
Binary files /dev/null and b/public/images/emoji/emoji_one/man_pilot/2.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot/3.png b/public/images/emoji/emoji_one/man_pilot/3.png
new file mode 100644
index 00000000000..92affa0b593
Binary files /dev/null and b/public/images/emoji/emoji_one/man_pilot/3.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot/4.png b/public/images/emoji/emoji_one/man_pilot/4.png
new file mode 100644
index 00000000000..59434b8f6b8
Binary files /dev/null and b/public/images/emoji/emoji_one/man_pilot/4.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot/5.png b/public/images/emoji/emoji_one/man_pilot/5.png
new file mode 100644
index 00000000000..7ef55e6a0fe
Binary files /dev/null and b/public/images/emoji/emoji_one/man_pilot/5.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot/6.png b/public/images/emoji/emoji_one/man_pilot/6.png
new file mode 100644
index 00000000000..6a9bb6326de
Binary files /dev/null and b/public/images/emoji/emoji_one/man_pilot/6.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball.png b/public/images/emoji/emoji_one/man_playing_handball.png
new file mode 100644
index 00000000000..f601cd91dcf
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_handball.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball/2.png b/public/images/emoji/emoji_one/man_playing_handball/2.png
new file mode 100644
index 00000000000..98609b13788
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_handball/2.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball/3.png b/public/images/emoji/emoji_one/man_playing_handball/3.png
new file mode 100644
index 00000000000..e656a0a9533
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_handball/3.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball/4.png b/public/images/emoji/emoji_one/man_playing_handball/4.png
new file mode 100644
index 00000000000..c450007bcde
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_handball/4.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball/5.png b/public/images/emoji/emoji_one/man_playing_handball/5.png
new file mode 100644
index 00000000000..01e5663bcbc
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_handball/5.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball/6.png b/public/images/emoji/emoji_one/man_playing_handball/6.png
new file mode 100644
index 00000000000..1836ebfc311
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_handball/6.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo.png b/public/images/emoji/emoji_one/man_playing_water_polo.png
new file mode 100644
index 00000000000..d7167ec5b2f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_water_polo.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo/2.png b/public/images/emoji/emoji_one/man_playing_water_polo/2.png
new file mode 100644
index 00000000000..4dcd8f371bd
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo/3.png b/public/images/emoji/emoji_one/man_playing_water_polo/3.png
new file mode 100644
index 00000000000..a99323fe8dc
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo/4.png b/public/images/emoji/emoji_one/man_playing_water_polo/4.png
new file mode 100644
index 00000000000..d79863e4c2e
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo/5.png b/public/images/emoji/emoji_one/man_playing_water_polo/5.png
new file mode 100644
index 00000000000..ea75d7e910d
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo/6.png b/public/images/emoji/emoji_one/man_playing_water_polo/6.png
new file mode 100644
index 00000000000..f597e75c4cb
Binary files /dev/null and b/public/images/emoji/emoji_one/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist.png b/public/images/emoji/emoji_one/man_scientist.png
new file mode 100644
index 00000000000..4f92ec5abb3
Binary files /dev/null and b/public/images/emoji/emoji_one/man_scientist.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist/2.png b/public/images/emoji/emoji_one/man_scientist/2.png
new file mode 100644
index 00000000000..ee0c38afe76
Binary files /dev/null and b/public/images/emoji/emoji_one/man_scientist/2.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist/3.png b/public/images/emoji/emoji_one/man_scientist/3.png
new file mode 100644
index 00000000000..3b0003351a3
Binary files /dev/null and b/public/images/emoji/emoji_one/man_scientist/3.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist/4.png b/public/images/emoji/emoji_one/man_scientist/4.png
new file mode 100644
index 00000000000..6d883773109
Binary files /dev/null and b/public/images/emoji/emoji_one/man_scientist/4.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist/5.png b/public/images/emoji/emoji_one/man_scientist/5.png
new file mode 100644
index 00000000000..fe5f8b64495
Binary files /dev/null and b/public/images/emoji/emoji_one/man_scientist/5.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist/6.png b/public/images/emoji/emoji_one/man_scientist/6.png
new file mode 100644
index 00000000000..4624f479164
Binary files /dev/null and b/public/images/emoji/emoji_one/man_scientist/6.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging.png b/public/images/emoji/emoji_one/man_shrugging.png
new file mode 100644
index 00000000000..e5e27fbaf6a
Binary files /dev/null and b/public/images/emoji/emoji_one/man_shrugging.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging/2.png b/public/images/emoji/emoji_one/man_shrugging/2.png
new file mode 100644
index 00000000000..c272bf45426
Binary files /dev/null and b/public/images/emoji/emoji_one/man_shrugging/2.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging/3.png b/public/images/emoji/emoji_one/man_shrugging/3.png
new file mode 100644
index 00000000000..a1bf809d21b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_shrugging/3.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging/4.png b/public/images/emoji/emoji_one/man_shrugging/4.png
new file mode 100644
index 00000000000..5c45d8f136f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_shrugging/4.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging/5.png b/public/images/emoji/emoji_one/man_shrugging/5.png
new file mode 100644
index 00000000000..41b3733d4f0
Binary files /dev/null and b/public/images/emoji/emoji_one/man_shrugging/5.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging/6.png b/public/images/emoji/emoji_one/man_shrugging/6.png
new file mode 100644
index 00000000000..17fd2284340
Binary files /dev/null and b/public/images/emoji/emoji_one/man_shrugging/6.png differ
diff --git a/public/images/emoji/emoji_one/man_singer.png b/public/images/emoji/emoji_one/man_singer.png
new file mode 100644
index 00000000000..33d678d274f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer.png differ
diff --git a/public/images/emoji/emoji_one/man_singer/2.png b/public/images/emoji/emoji_one/man_singer/2.png
new file mode 100644
index 00000000000..4f88fddb22a
Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer/2.png differ
diff --git a/public/images/emoji/emoji_one/man_singer/3.png b/public/images/emoji/emoji_one/man_singer/3.png
new file mode 100644
index 00000000000..0a60b03573c
Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer/3.png differ
diff --git a/public/images/emoji/emoji_one/man_singer/4.png b/public/images/emoji/emoji_one/man_singer/4.png
new file mode 100644
index 00000000000..bde6c56f6b4
Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer/4.png differ
diff --git a/public/images/emoji/emoji_one/man_singer/5.png b/public/images/emoji/emoji_one/man_singer/5.png
new file mode 100644
index 00000000000..8754a2ec354
Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer/5.png differ
diff --git a/public/images/emoji/emoji_one/man_singer/6.png b/public/images/emoji/emoji_one/man_singer/6.png
new file mode 100644
index 00000000000..4ef64cdd34e
Binary files /dev/null and b/public/images/emoji/emoji_one/man_singer/6.png differ
diff --git a/public/images/emoji/emoji_one/man_student.png b/public/images/emoji/emoji_one/man_student.png
new file mode 100644
index 00000000000..7f8b6018402
Binary files /dev/null and b/public/images/emoji/emoji_one/man_student.png differ
diff --git a/public/images/emoji/emoji_one/man_student/2.png b/public/images/emoji/emoji_one/man_student/2.png
new file mode 100644
index 00000000000..af41fdaa11d
Binary files /dev/null and b/public/images/emoji/emoji_one/man_student/2.png differ
diff --git a/public/images/emoji/emoji_one/man_student/3.png b/public/images/emoji/emoji_one/man_student/3.png
new file mode 100644
index 00000000000..0b2ec4fb61c
Binary files /dev/null and b/public/images/emoji/emoji_one/man_student/3.png differ
diff --git a/public/images/emoji/emoji_one/man_student/4.png b/public/images/emoji/emoji_one/man_student/4.png
new file mode 100644
index 00000000000..5ddbe0fd840
Binary files /dev/null and b/public/images/emoji/emoji_one/man_student/4.png differ
diff --git a/public/images/emoji/emoji_one/man_student/5.png b/public/images/emoji/emoji_one/man_student/5.png
new file mode 100644
index 00000000000..aced934658a
Binary files /dev/null and b/public/images/emoji/emoji_one/man_student/5.png differ
diff --git a/public/images/emoji/emoji_one/man_student/6.png b/public/images/emoji/emoji_one/man_student/6.png
new file mode 100644
index 00000000000..a95159c072b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_student/6.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher.png b/public/images/emoji/emoji_one/man_teacher.png
new file mode 100644
index 00000000000..c46732784e2
Binary files /dev/null and b/public/images/emoji/emoji_one/man_teacher.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher/2.png b/public/images/emoji/emoji_one/man_teacher/2.png
new file mode 100644
index 00000000000..dfa4bd606a6
Binary files /dev/null and b/public/images/emoji/emoji_one/man_teacher/2.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher/3.png b/public/images/emoji/emoji_one/man_teacher/3.png
new file mode 100644
index 00000000000..08470c37996
Binary files /dev/null and b/public/images/emoji/emoji_one/man_teacher/3.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher/4.png b/public/images/emoji/emoji_one/man_teacher/4.png
new file mode 100644
index 00000000000..9ff218b0025
Binary files /dev/null and b/public/images/emoji/emoji_one/man_teacher/4.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher/5.png b/public/images/emoji/emoji_one/man_teacher/5.png
new file mode 100644
index 00000000000..2c124f5a41a
Binary files /dev/null and b/public/images/emoji/emoji_one/man_teacher/5.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher/6.png b/public/images/emoji/emoji_one/man_teacher/6.png
new file mode 100644
index 00000000000..b25f4ae19c8
Binary files /dev/null and b/public/images/emoji/emoji_one/man_teacher/6.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist.png b/public/images/emoji/emoji_one/man_technologist.png
new file mode 100644
index 00000000000..e371bfbc519
Binary files /dev/null and b/public/images/emoji/emoji_one/man_technologist.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist/2.png b/public/images/emoji/emoji_one/man_technologist/2.png
new file mode 100644
index 00000000000..7b701e8f4d7
Binary files /dev/null and b/public/images/emoji/emoji_one/man_technologist/2.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist/3.png b/public/images/emoji/emoji_one/man_technologist/3.png
new file mode 100644
index 00000000000..4b76f796269
Binary files /dev/null and b/public/images/emoji/emoji_one/man_technologist/3.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist/4.png b/public/images/emoji/emoji_one/man_technologist/4.png
new file mode 100644
index 00000000000..92381c99d1b
Binary files /dev/null and b/public/images/emoji/emoji_one/man_technologist/4.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist/5.png b/public/images/emoji/emoji_one/man_technologist/5.png
new file mode 100644
index 00000000000..e86b665f296
Binary files /dev/null and b/public/images/emoji/emoji_one/man_technologist/5.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist/6.png b/public/images/emoji/emoji_one/man_technologist/6.png
new file mode 100644
index 00000000000..6493a958a2f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_technologist/6.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao.png
index aebef5091d1..a98751ba500 100644
Binary files a/public/images/emoji/emoji_one/man_with_gua_pi_mao.png and b/public/images/emoji/emoji_one/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao/2.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao/2.png
new file mode 100644
index 00000000000..57861e55389
Binary files /dev/null and b/public/images/emoji/emoji_one/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao/3.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao/3.png
new file mode 100644
index 00000000000..55c6a76172f
Binary files /dev/null and b/public/images/emoji/emoji_one/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao/4.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao/4.png
new file mode 100644
index 00000000000..3ed67d24ea2
Binary files /dev/null and b/public/images/emoji/emoji_one/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao/5.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao/5.png
new file mode 100644
index 00000000000..4940d7f81bb
Binary files /dev/null and b/public/images/emoji/emoji_one/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao/6.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao/6.png
new file mode 100644
index 00000000000..5767e397177
Binary files /dev/null and b/public/images/emoji/emoji_one/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban.png b/public/images/emoji/emoji_one/man_with_turban.png
index 4f237ee9caa..f68b73d5209 100644
Binary files a/public/images/emoji/emoji_one/man_with_turban.png and b/public/images/emoji/emoji_one/man_with_turban.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban/2.png b/public/images/emoji/emoji_one/man_with_turban/2.png
new file mode 100644
index 00000000000..e47844dd5ab
Binary files /dev/null and b/public/images/emoji/emoji_one/man_with_turban/2.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban/3.png b/public/images/emoji/emoji_one/man_with_turban/3.png
new file mode 100644
index 00000000000..72f636b0f93
Binary files /dev/null and b/public/images/emoji/emoji_one/man_with_turban/3.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban/4.png b/public/images/emoji/emoji_one/man_with_turban/4.png
new file mode 100644
index 00000000000..96a3733f4fe
Binary files /dev/null and b/public/images/emoji/emoji_one/man_with_turban/4.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban/5.png b/public/images/emoji/emoji_one/man_with_turban/5.png
new file mode 100644
index 00000000000..dca15965c8e
Binary files /dev/null and b/public/images/emoji/emoji_one/man_with_turban/5.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban/6.png b/public/images/emoji/emoji_one/man_with_turban/6.png
new file mode 100644
index 00000000000..5a4f11ed8e0
Binary files /dev/null and b/public/images/emoji/emoji_one/man_with_turban/6.png differ
diff --git a/public/images/emoji/emoji_one/mans_shoe.png b/public/images/emoji/emoji_one/mans_shoe.png
index 98894d84fd5..815fdac34c9 100644
Binary files a/public/images/emoji/emoji_one/mans_shoe.png and b/public/images/emoji/emoji_one/mans_shoe.png differ
diff --git a/public/images/emoji/emoji_one/mantelpiece_clock.png b/public/images/emoji/emoji_one/mantelpiece_clock.png
new file mode 100644
index 00000000000..15b97354c53
Binary files /dev/null and b/public/images/emoji/emoji_one/mantelpiece_clock.png differ
diff --git a/public/images/emoji/emoji_one/mantlepiece_clock.png b/public/images/emoji/emoji_one/mantlepiece_clock.png
deleted file mode 100644
index e1a55310426..00000000000
Binary files a/public/images/emoji/emoji_one/mantlepiece_clock.png and /dev/null differ
diff --git a/public/images/emoji/emoji_one/map.png b/public/images/emoji/emoji_one/map.png
index 83ac3734510..d3d5a184310 100644
Binary files a/public/images/emoji/emoji_one/map.png and b/public/images/emoji/emoji_one/map.png differ
diff --git a/public/images/emoji/emoji_one/maple_leaf.png b/public/images/emoji/emoji_one/maple_leaf.png
index cd5f7f3095e..1e3d77562c3 100644
Binary files a/public/images/emoji/emoji_one/maple_leaf.png and b/public/images/emoji/emoji_one/maple_leaf.png differ
diff --git a/public/images/emoji/emoji_one/marshall_islands.png b/public/images/emoji/emoji_one/marshall_islands.png
new file mode 100644
index 00000000000..35a77d3ec6a
Binary files /dev/null and b/public/images/emoji/emoji_one/marshall_islands.png differ
diff --git a/public/images/emoji/emoji_one/martial_arts_uniform.png b/public/images/emoji/emoji_one/martial_arts_uniform.png
new file mode 100644
index 00000000000..0afc7181dd5
Binary files /dev/null and b/public/images/emoji/emoji_one/martial_arts_uniform.png differ
diff --git a/public/images/emoji/emoji_one/martinique.png b/public/images/emoji/emoji_one/martinique.png
new file mode 100644
index 00000000000..20265c357af
Binary files /dev/null and b/public/images/emoji/emoji_one/martinique.png differ
diff --git a/public/images/emoji/emoji_one/mask.png b/public/images/emoji/emoji_one/mask.png
index af3686bb501..84de8c95799 100644
Binary files a/public/images/emoji/emoji_one/mask.png and b/public/images/emoji/emoji_one/mask.png differ
diff --git a/public/images/emoji/emoji_one/massage.png b/public/images/emoji/emoji_one/massage.png
index 27aafd05c0c..bc6176bb8e8 100644
Binary files a/public/images/emoji/emoji_one/massage.png and b/public/images/emoji/emoji_one/massage.png differ
diff --git a/public/images/emoji/emoji_one/massage/2.png b/public/images/emoji/emoji_one/massage/2.png
new file mode 100644
index 00000000000..1f91b9ebac1
Binary files /dev/null and b/public/images/emoji/emoji_one/massage/2.png differ
diff --git a/public/images/emoji/emoji_one/massage/3.png b/public/images/emoji/emoji_one/massage/3.png
new file mode 100644
index 00000000000..b5d0c9d676d
Binary files /dev/null and b/public/images/emoji/emoji_one/massage/3.png differ
diff --git a/public/images/emoji/emoji_one/massage/4.png b/public/images/emoji/emoji_one/massage/4.png
new file mode 100644
index 00000000000..861a00f549a
Binary files /dev/null and b/public/images/emoji/emoji_one/massage/4.png differ
diff --git a/public/images/emoji/emoji_one/massage/5.png b/public/images/emoji/emoji_one/massage/5.png
new file mode 100644
index 00000000000..df5f8d6607e
Binary files /dev/null and b/public/images/emoji/emoji_one/massage/5.png differ
diff --git a/public/images/emoji/emoji_one/massage/6.png b/public/images/emoji/emoji_one/massage/6.png
new file mode 100644
index 00000000000..7419cfaa352
Binary files /dev/null and b/public/images/emoji/emoji_one/massage/6.png differ
diff --git a/public/images/emoji/emoji_one/massage_man.png b/public/images/emoji/emoji_one/massage_man.png
new file mode 100644
index 00000000000..68d3f716341
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_man.png differ
diff --git a/public/images/emoji/emoji_one/massage_man/2.png b/public/images/emoji/emoji_one/massage_man/2.png
new file mode 100644
index 00000000000..d5ad39832a0
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_man/2.png differ
diff --git a/public/images/emoji/emoji_one/massage_man/3.png b/public/images/emoji/emoji_one/massage_man/3.png
new file mode 100644
index 00000000000..d8557c701e8
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_man/3.png differ
diff --git a/public/images/emoji/emoji_one/massage_man/4.png b/public/images/emoji/emoji_one/massage_man/4.png
new file mode 100644
index 00000000000..e7c12dd8c70
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_man/4.png differ
diff --git a/public/images/emoji/emoji_one/massage_man/5.png b/public/images/emoji/emoji_one/massage_man/5.png
new file mode 100644
index 00000000000..70c44ccb057
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_man/5.png differ
diff --git a/public/images/emoji/emoji_one/massage_man/6.png b/public/images/emoji/emoji_one/massage_man/6.png
new file mode 100644
index 00000000000..bd1020497d0
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_man/6.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman.png b/public/images/emoji/emoji_one/massage_woman.png
new file mode 100644
index 00000000000..bc6176bb8e8
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_woman.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman/2.png b/public/images/emoji/emoji_one/massage_woman/2.png
new file mode 100644
index 00000000000..1f91b9ebac1
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman/3.png b/public/images/emoji/emoji_one/massage_woman/3.png
new file mode 100644
index 00000000000..b5d0c9d676d
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman/4.png b/public/images/emoji/emoji_one/massage_woman/4.png
new file mode 100644
index 00000000000..861a00f549a
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman/5.png b/public/images/emoji/emoji_one/massage_woman/5.png
new file mode 100644
index 00000000000..df5f8d6607e
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman/6.png b/public/images/emoji/emoji_one/massage_woman/6.png
new file mode 100644
index 00000000000..7419cfaa352
Binary files /dev/null and b/public/images/emoji/emoji_one/massage_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/mauritania.png b/public/images/emoji/emoji_one/mauritania.png
new file mode 100644
index 00000000000..23fa26e4ced
Binary files /dev/null and b/public/images/emoji/emoji_one/mauritania.png differ
diff --git a/public/images/emoji/emoji_one/mauritius.png b/public/images/emoji/emoji_one/mauritius.png
new file mode 100644
index 00000000000..846272e3670
Binary files /dev/null and b/public/images/emoji/emoji_one/mauritius.png differ
diff --git a/public/images/emoji/emoji_one/mayotte.png b/public/images/emoji/emoji_one/mayotte.png
new file mode 100644
index 00000000000..43a7879d247
Binary files /dev/null and b/public/images/emoji/emoji_one/mayotte.png differ
diff --git a/public/images/emoji/emoji_one/meat_on_bone.png b/public/images/emoji/emoji_one/meat_on_bone.png
index ff8398d922f..a90749952d7 100644
Binary files a/public/images/emoji/emoji_one/meat_on_bone.png and b/public/images/emoji/emoji_one/meat_on_bone.png differ
diff --git a/public/images/emoji/emoji_one/medal.png b/public/images/emoji/emoji_one/medal.png
index b5f122fc568..63d5d18c6d8 100644
Binary files a/public/images/emoji/emoji_one/medal.png and b/public/images/emoji/emoji_one/medal.png differ
diff --git a/public/images/emoji/emoji_one/medal_military.png b/public/images/emoji/emoji_one/medal_military.png
new file mode 100644
index 00000000000..423b9a26eaa
Binary files /dev/null and b/public/images/emoji/emoji_one/medal_military.png differ
diff --git a/public/images/emoji/emoji_one/medal_sports.png b/public/images/emoji/emoji_one/medal_sports.png
new file mode 100644
index 00000000000..63d5d18c6d8
Binary files /dev/null and b/public/images/emoji/emoji_one/medal_sports.png differ
diff --git a/public/images/emoji/emoji_one/mega.png b/public/images/emoji/emoji_one/mega.png
index 683e6c6955c..04cd04079b2 100644
Binary files a/public/images/emoji/emoji_one/mega.png and b/public/images/emoji/emoji_one/mega.png differ
diff --git a/public/images/emoji/emoji_one/melon.png b/public/images/emoji/emoji_one/melon.png
index d4a23451433..11ba1863300 100644
Binary files a/public/images/emoji/emoji_one/melon.png and b/public/images/emoji/emoji_one/melon.png differ
diff --git a/public/images/emoji/emoji_one/memo.png b/public/images/emoji/emoji_one/memo.png
new file mode 100644
index 00000000000..5a9bf16ac51
Binary files /dev/null and b/public/images/emoji/emoji_one/memo.png differ
diff --git a/public/images/emoji/emoji_one/men_wrestling.png b/public/images/emoji/emoji_one/men_wrestling.png
new file mode 100644
index 00000000000..a4fc02f4dfb
Binary files /dev/null and b/public/images/emoji/emoji_one/men_wrestling.png differ
diff --git a/public/images/emoji/emoji_one/menorah.png b/public/images/emoji/emoji_one/menorah.png
index 5baf6ee47e5..cc23fa04635 100644
Binary files a/public/images/emoji/emoji_one/menorah.png and b/public/images/emoji/emoji_one/menorah.png differ
diff --git a/public/images/emoji/emoji_one/mens.png b/public/images/emoji/emoji_one/mens.png
index 51926e328c1..953c521a0de 100644
Binary files a/public/images/emoji/emoji_one/mens.png and b/public/images/emoji/emoji_one/mens.png differ
diff --git a/public/images/emoji/emoji_one/merperson.png b/public/images/emoji/emoji_one/merperson.png
new file mode 100644
index 00000000000..8bb7f4f887c
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson.png differ
diff --git a/public/images/emoji/emoji_one/metal.png b/public/images/emoji/emoji_one/metal.png
index da08837ff95..c5afaf3cab9 100644
Binary files a/public/images/emoji/emoji_one/metal.png and b/public/images/emoji/emoji_one/metal.png differ
diff --git a/public/images/emoji/emoji_one/metal/2.png b/public/images/emoji/emoji_one/metal/2.png
new file mode 100644
index 00000000000..58823b056c2
Binary files /dev/null and b/public/images/emoji/emoji_one/metal/2.png differ
diff --git a/public/images/emoji/emoji_one/metal/3.png b/public/images/emoji/emoji_one/metal/3.png
new file mode 100644
index 00000000000..7649f660d6c
Binary files /dev/null and b/public/images/emoji/emoji_one/metal/3.png differ
diff --git a/public/images/emoji/emoji_one/metal/4.png b/public/images/emoji/emoji_one/metal/4.png
new file mode 100644
index 00000000000..587ce13ef0d
Binary files /dev/null and b/public/images/emoji/emoji_one/metal/4.png differ
diff --git a/public/images/emoji/emoji_one/metal/5.png b/public/images/emoji/emoji_one/metal/5.png
new file mode 100644
index 00000000000..6f5a7f9a1a1
Binary files /dev/null and b/public/images/emoji/emoji_one/metal/5.png differ
diff --git a/public/images/emoji/emoji_one/metal/6.png b/public/images/emoji/emoji_one/metal/6.png
new file mode 100644
index 00000000000..90670b67926
Binary files /dev/null and b/public/images/emoji/emoji_one/metal/6.png differ
diff --git a/public/images/emoji/emoji_one/metro.png b/public/images/emoji/emoji_one/metro.png
index 0d064ec8dbc..997ab04c9c7 100644
Binary files a/public/images/emoji/emoji_one/metro.png and b/public/images/emoji/emoji_one/metro.png differ
diff --git a/public/images/emoji/emoji_one/mexico.png b/public/images/emoji/emoji_one/mexico.png
new file mode 100644
index 00000000000..95e838852b4
Binary files /dev/null and b/public/images/emoji/emoji_one/mexico.png differ
diff --git a/public/images/emoji/emoji_one/micronesia.png b/public/images/emoji/emoji_one/micronesia.png
new file mode 100644
index 00000000000..549d03fdc7c
Binary files /dev/null and b/public/images/emoji/emoji_one/micronesia.png differ
diff --git a/public/images/emoji/emoji_one/microphone.png b/public/images/emoji/emoji_one/microphone.png
index 57392f0f83a..25c6a41f239 100644
Binary files a/public/images/emoji/emoji_one/microphone.png and b/public/images/emoji/emoji_one/microphone.png differ
diff --git a/public/images/emoji/emoji_one/microphone2.png b/public/images/emoji/emoji_one/microphone2.png
index 807d3bac9bb..4a10c14e1d4 100644
Binary files a/public/images/emoji/emoji_one/microphone2.png and b/public/images/emoji/emoji_one/microphone2.png differ
diff --git a/public/images/emoji/emoji_one/microscope.png b/public/images/emoji/emoji_one/microscope.png
index 6ea8d499257..e4b0ea2de79 100644
Binary files a/public/images/emoji/emoji_one/microscope.png and b/public/images/emoji/emoji_one/microscope.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger.png b/public/images/emoji/emoji_one/middle_finger.png
index 6f99e17bdb6..1bc73629bb1 100644
Binary files a/public/images/emoji/emoji_one/middle_finger.png and b/public/images/emoji/emoji_one/middle_finger.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger/2.png b/public/images/emoji/emoji_one/middle_finger/2.png
new file mode 100644
index 00000000000..37ac4780316
Binary files /dev/null and b/public/images/emoji/emoji_one/middle_finger/2.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger/3.png b/public/images/emoji/emoji_one/middle_finger/3.png
new file mode 100644
index 00000000000..69fbed14d25
Binary files /dev/null and b/public/images/emoji/emoji_one/middle_finger/3.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger/4.png b/public/images/emoji/emoji_one/middle_finger/4.png
new file mode 100644
index 00000000000..c1134aea0fa
Binary files /dev/null and b/public/images/emoji/emoji_one/middle_finger/4.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger/5.png b/public/images/emoji/emoji_one/middle_finger/5.png
new file mode 100644
index 00000000000..371ee90cf9f
Binary files /dev/null and b/public/images/emoji/emoji_one/middle_finger/5.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger/6.png b/public/images/emoji/emoji_one/middle_finger/6.png
new file mode 100644
index 00000000000..db57dfd0983
Binary files /dev/null and b/public/images/emoji/emoji_one/middle_finger/6.png differ
diff --git a/public/images/emoji/emoji_one/military_medal.png b/public/images/emoji/emoji_one/military_medal.png
index b6a38f18614..423b9a26eaa 100644
Binary files a/public/images/emoji/emoji_one/military_medal.png and b/public/images/emoji/emoji_one/military_medal.png differ
diff --git a/public/images/emoji/emoji_one/milk_glass.png b/public/images/emoji/emoji_one/milk_glass.png
new file mode 100644
index 00000000000..e3ea06a0064
Binary files /dev/null and b/public/images/emoji/emoji_one/milk_glass.png differ
diff --git a/public/images/emoji/emoji_one/milky_way.png b/public/images/emoji/emoji_one/milky_way.png
index b6e08e1d9cc..99ec10a374b 100644
Binary files a/public/images/emoji/emoji_one/milky_way.png and b/public/images/emoji/emoji_one/milky_way.png differ
diff --git a/public/images/emoji/emoji_one/minibus.png b/public/images/emoji/emoji_one/minibus.png
index 9594f5f3c96..94424442b37 100644
Binary files a/public/images/emoji/emoji_one/minibus.png and b/public/images/emoji/emoji_one/minibus.png differ
diff --git a/public/images/emoji/emoji_one/minidisc.png b/public/images/emoji/emoji_one/minidisc.png
index d77c0a05dcd..a44117ec899 100644
Binary files a/public/images/emoji/emoji_one/minidisc.png and b/public/images/emoji/emoji_one/minidisc.png differ
diff --git a/public/images/emoji/emoji_one/mobile_phone_off.png b/public/images/emoji/emoji_one/mobile_phone_off.png
index 469367a6797..69c60ad4ad4 100644
Binary files a/public/images/emoji/emoji_one/mobile_phone_off.png and b/public/images/emoji/emoji_one/mobile_phone_off.png differ
diff --git a/public/images/emoji/emoji_one/moldova.png b/public/images/emoji/emoji_one/moldova.png
new file mode 100644
index 00000000000..d4463a01473
Binary files /dev/null and b/public/images/emoji/emoji_one/moldova.png differ
diff --git a/public/images/emoji/emoji_one/monaco.png b/public/images/emoji/emoji_one/monaco.png
new file mode 100644
index 00000000000..17833f535af
Binary files /dev/null and b/public/images/emoji/emoji_one/monaco.png differ
diff --git a/public/images/emoji/emoji_one/money_mouth.png b/public/images/emoji/emoji_one/money_mouth.png
index 267d6c1643e..364ee6dbcb8 100644
Binary files a/public/images/emoji/emoji_one/money_mouth.png and b/public/images/emoji/emoji_one/money_mouth.png differ
diff --git a/public/images/emoji/emoji_one/money_mouth_face.png b/public/images/emoji/emoji_one/money_mouth_face.png
index 267d6c1643e..364ee6dbcb8 100644
Binary files a/public/images/emoji/emoji_one/money_mouth_face.png and b/public/images/emoji/emoji_one/money_mouth_face.png differ
diff --git a/public/images/emoji/emoji_one/money_with_wings.png b/public/images/emoji/emoji_one/money_with_wings.png
index 805ac8afd00..9005ced3fe1 100644
Binary files a/public/images/emoji/emoji_one/money_with_wings.png and b/public/images/emoji/emoji_one/money_with_wings.png differ
diff --git a/public/images/emoji/emoji_one/moneybag.png b/public/images/emoji/emoji_one/moneybag.png
index 6239b8e4e95..f020e5d2454 100644
Binary files a/public/images/emoji/emoji_one/moneybag.png and b/public/images/emoji/emoji_one/moneybag.png differ
diff --git a/public/images/emoji/emoji_one/mongolia.png b/public/images/emoji/emoji_one/mongolia.png
new file mode 100644
index 00000000000..cf978945085
Binary files /dev/null and b/public/images/emoji/emoji_one/mongolia.png differ
diff --git a/public/images/emoji/emoji_one/monkey.png b/public/images/emoji/emoji_one/monkey.png
index 08733713de9..f2b8c20d6ff 100644
Binary files a/public/images/emoji/emoji_one/monkey.png and b/public/images/emoji/emoji_one/monkey.png differ
diff --git a/public/images/emoji/emoji_one/monkey_face.png b/public/images/emoji/emoji_one/monkey_face.png
index 841f3d3c178..1ec95ee3d11 100644
Binary files a/public/images/emoji/emoji_one/monkey_face.png and b/public/images/emoji/emoji_one/monkey_face.png differ
diff --git a/public/images/emoji/emoji_one/monorail.png b/public/images/emoji/emoji_one/monorail.png
index e7099b86966..e081bf9cb89 100644
Binary files a/public/images/emoji/emoji_one/monorail.png and b/public/images/emoji/emoji_one/monorail.png differ
diff --git a/public/images/emoji/emoji_one/montenegro.png b/public/images/emoji/emoji_one/montenegro.png
new file mode 100644
index 00000000000..7cbd07cef3c
Binary files /dev/null and b/public/images/emoji/emoji_one/montenegro.png differ
diff --git a/public/images/emoji/emoji_one/montserrat.png b/public/images/emoji/emoji_one/montserrat.png
new file mode 100644
index 00000000000..28712de519d
Binary files /dev/null and b/public/images/emoji/emoji_one/montserrat.png differ
diff --git a/public/images/emoji/emoji_one/moon.png b/public/images/emoji/emoji_one/moon.png
new file mode 100644
index 00000000000..3020cb4c19f
Binary files /dev/null and b/public/images/emoji/emoji_one/moon.png differ
diff --git a/public/images/emoji/emoji_one/morocco.png b/public/images/emoji/emoji_one/morocco.png
new file mode 100644
index 00000000000..7f16d0a66de
Binary files /dev/null and b/public/images/emoji/emoji_one/morocco.png differ
diff --git a/public/images/emoji/emoji_one/mortar_board.png b/public/images/emoji/emoji_one/mortar_board.png
index 5e40cf898f7..11a5e7f2d24 100644
Binary files a/public/images/emoji/emoji_one/mortar_board.png and b/public/images/emoji/emoji_one/mortar_board.png differ
diff --git a/public/images/emoji/emoji_one/mosque.png b/public/images/emoji/emoji_one/mosque.png
index 158222fe4bc..e5a96e633b0 100644
Binary files a/public/images/emoji/emoji_one/mosque.png and b/public/images/emoji/emoji_one/mosque.png differ
diff --git a/public/images/emoji/emoji_one/motor_boat.png b/public/images/emoji/emoji_one/motor_boat.png
new file mode 100644
index 00000000000..0dfeae01e90
Binary files /dev/null and b/public/images/emoji/emoji_one/motor_boat.png differ
diff --git a/public/images/emoji/emoji_one/motor_scooter.png b/public/images/emoji/emoji_one/motor_scooter.png
new file mode 100644
index 00000000000..be078d0d1e8
Binary files /dev/null and b/public/images/emoji/emoji_one/motor_scooter.png differ
diff --git a/public/images/emoji/emoji_one/motorboat.png b/public/images/emoji/emoji_one/motorboat.png
index fe090e9cc0b..0dfeae01e90 100644
Binary files a/public/images/emoji/emoji_one/motorboat.png and b/public/images/emoji/emoji_one/motorboat.png differ
diff --git a/public/images/emoji/emoji_one/motorcycle.png b/public/images/emoji/emoji_one/motorcycle.png
index be62ca41f19..9014f6e7201 100644
Binary files a/public/images/emoji/emoji_one/motorcycle.png and b/public/images/emoji/emoji_one/motorcycle.png differ
diff --git a/public/images/emoji/emoji_one/motorway.png b/public/images/emoji/emoji_one/motorway.png
index cae0bce1585..1a2fd734e45 100644
Binary files a/public/images/emoji/emoji_one/motorway.png and b/public/images/emoji/emoji_one/motorway.png differ
diff --git a/public/images/emoji/emoji_one/mount_fuji.png b/public/images/emoji/emoji_one/mount_fuji.png
index 94fdf69b3bf..48012f21fc7 100644
Binary files a/public/images/emoji/emoji_one/mount_fuji.png and b/public/images/emoji/emoji_one/mount_fuji.png differ
diff --git a/public/images/emoji/emoji_one/mountain.png b/public/images/emoji/emoji_one/mountain.png
index 7d01279c272..93c67d8cc7c 100644
Binary files a/public/images/emoji/emoji_one/mountain.png and b/public/images/emoji/emoji_one/mountain.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist.png b/public/images/emoji/emoji_one/mountain_bicyclist.png
index 202e911d382..7966eeba38d 100644
Binary files a/public/images/emoji/emoji_one/mountain_bicyclist.png and b/public/images/emoji/emoji_one/mountain_bicyclist.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist/2.png b/public/images/emoji/emoji_one/mountain_bicyclist/2.png
new file mode 100644
index 00000000000..03e88fba5ed
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist/3.png b/public/images/emoji/emoji_one/mountain_bicyclist/3.png
new file mode 100644
index 00000000000..4505087a27c
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist/4.png b/public/images/emoji/emoji_one/mountain_bicyclist/4.png
new file mode 100644
index 00000000000..ab88eaeeebe
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist/5.png b/public/images/emoji/emoji_one/mountain_bicyclist/5.png
new file mode 100644
index 00000000000..8fc9f8ee142
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist/6.png b/public/images/emoji/emoji_one/mountain_bicyclist/6.png
new file mode 100644
index 00000000000..52c8ad73d4d
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man.png b/public/images/emoji/emoji_one/mountain_biking_man.png
new file mode 100644
index 00000000000..7966eeba38d
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_man.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man/2.png b/public/images/emoji/emoji_one/mountain_biking_man/2.png
new file mode 100644
index 00000000000..03e88fba5ed
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man/3.png b/public/images/emoji/emoji_one/mountain_biking_man/3.png
new file mode 100644
index 00000000000..4505087a27c
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man/4.png b/public/images/emoji/emoji_one/mountain_biking_man/4.png
new file mode 100644
index 00000000000..ab88eaeeebe
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man/5.png b/public/images/emoji/emoji_one/mountain_biking_man/5.png
new file mode 100644
index 00000000000..8fc9f8ee142
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man/6.png b/public/images/emoji/emoji_one/mountain_biking_man/6.png
new file mode 100644
index 00000000000..52c8ad73d4d
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman.png b/public/images/emoji/emoji_one/mountain_biking_woman.png
new file mode 100644
index 00000000000..9f370d9ae57
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_woman.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman/2.png b/public/images/emoji/emoji_one/mountain_biking_woman/2.png
new file mode 100644
index 00000000000..568cc09171f
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman/3.png b/public/images/emoji/emoji_one/mountain_biking_woman/3.png
new file mode 100644
index 00000000000..64eeccd1b5a
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman/4.png b/public/images/emoji/emoji_one/mountain_biking_woman/4.png
new file mode 100644
index 00000000000..87ece4d70cb
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman/5.png b/public/images/emoji/emoji_one/mountain_biking_woman/5.png
new file mode 100644
index 00000000000..83ccad20acd
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman/6.png b/public/images/emoji/emoji_one/mountain_biking_woman/6.png
new file mode 100644
index 00000000000..4b0753fa209
Binary files /dev/null and b/public/images/emoji/emoji_one/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/mountain_cableway.png b/public/images/emoji/emoji_one/mountain_cableway.png
index aa24ad366c7..a517207caf7 100644
Binary files a/public/images/emoji/emoji_one/mountain_cableway.png and b/public/images/emoji/emoji_one/mountain_cableway.png differ
diff --git a/public/images/emoji/emoji_one/mountain_railway.png b/public/images/emoji/emoji_one/mountain_railway.png
index 0c365f93683..dd42e9d4478 100644
Binary files a/public/images/emoji/emoji_one/mountain_railway.png and b/public/images/emoji/emoji_one/mountain_railway.png differ
diff --git a/public/images/emoji/emoji_one/mountain_snow.png b/public/images/emoji/emoji_one/mountain_snow.png
index fcf09dab6b3..5654198a525 100644
Binary files a/public/images/emoji/emoji_one/mountain_snow.png and b/public/images/emoji/emoji_one/mountain_snow.png differ
diff --git a/public/images/emoji/emoji_one/mouse.png b/public/images/emoji/emoji_one/mouse.png
index 98ff28c82d4..62bff90b9d9 100644
Binary files a/public/images/emoji/emoji_one/mouse.png and b/public/images/emoji/emoji_one/mouse.png differ
diff --git a/public/images/emoji/emoji_one/mouse2.png b/public/images/emoji/emoji_one/mouse2.png
index eaed642c75d..b5164e68deb 100644
Binary files a/public/images/emoji/emoji_one/mouse2.png and b/public/images/emoji/emoji_one/mouse2.png differ
diff --git a/public/images/emoji/emoji_one/mouse_three_button.png b/public/images/emoji/emoji_one/mouse_three_button.png
index b03f1583b9e..0e9dfa8326a 100644
Binary files a/public/images/emoji/emoji_one/mouse_three_button.png and b/public/images/emoji/emoji_one/mouse_three_button.png differ
diff --git a/public/images/emoji/emoji_one/movie_camera.png b/public/images/emoji/emoji_one/movie_camera.png
index 65b156c3316..bba0902b3e8 100644
Binary files a/public/images/emoji/emoji_one/movie_camera.png and b/public/images/emoji/emoji_one/movie_camera.png differ
diff --git a/public/images/emoji/emoji_one/moyai.png b/public/images/emoji/emoji_one/moyai.png
index 88e53a2d9ca..fa8f664e9c2 100644
Binary files a/public/images/emoji/emoji_one/moyai.png and b/public/images/emoji/emoji_one/moyai.png differ
diff --git a/public/images/emoji/emoji_one/mozambique.png b/public/images/emoji/emoji_one/mozambique.png
new file mode 100644
index 00000000000..07d5cd56f0e
Binary files /dev/null and b/public/images/emoji/emoji_one/mozambique.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus.png b/public/images/emoji/emoji_one/mrs_claus.png
new file mode 100644
index 00000000000..0bfa9b22896
Binary files /dev/null and b/public/images/emoji/emoji_one/mrs_claus.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus/2.png b/public/images/emoji/emoji_one/mrs_claus/2.png
new file mode 100644
index 00000000000..016b9b201f8
Binary files /dev/null and b/public/images/emoji/emoji_one/mrs_claus/2.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus/3.png b/public/images/emoji/emoji_one/mrs_claus/3.png
new file mode 100644
index 00000000000..b62fbe5fe27
Binary files /dev/null and b/public/images/emoji/emoji_one/mrs_claus/3.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus/4.png b/public/images/emoji/emoji_one/mrs_claus/4.png
new file mode 100644
index 00000000000..bda101150ef
Binary files /dev/null and b/public/images/emoji/emoji_one/mrs_claus/4.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus/5.png b/public/images/emoji/emoji_one/mrs_claus/5.png
new file mode 100644
index 00000000000..5fac5f0e0b8
Binary files /dev/null and b/public/images/emoji/emoji_one/mrs_claus/5.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus/6.png b/public/images/emoji/emoji_one/mrs_claus/6.png
new file mode 100644
index 00000000000..0f37b0cfd2f
Binary files /dev/null and b/public/images/emoji/emoji_one/mrs_claus/6.png differ
diff --git a/public/images/emoji/emoji_one/muscle.png b/public/images/emoji/emoji_one/muscle.png
index e8cff18af8e..86231c7c881 100644
Binary files a/public/images/emoji/emoji_one/muscle.png and b/public/images/emoji/emoji_one/muscle.png differ
diff --git a/public/images/emoji/emoji_one/muscle/2.png b/public/images/emoji/emoji_one/muscle/2.png
new file mode 100644
index 00000000000..ad23c83c709
Binary files /dev/null and b/public/images/emoji/emoji_one/muscle/2.png differ
diff --git a/public/images/emoji/emoji_one/muscle/3.png b/public/images/emoji/emoji_one/muscle/3.png
new file mode 100644
index 00000000000..cea5d32403f
Binary files /dev/null and b/public/images/emoji/emoji_one/muscle/3.png differ
diff --git a/public/images/emoji/emoji_one/muscle/4.png b/public/images/emoji/emoji_one/muscle/4.png
new file mode 100644
index 00000000000..551a9a8b834
Binary files /dev/null and b/public/images/emoji/emoji_one/muscle/4.png differ
diff --git a/public/images/emoji/emoji_one/muscle/5.png b/public/images/emoji/emoji_one/muscle/5.png
new file mode 100644
index 00000000000..2ac7a5f3922
Binary files /dev/null and b/public/images/emoji/emoji_one/muscle/5.png differ
diff --git a/public/images/emoji/emoji_one/muscle/6.png b/public/images/emoji/emoji_one/muscle/6.png
new file mode 100644
index 00000000000..d73cee216eb
Binary files /dev/null and b/public/images/emoji/emoji_one/muscle/6.png differ
diff --git a/public/images/emoji/emoji_one/mushroom.png b/public/images/emoji/emoji_one/mushroom.png
index a755e1dca21..4e68a59c2a8 100644
Binary files a/public/images/emoji/emoji_one/mushroom.png and b/public/images/emoji/emoji_one/mushroom.png differ
diff --git a/public/images/emoji/emoji_one/musical_keyboard.png b/public/images/emoji/emoji_one/musical_keyboard.png
index af3c2cf8777..92a822c147c 100644
Binary files a/public/images/emoji/emoji_one/musical_keyboard.png and b/public/images/emoji/emoji_one/musical_keyboard.png differ
diff --git a/public/images/emoji/emoji_one/musical_note.png b/public/images/emoji/emoji_one/musical_note.png
index c7ea06d53d5..a2e81aa34bb 100644
Binary files a/public/images/emoji/emoji_one/musical_note.png and b/public/images/emoji/emoji_one/musical_note.png differ
diff --git a/public/images/emoji/emoji_one/musical_score.png b/public/images/emoji/emoji_one/musical_score.png
index 6f8204be525..d0c5e8ef9ce 100644
Binary files a/public/images/emoji/emoji_one/musical_score.png and b/public/images/emoji/emoji_one/musical_score.png differ
diff --git a/public/images/emoji/emoji_one/mute.png b/public/images/emoji/emoji_one/mute.png
index 1db8a5659e7..43b741d883a 100644
Binary files a/public/images/emoji/emoji_one/mute.png and b/public/images/emoji/emoji_one/mute.png differ
diff --git a/public/images/emoji/emoji_one/myanmar.png b/public/images/emoji/emoji_one/myanmar.png
new file mode 100644
index 00000000000..345829e2a3e
Binary files /dev/null and b/public/images/emoji/emoji_one/myanmar.png differ
diff --git a/public/images/emoji/emoji_one/nail_care.png b/public/images/emoji/emoji_one/nail_care.png
index 92fd62fc54c..9475bfd88b7 100644
Binary files a/public/images/emoji/emoji_one/nail_care.png and b/public/images/emoji/emoji_one/nail_care.png differ
diff --git a/public/images/emoji/emoji_one/nail_care/2.png b/public/images/emoji/emoji_one/nail_care/2.png
new file mode 100644
index 00000000000..e9232098457
Binary files /dev/null and b/public/images/emoji/emoji_one/nail_care/2.png differ
diff --git a/public/images/emoji/emoji_one/nail_care/3.png b/public/images/emoji/emoji_one/nail_care/3.png
new file mode 100644
index 00000000000..be20f9cb05c
Binary files /dev/null and b/public/images/emoji/emoji_one/nail_care/3.png differ
diff --git a/public/images/emoji/emoji_one/nail_care/4.png b/public/images/emoji/emoji_one/nail_care/4.png
new file mode 100644
index 00000000000..849c511bd17
Binary files /dev/null and b/public/images/emoji/emoji_one/nail_care/4.png differ
diff --git a/public/images/emoji/emoji_one/nail_care/5.png b/public/images/emoji/emoji_one/nail_care/5.png
new file mode 100644
index 00000000000..99d9dcec6d5
Binary files /dev/null and b/public/images/emoji/emoji_one/nail_care/5.png differ
diff --git a/public/images/emoji/emoji_one/nail_care/6.png b/public/images/emoji/emoji_one/nail_care/6.png
new file mode 100644
index 00000000000..f676aaca29e
Binary files /dev/null and b/public/images/emoji/emoji_one/nail_care/6.png differ
diff --git a/public/images/emoji/emoji_one/name_badge.png b/public/images/emoji/emoji_one/name_badge.png
index c1b6c30da52..fd76506f1e5 100644
Binary files a/public/images/emoji/emoji_one/name_badge.png and b/public/images/emoji/emoji_one/name_badge.png differ
diff --git a/public/images/emoji/emoji_one/namibia.png b/public/images/emoji/emoji_one/namibia.png
new file mode 100644
index 00000000000..f505b371fd5
Binary files /dev/null and b/public/images/emoji/emoji_one/namibia.png differ
diff --git a/public/images/emoji/emoji_one/national_park.png b/public/images/emoji/emoji_one/national_park.png
index 65a3d29cc17..51e74834990 100644
Binary files a/public/images/emoji/emoji_one/national_park.png and b/public/images/emoji/emoji_one/national_park.png differ
diff --git a/public/images/emoji/emoji_one/nauru.png b/public/images/emoji/emoji_one/nauru.png
new file mode 100644
index 00000000000..443c1a5e935
Binary files /dev/null and b/public/images/emoji/emoji_one/nauru.png differ
diff --git a/public/images/emoji/emoji_one/nauseated_face.png b/public/images/emoji/emoji_one/nauseated_face.png
new file mode 100644
index 00000000000..5daeea636d4
Binary files /dev/null and b/public/images/emoji/emoji_one/nauseated_face.png differ
diff --git a/public/images/emoji/emoji_one/necktie.png b/public/images/emoji/emoji_one/necktie.png
index a3f70d6ba8f..7013509cd21 100644
Binary files a/public/images/emoji/emoji_one/necktie.png and b/public/images/emoji/emoji_one/necktie.png differ
diff --git a/public/images/emoji/emoji_one/negative_squared_cross_mark.png b/public/images/emoji/emoji_one/negative_squared_cross_mark.png
index aefbc66f6f8..27d79adaf6d 100644
Binary files a/public/images/emoji/emoji_one/negative_squared_cross_mark.png and b/public/images/emoji/emoji_one/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/emoji_one/nepal.png b/public/images/emoji/emoji_one/nepal.png
new file mode 100644
index 00000000000..cd57822d801
Binary files /dev/null and b/public/images/emoji/emoji_one/nepal.png differ
diff --git a/public/images/emoji/emoji_one/nerd.png b/public/images/emoji/emoji_one/nerd.png
index f546c07bbb2..c17e121530e 100644
Binary files a/public/images/emoji/emoji_one/nerd.png and b/public/images/emoji/emoji_one/nerd.png differ
diff --git a/public/images/emoji/emoji_one/nerd_face.png b/public/images/emoji/emoji_one/nerd_face.png
index f546c07bbb2..c17e121530e 100644
Binary files a/public/images/emoji/emoji_one/nerd_face.png and b/public/images/emoji/emoji_one/nerd_face.png differ
diff --git a/public/images/emoji/emoji_one/netherlands.png b/public/images/emoji/emoji_one/netherlands.png
new file mode 100644
index 00000000000..1e37d79d5d4
Binary files /dev/null and b/public/images/emoji/emoji_one/netherlands.png differ
diff --git a/public/images/emoji/emoji_one/neutral_face.png b/public/images/emoji/emoji_one/neutral_face.png
index 5f30ea932f4..678d22e786d 100644
Binary files a/public/images/emoji/emoji_one/neutral_face.png and b/public/images/emoji/emoji_one/neutral_face.png differ
diff --git a/public/images/emoji/emoji_one/new.png b/public/images/emoji/emoji_one/new.png
index f892ce6d224..e12d132bb38 100644
Binary files a/public/images/emoji/emoji_one/new.png and b/public/images/emoji/emoji_one/new.png differ
diff --git a/public/images/emoji/emoji_one/new_caledonia.png b/public/images/emoji/emoji_one/new_caledonia.png
new file mode 100644
index 00000000000..45914c48c7d
Binary files /dev/null and b/public/images/emoji/emoji_one/new_caledonia.png differ
diff --git a/public/images/emoji/emoji_one/new_moon.png b/public/images/emoji/emoji_one/new_moon.png
index 6595a81e154..3020cb4c19f 100644
Binary files a/public/images/emoji/emoji_one/new_moon.png and b/public/images/emoji/emoji_one/new_moon.png differ
diff --git a/public/images/emoji/emoji_one/new_moon_with_face.png b/public/images/emoji/emoji_one/new_moon_with_face.png
index 055b146a9f8..931b3eea6c7 100644
Binary files a/public/images/emoji/emoji_one/new_moon_with_face.png and b/public/images/emoji/emoji_one/new_moon_with_face.png differ
diff --git a/public/images/emoji/emoji_one/new_zealand.png b/public/images/emoji/emoji_one/new_zealand.png
new file mode 100644
index 00000000000..9ab60df7b72
Binary files /dev/null and b/public/images/emoji/emoji_one/new_zealand.png differ
diff --git a/public/images/emoji/emoji_one/newspaper.png b/public/images/emoji/emoji_one/newspaper.png
index d0a306b46ce..8bd32c315d4 100644
Binary files a/public/images/emoji/emoji_one/newspaper.png and b/public/images/emoji/emoji_one/newspaper.png differ
diff --git a/public/images/emoji/emoji_one/newspaper2.png b/public/images/emoji/emoji_one/newspaper2.png
index 9bab1e549d4..4568e894ec8 100644
Binary files a/public/images/emoji/emoji_one/newspaper2.png and b/public/images/emoji/emoji_one/newspaper2.png differ
diff --git a/public/images/emoji/emoji_one/newspaper_roll.png b/public/images/emoji/emoji_one/newspaper_roll.png
new file mode 100644
index 00000000000..4568e894ec8
Binary files /dev/null and b/public/images/emoji/emoji_one/newspaper_roll.png differ
diff --git a/public/images/emoji/emoji_one/next_track.png b/public/images/emoji/emoji_one/next_track.png
index 1e6fc4c14b8..57c7a28d125 100644
Binary files a/public/images/emoji/emoji_one/next_track.png and b/public/images/emoji/emoji_one/next_track.png differ
diff --git a/public/images/emoji/emoji_one/next_track_button.png b/public/images/emoji/emoji_one/next_track_button.png
new file mode 100644
index 00000000000..57c7a28d125
Binary files /dev/null and b/public/images/emoji/emoji_one/next_track_button.png differ
diff --git a/public/images/emoji/emoji_one/ng.png b/public/images/emoji/emoji_one/ng.png
index d547ef97e32..c515756584a 100644
Binary files a/public/images/emoji/emoji_one/ng.png and b/public/images/emoji/emoji_one/ng.png differ
diff --git a/public/images/emoji/emoji_one/nicaragua.png b/public/images/emoji/emoji_one/nicaragua.png
new file mode 100644
index 00000000000..e405151e2d1
Binary files /dev/null and b/public/images/emoji/emoji_one/nicaragua.png differ
diff --git a/public/images/emoji/emoji_one/niger.png b/public/images/emoji/emoji_one/niger.png
new file mode 100644
index 00000000000..fb6c4a4d372
Binary files /dev/null and b/public/images/emoji/emoji_one/niger.png differ
diff --git a/public/images/emoji/emoji_one/nigeria.png b/public/images/emoji/emoji_one/nigeria.png
new file mode 100644
index 00000000000..23c9d9a7627
Binary files /dev/null and b/public/images/emoji/emoji_one/nigeria.png differ
diff --git a/public/images/emoji/emoji_one/night_with_stars.png b/public/images/emoji/emoji_one/night_with_stars.png
index 94d0623d9b8..787073a1f6f 100644
Binary files a/public/images/emoji/emoji_one/night_with_stars.png and b/public/images/emoji/emoji_one/night_with_stars.png differ
diff --git a/public/images/emoji/emoji_one/nine.png b/public/images/emoji/emoji_one/nine.png
index 61af7b15539..6e25bb3293e 100644
Binary files a/public/images/emoji/emoji_one/nine.png and b/public/images/emoji/emoji_one/nine.png differ
diff --git a/public/images/emoji/emoji_one/niue.png b/public/images/emoji/emoji_one/niue.png
new file mode 100644
index 00000000000..daaa26cc166
Binary files /dev/null and b/public/images/emoji/emoji_one/niue.png differ
diff --git a/public/images/emoji/emoji_one/no_bell.png b/public/images/emoji/emoji_one/no_bell.png
index 7fd601d0263..75c6bb2648e 100644
Binary files a/public/images/emoji/emoji_one/no_bell.png and b/public/images/emoji/emoji_one/no_bell.png differ
diff --git a/public/images/emoji/emoji_one/no_bicycles.png b/public/images/emoji/emoji_one/no_bicycles.png
index cfee56d49c0..d49b8c74cff 100644
Binary files a/public/images/emoji/emoji_one/no_bicycles.png and b/public/images/emoji/emoji_one/no_bicycles.png differ
diff --git a/public/images/emoji/emoji_one/no_entry.png b/public/images/emoji/emoji_one/no_entry.png
index bcdddec2ba8..2ab1a31adc4 100644
Binary files a/public/images/emoji/emoji_one/no_entry.png and b/public/images/emoji/emoji_one/no_entry.png differ
diff --git a/public/images/emoji/emoji_one/no_entry_sign.png b/public/images/emoji/emoji_one/no_entry_sign.png
index 2330f8a8bc2..e4272bd7d03 100644
Binary files a/public/images/emoji/emoji_one/no_entry_sign.png and b/public/images/emoji/emoji_one/no_entry_sign.png differ
diff --git a/public/images/emoji/emoji_one/no_good.png b/public/images/emoji/emoji_one/no_good.png
index e5390d78d41..3a23f470d66 100644
Binary files a/public/images/emoji/emoji_one/no_good.png and b/public/images/emoji/emoji_one/no_good.png differ
diff --git a/public/images/emoji/emoji_one/no_good/2.png b/public/images/emoji/emoji_one/no_good/2.png
new file mode 100644
index 00000000000..127af7cad70
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good/2.png differ
diff --git a/public/images/emoji/emoji_one/no_good/3.png b/public/images/emoji/emoji_one/no_good/3.png
new file mode 100644
index 00000000000..90e84f442df
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good/3.png differ
diff --git a/public/images/emoji/emoji_one/no_good/4.png b/public/images/emoji/emoji_one/no_good/4.png
new file mode 100644
index 00000000000..e8dc6e88828
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good/4.png differ
diff --git a/public/images/emoji/emoji_one/no_good/5.png b/public/images/emoji/emoji_one/no_good/5.png
new file mode 100644
index 00000000000..3cbb6fcf0ee
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good/5.png differ
diff --git a/public/images/emoji/emoji_one/no_good/6.png b/public/images/emoji/emoji_one/no_good/6.png
new file mode 100644
index 00000000000..0b2954a0c6c
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good/6.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man.png b/public/images/emoji/emoji_one/no_good_man.png
new file mode 100644
index 00000000000..c875ae4a2d4
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_man.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man/2.png b/public/images/emoji/emoji_one/no_good_man/2.png
new file mode 100644
index 00000000000..ecc62da49ce
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_man/2.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man/3.png b/public/images/emoji/emoji_one/no_good_man/3.png
new file mode 100644
index 00000000000..0f80353ea31
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_man/3.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man/4.png b/public/images/emoji/emoji_one/no_good_man/4.png
new file mode 100644
index 00000000000..bdc4c7da134
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_man/4.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man/5.png b/public/images/emoji/emoji_one/no_good_man/5.png
new file mode 100644
index 00000000000..1c3daecf363
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_man/5.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man/6.png b/public/images/emoji/emoji_one/no_good_man/6.png
new file mode 100644
index 00000000000..20502fbaed7
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_man/6.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman.png b/public/images/emoji/emoji_one/no_good_woman.png
new file mode 100644
index 00000000000..3a23f470d66
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_woman.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman/2.png b/public/images/emoji/emoji_one/no_good_woman/2.png
new file mode 100644
index 00000000000..127af7cad70
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman/3.png b/public/images/emoji/emoji_one/no_good_woman/3.png
new file mode 100644
index 00000000000..90e84f442df
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman/4.png b/public/images/emoji/emoji_one/no_good_woman/4.png
new file mode 100644
index 00000000000..e8dc6e88828
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman/5.png b/public/images/emoji/emoji_one/no_good_woman/5.png
new file mode 100644
index 00000000000..3cbb6fcf0ee
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman/6.png b/public/images/emoji/emoji_one/no_good_woman/6.png
new file mode 100644
index 00000000000..0b2954a0c6c
Binary files /dev/null and b/public/images/emoji/emoji_one/no_good_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/no_mobile_phones.png b/public/images/emoji/emoji_one/no_mobile_phones.png
index 24954213f9e..4aa58e93384 100644
Binary files a/public/images/emoji/emoji_one/no_mobile_phones.png and b/public/images/emoji/emoji_one/no_mobile_phones.png differ
diff --git a/public/images/emoji/emoji_one/no_mouth.png b/public/images/emoji/emoji_one/no_mouth.png
index f604605fee8..abb14e19bc3 100644
Binary files a/public/images/emoji/emoji_one/no_mouth.png and b/public/images/emoji/emoji_one/no_mouth.png differ
diff --git a/public/images/emoji/emoji_one/no_pedestrians.png b/public/images/emoji/emoji_one/no_pedestrians.png
index 1790f7541db..93f2742dfaa 100644
Binary files a/public/images/emoji/emoji_one/no_pedestrians.png and b/public/images/emoji/emoji_one/no_pedestrians.png differ
diff --git a/public/images/emoji/emoji_one/no_smoking.png b/public/images/emoji/emoji_one/no_smoking.png
index c276e0b0f0b..2e97e1e4539 100644
Binary files a/public/images/emoji/emoji_one/no_smoking.png and b/public/images/emoji/emoji_one/no_smoking.png differ
diff --git a/public/images/emoji/emoji_one/non-potable_water.png b/public/images/emoji/emoji_one/non-potable_water.png
index 59f6e800d95..d06253f3176 100644
Binary files a/public/images/emoji/emoji_one/non-potable_water.png and b/public/images/emoji/emoji_one/non-potable_water.png differ
diff --git a/public/images/emoji/emoji_one/norfolk_island.png b/public/images/emoji/emoji_one/norfolk_island.png
new file mode 100644
index 00000000000..574acba1009
Binary files /dev/null and b/public/images/emoji/emoji_one/norfolk_island.png differ
diff --git a/public/images/emoji/emoji_one/north_korea.png b/public/images/emoji/emoji_one/north_korea.png
new file mode 100644
index 00000000000..d15d10aecec
Binary files /dev/null and b/public/images/emoji/emoji_one/north_korea.png differ
diff --git a/public/images/emoji/emoji_one/northern_mariana_islands.png b/public/images/emoji/emoji_one/northern_mariana_islands.png
new file mode 100644
index 00000000000..962a6171b9c
Binary files /dev/null and b/public/images/emoji/emoji_one/northern_mariana_islands.png differ
diff --git a/public/images/emoji/emoji_one/norway.png b/public/images/emoji/emoji_one/norway.png
new file mode 100644
index 00000000000..004a11d8308
Binary files /dev/null and b/public/images/emoji/emoji_one/norway.png differ
diff --git a/public/images/emoji/emoji_one/nose.png b/public/images/emoji/emoji_one/nose.png
index d4dd8f8aa82..3382adb9b9b 100644
Binary files a/public/images/emoji/emoji_one/nose.png and b/public/images/emoji/emoji_one/nose.png differ
diff --git a/public/images/emoji/emoji_one/nose/2.png b/public/images/emoji/emoji_one/nose/2.png
new file mode 100644
index 00000000000..3a7140471ac
Binary files /dev/null and b/public/images/emoji/emoji_one/nose/2.png differ
diff --git a/public/images/emoji/emoji_one/nose/3.png b/public/images/emoji/emoji_one/nose/3.png
new file mode 100644
index 00000000000..7c3d483c523
Binary files /dev/null and b/public/images/emoji/emoji_one/nose/3.png differ
diff --git a/public/images/emoji/emoji_one/nose/4.png b/public/images/emoji/emoji_one/nose/4.png
new file mode 100644
index 00000000000..7ba3f95a23b
Binary files /dev/null and b/public/images/emoji/emoji_one/nose/4.png differ
diff --git a/public/images/emoji/emoji_one/nose/5.png b/public/images/emoji/emoji_one/nose/5.png
new file mode 100644
index 00000000000..d7fc311f571
Binary files /dev/null and b/public/images/emoji/emoji_one/nose/5.png differ
diff --git a/public/images/emoji/emoji_one/nose/6.png b/public/images/emoji/emoji_one/nose/6.png
new file mode 100644
index 00000000000..c0b5ed06449
Binary files /dev/null and b/public/images/emoji/emoji_one/nose/6.png differ
diff --git a/public/images/emoji/emoji_one/notebook.png b/public/images/emoji/emoji_one/notebook.png
index 3f1edfc0003..dfab3025621 100644
Binary files a/public/images/emoji/emoji_one/notebook.png and b/public/images/emoji/emoji_one/notebook.png differ
diff --git a/public/images/emoji/emoji_one/notebook_with_decorative_cover.png b/public/images/emoji/emoji_one/notebook_with_decorative_cover.png
index de9c79d5876..738f930ac56 100644
Binary files a/public/images/emoji/emoji_one/notebook_with_decorative_cover.png and b/public/images/emoji/emoji_one/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/emoji_one/notepad_spiral.png b/public/images/emoji/emoji_one/notepad_spiral.png
index 3137300cb34..08c5181db28 100644
Binary files a/public/images/emoji/emoji_one/notepad_spiral.png and b/public/images/emoji/emoji_one/notepad_spiral.png differ
diff --git a/public/images/emoji/emoji_one/notes.png b/public/images/emoji/emoji_one/notes.png
index 2d0a6955327..a59a0b0f773 100644
Binary files a/public/images/emoji/emoji_one/notes.png and b/public/images/emoji/emoji_one/notes.png differ
diff --git a/public/images/emoji/emoji_one/nut_and_bolt.png b/public/images/emoji/emoji_one/nut_and_bolt.png
index 2e97676a8e9..8d7d79dec0b 100644
Binary files a/public/images/emoji/emoji_one/nut_and_bolt.png and b/public/images/emoji/emoji_one/nut_and_bolt.png differ
diff --git a/public/images/emoji/emoji_one/o.png b/public/images/emoji/emoji_one/o.png
index f34a9c98b62..b56ae8374ee 100644
Binary files a/public/images/emoji/emoji_one/o.png and b/public/images/emoji/emoji_one/o.png differ
diff --git a/public/images/emoji/emoji_one/o2.png b/public/images/emoji/emoji_one/o2.png
index 400bce3e4bf..02f6f9a12a9 100644
Binary files a/public/images/emoji/emoji_one/o2.png and b/public/images/emoji/emoji_one/o2.png differ
diff --git a/public/images/emoji/emoji_one/ocean.png b/public/images/emoji/emoji_one/ocean.png
index c8792833b98..e6a7a860175 100644
Binary files a/public/images/emoji/emoji_one/ocean.png and b/public/images/emoji/emoji_one/ocean.png differ
diff --git a/public/images/emoji/emoji_one/octopus.png b/public/images/emoji/emoji_one/octopus.png
index 5365ca4d8c7..b6e5b785d5b 100644
Binary files a/public/images/emoji/emoji_one/octopus.png and b/public/images/emoji/emoji_one/octopus.png differ
diff --git a/public/images/emoji/emoji_one/oden.png b/public/images/emoji/emoji_one/oden.png
index 4f339f8ca60..30e932cf9c1 100644
Binary files a/public/images/emoji/emoji_one/oden.png and b/public/images/emoji/emoji_one/oden.png differ
diff --git a/public/images/emoji/emoji_one/office.png b/public/images/emoji/emoji_one/office.png
index 3f77f2112a3..2200d871c0a 100644
Binary files a/public/images/emoji/emoji_one/office.png and b/public/images/emoji/emoji_one/office.png differ
diff --git a/public/images/emoji/emoji_one/oil.png b/public/images/emoji/emoji_one/oil.png
index 6c3c0b6ec71..c6b1488ec37 100644
Binary files a/public/images/emoji/emoji_one/oil.png and b/public/images/emoji/emoji_one/oil.png differ
diff --git a/public/images/emoji/emoji_one/oil_drum.png b/public/images/emoji/emoji_one/oil_drum.png
index 6c3c0b6ec71..c6b1488ec37 100644
Binary files a/public/images/emoji/emoji_one/oil_drum.png and b/public/images/emoji/emoji_one/oil_drum.png differ
diff --git a/public/images/emoji/emoji_one/ok.png b/public/images/emoji/emoji_one/ok.png
index 18749a35170..709da2b906a 100644
Binary files a/public/images/emoji/emoji_one/ok.png and b/public/images/emoji/emoji_one/ok.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand.png b/public/images/emoji/emoji_one/ok_hand.png
index 59ae855200c..e190f91edb1 100644
Binary files a/public/images/emoji/emoji_one/ok_hand.png and b/public/images/emoji/emoji_one/ok_hand.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand/2.png b/public/images/emoji/emoji_one/ok_hand/2.png
new file mode 100644
index 00000000000..3e42cc0a079
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand/3.png b/public/images/emoji/emoji_one/ok_hand/3.png
new file mode 100644
index 00000000000..4348ebf5c19
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand/4.png b/public/images/emoji/emoji_one/ok_hand/4.png
new file mode 100644
index 00000000000..031dde8dddb
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand/5.png b/public/images/emoji/emoji_one/ok_hand/5.png
new file mode 100644
index 00000000000..09d6bc18ff9
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand/6.png b/public/images/emoji/emoji_one/ok_hand/6.png
new file mode 100644
index 00000000000..3d2ef92e869
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/ok_man.png b/public/images/emoji/emoji_one/ok_man.png
new file mode 100644
index 00000000000..2ea10db8662
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_man.png differ
diff --git a/public/images/emoji/emoji_one/ok_man/2.png b/public/images/emoji/emoji_one/ok_man/2.png
new file mode 100644
index 00000000000..dc21a39e4ab
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_man/2.png differ
diff --git a/public/images/emoji/emoji_one/ok_man/3.png b/public/images/emoji/emoji_one/ok_man/3.png
new file mode 100644
index 00000000000..f9099ef5bd7
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_man/3.png differ
diff --git a/public/images/emoji/emoji_one/ok_man/4.png b/public/images/emoji/emoji_one/ok_man/4.png
new file mode 100644
index 00000000000..716c85c6b5c
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_man/4.png differ
diff --git a/public/images/emoji/emoji_one/ok_man/5.png b/public/images/emoji/emoji_one/ok_man/5.png
new file mode 100644
index 00000000000..1b266778a13
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_man/5.png differ
diff --git a/public/images/emoji/emoji_one/ok_man/6.png b/public/images/emoji/emoji_one/ok_man/6.png
new file mode 100644
index 00000000000..73686257664
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_man/6.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman.png b/public/images/emoji/emoji_one/ok_woman.png
index 1df42092f00..7f85ec7859f 100644
Binary files a/public/images/emoji/emoji_one/ok_woman.png and b/public/images/emoji/emoji_one/ok_woman.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman/2.png b/public/images/emoji/emoji_one/ok_woman/2.png
new file mode 100644
index 00000000000..fe1e9991f5d
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman/3.png b/public/images/emoji/emoji_one/ok_woman/3.png
new file mode 100644
index 00000000000..4a0aa4a2d71
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman/4.png b/public/images/emoji/emoji_one/ok_woman/4.png
new file mode 100644
index 00000000000..67bf1fa2bbb
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman/5.png b/public/images/emoji/emoji_one/ok_woman/5.png
new file mode 100644
index 00000000000..2f64f651491
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman/6.png b/public/images/emoji/emoji_one/ok_woman/6.png
new file mode 100644
index 00000000000..e79ae5d5acc
Binary files /dev/null and b/public/images/emoji/emoji_one/ok_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/old_key.png b/public/images/emoji/emoji_one/old_key.png
index f74bb1ba0d5..de500e10539 100644
Binary files a/public/images/emoji/emoji_one/old_key.png and b/public/images/emoji/emoji_one/old_key.png differ
diff --git a/public/images/emoji/emoji_one/older_adult.png b/public/images/emoji/emoji_one/older_adult.png
new file mode 100644
index 00000000000..8796829b876
Binary files /dev/null and b/public/images/emoji/emoji_one/older_adult.png differ
diff --git a/public/images/emoji/emoji_one/older_adult/2.png b/public/images/emoji/emoji_one/older_adult/2.png
new file mode 100644
index 00000000000..b36f41960e7
Binary files /dev/null and b/public/images/emoji/emoji_one/older_adult/2.png differ
diff --git a/public/images/emoji/emoji_one/older_adult/3.png b/public/images/emoji/emoji_one/older_adult/3.png
new file mode 100644
index 00000000000..dc1441fea56
Binary files /dev/null and b/public/images/emoji/emoji_one/older_adult/3.png differ
diff --git a/public/images/emoji/emoji_one/older_adult/4.png b/public/images/emoji/emoji_one/older_adult/4.png
new file mode 100644
index 00000000000..abc19e06c74
Binary files /dev/null and b/public/images/emoji/emoji_one/older_adult/4.png differ
diff --git a/public/images/emoji/emoji_one/older_adult/5.png b/public/images/emoji/emoji_one/older_adult/5.png
new file mode 100644
index 00000000000..c90549f6813
Binary files /dev/null and b/public/images/emoji/emoji_one/older_adult/5.png differ
diff --git a/public/images/emoji/emoji_one/older_adult/6.png b/public/images/emoji/emoji_one/older_adult/6.png
new file mode 100644
index 00000000000..5152c9c1a3e
Binary files /dev/null and b/public/images/emoji/emoji_one/older_adult/6.png differ
diff --git a/public/images/emoji/emoji_one/older_man.png b/public/images/emoji/emoji_one/older_man.png
index 92b85c01ff8..509ee79a9ef 100644
Binary files a/public/images/emoji/emoji_one/older_man.png and b/public/images/emoji/emoji_one/older_man.png differ
diff --git a/public/images/emoji/emoji_one/older_man/2.png b/public/images/emoji/emoji_one/older_man/2.png
new file mode 100644
index 00000000000..f98ec1d04d3
Binary files /dev/null and b/public/images/emoji/emoji_one/older_man/2.png differ
diff --git a/public/images/emoji/emoji_one/older_man/3.png b/public/images/emoji/emoji_one/older_man/3.png
new file mode 100644
index 00000000000..ce66ed2b8e8
Binary files /dev/null and b/public/images/emoji/emoji_one/older_man/3.png differ
diff --git a/public/images/emoji/emoji_one/older_man/4.png b/public/images/emoji/emoji_one/older_man/4.png
new file mode 100644
index 00000000000..d3a008785c5
Binary files /dev/null and b/public/images/emoji/emoji_one/older_man/4.png differ
diff --git a/public/images/emoji/emoji_one/older_man/5.png b/public/images/emoji/emoji_one/older_man/5.png
new file mode 100644
index 00000000000..aa4f4230cfe
Binary files /dev/null and b/public/images/emoji/emoji_one/older_man/5.png differ
diff --git a/public/images/emoji/emoji_one/older_man/6.png b/public/images/emoji/emoji_one/older_man/6.png
new file mode 100644
index 00000000000..12903f81000
Binary files /dev/null and b/public/images/emoji/emoji_one/older_man/6.png differ
diff --git a/public/images/emoji/emoji_one/older_woman.png b/public/images/emoji/emoji_one/older_woman.png
index d1e78babe84..ef0d803bae9 100644
Binary files a/public/images/emoji/emoji_one/older_woman.png and b/public/images/emoji/emoji_one/older_woman.png differ
diff --git a/public/images/emoji/emoji_one/older_woman/2.png b/public/images/emoji/emoji_one/older_woman/2.png
new file mode 100644
index 00000000000..78028f179fa
Binary files /dev/null and b/public/images/emoji/emoji_one/older_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/older_woman/3.png b/public/images/emoji/emoji_one/older_woman/3.png
new file mode 100644
index 00000000000..e12b43f089b
Binary files /dev/null and b/public/images/emoji/emoji_one/older_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/older_woman/4.png b/public/images/emoji/emoji_one/older_woman/4.png
new file mode 100644
index 00000000000..7d5882174cd
Binary files /dev/null and b/public/images/emoji/emoji_one/older_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/older_woman/5.png b/public/images/emoji/emoji_one/older_woman/5.png
new file mode 100644
index 00000000000..fdc2609bdbb
Binary files /dev/null and b/public/images/emoji/emoji_one/older_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/older_woman/6.png b/public/images/emoji/emoji_one/older_woman/6.png
new file mode 100644
index 00000000000..a9b8dc3fa1b
Binary files /dev/null and b/public/images/emoji/emoji_one/older_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/om.png b/public/images/emoji/emoji_one/om.png
new file mode 100644
index 00000000000..25c7844a2b4
Binary files /dev/null and b/public/images/emoji/emoji_one/om.png differ
diff --git a/public/images/emoji/emoji_one/om_symbol.png b/public/images/emoji/emoji_one/om_symbol.png
index db9dae08285..25c7844a2b4 100644
Binary files a/public/images/emoji/emoji_one/om_symbol.png and b/public/images/emoji/emoji_one/om_symbol.png differ
diff --git a/public/images/emoji/emoji_one/oman.png b/public/images/emoji/emoji_one/oman.png
new file mode 100644
index 00000000000..59e0df087e4
Binary files /dev/null and b/public/images/emoji/emoji_one/oman.png differ
diff --git a/public/images/emoji/emoji_one/on.png b/public/images/emoji/emoji_one/on.png
index 284d9d3c00a..858a03902b9 100644
Binary files a/public/images/emoji/emoji_one/on.png and b/public/images/emoji/emoji_one/on.png differ
diff --git a/public/images/emoji/emoji_one/oncoming_automobile.png b/public/images/emoji/emoji_one/oncoming_automobile.png
index 94365ea16db..a5f65e3832d 100644
Binary files a/public/images/emoji/emoji_one/oncoming_automobile.png and b/public/images/emoji/emoji_one/oncoming_automobile.png differ
diff --git a/public/images/emoji/emoji_one/oncoming_bus.png b/public/images/emoji/emoji_one/oncoming_bus.png
index b78198d0d79..582d961cc97 100644
Binary files a/public/images/emoji/emoji_one/oncoming_bus.png and b/public/images/emoji/emoji_one/oncoming_bus.png differ
diff --git a/public/images/emoji/emoji_one/oncoming_police_car.png b/public/images/emoji/emoji_one/oncoming_police_car.png
index b4f82551fd8..1866a25fa82 100644
Binary files a/public/images/emoji/emoji_one/oncoming_police_car.png and b/public/images/emoji/emoji_one/oncoming_police_car.png differ
diff --git a/public/images/emoji/emoji_one/oncoming_taxi.png b/public/images/emoji/emoji_one/oncoming_taxi.png
index a84cc5433ea..36907a54be8 100644
Binary files a/public/images/emoji/emoji_one/oncoming_taxi.png and b/public/images/emoji/emoji_one/oncoming_taxi.png differ
diff --git a/public/images/emoji/emoji_one/one.png b/public/images/emoji/emoji_one/one.png
index 2e02f0dc59f..7902d41c78a 100644
Binary files a/public/images/emoji/emoji_one/one.png and b/public/images/emoji/emoji_one/one.png differ
diff --git a/public/images/emoji/emoji_one/open_book.png b/public/images/emoji/emoji_one/open_book.png
new file mode 100644
index 00000000000..3a8176a7d88
Binary files /dev/null and b/public/images/emoji/emoji_one/open_book.png differ
diff --git a/public/images/emoji/emoji_one/open_file_folder.png b/public/images/emoji/emoji_one/open_file_folder.png
index 54d61589a37..33c1ca987f7 100644
Binary files a/public/images/emoji/emoji_one/open_file_folder.png and b/public/images/emoji/emoji_one/open_file_folder.png differ
diff --git a/public/images/emoji/emoji_one/open_hands.png b/public/images/emoji/emoji_one/open_hands.png
index 70fe3a02517..6ec9b8e0ba9 100644
Binary files a/public/images/emoji/emoji_one/open_hands.png and b/public/images/emoji/emoji_one/open_hands.png differ
diff --git a/public/images/emoji/emoji_one/open_hands/2.png b/public/images/emoji/emoji_one/open_hands/2.png
new file mode 100644
index 00000000000..345b06c23fe
Binary files /dev/null and b/public/images/emoji/emoji_one/open_hands/2.png differ
diff --git a/public/images/emoji/emoji_one/open_hands/3.png b/public/images/emoji/emoji_one/open_hands/3.png
new file mode 100644
index 00000000000..3e82135ac49
Binary files /dev/null and b/public/images/emoji/emoji_one/open_hands/3.png differ
diff --git a/public/images/emoji/emoji_one/open_hands/4.png b/public/images/emoji/emoji_one/open_hands/4.png
new file mode 100644
index 00000000000..1238b01769f
Binary files /dev/null and b/public/images/emoji/emoji_one/open_hands/4.png differ
diff --git a/public/images/emoji/emoji_one/open_hands/5.png b/public/images/emoji/emoji_one/open_hands/5.png
new file mode 100644
index 00000000000..6da54d7f51c
Binary files /dev/null and b/public/images/emoji/emoji_one/open_hands/5.png differ
diff --git a/public/images/emoji/emoji_one/open_hands/6.png b/public/images/emoji/emoji_one/open_hands/6.png
new file mode 100644
index 00000000000..93b7a9f3d3a
Binary files /dev/null and b/public/images/emoji/emoji_one/open_hands/6.png differ
diff --git a/public/images/emoji/emoji_one/open_mouth.png b/public/images/emoji/emoji_one/open_mouth.png
index 0a6dae09788..e3e0eff2e45 100644
Binary files a/public/images/emoji/emoji_one/open_mouth.png and b/public/images/emoji/emoji_one/open_mouth.png differ
diff --git a/public/images/emoji/emoji_one/open_umbrella.png b/public/images/emoji/emoji_one/open_umbrella.png
new file mode 100644
index 00000000000..009d0ece9d9
Binary files /dev/null and b/public/images/emoji/emoji_one/open_umbrella.png differ
diff --git a/public/images/emoji/emoji_one/ophiuchus.png b/public/images/emoji/emoji_one/ophiuchus.png
index 45a148e32e1..b570a4c1dfe 100644
Binary files a/public/images/emoji/emoji_one/ophiuchus.png and b/public/images/emoji/emoji_one/ophiuchus.png differ
diff --git a/public/images/emoji/emoji_one/orange_book.png b/public/images/emoji/emoji_one/orange_book.png
index a29c7355d12..e6c302f9fc5 100644
Binary files a/public/images/emoji/emoji_one/orange_book.png and b/public/images/emoji/emoji_one/orange_book.png differ
diff --git a/public/images/emoji/emoji_one/orange_heart.png b/public/images/emoji/emoji_one/orange_heart.png
new file mode 100644
index 00000000000..f217c930a74
Binary files /dev/null and b/public/images/emoji/emoji_one/orange_heart.png differ
diff --git a/public/images/emoji/emoji_one/orthodox_cross.png b/public/images/emoji/emoji_one/orthodox_cross.png
index 34fb8922337..d77d2128c8c 100644
Binary files a/public/images/emoji/emoji_one/orthodox_cross.png and b/public/images/emoji/emoji_one/orthodox_cross.png differ
diff --git a/public/images/emoji/emoji_one/outbox_tray.png b/public/images/emoji/emoji_one/outbox_tray.png
index ccce2b90de1..9240145417f 100644
Binary files a/public/images/emoji/emoji_one/outbox_tray.png and b/public/images/emoji/emoji_one/outbox_tray.png differ
diff --git a/public/images/emoji/emoji_one/owl.png b/public/images/emoji/emoji_one/owl.png
new file mode 100644
index 00000000000..d3fcd025cdc
Binary files /dev/null and b/public/images/emoji/emoji_one/owl.png differ
diff --git a/public/images/emoji/emoji_one/ox.png b/public/images/emoji/emoji_one/ox.png
index e91537b0a10..c1ba333d39b 100644
Binary files a/public/images/emoji/emoji_one/ox.png and b/public/images/emoji/emoji_one/ox.png differ
diff --git a/public/images/emoji/emoji_one/package.png b/public/images/emoji/emoji_one/package.png
index a544f88a591..c235c0f7726 100644
Binary files a/public/images/emoji/emoji_one/package.png and b/public/images/emoji/emoji_one/package.png differ
diff --git a/public/images/emoji/emoji_one/page_facing_up.png b/public/images/emoji/emoji_one/page_facing_up.png
index 5b47f9d7431..c68507d9aad 100644
Binary files a/public/images/emoji/emoji_one/page_facing_up.png and b/public/images/emoji/emoji_one/page_facing_up.png differ
diff --git a/public/images/emoji/emoji_one/page_with_curl.png b/public/images/emoji/emoji_one/page_with_curl.png
index d088e4ed9f0..923fa9b0414 100644
Binary files a/public/images/emoji/emoji_one/page_with_curl.png and b/public/images/emoji/emoji_one/page_with_curl.png differ
diff --git a/public/images/emoji/emoji_one/pager.png b/public/images/emoji/emoji_one/pager.png
index ea36ff28010..dc7b6199532 100644
Binary files a/public/images/emoji/emoji_one/pager.png and b/public/images/emoji/emoji_one/pager.png differ
diff --git a/public/images/emoji/emoji_one/paintbrush.png b/public/images/emoji/emoji_one/paintbrush.png
index eb2b750712b..c61df4d04c6 100644
Binary files a/public/images/emoji/emoji_one/paintbrush.png and b/public/images/emoji/emoji_one/paintbrush.png differ
diff --git a/public/images/emoji/emoji_one/pakistan.png b/public/images/emoji/emoji_one/pakistan.png
new file mode 100644
index 00000000000..f4c74d1d49c
Binary files /dev/null and b/public/images/emoji/emoji_one/pakistan.png differ
diff --git a/public/images/emoji/emoji_one/palau.png b/public/images/emoji/emoji_one/palau.png
new file mode 100644
index 00000000000..69aace7555f
Binary files /dev/null and b/public/images/emoji/emoji_one/palau.png differ
diff --git a/public/images/emoji/emoji_one/palestinian_territories.png b/public/images/emoji/emoji_one/palestinian_territories.png
new file mode 100644
index 00000000000..2e4399d7627
Binary files /dev/null and b/public/images/emoji/emoji_one/palestinian_territories.png differ
diff --git a/public/images/emoji/emoji_one/palm_tree.png b/public/images/emoji/emoji_one/palm_tree.png
index 1d17c2ffa7a..9284c042ed7 100644
Binary files a/public/images/emoji/emoji_one/palm_tree.png and b/public/images/emoji/emoji_one/palm_tree.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together.png b/public/images/emoji/emoji_one/palms_up_together.png
new file mode 100644
index 00000000000..fb66ba11c40
Binary files /dev/null and b/public/images/emoji/emoji_one/palms_up_together.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together/2.png b/public/images/emoji/emoji_one/palms_up_together/2.png
new file mode 100644
index 00000000000..6d9b2fc8ccd
Binary files /dev/null and b/public/images/emoji/emoji_one/palms_up_together/2.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together/3.png b/public/images/emoji/emoji_one/palms_up_together/3.png
new file mode 100644
index 00000000000..c5d52f5c7a7
Binary files /dev/null and b/public/images/emoji/emoji_one/palms_up_together/3.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together/4.png b/public/images/emoji/emoji_one/palms_up_together/4.png
new file mode 100644
index 00000000000..3d4288d10db
Binary files /dev/null and b/public/images/emoji/emoji_one/palms_up_together/4.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together/5.png b/public/images/emoji/emoji_one/palms_up_together/5.png
new file mode 100644
index 00000000000..6ff36c07cbd
Binary files /dev/null and b/public/images/emoji/emoji_one/palms_up_together/5.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together/6.png b/public/images/emoji/emoji_one/palms_up_together/6.png
new file mode 100644
index 00000000000..c25d42927d8
Binary files /dev/null and b/public/images/emoji/emoji_one/palms_up_together/6.png differ
diff --git a/public/images/emoji/emoji_one/panama.png b/public/images/emoji/emoji_one/panama.png
new file mode 100644
index 00000000000..2a564db4266
Binary files /dev/null and b/public/images/emoji/emoji_one/panama.png differ
diff --git a/public/images/emoji/emoji_one/pancakes.png b/public/images/emoji/emoji_one/pancakes.png
new file mode 100644
index 00000000000..73d2253fe5f
Binary files /dev/null and b/public/images/emoji/emoji_one/pancakes.png differ
diff --git a/public/images/emoji/emoji_one/panda_face.png b/public/images/emoji/emoji_one/panda_face.png
index 4c7415ce5a9..a572d24c2c0 100644
Binary files a/public/images/emoji/emoji_one/panda_face.png and b/public/images/emoji/emoji_one/panda_face.png differ
diff --git a/public/images/emoji/emoji_one/paperclip.png b/public/images/emoji/emoji_one/paperclip.png
index 8f1ca18e51b..7db0922aa82 100644
Binary files a/public/images/emoji/emoji_one/paperclip.png and b/public/images/emoji/emoji_one/paperclip.png differ
diff --git a/public/images/emoji/emoji_one/paperclips.png b/public/images/emoji/emoji_one/paperclips.png
index baf54b2f890..8db707562a0 100644
Binary files a/public/images/emoji/emoji_one/paperclips.png and b/public/images/emoji/emoji_one/paperclips.png differ
diff --git a/public/images/emoji/emoji_one/papua_new_guinea.png b/public/images/emoji/emoji_one/papua_new_guinea.png
new file mode 100644
index 00000000000..b449d67794a
Binary files /dev/null and b/public/images/emoji/emoji_one/papua_new_guinea.png differ
diff --git a/public/images/emoji/emoji_one/paraguay.png b/public/images/emoji/emoji_one/paraguay.png
new file mode 100644
index 00000000000..d9eab9434ce
Binary files /dev/null and b/public/images/emoji/emoji_one/paraguay.png differ
diff --git a/public/images/emoji/emoji_one/parasol_on_ground.png b/public/images/emoji/emoji_one/parasol_on_ground.png
new file mode 100644
index 00000000000..4e2db243269
Binary files /dev/null and b/public/images/emoji/emoji_one/parasol_on_ground.png differ
diff --git a/public/images/emoji/emoji_one/park.png b/public/images/emoji/emoji_one/park.png
index 65a3d29cc17..51e74834990 100644
Binary files a/public/images/emoji/emoji_one/park.png and b/public/images/emoji/emoji_one/park.png differ
diff --git a/public/images/emoji/emoji_one/parking.png b/public/images/emoji/emoji_one/parking.png
index 45c5a905f8d..e85ee34cffc 100644
Binary files a/public/images/emoji/emoji_one/parking.png and b/public/images/emoji/emoji_one/parking.png differ
diff --git a/public/images/emoji/emoji_one/part_alternation_mark.png b/public/images/emoji/emoji_one/part_alternation_mark.png
index e600cb3d2e3..d0b4226470d 100644
Binary files a/public/images/emoji/emoji_one/part_alternation_mark.png and b/public/images/emoji/emoji_one/part_alternation_mark.png differ
diff --git a/public/images/emoji/emoji_one/partly_sunny.png b/public/images/emoji/emoji_one/partly_sunny.png
index 10ef91e7ba6..e100b05d5b3 100644
Binary files a/public/images/emoji/emoji_one/partly_sunny.png and b/public/images/emoji/emoji_one/partly_sunny.png differ
diff --git a/public/images/emoji/emoji_one/passenger_ship.png b/public/images/emoji/emoji_one/passenger_ship.png
index c77f1c88dd2..8a05089fbb1 100644
Binary files a/public/images/emoji/emoji_one/passenger_ship.png and b/public/images/emoji/emoji_one/passenger_ship.png differ
diff --git a/public/images/emoji/emoji_one/passport_control.png b/public/images/emoji/emoji_one/passport_control.png
index 3f9b687f860..82dedbf4625 100644
Binary files a/public/images/emoji/emoji_one/passport_control.png and b/public/images/emoji/emoji_one/passport_control.png differ
diff --git a/public/images/emoji/emoji_one/pause_button.png b/public/images/emoji/emoji_one/pause_button.png
index 37b536aaef2..eaff9c506b3 100644
Binary files a/public/images/emoji/emoji_one/pause_button.png and b/public/images/emoji/emoji_one/pause_button.png differ
diff --git a/public/images/emoji/emoji_one/paw_prints.png b/public/images/emoji/emoji_one/paw_prints.png
index a507977217f..37710a6f880 100644
Binary files a/public/images/emoji/emoji_one/paw_prints.png and b/public/images/emoji/emoji_one/paw_prints.png differ
diff --git a/public/images/emoji/emoji_one/peace.png b/public/images/emoji/emoji_one/peace.png
index 8a6c3931ae1..aa9871f5e63 100644
Binary files a/public/images/emoji/emoji_one/peace.png and b/public/images/emoji/emoji_one/peace.png differ
diff --git a/public/images/emoji/emoji_one/peace_symbol.png b/public/images/emoji/emoji_one/peace_symbol.png
index 8a6c3931ae1..aa9871f5e63 100644
Binary files a/public/images/emoji/emoji_one/peace_symbol.png and b/public/images/emoji/emoji_one/peace_symbol.png differ
diff --git a/public/images/emoji/emoji_one/peach.png b/public/images/emoji/emoji_one/peach.png
index 8428a6a0220..03680ece2a8 100644
Binary files a/public/images/emoji/emoji_one/peach.png and b/public/images/emoji/emoji_one/peach.png differ
diff --git a/public/images/emoji/emoji_one/peanuts.png b/public/images/emoji/emoji_one/peanuts.png
new file mode 100644
index 00000000000..cfbdab9aec6
Binary files /dev/null and b/public/images/emoji/emoji_one/peanuts.png differ
diff --git a/public/images/emoji/emoji_one/pear.png b/public/images/emoji/emoji_one/pear.png
index 7ead489e212..7e369c9b1d8 100644
Binary files a/public/images/emoji/emoji_one/pear.png and b/public/images/emoji/emoji_one/pear.png differ
diff --git a/public/images/emoji/emoji_one/pen.png b/public/images/emoji/emoji_one/pen.png
new file mode 100644
index 00000000000..cb005206b63
Binary files /dev/null and b/public/images/emoji/emoji_one/pen.png differ
diff --git a/public/images/emoji/emoji_one/pen_ballpoint.png b/public/images/emoji/emoji_one/pen_ballpoint.png
index 368612e5465..cb005206b63 100644
Binary files a/public/images/emoji/emoji_one/pen_ballpoint.png and b/public/images/emoji/emoji_one/pen_ballpoint.png differ
diff --git a/public/images/emoji/emoji_one/pen_fountain.png b/public/images/emoji/emoji_one/pen_fountain.png
index 9ca6da5a0ce..e9983527850 100644
Binary files a/public/images/emoji/emoji_one/pen_fountain.png and b/public/images/emoji/emoji_one/pen_fountain.png differ
diff --git a/public/images/emoji/emoji_one/pencil.png b/public/images/emoji/emoji_one/pencil.png
index 9a02dd3728d..5a9bf16ac51 100644
Binary files a/public/images/emoji/emoji_one/pencil.png and b/public/images/emoji/emoji_one/pencil.png differ
diff --git a/public/images/emoji/emoji_one/pencil2.png b/public/images/emoji/emoji_one/pencil2.png
index c7fba930344..6545b28994c 100644
Binary files a/public/images/emoji/emoji_one/pencil2.png and b/public/images/emoji/emoji_one/pencil2.png differ
diff --git a/public/images/emoji/emoji_one/penguin.png b/public/images/emoji/emoji_one/penguin.png
index ec3cdc34dff..4ecb573fbb2 100644
Binary files a/public/images/emoji/emoji_one/penguin.png and b/public/images/emoji/emoji_one/penguin.png differ
diff --git a/public/images/emoji/emoji_one/pensive.png b/public/images/emoji/emoji_one/pensive.png
index ce9424666e6..e7bcd154b68 100644
Binary files a/public/images/emoji/emoji_one/pensive.png and b/public/images/emoji/emoji_one/pensive.png differ
diff --git a/public/images/emoji/emoji_one/performing_arts.png b/public/images/emoji/emoji_one/performing_arts.png
index babf4590dbc..0084fba6bf0 100644
Binary files a/public/images/emoji/emoji_one/performing_arts.png and b/public/images/emoji/emoji_one/performing_arts.png differ
diff --git a/public/images/emoji/emoji_one/persevere.png b/public/images/emoji/emoji_one/persevere.png
index 818553a8081..53038c443fe 100644
Binary files a/public/images/emoji/emoji_one/persevere.png and b/public/images/emoji/emoji_one/persevere.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing.png b/public/images/emoji/emoji_one/person_climbing.png
new file mode 100644
index 00000000000..202a814c719
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing.png differ
diff --git a/public/images/emoji/emoji_one/person_fencing.png b/public/images/emoji/emoji_one/person_fencing.png
new file mode 100644
index 00000000000..238d7e6ee13
Binary files /dev/null and b/public/images/emoji/emoji_one/person_fencing.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning.png b/public/images/emoji/emoji_one/person_frowning.png
index 6fb37ad952a..a1af9eaf914 100644
Binary files a/public/images/emoji/emoji_one/person_frowning.png and b/public/images/emoji/emoji_one/person_frowning.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning/2.png b/public/images/emoji/emoji_one/person_frowning/2.png
new file mode 100644
index 00000000000..ce5ee0f0364
Binary files /dev/null and b/public/images/emoji/emoji_one/person_frowning/2.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning/3.png b/public/images/emoji/emoji_one/person_frowning/3.png
new file mode 100644
index 00000000000..f2017acecf4
Binary files /dev/null and b/public/images/emoji/emoji_one/person_frowning/3.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning/4.png b/public/images/emoji/emoji_one/person_frowning/4.png
new file mode 100644
index 00000000000..9fca177e9d9
Binary files /dev/null and b/public/images/emoji/emoji_one/person_frowning/4.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning/5.png b/public/images/emoji/emoji_one/person_frowning/5.png
new file mode 100644
index 00000000000..8bb8d943afd
Binary files /dev/null and b/public/images/emoji/emoji_one/person_frowning/5.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning/6.png b/public/images/emoji/emoji_one/person_frowning/6.png
new file mode 100644
index 00000000000..5d30d35d42e
Binary files /dev/null and b/public/images/emoji/emoji_one/person_frowning/6.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position.png b/public/images/emoji/emoji_one/person_in_lotus_position.png
new file mode 100644
index 00000000000..e9404fd5255
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_lotus_position.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position/2.png b/public/images/emoji/emoji_one/person_in_lotus_position/2.png
new file mode 100644
index 00000000000..8817578cf09
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position/3.png b/public/images/emoji/emoji_one/person_in_lotus_position/3.png
new file mode 100644
index 00000000000..0e9bf46e0b6
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position/4.png b/public/images/emoji/emoji_one/person_in_lotus_position/4.png
new file mode 100644
index 00000000000..918e3d435a2
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position/5.png b/public/images/emoji/emoji_one/person_in_lotus_position/5.png
new file mode 100644
index 00000000000..0c01143530e
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position/6.png b/public/images/emoji/emoji_one/person_in_lotus_position/6.png
new file mode 100644
index 00000000000..fed226dac29
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room.png b/public/images/emoji/emoji_one/person_in_steamy_room.png
new file mode 100644
index 00000000000..65a0790d926
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_steamy_room.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room/2.png b/public/images/emoji/emoji_one/person_in_steamy_room/2.png
new file mode 100644
index 00000000000..7260df1d154
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room/3.png b/public/images/emoji/emoji_one/person_in_steamy_room/3.png
new file mode 100644
index 00000000000..d14580a3db3
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room/4.png b/public/images/emoji/emoji_one/person_in_steamy_room/4.png
new file mode 100644
index 00000000000..9313ab2116b
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room/5.png b/public/images/emoji/emoji_one/person_in_steamy_room/5.png
new file mode 100644
index 00000000000..f432b554b37
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room/6.png b/public/images/emoji/emoji_one/person_in_steamy_room/6.png
new file mode 100644
index 00000000000..dc7087e0284
Binary files /dev/null and b/public/images/emoji/emoji_one/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball.png b/public/images/emoji/emoji_one/person_with_ball.png
index 38c6d635f18..a6904abac92 100644
Binary files a/public/images/emoji/emoji_one/person_with_ball.png and b/public/images/emoji/emoji_one/person_with_ball.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball/2.png b/public/images/emoji/emoji_one/person_with_ball/2.png
new file mode 100644
index 00000000000..9c1bee41ced
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_ball/2.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball/3.png b/public/images/emoji/emoji_one/person_with_ball/3.png
new file mode 100644
index 00000000000..275d1edd9b3
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_ball/3.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball/4.png b/public/images/emoji/emoji_one/person_with_ball/4.png
new file mode 100644
index 00000000000..7eb313163d5
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_ball/4.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball/5.png b/public/images/emoji/emoji_one/person_with_ball/5.png
new file mode 100644
index 00000000000..fb9dc3936f3
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_ball/5.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball/6.png b/public/images/emoji/emoji_one/person_with_ball/6.png
new file mode 100644
index 00000000000..6636a5024f9
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_ball/6.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair.png b/public/images/emoji/emoji_one/person_with_blond_hair.png
index 5a9cd9cedbb..b7e300ea9cd 100644
Binary files a/public/images/emoji/emoji_one/person_with_blond_hair.png and b/public/images/emoji/emoji_one/person_with_blond_hair.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair/2.png b/public/images/emoji/emoji_one/person_with_blond_hair/2.png
new file mode 100644
index 00000000000..afe0242f7aa
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair/3.png b/public/images/emoji/emoji_one/person_with_blond_hair/3.png
new file mode 100644
index 00000000000..39dff279380
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair/4.png b/public/images/emoji/emoji_one/person_with_blond_hair/4.png
new file mode 100644
index 00000000000..02da4b5d72f
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair/5.png b/public/images/emoji/emoji_one/person_with_blond_hair/5.png
new file mode 100644
index 00000000000..e207ddaa266
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair/6.png b/public/images/emoji/emoji_one/person_with_blond_hair/6.png
new file mode 100644
index 00000000000..cb09defa9f3
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face.png b/public/images/emoji/emoji_one/person_with_pouting_face.png
index 4f374afa838..72c13f15320 100644
Binary files a/public/images/emoji/emoji_one/person_with_pouting_face.png and b/public/images/emoji/emoji_one/person_with_pouting_face.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face/2.png b/public/images/emoji/emoji_one/person_with_pouting_face/2.png
new file mode 100644
index 00000000000..dae7de18906
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face/3.png b/public/images/emoji/emoji_one/person_with_pouting_face/3.png
new file mode 100644
index 00000000000..341d3e80ce7
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face/4.png b/public/images/emoji/emoji_one/person_with_pouting_face/4.png
new file mode 100644
index 00000000000..1847d9f981e
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face/5.png b/public/images/emoji/emoji_one/person_with_pouting_face/5.png
new file mode 100644
index 00000000000..5a5df7acd7c
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face/6.png b/public/images/emoji/emoji_one/person_with_pouting_face/6.png
new file mode 100644
index 00000000000..393544addf9
Binary files /dev/null and b/public/images/emoji/emoji_one/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/emoji_one/peru.png b/public/images/emoji/emoji_one/peru.png
new file mode 100644
index 00000000000..bbb5523f939
Binary files /dev/null and b/public/images/emoji/emoji_one/peru.png differ
diff --git a/public/images/emoji/emoji_one/philippines.png b/public/images/emoji/emoji_one/philippines.png
new file mode 100644
index 00000000000..b26fa86ac23
Binary files /dev/null and b/public/images/emoji/emoji_one/philippines.png differ
diff --git a/public/images/emoji/emoji_one/phone.png b/public/images/emoji/emoji_one/phone.png
new file mode 100644
index 00000000000..41071e58049
Binary files /dev/null and b/public/images/emoji/emoji_one/phone.png differ
diff --git a/public/images/emoji/emoji_one/pick.png b/public/images/emoji/emoji_one/pick.png
index a8672c16e4d..acfaec124d8 100644
Binary files a/public/images/emoji/emoji_one/pick.png and b/public/images/emoji/emoji_one/pick.png differ
diff --git a/public/images/emoji/emoji_one/pie.png b/public/images/emoji/emoji_one/pie.png
new file mode 100644
index 00000000000..e73a1a2ed9e
Binary files /dev/null and b/public/images/emoji/emoji_one/pie.png differ
diff --git a/public/images/emoji/emoji_one/pig.png b/public/images/emoji/emoji_one/pig.png
index f7733c43f9b..044bd4fadb5 100644
Binary files a/public/images/emoji/emoji_one/pig.png and b/public/images/emoji/emoji_one/pig.png differ
diff --git a/public/images/emoji/emoji_one/pig2.png b/public/images/emoji/emoji_one/pig2.png
index c01f1f74624..4564113ff25 100644
Binary files a/public/images/emoji/emoji_one/pig2.png and b/public/images/emoji/emoji_one/pig2.png differ
diff --git a/public/images/emoji/emoji_one/pig_nose.png b/public/images/emoji/emoji_one/pig_nose.png
index e3da3db6778..51f1fe6e3ef 100644
Binary files a/public/images/emoji/emoji_one/pig_nose.png and b/public/images/emoji/emoji_one/pig_nose.png differ
diff --git a/public/images/emoji/emoji_one/pill.png b/public/images/emoji/emoji_one/pill.png
index 4faa61d79c7..a30f1593c85 100644
Binary files a/public/images/emoji/emoji_one/pill.png and b/public/images/emoji/emoji_one/pill.png differ
diff --git a/public/images/emoji/emoji_one/pineapple.png b/public/images/emoji/emoji_one/pineapple.png
index c5f12859cd1..c8be5ff5244 100644
Binary files a/public/images/emoji/emoji_one/pineapple.png and b/public/images/emoji/emoji_one/pineapple.png differ
diff --git a/public/images/emoji/emoji_one/ping_pong.png b/public/images/emoji/emoji_one/ping_pong.png
index 057c1dbcd03..ecdefb3dc8a 100644
Binary files a/public/images/emoji/emoji_one/ping_pong.png and b/public/images/emoji/emoji_one/ping_pong.png differ
diff --git a/public/images/emoji/emoji_one/pisces.png b/public/images/emoji/emoji_one/pisces.png
index 4f18a23de0a..30c4d33afc6 100644
Binary files a/public/images/emoji/emoji_one/pisces.png and b/public/images/emoji/emoji_one/pisces.png differ
diff --git a/public/images/emoji/emoji_one/pitcairn_islands.png b/public/images/emoji/emoji_one/pitcairn_islands.png
new file mode 100644
index 00000000000..3e3d79bca5c
Binary files /dev/null and b/public/images/emoji/emoji_one/pitcairn_islands.png differ
diff --git a/public/images/emoji/emoji_one/pizza.png b/public/images/emoji/emoji_one/pizza.png
index 18dc856a9e8..8e9da309b6d 100644
Binary files a/public/images/emoji/emoji_one/pizza.png and b/public/images/emoji/emoji_one/pizza.png differ
diff --git a/public/images/emoji/emoji_one/place_of_worship.png b/public/images/emoji/emoji_one/place_of_worship.png
index 83334c1122c..05ce41a23a8 100644
Binary files a/public/images/emoji/emoji_one/place_of_worship.png and b/public/images/emoji/emoji_one/place_of_worship.png differ
diff --git a/public/images/emoji/emoji_one/plate_with_cutlery.png b/public/images/emoji/emoji_one/plate_with_cutlery.png
new file mode 100644
index 00000000000..c52a0f2d3c9
Binary files /dev/null and b/public/images/emoji/emoji_one/plate_with_cutlery.png differ
diff --git a/public/images/emoji/emoji_one/play_or_pause_button.png b/public/images/emoji/emoji_one/play_or_pause_button.png
new file mode 100644
index 00000000000..d956a2e1b52
Binary files /dev/null and b/public/images/emoji/emoji_one/play_or_pause_button.png differ
diff --git a/public/images/emoji/emoji_one/play_pause.png b/public/images/emoji/emoji_one/play_pause.png
index adc41e26406..d956a2e1b52 100644
Binary files a/public/images/emoji/emoji_one/play_pause.png and b/public/images/emoji/emoji_one/play_pause.png differ
diff --git a/public/images/emoji/emoji_one/point_down.png b/public/images/emoji/emoji_one/point_down.png
index 7d6a31494a7..6e146fec75c 100644
Binary files a/public/images/emoji/emoji_one/point_down.png and b/public/images/emoji/emoji_one/point_down.png differ
diff --git a/public/images/emoji/emoji_one/point_down/2.png b/public/images/emoji/emoji_one/point_down/2.png
new file mode 100644
index 00000000000..96fb4bb64ba
Binary files /dev/null and b/public/images/emoji/emoji_one/point_down/2.png differ
diff --git a/public/images/emoji/emoji_one/point_down/3.png b/public/images/emoji/emoji_one/point_down/3.png
new file mode 100644
index 00000000000..a59bc6fefd8
Binary files /dev/null and b/public/images/emoji/emoji_one/point_down/3.png differ
diff --git a/public/images/emoji/emoji_one/point_down/4.png b/public/images/emoji/emoji_one/point_down/4.png
new file mode 100644
index 00000000000..333b5248ba3
Binary files /dev/null and b/public/images/emoji/emoji_one/point_down/4.png differ
diff --git a/public/images/emoji/emoji_one/point_down/5.png b/public/images/emoji/emoji_one/point_down/5.png
new file mode 100644
index 00000000000..7ee088592d4
Binary files /dev/null and b/public/images/emoji/emoji_one/point_down/5.png differ
diff --git a/public/images/emoji/emoji_one/point_down/6.png b/public/images/emoji/emoji_one/point_down/6.png
new file mode 100644
index 00000000000..d9934267dbc
Binary files /dev/null and b/public/images/emoji/emoji_one/point_down/6.png differ
diff --git a/public/images/emoji/emoji_one/point_left.png b/public/images/emoji/emoji_one/point_left.png
index 676dc9a71b9..fac504f0b7d 100644
Binary files a/public/images/emoji/emoji_one/point_left.png and b/public/images/emoji/emoji_one/point_left.png differ
diff --git a/public/images/emoji/emoji_one/point_left/2.png b/public/images/emoji/emoji_one/point_left/2.png
new file mode 100644
index 00000000000..0a8efd80020
Binary files /dev/null and b/public/images/emoji/emoji_one/point_left/2.png differ
diff --git a/public/images/emoji/emoji_one/point_left/3.png b/public/images/emoji/emoji_one/point_left/3.png
new file mode 100644
index 00000000000..aaaa6a2ab4f
Binary files /dev/null and b/public/images/emoji/emoji_one/point_left/3.png differ
diff --git a/public/images/emoji/emoji_one/point_left/4.png b/public/images/emoji/emoji_one/point_left/4.png
new file mode 100644
index 00000000000..1e47d415093
Binary files /dev/null and b/public/images/emoji/emoji_one/point_left/4.png differ
diff --git a/public/images/emoji/emoji_one/point_left/5.png b/public/images/emoji/emoji_one/point_left/5.png
new file mode 100644
index 00000000000..a86834bb477
Binary files /dev/null and b/public/images/emoji/emoji_one/point_left/5.png differ
diff --git a/public/images/emoji/emoji_one/point_left/6.png b/public/images/emoji/emoji_one/point_left/6.png
new file mode 100644
index 00000000000..8f35b049dd7
Binary files /dev/null and b/public/images/emoji/emoji_one/point_left/6.png differ
diff --git a/public/images/emoji/emoji_one/point_right.png b/public/images/emoji/emoji_one/point_right.png
index 3b73999b42d..ef6ba62b135 100644
Binary files a/public/images/emoji/emoji_one/point_right.png and b/public/images/emoji/emoji_one/point_right.png differ
diff --git a/public/images/emoji/emoji_one/point_right/2.png b/public/images/emoji/emoji_one/point_right/2.png
new file mode 100644
index 00000000000..8da5fac9502
Binary files /dev/null and b/public/images/emoji/emoji_one/point_right/2.png differ
diff --git a/public/images/emoji/emoji_one/point_right/3.png b/public/images/emoji/emoji_one/point_right/3.png
new file mode 100644
index 00000000000..487b670a738
Binary files /dev/null and b/public/images/emoji/emoji_one/point_right/3.png differ
diff --git a/public/images/emoji/emoji_one/point_right/4.png b/public/images/emoji/emoji_one/point_right/4.png
new file mode 100644
index 00000000000..ee87509e0b1
Binary files /dev/null and b/public/images/emoji/emoji_one/point_right/4.png differ
diff --git a/public/images/emoji/emoji_one/point_right/5.png b/public/images/emoji/emoji_one/point_right/5.png
new file mode 100644
index 00000000000..7764f18805c
Binary files /dev/null and b/public/images/emoji/emoji_one/point_right/5.png differ
diff --git a/public/images/emoji/emoji_one/point_right/6.png b/public/images/emoji/emoji_one/point_right/6.png
new file mode 100644
index 00000000000..67f96ff9d0d
Binary files /dev/null and b/public/images/emoji/emoji_one/point_right/6.png differ
diff --git a/public/images/emoji/emoji_one/point_up.png b/public/images/emoji/emoji_one/point_up.png
index db9ccf3c54b..12c59b63d07 100644
Binary files a/public/images/emoji/emoji_one/point_up.png and b/public/images/emoji/emoji_one/point_up.png differ
diff --git a/public/images/emoji/emoji_one/point_up/2.png b/public/images/emoji/emoji_one/point_up/2.png
new file mode 100644
index 00000000000..a058a4da96f
Binary files /dev/null and b/public/images/emoji/emoji_one/point_up/2.png differ
diff --git a/public/images/emoji/emoji_one/point_up/3.png b/public/images/emoji/emoji_one/point_up/3.png
new file mode 100644
index 00000000000..be32c0b3ce9
Binary files /dev/null and b/public/images/emoji/emoji_one/point_up/3.png differ
diff --git a/public/images/emoji/emoji_one/point_up/4.png b/public/images/emoji/emoji_one/point_up/4.png
new file mode 100644
index 00000000000..ac76d48a9b2
Binary files /dev/null and b/public/images/emoji/emoji_one/point_up/4.png differ
diff --git a/public/images/emoji/emoji_one/point_up/5.png b/public/images/emoji/emoji_one/point_up/5.png
new file mode 100644
index 00000000000..616bb44aba0
Binary files /dev/null and b/public/images/emoji/emoji_one/point_up/5.png differ
diff --git a/public/images/emoji/emoji_one/point_up/6.png b/public/images/emoji/emoji_one/point_up/6.png
new file mode 100644
index 00000000000..c4ca8311bf1
Binary files /dev/null and b/public/images/emoji/emoji_one/point_up/6.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2.png b/public/images/emoji/emoji_one/point_up_2.png
index e7ad6c9271c..5c92b460276 100644
Binary files a/public/images/emoji/emoji_one/point_up_2.png and b/public/images/emoji/emoji_one/point_up_2.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2/2.png b/public/images/emoji/emoji_one/point_up_2/2.png
new file mode 100644
index 00000000000..b3fe16db21a
Binary files /dev/null and b/public/images/emoji/emoji_one/point_up_2/2.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2/3.png b/public/images/emoji/emoji_one/point_up_2/3.png
new file mode 100644
index 00000000000..694ba78e72e
Binary files /dev/null and b/public/images/emoji/emoji_one/point_up_2/3.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2/4.png b/public/images/emoji/emoji_one/point_up_2/4.png
new file mode 100644
index 00000000000..a8e74067275
Binary files /dev/null and b/public/images/emoji/emoji_one/point_up_2/4.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2/5.png b/public/images/emoji/emoji_one/point_up_2/5.png
new file mode 100644
index 00000000000..6814fe7d07c
Binary files /dev/null and b/public/images/emoji/emoji_one/point_up_2/5.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2/6.png b/public/images/emoji/emoji_one/point_up_2/6.png
new file mode 100644
index 00000000000..ab59bd66aaf
Binary files /dev/null and b/public/images/emoji/emoji_one/point_up_2/6.png differ
diff --git a/public/images/emoji/emoji_one/poland.png b/public/images/emoji/emoji_one/poland.png
new file mode 100644
index 00000000000..c8872ee52e9
Binary files /dev/null and b/public/images/emoji/emoji_one/poland.png differ
diff --git a/public/images/emoji/emoji_one/police_car.png b/public/images/emoji/emoji_one/police_car.png
index 9e4107ed223..12b42ef1db6 100644
Binary files a/public/images/emoji/emoji_one/police_car.png and b/public/images/emoji/emoji_one/police_car.png differ
diff --git a/public/images/emoji/emoji_one/policeman.png b/public/images/emoji/emoji_one/policeman.png
new file mode 100644
index 00000000000..d6cf91384ec
Binary files /dev/null and b/public/images/emoji/emoji_one/policeman.png differ
diff --git a/public/images/emoji/emoji_one/policeman/2.png b/public/images/emoji/emoji_one/policeman/2.png
new file mode 100644
index 00000000000..0b83eee3307
Binary files /dev/null and b/public/images/emoji/emoji_one/policeman/2.png differ
diff --git a/public/images/emoji/emoji_one/policeman/3.png b/public/images/emoji/emoji_one/policeman/3.png
new file mode 100644
index 00000000000..5b8dedac124
Binary files /dev/null and b/public/images/emoji/emoji_one/policeman/3.png differ
diff --git a/public/images/emoji/emoji_one/policeman/4.png b/public/images/emoji/emoji_one/policeman/4.png
new file mode 100644
index 00000000000..f6cccf50a57
Binary files /dev/null and b/public/images/emoji/emoji_one/policeman/4.png differ
diff --git a/public/images/emoji/emoji_one/policeman/5.png b/public/images/emoji/emoji_one/policeman/5.png
new file mode 100644
index 00000000000..ae3b2d81e65
Binary files /dev/null and b/public/images/emoji/emoji_one/policeman/5.png differ
diff --git a/public/images/emoji/emoji_one/policeman/6.png b/public/images/emoji/emoji_one/policeman/6.png
new file mode 100644
index 00000000000..6d74f9bd251
Binary files /dev/null and b/public/images/emoji/emoji_one/policeman/6.png differ
diff --git a/public/images/emoji/emoji_one/policewoman.png b/public/images/emoji/emoji_one/policewoman.png
new file mode 100644
index 00000000000..afcc80b7aa7
Binary files /dev/null and b/public/images/emoji/emoji_one/policewoman.png differ
diff --git a/public/images/emoji/emoji_one/policewoman/2.png b/public/images/emoji/emoji_one/policewoman/2.png
new file mode 100644
index 00000000000..b40a2ebfa42
Binary files /dev/null and b/public/images/emoji/emoji_one/policewoman/2.png differ
diff --git a/public/images/emoji/emoji_one/policewoman/3.png b/public/images/emoji/emoji_one/policewoman/3.png
new file mode 100644
index 00000000000..df1a0123ba8
Binary files /dev/null and b/public/images/emoji/emoji_one/policewoman/3.png differ
diff --git a/public/images/emoji/emoji_one/policewoman/4.png b/public/images/emoji/emoji_one/policewoman/4.png
new file mode 100644
index 00000000000..1c385005083
Binary files /dev/null and b/public/images/emoji/emoji_one/policewoman/4.png differ
diff --git a/public/images/emoji/emoji_one/policewoman/5.png b/public/images/emoji/emoji_one/policewoman/5.png
new file mode 100644
index 00000000000..aa9d8e25c60
Binary files /dev/null and b/public/images/emoji/emoji_one/policewoman/5.png differ
diff --git a/public/images/emoji/emoji_one/policewoman/6.png b/public/images/emoji/emoji_one/policewoman/6.png
new file mode 100644
index 00000000000..8a79e5bb92b
Binary files /dev/null and b/public/images/emoji/emoji_one/policewoman/6.png differ
diff --git a/public/images/emoji/emoji_one/poo.png b/public/images/emoji/emoji_one/poo.png
index 77eb5b9fd23..123281b9b32 100644
Binary files a/public/images/emoji/emoji_one/poo.png and b/public/images/emoji/emoji_one/poo.png differ
diff --git a/public/images/emoji/emoji_one/poodle.png b/public/images/emoji/emoji_one/poodle.png
index fa439cdb07a..259b758e763 100644
Binary files a/public/images/emoji/emoji_one/poodle.png and b/public/images/emoji/emoji_one/poodle.png differ
diff --git a/public/images/emoji/emoji_one/poop.png b/public/images/emoji/emoji_one/poop.png
index 77eb5b9fd23..123281b9b32 100644
Binary files a/public/images/emoji/emoji_one/poop.png and b/public/images/emoji/emoji_one/poop.png differ
diff --git a/public/images/emoji/emoji_one/popcorn.png b/public/images/emoji/emoji_one/popcorn.png
index 29ec3d38790..b6015b545a3 100644
Binary files a/public/images/emoji/emoji_one/popcorn.png and b/public/images/emoji/emoji_one/popcorn.png differ
diff --git a/public/images/emoji/emoji_one/portugal.png b/public/images/emoji/emoji_one/portugal.png
new file mode 100644
index 00000000000..5646de06226
Binary files /dev/null and b/public/images/emoji/emoji_one/portugal.png differ
diff --git a/public/images/emoji/emoji_one/post_office.png b/public/images/emoji/emoji_one/post_office.png
index b1fa8fc2c77..2a4f51f993e 100644
Binary files a/public/images/emoji/emoji_one/post_office.png and b/public/images/emoji/emoji_one/post_office.png differ
diff --git a/public/images/emoji/emoji_one/postal_horn.png b/public/images/emoji/emoji_one/postal_horn.png
index 184ef61df94..33b9366b315 100644
Binary files a/public/images/emoji/emoji_one/postal_horn.png and b/public/images/emoji/emoji_one/postal_horn.png differ
diff --git a/public/images/emoji/emoji_one/postbox.png b/public/images/emoji/emoji_one/postbox.png
index 48951840627..1997a6577ae 100644
Binary files a/public/images/emoji/emoji_one/postbox.png and b/public/images/emoji/emoji_one/postbox.png differ
diff --git a/public/images/emoji/emoji_one/potable_water.png b/public/images/emoji/emoji_one/potable_water.png
index 5f26babcdee..f59a27b0343 100644
Binary files a/public/images/emoji/emoji_one/potable_water.png and b/public/images/emoji/emoji_one/potable_water.png differ
diff --git a/public/images/emoji/emoji_one/potato.png b/public/images/emoji/emoji_one/potato.png
new file mode 100644
index 00000000000..b2861daa575
Binary files /dev/null and b/public/images/emoji/emoji_one/potato.png differ
diff --git a/public/images/emoji/emoji_one/pouch.png b/public/images/emoji/emoji_one/pouch.png
index 811ac058581..2d1bb9e491b 100644
Binary files a/public/images/emoji/emoji_one/pouch.png and b/public/images/emoji/emoji_one/pouch.png differ
diff --git a/public/images/emoji/emoji_one/poultry_leg.png b/public/images/emoji/emoji_one/poultry_leg.png
index 17e4a43a45c..1f39ea43712 100644
Binary files a/public/images/emoji/emoji_one/poultry_leg.png and b/public/images/emoji/emoji_one/poultry_leg.png differ
diff --git a/public/images/emoji/emoji_one/pound.png b/public/images/emoji/emoji_one/pound.png
index 19192da49d8..036dfe07a64 100644
Binary files a/public/images/emoji/emoji_one/pound.png and b/public/images/emoji/emoji_one/pound.png differ
diff --git a/public/images/emoji/emoji_one/pouting_cat.png b/public/images/emoji/emoji_one/pouting_cat.png
index 2b7fe56ade5..6ee2e0a0c2b 100644
Binary files a/public/images/emoji/emoji_one/pouting_cat.png and b/public/images/emoji/emoji_one/pouting_cat.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man.png b/public/images/emoji/emoji_one/pouting_man.png
new file mode 100644
index 00000000000..000fdf8d58e
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_man.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man/2.png b/public/images/emoji/emoji_one/pouting_man/2.png
new file mode 100644
index 00000000000..eeb90e06914
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_man/2.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man/3.png b/public/images/emoji/emoji_one/pouting_man/3.png
new file mode 100644
index 00000000000..0189ff9faf7
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_man/3.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man/4.png b/public/images/emoji/emoji_one/pouting_man/4.png
new file mode 100644
index 00000000000..1e1fff17949
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_man/4.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man/5.png b/public/images/emoji/emoji_one/pouting_man/5.png
new file mode 100644
index 00000000000..9250b873e92
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_man/5.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man/6.png b/public/images/emoji/emoji_one/pouting_man/6.png
new file mode 100644
index 00000000000..715052ff4da
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_man/6.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman.png b/public/images/emoji/emoji_one/pouting_woman.png
new file mode 100644
index 00000000000..72c13f15320
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_woman.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman/2.png b/public/images/emoji/emoji_one/pouting_woman/2.png
new file mode 100644
index 00000000000..dae7de18906
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman/3.png b/public/images/emoji/emoji_one/pouting_woman/3.png
new file mode 100644
index 00000000000..341d3e80ce7
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman/4.png b/public/images/emoji/emoji_one/pouting_woman/4.png
new file mode 100644
index 00000000000..1847d9f981e
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman/5.png b/public/images/emoji/emoji_one/pouting_woman/5.png
new file mode 100644
index 00000000000..5a5df7acd7c
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman/6.png b/public/images/emoji/emoji_one/pouting_woman/6.png
new file mode 100644
index 00000000000..393544addf9
Binary files /dev/null and b/public/images/emoji/emoji_one/pouting_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/pray.png b/public/images/emoji/emoji_one/pray.png
index ff6879172a8..9018b6f2595 100644
Binary files a/public/images/emoji/emoji_one/pray.png and b/public/images/emoji/emoji_one/pray.png differ
diff --git a/public/images/emoji/emoji_one/pray/2.png b/public/images/emoji/emoji_one/pray/2.png
new file mode 100644
index 00000000000..8875cc01c71
Binary files /dev/null and b/public/images/emoji/emoji_one/pray/2.png differ
diff --git a/public/images/emoji/emoji_one/pray/3.png b/public/images/emoji/emoji_one/pray/3.png
new file mode 100644
index 00000000000..bc82bf06dca
Binary files /dev/null and b/public/images/emoji/emoji_one/pray/3.png differ
diff --git a/public/images/emoji/emoji_one/pray/4.png b/public/images/emoji/emoji_one/pray/4.png
new file mode 100644
index 00000000000..d5fdb30a812
Binary files /dev/null and b/public/images/emoji/emoji_one/pray/4.png differ
diff --git a/public/images/emoji/emoji_one/pray/5.png b/public/images/emoji/emoji_one/pray/5.png
new file mode 100644
index 00000000000..ce8568ef64d
Binary files /dev/null and b/public/images/emoji/emoji_one/pray/5.png differ
diff --git a/public/images/emoji/emoji_one/pray/6.png b/public/images/emoji/emoji_one/pray/6.png
new file mode 100644
index 00000000000..117117a5d0f
Binary files /dev/null and b/public/images/emoji/emoji_one/pray/6.png differ
diff --git a/public/images/emoji/emoji_one/prayer_beads.png b/public/images/emoji/emoji_one/prayer_beads.png
index 96336c5b56c..6b0c0a5abe2 100644
Binary files a/public/images/emoji/emoji_one/prayer_beads.png and b/public/images/emoji/emoji_one/prayer_beads.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman.png b/public/images/emoji/emoji_one/pregnant_woman.png
new file mode 100644
index 00000000000..00736d56303
Binary files /dev/null and b/public/images/emoji/emoji_one/pregnant_woman.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman/2.png b/public/images/emoji/emoji_one/pregnant_woman/2.png
new file mode 100644
index 00000000000..f8f1ce24868
Binary files /dev/null and b/public/images/emoji/emoji_one/pregnant_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman/3.png b/public/images/emoji/emoji_one/pregnant_woman/3.png
new file mode 100644
index 00000000000..1dfd06fa877
Binary files /dev/null and b/public/images/emoji/emoji_one/pregnant_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman/4.png b/public/images/emoji/emoji_one/pregnant_woman/4.png
new file mode 100644
index 00000000000..3164bf9239c
Binary files /dev/null and b/public/images/emoji/emoji_one/pregnant_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman/5.png b/public/images/emoji/emoji_one/pregnant_woman/5.png
new file mode 100644
index 00000000000..3d848dc3310
Binary files /dev/null and b/public/images/emoji/emoji_one/pregnant_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman/6.png b/public/images/emoji/emoji_one/pregnant_woman/6.png
new file mode 100644
index 00000000000..050fc456a34
Binary files /dev/null and b/public/images/emoji/emoji_one/pregnant_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/pretzel.png b/public/images/emoji/emoji_one/pretzel.png
new file mode 100644
index 00000000000..9116d6ee9a2
Binary files /dev/null and b/public/images/emoji/emoji_one/pretzel.png differ
diff --git a/public/images/emoji/emoji_one/previous_track.png b/public/images/emoji/emoji_one/previous_track.png
index e1a06c07a7c..7dd785d16c5 100644
Binary files a/public/images/emoji/emoji_one/previous_track.png and b/public/images/emoji/emoji_one/previous_track.png differ
diff --git a/public/images/emoji/emoji_one/previous_track_button.png b/public/images/emoji/emoji_one/previous_track_button.png
new file mode 100644
index 00000000000..7dd785d16c5
Binary files /dev/null and b/public/images/emoji/emoji_one/previous_track_button.png differ
diff --git a/public/images/emoji/emoji_one/prince.png b/public/images/emoji/emoji_one/prince.png
new file mode 100644
index 00000000000..f4bb4cd8811
Binary files /dev/null and b/public/images/emoji/emoji_one/prince.png differ
diff --git a/public/images/emoji/emoji_one/prince/2.png b/public/images/emoji/emoji_one/prince/2.png
new file mode 100644
index 00000000000..9678a888457
Binary files /dev/null and b/public/images/emoji/emoji_one/prince/2.png differ
diff --git a/public/images/emoji/emoji_one/prince/3.png b/public/images/emoji/emoji_one/prince/3.png
new file mode 100644
index 00000000000..cc9040e0ff2
Binary files /dev/null and b/public/images/emoji/emoji_one/prince/3.png differ
diff --git a/public/images/emoji/emoji_one/prince/4.png b/public/images/emoji/emoji_one/prince/4.png
new file mode 100644
index 00000000000..f8210e305b6
Binary files /dev/null and b/public/images/emoji/emoji_one/prince/4.png differ
diff --git a/public/images/emoji/emoji_one/prince/5.png b/public/images/emoji/emoji_one/prince/5.png
new file mode 100644
index 00000000000..23ef84b772b
Binary files /dev/null and b/public/images/emoji/emoji_one/prince/5.png differ
diff --git a/public/images/emoji/emoji_one/prince/6.png b/public/images/emoji/emoji_one/prince/6.png
new file mode 100644
index 00000000000..fb56a6ccf98
Binary files /dev/null and b/public/images/emoji/emoji_one/prince/6.png differ
diff --git a/public/images/emoji/emoji_one/princess.png b/public/images/emoji/emoji_one/princess.png
index d8990087d11..59ec00767a3 100644
Binary files a/public/images/emoji/emoji_one/princess.png and b/public/images/emoji/emoji_one/princess.png differ
diff --git a/public/images/emoji/emoji_one/princess/2.png b/public/images/emoji/emoji_one/princess/2.png
new file mode 100644
index 00000000000..70fade70216
Binary files /dev/null and b/public/images/emoji/emoji_one/princess/2.png differ
diff --git a/public/images/emoji/emoji_one/princess/3.png b/public/images/emoji/emoji_one/princess/3.png
new file mode 100644
index 00000000000..362360f91f9
Binary files /dev/null and b/public/images/emoji/emoji_one/princess/3.png differ
diff --git a/public/images/emoji/emoji_one/princess/4.png b/public/images/emoji/emoji_one/princess/4.png
new file mode 100644
index 00000000000..d9eae5a70ac
Binary files /dev/null and b/public/images/emoji/emoji_one/princess/4.png differ
diff --git a/public/images/emoji/emoji_one/princess/5.png b/public/images/emoji/emoji_one/princess/5.png
new file mode 100644
index 00000000000..39c7ecc3a25
Binary files /dev/null and b/public/images/emoji/emoji_one/princess/5.png differ
diff --git a/public/images/emoji/emoji_one/princess/6.png b/public/images/emoji/emoji_one/princess/6.png
new file mode 100644
index 00000000000..a960ffd1196
Binary files /dev/null and b/public/images/emoji/emoji_one/princess/6.png differ
diff --git a/public/images/emoji/emoji_one/printer.png b/public/images/emoji/emoji_one/printer.png
index ea2fd067605..ea31e57dac8 100644
Binary files a/public/images/emoji/emoji_one/printer.png and b/public/images/emoji/emoji_one/printer.png differ
diff --git a/public/images/emoji/emoji_one/projector.png b/public/images/emoji/emoji_one/projector.png
index e18aae6b5c2..1ab19e3f1e0 100644
Binary files a/public/images/emoji/emoji_one/projector.png and b/public/images/emoji/emoji_one/projector.png differ
diff --git a/public/images/emoji/emoji_one/puerto_rico.png b/public/images/emoji/emoji_one/puerto_rico.png
new file mode 100644
index 00000000000..05a929944de
Binary files /dev/null and b/public/images/emoji/emoji_one/puerto_rico.png differ
diff --git a/public/images/emoji/emoji_one/punch.png b/public/images/emoji/emoji_one/punch.png
index ade269fde0e..488aec1d2ba 100644
Binary files a/public/images/emoji/emoji_one/punch.png and b/public/images/emoji/emoji_one/punch.png differ
diff --git a/public/images/emoji/emoji_one/punch/2.png b/public/images/emoji/emoji_one/punch/2.png
new file mode 100644
index 00000000000..ba746c9f2e7
Binary files /dev/null and b/public/images/emoji/emoji_one/punch/2.png differ
diff --git a/public/images/emoji/emoji_one/punch/3.png b/public/images/emoji/emoji_one/punch/3.png
new file mode 100644
index 00000000000..35ecc381dcb
Binary files /dev/null and b/public/images/emoji/emoji_one/punch/3.png differ
diff --git a/public/images/emoji/emoji_one/punch/4.png b/public/images/emoji/emoji_one/punch/4.png
new file mode 100644
index 00000000000..d90a9417821
Binary files /dev/null and b/public/images/emoji/emoji_one/punch/4.png differ
diff --git a/public/images/emoji/emoji_one/punch/5.png b/public/images/emoji/emoji_one/punch/5.png
new file mode 100644
index 00000000000..1331fa3b8a7
Binary files /dev/null and b/public/images/emoji/emoji_one/punch/5.png differ
diff --git a/public/images/emoji/emoji_one/punch/6.png b/public/images/emoji/emoji_one/punch/6.png
new file mode 100644
index 00000000000..6e7920e71a2
Binary files /dev/null and b/public/images/emoji/emoji_one/punch/6.png differ
diff --git a/public/images/emoji/emoji_one/purple_heart.png b/public/images/emoji/emoji_one/purple_heart.png
index fdd70b19fb4..ada42551ac5 100644
Binary files a/public/images/emoji/emoji_one/purple_heart.png and b/public/images/emoji/emoji_one/purple_heart.png differ
diff --git a/public/images/emoji/emoji_one/purse.png b/public/images/emoji/emoji_one/purse.png
index dde8d73cb96..b9823e9a89f 100644
Binary files a/public/images/emoji/emoji_one/purse.png and b/public/images/emoji/emoji_one/purse.png differ
diff --git a/public/images/emoji/emoji_one/pushpin.png b/public/images/emoji/emoji_one/pushpin.png
index 1495b5f3526..4ccae8a594a 100644
Binary files a/public/images/emoji/emoji_one/pushpin.png and b/public/images/emoji/emoji_one/pushpin.png differ
diff --git a/public/images/emoji/emoji_one/put_litter_in_its_place.png b/public/images/emoji/emoji_one/put_litter_in_its_place.png
index a867138894a..f0921e2ccc6 100644
Binary files a/public/images/emoji/emoji_one/put_litter_in_its_place.png and b/public/images/emoji/emoji_one/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/emoji_one/qatar.png b/public/images/emoji/emoji_one/qatar.png
new file mode 100644
index 00000000000..f51ae1d0ffd
Binary files /dev/null and b/public/images/emoji/emoji_one/qatar.png differ
diff --git a/public/images/emoji/emoji_one/question.png b/public/images/emoji/emoji_one/question.png
index 13880d004f6..134d9a3f68a 100644
Binary files a/public/images/emoji/emoji_one/question.png and b/public/images/emoji/emoji_one/question.png differ
diff --git a/public/images/emoji/emoji_one/rabbit.png b/public/images/emoji/emoji_one/rabbit.png
index dbe49148797..3f22f7b8508 100644
Binary files a/public/images/emoji/emoji_one/rabbit.png and b/public/images/emoji/emoji_one/rabbit.png differ
diff --git a/public/images/emoji/emoji_one/rabbit2.png b/public/images/emoji/emoji_one/rabbit2.png
index 9fd617c3e6f..7dbdd79f41f 100644
Binary files a/public/images/emoji/emoji_one/rabbit2.png and b/public/images/emoji/emoji_one/rabbit2.png differ
diff --git a/public/images/emoji/emoji_one/race_car.png b/public/images/emoji/emoji_one/race_car.png
index 86c9a2c840f..729488ea147 100644
Binary files a/public/images/emoji/emoji_one/race_car.png and b/public/images/emoji/emoji_one/race_car.png differ
diff --git a/public/images/emoji/emoji_one/racehorse.png b/public/images/emoji/emoji_one/racehorse.png
index b70842e4743..6547b4f3dae 100644
Binary files a/public/images/emoji/emoji_one/racehorse.png and b/public/images/emoji/emoji_one/racehorse.png differ
diff --git a/public/images/emoji/emoji_one/racing_car.png b/public/images/emoji/emoji_one/racing_car.png
index 86c9a2c840f..729488ea147 100644
Binary files a/public/images/emoji/emoji_one/racing_car.png and b/public/images/emoji/emoji_one/racing_car.png differ
diff --git a/public/images/emoji/emoji_one/racing_motorcycle.png b/public/images/emoji/emoji_one/racing_motorcycle.png
index be62ca41f19..9014f6e7201 100644
Binary files a/public/images/emoji/emoji_one/racing_motorcycle.png and b/public/images/emoji/emoji_one/racing_motorcycle.png differ
diff --git a/public/images/emoji/emoji_one/radio.png b/public/images/emoji/emoji_one/radio.png
index 9cf001ec242..add2123cfda 100644
Binary files a/public/images/emoji/emoji_one/radio.png and b/public/images/emoji/emoji_one/radio.png differ
diff --git a/public/images/emoji/emoji_one/radio_button.png b/public/images/emoji/emoji_one/radio_button.png
index 3256f716aa0..573e0519237 100644
Binary files a/public/images/emoji/emoji_one/radio_button.png and b/public/images/emoji/emoji_one/radio_button.png differ
diff --git a/public/images/emoji/emoji_one/radioactive.png b/public/images/emoji/emoji_one/radioactive.png
index 8c96196adb0..d3fb5719f6b 100644
Binary files a/public/images/emoji/emoji_one/radioactive.png and b/public/images/emoji/emoji_one/radioactive.png differ
diff --git a/public/images/emoji/emoji_one/radioactive_sign.png b/public/images/emoji/emoji_one/radioactive_sign.png
index 8c96196adb0..d3fb5719f6b 100644
Binary files a/public/images/emoji/emoji_one/radioactive_sign.png and b/public/images/emoji/emoji_one/radioactive_sign.png differ
diff --git a/public/images/emoji/emoji_one/rage.png b/public/images/emoji/emoji_one/rage.png
index d51b1307506..b3121157c19 100644
Binary files a/public/images/emoji/emoji_one/rage.png and b/public/images/emoji/emoji_one/rage.png differ
diff --git a/public/images/emoji/emoji_one/railroad_track.png b/public/images/emoji/emoji_one/railroad_track.png
index e95bece31cd..9fd96b0b62e 100644
Binary files a/public/images/emoji/emoji_one/railroad_track.png and b/public/images/emoji/emoji_one/railroad_track.png differ
diff --git a/public/images/emoji/emoji_one/railway_car.png b/public/images/emoji/emoji_one/railway_car.png
index e892028fc3a..a1f39d4c6ce 100644
Binary files a/public/images/emoji/emoji_one/railway_car.png and b/public/images/emoji/emoji_one/railway_car.png differ
diff --git a/public/images/emoji/emoji_one/railway_track.png b/public/images/emoji/emoji_one/railway_track.png
index e95bece31cd..9fd96b0b62e 100644
Binary files a/public/images/emoji/emoji_one/railway_track.png and b/public/images/emoji/emoji_one/railway_track.png differ
diff --git a/public/images/emoji/emoji_one/rainbow.png b/public/images/emoji/emoji_one/rainbow.png
index 4448583e6f6..eb08aad6480 100644
Binary files a/public/images/emoji/emoji_one/rainbow.png and b/public/images/emoji/emoji_one/rainbow.png differ
diff --git a/public/images/emoji/emoji_one/rainbow_flag.png b/public/images/emoji/emoji_one/rainbow_flag.png
new file mode 100644
index 00000000000..d13b51efa6d
Binary files /dev/null and b/public/images/emoji/emoji_one/rainbow_flag.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand.png b/public/images/emoji/emoji_one/raised_back_of_hand.png
new file mode 100644
index 00000000000..d6746b4765b
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_back_of_hand.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand/2.png b/public/images/emoji/emoji_one/raised_back_of_hand/2.png
new file mode 100644
index 00000000000..1470d4df99b
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand/3.png b/public/images/emoji/emoji_one/raised_back_of_hand/3.png
new file mode 100644
index 00000000000..f27ffead6ec
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand/4.png b/public/images/emoji/emoji_one/raised_back_of_hand/4.png
new file mode 100644
index 00000000000..f9150049e22
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand/5.png b/public/images/emoji/emoji_one/raised_back_of_hand/5.png
new file mode 100644
index 00000000000..efdfe34a544
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand/6.png b/public/images/emoji/emoji_one/raised_back_of_hand/6.png
new file mode 100644
index 00000000000..11ffcc8dd4e
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand.png b/public/images/emoji/emoji_one/raised_hand.png
index 936ae16df6e..9e968721c4a 100644
Binary files a/public/images/emoji/emoji_one/raised_hand.png and b/public/images/emoji/emoji_one/raised_hand.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand/2.png b/public/images/emoji/emoji_one/raised_hand/2.png
new file mode 100644
index 00000000000..9f4b42f5718
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand/3.png b/public/images/emoji/emoji_one/raised_hand/3.png
new file mode 100644
index 00000000000..49df4165bb2
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand/4.png b/public/images/emoji/emoji_one/raised_hand/4.png
new file mode 100644
index 00000000000..0de00d135e5
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand/5.png b/public/images/emoji/emoji_one/raised_hand/5.png
new file mode 100644
index 00000000000..13d1da4f671
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand/6.png b/public/images/emoji/emoji_one/raised_hand/6.png
new file mode 100644
index 00000000000..27d2a626e4c
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed.png
index 77d0794e0df..dfdad1339bc 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed.png and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/2.png
new file mode 100644
index 00000000000..d360cea9edd
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/3.png
new file mode 100644
index 00000000000..c889c464bae
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/4.png
new file mode 100644
index 00000000000..fa9654e7862
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/5.png
new file mode 100644
index 00000000000..243d1cc157e
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/6.png
new file mode 100644
index 00000000000..255937df938
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers.png
index b22486308b3..ae4eb8eb155 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers.png and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/2.png
new file mode 100644
index 00000000000..875852eab1e
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/3.png
new file mode 100644
index 00000000000..bb0e4d166c4
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/4.png
new file mode 100644
index 00000000000..1d0ec203036
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/5.png
new file mode 100644
index 00000000000..57671722728
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/6.png
new file mode 100644
index 00000000000..4a81388be31
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands.png b/public/images/emoji/emoji_one/raised_hands.png
index 3947fd54108..7d7765e83b6 100644
Binary files a/public/images/emoji/emoji_one/raised_hands.png and b/public/images/emoji/emoji_one/raised_hands.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands/2.png b/public/images/emoji/emoji_one/raised_hands/2.png
new file mode 100644
index 00000000000..d640bf63af3
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hands/2.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands/3.png b/public/images/emoji/emoji_one/raised_hands/3.png
new file mode 100644
index 00000000000..7e8adf84a5a
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hands/3.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands/4.png b/public/images/emoji/emoji_one/raised_hands/4.png
new file mode 100644
index 00000000000..626611bbc09
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hands/4.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands/5.png b/public/images/emoji/emoji_one/raised_hands/5.png
new file mode 100644
index 00000000000..bc77f9db54d
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hands/5.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands/6.png b/public/images/emoji/emoji_one/raised_hands/6.png
new file mode 100644
index 00000000000..3518c49386e
Binary files /dev/null and b/public/images/emoji/emoji_one/raised_hands/6.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand.png b/public/images/emoji/emoji_one/raising_hand.png
index 9186a15087b..7e41ad3a3b0 100644
Binary files a/public/images/emoji/emoji_one/raising_hand.png and b/public/images/emoji/emoji_one/raising_hand.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand/2.png b/public/images/emoji/emoji_one/raising_hand/2.png
new file mode 100644
index 00000000000..c4f7fe286d7
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand/3.png b/public/images/emoji/emoji_one/raising_hand/3.png
new file mode 100644
index 00000000000..1a5d9d1fee4
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand/4.png b/public/images/emoji/emoji_one/raising_hand/4.png
new file mode 100644
index 00000000000..a905a7f14e7
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand/5.png b/public/images/emoji/emoji_one/raising_hand/5.png
new file mode 100644
index 00000000000..e554fe43697
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand/6.png b/public/images/emoji/emoji_one/raising_hand/6.png
new file mode 100644
index 00000000000..563746c2f71
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man.png b/public/images/emoji/emoji_one/raising_hand_man.png
new file mode 100644
index 00000000000..e0968ea5022
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_man.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man/2.png b/public/images/emoji/emoji_one/raising_hand_man/2.png
new file mode 100644
index 00000000000..1c6a740a284
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_man/2.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man/3.png b/public/images/emoji/emoji_one/raising_hand_man/3.png
new file mode 100644
index 00000000000..b8b5cdd493d
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_man/3.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man/4.png b/public/images/emoji/emoji_one/raising_hand_man/4.png
new file mode 100644
index 00000000000..528e2cc2567
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_man/4.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man/5.png b/public/images/emoji/emoji_one/raising_hand_man/5.png
new file mode 100644
index 00000000000..eefddd6be1c
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_man/5.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man/6.png b/public/images/emoji/emoji_one/raising_hand_man/6.png
new file mode 100644
index 00000000000..894a5695292
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_man/6.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman.png b/public/images/emoji/emoji_one/raising_hand_woman.png
new file mode 100644
index 00000000000..7e41ad3a3b0
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_woman.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman/2.png b/public/images/emoji/emoji_one/raising_hand_woman/2.png
new file mode 100644
index 00000000000..c4f7fe286d7
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman/3.png b/public/images/emoji/emoji_one/raising_hand_woman/3.png
new file mode 100644
index 00000000000..1a5d9d1fee4
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman/4.png b/public/images/emoji/emoji_one/raising_hand_woman/4.png
new file mode 100644
index 00000000000..a905a7f14e7
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman/5.png b/public/images/emoji/emoji_one/raising_hand_woman/5.png
new file mode 100644
index 00000000000..e554fe43697
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman/6.png b/public/images/emoji/emoji_one/raising_hand_woman/6.png
new file mode 100644
index 00000000000..563746c2f71
Binary files /dev/null and b/public/images/emoji/emoji_one/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/ram.png b/public/images/emoji/emoji_one/ram.png
index a3c953fe46a..8475de585c7 100644
Binary files a/public/images/emoji/emoji_one/ram.png and b/public/images/emoji/emoji_one/ram.png differ
diff --git a/public/images/emoji/emoji_one/ramen.png b/public/images/emoji/emoji_one/ramen.png
index e61280eaaa1..7c9dfcf5a72 100644
Binary files a/public/images/emoji/emoji_one/ramen.png and b/public/images/emoji/emoji_one/ramen.png differ
diff --git a/public/images/emoji/emoji_one/rat.png b/public/images/emoji/emoji_one/rat.png
index 7dbc8eaeaf9..0284fd0e86d 100644
Binary files a/public/images/emoji/emoji_one/rat.png and b/public/images/emoji/emoji_one/rat.png differ
diff --git a/public/images/emoji/emoji_one/record_button.png b/public/images/emoji/emoji_one/record_button.png
index fd8574320c6..d40f51bcd7d 100644
Binary files a/public/images/emoji/emoji_one/record_button.png and b/public/images/emoji/emoji_one/record_button.png differ
diff --git a/public/images/emoji/emoji_one/recycle.png b/public/images/emoji/emoji_one/recycle.png
index 526553b323b..fd7bb8fdda0 100644
Binary files a/public/images/emoji/emoji_one/recycle.png and b/public/images/emoji/emoji_one/recycle.png differ
diff --git a/public/images/emoji/emoji_one/red_car.png b/public/images/emoji/emoji_one/red_car.png
index 9010bb046a9..13819504f70 100644
Binary files a/public/images/emoji/emoji_one/red_car.png and b/public/images/emoji/emoji_one/red_car.png differ
diff --git a/public/images/emoji/emoji_one/red_circle.png b/public/images/emoji/emoji_one/red_circle.png
index 4281bcd2532..ee059ea448a 100644
Binary files a/public/images/emoji/emoji_one/red_circle.png and b/public/images/emoji/emoji_one/red_circle.png differ
diff --git a/public/images/emoji/emoji_one/registered.png b/public/images/emoji/emoji_one/registered.png
index 4a952e105b5..322864d0117 100644
Binary files a/public/images/emoji/emoji_one/registered.png and b/public/images/emoji/emoji_one/registered.png differ
diff --git a/public/images/emoji/emoji_one/relaxed.png b/public/images/emoji/emoji_one/relaxed.png
index 61bef2d0b1e..3c36a4c2a13 100644
Binary files a/public/images/emoji/emoji_one/relaxed.png and b/public/images/emoji/emoji_one/relaxed.png differ
diff --git a/public/images/emoji/emoji_one/relieved.png b/public/images/emoji/emoji_one/relieved.png
index 891808c490a..95eec25ed35 100644
Binary files a/public/images/emoji/emoji_one/relieved.png and b/public/images/emoji/emoji_one/relieved.png differ
diff --git a/public/images/emoji/emoji_one/reminder_ribbon.png b/public/images/emoji/emoji_one/reminder_ribbon.png
index b167759990d..3d6beebf4f1 100644
Binary files a/public/images/emoji/emoji_one/reminder_ribbon.png and b/public/images/emoji/emoji_one/reminder_ribbon.png differ
diff --git a/public/images/emoji/emoji_one/repeat.png b/public/images/emoji/emoji_one/repeat.png
index 163b8ce644b..3e9d00354bf 100644
Binary files a/public/images/emoji/emoji_one/repeat.png and b/public/images/emoji/emoji_one/repeat.png differ
diff --git a/public/images/emoji/emoji_one/repeat_one.png b/public/images/emoji/emoji_one/repeat_one.png
index 92ccb31fd81..40a8db5ca41 100644
Binary files a/public/images/emoji/emoji_one/repeat_one.png and b/public/images/emoji/emoji_one/repeat_one.png differ
diff --git a/public/images/emoji/emoji_one/rescue_worker_helmet.png b/public/images/emoji/emoji_one/rescue_worker_helmet.png
new file mode 100644
index 00000000000..baaa54a80ba
Binary files /dev/null and b/public/images/emoji/emoji_one/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/emoji_one/restroom.png b/public/images/emoji/emoji_one/restroom.png
index 082a98d74f6..d61d2e07af3 100644
Binary files a/public/images/emoji/emoji_one/restroom.png and b/public/images/emoji/emoji_one/restroom.png differ
diff --git a/public/images/emoji/emoji_one/reunion.png b/public/images/emoji/emoji_one/reunion.png
new file mode 100644
index 00000000000..1679d4c5b9c
Binary files /dev/null and b/public/images/emoji/emoji_one/reunion.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended.png
index 6f99e17bdb6..1bc73629bb1 100644
Binary files a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended.png and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/2.png
new file mode 100644
index 00000000000..37ac4780316
Binary files /dev/null and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/3.png
new file mode 100644
index 00000000000..69fbed14d25
Binary files /dev/null and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/4.png
new file mode 100644
index 00000000000..c1134aea0fa
Binary files /dev/null and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/5.png
new file mode 100644
index 00000000000..371ee90cf9f
Binary files /dev/null and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/6.png
new file mode 100644
index 00000000000..db57dfd0983
Binary files /dev/null and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/emoji_one/revolving_hearts.png b/public/images/emoji/emoji_one/revolving_hearts.png
index 7c0c92401cf..4bbb1b26bf0 100644
Binary files a/public/images/emoji/emoji_one/revolving_hearts.png and b/public/images/emoji/emoji_one/revolving_hearts.png differ
diff --git a/public/images/emoji/emoji_one/rewind.png b/public/images/emoji/emoji_one/rewind.png
index 0c0d8f95fdb..654889ca49e 100644
Binary files a/public/images/emoji/emoji_one/rewind.png and b/public/images/emoji/emoji_one/rewind.png differ
diff --git a/public/images/emoji/emoji_one/rhinoceros.png b/public/images/emoji/emoji_one/rhinoceros.png
new file mode 100644
index 00000000000..3ad06ce8395
Binary files /dev/null and b/public/images/emoji/emoji_one/rhinoceros.png differ
diff --git a/public/images/emoji/emoji_one/ribbon.png b/public/images/emoji/emoji_one/ribbon.png
index bf1077ea22c..0f8abdf06b8 100644
Binary files a/public/images/emoji/emoji_one/ribbon.png and b/public/images/emoji/emoji_one/ribbon.png differ
diff --git a/public/images/emoji/emoji_one/rice.png b/public/images/emoji/emoji_one/rice.png
index 08f426fd164..a9a0d56d520 100644
Binary files a/public/images/emoji/emoji_one/rice.png and b/public/images/emoji/emoji_one/rice.png differ
diff --git a/public/images/emoji/emoji_one/rice_ball.png b/public/images/emoji/emoji_one/rice_ball.png
index 71891035c71..b468efc5520 100644
Binary files a/public/images/emoji/emoji_one/rice_ball.png and b/public/images/emoji/emoji_one/rice_ball.png differ
diff --git a/public/images/emoji/emoji_one/rice_cracker.png b/public/images/emoji/emoji_one/rice_cracker.png
index 9307a05b422..78dbeed5d59 100644
Binary files a/public/images/emoji/emoji_one/rice_cracker.png and b/public/images/emoji/emoji_one/rice_cracker.png differ
diff --git a/public/images/emoji/emoji_one/rice_scene.png b/public/images/emoji/emoji_one/rice_scene.png
index f4ff8e4bd55..8f3dbf462bf 100644
Binary files a/public/images/emoji/emoji_one/rice_scene.png and b/public/images/emoji/emoji_one/rice_scene.png differ
diff --git a/public/images/emoji/emoji_one/right_anger_bubble.png b/public/images/emoji/emoji_one/right_anger_bubble.png
index 9db343ff89d..8899f3c74da 100644
Binary files a/public/images/emoji/emoji_one/right_anger_bubble.png and b/public/images/emoji/emoji_one/right_anger_bubble.png differ
diff --git a/public/images/emoji/emoji_one/ring.png b/public/images/emoji/emoji_one/ring.png
index 40411109129..034d0a2d88b 100644
Binary files a/public/images/emoji/emoji_one/ring.png and b/public/images/emoji/emoji_one/ring.png differ
diff --git a/public/images/emoji/emoji_one/robot.png b/public/images/emoji/emoji_one/robot.png
index 0c1844d6def..47204f3e3be 100644
Binary files a/public/images/emoji/emoji_one/robot.png and b/public/images/emoji/emoji_one/robot.png differ
diff --git a/public/images/emoji/emoji_one/robot_face.png b/public/images/emoji/emoji_one/robot_face.png
index 0c1844d6def..47204f3e3be 100644
Binary files a/public/images/emoji/emoji_one/robot_face.png and b/public/images/emoji/emoji_one/robot_face.png differ
diff --git a/public/images/emoji/emoji_one/rocket.png b/public/images/emoji/emoji_one/rocket.png
index b8107c6fd7c..15a7edacc51 100644
Binary files a/public/images/emoji/emoji_one/rocket.png and b/public/images/emoji/emoji_one/rocket.png differ
diff --git a/public/images/emoji/emoji_one/rofl.png b/public/images/emoji/emoji_one/rofl.png
new file mode 100644
index 00000000000..5c8464c9f58
Binary files /dev/null and b/public/images/emoji/emoji_one/rofl.png differ
diff --git a/public/images/emoji/emoji_one/roll_eyes.png b/public/images/emoji/emoji_one/roll_eyes.png
new file mode 100644
index 00000000000..dc4f8c13851
Binary files /dev/null and b/public/images/emoji/emoji_one/roll_eyes.png differ
diff --git a/public/images/emoji/emoji_one/rolled_up_newspaper.png b/public/images/emoji/emoji_one/rolled_up_newspaper.png
index 9bab1e549d4..4568e894ec8 100644
Binary files a/public/images/emoji/emoji_one/rolled_up_newspaper.png and b/public/images/emoji/emoji_one/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/emoji_one/roller_coaster.png b/public/images/emoji/emoji_one/roller_coaster.png
index 32a249eb225..75f5db3a936 100644
Binary files a/public/images/emoji/emoji_one/roller_coaster.png and b/public/images/emoji/emoji_one/roller_coaster.png differ
diff --git a/public/images/emoji/emoji_one/rolling_eyes.png b/public/images/emoji/emoji_one/rolling_eyes.png
index 1eec27738b1..dc4f8c13851 100644
Binary files a/public/images/emoji/emoji_one/rolling_eyes.png and b/public/images/emoji/emoji_one/rolling_eyes.png differ
diff --git a/public/images/emoji/emoji_one/romania.png b/public/images/emoji/emoji_one/romania.png
new file mode 100644
index 00000000000..2b163248784
Binary files /dev/null and b/public/images/emoji/emoji_one/romania.png differ
diff --git a/public/images/emoji/emoji_one/rooster.png b/public/images/emoji/emoji_one/rooster.png
index 15c796fae98..2acba8b333c 100644
Binary files a/public/images/emoji/emoji_one/rooster.png and b/public/images/emoji/emoji_one/rooster.png differ
diff --git a/public/images/emoji/emoji_one/rose.png b/public/images/emoji/emoji_one/rose.png
index 303b898e66e..e3551d2e10c 100644
Binary files a/public/images/emoji/emoji_one/rose.png and b/public/images/emoji/emoji_one/rose.png differ
diff --git a/public/images/emoji/emoji_one/rosette.png b/public/images/emoji/emoji_one/rosette.png
index 1b7e1b4ca6e..1166e0a14e9 100644
Binary files a/public/images/emoji/emoji_one/rosette.png and b/public/images/emoji/emoji_one/rosette.png differ
diff --git a/public/images/emoji/emoji_one/rotating_light.png b/public/images/emoji/emoji_one/rotating_light.png
index 0675835a621..e9af91350ec 100644
Binary files a/public/images/emoji/emoji_one/rotating_light.png and b/public/images/emoji/emoji_one/rotating_light.png differ
diff --git a/public/images/emoji/emoji_one/round_pushpin.png b/public/images/emoji/emoji_one/round_pushpin.png
index 71e0b59b6c3..05be5fa1521 100644
Binary files a/public/images/emoji/emoji_one/round_pushpin.png and b/public/images/emoji/emoji_one/round_pushpin.png differ
diff --git a/public/images/emoji/emoji_one/rowboat.png b/public/images/emoji/emoji_one/rowboat.png
index 7c7928dc12e..bac92654e17 100644
Binary files a/public/images/emoji/emoji_one/rowboat.png and b/public/images/emoji/emoji_one/rowboat.png differ
diff --git a/public/images/emoji/emoji_one/rowboat/2.png b/public/images/emoji/emoji_one/rowboat/2.png
new file mode 100644
index 00000000000..79f58dc55fc
Binary files /dev/null and b/public/images/emoji/emoji_one/rowboat/2.png differ
diff --git a/public/images/emoji/emoji_one/rowboat/3.png b/public/images/emoji/emoji_one/rowboat/3.png
new file mode 100644
index 00000000000..6cc17faf6ab
Binary files /dev/null and b/public/images/emoji/emoji_one/rowboat/3.png differ
diff --git a/public/images/emoji/emoji_one/rowboat/4.png b/public/images/emoji/emoji_one/rowboat/4.png
new file mode 100644
index 00000000000..bdac8637e5e
Binary files /dev/null and b/public/images/emoji/emoji_one/rowboat/4.png differ
diff --git a/public/images/emoji/emoji_one/rowboat/5.png b/public/images/emoji/emoji_one/rowboat/5.png
new file mode 100644
index 00000000000..bcdde26969c
Binary files /dev/null and b/public/images/emoji/emoji_one/rowboat/5.png differ
diff --git a/public/images/emoji/emoji_one/rowboat/6.png b/public/images/emoji/emoji_one/rowboat/6.png
new file mode 100644
index 00000000000..c2d1c4e351c
Binary files /dev/null and b/public/images/emoji/emoji_one/rowboat/6.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man.png b/public/images/emoji/emoji_one/rowing_man.png
new file mode 100644
index 00000000000..bac92654e17
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_man.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man/2.png b/public/images/emoji/emoji_one/rowing_man/2.png
new file mode 100644
index 00000000000..79f58dc55fc
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_man/2.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man/3.png b/public/images/emoji/emoji_one/rowing_man/3.png
new file mode 100644
index 00000000000..6cc17faf6ab
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_man/3.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man/4.png b/public/images/emoji/emoji_one/rowing_man/4.png
new file mode 100644
index 00000000000..bdac8637e5e
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_man/4.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man/5.png b/public/images/emoji/emoji_one/rowing_man/5.png
new file mode 100644
index 00000000000..bcdde26969c
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_man/5.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man/6.png b/public/images/emoji/emoji_one/rowing_man/6.png
new file mode 100644
index 00000000000..c2d1c4e351c
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_man/6.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman.png b/public/images/emoji/emoji_one/rowing_woman.png
new file mode 100644
index 00000000000..c8295bf593c
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_woman.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman/2.png b/public/images/emoji/emoji_one/rowing_woman/2.png
new file mode 100644
index 00000000000..9c72c4ea9f8
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman/3.png b/public/images/emoji/emoji_one/rowing_woman/3.png
new file mode 100644
index 00000000000..33590ced9a7
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman/4.png b/public/images/emoji/emoji_one/rowing_woman/4.png
new file mode 100644
index 00000000000..1d6eebb6cf4
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman/5.png b/public/images/emoji/emoji_one/rowing_woman/5.png
new file mode 100644
index 00000000000..d3778864423
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman/6.png b/public/images/emoji/emoji_one/rowing_woman/6.png
new file mode 100644
index 00000000000..417fd8d2d43
Binary files /dev/null and b/public/images/emoji/emoji_one/rowing_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/ru.png b/public/images/emoji/emoji_one/ru.png
index 62b6b21d67d..3ecaefd941b 100644
Binary files a/public/images/emoji/emoji_one/ru.png and b/public/images/emoji/emoji_one/ru.png differ
diff --git a/public/images/emoji/emoji_one/rugby_football.png b/public/images/emoji/emoji_one/rugby_football.png
index 7e35beb01af..eb05cd614e0 100644
Binary files a/public/images/emoji/emoji_one/rugby_football.png and b/public/images/emoji/emoji_one/rugby_football.png differ
diff --git a/public/images/emoji/emoji_one/runner.png b/public/images/emoji/emoji_one/runner.png
index 72cef9e8518..99d62ddf226 100644
Binary files a/public/images/emoji/emoji_one/runner.png and b/public/images/emoji/emoji_one/runner.png differ
diff --git a/public/images/emoji/emoji_one/runner/2.png b/public/images/emoji/emoji_one/runner/2.png
new file mode 100644
index 00000000000..885b2a92fe1
Binary files /dev/null and b/public/images/emoji/emoji_one/runner/2.png differ
diff --git a/public/images/emoji/emoji_one/runner/3.png b/public/images/emoji/emoji_one/runner/3.png
new file mode 100644
index 00000000000..33425ec5d57
Binary files /dev/null and b/public/images/emoji/emoji_one/runner/3.png differ
diff --git a/public/images/emoji/emoji_one/runner/4.png b/public/images/emoji/emoji_one/runner/4.png
new file mode 100644
index 00000000000..e5139b002d4
Binary files /dev/null and b/public/images/emoji/emoji_one/runner/4.png differ
diff --git a/public/images/emoji/emoji_one/runner/5.png b/public/images/emoji/emoji_one/runner/5.png
new file mode 100644
index 00000000000..664bbf6def3
Binary files /dev/null and b/public/images/emoji/emoji_one/runner/5.png differ
diff --git a/public/images/emoji/emoji_one/runner/6.png b/public/images/emoji/emoji_one/runner/6.png
new file mode 100644
index 00000000000..c0a6b9f63ce
Binary files /dev/null and b/public/images/emoji/emoji_one/runner/6.png differ
diff --git a/public/images/emoji/emoji_one/running_man.png b/public/images/emoji/emoji_one/running_man.png
new file mode 100644
index 00000000000..99d62ddf226
Binary files /dev/null and b/public/images/emoji/emoji_one/running_man.png differ
diff --git a/public/images/emoji/emoji_one/running_man/2.png b/public/images/emoji/emoji_one/running_man/2.png
new file mode 100644
index 00000000000..885b2a92fe1
Binary files /dev/null and b/public/images/emoji/emoji_one/running_man/2.png differ
diff --git a/public/images/emoji/emoji_one/running_man/3.png b/public/images/emoji/emoji_one/running_man/3.png
new file mode 100644
index 00000000000..33425ec5d57
Binary files /dev/null and b/public/images/emoji/emoji_one/running_man/3.png differ
diff --git a/public/images/emoji/emoji_one/running_man/4.png b/public/images/emoji/emoji_one/running_man/4.png
new file mode 100644
index 00000000000..e5139b002d4
Binary files /dev/null and b/public/images/emoji/emoji_one/running_man/4.png differ
diff --git a/public/images/emoji/emoji_one/running_man/5.png b/public/images/emoji/emoji_one/running_man/5.png
new file mode 100644
index 00000000000..664bbf6def3
Binary files /dev/null and b/public/images/emoji/emoji_one/running_man/5.png differ
diff --git a/public/images/emoji/emoji_one/running_man/6.png b/public/images/emoji/emoji_one/running_man/6.png
new file mode 100644
index 00000000000..c0a6b9f63ce
Binary files /dev/null and b/public/images/emoji/emoji_one/running_man/6.png differ
diff --git a/public/images/emoji/emoji_one/running_shirt_with_sash.png b/public/images/emoji/emoji_one/running_shirt_with_sash.png
index 8953f4bd08d..0afd8c09005 100644
Binary files a/public/images/emoji/emoji_one/running_shirt_with_sash.png and b/public/images/emoji/emoji_one/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/emoji_one/running_woman.png b/public/images/emoji/emoji_one/running_woman.png
new file mode 100644
index 00000000000..14ab5b717eb
Binary files /dev/null and b/public/images/emoji/emoji_one/running_woman.png differ
diff --git a/public/images/emoji/emoji_one/running_woman/2.png b/public/images/emoji/emoji_one/running_woman/2.png
new file mode 100644
index 00000000000..b6c332f3b57
Binary files /dev/null and b/public/images/emoji/emoji_one/running_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/running_woman/3.png b/public/images/emoji/emoji_one/running_woman/3.png
new file mode 100644
index 00000000000..5013c3fef17
Binary files /dev/null and b/public/images/emoji/emoji_one/running_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/running_woman/4.png b/public/images/emoji/emoji_one/running_woman/4.png
new file mode 100644
index 00000000000..acc8abbdfe8
Binary files /dev/null and b/public/images/emoji/emoji_one/running_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/running_woman/5.png b/public/images/emoji/emoji_one/running_woman/5.png
new file mode 100644
index 00000000000..8df764add3f
Binary files /dev/null and b/public/images/emoji/emoji_one/running_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/running_woman/6.png b/public/images/emoji/emoji_one/running_woman/6.png
new file mode 100644
index 00000000000..82e65002ce1
Binary files /dev/null and b/public/images/emoji/emoji_one/running_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/rwanda.png b/public/images/emoji/emoji_one/rwanda.png
new file mode 100644
index 00000000000..a45a988ff58
Binary files /dev/null and b/public/images/emoji/emoji_one/rwanda.png differ
diff --git a/public/images/emoji/emoji_one/sa.png b/public/images/emoji/emoji_one/sa.png
index 19c538273c4..339dd0d1039 100644
Binary files a/public/images/emoji/emoji_one/sa.png and b/public/images/emoji/emoji_one/sa.png differ
diff --git a/public/images/emoji/emoji_one/sagittarius.png b/public/images/emoji/emoji_one/sagittarius.png
index 9f080ccaafa..80865c2a61b 100644
Binary files a/public/images/emoji/emoji_one/sagittarius.png and b/public/images/emoji/emoji_one/sagittarius.png differ
diff --git a/public/images/emoji/emoji_one/sailboat.png b/public/images/emoji/emoji_one/sailboat.png
index 6e7872f487f..4ec504bb23c 100644
Binary files a/public/images/emoji/emoji_one/sailboat.png and b/public/images/emoji/emoji_one/sailboat.png differ
diff --git a/public/images/emoji/emoji_one/sake.png b/public/images/emoji/emoji_one/sake.png
index 0cf8a228628..7ba82dc546b 100644
Binary files a/public/images/emoji/emoji_one/sake.png and b/public/images/emoji/emoji_one/sake.png differ
diff --git a/public/images/emoji/emoji_one/samoa.png b/public/images/emoji/emoji_one/samoa.png
new file mode 100644
index 00000000000..de81c048d01
Binary files /dev/null and b/public/images/emoji/emoji_one/samoa.png differ
diff --git a/public/images/emoji/emoji_one/san_marino.png b/public/images/emoji/emoji_one/san_marino.png
new file mode 100644
index 00000000000..fa20a008086
Binary files /dev/null and b/public/images/emoji/emoji_one/san_marino.png differ
diff --git a/public/images/emoji/emoji_one/sandal.png b/public/images/emoji/emoji_one/sandal.png
index 4c13fd19f76..bb2674f5ce2 100644
Binary files a/public/images/emoji/emoji_one/sandal.png and b/public/images/emoji/emoji_one/sandal.png differ
diff --git a/public/images/emoji/emoji_one/sandwich.png b/public/images/emoji/emoji_one/sandwich.png
new file mode 100644
index 00000000000..d3e6208858a
Binary files /dev/null and b/public/images/emoji/emoji_one/sandwich.png differ
diff --git a/public/images/emoji/emoji_one/santa.png b/public/images/emoji/emoji_one/santa.png
index 4f5786f8739..60656dd07ac 100644
Binary files a/public/images/emoji/emoji_one/santa.png and b/public/images/emoji/emoji_one/santa.png differ
diff --git a/public/images/emoji/emoji_one/santa/2.png b/public/images/emoji/emoji_one/santa/2.png
new file mode 100644
index 00000000000..a74de500529
Binary files /dev/null and b/public/images/emoji/emoji_one/santa/2.png differ
diff --git a/public/images/emoji/emoji_one/santa/3.png b/public/images/emoji/emoji_one/santa/3.png
new file mode 100644
index 00000000000..a59a1a3a8bd
Binary files /dev/null and b/public/images/emoji/emoji_one/santa/3.png differ
diff --git a/public/images/emoji/emoji_one/santa/4.png b/public/images/emoji/emoji_one/santa/4.png
new file mode 100644
index 00000000000..d3eba6d319d
Binary files /dev/null and b/public/images/emoji/emoji_one/santa/4.png differ
diff --git a/public/images/emoji/emoji_one/santa/5.png b/public/images/emoji/emoji_one/santa/5.png
new file mode 100644
index 00000000000..9d3197c6731
Binary files /dev/null and b/public/images/emoji/emoji_one/santa/5.png differ
diff --git a/public/images/emoji/emoji_one/santa/6.png b/public/images/emoji/emoji_one/santa/6.png
new file mode 100644
index 00000000000..befd15b8042
Binary files /dev/null and b/public/images/emoji/emoji_one/santa/6.png differ
diff --git a/public/images/emoji/emoji_one/sao_tome_principe.png b/public/images/emoji/emoji_one/sao_tome_principe.png
new file mode 100644
index 00000000000..bbfcbd18df3
Binary files /dev/null and b/public/images/emoji/emoji_one/sao_tome_principe.png differ
diff --git a/public/images/emoji/emoji_one/satellite.png b/public/images/emoji/emoji_one/satellite.png
index c3ab7d44194..b62b62f601a 100644
Binary files a/public/images/emoji/emoji_one/satellite.png and b/public/images/emoji/emoji_one/satellite.png differ
diff --git a/public/images/emoji/emoji_one/satellite_orbital.png b/public/images/emoji/emoji_one/satellite_orbital.png
index 27f981e9e17..3463ad91aed 100644
Binary files a/public/images/emoji/emoji_one/satellite_orbital.png and b/public/images/emoji/emoji_one/satellite_orbital.png differ
diff --git a/public/images/emoji/emoji_one/satisfied.png b/public/images/emoji/emoji_one/satisfied.png
index a6594d2e5df..ffa2477caa6 100644
Binary files a/public/images/emoji/emoji_one/satisfied.png and b/public/images/emoji/emoji_one/satisfied.png differ
diff --git a/public/images/emoji/emoji_one/saudi_arabia.png b/public/images/emoji/emoji_one/saudi_arabia.png
new file mode 100644
index 00000000000..59954eccbc0
Binary files /dev/null and b/public/images/emoji/emoji_one/saudi_arabia.png differ
diff --git a/public/images/emoji/emoji_one/sauropod.png b/public/images/emoji/emoji_one/sauropod.png
new file mode 100644
index 00000000000..2f4d6199975
Binary files /dev/null and b/public/images/emoji/emoji_one/sauropod.png differ
diff --git a/public/images/emoji/emoji_one/saxophone.png b/public/images/emoji/emoji_one/saxophone.png
index b5970ac9e47..7e246ac1d3c 100644
Binary files a/public/images/emoji/emoji_one/saxophone.png and b/public/images/emoji/emoji_one/saxophone.png differ
diff --git a/public/images/emoji/emoji_one/scales.png b/public/images/emoji/emoji_one/scales.png
index 3cf07990549..5ce9296bce6 100644
Binary files a/public/images/emoji/emoji_one/scales.png and b/public/images/emoji/emoji_one/scales.png differ
diff --git a/public/images/emoji/emoji_one/scarf.png b/public/images/emoji/emoji_one/scarf.png
new file mode 100644
index 00000000000..73653eee2bd
Binary files /dev/null and b/public/images/emoji/emoji_one/scarf.png differ
diff --git a/public/images/emoji/emoji_one/school.png b/public/images/emoji/emoji_one/school.png
index d2ce16c061c..12a344b5757 100644
Binary files a/public/images/emoji/emoji_one/school.png and b/public/images/emoji/emoji_one/school.png differ
diff --git a/public/images/emoji/emoji_one/school_satchel.png b/public/images/emoji/emoji_one/school_satchel.png
index 39782759c22..7b33692651d 100644
Binary files a/public/images/emoji/emoji_one/school_satchel.png and b/public/images/emoji/emoji_one/school_satchel.png differ
diff --git a/public/images/emoji/emoji_one/scissors.png b/public/images/emoji/emoji_one/scissors.png
index 88084eae990..ffd41f23ef1 100644
Binary files a/public/images/emoji/emoji_one/scissors.png and b/public/images/emoji/emoji_one/scissors.png differ
diff --git a/public/images/emoji/emoji_one/scorpion.png b/public/images/emoji/emoji_one/scorpion.png
index 8ccbe6037f5..16bad6b57c5 100644
Binary files a/public/images/emoji/emoji_one/scorpion.png and b/public/images/emoji/emoji_one/scorpion.png differ
diff --git a/public/images/emoji/emoji_one/scorpius.png b/public/images/emoji/emoji_one/scorpius.png
index a50e56e80af..6f7adc0b3f0 100644
Binary files a/public/images/emoji/emoji_one/scorpius.png and b/public/images/emoji/emoji_one/scorpius.png differ
diff --git a/public/images/emoji/emoji_one/scream.png b/public/images/emoji/emoji_one/scream.png
index 45efbb75c3d..1511a5e4e32 100644
Binary files a/public/images/emoji/emoji_one/scream.png and b/public/images/emoji/emoji_one/scream.png differ
diff --git a/public/images/emoji/emoji_one/scream_cat.png b/public/images/emoji/emoji_one/scream_cat.png
index 0b04d37d662..167b1f2b32d 100644
Binary files a/public/images/emoji/emoji_one/scream_cat.png and b/public/images/emoji/emoji_one/scream_cat.png differ
diff --git a/public/images/emoji/emoji_one/scroll.png b/public/images/emoji/emoji_one/scroll.png
index b84deb9bd64..b5bedd22724 100644
Binary files a/public/images/emoji/emoji_one/scroll.png and b/public/images/emoji/emoji_one/scroll.png differ
diff --git a/public/images/emoji/emoji_one/seat.png b/public/images/emoji/emoji_one/seat.png
index fac130fff03..7b9c833e9a1 100644
Binary files a/public/images/emoji/emoji_one/seat.png and b/public/images/emoji/emoji_one/seat.png differ
diff --git a/public/images/emoji/emoji_one/secret.png b/public/images/emoji/emoji_one/secret.png
index 1b6e6176cf5..b61ab4977eb 100644
Binary files a/public/images/emoji/emoji_one/secret.png and b/public/images/emoji/emoji_one/secret.png differ
diff --git a/public/images/emoji/emoji_one/see_no_evil.png b/public/images/emoji/emoji_one/see_no_evil.png
index 6f5ced9b5f3..07090c8a086 100644
Binary files a/public/images/emoji/emoji_one/see_no_evil.png and b/public/images/emoji/emoji_one/see_no_evil.png differ
diff --git a/public/images/emoji/emoji_one/seedling.png b/public/images/emoji/emoji_one/seedling.png
index 0401c8dc642..d75fda98178 100644
Binary files a/public/images/emoji/emoji_one/seedling.png and b/public/images/emoji/emoji_one/seedling.png differ
diff --git a/public/images/emoji/emoji_one/selfie.png b/public/images/emoji/emoji_one/selfie.png
new file mode 100644
index 00000000000..de57ef4419e
Binary files /dev/null and b/public/images/emoji/emoji_one/selfie.png differ
diff --git a/public/images/emoji/emoji_one/selfie/2.png b/public/images/emoji/emoji_one/selfie/2.png
new file mode 100644
index 00000000000..2b041e7a756
Binary files /dev/null and b/public/images/emoji/emoji_one/selfie/2.png differ
diff --git a/public/images/emoji/emoji_one/selfie/3.png b/public/images/emoji/emoji_one/selfie/3.png
new file mode 100644
index 00000000000..d044c4a12e7
Binary files /dev/null and b/public/images/emoji/emoji_one/selfie/3.png differ
diff --git a/public/images/emoji/emoji_one/selfie/4.png b/public/images/emoji/emoji_one/selfie/4.png
new file mode 100644
index 00000000000..c4580ad9e0a
Binary files /dev/null and b/public/images/emoji/emoji_one/selfie/4.png differ
diff --git a/public/images/emoji/emoji_one/selfie/5.png b/public/images/emoji/emoji_one/selfie/5.png
new file mode 100644
index 00000000000..058d9fd8aaf
Binary files /dev/null and b/public/images/emoji/emoji_one/selfie/5.png differ
diff --git a/public/images/emoji/emoji_one/selfie/6.png b/public/images/emoji/emoji_one/selfie/6.png
new file mode 100644
index 00000000000..7c9abea6b8b
Binary files /dev/null and b/public/images/emoji/emoji_one/selfie/6.png differ
diff --git a/public/images/emoji/emoji_one/senegal.png b/public/images/emoji/emoji_one/senegal.png
new file mode 100644
index 00000000000..2d32427625a
Binary files /dev/null and b/public/images/emoji/emoji_one/senegal.png differ
diff --git a/public/images/emoji/emoji_one/serbia.png b/public/images/emoji/emoji_one/serbia.png
new file mode 100644
index 00000000000..a7af1346e56
Binary files /dev/null and b/public/images/emoji/emoji_one/serbia.png differ
diff --git a/public/images/emoji/emoji_one/seven.png b/public/images/emoji/emoji_one/seven.png
index 082c0c853f6..636f1a4a35b 100644
Binary files a/public/images/emoji/emoji_one/seven.png and b/public/images/emoji/emoji_one/seven.png differ
diff --git a/public/images/emoji/emoji_one/seychelles.png b/public/images/emoji/emoji_one/seychelles.png
new file mode 100644
index 00000000000..e69ca6add18
Binary files /dev/null and b/public/images/emoji/emoji_one/seychelles.png differ
diff --git a/public/images/emoji/emoji_one/shallow_pan_of_food.png b/public/images/emoji/emoji_one/shallow_pan_of_food.png
new file mode 100644
index 00000000000..57246e34619
Binary files /dev/null and b/public/images/emoji/emoji_one/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/emoji_one/shamrock.png b/public/images/emoji/emoji_one/shamrock.png
index 14e221b62b0..e2779368b43 100644
Binary files a/public/images/emoji/emoji_one/shamrock.png and b/public/images/emoji/emoji_one/shamrock.png differ
diff --git a/public/images/emoji/emoji_one/shark.png b/public/images/emoji/emoji_one/shark.png
new file mode 100644
index 00000000000..e7ba34f9743
Binary files /dev/null and b/public/images/emoji/emoji_one/shark.png differ
diff --git a/public/images/emoji/emoji_one/shaved_ice.png b/public/images/emoji/emoji_one/shaved_ice.png
index 8eac6e904e2..e1e9a07c4ad 100644
Binary files a/public/images/emoji/emoji_one/shaved_ice.png and b/public/images/emoji/emoji_one/shaved_ice.png differ
diff --git a/public/images/emoji/emoji_one/sheep.png b/public/images/emoji/emoji_one/sheep.png
index b50686cd5d3..d41b629cd1f 100644
Binary files a/public/images/emoji/emoji_one/sheep.png and b/public/images/emoji/emoji_one/sheep.png differ
diff --git a/public/images/emoji/emoji_one/shell.png b/public/images/emoji/emoji_one/shell.png
index d78b8a3e69b..10692881163 100644
Binary files a/public/images/emoji/emoji_one/shell.png and b/public/images/emoji/emoji_one/shell.png differ
diff --git a/public/images/emoji/emoji_one/shield.png b/public/images/emoji/emoji_one/shield.png
index d453021093d..874899ed7c2 100644
Binary files a/public/images/emoji/emoji_one/shield.png and b/public/images/emoji/emoji_one/shield.png differ
diff --git a/public/images/emoji/emoji_one/shinto_shrine.png b/public/images/emoji/emoji_one/shinto_shrine.png
index 9c4f67c43a1..073ba575474 100644
Binary files a/public/images/emoji/emoji_one/shinto_shrine.png and b/public/images/emoji/emoji_one/shinto_shrine.png differ
diff --git a/public/images/emoji/emoji_one/ship.png b/public/images/emoji/emoji_one/ship.png
index 4503cd5eae4..9fcfae6bae6 100644
Binary files a/public/images/emoji/emoji_one/ship.png and b/public/images/emoji/emoji_one/ship.png differ
diff --git a/public/images/emoji/emoji_one/shirt.png b/public/images/emoji/emoji_one/shirt.png
index ecf79205873..94681118582 100644
Binary files a/public/images/emoji/emoji_one/shirt.png and b/public/images/emoji/emoji_one/shirt.png differ
diff --git a/public/images/emoji/emoji_one/shit.png b/public/images/emoji/emoji_one/shit.png
index 77eb5b9fd23..123281b9b32 100644
Binary files a/public/images/emoji/emoji_one/shit.png and b/public/images/emoji/emoji_one/shit.png differ
diff --git a/public/images/emoji/emoji_one/shopping.png b/public/images/emoji/emoji_one/shopping.png
new file mode 100644
index 00000000000..51da93c9678
Binary files /dev/null and b/public/images/emoji/emoji_one/shopping.png differ
diff --git a/public/images/emoji/emoji_one/shopping_bags.png b/public/images/emoji/emoji_one/shopping_bags.png
index 63194341660..51da93c9678 100644
Binary files a/public/images/emoji/emoji_one/shopping_bags.png and b/public/images/emoji/emoji_one/shopping_bags.png differ
diff --git a/public/images/emoji/emoji_one/shopping_cart.png b/public/images/emoji/emoji_one/shopping_cart.png
new file mode 100644
index 00000000000..57386eb1d4b
Binary files /dev/null and b/public/images/emoji/emoji_one/shopping_cart.png differ
diff --git a/public/images/emoji/emoji_one/shower.png b/public/images/emoji/emoji_one/shower.png
index 35e297cbf9d..60cb0240940 100644
Binary files a/public/images/emoji/emoji_one/shower.png and b/public/images/emoji/emoji_one/shower.png differ
diff --git a/public/images/emoji/emoji_one/shrimp.png b/public/images/emoji/emoji_one/shrimp.png
new file mode 100644
index 00000000000..c0e050dc5e5
Binary files /dev/null and b/public/images/emoji/emoji_one/shrimp.png differ
diff --git a/public/images/emoji/emoji_one/sierra_leone.png b/public/images/emoji/emoji_one/sierra_leone.png
new file mode 100644
index 00000000000..816f090002a
Binary files /dev/null and b/public/images/emoji/emoji_one/sierra_leone.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns.png b/public/images/emoji/emoji_one/sign_of_the_horns.png
index da08837ff95..c5afaf3cab9 100644
Binary files a/public/images/emoji/emoji_one/sign_of_the_horns.png and b/public/images/emoji/emoji_one/sign_of_the_horns.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns/2.png b/public/images/emoji/emoji_one/sign_of_the_horns/2.png
new file mode 100644
index 00000000000..58823b056c2
Binary files /dev/null and b/public/images/emoji/emoji_one/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns/3.png b/public/images/emoji/emoji_one/sign_of_the_horns/3.png
new file mode 100644
index 00000000000..7649f660d6c
Binary files /dev/null and b/public/images/emoji/emoji_one/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns/4.png b/public/images/emoji/emoji_one/sign_of_the_horns/4.png
new file mode 100644
index 00000000000..587ce13ef0d
Binary files /dev/null and b/public/images/emoji/emoji_one/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns/5.png b/public/images/emoji/emoji_one/sign_of_the_horns/5.png
new file mode 100644
index 00000000000..6f5a7f9a1a1
Binary files /dev/null and b/public/images/emoji/emoji_one/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns/6.png b/public/images/emoji/emoji_one/sign_of_the_horns/6.png
new file mode 100644
index 00000000000..90670b67926
Binary files /dev/null and b/public/images/emoji/emoji_one/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/emoji_one/signal_strength.png b/public/images/emoji/emoji_one/signal_strength.png
index b3bfcb6f4a3..a1bb5ea0ab8 100644
Binary files a/public/images/emoji/emoji_one/signal_strength.png and b/public/images/emoji/emoji_one/signal_strength.png differ
diff --git a/public/images/emoji/emoji_one/singapore.png b/public/images/emoji/emoji_one/singapore.png
new file mode 100644
index 00000000000..4cf2332d20f
Binary files /dev/null and b/public/images/emoji/emoji_one/singapore.png differ
diff --git a/public/images/emoji/emoji_one/sint_maarten.png b/public/images/emoji/emoji_one/sint_maarten.png
new file mode 100644
index 00000000000..5248152aba9
Binary files /dev/null and b/public/images/emoji/emoji_one/sint_maarten.png differ
diff --git a/public/images/emoji/emoji_one/six.png b/public/images/emoji/emoji_one/six.png
index e63c0ca97f1..06822f95c01 100644
Binary files a/public/images/emoji/emoji_one/six.png and b/public/images/emoji/emoji_one/six.png differ
diff --git a/public/images/emoji/emoji_one/six_pointed_star.png b/public/images/emoji/emoji_one/six_pointed_star.png
index 0f461bf76e0..8631a9c0abc 100644
Binary files a/public/images/emoji/emoji_one/six_pointed_star.png and b/public/images/emoji/emoji_one/six_pointed_star.png differ
diff --git a/public/images/emoji/emoji_one/skeleton.png b/public/images/emoji/emoji_one/skeleton.png
index 4e51ce946a7..c3fe6053db7 100644
Binary files a/public/images/emoji/emoji_one/skeleton.png and b/public/images/emoji/emoji_one/skeleton.png differ
diff --git a/public/images/emoji/emoji_one/ski.png b/public/images/emoji/emoji_one/ski.png
index 28c26e3b20f..e0e2b4af702 100644
Binary files a/public/images/emoji/emoji_one/ski.png and b/public/images/emoji/emoji_one/ski.png differ
diff --git a/public/images/emoji/emoji_one/skier.png b/public/images/emoji/emoji_one/skier.png
index 1aa3148d39d..46d21812016 100644
Binary files a/public/images/emoji/emoji_one/skier.png and b/public/images/emoji/emoji_one/skier.png differ
diff --git a/public/images/emoji/emoji_one/skull.png b/public/images/emoji/emoji_one/skull.png
index 4e51ce946a7..c3fe6053db7 100644
Binary files a/public/images/emoji/emoji_one/skull.png and b/public/images/emoji/emoji_one/skull.png differ
diff --git a/public/images/emoji/emoji_one/skull_and_crossbones.png b/public/images/emoji/emoji_one/skull_and_crossbones.png
index 57ba5833f1d..2320ddcb7c3 100644
Binary files a/public/images/emoji/emoji_one/skull_and_crossbones.png and b/public/images/emoji/emoji_one/skull_and_crossbones.png differ
diff --git a/public/images/emoji/emoji_one/skull_crossbones.png b/public/images/emoji/emoji_one/skull_crossbones.png
index 57ba5833f1d..2320ddcb7c3 100644
Binary files a/public/images/emoji/emoji_one/skull_crossbones.png and b/public/images/emoji/emoji_one/skull_crossbones.png differ
diff --git a/public/images/emoji/emoji_one/sled.png b/public/images/emoji/emoji_one/sled.png
new file mode 100644
index 00000000000..01805b1fe76
Binary files /dev/null and b/public/images/emoji/emoji_one/sled.png differ
diff --git a/public/images/emoji/emoji_one/sleeping.png b/public/images/emoji/emoji_one/sleeping.png
index 4a6a7a85018..0529449992f 100644
Binary files a/public/images/emoji/emoji_one/sleeping.png and b/public/images/emoji/emoji_one/sleeping.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation.png b/public/images/emoji/emoji_one/sleeping_accommodation.png
index b5b231d5a07..9a919c519a2 100644
Binary files a/public/images/emoji/emoji_one/sleeping_accommodation.png and b/public/images/emoji/emoji_one/sleeping_accommodation.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation/2.png b/public/images/emoji/emoji_one/sleeping_accommodation/2.png
new file mode 100644
index 00000000000..c5b63b88abd
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation/3.png b/public/images/emoji/emoji_one/sleeping_accommodation/3.png
new file mode 100644
index 00000000000..84ff2961895
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation/4.png b/public/images/emoji/emoji_one/sleeping_accommodation/4.png
new file mode 100644
index 00000000000..900d4c89931
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation/5.png b/public/images/emoji/emoji_one/sleeping_accommodation/5.png
new file mode 100644
index 00000000000..02ebcc0f6bf
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation/6.png b/public/images/emoji/emoji_one/sleeping_accommodation/6.png
new file mode 100644
index 00000000000..1d098526012
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed.png b/public/images/emoji/emoji_one/sleeping_bed.png
new file mode 100644
index 00000000000..9a919c519a2
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_bed.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed/2.png b/public/images/emoji/emoji_one/sleeping_bed/2.png
new file mode 100644
index 00000000000..c5b63b88abd
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_bed/2.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed/3.png b/public/images/emoji/emoji_one/sleeping_bed/3.png
new file mode 100644
index 00000000000..84ff2961895
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_bed/3.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed/4.png b/public/images/emoji/emoji_one/sleeping_bed/4.png
new file mode 100644
index 00000000000..900d4c89931
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_bed/4.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed/5.png b/public/images/emoji/emoji_one/sleeping_bed/5.png
new file mode 100644
index 00000000000..02ebcc0f6bf
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_bed/5.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed/6.png b/public/images/emoji/emoji_one/sleeping_bed/6.png
new file mode 100644
index 00000000000..1d098526012
Binary files /dev/null and b/public/images/emoji/emoji_one/sleeping_bed/6.png differ
diff --git a/public/images/emoji/emoji_one/sleepy.png b/public/images/emoji/emoji_one/sleepy.png
index 35d76526938..bc5e0e6211a 100644
Binary files a/public/images/emoji/emoji_one/sleepy.png and b/public/images/emoji/emoji_one/sleepy.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy.png b/public/images/emoji/emoji_one/sleuth_or_spy.png
index 0e0ad49b6db..dda052dfbb9 100644
Binary files a/public/images/emoji/emoji_one/sleuth_or_spy.png and b/public/images/emoji/emoji_one/sleuth_or_spy.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy/2.png b/public/images/emoji/emoji_one/sleuth_or_spy/2.png
new file mode 100644
index 00000000000..22f8a4fa1b4
Binary files /dev/null and b/public/images/emoji/emoji_one/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy/3.png b/public/images/emoji/emoji_one/sleuth_or_spy/3.png
new file mode 100644
index 00000000000..028d6d8e162
Binary files /dev/null and b/public/images/emoji/emoji_one/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy/4.png b/public/images/emoji/emoji_one/sleuth_or_spy/4.png
new file mode 100644
index 00000000000..467e372e512
Binary files /dev/null and b/public/images/emoji/emoji_one/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy/5.png b/public/images/emoji/emoji_one/sleuth_or_spy/5.png
new file mode 100644
index 00000000000..69c952c3b7b
Binary files /dev/null and b/public/images/emoji/emoji_one/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy/6.png b/public/images/emoji/emoji_one/sleuth_or_spy/6.png
new file mode 100644
index 00000000000..3caf1bcfc88
Binary files /dev/null and b/public/images/emoji/emoji_one/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/emoji_one/slight_frown.png b/public/images/emoji/emoji_one/slight_frown.png
index 72d3d96f6fc..b6807a25b55 100644
Binary files a/public/images/emoji/emoji_one/slight_frown.png and b/public/images/emoji/emoji_one/slight_frown.png differ
diff --git a/public/images/emoji/emoji_one/slight_smile.png b/public/images/emoji/emoji_one/slight_smile.png
index c40491e67d2..96cc82d8ed1 100644
Binary files a/public/images/emoji/emoji_one/slight_smile.png and b/public/images/emoji/emoji_one/slight_smile.png differ
diff --git a/public/images/emoji/emoji_one/slightly_frowning_face.png b/public/images/emoji/emoji_one/slightly_frowning_face.png
index 72d3d96f6fc..b6807a25b55 100644
Binary files a/public/images/emoji/emoji_one/slightly_frowning_face.png and b/public/images/emoji/emoji_one/slightly_frowning_face.png differ
diff --git a/public/images/emoji/emoji_one/slightly_smiling.png b/public/images/emoji/emoji_one/slightly_smiling.png
new file mode 100644
index 00000000000..96cc82d8ed1
Binary files /dev/null and b/public/images/emoji/emoji_one/slightly_smiling.png differ
diff --git a/public/images/emoji/emoji_one/slightly_smiling_face.png b/public/images/emoji/emoji_one/slightly_smiling_face.png
index c40491e67d2..96cc82d8ed1 100644
Binary files a/public/images/emoji/emoji_one/slightly_smiling_face.png and b/public/images/emoji/emoji_one/slightly_smiling_face.png differ
diff --git a/public/images/emoji/emoji_one/slot_machine.png b/public/images/emoji/emoji_one/slot_machine.png
index e7df76618cf..832e535471e 100644
Binary files a/public/images/emoji/emoji_one/slot_machine.png and b/public/images/emoji/emoji_one/slot_machine.png differ
diff --git a/public/images/emoji/emoji_one/slovakia.png b/public/images/emoji/emoji_one/slovakia.png
new file mode 100644
index 00000000000..9b716032fd8
Binary files /dev/null and b/public/images/emoji/emoji_one/slovakia.png differ
diff --git a/public/images/emoji/emoji_one/slovenia.png b/public/images/emoji/emoji_one/slovenia.png
new file mode 100644
index 00000000000..6dfbe6eae24
Binary files /dev/null and b/public/images/emoji/emoji_one/slovenia.png differ
diff --git a/public/images/emoji/emoji_one/small_airplane.png b/public/images/emoji/emoji_one/small_airplane.png
index 217b0b85a6d..ff5a7b34e11 100644
Binary files a/public/images/emoji/emoji_one/small_airplane.png and b/public/images/emoji/emoji_one/small_airplane.png differ
diff --git a/public/images/emoji/emoji_one/small_blue_diamond.png b/public/images/emoji/emoji_one/small_blue_diamond.png
index 7293d4294b3..9b2903c84ae 100644
Binary files a/public/images/emoji/emoji_one/small_blue_diamond.png and b/public/images/emoji/emoji_one/small_blue_diamond.png differ
diff --git a/public/images/emoji/emoji_one/small_orange_diamond.png b/public/images/emoji/emoji_one/small_orange_diamond.png
index 5f71ecdf08e..2db6b3e24cf 100644
Binary files a/public/images/emoji/emoji_one/small_orange_diamond.png and b/public/images/emoji/emoji_one/small_orange_diamond.png differ
diff --git a/public/images/emoji/emoji_one/small_red_triangle.png b/public/images/emoji/emoji_one/small_red_triangle.png
index 23554893461..94b28fb76dc 100644
Binary files a/public/images/emoji/emoji_one/small_red_triangle.png and b/public/images/emoji/emoji_one/small_red_triangle.png differ
diff --git a/public/images/emoji/emoji_one/small_red_triangle_down.png b/public/images/emoji/emoji_one/small_red_triangle_down.png
index b72afa6f92e..44942bd7dd4 100644
Binary files a/public/images/emoji/emoji_one/small_red_triangle_down.png and b/public/images/emoji/emoji_one/small_red_triangle_down.png differ
diff --git a/public/images/emoji/emoji_one/smile.png b/public/images/emoji/emoji_one/smile.png
index efe65f3b832..b40fadb0a7e 100644
Binary files a/public/images/emoji/emoji_one/smile.png and b/public/images/emoji/emoji_one/smile.png differ
diff --git a/public/images/emoji/emoji_one/smile_cat.png b/public/images/emoji/emoji_one/smile_cat.png
index 16145530fdb..f7802bd302e 100644
Binary files a/public/images/emoji/emoji_one/smile_cat.png and b/public/images/emoji/emoji_one/smile_cat.png differ
diff --git a/public/images/emoji/emoji_one/smiley.png b/public/images/emoji/emoji_one/smiley.png
index f82b805814b..5a647aee01b 100644
Binary files a/public/images/emoji/emoji_one/smiley.png and b/public/images/emoji/emoji_one/smiley.png differ
diff --git a/public/images/emoji/emoji_one/smiley_cat.png b/public/images/emoji/emoji_one/smiley_cat.png
index c489ba35fca..3f83e3285ad 100644
Binary files a/public/images/emoji/emoji_one/smiley_cat.png and b/public/images/emoji/emoji_one/smiley_cat.png differ
diff --git a/public/images/emoji/emoji_one/smiling_imp.png b/public/images/emoji/emoji_one/smiling_imp.png
index 865a2137758..15dd76b14d4 100644
Binary files a/public/images/emoji/emoji_one/smiling_imp.png and b/public/images/emoji/emoji_one/smiling_imp.png differ
diff --git a/public/images/emoji/emoji_one/smirk.png b/public/images/emoji/emoji_one/smirk.png
index 163faee7ece..4352c78f170 100644
Binary files a/public/images/emoji/emoji_one/smirk.png and b/public/images/emoji/emoji_one/smirk.png differ
diff --git a/public/images/emoji/emoji_one/smirk_cat.png b/public/images/emoji/emoji_one/smirk_cat.png
index 2942825c02b..2bb8347640f 100644
Binary files a/public/images/emoji/emoji_one/smirk_cat.png and b/public/images/emoji/emoji_one/smirk_cat.png differ
diff --git a/public/images/emoji/emoji_one/smoking.png b/public/images/emoji/emoji_one/smoking.png
index 96944185bbf..7c08cdc9ff2 100644
Binary files a/public/images/emoji/emoji_one/smoking.png and b/public/images/emoji/emoji_one/smoking.png differ
diff --git a/public/images/emoji/emoji_one/snail.png b/public/images/emoji/emoji_one/snail.png
index f1710296975..c648eea6aaa 100644
Binary files a/public/images/emoji/emoji_one/snail.png and b/public/images/emoji/emoji_one/snail.png differ
diff --git a/public/images/emoji/emoji_one/snake.png b/public/images/emoji/emoji_one/snake.png
index 17995513c9a..fd47985c9cf 100644
Binary files a/public/images/emoji/emoji_one/snake.png and b/public/images/emoji/emoji_one/snake.png differ
diff --git a/public/images/emoji/emoji_one/sneezing_face.png b/public/images/emoji/emoji_one/sneezing_face.png
new file mode 100644
index 00000000000..ed2115a34fe
Binary files /dev/null and b/public/images/emoji/emoji_one/sneezing_face.png differ
diff --git a/public/images/emoji/emoji_one/snow_capped_mountain.png b/public/images/emoji/emoji_one/snow_capped_mountain.png
index fcf09dab6b3..5654198a525 100644
Binary files a/public/images/emoji/emoji_one/snow_capped_mountain.png and b/public/images/emoji/emoji_one/snow_capped_mountain.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder.png b/public/images/emoji/emoji_one/snowboarder.png
index a1c4cfcf336..ec4dec2378d 100644
Binary files a/public/images/emoji/emoji_one/snowboarder.png and b/public/images/emoji/emoji_one/snowboarder.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder/2.png b/public/images/emoji/emoji_one/snowboarder/2.png
new file mode 100644
index 00000000000..d75f80a2728
Binary files /dev/null and b/public/images/emoji/emoji_one/snowboarder/2.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder/3.png b/public/images/emoji/emoji_one/snowboarder/3.png
new file mode 100644
index 00000000000..57f8d32290b
Binary files /dev/null and b/public/images/emoji/emoji_one/snowboarder/3.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder/4.png b/public/images/emoji/emoji_one/snowboarder/4.png
new file mode 100644
index 00000000000..f1d6be361eb
Binary files /dev/null and b/public/images/emoji/emoji_one/snowboarder/4.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder/5.png b/public/images/emoji/emoji_one/snowboarder/5.png
new file mode 100644
index 00000000000..c81607fc790
Binary files /dev/null and b/public/images/emoji/emoji_one/snowboarder/5.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder/6.png b/public/images/emoji/emoji_one/snowboarder/6.png
new file mode 100644
index 00000000000..50869272ee2
Binary files /dev/null and b/public/images/emoji/emoji_one/snowboarder/6.png differ
diff --git a/public/images/emoji/emoji_one/snowflake.png b/public/images/emoji/emoji_one/snowflake.png
index 01360220aeb..0ee41a7d9a9 100644
Binary files a/public/images/emoji/emoji_one/snowflake.png and b/public/images/emoji/emoji_one/snowflake.png differ
diff --git a/public/images/emoji/emoji_one/snowman.png b/public/images/emoji/emoji_one/snowman.png
index 55c82a95c1d..5ec353fdecb 100644
Binary files a/public/images/emoji/emoji_one/snowman.png and b/public/images/emoji/emoji_one/snowman.png differ
diff --git a/public/images/emoji/emoji_one/snowman2.png b/public/images/emoji/emoji_one/snowman2.png
index 87c6724c7ad..6bf5eaa8185 100644
Binary files a/public/images/emoji/emoji_one/snowman2.png and b/public/images/emoji/emoji_one/snowman2.png differ
diff --git a/public/images/emoji/emoji_one/snowman_with_snow.png b/public/images/emoji/emoji_one/snowman_with_snow.png
new file mode 100644
index 00000000000..6bf5eaa8185
Binary files /dev/null and b/public/images/emoji/emoji_one/snowman_with_snow.png differ
diff --git a/public/images/emoji/emoji_one/sob.png b/public/images/emoji/emoji_one/sob.png
index 3c63c1a3401..7cebf5c5ba6 100644
Binary files a/public/images/emoji/emoji_one/sob.png and b/public/images/emoji/emoji_one/sob.png differ
diff --git a/public/images/emoji/emoji_one/soccer.png b/public/images/emoji/emoji_one/soccer.png
index 65eceea9868..40e92cb6945 100644
Binary files a/public/images/emoji/emoji_one/soccer.png and b/public/images/emoji/emoji_one/soccer.png differ
diff --git a/public/images/emoji/emoji_one/socks.png b/public/images/emoji/emoji_one/socks.png
new file mode 100644
index 00000000000..49e7c5df855
Binary files /dev/null and b/public/images/emoji/emoji_one/socks.png differ
diff --git a/public/images/emoji/emoji_one/solomon_islands.png b/public/images/emoji/emoji_one/solomon_islands.png
new file mode 100644
index 00000000000..e4476e18806
Binary files /dev/null and b/public/images/emoji/emoji_one/solomon_islands.png differ
diff --git a/public/images/emoji/emoji_one/somalia.png b/public/images/emoji/emoji_one/somalia.png
new file mode 100644
index 00000000000..209fffeaed0
Binary files /dev/null and b/public/images/emoji/emoji_one/somalia.png differ
diff --git a/public/images/emoji/emoji_one/soon.png b/public/images/emoji/emoji_one/soon.png
index c56de37b98f..b737658c9af 100644
Binary files a/public/images/emoji/emoji_one/soon.png and b/public/images/emoji/emoji_one/soon.png differ
diff --git a/public/images/emoji/emoji_one/sos.png b/public/images/emoji/emoji_one/sos.png
index 9b1e4bba83b..f4c31114f27 100644
Binary files a/public/images/emoji/emoji_one/sos.png and b/public/images/emoji/emoji_one/sos.png differ
diff --git a/public/images/emoji/emoji_one/sound.png b/public/images/emoji/emoji_one/sound.png
index 09adf65c39d..803ba143309 100644
Binary files a/public/images/emoji/emoji_one/sound.png and b/public/images/emoji/emoji_one/sound.png differ
diff --git a/public/images/emoji/emoji_one/south_africa.png b/public/images/emoji/emoji_one/south_africa.png
new file mode 100644
index 00000000000..d40f1c75c81
Binary files /dev/null and b/public/images/emoji/emoji_one/south_africa.png differ
diff --git a/public/images/emoji/emoji_one/south_georgia_south_sandwich_islands.png b/public/images/emoji/emoji_one/south_georgia_south_sandwich_islands.png
new file mode 100644
index 00000000000..58f47bcd9b9
Binary files /dev/null and b/public/images/emoji/emoji_one/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/emoji_one/south_sudan.png b/public/images/emoji/emoji_one/south_sudan.png
new file mode 100644
index 00000000000..c7cbc6967c2
Binary files /dev/null and b/public/images/emoji/emoji_one/south_sudan.png differ
diff --git a/public/images/emoji/emoji_one/space_invader.png b/public/images/emoji/emoji_one/space_invader.png
index a964e9fdee1..72530a229e3 100644
Binary files a/public/images/emoji/emoji_one/space_invader.png and b/public/images/emoji/emoji_one/space_invader.png differ
diff --git a/public/images/emoji/emoji_one/spades.png b/public/images/emoji/emoji_one/spades.png
index 49d963bb385..261536e773b 100644
Binary files a/public/images/emoji/emoji_one/spades.png and b/public/images/emoji/emoji_one/spades.png differ
diff --git a/public/images/emoji/emoji_one/spaghetti.png b/public/images/emoji/emoji_one/spaghetti.png
index 5d9f9c94850..42223ee671e 100644
Binary files a/public/images/emoji/emoji_one/spaghetti.png and b/public/images/emoji/emoji_one/spaghetti.png differ
diff --git a/public/images/emoji/emoji_one/sparkle.png b/public/images/emoji/emoji_one/sparkle.png
index d980fe699c9..e9231efc2fb 100644
Binary files a/public/images/emoji/emoji_one/sparkle.png and b/public/images/emoji/emoji_one/sparkle.png differ
diff --git a/public/images/emoji/emoji_one/sparkler.png b/public/images/emoji/emoji_one/sparkler.png
index bcae44a7875..d99fb5195e2 100644
Binary files a/public/images/emoji/emoji_one/sparkler.png and b/public/images/emoji/emoji_one/sparkler.png differ
diff --git a/public/images/emoji/emoji_one/sparkles.png b/public/images/emoji/emoji_one/sparkles.png
index 3cbacb46e31..d50cc9a11e9 100644
Binary files a/public/images/emoji/emoji_one/sparkles.png and b/public/images/emoji/emoji_one/sparkles.png differ
diff --git a/public/images/emoji/emoji_one/sparkling_heart.png b/public/images/emoji/emoji_one/sparkling_heart.png
index 9f3734bddcb..5d0ea34a845 100644
Binary files a/public/images/emoji/emoji_one/sparkling_heart.png and b/public/images/emoji/emoji_one/sparkling_heart.png differ
diff --git a/public/images/emoji/emoji_one/speak_no_evil.png b/public/images/emoji/emoji_one/speak_no_evil.png
index c6deac879cb..f05c13f3baf 100644
Binary files a/public/images/emoji/emoji_one/speak_no_evil.png and b/public/images/emoji/emoji_one/speak_no_evil.png differ
diff --git a/public/images/emoji/emoji_one/speaker.png b/public/images/emoji/emoji_one/speaker.png
index 57a70b96b18..c0dffb3d84a 100644
Binary files a/public/images/emoji/emoji_one/speaker.png and b/public/images/emoji/emoji_one/speaker.png differ
diff --git a/public/images/emoji/emoji_one/speaking_head.png b/public/images/emoji/emoji_one/speaking_head.png
index b84d9b048ab..78c9f6c1f35 100644
Binary files a/public/images/emoji/emoji_one/speaking_head.png and b/public/images/emoji/emoji_one/speaking_head.png differ
diff --git a/public/images/emoji/emoji_one/speaking_head_in_silhouette.png b/public/images/emoji/emoji_one/speaking_head_in_silhouette.png
index b84d9b048ab..78c9f6c1f35 100644
Binary files a/public/images/emoji/emoji_one/speaking_head_in_silhouette.png and b/public/images/emoji/emoji_one/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/emoji_one/speech_balloon.png b/public/images/emoji/emoji_one/speech_balloon.png
index 84b3f21e488..9addbd158ff 100644
Binary files a/public/images/emoji/emoji_one/speech_balloon.png and b/public/images/emoji/emoji_one/speech_balloon.png differ
diff --git a/public/images/emoji/emoji_one/speedboat.png b/public/images/emoji/emoji_one/speedboat.png
index 39ae11a2a35..75019fbe69f 100644
Binary files a/public/images/emoji/emoji_one/speedboat.png and b/public/images/emoji/emoji_one/speedboat.png differ
diff --git a/public/images/emoji/emoji_one/spider.png b/public/images/emoji/emoji_one/spider.png
index 0e8f42dea1b..80062eb1696 100644
Binary files a/public/images/emoji/emoji_one/spider.png and b/public/images/emoji/emoji_one/spider.png differ
diff --git a/public/images/emoji/emoji_one/spider_web.png b/public/images/emoji/emoji_one/spider_web.png
index fc4532a4ec9..5a1a32d2fb6 100644
Binary files a/public/images/emoji/emoji_one/spider_web.png and b/public/images/emoji/emoji_one/spider_web.png differ
diff --git a/public/images/emoji/emoji_one/spiral_calendar.png b/public/images/emoji/emoji_one/spiral_calendar.png
new file mode 100644
index 00000000000..fd91b82bf90
Binary files /dev/null and b/public/images/emoji/emoji_one/spiral_calendar.png differ
diff --git a/public/images/emoji/emoji_one/spiral_calendar_pad.png b/public/images/emoji/emoji_one/spiral_calendar_pad.png
index 50fb5e044aa..fd91b82bf90 100644
Binary files a/public/images/emoji/emoji_one/spiral_calendar_pad.png and b/public/images/emoji/emoji_one/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/emoji_one/spiral_note_pad.png b/public/images/emoji/emoji_one/spiral_note_pad.png
index 3137300cb34..08c5181db28 100644
Binary files a/public/images/emoji/emoji_one/spiral_note_pad.png and b/public/images/emoji/emoji_one/spiral_note_pad.png differ
diff --git a/public/images/emoji/emoji_one/spiral_notepad.png b/public/images/emoji/emoji_one/spiral_notepad.png
new file mode 100644
index 00000000000..08c5181db28
Binary files /dev/null and b/public/images/emoji/emoji_one/spiral_notepad.png differ
diff --git a/public/images/emoji/emoji_one/spoon.png b/public/images/emoji/emoji_one/spoon.png
new file mode 100644
index 00000000000..ce2c1bab14d
Binary files /dev/null and b/public/images/emoji/emoji_one/spoon.png differ
diff --git a/public/images/emoji/emoji_one/sports_medal.png b/public/images/emoji/emoji_one/sports_medal.png
index b5f122fc568..63d5d18c6d8 100644
Binary files a/public/images/emoji/emoji_one/sports_medal.png and b/public/images/emoji/emoji_one/sports_medal.png differ
diff --git a/public/images/emoji/emoji_one/spy.png b/public/images/emoji/emoji_one/spy.png
index 0e0ad49b6db..dda052dfbb9 100644
Binary files a/public/images/emoji/emoji_one/spy.png and b/public/images/emoji/emoji_one/spy.png differ
diff --git a/public/images/emoji/emoji_one/spy/2.png b/public/images/emoji/emoji_one/spy/2.png
new file mode 100644
index 00000000000..22f8a4fa1b4
Binary files /dev/null and b/public/images/emoji/emoji_one/spy/2.png differ
diff --git a/public/images/emoji/emoji_one/spy/3.png b/public/images/emoji/emoji_one/spy/3.png
new file mode 100644
index 00000000000..028d6d8e162
Binary files /dev/null and b/public/images/emoji/emoji_one/spy/3.png differ
diff --git a/public/images/emoji/emoji_one/spy/4.png b/public/images/emoji/emoji_one/spy/4.png
new file mode 100644
index 00000000000..467e372e512
Binary files /dev/null and b/public/images/emoji/emoji_one/spy/4.png differ
diff --git a/public/images/emoji/emoji_one/spy/5.png b/public/images/emoji/emoji_one/spy/5.png
new file mode 100644
index 00000000000..69c952c3b7b
Binary files /dev/null and b/public/images/emoji/emoji_one/spy/5.png differ
diff --git a/public/images/emoji/emoji_one/spy/6.png b/public/images/emoji/emoji_one/spy/6.png
new file mode 100644
index 00000000000..3caf1bcfc88
Binary files /dev/null and b/public/images/emoji/emoji_one/spy/6.png differ
diff --git a/public/images/emoji/emoji_one/squid.png b/public/images/emoji/emoji_one/squid.png
new file mode 100644
index 00000000000..b1a0a0a30e4
Binary files /dev/null and b/public/images/emoji/emoji_one/squid.png differ
diff --git a/public/images/emoji/emoji_one/sri_lanka.png b/public/images/emoji/emoji_one/sri_lanka.png
new file mode 100644
index 00000000000..f15b9be56dd
Binary files /dev/null and b/public/images/emoji/emoji_one/sri_lanka.png differ
diff --git a/public/images/emoji/emoji_one/st_barthelemy.png b/public/images/emoji/emoji_one/st_barthelemy.png
new file mode 100644
index 00000000000..e213bf7e406
Binary files /dev/null and b/public/images/emoji/emoji_one/st_barthelemy.png differ
diff --git a/public/images/emoji/emoji_one/st_helena.png b/public/images/emoji/emoji_one/st_helena.png
new file mode 100644
index 00000000000..90fefd0cab2
Binary files /dev/null and b/public/images/emoji/emoji_one/st_helena.png differ
diff --git a/public/images/emoji/emoji_one/st_kitts_nevis.png b/public/images/emoji/emoji_one/st_kitts_nevis.png
new file mode 100644
index 00000000000..d7686f8b603
Binary files /dev/null and b/public/images/emoji/emoji_one/st_kitts_nevis.png differ
diff --git a/public/images/emoji/emoji_one/st_lucia.png b/public/images/emoji/emoji_one/st_lucia.png
new file mode 100644
index 00000000000..92eafffe947
Binary files /dev/null and b/public/images/emoji/emoji_one/st_lucia.png differ
diff --git a/public/images/emoji/emoji_one/st_martin.png b/public/images/emoji/emoji_one/st_martin.png
new file mode 100644
index 00000000000..7943b73f671
Binary files /dev/null and b/public/images/emoji/emoji_one/st_martin.png differ
diff --git a/public/images/emoji/emoji_one/st_pierre_miquelon.png b/public/images/emoji/emoji_one/st_pierre_miquelon.png
new file mode 100644
index 00000000000..b05828b47cb
Binary files /dev/null and b/public/images/emoji/emoji_one/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/emoji_one/st_vincent_grenadines.png b/public/images/emoji/emoji_one/st_vincent_grenadines.png
new file mode 100644
index 00000000000..ddfd25fd227
Binary files /dev/null and b/public/images/emoji/emoji_one/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/emoji_one/stadium.png b/public/images/emoji/emoji_one/stadium.png
index e1a45f0b984..bc75521171e 100644
Binary files a/public/images/emoji/emoji_one/stadium.png and b/public/images/emoji/emoji_one/stadium.png differ
diff --git a/public/images/emoji/emoji_one/star.png b/public/images/emoji/emoji_one/star.png
index 6af620098ff..f5791a931d4 100644
Binary files a/public/images/emoji/emoji_one/star.png and b/public/images/emoji/emoji_one/star.png differ
diff --git a/public/images/emoji/emoji_one/star2.png b/public/images/emoji/emoji_one/star2.png
index e7b4194d787..223b2a0f94c 100644
Binary files a/public/images/emoji/emoji_one/star2.png and b/public/images/emoji/emoji_one/star2.png differ
diff --git a/public/images/emoji/emoji_one/star_and_crescent.png b/public/images/emoji/emoji_one/star_and_crescent.png
index a00bc5b19a3..f566b96f2ce 100644
Binary files a/public/images/emoji/emoji_one/star_and_crescent.png and b/public/images/emoji/emoji_one/star_and_crescent.png differ
diff --git a/public/images/emoji/emoji_one/star_of_david.png b/public/images/emoji/emoji_one/star_of_david.png
index f1f8b67e9b7..e88bf4b834f 100644
Binary files a/public/images/emoji/emoji_one/star_of_david.png and b/public/images/emoji/emoji_one/star_of_david.png differ
diff --git a/public/images/emoji/emoji_one/star_struck.png b/public/images/emoji/emoji_one/star_struck.png
new file mode 100644
index 00000000000..6b11651cd2c
Binary files /dev/null and b/public/images/emoji/emoji_one/star_struck.png differ
diff --git a/public/images/emoji/emoji_one/stars.png b/public/images/emoji/emoji_one/stars.png
index 3435cd7119a..dc9ad1ffbe4 100644
Binary files a/public/images/emoji/emoji_one/stars.png and b/public/images/emoji/emoji_one/stars.png differ
diff --git a/public/images/emoji/emoji_one/station.png b/public/images/emoji/emoji_one/station.png
index 1b078825299..0cd5a8a3c7c 100644
Binary files a/public/images/emoji/emoji_one/station.png and b/public/images/emoji/emoji_one/station.png differ
diff --git a/public/images/emoji/emoji_one/statue_of_liberty.png b/public/images/emoji/emoji_one/statue_of_liberty.png
index 488c70779ce..5ffef3c0dca 100644
Binary files a/public/images/emoji/emoji_one/statue_of_liberty.png and b/public/images/emoji/emoji_one/statue_of_liberty.png differ
diff --git a/public/images/emoji/emoji_one/steam_locomotive.png b/public/images/emoji/emoji_one/steam_locomotive.png
index 1617cf348ac..3ac96bb5429 100644
Binary files a/public/images/emoji/emoji_one/steam_locomotive.png and b/public/images/emoji/emoji_one/steam_locomotive.png differ
diff --git a/public/images/emoji/emoji_one/stew.png b/public/images/emoji/emoji_one/stew.png
index e5f8f89e9af..4d273302d62 100644
Binary files a/public/images/emoji/emoji_one/stew.png and b/public/images/emoji/emoji_one/stew.png differ
diff --git a/public/images/emoji/emoji_one/stop_button.png b/public/images/emoji/emoji_one/stop_button.png
index b24d962369b..9f080595ac8 100644
Binary files a/public/images/emoji/emoji_one/stop_button.png and b/public/images/emoji/emoji_one/stop_button.png differ
diff --git a/public/images/emoji/emoji_one/stop_sign.png b/public/images/emoji/emoji_one/stop_sign.png
new file mode 100644
index 00000000000..b002e1e5797
Binary files /dev/null and b/public/images/emoji/emoji_one/stop_sign.png differ
diff --git a/public/images/emoji/emoji_one/stopwatch.png b/public/images/emoji/emoji_one/stopwatch.png
index c52ceec6d44..61eba597e31 100644
Binary files a/public/images/emoji/emoji_one/stopwatch.png and b/public/images/emoji/emoji_one/stopwatch.png differ
diff --git a/public/images/emoji/emoji_one/straight_ruler.png b/public/images/emoji/emoji_one/straight_ruler.png
index d014058c88d..a4aa603f840 100644
Binary files a/public/images/emoji/emoji_one/straight_ruler.png and b/public/images/emoji/emoji_one/straight_ruler.png differ
diff --git a/public/images/emoji/emoji_one/strawberry.png b/public/images/emoji/emoji_one/strawberry.png
index 8bac8aa8b70..cab98ebddba 100644
Binary files a/public/images/emoji/emoji_one/strawberry.png and b/public/images/emoji/emoji_one/strawberry.png differ
diff --git a/public/images/emoji/emoji_one/stuck_out_tongue.png b/public/images/emoji/emoji_one/stuck_out_tongue.png
index a4db2c08ba2..85b042cb2b9 100644
Binary files a/public/images/emoji/emoji_one/stuck_out_tongue.png and b/public/images/emoji/emoji_one/stuck_out_tongue.png differ
diff --git a/public/images/emoji/emoji_one/stuck_out_tongue_closed_eyes.png b/public/images/emoji/emoji_one/stuck_out_tongue_closed_eyes.png
index ccac72048da..98430e5eac4 100644
Binary files a/public/images/emoji/emoji_one/stuck_out_tongue_closed_eyes.png and b/public/images/emoji/emoji_one/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/emoji_one/stuck_out_tongue_winking_eye.png b/public/images/emoji/emoji_one/stuck_out_tongue_winking_eye.png
index 9b32aedf2ae..cf7d7d1b9a0 100644
Binary files a/public/images/emoji/emoji_one/stuck_out_tongue_winking_eye.png and b/public/images/emoji/emoji_one/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/emoji_one/studio_microphone.png b/public/images/emoji/emoji_one/studio_microphone.png
index 807d3bac9bb..4a10c14e1d4 100644
Binary files a/public/images/emoji/emoji_one/studio_microphone.png and b/public/images/emoji/emoji_one/studio_microphone.png differ
diff --git a/public/images/emoji/emoji_one/stuffed_flatbread.png b/public/images/emoji/emoji_one/stuffed_flatbread.png
new file mode 100644
index 00000000000..8c4b6a08bdb
Binary files /dev/null and b/public/images/emoji/emoji_one/stuffed_flatbread.png differ
diff --git a/public/images/emoji/emoji_one/sudan.png b/public/images/emoji/emoji_one/sudan.png
new file mode 100644
index 00000000000..3974a07328c
Binary files /dev/null and b/public/images/emoji/emoji_one/sudan.png differ
diff --git a/public/images/emoji/emoji_one/sun_behind_large_cloud.png b/public/images/emoji/emoji_one/sun_behind_large_cloud.png
new file mode 100644
index 00000000000..e8b9220a8a1
Binary files /dev/null and b/public/images/emoji/emoji_one/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/emoji_one/sun_behind_rain_cloud.png b/public/images/emoji/emoji_one/sun_behind_rain_cloud.png
new file mode 100644
index 00000000000..67907abd2f6
Binary files /dev/null and b/public/images/emoji/emoji_one/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/emoji_one/sun_behind_small_cloud.png b/public/images/emoji/emoji_one/sun_behind_small_cloud.png
new file mode 100644
index 00000000000..ea5d830e96b
Binary files /dev/null and b/public/images/emoji/emoji_one/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/emoji_one/sun_with_face.png b/public/images/emoji/emoji_one/sun_with_face.png
index 3a9eab8dc92..0e10b41c2e0 100644
Binary files a/public/images/emoji/emoji_one/sun_with_face.png and b/public/images/emoji/emoji_one/sun_with_face.png differ
diff --git a/public/images/emoji/emoji_one/sunflower.png b/public/images/emoji/emoji_one/sunflower.png
index 2198a7c3069..13913edaca5 100644
Binary files a/public/images/emoji/emoji_one/sunflower.png and b/public/images/emoji/emoji_one/sunflower.png differ
diff --git a/public/images/emoji/emoji_one/sunglasses.png b/public/images/emoji/emoji_one/sunglasses.png
index 7fb7881bdaa..92cff83415e 100644
Binary files a/public/images/emoji/emoji_one/sunglasses.png and b/public/images/emoji/emoji_one/sunglasses.png differ
diff --git a/public/images/emoji/emoji_one/sunny.png b/public/images/emoji/emoji_one/sunny.png
index c3091a74d1a..7b7b33a7a77 100644
Binary files a/public/images/emoji/emoji_one/sunny.png and b/public/images/emoji/emoji_one/sunny.png differ
diff --git a/public/images/emoji/emoji_one/sunrise.png b/public/images/emoji/emoji_one/sunrise.png
index a7b5118f802..1942ac28716 100644
Binary files a/public/images/emoji/emoji_one/sunrise.png and b/public/images/emoji/emoji_one/sunrise.png differ
diff --git a/public/images/emoji/emoji_one/sunrise_over_mountains.png b/public/images/emoji/emoji_one/sunrise_over_mountains.png
index db68afdce8a..fc2bde0e252 100644
Binary files a/public/images/emoji/emoji_one/sunrise_over_mountains.png and b/public/images/emoji/emoji_one/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/emoji_one/surfer.png b/public/images/emoji/emoji_one/surfer.png
index 51ee0c0f29b..51a39cfd49d 100644
Binary files a/public/images/emoji/emoji_one/surfer.png and b/public/images/emoji/emoji_one/surfer.png differ
diff --git a/public/images/emoji/emoji_one/surfer/2.png b/public/images/emoji/emoji_one/surfer/2.png
new file mode 100644
index 00000000000..9bc980175f8
Binary files /dev/null and b/public/images/emoji/emoji_one/surfer/2.png differ
diff --git a/public/images/emoji/emoji_one/surfer/3.png b/public/images/emoji/emoji_one/surfer/3.png
new file mode 100644
index 00000000000..dd14853d955
Binary files /dev/null and b/public/images/emoji/emoji_one/surfer/3.png differ
diff --git a/public/images/emoji/emoji_one/surfer/4.png b/public/images/emoji/emoji_one/surfer/4.png
new file mode 100644
index 00000000000..79a42b2c091
Binary files /dev/null and b/public/images/emoji/emoji_one/surfer/4.png differ
diff --git a/public/images/emoji/emoji_one/surfer/5.png b/public/images/emoji/emoji_one/surfer/5.png
new file mode 100644
index 00000000000..5e92807f3a0
Binary files /dev/null and b/public/images/emoji/emoji_one/surfer/5.png differ
diff --git a/public/images/emoji/emoji_one/surfer/6.png b/public/images/emoji/emoji_one/surfer/6.png
new file mode 100644
index 00000000000..c86606c7aff
Binary files /dev/null and b/public/images/emoji/emoji_one/surfer/6.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man.png b/public/images/emoji/emoji_one/surfing_man.png
new file mode 100644
index 00000000000..51a39cfd49d
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_man.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man/2.png b/public/images/emoji/emoji_one/surfing_man/2.png
new file mode 100644
index 00000000000..9bc980175f8
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_man/2.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man/3.png b/public/images/emoji/emoji_one/surfing_man/3.png
new file mode 100644
index 00000000000..dd14853d955
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_man/3.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man/4.png b/public/images/emoji/emoji_one/surfing_man/4.png
new file mode 100644
index 00000000000..79a42b2c091
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_man/4.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man/5.png b/public/images/emoji/emoji_one/surfing_man/5.png
new file mode 100644
index 00000000000..5e92807f3a0
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_man/5.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man/6.png b/public/images/emoji/emoji_one/surfing_man/6.png
new file mode 100644
index 00000000000..c86606c7aff
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_man/6.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman.png b/public/images/emoji/emoji_one/surfing_woman.png
new file mode 100644
index 00000000000..90c105ee7c5
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_woman.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman/2.png b/public/images/emoji/emoji_one/surfing_woman/2.png
new file mode 100644
index 00000000000..0716646d8b4
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman/3.png b/public/images/emoji/emoji_one/surfing_woman/3.png
new file mode 100644
index 00000000000..45b13a495be
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman/4.png b/public/images/emoji/emoji_one/surfing_woman/4.png
new file mode 100644
index 00000000000..16440a8ccc4
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman/5.png b/public/images/emoji/emoji_one/surfing_woman/5.png
new file mode 100644
index 00000000000..062adee4ea6
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman/6.png b/public/images/emoji/emoji_one/surfing_woman/6.png
new file mode 100644
index 00000000000..d822aa163f6
Binary files /dev/null and b/public/images/emoji/emoji_one/surfing_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/suriname.png b/public/images/emoji/emoji_one/suriname.png
new file mode 100644
index 00000000000..48afc4adac5
Binary files /dev/null and b/public/images/emoji/emoji_one/suriname.png differ
diff --git a/public/images/emoji/emoji_one/sushi.png b/public/images/emoji/emoji_one/sushi.png
index 4db4fde6f1e..86bf8f2dce1 100644
Binary files a/public/images/emoji/emoji_one/sushi.png and b/public/images/emoji/emoji_one/sushi.png differ
diff --git a/public/images/emoji/emoji_one/sushing_face.png b/public/images/emoji/emoji_one/sushing_face.png
new file mode 100644
index 00000000000..85d7e1446a6
Binary files /dev/null and b/public/images/emoji/emoji_one/sushing_face.png differ
diff --git a/public/images/emoji/emoji_one/suspension_railway.png b/public/images/emoji/emoji_one/suspension_railway.png
index 2faa0ec20c1..c98bc888c1e 100644
Binary files a/public/images/emoji/emoji_one/suspension_railway.png and b/public/images/emoji/emoji_one/suspension_railway.png differ
diff --git a/public/images/emoji/emoji_one/svalbard_and_jan_mayen.png b/public/images/emoji/emoji_one/svalbard_and_jan_mayen.png
new file mode 100644
index 00000000000..004a11d8308
Binary files /dev/null and b/public/images/emoji/emoji_one/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/emoji_one/swaziland.png b/public/images/emoji/emoji_one/swaziland.png
new file mode 100644
index 00000000000..fb5ee97ba24
Binary files /dev/null and b/public/images/emoji/emoji_one/swaziland.png differ
diff --git a/public/images/emoji/emoji_one/sweat.png b/public/images/emoji/emoji_one/sweat.png
index 2f115f599e3..8f37bd3bca1 100644
Binary files a/public/images/emoji/emoji_one/sweat.png and b/public/images/emoji/emoji_one/sweat.png differ
diff --git a/public/images/emoji/emoji_one/sweat_drops.png b/public/images/emoji/emoji_one/sweat_drops.png
index 35c665b7e9f..d4877b2f18e 100644
Binary files a/public/images/emoji/emoji_one/sweat_drops.png and b/public/images/emoji/emoji_one/sweat_drops.png differ
diff --git a/public/images/emoji/emoji_one/sweat_smile.png b/public/images/emoji/emoji_one/sweat_smile.png
index 21a207cfb8f..065b60b3f83 100644
Binary files a/public/images/emoji/emoji_one/sweat_smile.png and b/public/images/emoji/emoji_one/sweat_smile.png differ
diff --git a/public/images/emoji/emoji_one/sweden.png b/public/images/emoji/emoji_one/sweden.png
new file mode 100644
index 00000000000..3b46fe18abc
Binary files /dev/null and b/public/images/emoji/emoji_one/sweden.png differ
diff --git a/public/images/emoji/emoji_one/sweet_potato.png b/public/images/emoji/emoji_one/sweet_potato.png
index 07f5000098b..558361732c0 100644
Binary files a/public/images/emoji/emoji_one/sweet_potato.png and b/public/images/emoji/emoji_one/sweet_potato.png differ
diff --git a/public/images/emoji/emoji_one/swimmer.png b/public/images/emoji/emoji_one/swimmer.png
index 2ea06214ded..9c4bd048e42 100644
Binary files a/public/images/emoji/emoji_one/swimmer.png and b/public/images/emoji/emoji_one/swimmer.png differ
diff --git a/public/images/emoji/emoji_one/swimmer/2.png b/public/images/emoji/emoji_one/swimmer/2.png
new file mode 100644
index 00000000000..76acd61bccb
Binary files /dev/null and b/public/images/emoji/emoji_one/swimmer/2.png differ
diff --git a/public/images/emoji/emoji_one/swimmer/3.png b/public/images/emoji/emoji_one/swimmer/3.png
new file mode 100644
index 00000000000..4e71d938b89
Binary files /dev/null and b/public/images/emoji/emoji_one/swimmer/3.png differ
diff --git a/public/images/emoji/emoji_one/swimmer/4.png b/public/images/emoji/emoji_one/swimmer/4.png
new file mode 100644
index 00000000000..7f1979a7f53
Binary files /dev/null and b/public/images/emoji/emoji_one/swimmer/4.png differ
diff --git a/public/images/emoji/emoji_one/swimmer/5.png b/public/images/emoji/emoji_one/swimmer/5.png
new file mode 100644
index 00000000000..3e0c791a76e
Binary files /dev/null and b/public/images/emoji/emoji_one/swimmer/5.png differ
diff --git a/public/images/emoji/emoji_one/swimmer/6.png b/public/images/emoji/emoji_one/swimmer/6.png
new file mode 100644
index 00000000000..5b4d808e4e4
Binary files /dev/null and b/public/images/emoji/emoji_one/swimmer/6.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man.png b/public/images/emoji/emoji_one/swimming_man.png
new file mode 100644
index 00000000000..9c4bd048e42
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_man.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man/2.png b/public/images/emoji/emoji_one/swimming_man/2.png
new file mode 100644
index 00000000000..76acd61bccb
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_man/2.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man/3.png b/public/images/emoji/emoji_one/swimming_man/3.png
new file mode 100644
index 00000000000..4e71d938b89
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_man/3.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man/4.png b/public/images/emoji/emoji_one/swimming_man/4.png
new file mode 100644
index 00000000000..7f1979a7f53
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_man/4.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man/5.png b/public/images/emoji/emoji_one/swimming_man/5.png
new file mode 100644
index 00000000000..3e0c791a76e
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_man/5.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man/6.png b/public/images/emoji/emoji_one/swimming_man/6.png
new file mode 100644
index 00000000000..5b4d808e4e4
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_man/6.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman.png b/public/images/emoji/emoji_one/swimming_woman.png
new file mode 100644
index 00000000000..bd0260332f0
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_woman.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman/2.png b/public/images/emoji/emoji_one/swimming_woman/2.png
new file mode 100644
index 00000000000..363e81e496d
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman/3.png b/public/images/emoji/emoji_one/swimming_woman/3.png
new file mode 100644
index 00000000000..03dd5f3e09c
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman/4.png b/public/images/emoji/emoji_one/swimming_woman/4.png
new file mode 100644
index 00000000000..63d057378f4
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman/5.png b/public/images/emoji/emoji_one/swimming_woman/5.png
new file mode 100644
index 00000000000..c4dfaacff1d
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman/6.png b/public/images/emoji/emoji_one/swimming_woman/6.png
new file mode 100644
index 00000000000..269aaf0f02f
Binary files /dev/null and b/public/images/emoji/emoji_one/swimming_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/switzerland.png b/public/images/emoji/emoji_one/switzerland.png
new file mode 100644
index 00000000000..e0caa61ba63
Binary files /dev/null and b/public/images/emoji/emoji_one/switzerland.png differ
diff --git a/public/images/emoji/emoji_one/symbols.png b/public/images/emoji/emoji_one/symbols.png
index 24693dc49e5..3008cec1161 100644
Binary files a/public/images/emoji/emoji_one/symbols.png and b/public/images/emoji/emoji_one/symbols.png differ
diff --git a/public/images/emoji/emoji_one/synagogue.png b/public/images/emoji/emoji_one/synagogue.png
index 0aeec7a5deb..c69febdeb5c 100644
Binary files a/public/images/emoji/emoji_one/synagogue.png and b/public/images/emoji/emoji_one/synagogue.png differ
diff --git a/public/images/emoji/emoji_one/syria.png b/public/images/emoji/emoji_one/syria.png
new file mode 100644
index 00000000000..53606f3e075
Binary files /dev/null and b/public/images/emoji/emoji_one/syria.png differ
diff --git a/public/images/emoji/emoji_one/syringe.png b/public/images/emoji/emoji_one/syringe.png
index 5d163a8f9c7..2b61c4bff4f 100644
Binary files a/public/images/emoji/emoji_one/syringe.png and b/public/images/emoji/emoji_one/syringe.png differ
diff --git a/public/images/emoji/emoji_one/t_rex.png b/public/images/emoji/emoji_one/t_rex.png
new file mode 100644
index 00000000000..324f744909b
Binary files /dev/null and b/public/images/emoji/emoji_one/t_rex.png differ
diff --git a/public/images/emoji/emoji_one/table_tennis.png b/public/images/emoji/emoji_one/table_tennis.png
index 057c1dbcd03..ecdefb3dc8a 100644
Binary files a/public/images/emoji/emoji_one/table_tennis.png and b/public/images/emoji/emoji_one/table_tennis.png differ
diff --git a/public/images/emoji/emoji_one/taco.png b/public/images/emoji/emoji_one/taco.png
index 71efba83ad6..86e148a72e6 100644
Binary files a/public/images/emoji/emoji_one/taco.png and b/public/images/emoji/emoji_one/taco.png differ
diff --git a/public/images/emoji/emoji_one/tada.png b/public/images/emoji/emoji_one/tada.png
index 35e4a5e0daa..e1cb93cef8b 100644
Binary files a/public/images/emoji/emoji_one/tada.png and b/public/images/emoji/emoji_one/tada.png differ
diff --git a/public/images/emoji/emoji_one/taiwan.png b/public/images/emoji/emoji_one/taiwan.png
new file mode 100644
index 00000000000..dde348b40da
Binary files /dev/null and b/public/images/emoji/emoji_one/taiwan.png differ
diff --git a/public/images/emoji/emoji_one/tajikistan.png b/public/images/emoji/emoji_one/tajikistan.png
new file mode 100644
index 00000000000..7b3697952d5
Binary files /dev/null and b/public/images/emoji/emoji_one/tajikistan.png differ
diff --git a/public/images/emoji/emoji_one/takeout_box.png b/public/images/emoji/emoji_one/takeout_box.png
new file mode 100644
index 00000000000..a50b71ed126
Binary files /dev/null and b/public/images/emoji/emoji_one/takeout_box.png differ
diff --git a/public/images/emoji/emoji_one/tanabata_tree.png b/public/images/emoji/emoji_one/tanabata_tree.png
index 74e1d13dea7..5d6b814de13 100644
Binary files a/public/images/emoji/emoji_one/tanabata_tree.png and b/public/images/emoji/emoji_one/tanabata_tree.png differ
diff --git a/public/images/emoji/emoji_one/tangerine.png b/public/images/emoji/emoji_one/tangerine.png
index add423a82dd..c1d75582576 100644
Binary files a/public/images/emoji/emoji_one/tangerine.png and b/public/images/emoji/emoji_one/tangerine.png differ
diff --git a/public/images/emoji/emoji_one/tanzania.png b/public/images/emoji/emoji_one/tanzania.png
new file mode 100644
index 00000000000..d4026fea320
Binary files /dev/null and b/public/images/emoji/emoji_one/tanzania.png differ
diff --git a/public/images/emoji/emoji_one/taurus.png b/public/images/emoji/emoji_one/taurus.png
index ca8437ad0e4..dad59ea4931 100644
Binary files a/public/images/emoji/emoji_one/taurus.png and b/public/images/emoji/emoji_one/taurus.png differ
diff --git a/public/images/emoji/emoji_one/taxi.png b/public/images/emoji/emoji_one/taxi.png
index 5e9456921fa..d3626b47019 100644
Binary files a/public/images/emoji/emoji_one/taxi.png and b/public/images/emoji/emoji_one/taxi.png differ
diff --git a/public/images/emoji/emoji_one/tea.png b/public/images/emoji/emoji_one/tea.png
index 99515934efa..cffd1533aef 100644
Binary files a/public/images/emoji/emoji_one/tea.png and b/public/images/emoji/emoji_one/tea.png differ
diff --git a/public/images/emoji/emoji_one/telephone.png b/public/images/emoji/emoji_one/telephone.png
index c9fa2f37536..41071e58049 100644
Binary files a/public/images/emoji/emoji_one/telephone.png and b/public/images/emoji/emoji_one/telephone.png differ
diff --git a/public/images/emoji/emoji_one/telephone_receiver.png b/public/images/emoji/emoji_one/telephone_receiver.png
index 468fe1d5efe..f157a3320fd 100644
Binary files a/public/images/emoji/emoji_one/telephone_receiver.png and b/public/images/emoji/emoji_one/telephone_receiver.png differ
diff --git a/public/images/emoji/emoji_one/telescope.png b/public/images/emoji/emoji_one/telescope.png
index ad05516da8a..e2b401d6655 100644
Binary files a/public/images/emoji/emoji_one/telescope.png and b/public/images/emoji/emoji_one/telescope.png differ
diff --git a/public/images/emoji/emoji_one/ten.png b/public/images/emoji/emoji_one/ten.png
index c1ec395ca08..c700426ad46 100644
Binary files a/public/images/emoji/emoji_one/ten.png and b/public/images/emoji/emoji_one/ten.png differ
diff --git a/public/images/emoji/emoji_one/tennis.png b/public/images/emoji/emoji_one/tennis.png
index f9ca8c5c1c5..7d23bbc9643 100644
Binary files a/public/images/emoji/emoji_one/tennis.png and b/public/images/emoji/emoji_one/tennis.png differ
diff --git a/public/images/emoji/emoji_one/tent.png b/public/images/emoji/emoji_one/tent.png
index 95b8e473909..a8d553ecc27 100644
Binary files a/public/images/emoji/emoji_one/tent.png and b/public/images/emoji/emoji_one/tent.png differ
diff --git a/public/images/emoji/emoji_one/thailand.png b/public/images/emoji/emoji_one/thailand.png
new file mode 100644
index 00000000000..81499f16168
Binary files /dev/null and b/public/images/emoji/emoji_one/thailand.png differ
diff --git a/public/images/emoji/emoji_one/thermometer.png b/public/images/emoji/emoji_one/thermometer.png
index f71af59c0e6..f2eb04df3dc 100644
Binary files a/public/images/emoji/emoji_one/thermometer.png and b/public/images/emoji/emoji_one/thermometer.png differ
diff --git a/public/images/emoji/emoji_one/thermometer_face.png b/public/images/emoji/emoji_one/thermometer_face.png
index 9722ff8212d..abfed8eb566 100644
Binary files a/public/images/emoji/emoji_one/thermometer_face.png and b/public/images/emoji/emoji_one/thermometer_face.png differ
diff --git a/public/images/emoji/emoji_one/thinking.png b/public/images/emoji/emoji_one/thinking.png
index f174f7ca299..110c4e2fba1 100644
Binary files a/public/images/emoji/emoji_one/thinking.png and b/public/images/emoji/emoji_one/thinking.png differ
diff --git a/public/images/emoji/emoji_one/thinking_face.png b/public/images/emoji/emoji_one/thinking_face.png
index f174f7ca299..110c4e2fba1 100644
Binary files a/public/images/emoji/emoji_one/thinking_face.png and b/public/images/emoji/emoji_one/thinking_face.png differ
diff --git a/public/images/emoji/emoji_one/thought_balloon.png b/public/images/emoji/emoji_one/thought_balloon.png
index 0eceaa4d1c4..602c778131c 100644
Binary files a/public/images/emoji/emoji_one/thought_balloon.png and b/public/images/emoji/emoji_one/thought_balloon.png differ
diff --git a/public/images/emoji/emoji_one/three.png b/public/images/emoji/emoji_one/three.png
index f0ba2b4db50..65d767df9d0 100644
Binary files a/public/images/emoji/emoji_one/three.png and b/public/images/emoji/emoji_one/three.png differ
diff --git a/public/images/emoji/emoji_one/three_button_mouse.png b/public/images/emoji/emoji_one/three_button_mouse.png
index b03f1583b9e..0e9dfa8326a 100644
Binary files a/public/images/emoji/emoji_one/three_button_mouse.png and b/public/images/emoji/emoji_one/three_button_mouse.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown.png b/public/images/emoji/emoji_one/thumbsdown.png
index c8e3213e3a2..609e8256180 100644
Binary files a/public/images/emoji/emoji_one/thumbsdown.png and b/public/images/emoji/emoji_one/thumbsdown.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown/2.png b/public/images/emoji/emoji_one/thumbsdown/2.png
new file mode 100644
index 00000000000..322c518f756
Binary files /dev/null and b/public/images/emoji/emoji_one/thumbsdown/2.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown/3.png b/public/images/emoji/emoji_one/thumbsdown/3.png
new file mode 100644
index 00000000000..0c7a4ca2ce7
Binary files /dev/null and b/public/images/emoji/emoji_one/thumbsdown/3.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown/4.png b/public/images/emoji/emoji_one/thumbsdown/4.png
new file mode 100644
index 00000000000..97347643042
Binary files /dev/null and b/public/images/emoji/emoji_one/thumbsdown/4.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown/5.png b/public/images/emoji/emoji_one/thumbsdown/5.png
new file mode 100644
index 00000000000..39e2360bf9c
Binary files /dev/null and b/public/images/emoji/emoji_one/thumbsdown/5.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown/6.png b/public/images/emoji/emoji_one/thumbsdown/6.png
new file mode 100644
index 00000000000..cb21abb2dc6
Binary files /dev/null and b/public/images/emoji/emoji_one/thumbsdown/6.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup.png b/public/images/emoji/emoji_one/thumbsup.png
index 8cb59b1cfe7..76e9adb1537 100644
Binary files a/public/images/emoji/emoji_one/thumbsup.png and b/public/images/emoji/emoji_one/thumbsup.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup/2.png b/public/images/emoji/emoji_one/thumbsup/2.png
new file mode 100644
index 00000000000..411f6e0da83
Binary files /dev/null and b/public/images/emoji/emoji_one/thumbsup/2.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup/3.png b/public/images/emoji/emoji_one/thumbsup/3.png
new file mode 100644
index 00000000000..2b6cb704474
Binary files /dev/null and b/public/images/emoji/emoji_one/thumbsup/3.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup/4.png b/public/images/emoji/emoji_one/thumbsup/4.png
new file mode 100644
index 00000000000..385abbf4def
Binary files /dev/null and b/public/images/emoji/emoji_one/thumbsup/4.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup/5.png b/public/images/emoji/emoji_one/thumbsup/5.png
new file mode 100644
index 00000000000..36bca309c91
Binary files /dev/null and b/public/images/emoji/emoji_one/thumbsup/5.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup/6.png b/public/images/emoji/emoji_one/thumbsup/6.png
new file mode 100644
index 00000000000..2d9460c9499
Binary files /dev/null and b/public/images/emoji/emoji_one/thumbsup/6.png differ
diff --git a/public/images/emoji/emoji_one/thunder_cloud_and_rain.png b/public/images/emoji/emoji_one/thunder_cloud_and_rain.png
index 93485b0a4f6..05610e8e13b 100644
Binary files a/public/images/emoji/emoji_one/thunder_cloud_and_rain.png and b/public/images/emoji/emoji_one/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/emoji_one/thunder_cloud_rain.png b/public/images/emoji/emoji_one/thunder_cloud_rain.png
index 93485b0a4f6..05610e8e13b 100644
Binary files a/public/images/emoji/emoji_one/thunder_cloud_rain.png and b/public/images/emoji/emoji_one/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/emoji_one/ticket.png b/public/images/emoji/emoji_one/ticket.png
index d68cb6789cf..2d5d876b6de 100644
Binary files a/public/images/emoji/emoji_one/ticket.png and b/public/images/emoji/emoji_one/ticket.png differ
diff --git a/public/images/emoji/emoji_one/tickets.png b/public/images/emoji/emoji_one/tickets.png
index 4f6a24f9705..9ab7bfc6094 100644
Binary files a/public/images/emoji/emoji_one/tickets.png and b/public/images/emoji/emoji_one/tickets.png differ
diff --git a/public/images/emoji/emoji_one/tiger.png b/public/images/emoji/emoji_one/tiger.png
index 673cbadc7e5..7ab7e8cdc46 100644
Binary files a/public/images/emoji/emoji_one/tiger.png and b/public/images/emoji/emoji_one/tiger.png differ
diff --git a/public/images/emoji/emoji_one/tiger2.png b/public/images/emoji/emoji_one/tiger2.png
index 9533a5d151c..e1ecde81806 100644
Binary files a/public/images/emoji/emoji_one/tiger2.png and b/public/images/emoji/emoji_one/tiger2.png differ
diff --git a/public/images/emoji/emoji_one/timer.png b/public/images/emoji/emoji_one/timer.png
index a8d1865189e..aac5f4a6ea9 100644
Binary files a/public/images/emoji/emoji_one/timer.png and b/public/images/emoji/emoji_one/timer.png differ
diff --git a/public/images/emoji/emoji_one/timer_clock.png b/public/images/emoji/emoji_one/timer_clock.png
index a8d1865189e..aac5f4a6ea9 100644
Binary files a/public/images/emoji/emoji_one/timer_clock.png and b/public/images/emoji/emoji_one/timer_clock.png differ
diff --git a/public/images/emoji/emoji_one/timor_leste.png b/public/images/emoji/emoji_one/timor_leste.png
new file mode 100644
index 00000000000..6706def9912
Binary files /dev/null and b/public/images/emoji/emoji_one/timor_leste.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man.png b/public/images/emoji/emoji_one/tipping_hand_man.png
new file mode 100644
index 00000000000..4d2c0b24690
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_man.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man/2.png b/public/images/emoji/emoji_one/tipping_hand_man/2.png
new file mode 100644
index 00000000000..36b06ff17a9
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man/3.png b/public/images/emoji/emoji_one/tipping_hand_man/3.png
new file mode 100644
index 00000000000..cdd549704df
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man/4.png b/public/images/emoji/emoji_one/tipping_hand_man/4.png
new file mode 100644
index 00000000000..83756971d41
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man/5.png b/public/images/emoji/emoji_one/tipping_hand_man/5.png
new file mode 100644
index 00000000000..12872ae983b
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man/6.png b/public/images/emoji/emoji_one/tipping_hand_man/6.png
new file mode 100644
index 00000000000..1d049eea242
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman.png b/public/images/emoji/emoji_one/tipping_hand_woman.png
new file mode 100644
index 00000000000..919dff8d5b6
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_woman.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman/2.png b/public/images/emoji/emoji_one/tipping_hand_woman/2.png
new file mode 100644
index 00000000000..c5ac40f6d79
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman/3.png b/public/images/emoji/emoji_one/tipping_hand_woman/3.png
new file mode 100644
index 00000000000..40d67b2e4e6
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman/4.png b/public/images/emoji/emoji_one/tipping_hand_woman/4.png
new file mode 100644
index 00000000000..28e222afc0c
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman/5.png b/public/images/emoji/emoji_one/tipping_hand_woman/5.png
new file mode 100644
index 00000000000..cf2033c7d9b
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman/6.png b/public/images/emoji/emoji_one/tipping_hand_woman/6.png
new file mode 100644
index 00000000000..2284126f875
Binary files /dev/null and b/public/images/emoji/emoji_one/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/tired_face.png b/public/images/emoji/emoji_one/tired_face.png
index 077e91d1395..9a29d60b7ba 100644
Binary files a/public/images/emoji/emoji_one/tired_face.png and b/public/images/emoji/emoji_one/tired_face.png differ
diff --git a/public/images/emoji/emoji_one/tm.png b/public/images/emoji/emoji_one/tm.png
index e8be4904a70..b8f0f252cc5 100644
Binary files a/public/images/emoji/emoji_one/tm.png and b/public/images/emoji/emoji_one/tm.png differ
diff --git a/public/images/emoji/emoji_one/togo.png b/public/images/emoji/emoji_one/togo.png
new file mode 100644
index 00000000000..7a542547e05
Binary files /dev/null and b/public/images/emoji/emoji_one/togo.png differ
diff --git a/public/images/emoji/emoji_one/toilet.png b/public/images/emoji/emoji_one/toilet.png
index 922d58d01b7..de6f836cccf 100644
Binary files a/public/images/emoji/emoji_one/toilet.png and b/public/images/emoji/emoji_one/toilet.png differ
diff --git a/public/images/emoji/emoji_one/tokelau.png b/public/images/emoji/emoji_one/tokelau.png
new file mode 100644
index 00000000000..f42f8686314
Binary files /dev/null and b/public/images/emoji/emoji_one/tokelau.png differ
diff --git a/public/images/emoji/emoji_one/tokyo_tower.png b/public/images/emoji/emoji_one/tokyo_tower.png
index 91e6e3e21a9..a47d65e9f7f 100644
Binary files a/public/images/emoji/emoji_one/tokyo_tower.png and b/public/images/emoji/emoji_one/tokyo_tower.png differ
diff --git a/public/images/emoji/emoji_one/tomato.png b/public/images/emoji/emoji_one/tomato.png
index c91633e3e0a..9b024b72028 100644
Binary files a/public/images/emoji/emoji_one/tomato.png and b/public/images/emoji/emoji_one/tomato.png differ
diff --git a/public/images/emoji/emoji_one/tonga.png b/public/images/emoji/emoji_one/tonga.png
new file mode 100644
index 00000000000..bfff80acf4d
Binary files /dev/null and b/public/images/emoji/emoji_one/tonga.png differ
diff --git a/public/images/emoji/emoji_one/tongue.png b/public/images/emoji/emoji_one/tongue.png
index ca7adc18417..11d4689e842 100644
Binary files a/public/images/emoji/emoji_one/tongue.png and b/public/images/emoji/emoji_one/tongue.png differ
diff --git a/public/images/emoji/emoji_one/tools.png b/public/images/emoji/emoji_one/tools.png
index 3ff769bdf20..9de9731f574 100644
Binary files a/public/images/emoji/emoji_one/tools.png and b/public/images/emoji/emoji_one/tools.png differ
diff --git a/public/images/emoji/emoji_one/top.png b/public/images/emoji/emoji_one/top.png
index 9d5519b6f77..7f161313fd4 100644
Binary files a/public/images/emoji/emoji_one/top.png and b/public/images/emoji/emoji_one/top.png differ
diff --git a/public/images/emoji/emoji_one/tophat.png b/public/images/emoji/emoji_one/tophat.png
index 1eff378806c..4dd53ffb1a8 100644
Binary files a/public/images/emoji/emoji_one/tophat.png and b/public/images/emoji/emoji_one/tophat.png differ
diff --git a/public/images/emoji/emoji_one/tornado.png b/public/images/emoji/emoji_one/tornado.png
new file mode 100644
index 00000000000..53591a435e5
Binary files /dev/null and b/public/images/emoji/emoji_one/tornado.png differ
diff --git a/public/images/emoji/emoji_one/tr.png b/public/images/emoji/emoji_one/tr.png
new file mode 100644
index 00000000000..3b6fc163790
Binary files /dev/null and b/public/images/emoji/emoji_one/tr.png differ
diff --git a/public/images/emoji/emoji_one/track_next.png b/public/images/emoji/emoji_one/track_next.png
index 1e6fc4c14b8..57c7a28d125 100644
Binary files a/public/images/emoji/emoji_one/track_next.png and b/public/images/emoji/emoji_one/track_next.png differ
diff --git a/public/images/emoji/emoji_one/track_previous.png b/public/images/emoji/emoji_one/track_previous.png
index e1a06c07a7c..7dd785d16c5 100644
Binary files a/public/images/emoji/emoji_one/track_previous.png and b/public/images/emoji/emoji_one/track_previous.png differ
diff --git a/public/images/emoji/emoji_one/trackball.png b/public/images/emoji/emoji_one/trackball.png
index bd675e92671..9e56373cd2d 100644
Binary files a/public/images/emoji/emoji_one/trackball.png and b/public/images/emoji/emoji_one/trackball.png differ
diff --git a/public/images/emoji/emoji_one/tractor.png b/public/images/emoji/emoji_one/tractor.png
index f145a0fd73b..eb9ec2811f2 100644
Binary files a/public/images/emoji/emoji_one/tractor.png and b/public/images/emoji/emoji_one/tractor.png differ
diff --git a/public/images/emoji/emoji_one/traffic_light.png b/public/images/emoji/emoji_one/traffic_light.png
index 8289d20b6eb..28baf0d455f 100644
Binary files a/public/images/emoji/emoji_one/traffic_light.png and b/public/images/emoji/emoji_one/traffic_light.png differ
diff --git a/public/images/emoji/emoji_one/train.png b/public/images/emoji/emoji_one/train.png
index ff5080e0ea7..711031fe441 100644
Binary files a/public/images/emoji/emoji_one/train.png and b/public/images/emoji/emoji_one/train.png differ
diff --git a/public/images/emoji/emoji_one/train2.png b/public/images/emoji/emoji_one/train2.png
index cb51d2a0f63..8e3f9b0deb4 100644
Binary files a/public/images/emoji/emoji_one/train2.png and b/public/images/emoji/emoji_one/train2.png differ
diff --git a/public/images/emoji/emoji_one/tram.png b/public/images/emoji/emoji_one/tram.png
index dd7c82b40ee..06dc800d5c2 100644
Binary files a/public/images/emoji/emoji_one/tram.png and b/public/images/emoji/emoji_one/tram.png differ
diff --git a/public/images/emoji/emoji_one/triangular_flag_on_post.png b/public/images/emoji/emoji_one/triangular_flag_on_post.png
index 5adceaac6aa..fc4a3d2ab60 100644
Binary files a/public/images/emoji/emoji_one/triangular_flag_on_post.png and b/public/images/emoji/emoji_one/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/emoji_one/triangular_ruler.png b/public/images/emoji/emoji_one/triangular_ruler.png
index d03b796cdb0..c3924998219 100644
Binary files a/public/images/emoji/emoji_one/triangular_ruler.png and b/public/images/emoji/emoji_one/triangular_ruler.png differ
diff --git a/public/images/emoji/emoji_one/trident.png b/public/images/emoji/emoji_one/trident.png
index 6c9f1c3713d..4812f82326a 100644
Binary files a/public/images/emoji/emoji_one/trident.png and b/public/images/emoji/emoji_one/trident.png differ
diff --git a/public/images/emoji/emoji_one/trinidad_tobago.png b/public/images/emoji/emoji_one/trinidad_tobago.png
new file mode 100644
index 00000000000..14355ce15f6
Binary files /dev/null and b/public/images/emoji/emoji_one/trinidad_tobago.png differ
diff --git a/public/images/emoji/emoji_one/tristan_da_cunha.png b/public/images/emoji/emoji_one/tristan_da_cunha.png
new file mode 100644
index 00000000000..dff4791d41b
Binary files /dev/null and b/public/images/emoji/emoji_one/tristan_da_cunha.png differ
diff --git a/public/images/emoji/emoji_one/triumph.png b/public/images/emoji/emoji_one/triumph.png
index b047c62ce27..02ced4c4eb1 100644
Binary files a/public/images/emoji/emoji_one/triumph.png and b/public/images/emoji/emoji_one/triumph.png differ
diff --git a/public/images/emoji/emoji_one/trolleybus.png b/public/images/emoji/emoji_one/trolleybus.png
index 79f626f5721..33c5af16dd1 100644
Binary files a/public/images/emoji/emoji_one/trolleybus.png and b/public/images/emoji/emoji_one/trolleybus.png differ
diff --git a/public/images/emoji/emoji_one/trophy.png b/public/images/emoji/emoji_one/trophy.png
index 2d20e9f8261..ec539e01411 100644
Binary files a/public/images/emoji/emoji_one/trophy.png and b/public/images/emoji/emoji_one/trophy.png differ
diff --git a/public/images/emoji/emoji_one/tropical_drink.png b/public/images/emoji/emoji_one/tropical_drink.png
index 84e243eb0b8..210e45e1b8b 100644
Binary files a/public/images/emoji/emoji_one/tropical_drink.png and b/public/images/emoji/emoji_one/tropical_drink.png differ
diff --git a/public/images/emoji/emoji_one/tropical_fish.png b/public/images/emoji/emoji_one/tropical_fish.png
index df6ac342b76..6ac8df2f732 100644
Binary files a/public/images/emoji/emoji_one/tropical_fish.png and b/public/images/emoji/emoji_one/tropical_fish.png differ
diff --git a/public/images/emoji/emoji_one/truck.png b/public/images/emoji/emoji_one/truck.png
index b7b46ab3d91..eeb215ae89b 100644
Binary files a/public/images/emoji/emoji_one/truck.png and b/public/images/emoji/emoji_one/truck.png differ
diff --git a/public/images/emoji/emoji_one/trumpet.png b/public/images/emoji/emoji_one/trumpet.png
index 2d3eb1ebde5..d63c5a33f80 100644
Binary files a/public/images/emoji/emoji_one/trumpet.png and b/public/images/emoji/emoji_one/trumpet.png differ
diff --git a/public/images/emoji/emoji_one/tshirt.png b/public/images/emoji/emoji_one/tshirt.png
new file mode 100644
index 00000000000..94681118582
Binary files /dev/null and b/public/images/emoji/emoji_one/tshirt.png differ
diff --git a/public/images/emoji/emoji_one/tulip.png b/public/images/emoji/emoji_one/tulip.png
index 73410768c12..99134eb34dd 100644
Binary files a/public/images/emoji/emoji_one/tulip.png and b/public/images/emoji/emoji_one/tulip.png differ
diff --git a/public/images/emoji/emoji_one/tumbler_glass.png b/public/images/emoji/emoji_one/tumbler_glass.png
new file mode 100644
index 00000000000..b91d26aac98
Binary files /dev/null and b/public/images/emoji/emoji_one/tumbler_glass.png differ
diff --git a/public/images/emoji/emoji_one/tunisia.png b/public/images/emoji/emoji_one/tunisia.png
new file mode 100644
index 00000000000..2691b42f09a
Binary files /dev/null and b/public/images/emoji/emoji_one/tunisia.png differ
diff --git a/public/images/emoji/emoji_one/turkey.png b/public/images/emoji/emoji_one/turkey.png
index 8fb0d06cca0..cd074b3cbbf 100644
Binary files a/public/images/emoji/emoji_one/turkey.png and b/public/images/emoji/emoji_one/turkey.png differ
diff --git a/public/images/emoji/emoji_one/turkmenistan.png b/public/images/emoji/emoji_one/turkmenistan.png
new file mode 100644
index 00000000000..a0729e2c292
Binary files /dev/null and b/public/images/emoji/emoji_one/turkmenistan.png differ
diff --git a/public/images/emoji/emoji_one/turks_caicos_islands.png b/public/images/emoji/emoji_one/turks_caicos_islands.png
new file mode 100644
index 00000000000..bb04d27666c
Binary files /dev/null and b/public/images/emoji/emoji_one/turks_caicos_islands.png differ
diff --git a/public/images/emoji/emoji_one/turtle.png b/public/images/emoji/emoji_one/turtle.png
index 96a07e8020a..9d85f55271d 100644
Binary files a/public/images/emoji/emoji_one/turtle.png and b/public/images/emoji/emoji_one/turtle.png differ
diff --git a/public/images/emoji/emoji_one/tuvalu.png b/public/images/emoji/emoji_one/tuvalu.png
new file mode 100644
index 00000000000..60fad11afce
Binary files /dev/null and b/public/images/emoji/emoji_one/tuvalu.png differ
diff --git a/public/images/emoji/emoji_one/tv.png b/public/images/emoji/emoji_one/tv.png
index 7c7514489a4..6eb47d85b35 100644
Binary files a/public/images/emoji/emoji_one/tv.png and b/public/images/emoji/emoji_one/tv.png differ
diff --git a/public/images/emoji/emoji_one/twisted_rightwards_arrows.png b/public/images/emoji/emoji_one/twisted_rightwards_arrows.png
index 7fb7093ece0..b9df7c85b76 100644
Binary files a/public/images/emoji/emoji_one/twisted_rightwards_arrows.png and b/public/images/emoji/emoji_one/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/emoji_one/two.png b/public/images/emoji/emoji_one/two.png
index 0f8b3c87e86..76388b415f2 100644
Binary files a/public/images/emoji/emoji_one/two.png and b/public/images/emoji/emoji_one/two.png differ
diff --git a/public/images/emoji/emoji_one/two_hearts.png b/public/images/emoji/emoji_one/two_hearts.png
index 5be48553004..29b4b1ad10c 100644
Binary files a/public/images/emoji/emoji_one/two_hearts.png and b/public/images/emoji/emoji_one/two_hearts.png differ
diff --git a/public/images/emoji/emoji_one/two_men_holding_hands.png b/public/images/emoji/emoji_one/two_men_holding_hands.png
index cf16b871116..3613eb310b2 100644
Binary files a/public/images/emoji/emoji_one/two_men_holding_hands.png and b/public/images/emoji/emoji_one/two_men_holding_hands.png differ
diff --git a/public/images/emoji/emoji_one/two_women_holding_hands.png b/public/images/emoji/emoji_one/two_women_holding_hands.png
index 7ed2c58dcc7..48a4621d641 100644
Binary files a/public/images/emoji/emoji_one/two_women_holding_hands.png and b/public/images/emoji/emoji_one/two_women_holding_hands.png differ
diff --git a/public/images/emoji/emoji_one/u5272.png b/public/images/emoji/emoji_one/u5272.png
index 5fdc2748352..14e8ee5ad03 100644
Binary files a/public/images/emoji/emoji_one/u5272.png and b/public/images/emoji/emoji_one/u5272.png differ
diff --git a/public/images/emoji/emoji_one/u5408.png b/public/images/emoji/emoji_one/u5408.png
index 264db681c90..7a56b072921 100644
Binary files a/public/images/emoji/emoji_one/u5408.png and b/public/images/emoji/emoji_one/u5408.png differ
diff --git a/public/images/emoji/emoji_one/u55b6.png b/public/images/emoji/emoji_one/u55b6.png
index 5547724fa04..1f0264ac8a7 100644
Binary files a/public/images/emoji/emoji_one/u55b6.png and b/public/images/emoji/emoji_one/u55b6.png differ
diff --git a/public/images/emoji/emoji_one/u6307.png b/public/images/emoji/emoji_one/u6307.png
index 3d05998e882..3fb55606e61 100644
Binary files a/public/images/emoji/emoji_one/u6307.png and b/public/images/emoji/emoji_one/u6307.png differ
diff --git a/public/images/emoji/emoji_one/u6708.png b/public/images/emoji/emoji_one/u6708.png
index 149f97e4420..c9e46e820e1 100644
Binary files a/public/images/emoji/emoji_one/u6708.png and b/public/images/emoji/emoji_one/u6708.png differ
diff --git a/public/images/emoji/emoji_one/u6709.png b/public/images/emoji/emoji_one/u6709.png
index b1fec372977..b0638a4e104 100644
Binary files a/public/images/emoji/emoji_one/u6709.png and b/public/images/emoji/emoji_one/u6709.png differ
diff --git a/public/images/emoji/emoji_one/u6e80.png b/public/images/emoji/emoji_one/u6e80.png
index a14192470f5..26a2e54e9ba 100644
Binary files a/public/images/emoji/emoji_one/u6e80.png and b/public/images/emoji/emoji_one/u6e80.png differ
diff --git a/public/images/emoji/emoji_one/u7121.png b/public/images/emoji/emoji_one/u7121.png
index b2eeb6222a6..bce7271cd04 100644
Binary files a/public/images/emoji/emoji_one/u7121.png and b/public/images/emoji/emoji_one/u7121.png differ
diff --git a/public/images/emoji/emoji_one/u7533.png b/public/images/emoji/emoji_one/u7533.png
index 968e8708596..a33b2e24066 100644
Binary files a/public/images/emoji/emoji_one/u7533.png and b/public/images/emoji/emoji_one/u7533.png differ
diff --git a/public/images/emoji/emoji_one/u7981.png b/public/images/emoji/emoji_one/u7981.png
index dcbfc1a2d0b..b62c4f4e7f0 100644
Binary files a/public/images/emoji/emoji_one/u7981.png and b/public/images/emoji/emoji_one/u7981.png differ
diff --git a/public/images/emoji/emoji_one/u7a7a.png b/public/images/emoji/emoji_one/u7a7a.png
index 650bcfc8817..a7131b0e9f1 100644
Binary files a/public/images/emoji/emoji_one/u7a7a.png and b/public/images/emoji/emoji_one/u7a7a.png differ
diff --git a/public/images/emoji/emoji_one/uganda.png b/public/images/emoji/emoji_one/uganda.png
new file mode 100644
index 00000000000..9541a9fe432
Binary files /dev/null and b/public/images/emoji/emoji_one/uganda.png differ
diff --git a/public/images/emoji/emoji_one/uk.png b/public/images/emoji/emoji_one/uk.png
new file mode 100644
index 00000000000..ad2a6622e47
Binary files /dev/null and b/public/images/emoji/emoji_one/uk.png differ
diff --git a/public/images/emoji/emoji_one/ukraine.png b/public/images/emoji/emoji_one/ukraine.png
new file mode 100644
index 00000000000..d24b4e827b0
Binary files /dev/null and b/public/images/emoji/emoji_one/ukraine.png differ
diff --git a/public/images/emoji/emoji_one/umbrella.png b/public/images/emoji/emoji_one/umbrella.png
index a86bea8dbfd..0af9e888e8b 100644
Binary files a/public/images/emoji/emoji_one/umbrella.png and b/public/images/emoji/emoji_one/umbrella.png differ
diff --git a/public/images/emoji/emoji_one/umbrella2.png b/public/images/emoji/emoji_one/umbrella2.png
index 77d9ca0ca78..009d0ece9d9 100644
Binary files a/public/images/emoji/emoji_one/umbrella2.png and b/public/images/emoji/emoji_one/umbrella2.png differ
diff --git a/public/images/emoji/emoji_one/umbrella_on_ground.png b/public/images/emoji/emoji_one/umbrella_on_ground.png
index 7fa37d2f2ed..4e2db243269 100644
Binary files a/public/images/emoji/emoji_one/umbrella_on_ground.png and b/public/images/emoji/emoji_one/umbrella_on_ground.png differ
diff --git a/public/images/emoji/emoji_one/unamused.png b/public/images/emoji/emoji_one/unamused.png
index 6457c252018..37b0970397f 100644
Binary files a/public/images/emoji/emoji_one/unamused.png and b/public/images/emoji/emoji_one/unamused.png differ
diff --git a/public/images/emoji/emoji_one/underage.png b/public/images/emoji/emoji_one/underage.png
index a9066a1691b..0b91581cdd3 100644
Binary files a/public/images/emoji/emoji_one/underage.png and b/public/images/emoji/emoji_one/underage.png differ
diff --git a/public/images/emoji/emoji_one/unicorn.png b/public/images/emoji/emoji_one/unicorn.png
index f9e16ab2ab5..9c451378803 100644
Binary files a/public/images/emoji/emoji_one/unicorn.png and b/public/images/emoji/emoji_one/unicorn.png differ
diff --git a/public/images/emoji/emoji_one/unicorn_face.png b/public/images/emoji/emoji_one/unicorn_face.png
index f9e16ab2ab5..9c451378803 100644
Binary files a/public/images/emoji/emoji_one/unicorn_face.png and b/public/images/emoji/emoji_one/unicorn_face.png differ
diff --git a/public/images/emoji/emoji_one/united_arab_emirates.png b/public/images/emoji/emoji_one/united_arab_emirates.png
new file mode 100644
index 00000000000..0aac4c4b1eb
Binary files /dev/null and b/public/images/emoji/emoji_one/united_arab_emirates.png differ
diff --git a/public/images/emoji/emoji_one/united_nations.png b/public/images/emoji/emoji_one/united_nations.png
new file mode 100644
index 00000000000..d695a5cac09
Binary files /dev/null and b/public/images/emoji/emoji_one/united_nations.png differ
diff --git a/public/images/emoji/emoji_one/unlock.png b/public/images/emoji/emoji_one/unlock.png
index bc70d78e377..0e4459b790e 100644
Binary files a/public/images/emoji/emoji_one/unlock.png and b/public/images/emoji/emoji_one/unlock.png differ
diff --git a/public/images/emoji/emoji_one/up.png b/public/images/emoji/emoji_one/up.png
index 891242e9e93..ee1b816da0d 100644
Binary files a/public/images/emoji/emoji_one/up.png and b/public/images/emoji/emoji_one/up.png differ
diff --git a/public/images/emoji/emoji_one/upside_down.png b/public/images/emoji/emoji_one/upside_down.png
index 6cfa6e75b39..79da5e1d842 100644
Binary files a/public/images/emoji/emoji_one/upside_down.png and b/public/images/emoji/emoji_one/upside_down.png differ
diff --git a/public/images/emoji/emoji_one/upside_down_face.png b/public/images/emoji/emoji_one/upside_down_face.png
index 6cfa6e75b39..79da5e1d842 100644
Binary files a/public/images/emoji/emoji_one/upside_down_face.png and b/public/images/emoji/emoji_one/upside_down_face.png differ
diff --git a/public/images/emoji/emoji_one/urn.png b/public/images/emoji/emoji_one/urn.png
index c531e105cbb..e158fa9f832 100644
Binary files a/public/images/emoji/emoji_one/urn.png and b/public/images/emoji/emoji_one/urn.png differ
diff --git a/public/images/emoji/emoji_one/uruguay.png b/public/images/emoji/emoji_one/uruguay.png
new file mode 100644
index 00000000000..8196541e261
Binary files /dev/null and b/public/images/emoji/emoji_one/uruguay.png differ
diff --git a/public/images/emoji/emoji_one/us.png b/public/images/emoji/emoji_one/us.png
index 748e2b413d7..450853eca47 100644
Binary files a/public/images/emoji/emoji_one/us.png and b/public/images/emoji/emoji_one/us.png differ
diff --git a/public/images/emoji/emoji_one/us_outlying_islands.png b/public/images/emoji/emoji_one/us_outlying_islands.png
new file mode 100644
index 00000000000..450853eca47
Binary files /dev/null and b/public/images/emoji/emoji_one/us_outlying_islands.png differ
diff --git a/public/images/emoji/emoji_one/us_virgin_islands.png b/public/images/emoji/emoji_one/us_virgin_islands.png
new file mode 100644
index 00000000000..2352c2610b8
Binary files /dev/null and b/public/images/emoji/emoji_one/us_virgin_islands.png differ
diff --git a/public/images/emoji/emoji_one/uzbekistan.png b/public/images/emoji/emoji_one/uzbekistan.png
new file mode 100644
index 00000000000..c268b7f0b2a
Binary files /dev/null and b/public/images/emoji/emoji_one/uzbekistan.png differ
diff --git a/public/images/emoji/emoji_one/v.png b/public/images/emoji/emoji_one/v.png
index 92e2f8a0af1..3f39fecaeab 100644
Binary files a/public/images/emoji/emoji_one/v.png and b/public/images/emoji/emoji_one/v.png differ
diff --git a/public/images/emoji/emoji_one/v/2.png b/public/images/emoji/emoji_one/v/2.png
new file mode 100644
index 00000000000..c4e6bd5ad23
Binary files /dev/null and b/public/images/emoji/emoji_one/v/2.png differ
diff --git a/public/images/emoji/emoji_one/v/3.png b/public/images/emoji/emoji_one/v/3.png
new file mode 100644
index 00000000000..ec80f470094
Binary files /dev/null and b/public/images/emoji/emoji_one/v/3.png differ
diff --git a/public/images/emoji/emoji_one/v/4.png b/public/images/emoji/emoji_one/v/4.png
new file mode 100644
index 00000000000..27d4353f3c3
Binary files /dev/null and b/public/images/emoji/emoji_one/v/4.png differ
diff --git a/public/images/emoji/emoji_one/v/5.png b/public/images/emoji/emoji_one/v/5.png
new file mode 100644
index 00000000000..4c22a4b85d1
Binary files /dev/null and b/public/images/emoji/emoji_one/v/5.png differ
diff --git a/public/images/emoji/emoji_one/v/6.png b/public/images/emoji/emoji_one/v/6.png
new file mode 100644
index 00000000000..e4d5d5ecb50
Binary files /dev/null and b/public/images/emoji/emoji_one/v/6.png differ
diff --git a/public/images/emoji/emoji_one/vampire.png b/public/images/emoji/emoji_one/vampire.png
new file mode 100644
index 00000000000..962288bd170
Binary files /dev/null and b/public/images/emoji/emoji_one/vampire.png differ
diff --git a/public/images/emoji/emoji_one/vampire/2.png b/public/images/emoji/emoji_one/vampire/2.png
new file mode 100644
index 00000000000..154f2b6e35a
Binary files /dev/null and b/public/images/emoji/emoji_one/vampire/2.png differ
diff --git a/public/images/emoji/emoji_one/vampire/3.png b/public/images/emoji/emoji_one/vampire/3.png
new file mode 100644
index 00000000000..540b48d887f
Binary files /dev/null and b/public/images/emoji/emoji_one/vampire/3.png differ
diff --git a/public/images/emoji/emoji_one/vampire/4.png b/public/images/emoji/emoji_one/vampire/4.png
new file mode 100644
index 00000000000..b05d3bad9ab
Binary files /dev/null and b/public/images/emoji/emoji_one/vampire/4.png differ
diff --git a/public/images/emoji/emoji_one/vampire/5.png b/public/images/emoji/emoji_one/vampire/5.png
new file mode 100644
index 00000000000..2bd9a7b71bb
Binary files /dev/null and b/public/images/emoji/emoji_one/vampire/5.png differ
diff --git a/public/images/emoji/emoji_one/vampire/6.png b/public/images/emoji/emoji_one/vampire/6.png
new file mode 100644
index 00000000000..c88f4ad73bf
Binary files /dev/null and b/public/images/emoji/emoji_one/vampire/6.png differ
diff --git a/public/images/emoji/emoji_one/vanuatu.png b/public/images/emoji/emoji_one/vanuatu.png
new file mode 100644
index 00000000000..ebf4b693156
Binary files /dev/null and b/public/images/emoji/emoji_one/vanuatu.png differ
diff --git a/public/images/emoji/emoji_one/vatican_city.png b/public/images/emoji/emoji_one/vatican_city.png
new file mode 100644
index 00000000000..a91fed8815c
Binary files /dev/null and b/public/images/emoji/emoji_one/vatican_city.png differ
diff --git a/public/images/emoji/emoji_one/venezuela.png b/public/images/emoji/emoji_one/venezuela.png
new file mode 100644
index 00000000000..e2b7cff1d89
Binary files /dev/null and b/public/images/emoji/emoji_one/venezuela.png differ
diff --git a/public/images/emoji/emoji_one/vertical_traffic_light.png b/public/images/emoji/emoji_one/vertical_traffic_light.png
index 5bf30483a62..bdfcd48cf0b 100644
Binary files a/public/images/emoji/emoji_one/vertical_traffic_light.png and b/public/images/emoji/emoji_one/vertical_traffic_light.png differ
diff --git a/public/images/emoji/emoji_one/vhs.png b/public/images/emoji/emoji_one/vhs.png
index 2e7a8e98522..a74d2e09655 100644
Binary files a/public/images/emoji/emoji_one/vhs.png and b/public/images/emoji/emoji_one/vhs.png differ
diff --git a/public/images/emoji/emoji_one/vibration_mode.png b/public/images/emoji/emoji_one/vibration_mode.png
index e5ade50f6be..eba6544fc90 100644
Binary files a/public/images/emoji/emoji_one/vibration_mode.png and b/public/images/emoji/emoji_one/vibration_mode.png differ
diff --git a/public/images/emoji/emoji_one/video_camera.png b/public/images/emoji/emoji_one/video_camera.png
index 7af1116cf7b..52c29136265 100644
Binary files a/public/images/emoji/emoji_one/video_camera.png and b/public/images/emoji/emoji_one/video_camera.png differ
diff --git a/public/images/emoji/emoji_one/video_game.png b/public/images/emoji/emoji_one/video_game.png
index b6eb5a873ce..b238fc65749 100644
Binary files a/public/images/emoji/emoji_one/video_game.png and b/public/images/emoji/emoji_one/video_game.png differ
diff --git a/public/images/emoji/emoji_one/vietnam.png b/public/images/emoji/emoji_one/vietnam.png
new file mode 100644
index 00000000000..f888ea94350
Binary files /dev/null and b/public/images/emoji/emoji_one/vietnam.png differ
diff --git a/public/images/emoji/emoji_one/violin.png b/public/images/emoji/emoji_one/violin.png
index fbdb62006ee..4437689dc74 100644
Binary files a/public/images/emoji/emoji_one/violin.png and b/public/images/emoji/emoji_one/violin.png differ
diff --git a/public/images/emoji/emoji_one/virgo.png b/public/images/emoji/emoji_one/virgo.png
index 6d39290e280..eec534b0d6a 100644
Binary files a/public/images/emoji/emoji_one/virgo.png and b/public/images/emoji/emoji_one/virgo.png differ
diff --git a/public/images/emoji/emoji_one/volcano.png b/public/images/emoji/emoji_one/volcano.png
index 0faaf12a474..d20d9c22967 100644
Binary files a/public/images/emoji/emoji_one/volcano.png and b/public/images/emoji/emoji_one/volcano.png differ
diff --git a/public/images/emoji/emoji_one/volleyball.png b/public/images/emoji/emoji_one/volleyball.png
index 56ee9494683..809a518545b 100644
Binary files a/public/images/emoji/emoji_one/volleyball.png and b/public/images/emoji/emoji_one/volleyball.png differ
diff --git a/public/images/emoji/emoji_one/vs.png b/public/images/emoji/emoji_one/vs.png
index e41b463456e..8d3c8752c78 100644
Binary files a/public/images/emoji/emoji_one/vs.png and b/public/images/emoji/emoji_one/vs.png differ
diff --git a/public/images/emoji/emoji_one/vulcan.png b/public/images/emoji/emoji_one/vulcan.png
index b22486308b3..ae4eb8eb155 100644
Binary files a/public/images/emoji/emoji_one/vulcan.png and b/public/images/emoji/emoji_one/vulcan.png differ
diff --git a/public/images/emoji/emoji_one/vulcan/2.png b/public/images/emoji/emoji_one/vulcan/2.png
new file mode 100644
index 00000000000..875852eab1e
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan/2.png differ
diff --git a/public/images/emoji/emoji_one/vulcan/3.png b/public/images/emoji/emoji_one/vulcan/3.png
new file mode 100644
index 00000000000..bb0e4d166c4
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan/3.png differ
diff --git a/public/images/emoji/emoji_one/vulcan/4.png b/public/images/emoji/emoji_one/vulcan/4.png
new file mode 100644
index 00000000000..1d0ec203036
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan/4.png differ
diff --git a/public/images/emoji/emoji_one/vulcan/5.png b/public/images/emoji/emoji_one/vulcan/5.png
new file mode 100644
index 00000000000..57671722728
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan/5.png differ
diff --git a/public/images/emoji/emoji_one/vulcan/6.png b/public/images/emoji/emoji_one/vulcan/6.png
new file mode 100644
index 00000000000..4a81388be31
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan/6.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute.png b/public/images/emoji/emoji_one/vulcan_salute.png
new file mode 100644
index 00000000000..ae4eb8eb155
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan_salute.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute/2.png b/public/images/emoji/emoji_one/vulcan_salute/2.png
new file mode 100644
index 00000000000..875852eab1e
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan_salute/2.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute/3.png b/public/images/emoji/emoji_one/vulcan_salute/3.png
new file mode 100644
index 00000000000..bb0e4d166c4
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan_salute/3.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute/4.png b/public/images/emoji/emoji_one/vulcan_salute/4.png
new file mode 100644
index 00000000000..1d0ec203036
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan_salute/4.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute/5.png b/public/images/emoji/emoji_one/vulcan_salute/5.png
new file mode 100644
index 00000000000..57671722728
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan_salute/5.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute/6.png b/public/images/emoji/emoji_one/vulcan_salute/6.png
new file mode 100644
index 00000000000..4a81388be31
Binary files /dev/null and b/public/images/emoji/emoji_one/vulcan_salute/6.png differ
diff --git a/public/images/emoji/emoji_one/walking.png b/public/images/emoji/emoji_one/walking.png
index 61f39139c9f..320f3b4d256 100644
Binary files a/public/images/emoji/emoji_one/walking.png and b/public/images/emoji/emoji_one/walking.png differ
diff --git a/public/images/emoji/emoji_one/walking/2.png b/public/images/emoji/emoji_one/walking/2.png
new file mode 100644
index 00000000000..8d6ad0d16a5
Binary files /dev/null and b/public/images/emoji/emoji_one/walking/2.png differ
diff --git a/public/images/emoji/emoji_one/walking/3.png b/public/images/emoji/emoji_one/walking/3.png
new file mode 100644
index 00000000000..4062a9da563
Binary files /dev/null and b/public/images/emoji/emoji_one/walking/3.png differ
diff --git a/public/images/emoji/emoji_one/walking/4.png b/public/images/emoji/emoji_one/walking/4.png
new file mode 100644
index 00000000000..baadb7d7194
Binary files /dev/null and b/public/images/emoji/emoji_one/walking/4.png differ
diff --git a/public/images/emoji/emoji_one/walking/5.png b/public/images/emoji/emoji_one/walking/5.png
new file mode 100644
index 00000000000..ec92544c0ae
Binary files /dev/null and b/public/images/emoji/emoji_one/walking/5.png differ
diff --git a/public/images/emoji/emoji_one/walking/6.png b/public/images/emoji/emoji_one/walking/6.png
new file mode 100644
index 00000000000..f7d50331b78
Binary files /dev/null and b/public/images/emoji/emoji_one/walking/6.png differ
diff --git a/public/images/emoji/emoji_one/walking_man.png b/public/images/emoji/emoji_one/walking_man.png
new file mode 100644
index 00000000000..320f3b4d256
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_man.png differ
diff --git a/public/images/emoji/emoji_one/walking_man/2.png b/public/images/emoji/emoji_one/walking_man/2.png
new file mode 100644
index 00000000000..8d6ad0d16a5
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_man/2.png differ
diff --git a/public/images/emoji/emoji_one/walking_man/3.png b/public/images/emoji/emoji_one/walking_man/3.png
new file mode 100644
index 00000000000..4062a9da563
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_man/3.png differ
diff --git a/public/images/emoji/emoji_one/walking_man/4.png b/public/images/emoji/emoji_one/walking_man/4.png
new file mode 100644
index 00000000000..baadb7d7194
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_man/4.png differ
diff --git a/public/images/emoji/emoji_one/walking_man/5.png b/public/images/emoji/emoji_one/walking_man/5.png
new file mode 100644
index 00000000000..ec92544c0ae
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_man/5.png differ
diff --git a/public/images/emoji/emoji_one/walking_man/6.png b/public/images/emoji/emoji_one/walking_man/6.png
new file mode 100644
index 00000000000..f7d50331b78
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_man/6.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman.png b/public/images/emoji/emoji_one/walking_woman.png
new file mode 100644
index 00000000000..4890b927ce1
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_woman.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman/2.png b/public/images/emoji/emoji_one/walking_woman/2.png
new file mode 100644
index 00000000000..9df9b8f55a9
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman/3.png b/public/images/emoji/emoji_one/walking_woman/3.png
new file mode 100644
index 00000000000..f08f7548948
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman/4.png b/public/images/emoji/emoji_one/walking_woman/4.png
new file mode 100644
index 00000000000..adb31c92374
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman/5.png b/public/images/emoji/emoji_one/walking_woman/5.png
new file mode 100644
index 00000000000..e9bf1842f85
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman/6.png b/public/images/emoji/emoji_one/walking_woman/6.png
new file mode 100644
index 00000000000..5d5c123da8e
Binary files /dev/null and b/public/images/emoji/emoji_one/walking_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/wallis_futuna.png b/public/images/emoji/emoji_one/wallis_futuna.png
new file mode 100644
index 00000000000..4672eabedba
Binary files /dev/null and b/public/images/emoji/emoji_one/wallis_futuna.png differ
diff --git a/public/images/emoji/emoji_one/waning_crescent_moon.png b/public/images/emoji/emoji_one/waning_crescent_moon.png
index 8c43032ee16..f4b4f8f1140 100644
Binary files a/public/images/emoji/emoji_one/waning_crescent_moon.png and b/public/images/emoji/emoji_one/waning_crescent_moon.png differ
diff --git a/public/images/emoji/emoji_one/waning_gibbous_moon.png b/public/images/emoji/emoji_one/waning_gibbous_moon.png
index 78f9df82f53..ce36d13b5b1 100644
Binary files a/public/images/emoji/emoji_one/waning_gibbous_moon.png and b/public/images/emoji/emoji_one/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/emoji_one/warning.png b/public/images/emoji/emoji_one/warning.png
index e47483ab253..2e1da565edc 100644
Binary files a/public/images/emoji/emoji_one/warning.png and b/public/images/emoji/emoji_one/warning.png differ
diff --git a/public/images/emoji/emoji_one/wastebasket.png b/public/images/emoji/emoji_one/wastebasket.png
index 6fc87407d50..0b2b742f17e 100644
Binary files a/public/images/emoji/emoji_one/wastebasket.png and b/public/images/emoji/emoji_one/wastebasket.png differ
diff --git a/public/images/emoji/emoji_one/watch.png b/public/images/emoji/emoji_one/watch.png
index 5d6165c4063..7aac92e9c84 100644
Binary files a/public/images/emoji/emoji_one/watch.png and b/public/images/emoji/emoji_one/watch.png differ
diff --git a/public/images/emoji/emoji_one/water_buffalo.png b/public/images/emoji/emoji_one/water_buffalo.png
index 2c2784f51c8..07f6285be4f 100644
Binary files a/public/images/emoji/emoji_one/water_buffalo.png and b/public/images/emoji/emoji_one/water_buffalo.png differ
diff --git a/public/images/emoji/emoji_one/watermelon.png b/public/images/emoji/emoji_one/watermelon.png
index ee55ee154ad..d07869ca783 100644
Binary files a/public/images/emoji/emoji_one/watermelon.png and b/public/images/emoji/emoji_one/watermelon.png differ
diff --git a/public/images/emoji/emoji_one/wave.png b/public/images/emoji/emoji_one/wave.png
index d92dd6420ef..7317379fb59 100644
Binary files a/public/images/emoji/emoji_one/wave.png and b/public/images/emoji/emoji_one/wave.png differ
diff --git a/public/images/emoji/emoji_one/wave/2.png b/public/images/emoji/emoji_one/wave/2.png
new file mode 100644
index 00000000000..0f3967e69b7
Binary files /dev/null and b/public/images/emoji/emoji_one/wave/2.png differ
diff --git a/public/images/emoji/emoji_one/wave/3.png b/public/images/emoji/emoji_one/wave/3.png
new file mode 100644
index 00000000000..c019447ad7f
Binary files /dev/null and b/public/images/emoji/emoji_one/wave/3.png differ
diff --git a/public/images/emoji/emoji_one/wave/4.png b/public/images/emoji/emoji_one/wave/4.png
new file mode 100644
index 00000000000..f0023f96630
Binary files /dev/null and b/public/images/emoji/emoji_one/wave/4.png differ
diff --git a/public/images/emoji/emoji_one/wave/5.png b/public/images/emoji/emoji_one/wave/5.png
new file mode 100644
index 00000000000..ed8c181200e
Binary files /dev/null and b/public/images/emoji/emoji_one/wave/5.png differ
diff --git a/public/images/emoji/emoji_one/wave/6.png b/public/images/emoji/emoji_one/wave/6.png
new file mode 100644
index 00000000000..9685d034594
Binary files /dev/null and b/public/images/emoji/emoji_one/wave/6.png differ
diff --git a/public/images/emoji/emoji_one/waving_black_flag.png b/public/images/emoji/emoji_one/waving_black_flag.png
index e6071f3ee0c..193a775633f 100644
Binary files a/public/images/emoji/emoji_one/waving_black_flag.png and b/public/images/emoji/emoji_one/waving_black_flag.png differ
diff --git a/public/images/emoji/emoji_one/waving_white_flag.png b/public/images/emoji/emoji_one/waving_white_flag.png
index a4b7a4848a4..b2c3a85f49e 100644
Binary files a/public/images/emoji/emoji_one/waving_white_flag.png and b/public/images/emoji/emoji_one/waving_white_flag.png differ
diff --git a/public/images/emoji/emoji_one/wavy_dash.png b/public/images/emoji/emoji_one/wavy_dash.png
index 80c07a241a3..476444b3138 100644
Binary files a/public/images/emoji/emoji_one/wavy_dash.png and b/public/images/emoji/emoji_one/wavy_dash.png differ
diff --git a/public/images/emoji/emoji_one/waxing_crescent_moon.png b/public/images/emoji/emoji_one/waxing_crescent_moon.png
index 38f4b1a13b5..79e156324c8 100644
Binary files a/public/images/emoji/emoji_one/waxing_crescent_moon.png and b/public/images/emoji/emoji_one/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/emoji_one/waxing_gibbous_moon.png b/public/images/emoji/emoji_one/waxing_gibbous_moon.png
index 11bb126786a..b5264d60c73 100644
Binary files a/public/images/emoji/emoji_one/waxing_gibbous_moon.png and b/public/images/emoji/emoji_one/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/emoji_one/wc.png b/public/images/emoji/emoji_one/wc.png
index ce3a29a346d..d404c70a1cd 100644
Binary files a/public/images/emoji/emoji_one/wc.png and b/public/images/emoji/emoji_one/wc.png differ
diff --git a/public/images/emoji/emoji_one/weary.png b/public/images/emoji/emoji_one/weary.png
index f6e8f7db8a0..c8a4c3d9253 100644
Binary files a/public/images/emoji/emoji_one/weary.png and b/public/images/emoji/emoji_one/weary.png differ
diff --git a/public/images/emoji/emoji_one/wedding.png b/public/images/emoji/emoji_one/wedding.png
index 127c2f86a57..4dbb89a6035 100644
Binary files a/public/images/emoji/emoji_one/wedding.png and b/public/images/emoji/emoji_one/wedding.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter.png b/public/images/emoji/emoji_one/weight_lifter.png
index 987fafb21e2..e559b73ffec 100644
Binary files a/public/images/emoji/emoji_one/weight_lifter.png and b/public/images/emoji/emoji_one/weight_lifter.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter/2.png b/public/images/emoji/emoji_one/weight_lifter/2.png
new file mode 100644
index 00000000000..a31a1aab292
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifter/2.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter/3.png b/public/images/emoji/emoji_one/weight_lifter/3.png
new file mode 100644
index 00000000000..45ebbc67df6
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifter/3.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter/4.png b/public/images/emoji/emoji_one/weight_lifter/4.png
new file mode 100644
index 00000000000..c5d5f63edc1
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifter/4.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter/5.png b/public/images/emoji/emoji_one/weight_lifter/5.png
new file mode 100644
index 00000000000..eeb1fa21c79
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifter/5.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter/6.png b/public/images/emoji/emoji_one/weight_lifter/6.png
new file mode 100644
index 00000000000..a3308e88692
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifter/6.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man.png b/public/images/emoji/emoji_one/weight_lifting_man.png
new file mode 100644
index 00000000000..e559b73ffec
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifting_man.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man/2.png b/public/images/emoji/emoji_one/weight_lifting_man/2.png
new file mode 100644
index 00000000000..a31a1aab292
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man/3.png b/public/images/emoji/emoji_one/weight_lifting_man/3.png
new file mode 100644
index 00000000000..45ebbc67df6
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man/4.png b/public/images/emoji/emoji_one/weight_lifting_man/4.png
new file mode 100644
index 00000000000..c5d5f63edc1
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man/5.png b/public/images/emoji/emoji_one/weight_lifting_man/5.png
new file mode 100644
index 00000000000..eeb1fa21c79
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man/6.png b/public/images/emoji/emoji_one/weight_lifting_man/6.png
new file mode 100644
index 00000000000..a3308e88692
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_woman.png b/public/images/emoji/emoji_one/weight_lifting_woman.png
new file mode 100644
index 00000000000..e0d7d244000
Binary files /dev/null and b/public/images/emoji/emoji_one/weight_lifting_woman.png differ
diff --git a/public/images/emoji/emoji_one/western_sahara.png b/public/images/emoji/emoji_one/western_sahara.png
new file mode 100644
index 00000000000..44c0ea20dd7
Binary files /dev/null and b/public/images/emoji/emoji_one/western_sahara.png differ
diff --git a/public/images/emoji/emoji_one/whale.png b/public/images/emoji/emoji_one/whale.png
index 2d4edb20cc8..c31c3e625ce 100644
Binary files a/public/images/emoji/emoji_one/whale.png and b/public/images/emoji/emoji_one/whale.png differ
diff --git a/public/images/emoji/emoji_one/whale2.png b/public/images/emoji/emoji_one/whale2.png
index e2a4bad81f2..782140bb5e9 100644
Binary files a/public/images/emoji/emoji_one/whale2.png and b/public/images/emoji/emoji_one/whale2.png differ
diff --git a/public/images/emoji/emoji_one/wheel_of_dharma.png b/public/images/emoji/emoji_one/wheel_of_dharma.png
index 2d4661bf8bf..9ce8a85b89a 100644
Binary files a/public/images/emoji/emoji_one/wheel_of_dharma.png and b/public/images/emoji/emoji_one/wheel_of_dharma.png differ
diff --git a/public/images/emoji/emoji_one/wheelchair.png b/public/images/emoji/emoji_one/wheelchair.png
index eab8e5c372b..325453e63bb 100644
Binary files a/public/images/emoji/emoji_one/wheelchair.png and b/public/images/emoji/emoji_one/wheelchair.png differ
diff --git a/public/images/emoji/emoji_one/white_check_mark.png b/public/images/emoji/emoji_one/white_check_mark.png
index 723da5aa8c5..9300727b866 100644
Binary files a/public/images/emoji/emoji_one/white_check_mark.png and b/public/images/emoji/emoji_one/white_check_mark.png differ
diff --git a/public/images/emoji/emoji_one/white_circle.png b/public/images/emoji/emoji_one/white_circle.png
index 6dcb272cbc7..2308140ea46 100644
Binary files a/public/images/emoji/emoji_one/white_circle.png and b/public/images/emoji/emoji_one/white_circle.png differ
diff --git a/public/images/emoji/emoji_one/white_flag.png b/public/images/emoji/emoji_one/white_flag.png
new file mode 100644
index 00000000000..b2c3a85f49e
Binary files /dev/null and b/public/images/emoji/emoji_one/white_flag.png differ
diff --git a/public/images/emoji/emoji_one/white_flower.png b/public/images/emoji/emoji_one/white_flower.png
index e7fd8dd647b..326f3f34edf 100644
Binary files a/public/images/emoji/emoji_one/white_flower.png and b/public/images/emoji/emoji_one/white_flower.png differ
diff --git a/public/images/emoji/emoji_one/white_frowning_face.png b/public/images/emoji/emoji_one/white_frowning_face.png
index 72453581da4..968de324b53 100644
Binary files a/public/images/emoji/emoji_one/white_frowning_face.png and b/public/images/emoji/emoji_one/white_frowning_face.png differ
diff --git a/public/images/emoji/emoji_one/white_large_square.png b/public/images/emoji/emoji_one/white_large_square.png
index 4ca1aba4d40..7ae4aaa11d3 100644
Binary files a/public/images/emoji/emoji_one/white_large_square.png and b/public/images/emoji/emoji_one/white_large_square.png differ
diff --git a/public/images/emoji/emoji_one/white_medium_small_square.png b/public/images/emoji/emoji_one/white_medium_small_square.png
index fbc658b5a26..adec528bbc3 100644
Binary files a/public/images/emoji/emoji_one/white_medium_small_square.png and b/public/images/emoji/emoji_one/white_medium_small_square.png differ
diff --git a/public/images/emoji/emoji_one/white_medium_square.png b/public/images/emoji/emoji_one/white_medium_square.png
index c280a8a4a62..17d1b340e14 100644
Binary files a/public/images/emoji/emoji_one/white_medium_square.png and b/public/images/emoji/emoji_one/white_medium_square.png differ
diff --git a/public/images/emoji/emoji_one/white_small_square.png b/public/images/emoji/emoji_one/white_small_square.png
index f9718db4a3f..b8b19f283a7 100644
Binary files a/public/images/emoji/emoji_one/white_small_square.png and b/public/images/emoji/emoji_one/white_small_square.png differ
diff --git a/public/images/emoji/emoji_one/white_square_button.png b/public/images/emoji/emoji_one/white_square_button.png
index f6fb91f861d..733385d3829 100644
Binary files a/public/images/emoji/emoji_one/white_square_button.png and b/public/images/emoji/emoji_one/white_square_button.png differ
diff --git a/public/images/emoji/emoji_one/white_sun_behind_cloud.png b/public/images/emoji/emoji_one/white_sun_behind_cloud.png
index 500182bef95..e8b9220a8a1 100644
Binary files a/public/images/emoji/emoji_one/white_sun_behind_cloud.png and b/public/images/emoji/emoji_one/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/emoji_one/white_sun_behind_cloud_with_rain.png b/public/images/emoji/emoji_one/white_sun_behind_cloud_with_rain.png
index 24ee434dc16..67907abd2f6 100644
Binary files a/public/images/emoji/emoji_one/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/emoji_one/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/emoji_one/white_sun_cloud.png b/public/images/emoji/emoji_one/white_sun_cloud.png
index 500182bef95..e8b9220a8a1 100644
Binary files a/public/images/emoji/emoji_one/white_sun_cloud.png and b/public/images/emoji/emoji_one/white_sun_cloud.png differ
diff --git a/public/images/emoji/emoji_one/white_sun_rain_cloud.png b/public/images/emoji/emoji_one/white_sun_rain_cloud.png
index 24ee434dc16..67907abd2f6 100644
Binary files a/public/images/emoji/emoji_one/white_sun_rain_cloud.png and b/public/images/emoji/emoji_one/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/emoji_one/white_sun_small_cloud.png b/public/images/emoji/emoji_one/white_sun_small_cloud.png
index 1cfb219d3af..e100b05d5b3 100644
Binary files a/public/images/emoji/emoji_one/white_sun_small_cloud.png and b/public/images/emoji/emoji_one/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/emoji_one/white_sun_with_small_cloud.png b/public/images/emoji/emoji_one/white_sun_with_small_cloud.png
index 1cfb219d3af..e100b05d5b3 100644
Binary files a/public/images/emoji/emoji_one/white_sun_with_small_cloud.png and b/public/images/emoji/emoji_one/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/emoji_one/wilted_flower.png b/public/images/emoji/emoji_one/wilted_flower.png
new file mode 100644
index 00000000000..b4d0364c622
Binary files /dev/null and b/public/images/emoji/emoji_one/wilted_flower.png differ
diff --git a/public/images/emoji/emoji_one/wind_blowing_face.png b/public/images/emoji/emoji_one/wind_blowing_face.png
index 6f636c11157..a1af40102e3 100644
Binary files a/public/images/emoji/emoji_one/wind_blowing_face.png and b/public/images/emoji/emoji_one/wind_blowing_face.png differ
diff --git a/public/images/emoji/emoji_one/wind_chime.png b/public/images/emoji/emoji_one/wind_chime.png
index c7309ac0c15..dbf93a1bd5d 100644
Binary files a/public/images/emoji/emoji_one/wind_chime.png and b/public/images/emoji/emoji_one/wind_chime.png differ
diff --git a/public/images/emoji/emoji_one/wind_face.png b/public/images/emoji/emoji_one/wind_face.png
new file mode 100644
index 00000000000..a1af40102e3
Binary files /dev/null and b/public/images/emoji/emoji_one/wind_face.png differ
diff --git a/public/images/emoji/emoji_one/wine_glass.png b/public/images/emoji/emoji_one/wine_glass.png
index e2d8c54c619..c0d1b8ff639 100644
Binary files a/public/images/emoji/emoji_one/wine_glass.png and b/public/images/emoji/emoji_one/wine_glass.png differ
diff --git a/public/images/emoji/emoji_one/wink.png b/public/images/emoji/emoji_one/wink.png
index b381cccbbbe..ec4272d1dfe 100644
Binary files a/public/images/emoji/emoji_one/wink.png and b/public/images/emoji/emoji_one/wink.png differ
diff --git a/public/images/emoji/emoji_one/wolf.png b/public/images/emoji/emoji_one/wolf.png
index 47a5019415d..ce0527e530a 100644
Binary files a/public/images/emoji/emoji_one/wolf.png and b/public/images/emoji/emoji_one/wolf.png differ
diff --git a/public/images/emoji/emoji_one/woman.png b/public/images/emoji/emoji_one/woman.png
index 0abe2625667..ba297e7a87b 100644
Binary files a/public/images/emoji/emoji_one/woman.png and b/public/images/emoji/emoji_one/woman.png differ
diff --git a/public/images/emoji/emoji_one/woman/2.png b/public/images/emoji/emoji_one/woman/2.png
new file mode 100644
index 00000000000..1a202110d03
Binary files /dev/null and b/public/images/emoji/emoji_one/woman/2.png differ
diff --git a/public/images/emoji/emoji_one/woman/3.png b/public/images/emoji/emoji_one/woman/3.png
new file mode 100644
index 00000000000..b09feb39b48
Binary files /dev/null and b/public/images/emoji/emoji_one/woman/3.png differ
diff --git a/public/images/emoji/emoji_one/woman/4.png b/public/images/emoji/emoji_one/woman/4.png
new file mode 100644
index 00000000000..59b06db034b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman/4.png differ
diff --git a/public/images/emoji/emoji_one/woman/5.png b/public/images/emoji/emoji_one/woman/5.png
new file mode 100644
index 00000000000..8b880d3718e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman/5.png differ
diff --git a/public/images/emoji/emoji_one/woman/6.png b/public/images/emoji/emoji_one/woman/6.png
new file mode 100644
index 00000000000..9e9361f87a7
Binary files /dev/null and b/public/images/emoji/emoji_one/woman/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist.png b/public/images/emoji/emoji_one/woman_artist.png
new file mode 100644
index 00000000000..df7d508b5d2
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_artist.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist/2.png b/public/images/emoji/emoji_one/woman_artist/2.png
new file mode 100644
index 00000000000..0c0c280cea1
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_artist/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist/3.png b/public/images/emoji/emoji_one/woman_artist/3.png
new file mode 100644
index 00000000000..bb20920a804
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_artist/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist/4.png b/public/images/emoji/emoji_one/woman_artist/4.png
new file mode 100644
index 00000000000..bf24c333ff0
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_artist/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist/5.png b/public/images/emoji/emoji_one/woman_artist/5.png
new file mode 100644
index 00000000000..9ed45087d20
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_artist/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist/6.png b/public/images/emoji/emoji_one/woman_artist/6.png
new file mode 100644
index 00000000000..de910b3c26e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_artist/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut.png b/public/images/emoji/emoji_one/woman_astronaut.png
new file mode 100644
index 00000000000..d884c4642f2
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_astronaut.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut/2.png b/public/images/emoji/emoji_one/woman_astronaut/2.png
new file mode 100644
index 00000000000..c9894d25d4b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_astronaut/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut/3.png b/public/images/emoji/emoji_one/woman_astronaut/3.png
new file mode 100644
index 00000000000..6186dac7e57
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_astronaut/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut/4.png b/public/images/emoji/emoji_one/woman_astronaut/4.png
new file mode 100644
index 00000000000..b1a42bf4b9e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_astronaut/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut/5.png b/public/images/emoji/emoji_one/woman_astronaut/5.png
new file mode 100644
index 00000000000..b45574862d3
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_astronaut/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut/6.png b/public/images/emoji/emoji_one/woman_astronaut/6.png
new file mode 100644
index 00000000000..164ab8a19dc
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_astronaut/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling.png b/public/images/emoji/emoji_one/woman_cartwheeling.png
new file mode 100644
index 00000000000..b7ed44d989a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cartwheeling.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling/2.png b/public/images/emoji/emoji_one/woman_cartwheeling/2.png
new file mode 100644
index 00000000000..c39ccd7f8b6
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling/3.png b/public/images/emoji/emoji_one/woman_cartwheeling/3.png
new file mode 100644
index 00000000000..2f5742529af
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling/4.png b/public/images/emoji/emoji_one/woman_cartwheeling/4.png
new file mode 100644
index 00000000000..9ccb8ed7545
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling/5.png b/public/images/emoji/emoji_one/woman_cartwheeling/5.png
new file mode 100644
index 00000000000..f58d8952629
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling/6.png b/public/images/emoji/emoji_one/woman_cartwheeling/6.png
new file mode 100644
index 00000000000..e9f09ea9bfd
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook.png b/public/images/emoji/emoji_one/woman_cook.png
new file mode 100644
index 00000000000..db48bcfbe12
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cook.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook/2.png b/public/images/emoji/emoji_one/woman_cook/2.png
new file mode 100644
index 00000000000..5941b57c0f0
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cook/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook/3.png b/public/images/emoji/emoji_one/woman_cook/3.png
new file mode 100644
index 00000000000..93f065cb121
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cook/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook/4.png b/public/images/emoji/emoji_one/woman_cook/4.png
new file mode 100644
index 00000000000..24ed0e4f23b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cook/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook/5.png b/public/images/emoji/emoji_one/woman_cook/5.png
new file mode 100644
index 00000000000..fd7df3945ff
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cook/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook/6.png b/public/images/emoji/emoji_one/woman_cook/6.png
new file mode 100644
index 00000000000..25c27f6e89c
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_cook/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming.png b/public/images/emoji/emoji_one/woman_facepalming.png
new file mode 100644
index 00000000000..1fd9b1e63e3
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_facepalming.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming/2.png b/public/images/emoji/emoji_one/woman_facepalming/2.png
new file mode 100644
index 00000000000..9da5b3cb877
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_facepalming/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming/3.png b/public/images/emoji/emoji_one/woman_facepalming/3.png
new file mode 100644
index 00000000000..eef81559832
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_facepalming/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming/4.png b/public/images/emoji/emoji_one/woman_facepalming/4.png
new file mode 100644
index 00000000000..4ceed5477a6
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_facepalming/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming/5.png b/public/images/emoji/emoji_one/woman_facepalming/5.png
new file mode 100644
index 00000000000..2607a2f2c26
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_facepalming/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming/6.png b/public/images/emoji/emoji_one/woman_facepalming/6.png
new file mode 100644
index 00000000000..f2c9a7f81d9
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_facepalming/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker.png b/public/images/emoji/emoji_one/woman_factory_worker.png
new file mode 100644
index 00000000000..5fb29ea5baa
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_factory_worker.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker/2.png b/public/images/emoji/emoji_one/woman_factory_worker/2.png
new file mode 100644
index 00000000000..df11eace4b0
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker/3.png b/public/images/emoji/emoji_one/woman_factory_worker/3.png
new file mode 100644
index 00000000000..0397dca1dba
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker/4.png b/public/images/emoji/emoji_one/woman_factory_worker/4.png
new file mode 100644
index 00000000000..6821c824418
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker/5.png b/public/images/emoji/emoji_one/woman_factory_worker/5.png
new file mode 100644
index 00000000000..07200e727d6
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker/6.png b/public/images/emoji/emoji_one/woman_factory_worker/6.png
new file mode 100644
index 00000000000..d03d5914f7f
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer.png b/public/images/emoji/emoji_one/woman_farmer.png
new file mode 100644
index 00000000000..254e745b548
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_farmer.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer/2.png b/public/images/emoji/emoji_one/woman_farmer/2.png
new file mode 100644
index 00000000000..356e74f499e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_farmer/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer/3.png b/public/images/emoji/emoji_one/woman_farmer/3.png
new file mode 100644
index 00000000000..f9b3e314d9a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_farmer/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer/4.png b/public/images/emoji/emoji_one/woman_farmer/4.png
new file mode 100644
index 00000000000..98f2ad9c960
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_farmer/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer/5.png b/public/images/emoji/emoji_one/woman_farmer/5.png
new file mode 100644
index 00000000000..f5b440ee187
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_farmer/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer/6.png b/public/images/emoji/emoji_one/woman_farmer/6.png
new file mode 100644
index 00000000000..b1bca1dd4db
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_farmer/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter.png b/public/images/emoji/emoji_one/woman_firefighter.png
new file mode 100644
index 00000000000..8ffa29cf783
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_firefighter.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter/2.png b/public/images/emoji/emoji_one/woman_firefighter/2.png
new file mode 100644
index 00000000000..853b9bed819
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_firefighter/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter/3.png b/public/images/emoji/emoji_one/woman_firefighter/3.png
new file mode 100644
index 00000000000..86bbf79b3b1
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_firefighter/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter/4.png b/public/images/emoji/emoji_one/woman_firefighter/4.png
new file mode 100644
index 00000000000..0b5f148f879
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_firefighter/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter/5.png b/public/images/emoji/emoji_one/woman_firefighter/5.png
new file mode 100644
index 00000000000..41c34e3f109
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_firefighter/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter/6.png b/public/images/emoji/emoji_one/woman_firefighter/6.png
new file mode 100644
index 00000000000..c5ed0a2abcf
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_firefighter/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker.png b/public/images/emoji/emoji_one/woman_health_worker.png
new file mode 100644
index 00000000000..e2e4c83f510
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_health_worker.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker/2.png b/public/images/emoji/emoji_one/woman_health_worker/2.png
new file mode 100644
index 00000000000..84061ca080a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_health_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker/3.png b/public/images/emoji/emoji_one/woman_health_worker/3.png
new file mode 100644
index 00000000000..0a065c4b430
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_health_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker/4.png b/public/images/emoji/emoji_one/woman_health_worker/4.png
new file mode 100644
index 00000000000..979ff387cbe
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_health_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker/5.png b/public/images/emoji/emoji_one/woman_health_worker/5.png
new file mode 100644
index 00000000000..6348a939cb3
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_health_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker/6.png b/public/images/emoji/emoji_one/woman_health_worker/6.png
new file mode 100644
index 00000000000..d47ad69ab54
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_health_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge.png b/public/images/emoji/emoji_one/woman_judge.png
new file mode 100644
index 00000000000..06f1dd93332
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_judge.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge/2.png b/public/images/emoji/emoji_one/woman_judge/2.png
new file mode 100644
index 00000000000..c7d3c6bca60
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_judge/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge/3.png b/public/images/emoji/emoji_one/woman_judge/3.png
new file mode 100644
index 00000000000..0cdd87676a6
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_judge/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge/4.png b/public/images/emoji/emoji_one/woman_judge/4.png
new file mode 100644
index 00000000000..e08f8948e00
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_judge/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge/5.png b/public/images/emoji/emoji_one/woman_judge/5.png
new file mode 100644
index 00000000000..30b76c17220
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_judge/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge/6.png b/public/images/emoji/emoji_one/woman_judge/6.png
new file mode 100644
index 00000000000..efd5fdd10cc
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_judge/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling.png b/public/images/emoji/emoji_one/woman_juggling.png
new file mode 100644
index 00000000000..7cdfcc20a26
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_juggling.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling/2.png b/public/images/emoji/emoji_one/woman_juggling/2.png
new file mode 100644
index 00000000000..f7cfbd7eb7a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_juggling/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling/3.png b/public/images/emoji/emoji_one/woman_juggling/3.png
new file mode 100644
index 00000000000..f9a3d689261
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_juggling/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling/4.png b/public/images/emoji/emoji_one/woman_juggling/4.png
new file mode 100644
index 00000000000..43bf31cb56b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_juggling/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling/5.png b/public/images/emoji/emoji_one/woman_juggling/5.png
new file mode 100644
index 00000000000..090e4b5cfcb
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_juggling/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling/6.png b/public/images/emoji/emoji_one/woman_juggling/6.png
new file mode 100644
index 00000000000..59939bef54b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_juggling/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic.png b/public/images/emoji/emoji_one/woman_mechanic.png
new file mode 100644
index 00000000000..38825ae3c13
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mechanic.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic/2.png b/public/images/emoji/emoji_one/woman_mechanic/2.png
new file mode 100644
index 00000000000..4480dcb83af
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mechanic/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic/3.png b/public/images/emoji/emoji_one/woman_mechanic/3.png
new file mode 100644
index 00000000000..20fac44d109
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mechanic/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic/4.png b/public/images/emoji/emoji_one/woman_mechanic/4.png
new file mode 100644
index 00000000000..24fd392ac05
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mechanic/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic/5.png b/public/images/emoji/emoji_one/woman_mechanic/5.png
new file mode 100644
index 00000000000..232fdd56c14
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mechanic/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic/6.png b/public/images/emoji/emoji_one/woman_mechanic/6.png
new file mode 100644
index 00000000000..bf50ef46803
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_mechanic/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker.png b/public/images/emoji/emoji_one/woman_office_worker.png
new file mode 100644
index 00000000000..09ae32ecb3a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_office_worker.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker/2.png b/public/images/emoji/emoji_one/woman_office_worker/2.png
new file mode 100644
index 00000000000..d8e4c7f3e7c
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_office_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker/3.png b/public/images/emoji/emoji_one/woman_office_worker/3.png
new file mode 100644
index 00000000000..a732692349b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_office_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker/4.png b/public/images/emoji/emoji_one/woman_office_worker/4.png
new file mode 100644
index 00000000000..b0368bde76c
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_office_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker/5.png b/public/images/emoji/emoji_one/woman_office_worker/5.png
new file mode 100644
index 00000000000..c9f76b7f51b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_office_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker/6.png b/public/images/emoji/emoji_one/woman_office_worker/6.png
new file mode 100644
index 00000000000..3172a8ddf28
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_office_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot.png b/public/images/emoji/emoji_one/woman_pilot.png
new file mode 100644
index 00000000000..6cf43ed7182
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_pilot.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot/2.png b/public/images/emoji/emoji_one/woman_pilot/2.png
new file mode 100644
index 00000000000..038f3168810
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_pilot/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot/3.png b/public/images/emoji/emoji_one/woman_pilot/3.png
new file mode 100644
index 00000000000..117cea7c71a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_pilot/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot/4.png b/public/images/emoji/emoji_one/woman_pilot/4.png
new file mode 100644
index 00000000000..5dfc1a53954
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_pilot/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot/5.png b/public/images/emoji/emoji_one/woman_pilot/5.png
new file mode 100644
index 00000000000..f466a19606e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_pilot/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot/6.png b/public/images/emoji/emoji_one/woman_pilot/6.png
new file mode 100644
index 00000000000..2be37aade0f
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_pilot/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball.png b/public/images/emoji/emoji_one/woman_playing_handball.png
new file mode 100644
index 00000000000..b76d637af0a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_handball.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball/2.png b/public/images/emoji/emoji_one/woman_playing_handball/2.png
new file mode 100644
index 00000000000..f44176a0987
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball/3.png b/public/images/emoji/emoji_one/woman_playing_handball/3.png
new file mode 100644
index 00000000000..0395a52cadd
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball/4.png b/public/images/emoji/emoji_one/woman_playing_handball/4.png
new file mode 100644
index 00000000000..f31e21106de
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball/5.png b/public/images/emoji/emoji_one/woman_playing_handball/5.png
new file mode 100644
index 00000000000..db6ee69af59
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball/6.png b/public/images/emoji/emoji_one/woman_playing_handball/6.png
new file mode 100644
index 00000000000..345314c8545
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo.png b/public/images/emoji/emoji_one/woman_playing_water_polo.png
new file mode 100644
index 00000000000..1c47125ff98
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo/2.png b/public/images/emoji/emoji_one/woman_playing_water_polo/2.png
new file mode 100644
index 00000000000..906d1605a5e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo/3.png b/public/images/emoji/emoji_one/woman_playing_water_polo/3.png
new file mode 100644
index 00000000000..2a3adc69765
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo/4.png b/public/images/emoji/emoji_one/woman_playing_water_polo/4.png
new file mode 100644
index 00000000000..c47a2c88bf5
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo/5.png b/public/images/emoji/emoji_one/woman_playing_water_polo/5.png
new file mode 100644
index 00000000000..2c4ee06395c
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo/6.png b/public/images/emoji/emoji_one/woman_playing_water_polo/6.png
new file mode 100644
index 00000000000..cb776e45c14
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist.png b/public/images/emoji/emoji_one/woman_scientist.png
new file mode 100644
index 00000000000..89e4850622c
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_scientist.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist/2.png b/public/images/emoji/emoji_one/woman_scientist/2.png
new file mode 100644
index 00000000000..14a368f8731
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_scientist/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist/3.png b/public/images/emoji/emoji_one/woman_scientist/3.png
new file mode 100644
index 00000000000..90e60c1c80a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_scientist/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist/4.png b/public/images/emoji/emoji_one/woman_scientist/4.png
new file mode 100644
index 00000000000..cfca1820c95
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_scientist/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist/5.png b/public/images/emoji/emoji_one/woman_scientist/5.png
new file mode 100644
index 00000000000..e7c7d1de670
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_scientist/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist/6.png b/public/images/emoji/emoji_one/woman_scientist/6.png
new file mode 100644
index 00000000000..d1a9c5d19f4
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_scientist/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging.png b/public/images/emoji/emoji_one/woman_shrugging.png
new file mode 100644
index 00000000000..e437955ee71
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_shrugging.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging/2.png b/public/images/emoji/emoji_one/woman_shrugging/2.png
new file mode 100644
index 00000000000..8e7bbed7a09
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_shrugging/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging/3.png b/public/images/emoji/emoji_one/woman_shrugging/3.png
new file mode 100644
index 00000000000..3d9b0060f95
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_shrugging/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging/4.png b/public/images/emoji/emoji_one/woman_shrugging/4.png
new file mode 100644
index 00000000000..7ffb49d7635
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_shrugging/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging/5.png b/public/images/emoji/emoji_one/woman_shrugging/5.png
new file mode 100644
index 00000000000..30b3774987b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_shrugging/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging/6.png b/public/images/emoji/emoji_one/woman_shrugging/6.png
new file mode 100644
index 00000000000..cda85e9cc4c
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_shrugging/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer.png b/public/images/emoji/emoji_one/woman_singer.png
new file mode 100644
index 00000000000..f412f27476b
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer/2.png b/public/images/emoji/emoji_one/woman_singer/2.png
new file mode 100644
index 00000000000..6d14d8c1627
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer/3.png b/public/images/emoji/emoji_one/woman_singer/3.png
new file mode 100644
index 00000000000..9754d70650a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer/4.png b/public/images/emoji/emoji_one/woman_singer/4.png
new file mode 100644
index 00000000000..5fa71c50c54
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer/5.png b/public/images/emoji/emoji_one/woman_singer/5.png
new file mode 100644
index 00000000000..c363412cf33
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer/6.png b/public/images/emoji/emoji_one/woman_singer/6.png
new file mode 100644
index 00000000000..39b235a7a93
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_singer/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_student.png b/public/images/emoji/emoji_one/woman_student.png
new file mode 100644
index 00000000000..9d00e2abed3
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student.png differ
diff --git a/public/images/emoji/emoji_one/woman_student/2.png b/public/images/emoji/emoji_one/woman_student/2.png
new file mode 100644
index 00000000000..9a754752ae4
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_student/3.png b/public/images/emoji/emoji_one/woman_student/3.png
new file mode 100644
index 00000000000..27f26dc0748
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_student/4.png b/public/images/emoji/emoji_one/woman_student/4.png
new file mode 100644
index 00000000000..ac85cfa64c8
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_student/5.png b/public/images/emoji/emoji_one/woman_student/5.png
new file mode 100644
index 00000000000..c2bfd0f056c
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_student/6.png b/public/images/emoji/emoji_one/woman_student/6.png
new file mode 100644
index 00000000000..89f47c0acd9
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_student/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher.png b/public/images/emoji/emoji_one/woman_teacher.png
new file mode 100644
index 00000000000..99cd5f3afe3
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_teacher.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher/2.png b/public/images/emoji/emoji_one/woman_teacher/2.png
new file mode 100644
index 00000000000..852548df24c
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_teacher/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher/3.png b/public/images/emoji/emoji_one/woman_teacher/3.png
new file mode 100644
index 00000000000..e0c9391a6d0
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_teacher/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher/4.png b/public/images/emoji/emoji_one/woman_teacher/4.png
new file mode 100644
index 00000000000..c08c48635b4
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_teacher/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher/5.png b/public/images/emoji/emoji_one/woman_teacher/5.png
new file mode 100644
index 00000000000..437eddb6f82
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_teacher/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher/6.png b/public/images/emoji/emoji_one/woman_teacher/6.png
new file mode 100644
index 00000000000..43b162ced31
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_teacher/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist.png b/public/images/emoji/emoji_one/woman_technologist.png
new file mode 100644
index 00000000000..776fbfcab4a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_technologist.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist/2.png b/public/images/emoji/emoji_one/woman_technologist/2.png
new file mode 100644
index 00000000000..5f161cbee6d
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_technologist/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist/3.png b/public/images/emoji/emoji_one/woman_technologist/3.png
new file mode 100644
index 00000000000..9e00f7b1433
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_technologist/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist/4.png b/public/images/emoji/emoji_one/woman_technologist/4.png
new file mode 100644
index 00000000000..7235d0108f5
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_technologist/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist/5.png b/public/images/emoji/emoji_one/woman_technologist/5.png
new file mode 100644
index 00000000000..26770ddeb77
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_technologist/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist/6.png b/public/images/emoji/emoji_one/woman_technologist/6.png
new file mode 100644
index 00000000000..ea37a55bbe2
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_technologist/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf.png b/public/images/emoji/emoji_one/woman_with_headscarf.png
new file mode 100644
index 00000000000..f7e6fb99f7a
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban.png b/public/images/emoji/emoji_one/woman_with_turban.png
new file mode 100644
index 00000000000..864b5727a5e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_turban.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban/2.png b/public/images/emoji/emoji_one/woman_with_turban/2.png
new file mode 100644
index 00000000000..2b50d77b889
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_turban/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban/3.png b/public/images/emoji/emoji_one/woman_with_turban/3.png
new file mode 100644
index 00000000000..5eafe2592ae
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_turban/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban/4.png b/public/images/emoji/emoji_one/woman_with_turban/4.png
new file mode 100644
index 00000000000..a9f86d7c875
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_turban/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban/5.png b/public/images/emoji/emoji_one/woman_with_turban/5.png
new file mode 100644
index 00000000000..9720d94218e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_turban/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban/6.png b/public/images/emoji/emoji_one/woman_with_turban/6.png
new file mode 100644
index 00000000000..4897f0e583f
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_turban/6.png differ
diff --git a/public/images/emoji/emoji_one/womans_clothes.png b/public/images/emoji/emoji_one/womans_clothes.png
index 39c0f1079fc..4b9eb1d5724 100644
Binary files a/public/images/emoji/emoji_one/womans_clothes.png and b/public/images/emoji/emoji_one/womans_clothes.png differ
diff --git a/public/images/emoji/emoji_one/womans_hat.png b/public/images/emoji/emoji_one/womans_hat.png
index 7db014b1058..3221d033a24 100644
Binary files a/public/images/emoji/emoji_one/womans_hat.png and b/public/images/emoji/emoji_one/womans_hat.png differ
diff --git a/public/images/emoji/emoji_one/women_wrestling.png b/public/images/emoji/emoji_one/women_wrestling.png
new file mode 100644
index 00000000000..ba1175b4adf
Binary files /dev/null and b/public/images/emoji/emoji_one/women_wrestling.png differ
diff --git a/public/images/emoji/emoji_one/womens.png b/public/images/emoji/emoji_one/womens.png
index 83b4a038771..be9dffce5da 100644
Binary files a/public/images/emoji/emoji_one/womens.png and b/public/images/emoji/emoji_one/womens.png differ
diff --git a/public/images/emoji/emoji_one/world_map.png b/public/images/emoji/emoji_one/world_map.png
index 83ac3734510..d3d5a184310 100644
Binary files a/public/images/emoji/emoji_one/world_map.png and b/public/images/emoji/emoji_one/world_map.png differ
diff --git a/public/images/emoji/emoji_one/worried.png b/public/images/emoji/emoji_one/worried.png
index ca69d33653c..89aefe61c55 100644
Binary files a/public/images/emoji/emoji_one/worried.png and b/public/images/emoji/emoji_one/worried.png differ
diff --git a/public/images/emoji/emoji_one/worship_symbol.png b/public/images/emoji/emoji_one/worship_symbol.png
index 83334c1122c..05ce41a23a8 100644
Binary files a/public/images/emoji/emoji_one/worship_symbol.png and b/public/images/emoji/emoji_one/worship_symbol.png differ
diff --git a/public/images/emoji/emoji_one/wrench.png b/public/images/emoji/emoji_one/wrench.png
index 19c555328e4..68212efaf11 100644
Binary files a/public/images/emoji/emoji_one/wrench.png and b/public/images/emoji/emoji_one/wrench.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand.png b/public/images/emoji/emoji_one/writing_hand.png
index 94953f90054..6a7dc8dda20 100644
Binary files a/public/images/emoji/emoji_one/writing_hand.png and b/public/images/emoji/emoji_one/writing_hand.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand/2.png b/public/images/emoji/emoji_one/writing_hand/2.png
new file mode 100644
index 00000000000..69ddfaa4f31
Binary files /dev/null and b/public/images/emoji/emoji_one/writing_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand/3.png b/public/images/emoji/emoji_one/writing_hand/3.png
new file mode 100644
index 00000000000..77155df4b54
Binary files /dev/null and b/public/images/emoji/emoji_one/writing_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand/4.png b/public/images/emoji/emoji_one/writing_hand/4.png
new file mode 100644
index 00000000000..60c5749354e
Binary files /dev/null and b/public/images/emoji/emoji_one/writing_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand/5.png b/public/images/emoji/emoji_one/writing_hand/5.png
new file mode 100644
index 00000000000..8e21ae31824
Binary files /dev/null and b/public/images/emoji/emoji_one/writing_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand/6.png b/public/images/emoji/emoji_one/writing_hand/6.png
new file mode 100644
index 00000000000..cf40b2bf4c1
Binary files /dev/null and b/public/images/emoji/emoji_one/writing_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/x.png b/public/images/emoji/emoji_one/x.png
index 6339665c40b..76c0e60d891 100644
Binary files a/public/images/emoji/emoji_one/x.png and b/public/images/emoji/emoji_one/x.png differ
diff --git a/public/images/emoji/emoji_one/yellow_heart.png b/public/images/emoji/emoji_one/yellow_heart.png
index 2ba0d27e7b3..7fca911a61d 100644
Binary files a/public/images/emoji/emoji_one/yellow_heart.png and b/public/images/emoji/emoji_one/yellow_heart.png differ
diff --git a/public/images/emoji/emoji_one/yemen.png b/public/images/emoji/emoji_one/yemen.png
new file mode 100644
index 00000000000..3a37c850413
Binary files /dev/null and b/public/images/emoji/emoji_one/yemen.png differ
diff --git a/public/images/emoji/emoji_one/yen.png b/public/images/emoji/emoji_one/yen.png
index 78bf43895d8..106775040df 100644
Binary files a/public/images/emoji/emoji_one/yen.png and b/public/images/emoji/emoji_one/yen.png differ
diff --git a/public/images/emoji/emoji_one/yin_yang.png b/public/images/emoji/emoji_one/yin_yang.png
index 8bdb521f160..c96fc0cc2ee 100644
Binary files a/public/images/emoji/emoji_one/yin_yang.png and b/public/images/emoji/emoji_one/yin_yang.png differ
diff --git a/public/images/emoji/emoji_one/yum.png b/public/images/emoji/emoji_one/yum.png
index 96990fd9b1d..f5a38e15f82 100644
Binary files a/public/images/emoji/emoji_one/yum.png and b/public/images/emoji/emoji_one/yum.png differ
diff --git a/public/images/emoji/emoji_one/zambia.png b/public/images/emoji/emoji_one/zambia.png
new file mode 100644
index 00000000000..3e7d4cbea56
Binary files /dev/null and b/public/images/emoji/emoji_one/zambia.png differ
diff --git a/public/images/emoji/emoji_one/zap.png b/public/images/emoji/emoji_one/zap.png
index fef2e9cdc4e..629e603fcff 100644
Binary files a/public/images/emoji/emoji_one/zap.png and b/public/images/emoji/emoji_one/zap.png differ
diff --git a/public/images/emoji/emoji_one/zebra.png b/public/images/emoji/emoji_one/zebra.png
new file mode 100644
index 00000000000..6faa14f55dc
Binary files /dev/null and b/public/images/emoji/emoji_one/zebra.png differ
diff --git a/public/images/emoji/emoji_one/zero.png b/public/images/emoji/emoji_one/zero.png
index 8123d5e090e..7a255c7c1a9 100644
Binary files a/public/images/emoji/emoji_one/zero.png and b/public/images/emoji/emoji_one/zero.png differ
diff --git a/public/images/emoji/emoji_one/zimbabwe.png b/public/images/emoji/emoji_one/zimbabwe.png
new file mode 100644
index 00000000000..c3af3c54d7e
Binary files /dev/null and b/public/images/emoji/emoji_one/zimbabwe.png differ
diff --git a/public/images/emoji/emoji_one/zipper_mouth.png b/public/images/emoji/emoji_one/zipper_mouth.png
index 40fbdd4c114..8e4cf03f40d 100644
Binary files a/public/images/emoji/emoji_one/zipper_mouth.png and b/public/images/emoji/emoji_one/zipper_mouth.png differ
diff --git a/public/images/emoji/emoji_one/zipper_mouth_face.png b/public/images/emoji/emoji_one/zipper_mouth_face.png
index 40fbdd4c114..8e4cf03f40d 100644
Binary files a/public/images/emoji/emoji_one/zipper_mouth_face.png and b/public/images/emoji/emoji_one/zipper_mouth_face.png differ
diff --git a/public/images/emoji/emoji_one/zombie.png b/public/images/emoji/emoji_one/zombie.png
new file mode 100644
index 00000000000..1bf288fcd4c
Binary files /dev/null and b/public/images/emoji/emoji_one/zombie.png differ
diff --git a/public/images/emoji/emoji_one/zzz.png b/public/images/emoji/emoji_one/zzz.png
index 53a200ed42c..8087a672326 100644
Binary files a/public/images/emoji/emoji_one/zzz.png and b/public/images/emoji/emoji_one/zzz.png differ
diff --git a/public/images/emoji/facebook_messenger/+1.png b/public/images/emoji/facebook_messenger/+1.png
new file mode 100644
index 00000000000..6621dc4a7bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/+1.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/2.png b/public/images/emoji/facebook_messenger/+1/2.png
new file mode 100644
index 00000000000..37b29f3252d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/+1/2.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/3.png b/public/images/emoji/facebook_messenger/+1/3.png
new file mode 100644
index 00000000000..c7aa5375582
Binary files /dev/null and b/public/images/emoji/facebook_messenger/+1/3.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/4.png b/public/images/emoji/facebook_messenger/+1/4.png
new file mode 100644
index 00000000000..1e24d40e565
Binary files /dev/null and b/public/images/emoji/facebook_messenger/+1/4.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/5.png b/public/images/emoji/facebook_messenger/+1/5.png
new file mode 100644
index 00000000000..5b1740d87b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/+1/5.png differ
diff --git a/public/images/emoji/facebook_messenger/+1/6.png b/public/images/emoji/facebook_messenger/+1/6.png
new file mode 100644
index 00000000000..e67bd06a2ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/+1/6.png differ
diff --git a/public/images/emoji/facebook_messenger/-1.png b/public/images/emoji/facebook_messenger/-1.png
new file mode 100644
index 00000000000..1f6f64836b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/-1.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/2.png b/public/images/emoji/facebook_messenger/-1/2.png
new file mode 100644
index 00000000000..e706d7c7a54
Binary files /dev/null and b/public/images/emoji/facebook_messenger/-1/2.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/3.png b/public/images/emoji/facebook_messenger/-1/3.png
new file mode 100644
index 00000000000..9bf7711367e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/-1/3.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/4.png b/public/images/emoji/facebook_messenger/-1/4.png
new file mode 100644
index 00000000000..35fc141cba2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/-1/4.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/5.png b/public/images/emoji/facebook_messenger/-1/5.png
new file mode 100644
index 00000000000..bd43bad3049
Binary files /dev/null and b/public/images/emoji/facebook_messenger/-1/5.png differ
diff --git a/public/images/emoji/facebook_messenger/-1/6.png b/public/images/emoji/facebook_messenger/-1/6.png
new file mode 100644
index 00000000000..5b682877029
Binary files /dev/null and b/public/images/emoji/facebook_messenger/-1/6.png differ
diff --git a/public/images/emoji/facebook_messenger/100.png b/public/images/emoji/facebook_messenger/100.png
new file mode 100644
index 00000000000..d6b5336e120
Binary files /dev/null and b/public/images/emoji/facebook_messenger/100.png differ
diff --git a/public/images/emoji/facebook_messenger/1234.png b/public/images/emoji/facebook_messenger/1234.png
new file mode 100644
index 00000000000..44d2a4fc663
Binary files /dev/null and b/public/images/emoji/facebook_messenger/1234.png differ
diff --git a/public/images/emoji/facebook_messenger/1st_place_medal.png b/public/images/emoji/facebook_messenger/1st_place_medal.png
new file mode 100644
index 00000000000..92235c693c6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/1st_place_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/2nd_place_medal.png b/public/images/emoji/facebook_messenger/2nd_place_medal.png
new file mode 100644
index 00000000000..6eb5db8e21f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/2nd_place_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/3rd_place_medal.png b/public/images/emoji/facebook_messenger/3rd_place_medal.png
new file mode 100644
index 00000000000..4676f24e21a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/3rd_place_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/8ball.png b/public/images/emoji/facebook_messenger/8ball.png
new file mode 100644
index 00000000000..771ad025693
Binary files /dev/null and b/public/images/emoji/facebook_messenger/8ball.png differ
diff --git a/public/images/emoji/facebook_messenger/a.png b/public/images/emoji/facebook_messenger/a.png
new file mode 100644
index 00000000000..501883feb4a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/a.png differ
diff --git a/public/images/emoji/facebook_messenger/ab.png b/public/images/emoji/facebook_messenger/ab.png
new file mode 100644
index 00000000000..e00355202a4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ab.png differ
diff --git a/public/images/emoji/facebook_messenger/abc.png b/public/images/emoji/facebook_messenger/abc.png
new file mode 100644
index 00000000000..1428e8a0ea6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/abc.png differ
diff --git a/public/images/emoji/facebook_messenger/abcd.png b/public/images/emoji/facebook_messenger/abcd.png
new file mode 100644
index 00000000000..d1ce86be981
Binary files /dev/null and b/public/images/emoji/facebook_messenger/abcd.png differ
diff --git a/public/images/emoji/facebook_messenger/accept.png b/public/images/emoji/facebook_messenger/accept.png
new file mode 100644
index 00000000000..178a26fea0e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/accept.png differ
diff --git a/public/images/emoji/facebook_messenger/admission_tickets.png b/public/images/emoji/facebook_messenger/admission_tickets.png
new file mode 100644
index 00000000000..295e9bbdc6d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/admission_tickets.png differ
diff --git a/public/images/emoji/facebook_messenger/adult.png b/public/images/emoji/facebook_messenger/adult.png
new file mode 100644
index 00000000000..53a5eb2ccb9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/adult.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/2.png b/public/images/emoji/facebook_messenger/adult/2.png
new file mode 100644
index 00000000000..8f30fc9e389
Binary files /dev/null and b/public/images/emoji/facebook_messenger/adult/2.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/3.png b/public/images/emoji/facebook_messenger/adult/3.png
new file mode 100644
index 00000000000..36a4e57d1f8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/adult/3.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/4.png b/public/images/emoji/facebook_messenger/adult/4.png
new file mode 100644
index 00000000000..77c57605e93
Binary files /dev/null and b/public/images/emoji/facebook_messenger/adult/4.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/5.png b/public/images/emoji/facebook_messenger/adult/5.png
new file mode 100644
index 00000000000..58bcd6a2fcf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/adult/5.png differ
diff --git a/public/images/emoji/facebook_messenger/adult/6.png b/public/images/emoji/facebook_messenger/adult/6.png
new file mode 100644
index 00000000000..3bc6b5a57a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/adult/6.png differ
diff --git a/public/images/emoji/facebook_messenger/aerial_tramway.png b/public/images/emoji/facebook_messenger/aerial_tramway.png
new file mode 100644
index 00000000000..417aad58449
Binary files /dev/null and b/public/images/emoji/facebook_messenger/aerial_tramway.png differ
diff --git a/public/images/emoji/facebook_messenger/afghanistan.png b/public/images/emoji/facebook_messenger/afghanistan.png
new file mode 100644
index 00000000000..50c4c6b272e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/afghanistan.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane.png b/public/images/emoji/facebook_messenger/airplane.png
new file mode 100644
index 00000000000..4cd01455cde
Binary files /dev/null and b/public/images/emoji/facebook_messenger/airplane.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane_arriving.png b/public/images/emoji/facebook_messenger/airplane_arriving.png
new file mode 100644
index 00000000000..0585a1c36c2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/airplane_arriving.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane_departure.png b/public/images/emoji/facebook_messenger/airplane_departure.png
new file mode 100644
index 00000000000..dc86670a865
Binary files /dev/null and b/public/images/emoji/facebook_messenger/airplane_departure.png differ
diff --git a/public/images/emoji/facebook_messenger/airplane_small.png b/public/images/emoji/facebook_messenger/airplane_small.png
new file mode 100644
index 00000000000..47399184f72
Binary files /dev/null and b/public/images/emoji/facebook_messenger/airplane_small.png differ
diff --git a/public/images/emoji/facebook_messenger/aland_islands.png b/public/images/emoji/facebook_messenger/aland_islands.png
new file mode 100644
index 00000000000..2ce958b9202
Binary files /dev/null and b/public/images/emoji/facebook_messenger/aland_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/alarm_clock.png b/public/images/emoji/facebook_messenger/alarm_clock.png
new file mode 100644
index 00000000000..8b2669f0cee
Binary files /dev/null and b/public/images/emoji/facebook_messenger/alarm_clock.png differ
diff --git a/public/images/emoji/facebook_messenger/albania.png b/public/images/emoji/facebook_messenger/albania.png
new file mode 100644
index 00000000000..8d428869d47
Binary files /dev/null and b/public/images/emoji/facebook_messenger/albania.png differ
diff --git a/public/images/emoji/facebook_messenger/alembic.png b/public/images/emoji/facebook_messenger/alembic.png
new file mode 100644
index 00000000000..cc2853f6d92
Binary files /dev/null and b/public/images/emoji/facebook_messenger/alembic.png differ
diff --git a/public/images/emoji/facebook_messenger/algeria.png b/public/images/emoji/facebook_messenger/algeria.png
new file mode 100644
index 00000000000..cd3dc01ab28
Binary files /dev/null and b/public/images/emoji/facebook_messenger/algeria.png differ
diff --git a/public/images/emoji/facebook_messenger/alien.png b/public/images/emoji/facebook_messenger/alien.png
new file mode 100644
index 00000000000..00c53ca2bd1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/alien.png differ
diff --git a/public/images/emoji/facebook_messenger/ambulance.png b/public/images/emoji/facebook_messenger/ambulance.png
new file mode 100644
index 00000000000..2700dcd39ce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ambulance.png differ
diff --git a/public/images/emoji/facebook_messenger/american_samoa.png b/public/images/emoji/facebook_messenger/american_samoa.png
new file mode 100644
index 00000000000..f4f58e2e257
Binary files /dev/null and b/public/images/emoji/facebook_messenger/american_samoa.png differ
diff --git a/public/images/emoji/facebook_messenger/amphora.png b/public/images/emoji/facebook_messenger/amphora.png
new file mode 100644
index 00000000000..550f047067a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/amphora.png differ
diff --git a/public/images/emoji/facebook_messenger/anchor.png b/public/images/emoji/facebook_messenger/anchor.png
new file mode 100644
index 00000000000..ff5a1a69fb5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/anchor.png differ
diff --git a/public/images/emoji/facebook_messenger/andorra.png b/public/images/emoji/facebook_messenger/andorra.png
new file mode 100644
index 00000000000..0fd73782c23
Binary files /dev/null and b/public/images/emoji/facebook_messenger/andorra.png differ
diff --git a/public/images/emoji/facebook_messenger/angel.png b/public/images/emoji/facebook_messenger/angel.png
new file mode 100644
index 00000000000..8e51518eef7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/angel.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/2.png b/public/images/emoji/facebook_messenger/angel/2.png
new file mode 100644
index 00000000000..e0ca086f4cc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/angel/2.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/3.png b/public/images/emoji/facebook_messenger/angel/3.png
new file mode 100644
index 00000000000..6157d5e417d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/angel/3.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/4.png b/public/images/emoji/facebook_messenger/angel/4.png
new file mode 100644
index 00000000000..2e46b4983e7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/angel/4.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/5.png b/public/images/emoji/facebook_messenger/angel/5.png
new file mode 100644
index 00000000000..08691516484
Binary files /dev/null and b/public/images/emoji/facebook_messenger/angel/5.png differ
diff --git a/public/images/emoji/facebook_messenger/angel/6.png b/public/images/emoji/facebook_messenger/angel/6.png
new file mode 100644
index 00000000000..82c7fcb3cf9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/angel/6.png differ
diff --git a/public/images/emoji/facebook_messenger/anger.png b/public/images/emoji/facebook_messenger/anger.png
new file mode 100644
index 00000000000..689a10c00fa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/anger.png differ
diff --git a/public/images/emoji/facebook_messenger/anger_right.png b/public/images/emoji/facebook_messenger/anger_right.png
new file mode 100644
index 00000000000..3d3ee7dcfad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/anger_right.png differ
diff --git a/public/images/emoji/facebook_messenger/angola.png b/public/images/emoji/facebook_messenger/angola.png
new file mode 100644
index 00000000000..5aca11a07e4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/angola.png differ
diff --git a/public/images/emoji/facebook_messenger/angry.png b/public/images/emoji/facebook_messenger/angry.png
new file mode 100644
index 00000000000..cedaec8a4d2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/angry.png differ
diff --git a/public/images/emoji/facebook_messenger/anguilla.png b/public/images/emoji/facebook_messenger/anguilla.png
new file mode 100644
index 00000000000..d1006c6c19b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/anguilla.png differ
diff --git a/public/images/emoji/facebook_messenger/anguished.png b/public/images/emoji/facebook_messenger/anguished.png
new file mode 100644
index 00000000000..52899f30da4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/anguished.png differ
diff --git a/public/images/emoji/facebook_messenger/ant.png b/public/images/emoji/facebook_messenger/ant.png
new file mode 100644
index 00000000000..2bab6a6f12a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ant.png differ
diff --git a/public/images/emoji/facebook_messenger/antarctica.png b/public/images/emoji/facebook_messenger/antarctica.png
new file mode 100644
index 00000000000..5a6759de63e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/antarctica.png differ
diff --git a/public/images/emoji/facebook_messenger/antigua_barbuda.png b/public/images/emoji/facebook_messenger/antigua_barbuda.png
new file mode 100644
index 00000000000..e3ff113cbae
Binary files /dev/null and b/public/images/emoji/facebook_messenger/antigua_barbuda.png differ
diff --git a/public/images/emoji/facebook_messenger/apple.png b/public/images/emoji/facebook_messenger/apple.png
new file mode 100644
index 00000000000..97c4bbdd6df
Binary files /dev/null and b/public/images/emoji/facebook_messenger/apple.png differ
diff --git a/public/images/emoji/facebook_messenger/aquarius.png b/public/images/emoji/facebook_messenger/aquarius.png
new file mode 100644
index 00000000000..bee7380c6cc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/aquarius.png differ
diff --git a/public/images/emoji/facebook_messenger/archery.png b/public/images/emoji/facebook_messenger/archery.png
new file mode 100644
index 00000000000..f50a1389fef
Binary files /dev/null and b/public/images/emoji/facebook_messenger/archery.png differ
diff --git a/public/images/emoji/facebook_messenger/argentina.png b/public/images/emoji/facebook_messenger/argentina.png
new file mode 100644
index 00000000000..1e5e8150987
Binary files /dev/null and b/public/images/emoji/facebook_messenger/argentina.png differ
diff --git a/public/images/emoji/facebook_messenger/aries.png b/public/images/emoji/facebook_messenger/aries.png
new file mode 100644
index 00000000000..270321de177
Binary files /dev/null and b/public/images/emoji/facebook_messenger/aries.png differ
diff --git a/public/images/emoji/facebook_messenger/armenia.png b/public/images/emoji/facebook_messenger/armenia.png
new file mode 100644
index 00000000000..846307fcf33
Binary files /dev/null and b/public/images/emoji/facebook_messenger/armenia.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_backward.png b/public/images/emoji/facebook_messenger/arrow_backward.png
new file mode 100644
index 00000000000..31bc57f66ea
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_backward.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_double_down.png b/public/images/emoji/facebook_messenger/arrow_double_down.png
new file mode 100644
index 00000000000..0d55a3b8a53
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_double_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_double_up.png b/public/images/emoji/facebook_messenger/arrow_double_up.png
new file mode 100644
index 00000000000..3e26428da13
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_double_up.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_down.png b/public/images/emoji/facebook_messenger/arrow_down.png
new file mode 100644
index 00000000000..cea37e3f45c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_down_small.png b/public/images/emoji/facebook_messenger/arrow_down_small.png
new file mode 100644
index 00000000000..26f28620d3b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_down_small.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_forward.png b/public/images/emoji/facebook_messenger/arrow_forward.png
new file mode 100644
index 00000000000..b7f0770bfac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_forward.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_heading_down.png b/public/images/emoji/facebook_messenger/arrow_heading_down.png
new file mode 100644
index 00000000000..d0031653e00
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_heading_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_heading_up.png b/public/images/emoji/facebook_messenger/arrow_heading_up.png
new file mode 100644
index 00000000000..d95ee952c3f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_heading_up.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_left.png b/public/images/emoji/facebook_messenger/arrow_left.png
new file mode 100644
index 00000000000..0bd799e8661
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_left.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_lower_left.png b/public/images/emoji/facebook_messenger/arrow_lower_left.png
new file mode 100644
index 00000000000..230b491ccb8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_lower_left.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_lower_right.png b/public/images/emoji/facebook_messenger/arrow_lower_right.png
new file mode 100644
index 00000000000..2cb9ab11bbd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_lower_right.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_right.png b/public/images/emoji/facebook_messenger/arrow_right.png
new file mode 100644
index 00000000000..08a9c6e85b6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_right.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_right_hook.png b/public/images/emoji/facebook_messenger/arrow_right_hook.png
new file mode 100644
index 00000000000..10e84d8f5db
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_right_hook.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_up.png b/public/images/emoji/facebook_messenger/arrow_up.png
new file mode 100644
index 00000000000..d87df932aa0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_up.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_up_down.png b/public/images/emoji/facebook_messenger/arrow_up_down.png
new file mode 100644
index 00000000000..0262977544e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_up_down.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_up_small.png b/public/images/emoji/facebook_messenger/arrow_up_small.png
new file mode 100644
index 00000000000..f2eff4c9047
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_up_small.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_upper_left.png b/public/images/emoji/facebook_messenger/arrow_upper_left.png
new file mode 100644
index 00000000000..8ac358c63fd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_upper_left.png differ
diff --git a/public/images/emoji/facebook_messenger/arrow_upper_right.png b/public/images/emoji/facebook_messenger/arrow_upper_right.png
new file mode 100644
index 00000000000..29700d0bf7c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrow_upper_right.png differ
diff --git a/public/images/emoji/facebook_messenger/arrows_clockwise.png b/public/images/emoji/facebook_messenger/arrows_clockwise.png
new file mode 100644
index 00000000000..04755b39234
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrows_clockwise.png differ
diff --git a/public/images/emoji/facebook_messenger/arrows_counterclockwise.png b/public/images/emoji/facebook_messenger/arrows_counterclockwise.png
new file mode 100644
index 00000000000..8d164545167
Binary files /dev/null and b/public/images/emoji/facebook_messenger/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/facebook_messenger/art.png b/public/images/emoji/facebook_messenger/art.png
new file mode 100644
index 00000000000..416c995030d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/art.png differ
diff --git a/public/images/emoji/facebook_messenger/articulated_lorry.png b/public/images/emoji/facebook_messenger/articulated_lorry.png
new file mode 100644
index 00000000000..d965f6a4903
Binary files /dev/null and b/public/images/emoji/facebook_messenger/articulated_lorry.png differ
diff --git a/public/images/emoji/facebook_messenger/artificial_satellite.png b/public/images/emoji/facebook_messenger/artificial_satellite.png
new file mode 100644
index 00000000000..81715516af6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/artificial_satellite.png differ
diff --git a/public/images/emoji/facebook_messenger/aruba.png b/public/images/emoji/facebook_messenger/aruba.png
new file mode 100644
index 00000000000..459facc13b1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/aruba.png differ
diff --git a/public/images/emoji/facebook_messenger/ascension_island.png b/public/images/emoji/facebook_messenger/ascension_island.png
new file mode 100644
index 00000000000..2e3a1fdd737
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ascension_island.png differ
diff --git a/public/images/emoji/facebook_messenger/asterisk.png b/public/images/emoji/facebook_messenger/asterisk.png
new file mode 100644
index 00000000000..2bfefce2bec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/asterisk.png differ
diff --git a/public/images/emoji/facebook_messenger/astonished.png b/public/images/emoji/facebook_messenger/astonished.png
new file mode 100644
index 00000000000..915e4818899
Binary files /dev/null and b/public/images/emoji/facebook_messenger/astonished.png differ
diff --git a/public/images/emoji/facebook_messenger/athletic_shoe.png b/public/images/emoji/facebook_messenger/athletic_shoe.png
new file mode 100644
index 00000000000..5c5909a17d5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/athletic_shoe.png differ
diff --git a/public/images/emoji/facebook_messenger/atm.png b/public/images/emoji/facebook_messenger/atm.png
new file mode 100644
index 00000000000..4cfeb25e641
Binary files /dev/null and b/public/images/emoji/facebook_messenger/atm.png differ
diff --git a/public/images/emoji/facebook_messenger/atom.png b/public/images/emoji/facebook_messenger/atom.png
new file mode 100644
index 00000000000..3d27cd89537
Binary files /dev/null and b/public/images/emoji/facebook_messenger/atom.png differ
diff --git a/public/images/emoji/facebook_messenger/atom_symbol.png b/public/images/emoji/facebook_messenger/atom_symbol.png
new file mode 100644
index 00000000000..3d27cd89537
Binary files /dev/null and b/public/images/emoji/facebook_messenger/atom_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/australia.png b/public/images/emoji/facebook_messenger/australia.png
new file mode 100644
index 00000000000..edd74bfd734
Binary files /dev/null and b/public/images/emoji/facebook_messenger/australia.png differ
diff --git a/public/images/emoji/facebook_messenger/austria.png b/public/images/emoji/facebook_messenger/austria.png
new file mode 100644
index 00000000000..c0e176217bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/austria.png differ
diff --git a/public/images/emoji/facebook_messenger/automobile.png b/public/images/emoji/facebook_messenger/automobile.png
new file mode 100644
index 00000000000..024cdb23b51
Binary files /dev/null and b/public/images/emoji/facebook_messenger/automobile.png differ
diff --git a/public/images/emoji/facebook_messenger/avocado.png b/public/images/emoji/facebook_messenger/avocado.png
new file mode 100644
index 00000000000..faa8c8fbe79
Binary files /dev/null and b/public/images/emoji/facebook_messenger/avocado.png differ
diff --git a/public/images/emoji/facebook_messenger/azerbaijan.png b/public/images/emoji/facebook_messenger/azerbaijan.png
new file mode 100644
index 00000000000..59b4ecf2a0a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/azerbaijan.png differ
diff --git a/public/images/emoji/facebook_messenger/b.png b/public/images/emoji/facebook_messenger/b.png
new file mode 100644
index 00000000000..4e3c3241ee3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/b.png differ
diff --git a/public/images/emoji/facebook_messenger/baby.png b/public/images/emoji/facebook_messenger/baby.png
new file mode 100644
index 00000000000..3250db1a61a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baby.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/2.png b/public/images/emoji/facebook_messenger/baby/2.png
new file mode 100644
index 00000000000..ba7d05faa16
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baby/2.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/3.png b/public/images/emoji/facebook_messenger/baby/3.png
new file mode 100644
index 00000000000..02393b8bf14
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baby/3.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/4.png b/public/images/emoji/facebook_messenger/baby/4.png
new file mode 100644
index 00000000000..43b9d1234c0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baby/4.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/5.png b/public/images/emoji/facebook_messenger/baby/5.png
new file mode 100644
index 00000000000..8d394e75d94
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baby/5.png differ
diff --git a/public/images/emoji/facebook_messenger/baby/6.png b/public/images/emoji/facebook_messenger/baby/6.png
new file mode 100644
index 00000000000..db838c47904
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baby/6.png differ
diff --git a/public/images/emoji/facebook_messenger/baby_bottle.png b/public/images/emoji/facebook_messenger/baby_bottle.png
new file mode 100644
index 00000000000..8a7f5d04096
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baby_bottle.png differ
diff --git a/public/images/emoji/facebook_messenger/baby_chick.png b/public/images/emoji/facebook_messenger/baby_chick.png
new file mode 100644
index 00000000000..c01948acd5e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baby_chick.png differ
diff --git a/public/images/emoji/facebook_messenger/baby_symbol.png b/public/images/emoji/facebook_messenger/baby_symbol.png
new file mode 100644
index 00000000000..d90dc597c14
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baby_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/back.png b/public/images/emoji/facebook_messenger/back.png
new file mode 100644
index 00000000000..b38f5260627
Binary files /dev/null and b/public/images/emoji/facebook_messenger/back.png differ
diff --git a/public/images/emoji/facebook_messenger/bacon.png b/public/images/emoji/facebook_messenger/bacon.png
new file mode 100644
index 00000000000..b1cfa9dc3b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bacon.png differ
diff --git a/public/images/emoji/facebook_messenger/badminton.png b/public/images/emoji/facebook_messenger/badminton.png
new file mode 100644
index 00000000000..3b5d0df295d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/badminton.png differ
diff --git a/public/images/emoji/facebook_messenger/baggage_claim.png b/public/images/emoji/facebook_messenger/baggage_claim.png
new file mode 100644
index 00000000000..62234d5dba4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baggage_claim.png differ
diff --git a/public/images/emoji/facebook_messenger/baguette_bread.png b/public/images/emoji/facebook_messenger/baguette_bread.png
new file mode 100644
index 00000000000..3be5a539033
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baguette_bread.png differ
diff --git a/public/images/emoji/facebook_messenger/bahamas.png b/public/images/emoji/facebook_messenger/bahamas.png
new file mode 100644
index 00000000000..ed95128e196
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bahamas.png differ
diff --git a/public/images/emoji/facebook_messenger/bahrain.png b/public/images/emoji/facebook_messenger/bahrain.png
new file mode 100644
index 00000000000..815a93ef0bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bahrain.png differ
diff --git a/public/images/emoji/facebook_messenger/balance_scale.png b/public/images/emoji/facebook_messenger/balance_scale.png
new file mode 100644
index 00000000000..75713abc23d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/balance_scale.png differ
diff --git a/public/images/emoji/facebook_messenger/balloon.png b/public/images/emoji/facebook_messenger/balloon.png
new file mode 100644
index 00000000000..4c1986ac6fb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/balloon.png differ
diff --git a/public/images/emoji/facebook_messenger/ballot_box.png b/public/images/emoji/facebook_messenger/ballot_box.png
new file mode 100644
index 00000000000..59bfa2ae2fc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ballot_box.png differ
diff --git a/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png b/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png
new file mode 100644
index 00000000000..59bfa2ae2fc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/facebook_messenger/ballot_box_with_check.png b/public/images/emoji/facebook_messenger/ballot_box_with_check.png
new file mode 100644
index 00000000000..80b2e3fda4f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ballot_box_with_check.png differ
diff --git a/public/images/emoji/facebook_messenger/bamboo.png b/public/images/emoji/facebook_messenger/bamboo.png
new file mode 100644
index 00000000000..f364eba710c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bamboo.png differ
diff --git a/public/images/emoji/facebook_messenger/banana.png b/public/images/emoji/facebook_messenger/banana.png
new file mode 100644
index 00000000000..cf8781b5eff
Binary files /dev/null and b/public/images/emoji/facebook_messenger/banana.png differ
diff --git a/public/images/emoji/facebook_messenger/bangbang.png b/public/images/emoji/facebook_messenger/bangbang.png
new file mode 100644
index 00000000000..f14ac06077a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bangbang.png differ
diff --git a/public/images/emoji/facebook_messenger/bangladesh.png b/public/images/emoji/facebook_messenger/bangladesh.png
new file mode 100644
index 00000000000..caab400018c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bangladesh.png differ
diff --git a/public/images/emoji/facebook_messenger/bank.png b/public/images/emoji/facebook_messenger/bank.png
new file mode 100644
index 00000000000..bb8a2828011
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bank.png differ
diff --git a/public/images/emoji/facebook_messenger/bar_chart.png b/public/images/emoji/facebook_messenger/bar_chart.png
new file mode 100644
index 00000000000..2cd9961c950
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bar_chart.png differ
diff --git a/public/images/emoji/facebook_messenger/barbados.png b/public/images/emoji/facebook_messenger/barbados.png
new file mode 100644
index 00000000000..830578344d9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/barbados.png differ
diff --git a/public/images/emoji/facebook_messenger/barber.png b/public/images/emoji/facebook_messenger/barber.png
new file mode 100644
index 00000000000..2cdda450a89
Binary files /dev/null and b/public/images/emoji/facebook_messenger/barber.png differ
diff --git a/public/images/emoji/facebook_messenger/baseball.png b/public/images/emoji/facebook_messenger/baseball.png
new file mode 100644
index 00000000000..20a21d567ee
Binary files /dev/null and b/public/images/emoji/facebook_messenger/baseball.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball.png b/public/images/emoji/facebook_messenger/basketball.png
new file mode 100644
index 00000000000..fbff78ffbbe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man.png b/public/images/emoji/facebook_messenger/basketball_man.png
new file mode 100644
index 00000000000..ac6a6c2c9f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_man.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/2.png b/public/images/emoji/facebook_messenger/basketball_man/2.png
new file mode 100644
index 00000000000..4dad1da7dbe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/3.png b/public/images/emoji/facebook_messenger/basketball_man/3.png
new file mode 100644
index 00000000000..739f1de58c0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/4.png b/public/images/emoji/facebook_messenger/basketball_man/4.png
new file mode 100644
index 00000000000..62a23de4665
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/5.png b/public/images/emoji/facebook_messenger/basketball_man/5.png
new file mode 100644
index 00000000000..2cd9628b760
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_man/6.png b/public/images/emoji/facebook_messenger/basketball_man/6.png
new file mode 100644
index 00000000000..85bfaeb5785
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player.png b/public/images/emoji/facebook_messenger/basketball_player.png
new file mode 100644
index 00000000000..ac6a6c2c9f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_player.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/2.png b/public/images/emoji/facebook_messenger/basketball_player/2.png
new file mode 100644
index 00000000000..4dad1da7dbe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_player/2.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/3.png b/public/images/emoji/facebook_messenger/basketball_player/3.png
new file mode 100644
index 00000000000..739f1de58c0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_player/3.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/4.png b/public/images/emoji/facebook_messenger/basketball_player/4.png
new file mode 100644
index 00000000000..62a23de4665
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_player/4.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/5.png b/public/images/emoji/facebook_messenger/basketball_player/5.png
new file mode 100644
index 00000000000..2cd9628b760
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_player/5.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_player/6.png b/public/images/emoji/facebook_messenger/basketball_player/6.png
new file mode 100644
index 00000000000..85bfaeb5785
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_player/6.png differ
diff --git a/public/images/emoji/facebook_messenger/basketball_woman.png b/public/images/emoji/facebook_messenger/basketball_woman.png
new file mode 100644
index 00000000000..7df66bcfb7b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/basketball_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/bat.png b/public/images/emoji/facebook_messenger/bat.png
new file mode 100644
index 00000000000..d997111fc5f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bat.png differ
diff --git a/public/images/emoji/facebook_messenger/bath.png b/public/images/emoji/facebook_messenger/bath.png
new file mode 100644
index 00000000000..2173defed8e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bath.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/2.png b/public/images/emoji/facebook_messenger/bath/2.png
new file mode 100644
index 00000000000..9ca3e7b1cbc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bath/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/3.png b/public/images/emoji/facebook_messenger/bath/3.png
new file mode 100644
index 00000000000..2ffaa936809
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bath/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/4.png b/public/images/emoji/facebook_messenger/bath/4.png
new file mode 100644
index 00000000000..008ff97772e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bath/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/5.png b/public/images/emoji/facebook_messenger/bath/5.png
new file mode 100644
index 00000000000..09c0ac3fe92
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bath/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bath/6.png b/public/images/emoji/facebook_messenger/bath/6.png
new file mode 100644
index 00000000000..857b92f2319
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bath/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bathtub.png b/public/images/emoji/facebook_messenger/bathtub.png
new file mode 100644
index 00000000000..6ac723e1c82
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bathtub.png differ
diff --git a/public/images/emoji/facebook_messenger/battery.png b/public/images/emoji/facebook_messenger/battery.png
new file mode 100644
index 00000000000..a63f16624f7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/battery.png differ
diff --git a/public/images/emoji/facebook_messenger/beach.png b/public/images/emoji/facebook_messenger/beach.png
new file mode 100644
index 00000000000..894e33bee13
Binary files /dev/null and b/public/images/emoji/facebook_messenger/beach.png differ
diff --git a/public/images/emoji/facebook_messenger/beach_umbrella.png b/public/images/emoji/facebook_messenger/beach_umbrella.png
new file mode 100644
index 00000000000..894e33bee13
Binary files /dev/null and b/public/images/emoji/facebook_messenger/beach_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/beach_with_umbrella.png b/public/images/emoji/facebook_messenger/beach_with_umbrella.png
new file mode 100644
index 00000000000..894e33bee13
Binary files /dev/null and b/public/images/emoji/facebook_messenger/beach_with_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/bear.png b/public/images/emoji/facebook_messenger/bear.png
new file mode 100644
index 00000000000..8e052d9adbe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bear.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person.png b/public/images/emoji/facebook_messenger/bearded_person.png
new file mode 100644
index 00000000000..ed22a6cb381
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bearded_person.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/2.png b/public/images/emoji/facebook_messenger/bearded_person/2.png
new file mode 100644
index 00000000000..4a2fdeb3040
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bearded_person/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/3.png b/public/images/emoji/facebook_messenger/bearded_person/3.png
new file mode 100644
index 00000000000..b1f6e168d7c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bearded_person/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/4.png b/public/images/emoji/facebook_messenger/bearded_person/4.png
new file mode 100644
index 00000000000..f75b75a74e9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bearded_person/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/5.png b/public/images/emoji/facebook_messenger/bearded_person/5.png
new file mode 100644
index 00000000000..a9665b318a4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bearded_person/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bearded_person/6.png b/public/images/emoji/facebook_messenger/bearded_person/6.png
new file mode 100644
index 00000000000..a42b3caf88c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bearded_person/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bed.png b/public/images/emoji/facebook_messenger/bed.png
new file mode 100644
index 00000000000..98d795e8476
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bed.png differ
diff --git a/public/images/emoji/facebook_messenger/bee.png b/public/images/emoji/facebook_messenger/bee.png
new file mode 100644
index 00000000000..b4b2bff015b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bee.png differ
diff --git a/public/images/emoji/facebook_messenger/beer.png b/public/images/emoji/facebook_messenger/beer.png
new file mode 100644
index 00000000000..035842b0056
Binary files /dev/null and b/public/images/emoji/facebook_messenger/beer.png differ
diff --git a/public/images/emoji/facebook_messenger/beers.png b/public/images/emoji/facebook_messenger/beers.png
new file mode 100644
index 00000000000..f69c94220ed
Binary files /dev/null and b/public/images/emoji/facebook_messenger/beers.png differ
diff --git a/public/images/emoji/facebook_messenger/beetle.png b/public/images/emoji/facebook_messenger/beetle.png
new file mode 100644
index 00000000000..01bc9362c18
Binary files /dev/null and b/public/images/emoji/facebook_messenger/beetle.png differ
diff --git a/public/images/emoji/facebook_messenger/beginner.png b/public/images/emoji/facebook_messenger/beginner.png
new file mode 100644
index 00000000000..80429e29ecb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/beginner.png differ
diff --git a/public/images/emoji/facebook_messenger/belarus.png b/public/images/emoji/facebook_messenger/belarus.png
new file mode 100644
index 00000000000..e75dc9ec50b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/belarus.png differ
diff --git a/public/images/emoji/facebook_messenger/belgium.png b/public/images/emoji/facebook_messenger/belgium.png
new file mode 100644
index 00000000000..faa710e2110
Binary files /dev/null and b/public/images/emoji/facebook_messenger/belgium.png differ
diff --git a/public/images/emoji/facebook_messenger/belize.png b/public/images/emoji/facebook_messenger/belize.png
new file mode 100644
index 00000000000..5f6dded80bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/belize.png differ
diff --git a/public/images/emoji/facebook_messenger/bell.png b/public/images/emoji/facebook_messenger/bell.png
new file mode 100644
index 00000000000..50bd10b5db9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bell.png differ
diff --git a/public/images/emoji/facebook_messenger/bellhop.png b/public/images/emoji/facebook_messenger/bellhop.png
new file mode 100644
index 00000000000..21a073029d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bellhop.png differ
diff --git a/public/images/emoji/facebook_messenger/bellhop_bell.png b/public/images/emoji/facebook_messenger/bellhop_bell.png
new file mode 100644
index 00000000000..21a073029d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bellhop_bell.png differ
diff --git a/public/images/emoji/facebook_messenger/benin.png b/public/images/emoji/facebook_messenger/benin.png
new file mode 100644
index 00000000000..bb74e98818a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/benin.png differ
diff --git a/public/images/emoji/facebook_messenger/bento.png b/public/images/emoji/facebook_messenger/bento.png
new file mode 100644
index 00000000000..6f1ce980f39
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bento.png differ
diff --git a/public/images/emoji/facebook_messenger/bermuda.png b/public/images/emoji/facebook_messenger/bermuda.png
new file mode 100644
index 00000000000..75f2fac7609
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bermuda.png differ
diff --git a/public/images/emoji/facebook_messenger/bhutan.png b/public/images/emoji/facebook_messenger/bhutan.png
new file mode 100644
index 00000000000..d9a2d20fc1f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bhutan.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist.png b/public/images/emoji/facebook_messenger/bicyclist.png
new file mode 100644
index 00000000000..e2079b8040e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bicyclist.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/2.png b/public/images/emoji/facebook_messenger/bicyclist/2.png
new file mode 100644
index 00000000000..120dba4f56c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bicyclist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/3.png b/public/images/emoji/facebook_messenger/bicyclist/3.png
new file mode 100644
index 00000000000..108f8765b6c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bicyclist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/4.png b/public/images/emoji/facebook_messenger/bicyclist/4.png
new file mode 100644
index 00000000000..96e0fc4e076
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bicyclist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/5.png b/public/images/emoji/facebook_messenger/bicyclist/5.png
new file mode 100644
index 00000000000..37d2867b23f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bicyclist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bicyclist/6.png b/public/images/emoji/facebook_messenger/bicyclist/6.png
new file mode 100644
index 00000000000..454968531e7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bicyclist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bike.png b/public/images/emoji/facebook_messenger/bike.png
new file mode 100644
index 00000000000..56d1d538d50
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bike.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man.png b/public/images/emoji/facebook_messenger/biking_man.png
new file mode 100644
index 00000000000..e2079b8040e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/2.png b/public/images/emoji/facebook_messenger/biking_man/2.png
new file mode 100644
index 00000000000..120dba4f56c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/3.png b/public/images/emoji/facebook_messenger/biking_man/3.png
new file mode 100644
index 00000000000..108f8765b6c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/4.png b/public/images/emoji/facebook_messenger/biking_man/4.png
new file mode 100644
index 00000000000..96e0fc4e076
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/5.png b/public/images/emoji/facebook_messenger/biking_man/5.png
new file mode 100644
index 00000000000..37d2867b23f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_man/6.png b/public/images/emoji/facebook_messenger/biking_man/6.png
new file mode 100644
index 00000000000..454968531e7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman.png b/public/images/emoji/facebook_messenger/biking_woman.png
new file mode 100644
index 00000000000..eab8bcf9f62
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/2.png b/public/images/emoji/facebook_messenger/biking_woman/2.png
new file mode 100644
index 00000000000..39b2f70d9a6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/3.png b/public/images/emoji/facebook_messenger/biking_woman/3.png
new file mode 100644
index 00000000000..1cdb55d7bd1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/4.png b/public/images/emoji/facebook_messenger/biking_woman/4.png
new file mode 100644
index 00000000000..1479fbc064f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/5.png b/public/images/emoji/facebook_messenger/biking_woman/5.png
new file mode 100644
index 00000000000..521d5bf8850
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/biking_woman/6.png b/public/images/emoji/facebook_messenger/biking_woman/6.png
new file mode 100644
index 00000000000..bb3897810e7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biking_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bikini.png b/public/images/emoji/facebook_messenger/bikini.png
new file mode 100644
index 00000000000..9ddf6bbc4ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bikini.png differ
diff --git a/public/images/emoji/facebook_messenger/billed_cap.png b/public/images/emoji/facebook_messenger/billed_cap.png
new file mode 100644
index 00000000000..5cc92e307e1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/billed_cap.png differ
diff --git a/public/images/emoji/facebook_messenger/biohazard.png b/public/images/emoji/facebook_messenger/biohazard.png
new file mode 100644
index 00000000000..95f312482cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biohazard.png differ
diff --git a/public/images/emoji/facebook_messenger/biohazard_sign.png b/public/images/emoji/facebook_messenger/biohazard_sign.png
new file mode 100644
index 00000000000..95f312482cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/biohazard_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/bird.png b/public/images/emoji/facebook_messenger/bird.png
new file mode 100644
index 00000000000..23e76124179
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bird.png differ
diff --git a/public/images/emoji/facebook_messenger/birthday.png b/public/images/emoji/facebook_messenger/birthday.png
new file mode 100644
index 00000000000..1d1dd505858
Binary files /dev/null and b/public/images/emoji/facebook_messenger/birthday.png differ
diff --git a/public/images/emoji/facebook_messenger/black_circle.png b/public/images/emoji/facebook_messenger/black_circle.png
new file mode 100644
index 00000000000..b6dd0cc78b1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/black_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/black_flag.png b/public/images/emoji/facebook_messenger/black_flag.png
new file mode 100644
index 00000000000..5c1237bdad2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/black_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/black_heart.png b/public/images/emoji/facebook_messenger/black_heart.png
new file mode 100644
index 00000000000..b2378197554
Binary files /dev/null and b/public/images/emoji/facebook_messenger/black_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/black_joker.png b/public/images/emoji/facebook_messenger/black_joker.png
new file mode 100644
index 00000000000..5666f561d15
Binary files /dev/null and b/public/images/emoji/facebook_messenger/black_joker.png differ
diff --git a/public/images/emoji/facebook_messenger/black_large_square.png b/public/images/emoji/facebook_messenger/black_large_square.png
new file mode 100644
index 00000000000..b9af66d4328
Binary files /dev/null and b/public/images/emoji/facebook_messenger/black_large_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_medium_small_square.png b/public/images/emoji/facebook_messenger/black_medium_small_square.png
new file mode 100644
index 00000000000..7fe4d1187d6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/black_medium_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_medium_square.png b/public/images/emoji/facebook_messenger/black_medium_square.png
new file mode 100644
index 00000000000..5e67a2f95d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/black_medium_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_nib.png b/public/images/emoji/facebook_messenger/black_nib.png
new file mode 100644
index 00000000000..6bc6df45cb2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/black_nib.png differ
diff --git a/public/images/emoji/facebook_messenger/black_small_square.png b/public/images/emoji/facebook_messenger/black_small_square.png
new file mode 100644
index 00000000000..7a9dac388b4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/black_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/black_square_button.png b/public/images/emoji/facebook_messenger/black_square_button.png
new file mode 100644
index 00000000000..acdb7812c3e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/black_square_button.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man.png b/public/images/emoji/facebook_messenger/blonde_man.png
new file mode 100644
index 00000000000..cfe7273eb3a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_man.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/2.png b/public/images/emoji/facebook_messenger/blonde_man/2.png
new file mode 100644
index 00000000000..aee96b85a74
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/3.png b/public/images/emoji/facebook_messenger/blonde_man/3.png
new file mode 100644
index 00000000000..b4fffd5a303
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/4.png b/public/images/emoji/facebook_messenger/blonde_man/4.png
new file mode 100644
index 00000000000..d8d6a0de15e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/5.png b/public/images/emoji/facebook_messenger/blonde_man/5.png
new file mode 100644
index 00000000000..6a573ffb48a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_man/6.png b/public/images/emoji/facebook_messenger/blonde_man/6.png
new file mode 100644
index 00000000000..1cefe68636a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman.png b/public/images/emoji/facebook_messenger/blonde_woman.png
new file mode 100644
index 00000000000..11e258fa617
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/2.png b/public/images/emoji/facebook_messenger/blonde_woman/2.png
new file mode 100644
index 00000000000..70e3888d3eb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/3.png b/public/images/emoji/facebook_messenger/blonde_woman/3.png
new file mode 100644
index 00000000000..52e92bb7d6b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/4.png b/public/images/emoji/facebook_messenger/blonde_woman/4.png
new file mode 100644
index 00000000000..37108efb1f2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/5.png b/public/images/emoji/facebook_messenger/blonde_woman/5.png
new file mode 100644
index 00000000000..a7c2fcdfd9b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/blonde_woman/6.png b/public/images/emoji/facebook_messenger/blonde_woman/6.png
new file mode 100644
index 00000000000..0a8ee484ce3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blonde_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/blossom.png b/public/images/emoji/facebook_messenger/blossom.png
new file mode 100644
index 00000000000..cc6fb6e6176
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blossom.png differ
diff --git a/public/images/emoji/facebook_messenger/blowfish.png b/public/images/emoji/facebook_messenger/blowfish.png
new file mode 100644
index 00000000000..5d39475b064
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blowfish.png differ
diff --git a/public/images/emoji/facebook_messenger/blue_book.png b/public/images/emoji/facebook_messenger/blue_book.png
new file mode 100644
index 00000000000..ce96b52fc34
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blue_book.png differ
diff --git a/public/images/emoji/facebook_messenger/blue_car.png b/public/images/emoji/facebook_messenger/blue_car.png
new file mode 100644
index 00000000000..b4976f11243
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blue_car.png differ
diff --git a/public/images/emoji/facebook_messenger/blue_heart.png b/public/images/emoji/facebook_messenger/blue_heart.png
new file mode 100644
index 00000000000..b81cebfba17
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blue_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/blush.png b/public/images/emoji/facebook_messenger/blush.png
new file mode 100644
index 00000000000..5db3f3a78c9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/blush.png differ
diff --git a/public/images/emoji/facebook_messenger/boar.png b/public/images/emoji/facebook_messenger/boar.png
new file mode 100644
index 00000000000..09614c37228
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boar.png differ
diff --git a/public/images/emoji/facebook_messenger/boat.png b/public/images/emoji/facebook_messenger/boat.png
new file mode 100644
index 00000000000..3eba365766f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boat.png differ
diff --git a/public/images/emoji/facebook_messenger/bolivia.png b/public/images/emoji/facebook_messenger/bolivia.png
new file mode 100644
index 00000000000..af9bd4d5e7a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bolivia.png differ
diff --git a/public/images/emoji/facebook_messenger/bomb.png b/public/images/emoji/facebook_messenger/bomb.png
new file mode 100644
index 00000000000..5afa9092b4a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bomb.png differ
diff --git a/public/images/emoji/facebook_messenger/book.png b/public/images/emoji/facebook_messenger/book.png
new file mode 100644
index 00000000000..466a96d4dc2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/book.png differ
diff --git a/public/images/emoji/facebook_messenger/bookmark.png b/public/images/emoji/facebook_messenger/bookmark.png
new file mode 100644
index 00000000000..896268d22bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bookmark.png differ
diff --git a/public/images/emoji/facebook_messenger/bookmark_tabs.png b/public/images/emoji/facebook_messenger/bookmark_tabs.png
new file mode 100644
index 00000000000..b26787ae8a1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bookmark_tabs.png differ
diff --git a/public/images/emoji/facebook_messenger/books.png b/public/images/emoji/facebook_messenger/books.png
new file mode 100644
index 00000000000..77002adc857
Binary files /dev/null and b/public/images/emoji/facebook_messenger/books.png differ
diff --git a/public/images/emoji/facebook_messenger/boom.png b/public/images/emoji/facebook_messenger/boom.png
new file mode 100644
index 00000000000..786e74def77
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boom.png differ
diff --git a/public/images/emoji/facebook_messenger/boot.png b/public/images/emoji/facebook_messenger/boot.png
new file mode 100644
index 00000000000..8675b479402
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boot.png differ
diff --git a/public/images/emoji/facebook_messenger/bosnia_herzegovina.png b/public/images/emoji/facebook_messenger/bosnia_herzegovina.png
new file mode 100644
index 00000000000..91493ade758
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/facebook_messenger/botswana.png b/public/images/emoji/facebook_messenger/botswana.png
new file mode 100644
index 00000000000..3697a723dd3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/botswana.png differ
diff --git a/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png b/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png
new file mode 100644
index 00000000000..49ea37f3899
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/facebook_messenger/bouquet.png b/public/images/emoji/facebook_messenger/bouquet.png
new file mode 100644
index 00000000000..7bf622d7361
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bouquet.png differ
diff --git a/public/images/emoji/facebook_messenger/bouvet_island.png b/public/images/emoji/facebook_messenger/bouvet_island.png
new file mode 100644
index 00000000000..801a5776543
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bouvet_island.png differ
diff --git a/public/images/emoji/facebook_messenger/bow.png b/public/images/emoji/facebook_messenger/bow.png
new file mode 100644
index 00000000000..8bcfb359109
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bow.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/2.png b/public/images/emoji/facebook_messenger/bow/2.png
new file mode 100644
index 00000000000..dbcc662a1dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bow/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/3.png b/public/images/emoji/facebook_messenger/bow/3.png
new file mode 100644
index 00000000000..e764892f5be
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bow/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/4.png b/public/images/emoji/facebook_messenger/bow/4.png
new file mode 100644
index 00000000000..0a33d718d2b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bow/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/5.png b/public/images/emoji/facebook_messenger/bow/5.png
new file mode 100644
index 00000000000..f6f4b24775b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bow/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bow/6.png b/public/images/emoji/facebook_messenger/bow/6.png
new file mode 100644
index 00000000000..ef61032004b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bow/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bow_and_arrow.png b/public/images/emoji/facebook_messenger/bow_and_arrow.png
new file mode 100644
index 00000000000..f50a1389fef
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bow_and_arrow.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man.png b/public/images/emoji/facebook_messenger/bowing_man.png
new file mode 100644
index 00000000000..8bcfb359109
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/2.png b/public/images/emoji/facebook_messenger/bowing_man/2.png
new file mode 100644
index 00000000000..dbcc662a1dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/3.png b/public/images/emoji/facebook_messenger/bowing_man/3.png
new file mode 100644
index 00000000000..e764892f5be
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/4.png b/public/images/emoji/facebook_messenger/bowing_man/4.png
new file mode 100644
index 00000000000..0a33d718d2b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/5.png b/public/images/emoji/facebook_messenger/bowing_man/5.png
new file mode 100644
index 00000000000..f6f4b24775b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_man/6.png b/public/images/emoji/facebook_messenger/bowing_man/6.png
new file mode 100644
index 00000000000..ef61032004b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman.png b/public/images/emoji/facebook_messenger/bowing_woman.png
new file mode 100644
index 00000000000..bbe859ce678
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/2.png b/public/images/emoji/facebook_messenger/bowing_woman/2.png
new file mode 100644
index 00000000000..e6fa7ca7f53
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/3.png b/public/images/emoji/facebook_messenger/bowing_woman/3.png
new file mode 100644
index 00000000000..206a3687086
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/4.png b/public/images/emoji/facebook_messenger/bowing_woman/4.png
new file mode 100644
index 00000000000..047411f9662
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/5.png b/public/images/emoji/facebook_messenger/bowing_woman/5.png
new file mode 100644
index 00000000000..9d43cffab0a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bowing_woman/6.png b/public/images/emoji/facebook_messenger/bowing_woman/6.png
new file mode 100644
index 00000000000..85a701f354e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowing_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bowl_with_spoon.png b/public/images/emoji/facebook_messenger/bowl_with_spoon.png
new file mode 100644
index 00000000000..b0d88a73b9d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowl_with_spoon.png differ
diff --git a/public/images/emoji/facebook_messenger/bowling.png b/public/images/emoji/facebook_messenger/bowling.png
new file mode 100644
index 00000000000..4b480dd9bf2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bowling.png differ
diff --git a/public/images/emoji/facebook_messenger/boxing_glove.png b/public/images/emoji/facebook_messenger/boxing_glove.png
new file mode 100644
index 00000000000..abb4d248341
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boxing_glove.png differ
diff --git a/public/images/emoji/facebook_messenger/boy.png b/public/images/emoji/facebook_messenger/boy.png
new file mode 100644
index 00000000000..28d4189bc1a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boy.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/2.png b/public/images/emoji/facebook_messenger/boy/2.png
new file mode 100644
index 00000000000..0a447532d81
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/3.png b/public/images/emoji/facebook_messenger/boy/3.png
new file mode 100644
index 00000000000..777a3f9cfbe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/4.png b/public/images/emoji/facebook_messenger/boy/4.png
new file mode 100644
index 00000000000..d0d67a57f5a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/5.png b/public/images/emoji/facebook_messenger/boy/5.png
new file mode 100644
index 00000000000..0d04819d226
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/boy/6.png b/public/images/emoji/facebook_messenger/boy/6.png
new file mode 100644
index 00000000000..c817adeeeb7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/boy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/brain.png b/public/images/emoji/facebook_messenger/brain.png
new file mode 100644
index 00000000000..c8e889faecf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/brain.png differ
diff --git a/public/images/emoji/facebook_messenger/brazil.png b/public/images/emoji/facebook_messenger/brazil.png
new file mode 100644
index 00000000000..f510542abc8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/brazil.png differ
diff --git a/public/images/emoji/facebook_messenger/bread.png b/public/images/emoji/facebook_messenger/bread.png
new file mode 100644
index 00000000000..4d4011d4490
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bread.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding.png b/public/images/emoji/facebook_messenger/breast_feeding.png
new file mode 100644
index 00000000000..815538138bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/breast_feeding.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/2.png b/public/images/emoji/facebook_messenger/breast_feeding/2.png
new file mode 100644
index 00000000000..fb591aa4fb4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/breast_feeding/2.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/3.png b/public/images/emoji/facebook_messenger/breast_feeding/3.png
new file mode 100644
index 00000000000..5adcffa4b94
Binary files /dev/null and b/public/images/emoji/facebook_messenger/breast_feeding/3.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/4.png b/public/images/emoji/facebook_messenger/breast_feeding/4.png
new file mode 100644
index 00000000000..d166f981b24
Binary files /dev/null and b/public/images/emoji/facebook_messenger/breast_feeding/4.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/5.png b/public/images/emoji/facebook_messenger/breast_feeding/5.png
new file mode 100644
index 00000000000..7c8cb50a780
Binary files /dev/null and b/public/images/emoji/facebook_messenger/breast_feeding/5.png differ
diff --git a/public/images/emoji/facebook_messenger/breast_feeding/6.png b/public/images/emoji/facebook_messenger/breast_feeding/6.png
new file mode 100644
index 00000000000..e113d8cb428
Binary files /dev/null and b/public/images/emoji/facebook_messenger/breast_feeding/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil.png b/public/images/emoji/facebook_messenger/bride_with_veil.png
new file mode 100644
index 00000000000..ffb60049020
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bride_with_veil.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/2.png b/public/images/emoji/facebook_messenger/bride_with_veil/2.png
new file mode 100644
index 00000000000..f279c55580a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bride_with_veil/2.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/3.png b/public/images/emoji/facebook_messenger/bride_with_veil/3.png
new file mode 100644
index 00000000000..016fae0a30c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bride_with_veil/3.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/4.png b/public/images/emoji/facebook_messenger/bride_with_veil/4.png
new file mode 100644
index 00000000000..d257eb58b75
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bride_with_veil/4.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/5.png b/public/images/emoji/facebook_messenger/bride_with_veil/5.png
new file mode 100644
index 00000000000..76478e5f9c2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bride_with_veil/5.png differ
diff --git a/public/images/emoji/facebook_messenger/bride_with_veil/6.png b/public/images/emoji/facebook_messenger/bride_with_veil/6.png
new file mode 100644
index 00000000000..3b592cdefb8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bride_with_veil/6.png differ
diff --git a/public/images/emoji/facebook_messenger/bridge_at_night.png b/public/images/emoji/facebook_messenger/bridge_at_night.png
new file mode 100644
index 00000000000..742e0629fd5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bridge_at_night.png differ
diff --git a/public/images/emoji/facebook_messenger/briefcase.png b/public/images/emoji/facebook_messenger/briefcase.png
new file mode 100644
index 00000000000..0dbe9606a3f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/briefcase.png differ
diff --git a/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png b/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png
new file mode 100644
index 00000000000..e3d2479344f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/facebook_messenger/british_virgin_islands.png b/public/images/emoji/facebook_messenger/british_virgin_islands.png
new file mode 100644
index 00000000000..9f758979a16
Binary files /dev/null and b/public/images/emoji/facebook_messenger/british_virgin_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/broccoli.png b/public/images/emoji/facebook_messenger/broccoli.png
new file mode 100644
index 00000000000..5e03a6d23ba
Binary files /dev/null and b/public/images/emoji/facebook_messenger/broccoli.png differ
diff --git a/public/images/emoji/facebook_messenger/broken_heart.png b/public/images/emoji/facebook_messenger/broken_heart.png
new file mode 100644
index 00000000000..3f16d80d9e8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/broken_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/brunei.png b/public/images/emoji/facebook_messenger/brunei.png
new file mode 100644
index 00000000000..647e1c4d79b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/brunei.png differ
diff --git a/public/images/emoji/facebook_messenger/bug.png b/public/images/emoji/facebook_messenger/bug.png
new file mode 100644
index 00000000000..bea8c8c0b6f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bug.png differ
diff --git a/public/images/emoji/facebook_messenger/building_construction.png b/public/images/emoji/facebook_messenger/building_construction.png
new file mode 100644
index 00000000000..24cdec2e5fd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/building_construction.png differ
diff --git a/public/images/emoji/facebook_messenger/bulb.png b/public/images/emoji/facebook_messenger/bulb.png
new file mode 100644
index 00000000000..485bf7f6a45
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bulb.png differ
diff --git a/public/images/emoji/facebook_messenger/bulgaria.png b/public/images/emoji/facebook_messenger/bulgaria.png
new file mode 100644
index 00000000000..5185700c636
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bulgaria.png differ
diff --git a/public/images/emoji/facebook_messenger/bullettrain_front.png b/public/images/emoji/facebook_messenger/bullettrain_front.png
new file mode 100644
index 00000000000..70218a9ea2c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bullettrain_front.png differ
diff --git a/public/images/emoji/facebook_messenger/bullettrain_side.png b/public/images/emoji/facebook_messenger/bullettrain_side.png
new file mode 100644
index 00000000000..8e23c7097cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bullettrain_side.png differ
diff --git a/public/images/emoji/facebook_messenger/burkina_faso.png b/public/images/emoji/facebook_messenger/burkina_faso.png
new file mode 100644
index 00000000000..c519f8a954c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/burkina_faso.png differ
diff --git a/public/images/emoji/facebook_messenger/burrito.png b/public/images/emoji/facebook_messenger/burrito.png
new file mode 100644
index 00000000000..74894241cc2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/burrito.png differ
diff --git a/public/images/emoji/facebook_messenger/burundi.png b/public/images/emoji/facebook_messenger/burundi.png
new file mode 100644
index 00000000000..83e731cc34f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/burundi.png differ
diff --git a/public/images/emoji/facebook_messenger/bus.png b/public/images/emoji/facebook_messenger/bus.png
new file mode 100644
index 00000000000..a8a91afa97b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bus.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating.png b/public/images/emoji/facebook_messenger/business_suit_levitating.png
new file mode 100644
index 00000000000..5231c708a03
Binary files /dev/null and b/public/images/emoji/facebook_messenger/business_suit_levitating.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/2.png b/public/images/emoji/facebook_messenger/business_suit_levitating/2.png
new file mode 100644
index 00000000000..753693b093b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/3.png b/public/images/emoji/facebook_messenger/business_suit_levitating/3.png
new file mode 100644
index 00000000000..f56875edac9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/4.png b/public/images/emoji/facebook_messenger/business_suit_levitating/4.png
new file mode 100644
index 00000000000..37d74f5c97d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/5.png b/public/images/emoji/facebook_messenger/business_suit_levitating/5.png
new file mode 100644
index 00000000000..5a48f961920
Binary files /dev/null and b/public/images/emoji/facebook_messenger/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/facebook_messenger/business_suit_levitating/6.png b/public/images/emoji/facebook_messenger/business_suit_levitating/6.png
new file mode 100644
index 00000000000..61507408172
Binary files /dev/null and b/public/images/emoji/facebook_messenger/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/facebook_messenger/busstop.png b/public/images/emoji/facebook_messenger/busstop.png
new file mode 100644
index 00000000000..ac57b9d39f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/busstop.png differ
diff --git a/public/images/emoji/facebook_messenger/bust_in_silhouette.png b/public/images/emoji/facebook_messenger/bust_in_silhouette.png
new file mode 100644
index 00000000000..74594226111
Binary files /dev/null and b/public/images/emoji/facebook_messenger/bust_in_silhouette.png differ
diff --git a/public/images/emoji/facebook_messenger/busts_in_silhouette.png b/public/images/emoji/facebook_messenger/busts_in_silhouette.png
new file mode 100644
index 00000000000..ecb85a45666
Binary files /dev/null and b/public/images/emoji/facebook_messenger/busts_in_silhouette.png differ
diff --git a/public/images/emoji/facebook_messenger/butterfly.png b/public/images/emoji/facebook_messenger/butterfly.png
new file mode 100644
index 00000000000..995ea58f802
Binary files /dev/null and b/public/images/emoji/facebook_messenger/butterfly.png differ
diff --git a/public/images/emoji/facebook_messenger/cactus.png b/public/images/emoji/facebook_messenger/cactus.png
new file mode 100644
index 00000000000..8b7a55a0fa0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cactus.png differ
diff --git a/public/images/emoji/facebook_messenger/cake.png b/public/images/emoji/facebook_messenger/cake.png
new file mode 100644
index 00000000000..e89e914f1a5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cake.png differ
diff --git a/public/images/emoji/facebook_messenger/calendar.png b/public/images/emoji/facebook_messenger/calendar.png
new file mode 100644
index 00000000000..b8b14b579a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/calendar.png differ
diff --git a/public/images/emoji/facebook_messenger/calendar_spiral.png b/public/images/emoji/facebook_messenger/calendar_spiral.png
new file mode 100644
index 00000000000..8cd3bd7e57f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/calendar_spiral.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand.png b/public/images/emoji/facebook_messenger/call_me_hand.png
new file mode 100644
index 00000000000..6e50aea9ee9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/call_me_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/2.png b/public/images/emoji/facebook_messenger/call_me_hand/2.png
new file mode 100644
index 00000000000..31a89ad6336
Binary files /dev/null and b/public/images/emoji/facebook_messenger/call_me_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/3.png b/public/images/emoji/facebook_messenger/call_me_hand/3.png
new file mode 100644
index 00000000000..d619e0b8d79
Binary files /dev/null and b/public/images/emoji/facebook_messenger/call_me_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/4.png b/public/images/emoji/facebook_messenger/call_me_hand/4.png
new file mode 100644
index 00000000000..f99492eb6c9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/call_me_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/5.png b/public/images/emoji/facebook_messenger/call_me_hand/5.png
new file mode 100644
index 00000000000..02be2857ff6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/call_me_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/call_me_hand/6.png b/public/images/emoji/facebook_messenger/call_me_hand/6.png
new file mode 100644
index 00000000000..f0c258b55b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/call_me_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/calling.png b/public/images/emoji/facebook_messenger/calling.png
new file mode 100644
index 00000000000..a6891ba5bdf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/calling.png differ
diff --git a/public/images/emoji/facebook_messenger/cambodia.png b/public/images/emoji/facebook_messenger/cambodia.png
new file mode 100644
index 00000000000..0a7ca06fb42
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cambodia.png differ
diff --git a/public/images/emoji/facebook_messenger/camel.png b/public/images/emoji/facebook_messenger/camel.png
new file mode 100644
index 00000000000..5f3c565b697
Binary files /dev/null and b/public/images/emoji/facebook_messenger/camel.png differ
diff --git a/public/images/emoji/facebook_messenger/camera.png b/public/images/emoji/facebook_messenger/camera.png
new file mode 100644
index 00000000000..fd24f1b440c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/camera.png differ
diff --git a/public/images/emoji/facebook_messenger/camera_flash.png b/public/images/emoji/facebook_messenger/camera_flash.png
new file mode 100644
index 00000000000..fd49394ac1d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/camera_flash.png differ
diff --git a/public/images/emoji/facebook_messenger/camera_with_flash.png b/public/images/emoji/facebook_messenger/camera_with_flash.png
new file mode 100644
index 00000000000..fd49394ac1d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/camera_with_flash.png differ
diff --git a/public/images/emoji/facebook_messenger/cameroon.png b/public/images/emoji/facebook_messenger/cameroon.png
new file mode 100644
index 00000000000..b9aaf463487
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cameroon.png differ
diff --git a/public/images/emoji/facebook_messenger/camping.png b/public/images/emoji/facebook_messenger/camping.png
new file mode 100644
index 00000000000..414dc9caf6f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/camping.png differ
diff --git a/public/images/emoji/facebook_messenger/canada.png b/public/images/emoji/facebook_messenger/canada.png
new file mode 100644
index 00000000000..4ee3f2c1fdd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/canada.png differ
diff --git a/public/images/emoji/facebook_messenger/canary_islands.png b/public/images/emoji/facebook_messenger/canary_islands.png
new file mode 100644
index 00000000000..68ccf48d0df
Binary files /dev/null and b/public/images/emoji/facebook_messenger/canary_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/cancer.png b/public/images/emoji/facebook_messenger/cancer.png
new file mode 100644
index 00000000000..f413b1e61f7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cancer.png differ
diff --git a/public/images/emoji/facebook_messenger/candle.png b/public/images/emoji/facebook_messenger/candle.png
new file mode 100644
index 00000000000..0a27def4ef1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/candle.png differ
diff --git a/public/images/emoji/facebook_messenger/candy.png b/public/images/emoji/facebook_messenger/candy.png
new file mode 100644
index 00000000000..2eb0b1616f3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/candy.png differ
diff --git a/public/images/emoji/facebook_messenger/canned_food.png b/public/images/emoji/facebook_messenger/canned_food.png
new file mode 100644
index 00000000000..2e5976e9d2f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/canned_food.png differ
diff --git a/public/images/emoji/facebook_messenger/canoe.png b/public/images/emoji/facebook_messenger/canoe.png
new file mode 100644
index 00000000000..4ee3c9caa7e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/canoe.png differ
diff --git a/public/images/emoji/facebook_messenger/cape_verde.png b/public/images/emoji/facebook_messenger/cape_verde.png
new file mode 100644
index 00000000000..1252c37a6d8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cape_verde.png differ
diff --git a/public/images/emoji/facebook_messenger/capital_abcd.png b/public/images/emoji/facebook_messenger/capital_abcd.png
new file mode 100644
index 00000000000..0d4c9eba175
Binary files /dev/null and b/public/images/emoji/facebook_messenger/capital_abcd.png differ
diff --git a/public/images/emoji/facebook_messenger/capricorn.png b/public/images/emoji/facebook_messenger/capricorn.png
new file mode 100644
index 00000000000..f7e1446d117
Binary files /dev/null and b/public/images/emoji/facebook_messenger/capricorn.png differ
diff --git a/public/images/emoji/facebook_messenger/car.png b/public/images/emoji/facebook_messenger/car.png
new file mode 100644
index 00000000000..024cdb23b51
Binary files /dev/null and b/public/images/emoji/facebook_messenger/car.png differ
diff --git a/public/images/emoji/facebook_messenger/card_box.png b/public/images/emoji/facebook_messenger/card_box.png
new file mode 100644
index 00000000000..5f2766de915
Binary files /dev/null and b/public/images/emoji/facebook_messenger/card_box.png differ
diff --git a/public/images/emoji/facebook_messenger/card_file_box.png b/public/images/emoji/facebook_messenger/card_file_box.png
new file mode 100644
index 00000000000..5f2766de915
Binary files /dev/null and b/public/images/emoji/facebook_messenger/card_file_box.png differ
diff --git a/public/images/emoji/facebook_messenger/card_index.png b/public/images/emoji/facebook_messenger/card_index.png
new file mode 100644
index 00000000000..b608bb66a14
Binary files /dev/null and b/public/images/emoji/facebook_messenger/card_index.png differ
diff --git a/public/images/emoji/facebook_messenger/card_index_dividers.png b/public/images/emoji/facebook_messenger/card_index_dividers.png
new file mode 100644
index 00000000000..b1e27091c92
Binary files /dev/null and b/public/images/emoji/facebook_messenger/card_index_dividers.png differ
diff --git a/public/images/emoji/facebook_messenger/caribbean_netherlands.png b/public/images/emoji/facebook_messenger/caribbean_netherlands.png
new file mode 100644
index 00000000000..7780a4a0367
Binary files /dev/null and b/public/images/emoji/facebook_messenger/caribbean_netherlands.png differ
diff --git a/public/images/emoji/facebook_messenger/carousel_horse.png b/public/images/emoji/facebook_messenger/carousel_horse.png
new file mode 100644
index 00000000000..66a3f29830c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/carousel_horse.png differ
diff --git a/public/images/emoji/facebook_messenger/carrot.png b/public/images/emoji/facebook_messenger/carrot.png
new file mode 100644
index 00000000000..939b6874ea3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/carrot.png differ
diff --git a/public/images/emoji/facebook_messenger/cat.png b/public/images/emoji/facebook_messenger/cat.png
new file mode 100644
index 00000000000..bcbd9a26d2b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cat.png differ
diff --git a/public/images/emoji/facebook_messenger/cat2.png b/public/images/emoji/facebook_messenger/cat2.png
new file mode 100644
index 00000000000..9c7f4536bfe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cat2.png differ
diff --git a/public/images/emoji/facebook_messenger/cayman_islands.png b/public/images/emoji/facebook_messenger/cayman_islands.png
new file mode 100644
index 00000000000..70d8309d8c6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cayman_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/cd.png b/public/images/emoji/facebook_messenger/cd.png
new file mode 100644
index 00000000000..411ec9a7a10
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cd.png differ
diff --git a/public/images/emoji/facebook_messenger/central_african_republic.png b/public/images/emoji/facebook_messenger/central_african_republic.png
new file mode 100644
index 00000000000..a344cb3ae87
Binary files /dev/null and b/public/images/emoji/facebook_messenger/central_african_republic.png differ
diff --git a/public/images/emoji/facebook_messenger/ceuta_and_melilla.png b/public/images/emoji/facebook_messenger/ceuta_and_melilla.png
new file mode 100644
index 00000000000..e0da30d5a6c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/facebook_messenger/chad.png b/public/images/emoji/facebook_messenger/chad.png
new file mode 100644
index 00000000000..26b77c821c1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chad.png differ
diff --git a/public/images/emoji/facebook_messenger/chains.png b/public/images/emoji/facebook_messenger/chains.png
new file mode 100644
index 00000000000..610d0e4734b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chains.png differ
diff --git a/public/images/emoji/facebook_messenger/champagne.png b/public/images/emoji/facebook_messenger/champagne.png
new file mode 100644
index 00000000000..49ea37f3899
Binary files /dev/null and b/public/images/emoji/facebook_messenger/champagne.png differ
diff --git a/public/images/emoji/facebook_messenger/chart.png b/public/images/emoji/facebook_messenger/chart.png
new file mode 100644
index 00000000000..5d933361d5c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chart.png differ
diff --git a/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png b/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png
new file mode 100644
index 00000000000..be24239508c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png b/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png
new file mode 100644
index 00000000000..6e8de585ec9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/facebook_messenger/checkered_flag.png b/public/images/emoji/facebook_messenger/checkered_flag.png
new file mode 100644
index 00000000000..1c819a0386f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/checkered_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/cheese.png b/public/images/emoji/facebook_messenger/cheese.png
new file mode 100644
index 00000000000..c3a4b402b18
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cheese.png differ
diff --git a/public/images/emoji/facebook_messenger/cheese_wedge.png b/public/images/emoji/facebook_messenger/cheese_wedge.png
new file mode 100644
index 00000000000..c3a4b402b18
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cheese_wedge.png differ
diff --git a/public/images/emoji/facebook_messenger/cherries.png b/public/images/emoji/facebook_messenger/cherries.png
new file mode 100644
index 00000000000..5a700ed9d89
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cherries.png differ
diff --git a/public/images/emoji/facebook_messenger/cherry_blossom.png b/public/images/emoji/facebook_messenger/cherry_blossom.png
new file mode 100644
index 00000000000..16bf728cdd0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cherry_blossom.png differ
diff --git a/public/images/emoji/facebook_messenger/chestnut.png b/public/images/emoji/facebook_messenger/chestnut.png
new file mode 100644
index 00000000000..1f50ca97131
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chestnut.png differ
diff --git a/public/images/emoji/facebook_messenger/chicken.png b/public/images/emoji/facebook_messenger/chicken.png
new file mode 100644
index 00000000000..a87033991a9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chicken.png differ
diff --git a/public/images/emoji/facebook_messenger/child.png b/public/images/emoji/facebook_messenger/child.png
new file mode 100644
index 00000000000..33e50494a3a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/child.png differ
diff --git a/public/images/emoji/facebook_messenger/child/2.png b/public/images/emoji/facebook_messenger/child/2.png
new file mode 100644
index 00000000000..7a0e4f1cb75
Binary files /dev/null and b/public/images/emoji/facebook_messenger/child/2.png differ
diff --git a/public/images/emoji/facebook_messenger/child/3.png b/public/images/emoji/facebook_messenger/child/3.png
new file mode 100644
index 00000000000..81a69110e9d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/child/3.png differ
diff --git a/public/images/emoji/facebook_messenger/child/4.png b/public/images/emoji/facebook_messenger/child/4.png
new file mode 100644
index 00000000000..b5c64c9cc84
Binary files /dev/null and b/public/images/emoji/facebook_messenger/child/4.png differ
diff --git a/public/images/emoji/facebook_messenger/child/5.png b/public/images/emoji/facebook_messenger/child/5.png
new file mode 100644
index 00000000000..0763a8bd94c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/child/5.png differ
diff --git a/public/images/emoji/facebook_messenger/child/6.png b/public/images/emoji/facebook_messenger/child/6.png
new file mode 100644
index 00000000000..3ed705b9025
Binary files /dev/null and b/public/images/emoji/facebook_messenger/child/6.png differ
diff --git a/public/images/emoji/facebook_messenger/children_crossing.png b/public/images/emoji/facebook_messenger/children_crossing.png
new file mode 100644
index 00000000000..10479dbe19c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/children_crossing.png differ
diff --git a/public/images/emoji/facebook_messenger/chile.png b/public/images/emoji/facebook_messenger/chile.png
new file mode 100644
index 00000000000..e150c074788
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chile.png differ
diff --git a/public/images/emoji/facebook_messenger/chipmunk.png b/public/images/emoji/facebook_messenger/chipmunk.png
new file mode 100644
index 00000000000..e46b2790d62
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chipmunk.png differ
diff --git a/public/images/emoji/facebook_messenger/chocolate_bar.png b/public/images/emoji/facebook_messenger/chocolate_bar.png
new file mode 100644
index 00000000000..8efd86eddf8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chocolate_bar.png differ
diff --git a/public/images/emoji/facebook_messenger/chopsticks.png b/public/images/emoji/facebook_messenger/chopsticks.png
new file mode 100644
index 00000000000..57064202979
Binary files /dev/null and b/public/images/emoji/facebook_messenger/chopsticks.png differ
diff --git a/public/images/emoji/facebook_messenger/christmas_island.png b/public/images/emoji/facebook_messenger/christmas_island.png
new file mode 100644
index 00000000000..6958b7d8d8f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/christmas_island.png differ
diff --git a/public/images/emoji/facebook_messenger/christmas_tree.png b/public/images/emoji/facebook_messenger/christmas_tree.png
new file mode 100644
index 00000000000..ce421a823fc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/christmas_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/church.png b/public/images/emoji/facebook_messenger/church.png
new file mode 100644
index 00000000000..e365f1b5d76
Binary files /dev/null and b/public/images/emoji/facebook_messenger/church.png differ
diff --git a/public/images/emoji/facebook_messenger/cinema.png b/public/images/emoji/facebook_messenger/cinema.png
new file mode 100644
index 00000000000..64864074f2e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cinema.png differ
diff --git a/public/images/emoji/facebook_messenger/circus_tent.png b/public/images/emoji/facebook_messenger/circus_tent.png
new file mode 100644
index 00000000000..6fafd2ced01
Binary files /dev/null and b/public/images/emoji/facebook_messenger/circus_tent.png differ
diff --git a/public/images/emoji/facebook_messenger/city_dusk.png b/public/images/emoji/facebook_messenger/city_dusk.png
new file mode 100644
index 00000000000..75c2bb97d65
Binary files /dev/null and b/public/images/emoji/facebook_messenger/city_dusk.png differ
diff --git a/public/images/emoji/facebook_messenger/city_sunrise.png b/public/images/emoji/facebook_messenger/city_sunrise.png
new file mode 100644
index 00000000000..41b4c09ddcd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/city_sunrise.png differ
diff --git a/public/images/emoji/facebook_messenger/city_sunset.png b/public/images/emoji/facebook_messenger/city_sunset.png
new file mode 100644
index 00000000000..75c2bb97d65
Binary files /dev/null and b/public/images/emoji/facebook_messenger/city_sunset.png differ
diff --git a/public/images/emoji/facebook_messenger/cityscape.png b/public/images/emoji/facebook_messenger/cityscape.png
new file mode 100644
index 00000000000..24bcea239ba
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cityscape.png differ
diff --git a/public/images/emoji/facebook_messenger/cl.png b/public/images/emoji/facebook_messenger/cl.png
new file mode 100644
index 00000000000..c3ea87fdbe3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cl.png differ
diff --git a/public/images/emoji/facebook_messenger/clamp.png b/public/images/emoji/facebook_messenger/clamp.png
new file mode 100644
index 00000000000..e17edcfc70e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clamp.png differ
diff --git a/public/images/emoji/facebook_messenger/clap.png b/public/images/emoji/facebook_messenger/clap.png
new file mode 100644
index 00000000000..40529017634
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clap.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/2.png b/public/images/emoji/facebook_messenger/clap/2.png
new file mode 100644
index 00000000000..a60881e1075
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clap/2.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/3.png b/public/images/emoji/facebook_messenger/clap/3.png
new file mode 100644
index 00000000000..44e6d82998a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clap/3.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/4.png b/public/images/emoji/facebook_messenger/clap/4.png
new file mode 100644
index 00000000000..d01e802f640
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clap/4.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/5.png b/public/images/emoji/facebook_messenger/clap/5.png
new file mode 100644
index 00000000000..a08c620dd77
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clap/5.png differ
diff --git a/public/images/emoji/facebook_messenger/clap/6.png b/public/images/emoji/facebook_messenger/clap/6.png
new file mode 100644
index 00000000000..55a4e45e2b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clap/6.png differ
diff --git a/public/images/emoji/facebook_messenger/clapper.png b/public/images/emoji/facebook_messenger/clapper.png
new file mode 100644
index 00000000000..5024b9412d9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clapper.png differ
diff --git a/public/images/emoji/facebook_messenger/classical_building.png b/public/images/emoji/facebook_messenger/classical_building.png
new file mode 100644
index 00000000000..00dfbe29d32
Binary files /dev/null and b/public/images/emoji/facebook_messenger/classical_building.png differ
diff --git a/public/images/emoji/facebook_messenger/clinking_glasses.png b/public/images/emoji/facebook_messenger/clinking_glasses.png
new file mode 100644
index 00000000000..1b24d16ae00
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clinking_glasses.png differ
diff --git a/public/images/emoji/facebook_messenger/clipboard.png b/public/images/emoji/facebook_messenger/clipboard.png
new file mode 100644
index 00000000000..8159f1d4d58
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clipboard.png differ
diff --git a/public/images/emoji/facebook_messenger/clipperton_island.png b/public/images/emoji/facebook_messenger/clipperton_island.png
new file mode 100644
index 00000000000..7943b73f671
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clipperton_island.png differ
diff --git a/public/images/emoji/facebook_messenger/clock.png b/public/images/emoji/facebook_messenger/clock.png
new file mode 100644
index 00000000000..62a0e894592
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1.png b/public/images/emoji/facebook_messenger/clock1.png
new file mode 100644
index 00000000000..54ab69b0e96
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock1.png differ
diff --git a/public/images/emoji/facebook_messenger/clock10.png b/public/images/emoji/facebook_messenger/clock10.png
new file mode 100644
index 00000000000..b584c2d3817
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock10.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1030.png b/public/images/emoji/facebook_messenger/clock1030.png
new file mode 100644
index 00000000000..bff9bd0f0a8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock1030.png differ
diff --git a/public/images/emoji/facebook_messenger/clock11.png b/public/images/emoji/facebook_messenger/clock11.png
new file mode 100644
index 00000000000..d2bf76b159a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock11.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1130.png b/public/images/emoji/facebook_messenger/clock1130.png
new file mode 100644
index 00000000000..252f51565e1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock1130.png differ
diff --git a/public/images/emoji/facebook_messenger/clock12.png b/public/images/emoji/facebook_messenger/clock12.png
new file mode 100644
index 00000000000..067c79fbe32
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock12.png differ
diff --git a/public/images/emoji/facebook_messenger/clock1230.png b/public/images/emoji/facebook_messenger/clock1230.png
new file mode 100644
index 00000000000..b50c5854305
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock1230.png differ
diff --git a/public/images/emoji/facebook_messenger/clock130.png b/public/images/emoji/facebook_messenger/clock130.png
new file mode 100644
index 00000000000..44a6ef348ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock130.png differ
diff --git a/public/images/emoji/facebook_messenger/clock2.png b/public/images/emoji/facebook_messenger/clock2.png
new file mode 100644
index 00000000000..1abb0b3dcfe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock2.png differ
diff --git a/public/images/emoji/facebook_messenger/clock230.png b/public/images/emoji/facebook_messenger/clock230.png
new file mode 100644
index 00000000000..e36cfd6faf2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock230.png differ
diff --git a/public/images/emoji/facebook_messenger/clock3.png b/public/images/emoji/facebook_messenger/clock3.png
new file mode 100644
index 00000000000..3818ab1cbb7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock3.png differ
diff --git a/public/images/emoji/facebook_messenger/clock330.png b/public/images/emoji/facebook_messenger/clock330.png
new file mode 100644
index 00000000000..c6631cdc263
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock330.png differ
diff --git a/public/images/emoji/facebook_messenger/clock4.png b/public/images/emoji/facebook_messenger/clock4.png
new file mode 100644
index 00000000000..ebc3cfd4ded
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock4.png differ
diff --git a/public/images/emoji/facebook_messenger/clock430.png b/public/images/emoji/facebook_messenger/clock430.png
new file mode 100644
index 00000000000..bf513491300
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock430.png differ
diff --git a/public/images/emoji/facebook_messenger/clock5.png b/public/images/emoji/facebook_messenger/clock5.png
new file mode 100644
index 00000000000..ea2c4adcbcb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock5.png differ
diff --git a/public/images/emoji/facebook_messenger/clock530.png b/public/images/emoji/facebook_messenger/clock530.png
new file mode 100644
index 00000000000..77fba2691e4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock530.png differ
diff --git a/public/images/emoji/facebook_messenger/clock6.png b/public/images/emoji/facebook_messenger/clock6.png
new file mode 100644
index 00000000000..af72ddd43a5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock6.png differ
diff --git a/public/images/emoji/facebook_messenger/clock630.png b/public/images/emoji/facebook_messenger/clock630.png
new file mode 100644
index 00000000000..4dff8b77570
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock630.png differ
diff --git a/public/images/emoji/facebook_messenger/clock7.png b/public/images/emoji/facebook_messenger/clock7.png
new file mode 100644
index 00000000000..b3a11943912
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock7.png differ
diff --git a/public/images/emoji/facebook_messenger/clock730.png b/public/images/emoji/facebook_messenger/clock730.png
new file mode 100644
index 00000000000..f52c3608984
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock730.png differ
diff --git a/public/images/emoji/facebook_messenger/clock8.png b/public/images/emoji/facebook_messenger/clock8.png
new file mode 100644
index 00000000000..505234ede54
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock8.png differ
diff --git a/public/images/emoji/facebook_messenger/clock830.png b/public/images/emoji/facebook_messenger/clock830.png
new file mode 100644
index 00000000000..c3ff77cd7fa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock830.png differ
diff --git a/public/images/emoji/facebook_messenger/clock9.png b/public/images/emoji/facebook_messenger/clock9.png
new file mode 100644
index 00000000000..972becb6d47
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock9.png differ
diff --git a/public/images/emoji/facebook_messenger/clock930.png b/public/images/emoji/facebook_messenger/clock930.png
new file mode 100644
index 00000000000..8ec20ac7dc6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clock930.png differ
diff --git a/public/images/emoji/facebook_messenger/closed_book.png b/public/images/emoji/facebook_messenger/closed_book.png
new file mode 100644
index 00000000000..ddf42b7ab7a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/closed_book.png differ
diff --git a/public/images/emoji/facebook_messenger/closed_lock_with_key.png b/public/images/emoji/facebook_messenger/closed_lock_with_key.png
new file mode 100644
index 00000000000..7ef1a8ab5ea
Binary files /dev/null and b/public/images/emoji/facebook_messenger/closed_lock_with_key.png differ
diff --git a/public/images/emoji/facebook_messenger/closed_umbrella.png b/public/images/emoji/facebook_messenger/closed_umbrella.png
new file mode 100644
index 00000000000..680ef4cd1ea
Binary files /dev/null and b/public/images/emoji/facebook_messenger/closed_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud.png b/public/images/emoji/facebook_messenger/cloud.png
new file mode 100644
index 00000000000..8f1746d0759
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_lightning.png b/public/images/emoji/facebook_messenger/cloud_lightning.png
new file mode 100644
index 00000000000..f45cd421995
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cloud_lightning.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_rain.png b/public/images/emoji/facebook_messenger/cloud_rain.png
new file mode 100644
index 00000000000..ffd91a25b44
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cloud_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_snow.png b/public/images/emoji/facebook_messenger/cloud_snow.png
new file mode 100644
index 00000000000..24834e2de3c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cloud_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_tornado.png b/public/images/emoji/facebook_messenger/cloud_tornado.png
new file mode 100644
index 00000000000..fd843824ed3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cloud_tornado.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_lightning.png b/public/images/emoji/facebook_messenger/cloud_with_lightning.png
new file mode 100644
index 00000000000..f45cd421995
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cloud_with_lightning.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png b/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png
new file mode 100644
index 00000000000..be44d531a75
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_rain.png b/public/images/emoji/facebook_messenger/cloud_with_rain.png
new file mode 100644
index 00000000000..ffd91a25b44
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cloud_with_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_snow.png b/public/images/emoji/facebook_messenger/cloud_with_snow.png
new file mode 100644
index 00000000000..24834e2de3c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cloud_with_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/cloud_with_tornado.png b/public/images/emoji/facebook_messenger/cloud_with_tornado.png
new file mode 100644
index 00000000000..fd843824ed3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cloud_with_tornado.png differ
diff --git a/public/images/emoji/facebook_messenger/clown_face.png b/public/images/emoji/facebook_messenger/clown_face.png
new file mode 100644
index 00000000000..c78134fdee3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clown_face.png differ
diff --git a/public/images/emoji/facebook_messenger/clubs.png b/public/images/emoji/facebook_messenger/clubs.png
new file mode 100644
index 00000000000..e0889a39fd3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/clubs.png differ
diff --git a/public/images/emoji/facebook_messenger/cn.png b/public/images/emoji/facebook_messenger/cn.png
new file mode 100644
index 00000000000..a9325fc771c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cn.png differ
diff --git a/public/images/emoji/facebook_messenger/coat.png b/public/images/emoji/facebook_messenger/coat.png
new file mode 100644
index 00000000000..c409f9f4c4c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/coat.png differ
diff --git a/public/images/emoji/facebook_messenger/cocktail.png b/public/images/emoji/facebook_messenger/cocktail.png
new file mode 100644
index 00000000000..7226b15e04b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cocktail.png differ
diff --git a/public/images/emoji/facebook_messenger/coconut.png b/public/images/emoji/facebook_messenger/coconut.png
new file mode 100644
index 00000000000..e76b533149f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/coconut.png differ
diff --git a/public/images/emoji/facebook_messenger/cocos_islands.png b/public/images/emoji/facebook_messenger/cocos_islands.png
new file mode 100644
index 00000000000..c9025e34e4b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cocos_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/coffee.png b/public/images/emoji/facebook_messenger/coffee.png
new file mode 100644
index 00000000000..00f0517ca5c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/coffee.png differ
diff --git a/public/images/emoji/facebook_messenger/coffin.png b/public/images/emoji/facebook_messenger/coffin.png
new file mode 100644
index 00000000000..cbf6ba5696d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/coffin.png differ
diff --git a/public/images/emoji/facebook_messenger/cold_sweat.png b/public/images/emoji/facebook_messenger/cold_sweat.png
new file mode 100644
index 00000000000..aef91ca8523
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cold_sweat.png differ
diff --git a/public/images/emoji/facebook_messenger/colombia.png b/public/images/emoji/facebook_messenger/colombia.png
new file mode 100644
index 00000000000..f8ac0baf8bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/colombia.png differ
diff --git a/public/images/emoji/facebook_messenger/comet.png b/public/images/emoji/facebook_messenger/comet.png
new file mode 100644
index 00000000000..fceafe31e07
Binary files /dev/null and b/public/images/emoji/facebook_messenger/comet.png differ
diff --git a/public/images/emoji/facebook_messenger/comoros.png b/public/images/emoji/facebook_messenger/comoros.png
new file mode 100644
index 00000000000..e765f507156
Binary files /dev/null and b/public/images/emoji/facebook_messenger/comoros.png differ
diff --git a/public/images/emoji/facebook_messenger/compression.png b/public/images/emoji/facebook_messenger/compression.png
new file mode 100644
index 00000000000..e17edcfc70e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/compression.png differ
diff --git a/public/images/emoji/facebook_messenger/computer.png b/public/images/emoji/facebook_messenger/computer.png
new file mode 100644
index 00000000000..16df1b45902
Binary files /dev/null and b/public/images/emoji/facebook_messenger/computer.png differ
diff --git a/public/images/emoji/facebook_messenger/computer_mouse.png b/public/images/emoji/facebook_messenger/computer_mouse.png
new file mode 100644
index 00000000000..3a71c800c68
Binary files /dev/null and b/public/images/emoji/facebook_messenger/computer_mouse.png differ
diff --git a/public/images/emoji/facebook_messenger/confetti_ball.png b/public/images/emoji/facebook_messenger/confetti_ball.png
new file mode 100644
index 00000000000..d198bb4654c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/confetti_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/confounded.png b/public/images/emoji/facebook_messenger/confounded.png
new file mode 100644
index 00000000000..556801a6c17
Binary files /dev/null and b/public/images/emoji/facebook_messenger/confounded.png differ
diff --git a/public/images/emoji/facebook_messenger/confused.png b/public/images/emoji/facebook_messenger/confused.png
new file mode 100644
index 00000000000..8a37c428cb2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/confused.png differ
diff --git a/public/images/emoji/facebook_messenger/congo_brazzaville.png b/public/images/emoji/facebook_messenger/congo_brazzaville.png
new file mode 100644
index 00000000000..2eef1d6c176
Binary files /dev/null and b/public/images/emoji/facebook_messenger/congo_brazzaville.png differ
diff --git a/public/images/emoji/facebook_messenger/congo_kinshasa.png b/public/images/emoji/facebook_messenger/congo_kinshasa.png
new file mode 100644
index 00000000000..a34af9d64a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/congo_kinshasa.png differ
diff --git a/public/images/emoji/facebook_messenger/congratulations.png b/public/images/emoji/facebook_messenger/congratulations.png
new file mode 100644
index 00000000000..eb88827ad02
Binary files /dev/null and b/public/images/emoji/facebook_messenger/congratulations.png differ
diff --git a/public/images/emoji/facebook_messenger/construction.png b/public/images/emoji/facebook_messenger/construction.png
new file mode 100644
index 00000000000..5d09fb084fc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_site.png b/public/images/emoji/facebook_messenger/construction_site.png
new file mode 100644
index 00000000000..24cdec2e5fd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_site.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker.png b/public/images/emoji/facebook_messenger/construction_worker.png
new file mode 100644
index 00000000000..5feb48f134f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/2.png b/public/images/emoji/facebook_messenger/construction_worker/2.png
new file mode 100644
index 00000000000..bd490932a39
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/3.png b/public/images/emoji/facebook_messenger/construction_worker/3.png
new file mode 100644
index 00000000000..ff712fcd477
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/4.png b/public/images/emoji/facebook_messenger/construction_worker/4.png
new file mode 100644
index 00000000000..e59a2e70386
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/5.png b/public/images/emoji/facebook_messenger/construction_worker/5.png
new file mode 100644
index 00000000000..95e6d6a842e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker/6.png b/public/images/emoji/facebook_messenger/construction_worker/6.png
new file mode 100644
index 00000000000..721415e844e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man.png b/public/images/emoji/facebook_messenger/construction_worker_man.png
new file mode 100644
index 00000000000..5feb48f134f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_man.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/2.png b/public/images/emoji/facebook_messenger/construction_worker_man/2.png
new file mode 100644
index 00000000000..bd490932a39
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/3.png b/public/images/emoji/facebook_messenger/construction_worker_man/3.png
new file mode 100644
index 00000000000..ff712fcd477
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/4.png b/public/images/emoji/facebook_messenger/construction_worker_man/4.png
new file mode 100644
index 00000000000..e59a2e70386
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/5.png b/public/images/emoji/facebook_messenger/construction_worker_man/5.png
new file mode 100644
index 00000000000..95e6d6a842e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_man/6.png b/public/images/emoji/facebook_messenger/construction_worker_man/6.png
new file mode 100644
index 00000000000..721415e844e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman.png b/public/images/emoji/facebook_messenger/construction_worker_woman.png
new file mode 100644
index 00000000000..79632626060
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/2.png b/public/images/emoji/facebook_messenger/construction_worker_woman/2.png
new file mode 100644
index 00000000000..63998c76ae0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/3.png b/public/images/emoji/facebook_messenger/construction_worker_woman/3.png
new file mode 100644
index 00000000000..83eb2d87495
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/4.png b/public/images/emoji/facebook_messenger/construction_worker_woman/4.png
new file mode 100644
index 00000000000..b518850876c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/5.png b/public/images/emoji/facebook_messenger/construction_worker_woman/5.png
new file mode 100644
index 00000000000..80eacbdd523
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/construction_worker_woman/6.png b/public/images/emoji/facebook_messenger/construction_worker_woman/6.png
new file mode 100644
index 00000000000..34a1e9e2c0d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/control_knobs.png b/public/images/emoji/facebook_messenger/control_knobs.png
new file mode 100644
index 00000000000..471e812ed30
Binary files /dev/null and b/public/images/emoji/facebook_messenger/control_knobs.png differ
diff --git a/public/images/emoji/facebook_messenger/convenience_store.png b/public/images/emoji/facebook_messenger/convenience_store.png
new file mode 100644
index 00000000000..7cf81e3889c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/convenience_store.png differ
diff --git a/public/images/emoji/facebook_messenger/cook_islands.png b/public/images/emoji/facebook_messenger/cook_islands.png
new file mode 100644
index 00000000000..d1e4afbacae
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cook_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/cookie.png b/public/images/emoji/facebook_messenger/cookie.png
new file mode 100644
index 00000000000..5037c4bc648
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cookie.png differ
diff --git a/public/images/emoji/facebook_messenger/cool.png b/public/images/emoji/facebook_messenger/cool.png
new file mode 100644
index 00000000000..8e1dccf987e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cool.png differ
diff --git a/public/images/emoji/facebook_messenger/cop.png b/public/images/emoji/facebook_messenger/cop.png
new file mode 100644
index 00000000000..4efbb5500d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cop.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/2.png b/public/images/emoji/facebook_messenger/cop/2.png
new file mode 100644
index 00000000000..02f646d46fb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cop/2.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/3.png b/public/images/emoji/facebook_messenger/cop/3.png
new file mode 100644
index 00000000000..fc0d621ff81
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cop/3.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/4.png b/public/images/emoji/facebook_messenger/cop/4.png
new file mode 100644
index 00000000000..607565d83dd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cop/4.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/5.png b/public/images/emoji/facebook_messenger/cop/5.png
new file mode 100644
index 00000000000..d54b5e01abd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cop/5.png differ
diff --git a/public/images/emoji/facebook_messenger/cop/6.png b/public/images/emoji/facebook_messenger/cop/6.png
new file mode 100644
index 00000000000..cc17ff14df0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cop/6.png differ
diff --git a/public/images/emoji/facebook_messenger/copyright.png b/public/images/emoji/facebook_messenger/copyright.png
new file mode 100644
index 00000000000..e7ed95e52ae
Binary files /dev/null and b/public/images/emoji/facebook_messenger/copyright.png differ
diff --git a/public/images/emoji/facebook_messenger/corn.png b/public/images/emoji/facebook_messenger/corn.png
new file mode 100644
index 00000000000..7d6bd73005b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/corn.png differ
diff --git a/public/images/emoji/facebook_messenger/costa_rica.png b/public/images/emoji/facebook_messenger/costa_rica.png
new file mode 100644
index 00000000000..e6c16e4ea0b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/costa_rica.png differ
diff --git a/public/images/emoji/facebook_messenger/cote_divoire.png b/public/images/emoji/facebook_messenger/cote_divoire.png
new file mode 100644
index 00000000000..c8e9c1eacef
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cote_divoire.png differ
diff --git a/public/images/emoji/facebook_messenger/couch.png b/public/images/emoji/facebook_messenger/couch.png
new file mode 100644
index 00000000000..e46d4de8590
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couch.png differ
diff --git a/public/images/emoji/facebook_messenger/couch_and_lamp.png b/public/images/emoji/facebook_messenger/couch_and_lamp.png
new file mode 100644
index 00000000000..e46d4de8590
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couch_and_lamp.png differ
diff --git a/public/images/emoji/facebook_messenger/couple.png b/public/images/emoji/facebook_messenger/couple.png
new file mode 100644
index 00000000000..955b98c386f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couple.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart.png b/public/images/emoji/facebook_messenger/couple_with_heart.png
new file mode 100644
index 00000000000..30aa3b83291
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couple_with_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png b/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png
new file mode 100644
index 00000000000..8fcabbd4300
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png b/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png
new file mode 100644
index 00000000000..30aa3b83291
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png b/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png
new file mode 100644
index 00000000000..b82bbf04b49
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss.png b/public/images/emoji/facebook_messenger/couplekiss.png
new file mode 100644
index 00000000000..07ab022382d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couplekiss.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss_man_man.png b/public/images/emoji/facebook_messenger/couplekiss_man_man.png
new file mode 100644
index 00000000000..842c5a4e22d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couplekiss_man_man.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss_man_woman.png b/public/images/emoji/facebook_messenger/couplekiss_man_woman.png
new file mode 100644
index 00000000000..07ab022382d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png b/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png
new file mode 100644
index 00000000000..4f1324e09f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/cow.png b/public/images/emoji/facebook_messenger/cow.png
new file mode 100644
index 00000000000..21b6b7be8f4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cow.png differ
diff --git a/public/images/emoji/facebook_messenger/cow2.png b/public/images/emoji/facebook_messenger/cow2.png
new file mode 100644
index 00000000000..0aee85e1837
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cow2.png differ
diff --git a/public/images/emoji/facebook_messenger/cowboy_hat_face.png b/public/images/emoji/facebook_messenger/cowboy_hat_face.png
new file mode 100644
index 00000000000..efe2c6fcd17
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cowboy_hat_face.png differ
diff --git a/public/images/emoji/facebook_messenger/crab.png b/public/images/emoji/facebook_messenger/crab.png
new file mode 100644
index 00000000000..549988455da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crab.png differ
diff --git a/public/images/emoji/facebook_messenger/crayon.png b/public/images/emoji/facebook_messenger/crayon.png
new file mode 100644
index 00000000000..0ad5b02c2dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crayon.png differ
diff --git a/public/images/emoji/facebook_messenger/crazy_face.png b/public/images/emoji/facebook_messenger/crazy_face.png
new file mode 100644
index 00000000000..0aaa1cf7651
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crazy_face.png differ
diff --git a/public/images/emoji/facebook_messenger/credit_card.png b/public/images/emoji/facebook_messenger/credit_card.png
new file mode 100644
index 00000000000..818c05713d7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/credit_card.png differ
diff --git a/public/images/emoji/facebook_messenger/crescent_moon.png b/public/images/emoji/facebook_messenger/crescent_moon.png
new file mode 100644
index 00000000000..8094a7c2055
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crescent_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket.png b/public/images/emoji/facebook_messenger/cricket.png
new file mode 100644
index 00000000000..1e3c9dfa382
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cricket.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png b/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..8a0bf65a6c7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/cricket_bat_ball.png b/public/images/emoji/facebook_messenger/cricket_bat_ball.png
new file mode 100644
index 00000000000..8a0bf65a6c7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cricket_bat_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/croatia.png b/public/images/emoji/facebook_messenger/croatia.png
new file mode 100644
index 00000000000..6cc9a0e7485
Binary files /dev/null and b/public/images/emoji/facebook_messenger/croatia.png differ
diff --git a/public/images/emoji/facebook_messenger/crocodile.png b/public/images/emoji/facebook_messenger/crocodile.png
new file mode 100644
index 00000000000..64740f53d5d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crocodile.png differ
diff --git a/public/images/emoji/facebook_messenger/croissant.png b/public/images/emoji/facebook_messenger/croissant.png
new file mode 100644
index 00000000000..c2cea2221f9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/croissant.png differ
diff --git a/public/images/emoji/facebook_messenger/cross.png b/public/images/emoji/facebook_messenger/cross.png
new file mode 100644
index 00000000000..f11e296dd97
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cross.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers.png b/public/images/emoji/facebook_messenger/crossed_fingers.png
new file mode 100644
index 00000000000..9ba3b1ff090
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crossed_fingers.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/2.png b/public/images/emoji/facebook_messenger/crossed_fingers/2.png
new file mode 100644
index 00000000000..7ce5cd5811a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crossed_fingers/2.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/3.png b/public/images/emoji/facebook_messenger/crossed_fingers/3.png
new file mode 100644
index 00000000000..c6297b1c63b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crossed_fingers/3.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/4.png b/public/images/emoji/facebook_messenger/crossed_fingers/4.png
new file mode 100644
index 00000000000..8ae4d9b0f90
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crossed_fingers/4.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/5.png b/public/images/emoji/facebook_messenger/crossed_fingers/5.png
new file mode 100644
index 00000000000..f3529e25376
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crossed_fingers/5.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_fingers/6.png b/public/images/emoji/facebook_messenger/crossed_fingers/6.png
new file mode 100644
index 00000000000..0265996d383
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crossed_fingers/6.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_flags.png b/public/images/emoji/facebook_messenger/crossed_flags.png
new file mode 100644
index 00000000000..c168bb1ba50
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crossed_flags.png differ
diff --git a/public/images/emoji/facebook_messenger/crossed_swords.png b/public/images/emoji/facebook_messenger/crossed_swords.png
new file mode 100644
index 00000000000..ec1da04367b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crossed_swords.png differ
diff --git a/public/images/emoji/facebook_messenger/crown.png b/public/images/emoji/facebook_messenger/crown.png
new file mode 100644
index 00000000000..8a0b6d323db
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crown.png differ
diff --git a/public/images/emoji/facebook_messenger/cruise_ship.png b/public/images/emoji/facebook_messenger/cruise_ship.png
new file mode 100644
index 00000000000..b1ee5613467
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cruise_ship.png differ
diff --git a/public/images/emoji/facebook_messenger/cry.png b/public/images/emoji/facebook_messenger/cry.png
new file mode 100644
index 00000000000..f77cfe7b5aa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cry.png differ
diff --git a/public/images/emoji/facebook_messenger/crying_cat_face.png b/public/images/emoji/facebook_messenger/crying_cat_face.png
new file mode 100644
index 00000000000..ea06ae025cd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crying_cat_face.png differ
diff --git a/public/images/emoji/facebook_messenger/crystal_ball.png b/public/images/emoji/facebook_messenger/crystal_ball.png
new file mode 100644
index 00000000000..0a119e84f45
Binary files /dev/null and b/public/images/emoji/facebook_messenger/crystal_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/cuba.png b/public/images/emoji/facebook_messenger/cuba.png
new file mode 100644
index 00000000000..4436dee31e9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cuba.png differ
diff --git a/public/images/emoji/facebook_messenger/cucumber.png b/public/images/emoji/facebook_messenger/cucumber.png
new file mode 100644
index 00000000000..392fdddcc1c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cucumber.png differ
diff --git a/public/images/emoji/facebook_messenger/cup_with_straw.png b/public/images/emoji/facebook_messenger/cup_with_straw.png
new file mode 100644
index 00000000000..4b2f313f9b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cup_with_straw.png differ
diff --git a/public/images/emoji/facebook_messenger/cupid.png b/public/images/emoji/facebook_messenger/cupid.png
new file mode 100644
index 00000000000..d6c771a319a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cupid.png differ
diff --git a/public/images/emoji/facebook_messenger/curacao.png b/public/images/emoji/facebook_messenger/curacao.png
new file mode 100644
index 00000000000..e29bde1f8b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/curacao.png differ
diff --git a/public/images/emoji/facebook_messenger/curling_stone.png b/public/images/emoji/facebook_messenger/curling_stone.png
new file mode 100644
index 00000000000..09027a2fb2e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/curling_stone.png differ
diff --git a/public/images/emoji/facebook_messenger/curly_loop.png b/public/images/emoji/facebook_messenger/curly_loop.png
new file mode 100644
index 00000000000..dc1db4da407
Binary files /dev/null and b/public/images/emoji/facebook_messenger/curly_loop.png differ
diff --git a/public/images/emoji/facebook_messenger/currency_exchange.png b/public/images/emoji/facebook_messenger/currency_exchange.png
new file mode 100644
index 00000000000..e3bdddf3927
Binary files /dev/null and b/public/images/emoji/facebook_messenger/currency_exchange.png differ
diff --git a/public/images/emoji/facebook_messenger/curry.png b/public/images/emoji/facebook_messenger/curry.png
new file mode 100644
index 00000000000..383f800e954
Binary files /dev/null and b/public/images/emoji/facebook_messenger/curry.png differ
diff --git a/public/images/emoji/facebook_messenger/custard.png b/public/images/emoji/facebook_messenger/custard.png
new file mode 100644
index 00000000000..dc16af3ad2f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/custard.png differ
diff --git a/public/images/emoji/facebook_messenger/customs.png b/public/images/emoji/facebook_messenger/customs.png
new file mode 100644
index 00000000000..9c0dc646a1c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/customs.png differ
diff --git a/public/images/emoji/facebook_messenger/cut_of_meat.png b/public/images/emoji/facebook_messenger/cut_of_meat.png
new file mode 100644
index 00000000000..b66d427e099
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cut_of_meat.png differ
diff --git a/public/images/emoji/facebook_messenger/cyclone.png b/public/images/emoji/facebook_messenger/cyclone.png
new file mode 100644
index 00000000000..cf2b568c069
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cyclone.png differ
diff --git a/public/images/emoji/facebook_messenger/cyprus.png b/public/images/emoji/facebook_messenger/cyprus.png
new file mode 100644
index 00000000000..7f80f4ed578
Binary files /dev/null and b/public/images/emoji/facebook_messenger/cyprus.png differ
diff --git a/public/images/emoji/facebook_messenger/czech_republic.png b/public/images/emoji/facebook_messenger/czech_republic.png
new file mode 100644
index 00000000000..88558e4ab2a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/czech_republic.png differ
diff --git a/public/images/emoji/facebook_messenger/dagger.png b/public/images/emoji/facebook_messenger/dagger.png
new file mode 100644
index 00000000000..8e56922aa62
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dagger.png differ
diff --git a/public/images/emoji/facebook_messenger/dagger_knife.png b/public/images/emoji/facebook_messenger/dagger_knife.png
new file mode 100644
index 00000000000..8e56922aa62
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dagger_knife.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer.png b/public/images/emoji/facebook_messenger/dancer.png
new file mode 100644
index 00000000000..e05d6372362
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dancer.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/2.png b/public/images/emoji/facebook_messenger/dancer/2.png
new file mode 100644
index 00000000000..cec2b05df7d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dancer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/3.png b/public/images/emoji/facebook_messenger/dancer/3.png
new file mode 100644
index 00000000000..208851079d5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dancer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/4.png b/public/images/emoji/facebook_messenger/dancer/4.png
new file mode 100644
index 00000000000..c68c9968abe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dancer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/5.png b/public/images/emoji/facebook_messenger/dancer/5.png
new file mode 100644
index 00000000000..7927c186748
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dancer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/dancer/6.png b/public/images/emoji/facebook_messenger/dancer/6.png
new file mode 100644
index 00000000000..13b20521304
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dancer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/dancers.png b/public/images/emoji/facebook_messenger/dancers.png
new file mode 100644
index 00000000000..8a83bc31d2c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dancers.png differ
diff --git a/public/images/emoji/facebook_messenger/dancing_men.png b/public/images/emoji/facebook_messenger/dancing_men.png
new file mode 100644
index 00000000000..dec9fb054b6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dancing_men.png differ
diff --git a/public/images/emoji/facebook_messenger/dancing_women.png b/public/images/emoji/facebook_messenger/dancing_women.png
new file mode 100644
index 00000000000..8a83bc31d2c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dancing_women.png differ
diff --git a/public/images/emoji/facebook_messenger/dango.png b/public/images/emoji/facebook_messenger/dango.png
new file mode 100644
index 00000000000..f90ec298ada
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dango.png differ
diff --git a/public/images/emoji/facebook_messenger/dark_sunglasses.png b/public/images/emoji/facebook_messenger/dark_sunglasses.png
new file mode 100644
index 00000000000..a4a0514f9c4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dark_sunglasses.png differ
diff --git a/public/images/emoji/facebook_messenger/dart.png b/public/images/emoji/facebook_messenger/dart.png
new file mode 100644
index 00000000000..ff79ba245d8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dart.png differ
diff --git a/public/images/emoji/facebook_messenger/dash.png b/public/images/emoji/facebook_messenger/dash.png
new file mode 100644
index 00000000000..72b36c8e4fc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dash.png differ
diff --git a/public/images/emoji/facebook_messenger/date.png b/public/images/emoji/facebook_messenger/date.png
new file mode 100644
index 00000000000..adfdfd42560
Binary files /dev/null and b/public/images/emoji/facebook_messenger/date.png differ
diff --git a/public/images/emoji/facebook_messenger/de.png b/public/images/emoji/facebook_messenger/de.png
new file mode 100644
index 00000000000..964116acbb5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/de.png differ
diff --git a/public/images/emoji/facebook_messenger/deciduous_tree.png b/public/images/emoji/facebook_messenger/deciduous_tree.png
new file mode 100644
index 00000000000..a6df67b2a99
Binary files /dev/null and b/public/images/emoji/facebook_messenger/deciduous_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/deer.png b/public/images/emoji/facebook_messenger/deer.png
new file mode 100644
index 00000000000..92aa546e945
Binary files /dev/null and b/public/images/emoji/facebook_messenger/deer.png differ
diff --git a/public/images/emoji/facebook_messenger/denmark.png b/public/images/emoji/facebook_messenger/denmark.png
new file mode 100644
index 00000000000..bb8ef11ea58
Binary files /dev/null and b/public/images/emoji/facebook_messenger/denmark.png differ
diff --git a/public/images/emoji/facebook_messenger/department_store.png b/public/images/emoji/facebook_messenger/department_store.png
new file mode 100644
index 00000000000..b6b6f440ed9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/department_store.png differ
diff --git a/public/images/emoji/facebook_messenger/derelict_house.png b/public/images/emoji/facebook_messenger/derelict_house.png
new file mode 100644
index 00000000000..a48da604946
Binary files /dev/null and b/public/images/emoji/facebook_messenger/derelict_house.png differ
diff --git a/public/images/emoji/facebook_messenger/derelict_house_building.png b/public/images/emoji/facebook_messenger/derelict_house_building.png
new file mode 100644
index 00000000000..a48da604946
Binary files /dev/null and b/public/images/emoji/facebook_messenger/derelict_house_building.png differ
diff --git a/public/images/emoji/facebook_messenger/desert.png b/public/images/emoji/facebook_messenger/desert.png
new file mode 100644
index 00000000000..3ec8a867b45
Binary files /dev/null and b/public/images/emoji/facebook_messenger/desert.png differ
diff --git a/public/images/emoji/facebook_messenger/desert_island.png b/public/images/emoji/facebook_messenger/desert_island.png
new file mode 100644
index 00000000000..2d2e8919fff
Binary files /dev/null and b/public/images/emoji/facebook_messenger/desert_island.png differ
diff --git a/public/images/emoji/facebook_messenger/desktop.png b/public/images/emoji/facebook_messenger/desktop.png
new file mode 100644
index 00000000000..120faa75360
Binary files /dev/null and b/public/images/emoji/facebook_messenger/desktop.png differ
diff --git a/public/images/emoji/facebook_messenger/desktop_computer.png b/public/images/emoji/facebook_messenger/desktop_computer.png
new file mode 100644
index 00000000000..120faa75360
Binary files /dev/null and b/public/images/emoji/facebook_messenger/desktop_computer.png differ
diff --git a/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png b/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png
new file mode 100644
index 00000000000..5b51721f2e7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/facebook_messenger/diamonds.png b/public/images/emoji/facebook_messenger/diamonds.png
new file mode 100644
index 00000000000..e416a8ce5d2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/diamonds.png differ
diff --git a/public/images/emoji/facebook_messenger/diego_garcia.png b/public/images/emoji/facebook_messenger/diego_garcia.png
new file mode 100644
index 00000000000..881e01a927f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/diego_garcia.png differ
diff --git a/public/images/emoji/facebook_messenger/disappointed.png b/public/images/emoji/facebook_messenger/disappointed.png
new file mode 100644
index 00000000000..26ca83eeb56
Binary files /dev/null and b/public/images/emoji/facebook_messenger/disappointed.png differ
diff --git a/public/images/emoji/facebook_messenger/disappointed_relieved.png b/public/images/emoji/facebook_messenger/disappointed_relieved.png
new file mode 100644
index 00000000000..0537746c4cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/disappointed_relieved.png differ
diff --git a/public/images/emoji/facebook_messenger/dividers.png b/public/images/emoji/facebook_messenger/dividers.png
new file mode 100644
index 00000000000..b1e27091c92
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dividers.png differ
diff --git a/public/images/emoji/facebook_messenger/dizzy.png b/public/images/emoji/facebook_messenger/dizzy.png
new file mode 100644
index 00000000000..0894ceafb58
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dizzy.png differ
diff --git a/public/images/emoji/facebook_messenger/dizzy_face.png b/public/images/emoji/facebook_messenger/dizzy_face.png
new file mode 100644
index 00000000000..24f1af2db30
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dizzy_face.png differ
diff --git a/public/images/emoji/facebook_messenger/djibouti.png b/public/images/emoji/facebook_messenger/djibouti.png
new file mode 100644
index 00000000000..606fe6a1ee5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/djibouti.png differ
diff --git a/public/images/emoji/facebook_messenger/do_not_litter.png b/public/images/emoji/facebook_messenger/do_not_litter.png
new file mode 100644
index 00000000000..f53f8fa83d7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/do_not_litter.png differ
diff --git a/public/images/emoji/facebook_messenger/dog.png b/public/images/emoji/facebook_messenger/dog.png
new file mode 100644
index 00000000000..8f398512300
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dog.png differ
diff --git a/public/images/emoji/facebook_messenger/dog2.png b/public/images/emoji/facebook_messenger/dog2.png
new file mode 100644
index 00000000000..afb48d19e87
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dog2.png differ
diff --git a/public/images/emoji/facebook_messenger/dollar.png b/public/images/emoji/facebook_messenger/dollar.png
new file mode 100644
index 00000000000..cc6d41c785a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dollar.png differ
diff --git a/public/images/emoji/facebook_messenger/dolls.png b/public/images/emoji/facebook_messenger/dolls.png
new file mode 100644
index 00000000000..effc75342ee
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dolls.png differ
diff --git a/public/images/emoji/facebook_messenger/dolphin.png b/public/images/emoji/facebook_messenger/dolphin.png
new file mode 100644
index 00000000000..bae7802d5e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dolphin.png differ
diff --git a/public/images/emoji/facebook_messenger/dominica.png b/public/images/emoji/facebook_messenger/dominica.png
new file mode 100644
index 00000000000..588ece3f433
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dominica.png differ
diff --git a/public/images/emoji/facebook_messenger/dominican_republic.png b/public/images/emoji/facebook_messenger/dominican_republic.png
new file mode 100644
index 00000000000..de48ff449ca
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dominican_republic.png differ
diff --git a/public/images/emoji/facebook_messenger/door.png b/public/images/emoji/facebook_messenger/door.png
new file mode 100644
index 00000000000..bcb88cd2b52
Binary files /dev/null and b/public/images/emoji/facebook_messenger/door.png differ
diff --git a/public/images/emoji/facebook_messenger/double_vertical_bar.png b/public/images/emoji/facebook_messenger/double_vertical_bar.png
new file mode 100644
index 00000000000..624e2df7118
Binary files /dev/null and b/public/images/emoji/facebook_messenger/double_vertical_bar.png differ
diff --git a/public/images/emoji/facebook_messenger/doughnut.png b/public/images/emoji/facebook_messenger/doughnut.png
new file mode 100644
index 00000000000..edfa5ccac9e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/doughnut.png differ
diff --git a/public/images/emoji/facebook_messenger/dove.png b/public/images/emoji/facebook_messenger/dove.png
new file mode 100644
index 00000000000..9fdcff829ad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dove.png differ
diff --git a/public/images/emoji/facebook_messenger/dove_of_peace.png b/public/images/emoji/facebook_messenger/dove_of_peace.png
new file mode 100644
index 00000000000..9fdcff829ad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dove_of_peace.png differ
diff --git a/public/images/emoji/facebook_messenger/dragon.png b/public/images/emoji/facebook_messenger/dragon.png
new file mode 100644
index 00000000000..c67e4d4b5e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dragon.png differ
diff --git a/public/images/emoji/facebook_messenger/dragon_face.png b/public/images/emoji/facebook_messenger/dragon_face.png
new file mode 100644
index 00000000000..cea46ab094f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dragon_face.png differ
diff --git a/public/images/emoji/facebook_messenger/dress.png b/public/images/emoji/facebook_messenger/dress.png
new file mode 100644
index 00000000000..ef0e02eb6a4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dress.png differ
diff --git a/public/images/emoji/facebook_messenger/dromedary_camel.png b/public/images/emoji/facebook_messenger/dromedary_camel.png
new file mode 100644
index 00000000000..30fba91ffe7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dromedary_camel.png differ
diff --git a/public/images/emoji/facebook_messenger/drooling_face.png b/public/images/emoji/facebook_messenger/drooling_face.png
new file mode 100644
index 00000000000..2ad3f8a41b1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/drooling_face.png differ
diff --git a/public/images/emoji/facebook_messenger/droplet.png b/public/images/emoji/facebook_messenger/droplet.png
new file mode 100644
index 00000000000..186137dfb4d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/droplet.png differ
diff --git a/public/images/emoji/facebook_messenger/drum.png b/public/images/emoji/facebook_messenger/drum.png
new file mode 100644
index 00000000000..d0c94c34e49
Binary files /dev/null and b/public/images/emoji/facebook_messenger/drum.png differ
diff --git a/public/images/emoji/facebook_messenger/duck.png b/public/images/emoji/facebook_messenger/duck.png
new file mode 100644
index 00000000000..6adaf8cddb3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/duck.png differ
diff --git a/public/images/emoji/facebook_messenger/dumpling.png b/public/images/emoji/facebook_messenger/dumpling.png
new file mode 100644
index 00000000000..489a779bf69
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dumpling.png differ
diff --git a/public/images/emoji/facebook_messenger/dvd.png b/public/images/emoji/facebook_messenger/dvd.png
new file mode 100644
index 00000000000..d2cfd45f3ce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/dvd.png differ
diff --git a/public/images/emoji/facebook_messenger/e-mail.png b/public/images/emoji/facebook_messenger/e-mail.png
new file mode 100644
index 00000000000..e160129faf7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/e-mail.png differ
diff --git a/public/images/emoji/facebook_messenger/eagle.png b/public/images/emoji/facebook_messenger/eagle.png
new file mode 100644
index 00000000000..c9cce258ae2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/eagle.png differ
diff --git a/public/images/emoji/facebook_messenger/ear.png b/public/images/emoji/facebook_messenger/ear.png
new file mode 100644
index 00000000000..654ee589830
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ear.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/2.png b/public/images/emoji/facebook_messenger/ear/2.png
new file mode 100644
index 00000000000..16c75ee0c1d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ear/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/3.png b/public/images/emoji/facebook_messenger/ear/3.png
new file mode 100644
index 00000000000..f62ef93bf8e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ear/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/4.png b/public/images/emoji/facebook_messenger/ear/4.png
new file mode 100644
index 00000000000..4b1179a35b8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ear/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/5.png b/public/images/emoji/facebook_messenger/ear/5.png
new file mode 100644
index 00000000000..2388c5ce034
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ear/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ear/6.png b/public/images/emoji/facebook_messenger/ear/6.png
new file mode 100644
index 00000000000..6b2e51b85e8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ear/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ear_of_rice.png b/public/images/emoji/facebook_messenger/ear_of_rice.png
new file mode 100644
index 00000000000..5273991fabb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ear_of_rice.png differ
diff --git a/public/images/emoji/facebook_messenger/earth_africa.png b/public/images/emoji/facebook_messenger/earth_africa.png
new file mode 100644
index 00000000000..f659e02dbe9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/earth_africa.png differ
diff --git a/public/images/emoji/facebook_messenger/earth_americas.png b/public/images/emoji/facebook_messenger/earth_americas.png
new file mode 100644
index 00000000000..26fbfc97142
Binary files /dev/null and b/public/images/emoji/facebook_messenger/earth_americas.png differ
diff --git a/public/images/emoji/facebook_messenger/earth_asia.png b/public/images/emoji/facebook_messenger/earth_asia.png
new file mode 100644
index 00000000000..030250142f5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/earth_asia.png differ
diff --git a/public/images/emoji/facebook_messenger/ecuador.png b/public/images/emoji/facebook_messenger/ecuador.png
new file mode 100644
index 00000000000..cf86fbaad62
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ecuador.png differ
diff --git a/public/images/emoji/facebook_messenger/egg.png b/public/images/emoji/facebook_messenger/egg.png
new file mode 100644
index 00000000000..cec55b549a2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/egg.png differ
diff --git a/public/images/emoji/facebook_messenger/eggplant.png b/public/images/emoji/facebook_messenger/eggplant.png
new file mode 100644
index 00000000000..4f60ef799da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/eggplant.png differ
diff --git a/public/images/emoji/facebook_messenger/egypt.png b/public/images/emoji/facebook_messenger/egypt.png
new file mode 100644
index 00000000000..bbbdefa653f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/egypt.png differ
diff --git a/public/images/emoji/facebook_messenger/eight.png b/public/images/emoji/facebook_messenger/eight.png
new file mode 100644
index 00000000000..12c277e5858
Binary files /dev/null and b/public/images/emoji/facebook_messenger/eight.png differ
diff --git a/public/images/emoji/facebook_messenger/eight_pointed_black_star.png b/public/images/emoji/facebook_messenger/eight_pointed_black_star.png
new file mode 100644
index 00000000000..af0cf9dabab
Binary files /dev/null and b/public/images/emoji/facebook_messenger/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png b/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png
new file mode 100644
index 00000000000..09351f437d7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/facebook_messenger/el_salvador.png b/public/images/emoji/facebook_messenger/el_salvador.png
new file mode 100644
index 00000000000..0f24a983698
Binary files /dev/null and b/public/images/emoji/facebook_messenger/el_salvador.png differ
diff --git a/public/images/emoji/facebook_messenger/electric_plug.png b/public/images/emoji/facebook_messenger/electric_plug.png
new file mode 100644
index 00000000000..b6c91f603b9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/electric_plug.png differ
diff --git a/public/images/emoji/facebook_messenger/elephant.png b/public/images/emoji/facebook_messenger/elephant.png
new file mode 100644
index 00000000000..d7dc652e62b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/elephant.png differ
diff --git a/public/images/emoji/facebook_messenger/elf.png b/public/images/emoji/facebook_messenger/elf.png
new file mode 100644
index 00000000000..f8b6dd873e2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/elf.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/2.png b/public/images/emoji/facebook_messenger/elf/2.png
new file mode 100644
index 00000000000..15984024f21
Binary files /dev/null and b/public/images/emoji/facebook_messenger/elf/2.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/3.png b/public/images/emoji/facebook_messenger/elf/3.png
new file mode 100644
index 00000000000..4689243a178
Binary files /dev/null and b/public/images/emoji/facebook_messenger/elf/3.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/4.png b/public/images/emoji/facebook_messenger/elf/4.png
new file mode 100644
index 00000000000..861cbf808ca
Binary files /dev/null and b/public/images/emoji/facebook_messenger/elf/4.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/5.png b/public/images/emoji/facebook_messenger/elf/5.png
new file mode 100644
index 00000000000..50748760101
Binary files /dev/null and b/public/images/emoji/facebook_messenger/elf/5.png differ
diff --git a/public/images/emoji/facebook_messenger/elf/6.png b/public/images/emoji/facebook_messenger/elf/6.png
new file mode 100644
index 00000000000..505c908b180
Binary files /dev/null and b/public/images/emoji/facebook_messenger/elf/6.png differ
diff --git a/public/images/emoji/facebook_messenger/email.png b/public/images/emoji/facebook_messenger/email.png
new file mode 100644
index 00000000000..e160129faf7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/email.png differ
diff --git a/public/images/emoji/facebook_messenger/end.png b/public/images/emoji/facebook_messenger/end.png
new file mode 100644
index 00000000000..fb13367f7f9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/end.png differ
diff --git a/public/images/emoji/facebook_messenger/envelope.png b/public/images/emoji/facebook_messenger/envelope.png
new file mode 100644
index 00000000000..e160129faf7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/envelope.png differ
diff --git a/public/images/emoji/facebook_messenger/envelope_with_arrow.png b/public/images/emoji/facebook_messenger/envelope_with_arrow.png
new file mode 100644
index 00000000000..ea1f5e5b37d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/envelope_with_arrow.png differ
diff --git a/public/images/emoji/facebook_messenger/equatorial_guinea.png b/public/images/emoji/facebook_messenger/equatorial_guinea.png
new file mode 100644
index 00000000000..38e992318c3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/equatorial_guinea.png differ
diff --git a/public/images/emoji/facebook_messenger/eritrea.png b/public/images/emoji/facebook_messenger/eritrea.png
new file mode 100644
index 00000000000..630fd664150
Binary files /dev/null and b/public/images/emoji/facebook_messenger/eritrea.png differ
diff --git a/public/images/emoji/facebook_messenger/es.png b/public/images/emoji/facebook_messenger/es.png
new file mode 100644
index 00000000000..82d50c036e3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/es.png differ
diff --git a/public/images/emoji/facebook_messenger/estonia.png b/public/images/emoji/facebook_messenger/estonia.png
new file mode 100644
index 00000000000..2553a5dbf7d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/estonia.png differ
diff --git a/public/images/emoji/facebook_messenger/ethiopia.png b/public/images/emoji/facebook_messenger/ethiopia.png
new file mode 100644
index 00000000000..d0d78350cdf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ethiopia.png differ
diff --git a/public/images/emoji/facebook_messenger/eu.png b/public/images/emoji/facebook_messenger/eu.png
new file mode 100644
index 00000000000..938b488ddb8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/eu.png differ
diff --git a/public/images/emoji/facebook_messenger/euro.png b/public/images/emoji/facebook_messenger/euro.png
new file mode 100644
index 00000000000..bdfc11b7f67
Binary files /dev/null and b/public/images/emoji/facebook_messenger/euro.png differ
diff --git a/public/images/emoji/facebook_messenger/european_castle.png b/public/images/emoji/facebook_messenger/european_castle.png
new file mode 100644
index 00000000000..5eeee24e643
Binary files /dev/null and b/public/images/emoji/facebook_messenger/european_castle.png differ
diff --git a/public/images/emoji/facebook_messenger/european_post_office.png b/public/images/emoji/facebook_messenger/european_post_office.png
new file mode 100644
index 00000000000..fb3da8bf709
Binary files /dev/null and b/public/images/emoji/facebook_messenger/european_post_office.png differ
diff --git a/public/images/emoji/facebook_messenger/evergreen_tree.png b/public/images/emoji/facebook_messenger/evergreen_tree.png
new file mode 100644
index 00000000000..ce75d328c3e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/evergreen_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/exclamation.png b/public/images/emoji/facebook_messenger/exclamation.png
new file mode 100644
index 00000000000..e7230e1697e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/exploding_head.png b/public/images/emoji/facebook_messenger/exploding_head.png
new file mode 100644
index 00000000000..85532dadc7a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/exploding_head.png differ
diff --git a/public/images/emoji/facebook_messenger/expressionless.png b/public/images/emoji/facebook_messenger/expressionless.png
new file mode 100644
index 00000000000..ace98269b51
Binary files /dev/null and b/public/images/emoji/facebook_messenger/expressionless.png differ
diff --git a/public/images/emoji/facebook_messenger/eye.png b/public/images/emoji/facebook_messenger/eye.png
new file mode 100644
index 00000000000..5c77590cb21
Binary files /dev/null and b/public/images/emoji/facebook_messenger/eye.png differ
diff --git a/public/images/emoji/facebook_messenger/eyeglasses.png b/public/images/emoji/facebook_messenger/eyeglasses.png
new file mode 100644
index 00000000000..04830b29aba
Binary files /dev/null and b/public/images/emoji/facebook_messenger/eyeglasses.png differ
diff --git a/public/images/emoji/facebook_messenger/eyes.png b/public/images/emoji/facebook_messenger/eyes.png
new file mode 100644
index 00000000000..711c98965b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/face_vomiting.png b/public/images/emoji/facebook_messenger/face_vomiting.png
new file mode 100644
index 00000000000..cd7c3d1f2b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/face_vomiting.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png b/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png
new file mode 100644
index 00000000000..aed8f62e0b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_head_bandage.png b/public/images/emoji/facebook_messenger/face_with_head_bandage.png
new file mode 100644
index 00000000000..97bec4d11f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/face_with_head_bandage.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_monocle.png b/public/images/emoji/facebook_messenger/face_with_monocle.png
new file mode 100644
index 00000000000..c6fbb4481d5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/face_with_monocle.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png b/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png
new file mode 100644
index 00000000000..887f70e3652
Binary files /dev/null and b/public/images/emoji/facebook_messenger/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png b/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png
new file mode 100644
index 00000000000..8a864a00bdf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png b/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png
new file mode 100644
index 00000000000..84bb9ec9c53
Binary files /dev/null and b/public/images/emoji/facebook_messenger/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/face_with_thermometer.png b/public/images/emoji/facebook_messenger/face_with_thermometer.png
new file mode 100644
index 00000000000..c9440239c0d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/face_with_thermometer.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch.png b/public/images/emoji/facebook_messenger/facepunch.png
new file mode 100644
index 00000000000..ed3c41bc0d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/facepunch.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/2.png b/public/images/emoji/facebook_messenger/facepunch/2.png
new file mode 100644
index 00000000000..e499d8d0fac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/facepunch/2.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/3.png b/public/images/emoji/facebook_messenger/facepunch/3.png
new file mode 100644
index 00000000000..f56ee4a1ff4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/facepunch/3.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/4.png b/public/images/emoji/facebook_messenger/facepunch/4.png
new file mode 100644
index 00000000000..bc6cebcbf63
Binary files /dev/null and b/public/images/emoji/facebook_messenger/facepunch/4.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/5.png b/public/images/emoji/facebook_messenger/facepunch/5.png
new file mode 100644
index 00000000000..c8313f984fb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/facepunch/5.png differ
diff --git a/public/images/emoji/facebook_messenger/facepunch/6.png b/public/images/emoji/facebook_messenger/facepunch/6.png
new file mode 100644
index 00000000000..cf2064a1ad3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/facepunch/6.png differ
diff --git a/public/images/emoji/facebook_messenger/factory.png b/public/images/emoji/facebook_messenger/factory.png
new file mode 100644
index 00000000000..188462d1b7c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/factory.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy.png b/public/images/emoji/facebook_messenger/fairy.png
new file mode 100644
index 00000000000..429938294b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fairy.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/2.png b/public/images/emoji/facebook_messenger/fairy/2.png
new file mode 100644
index 00000000000..91e1de4e5dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fairy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/3.png b/public/images/emoji/facebook_messenger/fairy/3.png
new file mode 100644
index 00000000000..42821806e92
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fairy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/4.png b/public/images/emoji/facebook_messenger/fairy/4.png
new file mode 100644
index 00000000000..9e8d3adb897
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fairy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/5.png b/public/images/emoji/facebook_messenger/fairy/5.png
new file mode 100644
index 00000000000..88d190e3926
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fairy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fairy/6.png b/public/images/emoji/facebook_messenger/fairy/6.png
new file mode 100644
index 00000000000..e6ab8ade743
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fairy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/falkland_islands.png b/public/images/emoji/facebook_messenger/falkland_islands.png
new file mode 100644
index 00000000000..d97a84cea15
Binary files /dev/null and b/public/images/emoji/facebook_messenger/falkland_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/fallen_leaf.png b/public/images/emoji/facebook_messenger/fallen_leaf.png
new file mode 100644
index 00000000000..f349fd56d10
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fallen_leaf.png differ
diff --git a/public/images/emoji/facebook_messenger/family.png b/public/images/emoji/facebook_messenger/family.png
new file mode 100644
index 00000000000..08b4d427baa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_boy.png b/public/images/emoji/facebook_messenger/family_man_boy.png
new file mode 100644
index 00000000000..d31b0f6209a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_boy_boy.png b/public/images/emoji/facebook_messenger/family_man_boy_boy.png
new file mode 100644
index 00000000000..67d15f282cf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_girl.png b/public/images/emoji/facebook_messenger/family_man_girl.png
new file mode 100644
index 00000000000..4bb3d823f80
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_girl_boy.png b/public/images/emoji/facebook_messenger/family_man_girl_boy.png
new file mode 100644
index 00000000000..a8b6469dcb1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_girl_girl.png b/public/images/emoji/facebook_messenger/family_man_girl_girl.png
new file mode 100644
index 00000000000..e1aa1a80db0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_boy.png b/public/images/emoji/facebook_messenger/family_man_man_boy.png
new file mode 100644
index 00000000000..02c84cb2374
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_man_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png b/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png
new file mode 100644
index 00000000000..b26bb9ae075
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_girl.png b/public/images/emoji/facebook_messenger/family_man_man_girl.png
new file mode 100644
index 00000000000..b8aa492934b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_man_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png b/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png
new file mode 100644
index 00000000000..e5f46611b54
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png b/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png
new file mode 100644
index 00000000000..569ee332e2e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_boy.png b/public/images/emoji/facebook_messenger/family_man_woman_boy.png
new file mode 100644
index 00000000000..d6749b798dd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_woman_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png b/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png
new file mode 100644
index 00000000000..34b21628a19
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_boys.png b/public/images/emoji/facebook_messenger/family_man_woman_boys.png
new file mode 100644
index 00000000000..34b21628a19
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_woman_boys.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girl.png b/public/images/emoji/facebook_messenger/family_man_woman_girl.png
new file mode 100644
index 00000000000..ff4539599f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_woman_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png b/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png
new file mode 100644
index 00000000000..08b4d427baa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png b/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png
new file mode 100644
index 00000000000..2e160431664
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_man_woman_girls.png b/public/images/emoji/facebook_messenger/family_man_woman_girls.png
new file mode 100644
index 00000000000..2e160431664
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_man_woman_girls.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_boy.png b/public/images/emoji/facebook_messenger/family_men_boy.png
new file mode 100644
index 00000000000..02c84cb2374
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_men_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_boys.png b/public/images/emoji/facebook_messenger/family_men_boys.png
new file mode 100644
index 00000000000..b26bb9ae075
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_men_boys.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_girl.png b/public/images/emoji/facebook_messenger/family_men_girl.png
new file mode 100644
index 00000000000..b8aa492934b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_men_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_girl_boy.png b/public/images/emoji/facebook_messenger/family_men_girl_boy.png
new file mode 100644
index 00000000000..e5f46611b54
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_men_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_men_girls.png b/public/images/emoji/facebook_messenger/family_men_girls.png
new file mode 100644
index 00000000000..569ee332e2e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_men_girls.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_boy.png b/public/images/emoji/facebook_messenger/family_woman_boy.png
new file mode 100644
index 00000000000..3b0f755fd8c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_woman_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_boy_boy.png b/public/images/emoji/facebook_messenger/family_woman_boy_boy.png
new file mode 100644
index 00000000000..f9a18137382
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_girl.png b/public/images/emoji/facebook_messenger/family_woman_girl.png
new file mode 100644
index 00000000000..966c36a0b90
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_woman_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_girl_boy.png b/public/images/emoji/facebook_messenger/family_woman_girl_boy.png
new file mode 100644
index 00000000000..68b96718176
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_girl_girl.png b/public/images/emoji/facebook_messenger/family_woman_girl_girl.png
new file mode 100644
index 00000000000..1e1995f8bf4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_boy.png b/public/images/emoji/facebook_messenger/family_woman_woman_boy.png
new file mode 100644
index 00000000000..7246ed2b02f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png b/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png
new file mode 100644
index 00000000000..734955bf4a8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_girl.png b/public/images/emoji/facebook_messenger/family_woman_woman_girl.png
new file mode 100644
index 00000000000..a702d02e5b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png b/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png
new file mode 100644
index 00000000000..d21b40444d9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png b/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png
new file mode 100644
index 00000000000..5f3f8b821ef
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_boy.png b/public/images/emoji/facebook_messenger/family_women_boy.png
new file mode 100644
index 00000000000..7246ed2b02f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_women_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_boys.png b/public/images/emoji/facebook_messenger/family_women_boys.png
new file mode 100644
index 00000000000..734955bf4a8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_women_boys.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_girl.png b/public/images/emoji/facebook_messenger/family_women_girl.png
new file mode 100644
index 00000000000..a702d02e5b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_women_girl.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_girl_boy.png b/public/images/emoji/facebook_messenger/family_women_girl_boy.png
new file mode 100644
index 00000000000..d21b40444d9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_women_girl_boy.png differ
diff --git a/public/images/emoji/facebook_messenger/family_women_girls.png b/public/images/emoji/facebook_messenger/family_women_girls.png
new file mode 100644
index 00000000000..5f3f8b821ef
Binary files /dev/null and b/public/images/emoji/facebook_messenger/family_women_girls.png differ
diff --git a/public/images/emoji/facebook_messenger/faroe_islands.png b/public/images/emoji/facebook_messenger/faroe_islands.png
new file mode 100644
index 00000000000..5da7953f8d0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/faroe_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/fast_forward.png b/public/images/emoji/facebook_messenger/fast_forward.png
new file mode 100644
index 00000000000..3e26428da13
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fast_forward.png differ
diff --git a/public/images/emoji/facebook_messenger/fax.png b/public/images/emoji/facebook_messenger/fax.png
new file mode 100644
index 00000000000..c28739d4599
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fax.png differ
diff --git a/public/images/emoji/facebook_messenger/fearful.png b/public/images/emoji/facebook_messenger/fearful.png
new file mode 100644
index 00000000000..c42b60ae3b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fearful.png differ
diff --git a/public/images/emoji/facebook_messenger/feet.png b/public/images/emoji/facebook_messenger/feet.png
new file mode 100644
index 00000000000..47eb29d7b8d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/feet.png differ
diff --git a/public/images/emoji/facebook_messenger/female_couple_with_heart.png b/public/images/emoji/facebook_messenger/female_couple_with_heart.png
new file mode 100644
index 00000000000..b82bbf04b49
Binary files /dev/null and b/public/images/emoji/facebook_messenger/female_couple_with_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/female_couplekiss.png b/public/images/emoji/facebook_messenger/female_couplekiss.png
new file mode 100644
index 00000000000..4f1324e09f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/female_couplekiss.png differ
diff --git a/public/images/emoji/facebook_messenger/female_detective.png b/public/images/emoji/facebook_messenger/female_detective.png
new file mode 100644
index 00000000000..c1703a7c869
Binary files /dev/null and b/public/images/emoji/facebook_messenger/female_detective.png differ
diff --git a/public/images/emoji/facebook_messenger/ferris_wheel.png b/public/images/emoji/facebook_messenger/ferris_wheel.png
new file mode 100644
index 00000000000..d88a5881ce8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ferris_wheel.png differ
diff --git a/public/images/emoji/facebook_messenger/ferry.png b/public/images/emoji/facebook_messenger/ferry.png
new file mode 100644
index 00000000000..b56a1cb3ff3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ferry.png differ
diff --git a/public/images/emoji/facebook_messenger/field_hockey.png b/public/images/emoji/facebook_messenger/field_hockey.png
new file mode 100644
index 00000000000..fb4f1e573a1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/field_hockey.png differ
diff --git a/public/images/emoji/facebook_messenger/fiji.png b/public/images/emoji/facebook_messenger/fiji.png
new file mode 100644
index 00000000000..df504caef6c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fiji.png differ
diff --git a/public/images/emoji/facebook_messenger/file_cabinet.png b/public/images/emoji/facebook_messenger/file_cabinet.png
new file mode 100644
index 00000000000..f94b0fd46ae
Binary files /dev/null and b/public/images/emoji/facebook_messenger/file_cabinet.png differ
diff --git a/public/images/emoji/facebook_messenger/file_folder.png b/public/images/emoji/facebook_messenger/file_folder.png
new file mode 100644
index 00000000000..131226b2b45
Binary files /dev/null and b/public/images/emoji/facebook_messenger/file_folder.png differ
diff --git a/public/images/emoji/facebook_messenger/film_frames.png b/public/images/emoji/facebook_messenger/film_frames.png
new file mode 100644
index 00000000000..f0fcd6fc1dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/film_frames.png differ
diff --git a/public/images/emoji/facebook_messenger/film_projector.png b/public/images/emoji/facebook_messenger/film_projector.png
new file mode 100644
index 00000000000..3acb6ea9c3f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/film_projector.png differ
diff --git a/public/images/emoji/facebook_messenger/film_strip.png b/public/images/emoji/facebook_messenger/film_strip.png
new file mode 100644
index 00000000000..f0fcd6fc1dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/film_strip.png differ
diff --git a/public/images/emoji/facebook_messenger/finland.png b/public/images/emoji/facebook_messenger/finland.png
new file mode 100644
index 00000000000..3e6178f10a4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/finland.png differ
diff --git a/public/images/emoji/facebook_messenger/fire.png b/public/images/emoji/facebook_messenger/fire.png
new file mode 100644
index 00000000000..d871ffb8a4d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fire.png differ
diff --git a/public/images/emoji/facebook_messenger/fire_engine.png b/public/images/emoji/facebook_messenger/fire_engine.png
new file mode 100644
index 00000000000..66b69e4f300
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fire_engine.png differ
diff --git a/public/images/emoji/facebook_messenger/fireworks.png b/public/images/emoji/facebook_messenger/fireworks.png
new file mode 100644
index 00000000000..e4367bbe5dd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fireworks.png differ
diff --git a/public/images/emoji/facebook_messenger/first_quarter_moon.png b/public/images/emoji/facebook_messenger/first_quarter_moon.png
new file mode 100644
index 00000000000..1ac1c39d87a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/first_quarter_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png b/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png
new file mode 100644
index 00000000000..144e9976c5c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/fish.png b/public/images/emoji/facebook_messenger/fish.png
new file mode 100644
index 00000000000..73ab8a00678
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fish.png differ
diff --git a/public/images/emoji/facebook_messenger/fish_cake.png b/public/images/emoji/facebook_messenger/fish_cake.png
new file mode 100644
index 00000000000..89982e42bf1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fish_cake.png differ
diff --git a/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png b/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png
new file mode 100644
index 00000000000..827a249f5f2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/facebook_messenger/fist.png b/public/images/emoji/facebook_messenger/fist.png
new file mode 100644
index 00000000000..735826472a0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/2.png b/public/images/emoji/facebook_messenger/fist/2.png
new file mode 100644
index 00000000000..5731ed8c0af
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/3.png b/public/images/emoji/facebook_messenger/fist/3.png
new file mode 100644
index 00000000000..db84dee200e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/4.png b/public/images/emoji/facebook_messenger/fist/4.png
new file mode 100644
index 00000000000..6390df800dd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/5.png b/public/images/emoji/facebook_messenger/fist/5.png
new file mode 100644
index 00000000000..32890d75b7c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fist/6.png b/public/images/emoji/facebook_messenger/fist/6.png
new file mode 100644
index 00000000000..36ed9f43f1e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left.png b/public/images/emoji/facebook_messenger/fist_left.png
new file mode 100644
index 00000000000..f1ebb97514a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_left.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/2.png b/public/images/emoji/facebook_messenger/fist_left/2.png
new file mode 100644
index 00000000000..1360d252cef
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_left/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/3.png b/public/images/emoji/facebook_messenger/fist_left/3.png
new file mode 100644
index 00000000000..270de69cd23
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_left/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/4.png b/public/images/emoji/facebook_messenger/fist_left/4.png
new file mode 100644
index 00000000000..99e8ae08f3f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_left/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/5.png b/public/images/emoji/facebook_messenger/fist_left/5.png
new file mode 100644
index 00000000000..5600a525fbb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_left/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_left/6.png b/public/images/emoji/facebook_messenger/fist_left/6.png
new file mode 100644
index 00000000000..4db9f46f345
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_left/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right.png b/public/images/emoji/facebook_messenger/fist_right.png
new file mode 100644
index 00000000000..010432f2013
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_right.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/2.png b/public/images/emoji/facebook_messenger/fist_right/2.png
new file mode 100644
index 00000000000..a71348e322b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_right/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/3.png b/public/images/emoji/facebook_messenger/fist_right/3.png
new file mode 100644
index 00000000000..b62317eca5a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_right/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/4.png b/public/images/emoji/facebook_messenger/fist_right/4.png
new file mode 100644
index 00000000000..abceea04345
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_right/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/5.png b/public/images/emoji/facebook_messenger/fist_right/5.png
new file mode 100644
index 00000000000..e64682dfe54
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_right/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fist_right/6.png b/public/images/emoji/facebook_messenger/fist_right/6.png
new file mode 100644
index 00000000000..daa257c5c26
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fist_right/6.png differ
diff --git a/public/images/emoji/facebook_messenger/five.png b/public/images/emoji/facebook_messenger/five.png
new file mode 100644
index 00000000000..cea258d2f05
Binary files /dev/null and b/public/images/emoji/facebook_messenger/five.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_black.png b/public/images/emoji/facebook_messenger/flag_black.png
new file mode 100644
index 00000000000..5c1237bdad2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_black.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_cn.png b/public/images/emoji/facebook_messenger/flag_cn.png
new file mode 100644
index 00000000000..a9325fc771c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_cn.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_de.png b/public/images/emoji/facebook_messenger/flag_de.png
new file mode 100644
index 00000000000..964116acbb5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_de.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_es.png b/public/images/emoji/facebook_messenger/flag_es.png
new file mode 100644
index 00000000000..82d50c036e3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_es.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_fr.png b/public/images/emoji/facebook_messenger/flag_fr.png
new file mode 100644
index 00000000000..f8afe536517
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_fr.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_gb.png b/public/images/emoji/facebook_messenger/flag_gb.png
new file mode 100644
index 00000000000..bc850e7890e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_gb.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_it.png b/public/images/emoji/facebook_messenger/flag_it.png
new file mode 100644
index 00000000000..e5e0646c21a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_it.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_jp.png b/public/images/emoji/facebook_messenger/flag_jp.png
new file mode 100644
index 00000000000..ab749c77f7d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_jp.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_kr.png b/public/images/emoji/facebook_messenger/flag_kr.png
new file mode 100644
index 00000000000..73c4454e7fe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_kr.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_ru.png b/public/images/emoji/facebook_messenger/flag_ru.png
new file mode 100644
index 00000000000..f3932d9f3cc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_ru.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_us.png b/public/images/emoji/facebook_messenger/flag_us.png
new file mode 100644
index 00000000000..b0c3a76dd6a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_us.png differ
diff --git a/public/images/emoji/facebook_messenger/flag_white.png b/public/images/emoji/facebook_messenger/flag_white.png
new file mode 100644
index 00000000000..5f052fff2af
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flag_white.png differ
diff --git a/public/images/emoji/facebook_messenger/flags.png b/public/images/emoji/facebook_messenger/flags.png
new file mode 100644
index 00000000000..52e8a4a95f3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flags.png differ
diff --git a/public/images/emoji/facebook_messenger/flame.png b/public/images/emoji/facebook_messenger/flame.png
new file mode 100644
index 00000000000..d871ffb8a4d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flame.png differ
diff --git a/public/images/emoji/facebook_messenger/flashlight.png b/public/images/emoji/facebook_messenger/flashlight.png
new file mode 100644
index 00000000000..3bb5512763d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flashlight.png differ
diff --git a/public/images/emoji/facebook_messenger/fleur-de-lis.png b/public/images/emoji/facebook_messenger/fleur-de-lis.png
new file mode 100644
index 00000000000..27cd209049a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fleur-de-lis.png differ
diff --git a/public/images/emoji/facebook_messenger/fleur_de_lis.png b/public/images/emoji/facebook_messenger/fleur_de_lis.png
new file mode 100644
index 00000000000..27cd209049a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fleur_de_lis.png differ
diff --git a/public/images/emoji/facebook_messenger/flight_arrival.png b/public/images/emoji/facebook_messenger/flight_arrival.png
new file mode 100644
index 00000000000..0585a1c36c2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flight_arrival.png differ
diff --git a/public/images/emoji/facebook_messenger/flight_departure.png b/public/images/emoji/facebook_messenger/flight_departure.png
new file mode 100644
index 00000000000..dc86670a865
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flight_departure.png differ
diff --git a/public/images/emoji/facebook_messenger/floppy_disk.png b/public/images/emoji/facebook_messenger/floppy_disk.png
new file mode 100644
index 00000000000..25bd410b023
Binary files /dev/null and b/public/images/emoji/facebook_messenger/floppy_disk.png differ
diff --git a/public/images/emoji/facebook_messenger/flower_playing_cards.png b/public/images/emoji/facebook_messenger/flower_playing_cards.png
new file mode 100644
index 00000000000..baf5f9ddded
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flower_playing_cards.png differ
diff --git a/public/images/emoji/facebook_messenger/flushed.png b/public/images/emoji/facebook_messenger/flushed.png
new file mode 100644
index 00000000000..7b4667ad26f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flushed.png differ
diff --git a/public/images/emoji/facebook_messenger/flying_saucer.png b/public/images/emoji/facebook_messenger/flying_saucer.png
new file mode 100644
index 00000000000..7d5c8628554
Binary files /dev/null and b/public/images/emoji/facebook_messenger/flying_saucer.png differ
diff --git a/public/images/emoji/facebook_messenger/fog.png b/public/images/emoji/facebook_messenger/fog.png
new file mode 100644
index 00000000000..f8aee2c7b5e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fog.png differ
diff --git a/public/images/emoji/facebook_messenger/foggy.png b/public/images/emoji/facebook_messenger/foggy.png
new file mode 100644
index 00000000000..e5dcb6812ad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/foggy.png differ
diff --git a/public/images/emoji/facebook_messenger/football.png b/public/images/emoji/facebook_messenger/football.png
new file mode 100644
index 00000000000..65f4c1147af
Binary files /dev/null and b/public/images/emoji/facebook_messenger/football.png differ
diff --git a/public/images/emoji/facebook_messenger/footprints.png b/public/images/emoji/facebook_messenger/footprints.png
new file mode 100644
index 00000000000..47eb29d7b8d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/footprints.png differ
diff --git a/public/images/emoji/facebook_messenger/fork_and_knife.png b/public/images/emoji/facebook_messenger/fork_and_knife.png
new file mode 100644
index 00000000000..e233399e521
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fork_and_knife.png differ
diff --git a/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png b/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png
new file mode 100644
index 00000000000..df63dcc4f4f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/facebook_messenger/fork_knife_plate.png b/public/images/emoji/facebook_messenger/fork_knife_plate.png
new file mode 100644
index 00000000000..df63dcc4f4f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fork_knife_plate.png differ
diff --git a/public/images/emoji/facebook_messenger/fortune_cookie.png b/public/images/emoji/facebook_messenger/fortune_cookie.png
new file mode 100644
index 00000000000..94a8cdca403
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fortune_cookie.png differ
diff --git a/public/images/emoji/facebook_messenger/fountain.png b/public/images/emoji/facebook_messenger/fountain.png
new file mode 100644
index 00000000000..c128b6075ea
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fountain.png differ
diff --git a/public/images/emoji/facebook_messenger/fountain_pen.png b/public/images/emoji/facebook_messenger/fountain_pen.png
new file mode 100644
index 00000000000..96584c9f579
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fountain_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/four.png b/public/images/emoji/facebook_messenger/four.png
new file mode 100644
index 00000000000..f728effd4a7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/four.png differ
diff --git a/public/images/emoji/facebook_messenger/four_leaf_clover.png b/public/images/emoji/facebook_messenger/four_leaf_clover.png
new file mode 100644
index 00000000000..99d39c965cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/four_leaf_clover.png differ
diff --git a/public/images/emoji/facebook_messenger/fox_face.png b/public/images/emoji/facebook_messenger/fox_face.png
new file mode 100644
index 00000000000..74bcddb7e72
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fox_face.png differ
diff --git a/public/images/emoji/facebook_messenger/fr.png b/public/images/emoji/facebook_messenger/fr.png
new file mode 100644
index 00000000000..f8afe536517
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fr.png differ
diff --git a/public/images/emoji/facebook_messenger/frame_photo.png b/public/images/emoji/facebook_messenger/frame_photo.png
new file mode 100644
index 00000000000..ad38ccf08da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frame_photo.png differ
diff --git a/public/images/emoji/facebook_messenger/frame_with_picture.png b/public/images/emoji/facebook_messenger/frame_with_picture.png
new file mode 100644
index 00000000000..ad38ccf08da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frame_with_picture.png differ
diff --git a/public/images/emoji/facebook_messenger/framed_picture.png b/public/images/emoji/facebook_messenger/framed_picture.png
new file mode 100644
index 00000000000..ad38ccf08da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/framed_picture.png differ
diff --git a/public/images/emoji/facebook_messenger/free.png b/public/images/emoji/facebook_messenger/free.png
new file mode 100644
index 00000000000..1b4d5a6973b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/free.png differ
diff --git a/public/images/emoji/facebook_messenger/french_guiana.png b/public/images/emoji/facebook_messenger/french_guiana.png
new file mode 100644
index 00000000000..b67d58af241
Binary files /dev/null and b/public/images/emoji/facebook_messenger/french_guiana.png differ
diff --git a/public/images/emoji/facebook_messenger/french_polynesia.png b/public/images/emoji/facebook_messenger/french_polynesia.png
new file mode 100644
index 00000000000..8e67281736f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/french_polynesia.png differ
diff --git a/public/images/emoji/facebook_messenger/french_southern_territories.png b/public/images/emoji/facebook_messenger/french_southern_territories.png
new file mode 100644
index 00000000000..ecc9bec0fa6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/french_southern_territories.png differ
diff --git a/public/images/emoji/facebook_messenger/fried_egg.png b/public/images/emoji/facebook_messenger/fried_egg.png
new file mode 100644
index 00000000000..20578913f18
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fried_egg.png differ
diff --git a/public/images/emoji/facebook_messenger/fried_shrimp.png b/public/images/emoji/facebook_messenger/fried_shrimp.png
new file mode 100644
index 00000000000..e3ffbd88884
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fried_shrimp.png differ
diff --git a/public/images/emoji/facebook_messenger/fries.png b/public/images/emoji/facebook_messenger/fries.png
new file mode 100644
index 00000000000..49655d58273
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fries.png differ
diff --git a/public/images/emoji/facebook_messenger/frog.png b/public/images/emoji/facebook_messenger/frog.png
new file mode 100644
index 00000000000..33274868db2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frog.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning.png b/public/images/emoji/facebook_messenger/frowning.png
new file mode 100644
index 00000000000..55d6c9d4605
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning2.png b/public/images/emoji/facebook_messenger/frowning2.png
new file mode 100644
index 00000000000..1c5988a20b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning2.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_face.png b/public/images/emoji/facebook_messenger/frowning_face.png
new file mode 100644
index 00000000000..1c5988a20b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_face.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man.png b/public/images/emoji/facebook_messenger/frowning_man.png
new file mode 100644
index 00000000000..e10ce817f85
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_man.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/2.png b/public/images/emoji/facebook_messenger/frowning_man/2.png
new file mode 100644
index 00000000000..5f04a5370d7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/3.png b/public/images/emoji/facebook_messenger/frowning_man/3.png
new file mode 100644
index 00000000000..8be682c19d4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/4.png b/public/images/emoji/facebook_messenger/frowning_man/4.png
new file mode 100644
index 00000000000..28b79908428
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/5.png b/public/images/emoji/facebook_messenger/frowning_man/5.png
new file mode 100644
index 00000000000..5f8463196b4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_man/6.png b/public/images/emoji/facebook_messenger/frowning_man/6.png
new file mode 100644
index 00000000000..8c92a9c484b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman.png b/public/images/emoji/facebook_messenger/frowning_woman.png
new file mode 100644
index 00000000000..1e5f89e7b57
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/2.png b/public/images/emoji/facebook_messenger/frowning_woman/2.png
new file mode 100644
index 00000000000..db018f2e812
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/3.png b/public/images/emoji/facebook_messenger/frowning_woman/3.png
new file mode 100644
index 00000000000..2a32b70d58a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/4.png b/public/images/emoji/facebook_messenger/frowning_woman/4.png
new file mode 100644
index 00000000000..824a0bea02b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/5.png b/public/images/emoji/facebook_messenger/frowning_woman/5.png
new file mode 100644
index 00000000000..ca476ecf1f3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/frowning_woman/6.png b/public/images/emoji/facebook_messenger/frowning_woman/6.png
new file mode 100644
index 00000000000..c36b369e0b8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/frowning_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fu.png b/public/images/emoji/facebook_messenger/fu.png
new file mode 100644
index 00000000000..8e7fce2f49b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fu.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/2.png b/public/images/emoji/facebook_messenger/fu/2.png
new file mode 100644
index 00000000000..992338bb2b6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fu/2.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/3.png b/public/images/emoji/facebook_messenger/fu/3.png
new file mode 100644
index 00000000000..aadc06129fe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fu/3.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/4.png b/public/images/emoji/facebook_messenger/fu/4.png
new file mode 100644
index 00000000000..8ad10be1169
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fu/4.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/5.png b/public/images/emoji/facebook_messenger/fu/5.png
new file mode 100644
index 00000000000..695c4a6cb9c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fu/5.png differ
diff --git a/public/images/emoji/facebook_messenger/fu/6.png b/public/images/emoji/facebook_messenger/fu/6.png
new file mode 100644
index 00000000000..3457e01312c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fu/6.png differ
diff --git a/public/images/emoji/facebook_messenger/fuelpump.png b/public/images/emoji/facebook_messenger/fuelpump.png
new file mode 100644
index 00000000000..75df52ada8f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/fuelpump.png differ
diff --git a/public/images/emoji/facebook_messenger/full_moon.png b/public/images/emoji/facebook_messenger/full_moon.png
new file mode 100644
index 00000000000..9d4cd0c36b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/full_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/full_moon_with_face.png b/public/images/emoji/facebook_messenger/full_moon_with_face.png
new file mode 100644
index 00000000000..ff164d2be14
Binary files /dev/null and b/public/images/emoji/facebook_messenger/full_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/funeral_urn.png b/public/images/emoji/facebook_messenger/funeral_urn.png
new file mode 100644
index 00000000000..56112c50ed4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/funeral_urn.png differ
diff --git a/public/images/emoji/facebook_messenger/gabon.png b/public/images/emoji/facebook_messenger/gabon.png
new file mode 100644
index 00000000000..6563b2a69f0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gabon.png differ
diff --git a/public/images/emoji/facebook_messenger/gambia.png b/public/images/emoji/facebook_messenger/gambia.png
new file mode 100644
index 00000000000..707ca2a121b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gambia.png differ
diff --git a/public/images/emoji/facebook_messenger/game_die.png b/public/images/emoji/facebook_messenger/game_die.png
new file mode 100644
index 00000000000..9ed66afdac8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/game_die.png differ
diff --git a/public/images/emoji/facebook_messenger/gb.png b/public/images/emoji/facebook_messenger/gb.png
new file mode 100644
index 00000000000..bc850e7890e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gb.png differ
diff --git a/public/images/emoji/facebook_messenger/gear.png b/public/images/emoji/facebook_messenger/gear.png
new file mode 100644
index 00000000000..6a9d3b8d1b1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gear.png differ
diff --git a/public/images/emoji/facebook_messenger/gem.png b/public/images/emoji/facebook_messenger/gem.png
new file mode 100644
index 00000000000..7ffd84c773c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gem.png differ
diff --git a/public/images/emoji/facebook_messenger/gemini.png b/public/images/emoji/facebook_messenger/gemini.png
new file mode 100644
index 00000000000..a08a5b768b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gemini.png differ
diff --git a/public/images/emoji/facebook_messenger/genie.png b/public/images/emoji/facebook_messenger/genie.png
new file mode 100644
index 00000000000..f0eddcc91ae
Binary files /dev/null and b/public/images/emoji/facebook_messenger/genie.png differ
diff --git a/public/images/emoji/facebook_messenger/georgia.png b/public/images/emoji/facebook_messenger/georgia.png
new file mode 100644
index 00000000000..673f81ef6ff
Binary files /dev/null and b/public/images/emoji/facebook_messenger/georgia.png differ
diff --git a/public/images/emoji/facebook_messenger/ghana.png b/public/images/emoji/facebook_messenger/ghana.png
new file mode 100644
index 00000000000..f1b8829dbab
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ghana.png differ
diff --git a/public/images/emoji/facebook_messenger/ghost.png b/public/images/emoji/facebook_messenger/ghost.png
new file mode 100644
index 00000000000..45ea4f57b9b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ghost.png differ
diff --git a/public/images/emoji/facebook_messenger/gibraltar.png b/public/images/emoji/facebook_messenger/gibraltar.png
new file mode 100644
index 00000000000..cbe9f11a125
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gibraltar.png differ
diff --git a/public/images/emoji/facebook_messenger/gift.png b/public/images/emoji/facebook_messenger/gift.png
new file mode 100644
index 00000000000..d4abb27460e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gift.png differ
diff --git a/public/images/emoji/facebook_messenger/gift_heart.png b/public/images/emoji/facebook_messenger/gift_heart.png
new file mode 100644
index 00000000000..7cb11440d2e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gift_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/giraffe.png b/public/images/emoji/facebook_messenger/giraffe.png
new file mode 100644
index 00000000000..be0e85d2896
Binary files /dev/null and b/public/images/emoji/facebook_messenger/giraffe.png differ
diff --git a/public/images/emoji/facebook_messenger/girl.png b/public/images/emoji/facebook_messenger/girl.png
new file mode 100644
index 00000000000..cef329322b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/girl.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/2.png b/public/images/emoji/facebook_messenger/girl/2.png
new file mode 100644
index 00000000000..94ef7ffcde0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/girl/2.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/3.png b/public/images/emoji/facebook_messenger/girl/3.png
new file mode 100644
index 00000000000..84c7e27b997
Binary files /dev/null and b/public/images/emoji/facebook_messenger/girl/3.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/4.png b/public/images/emoji/facebook_messenger/girl/4.png
new file mode 100644
index 00000000000..f542d343c02
Binary files /dev/null and b/public/images/emoji/facebook_messenger/girl/4.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/5.png b/public/images/emoji/facebook_messenger/girl/5.png
new file mode 100644
index 00000000000..c4d0909ec8c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/girl/5.png differ
diff --git a/public/images/emoji/facebook_messenger/girl/6.png b/public/images/emoji/facebook_messenger/girl/6.png
new file mode 100644
index 00000000000..74133163aa7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/girl/6.png differ
diff --git a/public/images/emoji/facebook_messenger/globe_with_meridians.png b/public/images/emoji/facebook_messenger/globe_with_meridians.png
new file mode 100644
index 00000000000..fec4f1ea63c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/globe_with_meridians.png differ
diff --git a/public/images/emoji/facebook_messenger/gloves.png b/public/images/emoji/facebook_messenger/gloves.png
new file mode 100644
index 00000000000..1a11dd2c560
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gloves.png differ
diff --git a/public/images/emoji/facebook_messenger/goal_net.png b/public/images/emoji/facebook_messenger/goal_net.png
new file mode 100644
index 00000000000..4773a63cf9d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/goal_net.png differ
diff --git a/public/images/emoji/facebook_messenger/goat.png b/public/images/emoji/facebook_messenger/goat.png
new file mode 100644
index 00000000000..7c66018bd40
Binary files /dev/null and b/public/images/emoji/facebook_messenger/goat.png differ
diff --git a/public/images/emoji/facebook_messenger/golf.png b/public/images/emoji/facebook_messenger/golf.png
new file mode 100644
index 00000000000..750595fb3c9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golf.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer.png b/public/images/emoji/facebook_messenger/golfer.png
new file mode 100644
index 00000000000..36609a56707
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfer.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/2.png b/public/images/emoji/facebook_messenger/golfer/2.png
new file mode 100644
index 00000000000..93df509c6ee
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/3.png b/public/images/emoji/facebook_messenger/golfer/3.png
new file mode 100644
index 00000000000..d986fe75018
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/4.png b/public/images/emoji/facebook_messenger/golfer/4.png
new file mode 100644
index 00000000000..3fa61820b6a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/5.png b/public/images/emoji/facebook_messenger/golfer/5.png
new file mode 100644
index 00000000000..22116c217a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/golfer/6.png b/public/images/emoji/facebook_messenger/golfer/6.png
new file mode 100644
index 00000000000..ebbc3263e20
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man.png b/public/images/emoji/facebook_messenger/golfing_man.png
new file mode 100644
index 00000000000..36609a56707
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/2.png b/public/images/emoji/facebook_messenger/golfing_man/2.png
new file mode 100644
index 00000000000..93df509c6ee
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/3.png b/public/images/emoji/facebook_messenger/golfing_man/3.png
new file mode 100644
index 00000000000..d986fe75018
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/4.png b/public/images/emoji/facebook_messenger/golfing_man/4.png
new file mode 100644
index 00000000000..3fa61820b6a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/5.png b/public/images/emoji/facebook_messenger/golfing_man/5.png
new file mode 100644
index 00000000000..22116c217a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_man/6.png b/public/images/emoji/facebook_messenger/golfing_man/6.png
new file mode 100644
index 00000000000..ebbc3263e20
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/golfing_woman.png b/public/images/emoji/facebook_messenger/golfing_woman.png
new file mode 100644
index 00000000000..115ceac8f08
Binary files /dev/null and b/public/images/emoji/facebook_messenger/golfing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/gorilla.png b/public/images/emoji/facebook_messenger/gorilla.png
new file mode 100644
index 00000000000..bd7d3d17fb5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gorilla.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma.png b/public/images/emoji/facebook_messenger/grandma.png
new file mode 100644
index 00000000000..02e8230771c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grandma.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/2.png b/public/images/emoji/facebook_messenger/grandma/2.png
new file mode 100644
index 00000000000..8e4a01cfccf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grandma/2.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/3.png b/public/images/emoji/facebook_messenger/grandma/3.png
new file mode 100644
index 00000000000..4f8be8c914b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grandma/3.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/4.png b/public/images/emoji/facebook_messenger/grandma/4.png
new file mode 100644
index 00000000000..0d7aa5e0d9a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grandma/4.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/5.png b/public/images/emoji/facebook_messenger/grandma/5.png
new file mode 100644
index 00000000000..41f7e664386
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grandma/5.png differ
diff --git a/public/images/emoji/facebook_messenger/grandma/6.png b/public/images/emoji/facebook_messenger/grandma/6.png
new file mode 100644
index 00000000000..6de06114965
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grandma/6.png differ
diff --git a/public/images/emoji/facebook_messenger/grapes.png b/public/images/emoji/facebook_messenger/grapes.png
new file mode 100644
index 00000000000..6503af87cc3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grapes.png differ
diff --git a/public/images/emoji/facebook_messenger/greece.png b/public/images/emoji/facebook_messenger/greece.png
new file mode 100644
index 00000000000..c274ffb629c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/greece.png differ
diff --git a/public/images/emoji/facebook_messenger/green_apple.png b/public/images/emoji/facebook_messenger/green_apple.png
new file mode 100644
index 00000000000..4955c0c8cae
Binary files /dev/null and b/public/images/emoji/facebook_messenger/green_apple.png differ
diff --git a/public/images/emoji/facebook_messenger/green_book.png b/public/images/emoji/facebook_messenger/green_book.png
new file mode 100644
index 00000000000..535329d5920
Binary files /dev/null and b/public/images/emoji/facebook_messenger/green_book.png differ
diff --git a/public/images/emoji/facebook_messenger/green_heart.png b/public/images/emoji/facebook_messenger/green_heart.png
new file mode 100644
index 00000000000..9c3f439624c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/green_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/green_salad.png b/public/images/emoji/facebook_messenger/green_salad.png
new file mode 100644
index 00000000000..e3325b048e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/green_salad.png differ
diff --git a/public/images/emoji/facebook_messenger/greenland.png b/public/images/emoji/facebook_messenger/greenland.png
new file mode 100644
index 00000000000..31c8707a434
Binary files /dev/null and b/public/images/emoji/facebook_messenger/greenland.png differ
diff --git a/public/images/emoji/facebook_messenger/grenada.png b/public/images/emoji/facebook_messenger/grenada.png
new file mode 100644
index 00000000000..87f17a6ff22
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grenada.png differ
diff --git a/public/images/emoji/facebook_messenger/grey_exclamation.png b/public/images/emoji/facebook_messenger/grey_exclamation.png
new file mode 100644
index 00000000000..2e4d806cfd2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grey_exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/grey_question.png b/public/images/emoji/facebook_messenger/grey_question.png
new file mode 100644
index 00000000000..22c7edad284
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grey_question.png differ
diff --git a/public/images/emoji/facebook_messenger/grimacing.png b/public/images/emoji/facebook_messenger/grimacing.png
new file mode 100644
index 00000000000..768958e1304
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grimacing.png differ
diff --git a/public/images/emoji/facebook_messenger/grin.png b/public/images/emoji/facebook_messenger/grin.png
new file mode 100644
index 00000000000..47c8a262760
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grin.png differ
diff --git a/public/images/emoji/facebook_messenger/grinning.png b/public/images/emoji/facebook_messenger/grinning.png
new file mode 100644
index 00000000000..508ab37205e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/grinning.png differ
diff --git a/public/images/emoji/facebook_messenger/guadeloupe.png b/public/images/emoji/facebook_messenger/guadeloupe.png
new file mode 100644
index 00000000000..c9c437901df
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guadeloupe.png differ
diff --git a/public/images/emoji/facebook_messenger/guam.png b/public/images/emoji/facebook_messenger/guam.png
new file mode 100644
index 00000000000..d291c89c97c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guam.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman.png b/public/images/emoji/facebook_messenger/guardsman.png
new file mode 100644
index 00000000000..66df4e7a1b4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardsman.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/2.png b/public/images/emoji/facebook_messenger/guardsman/2.png
new file mode 100644
index 00000000000..819233d197f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardsman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/3.png b/public/images/emoji/facebook_messenger/guardsman/3.png
new file mode 100644
index 00000000000..17d12bc5b1c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardsman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/4.png b/public/images/emoji/facebook_messenger/guardsman/4.png
new file mode 100644
index 00000000000..57dbe514275
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardsman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/5.png b/public/images/emoji/facebook_messenger/guardsman/5.png
new file mode 100644
index 00000000000..3d2088de4a7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardsman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/guardsman/6.png b/public/images/emoji/facebook_messenger/guardsman/6.png
new file mode 100644
index 00000000000..38b5ea50035
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardsman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman.png b/public/images/emoji/facebook_messenger/guardswoman.png
new file mode 100644
index 00000000000..fefb6c23e59
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardswoman.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/2.png b/public/images/emoji/facebook_messenger/guardswoman/2.png
new file mode 100644
index 00000000000..9b3ea56a62d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardswoman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/3.png b/public/images/emoji/facebook_messenger/guardswoman/3.png
new file mode 100644
index 00000000000..0ab6714e8dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardswoman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/4.png b/public/images/emoji/facebook_messenger/guardswoman/4.png
new file mode 100644
index 00000000000..4fde6f1fd6b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardswoman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/5.png b/public/images/emoji/facebook_messenger/guardswoman/5.png
new file mode 100644
index 00000000000..42349efadde
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardswoman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/guardswoman/6.png b/public/images/emoji/facebook_messenger/guardswoman/6.png
new file mode 100644
index 00000000000..77ae53aaf1d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guardswoman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/guatemala.png b/public/images/emoji/facebook_messenger/guatemala.png
new file mode 100644
index 00000000000..b7e7259bc83
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guatemala.png differ
diff --git a/public/images/emoji/facebook_messenger/guernsey.png b/public/images/emoji/facebook_messenger/guernsey.png
new file mode 100644
index 00000000000..f92e78a3246
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guernsey.png differ
diff --git a/public/images/emoji/facebook_messenger/guinea.png b/public/images/emoji/facebook_messenger/guinea.png
new file mode 100644
index 00000000000..dd1482188c6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guinea.png differ
diff --git a/public/images/emoji/facebook_messenger/guinea_bissau.png b/public/images/emoji/facebook_messenger/guinea_bissau.png
new file mode 100644
index 00000000000..c2ab6fb5073
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guinea_bissau.png differ
diff --git a/public/images/emoji/facebook_messenger/guitar.png b/public/images/emoji/facebook_messenger/guitar.png
new file mode 100644
index 00000000000..7e8246bd693
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guitar.png differ
diff --git a/public/images/emoji/facebook_messenger/gun.png b/public/images/emoji/facebook_messenger/gun.png
new file mode 100644
index 00000000000..0d269b9bbd5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/gun.png differ
diff --git a/public/images/emoji/facebook_messenger/guyana.png b/public/images/emoji/facebook_messenger/guyana.png
new file mode 100644
index 00000000000..2ceb411ad23
Binary files /dev/null and b/public/images/emoji/facebook_messenger/guyana.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut.png b/public/images/emoji/facebook_messenger/haircut.png
new file mode 100644
index 00000000000..b6c6486938e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/2.png b/public/images/emoji/facebook_messenger/haircut/2.png
new file mode 100644
index 00000000000..e211f4d8bbe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut/2.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/3.png b/public/images/emoji/facebook_messenger/haircut/3.png
new file mode 100644
index 00000000000..47626a4a9e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut/3.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/4.png b/public/images/emoji/facebook_messenger/haircut/4.png
new file mode 100644
index 00000000000..210b78048c0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut/4.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/5.png b/public/images/emoji/facebook_messenger/haircut/5.png
new file mode 100644
index 00000000000..543c86e14d0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut/5.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut/6.png b/public/images/emoji/facebook_messenger/haircut/6.png
new file mode 100644
index 00000000000..3e21e1099be
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut/6.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man.png b/public/images/emoji/facebook_messenger/haircut_man.png
new file mode 100644
index 00000000000..b5a80561e42
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_man.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/2.png b/public/images/emoji/facebook_messenger/haircut_man/2.png
new file mode 100644
index 00000000000..2be41d13bcd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/3.png b/public/images/emoji/facebook_messenger/haircut_man/3.png
new file mode 100644
index 00000000000..2fab3a1ac2c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/4.png b/public/images/emoji/facebook_messenger/haircut_man/4.png
new file mode 100644
index 00000000000..7e6d5998c77
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/5.png b/public/images/emoji/facebook_messenger/haircut_man/5.png
new file mode 100644
index 00000000000..5787ce4a5ba
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_man/6.png b/public/images/emoji/facebook_messenger/haircut_man/6.png
new file mode 100644
index 00000000000..f5d2a283126
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman.png b/public/images/emoji/facebook_messenger/haircut_woman.png
new file mode 100644
index 00000000000..b6c6486938e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/2.png b/public/images/emoji/facebook_messenger/haircut_woman/2.png
new file mode 100644
index 00000000000..e211f4d8bbe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/3.png b/public/images/emoji/facebook_messenger/haircut_woman/3.png
new file mode 100644
index 00000000000..47626a4a9e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/4.png b/public/images/emoji/facebook_messenger/haircut_woman/4.png
new file mode 100644
index 00000000000..210b78048c0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/5.png b/public/images/emoji/facebook_messenger/haircut_woman/5.png
new file mode 100644
index 00000000000..543c86e14d0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/haircut_woman/6.png b/public/images/emoji/facebook_messenger/haircut_woman/6.png
new file mode 100644
index 00000000000..3e21e1099be
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haircut_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/haiti.png b/public/images/emoji/facebook_messenger/haiti.png
new file mode 100644
index 00000000000..53d2160f9a6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/haiti.png differ
diff --git a/public/images/emoji/facebook_messenger/hamburger.png b/public/images/emoji/facebook_messenger/hamburger.png
new file mode 100644
index 00000000000..c5843ee75b1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hamburger.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer.png b/public/images/emoji/facebook_messenger/hammer.png
new file mode 100644
index 00000000000..7d18dc8fd34
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hammer.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer_and_pick.png b/public/images/emoji/facebook_messenger/hammer_and_pick.png
new file mode 100644
index 00000000000..71bb73f2c59
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hammer_and_pick.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer_and_wrench.png b/public/images/emoji/facebook_messenger/hammer_and_wrench.png
new file mode 100644
index 00000000000..2b7c33b2077
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hammer_and_wrench.png differ
diff --git a/public/images/emoji/facebook_messenger/hammer_pick.png b/public/images/emoji/facebook_messenger/hammer_pick.png
new file mode 100644
index 00000000000..71bb73f2c59
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hammer_pick.png differ
diff --git a/public/images/emoji/facebook_messenger/hamster.png b/public/images/emoji/facebook_messenger/hamster.png
new file mode 100644
index 00000000000..efd899ad5a6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hamster.png differ
diff --git a/public/images/emoji/facebook_messenger/hand.png b/public/images/emoji/facebook_messenger/hand.png
new file mode 100644
index 00000000000..a0097d9b71a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/2.png b/public/images/emoji/facebook_messenger/hand/2.png
new file mode 100644
index 00000000000..d23202d6c36
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/3.png b/public/images/emoji/facebook_messenger/hand/3.png
new file mode 100644
index 00000000000..7ff91aea009
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/4.png b/public/images/emoji/facebook_messenger/hand/4.png
new file mode 100644
index 00000000000..635801f6479
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/5.png b/public/images/emoji/facebook_messenger/hand/5.png
new file mode 100644
index 00000000000..63bc01077e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/hand/6.png b/public/images/emoji/facebook_messenger/hand/6.png
new file mode 100644
index 00000000000..244c30c3821
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed.png b/public/images/emoji/facebook_messenger/hand_splayed.png
new file mode 100644
index 00000000000..f41f01af47b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand_splayed.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/2.png b/public/images/emoji/facebook_messenger/hand_splayed/2.png
new file mode 100644
index 00000000000..37a9048ad78
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand_splayed/2.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/3.png b/public/images/emoji/facebook_messenger/hand_splayed/3.png
new file mode 100644
index 00000000000..6ddd74b5862
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand_splayed/3.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/4.png b/public/images/emoji/facebook_messenger/hand_splayed/4.png
new file mode 100644
index 00000000000..1d901925fe9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand_splayed/4.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/5.png b/public/images/emoji/facebook_messenger/hand_splayed/5.png
new file mode 100644
index 00000000000..5fcac72a703
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand_splayed/5.png differ
diff --git a/public/images/emoji/facebook_messenger/hand_splayed/6.png b/public/images/emoji/facebook_messenger/hand_splayed/6.png
new file mode 100644
index 00000000000..74fa972cade
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hand_splayed/6.png differ
diff --git a/public/images/emoji/facebook_messenger/handbag.png b/public/images/emoji/facebook_messenger/handbag.png
new file mode 100644
index 00000000000..401416b2863
Binary files /dev/null and b/public/images/emoji/facebook_messenger/handbag.png differ
diff --git a/public/images/emoji/facebook_messenger/handshake.png b/public/images/emoji/facebook_messenger/handshake.png
new file mode 100644
index 00000000000..6ac8b5fdf6f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/handshake.png differ
diff --git a/public/images/emoji/facebook_messenger/hankey.png b/public/images/emoji/facebook_messenger/hankey.png
new file mode 100644
index 00000000000..e175a1dfffc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hankey.png differ
diff --git a/public/images/emoji/facebook_messenger/hash.png b/public/images/emoji/facebook_messenger/hash.png
new file mode 100644
index 00000000000..1ce55028690
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hash.png differ
diff --git a/public/images/emoji/facebook_messenger/hatched_chick.png b/public/images/emoji/facebook_messenger/hatched_chick.png
new file mode 100644
index 00000000000..3034639583b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hatched_chick.png differ
diff --git a/public/images/emoji/facebook_messenger/hatching_chick.png b/public/images/emoji/facebook_messenger/hatching_chick.png
new file mode 100644
index 00000000000..fb7d92ec9b4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hatching_chick.png differ
diff --git a/public/images/emoji/facebook_messenger/head_bandage.png b/public/images/emoji/facebook_messenger/head_bandage.png
new file mode 100644
index 00000000000..97bec4d11f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/head_bandage.png differ
diff --git a/public/images/emoji/facebook_messenger/headphones.png b/public/images/emoji/facebook_messenger/headphones.png
new file mode 100644
index 00000000000..366b1c8cef4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/headphones.png differ
diff --git a/public/images/emoji/facebook_messenger/hear_no_evil.png b/public/images/emoji/facebook_messenger/hear_no_evil.png
new file mode 100644
index 00000000000..cf3508c82c6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hear_no_evil.png differ
diff --git a/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png b/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png
new file mode 100644
index 00000000000..1b5bf7b178f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/heart.png b/public/images/emoji/facebook_messenger/heart.png
new file mode 100644
index 00000000000..87f15c3a771
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heart.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_decoration.png b/public/images/emoji/facebook_messenger/heart_decoration.png
new file mode 100644
index 00000000000..ad8a16d330d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heart_decoration.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_exclamation.png b/public/images/emoji/facebook_messenger/heart_exclamation.png
new file mode 100644
index 00000000000..1cb11ddf8bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heart_exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_eyes.png b/public/images/emoji/facebook_messenger/heart_eyes.png
new file mode 100644
index 00000000000..8e6d3851906
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heart_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/heart_eyes_cat.png b/public/images/emoji/facebook_messenger/heart_eyes_cat.png
new file mode 100644
index 00000000000..e0803aeb180
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heart_eyes_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/heartbeat.png b/public/images/emoji/facebook_messenger/heartbeat.png
new file mode 100644
index 00000000000..8d6aaa7b938
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heartbeat.png differ
diff --git a/public/images/emoji/facebook_messenger/heartpulse.png b/public/images/emoji/facebook_messenger/heartpulse.png
new file mode 100644
index 00000000000..99e48c36ca7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heartpulse.png differ
diff --git a/public/images/emoji/facebook_messenger/hearts.png b/public/images/emoji/facebook_messenger/hearts.png
new file mode 100644
index 00000000000..11d94403aee
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hearts.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_check_mark.png b/public/images/emoji/facebook_messenger/heavy_check_mark.png
new file mode 100644
index 00000000000..54b5613486f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heavy_check_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_division_sign.png b/public/images/emoji/facebook_messenger/heavy_division_sign.png
new file mode 100644
index 00000000000..d9e495f28ee
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heavy_division_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_dollar_sign.png b/public/images/emoji/facebook_messenger/heavy_dollar_sign.png
new file mode 100644
index 00000000000..21f0df3b74f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png b/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png
new file mode 100644
index 00000000000..1cb11ddf8bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png
new file mode 100644
index 00000000000..1cb11ddf8bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_minus_sign.png b/public/images/emoji/facebook_messenger/heavy_minus_sign.png
new file mode 100644
index 00000000000..666b6d50385
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heavy_minus_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_multiplication_x.png b/public/images/emoji/facebook_messenger/heavy_multiplication_x.png
new file mode 100644
index 00000000000..f442fec0c91
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/facebook_messenger/heavy_plus_sign.png b/public/images/emoji/facebook_messenger/heavy_plus_sign.png
new file mode 100644
index 00000000000..c40c5c83fbb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/heavy_plus_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/hedgehog.png b/public/images/emoji/facebook_messenger/hedgehog.png
new file mode 100644
index 00000000000..9b978b35407
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hedgehog.png differ
diff --git a/public/images/emoji/facebook_messenger/helicopter.png b/public/images/emoji/facebook_messenger/helicopter.png
new file mode 100644
index 00000000000..e4ecb07aac9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/helicopter.png differ
diff --git a/public/images/emoji/facebook_messenger/helmet_with_cross.png b/public/images/emoji/facebook_messenger/helmet_with_cross.png
new file mode 100644
index 00000000000..ad220c2eefe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/helmet_with_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/helmet_with_white_cross.png b/public/images/emoji/facebook_messenger/helmet_with_white_cross.png
new file mode 100644
index 00000000000..ad220c2eefe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/herb.png b/public/images/emoji/facebook_messenger/herb.png
new file mode 100644
index 00000000000..610292c362d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/herb.png differ
diff --git a/public/images/emoji/facebook_messenger/hibiscus.png b/public/images/emoji/facebook_messenger/hibiscus.png
new file mode 100644
index 00000000000..5655dc87de1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hibiscus.png differ
diff --git a/public/images/emoji/facebook_messenger/high_brightness.png b/public/images/emoji/facebook_messenger/high_brightness.png
new file mode 100644
index 00000000000..ff1e1212803
Binary files /dev/null and b/public/images/emoji/facebook_messenger/high_brightness.png differ
diff --git a/public/images/emoji/facebook_messenger/high_heel.png b/public/images/emoji/facebook_messenger/high_heel.png
new file mode 100644
index 00000000000..a93d0c41ef0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/high_heel.png differ
diff --git a/public/images/emoji/facebook_messenger/hocho.png b/public/images/emoji/facebook_messenger/hocho.png
new file mode 100644
index 00000000000..c606db130a5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hocho.png differ
diff --git a/public/images/emoji/facebook_messenger/hockey.png b/public/images/emoji/facebook_messenger/hockey.png
new file mode 100644
index 00000000000..7b5a1105c39
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hockey.png differ
diff --git a/public/images/emoji/facebook_messenger/hole.png b/public/images/emoji/facebook_messenger/hole.png
new file mode 100644
index 00000000000..6df8ea8c4c8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hole.png differ
diff --git a/public/images/emoji/facebook_messenger/homes.png b/public/images/emoji/facebook_messenger/homes.png
new file mode 100644
index 00000000000..5f9a0a658b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/homes.png differ
diff --git a/public/images/emoji/facebook_messenger/honduras.png b/public/images/emoji/facebook_messenger/honduras.png
new file mode 100644
index 00000000000..d0aff11833e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/honduras.png differ
diff --git a/public/images/emoji/facebook_messenger/honey_pot.png b/public/images/emoji/facebook_messenger/honey_pot.png
new file mode 100644
index 00000000000..a23e57415a9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/honey_pot.png differ
diff --git a/public/images/emoji/facebook_messenger/honeybee.png b/public/images/emoji/facebook_messenger/honeybee.png
new file mode 100644
index 00000000000..b4b2bff015b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/honeybee.png differ
diff --git a/public/images/emoji/facebook_messenger/hong_kong.png b/public/images/emoji/facebook_messenger/hong_kong.png
new file mode 100644
index 00000000000..786a0401560
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hong_kong.png differ
diff --git a/public/images/emoji/facebook_messenger/horse.png b/public/images/emoji/facebook_messenger/horse.png
new file mode 100644
index 00000000000..befd5ea865e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/horse.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing.png b/public/images/emoji/facebook_messenger/horse_racing.png
new file mode 100644
index 00000000000..7aacc88528a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/horse_racing.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/2.png b/public/images/emoji/facebook_messenger/horse_racing/2.png
new file mode 100644
index 00000000000..07a007cec6a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/horse_racing/2.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/3.png b/public/images/emoji/facebook_messenger/horse_racing/3.png
new file mode 100644
index 00000000000..999574cf488
Binary files /dev/null and b/public/images/emoji/facebook_messenger/horse_racing/3.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/4.png b/public/images/emoji/facebook_messenger/horse_racing/4.png
new file mode 100644
index 00000000000..f4cf9ba39df
Binary files /dev/null and b/public/images/emoji/facebook_messenger/horse_racing/4.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/5.png b/public/images/emoji/facebook_messenger/horse_racing/5.png
new file mode 100644
index 00000000000..b697e37867f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/horse_racing/5.png differ
diff --git a/public/images/emoji/facebook_messenger/horse_racing/6.png b/public/images/emoji/facebook_messenger/horse_racing/6.png
new file mode 100644
index 00000000000..ab5119fd2db
Binary files /dev/null and b/public/images/emoji/facebook_messenger/horse_racing/6.png differ
diff --git a/public/images/emoji/facebook_messenger/hospital.png b/public/images/emoji/facebook_messenger/hospital.png
new file mode 100644
index 00000000000..87adf354275
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hospital.png differ
diff --git a/public/images/emoji/facebook_messenger/hot_dog.png b/public/images/emoji/facebook_messenger/hot_dog.png
new file mode 100644
index 00000000000..0fe32af15f7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hot_dog.png differ
diff --git a/public/images/emoji/facebook_messenger/hot_pepper.png b/public/images/emoji/facebook_messenger/hot_pepper.png
new file mode 100644
index 00000000000..d72eba3a1a2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hot_pepper.png differ
diff --git a/public/images/emoji/facebook_messenger/hotdog.png b/public/images/emoji/facebook_messenger/hotdog.png
new file mode 100644
index 00000000000..0fe32af15f7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hotdog.png differ
diff --git a/public/images/emoji/facebook_messenger/hotel.png b/public/images/emoji/facebook_messenger/hotel.png
new file mode 100644
index 00000000000..b689dbc3762
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hotel.png differ
diff --git a/public/images/emoji/facebook_messenger/hotsprings.png b/public/images/emoji/facebook_messenger/hotsprings.png
new file mode 100644
index 00000000000..9a31e886bdc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hotsprings.png differ
diff --git a/public/images/emoji/facebook_messenger/hourglass.png b/public/images/emoji/facebook_messenger/hourglass.png
new file mode 100644
index 00000000000..e139fe10770
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hourglass.png differ
diff --git a/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png b/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png
new file mode 100644
index 00000000000..cff6f63bee1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/facebook_messenger/house.png b/public/images/emoji/facebook_messenger/house.png
new file mode 100644
index 00000000000..6775ff48828
Binary files /dev/null and b/public/images/emoji/facebook_messenger/house.png differ
diff --git a/public/images/emoji/facebook_messenger/house_abandoned.png b/public/images/emoji/facebook_messenger/house_abandoned.png
new file mode 100644
index 00000000000..a48da604946
Binary files /dev/null and b/public/images/emoji/facebook_messenger/house_abandoned.png differ
diff --git a/public/images/emoji/facebook_messenger/house_buildings.png b/public/images/emoji/facebook_messenger/house_buildings.png
new file mode 100644
index 00000000000..5f9a0a658b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/house_buildings.png differ
diff --git a/public/images/emoji/facebook_messenger/house_with_garden.png b/public/images/emoji/facebook_messenger/house_with_garden.png
new file mode 100644
index 00000000000..763eaa1b8f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/house_with_garden.png differ
diff --git a/public/images/emoji/facebook_messenger/houses.png b/public/images/emoji/facebook_messenger/houses.png
new file mode 100644
index 00000000000..5f9a0a658b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/houses.png differ
diff --git a/public/images/emoji/facebook_messenger/hugging.png b/public/images/emoji/facebook_messenger/hugging.png
new file mode 100644
index 00000000000..f0eb7db3220
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hugging.png differ
diff --git a/public/images/emoji/facebook_messenger/hugging_face.png b/public/images/emoji/facebook_messenger/hugging_face.png
new file mode 100644
index 00000000000..f0eb7db3220
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hugging_face.png differ
diff --git a/public/images/emoji/facebook_messenger/hugs.png b/public/images/emoji/facebook_messenger/hugs.png
new file mode 100644
index 00000000000..f0eb7db3220
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hugs.png differ
diff --git a/public/images/emoji/facebook_messenger/hungary.png b/public/images/emoji/facebook_messenger/hungary.png
new file mode 100644
index 00000000000..98963a97c99
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hungary.png differ
diff --git a/public/images/emoji/facebook_messenger/hushed.png b/public/images/emoji/facebook_messenger/hushed.png
new file mode 100644
index 00000000000..e8b83c13b76
Binary files /dev/null and b/public/images/emoji/facebook_messenger/hushed.png differ
diff --git a/public/images/emoji/facebook_messenger/ice_cream.png b/public/images/emoji/facebook_messenger/ice_cream.png
new file mode 100644
index 00000000000..7db482a6972
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ice_cream.png differ
diff --git a/public/images/emoji/facebook_messenger/ice_hockey.png b/public/images/emoji/facebook_messenger/ice_hockey.png
new file mode 100644
index 00000000000..7b5a1105c39
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ice_hockey.png differ
diff --git a/public/images/emoji/facebook_messenger/ice_skate.png b/public/images/emoji/facebook_messenger/ice_skate.png
new file mode 100644
index 00000000000..a9e9fcbbe52
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ice_skate.png differ
diff --git a/public/images/emoji/facebook_messenger/icecream.png b/public/images/emoji/facebook_messenger/icecream.png
new file mode 100644
index 00000000000..fe53d60a2e8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/icecream.png differ
diff --git a/public/images/emoji/facebook_messenger/iceland.png b/public/images/emoji/facebook_messenger/iceland.png
new file mode 100644
index 00000000000..399f5a4e85d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/iceland.png differ
diff --git a/public/images/emoji/facebook_messenger/id.png b/public/images/emoji/facebook_messenger/id.png
new file mode 100644
index 00000000000..73c4ab4da33
Binary files /dev/null and b/public/images/emoji/facebook_messenger/id.png differ
diff --git a/public/images/emoji/facebook_messenger/ideograph_advantage.png b/public/images/emoji/facebook_messenger/ideograph_advantage.png
new file mode 100644
index 00000000000..17f27bb535d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ideograph_advantage.png differ
diff --git a/public/images/emoji/facebook_messenger/imp.png b/public/images/emoji/facebook_messenger/imp.png
new file mode 100644
index 00000000000..86b6277008b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/imp.png differ
diff --git a/public/images/emoji/facebook_messenger/inbox_tray.png b/public/images/emoji/facebook_messenger/inbox_tray.png
new file mode 100644
index 00000000000..ebf4a42d5bc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/inbox_tray.png differ
diff --git a/public/images/emoji/facebook_messenger/incoming_envelope.png b/public/images/emoji/facebook_messenger/incoming_envelope.png
new file mode 100644
index 00000000000..da989200ebd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/incoming_envelope.png differ
diff --git a/public/images/emoji/facebook_messenger/india.png b/public/images/emoji/facebook_messenger/india.png
new file mode 100644
index 00000000000..3ae5f9b82b9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/india.png differ
diff --git a/public/images/emoji/facebook_messenger/indonesia.png b/public/images/emoji/facebook_messenger/indonesia.png
new file mode 100644
index 00000000000..c3906b37059
Binary files /dev/null and b/public/images/emoji/facebook_messenger/indonesia.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person.png b/public/images/emoji/facebook_messenger/information_desk_person.png
new file mode 100644
index 00000000000..17d66f473bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/information_desk_person.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/2.png b/public/images/emoji/facebook_messenger/information_desk_person/2.png
new file mode 100644
index 00000000000..92055ff0cd9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/information_desk_person/2.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/3.png b/public/images/emoji/facebook_messenger/information_desk_person/3.png
new file mode 100644
index 00000000000..2c8a485a1f4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/information_desk_person/3.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/4.png b/public/images/emoji/facebook_messenger/information_desk_person/4.png
new file mode 100644
index 00000000000..890ae929d22
Binary files /dev/null and b/public/images/emoji/facebook_messenger/information_desk_person/4.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/5.png b/public/images/emoji/facebook_messenger/information_desk_person/5.png
new file mode 100644
index 00000000000..c7228bf6a8c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/information_desk_person/5.png differ
diff --git a/public/images/emoji/facebook_messenger/information_desk_person/6.png b/public/images/emoji/facebook_messenger/information_desk_person/6.png
new file mode 100644
index 00000000000..f02f68988a0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/information_desk_person/6.png differ
diff --git a/public/images/emoji/facebook_messenger/information_source.png b/public/images/emoji/facebook_messenger/information_source.png
new file mode 100644
index 00000000000..a8fd945655e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/information_source.png differ
diff --git a/public/images/emoji/facebook_messenger/innocent.png b/public/images/emoji/facebook_messenger/innocent.png
new file mode 100644
index 00000000000..11d735eb665
Binary files /dev/null and b/public/images/emoji/facebook_messenger/innocent.png differ
diff --git a/public/images/emoji/facebook_messenger/interrobang.png b/public/images/emoji/facebook_messenger/interrobang.png
new file mode 100644
index 00000000000..3128a2b638f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/interrobang.png differ
diff --git a/public/images/emoji/facebook_messenger/iphone.png b/public/images/emoji/facebook_messenger/iphone.png
new file mode 100644
index 00000000000..dafb42d72e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/iphone.png differ
diff --git a/public/images/emoji/facebook_messenger/iran.png b/public/images/emoji/facebook_messenger/iran.png
new file mode 100644
index 00000000000..e30df4c1f50
Binary files /dev/null and b/public/images/emoji/facebook_messenger/iran.png differ
diff --git a/public/images/emoji/facebook_messenger/iraq.png b/public/images/emoji/facebook_messenger/iraq.png
new file mode 100644
index 00000000000..cccd140ba3c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/iraq.png differ
diff --git a/public/images/emoji/facebook_messenger/ireland.png b/public/images/emoji/facebook_messenger/ireland.png
new file mode 100644
index 00000000000..e71a1f1e63e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ireland.png differ
diff --git a/public/images/emoji/facebook_messenger/island.png b/public/images/emoji/facebook_messenger/island.png
new file mode 100644
index 00000000000..2d2e8919fff
Binary files /dev/null and b/public/images/emoji/facebook_messenger/island.png differ
diff --git a/public/images/emoji/facebook_messenger/isle_of_man.png b/public/images/emoji/facebook_messenger/isle_of_man.png
new file mode 100644
index 00000000000..7829f538f8e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/isle_of_man.png differ
diff --git a/public/images/emoji/facebook_messenger/israel.png b/public/images/emoji/facebook_messenger/israel.png
new file mode 100644
index 00000000000..548d97611ff
Binary files /dev/null and b/public/images/emoji/facebook_messenger/israel.png differ
diff --git a/public/images/emoji/facebook_messenger/it.png b/public/images/emoji/facebook_messenger/it.png
new file mode 100644
index 00000000000..e5e0646c21a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/it.png differ
diff --git a/public/images/emoji/facebook_messenger/izakaya_lantern.png b/public/images/emoji/facebook_messenger/izakaya_lantern.png
new file mode 100644
index 00000000000..8dde73ba952
Binary files /dev/null and b/public/images/emoji/facebook_messenger/izakaya_lantern.png differ
diff --git a/public/images/emoji/facebook_messenger/jack_o_lantern.png b/public/images/emoji/facebook_messenger/jack_o_lantern.png
new file mode 100644
index 00000000000..b6e2ad00dfa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/jack_o_lantern.png differ
diff --git a/public/images/emoji/facebook_messenger/jamaica.png b/public/images/emoji/facebook_messenger/jamaica.png
new file mode 100644
index 00000000000..dc2c8075112
Binary files /dev/null and b/public/images/emoji/facebook_messenger/jamaica.png differ
diff --git a/public/images/emoji/facebook_messenger/japan.png b/public/images/emoji/facebook_messenger/japan.png
new file mode 100644
index 00000000000..1720c3d9b10
Binary files /dev/null and b/public/images/emoji/facebook_messenger/japan.png differ
diff --git a/public/images/emoji/facebook_messenger/japanese_castle.png b/public/images/emoji/facebook_messenger/japanese_castle.png
new file mode 100644
index 00000000000..0ba2b78fa4e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/japanese_castle.png differ
diff --git a/public/images/emoji/facebook_messenger/japanese_goblin.png b/public/images/emoji/facebook_messenger/japanese_goblin.png
new file mode 100644
index 00000000000..77c502d606b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/japanese_goblin.png differ
diff --git a/public/images/emoji/facebook_messenger/japanese_ogre.png b/public/images/emoji/facebook_messenger/japanese_ogre.png
new file mode 100644
index 00000000000..dd7075f444f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/japanese_ogre.png differ
diff --git a/public/images/emoji/facebook_messenger/jeans.png b/public/images/emoji/facebook_messenger/jeans.png
new file mode 100644
index 00000000000..3287ca8815b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/jeans.png differ
diff --git a/public/images/emoji/facebook_messenger/jersey.png b/public/images/emoji/facebook_messenger/jersey.png
new file mode 100644
index 00000000000..adfdbc3c1a6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/jersey.png differ
diff --git a/public/images/emoji/facebook_messenger/jordan.png b/public/images/emoji/facebook_messenger/jordan.png
new file mode 100644
index 00000000000..43a2f9139f4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/jordan.png differ
diff --git a/public/images/emoji/facebook_messenger/joy.png b/public/images/emoji/facebook_messenger/joy.png
new file mode 100644
index 00000000000..9c6e7ee1477
Binary files /dev/null and b/public/images/emoji/facebook_messenger/joy.png differ
diff --git a/public/images/emoji/facebook_messenger/joy_cat.png b/public/images/emoji/facebook_messenger/joy_cat.png
new file mode 100644
index 00000000000..db84adf5ef5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/joy_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/joystick.png b/public/images/emoji/facebook_messenger/joystick.png
new file mode 100644
index 00000000000..8e5c09d59be
Binary files /dev/null and b/public/images/emoji/facebook_messenger/joystick.png differ
diff --git a/public/images/emoji/facebook_messenger/jp.png b/public/images/emoji/facebook_messenger/jp.png
new file mode 100644
index 00000000000..ab749c77f7d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/jp.png differ
diff --git a/public/images/emoji/facebook_messenger/kaaba.png b/public/images/emoji/facebook_messenger/kaaba.png
new file mode 100644
index 00000000000..73219d28c1c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kaaba.png differ
diff --git a/public/images/emoji/facebook_messenger/kazakhstan.png b/public/images/emoji/facebook_messenger/kazakhstan.png
new file mode 100644
index 00000000000..731858e2cfa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kazakhstan.png differ
diff --git a/public/images/emoji/facebook_messenger/kenya.png b/public/images/emoji/facebook_messenger/kenya.png
new file mode 100644
index 00000000000..cc55fd69815
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kenya.png differ
diff --git a/public/images/emoji/facebook_messenger/key.png b/public/images/emoji/facebook_messenger/key.png
new file mode 100644
index 00000000000..84889b66f5e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/key.png differ
diff --git a/public/images/emoji/facebook_messenger/key2.png b/public/images/emoji/facebook_messenger/key2.png
new file mode 100644
index 00000000000..18b93994322
Binary files /dev/null and b/public/images/emoji/facebook_messenger/key2.png differ
diff --git a/public/images/emoji/facebook_messenger/keyboard.png b/public/images/emoji/facebook_messenger/keyboard.png
new file mode 100644
index 00000000000..a16457d5339
Binary files /dev/null and b/public/images/emoji/facebook_messenger/keyboard.png differ
diff --git a/public/images/emoji/facebook_messenger/keycap_star.png b/public/images/emoji/facebook_messenger/keycap_star.png
new file mode 100644
index 00000000000..2bfefce2bec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/keycap_star.png differ
diff --git a/public/images/emoji/facebook_messenger/keycap_ten.png b/public/images/emoji/facebook_messenger/keycap_ten.png
new file mode 100644
index 00000000000..12264637b0b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/keycap_ten.png differ
diff --git a/public/images/emoji/facebook_messenger/kick_scooter.png b/public/images/emoji/facebook_messenger/kick_scooter.png
new file mode 100644
index 00000000000..f04615710f9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kick_scooter.png differ
diff --git a/public/images/emoji/facebook_messenger/kimono.png b/public/images/emoji/facebook_messenger/kimono.png
new file mode 100644
index 00000000000..8459c5ef5f7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kimono.png differ
diff --git a/public/images/emoji/facebook_messenger/kiribati.png b/public/images/emoji/facebook_messenger/kiribati.png
new file mode 100644
index 00000000000..138fd3f2b5b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kiribati.png differ
diff --git a/public/images/emoji/facebook_messenger/kiss.png b/public/images/emoji/facebook_messenger/kiss.png
new file mode 100644
index 00000000000..24195789729
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kiss.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing.png b/public/images/emoji/facebook_messenger/kissing.png
new file mode 100644
index 00000000000..e1fe9088c12
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kissing.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_cat.png b/public/images/emoji/facebook_messenger/kissing_cat.png
new file mode 100644
index 00000000000..42882123c54
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kissing_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_closed_eyes.png b/public/images/emoji/facebook_messenger/kissing_closed_eyes.png
new file mode 100644
index 00000000000..68c5f1c4fd8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_heart.png b/public/images/emoji/facebook_messenger/kissing_heart.png
new file mode 100644
index 00000000000..70ac23c2fce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kissing_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png b/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png
new file mode 100644
index 00000000000..7e32d050e66
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/kiwi_fruit.png b/public/images/emoji/facebook_messenger/kiwi_fruit.png
new file mode 100644
index 00000000000..1abebdab603
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kiwi_fruit.png differ
diff --git a/public/images/emoji/facebook_messenger/knife.png b/public/images/emoji/facebook_messenger/knife.png
new file mode 100644
index 00000000000..c606db130a5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/knife.png differ
diff --git a/public/images/emoji/facebook_messenger/koala.png b/public/images/emoji/facebook_messenger/koala.png
new file mode 100644
index 00000000000..b181cd8aeef
Binary files /dev/null and b/public/images/emoji/facebook_messenger/koala.png differ
diff --git a/public/images/emoji/facebook_messenger/koko.png b/public/images/emoji/facebook_messenger/koko.png
new file mode 100644
index 00000000000..277172ed84d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/koko.png differ
diff --git a/public/images/emoji/facebook_messenger/kosovo.png b/public/images/emoji/facebook_messenger/kosovo.png
new file mode 100644
index 00000000000..efea0b70bde
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kosovo.png differ
diff --git a/public/images/emoji/facebook_messenger/kr.png b/public/images/emoji/facebook_messenger/kr.png
new file mode 100644
index 00000000000..73c4454e7fe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kr.png differ
diff --git a/public/images/emoji/facebook_messenger/kuwait.png b/public/images/emoji/facebook_messenger/kuwait.png
new file mode 100644
index 00000000000..32b00e4806d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kuwait.png differ
diff --git a/public/images/emoji/facebook_messenger/kyrgyzstan.png b/public/images/emoji/facebook_messenger/kyrgyzstan.png
new file mode 100644
index 00000000000..6ecfc717c9b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/kyrgyzstan.png differ
diff --git a/public/images/emoji/facebook_messenger/label.png b/public/images/emoji/facebook_messenger/label.png
new file mode 100644
index 00000000000..36f91eb31c0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/label.png differ
diff --git a/public/images/emoji/facebook_messenger/laos.png b/public/images/emoji/facebook_messenger/laos.png
new file mode 100644
index 00000000000..5dca502f80e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/laos.png differ
diff --git a/public/images/emoji/facebook_messenger/large_blue_circle.png b/public/images/emoji/facebook_messenger/large_blue_circle.png
new file mode 100644
index 00000000000..e79a949ccb4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/large_blue_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/large_blue_diamond.png b/public/images/emoji/facebook_messenger/large_blue_diamond.png
new file mode 100644
index 00000000000..fc1a8547165
Binary files /dev/null and b/public/images/emoji/facebook_messenger/large_blue_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/large_orange_diamond.png b/public/images/emoji/facebook_messenger/large_orange_diamond.png
new file mode 100644
index 00000000000..ecc594465b8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/large_orange_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/last_quarter_moon.png b/public/images/emoji/facebook_messenger/last_quarter_moon.png
new file mode 100644
index 00000000000..aa083f2b817
Binary files /dev/null and b/public/images/emoji/facebook_messenger/last_quarter_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png b/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png
new file mode 100644
index 00000000000..33bf88b07b1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/latin_cross.png b/public/images/emoji/facebook_messenger/latin_cross.png
new file mode 100644
index 00000000000..f11e296dd97
Binary files /dev/null and b/public/images/emoji/facebook_messenger/latin_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/latvia.png b/public/images/emoji/facebook_messenger/latvia.png
new file mode 100644
index 00000000000..a23d4c4e2e6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/latvia.png differ
diff --git a/public/images/emoji/facebook_messenger/laughing.png b/public/images/emoji/facebook_messenger/laughing.png
new file mode 100644
index 00000000000..68cbb0f1481
Binary files /dev/null and b/public/images/emoji/facebook_messenger/laughing.png differ
diff --git a/public/images/emoji/facebook_messenger/leaves.png b/public/images/emoji/facebook_messenger/leaves.png
new file mode 100644
index 00000000000..a4cbbe176cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/leaves.png differ
diff --git a/public/images/emoji/facebook_messenger/lebanon.png b/public/images/emoji/facebook_messenger/lebanon.png
new file mode 100644
index 00000000000..5b8710dfd72
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lebanon.png differ
diff --git a/public/images/emoji/facebook_messenger/ledger.png b/public/images/emoji/facebook_messenger/ledger.png
new file mode 100644
index 00000000000..0801a71d891
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ledger.png differ
diff --git a/public/images/emoji/facebook_messenger/left_luggage.png b/public/images/emoji/facebook_messenger/left_luggage.png
new file mode 100644
index 00000000000..8a3acbaf3ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/left_luggage.png differ
diff --git a/public/images/emoji/facebook_messenger/left_right_arrow.png b/public/images/emoji/facebook_messenger/left_right_arrow.png
new file mode 100644
index 00000000000..86df388cca2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/left_right_arrow.png differ
diff --git a/public/images/emoji/facebook_messenger/left_speech_bubble.png b/public/images/emoji/facebook_messenger/left_speech_bubble.png
new file mode 100644
index 00000000000..8cb3b728e0e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/left_speech_bubble.png differ
diff --git a/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png b/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png
new file mode 100644
index 00000000000..0a60642fa65
Binary files /dev/null and b/public/images/emoji/facebook_messenger/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/facebook_messenger/lemon.png b/public/images/emoji/facebook_messenger/lemon.png
new file mode 100644
index 00000000000..14773e7d99b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lemon.png differ
diff --git a/public/images/emoji/facebook_messenger/leo.png b/public/images/emoji/facebook_messenger/leo.png
new file mode 100644
index 00000000000..0050c7afb39
Binary files /dev/null and b/public/images/emoji/facebook_messenger/leo.png differ
diff --git a/public/images/emoji/facebook_messenger/leopard.png b/public/images/emoji/facebook_messenger/leopard.png
new file mode 100644
index 00000000000..4a602a95bb1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/leopard.png differ
diff --git a/public/images/emoji/facebook_messenger/lesotho.png b/public/images/emoji/facebook_messenger/lesotho.png
new file mode 100644
index 00000000000..136ea59d3dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lesotho.png differ
diff --git a/public/images/emoji/facebook_messenger/level_slider.png b/public/images/emoji/facebook_messenger/level_slider.png
new file mode 100644
index 00000000000..d7c8408ead3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/level_slider.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate.png b/public/images/emoji/facebook_messenger/levitate.png
new file mode 100644
index 00000000000..5231c708a03
Binary files /dev/null and b/public/images/emoji/facebook_messenger/levitate.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/2.png b/public/images/emoji/facebook_messenger/levitate/2.png
new file mode 100644
index 00000000000..753693b093b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/levitate/2.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/3.png b/public/images/emoji/facebook_messenger/levitate/3.png
new file mode 100644
index 00000000000..f56875edac9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/levitate/3.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/4.png b/public/images/emoji/facebook_messenger/levitate/4.png
new file mode 100644
index 00000000000..37d74f5c97d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/levitate/4.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/5.png b/public/images/emoji/facebook_messenger/levitate/5.png
new file mode 100644
index 00000000000..5a48f961920
Binary files /dev/null and b/public/images/emoji/facebook_messenger/levitate/5.png differ
diff --git a/public/images/emoji/facebook_messenger/levitate/6.png b/public/images/emoji/facebook_messenger/levitate/6.png
new file mode 100644
index 00000000000..61507408172
Binary files /dev/null and b/public/images/emoji/facebook_messenger/levitate/6.png differ
diff --git a/public/images/emoji/facebook_messenger/liberia.png b/public/images/emoji/facebook_messenger/liberia.png
new file mode 100644
index 00000000000..2828cee4c87
Binary files /dev/null and b/public/images/emoji/facebook_messenger/liberia.png differ
diff --git a/public/images/emoji/facebook_messenger/libra.png b/public/images/emoji/facebook_messenger/libra.png
new file mode 100644
index 00000000000..54f93f04d9f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/libra.png differ
diff --git a/public/images/emoji/facebook_messenger/libya.png b/public/images/emoji/facebook_messenger/libya.png
new file mode 100644
index 00000000000..a6c90e15d4f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/libya.png differ
diff --git a/public/images/emoji/facebook_messenger/liechtenstein.png b/public/images/emoji/facebook_messenger/liechtenstein.png
new file mode 100644
index 00000000000..93605ebfd57
Binary files /dev/null and b/public/images/emoji/facebook_messenger/liechtenstein.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter.png b/public/images/emoji/facebook_messenger/lifter.png
new file mode 100644
index 00000000000..be0473304d5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lifter.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/2.png b/public/images/emoji/facebook_messenger/lifter/2.png
new file mode 100644
index 00000000000..8d680f5b12c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lifter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/3.png b/public/images/emoji/facebook_messenger/lifter/3.png
new file mode 100644
index 00000000000..e4e961d5d5d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lifter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/4.png b/public/images/emoji/facebook_messenger/lifter/4.png
new file mode 100644
index 00000000000..bcdf20d1757
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lifter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/5.png b/public/images/emoji/facebook_messenger/lifter/5.png
new file mode 100644
index 00000000000..9b91906952e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lifter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/lifter/6.png b/public/images/emoji/facebook_messenger/lifter/6.png
new file mode 100644
index 00000000000..c3ce145e9e1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lifter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/light_rail.png b/public/images/emoji/facebook_messenger/light_rail.png
new file mode 100644
index 00000000000..e1aecd7aefa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/light_rail.png differ
diff --git a/public/images/emoji/facebook_messenger/link.png b/public/images/emoji/facebook_messenger/link.png
new file mode 100644
index 00000000000..a428a15a9b6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/link.png differ
diff --git a/public/images/emoji/facebook_messenger/linked_paperclips.png b/public/images/emoji/facebook_messenger/linked_paperclips.png
new file mode 100644
index 00000000000..b4080878f68
Binary files /dev/null and b/public/images/emoji/facebook_messenger/linked_paperclips.png differ
diff --git a/public/images/emoji/facebook_messenger/lion.png b/public/images/emoji/facebook_messenger/lion.png
new file mode 100644
index 00000000000..aace4fa00bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lion.png differ
diff --git a/public/images/emoji/facebook_messenger/lion_face.png b/public/images/emoji/facebook_messenger/lion_face.png
new file mode 100644
index 00000000000..aace4fa00bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lion_face.png differ
diff --git a/public/images/emoji/facebook_messenger/lips.png b/public/images/emoji/facebook_messenger/lips.png
new file mode 100644
index 00000000000..6e6f4164211
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lips.png differ
diff --git a/public/images/emoji/facebook_messenger/lipstick.png b/public/images/emoji/facebook_messenger/lipstick.png
new file mode 100644
index 00000000000..f42fefcebcb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lipstick.png differ
diff --git a/public/images/emoji/facebook_messenger/lithuania.png b/public/images/emoji/facebook_messenger/lithuania.png
new file mode 100644
index 00000000000..d4e7e6766a2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lithuania.png differ
diff --git a/public/images/emoji/facebook_messenger/lizard.png b/public/images/emoji/facebook_messenger/lizard.png
new file mode 100644
index 00000000000..302081914b6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lizard.png differ
diff --git a/public/images/emoji/facebook_messenger/lock.png b/public/images/emoji/facebook_messenger/lock.png
new file mode 100644
index 00000000000..c584b6db28d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lock.png differ
diff --git a/public/images/emoji/facebook_messenger/lock_with_ink_pen.png b/public/images/emoji/facebook_messenger/lock_with_ink_pen.png
new file mode 100644
index 00000000000..a8c6259a9bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/lollipop.png b/public/images/emoji/facebook_messenger/lollipop.png
new file mode 100644
index 00000000000..ec7f17ed110
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lollipop.png differ
diff --git a/public/images/emoji/facebook_messenger/loop.png b/public/images/emoji/facebook_messenger/loop.png
new file mode 100644
index 00000000000..103b356312c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/loop.png differ
diff --git a/public/images/emoji/facebook_messenger/loud_sound.png b/public/images/emoji/facebook_messenger/loud_sound.png
new file mode 100644
index 00000000000..e5201112af4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/loud_sound.png differ
diff --git a/public/images/emoji/facebook_messenger/loudspeaker.png b/public/images/emoji/facebook_messenger/loudspeaker.png
new file mode 100644
index 00000000000..c1c1fcbf23f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/loudspeaker.png differ
diff --git a/public/images/emoji/facebook_messenger/love_hotel.png b/public/images/emoji/facebook_messenger/love_hotel.png
new file mode 100644
index 00000000000..88ff0d0c97b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/love_hotel.png differ
diff --git a/public/images/emoji/facebook_messenger/love_letter.png b/public/images/emoji/facebook_messenger/love_letter.png
new file mode 100644
index 00000000000..6042cea7360
Binary files /dev/null and b/public/images/emoji/facebook_messenger/love_letter.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture.png b/public/images/emoji/facebook_messenger/love_you_gesture.png
new file mode 100644
index 00000000000..14ef7c72b20
Binary files /dev/null and b/public/images/emoji/facebook_messenger/love_you_gesture.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/2.png b/public/images/emoji/facebook_messenger/love_you_gesture/2.png
new file mode 100644
index 00000000000..b70217e894c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/love_you_gesture/2.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/3.png b/public/images/emoji/facebook_messenger/love_you_gesture/3.png
new file mode 100644
index 00000000000..aa984ea9263
Binary files /dev/null and b/public/images/emoji/facebook_messenger/love_you_gesture/3.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/4.png b/public/images/emoji/facebook_messenger/love_you_gesture/4.png
new file mode 100644
index 00000000000..5decb0e8008
Binary files /dev/null and b/public/images/emoji/facebook_messenger/love_you_gesture/4.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/5.png b/public/images/emoji/facebook_messenger/love_you_gesture/5.png
new file mode 100644
index 00000000000..e0bb218cc08
Binary files /dev/null and b/public/images/emoji/facebook_messenger/love_you_gesture/5.png differ
diff --git a/public/images/emoji/facebook_messenger/love_you_gesture/6.png b/public/images/emoji/facebook_messenger/love_you_gesture/6.png
new file mode 100644
index 00000000000..bb51bde8bbd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/love_you_gesture/6.png differ
diff --git a/public/images/emoji/facebook_messenger/low_brightness.png b/public/images/emoji/facebook_messenger/low_brightness.png
new file mode 100644
index 00000000000..f7dfde34ed4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/low_brightness.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png b/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png
new file mode 100644
index 00000000000..6219ae26cc1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_crayon.png b/public/images/emoji/facebook_messenger/lower_left_crayon.png
new file mode 100644
index 00000000000..0ad5b02c2dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lower_left_crayon.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png b/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png
new file mode 100644
index 00000000000..96584c9f579
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/facebook_messenger/lower_left_paintbrush.png b/public/images/emoji/facebook_messenger/lower_left_paintbrush.png
new file mode 100644
index 00000000000..c7d649a3781
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/facebook_messenger/luxembourg.png b/public/images/emoji/facebook_messenger/luxembourg.png
new file mode 100644
index 00000000000..a8c6737d1b6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/luxembourg.png differ
diff --git a/public/images/emoji/facebook_messenger/lying_face.png b/public/images/emoji/facebook_messenger/lying_face.png
new file mode 100644
index 00000000000..e31e547296e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/lying_face.png differ
diff --git a/public/images/emoji/facebook_messenger/m.png b/public/images/emoji/facebook_messenger/m.png
new file mode 100644
index 00000000000..84fef974e00
Binary files /dev/null and b/public/images/emoji/facebook_messenger/m.png differ
diff --git a/public/images/emoji/facebook_messenger/macau.png b/public/images/emoji/facebook_messenger/macau.png
new file mode 100644
index 00000000000..6690c383f81
Binary files /dev/null and b/public/images/emoji/facebook_messenger/macau.png differ
diff --git a/public/images/emoji/facebook_messenger/macedonia.png b/public/images/emoji/facebook_messenger/macedonia.png
new file mode 100644
index 00000000000..a4c8ef41d2f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/macedonia.png differ
diff --git a/public/images/emoji/facebook_messenger/madagascar.png b/public/images/emoji/facebook_messenger/madagascar.png
new file mode 100644
index 00000000000..708ec7416ce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/madagascar.png differ
diff --git a/public/images/emoji/facebook_messenger/mag.png b/public/images/emoji/facebook_messenger/mag.png
new file mode 100644
index 00000000000..a0881161e4b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mag.png differ
diff --git a/public/images/emoji/facebook_messenger/mag_right.png b/public/images/emoji/facebook_messenger/mag_right.png
new file mode 100644
index 00000000000..0ba4cfeff04
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mag_right.png differ
diff --git a/public/images/emoji/facebook_messenger/mage.png b/public/images/emoji/facebook_messenger/mage.png
new file mode 100644
index 00000000000..71c1b13f924
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mage.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/2.png b/public/images/emoji/facebook_messenger/mage/2.png
new file mode 100644
index 00000000000..823f6843fad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mage/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/3.png b/public/images/emoji/facebook_messenger/mage/3.png
new file mode 100644
index 00000000000..c2ff6622a04
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mage/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/4.png b/public/images/emoji/facebook_messenger/mage/4.png
new file mode 100644
index 00000000000..76d0a52e374
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mage/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/5.png b/public/images/emoji/facebook_messenger/mage/5.png
new file mode 100644
index 00000000000..ddb5de55806
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mage/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mage/6.png b/public/images/emoji/facebook_messenger/mage/6.png
new file mode 100644
index 00000000000..302dd62dfb3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mage/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mahjong.png b/public/images/emoji/facebook_messenger/mahjong.png
new file mode 100644
index 00000000000..5766d97ecfe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mahjong.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox.png b/public/images/emoji/facebook_messenger/mailbox.png
new file mode 100644
index 00000000000..1ee01907c39
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mailbox.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox_closed.png b/public/images/emoji/facebook_messenger/mailbox_closed.png
new file mode 100644
index 00000000000..4d7c0ac6200
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mailbox_closed.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox_with_mail.png b/public/images/emoji/facebook_messenger/mailbox_with_mail.png
new file mode 100644
index 00000000000..724bab14ab1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mailbox_with_mail.png differ
diff --git a/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png b/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png
new file mode 100644
index 00000000000..a3ae327980d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/facebook_messenger/malawi.png b/public/images/emoji/facebook_messenger/malawi.png
new file mode 100644
index 00000000000..854fd4ce854
Binary files /dev/null and b/public/images/emoji/facebook_messenger/malawi.png differ
diff --git a/public/images/emoji/facebook_messenger/malaysia.png b/public/images/emoji/facebook_messenger/malaysia.png
new file mode 100644
index 00000000000..dbf3a912985
Binary files /dev/null and b/public/images/emoji/facebook_messenger/malaysia.png differ
diff --git a/public/images/emoji/facebook_messenger/maldives.png b/public/images/emoji/facebook_messenger/maldives.png
new file mode 100644
index 00000000000..e0fec7e04b4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/maldives.png differ
diff --git a/public/images/emoji/facebook_messenger/male_couple_with_heart.png b/public/images/emoji/facebook_messenger/male_couple_with_heart.png
new file mode 100644
index 00000000000..8fcabbd4300
Binary files /dev/null and b/public/images/emoji/facebook_messenger/male_couple_with_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/male_couplekiss.png b/public/images/emoji/facebook_messenger/male_couplekiss.png
new file mode 100644
index 00000000000..842c5a4e22d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/male_couplekiss.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective.png b/public/images/emoji/facebook_messenger/male_detective.png
new file mode 100644
index 00000000000..587e506d98d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/male_detective.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/2.png b/public/images/emoji/facebook_messenger/male_detective/2.png
new file mode 100644
index 00000000000..a25d5ea4d44
Binary files /dev/null and b/public/images/emoji/facebook_messenger/male_detective/2.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/3.png b/public/images/emoji/facebook_messenger/male_detective/3.png
new file mode 100644
index 00000000000..f100fd13a45
Binary files /dev/null and b/public/images/emoji/facebook_messenger/male_detective/3.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/4.png b/public/images/emoji/facebook_messenger/male_detective/4.png
new file mode 100644
index 00000000000..775a8b2f2b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/male_detective/4.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/5.png b/public/images/emoji/facebook_messenger/male_detective/5.png
new file mode 100644
index 00000000000..c9703ba9946
Binary files /dev/null and b/public/images/emoji/facebook_messenger/male_detective/5.png differ
diff --git a/public/images/emoji/facebook_messenger/male_detective/6.png b/public/images/emoji/facebook_messenger/male_detective/6.png
new file mode 100644
index 00000000000..55cc03db8d4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/male_detective/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mali.png b/public/images/emoji/facebook_messenger/mali.png
new file mode 100644
index 00000000000..ef19c197c7b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mali.png differ
diff --git a/public/images/emoji/facebook_messenger/malta.png b/public/images/emoji/facebook_messenger/malta.png
new file mode 100644
index 00000000000..f6850d62764
Binary files /dev/null and b/public/images/emoji/facebook_messenger/malta.png differ
diff --git a/public/images/emoji/facebook_messenger/man.png b/public/images/emoji/facebook_messenger/man.png
new file mode 100644
index 00000000000..51dd587074c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man.png differ
diff --git a/public/images/emoji/facebook_messenger/man/2.png b/public/images/emoji/facebook_messenger/man/2.png
new file mode 100644
index 00000000000..619a4af214e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man/3.png b/public/images/emoji/facebook_messenger/man/3.png
new file mode 100644
index 00000000000..c75a2f06c7f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man/4.png b/public/images/emoji/facebook_messenger/man/4.png
new file mode 100644
index 00000000000..3289978982c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man/5.png b/public/images/emoji/facebook_messenger/man/5.png
new file mode 100644
index 00000000000..c77e49351fd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man/6.png b/public/images/emoji/facebook_messenger/man/6.png
new file mode 100644
index 00000000000..fe6e80f2160
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist.png b/public/images/emoji/facebook_messenger/man_artist.png
new file mode 100644
index 00000000000..1cc66506970
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_artist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/2.png b/public/images/emoji/facebook_messenger/man_artist/2.png
new file mode 100644
index 00000000000..4bacb1ea060
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_artist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/3.png b/public/images/emoji/facebook_messenger/man_artist/3.png
new file mode 100644
index 00000000000..05d4d810aa6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_artist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/4.png b/public/images/emoji/facebook_messenger/man_artist/4.png
new file mode 100644
index 00000000000..4f62b719230
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_artist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/5.png b/public/images/emoji/facebook_messenger/man_artist/5.png
new file mode 100644
index 00000000000..87b201e1066
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_artist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_artist/6.png b/public/images/emoji/facebook_messenger/man_artist/6.png
new file mode 100644
index 00000000000..d3c5344420f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_artist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut.png b/public/images/emoji/facebook_messenger/man_astronaut.png
new file mode 100644
index 00000000000..3248c7ea4bb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_astronaut.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/2.png b/public/images/emoji/facebook_messenger/man_astronaut/2.png
new file mode 100644
index 00000000000..3f4608453cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_astronaut/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/3.png b/public/images/emoji/facebook_messenger/man_astronaut/3.png
new file mode 100644
index 00000000000..dfb79a0fa12
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_astronaut/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/4.png b/public/images/emoji/facebook_messenger/man_astronaut/4.png
new file mode 100644
index 00000000000..ecffb4b3dcd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_astronaut/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/5.png b/public/images/emoji/facebook_messenger/man_astronaut/5.png
new file mode 100644
index 00000000000..30a01501b69
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_astronaut/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_astronaut/6.png b/public/images/emoji/facebook_messenger/man_astronaut/6.png
new file mode 100644
index 00000000000..1b5c86eeb3e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_astronaut/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling.png b/public/images/emoji/facebook_messenger/man_cartwheeling.png
new file mode 100644
index 00000000000..aaf7c70f746
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cartwheeling.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/2.png b/public/images/emoji/facebook_messenger/man_cartwheeling/2.png
new file mode 100644
index 00000000000..431a4461e3c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/3.png b/public/images/emoji/facebook_messenger/man_cartwheeling/3.png
new file mode 100644
index 00000000000..fb4421abb07
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/4.png b/public/images/emoji/facebook_messenger/man_cartwheeling/4.png
new file mode 100644
index 00000000000..277e11f0c50
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/5.png b/public/images/emoji/facebook_messenger/man_cartwheeling/5.png
new file mode 100644
index 00000000000..dfd446bd8d2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cartwheeling/6.png b/public/images/emoji/facebook_messenger/man_cartwheeling/6.png
new file mode 100644
index 00000000000..8877efb2711
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook.png b/public/images/emoji/facebook_messenger/man_cook.png
new file mode 100644
index 00000000000..8fb843406f5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cook.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/2.png b/public/images/emoji/facebook_messenger/man_cook/2.png
new file mode 100644
index 00000000000..4dfed228556
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cook/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/3.png b/public/images/emoji/facebook_messenger/man_cook/3.png
new file mode 100644
index 00000000000..072ab0c4753
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cook/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/4.png b/public/images/emoji/facebook_messenger/man_cook/4.png
new file mode 100644
index 00000000000..0d3c6b85351
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cook/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/5.png b/public/images/emoji/facebook_messenger/man_cook/5.png
new file mode 100644
index 00000000000..805aa4fcf67
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cook/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_cook/6.png b/public/images/emoji/facebook_messenger/man_cook/6.png
new file mode 100644
index 00000000000..60d2b62aa26
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_cook/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing.png b/public/images/emoji/facebook_messenger/man_dancing.png
new file mode 100644
index 00000000000..f3f2a5b04c7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_dancing.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/2.png b/public/images/emoji/facebook_messenger/man_dancing/2.png
new file mode 100644
index 00000000000..040218520e4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_dancing/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/3.png b/public/images/emoji/facebook_messenger/man_dancing/3.png
new file mode 100644
index 00000000000..8aec654d0ed
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_dancing/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/4.png b/public/images/emoji/facebook_messenger/man_dancing/4.png
new file mode 100644
index 00000000000..3d74099cbba
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_dancing/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/5.png b/public/images/emoji/facebook_messenger/man_dancing/5.png
new file mode 100644
index 00000000000..d41bc277889
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_dancing/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_dancing/6.png b/public/images/emoji/facebook_messenger/man_dancing/6.png
new file mode 100644
index 00000000000..01ee2f8efeb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_dancing/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming.png b/public/images/emoji/facebook_messenger/man_facepalming.png
new file mode 100644
index 00000000000..4967e238dcc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_facepalming.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/2.png b/public/images/emoji/facebook_messenger/man_facepalming/2.png
new file mode 100644
index 00000000000..797300f215f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_facepalming/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/3.png b/public/images/emoji/facebook_messenger/man_facepalming/3.png
new file mode 100644
index 00000000000..407e8054b53
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_facepalming/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/4.png b/public/images/emoji/facebook_messenger/man_facepalming/4.png
new file mode 100644
index 00000000000..6254233090c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_facepalming/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/5.png b/public/images/emoji/facebook_messenger/man_facepalming/5.png
new file mode 100644
index 00000000000..5e7da37f052
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_facepalming/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/6.png b/public/images/emoji/facebook_messenger/man_facepalming/6.png
new file mode 100644
index 00000000000..eca03f4a44f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_facepalming/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker.png b/public/images/emoji/facebook_messenger/man_factory_worker.png
new file mode 100644
index 00000000000..4f8d7b6339f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_factory_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/2.png b/public/images/emoji/facebook_messenger/man_factory_worker/2.png
new file mode 100644
index 00000000000..ac0c07e8d58
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_factory_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/3.png b/public/images/emoji/facebook_messenger/man_factory_worker/3.png
new file mode 100644
index 00000000000..f5b09e3c747
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_factory_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/4.png b/public/images/emoji/facebook_messenger/man_factory_worker/4.png
new file mode 100644
index 00000000000..d9e2f4f8f99
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_factory_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/5.png b/public/images/emoji/facebook_messenger/man_factory_worker/5.png
new file mode 100644
index 00000000000..c6fb8f9c463
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_factory_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_factory_worker/6.png b/public/images/emoji/facebook_messenger/man_factory_worker/6.png
new file mode 100644
index 00000000000..196de5ae668
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_factory_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer.png b/public/images/emoji/facebook_messenger/man_farmer.png
new file mode 100644
index 00000000000..a275fe56a76
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_farmer.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/2.png b/public/images/emoji/facebook_messenger/man_farmer/2.png
new file mode 100644
index 00000000000..cf79c4c3110
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_farmer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/3.png b/public/images/emoji/facebook_messenger/man_farmer/3.png
new file mode 100644
index 00000000000..b0c9648562a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_farmer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/4.png b/public/images/emoji/facebook_messenger/man_farmer/4.png
new file mode 100644
index 00000000000..89249787904
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_farmer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/5.png b/public/images/emoji/facebook_messenger/man_farmer/5.png
new file mode 100644
index 00000000000..dc6e22dbc16
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_farmer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_farmer/6.png b/public/images/emoji/facebook_messenger/man_farmer/6.png
new file mode 100644
index 00000000000..e7df59313d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_farmer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter.png b/public/images/emoji/facebook_messenger/man_firefighter.png
new file mode 100644
index 00000000000..a43787bc209
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_firefighter.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/2.png b/public/images/emoji/facebook_messenger/man_firefighter/2.png
new file mode 100644
index 00000000000..9788ff223ed
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_firefighter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/3.png b/public/images/emoji/facebook_messenger/man_firefighter/3.png
new file mode 100644
index 00000000000..b92f6491359
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_firefighter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/4.png b/public/images/emoji/facebook_messenger/man_firefighter/4.png
new file mode 100644
index 00000000000..2494826b0d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_firefighter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/5.png b/public/images/emoji/facebook_messenger/man_firefighter/5.png
new file mode 100644
index 00000000000..74caaf3d670
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_firefighter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_firefighter/6.png b/public/images/emoji/facebook_messenger/man_firefighter/6.png
new file mode 100644
index 00000000000..87b1460b99a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_firefighter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker.png b/public/images/emoji/facebook_messenger/man_health_worker.png
new file mode 100644
index 00000000000..266219eec10
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_health_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/2.png b/public/images/emoji/facebook_messenger/man_health_worker/2.png
new file mode 100644
index 00000000000..07434ed5781
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_health_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/3.png b/public/images/emoji/facebook_messenger/man_health_worker/3.png
new file mode 100644
index 00000000000..a233efb0c7a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_health_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/4.png b/public/images/emoji/facebook_messenger/man_health_worker/4.png
new file mode 100644
index 00000000000..9dbd254708e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_health_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/5.png b/public/images/emoji/facebook_messenger/man_health_worker/5.png
new file mode 100644
index 00000000000..3e13cf5b0dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_health_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_health_worker/6.png b/public/images/emoji/facebook_messenger/man_health_worker/6.png
new file mode 100644
index 00000000000..6fe28eed3cd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_health_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png
new file mode 100644
index 00000000000..5231c708a03
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png
new file mode 100644
index 00000000000..753693b093b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png
new file mode 100644
index 00000000000..f56875edac9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png
new file mode 100644
index 00000000000..37d74f5c97d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png
new file mode 100644
index 00000000000..5a48f961920
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png
new file mode 100644
index 00000000000..61507408172
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo.png b/public/images/emoji/facebook_messenger/man_in_tuxedo.png
new file mode 100644
index 00000000000..68a5498555d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_tuxedo.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png
new file mode 100644
index 00000000000..9115065434d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png
new file mode 100644
index 00000000000..7d21e355055
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png
new file mode 100644
index 00000000000..5560c73e7c2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png
new file mode 100644
index 00000000000..0507a8bc08e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png b/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png
new file mode 100644
index 00000000000..7e5b9118602
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge.png b/public/images/emoji/facebook_messenger/man_judge.png
new file mode 100644
index 00000000000..b20c0cd7349
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_judge.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/2.png b/public/images/emoji/facebook_messenger/man_judge/2.png
new file mode 100644
index 00000000000..bdfee1817bb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_judge/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/3.png b/public/images/emoji/facebook_messenger/man_judge/3.png
new file mode 100644
index 00000000000..052c0b0fa21
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_judge/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/4.png b/public/images/emoji/facebook_messenger/man_judge/4.png
new file mode 100644
index 00000000000..ddd7e0530df
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_judge/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/5.png b/public/images/emoji/facebook_messenger/man_judge/5.png
new file mode 100644
index 00000000000..1a374e14850
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_judge/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_judge/6.png b/public/images/emoji/facebook_messenger/man_judge/6.png
new file mode 100644
index 00000000000..4d5fac75dfe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_judge/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling.png b/public/images/emoji/facebook_messenger/man_juggling.png
new file mode 100644
index 00000000000..d6cc6a380df
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_juggling.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/2.png b/public/images/emoji/facebook_messenger/man_juggling/2.png
new file mode 100644
index 00000000000..631afe697f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_juggling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/3.png b/public/images/emoji/facebook_messenger/man_juggling/3.png
new file mode 100644
index 00000000000..c28f2a5db9f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_juggling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/4.png b/public/images/emoji/facebook_messenger/man_juggling/4.png
new file mode 100644
index 00000000000..12d32ecb86a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_juggling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/5.png b/public/images/emoji/facebook_messenger/man_juggling/5.png
new file mode 100644
index 00000000000..f04ba21ece3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_juggling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_juggling/6.png b/public/images/emoji/facebook_messenger/man_juggling/6.png
new file mode 100644
index 00000000000..4b5b1a7d5c6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_juggling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic.png b/public/images/emoji/facebook_messenger/man_mechanic.png
new file mode 100644
index 00000000000..df912ad2558
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_mechanic.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/2.png b/public/images/emoji/facebook_messenger/man_mechanic/2.png
new file mode 100644
index 00000000000..2d9a40a7b64
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_mechanic/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/3.png b/public/images/emoji/facebook_messenger/man_mechanic/3.png
new file mode 100644
index 00000000000..0b6093c5612
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_mechanic/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/4.png b/public/images/emoji/facebook_messenger/man_mechanic/4.png
new file mode 100644
index 00000000000..4b776c98ef2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_mechanic/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/5.png b/public/images/emoji/facebook_messenger/man_mechanic/5.png
new file mode 100644
index 00000000000..994526ddb9e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_mechanic/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_mechanic/6.png b/public/images/emoji/facebook_messenger/man_mechanic/6.png
new file mode 100644
index 00000000000..e95117df24a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_mechanic/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker.png b/public/images/emoji/facebook_messenger/man_office_worker.png
new file mode 100644
index 00000000000..641784af029
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_office_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/2.png b/public/images/emoji/facebook_messenger/man_office_worker/2.png
new file mode 100644
index 00000000000..db95aa14314
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_office_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/3.png b/public/images/emoji/facebook_messenger/man_office_worker/3.png
new file mode 100644
index 00000000000..0da3a36f501
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_office_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/4.png b/public/images/emoji/facebook_messenger/man_office_worker/4.png
new file mode 100644
index 00000000000..0e7d62291b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_office_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/5.png b/public/images/emoji/facebook_messenger/man_office_worker/5.png
new file mode 100644
index 00000000000..b2ef2f04209
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_office_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_office_worker/6.png b/public/images/emoji/facebook_messenger/man_office_worker/6.png
new file mode 100644
index 00000000000..f237971ab0d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_office_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot.png b/public/images/emoji/facebook_messenger/man_pilot.png
new file mode 100644
index 00000000000..196949a366f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_pilot.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/2.png b/public/images/emoji/facebook_messenger/man_pilot/2.png
new file mode 100644
index 00000000000..0b3fe7f3492
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_pilot/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/3.png b/public/images/emoji/facebook_messenger/man_pilot/3.png
new file mode 100644
index 00000000000..2af0c956d9d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_pilot/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/4.png b/public/images/emoji/facebook_messenger/man_pilot/4.png
new file mode 100644
index 00000000000..7098a598caa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_pilot/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/5.png b/public/images/emoji/facebook_messenger/man_pilot/5.png
new file mode 100644
index 00000000000..790ecc7051e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_pilot/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_pilot/6.png b/public/images/emoji/facebook_messenger/man_pilot/6.png
new file mode 100644
index 00000000000..7082b178d78
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_pilot/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball.png b/public/images/emoji/facebook_messenger/man_playing_handball.png
new file mode 100644
index 00000000000..8d9964cf037
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_handball.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/2.png b/public/images/emoji/facebook_messenger/man_playing_handball/2.png
new file mode 100644
index 00000000000..33b1d7c764b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_handball/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/3.png b/public/images/emoji/facebook_messenger/man_playing_handball/3.png
new file mode 100644
index 00000000000..1f3f9215d08
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_handball/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/4.png b/public/images/emoji/facebook_messenger/man_playing_handball/4.png
new file mode 100644
index 00000000000..20d6288ed7a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_handball/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/5.png b/public/images/emoji/facebook_messenger/man_playing_handball/5.png
new file mode 100644
index 00000000000..b653112d27f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_handball/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_handball/6.png b/public/images/emoji/facebook_messenger/man_playing_handball/6.png
new file mode 100644
index 00000000000..c7dce8c231c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_handball/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo.png b/public/images/emoji/facebook_messenger/man_playing_water_polo.png
new file mode 100644
index 00000000000..14bc7c68d11
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_water_polo.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png
new file mode 100644
index 00000000000..4f343861d3c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png
new file mode 100644
index 00000000000..3548a2ef8db
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png
new file mode 100644
index 00000000000..7b45751b64d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png
new file mode 100644
index 00000000000..3247752e194
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png b/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png
new file mode 100644
index 00000000000..bd6e616eb20
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist.png b/public/images/emoji/facebook_messenger/man_scientist.png
new file mode 100644
index 00000000000..af1f36d1cd5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_scientist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/2.png b/public/images/emoji/facebook_messenger/man_scientist/2.png
new file mode 100644
index 00000000000..5a1e488e80b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_scientist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/3.png b/public/images/emoji/facebook_messenger/man_scientist/3.png
new file mode 100644
index 00000000000..7c7d6b849e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_scientist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/4.png b/public/images/emoji/facebook_messenger/man_scientist/4.png
new file mode 100644
index 00000000000..ff16a5535f7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_scientist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/5.png b/public/images/emoji/facebook_messenger/man_scientist/5.png
new file mode 100644
index 00000000000..179479a6969
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_scientist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_scientist/6.png b/public/images/emoji/facebook_messenger/man_scientist/6.png
new file mode 100644
index 00000000000..b02e169aaff
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_scientist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging.png b/public/images/emoji/facebook_messenger/man_shrugging.png
new file mode 100644
index 00000000000..61e00fd0b01
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_shrugging.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/2.png b/public/images/emoji/facebook_messenger/man_shrugging/2.png
new file mode 100644
index 00000000000..6db5885ddbd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_shrugging/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/3.png b/public/images/emoji/facebook_messenger/man_shrugging/3.png
new file mode 100644
index 00000000000..f1fc833e9c7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_shrugging/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/4.png b/public/images/emoji/facebook_messenger/man_shrugging/4.png
new file mode 100644
index 00000000000..9ca39fce99b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_shrugging/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/5.png b/public/images/emoji/facebook_messenger/man_shrugging/5.png
new file mode 100644
index 00000000000..ab9cd50150c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_shrugging/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_shrugging/6.png b/public/images/emoji/facebook_messenger/man_shrugging/6.png
new file mode 100644
index 00000000000..a805a9fe340
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_shrugging/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer.png b/public/images/emoji/facebook_messenger/man_singer.png
new file mode 100644
index 00000000000..f3df8810282
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_singer.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/2.png b/public/images/emoji/facebook_messenger/man_singer/2.png
new file mode 100644
index 00000000000..4e65783bfd5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_singer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/3.png b/public/images/emoji/facebook_messenger/man_singer/3.png
new file mode 100644
index 00000000000..516eb98afb5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_singer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/4.png b/public/images/emoji/facebook_messenger/man_singer/4.png
new file mode 100644
index 00000000000..89326187fbb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_singer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/5.png b/public/images/emoji/facebook_messenger/man_singer/5.png
new file mode 100644
index 00000000000..b899d241e70
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_singer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_singer/6.png b/public/images/emoji/facebook_messenger/man_singer/6.png
new file mode 100644
index 00000000000..a13d0b8c926
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_singer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student.png b/public/images/emoji/facebook_messenger/man_student.png
new file mode 100644
index 00000000000..897c8af4123
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_student.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/2.png b/public/images/emoji/facebook_messenger/man_student/2.png
new file mode 100644
index 00000000000..7acaf3e280b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_student/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/3.png b/public/images/emoji/facebook_messenger/man_student/3.png
new file mode 100644
index 00000000000..c24cb607301
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_student/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/4.png b/public/images/emoji/facebook_messenger/man_student/4.png
new file mode 100644
index 00000000000..f0789f0b596
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_student/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/5.png b/public/images/emoji/facebook_messenger/man_student/5.png
new file mode 100644
index 00000000000..8471ef972a0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_student/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_student/6.png b/public/images/emoji/facebook_messenger/man_student/6.png
new file mode 100644
index 00000000000..985678e804c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_student/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher.png b/public/images/emoji/facebook_messenger/man_teacher.png
new file mode 100644
index 00000000000..b85d9054667
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_teacher.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/2.png b/public/images/emoji/facebook_messenger/man_teacher/2.png
new file mode 100644
index 00000000000..e7cdd5b69aa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_teacher/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/3.png b/public/images/emoji/facebook_messenger/man_teacher/3.png
new file mode 100644
index 00000000000..00f91851cbd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_teacher/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/4.png b/public/images/emoji/facebook_messenger/man_teacher/4.png
new file mode 100644
index 00000000000..a82ddfb1401
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_teacher/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/5.png b/public/images/emoji/facebook_messenger/man_teacher/5.png
new file mode 100644
index 00000000000..d4140998d30
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_teacher/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_teacher/6.png b/public/images/emoji/facebook_messenger/man_teacher/6.png
new file mode 100644
index 00000000000..ed08c11d2b3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_teacher/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist.png b/public/images/emoji/facebook_messenger/man_technologist.png
new file mode 100644
index 00000000000..4d8208bbe1f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_technologist.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/2.png b/public/images/emoji/facebook_messenger/man_technologist/2.png
new file mode 100644
index 00000000000..aed10e4c384
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_technologist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/3.png b/public/images/emoji/facebook_messenger/man_technologist/3.png
new file mode 100644
index 00000000000..21b1243f7d8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_technologist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/4.png b/public/images/emoji/facebook_messenger/man_technologist/4.png
new file mode 100644
index 00000000000..f8d2f531dc3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_technologist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/5.png b/public/images/emoji/facebook_messenger/man_technologist/5.png
new file mode 100644
index 00000000000..27ea1004131
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_technologist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_technologist/6.png b/public/images/emoji/facebook_messenger/man_technologist/6.png
new file mode 100644
index 00000000000..e6c6bccfffd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_technologist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png
new file mode 100644
index 00000000000..12733f7310e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png
new file mode 100644
index 00000000000..5be20536905
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png
new file mode 100644
index 00000000000..d6fe373e5dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png
new file mode 100644
index 00000000000..ed8e0fa95f0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png
new file mode 100644
index 00000000000..37ebcedaf7a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png
new file mode 100644
index 00000000000..0fd02d1709c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban.png b/public/images/emoji/facebook_messenger/man_with_turban.png
new file mode 100644
index 00000000000..658845d182b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_turban.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/2.png b/public/images/emoji/facebook_messenger/man_with_turban/2.png
new file mode 100644
index 00000000000..fd2a2c17e33
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_turban/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/3.png b/public/images/emoji/facebook_messenger/man_with_turban/3.png
new file mode 100644
index 00000000000..0fd074ec85e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_turban/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/4.png b/public/images/emoji/facebook_messenger/man_with_turban/4.png
new file mode 100644
index 00000000000..88ef725c328
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_turban/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/5.png b/public/images/emoji/facebook_messenger/man_with_turban/5.png
new file mode 100644
index 00000000000..924ab084d28
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_turban/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_with_turban/6.png b/public/images/emoji/facebook_messenger/man_with_turban/6.png
new file mode 100644
index 00000000000..fa49843cb69
Binary files /dev/null and b/public/images/emoji/facebook_messenger/man_with_turban/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mans_shoe.png b/public/images/emoji/facebook_messenger/mans_shoe.png
new file mode 100644
index 00000000000..e9157aa9a55
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mans_shoe.png differ
diff --git a/public/images/emoji/facebook_messenger/mantelpiece_clock.png b/public/images/emoji/facebook_messenger/mantelpiece_clock.png
new file mode 100644
index 00000000000..62a0e894592
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mantelpiece_clock.png differ
diff --git a/public/images/emoji/facebook_messenger/map.png b/public/images/emoji/facebook_messenger/map.png
new file mode 100644
index 00000000000..8c102ea49de
Binary files /dev/null and b/public/images/emoji/facebook_messenger/map.png differ
diff --git a/public/images/emoji/facebook_messenger/maple_leaf.png b/public/images/emoji/facebook_messenger/maple_leaf.png
new file mode 100644
index 00000000000..d9ec4056552
Binary files /dev/null and b/public/images/emoji/facebook_messenger/maple_leaf.png differ
diff --git a/public/images/emoji/facebook_messenger/marshall_islands.png b/public/images/emoji/facebook_messenger/marshall_islands.png
new file mode 100644
index 00000000000..35a77d3ec6a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/marshall_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/martial_arts_uniform.png b/public/images/emoji/facebook_messenger/martial_arts_uniform.png
new file mode 100644
index 00000000000..50e9d87cd53
Binary files /dev/null and b/public/images/emoji/facebook_messenger/martial_arts_uniform.png differ
diff --git a/public/images/emoji/facebook_messenger/martinique.png b/public/images/emoji/facebook_messenger/martinique.png
new file mode 100644
index 00000000000..20265c357af
Binary files /dev/null and b/public/images/emoji/facebook_messenger/martinique.png differ
diff --git a/public/images/emoji/facebook_messenger/mask.png b/public/images/emoji/facebook_messenger/mask.png
new file mode 100644
index 00000000000..3fb3c370ede
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mask.png differ
diff --git a/public/images/emoji/facebook_messenger/massage.png b/public/images/emoji/facebook_messenger/massage.png
new file mode 100644
index 00000000000..963acc0b3b3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/2.png b/public/images/emoji/facebook_messenger/massage/2.png
new file mode 100644
index 00000000000..908482b905c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage/2.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/3.png b/public/images/emoji/facebook_messenger/massage/3.png
new file mode 100644
index 00000000000..c6349e91464
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage/3.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/4.png b/public/images/emoji/facebook_messenger/massage/4.png
new file mode 100644
index 00000000000..83899fc1936
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage/4.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/5.png b/public/images/emoji/facebook_messenger/massage/5.png
new file mode 100644
index 00000000000..8645741a675
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage/5.png differ
diff --git a/public/images/emoji/facebook_messenger/massage/6.png b/public/images/emoji/facebook_messenger/massage/6.png
new file mode 100644
index 00000000000..6ebddf72f97
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage/6.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man.png b/public/images/emoji/facebook_messenger/massage_man.png
new file mode 100644
index 00000000000..b2d809725e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_man.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/2.png b/public/images/emoji/facebook_messenger/massage_man/2.png
new file mode 100644
index 00000000000..892e43bd6aa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/3.png b/public/images/emoji/facebook_messenger/massage_man/3.png
new file mode 100644
index 00000000000..e9668ae1d81
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/4.png b/public/images/emoji/facebook_messenger/massage_man/4.png
new file mode 100644
index 00000000000..f891cc952f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/5.png b/public/images/emoji/facebook_messenger/massage_man/5.png
new file mode 100644
index 00000000000..8295da5a875
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_man/6.png b/public/images/emoji/facebook_messenger/massage_man/6.png
new file mode 100644
index 00000000000..549596cc7c1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman.png b/public/images/emoji/facebook_messenger/massage_woman.png
new file mode 100644
index 00000000000..963acc0b3b3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/2.png b/public/images/emoji/facebook_messenger/massage_woman/2.png
new file mode 100644
index 00000000000..908482b905c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/3.png b/public/images/emoji/facebook_messenger/massage_woman/3.png
new file mode 100644
index 00000000000..c6349e91464
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/4.png b/public/images/emoji/facebook_messenger/massage_woman/4.png
new file mode 100644
index 00000000000..83899fc1936
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/5.png b/public/images/emoji/facebook_messenger/massage_woman/5.png
new file mode 100644
index 00000000000..8645741a675
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/massage_woman/6.png b/public/images/emoji/facebook_messenger/massage_woman/6.png
new file mode 100644
index 00000000000..6ebddf72f97
Binary files /dev/null and b/public/images/emoji/facebook_messenger/massage_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mauritania.png b/public/images/emoji/facebook_messenger/mauritania.png
new file mode 100644
index 00000000000..23fa26e4ced
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mauritania.png differ
diff --git a/public/images/emoji/facebook_messenger/mauritius.png b/public/images/emoji/facebook_messenger/mauritius.png
new file mode 100644
index 00000000000..846272e3670
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mauritius.png differ
diff --git a/public/images/emoji/facebook_messenger/mayotte.png b/public/images/emoji/facebook_messenger/mayotte.png
new file mode 100644
index 00000000000..43a7879d247
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mayotte.png differ
diff --git a/public/images/emoji/facebook_messenger/meat_on_bone.png b/public/images/emoji/facebook_messenger/meat_on_bone.png
new file mode 100644
index 00000000000..545091e6d71
Binary files /dev/null and b/public/images/emoji/facebook_messenger/meat_on_bone.png differ
diff --git a/public/images/emoji/facebook_messenger/medal.png b/public/images/emoji/facebook_messenger/medal.png
new file mode 100644
index 00000000000..57fbc8512fc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/medal.png differ
diff --git a/public/images/emoji/facebook_messenger/medal_military.png b/public/images/emoji/facebook_messenger/medal_military.png
new file mode 100644
index 00000000000..857488da67c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/medal_military.png differ
diff --git a/public/images/emoji/facebook_messenger/medal_sports.png b/public/images/emoji/facebook_messenger/medal_sports.png
new file mode 100644
index 00000000000..57fbc8512fc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/medal_sports.png differ
diff --git a/public/images/emoji/facebook_messenger/mega.png b/public/images/emoji/facebook_messenger/mega.png
new file mode 100644
index 00000000000..0b8649ee37a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mega.png differ
diff --git a/public/images/emoji/facebook_messenger/melon.png b/public/images/emoji/facebook_messenger/melon.png
new file mode 100644
index 00000000000..474cf5ae568
Binary files /dev/null and b/public/images/emoji/facebook_messenger/melon.png differ
diff --git a/public/images/emoji/facebook_messenger/memo.png b/public/images/emoji/facebook_messenger/memo.png
new file mode 100644
index 00000000000..8a9a0a4d8cf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/memo.png differ
diff --git a/public/images/emoji/facebook_messenger/men_wrestling.png b/public/images/emoji/facebook_messenger/men_wrestling.png
new file mode 100644
index 00000000000..ab63e2f4f0f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/men_wrestling.png differ
diff --git a/public/images/emoji/facebook_messenger/menorah.png b/public/images/emoji/facebook_messenger/menorah.png
new file mode 100644
index 00000000000..fe2a128793a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/menorah.png differ
diff --git a/public/images/emoji/facebook_messenger/mens.png b/public/images/emoji/facebook_messenger/mens.png
new file mode 100644
index 00000000000..4cddf230fb2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mens.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson.png b/public/images/emoji/facebook_messenger/merperson.png
new file mode 100644
index 00000000000..ee1b999e0dd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merperson.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/2.png b/public/images/emoji/facebook_messenger/merperson/2.png
new file mode 100644
index 00000000000..b97fbf42e35
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merperson/2.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/3.png b/public/images/emoji/facebook_messenger/merperson/3.png
new file mode 100644
index 00000000000..9079f60b81e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merperson/3.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/4.png b/public/images/emoji/facebook_messenger/merperson/4.png
new file mode 100644
index 00000000000..decc0b58929
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merperson/4.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/5.png b/public/images/emoji/facebook_messenger/merperson/5.png
new file mode 100644
index 00000000000..e3e3e89cb16
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merperson/5.png differ
diff --git a/public/images/emoji/facebook_messenger/merperson/6.png b/public/images/emoji/facebook_messenger/merperson/6.png
new file mode 100644
index 00000000000..5a5f36684e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/merperson/6.png differ
diff --git a/public/images/emoji/facebook_messenger/metal.png b/public/images/emoji/facebook_messenger/metal.png
new file mode 100644
index 00000000000..72d987aadc3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/metal.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/2.png b/public/images/emoji/facebook_messenger/metal/2.png
new file mode 100644
index 00000000000..8d87aab277f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/metal/2.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/3.png b/public/images/emoji/facebook_messenger/metal/3.png
new file mode 100644
index 00000000000..39a19cd401f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/metal/3.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/4.png b/public/images/emoji/facebook_messenger/metal/4.png
new file mode 100644
index 00000000000..73bedb2c022
Binary files /dev/null and b/public/images/emoji/facebook_messenger/metal/4.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/5.png b/public/images/emoji/facebook_messenger/metal/5.png
new file mode 100644
index 00000000000..36413ab8cfb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/metal/5.png differ
diff --git a/public/images/emoji/facebook_messenger/metal/6.png b/public/images/emoji/facebook_messenger/metal/6.png
new file mode 100644
index 00000000000..1cb1b661b95
Binary files /dev/null and b/public/images/emoji/facebook_messenger/metal/6.png differ
diff --git a/public/images/emoji/facebook_messenger/metro.png b/public/images/emoji/facebook_messenger/metro.png
new file mode 100644
index 00000000000..b4b77dd6bac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/metro.png differ
diff --git a/public/images/emoji/facebook_messenger/mexico.png b/public/images/emoji/facebook_messenger/mexico.png
new file mode 100644
index 00000000000..0bed6bc4643
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mexico.png differ
diff --git a/public/images/emoji/facebook_messenger/micronesia.png b/public/images/emoji/facebook_messenger/micronesia.png
new file mode 100644
index 00000000000..549d03fdc7c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/micronesia.png differ
diff --git a/public/images/emoji/facebook_messenger/microphone.png b/public/images/emoji/facebook_messenger/microphone.png
new file mode 100644
index 00000000000..2b72052cc93
Binary files /dev/null and b/public/images/emoji/facebook_messenger/microphone.png differ
diff --git a/public/images/emoji/facebook_messenger/microphone2.png b/public/images/emoji/facebook_messenger/microphone2.png
new file mode 100644
index 00000000000..d10b32281fc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/microphone2.png differ
diff --git a/public/images/emoji/facebook_messenger/microscope.png b/public/images/emoji/facebook_messenger/microscope.png
new file mode 100644
index 00000000000..9881d1fa04d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/microscope.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger.png b/public/images/emoji/facebook_messenger/middle_finger.png
new file mode 100644
index 00000000000..8e7fce2f49b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/middle_finger.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/2.png b/public/images/emoji/facebook_messenger/middle_finger/2.png
new file mode 100644
index 00000000000..992338bb2b6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/middle_finger/2.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/3.png b/public/images/emoji/facebook_messenger/middle_finger/3.png
new file mode 100644
index 00000000000..aadc06129fe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/middle_finger/3.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/4.png b/public/images/emoji/facebook_messenger/middle_finger/4.png
new file mode 100644
index 00000000000..8ad10be1169
Binary files /dev/null and b/public/images/emoji/facebook_messenger/middle_finger/4.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/5.png b/public/images/emoji/facebook_messenger/middle_finger/5.png
new file mode 100644
index 00000000000..695c4a6cb9c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/middle_finger/5.png differ
diff --git a/public/images/emoji/facebook_messenger/middle_finger/6.png b/public/images/emoji/facebook_messenger/middle_finger/6.png
new file mode 100644
index 00000000000..3457e01312c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/middle_finger/6.png differ
diff --git a/public/images/emoji/facebook_messenger/military_medal.png b/public/images/emoji/facebook_messenger/military_medal.png
new file mode 100644
index 00000000000..857488da67c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/military_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/milk_glass.png b/public/images/emoji/facebook_messenger/milk_glass.png
new file mode 100644
index 00000000000..d2de8252bba
Binary files /dev/null and b/public/images/emoji/facebook_messenger/milk_glass.png differ
diff --git a/public/images/emoji/facebook_messenger/milky_way.png b/public/images/emoji/facebook_messenger/milky_way.png
new file mode 100644
index 00000000000..e3073f128a0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/milky_way.png differ
diff --git a/public/images/emoji/facebook_messenger/minibus.png b/public/images/emoji/facebook_messenger/minibus.png
new file mode 100644
index 00000000000..aee0cb3011c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/minibus.png differ
diff --git a/public/images/emoji/facebook_messenger/minidisc.png b/public/images/emoji/facebook_messenger/minidisc.png
new file mode 100644
index 00000000000..0c8fa7297a7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/minidisc.png differ
diff --git a/public/images/emoji/facebook_messenger/mobile_phone_off.png b/public/images/emoji/facebook_messenger/mobile_phone_off.png
new file mode 100644
index 00000000000..21e170f6fd2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mobile_phone_off.png differ
diff --git a/public/images/emoji/facebook_messenger/moldova.png b/public/images/emoji/facebook_messenger/moldova.png
new file mode 100644
index 00000000000..d4463a01473
Binary files /dev/null and b/public/images/emoji/facebook_messenger/moldova.png differ
diff --git a/public/images/emoji/facebook_messenger/monaco.png b/public/images/emoji/facebook_messenger/monaco.png
new file mode 100644
index 00000000000..17833f535af
Binary files /dev/null and b/public/images/emoji/facebook_messenger/monaco.png differ
diff --git a/public/images/emoji/facebook_messenger/money_mouth.png b/public/images/emoji/facebook_messenger/money_mouth.png
new file mode 100644
index 00000000000..cd2459518eb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/money_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/money_mouth_face.png b/public/images/emoji/facebook_messenger/money_mouth_face.png
new file mode 100644
index 00000000000..cd2459518eb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/money_mouth_face.png differ
diff --git a/public/images/emoji/facebook_messenger/money_with_wings.png b/public/images/emoji/facebook_messenger/money_with_wings.png
new file mode 100644
index 00000000000..6b3ed315add
Binary files /dev/null and b/public/images/emoji/facebook_messenger/money_with_wings.png differ
diff --git a/public/images/emoji/facebook_messenger/moneybag.png b/public/images/emoji/facebook_messenger/moneybag.png
new file mode 100644
index 00000000000..abd97b89044
Binary files /dev/null and b/public/images/emoji/facebook_messenger/moneybag.png differ
diff --git a/public/images/emoji/facebook_messenger/mongolia.png b/public/images/emoji/facebook_messenger/mongolia.png
new file mode 100644
index 00000000000..cf978945085
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mongolia.png differ
diff --git a/public/images/emoji/facebook_messenger/monkey.png b/public/images/emoji/facebook_messenger/monkey.png
new file mode 100644
index 00000000000..c47f55ca638
Binary files /dev/null and b/public/images/emoji/facebook_messenger/monkey.png differ
diff --git a/public/images/emoji/facebook_messenger/monkey_face.png b/public/images/emoji/facebook_messenger/monkey_face.png
new file mode 100644
index 00000000000..590a3057c96
Binary files /dev/null and b/public/images/emoji/facebook_messenger/monkey_face.png differ
diff --git a/public/images/emoji/facebook_messenger/monorail.png b/public/images/emoji/facebook_messenger/monorail.png
new file mode 100644
index 00000000000..2dcf74036c9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/monorail.png differ
diff --git a/public/images/emoji/facebook_messenger/montenegro.png b/public/images/emoji/facebook_messenger/montenegro.png
new file mode 100644
index 00000000000..7cbd07cef3c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/montenegro.png differ
diff --git a/public/images/emoji/facebook_messenger/montserrat.png b/public/images/emoji/facebook_messenger/montserrat.png
new file mode 100644
index 00000000000..28712de519d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/montserrat.png differ
diff --git a/public/images/emoji/facebook_messenger/moon.png b/public/images/emoji/facebook_messenger/moon.png
new file mode 100644
index 00000000000..c20fb89b189
Binary files /dev/null and b/public/images/emoji/facebook_messenger/moon.png differ
diff --git a/public/images/emoji/facebook_messenger/morocco.png b/public/images/emoji/facebook_messenger/morocco.png
new file mode 100644
index 00000000000..7f16d0a66de
Binary files /dev/null and b/public/images/emoji/facebook_messenger/morocco.png differ
diff --git a/public/images/emoji/facebook_messenger/mortar_board.png b/public/images/emoji/facebook_messenger/mortar_board.png
new file mode 100644
index 00000000000..d06f52a4383
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mortar_board.png differ
diff --git a/public/images/emoji/facebook_messenger/mosque.png b/public/images/emoji/facebook_messenger/mosque.png
new file mode 100644
index 00000000000..b0a68fffb5a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mosque.png differ
diff --git a/public/images/emoji/facebook_messenger/motor_boat.png b/public/images/emoji/facebook_messenger/motor_boat.png
new file mode 100644
index 00000000000..3eba365766f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/motor_boat.png differ
diff --git a/public/images/emoji/facebook_messenger/motor_scooter.png b/public/images/emoji/facebook_messenger/motor_scooter.png
new file mode 100644
index 00000000000..b9659e99a3e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/motor_scooter.png differ
diff --git a/public/images/emoji/facebook_messenger/motorboat.png b/public/images/emoji/facebook_messenger/motorboat.png
new file mode 100644
index 00000000000..3eba365766f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/motorboat.png differ
diff --git a/public/images/emoji/facebook_messenger/motorcycle.png b/public/images/emoji/facebook_messenger/motorcycle.png
new file mode 100644
index 00000000000..ba7fb373bad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/motorcycle.png differ
diff --git a/public/images/emoji/facebook_messenger/motorway.png b/public/images/emoji/facebook_messenger/motorway.png
new file mode 100644
index 00000000000..2d5622664b6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/motorway.png differ
diff --git a/public/images/emoji/facebook_messenger/mount_fuji.png b/public/images/emoji/facebook_messenger/mount_fuji.png
new file mode 100644
index 00000000000..e987911d265
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mount_fuji.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain.png b/public/images/emoji/facebook_messenger/mountain.png
new file mode 100644
index 00000000000..6b545f00584
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist.png b/public/images/emoji/facebook_messenger/mountain_bicyclist.png
new file mode 100644
index 00000000000..31e00446a8c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_bicyclist.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png
new file mode 100644
index 00000000000..19ecb982e3c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png
new file mode 100644
index 00000000000..0c96a1744f3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png
new file mode 100644
index 00000000000..a407ca499f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png
new file mode 100644
index 00000000000..1d87023abe9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png b/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png
new file mode 100644
index 00000000000..74eafbd22ed
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man.png b/public/images/emoji/facebook_messenger/mountain_biking_man.png
new file mode 100644
index 00000000000..31e00446a8c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/2.png b/public/images/emoji/facebook_messenger/mountain_biking_man/2.png
new file mode 100644
index 00000000000..19ecb982e3c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/3.png b/public/images/emoji/facebook_messenger/mountain_biking_man/3.png
new file mode 100644
index 00000000000..0c96a1744f3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/4.png b/public/images/emoji/facebook_messenger/mountain_biking_man/4.png
new file mode 100644
index 00000000000..a407ca499f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/5.png b/public/images/emoji/facebook_messenger/mountain_biking_man/5.png
new file mode 100644
index 00000000000..1d87023abe9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_man/6.png b/public/images/emoji/facebook_messenger/mountain_biking_man/6.png
new file mode 100644
index 00000000000..74eafbd22ed
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman.png b/public/images/emoji/facebook_messenger/mountain_biking_woman.png
new file mode 100644
index 00000000000..f752e9cdf3c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png
new file mode 100644
index 00000000000..78e8c2577b8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png
new file mode 100644
index 00000000000..2e4e5a891d4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png
new file mode 100644
index 00000000000..ee9fd92c8d7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png
new file mode 100644
index 00000000000..6f663ca4c08
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png b/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png
new file mode 100644
index 00000000000..f49e7054c91
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_cableway.png b/public/images/emoji/facebook_messenger/mountain_cableway.png
new file mode 100644
index 00000000000..e2423930304
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_cableway.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_railway.png b/public/images/emoji/facebook_messenger/mountain_railway.png
new file mode 100644
index 00000000000..eee5c10a52d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_railway.png differ
diff --git a/public/images/emoji/facebook_messenger/mountain_snow.png b/public/images/emoji/facebook_messenger/mountain_snow.png
new file mode 100644
index 00000000000..b3e246f09b9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mountain_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/mouse.png b/public/images/emoji/facebook_messenger/mouse.png
new file mode 100644
index 00000000000..8e52012ef31
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mouse.png differ
diff --git a/public/images/emoji/facebook_messenger/mouse2.png b/public/images/emoji/facebook_messenger/mouse2.png
new file mode 100644
index 00000000000..08163d834a6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mouse2.png differ
diff --git a/public/images/emoji/facebook_messenger/mouse_three_button.png b/public/images/emoji/facebook_messenger/mouse_three_button.png
new file mode 100644
index 00000000000..3a71c800c68
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mouse_three_button.png differ
diff --git a/public/images/emoji/facebook_messenger/movie_camera.png b/public/images/emoji/facebook_messenger/movie_camera.png
new file mode 100644
index 00000000000..e074b30c839
Binary files /dev/null and b/public/images/emoji/facebook_messenger/movie_camera.png differ
diff --git a/public/images/emoji/facebook_messenger/moyai.png b/public/images/emoji/facebook_messenger/moyai.png
new file mode 100644
index 00000000000..454250431e6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/moyai.png differ
diff --git a/public/images/emoji/facebook_messenger/mozambique.png b/public/images/emoji/facebook_messenger/mozambique.png
new file mode 100644
index 00000000000..07d5cd56f0e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mozambique.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus.png b/public/images/emoji/facebook_messenger/mrs_claus.png
new file mode 100644
index 00000000000..1923fbd8e93
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mrs_claus.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/2.png b/public/images/emoji/facebook_messenger/mrs_claus/2.png
new file mode 100644
index 00000000000..a6e57fc30b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mrs_claus/2.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/3.png b/public/images/emoji/facebook_messenger/mrs_claus/3.png
new file mode 100644
index 00000000000..48e81212564
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mrs_claus/3.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/4.png b/public/images/emoji/facebook_messenger/mrs_claus/4.png
new file mode 100644
index 00000000000..cdefbc93405
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mrs_claus/4.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/5.png b/public/images/emoji/facebook_messenger/mrs_claus/5.png
new file mode 100644
index 00000000000..de7de0327ab
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mrs_claus/5.png differ
diff --git a/public/images/emoji/facebook_messenger/mrs_claus/6.png b/public/images/emoji/facebook_messenger/mrs_claus/6.png
new file mode 100644
index 00000000000..25324ab4205
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mrs_claus/6.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle.png b/public/images/emoji/facebook_messenger/muscle.png
new file mode 100644
index 00000000000..756a72d513a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/muscle.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/2.png b/public/images/emoji/facebook_messenger/muscle/2.png
new file mode 100644
index 00000000000..305d54c21b8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/muscle/2.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/3.png b/public/images/emoji/facebook_messenger/muscle/3.png
new file mode 100644
index 00000000000..e8ebb0250a1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/muscle/3.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/4.png b/public/images/emoji/facebook_messenger/muscle/4.png
new file mode 100644
index 00000000000..83ba3d4bfde
Binary files /dev/null and b/public/images/emoji/facebook_messenger/muscle/4.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/5.png b/public/images/emoji/facebook_messenger/muscle/5.png
new file mode 100644
index 00000000000..eb0d6edff46
Binary files /dev/null and b/public/images/emoji/facebook_messenger/muscle/5.png differ
diff --git a/public/images/emoji/facebook_messenger/muscle/6.png b/public/images/emoji/facebook_messenger/muscle/6.png
new file mode 100644
index 00000000000..ddd35e74784
Binary files /dev/null and b/public/images/emoji/facebook_messenger/muscle/6.png differ
diff --git a/public/images/emoji/facebook_messenger/mushroom.png b/public/images/emoji/facebook_messenger/mushroom.png
new file mode 100644
index 00000000000..03d8b063f3b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mushroom.png differ
diff --git a/public/images/emoji/facebook_messenger/musical_keyboard.png b/public/images/emoji/facebook_messenger/musical_keyboard.png
new file mode 100644
index 00000000000..8248f6d20ce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/musical_keyboard.png differ
diff --git a/public/images/emoji/facebook_messenger/musical_note.png b/public/images/emoji/facebook_messenger/musical_note.png
new file mode 100644
index 00000000000..401fc305688
Binary files /dev/null and b/public/images/emoji/facebook_messenger/musical_note.png differ
diff --git a/public/images/emoji/facebook_messenger/musical_score.png b/public/images/emoji/facebook_messenger/musical_score.png
new file mode 100644
index 00000000000..1ccebe791d0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/musical_score.png differ
diff --git a/public/images/emoji/facebook_messenger/mute.png b/public/images/emoji/facebook_messenger/mute.png
new file mode 100644
index 00000000000..6f1b18791ad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/mute.png differ
diff --git a/public/images/emoji/facebook_messenger/myanmar.png b/public/images/emoji/facebook_messenger/myanmar.png
new file mode 100644
index 00000000000..345829e2a3e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/myanmar.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care.png b/public/images/emoji/facebook_messenger/nail_care.png
new file mode 100644
index 00000000000..be33983b208
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nail_care.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/2.png b/public/images/emoji/facebook_messenger/nail_care/2.png
new file mode 100644
index 00000000000..78df4c65649
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nail_care/2.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/3.png b/public/images/emoji/facebook_messenger/nail_care/3.png
new file mode 100644
index 00000000000..146f82f51de
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nail_care/3.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/4.png b/public/images/emoji/facebook_messenger/nail_care/4.png
new file mode 100644
index 00000000000..bcfc28f1be9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nail_care/4.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/5.png b/public/images/emoji/facebook_messenger/nail_care/5.png
new file mode 100644
index 00000000000..b4a35b65408
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nail_care/5.png differ
diff --git a/public/images/emoji/facebook_messenger/nail_care/6.png b/public/images/emoji/facebook_messenger/nail_care/6.png
new file mode 100644
index 00000000000..923baa7cd88
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nail_care/6.png differ
diff --git a/public/images/emoji/facebook_messenger/name_badge.png b/public/images/emoji/facebook_messenger/name_badge.png
new file mode 100644
index 00000000000..3aec1b2f8e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/name_badge.png differ
diff --git a/public/images/emoji/facebook_messenger/namibia.png b/public/images/emoji/facebook_messenger/namibia.png
new file mode 100644
index 00000000000..f505b371fd5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/namibia.png differ
diff --git a/public/images/emoji/facebook_messenger/national_park.png b/public/images/emoji/facebook_messenger/national_park.png
new file mode 100644
index 00000000000..db29d2dff96
Binary files /dev/null and b/public/images/emoji/facebook_messenger/national_park.png differ
diff --git a/public/images/emoji/facebook_messenger/nauru.png b/public/images/emoji/facebook_messenger/nauru.png
new file mode 100644
index 00000000000..443c1a5e935
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nauru.png differ
diff --git a/public/images/emoji/facebook_messenger/nauseated_face.png b/public/images/emoji/facebook_messenger/nauseated_face.png
new file mode 100644
index 00000000000..0ec48392c20
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nauseated_face.png differ
diff --git a/public/images/emoji/facebook_messenger/necktie.png b/public/images/emoji/facebook_messenger/necktie.png
new file mode 100644
index 00000000000..c872774b802
Binary files /dev/null and b/public/images/emoji/facebook_messenger/necktie.png differ
diff --git a/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png b/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png
new file mode 100644
index 00000000000..24a2cfa27d2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/nepal.png b/public/images/emoji/facebook_messenger/nepal.png
new file mode 100644
index 00000000000..cd57822d801
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nepal.png differ
diff --git a/public/images/emoji/facebook_messenger/nerd.png b/public/images/emoji/facebook_messenger/nerd.png
new file mode 100644
index 00000000000..b844baf25b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nerd.png differ
diff --git a/public/images/emoji/facebook_messenger/nerd_face.png b/public/images/emoji/facebook_messenger/nerd_face.png
new file mode 100644
index 00000000000..b844baf25b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nerd_face.png differ
diff --git a/public/images/emoji/facebook_messenger/netherlands.png b/public/images/emoji/facebook_messenger/netherlands.png
new file mode 100644
index 00000000000..b01d79e5ee4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/netherlands.png differ
diff --git a/public/images/emoji/facebook_messenger/neutral_face.png b/public/images/emoji/facebook_messenger/neutral_face.png
new file mode 100644
index 00000000000..e617f1227ad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/neutral_face.png differ
diff --git a/public/images/emoji/facebook_messenger/new.png b/public/images/emoji/facebook_messenger/new.png
new file mode 100644
index 00000000000..3def1bf7711
Binary files /dev/null and b/public/images/emoji/facebook_messenger/new.png differ
diff --git a/public/images/emoji/facebook_messenger/new_caledonia.png b/public/images/emoji/facebook_messenger/new_caledonia.png
new file mode 100644
index 00000000000..45914c48c7d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/new_caledonia.png differ
diff --git a/public/images/emoji/facebook_messenger/new_moon.png b/public/images/emoji/facebook_messenger/new_moon.png
new file mode 100644
index 00000000000..c20fb89b189
Binary files /dev/null and b/public/images/emoji/facebook_messenger/new_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/new_moon_with_face.png b/public/images/emoji/facebook_messenger/new_moon_with_face.png
new file mode 100644
index 00000000000..70599fc0db2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/new_moon_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/new_zealand.png b/public/images/emoji/facebook_messenger/new_zealand.png
new file mode 100644
index 00000000000..9d86ff873c4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/new_zealand.png differ
diff --git a/public/images/emoji/facebook_messenger/newspaper.png b/public/images/emoji/facebook_messenger/newspaper.png
new file mode 100644
index 00000000000..f0dd5da17e6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/newspaper.png differ
diff --git a/public/images/emoji/facebook_messenger/newspaper2.png b/public/images/emoji/facebook_messenger/newspaper2.png
new file mode 100644
index 00000000000..052dcce75f0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/newspaper2.png differ
diff --git a/public/images/emoji/facebook_messenger/newspaper_roll.png b/public/images/emoji/facebook_messenger/newspaper_roll.png
new file mode 100644
index 00000000000..052dcce75f0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/newspaper_roll.png differ
diff --git a/public/images/emoji/facebook_messenger/next_track.png b/public/images/emoji/facebook_messenger/next_track.png
new file mode 100644
index 00000000000..13953da5d7f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/next_track.png differ
diff --git a/public/images/emoji/facebook_messenger/next_track_button.png b/public/images/emoji/facebook_messenger/next_track_button.png
new file mode 100644
index 00000000000..13953da5d7f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/next_track_button.png differ
diff --git a/public/images/emoji/facebook_messenger/ng.png b/public/images/emoji/facebook_messenger/ng.png
new file mode 100644
index 00000000000..fbf8bf7d8e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ng.png differ
diff --git a/public/images/emoji/facebook_messenger/nicaragua.png b/public/images/emoji/facebook_messenger/nicaragua.png
new file mode 100644
index 00000000000..e405151e2d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nicaragua.png differ
diff --git a/public/images/emoji/facebook_messenger/niger.png b/public/images/emoji/facebook_messenger/niger.png
new file mode 100644
index 00000000000..fb6c4a4d372
Binary files /dev/null and b/public/images/emoji/facebook_messenger/niger.png differ
diff --git a/public/images/emoji/facebook_messenger/nigeria.png b/public/images/emoji/facebook_messenger/nigeria.png
new file mode 100644
index 00000000000..23c9d9a7627
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nigeria.png differ
diff --git a/public/images/emoji/facebook_messenger/night_with_stars.png b/public/images/emoji/facebook_messenger/night_with_stars.png
new file mode 100644
index 00000000000..8e42c84cad0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/night_with_stars.png differ
diff --git a/public/images/emoji/facebook_messenger/nine.png b/public/images/emoji/facebook_messenger/nine.png
new file mode 100644
index 00000000000..15cd82061e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nine.png differ
diff --git a/public/images/emoji/facebook_messenger/niue.png b/public/images/emoji/facebook_messenger/niue.png
new file mode 100644
index 00000000000..daaa26cc166
Binary files /dev/null and b/public/images/emoji/facebook_messenger/niue.png differ
diff --git a/public/images/emoji/facebook_messenger/no_bell.png b/public/images/emoji/facebook_messenger/no_bell.png
new file mode 100644
index 00000000000..30cc5f68ba3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_bell.png differ
diff --git a/public/images/emoji/facebook_messenger/no_bicycles.png b/public/images/emoji/facebook_messenger/no_bicycles.png
new file mode 100644
index 00000000000..81d14e9d8ba
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_bicycles.png differ
diff --git a/public/images/emoji/facebook_messenger/no_entry.png b/public/images/emoji/facebook_messenger/no_entry.png
new file mode 100644
index 00000000000..f3db9deb401
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_entry.png differ
diff --git a/public/images/emoji/facebook_messenger/no_entry_sign.png b/public/images/emoji/facebook_messenger/no_entry_sign.png
new file mode 100644
index 00000000000..930838c69bc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_entry_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good.png b/public/images/emoji/facebook_messenger/no_good.png
new file mode 100644
index 00000000000..1b39244154e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/2.png b/public/images/emoji/facebook_messenger/no_good/2.png
new file mode 100644
index 00000000000..ae600f93d1d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good/2.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/3.png b/public/images/emoji/facebook_messenger/no_good/3.png
new file mode 100644
index 00000000000..aaa680f7ab9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good/3.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/4.png b/public/images/emoji/facebook_messenger/no_good/4.png
new file mode 100644
index 00000000000..f96e628a3ad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good/4.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/5.png b/public/images/emoji/facebook_messenger/no_good/5.png
new file mode 100644
index 00000000000..10cf1a4bec4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good/5.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good/6.png b/public/images/emoji/facebook_messenger/no_good/6.png
new file mode 100644
index 00000000000..2bf5e240084
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good/6.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man.png b/public/images/emoji/facebook_messenger/no_good_man.png
new file mode 100644
index 00000000000..482a4698d1e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_man.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/2.png b/public/images/emoji/facebook_messenger/no_good_man/2.png
new file mode 100644
index 00000000000..faf146004d6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/3.png b/public/images/emoji/facebook_messenger/no_good_man/3.png
new file mode 100644
index 00000000000..27ba65f98b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/4.png b/public/images/emoji/facebook_messenger/no_good_man/4.png
new file mode 100644
index 00000000000..cb7608b4e9c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/5.png b/public/images/emoji/facebook_messenger/no_good_man/5.png
new file mode 100644
index 00000000000..6498b6f0827
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_man/6.png b/public/images/emoji/facebook_messenger/no_good_man/6.png
new file mode 100644
index 00000000000..0bac0f4cd47
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman.png b/public/images/emoji/facebook_messenger/no_good_woman.png
new file mode 100644
index 00000000000..1b39244154e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/2.png b/public/images/emoji/facebook_messenger/no_good_woman/2.png
new file mode 100644
index 00000000000..ae600f93d1d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/3.png b/public/images/emoji/facebook_messenger/no_good_woman/3.png
new file mode 100644
index 00000000000..aaa680f7ab9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/4.png b/public/images/emoji/facebook_messenger/no_good_woman/4.png
new file mode 100644
index 00000000000..f96e628a3ad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/5.png b/public/images/emoji/facebook_messenger/no_good_woman/5.png
new file mode 100644
index 00000000000..10cf1a4bec4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/no_good_woman/6.png b/public/images/emoji/facebook_messenger/no_good_woman/6.png
new file mode 100644
index 00000000000..2bf5e240084
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_good_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/no_mobile_phones.png b/public/images/emoji/facebook_messenger/no_mobile_phones.png
new file mode 100644
index 00000000000..26a54246de5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_mobile_phones.png differ
diff --git a/public/images/emoji/facebook_messenger/no_mouth.png b/public/images/emoji/facebook_messenger/no_mouth.png
new file mode 100644
index 00000000000..609faa8c373
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/no_pedestrians.png b/public/images/emoji/facebook_messenger/no_pedestrians.png
new file mode 100644
index 00000000000..afccb3291ff
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_pedestrians.png differ
diff --git a/public/images/emoji/facebook_messenger/no_smoking.png b/public/images/emoji/facebook_messenger/no_smoking.png
new file mode 100644
index 00000000000..06ff47b0a91
Binary files /dev/null and b/public/images/emoji/facebook_messenger/no_smoking.png differ
diff --git a/public/images/emoji/facebook_messenger/non-potable_water.png b/public/images/emoji/facebook_messenger/non-potable_water.png
new file mode 100644
index 00000000000..7efa68146e1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/non-potable_water.png differ
diff --git a/public/images/emoji/facebook_messenger/norfolk_island.png b/public/images/emoji/facebook_messenger/norfolk_island.png
new file mode 100644
index 00000000000..574acba1009
Binary files /dev/null and b/public/images/emoji/facebook_messenger/norfolk_island.png differ
diff --git a/public/images/emoji/facebook_messenger/north_korea.png b/public/images/emoji/facebook_messenger/north_korea.png
new file mode 100644
index 00000000000..d15d10aecec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/north_korea.png differ
diff --git a/public/images/emoji/facebook_messenger/northern_mariana_islands.png b/public/images/emoji/facebook_messenger/northern_mariana_islands.png
new file mode 100644
index 00000000000..962a6171b9c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/northern_mariana_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/norway.png b/public/images/emoji/facebook_messenger/norway.png
new file mode 100644
index 00000000000..3a2439e1505
Binary files /dev/null and b/public/images/emoji/facebook_messenger/norway.png differ
diff --git a/public/images/emoji/facebook_messenger/nose.png b/public/images/emoji/facebook_messenger/nose.png
new file mode 100644
index 00000000000..8f583249c5a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nose.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/2.png b/public/images/emoji/facebook_messenger/nose/2.png
new file mode 100644
index 00000000000..c61a3cd9b2b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nose/2.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/3.png b/public/images/emoji/facebook_messenger/nose/3.png
new file mode 100644
index 00000000000..5024bbcac6f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nose/3.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/4.png b/public/images/emoji/facebook_messenger/nose/4.png
new file mode 100644
index 00000000000..acc16c879d9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nose/4.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/5.png b/public/images/emoji/facebook_messenger/nose/5.png
new file mode 100644
index 00000000000..79221668f38
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nose/5.png differ
diff --git a/public/images/emoji/facebook_messenger/nose/6.png b/public/images/emoji/facebook_messenger/nose/6.png
new file mode 100644
index 00000000000..2b29d4ef609
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nose/6.png differ
diff --git a/public/images/emoji/facebook_messenger/notebook.png b/public/images/emoji/facebook_messenger/notebook.png
new file mode 100644
index 00000000000..30c97ad185a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/notebook.png differ
diff --git a/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png b/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png
new file mode 100644
index 00000000000..bfdf9849b5d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/facebook_messenger/notepad_spiral.png b/public/images/emoji/facebook_messenger/notepad_spiral.png
new file mode 100644
index 00000000000..b8ebfe080a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/notepad_spiral.png differ
diff --git a/public/images/emoji/facebook_messenger/notes.png b/public/images/emoji/facebook_messenger/notes.png
new file mode 100644
index 00000000000..ff9430ffdc0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/notes.png differ
diff --git a/public/images/emoji/facebook_messenger/nut_and_bolt.png b/public/images/emoji/facebook_messenger/nut_and_bolt.png
new file mode 100644
index 00000000000..ff4e024188e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/nut_and_bolt.png differ
diff --git a/public/images/emoji/facebook_messenger/o.png b/public/images/emoji/facebook_messenger/o.png
new file mode 100644
index 00000000000..65518db51fb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/o.png differ
diff --git a/public/images/emoji/facebook_messenger/o2.png b/public/images/emoji/facebook_messenger/o2.png
new file mode 100644
index 00000000000..7293a012e80
Binary files /dev/null and b/public/images/emoji/facebook_messenger/o2.png differ
diff --git a/public/images/emoji/facebook_messenger/ocean.png b/public/images/emoji/facebook_messenger/ocean.png
new file mode 100644
index 00000000000..f4ce329fce3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ocean.png differ
diff --git a/public/images/emoji/facebook_messenger/octopus.png b/public/images/emoji/facebook_messenger/octopus.png
new file mode 100644
index 00000000000..b6a1b5acbf8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/octopus.png differ
diff --git a/public/images/emoji/facebook_messenger/oden.png b/public/images/emoji/facebook_messenger/oden.png
new file mode 100644
index 00000000000..c497a79d04b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/oden.png differ
diff --git a/public/images/emoji/facebook_messenger/office.png b/public/images/emoji/facebook_messenger/office.png
new file mode 100644
index 00000000000..e231c280ac1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/office.png differ
diff --git a/public/images/emoji/facebook_messenger/oil.png b/public/images/emoji/facebook_messenger/oil.png
new file mode 100644
index 00000000000..7c6d9e728f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/oil.png differ
diff --git a/public/images/emoji/facebook_messenger/oil_drum.png b/public/images/emoji/facebook_messenger/oil_drum.png
new file mode 100644
index 00000000000..7c6d9e728f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/oil_drum.png differ
diff --git a/public/images/emoji/facebook_messenger/ok.png b/public/images/emoji/facebook_messenger/ok.png
new file mode 100644
index 00000000000..200b86672b1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand.png b/public/images/emoji/facebook_messenger/ok_hand.png
new file mode 100644
index 00000000000..e1d5e568ae9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/2.png b/public/images/emoji/facebook_messenger/ok_hand/2.png
new file mode 100644
index 00000000000..e7fc3a26ca9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/3.png b/public/images/emoji/facebook_messenger/ok_hand/3.png
new file mode 100644
index 00000000000..963f15614e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/4.png b/public/images/emoji/facebook_messenger/ok_hand/4.png
new file mode 100644
index 00000000000..93c785d3e18
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/5.png b/public/images/emoji/facebook_messenger/ok_hand/5.png
new file mode 100644
index 00000000000..57dfe1cdc47
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_hand/6.png b/public/images/emoji/facebook_messenger/ok_hand/6.png
new file mode 100644
index 00000000000..428fa0ef4f7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man.png b/public/images/emoji/facebook_messenger/ok_man.png
new file mode 100644
index 00000000000..a409be9d6e3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_man.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/2.png b/public/images/emoji/facebook_messenger/ok_man/2.png
new file mode 100644
index 00000000000..a053dbd980e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/3.png b/public/images/emoji/facebook_messenger/ok_man/3.png
new file mode 100644
index 00000000000..e16633321f5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/4.png b/public/images/emoji/facebook_messenger/ok_man/4.png
new file mode 100644
index 00000000000..4634976b5e4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/5.png b/public/images/emoji/facebook_messenger/ok_man/5.png
new file mode 100644
index 00000000000..f0003c09eb6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_man/6.png b/public/images/emoji/facebook_messenger/ok_man/6.png
new file mode 100644
index 00000000000..39c7357546e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman.png b/public/images/emoji/facebook_messenger/ok_woman.png
new file mode 100644
index 00000000000..e5ed37b4391
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/2.png b/public/images/emoji/facebook_messenger/ok_woman/2.png
new file mode 100644
index 00000000000..11e28436c08
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/3.png b/public/images/emoji/facebook_messenger/ok_woman/3.png
new file mode 100644
index 00000000000..4d341255eee
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/4.png b/public/images/emoji/facebook_messenger/ok_woman/4.png
new file mode 100644
index 00000000000..b6dc29569ab
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/5.png b/public/images/emoji/facebook_messenger/ok_woman/5.png
new file mode 100644
index 00000000000..df017318692
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/ok_woman/6.png b/public/images/emoji/facebook_messenger/ok_woman/6.png
new file mode 100644
index 00000000000..825602b97d3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ok_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/old_key.png b/public/images/emoji/facebook_messenger/old_key.png
new file mode 100644
index 00000000000..18b93994322
Binary files /dev/null and b/public/images/emoji/facebook_messenger/old_key.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult.png b/public/images/emoji/facebook_messenger/older_adult.png
new file mode 100644
index 00000000000..8796829b876
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_adult.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/2.png b/public/images/emoji/facebook_messenger/older_adult/2.png
new file mode 100644
index 00000000000..b36f41960e7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_adult/2.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/3.png b/public/images/emoji/facebook_messenger/older_adult/3.png
new file mode 100644
index 00000000000..dc1441fea56
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_adult/3.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/4.png b/public/images/emoji/facebook_messenger/older_adult/4.png
new file mode 100644
index 00000000000..abc19e06c74
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_adult/4.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/5.png b/public/images/emoji/facebook_messenger/older_adult/5.png
new file mode 100644
index 00000000000..c90549f6813
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_adult/5.png differ
diff --git a/public/images/emoji/facebook_messenger/older_adult/6.png b/public/images/emoji/facebook_messenger/older_adult/6.png
new file mode 100644
index 00000000000..5152c9c1a3e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_adult/6.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man.png b/public/images/emoji/facebook_messenger/older_man.png
new file mode 100644
index 00000000000..47e7cef9993
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_man.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/2.png b/public/images/emoji/facebook_messenger/older_man/2.png
new file mode 100644
index 00000000000..2fb0c5a7e5a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/3.png b/public/images/emoji/facebook_messenger/older_man/3.png
new file mode 100644
index 00000000000..7e4e62a615f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/4.png b/public/images/emoji/facebook_messenger/older_man/4.png
new file mode 100644
index 00000000000..2414ae1dfe1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/5.png b/public/images/emoji/facebook_messenger/older_man/5.png
new file mode 100644
index 00000000000..7f3d54e6895
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/older_man/6.png b/public/images/emoji/facebook_messenger/older_man/6.png
new file mode 100644
index 00000000000..07eb64ff158
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman.png b/public/images/emoji/facebook_messenger/older_woman.png
new file mode 100644
index 00000000000..02e8230771c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/2.png b/public/images/emoji/facebook_messenger/older_woman/2.png
new file mode 100644
index 00000000000..8e4a01cfccf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/3.png b/public/images/emoji/facebook_messenger/older_woman/3.png
new file mode 100644
index 00000000000..4f8be8c914b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/4.png b/public/images/emoji/facebook_messenger/older_woman/4.png
new file mode 100644
index 00000000000..0d7aa5e0d9a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/5.png b/public/images/emoji/facebook_messenger/older_woman/5.png
new file mode 100644
index 00000000000..41f7e664386
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/older_woman/6.png b/public/images/emoji/facebook_messenger/older_woman/6.png
new file mode 100644
index 00000000000..6de06114965
Binary files /dev/null and b/public/images/emoji/facebook_messenger/older_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/om.png b/public/images/emoji/facebook_messenger/om.png
new file mode 100644
index 00000000000..bcd7113141c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/om.png differ
diff --git a/public/images/emoji/facebook_messenger/om_symbol.png b/public/images/emoji/facebook_messenger/om_symbol.png
new file mode 100644
index 00000000000..bcd7113141c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/om_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/oman.png b/public/images/emoji/facebook_messenger/oman.png
new file mode 100644
index 00000000000..59e0df087e4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/oman.png differ
diff --git a/public/images/emoji/facebook_messenger/on.png b/public/images/emoji/facebook_messenger/on.png
new file mode 100644
index 00000000000..bd14ab9d486
Binary files /dev/null and b/public/images/emoji/facebook_messenger/on.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_automobile.png b/public/images/emoji/facebook_messenger/oncoming_automobile.png
new file mode 100644
index 00000000000..024cdb23b51
Binary files /dev/null and b/public/images/emoji/facebook_messenger/oncoming_automobile.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_bus.png b/public/images/emoji/facebook_messenger/oncoming_bus.png
new file mode 100644
index 00000000000..19dfdd08c5c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/oncoming_bus.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_police_car.png b/public/images/emoji/facebook_messenger/oncoming_police_car.png
new file mode 100644
index 00000000000..cacce06c49d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/oncoming_police_car.png differ
diff --git a/public/images/emoji/facebook_messenger/oncoming_taxi.png b/public/images/emoji/facebook_messenger/oncoming_taxi.png
new file mode 100644
index 00000000000..c3d11c9bb82
Binary files /dev/null and b/public/images/emoji/facebook_messenger/oncoming_taxi.png differ
diff --git a/public/images/emoji/facebook_messenger/one.png b/public/images/emoji/facebook_messenger/one.png
new file mode 100644
index 00000000000..8cf9c776565
Binary files /dev/null and b/public/images/emoji/facebook_messenger/one.png differ
diff --git a/public/images/emoji/facebook_messenger/open_book.png b/public/images/emoji/facebook_messenger/open_book.png
new file mode 100644
index 00000000000..466a96d4dc2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/open_book.png differ
diff --git a/public/images/emoji/facebook_messenger/open_file_folder.png b/public/images/emoji/facebook_messenger/open_file_folder.png
new file mode 100644
index 00000000000..1c7e6b1be08
Binary files /dev/null and b/public/images/emoji/facebook_messenger/open_file_folder.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands.png b/public/images/emoji/facebook_messenger/open_hands.png
new file mode 100644
index 00000000000..a85e8a6c4bb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/open_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/2.png b/public/images/emoji/facebook_messenger/open_hands/2.png
new file mode 100644
index 00000000000..c45027d8ad4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/open_hands/2.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/3.png b/public/images/emoji/facebook_messenger/open_hands/3.png
new file mode 100644
index 00000000000..0422b884348
Binary files /dev/null and b/public/images/emoji/facebook_messenger/open_hands/3.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/4.png b/public/images/emoji/facebook_messenger/open_hands/4.png
new file mode 100644
index 00000000000..d36a5224386
Binary files /dev/null and b/public/images/emoji/facebook_messenger/open_hands/4.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/5.png b/public/images/emoji/facebook_messenger/open_hands/5.png
new file mode 100644
index 00000000000..0e41b410c5d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/open_hands/5.png differ
diff --git a/public/images/emoji/facebook_messenger/open_hands/6.png b/public/images/emoji/facebook_messenger/open_hands/6.png
new file mode 100644
index 00000000000..473c50cb3d8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/open_hands/6.png differ
diff --git a/public/images/emoji/facebook_messenger/open_mouth.png b/public/images/emoji/facebook_messenger/open_mouth.png
new file mode 100644
index 00000000000..5857e8dcca3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/open_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/open_umbrella.png b/public/images/emoji/facebook_messenger/open_umbrella.png
new file mode 100644
index 00000000000..ec99aeb164e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/open_umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/ophiuchus.png b/public/images/emoji/facebook_messenger/ophiuchus.png
new file mode 100644
index 00000000000..785022965e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ophiuchus.png differ
diff --git a/public/images/emoji/facebook_messenger/orange_book.png b/public/images/emoji/facebook_messenger/orange_book.png
new file mode 100644
index 00000000000..f740242a401
Binary files /dev/null and b/public/images/emoji/facebook_messenger/orange_book.png differ
diff --git a/public/images/emoji/facebook_messenger/orange_heart.png b/public/images/emoji/facebook_messenger/orange_heart.png
new file mode 100644
index 00000000000..f217c930a74
Binary files /dev/null and b/public/images/emoji/facebook_messenger/orange_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/orthodox_cross.png b/public/images/emoji/facebook_messenger/orthodox_cross.png
new file mode 100644
index 00000000000..5b398f5cf28
Binary files /dev/null and b/public/images/emoji/facebook_messenger/orthodox_cross.png differ
diff --git a/public/images/emoji/facebook_messenger/outbox_tray.png b/public/images/emoji/facebook_messenger/outbox_tray.png
new file mode 100644
index 00000000000..3749f9e0c56
Binary files /dev/null and b/public/images/emoji/facebook_messenger/outbox_tray.png differ
diff --git a/public/images/emoji/facebook_messenger/owl.png b/public/images/emoji/facebook_messenger/owl.png
new file mode 100644
index 00000000000..905115e7122
Binary files /dev/null and b/public/images/emoji/facebook_messenger/owl.png differ
diff --git a/public/images/emoji/facebook_messenger/ox.png b/public/images/emoji/facebook_messenger/ox.png
new file mode 100644
index 00000000000..f1389ed7656
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ox.png differ
diff --git a/public/images/emoji/facebook_messenger/package.png b/public/images/emoji/facebook_messenger/package.png
new file mode 100644
index 00000000000..5252e91f82d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/package.png differ
diff --git a/public/images/emoji/facebook_messenger/page_facing_up.png b/public/images/emoji/facebook_messenger/page_facing_up.png
new file mode 100644
index 00000000000..a3e3e6dac9a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/page_facing_up.png differ
diff --git a/public/images/emoji/facebook_messenger/page_with_curl.png b/public/images/emoji/facebook_messenger/page_with_curl.png
new file mode 100644
index 00000000000..1b6042549f9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/page_with_curl.png differ
diff --git a/public/images/emoji/facebook_messenger/pager.png b/public/images/emoji/facebook_messenger/pager.png
new file mode 100644
index 00000000000..9e3cb953032
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pager.png differ
diff --git a/public/images/emoji/facebook_messenger/paintbrush.png b/public/images/emoji/facebook_messenger/paintbrush.png
new file mode 100644
index 00000000000..c7d649a3781
Binary files /dev/null and b/public/images/emoji/facebook_messenger/paintbrush.png differ
diff --git a/public/images/emoji/facebook_messenger/pakistan.png b/public/images/emoji/facebook_messenger/pakistan.png
new file mode 100644
index 00000000000..f4c74d1d49c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pakistan.png differ
diff --git a/public/images/emoji/facebook_messenger/palau.png b/public/images/emoji/facebook_messenger/palau.png
new file mode 100644
index 00000000000..69aace7555f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/palau.png differ
diff --git a/public/images/emoji/facebook_messenger/palestinian_territories.png b/public/images/emoji/facebook_messenger/palestinian_territories.png
new file mode 100644
index 00000000000..2e4399d7627
Binary files /dev/null and b/public/images/emoji/facebook_messenger/palestinian_territories.png differ
diff --git a/public/images/emoji/facebook_messenger/palm_tree.png b/public/images/emoji/facebook_messenger/palm_tree.png
new file mode 100644
index 00000000000..8644ca6a57b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/palm_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together.png b/public/images/emoji/facebook_messenger/palms_up_together.png
new file mode 100644
index 00000000000..fb66ba11c40
Binary files /dev/null and b/public/images/emoji/facebook_messenger/palms_up_together.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/2.png b/public/images/emoji/facebook_messenger/palms_up_together/2.png
new file mode 100644
index 00000000000..6d9b2fc8ccd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/palms_up_together/2.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/3.png b/public/images/emoji/facebook_messenger/palms_up_together/3.png
new file mode 100644
index 00000000000..c5d52f5c7a7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/palms_up_together/3.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/4.png b/public/images/emoji/facebook_messenger/palms_up_together/4.png
new file mode 100644
index 00000000000..3d4288d10db
Binary files /dev/null and b/public/images/emoji/facebook_messenger/palms_up_together/4.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/5.png b/public/images/emoji/facebook_messenger/palms_up_together/5.png
new file mode 100644
index 00000000000..6ff36c07cbd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/palms_up_together/5.png differ
diff --git a/public/images/emoji/facebook_messenger/palms_up_together/6.png b/public/images/emoji/facebook_messenger/palms_up_together/6.png
new file mode 100644
index 00000000000..c25d42927d8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/palms_up_together/6.png differ
diff --git a/public/images/emoji/facebook_messenger/panama.png b/public/images/emoji/facebook_messenger/panama.png
new file mode 100644
index 00000000000..2a564db4266
Binary files /dev/null and b/public/images/emoji/facebook_messenger/panama.png differ
diff --git a/public/images/emoji/facebook_messenger/pancakes.png b/public/images/emoji/facebook_messenger/pancakes.png
new file mode 100644
index 00000000000..ebd14eecd02
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pancakes.png differ
diff --git a/public/images/emoji/facebook_messenger/panda_face.png b/public/images/emoji/facebook_messenger/panda_face.png
new file mode 100644
index 00000000000..328e9216193
Binary files /dev/null and b/public/images/emoji/facebook_messenger/panda_face.png differ
diff --git a/public/images/emoji/facebook_messenger/paperclip.png b/public/images/emoji/facebook_messenger/paperclip.png
new file mode 100644
index 00000000000..42329aa2d2a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/paperclip.png differ
diff --git a/public/images/emoji/facebook_messenger/paperclips.png b/public/images/emoji/facebook_messenger/paperclips.png
new file mode 100644
index 00000000000..b4080878f68
Binary files /dev/null and b/public/images/emoji/facebook_messenger/paperclips.png differ
diff --git a/public/images/emoji/facebook_messenger/papua_new_guinea.png b/public/images/emoji/facebook_messenger/papua_new_guinea.png
new file mode 100644
index 00000000000..b449d67794a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/papua_new_guinea.png differ
diff --git a/public/images/emoji/facebook_messenger/paraguay.png b/public/images/emoji/facebook_messenger/paraguay.png
new file mode 100644
index 00000000000..d9eab9434ce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/paraguay.png differ
diff --git a/public/images/emoji/facebook_messenger/parasol_on_ground.png b/public/images/emoji/facebook_messenger/parasol_on_ground.png
new file mode 100644
index 00000000000..2bb23697b7f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/parasol_on_ground.png differ
diff --git a/public/images/emoji/facebook_messenger/park.png b/public/images/emoji/facebook_messenger/park.png
new file mode 100644
index 00000000000..db29d2dff96
Binary files /dev/null and b/public/images/emoji/facebook_messenger/park.png differ
diff --git a/public/images/emoji/facebook_messenger/parking.png b/public/images/emoji/facebook_messenger/parking.png
new file mode 100644
index 00000000000..49ea56e3224
Binary files /dev/null and b/public/images/emoji/facebook_messenger/parking.png differ
diff --git a/public/images/emoji/facebook_messenger/part_alternation_mark.png b/public/images/emoji/facebook_messenger/part_alternation_mark.png
new file mode 100644
index 00000000000..e1bf14a9476
Binary files /dev/null and b/public/images/emoji/facebook_messenger/part_alternation_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/partly_sunny.png b/public/images/emoji/facebook_messenger/partly_sunny.png
new file mode 100644
index 00000000000..51953bf6959
Binary files /dev/null and b/public/images/emoji/facebook_messenger/partly_sunny.png differ
diff --git a/public/images/emoji/facebook_messenger/passenger_ship.png b/public/images/emoji/facebook_messenger/passenger_ship.png
new file mode 100644
index 00000000000..b1ee5613467
Binary files /dev/null and b/public/images/emoji/facebook_messenger/passenger_ship.png differ
diff --git a/public/images/emoji/facebook_messenger/passport_control.png b/public/images/emoji/facebook_messenger/passport_control.png
new file mode 100644
index 00000000000..87ab1cb24e7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/passport_control.png differ
diff --git a/public/images/emoji/facebook_messenger/pause_button.png b/public/images/emoji/facebook_messenger/pause_button.png
new file mode 100644
index 00000000000..624e2df7118
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pause_button.png differ
diff --git a/public/images/emoji/facebook_messenger/paw_prints.png b/public/images/emoji/facebook_messenger/paw_prints.png
new file mode 100644
index 00000000000..ccd6e7503e1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/paw_prints.png differ
diff --git a/public/images/emoji/facebook_messenger/peace.png b/public/images/emoji/facebook_messenger/peace.png
new file mode 100644
index 00000000000..4eeaef2b556
Binary files /dev/null and b/public/images/emoji/facebook_messenger/peace.png differ
diff --git a/public/images/emoji/facebook_messenger/peace_symbol.png b/public/images/emoji/facebook_messenger/peace_symbol.png
new file mode 100644
index 00000000000..4eeaef2b556
Binary files /dev/null and b/public/images/emoji/facebook_messenger/peace_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/peach.png b/public/images/emoji/facebook_messenger/peach.png
new file mode 100644
index 00000000000..30e37f15888
Binary files /dev/null and b/public/images/emoji/facebook_messenger/peach.png differ
diff --git a/public/images/emoji/facebook_messenger/peanuts.png b/public/images/emoji/facebook_messenger/peanuts.png
new file mode 100644
index 00000000000..34f4eed2d5f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/peanuts.png differ
diff --git a/public/images/emoji/facebook_messenger/pear.png b/public/images/emoji/facebook_messenger/pear.png
new file mode 100644
index 00000000000..b1ec7e04ec0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pear.png differ
diff --git a/public/images/emoji/facebook_messenger/pen.png b/public/images/emoji/facebook_messenger/pen.png
new file mode 100644
index 00000000000..6219ae26cc1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pen.png differ
diff --git a/public/images/emoji/facebook_messenger/pen_ballpoint.png b/public/images/emoji/facebook_messenger/pen_ballpoint.png
new file mode 100644
index 00000000000..6219ae26cc1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pen_ballpoint.png differ
diff --git a/public/images/emoji/facebook_messenger/pen_fountain.png b/public/images/emoji/facebook_messenger/pen_fountain.png
new file mode 100644
index 00000000000..96584c9f579
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pen_fountain.png differ
diff --git a/public/images/emoji/facebook_messenger/pencil.png b/public/images/emoji/facebook_messenger/pencil.png
new file mode 100644
index 00000000000..8a9a0a4d8cf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pencil.png differ
diff --git a/public/images/emoji/facebook_messenger/pencil2.png b/public/images/emoji/facebook_messenger/pencil2.png
new file mode 100644
index 00000000000..2f90e4ed7da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pencil2.png differ
diff --git a/public/images/emoji/facebook_messenger/penguin.png b/public/images/emoji/facebook_messenger/penguin.png
new file mode 100644
index 00000000000..6936f1c999f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/penguin.png differ
diff --git a/public/images/emoji/facebook_messenger/pensive.png b/public/images/emoji/facebook_messenger/pensive.png
new file mode 100644
index 00000000000..f72ca15c11e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pensive.png differ
diff --git a/public/images/emoji/facebook_messenger/performing_arts.png b/public/images/emoji/facebook_messenger/performing_arts.png
new file mode 100644
index 00000000000..08d06a7377d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/performing_arts.png differ
diff --git a/public/images/emoji/facebook_messenger/persevere.png b/public/images/emoji/facebook_messenger/persevere.png
new file mode 100644
index 00000000000..741dec170ce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/persevere.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing.png b/public/images/emoji/facebook_messenger/person_climbing.png
new file mode 100644
index 00000000000..d8a6229d6b9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_climbing.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/2.png b/public/images/emoji/facebook_messenger/person_climbing/2.png
new file mode 100644
index 00000000000..71330d66a8c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_climbing/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/3.png b/public/images/emoji/facebook_messenger/person_climbing/3.png
new file mode 100644
index 00000000000..a1345ecbd25
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_climbing/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/4.png b/public/images/emoji/facebook_messenger/person_climbing/4.png
new file mode 100644
index 00000000000..016b920bcde
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_climbing/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/5.png b/public/images/emoji/facebook_messenger/person_climbing/5.png
new file mode 100644
index 00000000000..4591eb52904
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_climbing/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_climbing/6.png b/public/images/emoji/facebook_messenger/person_climbing/6.png
new file mode 100644
index 00000000000..19be3236ae9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_climbing/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_fencing.png b/public/images/emoji/facebook_messenger/person_fencing.png
new file mode 100644
index 00000000000..064b747aaec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_fencing.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning.png b/public/images/emoji/facebook_messenger/person_frowning.png
new file mode 100644
index 00000000000..1e5f89e7b57
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_frowning.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/2.png b/public/images/emoji/facebook_messenger/person_frowning/2.png
new file mode 100644
index 00000000000..db018f2e812
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_frowning/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/3.png b/public/images/emoji/facebook_messenger/person_frowning/3.png
new file mode 100644
index 00000000000..2a32b70d58a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_frowning/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/4.png b/public/images/emoji/facebook_messenger/person_frowning/4.png
new file mode 100644
index 00000000000..824a0bea02b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_frowning/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/5.png b/public/images/emoji/facebook_messenger/person_frowning/5.png
new file mode 100644
index 00000000000..ca476ecf1f3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_frowning/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_frowning/6.png b/public/images/emoji/facebook_messenger/person_frowning/6.png
new file mode 100644
index 00000000000..c36b369e0b8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_frowning/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position.png b/public/images/emoji/facebook_messenger/person_in_lotus_position.png
new file mode 100644
index 00000000000..e9404fd5255
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_lotus_position.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png
new file mode 100644
index 00000000000..8817578cf09
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png
new file mode 100644
index 00000000000..0e9bf46e0b6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png
new file mode 100644
index 00000000000..918e3d435a2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png
new file mode 100644
index 00000000000..0c01143530e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png b/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png
new file mode 100644
index 00000000000..fed226dac29
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room.png b/public/images/emoji/facebook_messenger/person_in_steamy_room.png
new file mode 100644
index 00000000000..65a0790d926
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_steamy_room.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png
new file mode 100644
index 00000000000..7260df1d154
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png
new file mode 100644
index 00000000000..d14580a3db3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png
new file mode 100644
index 00000000000..9313ab2116b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png
new file mode 100644
index 00000000000..f432b554b37
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png b/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png
new file mode 100644
index 00000000000..dc7087e0284
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball.png b/public/images/emoji/facebook_messenger/person_with_ball.png
new file mode 100644
index 00000000000..ac6a6c2c9f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/2.png b/public/images/emoji/facebook_messenger/person_with_ball/2.png
new file mode 100644
index 00000000000..4dad1da7dbe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_ball/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/3.png b/public/images/emoji/facebook_messenger/person_with_ball/3.png
new file mode 100644
index 00000000000..739f1de58c0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_ball/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/4.png b/public/images/emoji/facebook_messenger/person_with_ball/4.png
new file mode 100644
index 00000000000..62a23de4665
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_ball/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/5.png b/public/images/emoji/facebook_messenger/person_with_ball/5.png
new file mode 100644
index 00000000000..2cd9628b760
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_ball/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_ball/6.png b/public/images/emoji/facebook_messenger/person_with_ball/6.png
new file mode 100644
index 00000000000..85bfaeb5785
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_ball/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair.png b/public/images/emoji/facebook_messenger/person_with_blond_hair.png
new file mode 100644
index 00000000000..cfe7273eb3a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_blond_hair.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png
new file mode 100644
index 00000000000..aee96b85a74
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png
new file mode 100644
index 00000000000..b4fffd5a303
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png
new file mode 100644
index 00000000000..d8d6a0de15e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png
new file mode 100644
index 00000000000..6a573ffb48a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png b/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png
new file mode 100644
index 00000000000..1cefe68636a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face.png b/public/images/emoji/facebook_messenger/person_with_pouting_face.png
new file mode 100644
index 00000000000..038973f9400
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_pouting_face.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png
new file mode 100644
index 00000000000..65473cdbce9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png
new file mode 100644
index 00000000000..82e31162c07
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png
new file mode 100644
index 00000000000..838df0d6569
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png
new file mode 100644
index 00000000000..cedf79afd20
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png b/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png
new file mode 100644
index 00000000000..7bb2a217dbc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/facebook_messenger/peru.png b/public/images/emoji/facebook_messenger/peru.png
new file mode 100644
index 00000000000..bbb5523f939
Binary files /dev/null and b/public/images/emoji/facebook_messenger/peru.png differ
diff --git a/public/images/emoji/facebook_messenger/philippines.png b/public/images/emoji/facebook_messenger/philippines.png
new file mode 100644
index 00000000000..33fcf38a3ce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/philippines.png differ
diff --git a/public/images/emoji/facebook_messenger/phone.png b/public/images/emoji/facebook_messenger/phone.png
new file mode 100644
index 00000000000..b8bbec494d3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/phone.png differ
diff --git a/public/images/emoji/facebook_messenger/pick.png b/public/images/emoji/facebook_messenger/pick.png
new file mode 100644
index 00000000000..cc216bfcae1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pick.png differ
diff --git a/public/images/emoji/facebook_messenger/pie.png b/public/images/emoji/facebook_messenger/pie.png
new file mode 100644
index 00000000000..4f5f474d82c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pie.png differ
diff --git a/public/images/emoji/facebook_messenger/pig.png b/public/images/emoji/facebook_messenger/pig.png
new file mode 100644
index 00000000000..f1785f8302c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pig.png differ
diff --git a/public/images/emoji/facebook_messenger/pig2.png b/public/images/emoji/facebook_messenger/pig2.png
new file mode 100644
index 00000000000..fe2fe97e23e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pig2.png differ
diff --git a/public/images/emoji/facebook_messenger/pig_nose.png b/public/images/emoji/facebook_messenger/pig_nose.png
new file mode 100644
index 00000000000..d17e33d638f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pig_nose.png differ
diff --git a/public/images/emoji/facebook_messenger/pill.png b/public/images/emoji/facebook_messenger/pill.png
new file mode 100644
index 00000000000..70b65c6a31f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pill.png differ
diff --git a/public/images/emoji/facebook_messenger/pineapple.png b/public/images/emoji/facebook_messenger/pineapple.png
new file mode 100644
index 00000000000..3dbd743222e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pineapple.png differ
diff --git a/public/images/emoji/facebook_messenger/ping_pong.png b/public/images/emoji/facebook_messenger/ping_pong.png
new file mode 100644
index 00000000000..935993c8608
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ping_pong.png differ
diff --git a/public/images/emoji/facebook_messenger/pisces.png b/public/images/emoji/facebook_messenger/pisces.png
new file mode 100644
index 00000000000..628b9b0706b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pisces.png differ
diff --git a/public/images/emoji/facebook_messenger/pitcairn_islands.png b/public/images/emoji/facebook_messenger/pitcairn_islands.png
new file mode 100644
index 00000000000..3e3d79bca5c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pitcairn_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/pizza.png b/public/images/emoji/facebook_messenger/pizza.png
new file mode 100644
index 00000000000..5f34afb51d8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pizza.png differ
diff --git a/public/images/emoji/facebook_messenger/place_of_worship.png b/public/images/emoji/facebook_messenger/place_of_worship.png
new file mode 100644
index 00000000000..19e1150b303
Binary files /dev/null and b/public/images/emoji/facebook_messenger/place_of_worship.png differ
diff --git a/public/images/emoji/facebook_messenger/plate_with_cutlery.png b/public/images/emoji/facebook_messenger/plate_with_cutlery.png
new file mode 100644
index 00000000000..df63dcc4f4f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/plate_with_cutlery.png differ
diff --git a/public/images/emoji/facebook_messenger/play_or_pause_button.png b/public/images/emoji/facebook_messenger/play_or_pause_button.png
new file mode 100644
index 00000000000..64b99985414
Binary files /dev/null and b/public/images/emoji/facebook_messenger/play_or_pause_button.png differ
diff --git a/public/images/emoji/facebook_messenger/play_pause.png b/public/images/emoji/facebook_messenger/play_pause.png
new file mode 100644
index 00000000000..64b99985414
Binary files /dev/null and b/public/images/emoji/facebook_messenger/play_pause.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down.png b/public/images/emoji/facebook_messenger/point_down.png
new file mode 100644
index 00000000000..0532b9ae9c9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_down.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/2.png b/public/images/emoji/facebook_messenger/point_down/2.png
new file mode 100644
index 00000000000..d0b150916e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_down/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/3.png b/public/images/emoji/facebook_messenger/point_down/3.png
new file mode 100644
index 00000000000..6230cc4801e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_down/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/4.png b/public/images/emoji/facebook_messenger/point_down/4.png
new file mode 100644
index 00000000000..114adc6a210
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_down/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/5.png b/public/images/emoji/facebook_messenger/point_down/5.png
new file mode 100644
index 00000000000..0717726383a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_down/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_down/6.png b/public/images/emoji/facebook_messenger/point_down/6.png
new file mode 100644
index 00000000000..38d0116c827
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_down/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left.png b/public/images/emoji/facebook_messenger/point_left.png
new file mode 100644
index 00000000000..d4a84e5d312
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_left.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/2.png b/public/images/emoji/facebook_messenger/point_left/2.png
new file mode 100644
index 00000000000..d43212ff56d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_left/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/3.png b/public/images/emoji/facebook_messenger/point_left/3.png
new file mode 100644
index 00000000000..48753a68efd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_left/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/4.png b/public/images/emoji/facebook_messenger/point_left/4.png
new file mode 100644
index 00000000000..e5bda27630d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_left/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/5.png b/public/images/emoji/facebook_messenger/point_left/5.png
new file mode 100644
index 00000000000..51200df95ae
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_left/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_left/6.png b/public/images/emoji/facebook_messenger/point_left/6.png
new file mode 100644
index 00000000000..fd6c930fc82
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_left/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right.png b/public/images/emoji/facebook_messenger/point_right.png
new file mode 100644
index 00000000000..56f542c20ab
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_right.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/2.png b/public/images/emoji/facebook_messenger/point_right/2.png
new file mode 100644
index 00000000000..8e85edee2bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_right/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/3.png b/public/images/emoji/facebook_messenger/point_right/3.png
new file mode 100644
index 00000000000..5f8007ca82a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_right/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/4.png b/public/images/emoji/facebook_messenger/point_right/4.png
new file mode 100644
index 00000000000..4076a56aa18
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_right/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/5.png b/public/images/emoji/facebook_messenger/point_right/5.png
new file mode 100644
index 00000000000..7a2f0f80330
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_right/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_right/6.png b/public/images/emoji/facebook_messenger/point_right/6.png
new file mode 100644
index 00000000000..df280e5a7ec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_right/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up.png b/public/images/emoji/facebook_messenger/point_up.png
new file mode 100644
index 00000000000..fd27f92492e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/2.png b/public/images/emoji/facebook_messenger/point_up/2.png
new file mode 100644
index 00000000000..375079cacf9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/3.png b/public/images/emoji/facebook_messenger/point_up/3.png
new file mode 100644
index 00000000000..7087cdd806b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/4.png b/public/images/emoji/facebook_messenger/point_up/4.png
new file mode 100644
index 00000000000..22ceb6d0bd1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/5.png b/public/images/emoji/facebook_messenger/point_up/5.png
new file mode 100644
index 00000000000..4a7973ef638
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up/6.png b/public/images/emoji/facebook_messenger/point_up/6.png
new file mode 100644
index 00000000000..85cb47d273d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up/6.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2.png b/public/images/emoji/facebook_messenger/point_up_2.png
new file mode 100644
index 00000000000..ebf21760c65
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up_2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/2.png b/public/images/emoji/facebook_messenger/point_up_2/2.png
new file mode 100644
index 00000000000..b6d3fddfe68
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up_2/2.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/3.png b/public/images/emoji/facebook_messenger/point_up_2/3.png
new file mode 100644
index 00000000000..ba3389e362c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up_2/3.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/4.png b/public/images/emoji/facebook_messenger/point_up_2/4.png
new file mode 100644
index 00000000000..bce3cbdfa88
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up_2/4.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/5.png b/public/images/emoji/facebook_messenger/point_up_2/5.png
new file mode 100644
index 00000000000..71f95adf24e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up_2/5.png differ
diff --git a/public/images/emoji/facebook_messenger/point_up_2/6.png b/public/images/emoji/facebook_messenger/point_up_2/6.png
new file mode 100644
index 00000000000..7fc4a4877b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/point_up_2/6.png differ
diff --git a/public/images/emoji/facebook_messenger/poland.png b/public/images/emoji/facebook_messenger/poland.png
new file mode 100644
index 00000000000..78057f600c8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/poland.png differ
diff --git a/public/images/emoji/facebook_messenger/police_car.png b/public/images/emoji/facebook_messenger/police_car.png
new file mode 100644
index 00000000000..c77c1c05a8d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/police_car.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman.png b/public/images/emoji/facebook_messenger/policeman.png
new file mode 100644
index 00000000000..4efbb5500d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policeman.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/2.png b/public/images/emoji/facebook_messenger/policeman/2.png
new file mode 100644
index 00000000000..02f646d46fb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policeman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/3.png b/public/images/emoji/facebook_messenger/policeman/3.png
new file mode 100644
index 00000000000..fc0d621ff81
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policeman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/4.png b/public/images/emoji/facebook_messenger/policeman/4.png
new file mode 100644
index 00000000000..607565d83dd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policeman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/5.png b/public/images/emoji/facebook_messenger/policeman/5.png
new file mode 100644
index 00000000000..d54b5e01abd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policeman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/policeman/6.png b/public/images/emoji/facebook_messenger/policeman/6.png
new file mode 100644
index 00000000000..cc17ff14df0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policeman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman.png b/public/images/emoji/facebook_messenger/policewoman.png
new file mode 100644
index 00000000000..566f93771b3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policewoman.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/2.png b/public/images/emoji/facebook_messenger/policewoman/2.png
new file mode 100644
index 00000000000..f319e4af5db
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policewoman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/3.png b/public/images/emoji/facebook_messenger/policewoman/3.png
new file mode 100644
index 00000000000..c1652f098c4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policewoman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/4.png b/public/images/emoji/facebook_messenger/policewoman/4.png
new file mode 100644
index 00000000000..92fe65ff978
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policewoman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/5.png b/public/images/emoji/facebook_messenger/policewoman/5.png
new file mode 100644
index 00000000000..0bf22ab60db
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policewoman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/policewoman/6.png b/public/images/emoji/facebook_messenger/policewoman/6.png
new file mode 100644
index 00000000000..13ab6c5e904
Binary files /dev/null and b/public/images/emoji/facebook_messenger/policewoman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/poo.png b/public/images/emoji/facebook_messenger/poo.png
new file mode 100644
index 00000000000..e175a1dfffc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/poo.png differ
diff --git a/public/images/emoji/facebook_messenger/poodle.png b/public/images/emoji/facebook_messenger/poodle.png
new file mode 100644
index 00000000000..b9cad43ce13
Binary files /dev/null and b/public/images/emoji/facebook_messenger/poodle.png differ
diff --git a/public/images/emoji/facebook_messenger/poop.png b/public/images/emoji/facebook_messenger/poop.png
new file mode 100644
index 00000000000..e175a1dfffc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/poop.png differ
diff --git a/public/images/emoji/facebook_messenger/popcorn.png b/public/images/emoji/facebook_messenger/popcorn.png
new file mode 100644
index 00000000000..ccdc42f6c6c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/popcorn.png differ
diff --git a/public/images/emoji/facebook_messenger/portugal.png b/public/images/emoji/facebook_messenger/portugal.png
new file mode 100644
index 00000000000..77ff0993940
Binary files /dev/null and b/public/images/emoji/facebook_messenger/portugal.png differ
diff --git a/public/images/emoji/facebook_messenger/post_office.png b/public/images/emoji/facebook_messenger/post_office.png
new file mode 100644
index 00000000000..18aa7cdb7ae
Binary files /dev/null and b/public/images/emoji/facebook_messenger/post_office.png differ
diff --git a/public/images/emoji/facebook_messenger/postal_horn.png b/public/images/emoji/facebook_messenger/postal_horn.png
new file mode 100644
index 00000000000..9a03ae187c4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/postal_horn.png differ
diff --git a/public/images/emoji/facebook_messenger/postbox.png b/public/images/emoji/facebook_messenger/postbox.png
new file mode 100644
index 00000000000..2f590112183
Binary files /dev/null and b/public/images/emoji/facebook_messenger/postbox.png differ
diff --git a/public/images/emoji/facebook_messenger/potable_water.png b/public/images/emoji/facebook_messenger/potable_water.png
new file mode 100644
index 00000000000..220cacc7cbd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/potable_water.png differ
diff --git a/public/images/emoji/facebook_messenger/potato.png b/public/images/emoji/facebook_messenger/potato.png
new file mode 100644
index 00000000000..3f097365d9f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/potato.png differ
diff --git a/public/images/emoji/facebook_messenger/pouch.png b/public/images/emoji/facebook_messenger/pouch.png
new file mode 100644
index 00000000000..dd0ff200546
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouch.png differ
diff --git a/public/images/emoji/facebook_messenger/poultry_leg.png b/public/images/emoji/facebook_messenger/poultry_leg.png
new file mode 100644
index 00000000000..9c2d26a096b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/poultry_leg.png differ
diff --git a/public/images/emoji/facebook_messenger/pound.png b/public/images/emoji/facebook_messenger/pound.png
new file mode 100644
index 00000000000..8b25b67c8ec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pound.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_cat.png b/public/images/emoji/facebook_messenger/pouting_cat.png
new file mode 100644
index 00000000000..bebe99a8aad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man.png b/public/images/emoji/facebook_messenger/pouting_man.png
new file mode 100644
index 00000000000..c6392b40a64
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_man.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/2.png b/public/images/emoji/facebook_messenger/pouting_man/2.png
new file mode 100644
index 00000000000..b5f4f2999a6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/3.png b/public/images/emoji/facebook_messenger/pouting_man/3.png
new file mode 100644
index 00000000000..7ca74c419eb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/4.png b/public/images/emoji/facebook_messenger/pouting_man/4.png
new file mode 100644
index 00000000000..0e99fe45b11
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/5.png b/public/images/emoji/facebook_messenger/pouting_man/5.png
new file mode 100644
index 00000000000..91faf90cf59
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_man/6.png b/public/images/emoji/facebook_messenger/pouting_man/6.png
new file mode 100644
index 00000000000..07156230630
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman.png b/public/images/emoji/facebook_messenger/pouting_woman.png
new file mode 100644
index 00000000000..038973f9400
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/2.png b/public/images/emoji/facebook_messenger/pouting_woman/2.png
new file mode 100644
index 00000000000..65473cdbce9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/3.png b/public/images/emoji/facebook_messenger/pouting_woman/3.png
new file mode 100644
index 00000000000..82e31162c07
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/4.png b/public/images/emoji/facebook_messenger/pouting_woman/4.png
new file mode 100644
index 00000000000..838df0d6569
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/5.png b/public/images/emoji/facebook_messenger/pouting_woman/5.png
new file mode 100644
index 00000000000..cedf79afd20
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pouting_woman/6.png b/public/images/emoji/facebook_messenger/pouting_woman/6.png
new file mode 100644
index 00000000000..7bb2a217dbc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pouting_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/pray.png b/public/images/emoji/facebook_messenger/pray.png
new file mode 100644
index 00000000000..ef38e898582
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pray.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/2.png b/public/images/emoji/facebook_messenger/pray/2.png
new file mode 100644
index 00000000000..0d60a4c0e93
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pray/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/3.png b/public/images/emoji/facebook_messenger/pray/3.png
new file mode 100644
index 00000000000..11b9f064628
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pray/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/4.png b/public/images/emoji/facebook_messenger/pray/4.png
new file mode 100644
index 00000000000..ab26567ae26
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pray/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/5.png b/public/images/emoji/facebook_messenger/pray/5.png
new file mode 100644
index 00000000000..97ddc0f08bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pray/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pray/6.png b/public/images/emoji/facebook_messenger/pray/6.png
new file mode 100644
index 00000000000..bf6a32e3470
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pray/6.png differ
diff --git a/public/images/emoji/facebook_messenger/prayer_beads.png b/public/images/emoji/facebook_messenger/prayer_beads.png
new file mode 100644
index 00000000000..71d6e55ae05
Binary files /dev/null and b/public/images/emoji/facebook_messenger/prayer_beads.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman.png b/public/images/emoji/facebook_messenger/pregnant_woman.png
new file mode 100644
index 00000000000..d965748c88b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pregnant_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/2.png b/public/images/emoji/facebook_messenger/pregnant_woman/2.png
new file mode 100644
index 00000000000..5b633046347
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pregnant_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/3.png b/public/images/emoji/facebook_messenger/pregnant_woman/3.png
new file mode 100644
index 00000000000..5ff2e3c4321
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pregnant_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/4.png b/public/images/emoji/facebook_messenger/pregnant_woman/4.png
new file mode 100644
index 00000000000..6b6241fefc4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pregnant_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/5.png b/public/images/emoji/facebook_messenger/pregnant_woman/5.png
new file mode 100644
index 00000000000..ddc0648e8e4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pregnant_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/pregnant_woman/6.png b/public/images/emoji/facebook_messenger/pregnant_woman/6.png
new file mode 100644
index 00000000000..04918ba7384
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pregnant_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/pretzel.png b/public/images/emoji/facebook_messenger/pretzel.png
new file mode 100644
index 00000000000..9116d6ee9a2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pretzel.png differ
diff --git a/public/images/emoji/facebook_messenger/previous_track.png b/public/images/emoji/facebook_messenger/previous_track.png
new file mode 100644
index 00000000000..ada39abc337
Binary files /dev/null and b/public/images/emoji/facebook_messenger/previous_track.png differ
diff --git a/public/images/emoji/facebook_messenger/previous_track_button.png b/public/images/emoji/facebook_messenger/previous_track_button.png
new file mode 100644
index 00000000000..ada39abc337
Binary files /dev/null and b/public/images/emoji/facebook_messenger/previous_track_button.png differ
diff --git a/public/images/emoji/facebook_messenger/prince.png b/public/images/emoji/facebook_messenger/prince.png
new file mode 100644
index 00000000000..5ec0ddf76be
Binary files /dev/null and b/public/images/emoji/facebook_messenger/prince.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/2.png b/public/images/emoji/facebook_messenger/prince/2.png
new file mode 100644
index 00000000000..dd91dd02fa8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/prince/2.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/3.png b/public/images/emoji/facebook_messenger/prince/3.png
new file mode 100644
index 00000000000..d3e36181843
Binary files /dev/null and b/public/images/emoji/facebook_messenger/prince/3.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/4.png b/public/images/emoji/facebook_messenger/prince/4.png
new file mode 100644
index 00000000000..a00e9eb039d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/prince/4.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/5.png b/public/images/emoji/facebook_messenger/prince/5.png
new file mode 100644
index 00000000000..2d2fabb6ec9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/prince/5.png differ
diff --git a/public/images/emoji/facebook_messenger/prince/6.png b/public/images/emoji/facebook_messenger/prince/6.png
new file mode 100644
index 00000000000..5f7f4ec8914
Binary files /dev/null and b/public/images/emoji/facebook_messenger/prince/6.png differ
diff --git a/public/images/emoji/facebook_messenger/princess.png b/public/images/emoji/facebook_messenger/princess.png
new file mode 100644
index 00000000000..83b1de6c499
Binary files /dev/null and b/public/images/emoji/facebook_messenger/princess.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/2.png b/public/images/emoji/facebook_messenger/princess/2.png
new file mode 100644
index 00000000000..f44ba4578b9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/princess/2.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/3.png b/public/images/emoji/facebook_messenger/princess/3.png
new file mode 100644
index 00000000000..49933ec338e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/princess/3.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/4.png b/public/images/emoji/facebook_messenger/princess/4.png
new file mode 100644
index 00000000000..2af30a213b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/princess/4.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/5.png b/public/images/emoji/facebook_messenger/princess/5.png
new file mode 100644
index 00000000000..08e62a5795e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/princess/5.png differ
diff --git a/public/images/emoji/facebook_messenger/princess/6.png b/public/images/emoji/facebook_messenger/princess/6.png
new file mode 100644
index 00000000000..6ee3cd3da16
Binary files /dev/null and b/public/images/emoji/facebook_messenger/princess/6.png differ
diff --git a/public/images/emoji/facebook_messenger/printer.png b/public/images/emoji/facebook_messenger/printer.png
new file mode 100644
index 00000000000..3fbfb20f27e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/printer.png differ
diff --git a/public/images/emoji/facebook_messenger/projector.png b/public/images/emoji/facebook_messenger/projector.png
new file mode 100644
index 00000000000..3acb6ea9c3f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/projector.png differ
diff --git a/public/images/emoji/facebook_messenger/puerto_rico.png b/public/images/emoji/facebook_messenger/puerto_rico.png
new file mode 100644
index 00000000000..5270bb9f87a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/puerto_rico.png differ
diff --git a/public/images/emoji/facebook_messenger/punch.png b/public/images/emoji/facebook_messenger/punch.png
new file mode 100644
index 00000000000..ed3c41bc0d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/punch.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/2.png b/public/images/emoji/facebook_messenger/punch/2.png
new file mode 100644
index 00000000000..e499d8d0fac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/punch/2.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/3.png b/public/images/emoji/facebook_messenger/punch/3.png
new file mode 100644
index 00000000000..f56ee4a1ff4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/punch/3.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/4.png b/public/images/emoji/facebook_messenger/punch/4.png
new file mode 100644
index 00000000000..bc6cebcbf63
Binary files /dev/null and b/public/images/emoji/facebook_messenger/punch/4.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/5.png b/public/images/emoji/facebook_messenger/punch/5.png
new file mode 100644
index 00000000000..c8313f984fb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/punch/5.png differ
diff --git a/public/images/emoji/facebook_messenger/punch/6.png b/public/images/emoji/facebook_messenger/punch/6.png
new file mode 100644
index 00000000000..cf2064a1ad3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/punch/6.png differ
diff --git a/public/images/emoji/facebook_messenger/purple_heart.png b/public/images/emoji/facebook_messenger/purple_heart.png
new file mode 100644
index 00000000000..f055ac431c3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/purple_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/purse.png b/public/images/emoji/facebook_messenger/purse.png
new file mode 100644
index 00000000000..ec56d3b10a1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/purse.png differ
diff --git a/public/images/emoji/facebook_messenger/pushpin.png b/public/images/emoji/facebook_messenger/pushpin.png
new file mode 100644
index 00000000000..79cf94cf556
Binary files /dev/null and b/public/images/emoji/facebook_messenger/pushpin.png differ
diff --git a/public/images/emoji/facebook_messenger/put_litter_in_its_place.png b/public/images/emoji/facebook_messenger/put_litter_in_its_place.png
new file mode 100644
index 00000000000..fae27e6a258
Binary files /dev/null and b/public/images/emoji/facebook_messenger/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/facebook_messenger/qatar.png b/public/images/emoji/facebook_messenger/qatar.png
new file mode 100644
index 00000000000..f51ae1d0ffd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/qatar.png differ
diff --git a/public/images/emoji/facebook_messenger/question.png b/public/images/emoji/facebook_messenger/question.png
new file mode 100644
index 00000000000..7e87b10732a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/question.png differ
diff --git a/public/images/emoji/facebook_messenger/rabbit.png b/public/images/emoji/facebook_messenger/rabbit.png
new file mode 100644
index 00000000000..637d9d57d77
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rabbit.png differ
diff --git a/public/images/emoji/facebook_messenger/rabbit2.png b/public/images/emoji/facebook_messenger/rabbit2.png
new file mode 100644
index 00000000000..63b2bb144bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rabbit2.png differ
diff --git a/public/images/emoji/facebook_messenger/race_car.png b/public/images/emoji/facebook_messenger/race_car.png
new file mode 100644
index 00000000000..894f1b62c24
Binary files /dev/null and b/public/images/emoji/facebook_messenger/race_car.png differ
diff --git a/public/images/emoji/facebook_messenger/racehorse.png b/public/images/emoji/facebook_messenger/racehorse.png
new file mode 100644
index 00000000000..986b22d2b29
Binary files /dev/null and b/public/images/emoji/facebook_messenger/racehorse.png differ
diff --git a/public/images/emoji/facebook_messenger/racing_car.png b/public/images/emoji/facebook_messenger/racing_car.png
new file mode 100644
index 00000000000..894f1b62c24
Binary files /dev/null and b/public/images/emoji/facebook_messenger/racing_car.png differ
diff --git a/public/images/emoji/facebook_messenger/racing_motorcycle.png b/public/images/emoji/facebook_messenger/racing_motorcycle.png
new file mode 100644
index 00000000000..ba7fb373bad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/racing_motorcycle.png differ
diff --git a/public/images/emoji/facebook_messenger/radio.png b/public/images/emoji/facebook_messenger/radio.png
new file mode 100644
index 00000000000..ee26ea72d43
Binary files /dev/null and b/public/images/emoji/facebook_messenger/radio.png differ
diff --git a/public/images/emoji/facebook_messenger/radio_button.png b/public/images/emoji/facebook_messenger/radio_button.png
new file mode 100644
index 00000000000..2e744fd1512
Binary files /dev/null and b/public/images/emoji/facebook_messenger/radio_button.png differ
diff --git a/public/images/emoji/facebook_messenger/radioactive.png b/public/images/emoji/facebook_messenger/radioactive.png
new file mode 100644
index 00000000000..8fdf276cd29
Binary files /dev/null and b/public/images/emoji/facebook_messenger/radioactive.png differ
diff --git a/public/images/emoji/facebook_messenger/radioactive_sign.png b/public/images/emoji/facebook_messenger/radioactive_sign.png
new file mode 100644
index 00000000000..8fdf276cd29
Binary files /dev/null and b/public/images/emoji/facebook_messenger/radioactive_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/rage.png b/public/images/emoji/facebook_messenger/rage.png
new file mode 100644
index 00000000000..70ce2bd0c9a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rage.png differ
diff --git a/public/images/emoji/facebook_messenger/railroad_track.png b/public/images/emoji/facebook_messenger/railroad_track.png
new file mode 100644
index 00000000000..7b456ff579a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/railroad_track.png differ
diff --git a/public/images/emoji/facebook_messenger/railway_car.png b/public/images/emoji/facebook_messenger/railway_car.png
new file mode 100644
index 00000000000..dedb706da24
Binary files /dev/null and b/public/images/emoji/facebook_messenger/railway_car.png differ
diff --git a/public/images/emoji/facebook_messenger/railway_track.png b/public/images/emoji/facebook_messenger/railway_track.png
new file mode 100644
index 00000000000..7b456ff579a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/railway_track.png differ
diff --git a/public/images/emoji/facebook_messenger/rainbow.png b/public/images/emoji/facebook_messenger/rainbow.png
new file mode 100644
index 00000000000..4d82fd066df
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rainbow.png differ
diff --git a/public/images/emoji/facebook_messenger/rainbow_flag.png b/public/images/emoji/facebook_messenger/rainbow_flag.png
new file mode 100644
index 00000000000..af14c94a4f2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rainbow_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand.png b/public/images/emoji/facebook_messenger/raised_back_of_hand.png
new file mode 100644
index 00000000000..7e8bd4c6ad9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_back_of_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png
new file mode 100644
index 00000000000..a65c925100b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png
new file mode 100644
index 00000000000..527e2055be7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png
new file mode 100644
index 00000000000..35a4c34bc74
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png
new file mode 100644
index 00000000000..3a75748ef90
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png b/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png
new file mode 100644
index 00000000000..db1c8f050cf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand.png b/public/images/emoji/facebook_messenger/raised_hand.png
new file mode 100644
index 00000000000..a0097d9b71a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/2.png b/public/images/emoji/facebook_messenger/raised_hand/2.png
new file mode 100644
index 00000000000..d23202d6c36
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/3.png b/public/images/emoji/facebook_messenger/raised_hand/3.png
new file mode 100644
index 00000000000..7ff91aea009
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/4.png b/public/images/emoji/facebook_messenger/raised_hand/4.png
new file mode 100644
index 00000000000..635801f6479
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/5.png b/public/images/emoji/facebook_messenger/raised_hand/5.png
new file mode 100644
index 00000000000..63bc01077e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand/6.png b/public/images/emoji/facebook_messenger/raised_hand/6.png
new file mode 100644
index 00000000000..244c30c3821
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png
new file mode 100644
index 00000000000..f41f01af47b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png
new file mode 100644
index 00000000000..37a9048ad78
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png
new file mode 100644
index 00000000000..6ddd74b5862
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png
new file mode 100644
index 00000000000..1d901925fe9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png
new file mode 100644
index 00000000000..5fcac72a703
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png
new file mode 100644
index 00000000000..74fa972cade
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png
new file mode 100644
index 00000000000..62459294572
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png
new file mode 100644
index 00000000000..5cdfab6d9a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png
new file mode 100644
index 00000000000..a469f9b420e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png
new file mode 100644
index 00000000000..a8803b88169
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png
new file mode 100644
index 00000000000..2d9def823e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png
new file mode 100644
index 00000000000..bbcb6dc0d34
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands.png b/public/images/emoji/facebook_messenger/raised_hands.png
new file mode 100644
index 00000000000..c162e955583
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/2.png b/public/images/emoji/facebook_messenger/raised_hands/2.png
new file mode 100644
index 00000000000..ba129063104
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hands/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/3.png b/public/images/emoji/facebook_messenger/raised_hands/3.png
new file mode 100644
index 00000000000..e377f7180f9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hands/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/4.png b/public/images/emoji/facebook_messenger/raised_hands/4.png
new file mode 100644
index 00000000000..79139782eaf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hands/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/5.png b/public/images/emoji/facebook_messenger/raised_hands/5.png
new file mode 100644
index 00000000000..b7ae99b4c53
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hands/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raised_hands/6.png b/public/images/emoji/facebook_messenger/raised_hands/6.png
new file mode 100644
index 00000000000..15dc25b2b2a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raised_hands/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand.png b/public/images/emoji/facebook_messenger/raising_hand.png
new file mode 100644
index 00000000000..0a94688c881
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/2.png b/public/images/emoji/facebook_messenger/raising_hand/2.png
new file mode 100644
index 00000000000..342d6fafd01
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/3.png b/public/images/emoji/facebook_messenger/raising_hand/3.png
new file mode 100644
index 00000000000..6a27504e81f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/4.png b/public/images/emoji/facebook_messenger/raising_hand/4.png
new file mode 100644
index 00000000000..daa638dc6a5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/5.png b/public/images/emoji/facebook_messenger/raising_hand/5.png
new file mode 100644
index 00000000000..457f7ed4c50
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand/6.png b/public/images/emoji/facebook_messenger/raising_hand/6.png
new file mode 100644
index 00000000000..1d3bc70cc98
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man.png b/public/images/emoji/facebook_messenger/raising_hand_man.png
new file mode 100644
index 00000000000..888c2e010f1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_man.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/2.png b/public/images/emoji/facebook_messenger/raising_hand_man/2.png
new file mode 100644
index 00000000000..358c2c878bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/3.png b/public/images/emoji/facebook_messenger/raising_hand_man/3.png
new file mode 100644
index 00000000000..ebe5b4b0eb9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/4.png b/public/images/emoji/facebook_messenger/raising_hand_man/4.png
new file mode 100644
index 00000000000..a2d3d552bbf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/5.png b/public/images/emoji/facebook_messenger/raising_hand_man/5.png
new file mode 100644
index 00000000000..385867923f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_man/6.png b/public/images/emoji/facebook_messenger/raising_hand_man/6.png
new file mode 100644
index 00000000000..21a811c9976
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman.png b/public/images/emoji/facebook_messenger/raising_hand_woman.png
new file mode 100644
index 00000000000..0a94688c881
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/2.png b/public/images/emoji/facebook_messenger/raising_hand_woman/2.png
new file mode 100644
index 00000000000..342d6fafd01
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/3.png b/public/images/emoji/facebook_messenger/raising_hand_woman/3.png
new file mode 100644
index 00000000000..6a27504e81f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/4.png b/public/images/emoji/facebook_messenger/raising_hand_woman/4.png
new file mode 100644
index 00000000000..daa638dc6a5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/5.png b/public/images/emoji/facebook_messenger/raising_hand_woman/5.png
new file mode 100644
index 00000000000..457f7ed4c50
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/raising_hand_woman/6.png b/public/images/emoji/facebook_messenger/raising_hand_woman/6.png
new file mode 100644
index 00000000000..1d3bc70cc98
Binary files /dev/null and b/public/images/emoji/facebook_messenger/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ram.png b/public/images/emoji/facebook_messenger/ram.png
new file mode 100644
index 00000000000..4b0dd9f559a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ram.png differ
diff --git a/public/images/emoji/facebook_messenger/ramen.png b/public/images/emoji/facebook_messenger/ramen.png
new file mode 100644
index 00000000000..19d41b3efec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ramen.png differ
diff --git a/public/images/emoji/facebook_messenger/rat.png b/public/images/emoji/facebook_messenger/rat.png
new file mode 100644
index 00000000000..54c84f57786
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rat.png differ
diff --git a/public/images/emoji/facebook_messenger/record_button.png b/public/images/emoji/facebook_messenger/record_button.png
new file mode 100644
index 00000000000..9015b0fde15
Binary files /dev/null and b/public/images/emoji/facebook_messenger/record_button.png differ
diff --git a/public/images/emoji/facebook_messenger/recycle.png b/public/images/emoji/facebook_messenger/recycle.png
new file mode 100644
index 00000000000..aa374a2d34e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/recycle.png differ
diff --git a/public/images/emoji/facebook_messenger/red_car.png b/public/images/emoji/facebook_messenger/red_car.png
new file mode 100644
index 00000000000..15024a56bd0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/red_car.png differ
diff --git a/public/images/emoji/facebook_messenger/red_circle.png b/public/images/emoji/facebook_messenger/red_circle.png
new file mode 100644
index 00000000000..fef186ba910
Binary files /dev/null and b/public/images/emoji/facebook_messenger/red_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/registered.png b/public/images/emoji/facebook_messenger/registered.png
new file mode 100644
index 00000000000..b2242fe470b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/registered.png differ
diff --git a/public/images/emoji/facebook_messenger/relaxed.png b/public/images/emoji/facebook_messenger/relaxed.png
new file mode 100644
index 00000000000..749a05960d4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/relaxed.png differ
diff --git a/public/images/emoji/facebook_messenger/relieved.png b/public/images/emoji/facebook_messenger/relieved.png
new file mode 100644
index 00000000000..faceb08c806
Binary files /dev/null and b/public/images/emoji/facebook_messenger/relieved.png differ
diff --git a/public/images/emoji/facebook_messenger/reminder_ribbon.png b/public/images/emoji/facebook_messenger/reminder_ribbon.png
new file mode 100644
index 00000000000..09d8d0e3081
Binary files /dev/null and b/public/images/emoji/facebook_messenger/reminder_ribbon.png differ
diff --git a/public/images/emoji/facebook_messenger/repeat.png b/public/images/emoji/facebook_messenger/repeat.png
new file mode 100644
index 00000000000..73597ff253f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/repeat.png differ
diff --git a/public/images/emoji/facebook_messenger/repeat_one.png b/public/images/emoji/facebook_messenger/repeat_one.png
new file mode 100644
index 00000000000..832543f62da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/repeat_one.png differ
diff --git a/public/images/emoji/facebook_messenger/rescue_worker_helmet.png b/public/images/emoji/facebook_messenger/rescue_worker_helmet.png
new file mode 100644
index 00000000000..ad220c2eefe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/facebook_messenger/restroom.png b/public/images/emoji/facebook_messenger/restroom.png
new file mode 100644
index 00000000000..9322abb6bfa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/restroom.png differ
diff --git a/public/images/emoji/facebook_messenger/reunion.png b/public/images/emoji/facebook_messenger/reunion.png
new file mode 100644
index 00000000000..1679d4c5b9c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/reunion.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png
new file mode 100644
index 00000000000..8e7fce2f49b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png
new file mode 100644
index 00000000000..992338bb2b6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png
new file mode 100644
index 00000000000..aadc06129fe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png
new file mode 100644
index 00000000000..8ad10be1169
Binary files /dev/null and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png
new file mode 100644
index 00000000000..695c4a6cb9c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png
new file mode 100644
index 00000000000..3457e01312c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/facebook_messenger/revolving_hearts.png b/public/images/emoji/facebook_messenger/revolving_hearts.png
new file mode 100644
index 00000000000..9a6f39ef710
Binary files /dev/null and b/public/images/emoji/facebook_messenger/revolving_hearts.png differ
diff --git a/public/images/emoji/facebook_messenger/rewind.png b/public/images/emoji/facebook_messenger/rewind.png
new file mode 100644
index 00000000000..685f57f86cd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rewind.png differ
diff --git a/public/images/emoji/facebook_messenger/rhinoceros.png b/public/images/emoji/facebook_messenger/rhinoceros.png
new file mode 100644
index 00000000000..e81681a6031
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rhinoceros.png differ
diff --git a/public/images/emoji/facebook_messenger/ribbon.png b/public/images/emoji/facebook_messenger/ribbon.png
new file mode 100644
index 00000000000..2a236f2a138
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ribbon.png differ
diff --git a/public/images/emoji/facebook_messenger/rice.png b/public/images/emoji/facebook_messenger/rice.png
new file mode 100644
index 00000000000..60de4a64f27
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rice.png differ
diff --git a/public/images/emoji/facebook_messenger/rice_ball.png b/public/images/emoji/facebook_messenger/rice_ball.png
new file mode 100644
index 00000000000..13a97cc4ef4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rice_ball.png differ
diff --git a/public/images/emoji/facebook_messenger/rice_cracker.png b/public/images/emoji/facebook_messenger/rice_cracker.png
new file mode 100644
index 00000000000..ad821b75758
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rice_cracker.png differ
diff --git a/public/images/emoji/facebook_messenger/rice_scene.png b/public/images/emoji/facebook_messenger/rice_scene.png
new file mode 100644
index 00000000000..a9ff32238aa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rice_scene.png differ
diff --git a/public/images/emoji/facebook_messenger/right_anger_bubble.png b/public/images/emoji/facebook_messenger/right_anger_bubble.png
new file mode 100644
index 00000000000..3d3ee7dcfad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/right_anger_bubble.png differ
diff --git a/public/images/emoji/facebook_messenger/ring.png b/public/images/emoji/facebook_messenger/ring.png
new file mode 100644
index 00000000000..88f8ad512b3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ring.png differ
diff --git a/public/images/emoji/facebook_messenger/robot.png b/public/images/emoji/facebook_messenger/robot.png
new file mode 100644
index 00000000000..c728ecf9c1a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/robot.png differ
diff --git a/public/images/emoji/facebook_messenger/robot_face.png b/public/images/emoji/facebook_messenger/robot_face.png
new file mode 100644
index 00000000000..c728ecf9c1a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/robot_face.png differ
diff --git a/public/images/emoji/facebook_messenger/rocket.png b/public/images/emoji/facebook_messenger/rocket.png
new file mode 100644
index 00000000000..518c778f8b8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rocket.png differ
diff --git a/public/images/emoji/facebook_messenger/rofl.png b/public/images/emoji/facebook_messenger/rofl.png
new file mode 100644
index 00000000000..ab648dd83df
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rofl.png differ
diff --git a/public/images/emoji/facebook_messenger/roll_eyes.png b/public/images/emoji/facebook_messenger/roll_eyes.png
new file mode 100644
index 00000000000..8a864a00bdf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/roll_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/rolled_up_newspaper.png b/public/images/emoji/facebook_messenger/rolled_up_newspaper.png
new file mode 100644
index 00000000000..052dcce75f0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/facebook_messenger/roller_coaster.png b/public/images/emoji/facebook_messenger/roller_coaster.png
new file mode 100644
index 00000000000..1d1919e0cd9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/roller_coaster.png differ
diff --git a/public/images/emoji/facebook_messenger/rolling_eyes.png b/public/images/emoji/facebook_messenger/rolling_eyes.png
new file mode 100644
index 00000000000..8a864a00bdf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rolling_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/romania.png b/public/images/emoji/facebook_messenger/romania.png
new file mode 100644
index 00000000000..2b163248784
Binary files /dev/null and b/public/images/emoji/facebook_messenger/romania.png differ
diff --git a/public/images/emoji/facebook_messenger/rooster.png b/public/images/emoji/facebook_messenger/rooster.png
new file mode 100644
index 00000000000..33608158147
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rooster.png differ
diff --git a/public/images/emoji/facebook_messenger/rose.png b/public/images/emoji/facebook_messenger/rose.png
new file mode 100644
index 00000000000..be7bcb7ae7c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rose.png differ
diff --git a/public/images/emoji/facebook_messenger/rosette.png b/public/images/emoji/facebook_messenger/rosette.png
new file mode 100644
index 00000000000..b21ae33e63b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rosette.png differ
diff --git a/public/images/emoji/facebook_messenger/rotating_light.png b/public/images/emoji/facebook_messenger/rotating_light.png
new file mode 100644
index 00000000000..a6ac22f351d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rotating_light.png differ
diff --git a/public/images/emoji/facebook_messenger/round_pushpin.png b/public/images/emoji/facebook_messenger/round_pushpin.png
new file mode 100644
index 00000000000..35ccf8b9436
Binary files /dev/null and b/public/images/emoji/facebook_messenger/round_pushpin.png differ
diff --git a/public/images/emoji/facebook_messenger/rowboat.png b/public/images/emoji/facebook_messenger/rowboat.png
new file mode 100644
index 00000000000..7b73bd927a7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowboat.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_man.png b/public/images/emoji/facebook_messenger/rowing_man.png
new file mode 100644
index 00000000000..7b73bd927a7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman.png b/public/images/emoji/facebook_messenger/rowing_woman.png
new file mode 100644
index 00000000000..621b0acc040
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/2.png b/public/images/emoji/facebook_messenger/rowing_woman/2.png
new file mode 100644
index 00000000000..0bee4147be6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/3.png b/public/images/emoji/facebook_messenger/rowing_woman/3.png
new file mode 100644
index 00000000000..f51db263218
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/4.png b/public/images/emoji/facebook_messenger/rowing_woman/4.png
new file mode 100644
index 00000000000..e61c949d0d6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/5.png b/public/images/emoji/facebook_messenger/rowing_woman/5.png
new file mode 100644
index 00000000000..b21bb84ca6f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/rowing_woman/6.png b/public/images/emoji/facebook_messenger/rowing_woman/6.png
new file mode 100644
index 00000000000..cc2a55e7672
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rowing_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/ru.png b/public/images/emoji/facebook_messenger/ru.png
new file mode 100644
index 00000000000..f3932d9f3cc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ru.png differ
diff --git a/public/images/emoji/facebook_messenger/rugby_football.png b/public/images/emoji/facebook_messenger/rugby_football.png
new file mode 100644
index 00000000000..6ce225a2ec4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rugby_football.png differ
diff --git a/public/images/emoji/facebook_messenger/runner.png b/public/images/emoji/facebook_messenger/runner.png
new file mode 100644
index 00000000000..d1db4d17965
Binary files /dev/null and b/public/images/emoji/facebook_messenger/runner.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/2.png b/public/images/emoji/facebook_messenger/runner/2.png
new file mode 100644
index 00000000000..d45b1ccb14b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/runner/2.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/3.png b/public/images/emoji/facebook_messenger/runner/3.png
new file mode 100644
index 00000000000..67bb67e9797
Binary files /dev/null and b/public/images/emoji/facebook_messenger/runner/3.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/4.png b/public/images/emoji/facebook_messenger/runner/4.png
new file mode 100644
index 00000000000..da3404f1357
Binary files /dev/null and b/public/images/emoji/facebook_messenger/runner/4.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/5.png b/public/images/emoji/facebook_messenger/runner/5.png
new file mode 100644
index 00000000000..02b731334ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/runner/5.png differ
diff --git a/public/images/emoji/facebook_messenger/runner/6.png b/public/images/emoji/facebook_messenger/runner/6.png
new file mode 100644
index 00000000000..0a0dcc7d844
Binary files /dev/null and b/public/images/emoji/facebook_messenger/runner/6.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man.png b/public/images/emoji/facebook_messenger/running_man.png
new file mode 100644
index 00000000000..d1db4d17965
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_man.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/2.png b/public/images/emoji/facebook_messenger/running_man/2.png
new file mode 100644
index 00000000000..d45b1ccb14b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/3.png b/public/images/emoji/facebook_messenger/running_man/3.png
new file mode 100644
index 00000000000..67bb67e9797
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/4.png b/public/images/emoji/facebook_messenger/running_man/4.png
new file mode 100644
index 00000000000..da3404f1357
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/5.png b/public/images/emoji/facebook_messenger/running_man/5.png
new file mode 100644
index 00000000000..02b731334ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/running_man/6.png b/public/images/emoji/facebook_messenger/running_man/6.png
new file mode 100644
index 00000000000..0a0dcc7d844
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/running_shirt_with_sash.png b/public/images/emoji/facebook_messenger/running_shirt_with_sash.png
new file mode 100644
index 00000000000..960b63b65b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman.png b/public/images/emoji/facebook_messenger/running_woman.png
new file mode 100644
index 00000000000..01418f1a8da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/2.png b/public/images/emoji/facebook_messenger/running_woman/2.png
new file mode 100644
index 00000000000..cde0a287031
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/3.png b/public/images/emoji/facebook_messenger/running_woman/3.png
new file mode 100644
index 00000000000..a9b8ba20cec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/4.png b/public/images/emoji/facebook_messenger/running_woman/4.png
new file mode 100644
index 00000000000..e14cb3884a9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/5.png b/public/images/emoji/facebook_messenger/running_woman/5.png
new file mode 100644
index 00000000000..54b0cb838b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/running_woman/6.png b/public/images/emoji/facebook_messenger/running_woman/6.png
new file mode 100644
index 00000000000..114138c0b68
Binary files /dev/null and b/public/images/emoji/facebook_messenger/running_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/rwanda.png b/public/images/emoji/facebook_messenger/rwanda.png
new file mode 100644
index 00000000000..a45a988ff58
Binary files /dev/null and b/public/images/emoji/facebook_messenger/rwanda.png differ
diff --git a/public/images/emoji/facebook_messenger/sa.png b/public/images/emoji/facebook_messenger/sa.png
new file mode 100644
index 00000000000..67fffa68f83
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sa.png differ
diff --git a/public/images/emoji/facebook_messenger/sagittarius.png b/public/images/emoji/facebook_messenger/sagittarius.png
new file mode 100644
index 00000000000..d8580b190b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sagittarius.png differ
diff --git a/public/images/emoji/facebook_messenger/sailboat.png b/public/images/emoji/facebook_messenger/sailboat.png
new file mode 100644
index 00000000000..73cb6717ef4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sailboat.png differ
diff --git a/public/images/emoji/facebook_messenger/sake.png b/public/images/emoji/facebook_messenger/sake.png
new file mode 100644
index 00000000000..7e9b170b68a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sake.png differ
diff --git a/public/images/emoji/facebook_messenger/samoa.png b/public/images/emoji/facebook_messenger/samoa.png
new file mode 100644
index 00000000000..de81c048d01
Binary files /dev/null and b/public/images/emoji/facebook_messenger/samoa.png differ
diff --git a/public/images/emoji/facebook_messenger/san_marino.png b/public/images/emoji/facebook_messenger/san_marino.png
new file mode 100644
index 00000000000..fa20a008086
Binary files /dev/null and b/public/images/emoji/facebook_messenger/san_marino.png differ
diff --git a/public/images/emoji/facebook_messenger/sandal.png b/public/images/emoji/facebook_messenger/sandal.png
new file mode 100644
index 00000000000..f48e7f3a235
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sandal.png differ
diff --git a/public/images/emoji/facebook_messenger/sandwich.png b/public/images/emoji/facebook_messenger/sandwich.png
new file mode 100644
index 00000000000..ba3f9a1cdb7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sandwich.png differ
diff --git a/public/images/emoji/facebook_messenger/santa.png b/public/images/emoji/facebook_messenger/santa.png
new file mode 100644
index 00000000000..4995fdca211
Binary files /dev/null and b/public/images/emoji/facebook_messenger/santa.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/2.png b/public/images/emoji/facebook_messenger/santa/2.png
new file mode 100644
index 00000000000..5a6ef2f00d8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/santa/2.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/3.png b/public/images/emoji/facebook_messenger/santa/3.png
new file mode 100644
index 00000000000..52b0fb27059
Binary files /dev/null and b/public/images/emoji/facebook_messenger/santa/3.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/4.png b/public/images/emoji/facebook_messenger/santa/4.png
new file mode 100644
index 00000000000..6181e6ccc34
Binary files /dev/null and b/public/images/emoji/facebook_messenger/santa/4.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/5.png b/public/images/emoji/facebook_messenger/santa/5.png
new file mode 100644
index 00000000000..215b68451d3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/santa/5.png differ
diff --git a/public/images/emoji/facebook_messenger/santa/6.png b/public/images/emoji/facebook_messenger/santa/6.png
new file mode 100644
index 00000000000..390a6a2550a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/santa/6.png differ
diff --git a/public/images/emoji/facebook_messenger/sao_tome_principe.png b/public/images/emoji/facebook_messenger/sao_tome_principe.png
new file mode 100644
index 00000000000..bbfcbd18df3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sao_tome_principe.png differ
diff --git a/public/images/emoji/facebook_messenger/satellite.png b/public/images/emoji/facebook_messenger/satellite.png
new file mode 100644
index 00000000000..48510c86cf5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/satellite.png differ
diff --git a/public/images/emoji/facebook_messenger/satellite_orbital.png b/public/images/emoji/facebook_messenger/satellite_orbital.png
new file mode 100644
index 00000000000..81715516af6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/satellite_orbital.png differ
diff --git a/public/images/emoji/facebook_messenger/satisfied.png b/public/images/emoji/facebook_messenger/satisfied.png
new file mode 100644
index 00000000000..68cbb0f1481
Binary files /dev/null and b/public/images/emoji/facebook_messenger/satisfied.png differ
diff --git a/public/images/emoji/facebook_messenger/saudi_arabia.png b/public/images/emoji/facebook_messenger/saudi_arabia.png
new file mode 100644
index 00000000000..dc3a6b29f60
Binary files /dev/null and b/public/images/emoji/facebook_messenger/saudi_arabia.png differ
diff --git a/public/images/emoji/facebook_messenger/sauropod.png b/public/images/emoji/facebook_messenger/sauropod.png
new file mode 100644
index 00000000000..2f4d6199975
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sauropod.png differ
diff --git a/public/images/emoji/facebook_messenger/saxophone.png b/public/images/emoji/facebook_messenger/saxophone.png
new file mode 100644
index 00000000000..8740f0d6883
Binary files /dev/null and b/public/images/emoji/facebook_messenger/saxophone.png differ
diff --git a/public/images/emoji/facebook_messenger/scales.png b/public/images/emoji/facebook_messenger/scales.png
new file mode 100644
index 00000000000..75713abc23d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/scales.png differ
diff --git a/public/images/emoji/facebook_messenger/scarf.png b/public/images/emoji/facebook_messenger/scarf.png
new file mode 100644
index 00000000000..73653eee2bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/scarf.png differ
diff --git a/public/images/emoji/facebook_messenger/school.png b/public/images/emoji/facebook_messenger/school.png
new file mode 100644
index 00000000000..a5d6791d939
Binary files /dev/null and b/public/images/emoji/facebook_messenger/school.png differ
diff --git a/public/images/emoji/facebook_messenger/school_satchel.png b/public/images/emoji/facebook_messenger/school_satchel.png
new file mode 100644
index 00000000000..cfc748f8652
Binary files /dev/null and b/public/images/emoji/facebook_messenger/school_satchel.png differ
diff --git a/public/images/emoji/facebook_messenger/scissors.png b/public/images/emoji/facebook_messenger/scissors.png
new file mode 100644
index 00000000000..546ee1babbc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/scissors.png differ
diff --git a/public/images/emoji/facebook_messenger/scorpion.png b/public/images/emoji/facebook_messenger/scorpion.png
new file mode 100644
index 00000000000..2215d4642fd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/scorpion.png differ
diff --git a/public/images/emoji/facebook_messenger/scorpius.png b/public/images/emoji/facebook_messenger/scorpius.png
new file mode 100644
index 00000000000..22f33ac23b4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/scorpius.png differ
diff --git a/public/images/emoji/facebook_messenger/scream.png b/public/images/emoji/facebook_messenger/scream.png
new file mode 100644
index 00000000000..76a4e2f5c71
Binary files /dev/null and b/public/images/emoji/facebook_messenger/scream.png differ
diff --git a/public/images/emoji/facebook_messenger/scream_cat.png b/public/images/emoji/facebook_messenger/scream_cat.png
new file mode 100644
index 00000000000..1ff4b8e92aa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/scream_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/scroll.png b/public/images/emoji/facebook_messenger/scroll.png
new file mode 100644
index 00000000000..82c810dd5bc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/scroll.png differ
diff --git a/public/images/emoji/facebook_messenger/seat.png b/public/images/emoji/facebook_messenger/seat.png
new file mode 100644
index 00000000000..850e39dafe9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/seat.png differ
diff --git a/public/images/emoji/facebook_messenger/secret.png b/public/images/emoji/facebook_messenger/secret.png
new file mode 100644
index 00000000000..652e4f7ca96
Binary files /dev/null and b/public/images/emoji/facebook_messenger/secret.png differ
diff --git a/public/images/emoji/facebook_messenger/see_no_evil.png b/public/images/emoji/facebook_messenger/see_no_evil.png
new file mode 100644
index 00000000000..3b73a085a88
Binary files /dev/null and b/public/images/emoji/facebook_messenger/see_no_evil.png differ
diff --git a/public/images/emoji/facebook_messenger/seedling.png b/public/images/emoji/facebook_messenger/seedling.png
new file mode 100644
index 00000000000..990126746a7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/seedling.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie.png b/public/images/emoji/facebook_messenger/selfie.png
new file mode 100644
index 00000000000..f6411e5444c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/selfie.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/2.png b/public/images/emoji/facebook_messenger/selfie/2.png
new file mode 100644
index 00000000000..24a81ca396a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/selfie/2.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/3.png b/public/images/emoji/facebook_messenger/selfie/3.png
new file mode 100644
index 00000000000..712bc730000
Binary files /dev/null and b/public/images/emoji/facebook_messenger/selfie/3.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/4.png b/public/images/emoji/facebook_messenger/selfie/4.png
new file mode 100644
index 00000000000..77139915b79
Binary files /dev/null and b/public/images/emoji/facebook_messenger/selfie/4.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/5.png b/public/images/emoji/facebook_messenger/selfie/5.png
new file mode 100644
index 00000000000..f326d7825d1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/selfie/5.png differ
diff --git a/public/images/emoji/facebook_messenger/selfie/6.png b/public/images/emoji/facebook_messenger/selfie/6.png
new file mode 100644
index 00000000000..de9106c369f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/selfie/6.png differ
diff --git a/public/images/emoji/facebook_messenger/senegal.png b/public/images/emoji/facebook_messenger/senegal.png
new file mode 100644
index 00000000000..2d32427625a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/senegal.png differ
diff --git a/public/images/emoji/facebook_messenger/serbia.png b/public/images/emoji/facebook_messenger/serbia.png
new file mode 100644
index 00000000000..a7af1346e56
Binary files /dev/null and b/public/images/emoji/facebook_messenger/serbia.png differ
diff --git a/public/images/emoji/facebook_messenger/seven.png b/public/images/emoji/facebook_messenger/seven.png
new file mode 100644
index 00000000000..967f9092615
Binary files /dev/null and b/public/images/emoji/facebook_messenger/seven.png differ
diff --git a/public/images/emoji/facebook_messenger/seychelles.png b/public/images/emoji/facebook_messenger/seychelles.png
new file mode 100644
index 00000000000..e69ca6add18
Binary files /dev/null and b/public/images/emoji/facebook_messenger/seychelles.png differ
diff --git a/public/images/emoji/facebook_messenger/shallow_pan_of_food.png b/public/images/emoji/facebook_messenger/shallow_pan_of_food.png
new file mode 100644
index 00000000000..300f700fcc4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/facebook_messenger/shamrock.png b/public/images/emoji/facebook_messenger/shamrock.png
new file mode 100644
index 00000000000..dfad1cfc708
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shamrock.png differ
diff --git a/public/images/emoji/facebook_messenger/shark.png b/public/images/emoji/facebook_messenger/shark.png
new file mode 100644
index 00000000000..856894743dd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shark.png differ
diff --git a/public/images/emoji/facebook_messenger/shaved_ice.png b/public/images/emoji/facebook_messenger/shaved_ice.png
new file mode 100644
index 00000000000..d00270a6629
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shaved_ice.png differ
diff --git a/public/images/emoji/facebook_messenger/sheep.png b/public/images/emoji/facebook_messenger/sheep.png
new file mode 100644
index 00000000000..c6deaa70632
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sheep.png differ
diff --git a/public/images/emoji/facebook_messenger/shell.png b/public/images/emoji/facebook_messenger/shell.png
new file mode 100644
index 00000000000..dd46b772a4b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shell.png differ
diff --git a/public/images/emoji/facebook_messenger/shield.png b/public/images/emoji/facebook_messenger/shield.png
new file mode 100644
index 00000000000..4fbc6a59153
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shield.png differ
diff --git a/public/images/emoji/facebook_messenger/shinto_shrine.png b/public/images/emoji/facebook_messenger/shinto_shrine.png
new file mode 100644
index 00000000000..52c368a6a6f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shinto_shrine.png differ
diff --git a/public/images/emoji/facebook_messenger/ship.png b/public/images/emoji/facebook_messenger/ship.png
new file mode 100644
index 00000000000..80df6b31433
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ship.png differ
diff --git a/public/images/emoji/facebook_messenger/shirt.png b/public/images/emoji/facebook_messenger/shirt.png
new file mode 100644
index 00000000000..f24f758f681
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shirt.png differ
diff --git a/public/images/emoji/facebook_messenger/shit.png b/public/images/emoji/facebook_messenger/shit.png
new file mode 100644
index 00000000000..e175a1dfffc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shit.png differ
diff --git a/public/images/emoji/facebook_messenger/shopping.png b/public/images/emoji/facebook_messenger/shopping.png
new file mode 100644
index 00000000000..ee15abd9933
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shopping.png differ
diff --git a/public/images/emoji/facebook_messenger/shopping_bags.png b/public/images/emoji/facebook_messenger/shopping_bags.png
new file mode 100644
index 00000000000..ee15abd9933
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shopping_bags.png differ
diff --git a/public/images/emoji/facebook_messenger/shopping_cart.png b/public/images/emoji/facebook_messenger/shopping_cart.png
new file mode 100644
index 00000000000..419cc70376a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shopping_cart.png differ
diff --git a/public/images/emoji/facebook_messenger/shower.png b/public/images/emoji/facebook_messenger/shower.png
new file mode 100644
index 00000000000..1070d46a501
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shower.png differ
diff --git a/public/images/emoji/facebook_messenger/shrimp.png b/public/images/emoji/facebook_messenger/shrimp.png
new file mode 100644
index 00000000000..e45d741b479
Binary files /dev/null and b/public/images/emoji/facebook_messenger/shrimp.png differ
diff --git a/public/images/emoji/facebook_messenger/sierra_leone.png b/public/images/emoji/facebook_messenger/sierra_leone.png
new file mode 100644
index 00000000000..816f090002a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sierra_leone.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns.png b/public/images/emoji/facebook_messenger/sign_of_the_horns.png
new file mode 100644
index 00000000000..72d987aadc3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sign_of_the_horns.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png
new file mode 100644
index 00000000000..8d87aab277f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png
new file mode 100644
index 00000000000..39a19cd401f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png
new file mode 100644
index 00000000000..73bedb2c022
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png
new file mode 100644
index 00000000000..36413ab8cfb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png b/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png
new file mode 100644
index 00000000000..1cb1b661b95
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/facebook_messenger/signal_strength.png b/public/images/emoji/facebook_messenger/signal_strength.png
new file mode 100644
index 00000000000..8ff27d11762
Binary files /dev/null and b/public/images/emoji/facebook_messenger/signal_strength.png differ
diff --git a/public/images/emoji/facebook_messenger/singapore.png b/public/images/emoji/facebook_messenger/singapore.png
new file mode 100644
index 00000000000..42a338884d2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/singapore.png differ
diff --git a/public/images/emoji/facebook_messenger/sint_maarten.png b/public/images/emoji/facebook_messenger/sint_maarten.png
new file mode 100644
index 00000000000..5248152aba9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sint_maarten.png differ
diff --git a/public/images/emoji/facebook_messenger/six.png b/public/images/emoji/facebook_messenger/six.png
new file mode 100644
index 00000000000..5208c51d592
Binary files /dev/null and b/public/images/emoji/facebook_messenger/six.png differ
diff --git a/public/images/emoji/facebook_messenger/six_pointed_star.png b/public/images/emoji/facebook_messenger/six_pointed_star.png
new file mode 100644
index 00000000000..3a640a6c915
Binary files /dev/null and b/public/images/emoji/facebook_messenger/six_pointed_star.png differ
diff --git a/public/images/emoji/facebook_messenger/skeleton.png b/public/images/emoji/facebook_messenger/skeleton.png
new file mode 100644
index 00000000000..9ff2306a450
Binary files /dev/null and b/public/images/emoji/facebook_messenger/skeleton.png differ
diff --git a/public/images/emoji/facebook_messenger/ski.png b/public/images/emoji/facebook_messenger/ski.png
new file mode 100644
index 00000000000..919452aacca
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ski.png differ
diff --git a/public/images/emoji/facebook_messenger/skier.png b/public/images/emoji/facebook_messenger/skier.png
new file mode 100644
index 00000000000..a4cffe7aca6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/skier.png differ
diff --git a/public/images/emoji/facebook_messenger/skull.png b/public/images/emoji/facebook_messenger/skull.png
new file mode 100644
index 00000000000..9ff2306a450
Binary files /dev/null and b/public/images/emoji/facebook_messenger/skull.png differ
diff --git a/public/images/emoji/facebook_messenger/skull_and_crossbones.png b/public/images/emoji/facebook_messenger/skull_and_crossbones.png
new file mode 100644
index 00000000000..df4531d2b0a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/skull_and_crossbones.png differ
diff --git a/public/images/emoji/facebook_messenger/skull_crossbones.png b/public/images/emoji/facebook_messenger/skull_crossbones.png
new file mode 100644
index 00000000000..df4531d2b0a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/skull_crossbones.png differ
diff --git a/public/images/emoji/facebook_messenger/sled.png b/public/images/emoji/facebook_messenger/sled.png
new file mode 100644
index 00000000000..01805b1fe76
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sled.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping.png b/public/images/emoji/facebook_messenger/sleeping.png
new file mode 100644
index 00000000000..f0f03bd3a8b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation.png b/public/images/emoji/facebook_messenger/sleeping_accommodation.png
new file mode 100644
index 00000000000..70398fd0978
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_accommodation.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png
new file mode 100644
index 00000000000..feb77c5dac0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png
new file mode 100644
index 00000000000..6934d93973f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png
new file mode 100644
index 00000000000..e7705b515e9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png
new file mode 100644
index 00000000000..76d7ae664b3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png b/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png
new file mode 100644
index 00000000000..6ea7b534620
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed.png b/public/images/emoji/facebook_messenger/sleeping_bed.png
new file mode 100644
index 00000000000..70398fd0978
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_bed.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/2.png b/public/images/emoji/facebook_messenger/sleeping_bed/2.png
new file mode 100644
index 00000000000..feb77c5dac0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_bed/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/3.png b/public/images/emoji/facebook_messenger/sleeping_bed/3.png
new file mode 100644
index 00000000000..6934d93973f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_bed/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/4.png b/public/images/emoji/facebook_messenger/sleeping_bed/4.png
new file mode 100644
index 00000000000..e7705b515e9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_bed/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/5.png b/public/images/emoji/facebook_messenger/sleeping_bed/5.png
new file mode 100644
index 00000000000..76d7ae664b3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_bed/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sleeping_bed/6.png b/public/images/emoji/facebook_messenger/sleeping_bed/6.png
new file mode 100644
index 00000000000..6ea7b534620
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleeping_bed/6.png differ
diff --git a/public/images/emoji/facebook_messenger/sleepy.png b/public/images/emoji/facebook_messenger/sleepy.png
new file mode 100644
index 00000000000..d6d67475bc3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleepy.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy.png b/public/images/emoji/facebook_messenger/sleuth_or_spy.png
new file mode 100644
index 00000000000..587e506d98d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleuth_or_spy.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png
new file mode 100644
index 00000000000..a25d5ea4d44
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png
new file mode 100644
index 00000000000..f100fd13a45
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png
new file mode 100644
index 00000000000..775a8b2f2b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png
new file mode 100644
index 00000000000..c9703ba9946
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png b/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png
new file mode 100644
index 00000000000..55cc03db8d4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/slight_frown.png b/public/images/emoji/facebook_messenger/slight_frown.png
new file mode 100644
index 00000000000..d7dfe0e8486
Binary files /dev/null and b/public/images/emoji/facebook_messenger/slight_frown.png differ
diff --git a/public/images/emoji/facebook_messenger/slight_smile.png b/public/images/emoji/facebook_messenger/slight_smile.png
new file mode 100644
index 00000000000..2c240c1bb80
Binary files /dev/null and b/public/images/emoji/facebook_messenger/slight_smile.png differ
diff --git a/public/images/emoji/facebook_messenger/slightly_frowning_face.png b/public/images/emoji/facebook_messenger/slightly_frowning_face.png
new file mode 100644
index 00000000000..d7dfe0e8486
Binary files /dev/null and b/public/images/emoji/facebook_messenger/slightly_frowning_face.png differ
diff --git a/public/images/emoji/facebook_messenger/slightly_smiling.png b/public/images/emoji/facebook_messenger/slightly_smiling.png
new file mode 100644
index 00000000000..2c240c1bb80
Binary files /dev/null and b/public/images/emoji/facebook_messenger/slightly_smiling.png differ
diff --git a/public/images/emoji/facebook_messenger/slightly_smiling_face.png b/public/images/emoji/facebook_messenger/slightly_smiling_face.png
new file mode 100644
index 00000000000..2c240c1bb80
Binary files /dev/null and b/public/images/emoji/facebook_messenger/slightly_smiling_face.png differ
diff --git a/public/images/emoji/facebook_messenger/slot_machine.png b/public/images/emoji/facebook_messenger/slot_machine.png
new file mode 100644
index 00000000000..a67edf96be9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/slot_machine.png differ
diff --git a/public/images/emoji/facebook_messenger/slovakia.png b/public/images/emoji/facebook_messenger/slovakia.png
new file mode 100644
index 00000000000..9b716032fd8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/slovakia.png differ
diff --git a/public/images/emoji/facebook_messenger/slovenia.png b/public/images/emoji/facebook_messenger/slovenia.png
new file mode 100644
index 00000000000..6dfbe6eae24
Binary files /dev/null and b/public/images/emoji/facebook_messenger/slovenia.png differ
diff --git a/public/images/emoji/facebook_messenger/small_airplane.png b/public/images/emoji/facebook_messenger/small_airplane.png
new file mode 100644
index 00000000000..47399184f72
Binary files /dev/null and b/public/images/emoji/facebook_messenger/small_airplane.png differ
diff --git a/public/images/emoji/facebook_messenger/small_blue_diamond.png b/public/images/emoji/facebook_messenger/small_blue_diamond.png
new file mode 100644
index 00000000000..e5b2ce33f20
Binary files /dev/null and b/public/images/emoji/facebook_messenger/small_blue_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/small_orange_diamond.png b/public/images/emoji/facebook_messenger/small_orange_diamond.png
new file mode 100644
index 00000000000..ce3ffc859be
Binary files /dev/null and b/public/images/emoji/facebook_messenger/small_orange_diamond.png differ
diff --git a/public/images/emoji/facebook_messenger/small_red_triangle.png b/public/images/emoji/facebook_messenger/small_red_triangle.png
new file mode 100644
index 00000000000..ff5080276e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/small_red_triangle.png differ
diff --git a/public/images/emoji/facebook_messenger/small_red_triangle_down.png b/public/images/emoji/facebook_messenger/small_red_triangle_down.png
new file mode 100644
index 00000000000..ffc0b20b6da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/small_red_triangle_down.png differ
diff --git a/public/images/emoji/facebook_messenger/smile.png b/public/images/emoji/facebook_messenger/smile.png
new file mode 100644
index 00000000000..b38ee2bad13
Binary files /dev/null and b/public/images/emoji/facebook_messenger/smile.png differ
diff --git a/public/images/emoji/facebook_messenger/smile_cat.png b/public/images/emoji/facebook_messenger/smile_cat.png
new file mode 100644
index 00000000000..07733f39a42
Binary files /dev/null and b/public/images/emoji/facebook_messenger/smile_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/smiley.png b/public/images/emoji/facebook_messenger/smiley.png
new file mode 100644
index 00000000000..3df89f4799f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/smiley.png differ
diff --git a/public/images/emoji/facebook_messenger/smiley_cat.png b/public/images/emoji/facebook_messenger/smiley_cat.png
new file mode 100644
index 00000000000..c64dead5286
Binary files /dev/null and b/public/images/emoji/facebook_messenger/smiley_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/smiling_imp.png b/public/images/emoji/facebook_messenger/smiling_imp.png
new file mode 100644
index 00000000000..ad5ca558493
Binary files /dev/null and b/public/images/emoji/facebook_messenger/smiling_imp.png differ
diff --git a/public/images/emoji/facebook_messenger/smirk.png b/public/images/emoji/facebook_messenger/smirk.png
new file mode 100644
index 00000000000..cf36fecf96b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/smirk.png differ
diff --git a/public/images/emoji/facebook_messenger/smirk_cat.png b/public/images/emoji/facebook_messenger/smirk_cat.png
new file mode 100644
index 00000000000..0981c4f0921
Binary files /dev/null and b/public/images/emoji/facebook_messenger/smirk_cat.png differ
diff --git a/public/images/emoji/facebook_messenger/smoking.png b/public/images/emoji/facebook_messenger/smoking.png
new file mode 100644
index 00000000000..f3d1dd8b089
Binary files /dev/null and b/public/images/emoji/facebook_messenger/smoking.png differ
diff --git a/public/images/emoji/facebook_messenger/snail.png b/public/images/emoji/facebook_messenger/snail.png
new file mode 100644
index 00000000000..4ca88c40fed
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snail.png differ
diff --git a/public/images/emoji/facebook_messenger/snake.png b/public/images/emoji/facebook_messenger/snake.png
new file mode 100644
index 00000000000..45d642454c2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snake.png differ
diff --git a/public/images/emoji/facebook_messenger/sneezing_face.png b/public/images/emoji/facebook_messenger/sneezing_face.png
new file mode 100644
index 00000000000..b1801ae41ff
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sneezing_face.png differ
diff --git a/public/images/emoji/facebook_messenger/snow_capped_mountain.png b/public/images/emoji/facebook_messenger/snow_capped_mountain.png
new file mode 100644
index 00000000000..b3e246f09b9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snow_capped_mountain.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder.png b/public/images/emoji/facebook_messenger/snowboarder.png
new file mode 100644
index 00000000000..1c6f59397b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snowboarder.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/2.png b/public/images/emoji/facebook_messenger/snowboarder/2.png
new file mode 100644
index 00000000000..6d3da25d658
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snowboarder/2.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/3.png b/public/images/emoji/facebook_messenger/snowboarder/3.png
new file mode 100644
index 00000000000..cf8c1f336df
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snowboarder/3.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/4.png b/public/images/emoji/facebook_messenger/snowboarder/4.png
new file mode 100644
index 00000000000..7c5a44116e4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snowboarder/4.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/5.png b/public/images/emoji/facebook_messenger/snowboarder/5.png
new file mode 100644
index 00000000000..e7cea154901
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snowboarder/5.png differ
diff --git a/public/images/emoji/facebook_messenger/snowboarder/6.png b/public/images/emoji/facebook_messenger/snowboarder/6.png
new file mode 100644
index 00000000000..abe744f0fe2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snowboarder/6.png differ
diff --git a/public/images/emoji/facebook_messenger/snowflake.png b/public/images/emoji/facebook_messenger/snowflake.png
new file mode 100644
index 00000000000..bc25658a748
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snowflake.png differ
diff --git a/public/images/emoji/facebook_messenger/snowman.png b/public/images/emoji/facebook_messenger/snowman.png
new file mode 100644
index 00000000000..edb003e3623
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snowman.png differ
diff --git a/public/images/emoji/facebook_messenger/snowman2.png b/public/images/emoji/facebook_messenger/snowman2.png
new file mode 100644
index 00000000000..abefab72343
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snowman2.png differ
diff --git a/public/images/emoji/facebook_messenger/snowman_with_snow.png b/public/images/emoji/facebook_messenger/snowman_with_snow.png
new file mode 100644
index 00000000000..abefab72343
Binary files /dev/null and b/public/images/emoji/facebook_messenger/snowman_with_snow.png differ
diff --git a/public/images/emoji/facebook_messenger/sob.png b/public/images/emoji/facebook_messenger/sob.png
new file mode 100644
index 00000000000..825639b5668
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sob.png differ
diff --git a/public/images/emoji/facebook_messenger/soccer.png b/public/images/emoji/facebook_messenger/soccer.png
new file mode 100644
index 00000000000..5b34f824748
Binary files /dev/null and b/public/images/emoji/facebook_messenger/soccer.png differ
diff --git a/public/images/emoji/facebook_messenger/socks.png b/public/images/emoji/facebook_messenger/socks.png
new file mode 100644
index 00000000000..8f2b9bbe9e3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/socks.png differ
diff --git a/public/images/emoji/facebook_messenger/solomon_islands.png b/public/images/emoji/facebook_messenger/solomon_islands.png
new file mode 100644
index 00000000000..e4476e18806
Binary files /dev/null and b/public/images/emoji/facebook_messenger/solomon_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/somalia.png b/public/images/emoji/facebook_messenger/somalia.png
new file mode 100644
index 00000000000..209fffeaed0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/somalia.png differ
diff --git a/public/images/emoji/facebook_messenger/soon.png b/public/images/emoji/facebook_messenger/soon.png
new file mode 100644
index 00000000000..06de16d0912
Binary files /dev/null and b/public/images/emoji/facebook_messenger/soon.png differ
diff --git a/public/images/emoji/facebook_messenger/sos.png b/public/images/emoji/facebook_messenger/sos.png
new file mode 100644
index 00000000000..d8ddeba4e08
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sos.png differ
diff --git a/public/images/emoji/facebook_messenger/sound.png b/public/images/emoji/facebook_messenger/sound.png
new file mode 100644
index 00000000000..2311f6534cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sound.png differ
diff --git a/public/images/emoji/facebook_messenger/south_africa.png b/public/images/emoji/facebook_messenger/south_africa.png
new file mode 100644
index 00000000000..967b98eb846
Binary files /dev/null and b/public/images/emoji/facebook_messenger/south_africa.png differ
diff --git a/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png b/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png
new file mode 100644
index 00000000000..58f47bcd9b9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/south_sudan.png b/public/images/emoji/facebook_messenger/south_sudan.png
new file mode 100644
index 00000000000..c7cbc6967c2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/south_sudan.png differ
diff --git a/public/images/emoji/facebook_messenger/space_invader.png b/public/images/emoji/facebook_messenger/space_invader.png
new file mode 100644
index 00000000000..ef0cc6b6458
Binary files /dev/null and b/public/images/emoji/facebook_messenger/space_invader.png differ
diff --git a/public/images/emoji/facebook_messenger/spades.png b/public/images/emoji/facebook_messenger/spades.png
new file mode 100644
index 00000000000..d8caab8d911
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spades.png differ
diff --git a/public/images/emoji/facebook_messenger/spaghetti.png b/public/images/emoji/facebook_messenger/spaghetti.png
new file mode 100644
index 00000000000..8276dcbec6a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spaghetti.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkle.png b/public/images/emoji/facebook_messenger/sparkle.png
new file mode 100644
index 00000000000..b63a7dea208
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sparkle.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkler.png b/public/images/emoji/facebook_messenger/sparkler.png
new file mode 100644
index 00000000000..71550c5313e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sparkler.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkles.png b/public/images/emoji/facebook_messenger/sparkles.png
new file mode 100644
index 00000000000..081aa8bea4b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sparkles.png differ
diff --git a/public/images/emoji/facebook_messenger/sparkling_heart.png b/public/images/emoji/facebook_messenger/sparkling_heart.png
new file mode 100644
index 00000000000..db195de7cd8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sparkling_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/speak_no_evil.png b/public/images/emoji/facebook_messenger/speak_no_evil.png
new file mode 100644
index 00000000000..4e7665f8319
Binary files /dev/null and b/public/images/emoji/facebook_messenger/speak_no_evil.png differ
diff --git a/public/images/emoji/facebook_messenger/speaker.png b/public/images/emoji/facebook_messenger/speaker.png
new file mode 100644
index 00000000000..5ce21108798
Binary files /dev/null and b/public/images/emoji/facebook_messenger/speaker.png differ
diff --git a/public/images/emoji/facebook_messenger/speaking_head.png b/public/images/emoji/facebook_messenger/speaking_head.png
new file mode 100644
index 00000000000..edf252b9bdc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/speaking_head.png differ
diff --git a/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png b/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png
new file mode 100644
index 00000000000..edf252b9bdc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/facebook_messenger/speech_balloon.png b/public/images/emoji/facebook_messenger/speech_balloon.png
new file mode 100644
index 00000000000..ec17855d07a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/speech_balloon.png differ
diff --git a/public/images/emoji/facebook_messenger/speedboat.png b/public/images/emoji/facebook_messenger/speedboat.png
new file mode 100644
index 00000000000..cf31f7eac16
Binary files /dev/null and b/public/images/emoji/facebook_messenger/speedboat.png differ
diff --git a/public/images/emoji/facebook_messenger/spider.png b/public/images/emoji/facebook_messenger/spider.png
new file mode 100644
index 00000000000..12ef291fa03
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spider.png differ
diff --git a/public/images/emoji/facebook_messenger/spider_web.png b/public/images/emoji/facebook_messenger/spider_web.png
new file mode 100644
index 00000000000..568c1dec8ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spider_web.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_calendar.png b/public/images/emoji/facebook_messenger/spiral_calendar.png
new file mode 100644
index 00000000000..8cd3bd7e57f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spiral_calendar.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_calendar_pad.png b/public/images/emoji/facebook_messenger/spiral_calendar_pad.png
new file mode 100644
index 00000000000..8cd3bd7e57f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_note_pad.png b/public/images/emoji/facebook_messenger/spiral_note_pad.png
new file mode 100644
index 00000000000..b8ebfe080a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spiral_note_pad.png differ
diff --git a/public/images/emoji/facebook_messenger/spiral_notepad.png b/public/images/emoji/facebook_messenger/spiral_notepad.png
new file mode 100644
index 00000000000..b8ebfe080a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spiral_notepad.png differ
diff --git a/public/images/emoji/facebook_messenger/spoon.png b/public/images/emoji/facebook_messenger/spoon.png
new file mode 100644
index 00000000000..960cba2bf7f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spoon.png differ
diff --git a/public/images/emoji/facebook_messenger/sports_medal.png b/public/images/emoji/facebook_messenger/sports_medal.png
new file mode 100644
index 00000000000..57fbc8512fc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sports_medal.png differ
diff --git a/public/images/emoji/facebook_messenger/spy.png b/public/images/emoji/facebook_messenger/spy.png
new file mode 100644
index 00000000000..587e506d98d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spy.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/2.png b/public/images/emoji/facebook_messenger/spy/2.png
new file mode 100644
index 00000000000..a25d5ea4d44
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spy/2.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/3.png b/public/images/emoji/facebook_messenger/spy/3.png
new file mode 100644
index 00000000000..f100fd13a45
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spy/3.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/4.png b/public/images/emoji/facebook_messenger/spy/4.png
new file mode 100644
index 00000000000..775a8b2f2b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spy/4.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/5.png b/public/images/emoji/facebook_messenger/spy/5.png
new file mode 100644
index 00000000000..c9703ba9946
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spy/5.png differ
diff --git a/public/images/emoji/facebook_messenger/spy/6.png b/public/images/emoji/facebook_messenger/spy/6.png
new file mode 100644
index 00000000000..55cc03db8d4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/spy/6.png differ
diff --git a/public/images/emoji/facebook_messenger/squid.png b/public/images/emoji/facebook_messenger/squid.png
new file mode 100644
index 00000000000..8e1b95f60e9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/squid.png differ
diff --git a/public/images/emoji/facebook_messenger/sri_lanka.png b/public/images/emoji/facebook_messenger/sri_lanka.png
new file mode 100644
index 00000000000..f15b9be56dd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sri_lanka.png differ
diff --git a/public/images/emoji/facebook_messenger/st_barthelemy.png b/public/images/emoji/facebook_messenger/st_barthelemy.png
new file mode 100644
index 00000000000..e213bf7e406
Binary files /dev/null and b/public/images/emoji/facebook_messenger/st_barthelemy.png differ
diff --git a/public/images/emoji/facebook_messenger/st_helena.png b/public/images/emoji/facebook_messenger/st_helena.png
new file mode 100644
index 00000000000..90fefd0cab2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/st_helena.png differ
diff --git a/public/images/emoji/facebook_messenger/st_kitts_nevis.png b/public/images/emoji/facebook_messenger/st_kitts_nevis.png
new file mode 100644
index 00000000000..d7686f8b603
Binary files /dev/null and b/public/images/emoji/facebook_messenger/st_kitts_nevis.png differ
diff --git a/public/images/emoji/facebook_messenger/st_lucia.png b/public/images/emoji/facebook_messenger/st_lucia.png
new file mode 100644
index 00000000000..92eafffe947
Binary files /dev/null and b/public/images/emoji/facebook_messenger/st_lucia.png differ
diff --git a/public/images/emoji/facebook_messenger/st_martin.png b/public/images/emoji/facebook_messenger/st_martin.png
new file mode 100644
index 00000000000..7943b73f671
Binary files /dev/null and b/public/images/emoji/facebook_messenger/st_martin.png differ
diff --git a/public/images/emoji/facebook_messenger/st_pierre_miquelon.png b/public/images/emoji/facebook_messenger/st_pierre_miquelon.png
new file mode 100644
index 00000000000..b05828b47cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/facebook_messenger/st_vincent_grenadines.png b/public/images/emoji/facebook_messenger/st_vincent_grenadines.png
new file mode 100644
index 00000000000..ddfd25fd227
Binary files /dev/null and b/public/images/emoji/facebook_messenger/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/facebook_messenger/stadium.png b/public/images/emoji/facebook_messenger/stadium.png
new file mode 100644
index 00000000000..0ad57f80a41
Binary files /dev/null and b/public/images/emoji/facebook_messenger/stadium.png differ
diff --git a/public/images/emoji/facebook_messenger/star.png b/public/images/emoji/facebook_messenger/star.png
new file mode 100644
index 00000000000..7381725ef41
Binary files /dev/null and b/public/images/emoji/facebook_messenger/star.png differ
diff --git a/public/images/emoji/facebook_messenger/star2.png b/public/images/emoji/facebook_messenger/star2.png
new file mode 100644
index 00000000000..43cfbee5cb4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/star2.png differ
diff --git a/public/images/emoji/facebook_messenger/star_and_crescent.png b/public/images/emoji/facebook_messenger/star_and_crescent.png
new file mode 100644
index 00000000000..a89f689ad59
Binary files /dev/null and b/public/images/emoji/facebook_messenger/star_and_crescent.png differ
diff --git a/public/images/emoji/facebook_messenger/star_of_david.png b/public/images/emoji/facebook_messenger/star_of_david.png
new file mode 100644
index 00000000000..96462ffd58f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/star_of_david.png differ
diff --git a/public/images/emoji/facebook_messenger/star_struck.png b/public/images/emoji/facebook_messenger/star_struck.png
new file mode 100644
index 00000000000..7da8183f394
Binary files /dev/null and b/public/images/emoji/facebook_messenger/star_struck.png differ
diff --git a/public/images/emoji/facebook_messenger/stars.png b/public/images/emoji/facebook_messenger/stars.png
new file mode 100644
index 00000000000..a7cfe72b881
Binary files /dev/null and b/public/images/emoji/facebook_messenger/stars.png differ
diff --git a/public/images/emoji/facebook_messenger/station.png b/public/images/emoji/facebook_messenger/station.png
new file mode 100644
index 00000000000..66b496b9a24
Binary files /dev/null and b/public/images/emoji/facebook_messenger/station.png differ
diff --git a/public/images/emoji/facebook_messenger/statue_of_liberty.png b/public/images/emoji/facebook_messenger/statue_of_liberty.png
new file mode 100644
index 00000000000..0bf418a00b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/statue_of_liberty.png differ
diff --git a/public/images/emoji/facebook_messenger/steam_locomotive.png b/public/images/emoji/facebook_messenger/steam_locomotive.png
new file mode 100644
index 00000000000..1c5caa9a1c6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/steam_locomotive.png differ
diff --git a/public/images/emoji/facebook_messenger/stew.png b/public/images/emoji/facebook_messenger/stew.png
new file mode 100644
index 00000000000..e2c6063d238
Binary files /dev/null and b/public/images/emoji/facebook_messenger/stew.png differ
diff --git a/public/images/emoji/facebook_messenger/stop_button.png b/public/images/emoji/facebook_messenger/stop_button.png
new file mode 100644
index 00000000000..bbdb0b7b75a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/stop_button.png differ
diff --git a/public/images/emoji/facebook_messenger/stop_sign.png b/public/images/emoji/facebook_messenger/stop_sign.png
new file mode 100644
index 00000000000..cf08756ebf4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/stop_sign.png differ
diff --git a/public/images/emoji/facebook_messenger/stopwatch.png b/public/images/emoji/facebook_messenger/stopwatch.png
new file mode 100644
index 00000000000..74bff440042
Binary files /dev/null and b/public/images/emoji/facebook_messenger/stopwatch.png differ
diff --git a/public/images/emoji/facebook_messenger/straight_ruler.png b/public/images/emoji/facebook_messenger/straight_ruler.png
new file mode 100644
index 00000000000..96957387625
Binary files /dev/null and b/public/images/emoji/facebook_messenger/straight_ruler.png differ
diff --git a/public/images/emoji/facebook_messenger/strawberry.png b/public/images/emoji/facebook_messenger/strawberry.png
new file mode 100644
index 00000000000..0b2dd5ba438
Binary files /dev/null and b/public/images/emoji/facebook_messenger/strawberry.png differ
diff --git a/public/images/emoji/facebook_messenger/stuck_out_tongue.png b/public/images/emoji/facebook_messenger/stuck_out_tongue.png
new file mode 100644
index 00000000000..1bc67678616
Binary files /dev/null and b/public/images/emoji/facebook_messenger/stuck_out_tongue.png differ
diff --git a/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png b/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png
new file mode 100644
index 00000000000..fc6eb0cb994
Binary files /dev/null and b/public/images/emoji/facebook_messenger/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png b/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png
new file mode 100644
index 00000000000..227eebc6ad3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/facebook_messenger/studio_microphone.png b/public/images/emoji/facebook_messenger/studio_microphone.png
new file mode 100644
index 00000000000..d10b32281fc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/studio_microphone.png differ
diff --git a/public/images/emoji/facebook_messenger/stuffed_flatbread.png b/public/images/emoji/facebook_messenger/stuffed_flatbread.png
new file mode 100644
index 00000000000..f5dca14bd2b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/stuffed_flatbread.png differ
diff --git a/public/images/emoji/facebook_messenger/sudan.png b/public/images/emoji/facebook_messenger/sudan.png
new file mode 100644
index 00000000000..3974a07328c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sudan.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png b/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png
new file mode 100644
index 00000000000..3ceb40a9ec0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png b/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png
new file mode 100644
index 00000000000..ef892f1f889
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png b/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png
new file mode 100644
index 00000000000..90af3591e04
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/sun_with_face.png b/public/images/emoji/facebook_messenger/sun_with_face.png
new file mode 100644
index 00000000000..5c3125e2128
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sun_with_face.png differ
diff --git a/public/images/emoji/facebook_messenger/sunflower.png b/public/images/emoji/facebook_messenger/sunflower.png
new file mode 100644
index 00000000000..f5ef9ec1df0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sunflower.png differ
diff --git a/public/images/emoji/facebook_messenger/sunglasses.png b/public/images/emoji/facebook_messenger/sunglasses.png
new file mode 100644
index 00000000000..e1ed3118061
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sunglasses.png differ
diff --git a/public/images/emoji/facebook_messenger/sunny.png b/public/images/emoji/facebook_messenger/sunny.png
new file mode 100644
index 00000000000..02632bb3dfe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sunny.png differ
diff --git a/public/images/emoji/facebook_messenger/sunrise.png b/public/images/emoji/facebook_messenger/sunrise.png
new file mode 100644
index 00000000000..b10c95a0e97
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sunrise.png differ
diff --git a/public/images/emoji/facebook_messenger/sunrise_over_mountains.png b/public/images/emoji/facebook_messenger/sunrise_over_mountains.png
new file mode 100644
index 00000000000..5642e6c0ca7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer.png b/public/images/emoji/facebook_messenger/surfer.png
new file mode 100644
index 00000000000..0d12c43c8bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfer.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/2.png b/public/images/emoji/facebook_messenger/surfer/2.png
new file mode 100644
index 00000000000..596085dc017
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/3.png b/public/images/emoji/facebook_messenger/surfer/3.png
new file mode 100644
index 00000000000..2ddb34c2507
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/4.png b/public/images/emoji/facebook_messenger/surfer/4.png
new file mode 100644
index 00000000000..46785c0494c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/5.png b/public/images/emoji/facebook_messenger/surfer/5.png
new file mode 100644
index 00000000000..d241b79d590
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/surfer/6.png b/public/images/emoji/facebook_messenger/surfer/6.png
new file mode 100644
index 00000000000..d6b178659cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man.png b/public/images/emoji/facebook_messenger/surfing_man.png
new file mode 100644
index 00000000000..0d12c43c8bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_man.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/2.png b/public/images/emoji/facebook_messenger/surfing_man/2.png
new file mode 100644
index 00000000000..596085dc017
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/3.png b/public/images/emoji/facebook_messenger/surfing_man/3.png
new file mode 100644
index 00000000000..2ddb34c2507
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/4.png b/public/images/emoji/facebook_messenger/surfing_man/4.png
new file mode 100644
index 00000000000..46785c0494c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/5.png b/public/images/emoji/facebook_messenger/surfing_man/5.png
new file mode 100644
index 00000000000..d241b79d590
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_man/6.png b/public/images/emoji/facebook_messenger/surfing_man/6.png
new file mode 100644
index 00000000000..d6b178659cb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman.png b/public/images/emoji/facebook_messenger/surfing_woman.png
new file mode 100644
index 00000000000..5a5e1cefda9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/2.png b/public/images/emoji/facebook_messenger/surfing_woman/2.png
new file mode 100644
index 00000000000..c66e258d1c7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/3.png b/public/images/emoji/facebook_messenger/surfing_woman/3.png
new file mode 100644
index 00000000000..0e9b7989d64
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/4.png b/public/images/emoji/facebook_messenger/surfing_woman/4.png
new file mode 100644
index 00000000000..50f43ce0700
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/5.png b/public/images/emoji/facebook_messenger/surfing_woman/5.png
new file mode 100644
index 00000000000..99d3d275355
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/surfing_woman/6.png b/public/images/emoji/facebook_messenger/surfing_woman/6.png
new file mode 100644
index 00000000000..f30dff2f5a9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/surfing_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/suriname.png b/public/images/emoji/facebook_messenger/suriname.png
new file mode 100644
index 00000000000..48afc4adac5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/suriname.png differ
diff --git a/public/images/emoji/facebook_messenger/sushi.png b/public/images/emoji/facebook_messenger/sushi.png
new file mode 100644
index 00000000000..a388ce9d65a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sushi.png differ
diff --git a/public/images/emoji/facebook_messenger/sushing_face.png b/public/images/emoji/facebook_messenger/sushing_face.png
new file mode 100644
index 00000000000..e4427cbd153
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sushing_face.png differ
diff --git a/public/images/emoji/facebook_messenger/suspension_railway.png b/public/images/emoji/facebook_messenger/suspension_railway.png
new file mode 100644
index 00000000000..3dd6dc2e8a0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/suspension_railway.png differ
diff --git a/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png b/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png
new file mode 100644
index 00000000000..004a11d8308
Binary files /dev/null and b/public/images/emoji/facebook_messenger/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/facebook_messenger/swaziland.png b/public/images/emoji/facebook_messenger/swaziland.png
new file mode 100644
index 00000000000..fb5ee97ba24
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swaziland.png differ
diff --git a/public/images/emoji/facebook_messenger/sweat.png b/public/images/emoji/facebook_messenger/sweat.png
new file mode 100644
index 00000000000..0f6075cbcce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sweat.png differ
diff --git a/public/images/emoji/facebook_messenger/sweat_drops.png b/public/images/emoji/facebook_messenger/sweat_drops.png
new file mode 100644
index 00000000000..2555ca7db40
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sweat_drops.png differ
diff --git a/public/images/emoji/facebook_messenger/sweat_smile.png b/public/images/emoji/facebook_messenger/sweat_smile.png
new file mode 100644
index 00000000000..f910451ae6c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sweat_smile.png differ
diff --git a/public/images/emoji/facebook_messenger/sweden.png b/public/images/emoji/facebook_messenger/sweden.png
new file mode 100644
index 00000000000..7274789f2eb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sweden.png differ
diff --git a/public/images/emoji/facebook_messenger/sweet_potato.png b/public/images/emoji/facebook_messenger/sweet_potato.png
new file mode 100644
index 00000000000..cf664331449
Binary files /dev/null and b/public/images/emoji/facebook_messenger/sweet_potato.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer.png b/public/images/emoji/facebook_messenger/swimmer.png
new file mode 100644
index 00000000000..4ef1cc186fa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimmer.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/2.png b/public/images/emoji/facebook_messenger/swimmer/2.png
new file mode 100644
index 00000000000..c6140b93bb3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimmer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/3.png b/public/images/emoji/facebook_messenger/swimmer/3.png
new file mode 100644
index 00000000000..cdb3af693aa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimmer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/4.png b/public/images/emoji/facebook_messenger/swimmer/4.png
new file mode 100644
index 00000000000..989a36b8c83
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimmer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/5.png b/public/images/emoji/facebook_messenger/swimmer/5.png
new file mode 100644
index 00000000000..ab6537f51e7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimmer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/swimmer/6.png b/public/images/emoji/facebook_messenger/swimmer/6.png
new file mode 100644
index 00000000000..d49ea483d20
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimmer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man.png b/public/images/emoji/facebook_messenger/swimming_man.png
new file mode 100644
index 00000000000..4ef1cc186fa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_man.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/2.png b/public/images/emoji/facebook_messenger/swimming_man/2.png
new file mode 100644
index 00000000000..c6140b93bb3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/3.png b/public/images/emoji/facebook_messenger/swimming_man/3.png
new file mode 100644
index 00000000000..cdb3af693aa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/4.png b/public/images/emoji/facebook_messenger/swimming_man/4.png
new file mode 100644
index 00000000000..989a36b8c83
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/5.png b/public/images/emoji/facebook_messenger/swimming_man/5.png
new file mode 100644
index 00000000000..ab6537f51e7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_man/6.png b/public/images/emoji/facebook_messenger/swimming_man/6.png
new file mode 100644
index 00000000000..d49ea483d20
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman.png b/public/images/emoji/facebook_messenger/swimming_woman.png
new file mode 100644
index 00000000000..9963221f611
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/2.png b/public/images/emoji/facebook_messenger/swimming_woman/2.png
new file mode 100644
index 00000000000..59dad2c3e13
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/3.png b/public/images/emoji/facebook_messenger/swimming_woman/3.png
new file mode 100644
index 00000000000..66e962335cf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/4.png b/public/images/emoji/facebook_messenger/swimming_woman/4.png
new file mode 100644
index 00000000000..9414644c3e8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/5.png b/public/images/emoji/facebook_messenger/swimming_woman/5.png
new file mode 100644
index 00000000000..ebde0eb37c5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/swimming_woman/6.png b/public/images/emoji/facebook_messenger/swimming_woman/6.png
new file mode 100644
index 00000000000..d294454be94
Binary files /dev/null and b/public/images/emoji/facebook_messenger/swimming_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/switzerland.png b/public/images/emoji/facebook_messenger/switzerland.png
new file mode 100644
index 00000000000..9e47fad1aed
Binary files /dev/null and b/public/images/emoji/facebook_messenger/switzerland.png differ
diff --git a/public/images/emoji/facebook_messenger/symbols.png b/public/images/emoji/facebook_messenger/symbols.png
new file mode 100644
index 00000000000..def3faa02a7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/symbols.png differ
diff --git a/public/images/emoji/facebook_messenger/synagogue.png b/public/images/emoji/facebook_messenger/synagogue.png
new file mode 100644
index 00000000000..c72b028f247
Binary files /dev/null and b/public/images/emoji/facebook_messenger/synagogue.png differ
diff --git a/public/images/emoji/facebook_messenger/syria.png b/public/images/emoji/facebook_messenger/syria.png
new file mode 100644
index 00000000000..53606f3e075
Binary files /dev/null and b/public/images/emoji/facebook_messenger/syria.png differ
diff --git a/public/images/emoji/facebook_messenger/syringe.png b/public/images/emoji/facebook_messenger/syringe.png
new file mode 100644
index 00000000000..45cf34b2a12
Binary files /dev/null and b/public/images/emoji/facebook_messenger/syringe.png differ
diff --git a/public/images/emoji/facebook_messenger/t_rex.png b/public/images/emoji/facebook_messenger/t_rex.png
new file mode 100644
index 00000000000..d8811a56382
Binary files /dev/null and b/public/images/emoji/facebook_messenger/t_rex.png differ
diff --git a/public/images/emoji/facebook_messenger/table_tennis.png b/public/images/emoji/facebook_messenger/table_tennis.png
new file mode 100644
index 00000000000..935993c8608
Binary files /dev/null and b/public/images/emoji/facebook_messenger/table_tennis.png differ
diff --git a/public/images/emoji/facebook_messenger/taco.png b/public/images/emoji/facebook_messenger/taco.png
new file mode 100644
index 00000000000..14247eb307a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/taco.png differ
diff --git a/public/images/emoji/facebook_messenger/tada.png b/public/images/emoji/facebook_messenger/tada.png
new file mode 100644
index 00000000000..ae95549f3ba
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tada.png differ
diff --git a/public/images/emoji/facebook_messenger/taiwan.png b/public/images/emoji/facebook_messenger/taiwan.png
new file mode 100644
index 00000000000..dde348b40da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/taiwan.png differ
diff --git a/public/images/emoji/facebook_messenger/tajikistan.png b/public/images/emoji/facebook_messenger/tajikistan.png
new file mode 100644
index 00000000000..7b3697952d5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tajikistan.png differ
diff --git a/public/images/emoji/facebook_messenger/takeout_box.png b/public/images/emoji/facebook_messenger/takeout_box.png
new file mode 100644
index 00000000000..08aa6a4843f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/takeout_box.png differ
diff --git a/public/images/emoji/facebook_messenger/tanabata_tree.png b/public/images/emoji/facebook_messenger/tanabata_tree.png
new file mode 100644
index 00000000000..ddf022c97fa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tanabata_tree.png differ
diff --git a/public/images/emoji/facebook_messenger/tangerine.png b/public/images/emoji/facebook_messenger/tangerine.png
new file mode 100644
index 00000000000..369113f279e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tangerine.png differ
diff --git a/public/images/emoji/facebook_messenger/tanzania.png b/public/images/emoji/facebook_messenger/tanzania.png
new file mode 100644
index 00000000000..d4026fea320
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tanzania.png differ
diff --git a/public/images/emoji/facebook_messenger/taurus.png b/public/images/emoji/facebook_messenger/taurus.png
new file mode 100644
index 00000000000..0fc8505969d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/taurus.png differ
diff --git a/public/images/emoji/facebook_messenger/taxi.png b/public/images/emoji/facebook_messenger/taxi.png
new file mode 100644
index 00000000000..3097c343af5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/taxi.png differ
diff --git a/public/images/emoji/facebook_messenger/tea.png b/public/images/emoji/facebook_messenger/tea.png
new file mode 100644
index 00000000000..e8ea9431140
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tea.png differ
diff --git a/public/images/emoji/facebook_messenger/telephone.png b/public/images/emoji/facebook_messenger/telephone.png
new file mode 100644
index 00000000000..b8bbec494d3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/telephone.png differ
diff --git a/public/images/emoji/facebook_messenger/telephone_receiver.png b/public/images/emoji/facebook_messenger/telephone_receiver.png
new file mode 100644
index 00000000000..ec5f5e89cc7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/telephone_receiver.png differ
diff --git a/public/images/emoji/facebook_messenger/telescope.png b/public/images/emoji/facebook_messenger/telescope.png
new file mode 100644
index 00000000000..e01c0f8aaca
Binary files /dev/null and b/public/images/emoji/facebook_messenger/telescope.png differ
diff --git a/public/images/emoji/facebook_messenger/ten.png b/public/images/emoji/facebook_messenger/ten.png
new file mode 100644
index 00000000000..12264637b0b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ten.png differ
diff --git a/public/images/emoji/facebook_messenger/tennis.png b/public/images/emoji/facebook_messenger/tennis.png
new file mode 100644
index 00000000000..bddde41f5ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tennis.png differ
diff --git a/public/images/emoji/facebook_messenger/tent.png b/public/images/emoji/facebook_messenger/tent.png
new file mode 100644
index 00000000000..22617eb275f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tent.png differ
diff --git a/public/images/emoji/facebook_messenger/thailand.png b/public/images/emoji/facebook_messenger/thailand.png
new file mode 100644
index 00000000000..81499f16168
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thailand.png differ
diff --git a/public/images/emoji/facebook_messenger/thermometer.png b/public/images/emoji/facebook_messenger/thermometer.png
new file mode 100644
index 00000000000..eef50895b07
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thermometer.png differ
diff --git a/public/images/emoji/facebook_messenger/thermometer_face.png b/public/images/emoji/facebook_messenger/thermometer_face.png
new file mode 100644
index 00000000000..c9440239c0d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thermometer_face.png differ
diff --git a/public/images/emoji/facebook_messenger/thinking.png b/public/images/emoji/facebook_messenger/thinking.png
new file mode 100644
index 00000000000..f1bc0726a29
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thinking.png differ
diff --git a/public/images/emoji/facebook_messenger/thinking_face.png b/public/images/emoji/facebook_messenger/thinking_face.png
new file mode 100644
index 00000000000..f1bc0726a29
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thinking_face.png differ
diff --git a/public/images/emoji/facebook_messenger/thought_balloon.png b/public/images/emoji/facebook_messenger/thought_balloon.png
new file mode 100644
index 00000000000..a8cae3276a5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thought_balloon.png differ
diff --git a/public/images/emoji/facebook_messenger/three.png b/public/images/emoji/facebook_messenger/three.png
new file mode 100644
index 00000000000..e57e2a8272d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/three.png differ
diff --git a/public/images/emoji/facebook_messenger/three_button_mouse.png b/public/images/emoji/facebook_messenger/three_button_mouse.png
new file mode 100644
index 00000000000..3a71c800c68
Binary files /dev/null and b/public/images/emoji/facebook_messenger/three_button_mouse.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown.png b/public/images/emoji/facebook_messenger/thumbsdown.png
new file mode 100644
index 00000000000..1f6f64836b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsdown.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/2.png b/public/images/emoji/facebook_messenger/thumbsdown/2.png
new file mode 100644
index 00000000000..e706d7c7a54
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsdown/2.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/3.png b/public/images/emoji/facebook_messenger/thumbsdown/3.png
new file mode 100644
index 00000000000..9bf7711367e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsdown/3.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/4.png b/public/images/emoji/facebook_messenger/thumbsdown/4.png
new file mode 100644
index 00000000000..35fc141cba2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsdown/4.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/5.png b/public/images/emoji/facebook_messenger/thumbsdown/5.png
new file mode 100644
index 00000000000..bd43bad3049
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsdown/5.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsdown/6.png b/public/images/emoji/facebook_messenger/thumbsdown/6.png
new file mode 100644
index 00000000000..5b682877029
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsdown/6.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup.png b/public/images/emoji/facebook_messenger/thumbsup.png
new file mode 100644
index 00000000000..6621dc4a7bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsup.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/2.png b/public/images/emoji/facebook_messenger/thumbsup/2.png
new file mode 100644
index 00000000000..37b29f3252d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsup/2.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/3.png b/public/images/emoji/facebook_messenger/thumbsup/3.png
new file mode 100644
index 00000000000..c7aa5375582
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsup/3.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/4.png b/public/images/emoji/facebook_messenger/thumbsup/4.png
new file mode 100644
index 00000000000..1e24d40e565
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsup/4.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/5.png b/public/images/emoji/facebook_messenger/thumbsup/5.png
new file mode 100644
index 00000000000..5b1740d87b2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsup/5.png differ
diff --git a/public/images/emoji/facebook_messenger/thumbsup/6.png b/public/images/emoji/facebook_messenger/thumbsup/6.png
new file mode 100644
index 00000000000..e67bd06a2ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thumbsup/6.png differ
diff --git a/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png b/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png
new file mode 100644
index 00000000000..be44d531a75
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/thunder_cloud_rain.png b/public/images/emoji/facebook_messenger/thunder_cloud_rain.png
new file mode 100644
index 00000000000..be44d531a75
Binary files /dev/null and b/public/images/emoji/facebook_messenger/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/ticket.png b/public/images/emoji/facebook_messenger/ticket.png
new file mode 100644
index 00000000000..2894d403000
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ticket.png differ
diff --git a/public/images/emoji/facebook_messenger/tickets.png b/public/images/emoji/facebook_messenger/tickets.png
new file mode 100644
index 00000000000..295e9bbdc6d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tickets.png differ
diff --git a/public/images/emoji/facebook_messenger/tiger.png b/public/images/emoji/facebook_messenger/tiger.png
new file mode 100644
index 00000000000..c393c38d499
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tiger.png differ
diff --git a/public/images/emoji/facebook_messenger/tiger2.png b/public/images/emoji/facebook_messenger/tiger2.png
new file mode 100644
index 00000000000..9934d6e85b4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tiger2.png differ
diff --git a/public/images/emoji/facebook_messenger/timer.png b/public/images/emoji/facebook_messenger/timer.png
new file mode 100644
index 00000000000..31f31d89371
Binary files /dev/null and b/public/images/emoji/facebook_messenger/timer.png differ
diff --git a/public/images/emoji/facebook_messenger/timer_clock.png b/public/images/emoji/facebook_messenger/timer_clock.png
new file mode 100644
index 00000000000..31f31d89371
Binary files /dev/null and b/public/images/emoji/facebook_messenger/timer_clock.png differ
diff --git a/public/images/emoji/facebook_messenger/timor_leste.png b/public/images/emoji/facebook_messenger/timor_leste.png
new file mode 100644
index 00000000000..6706def9912
Binary files /dev/null and b/public/images/emoji/facebook_messenger/timor_leste.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man.png b/public/images/emoji/facebook_messenger/tipping_hand_man.png
new file mode 100644
index 00000000000..63e5492220b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_man.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/2.png b/public/images/emoji/facebook_messenger/tipping_hand_man/2.png
new file mode 100644
index 00000000000..aec62f49f46
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/3.png b/public/images/emoji/facebook_messenger/tipping_hand_man/3.png
new file mode 100644
index 00000000000..92e1fe7d224
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/4.png b/public/images/emoji/facebook_messenger/tipping_hand_man/4.png
new file mode 100644
index 00000000000..813113bb9c5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/5.png b/public/images/emoji/facebook_messenger/tipping_hand_man/5.png
new file mode 100644
index 00000000000..a2f29fdac94
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_man/6.png b/public/images/emoji/facebook_messenger/tipping_hand_man/6.png
new file mode 100644
index 00000000000..fa68bdb53aa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman.png b/public/images/emoji/facebook_messenger/tipping_hand_woman.png
new file mode 100644
index 00000000000..17d66f473bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png
new file mode 100644
index 00000000000..92055ff0cd9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png
new file mode 100644
index 00000000000..2c8a485a1f4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png
new file mode 100644
index 00000000000..890ae929d22
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png
new file mode 100644
index 00000000000..c7228bf6a8c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png b/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png
new file mode 100644
index 00000000000..f02f68988a0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/tired_face.png b/public/images/emoji/facebook_messenger/tired_face.png
new file mode 100644
index 00000000000..d1d6a8b748b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tired_face.png differ
diff --git a/public/images/emoji/facebook_messenger/tm.png b/public/images/emoji/facebook_messenger/tm.png
new file mode 100644
index 00000000000..d18a8b8004d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tm.png differ
diff --git a/public/images/emoji/facebook_messenger/togo.png b/public/images/emoji/facebook_messenger/togo.png
new file mode 100644
index 00000000000..7a542547e05
Binary files /dev/null and b/public/images/emoji/facebook_messenger/togo.png differ
diff --git a/public/images/emoji/facebook_messenger/toilet.png b/public/images/emoji/facebook_messenger/toilet.png
new file mode 100644
index 00000000000..99d7a913ceb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/toilet.png differ
diff --git a/public/images/emoji/facebook_messenger/tokelau.png b/public/images/emoji/facebook_messenger/tokelau.png
new file mode 100644
index 00000000000..f42f8686314
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tokelau.png differ
diff --git a/public/images/emoji/facebook_messenger/tokyo_tower.png b/public/images/emoji/facebook_messenger/tokyo_tower.png
new file mode 100644
index 00000000000..f2e7e714e00
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tokyo_tower.png differ
diff --git a/public/images/emoji/facebook_messenger/tomato.png b/public/images/emoji/facebook_messenger/tomato.png
new file mode 100644
index 00000000000..245cf164624
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tomato.png differ
diff --git a/public/images/emoji/facebook_messenger/tonga.png b/public/images/emoji/facebook_messenger/tonga.png
new file mode 100644
index 00000000000..bfff80acf4d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tonga.png differ
diff --git a/public/images/emoji/facebook_messenger/tongue.png b/public/images/emoji/facebook_messenger/tongue.png
new file mode 100644
index 00000000000..34fe6e63884
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tongue.png differ
diff --git a/public/images/emoji/facebook_messenger/tools.png b/public/images/emoji/facebook_messenger/tools.png
new file mode 100644
index 00000000000..2b7c33b2077
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tools.png differ
diff --git a/public/images/emoji/facebook_messenger/top.png b/public/images/emoji/facebook_messenger/top.png
new file mode 100644
index 00000000000..323068a7089
Binary files /dev/null and b/public/images/emoji/facebook_messenger/top.png differ
diff --git a/public/images/emoji/facebook_messenger/tophat.png b/public/images/emoji/facebook_messenger/tophat.png
new file mode 100644
index 00000000000..57b63124678
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tophat.png differ
diff --git a/public/images/emoji/facebook_messenger/tornado.png b/public/images/emoji/facebook_messenger/tornado.png
new file mode 100644
index 00000000000..fd843824ed3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tornado.png differ
diff --git a/public/images/emoji/facebook_messenger/tr.png b/public/images/emoji/facebook_messenger/tr.png
new file mode 100644
index 00000000000..0658b52963d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tr.png differ
diff --git a/public/images/emoji/facebook_messenger/track_next.png b/public/images/emoji/facebook_messenger/track_next.png
new file mode 100644
index 00000000000..13953da5d7f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/track_next.png differ
diff --git a/public/images/emoji/facebook_messenger/track_previous.png b/public/images/emoji/facebook_messenger/track_previous.png
new file mode 100644
index 00000000000..ada39abc337
Binary files /dev/null and b/public/images/emoji/facebook_messenger/track_previous.png differ
diff --git a/public/images/emoji/facebook_messenger/trackball.png b/public/images/emoji/facebook_messenger/trackball.png
new file mode 100644
index 00000000000..c2258edc121
Binary files /dev/null and b/public/images/emoji/facebook_messenger/trackball.png differ
diff --git a/public/images/emoji/facebook_messenger/tractor.png b/public/images/emoji/facebook_messenger/tractor.png
new file mode 100644
index 00000000000..a1c1b2765e6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tractor.png differ
diff --git a/public/images/emoji/facebook_messenger/traffic_light.png b/public/images/emoji/facebook_messenger/traffic_light.png
new file mode 100644
index 00000000000..2d1a5425a0d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/traffic_light.png differ
diff --git a/public/images/emoji/facebook_messenger/train.png b/public/images/emoji/facebook_messenger/train.png
new file mode 100644
index 00000000000..4c70d251dad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/train.png differ
diff --git a/public/images/emoji/facebook_messenger/train2.png b/public/images/emoji/facebook_messenger/train2.png
new file mode 100644
index 00000000000..76fff478a5e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/train2.png differ
diff --git a/public/images/emoji/facebook_messenger/tram.png b/public/images/emoji/facebook_messenger/tram.png
new file mode 100644
index 00000000000..5b2069a40b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tram.png differ
diff --git a/public/images/emoji/facebook_messenger/triangular_flag_on_post.png b/public/images/emoji/facebook_messenger/triangular_flag_on_post.png
new file mode 100644
index 00000000000..e6ff9b471ce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/facebook_messenger/triangular_ruler.png b/public/images/emoji/facebook_messenger/triangular_ruler.png
new file mode 100644
index 00000000000..1a7453442f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/triangular_ruler.png differ
diff --git a/public/images/emoji/facebook_messenger/trident.png b/public/images/emoji/facebook_messenger/trident.png
new file mode 100644
index 00000000000..fc10c3aa637
Binary files /dev/null and b/public/images/emoji/facebook_messenger/trident.png differ
diff --git a/public/images/emoji/facebook_messenger/trinidad_tobago.png b/public/images/emoji/facebook_messenger/trinidad_tobago.png
new file mode 100644
index 00000000000..14355ce15f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/trinidad_tobago.png differ
diff --git a/public/images/emoji/facebook_messenger/tristan_da_cunha.png b/public/images/emoji/facebook_messenger/tristan_da_cunha.png
new file mode 100644
index 00000000000..dff4791d41b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tristan_da_cunha.png differ
diff --git a/public/images/emoji/facebook_messenger/triumph.png b/public/images/emoji/facebook_messenger/triumph.png
new file mode 100644
index 00000000000..3ee0215c96b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/triumph.png differ
diff --git a/public/images/emoji/facebook_messenger/trolleybus.png b/public/images/emoji/facebook_messenger/trolleybus.png
new file mode 100644
index 00000000000..061adebdbf4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/trolleybus.png differ
diff --git a/public/images/emoji/facebook_messenger/trophy.png b/public/images/emoji/facebook_messenger/trophy.png
new file mode 100644
index 00000000000..6724dbaa0df
Binary files /dev/null and b/public/images/emoji/facebook_messenger/trophy.png differ
diff --git a/public/images/emoji/facebook_messenger/tropical_drink.png b/public/images/emoji/facebook_messenger/tropical_drink.png
new file mode 100644
index 00000000000..25045a45fa0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tropical_drink.png differ
diff --git a/public/images/emoji/facebook_messenger/tropical_fish.png b/public/images/emoji/facebook_messenger/tropical_fish.png
new file mode 100644
index 00000000000..6bc8cc88554
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tropical_fish.png differ
diff --git a/public/images/emoji/facebook_messenger/truck.png b/public/images/emoji/facebook_messenger/truck.png
new file mode 100644
index 00000000000..439548faef2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/truck.png differ
diff --git a/public/images/emoji/facebook_messenger/trumpet.png b/public/images/emoji/facebook_messenger/trumpet.png
new file mode 100644
index 00000000000..7a17221d89b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/trumpet.png differ
diff --git a/public/images/emoji/facebook_messenger/tshirt.png b/public/images/emoji/facebook_messenger/tshirt.png
new file mode 100644
index 00000000000..f24f758f681
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tshirt.png differ
diff --git a/public/images/emoji/facebook_messenger/tulip.png b/public/images/emoji/facebook_messenger/tulip.png
new file mode 100644
index 00000000000..c4eb133b62f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tulip.png differ
diff --git a/public/images/emoji/facebook_messenger/tumbler_glass.png b/public/images/emoji/facebook_messenger/tumbler_glass.png
new file mode 100644
index 00000000000..78db9d6036f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tumbler_glass.png differ
diff --git a/public/images/emoji/facebook_messenger/tunisia.png b/public/images/emoji/facebook_messenger/tunisia.png
new file mode 100644
index 00000000000..2691b42f09a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tunisia.png differ
diff --git a/public/images/emoji/facebook_messenger/turkey.png b/public/images/emoji/facebook_messenger/turkey.png
new file mode 100644
index 00000000000..829f5ffdfca
Binary files /dev/null and b/public/images/emoji/facebook_messenger/turkey.png differ
diff --git a/public/images/emoji/facebook_messenger/turkmenistan.png b/public/images/emoji/facebook_messenger/turkmenistan.png
new file mode 100644
index 00000000000..a0729e2c292
Binary files /dev/null and b/public/images/emoji/facebook_messenger/turkmenistan.png differ
diff --git a/public/images/emoji/facebook_messenger/turks_caicos_islands.png b/public/images/emoji/facebook_messenger/turks_caicos_islands.png
new file mode 100644
index 00000000000..bb04d27666c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/turks_caicos_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/turtle.png b/public/images/emoji/facebook_messenger/turtle.png
new file mode 100644
index 00000000000..5095da28535
Binary files /dev/null and b/public/images/emoji/facebook_messenger/turtle.png differ
diff --git a/public/images/emoji/facebook_messenger/tuvalu.png b/public/images/emoji/facebook_messenger/tuvalu.png
new file mode 100644
index 00000000000..60fad11afce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tuvalu.png differ
diff --git a/public/images/emoji/facebook_messenger/tv.png b/public/images/emoji/facebook_messenger/tv.png
new file mode 100644
index 00000000000..fa8441fc9c0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/tv.png differ
diff --git a/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png b/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png
new file mode 100644
index 00000000000..f393dfd6d0c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/facebook_messenger/two.png b/public/images/emoji/facebook_messenger/two.png
new file mode 100644
index 00000000000..9bc86e3bec9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/two.png differ
diff --git a/public/images/emoji/facebook_messenger/two_hearts.png b/public/images/emoji/facebook_messenger/two_hearts.png
new file mode 100644
index 00000000000..33db2c6b331
Binary files /dev/null and b/public/images/emoji/facebook_messenger/two_hearts.png differ
diff --git a/public/images/emoji/facebook_messenger/two_men_holding_hands.png b/public/images/emoji/facebook_messenger/two_men_holding_hands.png
new file mode 100644
index 00000000000..ab6ad0d2698
Binary files /dev/null and b/public/images/emoji/facebook_messenger/two_men_holding_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/two_women_holding_hands.png b/public/images/emoji/facebook_messenger/two_women_holding_hands.png
new file mode 100644
index 00000000000..3ec3b2d8ad8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/two_women_holding_hands.png differ
diff --git a/public/images/emoji/facebook_messenger/u5272.png b/public/images/emoji/facebook_messenger/u5272.png
new file mode 100644
index 00000000000..3622c9a5a1f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u5272.png differ
diff --git a/public/images/emoji/facebook_messenger/u5408.png b/public/images/emoji/facebook_messenger/u5408.png
new file mode 100644
index 00000000000..43a08ae3abe
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u5408.png differ
diff --git a/public/images/emoji/facebook_messenger/u55b6.png b/public/images/emoji/facebook_messenger/u55b6.png
new file mode 100644
index 00000000000..03daff78726
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u55b6.png differ
diff --git a/public/images/emoji/facebook_messenger/u6307.png b/public/images/emoji/facebook_messenger/u6307.png
new file mode 100644
index 00000000000..976f45493a7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u6307.png differ
diff --git a/public/images/emoji/facebook_messenger/u6708.png b/public/images/emoji/facebook_messenger/u6708.png
new file mode 100644
index 00000000000..510628a9ea8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u6708.png differ
diff --git a/public/images/emoji/facebook_messenger/u6709.png b/public/images/emoji/facebook_messenger/u6709.png
new file mode 100644
index 00000000000..425c1597b01
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u6709.png differ
diff --git a/public/images/emoji/facebook_messenger/u6e80.png b/public/images/emoji/facebook_messenger/u6e80.png
new file mode 100644
index 00000000000..47b86f38fd6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u6e80.png differ
diff --git a/public/images/emoji/facebook_messenger/u7121.png b/public/images/emoji/facebook_messenger/u7121.png
new file mode 100644
index 00000000000..13d13a211a6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u7121.png differ
diff --git a/public/images/emoji/facebook_messenger/u7533.png b/public/images/emoji/facebook_messenger/u7533.png
new file mode 100644
index 00000000000..e724d38ddf2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u7533.png differ
diff --git a/public/images/emoji/facebook_messenger/u7981.png b/public/images/emoji/facebook_messenger/u7981.png
new file mode 100644
index 00000000000..ee222f8d86c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u7981.png differ
diff --git a/public/images/emoji/facebook_messenger/u7a7a.png b/public/images/emoji/facebook_messenger/u7a7a.png
new file mode 100644
index 00000000000..a65626c0727
Binary files /dev/null and b/public/images/emoji/facebook_messenger/u7a7a.png differ
diff --git a/public/images/emoji/facebook_messenger/uganda.png b/public/images/emoji/facebook_messenger/uganda.png
new file mode 100644
index 00000000000..9541a9fe432
Binary files /dev/null and b/public/images/emoji/facebook_messenger/uganda.png differ
diff --git a/public/images/emoji/facebook_messenger/uk.png b/public/images/emoji/facebook_messenger/uk.png
new file mode 100644
index 00000000000..bc850e7890e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/uk.png differ
diff --git a/public/images/emoji/facebook_messenger/ukraine.png b/public/images/emoji/facebook_messenger/ukraine.png
new file mode 100644
index 00000000000..d24b4e827b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/ukraine.png differ
diff --git a/public/images/emoji/facebook_messenger/umbrella.png b/public/images/emoji/facebook_messenger/umbrella.png
new file mode 100644
index 00000000000..adc7a914742
Binary files /dev/null and b/public/images/emoji/facebook_messenger/umbrella.png differ
diff --git a/public/images/emoji/facebook_messenger/umbrella2.png b/public/images/emoji/facebook_messenger/umbrella2.png
new file mode 100644
index 00000000000..ec99aeb164e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/umbrella2.png differ
diff --git a/public/images/emoji/facebook_messenger/umbrella_on_ground.png b/public/images/emoji/facebook_messenger/umbrella_on_ground.png
new file mode 100644
index 00000000000..2bb23697b7f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/umbrella_on_ground.png differ
diff --git a/public/images/emoji/facebook_messenger/unamused.png b/public/images/emoji/facebook_messenger/unamused.png
new file mode 100644
index 00000000000..7a753e914af
Binary files /dev/null and b/public/images/emoji/facebook_messenger/unamused.png differ
diff --git a/public/images/emoji/facebook_messenger/underage.png b/public/images/emoji/facebook_messenger/underage.png
new file mode 100644
index 00000000000..a1f8047bce4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/underage.png differ
diff --git a/public/images/emoji/facebook_messenger/unicorn.png b/public/images/emoji/facebook_messenger/unicorn.png
new file mode 100644
index 00000000000..7b53a8b310a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/unicorn.png differ
diff --git a/public/images/emoji/facebook_messenger/unicorn_face.png b/public/images/emoji/facebook_messenger/unicorn_face.png
new file mode 100644
index 00000000000..7b53a8b310a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/unicorn_face.png differ
diff --git a/public/images/emoji/facebook_messenger/united_arab_emirates.png b/public/images/emoji/facebook_messenger/united_arab_emirates.png
new file mode 100644
index 00000000000..aad7e052856
Binary files /dev/null and b/public/images/emoji/facebook_messenger/united_arab_emirates.png differ
diff --git a/public/images/emoji/facebook_messenger/united_nations.png b/public/images/emoji/facebook_messenger/united_nations.png
new file mode 100644
index 00000000000..d695a5cac09
Binary files /dev/null and b/public/images/emoji/facebook_messenger/united_nations.png differ
diff --git a/public/images/emoji/facebook_messenger/unlock.png b/public/images/emoji/facebook_messenger/unlock.png
new file mode 100644
index 00000000000..c810256c58d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/unlock.png differ
diff --git a/public/images/emoji/facebook_messenger/up.png b/public/images/emoji/facebook_messenger/up.png
new file mode 100644
index 00000000000..19b5fb73b4d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/up.png differ
diff --git a/public/images/emoji/facebook_messenger/upside_down.png b/public/images/emoji/facebook_messenger/upside_down.png
new file mode 100644
index 00000000000..85c96142cf9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/upside_down.png differ
diff --git a/public/images/emoji/facebook_messenger/upside_down_face.png b/public/images/emoji/facebook_messenger/upside_down_face.png
new file mode 100644
index 00000000000..85c96142cf9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/upside_down_face.png differ
diff --git a/public/images/emoji/facebook_messenger/urn.png b/public/images/emoji/facebook_messenger/urn.png
new file mode 100644
index 00000000000..56112c50ed4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/urn.png differ
diff --git a/public/images/emoji/facebook_messenger/uruguay.png b/public/images/emoji/facebook_messenger/uruguay.png
new file mode 100644
index 00000000000..8196541e261
Binary files /dev/null and b/public/images/emoji/facebook_messenger/uruguay.png differ
diff --git a/public/images/emoji/facebook_messenger/us.png b/public/images/emoji/facebook_messenger/us.png
new file mode 100644
index 00000000000..b0c3a76dd6a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/us.png differ
diff --git a/public/images/emoji/facebook_messenger/us_outlying_islands.png b/public/images/emoji/facebook_messenger/us_outlying_islands.png
new file mode 100644
index 00000000000..450853eca47
Binary files /dev/null and b/public/images/emoji/facebook_messenger/us_outlying_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/us_virgin_islands.png b/public/images/emoji/facebook_messenger/us_virgin_islands.png
new file mode 100644
index 00000000000..2352c2610b8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/us_virgin_islands.png differ
diff --git a/public/images/emoji/facebook_messenger/uzbekistan.png b/public/images/emoji/facebook_messenger/uzbekistan.png
new file mode 100644
index 00000000000..c268b7f0b2a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/uzbekistan.png differ
diff --git a/public/images/emoji/facebook_messenger/v.png b/public/images/emoji/facebook_messenger/v.png
new file mode 100644
index 00000000000..03395c9e323
Binary files /dev/null and b/public/images/emoji/facebook_messenger/v.png differ
diff --git a/public/images/emoji/facebook_messenger/v/2.png b/public/images/emoji/facebook_messenger/v/2.png
new file mode 100644
index 00000000000..6acc777aaf6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/v/2.png differ
diff --git a/public/images/emoji/facebook_messenger/v/3.png b/public/images/emoji/facebook_messenger/v/3.png
new file mode 100644
index 00000000000..698acefd9b4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/v/3.png differ
diff --git a/public/images/emoji/facebook_messenger/v/4.png b/public/images/emoji/facebook_messenger/v/4.png
new file mode 100644
index 00000000000..07596c84129
Binary files /dev/null and b/public/images/emoji/facebook_messenger/v/4.png differ
diff --git a/public/images/emoji/facebook_messenger/v/5.png b/public/images/emoji/facebook_messenger/v/5.png
new file mode 100644
index 00000000000..7afa597f1a1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/v/5.png differ
diff --git a/public/images/emoji/facebook_messenger/v/6.png b/public/images/emoji/facebook_messenger/v/6.png
new file mode 100644
index 00000000000..fc65442c4cf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/v/6.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire.png b/public/images/emoji/facebook_messenger/vampire.png
new file mode 100644
index 00000000000..962288bd170
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vampire.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/2.png b/public/images/emoji/facebook_messenger/vampire/2.png
new file mode 100644
index 00000000000..154f2b6e35a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vampire/2.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/3.png b/public/images/emoji/facebook_messenger/vampire/3.png
new file mode 100644
index 00000000000..540b48d887f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vampire/3.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/4.png b/public/images/emoji/facebook_messenger/vampire/4.png
new file mode 100644
index 00000000000..b05d3bad9ab
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vampire/4.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/5.png b/public/images/emoji/facebook_messenger/vampire/5.png
new file mode 100644
index 00000000000..2bd9a7b71bb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vampire/5.png differ
diff --git a/public/images/emoji/facebook_messenger/vampire/6.png b/public/images/emoji/facebook_messenger/vampire/6.png
new file mode 100644
index 00000000000..c88f4ad73bf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vampire/6.png differ
diff --git a/public/images/emoji/facebook_messenger/vanuatu.png b/public/images/emoji/facebook_messenger/vanuatu.png
new file mode 100644
index 00000000000..ebf4b693156
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vanuatu.png differ
diff --git a/public/images/emoji/facebook_messenger/vatican_city.png b/public/images/emoji/facebook_messenger/vatican_city.png
new file mode 100644
index 00000000000..a91fed8815c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vatican_city.png differ
diff --git a/public/images/emoji/facebook_messenger/venezuela.png b/public/images/emoji/facebook_messenger/venezuela.png
new file mode 100644
index 00000000000..e2b7cff1d89
Binary files /dev/null and b/public/images/emoji/facebook_messenger/venezuela.png differ
diff --git a/public/images/emoji/facebook_messenger/vertical_traffic_light.png b/public/images/emoji/facebook_messenger/vertical_traffic_light.png
new file mode 100644
index 00000000000..5d21d73d791
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vertical_traffic_light.png differ
diff --git a/public/images/emoji/facebook_messenger/vhs.png b/public/images/emoji/facebook_messenger/vhs.png
new file mode 100644
index 00000000000..951ee0caa87
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vhs.png differ
diff --git a/public/images/emoji/facebook_messenger/vibration_mode.png b/public/images/emoji/facebook_messenger/vibration_mode.png
new file mode 100644
index 00000000000..a0c69eb824f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vibration_mode.png differ
diff --git a/public/images/emoji/facebook_messenger/video_camera.png b/public/images/emoji/facebook_messenger/video_camera.png
new file mode 100644
index 00000000000..799525309f6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/video_camera.png differ
diff --git a/public/images/emoji/facebook_messenger/video_game.png b/public/images/emoji/facebook_messenger/video_game.png
new file mode 100644
index 00000000000..d564ba844f2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/video_game.png differ
diff --git a/public/images/emoji/facebook_messenger/vietnam.png b/public/images/emoji/facebook_messenger/vietnam.png
new file mode 100644
index 00000000000..57e44ae1752
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vietnam.png differ
diff --git a/public/images/emoji/facebook_messenger/violin.png b/public/images/emoji/facebook_messenger/violin.png
new file mode 100644
index 00000000000..cdf1bf735b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/violin.png differ
diff --git a/public/images/emoji/facebook_messenger/virgo.png b/public/images/emoji/facebook_messenger/virgo.png
new file mode 100644
index 00000000000..d75d83bbd49
Binary files /dev/null and b/public/images/emoji/facebook_messenger/virgo.png differ
diff --git a/public/images/emoji/facebook_messenger/volcano.png b/public/images/emoji/facebook_messenger/volcano.png
new file mode 100644
index 00000000000..5258533d2a4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/volcano.png differ
diff --git a/public/images/emoji/facebook_messenger/volleyball.png b/public/images/emoji/facebook_messenger/volleyball.png
new file mode 100644
index 00000000000..5d6921c81e9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/volleyball.png differ
diff --git a/public/images/emoji/facebook_messenger/vs.png b/public/images/emoji/facebook_messenger/vs.png
new file mode 100644
index 00000000000..761b7a9f02c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vs.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan.png b/public/images/emoji/facebook_messenger/vulcan.png
new file mode 100644
index 00000000000..62459294572
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/2.png b/public/images/emoji/facebook_messenger/vulcan/2.png
new file mode 100644
index 00000000000..5cdfab6d9a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan/2.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/3.png b/public/images/emoji/facebook_messenger/vulcan/3.png
new file mode 100644
index 00000000000..a469f9b420e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan/3.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/4.png b/public/images/emoji/facebook_messenger/vulcan/4.png
new file mode 100644
index 00000000000..a8803b88169
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan/4.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/5.png b/public/images/emoji/facebook_messenger/vulcan/5.png
new file mode 100644
index 00000000000..2d9def823e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan/5.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan/6.png b/public/images/emoji/facebook_messenger/vulcan/6.png
new file mode 100644
index 00000000000..bbcb6dc0d34
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan/6.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute.png b/public/images/emoji/facebook_messenger/vulcan_salute.png
new file mode 100644
index 00000000000..62459294572
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan_salute.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/2.png b/public/images/emoji/facebook_messenger/vulcan_salute/2.png
new file mode 100644
index 00000000000..5cdfab6d9a3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan_salute/2.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/3.png b/public/images/emoji/facebook_messenger/vulcan_salute/3.png
new file mode 100644
index 00000000000..a469f9b420e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan_salute/3.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/4.png b/public/images/emoji/facebook_messenger/vulcan_salute/4.png
new file mode 100644
index 00000000000..a8803b88169
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan_salute/4.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/5.png b/public/images/emoji/facebook_messenger/vulcan_salute/5.png
new file mode 100644
index 00000000000..2d9def823e5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan_salute/5.png differ
diff --git a/public/images/emoji/facebook_messenger/vulcan_salute/6.png b/public/images/emoji/facebook_messenger/vulcan_salute/6.png
new file mode 100644
index 00000000000..bbcb6dc0d34
Binary files /dev/null and b/public/images/emoji/facebook_messenger/vulcan_salute/6.png differ
diff --git a/public/images/emoji/facebook_messenger/walking.png b/public/images/emoji/facebook_messenger/walking.png
new file mode 100644
index 00000000000..23da7224aa4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/2.png b/public/images/emoji/facebook_messenger/walking/2.png
new file mode 100644
index 00000000000..c9dcb4569e6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking/2.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/3.png b/public/images/emoji/facebook_messenger/walking/3.png
new file mode 100644
index 00000000000..61e714afb1a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking/3.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/4.png b/public/images/emoji/facebook_messenger/walking/4.png
new file mode 100644
index 00000000000..3cf55665cd3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking/4.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/5.png b/public/images/emoji/facebook_messenger/walking/5.png
new file mode 100644
index 00000000000..1a0a252797a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking/5.png differ
diff --git a/public/images/emoji/facebook_messenger/walking/6.png b/public/images/emoji/facebook_messenger/walking/6.png
new file mode 100644
index 00000000000..022aeb90ec3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking/6.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man.png b/public/images/emoji/facebook_messenger/walking_man.png
new file mode 100644
index 00000000000..23da7224aa4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_man.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/2.png b/public/images/emoji/facebook_messenger/walking_man/2.png
new file mode 100644
index 00000000000..c9dcb4569e6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/3.png b/public/images/emoji/facebook_messenger/walking_man/3.png
new file mode 100644
index 00000000000..61e714afb1a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/4.png b/public/images/emoji/facebook_messenger/walking_man/4.png
new file mode 100644
index 00000000000..3cf55665cd3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/5.png b/public/images/emoji/facebook_messenger/walking_man/5.png
new file mode 100644
index 00000000000..1a0a252797a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_man/6.png b/public/images/emoji/facebook_messenger/walking_man/6.png
new file mode 100644
index 00000000000..022aeb90ec3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman.png b/public/images/emoji/facebook_messenger/walking_woman.png
new file mode 100644
index 00000000000..5541bff1ede
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/2.png b/public/images/emoji/facebook_messenger/walking_woman/2.png
new file mode 100644
index 00000000000..3e8f7832c4c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/3.png b/public/images/emoji/facebook_messenger/walking_woman/3.png
new file mode 100644
index 00000000000..3876ee6e63d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/4.png b/public/images/emoji/facebook_messenger/walking_woman/4.png
new file mode 100644
index 00000000000..0aad2bc840d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/5.png b/public/images/emoji/facebook_messenger/walking_woman/5.png
new file mode 100644
index 00000000000..c4d8fc9c356
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/walking_woman/6.png b/public/images/emoji/facebook_messenger/walking_woman/6.png
new file mode 100644
index 00000000000..54cb211d6b9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/walking_woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/wallis_futuna.png b/public/images/emoji/facebook_messenger/wallis_futuna.png
new file mode 100644
index 00000000000..4672eabedba
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wallis_futuna.png differ
diff --git a/public/images/emoji/facebook_messenger/waning_crescent_moon.png b/public/images/emoji/facebook_messenger/waning_crescent_moon.png
new file mode 100644
index 00000000000..f315a7566fb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/waning_crescent_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/waning_gibbous_moon.png b/public/images/emoji/facebook_messenger/waning_gibbous_moon.png
new file mode 100644
index 00000000000..2f5450b752b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/warning.png b/public/images/emoji/facebook_messenger/warning.png
new file mode 100644
index 00000000000..4bf669d8260
Binary files /dev/null and b/public/images/emoji/facebook_messenger/warning.png differ
diff --git a/public/images/emoji/facebook_messenger/wastebasket.png b/public/images/emoji/facebook_messenger/wastebasket.png
new file mode 100644
index 00000000000..65b0729097e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wastebasket.png differ
diff --git a/public/images/emoji/facebook_messenger/watch.png b/public/images/emoji/facebook_messenger/watch.png
new file mode 100644
index 00000000000..b3b9b84eb89
Binary files /dev/null and b/public/images/emoji/facebook_messenger/watch.png differ
diff --git a/public/images/emoji/facebook_messenger/water_buffalo.png b/public/images/emoji/facebook_messenger/water_buffalo.png
new file mode 100644
index 00000000000..93c10bcd960
Binary files /dev/null and b/public/images/emoji/facebook_messenger/water_buffalo.png differ
diff --git a/public/images/emoji/facebook_messenger/watermelon.png b/public/images/emoji/facebook_messenger/watermelon.png
new file mode 100644
index 00000000000..bdb353b4b9f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/watermelon.png differ
diff --git a/public/images/emoji/facebook_messenger/wave.png b/public/images/emoji/facebook_messenger/wave.png
new file mode 100644
index 00000000000..99a9bc135ad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wave.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/2.png b/public/images/emoji/facebook_messenger/wave/2.png
new file mode 100644
index 00000000000..57bd2ffb66d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wave/2.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/3.png b/public/images/emoji/facebook_messenger/wave/3.png
new file mode 100644
index 00000000000..de52c86f75c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wave/3.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/4.png b/public/images/emoji/facebook_messenger/wave/4.png
new file mode 100644
index 00000000000..aaa49bca4ed
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wave/4.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/5.png b/public/images/emoji/facebook_messenger/wave/5.png
new file mode 100644
index 00000000000..187177e4786
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wave/5.png differ
diff --git a/public/images/emoji/facebook_messenger/wave/6.png b/public/images/emoji/facebook_messenger/wave/6.png
new file mode 100644
index 00000000000..52951b965ae
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wave/6.png differ
diff --git a/public/images/emoji/facebook_messenger/waving_black_flag.png b/public/images/emoji/facebook_messenger/waving_black_flag.png
new file mode 100644
index 00000000000..5c1237bdad2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/waving_black_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/waving_white_flag.png b/public/images/emoji/facebook_messenger/waving_white_flag.png
new file mode 100644
index 00000000000..5f052fff2af
Binary files /dev/null and b/public/images/emoji/facebook_messenger/waving_white_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/wavy_dash.png b/public/images/emoji/facebook_messenger/wavy_dash.png
new file mode 100644
index 00000000000..fab5f74c45c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wavy_dash.png differ
diff --git a/public/images/emoji/facebook_messenger/waxing_crescent_moon.png b/public/images/emoji/facebook_messenger/waxing_crescent_moon.png
new file mode 100644
index 00000000000..35560d1aaeb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png b/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png
new file mode 100644
index 00000000000..afe59e7f4e8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/facebook_messenger/wc.png b/public/images/emoji/facebook_messenger/wc.png
new file mode 100644
index 00000000000..55e92707a14
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wc.png differ
diff --git a/public/images/emoji/facebook_messenger/weary.png b/public/images/emoji/facebook_messenger/weary.png
new file mode 100644
index 00000000000..097b31cf81f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weary.png differ
diff --git a/public/images/emoji/facebook_messenger/wedding.png b/public/images/emoji/facebook_messenger/wedding.png
new file mode 100644
index 00000000000..9e4cb772257
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wedding.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter.png b/public/images/emoji/facebook_messenger/weight_lifter.png
new file mode 100644
index 00000000000..be0473304d5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifter.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/2.png b/public/images/emoji/facebook_messenger/weight_lifter/2.png
new file mode 100644
index 00000000000..8d680f5b12c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/3.png b/public/images/emoji/facebook_messenger/weight_lifter/3.png
new file mode 100644
index 00000000000..e4e961d5d5d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/4.png b/public/images/emoji/facebook_messenger/weight_lifter/4.png
new file mode 100644
index 00000000000..bcdf20d1757
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/5.png b/public/images/emoji/facebook_messenger/weight_lifter/5.png
new file mode 100644
index 00000000000..9b91906952e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifter/6.png b/public/images/emoji/facebook_messenger/weight_lifter/6.png
new file mode 100644
index 00000000000..c3ce145e9e1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man.png b/public/images/emoji/facebook_messenger/weight_lifting_man.png
new file mode 100644
index 00000000000..be0473304d5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifting_man.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/2.png b/public/images/emoji/facebook_messenger/weight_lifting_man/2.png
new file mode 100644
index 00000000000..8d680f5b12c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/3.png b/public/images/emoji/facebook_messenger/weight_lifting_man/3.png
new file mode 100644
index 00000000000..e4e961d5d5d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/4.png b/public/images/emoji/facebook_messenger/weight_lifting_man/4.png
new file mode 100644
index 00000000000..bcdf20d1757
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/5.png b/public/images/emoji/facebook_messenger/weight_lifting_man/5.png
new file mode 100644
index 00000000000..9b91906952e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_man/6.png b/public/images/emoji/facebook_messenger/weight_lifting_man/6.png
new file mode 100644
index 00000000000..c3ce145e9e1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/facebook_messenger/weight_lifting_woman.png b/public/images/emoji/facebook_messenger/weight_lifting_woman.png
new file mode 100644
index 00000000000..2279709c85b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/weight_lifting_woman.png differ
diff --git a/public/images/emoji/facebook_messenger/western_sahara.png b/public/images/emoji/facebook_messenger/western_sahara.png
new file mode 100644
index 00000000000..44c0ea20dd7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/western_sahara.png differ
diff --git a/public/images/emoji/facebook_messenger/whale.png b/public/images/emoji/facebook_messenger/whale.png
new file mode 100644
index 00000000000..7356dc7f43a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/whale.png differ
diff --git a/public/images/emoji/facebook_messenger/whale2.png b/public/images/emoji/facebook_messenger/whale2.png
new file mode 100644
index 00000000000..029e9adf6c9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/whale2.png differ
diff --git a/public/images/emoji/facebook_messenger/wheel_of_dharma.png b/public/images/emoji/facebook_messenger/wheel_of_dharma.png
new file mode 100644
index 00000000000..8792718a1e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wheel_of_dharma.png differ
diff --git a/public/images/emoji/facebook_messenger/wheelchair.png b/public/images/emoji/facebook_messenger/wheelchair.png
new file mode 100644
index 00000000000..b90964dd4a7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wheelchair.png differ
diff --git a/public/images/emoji/facebook_messenger/white_check_mark.png b/public/images/emoji/facebook_messenger/white_check_mark.png
new file mode 100644
index 00000000000..3b00d70f904
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_check_mark.png differ
diff --git a/public/images/emoji/facebook_messenger/white_circle.png b/public/images/emoji/facebook_messenger/white_circle.png
new file mode 100644
index 00000000000..81e7ee83745
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_circle.png differ
diff --git a/public/images/emoji/facebook_messenger/white_flag.png b/public/images/emoji/facebook_messenger/white_flag.png
new file mode 100644
index 00000000000..5f052fff2af
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_flag.png differ
diff --git a/public/images/emoji/facebook_messenger/white_flower.png b/public/images/emoji/facebook_messenger/white_flower.png
new file mode 100644
index 00000000000..e7975caf5bc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_flower.png differ
diff --git a/public/images/emoji/facebook_messenger/white_frowning_face.png b/public/images/emoji/facebook_messenger/white_frowning_face.png
new file mode 100644
index 00000000000..1c5988a20b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_frowning_face.png differ
diff --git a/public/images/emoji/facebook_messenger/white_large_square.png b/public/images/emoji/facebook_messenger/white_large_square.png
new file mode 100644
index 00000000000..b0652e666b4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_large_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_medium_small_square.png b/public/images/emoji/facebook_messenger/white_medium_small_square.png
new file mode 100644
index 00000000000..d6ab186f389
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_medium_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_medium_square.png b/public/images/emoji/facebook_messenger/white_medium_square.png
new file mode 100644
index 00000000000..8f96f4ecd8f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_medium_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_small_square.png b/public/images/emoji/facebook_messenger/white_small_square.png
new file mode 100644
index 00000000000..328248a3de7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_small_square.png differ
diff --git a/public/images/emoji/facebook_messenger/white_square_button.png b/public/images/emoji/facebook_messenger/white_square_button.png
new file mode 100644
index 00000000000..6162783a0dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_square_button.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png b/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png
new file mode 100644
index 00000000000..3ceb40a9ec0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png b/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png
new file mode 100644
index 00000000000..ef892f1f889
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_cloud.png b/public/images/emoji/facebook_messenger/white_sun_cloud.png
new file mode 100644
index 00000000000..3ceb40a9ec0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_sun_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png b/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png
new file mode 100644
index 00000000000..ef892f1f889
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_small_cloud.png b/public/images/emoji/facebook_messenger/white_sun_small_cloud.png
new file mode 100644
index 00000000000..51953bf6959
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png b/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png
new file mode 100644
index 00000000000..51953bf6959
Binary files /dev/null and b/public/images/emoji/facebook_messenger/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/facebook_messenger/wilted_flower.png b/public/images/emoji/facebook_messenger/wilted_flower.png
new file mode 100644
index 00000000000..a4e69ff073b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wilted_flower.png differ
diff --git a/public/images/emoji/facebook_messenger/wind_blowing_face.png b/public/images/emoji/facebook_messenger/wind_blowing_face.png
new file mode 100644
index 00000000000..f89ef444f72
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wind_blowing_face.png differ
diff --git a/public/images/emoji/facebook_messenger/wind_chime.png b/public/images/emoji/facebook_messenger/wind_chime.png
new file mode 100644
index 00000000000..279f3ce2a2b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wind_chime.png differ
diff --git a/public/images/emoji/facebook_messenger/wind_face.png b/public/images/emoji/facebook_messenger/wind_face.png
new file mode 100644
index 00000000000..f89ef444f72
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wind_face.png differ
diff --git a/public/images/emoji/facebook_messenger/wine_glass.png b/public/images/emoji/facebook_messenger/wine_glass.png
new file mode 100644
index 00000000000..765420b74f5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wine_glass.png differ
diff --git a/public/images/emoji/facebook_messenger/wink.png b/public/images/emoji/facebook_messenger/wink.png
new file mode 100644
index 00000000000..b592f594ee5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wink.png differ
diff --git a/public/images/emoji/facebook_messenger/wolf.png b/public/images/emoji/facebook_messenger/wolf.png
new file mode 100644
index 00000000000..ce3e33bbcaf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wolf.png differ
diff --git a/public/images/emoji/facebook_messenger/woman.png b/public/images/emoji/facebook_messenger/woman.png
new file mode 100644
index 00000000000..071afe7e94e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/2.png b/public/images/emoji/facebook_messenger/woman/2.png
new file mode 100644
index 00000000000..f030836e287
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/3.png b/public/images/emoji/facebook_messenger/woman/3.png
new file mode 100644
index 00000000000..85fc02b9c67
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/4.png b/public/images/emoji/facebook_messenger/woman/4.png
new file mode 100644
index 00000000000..8320ed83f69
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/5.png b/public/images/emoji/facebook_messenger/woman/5.png
new file mode 100644
index 00000000000..da30bd1d99c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman/6.png b/public/images/emoji/facebook_messenger/woman/6.png
new file mode 100644
index 00000000000..4818fd47397
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist.png b/public/images/emoji/facebook_messenger/woman_artist.png
new file mode 100644
index 00000000000..59bef6499ad
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_artist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/2.png b/public/images/emoji/facebook_messenger/woman_artist/2.png
new file mode 100644
index 00000000000..1f10ebc442d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_artist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/3.png b/public/images/emoji/facebook_messenger/woman_artist/3.png
new file mode 100644
index 00000000000..4b6fe289bce
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_artist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/4.png b/public/images/emoji/facebook_messenger/woman_artist/4.png
new file mode 100644
index 00000000000..70d36d0287b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_artist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/5.png b/public/images/emoji/facebook_messenger/woman_artist/5.png
new file mode 100644
index 00000000000..ab8ce935d1d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_artist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_artist/6.png b/public/images/emoji/facebook_messenger/woman_artist/6.png
new file mode 100644
index 00000000000..5513232d02c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_artist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut.png b/public/images/emoji/facebook_messenger/woman_astronaut.png
new file mode 100644
index 00000000000..cdd72ce56da
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_astronaut.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/2.png b/public/images/emoji/facebook_messenger/woman_astronaut/2.png
new file mode 100644
index 00000000000..51af6656685
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_astronaut/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/3.png b/public/images/emoji/facebook_messenger/woman_astronaut/3.png
new file mode 100644
index 00000000000..f1505464c9d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_astronaut/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/4.png b/public/images/emoji/facebook_messenger/woman_astronaut/4.png
new file mode 100644
index 00000000000..f5716b1882c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_astronaut/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/5.png b/public/images/emoji/facebook_messenger/woman_astronaut/5.png
new file mode 100644
index 00000000000..5f8e97f970f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_astronaut/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_astronaut/6.png b/public/images/emoji/facebook_messenger/woman_astronaut/6.png
new file mode 100644
index 00000000000..d07a48eaacc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_astronaut/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling.png b/public/images/emoji/facebook_messenger/woman_cartwheeling.png
new file mode 100644
index 00000000000..124763691f3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cartwheeling.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png
new file mode 100644
index 00000000000..cbda90bf9f8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png
new file mode 100644
index 00000000000..133d630aae8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png
new file mode 100644
index 00000000000..399f4807f8f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png
new file mode 100644
index 00000000000..bb0785b5022
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png b/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png
new file mode 100644
index 00000000000..90454bc8b96
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook.png b/public/images/emoji/facebook_messenger/woman_cook.png
new file mode 100644
index 00000000000..fb473698634
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cook.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/2.png b/public/images/emoji/facebook_messenger/woman_cook/2.png
new file mode 100644
index 00000000000..dcf2163a16d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cook/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/3.png b/public/images/emoji/facebook_messenger/woman_cook/3.png
new file mode 100644
index 00000000000..00a32101071
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cook/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/4.png b/public/images/emoji/facebook_messenger/woman_cook/4.png
new file mode 100644
index 00000000000..ea9400ce130
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cook/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/5.png b/public/images/emoji/facebook_messenger/woman_cook/5.png
new file mode 100644
index 00000000000..9c90c090d73
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cook/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_cook/6.png b/public/images/emoji/facebook_messenger/woman_cook/6.png
new file mode 100644
index 00000000000..6745e5324ec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_cook/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming.png b/public/images/emoji/facebook_messenger/woman_facepalming.png
new file mode 100644
index 00000000000..0862f45755f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_facepalming.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/2.png b/public/images/emoji/facebook_messenger/woman_facepalming/2.png
new file mode 100644
index 00000000000..c2a0c5583d9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_facepalming/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/3.png b/public/images/emoji/facebook_messenger/woman_facepalming/3.png
new file mode 100644
index 00000000000..2efbdb0954d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_facepalming/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/4.png b/public/images/emoji/facebook_messenger/woman_facepalming/4.png
new file mode 100644
index 00000000000..93d1697b834
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_facepalming/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/5.png b/public/images/emoji/facebook_messenger/woman_facepalming/5.png
new file mode 100644
index 00000000000..5e7da37f052
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_facepalming/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_facepalming/6.png b/public/images/emoji/facebook_messenger/woman_facepalming/6.png
new file mode 100644
index 00000000000..d7dcd8dfc0f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_facepalming/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker.png b/public/images/emoji/facebook_messenger/woman_factory_worker.png
new file mode 100644
index 00000000000..22e9ab5b8d3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_factory_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/2.png b/public/images/emoji/facebook_messenger/woman_factory_worker/2.png
new file mode 100644
index 00000000000..8124db7497d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/3.png b/public/images/emoji/facebook_messenger/woman_factory_worker/3.png
new file mode 100644
index 00000000000..2e3ad0ee377
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/4.png b/public/images/emoji/facebook_messenger/woman_factory_worker/4.png
new file mode 100644
index 00000000000..461a4dcb8fb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/5.png b/public/images/emoji/facebook_messenger/woman_factory_worker/5.png
new file mode 100644
index 00000000000..a1e2b6fedf5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_factory_worker/6.png b/public/images/emoji/facebook_messenger/woman_factory_worker/6.png
new file mode 100644
index 00000000000..8bb53fe8342
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer.png b/public/images/emoji/facebook_messenger/woman_farmer.png
new file mode 100644
index 00000000000..edb763b8c0d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_farmer.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/2.png b/public/images/emoji/facebook_messenger/woman_farmer/2.png
new file mode 100644
index 00000000000..b8b38757986
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_farmer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/3.png b/public/images/emoji/facebook_messenger/woman_farmer/3.png
new file mode 100644
index 00000000000..50bca0a619b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_farmer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/4.png b/public/images/emoji/facebook_messenger/woman_farmer/4.png
new file mode 100644
index 00000000000..f990a8c7997
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_farmer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/5.png b/public/images/emoji/facebook_messenger/woman_farmer/5.png
new file mode 100644
index 00000000000..bbdeaac7784
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_farmer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_farmer/6.png b/public/images/emoji/facebook_messenger/woman_farmer/6.png
new file mode 100644
index 00000000000..680f352c0a0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_farmer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter.png b/public/images/emoji/facebook_messenger/woman_firefighter.png
new file mode 100644
index 00000000000..ec9fc0dd0ae
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_firefighter.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/2.png b/public/images/emoji/facebook_messenger/woman_firefighter/2.png
new file mode 100644
index 00000000000..4108b65e648
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_firefighter/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/3.png b/public/images/emoji/facebook_messenger/woman_firefighter/3.png
new file mode 100644
index 00000000000..648fd207ef9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_firefighter/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/4.png b/public/images/emoji/facebook_messenger/woman_firefighter/4.png
new file mode 100644
index 00000000000..366f946a1c4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_firefighter/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/5.png b/public/images/emoji/facebook_messenger/woman_firefighter/5.png
new file mode 100644
index 00000000000..cfd3ac72703
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_firefighter/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_firefighter/6.png b/public/images/emoji/facebook_messenger/woman_firefighter/6.png
new file mode 100644
index 00000000000..6da20434d92
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_firefighter/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker.png b/public/images/emoji/facebook_messenger/woman_health_worker.png
new file mode 100644
index 00000000000..bdd57f781c7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_health_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/2.png b/public/images/emoji/facebook_messenger/woman_health_worker/2.png
new file mode 100644
index 00000000000..7e0d10c1f09
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_health_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/3.png b/public/images/emoji/facebook_messenger/woman_health_worker/3.png
new file mode 100644
index 00000000000..06e678a9dbc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_health_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/4.png b/public/images/emoji/facebook_messenger/woman_health_worker/4.png
new file mode 100644
index 00000000000..86876a9e634
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_health_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/5.png b/public/images/emoji/facebook_messenger/woman_health_worker/5.png
new file mode 100644
index 00000000000..922e25ee9a2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_health_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_health_worker/6.png b/public/images/emoji/facebook_messenger/woman_health_worker/6.png
new file mode 100644
index 00000000000..cae11d93383
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_health_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge.png b/public/images/emoji/facebook_messenger/woman_judge.png
new file mode 100644
index 00000000000..302f1fbdd70
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_judge.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/2.png b/public/images/emoji/facebook_messenger/woman_judge/2.png
new file mode 100644
index 00000000000..ba942e11df6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_judge/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/3.png b/public/images/emoji/facebook_messenger/woman_judge/3.png
new file mode 100644
index 00000000000..943dc444e8a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_judge/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/4.png b/public/images/emoji/facebook_messenger/woman_judge/4.png
new file mode 100644
index 00000000000..901c7c2fb9b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_judge/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/5.png b/public/images/emoji/facebook_messenger/woman_judge/5.png
new file mode 100644
index 00000000000..be61917660f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_judge/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_judge/6.png b/public/images/emoji/facebook_messenger/woman_judge/6.png
new file mode 100644
index 00000000000..3be5920c27d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_judge/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling.png b/public/images/emoji/facebook_messenger/woman_juggling.png
new file mode 100644
index 00000000000..5c3deb2d493
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_juggling.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/2.png b/public/images/emoji/facebook_messenger/woman_juggling/2.png
new file mode 100644
index 00000000000..7e0822fd89d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_juggling/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/3.png b/public/images/emoji/facebook_messenger/woman_juggling/3.png
new file mode 100644
index 00000000000..9427c61849f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_juggling/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/4.png b/public/images/emoji/facebook_messenger/woman_juggling/4.png
new file mode 100644
index 00000000000..710119d96b5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_juggling/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/5.png b/public/images/emoji/facebook_messenger/woman_juggling/5.png
new file mode 100644
index 00000000000..2a8d51aaa99
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_juggling/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_juggling/6.png b/public/images/emoji/facebook_messenger/woman_juggling/6.png
new file mode 100644
index 00000000000..37a7391cfe7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_juggling/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic.png b/public/images/emoji/facebook_messenger/woman_mechanic.png
new file mode 100644
index 00000000000..00c01f4dc78
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mechanic.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/2.png b/public/images/emoji/facebook_messenger/woman_mechanic/2.png
new file mode 100644
index 00000000000..2dd109611ef
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mechanic/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/3.png b/public/images/emoji/facebook_messenger/woman_mechanic/3.png
new file mode 100644
index 00000000000..3029459512e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mechanic/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/4.png b/public/images/emoji/facebook_messenger/woman_mechanic/4.png
new file mode 100644
index 00000000000..fd6be2cb760
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mechanic/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/5.png b/public/images/emoji/facebook_messenger/woman_mechanic/5.png
new file mode 100644
index 00000000000..baec0ca3c51
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mechanic/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_mechanic/6.png b/public/images/emoji/facebook_messenger/woman_mechanic/6.png
new file mode 100644
index 00000000000..de62d29f061
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_mechanic/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker.png b/public/images/emoji/facebook_messenger/woman_office_worker.png
new file mode 100644
index 00000000000..3ed967832b7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_office_worker.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/2.png b/public/images/emoji/facebook_messenger/woman_office_worker/2.png
new file mode 100644
index 00000000000..17b377b41ca
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_office_worker/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/3.png b/public/images/emoji/facebook_messenger/woman_office_worker/3.png
new file mode 100644
index 00000000000..70fea252b05
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_office_worker/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/4.png b/public/images/emoji/facebook_messenger/woman_office_worker/4.png
new file mode 100644
index 00000000000..59cd9724190
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_office_worker/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/5.png b/public/images/emoji/facebook_messenger/woman_office_worker/5.png
new file mode 100644
index 00000000000..410d6e42cf9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_office_worker/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_office_worker/6.png b/public/images/emoji/facebook_messenger/woman_office_worker/6.png
new file mode 100644
index 00000000000..77c1ab6c3cd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_office_worker/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot.png b/public/images/emoji/facebook_messenger/woman_pilot.png
new file mode 100644
index 00000000000..bdb1f781ee9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_pilot.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/2.png b/public/images/emoji/facebook_messenger/woman_pilot/2.png
new file mode 100644
index 00000000000..18357b611a1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_pilot/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/3.png b/public/images/emoji/facebook_messenger/woman_pilot/3.png
new file mode 100644
index 00000000000..6ef43682bc7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_pilot/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/4.png b/public/images/emoji/facebook_messenger/woman_pilot/4.png
new file mode 100644
index 00000000000..5b46123bc29
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_pilot/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/5.png b/public/images/emoji/facebook_messenger/woman_pilot/5.png
new file mode 100644
index 00000000000..c13b55013ec
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_pilot/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_pilot/6.png b/public/images/emoji/facebook_messenger/woman_pilot/6.png
new file mode 100644
index 00000000000..fb7ec93f0ca
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_pilot/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball.png b/public/images/emoji/facebook_messenger/woman_playing_handball.png
new file mode 100644
index 00000000000..731f747ab26
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_handball.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/2.png b/public/images/emoji/facebook_messenger/woman_playing_handball/2.png
new file mode 100644
index 00000000000..52f1ac332db
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/3.png b/public/images/emoji/facebook_messenger/woman_playing_handball/3.png
new file mode 100644
index 00000000000..57ff251cbe3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/4.png b/public/images/emoji/facebook_messenger/woman_playing_handball/4.png
new file mode 100644
index 00000000000..8b21c5f954e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/5.png b/public/images/emoji/facebook_messenger/woman_playing_handball/5.png
new file mode 100644
index 00000000000..c09e12ad349
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_handball/6.png b/public/images/emoji/facebook_messenger/woman_playing_handball/6.png
new file mode 100644
index 00000000000..25a5c4edd8e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo.png
new file mode 100644
index 00000000000..9f1a2e79e9d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png
new file mode 100644
index 00000000000..74118cdc896
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png
new file mode 100644
index 00000000000..02a40bc83d7
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png
new file mode 100644
index 00000000000..28e04bc113c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png
new file mode 100644
index 00000000000..f112c330bc3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png b/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png
new file mode 100644
index 00000000000..dd3f628ee91
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist.png b/public/images/emoji/facebook_messenger/woman_scientist.png
new file mode 100644
index 00000000000..debc8aa07e2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_scientist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/2.png b/public/images/emoji/facebook_messenger/woman_scientist/2.png
new file mode 100644
index 00000000000..84b54c10bb0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_scientist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/3.png b/public/images/emoji/facebook_messenger/woman_scientist/3.png
new file mode 100644
index 00000000000..e7aa385a93c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_scientist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/4.png b/public/images/emoji/facebook_messenger/woman_scientist/4.png
new file mode 100644
index 00000000000..9d294761afa
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_scientist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/5.png b/public/images/emoji/facebook_messenger/woman_scientist/5.png
new file mode 100644
index 00000000000..bfc9f7b48c5
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_scientist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_scientist/6.png b/public/images/emoji/facebook_messenger/woman_scientist/6.png
new file mode 100644
index 00000000000..70ebc5bc4f3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_scientist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging.png b/public/images/emoji/facebook_messenger/woman_shrugging.png
new file mode 100644
index 00000000000..3839c5eacdf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_shrugging.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/2.png b/public/images/emoji/facebook_messenger/woman_shrugging/2.png
new file mode 100644
index 00000000000..3ae10f1008d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_shrugging/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/3.png b/public/images/emoji/facebook_messenger/woman_shrugging/3.png
new file mode 100644
index 00000000000..1be387d41e1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_shrugging/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/4.png b/public/images/emoji/facebook_messenger/woman_shrugging/4.png
new file mode 100644
index 00000000000..9fbf38dfeab
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_shrugging/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/5.png b/public/images/emoji/facebook_messenger/woman_shrugging/5.png
new file mode 100644
index 00000000000..349d86171e0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_shrugging/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_shrugging/6.png b/public/images/emoji/facebook_messenger/woman_shrugging/6.png
new file mode 100644
index 00000000000..82a2b9f0528
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_shrugging/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer.png b/public/images/emoji/facebook_messenger/woman_singer.png
new file mode 100644
index 00000000000..07f59ab15f2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_singer.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/2.png b/public/images/emoji/facebook_messenger/woman_singer/2.png
new file mode 100644
index 00000000000..96578ef833f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_singer/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/3.png b/public/images/emoji/facebook_messenger/woman_singer/3.png
new file mode 100644
index 00000000000..3a613507ef2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_singer/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/4.png b/public/images/emoji/facebook_messenger/woman_singer/4.png
new file mode 100644
index 00000000000..439f929fb0b
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_singer/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/5.png b/public/images/emoji/facebook_messenger/woman_singer/5.png
new file mode 100644
index 00000000000..f615d7ef3c0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_singer/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_singer/6.png b/public/images/emoji/facebook_messenger/woman_singer/6.png
new file mode 100644
index 00000000000..4d919b04534
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_singer/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student.png b/public/images/emoji/facebook_messenger/woman_student.png
new file mode 100644
index 00000000000..60e3c075ebb
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_student.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/2.png b/public/images/emoji/facebook_messenger/woman_student/2.png
new file mode 100644
index 00000000000..b02489086fd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_student/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/3.png b/public/images/emoji/facebook_messenger/woman_student/3.png
new file mode 100644
index 00000000000..f6488d33900
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_student/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/4.png b/public/images/emoji/facebook_messenger/woman_student/4.png
new file mode 100644
index 00000000000..05f82e21622
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_student/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/5.png b/public/images/emoji/facebook_messenger/woman_student/5.png
new file mode 100644
index 00000000000..26ceb123206
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_student/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_student/6.png b/public/images/emoji/facebook_messenger/woman_student/6.png
new file mode 100644
index 00000000000..7fca961910f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_student/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher.png b/public/images/emoji/facebook_messenger/woman_teacher.png
new file mode 100644
index 00000000000..d98448f85bd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_teacher.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/2.png b/public/images/emoji/facebook_messenger/woman_teacher/2.png
new file mode 100644
index 00000000000..6f980a37166
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_teacher/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/3.png b/public/images/emoji/facebook_messenger/woman_teacher/3.png
new file mode 100644
index 00000000000..0fb8f0904a8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_teacher/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/4.png b/public/images/emoji/facebook_messenger/woman_teacher/4.png
new file mode 100644
index 00000000000..a8021347936
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_teacher/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/5.png b/public/images/emoji/facebook_messenger/woman_teacher/5.png
new file mode 100644
index 00000000000..dcceb1add1a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_teacher/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_teacher/6.png b/public/images/emoji/facebook_messenger/woman_teacher/6.png
new file mode 100644
index 00000000000..41dc97c0786
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_teacher/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist.png b/public/images/emoji/facebook_messenger/woman_technologist.png
new file mode 100644
index 00000000000..d74e604a64c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_technologist.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/2.png b/public/images/emoji/facebook_messenger/woman_technologist/2.png
new file mode 100644
index 00000000000..931f1fd2bdd
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_technologist/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/3.png b/public/images/emoji/facebook_messenger/woman_technologist/3.png
new file mode 100644
index 00000000000..2cb918f752a
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_technologist/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/4.png b/public/images/emoji/facebook_messenger/woman_technologist/4.png
new file mode 100644
index 00000000000..f1cb4062e80
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_technologist/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/5.png b/public/images/emoji/facebook_messenger/woman_technologist/5.png
new file mode 100644
index 00000000000..5154939f5b0
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_technologist/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_technologist/6.png b/public/images/emoji/facebook_messenger/woman_technologist/6.png
new file mode 100644
index 00000000000..a427628a98e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_technologist/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf.png b/public/images/emoji/facebook_messenger/woman_with_headscarf.png
new file mode 100644
index 00000000000..6b3731cac84
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_headscarf.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png
new file mode 100644
index 00000000000..511414ad6c6
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png
new file mode 100644
index 00000000000..af954353790
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png
new file mode 100644
index 00000000000..355bdeb6361
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png
new file mode 100644
index 00000000000..8d0ad7202e3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png b/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png
new file mode 100644
index 00000000000..3c49195f876
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban.png b/public/images/emoji/facebook_messenger/woman_with_turban.png
new file mode 100644
index 00000000000..884af5800cf
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_turban.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/2.png b/public/images/emoji/facebook_messenger/woman_with_turban/2.png
new file mode 100644
index 00000000000..f4904a0f1c8
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_turban/2.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/3.png b/public/images/emoji/facebook_messenger/woman_with_turban/3.png
new file mode 100644
index 00000000000..1629f28e0b1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_turban/3.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/4.png b/public/images/emoji/facebook_messenger/woman_with_turban/4.png
new file mode 100644
index 00000000000..be7cbbeb4ee
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_turban/4.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/5.png b/public/images/emoji/facebook_messenger/woman_with_turban/5.png
new file mode 100644
index 00000000000..28845305df9
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_turban/5.png differ
diff --git a/public/images/emoji/facebook_messenger/woman_with_turban/6.png b/public/images/emoji/facebook_messenger/woman_with_turban/6.png
new file mode 100644
index 00000000000..1831d062fee
Binary files /dev/null and b/public/images/emoji/facebook_messenger/woman_with_turban/6.png differ
diff --git a/public/images/emoji/facebook_messenger/womans_clothes.png b/public/images/emoji/facebook_messenger/womans_clothes.png
new file mode 100644
index 00000000000..69c438bcbc4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/womans_clothes.png differ
diff --git a/public/images/emoji/facebook_messenger/womans_hat.png b/public/images/emoji/facebook_messenger/womans_hat.png
new file mode 100644
index 00000000000..bcbde01af25
Binary files /dev/null and b/public/images/emoji/facebook_messenger/womans_hat.png differ
diff --git a/public/images/emoji/facebook_messenger/women_wrestling.png b/public/images/emoji/facebook_messenger/women_wrestling.png
new file mode 100644
index 00000000000..11fa66fd954
Binary files /dev/null and b/public/images/emoji/facebook_messenger/women_wrestling.png differ
diff --git a/public/images/emoji/facebook_messenger/womens.png b/public/images/emoji/facebook_messenger/womens.png
new file mode 100644
index 00000000000..4223ed07e68
Binary files /dev/null and b/public/images/emoji/facebook_messenger/womens.png differ
diff --git a/public/images/emoji/facebook_messenger/world_map.png b/public/images/emoji/facebook_messenger/world_map.png
new file mode 100644
index 00000000000..8c102ea49de
Binary files /dev/null and b/public/images/emoji/facebook_messenger/world_map.png differ
diff --git a/public/images/emoji/facebook_messenger/worried.png b/public/images/emoji/facebook_messenger/worried.png
new file mode 100644
index 00000000000..c4614d9bef1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/worried.png differ
diff --git a/public/images/emoji/facebook_messenger/worship_symbol.png b/public/images/emoji/facebook_messenger/worship_symbol.png
new file mode 100644
index 00000000000..19e1150b303
Binary files /dev/null and b/public/images/emoji/facebook_messenger/worship_symbol.png differ
diff --git a/public/images/emoji/facebook_messenger/wrench.png b/public/images/emoji/facebook_messenger/wrench.png
new file mode 100644
index 00000000000..d91bd45269e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/wrench.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand.png b/public/images/emoji/facebook_messenger/writing_hand.png
new file mode 100644
index 00000000000..8ec2032bf40
Binary files /dev/null and b/public/images/emoji/facebook_messenger/writing_hand.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/2.png b/public/images/emoji/facebook_messenger/writing_hand/2.png
new file mode 100644
index 00000000000..37ac5fc0895
Binary files /dev/null and b/public/images/emoji/facebook_messenger/writing_hand/2.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/3.png b/public/images/emoji/facebook_messenger/writing_hand/3.png
new file mode 100644
index 00000000000..38606d26637
Binary files /dev/null and b/public/images/emoji/facebook_messenger/writing_hand/3.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/4.png b/public/images/emoji/facebook_messenger/writing_hand/4.png
new file mode 100644
index 00000000000..84ae862921f
Binary files /dev/null and b/public/images/emoji/facebook_messenger/writing_hand/4.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/5.png b/public/images/emoji/facebook_messenger/writing_hand/5.png
new file mode 100644
index 00000000000..89644b2736d
Binary files /dev/null and b/public/images/emoji/facebook_messenger/writing_hand/5.png differ
diff --git a/public/images/emoji/facebook_messenger/writing_hand/6.png b/public/images/emoji/facebook_messenger/writing_hand/6.png
new file mode 100644
index 00000000000..c9e50cd3522
Binary files /dev/null and b/public/images/emoji/facebook_messenger/writing_hand/6.png differ
diff --git a/public/images/emoji/facebook_messenger/x.png b/public/images/emoji/facebook_messenger/x.png
new file mode 100644
index 00000000000..fbb75f26265
Binary files /dev/null and b/public/images/emoji/facebook_messenger/x.png differ
diff --git a/public/images/emoji/facebook_messenger/yellow_heart.png b/public/images/emoji/facebook_messenger/yellow_heart.png
new file mode 100644
index 00000000000..5d2ed7dc209
Binary files /dev/null and b/public/images/emoji/facebook_messenger/yellow_heart.png differ
diff --git a/public/images/emoji/facebook_messenger/yemen.png b/public/images/emoji/facebook_messenger/yemen.png
new file mode 100644
index 00000000000..3a37c850413
Binary files /dev/null and b/public/images/emoji/facebook_messenger/yemen.png differ
diff --git a/public/images/emoji/facebook_messenger/yen.png b/public/images/emoji/facebook_messenger/yen.png
new file mode 100644
index 00000000000..237355971e4
Binary files /dev/null and b/public/images/emoji/facebook_messenger/yen.png differ
diff --git a/public/images/emoji/facebook_messenger/yin_yang.png b/public/images/emoji/facebook_messenger/yin_yang.png
new file mode 100644
index 00000000000..9e6fbd048a1
Binary files /dev/null and b/public/images/emoji/facebook_messenger/yin_yang.png differ
diff --git a/public/images/emoji/facebook_messenger/yum.png b/public/images/emoji/facebook_messenger/yum.png
new file mode 100644
index 00000000000..83d4dc62db2
Binary files /dev/null and b/public/images/emoji/facebook_messenger/yum.png differ
diff --git a/public/images/emoji/facebook_messenger/zambia.png b/public/images/emoji/facebook_messenger/zambia.png
new file mode 100644
index 00000000000..3e7d4cbea56
Binary files /dev/null and b/public/images/emoji/facebook_messenger/zambia.png differ
diff --git a/public/images/emoji/facebook_messenger/zap.png b/public/images/emoji/facebook_messenger/zap.png
new file mode 100644
index 00000000000..e7a3c9cdfc3
Binary files /dev/null and b/public/images/emoji/facebook_messenger/zap.png differ
diff --git a/public/images/emoji/facebook_messenger/zebra.png b/public/images/emoji/facebook_messenger/zebra.png
new file mode 100644
index 00000000000..6faa14f55dc
Binary files /dev/null and b/public/images/emoji/facebook_messenger/zebra.png differ
diff --git a/public/images/emoji/facebook_messenger/zero.png b/public/images/emoji/facebook_messenger/zero.png
new file mode 100644
index 00000000000..a8ff7b88d91
Binary files /dev/null and b/public/images/emoji/facebook_messenger/zero.png differ
diff --git a/public/images/emoji/facebook_messenger/zimbabwe.png b/public/images/emoji/facebook_messenger/zimbabwe.png
new file mode 100644
index 00000000000..c3af3c54d7e
Binary files /dev/null and b/public/images/emoji/facebook_messenger/zimbabwe.png differ
diff --git a/public/images/emoji/facebook_messenger/zipper_mouth.png b/public/images/emoji/facebook_messenger/zipper_mouth.png
new file mode 100644
index 00000000000..d764a0fe1ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/zipper_mouth.png differ
diff --git a/public/images/emoji/facebook_messenger/zipper_mouth_face.png b/public/images/emoji/facebook_messenger/zipper_mouth_face.png
new file mode 100644
index 00000000000..d764a0fe1ac
Binary files /dev/null and b/public/images/emoji/facebook_messenger/zipper_mouth_face.png differ
diff --git a/public/images/emoji/facebook_messenger/zombie.png b/public/images/emoji/facebook_messenger/zombie.png
new file mode 100644
index 00000000000..1bf288fcd4c
Binary files /dev/null and b/public/images/emoji/facebook_messenger/zombie.png differ
diff --git a/public/images/emoji/facebook_messenger/zzz.png b/public/images/emoji/facebook_messenger/zzz.png
new file mode 100644
index 00000000000..3ec9ff90039
Binary files /dev/null and b/public/images/emoji/facebook_messenger/zzz.png differ
diff --git a/public/images/emoji/google/+1.png b/public/images/emoji/google/+1.png
index bf0f4e543ad..b03f09eb007 100644
Binary files a/public/images/emoji/google/+1.png and b/public/images/emoji/google/+1.png differ
diff --git a/public/images/emoji/google/+1/2.png b/public/images/emoji/google/+1/2.png
new file mode 100644
index 00000000000..a3a855f569e
Binary files /dev/null and b/public/images/emoji/google/+1/2.png differ
diff --git a/public/images/emoji/google/+1/3.png b/public/images/emoji/google/+1/3.png
new file mode 100644
index 00000000000..c8e515c99bb
Binary files /dev/null and b/public/images/emoji/google/+1/3.png differ
diff --git a/public/images/emoji/google/+1/4.png b/public/images/emoji/google/+1/4.png
new file mode 100644
index 00000000000..4a388dd5fc0
Binary files /dev/null and b/public/images/emoji/google/+1/4.png differ
diff --git a/public/images/emoji/google/+1/5.png b/public/images/emoji/google/+1/5.png
new file mode 100644
index 00000000000..5bf6c233fd2
Binary files /dev/null and b/public/images/emoji/google/+1/5.png differ
diff --git a/public/images/emoji/google/+1/6.png b/public/images/emoji/google/+1/6.png
new file mode 100644
index 00000000000..fed5d03000e
Binary files /dev/null and b/public/images/emoji/google/+1/6.png differ
diff --git a/public/images/emoji/google/-1.png b/public/images/emoji/google/-1.png
index 8203a027e11..f2e7da55f6a 100644
Binary files a/public/images/emoji/google/-1.png and b/public/images/emoji/google/-1.png differ
diff --git a/public/images/emoji/google/-1/2.png b/public/images/emoji/google/-1/2.png
new file mode 100644
index 00000000000..86d0319a4ab
Binary files /dev/null and b/public/images/emoji/google/-1/2.png differ
diff --git a/public/images/emoji/google/-1/3.png b/public/images/emoji/google/-1/3.png
new file mode 100644
index 00000000000..c50a57e11ec
Binary files /dev/null and b/public/images/emoji/google/-1/3.png differ
diff --git a/public/images/emoji/google/-1/4.png b/public/images/emoji/google/-1/4.png
new file mode 100644
index 00000000000..979e09adf86
Binary files /dev/null and b/public/images/emoji/google/-1/4.png differ
diff --git a/public/images/emoji/google/-1/5.png b/public/images/emoji/google/-1/5.png
new file mode 100644
index 00000000000..bf4f10d81ab
Binary files /dev/null and b/public/images/emoji/google/-1/5.png differ
diff --git a/public/images/emoji/google/-1/6.png b/public/images/emoji/google/-1/6.png
new file mode 100644
index 00000000000..ecab34a9829
Binary files /dev/null and b/public/images/emoji/google/-1/6.png differ
diff --git a/public/images/emoji/google/100.png b/public/images/emoji/google/100.png
index de69e2b80c3..f72792d350f 100644
Binary files a/public/images/emoji/google/100.png and b/public/images/emoji/google/100.png differ
diff --git a/public/images/emoji/google/1234.png b/public/images/emoji/google/1234.png
index 064bcf41059..53d00b47171 100644
Binary files a/public/images/emoji/google/1234.png and b/public/images/emoji/google/1234.png differ
diff --git a/public/images/emoji/google/1st_place_medal.png b/public/images/emoji/google/1st_place_medal.png
new file mode 100644
index 00000000000..8b13dfec619
Binary files /dev/null and b/public/images/emoji/google/1st_place_medal.png differ
diff --git a/public/images/emoji/google/2nd_place_medal.png b/public/images/emoji/google/2nd_place_medal.png
new file mode 100644
index 00000000000..dbd2ef99141
Binary files /dev/null and b/public/images/emoji/google/2nd_place_medal.png differ
diff --git a/public/images/emoji/google/3rd_place_medal.png b/public/images/emoji/google/3rd_place_medal.png
new file mode 100644
index 00000000000..a6e4ff3b4bf
Binary files /dev/null and b/public/images/emoji/google/3rd_place_medal.png differ
diff --git a/public/images/emoji/google/8ball.png b/public/images/emoji/google/8ball.png
index 97afde3fcf6..ab42869644a 100644
Binary files a/public/images/emoji/google/8ball.png and b/public/images/emoji/google/8ball.png differ
diff --git a/public/images/emoji/google/a.png b/public/images/emoji/google/a.png
index 5e887d2b010..97451b60768 100644
Binary files a/public/images/emoji/google/a.png and b/public/images/emoji/google/a.png differ
diff --git a/public/images/emoji/google/ab.png b/public/images/emoji/google/ab.png
index fe85e51fd3f..da29c555997 100644
Binary files a/public/images/emoji/google/ab.png and b/public/images/emoji/google/ab.png differ
diff --git a/public/images/emoji/google/abc.png b/public/images/emoji/google/abc.png
index 8136d794aa8..5c9880cf93c 100644
Binary files a/public/images/emoji/google/abc.png and b/public/images/emoji/google/abc.png differ
diff --git a/public/images/emoji/google/abcd.png b/public/images/emoji/google/abcd.png
index f28edf29c6a..0aeeb0eb9d7 100644
Binary files a/public/images/emoji/google/abcd.png and b/public/images/emoji/google/abcd.png differ
diff --git a/public/images/emoji/google/accept.png b/public/images/emoji/google/accept.png
index 32b0ff03830..3a8259c2a65 100644
Binary files a/public/images/emoji/google/accept.png and b/public/images/emoji/google/accept.png differ
diff --git a/public/images/emoji/google/admission_tickets.png b/public/images/emoji/google/admission_tickets.png
index 959ba48a2d2..d4a4f20a291 100644
Binary files a/public/images/emoji/google/admission_tickets.png and b/public/images/emoji/google/admission_tickets.png differ
diff --git a/public/images/emoji/google/adult.png b/public/images/emoji/google/adult.png
new file mode 100644
index 00000000000..b1e573ea796
Binary files /dev/null and b/public/images/emoji/google/adult.png differ
diff --git a/public/images/emoji/google/adult/2.png b/public/images/emoji/google/adult/2.png
new file mode 100644
index 00000000000..49b6323c700
Binary files /dev/null and b/public/images/emoji/google/adult/2.png differ
diff --git a/public/images/emoji/google/adult/3.png b/public/images/emoji/google/adult/3.png
new file mode 100644
index 00000000000..74211085d4c
Binary files /dev/null and b/public/images/emoji/google/adult/3.png differ
diff --git a/public/images/emoji/google/adult/4.png b/public/images/emoji/google/adult/4.png
new file mode 100644
index 00000000000..3d1fea5870e
Binary files /dev/null and b/public/images/emoji/google/adult/4.png differ
diff --git a/public/images/emoji/google/adult/5.png b/public/images/emoji/google/adult/5.png
new file mode 100644
index 00000000000..4308a403887
Binary files /dev/null and b/public/images/emoji/google/adult/5.png differ
diff --git a/public/images/emoji/google/adult/6.png b/public/images/emoji/google/adult/6.png
new file mode 100644
index 00000000000..402c4664ec2
Binary files /dev/null and b/public/images/emoji/google/adult/6.png differ
diff --git a/public/images/emoji/google/aerial_tramway.png b/public/images/emoji/google/aerial_tramway.png
index 8ebcc10e09a..98f5d590e07 100644
Binary files a/public/images/emoji/google/aerial_tramway.png and b/public/images/emoji/google/aerial_tramway.png differ
diff --git a/public/images/emoji/google/afghanistan.png b/public/images/emoji/google/afghanistan.png
new file mode 100644
index 00000000000..e9738a1765d
Binary files /dev/null and b/public/images/emoji/google/afghanistan.png differ
diff --git a/public/images/emoji/google/airplane.png b/public/images/emoji/google/airplane.png
index 46a71b71b7b..98772ecd4ce 100644
Binary files a/public/images/emoji/google/airplane.png and b/public/images/emoji/google/airplane.png differ
diff --git a/public/images/emoji/google/airplane_arriving.png b/public/images/emoji/google/airplane_arriving.png
index 8e3428aefe2..e50c3233c24 100644
Binary files a/public/images/emoji/google/airplane_arriving.png and b/public/images/emoji/google/airplane_arriving.png differ
diff --git a/public/images/emoji/google/airplane_departure.png b/public/images/emoji/google/airplane_departure.png
index d6782594146..0536d2b45ba 100644
Binary files a/public/images/emoji/google/airplane_departure.png and b/public/images/emoji/google/airplane_departure.png differ
diff --git a/public/images/emoji/google/airplane_small.png b/public/images/emoji/google/airplane_small.png
index 4bd5d32edc1..5342466c300 100644
Binary files a/public/images/emoji/google/airplane_small.png and b/public/images/emoji/google/airplane_small.png differ
diff --git a/public/images/emoji/google/aland_islands.png b/public/images/emoji/google/aland_islands.png
new file mode 100644
index 00000000000..3da364d6153
Binary files /dev/null and b/public/images/emoji/google/aland_islands.png differ
diff --git a/public/images/emoji/google/alarm_clock.png b/public/images/emoji/google/alarm_clock.png
index f3824527d69..c0278db2680 100644
Binary files a/public/images/emoji/google/alarm_clock.png and b/public/images/emoji/google/alarm_clock.png differ
diff --git a/public/images/emoji/google/albania.png b/public/images/emoji/google/albania.png
new file mode 100644
index 00000000000..03ed7ebf0ae
Binary files /dev/null and b/public/images/emoji/google/albania.png differ
diff --git a/public/images/emoji/google/alembic.png b/public/images/emoji/google/alembic.png
index 5f3b4ccbc45..436090af681 100644
Binary files a/public/images/emoji/google/alembic.png and b/public/images/emoji/google/alembic.png differ
diff --git a/public/images/emoji/google/algeria.png b/public/images/emoji/google/algeria.png
new file mode 100644
index 00000000000..aaabbe9432b
Binary files /dev/null and b/public/images/emoji/google/algeria.png differ
diff --git a/public/images/emoji/google/alien.png b/public/images/emoji/google/alien.png
index 372f90bd825..b21fb58a8e9 100644
Binary files a/public/images/emoji/google/alien.png and b/public/images/emoji/google/alien.png differ
diff --git a/public/images/emoji/google/ambulance.png b/public/images/emoji/google/ambulance.png
index 172c3db9f33..af5dba3d2dc 100644
Binary files a/public/images/emoji/google/ambulance.png and b/public/images/emoji/google/ambulance.png differ
diff --git a/public/images/emoji/google/american_samoa.png b/public/images/emoji/google/american_samoa.png
new file mode 100644
index 00000000000..7c6a59dc3db
Binary files /dev/null and b/public/images/emoji/google/american_samoa.png differ
diff --git a/public/images/emoji/google/amphora.png b/public/images/emoji/google/amphora.png
index 2691b9b9d94..ad738586d46 100644
Binary files a/public/images/emoji/google/amphora.png and b/public/images/emoji/google/amphora.png differ
diff --git a/public/images/emoji/google/anchor.png b/public/images/emoji/google/anchor.png
index d667de555f2..9ad6ffcef08 100644
Binary files a/public/images/emoji/google/anchor.png and b/public/images/emoji/google/anchor.png differ
diff --git a/public/images/emoji/google/andorra.png b/public/images/emoji/google/andorra.png
new file mode 100644
index 00000000000..ce11d436920
Binary files /dev/null and b/public/images/emoji/google/andorra.png differ
diff --git a/public/images/emoji/google/angel.png b/public/images/emoji/google/angel.png
index 8104a636e23..93195336c2c 100644
Binary files a/public/images/emoji/google/angel.png and b/public/images/emoji/google/angel.png differ
diff --git a/public/images/emoji/google/angel/2.png b/public/images/emoji/google/angel/2.png
new file mode 100644
index 00000000000..f2b3b918a5c
Binary files /dev/null and b/public/images/emoji/google/angel/2.png differ
diff --git a/public/images/emoji/google/angel/3.png b/public/images/emoji/google/angel/3.png
new file mode 100644
index 00000000000..d40d3c8ba69
Binary files /dev/null and b/public/images/emoji/google/angel/3.png differ
diff --git a/public/images/emoji/google/angel/4.png b/public/images/emoji/google/angel/4.png
new file mode 100644
index 00000000000..894cfb72e7e
Binary files /dev/null and b/public/images/emoji/google/angel/4.png differ
diff --git a/public/images/emoji/google/angel/5.png b/public/images/emoji/google/angel/5.png
new file mode 100644
index 00000000000..196efe7c9d2
Binary files /dev/null and b/public/images/emoji/google/angel/5.png differ
diff --git a/public/images/emoji/google/angel/6.png b/public/images/emoji/google/angel/6.png
new file mode 100644
index 00000000000..ba65e5bcd2c
Binary files /dev/null and b/public/images/emoji/google/angel/6.png differ
diff --git a/public/images/emoji/google/anger.png b/public/images/emoji/google/anger.png
index fafb67c5f5c..6aa9f61415f 100644
Binary files a/public/images/emoji/google/anger.png and b/public/images/emoji/google/anger.png differ
diff --git a/public/images/emoji/google/anger_right.png b/public/images/emoji/google/anger_right.png
index 285492d7b7e..27b4462cbb4 100644
Binary files a/public/images/emoji/google/anger_right.png and b/public/images/emoji/google/anger_right.png differ
diff --git a/public/images/emoji/google/angola.png b/public/images/emoji/google/angola.png
new file mode 100644
index 00000000000..f6a8d186edc
Binary files /dev/null and b/public/images/emoji/google/angola.png differ
diff --git a/public/images/emoji/google/angry.png b/public/images/emoji/google/angry.png
index 92e2ce9c346..6649257e2a9 100644
Binary files a/public/images/emoji/google/angry.png and b/public/images/emoji/google/angry.png differ
diff --git a/public/images/emoji/google/anguilla.png b/public/images/emoji/google/anguilla.png
new file mode 100644
index 00000000000..20311cb75cb
Binary files /dev/null and b/public/images/emoji/google/anguilla.png differ
diff --git a/public/images/emoji/google/anguished.png b/public/images/emoji/google/anguished.png
index 249f6a06d20..5b943bac34d 100644
Binary files a/public/images/emoji/google/anguished.png and b/public/images/emoji/google/anguished.png differ
diff --git a/public/images/emoji/google/ant.png b/public/images/emoji/google/ant.png
index 68ba00aa1ff..c0399ae6e5b 100644
Binary files a/public/images/emoji/google/ant.png and b/public/images/emoji/google/ant.png differ
diff --git a/public/images/emoji/google/antarctica.png b/public/images/emoji/google/antarctica.png
new file mode 100644
index 00000000000..f4eee7ffa90
Binary files /dev/null and b/public/images/emoji/google/antarctica.png differ
diff --git a/public/images/emoji/google/antigua_barbuda.png b/public/images/emoji/google/antigua_barbuda.png
new file mode 100644
index 00000000000..d9ac68ec8c5
Binary files /dev/null and b/public/images/emoji/google/antigua_barbuda.png differ
diff --git a/public/images/emoji/google/apple.png b/public/images/emoji/google/apple.png
index 5b035b15a96..a3df2037159 100644
Binary files a/public/images/emoji/google/apple.png and b/public/images/emoji/google/apple.png differ
diff --git a/public/images/emoji/google/aquarius.png b/public/images/emoji/google/aquarius.png
index b4c86aeb1bb..52d8d5000be 100644
Binary files a/public/images/emoji/google/aquarius.png and b/public/images/emoji/google/aquarius.png differ
diff --git a/public/images/emoji/google/archery.png b/public/images/emoji/google/archery.png
index dceea7eab1b..6539d3b37e8 100644
Binary files a/public/images/emoji/google/archery.png and b/public/images/emoji/google/archery.png differ
diff --git a/public/images/emoji/google/argentina.png b/public/images/emoji/google/argentina.png
new file mode 100644
index 00000000000..5f44faeddde
Binary files /dev/null and b/public/images/emoji/google/argentina.png differ
diff --git a/public/images/emoji/google/aries.png b/public/images/emoji/google/aries.png
index 06ee1dc3a06..ab7fc9b03c0 100644
Binary files a/public/images/emoji/google/aries.png and b/public/images/emoji/google/aries.png differ
diff --git a/public/images/emoji/google/armenia.png b/public/images/emoji/google/armenia.png
new file mode 100644
index 00000000000..4af6686cb60
Binary files /dev/null and b/public/images/emoji/google/armenia.png differ
diff --git a/public/images/emoji/google/arrow_backward.png b/public/images/emoji/google/arrow_backward.png
index f583ff4bcf6..2bec2d7c448 100644
Binary files a/public/images/emoji/google/arrow_backward.png and b/public/images/emoji/google/arrow_backward.png differ
diff --git a/public/images/emoji/google/arrow_double_down.png b/public/images/emoji/google/arrow_double_down.png
index 0da8e08c4d3..efbad59f092 100644
Binary files a/public/images/emoji/google/arrow_double_down.png and b/public/images/emoji/google/arrow_double_down.png differ
diff --git a/public/images/emoji/google/arrow_double_up.png b/public/images/emoji/google/arrow_double_up.png
index 4d7dd039834..76f5e0ae149 100644
Binary files a/public/images/emoji/google/arrow_double_up.png and b/public/images/emoji/google/arrow_double_up.png differ
diff --git a/public/images/emoji/google/arrow_down.png b/public/images/emoji/google/arrow_down.png
index 8f324377edd..0b9865184ca 100644
Binary files a/public/images/emoji/google/arrow_down.png and b/public/images/emoji/google/arrow_down.png differ
diff --git a/public/images/emoji/google/arrow_down_small.png b/public/images/emoji/google/arrow_down_small.png
index 0f528cca2a0..48297676a93 100644
Binary files a/public/images/emoji/google/arrow_down_small.png and b/public/images/emoji/google/arrow_down_small.png differ
diff --git a/public/images/emoji/google/arrow_forward.png b/public/images/emoji/google/arrow_forward.png
index 440d4525a6b..3a6466fca7a 100644
Binary files a/public/images/emoji/google/arrow_forward.png and b/public/images/emoji/google/arrow_forward.png differ
diff --git a/public/images/emoji/google/arrow_heading_down.png b/public/images/emoji/google/arrow_heading_down.png
index b3f6fc59e0a..c8597ae17b1 100644
Binary files a/public/images/emoji/google/arrow_heading_down.png and b/public/images/emoji/google/arrow_heading_down.png differ
diff --git a/public/images/emoji/google/arrow_heading_up.png b/public/images/emoji/google/arrow_heading_up.png
index 22606f8e021..fe00d096491 100644
Binary files a/public/images/emoji/google/arrow_heading_up.png and b/public/images/emoji/google/arrow_heading_up.png differ
diff --git a/public/images/emoji/google/arrow_left.png b/public/images/emoji/google/arrow_left.png
index 08926f34486..bff1717f9b7 100644
Binary files a/public/images/emoji/google/arrow_left.png and b/public/images/emoji/google/arrow_left.png differ
diff --git a/public/images/emoji/google/arrow_lower_left.png b/public/images/emoji/google/arrow_lower_left.png
index 16105a839b1..517892c9130 100644
Binary files a/public/images/emoji/google/arrow_lower_left.png and b/public/images/emoji/google/arrow_lower_left.png differ
diff --git a/public/images/emoji/google/arrow_lower_right.png b/public/images/emoji/google/arrow_lower_right.png
index 5afb3fbfd0f..a2ff7573d7d 100644
Binary files a/public/images/emoji/google/arrow_lower_right.png and b/public/images/emoji/google/arrow_lower_right.png differ
diff --git a/public/images/emoji/google/arrow_right.png b/public/images/emoji/google/arrow_right.png
index b0648934b7d..b61cb914e58 100644
Binary files a/public/images/emoji/google/arrow_right.png and b/public/images/emoji/google/arrow_right.png differ
diff --git a/public/images/emoji/google/arrow_right_hook.png b/public/images/emoji/google/arrow_right_hook.png
index 263856473e9..1024ba2c28f 100644
Binary files a/public/images/emoji/google/arrow_right_hook.png and b/public/images/emoji/google/arrow_right_hook.png differ
diff --git a/public/images/emoji/google/arrow_up.png b/public/images/emoji/google/arrow_up.png
index f4543a4b42d..012d625c6aa 100644
Binary files a/public/images/emoji/google/arrow_up.png and b/public/images/emoji/google/arrow_up.png differ
diff --git a/public/images/emoji/google/arrow_up_down.png b/public/images/emoji/google/arrow_up_down.png
index 769849038ae..063fa8766c3 100644
Binary files a/public/images/emoji/google/arrow_up_down.png and b/public/images/emoji/google/arrow_up_down.png differ
diff --git a/public/images/emoji/google/arrow_up_small.png b/public/images/emoji/google/arrow_up_small.png
index f36b293e1a7..6f44a810205 100644
Binary files a/public/images/emoji/google/arrow_up_small.png and b/public/images/emoji/google/arrow_up_small.png differ
diff --git a/public/images/emoji/google/arrow_upper_left.png b/public/images/emoji/google/arrow_upper_left.png
index 63ad11cdb79..8187a46b08a 100644
Binary files a/public/images/emoji/google/arrow_upper_left.png and b/public/images/emoji/google/arrow_upper_left.png differ
diff --git a/public/images/emoji/google/arrow_upper_right.png b/public/images/emoji/google/arrow_upper_right.png
index f00a16a1eda..c59c2f3585f 100644
Binary files a/public/images/emoji/google/arrow_upper_right.png and b/public/images/emoji/google/arrow_upper_right.png differ
diff --git a/public/images/emoji/google/arrows_clockwise.png b/public/images/emoji/google/arrows_clockwise.png
index 9d94d6ecd69..63cb99ff897 100644
Binary files a/public/images/emoji/google/arrows_clockwise.png and b/public/images/emoji/google/arrows_clockwise.png differ
diff --git a/public/images/emoji/google/arrows_counterclockwise.png b/public/images/emoji/google/arrows_counterclockwise.png
index a20d7ee61d3..9811cdcec52 100644
Binary files a/public/images/emoji/google/arrows_counterclockwise.png and b/public/images/emoji/google/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/google/art.png b/public/images/emoji/google/art.png
index 75e4ae2ce81..9bb7a1d9f9a 100644
Binary files a/public/images/emoji/google/art.png and b/public/images/emoji/google/art.png differ
diff --git a/public/images/emoji/google/articulated_lorry.png b/public/images/emoji/google/articulated_lorry.png
index ff204d376ee..35b3d9b9917 100644
Binary files a/public/images/emoji/google/articulated_lorry.png and b/public/images/emoji/google/articulated_lorry.png differ
diff --git a/public/images/emoji/google/artificial_satellite.png b/public/images/emoji/google/artificial_satellite.png
new file mode 100644
index 00000000000..6b94efd773e
Binary files /dev/null and b/public/images/emoji/google/artificial_satellite.png differ
diff --git a/public/images/emoji/google/aruba.png b/public/images/emoji/google/aruba.png
new file mode 100644
index 00000000000..74245636f22
Binary files /dev/null and b/public/images/emoji/google/aruba.png differ
diff --git a/public/images/emoji/google/ascension_island.png b/public/images/emoji/google/ascension_island.png
new file mode 100644
index 00000000000..708a3c64aa9
Binary files /dev/null and b/public/images/emoji/google/ascension_island.png differ
diff --git a/public/images/emoji/google/asterisk.png b/public/images/emoji/google/asterisk.png
new file mode 100644
index 00000000000..9c0101c7d7e
Binary files /dev/null and b/public/images/emoji/google/asterisk.png differ
diff --git a/public/images/emoji/google/astonished.png b/public/images/emoji/google/astonished.png
index 70d16f32fbf..3016c48f586 100644
Binary files a/public/images/emoji/google/astonished.png and b/public/images/emoji/google/astonished.png differ
diff --git a/public/images/emoji/google/athletic_shoe.png b/public/images/emoji/google/athletic_shoe.png
index 313f37fdb56..9c169666aa8 100644
Binary files a/public/images/emoji/google/athletic_shoe.png and b/public/images/emoji/google/athletic_shoe.png differ
diff --git a/public/images/emoji/google/atm.png b/public/images/emoji/google/atm.png
index 095871f6cc8..1479b91ddba 100644
Binary files a/public/images/emoji/google/atm.png and b/public/images/emoji/google/atm.png differ
diff --git a/public/images/emoji/google/atom.png b/public/images/emoji/google/atom.png
index f535028c7aa..1bb290c8514 100644
Binary files a/public/images/emoji/google/atom.png and b/public/images/emoji/google/atom.png differ
diff --git a/public/images/emoji/google/atom_symbol.png b/public/images/emoji/google/atom_symbol.png
index f535028c7aa..1bb290c8514 100644
Binary files a/public/images/emoji/google/atom_symbol.png and b/public/images/emoji/google/atom_symbol.png differ
diff --git a/public/images/emoji/google/australia.png b/public/images/emoji/google/australia.png
new file mode 100644
index 00000000000..7ef6056c335
Binary files /dev/null and b/public/images/emoji/google/australia.png differ
diff --git a/public/images/emoji/google/austria.png b/public/images/emoji/google/austria.png
new file mode 100644
index 00000000000..84a21b7c852
Binary files /dev/null and b/public/images/emoji/google/austria.png differ
diff --git a/public/images/emoji/google/automobile.png b/public/images/emoji/google/automobile.png
new file mode 100644
index 00000000000..56f5cddc276
Binary files /dev/null and b/public/images/emoji/google/automobile.png differ
diff --git a/public/images/emoji/google/avocado.png b/public/images/emoji/google/avocado.png
new file mode 100644
index 00000000000..7f3e78d55f6
Binary files /dev/null and b/public/images/emoji/google/avocado.png differ
diff --git a/public/images/emoji/google/azerbaijan.png b/public/images/emoji/google/azerbaijan.png
new file mode 100644
index 00000000000..2ca8b332402
Binary files /dev/null and b/public/images/emoji/google/azerbaijan.png differ
diff --git a/public/images/emoji/google/b.png b/public/images/emoji/google/b.png
index 1d1da3a15e5..0c37cfbcc92 100644
Binary files a/public/images/emoji/google/b.png and b/public/images/emoji/google/b.png differ
diff --git a/public/images/emoji/google/baby.png b/public/images/emoji/google/baby.png
index 7f0efa4214b..7bb8284202e 100644
Binary files a/public/images/emoji/google/baby.png and b/public/images/emoji/google/baby.png differ
diff --git a/public/images/emoji/google/baby/2.png b/public/images/emoji/google/baby/2.png
new file mode 100644
index 00000000000..1b453f752ef
Binary files /dev/null and b/public/images/emoji/google/baby/2.png differ
diff --git a/public/images/emoji/google/baby/3.png b/public/images/emoji/google/baby/3.png
new file mode 100644
index 00000000000..e8bef481c91
Binary files /dev/null and b/public/images/emoji/google/baby/3.png differ
diff --git a/public/images/emoji/google/baby/4.png b/public/images/emoji/google/baby/4.png
new file mode 100644
index 00000000000..3b6af055b6a
Binary files /dev/null and b/public/images/emoji/google/baby/4.png differ
diff --git a/public/images/emoji/google/baby/5.png b/public/images/emoji/google/baby/5.png
new file mode 100644
index 00000000000..7a6ffedb961
Binary files /dev/null and b/public/images/emoji/google/baby/5.png differ
diff --git a/public/images/emoji/google/baby/6.png b/public/images/emoji/google/baby/6.png
new file mode 100644
index 00000000000..8c0d6788e4f
Binary files /dev/null and b/public/images/emoji/google/baby/6.png differ
diff --git a/public/images/emoji/google/baby_bottle.png b/public/images/emoji/google/baby_bottle.png
index d2b0b9421cb..1db2ef3b010 100644
Binary files a/public/images/emoji/google/baby_bottle.png and b/public/images/emoji/google/baby_bottle.png differ
diff --git a/public/images/emoji/google/baby_chick.png b/public/images/emoji/google/baby_chick.png
index 54d0a9f8706..109f05c0d43 100644
Binary files a/public/images/emoji/google/baby_chick.png and b/public/images/emoji/google/baby_chick.png differ
diff --git a/public/images/emoji/google/baby_symbol.png b/public/images/emoji/google/baby_symbol.png
index 49f0ac2a1b7..8c3fcd2dccb 100644
Binary files a/public/images/emoji/google/baby_symbol.png and b/public/images/emoji/google/baby_symbol.png differ
diff --git a/public/images/emoji/google/back.png b/public/images/emoji/google/back.png
index 10e93a3fdea..457e8dc3aca 100644
Binary files a/public/images/emoji/google/back.png and b/public/images/emoji/google/back.png differ
diff --git a/public/images/emoji/google/bacon.png b/public/images/emoji/google/bacon.png
new file mode 100644
index 00000000000..96187058dd9
Binary files /dev/null and b/public/images/emoji/google/bacon.png differ
diff --git a/public/images/emoji/google/badminton.png b/public/images/emoji/google/badminton.png
index 29e58535fef..23d81a01c26 100644
Binary files a/public/images/emoji/google/badminton.png and b/public/images/emoji/google/badminton.png differ
diff --git a/public/images/emoji/google/baggage_claim.png b/public/images/emoji/google/baggage_claim.png
index 4662c074909..b64147d6a63 100644
Binary files a/public/images/emoji/google/baggage_claim.png and b/public/images/emoji/google/baggage_claim.png differ
diff --git a/public/images/emoji/google/baguette_bread.png b/public/images/emoji/google/baguette_bread.png
new file mode 100644
index 00000000000..b05d2fd9720
Binary files /dev/null and b/public/images/emoji/google/baguette_bread.png differ
diff --git a/public/images/emoji/google/bahamas.png b/public/images/emoji/google/bahamas.png
new file mode 100644
index 00000000000..eb3e9140a63
Binary files /dev/null and b/public/images/emoji/google/bahamas.png differ
diff --git a/public/images/emoji/google/bahrain.png b/public/images/emoji/google/bahrain.png
new file mode 100644
index 00000000000..defa6c0297f
Binary files /dev/null and b/public/images/emoji/google/bahrain.png differ
diff --git a/public/images/emoji/google/balance_scale.png b/public/images/emoji/google/balance_scale.png
new file mode 100644
index 00000000000..b13e29f36c2
Binary files /dev/null and b/public/images/emoji/google/balance_scale.png differ
diff --git a/public/images/emoji/google/balloon.png b/public/images/emoji/google/balloon.png
index f0c1cdf23a6..e1d5408014f 100644
Binary files a/public/images/emoji/google/balloon.png and b/public/images/emoji/google/balloon.png differ
diff --git a/public/images/emoji/google/ballot_box.png b/public/images/emoji/google/ballot_box.png
index e38572e931d..874b7e277f0 100644
Binary files a/public/images/emoji/google/ballot_box.png and b/public/images/emoji/google/ballot_box.png differ
diff --git a/public/images/emoji/google/ballot_box_with_ballot.png b/public/images/emoji/google/ballot_box_with_ballot.png
index e38572e931d..874b7e277f0 100644
Binary files a/public/images/emoji/google/ballot_box_with_ballot.png and b/public/images/emoji/google/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/google/ballot_box_with_check.png b/public/images/emoji/google/ballot_box_with_check.png
index 624556e4b78..f18496deaf4 100644
Binary files a/public/images/emoji/google/ballot_box_with_check.png and b/public/images/emoji/google/ballot_box_with_check.png differ
diff --git a/public/images/emoji/google/bamboo.png b/public/images/emoji/google/bamboo.png
index c16dbf58b15..e9dc72c9f80 100644
Binary files a/public/images/emoji/google/bamboo.png and b/public/images/emoji/google/bamboo.png differ
diff --git a/public/images/emoji/google/banana.png b/public/images/emoji/google/banana.png
index 0956b72a74c..f01da669425 100644
Binary files a/public/images/emoji/google/banana.png and b/public/images/emoji/google/banana.png differ
diff --git a/public/images/emoji/google/bangbang.png b/public/images/emoji/google/bangbang.png
index fbf009bdade..5160aad2a08 100644
Binary files a/public/images/emoji/google/bangbang.png and b/public/images/emoji/google/bangbang.png differ
diff --git a/public/images/emoji/google/bangladesh.png b/public/images/emoji/google/bangladesh.png
new file mode 100644
index 00000000000..523e5928265
Binary files /dev/null and b/public/images/emoji/google/bangladesh.png differ
diff --git a/public/images/emoji/google/bank.png b/public/images/emoji/google/bank.png
index a64db408366..4011d56208b 100644
Binary files a/public/images/emoji/google/bank.png and b/public/images/emoji/google/bank.png differ
diff --git a/public/images/emoji/google/bar_chart.png b/public/images/emoji/google/bar_chart.png
index e12b95e0c76..f32d1a3aa87 100644
Binary files a/public/images/emoji/google/bar_chart.png and b/public/images/emoji/google/bar_chart.png differ
diff --git a/public/images/emoji/google/barbados.png b/public/images/emoji/google/barbados.png
new file mode 100644
index 00000000000..de435239cb7
Binary files /dev/null and b/public/images/emoji/google/barbados.png differ
diff --git a/public/images/emoji/google/barber.png b/public/images/emoji/google/barber.png
index 4e4a9ef79fe..ba56bc5c97c 100644
Binary files a/public/images/emoji/google/barber.png and b/public/images/emoji/google/barber.png differ
diff --git a/public/images/emoji/google/baseball.png b/public/images/emoji/google/baseball.png
index a00806ab5ad..97a73f6f8ed 100644
Binary files a/public/images/emoji/google/baseball.png and b/public/images/emoji/google/baseball.png differ
diff --git a/public/images/emoji/google/basketball.png b/public/images/emoji/google/basketball.png
index 9e4997efc1a..c7362826e64 100644
Binary files a/public/images/emoji/google/basketball.png and b/public/images/emoji/google/basketball.png differ
diff --git a/public/images/emoji/google/basketball_man.png b/public/images/emoji/google/basketball_man.png
new file mode 100644
index 00000000000..2f234c1261c
Binary files /dev/null and b/public/images/emoji/google/basketball_man.png differ
diff --git a/public/images/emoji/google/basketball_man/2.png b/public/images/emoji/google/basketball_man/2.png
new file mode 100644
index 00000000000..511ad7125cd
Binary files /dev/null and b/public/images/emoji/google/basketball_man/2.png differ
diff --git a/public/images/emoji/google/basketball_man/3.png b/public/images/emoji/google/basketball_man/3.png
new file mode 100644
index 00000000000..652a2149b8f
Binary files /dev/null and b/public/images/emoji/google/basketball_man/3.png differ
diff --git a/public/images/emoji/google/basketball_man/4.png b/public/images/emoji/google/basketball_man/4.png
new file mode 100644
index 00000000000..3ea11741d3e
Binary files /dev/null and b/public/images/emoji/google/basketball_man/4.png differ
diff --git a/public/images/emoji/google/basketball_man/5.png b/public/images/emoji/google/basketball_man/5.png
new file mode 100644
index 00000000000..28b8f863258
Binary files /dev/null and b/public/images/emoji/google/basketball_man/5.png differ
diff --git a/public/images/emoji/google/basketball_man/6.png b/public/images/emoji/google/basketball_man/6.png
new file mode 100644
index 00000000000..5450f40d54e
Binary files /dev/null and b/public/images/emoji/google/basketball_man/6.png differ
diff --git a/public/images/emoji/google/basketball_player.png b/public/images/emoji/google/basketball_player.png
index 13cb1dcc7d7..2f234c1261c 100644
Binary files a/public/images/emoji/google/basketball_player.png and b/public/images/emoji/google/basketball_player.png differ
diff --git a/public/images/emoji/google/basketball_player/2.png b/public/images/emoji/google/basketball_player/2.png
new file mode 100644
index 00000000000..511ad7125cd
Binary files /dev/null and b/public/images/emoji/google/basketball_player/2.png differ
diff --git a/public/images/emoji/google/basketball_player/3.png b/public/images/emoji/google/basketball_player/3.png
new file mode 100644
index 00000000000..652a2149b8f
Binary files /dev/null and b/public/images/emoji/google/basketball_player/3.png differ
diff --git a/public/images/emoji/google/basketball_player/4.png b/public/images/emoji/google/basketball_player/4.png
new file mode 100644
index 00000000000..3ea11741d3e
Binary files /dev/null and b/public/images/emoji/google/basketball_player/4.png differ
diff --git a/public/images/emoji/google/basketball_player/5.png b/public/images/emoji/google/basketball_player/5.png
new file mode 100644
index 00000000000..28b8f863258
Binary files /dev/null and b/public/images/emoji/google/basketball_player/5.png differ
diff --git a/public/images/emoji/google/basketball_player/6.png b/public/images/emoji/google/basketball_player/6.png
new file mode 100644
index 00000000000..5450f40d54e
Binary files /dev/null and b/public/images/emoji/google/basketball_player/6.png differ
diff --git a/public/images/emoji/google/basketball_woman.png b/public/images/emoji/google/basketball_woman.png
new file mode 100644
index 00000000000..1ebaa145024
Binary files /dev/null and b/public/images/emoji/google/basketball_woman.png differ
diff --git a/public/images/emoji/google/bat.png b/public/images/emoji/google/bat.png
new file mode 100644
index 00000000000..7bcc07be3a6
Binary files /dev/null and b/public/images/emoji/google/bat.png differ
diff --git a/public/images/emoji/google/bath.png b/public/images/emoji/google/bath.png
index 7710113f84d..7446865226a 100644
Binary files a/public/images/emoji/google/bath.png and b/public/images/emoji/google/bath.png differ
diff --git a/public/images/emoji/google/bath/2.png b/public/images/emoji/google/bath/2.png
new file mode 100644
index 00000000000..6fe566d964b
Binary files /dev/null and b/public/images/emoji/google/bath/2.png differ
diff --git a/public/images/emoji/google/bath/3.png b/public/images/emoji/google/bath/3.png
new file mode 100644
index 00000000000..918c109395a
Binary files /dev/null and b/public/images/emoji/google/bath/3.png differ
diff --git a/public/images/emoji/google/bath/4.png b/public/images/emoji/google/bath/4.png
new file mode 100644
index 00000000000..aa4fe481daa
Binary files /dev/null and b/public/images/emoji/google/bath/4.png differ
diff --git a/public/images/emoji/google/bath/5.png b/public/images/emoji/google/bath/5.png
new file mode 100644
index 00000000000..be0bcdbc28f
Binary files /dev/null and b/public/images/emoji/google/bath/5.png differ
diff --git a/public/images/emoji/google/bath/6.png b/public/images/emoji/google/bath/6.png
new file mode 100644
index 00000000000..476327e201a
Binary files /dev/null and b/public/images/emoji/google/bath/6.png differ
diff --git a/public/images/emoji/google/bathtub.png b/public/images/emoji/google/bathtub.png
index 9b73db28aae..99c7d1ba918 100644
Binary files a/public/images/emoji/google/bathtub.png and b/public/images/emoji/google/bathtub.png differ
diff --git a/public/images/emoji/google/battery.png b/public/images/emoji/google/battery.png
index d808953c8ba..f8f68e028dc 100644
Binary files a/public/images/emoji/google/battery.png and b/public/images/emoji/google/battery.png differ
diff --git a/public/images/emoji/google/beach.png b/public/images/emoji/google/beach.png
index df2c0101be9..ac106a0f036 100644
Binary files a/public/images/emoji/google/beach.png and b/public/images/emoji/google/beach.png differ
diff --git a/public/images/emoji/google/beach_umbrella.png b/public/images/emoji/google/beach_umbrella.png
index f23d6f604ce..ac106a0f036 100644
Binary files a/public/images/emoji/google/beach_umbrella.png and b/public/images/emoji/google/beach_umbrella.png differ
diff --git a/public/images/emoji/google/beach_with_umbrella.png b/public/images/emoji/google/beach_with_umbrella.png
index df2c0101be9..ac106a0f036 100644
Binary files a/public/images/emoji/google/beach_with_umbrella.png and b/public/images/emoji/google/beach_with_umbrella.png differ
diff --git a/public/images/emoji/google/bear.png b/public/images/emoji/google/bear.png
index 932e720ba3f..6d486b65605 100644
Binary files a/public/images/emoji/google/bear.png and b/public/images/emoji/google/bear.png differ
diff --git a/public/images/emoji/google/bearded_person.png b/public/images/emoji/google/bearded_person.png
new file mode 100644
index 00000000000..1cbeab61ab8
Binary files /dev/null and b/public/images/emoji/google/bearded_person.png differ
diff --git a/public/images/emoji/google/bearded_person/2.png b/public/images/emoji/google/bearded_person/2.png
new file mode 100644
index 00000000000..4bebe194407
Binary files /dev/null and b/public/images/emoji/google/bearded_person/2.png differ
diff --git a/public/images/emoji/google/bearded_person/3.png b/public/images/emoji/google/bearded_person/3.png
new file mode 100644
index 00000000000..1468f3cfaeb
Binary files /dev/null and b/public/images/emoji/google/bearded_person/3.png differ
diff --git a/public/images/emoji/google/bearded_person/4.png b/public/images/emoji/google/bearded_person/4.png
new file mode 100644
index 00000000000..bb0753cf8e8
Binary files /dev/null and b/public/images/emoji/google/bearded_person/4.png differ
diff --git a/public/images/emoji/google/bearded_person/5.png b/public/images/emoji/google/bearded_person/5.png
new file mode 100644
index 00000000000..9178fbef0a7
Binary files /dev/null and b/public/images/emoji/google/bearded_person/5.png differ
diff --git a/public/images/emoji/google/bearded_person/6.png b/public/images/emoji/google/bearded_person/6.png
new file mode 100644
index 00000000000..ecbca1e8453
Binary files /dev/null and b/public/images/emoji/google/bearded_person/6.png differ
diff --git a/public/images/emoji/google/bed.png b/public/images/emoji/google/bed.png
index 9f53173a0e8..0044d37c514 100644
Binary files a/public/images/emoji/google/bed.png and b/public/images/emoji/google/bed.png differ
diff --git a/public/images/emoji/google/bee.png b/public/images/emoji/google/bee.png
index 168af47a547..4bcf0f5a5ce 100644
Binary files a/public/images/emoji/google/bee.png and b/public/images/emoji/google/bee.png differ
diff --git a/public/images/emoji/google/beer.png b/public/images/emoji/google/beer.png
index b19ebbf90ce..8f28caa27d7 100644
Binary files a/public/images/emoji/google/beer.png and b/public/images/emoji/google/beer.png differ
diff --git a/public/images/emoji/google/beers.png b/public/images/emoji/google/beers.png
index 07919b0e35f..b92d90adc69 100644
Binary files a/public/images/emoji/google/beers.png and b/public/images/emoji/google/beers.png differ
diff --git a/public/images/emoji/google/beetle.png b/public/images/emoji/google/beetle.png
index 3dc6cdb7de4..62d39a1f559 100644
Binary files a/public/images/emoji/google/beetle.png and b/public/images/emoji/google/beetle.png differ
diff --git a/public/images/emoji/google/beginner.png b/public/images/emoji/google/beginner.png
index 09306fda007..30582c207b4 100644
Binary files a/public/images/emoji/google/beginner.png and b/public/images/emoji/google/beginner.png differ
diff --git a/public/images/emoji/google/belarus.png b/public/images/emoji/google/belarus.png
new file mode 100644
index 00000000000..b177eb3d5c3
Binary files /dev/null and b/public/images/emoji/google/belarus.png differ
diff --git a/public/images/emoji/google/belgium.png b/public/images/emoji/google/belgium.png
new file mode 100644
index 00000000000..23dec0aa5a7
Binary files /dev/null and b/public/images/emoji/google/belgium.png differ
diff --git a/public/images/emoji/google/belize.png b/public/images/emoji/google/belize.png
new file mode 100644
index 00000000000..40c0e4247e9
Binary files /dev/null and b/public/images/emoji/google/belize.png differ
diff --git a/public/images/emoji/google/bell.png b/public/images/emoji/google/bell.png
index e02bd2477fb..54f61d27d7d 100644
Binary files a/public/images/emoji/google/bell.png and b/public/images/emoji/google/bell.png differ
diff --git a/public/images/emoji/google/bellhop.png b/public/images/emoji/google/bellhop.png
index 582fb0f6a58..fa5165b0f2f 100644
Binary files a/public/images/emoji/google/bellhop.png and b/public/images/emoji/google/bellhop.png differ
diff --git a/public/images/emoji/google/bellhop_bell.png b/public/images/emoji/google/bellhop_bell.png
index 582fb0f6a58..fa5165b0f2f 100644
Binary files a/public/images/emoji/google/bellhop_bell.png and b/public/images/emoji/google/bellhop_bell.png differ
diff --git a/public/images/emoji/google/benin.png b/public/images/emoji/google/benin.png
new file mode 100644
index 00000000000..c05de3702a4
Binary files /dev/null and b/public/images/emoji/google/benin.png differ
diff --git a/public/images/emoji/google/bento.png b/public/images/emoji/google/bento.png
index 2180fc50008..412d219fa43 100644
Binary files a/public/images/emoji/google/bento.png and b/public/images/emoji/google/bento.png differ
diff --git a/public/images/emoji/google/bermuda.png b/public/images/emoji/google/bermuda.png
new file mode 100644
index 00000000000..8eb79e2f0dc
Binary files /dev/null and b/public/images/emoji/google/bermuda.png differ
diff --git a/public/images/emoji/google/bhutan.png b/public/images/emoji/google/bhutan.png
new file mode 100644
index 00000000000..7812ea3b2a1
Binary files /dev/null and b/public/images/emoji/google/bhutan.png differ
diff --git a/public/images/emoji/google/bicyclist.png b/public/images/emoji/google/bicyclist.png
index 5ef11710301..90af3135045 100644
Binary files a/public/images/emoji/google/bicyclist.png and b/public/images/emoji/google/bicyclist.png differ
diff --git a/public/images/emoji/google/bicyclist/2.png b/public/images/emoji/google/bicyclist/2.png
new file mode 100644
index 00000000000..9c7240de480
Binary files /dev/null and b/public/images/emoji/google/bicyclist/2.png differ
diff --git a/public/images/emoji/google/bicyclist/3.png b/public/images/emoji/google/bicyclist/3.png
new file mode 100644
index 00000000000..4c9ec6b5cf0
Binary files /dev/null and b/public/images/emoji/google/bicyclist/3.png differ
diff --git a/public/images/emoji/google/bicyclist/4.png b/public/images/emoji/google/bicyclist/4.png
new file mode 100644
index 00000000000..c24ba48c30e
Binary files /dev/null and b/public/images/emoji/google/bicyclist/4.png differ
diff --git a/public/images/emoji/google/bicyclist/5.png b/public/images/emoji/google/bicyclist/5.png
new file mode 100644
index 00000000000..20784cbbb5e
Binary files /dev/null and b/public/images/emoji/google/bicyclist/5.png differ
diff --git a/public/images/emoji/google/bicyclist/6.png b/public/images/emoji/google/bicyclist/6.png
new file mode 100644
index 00000000000..30dfc6a26d2
Binary files /dev/null and b/public/images/emoji/google/bicyclist/6.png differ
diff --git a/public/images/emoji/google/bike.png b/public/images/emoji/google/bike.png
index 6c9ac02949e..aae5fc30661 100644
Binary files a/public/images/emoji/google/bike.png and b/public/images/emoji/google/bike.png differ
diff --git a/public/images/emoji/google/biking_man.png b/public/images/emoji/google/biking_man.png
new file mode 100644
index 00000000000..90af3135045
Binary files /dev/null and b/public/images/emoji/google/biking_man.png differ
diff --git a/public/images/emoji/google/biking_man/2.png b/public/images/emoji/google/biking_man/2.png
new file mode 100644
index 00000000000..9c7240de480
Binary files /dev/null and b/public/images/emoji/google/biking_man/2.png differ
diff --git a/public/images/emoji/google/biking_man/3.png b/public/images/emoji/google/biking_man/3.png
new file mode 100644
index 00000000000..4c9ec6b5cf0
Binary files /dev/null and b/public/images/emoji/google/biking_man/3.png differ
diff --git a/public/images/emoji/google/biking_man/4.png b/public/images/emoji/google/biking_man/4.png
new file mode 100644
index 00000000000..c24ba48c30e
Binary files /dev/null and b/public/images/emoji/google/biking_man/4.png differ
diff --git a/public/images/emoji/google/biking_man/5.png b/public/images/emoji/google/biking_man/5.png
new file mode 100644
index 00000000000..20784cbbb5e
Binary files /dev/null and b/public/images/emoji/google/biking_man/5.png differ
diff --git a/public/images/emoji/google/biking_man/6.png b/public/images/emoji/google/biking_man/6.png
new file mode 100644
index 00000000000..30dfc6a26d2
Binary files /dev/null and b/public/images/emoji/google/biking_man/6.png differ
diff --git a/public/images/emoji/google/biking_woman.png b/public/images/emoji/google/biking_woman.png
new file mode 100644
index 00000000000..d6a192f9b81
Binary files /dev/null and b/public/images/emoji/google/biking_woman.png differ
diff --git a/public/images/emoji/google/biking_woman/2.png b/public/images/emoji/google/biking_woman/2.png
new file mode 100644
index 00000000000..e7eb57701dc
Binary files /dev/null and b/public/images/emoji/google/biking_woman/2.png differ
diff --git a/public/images/emoji/google/biking_woman/3.png b/public/images/emoji/google/biking_woman/3.png
new file mode 100644
index 00000000000..6d80a1fe33d
Binary files /dev/null and b/public/images/emoji/google/biking_woman/3.png differ
diff --git a/public/images/emoji/google/biking_woman/4.png b/public/images/emoji/google/biking_woman/4.png
new file mode 100644
index 00000000000..d7613910d91
Binary files /dev/null and b/public/images/emoji/google/biking_woman/4.png differ
diff --git a/public/images/emoji/google/biking_woman/5.png b/public/images/emoji/google/biking_woman/5.png
new file mode 100644
index 00000000000..bd543a4c643
Binary files /dev/null and b/public/images/emoji/google/biking_woman/5.png differ
diff --git a/public/images/emoji/google/biking_woman/6.png b/public/images/emoji/google/biking_woman/6.png
new file mode 100644
index 00000000000..25465277d74
Binary files /dev/null and b/public/images/emoji/google/biking_woman/6.png differ
diff --git a/public/images/emoji/google/bikini.png b/public/images/emoji/google/bikini.png
index 1c8b7f54407..ad6fdaff311 100644
Binary files a/public/images/emoji/google/bikini.png and b/public/images/emoji/google/bikini.png differ
diff --git a/public/images/emoji/google/billed_cap.png b/public/images/emoji/google/billed_cap.png
new file mode 100644
index 00000000000..a09913e21b6
Binary files /dev/null and b/public/images/emoji/google/billed_cap.png differ
diff --git a/public/images/emoji/google/biohazard.png b/public/images/emoji/google/biohazard.png
index 98ecbc5dfc7..867acac4099 100644
Binary files a/public/images/emoji/google/biohazard.png and b/public/images/emoji/google/biohazard.png differ
diff --git a/public/images/emoji/google/biohazard_sign.png b/public/images/emoji/google/biohazard_sign.png
index 98ecbc5dfc7..867acac4099 100644
Binary files a/public/images/emoji/google/biohazard_sign.png and b/public/images/emoji/google/biohazard_sign.png differ
diff --git a/public/images/emoji/google/bird.png b/public/images/emoji/google/bird.png
index 85626b6c353..f29f1aa9036 100644
Binary files a/public/images/emoji/google/bird.png and b/public/images/emoji/google/bird.png differ
diff --git a/public/images/emoji/google/birthday.png b/public/images/emoji/google/birthday.png
index 392518cf336..9800dbc9aed 100644
Binary files a/public/images/emoji/google/birthday.png and b/public/images/emoji/google/birthday.png differ
diff --git a/public/images/emoji/google/black_circle.png b/public/images/emoji/google/black_circle.png
index 9cb8a2949c9..19a1b9ebc13 100644
Binary files a/public/images/emoji/google/black_circle.png and b/public/images/emoji/google/black_circle.png differ
diff --git a/public/images/emoji/google/black_flag.png b/public/images/emoji/google/black_flag.png
new file mode 100644
index 00000000000..a7fce0c5812
Binary files /dev/null and b/public/images/emoji/google/black_flag.png differ
diff --git a/public/images/emoji/google/black_heart.png b/public/images/emoji/google/black_heart.png
new file mode 100644
index 00000000000..38b5ac9fa5c
Binary files /dev/null and b/public/images/emoji/google/black_heart.png differ
diff --git a/public/images/emoji/google/black_joker.png b/public/images/emoji/google/black_joker.png
index db372fcab03..5a2de82787b 100644
Binary files a/public/images/emoji/google/black_joker.png and b/public/images/emoji/google/black_joker.png differ
diff --git a/public/images/emoji/google/black_large_square.png b/public/images/emoji/google/black_large_square.png
index b74a8c0b7f4..5d5a3e00872 100644
Binary files a/public/images/emoji/google/black_large_square.png and b/public/images/emoji/google/black_large_square.png differ
diff --git a/public/images/emoji/google/black_medium_small_square.png b/public/images/emoji/google/black_medium_small_square.png
index 4edf9c41fe3..2e1abb616ed 100644
Binary files a/public/images/emoji/google/black_medium_small_square.png and b/public/images/emoji/google/black_medium_small_square.png differ
diff --git a/public/images/emoji/google/black_medium_square.png b/public/images/emoji/google/black_medium_square.png
index bc3ecd4b2a4..e632311ccbc 100644
Binary files a/public/images/emoji/google/black_medium_square.png and b/public/images/emoji/google/black_medium_square.png differ
diff --git a/public/images/emoji/google/black_nib.png b/public/images/emoji/google/black_nib.png
index 1a50fa2b5aa..730254037f6 100644
Binary files a/public/images/emoji/google/black_nib.png and b/public/images/emoji/google/black_nib.png differ
diff --git a/public/images/emoji/google/black_small_square.png b/public/images/emoji/google/black_small_square.png
index 95b7ff704f4..bbdcbef554b 100644
Binary files a/public/images/emoji/google/black_small_square.png and b/public/images/emoji/google/black_small_square.png differ
diff --git a/public/images/emoji/google/black_square_button.png b/public/images/emoji/google/black_square_button.png
index 20f794590a3..242889f0639 100644
Binary files a/public/images/emoji/google/black_square_button.png and b/public/images/emoji/google/black_square_button.png differ
diff --git a/public/images/emoji/google/blonde_man.png b/public/images/emoji/google/blonde_man.png
new file mode 100644
index 00000000000..69d6b0b5a7e
Binary files /dev/null and b/public/images/emoji/google/blonde_man.png differ
diff --git a/public/images/emoji/google/blonde_man/2.png b/public/images/emoji/google/blonde_man/2.png
new file mode 100644
index 00000000000..71286ddbf4e
Binary files /dev/null and b/public/images/emoji/google/blonde_man/2.png differ
diff --git a/public/images/emoji/google/blonde_man/3.png b/public/images/emoji/google/blonde_man/3.png
new file mode 100644
index 00000000000..f5ccb5bc267
Binary files /dev/null and b/public/images/emoji/google/blonde_man/3.png differ
diff --git a/public/images/emoji/google/blonde_man/4.png b/public/images/emoji/google/blonde_man/4.png
new file mode 100644
index 00000000000..2d068f1de93
Binary files /dev/null and b/public/images/emoji/google/blonde_man/4.png differ
diff --git a/public/images/emoji/google/blonde_man/5.png b/public/images/emoji/google/blonde_man/5.png
new file mode 100644
index 00000000000..af6fe7aa988
Binary files /dev/null and b/public/images/emoji/google/blonde_man/5.png differ
diff --git a/public/images/emoji/google/blonde_man/6.png b/public/images/emoji/google/blonde_man/6.png
new file mode 100644
index 00000000000..85e4e9885b0
Binary files /dev/null and b/public/images/emoji/google/blonde_man/6.png differ
diff --git a/public/images/emoji/google/blonde_woman.png b/public/images/emoji/google/blonde_woman.png
new file mode 100644
index 00000000000..30bdd3f9d7b
Binary files /dev/null and b/public/images/emoji/google/blonde_woman.png differ
diff --git a/public/images/emoji/google/blonde_woman/2.png b/public/images/emoji/google/blonde_woman/2.png
new file mode 100644
index 00000000000..470f202beea
Binary files /dev/null and b/public/images/emoji/google/blonde_woman/2.png differ
diff --git a/public/images/emoji/google/blonde_woman/3.png b/public/images/emoji/google/blonde_woman/3.png
new file mode 100644
index 00000000000..932587e8d52
Binary files /dev/null and b/public/images/emoji/google/blonde_woman/3.png differ
diff --git a/public/images/emoji/google/blonde_woman/4.png b/public/images/emoji/google/blonde_woman/4.png
new file mode 100644
index 00000000000..c142bc62cf7
Binary files /dev/null and b/public/images/emoji/google/blonde_woman/4.png differ
diff --git a/public/images/emoji/google/blonde_woman/5.png b/public/images/emoji/google/blonde_woman/5.png
new file mode 100644
index 00000000000..2d5d18886fe
Binary files /dev/null and b/public/images/emoji/google/blonde_woman/5.png differ
diff --git a/public/images/emoji/google/blonde_woman/6.png b/public/images/emoji/google/blonde_woman/6.png
new file mode 100644
index 00000000000..fb1e8757ea8
Binary files /dev/null and b/public/images/emoji/google/blonde_woman/6.png differ
diff --git a/public/images/emoji/google/blossom.png b/public/images/emoji/google/blossom.png
index cd264329429..0f3b661adb1 100644
Binary files a/public/images/emoji/google/blossom.png and b/public/images/emoji/google/blossom.png differ
diff --git a/public/images/emoji/google/blowfish.png b/public/images/emoji/google/blowfish.png
index d8b6b284e79..1ab19958f19 100644
Binary files a/public/images/emoji/google/blowfish.png and b/public/images/emoji/google/blowfish.png differ
diff --git a/public/images/emoji/google/blue_book.png b/public/images/emoji/google/blue_book.png
index f3698722805..5edf72ede75 100644
Binary files a/public/images/emoji/google/blue_book.png and b/public/images/emoji/google/blue_book.png differ
diff --git a/public/images/emoji/google/blue_car.png b/public/images/emoji/google/blue_car.png
index abdf8f80fd8..6234478d686 100644
Binary files a/public/images/emoji/google/blue_car.png and b/public/images/emoji/google/blue_car.png differ
diff --git a/public/images/emoji/google/blue_heart.png b/public/images/emoji/google/blue_heart.png
index f9446770766..31a8f805dbe 100644
Binary files a/public/images/emoji/google/blue_heart.png and b/public/images/emoji/google/blue_heart.png differ
diff --git a/public/images/emoji/google/blush.png b/public/images/emoji/google/blush.png
index f01b27b4ab3..eea497bc22e 100644
Binary files a/public/images/emoji/google/blush.png and b/public/images/emoji/google/blush.png differ
diff --git a/public/images/emoji/google/boar.png b/public/images/emoji/google/boar.png
index ced8c03a5e3..aeb75ed0f3e 100644
Binary files a/public/images/emoji/google/boar.png and b/public/images/emoji/google/boar.png differ
diff --git a/public/images/emoji/google/boat.png b/public/images/emoji/google/boat.png
new file mode 100644
index 00000000000..42799a3b742
Binary files /dev/null and b/public/images/emoji/google/boat.png differ
diff --git a/public/images/emoji/google/bolivia.png b/public/images/emoji/google/bolivia.png
new file mode 100644
index 00000000000..0f16302055a
Binary files /dev/null and b/public/images/emoji/google/bolivia.png differ
diff --git a/public/images/emoji/google/bomb.png b/public/images/emoji/google/bomb.png
index 632540aae6c..9cd29f7a6ca 100644
Binary files a/public/images/emoji/google/bomb.png and b/public/images/emoji/google/bomb.png differ
diff --git a/public/images/emoji/google/book.png b/public/images/emoji/google/book.png
index ac277b2a55d..2f4edfa0328 100644
Binary files a/public/images/emoji/google/book.png and b/public/images/emoji/google/book.png differ
diff --git a/public/images/emoji/google/bookmark.png b/public/images/emoji/google/bookmark.png
index 44814dfcfe2..e74cd346146 100644
Binary files a/public/images/emoji/google/bookmark.png and b/public/images/emoji/google/bookmark.png differ
diff --git a/public/images/emoji/google/bookmark_tabs.png b/public/images/emoji/google/bookmark_tabs.png
index cd1d7ab780c..a582c199451 100644
Binary files a/public/images/emoji/google/bookmark_tabs.png and b/public/images/emoji/google/bookmark_tabs.png differ
diff --git a/public/images/emoji/google/books.png b/public/images/emoji/google/books.png
index 1478bfad9fe..9e065d7caaf 100644
Binary files a/public/images/emoji/google/books.png and b/public/images/emoji/google/books.png differ
diff --git a/public/images/emoji/google/boom.png b/public/images/emoji/google/boom.png
index 76edc4c348d..3f9acdb1ccd 100644
Binary files a/public/images/emoji/google/boom.png and b/public/images/emoji/google/boom.png differ
diff --git a/public/images/emoji/google/boot.png b/public/images/emoji/google/boot.png
index eb0347064ed..6a96d4f3b7d 100644
Binary files a/public/images/emoji/google/boot.png and b/public/images/emoji/google/boot.png differ
diff --git a/public/images/emoji/google/bosnia_herzegovina.png b/public/images/emoji/google/bosnia_herzegovina.png
new file mode 100644
index 00000000000..34109f18c90
Binary files /dev/null and b/public/images/emoji/google/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/google/botswana.png b/public/images/emoji/google/botswana.png
new file mode 100644
index 00000000000..ebb46a9fd0d
Binary files /dev/null and b/public/images/emoji/google/botswana.png differ
diff --git a/public/images/emoji/google/bottle_with_popping_cork.png b/public/images/emoji/google/bottle_with_popping_cork.png
index 5cf41ff03b2..ea9d7ec6bca 100644
Binary files a/public/images/emoji/google/bottle_with_popping_cork.png and b/public/images/emoji/google/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/google/bouquet.png b/public/images/emoji/google/bouquet.png
index 64ba6b601c2..94582587d6b 100644
Binary files a/public/images/emoji/google/bouquet.png and b/public/images/emoji/google/bouquet.png differ
diff --git a/public/images/emoji/google/bouvet_island.png b/public/images/emoji/google/bouvet_island.png
new file mode 100644
index 00000000000..5330d9794c3
Binary files /dev/null and b/public/images/emoji/google/bouvet_island.png differ
diff --git a/public/images/emoji/google/bow.png b/public/images/emoji/google/bow.png
index bd18e0ae6c6..3a5c6371d11 100644
Binary files a/public/images/emoji/google/bow.png and b/public/images/emoji/google/bow.png differ
diff --git a/public/images/emoji/google/bow/2.png b/public/images/emoji/google/bow/2.png
new file mode 100644
index 00000000000..b8f3b1fb52b
Binary files /dev/null and b/public/images/emoji/google/bow/2.png differ
diff --git a/public/images/emoji/google/bow/3.png b/public/images/emoji/google/bow/3.png
new file mode 100644
index 00000000000..e41b4963a86
Binary files /dev/null and b/public/images/emoji/google/bow/3.png differ
diff --git a/public/images/emoji/google/bow/4.png b/public/images/emoji/google/bow/4.png
new file mode 100644
index 00000000000..95236132809
Binary files /dev/null and b/public/images/emoji/google/bow/4.png differ
diff --git a/public/images/emoji/google/bow/5.png b/public/images/emoji/google/bow/5.png
new file mode 100644
index 00000000000..e4d4e3c8942
Binary files /dev/null and b/public/images/emoji/google/bow/5.png differ
diff --git a/public/images/emoji/google/bow/6.png b/public/images/emoji/google/bow/6.png
new file mode 100644
index 00000000000..94bce13825c
Binary files /dev/null and b/public/images/emoji/google/bow/6.png differ
diff --git a/public/images/emoji/google/bow_and_arrow.png b/public/images/emoji/google/bow_and_arrow.png
index dceea7eab1b..6539d3b37e8 100644
Binary files a/public/images/emoji/google/bow_and_arrow.png and b/public/images/emoji/google/bow_and_arrow.png differ
diff --git a/public/images/emoji/google/bowing_man.png b/public/images/emoji/google/bowing_man.png
new file mode 100644
index 00000000000..3a5c6371d11
Binary files /dev/null and b/public/images/emoji/google/bowing_man.png differ
diff --git a/public/images/emoji/google/bowing_man/2.png b/public/images/emoji/google/bowing_man/2.png
new file mode 100644
index 00000000000..b8f3b1fb52b
Binary files /dev/null and b/public/images/emoji/google/bowing_man/2.png differ
diff --git a/public/images/emoji/google/bowing_man/3.png b/public/images/emoji/google/bowing_man/3.png
new file mode 100644
index 00000000000..e41b4963a86
Binary files /dev/null and b/public/images/emoji/google/bowing_man/3.png differ
diff --git a/public/images/emoji/google/bowing_man/4.png b/public/images/emoji/google/bowing_man/4.png
new file mode 100644
index 00000000000..95236132809
Binary files /dev/null and b/public/images/emoji/google/bowing_man/4.png differ
diff --git a/public/images/emoji/google/bowing_man/5.png b/public/images/emoji/google/bowing_man/5.png
new file mode 100644
index 00000000000..e4d4e3c8942
Binary files /dev/null and b/public/images/emoji/google/bowing_man/5.png differ
diff --git a/public/images/emoji/google/bowing_man/6.png b/public/images/emoji/google/bowing_man/6.png
new file mode 100644
index 00000000000..94bce13825c
Binary files /dev/null and b/public/images/emoji/google/bowing_man/6.png differ
diff --git a/public/images/emoji/google/bowing_woman.png b/public/images/emoji/google/bowing_woman.png
new file mode 100644
index 00000000000..44e482e39fa
Binary files /dev/null and b/public/images/emoji/google/bowing_woman.png differ
diff --git a/public/images/emoji/google/bowing_woman/2.png b/public/images/emoji/google/bowing_woman/2.png
new file mode 100644
index 00000000000..5b4930a1df5
Binary files /dev/null and b/public/images/emoji/google/bowing_woman/2.png differ
diff --git a/public/images/emoji/google/bowing_woman/3.png b/public/images/emoji/google/bowing_woman/3.png
new file mode 100644
index 00000000000..24063f7eac8
Binary files /dev/null and b/public/images/emoji/google/bowing_woman/3.png differ
diff --git a/public/images/emoji/google/bowing_woman/4.png b/public/images/emoji/google/bowing_woman/4.png
new file mode 100644
index 00000000000..1352161b085
Binary files /dev/null and b/public/images/emoji/google/bowing_woman/4.png differ
diff --git a/public/images/emoji/google/bowing_woman/5.png b/public/images/emoji/google/bowing_woman/5.png
new file mode 100644
index 00000000000..989caced3b7
Binary files /dev/null and b/public/images/emoji/google/bowing_woman/5.png differ
diff --git a/public/images/emoji/google/bowing_woman/6.png b/public/images/emoji/google/bowing_woman/6.png
new file mode 100644
index 00000000000..3631f79ed4c
Binary files /dev/null and b/public/images/emoji/google/bowing_woman/6.png differ
diff --git a/public/images/emoji/google/bowl_with_spoon.png b/public/images/emoji/google/bowl_with_spoon.png
new file mode 100644
index 00000000000..95d115c676c
Binary files /dev/null and b/public/images/emoji/google/bowl_with_spoon.png differ
diff --git a/public/images/emoji/google/bowling.png b/public/images/emoji/google/bowling.png
index e39f72ddb6b..3b751677423 100644
Binary files a/public/images/emoji/google/bowling.png and b/public/images/emoji/google/bowling.png differ
diff --git a/public/images/emoji/google/boxing_glove.png b/public/images/emoji/google/boxing_glove.png
new file mode 100644
index 00000000000..96fba7e038a
Binary files /dev/null and b/public/images/emoji/google/boxing_glove.png differ
diff --git a/public/images/emoji/google/boy.png b/public/images/emoji/google/boy.png
index 9a0810d5f85..7764083787a 100644
Binary files a/public/images/emoji/google/boy.png and b/public/images/emoji/google/boy.png differ
diff --git a/public/images/emoji/google/boy/2.png b/public/images/emoji/google/boy/2.png
new file mode 100644
index 00000000000..a2bc54b5202
Binary files /dev/null and b/public/images/emoji/google/boy/2.png differ
diff --git a/public/images/emoji/google/boy/3.png b/public/images/emoji/google/boy/3.png
new file mode 100644
index 00000000000..1d1a18acac6
Binary files /dev/null and b/public/images/emoji/google/boy/3.png differ
diff --git a/public/images/emoji/google/boy/4.png b/public/images/emoji/google/boy/4.png
new file mode 100644
index 00000000000..732aa7ae8fd
Binary files /dev/null and b/public/images/emoji/google/boy/4.png differ
diff --git a/public/images/emoji/google/boy/5.png b/public/images/emoji/google/boy/5.png
new file mode 100644
index 00000000000..c90aaa9978a
Binary files /dev/null and b/public/images/emoji/google/boy/5.png differ
diff --git a/public/images/emoji/google/boy/6.png b/public/images/emoji/google/boy/6.png
new file mode 100644
index 00000000000..dc62add0fa3
Binary files /dev/null and b/public/images/emoji/google/boy/6.png differ
diff --git a/public/images/emoji/google/brain.png b/public/images/emoji/google/brain.png
new file mode 100644
index 00000000000..a25c3629732
Binary files /dev/null and b/public/images/emoji/google/brain.png differ
diff --git a/public/images/emoji/google/brazil.png b/public/images/emoji/google/brazil.png
new file mode 100644
index 00000000000..0b4cf93fd6f
Binary files /dev/null and b/public/images/emoji/google/brazil.png differ
diff --git a/public/images/emoji/google/bread.png b/public/images/emoji/google/bread.png
index db9365adb16..35c1d102474 100644
Binary files a/public/images/emoji/google/bread.png and b/public/images/emoji/google/bread.png differ
diff --git a/public/images/emoji/google/breast_feeding.png b/public/images/emoji/google/breast_feeding.png
new file mode 100644
index 00000000000..06bf48a8ddd
Binary files /dev/null and b/public/images/emoji/google/breast_feeding.png differ
diff --git a/public/images/emoji/google/breast_feeding/2.png b/public/images/emoji/google/breast_feeding/2.png
new file mode 100644
index 00000000000..0a1c42a6de4
Binary files /dev/null and b/public/images/emoji/google/breast_feeding/2.png differ
diff --git a/public/images/emoji/google/breast_feeding/3.png b/public/images/emoji/google/breast_feeding/3.png
new file mode 100644
index 00000000000..e57faa9745e
Binary files /dev/null and b/public/images/emoji/google/breast_feeding/3.png differ
diff --git a/public/images/emoji/google/breast_feeding/4.png b/public/images/emoji/google/breast_feeding/4.png
new file mode 100644
index 00000000000..0732edb9fae
Binary files /dev/null and b/public/images/emoji/google/breast_feeding/4.png differ
diff --git a/public/images/emoji/google/breast_feeding/5.png b/public/images/emoji/google/breast_feeding/5.png
new file mode 100644
index 00000000000..9f013ec1998
Binary files /dev/null and b/public/images/emoji/google/breast_feeding/5.png differ
diff --git a/public/images/emoji/google/breast_feeding/6.png b/public/images/emoji/google/breast_feeding/6.png
new file mode 100644
index 00000000000..b18f79b1afe
Binary files /dev/null and b/public/images/emoji/google/breast_feeding/6.png differ
diff --git a/public/images/emoji/google/bride_with_veil.png b/public/images/emoji/google/bride_with_veil.png
index 95ac30e145c..4734c8155f7 100644
Binary files a/public/images/emoji/google/bride_with_veil.png and b/public/images/emoji/google/bride_with_veil.png differ
diff --git a/public/images/emoji/google/bride_with_veil/2.png b/public/images/emoji/google/bride_with_veil/2.png
new file mode 100644
index 00000000000..8ec4d883504
Binary files /dev/null and b/public/images/emoji/google/bride_with_veil/2.png differ
diff --git a/public/images/emoji/google/bride_with_veil/3.png b/public/images/emoji/google/bride_with_veil/3.png
new file mode 100644
index 00000000000..fa3fe8746b8
Binary files /dev/null and b/public/images/emoji/google/bride_with_veil/3.png differ
diff --git a/public/images/emoji/google/bride_with_veil/4.png b/public/images/emoji/google/bride_with_veil/4.png
new file mode 100644
index 00000000000..fce877ded3e
Binary files /dev/null and b/public/images/emoji/google/bride_with_veil/4.png differ
diff --git a/public/images/emoji/google/bride_with_veil/5.png b/public/images/emoji/google/bride_with_veil/5.png
new file mode 100644
index 00000000000..00368c7c7ba
Binary files /dev/null and b/public/images/emoji/google/bride_with_veil/5.png differ
diff --git a/public/images/emoji/google/bride_with_veil/6.png b/public/images/emoji/google/bride_with_veil/6.png
new file mode 100644
index 00000000000..5a898b3cb22
Binary files /dev/null and b/public/images/emoji/google/bride_with_veil/6.png differ
diff --git a/public/images/emoji/google/bridge_at_night.png b/public/images/emoji/google/bridge_at_night.png
index c2db12fa265..d80d5367f1f 100644
Binary files a/public/images/emoji/google/bridge_at_night.png and b/public/images/emoji/google/bridge_at_night.png differ
diff --git a/public/images/emoji/google/briefcase.png b/public/images/emoji/google/briefcase.png
index b384dc9d6cc..56d1fa4c3a8 100644
Binary files a/public/images/emoji/google/briefcase.png and b/public/images/emoji/google/briefcase.png differ
diff --git a/public/images/emoji/google/british_indian_ocean_territory.png b/public/images/emoji/google/british_indian_ocean_territory.png
new file mode 100644
index 00000000000..570ac967306
Binary files /dev/null and b/public/images/emoji/google/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/google/british_virgin_islands.png b/public/images/emoji/google/british_virgin_islands.png
new file mode 100644
index 00000000000..dd3399c2138
Binary files /dev/null and b/public/images/emoji/google/british_virgin_islands.png differ
diff --git a/public/images/emoji/google/broccoli.png b/public/images/emoji/google/broccoli.png
new file mode 100644
index 00000000000..067cfa08e4e
Binary files /dev/null and b/public/images/emoji/google/broccoli.png differ
diff --git a/public/images/emoji/google/broken_heart.png b/public/images/emoji/google/broken_heart.png
index df439f80444..115bf873f22 100644
Binary files a/public/images/emoji/google/broken_heart.png and b/public/images/emoji/google/broken_heart.png differ
diff --git a/public/images/emoji/google/brunei.png b/public/images/emoji/google/brunei.png
new file mode 100644
index 00000000000..f6257892f4d
Binary files /dev/null and b/public/images/emoji/google/brunei.png differ
diff --git a/public/images/emoji/google/bug.png b/public/images/emoji/google/bug.png
index 96ef9230ab1..f690ec234fb 100644
Binary files a/public/images/emoji/google/bug.png and b/public/images/emoji/google/bug.png differ
diff --git a/public/images/emoji/google/building_construction.png b/public/images/emoji/google/building_construction.png
index 78e30b4b27a..625247fd7c8 100644
Binary files a/public/images/emoji/google/building_construction.png and b/public/images/emoji/google/building_construction.png differ
diff --git a/public/images/emoji/google/bulb.png b/public/images/emoji/google/bulb.png
index 1ff72c2b962..92456879f71 100644
Binary files a/public/images/emoji/google/bulb.png and b/public/images/emoji/google/bulb.png differ
diff --git a/public/images/emoji/google/bulgaria.png b/public/images/emoji/google/bulgaria.png
new file mode 100644
index 00000000000..d8a43cd03bb
Binary files /dev/null and b/public/images/emoji/google/bulgaria.png differ
diff --git a/public/images/emoji/google/bullettrain_front.png b/public/images/emoji/google/bullettrain_front.png
index 9e70b3b2c33..3c117d8bace 100644
Binary files a/public/images/emoji/google/bullettrain_front.png and b/public/images/emoji/google/bullettrain_front.png differ
diff --git a/public/images/emoji/google/bullettrain_side.png b/public/images/emoji/google/bullettrain_side.png
index b257266ae0b..dae0881c98e 100644
Binary files a/public/images/emoji/google/bullettrain_side.png and b/public/images/emoji/google/bullettrain_side.png differ
diff --git a/public/images/emoji/google/burkina_faso.png b/public/images/emoji/google/burkina_faso.png
new file mode 100644
index 00000000000..ebebb32fbde
Binary files /dev/null and b/public/images/emoji/google/burkina_faso.png differ
diff --git a/public/images/emoji/google/burrito.png b/public/images/emoji/google/burrito.png
index cde9352f14c..807f0aa5337 100644
Binary files a/public/images/emoji/google/burrito.png and b/public/images/emoji/google/burrito.png differ
diff --git a/public/images/emoji/google/burundi.png b/public/images/emoji/google/burundi.png
new file mode 100644
index 00000000000..487c4ccd613
Binary files /dev/null and b/public/images/emoji/google/burundi.png differ
diff --git a/public/images/emoji/google/bus.png b/public/images/emoji/google/bus.png
index 599eca6f1cf..210d7f2ae9f 100644
Binary files a/public/images/emoji/google/bus.png and b/public/images/emoji/google/bus.png differ
diff --git a/public/images/emoji/google/business_suit_levitating.png b/public/images/emoji/google/business_suit_levitating.png
new file mode 100644
index 00000000000..88918f97b31
Binary files /dev/null and b/public/images/emoji/google/business_suit_levitating.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/2.png b/public/images/emoji/google/business_suit_levitating/2.png
new file mode 100644
index 00000000000..ddeda2a43bb
Binary files /dev/null and b/public/images/emoji/google/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/3.png b/public/images/emoji/google/business_suit_levitating/3.png
new file mode 100644
index 00000000000..e62d08a901f
Binary files /dev/null and b/public/images/emoji/google/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/4.png b/public/images/emoji/google/business_suit_levitating/4.png
new file mode 100644
index 00000000000..27012dfbe98
Binary files /dev/null and b/public/images/emoji/google/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/5.png b/public/images/emoji/google/business_suit_levitating/5.png
new file mode 100644
index 00000000000..c8863f58335
Binary files /dev/null and b/public/images/emoji/google/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/google/business_suit_levitating/6.png b/public/images/emoji/google/business_suit_levitating/6.png
new file mode 100644
index 00000000000..62e5e00578f
Binary files /dev/null and b/public/images/emoji/google/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/google/busstop.png b/public/images/emoji/google/busstop.png
index bf9c299cc28..a5f1d98efdb 100644
Binary files a/public/images/emoji/google/busstop.png and b/public/images/emoji/google/busstop.png differ
diff --git a/public/images/emoji/google/bust_in_silhouette.png b/public/images/emoji/google/bust_in_silhouette.png
index bc992283987..37e0afd46ec 100644
Binary files a/public/images/emoji/google/bust_in_silhouette.png and b/public/images/emoji/google/bust_in_silhouette.png differ
diff --git a/public/images/emoji/google/busts_in_silhouette.png b/public/images/emoji/google/busts_in_silhouette.png
index 677dcb13c5f..d6dc081cdc2 100644
Binary files a/public/images/emoji/google/busts_in_silhouette.png and b/public/images/emoji/google/busts_in_silhouette.png differ
diff --git a/public/images/emoji/google/butterfly.png b/public/images/emoji/google/butterfly.png
new file mode 100644
index 00000000000..02337caf6de
Binary files /dev/null and b/public/images/emoji/google/butterfly.png differ
diff --git a/public/images/emoji/google/cactus.png b/public/images/emoji/google/cactus.png
index 5d0ca1b590f..b0fcc9ae76b 100644
Binary files a/public/images/emoji/google/cactus.png and b/public/images/emoji/google/cactus.png differ
diff --git a/public/images/emoji/google/cake.png b/public/images/emoji/google/cake.png
index 1cdb3529926..9e7af8c5ec2 100644
Binary files a/public/images/emoji/google/cake.png and b/public/images/emoji/google/cake.png differ
diff --git a/public/images/emoji/google/calendar.png b/public/images/emoji/google/calendar.png
index fe5a4397697..748d582db3e 100644
Binary files a/public/images/emoji/google/calendar.png and b/public/images/emoji/google/calendar.png differ
diff --git a/public/images/emoji/google/calendar_spiral.png b/public/images/emoji/google/calendar_spiral.png
index 4f13ffb5f76..0997b42f0c2 100644
Binary files a/public/images/emoji/google/calendar_spiral.png and b/public/images/emoji/google/calendar_spiral.png differ
diff --git a/public/images/emoji/google/call_me_hand.png b/public/images/emoji/google/call_me_hand.png
new file mode 100644
index 00000000000..2e60f8c84ce
Binary files /dev/null and b/public/images/emoji/google/call_me_hand.png differ
diff --git a/public/images/emoji/google/call_me_hand/2.png b/public/images/emoji/google/call_me_hand/2.png
new file mode 100644
index 00000000000..4fb8a6c066d
Binary files /dev/null and b/public/images/emoji/google/call_me_hand/2.png differ
diff --git a/public/images/emoji/google/call_me_hand/3.png b/public/images/emoji/google/call_me_hand/3.png
new file mode 100644
index 00000000000..3144c7a46c1
Binary files /dev/null and b/public/images/emoji/google/call_me_hand/3.png differ
diff --git a/public/images/emoji/google/call_me_hand/4.png b/public/images/emoji/google/call_me_hand/4.png
new file mode 100644
index 00000000000..440776f8857
Binary files /dev/null and b/public/images/emoji/google/call_me_hand/4.png differ
diff --git a/public/images/emoji/google/call_me_hand/5.png b/public/images/emoji/google/call_me_hand/5.png
new file mode 100644
index 00000000000..6eb543f4cce
Binary files /dev/null and b/public/images/emoji/google/call_me_hand/5.png differ
diff --git a/public/images/emoji/google/call_me_hand/6.png b/public/images/emoji/google/call_me_hand/6.png
new file mode 100644
index 00000000000..99f568f9b1f
Binary files /dev/null and b/public/images/emoji/google/call_me_hand/6.png differ
diff --git a/public/images/emoji/google/calling.png b/public/images/emoji/google/calling.png
index 69d80b6b275..4d3bfd087fa 100644
Binary files a/public/images/emoji/google/calling.png and b/public/images/emoji/google/calling.png differ
diff --git a/public/images/emoji/google/cambodia.png b/public/images/emoji/google/cambodia.png
new file mode 100644
index 00000000000..cfbedf91ac5
Binary files /dev/null and b/public/images/emoji/google/cambodia.png differ
diff --git a/public/images/emoji/google/camel.png b/public/images/emoji/google/camel.png
index 715d722cd21..5da0d4620a9 100644
Binary files a/public/images/emoji/google/camel.png and b/public/images/emoji/google/camel.png differ
diff --git a/public/images/emoji/google/camera.png b/public/images/emoji/google/camera.png
index 8483a62d9ed..56a6109fd42 100644
Binary files a/public/images/emoji/google/camera.png and b/public/images/emoji/google/camera.png differ
diff --git a/public/images/emoji/google/camera_flash.png b/public/images/emoji/google/camera_flash.png
new file mode 100644
index 00000000000..327fbd507e9
Binary files /dev/null and b/public/images/emoji/google/camera_flash.png differ
diff --git a/public/images/emoji/google/camera_with_flash.png b/public/images/emoji/google/camera_with_flash.png
index 9e898cde12e..327fbd507e9 100644
Binary files a/public/images/emoji/google/camera_with_flash.png and b/public/images/emoji/google/camera_with_flash.png differ
diff --git a/public/images/emoji/google/cameroon.png b/public/images/emoji/google/cameroon.png
new file mode 100644
index 00000000000..0c49ba9df81
Binary files /dev/null and b/public/images/emoji/google/cameroon.png differ
diff --git a/public/images/emoji/google/camping.png b/public/images/emoji/google/camping.png
index 20cf5bd6010..eb062ee1e4a 100644
Binary files a/public/images/emoji/google/camping.png and b/public/images/emoji/google/camping.png differ
diff --git a/public/images/emoji/google/canada.png b/public/images/emoji/google/canada.png
new file mode 100644
index 00000000000..97744af556a
Binary files /dev/null and b/public/images/emoji/google/canada.png differ
diff --git a/public/images/emoji/google/canary_islands.png b/public/images/emoji/google/canary_islands.png
new file mode 100644
index 00000000000..4a33a5b653c
Binary files /dev/null and b/public/images/emoji/google/canary_islands.png differ
diff --git a/public/images/emoji/google/cancer.png b/public/images/emoji/google/cancer.png
index 2136036126b..275373bd958 100644
Binary files a/public/images/emoji/google/cancer.png and b/public/images/emoji/google/cancer.png differ
diff --git a/public/images/emoji/google/candle.png b/public/images/emoji/google/candle.png
index 7978fccceed..e131340388c 100644
Binary files a/public/images/emoji/google/candle.png and b/public/images/emoji/google/candle.png differ
diff --git a/public/images/emoji/google/candy.png b/public/images/emoji/google/candy.png
index d235a92b7cc..40a0b252b5c 100644
Binary files a/public/images/emoji/google/candy.png and b/public/images/emoji/google/candy.png differ
diff --git a/public/images/emoji/google/canned_food.png b/public/images/emoji/google/canned_food.png
new file mode 100644
index 00000000000..2fdb07a070b
Binary files /dev/null and b/public/images/emoji/google/canned_food.png differ
diff --git a/public/images/emoji/google/canoe.png b/public/images/emoji/google/canoe.png
new file mode 100644
index 00000000000..7464ae1e29a
Binary files /dev/null and b/public/images/emoji/google/canoe.png differ
diff --git a/public/images/emoji/google/cape_verde.png b/public/images/emoji/google/cape_verde.png
new file mode 100644
index 00000000000..42fc1f87f64
Binary files /dev/null and b/public/images/emoji/google/cape_verde.png differ
diff --git a/public/images/emoji/google/capital_abcd.png b/public/images/emoji/google/capital_abcd.png
index 62c8b9fe592..3c2d4dd68c3 100644
Binary files a/public/images/emoji/google/capital_abcd.png and b/public/images/emoji/google/capital_abcd.png differ
diff --git a/public/images/emoji/google/capricorn.png b/public/images/emoji/google/capricorn.png
index b99a7d1b742..f4dd4a18804 100644
Binary files a/public/images/emoji/google/capricorn.png and b/public/images/emoji/google/capricorn.png differ
diff --git a/public/images/emoji/google/car.png b/public/images/emoji/google/car.png
new file mode 100644
index 00000000000..56f5cddc276
Binary files /dev/null and b/public/images/emoji/google/car.png differ
diff --git a/public/images/emoji/google/card_box.png b/public/images/emoji/google/card_box.png
index 85c914bb1ca..68c5cb59351 100644
Binary files a/public/images/emoji/google/card_box.png and b/public/images/emoji/google/card_box.png differ
diff --git a/public/images/emoji/google/card_file_box.png b/public/images/emoji/google/card_file_box.png
index 85c914bb1ca..68c5cb59351 100644
Binary files a/public/images/emoji/google/card_file_box.png and b/public/images/emoji/google/card_file_box.png differ
diff --git a/public/images/emoji/google/card_index.png b/public/images/emoji/google/card_index.png
index d98708218f3..0403d3f48b3 100644
Binary files a/public/images/emoji/google/card_index.png and b/public/images/emoji/google/card_index.png differ
diff --git a/public/images/emoji/google/card_index_dividers.png b/public/images/emoji/google/card_index_dividers.png
index 62dea0dd66d..dd8929d64ac 100644
Binary files a/public/images/emoji/google/card_index_dividers.png and b/public/images/emoji/google/card_index_dividers.png differ
diff --git a/public/images/emoji/google/caribbean_netherlands.png b/public/images/emoji/google/caribbean_netherlands.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/caribbean_netherlands.png differ
diff --git a/public/images/emoji/google/carousel_horse.png b/public/images/emoji/google/carousel_horse.png
index 1a1da271366..cbe2d1c7cba 100644
Binary files a/public/images/emoji/google/carousel_horse.png and b/public/images/emoji/google/carousel_horse.png differ
diff --git a/public/images/emoji/google/carrot.png b/public/images/emoji/google/carrot.png
new file mode 100644
index 00000000000..08bde96748f
Binary files /dev/null and b/public/images/emoji/google/carrot.png differ
diff --git a/public/images/emoji/google/cat.png b/public/images/emoji/google/cat.png
index 78d6f9206b2..78249af6b10 100644
Binary files a/public/images/emoji/google/cat.png and b/public/images/emoji/google/cat.png differ
diff --git a/public/images/emoji/google/cat2.png b/public/images/emoji/google/cat2.png
index 5a5ceb0e67b..90f7ccac424 100644
Binary files a/public/images/emoji/google/cat2.png and b/public/images/emoji/google/cat2.png differ
diff --git a/public/images/emoji/google/cayman_islands.png b/public/images/emoji/google/cayman_islands.png
new file mode 100644
index 00000000000..d08b13b5ff0
Binary files /dev/null and b/public/images/emoji/google/cayman_islands.png differ
diff --git a/public/images/emoji/google/cd.png b/public/images/emoji/google/cd.png
index a5334c3acd2..a8eb5143702 100644
Binary files a/public/images/emoji/google/cd.png and b/public/images/emoji/google/cd.png differ
diff --git a/public/images/emoji/google/central_african_republic.png b/public/images/emoji/google/central_african_republic.png
new file mode 100644
index 00000000000..c848f392e01
Binary files /dev/null and b/public/images/emoji/google/central_african_republic.png differ
diff --git a/public/images/emoji/google/ceuta_and_melilla.png b/public/images/emoji/google/ceuta_and_melilla.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/google/chad.png b/public/images/emoji/google/chad.png
new file mode 100644
index 00000000000..969e249fa0f
Binary files /dev/null and b/public/images/emoji/google/chad.png differ
diff --git a/public/images/emoji/google/chains.png b/public/images/emoji/google/chains.png
index 30c3e888811..21b9cba7ad5 100644
Binary files a/public/images/emoji/google/chains.png and b/public/images/emoji/google/chains.png differ
diff --git a/public/images/emoji/google/champagne.png b/public/images/emoji/google/champagne.png
index 5cf41ff03b2..ea9d7ec6bca 100644
Binary files a/public/images/emoji/google/champagne.png and b/public/images/emoji/google/champagne.png differ
diff --git a/public/images/emoji/google/chart.png b/public/images/emoji/google/chart.png
index d66c094b485..63e45562f47 100644
Binary files a/public/images/emoji/google/chart.png and b/public/images/emoji/google/chart.png differ
diff --git a/public/images/emoji/google/chart_with_downwards_trend.png b/public/images/emoji/google/chart_with_downwards_trend.png
index 377075e9c63..b7b1f63b8af 100644
Binary files a/public/images/emoji/google/chart_with_downwards_trend.png and b/public/images/emoji/google/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/google/chart_with_upwards_trend.png b/public/images/emoji/google/chart_with_upwards_trend.png
index 282ef90344a..61fe759b330 100644
Binary files a/public/images/emoji/google/chart_with_upwards_trend.png and b/public/images/emoji/google/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/google/checkered_flag.png b/public/images/emoji/google/checkered_flag.png
index c9b232ed025..f3bb7f449b9 100644
Binary files a/public/images/emoji/google/checkered_flag.png and b/public/images/emoji/google/checkered_flag.png differ
diff --git a/public/images/emoji/google/cheese.png b/public/images/emoji/google/cheese.png
index e66ad08ba8a..383912db45e 100644
Binary files a/public/images/emoji/google/cheese.png and b/public/images/emoji/google/cheese.png differ
diff --git a/public/images/emoji/google/cheese_wedge.png b/public/images/emoji/google/cheese_wedge.png
index e66ad08ba8a..383912db45e 100644
Binary files a/public/images/emoji/google/cheese_wedge.png and b/public/images/emoji/google/cheese_wedge.png differ
diff --git a/public/images/emoji/google/cherries.png b/public/images/emoji/google/cherries.png
index e1931e295c3..f73b77ea8ed 100644
Binary files a/public/images/emoji/google/cherries.png and b/public/images/emoji/google/cherries.png differ
diff --git a/public/images/emoji/google/cherry_blossom.png b/public/images/emoji/google/cherry_blossom.png
index 4a142df68dd..f390147a2f5 100644
Binary files a/public/images/emoji/google/cherry_blossom.png and b/public/images/emoji/google/cherry_blossom.png differ
diff --git a/public/images/emoji/google/chestnut.png b/public/images/emoji/google/chestnut.png
index 4a6266aa0e0..f6357e32208 100644
Binary files a/public/images/emoji/google/chestnut.png and b/public/images/emoji/google/chestnut.png differ
diff --git a/public/images/emoji/google/chicken.png b/public/images/emoji/google/chicken.png
index 53c11c8cbc6..7afff72f1a1 100644
Binary files a/public/images/emoji/google/chicken.png and b/public/images/emoji/google/chicken.png differ
diff --git a/public/images/emoji/google/child.png b/public/images/emoji/google/child.png
new file mode 100644
index 00000000000..50c98992c4b
Binary files /dev/null and b/public/images/emoji/google/child.png differ
diff --git a/public/images/emoji/google/child/2.png b/public/images/emoji/google/child/2.png
new file mode 100644
index 00000000000..fcb4518f4c3
Binary files /dev/null and b/public/images/emoji/google/child/2.png differ
diff --git a/public/images/emoji/google/child/3.png b/public/images/emoji/google/child/3.png
new file mode 100644
index 00000000000..14d11ce1f02
Binary files /dev/null and b/public/images/emoji/google/child/3.png differ
diff --git a/public/images/emoji/google/child/4.png b/public/images/emoji/google/child/4.png
new file mode 100644
index 00000000000..8e1f733e470
Binary files /dev/null and b/public/images/emoji/google/child/4.png differ
diff --git a/public/images/emoji/google/child/5.png b/public/images/emoji/google/child/5.png
new file mode 100644
index 00000000000..bd7cf557ced
Binary files /dev/null and b/public/images/emoji/google/child/5.png differ
diff --git a/public/images/emoji/google/child/6.png b/public/images/emoji/google/child/6.png
new file mode 100644
index 00000000000..9a20bf5feb5
Binary files /dev/null and b/public/images/emoji/google/child/6.png differ
diff --git a/public/images/emoji/google/children_crossing.png b/public/images/emoji/google/children_crossing.png
index f83ecee8e27..070212c0b32 100644
Binary files a/public/images/emoji/google/children_crossing.png and b/public/images/emoji/google/children_crossing.png differ
diff --git a/public/images/emoji/google/chile.png b/public/images/emoji/google/chile.png
new file mode 100644
index 00000000000..26d789675a1
Binary files /dev/null and b/public/images/emoji/google/chile.png differ
diff --git a/public/images/emoji/google/chipmunk.png b/public/images/emoji/google/chipmunk.png
index 56529ca0464..b1a971d38c8 100644
Binary files a/public/images/emoji/google/chipmunk.png and b/public/images/emoji/google/chipmunk.png differ
diff --git a/public/images/emoji/google/chocolate_bar.png b/public/images/emoji/google/chocolate_bar.png
index 8ebd8fe93fd..71998f818e4 100644
Binary files a/public/images/emoji/google/chocolate_bar.png and b/public/images/emoji/google/chocolate_bar.png differ
diff --git a/public/images/emoji/google/chopsticks.png b/public/images/emoji/google/chopsticks.png
new file mode 100644
index 00000000000..1f37514d5a4
Binary files /dev/null and b/public/images/emoji/google/chopsticks.png differ
diff --git a/public/images/emoji/google/christmas_island.png b/public/images/emoji/google/christmas_island.png
new file mode 100644
index 00000000000..48f139fdceb
Binary files /dev/null and b/public/images/emoji/google/christmas_island.png differ
diff --git a/public/images/emoji/google/christmas_tree.png b/public/images/emoji/google/christmas_tree.png
index 4ddc26af5a2..fdaa2f2f2a9 100644
Binary files a/public/images/emoji/google/christmas_tree.png and b/public/images/emoji/google/christmas_tree.png differ
diff --git a/public/images/emoji/google/church.png b/public/images/emoji/google/church.png
index 855bf9c3c72..0efd95ee047 100644
Binary files a/public/images/emoji/google/church.png and b/public/images/emoji/google/church.png differ
diff --git a/public/images/emoji/google/cinema.png b/public/images/emoji/google/cinema.png
index 912c36a6e05..615ec6150ba 100644
Binary files a/public/images/emoji/google/cinema.png and b/public/images/emoji/google/cinema.png differ
diff --git a/public/images/emoji/google/circus_tent.png b/public/images/emoji/google/circus_tent.png
index fc0995ea1eb..4e49fd8ab7e 100644
Binary files a/public/images/emoji/google/circus_tent.png and b/public/images/emoji/google/circus_tent.png differ
diff --git a/public/images/emoji/google/city_dusk.png b/public/images/emoji/google/city_dusk.png
index 11677c9411f..a04bf365511 100644
Binary files a/public/images/emoji/google/city_dusk.png and b/public/images/emoji/google/city_dusk.png differ
diff --git a/public/images/emoji/google/city_sunrise.png b/public/images/emoji/google/city_sunrise.png
index 606d49c2dd4..760a68ca829 100644
Binary files a/public/images/emoji/google/city_sunrise.png and b/public/images/emoji/google/city_sunrise.png differ
diff --git a/public/images/emoji/google/city_sunset.png b/public/images/emoji/google/city_sunset.png
index 606d49c2dd4..a04bf365511 100644
Binary files a/public/images/emoji/google/city_sunset.png and b/public/images/emoji/google/city_sunset.png differ
diff --git a/public/images/emoji/google/cityscape.png b/public/images/emoji/google/cityscape.png
index 218ea8e5fa9..431e0bbffd9 100644
Binary files a/public/images/emoji/google/cityscape.png and b/public/images/emoji/google/cityscape.png differ
diff --git a/public/images/emoji/google/cl.png b/public/images/emoji/google/cl.png
index 20e0d1d0960..1368a85cd1c 100644
Binary files a/public/images/emoji/google/cl.png and b/public/images/emoji/google/cl.png differ
diff --git a/public/images/emoji/google/clamp.png b/public/images/emoji/google/clamp.png
new file mode 100644
index 00000000000..245635724e4
Binary files /dev/null and b/public/images/emoji/google/clamp.png differ
diff --git a/public/images/emoji/google/clap.png b/public/images/emoji/google/clap.png
index 1def8c44efd..8270b96203d 100644
Binary files a/public/images/emoji/google/clap.png and b/public/images/emoji/google/clap.png differ
diff --git a/public/images/emoji/google/clap/2.png b/public/images/emoji/google/clap/2.png
new file mode 100644
index 00000000000..7497ec0698d
Binary files /dev/null and b/public/images/emoji/google/clap/2.png differ
diff --git a/public/images/emoji/google/clap/3.png b/public/images/emoji/google/clap/3.png
new file mode 100644
index 00000000000..77229e9f2b8
Binary files /dev/null and b/public/images/emoji/google/clap/3.png differ
diff --git a/public/images/emoji/google/clap/4.png b/public/images/emoji/google/clap/4.png
new file mode 100644
index 00000000000..34365ff5487
Binary files /dev/null and b/public/images/emoji/google/clap/4.png differ
diff --git a/public/images/emoji/google/clap/5.png b/public/images/emoji/google/clap/5.png
new file mode 100644
index 00000000000..699baff1d63
Binary files /dev/null and b/public/images/emoji/google/clap/5.png differ
diff --git a/public/images/emoji/google/clap/6.png b/public/images/emoji/google/clap/6.png
new file mode 100644
index 00000000000..8015a4ffa6d
Binary files /dev/null and b/public/images/emoji/google/clap/6.png differ
diff --git a/public/images/emoji/google/clapper.png b/public/images/emoji/google/clapper.png
index b8f9f807f98..88272203106 100644
Binary files a/public/images/emoji/google/clapper.png and b/public/images/emoji/google/clapper.png differ
diff --git a/public/images/emoji/google/classical_building.png b/public/images/emoji/google/classical_building.png
index 7c8c45438eb..b0a41c6c346 100644
Binary files a/public/images/emoji/google/classical_building.png and b/public/images/emoji/google/classical_building.png differ
diff --git a/public/images/emoji/google/clinking_glasses.png b/public/images/emoji/google/clinking_glasses.png
new file mode 100644
index 00000000000..e5a357035d2
Binary files /dev/null and b/public/images/emoji/google/clinking_glasses.png differ
diff --git a/public/images/emoji/google/clipboard.png b/public/images/emoji/google/clipboard.png
index c9af21fc986..4b831ffb8b5 100644
Binary files a/public/images/emoji/google/clipboard.png and b/public/images/emoji/google/clipboard.png differ
diff --git a/public/images/emoji/google/clipperton_island.png b/public/images/emoji/google/clipperton_island.png
new file mode 100644
index 00000000000..bc63af1def5
Binary files /dev/null and b/public/images/emoji/google/clipperton_island.png differ
diff --git a/public/images/emoji/google/clock.png b/public/images/emoji/google/clock.png
index 48c0e38d418..b326630c04a 100644
Binary files a/public/images/emoji/google/clock.png and b/public/images/emoji/google/clock.png differ
diff --git a/public/images/emoji/google/clock1.png b/public/images/emoji/google/clock1.png
index 5f0b1d88a5b..ee992f671f3 100644
Binary files a/public/images/emoji/google/clock1.png and b/public/images/emoji/google/clock1.png differ
diff --git a/public/images/emoji/google/clock10.png b/public/images/emoji/google/clock10.png
index 2942520aa62..41ec385cf8f 100644
Binary files a/public/images/emoji/google/clock10.png and b/public/images/emoji/google/clock10.png differ
diff --git a/public/images/emoji/google/clock1030.png b/public/images/emoji/google/clock1030.png
index b4bad6b1dee..19ca949e662 100644
Binary files a/public/images/emoji/google/clock1030.png and b/public/images/emoji/google/clock1030.png differ
diff --git a/public/images/emoji/google/clock11.png b/public/images/emoji/google/clock11.png
index bc422c6be84..43add251aae 100644
Binary files a/public/images/emoji/google/clock11.png and b/public/images/emoji/google/clock11.png differ
diff --git a/public/images/emoji/google/clock1130.png b/public/images/emoji/google/clock1130.png
index 4c4c06b94a2..c28f78163cd 100644
Binary files a/public/images/emoji/google/clock1130.png and b/public/images/emoji/google/clock1130.png differ
diff --git a/public/images/emoji/google/clock12.png b/public/images/emoji/google/clock12.png
index d7733bc61a1..63f46ae2a4c 100644
Binary files a/public/images/emoji/google/clock12.png and b/public/images/emoji/google/clock12.png differ
diff --git a/public/images/emoji/google/clock1230.png b/public/images/emoji/google/clock1230.png
index a1c71c939f1..23772963603 100644
Binary files a/public/images/emoji/google/clock1230.png and b/public/images/emoji/google/clock1230.png differ
diff --git a/public/images/emoji/google/clock130.png b/public/images/emoji/google/clock130.png
index 8c6496020a5..677203adc49 100644
Binary files a/public/images/emoji/google/clock130.png and b/public/images/emoji/google/clock130.png differ
diff --git a/public/images/emoji/google/clock2.png b/public/images/emoji/google/clock2.png
index 20d6e843a2f..eecb3ab9b5f 100644
Binary files a/public/images/emoji/google/clock2.png and b/public/images/emoji/google/clock2.png differ
diff --git a/public/images/emoji/google/clock230.png b/public/images/emoji/google/clock230.png
index c04c0307962..1042202b561 100644
Binary files a/public/images/emoji/google/clock230.png and b/public/images/emoji/google/clock230.png differ
diff --git a/public/images/emoji/google/clock3.png b/public/images/emoji/google/clock3.png
index 190e7842527..b7bc5fad42b 100644
Binary files a/public/images/emoji/google/clock3.png and b/public/images/emoji/google/clock3.png differ
diff --git a/public/images/emoji/google/clock330.png b/public/images/emoji/google/clock330.png
index 5e878c3c29e..a03cc49d9b7 100644
Binary files a/public/images/emoji/google/clock330.png and b/public/images/emoji/google/clock330.png differ
diff --git a/public/images/emoji/google/clock4.png b/public/images/emoji/google/clock4.png
index b4df6cfde92..9691167de8f 100644
Binary files a/public/images/emoji/google/clock4.png and b/public/images/emoji/google/clock4.png differ
diff --git a/public/images/emoji/google/clock430.png b/public/images/emoji/google/clock430.png
index 33e2cf89420..e3f45cb4709 100644
Binary files a/public/images/emoji/google/clock430.png and b/public/images/emoji/google/clock430.png differ
diff --git a/public/images/emoji/google/clock5.png b/public/images/emoji/google/clock5.png
index 70cfdce4683..9915dc19a18 100644
Binary files a/public/images/emoji/google/clock5.png and b/public/images/emoji/google/clock5.png differ
diff --git a/public/images/emoji/google/clock530.png b/public/images/emoji/google/clock530.png
index f7f5a6e192c..235ea8c4c37 100644
Binary files a/public/images/emoji/google/clock530.png and b/public/images/emoji/google/clock530.png differ
diff --git a/public/images/emoji/google/clock6.png b/public/images/emoji/google/clock6.png
index a71efd9da36..e66f2b61912 100644
Binary files a/public/images/emoji/google/clock6.png and b/public/images/emoji/google/clock6.png differ
diff --git a/public/images/emoji/google/clock630.png b/public/images/emoji/google/clock630.png
index 95149d0005a..2f27e90a38c 100644
Binary files a/public/images/emoji/google/clock630.png and b/public/images/emoji/google/clock630.png differ
diff --git a/public/images/emoji/google/clock7.png b/public/images/emoji/google/clock7.png
index 54bc95e8b83..709337d8f71 100644
Binary files a/public/images/emoji/google/clock7.png and b/public/images/emoji/google/clock7.png differ
diff --git a/public/images/emoji/google/clock730.png b/public/images/emoji/google/clock730.png
index 2244745911c..d625bebd2a4 100644
Binary files a/public/images/emoji/google/clock730.png and b/public/images/emoji/google/clock730.png differ
diff --git a/public/images/emoji/google/clock8.png b/public/images/emoji/google/clock8.png
index 72da307e37c..dd9c9eae546 100644
Binary files a/public/images/emoji/google/clock8.png and b/public/images/emoji/google/clock8.png differ
diff --git a/public/images/emoji/google/clock830.png b/public/images/emoji/google/clock830.png
index c36b0798b83..bc476488cd1 100644
Binary files a/public/images/emoji/google/clock830.png and b/public/images/emoji/google/clock830.png differ
diff --git a/public/images/emoji/google/clock9.png b/public/images/emoji/google/clock9.png
index 1aba4a8937f..f582c8a3ccf 100644
Binary files a/public/images/emoji/google/clock9.png and b/public/images/emoji/google/clock9.png differ
diff --git a/public/images/emoji/google/clock930.png b/public/images/emoji/google/clock930.png
index 1e7acda191e..36a3615e97f 100644
Binary files a/public/images/emoji/google/clock930.png and b/public/images/emoji/google/clock930.png differ
diff --git a/public/images/emoji/google/closed_book.png b/public/images/emoji/google/closed_book.png
index b28245ac4b5..99d377f072c 100644
Binary files a/public/images/emoji/google/closed_book.png and b/public/images/emoji/google/closed_book.png differ
diff --git a/public/images/emoji/google/closed_lock_with_key.png b/public/images/emoji/google/closed_lock_with_key.png
index 6fc692ab10f..8dba5354a84 100644
Binary files a/public/images/emoji/google/closed_lock_with_key.png and b/public/images/emoji/google/closed_lock_with_key.png differ
diff --git a/public/images/emoji/google/closed_umbrella.png b/public/images/emoji/google/closed_umbrella.png
index 6b2cdf59e56..cdc2739a518 100644
Binary files a/public/images/emoji/google/closed_umbrella.png and b/public/images/emoji/google/closed_umbrella.png differ
diff --git a/public/images/emoji/google/cloud.png b/public/images/emoji/google/cloud.png
index d11cf974a59..31008df2a0a 100644
Binary files a/public/images/emoji/google/cloud.png and b/public/images/emoji/google/cloud.png differ
diff --git a/public/images/emoji/google/cloud_lightning.png b/public/images/emoji/google/cloud_lightning.png
index 189e4a6a973..945a25d0661 100644
Binary files a/public/images/emoji/google/cloud_lightning.png and b/public/images/emoji/google/cloud_lightning.png differ
diff --git a/public/images/emoji/google/cloud_rain.png b/public/images/emoji/google/cloud_rain.png
index 1b32b3716fe..2795a159175 100644
Binary files a/public/images/emoji/google/cloud_rain.png and b/public/images/emoji/google/cloud_rain.png differ
diff --git a/public/images/emoji/google/cloud_snow.png b/public/images/emoji/google/cloud_snow.png
index 02d9e2ddb01..cdaf2830b50 100644
Binary files a/public/images/emoji/google/cloud_snow.png and b/public/images/emoji/google/cloud_snow.png differ
diff --git a/public/images/emoji/google/cloud_tornado.png b/public/images/emoji/google/cloud_tornado.png
index fb8684e1cec..7f488bc983f 100644
Binary files a/public/images/emoji/google/cloud_tornado.png and b/public/images/emoji/google/cloud_tornado.png differ
diff --git a/public/images/emoji/google/cloud_with_lightning.png b/public/images/emoji/google/cloud_with_lightning.png
index 189e4a6a973..945a25d0661 100644
Binary files a/public/images/emoji/google/cloud_with_lightning.png and b/public/images/emoji/google/cloud_with_lightning.png differ
diff --git a/public/images/emoji/google/cloud_with_lightning_and_rain.png b/public/images/emoji/google/cloud_with_lightning_and_rain.png
new file mode 100644
index 00000000000..5cb64e49e46
Binary files /dev/null and b/public/images/emoji/google/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/google/cloud_with_rain.png b/public/images/emoji/google/cloud_with_rain.png
index 1b32b3716fe..2795a159175 100644
Binary files a/public/images/emoji/google/cloud_with_rain.png and b/public/images/emoji/google/cloud_with_rain.png differ
diff --git a/public/images/emoji/google/cloud_with_snow.png b/public/images/emoji/google/cloud_with_snow.png
index 02d9e2ddb01..cdaf2830b50 100644
Binary files a/public/images/emoji/google/cloud_with_snow.png and b/public/images/emoji/google/cloud_with_snow.png differ
diff --git a/public/images/emoji/google/cloud_with_tornado.png b/public/images/emoji/google/cloud_with_tornado.png
index fb8684e1cec..7f488bc983f 100644
Binary files a/public/images/emoji/google/cloud_with_tornado.png and b/public/images/emoji/google/cloud_with_tornado.png differ
diff --git a/public/images/emoji/google/clown_face.png b/public/images/emoji/google/clown_face.png
new file mode 100644
index 00000000000..0f3fdf1fccc
Binary files /dev/null and b/public/images/emoji/google/clown_face.png differ
diff --git a/public/images/emoji/google/clubs.png b/public/images/emoji/google/clubs.png
index 2efcb695b83..5a5b71f15d5 100644
Binary files a/public/images/emoji/google/clubs.png and b/public/images/emoji/google/clubs.png differ
diff --git a/public/images/emoji/google/cn.png b/public/images/emoji/google/cn.png
index 38d240d5658..010dddd1076 100644
Binary files a/public/images/emoji/google/cn.png and b/public/images/emoji/google/cn.png differ
diff --git a/public/images/emoji/google/coat.png b/public/images/emoji/google/coat.png
new file mode 100644
index 00000000000..f7726506705
Binary files /dev/null and b/public/images/emoji/google/coat.png differ
diff --git a/public/images/emoji/google/cocktail.png b/public/images/emoji/google/cocktail.png
index 0174cbf98b0..48c95fd64fa 100644
Binary files a/public/images/emoji/google/cocktail.png and b/public/images/emoji/google/cocktail.png differ
diff --git a/public/images/emoji/google/coconut.png b/public/images/emoji/google/coconut.png
new file mode 100644
index 00000000000..273946dcdd5
Binary files /dev/null and b/public/images/emoji/google/coconut.png differ
diff --git a/public/images/emoji/google/cocos_islands.png b/public/images/emoji/google/cocos_islands.png
new file mode 100644
index 00000000000..040fe6aa8b8
Binary files /dev/null and b/public/images/emoji/google/cocos_islands.png differ
diff --git a/public/images/emoji/google/coffee.png b/public/images/emoji/google/coffee.png
index ccf5a36de5f..06756dc5392 100644
Binary files a/public/images/emoji/google/coffee.png and b/public/images/emoji/google/coffee.png differ
diff --git a/public/images/emoji/google/coffin.png b/public/images/emoji/google/coffin.png
index ac77ae07133..ec867a66357 100644
Binary files a/public/images/emoji/google/coffin.png and b/public/images/emoji/google/coffin.png differ
diff --git a/public/images/emoji/google/cold_sweat.png b/public/images/emoji/google/cold_sweat.png
index 956924946b5..dc7c922d647 100644
Binary files a/public/images/emoji/google/cold_sweat.png and b/public/images/emoji/google/cold_sweat.png differ
diff --git a/public/images/emoji/google/colombia.png b/public/images/emoji/google/colombia.png
new file mode 100644
index 00000000000..e7c1d5e6601
Binary files /dev/null and b/public/images/emoji/google/colombia.png differ
diff --git a/public/images/emoji/google/comet.png b/public/images/emoji/google/comet.png
index 34c92afd66f..5eb8e547503 100644
Binary files a/public/images/emoji/google/comet.png and b/public/images/emoji/google/comet.png differ
diff --git a/public/images/emoji/google/comoros.png b/public/images/emoji/google/comoros.png
new file mode 100644
index 00000000000..7f2ee7da428
Binary files /dev/null and b/public/images/emoji/google/comoros.png differ
diff --git a/public/images/emoji/google/compression.png b/public/images/emoji/google/compression.png
index 99709b6d7c9..245635724e4 100644
Binary files a/public/images/emoji/google/compression.png and b/public/images/emoji/google/compression.png differ
diff --git a/public/images/emoji/google/computer.png b/public/images/emoji/google/computer.png
index fbd02827cca..9185ea466f0 100644
Binary files a/public/images/emoji/google/computer.png and b/public/images/emoji/google/computer.png differ
diff --git a/public/images/emoji/google/computer_mouse.png b/public/images/emoji/google/computer_mouse.png
new file mode 100644
index 00000000000..606ada2ed4f
Binary files /dev/null and b/public/images/emoji/google/computer_mouse.png differ
diff --git a/public/images/emoji/google/confetti_ball.png b/public/images/emoji/google/confetti_ball.png
index c6afa366acb..301f662e21f 100644
Binary files a/public/images/emoji/google/confetti_ball.png and b/public/images/emoji/google/confetti_ball.png differ
diff --git a/public/images/emoji/google/confounded.png b/public/images/emoji/google/confounded.png
index 1b55bad1719..05468a6f908 100644
Binary files a/public/images/emoji/google/confounded.png and b/public/images/emoji/google/confounded.png differ
diff --git a/public/images/emoji/google/confused.png b/public/images/emoji/google/confused.png
index 4d382d61971..10f68535024 100644
Binary files a/public/images/emoji/google/confused.png and b/public/images/emoji/google/confused.png differ
diff --git a/public/images/emoji/google/congo_brazzaville.png b/public/images/emoji/google/congo_brazzaville.png
new file mode 100644
index 00000000000..86ba2b7c534
Binary files /dev/null and b/public/images/emoji/google/congo_brazzaville.png differ
diff --git a/public/images/emoji/google/congo_kinshasa.png b/public/images/emoji/google/congo_kinshasa.png
new file mode 100644
index 00000000000..bc6103b9920
Binary files /dev/null and b/public/images/emoji/google/congo_kinshasa.png differ
diff --git a/public/images/emoji/google/congratulations.png b/public/images/emoji/google/congratulations.png
index 9e5ab9c4fbf..bdf20971b09 100644
Binary files a/public/images/emoji/google/congratulations.png and b/public/images/emoji/google/congratulations.png differ
diff --git a/public/images/emoji/google/construction.png b/public/images/emoji/google/construction.png
index 3b53d874382..2410e41ffb4 100644
Binary files a/public/images/emoji/google/construction.png and b/public/images/emoji/google/construction.png differ
diff --git a/public/images/emoji/google/construction_site.png b/public/images/emoji/google/construction_site.png
index 78e30b4b27a..625247fd7c8 100644
Binary files a/public/images/emoji/google/construction_site.png and b/public/images/emoji/google/construction_site.png differ
diff --git a/public/images/emoji/google/construction_worker.png b/public/images/emoji/google/construction_worker.png
index 4888f08a477..aadfbfd27fb 100644
Binary files a/public/images/emoji/google/construction_worker.png and b/public/images/emoji/google/construction_worker.png differ
diff --git a/public/images/emoji/google/construction_worker/2.png b/public/images/emoji/google/construction_worker/2.png
new file mode 100644
index 00000000000..72c777135a5
Binary files /dev/null and b/public/images/emoji/google/construction_worker/2.png differ
diff --git a/public/images/emoji/google/construction_worker/3.png b/public/images/emoji/google/construction_worker/3.png
new file mode 100644
index 00000000000..68b5d586a17
Binary files /dev/null and b/public/images/emoji/google/construction_worker/3.png differ
diff --git a/public/images/emoji/google/construction_worker/4.png b/public/images/emoji/google/construction_worker/4.png
new file mode 100644
index 00000000000..e20b2d69ce6
Binary files /dev/null and b/public/images/emoji/google/construction_worker/4.png differ
diff --git a/public/images/emoji/google/construction_worker/5.png b/public/images/emoji/google/construction_worker/5.png
new file mode 100644
index 00000000000..256587ff5a4
Binary files /dev/null and b/public/images/emoji/google/construction_worker/5.png differ
diff --git a/public/images/emoji/google/construction_worker/6.png b/public/images/emoji/google/construction_worker/6.png
new file mode 100644
index 00000000000..2f4c5c40ab2
Binary files /dev/null and b/public/images/emoji/google/construction_worker/6.png differ
diff --git a/public/images/emoji/google/construction_worker_man.png b/public/images/emoji/google/construction_worker_man.png
new file mode 100644
index 00000000000..aadfbfd27fb
Binary files /dev/null and b/public/images/emoji/google/construction_worker_man.png differ
diff --git a/public/images/emoji/google/construction_worker_man/2.png b/public/images/emoji/google/construction_worker_man/2.png
new file mode 100644
index 00000000000..72c777135a5
Binary files /dev/null and b/public/images/emoji/google/construction_worker_man/2.png differ
diff --git a/public/images/emoji/google/construction_worker_man/3.png b/public/images/emoji/google/construction_worker_man/3.png
new file mode 100644
index 00000000000..68b5d586a17
Binary files /dev/null and b/public/images/emoji/google/construction_worker_man/3.png differ
diff --git a/public/images/emoji/google/construction_worker_man/4.png b/public/images/emoji/google/construction_worker_man/4.png
new file mode 100644
index 00000000000..e20b2d69ce6
Binary files /dev/null and b/public/images/emoji/google/construction_worker_man/4.png differ
diff --git a/public/images/emoji/google/construction_worker_man/5.png b/public/images/emoji/google/construction_worker_man/5.png
new file mode 100644
index 00000000000..256587ff5a4
Binary files /dev/null and b/public/images/emoji/google/construction_worker_man/5.png differ
diff --git a/public/images/emoji/google/construction_worker_man/6.png b/public/images/emoji/google/construction_worker_man/6.png
new file mode 100644
index 00000000000..2f4c5c40ab2
Binary files /dev/null and b/public/images/emoji/google/construction_worker_man/6.png differ
diff --git a/public/images/emoji/google/construction_worker_woman.png b/public/images/emoji/google/construction_worker_woman.png
new file mode 100644
index 00000000000..3c8f4806a7f
Binary files /dev/null and b/public/images/emoji/google/construction_worker_woman.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/2.png b/public/images/emoji/google/construction_worker_woman/2.png
new file mode 100644
index 00000000000..cae3c67fd53
Binary files /dev/null and b/public/images/emoji/google/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/3.png b/public/images/emoji/google/construction_worker_woman/3.png
new file mode 100644
index 00000000000..3dc7ae5dfcb
Binary files /dev/null and b/public/images/emoji/google/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/4.png b/public/images/emoji/google/construction_worker_woman/4.png
new file mode 100644
index 00000000000..f20f783509b
Binary files /dev/null and b/public/images/emoji/google/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/5.png b/public/images/emoji/google/construction_worker_woman/5.png
new file mode 100644
index 00000000000..7e9217adbc4
Binary files /dev/null and b/public/images/emoji/google/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/google/construction_worker_woman/6.png b/public/images/emoji/google/construction_worker_woman/6.png
new file mode 100644
index 00000000000..1098adbc8bf
Binary files /dev/null and b/public/images/emoji/google/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/google/control_knobs.png b/public/images/emoji/google/control_knobs.png
index 8b5f9176649..ac664d80573 100644
Binary files a/public/images/emoji/google/control_knobs.png and b/public/images/emoji/google/control_knobs.png differ
diff --git a/public/images/emoji/google/convenience_store.png b/public/images/emoji/google/convenience_store.png
index 20a2659bed3..5043fa66116 100644
Binary files a/public/images/emoji/google/convenience_store.png and b/public/images/emoji/google/convenience_store.png differ
diff --git a/public/images/emoji/google/cook_islands.png b/public/images/emoji/google/cook_islands.png
new file mode 100644
index 00000000000..fda8d2ba622
Binary files /dev/null and b/public/images/emoji/google/cook_islands.png differ
diff --git a/public/images/emoji/google/cookie.png b/public/images/emoji/google/cookie.png
index d7699382b0f..8db73aa8f6c 100644
Binary files a/public/images/emoji/google/cookie.png and b/public/images/emoji/google/cookie.png differ
diff --git a/public/images/emoji/google/cool.png b/public/images/emoji/google/cool.png
index edb2e1a4fbb..7b61153634d 100644
Binary files a/public/images/emoji/google/cool.png and b/public/images/emoji/google/cool.png differ
diff --git a/public/images/emoji/google/cop.png b/public/images/emoji/google/cop.png
index 5705d19c157..c6e424f54a1 100644
Binary files a/public/images/emoji/google/cop.png and b/public/images/emoji/google/cop.png differ
diff --git a/public/images/emoji/google/cop/2.png b/public/images/emoji/google/cop/2.png
new file mode 100644
index 00000000000..74bc0da8f2c
Binary files /dev/null and b/public/images/emoji/google/cop/2.png differ
diff --git a/public/images/emoji/google/cop/3.png b/public/images/emoji/google/cop/3.png
new file mode 100644
index 00000000000..d461370fdbf
Binary files /dev/null and b/public/images/emoji/google/cop/3.png differ
diff --git a/public/images/emoji/google/cop/4.png b/public/images/emoji/google/cop/4.png
new file mode 100644
index 00000000000..12d654b4e5e
Binary files /dev/null and b/public/images/emoji/google/cop/4.png differ
diff --git a/public/images/emoji/google/cop/5.png b/public/images/emoji/google/cop/5.png
new file mode 100644
index 00000000000..d555c18f792
Binary files /dev/null and b/public/images/emoji/google/cop/5.png differ
diff --git a/public/images/emoji/google/cop/6.png b/public/images/emoji/google/cop/6.png
new file mode 100644
index 00000000000..0542d87a6a2
Binary files /dev/null and b/public/images/emoji/google/cop/6.png differ
diff --git a/public/images/emoji/google/copyright.png b/public/images/emoji/google/copyright.png
index 68d8f2a6b65..220384e7ca5 100644
Binary files a/public/images/emoji/google/copyright.png and b/public/images/emoji/google/copyright.png differ
diff --git a/public/images/emoji/google/corn.png b/public/images/emoji/google/corn.png
index cb4010c5304..d608093dcaa 100644
Binary files a/public/images/emoji/google/corn.png and b/public/images/emoji/google/corn.png differ
diff --git a/public/images/emoji/google/costa_rica.png b/public/images/emoji/google/costa_rica.png
new file mode 100644
index 00000000000..57d6736bf1c
Binary files /dev/null and b/public/images/emoji/google/costa_rica.png differ
diff --git a/public/images/emoji/google/cote_divoire.png b/public/images/emoji/google/cote_divoire.png
new file mode 100644
index 00000000000..44cd3a3842d
Binary files /dev/null and b/public/images/emoji/google/cote_divoire.png differ
diff --git a/public/images/emoji/google/couch.png b/public/images/emoji/google/couch.png
index c74cf74d748..3e22d05afad 100644
Binary files a/public/images/emoji/google/couch.png and b/public/images/emoji/google/couch.png differ
diff --git a/public/images/emoji/google/couch_and_lamp.png b/public/images/emoji/google/couch_and_lamp.png
index c74cf74d748..3e22d05afad 100644
Binary files a/public/images/emoji/google/couch_and_lamp.png and b/public/images/emoji/google/couch_and_lamp.png differ
diff --git a/public/images/emoji/google/couple.png b/public/images/emoji/google/couple.png
index 7708bf8430a..e4faa7aca49 100644
Binary files a/public/images/emoji/google/couple.png and b/public/images/emoji/google/couple.png differ
diff --git a/public/images/emoji/google/couple_with_heart.png b/public/images/emoji/google/couple_with_heart.png
index 731e413a63b..8964580850c 100644
Binary files a/public/images/emoji/google/couple_with_heart.png and b/public/images/emoji/google/couple_with_heart.png differ
diff --git a/public/images/emoji/google/couple_with_heart_man_man.png b/public/images/emoji/google/couple_with_heart_man_man.png
new file mode 100644
index 00000000000..8c30736f98d
Binary files /dev/null and b/public/images/emoji/google/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/google/couple_with_heart_woman_man.png b/public/images/emoji/google/couple_with_heart_woman_man.png
new file mode 100644
index 00000000000..8964580850c
Binary files /dev/null and b/public/images/emoji/google/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/google/couple_with_heart_woman_woman.png b/public/images/emoji/google/couple_with_heart_woman_woman.png
new file mode 100644
index 00000000000..8eda1e8d848
Binary files /dev/null and b/public/images/emoji/google/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/google/couplekiss.png b/public/images/emoji/google/couplekiss.png
index f4c6a502da5..0b0adb59f65 100644
Binary files a/public/images/emoji/google/couplekiss.png and b/public/images/emoji/google/couplekiss.png differ
diff --git a/public/images/emoji/google/couplekiss_man_man.png b/public/images/emoji/google/couplekiss_man_man.png
new file mode 100644
index 00000000000..60aff93dd76
Binary files /dev/null and b/public/images/emoji/google/couplekiss_man_man.png differ
diff --git a/public/images/emoji/google/couplekiss_man_woman.png b/public/images/emoji/google/couplekiss_man_woman.png
new file mode 100644
index 00000000000..0b0adb59f65
Binary files /dev/null and b/public/images/emoji/google/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/google/couplekiss_woman_woman.png b/public/images/emoji/google/couplekiss_woman_woman.png
new file mode 100644
index 00000000000..7cd2d2ebdd7
Binary files /dev/null and b/public/images/emoji/google/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/google/cow.png b/public/images/emoji/google/cow.png
index cdf13217866..5cfba503983 100644
Binary files a/public/images/emoji/google/cow.png and b/public/images/emoji/google/cow.png differ
diff --git a/public/images/emoji/google/cow2.png b/public/images/emoji/google/cow2.png
index 996889ffdd4..0253a702630 100644
Binary files a/public/images/emoji/google/cow2.png and b/public/images/emoji/google/cow2.png differ
diff --git a/public/images/emoji/google/cowboy_hat_face.png b/public/images/emoji/google/cowboy_hat_face.png
new file mode 100644
index 00000000000..40f43ca47c5
Binary files /dev/null and b/public/images/emoji/google/cowboy_hat_face.png differ
diff --git a/public/images/emoji/google/crab.png b/public/images/emoji/google/crab.png
index 57e06b8faad..3385c068feb 100644
Binary files a/public/images/emoji/google/crab.png and b/public/images/emoji/google/crab.png differ
diff --git a/public/images/emoji/google/crayon.png b/public/images/emoji/google/crayon.png
index 0ef86da10fb..e82c0d2d5e6 100644
Binary files a/public/images/emoji/google/crayon.png and b/public/images/emoji/google/crayon.png differ
diff --git a/public/images/emoji/google/crazy_face.png b/public/images/emoji/google/crazy_face.png
new file mode 100644
index 00000000000..bdd2c62740d
Binary files /dev/null and b/public/images/emoji/google/crazy_face.png differ
diff --git a/public/images/emoji/google/credit_card.png b/public/images/emoji/google/credit_card.png
index 8c694147d8e..ba1d605923f 100644
Binary files a/public/images/emoji/google/credit_card.png and b/public/images/emoji/google/credit_card.png differ
diff --git a/public/images/emoji/google/crescent_moon.png b/public/images/emoji/google/crescent_moon.png
index 780a07cbc7f..dd893e982f7 100644
Binary files a/public/images/emoji/google/crescent_moon.png and b/public/images/emoji/google/crescent_moon.png differ
diff --git a/public/images/emoji/google/cricket.png b/public/images/emoji/google/cricket.png
index a6bbc03a90c..46b39fae4a7 100644
Binary files a/public/images/emoji/google/cricket.png and b/public/images/emoji/google/cricket.png differ
diff --git a/public/images/emoji/google/cricket_bat_and_ball.png b/public/images/emoji/google/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..98bac43e6c1
Binary files /dev/null and b/public/images/emoji/google/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/google/cricket_bat_ball.png b/public/images/emoji/google/cricket_bat_ball.png
index a6bbc03a90c..98bac43e6c1 100644
Binary files a/public/images/emoji/google/cricket_bat_ball.png and b/public/images/emoji/google/cricket_bat_ball.png differ
diff --git a/public/images/emoji/google/croatia.png b/public/images/emoji/google/croatia.png
new file mode 100644
index 00000000000..3dff9861d01
Binary files /dev/null and b/public/images/emoji/google/croatia.png differ
diff --git a/public/images/emoji/google/crocodile.png b/public/images/emoji/google/crocodile.png
index 94e0504c433..1269841e366 100644
Binary files a/public/images/emoji/google/crocodile.png and b/public/images/emoji/google/crocodile.png differ
diff --git a/public/images/emoji/google/croissant.png b/public/images/emoji/google/croissant.png
new file mode 100644
index 00000000000..879284fcb08
Binary files /dev/null and b/public/images/emoji/google/croissant.png differ
diff --git a/public/images/emoji/google/cross.png b/public/images/emoji/google/cross.png
index 52d188499f9..0a367b0233e 100644
Binary files a/public/images/emoji/google/cross.png and b/public/images/emoji/google/cross.png differ
diff --git a/public/images/emoji/google/crossed_fingers.png b/public/images/emoji/google/crossed_fingers.png
new file mode 100644
index 00000000000..cae9b3d41c7
Binary files /dev/null and b/public/images/emoji/google/crossed_fingers.png differ
diff --git a/public/images/emoji/google/crossed_fingers/2.png b/public/images/emoji/google/crossed_fingers/2.png
new file mode 100644
index 00000000000..0ebff8d5b47
Binary files /dev/null and b/public/images/emoji/google/crossed_fingers/2.png differ
diff --git a/public/images/emoji/google/crossed_fingers/3.png b/public/images/emoji/google/crossed_fingers/3.png
new file mode 100644
index 00000000000..122c1d7ca1f
Binary files /dev/null and b/public/images/emoji/google/crossed_fingers/3.png differ
diff --git a/public/images/emoji/google/crossed_fingers/4.png b/public/images/emoji/google/crossed_fingers/4.png
new file mode 100644
index 00000000000..dd5c35e1785
Binary files /dev/null and b/public/images/emoji/google/crossed_fingers/4.png differ
diff --git a/public/images/emoji/google/crossed_fingers/5.png b/public/images/emoji/google/crossed_fingers/5.png
new file mode 100644
index 00000000000..3371fbf4134
Binary files /dev/null and b/public/images/emoji/google/crossed_fingers/5.png differ
diff --git a/public/images/emoji/google/crossed_fingers/6.png b/public/images/emoji/google/crossed_fingers/6.png
new file mode 100644
index 00000000000..c22fcea63df
Binary files /dev/null and b/public/images/emoji/google/crossed_fingers/6.png differ
diff --git a/public/images/emoji/google/crossed_flags.png b/public/images/emoji/google/crossed_flags.png
index f1ad338c676..852ba9a702e 100644
Binary files a/public/images/emoji/google/crossed_flags.png and b/public/images/emoji/google/crossed_flags.png differ
diff --git a/public/images/emoji/google/crossed_swords.png b/public/images/emoji/google/crossed_swords.png
index 97f8e0d9a89..aa8ef85a770 100644
Binary files a/public/images/emoji/google/crossed_swords.png and b/public/images/emoji/google/crossed_swords.png differ
diff --git a/public/images/emoji/google/crown.png b/public/images/emoji/google/crown.png
index bb53ee14675..1c9d776e822 100644
Binary files a/public/images/emoji/google/crown.png and b/public/images/emoji/google/crown.png differ
diff --git a/public/images/emoji/google/cruise_ship.png b/public/images/emoji/google/cruise_ship.png
index b0ce2c2f50a..5ffa1e17dcd 100644
Binary files a/public/images/emoji/google/cruise_ship.png and b/public/images/emoji/google/cruise_ship.png differ
diff --git a/public/images/emoji/google/cry.png b/public/images/emoji/google/cry.png
index 995b0476603..0e9daa41ef5 100644
Binary files a/public/images/emoji/google/cry.png and b/public/images/emoji/google/cry.png differ
diff --git a/public/images/emoji/google/crying_cat_face.png b/public/images/emoji/google/crying_cat_face.png
index 453949b170e..9bf1a397aff 100644
Binary files a/public/images/emoji/google/crying_cat_face.png and b/public/images/emoji/google/crying_cat_face.png differ
diff --git a/public/images/emoji/google/crystal_ball.png b/public/images/emoji/google/crystal_ball.png
index f8abc41b2ea..e27b2c5c8d2 100644
Binary files a/public/images/emoji/google/crystal_ball.png and b/public/images/emoji/google/crystal_ball.png differ
diff --git a/public/images/emoji/google/cuba.png b/public/images/emoji/google/cuba.png
new file mode 100644
index 00000000000..feae50ff4b2
Binary files /dev/null and b/public/images/emoji/google/cuba.png differ
diff --git a/public/images/emoji/google/cucumber.png b/public/images/emoji/google/cucumber.png
new file mode 100644
index 00000000000..28bb40fe291
Binary files /dev/null and b/public/images/emoji/google/cucumber.png differ
diff --git a/public/images/emoji/google/cup_with_straw.png b/public/images/emoji/google/cup_with_straw.png
new file mode 100644
index 00000000000..cb421be671e
Binary files /dev/null and b/public/images/emoji/google/cup_with_straw.png differ
diff --git a/public/images/emoji/google/cupid.png b/public/images/emoji/google/cupid.png
index 0088a51e62e..6e26e46afd3 100644
Binary files a/public/images/emoji/google/cupid.png and b/public/images/emoji/google/cupid.png differ
diff --git a/public/images/emoji/google/curacao.png b/public/images/emoji/google/curacao.png
new file mode 100644
index 00000000000..6853a1c99fc
Binary files /dev/null and b/public/images/emoji/google/curacao.png differ
diff --git a/public/images/emoji/google/curling_stone.png b/public/images/emoji/google/curling_stone.png
new file mode 100644
index 00000000000..99dace03469
Binary files /dev/null and b/public/images/emoji/google/curling_stone.png differ
diff --git a/public/images/emoji/google/curly_loop.png b/public/images/emoji/google/curly_loop.png
index bb05a9bbb5b..860b72bf406 100644
Binary files a/public/images/emoji/google/curly_loop.png and b/public/images/emoji/google/curly_loop.png differ
diff --git a/public/images/emoji/google/currency_exchange.png b/public/images/emoji/google/currency_exchange.png
index d5e954da512..55b41fd570a 100644
Binary files a/public/images/emoji/google/currency_exchange.png and b/public/images/emoji/google/currency_exchange.png differ
diff --git a/public/images/emoji/google/curry.png b/public/images/emoji/google/curry.png
index 85563c8a939..2d1f9270533 100644
Binary files a/public/images/emoji/google/curry.png and b/public/images/emoji/google/curry.png differ
diff --git a/public/images/emoji/google/custard.png b/public/images/emoji/google/custard.png
index 1117f9bc894..6373ce2a546 100644
Binary files a/public/images/emoji/google/custard.png and b/public/images/emoji/google/custard.png differ
diff --git a/public/images/emoji/google/customs.png b/public/images/emoji/google/customs.png
index 8010e736046..58801f20462 100644
Binary files a/public/images/emoji/google/customs.png and b/public/images/emoji/google/customs.png differ
diff --git a/public/images/emoji/google/cut_of_meat.png b/public/images/emoji/google/cut_of_meat.png
new file mode 100644
index 00000000000..f801d2c4803
Binary files /dev/null and b/public/images/emoji/google/cut_of_meat.png differ
diff --git a/public/images/emoji/google/cyclone.png b/public/images/emoji/google/cyclone.png
index 9707a7d362c..e172a92653f 100644
Binary files a/public/images/emoji/google/cyclone.png and b/public/images/emoji/google/cyclone.png differ
diff --git a/public/images/emoji/google/cyprus.png b/public/images/emoji/google/cyprus.png
new file mode 100644
index 00000000000..e063ccf4dfb
Binary files /dev/null and b/public/images/emoji/google/cyprus.png differ
diff --git a/public/images/emoji/google/czech_republic.png b/public/images/emoji/google/czech_republic.png
new file mode 100644
index 00000000000..c9b0edb988f
Binary files /dev/null and b/public/images/emoji/google/czech_republic.png differ
diff --git a/public/images/emoji/google/dagger.png b/public/images/emoji/google/dagger.png
index 2500c5cd4d6..8e191507791 100644
Binary files a/public/images/emoji/google/dagger.png and b/public/images/emoji/google/dagger.png differ
diff --git a/public/images/emoji/google/dagger_knife.png b/public/images/emoji/google/dagger_knife.png
index 2500c5cd4d6..8e191507791 100644
Binary files a/public/images/emoji/google/dagger_knife.png and b/public/images/emoji/google/dagger_knife.png differ
diff --git a/public/images/emoji/google/dancer.png b/public/images/emoji/google/dancer.png
index af065d1d4c5..415741ec13f 100644
Binary files a/public/images/emoji/google/dancer.png and b/public/images/emoji/google/dancer.png differ
diff --git a/public/images/emoji/google/dancer/2.png b/public/images/emoji/google/dancer/2.png
new file mode 100644
index 00000000000..74d9350f386
Binary files /dev/null and b/public/images/emoji/google/dancer/2.png differ
diff --git a/public/images/emoji/google/dancer/3.png b/public/images/emoji/google/dancer/3.png
new file mode 100644
index 00000000000..5d1b9b2e84c
Binary files /dev/null and b/public/images/emoji/google/dancer/3.png differ
diff --git a/public/images/emoji/google/dancer/4.png b/public/images/emoji/google/dancer/4.png
new file mode 100644
index 00000000000..e34f3fd12fc
Binary files /dev/null and b/public/images/emoji/google/dancer/4.png differ
diff --git a/public/images/emoji/google/dancer/5.png b/public/images/emoji/google/dancer/5.png
new file mode 100644
index 00000000000..7bceb0c9c62
Binary files /dev/null and b/public/images/emoji/google/dancer/5.png differ
diff --git a/public/images/emoji/google/dancer/6.png b/public/images/emoji/google/dancer/6.png
new file mode 100644
index 00000000000..6483f6966c7
Binary files /dev/null and b/public/images/emoji/google/dancer/6.png differ
diff --git a/public/images/emoji/google/dancers.png b/public/images/emoji/google/dancers.png
index a7c9a1072c8..30018f29ed9 100644
Binary files a/public/images/emoji/google/dancers.png and b/public/images/emoji/google/dancers.png differ
diff --git a/public/images/emoji/google/dancing_men.png b/public/images/emoji/google/dancing_men.png
new file mode 100644
index 00000000000..879d26a98dd
Binary files /dev/null and b/public/images/emoji/google/dancing_men.png differ
diff --git a/public/images/emoji/google/dancing_women.png b/public/images/emoji/google/dancing_women.png
new file mode 100644
index 00000000000..30018f29ed9
Binary files /dev/null and b/public/images/emoji/google/dancing_women.png differ
diff --git a/public/images/emoji/google/dango.png b/public/images/emoji/google/dango.png
index e5747de1c7b..a9e27e8991b 100644
Binary files a/public/images/emoji/google/dango.png and b/public/images/emoji/google/dango.png differ
diff --git a/public/images/emoji/google/dark_sunglasses.png b/public/images/emoji/google/dark_sunglasses.png
index 3ad3db6dc4a..34866a4a060 100644
Binary files a/public/images/emoji/google/dark_sunglasses.png and b/public/images/emoji/google/dark_sunglasses.png differ
diff --git a/public/images/emoji/google/dart.png b/public/images/emoji/google/dart.png
index 6e706955b1d..4748ca6846b 100644
Binary files a/public/images/emoji/google/dart.png and b/public/images/emoji/google/dart.png differ
diff --git a/public/images/emoji/google/dash.png b/public/images/emoji/google/dash.png
index 55f2eba4687..53fb9f18322 100644
Binary files a/public/images/emoji/google/dash.png and b/public/images/emoji/google/dash.png differ
diff --git a/public/images/emoji/google/date.png b/public/images/emoji/google/date.png
index 0131586e5e4..91125e15b7c 100644
Binary files a/public/images/emoji/google/date.png and b/public/images/emoji/google/date.png differ
diff --git a/public/images/emoji/google/de.png b/public/images/emoji/google/de.png
index d9a749790e8..e18953b9bee 100644
Binary files a/public/images/emoji/google/de.png and b/public/images/emoji/google/de.png differ
diff --git a/public/images/emoji/google/deciduous_tree.png b/public/images/emoji/google/deciduous_tree.png
index 87b85c98e6d..7ef80df7802 100644
Binary files a/public/images/emoji/google/deciduous_tree.png and b/public/images/emoji/google/deciduous_tree.png differ
diff --git a/public/images/emoji/google/deer.png b/public/images/emoji/google/deer.png
new file mode 100644
index 00000000000..72ce4475935
Binary files /dev/null and b/public/images/emoji/google/deer.png differ
diff --git a/public/images/emoji/google/denmark.png b/public/images/emoji/google/denmark.png
new file mode 100644
index 00000000000..c56dcdfb177
Binary files /dev/null and b/public/images/emoji/google/denmark.png differ
diff --git a/public/images/emoji/google/department_store.png b/public/images/emoji/google/department_store.png
index 4b95e08e825..ebb3b4f1131 100644
Binary files a/public/images/emoji/google/department_store.png and b/public/images/emoji/google/department_store.png differ
diff --git a/public/images/emoji/google/derelict_house.png b/public/images/emoji/google/derelict_house.png
new file mode 100644
index 00000000000..5a4faead956
Binary files /dev/null and b/public/images/emoji/google/derelict_house.png differ
diff --git a/public/images/emoji/google/derelict_house_building.png b/public/images/emoji/google/derelict_house_building.png
index b1d5a7d814e..5a4faead956 100644
Binary files a/public/images/emoji/google/derelict_house_building.png and b/public/images/emoji/google/derelict_house_building.png differ
diff --git a/public/images/emoji/google/desert.png b/public/images/emoji/google/desert.png
index 4d08770a45c..10cb404801a 100644
Binary files a/public/images/emoji/google/desert.png and b/public/images/emoji/google/desert.png differ
diff --git a/public/images/emoji/google/desert_island.png b/public/images/emoji/google/desert_island.png
index 33b1d3883cf..30ee864648a 100644
Binary files a/public/images/emoji/google/desert_island.png and b/public/images/emoji/google/desert_island.png differ
diff --git a/public/images/emoji/google/desktop.png b/public/images/emoji/google/desktop.png
index 89b4ce5664f..d967edd0e7b 100644
Binary files a/public/images/emoji/google/desktop.png and b/public/images/emoji/google/desktop.png differ
diff --git a/public/images/emoji/google/desktop_computer.png b/public/images/emoji/google/desktop_computer.png
index 89b4ce5664f..d967edd0e7b 100644
Binary files a/public/images/emoji/google/desktop_computer.png and b/public/images/emoji/google/desktop_computer.png differ
diff --git a/public/images/emoji/google/diamond_shape_with_a_dot_inside.png b/public/images/emoji/google/diamond_shape_with_a_dot_inside.png
index 83439229544..aeda139b224 100644
Binary files a/public/images/emoji/google/diamond_shape_with_a_dot_inside.png and b/public/images/emoji/google/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/google/diamonds.png b/public/images/emoji/google/diamonds.png
index 5e706802de3..13d047c0fe8 100644
Binary files a/public/images/emoji/google/diamonds.png and b/public/images/emoji/google/diamonds.png differ
diff --git a/public/images/emoji/google/diego_garcia.png b/public/images/emoji/google/diego_garcia.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/diego_garcia.png differ
diff --git a/public/images/emoji/google/disappointed.png b/public/images/emoji/google/disappointed.png
index ec08ac2e397..f7e0e453e8a 100644
Binary files a/public/images/emoji/google/disappointed.png and b/public/images/emoji/google/disappointed.png differ
diff --git a/public/images/emoji/google/disappointed_relieved.png b/public/images/emoji/google/disappointed_relieved.png
index e492b2339d1..70d7736cd4a 100644
Binary files a/public/images/emoji/google/disappointed_relieved.png and b/public/images/emoji/google/disappointed_relieved.png differ
diff --git a/public/images/emoji/google/dividers.png b/public/images/emoji/google/dividers.png
index 62dea0dd66d..dd8929d64ac 100644
Binary files a/public/images/emoji/google/dividers.png and b/public/images/emoji/google/dividers.png differ
diff --git a/public/images/emoji/google/dizzy.png b/public/images/emoji/google/dizzy.png
index 8e869e9cef5..6792b1f955f 100644
Binary files a/public/images/emoji/google/dizzy.png and b/public/images/emoji/google/dizzy.png differ
diff --git a/public/images/emoji/google/dizzy_face.png b/public/images/emoji/google/dizzy_face.png
index ccf14a1e775..eccac861a83 100644
Binary files a/public/images/emoji/google/dizzy_face.png and b/public/images/emoji/google/dizzy_face.png differ
diff --git a/public/images/emoji/google/djibouti.png b/public/images/emoji/google/djibouti.png
new file mode 100644
index 00000000000..7bc474b64de
Binary files /dev/null and b/public/images/emoji/google/djibouti.png differ
diff --git a/public/images/emoji/google/do_not_litter.png b/public/images/emoji/google/do_not_litter.png
index 301e4889663..8aab5b26dc3 100644
Binary files a/public/images/emoji/google/do_not_litter.png and b/public/images/emoji/google/do_not_litter.png differ
diff --git a/public/images/emoji/google/dog.png b/public/images/emoji/google/dog.png
index 4245e1dca6c..76429a4bdb1 100644
Binary files a/public/images/emoji/google/dog.png and b/public/images/emoji/google/dog.png differ
diff --git a/public/images/emoji/google/dog2.png b/public/images/emoji/google/dog2.png
index 7db40e2f52e..6b987ceb724 100644
Binary files a/public/images/emoji/google/dog2.png and b/public/images/emoji/google/dog2.png differ
diff --git a/public/images/emoji/google/dollar.png b/public/images/emoji/google/dollar.png
index f97db471285..b85051719ca 100644
Binary files a/public/images/emoji/google/dollar.png and b/public/images/emoji/google/dollar.png differ
diff --git a/public/images/emoji/google/dolls.png b/public/images/emoji/google/dolls.png
index a06aadbfbd0..b92315527ef 100644
Binary files a/public/images/emoji/google/dolls.png and b/public/images/emoji/google/dolls.png differ
diff --git a/public/images/emoji/google/dolphin.png b/public/images/emoji/google/dolphin.png
index dc7a84f5b74..e768e4031c0 100644
Binary files a/public/images/emoji/google/dolphin.png and b/public/images/emoji/google/dolphin.png differ
diff --git a/public/images/emoji/google/dominica.png b/public/images/emoji/google/dominica.png
new file mode 100644
index 00000000000..b9a27a68469
Binary files /dev/null and b/public/images/emoji/google/dominica.png differ
diff --git a/public/images/emoji/google/dominican_republic.png b/public/images/emoji/google/dominican_republic.png
new file mode 100644
index 00000000000..19dd042bb6e
Binary files /dev/null and b/public/images/emoji/google/dominican_republic.png differ
diff --git a/public/images/emoji/google/door.png b/public/images/emoji/google/door.png
index e7f6f891eb9..71ad017a2a8 100644
Binary files a/public/images/emoji/google/door.png and b/public/images/emoji/google/door.png differ
diff --git a/public/images/emoji/google/double_vertical_bar.png b/public/images/emoji/google/double_vertical_bar.png
index 1be5733ff4e..31613a93208 100644
Binary files a/public/images/emoji/google/double_vertical_bar.png and b/public/images/emoji/google/double_vertical_bar.png differ
diff --git a/public/images/emoji/google/doughnut.png b/public/images/emoji/google/doughnut.png
index e7ce32abfbd..ff13ae964db 100644
Binary files a/public/images/emoji/google/doughnut.png and b/public/images/emoji/google/doughnut.png differ
diff --git a/public/images/emoji/google/dove.png b/public/images/emoji/google/dove.png
index 0800e98fc47..985b5454939 100644
Binary files a/public/images/emoji/google/dove.png and b/public/images/emoji/google/dove.png differ
diff --git a/public/images/emoji/google/dove_of_peace.png b/public/images/emoji/google/dove_of_peace.png
index 0800e98fc47..985b5454939 100644
Binary files a/public/images/emoji/google/dove_of_peace.png and b/public/images/emoji/google/dove_of_peace.png differ
diff --git a/public/images/emoji/google/dragon.png b/public/images/emoji/google/dragon.png
index 34538757f41..ec1ae432331 100644
Binary files a/public/images/emoji/google/dragon.png and b/public/images/emoji/google/dragon.png differ
diff --git a/public/images/emoji/google/dragon_face.png b/public/images/emoji/google/dragon_face.png
index df3d493b024..a22bf81f9a6 100644
Binary files a/public/images/emoji/google/dragon_face.png and b/public/images/emoji/google/dragon_face.png differ
diff --git a/public/images/emoji/google/dress.png b/public/images/emoji/google/dress.png
index 7417f2a5297..fade5244a6e 100644
Binary files a/public/images/emoji/google/dress.png and b/public/images/emoji/google/dress.png differ
diff --git a/public/images/emoji/google/dromedary_camel.png b/public/images/emoji/google/dromedary_camel.png
index 22c3919b6ed..4a107228007 100644
Binary files a/public/images/emoji/google/dromedary_camel.png and b/public/images/emoji/google/dromedary_camel.png differ
diff --git a/public/images/emoji/google/drooling_face.png b/public/images/emoji/google/drooling_face.png
new file mode 100644
index 00000000000..ea720c91253
Binary files /dev/null and b/public/images/emoji/google/drooling_face.png differ
diff --git a/public/images/emoji/google/droplet.png b/public/images/emoji/google/droplet.png
index c4802b95791..2e57daba012 100644
Binary files a/public/images/emoji/google/droplet.png and b/public/images/emoji/google/droplet.png differ
diff --git a/public/images/emoji/google/drum.png b/public/images/emoji/google/drum.png
new file mode 100644
index 00000000000..884c12370a4
Binary files /dev/null and b/public/images/emoji/google/drum.png differ
diff --git a/public/images/emoji/google/duck.png b/public/images/emoji/google/duck.png
new file mode 100644
index 00000000000..3a00bf45275
Binary files /dev/null and b/public/images/emoji/google/duck.png differ
diff --git a/public/images/emoji/google/dumpling.png b/public/images/emoji/google/dumpling.png
new file mode 100644
index 00000000000..c013fe1d7af
Binary files /dev/null and b/public/images/emoji/google/dumpling.png differ
diff --git a/public/images/emoji/google/dvd.png b/public/images/emoji/google/dvd.png
index 26a93b845f6..ae360226398 100644
Binary files a/public/images/emoji/google/dvd.png and b/public/images/emoji/google/dvd.png differ
diff --git a/public/images/emoji/google/e-mail.png b/public/images/emoji/google/e-mail.png
index 955d563ad4d..333a70ea08b 100644
Binary files a/public/images/emoji/google/e-mail.png and b/public/images/emoji/google/e-mail.png differ
diff --git a/public/images/emoji/google/eagle.png b/public/images/emoji/google/eagle.png
new file mode 100644
index 00000000000..8bed5acca57
Binary files /dev/null and b/public/images/emoji/google/eagle.png differ
diff --git a/public/images/emoji/google/ear.png b/public/images/emoji/google/ear.png
index 3e3b72f7c59..48c27113ff7 100644
Binary files a/public/images/emoji/google/ear.png and b/public/images/emoji/google/ear.png differ
diff --git a/public/images/emoji/google/ear/2.png b/public/images/emoji/google/ear/2.png
new file mode 100644
index 00000000000..7d3c1ad12a2
Binary files /dev/null and b/public/images/emoji/google/ear/2.png differ
diff --git a/public/images/emoji/google/ear/3.png b/public/images/emoji/google/ear/3.png
new file mode 100644
index 00000000000..68b0ce88581
Binary files /dev/null and b/public/images/emoji/google/ear/3.png differ
diff --git a/public/images/emoji/google/ear/4.png b/public/images/emoji/google/ear/4.png
new file mode 100644
index 00000000000..b8b95f071ff
Binary files /dev/null and b/public/images/emoji/google/ear/4.png differ
diff --git a/public/images/emoji/google/ear/5.png b/public/images/emoji/google/ear/5.png
new file mode 100644
index 00000000000..80974cba323
Binary files /dev/null and b/public/images/emoji/google/ear/5.png differ
diff --git a/public/images/emoji/google/ear/6.png b/public/images/emoji/google/ear/6.png
new file mode 100644
index 00000000000..c8daaed81e9
Binary files /dev/null and b/public/images/emoji/google/ear/6.png differ
diff --git a/public/images/emoji/google/ear_of_rice.png b/public/images/emoji/google/ear_of_rice.png
index 57f2375a4dc..ae65174881d 100644
Binary files a/public/images/emoji/google/ear_of_rice.png and b/public/images/emoji/google/ear_of_rice.png differ
diff --git a/public/images/emoji/google/earth_africa.png b/public/images/emoji/google/earth_africa.png
index 0bc15d9d9e0..cd2cb281dc1 100644
Binary files a/public/images/emoji/google/earth_africa.png and b/public/images/emoji/google/earth_africa.png differ
diff --git a/public/images/emoji/google/earth_americas.png b/public/images/emoji/google/earth_americas.png
index 438db709e94..fa95574e900 100644
Binary files a/public/images/emoji/google/earth_americas.png and b/public/images/emoji/google/earth_americas.png differ
diff --git a/public/images/emoji/google/earth_asia.png b/public/images/emoji/google/earth_asia.png
index 906d0ebd44f..0706e95e920 100644
Binary files a/public/images/emoji/google/earth_asia.png and b/public/images/emoji/google/earth_asia.png differ
diff --git a/public/images/emoji/google/ecuador.png b/public/images/emoji/google/ecuador.png
new file mode 100644
index 00000000000..a4c0b557b01
Binary files /dev/null and b/public/images/emoji/google/ecuador.png differ
diff --git a/public/images/emoji/google/egg.png b/public/images/emoji/google/egg.png
index 0e0d3c30058..5c2ba19f51e 100644
Binary files a/public/images/emoji/google/egg.png and b/public/images/emoji/google/egg.png differ
diff --git a/public/images/emoji/google/eggplant.png b/public/images/emoji/google/eggplant.png
index b874c4df3b5..ef1fcd659f8 100644
Binary files a/public/images/emoji/google/eggplant.png and b/public/images/emoji/google/eggplant.png differ
diff --git a/public/images/emoji/google/egypt.png b/public/images/emoji/google/egypt.png
new file mode 100644
index 00000000000..dc64def716d
Binary files /dev/null and b/public/images/emoji/google/egypt.png differ
diff --git a/public/images/emoji/google/eight.png b/public/images/emoji/google/eight.png
index af151748ca9..d6bfa97b33b 100644
Binary files a/public/images/emoji/google/eight.png and b/public/images/emoji/google/eight.png differ
diff --git a/public/images/emoji/google/eight_pointed_black_star.png b/public/images/emoji/google/eight_pointed_black_star.png
index bec12ec208a..c579846b3c4 100644
Binary files a/public/images/emoji/google/eight_pointed_black_star.png and b/public/images/emoji/google/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/google/eight_spoked_asterisk.png b/public/images/emoji/google/eight_spoked_asterisk.png
index 85fdfd575b2..ac9a777cd1e 100644
Binary files a/public/images/emoji/google/eight_spoked_asterisk.png and b/public/images/emoji/google/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/google/el_salvador.png b/public/images/emoji/google/el_salvador.png
new file mode 100644
index 00000000000..f5bf8e8fbda
Binary files /dev/null and b/public/images/emoji/google/el_salvador.png differ
diff --git a/public/images/emoji/google/electric_plug.png b/public/images/emoji/google/electric_plug.png
index 4ded6719071..0ed89732718 100644
Binary files a/public/images/emoji/google/electric_plug.png and b/public/images/emoji/google/electric_plug.png differ
diff --git a/public/images/emoji/google/elephant.png b/public/images/emoji/google/elephant.png
index e4dd62f7b90..82ffbef3661 100644
Binary files a/public/images/emoji/google/elephant.png and b/public/images/emoji/google/elephant.png differ
diff --git a/public/images/emoji/google/elf.png b/public/images/emoji/google/elf.png
new file mode 100644
index 00000000000..7f13711c3ed
Binary files /dev/null and b/public/images/emoji/google/elf.png differ
diff --git a/public/images/emoji/google/elf/2.png b/public/images/emoji/google/elf/2.png
new file mode 100644
index 00000000000..18183cdf5d5
Binary files /dev/null and b/public/images/emoji/google/elf/2.png differ
diff --git a/public/images/emoji/google/elf/3.png b/public/images/emoji/google/elf/3.png
new file mode 100644
index 00000000000..5f3bd85830a
Binary files /dev/null and b/public/images/emoji/google/elf/3.png differ
diff --git a/public/images/emoji/google/elf/4.png b/public/images/emoji/google/elf/4.png
new file mode 100644
index 00000000000..7b936f8f597
Binary files /dev/null and b/public/images/emoji/google/elf/4.png differ
diff --git a/public/images/emoji/google/elf/5.png b/public/images/emoji/google/elf/5.png
new file mode 100644
index 00000000000..5af1e1f219c
Binary files /dev/null and b/public/images/emoji/google/elf/5.png differ
diff --git a/public/images/emoji/google/elf/6.png b/public/images/emoji/google/elf/6.png
new file mode 100644
index 00000000000..3db350cc167
Binary files /dev/null and b/public/images/emoji/google/elf/6.png differ
diff --git a/public/images/emoji/google/email.png b/public/images/emoji/google/email.png
index 955d563ad4d..333a70ea08b 100644
Binary files a/public/images/emoji/google/email.png and b/public/images/emoji/google/email.png differ
diff --git a/public/images/emoji/google/end.png b/public/images/emoji/google/end.png
index 3f510fab9bd..2ff3a095e69 100644
Binary files a/public/images/emoji/google/end.png and b/public/images/emoji/google/end.png differ
diff --git a/public/images/emoji/google/envelope.png b/public/images/emoji/google/envelope.png
index da007e47b83..333a70ea08b 100644
Binary files a/public/images/emoji/google/envelope.png and b/public/images/emoji/google/envelope.png differ
diff --git a/public/images/emoji/google/envelope_with_arrow.png b/public/images/emoji/google/envelope_with_arrow.png
index 4edfec02739..29ddb7ea638 100644
Binary files a/public/images/emoji/google/envelope_with_arrow.png and b/public/images/emoji/google/envelope_with_arrow.png differ
diff --git a/public/images/emoji/google/equatorial_guinea.png b/public/images/emoji/google/equatorial_guinea.png
new file mode 100644
index 00000000000..1847227c712
Binary files /dev/null and b/public/images/emoji/google/equatorial_guinea.png differ
diff --git a/public/images/emoji/google/eritrea.png b/public/images/emoji/google/eritrea.png
new file mode 100644
index 00000000000..fbd7ce17bbd
Binary files /dev/null and b/public/images/emoji/google/eritrea.png differ
diff --git a/public/images/emoji/google/es.png b/public/images/emoji/google/es.png
index 72747290e1d..55bba051719 100644
Binary files a/public/images/emoji/google/es.png and b/public/images/emoji/google/es.png differ
diff --git a/public/images/emoji/google/estonia.png b/public/images/emoji/google/estonia.png
new file mode 100644
index 00000000000..cbee9fc6ae1
Binary files /dev/null and b/public/images/emoji/google/estonia.png differ
diff --git a/public/images/emoji/google/ethiopia.png b/public/images/emoji/google/ethiopia.png
new file mode 100644
index 00000000000..7ba22073ebd
Binary files /dev/null and b/public/images/emoji/google/ethiopia.png differ
diff --git a/public/images/emoji/google/eu.png b/public/images/emoji/google/eu.png
new file mode 100644
index 00000000000..02f79b58a5e
Binary files /dev/null and b/public/images/emoji/google/eu.png differ
diff --git a/public/images/emoji/google/euro.png b/public/images/emoji/google/euro.png
index ba5430c974d..4bd0e68827c 100644
Binary files a/public/images/emoji/google/euro.png and b/public/images/emoji/google/euro.png differ
diff --git a/public/images/emoji/google/european_castle.png b/public/images/emoji/google/european_castle.png
index d3e76515dd1..0be9efa5395 100644
Binary files a/public/images/emoji/google/european_castle.png and b/public/images/emoji/google/european_castle.png differ
diff --git a/public/images/emoji/google/european_post_office.png b/public/images/emoji/google/european_post_office.png
index 8572abd27aa..4f6fc8c247c 100644
Binary files a/public/images/emoji/google/european_post_office.png and b/public/images/emoji/google/european_post_office.png differ
diff --git a/public/images/emoji/google/evergreen_tree.png b/public/images/emoji/google/evergreen_tree.png
index 0487eca6516..5df8a196dbe 100644
Binary files a/public/images/emoji/google/evergreen_tree.png and b/public/images/emoji/google/evergreen_tree.png differ
diff --git a/public/images/emoji/google/exclamation.png b/public/images/emoji/google/exclamation.png
index 2c8d249fd48..71429ae6497 100644
Binary files a/public/images/emoji/google/exclamation.png and b/public/images/emoji/google/exclamation.png differ
diff --git a/public/images/emoji/google/exploding_head.png b/public/images/emoji/google/exploding_head.png
new file mode 100644
index 00000000000..fc76cf40b3b
Binary files /dev/null and b/public/images/emoji/google/exploding_head.png differ
diff --git a/public/images/emoji/google/expressionless.png b/public/images/emoji/google/expressionless.png
index b3e2fa154df..8a57855d705 100644
Binary files a/public/images/emoji/google/expressionless.png and b/public/images/emoji/google/expressionless.png differ
diff --git a/public/images/emoji/google/eye.png b/public/images/emoji/google/eye.png
index 2cf73b566e8..3f7c1820944 100644
Binary files a/public/images/emoji/google/eye.png and b/public/images/emoji/google/eye.png differ
diff --git a/public/images/emoji/google/eyeglasses.png b/public/images/emoji/google/eyeglasses.png
index a42b7f7a81d..8507c7f9abb 100644
Binary files a/public/images/emoji/google/eyeglasses.png and b/public/images/emoji/google/eyeglasses.png differ
diff --git a/public/images/emoji/google/eyes.png b/public/images/emoji/google/eyes.png
index 5646259013e..52dd4f221df 100644
Binary files a/public/images/emoji/google/eyes.png and b/public/images/emoji/google/eyes.png differ
diff --git a/public/images/emoji/google/face_vomiting.png b/public/images/emoji/google/face_vomiting.png
new file mode 100644
index 00000000000..017495f7e0b
Binary files /dev/null and b/public/images/emoji/google/face_vomiting.png differ
diff --git a/public/images/emoji/google/face_with_hand_over_mouth.png b/public/images/emoji/google/face_with_hand_over_mouth.png
new file mode 100644
index 00000000000..1f15c0df7ea
Binary files /dev/null and b/public/images/emoji/google/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/google/face_with_head_bandage.png b/public/images/emoji/google/face_with_head_bandage.png
index d892078bb20..e07d929a276 100644
Binary files a/public/images/emoji/google/face_with_head_bandage.png and b/public/images/emoji/google/face_with_head_bandage.png differ
diff --git a/public/images/emoji/google/face_with_monocle.png b/public/images/emoji/google/face_with_monocle.png
new file mode 100644
index 00000000000..129e9e4f54c
Binary files /dev/null and b/public/images/emoji/google/face_with_monocle.png differ
diff --git a/public/images/emoji/google/face_with_raised_eyebrow.png b/public/images/emoji/google/face_with_raised_eyebrow.png
new file mode 100644
index 00000000000..f407c190e3e
Binary files /dev/null and b/public/images/emoji/google/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/google/face_with_rolling_eyes.png b/public/images/emoji/google/face_with_rolling_eyes.png
index 10153f06a46..8485fcbe1cc 100644
Binary files a/public/images/emoji/google/face_with_rolling_eyes.png and b/public/images/emoji/google/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/google/face_with_symbols_over_mouth.png b/public/images/emoji/google/face_with_symbols_over_mouth.png
new file mode 100644
index 00000000000..43d27aea0b4
Binary files /dev/null and b/public/images/emoji/google/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/google/face_with_thermometer.png b/public/images/emoji/google/face_with_thermometer.png
index 3a7ba22f8ea..82bdbf6335b 100644
Binary files a/public/images/emoji/google/face_with_thermometer.png and b/public/images/emoji/google/face_with_thermometer.png differ
diff --git a/public/images/emoji/google/facepunch.png b/public/images/emoji/google/facepunch.png
new file mode 100644
index 00000000000..f05a3f6d14c
Binary files /dev/null and b/public/images/emoji/google/facepunch.png differ
diff --git a/public/images/emoji/google/facepunch/2.png b/public/images/emoji/google/facepunch/2.png
new file mode 100644
index 00000000000..bba3d6fe12b
Binary files /dev/null and b/public/images/emoji/google/facepunch/2.png differ
diff --git a/public/images/emoji/google/facepunch/3.png b/public/images/emoji/google/facepunch/3.png
new file mode 100644
index 00000000000..123e4450309
Binary files /dev/null and b/public/images/emoji/google/facepunch/3.png differ
diff --git a/public/images/emoji/google/facepunch/4.png b/public/images/emoji/google/facepunch/4.png
new file mode 100644
index 00000000000..974055c6286
Binary files /dev/null and b/public/images/emoji/google/facepunch/4.png differ
diff --git a/public/images/emoji/google/facepunch/5.png b/public/images/emoji/google/facepunch/5.png
new file mode 100644
index 00000000000..3f068a0f950
Binary files /dev/null and b/public/images/emoji/google/facepunch/5.png differ
diff --git a/public/images/emoji/google/facepunch/6.png b/public/images/emoji/google/facepunch/6.png
new file mode 100644
index 00000000000..798a95d9fd6
Binary files /dev/null and b/public/images/emoji/google/facepunch/6.png differ
diff --git a/public/images/emoji/google/factory.png b/public/images/emoji/google/factory.png
index dea1ecb59c6..4ba2516a850 100644
Binary files a/public/images/emoji/google/factory.png and b/public/images/emoji/google/factory.png differ
diff --git a/public/images/emoji/google/fairy.png b/public/images/emoji/google/fairy.png
new file mode 100644
index 00000000000..a50d75d6243
Binary files /dev/null and b/public/images/emoji/google/fairy.png differ
diff --git a/public/images/emoji/google/fairy/2.png b/public/images/emoji/google/fairy/2.png
new file mode 100644
index 00000000000..71db8fcbb2a
Binary files /dev/null and b/public/images/emoji/google/fairy/2.png differ
diff --git a/public/images/emoji/google/fairy/3.png b/public/images/emoji/google/fairy/3.png
new file mode 100644
index 00000000000..939c3fec826
Binary files /dev/null and b/public/images/emoji/google/fairy/3.png differ
diff --git a/public/images/emoji/google/fairy/4.png b/public/images/emoji/google/fairy/4.png
new file mode 100644
index 00000000000..4f7ea1dac7f
Binary files /dev/null and b/public/images/emoji/google/fairy/4.png differ
diff --git a/public/images/emoji/google/fairy/5.png b/public/images/emoji/google/fairy/5.png
new file mode 100644
index 00000000000..80e3e07ff9e
Binary files /dev/null and b/public/images/emoji/google/fairy/5.png differ
diff --git a/public/images/emoji/google/fairy/6.png b/public/images/emoji/google/fairy/6.png
new file mode 100644
index 00000000000..72e4457ec19
Binary files /dev/null and b/public/images/emoji/google/fairy/6.png differ
diff --git a/public/images/emoji/google/falkland_islands.png b/public/images/emoji/google/falkland_islands.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/falkland_islands.png differ
diff --git a/public/images/emoji/google/fallen_leaf.png b/public/images/emoji/google/fallen_leaf.png
index be64a406861..a64ee52526a 100644
Binary files a/public/images/emoji/google/fallen_leaf.png and b/public/images/emoji/google/fallen_leaf.png differ
diff --git a/public/images/emoji/google/family.png b/public/images/emoji/google/family.png
new file mode 100644
index 00000000000..3b719a82a08
Binary files /dev/null and b/public/images/emoji/google/family.png differ
diff --git a/public/images/emoji/google/family_man_boy.png b/public/images/emoji/google/family_man_boy.png
new file mode 100644
index 00000000000..ea1ba13d527
Binary files /dev/null and b/public/images/emoji/google/family_man_boy.png differ
diff --git a/public/images/emoji/google/family_man_boy_boy.png b/public/images/emoji/google/family_man_boy_boy.png
new file mode 100644
index 00000000000..6739fec8282
Binary files /dev/null and b/public/images/emoji/google/family_man_boy_boy.png differ
diff --git a/public/images/emoji/google/family_man_girl.png b/public/images/emoji/google/family_man_girl.png
new file mode 100644
index 00000000000..0bd8bb90855
Binary files /dev/null and b/public/images/emoji/google/family_man_girl.png differ
diff --git a/public/images/emoji/google/family_man_girl_boy.png b/public/images/emoji/google/family_man_girl_boy.png
new file mode 100644
index 00000000000..407f88f33b1
Binary files /dev/null and b/public/images/emoji/google/family_man_girl_boy.png differ
diff --git a/public/images/emoji/google/family_man_girl_girl.png b/public/images/emoji/google/family_man_girl_girl.png
new file mode 100644
index 00000000000..f9626d9ef6d
Binary files /dev/null and b/public/images/emoji/google/family_man_girl_girl.png differ
diff --git a/public/images/emoji/google/family_man_man_boy.png b/public/images/emoji/google/family_man_man_boy.png
new file mode 100644
index 00000000000..47f7d7b3a47
Binary files /dev/null and b/public/images/emoji/google/family_man_man_boy.png differ
diff --git a/public/images/emoji/google/family_man_man_boy_boy.png b/public/images/emoji/google/family_man_man_boy_boy.png
new file mode 100644
index 00000000000..631a4aa6f2e
Binary files /dev/null and b/public/images/emoji/google/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/google/family_man_man_girl.png b/public/images/emoji/google/family_man_man_girl.png
new file mode 100644
index 00000000000..58e99a1d31e
Binary files /dev/null and b/public/images/emoji/google/family_man_man_girl.png differ
diff --git a/public/images/emoji/google/family_man_man_girl_boy.png b/public/images/emoji/google/family_man_man_girl_boy.png
new file mode 100644
index 00000000000..9f482921516
Binary files /dev/null and b/public/images/emoji/google/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/google/family_man_man_girl_girl.png b/public/images/emoji/google/family_man_man_girl_girl.png
new file mode 100644
index 00000000000..31b20d2aa84
Binary files /dev/null and b/public/images/emoji/google/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/google/family_man_woman_boy.png b/public/images/emoji/google/family_man_woman_boy.png
new file mode 100644
index 00000000000..da5b683e78c
Binary files /dev/null and b/public/images/emoji/google/family_man_woman_boy.png differ
diff --git a/public/images/emoji/google/family_man_woman_boy_boy.png b/public/images/emoji/google/family_man_woman_boy_boy.png
new file mode 100644
index 00000000000..2322faad907
Binary files /dev/null and b/public/images/emoji/google/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/google/family_man_woman_boys.png b/public/images/emoji/google/family_man_woman_boys.png
index 0157653ec0a..2322faad907 100644
Binary files a/public/images/emoji/google/family_man_woman_boys.png and b/public/images/emoji/google/family_man_woman_boys.png differ
diff --git a/public/images/emoji/google/family_man_woman_girl.png b/public/images/emoji/google/family_man_woman_girl.png
index a61f473a958..63af73ac223 100644
Binary files a/public/images/emoji/google/family_man_woman_girl.png and b/public/images/emoji/google/family_man_woman_girl.png differ
diff --git a/public/images/emoji/google/family_man_woman_girl_boy.png b/public/images/emoji/google/family_man_woman_girl_boy.png
index 72f8f605a29..3b719a82a08 100644
Binary files a/public/images/emoji/google/family_man_woman_girl_boy.png and b/public/images/emoji/google/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/google/family_man_woman_girl_girl.png b/public/images/emoji/google/family_man_woman_girl_girl.png
new file mode 100644
index 00000000000..c62b2c0e812
Binary files /dev/null and b/public/images/emoji/google/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/google/family_man_woman_girls.png b/public/images/emoji/google/family_man_woman_girls.png
index 4fb883a0765..c62b2c0e812 100644
Binary files a/public/images/emoji/google/family_man_woman_girls.png and b/public/images/emoji/google/family_man_woman_girls.png differ
diff --git a/public/images/emoji/google/family_men_boy.png b/public/images/emoji/google/family_men_boy.png
index c51367732cc..47f7d7b3a47 100644
Binary files a/public/images/emoji/google/family_men_boy.png and b/public/images/emoji/google/family_men_boy.png differ
diff --git a/public/images/emoji/google/family_men_boys.png b/public/images/emoji/google/family_men_boys.png
index caf6cf70d3b..631a4aa6f2e 100644
Binary files a/public/images/emoji/google/family_men_boys.png and b/public/images/emoji/google/family_men_boys.png differ
diff --git a/public/images/emoji/google/family_men_girl.png b/public/images/emoji/google/family_men_girl.png
index d52960b09de..58e99a1d31e 100644
Binary files a/public/images/emoji/google/family_men_girl.png and b/public/images/emoji/google/family_men_girl.png differ
diff --git a/public/images/emoji/google/family_men_girl_boy.png b/public/images/emoji/google/family_men_girl_boy.png
index 6325e4bc148..9f482921516 100644
Binary files a/public/images/emoji/google/family_men_girl_boy.png and b/public/images/emoji/google/family_men_girl_boy.png differ
diff --git a/public/images/emoji/google/family_men_girls.png b/public/images/emoji/google/family_men_girls.png
index bfe7c497133..31b20d2aa84 100644
Binary files a/public/images/emoji/google/family_men_girls.png and b/public/images/emoji/google/family_men_girls.png differ
diff --git a/public/images/emoji/google/family_woman_boy.png b/public/images/emoji/google/family_woman_boy.png
new file mode 100644
index 00000000000..7c96ecd94f4
Binary files /dev/null and b/public/images/emoji/google/family_woman_boy.png differ
diff --git a/public/images/emoji/google/family_woman_boy_boy.png b/public/images/emoji/google/family_woman_boy_boy.png
new file mode 100644
index 00000000000..0a8214dd6b1
Binary files /dev/null and b/public/images/emoji/google/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/google/family_woman_girl.png b/public/images/emoji/google/family_woman_girl.png
new file mode 100644
index 00000000000..16fd9b1e564
Binary files /dev/null and b/public/images/emoji/google/family_woman_girl.png differ
diff --git a/public/images/emoji/google/family_woman_girl_boy.png b/public/images/emoji/google/family_woman_girl_boy.png
new file mode 100644
index 00000000000..0e36fc3fe3b
Binary files /dev/null and b/public/images/emoji/google/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/google/family_woman_girl_girl.png b/public/images/emoji/google/family_woman_girl_girl.png
new file mode 100644
index 00000000000..7d261d1806b
Binary files /dev/null and b/public/images/emoji/google/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/google/family_woman_woman_boy.png b/public/images/emoji/google/family_woman_woman_boy.png
new file mode 100644
index 00000000000..55c5716c6b6
Binary files /dev/null and b/public/images/emoji/google/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/google/family_woman_woman_boy_boy.png b/public/images/emoji/google/family_woman_woman_boy_boy.png
new file mode 100644
index 00000000000..a0c6560b50c
Binary files /dev/null and b/public/images/emoji/google/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/google/family_woman_woman_girl.png b/public/images/emoji/google/family_woman_woman_girl.png
new file mode 100644
index 00000000000..dfd392a489e
Binary files /dev/null and b/public/images/emoji/google/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/google/family_woman_woman_girl_boy.png b/public/images/emoji/google/family_woman_woman_girl_boy.png
new file mode 100644
index 00000000000..4f9d9b92ce8
Binary files /dev/null and b/public/images/emoji/google/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/google/family_woman_woman_girl_girl.png b/public/images/emoji/google/family_woman_woman_girl_girl.png
new file mode 100644
index 00000000000..1c1cbe3dd48
Binary files /dev/null and b/public/images/emoji/google/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/google/family_women_boy.png b/public/images/emoji/google/family_women_boy.png
index e23e4f890bf..55c5716c6b6 100644
Binary files a/public/images/emoji/google/family_women_boy.png and b/public/images/emoji/google/family_women_boy.png differ
diff --git a/public/images/emoji/google/family_women_boys.png b/public/images/emoji/google/family_women_boys.png
index 8954240ad26..a0c6560b50c 100644
Binary files a/public/images/emoji/google/family_women_boys.png and b/public/images/emoji/google/family_women_boys.png differ
diff --git a/public/images/emoji/google/family_women_girl.png b/public/images/emoji/google/family_women_girl.png
index 120e1a1f733..dfd392a489e 100644
Binary files a/public/images/emoji/google/family_women_girl.png and b/public/images/emoji/google/family_women_girl.png differ
diff --git a/public/images/emoji/google/family_women_girl_boy.png b/public/images/emoji/google/family_women_girl_boy.png
index bc585a35611..4f9d9b92ce8 100644
Binary files a/public/images/emoji/google/family_women_girl_boy.png and b/public/images/emoji/google/family_women_girl_boy.png differ
diff --git a/public/images/emoji/google/family_women_girls.png b/public/images/emoji/google/family_women_girls.png
index 4c40bb8c6a1..1c1cbe3dd48 100644
Binary files a/public/images/emoji/google/family_women_girls.png and b/public/images/emoji/google/family_women_girls.png differ
diff --git a/public/images/emoji/google/faroe_islands.png b/public/images/emoji/google/faroe_islands.png
new file mode 100644
index 00000000000..310868b9810
Binary files /dev/null and b/public/images/emoji/google/faroe_islands.png differ
diff --git a/public/images/emoji/google/fast_forward.png b/public/images/emoji/google/fast_forward.png
index 3e7a98a8bf6..55a179f18e0 100644
Binary files a/public/images/emoji/google/fast_forward.png and b/public/images/emoji/google/fast_forward.png differ
diff --git a/public/images/emoji/google/fax.png b/public/images/emoji/google/fax.png
index ece233348b9..fc119f74087 100644
Binary files a/public/images/emoji/google/fax.png and b/public/images/emoji/google/fax.png differ
diff --git a/public/images/emoji/google/fearful.png b/public/images/emoji/google/fearful.png
index 47ad29bc3d8..c0ff5ed9a3c 100644
Binary files a/public/images/emoji/google/fearful.png and b/public/images/emoji/google/fearful.png differ
diff --git a/public/images/emoji/google/feet.png b/public/images/emoji/google/feet.png
index 1fdef760934..31748106285 100644
Binary files a/public/images/emoji/google/feet.png and b/public/images/emoji/google/feet.png differ
diff --git a/public/images/emoji/google/female_couple_with_heart.png b/public/images/emoji/google/female_couple_with_heart.png
index d8fb5100d68..8eda1e8d848 100644
Binary files a/public/images/emoji/google/female_couple_with_heart.png and b/public/images/emoji/google/female_couple_with_heart.png differ
diff --git a/public/images/emoji/google/female_couplekiss.png b/public/images/emoji/google/female_couplekiss.png
index c5b25dd6438..7cd2d2ebdd7 100644
Binary files a/public/images/emoji/google/female_couplekiss.png and b/public/images/emoji/google/female_couplekiss.png differ
diff --git a/public/images/emoji/google/female_detective.png b/public/images/emoji/google/female_detective.png
new file mode 100644
index 00000000000..2b5f2e9dcc9
Binary files /dev/null and b/public/images/emoji/google/female_detective.png differ
diff --git a/public/images/emoji/google/ferris_wheel.png b/public/images/emoji/google/ferris_wheel.png
index 642c816e961..2ebf2a6fab9 100644
Binary files a/public/images/emoji/google/ferris_wheel.png and b/public/images/emoji/google/ferris_wheel.png differ
diff --git a/public/images/emoji/google/ferry.png b/public/images/emoji/google/ferry.png
index 0c420440c85..67e10337a26 100644
Binary files a/public/images/emoji/google/ferry.png and b/public/images/emoji/google/ferry.png differ
diff --git a/public/images/emoji/google/field_hockey.png b/public/images/emoji/google/field_hockey.png
index 117e8174bf2..1ef09cb540c 100644
Binary files a/public/images/emoji/google/field_hockey.png and b/public/images/emoji/google/field_hockey.png differ
diff --git a/public/images/emoji/google/fiji.png b/public/images/emoji/google/fiji.png
new file mode 100644
index 00000000000..fd2325f7964
Binary files /dev/null and b/public/images/emoji/google/fiji.png differ
diff --git a/public/images/emoji/google/file_cabinet.png b/public/images/emoji/google/file_cabinet.png
index 613fc5b840f..1b038f0701e 100644
Binary files a/public/images/emoji/google/file_cabinet.png and b/public/images/emoji/google/file_cabinet.png differ
diff --git a/public/images/emoji/google/file_folder.png b/public/images/emoji/google/file_folder.png
index 5fac9ae16ae..b35d7b6615d 100644
Binary files a/public/images/emoji/google/file_folder.png and b/public/images/emoji/google/file_folder.png differ
diff --git a/public/images/emoji/google/film_frames.png b/public/images/emoji/google/film_frames.png
index 38d1a529ab7..16a6d1da41c 100644
Binary files a/public/images/emoji/google/film_frames.png and b/public/images/emoji/google/film_frames.png differ
diff --git a/public/images/emoji/google/film_projector.png b/public/images/emoji/google/film_projector.png
index b626d6088c9..f957286ba21 100644
Binary files a/public/images/emoji/google/film_projector.png and b/public/images/emoji/google/film_projector.png differ
diff --git a/public/images/emoji/google/film_strip.png b/public/images/emoji/google/film_strip.png
new file mode 100644
index 00000000000..16a6d1da41c
Binary files /dev/null and b/public/images/emoji/google/film_strip.png differ
diff --git a/public/images/emoji/google/finland.png b/public/images/emoji/google/finland.png
new file mode 100644
index 00000000000..861e00aea2d
Binary files /dev/null and b/public/images/emoji/google/finland.png differ
diff --git a/public/images/emoji/google/fire.png b/public/images/emoji/google/fire.png
index c593b37d090..7b17db8d7a0 100644
Binary files a/public/images/emoji/google/fire.png and b/public/images/emoji/google/fire.png differ
diff --git a/public/images/emoji/google/fire_engine.png b/public/images/emoji/google/fire_engine.png
index 4cf96e8199c..e144b15efde 100644
Binary files a/public/images/emoji/google/fire_engine.png and b/public/images/emoji/google/fire_engine.png differ
diff --git a/public/images/emoji/google/fireworks.png b/public/images/emoji/google/fireworks.png
index 85fc93af7e3..aa6c7d7ea66 100644
Binary files a/public/images/emoji/google/fireworks.png and b/public/images/emoji/google/fireworks.png differ
diff --git a/public/images/emoji/google/first_quarter_moon.png b/public/images/emoji/google/first_quarter_moon.png
index 468d7c19229..1137028aa8d 100644
Binary files a/public/images/emoji/google/first_quarter_moon.png and b/public/images/emoji/google/first_quarter_moon.png differ
diff --git a/public/images/emoji/google/first_quarter_moon_with_face.png b/public/images/emoji/google/first_quarter_moon_with_face.png
index 54da77edb49..f16569616f9 100644
Binary files a/public/images/emoji/google/first_quarter_moon_with_face.png and b/public/images/emoji/google/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/google/fish.png b/public/images/emoji/google/fish.png
index ae44b8ba203..eaafb3810e9 100644
Binary files a/public/images/emoji/google/fish.png and b/public/images/emoji/google/fish.png differ
diff --git a/public/images/emoji/google/fish_cake.png b/public/images/emoji/google/fish_cake.png
index 271f4894c63..8d6ef5e6714 100644
Binary files a/public/images/emoji/google/fish_cake.png and b/public/images/emoji/google/fish_cake.png differ
diff --git a/public/images/emoji/google/fishing_pole_and_fish.png b/public/images/emoji/google/fishing_pole_and_fish.png
index 3a6f85cb2ac..ddecf5b68fd 100644
Binary files a/public/images/emoji/google/fishing_pole_and_fish.png and b/public/images/emoji/google/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/google/fist.png b/public/images/emoji/google/fist.png
index 57d88a62c73..78968a9a09e 100644
Binary files a/public/images/emoji/google/fist.png and b/public/images/emoji/google/fist.png differ
diff --git a/public/images/emoji/google/fist/2.png b/public/images/emoji/google/fist/2.png
new file mode 100644
index 00000000000..0d41260837b
Binary files /dev/null and b/public/images/emoji/google/fist/2.png differ
diff --git a/public/images/emoji/google/fist/3.png b/public/images/emoji/google/fist/3.png
new file mode 100644
index 00000000000..14849f92d14
Binary files /dev/null and b/public/images/emoji/google/fist/3.png differ
diff --git a/public/images/emoji/google/fist/4.png b/public/images/emoji/google/fist/4.png
new file mode 100644
index 00000000000..46d18a88521
Binary files /dev/null and b/public/images/emoji/google/fist/4.png differ
diff --git a/public/images/emoji/google/fist/5.png b/public/images/emoji/google/fist/5.png
new file mode 100644
index 00000000000..fc1435be796
Binary files /dev/null and b/public/images/emoji/google/fist/5.png differ
diff --git a/public/images/emoji/google/fist/6.png b/public/images/emoji/google/fist/6.png
new file mode 100644
index 00000000000..21a74197bd6
Binary files /dev/null and b/public/images/emoji/google/fist/6.png differ
diff --git a/public/images/emoji/google/fist_left.png b/public/images/emoji/google/fist_left.png
new file mode 100644
index 00000000000..170444849ce
Binary files /dev/null and b/public/images/emoji/google/fist_left.png differ
diff --git a/public/images/emoji/google/fist_left/2.png b/public/images/emoji/google/fist_left/2.png
new file mode 100644
index 00000000000..724c63a7678
Binary files /dev/null and b/public/images/emoji/google/fist_left/2.png differ
diff --git a/public/images/emoji/google/fist_left/3.png b/public/images/emoji/google/fist_left/3.png
new file mode 100644
index 00000000000..8ab98131502
Binary files /dev/null and b/public/images/emoji/google/fist_left/3.png differ
diff --git a/public/images/emoji/google/fist_left/4.png b/public/images/emoji/google/fist_left/4.png
new file mode 100644
index 00000000000..c7d58e309b2
Binary files /dev/null and b/public/images/emoji/google/fist_left/4.png differ
diff --git a/public/images/emoji/google/fist_left/5.png b/public/images/emoji/google/fist_left/5.png
new file mode 100644
index 00000000000..06684b2a477
Binary files /dev/null and b/public/images/emoji/google/fist_left/5.png differ
diff --git a/public/images/emoji/google/fist_left/6.png b/public/images/emoji/google/fist_left/6.png
new file mode 100644
index 00000000000..2070d12016f
Binary files /dev/null and b/public/images/emoji/google/fist_left/6.png differ
diff --git a/public/images/emoji/google/fist_right.png b/public/images/emoji/google/fist_right.png
new file mode 100644
index 00000000000..8b5c83ae577
Binary files /dev/null and b/public/images/emoji/google/fist_right.png differ
diff --git a/public/images/emoji/google/fist_right/2.png b/public/images/emoji/google/fist_right/2.png
new file mode 100644
index 00000000000..07e2e7bbfce
Binary files /dev/null and b/public/images/emoji/google/fist_right/2.png differ
diff --git a/public/images/emoji/google/fist_right/3.png b/public/images/emoji/google/fist_right/3.png
new file mode 100644
index 00000000000..86dbaf843b1
Binary files /dev/null and b/public/images/emoji/google/fist_right/3.png differ
diff --git a/public/images/emoji/google/fist_right/4.png b/public/images/emoji/google/fist_right/4.png
new file mode 100644
index 00000000000..4cd975fa2d1
Binary files /dev/null and b/public/images/emoji/google/fist_right/4.png differ
diff --git a/public/images/emoji/google/fist_right/5.png b/public/images/emoji/google/fist_right/5.png
new file mode 100644
index 00000000000..c6cc84c9b7c
Binary files /dev/null and b/public/images/emoji/google/fist_right/5.png differ
diff --git a/public/images/emoji/google/fist_right/6.png b/public/images/emoji/google/fist_right/6.png
new file mode 100644
index 00000000000..b30ad1986f8
Binary files /dev/null and b/public/images/emoji/google/fist_right/6.png differ
diff --git a/public/images/emoji/google/five.png b/public/images/emoji/google/five.png
index 2ea1be6607b..e3557d2324a 100644
Binary files a/public/images/emoji/google/five.png and b/public/images/emoji/google/five.png differ
diff --git a/public/images/emoji/google/flag_black.png b/public/images/emoji/google/flag_black.png
index de072bca626..a7fce0c5812 100644
Binary files a/public/images/emoji/google/flag_black.png and b/public/images/emoji/google/flag_black.png differ
diff --git a/public/images/emoji/google/flag_cn.png b/public/images/emoji/google/flag_cn.png
index 38d240d5658..010dddd1076 100644
Binary files a/public/images/emoji/google/flag_cn.png and b/public/images/emoji/google/flag_cn.png differ
diff --git a/public/images/emoji/google/flag_de.png b/public/images/emoji/google/flag_de.png
index d9a749790e8..e18953b9bee 100644
Binary files a/public/images/emoji/google/flag_de.png and b/public/images/emoji/google/flag_de.png differ
diff --git a/public/images/emoji/google/flag_es.png b/public/images/emoji/google/flag_es.png
index 72747290e1d..55bba051719 100644
Binary files a/public/images/emoji/google/flag_es.png and b/public/images/emoji/google/flag_es.png differ
diff --git a/public/images/emoji/google/flag_fr.png b/public/images/emoji/google/flag_fr.png
index 6c144e0c731..bc63af1def5 100644
Binary files a/public/images/emoji/google/flag_fr.png and b/public/images/emoji/google/flag_fr.png differ
diff --git a/public/images/emoji/google/flag_gb.png b/public/images/emoji/google/flag_gb.png
index ef65da3b951..798328a1ee2 100644
Binary files a/public/images/emoji/google/flag_gb.png and b/public/images/emoji/google/flag_gb.png differ
diff --git a/public/images/emoji/google/flag_it.png b/public/images/emoji/google/flag_it.png
index cfbd4125e46..5ae7c53b6ff 100644
Binary files a/public/images/emoji/google/flag_it.png and b/public/images/emoji/google/flag_it.png differ
diff --git a/public/images/emoji/google/flag_jp.png b/public/images/emoji/google/flag_jp.png
index 99129fe55d0..72cbebef789 100644
Binary files a/public/images/emoji/google/flag_jp.png and b/public/images/emoji/google/flag_jp.png differ
diff --git a/public/images/emoji/google/flag_kr.png b/public/images/emoji/google/flag_kr.png
index efb95e4babc..33ead18d8c6 100644
Binary files a/public/images/emoji/google/flag_kr.png and b/public/images/emoji/google/flag_kr.png differ
diff --git a/public/images/emoji/google/flag_ru.png b/public/images/emoji/google/flag_ru.png
index f85a73fd4d9..a92bbdbb8a7 100644
Binary files a/public/images/emoji/google/flag_ru.png and b/public/images/emoji/google/flag_ru.png differ
diff --git a/public/images/emoji/google/flag_us.png b/public/images/emoji/google/flag_us.png
index 253e481c1ff..fae42715118 100644
Binary files a/public/images/emoji/google/flag_us.png and b/public/images/emoji/google/flag_us.png differ
diff --git a/public/images/emoji/google/flag_white.png b/public/images/emoji/google/flag_white.png
index ce4e23c8c72..7876a1b95cc 100644
Binary files a/public/images/emoji/google/flag_white.png and b/public/images/emoji/google/flag_white.png differ
diff --git a/public/images/emoji/google/flags.png b/public/images/emoji/google/flags.png
index c1c384d49ed..ed7ac4373a8 100644
Binary files a/public/images/emoji/google/flags.png and b/public/images/emoji/google/flags.png differ
diff --git a/public/images/emoji/google/flame.png b/public/images/emoji/google/flame.png
index c593b37d090..7b17db8d7a0 100644
Binary files a/public/images/emoji/google/flame.png and b/public/images/emoji/google/flame.png differ
diff --git a/public/images/emoji/google/flashlight.png b/public/images/emoji/google/flashlight.png
index 04a48b04d3d..5a7b9949948 100644
Binary files a/public/images/emoji/google/flashlight.png and b/public/images/emoji/google/flashlight.png differ
diff --git a/public/images/emoji/google/fleur-de-lis.png b/public/images/emoji/google/fleur-de-lis.png
index cb6333c5d44..04b03079f5c 100644
Binary files a/public/images/emoji/google/fleur-de-lis.png and b/public/images/emoji/google/fleur-de-lis.png differ
diff --git a/public/images/emoji/google/fleur_de_lis.png b/public/images/emoji/google/fleur_de_lis.png
new file mode 100644
index 00000000000..04b03079f5c
Binary files /dev/null and b/public/images/emoji/google/fleur_de_lis.png differ
diff --git a/public/images/emoji/google/flight_arrival.png b/public/images/emoji/google/flight_arrival.png
new file mode 100644
index 00000000000..e50c3233c24
Binary files /dev/null and b/public/images/emoji/google/flight_arrival.png differ
diff --git a/public/images/emoji/google/flight_departure.png b/public/images/emoji/google/flight_departure.png
new file mode 100644
index 00000000000..0536d2b45ba
Binary files /dev/null and b/public/images/emoji/google/flight_departure.png differ
diff --git a/public/images/emoji/google/floppy_disk.png b/public/images/emoji/google/floppy_disk.png
index b8278287520..bb0382d33a9 100644
Binary files a/public/images/emoji/google/floppy_disk.png and b/public/images/emoji/google/floppy_disk.png differ
diff --git a/public/images/emoji/google/flower_playing_cards.png b/public/images/emoji/google/flower_playing_cards.png
index a875efa76d4..46102e1a479 100644
Binary files a/public/images/emoji/google/flower_playing_cards.png and b/public/images/emoji/google/flower_playing_cards.png differ
diff --git a/public/images/emoji/google/flushed.png b/public/images/emoji/google/flushed.png
index a5d1a69b883..710d69d885c 100644
Binary files a/public/images/emoji/google/flushed.png and b/public/images/emoji/google/flushed.png differ
diff --git a/public/images/emoji/google/flying_saucer.png b/public/images/emoji/google/flying_saucer.png
new file mode 100644
index 00000000000..084840430f5
Binary files /dev/null and b/public/images/emoji/google/flying_saucer.png differ
diff --git a/public/images/emoji/google/fog.png b/public/images/emoji/google/fog.png
index dada1006157..223bc9d4ed5 100644
Binary files a/public/images/emoji/google/fog.png and b/public/images/emoji/google/fog.png differ
diff --git a/public/images/emoji/google/foggy.png b/public/images/emoji/google/foggy.png
index 61e526bf8dc..825600a6279 100644
Binary files a/public/images/emoji/google/foggy.png and b/public/images/emoji/google/foggy.png differ
diff --git a/public/images/emoji/google/football.png b/public/images/emoji/google/football.png
index d7bbeb34905..99b3759397a 100644
Binary files a/public/images/emoji/google/football.png and b/public/images/emoji/google/football.png differ
diff --git a/public/images/emoji/google/footprints.png b/public/images/emoji/google/footprints.png
index aec34d338e1..31748106285 100644
Binary files a/public/images/emoji/google/footprints.png and b/public/images/emoji/google/footprints.png differ
diff --git a/public/images/emoji/google/fork_and_knife.png b/public/images/emoji/google/fork_and_knife.png
index 68706930841..ef075aaa230 100644
Binary files a/public/images/emoji/google/fork_and_knife.png and b/public/images/emoji/google/fork_and_knife.png differ
diff --git a/public/images/emoji/google/fork_and_knife_with_plate.png b/public/images/emoji/google/fork_and_knife_with_plate.png
index 07989f14806..a990ed2cbe4 100644
Binary files a/public/images/emoji/google/fork_and_knife_with_plate.png and b/public/images/emoji/google/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/google/fork_knife_plate.png b/public/images/emoji/google/fork_knife_plate.png
index 07989f14806..a990ed2cbe4 100644
Binary files a/public/images/emoji/google/fork_knife_plate.png and b/public/images/emoji/google/fork_knife_plate.png differ
diff --git a/public/images/emoji/google/fortune_cookie.png b/public/images/emoji/google/fortune_cookie.png
new file mode 100644
index 00000000000..2a869b3482a
Binary files /dev/null and b/public/images/emoji/google/fortune_cookie.png differ
diff --git a/public/images/emoji/google/fountain.png b/public/images/emoji/google/fountain.png
index dce123c0275..991937cf771 100644
Binary files a/public/images/emoji/google/fountain.png and b/public/images/emoji/google/fountain.png differ
diff --git a/public/images/emoji/google/fountain_pen.png b/public/images/emoji/google/fountain_pen.png
new file mode 100644
index 00000000000..a06fcdc40e4
Binary files /dev/null and b/public/images/emoji/google/fountain_pen.png differ
diff --git a/public/images/emoji/google/four.png b/public/images/emoji/google/four.png
index 32d830771a2..819b70348c2 100644
Binary files a/public/images/emoji/google/four.png and b/public/images/emoji/google/four.png differ
diff --git a/public/images/emoji/google/four_leaf_clover.png b/public/images/emoji/google/four_leaf_clover.png
index a9b4209ba96..cdd7c8219ae 100644
Binary files a/public/images/emoji/google/four_leaf_clover.png and b/public/images/emoji/google/four_leaf_clover.png differ
diff --git a/public/images/emoji/google/fox_face.png b/public/images/emoji/google/fox_face.png
new file mode 100644
index 00000000000..4cbbe2f5665
Binary files /dev/null and b/public/images/emoji/google/fox_face.png differ
diff --git a/public/images/emoji/google/fr.png b/public/images/emoji/google/fr.png
index 6c144e0c731..bc63af1def5 100644
Binary files a/public/images/emoji/google/fr.png and b/public/images/emoji/google/fr.png differ
diff --git a/public/images/emoji/google/frame_photo.png b/public/images/emoji/google/frame_photo.png
index 5b57c11bc07..2e0fbe54bb7 100644
Binary files a/public/images/emoji/google/frame_photo.png and b/public/images/emoji/google/frame_photo.png differ
diff --git a/public/images/emoji/google/frame_with_picture.png b/public/images/emoji/google/frame_with_picture.png
index 5b57c11bc07..2e0fbe54bb7 100644
Binary files a/public/images/emoji/google/frame_with_picture.png and b/public/images/emoji/google/frame_with_picture.png differ
diff --git a/public/images/emoji/google/framed_picture.png b/public/images/emoji/google/framed_picture.png
new file mode 100644
index 00000000000..2e0fbe54bb7
Binary files /dev/null and b/public/images/emoji/google/framed_picture.png differ
diff --git a/public/images/emoji/google/free.png b/public/images/emoji/google/free.png
index fd7ed85f99a..ae1a169d4da 100644
Binary files a/public/images/emoji/google/free.png and b/public/images/emoji/google/free.png differ
diff --git a/public/images/emoji/google/french_guiana.png b/public/images/emoji/google/french_guiana.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/french_guiana.png differ
diff --git a/public/images/emoji/google/french_polynesia.png b/public/images/emoji/google/french_polynesia.png
new file mode 100644
index 00000000000..2950f28c7a5
Binary files /dev/null and b/public/images/emoji/google/french_polynesia.png differ
diff --git a/public/images/emoji/google/french_southern_territories.png b/public/images/emoji/google/french_southern_territories.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/french_southern_territories.png differ
diff --git a/public/images/emoji/google/fried_egg.png b/public/images/emoji/google/fried_egg.png
new file mode 100644
index 00000000000..5259cc766c7
Binary files /dev/null and b/public/images/emoji/google/fried_egg.png differ
diff --git a/public/images/emoji/google/fried_shrimp.png b/public/images/emoji/google/fried_shrimp.png
index bdb350d529d..6fd40834eae 100644
Binary files a/public/images/emoji/google/fried_shrimp.png and b/public/images/emoji/google/fried_shrimp.png differ
diff --git a/public/images/emoji/google/fries.png b/public/images/emoji/google/fries.png
index 68359ecb1f3..be0344d9c23 100644
Binary files a/public/images/emoji/google/fries.png and b/public/images/emoji/google/fries.png differ
diff --git a/public/images/emoji/google/frog.png b/public/images/emoji/google/frog.png
index 017e47cfb79..52eb71fa2b6 100644
Binary files a/public/images/emoji/google/frog.png and b/public/images/emoji/google/frog.png differ
diff --git a/public/images/emoji/google/frowning.png b/public/images/emoji/google/frowning.png
index 353c945e682..401412e202c 100644
Binary files a/public/images/emoji/google/frowning.png and b/public/images/emoji/google/frowning.png differ
diff --git a/public/images/emoji/google/frowning2.png b/public/images/emoji/google/frowning2.png
index db9c6af5b3b..7248eaba8ac 100644
Binary files a/public/images/emoji/google/frowning2.png and b/public/images/emoji/google/frowning2.png differ
diff --git a/public/images/emoji/google/frowning_face.png b/public/images/emoji/google/frowning_face.png
new file mode 100644
index 00000000000..7248eaba8ac
Binary files /dev/null and b/public/images/emoji/google/frowning_face.png differ
diff --git a/public/images/emoji/google/frowning_man.png b/public/images/emoji/google/frowning_man.png
new file mode 100644
index 00000000000..e09bd0a7906
Binary files /dev/null and b/public/images/emoji/google/frowning_man.png differ
diff --git a/public/images/emoji/google/frowning_man/2.png b/public/images/emoji/google/frowning_man/2.png
new file mode 100644
index 00000000000..8f5bbc4c8c5
Binary files /dev/null and b/public/images/emoji/google/frowning_man/2.png differ
diff --git a/public/images/emoji/google/frowning_man/3.png b/public/images/emoji/google/frowning_man/3.png
new file mode 100644
index 00000000000..57bbd5e6452
Binary files /dev/null and b/public/images/emoji/google/frowning_man/3.png differ
diff --git a/public/images/emoji/google/frowning_man/4.png b/public/images/emoji/google/frowning_man/4.png
new file mode 100644
index 00000000000..b012c61440f
Binary files /dev/null and b/public/images/emoji/google/frowning_man/4.png differ
diff --git a/public/images/emoji/google/frowning_man/5.png b/public/images/emoji/google/frowning_man/5.png
new file mode 100644
index 00000000000..a78912cd69d
Binary files /dev/null and b/public/images/emoji/google/frowning_man/5.png differ
diff --git a/public/images/emoji/google/frowning_man/6.png b/public/images/emoji/google/frowning_man/6.png
new file mode 100644
index 00000000000..4da9b0198e5
Binary files /dev/null and b/public/images/emoji/google/frowning_man/6.png differ
diff --git a/public/images/emoji/google/frowning_woman.png b/public/images/emoji/google/frowning_woman.png
new file mode 100644
index 00000000000..4667b907ddf
Binary files /dev/null and b/public/images/emoji/google/frowning_woman.png differ
diff --git a/public/images/emoji/google/frowning_woman/2.png b/public/images/emoji/google/frowning_woman/2.png
new file mode 100644
index 00000000000..16f321b8aeb
Binary files /dev/null and b/public/images/emoji/google/frowning_woman/2.png differ
diff --git a/public/images/emoji/google/frowning_woman/3.png b/public/images/emoji/google/frowning_woman/3.png
new file mode 100644
index 00000000000..bd6c5e162fb
Binary files /dev/null and b/public/images/emoji/google/frowning_woman/3.png differ
diff --git a/public/images/emoji/google/frowning_woman/4.png b/public/images/emoji/google/frowning_woman/4.png
new file mode 100644
index 00000000000..72f848c863c
Binary files /dev/null and b/public/images/emoji/google/frowning_woman/4.png differ
diff --git a/public/images/emoji/google/frowning_woman/5.png b/public/images/emoji/google/frowning_woman/5.png
new file mode 100644
index 00000000000..863caa54338
Binary files /dev/null and b/public/images/emoji/google/frowning_woman/5.png differ
diff --git a/public/images/emoji/google/frowning_woman/6.png b/public/images/emoji/google/frowning_woman/6.png
new file mode 100644
index 00000000000..d1936f11235
Binary files /dev/null and b/public/images/emoji/google/frowning_woman/6.png differ
diff --git a/public/images/emoji/google/fu.png b/public/images/emoji/google/fu.png
new file mode 100644
index 00000000000..8ce128b147d
Binary files /dev/null and b/public/images/emoji/google/fu.png differ
diff --git a/public/images/emoji/google/fu/2.png b/public/images/emoji/google/fu/2.png
new file mode 100644
index 00000000000..3313e7e2f07
Binary files /dev/null and b/public/images/emoji/google/fu/2.png differ
diff --git a/public/images/emoji/google/fu/3.png b/public/images/emoji/google/fu/3.png
new file mode 100644
index 00000000000..916b42be04a
Binary files /dev/null and b/public/images/emoji/google/fu/3.png differ
diff --git a/public/images/emoji/google/fu/4.png b/public/images/emoji/google/fu/4.png
new file mode 100644
index 00000000000..7ab3507e2cd
Binary files /dev/null and b/public/images/emoji/google/fu/4.png differ
diff --git a/public/images/emoji/google/fu/5.png b/public/images/emoji/google/fu/5.png
new file mode 100644
index 00000000000..aeb15696e62
Binary files /dev/null and b/public/images/emoji/google/fu/5.png differ
diff --git a/public/images/emoji/google/fu/6.png b/public/images/emoji/google/fu/6.png
new file mode 100644
index 00000000000..8e864665145
Binary files /dev/null and b/public/images/emoji/google/fu/6.png differ
diff --git a/public/images/emoji/google/fuelpump.png b/public/images/emoji/google/fuelpump.png
index e706e740500..1c64f34d066 100644
Binary files a/public/images/emoji/google/fuelpump.png and b/public/images/emoji/google/fuelpump.png differ
diff --git a/public/images/emoji/google/full_moon.png b/public/images/emoji/google/full_moon.png
index a010820c160..8e591964a89 100644
Binary files a/public/images/emoji/google/full_moon.png and b/public/images/emoji/google/full_moon.png differ
diff --git a/public/images/emoji/google/full_moon_with_face.png b/public/images/emoji/google/full_moon_with_face.png
index cf8f51c590b..b43bda183a1 100644
Binary files a/public/images/emoji/google/full_moon_with_face.png and b/public/images/emoji/google/full_moon_with_face.png differ
diff --git a/public/images/emoji/google/funeral_urn.png b/public/images/emoji/google/funeral_urn.png
index eff08b3c1a1..864d903a351 100644
Binary files a/public/images/emoji/google/funeral_urn.png and b/public/images/emoji/google/funeral_urn.png differ
diff --git a/public/images/emoji/google/gabon.png b/public/images/emoji/google/gabon.png
new file mode 100644
index 00000000000..34a24616483
Binary files /dev/null and b/public/images/emoji/google/gabon.png differ
diff --git a/public/images/emoji/google/gambia.png b/public/images/emoji/google/gambia.png
new file mode 100644
index 00000000000..96e8ea845c8
Binary files /dev/null and b/public/images/emoji/google/gambia.png differ
diff --git a/public/images/emoji/google/game_die.png b/public/images/emoji/google/game_die.png
index 744ce2cc51a..4e0b58ab279 100644
Binary files a/public/images/emoji/google/game_die.png and b/public/images/emoji/google/game_die.png differ
diff --git a/public/images/emoji/google/gb.png b/public/images/emoji/google/gb.png
index ef65da3b951..798328a1ee2 100644
Binary files a/public/images/emoji/google/gb.png and b/public/images/emoji/google/gb.png differ
diff --git a/public/images/emoji/google/gear.png b/public/images/emoji/google/gear.png
index 5ce6ac16ee4..10881a48026 100644
Binary files a/public/images/emoji/google/gear.png and b/public/images/emoji/google/gear.png differ
diff --git a/public/images/emoji/google/gem.png b/public/images/emoji/google/gem.png
index a57b9123e3c..d5e8f5220e0 100644
Binary files a/public/images/emoji/google/gem.png and b/public/images/emoji/google/gem.png differ
diff --git a/public/images/emoji/google/gemini.png b/public/images/emoji/google/gemini.png
index 3d848fe1202..08e86865dd9 100644
Binary files a/public/images/emoji/google/gemini.png and b/public/images/emoji/google/gemini.png differ
diff --git a/public/images/emoji/google/genie.png b/public/images/emoji/google/genie.png
new file mode 100644
index 00000000000..2edad6a9a15
Binary files /dev/null and b/public/images/emoji/google/genie.png differ
diff --git a/public/images/emoji/google/georgia.png b/public/images/emoji/google/georgia.png
new file mode 100644
index 00000000000..0bb8fbc7384
Binary files /dev/null and b/public/images/emoji/google/georgia.png differ
diff --git a/public/images/emoji/google/ghana.png b/public/images/emoji/google/ghana.png
new file mode 100644
index 00000000000..e9a9cef6a17
Binary files /dev/null and b/public/images/emoji/google/ghana.png differ
diff --git a/public/images/emoji/google/ghost.png b/public/images/emoji/google/ghost.png
index 0008f99cbf7..5a480fdd902 100644
Binary files a/public/images/emoji/google/ghost.png and b/public/images/emoji/google/ghost.png differ
diff --git a/public/images/emoji/google/gibraltar.png b/public/images/emoji/google/gibraltar.png
new file mode 100644
index 00000000000..c84d89c6eca
Binary files /dev/null and b/public/images/emoji/google/gibraltar.png differ
diff --git a/public/images/emoji/google/gift.png b/public/images/emoji/google/gift.png
index c9c6762ea0f..4b64280a4a1 100644
Binary files a/public/images/emoji/google/gift.png and b/public/images/emoji/google/gift.png differ
diff --git a/public/images/emoji/google/gift_heart.png b/public/images/emoji/google/gift_heart.png
index 4df8b50642c..095265e17ab 100644
Binary files a/public/images/emoji/google/gift_heart.png and b/public/images/emoji/google/gift_heart.png differ
diff --git a/public/images/emoji/google/giraffe.png b/public/images/emoji/google/giraffe.png
new file mode 100644
index 00000000000..1bfe48b2ce2
Binary files /dev/null and b/public/images/emoji/google/giraffe.png differ
diff --git a/public/images/emoji/google/girl.png b/public/images/emoji/google/girl.png
index daad02a92d3..e7c8862e089 100644
Binary files a/public/images/emoji/google/girl.png and b/public/images/emoji/google/girl.png differ
diff --git a/public/images/emoji/google/girl/2.png b/public/images/emoji/google/girl/2.png
new file mode 100644
index 00000000000..6116182f27b
Binary files /dev/null and b/public/images/emoji/google/girl/2.png differ
diff --git a/public/images/emoji/google/girl/3.png b/public/images/emoji/google/girl/3.png
new file mode 100644
index 00000000000..0179a03094e
Binary files /dev/null and b/public/images/emoji/google/girl/3.png differ
diff --git a/public/images/emoji/google/girl/4.png b/public/images/emoji/google/girl/4.png
new file mode 100644
index 00000000000..46b6a6a7082
Binary files /dev/null and b/public/images/emoji/google/girl/4.png differ
diff --git a/public/images/emoji/google/girl/5.png b/public/images/emoji/google/girl/5.png
new file mode 100644
index 00000000000..49613bc6c33
Binary files /dev/null and b/public/images/emoji/google/girl/5.png differ
diff --git a/public/images/emoji/google/girl/6.png b/public/images/emoji/google/girl/6.png
new file mode 100644
index 00000000000..d8532bee944
Binary files /dev/null and b/public/images/emoji/google/girl/6.png differ
diff --git a/public/images/emoji/google/globe_with_meridians.png b/public/images/emoji/google/globe_with_meridians.png
index 9150bf4548d..fbf3a52cc58 100644
Binary files a/public/images/emoji/google/globe_with_meridians.png and b/public/images/emoji/google/globe_with_meridians.png differ
diff --git a/public/images/emoji/google/gloves.png b/public/images/emoji/google/gloves.png
new file mode 100644
index 00000000000..099b209a922
Binary files /dev/null and b/public/images/emoji/google/gloves.png differ
diff --git a/public/images/emoji/google/goal_net.png b/public/images/emoji/google/goal_net.png
new file mode 100644
index 00000000000..b697e2a2e3d
Binary files /dev/null and b/public/images/emoji/google/goal_net.png differ
diff --git a/public/images/emoji/google/goat.png b/public/images/emoji/google/goat.png
index 524dba56c3e..9b4be817e33 100644
Binary files a/public/images/emoji/google/goat.png and b/public/images/emoji/google/goat.png differ
diff --git a/public/images/emoji/google/golf.png b/public/images/emoji/google/golf.png
index b90c033a328..79a7bca0743 100644
Binary files a/public/images/emoji/google/golf.png and b/public/images/emoji/google/golf.png differ
diff --git a/public/images/emoji/google/golfer.png b/public/images/emoji/google/golfer.png
index 47f54f7c764..c1f1277d413 100644
Binary files a/public/images/emoji/google/golfer.png and b/public/images/emoji/google/golfer.png differ
diff --git a/public/images/emoji/google/golfer/2.png b/public/images/emoji/google/golfer/2.png
new file mode 100644
index 00000000000..e0a520c4c1f
Binary files /dev/null and b/public/images/emoji/google/golfer/2.png differ
diff --git a/public/images/emoji/google/golfer/3.png b/public/images/emoji/google/golfer/3.png
new file mode 100644
index 00000000000..dc70809ff37
Binary files /dev/null and b/public/images/emoji/google/golfer/3.png differ
diff --git a/public/images/emoji/google/golfer/4.png b/public/images/emoji/google/golfer/4.png
new file mode 100644
index 00000000000..482d5d5dad6
Binary files /dev/null and b/public/images/emoji/google/golfer/4.png differ
diff --git a/public/images/emoji/google/golfer/5.png b/public/images/emoji/google/golfer/5.png
new file mode 100644
index 00000000000..e3a8b44424c
Binary files /dev/null and b/public/images/emoji/google/golfer/5.png differ
diff --git a/public/images/emoji/google/golfer/6.png b/public/images/emoji/google/golfer/6.png
new file mode 100644
index 00000000000..19550ce7ceb
Binary files /dev/null and b/public/images/emoji/google/golfer/6.png differ
diff --git a/public/images/emoji/google/golfing_man.png b/public/images/emoji/google/golfing_man.png
new file mode 100644
index 00000000000..c1f1277d413
Binary files /dev/null and b/public/images/emoji/google/golfing_man.png differ
diff --git a/public/images/emoji/google/golfing_man/2.png b/public/images/emoji/google/golfing_man/2.png
new file mode 100644
index 00000000000..e0a520c4c1f
Binary files /dev/null and b/public/images/emoji/google/golfing_man/2.png differ
diff --git a/public/images/emoji/google/golfing_man/3.png b/public/images/emoji/google/golfing_man/3.png
new file mode 100644
index 00000000000..dc70809ff37
Binary files /dev/null and b/public/images/emoji/google/golfing_man/3.png differ
diff --git a/public/images/emoji/google/golfing_man/4.png b/public/images/emoji/google/golfing_man/4.png
new file mode 100644
index 00000000000..482d5d5dad6
Binary files /dev/null and b/public/images/emoji/google/golfing_man/4.png differ
diff --git a/public/images/emoji/google/golfing_man/5.png b/public/images/emoji/google/golfing_man/5.png
new file mode 100644
index 00000000000..e3a8b44424c
Binary files /dev/null and b/public/images/emoji/google/golfing_man/5.png differ
diff --git a/public/images/emoji/google/golfing_man/6.png b/public/images/emoji/google/golfing_man/6.png
new file mode 100644
index 00000000000..19550ce7ceb
Binary files /dev/null and b/public/images/emoji/google/golfing_man/6.png differ
diff --git a/public/images/emoji/google/golfing_woman.png b/public/images/emoji/google/golfing_woman.png
new file mode 100644
index 00000000000..652de949dcd
Binary files /dev/null and b/public/images/emoji/google/golfing_woman.png differ
diff --git a/public/images/emoji/google/gorilla.png b/public/images/emoji/google/gorilla.png
new file mode 100644
index 00000000000..979e729d224
Binary files /dev/null and b/public/images/emoji/google/gorilla.png differ
diff --git a/public/images/emoji/google/grandma.png b/public/images/emoji/google/grandma.png
index 1261df7c00b..4aeba637f78 100644
Binary files a/public/images/emoji/google/grandma.png and b/public/images/emoji/google/grandma.png differ
diff --git a/public/images/emoji/google/grandma/2.png b/public/images/emoji/google/grandma/2.png
new file mode 100644
index 00000000000..905e8a98b37
Binary files /dev/null and b/public/images/emoji/google/grandma/2.png differ
diff --git a/public/images/emoji/google/grandma/3.png b/public/images/emoji/google/grandma/3.png
new file mode 100644
index 00000000000..7d9c997674c
Binary files /dev/null and b/public/images/emoji/google/grandma/3.png differ
diff --git a/public/images/emoji/google/grandma/4.png b/public/images/emoji/google/grandma/4.png
new file mode 100644
index 00000000000..69a9c179106
Binary files /dev/null and b/public/images/emoji/google/grandma/4.png differ
diff --git a/public/images/emoji/google/grandma/5.png b/public/images/emoji/google/grandma/5.png
new file mode 100644
index 00000000000..7ae4d8ea045
Binary files /dev/null and b/public/images/emoji/google/grandma/5.png differ
diff --git a/public/images/emoji/google/grandma/6.png b/public/images/emoji/google/grandma/6.png
new file mode 100644
index 00000000000..89542a23302
Binary files /dev/null and b/public/images/emoji/google/grandma/6.png differ
diff --git a/public/images/emoji/google/grapes.png b/public/images/emoji/google/grapes.png
index 979432e79f2..c089a8c087d 100644
Binary files a/public/images/emoji/google/grapes.png and b/public/images/emoji/google/grapes.png differ
diff --git a/public/images/emoji/google/greece.png b/public/images/emoji/google/greece.png
new file mode 100644
index 00000000000..151e38cec94
Binary files /dev/null and b/public/images/emoji/google/greece.png differ
diff --git a/public/images/emoji/google/green_apple.png b/public/images/emoji/google/green_apple.png
index 11177352a97..5ed58e60e15 100644
Binary files a/public/images/emoji/google/green_apple.png and b/public/images/emoji/google/green_apple.png differ
diff --git a/public/images/emoji/google/green_book.png b/public/images/emoji/google/green_book.png
index 3193363bb7a..635cf13f993 100644
Binary files a/public/images/emoji/google/green_book.png and b/public/images/emoji/google/green_book.png differ
diff --git a/public/images/emoji/google/green_heart.png b/public/images/emoji/google/green_heart.png
index c69336dcfd7..dc4d3acea35 100644
Binary files a/public/images/emoji/google/green_heart.png and b/public/images/emoji/google/green_heart.png differ
diff --git a/public/images/emoji/google/green_salad.png b/public/images/emoji/google/green_salad.png
new file mode 100644
index 00000000000..adce2051802
Binary files /dev/null and b/public/images/emoji/google/green_salad.png differ
diff --git a/public/images/emoji/google/greenland.png b/public/images/emoji/google/greenland.png
new file mode 100644
index 00000000000..01d30e7701b
Binary files /dev/null and b/public/images/emoji/google/greenland.png differ
diff --git a/public/images/emoji/google/grenada.png b/public/images/emoji/google/grenada.png
new file mode 100644
index 00000000000..f010bf6f4e9
Binary files /dev/null and b/public/images/emoji/google/grenada.png differ
diff --git a/public/images/emoji/google/grey_exclamation.png b/public/images/emoji/google/grey_exclamation.png
index fc253965357..61587566bee 100644
Binary files a/public/images/emoji/google/grey_exclamation.png and b/public/images/emoji/google/grey_exclamation.png differ
diff --git a/public/images/emoji/google/grey_question.png b/public/images/emoji/google/grey_question.png
index b0a37e84beb..7ac39ecd096 100644
Binary files a/public/images/emoji/google/grey_question.png and b/public/images/emoji/google/grey_question.png differ
diff --git a/public/images/emoji/google/grimacing.png b/public/images/emoji/google/grimacing.png
index edb29c6442b..7ea69942a8b 100644
Binary files a/public/images/emoji/google/grimacing.png and b/public/images/emoji/google/grimacing.png differ
diff --git a/public/images/emoji/google/grin.png b/public/images/emoji/google/grin.png
index 6405328b4c9..09a880d2f09 100644
Binary files a/public/images/emoji/google/grin.png and b/public/images/emoji/google/grin.png differ
diff --git a/public/images/emoji/google/grinning.png b/public/images/emoji/google/grinning.png
index 224cbcf38ad..4ab16b8d763 100644
Binary files a/public/images/emoji/google/grinning.png and b/public/images/emoji/google/grinning.png differ
diff --git a/public/images/emoji/google/guadeloupe.png b/public/images/emoji/google/guadeloupe.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/guadeloupe.png differ
diff --git a/public/images/emoji/google/guam.png b/public/images/emoji/google/guam.png
new file mode 100644
index 00000000000..efc6cb9d32e
Binary files /dev/null and b/public/images/emoji/google/guam.png differ
diff --git a/public/images/emoji/google/guardsman.png b/public/images/emoji/google/guardsman.png
index 1e3569ce939..019f2c6bbaa 100644
Binary files a/public/images/emoji/google/guardsman.png and b/public/images/emoji/google/guardsman.png differ
diff --git a/public/images/emoji/google/guardsman/2.png b/public/images/emoji/google/guardsman/2.png
new file mode 100644
index 00000000000..d8e776c409f
Binary files /dev/null and b/public/images/emoji/google/guardsman/2.png differ
diff --git a/public/images/emoji/google/guardsman/3.png b/public/images/emoji/google/guardsman/3.png
new file mode 100644
index 00000000000..eae8cd6091e
Binary files /dev/null and b/public/images/emoji/google/guardsman/3.png differ
diff --git a/public/images/emoji/google/guardsman/4.png b/public/images/emoji/google/guardsman/4.png
new file mode 100644
index 00000000000..497251d3503
Binary files /dev/null and b/public/images/emoji/google/guardsman/4.png differ
diff --git a/public/images/emoji/google/guardsman/5.png b/public/images/emoji/google/guardsman/5.png
new file mode 100644
index 00000000000..ce94c2f9348
Binary files /dev/null and b/public/images/emoji/google/guardsman/5.png differ
diff --git a/public/images/emoji/google/guardsman/6.png b/public/images/emoji/google/guardsman/6.png
new file mode 100644
index 00000000000..5474f51f938
Binary files /dev/null and b/public/images/emoji/google/guardsman/6.png differ
diff --git a/public/images/emoji/google/guardswoman.png b/public/images/emoji/google/guardswoman.png
new file mode 100644
index 00000000000..4719e71121d
Binary files /dev/null and b/public/images/emoji/google/guardswoman.png differ
diff --git a/public/images/emoji/google/guardswoman/2.png b/public/images/emoji/google/guardswoman/2.png
new file mode 100644
index 00000000000..511ba38698c
Binary files /dev/null and b/public/images/emoji/google/guardswoman/2.png differ
diff --git a/public/images/emoji/google/guardswoman/3.png b/public/images/emoji/google/guardswoman/3.png
new file mode 100644
index 00000000000..9c07dc8ed1f
Binary files /dev/null and b/public/images/emoji/google/guardswoman/3.png differ
diff --git a/public/images/emoji/google/guardswoman/4.png b/public/images/emoji/google/guardswoman/4.png
new file mode 100644
index 00000000000..3b0958971e0
Binary files /dev/null and b/public/images/emoji/google/guardswoman/4.png differ
diff --git a/public/images/emoji/google/guardswoman/5.png b/public/images/emoji/google/guardswoman/5.png
new file mode 100644
index 00000000000..4596eb5248d
Binary files /dev/null and b/public/images/emoji/google/guardswoman/5.png differ
diff --git a/public/images/emoji/google/guardswoman/6.png b/public/images/emoji/google/guardswoman/6.png
new file mode 100644
index 00000000000..dff612d4cae
Binary files /dev/null and b/public/images/emoji/google/guardswoman/6.png differ
diff --git a/public/images/emoji/google/guatemala.png b/public/images/emoji/google/guatemala.png
new file mode 100644
index 00000000000..48293adac15
Binary files /dev/null and b/public/images/emoji/google/guatemala.png differ
diff --git a/public/images/emoji/google/guernsey.png b/public/images/emoji/google/guernsey.png
new file mode 100644
index 00000000000..3afd4eb9434
Binary files /dev/null and b/public/images/emoji/google/guernsey.png differ
diff --git a/public/images/emoji/google/guinea.png b/public/images/emoji/google/guinea.png
new file mode 100644
index 00000000000..d366654a2bc
Binary files /dev/null and b/public/images/emoji/google/guinea.png differ
diff --git a/public/images/emoji/google/guinea_bissau.png b/public/images/emoji/google/guinea_bissau.png
new file mode 100644
index 00000000000..0eb63867a43
Binary files /dev/null and b/public/images/emoji/google/guinea_bissau.png differ
diff --git a/public/images/emoji/google/guitar.png b/public/images/emoji/google/guitar.png
index e165528667e..7e84d2f4291 100644
Binary files a/public/images/emoji/google/guitar.png and b/public/images/emoji/google/guitar.png differ
diff --git a/public/images/emoji/google/gun.png b/public/images/emoji/google/gun.png
index 7f91f26f00d..d13d1f81a6e 100644
Binary files a/public/images/emoji/google/gun.png and b/public/images/emoji/google/gun.png differ
diff --git a/public/images/emoji/google/guyana.png b/public/images/emoji/google/guyana.png
new file mode 100644
index 00000000000..53a0bdf172e
Binary files /dev/null and b/public/images/emoji/google/guyana.png differ
diff --git a/public/images/emoji/google/haircut.png b/public/images/emoji/google/haircut.png
index da92b36a55c..b64dccf57d0 100644
Binary files a/public/images/emoji/google/haircut.png and b/public/images/emoji/google/haircut.png differ
diff --git a/public/images/emoji/google/haircut/2.png b/public/images/emoji/google/haircut/2.png
new file mode 100644
index 00000000000..9b287229ed8
Binary files /dev/null and b/public/images/emoji/google/haircut/2.png differ
diff --git a/public/images/emoji/google/haircut/3.png b/public/images/emoji/google/haircut/3.png
new file mode 100644
index 00000000000..4f8a650ba75
Binary files /dev/null and b/public/images/emoji/google/haircut/3.png differ
diff --git a/public/images/emoji/google/haircut/4.png b/public/images/emoji/google/haircut/4.png
new file mode 100644
index 00000000000..b2132465b8a
Binary files /dev/null and b/public/images/emoji/google/haircut/4.png differ
diff --git a/public/images/emoji/google/haircut/5.png b/public/images/emoji/google/haircut/5.png
new file mode 100644
index 00000000000..e90a8932a01
Binary files /dev/null and b/public/images/emoji/google/haircut/5.png differ
diff --git a/public/images/emoji/google/haircut/6.png b/public/images/emoji/google/haircut/6.png
new file mode 100644
index 00000000000..ae756aad3db
Binary files /dev/null and b/public/images/emoji/google/haircut/6.png differ
diff --git a/public/images/emoji/google/haircut_man.png b/public/images/emoji/google/haircut_man.png
new file mode 100644
index 00000000000..b3a1d14243f
Binary files /dev/null and b/public/images/emoji/google/haircut_man.png differ
diff --git a/public/images/emoji/google/haircut_man/2.png b/public/images/emoji/google/haircut_man/2.png
new file mode 100644
index 00000000000..fbc63a18f4e
Binary files /dev/null and b/public/images/emoji/google/haircut_man/2.png differ
diff --git a/public/images/emoji/google/haircut_man/3.png b/public/images/emoji/google/haircut_man/3.png
new file mode 100644
index 00000000000..97bc65feea7
Binary files /dev/null and b/public/images/emoji/google/haircut_man/3.png differ
diff --git a/public/images/emoji/google/haircut_man/4.png b/public/images/emoji/google/haircut_man/4.png
new file mode 100644
index 00000000000..b3cc9b94d25
Binary files /dev/null and b/public/images/emoji/google/haircut_man/4.png differ
diff --git a/public/images/emoji/google/haircut_man/5.png b/public/images/emoji/google/haircut_man/5.png
new file mode 100644
index 00000000000..1a8e477d57d
Binary files /dev/null and b/public/images/emoji/google/haircut_man/5.png differ
diff --git a/public/images/emoji/google/haircut_man/6.png b/public/images/emoji/google/haircut_man/6.png
new file mode 100644
index 00000000000..1194faf9848
Binary files /dev/null and b/public/images/emoji/google/haircut_man/6.png differ
diff --git a/public/images/emoji/google/haircut_woman.png b/public/images/emoji/google/haircut_woman.png
new file mode 100644
index 00000000000..b64dccf57d0
Binary files /dev/null and b/public/images/emoji/google/haircut_woman.png differ
diff --git a/public/images/emoji/google/haircut_woman/2.png b/public/images/emoji/google/haircut_woman/2.png
new file mode 100644
index 00000000000..9b287229ed8
Binary files /dev/null and b/public/images/emoji/google/haircut_woman/2.png differ
diff --git a/public/images/emoji/google/haircut_woman/3.png b/public/images/emoji/google/haircut_woman/3.png
new file mode 100644
index 00000000000..4f8a650ba75
Binary files /dev/null and b/public/images/emoji/google/haircut_woman/3.png differ
diff --git a/public/images/emoji/google/haircut_woman/4.png b/public/images/emoji/google/haircut_woman/4.png
new file mode 100644
index 00000000000..b2132465b8a
Binary files /dev/null and b/public/images/emoji/google/haircut_woman/4.png differ
diff --git a/public/images/emoji/google/haircut_woman/5.png b/public/images/emoji/google/haircut_woman/5.png
new file mode 100644
index 00000000000..e90a8932a01
Binary files /dev/null and b/public/images/emoji/google/haircut_woman/5.png differ
diff --git a/public/images/emoji/google/haircut_woman/6.png b/public/images/emoji/google/haircut_woman/6.png
new file mode 100644
index 00000000000..ae756aad3db
Binary files /dev/null and b/public/images/emoji/google/haircut_woman/6.png differ
diff --git a/public/images/emoji/google/haiti.png b/public/images/emoji/google/haiti.png
new file mode 100644
index 00000000000..31aabf88a10
Binary files /dev/null and b/public/images/emoji/google/haiti.png differ
diff --git a/public/images/emoji/google/hamburger.png b/public/images/emoji/google/hamburger.png
index 937576c4dae..7b5619b619d 100644
Binary files a/public/images/emoji/google/hamburger.png and b/public/images/emoji/google/hamburger.png differ
diff --git a/public/images/emoji/google/hammer.png b/public/images/emoji/google/hammer.png
index c192eebd54a..055b25f23a5 100644
Binary files a/public/images/emoji/google/hammer.png and b/public/images/emoji/google/hammer.png differ
diff --git a/public/images/emoji/google/hammer_and_pick.png b/public/images/emoji/google/hammer_and_pick.png
index bbbd5b29906..8477e47e4c0 100644
Binary files a/public/images/emoji/google/hammer_and_pick.png and b/public/images/emoji/google/hammer_and_pick.png differ
diff --git a/public/images/emoji/google/hammer_and_wrench.png b/public/images/emoji/google/hammer_and_wrench.png
index 1be385628fb..174926ff02e 100644
Binary files a/public/images/emoji/google/hammer_and_wrench.png and b/public/images/emoji/google/hammer_and_wrench.png differ
diff --git a/public/images/emoji/google/hammer_pick.png b/public/images/emoji/google/hammer_pick.png
index bbbd5b29906..8477e47e4c0 100644
Binary files a/public/images/emoji/google/hammer_pick.png and b/public/images/emoji/google/hammer_pick.png differ
diff --git a/public/images/emoji/google/hamster.png b/public/images/emoji/google/hamster.png
index 31d4ef6ea12..cdb2d29d8aa 100644
Binary files a/public/images/emoji/google/hamster.png and b/public/images/emoji/google/hamster.png differ
diff --git a/public/images/emoji/google/hand.png b/public/images/emoji/google/hand.png
new file mode 100644
index 00000000000..b916dc7f878
Binary files /dev/null and b/public/images/emoji/google/hand.png differ
diff --git a/public/images/emoji/google/hand/2.png b/public/images/emoji/google/hand/2.png
new file mode 100644
index 00000000000..e60690c77eb
Binary files /dev/null and b/public/images/emoji/google/hand/2.png differ
diff --git a/public/images/emoji/google/hand/3.png b/public/images/emoji/google/hand/3.png
new file mode 100644
index 00000000000..9aabb63f85f
Binary files /dev/null and b/public/images/emoji/google/hand/3.png differ
diff --git a/public/images/emoji/google/hand/4.png b/public/images/emoji/google/hand/4.png
new file mode 100644
index 00000000000..86696653b53
Binary files /dev/null and b/public/images/emoji/google/hand/4.png differ
diff --git a/public/images/emoji/google/hand/5.png b/public/images/emoji/google/hand/5.png
new file mode 100644
index 00000000000..1e92c70971d
Binary files /dev/null and b/public/images/emoji/google/hand/5.png differ
diff --git a/public/images/emoji/google/hand/6.png b/public/images/emoji/google/hand/6.png
new file mode 100644
index 00000000000..1e260d44614
Binary files /dev/null and b/public/images/emoji/google/hand/6.png differ
diff --git a/public/images/emoji/google/hand_splayed.png b/public/images/emoji/google/hand_splayed.png
index 52ded94d54a..f99fef5296b 100644
Binary files a/public/images/emoji/google/hand_splayed.png and b/public/images/emoji/google/hand_splayed.png differ
diff --git a/public/images/emoji/google/hand_splayed/2.png b/public/images/emoji/google/hand_splayed/2.png
new file mode 100644
index 00000000000..3f6b667ebe2
Binary files /dev/null and b/public/images/emoji/google/hand_splayed/2.png differ
diff --git a/public/images/emoji/google/hand_splayed/3.png b/public/images/emoji/google/hand_splayed/3.png
new file mode 100644
index 00000000000..0a811f93d51
Binary files /dev/null and b/public/images/emoji/google/hand_splayed/3.png differ
diff --git a/public/images/emoji/google/hand_splayed/4.png b/public/images/emoji/google/hand_splayed/4.png
new file mode 100644
index 00000000000..21a92e444c9
Binary files /dev/null and b/public/images/emoji/google/hand_splayed/4.png differ
diff --git a/public/images/emoji/google/hand_splayed/5.png b/public/images/emoji/google/hand_splayed/5.png
new file mode 100644
index 00000000000..f40f860c160
Binary files /dev/null and b/public/images/emoji/google/hand_splayed/5.png differ
diff --git a/public/images/emoji/google/hand_splayed/6.png b/public/images/emoji/google/hand_splayed/6.png
new file mode 100644
index 00000000000..b87967ff847
Binary files /dev/null and b/public/images/emoji/google/hand_splayed/6.png differ
diff --git a/public/images/emoji/google/handbag.png b/public/images/emoji/google/handbag.png
index ff93dff4063..3c9e331817b 100644
Binary files a/public/images/emoji/google/handbag.png and b/public/images/emoji/google/handbag.png differ
diff --git a/public/images/emoji/google/handshake.png b/public/images/emoji/google/handshake.png
new file mode 100644
index 00000000000..39a65a8d66b
Binary files /dev/null and b/public/images/emoji/google/handshake.png differ
diff --git a/public/images/emoji/google/hankey.png b/public/images/emoji/google/hankey.png
index 87d78669668..b1d921d96c2 100644
Binary files a/public/images/emoji/google/hankey.png and b/public/images/emoji/google/hankey.png differ
diff --git a/public/images/emoji/google/hash.png b/public/images/emoji/google/hash.png
index 706a31c13b1..3110e701f70 100644
Binary files a/public/images/emoji/google/hash.png and b/public/images/emoji/google/hash.png differ
diff --git a/public/images/emoji/google/hatched_chick.png b/public/images/emoji/google/hatched_chick.png
index f416dc1376e..59513c6a1da 100644
Binary files a/public/images/emoji/google/hatched_chick.png and b/public/images/emoji/google/hatched_chick.png differ
diff --git a/public/images/emoji/google/hatching_chick.png b/public/images/emoji/google/hatching_chick.png
index 5b53b566f9a..65b2c5b2781 100644
Binary files a/public/images/emoji/google/hatching_chick.png and b/public/images/emoji/google/hatching_chick.png differ
diff --git a/public/images/emoji/google/head_bandage.png b/public/images/emoji/google/head_bandage.png
index d892078bb20..e07d929a276 100644
Binary files a/public/images/emoji/google/head_bandage.png and b/public/images/emoji/google/head_bandage.png differ
diff --git a/public/images/emoji/google/headphones.png b/public/images/emoji/google/headphones.png
index 8641079a6d9..294982aa8ec 100644
Binary files a/public/images/emoji/google/headphones.png and b/public/images/emoji/google/headphones.png differ
diff --git a/public/images/emoji/google/hear_no_evil.png b/public/images/emoji/google/hear_no_evil.png
index 2d68bb67709..31f768cf1af 100644
Binary files a/public/images/emoji/google/hear_no_evil.png and b/public/images/emoji/google/hear_no_evil.png differ
diff --git a/public/images/emoji/google/heard_and_mc_donald_islands.png b/public/images/emoji/google/heard_and_mc_donald_islands.png
new file mode 100644
index 00000000000..7ef6056c335
Binary files /dev/null and b/public/images/emoji/google/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/google/heart.png b/public/images/emoji/google/heart.png
index 2324dbaabdb..ab5223c5a0e 100644
Binary files a/public/images/emoji/google/heart.png and b/public/images/emoji/google/heart.png differ
diff --git a/public/images/emoji/google/heart_decoration.png b/public/images/emoji/google/heart_decoration.png
index 2b8efa17f1e..7b44e071535 100644
Binary files a/public/images/emoji/google/heart_decoration.png and b/public/images/emoji/google/heart_decoration.png differ
diff --git a/public/images/emoji/google/heart_exclamation.png b/public/images/emoji/google/heart_exclamation.png
index 401dfd498dd..dd204a5c3e9 100644
Binary files a/public/images/emoji/google/heart_exclamation.png and b/public/images/emoji/google/heart_exclamation.png differ
diff --git a/public/images/emoji/google/heart_eyes.png b/public/images/emoji/google/heart_eyes.png
index fee2c7f7a9c..20585dfdec0 100644
Binary files a/public/images/emoji/google/heart_eyes.png and b/public/images/emoji/google/heart_eyes.png differ
diff --git a/public/images/emoji/google/heart_eyes_cat.png b/public/images/emoji/google/heart_eyes_cat.png
index 2912c9aa571..767f119d779 100644
Binary files a/public/images/emoji/google/heart_eyes_cat.png and b/public/images/emoji/google/heart_eyes_cat.png differ
diff --git a/public/images/emoji/google/heartbeat.png b/public/images/emoji/google/heartbeat.png
index 8f50f8a8d24..f60c3b9565c 100644
Binary files a/public/images/emoji/google/heartbeat.png and b/public/images/emoji/google/heartbeat.png differ
diff --git a/public/images/emoji/google/heartpulse.png b/public/images/emoji/google/heartpulse.png
index 33bd1343681..130312d82cd 100644
Binary files a/public/images/emoji/google/heartpulse.png and b/public/images/emoji/google/heartpulse.png differ
diff --git a/public/images/emoji/google/hearts.png b/public/images/emoji/google/hearts.png
index 3f0472ff644..c081114da50 100644
Binary files a/public/images/emoji/google/hearts.png and b/public/images/emoji/google/hearts.png differ
diff --git a/public/images/emoji/google/heavy_check_mark.png b/public/images/emoji/google/heavy_check_mark.png
index 7243e553cdb..73e2a7ccc6c 100644
Binary files a/public/images/emoji/google/heavy_check_mark.png and b/public/images/emoji/google/heavy_check_mark.png differ
diff --git a/public/images/emoji/google/heavy_division_sign.png b/public/images/emoji/google/heavy_division_sign.png
index 311230dfd5d..10cfd95b24c 100644
Binary files a/public/images/emoji/google/heavy_division_sign.png and b/public/images/emoji/google/heavy_division_sign.png differ
diff --git a/public/images/emoji/google/heavy_dollar_sign.png b/public/images/emoji/google/heavy_dollar_sign.png
index 67b6826b968..7958910d977 100644
Binary files a/public/images/emoji/google/heavy_dollar_sign.png and b/public/images/emoji/google/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/google/heavy_heart_exclamation.png b/public/images/emoji/google/heavy_heart_exclamation.png
new file mode 100644
index 00000000000..dd204a5c3e9
Binary files /dev/null and b/public/images/emoji/google/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png
index 401dfd498dd..dd204a5c3e9 100644
Binary files a/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png and b/public/images/emoji/google/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/google/heavy_minus_sign.png b/public/images/emoji/google/heavy_minus_sign.png
index b6cd1991d7a..c5be3ff05f1 100644
Binary files a/public/images/emoji/google/heavy_minus_sign.png and b/public/images/emoji/google/heavy_minus_sign.png differ
diff --git a/public/images/emoji/google/heavy_multiplication_x.png b/public/images/emoji/google/heavy_multiplication_x.png
index 557185c7f0c..ec8c4701815 100644
Binary files a/public/images/emoji/google/heavy_multiplication_x.png and b/public/images/emoji/google/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/google/heavy_plus_sign.png b/public/images/emoji/google/heavy_plus_sign.png
index 8d10c30ca1f..3a092fdb300 100644
Binary files a/public/images/emoji/google/heavy_plus_sign.png and b/public/images/emoji/google/heavy_plus_sign.png differ
diff --git a/public/images/emoji/google/hedgehog.png b/public/images/emoji/google/hedgehog.png
new file mode 100644
index 00000000000..fc0a8233761
Binary files /dev/null and b/public/images/emoji/google/hedgehog.png differ
diff --git a/public/images/emoji/google/helicopter.png b/public/images/emoji/google/helicopter.png
index eb88f52eb52..eeefbae5904 100644
Binary files a/public/images/emoji/google/helicopter.png and b/public/images/emoji/google/helicopter.png differ
diff --git a/public/images/emoji/google/helmet_with_cross.png b/public/images/emoji/google/helmet_with_cross.png
index 721340bfb01..e1306b90dc3 100644
Binary files a/public/images/emoji/google/helmet_with_cross.png and b/public/images/emoji/google/helmet_with_cross.png differ
diff --git a/public/images/emoji/google/helmet_with_white_cross.png b/public/images/emoji/google/helmet_with_white_cross.png
index 721340bfb01..e1306b90dc3 100644
Binary files a/public/images/emoji/google/helmet_with_white_cross.png and b/public/images/emoji/google/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/google/herb.png b/public/images/emoji/google/herb.png
index ebad8c7ecda..ced3a53f7b5 100644
Binary files a/public/images/emoji/google/herb.png and b/public/images/emoji/google/herb.png differ
diff --git a/public/images/emoji/google/hibiscus.png b/public/images/emoji/google/hibiscus.png
index ab12e064014..085184daa1c 100644
Binary files a/public/images/emoji/google/hibiscus.png and b/public/images/emoji/google/hibiscus.png differ
diff --git a/public/images/emoji/google/high_brightness.png b/public/images/emoji/google/high_brightness.png
index b338f584208..16527f5ed2f 100644
Binary files a/public/images/emoji/google/high_brightness.png and b/public/images/emoji/google/high_brightness.png differ
diff --git a/public/images/emoji/google/high_heel.png b/public/images/emoji/google/high_heel.png
index ee79f03d2de..80446be7eb6 100644
Binary files a/public/images/emoji/google/high_heel.png and b/public/images/emoji/google/high_heel.png differ
diff --git a/public/images/emoji/google/hocho.png b/public/images/emoji/google/hocho.png
new file mode 100644
index 00000000000..f0260024b6a
Binary files /dev/null and b/public/images/emoji/google/hocho.png differ
diff --git a/public/images/emoji/google/hockey.png b/public/images/emoji/google/hockey.png
index ab84461bfb3..ded1adbd2bd 100644
Binary files a/public/images/emoji/google/hockey.png and b/public/images/emoji/google/hockey.png differ
diff --git a/public/images/emoji/google/hole.png b/public/images/emoji/google/hole.png
index d2f6a9a225a..7889e64531e 100644
Binary files a/public/images/emoji/google/hole.png and b/public/images/emoji/google/hole.png differ
diff --git a/public/images/emoji/google/homes.png b/public/images/emoji/google/homes.png
index e1a05599889..fa9363ada4b 100644
Binary files a/public/images/emoji/google/homes.png and b/public/images/emoji/google/homes.png differ
diff --git a/public/images/emoji/google/honduras.png b/public/images/emoji/google/honduras.png
new file mode 100644
index 00000000000..3c021c40ef3
Binary files /dev/null and b/public/images/emoji/google/honduras.png differ
diff --git a/public/images/emoji/google/honey_pot.png b/public/images/emoji/google/honey_pot.png
index d3255542ba3..e52dc00f237 100644
Binary files a/public/images/emoji/google/honey_pot.png and b/public/images/emoji/google/honey_pot.png differ
diff --git a/public/images/emoji/google/honeybee.png b/public/images/emoji/google/honeybee.png
new file mode 100644
index 00000000000..4bcf0f5a5ce
Binary files /dev/null and b/public/images/emoji/google/honeybee.png differ
diff --git a/public/images/emoji/google/hong_kong.png b/public/images/emoji/google/hong_kong.png
new file mode 100644
index 00000000000..691da0cc65e
Binary files /dev/null and b/public/images/emoji/google/hong_kong.png differ
diff --git a/public/images/emoji/google/horse.png b/public/images/emoji/google/horse.png
index bfa6fe21523..0dd1dc3140d 100644
Binary files a/public/images/emoji/google/horse.png and b/public/images/emoji/google/horse.png differ
diff --git a/public/images/emoji/google/horse_racing.png b/public/images/emoji/google/horse_racing.png
index b2164389462..d347767aa92 100644
Binary files a/public/images/emoji/google/horse_racing.png and b/public/images/emoji/google/horse_racing.png differ
diff --git a/public/images/emoji/google/horse_racing/2.png b/public/images/emoji/google/horse_racing/2.png
new file mode 100644
index 00000000000..c16c586ab6e
Binary files /dev/null and b/public/images/emoji/google/horse_racing/2.png differ
diff --git a/public/images/emoji/google/horse_racing/3.png b/public/images/emoji/google/horse_racing/3.png
new file mode 100644
index 00000000000..5bff25a2e8c
Binary files /dev/null and b/public/images/emoji/google/horse_racing/3.png differ
diff --git a/public/images/emoji/google/horse_racing/4.png b/public/images/emoji/google/horse_racing/4.png
new file mode 100644
index 00000000000..c0f4c4db36c
Binary files /dev/null and b/public/images/emoji/google/horse_racing/4.png differ
diff --git a/public/images/emoji/google/horse_racing/5.png b/public/images/emoji/google/horse_racing/5.png
new file mode 100644
index 00000000000..0f3be6013f0
Binary files /dev/null and b/public/images/emoji/google/horse_racing/5.png differ
diff --git a/public/images/emoji/google/horse_racing/6.png b/public/images/emoji/google/horse_racing/6.png
new file mode 100644
index 00000000000..749f989220b
Binary files /dev/null and b/public/images/emoji/google/horse_racing/6.png differ
diff --git a/public/images/emoji/google/hospital.png b/public/images/emoji/google/hospital.png
index 683ae2af051..f7fefbaad86 100644
Binary files a/public/images/emoji/google/hospital.png and b/public/images/emoji/google/hospital.png differ
diff --git a/public/images/emoji/google/hot_dog.png b/public/images/emoji/google/hot_dog.png
index 0e58953ffec..1221191c3f2 100644
Binary files a/public/images/emoji/google/hot_dog.png and b/public/images/emoji/google/hot_dog.png differ
diff --git a/public/images/emoji/google/hot_pepper.png b/public/images/emoji/google/hot_pepper.png
index 083ac34774b..87d576a9503 100644
Binary files a/public/images/emoji/google/hot_pepper.png and b/public/images/emoji/google/hot_pepper.png differ
diff --git a/public/images/emoji/google/hotdog.png b/public/images/emoji/google/hotdog.png
index 0e58953ffec..1221191c3f2 100644
Binary files a/public/images/emoji/google/hotdog.png and b/public/images/emoji/google/hotdog.png differ
diff --git a/public/images/emoji/google/hotel.png b/public/images/emoji/google/hotel.png
index 83bf093ca8d..661f6f4d2a5 100644
Binary files a/public/images/emoji/google/hotel.png and b/public/images/emoji/google/hotel.png differ
diff --git a/public/images/emoji/google/hotsprings.png b/public/images/emoji/google/hotsprings.png
index f0f4f65c861..9cd9a447c9a 100644
Binary files a/public/images/emoji/google/hotsprings.png and b/public/images/emoji/google/hotsprings.png differ
diff --git a/public/images/emoji/google/hourglass.png b/public/images/emoji/google/hourglass.png
index ecac60ebd57..dc20e70e26b 100644
Binary files a/public/images/emoji/google/hourglass.png and b/public/images/emoji/google/hourglass.png differ
diff --git a/public/images/emoji/google/hourglass_flowing_sand.png b/public/images/emoji/google/hourglass_flowing_sand.png
index 1952a366bb6..2947ddb2303 100644
Binary files a/public/images/emoji/google/hourglass_flowing_sand.png and b/public/images/emoji/google/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/google/house.png b/public/images/emoji/google/house.png
index 34100cce7a3..c34cf9df678 100644
Binary files a/public/images/emoji/google/house.png and b/public/images/emoji/google/house.png differ
diff --git a/public/images/emoji/google/house_abandoned.png b/public/images/emoji/google/house_abandoned.png
index b1d5a7d814e..5a4faead956 100644
Binary files a/public/images/emoji/google/house_abandoned.png and b/public/images/emoji/google/house_abandoned.png differ
diff --git a/public/images/emoji/google/house_buildings.png b/public/images/emoji/google/house_buildings.png
index e1a05599889..fa9363ada4b 100644
Binary files a/public/images/emoji/google/house_buildings.png and b/public/images/emoji/google/house_buildings.png differ
diff --git a/public/images/emoji/google/house_with_garden.png b/public/images/emoji/google/house_with_garden.png
index e38cfb45ebb..1c31e2d1415 100644
Binary files a/public/images/emoji/google/house_with_garden.png and b/public/images/emoji/google/house_with_garden.png differ
diff --git a/public/images/emoji/google/houses.png b/public/images/emoji/google/houses.png
new file mode 100644
index 00000000000..fa9363ada4b
Binary files /dev/null and b/public/images/emoji/google/houses.png differ
diff --git a/public/images/emoji/google/hugging.png b/public/images/emoji/google/hugging.png
index 6ac0f641741..bf104611e9b 100644
Binary files a/public/images/emoji/google/hugging.png and b/public/images/emoji/google/hugging.png differ
diff --git a/public/images/emoji/google/hugging_face.png b/public/images/emoji/google/hugging_face.png
index 6ac0f641741..bf104611e9b 100644
Binary files a/public/images/emoji/google/hugging_face.png and b/public/images/emoji/google/hugging_face.png differ
diff --git a/public/images/emoji/google/hugs.png b/public/images/emoji/google/hugs.png
new file mode 100644
index 00000000000..bf104611e9b
Binary files /dev/null and b/public/images/emoji/google/hugs.png differ
diff --git a/public/images/emoji/google/hungary.png b/public/images/emoji/google/hungary.png
new file mode 100644
index 00000000000..2fbf82b0e41
Binary files /dev/null and b/public/images/emoji/google/hungary.png differ
diff --git a/public/images/emoji/google/hushed.png b/public/images/emoji/google/hushed.png
index 1062006e820..1017735584d 100644
Binary files a/public/images/emoji/google/hushed.png and b/public/images/emoji/google/hushed.png differ
diff --git a/public/images/emoji/google/ice_cream.png b/public/images/emoji/google/ice_cream.png
index 30b30cde5cd..82e6d5352ee 100644
Binary files a/public/images/emoji/google/ice_cream.png and b/public/images/emoji/google/ice_cream.png differ
diff --git a/public/images/emoji/google/ice_hockey.png b/public/images/emoji/google/ice_hockey.png
new file mode 100644
index 00000000000..ded1adbd2bd
Binary files /dev/null and b/public/images/emoji/google/ice_hockey.png differ
diff --git a/public/images/emoji/google/ice_skate.png b/public/images/emoji/google/ice_skate.png
index 9c2b6c7998c..06a7f168f57 100644
Binary files a/public/images/emoji/google/ice_skate.png and b/public/images/emoji/google/ice_skate.png differ
diff --git a/public/images/emoji/google/icecream.png b/public/images/emoji/google/icecream.png
index 50d5dca0ed8..14d831d0dab 100644
Binary files a/public/images/emoji/google/icecream.png and b/public/images/emoji/google/icecream.png differ
diff --git a/public/images/emoji/google/iceland.png b/public/images/emoji/google/iceland.png
new file mode 100644
index 00000000000..cfc4b15f17c
Binary files /dev/null and b/public/images/emoji/google/iceland.png differ
diff --git a/public/images/emoji/google/id.png b/public/images/emoji/google/id.png
index 0d1f0e1bc9d..9d2fc98421d 100644
Binary files a/public/images/emoji/google/id.png and b/public/images/emoji/google/id.png differ
diff --git a/public/images/emoji/google/ideograph_advantage.png b/public/images/emoji/google/ideograph_advantage.png
index 9eb6c340d34..8e230f80749 100644
Binary files a/public/images/emoji/google/ideograph_advantage.png and b/public/images/emoji/google/ideograph_advantage.png differ
diff --git a/public/images/emoji/google/imp.png b/public/images/emoji/google/imp.png
index c5cca51457f..391197c7976 100644
Binary files a/public/images/emoji/google/imp.png and b/public/images/emoji/google/imp.png differ
diff --git a/public/images/emoji/google/inbox_tray.png b/public/images/emoji/google/inbox_tray.png
index 67148d2ce03..f4adb557350 100644
Binary files a/public/images/emoji/google/inbox_tray.png and b/public/images/emoji/google/inbox_tray.png differ
diff --git a/public/images/emoji/google/incoming_envelope.png b/public/images/emoji/google/incoming_envelope.png
index 92fcce77767..3be1a3b5ac5 100644
Binary files a/public/images/emoji/google/incoming_envelope.png and b/public/images/emoji/google/incoming_envelope.png differ
diff --git a/public/images/emoji/google/india.png b/public/images/emoji/google/india.png
new file mode 100644
index 00000000000..3d7da87187b
Binary files /dev/null and b/public/images/emoji/google/india.png differ
diff --git a/public/images/emoji/google/indonesia.png b/public/images/emoji/google/indonesia.png
new file mode 100644
index 00000000000..b2c334fd91d
Binary files /dev/null and b/public/images/emoji/google/indonesia.png differ
diff --git a/public/images/emoji/google/information_desk_person.png b/public/images/emoji/google/information_desk_person.png
index 3d4361ed65e..f84a2e02813 100644
Binary files a/public/images/emoji/google/information_desk_person.png and b/public/images/emoji/google/information_desk_person.png differ
diff --git a/public/images/emoji/google/information_desk_person/2.png b/public/images/emoji/google/information_desk_person/2.png
new file mode 100644
index 00000000000..448acc172ad
Binary files /dev/null and b/public/images/emoji/google/information_desk_person/2.png differ
diff --git a/public/images/emoji/google/information_desk_person/3.png b/public/images/emoji/google/information_desk_person/3.png
new file mode 100644
index 00000000000..23c4c592bc8
Binary files /dev/null and b/public/images/emoji/google/information_desk_person/3.png differ
diff --git a/public/images/emoji/google/information_desk_person/4.png b/public/images/emoji/google/information_desk_person/4.png
new file mode 100644
index 00000000000..be3b2d1e72a
Binary files /dev/null and b/public/images/emoji/google/information_desk_person/4.png differ
diff --git a/public/images/emoji/google/information_desk_person/5.png b/public/images/emoji/google/information_desk_person/5.png
new file mode 100644
index 00000000000..35c12c49030
Binary files /dev/null and b/public/images/emoji/google/information_desk_person/5.png differ
diff --git a/public/images/emoji/google/information_desk_person/6.png b/public/images/emoji/google/information_desk_person/6.png
new file mode 100644
index 00000000000..67e0a0ca12b
Binary files /dev/null and b/public/images/emoji/google/information_desk_person/6.png differ
diff --git a/public/images/emoji/google/information_source.png b/public/images/emoji/google/information_source.png
index d982dbd276b..b9c0993fc9d 100644
Binary files a/public/images/emoji/google/information_source.png and b/public/images/emoji/google/information_source.png differ
diff --git a/public/images/emoji/google/innocent.png b/public/images/emoji/google/innocent.png
index 234a5deaab0..f2eaaf228c9 100644
Binary files a/public/images/emoji/google/innocent.png and b/public/images/emoji/google/innocent.png differ
diff --git a/public/images/emoji/google/interrobang.png b/public/images/emoji/google/interrobang.png
index e96f13955d1..12d21b9834e 100644
Binary files a/public/images/emoji/google/interrobang.png and b/public/images/emoji/google/interrobang.png differ
diff --git a/public/images/emoji/google/iphone.png b/public/images/emoji/google/iphone.png
index 97ca7c4f79b..93dcb50850d 100644
Binary files a/public/images/emoji/google/iphone.png and b/public/images/emoji/google/iphone.png differ
diff --git a/public/images/emoji/google/iran.png b/public/images/emoji/google/iran.png
new file mode 100644
index 00000000000..846c6558501
Binary files /dev/null and b/public/images/emoji/google/iran.png differ
diff --git a/public/images/emoji/google/iraq.png b/public/images/emoji/google/iraq.png
new file mode 100644
index 00000000000..7afbf0e6dac
Binary files /dev/null and b/public/images/emoji/google/iraq.png differ
diff --git a/public/images/emoji/google/ireland.png b/public/images/emoji/google/ireland.png
new file mode 100644
index 00000000000..1a3efeb4ce6
Binary files /dev/null and b/public/images/emoji/google/ireland.png differ
diff --git a/public/images/emoji/google/island.png b/public/images/emoji/google/island.png
index 33b1d3883cf..30ee864648a 100644
Binary files a/public/images/emoji/google/island.png and b/public/images/emoji/google/island.png differ
diff --git a/public/images/emoji/google/isle_of_man.png b/public/images/emoji/google/isle_of_man.png
new file mode 100644
index 00000000000..81b217b4d36
Binary files /dev/null and b/public/images/emoji/google/isle_of_man.png differ
diff --git a/public/images/emoji/google/israel.png b/public/images/emoji/google/israel.png
new file mode 100644
index 00000000000..6554f75f87c
Binary files /dev/null and b/public/images/emoji/google/israel.png differ
diff --git a/public/images/emoji/google/it.png b/public/images/emoji/google/it.png
index cfbd4125e46..5ae7c53b6ff 100644
Binary files a/public/images/emoji/google/it.png and b/public/images/emoji/google/it.png differ
diff --git a/public/images/emoji/google/izakaya_lantern.png b/public/images/emoji/google/izakaya_lantern.png
index 92063b97fca..d8407f417f0 100644
Binary files a/public/images/emoji/google/izakaya_lantern.png and b/public/images/emoji/google/izakaya_lantern.png differ
diff --git a/public/images/emoji/google/jack_o_lantern.png b/public/images/emoji/google/jack_o_lantern.png
index 52e74c78e10..fe92e2bbabd 100644
Binary files a/public/images/emoji/google/jack_o_lantern.png and b/public/images/emoji/google/jack_o_lantern.png differ
diff --git a/public/images/emoji/google/jamaica.png b/public/images/emoji/google/jamaica.png
new file mode 100644
index 00000000000..a956adfab90
Binary files /dev/null and b/public/images/emoji/google/jamaica.png differ
diff --git a/public/images/emoji/google/japan.png b/public/images/emoji/google/japan.png
index a7754cc7342..19a1aceed1a 100644
Binary files a/public/images/emoji/google/japan.png and b/public/images/emoji/google/japan.png differ
diff --git a/public/images/emoji/google/japanese_castle.png b/public/images/emoji/google/japanese_castle.png
index 9b19a839326..d42ac569fe7 100644
Binary files a/public/images/emoji/google/japanese_castle.png and b/public/images/emoji/google/japanese_castle.png differ
diff --git a/public/images/emoji/google/japanese_goblin.png b/public/images/emoji/google/japanese_goblin.png
index 9d0a77f2353..0ebf700398f 100644
Binary files a/public/images/emoji/google/japanese_goblin.png and b/public/images/emoji/google/japanese_goblin.png differ
diff --git a/public/images/emoji/google/japanese_ogre.png b/public/images/emoji/google/japanese_ogre.png
index d24dffd0e2d..4a08e8e81be 100644
Binary files a/public/images/emoji/google/japanese_ogre.png and b/public/images/emoji/google/japanese_ogre.png differ
diff --git a/public/images/emoji/google/jeans.png b/public/images/emoji/google/jeans.png
index bfe464bb3e9..3bdd9ca3ba6 100644
Binary files a/public/images/emoji/google/jeans.png and b/public/images/emoji/google/jeans.png differ
diff --git a/public/images/emoji/google/jersey.png b/public/images/emoji/google/jersey.png
new file mode 100644
index 00000000000..47b536a6211
Binary files /dev/null and b/public/images/emoji/google/jersey.png differ
diff --git a/public/images/emoji/google/jordan.png b/public/images/emoji/google/jordan.png
new file mode 100644
index 00000000000..f8c6ca07eb7
Binary files /dev/null and b/public/images/emoji/google/jordan.png differ
diff --git a/public/images/emoji/google/joy.png b/public/images/emoji/google/joy.png
index 249ad7e8f0d..098ce2f4f98 100644
Binary files a/public/images/emoji/google/joy.png and b/public/images/emoji/google/joy.png differ
diff --git a/public/images/emoji/google/joy_cat.png b/public/images/emoji/google/joy_cat.png
index 3e7ae5090bd..a858d4615e0 100644
Binary files a/public/images/emoji/google/joy_cat.png and b/public/images/emoji/google/joy_cat.png differ
diff --git a/public/images/emoji/google/joystick.png b/public/images/emoji/google/joystick.png
index f8183693f9e..f5aa91b2d49 100644
Binary files a/public/images/emoji/google/joystick.png and b/public/images/emoji/google/joystick.png differ
diff --git a/public/images/emoji/google/jp.png b/public/images/emoji/google/jp.png
index 99129fe55d0..72cbebef789 100644
Binary files a/public/images/emoji/google/jp.png and b/public/images/emoji/google/jp.png differ
diff --git a/public/images/emoji/google/kaaba.png b/public/images/emoji/google/kaaba.png
index a74ce5d86f6..82aaffbd957 100644
Binary files a/public/images/emoji/google/kaaba.png and b/public/images/emoji/google/kaaba.png differ
diff --git a/public/images/emoji/google/kazakhstan.png b/public/images/emoji/google/kazakhstan.png
new file mode 100644
index 00000000000..ec2cffaecf1
Binary files /dev/null and b/public/images/emoji/google/kazakhstan.png differ
diff --git a/public/images/emoji/google/kenya.png b/public/images/emoji/google/kenya.png
new file mode 100644
index 00000000000..59f5ae68a7e
Binary files /dev/null and b/public/images/emoji/google/kenya.png differ
diff --git a/public/images/emoji/google/key.png b/public/images/emoji/google/key.png
index 05d1ca9b26a..7aca32f21d5 100644
Binary files a/public/images/emoji/google/key.png and b/public/images/emoji/google/key.png differ
diff --git a/public/images/emoji/google/key2.png b/public/images/emoji/google/key2.png
index 87121fe1078..d6739c8457c 100644
Binary files a/public/images/emoji/google/key2.png and b/public/images/emoji/google/key2.png differ
diff --git a/public/images/emoji/google/keyboard.png b/public/images/emoji/google/keyboard.png
index 197caff4e7b..f6190e74af4 100644
Binary files a/public/images/emoji/google/keyboard.png and b/public/images/emoji/google/keyboard.png differ
diff --git a/public/images/emoji/google/keycap_star.png b/public/images/emoji/google/keycap_star.png
index bc41c667b2c..9c0101c7d7e 100644
Binary files a/public/images/emoji/google/keycap_star.png and b/public/images/emoji/google/keycap_star.png differ
diff --git a/public/images/emoji/google/keycap_ten.png b/public/images/emoji/google/keycap_ten.png
new file mode 100644
index 00000000000..60b3c3787c0
Binary files /dev/null and b/public/images/emoji/google/keycap_ten.png differ
diff --git a/public/images/emoji/google/kick_scooter.png b/public/images/emoji/google/kick_scooter.png
new file mode 100644
index 00000000000..ebe5c370826
Binary files /dev/null and b/public/images/emoji/google/kick_scooter.png differ
diff --git a/public/images/emoji/google/kimono.png b/public/images/emoji/google/kimono.png
index a8161adf178..b252f0f2a74 100644
Binary files a/public/images/emoji/google/kimono.png and b/public/images/emoji/google/kimono.png differ
diff --git a/public/images/emoji/google/kiribati.png b/public/images/emoji/google/kiribati.png
new file mode 100644
index 00000000000..2f005d2487d
Binary files /dev/null and b/public/images/emoji/google/kiribati.png differ
diff --git a/public/images/emoji/google/kiss.png b/public/images/emoji/google/kiss.png
index 4c74c59e2ee..a7f50bbe04e 100644
Binary files a/public/images/emoji/google/kiss.png and b/public/images/emoji/google/kiss.png differ
diff --git a/public/images/emoji/google/kissing.png b/public/images/emoji/google/kissing.png
index 4d9b82e74a9..6033b2eb123 100644
Binary files a/public/images/emoji/google/kissing.png and b/public/images/emoji/google/kissing.png differ
diff --git a/public/images/emoji/google/kissing_cat.png b/public/images/emoji/google/kissing_cat.png
index bbe8c4a97ce..96ab3ba308b 100644
Binary files a/public/images/emoji/google/kissing_cat.png and b/public/images/emoji/google/kissing_cat.png differ
diff --git a/public/images/emoji/google/kissing_closed_eyes.png b/public/images/emoji/google/kissing_closed_eyes.png
index 12079862cd9..5118f05e7a3 100644
Binary files a/public/images/emoji/google/kissing_closed_eyes.png and b/public/images/emoji/google/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/google/kissing_heart.png b/public/images/emoji/google/kissing_heart.png
index 139ce489a48..1b16a522c9b 100644
Binary files a/public/images/emoji/google/kissing_heart.png and b/public/images/emoji/google/kissing_heart.png differ
diff --git a/public/images/emoji/google/kissing_smiling_eyes.png b/public/images/emoji/google/kissing_smiling_eyes.png
index d69b5d304ac..32d9aed1522 100644
Binary files a/public/images/emoji/google/kissing_smiling_eyes.png and b/public/images/emoji/google/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/google/kiwi_fruit.png b/public/images/emoji/google/kiwi_fruit.png
new file mode 100644
index 00000000000..d2834a517ad
Binary files /dev/null and b/public/images/emoji/google/kiwi_fruit.png differ
diff --git a/public/images/emoji/google/knife.png b/public/images/emoji/google/knife.png
index 88cee60960b..f0260024b6a 100644
Binary files a/public/images/emoji/google/knife.png and b/public/images/emoji/google/knife.png differ
diff --git a/public/images/emoji/google/koala.png b/public/images/emoji/google/koala.png
index 70b131e06bd..bcdca18c766 100644
Binary files a/public/images/emoji/google/koala.png and b/public/images/emoji/google/koala.png differ
diff --git a/public/images/emoji/google/koko.png b/public/images/emoji/google/koko.png
index ddaf0447ddf..eb223efbb57 100644
Binary files a/public/images/emoji/google/koko.png and b/public/images/emoji/google/koko.png differ
diff --git a/public/images/emoji/google/kosovo.png b/public/images/emoji/google/kosovo.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/kosovo.png differ
diff --git a/public/images/emoji/google/kr.png b/public/images/emoji/google/kr.png
index efb95e4babc..33ead18d8c6 100644
Binary files a/public/images/emoji/google/kr.png and b/public/images/emoji/google/kr.png differ
diff --git a/public/images/emoji/google/kuwait.png b/public/images/emoji/google/kuwait.png
new file mode 100644
index 00000000000..bf42ac971d1
Binary files /dev/null and b/public/images/emoji/google/kuwait.png differ
diff --git a/public/images/emoji/google/kyrgyzstan.png b/public/images/emoji/google/kyrgyzstan.png
new file mode 100644
index 00000000000..9ee2d3808fa
Binary files /dev/null and b/public/images/emoji/google/kyrgyzstan.png differ
diff --git a/public/images/emoji/google/label.png b/public/images/emoji/google/label.png
index c3043450a54..2473deefe6e 100644
Binary files a/public/images/emoji/google/label.png and b/public/images/emoji/google/label.png differ
diff --git a/public/images/emoji/google/laos.png b/public/images/emoji/google/laos.png
new file mode 100644
index 00000000000..5762ccf2973
Binary files /dev/null and b/public/images/emoji/google/laos.png differ
diff --git a/public/images/emoji/google/large_blue_circle.png b/public/images/emoji/google/large_blue_circle.png
index 2a680248230..183d6c3791a 100644
Binary files a/public/images/emoji/google/large_blue_circle.png and b/public/images/emoji/google/large_blue_circle.png differ
diff --git a/public/images/emoji/google/large_blue_diamond.png b/public/images/emoji/google/large_blue_diamond.png
index fc3f5b7c419..5479de75b34 100644
Binary files a/public/images/emoji/google/large_blue_diamond.png and b/public/images/emoji/google/large_blue_diamond.png differ
diff --git a/public/images/emoji/google/large_orange_diamond.png b/public/images/emoji/google/large_orange_diamond.png
index b652d77950a..41af4a51d41 100644
Binary files a/public/images/emoji/google/large_orange_diamond.png and b/public/images/emoji/google/large_orange_diamond.png differ
diff --git a/public/images/emoji/google/last_quarter_moon.png b/public/images/emoji/google/last_quarter_moon.png
index c6ad0a2dc4b..ae12e2a821c 100644
Binary files a/public/images/emoji/google/last_quarter_moon.png and b/public/images/emoji/google/last_quarter_moon.png differ
diff --git a/public/images/emoji/google/last_quarter_moon_with_face.png b/public/images/emoji/google/last_quarter_moon_with_face.png
index 96bd7112721..7900a9f9429 100644
Binary files a/public/images/emoji/google/last_quarter_moon_with_face.png and b/public/images/emoji/google/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/google/latin_cross.png b/public/images/emoji/google/latin_cross.png
index 52d188499f9..0a367b0233e 100644
Binary files a/public/images/emoji/google/latin_cross.png and b/public/images/emoji/google/latin_cross.png differ
diff --git a/public/images/emoji/google/latvia.png b/public/images/emoji/google/latvia.png
new file mode 100644
index 00000000000..963f774bb22
Binary files /dev/null and b/public/images/emoji/google/latvia.png differ
diff --git a/public/images/emoji/google/laughing.png b/public/images/emoji/google/laughing.png
index 04d29aa6a7d..1b64148f973 100644
Binary files a/public/images/emoji/google/laughing.png and b/public/images/emoji/google/laughing.png differ
diff --git a/public/images/emoji/google/leaves.png b/public/images/emoji/google/leaves.png
index 764114eaaf6..5dc15b3da44 100644
Binary files a/public/images/emoji/google/leaves.png and b/public/images/emoji/google/leaves.png differ
diff --git a/public/images/emoji/google/lebanon.png b/public/images/emoji/google/lebanon.png
new file mode 100644
index 00000000000..b8b47090432
Binary files /dev/null and b/public/images/emoji/google/lebanon.png differ
diff --git a/public/images/emoji/google/ledger.png b/public/images/emoji/google/ledger.png
index e709f538bfe..78915dd655a 100644
Binary files a/public/images/emoji/google/ledger.png and b/public/images/emoji/google/ledger.png differ
diff --git a/public/images/emoji/google/left_luggage.png b/public/images/emoji/google/left_luggage.png
index 47ad0e4f6ca..a81a7f4048f 100644
Binary files a/public/images/emoji/google/left_luggage.png and b/public/images/emoji/google/left_luggage.png differ
diff --git a/public/images/emoji/google/left_right_arrow.png b/public/images/emoji/google/left_right_arrow.png
index 29d18abc794..dc064561f02 100644
Binary files a/public/images/emoji/google/left_right_arrow.png and b/public/images/emoji/google/left_right_arrow.png differ
diff --git a/public/images/emoji/google/left_speech_bubble.png b/public/images/emoji/google/left_speech_bubble.png
index 450d8beafcc..4dd9f1330e0 100644
Binary files a/public/images/emoji/google/left_speech_bubble.png and b/public/images/emoji/google/left_speech_bubble.png differ
diff --git a/public/images/emoji/google/leftwards_arrow_with_hook.png b/public/images/emoji/google/leftwards_arrow_with_hook.png
index 2cefb32033b..da648022ba3 100644
Binary files a/public/images/emoji/google/leftwards_arrow_with_hook.png and b/public/images/emoji/google/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/google/lemon.png b/public/images/emoji/google/lemon.png
index 7cac69f07d9..f2748b54b35 100644
Binary files a/public/images/emoji/google/lemon.png and b/public/images/emoji/google/lemon.png differ
diff --git a/public/images/emoji/google/leo.png b/public/images/emoji/google/leo.png
index 99325408e35..ddb39122b65 100644
Binary files a/public/images/emoji/google/leo.png and b/public/images/emoji/google/leo.png differ
diff --git a/public/images/emoji/google/leopard.png b/public/images/emoji/google/leopard.png
index c781a5b6220..cc31eb647e7 100644
Binary files a/public/images/emoji/google/leopard.png and b/public/images/emoji/google/leopard.png differ
diff --git a/public/images/emoji/google/lesotho.png b/public/images/emoji/google/lesotho.png
new file mode 100644
index 00000000000..d0455846dda
Binary files /dev/null and b/public/images/emoji/google/lesotho.png differ
diff --git a/public/images/emoji/google/level_slider.png b/public/images/emoji/google/level_slider.png
index c255df10ffd..5991ab94a8d 100644
Binary files a/public/images/emoji/google/level_slider.png and b/public/images/emoji/google/level_slider.png differ
diff --git a/public/images/emoji/google/levitate.png b/public/images/emoji/google/levitate.png
index aafbbc2d802..88918f97b31 100644
Binary files a/public/images/emoji/google/levitate.png and b/public/images/emoji/google/levitate.png differ
diff --git a/public/images/emoji/google/levitate/2.png b/public/images/emoji/google/levitate/2.png
new file mode 100644
index 00000000000..ddeda2a43bb
Binary files /dev/null and b/public/images/emoji/google/levitate/2.png differ
diff --git a/public/images/emoji/google/levitate/3.png b/public/images/emoji/google/levitate/3.png
new file mode 100644
index 00000000000..e62d08a901f
Binary files /dev/null and b/public/images/emoji/google/levitate/3.png differ
diff --git a/public/images/emoji/google/levitate/4.png b/public/images/emoji/google/levitate/4.png
new file mode 100644
index 00000000000..27012dfbe98
Binary files /dev/null and b/public/images/emoji/google/levitate/4.png differ
diff --git a/public/images/emoji/google/levitate/5.png b/public/images/emoji/google/levitate/5.png
new file mode 100644
index 00000000000..c8863f58335
Binary files /dev/null and b/public/images/emoji/google/levitate/5.png differ
diff --git a/public/images/emoji/google/levitate/6.png b/public/images/emoji/google/levitate/6.png
new file mode 100644
index 00000000000..62e5e00578f
Binary files /dev/null and b/public/images/emoji/google/levitate/6.png differ
diff --git a/public/images/emoji/google/liberia.png b/public/images/emoji/google/liberia.png
new file mode 100644
index 00000000000..388c2f35d70
Binary files /dev/null and b/public/images/emoji/google/liberia.png differ
diff --git a/public/images/emoji/google/libra.png b/public/images/emoji/google/libra.png
index 4d0a2c452a7..1d8132623b2 100644
Binary files a/public/images/emoji/google/libra.png and b/public/images/emoji/google/libra.png differ
diff --git a/public/images/emoji/google/libya.png b/public/images/emoji/google/libya.png
new file mode 100644
index 00000000000..303b3fc66f3
Binary files /dev/null and b/public/images/emoji/google/libya.png differ
diff --git a/public/images/emoji/google/liechtenstein.png b/public/images/emoji/google/liechtenstein.png
new file mode 100644
index 00000000000..3c90874cca3
Binary files /dev/null and b/public/images/emoji/google/liechtenstein.png differ
diff --git a/public/images/emoji/google/lifter.png b/public/images/emoji/google/lifter.png
index eb58823175e..47689fc2921 100644
Binary files a/public/images/emoji/google/lifter.png and b/public/images/emoji/google/lifter.png differ
diff --git a/public/images/emoji/google/lifter/2.png b/public/images/emoji/google/lifter/2.png
new file mode 100644
index 00000000000..56ac45601aa
Binary files /dev/null and b/public/images/emoji/google/lifter/2.png differ
diff --git a/public/images/emoji/google/lifter/3.png b/public/images/emoji/google/lifter/3.png
new file mode 100644
index 00000000000..e4f89233ed0
Binary files /dev/null and b/public/images/emoji/google/lifter/3.png differ
diff --git a/public/images/emoji/google/lifter/4.png b/public/images/emoji/google/lifter/4.png
new file mode 100644
index 00000000000..a0a5133cf44
Binary files /dev/null and b/public/images/emoji/google/lifter/4.png differ
diff --git a/public/images/emoji/google/lifter/5.png b/public/images/emoji/google/lifter/5.png
new file mode 100644
index 00000000000..a38a3c841a9
Binary files /dev/null and b/public/images/emoji/google/lifter/5.png differ
diff --git a/public/images/emoji/google/lifter/6.png b/public/images/emoji/google/lifter/6.png
new file mode 100644
index 00000000000..f5b56144633
Binary files /dev/null and b/public/images/emoji/google/lifter/6.png differ
diff --git a/public/images/emoji/google/light_rail.png b/public/images/emoji/google/light_rail.png
index 09251b09349..3864cc38794 100644
Binary files a/public/images/emoji/google/light_rail.png and b/public/images/emoji/google/light_rail.png differ
diff --git a/public/images/emoji/google/link.png b/public/images/emoji/google/link.png
index cb01545722a..5c4d7c49230 100644
Binary files a/public/images/emoji/google/link.png and b/public/images/emoji/google/link.png differ
diff --git a/public/images/emoji/google/linked_paperclips.png b/public/images/emoji/google/linked_paperclips.png
index e34ff5ad2a3..b3b7e0de41d 100644
Binary files a/public/images/emoji/google/linked_paperclips.png and b/public/images/emoji/google/linked_paperclips.png differ
diff --git a/public/images/emoji/google/lion.png b/public/images/emoji/google/lion.png
index cccce723442..d8b4d7e2249 100644
Binary files a/public/images/emoji/google/lion.png and b/public/images/emoji/google/lion.png differ
diff --git a/public/images/emoji/google/lion_face.png b/public/images/emoji/google/lion_face.png
index cccce723442..d8b4d7e2249 100644
Binary files a/public/images/emoji/google/lion_face.png and b/public/images/emoji/google/lion_face.png differ
diff --git a/public/images/emoji/google/lips.png b/public/images/emoji/google/lips.png
index 193841abd43..93bbe027d50 100644
Binary files a/public/images/emoji/google/lips.png and b/public/images/emoji/google/lips.png differ
diff --git a/public/images/emoji/google/lipstick.png b/public/images/emoji/google/lipstick.png
index 57431fd4625..9e0b3713864 100644
Binary files a/public/images/emoji/google/lipstick.png and b/public/images/emoji/google/lipstick.png differ
diff --git a/public/images/emoji/google/lithuania.png b/public/images/emoji/google/lithuania.png
new file mode 100644
index 00000000000..41d85c692ba
Binary files /dev/null and b/public/images/emoji/google/lithuania.png differ
diff --git a/public/images/emoji/google/lizard.png b/public/images/emoji/google/lizard.png
new file mode 100644
index 00000000000..4932ac5dbbf
Binary files /dev/null and b/public/images/emoji/google/lizard.png differ
diff --git a/public/images/emoji/google/lock.png b/public/images/emoji/google/lock.png
index 50a713c2a55..07550237ed4 100644
Binary files a/public/images/emoji/google/lock.png and b/public/images/emoji/google/lock.png differ
diff --git a/public/images/emoji/google/lock_with_ink_pen.png b/public/images/emoji/google/lock_with_ink_pen.png
index c228e63bdb2..69b7d0cc636 100644
Binary files a/public/images/emoji/google/lock_with_ink_pen.png and b/public/images/emoji/google/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/google/lollipop.png b/public/images/emoji/google/lollipop.png
index fd51bc72c06..2d016c365e5 100644
Binary files a/public/images/emoji/google/lollipop.png and b/public/images/emoji/google/lollipop.png differ
diff --git a/public/images/emoji/google/loop.png b/public/images/emoji/google/loop.png
index eb371562dbd..633119f0fc3 100644
Binary files a/public/images/emoji/google/loop.png and b/public/images/emoji/google/loop.png differ
diff --git a/public/images/emoji/google/loud_sound.png b/public/images/emoji/google/loud_sound.png
index 1d5da87a4aa..dc3879609da 100644
Binary files a/public/images/emoji/google/loud_sound.png and b/public/images/emoji/google/loud_sound.png differ
diff --git a/public/images/emoji/google/loudspeaker.png b/public/images/emoji/google/loudspeaker.png
index 2702982fcfe..94402b054d0 100644
Binary files a/public/images/emoji/google/loudspeaker.png and b/public/images/emoji/google/loudspeaker.png differ
diff --git a/public/images/emoji/google/love_hotel.png b/public/images/emoji/google/love_hotel.png
index 3172fe6ca11..f56e26d106b 100644
Binary files a/public/images/emoji/google/love_hotel.png and b/public/images/emoji/google/love_hotel.png differ
diff --git a/public/images/emoji/google/love_letter.png b/public/images/emoji/google/love_letter.png
index d2d29b71069..198be2dce1d 100644
Binary files a/public/images/emoji/google/love_letter.png and b/public/images/emoji/google/love_letter.png differ
diff --git a/public/images/emoji/google/love_you_gesture.png b/public/images/emoji/google/love_you_gesture.png
new file mode 100644
index 00000000000..d1b677e4fe8
Binary files /dev/null and b/public/images/emoji/google/love_you_gesture.png differ
diff --git a/public/images/emoji/google/love_you_gesture/2.png b/public/images/emoji/google/love_you_gesture/2.png
new file mode 100644
index 00000000000..2731aa143f3
Binary files /dev/null and b/public/images/emoji/google/love_you_gesture/2.png differ
diff --git a/public/images/emoji/google/love_you_gesture/3.png b/public/images/emoji/google/love_you_gesture/3.png
new file mode 100644
index 00000000000..153ab728aff
Binary files /dev/null and b/public/images/emoji/google/love_you_gesture/3.png differ
diff --git a/public/images/emoji/google/love_you_gesture/4.png b/public/images/emoji/google/love_you_gesture/4.png
new file mode 100644
index 00000000000..4a7b85c9ff6
Binary files /dev/null and b/public/images/emoji/google/love_you_gesture/4.png differ
diff --git a/public/images/emoji/google/love_you_gesture/5.png b/public/images/emoji/google/love_you_gesture/5.png
new file mode 100644
index 00000000000..bac00236ea2
Binary files /dev/null and b/public/images/emoji/google/love_you_gesture/5.png differ
diff --git a/public/images/emoji/google/love_you_gesture/6.png b/public/images/emoji/google/love_you_gesture/6.png
new file mode 100644
index 00000000000..aac2741530e
Binary files /dev/null and b/public/images/emoji/google/love_you_gesture/6.png differ
diff --git a/public/images/emoji/google/low_brightness.png b/public/images/emoji/google/low_brightness.png
index 21d19226e1e..0a7d09ad2dc 100644
Binary files a/public/images/emoji/google/low_brightness.png and b/public/images/emoji/google/low_brightness.png differ
diff --git a/public/images/emoji/google/lower_left_ballpoint_pen.png b/public/images/emoji/google/lower_left_ballpoint_pen.png
index 11acae0cdd3..a67644b0ac7 100644
Binary files a/public/images/emoji/google/lower_left_ballpoint_pen.png and b/public/images/emoji/google/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/google/lower_left_crayon.png b/public/images/emoji/google/lower_left_crayon.png
index 0ef86da10fb..e82c0d2d5e6 100644
Binary files a/public/images/emoji/google/lower_left_crayon.png and b/public/images/emoji/google/lower_left_crayon.png differ
diff --git a/public/images/emoji/google/lower_left_fountain_pen.png b/public/images/emoji/google/lower_left_fountain_pen.png
index 4af057ce4ec..a06fcdc40e4 100644
Binary files a/public/images/emoji/google/lower_left_fountain_pen.png and b/public/images/emoji/google/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/google/lower_left_paintbrush.png b/public/images/emoji/google/lower_left_paintbrush.png
index 81b26f22fab..58697366466 100644
Binary files a/public/images/emoji/google/lower_left_paintbrush.png and b/public/images/emoji/google/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/google/luxembourg.png b/public/images/emoji/google/luxembourg.png
new file mode 100644
index 00000000000..d86b5c65bb2
Binary files /dev/null and b/public/images/emoji/google/luxembourg.png differ
diff --git a/public/images/emoji/google/lying_face.png b/public/images/emoji/google/lying_face.png
new file mode 100644
index 00000000000..aeb972bd265
Binary files /dev/null and b/public/images/emoji/google/lying_face.png differ
diff --git a/public/images/emoji/google/m.png b/public/images/emoji/google/m.png
index 6c7b443529a..7d37bedb9bf 100644
Binary files a/public/images/emoji/google/m.png and b/public/images/emoji/google/m.png differ
diff --git a/public/images/emoji/google/macau.png b/public/images/emoji/google/macau.png
new file mode 100644
index 00000000000..918444ff165
Binary files /dev/null and b/public/images/emoji/google/macau.png differ
diff --git a/public/images/emoji/google/macedonia.png b/public/images/emoji/google/macedonia.png
new file mode 100644
index 00000000000..68d7eeda312
Binary files /dev/null and b/public/images/emoji/google/macedonia.png differ
diff --git a/public/images/emoji/google/madagascar.png b/public/images/emoji/google/madagascar.png
new file mode 100644
index 00000000000..b166d103c70
Binary files /dev/null and b/public/images/emoji/google/madagascar.png differ
diff --git a/public/images/emoji/google/mag.png b/public/images/emoji/google/mag.png
index 3d58da8d6ed..009a8b29e7c 100644
Binary files a/public/images/emoji/google/mag.png and b/public/images/emoji/google/mag.png differ
diff --git a/public/images/emoji/google/mag_right.png b/public/images/emoji/google/mag_right.png
index 6217ffa8f1f..48158489f90 100644
Binary files a/public/images/emoji/google/mag_right.png and b/public/images/emoji/google/mag_right.png differ
diff --git a/public/images/emoji/google/mage.png b/public/images/emoji/google/mage.png
new file mode 100644
index 00000000000..95b77cab85f
Binary files /dev/null and b/public/images/emoji/google/mage.png differ
diff --git a/public/images/emoji/google/mage/2.png b/public/images/emoji/google/mage/2.png
new file mode 100644
index 00000000000..45f93bbf667
Binary files /dev/null and b/public/images/emoji/google/mage/2.png differ
diff --git a/public/images/emoji/google/mage/3.png b/public/images/emoji/google/mage/3.png
new file mode 100644
index 00000000000..11ad26c1204
Binary files /dev/null and b/public/images/emoji/google/mage/3.png differ
diff --git a/public/images/emoji/google/mage/4.png b/public/images/emoji/google/mage/4.png
new file mode 100644
index 00000000000..4af7b2eb6b0
Binary files /dev/null and b/public/images/emoji/google/mage/4.png differ
diff --git a/public/images/emoji/google/mage/5.png b/public/images/emoji/google/mage/5.png
new file mode 100644
index 00000000000..76ef339d1c7
Binary files /dev/null and b/public/images/emoji/google/mage/5.png differ
diff --git a/public/images/emoji/google/mage/6.png b/public/images/emoji/google/mage/6.png
new file mode 100644
index 00000000000..1563142f306
Binary files /dev/null and b/public/images/emoji/google/mage/6.png differ
diff --git a/public/images/emoji/google/mahjong.png b/public/images/emoji/google/mahjong.png
index e00e0879e2d..28e9b95f36a 100644
Binary files a/public/images/emoji/google/mahjong.png and b/public/images/emoji/google/mahjong.png differ
diff --git a/public/images/emoji/google/mailbox.png b/public/images/emoji/google/mailbox.png
index 3036e4fff35..5eaa0962304 100644
Binary files a/public/images/emoji/google/mailbox.png and b/public/images/emoji/google/mailbox.png differ
diff --git a/public/images/emoji/google/mailbox_closed.png b/public/images/emoji/google/mailbox_closed.png
index 2a9678b583b..6a9717aa1e9 100644
Binary files a/public/images/emoji/google/mailbox_closed.png and b/public/images/emoji/google/mailbox_closed.png differ
diff --git a/public/images/emoji/google/mailbox_with_mail.png b/public/images/emoji/google/mailbox_with_mail.png
index 6539904a2d3..f7ce167ec04 100644
Binary files a/public/images/emoji/google/mailbox_with_mail.png and b/public/images/emoji/google/mailbox_with_mail.png differ
diff --git a/public/images/emoji/google/mailbox_with_no_mail.png b/public/images/emoji/google/mailbox_with_no_mail.png
index d5fb100823b..d6a6a1c5349 100644
Binary files a/public/images/emoji/google/mailbox_with_no_mail.png and b/public/images/emoji/google/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/google/malawi.png b/public/images/emoji/google/malawi.png
new file mode 100644
index 00000000000..acc82bc5af6
Binary files /dev/null and b/public/images/emoji/google/malawi.png differ
diff --git a/public/images/emoji/google/malaysia.png b/public/images/emoji/google/malaysia.png
new file mode 100644
index 00000000000..2e693c11ebe
Binary files /dev/null and b/public/images/emoji/google/malaysia.png differ
diff --git a/public/images/emoji/google/maldives.png b/public/images/emoji/google/maldives.png
new file mode 100644
index 00000000000..99b18ac8d3d
Binary files /dev/null and b/public/images/emoji/google/maldives.png differ
diff --git a/public/images/emoji/google/male_couple_with_heart.png b/public/images/emoji/google/male_couple_with_heart.png
index ca94117982f..8c30736f98d 100644
Binary files a/public/images/emoji/google/male_couple_with_heart.png and b/public/images/emoji/google/male_couple_with_heart.png differ
diff --git a/public/images/emoji/google/male_couplekiss.png b/public/images/emoji/google/male_couplekiss.png
index b0c3a0b62e6..60aff93dd76 100644
Binary files a/public/images/emoji/google/male_couplekiss.png and b/public/images/emoji/google/male_couplekiss.png differ
diff --git a/public/images/emoji/google/male_detective.png b/public/images/emoji/google/male_detective.png
new file mode 100644
index 00000000000..13ef63b0aa6
Binary files /dev/null and b/public/images/emoji/google/male_detective.png differ
diff --git a/public/images/emoji/google/male_detective/2.png b/public/images/emoji/google/male_detective/2.png
new file mode 100644
index 00000000000..130424ff539
Binary files /dev/null and b/public/images/emoji/google/male_detective/2.png differ
diff --git a/public/images/emoji/google/male_detective/3.png b/public/images/emoji/google/male_detective/3.png
new file mode 100644
index 00000000000..6fb56a789c9
Binary files /dev/null and b/public/images/emoji/google/male_detective/3.png differ
diff --git a/public/images/emoji/google/male_detective/4.png b/public/images/emoji/google/male_detective/4.png
new file mode 100644
index 00000000000..c021157981c
Binary files /dev/null and b/public/images/emoji/google/male_detective/4.png differ
diff --git a/public/images/emoji/google/male_detective/5.png b/public/images/emoji/google/male_detective/5.png
new file mode 100644
index 00000000000..fcd34112328
Binary files /dev/null and b/public/images/emoji/google/male_detective/5.png differ
diff --git a/public/images/emoji/google/male_detective/6.png b/public/images/emoji/google/male_detective/6.png
new file mode 100644
index 00000000000..e4b939c908b
Binary files /dev/null and b/public/images/emoji/google/male_detective/6.png differ
diff --git a/public/images/emoji/google/mali.png b/public/images/emoji/google/mali.png
new file mode 100644
index 00000000000..8e30b34eb97
Binary files /dev/null and b/public/images/emoji/google/mali.png differ
diff --git a/public/images/emoji/google/malta.png b/public/images/emoji/google/malta.png
new file mode 100644
index 00000000000..dc1cf128cab
Binary files /dev/null and b/public/images/emoji/google/malta.png differ
diff --git a/public/images/emoji/google/man.png b/public/images/emoji/google/man.png
index f2d68401e86..419b9c8365c 100644
Binary files a/public/images/emoji/google/man.png and b/public/images/emoji/google/man.png differ
diff --git a/public/images/emoji/google/man/2.png b/public/images/emoji/google/man/2.png
new file mode 100644
index 00000000000..91680466036
Binary files /dev/null and b/public/images/emoji/google/man/2.png differ
diff --git a/public/images/emoji/google/man/3.png b/public/images/emoji/google/man/3.png
new file mode 100644
index 00000000000..c07120932fd
Binary files /dev/null and b/public/images/emoji/google/man/3.png differ
diff --git a/public/images/emoji/google/man/4.png b/public/images/emoji/google/man/4.png
new file mode 100644
index 00000000000..d8174a6ff05
Binary files /dev/null and b/public/images/emoji/google/man/4.png differ
diff --git a/public/images/emoji/google/man/5.png b/public/images/emoji/google/man/5.png
new file mode 100644
index 00000000000..b21c4b7b442
Binary files /dev/null and b/public/images/emoji/google/man/5.png differ
diff --git a/public/images/emoji/google/man/6.png b/public/images/emoji/google/man/6.png
new file mode 100644
index 00000000000..f8c77a50ea7
Binary files /dev/null and b/public/images/emoji/google/man/6.png differ
diff --git a/public/images/emoji/google/man_artist.png b/public/images/emoji/google/man_artist.png
new file mode 100644
index 00000000000..79ed156b477
Binary files /dev/null and b/public/images/emoji/google/man_artist.png differ
diff --git a/public/images/emoji/google/man_artist/2.png b/public/images/emoji/google/man_artist/2.png
new file mode 100644
index 00000000000..7a1da707a07
Binary files /dev/null and b/public/images/emoji/google/man_artist/2.png differ
diff --git a/public/images/emoji/google/man_artist/3.png b/public/images/emoji/google/man_artist/3.png
new file mode 100644
index 00000000000..aa84048bbd0
Binary files /dev/null and b/public/images/emoji/google/man_artist/3.png differ
diff --git a/public/images/emoji/google/man_artist/4.png b/public/images/emoji/google/man_artist/4.png
new file mode 100644
index 00000000000..fa5cf0518ed
Binary files /dev/null and b/public/images/emoji/google/man_artist/4.png differ
diff --git a/public/images/emoji/google/man_artist/5.png b/public/images/emoji/google/man_artist/5.png
new file mode 100644
index 00000000000..6614041b7e0
Binary files /dev/null and b/public/images/emoji/google/man_artist/5.png differ
diff --git a/public/images/emoji/google/man_artist/6.png b/public/images/emoji/google/man_artist/6.png
new file mode 100644
index 00000000000..f03ed789670
Binary files /dev/null and b/public/images/emoji/google/man_artist/6.png differ
diff --git a/public/images/emoji/google/man_astronaut.png b/public/images/emoji/google/man_astronaut.png
new file mode 100644
index 00000000000..7d4997a28b5
Binary files /dev/null and b/public/images/emoji/google/man_astronaut.png differ
diff --git a/public/images/emoji/google/man_astronaut/2.png b/public/images/emoji/google/man_astronaut/2.png
new file mode 100644
index 00000000000..b43a058475e
Binary files /dev/null and b/public/images/emoji/google/man_astronaut/2.png differ
diff --git a/public/images/emoji/google/man_astronaut/3.png b/public/images/emoji/google/man_astronaut/3.png
new file mode 100644
index 00000000000..95b1bd81499
Binary files /dev/null and b/public/images/emoji/google/man_astronaut/3.png differ
diff --git a/public/images/emoji/google/man_astronaut/4.png b/public/images/emoji/google/man_astronaut/4.png
new file mode 100644
index 00000000000..2ed638ebb50
Binary files /dev/null and b/public/images/emoji/google/man_astronaut/4.png differ
diff --git a/public/images/emoji/google/man_astronaut/5.png b/public/images/emoji/google/man_astronaut/5.png
new file mode 100644
index 00000000000..72d62f9a047
Binary files /dev/null and b/public/images/emoji/google/man_astronaut/5.png differ
diff --git a/public/images/emoji/google/man_astronaut/6.png b/public/images/emoji/google/man_astronaut/6.png
new file mode 100644
index 00000000000..da9e12ed5d7
Binary files /dev/null and b/public/images/emoji/google/man_astronaut/6.png differ
diff --git a/public/images/emoji/google/man_cartwheeling.png b/public/images/emoji/google/man_cartwheeling.png
new file mode 100644
index 00000000000..dbc6a774277
Binary files /dev/null and b/public/images/emoji/google/man_cartwheeling.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/2.png b/public/images/emoji/google/man_cartwheeling/2.png
new file mode 100644
index 00000000000..46199977e2a
Binary files /dev/null and b/public/images/emoji/google/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/3.png b/public/images/emoji/google/man_cartwheeling/3.png
new file mode 100644
index 00000000000..66d5a06d751
Binary files /dev/null and b/public/images/emoji/google/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/4.png b/public/images/emoji/google/man_cartwheeling/4.png
new file mode 100644
index 00000000000..1a209c3ec2d
Binary files /dev/null and b/public/images/emoji/google/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/5.png b/public/images/emoji/google/man_cartwheeling/5.png
new file mode 100644
index 00000000000..433b97cc8d0
Binary files /dev/null and b/public/images/emoji/google/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/google/man_cartwheeling/6.png b/public/images/emoji/google/man_cartwheeling/6.png
new file mode 100644
index 00000000000..518d6d31b7e
Binary files /dev/null and b/public/images/emoji/google/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/google/man_cook.png b/public/images/emoji/google/man_cook.png
new file mode 100644
index 00000000000..da49a409855
Binary files /dev/null and b/public/images/emoji/google/man_cook.png differ
diff --git a/public/images/emoji/google/man_cook/2.png b/public/images/emoji/google/man_cook/2.png
new file mode 100644
index 00000000000..05d57fdb538
Binary files /dev/null and b/public/images/emoji/google/man_cook/2.png differ
diff --git a/public/images/emoji/google/man_cook/3.png b/public/images/emoji/google/man_cook/3.png
new file mode 100644
index 00000000000..4c279c0b172
Binary files /dev/null and b/public/images/emoji/google/man_cook/3.png differ
diff --git a/public/images/emoji/google/man_cook/4.png b/public/images/emoji/google/man_cook/4.png
new file mode 100644
index 00000000000..eabdead72a3
Binary files /dev/null and b/public/images/emoji/google/man_cook/4.png differ
diff --git a/public/images/emoji/google/man_cook/5.png b/public/images/emoji/google/man_cook/5.png
new file mode 100644
index 00000000000..586449d287d
Binary files /dev/null and b/public/images/emoji/google/man_cook/5.png differ
diff --git a/public/images/emoji/google/man_cook/6.png b/public/images/emoji/google/man_cook/6.png
new file mode 100644
index 00000000000..50b95d4b16d
Binary files /dev/null and b/public/images/emoji/google/man_cook/6.png differ
diff --git a/public/images/emoji/google/man_dancing.png b/public/images/emoji/google/man_dancing.png
new file mode 100644
index 00000000000..7c06dae7815
Binary files /dev/null and b/public/images/emoji/google/man_dancing.png differ
diff --git a/public/images/emoji/google/man_dancing/2.png b/public/images/emoji/google/man_dancing/2.png
new file mode 100644
index 00000000000..dfcc4522e16
Binary files /dev/null and b/public/images/emoji/google/man_dancing/2.png differ
diff --git a/public/images/emoji/google/man_dancing/3.png b/public/images/emoji/google/man_dancing/3.png
new file mode 100644
index 00000000000..671d89d6f44
Binary files /dev/null and b/public/images/emoji/google/man_dancing/3.png differ
diff --git a/public/images/emoji/google/man_dancing/4.png b/public/images/emoji/google/man_dancing/4.png
new file mode 100644
index 00000000000..a5575df5310
Binary files /dev/null and b/public/images/emoji/google/man_dancing/4.png differ
diff --git a/public/images/emoji/google/man_dancing/5.png b/public/images/emoji/google/man_dancing/5.png
new file mode 100644
index 00000000000..b33d213a826
Binary files /dev/null and b/public/images/emoji/google/man_dancing/5.png differ
diff --git a/public/images/emoji/google/man_dancing/6.png b/public/images/emoji/google/man_dancing/6.png
new file mode 100644
index 00000000000..faed7a09855
Binary files /dev/null and b/public/images/emoji/google/man_dancing/6.png differ
diff --git a/public/images/emoji/google/man_facepalming.png b/public/images/emoji/google/man_facepalming.png
new file mode 100644
index 00000000000..545a28a2ab8
Binary files /dev/null and b/public/images/emoji/google/man_facepalming.png differ
diff --git a/public/images/emoji/google/man_facepalming/2.png b/public/images/emoji/google/man_facepalming/2.png
new file mode 100644
index 00000000000..b4c1b9189f4
Binary files /dev/null and b/public/images/emoji/google/man_facepalming/2.png differ
diff --git a/public/images/emoji/google/man_facepalming/3.png b/public/images/emoji/google/man_facepalming/3.png
new file mode 100644
index 00000000000..34678c776b1
Binary files /dev/null and b/public/images/emoji/google/man_facepalming/3.png differ
diff --git a/public/images/emoji/google/man_facepalming/4.png b/public/images/emoji/google/man_facepalming/4.png
new file mode 100644
index 00000000000..a951cc15b77
Binary files /dev/null and b/public/images/emoji/google/man_facepalming/4.png differ
diff --git a/public/images/emoji/google/man_facepalming/5.png b/public/images/emoji/google/man_facepalming/5.png
new file mode 100644
index 00000000000..54e377054f9
Binary files /dev/null and b/public/images/emoji/google/man_facepalming/5.png differ
diff --git a/public/images/emoji/google/man_facepalming/6.png b/public/images/emoji/google/man_facepalming/6.png
new file mode 100644
index 00000000000..5a432ab436f
Binary files /dev/null and b/public/images/emoji/google/man_facepalming/6.png differ
diff --git a/public/images/emoji/google/man_factory_worker.png b/public/images/emoji/google/man_factory_worker.png
new file mode 100644
index 00000000000..b85f161ad43
Binary files /dev/null and b/public/images/emoji/google/man_factory_worker.png differ
diff --git a/public/images/emoji/google/man_factory_worker/2.png b/public/images/emoji/google/man_factory_worker/2.png
new file mode 100644
index 00000000000..9bf74715106
Binary files /dev/null and b/public/images/emoji/google/man_factory_worker/2.png differ
diff --git a/public/images/emoji/google/man_factory_worker/3.png b/public/images/emoji/google/man_factory_worker/3.png
new file mode 100644
index 00000000000..438a21a2911
Binary files /dev/null and b/public/images/emoji/google/man_factory_worker/3.png differ
diff --git a/public/images/emoji/google/man_factory_worker/4.png b/public/images/emoji/google/man_factory_worker/4.png
new file mode 100644
index 00000000000..2a04997fb2f
Binary files /dev/null and b/public/images/emoji/google/man_factory_worker/4.png differ
diff --git a/public/images/emoji/google/man_factory_worker/5.png b/public/images/emoji/google/man_factory_worker/5.png
new file mode 100644
index 00000000000..864292c4beb
Binary files /dev/null and b/public/images/emoji/google/man_factory_worker/5.png differ
diff --git a/public/images/emoji/google/man_factory_worker/6.png b/public/images/emoji/google/man_factory_worker/6.png
new file mode 100644
index 00000000000..6b517faebc6
Binary files /dev/null and b/public/images/emoji/google/man_factory_worker/6.png differ
diff --git a/public/images/emoji/google/man_farmer.png b/public/images/emoji/google/man_farmer.png
new file mode 100644
index 00000000000..58f7f37810f
Binary files /dev/null and b/public/images/emoji/google/man_farmer.png differ
diff --git a/public/images/emoji/google/man_farmer/2.png b/public/images/emoji/google/man_farmer/2.png
new file mode 100644
index 00000000000..6e581d42d27
Binary files /dev/null and b/public/images/emoji/google/man_farmer/2.png differ
diff --git a/public/images/emoji/google/man_farmer/3.png b/public/images/emoji/google/man_farmer/3.png
new file mode 100644
index 00000000000..a50fbcc5787
Binary files /dev/null and b/public/images/emoji/google/man_farmer/3.png differ
diff --git a/public/images/emoji/google/man_farmer/4.png b/public/images/emoji/google/man_farmer/4.png
new file mode 100644
index 00000000000..3a9d3709411
Binary files /dev/null and b/public/images/emoji/google/man_farmer/4.png differ
diff --git a/public/images/emoji/google/man_farmer/5.png b/public/images/emoji/google/man_farmer/5.png
new file mode 100644
index 00000000000..5e9190d0e57
Binary files /dev/null and b/public/images/emoji/google/man_farmer/5.png differ
diff --git a/public/images/emoji/google/man_farmer/6.png b/public/images/emoji/google/man_farmer/6.png
new file mode 100644
index 00000000000..20d193dbbac
Binary files /dev/null and b/public/images/emoji/google/man_farmer/6.png differ
diff --git a/public/images/emoji/google/man_firefighter.png b/public/images/emoji/google/man_firefighter.png
new file mode 100644
index 00000000000..3949db60f68
Binary files /dev/null and b/public/images/emoji/google/man_firefighter.png differ
diff --git a/public/images/emoji/google/man_firefighter/2.png b/public/images/emoji/google/man_firefighter/2.png
new file mode 100644
index 00000000000..658b3422526
Binary files /dev/null and b/public/images/emoji/google/man_firefighter/2.png differ
diff --git a/public/images/emoji/google/man_firefighter/3.png b/public/images/emoji/google/man_firefighter/3.png
new file mode 100644
index 00000000000..178231b6b3f
Binary files /dev/null and b/public/images/emoji/google/man_firefighter/3.png differ
diff --git a/public/images/emoji/google/man_firefighter/4.png b/public/images/emoji/google/man_firefighter/4.png
new file mode 100644
index 00000000000..df7e09de2a9
Binary files /dev/null and b/public/images/emoji/google/man_firefighter/4.png differ
diff --git a/public/images/emoji/google/man_firefighter/5.png b/public/images/emoji/google/man_firefighter/5.png
new file mode 100644
index 00000000000..4dece2f32b9
Binary files /dev/null and b/public/images/emoji/google/man_firefighter/5.png differ
diff --git a/public/images/emoji/google/man_firefighter/6.png b/public/images/emoji/google/man_firefighter/6.png
new file mode 100644
index 00000000000..05ec509ffcd
Binary files /dev/null and b/public/images/emoji/google/man_firefighter/6.png differ
diff --git a/public/images/emoji/google/man_health_worker.png b/public/images/emoji/google/man_health_worker.png
new file mode 100644
index 00000000000..1e8e92d26cf
Binary files /dev/null and b/public/images/emoji/google/man_health_worker.png differ
diff --git a/public/images/emoji/google/man_health_worker/2.png b/public/images/emoji/google/man_health_worker/2.png
new file mode 100644
index 00000000000..11b275b3bdb
Binary files /dev/null and b/public/images/emoji/google/man_health_worker/2.png differ
diff --git a/public/images/emoji/google/man_health_worker/3.png b/public/images/emoji/google/man_health_worker/3.png
new file mode 100644
index 00000000000..9f066054524
Binary files /dev/null and b/public/images/emoji/google/man_health_worker/3.png differ
diff --git a/public/images/emoji/google/man_health_worker/4.png b/public/images/emoji/google/man_health_worker/4.png
new file mode 100644
index 00000000000..48c60e1a122
Binary files /dev/null and b/public/images/emoji/google/man_health_worker/4.png differ
diff --git a/public/images/emoji/google/man_health_worker/5.png b/public/images/emoji/google/man_health_worker/5.png
new file mode 100644
index 00000000000..b289707381b
Binary files /dev/null and b/public/images/emoji/google/man_health_worker/5.png differ
diff --git a/public/images/emoji/google/man_health_worker/6.png b/public/images/emoji/google/man_health_worker/6.png
new file mode 100644
index 00000000000..92f231e3fc6
Binary files /dev/null and b/public/images/emoji/google/man_health_worker/6.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating.png b/public/images/emoji/google/man_in_business_suit_levitating.png
index aafbbc2d802..88918f97b31 100644
Binary files a/public/images/emoji/google/man_in_business_suit_levitating.png and b/public/images/emoji/google/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/2.png b/public/images/emoji/google/man_in_business_suit_levitating/2.png
new file mode 100644
index 00000000000..ddeda2a43bb
Binary files /dev/null and b/public/images/emoji/google/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/3.png b/public/images/emoji/google/man_in_business_suit_levitating/3.png
new file mode 100644
index 00000000000..e62d08a901f
Binary files /dev/null and b/public/images/emoji/google/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/4.png b/public/images/emoji/google/man_in_business_suit_levitating/4.png
new file mode 100644
index 00000000000..27012dfbe98
Binary files /dev/null and b/public/images/emoji/google/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/5.png b/public/images/emoji/google/man_in_business_suit_levitating/5.png
new file mode 100644
index 00000000000..c8863f58335
Binary files /dev/null and b/public/images/emoji/google/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/google/man_in_business_suit_levitating/6.png b/public/images/emoji/google/man_in_business_suit_levitating/6.png
new file mode 100644
index 00000000000..62e5e00578f
Binary files /dev/null and b/public/images/emoji/google/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo.png b/public/images/emoji/google/man_in_tuxedo.png
new file mode 100644
index 00000000000..5b96a66a351
Binary files /dev/null and b/public/images/emoji/google/man_in_tuxedo.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/2.png b/public/images/emoji/google/man_in_tuxedo/2.png
new file mode 100644
index 00000000000..88cc2266e2f
Binary files /dev/null and b/public/images/emoji/google/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/3.png b/public/images/emoji/google/man_in_tuxedo/3.png
new file mode 100644
index 00000000000..82a068f725e
Binary files /dev/null and b/public/images/emoji/google/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/4.png b/public/images/emoji/google/man_in_tuxedo/4.png
new file mode 100644
index 00000000000..8572971df08
Binary files /dev/null and b/public/images/emoji/google/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/5.png b/public/images/emoji/google/man_in_tuxedo/5.png
new file mode 100644
index 00000000000..1122dfdd0fe
Binary files /dev/null and b/public/images/emoji/google/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/google/man_in_tuxedo/6.png b/public/images/emoji/google/man_in_tuxedo/6.png
new file mode 100644
index 00000000000..6c1febff298
Binary files /dev/null and b/public/images/emoji/google/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/google/man_judge.png b/public/images/emoji/google/man_judge.png
new file mode 100644
index 00000000000..b33b3f9bea5
Binary files /dev/null and b/public/images/emoji/google/man_judge.png differ
diff --git a/public/images/emoji/google/man_judge/2.png b/public/images/emoji/google/man_judge/2.png
new file mode 100644
index 00000000000..ca912638464
Binary files /dev/null and b/public/images/emoji/google/man_judge/2.png differ
diff --git a/public/images/emoji/google/man_judge/3.png b/public/images/emoji/google/man_judge/3.png
new file mode 100644
index 00000000000..e0161ccba91
Binary files /dev/null and b/public/images/emoji/google/man_judge/3.png differ
diff --git a/public/images/emoji/google/man_judge/4.png b/public/images/emoji/google/man_judge/4.png
new file mode 100644
index 00000000000..843abe2fa76
Binary files /dev/null and b/public/images/emoji/google/man_judge/4.png differ
diff --git a/public/images/emoji/google/man_judge/5.png b/public/images/emoji/google/man_judge/5.png
new file mode 100644
index 00000000000..06337e0c95e
Binary files /dev/null and b/public/images/emoji/google/man_judge/5.png differ
diff --git a/public/images/emoji/google/man_judge/6.png b/public/images/emoji/google/man_judge/6.png
new file mode 100644
index 00000000000..1368c778314
Binary files /dev/null and b/public/images/emoji/google/man_judge/6.png differ
diff --git a/public/images/emoji/google/man_juggling.png b/public/images/emoji/google/man_juggling.png
new file mode 100644
index 00000000000..0806890aec4
Binary files /dev/null and b/public/images/emoji/google/man_juggling.png differ
diff --git a/public/images/emoji/google/man_juggling/2.png b/public/images/emoji/google/man_juggling/2.png
new file mode 100644
index 00000000000..284272fad79
Binary files /dev/null and b/public/images/emoji/google/man_juggling/2.png differ
diff --git a/public/images/emoji/google/man_juggling/3.png b/public/images/emoji/google/man_juggling/3.png
new file mode 100644
index 00000000000..97f9a1b02df
Binary files /dev/null and b/public/images/emoji/google/man_juggling/3.png differ
diff --git a/public/images/emoji/google/man_juggling/4.png b/public/images/emoji/google/man_juggling/4.png
new file mode 100644
index 00000000000..27743f990f9
Binary files /dev/null and b/public/images/emoji/google/man_juggling/4.png differ
diff --git a/public/images/emoji/google/man_juggling/5.png b/public/images/emoji/google/man_juggling/5.png
new file mode 100644
index 00000000000..9d92c8162bc
Binary files /dev/null and b/public/images/emoji/google/man_juggling/5.png differ
diff --git a/public/images/emoji/google/man_juggling/6.png b/public/images/emoji/google/man_juggling/6.png
new file mode 100644
index 00000000000..f58c338c0c3
Binary files /dev/null and b/public/images/emoji/google/man_juggling/6.png differ
diff --git a/public/images/emoji/google/man_mechanic.png b/public/images/emoji/google/man_mechanic.png
new file mode 100644
index 00000000000..25b420bee0c
Binary files /dev/null and b/public/images/emoji/google/man_mechanic.png differ
diff --git a/public/images/emoji/google/man_mechanic/2.png b/public/images/emoji/google/man_mechanic/2.png
new file mode 100644
index 00000000000..6a09785396f
Binary files /dev/null and b/public/images/emoji/google/man_mechanic/2.png differ
diff --git a/public/images/emoji/google/man_mechanic/3.png b/public/images/emoji/google/man_mechanic/3.png
new file mode 100644
index 00000000000..a1301ff2312
Binary files /dev/null and b/public/images/emoji/google/man_mechanic/3.png differ
diff --git a/public/images/emoji/google/man_mechanic/4.png b/public/images/emoji/google/man_mechanic/4.png
new file mode 100644
index 00000000000..1bab61fb6ee
Binary files /dev/null and b/public/images/emoji/google/man_mechanic/4.png differ
diff --git a/public/images/emoji/google/man_mechanic/5.png b/public/images/emoji/google/man_mechanic/5.png
new file mode 100644
index 00000000000..b345797f35d
Binary files /dev/null and b/public/images/emoji/google/man_mechanic/5.png differ
diff --git a/public/images/emoji/google/man_mechanic/6.png b/public/images/emoji/google/man_mechanic/6.png
new file mode 100644
index 00000000000..a66ccdb6b47
Binary files /dev/null and b/public/images/emoji/google/man_mechanic/6.png differ
diff --git a/public/images/emoji/google/man_office_worker.png b/public/images/emoji/google/man_office_worker.png
new file mode 100644
index 00000000000..9ef011e6e07
Binary files /dev/null and b/public/images/emoji/google/man_office_worker.png differ
diff --git a/public/images/emoji/google/man_office_worker/2.png b/public/images/emoji/google/man_office_worker/2.png
new file mode 100644
index 00000000000..b555f03d963
Binary files /dev/null and b/public/images/emoji/google/man_office_worker/2.png differ
diff --git a/public/images/emoji/google/man_office_worker/3.png b/public/images/emoji/google/man_office_worker/3.png
new file mode 100644
index 00000000000..8b709a73bb7
Binary files /dev/null and b/public/images/emoji/google/man_office_worker/3.png differ
diff --git a/public/images/emoji/google/man_office_worker/4.png b/public/images/emoji/google/man_office_worker/4.png
new file mode 100644
index 00000000000..31948b5cdfe
Binary files /dev/null and b/public/images/emoji/google/man_office_worker/4.png differ
diff --git a/public/images/emoji/google/man_office_worker/5.png b/public/images/emoji/google/man_office_worker/5.png
new file mode 100644
index 00000000000..d4911d564d1
Binary files /dev/null and b/public/images/emoji/google/man_office_worker/5.png differ
diff --git a/public/images/emoji/google/man_office_worker/6.png b/public/images/emoji/google/man_office_worker/6.png
new file mode 100644
index 00000000000..a6d7cbc948c
Binary files /dev/null and b/public/images/emoji/google/man_office_worker/6.png differ
diff --git a/public/images/emoji/google/man_pilot.png b/public/images/emoji/google/man_pilot.png
new file mode 100644
index 00000000000..0c9e600e5d8
Binary files /dev/null and b/public/images/emoji/google/man_pilot.png differ
diff --git a/public/images/emoji/google/man_pilot/2.png b/public/images/emoji/google/man_pilot/2.png
new file mode 100644
index 00000000000..a6ec1f2266a
Binary files /dev/null and b/public/images/emoji/google/man_pilot/2.png differ
diff --git a/public/images/emoji/google/man_pilot/3.png b/public/images/emoji/google/man_pilot/3.png
new file mode 100644
index 00000000000..3679a9a1d41
Binary files /dev/null and b/public/images/emoji/google/man_pilot/3.png differ
diff --git a/public/images/emoji/google/man_pilot/4.png b/public/images/emoji/google/man_pilot/4.png
new file mode 100644
index 00000000000..31bab226b54
Binary files /dev/null and b/public/images/emoji/google/man_pilot/4.png differ
diff --git a/public/images/emoji/google/man_pilot/5.png b/public/images/emoji/google/man_pilot/5.png
new file mode 100644
index 00000000000..4b4b8224950
Binary files /dev/null and b/public/images/emoji/google/man_pilot/5.png differ
diff --git a/public/images/emoji/google/man_pilot/6.png b/public/images/emoji/google/man_pilot/6.png
new file mode 100644
index 00000000000..5c6a33a8820
Binary files /dev/null and b/public/images/emoji/google/man_pilot/6.png differ
diff --git a/public/images/emoji/google/man_playing_handball.png b/public/images/emoji/google/man_playing_handball.png
new file mode 100644
index 00000000000..2bfaab08959
Binary files /dev/null and b/public/images/emoji/google/man_playing_handball.png differ
diff --git a/public/images/emoji/google/man_playing_handball/2.png b/public/images/emoji/google/man_playing_handball/2.png
new file mode 100644
index 00000000000..234808c8d37
Binary files /dev/null and b/public/images/emoji/google/man_playing_handball/2.png differ
diff --git a/public/images/emoji/google/man_playing_handball/3.png b/public/images/emoji/google/man_playing_handball/3.png
new file mode 100644
index 00000000000..d9b0951d087
Binary files /dev/null and b/public/images/emoji/google/man_playing_handball/3.png differ
diff --git a/public/images/emoji/google/man_playing_handball/4.png b/public/images/emoji/google/man_playing_handball/4.png
new file mode 100644
index 00000000000..82d7d77964c
Binary files /dev/null and b/public/images/emoji/google/man_playing_handball/4.png differ
diff --git a/public/images/emoji/google/man_playing_handball/5.png b/public/images/emoji/google/man_playing_handball/5.png
new file mode 100644
index 00000000000..f6d4dc625c0
Binary files /dev/null and b/public/images/emoji/google/man_playing_handball/5.png differ
diff --git a/public/images/emoji/google/man_playing_handball/6.png b/public/images/emoji/google/man_playing_handball/6.png
new file mode 100644
index 00000000000..cbf4e936c49
Binary files /dev/null and b/public/images/emoji/google/man_playing_handball/6.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo.png b/public/images/emoji/google/man_playing_water_polo.png
new file mode 100644
index 00000000000..92f9700c12c
Binary files /dev/null and b/public/images/emoji/google/man_playing_water_polo.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/2.png b/public/images/emoji/google/man_playing_water_polo/2.png
new file mode 100644
index 00000000000..ce100a54c59
Binary files /dev/null and b/public/images/emoji/google/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/3.png b/public/images/emoji/google/man_playing_water_polo/3.png
new file mode 100644
index 00000000000..e40d5a9132e
Binary files /dev/null and b/public/images/emoji/google/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/4.png b/public/images/emoji/google/man_playing_water_polo/4.png
new file mode 100644
index 00000000000..7cfed1d0c93
Binary files /dev/null and b/public/images/emoji/google/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/5.png b/public/images/emoji/google/man_playing_water_polo/5.png
new file mode 100644
index 00000000000..24419842aac
Binary files /dev/null and b/public/images/emoji/google/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/google/man_playing_water_polo/6.png b/public/images/emoji/google/man_playing_water_polo/6.png
new file mode 100644
index 00000000000..e8ca7705a54
Binary files /dev/null and b/public/images/emoji/google/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/google/man_scientist.png b/public/images/emoji/google/man_scientist.png
new file mode 100644
index 00000000000..cda779ea51c
Binary files /dev/null and b/public/images/emoji/google/man_scientist.png differ
diff --git a/public/images/emoji/google/man_scientist/2.png b/public/images/emoji/google/man_scientist/2.png
new file mode 100644
index 00000000000..40f51c3c139
Binary files /dev/null and b/public/images/emoji/google/man_scientist/2.png differ
diff --git a/public/images/emoji/google/man_scientist/3.png b/public/images/emoji/google/man_scientist/3.png
new file mode 100644
index 00000000000..9fbac46c1b9
Binary files /dev/null and b/public/images/emoji/google/man_scientist/3.png differ
diff --git a/public/images/emoji/google/man_scientist/4.png b/public/images/emoji/google/man_scientist/4.png
new file mode 100644
index 00000000000..f122058b2df
Binary files /dev/null and b/public/images/emoji/google/man_scientist/4.png differ
diff --git a/public/images/emoji/google/man_scientist/5.png b/public/images/emoji/google/man_scientist/5.png
new file mode 100644
index 00000000000..005259ae05e
Binary files /dev/null and b/public/images/emoji/google/man_scientist/5.png differ
diff --git a/public/images/emoji/google/man_scientist/6.png b/public/images/emoji/google/man_scientist/6.png
new file mode 100644
index 00000000000..20cba10600e
Binary files /dev/null and b/public/images/emoji/google/man_scientist/6.png differ
diff --git a/public/images/emoji/google/man_shrugging.png b/public/images/emoji/google/man_shrugging.png
new file mode 100644
index 00000000000..1085867c73b
Binary files /dev/null and b/public/images/emoji/google/man_shrugging.png differ
diff --git a/public/images/emoji/google/man_shrugging/2.png b/public/images/emoji/google/man_shrugging/2.png
new file mode 100644
index 00000000000..79f62f05374
Binary files /dev/null and b/public/images/emoji/google/man_shrugging/2.png differ
diff --git a/public/images/emoji/google/man_shrugging/3.png b/public/images/emoji/google/man_shrugging/3.png
new file mode 100644
index 00000000000..4b2cf918290
Binary files /dev/null and b/public/images/emoji/google/man_shrugging/3.png differ
diff --git a/public/images/emoji/google/man_shrugging/4.png b/public/images/emoji/google/man_shrugging/4.png
new file mode 100644
index 00000000000..2fc5dec156a
Binary files /dev/null and b/public/images/emoji/google/man_shrugging/4.png differ
diff --git a/public/images/emoji/google/man_shrugging/5.png b/public/images/emoji/google/man_shrugging/5.png
new file mode 100644
index 00000000000..e333c6e8258
Binary files /dev/null and b/public/images/emoji/google/man_shrugging/5.png differ
diff --git a/public/images/emoji/google/man_shrugging/6.png b/public/images/emoji/google/man_shrugging/6.png
new file mode 100644
index 00000000000..80de645fd50
Binary files /dev/null and b/public/images/emoji/google/man_shrugging/6.png differ
diff --git a/public/images/emoji/google/man_singer.png b/public/images/emoji/google/man_singer.png
new file mode 100644
index 00000000000..b75730020a8
Binary files /dev/null and b/public/images/emoji/google/man_singer.png differ
diff --git a/public/images/emoji/google/man_singer/2.png b/public/images/emoji/google/man_singer/2.png
new file mode 100644
index 00000000000..f3615c790f8
Binary files /dev/null and b/public/images/emoji/google/man_singer/2.png differ
diff --git a/public/images/emoji/google/man_singer/3.png b/public/images/emoji/google/man_singer/3.png
new file mode 100644
index 00000000000..4a87204dd32
Binary files /dev/null and b/public/images/emoji/google/man_singer/3.png differ
diff --git a/public/images/emoji/google/man_singer/4.png b/public/images/emoji/google/man_singer/4.png
new file mode 100644
index 00000000000..503e7212956
Binary files /dev/null and b/public/images/emoji/google/man_singer/4.png differ
diff --git a/public/images/emoji/google/man_singer/5.png b/public/images/emoji/google/man_singer/5.png
new file mode 100644
index 00000000000..8e27920ade0
Binary files /dev/null and b/public/images/emoji/google/man_singer/5.png differ
diff --git a/public/images/emoji/google/man_singer/6.png b/public/images/emoji/google/man_singer/6.png
new file mode 100644
index 00000000000..98b7b97e2db
Binary files /dev/null and b/public/images/emoji/google/man_singer/6.png differ
diff --git a/public/images/emoji/google/man_student.png b/public/images/emoji/google/man_student.png
new file mode 100644
index 00000000000..ce6609832a4
Binary files /dev/null and b/public/images/emoji/google/man_student.png differ
diff --git a/public/images/emoji/google/man_student/2.png b/public/images/emoji/google/man_student/2.png
new file mode 100644
index 00000000000..510bbd28578
Binary files /dev/null and b/public/images/emoji/google/man_student/2.png differ
diff --git a/public/images/emoji/google/man_student/3.png b/public/images/emoji/google/man_student/3.png
new file mode 100644
index 00000000000..f3473301ba6
Binary files /dev/null and b/public/images/emoji/google/man_student/3.png differ
diff --git a/public/images/emoji/google/man_student/4.png b/public/images/emoji/google/man_student/4.png
new file mode 100644
index 00000000000..0e4c8a1eb68
Binary files /dev/null and b/public/images/emoji/google/man_student/4.png differ
diff --git a/public/images/emoji/google/man_student/5.png b/public/images/emoji/google/man_student/5.png
new file mode 100644
index 00000000000..3c116251129
Binary files /dev/null and b/public/images/emoji/google/man_student/5.png differ
diff --git a/public/images/emoji/google/man_student/6.png b/public/images/emoji/google/man_student/6.png
new file mode 100644
index 00000000000..287b380aa95
Binary files /dev/null and b/public/images/emoji/google/man_student/6.png differ
diff --git a/public/images/emoji/google/man_teacher.png b/public/images/emoji/google/man_teacher.png
new file mode 100644
index 00000000000..16762fdece5
Binary files /dev/null and b/public/images/emoji/google/man_teacher.png differ
diff --git a/public/images/emoji/google/man_teacher/2.png b/public/images/emoji/google/man_teacher/2.png
new file mode 100644
index 00000000000..d9212996f05
Binary files /dev/null and b/public/images/emoji/google/man_teacher/2.png differ
diff --git a/public/images/emoji/google/man_teacher/3.png b/public/images/emoji/google/man_teacher/3.png
new file mode 100644
index 00000000000..cc2a7d242fa
Binary files /dev/null and b/public/images/emoji/google/man_teacher/3.png differ
diff --git a/public/images/emoji/google/man_teacher/4.png b/public/images/emoji/google/man_teacher/4.png
new file mode 100644
index 00000000000..7099b3286ae
Binary files /dev/null and b/public/images/emoji/google/man_teacher/4.png differ
diff --git a/public/images/emoji/google/man_teacher/5.png b/public/images/emoji/google/man_teacher/5.png
new file mode 100644
index 00000000000..10b6a7acf3f
Binary files /dev/null and b/public/images/emoji/google/man_teacher/5.png differ
diff --git a/public/images/emoji/google/man_teacher/6.png b/public/images/emoji/google/man_teacher/6.png
new file mode 100644
index 00000000000..a37590307c5
Binary files /dev/null and b/public/images/emoji/google/man_teacher/6.png differ
diff --git a/public/images/emoji/google/man_technologist.png b/public/images/emoji/google/man_technologist.png
new file mode 100644
index 00000000000..b8d03288c1b
Binary files /dev/null and b/public/images/emoji/google/man_technologist.png differ
diff --git a/public/images/emoji/google/man_technologist/2.png b/public/images/emoji/google/man_technologist/2.png
new file mode 100644
index 00000000000..1f17bfa5ec0
Binary files /dev/null and b/public/images/emoji/google/man_technologist/2.png differ
diff --git a/public/images/emoji/google/man_technologist/3.png b/public/images/emoji/google/man_technologist/3.png
new file mode 100644
index 00000000000..2a709961341
Binary files /dev/null and b/public/images/emoji/google/man_technologist/3.png differ
diff --git a/public/images/emoji/google/man_technologist/4.png b/public/images/emoji/google/man_technologist/4.png
new file mode 100644
index 00000000000..c5ef8e56f20
Binary files /dev/null and b/public/images/emoji/google/man_technologist/4.png differ
diff --git a/public/images/emoji/google/man_technologist/5.png b/public/images/emoji/google/man_technologist/5.png
new file mode 100644
index 00000000000..e6fe4f56060
Binary files /dev/null and b/public/images/emoji/google/man_technologist/5.png differ
diff --git a/public/images/emoji/google/man_technologist/6.png b/public/images/emoji/google/man_technologist/6.png
new file mode 100644
index 00000000000..640ac73aea7
Binary files /dev/null and b/public/images/emoji/google/man_technologist/6.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao.png b/public/images/emoji/google/man_with_gua_pi_mao.png
index e7e0d94a7e2..fb65d54ebe7 100644
Binary files a/public/images/emoji/google/man_with_gua_pi_mao.png and b/public/images/emoji/google/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/2.png b/public/images/emoji/google/man_with_gua_pi_mao/2.png
new file mode 100644
index 00000000000..c0303446600
Binary files /dev/null and b/public/images/emoji/google/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/3.png b/public/images/emoji/google/man_with_gua_pi_mao/3.png
new file mode 100644
index 00000000000..26fc71e6744
Binary files /dev/null and b/public/images/emoji/google/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/4.png b/public/images/emoji/google/man_with_gua_pi_mao/4.png
new file mode 100644
index 00000000000..54d074db469
Binary files /dev/null and b/public/images/emoji/google/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/5.png b/public/images/emoji/google/man_with_gua_pi_mao/5.png
new file mode 100644
index 00000000000..b44d21527dd
Binary files /dev/null and b/public/images/emoji/google/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/google/man_with_gua_pi_mao/6.png b/public/images/emoji/google/man_with_gua_pi_mao/6.png
new file mode 100644
index 00000000000..02f8d4bec98
Binary files /dev/null and b/public/images/emoji/google/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/google/man_with_turban.png b/public/images/emoji/google/man_with_turban.png
index 87efccfb472..6552b1777c4 100644
Binary files a/public/images/emoji/google/man_with_turban.png and b/public/images/emoji/google/man_with_turban.png differ
diff --git a/public/images/emoji/google/man_with_turban/2.png b/public/images/emoji/google/man_with_turban/2.png
new file mode 100644
index 00000000000..717d147cef4
Binary files /dev/null and b/public/images/emoji/google/man_with_turban/2.png differ
diff --git a/public/images/emoji/google/man_with_turban/3.png b/public/images/emoji/google/man_with_turban/3.png
new file mode 100644
index 00000000000..33ffa778239
Binary files /dev/null and b/public/images/emoji/google/man_with_turban/3.png differ
diff --git a/public/images/emoji/google/man_with_turban/4.png b/public/images/emoji/google/man_with_turban/4.png
new file mode 100644
index 00000000000..c28c0ddf414
Binary files /dev/null and b/public/images/emoji/google/man_with_turban/4.png differ
diff --git a/public/images/emoji/google/man_with_turban/5.png b/public/images/emoji/google/man_with_turban/5.png
new file mode 100644
index 00000000000..130ab75787d
Binary files /dev/null and b/public/images/emoji/google/man_with_turban/5.png differ
diff --git a/public/images/emoji/google/man_with_turban/6.png b/public/images/emoji/google/man_with_turban/6.png
new file mode 100644
index 00000000000..55c5969cb24
Binary files /dev/null and b/public/images/emoji/google/man_with_turban/6.png differ
diff --git a/public/images/emoji/google/mans_shoe.png b/public/images/emoji/google/mans_shoe.png
index afb7c8086da..1192b8766f9 100644
Binary files a/public/images/emoji/google/mans_shoe.png and b/public/images/emoji/google/mans_shoe.png differ
diff --git a/public/images/emoji/google/mantelpiece_clock.png b/public/images/emoji/google/mantelpiece_clock.png
new file mode 100644
index 00000000000..b326630c04a
Binary files /dev/null and b/public/images/emoji/google/mantelpiece_clock.png differ
diff --git a/public/images/emoji/google/map.png b/public/images/emoji/google/map.png
index fc4cfafe8a4..dccb5d0512b 100644
Binary files a/public/images/emoji/google/map.png and b/public/images/emoji/google/map.png differ
diff --git a/public/images/emoji/google/maple_leaf.png b/public/images/emoji/google/maple_leaf.png
index 0f61101eec7..21701f9d6a1 100644
Binary files a/public/images/emoji/google/maple_leaf.png and b/public/images/emoji/google/maple_leaf.png differ
diff --git a/public/images/emoji/google/marshall_islands.png b/public/images/emoji/google/marshall_islands.png
new file mode 100644
index 00000000000..dfc0b63f0e9
Binary files /dev/null and b/public/images/emoji/google/marshall_islands.png differ
diff --git a/public/images/emoji/google/martial_arts_uniform.png b/public/images/emoji/google/martial_arts_uniform.png
new file mode 100644
index 00000000000..b9572f75428
Binary files /dev/null and b/public/images/emoji/google/martial_arts_uniform.png differ
diff --git a/public/images/emoji/google/martinique.png b/public/images/emoji/google/martinique.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/martinique.png differ
diff --git a/public/images/emoji/google/mask.png b/public/images/emoji/google/mask.png
index 568141e9c73..74dca611cb0 100644
Binary files a/public/images/emoji/google/mask.png and b/public/images/emoji/google/mask.png differ
diff --git a/public/images/emoji/google/massage.png b/public/images/emoji/google/massage.png
index 346fdeb2e9a..b52a93fddb8 100644
Binary files a/public/images/emoji/google/massage.png and b/public/images/emoji/google/massage.png differ
diff --git a/public/images/emoji/google/massage/2.png b/public/images/emoji/google/massage/2.png
new file mode 100644
index 00000000000..b1d3dd0467d
Binary files /dev/null and b/public/images/emoji/google/massage/2.png differ
diff --git a/public/images/emoji/google/massage/3.png b/public/images/emoji/google/massage/3.png
new file mode 100644
index 00000000000..ca82149d559
Binary files /dev/null and b/public/images/emoji/google/massage/3.png differ
diff --git a/public/images/emoji/google/massage/4.png b/public/images/emoji/google/massage/4.png
new file mode 100644
index 00000000000..89c98ef9048
Binary files /dev/null and b/public/images/emoji/google/massage/4.png differ
diff --git a/public/images/emoji/google/massage/5.png b/public/images/emoji/google/massage/5.png
new file mode 100644
index 00000000000..5ec0746086a
Binary files /dev/null and b/public/images/emoji/google/massage/5.png differ
diff --git a/public/images/emoji/google/massage/6.png b/public/images/emoji/google/massage/6.png
new file mode 100644
index 00000000000..46aa9ce8321
Binary files /dev/null and b/public/images/emoji/google/massage/6.png differ
diff --git a/public/images/emoji/google/massage_man.png b/public/images/emoji/google/massage_man.png
new file mode 100644
index 00000000000..44beaa030b2
Binary files /dev/null and b/public/images/emoji/google/massage_man.png differ
diff --git a/public/images/emoji/google/massage_man/2.png b/public/images/emoji/google/massage_man/2.png
new file mode 100644
index 00000000000..f49c27433b3
Binary files /dev/null and b/public/images/emoji/google/massage_man/2.png differ
diff --git a/public/images/emoji/google/massage_man/3.png b/public/images/emoji/google/massage_man/3.png
new file mode 100644
index 00000000000..bc3e5faff57
Binary files /dev/null and b/public/images/emoji/google/massage_man/3.png differ
diff --git a/public/images/emoji/google/massage_man/4.png b/public/images/emoji/google/massage_man/4.png
new file mode 100644
index 00000000000..78891ec1f05
Binary files /dev/null and b/public/images/emoji/google/massage_man/4.png differ
diff --git a/public/images/emoji/google/massage_man/5.png b/public/images/emoji/google/massage_man/5.png
new file mode 100644
index 00000000000..d2ed9d7d51a
Binary files /dev/null and b/public/images/emoji/google/massage_man/5.png differ
diff --git a/public/images/emoji/google/massage_man/6.png b/public/images/emoji/google/massage_man/6.png
new file mode 100644
index 00000000000..170a4bb4443
Binary files /dev/null and b/public/images/emoji/google/massage_man/6.png differ
diff --git a/public/images/emoji/google/massage_woman.png b/public/images/emoji/google/massage_woman.png
new file mode 100644
index 00000000000..b52a93fddb8
Binary files /dev/null and b/public/images/emoji/google/massage_woman.png differ
diff --git a/public/images/emoji/google/massage_woman/2.png b/public/images/emoji/google/massage_woman/2.png
new file mode 100644
index 00000000000..b1d3dd0467d
Binary files /dev/null and b/public/images/emoji/google/massage_woman/2.png differ
diff --git a/public/images/emoji/google/massage_woman/3.png b/public/images/emoji/google/massage_woman/3.png
new file mode 100644
index 00000000000..ca82149d559
Binary files /dev/null and b/public/images/emoji/google/massage_woman/3.png differ
diff --git a/public/images/emoji/google/massage_woman/4.png b/public/images/emoji/google/massage_woman/4.png
new file mode 100644
index 00000000000..89c98ef9048
Binary files /dev/null and b/public/images/emoji/google/massage_woman/4.png differ
diff --git a/public/images/emoji/google/massage_woman/5.png b/public/images/emoji/google/massage_woman/5.png
new file mode 100644
index 00000000000..5ec0746086a
Binary files /dev/null and b/public/images/emoji/google/massage_woman/5.png differ
diff --git a/public/images/emoji/google/massage_woman/6.png b/public/images/emoji/google/massage_woman/6.png
new file mode 100644
index 00000000000..46aa9ce8321
Binary files /dev/null and b/public/images/emoji/google/massage_woman/6.png differ
diff --git a/public/images/emoji/google/mauritania.png b/public/images/emoji/google/mauritania.png
new file mode 100644
index 00000000000..0e778d4d7e2
Binary files /dev/null and b/public/images/emoji/google/mauritania.png differ
diff --git a/public/images/emoji/google/mauritius.png b/public/images/emoji/google/mauritius.png
new file mode 100644
index 00000000000..91307b714b0
Binary files /dev/null and b/public/images/emoji/google/mauritius.png differ
diff --git a/public/images/emoji/google/mayotte.png b/public/images/emoji/google/mayotte.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/mayotte.png differ
diff --git a/public/images/emoji/google/meat_on_bone.png b/public/images/emoji/google/meat_on_bone.png
index 181d0dc4d8c..fbb5eef5410 100644
Binary files a/public/images/emoji/google/meat_on_bone.png and b/public/images/emoji/google/meat_on_bone.png differ
diff --git a/public/images/emoji/google/medal.png b/public/images/emoji/google/medal.png
index 165827b17b6..3d321d89ed8 100644
Binary files a/public/images/emoji/google/medal.png and b/public/images/emoji/google/medal.png differ
diff --git a/public/images/emoji/google/medal_military.png b/public/images/emoji/google/medal_military.png
new file mode 100644
index 00000000000..51c5c7027b3
Binary files /dev/null and b/public/images/emoji/google/medal_military.png differ
diff --git a/public/images/emoji/google/medal_sports.png b/public/images/emoji/google/medal_sports.png
new file mode 100644
index 00000000000..3d321d89ed8
Binary files /dev/null and b/public/images/emoji/google/medal_sports.png differ
diff --git a/public/images/emoji/google/mega.png b/public/images/emoji/google/mega.png
index e717c059339..f821145f10f 100644
Binary files a/public/images/emoji/google/mega.png and b/public/images/emoji/google/mega.png differ
diff --git a/public/images/emoji/google/melon.png b/public/images/emoji/google/melon.png
index 9ddb3c63b21..67e5836ef3d 100644
Binary files a/public/images/emoji/google/melon.png and b/public/images/emoji/google/melon.png differ
diff --git a/public/images/emoji/google/memo.png b/public/images/emoji/google/memo.png
new file mode 100644
index 00000000000..355dcfe22da
Binary files /dev/null and b/public/images/emoji/google/memo.png differ
diff --git a/public/images/emoji/google/men_wrestling.png b/public/images/emoji/google/men_wrestling.png
new file mode 100644
index 00000000000..8264daa9d36
Binary files /dev/null and b/public/images/emoji/google/men_wrestling.png differ
diff --git a/public/images/emoji/google/menorah.png b/public/images/emoji/google/menorah.png
index a479d99b307..260477a2d4b 100644
Binary files a/public/images/emoji/google/menorah.png and b/public/images/emoji/google/menorah.png differ
diff --git a/public/images/emoji/google/mens.png b/public/images/emoji/google/mens.png
index 640db6a49e7..cf8bd65a188 100644
Binary files a/public/images/emoji/google/mens.png and b/public/images/emoji/google/mens.png differ
diff --git a/public/images/emoji/google/merperson.png b/public/images/emoji/google/merperson.png
new file mode 100644
index 00000000000..52ddaf75997
Binary files /dev/null and b/public/images/emoji/google/merperson.png differ
diff --git a/public/images/emoji/google/merperson/2.png b/public/images/emoji/google/merperson/2.png
new file mode 100644
index 00000000000..d39e1bf4b70
Binary files /dev/null and b/public/images/emoji/google/merperson/2.png differ
diff --git a/public/images/emoji/google/merperson/3.png b/public/images/emoji/google/merperson/3.png
new file mode 100644
index 00000000000..2f56a42407c
Binary files /dev/null and b/public/images/emoji/google/merperson/3.png differ
diff --git a/public/images/emoji/google/merperson/4.png b/public/images/emoji/google/merperson/4.png
new file mode 100644
index 00000000000..31c61fadd46
Binary files /dev/null and b/public/images/emoji/google/merperson/4.png differ
diff --git a/public/images/emoji/google/merperson/5.png b/public/images/emoji/google/merperson/5.png
new file mode 100644
index 00000000000..183057d962d
Binary files /dev/null and b/public/images/emoji/google/merperson/5.png differ
diff --git a/public/images/emoji/google/merperson/6.png b/public/images/emoji/google/merperson/6.png
new file mode 100644
index 00000000000..8b3e5dd2937
Binary files /dev/null and b/public/images/emoji/google/merperson/6.png differ
diff --git a/public/images/emoji/google/metal.png b/public/images/emoji/google/metal.png
index d8d0c23c3f8..eeac747c65e 100644
Binary files a/public/images/emoji/google/metal.png and b/public/images/emoji/google/metal.png differ
diff --git a/public/images/emoji/google/metal/2.png b/public/images/emoji/google/metal/2.png
new file mode 100644
index 00000000000..614947ba817
Binary files /dev/null and b/public/images/emoji/google/metal/2.png differ
diff --git a/public/images/emoji/google/metal/3.png b/public/images/emoji/google/metal/3.png
new file mode 100644
index 00000000000..2f9891b4805
Binary files /dev/null and b/public/images/emoji/google/metal/3.png differ
diff --git a/public/images/emoji/google/metal/4.png b/public/images/emoji/google/metal/4.png
new file mode 100644
index 00000000000..44e8fc124cc
Binary files /dev/null and b/public/images/emoji/google/metal/4.png differ
diff --git a/public/images/emoji/google/metal/5.png b/public/images/emoji/google/metal/5.png
new file mode 100644
index 00000000000..7016d1f0f82
Binary files /dev/null and b/public/images/emoji/google/metal/5.png differ
diff --git a/public/images/emoji/google/metal/6.png b/public/images/emoji/google/metal/6.png
new file mode 100644
index 00000000000..39216902504
Binary files /dev/null and b/public/images/emoji/google/metal/6.png differ
diff --git a/public/images/emoji/google/metro.png b/public/images/emoji/google/metro.png
index 23f7d98acf3..87ac46e6e78 100644
Binary files a/public/images/emoji/google/metro.png and b/public/images/emoji/google/metro.png differ
diff --git a/public/images/emoji/google/mexico.png b/public/images/emoji/google/mexico.png
new file mode 100644
index 00000000000..bfc31b76df7
Binary files /dev/null and b/public/images/emoji/google/mexico.png differ
diff --git a/public/images/emoji/google/micronesia.png b/public/images/emoji/google/micronesia.png
new file mode 100644
index 00000000000..86cd1a6c806
Binary files /dev/null and b/public/images/emoji/google/micronesia.png differ
diff --git a/public/images/emoji/google/microphone.png b/public/images/emoji/google/microphone.png
index af52cbe103e..d003da3ba16 100644
Binary files a/public/images/emoji/google/microphone.png and b/public/images/emoji/google/microphone.png differ
diff --git a/public/images/emoji/google/microphone2.png b/public/images/emoji/google/microphone2.png
index bb2539903b9..9394168839c 100644
Binary files a/public/images/emoji/google/microphone2.png and b/public/images/emoji/google/microphone2.png differ
diff --git a/public/images/emoji/google/microscope.png b/public/images/emoji/google/microscope.png
index ac71bf49b57..1022205955c 100644
Binary files a/public/images/emoji/google/microscope.png and b/public/images/emoji/google/microscope.png differ
diff --git a/public/images/emoji/google/middle_finger.png b/public/images/emoji/google/middle_finger.png
index abeb7fe2f41..8ce128b147d 100644
Binary files a/public/images/emoji/google/middle_finger.png and b/public/images/emoji/google/middle_finger.png differ
diff --git a/public/images/emoji/google/middle_finger/2.png b/public/images/emoji/google/middle_finger/2.png
new file mode 100644
index 00000000000..3313e7e2f07
Binary files /dev/null and b/public/images/emoji/google/middle_finger/2.png differ
diff --git a/public/images/emoji/google/middle_finger/3.png b/public/images/emoji/google/middle_finger/3.png
new file mode 100644
index 00000000000..916b42be04a
Binary files /dev/null and b/public/images/emoji/google/middle_finger/3.png differ
diff --git a/public/images/emoji/google/middle_finger/4.png b/public/images/emoji/google/middle_finger/4.png
new file mode 100644
index 00000000000..7ab3507e2cd
Binary files /dev/null and b/public/images/emoji/google/middle_finger/4.png differ
diff --git a/public/images/emoji/google/middle_finger/5.png b/public/images/emoji/google/middle_finger/5.png
new file mode 100644
index 00000000000..aeb15696e62
Binary files /dev/null and b/public/images/emoji/google/middle_finger/5.png differ
diff --git a/public/images/emoji/google/middle_finger/6.png b/public/images/emoji/google/middle_finger/6.png
new file mode 100644
index 00000000000..8e864665145
Binary files /dev/null and b/public/images/emoji/google/middle_finger/6.png differ
diff --git a/public/images/emoji/google/military_medal.png b/public/images/emoji/google/military_medal.png
index 07db5ac13cf..51c5c7027b3 100644
Binary files a/public/images/emoji/google/military_medal.png and b/public/images/emoji/google/military_medal.png differ
diff --git a/public/images/emoji/google/milk_glass.png b/public/images/emoji/google/milk_glass.png
new file mode 100644
index 00000000000..256b562d4f2
Binary files /dev/null and b/public/images/emoji/google/milk_glass.png differ
diff --git a/public/images/emoji/google/milky_way.png b/public/images/emoji/google/milky_way.png
index 9b6f69ca1b6..af10ffa7e85 100644
Binary files a/public/images/emoji/google/milky_way.png and b/public/images/emoji/google/milky_way.png differ
diff --git a/public/images/emoji/google/minibus.png b/public/images/emoji/google/minibus.png
index 9e949d4b054..2a9731584a4 100644
Binary files a/public/images/emoji/google/minibus.png and b/public/images/emoji/google/minibus.png differ
diff --git a/public/images/emoji/google/minidisc.png b/public/images/emoji/google/minidisc.png
index 199b03f1d99..e9b2420fa97 100644
Binary files a/public/images/emoji/google/minidisc.png and b/public/images/emoji/google/minidisc.png differ
diff --git a/public/images/emoji/google/mobile_phone_off.png b/public/images/emoji/google/mobile_phone_off.png
index b353bd4abf6..2eb131de419 100644
Binary files a/public/images/emoji/google/mobile_phone_off.png and b/public/images/emoji/google/mobile_phone_off.png differ
diff --git a/public/images/emoji/google/moldova.png b/public/images/emoji/google/moldova.png
new file mode 100644
index 00000000000..bdd1daad75e
Binary files /dev/null and b/public/images/emoji/google/moldova.png differ
diff --git a/public/images/emoji/google/monaco.png b/public/images/emoji/google/monaco.png
new file mode 100644
index 00000000000..30c904e1694
Binary files /dev/null and b/public/images/emoji/google/monaco.png differ
diff --git a/public/images/emoji/google/money_mouth.png b/public/images/emoji/google/money_mouth.png
index 921b180454c..15b7188abea 100644
Binary files a/public/images/emoji/google/money_mouth.png and b/public/images/emoji/google/money_mouth.png differ
diff --git a/public/images/emoji/google/money_mouth_face.png b/public/images/emoji/google/money_mouth_face.png
index 921b180454c..15b7188abea 100644
Binary files a/public/images/emoji/google/money_mouth_face.png and b/public/images/emoji/google/money_mouth_face.png differ
diff --git a/public/images/emoji/google/money_with_wings.png b/public/images/emoji/google/money_with_wings.png
index f5939dfc2d8..7852c7b9be2 100644
Binary files a/public/images/emoji/google/money_with_wings.png and b/public/images/emoji/google/money_with_wings.png differ
diff --git a/public/images/emoji/google/moneybag.png b/public/images/emoji/google/moneybag.png
index ef2778f7a42..18995016eaa 100644
Binary files a/public/images/emoji/google/moneybag.png and b/public/images/emoji/google/moneybag.png differ
diff --git a/public/images/emoji/google/mongolia.png b/public/images/emoji/google/mongolia.png
new file mode 100644
index 00000000000..fc2c4d69d0d
Binary files /dev/null and b/public/images/emoji/google/mongolia.png differ
diff --git a/public/images/emoji/google/monkey.png b/public/images/emoji/google/monkey.png
index 88db70bffeb..06a97625d41 100644
Binary files a/public/images/emoji/google/monkey.png and b/public/images/emoji/google/monkey.png differ
diff --git a/public/images/emoji/google/monkey_face.png b/public/images/emoji/google/monkey_face.png
index 3de70bf0303..7a726c3a785 100644
Binary files a/public/images/emoji/google/monkey_face.png and b/public/images/emoji/google/monkey_face.png differ
diff --git a/public/images/emoji/google/monorail.png b/public/images/emoji/google/monorail.png
index b5693024927..b6e7072262f 100644
Binary files a/public/images/emoji/google/monorail.png and b/public/images/emoji/google/monorail.png differ
diff --git a/public/images/emoji/google/montenegro.png b/public/images/emoji/google/montenegro.png
new file mode 100644
index 00000000000..364f5af9bdb
Binary files /dev/null and b/public/images/emoji/google/montenegro.png differ
diff --git a/public/images/emoji/google/montserrat.png b/public/images/emoji/google/montserrat.png
new file mode 100644
index 00000000000..3b15005541b
Binary files /dev/null and b/public/images/emoji/google/montserrat.png differ
diff --git a/public/images/emoji/google/moon.png b/public/images/emoji/google/moon.png
new file mode 100644
index 00000000000..948d36d6a4f
Binary files /dev/null and b/public/images/emoji/google/moon.png differ
diff --git a/public/images/emoji/google/morocco.png b/public/images/emoji/google/morocco.png
new file mode 100644
index 00000000000..f9b158fd8c6
Binary files /dev/null and b/public/images/emoji/google/morocco.png differ
diff --git a/public/images/emoji/google/mortar_board.png b/public/images/emoji/google/mortar_board.png
index f6313a7704a..584c09dd0de 100644
Binary files a/public/images/emoji/google/mortar_board.png and b/public/images/emoji/google/mortar_board.png differ
diff --git a/public/images/emoji/google/mosque.png b/public/images/emoji/google/mosque.png
index 4f31242b15a..c2f372979f9 100644
Binary files a/public/images/emoji/google/mosque.png and b/public/images/emoji/google/mosque.png differ
diff --git a/public/images/emoji/google/motor_boat.png b/public/images/emoji/google/motor_boat.png
new file mode 100644
index 00000000000..42799a3b742
Binary files /dev/null and b/public/images/emoji/google/motor_boat.png differ
diff --git a/public/images/emoji/google/motor_scooter.png b/public/images/emoji/google/motor_scooter.png
new file mode 100644
index 00000000000..1a80fb5f2e2
Binary files /dev/null and b/public/images/emoji/google/motor_scooter.png differ
diff --git a/public/images/emoji/google/motorboat.png b/public/images/emoji/google/motorboat.png
index 16e1f419e2f..42799a3b742 100644
Binary files a/public/images/emoji/google/motorboat.png and b/public/images/emoji/google/motorboat.png differ
diff --git a/public/images/emoji/google/motorcycle.png b/public/images/emoji/google/motorcycle.png
index 59a73872fe7..d153c400edb 100644
Binary files a/public/images/emoji/google/motorcycle.png and b/public/images/emoji/google/motorcycle.png differ
diff --git a/public/images/emoji/google/motorway.png b/public/images/emoji/google/motorway.png
index 863c2a66986..e37d6fa63c0 100644
Binary files a/public/images/emoji/google/motorway.png and b/public/images/emoji/google/motorway.png differ
diff --git a/public/images/emoji/google/mount_fuji.png b/public/images/emoji/google/mount_fuji.png
index 75385882cb2..f0a58a3715c 100644
Binary files a/public/images/emoji/google/mount_fuji.png and b/public/images/emoji/google/mount_fuji.png differ
diff --git a/public/images/emoji/google/mountain.png b/public/images/emoji/google/mountain.png
index 3f7a75574e8..27d83350935 100644
Binary files a/public/images/emoji/google/mountain.png and b/public/images/emoji/google/mountain.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist.png b/public/images/emoji/google/mountain_bicyclist.png
index 01aa415deeb..126a776acc0 100644
Binary files a/public/images/emoji/google/mountain_bicyclist.png and b/public/images/emoji/google/mountain_bicyclist.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/2.png b/public/images/emoji/google/mountain_bicyclist/2.png
new file mode 100644
index 00000000000..7d49e1c916d
Binary files /dev/null and b/public/images/emoji/google/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/3.png b/public/images/emoji/google/mountain_bicyclist/3.png
new file mode 100644
index 00000000000..bcb2c823188
Binary files /dev/null and b/public/images/emoji/google/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/4.png b/public/images/emoji/google/mountain_bicyclist/4.png
new file mode 100644
index 00000000000..f864ee5ea94
Binary files /dev/null and b/public/images/emoji/google/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/5.png b/public/images/emoji/google/mountain_bicyclist/5.png
new file mode 100644
index 00000000000..c9c73598b1b
Binary files /dev/null and b/public/images/emoji/google/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/google/mountain_bicyclist/6.png b/public/images/emoji/google/mountain_bicyclist/6.png
new file mode 100644
index 00000000000..4cce156c14e
Binary files /dev/null and b/public/images/emoji/google/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/google/mountain_biking_man.png b/public/images/emoji/google/mountain_biking_man.png
new file mode 100644
index 00000000000..126a776acc0
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_man.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/2.png b/public/images/emoji/google/mountain_biking_man/2.png
new file mode 100644
index 00000000000..7d49e1c916d
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/3.png b/public/images/emoji/google/mountain_biking_man/3.png
new file mode 100644
index 00000000000..bcb2c823188
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/4.png b/public/images/emoji/google/mountain_biking_man/4.png
new file mode 100644
index 00000000000..f864ee5ea94
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/5.png b/public/images/emoji/google/mountain_biking_man/5.png
new file mode 100644
index 00000000000..c9c73598b1b
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/google/mountain_biking_man/6.png b/public/images/emoji/google/mountain_biking_man/6.png
new file mode 100644
index 00000000000..4cce156c14e
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman.png b/public/images/emoji/google/mountain_biking_woman.png
new file mode 100644
index 00000000000..94b07d31ac1
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_woman.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/2.png b/public/images/emoji/google/mountain_biking_woman/2.png
new file mode 100644
index 00000000000..a9b93276928
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/3.png b/public/images/emoji/google/mountain_biking_woman/3.png
new file mode 100644
index 00000000000..f41c9306801
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/4.png b/public/images/emoji/google/mountain_biking_woman/4.png
new file mode 100644
index 00000000000..f1c13c6e0cc
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/5.png b/public/images/emoji/google/mountain_biking_woman/5.png
new file mode 100644
index 00000000000..27b10c24fb4
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/google/mountain_biking_woman/6.png b/public/images/emoji/google/mountain_biking_woman/6.png
new file mode 100644
index 00000000000..d9f6ba7bba9
Binary files /dev/null and b/public/images/emoji/google/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/google/mountain_cableway.png b/public/images/emoji/google/mountain_cableway.png
index fc6924f71f7..109f4804191 100644
Binary files a/public/images/emoji/google/mountain_cableway.png and b/public/images/emoji/google/mountain_cableway.png differ
diff --git a/public/images/emoji/google/mountain_railway.png b/public/images/emoji/google/mountain_railway.png
index 662c9f36fed..c68849f3576 100644
Binary files a/public/images/emoji/google/mountain_railway.png and b/public/images/emoji/google/mountain_railway.png differ
diff --git a/public/images/emoji/google/mountain_snow.png b/public/images/emoji/google/mountain_snow.png
index edf4cc1286d..f7ab7c2c747 100644
Binary files a/public/images/emoji/google/mountain_snow.png and b/public/images/emoji/google/mountain_snow.png differ
diff --git a/public/images/emoji/google/mouse.png b/public/images/emoji/google/mouse.png
index 37e8c04c045..2e10c6001aa 100644
Binary files a/public/images/emoji/google/mouse.png and b/public/images/emoji/google/mouse.png differ
diff --git a/public/images/emoji/google/mouse2.png b/public/images/emoji/google/mouse2.png
index b69c664aa33..f32d8e136f4 100644
Binary files a/public/images/emoji/google/mouse2.png and b/public/images/emoji/google/mouse2.png differ
diff --git a/public/images/emoji/google/mouse_three_button.png b/public/images/emoji/google/mouse_three_button.png
index 220ef6486c1..606ada2ed4f 100644
Binary files a/public/images/emoji/google/mouse_three_button.png and b/public/images/emoji/google/mouse_three_button.png differ
diff --git a/public/images/emoji/google/movie_camera.png b/public/images/emoji/google/movie_camera.png
index 68fa2099ea6..c09d290c013 100644
Binary files a/public/images/emoji/google/movie_camera.png and b/public/images/emoji/google/movie_camera.png differ
diff --git a/public/images/emoji/google/moyai.png b/public/images/emoji/google/moyai.png
index 0417a109435..f9da2311849 100644
Binary files a/public/images/emoji/google/moyai.png and b/public/images/emoji/google/moyai.png differ
diff --git a/public/images/emoji/google/mozambique.png b/public/images/emoji/google/mozambique.png
new file mode 100644
index 00000000000..72b32c188f9
Binary files /dev/null and b/public/images/emoji/google/mozambique.png differ
diff --git a/public/images/emoji/google/mrs_claus.png b/public/images/emoji/google/mrs_claus.png
new file mode 100644
index 00000000000..694316523a1
Binary files /dev/null and b/public/images/emoji/google/mrs_claus.png differ
diff --git a/public/images/emoji/google/mrs_claus/2.png b/public/images/emoji/google/mrs_claus/2.png
new file mode 100644
index 00000000000..dbb37173d70
Binary files /dev/null and b/public/images/emoji/google/mrs_claus/2.png differ
diff --git a/public/images/emoji/google/mrs_claus/3.png b/public/images/emoji/google/mrs_claus/3.png
new file mode 100644
index 00000000000..c311381bce7
Binary files /dev/null and b/public/images/emoji/google/mrs_claus/3.png differ
diff --git a/public/images/emoji/google/mrs_claus/4.png b/public/images/emoji/google/mrs_claus/4.png
new file mode 100644
index 00000000000..bc74e33fe1c
Binary files /dev/null and b/public/images/emoji/google/mrs_claus/4.png differ
diff --git a/public/images/emoji/google/mrs_claus/5.png b/public/images/emoji/google/mrs_claus/5.png
new file mode 100644
index 00000000000..ce7bb7cd120
Binary files /dev/null and b/public/images/emoji/google/mrs_claus/5.png differ
diff --git a/public/images/emoji/google/mrs_claus/6.png b/public/images/emoji/google/mrs_claus/6.png
new file mode 100644
index 00000000000..c9fd8609bb0
Binary files /dev/null and b/public/images/emoji/google/mrs_claus/6.png differ
diff --git a/public/images/emoji/google/muscle.png b/public/images/emoji/google/muscle.png
index fcdded5cb49..2f4e8a9d487 100644
Binary files a/public/images/emoji/google/muscle.png and b/public/images/emoji/google/muscle.png differ
diff --git a/public/images/emoji/google/muscle/2.png b/public/images/emoji/google/muscle/2.png
new file mode 100644
index 00000000000..f5742eda91d
Binary files /dev/null and b/public/images/emoji/google/muscle/2.png differ
diff --git a/public/images/emoji/google/muscle/3.png b/public/images/emoji/google/muscle/3.png
new file mode 100644
index 00000000000..4dd7352f778
Binary files /dev/null and b/public/images/emoji/google/muscle/3.png differ
diff --git a/public/images/emoji/google/muscle/4.png b/public/images/emoji/google/muscle/4.png
new file mode 100644
index 00000000000..44dacb8a0c2
Binary files /dev/null and b/public/images/emoji/google/muscle/4.png differ
diff --git a/public/images/emoji/google/muscle/5.png b/public/images/emoji/google/muscle/5.png
new file mode 100644
index 00000000000..e8affdf4546
Binary files /dev/null and b/public/images/emoji/google/muscle/5.png differ
diff --git a/public/images/emoji/google/muscle/6.png b/public/images/emoji/google/muscle/6.png
new file mode 100644
index 00000000000..042948c39a7
Binary files /dev/null and b/public/images/emoji/google/muscle/6.png differ
diff --git a/public/images/emoji/google/mushroom.png b/public/images/emoji/google/mushroom.png
index 0332bba08ed..3bd413f2688 100644
Binary files a/public/images/emoji/google/mushroom.png and b/public/images/emoji/google/mushroom.png differ
diff --git a/public/images/emoji/google/musical_keyboard.png b/public/images/emoji/google/musical_keyboard.png
index a872990f0f5..d1bf210a77b 100644
Binary files a/public/images/emoji/google/musical_keyboard.png and b/public/images/emoji/google/musical_keyboard.png differ
diff --git a/public/images/emoji/google/musical_note.png b/public/images/emoji/google/musical_note.png
index ed7a1aa975c..ca4bd871c2e 100644
Binary files a/public/images/emoji/google/musical_note.png and b/public/images/emoji/google/musical_note.png differ
diff --git a/public/images/emoji/google/musical_score.png b/public/images/emoji/google/musical_score.png
index 6ca380ccc84..38e5a652abc 100644
Binary files a/public/images/emoji/google/musical_score.png and b/public/images/emoji/google/musical_score.png differ
diff --git a/public/images/emoji/google/mute.png b/public/images/emoji/google/mute.png
index 231202a8524..9c9dc80824d 100644
Binary files a/public/images/emoji/google/mute.png and b/public/images/emoji/google/mute.png differ
diff --git a/public/images/emoji/google/myanmar.png b/public/images/emoji/google/myanmar.png
new file mode 100644
index 00000000000..521999380c9
Binary files /dev/null and b/public/images/emoji/google/myanmar.png differ
diff --git a/public/images/emoji/google/nail_care.png b/public/images/emoji/google/nail_care.png
index 37972b04b52..e22ff7d1a62 100644
Binary files a/public/images/emoji/google/nail_care.png and b/public/images/emoji/google/nail_care.png differ
diff --git a/public/images/emoji/google/nail_care/2.png b/public/images/emoji/google/nail_care/2.png
new file mode 100644
index 00000000000..7959b94c396
Binary files /dev/null and b/public/images/emoji/google/nail_care/2.png differ
diff --git a/public/images/emoji/google/nail_care/3.png b/public/images/emoji/google/nail_care/3.png
new file mode 100644
index 00000000000..735f0fd5c3e
Binary files /dev/null and b/public/images/emoji/google/nail_care/3.png differ
diff --git a/public/images/emoji/google/nail_care/4.png b/public/images/emoji/google/nail_care/4.png
new file mode 100644
index 00000000000..e45bd79054f
Binary files /dev/null and b/public/images/emoji/google/nail_care/4.png differ
diff --git a/public/images/emoji/google/nail_care/5.png b/public/images/emoji/google/nail_care/5.png
new file mode 100644
index 00000000000..55a09777d70
Binary files /dev/null and b/public/images/emoji/google/nail_care/5.png differ
diff --git a/public/images/emoji/google/nail_care/6.png b/public/images/emoji/google/nail_care/6.png
new file mode 100644
index 00000000000..8f8a1668de7
Binary files /dev/null and b/public/images/emoji/google/nail_care/6.png differ
diff --git a/public/images/emoji/google/name_badge.png b/public/images/emoji/google/name_badge.png
index e19ef4cf867..6de01068dbf 100644
Binary files a/public/images/emoji/google/name_badge.png and b/public/images/emoji/google/name_badge.png differ
diff --git a/public/images/emoji/google/namibia.png b/public/images/emoji/google/namibia.png
new file mode 100644
index 00000000000..ff94010440c
Binary files /dev/null and b/public/images/emoji/google/namibia.png differ
diff --git a/public/images/emoji/google/national_park.png b/public/images/emoji/google/national_park.png
index 8867d8de41a..669eb54fbf1 100644
Binary files a/public/images/emoji/google/national_park.png and b/public/images/emoji/google/national_park.png differ
diff --git a/public/images/emoji/google/nauru.png b/public/images/emoji/google/nauru.png
new file mode 100644
index 00000000000..d62600569a2
Binary files /dev/null and b/public/images/emoji/google/nauru.png differ
diff --git a/public/images/emoji/google/nauseated_face.png b/public/images/emoji/google/nauseated_face.png
new file mode 100644
index 00000000000..004026f11e9
Binary files /dev/null and b/public/images/emoji/google/nauseated_face.png differ
diff --git a/public/images/emoji/google/necktie.png b/public/images/emoji/google/necktie.png
index 4937477132e..f8e16d4a1f4 100644
Binary files a/public/images/emoji/google/necktie.png and b/public/images/emoji/google/necktie.png differ
diff --git a/public/images/emoji/google/negative_squared_cross_mark.png b/public/images/emoji/google/negative_squared_cross_mark.png
index db53c8642a6..3a8695d5f4e 100644
Binary files a/public/images/emoji/google/negative_squared_cross_mark.png and b/public/images/emoji/google/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/google/nepal.png b/public/images/emoji/google/nepal.png
new file mode 100644
index 00000000000..737e60dcc8d
Binary files /dev/null and b/public/images/emoji/google/nepal.png differ
diff --git a/public/images/emoji/google/nerd.png b/public/images/emoji/google/nerd.png
index 2115d429f8e..0028a1fe44b 100644
Binary files a/public/images/emoji/google/nerd.png and b/public/images/emoji/google/nerd.png differ
diff --git a/public/images/emoji/google/nerd_face.png b/public/images/emoji/google/nerd_face.png
index 2115d429f8e..0028a1fe44b 100644
Binary files a/public/images/emoji/google/nerd_face.png and b/public/images/emoji/google/nerd_face.png differ
diff --git a/public/images/emoji/google/netherlands.png b/public/images/emoji/google/netherlands.png
new file mode 100644
index 00000000000..a4701766ec6
Binary files /dev/null and b/public/images/emoji/google/netherlands.png differ
diff --git a/public/images/emoji/google/neutral_face.png b/public/images/emoji/google/neutral_face.png
index fb7416e14e5..67d8c2ef3dd 100644
Binary files a/public/images/emoji/google/neutral_face.png and b/public/images/emoji/google/neutral_face.png differ
diff --git a/public/images/emoji/google/new.png b/public/images/emoji/google/new.png
index 8f7818def22..85ad0cc6536 100644
Binary files a/public/images/emoji/google/new.png and b/public/images/emoji/google/new.png differ
diff --git a/public/images/emoji/google/new_caledonia.png b/public/images/emoji/google/new_caledonia.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/new_caledonia.png differ
diff --git a/public/images/emoji/google/new_moon.png b/public/images/emoji/google/new_moon.png
index 0d169713882..948d36d6a4f 100644
Binary files a/public/images/emoji/google/new_moon.png and b/public/images/emoji/google/new_moon.png differ
diff --git a/public/images/emoji/google/new_moon_with_face.png b/public/images/emoji/google/new_moon_with_face.png
index 130a11287cf..ccc3826641c 100644
Binary files a/public/images/emoji/google/new_moon_with_face.png and b/public/images/emoji/google/new_moon_with_face.png differ
diff --git a/public/images/emoji/google/new_zealand.png b/public/images/emoji/google/new_zealand.png
new file mode 100644
index 00000000000..7b9a30256c3
Binary files /dev/null and b/public/images/emoji/google/new_zealand.png differ
diff --git a/public/images/emoji/google/newspaper.png b/public/images/emoji/google/newspaper.png
index 4820f0c6cc5..2138c8f8cd9 100644
Binary files a/public/images/emoji/google/newspaper.png and b/public/images/emoji/google/newspaper.png differ
diff --git a/public/images/emoji/google/newspaper2.png b/public/images/emoji/google/newspaper2.png
index 52095afb299..13fb2454713 100644
Binary files a/public/images/emoji/google/newspaper2.png and b/public/images/emoji/google/newspaper2.png differ
diff --git a/public/images/emoji/google/newspaper_roll.png b/public/images/emoji/google/newspaper_roll.png
new file mode 100644
index 00000000000..13fb2454713
Binary files /dev/null and b/public/images/emoji/google/newspaper_roll.png differ
diff --git a/public/images/emoji/google/next_track.png b/public/images/emoji/google/next_track.png
index 8fa069d5783..85f7bba60f7 100644
Binary files a/public/images/emoji/google/next_track.png and b/public/images/emoji/google/next_track.png differ
diff --git a/public/images/emoji/google/next_track_button.png b/public/images/emoji/google/next_track_button.png
new file mode 100644
index 00000000000..85f7bba60f7
Binary files /dev/null and b/public/images/emoji/google/next_track_button.png differ
diff --git a/public/images/emoji/google/ng.png b/public/images/emoji/google/ng.png
index bc9e942c190..9f2e1f1f893 100644
Binary files a/public/images/emoji/google/ng.png and b/public/images/emoji/google/ng.png differ
diff --git a/public/images/emoji/google/nicaragua.png b/public/images/emoji/google/nicaragua.png
new file mode 100644
index 00000000000..cf00cb5749c
Binary files /dev/null and b/public/images/emoji/google/nicaragua.png differ
diff --git a/public/images/emoji/google/niger.png b/public/images/emoji/google/niger.png
new file mode 100644
index 00000000000..b03af80215f
Binary files /dev/null and b/public/images/emoji/google/niger.png differ
diff --git a/public/images/emoji/google/nigeria.png b/public/images/emoji/google/nigeria.png
new file mode 100644
index 00000000000..a4562939c78
Binary files /dev/null and b/public/images/emoji/google/nigeria.png differ
diff --git a/public/images/emoji/google/night_with_stars.png b/public/images/emoji/google/night_with_stars.png
index 46059ef55f9..d4d2aadd83d 100644
Binary files a/public/images/emoji/google/night_with_stars.png and b/public/images/emoji/google/night_with_stars.png differ
diff --git a/public/images/emoji/google/nine.png b/public/images/emoji/google/nine.png
index 589d508d5af..2af7f8b823a 100644
Binary files a/public/images/emoji/google/nine.png and b/public/images/emoji/google/nine.png differ
diff --git a/public/images/emoji/google/niue.png b/public/images/emoji/google/niue.png
new file mode 100644
index 00000000000..6d08f75c6b8
Binary files /dev/null and b/public/images/emoji/google/niue.png differ
diff --git a/public/images/emoji/google/no_bell.png b/public/images/emoji/google/no_bell.png
index 4733ecb474e..a14d2bffaeb 100644
Binary files a/public/images/emoji/google/no_bell.png and b/public/images/emoji/google/no_bell.png differ
diff --git a/public/images/emoji/google/no_bicycles.png b/public/images/emoji/google/no_bicycles.png
index 7adef77ae4f..bfe7b1dc021 100644
Binary files a/public/images/emoji/google/no_bicycles.png and b/public/images/emoji/google/no_bicycles.png differ
diff --git a/public/images/emoji/google/no_entry.png b/public/images/emoji/google/no_entry.png
index 1d9da89933f..3544be5b036 100644
Binary files a/public/images/emoji/google/no_entry.png and b/public/images/emoji/google/no_entry.png differ
diff --git a/public/images/emoji/google/no_entry_sign.png b/public/images/emoji/google/no_entry_sign.png
index 4dd7808b873..caa3f51d2ea 100644
Binary files a/public/images/emoji/google/no_entry_sign.png and b/public/images/emoji/google/no_entry_sign.png differ
diff --git a/public/images/emoji/google/no_good.png b/public/images/emoji/google/no_good.png
index b4a10fe93ba..797c435b70e 100644
Binary files a/public/images/emoji/google/no_good.png and b/public/images/emoji/google/no_good.png differ
diff --git a/public/images/emoji/google/no_good/2.png b/public/images/emoji/google/no_good/2.png
new file mode 100644
index 00000000000..c90ee91006a
Binary files /dev/null and b/public/images/emoji/google/no_good/2.png differ
diff --git a/public/images/emoji/google/no_good/3.png b/public/images/emoji/google/no_good/3.png
new file mode 100644
index 00000000000..b6ec827f382
Binary files /dev/null and b/public/images/emoji/google/no_good/3.png differ
diff --git a/public/images/emoji/google/no_good/4.png b/public/images/emoji/google/no_good/4.png
new file mode 100644
index 00000000000..8df51e056f1
Binary files /dev/null and b/public/images/emoji/google/no_good/4.png differ
diff --git a/public/images/emoji/google/no_good/5.png b/public/images/emoji/google/no_good/5.png
new file mode 100644
index 00000000000..232495b5aa6
Binary files /dev/null and b/public/images/emoji/google/no_good/5.png differ
diff --git a/public/images/emoji/google/no_good/6.png b/public/images/emoji/google/no_good/6.png
new file mode 100644
index 00000000000..dc52c7b5d24
Binary files /dev/null and b/public/images/emoji/google/no_good/6.png differ
diff --git a/public/images/emoji/google/no_good_man.png b/public/images/emoji/google/no_good_man.png
new file mode 100644
index 00000000000..72455cef938
Binary files /dev/null and b/public/images/emoji/google/no_good_man.png differ
diff --git a/public/images/emoji/google/no_good_man/2.png b/public/images/emoji/google/no_good_man/2.png
new file mode 100644
index 00000000000..24c952374a5
Binary files /dev/null and b/public/images/emoji/google/no_good_man/2.png differ
diff --git a/public/images/emoji/google/no_good_man/3.png b/public/images/emoji/google/no_good_man/3.png
new file mode 100644
index 00000000000..b5746a4c788
Binary files /dev/null and b/public/images/emoji/google/no_good_man/3.png differ
diff --git a/public/images/emoji/google/no_good_man/4.png b/public/images/emoji/google/no_good_man/4.png
new file mode 100644
index 00000000000..92eded52fb4
Binary files /dev/null and b/public/images/emoji/google/no_good_man/4.png differ
diff --git a/public/images/emoji/google/no_good_man/5.png b/public/images/emoji/google/no_good_man/5.png
new file mode 100644
index 00000000000..a7a0fb9d5b9
Binary files /dev/null and b/public/images/emoji/google/no_good_man/5.png differ
diff --git a/public/images/emoji/google/no_good_man/6.png b/public/images/emoji/google/no_good_man/6.png
new file mode 100644
index 00000000000..77663e59341
Binary files /dev/null and b/public/images/emoji/google/no_good_man/6.png differ
diff --git a/public/images/emoji/google/no_good_woman.png b/public/images/emoji/google/no_good_woman.png
new file mode 100644
index 00000000000..797c435b70e
Binary files /dev/null and b/public/images/emoji/google/no_good_woman.png differ
diff --git a/public/images/emoji/google/no_good_woman/2.png b/public/images/emoji/google/no_good_woman/2.png
new file mode 100644
index 00000000000..c90ee91006a
Binary files /dev/null and b/public/images/emoji/google/no_good_woman/2.png differ
diff --git a/public/images/emoji/google/no_good_woman/3.png b/public/images/emoji/google/no_good_woman/3.png
new file mode 100644
index 00000000000..b6ec827f382
Binary files /dev/null and b/public/images/emoji/google/no_good_woman/3.png differ
diff --git a/public/images/emoji/google/no_good_woman/4.png b/public/images/emoji/google/no_good_woman/4.png
new file mode 100644
index 00000000000..8df51e056f1
Binary files /dev/null and b/public/images/emoji/google/no_good_woman/4.png differ
diff --git a/public/images/emoji/google/no_good_woman/5.png b/public/images/emoji/google/no_good_woman/5.png
new file mode 100644
index 00000000000..232495b5aa6
Binary files /dev/null and b/public/images/emoji/google/no_good_woman/5.png differ
diff --git a/public/images/emoji/google/no_good_woman/6.png b/public/images/emoji/google/no_good_woman/6.png
new file mode 100644
index 00000000000..dc52c7b5d24
Binary files /dev/null and b/public/images/emoji/google/no_good_woman/6.png differ
diff --git a/public/images/emoji/google/no_mobile_phones.png b/public/images/emoji/google/no_mobile_phones.png
index 3a812b55353..efec493cae4 100644
Binary files a/public/images/emoji/google/no_mobile_phones.png and b/public/images/emoji/google/no_mobile_phones.png differ
diff --git a/public/images/emoji/google/no_mouth.png b/public/images/emoji/google/no_mouth.png
index abaaf15ca4a..8dd7edd4584 100644
Binary files a/public/images/emoji/google/no_mouth.png and b/public/images/emoji/google/no_mouth.png differ
diff --git a/public/images/emoji/google/no_pedestrians.png b/public/images/emoji/google/no_pedestrians.png
index 20249ddacce..f948f3d2554 100644
Binary files a/public/images/emoji/google/no_pedestrians.png and b/public/images/emoji/google/no_pedestrians.png differ
diff --git a/public/images/emoji/google/no_smoking.png b/public/images/emoji/google/no_smoking.png
index fafebd2642b..bf662e9a8fe 100644
Binary files a/public/images/emoji/google/no_smoking.png and b/public/images/emoji/google/no_smoking.png differ
diff --git a/public/images/emoji/google/non-potable_water.png b/public/images/emoji/google/non-potable_water.png
index 131f6e05bb9..d2daa6662c3 100644
Binary files a/public/images/emoji/google/non-potable_water.png and b/public/images/emoji/google/non-potable_water.png differ
diff --git a/public/images/emoji/google/norfolk_island.png b/public/images/emoji/google/norfolk_island.png
new file mode 100644
index 00000000000..cf150763d95
Binary files /dev/null and b/public/images/emoji/google/norfolk_island.png differ
diff --git a/public/images/emoji/google/north_korea.png b/public/images/emoji/google/north_korea.png
new file mode 100644
index 00000000000..6bc5813b61d
Binary files /dev/null and b/public/images/emoji/google/north_korea.png differ
diff --git a/public/images/emoji/google/northern_mariana_islands.png b/public/images/emoji/google/northern_mariana_islands.png
new file mode 100644
index 00000000000..1e3243d7e56
Binary files /dev/null and b/public/images/emoji/google/northern_mariana_islands.png differ
diff --git a/public/images/emoji/google/norway.png b/public/images/emoji/google/norway.png
new file mode 100644
index 00000000000..5330d9794c3
Binary files /dev/null and b/public/images/emoji/google/norway.png differ
diff --git a/public/images/emoji/google/nose.png b/public/images/emoji/google/nose.png
index 386396c7991..7561d03c25d 100644
Binary files a/public/images/emoji/google/nose.png and b/public/images/emoji/google/nose.png differ
diff --git a/public/images/emoji/google/nose/2.png b/public/images/emoji/google/nose/2.png
new file mode 100644
index 00000000000..c474e1b2af3
Binary files /dev/null and b/public/images/emoji/google/nose/2.png differ
diff --git a/public/images/emoji/google/nose/3.png b/public/images/emoji/google/nose/3.png
new file mode 100644
index 00000000000..a04dbf7c8af
Binary files /dev/null and b/public/images/emoji/google/nose/3.png differ
diff --git a/public/images/emoji/google/nose/4.png b/public/images/emoji/google/nose/4.png
new file mode 100644
index 00000000000..f198511ec0e
Binary files /dev/null and b/public/images/emoji/google/nose/4.png differ
diff --git a/public/images/emoji/google/nose/5.png b/public/images/emoji/google/nose/5.png
new file mode 100644
index 00000000000..48b7dab4fc4
Binary files /dev/null and b/public/images/emoji/google/nose/5.png differ
diff --git a/public/images/emoji/google/nose/6.png b/public/images/emoji/google/nose/6.png
new file mode 100644
index 00000000000..90e8771126b
Binary files /dev/null and b/public/images/emoji/google/nose/6.png differ
diff --git a/public/images/emoji/google/notebook.png b/public/images/emoji/google/notebook.png
index 10971327a51..ff3e8f08b01 100644
Binary files a/public/images/emoji/google/notebook.png and b/public/images/emoji/google/notebook.png differ
diff --git a/public/images/emoji/google/notebook_with_decorative_cover.png b/public/images/emoji/google/notebook_with_decorative_cover.png
index d5a17c61047..175bdd76a2f 100644
Binary files a/public/images/emoji/google/notebook_with_decorative_cover.png and b/public/images/emoji/google/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/google/notepad_spiral.png b/public/images/emoji/google/notepad_spiral.png
index eb6853649e8..ff382324e5e 100644
Binary files a/public/images/emoji/google/notepad_spiral.png and b/public/images/emoji/google/notepad_spiral.png differ
diff --git a/public/images/emoji/google/notes.png b/public/images/emoji/google/notes.png
index bc1ac37390f..0303907dafb 100644
Binary files a/public/images/emoji/google/notes.png and b/public/images/emoji/google/notes.png differ
diff --git a/public/images/emoji/google/nut_and_bolt.png b/public/images/emoji/google/nut_and_bolt.png
index 4d77d041216..2ec42d068f5 100644
Binary files a/public/images/emoji/google/nut_and_bolt.png and b/public/images/emoji/google/nut_and_bolt.png differ
diff --git a/public/images/emoji/google/o.png b/public/images/emoji/google/o.png
index c22044d12c4..958cb3858f5 100644
Binary files a/public/images/emoji/google/o.png and b/public/images/emoji/google/o.png differ
diff --git a/public/images/emoji/google/o2.png b/public/images/emoji/google/o2.png
index 2a028a53918..60974e106d4 100644
Binary files a/public/images/emoji/google/o2.png and b/public/images/emoji/google/o2.png differ
diff --git a/public/images/emoji/google/ocean.png b/public/images/emoji/google/ocean.png
index 7cc7ec7c176..db5786f95bc 100644
Binary files a/public/images/emoji/google/ocean.png and b/public/images/emoji/google/ocean.png differ
diff --git a/public/images/emoji/google/octopus.png b/public/images/emoji/google/octopus.png
index 0b419a5df9f..356f9f3c647 100644
Binary files a/public/images/emoji/google/octopus.png and b/public/images/emoji/google/octopus.png differ
diff --git a/public/images/emoji/google/oden.png b/public/images/emoji/google/oden.png
index 257b23b826b..e23a091cbfc 100644
Binary files a/public/images/emoji/google/oden.png and b/public/images/emoji/google/oden.png differ
diff --git a/public/images/emoji/google/office.png b/public/images/emoji/google/office.png
index f7d06f7cd33..e12836eef91 100644
Binary files a/public/images/emoji/google/office.png and b/public/images/emoji/google/office.png differ
diff --git a/public/images/emoji/google/oil.png b/public/images/emoji/google/oil.png
index 8664a9d1cec..12f7f469aa1 100644
Binary files a/public/images/emoji/google/oil.png and b/public/images/emoji/google/oil.png differ
diff --git a/public/images/emoji/google/oil_drum.png b/public/images/emoji/google/oil_drum.png
index 8664a9d1cec..12f7f469aa1 100644
Binary files a/public/images/emoji/google/oil_drum.png and b/public/images/emoji/google/oil_drum.png differ
diff --git a/public/images/emoji/google/ok.png b/public/images/emoji/google/ok.png
index 28482bcb6d6..ae8f6be07ac 100644
Binary files a/public/images/emoji/google/ok.png and b/public/images/emoji/google/ok.png differ
diff --git a/public/images/emoji/google/ok_hand.png b/public/images/emoji/google/ok_hand.png
index 88f3ce8063a..e1adb5fc014 100644
Binary files a/public/images/emoji/google/ok_hand.png and b/public/images/emoji/google/ok_hand.png differ
diff --git a/public/images/emoji/google/ok_hand/2.png b/public/images/emoji/google/ok_hand/2.png
new file mode 100644
index 00000000000..22dd5a64093
Binary files /dev/null and b/public/images/emoji/google/ok_hand/2.png differ
diff --git a/public/images/emoji/google/ok_hand/3.png b/public/images/emoji/google/ok_hand/3.png
new file mode 100644
index 00000000000..3f6b9eefb62
Binary files /dev/null and b/public/images/emoji/google/ok_hand/3.png differ
diff --git a/public/images/emoji/google/ok_hand/4.png b/public/images/emoji/google/ok_hand/4.png
new file mode 100644
index 00000000000..74f9267b311
Binary files /dev/null and b/public/images/emoji/google/ok_hand/4.png differ
diff --git a/public/images/emoji/google/ok_hand/5.png b/public/images/emoji/google/ok_hand/5.png
new file mode 100644
index 00000000000..a2b4e9acc0d
Binary files /dev/null and b/public/images/emoji/google/ok_hand/5.png differ
diff --git a/public/images/emoji/google/ok_hand/6.png b/public/images/emoji/google/ok_hand/6.png
new file mode 100644
index 00000000000..244e16aa6c6
Binary files /dev/null and b/public/images/emoji/google/ok_hand/6.png differ
diff --git a/public/images/emoji/google/ok_man.png b/public/images/emoji/google/ok_man.png
new file mode 100644
index 00000000000..c4636c1ae9b
Binary files /dev/null and b/public/images/emoji/google/ok_man.png differ
diff --git a/public/images/emoji/google/ok_man/2.png b/public/images/emoji/google/ok_man/2.png
new file mode 100644
index 00000000000..8da030b7342
Binary files /dev/null and b/public/images/emoji/google/ok_man/2.png differ
diff --git a/public/images/emoji/google/ok_man/3.png b/public/images/emoji/google/ok_man/3.png
new file mode 100644
index 00000000000..d945cd09b48
Binary files /dev/null and b/public/images/emoji/google/ok_man/3.png differ
diff --git a/public/images/emoji/google/ok_man/4.png b/public/images/emoji/google/ok_man/4.png
new file mode 100644
index 00000000000..f871e308c5f
Binary files /dev/null and b/public/images/emoji/google/ok_man/4.png differ
diff --git a/public/images/emoji/google/ok_man/5.png b/public/images/emoji/google/ok_man/5.png
new file mode 100644
index 00000000000..ef9c47d55bb
Binary files /dev/null and b/public/images/emoji/google/ok_man/5.png differ
diff --git a/public/images/emoji/google/ok_man/6.png b/public/images/emoji/google/ok_man/6.png
new file mode 100644
index 00000000000..bf469bf1f07
Binary files /dev/null and b/public/images/emoji/google/ok_man/6.png differ
diff --git a/public/images/emoji/google/ok_woman.png b/public/images/emoji/google/ok_woman.png
index 5574a33c509..fc51dcfb069 100644
Binary files a/public/images/emoji/google/ok_woman.png and b/public/images/emoji/google/ok_woman.png differ
diff --git a/public/images/emoji/google/ok_woman/2.png b/public/images/emoji/google/ok_woman/2.png
new file mode 100644
index 00000000000..52cf1392a6c
Binary files /dev/null and b/public/images/emoji/google/ok_woman/2.png differ
diff --git a/public/images/emoji/google/ok_woman/3.png b/public/images/emoji/google/ok_woman/3.png
new file mode 100644
index 00000000000..a8b9d7ec9af
Binary files /dev/null and b/public/images/emoji/google/ok_woman/3.png differ
diff --git a/public/images/emoji/google/ok_woman/4.png b/public/images/emoji/google/ok_woman/4.png
new file mode 100644
index 00000000000..cbedc79d8dd
Binary files /dev/null and b/public/images/emoji/google/ok_woman/4.png differ
diff --git a/public/images/emoji/google/ok_woman/5.png b/public/images/emoji/google/ok_woman/5.png
new file mode 100644
index 00000000000..7a6da71e874
Binary files /dev/null and b/public/images/emoji/google/ok_woman/5.png differ
diff --git a/public/images/emoji/google/ok_woman/6.png b/public/images/emoji/google/ok_woman/6.png
new file mode 100644
index 00000000000..3236ad424f0
Binary files /dev/null and b/public/images/emoji/google/ok_woman/6.png differ
diff --git a/public/images/emoji/google/old_key.png b/public/images/emoji/google/old_key.png
index 87121fe1078..d6739c8457c 100644
Binary files a/public/images/emoji/google/old_key.png and b/public/images/emoji/google/old_key.png differ
diff --git a/public/images/emoji/google/older_adult.png b/public/images/emoji/google/older_adult.png
new file mode 100644
index 00000000000..3b4a3661719
Binary files /dev/null and b/public/images/emoji/google/older_adult.png differ
diff --git a/public/images/emoji/google/older_adult/2.png b/public/images/emoji/google/older_adult/2.png
new file mode 100644
index 00000000000..ffcda163087
Binary files /dev/null and b/public/images/emoji/google/older_adult/2.png differ
diff --git a/public/images/emoji/google/older_adult/3.png b/public/images/emoji/google/older_adult/3.png
new file mode 100644
index 00000000000..46fb7440351
Binary files /dev/null and b/public/images/emoji/google/older_adult/3.png differ
diff --git a/public/images/emoji/google/older_adult/4.png b/public/images/emoji/google/older_adult/4.png
new file mode 100644
index 00000000000..3c05309e58b
Binary files /dev/null and b/public/images/emoji/google/older_adult/4.png differ
diff --git a/public/images/emoji/google/older_adult/5.png b/public/images/emoji/google/older_adult/5.png
new file mode 100644
index 00000000000..1acf2a4a545
Binary files /dev/null and b/public/images/emoji/google/older_adult/5.png differ
diff --git a/public/images/emoji/google/older_adult/6.png b/public/images/emoji/google/older_adult/6.png
new file mode 100644
index 00000000000..6ca350992a7
Binary files /dev/null and b/public/images/emoji/google/older_adult/6.png differ
diff --git a/public/images/emoji/google/older_man.png b/public/images/emoji/google/older_man.png
index 3c4c59e1e0d..1efe6018b17 100644
Binary files a/public/images/emoji/google/older_man.png and b/public/images/emoji/google/older_man.png differ
diff --git a/public/images/emoji/google/older_man/2.png b/public/images/emoji/google/older_man/2.png
new file mode 100644
index 00000000000..53d70985978
Binary files /dev/null and b/public/images/emoji/google/older_man/2.png differ
diff --git a/public/images/emoji/google/older_man/3.png b/public/images/emoji/google/older_man/3.png
new file mode 100644
index 00000000000..c6175d65006
Binary files /dev/null and b/public/images/emoji/google/older_man/3.png differ
diff --git a/public/images/emoji/google/older_man/4.png b/public/images/emoji/google/older_man/4.png
new file mode 100644
index 00000000000..5b25856d3bb
Binary files /dev/null and b/public/images/emoji/google/older_man/4.png differ
diff --git a/public/images/emoji/google/older_man/5.png b/public/images/emoji/google/older_man/5.png
new file mode 100644
index 00000000000..ed9270ac9c9
Binary files /dev/null and b/public/images/emoji/google/older_man/5.png differ
diff --git a/public/images/emoji/google/older_man/6.png b/public/images/emoji/google/older_man/6.png
new file mode 100644
index 00000000000..507b2337036
Binary files /dev/null and b/public/images/emoji/google/older_man/6.png differ
diff --git a/public/images/emoji/google/older_woman.png b/public/images/emoji/google/older_woman.png
index 1261df7c00b..4aeba637f78 100644
Binary files a/public/images/emoji/google/older_woman.png and b/public/images/emoji/google/older_woman.png differ
diff --git a/public/images/emoji/google/older_woman/2.png b/public/images/emoji/google/older_woman/2.png
new file mode 100644
index 00000000000..905e8a98b37
Binary files /dev/null and b/public/images/emoji/google/older_woman/2.png differ
diff --git a/public/images/emoji/google/older_woman/3.png b/public/images/emoji/google/older_woman/3.png
new file mode 100644
index 00000000000..7d9c997674c
Binary files /dev/null and b/public/images/emoji/google/older_woman/3.png differ
diff --git a/public/images/emoji/google/older_woman/4.png b/public/images/emoji/google/older_woman/4.png
new file mode 100644
index 00000000000..69a9c179106
Binary files /dev/null and b/public/images/emoji/google/older_woman/4.png differ
diff --git a/public/images/emoji/google/older_woman/5.png b/public/images/emoji/google/older_woman/5.png
new file mode 100644
index 00000000000..7ae4d8ea045
Binary files /dev/null and b/public/images/emoji/google/older_woman/5.png differ
diff --git a/public/images/emoji/google/older_woman/6.png b/public/images/emoji/google/older_woman/6.png
new file mode 100644
index 00000000000..89542a23302
Binary files /dev/null and b/public/images/emoji/google/older_woman/6.png differ
diff --git a/public/images/emoji/google/om.png b/public/images/emoji/google/om.png
new file mode 100644
index 00000000000..1d732d75b37
Binary files /dev/null and b/public/images/emoji/google/om.png differ
diff --git a/public/images/emoji/google/om_symbol.png b/public/images/emoji/google/om_symbol.png
index aa79c5ac771..1d732d75b37 100644
Binary files a/public/images/emoji/google/om_symbol.png and b/public/images/emoji/google/om_symbol.png differ
diff --git a/public/images/emoji/google/oman.png b/public/images/emoji/google/oman.png
new file mode 100644
index 00000000000..7b20f241a47
Binary files /dev/null and b/public/images/emoji/google/oman.png differ
diff --git a/public/images/emoji/google/on.png b/public/images/emoji/google/on.png
index 9adad893938..b29c550cff6 100644
Binary files a/public/images/emoji/google/on.png and b/public/images/emoji/google/on.png differ
diff --git a/public/images/emoji/google/oncoming_automobile.png b/public/images/emoji/google/oncoming_automobile.png
index 9634051d47f..56f5cddc276 100644
Binary files a/public/images/emoji/google/oncoming_automobile.png and b/public/images/emoji/google/oncoming_automobile.png differ
diff --git a/public/images/emoji/google/oncoming_bus.png b/public/images/emoji/google/oncoming_bus.png
index b658875d7dc..b0684aa0b45 100644
Binary files a/public/images/emoji/google/oncoming_bus.png and b/public/images/emoji/google/oncoming_bus.png differ
diff --git a/public/images/emoji/google/oncoming_police_car.png b/public/images/emoji/google/oncoming_police_car.png
index 3bfba6c3ebf..7f3f138ccd5 100644
Binary files a/public/images/emoji/google/oncoming_police_car.png and b/public/images/emoji/google/oncoming_police_car.png differ
diff --git a/public/images/emoji/google/oncoming_taxi.png b/public/images/emoji/google/oncoming_taxi.png
index e8f1841320e..af2ad6f3fa8 100644
Binary files a/public/images/emoji/google/oncoming_taxi.png and b/public/images/emoji/google/oncoming_taxi.png differ
diff --git a/public/images/emoji/google/one.png b/public/images/emoji/google/one.png
index fd231c9dcc0..332d4cc90d1 100644
Binary files a/public/images/emoji/google/one.png and b/public/images/emoji/google/one.png differ
diff --git a/public/images/emoji/google/open_book.png b/public/images/emoji/google/open_book.png
new file mode 100644
index 00000000000..2f4edfa0328
Binary files /dev/null and b/public/images/emoji/google/open_book.png differ
diff --git a/public/images/emoji/google/open_file_folder.png b/public/images/emoji/google/open_file_folder.png
index bccc7685a90..342dc9e0d39 100644
Binary files a/public/images/emoji/google/open_file_folder.png and b/public/images/emoji/google/open_file_folder.png differ
diff --git a/public/images/emoji/google/open_hands.png b/public/images/emoji/google/open_hands.png
index ddc02d4fa7b..49e8ab878cb 100644
Binary files a/public/images/emoji/google/open_hands.png and b/public/images/emoji/google/open_hands.png differ
diff --git a/public/images/emoji/google/open_hands/2.png b/public/images/emoji/google/open_hands/2.png
new file mode 100644
index 00000000000..2d5120ea0be
Binary files /dev/null and b/public/images/emoji/google/open_hands/2.png differ
diff --git a/public/images/emoji/google/open_hands/3.png b/public/images/emoji/google/open_hands/3.png
new file mode 100644
index 00000000000..a6e32d60784
Binary files /dev/null and b/public/images/emoji/google/open_hands/3.png differ
diff --git a/public/images/emoji/google/open_hands/4.png b/public/images/emoji/google/open_hands/4.png
new file mode 100644
index 00000000000..79494951e34
Binary files /dev/null and b/public/images/emoji/google/open_hands/4.png differ
diff --git a/public/images/emoji/google/open_hands/5.png b/public/images/emoji/google/open_hands/5.png
new file mode 100644
index 00000000000..61f31b1cc47
Binary files /dev/null and b/public/images/emoji/google/open_hands/5.png differ
diff --git a/public/images/emoji/google/open_hands/6.png b/public/images/emoji/google/open_hands/6.png
new file mode 100644
index 00000000000..b57f1f5cb3c
Binary files /dev/null and b/public/images/emoji/google/open_hands/6.png differ
diff --git a/public/images/emoji/google/open_mouth.png b/public/images/emoji/google/open_mouth.png
index 780c99af787..d3afb4c6ebb 100644
Binary files a/public/images/emoji/google/open_mouth.png and b/public/images/emoji/google/open_mouth.png differ
diff --git a/public/images/emoji/google/open_umbrella.png b/public/images/emoji/google/open_umbrella.png
new file mode 100644
index 00000000000..21b025ea515
Binary files /dev/null and b/public/images/emoji/google/open_umbrella.png differ
diff --git a/public/images/emoji/google/ophiuchus.png b/public/images/emoji/google/ophiuchus.png
index ff36d049043..9dfcee2d479 100644
Binary files a/public/images/emoji/google/ophiuchus.png and b/public/images/emoji/google/ophiuchus.png differ
diff --git a/public/images/emoji/google/orange_book.png b/public/images/emoji/google/orange_book.png
index 7f056bfb32e..6a2a262aff0 100644
Binary files a/public/images/emoji/google/orange_book.png and b/public/images/emoji/google/orange_book.png differ
diff --git a/public/images/emoji/google/orange_heart.png b/public/images/emoji/google/orange_heart.png
new file mode 100644
index 00000000000..2239788f680
Binary files /dev/null and b/public/images/emoji/google/orange_heart.png differ
diff --git a/public/images/emoji/google/orthodox_cross.png b/public/images/emoji/google/orthodox_cross.png
index 78f881392d7..b7dd064c8f7 100644
Binary files a/public/images/emoji/google/orthodox_cross.png and b/public/images/emoji/google/orthodox_cross.png differ
diff --git a/public/images/emoji/google/outbox_tray.png b/public/images/emoji/google/outbox_tray.png
index fe8739808be..abac46b590a 100644
Binary files a/public/images/emoji/google/outbox_tray.png and b/public/images/emoji/google/outbox_tray.png differ
diff --git a/public/images/emoji/google/owl.png b/public/images/emoji/google/owl.png
new file mode 100644
index 00000000000..cf6ae83d807
Binary files /dev/null and b/public/images/emoji/google/owl.png differ
diff --git a/public/images/emoji/google/ox.png b/public/images/emoji/google/ox.png
index e2f19b2752f..796bfe4a843 100644
Binary files a/public/images/emoji/google/ox.png and b/public/images/emoji/google/ox.png differ
diff --git a/public/images/emoji/google/package.png b/public/images/emoji/google/package.png
index 29a44e6f058..17b5db0e250 100644
Binary files a/public/images/emoji/google/package.png and b/public/images/emoji/google/package.png differ
diff --git a/public/images/emoji/google/page_facing_up.png b/public/images/emoji/google/page_facing_up.png
index 4fa7bcf2cfe..b3002ed4c31 100644
Binary files a/public/images/emoji/google/page_facing_up.png and b/public/images/emoji/google/page_facing_up.png differ
diff --git a/public/images/emoji/google/page_with_curl.png b/public/images/emoji/google/page_with_curl.png
index 4f4bbda422c..0a71b54c91c 100644
Binary files a/public/images/emoji/google/page_with_curl.png and b/public/images/emoji/google/page_with_curl.png differ
diff --git a/public/images/emoji/google/pager.png b/public/images/emoji/google/pager.png
index 8b81727d4a0..e0e980854a9 100644
Binary files a/public/images/emoji/google/pager.png and b/public/images/emoji/google/pager.png differ
diff --git a/public/images/emoji/google/paintbrush.png b/public/images/emoji/google/paintbrush.png
index 81b26f22fab..58697366466 100644
Binary files a/public/images/emoji/google/paintbrush.png and b/public/images/emoji/google/paintbrush.png differ
diff --git a/public/images/emoji/google/pakistan.png b/public/images/emoji/google/pakistan.png
new file mode 100644
index 00000000000..e136514c9a4
Binary files /dev/null and b/public/images/emoji/google/pakistan.png differ
diff --git a/public/images/emoji/google/palau.png b/public/images/emoji/google/palau.png
new file mode 100644
index 00000000000..bcbfdea7854
Binary files /dev/null and b/public/images/emoji/google/palau.png differ
diff --git a/public/images/emoji/google/palestinian_territories.png b/public/images/emoji/google/palestinian_territories.png
new file mode 100644
index 00000000000..3a690eb7cce
Binary files /dev/null and b/public/images/emoji/google/palestinian_territories.png differ
diff --git a/public/images/emoji/google/palm_tree.png b/public/images/emoji/google/palm_tree.png
index 27dd3ad7c4f..8d7a39f271e 100644
Binary files a/public/images/emoji/google/palm_tree.png and b/public/images/emoji/google/palm_tree.png differ
diff --git a/public/images/emoji/google/palms_up_together.png b/public/images/emoji/google/palms_up_together.png
new file mode 100644
index 00000000000..8878837866c
Binary files /dev/null and b/public/images/emoji/google/palms_up_together.png differ
diff --git a/public/images/emoji/google/palms_up_together/2.png b/public/images/emoji/google/palms_up_together/2.png
new file mode 100644
index 00000000000..c25936413e0
Binary files /dev/null and b/public/images/emoji/google/palms_up_together/2.png differ
diff --git a/public/images/emoji/google/palms_up_together/3.png b/public/images/emoji/google/palms_up_together/3.png
new file mode 100644
index 00000000000..f2db60ab8b5
Binary files /dev/null and b/public/images/emoji/google/palms_up_together/3.png differ
diff --git a/public/images/emoji/google/palms_up_together/4.png b/public/images/emoji/google/palms_up_together/4.png
new file mode 100644
index 00000000000..f3e88da1682
Binary files /dev/null and b/public/images/emoji/google/palms_up_together/4.png differ
diff --git a/public/images/emoji/google/palms_up_together/5.png b/public/images/emoji/google/palms_up_together/5.png
new file mode 100644
index 00000000000..a11b9fac7a0
Binary files /dev/null and b/public/images/emoji/google/palms_up_together/5.png differ
diff --git a/public/images/emoji/google/palms_up_together/6.png b/public/images/emoji/google/palms_up_together/6.png
new file mode 100644
index 00000000000..93c4a67f411
Binary files /dev/null and b/public/images/emoji/google/palms_up_together/6.png differ
diff --git a/public/images/emoji/google/panama.png b/public/images/emoji/google/panama.png
new file mode 100644
index 00000000000..62e08e4bcc5
Binary files /dev/null and b/public/images/emoji/google/panama.png differ
diff --git a/public/images/emoji/google/pancakes.png b/public/images/emoji/google/pancakes.png
new file mode 100644
index 00000000000..ea40ec4e7b8
Binary files /dev/null and b/public/images/emoji/google/pancakes.png differ
diff --git a/public/images/emoji/google/panda_face.png b/public/images/emoji/google/panda_face.png
index 6d340d44c8c..6f560198c26 100644
Binary files a/public/images/emoji/google/panda_face.png and b/public/images/emoji/google/panda_face.png differ
diff --git a/public/images/emoji/google/paperclip.png b/public/images/emoji/google/paperclip.png
index 3075e667c45..791d9a70f3e 100644
Binary files a/public/images/emoji/google/paperclip.png and b/public/images/emoji/google/paperclip.png differ
diff --git a/public/images/emoji/google/paperclips.png b/public/images/emoji/google/paperclips.png
index e34ff5ad2a3..b3b7e0de41d 100644
Binary files a/public/images/emoji/google/paperclips.png and b/public/images/emoji/google/paperclips.png differ
diff --git a/public/images/emoji/google/papua_new_guinea.png b/public/images/emoji/google/papua_new_guinea.png
new file mode 100644
index 00000000000..c3bc9e2bf8f
Binary files /dev/null and b/public/images/emoji/google/papua_new_guinea.png differ
diff --git a/public/images/emoji/google/paraguay.png b/public/images/emoji/google/paraguay.png
new file mode 100644
index 00000000000..5f81d2d2f0b
Binary files /dev/null and b/public/images/emoji/google/paraguay.png differ
diff --git a/public/images/emoji/google/parasol_on_ground.png b/public/images/emoji/google/parasol_on_ground.png
new file mode 100644
index 00000000000..2a16b4d32a7
Binary files /dev/null and b/public/images/emoji/google/parasol_on_ground.png differ
diff --git a/public/images/emoji/google/park.png b/public/images/emoji/google/park.png
index 8867d8de41a..669eb54fbf1 100644
Binary files a/public/images/emoji/google/park.png and b/public/images/emoji/google/park.png differ
diff --git a/public/images/emoji/google/parking.png b/public/images/emoji/google/parking.png
index 0c15835e21e..3450cb75c29 100644
Binary files a/public/images/emoji/google/parking.png and b/public/images/emoji/google/parking.png differ
diff --git a/public/images/emoji/google/part_alternation_mark.png b/public/images/emoji/google/part_alternation_mark.png
index aca1d93a227..41a93424e8f 100644
Binary files a/public/images/emoji/google/part_alternation_mark.png and b/public/images/emoji/google/part_alternation_mark.png differ
diff --git a/public/images/emoji/google/partly_sunny.png b/public/images/emoji/google/partly_sunny.png
index 4338bb43895..ca30e8990bd 100644
Binary files a/public/images/emoji/google/partly_sunny.png and b/public/images/emoji/google/partly_sunny.png differ
diff --git a/public/images/emoji/google/passenger_ship.png b/public/images/emoji/google/passenger_ship.png
index b0ce2c2f50a..5ffa1e17dcd 100644
Binary files a/public/images/emoji/google/passenger_ship.png and b/public/images/emoji/google/passenger_ship.png differ
diff --git a/public/images/emoji/google/passport_control.png b/public/images/emoji/google/passport_control.png
index 66b170cc77e..92fd116fff8 100644
Binary files a/public/images/emoji/google/passport_control.png and b/public/images/emoji/google/passport_control.png differ
diff --git a/public/images/emoji/google/pause_button.png b/public/images/emoji/google/pause_button.png
index 1be5733ff4e..31613a93208 100644
Binary files a/public/images/emoji/google/pause_button.png and b/public/images/emoji/google/pause_button.png differ
diff --git a/public/images/emoji/google/paw_prints.png b/public/images/emoji/google/paw_prints.png
index 1fdef760934..29f068aaf05 100644
Binary files a/public/images/emoji/google/paw_prints.png and b/public/images/emoji/google/paw_prints.png differ
diff --git a/public/images/emoji/google/peace.png b/public/images/emoji/google/peace.png
index a0128d56159..c085022e7db 100644
Binary files a/public/images/emoji/google/peace.png and b/public/images/emoji/google/peace.png differ
diff --git a/public/images/emoji/google/peace_symbol.png b/public/images/emoji/google/peace_symbol.png
index a0128d56159..c085022e7db 100644
Binary files a/public/images/emoji/google/peace_symbol.png and b/public/images/emoji/google/peace_symbol.png differ
diff --git a/public/images/emoji/google/peach.png b/public/images/emoji/google/peach.png
index 0de43c9b36a..19d86b3013a 100644
Binary files a/public/images/emoji/google/peach.png and b/public/images/emoji/google/peach.png differ
diff --git a/public/images/emoji/google/peanuts.png b/public/images/emoji/google/peanuts.png
new file mode 100644
index 00000000000..ba87793ec1d
Binary files /dev/null and b/public/images/emoji/google/peanuts.png differ
diff --git a/public/images/emoji/google/pear.png b/public/images/emoji/google/pear.png
index 0e76c56f8b8..e622f3eaf85 100644
Binary files a/public/images/emoji/google/pear.png and b/public/images/emoji/google/pear.png differ
diff --git a/public/images/emoji/google/pen.png b/public/images/emoji/google/pen.png
new file mode 100644
index 00000000000..a67644b0ac7
Binary files /dev/null and b/public/images/emoji/google/pen.png differ
diff --git a/public/images/emoji/google/pen_ballpoint.png b/public/images/emoji/google/pen_ballpoint.png
index 11acae0cdd3..a67644b0ac7 100644
Binary files a/public/images/emoji/google/pen_ballpoint.png and b/public/images/emoji/google/pen_ballpoint.png differ
diff --git a/public/images/emoji/google/pen_fountain.png b/public/images/emoji/google/pen_fountain.png
index 4af057ce4ec..a06fcdc40e4 100644
Binary files a/public/images/emoji/google/pen_fountain.png and b/public/images/emoji/google/pen_fountain.png differ
diff --git a/public/images/emoji/google/pencil.png b/public/images/emoji/google/pencil.png
index 54aa560fedf..355dcfe22da 100644
Binary files a/public/images/emoji/google/pencil.png and b/public/images/emoji/google/pencil.png differ
diff --git a/public/images/emoji/google/pencil2.png b/public/images/emoji/google/pencil2.png
index b907b343c6e..e10b99fe925 100644
Binary files a/public/images/emoji/google/pencil2.png and b/public/images/emoji/google/pencil2.png differ
diff --git a/public/images/emoji/google/penguin.png b/public/images/emoji/google/penguin.png
index 5a5446d2891..b31a77b5b9a 100644
Binary files a/public/images/emoji/google/penguin.png and b/public/images/emoji/google/penguin.png differ
diff --git a/public/images/emoji/google/pensive.png b/public/images/emoji/google/pensive.png
index abab3533760..6cb7d76597c 100644
Binary files a/public/images/emoji/google/pensive.png and b/public/images/emoji/google/pensive.png differ
diff --git a/public/images/emoji/google/performing_arts.png b/public/images/emoji/google/performing_arts.png
index b99a1132cf2..dbcd3799110 100644
Binary files a/public/images/emoji/google/performing_arts.png and b/public/images/emoji/google/performing_arts.png differ
diff --git a/public/images/emoji/google/persevere.png b/public/images/emoji/google/persevere.png
index 9e504248323..fd1501221d3 100644
Binary files a/public/images/emoji/google/persevere.png and b/public/images/emoji/google/persevere.png differ
diff --git a/public/images/emoji/google/person_climbing.png b/public/images/emoji/google/person_climbing.png
new file mode 100644
index 00000000000..4064c30b89a
Binary files /dev/null and b/public/images/emoji/google/person_climbing.png differ
diff --git a/public/images/emoji/google/person_climbing/2.png b/public/images/emoji/google/person_climbing/2.png
new file mode 100644
index 00000000000..ec05fe0695d
Binary files /dev/null and b/public/images/emoji/google/person_climbing/2.png differ
diff --git a/public/images/emoji/google/person_climbing/3.png b/public/images/emoji/google/person_climbing/3.png
new file mode 100644
index 00000000000..790a278e9b8
Binary files /dev/null and b/public/images/emoji/google/person_climbing/3.png differ
diff --git a/public/images/emoji/google/person_climbing/4.png b/public/images/emoji/google/person_climbing/4.png
new file mode 100644
index 00000000000..9fffed69e16
Binary files /dev/null and b/public/images/emoji/google/person_climbing/4.png differ
diff --git a/public/images/emoji/google/person_climbing/5.png b/public/images/emoji/google/person_climbing/5.png
new file mode 100644
index 00000000000..cbd54a8b860
Binary files /dev/null and b/public/images/emoji/google/person_climbing/5.png differ
diff --git a/public/images/emoji/google/person_climbing/6.png b/public/images/emoji/google/person_climbing/6.png
new file mode 100644
index 00000000000..66b247fa5a0
Binary files /dev/null and b/public/images/emoji/google/person_climbing/6.png differ
diff --git a/public/images/emoji/google/person_fencing.png b/public/images/emoji/google/person_fencing.png
new file mode 100644
index 00000000000..2f191738880
Binary files /dev/null and b/public/images/emoji/google/person_fencing.png differ
diff --git a/public/images/emoji/google/person_frowning.png b/public/images/emoji/google/person_frowning.png
index 262db0d00b0..4667b907ddf 100644
Binary files a/public/images/emoji/google/person_frowning.png and b/public/images/emoji/google/person_frowning.png differ
diff --git a/public/images/emoji/google/person_frowning/2.png b/public/images/emoji/google/person_frowning/2.png
new file mode 100644
index 00000000000..16f321b8aeb
Binary files /dev/null and b/public/images/emoji/google/person_frowning/2.png differ
diff --git a/public/images/emoji/google/person_frowning/3.png b/public/images/emoji/google/person_frowning/3.png
new file mode 100644
index 00000000000..bd6c5e162fb
Binary files /dev/null and b/public/images/emoji/google/person_frowning/3.png differ
diff --git a/public/images/emoji/google/person_frowning/4.png b/public/images/emoji/google/person_frowning/4.png
new file mode 100644
index 00000000000..72f848c863c
Binary files /dev/null and b/public/images/emoji/google/person_frowning/4.png differ
diff --git a/public/images/emoji/google/person_frowning/5.png b/public/images/emoji/google/person_frowning/5.png
new file mode 100644
index 00000000000..863caa54338
Binary files /dev/null and b/public/images/emoji/google/person_frowning/5.png differ
diff --git a/public/images/emoji/google/person_frowning/6.png b/public/images/emoji/google/person_frowning/6.png
new file mode 100644
index 00000000000..d1936f11235
Binary files /dev/null and b/public/images/emoji/google/person_frowning/6.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position.png b/public/images/emoji/google/person_in_lotus_position.png
new file mode 100644
index 00000000000..d0be0a3bb06
Binary files /dev/null and b/public/images/emoji/google/person_in_lotus_position.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/2.png b/public/images/emoji/google/person_in_lotus_position/2.png
new file mode 100644
index 00000000000..2ccd6c72540
Binary files /dev/null and b/public/images/emoji/google/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/3.png b/public/images/emoji/google/person_in_lotus_position/3.png
new file mode 100644
index 00000000000..ac3ae39e31d
Binary files /dev/null and b/public/images/emoji/google/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/4.png b/public/images/emoji/google/person_in_lotus_position/4.png
new file mode 100644
index 00000000000..37446ec6e39
Binary files /dev/null and b/public/images/emoji/google/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/5.png b/public/images/emoji/google/person_in_lotus_position/5.png
new file mode 100644
index 00000000000..d6734f1e3d2
Binary files /dev/null and b/public/images/emoji/google/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/google/person_in_lotus_position/6.png b/public/images/emoji/google/person_in_lotus_position/6.png
new file mode 100644
index 00000000000..79852cb807d
Binary files /dev/null and b/public/images/emoji/google/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room.png b/public/images/emoji/google/person_in_steamy_room.png
new file mode 100644
index 00000000000..2e6d5c2069f
Binary files /dev/null and b/public/images/emoji/google/person_in_steamy_room.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/2.png b/public/images/emoji/google/person_in_steamy_room/2.png
new file mode 100644
index 00000000000..c85e42308d1
Binary files /dev/null and b/public/images/emoji/google/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/3.png b/public/images/emoji/google/person_in_steamy_room/3.png
new file mode 100644
index 00000000000..9e3488f99ba
Binary files /dev/null and b/public/images/emoji/google/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/4.png b/public/images/emoji/google/person_in_steamy_room/4.png
new file mode 100644
index 00000000000..9028b985f3f
Binary files /dev/null and b/public/images/emoji/google/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/5.png b/public/images/emoji/google/person_in_steamy_room/5.png
new file mode 100644
index 00000000000..840f346f830
Binary files /dev/null and b/public/images/emoji/google/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/google/person_in_steamy_room/6.png b/public/images/emoji/google/person_in_steamy_room/6.png
new file mode 100644
index 00000000000..54dbe80a395
Binary files /dev/null and b/public/images/emoji/google/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/google/person_with_ball.png b/public/images/emoji/google/person_with_ball.png
index 13cb1dcc7d7..2f234c1261c 100644
Binary files a/public/images/emoji/google/person_with_ball.png and b/public/images/emoji/google/person_with_ball.png differ
diff --git a/public/images/emoji/google/person_with_ball/2.png b/public/images/emoji/google/person_with_ball/2.png
new file mode 100644
index 00000000000..511ad7125cd
Binary files /dev/null and b/public/images/emoji/google/person_with_ball/2.png differ
diff --git a/public/images/emoji/google/person_with_ball/3.png b/public/images/emoji/google/person_with_ball/3.png
new file mode 100644
index 00000000000..652a2149b8f
Binary files /dev/null and b/public/images/emoji/google/person_with_ball/3.png differ
diff --git a/public/images/emoji/google/person_with_ball/4.png b/public/images/emoji/google/person_with_ball/4.png
new file mode 100644
index 00000000000..3ea11741d3e
Binary files /dev/null and b/public/images/emoji/google/person_with_ball/4.png differ
diff --git a/public/images/emoji/google/person_with_ball/5.png b/public/images/emoji/google/person_with_ball/5.png
new file mode 100644
index 00000000000..28b8f863258
Binary files /dev/null and b/public/images/emoji/google/person_with_ball/5.png differ
diff --git a/public/images/emoji/google/person_with_ball/6.png b/public/images/emoji/google/person_with_ball/6.png
new file mode 100644
index 00000000000..5450f40d54e
Binary files /dev/null and b/public/images/emoji/google/person_with_ball/6.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair.png b/public/images/emoji/google/person_with_blond_hair.png
index a06b4e01e78..69d6b0b5a7e 100644
Binary files a/public/images/emoji/google/person_with_blond_hair.png and b/public/images/emoji/google/person_with_blond_hair.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/2.png b/public/images/emoji/google/person_with_blond_hair/2.png
new file mode 100644
index 00000000000..71286ddbf4e
Binary files /dev/null and b/public/images/emoji/google/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/3.png b/public/images/emoji/google/person_with_blond_hair/3.png
new file mode 100644
index 00000000000..f5ccb5bc267
Binary files /dev/null and b/public/images/emoji/google/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/4.png b/public/images/emoji/google/person_with_blond_hair/4.png
new file mode 100644
index 00000000000..2d068f1de93
Binary files /dev/null and b/public/images/emoji/google/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/5.png b/public/images/emoji/google/person_with_blond_hair/5.png
new file mode 100644
index 00000000000..af6fe7aa988
Binary files /dev/null and b/public/images/emoji/google/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/google/person_with_blond_hair/6.png b/public/images/emoji/google/person_with_blond_hair/6.png
new file mode 100644
index 00000000000..85e4e9885b0
Binary files /dev/null and b/public/images/emoji/google/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face.png b/public/images/emoji/google/person_with_pouting_face.png
index c0c736f741f..3cfb0b6d15d 100644
Binary files a/public/images/emoji/google/person_with_pouting_face.png and b/public/images/emoji/google/person_with_pouting_face.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/2.png b/public/images/emoji/google/person_with_pouting_face/2.png
new file mode 100644
index 00000000000..f63af15d1d6
Binary files /dev/null and b/public/images/emoji/google/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/3.png b/public/images/emoji/google/person_with_pouting_face/3.png
new file mode 100644
index 00000000000..02d18d8a15e
Binary files /dev/null and b/public/images/emoji/google/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/4.png b/public/images/emoji/google/person_with_pouting_face/4.png
new file mode 100644
index 00000000000..9590fed0e8b
Binary files /dev/null and b/public/images/emoji/google/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/5.png b/public/images/emoji/google/person_with_pouting_face/5.png
new file mode 100644
index 00000000000..88232fbee9f
Binary files /dev/null and b/public/images/emoji/google/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/google/person_with_pouting_face/6.png b/public/images/emoji/google/person_with_pouting_face/6.png
new file mode 100644
index 00000000000..80d274c07aa
Binary files /dev/null and b/public/images/emoji/google/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/google/peru.png b/public/images/emoji/google/peru.png
new file mode 100644
index 00000000000..e468cd48844
Binary files /dev/null and b/public/images/emoji/google/peru.png differ
diff --git a/public/images/emoji/google/philippines.png b/public/images/emoji/google/philippines.png
new file mode 100644
index 00000000000..bdb66d85244
Binary files /dev/null and b/public/images/emoji/google/philippines.png differ
diff --git a/public/images/emoji/google/phone.png b/public/images/emoji/google/phone.png
new file mode 100644
index 00000000000..24450536868
Binary files /dev/null and b/public/images/emoji/google/phone.png differ
diff --git a/public/images/emoji/google/pick.png b/public/images/emoji/google/pick.png
index 71711ef1dc3..81bdd231595 100644
Binary files a/public/images/emoji/google/pick.png and b/public/images/emoji/google/pick.png differ
diff --git a/public/images/emoji/google/pie.png b/public/images/emoji/google/pie.png
new file mode 100644
index 00000000000..71919170c9a
Binary files /dev/null and b/public/images/emoji/google/pie.png differ
diff --git a/public/images/emoji/google/pig.png b/public/images/emoji/google/pig.png
index 068633b3a8d..246085679cf 100644
Binary files a/public/images/emoji/google/pig.png and b/public/images/emoji/google/pig.png differ
diff --git a/public/images/emoji/google/pig2.png b/public/images/emoji/google/pig2.png
index 6c6f5ff05b6..36bc51f9cfd 100644
Binary files a/public/images/emoji/google/pig2.png and b/public/images/emoji/google/pig2.png differ
diff --git a/public/images/emoji/google/pig_nose.png b/public/images/emoji/google/pig_nose.png
index 172289f230a..909362877f1 100644
Binary files a/public/images/emoji/google/pig_nose.png and b/public/images/emoji/google/pig_nose.png differ
diff --git a/public/images/emoji/google/pill.png b/public/images/emoji/google/pill.png
index a214b591cc8..2db3e8c5ea7 100644
Binary files a/public/images/emoji/google/pill.png and b/public/images/emoji/google/pill.png differ
diff --git a/public/images/emoji/google/pineapple.png b/public/images/emoji/google/pineapple.png
index c7bbbed3a11..1bc45c75c94 100644
Binary files a/public/images/emoji/google/pineapple.png and b/public/images/emoji/google/pineapple.png differ
diff --git a/public/images/emoji/google/ping_pong.png b/public/images/emoji/google/ping_pong.png
index e43ef813b10..8390f27bb8b 100644
Binary files a/public/images/emoji/google/ping_pong.png and b/public/images/emoji/google/ping_pong.png differ
diff --git a/public/images/emoji/google/pisces.png b/public/images/emoji/google/pisces.png
index fcac319f367..11390d483ec 100644
Binary files a/public/images/emoji/google/pisces.png and b/public/images/emoji/google/pisces.png differ
diff --git a/public/images/emoji/google/pitcairn_islands.png b/public/images/emoji/google/pitcairn_islands.png
new file mode 100644
index 00000000000..36e2e4183f0
Binary files /dev/null and b/public/images/emoji/google/pitcairn_islands.png differ
diff --git a/public/images/emoji/google/pizza.png b/public/images/emoji/google/pizza.png
index 8ef0aed7119..b8073d8d823 100644
Binary files a/public/images/emoji/google/pizza.png and b/public/images/emoji/google/pizza.png differ
diff --git a/public/images/emoji/google/place_of_worship.png b/public/images/emoji/google/place_of_worship.png
index 7783233e9f9..0cc3774779c 100644
Binary files a/public/images/emoji/google/place_of_worship.png and b/public/images/emoji/google/place_of_worship.png differ
diff --git a/public/images/emoji/google/plate_with_cutlery.png b/public/images/emoji/google/plate_with_cutlery.png
new file mode 100644
index 00000000000..a990ed2cbe4
Binary files /dev/null and b/public/images/emoji/google/plate_with_cutlery.png differ
diff --git a/public/images/emoji/google/play_or_pause_button.png b/public/images/emoji/google/play_or_pause_button.png
new file mode 100644
index 00000000000..75254d8a0e6
Binary files /dev/null and b/public/images/emoji/google/play_or_pause_button.png differ
diff --git a/public/images/emoji/google/play_pause.png b/public/images/emoji/google/play_pause.png
index eb1d4b2473c..75254d8a0e6 100644
Binary files a/public/images/emoji/google/play_pause.png and b/public/images/emoji/google/play_pause.png differ
diff --git a/public/images/emoji/google/point_down.png b/public/images/emoji/google/point_down.png
index 8d72ac773f8..6530e95cff7 100644
Binary files a/public/images/emoji/google/point_down.png and b/public/images/emoji/google/point_down.png differ
diff --git a/public/images/emoji/google/point_down/2.png b/public/images/emoji/google/point_down/2.png
new file mode 100644
index 00000000000..86a151d38c2
Binary files /dev/null and b/public/images/emoji/google/point_down/2.png differ
diff --git a/public/images/emoji/google/point_down/3.png b/public/images/emoji/google/point_down/3.png
new file mode 100644
index 00000000000..a051834bf11
Binary files /dev/null and b/public/images/emoji/google/point_down/3.png differ
diff --git a/public/images/emoji/google/point_down/4.png b/public/images/emoji/google/point_down/4.png
new file mode 100644
index 00000000000..88a08aeb952
Binary files /dev/null and b/public/images/emoji/google/point_down/4.png differ
diff --git a/public/images/emoji/google/point_down/5.png b/public/images/emoji/google/point_down/5.png
new file mode 100644
index 00000000000..78d1d82aa45
Binary files /dev/null and b/public/images/emoji/google/point_down/5.png differ
diff --git a/public/images/emoji/google/point_down/6.png b/public/images/emoji/google/point_down/6.png
new file mode 100644
index 00000000000..a7e3837f239
Binary files /dev/null and b/public/images/emoji/google/point_down/6.png differ
diff --git a/public/images/emoji/google/point_left.png b/public/images/emoji/google/point_left.png
index 1705f088c14..aa813b51d30 100644
Binary files a/public/images/emoji/google/point_left.png and b/public/images/emoji/google/point_left.png differ
diff --git a/public/images/emoji/google/point_left/2.png b/public/images/emoji/google/point_left/2.png
new file mode 100644
index 00000000000..f574ba95583
Binary files /dev/null and b/public/images/emoji/google/point_left/2.png differ
diff --git a/public/images/emoji/google/point_left/3.png b/public/images/emoji/google/point_left/3.png
new file mode 100644
index 00000000000..157a2286ff5
Binary files /dev/null and b/public/images/emoji/google/point_left/3.png differ
diff --git a/public/images/emoji/google/point_left/4.png b/public/images/emoji/google/point_left/4.png
new file mode 100644
index 00000000000..3a5b3c24eff
Binary files /dev/null and b/public/images/emoji/google/point_left/4.png differ
diff --git a/public/images/emoji/google/point_left/5.png b/public/images/emoji/google/point_left/5.png
new file mode 100644
index 00000000000..fb4b460b5bc
Binary files /dev/null and b/public/images/emoji/google/point_left/5.png differ
diff --git a/public/images/emoji/google/point_left/6.png b/public/images/emoji/google/point_left/6.png
new file mode 100644
index 00000000000..f8e91dad488
Binary files /dev/null and b/public/images/emoji/google/point_left/6.png differ
diff --git a/public/images/emoji/google/point_right.png b/public/images/emoji/google/point_right.png
index 3d5f77bbd9d..ec4187d7baf 100644
Binary files a/public/images/emoji/google/point_right.png and b/public/images/emoji/google/point_right.png differ
diff --git a/public/images/emoji/google/point_right/2.png b/public/images/emoji/google/point_right/2.png
new file mode 100644
index 00000000000..4e682eebbb2
Binary files /dev/null and b/public/images/emoji/google/point_right/2.png differ
diff --git a/public/images/emoji/google/point_right/3.png b/public/images/emoji/google/point_right/3.png
new file mode 100644
index 00000000000..ca02a74b537
Binary files /dev/null and b/public/images/emoji/google/point_right/3.png differ
diff --git a/public/images/emoji/google/point_right/4.png b/public/images/emoji/google/point_right/4.png
new file mode 100644
index 00000000000..8ae8ced01ff
Binary files /dev/null and b/public/images/emoji/google/point_right/4.png differ
diff --git a/public/images/emoji/google/point_right/5.png b/public/images/emoji/google/point_right/5.png
new file mode 100644
index 00000000000..388e88f4aca
Binary files /dev/null and b/public/images/emoji/google/point_right/5.png differ
diff --git a/public/images/emoji/google/point_right/6.png b/public/images/emoji/google/point_right/6.png
new file mode 100644
index 00000000000..be0960e5d0f
Binary files /dev/null and b/public/images/emoji/google/point_right/6.png differ
diff --git a/public/images/emoji/google/point_up.png b/public/images/emoji/google/point_up.png
index 4e8393a3854..7589c68d4f3 100644
Binary files a/public/images/emoji/google/point_up.png and b/public/images/emoji/google/point_up.png differ
diff --git a/public/images/emoji/google/point_up/2.png b/public/images/emoji/google/point_up/2.png
new file mode 100644
index 00000000000..bf48906da65
Binary files /dev/null and b/public/images/emoji/google/point_up/2.png differ
diff --git a/public/images/emoji/google/point_up/3.png b/public/images/emoji/google/point_up/3.png
new file mode 100644
index 00000000000..8de6a0c4c97
Binary files /dev/null and b/public/images/emoji/google/point_up/3.png differ
diff --git a/public/images/emoji/google/point_up/4.png b/public/images/emoji/google/point_up/4.png
new file mode 100644
index 00000000000..b7196bafcce
Binary files /dev/null and b/public/images/emoji/google/point_up/4.png differ
diff --git a/public/images/emoji/google/point_up/5.png b/public/images/emoji/google/point_up/5.png
new file mode 100644
index 00000000000..a9a3f6fdc02
Binary files /dev/null and b/public/images/emoji/google/point_up/5.png differ
diff --git a/public/images/emoji/google/point_up/6.png b/public/images/emoji/google/point_up/6.png
new file mode 100644
index 00000000000..8c6f7ba9569
Binary files /dev/null and b/public/images/emoji/google/point_up/6.png differ
diff --git a/public/images/emoji/google/point_up_2.png b/public/images/emoji/google/point_up_2.png
index 7bf80c22c29..99b63169d9f 100644
Binary files a/public/images/emoji/google/point_up_2.png and b/public/images/emoji/google/point_up_2.png differ
diff --git a/public/images/emoji/google/point_up_2/2.png b/public/images/emoji/google/point_up_2/2.png
new file mode 100644
index 00000000000..7064adcd53c
Binary files /dev/null and b/public/images/emoji/google/point_up_2/2.png differ
diff --git a/public/images/emoji/google/point_up_2/3.png b/public/images/emoji/google/point_up_2/3.png
new file mode 100644
index 00000000000..e74c10fac40
Binary files /dev/null and b/public/images/emoji/google/point_up_2/3.png differ
diff --git a/public/images/emoji/google/point_up_2/4.png b/public/images/emoji/google/point_up_2/4.png
new file mode 100644
index 00000000000..034e80952cf
Binary files /dev/null and b/public/images/emoji/google/point_up_2/4.png differ
diff --git a/public/images/emoji/google/point_up_2/5.png b/public/images/emoji/google/point_up_2/5.png
new file mode 100644
index 00000000000..3e5fdceccaf
Binary files /dev/null and b/public/images/emoji/google/point_up_2/5.png differ
diff --git a/public/images/emoji/google/point_up_2/6.png b/public/images/emoji/google/point_up_2/6.png
new file mode 100644
index 00000000000..14eec3497e4
Binary files /dev/null and b/public/images/emoji/google/point_up_2/6.png differ
diff --git a/public/images/emoji/google/poland.png b/public/images/emoji/google/poland.png
new file mode 100644
index 00000000000..f8f096e9cf7
Binary files /dev/null and b/public/images/emoji/google/poland.png differ
diff --git a/public/images/emoji/google/police_car.png b/public/images/emoji/google/police_car.png
index 6f98dcfcc14..9dc3c17e9bf 100644
Binary files a/public/images/emoji/google/police_car.png and b/public/images/emoji/google/police_car.png differ
diff --git a/public/images/emoji/google/policeman.png b/public/images/emoji/google/policeman.png
new file mode 100644
index 00000000000..c6e424f54a1
Binary files /dev/null and b/public/images/emoji/google/policeman.png differ
diff --git a/public/images/emoji/google/policeman/2.png b/public/images/emoji/google/policeman/2.png
new file mode 100644
index 00000000000..74bc0da8f2c
Binary files /dev/null and b/public/images/emoji/google/policeman/2.png differ
diff --git a/public/images/emoji/google/policeman/3.png b/public/images/emoji/google/policeman/3.png
new file mode 100644
index 00000000000..d461370fdbf
Binary files /dev/null and b/public/images/emoji/google/policeman/3.png differ
diff --git a/public/images/emoji/google/policeman/4.png b/public/images/emoji/google/policeman/4.png
new file mode 100644
index 00000000000..12d654b4e5e
Binary files /dev/null and b/public/images/emoji/google/policeman/4.png differ
diff --git a/public/images/emoji/google/policeman/5.png b/public/images/emoji/google/policeman/5.png
new file mode 100644
index 00000000000..d555c18f792
Binary files /dev/null and b/public/images/emoji/google/policeman/5.png differ
diff --git a/public/images/emoji/google/policeman/6.png b/public/images/emoji/google/policeman/6.png
new file mode 100644
index 00000000000..0542d87a6a2
Binary files /dev/null and b/public/images/emoji/google/policeman/6.png differ
diff --git a/public/images/emoji/google/policewoman.png b/public/images/emoji/google/policewoman.png
new file mode 100644
index 00000000000..b00f14d2fd1
Binary files /dev/null and b/public/images/emoji/google/policewoman.png differ
diff --git a/public/images/emoji/google/policewoman/2.png b/public/images/emoji/google/policewoman/2.png
new file mode 100644
index 00000000000..5e7e99b42e3
Binary files /dev/null and b/public/images/emoji/google/policewoman/2.png differ
diff --git a/public/images/emoji/google/policewoman/3.png b/public/images/emoji/google/policewoman/3.png
new file mode 100644
index 00000000000..cc435948393
Binary files /dev/null and b/public/images/emoji/google/policewoman/3.png differ
diff --git a/public/images/emoji/google/policewoman/4.png b/public/images/emoji/google/policewoman/4.png
new file mode 100644
index 00000000000..b9109d47d62
Binary files /dev/null and b/public/images/emoji/google/policewoman/4.png differ
diff --git a/public/images/emoji/google/policewoman/5.png b/public/images/emoji/google/policewoman/5.png
new file mode 100644
index 00000000000..b44c2ea1e0a
Binary files /dev/null and b/public/images/emoji/google/policewoman/5.png differ
diff --git a/public/images/emoji/google/policewoman/6.png b/public/images/emoji/google/policewoman/6.png
new file mode 100644
index 00000000000..cd94a46c766
Binary files /dev/null and b/public/images/emoji/google/policewoman/6.png differ
diff --git a/public/images/emoji/google/poo.png b/public/images/emoji/google/poo.png
index 87d78669668..b1d921d96c2 100644
Binary files a/public/images/emoji/google/poo.png and b/public/images/emoji/google/poo.png differ
diff --git a/public/images/emoji/google/poodle.png b/public/images/emoji/google/poodle.png
index dc4ad28221a..c8aa1889e4b 100644
Binary files a/public/images/emoji/google/poodle.png and b/public/images/emoji/google/poodle.png differ
diff --git a/public/images/emoji/google/poop.png b/public/images/emoji/google/poop.png
index 87d78669668..b1d921d96c2 100644
Binary files a/public/images/emoji/google/poop.png and b/public/images/emoji/google/poop.png differ
diff --git a/public/images/emoji/google/popcorn.png b/public/images/emoji/google/popcorn.png
index 55b9d7dbf1b..9041ab3d1fb 100644
Binary files a/public/images/emoji/google/popcorn.png and b/public/images/emoji/google/popcorn.png differ
diff --git a/public/images/emoji/google/portugal.png b/public/images/emoji/google/portugal.png
new file mode 100644
index 00000000000..70685125ba4
Binary files /dev/null and b/public/images/emoji/google/portugal.png differ
diff --git a/public/images/emoji/google/post_office.png b/public/images/emoji/google/post_office.png
index eae3454c86c..7a2fb070072 100644
Binary files a/public/images/emoji/google/post_office.png and b/public/images/emoji/google/post_office.png differ
diff --git a/public/images/emoji/google/postal_horn.png b/public/images/emoji/google/postal_horn.png
index ad913668e37..43646f03df6 100644
Binary files a/public/images/emoji/google/postal_horn.png and b/public/images/emoji/google/postal_horn.png differ
diff --git a/public/images/emoji/google/postbox.png b/public/images/emoji/google/postbox.png
index ae37adf3d1a..67b9059a7c6 100644
Binary files a/public/images/emoji/google/postbox.png and b/public/images/emoji/google/postbox.png differ
diff --git a/public/images/emoji/google/potable_water.png b/public/images/emoji/google/potable_water.png
index 2e4b6e90b64..b40de98bdc0 100644
Binary files a/public/images/emoji/google/potable_water.png and b/public/images/emoji/google/potable_water.png differ
diff --git a/public/images/emoji/google/potato.png b/public/images/emoji/google/potato.png
new file mode 100644
index 00000000000..065939c3827
Binary files /dev/null and b/public/images/emoji/google/potato.png differ
diff --git a/public/images/emoji/google/pouch.png b/public/images/emoji/google/pouch.png
index 2367b38e630..88a91f76f2a 100644
Binary files a/public/images/emoji/google/pouch.png and b/public/images/emoji/google/pouch.png differ
diff --git a/public/images/emoji/google/poultry_leg.png b/public/images/emoji/google/poultry_leg.png
index cf61c8eba04..acb0f99d720 100644
Binary files a/public/images/emoji/google/poultry_leg.png and b/public/images/emoji/google/poultry_leg.png differ
diff --git a/public/images/emoji/google/pound.png b/public/images/emoji/google/pound.png
index 9cb7a82163e..a44b7a12982 100644
Binary files a/public/images/emoji/google/pound.png and b/public/images/emoji/google/pound.png differ
diff --git a/public/images/emoji/google/pouting_cat.png b/public/images/emoji/google/pouting_cat.png
index 32754df9bf0..bdfc781f7b3 100644
Binary files a/public/images/emoji/google/pouting_cat.png and b/public/images/emoji/google/pouting_cat.png differ
diff --git a/public/images/emoji/google/pouting_man.png b/public/images/emoji/google/pouting_man.png
new file mode 100644
index 00000000000..07bb3d8bdf2
Binary files /dev/null and b/public/images/emoji/google/pouting_man.png differ
diff --git a/public/images/emoji/google/pouting_man/2.png b/public/images/emoji/google/pouting_man/2.png
new file mode 100644
index 00000000000..7e8ab5ac36f
Binary files /dev/null and b/public/images/emoji/google/pouting_man/2.png differ
diff --git a/public/images/emoji/google/pouting_man/3.png b/public/images/emoji/google/pouting_man/3.png
new file mode 100644
index 00000000000..7d01cfbe5cd
Binary files /dev/null and b/public/images/emoji/google/pouting_man/3.png differ
diff --git a/public/images/emoji/google/pouting_man/4.png b/public/images/emoji/google/pouting_man/4.png
new file mode 100644
index 00000000000..e6ad0ebd972
Binary files /dev/null and b/public/images/emoji/google/pouting_man/4.png differ
diff --git a/public/images/emoji/google/pouting_man/5.png b/public/images/emoji/google/pouting_man/5.png
new file mode 100644
index 00000000000..6a52e8697e7
Binary files /dev/null and b/public/images/emoji/google/pouting_man/5.png differ
diff --git a/public/images/emoji/google/pouting_man/6.png b/public/images/emoji/google/pouting_man/6.png
new file mode 100644
index 00000000000..d39407f1a3c
Binary files /dev/null and b/public/images/emoji/google/pouting_man/6.png differ
diff --git a/public/images/emoji/google/pouting_woman.png b/public/images/emoji/google/pouting_woman.png
new file mode 100644
index 00000000000..3cfb0b6d15d
Binary files /dev/null and b/public/images/emoji/google/pouting_woman.png differ
diff --git a/public/images/emoji/google/pouting_woman/2.png b/public/images/emoji/google/pouting_woman/2.png
new file mode 100644
index 00000000000..f63af15d1d6
Binary files /dev/null and b/public/images/emoji/google/pouting_woman/2.png differ
diff --git a/public/images/emoji/google/pouting_woman/3.png b/public/images/emoji/google/pouting_woman/3.png
new file mode 100644
index 00000000000..02d18d8a15e
Binary files /dev/null and b/public/images/emoji/google/pouting_woman/3.png differ
diff --git a/public/images/emoji/google/pouting_woman/4.png b/public/images/emoji/google/pouting_woman/4.png
new file mode 100644
index 00000000000..9590fed0e8b
Binary files /dev/null and b/public/images/emoji/google/pouting_woman/4.png differ
diff --git a/public/images/emoji/google/pouting_woman/5.png b/public/images/emoji/google/pouting_woman/5.png
new file mode 100644
index 00000000000..88232fbee9f
Binary files /dev/null and b/public/images/emoji/google/pouting_woman/5.png differ
diff --git a/public/images/emoji/google/pouting_woman/6.png b/public/images/emoji/google/pouting_woman/6.png
new file mode 100644
index 00000000000..80d274c07aa
Binary files /dev/null and b/public/images/emoji/google/pouting_woman/6.png differ
diff --git a/public/images/emoji/google/pray.png b/public/images/emoji/google/pray.png
index 320b8952bd3..eb1892ae029 100644
Binary files a/public/images/emoji/google/pray.png and b/public/images/emoji/google/pray.png differ
diff --git a/public/images/emoji/google/pray/2.png b/public/images/emoji/google/pray/2.png
new file mode 100644
index 00000000000..9c54413a720
Binary files /dev/null and b/public/images/emoji/google/pray/2.png differ
diff --git a/public/images/emoji/google/pray/3.png b/public/images/emoji/google/pray/3.png
new file mode 100644
index 00000000000..6281185ef7d
Binary files /dev/null and b/public/images/emoji/google/pray/3.png differ
diff --git a/public/images/emoji/google/pray/4.png b/public/images/emoji/google/pray/4.png
new file mode 100644
index 00000000000..23334af3ad9
Binary files /dev/null and b/public/images/emoji/google/pray/4.png differ
diff --git a/public/images/emoji/google/pray/5.png b/public/images/emoji/google/pray/5.png
new file mode 100644
index 00000000000..7304df459a5
Binary files /dev/null and b/public/images/emoji/google/pray/5.png differ
diff --git a/public/images/emoji/google/pray/6.png b/public/images/emoji/google/pray/6.png
new file mode 100644
index 00000000000..3b67bdd5227
Binary files /dev/null and b/public/images/emoji/google/pray/6.png differ
diff --git a/public/images/emoji/google/prayer_beads.png b/public/images/emoji/google/prayer_beads.png
index 3016620ec55..e67ffc8c3a6 100644
Binary files a/public/images/emoji/google/prayer_beads.png and b/public/images/emoji/google/prayer_beads.png differ
diff --git a/public/images/emoji/google/pregnant_woman.png b/public/images/emoji/google/pregnant_woman.png
new file mode 100644
index 00000000000..c56f668d183
Binary files /dev/null and b/public/images/emoji/google/pregnant_woman.png differ
diff --git a/public/images/emoji/google/pregnant_woman/2.png b/public/images/emoji/google/pregnant_woman/2.png
new file mode 100644
index 00000000000..3c439cfa610
Binary files /dev/null and b/public/images/emoji/google/pregnant_woman/2.png differ
diff --git a/public/images/emoji/google/pregnant_woman/3.png b/public/images/emoji/google/pregnant_woman/3.png
new file mode 100644
index 00000000000..ac810fa3051
Binary files /dev/null and b/public/images/emoji/google/pregnant_woman/3.png differ
diff --git a/public/images/emoji/google/pregnant_woman/4.png b/public/images/emoji/google/pregnant_woman/4.png
new file mode 100644
index 00000000000..893dc91287d
Binary files /dev/null and b/public/images/emoji/google/pregnant_woman/4.png differ
diff --git a/public/images/emoji/google/pregnant_woman/5.png b/public/images/emoji/google/pregnant_woman/5.png
new file mode 100644
index 00000000000..e3b1bb4e546
Binary files /dev/null and b/public/images/emoji/google/pregnant_woman/5.png differ
diff --git a/public/images/emoji/google/pregnant_woman/6.png b/public/images/emoji/google/pregnant_woman/6.png
new file mode 100644
index 00000000000..5b9b93f1fa8
Binary files /dev/null and b/public/images/emoji/google/pregnant_woman/6.png differ
diff --git a/public/images/emoji/google/pretzel.png b/public/images/emoji/google/pretzel.png
new file mode 100644
index 00000000000..615e11503a1
Binary files /dev/null and b/public/images/emoji/google/pretzel.png differ
diff --git a/public/images/emoji/google/previous_track.png b/public/images/emoji/google/previous_track.png
index 0ef5600a450..559086b3c06 100644
Binary files a/public/images/emoji/google/previous_track.png and b/public/images/emoji/google/previous_track.png differ
diff --git a/public/images/emoji/google/previous_track_button.png b/public/images/emoji/google/previous_track_button.png
new file mode 100644
index 00000000000..559086b3c06
Binary files /dev/null and b/public/images/emoji/google/previous_track_button.png differ
diff --git a/public/images/emoji/google/prince.png b/public/images/emoji/google/prince.png
new file mode 100644
index 00000000000..9829fa23d6d
Binary files /dev/null and b/public/images/emoji/google/prince.png differ
diff --git a/public/images/emoji/google/prince/2.png b/public/images/emoji/google/prince/2.png
new file mode 100644
index 00000000000..cb34d61e3cf
Binary files /dev/null and b/public/images/emoji/google/prince/2.png differ
diff --git a/public/images/emoji/google/prince/3.png b/public/images/emoji/google/prince/3.png
new file mode 100644
index 00000000000..362d7c4ec44
Binary files /dev/null and b/public/images/emoji/google/prince/3.png differ
diff --git a/public/images/emoji/google/prince/4.png b/public/images/emoji/google/prince/4.png
new file mode 100644
index 00000000000..57cb400ea26
Binary files /dev/null and b/public/images/emoji/google/prince/4.png differ
diff --git a/public/images/emoji/google/prince/5.png b/public/images/emoji/google/prince/5.png
new file mode 100644
index 00000000000..28598ace62f
Binary files /dev/null and b/public/images/emoji/google/prince/5.png differ
diff --git a/public/images/emoji/google/prince/6.png b/public/images/emoji/google/prince/6.png
new file mode 100644
index 00000000000..68fa20f10bd
Binary files /dev/null and b/public/images/emoji/google/prince/6.png differ
diff --git a/public/images/emoji/google/princess.png b/public/images/emoji/google/princess.png
index 2aecbe96a4e..de506646b47 100644
Binary files a/public/images/emoji/google/princess.png and b/public/images/emoji/google/princess.png differ
diff --git a/public/images/emoji/google/princess/2.png b/public/images/emoji/google/princess/2.png
new file mode 100644
index 00000000000..d576ce4df82
Binary files /dev/null and b/public/images/emoji/google/princess/2.png differ
diff --git a/public/images/emoji/google/princess/3.png b/public/images/emoji/google/princess/3.png
new file mode 100644
index 00000000000..96484ff7914
Binary files /dev/null and b/public/images/emoji/google/princess/3.png differ
diff --git a/public/images/emoji/google/princess/4.png b/public/images/emoji/google/princess/4.png
new file mode 100644
index 00000000000..7429f3ed815
Binary files /dev/null and b/public/images/emoji/google/princess/4.png differ
diff --git a/public/images/emoji/google/princess/5.png b/public/images/emoji/google/princess/5.png
new file mode 100644
index 00000000000..a1a476332a0
Binary files /dev/null and b/public/images/emoji/google/princess/5.png differ
diff --git a/public/images/emoji/google/princess/6.png b/public/images/emoji/google/princess/6.png
new file mode 100644
index 00000000000..5599020832a
Binary files /dev/null and b/public/images/emoji/google/princess/6.png differ
diff --git a/public/images/emoji/google/printer.png b/public/images/emoji/google/printer.png
index 711fd7fbe13..bc356b7b5ce 100644
Binary files a/public/images/emoji/google/printer.png and b/public/images/emoji/google/printer.png differ
diff --git a/public/images/emoji/google/projector.png b/public/images/emoji/google/projector.png
index b626d6088c9..f957286ba21 100644
Binary files a/public/images/emoji/google/projector.png and b/public/images/emoji/google/projector.png differ
diff --git a/public/images/emoji/google/puerto_rico.png b/public/images/emoji/google/puerto_rico.png
new file mode 100644
index 00000000000..8762d9ce24c
Binary files /dev/null and b/public/images/emoji/google/puerto_rico.png differ
diff --git a/public/images/emoji/google/punch.png b/public/images/emoji/google/punch.png
index f1d24709998..f05a3f6d14c 100644
Binary files a/public/images/emoji/google/punch.png and b/public/images/emoji/google/punch.png differ
diff --git a/public/images/emoji/google/punch/2.png b/public/images/emoji/google/punch/2.png
new file mode 100644
index 00000000000..bba3d6fe12b
Binary files /dev/null and b/public/images/emoji/google/punch/2.png differ
diff --git a/public/images/emoji/google/punch/3.png b/public/images/emoji/google/punch/3.png
new file mode 100644
index 00000000000..123e4450309
Binary files /dev/null and b/public/images/emoji/google/punch/3.png differ
diff --git a/public/images/emoji/google/punch/4.png b/public/images/emoji/google/punch/4.png
new file mode 100644
index 00000000000..974055c6286
Binary files /dev/null and b/public/images/emoji/google/punch/4.png differ
diff --git a/public/images/emoji/google/punch/5.png b/public/images/emoji/google/punch/5.png
new file mode 100644
index 00000000000..3f068a0f950
Binary files /dev/null and b/public/images/emoji/google/punch/5.png differ
diff --git a/public/images/emoji/google/punch/6.png b/public/images/emoji/google/punch/6.png
new file mode 100644
index 00000000000..798a95d9fd6
Binary files /dev/null and b/public/images/emoji/google/punch/6.png differ
diff --git a/public/images/emoji/google/purple_heart.png b/public/images/emoji/google/purple_heart.png
index 2aa3a5a10de..dab19a7cb7c 100644
Binary files a/public/images/emoji/google/purple_heart.png and b/public/images/emoji/google/purple_heart.png differ
diff --git a/public/images/emoji/google/purse.png b/public/images/emoji/google/purse.png
index 3c1c44845c7..728bd8fd536 100644
Binary files a/public/images/emoji/google/purse.png and b/public/images/emoji/google/purse.png differ
diff --git a/public/images/emoji/google/pushpin.png b/public/images/emoji/google/pushpin.png
index dcf40de1fd2..cb6e075c9c6 100644
Binary files a/public/images/emoji/google/pushpin.png and b/public/images/emoji/google/pushpin.png differ
diff --git a/public/images/emoji/google/put_litter_in_its_place.png b/public/images/emoji/google/put_litter_in_its_place.png
index 9736f427f14..ec4606998f8 100644
Binary files a/public/images/emoji/google/put_litter_in_its_place.png and b/public/images/emoji/google/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/google/qatar.png b/public/images/emoji/google/qatar.png
new file mode 100644
index 00000000000..8e058678efa
Binary files /dev/null and b/public/images/emoji/google/qatar.png differ
diff --git a/public/images/emoji/google/question.png b/public/images/emoji/google/question.png
index 80938421a3d..36d2465b862 100644
Binary files a/public/images/emoji/google/question.png and b/public/images/emoji/google/question.png differ
diff --git a/public/images/emoji/google/rabbit.png b/public/images/emoji/google/rabbit.png
index 01024697072..1ec796818c5 100644
Binary files a/public/images/emoji/google/rabbit.png and b/public/images/emoji/google/rabbit.png differ
diff --git a/public/images/emoji/google/rabbit2.png b/public/images/emoji/google/rabbit2.png
index cbb91dbda37..06be3a3850f 100644
Binary files a/public/images/emoji/google/rabbit2.png and b/public/images/emoji/google/rabbit2.png differ
diff --git a/public/images/emoji/google/race_car.png b/public/images/emoji/google/race_car.png
index c26550d13a2..60577b2803c 100644
Binary files a/public/images/emoji/google/race_car.png and b/public/images/emoji/google/race_car.png differ
diff --git a/public/images/emoji/google/racehorse.png b/public/images/emoji/google/racehorse.png
index 6a35a410146..3ce637440ef 100644
Binary files a/public/images/emoji/google/racehorse.png and b/public/images/emoji/google/racehorse.png differ
diff --git a/public/images/emoji/google/racing_car.png b/public/images/emoji/google/racing_car.png
index c26550d13a2..60577b2803c 100644
Binary files a/public/images/emoji/google/racing_car.png and b/public/images/emoji/google/racing_car.png differ
diff --git a/public/images/emoji/google/racing_motorcycle.png b/public/images/emoji/google/racing_motorcycle.png
index 59a73872fe7..d153c400edb 100644
Binary files a/public/images/emoji/google/racing_motorcycle.png and b/public/images/emoji/google/racing_motorcycle.png differ
diff --git a/public/images/emoji/google/radio.png b/public/images/emoji/google/radio.png
index d797df04cbb..2b6ebf3c6c0 100644
Binary files a/public/images/emoji/google/radio.png and b/public/images/emoji/google/radio.png differ
diff --git a/public/images/emoji/google/radio_button.png b/public/images/emoji/google/radio_button.png
index 0c767cd8019..0175b6c9aa8 100644
Binary files a/public/images/emoji/google/radio_button.png and b/public/images/emoji/google/radio_button.png differ
diff --git a/public/images/emoji/google/radioactive.png b/public/images/emoji/google/radioactive.png
index e977189f9ee..0f447cc8a73 100644
Binary files a/public/images/emoji/google/radioactive.png and b/public/images/emoji/google/radioactive.png differ
diff --git a/public/images/emoji/google/radioactive_sign.png b/public/images/emoji/google/radioactive_sign.png
index e977189f9ee..0f447cc8a73 100644
Binary files a/public/images/emoji/google/radioactive_sign.png and b/public/images/emoji/google/radioactive_sign.png differ
diff --git a/public/images/emoji/google/rage.png b/public/images/emoji/google/rage.png
index 17ad7b63073..c7ae736cad8 100644
Binary files a/public/images/emoji/google/rage.png and b/public/images/emoji/google/rage.png differ
diff --git a/public/images/emoji/google/railroad_track.png b/public/images/emoji/google/railroad_track.png
index 3a7795e3035..6c11df97547 100644
Binary files a/public/images/emoji/google/railroad_track.png and b/public/images/emoji/google/railroad_track.png differ
diff --git a/public/images/emoji/google/railway_car.png b/public/images/emoji/google/railway_car.png
index 53cecd4db7e..a84af6e421c 100644
Binary files a/public/images/emoji/google/railway_car.png and b/public/images/emoji/google/railway_car.png differ
diff --git a/public/images/emoji/google/railway_track.png b/public/images/emoji/google/railway_track.png
index 3a7795e3035..6c11df97547 100644
Binary files a/public/images/emoji/google/railway_track.png and b/public/images/emoji/google/railway_track.png differ
diff --git a/public/images/emoji/google/rainbow.png b/public/images/emoji/google/rainbow.png
index e8246217740..2292152e0d2 100644
Binary files a/public/images/emoji/google/rainbow.png and b/public/images/emoji/google/rainbow.png differ
diff --git a/public/images/emoji/google/rainbow_flag.png b/public/images/emoji/google/rainbow_flag.png
new file mode 100644
index 00000000000..d77a7706714
Binary files /dev/null and b/public/images/emoji/google/rainbow_flag.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand.png b/public/images/emoji/google/raised_back_of_hand.png
new file mode 100644
index 00000000000..ffda7881dc7
Binary files /dev/null and b/public/images/emoji/google/raised_back_of_hand.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/2.png b/public/images/emoji/google/raised_back_of_hand/2.png
new file mode 100644
index 00000000000..cf4b3376bb7
Binary files /dev/null and b/public/images/emoji/google/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/3.png b/public/images/emoji/google/raised_back_of_hand/3.png
new file mode 100644
index 00000000000..4febc58f7df
Binary files /dev/null and b/public/images/emoji/google/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/4.png b/public/images/emoji/google/raised_back_of_hand/4.png
new file mode 100644
index 00000000000..1de5dbde5a7
Binary files /dev/null and b/public/images/emoji/google/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/5.png b/public/images/emoji/google/raised_back_of_hand/5.png
new file mode 100644
index 00000000000..68e1158c3e1
Binary files /dev/null and b/public/images/emoji/google/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/google/raised_back_of_hand/6.png b/public/images/emoji/google/raised_back_of_hand/6.png
new file mode 100644
index 00000000000..505506833f0
Binary files /dev/null and b/public/images/emoji/google/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/google/raised_hand.png b/public/images/emoji/google/raised_hand.png
index 5e035fcfdbb..b916dc7f878 100644
Binary files a/public/images/emoji/google/raised_hand.png and b/public/images/emoji/google/raised_hand.png differ
diff --git a/public/images/emoji/google/raised_hand/2.png b/public/images/emoji/google/raised_hand/2.png
new file mode 100644
index 00000000000..e60690c77eb
Binary files /dev/null and b/public/images/emoji/google/raised_hand/2.png differ
diff --git a/public/images/emoji/google/raised_hand/3.png b/public/images/emoji/google/raised_hand/3.png
new file mode 100644
index 00000000000..9aabb63f85f
Binary files /dev/null and b/public/images/emoji/google/raised_hand/3.png differ
diff --git a/public/images/emoji/google/raised_hand/4.png b/public/images/emoji/google/raised_hand/4.png
new file mode 100644
index 00000000000..86696653b53
Binary files /dev/null and b/public/images/emoji/google/raised_hand/4.png differ
diff --git a/public/images/emoji/google/raised_hand/5.png b/public/images/emoji/google/raised_hand/5.png
new file mode 100644
index 00000000000..1e92c70971d
Binary files /dev/null and b/public/images/emoji/google/raised_hand/5.png differ
diff --git a/public/images/emoji/google/raised_hand/6.png b/public/images/emoji/google/raised_hand/6.png
new file mode 100644
index 00000000000..1e260d44614
Binary files /dev/null and b/public/images/emoji/google/raised_hand/6.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed.png b/public/images/emoji/google/raised_hand_with_fingers_splayed.png
index 52ded94d54a..f99fef5296b 100644
Binary files a/public/images/emoji/google/raised_hand_with_fingers_splayed.png and b/public/images/emoji/google/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png
new file mode 100644
index 00000000000..3f6b667ebe2
Binary files /dev/null and b/public/images/emoji/google/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png
new file mode 100644
index 00000000000..0a811f93d51
Binary files /dev/null and b/public/images/emoji/google/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png
new file mode 100644
index 00000000000..21a92e444c9
Binary files /dev/null and b/public/images/emoji/google/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png
new file mode 100644
index 00000000000..f40f860c160
Binary files /dev/null and b/public/images/emoji/google/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png
new file mode 100644
index 00000000000..b87967ff847
Binary files /dev/null and b/public/images/emoji/google/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png
index 7294a38c1fa..e672a711f11 100644
Binary files a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png
new file mode 100644
index 00000000000..635aa1f7757
Binary files /dev/null and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png
new file mode 100644
index 00000000000..d6c303152c4
Binary files /dev/null and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png
new file mode 100644
index 00000000000..645ad295a80
Binary files /dev/null and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png
new file mode 100644
index 00000000000..cbb240d2c67
Binary files /dev/null and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png
new file mode 100644
index 00000000000..0e727c865aa
Binary files /dev/null and b/public/images/emoji/google/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/google/raised_hands.png b/public/images/emoji/google/raised_hands.png
index 0533bab402b..49cb6a53aaf 100644
Binary files a/public/images/emoji/google/raised_hands.png and b/public/images/emoji/google/raised_hands.png differ
diff --git a/public/images/emoji/google/raised_hands/2.png b/public/images/emoji/google/raised_hands/2.png
new file mode 100644
index 00000000000..d03fdc2ea49
Binary files /dev/null and b/public/images/emoji/google/raised_hands/2.png differ
diff --git a/public/images/emoji/google/raised_hands/3.png b/public/images/emoji/google/raised_hands/3.png
new file mode 100644
index 00000000000..37e9b1277ec
Binary files /dev/null and b/public/images/emoji/google/raised_hands/3.png differ
diff --git a/public/images/emoji/google/raised_hands/4.png b/public/images/emoji/google/raised_hands/4.png
new file mode 100644
index 00000000000..c45d7f3cbaa
Binary files /dev/null and b/public/images/emoji/google/raised_hands/4.png differ
diff --git a/public/images/emoji/google/raised_hands/5.png b/public/images/emoji/google/raised_hands/5.png
new file mode 100644
index 00000000000..3ce79a95f75
Binary files /dev/null and b/public/images/emoji/google/raised_hands/5.png differ
diff --git a/public/images/emoji/google/raised_hands/6.png b/public/images/emoji/google/raised_hands/6.png
new file mode 100644
index 00000000000..b32c537c1f3
Binary files /dev/null and b/public/images/emoji/google/raised_hands/6.png differ
diff --git a/public/images/emoji/google/raising_hand.png b/public/images/emoji/google/raising_hand.png
index 5cef8797da8..72ea7e6bd70 100644
Binary files a/public/images/emoji/google/raising_hand.png and b/public/images/emoji/google/raising_hand.png differ
diff --git a/public/images/emoji/google/raising_hand/2.png b/public/images/emoji/google/raising_hand/2.png
new file mode 100644
index 00000000000..110f5edf80e
Binary files /dev/null and b/public/images/emoji/google/raising_hand/2.png differ
diff --git a/public/images/emoji/google/raising_hand/3.png b/public/images/emoji/google/raising_hand/3.png
new file mode 100644
index 00000000000..5fc1015a025
Binary files /dev/null and b/public/images/emoji/google/raising_hand/3.png differ
diff --git a/public/images/emoji/google/raising_hand/4.png b/public/images/emoji/google/raising_hand/4.png
new file mode 100644
index 00000000000..022eb60392f
Binary files /dev/null and b/public/images/emoji/google/raising_hand/4.png differ
diff --git a/public/images/emoji/google/raising_hand/5.png b/public/images/emoji/google/raising_hand/5.png
new file mode 100644
index 00000000000..76bad2a8938
Binary files /dev/null and b/public/images/emoji/google/raising_hand/5.png differ
diff --git a/public/images/emoji/google/raising_hand/6.png b/public/images/emoji/google/raising_hand/6.png
new file mode 100644
index 00000000000..fb799887687
Binary files /dev/null and b/public/images/emoji/google/raising_hand/6.png differ
diff --git a/public/images/emoji/google/raising_hand_man.png b/public/images/emoji/google/raising_hand_man.png
new file mode 100644
index 00000000000..268f7a5236e
Binary files /dev/null and b/public/images/emoji/google/raising_hand_man.png differ
diff --git a/public/images/emoji/google/raising_hand_man/2.png b/public/images/emoji/google/raising_hand_man/2.png
new file mode 100644
index 00000000000..79002d2fec8
Binary files /dev/null and b/public/images/emoji/google/raising_hand_man/2.png differ
diff --git a/public/images/emoji/google/raising_hand_man/3.png b/public/images/emoji/google/raising_hand_man/3.png
new file mode 100644
index 00000000000..8983fe4677c
Binary files /dev/null and b/public/images/emoji/google/raising_hand_man/3.png differ
diff --git a/public/images/emoji/google/raising_hand_man/4.png b/public/images/emoji/google/raising_hand_man/4.png
new file mode 100644
index 00000000000..274389fca0c
Binary files /dev/null and b/public/images/emoji/google/raising_hand_man/4.png differ
diff --git a/public/images/emoji/google/raising_hand_man/5.png b/public/images/emoji/google/raising_hand_man/5.png
new file mode 100644
index 00000000000..ae8b451a195
Binary files /dev/null and b/public/images/emoji/google/raising_hand_man/5.png differ
diff --git a/public/images/emoji/google/raising_hand_man/6.png b/public/images/emoji/google/raising_hand_man/6.png
new file mode 100644
index 00000000000..7eb18142ed2
Binary files /dev/null and b/public/images/emoji/google/raising_hand_man/6.png differ
diff --git a/public/images/emoji/google/raising_hand_woman.png b/public/images/emoji/google/raising_hand_woman.png
new file mode 100644
index 00000000000..72ea7e6bd70
Binary files /dev/null and b/public/images/emoji/google/raising_hand_woman.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/2.png b/public/images/emoji/google/raising_hand_woman/2.png
new file mode 100644
index 00000000000..110f5edf80e
Binary files /dev/null and b/public/images/emoji/google/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/3.png b/public/images/emoji/google/raising_hand_woman/3.png
new file mode 100644
index 00000000000..5fc1015a025
Binary files /dev/null and b/public/images/emoji/google/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/4.png b/public/images/emoji/google/raising_hand_woman/4.png
new file mode 100644
index 00000000000..022eb60392f
Binary files /dev/null and b/public/images/emoji/google/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/5.png b/public/images/emoji/google/raising_hand_woman/5.png
new file mode 100644
index 00000000000..76bad2a8938
Binary files /dev/null and b/public/images/emoji/google/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/google/raising_hand_woman/6.png b/public/images/emoji/google/raising_hand_woman/6.png
new file mode 100644
index 00000000000..fb799887687
Binary files /dev/null and b/public/images/emoji/google/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/google/ram.png b/public/images/emoji/google/ram.png
index 6afd11b63c8..c79fd6878a1 100644
Binary files a/public/images/emoji/google/ram.png and b/public/images/emoji/google/ram.png differ
diff --git a/public/images/emoji/google/ramen.png b/public/images/emoji/google/ramen.png
index 802587548db..029ccc226c4 100644
Binary files a/public/images/emoji/google/ramen.png and b/public/images/emoji/google/ramen.png differ
diff --git a/public/images/emoji/google/rat.png b/public/images/emoji/google/rat.png
index 17bc1265d80..01ab9f59450 100644
Binary files a/public/images/emoji/google/rat.png and b/public/images/emoji/google/rat.png differ
diff --git a/public/images/emoji/google/record_button.png b/public/images/emoji/google/record_button.png
index d3366b61fb5..b8c614bb0c0 100644
Binary files a/public/images/emoji/google/record_button.png and b/public/images/emoji/google/record_button.png differ
diff --git a/public/images/emoji/google/recycle.png b/public/images/emoji/google/recycle.png
index 04fe0099ed3..0d1c9d45a4d 100644
Binary files a/public/images/emoji/google/recycle.png and b/public/images/emoji/google/recycle.png differ
diff --git a/public/images/emoji/google/red_car.png b/public/images/emoji/google/red_car.png
index 9163e78abd8..f1184f7d47e 100644
Binary files a/public/images/emoji/google/red_car.png and b/public/images/emoji/google/red_car.png differ
diff --git a/public/images/emoji/google/red_circle.png b/public/images/emoji/google/red_circle.png
index 62e9d4c62c1..3d750cab491 100644
Binary files a/public/images/emoji/google/red_circle.png and b/public/images/emoji/google/red_circle.png differ
diff --git a/public/images/emoji/google/registered.png b/public/images/emoji/google/registered.png
index 5a06e509847..ba6ad077210 100644
Binary files a/public/images/emoji/google/registered.png and b/public/images/emoji/google/registered.png differ
diff --git a/public/images/emoji/google/relaxed.png b/public/images/emoji/google/relaxed.png
index fb8c270c8b8..d68bd3607fc 100644
Binary files a/public/images/emoji/google/relaxed.png and b/public/images/emoji/google/relaxed.png differ
diff --git a/public/images/emoji/google/relieved.png b/public/images/emoji/google/relieved.png
index 16bb59dee8f..bdf352d1324 100644
Binary files a/public/images/emoji/google/relieved.png and b/public/images/emoji/google/relieved.png differ
diff --git a/public/images/emoji/google/reminder_ribbon.png b/public/images/emoji/google/reminder_ribbon.png
index c352436d907..fe8d47927da 100644
Binary files a/public/images/emoji/google/reminder_ribbon.png and b/public/images/emoji/google/reminder_ribbon.png differ
diff --git a/public/images/emoji/google/repeat.png b/public/images/emoji/google/repeat.png
index 288e86d9a2e..650c52935cd 100644
Binary files a/public/images/emoji/google/repeat.png and b/public/images/emoji/google/repeat.png differ
diff --git a/public/images/emoji/google/repeat_one.png b/public/images/emoji/google/repeat_one.png
index 1ba3b8e7ca8..92240cc2c49 100644
Binary files a/public/images/emoji/google/repeat_one.png and b/public/images/emoji/google/repeat_one.png differ
diff --git a/public/images/emoji/google/rescue_worker_helmet.png b/public/images/emoji/google/rescue_worker_helmet.png
new file mode 100644
index 00000000000..e1306b90dc3
Binary files /dev/null and b/public/images/emoji/google/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/google/restroom.png b/public/images/emoji/google/restroom.png
index b8f203dc7ab..7c2b5160a63 100644
Binary files a/public/images/emoji/google/restroom.png and b/public/images/emoji/google/restroom.png differ
diff --git a/public/images/emoji/google/reunion.png b/public/images/emoji/google/reunion.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/reunion.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png
index abeb7fe2f41..8ce128b147d 100644
Binary files a/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png
new file mode 100644
index 00000000000..3313e7e2f07
Binary files /dev/null and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png
new file mode 100644
index 00000000000..916b42be04a
Binary files /dev/null and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png
new file mode 100644
index 00000000000..7ab3507e2cd
Binary files /dev/null and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png
new file mode 100644
index 00000000000..aeb15696e62
Binary files /dev/null and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png
new file mode 100644
index 00000000000..8e864665145
Binary files /dev/null and b/public/images/emoji/google/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/google/revolving_hearts.png b/public/images/emoji/google/revolving_hearts.png
index 9ab17fceaa7..c4e9aae2155 100644
Binary files a/public/images/emoji/google/revolving_hearts.png and b/public/images/emoji/google/revolving_hearts.png differ
diff --git a/public/images/emoji/google/rewind.png b/public/images/emoji/google/rewind.png
index 405c5916f52..e88ecfcd92e 100644
Binary files a/public/images/emoji/google/rewind.png and b/public/images/emoji/google/rewind.png differ
diff --git a/public/images/emoji/google/rhinoceros.png b/public/images/emoji/google/rhinoceros.png
new file mode 100644
index 00000000000..438c4c6b2e3
Binary files /dev/null and b/public/images/emoji/google/rhinoceros.png differ
diff --git a/public/images/emoji/google/ribbon.png b/public/images/emoji/google/ribbon.png
index ce6c110c383..86fa7f01cd4 100644
Binary files a/public/images/emoji/google/ribbon.png and b/public/images/emoji/google/ribbon.png differ
diff --git a/public/images/emoji/google/rice.png b/public/images/emoji/google/rice.png
index 3e4d163d947..9ad2d64fe3e 100644
Binary files a/public/images/emoji/google/rice.png and b/public/images/emoji/google/rice.png differ
diff --git a/public/images/emoji/google/rice_ball.png b/public/images/emoji/google/rice_ball.png
index b069d79b9fe..6ac20600510 100644
Binary files a/public/images/emoji/google/rice_ball.png and b/public/images/emoji/google/rice_ball.png differ
diff --git a/public/images/emoji/google/rice_cracker.png b/public/images/emoji/google/rice_cracker.png
index c81bea0aa5b..62da6d7ab51 100644
Binary files a/public/images/emoji/google/rice_cracker.png and b/public/images/emoji/google/rice_cracker.png differ
diff --git a/public/images/emoji/google/rice_scene.png b/public/images/emoji/google/rice_scene.png
index bde772e6301..7d05cb36043 100644
Binary files a/public/images/emoji/google/rice_scene.png and b/public/images/emoji/google/rice_scene.png differ
diff --git a/public/images/emoji/google/right_anger_bubble.png b/public/images/emoji/google/right_anger_bubble.png
index 285492d7b7e..27b4462cbb4 100644
Binary files a/public/images/emoji/google/right_anger_bubble.png and b/public/images/emoji/google/right_anger_bubble.png differ
diff --git a/public/images/emoji/google/ring.png b/public/images/emoji/google/ring.png
index 3a0cebaeba2..5b547518912 100644
Binary files a/public/images/emoji/google/ring.png and b/public/images/emoji/google/ring.png differ
diff --git a/public/images/emoji/google/robot.png b/public/images/emoji/google/robot.png
index fd0adefab10..d65ed7bb331 100644
Binary files a/public/images/emoji/google/robot.png and b/public/images/emoji/google/robot.png differ
diff --git a/public/images/emoji/google/robot_face.png b/public/images/emoji/google/robot_face.png
index fd0adefab10..d65ed7bb331 100644
Binary files a/public/images/emoji/google/robot_face.png and b/public/images/emoji/google/robot_face.png differ
diff --git a/public/images/emoji/google/rocket.png b/public/images/emoji/google/rocket.png
index 77efcb8983b..de37e29dff1 100644
Binary files a/public/images/emoji/google/rocket.png and b/public/images/emoji/google/rocket.png differ
diff --git a/public/images/emoji/google/rofl.png b/public/images/emoji/google/rofl.png
new file mode 100644
index 00000000000..c0e4eee11f4
Binary files /dev/null and b/public/images/emoji/google/rofl.png differ
diff --git a/public/images/emoji/google/roll_eyes.png b/public/images/emoji/google/roll_eyes.png
new file mode 100644
index 00000000000..8485fcbe1cc
Binary files /dev/null and b/public/images/emoji/google/roll_eyes.png differ
diff --git a/public/images/emoji/google/rolled_up_newspaper.png b/public/images/emoji/google/rolled_up_newspaper.png
index 52095afb299..13fb2454713 100644
Binary files a/public/images/emoji/google/rolled_up_newspaper.png and b/public/images/emoji/google/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/google/roller_coaster.png b/public/images/emoji/google/roller_coaster.png
index a304d8eb5c9..70e2c112ea7 100644
Binary files a/public/images/emoji/google/roller_coaster.png and b/public/images/emoji/google/roller_coaster.png differ
diff --git a/public/images/emoji/google/rolling_eyes.png b/public/images/emoji/google/rolling_eyes.png
index 10153f06a46..8485fcbe1cc 100644
Binary files a/public/images/emoji/google/rolling_eyes.png and b/public/images/emoji/google/rolling_eyes.png differ
diff --git a/public/images/emoji/google/romania.png b/public/images/emoji/google/romania.png
new file mode 100644
index 00000000000..898174d640d
Binary files /dev/null and b/public/images/emoji/google/romania.png differ
diff --git a/public/images/emoji/google/rooster.png b/public/images/emoji/google/rooster.png
index 9c1ec084f87..1a4a6bf2f69 100644
Binary files a/public/images/emoji/google/rooster.png and b/public/images/emoji/google/rooster.png differ
diff --git a/public/images/emoji/google/rose.png b/public/images/emoji/google/rose.png
index f845c370112..5dfe4d8a42f 100644
Binary files a/public/images/emoji/google/rose.png and b/public/images/emoji/google/rose.png differ
diff --git a/public/images/emoji/google/rosette.png b/public/images/emoji/google/rosette.png
index 2980fcc9d9c..784fd522700 100644
Binary files a/public/images/emoji/google/rosette.png and b/public/images/emoji/google/rosette.png differ
diff --git a/public/images/emoji/google/rotating_light.png b/public/images/emoji/google/rotating_light.png
index fe8be04225a..0abf3669b03 100644
Binary files a/public/images/emoji/google/rotating_light.png and b/public/images/emoji/google/rotating_light.png differ
diff --git a/public/images/emoji/google/round_pushpin.png b/public/images/emoji/google/round_pushpin.png
index f8c24e20050..d0f5f58a5b9 100644
Binary files a/public/images/emoji/google/round_pushpin.png and b/public/images/emoji/google/round_pushpin.png differ
diff --git a/public/images/emoji/google/rowboat.png b/public/images/emoji/google/rowboat.png
index 095b6c531e5..01e3f04148e 100644
Binary files a/public/images/emoji/google/rowboat.png and b/public/images/emoji/google/rowboat.png differ
diff --git a/public/images/emoji/google/rowboat/2.png b/public/images/emoji/google/rowboat/2.png
new file mode 100644
index 00000000000..0845805397f
Binary files /dev/null and b/public/images/emoji/google/rowboat/2.png differ
diff --git a/public/images/emoji/google/rowboat/3.png b/public/images/emoji/google/rowboat/3.png
new file mode 100644
index 00000000000..670f5ef3093
Binary files /dev/null and b/public/images/emoji/google/rowboat/3.png differ
diff --git a/public/images/emoji/google/rowboat/4.png b/public/images/emoji/google/rowboat/4.png
new file mode 100644
index 00000000000..00d83be28ec
Binary files /dev/null and b/public/images/emoji/google/rowboat/4.png differ
diff --git a/public/images/emoji/google/rowboat/5.png b/public/images/emoji/google/rowboat/5.png
new file mode 100644
index 00000000000..c01f2289d4b
Binary files /dev/null and b/public/images/emoji/google/rowboat/5.png differ
diff --git a/public/images/emoji/google/rowboat/6.png b/public/images/emoji/google/rowboat/6.png
new file mode 100644
index 00000000000..76b008246dd
Binary files /dev/null and b/public/images/emoji/google/rowboat/6.png differ
diff --git a/public/images/emoji/google/rowing_man.png b/public/images/emoji/google/rowing_man.png
new file mode 100644
index 00000000000..01e3f04148e
Binary files /dev/null and b/public/images/emoji/google/rowing_man.png differ
diff --git a/public/images/emoji/google/rowing_man/2.png b/public/images/emoji/google/rowing_man/2.png
new file mode 100644
index 00000000000..0845805397f
Binary files /dev/null and b/public/images/emoji/google/rowing_man/2.png differ
diff --git a/public/images/emoji/google/rowing_man/3.png b/public/images/emoji/google/rowing_man/3.png
new file mode 100644
index 00000000000..670f5ef3093
Binary files /dev/null and b/public/images/emoji/google/rowing_man/3.png differ
diff --git a/public/images/emoji/google/rowing_man/4.png b/public/images/emoji/google/rowing_man/4.png
new file mode 100644
index 00000000000..00d83be28ec
Binary files /dev/null and b/public/images/emoji/google/rowing_man/4.png differ
diff --git a/public/images/emoji/google/rowing_man/5.png b/public/images/emoji/google/rowing_man/5.png
new file mode 100644
index 00000000000..c01f2289d4b
Binary files /dev/null and b/public/images/emoji/google/rowing_man/5.png differ
diff --git a/public/images/emoji/google/rowing_man/6.png b/public/images/emoji/google/rowing_man/6.png
new file mode 100644
index 00000000000..76b008246dd
Binary files /dev/null and b/public/images/emoji/google/rowing_man/6.png differ
diff --git a/public/images/emoji/google/rowing_woman.png b/public/images/emoji/google/rowing_woman.png
new file mode 100644
index 00000000000..4fe824a2b93
Binary files /dev/null and b/public/images/emoji/google/rowing_woman.png differ
diff --git a/public/images/emoji/google/rowing_woman/2.png b/public/images/emoji/google/rowing_woman/2.png
new file mode 100644
index 00000000000..b83bbb6e81c
Binary files /dev/null and b/public/images/emoji/google/rowing_woman/2.png differ
diff --git a/public/images/emoji/google/rowing_woman/3.png b/public/images/emoji/google/rowing_woman/3.png
new file mode 100644
index 00000000000..93fef46fea4
Binary files /dev/null and b/public/images/emoji/google/rowing_woman/3.png differ
diff --git a/public/images/emoji/google/rowing_woman/4.png b/public/images/emoji/google/rowing_woman/4.png
new file mode 100644
index 00000000000..036d969d884
Binary files /dev/null and b/public/images/emoji/google/rowing_woman/4.png differ
diff --git a/public/images/emoji/google/rowing_woman/5.png b/public/images/emoji/google/rowing_woman/5.png
new file mode 100644
index 00000000000..1a0f5d5b6d5
Binary files /dev/null and b/public/images/emoji/google/rowing_woman/5.png differ
diff --git a/public/images/emoji/google/rowing_woman/6.png b/public/images/emoji/google/rowing_woman/6.png
new file mode 100644
index 00000000000..17841ebb877
Binary files /dev/null and b/public/images/emoji/google/rowing_woman/6.png differ
diff --git a/public/images/emoji/google/ru.png b/public/images/emoji/google/ru.png
index f85a73fd4d9..a92bbdbb8a7 100644
Binary files a/public/images/emoji/google/ru.png and b/public/images/emoji/google/ru.png differ
diff --git a/public/images/emoji/google/rugby_football.png b/public/images/emoji/google/rugby_football.png
index 35be1cf926f..b8a0b8f62dd 100644
Binary files a/public/images/emoji/google/rugby_football.png and b/public/images/emoji/google/rugby_football.png differ
diff --git a/public/images/emoji/google/runner.png b/public/images/emoji/google/runner.png
index bd9f81b76a7..86592f29758 100644
Binary files a/public/images/emoji/google/runner.png and b/public/images/emoji/google/runner.png differ
diff --git a/public/images/emoji/google/runner/2.png b/public/images/emoji/google/runner/2.png
new file mode 100644
index 00000000000..546cb4791d4
Binary files /dev/null and b/public/images/emoji/google/runner/2.png differ
diff --git a/public/images/emoji/google/runner/3.png b/public/images/emoji/google/runner/3.png
new file mode 100644
index 00000000000..635f3203ef8
Binary files /dev/null and b/public/images/emoji/google/runner/3.png differ
diff --git a/public/images/emoji/google/runner/4.png b/public/images/emoji/google/runner/4.png
new file mode 100644
index 00000000000..97d2cc1e034
Binary files /dev/null and b/public/images/emoji/google/runner/4.png differ
diff --git a/public/images/emoji/google/runner/5.png b/public/images/emoji/google/runner/5.png
new file mode 100644
index 00000000000..678a308cc47
Binary files /dev/null and b/public/images/emoji/google/runner/5.png differ
diff --git a/public/images/emoji/google/runner/6.png b/public/images/emoji/google/runner/6.png
new file mode 100644
index 00000000000..2f012dee701
Binary files /dev/null and b/public/images/emoji/google/runner/6.png differ
diff --git a/public/images/emoji/google/running_man.png b/public/images/emoji/google/running_man.png
new file mode 100644
index 00000000000..86592f29758
Binary files /dev/null and b/public/images/emoji/google/running_man.png differ
diff --git a/public/images/emoji/google/running_man/2.png b/public/images/emoji/google/running_man/2.png
new file mode 100644
index 00000000000..546cb4791d4
Binary files /dev/null and b/public/images/emoji/google/running_man/2.png differ
diff --git a/public/images/emoji/google/running_man/3.png b/public/images/emoji/google/running_man/3.png
new file mode 100644
index 00000000000..635f3203ef8
Binary files /dev/null and b/public/images/emoji/google/running_man/3.png differ
diff --git a/public/images/emoji/google/running_man/4.png b/public/images/emoji/google/running_man/4.png
new file mode 100644
index 00000000000..97d2cc1e034
Binary files /dev/null and b/public/images/emoji/google/running_man/4.png differ
diff --git a/public/images/emoji/google/running_man/5.png b/public/images/emoji/google/running_man/5.png
new file mode 100644
index 00000000000..678a308cc47
Binary files /dev/null and b/public/images/emoji/google/running_man/5.png differ
diff --git a/public/images/emoji/google/running_man/6.png b/public/images/emoji/google/running_man/6.png
new file mode 100644
index 00000000000..2f012dee701
Binary files /dev/null and b/public/images/emoji/google/running_man/6.png differ
diff --git a/public/images/emoji/google/running_shirt_with_sash.png b/public/images/emoji/google/running_shirt_with_sash.png
index 4d796f10a60..c1ff4c4d34d 100644
Binary files a/public/images/emoji/google/running_shirt_with_sash.png and b/public/images/emoji/google/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/google/running_woman.png b/public/images/emoji/google/running_woman.png
new file mode 100644
index 00000000000..d5908236a3e
Binary files /dev/null and b/public/images/emoji/google/running_woman.png differ
diff --git a/public/images/emoji/google/running_woman/2.png b/public/images/emoji/google/running_woman/2.png
new file mode 100644
index 00000000000..f6b51471f82
Binary files /dev/null and b/public/images/emoji/google/running_woman/2.png differ
diff --git a/public/images/emoji/google/running_woman/3.png b/public/images/emoji/google/running_woman/3.png
new file mode 100644
index 00000000000..b1a8400b208
Binary files /dev/null and b/public/images/emoji/google/running_woman/3.png differ
diff --git a/public/images/emoji/google/running_woman/4.png b/public/images/emoji/google/running_woman/4.png
new file mode 100644
index 00000000000..9899a688fa6
Binary files /dev/null and b/public/images/emoji/google/running_woman/4.png differ
diff --git a/public/images/emoji/google/running_woman/5.png b/public/images/emoji/google/running_woman/5.png
new file mode 100644
index 00000000000..2c2c34bc600
Binary files /dev/null and b/public/images/emoji/google/running_woman/5.png differ
diff --git a/public/images/emoji/google/running_woman/6.png b/public/images/emoji/google/running_woman/6.png
new file mode 100644
index 00000000000..45633617962
Binary files /dev/null and b/public/images/emoji/google/running_woman/6.png differ
diff --git a/public/images/emoji/google/rwanda.png b/public/images/emoji/google/rwanda.png
new file mode 100644
index 00000000000..4bbe4a97780
Binary files /dev/null and b/public/images/emoji/google/rwanda.png differ
diff --git a/public/images/emoji/google/sa.png b/public/images/emoji/google/sa.png
index 3bfb06bfffc..88b8b42a165 100644
Binary files a/public/images/emoji/google/sa.png and b/public/images/emoji/google/sa.png differ
diff --git a/public/images/emoji/google/sagittarius.png b/public/images/emoji/google/sagittarius.png
index e4f3edf680a..5c020b111aa 100644
Binary files a/public/images/emoji/google/sagittarius.png and b/public/images/emoji/google/sagittarius.png differ
diff --git a/public/images/emoji/google/sailboat.png b/public/images/emoji/google/sailboat.png
index dc2ea1ee659..c10b6a24ccc 100644
Binary files a/public/images/emoji/google/sailboat.png and b/public/images/emoji/google/sailboat.png differ
diff --git a/public/images/emoji/google/sake.png b/public/images/emoji/google/sake.png
index e7072a149a5..f9975bda7f0 100644
Binary files a/public/images/emoji/google/sake.png and b/public/images/emoji/google/sake.png differ
diff --git a/public/images/emoji/google/samoa.png b/public/images/emoji/google/samoa.png
new file mode 100644
index 00000000000..6f56f82623b
Binary files /dev/null and b/public/images/emoji/google/samoa.png differ
diff --git a/public/images/emoji/google/san_marino.png b/public/images/emoji/google/san_marino.png
new file mode 100644
index 00000000000..18aa756e026
Binary files /dev/null and b/public/images/emoji/google/san_marino.png differ
diff --git a/public/images/emoji/google/sandal.png b/public/images/emoji/google/sandal.png
index ca7edf36dfe..ab091981b85 100644
Binary files a/public/images/emoji/google/sandal.png and b/public/images/emoji/google/sandal.png differ
diff --git a/public/images/emoji/google/sandwich.png b/public/images/emoji/google/sandwich.png
new file mode 100644
index 00000000000..37dbc0c81eb
Binary files /dev/null and b/public/images/emoji/google/sandwich.png differ
diff --git a/public/images/emoji/google/santa.png b/public/images/emoji/google/santa.png
index 10c906203a4..38c66269e07 100644
Binary files a/public/images/emoji/google/santa.png and b/public/images/emoji/google/santa.png differ
diff --git a/public/images/emoji/google/santa/2.png b/public/images/emoji/google/santa/2.png
new file mode 100644
index 00000000000..cf273d91793
Binary files /dev/null and b/public/images/emoji/google/santa/2.png differ
diff --git a/public/images/emoji/google/santa/3.png b/public/images/emoji/google/santa/3.png
new file mode 100644
index 00000000000..46c7989b346
Binary files /dev/null and b/public/images/emoji/google/santa/3.png differ
diff --git a/public/images/emoji/google/santa/4.png b/public/images/emoji/google/santa/4.png
new file mode 100644
index 00000000000..d5f6bfc1133
Binary files /dev/null and b/public/images/emoji/google/santa/4.png differ
diff --git a/public/images/emoji/google/santa/5.png b/public/images/emoji/google/santa/5.png
new file mode 100644
index 00000000000..791442b674f
Binary files /dev/null and b/public/images/emoji/google/santa/5.png differ
diff --git a/public/images/emoji/google/santa/6.png b/public/images/emoji/google/santa/6.png
new file mode 100644
index 00000000000..1d98e5de0d7
Binary files /dev/null and b/public/images/emoji/google/santa/6.png differ
diff --git a/public/images/emoji/google/sao_tome_principe.png b/public/images/emoji/google/sao_tome_principe.png
new file mode 100644
index 00000000000..10a206cd598
Binary files /dev/null and b/public/images/emoji/google/sao_tome_principe.png differ
diff --git a/public/images/emoji/google/satellite.png b/public/images/emoji/google/satellite.png
index 154b1b5c72a..1a8fea811c9 100644
Binary files a/public/images/emoji/google/satellite.png and b/public/images/emoji/google/satellite.png differ
diff --git a/public/images/emoji/google/satellite_orbital.png b/public/images/emoji/google/satellite_orbital.png
index 68fb59dc197..6b94efd773e 100644
Binary files a/public/images/emoji/google/satellite_orbital.png and b/public/images/emoji/google/satellite_orbital.png differ
diff --git a/public/images/emoji/google/satisfied.png b/public/images/emoji/google/satisfied.png
index 04d29aa6a7d..1b64148f973 100644
Binary files a/public/images/emoji/google/satisfied.png and b/public/images/emoji/google/satisfied.png differ
diff --git a/public/images/emoji/google/saudi_arabia.png b/public/images/emoji/google/saudi_arabia.png
new file mode 100644
index 00000000000..6282420b70a
Binary files /dev/null and b/public/images/emoji/google/saudi_arabia.png differ
diff --git a/public/images/emoji/google/sauropod.png b/public/images/emoji/google/sauropod.png
new file mode 100644
index 00000000000..aa85e189ac8
Binary files /dev/null and b/public/images/emoji/google/sauropod.png differ
diff --git a/public/images/emoji/google/saxophone.png b/public/images/emoji/google/saxophone.png
index 7aee7172349..663c56cd02c 100644
Binary files a/public/images/emoji/google/saxophone.png and b/public/images/emoji/google/saxophone.png differ
diff --git a/public/images/emoji/google/scales.png b/public/images/emoji/google/scales.png
index 5fa43f378a6..b13e29f36c2 100644
Binary files a/public/images/emoji/google/scales.png and b/public/images/emoji/google/scales.png differ
diff --git a/public/images/emoji/google/scarf.png b/public/images/emoji/google/scarf.png
new file mode 100644
index 00000000000..597ecba8ec9
Binary files /dev/null and b/public/images/emoji/google/scarf.png differ
diff --git a/public/images/emoji/google/school.png b/public/images/emoji/google/school.png
index 752473912d7..7e9102aafba 100644
Binary files a/public/images/emoji/google/school.png and b/public/images/emoji/google/school.png differ
diff --git a/public/images/emoji/google/school_satchel.png b/public/images/emoji/google/school_satchel.png
index c9f160564bf..8948df417fa 100644
Binary files a/public/images/emoji/google/school_satchel.png and b/public/images/emoji/google/school_satchel.png differ
diff --git a/public/images/emoji/google/scissors.png b/public/images/emoji/google/scissors.png
index bf9a56aeffb..e7e2187f88e 100644
Binary files a/public/images/emoji/google/scissors.png and b/public/images/emoji/google/scissors.png differ
diff --git a/public/images/emoji/google/scorpion.png b/public/images/emoji/google/scorpion.png
index 390e62321cb..0dbc1a62874 100644
Binary files a/public/images/emoji/google/scorpion.png and b/public/images/emoji/google/scorpion.png differ
diff --git a/public/images/emoji/google/scorpius.png b/public/images/emoji/google/scorpius.png
index a9a9db203a5..cf32395936e 100644
Binary files a/public/images/emoji/google/scorpius.png and b/public/images/emoji/google/scorpius.png differ
diff --git a/public/images/emoji/google/scream.png b/public/images/emoji/google/scream.png
index 81b8c47abac..33a272b8441 100644
Binary files a/public/images/emoji/google/scream.png and b/public/images/emoji/google/scream.png differ
diff --git a/public/images/emoji/google/scream_cat.png b/public/images/emoji/google/scream_cat.png
index c0df8e7b37a..6e99397d585 100644
Binary files a/public/images/emoji/google/scream_cat.png and b/public/images/emoji/google/scream_cat.png differ
diff --git a/public/images/emoji/google/scroll.png b/public/images/emoji/google/scroll.png
index 1e46a06c658..029314138ae 100644
Binary files a/public/images/emoji/google/scroll.png and b/public/images/emoji/google/scroll.png differ
diff --git a/public/images/emoji/google/seat.png b/public/images/emoji/google/seat.png
index 958c30e9ee8..b8af47c1d7e 100644
Binary files a/public/images/emoji/google/seat.png and b/public/images/emoji/google/seat.png differ
diff --git a/public/images/emoji/google/secret.png b/public/images/emoji/google/secret.png
index 1bccee14903..b095eae8861 100644
Binary files a/public/images/emoji/google/secret.png and b/public/images/emoji/google/secret.png differ
diff --git a/public/images/emoji/google/see_no_evil.png b/public/images/emoji/google/see_no_evil.png
index 2851bccdb4c..2a7a930b26c 100644
Binary files a/public/images/emoji/google/see_no_evil.png and b/public/images/emoji/google/see_no_evil.png differ
diff --git a/public/images/emoji/google/seedling.png b/public/images/emoji/google/seedling.png
index 6e4dda1aecc..eb787b4d2af 100644
Binary files a/public/images/emoji/google/seedling.png and b/public/images/emoji/google/seedling.png differ
diff --git a/public/images/emoji/google/selfie.png b/public/images/emoji/google/selfie.png
new file mode 100644
index 00000000000..05126770ad8
Binary files /dev/null and b/public/images/emoji/google/selfie.png differ
diff --git a/public/images/emoji/google/selfie/2.png b/public/images/emoji/google/selfie/2.png
new file mode 100644
index 00000000000..0145a3946d9
Binary files /dev/null and b/public/images/emoji/google/selfie/2.png differ
diff --git a/public/images/emoji/google/selfie/3.png b/public/images/emoji/google/selfie/3.png
new file mode 100644
index 00000000000..917474197d9
Binary files /dev/null and b/public/images/emoji/google/selfie/3.png differ
diff --git a/public/images/emoji/google/selfie/4.png b/public/images/emoji/google/selfie/4.png
new file mode 100644
index 00000000000..17a6d18372e
Binary files /dev/null and b/public/images/emoji/google/selfie/4.png differ
diff --git a/public/images/emoji/google/selfie/5.png b/public/images/emoji/google/selfie/5.png
new file mode 100644
index 00000000000..6f17c4b78ff
Binary files /dev/null and b/public/images/emoji/google/selfie/5.png differ
diff --git a/public/images/emoji/google/selfie/6.png b/public/images/emoji/google/selfie/6.png
new file mode 100644
index 00000000000..34b10c5b5e2
Binary files /dev/null and b/public/images/emoji/google/selfie/6.png differ
diff --git a/public/images/emoji/google/senegal.png b/public/images/emoji/google/senegal.png
new file mode 100644
index 00000000000..4ab925eace3
Binary files /dev/null and b/public/images/emoji/google/senegal.png differ
diff --git a/public/images/emoji/google/serbia.png b/public/images/emoji/google/serbia.png
new file mode 100644
index 00000000000..4207dfd6f82
Binary files /dev/null and b/public/images/emoji/google/serbia.png differ
diff --git a/public/images/emoji/google/seven.png b/public/images/emoji/google/seven.png
index 8a1fe0417cb..e9ad2080000 100644
Binary files a/public/images/emoji/google/seven.png and b/public/images/emoji/google/seven.png differ
diff --git a/public/images/emoji/google/seychelles.png b/public/images/emoji/google/seychelles.png
new file mode 100644
index 00000000000..9d95603b802
Binary files /dev/null and b/public/images/emoji/google/seychelles.png differ
diff --git a/public/images/emoji/google/shallow_pan_of_food.png b/public/images/emoji/google/shallow_pan_of_food.png
new file mode 100644
index 00000000000..aa16e17fb43
Binary files /dev/null and b/public/images/emoji/google/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/google/shamrock.png b/public/images/emoji/google/shamrock.png
index 2b7f34d0e11..5e974646fa4 100644
Binary files a/public/images/emoji/google/shamrock.png and b/public/images/emoji/google/shamrock.png differ
diff --git a/public/images/emoji/google/shark.png b/public/images/emoji/google/shark.png
new file mode 100644
index 00000000000..a8421e10060
Binary files /dev/null and b/public/images/emoji/google/shark.png differ
diff --git a/public/images/emoji/google/shaved_ice.png b/public/images/emoji/google/shaved_ice.png
index 9a0d04f498e..c2c199eed1a 100644
Binary files a/public/images/emoji/google/shaved_ice.png and b/public/images/emoji/google/shaved_ice.png differ
diff --git a/public/images/emoji/google/sheep.png b/public/images/emoji/google/sheep.png
index fdcd26c8b48..5fd7a2952cc 100644
Binary files a/public/images/emoji/google/sheep.png and b/public/images/emoji/google/sheep.png differ
diff --git a/public/images/emoji/google/shell.png b/public/images/emoji/google/shell.png
index a6f2b268545..82a821de447 100644
Binary files a/public/images/emoji/google/shell.png and b/public/images/emoji/google/shell.png differ
diff --git a/public/images/emoji/google/shield.png b/public/images/emoji/google/shield.png
index 87d0f23c766..5b4713e2084 100644
Binary files a/public/images/emoji/google/shield.png and b/public/images/emoji/google/shield.png differ
diff --git a/public/images/emoji/google/shinto_shrine.png b/public/images/emoji/google/shinto_shrine.png
index ffa65cb673a..38f34726324 100644
Binary files a/public/images/emoji/google/shinto_shrine.png and b/public/images/emoji/google/shinto_shrine.png differ
diff --git a/public/images/emoji/google/ship.png b/public/images/emoji/google/ship.png
index 6cab94e37d8..6e6e94527b2 100644
Binary files a/public/images/emoji/google/ship.png and b/public/images/emoji/google/ship.png differ
diff --git a/public/images/emoji/google/shirt.png b/public/images/emoji/google/shirt.png
index 18fed809641..ef0745cb181 100644
Binary files a/public/images/emoji/google/shirt.png and b/public/images/emoji/google/shirt.png differ
diff --git a/public/images/emoji/google/shit.png b/public/images/emoji/google/shit.png
index 87d78669668..b1d921d96c2 100644
Binary files a/public/images/emoji/google/shit.png and b/public/images/emoji/google/shit.png differ
diff --git a/public/images/emoji/google/shopping.png b/public/images/emoji/google/shopping.png
new file mode 100644
index 00000000000..ddc2cb76516
Binary files /dev/null and b/public/images/emoji/google/shopping.png differ
diff --git a/public/images/emoji/google/shopping_bags.png b/public/images/emoji/google/shopping_bags.png
index ad7ba7e2493..ddc2cb76516 100644
Binary files a/public/images/emoji/google/shopping_bags.png and b/public/images/emoji/google/shopping_bags.png differ
diff --git a/public/images/emoji/google/shopping_cart.png b/public/images/emoji/google/shopping_cart.png
new file mode 100644
index 00000000000..81e394561b6
Binary files /dev/null and b/public/images/emoji/google/shopping_cart.png differ
diff --git a/public/images/emoji/google/shower.png b/public/images/emoji/google/shower.png
index 6db1dda0ec2..19a13378a84 100644
Binary files a/public/images/emoji/google/shower.png and b/public/images/emoji/google/shower.png differ
diff --git a/public/images/emoji/google/shrimp.png b/public/images/emoji/google/shrimp.png
new file mode 100644
index 00000000000..7d78c74866a
Binary files /dev/null and b/public/images/emoji/google/shrimp.png differ
diff --git a/public/images/emoji/google/sierra_leone.png b/public/images/emoji/google/sierra_leone.png
new file mode 100644
index 00000000000..1718e666023
Binary files /dev/null and b/public/images/emoji/google/sierra_leone.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns.png b/public/images/emoji/google/sign_of_the_horns.png
index d8d0c23c3f8..eeac747c65e 100644
Binary files a/public/images/emoji/google/sign_of_the_horns.png and b/public/images/emoji/google/sign_of_the_horns.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/2.png b/public/images/emoji/google/sign_of_the_horns/2.png
new file mode 100644
index 00000000000..614947ba817
Binary files /dev/null and b/public/images/emoji/google/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/3.png b/public/images/emoji/google/sign_of_the_horns/3.png
new file mode 100644
index 00000000000..2f9891b4805
Binary files /dev/null and b/public/images/emoji/google/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/4.png b/public/images/emoji/google/sign_of_the_horns/4.png
new file mode 100644
index 00000000000..44e8fc124cc
Binary files /dev/null and b/public/images/emoji/google/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/5.png b/public/images/emoji/google/sign_of_the_horns/5.png
new file mode 100644
index 00000000000..7016d1f0f82
Binary files /dev/null and b/public/images/emoji/google/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/google/sign_of_the_horns/6.png b/public/images/emoji/google/sign_of_the_horns/6.png
new file mode 100644
index 00000000000..39216902504
Binary files /dev/null and b/public/images/emoji/google/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/google/signal_strength.png b/public/images/emoji/google/signal_strength.png
index 2940d4ae747..d0c76c4b5c8 100644
Binary files a/public/images/emoji/google/signal_strength.png and b/public/images/emoji/google/signal_strength.png differ
diff --git a/public/images/emoji/google/singapore.png b/public/images/emoji/google/singapore.png
new file mode 100644
index 00000000000..170347d34d9
Binary files /dev/null and b/public/images/emoji/google/singapore.png differ
diff --git a/public/images/emoji/google/sint_maarten.png b/public/images/emoji/google/sint_maarten.png
new file mode 100644
index 00000000000..b43ec362126
Binary files /dev/null and b/public/images/emoji/google/sint_maarten.png differ
diff --git a/public/images/emoji/google/six.png b/public/images/emoji/google/six.png
index 2cf9e489f38..5972360e7f5 100644
Binary files a/public/images/emoji/google/six.png and b/public/images/emoji/google/six.png differ
diff --git a/public/images/emoji/google/six_pointed_star.png b/public/images/emoji/google/six_pointed_star.png
index 2a4d9ca7f78..23d2ecd1c48 100644
Binary files a/public/images/emoji/google/six_pointed_star.png and b/public/images/emoji/google/six_pointed_star.png differ
diff --git a/public/images/emoji/google/skeleton.png b/public/images/emoji/google/skeleton.png
index 89aaa6cbb0f..614ae5c8494 100644
Binary files a/public/images/emoji/google/skeleton.png and b/public/images/emoji/google/skeleton.png differ
diff --git a/public/images/emoji/google/ski.png b/public/images/emoji/google/ski.png
index 76d2b036245..270878a24fa 100644
Binary files a/public/images/emoji/google/ski.png and b/public/images/emoji/google/ski.png differ
diff --git a/public/images/emoji/google/skier.png b/public/images/emoji/google/skier.png
index 091956a1362..f33dfdfce8b 100644
Binary files a/public/images/emoji/google/skier.png and b/public/images/emoji/google/skier.png differ
diff --git a/public/images/emoji/google/skull.png b/public/images/emoji/google/skull.png
index 89aaa6cbb0f..614ae5c8494 100644
Binary files a/public/images/emoji/google/skull.png and b/public/images/emoji/google/skull.png differ
diff --git a/public/images/emoji/google/skull_and_crossbones.png b/public/images/emoji/google/skull_and_crossbones.png
index 1087099c6f4..2a3b044107c 100644
Binary files a/public/images/emoji/google/skull_and_crossbones.png and b/public/images/emoji/google/skull_and_crossbones.png differ
diff --git a/public/images/emoji/google/skull_crossbones.png b/public/images/emoji/google/skull_crossbones.png
index 1087099c6f4..2a3b044107c 100644
Binary files a/public/images/emoji/google/skull_crossbones.png and b/public/images/emoji/google/skull_crossbones.png differ
diff --git a/public/images/emoji/google/sled.png b/public/images/emoji/google/sled.png
new file mode 100644
index 00000000000..872e5c23d60
Binary files /dev/null and b/public/images/emoji/google/sled.png differ
diff --git a/public/images/emoji/google/sleeping.png b/public/images/emoji/google/sleeping.png
index d9ec0d7d8d5..2a3f2bd0849 100644
Binary files a/public/images/emoji/google/sleeping.png and b/public/images/emoji/google/sleeping.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation.png b/public/images/emoji/google/sleeping_accommodation.png
index e37df48d03e..90e49164e5a 100644
Binary files a/public/images/emoji/google/sleeping_accommodation.png and b/public/images/emoji/google/sleeping_accommodation.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/2.png b/public/images/emoji/google/sleeping_accommodation/2.png
new file mode 100644
index 00000000000..39216918ee5
Binary files /dev/null and b/public/images/emoji/google/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/3.png b/public/images/emoji/google/sleeping_accommodation/3.png
new file mode 100644
index 00000000000..bdbecbff6d1
Binary files /dev/null and b/public/images/emoji/google/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/4.png b/public/images/emoji/google/sleeping_accommodation/4.png
new file mode 100644
index 00000000000..8ce4902bcd3
Binary files /dev/null and b/public/images/emoji/google/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/5.png b/public/images/emoji/google/sleeping_accommodation/5.png
new file mode 100644
index 00000000000..76b824d5d93
Binary files /dev/null and b/public/images/emoji/google/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/google/sleeping_accommodation/6.png b/public/images/emoji/google/sleeping_accommodation/6.png
new file mode 100644
index 00000000000..05f754a6a63
Binary files /dev/null and b/public/images/emoji/google/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/google/sleeping_bed.png b/public/images/emoji/google/sleeping_bed.png
new file mode 100644
index 00000000000..90e49164e5a
Binary files /dev/null and b/public/images/emoji/google/sleeping_bed.png differ
diff --git a/public/images/emoji/google/sleeping_bed/2.png b/public/images/emoji/google/sleeping_bed/2.png
new file mode 100644
index 00000000000..39216918ee5
Binary files /dev/null and b/public/images/emoji/google/sleeping_bed/2.png differ
diff --git a/public/images/emoji/google/sleeping_bed/3.png b/public/images/emoji/google/sleeping_bed/3.png
new file mode 100644
index 00000000000..bdbecbff6d1
Binary files /dev/null and b/public/images/emoji/google/sleeping_bed/3.png differ
diff --git a/public/images/emoji/google/sleeping_bed/4.png b/public/images/emoji/google/sleeping_bed/4.png
new file mode 100644
index 00000000000..8ce4902bcd3
Binary files /dev/null and b/public/images/emoji/google/sleeping_bed/4.png differ
diff --git a/public/images/emoji/google/sleeping_bed/5.png b/public/images/emoji/google/sleeping_bed/5.png
new file mode 100644
index 00000000000..76b824d5d93
Binary files /dev/null and b/public/images/emoji/google/sleeping_bed/5.png differ
diff --git a/public/images/emoji/google/sleeping_bed/6.png b/public/images/emoji/google/sleeping_bed/6.png
new file mode 100644
index 00000000000..05f754a6a63
Binary files /dev/null and b/public/images/emoji/google/sleeping_bed/6.png differ
diff --git a/public/images/emoji/google/sleepy.png b/public/images/emoji/google/sleepy.png
index 34b9786153f..7a53d542342 100644
Binary files a/public/images/emoji/google/sleepy.png and b/public/images/emoji/google/sleepy.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy.png b/public/images/emoji/google/sleuth_or_spy.png
index b76dce309bf..13ef63b0aa6 100644
Binary files a/public/images/emoji/google/sleuth_or_spy.png and b/public/images/emoji/google/sleuth_or_spy.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/2.png b/public/images/emoji/google/sleuth_or_spy/2.png
new file mode 100644
index 00000000000..130424ff539
Binary files /dev/null and b/public/images/emoji/google/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/3.png b/public/images/emoji/google/sleuth_or_spy/3.png
new file mode 100644
index 00000000000..6fb56a789c9
Binary files /dev/null and b/public/images/emoji/google/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/4.png b/public/images/emoji/google/sleuth_or_spy/4.png
new file mode 100644
index 00000000000..c021157981c
Binary files /dev/null and b/public/images/emoji/google/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/5.png b/public/images/emoji/google/sleuth_or_spy/5.png
new file mode 100644
index 00000000000..fcd34112328
Binary files /dev/null and b/public/images/emoji/google/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/google/sleuth_or_spy/6.png b/public/images/emoji/google/sleuth_or_spy/6.png
new file mode 100644
index 00000000000..e4b939c908b
Binary files /dev/null and b/public/images/emoji/google/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/google/slight_frown.png b/public/images/emoji/google/slight_frown.png
index 938547aed9f..abe8592d677 100644
Binary files a/public/images/emoji/google/slight_frown.png and b/public/images/emoji/google/slight_frown.png differ
diff --git a/public/images/emoji/google/slight_smile.png b/public/images/emoji/google/slight_smile.png
index c8b0a25ea2d..dc605beeb3f 100644
Binary files a/public/images/emoji/google/slight_smile.png and b/public/images/emoji/google/slight_smile.png differ
diff --git a/public/images/emoji/google/slightly_frowning_face.png b/public/images/emoji/google/slightly_frowning_face.png
index 938547aed9f..abe8592d677 100644
Binary files a/public/images/emoji/google/slightly_frowning_face.png and b/public/images/emoji/google/slightly_frowning_face.png differ
diff --git a/public/images/emoji/google/slightly_smiling.png b/public/images/emoji/google/slightly_smiling.png
new file mode 100644
index 00000000000..dc605beeb3f
Binary files /dev/null and b/public/images/emoji/google/slightly_smiling.png differ
diff --git a/public/images/emoji/google/slightly_smiling_face.png b/public/images/emoji/google/slightly_smiling_face.png
index c8b0a25ea2d..dc605beeb3f 100644
Binary files a/public/images/emoji/google/slightly_smiling_face.png and b/public/images/emoji/google/slightly_smiling_face.png differ
diff --git a/public/images/emoji/google/slot_machine.png b/public/images/emoji/google/slot_machine.png
index 42da9edb7ad..59ce7cde1de 100644
Binary files a/public/images/emoji/google/slot_machine.png and b/public/images/emoji/google/slot_machine.png differ
diff --git a/public/images/emoji/google/slovakia.png b/public/images/emoji/google/slovakia.png
new file mode 100644
index 00000000000..1fc1c9392cc
Binary files /dev/null and b/public/images/emoji/google/slovakia.png differ
diff --git a/public/images/emoji/google/slovenia.png b/public/images/emoji/google/slovenia.png
new file mode 100644
index 00000000000..d21d260ac24
Binary files /dev/null and b/public/images/emoji/google/slovenia.png differ
diff --git a/public/images/emoji/google/small_airplane.png b/public/images/emoji/google/small_airplane.png
index 4bd5d32edc1..5342466c300 100644
Binary files a/public/images/emoji/google/small_airplane.png and b/public/images/emoji/google/small_airplane.png differ
diff --git a/public/images/emoji/google/small_blue_diamond.png b/public/images/emoji/google/small_blue_diamond.png
index 5b7e4a70d45..4dc56355d04 100644
Binary files a/public/images/emoji/google/small_blue_diamond.png and b/public/images/emoji/google/small_blue_diamond.png differ
diff --git a/public/images/emoji/google/small_orange_diamond.png b/public/images/emoji/google/small_orange_diamond.png
index 202d6e0bd60..4c2603b3a9b 100644
Binary files a/public/images/emoji/google/small_orange_diamond.png and b/public/images/emoji/google/small_orange_diamond.png differ
diff --git a/public/images/emoji/google/small_red_triangle.png b/public/images/emoji/google/small_red_triangle.png
index 3223603df14..0e045262de4 100644
Binary files a/public/images/emoji/google/small_red_triangle.png and b/public/images/emoji/google/small_red_triangle.png differ
diff --git a/public/images/emoji/google/small_red_triangle_down.png b/public/images/emoji/google/small_red_triangle_down.png
index 407a5e48c78..222ca47a56c 100644
Binary files a/public/images/emoji/google/small_red_triangle_down.png and b/public/images/emoji/google/small_red_triangle_down.png differ
diff --git a/public/images/emoji/google/smile.png b/public/images/emoji/google/smile.png
index cac80903ec2..c3bfe595c56 100644
Binary files a/public/images/emoji/google/smile.png and b/public/images/emoji/google/smile.png differ
diff --git a/public/images/emoji/google/smile_cat.png b/public/images/emoji/google/smile_cat.png
index f4d72befae7..bfb387136cb 100644
Binary files a/public/images/emoji/google/smile_cat.png and b/public/images/emoji/google/smile_cat.png differ
diff --git a/public/images/emoji/google/smiley.png b/public/images/emoji/google/smiley.png
index 8e65729a6c7..9ebae5eed08 100644
Binary files a/public/images/emoji/google/smiley.png and b/public/images/emoji/google/smiley.png differ
diff --git a/public/images/emoji/google/smiley_cat.png b/public/images/emoji/google/smiley_cat.png
index 7243c2cb5e0..a50aed54430 100644
Binary files a/public/images/emoji/google/smiley_cat.png and b/public/images/emoji/google/smiley_cat.png differ
diff --git a/public/images/emoji/google/smiling_imp.png b/public/images/emoji/google/smiling_imp.png
index 2b4ac8d7fc6..3790fe743b4 100644
Binary files a/public/images/emoji/google/smiling_imp.png and b/public/images/emoji/google/smiling_imp.png differ
diff --git a/public/images/emoji/google/smirk.png b/public/images/emoji/google/smirk.png
index a552663374a..80900d21266 100644
Binary files a/public/images/emoji/google/smirk.png and b/public/images/emoji/google/smirk.png differ
diff --git a/public/images/emoji/google/smirk_cat.png b/public/images/emoji/google/smirk_cat.png
index 0ad3ed0bedc..73c3b5e5bb6 100644
Binary files a/public/images/emoji/google/smirk_cat.png and b/public/images/emoji/google/smirk_cat.png differ
diff --git a/public/images/emoji/google/smoking.png b/public/images/emoji/google/smoking.png
index 106adce9c38..7d424c18d78 100644
Binary files a/public/images/emoji/google/smoking.png and b/public/images/emoji/google/smoking.png differ
diff --git a/public/images/emoji/google/snail.png b/public/images/emoji/google/snail.png
index 7014ab0c8b7..b160cdc2c9d 100644
Binary files a/public/images/emoji/google/snail.png and b/public/images/emoji/google/snail.png differ
diff --git a/public/images/emoji/google/snake.png b/public/images/emoji/google/snake.png
index 197beb5f98f..5904faf3398 100644
Binary files a/public/images/emoji/google/snake.png and b/public/images/emoji/google/snake.png differ
diff --git a/public/images/emoji/google/sneezing_face.png b/public/images/emoji/google/sneezing_face.png
new file mode 100644
index 00000000000..39fc4ecb4dd
Binary files /dev/null and b/public/images/emoji/google/sneezing_face.png differ
diff --git a/public/images/emoji/google/snow_capped_mountain.png b/public/images/emoji/google/snow_capped_mountain.png
index edf4cc1286d..f7ab7c2c747 100644
Binary files a/public/images/emoji/google/snow_capped_mountain.png and b/public/images/emoji/google/snow_capped_mountain.png differ
diff --git a/public/images/emoji/google/snowboarder.png b/public/images/emoji/google/snowboarder.png
index ab3ca56d38b..3d66a4cc84d 100644
Binary files a/public/images/emoji/google/snowboarder.png and b/public/images/emoji/google/snowboarder.png differ
diff --git a/public/images/emoji/google/snowboarder/2.png b/public/images/emoji/google/snowboarder/2.png
new file mode 100644
index 00000000000..6e5f70db4f0
Binary files /dev/null and b/public/images/emoji/google/snowboarder/2.png differ
diff --git a/public/images/emoji/google/snowboarder/3.png b/public/images/emoji/google/snowboarder/3.png
new file mode 100644
index 00000000000..a295d3ea8e1
Binary files /dev/null and b/public/images/emoji/google/snowboarder/3.png differ
diff --git a/public/images/emoji/google/snowboarder/4.png b/public/images/emoji/google/snowboarder/4.png
new file mode 100644
index 00000000000..d7c1c0f881e
Binary files /dev/null and b/public/images/emoji/google/snowboarder/4.png differ
diff --git a/public/images/emoji/google/snowboarder/5.png b/public/images/emoji/google/snowboarder/5.png
new file mode 100644
index 00000000000..682c1a1c268
Binary files /dev/null and b/public/images/emoji/google/snowboarder/5.png differ
diff --git a/public/images/emoji/google/snowboarder/6.png b/public/images/emoji/google/snowboarder/6.png
new file mode 100644
index 00000000000..1f676454cd4
Binary files /dev/null and b/public/images/emoji/google/snowboarder/6.png differ
diff --git a/public/images/emoji/google/snowflake.png b/public/images/emoji/google/snowflake.png
index 73164302202..3fe9831aca6 100644
Binary files a/public/images/emoji/google/snowflake.png and b/public/images/emoji/google/snowflake.png differ
diff --git a/public/images/emoji/google/snowman.png b/public/images/emoji/google/snowman.png
index 00183b16001..881f87d60d5 100644
Binary files a/public/images/emoji/google/snowman.png and b/public/images/emoji/google/snowman.png differ
diff --git a/public/images/emoji/google/snowman2.png b/public/images/emoji/google/snowman2.png
index 4355d9f0dbf..9388e9d4bfd 100644
Binary files a/public/images/emoji/google/snowman2.png and b/public/images/emoji/google/snowman2.png differ
diff --git a/public/images/emoji/google/snowman_with_snow.png b/public/images/emoji/google/snowman_with_snow.png
new file mode 100644
index 00000000000..9388e9d4bfd
Binary files /dev/null and b/public/images/emoji/google/snowman_with_snow.png differ
diff --git a/public/images/emoji/google/sob.png b/public/images/emoji/google/sob.png
index 6a09064f502..060ac2ddbf1 100644
Binary files a/public/images/emoji/google/sob.png and b/public/images/emoji/google/sob.png differ
diff --git a/public/images/emoji/google/soccer.png b/public/images/emoji/google/soccer.png
index df7c5c761e5..0c13f98e343 100644
Binary files a/public/images/emoji/google/soccer.png and b/public/images/emoji/google/soccer.png differ
diff --git a/public/images/emoji/google/socks.png b/public/images/emoji/google/socks.png
new file mode 100644
index 00000000000..eb275ca49c2
Binary files /dev/null and b/public/images/emoji/google/socks.png differ
diff --git a/public/images/emoji/google/solomon_islands.png b/public/images/emoji/google/solomon_islands.png
new file mode 100644
index 00000000000..bbdc2f61021
Binary files /dev/null and b/public/images/emoji/google/solomon_islands.png differ
diff --git a/public/images/emoji/google/somalia.png b/public/images/emoji/google/somalia.png
new file mode 100644
index 00000000000..0f51db4c94f
Binary files /dev/null and b/public/images/emoji/google/somalia.png differ
diff --git a/public/images/emoji/google/soon.png b/public/images/emoji/google/soon.png
index bd0f84f54dc..a04a1d9f71d 100644
Binary files a/public/images/emoji/google/soon.png and b/public/images/emoji/google/soon.png differ
diff --git a/public/images/emoji/google/sos.png b/public/images/emoji/google/sos.png
index 5bbb147019f..62637e71c3f 100644
Binary files a/public/images/emoji/google/sos.png and b/public/images/emoji/google/sos.png differ
diff --git a/public/images/emoji/google/sound.png b/public/images/emoji/google/sound.png
index 8f71ff5db4a..dfef71bfd04 100644
Binary files a/public/images/emoji/google/sound.png and b/public/images/emoji/google/sound.png differ
diff --git a/public/images/emoji/google/south_africa.png b/public/images/emoji/google/south_africa.png
new file mode 100644
index 00000000000..802bd272f7f
Binary files /dev/null and b/public/images/emoji/google/south_africa.png differ
diff --git a/public/images/emoji/google/south_georgia_south_sandwich_islands.png b/public/images/emoji/google/south_georgia_south_sandwich_islands.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/google/south_sudan.png b/public/images/emoji/google/south_sudan.png
new file mode 100644
index 00000000000..f26d9bdc6e4
Binary files /dev/null and b/public/images/emoji/google/south_sudan.png differ
diff --git a/public/images/emoji/google/space_invader.png b/public/images/emoji/google/space_invader.png
index f21cc087065..5488ca700cc 100644
Binary files a/public/images/emoji/google/space_invader.png and b/public/images/emoji/google/space_invader.png differ
diff --git a/public/images/emoji/google/spades.png b/public/images/emoji/google/spades.png
index a140620266a..8e3ca45c39d 100644
Binary files a/public/images/emoji/google/spades.png and b/public/images/emoji/google/spades.png differ
diff --git a/public/images/emoji/google/spaghetti.png b/public/images/emoji/google/spaghetti.png
index 997ea8acbfe..e3e5079fa53 100644
Binary files a/public/images/emoji/google/spaghetti.png and b/public/images/emoji/google/spaghetti.png differ
diff --git a/public/images/emoji/google/sparkle.png b/public/images/emoji/google/sparkle.png
index 361cedcebde..ca4a4d9d32c 100644
Binary files a/public/images/emoji/google/sparkle.png and b/public/images/emoji/google/sparkle.png differ
diff --git a/public/images/emoji/google/sparkler.png b/public/images/emoji/google/sparkler.png
index 530c91b32e6..d86bc80ac6a 100644
Binary files a/public/images/emoji/google/sparkler.png and b/public/images/emoji/google/sparkler.png differ
diff --git a/public/images/emoji/google/sparkles.png b/public/images/emoji/google/sparkles.png
index de135381699..0240f1ff543 100644
Binary files a/public/images/emoji/google/sparkles.png and b/public/images/emoji/google/sparkles.png differ
diff --git a/public/images/emoji/google/sparkling_heart.png b/public/images/emoji/google/sparkling_heart.png
index 1668b2ee48f..202e7b21873 100644
Binary files a/public/images/emoji/google/sparkling_heart.png and b/public/images/emoji/google/sparkling_heart.png differ
diff --git a/public/images/emoji/google/speak_no_evil.png b/public/images/emoji/google/speak_no_evil.png
index 25251d6a325..9cbc9b10023 100644
Binary files a/public/images/emoji/google/speak_no_evil.png and b/public/images/emoji/google/speak_no_evil.png differ
diff --git a/public/images/emoji/google/speaker.png b/public/images/emoji/google/speaker.png
index 9a7704da045..100295eec93 100644
Binary files a/public/images/emoji/google/speaker.png and b/public/images/emoji/google/speaker.png differ
diff --git a/public/images/emoji/google/speaking_head.png b/public/images/emoji/google/speaking_head.png
index 9345acae476..62fb598f389 100644
Binary files a/public/images/emoji/google/speaking_head.png and b/public/images/emoji/google/speaking_head.png differ
diff --git a/public/images/emoji/google/speaking_head_in_silhouette.png b/public/images/emoji/google/speaking_head_in_silhouette.png
index 9345acae476..62fb598f389 100644
Binary files a/public/images/emoji/google/speaking_head_in_silhouette.png and b/public/images/emoji/google/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/google/speech_balloon.png b/public/images/emoji/google/speech_balloon.png
index 3f01b30930e..40395744029 100644
Binary files a/public/images/emoji/google/speech_balloon.png and b/public/images/emoji/google/speech_balloon.png differ
diff --git a/public/images/emoji/google/speedboat.png b/public/images/emoji/google/speedboat.png
index 4c6b86d8a9f..4f7a4e3dbe9 100644
Binary files a/public/images/emoji/google/speedboat.png and b/public/images/emoji/google/speedboat.png differ
diff --git a/public/images/emoji/google/spider.png b/public/images/emoji/google/spider.png
index 06da53a7377..18018efcb48 100644
Binary files a/public/images/emoji/google/spider.png and b/public/images/emoji/google/spider.png differ
diff --git a/public/images/emoji/google/spider_web.png b/public/images/emoji/google/spider_web.png
index 163d2c89a08..97a6010501c 100644
Binary files a/public/images/emoji/google/spider_web.png and b/public/images/emoji/google/spider_web.png differ
diff --git a/public/images/emoji/google/spiral_calendar.png b/public/images/emoji/google/spiral_calendar.png
new file mode 100644
index 00000000000..0997b42f0c2
Binary files /dev/null and b/public/images/emoji/google/spiral_calendar.png differ
diff --git a/public/images/emoji/google/spiral_calendar_pad.png b/public/images/emoji/google/spiral_calendar_pad.png
index 4f13ffb5f76..0997b42f0c2 100644
Binary files a/public/images/emoji/google/spiral_calendar_pad.png and b/public/images/emoji/google/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/google/spiral_note_pad.png b/public/images/emoji/google/spiral_note_pad.png
index eb6853649e8..ff382324e5e 100644
Binary files a/public/images/emoji/google/spiral_note_pad.png and b/public/images/emoji/google/spiral_note_pad.png differ
diff --git a/public/images/emoji/google/spiral_notepad.png b/public/images/emoji/google/spiral_notepad.png
new file mode 100644
index 00000000000..ff382324e5e
Binary files /dev/null and b/public/images/emoji/google/spiral_notepad.png differ
diff --git a/public/images/emoji/google/spoon.png b/public/images/emoji/google/spoon.png
new file mode 100644
index 00000000000..583fa80861c
Binary files /dev/null and b/public/images/emoji/google/spoon.png differ
diff --git a/public/images/emoji/google/sports_medal.png b/public/images/emoji/google/sports_medal.png
index 165827b17b6..3d321d89ed8 100644
Binary files a/public/images/emoji/google/sports_medal.png and b/public/images/emoji/google/sports_medal.png differ
diff --git a/public/images/emoji/google/spy.png b/public/images/emoji/google/spy.png
index b76dce309bf..13ef63b0aa6 100644
Binary files a/public/images/emoji/google/spy.png and b/public/images/emoji/google/spy.png differ
diff --git a/public/images/emoji/google/spy/2.png b/public/images/emoji/google/spy/2.png
new file mode 100644
index 00000000000..130424ff539
Binary files /dev/null and b/public/images/emoji/google/spy/2.png differ
diff --git a/public/images/emoji/google/spy/3.png b/public/images/emoji/google/spy/3.png
new file mode 100644
index 00000000000..6fb56a789c9
Binary files /dev/null and b/public/images/emoji/google/spy/3.png differ
diff --git a/public/images/emoji/google/spy/4.png b/public/images/emoji/google/spy/4.png
new file mode 100644
index 00000000000..c021157981c
Binary files /dev/null and b/public/images/emoji/google/spy/4.png differ
diff --git a/public/images/emoji/google/spy/5.png b/public/images/emoji/google/spy/5.png
new file mode 100644
index 00000000000..fcd34112328
Binary files /dev/null and b/public/images/emoji/google/spy/5.png differ
diff --git a/public/images/emoji/google/spy/6.png b/public/images/emoji/google/spy/6.png
new file mode 100644
index 00000000000..e4b939c908b
Binary files /dev/null and b/public/images/emoji/google/spy/6.png differ
diff --git a/public/images/emoji/google/squid.png b/public/images/emoji/google/squid.png
new file mode 100644
index 00000000000..2c80acaa681
Binary files /dev/null and b/public/images/emoji/google/squid.png differ
diff --git a/public/images/emoji/google/sri_lanka.png b/public/images/emoji/google/sri_lanka.png
new file mode 100644
index 00000000000..fbbb925b804
Binary files /dev/null and b/public/images/emoji/google/sri_lanka.png differ
diff --git a/public/images/emoji/google/st_barthelemy.png b/public/images/emoji/google/st_barthelemy.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/st_barthelemy.png differ
diff --git a/public/images/emoji/google/st_helena.png b/public/images/emoji/google/st_helena.png
new file mode 100644
index 00000000000..de4db593989
Binary files /dev/null and b/public/images/emoji/google/st_helena.png differ
diff --git a/public/images/emoji/google/st_kitts_nevis.png b/public/images/emoji/google/st_kitts_nevis.png
new file mode 100644
index 00000000000..ae2720530ef
Binary files /dev/null and b/public/images/emoji/google/st_kitts_nevis.png differ
diff --git a/public/images/emoji/google/st_lucia.png b/public/images/emoji/google/st_lucia.png
new file mode 100644
index 00000000000..ba2a134ef0f
Binary files /dev/null and b/public/images/emoji/google/st_lucia.png differ
diff --git a/public/images/emoji/google/st_martin.png b/public/images/emoji/google/st_martin.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/st_martin.png differ
diff --git a/public/images/emoji/google/st_pierre_miquelon.png b/public/images/emoji/google/st_pierre_miquelon.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/google/st_vincent_grenadines.png b/public/images/emoji/google/st_vincent_grenadines.png
new file mode 100644
index 00000000000..d2a9b7fad72
Binary files /dev/null and b/public/images/emoji/google/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/google/stadium.png b/public/images/emoji/google/stadium.png
index 4622a592467..b69d81ebaad 100644
Binary files a/public/images/emoji/google/stadium.png and b/public/images/emoji/google/stadium.png differ
diff --git a/public/images/emoji/google/star.png b/public/images/emoji/google/star.png
index 43d25e24b72..363ff892741 100644
Binary files a/public/images/emoji/google/star.png and b/public/images/emoji/google/star.png differ
diff --git a/public/images/emoji/google/star2.png b/public/images/emoji/google/star2.png
index 791fa6a6774..7253e078cfc 100644
Binary files a/public/images/emoji/google/star2.png and b/public/images/emoji/google/star2.png differ
diff --git a/public/images/emoji/google/star_and_crescent.png b/public/images/emoji/google/star_and_crescent.png
index cac758b4f24..273c92af0e8 100644
Binary files a/public/images/emoji/google/star_and_crescent.png and b/public/images/emoji/google/star_and_crescent.png differ
diff --git a/public/images/emoji/google/star_of_david.png b/public/images/emoji/google/star_of_david.png
index fcfaad6d0ea..688528fa84d 100644
Binary files a/public/images/emoji/google/star_of_david.png and b/public/images/emoji/google/star_of_david.png differ
diff --git a/public/images/emoji/google/star_struck.png b/public/images/emoji/google/star_struck.png
new file mode 100644
index 00000000000..e7b8b6f9a8d
Binary files /dev/null and b/public/images/emoji/google/star_struck.png differ
diff --git a/public/images/emoji/google/stars.png b/public/images/emoji/google/stars.png
index c78acc9a3af..7a7afc7d897 100644
Binary files a/public/images/emoji/google/stars.png and b/public/images/emoji/google/stars.png differ
diff --git a/public/images/emoji/google/station.png b/public/images/emoji/google/station.png
index 06ca9379d85..47f4ba93fad 100644
Binary files a/public/images/emoji/google/station.png and b/public/images/emoji/google/station.png differ
diff --git a/public/images/emoji/google/statue_of_liberty.png b/public/images/emoji/google/statue_of_liberty.png
index f1e1ee69800..fd78f0e1313 100644
Binary files a/public/images/emoji/google/statue_of_liberty.png and b/public/images/emoji/google/statue_of_liberty.png differ
diff --git a/public/images/emoji/google/steam_locomotive.png b/public/images/emoji/google/steam_locomotive.png
index 2963435eeee..8691eafbb6d 100644
Binary files a/public/images/emoji/google/steam_locomotive.png and b/public/images/emoji/google/steam_locomotive.png differ
diff --git a/public/images/emoji/google/stew.png b/public/images/emoji/google/stew.png
index 32435295c77..84304bfcc65 100644
Binary files a/public/images/emoji/google/stew.png and b/public/images/emoji/google/stew.png differ
diff --git a/public/images/emoji/google/stop_button.png b/public/images/emoji/google/stop_button.png
index 234329ee037..791b42fa2fa 100644
Binary files a/public/images/emoji/google/stop_button.png and b/public/images/emoji/google/stop_button.png differ
diff --git a/public/images/emoji/google/stop_sign.png b/public/images/emoji/google/stop_sign.png
new file mode 100644
index 00000000000..c84adb179fe
Binary files /dev/null and b/public/images/emoji/google/stop_sign.png differ
diff --git a/public/images/emoji/google/stopwatch.png b/public/images/emoji/google/stopwatch.png
index 7bed0afec8f..c061a24e3e8 100644
Binary files a/public/images/emoji/google/stopwatch.png and b/public/images/emoji/google/stopwatch.png differ
diff --git a/public/images/emoji/google/straight_ruler.png b/public/images/emoji/google/straight_ruler.png
index b9223766a47..59fbedc93d0 100644
Binary files a/public/images/emoji/google/straight_ruler.png and b/public/images/emoji/google/straight_ruler.png differ
diff --git a/public/images/emoji/google/strawberry.png b/public/images/emoji/google/strawberry.png
index c48630c28f1..4e683c12805 100644
Binary files a/public/images/emoji/google/strawberry.png and b/public/images/emoji/google/strawberry.png differ
diff --git a/public/images/emoji/google/stuck_out_tongue.png b/public/images/emoji/google/stuck_out_tongue.png
index 88cfa38ee25..2d2367ebcf6 100644
Binary files a/public/images/emoji/google/stuck_out_tongue.png and b/public/images/emoji/google/stuck_out_tongue.png differ
diff --git a/public/images/emoji/google/stuck_out_tongue_closed_eyes.png b/public/images/emoji/google/stuck_out_tongue_closed_eyes.png
index c70ce93270b..4d6aee5361b 100644
Binary files a/public/images/emoji/google/stuck_out_tongue_closed_eyes.png and b/public/images/emoji/google/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/google/stuck_out_tongue_winking_eye.png b/public/images/emoji/google/stuck_out_tongue_winking_eye.png
index 98febc1f235..579284e7a22 100644
Binary files a/public/images/emoji/google/stuck_out_tongue_winking_eye.png and b/public/images/emoji/google/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/google/studio_microphone.png b/public/images/emoji/google/studio_microphone.png
index bb2539903b9..9394168839c 100644
Binary files a/public/images/emoji/google/studio_microphone.png and b/public/images/emoji/google/studio_microphone.png differ
diff --git a/public/images/emoji/google/stuffed_flatbread.png b/public/images/emoji/google/stuffed_flatbread.png
new file mode 100644
index 00000000000..ac839e32ca3
Binary files /dev/null and b/public/images/emoji/google/stuffed_flatbread.png differ
diff --git a/public/images/emoji/google/sudan.png b/public/images/emoji/google/sudan.png
new file mode 100644
index 00000000000..aaae2ea590f
Binary files /dev/null and b/public/images/emoji/google/sudan.png differ
diff --git a/public/images/emoji/google/sun_behind_large_cloud.png b/public/images/emoji/google/sun_behind_large_cloud.png
new file mode 100644
index 00000000000..e3a78dca903
Binary files /dev/null and b/public/images/emoji/google/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/google/sun_behind_rain_cloud.png b/public/images/emoji/google/sun_behind_rain_cloud.png
new file mode 100644
index 00000000000..4fc26cb31b6
Binary files /dev/null and b/public/images/emoji/google/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/google/sun_behind_small_cloud.png b/public/images/emoji/google/sun_behind_small_cloud.png
new file mode 100644
index 00000000000..6686bc8d5a1
Binary files /dev/null and b/public/images/emoji/google/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/google/sun_with_face.png b/public/images/emoji/google/sun_with_face.png
index 9471e1cf426..4ebe4329c16 100644
Binary files a/public/images/emoji/google/sun_with_face.png and b/public/images/emoji/google/sun_with_face.png differ
diff --git a/public/images/emoji/google/sunflower.png b/public/images/emoji/google/sunflower.png
index 1ffc2c9cfd6..b844443198b 100644
Binary files a/public/images/emoji/google/sunflower.png and b/public/images/emoji/google/sunflower.png differ
diff --git a/public/images/emoji/google/sunglasses.png b/public/images/emoji/google/sunglasses.png
index fdecf03f7ce..99271ece612 100644
Binary files a/public/images/emoji/google/sunglasses.png and b/public/images/emoji/google/sunglasses.png differ
diff --git a/public/images/emoji/google/sunny.png b/public/images/emoji/google/sunny.png
index b749ef2ee04..c983cbc0700 100644
Binary files a/public/images/emoji/google/sunny.png and b/public/images/emoji/google/sunny.png differ
diff --git a/public/images/emoji/google/sunrise.png b/public/images/emoji/google/sunrise.png
index dbad3698a8b..ba83c231262 100644
Binary files a/public/images/emoji/google/sunrise.png and b/public/images/emoji/google/sunrise.png differ
diff --git a/public/images/emoji/google/sunrise_over_mountains.png b/public/images/emoji/google/sunrise_over_mountains.png
index 6e9ec1b0015..3c27efd19a0 100644
Binary files a/public/images/emoji/google/sunrise_over_mountains.png and b/public/images/emoji/google/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/google/surfer.png b/public/images/emoji/google/surfer.png
index f5e6d0425f2..1e2f330d861 100644
Binary files a/public/images/emoji/google/surfer.png and b/public/images/emoji/google/surfer.png differ
diff --git a/public/images/emoji/google/surfer/2.png b/public/images/emoji/google/surfer/2.png
new file mode 100644
index 00000000000..c77d90b246d
Binary files /dev/null and b/public/images/emoji/google/surfer/2.png differ
diff --git a/public/images/emoji/google/surfer/3.png b/public/images/emoji/google/surfer/3.png
new file mode 100644
index 00000000000..fa1ed7963bc
Binary files /dev/null and b/public/images/emoji/google/surfer/3.png differ
diff --git a/public/images/emoji/google/surfer/4.png b/public/images/emoji/google/surfer/4.png
new file mode 100644
index 00000000000..1a8f8c59dd9
Binary files /dev/null and b/public/images/emoji/google/surfer/4.png differ
diff --git a/public/images/emoji/google/surfer/5.png b/public/images/emoji/google/surfer/5.png
new file mode 100644
index 00000000000..600963a330e
Binary files /dev/null and b/public/images/emoji/google/surfer/5.png differ
diff --git a/public/images/emoji/google/surfer/6.png b/public/images/emoji/google/surfer/6.png
new file mode 100644
index 00000000000..da93a4d5bab
Binary files /dev/null and b/public/images/emoji/google/surfer/6.png differ
diff --git a/public/images/emoji/google/surfing_man.png b/public/images/emoji/google/surfing_man.png
new file mode 100644
index 00000000000..1e2f330d861
Binary files /dev/null and b/public/images/emoji/google/surfing_man.png differ
diff --git a/public/images/emoji/google/surfing_man/2.png b/public/images/emoji/google/surfing_man/2.png
new file mode 100644
index 00000000000..c77d90b246d
Binary files /dev/null and b/public/images/emoji/google/surfing_man/2.png differ
diff --git a/public/images/emoji/google/surfing_man/3.png b/public/images/emoji/google/surfing_man/3.png
new file mode 100644
index 00000000000..fa1ed7963bc
Binary files /dev/null and b/public/images/emoji/google/surfing_man/3.png differ
diff --git a/public/images/emoji/google/surfing_man/4.png b/public/images/emoji/google/surfing_man/4.png
new file mode 100644
index 00000000000..1a8f8c59dd9
Binary files /dev/null and b/public/images/emoji/google/surfing_man/4.png differ
diff --git a/public/images/emoji/google/surfing_man/5.png b/public/images/emoji/google/surfing_man/5.png
new file mode 100644
index 00000000000..600963a330e
Binary files /dev/null and b/public/images/emoji/google/surfing_man/5.png differ
diff --git a/public/images/emoji/google/surfing_man/6.png b/public/images/emoji/google/surfing_man/6.png
new file mode 100644
index 00000000000..da93a4d5bab
Binary files /dev/null and b/public/images/emoji/google/surfing_man/6.png differ
diff --git a/public/images/emoji/google/surfing_woman.png b/public/images/emoji/google/surfing_woman.png
new file mode 100644
index 00000000000..5833789ebe4
Binary files /dev/null and b/public/images/emoji/google/surfing_woman.png differ
diff --git a/public/images/emoji/google/surfing_woman/2.png b/public/images/emoji/google/surfing_woman/2.png
new file mode 100644
index 00000000000..c0497f10e81
Binary files /dev/null and b/public/images/emoji/google/surfing_woman/2.png differ
diff --git a/public/images/emoji/google/surfing_woman/3.png b/public/images/emoji/google/surfing_woman/3.png
new file mode 100644
index 00000000000..27f3c517835
Binary files /dev/null and b/public/images/emoji/google/surfing_woman/3.png differ
diff --git a/public/images/emoji/google/surfing_woman/4.png b/public/images/emoji/google/surfing_woman/4.png
new file mode 100644
index 00000000000..37937a50855
Binary files /dev/null and b/public/images/emoji/google/surfing_woman/4.png differ
diff --git a/public/images/emoji/google/surfing_woman/5.png b/public/images/emoji/google/surfing_woman/5.png
new file mode 100644
index 00000000000..4185bf21d2a
Binary files /dev/null and b/public/images/emoji/google/surfing_woman/5.png differ
diff --git a/public/images/emoji/google/surfing_woman/6.png b/public/images/emoji/google/surfing_woman/6.png
new file mode 100644
index 00000000000..170fefa657d
Binary files /dev/null and b/public/images/emoji/google/surfing_woman/6.png differ
diff --git a/public/images/emoji/google/suriname.png b/public/images/emoji/google/suriname.png
new file mode 100644
index 00000000000..4113fc0a4ce
Binary files /dev/null and b/public/images/emoji/google/suriname.png differ
diff --git a/public/images/emoji/google/sushi.png b/public/images/emoji/google/sushi.png
index 7088a32456a..9bc4d0d8a9b 100644
Binary files a/public/images/emoji/google/sushi.png and b/public/images/emoji/google/sushi.png differ
diff --git a/public/images/emoji/google/sushing_face.png b/public/images/emoji/google/sushing_face.png
new file mode 100644
index 00000000000..aa287807f1a
Binary files /dev/null and b/public/images/emoji/google/sushing_face.png differ
diff --git a/public/images/emoji/google/suspension_railway.png b/public/images/emoji/google/suspension_railway.png
index 61a177788fc..4bb8e576ee3 100644
Binary files a/public/images/emoji/google/suspension_railway.png and b/public/images/emoji/google/suspension_railway.png differ
diff --git a/public/images/emoji/google/svalbard_and_jan_mayen.png b/public/images/emoji/google/svalbard_and_jan_mayen.png
new file mode 100644
index 00000000000..5330d9794c3
Binary files /dev/null and b/public/images/emoji/google/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/google/swaziland.png b/public/images/emoji/google/swaziland.png
new file mode 100644
index 00000000000..d1d715c2963
Binary files /dev/null and b/public/images/emoji/google/swaziland.png differ
diff --git a/public/images/emoji/google/sweat.png b/public/images/emoji/google/sweat.png
index cf08e685ea7..71c1442f13e 100644
Binary files a/public/images/emoji/google/sweat.png and b/public/images/emoji/google/sweat.png differ
diff --git a/public/images/emoji/google/sweat_drops.png b/public/images/emoji/google/sweat_drops.png
index 0f439023b46..6b3d498af28 100644
Binary files a/public/images/emoji/google/sweat_drops.png and b/public/images/emoji/google/sweat_drops.png differ
diff --git a/public/images/emoji/google/sweat_smile.png b/public/images/emoji/google/sweat_smile.png
index b9ece4b9359..07b2b315bca 100644
Binary files a/public/images/emoji/google/sweat_smile.png and b/public/images/emoji/google/sweat_smile.png differ
diff --git a/public/images/emoji/google/sweden.png b/public/images/emoji/google/sweden.png
new file mode 100644
index 00000000000..d784af61fcb
Binary files /dev/null and b/public/images/emoji/google/sweden.png differ
diff --git a/public/images/emoji/google/sweet_potato.png b/public/images/emoji/google/sweet_potato.png
index 6657f153b13..338ecbc998b 100644
Binary files a/public/images/emoji/google/sweet_potato.png and b/public/images/emoji/google/sweet_potato.png differ
diff --git a/public/images/emoji/google/swimmer.png b/public/images/emoji/google/swimmer.png
index cef0659d366..bc899762801 100644
Binary files a/public/images/emoji/google/swimmer.png and b/public/images/emoji/google/swimmer.png differ
diff --git a/public/images/emoji/google/swimmer/2.png b/public/images/emoji/google/swimmer/2.png
new file mode 100644
index 00000000000..f744028af4d
Binary files /dev/null and b/public/images/emoji/google/swimmer/2.png differ
diff --git a/public/images/emoji/google/swimmer/3.png b/public/images/emoji/google/swimmer/3.png
new file mode 100644
index 00000000000..f2f524c92b3
Binary files /dev/null and b/public/images/emoji/google/swimmer/3.png differ
diff --git a/public/images/emoji/google/swimmer/4.png b/public/images/emoji/google/swimmer/4.png
new file mode 100644
index 00000000000..72156ef8f96
Binary files /dev/null and b/public/images/emoji/google/swimmer/4.png differ
diff --git a/public/images/emoji/google/swimmer/5.png b/public/images/emoji/google/swimmer/5.png
new file mode 100644
index 00000000000..6f0b853600b
Binary files /dev/null and b/public/images/emoji/google/swimmer/5.png differ
diff --git a/public/images/emoji/google/swimmer/6.png b/public/images/emoji/google/swimmer/6.png
new file mode 100644
index 00000000000..5f6222134e6
Binary files /dev/null and b/public/images/emoji/google/swimmer/6.png differ
diff --git a/public/images/emoji/google/swimming_man.png b/public/images/emoji/google/swimming_man.png
new file mode 100644
index 00000000000..bc899762801
Binary files /dev/null and b/public/images/emoji/google/swimming_man.png differ
diff --git a/public/images/emoji/google/swimming_man/2.png b/public/images/emoji/google/swimming_man/2.png
new file mode 100644
index 00000000000..f744028af4d
Binary files /dev/null and b/public/images/emoji/google/swimming_man/2.png differ
diff --git a/public/images/emoji/google/swimming_man/3.png b/public/images/emoji/google/swimming_man/3.png
new file mode 100644
index 00000000000..f2f524c92b3
Binary files /dev/null and b/public/images/emoji/google/swimming_man/3.png differ
diff --git a/public/images/emoji/google/swimming_man/4.png b/public/images/emoji/google/swimming_man/4.png
new file mode 100644
index 00000000000..72156ef8f96
Binary files /dev/null and b/public/images/emoji/google/swimming_man/4.png differ
diff --git a/public/images/emoji/google/swimming_man/5.png b/public/images/emoji/google/swimming_man/5.png
new file mode 100644
index 00000000000..6f0b853600b
Binary files /dev/null and b/public/images/emoji/google/swimming_man/5.png differ
diff --git a/public/images/emoji/google/swimming_man/6.png b/public/images/emoji/google/swimming_man/6.png
new file mode 100644
index 00000000000..5f6222134e6
Binary files /dev/null and b/public/images/emoji/google/swimming_man/6.png differ
diff --git a/public/images/emoji/google/swimming_woman.png b/public/images/emoji/google/swimming_woman.png
new file mode 100644
index 00000000000..c96906cbfa0
Binary files /dev/null and b/public/images/emoji/google/swimming_woman.png differ
diff --git a/public/images/emoji/google/swimming_woman/2.png b/public/images/emoji/google/swimming_woman/2.png
new file mode 100644
index 00000000000..e7937a5e948
Binary files /dev/null and b/public/images/emoji/google/swimming_woman/2.png differ
diff --git a/public/images/emoji/google/swimming_woman/3.png b/public/images/emoji/google/swimming_woman/3.png
new file mode 100644
index 00000000000..c43eac0982e
Binary files /dev/null and b/public/images/emoji/google/swimming_woman/3.png differ
diff --git a/public/images/emoji/google/swimming_woman/4.png b/public/images/emoji/google/swimming_woman/4.png
new file mode 100644
index 00000000000..7a01d161136
Binary files /dev/null and b/public/images/emoji/google/swimming_woman/4.png differ
diff --git a/public/images/emoji/google/swimming_woman/5.png b/public/images/emoji/google/swimming_woman/5.png
new file mode 100644
index 00000000000..32e34241e2d
Binary files /dev/null and b/public/images/emoji/google/swimming_woman/5.png differ
diff --git a/public/images/emoji/google/swimming_woman/6.png b/public/images/emoji/google/swimming_woman/6.png
new file mode 100644
index 00000000000..26346ec2729
Binary files /dev/null and b/public/images/emoji/google/swimming_woman/6.png differ
diff --git a/public/images/emoji/google/switzerland.png b/public/images/emoji/google/switzerland.png
new file mode 100644
index 00000000000..1ef2b0ce41f
Binary files /dev/null and b/public/images/emoji/google/switzerland.png differ
diff --git a/public/images/emoji/google/symbols.png b/public/images/emoji/google/symbols.png
index 03905490d1b..182f0a46e2e 100644
Binary files a/public/images/emoji/google/symbols.png and b/public/images/emoji/google/symbols.png differ
diff --git a/public/images/emoji/google/synagogue.png b/public/images/emoji/google/synagogue.png
index e244775095c..a09c7104085 100644
Binary files a/public/images/emoji/google/synagogue.png and b/public/images/emoji/google/synagogue.png differ
diff --git a/public/images/emoji/google/syria.png b/public/images/emoji/google/syria.png
new file mode 100644
index 00000000000..9048b71158c
Binary files /dev/null and b/public/images/emoji/google/syria.png differ
diff --git a/public/images/emoji/google/syringe.png b/public/images/emoji/google/syringe.png
index 9dcffbb44be..ae2ef5f2655 100644
Binary files a/public/images/emoji/google/syringe.png and b/public/images/emoji/google/syringe.png differ
diff --git a/public/images/emoji/google/t_rex.png b/public/images/emoji/google/t_rex.png
new file mode 100644
index 00000000000..27102b89dea
Binary files /dev/null and b/public/images/emoji/google/t_rex.png differ
diff --git a/public/images/emoji/google/table_tennis.png b/public/images/emoji/google/table_tennis.png
index e43ef813b10..8390f27bb8b 100644
Binary files a/public/images/emoji/google/table_tennis.png and b/public/images/emoji/google/table_tennis.png differ
diff --git a/public/images/emoji/google/taco.png b/public/images/emoji/google/taco.png
index d1234bb4b96..dcdee39c821 100644
Binary files a/public/images/emoji/google/taco.png and b/public/images/emoji/google/taco.png differ
diff --git a/public/images/emoji/google/tada.png b/public/images/emoji/google/tada.png
index ba7765bc596..6737d2d1d73 100644
Binary files a/public/images/emoji/google/tada.png and b/public/images/emoji/google/tada.png differ
diff --git a/public/images/emoji/google/taiwan.png b/public/images/emoji/google/taiwan.png
new file mode 100644
index 00000000000..b0fdb2c49eb
Binary files /dev/null and b/public/images/emoji/google/taiwan.png differ
diff --git a/public/images/emoji/google/tajikistan.png b/public/images/emoji/google/tajikistan.png
new file mode 100644
index 00000000000..0cecf7088ae
Binary files /dev/null and b/public/images/emoji/google/tajikistan.png differ
diff --git a/public/images/emoji/google/takeout_box.png b/public/images/emoji/google/takeout_box.png
new file mode 100644
index 00000000000..dab274ddfc0
Binary files /dev/null and b/public/images/emoji/google/takeout_box.png differ
diff --git a/public/images/emoji/google/tanabata_tree.png b/public/images/emoji/google/tanabata_tree.png
index ff84cf3996a..7e50cf9972a 100644
Binary files a/public/images/emoji/google/tanabata_tree.png and b/public/images/emoji/google/tanabata_tree.png differ
diff --git a/public/images/emoji/google/tangerine.png b/public/images/emoji/google/tangerine.png
index 45a5ecd2af2..ee0912c1e0c 100644
Binary files a/public/images/emoji/google/tangerine.png and b/public/images/emoji/google/tangerine.png differ
diff --git a/public/images/emoji/google/tanzania.png b/public/images/emoji/google/tanzania.png
new file mode 100644
index 00000000000..290a513c36d
Binary files /dev/null and b/public/images/emoji/google/tanzania.png differ
diff --git a/public/images/emoji/google/taurus.png b/public/images/emoji/google/taurus.png
index 36ef13a8323..53fdc1438a6 100644
Binary files a/public/images/emoji/google/taurus.png and b/public/images/emoji/google/taurus.png differ
diff --git a/public/images/emoji/google/taxi.png b/public/images/emoji/google/taxi.png
index 2635768f55f..5c023688467 100644
Binary files a/public/images/emoji/google/taxi.png and b/public/images/emoji/google/taxi.png differ
diff --git a/public/images/emoji/google/tea.png b/public/images/emoji/google/tea.png
index d312f046023..f3e8ede67bd 100644
Binary files a/public/images/emoji/google/tea.png and b/public/images/emoji/google/tea.png differ
diff --git a/public/images/emoji/google/telephone.png b/public/images/emoji/google/telephone.png
index a456c17db5f..24450536868 100644
Binary files a/public/images/emoji/google/telephone.png and b/public/images/emoji/google/telephone.png differ
diff --git a/public/images/emoji/google/telephone_receiver.png b/public/images/emoji/google/telephone_receiver.png
index 62d5834fd2f..087c5fa29b5 100644
Binary files a/public/images/emoji/google/telephone_receiver.png and b/public/images/emoji/google/telephone_receiver.png differ
diff --git a/public/images/emoji/google/telescope.png b/public/images/emoji/google/telescope.png
index 1a61e8d5082..96f65d87e77 100644
Binary files a/public/images/emoji/google/telescope.png and b/public/images/emoji/google/telescope.png differ
diff --git a/public/images/emoji/google/ten.png b/public/images/emoji/google/ten.png
index 6690db7bc30..60b3c3787c0 100644
Binary files a/public/images/emoji/google/ten.png and b/public/images/emoji/google/ten.png differ
diff --git a/public/images/emoji/google/tennis.png b/public/images/emoji/google/tennis.png
index 673da9bd812..2ca385feb1a 100644
Binary files a/public/images/emoji/google/tennis.png and b/public/images/emoji/google/tennis.png differ
diff --git a/public/images/emoji/google/tent.png b/public/images/emoji/google/tent.png
index 99f7a6ef5e1..8eb56114f0f 100644
Binary files a/public/images/emoji/google/tent.png and b/public/images/emoji/google/tent.png differ
diff --git a/public/images/emoji/google/thailand.png b/public/images/emoji/google/thailand.png
new file mode 100644
index 00000000000..a3ac84b8fa2
Binary files /dev/null and b/public/images/emoji/google/thailand.png differ
diff --git a/public/images/emoji/google/thermometer.png b/public/images/emoji/google/thermometer.png
index 1d55d4f631e..23398cba6ce 100644
Binary files a/public/images/emoji/google/thermometer.png and b/public/images/emoji/google/thermometer.png differ
diff --git a/public/images/emoji/google/thermometer_face.png b/public/images/emoji/google/thermometer_face.png
index 3a7ba22f8ea..82bdbf6335b 100644
Binary files a/public/images/emoji/google/thermometer_face.png and b/public/images/emoji/google/thermometer_face.png differ
diff --git a/public/images/emoji/google/thinking.png b/public/images/emoji/google/thinking.png
index 1858262d956..a99dc4d85a5 100644
Binary files a/public/images/emoji/google/thinking.png and b/public/images/emoji/google/thinking.png differ
diff --git a/public/images/emoji/google/thinking_face.png b/public/images/emoji/google/thinking_face.png
index 1858262d956..a99dc4d85a5 100644
Binary files a/public/images/emoji/google/thinking_face.png and b/public/images/emoji/google/thinking_face.png differ
diff --git a/public/images/emoji/google/thought_balloon.png b/public/images/emoji/google/thought_balloon.png
index 67340603ea7..fd55816c8fd 100644
Binary files a/public/images/emoji/google/thought_balloon.png and b/public/images/emoji/google/thought_balloon.png differ
diff --git a/public/images/emoji/google/three.png b/public/images/emoji/google/three.png
index 600c2b652eb..0914fd78113 100644
Binary files a/public/images/emoji/google/three.png and b/public/images/emoji/google/three.png differ
diff --git a/public/images/emoji/google/three_button_mouse.png b/public/images/emoji/google/three_button_mouse.png
index 220ef6486c1..606ada2ed4f 100644
Binary files a/public/images/emoji/google/three_button_mouse.png and b/public/images/emoji/google/three_button_mouse.png differ
diff --git a/public/images/emoji/google/thumbsdown.png b/public/images/emoji/google/thumbsdown.png
index 8203a027e11..f2e7da55f6a 100644
Binary files a/public/images/emoji/google/thumbsdown.png and b/public/images/emoji/google/thumbsdown.png differ
diff --git a/public/images/emoji/google/thumbsdown/2.png b/public/images/emoji/google/thumbsdown/2.png
new file mode 100644
index 00000000000..86d0319a4ab
Binary files /dev/null and b/public/images/emoji/google/thumbsdown/2.png differ
diff --git a/public/images/emoji/google/thumbsdown/3.png b/public/images/emoji/google/thumbsdown/3.png
new file mode 100644
index 00000000000..c50a57e11ec
Binary files /dev/null and b/public/images/emoji/google/thumbsdown/3.png differ
diff --git a/public/images/emoji/google/thumbsdown/4.png b/public/images/emoji/google/thumbsdown/4.png
new file mode 100644
index 00000000000..979e09adf86
Binary files /dev/null and b/public/images/emoji/google/thumbsdown/4.png differ
diff --git a/public/images/emoji/google/thumbsdown/5.png b/public/images/emoji/google/thumbsdown/5.png
new file mode 100644
index 00000000000..bf4f10d81ab
Binary files /dev/null and b/public/images/emoji/google/thumbsdown/5.png differ
diff --git a/public/images/emoji/google/thumbsdown/6.png b/public/images/emoji/google/thumbsdown/6.png
new file mode 100644
index 00000000000..ecab34a9829
Binary files /dev/null and b/public/images/emoji/google/thumbsdown/6.png differ
diff --git a/public/images/emoji/google/thumbsup.png b/public/images/emoji/google/thumbsup.png
index bf0f4e543ad..b03f09eb007 100644
Binary files a/public/images/emoji/google/thumbsup.png and b/public/images/emoji/google/thumbsup.png differ
diff --git a/public/images/emoji/google/thumbsup/2.png b/public/images/emoji/google/thumbsup/2.png
new file mode 100644
index 00000000000..a3a855f569e
Binary files /dev/null and b/public/images/emoji/google/thumbsup/2.png differ
diff --git a/public/images/emoji/google/thumbsup/3.png b/public/images/emoji/google/thumbsup/3.png
new file mode 100644
index 00000000000..c8e515c99bb
Binary files /dev/null and b/public/images/emoji/google/thumbsup/3.png differ
diff --git a/public/images/emoji/google/thumbsup/4.png b/public/images/emoji/google/thumbsup/4.png
new file mode 100644
index 00000000000..4a388dd5fc0
Binary files /dev/null and b/public/images/emoji/google/thumbsup/4.png differ
diff --git a/public/images/emoji/google/thumbsup/5.png b/public/images/emoji/google/thumbsup/5.png
new file mode 100644
index 00000000000..5bf6c233fd2
Binary files /dev/null and b/public/images/emoji/google/thumbsup/5.png differ
diff --git a/public/images/emoji/google/thumbsup/6.png b/public/images/emoji/google/thumbsup/6.png
new file mode 100644
index 00000000000..fed5d03000e
Binary files /dev/null and b/public/images/emoji/google/thumbsup/6.png differ
diff --git a/public/images/emoji/google/thunder_cloud_and_rain.png b/public/images/emoji/google/thunder_cloud_and_rain.png
index ea9bc1ea2e5..5cb64e49e46 100644
Binary files a/public/images/emoji/google/thunder_cloud_and_rain.png and b/public/images/emoji/google/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/google/thunder_cloud_rain.png b/public/images/emoji/google/thunder_cloud_rain.png
index ea9bc1ea2e5..5cb64e49e46 100644
Binary files a/public/images/emoji/google/thunder_cloud_rain.png and b/public/images/emoji/google/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/google/ticket.png b/public/images/emoji/google/ticket.png
index f7cdc8af145..9523d73fe99 100644
Binary files a/public/images/emoji/google/ticket.png and b/public/images/emoji/google/ticket.png differ
diff --git a/public/images/emoji/google/tickets.png b/public/images/emoji/google/tickets.png
index 959ba48a2d2..d4a4f20a291 100644
Binary files a/public/images/emoji/google/tickets.png and b/public/images/emoji/google/tickets.png differ
diff --git a/public/images/emoji/google/tiger.png b/public/images/emoji/google/tiger.png
index 30d3f60e3f6..bcb497cda71 100644
Binary files a/public/images/emoji/google/tiger.png and b/public/images/emoji/google/tiger.png differ
diff --git a/public/images/emoji/google/tiger2.png b/public/images/emoji/google/tiger2.png
index 69fc916af46..9dc79730d9c 100644
Binary files a/public/images/emoji/google/tiger2.png and b/public/images/emoji/google/tiger2.png differ
diff --git a/public/images/emoji/google/timer.png b/public/images/emoji/google/timer.png
index 9ec0b3e7b92..970e7bdee46 100644
Binary files a/public/images/emoji/google/timer.png and b/public/images/emoji/google/timer.png differ
diff --git a/public/images/emoji/google/timer_clock.png b/public/images/emoji/google/timer_clock.png
index 9ec0b3e7b92..970e7bdee46 100644
Binary files a/public/images/emoji/google/timer_clock.png and b/public/images/emoji/google/timer_clock.png differ
diff --git a/public/images/emoji/google/timor_leste.png b/public/images/emoji/google/timor_leste.png
new file mode 100644
index 00000000000..9f5447a9c5b
Binary files /dev/null and b/public/images/emoji/google/timor_leste.png differ
diff --git a/public/images/emoji/google/tipping_hand_man.png b/public/images/emoji/google/tipping_hand_man.png
new file mode 100644
index 00000000000..a6eaa688174
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_man.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/2.png b/public/images/emoji/google/tipping_hand_man/2.png
new file mode 100644
index 00000000000..5252cee381f
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/3.png b/public/images/emoji/google/tipping_hand_man/3.png
new file mode 100644
index 00000000000..52eada652a7
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/4.png b/public/images/emoji/google/tipping_hand_man/4.png
new file mode 100644
index 00000000000..0cfa09e361d
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/5.png b/public/images/emoji/google/tipping_hand_man/5.png
new file mode 100644
index 00000000000..78ea0089828
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/google/tipping_hand_man/6.png b/public/images/emoji/google/tipping_hand_man/6.png
new file mode 100644
index 00000000000..7ee2daef290
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman.png b/public/images/emoji/google/tipping_hand_woman.png
new file mode 100644
index 00000000000..f84a2e02813
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_woman.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/2.png b/public/images/emoji/google/tipping_hand_woman/2.png
new file mode 100644
index 00000000000..448acc172ad
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/3.png b/public/images/emoji/google/tipping_hand_woman/3.png
new file mode 100644
index 00000000000..23c4c592bc8
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/4.png b/public/images/emoji/google/tipping_hand_woman/4.png
new file mode 100644
index 00000000000..be3b2d1e72a
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/5.png b/public/images/emoji/google/tipping_hand_woman/5.png
new file mode 100644
index 00000000000..35c12c49030
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/google/tipping_hand_woman/6.png b/public/images/emoji/google/tipping_hand_woman/6.png
new file mode 100644
index 00000000000..67e0a0ca12b
Binary files /dev/null and b/public/images/emoji/google/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/google/tired_face.png b/public/images/emoji/google/tired_face.png
index acf6f96ad84..0b6f36462de 100644
Binary files a/public/images/emoji/google/tired_face.png and b/public/images/emoji/google/tired_face.png differ
diff --git a/public/images/emoji/google/tm.png b/public/images/emoji/google/tm.png
index c5338782acb..eb251084017 100644
Binary files a/public/images/emoji/google/tm.png and b/public/images/emoji/google/tm.png differ
diff --git a/public/images/emoji/google/togo.png b/public/images/emoji/google/togo.png
new file mode 100644
index 00000000000..31f107a8f9c
Binary files /dev/null and b/public/images/emoji/google/togo.png differ
diff --git a/public/images/emoji/google/toilet.png b/public/images/emoji/google/toilet.png
index 0e499703dd2..08dbd74daa4 100644
Binary files a/public/images/emoji/google/toilet.png and b/public/images/emoji/google/toilet.png differ
diff --git a/public/images/emoji/google/tokelau.png b/public/images/emoji/google/tokelau.png
new file mode 100644
index 00000000000..52c3213be57
Binary files /dev/null and b/public/images/emoji/google/tokelau.png differ
diff --git a/public/images/emoji/google/tokyo_tower.png b/public/images/emoji/google/tokyo_tower.png
index 380a4ab4a57..6ae9f3923b1 100644
Binary files a/public/images/emoji/google/tokyo_tower.png and b/public/images/emoji/google/tokyo_tower.png differ
diff --git a/public/images/emoji/google/tomato.png b/public/images/emoji/google/tomato.png
index 8f3b553b8e3..5211b2c2f2e 100644
Binary files a/public/images/emoji/google/tomato.png and b/public/images/emoji/google/tomato.png differ
diff --git a/public/images/emoji/google/tonga.png b/public/images/emoji/google/tonga.png
new file mode 100644
index 00000000000..aabcbefa5c7
Binary files /dev/null and b/public/images/emoji/google/tonga.png differ
diff --git a/public/images/emoji/google/tongue.png b/public/images/emoji/google/tongue.png
index aa8a7fc5f12..2bb68dd3a57 100644
Binary files a/public/images/emoji/google/tongue.png and b/public/images/emoji/google/tongue.png differ
diff --git a/public/images/emoji/google/tools.png b/public/images/emoji/google/tools.png
index 1be385628fb..174926ff02e 100644
Binary files a/public/images/emoji/google/tools.png and b/public/images/emoji/google/tools.png differ
diff --git a/public/images/emoji/google/top.png b/public/images/emoji/google/top.png
index 7fd84ae9c86..a0065f57a3a 100644
Binary files a/public/images/emoji/google/top.png and b/public/images/emoji/google/top.png differ
diff --git a/public/images/emoji/google/tophat.png b/public/images/emoji/google/tophat.png
index 732d52bdec6..516e982d623 100644
Binary files a/public/images/emoji/google/tophat.png and b/public/images/emoji/google/tophat.png differ
diff --git a/public/images/emoji/google/tornado.png b/public/images/emoji/google/tornado.png
new file mode 100644
index 00000000000..7f488bc983f
Binary files /dev/null and b/public/images/emoji/google/tornado.png differ
diff --git a/public/images/emoji/google/tr.png b/public/images/emoji/google/tr.png
new file mode 100644
index 00000000000..1b52acea75f
Binary files /dev/null and b/public/images/emoji/google/tr.png differ
diff --git a/public/images/emoji/google/track_next.png b/public/images/emoji/google/track_next.png
index 8fa069d5783..85f7bba60f7 100644
Binary files a/public/images/emoji/google/track_next.png and b/public/images/emoji/google/track_next.png differ
diff --git a/public/images/emoji/google/track_previous.png b/public/images/emoji/google/track_previous.png
index 0ef5600a450..559086b3c06 100644
Binary files a/public/images/emoji/google/track_previous.png and b/public/images/emoji/google/track_previous.png differ
diff --git a/public/images/emoji/google/trackball.png b/public/images/emoji/google/trackball.png
index edf41b6a6e5..d0891896ec9 100644
Binary files a/public/images/emoji/google/trackball.png and b/public/images/emoji/google/trackball.png differ
diff --git a/public/images/emoji/google/tractor.png b/public/images/emoji/google/tractor.png
index 98d6ece6ea3..0de0ab08a85 100644
Binary files a/public/images/emoji/google/tractor.png and b/public/images/emoji/google/tractor.png differ
diff --git a/public/images/emoji/google/traffic_light.png b/public/images/emoji/google/traffic_light.png
index f9da859d081..43e9c0da20f 100644
Binary files a/public/images/emoji/google/traffic_light.png and b/public/images/emoji/google/traffic_light.png differ
diff --git a/public/images/emoji/google/train.png b/public/images/emoji/google/train.png
index 3e79fb1b6e8..6f34e414844 100644
Binary files a/public/images/emoji/google/train.png and b/public/images/emoji/google/train.png differ
diff --git a/public/images/emoji/google/train2.png b/public/images/emoji/google/train2.png
index e46bb807260..10105bc8d2b 100644
Binary files a/public/images/emoji/google/train2.png and b/public/images/emoji/google/train2.png differ
diff --git a/public/images/emoji/google/tram.png b/public/images/emoji/google/tram.png
index 4c63eca1b36..0d81f430a86 100644
Binary files a/public/images/emoji/google/tram.png and b/public/images/emoji/google/tram.png differ
diff --git a/public/images/emoji/google/triangular_flag_on_post.png b/public/images/emoji/google/triangular_flag_on_post.png
index deb43385a0f..495e1ee22af 100644
Binary files a/public/images/emoji/google/triangular_flag_on_post.png and b/public/images/emoji/google/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/google/triangular_ruler.png b/public/images/emoji/google/triangular_ruler.png
index 968e8073327..2419f0f5a05 100644
Binary files a/public/images/emoji/google/triangular_ruler.png and b/public/images/emoji/google/triangular_ruler.png differ
diff --git a/public/images/emoji/google/trident.png b/public/images/emoji/google/trident.png
index 5ede9698436..45536a1ac1f 100644
Binary files a/public/images/emoji/google/trident.png and b/public/images/emoji/google/trident.png differ
diff --git a/public/images/emoji/google/trinidad_tobago.png b/public/images/emoji/google/trinidad_tobago.png
new file mode 100644
index 00000000000..52bc446d8d0
Binary files /dev/null and b/public/images/emoji/google/trinidad_tobago.png differ
diff --git a/public/images/emoji/google/tristan_da_cunha.png b/public/images/emoji/google/tristan_da_cunha.png
new file mode 100644
index 00000000000..4dd6ecd04e5
Binary files /dev/null and b/public/images/emoji/google/tristan_da_cunha.png differ
diff --git a/public/images/emoji/google/triumph.png b/public/images/emoji/google/triumph.png
index 56dbe89f4eb..eae6985d997 100644
Binary files a/public/images/emoji/google/triumph.png and b/public/images/emoji/google/triumph.png differ
diff --git a/public/images/emoji/google/trolleybus.png b/public/images/emoji/google/trolleybus.png
index d708db94f05..ab8c570e6ab 100644
Binary files a/public/images/emoji/google/trolleybus.png and b/public/images/emoji/google/trolleybus.png differ
diff --git a/public/images/emoji/google/trophy.png b/public/images/emoji/google/trophy.png
index 4ef49749017..eb969912a94 100644
Binary files a/public/images/emoji/google/trophy.png and b/public/images/emoji/google/trophy.png differ
diff --git a/public/images/emoji/google/tropical_drink.png b/public/images/emoji/google/tropical_drink.png
index def9ee997ca..b4e30786863 100644
Binary files a/public/images/emoji/google/tropical_drink.png and b/public/images/emoji/google/tropical_drink.png differ
diff --git a/public/images/emoji/google/tropical_fish.png b/public/images/emoji/google/tropical_fish.png
index 8aed780373f..ff9c276b1cf 100644
Binary files a/public/images/emoji/google/tropical_fish.png and b/public/images/emoji/google/tropical_fish.png differ
diff --git a/public/images/emoji/google/truck.png b/public/images/emoji/google/truck.png
index cec1216e81e..0fbb5b4f669 100644
Binary files a/public/images/emoji/google/truck.png and b/public/images/emoji/google/truck.png differ
diff --git a/public/images/emoji/google/trumpet.png b/public/images/emoji/google/trumpet.png
index 30ff275879e..c1e906641fa 100644
Binary files a/public/images/emoji/google/trumpet.png and b/public/images/emoji/google/trumpet.png differ
diff --git a/public/images/emoji/google/tshirt.png b/public/images/emoji/google/tshirt.png
new file mode 100644
index 00000000000..ef0745cb181
Binary files /dev/null and b/public/images/emoji/google/tshirt.png differ
diff --git a/public/images/emoji/google/tulip.png b/public/images/emoji/google/tulip.png
index f798ed9d40c..e841a28bba3 100644
Binary files a/public/images/emoji/google/tulip.png and b/public/images/emoji/google/tulip.png differ
diff --git a/public/images/emoji/google/tumbler_glass.png b/public/images/emoji/google/tumbler_glass.png
new file mode 100644
index 00000000000..6fc6c89628f
Binary files /dev/null and b/public/images/emoji/google/tumbler_glass.png differ
diff --git a/public/images/emoji/google/tunisia.png b/public/images/emoji/google/tunisia.png
new file mode 100644
index 00000000000..9ba90c6c15c
Binary files /dev/null and b/public/images/emoji/google/tunisia.png differ
diff --git a/public/images/emoji/google/turkey.png b/public/images/emoji/google/turkey.png
index 09181dd70e6..c0aae847c91 100644
Binary files a/public/images/emoji/google/turkey.png and b/public/images/emoji/google/turkey.png differ
diff --git a/public/images/emoji/google/turkmenistan.png b/public/images/emoji/google/turkmenistan.png
new file mode 100644
index 00000000000..6c3dfed67a1
Binary files /dev/null and b/public/images/emoji/google/turkmenistan.png differ
diff --git a/public/images/emoji/google/turks_caicos_islands.png b/public/images/emoji/google/turks_caicos_islands.png
new file mode 100644
index 00000000000..e3f57dfe984
Binary files /dev/null and b/public/images/emoji/google/turks_caicos_islands.png differ
diff --git a/public/images/emoji/google/turtle.png b/public/images/emoji/google/turtle.png
index 8389c5dbaa6..fce25a40ce3 100644
Binary files a/public/images/emoji/google/turtle.png and b/public/images/emoji/google/turtle.png differ
diff --git a/public/images/emoji/google/tuvalu.png b/public/images/emoji/google/tuvalu.png
new file mode 100644
index 00000000000..179aa46066f
Binary files /dev/null and b/public/images/emoji/google/tuvalu.png differ
diff --git a/public/images/emoji/google/tv.png b/public/images/emoji/google/tv.png
index 85079ffb8b2..5cd554ac60d 100644
Binary files a/public/images/emoji/google/tv.png and b/public/images/emoji/google/tv.png differ
diff --git a/public/images/emoji/google/twisted_rightwards_arrows.png b/public/images/emoji/google/twisted_rightwards_arrows.png
index fa7708abb32..a187bc9b57b 100644
Binary files a/public/images/emoji/google/twisted_rightwards_arrows.png and b/public/images/emoji/google/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/google/two.png b/public/images/emoji/google/two.png
index 1de23db789e..37c3fa792f7 100644
Binary files a/public/images/emoji/google/two.png and b/public/images/emoji/google/two.png differ
diff --git a/public/images/emoji/google/two_hearts.png b/public/images/emoji/google/two_hearts.png
index 229a4a6b8a2..be2de5c738d 100644
Binary files a/public/images/emoji/google/two_hearts.png and b/public/images/emoji/google/two_hearts.png differ
diff --git a/public/images/emoji/google/two_men_holding_hands.png b/public/images/emoji/google/two_men_holding_hands.png
index b66c204e6a2..2c28894a112 100644
Binary files a/public/images/emoji/google/two_men_holding_hands.png and b/public/images/emoji/google/two_men_holding_hands.png differ
diff --git a/public/images/emoji/google/two_women_holding_hands.png b/public/images/emoji/google/two_women_holding_hands.png
index 6a538c4a91f..ea96bde5449 100644
Binary files a/public/images/emoji/google/two_women_holding_hands.png and b/public/images/emoji/google/two_women_holding_hands.png differ
diff --git a/public/images/emoji/google/u5272.png b/public/images/emoji/google/u5272.png
index babe5c8b2e9..c0b6e8b67ac 100644
Binary files a/public/images/emoji/google/u5272.png and b/public/images/emoji/google/u5272.png differ
diff --git a/public/images/emoji/google/u5408.png b/public/images/emoji/google/u5408.png
index f347e846b6e..f74e250d0ff 100644
Binary files a/public/images/emoji/google/u5408.png and b/public/images/emoji/google/u5408.png differ
diff --git a/public/images/emoji/google/u55b6.png b/public/images/emoji/google/u55b6.png
index 4f46d2340f3..48b07a4ed5d 100644
Binary files a/public/images/emoji/google/u55b6.png and b/public/images/emoji/google/u55b6.png differ
diff --git a/public/images/emoji/google/u6307.png b/public/images/emoji/google/u6307.png
index a33cc2e92ba..8d5ad589b68 100644
Binary files a/public/images/emoji/google/u6307.png and b/public/images/emoji/google/u6307.png differ
diff --git a/public/images/emoji/google/u6708.png b/public/images/emoji/google/u6708.png
index def973dc983..18f9397f5e3 100644
Binary files a/public/images/emoji/google/u6708.png and b/public/images/emoji/google/u6708.png differ
diff --git a/public/images/emoji/google/u6709.png b/public/images/emoji/google/u6709.png
index dc24cb62f64..29df4c52277 100644
Binary files a/public/images/emoji/google/u6709.png and b/public/images/emoji/google/u6709.png differ
diff --git a/public/images/emoji/google/u6e80.png b/public/images/emoji/google/u6e80.png
index ff0140c69dd..749f759aa62 100644
Binary files a/public/images/emoji/google/u6e80.png and b/public/images/emoji/google/u6e80.png differ
diff --git a/public/images/emoji/google/u7121.png b/public/images/emoji/google/u7121.png
index ff57e3c9716..d34fef0b4da 100644
Binary files a/public/images/emoji/google/u7121.png and b/public/images/emoji/google/u7121.png differ
diff --git a/public/images/emoji/google/u7533.png b/public/images/emoji/google/u7533.png
index a55ddcdd256..73a7bf1d66a 100644
Binary files a/public/images/emoji/google/u7533.png and b/public/images/emoji/google/u7533.png differ
diff --git a/public/images/emoji/google/u7981.png b/public/images/emoji/google/u7981.png
index 367af9cf6d9..bc603461a2e 100644
Binary files a/public/images/emoji/google/u7981.png and b/public/images/emoji/google/u7981.png differ
diff --git a/public/images/emoji/google/u7a7a.png b/public/images/emoji/google/u7a7a.png
index ccc982801d9..12ab0fc2563 100644
Binary files a/public/images/emoji/google/u7a7a.png and b/public/images/emoji/google/u7a7a.png differ
diff --git a/public/images/emoji/google/uganda.png b/public/images/emoji/google/uganda.png
new file mode 100644
index 00000000000..e897ff257c7
Binary files /dev/null and b/public/images/emoji/google/uganda.png differ
diff --git a/public/images/emoji/google/uk.png b/public/images/emoji/google/uk.png
new file mode 100644
index 00000000000..798328a1ee2
Binary files /dev/null and b/public/images/emoji/google/uk.png differ
diff --git a/public/images/emoji/google/ukraine.png b/public/images/emoji/google/ukraine.png
new file mode 100644
index 00000000000..5603cf126c2
Binary files /dev/null and b/public/images/emoji/google/ukraine.png differ
diff --git a/public/images/emoji/google/umbrella.png b/public/images/emoji/google/umbrella.png
index 3945316c2de..61415439186 100644
Binary files a/public/images/emoji/google/umbrella.png and b/public/images/emoji/google/umbrella.png differ
diff --git a/public/images/emoji/google/umbrella2.png b/public/images/emoji/google/umbrella2.png
index a9fbd03abaf..21b025ea515 100644
Binary files a/public/images/emoji/google/umbrella2.png and b/public/images/emoji/google/umbrella2.png differ
diff --git a/public/images/emoji/google/umbrella_on_ground.png b/public/images/emoji/google/umbrella_on_ground.png
index f23d6f604ce..2a16b4d32a7 100644
Binary files a/public/images/emoji/google/umbrella_on_ground.png and b/public/images/emoji/google/umbrella_on_ground.png differ
diff --git a/public/images/emoji/google/unamused.png b/public/images/emoji/google/unamused.png
index 9edd2a8dc3d..864cb335795 100644
Binary files a/public/images/emoji/google/unamused.png and b/public/images/emoji/google/unamused.png differ
diff --git a/public/images/emoji/google/underage.png b/public/images/emoji/google/underage.png
index 26cab51e7da..09e967fcad1 100644
Binary files a/public/images/emoji/google/underage.png and b/public/images/emoji/google/underage.png differ
diff --git a/public/images/emoji/google/unicorn.png b/public/images/emoji/google/unicorn.png
index 9a52258b99c..b32a890bec6 100644
Binary files a/public/images/emoji/google/unicorn.png and b/public/images/emoji/google/unicorn.png differ
diff --git a/public/images/emoji/google/unicorn_face.png b/public/images/emoji/google/unicorn_face.png
index 9a52258b99c..b32a890bec6 100644
Binary files a/public/images/emoji/google/unicorn_face.png and b/public/images/emoji/google/unicorn_face.png differ
diff --git a/public/images/emoji/google/united_arab_emirates.png b/public/images/emoji/google/united_arab_emirates.png
new file mode 100644
index 00000000000..0e19ed7007c
Binary files /dev/null and b/public/images/emoji/google/united_arab_emirates.png differ
diff --git a/public/images/emoji/google/united_nations.png b/public/images/emoji/google/united_nations.png
new file mode 100644
index 00000000000..721551f2b17
Binary files /dev/null and b/public/images/emoji/google/united_nations.png differ
diff --git a/public/images/emoji/google/unlock.png b/public/images/emoji/google/unlock.png
index 3e2fb468b7e..3f04497713d 100644
Binary files a/public/images/emoji/google/unlock.png and b/public/images/emoji/google/unlock.png differ
diff --git a/public/images/emoji/google/up.png b/public/images/emoji/google/up.png
index 3b52fffe11a..ce2b306ca68 100644
Binary files a/public/images/emoji/google/up.png and b/public/images/emoji/google/up.png differ
diff --git a/public/images/emoji/google/upside_down.png b/public/images/emoji/google/upside_down.png
index ea09f4c9a62..17905e15783 100644
Binary files a/public/images/emoji/google/upside_down.png and b/public/images/emoji/google/upside_down.png differ
diff --git a/public/images/emoji/google/upside_down_face.png b/public/images/emoji/google/upside_down_face.png
index ea09f4c9a62..17905e15783 100644
Binary files a/public/images/emoji/google/upside_down_face.png and b/public/images/emoji/google/upside_down_face.png differ
diff --git a/public/images/emoji/google/urn.png b/public/images/emoji/google/urn.png
index eff08b3c1a1..864d903a351 100644
Binary files a/public/images/emoji/google/urn.png and b/public/images/emoji/google/urn.png differ
diff --git a/public/images/emoji/google/uruguay.png b/public/images/emoji/google/uruguay.png
new file mode 100644
index 00000000000..2e547a48ff6
Binary files /dev/null and b/public/images/emoji/google/uruguay.png differ
diff --git a/public/images/emoji/google/us.png b/public/images/emoji/google/us.png
index 253e481c1ff..fae42715118 100644
Binary files a/public/images/emoji/google/us.png and b/public/images/emoji/google/us.png differ
diff --git a/public/images/emoji/google/us_outlying_islands.png b/public/images/emoji/google/us_outlying_islands.png
new file mode 100644
index 00000000000..fae42715118
Binary files /dev/null and b/public/images/emoji/google/us_outlying_islands.png differ
diff --git a/public/images/emoji/google/us_virgin_islands.png b/public/images/emoji/google/us_virgin_islands.png
new file mode 100644
index 00000000000..ddfe6616738
Binary files /dev/null and b/public/images/emoji/google/us_virgin_islands.png differ
diff --git a/public/images/emoji/google/uzbekistan.png b/public/images/emoji/google/uzbekistan.png
new file mode 100644
index 00000000000..f460a0ee46f
Binary files /dev/null and b/public/images/emoji/google/uzbekistan.png differ
diff --git a/public/images/emoji/google/v.png b/public/images/emoji/google/v.png
index 989ad11a143..b8cbb64306b 100644
Binary files a/public/images/emoji/google/v.png and b/public/images/emoji/google/v.png differ
diff --git a/public/images/emoji/google/v/2.png b/public/images/emoji/google/v/2.png
new file mode 100644
index 00000000000..1645b2899b5
Binary files /dev/null and b/public/images/emoji/google/v/2.png differ
diff --git a/public/images/emoji/google/v/3.png b/public/images/emoji/google/v/3.png
new file mode 100644
index 00000000000..15dc6dd3d36
Binary files /dev/null and b/public/images/emoji/google/v/3.png differ
diff --git a/public/images/emoji/google/v/4.png b/public/images/emoji/google/v/4.png
new file mode 100644
index 00000000000..b79939791b8
Binary files /dev/null and b/public/images/emoji/google/v/4.png differ
diff --git a/public/images/emoji/google/v/5.png b/public/images/emoji/google/v/5.png
new file mode 100644
index 00000000000..a7211c352cf
Binary files /dev/null and b/public/images/emoji/google/v/5.png differ
diff --git a/public/images/emoji/google/v/6.png b/public/images/emoji/google/v/6.png
new file mode 100644
index 00000000000..9f9b21f325b
Binary files /dev/null and b/public/images/emoji/google/v/6.png differ
diff --git a/public/images/emoji/google/vampire.png b/public/images/emoji/google/vampire.png
new file mode 100644
index 00000000000..01bd481c60d
Binary files /dev/null and b/public/images/emoji/google/vampire.png differ
diff --git a/public/images/emoji/google/vampire/2.png b/public/images/emoji/google/vampire/2.png
new file mode 100644
index 00000000000..548e6e82840
Binary files /dev/null and b/public/images/emoji/google/vampire/2.png differ
diff --git a/public/images/emoji/google/vampire/3.png b/public/images/emoji/google/vampire/3.png
new file mode 100644
index 00000000000..6498305d066
Binary files /dev/null and b/public/images/emoji/google/vampire/3.png differ
diff --git a/public/images/emoji/google/vampire/4.png b/public/images/emoji/google/vampire/4.png
new file mode 100644
index 00000000000..dab2ba096ee
Binary files /dev/null and b/public/images/emoji/google/vampire/4.png differ
diff --git a/public/images/emoji/google/vampire/5.png b/public/images/emoji/google/vampire/5.png
new file mode 100644
index 00000000000..dac38cae74c
Binary files /dev/null and b/public/images/emoji/google/vampire/5.png differ
diff --git a/public/images/emoji/google/vampire/6.png b/public/images/emoji/google/vampire/6.png
new file mode 100644
index 00000000000..3ad64b3710e
Binary files /dev/null and b/public/images/emoji/google/vampire/6.png differ
diff --git a/public/images/emoji/google/vanuatu.png b/public/images/emoji/google/vanuatu.png
new file mode 100644
index 00000000000..3fc2e85ac8f
Binary files /dev/null and b/public/images/emoji/google/vanuatu.png differ
diff --git a/public/images/emoji/google/vatican_city.png b/public/images/emoji/google/vatican_city.png
new file mode 100644
index 00000000000..1fad5c92691
Binary files /dev/null and b/public/images/emoji/google/vatican_city.png differ
diff --git a/public/images/emoji/google/venezuela.png b/public/images/emoji/google/venezuela.png
new file mode 100644
index 00000000000..2e340a521a9
Binary files /dev/null and b/public/images/emoji/google/venezuela.png differ
diff --git a/public/images/emoji/google/vertical_traffic_light.png b/public/images/emoji/google/vertical_traffic_light.png
index 56bee06af65..795439a0f29 100644
Binary files a/public/images/emoji/google/vertical_traffic_light.png and b/public/images/emoji/google/vertical_traffic_light.png differ
diff --git a/public/images/emoji/google/vhs.png b/public/images/emoji/google/vhs.png
index 6238e740207..e3789dc34fd 100644
Binary files a/public/images/emoji/google/vhs.png and b/public/images/emoji/google/vhs.png differ
diff --git a/public/images/emoji/google/vibration_mode.png b/public/images/emoji/google/vibration_mode.png
index 5a6aca044b4..a8f2fe50fe9 100644
Binary files a/public/images/emoji/google/vibration_mode.png and b/public/images/emoji/google/vibration_mode.png differ
diff --git a/public/images/emoji/google/video_camera.png b/public/images/emoji/google/video_camera.png
index 211279451d4..fd426e4ad33 100644
Binary files a/public/images/emoji/google/video_camera.png and b/public/images/emoji/google/video_camera.png differ
diff --git a/public/images/emoji/google/video_game.png b/public/images/emoji/google/video_game.png
index 38077b5a11f..66a883da313 100644
Binary files a/public/images/emoji/google/video_game.png and b/public/images/emoji/google/video_game.png differ
diff --git a/public/images/emoji/google/vietnam.png b/public/images/emoji/google/vietnam.png
new file mode 100644
index 00000000000..38ccc85e780
Binary files /dev/null and b/public/images/emoji/google/vietnam.png differ
diff --git a/public/images/emoji/google/violin.png b/public/images/emoji/google/violin.png
index d91a10d8ffb..e2d69249193 100644
Binary files a/public/images/emoji/google/violin.png and b/public/images/emoji/google/violin.png differ
diff --git a/public/images/emoji/google/virgo.png b/public/images/emoji/google/virgo.png
index 4f17f767a09..45473446ff4 100644
Binary files a/public/images/emoji/google/virgo.png and b/public/images/emoji/google/virgo.png differ
diff --git a/public/images/emoji/google/volcano.png b/public/images/emoji/google/volcano.png
index 4d1cf9b4ee6..0baf6540823 100644
Binary files a/public/images/emoji/google/volcano.png and b/public/images/emoji/google/volcano.png differ
diff --git a/public/images/emoji/google/volleyball.png b/public/images/emoji/google/volleyball.png
index 7503e8aa133..4cb7f03b3c2 100644
Binary files a/public/images/emoji/google/volleyball.png and b/public/images/emoji/google/volleyball.png differ
diff --git a/public/images/emoji/google/vs.png b/public/images/emoji/google/vs.png
index 98a374dcf09..2fe23e57cec 100644
Binary files a/public/images/emoji/google/vs.png and b/public/images/emoji/google/vs.png differ
diff --git a/public/images/emoji/google/vulcan.png b/public/images/emoji/google/vulcan.png
index 7294a38c1fa..e672a711f11 100644
Binary files a/public/images/emoji/google/vulcan.png and b/public/images/emoji/google/vulcan.png differ
diff --git a/public/images/emoji/google/vulcan/2.png b/public/images/emoji/google/vulcan/2.png
new file mode 100644
index 00000000000..635aa1f7757
Binary files /dev/null and b/public/images/emoji/google/vulcan/2.png differ
diff --git a/public/images/emoji/google/vulcan/3.png b/public/images/emoji/google/vulcan/3.png
new file mode 100644
index 00000000000..d6c303152c4
Binary files /dev/null and b/public/images/emoji/google/vulcan/3.png differ
diff --git a/public/images/emoji/google/vulcan/4.png b/public/images/emoji/google/vulcan/4.png
new file mode 100644
index 00000000000..645ad295a80
Binary files /dev/null and b/public/images/emoji/google/vulcan/4.png differ
diff --git a/public/images/emoji/google/vulcan/5.png b/public/images/emoji/google/vulcan/5.png
new file mode 100644
index 00000000000..cbb240d2c67
Binary files /dev/null and b/public/images/emoji/google/vulcan/5.png differ
diff --git a/public/images/emoji/google/vulcan/6.png b/public/images/emoji/google/vulcan/6.png
new file mode 100644
index 00000000000..0e727c865aa
Binary files /dev/null and b/public/images/emoji/google/vulcan/6.png differ
diff --git a/public/images/emoji/google/vulcan_salute.png b/public/images/emoji/google/vulcan_salute.png
new file mode 100644
index 00000000000..e672a711f11
Binary files /dev/null and b/public/images/emoji/google/vulcan_salute.png differ
diff --git a/public/images/emoji/google/vulcan_salute/2.png b/public/images/emoji/google/vulcan_salute/2.png
new file mode 100644
index 00000000000..635aa1f7757
Binary files /dev/null and b/public/images/emoji/google/vulcan_salute/2.png differ
diff --git a/public/images/emoji/google/vulcan_salute/3.png b/public/images/emoji/google/vulcan_salute/3.png
new file mode 100644
index 00000000000..d6c303152c4
Binary files /dev/null and b/public/images/emoji/google/vulcan_salute/3.png differ
diff --git a/public/images/emoji/google/vulcan_salute/4.png b/public/images/emoji/google/vulcan_salute/4.png
new file mode 100644
index 00000000000..645ad295a80
Binary files /dev/null and b/public/images/emoji/google/vulcan_salute/4.png differ
diff --git a/public/images/emoji/google/vulcan_salute/5.png b/public/images/emoji/google/vulcan_salute/5.png
new file mode 100644
index 00000000000..cbb240d2c67
Binary files /dev/null and b/public/images/emoji/google/vulcan_salute/5.png differ
diff --git a/public/images/emoji/google/vulcan_salute/6.png b/public/images/emoji/google/vulcan_salute/6.png
new file mode 100644
index 00000000000..0e727c865aa
Binary files /dev/null and b/public/images/emoji/google/vulcan_salute/6.png differ
diff --git a/public/images/emoji/google/walking.png b/public/images/emoji/google/walking.png
index bbd7b970bea..509a8cdabec 100644
Binary files a/public/images/emoji/google/walking.png and b/public/images/emoji/google/walking.png differ
diff --git a/public/images/emoji/google/walking/2.png b/public/images/emoji/google/walking/2.png
new file mode 100644
index 00000000000..e20ab752606
Binary files /dev/null and b/public/images/emoji/google/walking/2.png differ
diff --git a/public/images/emoji/google/walking/3.png b/public/images/emoji/google/walking/3.png
new file mode 100644
index 00000000000..766cfec327a
Binary files /dev/null and b/public/images/emoji/google/walking/3.png differ
diff --git a/public/images/emoji/google/walking/4.png b/public/images/emoji/google/walking/4.png
new file mode 100644
index 00000000000..a2a6fe42cf9
Binary files /dev/null and b/public/images/emoji/google/walking/4.png differ
diff --git a/public/images/emoji/google/walking/5.png b/public/images/emoji/google/walking/5.png
new file mode 100644
index 00000000000..855ebfa8c7c
Binary files /dev/null and b/public/images/emoji/google/walking/5.png differ
diff --git a/public/images/emoji/google/walking/6.png b/public/images/emoji/google/walking/6.png
new file mode 100644
index 00000000000..80df101bfdd
Binary files /dev/null and b/public/images/emoji/google/walking/6.png differ
diff --git a/public/images/emoji/google/walking_man.png b/public/images/emoji/google/walking_man.png
new file mode 100644
index 00000000000..509a8cdabec
Binary files /dev/null and b/public/images/emoji/google/walking_man.png differ
diff --git a/public/images/emoji/google/walking_man/2.png b/public/images/emoji/google/walking_man/2.png
new file mode 100644
index 00000000000..e20ab752606
Binary files /dev/null and b/public/images/emoji/google/walking_man/2.png differ
diff --git a/public/images/emoji/google/walking_man/3.png b/public/images/emoji/google/walking_man/3.png
new file mode 100644
index 00000000000..766cfec327a
Binary files /dev/null and b/public/images/emoji/google/walking_man/3.png differ
diff --git a/public/images/emoji/google/walking_man/4.png b/public/images/emoji/google/walking_man/4.png
new file mode 100644
index 00000000000..a2a6fe42cf9
Binary files /dev/null and b/public/images/emoji/google/walking_man/4.png differ
diff --git a/public/images/emoji/google/walking_man/5.png b/public/images/emoji/google/walking_man/5.png
new file mode 100644
index 00000000000..855ebfa8c7c
Binary files /dev/null and b/public/images/emoji/google/walking_man/5.png differ
diff --git a/public/images/emoji/google/walking_man/6.png b/public/images/emoji/google/walking_man/6.png
new file mode 100644
index 00000000000..80df101bfdd
Binary files /dev/null and b/public/images/emoji/google/walking_man/6.png differ
diff --git a/public/images/emoji/google/walking_woman.png b/public/images/emoji/google/walking_woman.png
new file mode 100644
index 00000000000..5f70f0657fb
Binary files /dev/null and b/public/images/emoji/google/walking_woman.png differ
diff --git a/public/images/emoji/google/walking_woman/2.png b/public/images/emoji/google/walking_woman/2.png
new file mode 100644
index 00000000000..10c82332c25
Binary files /dev/null and b/public/images/emoji/google/walking_woman/2.png differ
diff --git a/public/images/emoji/google/walking_woman/3.png b/public/images/emoji/google/walking_woman/3.png
new file mode 100644
index 00000000000..e99c4be9afc
Binary files /dev/null and b/public/images/emoji/google/walking_woman/3.png differ
diff --git a/public/images/emoji/google/walking_woman/4.png b/public/images/emoji/google/walking_woman/4.png
new file mode 100644
index 00000000000..b06773ed466
Binary files /dev/null and b/public/images/emoji/google/walking_woman/4.png differ
diff --git a/public/images/emoji/google/walking_woman/5.png b/public/images/emoji/google/walking_woman/5.png
new file mode 100644
index 00000000000..dadb3e34161
Binary files /dev/null and b/public/images/emoji/google/walking_woman/5.png differ
diff --git a/public/images/emoji/google/walking_woman/6.png b/public/images/emoji/google/walking_woman/6.png
new file mode 100644
index 00000000000..a2b5f60343d
Binary files /dev/null and b/public/images/emoji/google/walking_woman/6.png differ
diff --git a/public/images/emoji/google/wallis_futuna.png b/public/images/emoji/google/wallis_futuna.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/wallis_futuna.png differ
diff --git a/public/images/emoji/google/waning_crescent_moon.png b/public/images/emoji/google/waning_crescent_moon.png
index 993deafc94d..308cad43ead 100644
Binary files a/public/images/emoji/google/waning_crescent_moon.png and b/public/images/emoji/google/waning_crescent_moon.png differ
diff --git a/public/images/emoji/google/waning_gibbous_moon.png b/public/images/emoji/google/waning_gibbous_moon.png
index b70b1b3b523..a3d48ca2219 100644
Binary files a/public/images/emoji/google/waning_gibbous_moon.png and b/public/images/emoji/google/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/google/warning.png b/public/images/emoji/google/warning.png
index 13f08e539bf..9e3a4f3afeb 100644
Binary files a/public/images/emoji/google/warning.png and b/public/images/emoji/google/warning.png differ
diff --git a/public/images/emoji/google/wastebasket.png b/public/images/emoji/google/wastebasket.png
index ab1ca0dcbfd..874a3480e88 100644
Binary files a/public/images/emoji/google/wastebasket.png and b/public/images/emoji/google/wastebasket.png differ
diff --git a/public/images/emoji/google/watch.png b/public/images/emoji/google/watch.png
index 528df360740..d405c22176a 100644
Binary files a/public/images/emoji/google/watch.png and b/public/images/emoji/google/watch.png differ
diff --git a/public/images/emoji/google/water_buffalo.png b/public/images/emoji/google/water_buffalo.png
index 4888de00f2c..1b2f9c7e59f 100644
Binary files a/public/images/emoji/google/water_buffalo.png and b/public/images/emoji/google/water_buffalo.png differ
diff --git a/public/images/emoji/google/watermelon.png b/public/images/emoji/google/watermelon.png
index bf07ccfa7a7..db68e490110 100644
Binary files a/public/images/emoji/google/watermelon.png and b/public/images/emoji/google/watermelon.png differ
diff --git a/public/images/emoji/google/wave.png b/public/images/emoji/google/wave.png
index 35caa37fd97..90bca6de08a 100644
Binary files a/public/images/emoji/google/wave.png and b/public/images/emoji/google/wave.png differ
diff --git a/public/images/emoji/google/wave/2.png b/public/images/emoji/google/wave/2.png
new file mode 100644
index 00000000000..5c034714b0d
Binary files /dev/null and b/public/images/emoji/google/wave/2.png differ
diff --git a/public/images/emoji/google/wave/3.png b/public/images/emoji/google/wave/3.png
new file mode 100644
index 00000000000..9a2825e24e4
Binary files /dev/null and b/public/images/emoji/google/wave/3.png differ
diff --git a/public/images/emoji/google/wave/4.png b/public/images/emoji/google/wave/4.png
new file mode 100644
index 00000000000..bfbb943f5bc
Binary files /dev/null and b/public/images/emoji/google/wave/4.png differ
diff --git a/public/images/emoji/google/wave/5.png b/public/images/emoji/google/wave/5.png
new file mode 100644
index 00000000000..f4233b8168e
Binary files /dev/null and b/public/images/emoji/google/wave/5.png differ
diff --git a/public/images/emoji/google/wave/6.png b/public/images/emoji/google/wave/6.png
new file mode 100644
index 00000000000..d403d79c6fe
Binary files /dev/null and b/public/images/emoji/google/wave/6.png differ
diff --git a/public/images/emoji/google/waving_black_flag.png b/public/images/emoji/google/waving_black_flag.png
index de072bca626..a7fce0c5812 100644
Binary files a/public/images/emoji/google/waving_black_flag.png and b/public/images/emoji/google/waving_black_flag.png differ
diff --git a/public/images/emoji/google/waving_white_flag.png b/public/images/emoji/google/waving_white_flag.png
index ce4e23c8c72..7876a1b95cc 100644
Binary files a/public/images/emoji/google/waving_white_flag.png and b/public/images/emoji/google/waving_white_flag.png differ
diff --git a/public/images/emoji/google/wavy_dash.png b/public/images/emoji/google/wavy_dash.png
index e28d0933872..a11c57148d4 100644
Binary files a/public/images/emoji/google/wavy_dash.png and b/public/images/emoji/google/wavy_dash.png differ
diff --git a/public/images/emoji/google/waxing_crescent_moon.png b/public/images/emoji/google/waxing_crescent_moon.png
index 0a775f4918e..eafecdf5738 100644
Binary files a/public/images/emoji/google/waxing_crescent_moon.png and b/public/images/emoji/google/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/google/waxing_gibbous_moon.png b/public/images/emoji/google/waxing_gibbous_moon.png
index 5673a0b3fad..358209cb644 100644
Binary files a/public/images/emoji/google/waxing_gibbous_moon.png and b/public/images/emoji/google/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/google/wc.png b/public/images/emoji/google/wc.png
index 18b1e0b15ac..b56cd1743b0 100644
Binary files a/public/images/emoji/google/wc.png and b/public/images/emoji/google/wc.png differ
diff --git a/public/images/emoji/google/weary.png b/public/images/emoji/google/weary.png
index ced0d21c409..16b0783cec0 100644
Binary files a/public/images/emoji/google/weary.png and b/public/images/emoji/google/weary.png differ
diff --git a/public/images/emoji/google/wedding.png b/public/images/emoji/google/wedding.png
index e9b39cda21e..750e7e0c4a0 100644
Binary files a/public/images/emoji/google/wedding.png and b/public/images/emoji/google/wedding.png differ
diff --git a/public/images/emoji/google/weight_lifter.png b/public/images/emoji/google/weight_lifter.png
index eb58823175e..47689fc2921 100644
Binary files a/public/images/emoji/google/weight_lifter.png and b/public/images/emoji/google/weight_lifter.png differ
diff --git a/public/images/emoji/google/weight_lifter/2.png b/public/images/emoji/google/weight_lifter/2.png
new file mode 100644
index 00000000000..56ac45601aa
Binary files /dev/null and b/public/images/emoji/google/weight_lifter/2.png differ
diff --git a/public/images/emoji/google/weight_lifter/3.png b/public/images/emoji/google/weight_lifter/3.png
new file mode 100644
index 00000000000..e4f89233ed0
Binary files /dev/null and b/public/images/emoji/google/weight_lifter/3.png differ
diff --git a/public/images/emoji/google/weight_lifter/4.png b/public/images/emoji/google/weight_lifter/4.png
new file mode 100644
index 00000000000..a0a5133cf44
Binary files /dev/null and b/public/images/emoji/google/weight_lifter/4.png differ
diff --git a/public/images/emoji/google/weight_lifter/5.png b/public/images/emoji/google/weight_lifter/5.png
new file mode 100644
index 00000000000..a38a3c841a9
Binary files /dev/null and b/public/images/emoji/google/weight_lifter/5.png differ
diff --git a/public/images/emoji/google/weight_lifter/6.png b/public/images/emoji/google/weight_lifter/6.png
new file mode 100644
index 00000000000..f5b56144633
Binary files /dev/null and b/public/images/emoji/google/weight_lifter/6.png differ
diff --git a/public/images/emoji/google/weight_lifting_man.png b/public/images/emoji/google/weight_lifting_man.png
new file mode 100644
index 00000000000..47689fc2921
Binary files /dev/null and b/public/images/emoji/google/weight_lifting_man.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/2.png b/public/images/emoji/google/weight_lifting_man/2.png
new file mode 100644
index 00000000000..56ac45601aa
Binary files /dev/null and b/public/images/emoji/google/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/3.png b/public/images/emoji/google/weight_lifting_man/3.png
new file mode 100644
index 00000000000..e4f89233ed0
Binary files /dev/null and b/public/images/emoji/google/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/4.png b/public/images/emoji/google/weight_lifting_man/4.png
new file mode 100644
index 00000000000..a0a5133cf44
Binary files /dev/null and b/public/images/emoji/google/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/5.png b/public/images/emoji/google/weight_lifting_man/5.png
new file mode 100644
index 00000000000..a38a3c841a9
Binary files /dev/null and b/public/images/emoji/google/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/google/weight_lifting_man/6.png b/public/images/emoji/google/weight_lifting_man/6.png
new file mode 100644
index 00000000000..f5b56144633
Binary files /dev/null and b/public/images/emoji/google/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/google/weight_lifting_woman.png b/public/images/emoji/google/weight_lifting_woman.png
new file mode 100644
index 00000000000..52b046d7d83
Binary files /dev/null and b/public/images/emoji/google/weight_lifting_woman.png differ
diff --git a/public/images/emoji/google/western_sahara.png b/public/images/emoji/google/western_sahara.png
new file mode 100644
index 00000000000..dad0f8ce650
Binary files /dev/null and b/public/images/emoji/google/western_sahara.png differ
diff --git a/public/images/emoji/google/whale.png b/public/images/emoji/google/whale.png
index 2a83fedd0cc..114853b6262 100644
Binary files a/public/images/emoji/google/whale.png and b/public/images/emoji/google/whale.png differ
diff --git a/public/images/emoji/google/whale2.png b/public/images/emoji/google/whale2.png
index 433108acf74..0b96c8556b5 100644
Binary files a/public/images/emoji/google/whale2.png and b/public/images/emoji/google/whale2.png differ
diff --git a/public/images/emoji/google/wheel_of_dharma.png b/public/images/emoji/google/wheel_of_dharma.png
index eacaf590e69..71da4ccd167 100644
Binary files a/public/images/emoji/google/wheel_of_dharma.png and b/public/images/emoji/google/wheel_of_dharma.png differ
diff --git a/public/images/emoji/google/wheelchair.png b/public/images/emoji/google/wheelchair.png
index 17ab798b1c8..96ac605b623 100644
Binary files a/public/images/emoji/google/wheelchair.png and b/public/images/emoji/google/wheelchair.png differ
diff --git a/public/images/emoji/google/white_check_mark.png b/public/images/emoji/google/white_check_mark.png
index fcb38f94828..5c357f7c11c 100644
Binary files a/public/images/emoji/google/white_check_mark.png and b/public/images/emoji/google/white_check_mark.png differ
diff --git a/public/images/emoji/google/white_circle.png b/public/images/emoji/google/white_circle.png
index cb1d0f740af..6723e92a5f0 100644
Binary files a/public/images/emoji/google/white_circle.png and b/public/images/emoji/google/white_circle.png differ
diff --git a/public/images/emoji/google/white_flag.png b/public/images/emoji/google/white_flag.png
new file mode 100644
index 00000000000..7876a1b95cc
Binary files /dev/null and b/public/images/emoji/google/white_flag.png differ
diff --git a/public/images/emoji/google/white_flower.png b/public/images/emoji/google/white_flower.png
index 5486e25da82..dfa80abfe72 100644
Binary files a/public/images/emoji/google/white_flower.png and b/public/images/emoji/google/white_flower.png differ
diff --git a/public/images/emoji/google/white_frowning_face.png b/public/images/emoji/google/white_frowning_face.png
index db9c6af5b3b..7248eaba8ac 100644
Binary files a/public/images/emoji/google/white_frowning_face.png and b/public/images/emoji/google/white_frowning_face.png differ
diff --git a/public/images/emoji/google/white_large_square.png b/public/images/emoji/google/white_large_square.png
index f9dda7899df..79debc6d730 100644
Binary files a/public/images/emoji/google/white_large_square.png and b/public/images/emoji/google/white_large_square.png differ
diff --git a/public/images/emoji/google/white_medium_small_square.png b/public/images/emoji/google/white_medium_small_square.png
index 9768059a106..9067cd7ef9a 100644
Binary files a/public/images/emoji/google/white_medium_small_square.png and b/public/images/emoji/google/white_medium_small_square.png differ
diff --git a/public/images/emoji/google/white_medium_square.png b/public/images/emoji/google/white_medium_square.png
index 1a0bd021006..cfdbe99458e 100644
Binary files a/public/images/emoji/google/white_medium_square.png and b/public/images/emoji/google/white_medium_square.png differ
diff --git a/public/images/emoji/google/white_small_square.png b/public/images/emoji/google/white_small_square.png
index 3b2f5b6f419..57078785603 100644
Binary files a/public/images/emoji/google/white_small_square.png and b/public/images/emoji/google/white_small_square.png differ
diff --git a/public/images/emoji/google/white_square_button.png b/public/images/emoji/google/white_square_button.png
index 9daf142f81b..7e68a0c8ba5 100644
Binary files a/public/images/emoji/google/white_square_button.png and b/public/images/emoji/google/white_square_button.png differ
diff --git a/public/images/emoji/google/white_sun_behind_cloud.png b/public/images/emoji/google/white_sun_behind_cloud.png
index 43f98996984..e3a78dca903 100644
Binary files a/public/images/emoji/google/white_sun_behind_cloud.png and b/public/images/emoji/google/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_behind_cloud_with_rain.png b/public/images/emoji/google/white_sun_behind_cloud_with_rain.png
index 1ef8a371472..4fc26cb31b6 100644
Binary files a/public/images/emoji/google/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/google/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/google/white_sun_cloud.png b/public/images/emoji/google/white_sun_cloud.png
index 43f98996984..e3a78dca903 100644
Binary files a/public/images/emoji/google/white_sun_cloud.png and b/public/images/emoji/google/white_sun_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_rain_cloud.png b/public/images/emoji/google/white_sun_rain_cloud.png
index 1ef8a371472..4fc26cb31b6 100644
Binary files a/public/images/emoji/google/white_sun_rain_cloud.png and b/public/images/emoji/google/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_small_cloud.png b/public/images/emoji/google/white_sun_small_cloud.png
index 6a432e0db9d..ca30e8990bd 100644
Binary files a/public/images/emoji/google/white_sun_small_cloud.png and b/public/images/emoji/google/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/google/white_sun_with_small_cloud.png b/public/images/emoji/google/white_sun_with_small_cloud.png
index 6a432e0db9d..ca30e8990bd 100644
Binary files a/public/images/emoji/google/white_sun_with_small_cloud.png and b/public/images/emoji/google/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/google/wilted_flower.png b/public/images/emoji/google/wilted_flower.png
new file mode 100644
index 00000000000..58be454893f
Binary files /dev/null and b/public/images/emoji/google/wilted_flower.png differ
diff --git a/public/images/emoji/google/wind_blowing_face.png b/public/images/emoji/google/wind_blowing_face.png
index dc17bd19744..b7184aa468f 100644
Binary files a/public/images/emoji/google/wind_blowing_face.png and b/public/images/emoji/google/wind_blowing_face.png differ
diff --git a/public/images/emoji/google/wind_chime.png b/public/images/emoji/google/wind_chime.png
index 25ee602d2cd..ba76dbc1bfd 100644
Binary files a/public/images/emoji/google/wind_chime.png and b/public/images/emoji/google/wind_chime.png differ
diff --git a/public/images/emoji/google/wind_face.png b/public/images/emoji/google/wind_face.png
new file mode 100644
index 00000000000..b7184aa468f
Binary files /dev/null and b/public/images/emoji/google/wind_face.png differ
diff --git a/public/images/emoji/google/wine_glass.png b/public/images/emoji/google/wine_glass.png
index 86122bb31e7..dc515b30655 100644
Binary files a/public/images/emoji/google/wine_glass.png and b/public/images/emoji/google/wine_glass.png differ
diff --git a/public/images/emoji/google/wink.png b/public/images/emoji/google/wink.png
index 7d99dd23c1f..4a06288ae65 100644
Binary files a/public/images/emoji/google/wink.png and b/public/images/emoji/google/wink.png differ
diff --git a/public/images/emoji/google/wolf.png b/public/images/emoji/google/wolf.png
index dbd16da58b8..f6bfb3f47c2 100644
Binary files a/public/images/emoji/google/wolf.png and b/public/images/emoji/google/wolf.png differ
diff --git a/public/images/emoji/google/woman.png b/public/images/emoji/google/woman.png
index d7770ff9644..058ac922a70 100644
Binary files a/public/images/emoji/google/woman.png and b/public/images/emoji/google/woman.png differ
diff --git a/public/images/emoji/google/woman/2.png b/public/images/emoji/google/woman/2.png
new file mode 100644
index 00000000000..99a6a7c4287
Binary files /dev/null and b/public/images/emoji/google/woman/2.png differ
diff --git a/public/images/emoji/google/woman/3.png b/public/images/emoji/google/woman/3.png
new file mode 100644
index 00000000000..35beb7b0469
Binary files /dev/null and b/public/images/emoji/google/woman/3.png differ
diff --git a/public/images/emoji/google/woman/4.png b/public/images/emoji/google/woman/4.png
new file mode 100644
index 00000000000..2b783f6a8c7
Binary files /dev/null and b/public/images/emoji/google/woman/4.png differ
diff --git a/public/images/emoji/google/woman/5.png b/public/images/emoji/google/woman/5.png
new file mode 100644
index 00000000000..734c78d6467
Binary files /dev/null and b/public/images/emoji/google/woman/5.png differ
diff --git a/public/images/emoji/google/woman/6.png b/public/images/emoji/google/woman/6.png
new file mode 100644
index 00000000000..c0a3986e5ff
Binary files /dev/null and b/public/images/emoji/google/woman/6.png differ
diff --git a/public/images/emoji/google/woman_artist.png b/public/images/emoji/google/woman_artist.png
new file mode 100644
index 00000000000..8f158f24503
Binary files /dev/null and b/public/images/emoji/google/woman_artist.png differ
diff --git a/public/images/emoji/google/woman_artist/2.png b/public/images/emoji/google/woman_artist/2.png
new file mode 100644
index 00000000000..001ca83b260
Binary files /dev/null and b/public/images/emoji/google/woman_artist/2.png differ
diff --git a/public/images/emoji/google/woman_artist/3.png b/public/images/emoji/google/woman_artist/3.png
new file mode 100644
index 00000000000..5f41ea5f823
Binary files /dev/null and b/public/images/emoji/google/woman_artist/3.png differ
diff --git a/public/images/emoji/google/woman_artist/4.png b/public/images/emoji/google/woman_artist/4.png
new file mode 100644
index 00000000000..5b5e3fcd504
Binary files /dev/null and b/public/images/emoji/google/woman_artist/4.png differ
diff --git a/public/images/emoji/google/woman_artist/5.png b/public/images/emoji/google/woman_artist/5.png
new file mode 100644
index 00000000000..cefcb973326
Binary files /dev/null and b/public/images/emoji/google/woman_artist/5.png differ
diff --git a/public/images/emoji/google/woman_artist/6.png b/public/images/emoji/google/woman_artist/6.png
new file mode 100644
index 00000000000..93ae8562d58
Binary files /dev/null and b/public/images/emoji/google/woman_artist/6.png differ
diff --git a/public/images/emoji/google/woman_astronaut.png b/public/images/emoji/google/woman_astronaut.png
new file mode 100644
index 00000000000..5505538a5cf
Binary files /dev/null and b/public/images/emoji/google/woman_astronaut.png differ
diff --git a/public/images/emoji/google/woman_astronaut/2.png b/public/images/emoji/google/woman_astronaut/2.png
new file mode 100644
index 00000000000..aae23cda090
Binary files /dev/null and b/public/images/emoji/google/woman_astronaut/2.png differ
diff --git a/public/images/emoji/google/woman_astronaut/3.png b/public/images/emoji/google/woman_astronaut/3.png
new file mode 100644
index 00000000000..c109ee20f32
Binary files /dev/null and b/public/images/emoji/google/woman_astronaut/3.png differ
diff --git a/public/images/emoji/google/woman_astronaut/4.png b/public/images/emoji/google/woman_astronaut/4.png
new file mode 100644
index 00000000000..5bc3c000831
Binary files /dev/null and b/public/images/emoji/google/woman_astronaut/4.png differ
diff --git a/public/images/emoji/google/woman_astronaut/5.png b/public/images/emoji/google/woman_astronaut/5.png
new file mode 100644
index 00000000000..f431f727879
Binary files /dev/null and b/public/images/emoji/google/woman_astronaut/5.png differ
diff --git a/public/images/emoji/google/woman_astronaut/6.png b/public/images/emoji/google/woman_astronaut/6.png
new file mode 100644
index 00000000000..44168800937
Binary files /dev/null and b/public/images/emoji/google/woman_astronaut/6.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling.png b/public/images/emoji/google/woman_cartwheeling.png
new file mode 100644
index 00000000000..fda8a2d50b9
Binary files /dev/null and b/public/images/emoji/google/woman_cartwheeling.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/2.png b/public/images/emoji/google/woman_cartwheeling/2.png
new file mode 100644
index 00000000000..df68948dc86
Binary files /dev/null and b/public/images/emoji/google/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/3.png b/public/images/emoji/google/woman_cartwheeling/3.png
new file mode 100644
index 00000000000..67712e50056
Binary files /dev/null and b/public/images/emoji/google/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/4.png b/public/images/emoji/google/woman_cartwheeling/4.png
new file mode 100644
index 00000000000..6a56eb65396
Binary files /dev/null and b/public/images/emoji/google/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/5.png b/public/images/emoji/google/woman_cartwheeling/5.png
new file mode 100644
index 00000000000..ae2760e26ba
Binary files /dev/null and b/public/images/emoji/google/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/google/woman_cartwheeling/6.png b/public/images/emoji/google/woman_cartwheeling/6.png
new file mode 100644
index 00000000000..92171ba2086
Binary files /dev/null and b/public/images/emoji/google/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/google/woman_cook.png b/public/images/emoji/google/woman_cook.png
new file mode 100644
index 00000000000..293d1bf583f
Binary files /dev/null and b/public/images/emoji/google/woman_cook.png differ
diff --git a/public/images/emoji/google/woman_cook/2.png b/public/images/emoji/google/woman_cook/2.png
new file mode 100644
index 00000000000..c05237df598
Binary files /dev/null and b/public/images/emoji/google/woman_cook/2.png differ
diff --git a/public/images/emoji/google/woman_cook/3.png b/public/images/emoji/google/woman_cook/3.png
new file mode 100644
index 00000000000..63cdde05b88
Binary files /dev/null and b/public/images/emoji/google/woman_cook/3.png differ
diff --git a/public/images/emoji/google/woman_cook/4.png b/public/images/emoji/google/woman_cook/4.png
new file mode 100644
index 00000000000..e5546526e76
Binary files /dev/null and b/public/images/emoji/google/woman_cook/4.png differ
diff --git a/public/images/emoji/google/woman_cook/5.png b/public/images/emoji/google/woman_cook/5.png
new file mode 100644
index 00000000000..07a5ca711b6
Binary files /dev/null and b/public/images/emoji/google/woman_cook/5.png differ
diff --git a/public/images/emoji/google/woman_cook/6.png b/public/images/emoji/google/woman_cook/6.png
new file mode 100644
index 00000000000..b08c20bb85a
Binary files /dev/null and b/public/images/emoji/google/woman_cook/6.png differ
diff --git a/public/images/emoji/google/woman_facepalming.png b/public/images/emoji/google/woman_facepalming.png
new file mode 100644
index 00000000000..545a28a2ab8
Binary files /dev/null and b/public/images/emoji/google/woman_facepalming.png differ
diff --git a/public/images/emoji/google/woman_facepalming/2.png b/public/images/emoji/google/woman_facepalming/2.png
new file mode 100644
index 00000000000..b4c1b9189f4
Binary files /dev/null and b/public/images/emoji/google/woman_facepalming/2.png differ
diff --git a/public/images/emoji/google/woman_facepalming/3.png b/public/images/emoji/google/woman_facepalming/3.png
new file mode 100644
index 00000000000..34678c776b1
Binary files /dev/null and b/public/images/emoji/google/woman_facepalming/3.png differ
diff --git a/public/images/emoji/google/woman_facepalming/4.png b/public/images/emoji/google/woman_facepalming/4.png
new file mode 100644
index 00000000000..a951cc15b77
Binary files /dev/null and b/public/images/emoji/google/woman_facepalming/4.png differ
diff --git a/public/images/emoji/google/woman_facepalming/5.png b/public/images/emoji/google/woman_facepalming/5.png
new file mode 100644
index 00000000000..54e377054f9
Binary files /dev/null and b/public/images/emoji/google/woman_facepalming/5.png differ
diff --git a/public/images/emoji/google/woman_facepalming/6.png b/public/images/emoji/google/woman_facepalming/6.png
new file mode 100644
index 00000000000..5a432ab436f
Binary files /dev/null and b/public/images/emoji/google/woman_facepalming/6.png differ
diff --git a/public/images/emoji/google/woman_factory_worker.png b/public/images/emoji/google/woman_factory_worker.png
new file mode 100644
index 00000000000..ea445420a5c
Binary files /dev/null and b/public/images/emoji/google/woman_factory_worker.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/2.png b/public/images/emoji/google/woman_factory_worker/2.png
new file mode 100644
index 00000000000..a529dbdf458
Binary files /dev/null and b/public/images/emoji/google/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/3.png b/public/images/emoji/google/woman_factory_worker/3.png
new file mode 100644
index 00000000000..99fa60a9361
Binary files /dev/null and b/public/images/emoji/google/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/4.png b/public/images/emoji/google/woman_factory_worker/4.png
new file mode 100644
index 00000000000..f189a16315b
Binary files /dev/null and b/public/images/emoji/google/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/5.png b/public/images/emoji/google/woman_factory_worker/5.png
new file mode 100644
index 00000000000..1dcc1598475
Binary files /dev/null and b/public/images/emoji/google/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/google/woman_factory_worker/6.png b/public/images/emoji/google/woman_factory_worker/6.png
new file mode 100644
index 00000000000..fd6e058e78b
Binary files /dev/null and b/public/images/emoji/google/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/google/woman_farmer.png b/public/images/emoji/google/woman_farmer.png
new file mode 100644
index 00000000000..d894f4a079f
Binary files /dev/null and b/public/images/emoji/google/woman_farmer.png differ
diff --git a/public/images/emoji/google/woman_farmer/2.png b/public/images/emoji/google/woman_farmer/2.png
new file mode 100644
index 00000000000..2097b976bbf
Binary files /dev/null and b/public/images/emoji/google/woman_farmer/2.png differ
diff --git a/public/images/emoji/google/woman_farmer/3.png b/public/images/emoji/google/woman_farmer/3.png
new file mode 100644
index 00000000000..f442f76cb92
Binary files /dev/null and b/public/images/emoji/google/woman_farmer/3.png differ
diff --git a/public/images/emoji/google/woman_farmer/4.png b/public/images/emoji/google/woman_farmer/4.png
new file mode 100644
index 00000000000..0062e66b21f
Binary files /dev/null and b/public/images/emoji/google/woman_farmer/4.png differ
diff --git a/public/images/emoji/google/woman_farmer/5.png b/public/images/emoji/google/woman_farmer/5.png
new file mode 100644
index 00000000000..443fd921def
Binary files /dev/null and b/public/images/emoji/google/woman_farmer/5.png differ
diff --git a/public/images/emoji/google/woman_farmer/6.png b/public/images/emoji/google/woman_farmer/6.png
new file mode 100644
index 00000000000..09c1847f811
Binary files /dev/null and b/public/images/emoji/google/woman_farmer/6.png differ
diff --git a/public/images/emoji/google/woman_firefighter.png b/public/images/emoji/google/woman_firefighter.png
new file mode 100644
index 00000000000..fcd02ecb2dd
Binary files /dev/null and b/public/images/emoji/google/woman_firefighter.png differ
diff --git a/public/images/emoji/google/woman_firefighter/2.png b/public/images/emoji/google/woman_firefighter/2.png
new file mode 100644
index 00000000000..bd4c141f494
Binary files /dev/null and b/public/images/emoji/google/woman_firefighter/2.png differ
diff --git a/public/images/emoji/google/woman_firefighter/3.png b/public/images/emoji/google/woman_firefighter/3.png
new file mode 100644
index 00000000000..72fe9dd61d6
Binary files /dev/null and b/public/images/emoji/google/woman_firefighter/3.png differ
diff --git a/public/images/emoji/google/woman_firefighter/4.png b/public/images/emoji/google/woman_firefighter/4.png
new file mode 100644
index 00000000000..68e5aba4ce5
Binary files /dev/null and b/public/images/emoji/google/woman_firefighter/4.png differ
diff --git a/public/images/emoji/google/woman_firefighter/5.png b/public/images/emoji/google/woman_firefighter/5.png
new file mode 100644
index 00000000000..b98ba5dc9a4
Binary files /dev/null and b/public/images/emoji/google/woman_firefighter/5.png differ
diff --git a/public/images/emoji/google/woman_firefighter/6.png b/public/images/emoji/google/woman_firefighter/6.png
new file mode 100644
index 00000000000..e936ad67bee
Binary files /dev/null and b/public/images/emoji/google/woman_firefighter/6.png differ
diff --git a/public/images/emoji/google/woman_health_worker.png b/public/images/emoji/google/woman_health_worker.png
new file mode 100644
index 00000000000..455bd7b24b7
Binary files /dev/null and b/public/images/emoji/google/woman_health_worker.png differ
diff --git a/public/images/emoji/google/woman_health_worker/2.png b/public/images/emoji/google/woman_health_worker/2.png
new file mode 100644
index 00000000000..b668529d5d4
Binary files /dev/null and b/public/images/emoji/google/woman_health_worker/2.png differ
diff --git a/public/images/emoji/google/woman_health_worker/3.png b/public/images/emoji/google/woman_health_worker/3.png
new file mode 100644
index 00000000000..09b136615b2
Binary files /dev/null and b/public/images/emoji/google/woman_health_worker/3.png differ
diff --git a/public/images/emoji/google/woman_health_worker/4.png b/public/images/emoji/google/woman_health_worker/4.png
new file mode 100644
index 00000000000..fc8edda1fd3
Binary files /dev/null and b/public/images/emoji/google/woman_health_worker/4.png differ
diff --git a/public/images/emoji/google/woman_health_worker/5.png b/public/images/emoji/google/woman_health_worker/5.png
new file mode 100644
index 00000000000..a007e1d6c35
Binary files /dev/null and b/public/images/emoji/google/woman_health_worker/5.png differ
diff --git a/public/images/emoji/google/woman_health_worker/6.png b/public/images/emoji/google/woman_health_worker/6.png
new file mode 100644
index 00000000000..bda7018049b
Binary files /dev/null and b/public/images/emoji/google/woman_health_worker/6.png differ
diff --git a/public/images/emoji/google/woman_judge.png b/public/images/emoji/google/woman_judge.png
new file mode 100644
index 00000000000..ae2d4f1060b
Binary files /dev/null and b/public/images/emoji/google/woman_judge.png differ
diff --git a/public/images/emoji/google/woman_judge/2.png b/public/images/emoji/google/woman_judge/2.png
new file mode 100644
index 00000000000..198e959987f
Binary files /dev/null and b/public/images/emoji/google/woman_judge/2.png differ
diff --git a/public/images/emoji/google/woman_judge/3.png b/public/images/emoji/google/woman_judge/3.png
new file mode 100644
index 00000000000..65193777b87
Binary files /dev/null and b/public/images/emoji/google/woman_judge/3.png differ
diff --git a/public/images/emoji/google/woman_judge/4.png b/public/images/emoji/google/woman_judge/4.png
new file mode 100644
index 00000000000..27d70a95801
Binary files /dev/null and b/public/images/emoji/google/woman_judge/4.png differ
diff --git a/public/images/emoji/google/woman_judge/5.png b/public/images/emoji/google/woman_judge/5.png
new file mode 100644
index 00000000000..107b1df76ae
Binary files /dev/null and b/public/images/emoji/google/woman_judge/5.png differ
diff --git a/public/images/emoji/google/woman_judge/6.png b/public/images/emoji/google/woman_judge/6.png
new file mode 100644
index 00000000000..10aae699cab
Binary files /dev/null and b/public/images/emoji/google/woman_judge/6.png differ
diff --git a/public/images/emoji/google/woman_juggling.png b/public/images/emoji/google/woman_juggling.png
new file mode 100644
index 00000000000..189098d6164
Binary files /dev/null and b/public/images/emoji/google/woman_juggling.png differ
diff --git a/public/images/emoji/google/woman_juggling/2.png b/public/images/emoji/google/woman_juggling/2.png
new file mode 100644
index 00000000000..e999b0923cb
Binary files /dev/null and b/public/images/emoji/google/woman_juggling/2.png differ
diff --git a/public/images/emoji/google/woman_juggling/3.png b/public/images/emoji/google/woman_juggling/3.png
new file mode 100644
index 00000000000..6ff879f5e46
Binary files /dev/null and b/public/images/emoji/google/woman_juggling/3.png differ
diff --git a/public/images/emoji/google/woman_juggling/4.png b/public/images/emoji/google/woman_juggling/4.png
new file mode 100644
index 00000000000..2827bd824e4
Binary files /dev/null and b/public/images/emoji/google/woman_juggling/4.png differ
diff --git a/public/images/emoji/google/woman_juggling/5.png b/public/images/emoji/google/woman_juggling/5.png
new file mode 100644
index 00000000000..60e76455f9b
Binary files /dev/null and b/public/images/emoji/google/woman_juggling/5.png differ
diff --git a/public/images/emoji/google/woman_juggling/6.png b/public/images/emoji/google/woman_juggling/6.png
new file mode 100644
index 00000000000..caa0d3c91d6
Binary files /dev/null and b/public/images/emoji/google/woman_juggling/6.png differ
diff --git a/public/images/emoji/google/woman_mechanic.png b/public/images/emoji/google/woman_mechanic.png
new file mode 100644
index 00000000000..7eeb2ef6bc6
Binary files /dev/null and b/public/images/emoji/google/woman_mechanic.png differ
diff --git a/public/images/emoji/google/woman_mechanic/2.png b/public/images/emoji/google/woman_mechanic/2.png
new file mode 100644
index 00000000000..e1ef75546d0
Binary files /dev/null and b/public/images/emoji/google/woman_mechanic/2.png differ
diff --git a/public/images/emoji/google/woman_mechanic/3.png b/public/images/emoji/google/woman_mechanic/3.png
new file mode 100644
index 00000000000..c39f8a474f1
Binary files /dev/null and b/public/images/emoji/google/woman_mechanic/3.png differ
diff --git a/public/images/emoji/google/woman_mechanic/4.png b/public/images/emoji/google/woman_mechanic/4.png
new file mode 100644
index 00000000000..bac5d42b8d1
Binary files /dev/null and b/public/images/emoji/google/woman_mechanic/4.png differ
diff --git a/public/images/emoji/google/woman_mechanic/5.png b/public/images/emoji/google/woman_mechanic/5.png
new file mode 100644
index 00000000000..4fc2caffd8a
Binary files /dev/null and b/public/images/emoji/google/woman_mechanic/5.png differ
diff --git a/public/images/emoji/google/woman_mechanic/6.png b/public/images/emoji/google/woman_mechanic/6.png
new file mode 100644
index 00000000000..a5351ed74c1
Binary files /dev/null and b/public/images/emoji/google/woman_mechanic/6.png differ
diff --git a/public/images/emoji/google/woman_office_worker.png b/public/images/emoji/google/woman_office_worker.png
new file mode 100644
index 00000000000..ee71c20cecf
Binary files /dev/null and b/public/images/emoji/google/woman_office_worker.png differ
diff --git a/public/images/emoji/google/woman_office_worker/2.png b/public/images/emoji/google/woman_office_worker/2.png
new file mode 100644
index 00000000000..0ca85ae238c
Binary files /dev/null and b/public/images/emoji/google/woman_office_worker/2.png differ
diff --git a/public/images/emoji/google/woman_office_worker/3.png b/public/images/emoji/google/woman_office_worker/3.png
new file mode 100644
index 00000000000..db57388467e
Binary files /dev/null and b/public/images/emoji/google/woman_office_worker/3.png differ
diff --git a/public/images/emoji/google/woman_office_worker/4.png b/public/images/emoji/google/woman_office_worker/4.png
new file mode 100644
index 00000000000..19919209801
Binary files /dev/null and b/public/images/emoji/google/woman_office_worker/4.png differ
diff --git a/public/images/emoji/google/woman_office_worker/5.png b/public/images/emoji/google/woman_office_worker/5.png
new file mode 100644
index 00000000000..df9bce7b2f2
Binary files /dev/null and b/public/images/emoji/google/woman_office_worker/5.png differ
diff --git a/public/images/emoji/google/woman_office_worker/6.png b/public/images/emoji/google/woman_office_worker/6.png
new file mode 100644
index 00000000000..935bcfebc2d
Binary files /dev/null and b/public/images/emoji/google/woman_office_worker/6.png differ
diff --git a/public/images/emoji/google/woman_pilot.png b/public/images/emoji/google/woman_pilot.png
new file mode 100644
index 00000000000..20cc8707161
Binary files /dev/null and b/public/images/emoji/google/woman_pilot.png differ
diff --git a/public/images/emoji/google/woman_pilot/2.png b/public/images/emoji/google/woman_pilot/2.png
new file mode 100644
index 00000000000..378e61efe14
Binary files /dev/null and b/public/images/emoji/google/woman_pilot/2.png differ
diff --git a/public/images/emoji/google/woman_pilot/3.png b/public/images/emoji/google/woman_pilot/3.png
new file mode 100644
index 00000000000..e2484c4785f
Binary files /dev/null and b/public/images/emoji/google/woman_pilot/3.png differ
diff --git a/public/images/emoji/google/woman_pilot/4.png b/public/images/emoji/google/woman_pilot/4.png
new file mode 100644
index 00000000000..f59c81321fd
Binary files /dev/null and b/public/images/emoji/google/woman_pilot/4.png differ
diff --git a/public/images/emoji/google/woman_pilot/5.png b/public/images/emoji/google/woman_pilot/5.png
new file mode 100644
index 00000000000..7a3b523ab91
Binary files /dev/null and b/public/images/emoji/google/woman_pilot/5.png differ
diff --git a/public/images/emoji/google/woman_pilot/6.png b/public/images/emoji/google/woman_pilot/6.png
new file mode 100644
index 00000000000..d0e729e4775
Binary files /dev/null and b/public/images/emoji/google/woman_pilot/6.png differ
diff --git a/public/images/emoji/google/woman_playing_handball.png b/public/images/emoji/google/woman_playing_handball.png
new file mode 100644
index 00000000000..00c62370167
Binary files /dev/null and b/public/images/emoji/google/woman_playing_handball.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/2.png b/public/images/emoji/google/woman_playing_handball/2.png
new file mode 100644
index 00000000000..2396626d8e6
Binary files /dev/null and b/public/images/emoji/google/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/3.png b/public/images/emoji/google/woman_playing_handball/3.png
new file mode 100644
index 00000000000..b49ba0f3bb5
Binary files /dev/null and b/public/images/emoji/google/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/4.png b/public/images/emoji/google/woman_playing_handball/4.png
new file mode 100644
index 00000000000..70db301bf57
Binary files /dev/null and b/public/images/emoji/google/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/5.png b/public/images/emoji/google/woman_playing_handball/5.png
new file mode 100644
index 00000000000..bc5b60a12a3
Binary files /dev/null and b/public/images/emoji/google/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/google/woman_playing_handball/6.png b/public/images/emoji/google/woman_playing_handball/6.png
new file mode 100644
index 00000000000..5e7574d8604
Binary files /dev/null and b/public/images/emoji/google/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo.png b/public/images/emoji/google/woman_playing_water_polo.png
new file mode 100644
index 00000000000..fe24b5346da
Binary files /dev/null and b/public/images/emoji/google/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/2.png b/public/images/emoji/google/woman_playing_water_polo/2.png
new file mode 100644
index 00000000000..3f3798dd662
Binary files /dev/null and b/public/images/emoji/google/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/3.png b/public/images/emoji/google/woman_playing_water_polo/3.png
new file mode 100644
index 00000000000..e3db492fa53
Binary files /dev/null and b/public/images/emoji/google/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/4.png b/public/images/emoji/google/woman_playing_water_polo/4.png
new file mode 100644
index 00000000000..9a80e701a64
Binary files /dev/null and b/public/images/emoji/google/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/5.png b/public/images/emoji/google/woman_playing_water_polo/5.png
new file mode 100644
index 00000000000..8c706e9fde8
Binary files /dev/null and b/public/images/emoji/google/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/google/woman_playing_water_polo/6.png b/public/images/emoji/google/woman_playing_water_polo/6.png
new file mode 100644
index 00000000000..e4f4e19089d
Binary files /dev/null and b/public/images/emoji/google/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/google/woman_scientist.png b/public/images/emoji/google/woman_scientist.png
new file mode 100644
index 00000000000..7d873ea4c40
Binary files /dev/null and b/public/images/emoji/google/woman_scientist.png differ
diff --git a/public/images/emoji/google/woman_scientist/2.png b/public/images/emoji/google/woman_scientist/2.png
new file mode 100644
index 00000000000..c439bdb25fa
Binary files /dev/null and b/public/images/emoji/google/woman_scientist/2.png differ
diff --git a/public/images/emoji/google/woman_scientist/3.png b/public/images/emoji/google/woman_scientist/3.png
new file mode 100644
index 00000000000..724f5e11bf8
Binary files /dev/null and b/public/images/emoji/google/woman_scientist/3.png differ
diff --git a/public/images/emoji/google/woman_scientist/4.png b/public/images/emoji/google/woman_scientist/4.png
new file mode 100644
index 00000000000..b11657a04a2
Binary files /dev/null and b/public/images/emoji/google/woman_scientist/4.png differ
diff --git a/public/images/emoji/google/woman_scientist/5.png b/public/images/emoji/google/woman_scientist/5.png
new file mode 100644
index 00000000000..6233cf55f3e
Binary files /dev/null and b/public/images/emoji/google/woman_scientist/5.png differ
diff --git a/public/images/emoji/google/woman_scientist/6.png b/public/images/emoji/google/woman_scientist/6.png
new file mode 100644
index 00000000000..c5010fee976
Binary files /dev/null and b/public/images/emoji/google/woman_scientist/6.png differ
diff --git a/public/images/emoji/google/woman_shrugging.png b/public/images/emoji/google/woman_shrugging.png
new file mode 100644
index 00000000000..9a455a54570
Binary files /dev/null and b/public/images/emoji/google/woman_shrugging.png differ
diff --git a/public/images/emoji/google/woman_shrugging/2.png b/public/images/emoji/google/woman_shrugging/2.png
new file mode 100644
index 00000000000..0b85abb35a5
Binary files /dev/null and b/public/images/emoji/google/woman_shrugging/2.png differ
diff --git a/public/images/emoji/google/woman_shrugging/3.png b/public/images/emoji/google/woman_shrugging/3.png
new file mode 100644
index 00000000000..e8bfa2f22d2
Binary files /dev/null and b/public/images/emoji/google/woman_shrugging/3.png differ
diff --git a/public/images/emoji/google/woman_shrugging/4.png b/public/images/emoji/google/woman_shrugging/4.png
new file mode 100644
index 00000000000..f74a732db01
Binary files /dev/null and b/public/images/emoji/google/woman_shrugging/4.png differ
diff --git a/public/images/emoji/google/woman_shrugging/5.png b/public/images/emoji/google/woman_shrugging/5.png
new file mode 100644
index 00000000000..00a173acd5a
Binary files /dev/null and b/public/images/emoji/google/woman_shrugging/5.png differ
diff --git a/public/images/emoji/google/woman_shrugging/6.png b/public/images/emoji/google/woman_shrugging/6.png
new file mode 100644
index 00000000000..4a03c01d43f
Binary files /dev/null and b/public/images/emoji/google/woman_shrugging/6.png differ
diff --git a/public/images/emoji/google/woman_singer.png b/public/images/emoji/google/woman_singer.png
new file mode 100644
index 00000000000..2b3f46e2ea1
Binary files /dev/null and b/public/images/emoji/google/woman_singer.png differ
diff --git a/public/images/emoji/google/woman_singer/2.png b/public/images/emoji/google/woman_singer/2.png
new file mode 100644
index 00000000000..dff5bef3ed3
Binary files /dev/null and b/public/images/emoji/google/woman_singer/2.png differ
diff --git a/public/images/emoji/google/woman_singer/3.png b/public/images/emoji/google/woman_singer/3.png
new file mode 100644
index 00000000000..d71d68d9529
Binary files /dev/null and b/public/images/emoji/google/woman_singer/3.png differ
diff --git a/public/images/emoji/google/woman_singer/4.png b/public/images/emoji/google/woman_singer/4.png
new file mode 100644
index 00000000000..7b411c99d03
Binary files /dev/null and b/public/images/emoji/google/woman_singer/4.png differ
diff --git a/public/images/emoji/google/woman_singer/5.png b/public/images/emoji/google/woman_singer/5.png
new file mode 100644
index 00000000000..46cac26e5b0
Binary files /dev/null and b/public/images/emoji/google/woman_singer/5.png differ
diff --git a/public/images/emoji/google/woman_singer/6.png b/public/images/emoji/google/woman_singer/6.png
new file mode 100644
index 00000000000..b4459b9db40
Binary files /dev/null and b/public/images/emoji/google/woman_singer/6.png differ
diff --git a/public/images/emoji/google/woman_student.png b/public/images/emoji/google/woman_student.png
new file mode 100644
index 00000000000..c6f2c7c8e62
Binary files /dev/null and b/public/images/emoji/google/woman_student.png differ
diff --git a/public/images/emoji/google/woman_student/2.png b/public/images/emoji/google/woman_student/2.png
new file mode 100644
index 00000000000..01db6368f62
Binary files /dev/null and b/public/images/emoji/google/woman_student/2.png differ
diff --git a/public/images/emoji/google/woman_student/3.png b/public/images/emoji/google/woman_student/3.png
new file mode 100644
index 00000000000..9a6770954ff
Binary files /dev/null and b/public/images/emoji/google/woman_student/3.png differ
diff --git a/public/images/emoji/google/woman_student/4.png b/public/images/emoji/google/woman_student/4.png
new file mode 100644
index 00000000000..61ab96dcbe1
Binary files /dev/null and b/public/images/emoji/google/woman_student/4.png differ
diff --git a/public/images/emoji/google/woman_student/5.png b/public/images/emoji/google/woman_student/5.png
new file mode 100644
index 00000000000..8f227c084ff
Binary files /dev/null and b/public/images/emoji/google/woman_student/5.png differ
diff --git a/public/images/emoji/google/woman_student/6.png b/public/images/emoji/google/woman_student/6.png
new file mode 100644
index 00000000000..398e1cf36f4
Binary files /dev/null and b/public/images/emoji/google/woman_student/6.png differ
diff --git a/public/images/emoji/google/woman_teacher.png b/public/images/emoji/google/woman_teacher.png
new file mode 100644
index 00000000000..243e1125d99
Binary files /dev/null and b/public/images/emoji/google/woman_teacher.png differ
diff --git a/public/images/emoji/google/woman_teacher/2.png b/public/images/emoji/google/woman_teacher/2.png
new file mode 100644
index 00000000000..f7ebad6af96
Binary files /dev/null and b/public/images/emoji/google/woman_teacher/2.png differ
diff --git a/public/images/emoji/google/woman_teacher/3.png b/public/images/emoji/google/woman_teacher/3.png
new file mode 100644
index 00000000000..b64d09473cf
Binary files /dev/null and b/public/images/emoji/google/woman_teacher/3.png differ
diff --git a/public/images/emoji/google/woman_teacher/4.png b/public/images/emoji/google/woman_teacher/4.png
new file mode 100644
index 00000000000..5e214716fd1
Binary files /dev/null and b/public/images/emoji/google/woman_teacher/4.png differ
diff --git a/public/images/emoji/google/woman_teacher/5.png b/public/images/emoji/google/woman_teacher/5.png
new file mode 100644
index 00000000000..c3934da4858
Binary files /dev/null and b/public/images/emoji/google/woman_teacher/5.png differ
diff --git a/public/images/emoji/google/woman_teacher/6.png b/public/images/emoji/google/woman_teacher/6.png
new file mode 100644
index 00000000000..14333f1df3f
Binary files /dev/null and b/public/images/emoji/google/woman_teacher/6.png differ
diff --git a/public/images/emoji/google/woman_technologist.png b/public/images/emoji/google/woman_technologist.png
new file mode 100644
index 00000000000..68344dd63fc
Binary files /dev/null and b/public/images/emoji/google/woman_technologist.png differ
diff --git a/public/images/emoji/google/woman_technologist/2.png b/public/images/emoji/google/woman_technologist/2.png
new file mode 100644
index 00000000000..516715d48f4
Binary files /dev/null and b/public/images/emoji/google/woman_technologist/2.png differ
diff --git a/public/images/emoji/google/woman_technologist/3.png b/public/images/emoji/google/woman_technologist/3.png
new file mode 100644
index 00000000000..707fbcd9531
Binary files /dev/null and b/public/images/emoji/google/woman_technologist/3.png differ
diff --git a/public/images/emoji/google/woman_technologist/4.png b/public/images/emoji/google/woman_technologist/4.png
new file mode 100644
index 00000000000..5551b445ab3
Binary files /dev/null and b/public/images/emoji/google/woman_technologist/4.png differ
diff --git a/public/images/emoji/google/woman_technologist/5.png b/public/images/emoji/google/woman_technologist/5.png
new file mode 100644
index 00000000000..d6d2929d8d8
Binary files /dev/null and b/public/images/emoji/google/woman_technologist/5.png differ
diff --git a/public/images/emoji/google/woman_technologist/6.png b/public/images/emoji/google/woman_technologist/6.png
new file mode 100644
index 00000000000..f039e596c00
Binary files /dev/null and b/public/images/emoji/google/woman_technologist/6.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf.png b/public/images/emoji/google/woman_with_headscarf.png
new file mode 100644
index 00000000000..8768a6131f0
Binary files /dev/null and b/public/images/emoji/google/woman_with_headscarf.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/2.png b/public/images/emoji/google/woman_with_headscarf/2.png
new file mode 100644
index 00000000000..f4d75cbb46e
Binary files /dev/null and b/public/images/emoji/google/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/3.png b/public/images/emoji/google/woman_with_headscarf/3.png
new file mode 100644
index 00000000000..c6e1efa92c7
Binary files /dev/null and b/public/images/emoji/google/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/4.png b/public/images/emoji/google/woman_with_headscarf/4.png
new file mode 100644
index 00000000000..eb6826e4f16
Binary files /dev/null and b/public/images/emoji/google/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/5.png b/public/images/emoji/google/woman_with_headscarf/5.png
new file mode 100644
index 00000000000..a3f1e85d5b9
Binary files /dev/null and b/public/images/emoji/google/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/google/woman_with_headscarf/6.png b/public/images/emoji/google/woman_with_headscarf/6.png
new file mode 100644
index 00000000000..99d1f26240e
Binary files /dev/null and b/public/images/emoji/google/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/google/woman_with_turban.png b/public/images/emoji/google/woman_with_turban.png
new file mode 100644
index 00000000000..45e6b5af7a9
Binary files /dev/null and b/public/images/emoji/google/woman_with_turban.png differ
diff --git a/public/images/emoji/google/woman_with_turban/2.png b/public/images/emoji/google/woman_with_turban/2.png
new file mode 100644
index 00000000000..083ddb6b4c3
Binary files /dev/null and b/public/images/emoji/google/woman_with_turban/2.png differ
diff --git a/public/images/emoji/google/woman_with_turban/3.png b/public/images/emoji/google/woman_with_turban/3.png
new file mode 100644
index 00000000000..dc7c168a024
Binary files /dev/null and b/public/images/emoji/google/woman_with_turban/3.png differ
diff --git a/public/images/emoji/google/woman_with_turban/4.png b/public/images/emoji/google/woman_with_turban/4.png
new file mode 100644
index 00000000000..b17ff8bbc54
Binary files /dev/null and b/public/images/emoji/google/woman_with_turban/4.png differ
diff --git a/public/images/emoji/google/woman_with_turban/5.png b/public/images/emoji/google/woman_with_turban/5.png
new file mode 100644
index 00000000000..ff542288658
Binary files /dev/null and b/public/images/emoji/google/woman_with_turban/5.png differ
diff --git a/public/images/emoji/google/woman_with_turban/6.png b/public/images/emoji/google/woman_with_turban/6.png
new file mode 100644
index 00000000000..5739b78d287
Binary files /dev/null and b/public/images/emoji/google/woman_with_turban/6.png differ
diff --git a/public/images/emoji/google/womans_clothes.png b/public/images/emoji/google/womans_clothes.png
index 23f3f022bac..5585c0d59ce 100644
Binary files a/public/images/emoji/google/womans_clothes.png and b/public/images/emoji/google/womans_clothes.png differ
diff --git a/public/images/emoji/google/womans_hat.png b/public/images/emoji/google/womans_hat.png
index bb6e9b9a58f..0785e654922 100644
Binary files a/public/images/emoji/google/womans_hat.png and b/public/images/emoji/google/womans_hat.png differ
diff --git a/public/images/emoji/google/women_wrestling.png b/public/images/emoji/google/women_wrestling.png
new file mode 100644
index 00000000000..757fa6cf862
Binary files /dev/null and b/public/images/emoji/google/women_wrestling.png differ
diff --git a/public/images/emoji/google/womens.png b/public/images/emoji/google/womens.png
index 9c8b38392b2..cb8ddb829b5 100644
Binary files a/public/images/emoji/google/womens.png and b/public/images/emoji/google/womens.png differ
diff --git a/public/images/emoji/google/world_map.png b/public/images/emoji/google/world_map.png
index fc4cfafe8a4..dccb5d0512b 100644
Binary files a/public/images/emoji/google/world_map.png and b/public/images/emoji/google/world_map.png differ
diff --git a/public/images/emoji/google/worried.png b/public/images/emoji/google/worried.png
index 6a30663f232..d45ecb4af43 100644
Binary files a/public/images/emoji/google/worried.png and b/public/images/emoji/google/worried.png differ
diff --git a/public/images/emoji/google/worship_symbol.png b/public/images/emoji/google/worship_symbol.png
index 7783233e9f9..0cc3774779c 100644
Binary files a/public/images/emoji/google/worship_symbol.png and b/public/images/emoji/google/worship_symbol.png differ
diff --git a/public/images/emoji/google/wrench.png b/public/images/emoji/google/wrench.png
index ffd85982eab..7babf38ac64 100644
Binary files a/public/images/emoji/google/wrench.png and b/public/images/emoji/google/wrench.png differ
diff --git a/public/images/emoji/google/writing_hand.png b/public/images/emoji/google/writing_hand.png
index 608570fd5b7..02c6ba744ff 100644
Binary files a/public/images/emoji/google/writing_hand.png and b/public/images/emoji/google/writing_hand.png differ
diff --git a/public/images/emoji/google/writing_hand/2.png b/public/images/emoji/google/writing_hand/2.png
new file mode 100644
index 00000000000..247f8dafc4c
Binary files /dev/null and b/public/images/emoji/google/writing_hand/2.png differ
diff --git a/public/images/emoji/google/writing_hand/3.png b/public/images/emoji/google/writing_hand/3.png
new file mode 100644
index 00000000000..be2d6888fde
Binary files /dev/null and b/public/images/emoji/google/writing_hand/3.png differ
diff --git a/public/images/emoji/google/writing_hand/4.png b/public/images/emoji/google/writing_hand/4.png
new file mode 100644
index 00000000000..e1158445cf4
Binary files /dev/null and b/public/images/emoji/google/writing_hand/4.png differ
diff --git a/public/images/emoji/google/writing_hand/5.png b/public/images/emoji/google/writing_hand/5.png
new file mode 100644
index 00000000000..c7aa68796d6
Binary files /dev/null and b/public/images/emoji/google/writing_hand/5.png differ
diff --git a/public/images/emoji/google/writing_hand/6.png b/public/images/emoji/google/writing_hand/6.png
new file mode 100644
index 00000000000..beecc36dd1f
Binary files /dev/null and b/public/images/emoji/google/writing_hand/6.png differ
diff --git a/public/images/emoji/google/x.png b/public/images/emoji/google/x.png
index b950ece572f..56233b4e593 100644
Binary files a/public/images/emoji/google/x.png and b/public/images/emoji/google/x.png differ
diff --git a/public/images/emoji/google/yellow_heart.png b/public/images/emoji/google/yellow_heart.png
index 86d15a015b8..5849f2d9b41 100644
Binary files a/public/images/emoji/google/yellow_heart.png and b/public/images/emoji/google/yellow_heart.png differ
diff --git a/public/images/emoji/google/yemen.png b/public/images/emoji/google/yemen.png
new file mode 100644
index 00000000000..494e2072dfe
Binary files /dev/null and b/public/images/emoji/google/yemen.png differ
diff --git a/public/images/emoji/google/yen.png b/public/images/emoji/google/yen.png
index b76abb89c61..a6c8a80c7ed 100644
Binary files a/public/images/emoji/google/yen.png and b/public/images/emoji/google/yen.png differ
diff --git a/public/images/emoji/google/yin_yang.png b/public/images/emoji/google/yin_yang.png
index 143c24116e3..629675cfe9c 100644
Binary files a/public/images/emoji/google/yin_yang.png and b/public/images/emoji/google/yin_yang.png differ
diff --git a/public/images/emoji/google/yum.png b/public/images/emoji/google/yum.png
index 9ca8fab0131..c454d73b4c0 100644
Binary files a/public/images/emoji/google/yum.png and b/public/images/emoji/google/yum.png differ
diff --git a/public/images/emoji/google/zambia.png b/public/images/emoji/google/zambia.png
new file mode 100644
index 00000000000..4ca566d8d41
Binary files /dev/null and b/public/images/emoji/google/zambia.png differ
diff --git a/public/images/emoji/google/zap.png b/public/images/emoji/google/zap.png
index 5fbb7ca0035..a457b5fc1cf 100644
Binary files a/public/images/emoji/google/zap.png and b/public/images/emoji/google/zap.png differ
diff --git a/public/images/emoji/google/zebra.png b/public/images/emoji/google/zebra.png
new file mode 100644
index 00000000000..c98ffa79f0e
Binary files /dev/null and b/public/images/emoji/google/zebra.png differ
diff --git a/public/images/emoji/google/zero.png b/public/images/emoji/google/zero.png
index ce02394db08..28b42505406 100644
Binary files a/public/images/emoji/google/zero.png and b/public/images/emoji/google/zero.png differ
diff --git a/public/images/emoji/google/zimbabwe.png b/public/images/emoji/google/zimbabwe.png
new file mode 100644
index 00000000000..6d337f40e2d
Binary files /dev/null and b/public/images/emoji/google/zimbabwe.png differ
diff --git a/public/images/emoji/google/zipper_mouth.png b/public/images/emoji/google/zipper_mouth.png
index 6a9ed782fae..1fb69244fea 100644
Binary files a/public/images/emoji/google/zipper_mouth.png and b/public/images/emoji/google/zipper_mouth.png differ
diff --git a/public/images/emoji/google/zipper_mouth_face.png b/public/images/emoji/google/zipper_mouth_face.png
index 6a9ed782fae..1fb69244fea 100644
Binary files a/public/images/emoji/google/zipper_mouth_face.png and b/public/images/emoji/google/zipper_mouth_face.png differ
diff --git a/public/images/emoji/google/zombie.png b/public/images/emoji/google/zombie.png
new file mode 100644
index 00000000000..6d152046609
Binary files /dev/null and b/public/images/emoji/google/zombie.png differ
diff --git a/public/images/emoji/google/zzz.png b/public/images/emoji/google/zzz.png
index 1e6a2b5a161..35f09724ee1 100644
Binary files a/public/images/emoji/google/zzz.png and b/public/images/emoji/google/zzz.png differ
diff --git a/public/images/emoji/google_classic/+1.png b/public/images/emoji/google_classic/+1.png
new file mode 100644
index 00000000000..bf0f4e543ad
Binary files /dev/null and b/public/images/emoji/google_classic/+1.png differ
diff --git a/public/images/emoji/google_classic/+1/2.png b/public/images/emoji/google_classic/+1/2.png
new file mode 100644
index 00000000000..19b31d1cebc
Binary files /dev/null and b/public/images/emoji/google_classic/+1/2.png differ
diff --git a/public/images/emoji/google_classic/+1/3.png b/public/images/emoji/google_classic/+1/3.png
new file mode 100644
index 00000000000..9d4dffd10f6
Binary files /dev/null and b/public/images/emoji/google_classic/+1/3.png differ
diff --git a/public/images/emoji/google_classic/+1/4.png b/public/images/emoji/google_classic/+1/4.png
new file mode 100644
index 00000000000..92ab6353c19
Binary files /dev/null and b/public/images/emoji/google_classic/+1/4.png differ
diff --git a/public/images/emoji/google_classic/+1/5.png b/public/images/emoji/google_classic/+1/5.png
new file mode 100644
index 00000000000..888e5578ec4
Binary files /dev/null and b/public/images/emoji/google_classic/+1/5.png differ
diff --git a/public/images/emoji/google_classic/+1/6.png b/public/images/emoji/google_classic/+1/6.png
new file mode 100644
index 00000000000..f4912e85b2d
Binary files /dev/null and b/public/images/emoji/google_classic/+1/6.png differ
diff --git a/public/images/emoji/google_classic/-1.png b/public/images/emoji/google_classic/-1.png
new file mode 100644
index 00000000000..8203a027e11
Binary files /dev/null and b/public/images/emoji/google_classic/-1.png differ
diff --git a/public/images/emoji/google_classic/-1/2.png b/public/images/emoji/google_classic/-1/2.png
new file mode 100644
index 00000000000..d4c3fa91cc0
Binary files /dev/null and b/public/images/emoji/google_classic/-1/2.png differ
diff --git a/public/images/emoji/google_classic/-1/3.png b/public/images/emoji/google_classic/-1/3.png
new file mode 100644
index 00000000000..db75861b6ce
Binary files /dev/null and b/public/images/emoji/google_classic/-1/3.png differ
diff --git a/public/images/emoji/google_classic/-1/4.png b/public/images/emoji/google_classic/-1/4.png
new file mode 100644
index 00000000000..758c7116736
Binary files /dev/null and b/public/images/emoji/google_classic/-1/4.png differ
diff --git a/public/images/emoji/google_classic/-1/5.png b/public/images/emoji/google_classic/-1/5.png
new file mode 100644
index 00000000000..ed22fa28152
Binary files /dev/null and b/public/images/emoji/google_classic/-1/5.png differ
diff --git a/public/images/emoji/google_classic/-1/6.png b/public/images/emoji/google_classic/-1/6.png
new file mode 100644
index 00000000000..030635f69ce
Binary files /dev/null and b/public/images/emoji/google_classic/-1/6.png differ
diff --git a/public/images/emoji/google_classic/100.png b/public/images/emoji/google_classic/100.png
new file mode 100644
index 00000000000..de69e2b80c3
Binary files /dev/null and b/public/images/emoji/google_classic/100.png differ
diff --git a/public/images/emoji/google_classic/1234.png b/public/images/emoji/google_classic/1234.png
new file mode 100644
index 00000000000..064bcf41059
Binary files /dev/null and b/public/images/emoji/google_classic/1234.png differ
diff --git a/public/images/emoji/google_classic/1st_place_medal.png b/public/images/emoji/google_classic/1st_place_medal.png
new file mode 100644
index 00000000000..a2a9b152237
Binary files /dev/null and b/public/images/emoji/google_classic/1st_place_medal.png differ
diff --git a/public/images/emoji/google_classic/2nd_place_medal.png b/public/images/emoji/google_classic/2nd_place_medal.png
new file mode 100644
index 00000000000..bc5fb2720ad
Binary files /dev/null and b/public/images/emoji/google_classic/2nd_place_medal.png differ
diff --git a/public/images/emoji/google_classic/3rd_place_medal.png b/public/images/emoji/google_classic/3rd_place_medal.png
new file mode 100644
index 00000000000..b8669f9f67b
Binary files /dev/null and b/public/images/emoji/google_classic/3rd_place_medal.png differ
diff --git a/public/images/emoji/google_classic/8ball.png b/public/images/emoji/google_classic/8ball.png
new file mode 100644
index 00000000000..97afde3fcf6
Binary files /dev/null and b/public/images/emoji/google_classic/8ball.png differ
diff --git a/public/images/emoji/google_classic/a.png b/public/images/emoji/google_classic/a.png
new file mode 100644
index 00000000000..5e887d2b010
Binary files /dev/null and b/public/images/emoji/google_classic/a.png differ
diff --git a/public/images/emoji/google_classic/ab.png b/public/images/emoji/google_classic/ab.png
new file mode 100644
index 00000000000..fe85e51fd3f
Binary files /dev/null and b/public/images/emoji/google_classic/ab.png differ
diff --git a/public/images/emoji/google_classic/abc.png b/public/images/emoji/google_classic/abc.png
new file mode 100644
index 00000000000..8136d794aa8
Binary files /dev/null and b/public/images/emoji/google_classic/abc.png differ
diff --git a/public/images/emoji/google_classic/abcd.png b/public/images/emoji/google_classic/abcd.png
new file mode 100644
index 00000000000..f28edf29c6a
Binary files /dev/null and b/public/images/emoji/google_classic/abcd.png differ
diff --git a/public/images/emoji/google_classic/accept.png b/public/images/emoji/google_classic/accept.png
new file mode 100644
index 00000000000..32b0ff03830
Binary files /dev/null and b/public/images/emoji/google_classic/accept.png differ
diff --git a/public/images/emoji/google_classic/admission_tickets.png b/public/images/emoji/google_classic/admission_tickets.png
new file mode 100644
index 00000000000..959ba48a2d2
Binary files /dev/null and b/public/images/emoji/google_classic/admission_tickets.png differ
diff --git a/public/images/emoji/google_classic/adult.png b/public/images/emoji/google_classic/adult.png
new file mode 100644
index 00000000000..53a5eb2ccb9
Binary files /dev/null and b/public/images/emoji/google_classic/adult.png differ
diff --git a/public/images/emoji/google_classic/adult/2.png b/public/images/emoji/google_classic/adult/2.png
new file mode 100644
index 00000000000..8f30fc9e389
Binary files /dev/null and b/public/images/emoji/google_classic/adult/2.png differ
diff --git a/public/images/emoji/google_classic/adult/3.png b/public/images/emoji/google_classic/adult/3.png
new file mode 100644
index 00000000000..36a4e57d1f8
Binary files /dev/null and b/public/images/emoji/google_classic/adult/3.png differ
diff --git a/public/images/emoji/google_classic/adult/4.png b/public/images/emoji/google_classic/adult/4.png
new file mode 100644
index 00000000000..77c57605e93
Binary files /dev/null and b/public/images/emoji/google_classic/adult/4.png differ
diff --git a/public/images/emoji/google_classic/adult/5.png b/public/images/emoji/google_classic/adult/5.png
new file mode 100644
index 00000000000..58bcd6a2fcf
Binary files /dev/null and b/public/images/emoji/google_classic/adult/5.png differ
diff --git a/public/images/emoji/google_classic/adult/6.png b/public/images/emoji/google_classic/adult/6.png
new file mode 100644
index 00000000000..3bc6b5a57a3
Binary files /dev/null and b/public/images/emoji/google_classic/adult/6.png differ
diff --git a/public/images/emoji/google_classic/aerial_tramway.png b/public/images/emoji/google_classic/aerial_tramway.png
new file mode 100644
index 00000000000..8ebcc10e09a
Binary files /dev/null and b/public/images/emoji/google_classic/aerial_tramway.png differ
diff --git a/public/images/emoji/google_classic/afghanistan.png b/public/images/emoji/google_classic/afghanistan.png
new file mode 100644
index 00000000000..677bcce11e9
Binary files /dev/null and b/public/images/emoji/google_classic/afghanistan.png differ
diff --git a/public/images/emoji/google_classic/airplane.png b/public/images/emoji/google_classic/airplane.png
new file mode 100644
index 00000000000..46a71b71b7b
Binary files /dev/null and b/public/images/emoji/google_classic/airplane.png differ
diff --git a/public/images/emoji/google_classic/airplane_arriving.png b/public/images/emoji/google_classic/airplane_arriving.png
new file mode 100644
index 00000000000..8e3428aefe2
Binary files /dev/null and b/public/images/emoji/google_classic/airplane_arriving.png differ
diff --git a/public/images/emoji/google_classic/airplane_departure.png b/public/images/emoji/google_classic/airplane_departure.png
new file mode 100644
index 00000000000..d6782594146
Binary files /dev/null and b/public/images/emoji/google_classic/airplane_departure.png differ
diff --git a/public/images/emoji/google_classic/airplane_small.png b/public/images/emoji/google_classic/airplane_small.png
new file mode 100644
index 00000000000..4bd5d32edc1
Binary files /dev/null and b/public/images/emoji/google_classic/airplane_small.png differ
diff --git a/public/images/emoji/google_classic/aland_islands.png b/public/images/emoji/google_classic/aland_islands.png
new file mode 100644
index 00000000000..c25bdc21e23
Binary files /dev/null and b/public/images/emoji/google_classic/aland_islands.png differ
diff --git a/public/images/emoji/google_classic/alarm_clock.png b/public/images/emoji/google_classic/alarm_clock.png
new file mode 100644
index 00000000000..f3824527d69
Binary files /dev/null and b/public/images/emoji/google_classic/alarm_clock.png differ
diff --git a/public/images/emoji/google_classic/albania.png b/public/images/emoji/google_classic/albania.png
new file mode 100644
index 00000000000..c4908e823fd
Binary files /dev/null and b/public/images/emoji/google_classic/albania.png differ
diff --git a/public/images/emoji/google_classic/alembic.png b/public/images/emoji/google_classic/alembic.png
new file mode 100644
index 00000000000..5f3b4ccbc45
Binary files /dev/null and b/public/images/emoji/google_classic/alembic.png differ
diff --git a/public/images/emoji/google_classic/algeria.png b/public/images/emoji/google_classic/algeria.png
new file mode 100644
index 00000000000..44dea7746b6
Binary files /dev/null and b/public/images/emoji/google_classic/algeria.png differ
diff --git a/public/images/emoji/google_classic/alien.png b/public/images/emoji/google_classic/alien.png
new file mode 100644
index 00000000000..372f90bd825
Binary files /dev/null and b/public/images/emoji/google_classic/alien.png differ
diff --git a/public/images/emoji/google_classic/ambulance.png b/public/images/emoji/google_classic/ambulance.png
new file mode 100644
index 00000000000..172c3db9f33
Binary files /dev/null and b/public/images/emoji/google_classic/ambulance.png differ
diff --git a/public/images/emoji/google_classic/american_samoa.png b/public/images/emoji/google_classic/american_samoa.png
new file mode 100644
index 00000000000..f2fdee48e1f
Binary files /dev/null and b/public/images/emoji/google_classic/american_samoa.png differ
diff --git a/public/images/emoji/google_classic/amphora.png b/public/images/emoji/google_classic/amphora.png
new file mode 100644
index 00000000000..2691b9b9d94
Binary files /dev/null and b/public/images/emoji/google_classic/amphora.png differ
diff --git a/public/images/emoji/google_classic/anchor.png b/public/images/emoji/google_classic/anchor.png
new file mode 100644
index 00000000000..d667de555f2
Binary files /dev/null and b/public/images/emoji/google_classic/anchor.png differ
diff --git a/public/images/emoji/google_classic/andorra.png b/public/images/emoji/google_classic/andorra.png
new file mode 100644
index 00000000000..5547cb9dc1f
Binary files /dev/null and b/public/images/emoji/google_classic/andorra.png differ
diff --git a/public/images/emoji/google_classic/angel.png b/public/images/emoji/google_classic/angel.png
new file mode 100644
index 00000000000..8104a636e23
Binary files /dev/null and b/public/images/emoji/google_classic/angel.png differ
diff --git a/public/images/emoji/google_classic/angel/2.png b/public/images/emoji/google_classic/angel/2.png
new file mode 100644
index 00000000000..012d6f71163
Binary files /dev/null and b/public/images/emoji/google_classic/angel/2.png differ
diff --git a/public/images/emoji/google_classic/angel/3.png b/public/images/emoji/google_classic/angel/3.png
new file mode 100644
index 00000000000..48a9289fc70
Binary files /dev/null and b/public/images/emoji/google_classic/angel/3.png differ
diff --git a/public/images/emoji/google_classic/angel/4.png b/public/images/emoji/google_classic/angel/4.png
new file mode 100644
index 00000000000..c200b1cff3f
Binary files /dev/null and b/public/images/emoji/google_classic/angel/4.png differ
diff --git a/public/images/emoji/google_classic/angel/5.png b/public/images/emoji/google_classic/angel/5.png
new file mode 100644
index 00000000000..6859897401d
Binary files /dev/null and b/public/images/emoji/google_classic/angel/5.png differ
diff --git a/public/images/emoji/google_classic/angel/6.png b/public/images/emoji/google_classic/angel/6.png
new file mode 100644
index 00000000000..694dd1c9dd6
Binary files /dev/null and b/public/images/emoji/google_classic/angel/6.png differ
diff --git a/public/images/emoji/google_classic/anger.png b/public/images/emoji/google_classic/anger.png
new file mode 100644
index 00000000000..fafb67c5f5c
Binary files /dev/null and b/public/images/emoji/google_classic/anger.png differ
diff --git a/public/images/emoji/google_classic/anger_right.png b/public/images/emoji/google_classic/anger_right.png
new file mode 100644
index 00000000000..285492d7b7e
Binary files /dev/null and b/public/images/emoji/google_classic/anger_right.png differ
diff --git a/public/images/emoji/google_classic/angola.png b/public/images/emoji/google_classic/angola.png
new file mode 100644
index 00000000000..6799eeb92b0
Binary files /dev/null and b/public/images/emoji/google_classic/angola.png differ
diff --git a/public/images/emoji/google_classic/angry.png b/public/images/emoji/google_classic/angry.png
new file mode 100644
index 00000000000..92e2ce9c346
Binary files /dev/null and b/public/images/emoji/google_classic/angry.png differ
diff --git a/public/images/emoji/google_classic/anguilla.png b/public/images/emoji/google_classic/anguilla.png
new file mode 100644
index 00000000000..a5ee30341ac
Binary files /dev/null and b/public/images/emoji/google_classic/anguilla.png differ
diff --git a/public/images/emoji/google_classic/anguished.png b/public/images/emoji/google_classic/anguished.png
new file mode 100644
index 00000000000..249f6a06d20
Binary files /dev/null and b/public/images/emoji/google_classic/anguished.png differ
diff --git a/public/images/emoji/google_classic/ant.png b/public/images/emoji/google_classic/ant.png
new file mode 100644
index 00000000000..68ba00aa1ff
Binary files /dev/null and b/public/images/emoji/google_classic/ant.png differ
diff --git a/public/images/emoji/google_classic/antarctica.png b/public/images/emoji/google_classic/antarctica.png
new file mode 100644
index 00000000000..098d8f50690
Binary files /dev/null and b/public/images/emoji/google_classic/antarctica.png differ
diff --git a/public/images/emoji/google_classic/antigua_barbuda.png b/public/images/emoji/google_classic/antigua_barbuda.png
new file mode 100644
index 00000000000..c04e2e4d272
Binary files /dev/null and b/public/images/emoji/google_classic/antigua_barbuda.png differ
diff --git a/public/images/emoji/google_classic/apple.png b/public/images/emoji/google_classic/apple.png
new file mode 100644
index 00000000000..5b035b15a96
Binary files /dev/null and b/public/images/emoji/google_classic/apple.png differ
diff --git a/public/images/emoji/google_classic/aquarius.png b/public/images/emoji/google_classic/aquarius.png
new file mode 100644
index 00000000000..b4c86aeb1bb
Binary files /dev/null and b/public/images/emoji/google_classic/aquarius.png differ
diff --git a/public/images/emoji/google_classic/archery.png b/public/images/emoji/google_classic/archery.png
new file mode 100644
index 00000000000..dceea7eab1b
Binary files /dev/null and b/public/images/emoji/google_classic/archery.png differ
diff --git a/public/images/emoji/google_classic/argentina.png b/public/images/emoji/google_classic/argentina.png
new file mode 100644
index 00000000000..cf669ffaca3
Binary files /dev/null and b/public/images/emoji/google_classic/argentina.png differ
diff --git a/public/images/emoji/google_classic/aries.png b/public/images/emoji/google_classic/aries.png
new file mode 100644
index 00000000000..06ee1dc3a06
Binary files /dev/null and b/public/images/emoji/google_classic/aries.png differ
diff --git a/public/images/emoji/google_classic/armenia.png b/public/images/emoji/google_classic/armenia.png
new file mode 100644
index 00000000000..1a2ac7a35b8
Binary files /dev/null and b/public/images/emoji/google_classic/armenia.png differ
diff --git a/public/images/emoji/google_classic/arrow_backward.png b/public/images/emoji/google_classic/arrow_backward.png
new file mode 100644
index 00000000000..f583ff4bcf6
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_backward.png differ
diff --git a/public/images/emoji/google_classic/arrow_double_down.png b/public/images/emoji/google_classic/arrow_double_down.png
new file mode 100644
index 00000000000..0da8e08c4d3
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_double_down.png differ
diff --git a/public/images/emoji/google_classic/arrow_double_up.png b/public/images/emoji/google_classic/arrow_double_up.png
new file mode 100644
index 00000000000..4d7dd039834
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_double_up.png differ
diff --git a/public/images/emoji/google_classic/arrow_down.png b/public/images/emoji/google_classic/arrow_down.png
new file mode 100644
index 00000000000..8f324377edd
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_down.png differ
diff --git a/public/images/emoji/google_classic/arrow_down_small.png b/public/images/emoji/google_classic/arrow_down_small.png
new file mode 100644
index 00000000000..0f528cca2a0
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_down_small.png differ
diff --git a/public/images/emoji/google_classic/arrow_forward.png b/public/images/emoji/google_classic/arrow_forward.png
new file mode 100644
index 00000000000..440d4525a6b
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_forward.png differ
diff --git a/public/images/emoji/google_classic/arrow_heading_down.png b/public/images/emoji/google_classic/arrow_heading_down.png
new file mode 100644
index 00000000000..b3f6fc59e0a
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_heading_down.png differ
diff --git a/public/images/emoji/google_classic/arrow_heading_up.png b/public/images/emoji/google_classic/arrow_heading_up.png
new file mode 100644
index 00000000000..22606f8e021
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_heading_up.png differ
diff --git a/public/images/emoji/google_classic/arrow_left.png b/public/images/emoji/google_classic/arrow_left.png
new file mode 100644
index 00000000000..08926f34486
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_left.png differ
diff --git a/public/images/emoji/google_classic/arrow_lower_left.png b/public/images/emoji/google_classic/arrow_lower_left.png
new file mode 100644
index 00000000000..16105a839b1
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_lower_left.png differ
diff --git a/public/images/emoji/google_classic/arrow_lower_right.png b/public/images/emoji/google_classic/arrow_lower_right.png
new file mode 100644
index 00000000000..5afb3fbfd0f
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_lower_right.png differ
diff --git a/public/images/emoji/google_classic/arrow_right.png b/public/images/emoji/google_classic/arrow_right.png
new file mode 100644
index 00000000000..b0648934b7d
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_right.png differ
diff --git a/public/images/emoji/google_classic/arrow_right_hook.png b/public/images/emoji/google_classic/arrow_right_hook.png
new file mode 100644
index 00000000000..263856473e9
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_right_hook.png differ
diff --git a/public/images/emoji/google_classic/arrow_up.png b/public/images/emoji/google_classic/arrow_up.png
new file mode 100644
index 00000000000..f4543a4b42d
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_up.png differ
diff --git a/public/images/emoji/google_classic/arrow_up_down.png b/public/images/emoji/google_classic/arrow_up_down.png
new file mode 100644
index 00000000000..769849038ae
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_up_down.png differ
diff --git a/public/images/emoji/google_classic/arrow_up_small.png b/public/images/emoji/google_classic/arrow_up_small.png
new file mode 100644
index 00000000000..f36b293e1a7
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_up_small.png differ
diff --git a/public/images/emoji/google_classic/arrow_upper_left.png b/public/images/emoji/google_classic/arrow_upper_left.png
new file mode 100644
index 00000000000..63ad11cdb79
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_upper_left.png differ
diff --git a/public/images/emoji/google_classic/arrow_upper_right.png b/public/images/emoji/google_classic/arrow_upper_right.png
new file mode 100644
index 00000000000..f00a16a1eda
Binary files /dev/null and b/public/images/emoji/google_classic/arrow_upper_right.png differ
diff --git a/public/images/emoji/google_classic/arrows_clockwise.png b/public/images/emoji/google_classic/arrows_clockwise.png
new file mode 100644
index 00000000000..9d94d6ecd69
Binary files /dev/null and b/public/images/emoji/google_classic/arrows_clockwise.png differ
diff --git a/public/images/emoji/google_classic/arrows_counterclockwise.png b/public/images/emoji/google_classic/arrows_counterclockwise.png
new file mode 100644
index 00000000000..a20d7ee61d3
Binary files /dev/null and b/public/images/emoji/google_classic/arrows_counterclockwise.png differ
diff --git a/public/images/emoji/google_classic/art.png b/public/images/emoji/google_classic/art.png
new file mode 100644
index 00000000000..75e4ae2ce81
Binary files /dev/null and b/public/images/emoji/google_classic/art.png differ
diff --git a/public/images/emoji/google_classic/articulated_lorry.png b/public/images/emoji/google_classic/articulated_lorry.png
new file mode 100644
index 00000000000..ff204d376ee
Binary files /dev/null and b/public/images/emoji/google_classic/articulated_lorry.png differ
diff --git a/public/images/emoji/google_classic/artificial_satellite.png b/public/images/emoji/google_classic/artificial_satellite.png
new file mode 100644
index 00000000000..68fb59dc197
Binary files /dev/null and b/public/images/emoji/google_classic/artificial_satellite.png differ
diff --git a/public/images/emoji/google_classic/aruba.png b/public/images/emoji/google_classic/aruba.png
new file mode 100644
index 00000000000..8139c5ee75a
Binary files /dev/null and b/public/images/emoji/google_classic/aruba.png differ
diff --git a/public/images/emoji/google_classic/ascension_island.png b/public/images/emoji/google_classic/ascension_island.png
new file mode 100644
index 00000000000..0d1da99b50d
Binary files /dev/null and b/public/images/emoji/google_classic/ascension_island.png differ
diff --git a/public/images/emoji/google_classic/asterisk.png b/public/images/emoji/google_classic/asterisk.png
new file mode 100644
index 00000000000..bc41c667b2c
Binary files /dev/null and b/public/images/emoji/google_classic/asterisk.png differ
diff --git a/public/images/emoji/google_classic/astonished.png b/public/images/emoji/google_classic/astonished.png
new file mode 100644
index 00000000000..70d16f32fbf
Binary files /dev/null and b/public/images/emoji/google_classic/astonished.png differ
diff --git a/public/images/emoji/google_classic/athletic_shoe.png b/public/images/emoji/google_classic/athletic_shoe.png
new file mode 100644
index 00000000000..313f37fdb56
Binary files /dev/null and b/public/images/emoji/google_classic/athletic_shoe.png differ
diff --git a/public/images/emoji/google_classic/atm.png b/public/images/emoji/google_classic/atm.png
new file mode 100644
index 00000000000..095871f6cc8
Binary files /dev/null and b/public/images/emoji/google_classic/atm.png differ
diff --git a/public/images/emoji/google_classic/atom.png b/public/images/emoji/google_classic/atom.png
new file mode 100644
index 00000000000..f535028c7aa
Binary files /dev/null and b/public/images/emoji/google_classic/atom.png differ
diff --git a/public/images/emoji/google_classic/atom_symbol.png b/public/images/emoji/google_classic/atom_symbol.png
new file mode 100644
index 00000000000..f535028c7aa
Binary files /dev/null and b/public/images/emoji/google_classic/atom_symbol.png differ
diff --git a/public/images/emoji/google_classic/australia.png b/public/images/emoji/google_classic/australia.png
new file mode 100644
index 00000000000..242d9f6872a
Binary files /dev/null and b/public/images/emoji/google_classic/australia.png differ
diff --git a/public/images/emoji/google_classic/austria.png b/public/images/emoji/google_classic/austria.png
new file mode 100644
index 00000000000..18b3535bf7e
Binary files /dev/null and b/public/images/emoji/google_classic/austria.png differ
diff --git a/public/images/emoji/google_classic/automobile.png b/public/images/emoji/google_classic/automobile.png
new file mode 100644
index 00000000000..9634051d47f
Binary files /dev/null and b/public/images/emoji/google_classic/automobile.png differ
diff --git a/public/images/emoji/google_classic/avocado.png b/public/images/emoji/google_classic/avocado.png
new file mode 100644
index 00000000000..647a6ec2fdb
Binary files /dev/null and b/public/images/emoji/google_classic/avocado.png differ
diff --git a/public/images/emoji/google_classic/azerbaijan.png b/public/images/emoji/google_classic/azerbaijan.png
new file mode 100644
index 00000000000..a56c1d32ba3
Binary files /dev/null and b/public/images/emoji/google_classic/azerbaijan.png differ
diff --git a/public/images/emoji/google_classic/b.png b/public/images/emoji/google_classic/b.png
new file mode 100644
index 00000000000..1d1da3a15e5
Binary files /dev/null and b/public/images/emoji/google_classic/b.png differ
diff --git a/public/images/emoji/google_classic/baby.png b/public/images/emoji/google_classic/baby.png
new file mode 100644
index 00000000000..7f0efa4214b
Binary files /dev/null and b/public/images/emoji/google_classic/baby.png differ
diff --git a/public/images/emoji/google_classic/baby/2.png b/public/images/emoji/google_classic/baby/2.png
new file mode 100644
index 00000000000..a3b3834ce6a
Binary files /dev/null and b/public/images/emoji/google_classic/baby/2.png differ
diff --git a/public/images/emoji/google_classic/baby/3.png b/public/images/emoji/google_classic/baby/3.png
new file mode 100644
index 00000000000..3110d6e82ad
Binary files /dev/null and b/public/images/emoji/google_classic/baby/3.png differ
diff --git a/public/images/emoji/google_classic/baby/4.png b/public/images/emoji/google_classic/baby/4.png
new file mode 100644
index 00000000000..66b1d5f0e94
Binary files /dev/null and b/public/images/emoji/google_classic/baby/4.png differ
diff --git a/public/images/emoji/google_classic/baby/5.png b/public/images/emoji/google_classic/baby/5.png
new file mode 100644
index 00000000000..a31e5c047f5
Binary files /dev/null and b/public/images/emoji/google_classic/baby/5.png differ
diff --git a/public/images/emoji/google_classic/baby/6.png b/public/images/emoji/google_classic/baby/6.png
new file mode 100644
index 00000000000..fb200df019d
Binary files /dev/null and b/public/images/emoji/google_classic/baby/6.png differ
diff --git a/public/images/emoji/google_classic/baby_bottle.png b/public/images/emoji/google_classic/baby_bottle.png
new file mode 100644
index 00000000000..d2b0b9421cb
Binary files /dev/null and b/public/images/emoji/google_classic/baby_bottle.png differ
diff --git a/public/images/emoji/google_classic/baby_chick.png b/public/images/emoji/google_classic/baby_chick.png
new file mode 100644
index 00000000000..54d0a9f8706
Binary files /dev/null and b/public/images/emoji/google_classic/baby_chick.png differ
diff --git a/public/images/emoji/google_classic/baby_symbol.png b/public/images/emoji/google_classic/baby_symbol.png
new file mode 100644
index 00000000000..49f0ac2a1b7
Binary files /dev/null and b/public/images/emoji/google_classic/baby_symbol.png differ
diff --git a/public/images/emoji/google_classic/back.png b/public/images/emoji/google_classic/back.png
new file mode 100644
index 00000000000..10e93a3fdea
Binary files /dev/null and b/public/images/emoji/google_classic/back.png differ
diff --git a/public/images/emoji/google_classic/bacon.png b/public/images/emoji/google_classic/bacon.png
new file mode 100644
index 00000000000..9c34ab0e563
Binary files /dev/null and b/public/images/emoji/google_classic/bacon.png differ
diff --git a/public/images/emoji/google_classic/badminton.png b/public/images/emoji/google_classic/badminton.png
new file mode 100644
index 00000000000..29e58535fef
Binary files /dev/null and b/public/images/emoji/google_classic/badminton.png differ
diff --git a/public/images/emoji/google_classic/baggage_claim.png b/public/images/emoji/google_classic/baggage_claim.png
new file mode 100644
index 00000000000..4662c074909
Binary files /dev/null and b/public/images/emoji/google_classic/baggage_claim.png differ
diff --git a/public/images/emoji/google_classic/baguette_bread.png b/public/images/emoji/google_classic/baguette_bread.png
new file mode 100644
index 00000000000..76061ed7094
Binary files /dev/null and b/public/images/emoji/google_classic/baguette_bread.png differ
diff --git a/public/images/emoji/google_classic/bahamas.png b/public/images/emoji/google_classic/bahamas.png
new file mode 100644
index 00000000000..60c8f92f042
Binary files /dev/null and b/public/images/emoji/google_classic/bahamas.png differ
diff --git a/public/images/emoji/google_classic/bahrain.png b/public/images/emoji/google_classic/bahrain.png
new file mode 100644
index 00000000000..1c87c774e08
Binary files /dev/null and b/public/images/emoji/google_classic/bahrain.png differ
diff --git a/public/images/emoji/google_classic/balance_scale.png b/public/images/emoji/google_classic/balance_scale.png
new file mode 100644
index 00000000000..5fa43f378a6
Binary files /dev/null and b/public/images/emoji/google_classic/balance_scale.png differ
diff --git a/public/images/emoji/google_classic/balloon.png b/public/images/emoji/google_classic/balloon.png
new file mode 100644
index 00000000000..f0c1cdf23a6
Binary files /dev/null and b/public/images/emoji/google_classic/balloon.png differ
diff --git a/public/images/emoji/google_classic/ballot_box.png b/public/images/emoji/google_classic/ballot_box.png
new file mode 100644
index 00000000000..e38572e931d
Binary files /dev/null and b/public/images/emoji/google_classic/ballot_box.png differ
diff --git a/public/images/emoji/google_classic/ballot_box_with_ballot.png b/public/images/emoji/google_classic/ballot_box_with_ballot.png
new file mode 100644
index 00000000000..e38572e931d
Binary files /dev/null and b/public/images/emoji/google_classic/ballot_box_with_ballot.png differ
diff --git a/public/images/emoji/google_classic/ballot_box_with_check.png b/public/images/emoji/google_classic/ballot_box_with_check.png
new file mode 100644
index 00000000000..624556e4b78
Binary files /dev/null and b/public/images/emoji/google_classic/ballot_box_with_check.png differ
diff --git a/public/images/emoji/google_classic/bamboo.png b/public/images/emoji/google_classic/bamboo.png
new file mode 100644
index 00000000000..c16dbf58b15
Binary files /dev/null and b/public/images/emoji/google_classic/bamboo.png differ
diff --git a/public/images/emoji/google_classic/banana.png b/public/images/emoji/google_classic/banana.png
new file mode 100644
index 00000000000..0956b72a74c
Binary files /dev/null and b/public/images/emoji/google_classic/banana.png differ
diff --git a/public/images/emoji/google_classic/bangbang.png b/public/images/emoji/google_classic/bangbang.png
new file mode 100644
index 00000000000..fbf009bdade
Binary files /dev/null and b/public/images/emoji/google_classic/bangbang.png differ
diff --git a/public/images/emoji/google_classic/bangladesh.png b/public/images/emoji/google_classic/bangladesh.png
new file mode 100644
index 00000000000..0c22f4fe828
Binary files /dev/null and b/public/images/emoji/google_classic/bangladesh.png differ
diff --git a/public/images/emoji/google_classic/bank.png b/public/images/emoji/google_classic/bank.png
new file mode 100644
index 00000000000..a64db408366
Binary files /dev/null and b/public/images/emoji/google_classic/bank.png differ
diff --git a/public/images/emoji/google_classic/bar_chart.png b/public/images/emoji/google_classic/bar_chart.png
new file mode 100644
index 00000000000..e12b95e0c76
Binary files /dev/null and b/public/images/emoji/google_classic/bar_chart.png differ
diff --git a/public/images/emoji/google_classic/barbados.png b/public/images/emoji/google_classic/barbados.png
new file mode 100644
index 00000000000..27742f07435
Binary files /dev/null and b/public/images/emoji/google_classic/barbados.png differ
diff --git a/public/images/emoji/google_classic/barber.png b/public/images/emoji/google_classic/barber.png
new file mode 100644
index 00000000000..4e4a9ef79fe
Binary files /dev/null and b/public/images/emoji/google_classic/barber.png differ
diff --git a/public/images/emoji/google_classic/baseball.png b/public/images/emoji/google_classic/baseball.png
new file mode 100644
index 00000000000..a00806ab5ad
Binary files /dev/null and b/public/images/emoji/google_classic/baseball.png differ
diff --git a/public/images/emoji/google_classic/basketball.png b/public/images/emoji/google_classic/basketball.png
new file mode 100644
index 00000000000..9e4997efc1a
Binary files /dev/null and b/public/images/emoji/google_classic/basketball.png differ
diff --git a/public/images/emoji/google_classic/basketball_man.png b/public/images/emoji/google_classic/basketball_man.png
new file mode 100644
index 00000000000..13cb1dcc7d7
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_man.png differ
diff --git a/public/images/emoji/google_classic/basketball_man/2.png b/public/images/emoji/google_classic/basketball_man/2.png
new file mode 100644
index 00000000000..8ea76c0c0a2
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_man/2.png differ
diff --git a/public/images/emoji/google_classic/basketball_man/3.png b/public/images/emoji/google_classic/basketball_man/3.png
new file mode 100644
index 00000000000..399e26300a6
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_man/3.png differ
diff --git a/public/images/emoji/google_classic/basketball_man/4.png b/public/images/emoji/google_classic/basketball_man/4.png
new file mode 100644
index 00000000000..8695943db81
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_man/4.png differ
diff --git a/public/images/emoji/google_classic/basketball_man/5.png b/public/images/emoji/google_classic/basketball_man/5.png
new file mode 100644
index 00000000000..2c62ab9c186
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_man/5.png differ
diff --git a/public/images/emoji/google_classic/basketball_man/6.png b/public/images/emoji/google_classic/basketball_man/6.png
new file mode 100644
index 00000000000..fca559c5903
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_man/6.png differ
diff --git a/public/images/emoji/google_classic/basketball_player.png b/public/images/emoji/google_classic/basketball_player.png
new file mode 100644
index 00000000000..13cb1dcc7d7
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_player.png differ
diff --git a/public/images/emoji/google_classic/basketball_player/2.png b/public/images/emoji/google_classic/basketball_player/2.png
new file mode 100644
index 00000000000..8ea76c0c0a2
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_player/2.png differ
diff --git a/public/images/emoji/google_classic/basketball_player/3.png b/public/images/emoji/google_classic/basketball_player/3.png
new file mode 100644
index 00000000000..399e26300a6
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_player/3.png differ
diff --git a/public/images/emoji/google_classic/basketball_player/4.png b/public/images/emoji/google_classic/basketball_player/4.png
new file mode 100644
index 00000000000..8695943db81
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_player/4.png differ
diff --git a/public/images/emoji/google_classic/basketball_player/5.png b/public/images/emoji/google_classic/basketball_player/5.png
new file mode 100644
index 00000000000..2c62ab9c186
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_player/5.png differ
diff --git a/public/images/emoji/google_classic/basketball_player/6.png b/public/images/emoji/google_classic/basketball_player/6.png
new file mode 100644
index 00000000000..fca559c5903
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_player/6.png differ
diff --git a/public/images/emoji/google_classic/basketball_woman.png b/public/images/emoji/google_classic/basketball_woman.png
new file mode 100644
index 00000000000..523d55de345
Binary files /dev/null and b/public/images/emoji/google_classic/basketball_woman.png differ
diff --git a/public/images/emoji/google_classic/bat.png b/public/images/emoji/google_classic/bat.png
new file mode 100644
index 00000000000..a141a117e37
Binary files /dev/null and b/public/images/emoji/google_classic/bat.png differ
diff --git a/public/images/emoji/google_classic/bath.png b/public/images/emoji/google_classic/bath.png
new file mode 100644
index 00000000000..7710113f84d
Binary files /dev/null and b/public/images/emoji/google_classic/bath.png differ
diff --git a/public/images/emoji/google_classic/bath/2.png b/public/images/emoji/google_classic/bath/2.png
new file mode 100644
index 00000000000..b35167d54f9
Binary files /dev/null and b/public/images/emoji/google_classic/bath/2.png differ
diff --git a/public/images/emoji/google_classic/bath/3.png b/public/images/emoji/google_classic/bath/3.png
new file mode 100644
index 00000000000..de2af7ccdbf
Binary files /dev/null and b/public/images/emoji/google_classic/bath/3.png differ
diff --git a/public/images/emoji/google_classic/bath/4.png b/public/images/emoji/google_classic/bath/4.png
new file mode 100644
index 00000000000..0490babb12f
Binary files /dev/null and b/public/images/emoji/google_classic/bath/4.png differ
diff --git a/public/images/emoji/google_classic/bath/5.png b/public/images/emoji/google_classic/bath/5.png
new file mode 100644
index 00000000000..66a455dcaf6
Binary files /dev/null and b/public/images/emoji/google_classic/bath/5.png differ
diff --git a/public/images/emoji/google_classic/bath/6.png b/public/images/emoji/google_classic/bath/6.png
new file mode 100644
index 00000000000..b2903625da9
Binary files /dev/null and b/public/images/emoji/google_classic/bath/6.png differ
diff --git a/public/images/emoji/google_classic/bathtub.png b/public/images/emoji/google_classic/bathtub.png
new file mode 100644
index 00000000000..9b73db28aae
Binary files /dev/null and b/public/images/emoji/google_classic/bathtub.png differ
diff --git a/public/images/emoji/google_classic/battery.png b/public/images/emoji/google_classic/battery.png
new file mode 100644
index 00000000000..d808953c8ba
Binary files /dev/null and b/public/images/emoji/google_classic/battery.png differ
diff --git a/public/images/emoji/google_classic/beach.png b/public/images/emoji/google_classic/beach.png
new file mode 100644
index 00000000000..df2c0101be9
Binary files /dev/null and b/public/images/emoji/google_classic/beach.png differ
diff --git a/public/images/emoji/google_classic/beach_umbrella.png b/public/images/emoji/google_classic/beach_umbrella.png
new file mode 100644
index 00000000000..df2c0101be9
Binary files /dev/null and b/public/images/emoji/google_classic/beach_umbrella.png differ
diff --git a/public/images/emoji/google_classic/beach_with_umbrella.png b/public/images/emoji/google_classic/beach_with_umbrella.png
new file mode 100644
index 00000000000..df2c0101be9
Binary files /dev/null and b/public/images/emoji/google_classic/beach_with_umbrella.png differ
diff --git a/public/images/emoji/google_classic/bear.png b/public/images/emoji/google_classic/bear.png
new file mode 100644
index 00000000000..932e720ba3f
Binary files /dev/null and b/public/images/emoji/google_classic/bear.png differ
diff --git a/public/images/emoji/google_classic/bearded_person.png b/public/images/emoji/google_classic/bearded_person.png
new file mode 100644
index 00000000000..ed22a6cb381
Binary files /dev/null and b/public/images/emoji/google_classic/bearded_person.png differ
diff --git a/public/images/emoji/google_classic/bearded_person/2.png b/public/images/emoji/google_classic/bearded_person/2.png
new file mode 100644
index 00000000000..4a2fdeb3040
Binary files /dev/null and b/public/images/emoji/google_classic/bearded_person/2.png differ
diff --git a/public/images/emoji/google_classic/bearded_person/3.png b/public/images/emoji/google_classic/bearded_person/3.png
new file mode 100644
index 00000000000..b1f6e168d7c
Binary files /dev/null and b/public/images/emoji/google_classic/bearded_person/3.png differ
diff --git a/public/images/emoji/google_classic/bearded_person/4.png b/public/images/emoji/google_classic/bearded_person/4.png
new file mode 100644
index 00000000000..f75b75a74e9
Binary files /dev/null and b/public/images/emoji/google_classic/bearded_person/4.png differ
diff --git a/public/images/emoji/google_classic/bearded_person/5.png b/public/images/emoji/google_classic/bearded_person/5.png
new file mode 100644
index 00000000000..a9665b318a4
Binary files /dev/null and b/public/images/emoji/google_classic/bearded_person/5.png differ
diff --git a/public/images/emoji/google_classic/bearded_person/6.png b/public/images/emoji/google_classic/bearded_person/6.png
new file mode 100644
index 00000000000..a42b3caf88c
Binary files /dev/null and b/public/images/emoji/google_classic/bearded_person/6.png differ
diff --git a/public/images/emoji/google_classic/bed.png b/public/images/emoji/google_classic/bed.png
new file mode 100644
index 00000000000..9f53173a0e8
Binary files /dev/null and b/public/images/emoji/google_classic/bed.png differ
diff --git a/public/images/emoji/google_classic/bee.png b/public/images/emoji/google_classic/bee.png
new file mode 100644
index 00000000000..168af47a547
Binary files /dev/null and b/public/images/emoji/google_classic/bee.png differ
diff --git a/public/images/emoji/google_classic/beer.png b/public/images/emoji/google_classic/beer.png
new file mode 100644
index 00000000000..b19ebbf90ce
Binary files /dev/null and b/public/images/emoji/google_classic/beer.png differ
diff --git a/public/images/emoji/google_classic/beers.png b/public/images/emoji/google_classic/beers.png
new file mode 100644
index 00000000000..07919b0e35f
Binary files /dev/null and b/public/images/emoji/google_classic/beers.png differ
diff --git a/public/images/emoji/google_classic/beetle.png b/public/images/emoji/google_classic/beetle.png
new file mode 100644
index 00000000000..3dc6cdb7de4
Binary files /dev/null and b/public/images/emoji/google_classic/beetle.png differ
diff --git a/public/images/emoji/google_classic/beginner.png b/public/images/emoji/google_classic/beginner.png
new file mode 100644
index 00000000000..09306fda007
Binary files /dev/null and b/public/images/emoji/google_classic/beginner.png differ
diff --git a/public/images/emoji/google_classic/belarus.png b/public/images/emoji/google_classic/belarus.png
new file mode 100644
index 00000000000..36a47c0e5a2
Binary files /dev/null and b/public/images/emoji/google_classic/belarus.png differ
diff --git a/public/images/emoji/google_classic/belgium.png b/public/images/emoji/google_classic/belgium.png
new file mode 100644
index 00000000000..cbf49cbc6c1
Binary files /dev/null and b/public/images/emoji/google_classic/belgium.png differ
diff --git a/public/images/emoji/google_classic/belize.png b/public/images/emoji/google_classic/belize.png
new file mode 100644
index 00000000000..f28f55049fb
Binary files /dev/null and b/public/images/emoji/google_classic/belize.png differ
diff --git a/public/images/emoji/google_classic/bell.png b/public/images/emoji/google_classic/bell.png
new file mode 100644
index 00000000000..e02bd2477fb
Binary files /dev/null and b/public/images/emoji/google_classic/bell.png differ
diff --git a/public/images/emoji/google_classic/bellhop.png b/public/images/emoji/google_classic/bellhop.png
new file mode 100644
index 00000000000..582fb0f6a58
Binary files /dev/null and b/public/images/emoji/google_classic/bellhop.png differ
diff --git a/public/images/emoji/google_classic/bellhop_bell.png b/public/images/emoji/google_classic/bellhop_bell.png
new file mode 100644
index 00000000000..582fb0f6a58
Binary files /dev/null and b/public/images/emoji/google_classic/bellhop_bell.png differ
diff --git a/public/images/emoji/google_classic/benin.png b/public/images/emoji/google_classic/benin.png
new file mode 100644
index 00000000000..0a4ebd85b00
Binary files /dev/null and b/public/images/emoji/google_classic/benin.png differ
diff --git a/public/images/emoji/google_classic/bento.png b/public/images/emoji/google_classic/bento.png
new file mode 100644
index 00000000000..2180fc50008
Binary files /dev/null and b/public/images/emoji/google_classic/bento.png differ
diff --git a/public/images/emoji/google_classic/bermuda.png b/public/images/emoji/google_classic/bermuda.png
new file mode 100644
index 00000000000..09b8382ef57
Binary files /dev/null and b/public/images/emoji/google_classic/bermuda.png differ
diff --git a/public/images/emoji/google_classic/bhutan.png b/public/images/emoji/google_classic/bhutan.png
new file mode 100644
index 00000000000..69c1f9661ce
Binary files /dev/null and b/public/images/emoji/google_classic/bhutan.png differ
diff --git a/public/images/emoji/google_classic/bicyclist.png b/public/images/emoji/google_classic/bicyclist.png
new file mode 100644
index 00000000000..5ef11710301
Binary files /dev/null and b/public/images/emoji/google_classic/bicyclist.png differ
diff --git a/public/images/emoji/google_classic/bicyclist/2.png b/public/images/emoji/google_classic/bicyclist/2.png
new file mode 100644
index 00000000000..ae55cccd8d9
Binary files /dev/null and b/public/images/emoji/google_classic/bicyclist/2.png differ
diff --git a/public/images/emoji/google_classic/bicyclist/3.png b/public/images/emoji/google_classic/bicyclist/3.png
new file mode 100644
index 00000000000..263390f8e1e
Binary files /dev/null and b/public/images/emoji/google_classic/bicyclist/3.png differ
diff --git a/public/images/emoji/google_classic/bicyclist/4.png b/public/images/emoji/google_classic/bicyclist/4.png
new file mode 100644
index 00000000000..3a86f238caa
Binary files /dev/null and b/public/images/emoji/google_classic/bicyclist/4.png differ
diff --git a/public/images/emoji/google_classic/bicyclist/5.png b/public/images/emoji/google_classic/bicyclist/5.png
new file mode 100644
index 00000000000..8b121c48f1d
Binary files /dev/null and b/public/images/emoji/google_classic/bicyclist/5.png differ
diff --git a/public/images/emoji/google_classic/bicyclist/6.png b/public/images/emoji/google_classic/bicyclist/6.png
new file mode 100644
index 00000000000..e874818ab05
Binary files /dev/null and b/public/images/emoji/google_classic/bicyclist/6.png differ
diff --git a/public/images/emoji/google_classic/bike.png b/public/images/emoji/google_classic/bike.png
new file mode 100644
index 00000000000..6c9ac02949e
Binary files /dev/null and b/public/images/emoji/google_classic/bike.png differ
diff --git a/public/images/emoji/google_classic/biking_man.png b/public/images/emoji/google_classic/biking_man.png
new file mode 100644
index 00000000000..5ef11710301
Binary files /dev/null and b/public/images/emoji/google_classic/biking_man.png differ
diff --git a/public/images/emoji/google_classic/biking_man/2.png b/public/images/emoji/google_classic/biking_man/2.png
new file mode 100644
index 00000000000..ae55cccd8d9
Binary files /dev/null and b/public/images/emoji/google_classic/biking_man/2.png differ
diff --git a/public/images/emoji/google_classic/biking_man/3.png b/public/images/emoji/google_classic/biking_man/3.png
new file mode 100644
index 00000000000..263390f8e1e
Binary files /dev/null and b/public/images/emoji/google_classic/biking_man/3.png differ
diff --git a/public/images/emoji/google_classic/biking_man/4.png b/public/images/emoji/google_classic/biking_man/4.png
new file mode 100644
index 00000000000..3a86f238caa
Binary files /dev/null and b/public/images/emoji/google_classic/biking_man/4.png differ
diff --git a/public/images/emoji/google_classic/biking_man/5.png b/public/images/emoji/google_classic/biking_man/5.png
new file mode 100644
index 00000000000..8b121c48f1d
Binary files /dev/null and b/public/images/emoji/google_classic/biking_man/5.png differ
diff --git a/public/images/emoji/google_classic/biking_man/6.png b/public/images/emoji/google_classic/biking_man/6.png
new file mode 100644
index 00000000000..e874818ab05
Binary files /dev/null and b/public/images/emoji/google_classic/biking_man/6.png differ
diff --git a/public/images/emoji/google_classic/biking_woman.png b/public/images/emoji/google_classic/biking_woman.png
new file mode 100644
index 00000000000..ca369391211
Binary files /dev/null and b/public/images/emoji/google_classic/biking_woman.png differ
diff --git a/public/images/emoji/google_classic/biking_woman/2.png b/public/images/emoji/google_classic/biking_woman/2.png
new file mode 100644
index 00000000000..7eb6d9e85c6
Binary files /dev/null and b/public/images/emoji/google_classic/biking_woman/2.png differ
diff --git a/public/images/emoji/google_classic/biking_woman/3.png b/public/images/emoji/google_classic/biking_woman/3.png
new file mode 100644
index 00000000000..8f113050a16
Binary files /dev/null and b/public/images/emoji/google_classic/biking_woman/3.png differ
diff --git a/public/images/emoji/google_classic/biking_woman/4.png b/public/images/emoji/google_classic/biking_woman/4.png
new file mode 100644
index 00000000000..10c70a64792
Binary files /dev/null and b/public/images/emoji/google_classic/biking_woman/4.png differ
diff --git a/public/images/emoji/google_classic/biking_woman/5.png b/public/images/emoji/google_classic/biking_woman/5.png
new file mode 100644
index 00000000000..eb607e99cf6
Binary files /dev/null and b/public/images/emoji/google_classic/biking_woman/5.png differ
diff --git a/public/images/emoji/google_classic/biking_woman/6.png b/public/images/emoji/google_classic/biking_woman/6.png
new file mode 100644
index 00000000000..48b029a213a
Binary files /dev/null and b/public/images/emoji/google_classic/biking_woman/6.png differ
diff --git a/public/images/emoji/google_classic/bikini.png b/public/images/emoji/google_classic/bikini.png
new file mode 100644
index 00000000000..1c8b7f54407
Binary files /dev/null and b/public/images/emoji/google_classic/bikini.png differ
diff --git a/public/images/emoji/google_classic/billed_cap.png b/public/images/emoji/google_classic/billed_cap.png
new file mode 100644
index 00000000000..5cc92e307e1
Binary files /dev/null and b/public/images/emoji/google_classic/billed_cap.png differ
diff --git a/public/images/emoji/google_classic/biohazard.png b/public/images/emoji/google_classic/biohazard.png
new file mode 100644
index 00000000000..98ecbc5dfc7
Binary files /dev/null and b/public/images/emoji/google_classic/biohazard.png differ
diff --git a/public/images/emoji/google_classic/biohazard_sign.png b/public/images/emoji/google_classic/biohazard_sign.png
new file mode 100644
index 00000000000..98ecbc5dfc7
Binary files /dev/null and b/public/images/emoji/google_classic/biohazard_sign.png differ
diff --git a/public/images/emoji/google_classic/bird.png b/public/images/emoji/google_classic/bird.png
new file mode 100644
index 00000000000..85626b6c353
Binary files /dev/null and b/public/images/emoji/google_classic/bird.png differ
diff --git a/public/images/emoji/google_classic/birthday.png b/public/images/emoji/google_classic/birthday.png
new file mode 100644
index 00000000000..392518cf336
Binary files /dev/null and b/public/images/emoji/google_classic/birthday.png differ
diff --git a/public/images/emoji/google_classic/black_circle.png b/public/images/emoji/google_classic/black_circle.png
new file mode 100644
index 00000000000..9cb8a2949c9
Binary files /dev/null and b/public/images/emoji/google_classic/black_circle.png differ
diff --git a/public/images/emoji/google_classic/black_flag.png b/public/images/emoji/google_classic/black_flag.png
new file mode 100644
index 00000000000..de072bca626
Binary files /dev/null and b/public/images/emoji/google_classic/black_flag.png differ
diff --git a/public/images/emoji/google_classic/black_heart.png b/public/images/emoji/google_classic/black_heart.png
new file mode 100644
index 00000000000..2d1a5aaf0b9
Binary files /dev/null and b/public/images/emoji/google_classic/black_heart.png differ
diff --git a/public/images/emoji/google_classic/black_joker.png b/public/images/emoji/google_classic/black_joker.png
new file mode 100644
index 00000000000..db372fcab03
Binary files /dev/null and b/public/images/emoji/google_classic/black_joker.png differ
diff --git a/public/images/emoji/google_classic/black_large_square.png b/public/images/emoji/google_classic/black_large_square.png
new file mode 100644
index 00000000000..b74a8c0b7f4
Binary files /dev/null and b/public/images/emoji/google_classic/black_large_square.png differ
diff --git a/public/images/emoji/google_classic/black_medium_small_square.png b/public/images/emoji/google_classic/black_medium_small_square.png
new file mode 100644
index 00000000000..4edf9c41fe3
Binary files /dev/null and b/public/images/emoji/google_classic/black_medium_small_square.png differ
diff --git a/public/images/emoji/google_classic/black_medium_square.png b/public/images/emoji/google_classic/black_medium_square.png
new file mode 100644
index 00000000000..bc3ecd4b2a4
Binary files /dev/null and b/public/images/emoji/google_classic/black_medium_square.png differ
diff --git a/public/images/emoji/google_classic/black_nib.png b/public/images/emoji/google_classic/black_nib.png
new file mode 100644
index 00000000000..1a50fa2b5aa
Binary files /dev/null and b/public/images/emoji/google_classic/black_nib.png differ
diff --git a/public/images/emoji/google_classic/black_small_square.png b/public/images/emoji/google_classic/black_small_square.png
new file mode 100644
index 00000000000..95b7ff704f4
Binary files /dev/null and b/public/images/emoji/google_classic/black_small_square.png differ
diff --git a/public/images/emoji/google_classic/black_square_button.png b/public/images/emoji/google_classic/black_square_button.png
new file mode 100644
index 00000000000..20f794590a3
Binary files /dev/null and b/public/images/emoji/google_classic/black_square_button.png differ
diff --git a/public/images/emoji/google_classic/blonde_man.png b/public/images/emoji/google_classic/blonde_man.png
new file mode 100644
index 00000000000..a06b4e01e78
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_man.png differ
diff --git a/public/images/emoji/google_classic/blonde_man/2.png b/public/images/emoji/google_classic/blonde_man/2.png
new file mode 100644
index 00000000000..e9a04252c6c
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_man/2.png differ
diff --git a/public/images/emoji/google_classic/blonde_man/3.png b/public/images/emoji/google_classic/blonde_man/3.png
new file mode 100644
index 00000000000..75674c347ef
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_man/3.png differ
diff --git a/public/images/emoji/google_classic/blonde_man/4.png b/public/images/emoji/google_classic/blonde_man/4.png
new file mode 100644
index 00000000000..d1d0f873053
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_man/4.png differ
diff --git a/public/images/emoji/google_classic/blonde_man/5.png b/public/images/emoji/google_classic/blonde_man/5.png
new file mode 100644
index 00000000000..a6264c605d8
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_man/5.png differ
diff --git a/public/images/emoji/google_classic/blonde_man/6.png b/public/images/emoji/google_classic/blonde_man/6.png
new file mode 100644
index 00000000000..508746275e4
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_man/6.png differ
diff --git a/public/images/emoji/google_classic/blonde_woman.png b/public/images/emoji/google_classic/blonde_woman.png
new file mode 100644
index 00000000000..daff12d6455
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_woman.png differ
diff --git a/public/images/emoji/google_classic/blonde_woman/2.png b/public/images/emoji/google_classic/blonde_woman/2.png
new file mode 100644
index 00000000000..ef2cb405235
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_woman/2.png differ
diff --git a/public/images/emoji/google_classic/blonde_woman/3.png b/public/images/emoji/google_classic/blonde_woman/3.png
new file mode 100644
index 00000000000..8e8f3040b1e
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_woman/3.png differ
diff --git a/public/images/emoji/google_classic/blonde_woman/4.png b/public/images/emoji/google_classic/blonde_woman/4.png
new file mode 100644
index 00000000000..14f1ff40767
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_woman/4.png differ
diff --git a/public/images/emoji/google_classic/blonde_woman/5.png b/public/images/emoji/google_classic/blonde_woman/5.png
new file mode 100644
index 00000000000..e8508f898b4
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_woman/5.png differ
diff --git a/public/images/emoji/google_classic/blonde_woman/6.png b/public/images/emoji/google_classic/blonde_woman/6.png
new file mode 100644
index 00000000000..eb44419c1c5
Binary files /dev/null and b/public/images/emoji/google_classic/blonde_woman/6.png differ
diff --git a/public/images/emoji/google_classic/blossom.png b/public/images/emoji/google_classic/blossom.png
new file mode 100644
index 00000000000..cd264329429
Binary files /dev/null and b/public/images/emoji/google_classic/blossom.png differ
diff --git a/public/images/emoji/google_classic/blowfish.png b/public/images/emoji/google_classic/blowfish.png
new file mode 100644
index 00000000000..d8b6b284e79
Binary files /dev/null and b/public/images/emoji/google_classic/blowfish.png differ
diff --git a/public/images/emoji/google_classic/blue_book.png b/public/images/emoji/google_classic/blue_book.png
new file mode 100644
index 00000000000..f3698722805
Binary files /dev/null and b/public/images/emoji/google_classic/blue_book.png differ
diff --git a/public/images/emoji/google_classic/blue_car.png b/public/images/emoji/google_classic/blue_car.png
new file mode 100644
index 00000000000..abdf8f80fd8
Binary files /dev/null and b/public/images/emoji/google_classic/blue_car.png differ
diff --git a/public/images/emoji/google_classic/blue_heart.png b/public/images/emoji/google_classic/blue_heart.png
new file mode 100644
index 00000000000..f9446770766
Binary files /dev/null and b/public/images/emoji/google_classic/blue_heart.png differ
diff --git a/public/images/emoji/google_classic/blush.png b/public/images/emoji/google_classic/blush.png
new file mode 100644
index 00000000000..f01b27b4ab3
Binary files /dev/null and b/public/images/emoji/google_classic/blush.png differ
diff --git a/public/images/emoji/google_classic/boar.png b/public/images/emoji/google_classic/boar.png
new file mode 100644
index 00000000000..ced8c03a5e3
Binary files /dev/null and b/public/images/emoji/google_classic/boar.png differ
diff --git a/public/images/emoji/google_classic/boat.png b/public/images/emoji/google_classic/boat.png
new file mode 100644
index 00000000000..16e1f419e2f
Binary files /dev/null and b/public/images/emoji/google_classic/boat.png differ
diff --git a/public/images/emoji/google_classic/bolivia.png b/public/images/emoji/google_classic/bolivia.png
new file mode 100644
index 00000000000..924eff4baea
Binary files /dev/null and b/public/images/emoji/google_classic/bolivia.png differ
diff --git a/public/images/emoji/google_classic/bomb.png b/public/images/emoji/google_classic/bomb.png
new file mode 100644
index 00000000000..632540aae6c
Binary files /dev/null and b/public/images/emoji/google_classic/bomb.png differ
diff --git a/public/images/emoji/google_classic/book.png b/public/images/emoji/google_classic/book.png
new file mode 100644
index 00000000000..ac277b2a55d
Binary files /dev/null and b/public/images/emoji/google_classic/book.png differ
diff --git a/public/images/emoji/google_classic/bookmark.png b/public/images/emoji/google_classic/bookmark.png
new file mode 100644
index 00000000000..44814dfcfe2
Binary files /dev/null and b/public/images/emoji/google_classic/bookmark.png differ
diff --git a/public/images/emoji/google_classic/bookmark_tabs.png b/public/images/emoji/google_classic/bookmark_tabs.png
new file mode 100644
index 00000000000..cd1d7ab780c
Binary files /dev/null and b/public/images/emoji/google_classic/bookmark_tabs.png differ
diff --git a/public/images/emoji/google_classic/books.png b/public/images/emoji/google_classic/books.png
new file mode 100644
index 00000000000..1478bfad9fe
Binary files /dev/null and b/public/images/emoji/google_classic/books.png differ
diff --git a/public/images/emoji/google_classic/boom.png b/public/images/emoji/google_classic/boom.png
new file mode 100644
index 00000000000..76edc4c348d
Binary files /dev/null and b/public/images/emoji/google_classic/boom.png differ
diff --git a/public/images/emoji/google_classic/boot.png b/public/images/emoji/google_classic/boot.png
new file mode 100644
index 00000000000..eb0347064ed
Binary files /dev/null and b/public/images/emoji/google_classic/boot.png differ
diff --git a/public/images/emoji/google_classic/bosnia_herzegovina.png b/public/images/emoji/google_classic/bosnia_herzegovina.png
new file mode 100644
index 00000000000..194fe5525f3
Binary files /dev/null and b/public/images/emoji/google_classic/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/google_classic/botswana.png b/public/images/emoji/google_classic/botswana.png
new file mode 100644
index 00000000000..eeb57d0392f
Binary files /dev/null and b/public/images/emoji/google_classic/botswana.png differ
diff --git a/public/images/emoji/google_classic/bottle_with_popping_cork.png b/public/images/emoji/google_classic/bottle_with_popping_cork.png
new file mode 100644
index 00000000000..5cf41ff03b2
Binary files /dev/null and b/public/images/emoji/google_classic/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/google_classic/bouquet.png b/public/images/emoji/google_classic/bouquet.png
new file mode 100644
index 00000000000..64ba6b601c2
Binary files /dev/null and b/public/images/emoji/google_classic/bouquet.png differ
diff --git a/public/images/emoji/google_classic/bouvet_island.png b/public/images/emoji/google_classic/bouvet_island.png
new file mode 100644
index 00000000000..4e8756eef8f
Binary files /dev/null and b/public/images/emoji/google_classic/bouvet_island.png differ
diff --git a/public/images/emoji/google_classic/bow.png b/public/images/emoji/google_classic/bow.png
new file mode 100644
index 00000000000..bd18e0ae6c6
Binary files /dev/null and b/public/images/emoji/google_classic/bow.png differ
diff --git a/public/images/emoji/google_classic/bow/2.png b/public/images/emoji/google_classic/bow/2.png
new file mode 100644
index 00000000000..4951531f68c
Binary files /dev/null and b/public/images/emoji/google_classic/bow/2.png differ
diff --git a/public/images/emoji/google_classic/bow/3.png b/public/images/emoji/google_classic/bow/3.png
new file mode 100644
index 00000000000..67e98e3383e
Binary files /dev/null and b/public/images/emoji/google_classic/bow/3.png differ
diff --git a/public/images/emoji/google_classic/bow/4.png b/public/images/emoji/google_classic/bow/4.png
new file mode 100644
index 00000000000..3fa52bbbf95
Binary files /dev/null and b/public/images/emoji/google_classic/bow/4.png differ
diff --git a/public/images/emoji/google_classic/bow/5.png b/public/images/emoji/google_classic/bow/5.png
new file mode 100644
index 00000000000..c778641159f
Binary files /dev/null and b/public/images/emoji/google_classic/bow/5.png differ
diff --git a/public/images/emoji/google_classic/bow/6.png b/public/images/emoji/google_classic/bow/6.png
new file mode 100644
index 00000000000..006348a3fb8
Binary files /dev/null and b/public/images/emoji/google_classic/bow/6.png differ
diff --git a/public/images/emoji/google_classic/bow_and_arrow.png b/public/images/emoji/google_classic/bow_and_arrow.png
new file mode 100644
index 00000000000..dceea7eab1b
Binary files /dev/null and b/public/images/emoji/google_classic/bow_and_arrow.png differ
diff --git a/public/images/emoji/google_classic/bowing_man.png b/public/images/emoji/google_classic/bowing_man.png
new file mode 100644
index 00000000000..bd18e0ae6c6
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_man.png differ
diff --git a/public/images/emoji/google_classic/bowing_man/2.png b/public/images/emoji/google_classic/bowing_man/2.png
new file mode 100644
index 00000000000..4951531f68c
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_man/2.png differ
diff --git a/public/images/emoji/google_classic/bowing_man/3.png b/public/images/emoji/google_classic/bowing_man/3.png
new file mode 100644
index 00000000000..67e98e3383e
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_man/3.png differ
diff --git a/public/images/emoji/google_classic/bowing_man/4.png b/public/images/emoji/google_classic/bowing_man/4.png
new file mode 100644
index 00000000000..3fa52bbbf95
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_man/4.png differ
diff --git a/public/images/emoji/google_classic/bowing_man/5.png b/public/images/emoji/google_classic/bowing_man/5.png
new file mode 100644
index 00000000000..c778641159f
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_man/5.png differ
diff --git a/public/images/emoji/google_classic/bowing_man/6.png b/public/images/emoji/google_classic/bowing_man/6.png
new file mode 100644
index 00000000000..006348a3fb8
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_man/6.png differ
diff --git a/public/images/emoji/google_classic/bowing_woman.png b/public/images/emoji/google_classic/bowing_woman.png
new file mode 100644
index 00000000000..0b0fb877d6e
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_woman.png differ
diff --git a/public/images/emoji/google_classic/bowing_woman/2.png b/public/images/emoji/google_classic/bowing_woman/2.png
new file mode 100644
index 00000000000..67efc8cbabf
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_woman/2.png differ
diff --git a/public/images/emoji/google_classic/bowing_woman/3.png b/public/images/emoji/google_classic/bowing_woman/3.png
new file mode 100644
index 00000000000..9095959ac3e
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_woman/3.png differ
diff --git a/public/images/emoji/google_classic/bowing_woman/4.png b/public/images/emoji/google_classic/bowing_woman/4.png
new file mode 100644
index 00000000000..91ec882a9a8
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_woman/4.png differ
diff --git a/public/images/emoji/google_classic/bowing_woman/5.png b/public/images/emoji/google_classic/bowing_woman/5.png
new file mode 100644
index 00000000000..551303cdef1
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_woman/5.png differ
diff --git a/public/images/emoji/google_classic/bowing_woman/6.png b/public/images/emoji/google_classic/bowing_woman/6.png
new file mode 100644
index 00000000000..e25777f315d
Binary files /dev/null and b/public/images/emoji/google_classic/bowing_woman/6.png differ
diff --git a/public/images/emoji/google_classic/bowl_with_spoon.png b/public/images/emoji/google_classic/bowl_with_spoon.png
new file mode 100644
index 00000000000..b0d88a73b9d
Binary files /dev/null and b/public/images/emoji/google_classic/bowl_with_spoon.png differ
diff --git a/public/images/emoji/google_classic/bowling.png b/public/images/emoji/google_classic/bowling.png
new file mode 100644
index 00000000000..e39f72ddb6b
Binary files /dev/null and b/public/images/emoji/google_classic/bowling.png differ
diff --git a/public/images/emoji/google_classic/boxing_glove.png b/public/images/emoji/google_classic/boxing_glove.png
new file mode 100644
index 00000000000..e5e3cd3a254
Binary files /dev/null and b/public/images/emoji/google_classic/boxing_glove.png differ
diff --git a/public/images/emoji/google_classic/boy.png b/public/images/emoji/google_classic/boy.png
new file mode 100644
index 00000000000..9a0810d5f85
Binary files /dev/null and b/public/images/emoji/google_classic/boy.png differ
diff --git a/public/images/emoji/google_classic/boy/2.png b/public/images/emoji/google_classic/boy/2.png
new file mode 100644
index 00000000000..86532b18fd8
Binary files /dev/null and b/public/images/emoji/google_classic/boy/2.png differ
diff --git a/public/images/emoji/google_classic/boy/3.png b/public/images/emoji/google_classic/boy/3.png
new file mode 100644
index 00000000000..7267de4f133
Binary files /dev/null and b/public/images/emoji/google_classic/boy/3.png differ
diff --git a/public/images/emoji/google_classic/boy/4.png b/public/images/emoji/google_classic/boy/4.png
new file mode 100644
index 00000000000..ce68cd37602
Binary files /dev/null and b/public/images/emoji/google_classic/boy/4.png differ
diff --git a/public/images/emoji/google_classic/boy/5.png b/public/images/emoji/google_classic/boy/5.png
new file mode 100644
index 00000000000..d0e292f77e0
Binary files /dev/null and b/public/images/emoji/google_classic/boy/5.png differ
diff --git a/public/images/emoji/google_classic/boy/6.png b/public/images/emoji/google_classic/boy/6.png
new file mode 100644
index 00000000000..fab4a148cf1
Binary files /dev/null and b/public/images/emoji/google_classic/boy/6.png differ
diff --git a/public/images/emoji/google_classic/brain.png b/public/images/emoji/google_classic/brain.png
new file mode 100644
index 00000000000..c8e889faecf
Binary files /dev/null and b/public/images/emoji/google_classic/brain.png differ
diff --git a/public/images/emoji/google_classic/brazil.png b/public/images/emoji/google_classic/brazil.png
new file mode 100644
index 00000000000..c7f3188b9c1
Binary files /dev/null and b/public/images/emoji/google_classic/brazil.png differ
diff --git a/public/images/emoji/google_classic/bread.png b/public/images/emoji/google_classic/bread.png
new file mode 100644
index 00000000000..db9365adb16
Binary files /dev/null and b/public/images/emoji/google_classic/bread.png differ
diff --git a/public/images/emoji/google_classic/breast_feeding.png b/public/images/emoji/google_classic/breast_feeding.png
new file mode 100644
index 00000000000..815538138bf
Binary files /dev/null and b/public/images/emoji/google_classic/breast_feeding.png differ
diff --git a/public/images/emoji/google_classic/breast_feeding/2.png b/public/images/emoji/google_classic/breast_feeding/2.png
new file mode 100644
index 00000000000..fb591aa4fb4
Binary files /dev/null and b/public/images/emoji/google_classic/breast_feeding/2.png differ
diff --git a/public/images/emoji/google_classic/breast_feeding/3.png b/public/images/emoji/google_classic/breast_feeding/3.png
new file mode 100644
index 00000000000..5adcffa4b94
Binary files /dev/null and b/public/images/emoji/google_classic/breast_feeding/3.png differ
diff --git a/public/images/emoji/google_classic/breast_feeding/4.png b/public/images/emoji/google_classic/breast_feeding/4.png
new file mode 100644
index 00000000000..d166f981b24
Binary files /dev/null and b/public/images/emoji/google_classic/breast_feeding/4.png differ
diff --git a/public/images/emoji/google_classic/breast_feeding/5.png b/public/images/emoji/google_classic/breast_feeding/5.png
new file mode 100644
index 00000000000..7c8cb50a780
Binary files /dev/null and b/public/images/emoji/google_classic/breast_feeding/5.png differ
diff --git a/public/images/emoji/google_classic/breast_feeding/6.png b/public/images/emoji/google_classic/breast_feeding/6.png
new file mode 100644
index 00000000000..e113d8cb428
Binary files /dev/null and b/public/images/emoji/google_classic/breast_feeding/6.png differ
diff --git a/public/images/emoji/google_classic/bride_with_veil.png b/public/images/emoji/google_classic/bride_with_veil.png
new file mode 100644
index 00000000000..95ac30e145c
Binary files /dev/null and b/public/images/emoji/google_classic/bride_with_veil.png differ
diff --git a/public/images/emoji/google_classic/bride_with_veil/2.png b/public/images/emoji/google_classic/bride_with_veil/2.png
new file mode 100644
index 00000000000..f05d47c9617
Binary files /dev/null and b/public/images/emoji/google_classic/bride_with_veil/2.png differ
diff --git a/public/images/emoji/google_classic/bride_with_veil/3.png b/public/images/emoji/google_classic/bride_with_veil/3.png
new file mode 100644
index 00000000000..8bf8fc24a7b
Binary files /dev/null and b/public/images/emoji/google_classic/bride_with_veil/3.png differ
diff --git a/public/images/emoji/google_classic/bride_with_veil/4.png b/public/images/emoji/google_classic/bride_with_veil/4.png
new file mode 100644
index 00000000000..61ad194afaf
Binary files /dev/null and b/public/images/emoji/google_classic/bride_with_veil/4.png differ
diff --git a/public/images/emoji/google_classic/bride_with_veil/5.png b/public/images/emoji/google_classic/bride_with_veil/5.png
new file mode 100644
index 00000000000..12b86801499
Binary files /dev/null and b/public/images/emoji/google_classic/bride_with_veil/5.png differ
diff --git a/public/images/emoji/google_classic/bride_with_veil/6.png b/public/images/emoji/google_classic/bride_with_veil/6.png
new file mode 100644
index 00000000000..d65223372cc
Binary files /dev/null and b/public/images/emoji/google_classic/bride_with_veil/6.png differ
diff --git a/public/images/emoji/google_classic/bridge_at_night.png b/public/images/emoji/google_classic/bridge_at_night.png
new file mode 100644
index 00000000000..c2db12fa265
Binary files /dev/null and b/public/images/emoji/google_classic/bridge_at_night.png differ
diff --git a/public/images/emoji/google_classic/briefcase.png b/public/images/emoji/google_classic/briefcase.png
new file mode 100644
index 00000000000..b384dc9d6cc
Binary files /dev/null and b/public/images/emoji/google_classic/briefcase.png differ
diff --git a/public/images/emoji/google_classic/british_indian_ocean_territory.png b/public/images/emoji/google_classic/british_indian_ocean_territory.png
new file mode 100644
index 00000000000..2a4d9018b64
Binary files /dev/null and b/public/images/emoji/google_classic/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/google_classic/british_virgin_islands.png b/public/images/emoji/google_classic/british_virgin_islands.png
new file mode 100644
index 00000000000..23a24303eed
Binary files /dev/null and b/public/images/emoji/google_classic/british_virgin_islands.png differ
diff --git a/public/images/emoji/google_classic/broccoli.png b/public/images/emoji/google_classic/broccoli.png
new file mode 100644
index 00000000000..5e03a6d23ba
Binary files /dev/null and b/public/images/emoji/google_classic/broccoli.png differ
diff --git a/public/images/emoji/google_classic/broken_heart.png b/public/images/emoji/google_classic/broken_heart.png
new file mode 100644
index 00000000000..df439f80444
Binary files /dev/null and b/public/images/emoji/google_classic/broken_heart.png differ
diff --git a/public/images/emoji/google_classic/brunei.png b/public/images/emoji/google_classic/brunei.png
new file mode 100644
index 00000000000..3dbb68c8a66
Binary files /dev/null and b/public/images/emoji/google_classic/brunei.png differ
diff --git a/public/images/emoji/google_classic/bug.png b/public/images/emoji/google_classic/bug.png
new file mode 100644
index 00000000000..96ef9230ab1
Binary files /dev/null and b/public/images/emoji/google_classic/bug.png differ
diff --git a/public/images/emoji/google_classic/building_construction.png b/public/images/emoji/google_classic/building_construction.png
new file mode 100644
index 00000000000..78e30b4b27a
Binary files /dev/null and b/public/images/emoji/google_classic/building_construction.png differ
diff --git a/public/images/emoji/google_classic/bulb.png b/public/images/emoji/google_classic/bulb.png
new file mode 100644
index 00000000000..1ff72c2b962
Binary files /dev/null and b/public/images/emoji/google_classic/bulb.png differ
diff --git a/public/images/emoji/google_classic/bulgaria.png b/public/images/emoji/google_classic/bulgaria.png
new file mode 100644
index 00000000000..8f710ce9416
Binary files /dev/null and b/public/images/emoji/google_classic/bulgaria.png differ
diff --git a/public/images/emoji/google_classic/bullettrain_front.png b/public/images/emoji/google_classic/bullettrain_front.png
new file mode 100644
index 00000000000..9e70b3b2c33
Binary files /dev/null and b/public/images/emoji/google_classic/bullettrain_front.png differ
diff --git a/public/images/emoji/google_classic/bullettrain_side.png b/public/images/emoji/google_classic/bullettrain_side.png
new file mode 100644
index 00000000000..b257266ae0b
Binary files /dev/null and b/public/images/emoji/google_classic/bullettrain_side.png differ
diff --git a/public/images/emoji/google_classic/burkina_faso.png b/public/images/emoji/google_classic/burkina_faso.png
new file mode 100644
index 00000000000..508a3c354a7
Binary files /dev/null and b/public/images/emoji/google_classic/burkina_faso.png differ
diff --git a/public/images/emoji/google_classic/burrito.png b/public/images/emoji/google_classic/burrito.png
new file mode 100644
index 00000000000..cde9352f14c
Binary files /dev/null and b/public/images/emoji/google_classic/burrito.png differ
diff --git a/public/images/emoji/google_classic/burundi.png b/public/images/emoji/google_classic/burundi.png
new file mode 100644
index 00000000000..dd8c61c768f
Binary files /dev/null and b/public/images/emoji/google_classic/burundi.png differ
diff --git a/public/images/emoji/google_classic/bus.png b/public/images/emoji/google_classic/bus.png
new file mode 100644
index 00000000000..599eca6f1cf
Binary files /dev/null and b/public/images/emoji/google_classic/bus.png differ
diff --git a/public/images/emoji/google_classic/business_suit_levitating.png b/public/images/emoji/google_classic/business_suit_levitating.png
new file mode 100644
index 00000000000..aafbbc2d802
Binary files /dev/null and b/public/images/emoji/google_classic/business_suit_levitating.png differ
diff --git a/public/images/emoji/google_classic/busstop.png b/public/images/emoji/google_classic/busstop.png
new file mode 100644
index 00000000000..bf9c299cc28
Binary files /dev/null and b/public/images/emoji/google_classic/busstop.png differ
diff --git a/public/images/emoji/google_classic/bust_in_silhouette.png b/public/images/emoji/google_classic/bust_in_silhouette.png
new file mode 100644
index 00000000000..bc992283987
Binary files /dev/null and b/public/images/emoji/google_classic/bust_in_silhouette.png differ
diff --git a/public/images/emoji/google_classic/busts_in_silhouette.png b/public/images/emoji/google_classic/busts_in_silhouette.png
new file mode 100644
index 00000000000..677dcb13c5f
Binary files /dev/null and b/public/images/emoji/google_classic/busts_in_silhouette.png differ
diff --git a/public/images/emoji/google_classic/butterfly.png b/public/images/emoji/google_classic/butterfly.png
new file mode 100644
index 00000000000..2a50be06d0a
Binary files /dev/null and b/public/images/emoji/google_classic/butterfly.png differ
diff --git a/public/images/emoji/google_classic/cactus.png b/public/images/emoji/google_classic/cactus.png
new file mode 100644
index 00000000000..5d0ca1b590f
Binary files /dev/null and b/public/images/emoji/google_classic/cactus.png differ
diff --git a/public/images/emoji/google_classic/cake.png b/public/images/emoji/google_classic/cake.png
new file mode 100644
index 00000000000..1cdb3529926
Binary files /dev/null and b/public/images/emoji/google_classic/cake.png differ
diff --git a/public/images/emoji/google_classic/calendar.png b/public/images/emoji/google_classic/calendar.png
new file mode 100644
index 00000000000..fe5a4397697
Binary files /dev/null and b/public/images/emoji/google_classic/calendar.png differ
diff --git a/public/images/emoji/google_classic/calendar_spiral.png b/public/images/emoji/google_classic/calendar_spiral.png
new file mode 100644
index 00000000000..4f13ffb5f76
Binary files /dev/null and b/public/images/emoji/google_classic/calendar_spiral.png differ
diff --git a/public/images/emoji/google_classic/call_me_hand.png b/public/images/emoji/google_classic/call_me_hand.png
new file mode 100644
index 00000000000..a4326ddd85f
Binary files /dev/null and b/public/images/emoji/google_classic/call_me_hand.png differ
diff --git a/public/images/emoji/google_classic/call_me_hand/2.png b/public/images/emoji/google_classic/call_me_hand/2.png
new file mode 100644
index 00000000000..9925d0e233c
Binary files /dev/null and b/public/images/emoji/google_classic/call_me_hand/2.png differ
diff --git a/public/images/emoji/google_classic/call_me_hand/3.png b/public/images/emoji/google_classic/call_me_hand/3.png
new file mode 100644
index 00000000000..5b44f232586
Binary files /dev/null and b/public/images/emoji/google_classic/call_me_hand/3.png differ
diff --git a/public/images/emoji/google_classic/call_me_hand/4.png b/public/images/emoji/google_classic/call_me_hand/4.png
new file mode 100644
index 00000000000..1a906a3cd9c
Binary files /dev/null and b/public/images/emoji/google_classic/call_me_hand/4.png differ
diff --git a/public/images/emoji/google_classic/call_me_hand/5.png b/public/images/emoji/google_classic/call_me_hand/5.png
new file mode 100644
index 00000000000..1a72aaff3e7
Binary files /dev/null and b/public/images/emoji/google_classic/call_me_hand/5.png differ
diff --git a/public/images/emoji/google_classic/call_me_hand/6.png b/public/images/emoji/google_classic/call_me_hand/6.png
new file mode 100644
index 00000000000..c2543bc7e33
Binary files /dev/null and b/public/images/emoji/google_classic/call_me_hand/6.png differ
diff --git a/public/images/emoji/google_classic/calling.png b/public/images/emoji/google_classic/calling.png
new file mode 100644
index 00000000000..69d80b6b275
Binary files /dev/null and b/public/images/emoji/google_classic/calling.png differ
diff --git a/public/images/emoji/google_classic/cambodia.png b/public/images/emoji/google_classic/cambodia.png
new file mode 100644
index 00000000000..8c6a46d5fa5
Binary files /dev/null and b/public/images/emoji/google_classic/cambodia.png differ
diff --git a/public/images/emoji/google_classic/camel.png b/public/images/emoji/google_classic/camel.png
new file mode 100644
index 00000000000..715d722cd21
Binary files /dev/null and b/public/images/emoji/google_classic/camel.png differ
diff --git a/public/images/emoji/google_classic/camera.png b/public/images/emoji/google_classic/camera.png
new file mode 100644
index 00000000000..8483a62d9ed
Binary files /dev/null and b/public/images/emoji/google_classic/camera.png differ
diff --git a/public/images/emoji/google_classic/camera_flash.png b/public/images/emoji/google_classic/camera_flash.png
new file mode 100644
index 00000000000..9e898cde12e
Binary files /dev/null and b/public/images/emoji/google_classic/camera_flash.png differ
diff --git a/public/images/emoji/google_classic/camera_with_flash.png b/public/images/emoji/google_classic/camera_with_flash.png
new file mode 100644
index 00000000000..9e898cde12e
Binary files /dev/null and b/public/images/emoji/google_classic/camera_with_flash.png differ
diff --git a/public/images/emoji/google_classic/cameroon.png b/public/images/emoji/google_classic/cameroon.png
new file mode 100644
index 00000000000..82c46e6de58
Binary files /dev/null and b/public/images/emoji/google_classic/cameroon.png differ
diff --git a/public/images/emoji/google_classic/camping.png b/public/images/emoji/google_classic/camping.png
new file mode 100644
index 00000000000..20cf5bd6010
Binary files /dev/null and b/public/images/emoji/google_classic/camping.png differ
diff --git a/public/images/emoji/google_classic/canada.png b/public/images/emoji/google_classic/canada.png
new file mode 100644
index 00000000000..06f13065ab0
Binary files /dev/null and b/public/images/emoji/google_classic/canada.png differ
diff --git a/public/images/emoji/google_classic/canary_islands.png b/public/images/emoji/google_classic/canary_islands.png
new file mode 100644
index 00000000000..131e462d578
Binary files /dev/null and b/public/images/emoji/google_classic/canary_islands.png differ
diff --git a/public/images/emoji/google_classic/cancer.png b/public/images/emoji/google_classic/cancer.png
new file mode 100644
index 00000000000..2136036126b
Binary files /dev/null and b/public/images/emoji/google_classic/cancer.png differ
diff --git a/public/images/emoji/google_classic/candle.png b/public/images/emoji/google_classic/candle.png
new file mode 100644
index 00000000000..7978fccceed
Binary files /dev/null and b/public/images/emoji/google_classic/candle.png differ
diff --git a/public/images/emoji/google_classic/candy.png b/public/images/emoji/google_classic/candy.png
new file mode 100644
index 00000000000..d235a92b7cc
Binary files /dev/null and b/public/images/emoji/google_classic/candy.png differ
diff --git a/public/images/emoji/google_classic/canned_food.png b/public/images/emoji/google_classic/canned_food.png
new file mode 100644
index 00000000000..2e5976e9d2f
Binary files /dev/null and b/public/images/emoji/google_classic/canned_food.png differ
diff --git a/public/images/emoji/google_classic/canoe.png b/public/images/emoji/google_classic/canoe.png
new file mode 100644
index 00000000000..c3fa97e8468
Binary files /dev/null and b/public/images/emoji/google_classic/canoe.png differ
diff --git a/public/images/emoji/google_classic/cape_verde.png b/public/images/emoji/google_classic/cape_verde.png
new file mode 100644
index 00000000000..b6ad8744f02
Binary files /dev/null and b/public/images/emoji/google_classic/cape_verde.png differ
diff --git a/public/images/emoji/google_classic/capital_abcd.png b/public/images/emoji/google_classic/capital_abcd.png
new file mode 100644
index 00000000000..62c8b9fe592
Binary files /dev/null and b/public/images/emoji/google_classic/capital_abcd.png differ
diff --git a/public/images/emoji/google_classic/capricorn.png b/public/images/emoji/google_classic/capricorn.png
new file mode 100644
index 00000000000..b99a7d1b742
Binary files /dev/null and b/public/images/emoji/google_classic/capricorn.png differ
diff --git a/public/images/emoji/google_classic/car.png b/public/images/emoji/google_classic/car.png
new file mode 100644
index 00000000000..9634051d47f
Binary files /dev/null and b/public/images/emoji/google_classic/car.png differ
diff --git a/public/images/emoji/google_classic/card_box.png b/public/images/emoji/google_classic/card_box.png
new file mode 100644
index 00000000000..85c914bb1ca
Binary files /dev/null and b/public/images/emoji/google_classic/card_box.png differ
diff --git a/public/images/emoji/google_classic/card_file_box.png b/public/images/emoji/google_classic/card_file_box.png
new file mode 100644
index 00000000000..85c914bb1ca
Binary files /dev/null and b/public/images/emoji/google_classic/card_file_box.png differ
diff --git a/public/images/emoji/google_classic/card_index.png b/public/images/emoji/google_classic/card_index.png
new file mode 100644
index 00000000000..d98708218f3
Binary files /dev/null and b/public/images/emoji/google_classic/card_index.png differ
diff --git a/public/images/emoji/google_classic/card_index_dividers.png b/public/images/emoji/google_classic/card_index_dividers.png
new file mode 100644
index 00000000000..62dea0dd66d
Binary files /dev/null and b/public/images/emoji/google_classic/card_index_dividers.png differ
diff --git a/public/images/emoji/google_classic/caribbean_netherlands.png b/public/images/emoji/google_classic/caribbean_netherlands.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/caribbean_netherlands.png differ
diff --git a/public/images/emoji/google_classic/carousel_horse.png b/public/images/emoji/google_classic/carousel_horse.png
new file mode 100644
index 00000000000..1a1da271366
Binary files /dev/null and b/public/images/emoji/google_classic/carousel_horse.png differ
diff --git a/public/images/emoji/google_classic/carrot.png b/public/images/emoji/google_classic/carrot.png
new file mode 100644
index 00000000000..6f56335609b
Binary files /dev/null and b/public/images/emoji/google_classic/carrot.png differ
diff --git a/public/images/emoji/google_classic/cat.png b/public/images/emoji/google_classic/cat.png
new file mode 100644
index 00000000000..78d6f9206b2
Binary files /dev/null and b/public/images/emoji/google_classic/cat.png differ
diff --git a/public/images/emoji/google_classic/cat2.png b/public/images/emoji/google_classic/cat2.png
new file mode 100644
index 00000000000..5a5ceb0e67b
Binary files /dev/null and b/public/images/emoji/google_classic/cat2.png differ
diff --git a/public/images/emoji/google_classic/cayman_islands.png b/public/images/emoji/google_classic/cayman_islands.png
new file mode 100644
index 00000000000..f08d5998cee
Binary files /dev/null and b/public/images/emoji/google_classic/cayman_islands.png differ
diff --git a/public/images/emoji/google_classic/cd.png b/public/images/emoji/google_classic/cd.png
new file mode 100644
index 00000000000..a5334c3acd2
Binary files /dev/null and b/public/images/emoji/google_classic/cd.png differ
diff --git a/public/images/emoji/google_classic/central_african_republic.png b/public/images/emoji/google_classic/central_african_republic.png
new file mode 100644
index 00000000000..d03ac0decfb
Binary files /dev/null and b/public/images/emoji/google_classic/central_african_republic.png differ
diff --git a/public/images/emoji/google_classic/ceuta_and_melilla.png b/public/images/emoji/google_classic/ceuta_and_melilla.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/google_classic/chad.png b/public/images/emoji/google_classic/chad.png
new file mode 100644
index 00000000000..4afaff7dad1
Binary files /dev/null and b/public/images/emoji/google_classic/chad.png differ
diff --git a/public/images/emoji/google_classic/chains.png b/public/images/emoji/google_classic/chains.png
new file mode 100644
index 00000000000..30c3e888811
Binary files /dev/null and b/public/images/emoji/google_classic/chains.png differ
diff --git a/public/images/emoji/google_classic/champagne.png b/public/images/emoji/google_classic/champagne.png
new file mode 100644
index 00000000000..5cf41ff03b2
Binary files /dev/null and b/public/images/emoji/google_classic/champagne.png differ
diff --git a/public/images/emoji/google_classic/chart.png b/public/images/emoji/google_classic/chart.png
new file mode 100644
index 00000000000..d66c094b485
Binary files /dev/null and b/public/images/emoji/google_classic/chart.png differ
diff --git a/public/images/emoji/google_classic/chart_with_downwards_trend.png b/public/images/emoji/google_classic/chart_with_downwards_trend.png
new file mode 100644
index 00000000000..377075e9c63
Binary files /dev/null and b/public/images/emoji/google_classic/chart_with_downwards_trend.png differ
diff --git a/public/images/emoji/google_classic/chart_with_upwards_trend.png b/public/images/emoji/google_classic/chart_with_upwards_trend.png
new file mode 100644
index 00000000000..282ef90344a
Binary files /dev/null and b/public/images/emoji/google_classic/chart_with_upwards_trend.png differ
diff --git a/public/images/emoji/google_classic/checkered_flag.png b/public/images/emoji/google_classic/checkered_flag.png
new file mode 100644
index 00000000000..c9b232ed025
Binary files /dev/null and b/public/images/emoji/google_classic/checkered_flag.png differ
diff --git a/public/images/emoji/google_classic/cheese.png b/public/images/emoji/google_classic/cheese.png
new file mode 100644
index 00000000000..e66ad08ba8a
Binary files /dev/null and b/public/images/emoji/google_classic/cheese.png differ
diff --git a/public/images/emoji/google_classic/cheese_wedge.png b/public/images/emoji/google_classic/cheese_wedge.png
new file mode 100644
index 00000000000..e66ad08ba8a
Binary files /dev/null and b/public/images/emoji/google_classic/cheese_wedge.png differ
diff --git a/public/images/emoji/google_classic/cherries.png b/public/images/emoji/google_classic/cherries.png
new file mode 100644
index 00000000000..e1931e295c3
Binary files /dev/null and b/public/images/emoji/google_classic/cherries.png differ
diff --git a/public/images/emoji/google_classic/cherry_blossom.png b/public/images/emoji/google_classic/cherry_blossom.png
new file mode 100644
index 00000000000..4a142df68dd
Binary files /dev/null and b/public/images/emoji/google_classic/cherry_blossom.png differ
diff --git a/public/images/emoji/google_classic/chestnut.png b/public/images/emoji/google_classic/chestnut.png
new file mode 100644
index 00000000000..4a6266aa0e0
Binary files /dev/null and b/public/images/emoji/google_classic/chestnut.png differ
diff --git a/public/images/emoji/google_classic/chicken.png b/public/images/emoji/google_classic/chicken.png
new file mode 100644
index 00000000000..53c11c8cbc6
Binary files /dev/null and b/public/images/emoji/google_classic/chicken.png differ
diff --git a/public/images/emoji/google_classic/child.png b/public/images/emoji/google_classic/child.png
new file mode 100644
index 00000000000..33e50494a3a
Binary files /dev/null and b/public/images/emoji/google_classic/child.png differ
diff --git a/public/images/emoji/google_classic/child/2.png b/public/images/emoji/google_classic/child/2.png
new file mode 100644
index 00000000000..7a0e4f1cb75
Binary files /dev/null and b/public/images/emoji/google_classic/child/2.png differ
diff --git a/public/images/emoji/google_classic/child/3.png b/public/images/emoji/google_classic/child/3.png
new file mode 100644
index 00000000000..81a69110e9d
Binary files /dev/null and b/public/images/emoji/google_classic/child/3.png differ
diff --git a/public/images/emoji/google_classic/child/4.png b/public/images/emoji/google_classic/child/4.png
new file mode 100644
index 00000000000..b5c64c9cc84
Binary files /dev/null and b/public/images/emoji/google_classic/child/4.png differ
diff --git a/public/images/emoji/google_classic/child/5.png b/public/images/emoji/google_classic/child/5.png
new file mode 100644
index 00000000000..0763a8bd94c
Binary files /dev/null and b/public/images/emoji/google_classic/child/5.png differ
diff --git a/public/images/emoji/google_classic/child/6.png b/public/images/emoji/google_classic/child/6.png
new file mode 100644
index 00000000000..3ed705b9025
Binary files /dev/null and b/public/images/emoji/google_classic/child/6.png differ
diff --git a/public/images/emoji/google_classic/children_crossing.png b/public/images/emoji/google_classic/children_crossing.png
new file mode 100644
index 00000000000..f83ecee8e27
Binary files /dev/null and b/public/images/emoji/google_classic/children_crossing.png differ
diff --git a/public/images/emoji/google_classic/chile.png b/public/images/emoji/google_classic/chile.png
new file mode 100644
index 00000000000..80def7867c2
Binary files /dev/null and b/public/images/emoji/google_classic/chile.png differ
diff --git a/public/images/emoji/google_classic/chipmunk.png b/public/images/emoji/google_classic/chipmunk.png
new file mode 100644
index 00000000000..56529ca0464
Binary files /dev/null and b/public/images/emoji/google_classic/chipmunk.png differ
diff --git a/public/images/emoji/google_classic/chocolate_bar.png b/public/images/emoji/google_classic/chocolate_bar.png
new file mode 100644
index 00000000000..8ebd8fe93fd
Binary files /dev/null and b/public/images/emoji/google_classic/chocolate_bar.png differ
diff --git a/public/images/emoji/google_classic/chopsticks.png b/public/images/emoji/google_classic/chopsticks.png
new file mode 100644
index 00000000000..57064202979
Binary files /dev/null and b/public/images/emoji/google_classic/chopsticks.png differ
diff --git a/public/images/emoji/google_classic/christmas_island.png b/public/images/emoji/google_classic/christmas_island.png
new file mode 100644
index 00000000000..bb0074547d9
Binary files /dev/null and b/public/images/emoji/google_classic/christmas_island.png differ
diff --git a/public/images/emoji/google_classic/christmas_tree.png b/public/images/emoji/google_classic/christmas_tree.png
new file mode 100644
index 00000000000..4ddc26af5a2
Binary files /dev/null and b/public/images/emoji/google_classic/christmas_tree.png differ
diff --git a/public/images/emoji/google_classic/church.png b/public/images/emoji/google_classic/church.png
new file mode 100644
index 00000000000..855bf9c3c72
Binary files /dev/null and b/public/images/emoji/google_classic/church.png differ
diff --git a/public/images/emoji/google_classic/cinema.png b/public/images/emoji/google_classic/cinema.png
new file mode 100644
index 00000000000..912c36a6e05
Binary files /dev/null and b/public/images/emoji/google_classic/cinema.png differ
diff --git a/public/images/emoji/google_classic/circus_tent.png b/public/images/emoji/google_classic/circus_tent.png
new file mode 100644
index 00000000000..fc0995ea1eb
Binary files /dev/null and b/public/images/emoji/google_classic/circus_tent.png differ
diff --git a/public/images/emoji/google_classic/city_dusk.png b/public/images/emoji/google_classic/city_dusk.png
new file mode 100644
index 00000000000..11677c9411f
Binary files /dev/null and b/public/images/emoji/google_classic/city_dusk.png differ
diff --git a/public/images/emoji/google_classic/city_sunrise.png b/public/images/emoji/google_classic/city_sunrise.png
new file mode 100644
index 00000000000..606d49c2dd4
Binary files /dev/null and b/public/images/emoji/google_classic/city_sunrise.png differ
diff --git a/public/images/emoji/google_classic/city_sunset.png b/public/images/emoji/google_classic/city_sunset.png
new file mode 100644
index 00000000000..11677c9411f
Binary files /dev/null and b/public/images/emoji/google_classic/city_sunset.png differ
diff --git a/public/images/emoji/google_classic/cityscape.png b/public/images/emoji/google_classic/cityscape.png
new file mode 100644
index 00000000000..218ea8e5fa9
Binary files /dev/null and b/public/images/emoji/google_classic/cityscape.png differ
diff --git a/public/images/emoji/google_classic/cl.png b/public/images/emoji/google_classic/cl.png
new file mode 100644
index 00000000000..20e0d1d0960
Binary files /dev/null and b/public/images/emoji/google_classic/cl.png differ
diff --git a/public/images/emoji/google_classic/clamp.png b/public/images/emoji/google_classic/clamp.png
new file mode 100644
index 00000000000..99709b6d7c9
Binary files /dev/null and b/public/images/emoji/google_classic/clamp.png differ
diff --git a/public/images/emoji/google_classic/clap.png b/public/images/emoji/google_classic/clap.png
new file mode 100644
index 00000000000..1def8c44efd
Binary files /dev/null and b/public/images/emoji/google_classic/clap.png differ
diff --git a/public/images/emoji/google_classic/clap/2.png b/public/images/emoji/google_classic/clap/2.png
new file mode 100644
index 00000000000..8c7d0704fb5
Binary files /dev/null and b/public/images/emoji/google_classic/clap/2.png differ
diff --git a/public/images/emoji/google_classic/clap/3.png b/public/images/emoji/google_classic/clap/3.png
new file mode 100644
index 00000000000..7d35e2d83ec
Binary files /dev/null and b/public/images/emoji/google_classic/clap/3.png differ
diff --git a/public/images/emoji/google_classic/clap/4.png b/public/images/emoji/google_classic/clap/4.png
new file mode 100644
index 00000000000..5a382e8c5db
Binary files /dev/null and b/public/images/emoji/google_classic/clap/4.png differ
diff --git a/public/images/emoji/google_classic/clap/5.png b/public/images/emoji/google_classic/clap/5.png
new file mode 100644
index 00000000000..2dfaf78c09f
Binary files /dev/null and b/public/images/emoji/google_classic/clap/5.png differ
diff --git a/public/images/emoji/google_classic/clap/6.png b/public/images/emoji/google_classic/clap/6.png
new file mode 100644
index 00000000000..1d6a3f35a5d
Binary files /dev/null and b/public/images/emoji/google_classic/clap/6.png differ
diff --git a/public/images/emoji/google_classic/clapper.png b/public/images/emoji/google_classic/clapper.png
new file mode 100644
index 00000000000..b8f9f807f98
Binary files /dev/null and b/public/images/emoji/google_classic/clapper.png differ
diff --git a/public/images/emoji/google_classic/classical_building.png b/public/images/emoji/google_classic/classical_building.png
new file mode 100644
index 00000000000..7c8c45438eb
Binary files /dev/null and b/public/images/emoji/google_classic/classical_building.png differ
diff --git a/public/images/emoji/google_classic/clinking_glasses.png b/public/images/emoji/google_classic/clinking_glasses.png
new file mode 100644
index 00000000000..aab477f0696
Binary files /dev/null and b/public/images/emoji/google_classic/clinking_glasses.png differ
diff --git a/public/images/emoji/google_classic/clipboard.png b/public/images/emoji/google_classic/clipboard.png
new file mode 100644
index 00000000000..c9af21fc986
Binary files /dev/null and b/public/images/emoji/google_classic/clipboard.png differ
diff --git a/public/images/emoji/google_classic/clipperton_island.png b/public/images/emoji/google_classic/clipperton_island.png
new file mode 100644
index 00000000000..359803de2b2
Binary files /dev/null and b/public/images/emoji/google_classic/clipperton_island.png differ
diff --git a/public/images/emoji/google/mantlepiece_clock.png b/public/images/emoji/google_classic/clock.png
similarity index 100%
rename from public/images/emoji/google/mantlepiece_clock.png
rename to public/images/emoji/google_classic/clock.png
diff --git a/public/images/emoji/google_classic/clock1.png b/public/images/emoji/google_classic/clock1.png
new file mode 100644
index 00000000000..5f0b1d88a5b
Binary files /dev/null and b/public/images/emoji/google_classic/clock1.png differ
diff --git a/public/images/emoji/google_classic/clock10.png b/public/images/emoji/google_classic/clock10.png
new file mode 100644
index 00000000000..2942520aa62
Binary files /dev/null and b/public/images/emoji/google_classic/clock10.png differ
diff --git a/public/images/emoji/google_classic/clock1030.png b/public/images/emoji/google_classic/clock1030.png
new file mode 100644
index 00000000000..b4bad6b1dee
Binary files /dev/null and b/public/images/emoji/google_classic/clock1030.png differ
diff --git a/public/images/emoji/google_classic/clock11.png b/public/images/emoji/google_classic/clock11.png
new file mode 100644
index 00000000000..bc422c6be84
Binary files /dev/null and b/public/images/emoji/google_classic/clock11.png differ
diff --git a/public/images/emoji/google_classic/clock1130.png b/public/images/emoji/google_classic/clock1130.png
new file mode 100644
index 00000000000..4c4c06b94a2
Binary files /dev/null and b/public/images/emoji/google_classic/clock1130.png differ
diff --git a/public/images/emoji/google_classic/clock12.png b/public/images/emoji/google_classic/clock12.png
new file mode 100644
index 00000000000..d7733bc61a1
Binary files /dev/null and b/public/images/emoji/google_classic/clock12.png differ
diff --git a/public/images/emoji/google_classic/clock1230.png b/public/images/emoji/google_classic/clock1230.png
new file mode 100644
index 00000000000..a1c71c939f1
Binary files /dev/null and b/public/images/emoji/google_classic/clock1230.png differ
diff --git a/public/images/emoji/google_classic/clock130.png b/public/images/emoji/google_classic/clock130.png
new file mode 100644
index 00000000000..8c6496020a5
Binary files /dev/null and b/public/images/emoji/google_classic/clock130.png differ
diff --git a/public/images/emoji/google_classic/clock2.png b/public/images/emoji/google_classic/clock2.png
new file mode 100644
index 00000000000..20d6e843a2f
Binary files /dev/null and b/public/images/emoji/google_classic/clock2.png differ
diff --git a/public/images/emoji/google_classic/clock230.png b/public/images/emoji/google_classic/clock230.png
new file mode 100644
index 00000000000..c04c0307962
Binary files /dev/null and b/public/images/emoji/google_classic/clock230.png differ
diff --git a/public/images/emoji/google_classic/clock3.png b/public/images/emoji/google_classic/clock3.png
new file mode 100644
index 00000000000..190e7842527
Binary files /dev/null and b/public/images/emoji/google_classic/clock3.png differ
diff --git a/public/images/emoji/google_classic/clock330.png b/public/images/emoji/google_classic/clock330.png
new file mode 100644
index 00000000000..5e878c3c29e
Binary files /dev/null and b/public/images/emoji/google_classic/clock330.png differ
diff --git a/public/images/emoji/google_classic/clock4.png b/public/images/emoji/google_classic/clock4.png
new file mode 100644
index 00000000000..b4df6cfde92
Binary files /dev/null and b/public/images/emoji/google_classic/clock4.png differ
diff --git a/public/images/emoji/google_classic/clock430.png b/public/images/emoji/google_classic/clock430.png
new file mode 100644
index 00000000000..33e2cf89420
Binary files /dev/null and b/public/images/emoji/google_classic/clock430.png differ
diff --git a/public/images/emoji/google_classic/clock5.png b/public/images/emoji/google_classic/clock5.png
new file mode 100644
index 00000000000..70cfdce4683
Binary files /dev/null and b/public/images/emoji/google_classic/clock5.png differ
diff --git a/public/images/emoji/google_classic/clock530.png b/public/images/emoji/google_classic/clock530.png
new file mode 100644
index 00000000000..f7f5a6e192c
Binary files /dev/null and b/public/images/emoji/google_classic/clock530.png differ
diff --git a/public/images/emoji/google_classic/clock6.png b/public/images/emoji/google_classic/clock6.png
new file mode 100644
index 00000000000..a71efd9da36
Binary files /dev/null and b/public/images/emoji/google_classic/clock6.png differ
diff --git a/public/images/emoji/google_classic/clock630.png b/public/images/emoji/google_classic/clock630.png
new file mode 100644
index 00000000000..95149d0005a
Binary files /dev/null and b/public/images/emoji/google_classic/clock630.png differ
diff --git a/public/images/emoji/google_classic/clock7.png b/public/images/emoji/google_classic/clock7.png
new file mode 100644
index 00000000000..54bc95e8b83
Binary files /dev/null and b/public/images/emoji/google_classic/clock7.png differ
diff --git a/public/images/emoji/google_classic/clock730.png b/public/images/emoji/google_classic/clock730.png
new file mode 100644
index 00000000000..2244745911c
Binary files /dev/null and b/public/images/emoji/google_classic/clock730.png differ
diff --git a/public/images/emoji/google_classic/clock8.png b/public/images/emoji/google_classic/clock8.png
new file mode 100644
index 00000000000..72da307e37c
Binary files /dev/null and b/public/images/emoji/google_classic/clock8.png differ
diff --git a/public/images/emoji/google_classic/clock830.png b/public/images/emoji/google_classic/clock830.png
new file mode 100644
index 00000000000..c36b0798b83
Binary files /dev/null and b/public/images/emoji/google_classic/clock830.png differ
diff --git a/public/images/emoji/google_classic/clock9.png b/public/images/emoji/google_classic/clock9.png
new file mode 100644
index 00000000000..1aba4a8937f
Binary files /dev/null and b/public/images/emoji/google_classic/clock9.png differ
diff --git a/public/images/emoji/google_classic/clock930.png b/public/images/emoji/google_classic/clock930.png
new file mode 100644
index 00000000000..1e7acda191e
Binary files /dev/null and b/public/images/emoji/google_classic/clock930.png differ
diff --git a/public/images/emoji/google_classic/closed_book.png b/public/images/emoji/google_classic/closed_book.png
new file mode 100644
index 00000000000..b28245ac4b5
Binary files /dev/null and b/public/images/emoji/google_classic/closed_book.png differ
diff --git a/public/images/emoji/google_classic/closed_lock_with_key.png b/public/images/emoji/google_classic/closed_lock_with_key.png
new file mode 100644
index 00000000000..6fc692ab10f
Binary files /dev/null and b/public/images/emoji/google_classic/closed_lock_with_key.png differ
diff --git a/public/images/emoji/google_classic/closed_umbrella.png b/public/images/emoji/google_classic/closed_umbrella.png
new file mode 100644
index 00000000000..6b2cdf59e56
Binary files /dev/null and b/public/images/emoji/google_classic/closed_umbrella.png differ
diff --git a/public/images/emoji/google_classic/cloud.png b/public/images/emoji/google_classic/cloud.png
new file mode 100644
index 00000000000..d11cf974a59
Binary files /dev/null and b/public/images/emoji/google_classic/cloud.png differ
diff --git a/public/images/emoji/google_classic/cloud_lightning.png b/public/images/emoji/google_classic/cloud_lightning.png
new file mode 100644
index 00000000000..189e4a6a973
Binary files /dev/null and b/public/images/emoji/google_classic/cloud_lightning.png differ
diff --git a/public/images/emoji/google_classic/cloud_rain.png b/public/images/emoji/google_classic/cloud_rain.png
new file mode 100644
index 00000000000..1b32b3716fe
Binary files /dev/null and b/public/images/emoji/google_classic/cloud_rain.png differ
diff --git a/public/images/emoji/google_classic/cloud_snow.png b/public/images/emoji/google_classic/cloud_snow.png
new file mode 100644
index 00000000000..02d9e2ddb01
Binary files /dev/null and b/public/images/emoji/google_classic/cloud_snow.png differ
diff --git a/public/images/emoji/google_classic/cloud_tornado.png b/public/images/emoji/google_classic/cloud_tornado.png
new file mode 100644
index 00000000000..fb8684e1cec
Binary files /dev/null and b/public/images/emoji/google_classic/cloud_tornado.png differ
diff --git a/public/images/emoji/google_classic/cloud_with_lightning.png b/public/images/emoji/google_classic/cloud_with_lightning.png
new file mode 100644
index 00000000000..189e4a6a973
Binary files /dev/null and b/public/images/emoji/google_classic/cloud_with_lightning.png differ
diff --git a/public/images/emoji/google_classic/cloud_with_lightning_and_rain.png b/public/images/emoji/google_classic/cloud_with_lightning_and_rain.png
new file mode 100644
index 00000000000..ea9bc1ea2e5
Binary files /dev/null and b/public/images/emoji/google_classic/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/google_classic/cloud_with_rain.png b/public/images/emoji/google_classic/cloud_with_rain.png
new file mode 100644
index 00000000000..1b32b3716fe
Binary files /dev/null and b/public/images/emoji/google_classic/cloud_with_rain.png differ
diff --git a/public/images/emoji/google_classic/cloud_with_snow.png b/public/images/emoji/google_classic/cloud_with_snow.png
new file mode 100644
index 00000000000..02d9e2ddb01
Binary files /dev/null and b/public/images/emoji/google_classic/cloud_with_snow.png differ
diff --git a/public/images/emoji/google_classic/cloud_with_tornado.png b/public/images/emoji/google_classic/cloud_with_tornado.png
new file mode 100644
index 00000000000..fb8684e1cec
Binary files /dev/null and b/public/images/emoji/google_classic/cloud_with_tornado.png differ
diff --git a/public/images/emoji/google_classic/clown_face.png b/public/images/emoji/google_classic/clown_face.png
new file mode 100644
index 00000000000..95acf0afec6
Binary files /dev/null and b/public/images/emoji/google_classic/clown_face.png differ
diff --git a/public/images/emoji/google_classic/clubs.png b/public/images/emoji/google_classic/clubs.png
new file mode 100644
index 00000000000..2efcb695b83
Binary files /dev/null and b/public/images/emoji/google_classic/clubs.png differ
diff --git a/public/images/emoji/google_classic/cn.png b/public/images/emoji/google_classic/cn.png
new file mode 100644
index 00000000000..8a4320b72f0
Binary files /dev/null and b/public/images/emoji/google_classic/cn.png differ
diff --git a/public/images/emoji/google_classic/coat.png b/public/images/emoji/google_classic/coat.png
new file mode 100644
index 00000000000..c409f9f4c4c
Binary files /dev/null and b/public/images/emoji/google_classic/coat.png differ
diff --git a/public/images/emoji/google_classic/cocktail.png b/public/images/emoji/google_classic/cocktail.png
new file mode 100644
index 00000000000..0174cbf98b0
Binary files /dev/null and b/public/images/emoji/google_classic/cocktail.png differ
diff --git a/public/images/emoji/google_classic/coconut.png b/public/images/emoji/google_classic/coconut.png
new file mode 100644
index 00000000000..e76b533149f
Binary files /dev/null and b/public/images/emoji/google_classic/coconut.png differ
diff --git a/public/images/emoji/google_classic/cocos_islands.png b/public/images/emoji/google_classic/cocos_islands.png
new file mode 100644
index 00000000000..73bea3ca4eb
Binary files /dev/null and b/public/images/emoji/google_classic/cocos_islands.png differ
diff --git a/public/images/emoji/google_classic/coffee.png b/public/images/emoji/google_classic/coffee.png
new file mode 100644
index 00000000000..ccf5a36de5f
Binary files /dev/null and b/public/images/emoji/google_classic/coffee.png differ
diff --git a/public/images/emoji/google_classic/coffin.png b/public/images/emoji/google_classic/coffin.png
new file mode 100644
index 00000000000..ac77ae07133
Binary files /dev/null and b/public/images/emoji/google_classic/coffin.png differ
diff --git a/public/images/emoji/google_classic/cold_sweat.png b/public/images/emoji/google_classic/cold_sweat.png
new file mode 100644
index 00000000000..956924946b5
Binary files /dev/null and b/public/images/emoji/google_classic/cold_sweat.png differ
diff --git a/public/images/emoji/google_classic/colombia.png b/public/images/emoji/google_classic/colombia.png
new file mode 100644
index 00000000000..df484985436
Binary files /dev/null and b/public/images/emoji/google_classic/colombia.png differ
diff --git a/public/images/emoji/google_classic/comet.png b/public/images/emoji/google_classic/comet.png
new file mode 100644
index 00000000000..34c92afd66f
Binary files /dev/null and b/public/images/emoji/google_classic/comet.png differ
diff --git a/public/images/emoji/google_classic/comoros.png b/public/images/emoji/google_classic/comoros.png
new file mode 100644
index 00000000000..3fbeec835a6
Binary files /dev/null and b/public/images/emoji/google_classic/comoros.png differ
diff --git a/public/images/emoji/google_classic/compression.png b/public/images/emoji/google_classic/compression.png
new file mode 100644
index 00000000000..99709b6d7c9
Binary files /dev/null and b/public/images/emoji/google_classic/compression.png differ
diff --git a/public/images/emoji/google_classic/computer.png b/public/images/emoji/google_classic/computer.png
new file mode 100644
index 00000000000..fbd02827cca
Binary files /dev/null and b/public/images/emoji/google_classic/computer.png differ
diff --git a/public/images/emoji/google_classic/computer_mouse.png b/public/images/emoji/google_classic/computer_mouse.png
new file mode 100644
index 00000000000..220ef6486c1
Binary files /dev/null and b/public/images/emoji/google_classic/computer_mouse.png differ
diff --git a/public/images/emoji/google_classic/confetti_ball.png b/public/images/emoji/google_classic/confetti_ball.png
new file mode 100644
index 00000000000..c6afa366acb
Binary files /dev/null and b/public/images/emoji/google_classic/confetti_ball.png differ
diff --git a/public/images/emoji/google_classic/confounded.png b/public/images/emoji/google_classic/confounded.png
new file mode 100644
index 00000000000..1b55bad1719
Binary files /dev/null and b/public/images/emoji/google_classic/confounded.png differ
diff --git a/public/images/emoji/google_classic/confused.png b/public/images/emoji/google_classic/confused.png
new file mode 100644
index 00000000000..4d382d61971
Binary files /dev/null and b/public/images/emoji/google_classic/confused.png differ
diff --git a/public/images/emoji/google_classic/congo_brazzaville.png b/public/images/emoji/google_classic/congo_brazzaville.png
new file mode 100644
index 00000000000..218083f194a
Binary files /dev/null and b/public/images/emoji/google_classic/congo_brazzaville.png differ
diff --git a/public/images/emoji/google_classic/congo_kinshasa.png b/public/images/emoji/google_classic/congo_kinshasa.png
new file mode 100644
index 00000000000..efd94373bc1
Binary files /dev/null and b/public/images/emoji/google_classic/congo_kinshasa.png differ
diff --git a/public/images/emoji/google_classic/congratulations.png b/public/images/emoji/google_classic/congratulations.png
new file mode 100644
index 00000000000..9e5ab9c4fbf
Binary files /dev/null and b/public/images/emoji/google_classic/congratulations.png differ
diff --git a/public/images/emoji/google_classic/construction.png b/public/images/emoji/google_classic/construction.png
new file mode 100644
index 00000000000..3b53d874382
Binary files /dev/null and b/public/images/emoji/google_classic/construction.png differ
diff --git a/public/images/emoji/google_classic/construction_site.png b/public/images/emoji/google_classic/construction_site.png
new file mode 100644
index 00000000000..78e30b4b27a
Binary files /dev/null and b/public/images/emoji/google_classic/construction_site.png differ
diff --git a/public/images/emoji/google_classic/construction_worker.png b/public/images/emoji/google_classic/construction_worker.png
new file mode 100644
index 00000000000..4888f08a477
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker.png differ
diff --git a/public/images/emoji/google_classic/construction_worker/2.png b/public/images/emoji/google_classic/construction_worker/2.png
new file mode 100644
index 00000000000..9e3c1b1f28c
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker/2.png differ
diff --git a/public/images/emoji/google_classic/construction_worker/3.png b/public/images/emoji/google_classic/construction_worker/3.png
new file mode 100644
index 00000000000..4fd2695e689
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker/3.png differ
diff --git a/public/images/emoji/google_classic/construction_worker/4.png b/public/images/emoji/google_classic/construction_worker/4.png
new file mode 100644
index 00000000000..9daac80392e
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker/4.png differ
diff --git a/public/images/emoji/google_classic/construction_worker/5.png b/public/images/emoji/google_classic/construction_worker/5.png
new file mode 100644
index 00000000000..37dc2e402d8
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker/5.png differ
diff --git a/public/images/emoji/google_classic/construction_worker/6.png b/public/images/emoji/google_classic/construction_worker/6.png
new file mode 100644
index 00000000000..bd99ffe1eb7
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker/6.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_man.png b/public/images/emoji/google_classic/construction_worker_man.png
new file mode 100644
index 00000000000..4888f08a477
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_man.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_man/2.png b/public/images/emoji/google_classic/construction_worker_man/2.png
new file mode 100644
index 00000000000..9e3c1b1f28c
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_man/2.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_man/3.png b/public/images/emoji/google_classic/construction_worker_man/3.png
new file mode 100644
index 00000000000..4fd2695e689
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_man/3.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_man/4.png b/public/images/emoji/google_classic/construction_worker_man/4.png
new file mode 100644
index 00000000000..9daac80392e
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_man/4.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_man/5.png b/public/images/emoji/google_classic/construction_worker_man/5.png
new file mode 100644
index 00000000000..37dc2e402d8
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_man/5.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_man/6.png b/public/images/emoji/google_classic/construction_worker_man/6.png
new file mode 100644
index 00000000000..bd99ffe1eb7
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_man/6.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_woman.png b/public/images/emoji/google_classic/construction_worker_woman.png
new file mode 100644
index 00000000000..de0494bfbe7
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_woman.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_woman/2.png b/public/images/emoji/google_classic/construction_worker_woman/2.png
new file mode 100644
index 00000000000..7da6df63c43
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_woman/3.png b/public/images/emoji/google_classic/construction_worker_woman/3.png
new file mode 100644
index 00000000000..fc7a1fad47a
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_woman/4.png b/public/images/emoji/google_classic/construction_worker_woman/4.png
new file mode 100644
index 00000000000..0931cb04cff
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_woman/5.png b/public/images/emoji/google_classic/construction_worker_woman/5.png
new file mode 100644
index 00000000000..5f18c011f01
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/google_classic/construction_worker_woman/6.png b/public/images/emoji/google_classic/construction_worker_woman/6.png
new file mode 100644
index 00000000000..031a0084503
Binary files /dev/null and b/public/images/emoji/google_classic/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/google_classic/control_knobs.png b/public/images/emoji/google_classic/control_knobs.png
new file mode 100644
index 00000000000..8b5f9176649
Binary files /dev/null and b/public/images/emoji/google_classic/control_knobs.png differ
diff --git a/public/images/emoji/google_classic/convenience_store.png b/public/images/emoji/google_classic/convenience_store.png
new file mode 100644
index 00000000000..20a2659bed3
Binary files /dev/null and b/public/images/emoji/google_classic/convenience_store.png differ
diff --git a/public/images/emoji/google_classic/cook_islands.png b/public/images/emoji/google_classic/cook_islands.png
new file mode 100644
index 00000000000..44710837e30
Binary files /dev/null and b/public/images/emoji/google_classic/cook_islands.png differ
diff --git a/public/images/emoji/google_classic/cookie.png b/public/images/emoji/google_classic/cookie.png
new file mode 100644
index 00000000000..d7699382b0f
Binary files /dev/null and b/public/images/emoji/google_classic/cookie.png differ
diff --git a/public/images/emoji/google_classic/cool.png b/public/images/emoji/google_classic/cool.png
new file mode 100644
index 00000000000..edb2e1a4fbb
Binary files /dev/null and b/public/images/emoji/google_classic/cool.png differ
diff --git a/public/images/emoji/google_classic/cop.png b/public/images/emoji/google_classic/cop.png
new file mode 100644
index 00000000000..5705d19c157
Binary files /dev/null and b/public/images/emoji/google_classic/cop.png differ
diff --git a/public/images/emoji/google_classic/cop/2.png b/public/images/emoji/google_classic/cop/2.png
new file mode 100644
index 00000000000..bf89834ff36
Binary files /dev/null and b/public/images/emoji/google_classic/cop/2.png differ
diff --git a/public/images/emoji/google_classic/cop/3.png b/public/images/emoji/google_classic/cop/3.png
new file mode 100644
index 00000000000..0deed50038d
Binary files /dev/null and b/public/images/emoji/google_classic/cop/3.png differ
diff --git a/public/images/emoji/google_classic/cop/4.png b/public/images/emoji/google_classic/cop/4.png
new file mode 100644
index 00000000000..86314c1925b
Binary files /dev/null and b/public/images/emoji/google_classic/cop/4.png differ
diff --git a/public/images/emoji/google_classic/cop/5.png b/public/images/emoji/google_classic/cop/5.png
new file mode 100644
index 00000000000..0cc03cf5a65
Binary files /dev/null and b/public/images/emoji/google_classic/cop/5.png differ
diff --git a/public/images/emoji/google_classic/cop/6.png b/public/images/emoji/google_classic/cop/6.png
new file mode 100644
index 00000000000..1f65e850074
Binary files /dev/null and b/public/images/emoji/google_classic/cop/6.png differ
diff --git a/public/images/emoji/google_classic/copyright.png b/public/images/emoji/google_classic/copyright.png
new file mode 100644
index 00000000000..68d8f2a6b65
Binary files /dev/null and b/public/images/emoji/google_classic/copyright.png differ
diff --git a/public/images/emoji/google_classic/corn.png b/public/images/emoji/google_classic/corn.png
new file mode 100644
index 00000000000..cb4010c5304
Binary files /dev/null and b/public/images/emoji/google_classic/corn.png differ
diff --git a/public/images/emoji/google_classic/costa_rica.png b/public/images/emoji/google_classic/costa_rica.png
new file mode 100644
index 00000000000..56a1fa8da6f
Binary files /dev/null and b/public/images/emoji/google_classic/costa_rica.png differ
diff --git a/public/images/emoji/google_classic/cote_divoire.png b/public/images/emoji/google_classic/cote_divoire.png
new file mode 100644
index 00000000000..a78399a14cb
Binary files /dev/null and b/public/images/emoji/google_classic/cote_divoire.png differ
diff --git a/public/images/emoji/google_classic/couch.png b/public/images/emoji/google_classic/couch.png
new file mode 100644
index 00000000000..c74cf74d748
Binary files /dev/null and b/public/images/emoji/google_classic/couch.png differ
diff --git a/public/images/emoji/google_classic/couch_and_lamp.png b/public/images/emoji/google_classic/couch_and_lamp.png
new file mode 100644
index 00000000000..c74cf74d748
Binary files /dev/null and b/public/images/emoji/google_classic/couch_and_lamp.png differ
diff --git a/public/images/emoji/google_classic/couple.png b/public/images/emoji/google_classic/couple.png
new file mode 100644
index 00000000000..7708bf8430a
Binary files /dev/null and b/public/images/emoji/google_classic/couple.png differ
diff --git a/public/images/emoji/google_classic/couple_with_heart.png b/public/images/emoji/google_classic/couple_with_heart.png
new file mode 100644
index 00000000000..731e413a63b
Binary files /dev/null and b/public/images/emoji/google_classic/couple_with_heart.png differ
diff --git a/public/images/emoji/google_classic/couple_with_heart_man_man.png b/public/images/emoji/google_classic/couple_with_heart_man_man.png
new file mode 100644
index 00000000000..ca94117982f
Binary files /dev/null and b/public/images/emoji/google_classic/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/google_classic/couple_with_heart_woman_man.png b/public/images/emoji/google_classic/couple_with_heart_woman_man.png
new file mode 100644
index 00000000000..731e413a63b
Binary files /dev/null and b/public/images/emoji/google_classic/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/google_classic/couple_with_heart_woman_woman.png b/public/images/emoji/google_classic/couple_with_heart_woman_woman.png
new file mode 100644
index 00000000000..d8fb5100d68
Binary files /dev/null and b/public/images/emoji/google_classic/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/google_classic/couplekiss.png b/public/images/emoji/google_classic/couplekiss.png
new file mode 100644
index 00000000000..f4c6a502da5
Binary files /dev/null and b/public/images/emoji/google_classic/couplekiss.png differ
diff --git a/public/images/emoji/google_classic/couplekiss_man_man.png b/public/images/emoji/google_classic/couplekiss_man_man.png
new file mode 100644
index 00000000000..b0c3a0b62e6
Binary files /dev/null and b/public/images/emoji/google_classic/couplekiss_man_man.png differ
diff --git a/public/images/emoji/google_classic/couplekiss_man_woman.png b/public/images/emoji/google_classic/couplekiss_man_woman.png
new file mode 100644
index 00000000000..f4c6a502da5
Binary files /dev/null and b/public/images/emoji/google_classic/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/google_classic/couplekiss_woman_woman.png b/public/images/emoji/google_classic/couplekiss_woman_woman.png
new file mode 100644
index 00000000000..c5b25dd6438
Binary files /dev/null and b/public/images/emoji/google_classic/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/google_classic/cow.png b/public/images/emoji/google_classic/cow.png
new file mode 100644
index 00000000000..cdf13217866
Binary files /dev/null and b/public/images/emoji/google_classic/cow.png differ
diff --git a/public/images/emoji/google_classic/cow2.png b/public/images/emoji/google_classic/cow2.png
new file mode 100644
index 00000000000..996889ffdd4
Binary files /dev/null and b/public/images/emoji/google_classic/cow2.png differ
diff --git a/public/images/emoji/google_classic/cowboy_hat_face.png b/public/images/emoji/google_classic/cowboy_hat_face.png
new file mode 100644
index 00000000000..42b4563b99a
Binary files /dev/null and b/public/images/emoji/google_classic/cowboy_hat_face.png differ
diff --git a/public/images/emoji/google_classic/crab.png b/public/images/emoji/google_classic/crab.png
new file mode 100644
index 00000000000..57e06b8faad
Binary files /dev/null and b/public/images/emoji/google_classic/crab.png differ
diff --git a/public/images/emoji/google_classic/crayon.png b/public/images/emoji/google_classic/crayon.png
new file mode 100644
index 00000000000..0ef86da10fb
Binary files /dev/null and b/public/images/emoji/google_classic/crayon.png differ
diff --git a/public/images/emoji/google_classic/crazy_face.png b/public/images/emoji/google_classic/crazy_face.png
new file mode 100644
index 00000000000..0aaa1cf7651
Binary files /dev/null and b/public/images/emoji/google_classic/crazy_face.png differ
diff --git a/public/images/emoji/google_classic/credit_card.png b/public/images/emoji/google_classic/credit_card.png
new file mode 100644
index 00000000000..8c694147d8e
Binary files /dev/null and b/public/images/emoji/google_classic/credit_card.png differ
diff --git a/public/images/emoji/google_classic/crescent_moon.png b/public/images/emoji/google_classic/crescent_moon.png
new file mode 100644
index 00000000000..780a07cbc7f
Binary files /dev/null and b/public/images/emoji/google_classic/crescent_moon.png differ
diff --git a/public/images/emoji/google_classic/cricket.png b/public/images/emoji/google_classic/cricket.png
new file mode 100644
index 00000000000..a6bbc03a90c
Binary files /dev/null and b/public/images/emoji/google_classic/cricket.png differ
diff --git a/public/images/emoji/google_classic/cricket_bat_and_ball.png b/public/images/emoji/google_classic/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..a6bbc03a90c
Binary files /dev/null and b/public/images/emoji/google_classic/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/google_classic/cricket_bat_ball.png b/public/images/emoji/google_classic/cricket_bat_ball.png
new file mode 100644
index 00000000000..a6bbc03a90c
Binary files /dev/null and b/public/images/emoji/google_classic/cricket_bat_ball.png differ
diff --git a/public/images/emoji/google_classic/croatia.png b/public/images/emoji/google_classic/croatia.png
new file mode 100644
index 00000000000..81fad64f074
Binary files /dev/null and b/public/images/emoji/google_classic/croatia.png differ
diff --git a/public/images/emoji/google_classic/crocodile.png b/public/images/emoji/google_classic/crocodile.png
new file mode 100644
index 00000000000..94e0504c433
Binary files /dev/null and b/public/images/emoji/google_classic/crocodile.png differ
diff --git a/public/images/emoji/google_classic/croissant.png b/public/images/emoji/google_classic/croissant.png
new file mode 100644
index 00000000000..1f7765a7ab5
Binary files /dev/null and b/public/images/emoji/google_classic/croissant.png differ
diff --git a/public/images/emoji/google_classic/cross.png b/public/images/emoji/google_classic/cross.png
new file mode 100644
index 00000000000..52d188499f9
Binary files /dev/null and b/public/images/emoji/google_classic/cross.png differ
diff --git a/public/images/emoji/google_classic/crossed_fingers.png b/public/images/emoji/google_classic/crossed_fingers.png
new file mode 100644
index 00000000000..24aab310181
Binary files /dev/null and b/public/images/emoji/google_classic/crossed_fingers.png differ
diff --git a/public/images/emoji/google_classic/crossed_fingers/2.png b/public/images/emoji/google_classic/crossed_fingers/2.png
new file mode 100644
index 00000000000..cd0bf3a8e12
Binary files /dev/null and b/public/images/emoji/google_classic/crossed_fingers/2.png differ
diff --git a/public/images/emoji/google_classic/crossed_fingers/3.png b/public/images/emoji/google_classic/crossed_fingers/3.png
new file mode 100644
index 00000000000..6eb7dfacac2
Binary files /dev/null and b/public/images/emoji/google_classic/crossed_fingers/3.png differ
diff --git a/public/images/emoji/google_classic/crossed_fingers/4.png b/public/images/emoji/google_classic/crossed_fingers/4.png
new file mode 100644
index 00000000000..61f0ea0a6f7
Binary files /dev/null and b/public/images/emoji/google_classic/crossed_fingers/4.png differ
diff --git a/public/images/emoji/google_classic/crossed_fingers/5.png b/public/images/emoji/google_classic/crossed_fingers/5.png
new file mode 100644
index 00000000000..e96eb243813
Binary files /dev/null and b/public/images/emoji/google_classic/crossed_fingers/5.png differ
diff --git a/public/images/emoji/google_classic/crossed_fingers/6.png b/public/images/emoji/google_classic/crossed_fingers/6.png
new file mode 100644
index 00000000000..20d97e0c882
Binary files /dev/null and b/public/images/emoji/google_classic/crossed_fingers/6.png differ
diff --git a/public/images/emoji/google_classic/crossed_flags.png b/public/images/emoji/google_classic/crossed_flags.png
new file mode 100644
index 00000000000..f1ad338c676
Binary files /dev/null and b/public/images/emoji/google_classic/crossed_flags.png differ
diff --git a/public/images/emoji/google_classic/crossed_swords.png b/public/images/emoji/google_classic/crossed_swords.png
new file mode 100644
index 00000000000..97f8e0d9a89
Binary files /dev/null and b/public/images/emoji/google_classic/crossed_swords.png differ
diff --git a/public/images/emoji/google_classic/crown.png b/public/images/emoji/google_classic/crown.png
new file mode 100644
index 00000000000..bb53ee14675
Binary files /dev/null and b/public/images/emoji/google_classic/crown.png differ
diff --git a/public/images/emoji/google_classic/cruise_ship.png b/public/images/emoji/google_classic/cruise_ship.png
new file mode 100644
index 00000000000..b0ce2c2f50a
Binary files /dev/null and b/public/images/emoji/google_classic/cruise_ship.png differ
diff --git a/public/images/emoji/google_classic/cry.png b/public/images/emoji/google_classic/cry.png
new file mode 100644
index 00000000000..995b0476603
Binary files /dev/null and b/public/images/emoji/google_classic/cry.png differ
diff --git a/public/images/emoji/google_classic/crying_cat_face.png b/public/images/emoji/google_classic/crying_cat_face.png
new file mode 100644
index 00000000000..453949b170e
Binary files /dev/null and b/public/images/emoji/google_classic/crying_cat_face.png differ
diff --git a/public/images/emoji/google_classic/crystal_ball.png b/public/images/emoji/google_classic/crystal_ball.png
new file mode 100644
index 00000000000..f8abc41b2ea
Binary files /dev/null and b/public/images/emoji/google_classic/crystal_ball.png differ
diff --git a/public/images/emoji/google_classic/cuba.png b/public/images/emoji/google_classic/cuba.png
new file mode 100644
index 00000000000..7735d78d63e
Binary files /dev/null and b/public/images/emoji/google_classic/cuba.png differ
diff --git a/public/images/emoji/google_classic/cucumber.png b/public/images/emoji/google_classic/cucumber.png
new file mode 100644
index 00000000000..72424829b5a
Binary files /dev/null and b/public/images/emoji/google_classic/cucumber.png differ
diff --git a/public/images/emoji/google_classic/cup_with_straw.png b/public/images/emoji/google_classic/cup_with_straw.png
new file mode 100644
index 00000000000..4b2f313f9b2
Binary files /dev/null and b/public/images/emoji/google_classic/cup_with_straw.png differ
diff --git a/public/images/emoji/google_classic/cupid.png b/public/images/emoji/google_classic/cupid.png
new file mode 100644
index 00000000000..0088a51e62e
Binary files /dev/null and b/public/images/emoji/google_classic/cupid.png differ
diff --git a/public/images/emoji/google_classic/curacao.png b/public/images/emoji/google_classic/curacao.png
new file mode 100644
index 00000000000..d5b9ffd9f42
Binary files /dev/null and b/public/images/emoji/google_classic/curacao.png differ
diff --git a/public/images/emoji/google_classic/curling_stone.png b/public/images/emoji/google_classic/curling_stone.png
new file mode 100644
index 00000000000..09027a2fb2e
Binary files /dev/null and b/public/images/emoji/google_classic/curling_stone.png differ
diff --git a/public/images/emoji/google_classic/curly_loop.png b/public/images/emoji/google_classic/curly_loop.png
new file mode 100644
index 00000000000..bb05a9bbb5b
Binary files /dev/null and b/public/images/emoji/google_classic/curly_loop.png differ
diff --git a/public/images/emoji/google_classic/currency_exchange.png b/public/images/emoji/google_classic/currency_exchange.png
new file mode 100644
index 00000000000..d5e954da512
Binary files /dev/null and b/public/images/emoji/google_classic/currency_exchange.png differ
diff --git a/public/images/emoji/google_classic/curry.png b/public/images/emoji/google_classic/curry.png
new file mode 100644
index 00000000000..85563c8a939
Binary files /dev/null and b/public/images/emoji/google_classic/curry.png differ
diff --git a/public/images/emoji/google_classic/custard.png b/public/images/emoji/google_classic/custard.png
new file mode 100644
index 00000000000..1117f9bc894
Binary files /dev/null and b/public/images/emoji/google_classic/custard.png differ
diff --git a/public/images/emoji/google_classic/customs.png b/public/images/emoji/google_classic/customs.png
new file mode 100644
index 00000000000..8010e736046
Binary files /dev/null and b/public/images/emoji/google_classic/customs.png differ
diff --git a/public/images/emoji/google_classic/cut_of_meat.png b/public/images/emoji/google_classic/cut_of_meat.png
new file mode 100644
index 00000000000..b66d427e099
Binary files /dev/null and b/public/images/emoji/google_classic/cut_of_meat.png differ
diff --git a/public/images/emoji/google_classic/cyclone.png b/public/images/emoji/google_classic/cyclone.png
new file mode 100644
index 00000000000..9707a7d362c
Binary files /dev/null and b/public/images/emoji/google_classic/cyclone.png differ
diff --git a/public/images/emoji/google_classic/cyprus.png b/public/images/emoji/google_classic/cyprus.png
new file mode 100644
index 00000000000..0d653ae4890
Binary files /dev/null and b/public/images/emoji/google_classic/cyprus.png differ
diff --git a/public/images/emoji/google_classic/czech_republic.png b/public/images/emoji/google_classic/czech_republic.png
new file mode 100644
index 00000000000..120fcd9e8b8
Binary files /dev/null and b/public/images/emoji/google_classic/czech_republic.png differ
diff --git a/public/images/emoji/google_classic/dagger.png b/public/images/emoji/google_classic/dagger.png
new file mode 100644
index 00000000000..2500c5cd4d6
Binary files /dev/null and b/public/images/emoji/google_classic/dagger.png differ
diff --git a/public/images/emoji/google_classic/dagger_knife.png b/public/images/emoji/google_classic/dagger_knife.png
new file mode 100644
index 00000000000..2500c5cd4d6
Binary files /dev/null and b/public/images/emoji/google_classic/dagger_knife.png differ
diff --git a/public/images/emoji/google_classic/dancer.png b/public/images/emoji/google_classic/dancer.png
new file mode 100644
index 00000000000..af065d1d4c5
Binary files /dev/null and b/public/images/emoji/google_classic/dancer.png differ
diff --git a/public/images/emoji/google_classic/dancer/2.png b/public/images/emoji/google_classic/dancer/2.png
new file mode 100644
index 00000000000..1b5916009e1
Binary files /dev/null and b/public/images/emoji/google_classic/dancer/2.png differ
diff --git a/public/images/emoji/google_classic/dancer/3.png b/public/images/emoji/google_classic/dancer/3.png
new file mode 100644
index 00000000000..39cce01206e
Binary files /dev/null and b/public/images/emoji/google_classic/dancer/3.png differ
diff --git a/public/images/emoji/google_classic/dancer/4.png b/public/images/emoji/google_classic/dancer/4.png
new file mode 100644
index 00000000000..4bd67d31e90
Binary files /dev/null and b/public/images/emoji/google_classic/dancer/4.png differ
diff --git a/public/images/emoji/google_classic/dancer/5.png b/public/images/emoji/google_classic/dancer/5.png
new file mode 100644
index 00000000000..c42407c505e
Binary files /dev/null and b/public/images/emoji/google_classic/dancer/5.png differ
diff --git a/public/images/emoji/google_classic/dancer/6.png b/public/images/emoji/google_classic/dancer/6.png
new file mode 100644
index 00000000000..91f563a50cc
Binary files /dev/null and b/public/images/emoji/google_classic/dancer/6.png differ
diff --git a/public/images/emoji/google_classic/dancers.png b/public/images/emoji/google_classic/dancers.png
new file mode 100644
index 00000000000..a7c9a1072c8
Binary files /dev/null and b/public/images/emoji/google_classic/dancers.png differ
diff --git a/public/images/emoji/google_classic/dancing_men.png b/public/images/emoji/google_classic/dancing_men.png
new file mode 100644
index 00000000000..44e128f5604
Binary files /dev/null and b/public/images/emoji/google_classic/dancing_men.png differ
diff --git a/public/images/emoji/google_classic/dancing_women.png b/public/images/emoji/google_classic/dancing_women.png
new file mode 100644
index 00000000000..a7c9a1072c8
Binary files /dev/null and b/public/images/emoji/google_classic/dancing_women.png differ
diff --git a/public/images/emoji/google_classic/dango.png b/public/images/emoji/google_classic/dango.png
new file mode 100644
index 00000000000..e5747de1c7b
Binary files /dev/null and b/public/images/emoji/google_classic/dango.png differ
diff --git a/public/images/emoji/google_classic/dark_sunglasses.png b/public/images/emoji/google_classic/dark_sunglasses.png
new file mode 100644
index 00000000000..3ad3db6dc4a
Binary files /dev/null and b/public/images/emoji/google_classic/dark_sunglasses.png differ
diff --git a/public/images/emoji/google_classic/dart.png b/public/images/emoji/google_classic/dart.png
new file mode 100644
index 00000000000..6e706955b1d
Binary files /dev/null and b/public/images/emoji/google_classic/dart.png differ
diff --git a/public/images/emoji/google_classic/dash.png b/public/images/emoji/google_classic/dash.png
new file mode 100644
index 00000000000..55f2eba4687
Binary files /dev/null and b/public/images/emoji/google_classic/dash.png differ
diff --git a/public/images/emoji/google_classic/date.png b/public/images/emoji/google_classic/date.png
new file mode 100644
index 00000000000..0131586e5e4
Binary files /dev/null and b/public/images/emoji/google_classic/date.png differ
diff --git a/public/images/emoji/google_classic/de.png b/public/images/emoji/google_classic/de.png
new file mode 100644
index 00000000000..fac1af4f15b
Binary files /dev/null and b/public/images/emoji/google_classic/de.png differ
diff --git a/public/images/emoji/google_classic/deciduous_tree.png b/public/images/emoji/google_classic/deciduous_tree.png
new file mode 100644
index 00000000000..87b85c98e6d
Binary files /dev/null and b/public/images/emoji/google_classic/deciduous_tree.png differ
diff --git a/public/images/emoji/google_classic/deer.png b/public/images/emoji/google_classic/deer.png
new file mode 100644
index 00000000000..e715d445869
Binary files /dev/null and b/public/images/emoji/google_classic/deer.png differ
diff --git a/public/images/emoji/google_classic/denmark.png b/public/images/emoji/google_classic/denmark.png
new file mode 100644
index 00000000000..21df1b23096
Binary files /dev/null and b/public/images/emoji/google_classic/denmark.png differ
diff --git a/public/images/emoji/google_classic/department_store.png b/public/images/emoji/google_classic/department_store.png
new file mode 100644
index 00000000000..4b95e08e825
Binary files /dev/null and b/public/images/emoji/google_classic/department_store.png differ
diff --git a/public/images/emoji/google_classic/derelict_house.png b/public/images/emoji/google_classic/derelict_house.png
new file mode 100644
index 00000000000..b1d5a7d814e
Binary files /dev/null and b/public/images/emoji/google_classic/derelict_house.png differ
diff --git a/public/images/emoji/google_classic/derelict_house_building.png b/public/images/emoji/google_classic/derelict_house_building.png
new file mode 100644
index 00000000000..b1d5a7d814e
Binary files /dev/null and b/public/images/emoji/google_classic/derelict_house_building.png differ
diff --git a/public/images/emoji/google_classic/desert.png b/public/images/emoji/google_classic/desert.png
new file mode 100644
index 00000000000..4d08770a45c
Binary files /dev/null and b/public/images/emoji/google_classic/desert.png differ
diff --git a/public/images/emoji/google_classic/desert_island.png b/public/images/emoji/google_classic/desert_island.png
new file mode 100644
index 00000000000..33b1d3883cf
Binary files /dev/null and b/public/images/emoji/google_classic/desert_island.png differ
diff --git a/public/images/emoji/google_classic/desktop.png b/public/images/emoji/google_classic/desktop.png
new file mode 100644
index 00000000000..89b4ce5664f
Binary files /dev/null and b/public/images/emoji/google_classic/desktop.png differ
diff --git a/public/images/emoji/google_classic/desktop_computer.png b/public/images/emoji/google_classic/desktop_computer.png
new file mode 100644
index 00000000000..89b4ce5664f
Binary files /dev/null and b/public/images/emoji/google_classic/desktop_computer.png differ
diff --git a/public/images/emoji/google_classic/diamond_shape_with_a_dot_inside.png b/public/images/emoji/google_classic/diamond_shape_with_a_dot_inside.png
new file mode 100644
index 00000000000..83439229544
Binary files /dev/null and b/public/images/emoji/google_classic/diamond_shape_with_a_dot_inside.png differ
diff --git a/public/images/emoji/google_classic/diamonds.png b/public/images/emoji/google_classic/diamonds.png
new file mode 100644
index 00000000000..5e706802de3
Binary files /dev/null and b/public/images/emoji/google_classic/diamonds.png differ
diff --git a/public/images/emoji/google_classic/diego_garcia.png b/public/images/emoji/google_classic/diego_garcia.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/diego_garcia.png differ
diff --git a/public/images/emoji/google_classic/disappointed.png b/public/images/emoji/google_classic/disappointed.png
new file mode 100644
index 00000000000..ec08ac2e397
Binary files /dev/null and b/public/images/emoji/google_classic/disappointed.png differ
diff --git a/public/images/emoji/google_classic/disappointed_relieved.png b/public/images/emoji/google_classic/disappointed_relieved.png
new file mode 100644
index 00000000000..e492b2339d1
Binary files /dev/null and b/public/images/emoji/google_classic/disappointed_relieved.png differ
diff --git a/public/images/emoji/google_classic/dividers.png b/public/images/emoji/google_classic/dividers.png
new file mode 100644
index 00000000000..62dea0dd66d
Binary files /dev/null and b/public/images/emoji/google_classic/dividers.png differ
diff --git a/public/images/emoji/google_classic/dizzy.png b/public/images/emoji/google_classic/dizzy.png
new file mode 100644
index 00000000000..8e869e9cef5
Binary files /dev/null and b/public/images/emoji/google_classic/dizzy.png differ
diff --git a/public/images/emoji/google_classic/dizzy_face.png b/public/images/emoji/google_classic/dizzy_face.png
new file mode 100644
index 00000000000..ccf14a1e775
Binary files /dev/null and b/public/images/emoji/google_classic/dizzy_face.png differ
diff --git a/public/images/emoji/google_classic/djibouti.png b/public/images/emoji/google_classic/djibouti.png
new file mode 100644
index 00000000000..de7384e8a12
Binary files /dev/null and b/public/images/emoji/google_classic/djibouti.png differ
diff --git a/public/images/emoji/google_classic/do_not_litter.png b/public/images/emoji/google_classic/do_not_litter.png
new file mode 100644
index 00000000000..301e4889663
Binary files /dev/null and b/public/images/emoji/google_classic/do_not_litter.png differ
diff --git a/public/images/emoji/google_classic/dog.png b/public/images/emoji/google_classic/dog.png
new file mode 100644
index 00000000000..4245e1dca6c
Binary files /dev/null and b/public/images/emoji/google_classic/dog.png differ
diff --git a/public/images/emoji/google_classic/dog2.png b/public/images/emoji/google_classic/dog2.png
new file mode 100644
index 00000000000..7db40e2f52e
Binary files /dev/null and b/public/images/emoji/google_classic/dog2.png differ
diff --git a/public/images/emoji/google_classic/dollar.png b/public/images/emoji/google_classic/dollar.png
new file mode 100644
index 00000000000..f97db471285
Binary files /dev/null and b/public/images/emoji/google_classic/dollar.png differ
diff --git a/public/images/emoji/google_classic/dolls.png b/public/images/emoji/google_classic/dolls.png
new file mode 100644
index 00000000000..a06aadbfbd0
Binary files /dev/null and b/public/images/emoji/google_classic/dolls.png differ
diff --git a/public/images/emoji/google_classic/dolphin.png b/public/images/emoji/google_classic/dolphin.png
new file mode 100644
index 00000000000..dc7a84f5b74
Binary files /dev/null and b/public/images/emoji/google_classic/dolphin.png differ
diff --git a/public/images/emoji/google_classic/dominica.png b/public/images/emoji/google_classic/dominica.png
new file mode 100644
index 00000000000..99321218f98
Binary files /dev/null and b/public/images/emoji/google_classic/dominica.png differ
diff --git a/public/images/emoji/google_classic/dominican_republic.png b/public/images/emoji/google_classic/dominican_republic.png
new file mode 100644
index 00000000000..2312ec96ece
Binary files /dev/null and b/public/images/emoji/google_classic/dominican_republic.png differ
diff --git a/public/images/emoji/google_classic/door.png b/public/images/emoji/google_classic/door.png
new file mode 100644
index 00000000000..e7f6f891eb9
Binary files /dev/null and b/public/images/emoji/google_classic/door.png differ
diff --git a/public/images/emoji/google_classic/double_vertical_bar.png b/public/images/emoji/google_classic/double_vertical_bar.png
new file mode 100644
index 00000000000..1be5733ff4e
Binary files /dev/null and b/public/images/emoji/google_classic/double_vertical_bar.png differ
diff --git a/public/images/emoji/google_classic/doughnut.png b/public/images/emoji/google_classic/doughnut.png
new file mode 100644
index 00000000000..e7ce32abfbd
Binary files /dev/null and b/public/images/emoji/google_classic/doughnut.png differ
diff --git a/public/images/emoji/google_classic/dove.png b/public/images/emoji/google_classic/dove.png
new file mode 100644
index 00000000000..0800e98fc47
Binary files /dev/null and b/public/images/emoji/google_classic/dove.png differ
diff --git a/public/images/emoji/google_classic/dove_of_peace.png b/public/images/emoji/google_classic/dove_of_peace.png
new file mode 100644
index 00000000000..0800e98fc47
Binary files /dev/null and b/public/images/emoji/google_classic/dove_of_peace.png differ
diff --git a/public/images/emoji/google_classic/dragon.png b/public/images/emoji/google_classic/dragon.png
new file mode 100644
index 00000000000..34538757f41
Binary files /dev/null and b/public/images/emoji/google_classic/dragon.png differ
diff --git a/public/images/emoji/google_classic/dragon_face.png b/public/images/emoji/google_classic/dragon_face.png
new file mode 100644
index 00000000000..df3d493b024
Binary files /dev/null and b/public/images/emoji/google_classic/dragon_face.png differ
diff --git a/public/images/emoji/google_classic/dress.png b/public/images/emoji/google_classic/dress.png
new file mode 100644
index 00000000000..7417f2a5297
Binary files /dev/null and b/public/images/emoji/google_classic/dress.png differ
diff --git a/public/images/emoji/google_classic/dromedary_camel.png b/public/images/emoji/google_classic/dromedary_camel.png
new file mode 100644
index 00000000000..22c3919b6ed
Binary files /dev/null and b/public/images/emoji/google_classic/dromedary_camel.png differ
diff --git a/public/images/emoji/google_classic/drooling_face.png b/public/images/emoji/google_classic/drooling_face.png
new file mode 100644
index 00000000000..71fb591150f
Binary files /dev/null and b/public/images/emoji/google_classic/drooling_face.png differ
diff --git a/public/images/emoji/google_classic/droplet.png b/public/images/emoji/google_classic/droplet.png
new file mode 100644
index 00000000000..c4802b95791
Binary files /dev/null and b/public/images/emoji/google_classic/droplet.png differ
diff --git a/public/images/emoji/google_classic/drum.png b/public/images/emoji/google_classic/drum.png
new file mode 100644
index 00000000000..6f26fb982a1
Binary files /dev/null and b/public/images/emoji/google_classic/drum.png differ
diff --git a/public/images/emoji/google_classic/duck.png b/public/images/emoji/google_classic/duck.png
new file mode 100644
index 00000000000..c1d7d01af03
Binary files /dev/null and b/public/images/emoji/google_classic/duck.png differ
diff --git a/public/images/emoji/google_classic/dumpling.png b/public/images/emoji/google_classic/dumpling.png
new file mode 100644
index 00000000000..489a779bf69
Binary files /dev/null and b/public/images/emoji/google_classic/dumpling.png differ
diff --git a/public/images/emoji/google_classic/dvd.png b/public/images/emoji/google_classic/dvd.png
new file mode 100644
index 00000000000..26a93b845f6
Binary files /dev/null and b/public/images/emoji/google_classic/dvd.png differ
diff --git a/public/images/emoji/google_classic/e-mail.png b/public/images/emoji/google_classic/e-mail.png
new file mode 100644
index 00000000000..da007e47b83
Binary files /dev/null and b/public/images/emoji/google_classic/e-mail.png differ
diff --git a/public/images/emoji/google_classic/eagle.png b/public/images/emoji/google_classic/eagle.png
new file mode 100644
index 00000000000..c7e34409fe5
Binary files /dev/null and b/public/images/emoji/google_classic/eagle.png differ
diff --git a/public/images/emoji/google_classic/ear.png b/public/images/emoji/google_classic/ear.png
new file mode 100644
index 00000000000..3e3b72f7c59
Binary files /dev/null and b/public/images/emoji/google_classic/ear.png differ
diff --git a/public/images/emoji/google_classic/ear/2.png b/public/images/emoji/google_classic/ear/2.png
new file mode 100644
index 00000000000..73d5e185ac4
Binary files /dev/null and b/public/images/emoji/google_classic/ear/2.png differ
diff --git a/public/images/emoji/google_classic/ear/3.png b/public/images/emoji/google_classic/ear/3.png
new file mode 100644
index 00000000000..ed650a1835f
Binary files /dev/null and b/public/images/emoji/google_classic/ear/3.png differ
diff --git a/public/images/emoji/google_classic/ear/4.png b/public/images/emoji/google_classic/ear/4.png
new file mode 100644
index 00000000000..c36a528289c
Binary files /dev/null and b/public/images/emoji/google_classic/ear/4.png differ
diff --git a/public/images/emoji/google_classic/ear/5.png b/public/images/emoji/google_classic/ear/5.png
new file mode 100644
index 00000000000..b7842a0f998
Binary files /dev/null and b/public/images/emoji/google_classic/ear/5.png differ
diff --git a/public/images/emoji/google_classic/ear/6.png b/public/images/emoji/google_classic/ear/6.png
new file mode 100644
index 00000000000..692ee926ae9
Binary files /dev/null and b/public/images/emoji/google_classic/ear/6.png differ
diff --git a/public/images/emoji/google_classic/ear_of_rice.png b/public/images/emoji/google_classic/ear_of_rice.png
new file mode 100644
index 00000000000..57f2375a4dc
Binary files /dev/null and b/public/images/emoji/google_classic/ear_of_rice.png differ
diff --git a/public/images/emoji/google_classic/earth_africa.png b/public/images/emoji/google_classic/earth_africa.png
new file mode 100644
index 00000000000..0bc15d9d9e0
Binary files /dev/null and b/public/images/emoji/google_classic/earth_africa.png differ
diff --git a/public/images/emoji/google_classic/earth_americas.png b/public/images/emoji/google_classic/earth_americas.png
new file mode 100644
index 00000000000..438db709e94
Binary files /dev/null and b/public/images/emoji/google_classic/earth_americas.png differ
diff --git a/public/images/emoji/google_classic/earth_asia.png b/public/images/emoji/google_classic/earth_asia.png
new file mode 100644
index 00000000000..906d0ebd44f
Binary files /dev/null and b/public/images/emoji/google_classic/earth_asia.png differ
diff --git a/public/images/emoji/google_classic/ecuador.png b/public/images/emoji/google_classic/ecuador.png
new file mode 100644
index 00000000000..48fb4c34420
Binary files /dev/null and b/public/images/emoji/google_classic/ecuador.png differ
diff --git a/public/images/emoji/google_classic/egg.png b/public/images/emoji/google_classic/egg.png
new file mode 100644
index 00000000000..a3bebbb91de
Binary files /dev/null and b/public/images/emoji/google_classic/egg.png differ
diff --git a/public/images/emoji/google_classic/eggplant.png b/public/images/emoji/google_classic/eggplant.png
new file mode 100644
index 00000000000..b874c4df3b5
Binary files /dev/null and b/public/images/emoji/google_classic/eggplant.png differ
diff --git a/public/images/emoji/google_classic/egypt.png b/public/images/emoji/google_classic/egypt.png
new file mode 100644
index 00000000000..5aa3ee75d72
Binary files /dev/null and b/public/images/emoji/google_classic/egypt.png differ
diff --git a/public/images/emoji/google_classic/eight.png b/public/images/emoji/google_classic/eight.png
new file mode 100644
index 00000000000..c60157ca25a
Binary files /dev/null and b/public/images/emoji/google_classic/eight.png differ
diff --git a/public/images/emoji/google_classic/eight_pointed_black_star.png b/public/images/emoji/google_classic/eight_pointed_black_star.png
new file mode 100644
index 00000000000..bec12ec208a
Binary files /dev/null and b/public/images/emoji/google_classic/eight_pointed_black_star.png differ
diff --git a/public/images/emoji/google_classic/eight_spoked_asterisk.png b/public/images/emoji/google_classic/eight_spoked_asterisk.png
new file mode 100644
index 00000000000..85fdfd575b2
Binary files /dev/null and b/public/images/emoji/google_classic/eight_spoked_asterisk.png differ
diff --git a/public/images/emoji/google_classic/el_salvador.png b/public/images/emoji/google_classic/el_salvador.png
new file mode 100644
index 00000000000..44e4aad9860
Binary files /dev/null and b/public/images/emoji/google_classic/el_salvador.png differ
diff --git a/public/images/emoji/google_classic/electric_plug.png b/public/images/emoji/google_classic/electric_plug.png
new file mode 100644
index 00000000000..4ded6719071
Binary files /dev/null and b/public/images/emoji/google_classic/electric_plug.png differ
diff --git a/public/images/emoji/google_classic/elephant.png b/public/images/emoji/google_classic/elephant.png
new file mode 100644
index 00000000000..e4dd62f7b90
Binary files /dev/null and b/public/images/emoji/google_classic/elephant.png differ
diff --git a/public/images/emoji/google_classic/elf.png b/public/images/emoji/google_classic/elf.png
new file mode 100644
index 00000000000..f8b6dd873e2
Binary files /dev/null and b/public/images/emoji/google_classic/elf.png differ
diff --git a/public/images/emoji/google_classic/elf/2.png b/public/images/emoji/google_classic/elf/2.png
new file mode 100644
index 00000000000..15984024f21
Binary files /dev/null and b/public/images/emoji/google_classic/elf/2.png differ
diff --git a/public/images/emoji/google_classic/elf/3.png b/public/images/emoji/google_classic/elf/3.png
new file mode 100644
index 00000000000..4689243a178
Binary files /dev/null and b/public/images/emoji/google_classic/elf/3.png differ
diff --git a/public/images/emoji/google_classic/elf/4.png b/public/images/emoji/google_classic/elf/4.png
new file mode 100644
index 00000000000..861cbf808ca
Binary files /dev/null and b/public/images/emoji/google_classic/elf/4.png differ
diff --git a/public/images/emoji/google_classic/elf/5.png b/public/images/emoji/google_classic/elf/5.png
new file mode 100644
index 00000000000..50748760101
Binary files /dev/null and b/public/images/emoji/google_classic/elf/5.png differ
diff --git a/public/images/emoji/google_classic/elf/6.png b/public/images/emoji/google_classic/elf/6.png
new file mode 100644
index 00000000000..505c908b180
Binary files /dev/null and b/public/images/emoji/google_classic/elf/6.png differ
diff --git a/public/images/emoji/google_classic/email.png b/public/images/emoji/google_classic/email.png
new file mode 100644
index 00000000000..da007e47b83
Binary files /dev/null and b/public/images/emoji/google_classic/email.png differ
diff --git a/public/images/emoji/google_classic/end.png b/public/images/emoji/google_classic/end.png
new file mode 100644
index 00000000000..3f510fab9bd
Binary files /dev/null and b/public/images/emoji/google_classic/end.png differ
diff --git a/public/images/emoji/google_classic/envelope.png b/public/images/emoji/google_classic/envelope.png
new file mode 100644
index 00000000000..da007e47b83
Binary files /dev/null and b/public/images/emoji/google_classic/envelope.png differ
diff --git a/public/images/emoji/google_classic/envelope_with_arrow.png b/public/images/emoji/google_classic/envelope_with_arrow.png
new file mode 100644
index 00000000000..4edfec02739
Binary files /dev/null and b/public/images/emoji/google_classic/envelope_with_arrow.png differ
diff --git a/public/images/emoji/google_classic/equatorial_guinea.png b/public/images/emoji/google_classic/equatorial_guinea.png
new file mode 100644
index 00000000000..5f2c59b90d4
Binary files /dev/null and b/public/images/emoji/google_classic/equatorial_guinea.png differ
diff --git a/public/images/emoji/google_classic/eritrea.png b/public/images/emoji/google_classic/eritrea.png
new file mode 100644
index 00000000000..af862b3fa47
Binary files /dev/null and b/public/images/emoji/google_classic/eritrea.png differ
diff --git a/public/images/emoji/google_classic/es.png b/public/images/emoji/google_classic/es.png
new file mode 100644
index 00000000000..b6b5639ad09
Binary files /dev/null and b/public/images/emoji/google_classic/es.png differ
diff --git a/public/images/emoji/google_classic/estonia.png b/public/images/emoji/google_classic/estonia.png
new file mode 100644
index 00000000000..8ac46b42bc7
Binary files /dev/null and b/public/images/emoji/google_classic/estonia.png differ
diff --git a/public/images/emoji/google_classic/ethiopia.png b/public/images/emoji/google_classic/ethiopia.png
new file mode 100644
index 00000000000..c1ba28d2e10
Binary files /dev/null and b/public/images/emoji/google_classic/ethiopia.png differ
diff --git a/public/images/emoji/google_classic/eu.png b/public/images/emoji/google_classic/eu.png
new file mode 100644
index 00000000000..baf875766cd
Binary files /dev/null and b/public/images/emoji/google_classic/eu.png differ
diff --git a/public/images/emoji/google_classic/euro.png b/public/images/emoji/google_classic/euro.png
new file mode 100644
index 00000000000..ba5430c974d
Binary files /dev/null and b/public/images/emoji/google_classic/euro.png differ
diff --git a/public/images/emoji/google_classic/european_castle.png b/public/images/emoji/google_classic/european_castle.png
new file mode 100644
index 00000000000..d3e76515dd1
Binary files /dev/null and b/public/images/emoji/google_classic/european_castle.png differ
diff --git a/public/images/emoji/google_classic/european_post_office.png b/public/images/emoji/google_classic/european_post_office.png
new file mode 100644
index 00000000000..8572abd27aa
Binary files /dev/null and b/public/images/emoji/google_classic/european_post_office.png differ
diff --git a/public/images/emoji/google_classic/evergreen_tree.png b/public/images/emoji/google_classic/evergreen_tree.png
new file mode 100644
index 00000000000..0487eca6516
Binary files /dev/null and b/public/images/emoji/google_classic/evergreen_tree.png differ
diff --git a/public/images/emoji/google_classic/exclamation.png b/public/images/emoji/google_classic/exclamation.png
new file mode 100644
index 00000000000..2c8d249fd48
Binary files /dev/null and b/public/images/emoji/google_classic/exclamation.png differ
diff --git a/public/images/emoji/google_classic/exploding_head.png b/public/images/emoji/google_classic/exploding_head.png
new file mode 100644
index 00000000000..85532dadc7a
Binary files /dev/null and b/public/images/emoji/google_classic/exploding_head.png differ
diff --git a/public/images/emoji/google_classic/expressionless.png b/public/images/emoji/google_classic/expressionless.png
new file mode 100644
index 00000000000..b3e2fa154df
Binary files /dev/null and b/public/images/emoji/google_classic/expressionless.png differ
diff --git a/public/images/emoji/google_classic/eye.png b/public/images/emoji/google_classic/eye.png
new file mode 100644
index 00000000000..2cf73b566e8
Binary files /dev/null and b/public/images/emoji/google_classic/eye.png differ
diff --git a/public/images/emoji/google_classic/eyeglasses.png b/public/images/emoji/google_classic/eyeglasses.png
new file mode 100644
index 00000000000..a42b7f7a81d
Binary files /dev/null and b/public/images/emoji/google_classic/eyeglasses.png differ
diff --git a/public/images/emoji/google_classic/eyes.png b/public/images/emoji/google_classic/eyes.png
new file mode 100644
index 00000000000..5646259013e
Binary files /dev/null and b/public/images/emoji/google_classic/eyes.png differ
diff --git a/public/images/emoji/google_classic/face_vomiting.png b/public/images/emoji/google_classic/face_vomiting.png
new file mode 100644
index 00000000000..cd7c3d1f2b7
Binary files /dev/null and b/public/images/emoji/google_classic/face_vomiting.png differ
diff --git a/public/images/emoji/google_classic/face_with_hand_over_mouth.png b/public/images/emoji/google_classic/face_with_hand_over_mouth.png
new file mode 100644
index 00000000000..aed8f62e0b0
Binary files /dev/null and b/public/images/emoji/google_classic/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/google_classic/face_with_head_bandage.png b/public/images/emoji/google_classic/face_with_head_bandage.png
new file mode 100644
index 00000000000..d892078bb20
Binary files /dev/null and b/public/images/emoji/google_classic/face_with_head_bandage.png differ
diff --git a/public/images/emoji/google_classic/face_with_monocle.png b/public/images/emoji/google_classic/face_with_monocle.png
new file mode 100644
index 00000000000..c6fbb4481d5
Binary files /dev/null and b/public/images/emoji/google_classic/face_with_monocle.png differ
diff --git a/public/images/emoji/google_classic/face_with_raised_eyebrow.png b/public/images/emoji/google_classic/face_with_raised_eyebrow.png
new file mode 100644
index 00000000000..887f70e3652
Binary files /dev/null and b/public/images/emoji/google_classic/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/google_classic/face_with_rolling_eyes.png b/public/images/emoji/google_classic/face_with_rolling_eyes.png
new file mode 100644
index 00000000000..10153f06a46
Binary files /dev/null and b/public/images/emoji/google_classic/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/google_classic/face_with_symbols_over_mouth.png b/public/images/emoji/google_classic/face_with_symbols_over_mouth.png
new file mode 100644
index 00000000000..84bb9ec9c53
Binary files /dev/null and b/public/images/emoji/google_classic/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/google_classic/face_with_thermometer.png b/public/images/emoji/google_classic/face_with_thermometer.png
new file mode 100644
index 00000000000..3a7ba22f8ea
Binary files /dev/null and b/public/images/emoji/google_classic/face_with_thermometer.png differ
diff --git a/public/images/emoji/google_classic/facepunch.png b/public/images/emoji/google_classic/facepunch.png
new file mode 100644
index 00000000000..f1d24709998
Binary files /dev/null and b/public/images/emoji/google_classic/facepunch.png differ
diff --git a/public/images/emoji/google_classic/facepunch/2.png b/public/images/emoji/google_classic/facepunch/2.png
new file mode 100644
index 00000000000..588d13d528b
Binary files /dev/null and b/public/images/emoji/google_classic/facepunch/2.png differ
diff --git a/public/images/emoji/google_classic/facepunch/3.png b/public/images/emoji/google_classic/facepunch/3.png
new file mode 100644
index 00000000000..70384907f39
Binary files /dev/null and b/public/images/emoji/google_classic/facepunch/3.png differ
diff --git a/public/images/emoji/google_classic/facepunch/4.png b/public/images/emoji/google_classic/facepunch/4.png
new file mode 100644
index 00000000000..04cb1c9ca4d
Binary files /dev/null and b/public/images/emoji/google_classic/facepunch/4.png differ
diff --git a/public/images/emoji/google_classic/facepunch/5.png b/public/images/emoji/google_classic/facepunch/5.png
new file mode 100644
index 00000000000..ddd6f184d24
Binary files /dev/null and b/public/images/emoji/google_classic/facepunch/5.png differ
diff --git a/public/images/emoji/google_classic/facepunch/6.png b/public/images/emoji/google_classic/facepunch/6.png
new file mode 100644
index 00000000000..0a1a2b7c87e
Binary files /dev/null and b/public/images/emoji/google_classic/facepunch/6.png differ
diff --git a/public/images/emoji/google_classic/factory.png b/public/images/emoji/google_classic/factory.png
new file mode 100644
index 00000000000..dea1ecb59c6
Binary files /dev/null and b/public/images/emoji/google_classic/factory.png differ
diff --git a/public/images/emoji/google_classic/fairy.png b/public/images/emoji/google_classic/fairy.png
new file mode 100644
index 00000000000..429938294b2
Binary files /dev/null and b/public/images/emoji/google_classic/fairy.png differ
diff --git a/public/images/emoji/google_classic/fairy/2.png b/public/images/emoji/google_classic/fairy/2.png
new file mode 100644
index 00000000000..91e1de4e5dc
Binary files /dev/null and b/public/images/emoji/google_classic/fairy/2.png differ
diff --git a/public/images/emoji/google_classic/fairy/3.png b/public/images/emoji/google_classic/fairy/3.png
new file mode 100644
index 00000000000..42821806e92
Binary files /dev/null and b/public/images/emoji/google_classic/fairy/3.png differ
diff --git a/public/images/emoji/google_classic/fairy/4.png b/public/images/emoji/google_classic/fairy/4.png
new file mode 100644
index 00000000000..9e8d3adb897
Binary files /dev/null and b/public/images/emoji/google_classic/fairy/4.png differ
diff --git a/public/images/emoji/google_classic/fairy/5.png b/public/images/emoji/google_classic/fairy/5.png
new file mode 100644
index 00000000000..88d190e3926
Binary files /dev/null and b/public/images/emoji/google_classic/fairy/5.png differ
diff --git a/public/images/emoji/google_classic/fairy/6.png b/public/images/emoji/google_classic/fairy/6.png
new file mode 100644
index 00000000000..e6ab8ade743
Binary files /dev/null and b/public/images/emoji/google_classic/fairy/6.png differ
diff --git a/public/images/emoji/google_classic/falkland_islands.png b/public/images/emoji/google_classic/falkland_islands.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/falkland_islands.png differ
diff --git a/public/images/emoji/google_classic/fallen_leaf.png b/public/images/emoji/google_classic/fallen_leaf.png
new file mode 100644
index 00000000000..be64a406861
Binary files /dev/null and b/public/images/emoji/google_classic/fallen_leaf.png differ
diff --git a/public/images/emoji/google_classic/family.png b/public/images/emoji/google_classic/family.png
new file mode 100644
index 00000000000..72f8f605a29
Binary files /dev/null and b/public/images/emoji/google_classic/family.png differ
diff --git a/public/images/emoji/google_classic/family_man_boy.png b/public/images/emoji/google_classic/family_man_boy.png
new file mode 100644
index 00000000000..3b03077b43f
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_boy.png differ
diff --git a/public/images/emoji/google_classic/family_man_boy_boy.png b/public/images/emoji/google_classic/family_man_boy_boy.png
new file mode 100644
index 00000000000..b8c72220ce6
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_boy_boy.png differ
diff --git a/public/images/emoji/google_classic/family_man_girl.png b/public/images/emoji/google_classic/family_man_girl.png
new file mode 100644
index 00000000000..7f8497c61ae
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_girl.png differ
diff --git a/public/images/emoji/google_classic/family_man_girl_boy.png b/public/images/emoji/google_classic/family_man_girl_boy.png
new file mode 100644
index 00000000000..4c4dc334ce8
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_girl_boy.png differ
diff --git a/public/images/emoji/google_classic/family_man_girl_girl.png b/public/images/emoji/google_classic/family_man_girl_girl.png
new file mode 100644
index 00000000000..af1048c4b99
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_girl_girl.png differ
diff --git a/public/images/emoji/google_classic/family_man_man_boy.png b/public/images/emoji/google_classic/family_man_man_boy.png
new file mode 100644
index 00000000000..c51367732cc
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_man_boy.png differ
diff --git a/public/images/emoji/google_classic/family_man_man_boy_boy.png b/public/images/emoji/google_classic/family_man_man_boy_boy.png
new file mode 100644
index 00000000000..caf6cf70d3b
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/google_classic/family_man_man_girl.png b/public/images/emoji/google_classic/family_man_man_girl.png
new file mode 100644
index 00000000000..d52960b09de
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_man_girl.png differ
diff --git a/public/images/emoji/google_classic/family_man_man_girl_boy.png b/public/images/emoji/google_classic/family_man_man_girl_boy.png
new file mode 100644
index 00000000000..6325e4bc148
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/google_classic/family_man_man_girl_girl.png b/public/images/emoji/google_classic/family_man_man_girl_girl.png
new file mode 100644
index 00000000000..bfe7c497133
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/google_classic/family_man_woman_boy.png b/public/images/emoji/google_classic/family_man_woman_boy.png
new file mode 100644
index 00000000000..20228725771
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_woman_boy.png differ
diff --git a/public/images/emoji/google_classic/family_man_woman_boy_boy.png b/public/images/emoji/google_classic/family_man_woman_boy_boy.png
new file mode 100644
index 00000000000..0157653ec0a
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/google_classic/family_man_woman_boys.png b/public/images/emoji/google_classic/family_man_woman_boys.png
new file mode 100644
index 00000000000..0157653ec0a
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_woman_boys.png differ
diff --git a/public/images/emoji/google_classic/family_man_woman_girl.png b/public/images/emoji/google_classic/family_man_woman_girl.png
new file mode 100644
index 00000000000..a61f473a958
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_woman_girl.png differ
diff --git a/public/images/emoji/google_classic/family_man_woman_girl_boy.png b/public/images/emoji/google_classic/family_man_woman_girl_boy.png
new file mode 100644
index 00000000000..72f8f605a29
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/google_classic/family_man_woman_girl_girl.png b/public/images/emoji/google_classic/family_man_woman_girl_girl.png
new file mode 100644
index 00000000000..4fb883a0765
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/google_classic/family_man_woman_girls.png b/public/images/emoji/google_classic/family_man_woman_girls.png
new file mode 100644
index 00000000000..4fb883a0765
Binary files /dev/null and b/public/images/emoji/google_classic/family_man_woman_girls.png differ
diff --git a/public/images/emoji/google_classic/family_men_boy.png b/public/images/emoji/google_classic/family_men_boy.png
new file mode 100644
index 00000000000..c51367732cc
Binary files /dev/null and b/public/images/emoji/google_classic/family_men_boy.png differ
diff --git a/public/images/emoji/google_classic/family_men_boys.png b/public/images/emoji/google_classic/family_men_boys.png
new file mode 100644
index 00000000000..caf6cf70d3b
Binary files /dev/null and b/public/images/emoji/google_classic/family_men_boys.png differ
diff --git a/public/images/emoji/google_classic/family_men_girl.png b/public/images/emoji/google_classic/family_men_girl.png
new file mode 100644
index 00000000000..d52960b09de
Binary files /dev/null and b/public/images/emoji/google_classic/family_men_girl.png differ
diff --git a/public/images/emoji/google_classic/family_men_girl_boy.png b/public/images/emoji/google_classic/family_men_girl_boy.png
new file mode 100644
index 00000000000..6325e4bc148
Binary files /dev/null and b/public/images/emoji/google_classic/family_men_girl_boy.png differ
diff --git a/public/images/emoji/google_classic/family_men_girls.png b/public/images/emoji/google_classic/family_men_girls.png
new file mode 100644
index 00000000000..bfe7c497133
Binary files /dev/null and b/public/images/emoji/google_classic/family_men_girls.png differ
diff --git a/public/images/emoji/google_classic/family_woman_boy.png b/public/images/emoji/google_classic/family_woman_boy.png
new file mode 100644
index 00000000000..22780e6f350
Binary files /dev/null and b/public/images/emoji/google_classic/family_woman_boy.png differ
diff --git a/public/images/emoji/google_classic/family_woman_boy_boy.png b/public/images/emoji/google_classic/family_woman_boy_boy.png
new file mode 100644
index 00000000000..09a7c91eb8b
Binary files /dev/null and b/public/images/emoji/google_classic/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/google_classic/family_woman_girl.png b/public/images/emoji/google_classic/family_woman_girl.png
new file mode 100644
index 00000000000..f038a508308
Binary files /dev/null and b/public/images/emoji/google_classic/family_woman_girl.png differ
diff --git a/public/images/emoji/google_classic/family_woman_girl_boy.png b/public/images/emoji/google_classic/family_woman_girl_boy.png
new file mode 100644
index 00000000000..146b5e187d0
Binary files /dev/null and b/public/images/emoji/google_classic/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/google_classic/family_woman_girl_girl.png b/public/images/emoji/google_classic/family_woman_girl_girl.png
new file mode 100644
index 00000000000..2a46193628b
Binary files /dev/null and b/public/images/emoji/google_classic/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/google_classic/family_woman_woman_boy.png b/public/images/emoji/google_classic/family_woman_woman_boy.png
new file mode 100644
index 00000000000..e23e4f890bf
Binary files /dev/null and b/public/images/emoji/google_classic/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/google_classic/family_woman_woman_boy_boy.png b/public/images/emoji/google_classic/family_woman_woman_boy_boy.png
new file mode 100644
index 00000000000..8954240ad26
Binary files /dev/null and b/public/images/emoji/google_classic/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/google_classic/family_woman_woman_girl.png b/public/images/emoji/google_classic/family_woman_woman_girl.png
new file mode 100644
index 00000000000..120e1a1f733
Binary files /dev/null and b/public/images/emoji/google_classic/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/google_classic/family_woman_woman_girl_boy.png b/public/images/emoji/google_classic/family_woman_woman_girl_boy.png
new file mode 100644
index 00000000000..bc585a35611
Binary files /dev/null and b/public/images/emoji/google_classic/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/google_classic/family_woman_woman_girl_girl.png b/public/images/emoji/google_classic/family_woman_woman_girl_girl.png
new file mode 100644
index 00000000000..4c40bb8c6a1
Binary files /dev/null and b/public/images/emoji/google_classic/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/google_classic/family_women_boy.png b/public/images/emoji/google_classic/family_women_boy.png
new file mode 100644
index 00000000000..e23e4f890bf
Binary files /dev/null and b/public/images/emoji/google_classic/family_women_boy.png differ
diff --git a/public/images/emoji/google_classic/family_women_boys.png b/public/images/emoji/google_classic/family_women_boys.png
new file mode 100644
index 00000000000..8954240ad26
Binary files /dev/null and b/public/images/emoji/google_classic/family_women_boys.png differ
diff --git a/public/images/emoji/google_classic/family_women_girl.png b/public/images/emoji/google_classic/family_women_girl.png
new file mode 100644
index 00000000000..120e1a1f733
Binary files /dev/null and b/public/images/emoji/google_classic/family_women_girl.png differ
diff --git a/public/images/emoji/google_classic/family_women_girl_boy.png b/public/images/emoji/google_classic/family_women_girl_boy.png
new file mode 100644
index 00000000000..bc585a35611
Binary files /dev/null and b/public/images/emoji/google_classic/family_women_girl_boy.png differ
diff --git a/public/images/emoji/google_classic/family_women_girls.png b/public/images/emoji/google_classic/family_women_girls.png
new file mode 100644
index 00000000000..4c40bb8c6a1
Binary files /dev/null and b/public/images/emoji/google_classic/family_women_girls.png differ
diff --git a/public/images/emoji/google_classic/faroe_islands.png b/public/images/emoji/google_classic/faroe_islands.png
new file mode 100644
index 00000000000..bf01e7cfe54
Binary files /dev/null and b/public/images/emoji/google_classic/faroe_islands.png differ
diff --git a/public/images/emoji/google_classic/fast_forward.png b/public/images/emoji/google_classic/fast_forward.png
new file mode 100644
index 00000000000..3e7a98a8bf6
Binary files /dev/null and b/public/images/emoji/google_classic/fast_forward.png differ
diff --git a/public/images/emoji/google_classic/fax.png b/public/images/emoji/google_classic/fax.png
new file mode 100644
index 00000000000..ece233348b9
Binary files /dev/null and b/public/images/emoji/google_classic/fax.png differ
diff --git a/public/images/emoji/google_classic/fearful.png b/public/images/emoji/google_classic/fearful.png
new file mode 100644
index 00000000000..47ad29bc3d8
Binary files /dev/null and b/public/images/emoji/google_classic/fearful.png differ
diff --git a/public/images/emoji/google_classic/feet.png b/public/images/emoji/google_classic/feet.png
new file mode 100644
index 00000000000..aec34d338e1
Binary files /dev/null and b/public/images/emoji/google_classic/feet.png differ
diff --git a/public/images/emoji/google_classic/female_couple_with_heart.png b/public/images/emoji/google_classic/female_couple_with_heart.png
new file mode 100644
index 00000000000..d8fb5100d68
Binary files /dev/null and b/public/images/emoji/google_classic/female_couple_with_heart.png differ
diff --git a/public/images/emoji/google_classic/female_couplekiss.png b/public/images/emoji/google_classic/female_couplekiss.png
new file mode 100644
index 00000000000..c5b25dd6438
Binary files /dev/null and b/public/images/emoji/google_classic/female_couplekiss.png differ
diff --git a/public/images/emoji/google_classic/female_detective.png b/public/images/emoji/google_classic/female_detective.png
new file mode 100644
index 00000000000..4289e723cef
Binary files /dev/null and b/public/images/emoji/google_classic/female_detective.png differ
diff --git a/public/images/emoji/google_classic/ferris_wheel.png b/public/images/emoji/google_classic/ferris_wheel.png
new file mode 100644
index 00000000000..642c816e961
Binary files /dev/null and b/public/images/emoji/google_classic/ferris_wheel.png differ
diff --git a/public/images/emoji/google_classic/ferry.png b/public/images/emoji/google_classic/ferry.png
new file mode 100644
index 00000000000..0c420440c85
Binary files /dev/null and b/public/images/emoji/google_classic/ferry.png differ
diff --git a/public/images/emoji/google_classic/field_hockey.png b/public/images/emoji/google_classic/field_hockey.png
new file mode 100644
index 00000000000..117e8174bf2
Binary files /dev/null and b/public/images/emoji/google_classic/field_hockey.png differ
diff --git a/public/images/emoji/google_classic/fiji.png b/public/images/emoji/google_classic/fiji.png
new file mode 100644
index 00000000000..dc60227217f
Binary files /dev/null and b/public/images/emoji/google_classic/fiji.png differ
diff --git a/public/images/emoji/google_classic/file_cabinet.png b/public/images/emoji/google_classic/file_cabinet.png
new file mode 100644
index 00000000000..613fc5b840f
Binary files /dev/null and b/public/images/emoji/google_classic/file_cabinet.png differ
diff --git a/public/images/emoji/google_classic/file_folder.png b/public/images/emoji/google_classic/file_folder.png
new file mode 100644
index 00000000000..5fac9ae16ae
Binary files /dev/null and b/public/images/emoji/google_classic/file_folder.png differ
diff --git a/public/images/emoji/google_classic/film_frames.png b/public/images/emoji/google_classic/film_frames.png
new file mode 100644
index 00000000000..38d1a529ab7
Binary files /dev/null and b/public/images/emoji/google_classic/film_frames.png differ
diff --git a/public/images/emoji/google_classic/film_projector.png b/public/images/emoji/google_classic/film_projector.png
new file mode 100644
index 00000000000..b626d6088c9
Binary files /dev/null and b/public/images/emoji/google_classic/film_projector.png differ
diff --git a/public/images/emoji/google_classic/film_strip.png b/public/images/emoji/google_classic/film_strip.png
new file mode 100644
index 00000000000..38d1a529ab7
Binary files /dev/null and b/public/images/emoji/google_classic/film_strip.png differ
diff --git a/public/images/emoji/google_classic/finland.png b/public/images/emoji/google_classic/finland.png
new file mode 100644
index 00000000000..9a8fe595731
Binary files /dev/null and b/public/images/emoji/google_classic/finland.png differ
diff --git a/public/images/emoji/google_classic/fire.png b/public/images/emoji/google_classic/fire.png
new file mode 100644
index 00000000000..c593b37d090
Binary files /dev/null and b/public/images/emoji/google_classic/fire.png differ
diff --git a/public/images/emoji/google_classic/fire_engine.png b/public/images/emoji/google_classic/fire_engine.png
new file mode 100644
index 00000000000..4cf96e8199c
Binary files /dev/null and b/public/images/emoji/google_classic/fire_engine.png differ
diff --git a/public/images/emoji/google_classic/fireworks.png b/public/images/emoji/google_classic/fireworks.png
new file mode 100644
index 00000000000..85fc93af7e3
Binary files /dev/null and b/public/images/emoji/google_classic/fireworks.png differ
diff --git a/public/images/emoji/google_classic/first_quarter_moon.png b/public/images/emoji/google_classic/first_quarter_moon.png
new file mode 100644
index 00000000000..468d7c19229
Binary files /dev/null and b/public/images/emoji/google_classic/first_quarter_moon.png differ
diff --git a/public/images/emoji/google_classic/first_quarter_moon_with_face.png b/public/images/emoji/google_classic/first_quarter_moon_with_face.png
new file mode 100644
index 00000000000..54da77edb49
Binary files /dev/null and b/public/images/emoji/google_classic/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/google_classic/fish.png b/public/images/emoji/google_classic/fish.png
new file mode 100644
index 00000000000..ae44b8ba203
Binary files /dev/null and b/public/images/emoji/google_classic/fish.png differ
diff --git a/public/images/emoji/google_classic/fish_cake.png b/public/images/emoji/google_classic/fish_cake.png
new file mode 100644
index 00000000000..271f4894c63
Binary files /dev/null and b/public/images/emoji/google_classic/fish_cake.png differ
diff --git a/public/images/emoji/google_classic/fishing_pole_and_fish.png b/public/images/emoji/google_classic/fishing_pole_and_fish.png
new file mode 100644
index 00000000000..3a6f85cb2ac
Binary files /dev/null and b/public/images/emoji/google_classic/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/google_classic/fist.png b/public/images/emoji/google_classic/fist.png
new file mode 100644
index 00000000000..57d88a62c73
Binary files /dev/null and b/public/images/emoji/google_classic/fist.png differ
diff --git a/public/images/emoji/google_classic/fist/2.png b/public/images/emoji/google_classic/fist/2.png
new file mode 100644
index 00000000000..b43096078be
Binary files /dev/null and b/public/images/emoji/google_classic/fist/2.png differ
diff --git a/public/images/emoji/google_classic/fist/3.png b/public/images/emoji/google_classic/fist/3.png
new file mode 100644
index 00000000000..ce7595b35d6
Binary files /dev/null and b/public/images/emoji/google_classic/fist/3.png differ
diff --git a/public/images/emoji/google_classic/fist/4.png b/public/images/emoji/google_classic/fist/4.png
new file mode 100644
index 00000000000..e20fe0cbbbb
Binary files /dev/null and b/public/images/emoji/google_classic/fist/4.png differ
diff --git a/public/images/emoji/google_classic/fist/5.png b/public/images/emoji/google_classic/fist/5.png
new file mode 100644
index 00000000000..b000bc64e10
Binary files /dev/null and b/public/images/emoji/google_classic/fist/5.png differ
diff --git a/public/images/emoji/google_classic/fist/6.png b/public/images/emoji/google_classic/fist/6.png
new file mode 100644
index 00000000000..0873e9a4993
Binary files /dev/null and b/public/images/emoji/google_classic/fist/6.png differ
diff --git a/public/images/emoji/google_classic/fist_left.png b/public/images/emoji/google_classic/fist_left.png
new file mode 100644
index 00000000000..5e02b480650
Binary files /dev/null and b/public/images/emoji/google_classic/fist_left.png differ
diff --git a/public/images/emoji/google_classic/fist_left/2.png b/public/images/emoji/google_classic/fist_left/2.png
new file mode 100644
index 00000000000..5495e986dbc
Binary files /dev/null and b/public/images/emoji/google_classic/fist_left/2.png differ
diff --git a/public/images/emoji/google_classic/fist_left/3.png b/public/images/emoji/google_classic/fist_left/3.png
new file mode 100644
index 00000000000..d9ed67da9ea
Binary files /dev/null and b/public/images/emoji/google_classic/fist_left/3.png differ
diff --git a/public/images/emoji/google_classic/fist_left/4.png b/public/images/emoji/google_classic/fist_left/4.png
new file mode 100644
index 00000000000..09617214735
Binary files /dev/null and b/public/images/emoji/google_classic/fist_left/4.png differ
diff --git a/public/images/emoji/google_classic/fist_left/5.png b/public/images/emoji/google_classic/fist_left/5.png
new file mode 100644
index 00000000000..05901ac2382
Binary files /dev/null and b/public/images/emoji/google_classic/fist_left/5.png differ
diff --git a/public/images/emoji/google_classic/fist_left/6.png b/public/images/emoji/google_classic/fist_left/6.png
new file mode 100644
index 00000000000..2354708eb91
Binary files /dev/null and b/public/images/emoji/google_classic/fist_left/6.png differ
diff --git a/public/images/emoji/google_classic/fist_right.png b/public/images/emoji/google_classic/fist_right.png
new file mode 100644
index 00000000000..e26d1cc7f82
Binary files /dev/null and b/public/images/emoji/google_classic/fist_right.png differ
diff --git a/public/images/emoji/google_classic/fist_right/2.png b/public/images/emoji/google_classic/fist_right/2.png
new file mode 100644
index 00000000000..c56b36f4a49
Binary files /dev/null and b/public/images/emoji/google_classic/fist_right/2.png differ
diff --git a/public/images/emoji/google_classic/fist_right/3.png b/public/images/emoji/google_classic/fist_right/3.png
new file mode 100644
index 00000000000..a0884e6f4d2
Binary files /dev/null and b/public/images/emoji/google_classic/fist_right/3.png differ
diff --git a/public/images/emoji/google_classic/fist_right/4.png b/public/images/emoji/google_classic/fist_right/4.png
new file mode 100644
index 00000000000..9d4dbc02c7a
Binary files /dev/null and b/public/images/emoji/google_classic/fist_right/4.png differ
diff --git a/public/images/emoji/google_classic/fist_right/5.png b/public/images/emoji/google_classic/fist_right/5.png
new file mode 100644
index 00000000000..c20b5ece70d
Binary files /dev/null and b/public/images/emoji/google_classic/fist_right/5.png differ
diff --git a/public/images/emoji/google_classic/fist_right/6.png b/public/images/emoji/google_classic/fist_right/6.png
new file mode 100644
index 00000000000..f524169f364
Binary files /dev/null and b/public/images/emoji/google_classic/fist_right/6.png differ
diff --git a/public/images/emoji/google_classic/five.png b/public/images/emoji/google_classic/five.png
new file mode 100644
index 00000000000..08c5c0dcda8
Binary files /dev/null and b/public/images/emoji/google_classic/five.png differ
diff --git a/public/images/emoji/google_classic/flag_black.png b/public/images/emoji/google_classic/flag_black.png
new file mode 100644
index 00000000000..de072bca626
Binary files /dev/null and b/public/images/emoji/google_classic/flag_black.png differ
diff --git a/public/images/emoji/google_classic/flag_cn.png b/public/images/emoji/google_classic/flag_cn.png
new file mode 100644
index 00000000000..8a4320b72f0
Binary files /dev/null and b/public/images/emoji/google_classic/flag_cn.png differ
diff --git a/public/images/emoji/google_classic/flag_de.png b/public/images/emoji/google_classic/flag_de.png
new file mode 100644
index 00000000000..fac1af4f15b
Binary files /dev/null and b/public/images/emoji/google_classic/flag_de.png differ
diff --git a/public/images/emoji/google_classic/flag_es.png b/public/images/emoji/google_classic/flag_es.png
new file mode 100644
index 00000000000..b6b5639ad09
Binary files /dev/null and b/public/images/emoji/google_classic/flag_es.png differ
diff --git a/public/images/emoji/google_classic/flag_fr.png b/public/images/emoji/google_classic/flag_fr.png
new file mode 100644
index 00000000000..359803de2b2
Binary files /dev/null and b/public/images/emoji/google_classic/flag_fr.png differ
diff --git a/public/images/emoji/google_classic/flag_gb.png b/public/images/emoji/google_classic/flag_gb.png
new file mode 100644
index 00000000000..ee88c3f750f
Binary files /dev/null and b/public/images/emoji/google_classic/flag_gb.png differ
diff --git a/public/images/emoji/google_classic/flag_it.png b/public/images/emoji/google_classic/flag_it.png
new file mode 100644
index 00000000000..af28278edfb
Binary files /dev/null and b/public/images/emoji/google_classic/flag_it.png differ
diff --git a/public/images/emoji/google_classic/flag_jp.png b/public/images/emoji/google_classic/flag_jp.png
new file mode 100644
index 00000000000..7af1ab49ca4
Binary files /dev/null and b/public/images/emoji/google_classic/flag_jp.png differ
diff --git a/public/images/emoji/google_classic/flag_kr.png b/public/images/emoji/google_classic/flag_kr.png
new file mode 100644
index 00000000000..33cac8bdf86
Binary files /dev/null and b/public/images/emoji/google_classic/flag_kr.png differ
diff --git a/public/images/emoji/google_classic/flag_ru.png b/public/images/emoji/google_classic/flag_ru.png
new file mode 100644
index 00000000000..c10fad17daf
Binary files /dev/null and b/public/images/emoji/google_classic/flag_ru.png differ
diff --git a/public/images/emoji/google_classic/flag_us.png b/public/images/emoji/google_classic/flag_us.png
new file mode 100644
index 00000000000..8ba4d5d5381
Binary files /dev/null and b/public/images/emoji/google_classic/flag_us.png differ
diff --git a/public/images/emoji/google_classic/flag_white.png b/public/images/emoji/google_classic/flag_white.png
new file mode 100644
index 00000000000..ce4e23c8c72
Binary files /dev/null and b/public/images/emoji/google_classic/flag_white.png differ
diff --git a/public/images/emoji/google_classic/flags.png b/public/images/emoji/google_classic/flags.png
new file mode 100644
index 00000000000..c1c384d49ed
Binary files /dev/null and b/public/images/emoji/google_classic/flags.png differ
diff --git a/public/images/emoji/google_classic/flame.png b/public/images/emoji/google_classic/flame.png
new file mode 100644
index 00000000000..c593b37d090
Binary files /dev/null and b/public/images/emoji/google_classic/flame.png differ
diff --git a/public/images/emoji/google_classic/flashlight.png b/public/images/emoji/google_classic/flashlight.png
new file mode 100644
index 00000000000..04a48b04d3d
Binary files /dev/null and b/public/images/emoji/google_classic/flashlight.png differ
diff --git a/public/images/emoji/google_classic/fleur-de-lis.png b/public/images/emoji/google_classic/fleur-de-lis.png
new file mode 100644
index 00000000000..cb6333c5d44
Binary files /dev/null and b/public/images/emoji/google_classic/fleur-de-lis.png differ
diff --git a/public/images/emoji/google_classic/fleur_de_lis.png b/public/images/emoji/google_classic/fleur_de_lis.png
new file mode 100644
index 00000000000..cb6333c5d44
Binary files /dev/null and b/public/images/emoji/google_classic/fleur_de_lis.png differ
diff --git a/public/images/emoji/google_classic/flight_arrival.png b/public/images/emoji/google_classic/flight_arrival.png
new file mode 100644
index 00000000000..8e3428aefe2
Binary files /dev/null and b/public/images/emoji/google_classic/flight_arrival.png differ
diff --git a/public/images/emoji/google_classic/flight_departure.png b/public/images/emoji/google_classic/flight_departure.png
new file mode 100644
index 00000000000..d6782594146
Binary files /dev/null and b/public/images/emoji/google_classic/flight_departure.png differ
diff --git a/public/images/emoji/google_classic/floppy_disk.png b/public/images/emoji/google_classic/floppy_disk.png
new file mode 100644
index 00000000000..b8278287520
Binary files /dev/null and b/public/images/emoji/google_classic/floppy_disk.png differ
diff --git a/public/images/emoji/google_classic/flower_playing_cards.png b/public/images/emoji/google_classic/flower_playing_cards.png
new file mode 100644
index 00000000000..a875efa76d4
Binary files /dev/null and b/public/images/emoji/google_classic/flower_playing_cards.png differ
diff --git a/public/images/emoji/google_classic/flushed.png b/public/images/emoji/google_classic/flushed.png
new file mode 100644
index 00000000000..a5d1a69b883
Binary files /dev/null and b/public/images/emoji/google_classic/flushed.png differ
diff --git a/public/images/emoji/google_classic/flying_saucer.png b/public/images/emoji/google_classic/flying_saucer.png
new file mode 100644
index 00000000000..7d5c8628554
Binary files /dev/null and b/public/images/emoji/google_classic/flying_saucer.png differ
diff --git a/public/images/emoji/google_classic/fog.png b/public/images/emoji/google_classic/fog.png
new file mode 100644
index 00000000000..dada1006157
Binary files /dev/null and b/public/images/emoji/google_classic/fog.png differ
diff --git a/public/images/emoji/google_classic/foggy.png b/public/images/emoji/google_classic/foggy.png
new file mode 100644
index 00000000000..61e526bf8dc
Binary files /dev/null and b/public/images/emoji/google_classic/foggy.png differ
diff --git a/public/images/emoji/google_classic/football.png b/public/images/emoji/google_classic/football.png
new file mode 100644
index 00000000000..d7bbeb34905
Binary files /dev/null and b/public/images/emoji/google_classic/football.png differ
diff --git a/public/images/emoji/google_classic/footprints.png b/public/images/emoji/google_classic/footprints.png
new file mode 100644
index 00000000000..aec34d338e1
Binary files /dev/null and b/public/images/emoji/google_classic/footprints.png differ
diff --git a/public/images/emoji/google_classic/fork_and_knife.png b/public/images/emoji/google_classic/fork_and_knife.png
new file mode 100644
index 00000000000..68706930841
Binary files /dev/null and b/public/images/emoji/google_classic/fork_and_knife.png differ
diff --git a/public/images/emoji/google_classic/fork_and_knife_with_plate.png b/public/images/emoji/google_classic/fork_and_knife_with_plate.png
new file mode 100644
index 00000000000..07989f14806
Binary files /dev/null and b/public/images/emoji/google_classic/fork_and_knife_with_plate.png differ
diff --git a/public/images/emoji/google_classic/fork_knife_plate.png b/public/images/emoji/google_classic/fork_knife_plate.png
new file mode 100644
index 00000000000..07989f14806
Binary files /dev/null and b/public/images/emoji/google_classic/fork_knife_plate.png differ
diff --git a/public/images/emoji/google_classic/fortune_cookie.png b/public/images/emoji/google_classic/fortune_cookie.png
new file mode 100644
index 00000000000..94a8cdca403
Binary files /dev/null and b/public/images/emoji/google_classic/fortune_cookie.png differ
diff --git a/public/images/emoji/google_classic/fountain.png b/public/images/emoji/google_classic/fountain.png
new file mode 100644
index 00000000000..dce123c0275
Binary files /dev/null and b/public/images/emoji/google_classic/fountain.png differ
diff --git a/public/images/emoji/google_classic/fountain_pen.png b/public/images/emoji/google_classic/fountain_pen.png
new file mode 100644
index 00000000000..4af057ce4ec
Binary files /dev/null and b/public/images/emoji/google_classic/fountain_pen.png differ
diff --git a/public/images/emoji/google_classic/four.png b/public/images/emoji/google_classic/four.png
new file mode 100644
index 00000000000..6dff5fdb29d
Binary files /dev/null and b/public/images/emoji/google_classic/four.png differ
diff --git a/public/images/emoji/google_classic/four_leaf_clover.png b/public/images/emoji/google_classic/four_leaf_clover.png
new file mode 100644
index 00000000000..a9b4209ba96
Binary files /dev/null and b/public/images/emoji/google_classic/four_leaf_clover.png differ
diff --git a/public/images/emoji/google_classic/fox_face.png b/public/images/emoji/google_classic/fox_face.png
new file mode 100644
index 00000000000..056ca455138
Binary files /dev/null and b/public/images/emoji/google_classic/fox_face.png differ
diff --git a/public/images/emoji/google_classic/fr.png b/public/images/emoji/google_classic/fr.png
new file mode 100644
index 00000000000..359803de2b2
Binary files /dev/null and b/public/images/emoji/google_classic/fr.png differ
diff --git a/public/images/emoji/google_classic/frame_photo.png b/public/images/emoji/google_classic/frame_photo.png
new file mode 100644
index 00000000000..5b57c11bc07
Binary files /dev/null and b/public/images/emoji/google_classic/frame_photo.png differ
diff --git a/public/images/emoji/google_classic/frame_with_picture.png b/public/images/emoji/google_classic/frame_with_picture.png
new file mode 100644
index 00000000000..5b57c11bc07
Binary files /dev/null and b/public/images/emoji/google_classic/frame_with_picture.png differ
diff --git a/public/images/emoji/google_classic/framed_picture.png b/public/images/emoji/google_classic/framed_picture.png
new file mode 100644
index 00000000000..5b57c11bc07
Binary files /dev/null and b/public/images/emoji/google_classic/framed_picture.png differ
diff --git a/public/images/emoji/google_classic/free.png b/public/images/emoji/google_classic/free.png
new file mode 100644
index 00000000000..fd7ed85f99a
Binary files /dev/null and b/public/images/emoji/google_classic/free.png differ
diff --git a/public/images/emoji/google_classic/french_guiana.png b/public/images/emoji/google_classic/french_guiana.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/french_guiana.png differ
diff --git a/public/images/emoji/google_classic/french_polynesia.png b/public/images/emoji/google_classic/french_polynesia.png
new file mode 100644
index 00000000000..46baa404289
Binary files /dev/null and b/public/images/emoji/google_classic/french_polynesia.png differ
diff --git a/public/images/emoji/google_classic/french_southern_territories.png b/public/images/emoji/google_classic/french_southern_territories.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/french_southern_territories.png differ
diff --git a/public/images/emoji/google_classic/fried_egg.png b/public/images/emoji/google_classic/fried_egg.png
new file mode 100644
index 00000000000..0e0d3c30058
Binary files /dev/null and b/public/images/emoji/google_classic/fried_egg.png differ
diff --git a/public/images/emoji/google_classic/fried_shrimp.png b/public/images/emoji/google_classic/fried_shrimp.png
new file mode 100644
index 00000000000..bdb350d529d
Binary files /dev/null and b/public/images/emoji/google_classic/fried_shrimp.png differ
diff --git a/public/images/emoji/google_classic/fries.png b/public/images/emoji/google_classic/fries.png
new file mode 100644
index 00000000000..68359ecb1f3
Binary files /dev/null and b/public/images/emoji/google_classic/fries.png differ
diff --git a/public/images/emoji/google_classic/frog.png b/public/images/emoji/google_classic/frog.png
new file mode 100644
index 00000000000..017e47cfb79
Binary files /dev/null and b/public/images/emoji/google_classic/frog.png differ
diff --git a/public/images/emoji/google_classic/frowning.png b/public/images/emoji/google_classic/frowning.png
new file mode 100644
index 00000000000..353c945e682
Binary files /dev/null and b/public/images/emoji/google_classic/frowning.png differ
diff --git a/public/images/emoji/google_classic/frowning2.png b/public/images/emoji/google_classic/frowning2.png
new file mode 100644
index 00000000000..db9c6af5b3b
Binary files /dev/null and b/public/images/emoji/google_classic/frowning2.png differ
diff --git a/public/images/emoji/google_classic/frowning_face.png b/public/images/emoji/google_classic/frowning_face.png
new file mode 100644
index 00000000000..db9c6af5b3b
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_face.png differ
diff --git a/public/images/emoji/google_classic/frowning_man.png b/public/images/emoji/google_classic/frowning_man.png
new file mode 100644
index 00000000000..1c1d1d3cfd6
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_man.png differ
diff --git a/public/images/emoji/google_classic/frowning_man/2.png b/public/images/emoji/google_classic/frowning_man/2.png
new file mode 100644
index 00000000000..cbb2741e59c
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_man/2.png differ
diff --git a/public/images/emoji/google_classic/frowning_man/3.png b/public/images/emoji/google_classic/frowning_man/3.png
new file mode 100644
index 00000000000..d4a82967125
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_man/3.png differ
diff --git a/public/images/emoji/google_classic/frowning_man/4.png b/public/images/emoji/google_classic/frowning_man/4.png
new file mode 100644
index 00000000000..1a6da18d1bc
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_man/4.png differ
diff --git a/public/images/emoji/google_classic/frowning_man/5.png b/public/images/emoji/google_classic/frowning_man/5.png
new file mode 100644
index 00000000000..2dc1c072754
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_man/5.png differ
diff --git a/public/images/emoji/google_classic/frowning_man/6.png b/public/images/emoji/google_classic/frowning_man/6.png
new file mode 100644
index 00000000000..38008416a23
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_man/6.png differ
diff --git a/public/images/emoji/google_classic/frowning_woman.png b/public/images/emoji/google_classic/frowning_woman.png
new file mode 100644
index 00000000000..262db0d00b0
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_woman.png differ
diff --git a/public/images/emoji/google_classic/frowning_woman/2.png b/public/images/emoji/google_classic/frowning_woman/2.png
new file mode 100644
index 00000000000..f42a78e451e
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_woman/2.png differ
diff --git a/public/images/emoji/google_classic/frowning_woman/3.png b/public/images/emoji/google_classic/frowning_woman/3.png
new file mode 100644
index 00000000000..84d6e41ab40
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_woman/3.png differ
diff --git a/public/images/emoji/google_classic/frowning_woman/4.png b/public/images/emoji/google_classic/frowning_woman/4.png
new file mode 100644
index 00000000000..2b2ee437e44
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_woman/4.png differ
diff --git a/public/images/emoji/google_classic/frowning_woman/5.png b/public/images/emoji/google_classic/frowning_woman/5.png
new file mode 100644
index 00000000000..417ee806f42
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_woman/5.png differ
diff --git a/public/images/emoji/google_classic/frowning_woman/6.png b/public/images/emoji/google_classic/frowning_woman/6.png
new file mode 100644
index 00000000000..065846524c5
Binary files /dev/null and b/public/images/emoji/google_classic/frowning_woman/6.png differ
diff --git a/public/images/emoji/google_classic/fu.png b/public/images/emoji/google_classic/fu.png
new file mode 100644
index 00000000000..abeb7fe2f41
Binary files /dev/null and b/public/images/emoji/google_classic/fu.png differ
diff --git a/public/images/emoji/google_classic/fu/2.png b/public/images/emoji/google_classic/fu/2.png
new file mode 100644
index 00000000000..957841c2b2b
Binary files /dev/null and b/public/images/emoji/google_classic/fu/2.png differ
diff --git a/public/images/emoji/google_classic/fu/3.png b/public/images/emoji/google_classic/fu/3.png
new file mode 100644
index 00000000000..a6e41041c11
Binary files /dev/null and b/public/images/emoji/google_classic/fu/3.png differ
diff --git a/public/images/emoji/google_classic/fu/4.png b/public/images/emoji/google_classic/fu/4.png
new file mode 100644
index 00000000000..ed6a1374587
Binary files /dev/null and b/public/images/emoji/google_classic/fu/4.png differ
diff --git a/public/images/emoji/google_classic/fu/5.png b/public/images/emoji/google_classic/fu/5.png
new file mode 100644
index 00000000000..4cd9f7a7f01
Binary files /dev/null and b/public/images/emoji/google_classic/fu/5.png differ
diff --git a/public/images/emoji/google_classic/fu/6.png b/public/images/emoji/google_classic/fu/6.png
new file mode 100644
index 00000000000..ad5a8e50e1e
Binary files /dev/null and b/public/images/emoji/google_classic/fu/6.png differ
diff --git a/public/images/emoji/google_classic/fuelpump.png b/public/images/emoji/google_classic/fuelpump.png
new file mode 100644
index 00000000000..e706e740500
Binary files /dev/null and b/public/images/emoji/google_classic/fuelpump.png differ
diff --git a/public/images/emoji/google_classic/full_moon.png b/public/images/emoji/google_classic/full_moon.png
new file mode 100644
index 00000000000..a010820c160
Binary files /dev/null and b/public/images/emoji/google_classic/full_moon.png differ
diff --git a/public/images/emoji/google_classic/full_moon_with_face.png b/public/images/emoji/google_classic/full_moon_with_face.png
new file mode 100644
index 00000000000..cf8f51c590b
Binary files /dev/null and b/public/images/emoji/google_classic/full_moon_with_face.png differ
diff --git a/public/images/emoji/google_classic/funeral_urn.png b/public/images/emoji/google_classic/funeral_urn.png
new file mode 100644
index 00000000000..eff08b3c1a1
Binary files /dev/null and b/public/images/emoji/google_classic/funeral_urn.png differ
diff --git a/public/images/emoji/google_classic/gabon.png b/public/images/emoji/google_classic/gabon.png
new file mode 100644
index 00000000000..c5acacc978b
Binary files /dev/null and b/public/images/emoji/google_classic/gabon.png differ
diff --git a/public/images/emoji/google_classic/gambia.png b/public/images/emoji/google_classic/gambia.png
new file mode 100644
index 00000000000..0bcc477d951
Binary files /dev/null and b/public/images/emoji/google_classic/gambia.png differ
diff --git a/public/images/emoji/google_classic/game_die.png b/public/images/emoji/google_classic/game_die.png
new file mode 100644
index 00000000000..744ce2cc51a
Binary files /dev/null and b/public/images/emoji/google_classic/game_die.png differ
diff --git a/public/images/emoji/google_classic/gb.png b/public/images/emoji/google_classic/gb.png
new file mode 100644
index 00000000000..ee88c3f750f
Binary files /dev/null and b/public/images/emoji/google_classic/gb.png differ
diff --git a/public/images/emoji/google_classic/gear.png b/public/images/emoji/google_classic/gear.png
new file mode 100644
index 00000000000..5ce6ac16ee4
Binary files /dev/null and b/public/images/emoji/google_classic/gear.png differ
diff --git a/public/images/emoji/google_classic/gem.png b/public/images/emoji/google_classic/gem.png
new file mode 100644
index 00000000000..a57b9123e3c
Binary files /dev/null and b/public/images/emoji/google_classic/gem.png differ
diff --git a/public/images/emoji/google_classic/gemini.png b/public/images/emoji/google_classic/gemini.png
new file mode 100644
index 00000000000..3d848fe1202
Binary files /dev/null and b/public/images/emoji/google_classic/gemini.png differ
diff --git a/public/images/emoji/google_classic/genie.png b/public/images/emoji/google_classic/genie.png
new file mode 100644
index 00000000000..f0eddcc91ae
Binary files /dev/null and b/public/images/emoji/google_classic/genie.png differ
diff --git a/public/images/emoji/google_classic/georgia.png b/public/images/emoji/google_classic/georgia.png
new file mode 100644
index 00000000000..380c9228a28
Binary files /dev/null and b/public/images/emoji/google_classic/georgia.png differ
diff --git a/public/images/emoji/google_classic/ghana.png b/public/images/emoji/google_classic/ghana.png
new file mode 100644
index 00000000000..111523077e9
Binary files /dev/null and b/public/images/emoji/google_classic/ghana.png differ
diff --git a/public/images/emoji/google_classic/ghost.png b/public/images/emoji/google_classic/ghost.png
new file mode 100644
index 00000000000..0008f99cbf7
Binary files /dev/null and b/public/images/emoji/google_classic/ghost.png differ
diff --git a/public/images/emoji/google_classic/gibraltar.png b/public/images/emoji/google_classic/gibraltar.png
new file mode 100644
index 00000000000..335cd5d3b83
Binary files /dev/null and b/public/images/emoji/google_classic/gibraltar.png differ
diff --git a/public/images/emoji/google_classic/gift.png b/public/images/emoji/google_classic/gift.png
new file mode 100644
index 00000000000..c9c6762ea0f
Binary files /dev/null and b/public/images/emoji/google_classic/gift.png differ
diff --git a/public/images/emoji/google_classic/gift_heart.png b/public/images/emoji/google_classic/gift_heart.png
new file mode 100644
index 00000000000..4df8b50642c
Binary files /dev/null and b/public/images/emoji/google_classic/gift_heart.png differ
diff --git a/public/images/emoji/google_classic/giraffe.png b/public/images/emoji/google_classic/giraffe.png
new file mode 100644
index 00000000000..be0e85d2896
Binary files /dev/null and b/public/images/emoji/google_classic/giraffe.png differ
diff --git a/public/images/emoji/google_classic/girl.png b/public/images/emoji/google_classic/girl.png
new file mode 100644
index 00000000000..daad02a92d3
Binary files /dev/null and b/public/images/emoji/google_classic/girl.png differ
diff --git a/public/images/emoji/google_classic/girl/2.png b/public/images/emoji/google_classic/girl/2.png
new file mode 100644
index 00000000000..62bbba4d856
Binary files /dev/null and b/public/images/emoji/google_classic/girl/2.png differ
diff --git a/public/images/emoji/google_classic/girl/3.png b/public/images/emoji/google_classic/girl/3.png
new file mode 100644
index 00000000000..1694c6e9c42
Binary files /dev/null and b/public/images/emoji/google_classic/girl/3.png differ
diff --git a/public/images/emoji/google_classic/girl/4.png b/public/images/emoji/google_classic/girl/4.png
new file mode 100644
index 00000000000..8de280e6de6
Binary files /dev/null and b/public/images/emoji/google_classic/girl/4.png differ
diff --git a/public/images/emoji/google_classic/girl/5.png b/public/images/emoji/google_classic/girl/5.png
new file mode 100644
index 00000000000..daf833c13f6
Binary files /dev/null and b/public/images/emoji/google_classic/girl/5.png differ
diff --git a/public/images/emoji/google_classic/girl/6.png b/public/images/emoji/google_classic/girl/6.png
new file mode 100644
index 00000000000..a5ffe3f2d2e
Binary files /dev/null and b/public/images/emoji/google_classic/girl/6.png differ
diff --git a/public/images/emoji/google_classic/globe_with_meridians.png b/public/images/emoji/google_classic/globe_with_meridians.png
new file mode 100644
index 00000000000..9150bf4548d
Binary files /dev/null and b/public/images/emoji/google_classic/globe_with_meridians.png differ
diff --git a/public/images/emoji/google_classic/gloves.png b/public/images/emoji/google_classic/gloves.png
new file mode 100644
index 00000000000..1a11dd2c560
Binary files /dev/null and b/public/images/emoji/google_classic/gloves.png differ
diff --git a/public/images/emoji/google_classic/goal_net.png b/public/images/emoji/google_classic/goal_net.png
new file mode 100644
index 00000000000..a816a8e4c4f
Binary files /dev/null and b/public/images/emoji/google_classic/goal_net.png differ
diff --git a/public/images/emoji/google_classic/goat.png b/public/images/emoji/google_classic/goat.png
new file mode 100644
index 00000000000..524dba56c3e
Binary files /dev/null and b/public/images/emoji/google_classic/goat.png differ
diff --git a/public/images/emoji/google_classic/golf.png b/public/images/emoji/google_classic/golf.png
new file mode 100644
index 00000000000..b90c033a328
Binary files /dev/null and b/public/images/emoji/google_classic/golf.png differ
diff --git a/public/images/emoji/google_classic/golfer.png b/public/images/emoji/google_classic/golfer.png
new file mode 100644
index 00000000000..47f54f7c764
Binary files /dev/null and b/public/images/emoji/google_classic/golfer.png differ
diff --git a/public/images/emoji/google_classic/golfing_man.png b/public/images/emoji/google_classic/golfing_man.png
new file mode 100644
index 00000000000..47f54f7c764
Binary files /dev/null and b/public/images/emoji/google_classic/golfing_man.png differ
diff --git a/public/images/emoji/google_classic/golfing_woman.png b/public/images/emoji/google_classic/golfing_woman.png
new file mode 100644
index 00000000000..49bf49006ee
Binary files /dev/null and b/public/images/emoji/google_classic/golfing_woman.png differ
diff --git a/public/images/emoji/google_classic/gorilla.png b/public/images/emoji/google_classic/gorilla.png
new file mode 100644
index 00000000000..4214d87ddc5
Binary files /dev/null and b/public/images/emoji/google_classic/gorilla.png differ
diff --git a/public/images/emoji/google_classic/grandma.png b/public/images/emoji/google_classic/grandma.png
new file mode 100644
index 00000000000..1261df7c00b
Binary files /dev/null and b/public/images/emoji/google_classic/grandma.png differ
diff --git a/public/images/emoji/google_classic/grandma/2.png b/public/images/emoji/google_classic/grandma/2.png
new file mode 100644
index 00000000000..01681ab34b5
Binary files /dev/null and b/public/images/emoji/google_classic/grandma/2.png differ
diff --git a/public/images/emoji/google_classic/grandma/3.png b/public/images/emoji/google_classic/grandma/3.png
new file mode 100644
index 00000000000..a861adf6edd
Binary files /dev/null and b/public/images/emoji/google_classic/grandma/3.png differ
diff --git a/public/images/emoji/google_classic/grandma/4.png b/public/images/emoji/google_classic/grandma/4.png
new file mode 100644
index 00000000000..6884082ac42
Binary files /dev/null and b/public/images/emoji/google_classic/grandma/4.png differ
diff --git a/public/images/emoji/google_classic/grandma/5.png b/public/images/emoji/google_classic/grandma/5.png
new file mode 100644
index 00000000000..49faefc74c7
Binary files /dev/null and b/public/images/emoji/google_classic/grandma/5.png differ
diff --git a/public/images/emoji/google_classic/grandma/6.png b/public/images/emoji/google_classic/grandma/6.png
new file mode 100644
index 00000000000..6c3d261ff3c
Binary files /dev/null and b/public/images/emoji/google_classic/grandma/6.png differ
diff --git a/public/images/emoji/google_classic/grapes.png b/public/images/emoji/google_classic/grapes.png
new file mode 100644
index 00000000000..979432e79f2
Binary files /dev/null and b/public/images/emoji/google_classic/grapes.png differ
diff --git a/public/images/emoji/google_classic/greece.png b/public/images/emoji/google_classic/greece.png
new file mode 100644
index 00000000000..c7baeec9243
Binary files /dev/null and b/public/images/emoji/google_classic/greece.png differ
diff --git a/public/images/emoji/google_classic/green_apple.png b/public/images/emoji/google_classic/green_apple.png
new file mode 100644
index 00000000000..11177352a97
Binary files /dev/null and b/public/images/emoji/google_classic/green_apple.png differ
diff --git a/public/images/emoji/google_classic/green_book.png b/public/images/emoji/google_classic/green_book.png
new file mode 100644
index 00000000000..3193363bb7a
Binary files /dev/null and b/public/images/emoji/google_classic/green_book.png differ
diff --git a/public/images/emoji/google_classic/green_heart.png b/public/images/emoji/google_classic/green_heart.png
new file mode 100644
index 00000000000..c69336dcfd7
Binary files /dev/null and b/public/images/emoji/google_classic/green_heart.png differ
diff --git a/public/images/emoji/google_classic/green_salad.png b/public/images/emoji/google_classic/green_salad.png
new file mode 100644
index 00000000000..de8911bd191
Binary files /dev/null and b/public/images/emoji/google_classic/green_salad.png differ
diff --git a/public/images/emoji/google_classic/greenland.png b/public/images/emoji/google_classic/greenland.png
new file mode 100644
index 00000000000..cbbab95df34
Binary files /dev/null and b/public/images/emoji/google_classic/greenland.png differ
diff --git a/public/images/emoji/google_classic/grenada.png b/public/images/emoji/google_classic/grenada.png
new file mode 100644
index 00000000000..a810c9f8a86
Binary files /dev/null and b/public/images/emoji/google_classic/grenada.png differ
diff --git a/public/images/emoji/google_classic/grey_exclamation.png b/public/images/emoji/google_classic/grey_exclamation.png
new file mode 100644
index 00000000000..fc253965357
Binary files /dev/null and b/public/images/emoji/google_classic/grey_exclamation.png differ
diff --git a/public/images/emoji/google_classic/grey_question.png b/public/images/emoji/google_classic/grey_question.png
new file mode 100644
index 00000000000..b0a37e84beb
Binary files /dev/null and b/public/images/emoji/google_classic/grey_question.png differ
diff --git a/public/images/emoji/google_classic/grimacing.png b/public/images/emoji/google_classic/grimacing.png
new file mode 100644
index 00000000000..edb29c6442b
Binary files /dev/null and b/public/images/emoji/google_classic/grimacing.png differ
diff --git a/public/images/emoji/google_classic/grin.png b/public/images/emoji/google_classic/grin.png
new file mode 100644
index 00000000000..6405328b4c9
Binary files /dev/null and b/public/images/emoji/google_classic/grin.png differ
diff --git a/public/images/emoji/google_classic/grinning.png b/public/images/emoji/google_classic/grinning.png
new file mode 100644
index 00000000000..224cbcf38ad
Binary files /dev/null and b/public/images/emoji/google_classic/grinning.png differ
diff --git a/public/images/emoji/google_classic/guadeloupe.png b/public/images/emoji/google_classic/guadeloupe.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/guadeloupe.png differ
diff --git a/public/images/emoji/google_classic/guam.png b/public/images/emoji/google_classic/guam.png
new file mode 100644
index 00000000000..181a0f5536a
Binary files /dev/null and b/public/images/emoji/google_classic/guam.png differ
diff --git a/public/images/emoji/google_classic/guardsman.png b/public/images/emoji/google_classic/guardsman.png
new file mode 100644
index 00000000000..1e3569ce939
Binary files /dev/null and b/public/images/emoji/google_classic/guardsman.png differ
diff --git a/public/images/emoji/google_classic/guardsman/2.png b/public/images/emoji/google_classic/guardsman/2.png
new file mode 100644
index 00000000000..4e6f468e439
Binary files /dev/null and b/public/images/emoji/google_classic/guardsman/2.png differ
diff --git a/public/images/emoji/google_classic/guardsman/3.png b/public/images/emoji/google_classic/guardsman/3.png
new file mode 100644
index 00000000000..abdf571e0ee
Binary files /dev/null and b/public/images/emoji/google_classic/guardsman/3.png differ
diff --git a/public/images/emoji/google_classic/guardsman/4.png b/public/images/emoji/google_classic/guardsman/4.png
new file mode 100644
index 00000000000..46d2e9cbeda
Binary files /dev/null and b/public/images/emoji/google_classic/guardsman/4.png differ
diff --git a/public/images/emoji/google_classic/guardsman/5.png b/public/images/emoji/google_classic/guardsman/5.png
new file mode 100644
index 00000000000..ab7ce6baf95
Binary files /dev/null and b/public/images/emoji/google_classic/guardsman/5.png differ
diff --git a/public/images/emoji/google_classic/guardsman/6.png b/public/images/emoji/google_classic/guardsman/6.png
new file mode 100644
index 00000000000..9f86a411598
Binary files /dev/null and b/public/images/emoji/google_classic/guardsman/6.png differ
diff --git a/public/images/emoji/google_classic/guardswoman.png b/public/images/emoji/google_classic/guardswoman.png
new file mode 100644
index 00000000000..c79fcee1c85
Binary files /dev/null and b/public/images/emoji/google_classic/guardswoman.png differ
diff --git a/public/images/emoji/google_classic/guardswoman/2.png b/public/images/emoji/google_classic/guardswoman/2.png
new file mode 100644
index 00000000000..b5b9a8507e4
Binary files /dev/null and b/public/images/emoji/google_classic/guardswoman/2.png differ
diff --git a/public/images/emoji/google_classic/guardswoman/3.png b/public/images/emoji/google_classic/guardswoman/3.png
new file mode 100644
index 00000000000..8d5063d32b0
Binary files /dev/null and b/public/images/emoji/google_classic/guardswoman/3.png differ
diff --git a/public/images/emoji/google_classic/guardswoman/4.png b/public/images/emoji/google_classic/guardswoman/4.png
new file mode 100644
index 00000000000..1d0fba0e566
Binary files /dev/null and b/public/images/emoji/google_classic/guardswoman/4.png differ
diff --git a/public/images/emoji/google_classic/guardswoman/5.png b/public/images/emoji/google_classic/guardswoman/5.png
new file mode 100644
index 00000000000..c95e75daf0b
Binary files /dev/null and b/public/images/emoji/google_classic/guardswoman/5.png differ
diff --git a/public/images/emoji/google_classic/guardswoman/6.png b/public/images/emoji/google_classic/guardswoman/6.png
new file mode 100644
index 00000000000..73f99eb4fc9
Binary files /dev/null and b/public/images/emoji/google_classic/guardswoman/6.png differ
diff --git a/public/images/emoji/google_classic/guatemala.png b/public/images/emoji/google_classic/guatemala.png
new file mode 100644
index 00000000000..19d8138252c
Binary files /dev/null and b/public/images/emoji/google_classic/guatemala.png differ
diff --git a/public/images/emoji/google_classic/guernsey.png b/public/images/emoji/google_classic/guernsey.png
new file mode 100644
index 00000000000..a4eb741bbed
Binary files /dev/null and b/public/images/emoji/google_classic/guernsey.png differ
diff --git a/public/images/emoji/google_classic/guinea.png b/public/images/emoji/google_classic/guinea.png
new file mode 100644
index 00000000000..c93090301ab
Binary files /dev/null and b/public/images/emoji/google_classic/guinea.png differ
diff --git a/public/images/emoji/google_classic/guinea_bissau.png b/public/images/emoji/google_classic/guinea_bissau.png
new file mode 100644
index 00000000000..eaaaa56b0ef
Binary files /dev/null and b/public/images/emoji/google_classic/guinea_bissau.png differ
diff --git a/public/images/emoji/google_classic/guitar.png b/public/images/emoji/google_classic/guitar.png
new file mode 100644
index 00000000000..e165528667e
Binary files /dev/null and b/public/images/emoji/google_classic/guitar.png differ
diff --git a/public/images/emoji/google_classic/gun.png b/public/images/emoji/google_classic/gun.png
new file mode 100644
index 00000000000..7f91f26f00d
Binary files /dev/null and b/public/images/emoji/google_classic/gun.png differ
diff --git a/public/images/emoji/google_classic/guyana.png b/public/images/emoji/google_classic/guyana.png
new file mode 100644
index 00000000000..20f4379dc85
Binary files /dev/null and b/public/images/emoji/google_classic/guyana.png differ
diff --git a/public/images/emoji/google_classic/haircut.png b/public/images/emoji/google_classic/haircut.png
new file mode 100644
index 00000000000..da92b36a55c
Binary files /dev/null and b/public/images/emoji/google_classic/haircut.png differ
diff --git a/public/images/emoji/google_classic/haircut/2.png b/public/images/emoji/google_classic/haircut/2.png
new file mode 100644
index 00000000000..fcb839726eb
Binary files /dev/null and b/public/images/emoji/google_classic/haircut/2.png differ
diff --git a/public/images/emoji/google_classic/haircut/3.png b/public/images/emoji/google_classic/haircut/3.png
new file mode 100644
index 00000000000..ed32e39102b
Binary files /dev/null and b/public/images/emoji/google_classic/haircut/3.png differ
diff --git a/public/images/emoji/google_classic/haircut/4.png b/public/images/emoji/google_classic/haircut/4.png
new file mode 100644
index 00000000000..d93aa7fa24e
Binary files /dev/null and b/public/images/emoji/google_classic/haircut/4.png differ
diff --git a/public/images/emoji/google_classic/haircut/5.png b/public/images/emoji/google_classic/haircut/5.png
new file mode 100644
index 00000000000..3a6eae2cd5a
Binary files /dev/null and b/public/images/emoji/google_classic/haircut/5.png differ
diff --git a/public/images/emoji/google_classic/haircut/6.png b/public/images/emoji/google_classic/haircut/6.png
new file mode 100644
index 00000000000..48967321e6d
Binary files /dev/null and b/public/images/emoji/google_classic/haircut/6.png differ
diff --git a/public/images/emoji/google_classic/haircut_man.png b/public/images/emoji/google_classic/haircut_man.png
new file mode 100644
index 00000000000..10130586f49
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_man.png differ
diff --git a/public/images/emoji/google_classic/haircut_man/2.png b/public/images/emoji/google_classic/haircut_man/2.png
new file mode 100644
index 00000000000..d2ab41cc229
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_man/2.png differ
diff --git a/public/images/emoji/google_classic/haircut_man/3.png b/public/images/emoji/google_classic/haircut_man/3.png
new file mode 100644
index 00000000000..a6da2f0db54
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_man/3.png differ
diff --git a/public/images/emoji/google_classic/haircut_man/4.png b/public/images/emoji/google_classic/haircut_man/4.png
new file mode 100644
index 00000000000..c7b1c95ac01
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_man/4.png differ
diff --git a/public/images/emoji/google_classic/haircut_man/5.png b/public/images/emoji/google_classic/haircut_man/5.png
new file mode 100644
index 00000000000..17f43f86004
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_man/5.png differ
diff --git a/public/images/emoji/google_classic/haircut_man/6.png b/public/images/emoji/google_classic/haircut_man/6.png
new file mode 100644
index 00000000000..01c94102596
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_man/6.png differ
diff --git a/public/images/emoji/google_classic/haircut_woman.png b/public/images/emoji/google_classic/haircut_woman.png
new file mode 100644
index 00000000000..da92b36a55c
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_woman.png differ
diff --git a/public/images/emoji/google_classic/haircut_woman/2.png b/public/images/emoji/google_classic/haircut_woman/2.png
new file mode 100644
index 00000000000..fcb839726eb
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_woman/2.png differ
diff --git a/public/images/emoji/google_classic/haircut_woman/3.png b/public/images/emoji/google_classic/haircut_woman/3.png
new file mode 100644
index 00000000000..ed32e39102b
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_woman/3.png differ
diff --git a/public/images/emoji/google_classic/haircut_woman/4.png b/public/images/emoji/google_classic/haircut_woman/4.png
new file mode 100644
index 00000000000..d93aa7fa24e
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_woman/4.png differ
diff --git a/public/images/emoji/google_classic/haircut_woman/5.png b/public/images/emoji/google_classic/haircut_woman/5.png
new file mode 100644
index 00000000000..3a6eae2cd5a
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_woman/5.png differ
diff --git a/public/images/emoji/google_classic/haircut_woman/6.png b/public/images/emoji/google_classic/haircut_woman/6.png
new file mode 100644
index 00000000000..48967321e6d
Binary files /dev/null and b/public/images/emoji/google_classic/haircut_woman/6.png differ
diff --git a/public/images/emoji/google_classic/haiti.png b/public/images/emoji/google_classic/haiti.png
new file mode 100644
index 00000000000..6ce84aa49de
Binary files /dev/null and b/public/images/emoji/google_classic/haiti.png differ
diff --git a/public/images/emoji/google_classic/hamburger.png b/public/images/emoji/google_classic/hamburger.png
new file mode 100644
index 00000000000..937576c4dae
Binary files /dev/null and b/public/images/emoji/google_classic/hamburger.png differ
diff --git a/public/images/emoji/google_classic/hammer.png b/public/images/emoji/google_classic/hammer.png
new file mode 100644
index 00000000000..c192eebd54a
Binary files /dev/null and b/public/images/emoji/google_classic/hammer.png differ
diff --git a/public/images/emoji/google_classic/hammer_and_pick.png b/public/images/emoji/google_classic/hammer_and_pick.png
new file mode 100644
index 00000000000..bbbd5b29906
Binary files /dev/null and b/public/images/emoji/google_classic/hammer_and_pick.png differ
diff --git a/public/images/emoji/google_classic/hammer_and_wrench.png b/public/images/emoji/google_classic/hammer_and_wrench.png
new file mode 100644
index 00000000000..1be385628fb
Binary files /dev/null and b/public/images/emoji/google_classic/hammer_and_wrench.png differ
diff --git a/public/images/emoji/google_classic/hammer_pick.png b/public/images/emoji/google_classic/hammer_pick.png
new file mode 100644
index 00000000000..bbbd5b29906
Binary files /dev/null and b/public/images/emoji/google_classic/hammer_pick.png differ
diff --git a/public/images/emoji/google_classic/hamster.png b/public/images/emoji/google_classic/hamster.png
new file mode 100644
index 00000000000..31d4ef6ea12
Binary files /dev/null and b/public/images/emoji/google_classic/hamster.png differ
diff --git a/public/images/emoji/google_classic/hand.png b/public/images/emoji/google_classic/hand.png
new file mode 100644
index 00000000000..5e035fcfdbb
Binary files /dev/null and b/public/images/emoji/google_classic/hand.png differ
diff --git a/public/images/emoji/google_classic/hand/2.png b/public/images/emoji/google_classic/hand/2.png
new file mode 100644
index 00000000000..e3608ce31aa
Binary files /dev/null and b/public/images/emoji/google_classic/hand/2.png differ
diff --git a/public/images/emoji/google_classic/hand/3.png b/public/images/emoji/google_classic/hand/3.png
new file mode 100644
index 00000000000..578ed54aec2
Binary files /dev/null and b/public/images/emoji/google_classic/hand/3.png differ
diff --git a/public/images/emoji/google_classic/hand/4.png b/public/images/emoji/google_classic/hand/4.png
new file mode 100644
index 00000000000..89b82387974
Binary files /dev/null and b/public/images/emoji/google_classic/hand/4.png differ
diff --git a/public/images/emoji/google_classic/hand/5.png b/public/images/emoji/google_classic/hand/5.png
new file mode 100644
index 00000000000..667110258cd
Binary files /dev/null and b/public/images/emoji/google_classic/hand/5.png differ
diff --git a/public/images/emoji/google_classic/hand/6.png b/public/images/emoji/google_classic/hand/6.png
new file mode 100644
index 00000000000..6efa5443283
Binary files /dev/null and b/public/images/emoji/google_classic/hand/6.png differ
diff --git a/public/images/emoji/google_classic/hand_splayed.png b/public/images/emoji/google_classic/hand_splayed.png
new file mode 100644
index 00000000000..52ded94d54a
Binary files /dev/null and b/public/images/emoji/google_classic/hand_splayed.png differ
diff --git a/public/images/emoji/google_classic/hand_splayed/2.png b/public/images/emoji/google_classic/hand_splayed/2.png
new file mode 100644
index 00000000000..2e59b69be04
Binary files /dev/null and b/public/images/emoji/google_classic/hand_splayed/2.png differ
diff --git a/public/images/emoji/google_classic/hand_splayed/3.png b/public/images/emoji/google_classic/hand_splayed/3.png
new file mode 100644
index 00000000000..53a0fb1b7f9
Binary files /dev/null and b/public/images/emoji/google_classic/hand_splayed/3.png differ
diff --git a/public/images/emoji/google_classic/hand_splayed/4.png b/public/images/emoji/google_classic/hand_splayed/4.png
new file mode 100644
index 00000000000..b2ee62e80d7
Binary files /dev/null and b/public/images/emoji/google_classic/hand_splayed/4.png differ
diff --git a/public/images/emoji/google_classic/hand_splayed/5.png b/public/images/emoji/google_classic/hand_splayed/5.png
new file mode 100644
index 00000000000..6327ab10255
Binary files /dev/null and b/public/images/emoji/google_classic/hand_splayed/5.png differ
diff --git a/public/images/emoji/google_classic/hand_splayed/6.png b/public/images/emoji/google_classic/hand_splayed/6.png
new file mode 100644
index 00000000000..c66b1a2138b
Binary files /dev/null and b/public/images/emoji/google_classic/hand_splayed/6.png differ
diff --git a/public/images/emoji/google_classic/handbag.png b/public/images/emoji/google_classic/handbag.png
new file mode 100644
index 00000000000..ff93dff4063
Binary files /dev/null and b/public/images/emoji/google_classic/handbag.png differ
diff --git a/public/images/emoji/google_classic/handshake.png b/public/images/emoji/google_classic/handshake.png
new file mode 100644
index 00000000000..ee14258ffbe
Binary files /dev/null and b/public/images/emoji/google_classic/handshake.png differ
diff --git a/public/images/emoji/google_classic/hankey.png b/public/images/emoji/google_classic/hankey.png
new file mode 100644
index 00000000000..87d78669668
Binary files /dev/null and b/public/images/emoji/google_classic/hankey.png differ
diff --git a/public/images/emoji/google_classic/hash.png b/public/images/emoji/google_classic/hash.png
new file mode 100644
index 00000000000..706a31c13b1
Binary files /dev/null and b/public/images/emoji/google_classic/hash.png differ
diff --git a/public/images/emoji/google_classic/hatched_chick.png b/public/images/emoji/google_classic/hatched_chick.png
new file mode 100644
index 00000000000..f416dc1376e
Binary files /dev/null and b/public/images/emoji/google_classic/hatched_chick.png differ
diff --git a/public/images/emoji/google_classic/hatching_chick.png b/public/images/emoji/google_classic/hatching_chick.png
new file mode 100644
index 00000000000..5b53b566f9a
Binary files /dev/null and b/public/images/emoji/google_classic/hatching_chick.png differ
diff --git a/public/images/emoji/google_classic/head_bandage.png b/public/images/emoji/google_classic/head_bandage.png
new file mode 100644
index 00000000000..d892078bb20
Binary files /dev/null and b/public/images/emoji/google_classic/head_bandage.png differ
diff --git a/public/images/emoji/google_classic/headphones.png b/public/images/emoji/google_classic/headphones.png
new file mode 100644
index 00000000000..8641079a6d9
Binary files /dev/null and b/public/images/emoji/google_classic/headphones.png differ
diff --git a/public/images/emoji/google_classic/hear_no_evil.png b/public/images/emoji/google_classic/hear_no_evil.png
new file mode 100644
index 00000000000..2d68bb67709
Binary files /dev/null and b/public/images/emoji/google_classic/hear_no_evil.png differ
diff --git a/public/images/emoji/google_classic/heard_and_mc_donald_islands.png b/public/images/emoji/google_classic/heard_and_mc_donald_islands.png
new file mode 100644
index 00000000000..242d9f6872a
Binary files /dev/null and b/public/images/emoji/google_classic/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/google_classic/heart.png b/public/images/emoji/google_classic/heart.png
new file mode 100644
index 00000000000..2324dbaabdb
Binary files /dev/null and b/public/images/emoji/google_classic/heart.png differ
diff --git a/public/images/emoji/google_classic/heart_decoration.png b/public/images/emoji/google_classic/heart_decoration.png
new file mode 100644
index 00000000000..2b8efa17f1e
Binary files /dev/null and b/public/images/emoji/google_classic/heart_decoration.png differ
diff --git a/public/images/emoji/google_classic/heart_exclamation.png b/public/images/emoji/google_classic/heart_exclamation.png
new file mode 100644
index 00000000000..401dfd498dd
Binary files /dev/null and b/public/images/emoji/google_classic/heart_exclamation.png differ
diff --git a/public/images/emoji/google_classic/heart_eyes.png b/public/images/emoji/google_classic/heart_eyes.png
new file mode 100644
index 00000000000..fee2c7f7a9c
Binary files /dev/null and b/public/images/emoji/google_classic/heart_eyes.png differ
diff --git a/public/images/emoji/google_classic/heart_eyes_cat.png b/public/images/emoji/google_classic/heart_eyes_cat.png
new file mode 100644
index 00000000000..2912c9aa571
Binary files /dev/null and b/public/images/emoji/google_classic/heart_eyes_cat.png differ
diff --git a/public/images/emoji/google_classic/heartbeat.png b/public/images/emoji/google_classic/heartbeat.png
new file mode 100644
index 00000000000..8f50f8a8d24
Binary files /dev/null and b/public/images/emoji/google_classic/heartbeat.png differ
diff --git a/public/images/emoji/google_classic/heartpulse.png b/public/images/emoji/google_classic/heartpulse.png
new file mode 100644
index 00000000000..33bd1343681
Binary files /dev/null and b/public/images/emoji/google_classic/heartpulse.png differ
diff --git a/public/images/emoji/google_classic/hearts.png b/public/images/emoji/google_classic/hearts.png
new file mode 100644
index 00000000000..3f0472ff644
Binary files /dev/null and b/public/images/emoji/google_classic/hearts.png differ
diff --git a/public/images/emoji/google_classic/heavy_check_mark.png b/public/images/emoji/google_classic/heavy_check_mark.png
new file mode 100644
index 00000000000..7243e553cdb
Binary files /dev/null and b/public/images/emoji/google_classic/heavy_check_mark.png differ
diff --git a/public/images/emoji/google_classic/heavy_division_sign.png b/public/images/emoji/google_classic/heavy_division_sign.png
new file mode 100644
index 00000000000..311230dfd5d
Binary files /dev/null and b/public/images/emoji/google_classic/heavy_division_sign.png differ
diff --git a/public/images/emoji/google_classic/heavy_dollar_sign.png b/public/images/emoji/google_classic/heavy_dollar_sign.png
new file mode 100644
index 00000000000..67b6826b968
Binary files /dev/null and b/public/images/emoji/google_classic/heavy_dollar_sign.png differ
diff --git a/public/images/emoji/google_classic/heavy_heart_exclamation.png b/public/images/emoji/google_classic/heavy_heart_exclamation.png
new file mode 100644
index 00000000000..401dfd498dd
Binary files /dev/null and b/public/images/emoji/google_classic/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/google_classic/heavy_heart_exclamation_mark_ornament.png b/public/images/emoji/google_classic/heavy_heart_exclamation_mark_ornament.png
new file mode 100644
index 00000000000..401dfd498dd
Binary files /dev/null and b/public/images/emoji/google_classic/heavy_heart_exclamation_mark_ornament.png differ
diff --git a/public/images/emoji/google_classic/heavy_minus_sign.png b/public/images/emoji/google_classic/heavy_minus_sign.png
new file mode 100644
index 00000000000..b6cd1991d7a
Binary files /dev/null and b/public/images/emoji/google_classic/heavy_minus_sign.png differ
diff --git a/public/images/emoji/google_classic/heavy_multiplication_x.png b/public/images/emoji/google_classic/heavy_multiplication_x.png
new file mode 100644
index 00000000000..557185c7f0c
Binary files /dev/null and b/public/images/emoji/google_classic/heavy_multiplication_x.png differ
diff --git a/public/images/emoji/google_classic/heavy_plus_sign.png b/public/images/emoji/google_classic/heavy_plus_sign.png
new file mode 100644
index 00000000000..8d10c30ca1f
Binary files /dev/null and b/public/images/emoji/google_classic/heavy_plus_sign.png differ
diff --git a/public/images/emoji/google_classic/hedgehog.png b/public/images/emoji/google_classic/hedgehog.png
new file mode 100644
index 00000000000..9b978b35407
Binary files /dev/null and b/public/images/emoji/google_classic/hedgehog.png differ
diff --git a/public/images/emoji/google_classic/helicopter.png b/public/images/emoji/google_classic/helicopter.png
new file mode 100644
index 00000000000..eb88f52eb52
Binary files /dev/null and b/public/images/emoji/google_classic/helicopter.png differ
diff --git a/public/images/emoji/google_classic/helmet_with_cross.png b/public/images/emoji/google_classic/helmet_with_cross.png
new file mode 100644
index 00000000000..721340bfb01
Binary files /dev/null and b/public/images/emoji/google_classic/helmet_with_cross.png differ
diff --git a/public/images/emoji/google_classic/helmet_with_white_cross.png b/public/images/emoji/google_classic/helmet_with_white_cross.png
new file mode 100644
index 00000000000..721340bfb01
Binary files /dev/null and b/public/images/emoji/google_classic/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/google_classic/herb.png b/public/images/emoji/google_classic/herb.png
new file mode 100644
index 00000000000..ebad8c7ecda
Binary files /dev/null and b/public/images/emoji/google_classic/herb.png differ
diff --git a/public/images/emoji/google_classic/hibiscus.png b/public/images/emoji/google_classic/hibiscus.png
new file mode 100644
index 00000000000..ab12e064014
Binary files /dev/null and b/public/images/emoji/google_classic/hibiscus.png differ
diff --git a/public/images/emoji/google_classic/high_brightness.png b/public/images/emoji/google_classic/high_brightness.png
new file mode 100644
index 00000000000..b338f584208
Binary files /dev/null and b/public/images/emoji/google_classic/high_brightness.png differ
diff --git a/public/images/emoji/google_classic/high_heel.png b/public/images/emoji/google_classic/high_heel.png
new file mode 100644
index 00000000000..ee79f03d2de
Binary files /dev/null and b/public/images/emoji/google_classic/high_heel.png differ
diff --git a/public/images/emoji/google_classic/hocho.png b/public/images/emoji/google_classic/hocho.png
new file mode 100644
index 00000000000..88cee60960b
Binary files /dev/null and b/public/images/emoji/google_classic/hocho.png differ
diff --git a/public/images/emoji/google_classic/hockey.png b/public/images/emoji/google_classic/hockey.png
new file mode 100644
index 00000000000..ab84461bfb3
Binary files /dev/null and b/public/images/emoji/google_classic/hockey.png differ
diff --git a/public/images/emoji/google_classic/hole.png b/public/images/emoji/google_classic/hole.png
new file mode 100644
index 00000000000..d2f6a9a225a
Binary files /dev/null and b/public/images/emoji/google_classic/hole.png differ
diff --git a/public/images/emoji/google_classic/homes.png b/public/images/emoji/google_classic/homes.png
new file mode 100644
index 00000000000..e1a05599889
Binary files /dev/null and b/public/images/emoji/google_classic/homes.png differ
diff --git a/public/images/emoji/google_classic/honduras.png b/public/images/emoji/google_classic/honduras.png
new file mode 100644
index 00000000000..91d624f9285
Binary files /dev/null and b/public/images/emoji/google_classic/honduras.png differ
diff --git a/public/images/emoji/google_classic/honey_pot.png b/public/images/emoji/google_classic/honey_pot.png
new file mode 100644
index 00000000000..d3255542ba3
Binary files /dev/null and b/public/images/emoji/google_classic/honey_pot.png differ
diff --git a/public/images/emoji/google_classic/honeybee.png b/public/images/emoji/google_classic/honeybee.png
new file mode 100644
index 00000000000..168af47a547
Binary files /dev/null and b/public/images/emoji/google_classic/honeybee.png differ
diff --git a/public/images/emoji/google_classic/hong_kong.png b/public/images/emoji/google_classic/hong_kong.png
new file mode 100644
index 00000000000..7b74d52c452
Binary files /dev/null and b/public/images/emoji/google_classic/hong_kong.png differ
diff --git a/public/images/emoji/google_classic/horse.png b/public/images/emoji/google_classic/horse.png
new file mode 100644
index 00000000000..bfa6fe21523
Binary files /dev/null and b/public/images/emoji/google_classic/horse.png differ
diff --git a/public/images/emoji/google_classic/horse_racing.png b/public/images/emoji/google_classic/horse_racing.png
new file mode 100644
index 00000000000..b2164389462
Binary files /dev/null and b/public/images/emoji/google_classic/horse_racing.png differ
diff --git a/public/images/emoji/google_classic/hospital.png b/public/images/emoji/google_classic/hospital.png
new file mode 100644
index 00000000000..683ae2af051
Binary files /dev/null and b/public/images/emoji/google_classic/hospital.png differ
diff --git a/public/images/emoji/google_classic/hot_dog.png b/public/images/emoji/google_classic/hot_dog.png
new file mode 100644
index 00000000000..0e58953ffec
Binary files /dev/null and b/public/images/emoji/google_classic/hot_dog.png differ
diff --git a/public/images/emoji/google_classic/hot_pepper.png b/public/images/emoji/google_classic/hot_pepper.png
new file mode 100644
index 00000000000..083ac34774b
Binary files /dev/null and b/public/images/emoji/google_classic/hot_pepper.png differ
diff --git a/public/images/emoji/google_classic/hotdog.png b/public/images/emoji/google_classic/hotdog.png
new file mode 100644
index 00000000000..0e58953ffec
Binary files /dev/null and b/public/images/emoji/google_classic/hotdog.png differ
diff --git a/public/images/emoji/google_classic/hotel.png b/public/images/emoji/google_classic/hotel.png
new file mode 100644
index 00000000000..83bf093ca8d
Binary files /dev/null and b/public/images/emoji/google_classic/hotel.png differ
diff --git a/public/images/emoji/google_classic/hotsprings.png b/public/images/emoji/google_classic/hotsprings.png
new file mode 100644
index 00000000000..f0f4f65c861
Binary files /dev/null and b/public/images/emoji/google_classic/hotsprings.png differ
diff --git a/public/images/emoji/google_classic/hourglass.png b/public/images/emoji/google_classic/hourglass.png
new file mode 100644
index 00000000000..ecac60ebd57
Binary files /dev/null and b/public/images/emoji/google_classic/hourglass.png differ
diff --git a/public/images/emoji/google_classic/hourglass_flowing_sand.png b/public/images/emoji/google_classic/hourglass_flowing_sand.png
new file mode 100644
index 00000000000..1952a366bb6
Binary files /dev/null and b/public/images/emoji/google_classic/hourglass_flowing_sand.png differ
diff --git a/public/images/emoji/google_classic/house.png b/public/images/emoji/google_classic/house.png
new file mode 100644
index 00000000000..34100cce7a3
Binary files /dev/null and b/public/images/emoji/google_classic/house.png differ
diff --git a/public/images/emoji/google_classic/house_abandoned.png b/public/images/emoji/google_classic/house_abandoned.png
new file mode 100644
index 00000000000..b1d5a7d814e
Binary files /dev/null and b/public/images/emoji/google_classic/house_abandoned.png differ
diff --git a/public/images/emoji/google_classic/house_buildings.png b/public/images/emoji/google_classic/house_buildings.png
new file mode 100644
index 00000000000..e1a05599889
Binary files /dev/null and b/public/images/emoji/google_classic/house_buildings.png differ
diff --git a/public/images/emoji/google_classic/house_with_garden.png b/public/images/emoji/google_classic/house_with_garden.png
new file mode 100644
index 00000000000..e38cfb45ebb
Binary files /dev/null and b/public/images/emoji/google_classic/house_with_garden.png differ
diff --git a/public/images/emoji/google_classic/houses.png b/public/images/emoji/google_classic/houses.png
new file mode 100644
index 00000000000..e1a05599889
Binary files /dev/null and b/public/images/emoji/google_classic/houses.png differ
diff --git a/public/images/emoji/google_classic/hugging.png b/public/images/emoji/google_classic/hugging.png
new file mode 100644
index 00000000000..6ac0f641741
Binary files /dev/null and b/public/images/emoji/google_classic/hugging.png differ
diff --git a/public/images/emoji/google_classic/hugging_face.png b/public/images/emoji/google_classic/hugging_face.png
new file mode 100644
index 00000000000..6ac0f641741
Binary files /dev/null and b/public/images/emoji/google_classic/hugging_face.png differ
diff --git a/public/images/emoji/google_classic/hugs.png b/public/images/emoji/google_classic/hugs.png
new file mode 100644
index 00000000000..6ac0f641741
Binary files /dev/null and b/public/images/emoji/google_classic/hugs.png differ
diff --git a/public/images/emoji/google_classic/hungary.png b/public/images/emoji/google_classic/hungary.png
new file mode 100644
index 00000000000..9bdb575d1e9
Binary files /dev/null and b/public/images/emoji/google_classic/hungary.png differ
diff --git a/public/images/emoji/google_classic/hushed.png b/public/images/emoji/google_classic/hushed.png
new file mode 100644
index 00000000000..1062006e820
Binary files /dev/null and b/public/images/emoji/google_classic/hushed.png differ
diff --git a/public/images/emoji/google_classic/ice_cream.png b/public/images/emoji/google_classic/ice_cream.png
new file mode 100644
index 00000000000..30b30cde5cd
Binary files /dev/null and b/public/images/emoji/google_classic/ice_cream.png differ
diff --git a/public/images/emoji/google_classic/ice_hockey.png b/public/images/emoji/google_classic/ice_hockey.png
new file mode 100644
index 00000000000..ab84461bfb3
Binary files /dev/null and b/public/images/emoji/google_classic/ice_hockey.png differ
diff --git a/public/images/emoji/google_classic/ice_skate.png b/public/images/emoji/google_classic/ice_skate.png
new file mode 100644
index 00000000000..9c2b6c7998c
Binary files /dev/null and b/public/images/emoji/google_classic/ice_skate.png differ
diff --git a/public/images/emoji/google_classic/icecream.png b/public/images/emoji/google_classic/icecream.png
new file mode 100644
index 00000000000..50d5dca0ed8
Binary files /dev/null and b/public/images/emoji/google_classic/icecream.png differ
diff --git a/public/images/emoji/google_classic/iceland.png b/public/images/emoji/google_classic/iceland.png
new file mode 100644
index 00000000000..6e27f14b5a7
Binary files /dev/null and b/public/images/emoji/google_classic/iceland.png differ
diff --git a/public/images/emoji/google_classic/id.png b/public/images/emoji/google_classic/id.png
new file mode 100644
index 00000000000..0d1f0e1bc9d
Binary files /dev/null and b/public/images/emoji/google_classic/id.png differ
diff --git a/public/images/emoji/google_classic/ideograph_advantage.png b/public/images/emoji/google_classic/ideograph_advantage.png
new file mode 100644
index 00000000000..9eb6c340d34
Binary files /dev/null and b/public/images/emoji/google_classic/ideograph_advantage.png differ
diff --git a/public/images/emoji/google_classic/imp.png b/public/images/emoji/google_classic/imp.png
new file mode 100644
index 00000000000..c5cca51457f
Binary files /dev/null and b/public/images/emoji/google_classic/imp.png differ
diff --git a/public/images/emoji/google_classic/inbox_tray.png b/public/images/emoji/google_classic/inbox_tray.png
new file mode 100644
index 00000000000..67148d2ce03
Binary files /dev/null and b/public/images/emoji/google_classic/inbox_tray.png differ
diff --git a/public/images/emoji/google_classic/incoming_envelope.png b/public/images/emoji/google_classic/incoming_envelope.png
new file mode 100644
index 00000000000..92fcce77767
Binary files /dev/null and b/public/images/emoji/google_classic/incoming_envelope.png differ
diff --git a/public/images/emoji/google_classic/india.png b/public/images/emoji/google_classic/india.png
new file mode 100644
index 00000000000..edda6c9a84b
Binary files /dev/null and b/public/images/emoji/google_classic/india.png differ
diff --git a/public/images/emoji/google_classic/indonesia.png b/public/images/emoji/google_classic/indonesia.png
new file mode 100644
index 00000000000..3a0418dacd3
Binary files /dev/null and b/public/images/emoji/google_classic/indonesia.png differ
diff --git a/public/images/emoji/google_classic/information_desk_person.png b/public/images/emoji/google_classic/information_desk_person.png
new file mode 100644
index 00000000000..3d4361ed65e
Binary files /dev/null and b/public/images/emoji/google_classic/information_desk_person.png differ
diff --git a/public/images/emoji/google_classic/information_desk_person/2.png b/public/images/emoji/google_classic/information_desk_person/2.png
new file mode 100644
index 00000000000..79cc5893c36
Binary files /dev/null and b/public/images/emoji/google_classic/information_desk_person/2.png differ
diff --git a/public/images/emoji/google_classic/information_desk_person/3.png b/public/images/emoji/google_classic/information_desk_person/3.png
new file mode 100644
index 00000000000..73e64b5f361
Binary files /dev/null and b/public/images/emoji/google_classic/information_desk_person/3.png differ
diff --git a/public/images/emoji/google_classic/information_desk_person/4.png b/public/images/emoji/google_classic/information_desk_person/4.png
new file mode 100644
index 00000000000..2f6ce066145
Binary files /dev/null and b/public/images/emoji/google_classic/information_desk_person/4.png differ
diff --git a/public/images/emoji/google_classic/information_desk_person/5.png b/public/images/emoji/google_classic/information_desk_person/5.png
new file mode 100644
index 00000000000..b86a70b3fb6
Binary files /dev/null and b/public/images/emoji/google_classic/information_desk_person/5.png differ
diff --git a/public/images/emoji/google_classic/information_desk_person/6.png b/public/images/emoji/google_classic/information_desk_person/6.png
new file mode 100644
index 00000000000..dafc8a1ac0e
Binary files /dev/null and b/public/images/emoji/google_classic/information_desk_person/6.png differ
diff --git a/public/images/emoji/google_classic/information_source.png b/public/images/emoji/google_classic/information_source.png
new file mode 100644
index 00000000000..d982dbd276b
Binary files /dev/null and b/public/images/emoji/google_classic/information_source.png differ
diff --git a/public/images/emoji/google_classic/innocent.png b/public/images/emoji/google_classic/innocent.png
new file mode 100644
index 00000000000..234a5deaab0
Binary files /dev/null and b/public/images/emoji/google_classic/innocent.png differ
diff --git a/public/images/emoji/google_classic/interrobang.png b/public/images/emoji/google_classic/interrobang.png
new file mode 100644
index 00000000000..e96f13955d1
Binary files /dev/null and b/public/images/emoji/google_classic/interrobang.png differ
diff --git a/public/images/emoji/google_classic/iphone.png b/public/images/emoji/google_classic/iphone.png
new file mode 100644
index 00000000000..97ca7c4f79b
Binary files /dev/null and b/public/images/emoji/google_classic/iphone.png differ
diff --git a/public/images/emoji/google_classic/iran.png b/public/images/emoji/google_classic/iran.png
new file mode 100644
index 00000000000..e8e35c6928d
Binary files /dev/null and b/public/images/emoji/google_classic/iran.png differ
diff --git a/public/images/emoji/google_classic/iraq.png b/public/images/emoji/google_classic/iraq.png
new file mode 100644
index 00000000000..bd6cd2729f4
Binary files /dev/null and b/public/images/emoji/google_classic/iraq.png differ
diff --git a/public/images/emoji/google_classic/ireland.png b/public/images/emoji/google_classic/ireland.png
new file mode 100644
index 00000000000..9b36b5b2110
Binary files /dev/null and b/public/images/emoji/google_classic/ireland.png differ
diff --git a/public/images/emoji/google_classic/island.png b/public/images/emoji/google_classic/island.png
new file mode 100644
index 00000000000..33b1d3883cf
Binary files /dev/null and b/public/images/emoji/google_classic/island.png differ
diff --git a/public/images/emoji/google_classic/isle_of_man.png b/public/images/emoji/google_classic/isle_of_man.png
new file mode 100644
index 00000000000..d7c1a17d33c
Binary files /dev/null and b/public/images/emoji/google_classic/isle_of_man.png differ
diff --git a/public/images/emoji/google_classic/israel.png b/public/images/emoji/google_classic/israel.png
new file mode 100644
index 00000000000..713c3ff6fc9
Binary files /dev/null and b/public/images/emoji/google_classic/israel.png differ
diff --git a/public/images/emoji/google_classic/it.png b/public/images/emoji/google_classic/it.png
new file mode 100644
index 00000000000..af28278edfb
Binary files /dev/null and b/public/images/emoji/google_classic/it.png differ
diff --git a/public/images/emoji/google_classic/izakaya_lantern.png b/public/images/emoji/google_classic/izakaya_lantern.png
new file mode 100644
index 00000000000..92063b97fca
Binary files /dev/null and b/public/images/emoji/google_classic/izakaya_lantern.png differ
diff --git a/public/images/emoji/google_classic/jack_o_lantern.png b/public/images/emoji/google_classic/jack_o_lantern.png
new file mode 100644
index 00000000000..52e74c78e10
Binary files /dev/null and b/public/images/emoji/google_classic/jack_o_lantern.png differ
diff --git a/public/images/emoji/google_classic/jamaica.png b/public/images/emoji/google_classic/jamaica.png
new file mode 100644
index 00000000000..89593fefca5
Binary files /dev/null and b/public/images/emoji/google_classic/jamaica.png differ
diff --git a/public/images/emoji/google_classic/japan.png b/public/images/emoji/google_classic/japan.png
new file mode 100644
index 00000000000..a7754cc7342
Binary files /dev/null and b/public/images/emoji/google_classic/japan.png differ
diff --git a/public/images/emoji/google_classic/japanese_castle.png b/public/images/emoji/google_classic/japanese_castle.png
new file mode 100644
index 00000000000..9b19a839326
Binary files /dev/null and b/public/images/emoji/google_classic/japanese_castle.png differ
diff --git a/public/images/emoji/google_classic/japanese_goblin.png b/public/images/emoji/google_classic/japanese_goblin.png
new file mode 100644
index 00000000000..9d0a77f2353
Binary files /dev/null and b/public/images/emoji/google_classic/japanese_goblin.png differ
diff --git a/public/images/emoji/google_classic/japanese_ogre.png b/public/images/emoji/google_classic/japanese_ogre.png
new file mode 100644
index 00000000000..d24dffd0e2d
Binary files /dev/null and b/public/images/emoji/google_classic/japanese_ogre.png differ
diff --git a/public/images/emoji/google_classic/jeans.png b/public/images/emoji/google_classic/jeans.png
new file mode 100644
index 00000000000..bfe464bb3e9
Binary files /dev/null and b/public/images/emoji/google_classic/jeans.png differ
diff --git a/public/images/emoji/google_classic/jersey.png b/public/images/emoji/google_classic/jersey.png
new file mode 100644
index 00000000000..88adae4c9ff
Binary files /dev/null and b/public/images/emoji/google_classic/jersey.png differ
diff --git a/public/images/emoji/google_classic/jordan.png b/public/images/emoji/google_classic/jordan.png
new file mode 100644
index 00000000000..623f05775c1
Binary files /dev/null and b/public/images/emoji/google_classic/jordan.png differ
diff --git a/public/images/emoji/google_classic/joy.png b/public/images/emoji/google_classic/joy.png
new file mode 100644
index 00000000000..249ad7e8f0d
Binary files /dev/null and b/public/images/emoji/google_classic/joy.png differ
diff --git a/public/images/emoji/google_classic/joy_cat.png b/public/images/emoji/google_classic/joy_cat.png
new file mode 100644
index 00000000000..3e7ae5090bd
Binary files /dev/null and b/public/images/emoji/google_classic/joy_cat.png differ
diff --git a/public/images/emoji/google_classic/joystick.png b/public/images/emoji/google_classic/joystick.png
new file mode 100644
index 00000000000..f8183693f9e
Binary files /dev/null and b/public/images/emoji/google_classic/joystick.png differ
diff --git a/public/images/emoji/google_classic/jp.png b/public/images/emoji/google_classic/jp.png
new file mode 100644
index 00000000000..7af1ab49ca4
Binary files /dev/null and b/public/images/emoji/google_classic/jp.png differ
diff --git a/public/images/emoji/google_classic/kaaba.png b/public/images/emoji/google_classic/kaaba.png
new file mode 100644
index 00000000000..a74ce5d86f6
Binary files /dev/null and b/public/images/emoji/google_classic/kaaba.png differ
diff --git a/public/images/emoji/google_classic/kazakhstan.png b/public/images/emoji/google_classic/kazakhstan.png
new file mode 100644
index 00000000000..a17b2b34975
Binary files /dev/null and b/public/images/emoji/google_classic/kazakhstan.png differ
diff --git a/public/images/emoji/google_classic/kenya.png b/public/images/emoji/google_classic/kenya.png
new file mode 100644
index 00000000000..060b3faa3a5
Binary files /dev/null and b/public/images/emoji/google_classic/kenya.png differ
diff --git a/public/images/emoji/google_classic/key.png b/public/images/emoji/google_classic/key.png
new file mode 100644
index 00000000000..05d1ca9b26a
Binary files /dev/null and b/public/images/emoji/google_classic/key.png differ
diff --git a/public/images/emoji/google_classic/key2.png b/public/images/emoji/google_classic/key2.png
new file mode 100644
index 00000000000..87121fe1078
Binary files /dev/null and b/public/images/emoji/google_classic/key2.png differ
diff --git a/public/images/emoji/google_classic/keyboard.png b/public/images/emoji/google_classic/keyboard.png
new file mode 100644
index 00000000000..197caff4e7b
Binary files /dev/null and b/public/images/emoji/google_classic/keyboard.png differ
diff --git a/public/images/emoji/google_classic/keycap_star.png b/public/images/emoji/google_classic/keycap_star.png
new file mode 100644
index 00000000000..bc41c667b2c
Binary files /dev/null and b/public/images/emoji/google_classic/keycap_star.png differ
diff --git a/public/images/emoji/google_classic/keycap_ten.png b/public/images/emoji/google_classic/keycap_ten.png
new file mode 100644
index 00000000000..6690db7bc30
Binary files /dev/null and b/public/images/emoji/google_classic/keycap_ten.png differ
diff --git a/public/images/emoji/google_classic/kick_scooter.png b/public/images/emoji/google_classic/kick_scooter.png
new file mode 100644
index 00000000000..e0b55919f4e
Binary files /dev/null and b/public/images/emoji/google_classic/kick_scooter.png differ
diff --git a/public/images/emoji/google_classic/kimono.png b/public/images/emoji/google_classic/kimono.png
new file mode 100644
index 00000000000..a8161adf178
Binary files /dev/null and b/public/images/emoji/google_classic/kimono.png differ
diff --git a/public/images/emoji/google_classic/kiribati.png b/public/images/emoji/google_classic/kiribati.png
new file mode 100644
index 00000000000..aa465cce8bf
Binary files /dev/null and b/public/images/emoji/google_classic/kiribati.png differ
diff --git a/public/images/emoji/google_classic/kiss.png b/public/images/emoji/google_classic/kiss.png
new file mode 100644
index 00000000000..4c74c59e2ee
Binary files /dev/null and b/public/images/emoji/google_classic/kiss.png differ
diff --git a/public/images/emoji/google_classic/kissing.png b/public/images/emoji/google_classic/kissing.png
new file mode 100644
index 00000000000..4d9b82e74a9
Binary files /dev/null and b/public/images/emoji/google_classic/kissing.png differ
diff --git a/public/images/emoji/google_classic/kissing_cat.png b/public/images/emoji/google_classic/kissing_cat.png
new file mode 100644
index 00000000000..bbe8c4a97ce
Binary files /dev/null and b/public/images/emoji/google_classic/kissing_cat.png differ
diff --git a/public/images/emoji/google_classic/kissing_closed_eyes.png b/public/images/emoji/google_classic/kissing_closed_eyes.png
new file mode 100644
index 00000000000..12079862cd9
Binary files /dev/null and b/public/images/emoji/google_classic/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/google_classic/kissing_heart.png b/public/images/emoji/google_classic/kissing_heart.png
new file mode 100644
index 00000000000..139ce489a48
Binary files /dev/null and b/public/images/emoji/google_classic/kissing_heart.png differ
diff --git a/public/images/emoji/google_classic/kissing_smiling_eyes.png b/public/images/emoji/google_classic/kissing_smiling_eyes.png
new file mode 100644
index 00000000000..d69b5d304ac
Binary files /dev/null and b/public/images/emoji/google_classic/kissing_smiling_eyes.png differ
diff --git a/public/images/emoji/google_classic/kiwi_fruit.png b/public/images/emoji/google_classic/kiwi_fruit.png
new file mode 100644
index 00000000000..098e0bd3ecf
Binary files /dev/null and b/public/images/emoji/google_classic/kiwi_fruit.png differ
diff --git a/public/images/emoji/google_classic/knife.png b/public/images/emoji/google_classic/knife.png
new file mode 100644
index 00000000000..88cee60960b
Binary files /dev/null and b/public/images/emoji/google_classic/knife.png differ
diff --git a/public/images/emoji/google_classic/koala.png b/public/images/emoji/google_classic/koala.png
new file mode 100644
index 00000000000..70b131e06bd
Binary files /dev/null and b/public/images/emoji/google_classic/koala.png differ
diff --git a/public/images/emoji/google_classic/koko.png b/public/images/emoji/google_classic/koko.png
new file mode 100644
index 00000000000..ddaf0447ddf
Binary files /dev/null and b/public/images/emoji/google_classic/koko.png differ
diff --git a/public/images/emoji/google_classic/kosovo.png b/public/images/emoji/google_classic/kosovo.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/kosovo.png differ
diff --git a/public/images/emoji/google_classic/kr.png b/public/images/emoji/google_classic/kr.png
new file mode 100644
index 00000000000..33cac8bdf86
Binary files /dev/null and b/public/images/emoji/google_classic/kr.png differ
diff --git a/public/images/emoji/google_classic/kuwait.png b/public/images/emoji/google_classic/kuwait.png
new file mode 100644
index 00000000000..277c4622877
Binary files /dev/null and b/public/images/emoji/google_classic/kuwait.png differ
diff --git a/public/images/emoji/google_classic/kyrgyzstan.png b/public/images/emoji/google_classic/kyrgyzstan.png
new file mode 100644
index 00000000000..66941c02230
Binary files /dev/null and b/public/images/emoji/google_classic/kyrgyzstan.png differ
diff --git a/public/images/emoji/google_classic/label.png b/public/images/emoji/google_classic/label.png
new file mode 100644
index 00000000000..c3043450a54
Binary files /dev/null and b/public/images/emoji/google_classic/label.png differ
diff --git a/public/images/emoji/google_classic/laos.png b/public/images/emoji/google_classic/laos.png
new file mode 100644
index 00000000000..24161a52165
Binary files /dev/null and b/public/images/emoji/google_classic/laos.png differ
diff --git a/public/images/emoji/google_classic/large_blue_circle.png b/public/images/emoji/google_classic/large_blue_circle.png
new file mode 100644
index 00000000000..2a680248230
Binary files /dev/null and b/public/images/emoji/google_classic/large_blue_circle.png differ
diff --git a/public/images/emoji/google_classic/large_blue_diamond.png b/public/images/emoji/google_classic/large_blue_diamond.png
new file mode 100644
index 00000000000..fc3f5b7c419
Binary files /dev/null and b/public/images/emoji/google_classic/large_blue_diamond.png differ
diff --git a/public/images/emoji/google_classic/large_orange_diamond.png b/public/images/emoji/google_classic/large_orange_diamond.png
new file mode 100644
index 00000000000..b652d77950a
Binary files /dev/null and b/public/images/emoji/google_classic/large_orange_diamond.png differ
diff --git a/public/images/emoji/google_classic/last_quarter_moon.png b/public/images/emoji/google_classic/last_quarter_moon.png
new file mode 100644
index 00000000000..c6ad0a2dc4b
Binary files /dev/null and b/public/images/emoji/google_classic/last_quarter_moon.png differ
diff --git a/public/images/emoji/google_classic/last_quarter_moon_with_face.png b/public/images/emoji/google_classic/last_quarter_moon_with_face.png
new file mode 100644
index 00000000000..96bd7112721
Binary files /dev/null and b/public/images/emoji/google_classic/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/google_classic/latin_cross.png b/public/images/emoji/google_classic/latin_cross.png
new file mode 100644
index 00000000000..52d188499f9
Binary files /dev/null and b/public/images/emoji/google_classic/latin_cross.png differ
diff --git a/public/images/emoji/google_classic/latvia.png b/public/images/emoji/google_classic/latvia.png
new file mode 100644
index 00000000000..db92a16a76f
Binary files /dev/null and b/public/images/emoji/google_classic/latvia.png differ
diff --git a/public/images/emoji/google_classic/laughing.png b/public/images/emoji/google_classic/laughing.png
new file mode 100644
index 00000000000..04d29aa6a7d
Binary files /dev/null and b/public/images/emoji/google_classic/laughing.png differ
diff --git a/public/images/emoji/google_classic/leaves.png b/public/images/emoji/google_classic/leaves.png
new file mode 100644
index 00000000000..764114eaaf6
Binary files /dev/null and b/public/images/emoji/google_classic/leaves.png differ
diff --git a/public/images/emoji/google_classic/lebanon.png b/public/images/emoji/google_classic/lebanon.png
new file mode 100644
index 00000000000..0b72ef1ed24
Binary files /dev/null and b/public/images/emoji/google_classic/lebanon.png differ
diff --git a/public/images/emoji/google_classic/ledger.png b/public/images/emoji/google_classic/ledger.png
new file mode 100644
index 00000000000..e709f538bfe
Binary files /dev/null and b/public/images/emoji/google_classic/ledger.png differ
diff --git a/public/images/emoji/google_classic/left_luggage.png b/public/images/emoji/google_classic/left_luggage.png
new file mode 100644
index 00000000000..47ad0e4f6ca
Binary files /dev/null and b/public/images/emoji/google_classic/left_luggage.png differ
diff --git a/public/images/emoji/google_classic/left_right_arrow.png b/public/images/emoji/google_classic/left_right_arrow.png
new file mode 100644
index 00000000000..29d18abc794
Binary files /dev/null and b/public/images/emoji/google_classic/left_right_arrow.png differ
diff --git a/public/images/emoji/google_classic/left_speech_bubble.png b/public/images/emoji/google_classic/left_speech_bubble.png
new file mode 100644
index 00000000000..450d8beafcc
Binary files /dev/null and b/public/images/emoji/google_classic/left_speech_bubble.png differ
diff --git a/public/images/emoji/google_classic/leftwards_arrow_with_hook.png b/public/images/emoji/google_classic/leftwards_arrow_with_hook.png
new file mode 100644
index 00000000000..2cefb32033b
Binary files /dev/null and b/public/images/emoji/google_classic/leftwards_arrow_with_hook.png differ
diff --git a/public/images/emoji/google_classic/lemon.png b/public/images/emoji/google_classic/lemon.png
new file mode 100644
index 00000000000..7cac69f07d9
Binary files /dev/null and b/public/images/emoji/google_classic/lemon.png differ
diff --git a/public/images/emoji/google_classic/leo.png b/public/images/emoji/google_classic/leo.png
new file mode 100644
index 00000000000..99325408e35
Binary files /dev/null and b/public/images/emoji/google_classic/leo.png differ
diff --git a/public/images/emoji/google_classic/leopard.png b/public/images/emoji/google_classic/leopard.png
new file mode 100644
index 00000000000..c781a5b6220
Binary files /dev/null and b/public/images/emoji/google_classic/leopard.png differ
diff --git a/public/images/emoji/google_classic/lesotho.png b/public/images/emoji/google_classic/lesotho.png
new file mode 100644
index 00000000000..9268fabf63f
Binary files /dev/null and b/public/images/emoji/google_classic/lesotho.png differ
diff --git a/public/images/emoji/google_classic/level_slider.png b/public/images/emoji/google_classic/level_slider.png
new file mode 100644
index 00000000000..c255df10ffd
Binary files /dev/null and b/public/images/emoji/google_classic/level_slider.png differ
diff --git a/public/images/emoji/google_classic/levitate.png b/public/images/emoji/google_classic/levitate.png
new file mode 100644
index 00000000000..aafbbc2d802
Binary files /dev/null and b/public/images/emoji/google_classic/levitate.png differ
diff --git a/public/images/emoji/google_classic/liberia.png b/public/images/emoji/google_classic/liberia.png
new file mode 100644
index 00000000000..8025350c3f8
Binary files /dev/null and b/public/images/emoji/google_classic/liberia.png differ
diff --git a/public/images/emoji/google_classic/libra.png b/public/images/emoji/google_classic/libra.png
new file mode 100644
index 00000000000..4d0a2c452a7
Binary files /dev/null and b/public/images/emoji/google_classic/libra.png differ
diff --git a/public/images/emoji/google_classic/libya.png b/public/images/emoji/google_classic/libya.png
new file mode 100644
index 00000000000..0c24ee712f9
Binary files /dev/null and b/public/images/emoji/google_classic/libya.png differ
diff --git a/public/images/emoji/google_classic/liechtenstein.png b/public/images/emoji/google_classic/liechtenstein.png
new file mode 100644
index 00000000000..f3fee572ec3
Binary files /dev/null and b/public/images/emoji/google_classic/liechtenstein.png differ
diff --git a/public/images/emoji/google_classic/lifter.png b/public/images/emoji/google_classic/lifter.png
new file mode 100644
index 00000000000..eb58823175e
Binary files /dev/null and b/public/images/emoji/google_classic/lifter.png differ
diff --git a/public/images/emoji/google_classic/lifter/2.png b/public/images/emoji/google_classic/lifter/2.png
new file mode 100644
index 00000000000..84419dd4f63
Binary files /dev/null and b/public/images/emoji/google_classic/lifter/2.png differ
diff --git a/public/images/emoji/google_classic/lifter/3.png b/public/images/emoji/google_classic/lifter/3.png
new file mode 100644
index 00000000000..10a04dbabe6
Binary files /dev/null and b/public/images/emoji/google_classic/lifter/3.png differ
diff --git a/public/images/emoji/google_classic/lifter/4.png b/public/images/emoji/google_classic/lifter/4.png
new file mode 100644
index 00000000000..72f83cb18ca
Binary files /dev/null and b/public/images/emoji/google_classic/lifter/4.png differ
diff --git a/public/images/emoji/google_classic/lifter/5.png b/public/images/emoji/google_classic/lifter/5.png
new file mode 100644
index 00000000000..d8114472342
Binary files /dev/null and b/public/images/emoji/google_classic/lifter/5.png differ
diff --git a/public/images/emoji/google_classic/lifter/6.png b/public/images/emoji/google_classic/lifter/6.png
new file mode 100644
index 00000000000..21be04c656a
Binary files /dev/null and b/public/images/emoji/google_classic/lifter/6.png differ
diff --git a/public/images/emoji/google_classic/light_rail.png b/public/images/emoji/google_classic/light_rail.png
new file mode 100644
index 00000000000..09251b09349
Binary files /dev/null and b/public/images/emoji/google_classic/light_rail.png differ
diff --git a/public/images/emoji/google_classic/link.png b/public/images/emoji/google_classic/link.png
new file mode 100644
index 00000000000..cb01545722a
Binary files /dev/null and b/public/images/emoji/google_classic/link.png differ
diff --git a/public/images/emoji/google_classic/linked_paperclips.png b/public/images/emoji/google_classic/linked_paperclips.png
new file mode 100644
index 00000000000..e34ff5ad2a3
Binary files /dev/null and b/public/images/emoji/google_classic/linked_paperclips.png differ
diff --git a/public/images/emoji/google_classic/lion.png b/public/images/emoji/google_classic/lion.png
new file mode 100644
index 00000000000..cccce723442
Binary files /dev/null and b/public/images/emoji/google_classic/lion.png differ
diff --git a/public/images/emoji/google_classic/lion_face.png b/public/images/emoji/google_classic/lion_face.png
new file mode 100644
index 00000000000..cccce723442
Binary files /dev/null and b/public/images/emoji/google_classic/lion_face.png differ
diff --git a/public/images/emoji/google_classic/lips.png b/public/images/emoji/google_classic/lips.png
new file mode 100644
index 00000000000..193841abd43
Binary files /dev/null and b/public/images/emoji/google_classic/lips.png differ
diff --git a/public/images/emoji/google_classic/lipstick.png b/public/images/emoji/google_classic/lipstick.png
new file mode 100644
index 00000000000..57431fd4625
Binary files /dev/null and b/public/images/emoji/google_classic/lipstick.png differ
diff --git a/public/images/emoji/google_classic/lithuania.png b/public/images/emoji/google_classic/lithuania.png
new file mode 100644
index 00000000000..5e8c9eafcac
Binary files /dev/null and b/public/images/emoji/google_classic/lithuania.png differ
diff --git a/public/images/emoji/google_classic/lizard.png b/public/images/emoji/google_classic/lizard.png
new file mode 100644
index 00000000000..47cd7c3dc5d
Binary files /dev/null and b/public/images/emoji/google_classic/lizard.png differ
diff --git a/public/images/emoji/google_classic/lock.png b/public/images/emoji/google_classic/lock.png
new file mode 100644
index 00000000000..50a713c2a55
Binary files /dev/null and b/public/images/emoji/google_classic/lock.png differ
diff --git a/public/images/emoji/google_classic/lock_with_ink_pen.png b/public/images/emoji/google_classic/lock_with_ink_pen.png
new file mode 100644
index 00000000000..c228e63bdb2
Binary files /dev/null and b/public/images/emoji/google_classic/lock_with_ink_pen.png differ
diff --git a/public/images/emoji/google_classic/lollipop.png b/public/images/emoji/google_classic/lollipop.png
new file mode 100644
index 00000000000..fd51bc72c06
Binary files /dev/null and b/public/images/emoji/google_classic/lollipop.png differ
diff --git a/public/images/emoji/google_classic/loop.png b/public/images/emoji/google_classic/loop.png
new file mode 100644
index 00000000000..eb371562dbd
Binary files /dev/null and b/public/images/emoji/google_classic/loop.png differ
diff --git a/public/images/emoji/google_classic/loud_sound.png b/public/images/emoji/google_classic/loud_sound.png
new file mode 100644
index 00000000000..1d5da87a4aa
Binary files /dev/null and b/public/images/emoji/google_classic/loud_sound.png differ
diff --git a/public/images/emoji/google_classic/loudspeaker.png b/public/images/emoji/google_classic/loudspeaker.png
new file mode 100644
index 00000000000..2702982fcfe
Binary files /dev/null and b/public/images/emoji/google_classic/loudspeaker.png differ
diff --git a/public/images/emoji/google_classic/love_hotel.png b/public/images/emoji/google_classic/love_hotel.png
new file mode 100644
index 00000000000..3172fe6ca11
Binary files /dev/null and b/public/images/emoji/google_classic/love_hotel.png differ
diff --git a/public/images/emoji/google_classic/love_letter.png b/public/images/emoji/google_classic/love_letter.png
new file mode 100644
index 00000000000..d2d29b71069
Binary files /dev/null and b/public/images/emoji/google_classic/love_letter.png differ
diff --git a/public/images/emoji/google_classic/love_you_gesture.png b/public/images/emoji/google_classic/love_you_gesture.png
new file mode 100644
index 00000000000..14ef7c72b20
Binary files /dev/null and b/public/images/emoji/google_classic/love_you_gesture.png differ
diff --git a/public/images/emoji/google_classic/love_you_gesture/2.png b/public/images/emoji/google_classic/love_you_gesture/2.png
new file mode 100644
index 00000000000..b70217e894c
Binary files /dev/null and b/public/images/emoji/google_classic/love_you_gesture/2.png differ
diff --git a/public/images/emoji/google_classic/love_you_gesture/3.png b/public/images/emoji/google_classic/love_you_gesture/3.png
new file mode 100644
index 00000000000..aa984ea9263
Binary files /dev/null and b/public/images/emoji/google_classic/love_you_gesture/3.png differ
diff --git a/public/images/emoji/google_classic/love_you_gesture/4.png b/public/images/emoji/google_classic/love_you_gesture/4.png
new file mode 100644
index 00000000000..5decb0e8008
Binary files /dev/null and b/public/images/emoji/google_classic/love_you_gesture/4.png differ
diff --git a/public/images/emoji/google_classic/love_you_gesture/5.png b/public/images/emoji/google_classic/love_you_gesture/5.png
new file mode 100644
index 00000000000..e0bb218cc08
Binary files /dev/null and b/public/images/emoji/google_classic/love_you_gesture/5.png differ
diff --git a/public/images/emoji/google_classic/love_you_gesture/6.png b/public/images/emoji/google_classic/love_you_gesture/6.png
new file mode 100644
index 00000000000..bb51bde8bbd
Binary files /dev/null and b/public/images/emoji/google_classic/love_you_gesture/6.png differ
diff --git a/public/images/emoji/google_classic/low_brightness.png b/public/images/emoji/google_classic/low_brightness.png
new file mode 100644
index 00000000000..21d19226e1e
Binary files /dev/null and b/public/images/emoji/google_classic/low_brightness.png differ
diff --git a/public/images/emoji/google_classic/lower_left_ballpoint_pen.png b/public/images/emoji/google_classic/lower_left_ballpoint_pen.png
new file mode 100644
index 00000000000..11acae0cdd3
Binary files /dev/null and b/public/images/emoji/google_classic/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/google_classic/lower_left_crayon.png b/public/images/emoji/google_classic/lower_left_crayon.png
new file mode 100644
index 00000000000..0ef86da10fb
Binary files /dev/null and b/public/images/emoji/google_classic/lower_left_crayon.png differ
diff --git a/public/images/emoji/google_classic/lower_left_fountain_pen.png b/public/images/emoji/google_classic/lower_left_fountain_pen.png
new file mode 100644
index 00000000000..4af057ce4ec
Binary files /dev/null and b/public/images/emoji/google_classic/lower_left_fountain_pen.png differ
diff --git a/public/images/emoji/google_classic/lower_left_paintbrush.png b/public/images/emoji/google_classic/lower_left_paintbrush.png
new file mode 100644
index 00000000000..81b26f22fab
Binary files /dev/null and b/public/images/emoji/google_classic/lower_left_paintbrush.png differ
diff --git a/public/images/emoji/google_classic/luxembourg.png b/public/images/emoji/google_classic/luxembourg.png
new file mode 100644
index 00000000000..0ca067c3a32
Binary files /dev/null and b/public/images/emoji/google_classic/luxembourg.png differ
diff --git a/public/images/emoji/google_classic/lying_face.png b/public/images/emoji/google_classic/lying_face.png
new file mode 100644
index 00000000000..0f0ddf93f60
Binary files /dev/null and b/public/images/emoji/google_classic/lying_face.png differ
diff --git a/public/images/emoji/google_classic/m.png b/public/images/emoji/google_classic/m.png
new file mode 100644
index 00000000000..6c7b443529a
Binary files /dev/null and b/public/images/emoji/google_classic/m.png differ
diff --git a/public/images/emoji/google_classic/macau.png b/public/images/emoji/google_classic/macau.png
new file mode 100644
index 00000000000..4361c0d493b
Binary files /dev/null and b/public/images/emoji/google_classic/macau.png differ
diff --git a/public/images/emoji/google_classic/macedonia.png b/public/images/emoji/google_classic/macedonia.png
new file mode 100644
index 00000000000..e5655b02011
Binary files /dev/null and b/public/images/emoji/google_classic/macedonia.png differ
diff --git a/public/images/emoji/google_classic/madagascar.png b/public/images/emoji/google_classic/madagascar.png
new file mode 100644
index 00000000000..16ecfbad427
Binary files /dev/null and b/public/images/emoji/google_classic/madagascar.png differ
diff --git a/public/images/emoji/google_classic/mag.png b/public/images/emoji/google_classic/mag.png
new file mode 100644
index 00000000000..3d58da8d6ed
Binary files /dev/null and b/public/images/emoji/google_classic/mag.png differ
diff --git a/public/images/emoji/google_classic/mag_right.png b/public/images/emoji/google_classic/mag_right.png
new file mode 100644
index 00000000000..6217ffa8f1f
Binary files /dev/null and b/public/images/emoji/google_classic/mag_right.png differ
diff --git a/public/images/emoji/google_classic/mage.png b/public/images/emoji/google_classic/mage.png
new file mode 100644
index 00000000000..71c1b13f924
Binary files /dev/null and b/public/images/emoji/google_classic/mage.png differ
diff --git a/public/images/emoji/google_classic/mage/2.png b/public/images/emoji/google_classic/mage/2.png
new file mode 100644
index 00000000000..823f6843fad
Binary files /dev/null and b/public/images/emoji/google_classic/mage/2.png differ
diff --git a/public/images/emoji/google_classic/mage/3.png b/public/images/emoji/google_classic/mage/3.png
new file mode 100644
index 00000000000..c2ff6622a04
Binary files /dev/null and b/public/images/emoji/google_classic/mage/3.png differ
diff --git a/public/images/emoji/google_classic/mage/4.png b/public/images/emoji/google_classic/mage/4.png
new file mode 100644
index 00000000000..76d0a52e374
Binary files /dev/null and b/public/images/emoji/google_classic/mage/4.png differ
diff --git a/public/images/emoji/google_classic/mage/5.png b/public/images/emoji/google_classic/mage/5.png
new file mode 100644
index 00000000000..ddb5de55806
Binary files /dev/null and b/public/images/emoji/google_classic/mage/5.png differ
diff --git a/public/images/emoji/google_classic/mage/6.png b/public/images/emoji/google_classic/mage/6.png
new file mode 100644
index 00000000000..302dd62dfb3
Binary files /dev/null and b/public/images/emoji/google_classic/mage/6.png differ
diff --git a/public/images/emoji/google_classic/mahjong.png b/public/images/emoji/google_classic/mahjong.png
new file mode 100644
index 00000000000..e00e0879e2d
Binary files /dev/null and b/public/images/emoji/google_classic/mahjong.png differ
diff --git a/public/images/emoji/google_classic/mailbox.png b/public/images/emoji/google_classic/mailbox.png
new file mode 100644
index 00000000000..3036e4fff35
Binary files /dev/null and b/public/images/emoji/google_classic/mailbox.png differ
diff --git a/public/images/emoji/google_classic/mailbox_closed.png b/public/images/emoji/google_classic/mailbox_closed.png
new file mode 100644
index 00000000000..2a9678b583b
Binary files /dev/null and b/public/images/emoji/google_classic/mailbox_closed.png differ
diff --git a/public/images/emoji/google_classic/mailbox_with_mail.png b/public/images/emoji/google_classic/mailbox_with_mail.png
new file mode 100644
index 00000000000..6539904a2d3
Binary files /dev/null and b/public/images/emoji/google_classic/mailbox_with_mail.png differ
diff --git a/public/images/emoji/google_classic/mailbox_with_no_mail.png b/public/images/emoji/google_classic/mailbox_with_no_mail.png
new file mode 100644
index 00000000000..d5fb100823b
Binary files /dev/null and b/public/images/emoji/google_classic/mailbox_with_no_mail.png differ
diff --git a/public/images/emoji/google_classic/malawi.png b/public/images/emoji/google_classic/malawi.png
new file mode 100644
index 00000000000..5db196f2d7a
Binary files /dev/null and b/public/images/emoji/google_classic/malawi.png differ
diff --git a/public/images/emoji/google_classic/malaysia.png b/public/images/emoji/google_classic/malaysia.png
new file mode 100644
index 00000000000..2e705f5bfda
Binary files /dev/null and b/public/images/emoji/google_classic/malaysia.png differ
diff --git a/public/images/emoji/google_classic/maldives.png b/public/images/emoji/google_classic/maldives.png
new file mode 100644
index 00000000000..34fc88c9006
Binary files /dev/null and b/public/images/emoji/google_classic/maldives.png differ
diff --git a/public/images/emoji/google_classic/male_couple_with_heart.png b/public/images/emoji/google_classic/male_couple_with_heart.png
new file mode 100644
index 00000000000..ca94117982f
Binary files /dev/null and b/public/images/emoji/google_classic/male_couple_with_heart.png differ
diff --git a/public/images/emoji/google_classic/male_couplekiss.png b/public/images/emoji/google_classic/male_couplekiss.png
new file mode 100644
index 00000000000..b0c3a0b62e6
Binary files /dev/null and b/public/images/emoji/google_classic/male_couplekiss.png differ
diff --git a/public/images/emoji/google_classic/male_detective.png b/public/images/emoji/google_classic/male_detective.png
new file mode 100644
index 00000000000..b76dce309bf
Binary files /dev/null and b/public/images/emoji/google_classic/male_detective.png differ
diff --git a/public/images/emoji/google_classic/male_detective/2.png b/public/images/emoji/google_classic/male_detective/2.png
new file mode 100644
index 00000000000..d7856fc1c54
Binary files /dev/null and b/public/images/emoji/google_classic/male_detective/2.png differ
diff --git a/public/images/emoji/google_classic/male_detective/3.png b/public/images/emoji/google_classic/male_detective/3.png
new file mode 100644
index 00000000000..7913646a104
Binary files /dev/null and b/public/images/emoji/google_classic/male_detective/3.png differ
diff --git a/public/images/emoji/google_classic/male_detective/4.png b/public/images/emoji/google_classic/male_detective/4.png
new file mode 100644
index 00000000000..69cb4974a6a
Binary files /dev/null and b/public/images/emoji/google_classic/male_detective/4.png differ
diff --git a/public/images/emoji/google_classic/male_detective/5.png b/public/images/emoji/google_classic/male_detective/5.png
new file mode 100644
index 00000000000..53d3133222c
Binary files /dev/null and b/public/images/emoji/google_classic/male_detective/5.png differ
diff --git a/public/images/emoji/google_classic/male_detective/6.png b/public/images/emoji/google_classic/male_detective/6.png
new file mode 100644
index 00000000000..d9d076168e7
Binary files /dev/null and b/public/images/emoji/google_classic/male_detective/6.png differ
diff --git a/public/images/emoji/google_classic/mali.png b/public/images/emoji/google_classic/mali.png
new file mode 100644
index 00000000000..16c72da7a5a
Binary files /dev/null and b/public/images/emoji/google_classic/mali.png differ
diff --git a/public/images/emoji/google_classic/malta.png b/public/images/emoji/google_classic/malta.png
new file mode 100644
index 00000000000..8851848686d
Binary files /dev/null and b/public/images/emoji/google_classic/malta.png differ
diff --git a/public/images/emoji/google_classic/man.png b/public/images/emoji/google_classic/man.png
new file mode 100644
index 00000000000..f2d68401e86
Binary files /dev/null and b/public/images/emoji/google_classic/man.png differ
diff --git a/public/images/emoji/google_classic/man/2.png b/public/images/emoji/google_classic/man/2.png
new file mode 100644
index 00000000000..fb9786d6ca2
Binary files /dev/null and b/public/images/emoji/google_classic/man/2.png differ
diff --git a/public/images/emoji/google_classic/man/3.png b/public/images/emoji/google_classic/man/3.png
new file mode 100644
index 00000000000..a608f8ca386
Binary files /dev/null and b/public/images/emoji/google_classic/man/3.png differ
diff --git a/public/images/emoji/google_classic/man/4.png b/public/images/emoji/google_classic/man/4.png
new file mode 100644
index 00000000000..c32c4c09e70
Binary files /dev/null and b/public/images/emoji/google_classic/man/4.png differ
diff --git a/public/images/emoji/google_classic/man/5.png b/public/images/emoji/google_classic/man/5.png
new file mode 100644
index 00000000000..099c48566f5
Binary files /dev/null and b/public/images/emoji/google_classic/man/5.png differ
diff --git a/public/images/emoji/google_classic/man/6.png b/public/images/emoji/google_classic/man/6.png
new file mode 100644
index 00000000000..b64f178fd38
Binary files /dev/null and b/public/images/emoji/google_classic/man/6.png differ
diff --git a/public/images/emoji/google_classic/man_artist.png b/public/images/emoji/google_classic/man_artist.png
new file mode 100644
index 00000000000..9aecbe8722e
Binary files /dev/null and b/public/images/emoji/google_classic/man_artist.png differ
diff --git a/public/images/emoji/google_classic/man_artist/2.png b/public/images/emoji/google_classic/man_artist/2.png
new file mode 100644
index 00000000000..643f7586d4a
Binary files /dev/null and b/public/images/emoji/google_classic/man_artist/2.png differ
diff --git a/public/images/emoji/google_classic/man_artist/3.png b/public/images/emoji/google_classic/man_artist/3.png
new file mode 100644
index 00000000000..a63988f842a
Binary files /dev/null and b/public/images/emoji/google_classic/man_artist/3.png differ
diff --git a/public/images/emoji/google_classic/man_artist/4.png b/public/images/emoji/google_classic/man_artist/4.png
new file mode 100644
index 00000000000..f3b2496069c
Binary files /dev/null and b/public/images/emoji/google_classic/man_artist/4.png differ
diff --git a/public/images/emoji/google_classic/man_artist/5.png b/public/images/emoji/google_classic/man_artist/5.png
new file mode 100644
index 00000000000..198cbb11de7
Binary files /dev/null and b/public/images/emoji/google_classic/man_artist/5.png differ
diff --git a/public/images/emoji/google_classic/man_artist/6.png b/public/images/emoji/google_classic/man_artist/6.png
new file mode 100644
index 00000000000..272a25075dc
Binary files /dev/null and b/public/images/emoji/google_classic/man_artist/6.png differ
diff --git a/public/images/emoji/google_classic/man_astronaut.png b/public/images/emoji/google_classic/man_astronaut.png
new file mode 100644
index 00000000000..09c0fec026e
Binary files /dev/null and b/public/images/emoji/google_classic/man_astronaut.png differ
diff --git a/public/images/emoji/google_classic/man_astronaut/2.png b/public/images/emoji/google_classic/man_astronaut/2.png
new file mode 100644
index 00000000000..3721356b475
Binary files /dev/null and b/public/images/emoji/google_classic/man_astronaut/2.png differ
diff --git a/public/images/emoji/google_classic/man_astronaut/3.png b/public/images/emoji/google_classic/man_astronaut/3.png
new file mode 100644
index 00000000000..45e02faa220
Binary files /dev/null and b/public/images/emoji/google_classic/man_astronaut/3.png differ
diff --git a/public/images/emoji/google_classic/man_astronaut/4.png b/public/images/emoji/google_classic/man_astronaut/4.png
new file mode 100644
index 00000000000..e83826d61af
Binary files /dev/null and b/public/images/emoji/google_classic/man_astronaut/4.png differ
diff --git a/public/images/emoji/google_classic/man_astronaut/5.png b/public/images/emoji/google_classic/man_astronaut/5.png
new file mode 100644
index 00000000000..194f3ed59f0
Binary files /dev/null and b/public/images/emoji/google_classic/man_astronaut/5.png differ
diff --git a/public/images/emoji/google_classic/man_astronaut/6.png b/public/images/emoji/google_classic/man_astronaut/6.png
new file mode 100644
index 00000000000..3a703eabc5d
Binary files /dev/null and b/public/images/emoji/google_classic/man_astronaut/6.png differ
diff --git a/public/images/emoji/google_classic/man_cartwheeling.png b/public/images/emoji/google_classic/man_cartwheeling.png
new file mode 100644
index 00000000000..e6899b43f24
Binary files /dev/null and b/public/images/emoji/google_classic/man_cartwheeling.png differ
diff --git a/public/images/emoji/google_classic/man_cartwheeling/2.png b/public/images/emoji/google_classic/man_cartwheeling/2.png
new file mode 100644
index 00000000000..ebaf2ca3a24
Binary files /dev/null and b/public/images/emoji/google_classic/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/google_classic/man_cartwheeling/3.png b/public/images/emoji/google_classic/man_cartwheeling/3.png
new file mode 100644
index 00000000000..075c966194c
Binary files /dev/null and b/public/images/emoji/google_classic/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/google_classic/man_cartwheeling/4.png b/public/images/emoji/google_classic/man_cartwheeling/4.png
new file mode 100644
index 00000000000..c05617d9bfb
Binary files /dev/null and b/public/images/emoji/google_classic/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/google_classic/man_cartwheeling/5.png b/public/images/emoji/google_classic/man_cartwheeling/5.png
new file mode 100644
index 00000000000..1c34ec0ea0a
Binary files /dev/null and b/public/images/emoji/google_classic/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/google_classic/man_cartwheeling/6.png b/public/images/emoji/google_classic/man_cartwheeling/6.png
new file mode 100644
index 00000000000..4be79e755fc
Binary files /dev/null and b/public/images/emoji/google_classic/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/google_classic/man_cook.png b/public/images/emoji/google_classic/man_cook.png
new file mode 100644
index 00000000000..e82044b9ee7
Binary files /dev/null and b/public/images/emoji/google_classic/man_cook.png differ
diff --git a/public/images/emoji/google_classic/man_cook/2.png b/public/images/emoji/google_classic/man_cook/2.png
new file mode 100644
index 00000000000..13a5e8d1375
Binary files /dev/null and b/public/images/emoji/google_classic/man_cook/2.png differ
diff --git a/public/images/emoji/google_classic/man_cook/3.png b/public/images/emoji/google_classic/man_cook/3.png
new file mode 100644
index 00000000000..c071cc5f4c4
Binary files /dev/null and b/public/images/emoji/google_classic/man_cook/3.png differ
diff --git a/public/images/emoji/google_classic/man_cook/4.png b/public/images/emoji/google_classic/man_cook/4.png
new file mode 100644
index 00000000000..1dc39e119a8
Binary files /dev/null and b/public/images/emoji/google_classic/man_cook/4.png differ
diff --git a/public/images/emoji/google_classic/man_cook/5.png b/public/images/emoji/google_classic/man_cook/5.png
new file mode 100644
index 00000000000..942a826825b
Binary files /dev/null and b/public/images/emoji/google_classic/man_cook/5.png differ
diff --git a/public/images/emoji/google_classic/man_cook/6.png b/public/images/emoji/google_classic/man_cook/6.png
new file mode 100644
index 00000000000..66820e43123
Binary files /dev/null and b/public/images/emoji/google_classic/man_cook/6.png differ
diff --git a/public/images/emoji/google_classic/man_dancing.png b/public/images/emoji/google_classic/man_dancing.png
new file mode 100644
index 00000000000..b064b48ff68
Binary files /dev/null and b/public/images/emoji/google_classic/man_dancing.png differ
diff --git a/public/images/emoji/google_classic/man_dancing/2.png b/public/images/emoji/google_classic/man_dancing/2.png
new file mode 100644
index 00000000000..e8b42068243
Binary files /dev/null and b/public/images/emoji/google_classic/man_dancing/2.png differ
diff --git a/public/images/emoji/google_classic/man_dancing/3.png b/public/images/emoji/google_classic/man_dancing/3.png
new file mode 100644
index 00000000000..a5e7a572c5b
Binary files /dev/null and b/public/images/emoji/google_classic/man_dancing/3.png differ
diff --git a/public/images/emoji/google_classic/man_dancing/4.png b/public/images/emoji/google_classic/man_dancing/4.png
new file mode 100644
index 00000000000..533073253dd
Binary files /dev/null and b/public/images/emoji/google_classic/man_dancing/4.png differ
diff --git a/public/images/emoji/google_classic/man_dancing/5.png b/public/images/emoji/google_classic/man_dancing/5.png
new file mode 100644
index 00000000000..1acd65b6890
Binary files /dev/null and b/public/images/emoji/google_classic/man_dancing/5.png differ
diff --git a/public/images/emoji/google_classic/man_dancing/6.png b/public/images/emoji/google_classic/man_dancing/6.png
new file mode 100644
index 00000000000..3a954fc2b9f
Binary files /dev/null and b/public/images/emoji/google_classic/man_dancing/6.png differ
diff --git a/public/images/emoji/google_classic/man_facepalming.png b/public/images/emoji/google_classic/man_facepalming.png
new file mode 100644
index 00000000000..1150e087a69
Binary files /dev/null and b/public/images/emoji/google_classic/man_facepalming.png differ
diff --git a/public/images/emoji/google_classic/man_facepalming/2.png b/public/images/emoji/google_classic/man_facepalming/2.png
new file mode 100644
index 00000000000..2567daff7e4
Binary files /dev/null and b/public/images/emoji/google_classic/man_facepalming/2.png differ
diff --git a/public/images/emoji/google_classic/man_facepalming/3.png b/public/images/emoji/google_classic/man_facepalming/3.png
new file mode 100644
index 00000000000..f82ee5ab23b
Binary files /dev/null and b/public/images/emoji/google_classic/man_facepalming/3.png differ
diff --git a/public/images/emoji/google_classic/man_facepalming/4.png b/public/images/emoji/google_classic/man_facepalming/4.png
new file mode 100644
index 00000000000..9a62d34d568
Binary files /dev/null and b/public/images/emoji/google_classic/man_facepalming/4.png differ
diff --git a/public/images/emoji/google_classic/man_facepalming/5.png b/public/images/emoji/google_classic/man_facepalming/5.png
new file mode 100644
index 00000000000..ffea8764d19
Binary files /dev/null and b/public/images/emoji/google_classic/man_facepalming/5.png differ
diff --git a/public/images/emoji/google_classic/man_facepalming/6.png b/public/images/emoji/google_classic/man_facepalming/6.png
new file mode 100644
index 00000000000..ea6855388b6
Binary files /dev/null and b/public/images/emoji/google_classic/man_facepalming/6.png differ
diff --git a/public/images/emoji/google_classic/man_factory_worker.png b/public/images/emoji/google_classic/man_factory_worker.png
new file mode 100644
index 00000000000..cd235542684
Binary files /dev/null and b/public/images/emoji/google_classic/man_factory_worker.png differ
diff --git a/public/images/emoji/google_classic/man_factory_worker/2.png b/public/images/emoji/google_classic/man_factory_worker/2.png
new file mode 100644
index 00000000000..04d6169b419
Binary files /dev/null and b/public/images/emoji/google_classic/man_factory_worker/2.png differ
diff --git a/public/images/emoji/google_classic/man_factory_worker/3.png b/public/images/emoji/google_classic/man_factory_worker/3.png
new file mode 100644
index 00000000000..d076f10c068
Binary files /dev/null and b/public/images/emoji/google_classic/man_factory_worker/3.png differ
diff --git a/public/images/emoji/google_classic/man_factory_worker/4.png b/public/images/emoji/google_classic/man_factory_worker/4.png
new file mode 100644
index 00000000000..24f29a308b9
Binary files /dev/null and b/public/images/emoji/google_classic/man_factory_worker/4.png differ
diff --git a/public/images/emoji/google_classic/man_factory_worker/5.png b/public/images/emoji/google_classic/man_factory_worker/5.png
new file mode 100644
index 00000000000..6209beeacd6
Binary files /dev/null and b/public/images/emoji/google_classic/man_factory_worker/5.png differ
diff --git a/public/images/emoji/google_classic/man_factory_worker/6.png b/public/images/emoji/google_classic/man_factory_worker/6.png
new file mode 100644
index 00000000000..f16ef697c72
Binary files /dev/null and b/public/images/emoji/google_classic/man_factory_worker/6.png differ
diff --git a/public/images/emoji/google_classic/man_farmer.png b/public/images/emoji/google_classic/man_farmer.png
new file mode 100644
index 00000000000..29c229c9d2d
Binary files /dev/null and b/public/images/emoji/google_classic/man_farmer.png differ
diff --git a/public/images/emoji/google_classic/man_farmer/2.png b/public/images/emoji/google_classic/man_farmer/2.png
new file mode 100644
index 00000000000..00072d7fb5b
Binary files /dev/null and b/public/images/emoji/google_classic/man_farmer/2.png differ
diff --git a/public/images/emoji/google_classic/man_farmer/3.png b/public/images/emoji/google_classic/man_farmer/3.png
new file mode 100644
index 00000000000..c820f0f6cde
Binary files /dev/null and b/public/images/emoji/google_classic/man_farmer/3.png differ
diff --git a/public/images/emoji/google_classic/man_farmer/4.png b/public/images/emoji/google_classic/man_farmer/4.png
new file mode 100644
index 00000000000..15f16196218
Binary files /dev/null and b/public/images/emoji/google_classic/man_farmer/4.png differ
diff --git a/public/images/emoji/google_classic/man_farmer/5.png b/public/images/emoji/google_classic/man_farmer/5.png
new file mode 100644
index 00000000000..29fd692e514
Binary files /dev/null and b/public/images/emoji/google_classic/man_farmer/5.png differ
diff --git a/public/images/emoji/google_classic/man_farmer/6.png b/public/images/emoji/google_classic/man_farmer/6.png
new file mode 100644
index 00000000000..7ba23296f88
Binary files /dev/null and b/public/images/emoji/google_classic/man_farmer/6.png differ
diff --git a/public/images/emoji/google_classic/man_firefighter.png b/public/images/emoji/google_classic/man_firefighter.png
new file mode 100644
index 00000000000..cceff3ba759
Binary files /dev/null and b/public/images/emoji/google_classic/man_firefighter.png differ
diff --git a/public/images/emoji/google_classic/man_firefighter/2.png b/public/images/emoji/google_classic/man_firefighter/2.png
new file mode 100644
index 00000000000..19521b237d6
Binary files /dev/null and b/public/images/emoji/google_classic/man_firefighter/2.png differ
diff --git a/public/images/emoji/google_classic/man_firefighter/3.png b/public/images/emoji/google_classic/man_firefighter/3.png
new file mode 100644
index 00000000000..b982d5c1fe5
Binary files /dev/null and b/public/images/emoji/google_classic/man_firefighter/3.png differ
diff --git a/public/images/emoji/google_classic/man_firefighter/4.png b/public/images/emoji/google_classic/man_firefighter/4.png
new file mode 100644
index 00000000000..a3b953f4693
Binary files /dev/null and b/public/images/emoji/google_classic/man_firefighter/4.png differ
diff --git a/public/images/emoji/google_classic/man_firefighter/5.png b/public/images/emoji/google_classic/man_firefighter/5.png
new file mode 100644
index 00000000000..daca3b0103a
Binary files /dev/null and b/public/images/emoji/google_classic/man_firefighter/5.png differ
diff --git a/public/images/emoji/google_classic/man_firefighter/6.png b/public/images/emoji/google_classic/man_firefighter/6.png
new file mode 100644
index 00000000000..2f8f3827cc2
Binary files /dev/null and b/public/images/emoji/google_classic/man_firefighter/6.png differ
diff --git a/public/images/emoji/google_classic/man_health_worker.png b/public/images/emoji/google_classic/man_health_worker.png
new file mode 100644
index 00000000000..0c3c31499b5
Binary files /dev/null and b/public/images/emoji/google_classic/man_health_worker.png differ
diff --git a/public/images/emoji/google_classic/man_health_worker/2.png b/public/images/emoji/google_classic/man_health_worker/2.png
new file mode 100644
index 00000000000..51c9665ad7b
Binary files /dev/null and b/public/images/emoji/google_classic/man_health_worker/2.png differ
diff --git a/public/images/emoji/google_classic/man_health_worker/3.png b/public/images/emoji/google_classic/man_health_worker/3.png
new file mode 100644
index 00000000000..bdd62d2633b
Binary files /dev/null and b/public/images/emoji/google_classic/man_health_worker/3.png differ
diff --git a/public/images/emoji/google_classic/man_health_worker/4.png b/public/images/emoji/google_classic/man_health_worker/4.png
new file mode 100644
index 00000000000..15da247788b
Binary files /dev/null and b/public/images/emoji/google_classic/man_health_worker/4.png differ
diff --git a/public/images/emoji/google_classic/man_health_worker/5.png b/public/images/emoji/google_classic/man_health_worker/5.png
new file mode 100644
index 00000000000..03f65f3bb1e
Binary files /dev/null and b/public/images/emoji/google_classic/man_health_worker/5.png differ
diff --git a/public/images/emoji/google_classic/man_health_worker/6.png b/public/images/emoji/google_classic/man_health_worker/6.png
new file mode 100644
index 00000000000..6a1847ec69a
Binary files /dev/null and b/public/images/emoji/google_classic/man_health_worker/6.png differ
diff --git a/public/images/emoji/google_classic/man_in_business_suit_levitating.png b/public/images/emoji/google_classic/man_in_business_suit_levitating.png
new file mode 100644
index 00000000000..aafbbc2d802
Binary files /dev/null and b/public/images/emoji/google_classic/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/google_classic/man_in_tuxedo.png b/public/images/emoji/google_classic/man_in_tuxedo.png
new file mode 100644
index 00000000000..2f6f1d1557b
Binary files /dev/null and b/public/images/emoji/google_classic/man_in_tuxedo.png differ
diff --git a/public/images/emoji/google_classic/man_in_tuxedo/2.png b/public/images/emoji/google_classic/man_in_tuxedo/2.png
new file mode 100644
index 00000000000..49a79e94dfe
Binary files /dev/null and b/public/images/emoji/google_classic/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/google_classic/man_in_tuxedo/3.png b/public/images/emoji/google_classic/man_in_tuxedo/3.png
new file mode 100644
index 00000000000..becc4e7971e
Binary files /dev/null and b/public/images/emoji/google_classic/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/google_classic/man_in_tuxedo/4.png b/public/images/emoji/google_classic/man_in_tuxedo/4.png
new file mode 100644
index 00000000000..cbd5d34b7b7
Binary files /dev/null and b/public/images/emoji/google_classic/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/google_classic/man_in_tuxedo/5.png b/public/images/emoji/google_classic/man_in_tuxedo/5.png
new file mode 100644
index 00000000000..098a64b54bb
Binary files /dev/null and b/public/images/emoji/google_classic/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/google_classic/man_in_tuxedo/6.png b/public/images/emoji/google_classic/man_in_tuxedo/6.png
new file mode 100644
index 00000000000..22bb40970b1
Binary files /dev/null and b/public/images/emoji/google_classic/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/google_classic/man_judge.png b/public/images/emoji/google_classic/man_judge.png
new file mode 100644
index 00000000000..6efa81e32f0
Binary files /dev/null and b/public/images/emoji/google_classic/man_judge.png differ
diff --git a/public/images/emoji/google_classic/man_judge/2.png b/public/images/emoji/google_classic/man_judge/2.png
new file mode 100644
index 00000000000..11ab8a0232d
Binary files /dev/null and b/public/images/emoji/google_classic/man_judge/2.png differ
diff --git a/public/images/emoji/google_classic/man_judge/3.png b/public/images/emoji/google_classic/man_judge/3.png
new file mode 100644
index 00000000000..98c4e86a7f1
Binary files /dev/null and b/public/images/emoji/google_classic/man_judge/3.png differ
diff --git a/public/images/emoji/google_classic/man_judge/4.png b/public/images/emoji/google_classic/man_judge/4.png
new file mode 100644
index 00000000000..ce17a094e1e
Binary files /dev/null and b/public/images/emoji/google_classic/man_judge/4.png differ
diff --git a/public/images/emoji/google_classic/man_judge/5.png b/public/images/emoji/google_classic/man_judge/5.png
new file mode 100644
index 00000000000..57107fc6d7e
Binary files /dev/null and b/public/images/emoji/google_classic/man_judge/5.png differ
diff --git a/public/images/emoji/google_classic/man_judge/6.png b/public/images/emoji/google_classic/man_judge/6.png
new file mode 100644
index 00000000000..ed274bbb54e
Binary files /dev/null and b/public/images/emoji/google_classic/man_judge/6.png differ
diff --git a/public/images/emoji/google_classic/man_juggling.png b/public/images/emoji/google_classic/man_juggling.png
new file mode 100644
index 00000000000..26dbbf8e0dd
Binary files /dev/null and b/public/images/emoji/google_classic/man_juggling.png differ
diff --git a/public/images/emoji/google_classic/man_juggling/2.png b/public/images/emoji/google_classic/man_juggling/2.png
new file mode 100644
index 00000000000..bc9a1fb7484
Binary files /dev/null and b/public/images/emoji/google_classic/man_juggling/2.png differ
diff --git a/public/images/emoji/google_classic/man_juggling/3.png b/public/images/emoji/google_classic/man_juggling/3.png
new file mode 100644
index 00000000000..bc0853ceafc
Binary files /dev/null and b/public/images/emoji/google_classic/man_juggling/3.png differ
diff --git a/public/images/emoji/google_classic/man_juggling/4.png b/public/images/emoji/google_classic/man_juggling/4.png
new file mode 100644
index 00000000000..a4ebe384470
Binary files /dev/null and b/public/images/emoji/google_classic/man_juggling/4.png differ
diff --git a/public/images/emoji/google_classic/man_juggling/5.png b/public/images/emoji/google_classic/man_juggling/5.png
new file mode 100644
index 00000000000..3c182e7fa04
Binary files /dev/null and b/public/images/emoji/google_classic/man_juggling/5.png differ
diff --git a/public/images/emoji/google_classic/man_juggling/6.png b/public/images/emoji/google_classic/man_juggling/6.png
new file mode 100644
index 00000000000..254f8402091
Binary files /dev/null and b/public/images/emoji/google_classic/man_juggling/6.png differ
diff --git a/public/images/emoji/google_classic/man_mechanic.png b/public/images/emoji/google_classic/man_mechanic.png
new file mode 100644
index 00000000000..8cbecd475e6
Binary files /dev/null and b/public/images/emoji/google_classic/man_mechanic.png differ
diff --git a/public/images/emoji/google_classic/man_mechanic/2.png b/public/images/emoji/google_classic/man_mechanic/2.png
new file mode 100644
index 00000000000..244628b3660
Binary files /dev/null and b/public/images/emoji/google_classic/man_mechanic/2.png differ
diff --git a/public/images/emoji/google_classic/man_mechanic/3.png b/public/images/emoji/google_classic/man_mechanic/3.png
new file mode 100644
index 00000000000..041f04bf8e6
Binary files /dev/null and b/public/images/emoji/google_classic/man_mechanic/3.png differ
diff --git a/public/images/emoji/google_classic/man_mechanic/4.png b/public/images/emoji/google_classic/man_mechanic/4.png
new file mode 100644
index 00000000000..da9735d9956
Binary files /dev/null and b/public/images/emoji/google_classic/man_mechanic/4.png differ
diff --git a/public/images/emoji/google_classic/man_mechanic/5.png b/public/images/emoji/google_classic/man_mechanic/5.png
new file mode 100644
index 00000000000..c840412f5f0
Binary files /dev/null and b/public/images/emoji/google_classic/man_mechanic/5.png differ
diff --git a/public/images/emoji/google_classic/man_mechanic/6.png b/public/images/emoji/google_classic/man_mechanic/6.png
new file mode 100644
index 00000000000..e36550f9945
Binary files /dev/null and b/public/images/emoji/google_classic/man_mechanic/6.png differ
diff --git a/public/images/emoji/google_classic/man_office_worker.png b/public/images/emoji/google_classic/man_office_worker.png
new file mode 100644
index 00000000000..599d8ecc97a
Binary files /dev/null and b/public/images/emoji/google_classic/man_office_worker.png differ
diff --git a/public/images/emoji/google_classic/man_office_worker/2.png b/public/images/emoji/google_classic/man_office_worker/2.png
new file mode 100644
index 00000000000..892e5ee759f
Binary files /dev/null and b/public/images/emoji/google_classic/man_office_worker/2.png differ
diff --git a/public/images/emoji/google_classic/man_office_worker/3.png b/public/images/emoji/google_classic/man_office_worker/3.png
new file mode 100644
index 00000000000..d36c167511f
Binary files /dev/null and b/public/images/emoji/google_classic/man_office_worker/3.png differ
diff --git a/public/images/emoji/google_classic/man_office_worker/4.png b/public/images/emoji/google_classic/man_office_worker/4.png
new file mode 100644
index 00000000000..a2328c0a694
Binary files /dev/null and b/public/images/emoji/google_classic/man_office_worker/4.png differ
diff --git a/public/images/emoji/google_classic/man_office_worker/5.png b/public/images/emoji/google_classic/man_office_worker/5.png
new file mode 100644
index 00000000000..d118f996002
Binary files /dev/null and b/public/images/emoji/google_classic/man_office_worker/5.png differ
diff --git a/public/images/emoji/google_classic/man_office_worker/6.png b/public/images/emoji/google_classic/man_office_worker/6.png
new file mode 100644
index 00000000000..273717999e6
Binary files /dev/null and b/public/images/emoji/google_classic/man_office_worker/6.png differ
diff --git a/public/images/emoji/google_classic/man_pilot.png b/public/images/emoji/google_classic/man_pilot.png
new file mode 100644
index 00000000000..b480b2032f7
Binary files /dev/null and b/public/images/emoji/google_classic/man_pilot.png differ
diff --git a/public/images/emoji/google_classic/man_pilot/2.png b/public/images/emoji/google_classic/man_pilot/2.png
new file mode 100644
index 00000000000..e15941552ef
Binary files /dev/null and b/public/images/emoji/google_classic/man_pilot/2.png differ
diff --git a/public/images/emoji/google_classic/man_pilot/3.png b/public/images/emoji/google_classic/man_pilot/3.png
new file mode 100644
index 00000000000..9a671657da9
Binary files /dev/null and b/public/images/emoji/google_classic/man_pilot/3.png differ
diff --git a/public/images/emoji/google_classic/man_pilot/4.png b/public/images/emoji/google_classic/man_pilot/4.png
new file mode 100644
index 00000000000..1db9a9544ac
Binary files /dev/null and b/public/images/emoji/google_classic/man_pilot/4.png differ
diff --git a/public/images/emoji/google_classic/man_pilot/5.png b/public/images/emoji/google_classic/man_pilot/5.png
new file mode 100644
index 00000000000..25851e745b7
Binary files /dev/null and b/public/images/emoji/google_classic/man_pilot/5.png differ
diff --git a/public/images/emoji/google_classic/man_pilot/6.png b/public/images/emoji/google_classic/man_pilot/6.png
new file mode 100644
index 00000000000..c416e706213
Binary files /dev/null and b/public/images/emoji/google_classic/man_pilot/6.png differ
diff --git a/public/images/emoji/google_classic/man_playing_handball.png b/public/images/emoji/google_classic/man_playing_handball.png
new file mode 100644
index 00000000000..cf8d12e6d9b
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_handball.png differ
diff --git a/public/images/emoji/google_classic/man_playing_handball/2.png b/public/images/emoji/google_classic/man_playing_handball/2.png
new file mode 100644
index 00000000000..d4f875af45a
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_handball/2.png differ
diff --git a/public/images/emoji/google_classic/man_playing_handball/3.png b/public/images/emoji/google_classic/man_playing_handball/3.png
new file mode 100644
index 00000000000..d0658fd0a57
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_handball/3.png differ
diff --git a/public/images/emoji/google_classic/man_playing_handball/4.png b/public/images/emoji/google_classic/man_playing_handball/4.png
new file mode 100644
index 00000000000..5ff27e4ead5
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_handball/4.png differ
diff --git a/public/images/emoji/google_classic/man_playing_handball/5.png b/public/images/emoji/google_classic/man_playing_handball/5.png
new file mode 100644
index 00000000000..248e0e42092
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_handball/5.png differ
diff --git a/public/images/emoji/google_classic/man_playing_handball/6.png b/public/images/emoji/google_classic/man_playing_handball/6.png
new file mode 100644
index 00000000000..900ed565c14
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_handball/6.png differ
diff --git a/public/images/emoji/google_classic/man_playing_water_polo.png b/public/images/emoji/google_classic/man_playing_water_polo.png
new file mode 100644
index 00000000000..e3e6975a613
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_water_polo.png differ
diff --git a/public/images/emoji/google_classic/man_playing_water_polo/2.png b/public/images/emoji/google_classic/man_playing_water_polo/2.png
new file mode 100644
index 00000000000..9716349afbc
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/google_classic/man_playing_water_polo/3.png b/public/images/emoji/google_classic/man_playing_water_polo/3.png
new file mode 100644
index 00000000000..d395307319b
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/google_classic/man_playing_water_polo/4.png b/public/images/emoji/google_classic/man_playing_water_polo/4.png
new file mode 100644
index 00000000000..fd82e007317
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/google_classic/man_playing_water_polo/5.png b/public/images/emoji/google_classic/man_playing_water_polo/5.png
new file mode 100644
index 00000000000..9ca220cbf5f
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/google_classic/man_playing_water_polo/6.png b/public/images/emoji/google_classic/man_playing_water_polo/6.png
new file mode 100644
index 00000000000..c329e141e5b
Binary files /dev/null and b/public/images/emoji/google_classic/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/google_classic/man_scientist.png b/public/images/emoji/google_classic/man_scientist.png
new file mode 100644
index 00000000000..e0bc22aa17f
Binary files /dev/null and b/public/images/emoji/google_classic/man_scientist.png differ
diff --git a/public/images/emoji/google_classic/man_scientist/2.png b/public/images/emoji/google_classic/man_scientist/2.png
new file mode 100644
index 00000000000..b36520e1a96
Binary files /dev/null and b/public/images/emoji/google_classic/man_scientist/2.png differ
diff --git a/public/images/emoji/google_classic/man_scientist/3.png b/public/images/emoji/google_classic/man_scientist/3.png
new file mode 100644
index 00000000000..467aa3aea96
Binary files /dev/null and b/public/images/emoji/google_classic/man_scientist/3.png differ
diff --git a/public/images/emoji/google_classic/man_scientist/4.png b/public/images/emoji/google_classic/man_scientist/4.png
new file mode 100644
index 00000000000..15840362e75
Binary files /dev/null and b/public/images/emoji/google_classic/man_scientist/4.png differ
diff --git a/public/images/emoji/google_classic/man_scientist/5.png b/public/images/emoji/google_classic/man_scientist/5.png
new file mode 100644
index 00000000000..461a0c42c4a
Binary files /dev/null and b/public/images/emoji/google_classic/man_scientist/5.png differ
diff --git a/public/images/emoji/google_classic/man_scientist/6.png b/public/images/emoji/google_classic/man_scientist/6.png
new file mode 100644
index 00000000000..a2bb47b52ec
Binary files /dev/null and b/public/images/emoji/google_classic/man_scientist/6.png differ
diff --git a/public/images/emoji/google_classic/man_shrugging.png b/public/images/emoji/google_classic/man_shrugging.png
new file mode 100644
index 00000000000..8f1b6e291d2
Binary files /dev/null and b/public/images/emoji/google_classic/man_shrugging.png differ
diff --git a/public/images/emoji/google_classic/man_shrugging/2.png b/public/images/emoji/google_classic/man_shrugging/2.png
new file mode 100644
index 00000000000..a1cd009cb55
Binary files /dev/null and b/public/images/emoji/google_classic/man_shrugging/2.png differ
diff --git a/public/images/emoji/google_classic/man_shrugging/3.png b/public/images/emoji/google_classic/man_shrugging/3.png
new file mode 100644
index 00000000000..bf470e788d0
Binary files /dev/null and b/public/images/emoji/google_classic/man_shrugging/3.png differ
diff --git a/public/images/emoji/google_classic/man_shrugging/4.png b/public/images/emoji/google_classic/man_shrugging/4.png
new file mode 100644
index 00000000000..fb4b75f53ac
Binary files /dev/null and b/public/images/emoji/google_classic/man_shrugging/4.png differ
diff --git a/public/images/emoji/google_classic/man_shrugging/5.png b/public/images/emoji/google_classic/man_shrugging/5.png
new file mode 100644
index 00000000000..18e186f59df
Binary files /dev/null and b/public/images/emoji/google_classic/man_shrugging/5.png differ
diff --git a/public/images/emoji/google_classic/man_shrugging/6.png b/public/images/emoji/google_classic/man_shrugging/6.png
new file mode 100644
index 00000000000..6ea19b5e503
Binary files /dev/null and b/public/images/emoji/google_classic/man_shrugging/6.png differ
diff --git a/public/images/emoji/google_classic/man_singer.png b/public/images/emoji/google_classic/man_singer.png
new file mode 100644
index 00000000000..b91c97a2242
Binary files /dev/null and b/public/images/emoji/google_classic/man_singer.png differ
diff --git a/public/images/emoji/google_classic/man_singer/2.png b/public/images/emoji/google_classic/man_singer/2.png
new file mode 100644
index 00000000000..a10731ce0d7
Binary files /dev/null and b/public/images/emoji/google_classic/man_singer/2.png differ
diff --git a/public/images/emoji/google_classic/man_singer/3.png b/public/images/emoji/google_classic/man_singer/3.png
new file mode 100644
index 00000000000..e9feafd8730
Binary files /dev/null and b/public/images/emoji/google_classic/man_singer/3.png differ
diff --git a/public/images/emoji/google_classic/man_singer/4.png b/public/images/emoji/google_classic/man_singer/4.png
new file mode 100644
index 00000000000..2a99360696e
Binary files /dev/null and b/public/images/emoji/google_classic/man_singer/4.png differ
diff --git a/public/images/emoji/google_classic/man_singer/5.png b/public/images/emoji/google_classic/man_singer/5.png
new file mode 100644
index 00000000000..7d0e2552e34
Binary files /dev/null and b/public/images/emoji/google_classic/man_singer/5.png differ
diff --git a/public/images/emoji/google_classic/man_singer/6.png b/public/images/emoji/google_classic/man_singer/6.png
new file mode 100644
index 00000000000..4f4d752b09d
Binary files /dev/null and b/public/images/emoji/google_classic/man_singer/6.png differ
diff --git a/public/images/emoji/google_classic/man_student.png b/public/images/emoji/google_classic/man_student.png
new file mode 100644
index 00000000000..92d2df60531
Binary files /dev/null and b/public/images/emoji/google_classic/man_student.png differ
diff --git a/public/images/emoji/google_classic/man_student/2.png b/public/images/emoji/google_classic/man_student/2.png
new file mode 100644
index 00000000000..4446d75d4ea
Binary files /dev/null and b/public/images/emoji/google_classic/man_student/2.png differ
diff --git a/public/images/emoji/google_classic/man_student/3.png b/public/images/emoji/google_classic/man_student/3.png
new file mode 100644
index 00000000000..d0c3e90a2e5
Binary files /dev/null and b/public/images/emoji/google_classic/man_student/3.png differ
diff --git a/public/images/emoji/google_classic/man_student/4.png b/public/images/emoji/google_classic/man_student/4.png
new file mode 100644
index 00000000000..43b783a7ea1
Binary files /dev/null and b/public/images/emoji/google_classic/man_student/4.png differ
diff --git a/public/images/emoji/google_classic/man_student/5.png b/public/images/emoji/google_classic/man_student/5.png
new file mode 100644
index 00000000000..3dfd6c46788
Binary files /dev/null and b/public/images/emoji/google_classic/man_student/5.png differ
diff --git a/public/images/emoji/google_classic/man_student/6.png b/public/images/emoji/google_classic/man_student/6.png
new file mode 100644
index 00000000000..0d376eebf5a
Binary files /dev/null and b/public/images/emoji/google_classic/man_student/6.png differ
diff --git a/public/images/emoji/google_classic/man_teacher.png b/public/images/emoji/google_classic/man_teacher.png
new file mode 100644
index 00000000000..693cf0eb397
Binary files /dev/null and b/public/images/emoji/google_classic/man_teacher.png differ
diff --git a/public/images/emoji/google_classic/man_teacher/2.png b/public/images/emoji/google_classic/man_teacher/2.png
new file mode 100644
index 00000000000..29c25ce55c9
Binary files /dev/null and b/public/images/emoji/google_classic/man_teacher/2.png differ
diff --git a/public/images/emoji/google_classic/man_teacher/3.png b/public/images/emoji/google_classic/man_teacher/3.png
new file mode 100644
index 00000000000..b02516af5ab
Binary files /dev/null and b/public/images/emoji/google_classic/man_teacher/3.png differ
diff --git a/public/images/emoji/google_classic/man_teacher/4.png b/public/images/emoji/google_classic/man_teacher/4.png
new file mode 100644
index 00000000000..3bffaccee9a
Binary files /dev/null and b/public/images/emoji/google_classic/man_teacher/4.png differ
diff --git a/public/images/emoji/google_classic/man_teacher/5.png b/public/images/emoji/google_classic/man_teacher/5.png
new file mode 100644
index 00000000000..54c6e2006e4
Binary files /dev/null and b/public/images/emoji/google_classic/man_teacher/5.png differ
diff --git a/public/images/emoji/google_classic/man_teacher/6.png b/public/images/emoji/google_classic/man_teacher/6.png
new file mode 100644
index 00000000000..95dd53e7fef
Binary files /dev/null and b/public/images/emoji/google_classic/man_teacher/6.png differ
diff --git a/public/images/emoji/google_classic/man_technologist.png b/public/images/emoji/google_classic/man_technologist.png
new file mode 100644
index 00000000000..0e3ff5b88b8
Binary files /dev/null and b/public/images/emoji/google_classic/man_technologist.png differ
diff --git a/public/images/emoji/google_classic/man_technologist/2.png b/public/images/emoji/google_classic/man_technologist/2.png
new file mode 100644
index 00000000000..e9038cd2dd4
Binary files /dev/null and b/public/images/emoji/google_classic/man_technologist/2.png differ
diff --git a/public/images/emoji/google_classic/man_technologist/3.png b/public/images/emoji/google_classic/man_technologist/3.png
new file mode 100644
index 00000000000..ec503f94b64
Binary files /dev/null and b/public/images/emoji/google_classic/man_technologist/3.png differ
diff --git a/public/images/emoji/google_classic/man_technologist/4.png b/public/images/emoji/google_classic/man_technologist/4.png
new file mode 100644
index 00000000000..99b5e32403b
Binary files /dev/null and b/public/images/emoji/google_classic/man_technologist/4.png differ
diff --git a/public/images/emoji/google_classic/man_technologist/5.png b/public/images/emoji/google_classic/man_technologist/5.png
new file mode 100644
index 00000000000..b425d3d9312
Binary files /dev/null and b/public/images/emoji/google_classic/man_technologist/5.png differ
diff --git a/public/images/emoji/google_classic/man_technologist/6.png b/public/images/emoji/google_classic/man_technologist/6.png
new file mode 100644
index 00000000000..86b3040878c
Binary files /dev/null and b/public/images/emoji/google_classic/man_technologist/6.png differ
diff --git a/public/images/emoji/google_classic/man_with_gua_pi_mao.png b/public/images/emoji/google_classic/man_with_gua_pi_mao.png
new file mode 100644
index 00000000000..e7e0d94a7e2
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/google_classic/man_with_gua_pi_mao/2.png b/public/images/emoji/google_classic/man_with_gua_pi_mao/2.png
new file mode 100644
index 00000000000..f3fa9be2094
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/google_classic/man_with_gua_pi_mao/3.png b/public/images/emoji/google_classic/man_with_gua_pi_mao/3.png
new file mode 100644
index 00000000000..b4a80578368
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/google_classic/man_with_gua_pi_mao/4.png b/public/images/emoji/google_classic/man_with_gua_pi_mao/4.png
new file mode 100644
index 00000000000..8ab34490289
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/google_classic/man_with_gua_pi_mao/5.png b/public/images/emoji/google_classic/man_with_gua_pi_mao/5.png
new file mode 100644
index 00000000000..138faec2d16
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/google_classic/man_with_gua_pi_mao/6.png b/public/images/emoji/google_classic/man_with_gua_pi_mao/6.png
new file mode 100644
index 00000000000..047a887fb14
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/google_classic/man_with_turban.png b/public/images/emoji/google_classic/man_with_turban.png
new file mode 100644
index 00000000000..87efccfb472
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_turban.png differ
diff --git a/public/images/emoji/google_classic/man_with_turban/2.png b/public/images/emoji/google_classic/man_with_turban/2.png
new file mode 100644
index 00000000000..77897d42081
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_turban/2.png differ
diff --git a/public/images/emoji/google_classic/man_with_turban/3.png b/public/images/emoji/google_classic/man_with_turban/3.png
new file mode 100644
index 00000000000..b969fde1e13
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_turban/3.png differ
diff --git a/public/images/emoji/google_classic/man_with_turban/4.png b/public/images/emoji/google_classic/man_with_turban/4.png
new file mode 100644
index 00000000000..d60ae4efc2e
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_turban/4.png differ
diff --git a/public/images/emoji/google_classic/man_with_turban/5.png b/public/images/emoji/google_classic/man_with_turban/5.png
new file mode 100644
index 00000000000..3425962af15
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_turban/5.png differ
diff --git a/public/images/emoji/google_classic/man_with_turban/6.png b/public/images/emoji/google_classic/man_with_turban/6.png
new file mode 100644
index 00000000000..bedf2aad186
Binary files /dev/null and b/public/images/emoji/google_classic/man_with_turban/6.png differ
diff --git a/public/images/emoji/google_classic/mans_shoe.png b/public/images/emoji/google_classic/mans_shoe.png
new file mode 100644
index 00000000000..afb7c8086da
Binary files /dev/null and b/public/images/emoji/google_classic/mans_shoe.png differ
diff --git a/public/images/emoji/google_classic/mantelpiece_clock.png b/public/images/emoji/google_classic/mantelpiece_clock.png
new file mode 100644
index 00000000000..48c0e38d418
Binary files /dev/null and b/public/images/emoji/google_classic/mantelpiece_clock.png differ
diff --git a/public/images/emoji/google_classic/map.png b/public/images/emoji/google_classic/map.png
new file mode 100644
index 00000000000..fc4cfafe8a4
Binary files /dev/null and b/public/images/emoji/google_classic/map.png differ
diff --git a/public/images/emoji/google_classic/maple_leaf.png b/public/images/emoji/google_classic/maple_leaf.png
new file mode 100644
index 00000000000..0f61101eec7
Binary files /dev/null and b/public/images/emoji/google_classic/maple_leaf.png differ
diff --git a/public/images/emoji/google_classic/marshall_islands.png b/public/images/emoji/google_classic/marshall_islands.png
new file mode 100644
index 00000000000..a233fcd1695
Binary files /dev/null and b/public/images/emoji/google_classic/marshall_islands.png differ
diff --git a/public/images/emoji/google_classic/martial_arts_uniform.png b/public/images/emoji/google_classic/martial_arts_uniform.png
new file mode 100644
index 00000000000..e3ed0f33870
Binary files /dev/null and b/public/images/emoji/google_classic/martial_arts_uniform.png differ
diff --git a/public/images/emoji/google_classic/martinique.png b/public/images/emoji/google_classic/martinique.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/martinique.png differ
diff --git a/public/images/emoji/google_classic/mask.png b/public/images/emoji/google_classic/mask.png
new file mode 100644
index 00000000000..568141e9c73
Binary files /dev/null and b/public/images/emoji/google_classic/mask.png differ
diff --git a/public/images/emoji/google_classic/massage.png b/public/images/emoji/google_classic/massage.png
new file mode 100644
index 00000000000..346fdeb2e9a
Binary files /dev/null and b/public/images/emoji/google_classic/massage.png differ
diff --git a/public/images/emoji/google_classic/massage/2.png b/public/images/emoji/google_classic/massage/2.png
new file mode 100644
index 00000000000..a31d8b6a52a
Binary files /dev/null and b/public/images/emoji/google_classic/massage/2.png differ
diff --git a/public/images/emoji/google_classic/massage/3.png b/public/images/emoji/google_classic/massage/3.png
new file mode 100644
index 00000000000..569a500df51
Binary files /dev/null and b/public/images/emoji/google_classic/massage/3.png differ
diff --git a/public/images/emoji/google_classic/massage/4.png b/public/images/emoji/google_classic/massage/4.png
new file mode 100644
index 00000000000..cf7c2412439
Binary files /dev/null and b/public/images/emoji/google_classic/massage/4.png differ
diff --git a/public/images/emoji/google_classic/massage/5.png b/public/images/emoji/google_classic/massage/5.png
new file mode 100644
index 00000000000..052eb3a32ff
Binary files /dev/null and b/public/images/emoji/google_classic/massage/5.png differ
diff --git a/public/images/emoji/google_classic/massage/6.png b/public/images/emoji/google_classic/massage/6.png
new file mode 100644
index 00000000000..9d29759b018
Binary files /dev/null and b/public/images/emoji/google_classic/massage/6.png differ
diff --git a/public/images/emoji/google_classic/massage_man.png b/public/images/emoji/google_classic/massage_man.png
new file mode 100644
index 00000000000..adbf98b1cce
Binary files /dev/null and b/public/images/emoji/google_classic/massage_man.png differ
diff --git a/public/images/emoji/google_classic/massage_man/2.png b/public/images/emoji/google_classic/massage_man/2.png
new file mode 100644
index 00000000000..6bb3bf6b515
Binary files /dev/null and b/public/images/emoji/google_classic/massage_man/2.png differ
diff --git a/public/images/emoji/google_classic/massage_man/3.png b/public/images/emoji/google_classic/massage_man/3.png
new file mode 100644
index 00000000000..33d6e630201
Binary files /dev/null and b/public/images/emoji/google_classic/massage_man/3.png differ
diff --git a/public/images/emoji/google_classic/massage_man/4.png b/public/images/emoji/google_classic/massage_man/4.png
new file mode 100644
index 00000000000..32910942ace
Binary files /dev/null and b/public/images/emoji/google_classic/massage_man/4.png differ
diff --git a/public/images/emoji/google_classic/massage_man/5.png b/public/images/emoji/google_classic/massage_man/5.png
new file mode 100644
index 00000000000..da9330abf10
Binary files /dev/null and b/public/images/emoji/google_classic/massage_man/5.png differ
diff --git a/public/images/emoji/google_classic/massage_man/6.png b/public/images/emoji/google_classic/massage_man/6.png
new file mode 100644
index 00000000000..b3f13232e93
Binary files /dev/null and b/public/images/emoji/google_classic/massage_man/6.png differ
diff --git a/public/images/emoji/google_classic/massage_woman.png b/public/images/emoji/google_classic/massage_woman.png
new file mode 100644
index 00000000000..346fdeb2e9a
Binary files /dev/null and b/public/images/emoji/google_classic/massage_woman.png differ
diff --git a/public/images/emoji/google_classic/massage_woman/2.png b/public/images/emoji/google_classic/massage_woman/2.png
new file mode 100644
index 00000000000..a31d8b6a52a
Binary files /dev/null and b/public/images/emoji/google_classic/massage_woman/2.png differ
diff --git a/public/images/emoji/google_classic/massage_woman/3.png b/public/images/emoji/google_classic/massage_woman/3.png
new file mode 100644
index 00000000000..569a500df51
Binary files /dev/null and b/public/images/emoji/google_classic/massage_woman/3.png differ
diff --git a/public/images/emoji/google_classic/massage_woman/4.png b/public/images/emoji/google_classic/massage_woman/4.png
new file mode 100644
index 00000000000..cf7c2412439
Binary files /dev/null and b/public/images/emoji/google_classic/massage_woman/4.png differ
diff --git a/public/images/emoji/google_classic/massage_woman/5.png b/public/images/emoji/google_classic/massage_woman/5.png
new file mode 100644
index 00000000000..052eb3a32ff
Binary files /dev/null and b/public/images/emoji/google_classic/massage_woman/5.png differ
diff --git a/public/images/emoji/google_classic/massage_woman/6.png b/public/images/emoji/google_classic/massage_woman/6.png
new file mode 100644
index 00000000000..9d29759b018
Binary files /dev/null and b/public/images/emoji/google_classic/massage_woman/6.png differ
diff --git a/public/images/emoji/google_classic/mauritania.png b/public/images/emoji/google_classic/mauritania.png
new file mode 100644
index 00000000000..aaec315d303
Binary files /dev/null and b/public/images/emoji/google_classic/mauritania.png differ
diff --git a/public/images/emoji/google_classic/mauritius.png b/public/images/emoji/google_classic/mauritius.png
new file mode 100644
index 00000000000..be23cd906ac
Binary files /dev/null and b/public/images/emoji/google_classic/mauritius.png differ
diff --git a/public/images/emoji/google_classic/mayotte.png b/public/images/emoji/google_classic/mayotte.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/mayotte.png differ
diff --git a/public/images/emoji/google_classic/meat_on_bone.png b/public/images/emoji/google_classic/meat_on_bone.png
new file mode 100644
index 00000000000..181d0dc4d8c
Binary files /dev/null and b/public/images/emoji/google_classic/meat_on_bone.png differ
diff --git a/public/images/emoji/google_classic/medal.png b/public/images/emoji/google_classic/medal.png
new file mode 100644
index 00000000000..165827b17b6
Binary files /dev/null and b/public/images/emoji/google_classic/medal.png differ
diff --git a/public/images/emoji/google_classic/medal_military.png b/public/images/emoji/google_classic/medal_military.png
new file mode 100644
index 00000000000..07db5ac13cf
Binary files /dev/null and b/public/images/emoji/google_classic/medal_military.png differ
diff --git a/public/images/emoji/google_classic/medal_sports.png b/public/images/emoji/google_classic/medal_sports.png
new file mode 100644
index 00000000000..165827b17b6
Binary files /dev/null and b/public/images/emoji/google_classic/medal_sports.png differ
diff --git a/public/images/emoji/google_classic/mega.png b/public/images/emoji/google_classic/mega.png
new file mode 100644
index 00000000000..e717c059339
Binary files /dev/null and b/public/images/emoji/google_classic/mega.png differ
diff --git a/public/images/emoji/google_classic/melon.png b/public/images/emoji/google_classic/melon.png
new file mode 100644
index 00000000000..9ddb3c63b21
Binary files /dev/null and b/public/images/emoji/google_classic/melon.png differ
diff --git a/public/images/emoji/google_classic/memo.png b/public/images/emoji/google_classic/memo.png
new file mode 100644
index 00000000000..54aa560fedf
Binary files /dev/null and b/public/images/emoji/google_classic/memo.png differ
diff --git a/public/images/emoji/google_classic/men_wrestling.png b/public/images/emoji/google_classic/men_wrestling.png
new file mode 100644
index 00000000000..ea9bf6c6bd7
Binary files /dev/null and b/public/images/emoji/google_classic/men_wrestling.png differ
diff --git a/public/images/emoji/google_classic/menorah.png b/public/images/emoji/google_classic/menorah.png
new file mode 100644
index 00000000000..a479d99b307
Binary files /dev/null and b/public/images/emoji/google_classic/menorah.png differ
diff --git a/public/images/emoji/google_classic/mens.png b/public/images/emoji/google_classic/mens.png
new file mode 100644
index 00000000000..640db6a49e7
Binary files /dev/null and b/public/images/emoji/google_classic/mens.png differ
diff --git a/public/images/emoji/google_classic/merperson.png b/public/images/emoji/google_classic/merperson.png
new file mode 100644
index 00000000000..ee1b999e0dd
Binary files /dev/null and b/public/images/emoji/google_classic/merperson.png differ
diff --git a/public/images/emoji/google_classic/merperson/2.png b/public/images/emoji/google_classic/merperson/2.png
new file mode 100644
index 00000000000..b97fbf42e35
Binary files /dev/null and b/public/images/emoji/google_classic/merperson/2.png differ
diff --git a/public/images/emoji/google_classic/merperson/3.png b/public/images/emoji/google_classic/merperson/3.png
new file mode 100644
index 00000000000..9079f60b81e
Binary files /dev/null and b/public/images/emoji/google_classic/merperson/3.png differ
diff --git a/public/images/emoji/google_classic/merperson/4.png b/public/images/emoji/google_classic/merperson/4.png
new file mode 100644
index 00000000000..decc0b58929
Binary files /dev/null and b/public/images/emoji/google_classic/merperson/4.png differ
diff --git a/public/images/emoji/google_classic/merperson/5.png b/public/images/emoji/google_classic/merperson/5.png
new file mode 100644
index 00000000000..e3e3e89cb16
Binary files /dev/null and b/public/images/emoji/google_classic/merperson/5.png differ
diff --git a/public/images/emoji/google_classic/merperson/6.png b/public/images/emoji/google_classic/merperson/6.png
new file mode 100644
index 00000000000..5a5f36684e5
Binary files /dev/null and b/public/images/emoji/google_classic/merperson/6.png differ
diff --git a/public/images/emoji/google_classic/metal.png b/public/images/emoji/google_classic/metal.png
new file mode 100644
index 00000000000..d8d0c23c3f8
Binary files /dev/null and b/public/images/emoji/google_classic/metal.png differ
diff --git a/public/images/emoji/google_classic/metal/2.png b/public/images/emoji/google_classic/metal/2.png
new file mode 100644
index 00000000000..8cf0a05b557
Binary files /dev/null and b/public/images/emoji/google_classic/metal/2.png differ
diff --git a/public/images/emoji/google_classic/metal/3.png b/public/images/emoji/google_classic/metal/3.png
new file mode 100644
index 00000000000..fe8c1c3ea76
Binary files /dev/null and b/public/images/emoji/google_classic/metal/3.png differ
diff --git a/public/images/emoji/google_classic/metal/4.png b/public/images/emoji/google_classic/metal/4.png
new file mode 100644
index 00000000000..640f1216113
Binary files /dev/null and b/public/images/emoji/google_classic/metal/4.png differ
diff --git a/public/images/emoji/google_classic/metal/5.png b/public/images/emoji/google_classic/metal/5.png
new file mode 100644
index 00000000000..6758574bbbb
Binary files /dev/null and b/public/images/emoji/google_classic/metal/5.png differ
diff --git a/public/images/emoji/google_classic/metal/6.png b/public/images/emoji/google_classic/metal/6.png
new file mode 100644
index 00000000000..e40f2cc1f91
Binary files /dev/null and b/public/images/emoji/google_classic/metal/6.png differ
diff --git a/public/images/emoji/google_classic/metro.png b/public/images/emoji/google_classic/metro.png
new file mode 100644
index 00000000000..23f7d98acf3
Binary files /dev/null and b/public/images/emoji/google_classic/metro.png differ
diff --git a/public/images/emoji/google_classic/mexico.png b/public/images/emoji/google_classic/mexico.png
new file mode 100644
index 00000000000..b8f41b601e1
Binary files /dev/null and b/public/images/emoji/google_classic/mexico.png differ
diff --git a/public/images/emoji/google_classic/micronesia.png b/public/images/emoji/google_classic/micronesia.png
new file mode 100644
index 00000000000..c5fe882fece
Binary files /dev/null and b/public/images/emoji/google_classic/micronesia.png differ
diff --git a/public/images/emoji/google_classic/microphone.png b/public/images/emoji/google_classic/microphone.png
new file mode 100644
index 00000000000..af52cbe103e
Binary files /dev/null and b/public/images/emoji/google_classic/microphone.png differ
diff --git a/public/images/emoji/google_classic/microphone2.png b/public/images/emoji/google_classic/microphone2.png
new file mode 100644
index 00000000000..bb2539903b9
Binary files /dev/null and b/public/images/emoji/google_classic/microphone2.png differ
diff --git a/public/images/emoji/google_classic/microscope.png b/public/images/emoji/google_classic/microscope.png
new file mode 100644
index 00000000000..ac71bf49b57
Binary files /dev/null and b/public/images/emoji/google_classic/microscope.png differ
diff --git a/public/images/emoji/google_classic/middle_finger.png b/public/images/emoji/google_classic/middle_finger.png
new file mode 100644
index 00000000000..abeb7fe2f41
Binary files /dev/null and b/public/images/emoji/google_classic/middle_finger.png differ
diff --git a/public/images/emoji/google_classic/middle_finger/2.png b/public/images/emoji/google_classic/middle_finger/2.png
new file mode 100644
index 00000000000..957841c2b2b
Binary files /dev/null and b/public/images/emoji/google_classic/middle_finger/2.png differ
diff --git a/public/images/emoji/google_classic/middle_finger/3.png b/public/images/emoji/google_classic/middle_finger/3.png
new file mode 100644
index 00000000000..a6e41041c11
Binary files /dev/null and b/public/images/emoji/google_classic/middle_finger/3.png differ
diff --git a/public/images/emoji/google_classic/middle_finger/4.png b/public/images/emoji/google_classic/middle_finger/4.png
new file mode 100644
index 00000000000..ed6a1374587
Binary files /dev/null and b/public/images/emoji/google_classic/middle_finger/4.png differ
diff --git a/public/images/emoji/google_classic/middle_finger/5.png b/public/images/emoji/google_classic/middle_finger/5.png
new file mode 100644
index 00000000000..4cd9f7a7f01
Binary files /dev/null and b/public/images/emoji/google_classic/middle_finger/5.png differ
diff --git a/public/images/emoji/google_classic/middle_finger/6.png b/public/images/emoji/google_classic/middle_finger/6.png
new file mode 100644
index 00000000000..ad5a8e50e1e
Binary files /dev/null and b/public/images/emoji/google_classic/middle_finger/6.png differ
diff --git a/public/images/emoji/google_classic/military_medal.png b/public/images/emoji/google_classic/military_medal.png
new file mode 100644
index 00000000000..07db5ac13cf
Binary files /dev/null and b/public/images/emoji/google_classic/military_medal.png differ
diff --git a/public/images/emoji/google_classic/milk_glass.png b/public/images/emoji/google_classic/milk_glass.png
new file mode 100644
index 00000000000..1e5d67a3b47
Binary files /dev/null and b/public/images/emoji/google_classic/milk_glass.png differ
diff --git a/public/images/emoji/google_classic/milky_way.png b/public/images/emoji/google_classic/milky_way.png
new file mode 100644
index 00000000000..9b6f69ca1b6
Binary files /dev/null and b/public/images/emoji/google_classic/milky_way.png differ
diff --git a/public/images/emoji/google_classic/minibus.png b/public/images/emoji/google_classic/minibus.png
new file mode 100644
index 00000000000..9e949d4b054
Binary files /dev/null and b/public/images/emoji/google_classic/minibus.png differ
diff --git a/public/images/emoji/google_classic/minidisc.png b/public/images/emoji/google_classic/minidisc.png
new file mode 100644
index 00000000000..199b03f1d99
Binary files /dev/null and b/public/images/emoji/google_classic/minidisc.png differ
diff --git a/public/images/emoji/google_classic/mobile_phone_off.png b/public/images/emoji/google_classic/mobile_phone_off.png
new file mode 100644
index 00000000000..b353bd4abf6
Binary files /dev/null and b/public/images/emoji/google_classic/mobile_phone_off.png differ
diff --git a/public/images/emoji/google_classic/moldova.png b/public/images/emoji/google_classic/moldova.png
new file mode 100644
index 00000000000..370f3a42459
Binary files /dev/null and b/public/images/emoji/google_classic/moldova.png differ
diff --git a/public/images/emoji/google_classic/monaco.png b/public/images/emoji/google_classic/monaco.png
new file mode 100644
index 00000000000..00eb521b52d
Binary files /dev/null and b/public/images/emoji/google_classic/monaco.png differ
diff --git a/public/images/emoji/google_classic/money_mouth.png b/public/images/emoji/google_classic/money_mouth.png
new file mode 100644
index 00000000000..921b180454c
Binary files /dev/null and b/public/images/emoji/google_classic/money_mouth.png differ
diff --git a/public/images/emoji/google_classic/money_mouth_face.png b/public/images/emoji/google_classic/money_mouth_face.png
new file mode 100644
index 00000000000..921b180454c
Binary files /dev/null and b/public/images/emoji/google_classic/money_mouth_face.png differ
diff --git a/public/images/emoji/google_classic/money_with_wings.png b/public/images/emoji/google_classic/money_with_wings.png
new file mode 100644
index 00000000000..f5939dfc2d8
Binary files /dev/null and b/public/images/emoji/google_classic/money_with_wings.png differ
diff --git a/public/images/emoji/google_classic/moneybag.png b/public/images/emoji/google_classic/moneybag.png
new file mode 100644
index 00000000000..ef2778f7a42
Binary files /dev/null and b/public/images/emoji/google_classic/moneybag.png differ
diff --git a/public/images/emoji/google_classic/mongolia.png b/public/images/emoji/google_classic/mongolia.png
new file mode 100644
index 00000000000..603a530b2a6
Binary files /dev/null and b/public/images/emoji/google_classic/mongolia.png differ
diff --git a/public/images/emoji/google_classic/monkey.png b/public/images/emoji/google_classic/monkey.png
new file mode 100644
index 00000000000..88db70bffeb
Binary files /dev/null and b/public/images/emoji/google_classic/monkey.png differ
diff --git a/public/images/emoji/google_classic/monkey_face.png b/public/images/emoji/google_classic/monkey_face.png
new file mode 100644
index 00000000000..3de70bf0303
Binary files /dev/null and b/public/images/emoji/google_classic/monkey_face.png differ
diff --git a/public/images/emoji/google_classic/monorail.png b/public/images/emoji/google_classic/monorail.png
new file mode 100644
index 00000000000..b5693024927
Binary files /dev/null and b/public/images/emoji/google_classic/monorail.png differ
diff --git a/public/images/emoji/google_classic/montenegro.png b/public/images/emoji/google_classic/montenegro.png
new file mode 100644
index 00000000000..3817818d162
Binary files /dev/null and b/public/images/emoji/google_classic/montenegro.png differ
diff --git a/public/images/emoji/google_classic/montserrat.png b/public/images/emoji/google_classic/montserrat.png
new file mode 100644
index 00000000000..b91a41a8281
Binary files /dev/null and b/public/images/emoji/google_classic/montserrat.png differ
diff --git a/public/images/emoji/google_classic/moon.png b/public/images/emoji/google_classic/moon.png
new file mode 100644
index 00000000000..0d169713882
Binary files /dev/null and b/public/images/emoji/google_classic/moon.png differ
diff --git a/public/images/emoji/google_classic/morocco.png b/public/images/emoji/google_classic/morocco.png
new file mode 100644
index 00000000000..e1447ab9765
Binary files /dev/null and b/public/images/emoji/google_classic/morocco.png differ
diff --git a/public/images/emoji/google_classic/mortar_board.png b/public/images/emoji/google_classic/mortar_board.png
new file mode 100644
index 00000000000..f6313a7704a
Binary files /dev/null and b/public/images/emoji/google_classic/mortar_board.png differ
diff --git a/public/images/emoji/google_classic/mosque.png b/public/images/emoji/google_classic/mosque.png
new file mode 100644
index 00000000000..4f31242b15a
Binary files /dev/null and b/public/images/emoji/google_classic/mosque.png differ
diff --git a/public/images/emoji/google_classic/motor_boat.png b/public/images/emoji/google_classic/motor_boat.png
new file mode 100644
index 00000000000..16e1f419e2f
Binary files /dev/null and b/public/images/emoji/google_classic/motor_boat.png differ
diff --git a/public/images/emoji/google_classic/motor_scooter.png b/public/images/emoji/google_classic/motor_scooter.png
new file mode 100644
index 00000000000..84b7fb4e580
Binary files /dev/null and b/public/images/emoji/google_classic/motor_scooter.png differ
diff --git a/public/images/emoji/google_classic/motorboat.png b/public/images/emoji/google_classic/motorboat.png
new file mode 100644
index 00000000000..16e1f419e2f
Binary files /dev/null and b/public/images/emoji/google_classic/motorboat.png differ
diff --git a/public/images/emoji/google_classic/motorcycle.png b/public/images/emoji/google_classic/motorcycle.png
new file mode 100644
index 00000000000..59a73872fe7
Binary files /dev/null and b/public/images/emoji/google_classic/motorcycle.png differ
diff --git a/public/images/emoji/google_classic/motorway.png b/public/images/emoji/google_classic/motorway.png
new file mode 100644
index 00000000000..863c2a66986
Binary files /dev/null and b/public/images/emoji/google_classic/motorway.png differ
diff --git a/public/images/emoji/google_classic/mount_fuji.png b/public/images/emoji/google_classic/mount_fuji.png
new file mode 100644
index 00000000000..75385882cb2
Binary files /dev/null and b/public/images/emoji/google_classic/mount_fuji.png differ
diff --git a/public/images/emoji/google_classic/mountain.png b/public/images/emoji/google_classic/mountain.png
new file mode 100644
index 00000000000..3f7a75574e8
Binary files /dev/null and b/public/images/emoji/google_classic/mountain.png differ
diff --git a/public/images/emoji/google_classic/mountain_bicyclist.png b/public/images/emoji/google_classic/mountain_bicyclist.png
new file mode 100644
index 00000000000..01aa415deeb
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_bicyclist.png differ
diff --git a/public/images/emoji/google_classic/mountain_bicyclist/2.png b/public/images/emoji/google_classic/mountain_bicyclist/2.png
new file mode 100644
index 00000000000..be6e58718c7
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/google_classic/mountain_bicyclist/3.png b/public/images/emoji/google_classic/mountain_bicyclist/3.png
new file mode 100644
index 00000000000..6e105fd5bda
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/google_classic/mountain_bicyclist/4.png b/public/images/emoji/google_classic/mountain_bicyclist/4.png
new file mode 100644
index 00000000000..718f58445ca
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/google_classic/mountain_bicyclist/5.png b/public/images/emoji/google_classic/mountain_bicyclist/5.png
new file mode 100644
index 00000000000..83e0dc67b14
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/google_classic/mountain_bicyclist/6.png b/public/images/emoji/google_classic/mountain_bicyclist/6.png
new file mode 100644
index 00000000000..4ea04cb8bb1
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_man.png b/public/images/emoji/google_classic/mountain_biking_man.png
new file mode 100644
index 00000000000..01aa415deeb
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_man.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_man/2.png b/public/images/emoji/google_classic/mountain_biking_man/2.png
new file mode 100644
index 00000000000..be6e58718c7
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_man/3.png b/public/images/emoji/google_classic/mountain_biking_man/3.png
new file mode 100644
index 00000000000..6e105fd5bda
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_man/4.png b/public/images/emoji/google_classic/mountain_biking_man/4.png
new file mode 100644
index 00000000000..718f58445ca
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_man/5.png b/public/images/emoji/google_classic/mountain_biking_man/5.png
new file mode 100644
index 00000000000..83e0dc67b14
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_man/6.png b/public/images/emoji/google_classic/mountain_biking_man/6.png
new file mode 100644
index 00000000000..4ea04cb8bb1
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_woman.png b/public/images/emoji/google_classic/mountain_biking_woman.png
new file mode 100644
index 00000000000..a9840630dba
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_woman.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_woman/2.png b/public/images/emoji/google_classic/mountain_biking_woman/2.png
new file mode 100644
index 00000000000..0e87267addf
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_woman/3.png b/public/images/emoji/google_classic/mountain_biking_woman/3.png
new file mode 100644
index 00000000000..dc79d8a0335
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_woman/4.png b/public/images/emoji/google_classic/mountain_biking_woman/4.png
new file mode 100644
index 00000000000..8629f9b6be8
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_woman/5.png b/public/images/emoji/google_classic/mountain_biking_woman/5.png
new file mode 100644
index 00000000000..1d4c8e8d2a1
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/google_classic/mountain_biking_woman/6.png b/public/images/emoji/google_classic/mountain_biking_woman/6.png
new file mode 100644
index 00000000000..b5bc881f565
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/google_classic/mountain_cableway.png b/public/images/emoji/google_classic/mountain_cableway.png
new file mode 100644
index 00000000000..fc6924f71f7
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_cableway.png differ
diff --git a/public/images/emoji/google_classic/mountain_railway.png b/public/images/emoji/google_classic/mountain_railway.png
new file mode 100644
index 00000000000..662c9f36fed
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_railway.png differ
diff --git a/public/images/emoji/google_classic/mountain_snow.png b/public/images/emoji/google_classic/mountain_snow.png
new file mode 100644
index 00000000000..edf4cc1286d
Binary files /dev/null and b/public/images/emoji/google_classic/mountain_snow.png differ
diff --git a/public/images/emoji/google_classic/mouse.png b/public/images/emoji/google_classic/mouse.png
new file mode 100644
index 00000000000..37e8c04c045
Binary files /dev/null and b/public/images/emoji/google_classic/mouse.png differ
diff --git a/public/images/emoji/google_classic/mouse2.png b/public/images/emoji/google_classic/mouse2.png
new file mode 100644
index 00000000000..b69c664aa33
Binary files /dev/null and b/public/images/emoji/google_classic/mouse2.png differ
diff --git a/public/images/emoji/google_classic/mouse_three_button.png b/public/images/emoji/google_classic/mouse_three_button.png
new file mode 100644
index 00000000000..220ef6486c1
Binary files /dev/null and b/public/images/emoji/google_classic/mouse_three_button.png differ
diff --git a/public/images/emoji/google_classic/movie_camera.png b/public/images/emoji/google_classic/movie_camera.png
new file mode 100644
index 00000000000..68fa2099ea6
Binary files /dev/null and b/public/images/emoji/google_classic/movie_camera.png differ
diff --git a/public/images/emoji/google_classic/moyai.png b/public/images/emoji/google_classic/moyai.png
new file mode 100644
index 00000000000..0417a109435
Binary files /dev/null and b/public/images/emoji/google_classic/moyai.png differ
diff --git a/public/images/emoji/google_classic/mozambique.png b/public/images/emoji/google_classic/mozambique.png
new file mode 100644
index 00000000000..2f7248ae6e2
Binary files /dev/null and b/public/images/emoji/google_classic/mozambique.png differ
diff --git a/public/images/emoji/google_classic/mrs_claus.png b/public/images/emoji/google_classic/mrs_claus.png
new file mode 100644
index 00000000000..dea93618930
Binary files /dev/null and b/public/images/emoji/google_classic/mrs_claus.png differ
diff --git a/public/images/emoji/google_classic/mrs_claus/2.png b/public/images/emoji/google_classic/mrs_claus/2.png
new file mode 100644
index 00000000000..968dd09dcd7
Binary files /dev/null and b/public/images/emoji/google_classic/mrs_claus/2.png differ
diff --git a/public/images/emoji/google_classic/mrs_claus/3.png b/public/images/emoji/google_classic/mrs_claus/3.png
new file mode 100644
index 00000000000..5d8ee88eaa2
Binary files /dev/null and b/public/images/emoji/google_classic/mrs_claus/3.png differ
diff --git a/public/images/emoji/google_classic/mrs_claus/4.png b/public/images/emoji/google_classic/mrs_claus/4.png
new file mode 100644
index 00000000000..6541b6fe428
Binary files /dev/null and b/public/images/emoji/google_classic/mrs_claus/4.png differ
diff --git a/public/images/emoji/google_classic/mrs_claus/5.png b/public/images/emoji/google_classic/mrs_claus/5.png
new file mode 100644
index 00000000000..99ae5c0f624
Binary files /dev/null and b/public/images/emoji/google_classic/mrs_claus/5.png differ
diff --git a/public/images/emoji/google_classic/mrs_claus/6.png b/public/images/emoji/google_classic/mrs_claus/6.png
new file mode 100644
index 00000000000..912ccf79c36
Binary files /dev/null and b/public/images/emoji/google_classic/mrs_claus/6.png differ
diff --git a/public/images/emoji/google_classic/muscle.png b/public/images/emoji/google_classic/muscle.png
new file mode 100644
index 00000000000..fcdded5cb49
Binary files /dev/null and b/public/images/emoji/google_classic/muscle.png differ
diff --git a/public/images/emoji/google_classic/muscle/2.png b/public/images/emoji/google_classic/muscle/2.png
new file mode 100644
index 00000000000..a7e0ef9b17e
Binary files /dev/null and b/public/images/emoji/google_classic/muscle/2.png differ
diff --git a/public/images/emoji/google_classic/muscle/3.png b/public/images/emoji/google_classic/muscle/3.png
new file mode 100644
index 00000000000..cceb8952688
Binary files /dev/null and b/public/images/emoji/google_classic/muscle/3.png differ
diff --git a/public/images/emoji/google_classic/muscle/4.png b/public/images/emoji/google_classic/muscle/4.png
new file mode 100644
index 00000000000..6d4295d5106
Binary files /dev/null and b/public/images/emoji/google_classic/muscle/4.png differ
diff --git a/public/images/emoji/google_classic/muscle/5.png b/public/images/emoji/google_classic/muscle/5.png
new file mode 100644
index 00000000000..625252023ba
Binary files /dev/null and b/public/images/emoji/google_classic/muscle/5.png differ
diff --git a/public/images/emoji/google_classic/muscle/6.png b/public/images/emoji/google_classic/muscle/6.png
new file mode 100644
index 00000000000..41a3a3fc33a
Binary files /dev/null and b/public/images/emoji/google_classic/muscle/6.png differ
diff --git a/public/images/emoji/google_classic/mushroom.png b/public/images/emoji/google_classic/mushroom.png
new file mode 100644
index 00000000000..0332bba08ed
Binary files /dev/null and b/public/images/emoji/google_classic/mushroom.png differ
diff --git a/public/images/emoji/google_classic/musical_keyboard.png b/public/images/emoji/google_classic/musical_keyboard.png
new file mode 100644
index 00000000000..a872990f0f5
Binary files /dev/null and b/public/images/emoji/google_classic/musical_keyboard.png differ
diff --git a/public/images/emoji/google_classic/musical_note.png b/public/images/emoji/google_classic/musical_note.png
new file mode 100644
index 00000000000..ed7a1aa975c
Binary files /dev/null and b/public/images/emoji/google_classic/musical_note.png differ
diff --git a/public/images/emoji/google_classic/musical_score.png b/public/images/emoji/google_classic/musical_score.png
new file mode 100644
index 00000000000..6ca380ccc84
Binary files /dev/null and b/public/images/emoji/google_classic/musical_score.png differ
diff --git a/public/images/emoji/google_classic/mute.png b/public/images/emoji/google_classic/mute.png
new file mode 100644
index 00000000000..231202a8524
Binary files /dev/null and b/public/images/emoji/google_classic/mute.png differ
diff --git a/public/images/emoji/google_classic/myanmar.png b/public/images/emoji/google_classic/myanmar.png
new file mode 100644
index 00000000000..94543a74a4c
Binary files /dev/null and b/public/images/emoji/google_classic/myanmar.png differ
diff --git a/public/images/emoji/google_classic/nail_care.png b/public/images/emoji/google_classic/nail_care.png
new file mode 100644
index 00000000000..37972b04b52
Binary files /dev/null and b/public/images/emoji/google_classic/nail_care.png differ
diff --git a/public/images/emoji/google_classic/nail_care/2.png b/public/images/emoji/google_classic/nail_care/2.png
new file mode 100644
index 00000000000..016985eb24f
Binary files /dev/null and b/public/images/emoji/google_classic/nail_care/2.png differ
diff --git a/public/images/emoji/google_classic/nail_care/3.png b/public/images/emoji/google_classic/nail_care/3.png
new file mode 100644
index 00000000000..00e5a685022
Binary files /dev/null and b/public/images/emoji/google_classic/nail_care/3.png differ
diff --git a/public/images/emoji/google_classic/nail_care/4.png b/public/images/emoji/google_classic/nail_care/4.png
new file mode 100644
index 00000000000..a3ac4820152
Binary files /dev/null and b/public/images/emoji/google_classic/nail_care/4.png differ
diff --git a/public/images/emoji/google_classic/nail_care/5.png b/public/images/emoji/google_classic/nail_care/5.png
new file mode 100644
index 00000000000..69ae8bd442d
Binary files /dev/null and b/public/images/emoji/google_classic/nail_care/5.png differ
diff --git a/public/images/emoji/google_classic/nail_care/6.png b/public/images/emoji/google_classic/nail_care/6.png
new file mode 100644
index 00000000000..38005d6c57b
Binary files /dev/null and b/public/images/emoji/google_classic/nail_care/6.png differ
diff --git a/public/images/emoji/google_classic/name_badge.png b/public/images/emoji/google_classic/name_badge.png
new file mode 100644
index 00000000000..e19ef4cf867
Binary files /dev/null and b/public/images/emoji/google_classic/name_badge.png differ
diff --git a/public/images/emoji/google_classic/namibia.png b/public/images/emoji/google_classic/namibia.png
new file mode 100644
index 00000000000..1231a7fbe1d
Binary files /dev/null and b/public/images/emoji/google_classic/namibia.png differ
diff --git a/public/images/emoji/google_classic/national_park.png b/public/images/emoji/google_classic/national_park.png
new file mode 100644
index 00000000000..8867d8de41a
Binary files /dev/null and b/public/images/emoji/google_classic/national_park.png differ
diff --git a/public/images/emoji/google_classic/nauru.png b/public/images/emoji/google_classic/nauru.png
new file mode 100644
index 00000000000..04ddfd6f167
Binary files /dev/null and b/public/images/emoji/google_classic/nauru.png differ
diff --git a/public/images/emoji/google_classic/nauseated_face.png b/public/images/emoji/google_classic/nauseated_face.png
new file mode 100644
index 00000000000..c434409c0dc
Binary files /dev/null and b/public/images/emoji/google_classic/nauseated_face.png differ
diff --git a/public/images/emoji/google_classic/necktie.png b/public/images/emoji/google_classic/necktie.png
new file mode 100644
index 00000000000..4937477132e
Binary files /dev/null and b/public/images/emoji/google_classic/necktie.png differ
diff --git a/public/images/emoji/google_classic/negative_squared_cross_mark.png b/public/images/emoji/google_classic/negative_squared_cross_mark.png
new file mode 100644
index 00000000000..db53c8642a6
Binary files /dev/null and b/public/images/emoji/google_classic/negative_squared_cross_mark.png differ
diff --git a/public/images/emoji/google_classic/nepal.png b/public/images/emoji/google_classic/nepal.png
new file mode 100644
index 00000000000..a75e1e6c2fb
Binary files /dev/null and b/public/images/emoji/google_classic/nepal.png differ
diff --git a/public/images/emoji/google_classic/nerd.png b/public/images/emoji/google_classic/nerd.png
new file mode 100644
index 00000000000..2115d429f8e
Binary files /dev/null and b/public/images/emoji/google_classic/nerd.png differ
diff --git a/public/images/emoji/google_classic/nerd_face.png b/public/images/emoji/google_classic/nerd_face.png
new file mode 100644
index 00000000000..2115d429f8e
Binary files /dev/null and b/public/images/emoji/google_classic/nerd_face.png differ
diff --git a/public/images/emoji/google_classic/netherlands.png b/public/images/emoji/google_classic/netherlands.png
new file mode 100644
index 00000000000..096d5647178
Binary files /dev/null and b/public/images/emoji/google_classic/netherlands.png differ
diff --git a/public/images/emoji/google_classic/neutral_face.png b/public/images/emoji/google_classic/neutral_face.png
new file mode 100644
index 00000000000..fb7416e14e5
Binary files /dev/null and b/public/images/emoji/google_classic/neutral_face.png differ
diff --git a/public/images/emoji/google_classic/new.png b/public/images/emoji/google_classic/new.png
new file mode 100644
index 00000000000..8f7818def22
Binary files /dev/null and b/public/images/emoji/google_classic/new.png differ
diff --git a/public/images/emoji/google_classic/new_caledonia.png b/public/images/emoji/google_classic/new_caledonia.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/new_caledonia.png differ
diff --git a/public/images/emoji/google_classic/new_moon.png b/public/images/emoji/google_classic/new_moon.png
new file mode 100644
index 00000000000..0d169713882
Binary files /dev/null and b/public/images/emoji/google_classic/new_moon.png differ
diff --git a/public/images/emoji/google_classic/new_moon_with_face.png b/public/images/emoji/google_classic/new_moon_with_face.png
new file mode 100644
index 00000000000..130a11287cf
Binary files /dev/null and b/public/images/emoji/google_classic/new_moon_with_face.png differ
diff --git a/public/images/emoji/google_classic/new_zealand.png b/public/images/emoji/google_classic/new_zealand.png
new file mode 100644
index 00000000000..ec79a6347dd
Binary files /dev/null and b/public/images/emoji/google_classic/new_zealand.png differ
diff --git a/public/images/emoji/google_classic/newspaper.png b/public/images/emoji/google_classic/newspaper.png
new file mode 100644
index 00000000000..4820f0c6cc5
Binary files /dev/null and b/public/images/emoji/google_classic/newspaper.png differ
diff --git a/public/images/emoji/google_classic/newspaper2.png b/public/images/emoji/google_classic/newspaper2.png
new file mode 100644
index 00000000000..52095afb299
Binary files /dev/null and b/public/images/emoji/google_classic/newspaper2.png differ
diff --git a/public/images/emoji/google_classic/newspaper_roll.png b/public/images/emoji/google_classic/newspaper_roll.png
new file mode 100644
index 00000000000..52095afb299
Binary files /dev/null and b/public/images/emoji/google_classic/newspaper_roll.png differ
diff --git a/public/images/emoji/google_classic/next_track.png b/public/images/emoji/google_classic/next_track.png
new file mode 100644
index 00000000000..8fa069d5783
Binary files /dev/null and b/public/images/emoji/google_classic/next_track.png differ
diff --git a/public/images/emoji/google_classic/next_track_button.png b/public/images/emoji/google_classic/next_track_button.png
new file mode 100644
index 00000000000..8fa069d5783
Binary files /dev/null and b/public/images/emoji/google_classic/next_track_button.png differ
diff --git a/public/images/emoji/google_classic/ng.png b/public/images/emoji/google_classic/ng.png
new file mode 100644
index 00000000000..bc9e942c190
Binary files /dev/null and b/public/images/emoji/google_classic/ng.png differ
diff --git a/public/images/emoji/google_classic/nicaragua.png b/public/images/emoji/google_classic/nicaragua.png
new file mode 100644
index 00000000000..a170bd71f0a
Binary files /dev/null and b/public/images/emoji/google_classic/nicaragua.png differ
diff --git a/public/images/emoji/google_classic/niger.png b/public/images/emoji/google_classic/niger.png
new file mode 100644
index 00000000000..b8eee6b19c5
Binary files /dev/null and b/public/images/emoji/google_classic/niger.png differ
diff --git a/public/images/emoji/google_classic/nigeria.png b/public/images/emoji/google_classic/nigeria.png
new file mode 100644
index 00000000000..630817af987
Binary files /dev/null and b/public/images/emoji/google_classic/nigeria.png differ
diff --git a/public/images/emoji/google_classic/night_with_stars.png b/public/images/emoji/google_classic/night_with_stars.png
new file mode 100644
index 00000000000..46059ef55f9
Binary files /dev/null and b/public/images/emoji/google_classic/night_with_stars.png differ
diff --git a/public/images/emoji/google_classic/nine.png b/public/images/emoji/google_classic/nine.png
new file mode 100644
index 00000000000..4ae93143be0
Binary files /dev/null and b/public/images/emoji/google_classic/nine.png differ
diff --git a/public/images/emoji/google_classic/niue.png b/public/images/emoji/google_classic/niue.png
new file mode 100644
index 00000000000..a5e213a8660
Binary files /dev/null and b/public/images/emoji/google_classic/niue.png differ
diff --git a/public/images/emoji/google_classic/no_bell.png b/public/images/emoji/google_classic/no_bell.png
new file mode 100644
index 00000000000..4733ecb474e
Binary files /dev/null and b/public/images/emoji/google_classic/no_bell.png differ
diff --git a/public/images/emoji/google_classic/no_bicycles.png b/public/images/emoji/google_classic/no_bicycles.png
new file mode 100644
index 00000000000..7adef77ae4f
Binary files /dev/null and b/public/images/emoji/google_classic/no_bicycles.png differ
diff --git a/public/images/emoji/google_classic/no_entry.png b/public/images/emoji/google_classic/no_entry.png
new file mode 100644
index 00000000000..1d9da89933f
Binary files /dev/null and b/public/images/emoji/google_classic/no_entry.png differ
diff --git a/public/images/emoji/google_classic/no_entry_sign.png b/public/images/emoji/google_classic/no_entry_sign.png
new file mode 100644
index 00000000000..4dd7808b873
Binary files /dev/null and b/public/images/emoji/google_classic/no_entry_sign.png differ
diff --git a/public/images/emoji/google_classic/no_good.png b/public/images/emoji/google_classic/no_good.png
new file mode 100644
index 00000000000..b4a10fe93ba
Binary files /dev/null and b/public/images/emoji/google_classic/no_good.png differ
diff --git a/public/images/emoji/google_classic/no_good/2.png b/public/images/emoji/google_classic/no_good/2.png
new file mode 100644
index 00000000000..e4c838cc32b
Binary files /dev/null and b/public/images/emoji/google_classic/no_good/2.png differ
diff --git a/public/images/emoji/google_classic/no_good/3.png b/public/images/emoji/google_classic/no_good/3.png
new file mode 100644
index 00000000000..22a726d66a2
Binary files /dev/null and b/public/images/emoji/google_classic/no_good/3.png differ
diff --git a/public/images/emoji/google_classic/no_good/4.png b/public/images/emoji/google_classic/no_good/4.png
new file mode 100644
index 00000000000..e1753b2e6b4
Binary files /dev/null and b/public/images/emoji/google_classic/no_good/4.png differ
diff --git a/public/images/emoji/google_classic/no_good/5.png b/public/images/emoji/google_classic/no_good/5.png
new file mode 100644
index 00000000000..94117f25547
Binary files /dev/null and b/public/images/emoji/google_classic/no_good/5.png differ
diff --git a/public/images/emoji/google_classic/no_good/6.png b/public/images/emoji/google_classic/no_good/6.png
new file mode 100644
index 00000000000..b3154d094bf
Binary files /dev/null and b/public/images/emoji/google_classic/no_good/6.png differ
diff --git a/public/images/emoji/google_classic/no_good_man.png b/public/images/emoji/google_classic/no_good_man.png
new file mode 100644
index 00000000000..ef1ec56a23d
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_man.png differ
diff --git a/public/images/emoji/google_classic/no_good_man/2.png b/public/images/emoji/google_classic/no_good_man/2.png
new file mode 100644
index 00000000000..26f264202db
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_man/2.png differ
diff --git a/public/images/emoji/google_classic/no_good_man/3.png b/public/images/emoji/google_classic/no_good_man/3.png
new file mode 100644
index 00000000000..a623c080de6
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_man/3.png differ
diff --git a/public/images/emoji/google_classic/no_good_man/4.png b/public/images/emoji/google_classic/no_good_man/4.png
new file mode 100644
index 00000000000..a74ac90bef8
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_man/4.png differ
diff --git a/public/images/emoji/google_classic/no_good_man/5.png b/public/images/emoji/google_classic/no_good_man/5.png
new file mode 100644
index 00000000000..34f7808184e
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_man/5.png differ
diff --git a/public/images/emoji/google_classic/no_good_man/6.png b/public/images/emoji/google_classic/no_good_man/6.png
new file mode 100644
index 00000000000..7a4b1557309
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_man/6.png differ
diff --git a/public/images/emoji/google_classic/no_good_woman.png b/public/images/emoji/google_classic/no_good_woman.png
new file mode 100644
index 00000000000..b4a10fe93ba
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_woman.png differ
diff --git a/public/images/emoji/google_classic/no_good_woman/2.png b/public/images/emoji/google_classic/no_good_woman/2.png
new file mode 100644
index 00000000000..e4c838cc32b
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_woman/2.png differ
diff --git a/public/images/emoji/google_classic/no_good_woman/3.png b/public/images/emoji/google_classic/no_good_woman/3.png
new file mode 100644
index 00000000000..22a726d66a2
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_woman/3.png differ
diff --git a/public/images/emoji/google_classic/no_good_woman/4.png b/public/images/emoji/google_classic/no_good_woman/4.png
new file mode 100644
index 00000000000..e1753b2e6b4
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_woman/4.png differ
diff --git a/public/images/emoji/google_classic/no_good_woman/5.png b/public/images/emoji/google_classic/no_good_woman/5.png
new file mode 100644
index 00000000000..94117f25547
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_woman/5.png differ
diff --git a/public/images/emoji/google_classic/no_good_woman/6.png b/public/images/emoji/google_classic/no_good_woman/6.png
new file mode 100644
index 00000000000..b3154d094bf
Binary files /dev/null and b/public/images/emoji/google_classic/no_good_woman/6.png differ
diff --git a/public/images/emoji/google_classic/no_mobile_phones.png b/public/images/emoji/google_classic/no_mobile_phones.png
new file mode 100644
index 00000000000..3a812b55353
Binary files /dev/null and b/public/images/emoji/google_classic/no_mobile_phones.png differ
diff --git a/public/images/emoji/google_classic/no_mouth.png b/public/images/emoji/google_classic/no_mouth.png
new file mode 100644
index 00000000000..abaaf15ca4a
Binary files /dev/null and b/public/images/emoji/google_classic/no_mouth.png differ
diff --git a/public/images/emoji/google_classic/no_pedestrians.png b/public/images/emoji/google_classic/no_pedestrians.png
new file mode 100644
index 00000000000..20249ddacce
Binary files /dev/null and b/public/images/emoji/google_classic/no_pedestrians.png differ
diff --git a/public/images/emoji/google_classic/no_smoking.png b/public/images/emoji/google_classic/no_smoking.png
new file mode 100644
index 00000000000..fafebd2642b
Binary files /dev/null and b/public/images/emoji/google_classic/no_smoking.png differ
diff --git a/public/images/emoji/google_classic/non-potable_water.png b/public/images/emoji/google_classic/non-potable_water.png
new file mode 100644
index 00000000000..131f6e05bb9
Binary files /dev/null and b/public/images/emoji/google_classic/non-potable_water.png differ
diff --git a/public/images/emoji/google_classic/norfolk_island.png b/public/images/emoji/google_classic/norfolk_island.png
new file mode 100644
index 00000000000..3441930e2af
Binary files /dev/null and b/public/images/emoji/google_classic/norfolk_island.png differ
diff --git a/public/images/emoji/google_classic/north_korea.png b/public/images/emoji/google_classic/north_korea.png
new file mode 100644
index 00000000000..e2ad8b7cec0
Binary files /dev/null and b/public/images/emoji/google_classic/north_korea.png differ
diff --git a/public/images/emoji/google_classic/northern_mariana_islands.png b/public/images/emoji/google_classic/northern_mariana_islands.png
new file mode 100644
index 00000000000..cddfe58a8a1
Binary files /dev/null and b/public/images/emoji/google_classic/northern_mariana_islands.png differ
diff --git a/public/images/emoji/google_classic/norway.png b/public/images/emoji/google_classic/norway.png
new file mode 100644
index 00000000000..4e8756eef8f
Binary files /dev/null and b/public/images/emoji/google_classic/norway.png differ
diff --git a/public/images/emoji/google_classic/nose.png b/public/images/emoji/google_classic/nose.png
new file mode 100644
index 00000000000..386396c7991
Binary files /dev/null and b/public/images/emoji/google_classic/nose.png differ
diff --git a/public/images/emoji/google_classic/nose/2.png b/public/images/emoji/google_classic/nose/2.png
new file mode 100644
index 00000000000..2943a50eee1
Binary files /dev/null and b/public/images/emoji/google_classic/nose/2.png differ
diff --git a/public/images/emoji/google_classic/nose/3.png b/public/images/emoji/google_classic/nose/3.png
new file mode 100644
index 00000000000..c6237b59643
Binary files /dev/null and b/public/images/emoji/google_classic/nose/3.png differ
diff --git a/public/images/emoji/google_classic/nose/4.png b/public/images/emoji/google_classic/nose/4.png
new file mode 100644
index 00000000000..1e6e728fdaf
Binary files /dev/null and b/public/images/emoji/google_classic/nose/4.png differ
diff --git a/public/images/emoji/google_classic/nose/5.png b/public/images/emoji/google_classic/nose/5.png
new file mode 100644
index 00000000000..5f3d4438db6
Binary files /dev/null and b/public/images/emoji/google_classic/nose/5.png differ
diff --git a/public/images/emoji/google_classic/nose/6.png b/public/images/emoji/google_classic/nose/6.png
new file mode 100644
index 00000000000..297b813db33
Binary files /dev/null and b/public/images/emoji/google_classic/nose/6.png differ
diff --git a/public/images/emoji/google_classic/notebook.png b/public/images/emoji/google_classic/notebook.png
new file mode 100644
index 00000000000..10971327a51
Binary files /dev/null and b/public/images/emoji/google_classic/notebook.png differ
diff --git a/public/images/emoji/google_classic/notebook_with_decorative_cover.png b/public/images/emoji/google_classic/notebook_with_decorative_cover.png
new file mode 100644
index 00000000000..d5a17c61047
Binary files /dev/null and b/public/images/emoji/google_classic/notebook_with_decorative_cover.png differ
diff --git a/public/images/emoji/google_classic/notepad_spiral.png b/public/images/emoji/google_classic/notepad_spiral.png
new file mode 100644
index 00000000000..eb6853649e8
Binary files /dev/null and b/public/images/emoji/google_classic/notepad_spiral.png differ
diff --git a/public/images/emoji/google_classic/notes.png b/public/images/emoji/google_classic/notes.png
new file mode 100644
index 00000000000..bc1ac37390f
Binary files /dev/null and b/public/images/emoji/google_classic/notes.png differ
diff --git a/public/images/emoji/google_classic/nut_and_bolt.png b/public/images/emoji/google_classic/nut_and_bolt.png
new file mode 100644
index 00000000000..4d77d041216
Binary files /dev/null and b/public/images/emoji/google_classic/nut_and_bolt.png differ
diff --git a/public/images/emoji/google_classic/o.png b/public/images/emoji/google_classic/o.png
new file mode 100644
index 00000000000..c22044d12c4
Binary files /dev/null and b/public/images/emoji/google_classic/o.png differ
diff --git a/public/images/emoji/google_classic/o2.png b/public/images/emoji/google_classic/o2.png
new file mode 100644
index 00000000000..2a028a53918
Binary files /dev/null and b/public/images/emoji/google_classic/o2.png differ
diff --git a/public/images/emoji/google_classic/ocean.png b/public/images/emoji/google_classic/ocean.png
new file mode 100644
index 00000000000..7cc7ec7c176
Binary files /dev/null and b/public/images/emoji/google_classic/ocean.png differ
diff --git a/public/images/emoji/google_classic/octopus.png b/public/images/emoji/google_classic/octopus.png
new file mode 100644
index 00000000000..0b419a5df9f
Binary files /dev/null and b/public/images/emoji/google_classic/octopus.png differ
diff --git a/public/images/emoji/google_classic/oden.png b/public/images/emoji/google_classic/oden.png
new file mode 100644
index 00000000000..257b23b826b
Binary files /dev/null and b/public/images/emoji/google_classic/oden.png differ
diff --git a/public/images/emoji/google_classic/office.png b/public/images/emoji/google_classic/office.png
new file mode 100644
index 00000000000..f7d06f7cd33
Binary files /dev/null and b/public/images/emoji/google_classic/office.png differ
diff --git a/public/images/emoji/google_classic/oil.png b/public/images/emoji/google_classic/oil.png
new file mode 100644
index 00000000000..8664a9d1cec
Binary files /dev/null and b/public/images/emoji/google_classic/oil.png differ
diff --git a/public/images/emoji/google_classic/oil_drum.png b/public/images/emoji/google_classic/oil_drum.png
new file mode 100644
index 00000000000..8664a9d1cec
Binary files /dev/null and b/public/images/emoji/google_classic/oil_drum.png differ
diff --git a/public/images/emoji/google_classic/ok.png b/public/images/emoji/google_classic/ok.png
new file mode 100644
index 00000000000..28482bcb6d6
Binary files /dev/null and b/public/images/emoji/google_classic/ok.png differ
diff --git a/public/images/emoji/google_classic/ok_hand.png b/public/images/emoji/google_classic/ok_hand.png
new file mode 100644
index 00000000000..88f3ce8063a
Binary files /dev/null and b/public/images/emoji/google_classic/ok_hand.png differ
diff --git a/public/images/emoji/google_classic/ok_hand/2.png b/public/images/emoji/google_classic/ok_hand/2.png
new file mode 100644
index 00000000000..ac927ebe17f
Binary files /dev/null and b/public/images/emoji/google_classic/ok_hand/2.png differ
diff --git a/public/images/emoji/google_classic/ok_hand/3.png b/public/images/emoji/google_classic/ok_hand/3.png
new file mode 100644
index 00000000000..513137d5124
Binary files /dev/null and b/public/images/emoji/google_classic/ok_hand/3.png differ
diff --git a/public/images/emoji/google_classic/ok_hand/4.png b/public/images/emoji/google_classic/ok_hand/4.png
new file mode 100644
index 00000000000..3a6093b7485
Binary files /dev/null and b/public/images/emoji/google_classic/ok_hand/4.png differ
diff --git a/public/images/emoji/google_classic/ok_hand/5.png b/public/images/emoji/google_classic/ok_hand/5.png
new file mode 100644
index 00000000000..596e51c774a
Binary files /dev/null and b/public/images/emoji/google_classic/ok_hand/5.png differ
diff --git a/public/images/emoji/google_classic/ok_hand/6.png b/public/images/emoji/google_classic/ok_hand/6.png
new file mode 100644
index 00000000000..af8cd7a22a7
Binary files /dev/null and b/public/images/emoji/google_classic/ok_hand/6.png differ
diff --git a/public/images/emoji/google_classic/ok_man.png b/public/images/emoji/google_classic/ok_man.png
new file mode 100644
index 00000000000..064ab8bba73
Binary files /dev/null and b/public/images/emoji/google_classic/ok_man.png differ
diff --git a/public/images/emoji/google_classic/ok_man/2.png b/public/images/emoji/google_classic/ok_man/2.png
new file mode 100644
index 00000000000..6afc9f8151a
Binary files /dev/null and b/public/images/emoji/google_classic/ok_man/2.png differ
diff --git a/public/images/emoji/google_classic/ok_man/3.png b/public/images/emoji/google_classic/ok_man/3.png
new file mode 100644
index 00000000000..1cf5d38c57a
Binary files /dev/null and b/public/images/emoji/google_classic/ok_man/3.png differ
diff --git a/public/images/emoji/google_classic/ok_man/4.png b/public/images/emoji/google_classic/ok_man/4.png
new file mode 100644
index 00000000000..db8b0e52881
Binary files /dev/null and b/public/images/emoji/google_classic/ok_man/4.png differ
diff --git a/public/images/emoji/google_classic/ok_man/5.png b/public/images/emoji/google_classic/ok_man/5.png
new file mode 100644
index 00000000000..63664f32eca
Binary files /dev/null and b/public/images/emoji/google_classic/ok_man/5.png differ
diff --git a/public/images/emoji/google_classic/ok_man/6.png b/public/images/emoji/google_classic/ok_man/6.png
new file mode 100644
index 00000000000..ad336dec9c1
Binary files /dev/null and b/public/images/emoji/google_classic/ok_man/6.png differ
diff --git a/public/images/emoji/google_classic/ok_woman.png b/public/images/emoji/google_classic/ok_woman.png
new file mode 100644
index 00000000000..5574a33c509
Binary files /dev/null and b/public/images/emoji/google_classic/ok_woman.png differ
diff --git a/public/images/emoji/google_classic/ok_woman/2.png b/public/images/emoji/google_classic/ok_woman/2.png
new file mode 100644
index 00000000000..f9a77f36d07
Binary files /dev/null and b/public/images/emoji/google_classic/ok_woman/2.png differ
diff --git a/public/images/emoji/google_classic/ok_woman/3.png b/public/images/emoji/google_classic/ok_woman/3.png
new file mode 100644
index 00000000000..69929488d6a
Binary files /dev/null and b/public/images/emoji/google_classic/ok_woman/3.png differ
diff --git a/public/images/emoji/google_classic/ok_woman/4.png b/public/images/emoji/google_classic/ok_woman/4.png
new file mode 100644
index 00000000000..f319311c952
Binary files /dev/null and b/public/images/emoji/google_classic/ok_woman/4.png differ
diff --git a/public/images/emoji/google_classic/ok_woman/5.png b/public/images/emoji/google_classic/ok_woman/5.png
new file mode 100644
index 00000000000..9cd2e6031a1
Binary files /dev/null and b/public/images/emoji/google_classic/ok_woman/5.png differ
diff --git a/public/images/emoji/google_classic/ok_woman/6.png b/public/images/emoji/google_classic/ok_woman/6.png
new file mode 100644
index 00000000000..2234247e640
Binary files /dev/null and b/public/images/emoji/google_classic/ok_woman/6.png differ
diff --git a/public/images/emoji/google_classic/old_key.png b/public/images/emoji/google_classic/old_key.png
new file mode 100644
index 00000000000..87121fe1078
Binary files /dev/null and b/public/images/emoji/google_classic/old_key.png differ
diff --git a/public/images/emoji/google_classic/older_adult.png b/public/images/emoji/google_classic/older_adult.png
new file mode 100644
index 00000000000..8796829b876
Binary files /dev/null and b/public/images/emoji/google_classic/older_adult.png differ
diff --git a/public/images/emoji/google_classic/older_adult/2.png b/public/images/emoji/google_classic/older_adult/2.png
new file mode 100644
index 00000000000..b36f41960e7
Binary files /dev/null and b/public/images/emoji/google_classic/older_adult/2.png differ
diff --git a/public/images/emoji/google_classic/older_adult/3.png b/public/images/emoji/google_classic/older_adult/3.png
new file mode 100644
index 00000000000..dc1441fea56
Binary files /dev/null and b/public/images/emoji/google_classic/older_adult/3.png differ
diff --git a/public/images/emoji/google_classic/older_adult/4.png b/public/images/emoji/google_classic/older_adult/4.png
new file mode 100644
index 00000000000..abc19e06c74
Binary files /dev/null and b/public/images/emoji/google_classic/older_adult/4.png differ
diff --git a/public/images/emoji/google_classic/older_adult/5.png b/public/images/emoji/google_classic/older_adult/5.png
new file mode 100644
index 00000000000..c90549f6813
Binary files /dev/null and b/public/images/emoji/google_classic/older_adult/5.png differ
diff --git a/public/images/emoji/google_classic/older_adult/6.png b/public/images/emoji/google_classic/older_adult/6.png
new file mode 100644
index 00000000000..5152c9c1a3e
Binary files /dev/null and b/public/images/emoji/google_classic/older_adult/6.png differ
diff --git a/public/images/emoji/google_classic/older_man.png b/public/images/emoji/google_classic/older_man.png
new file mode 100644
index 00000000000..3c4c59e1e0d
Binary files /dev/null and b/public/images/emoji/google_classic/older_man.png differ
diff --git a/public/images/emoji/google_classic/older_man/2.png b/public/images/emoji/google_classic/older_man/2.png
new file mode 100644
index 00000000000..a15b796635d
Binary files /dev/null and b/public/images/emoji/google_classic/older_man/2.png differ
diff --git a/public/images/emoji/google_classic/older_man/3.png b/public/images/emoji/google_classic/older_man/3.png
new file mode 100644
index 00000000000..07c22571141
Binary files /dev/null and b/public/images/emoji/google_classic/older_man/3.png differ
diff --git a/public/images/emoji/google_classic/older_man/4.png b/public/images/emoji/google_classic/older_man/4.png
new file mode 100644
index 00000000000..eeb196006c3
Binary files /dev/null and b/public/images/emoji/google_classic/older_man/4.png differ
diff --git a/public/images/emoji/google_classic/older_man/5.png b/public/images/emoji/google_classic/older_man/5.png
new file mode 100644
index 00000000000..590fc0ec0f5
Binary files /dev/null and b/public/images/emoji/google_classic/older_man/5.png differ
diff --git a/public/images/emoji/google_classic/older_man/6.png b/public/images/emoji/google_classic/older_man/6.png
new file mode 100644
index 00000000000..c1e5de22a8b
Binary files /dev/null and b/public/images/emoji/google_classic/older_man/6.png differ
diff --git a/public/images/emoji/google_classic/older_woman.png b/public/images/emoji/google_classic/older_woman.png
new file mode 100644
index 00000000000..1261df7c00b
Binary files /dev/null and b/public/images/emoji/google_classic/older_woman.png differ
diff --git a/public/images/emoji/google_classic/older_woman/2.png b/public/images/emoji/google_classic/older_woman/2.png
new file mode 100644
index 00000000000..01681ab34b5
Binary files /dev/null and b/public/images/emoji/google_classic/older_woman/2.png differ
diff --git a/public/images/emoji/google_classic/older_woman/3.png b/public/images/emoji/google_classic/older_woman/3.png
new file mode 100644
index 00000000000..a861adf6edd
Binary files /dev/null and b/public/images/emoji/google_classic/older_woman/3.png differ
diff --git a/public/images/emoji/google_classic/older_woman/4.png b/public/images/emoji/google_classic/older_woman/4.png
new file mode 100644
index 00000000000..6884082ac42
Binary files /dev/null and b/public/images/emoji/google_classic/older_woman/4.png differ
diff --git a/public/images/emoji/google_classic/older_woman/5.png b/public/images/emoji/google_classic/older_woman/5.png
new file mode 100644
index 00000000000..49faefc74c7
Binary files /dev/null and b/public/images/emoji/google_classic/older_woman/5.png differ
diff --git a/public/images/emoji/google_classic/older_woman/6.png b/public/images/emoji/google_classic/older_woman/6.png
new file mode 100644
index 00000000000..6c3d261ff3c
Binary files /dev/null and b/public/images/emoji/google_classic/older_woman/6.png differ
diff --git a/public/images/emoji/google_classic/om.png b/public/images/emoji/google_classic/om.png
new file mode 100644
index 00000000000..aa79c5ac771
Binary files /dev/null and b/public/images/emoji/google_classic/om.png differ
diff --git a/public/images/emoji/google_classic/om_symbol.png b/public/images/emoji/google_classic/om_symbol.png
new file mode 100644
index 00000000000..aa79c5ac771
Binary files /dev/null and b/public/images/emoji/google_classic/om_symbol.png differ
diff --git a/public/images/emoji/google_classic/oman.png b/public/images/emoji/google_classic/oman.png
new file mode 100644
index 00000000000..a3084bb2478
Binary files /dev/null and b/public/images/emoji/google_classic/oman.png differ
diff --git a/public/images/emoji/google_classic/on.png b/public/images/emoji/google_classic/on.png
new file mode 100644
index 00000000000..9adad893938
Binary files /dev/null and b/public/images/emoji/google_classic/on.png differ
diff --git a/public/images/emoji/google_classic/oncoming_automobile.png b/public/images/emoji/google_classic/oncoming_automobile.png
new file mode 100644
index 00000000000..9634051d47f
Binary files /dev/null and b/public/images/emoji/google_classic/oncoming_automobile.png differ
diff --git a/public/images/emoji/google_classic/oncoming_bus.png b/public/images/emoji/google_classic/oncoming_bus.png
new file mode 100644
index 00000000000..b658875d7dc
Binary files /dev/null and b/public/images/emoji/google_classic/oncoming_bus.png differ
diff --git a/public/images/emoji/google_classic/oncoming_police_car.png b/public/images/emoji/google_classic/oncoming_police_car.png
new file mode 100644
index 00000000000..3bfba6c3ebf
Binary files /dev/null and b/public/images/emoji/google_classic/oncoming_police_car.png differ
diff --git a/public/images/emoji/google_classic/oncoming_taxi.png b/public/images/emoji/google_classic/oncoming_taxi.png
new file mode 100644
index 00000000000..e8f1841320e
Binary files /dev/null and b/public/images/emoji/google_classic/oncoming_taxi.png differ
diff --git a/public/images/emoji/google_classic/one.png b/public/images/emoji/google_classic/one.png
new file mode 100644
index 00000000000..ac76f853ed5
Binary files /dev/null and b/public/images/emoji/google_classic/one.png differ
diff --git a/public/images/emoji/google_classic/open_book.png b/public/images/emoji/google_classic/open_book.png
new file mode 100644
index 00000000000..ac277b2a55d
Binary files /dev/null and b/public/images/emoji/google_classic/open_book.png differ
diff --git a/public/images/emoji/google_classic/open_file_folder.png b/public/images/emoji/google_classic/open_file_folder.png
new file mode 100644
index 00000000000..bccc7685a90
Binary files /dev/null and b/public/images/emoji/google_classic/open_file_folder.png differ
diff --git a/public/images/emoji/google_classic/open_hands.png b/public/images/emoji/google_classic/open_hands.png
new file mode 100644
index 00000000000..ddc02d4fa7b
Binary files /dev/null and b/public/images/emoji/google_classic/open_hands.png differ
diff --git a/public/images/emoji/google_classic/open_hands/2.png b/public/images/emoji/google_classic/open_hands/2.png
new file mode 100644
index 00000000000..772148aece3
Binary files /dev/null and b/public/images/emoji/google_classic/open_hands/2.png differ
diff --git a/public/images/emoji/google_classic/open_hands/3.png b/public/images/emoji/google_classic/open_hands/3.png
new file mode 100644
index 00000000000..62a39dca050
Binary files /dev/null and b/public/images/emoji/google_classic/open_hands/3.png differ
diff --git a/public/images/emoji/google_classic/open_hands/4.png b/public/images/emoji/google_classic/open_hands/4.png
new file mode 100644
index 00000000000..cd68f7ac3e1
Binary files /dev/null and b/public/images/emoji/google_classic/open_hands/4.png differ
diff --git a/public/images/emoji/google_classic/open_hands/5.png b/public/images/emoji/google_classic/open_hands/5.png
new file mode 100644
index 00000000000..087991d5943
Binary files /dev/null and b/public/images/emoji/google_classic/open_hands/5.png differ
diff --git a/public/images/emoji/google_classic/open_hands/6.png b/public/images/emoji/google_classic/open_hands/6.png
new file mode 100644
index 00000000000..14b088b1969
Binary files /dev/null and b/public/images/emoji/google_classic/open_hands/6.png differ
diff --git a/public/images/emoji/google_classic/open_mouth.png b/public/images/emoji/google_classic/open_mouth.png
new file mode 100644
index 00000000000..780c99af787
Binary files /dev/null and b/public/images/emoji/google_classic/open_mouth.png differ
diff --git a/public/images/emoji/google_classic/open_umbrella.png b/public/images/emoji/google_classic/open_umbrella.png
new file mode 100644
index 00000000000..a9fbd03abaf
Binary files /dev/null and b/public/images/emoji/google_classic/open_umbrella.png differ
diff --git a/public/images/emoji/google_classic/ophiuchus.png b/public/images/emoji/google_classic/ophiuchus.png
new file mode 100644
index 00000000000..ff36d049043
Binary files /dev/null and b/public/images/emoji/google_classic/ophiuchus.png differ
diff --git a/public/images/emoji/google_classic/orange_book.png b/public/images/emoji/google_classic/orange_book.png
new file mode 100644
index 00000000000..7f056bfb32e
Binary files /dev/null and b/public/images/emoji/google_classic/orange_book.png differ
diff --git a/public/images/emoji/google_classic/orange_heart.png b/public/images/emoji/google_classic/orange_heart.png
new file mode 100644
index 00000000000..f217c930a74
Binary files /dev/null and b/public/images/emoji/google_classic/orange_heart.png differ
diff --git a/public/images/emoji/google_classic/orthodox_cross.png b/public/images/emoji/google_classic/orthodox_cross.png
new file mode 100644
index 00000000000..78f881392d7
Binary files /dev/null and b/public/images/emoji/google_classic/orthodox_cross.png differ
diff --git a/public/images/emoji/google_classic/outbox_tray.png b/public/images/emoji/google_classic/outbox_tray.png
new file mode 100644
index 00000000000..fe8739808be
Binary files /dev/null and b/public/images/emoji/google_classic/outbox_tray.png differ
diff --git a/public/images/emoji/google_classic/owl.png b/public/images/emoji/google_classic/owl.png
new file mode 100644
index 00000000000..f406ed86d26
Binary files /dev/null and b/public/images/emoji/google_classic/owl.png differ
diff --git a/public/images/emoji/google_classic/ox.png b/public/images/emoji/google_classic/ox.png
new file mode 100644
index 00000000000..e2f19b2752f
Binary files /dev/null and b/public/images/emoji/google_classic/ox.png differ
diff --git a/public/images/emoji/google_classic/package.png b/public/images/emoji/google_classic/package.png
new file mode 100644
index 00000000000..29a44e6f058
Binary files /dev/null and b/public/images/emoji/google_classic/package.png differ
diff --git a/public/images/emoji/google_classic/page_facing_up.png b/public/images/emoji/google_classic/page_facing_up.png
new file mode 100644
index 00000000000..4fa7bcf2cfe
Binary files /dev/null and b/public/images/emoji/google_classic/page_facing_up.png differ
diff --git a/public/images/emoji/google_classic/page_with_curl.png b/public/images/emoji/google_classic/page_with_curl.png
new file mode 100644
index 00000000000..4f4bbda422c
Binary files /dev/null and b/public/images/emoji/google_classic/page_with_curl.png differ
diff --git a/public/images/emoji/google_classic/pager.png b/public/images/emoji/google_classic/pager.png
new file mode 100644
index 00000000000..8b81727d4a0
Binary files /dev/null and b/public/images/emoji/google_classic/pager.png differ
diff --git a/public/images/emoji/google_classic/paintbrush.png b/public/images/emoji/google_classic/paintbrush.png
new file mode 100644
index 00000000000..81b26f22fab
Binary files /dev/null and b/public/images/emoji/google_classic/paintbrush.png differ
diff --git a/public/images/emoji/google_classic/pakistan.png b/public/images/emoji/google_classic/pakistan.png
new file mode 100644
index 00000000000..300c4cda316
Binary files /dev/null and b/public/images/emoji/google_classic/pakistan.png differ
diff --git a/public/images/emoji/google_classic/palau.png b/public/images/emoji/google_classic/palau.png
new file mode 100644
index 00000000000..fa1aa4b91ba
Binary files /dev/null and b/public/images/emoji/google_classic/palau.png differ
diff --git a/public/images/emoji/google_classic/palestinian_territories.png b/public/images/emoji/google_classic/palestinian_territories.png
new file mode 100644
index 00000000000..2fa3cf503eb
Binary files /dev/null and b/public/images/emoji/google_classic/palestinian_territories.png differ
diff --git a/public/images/emoji/google_classic/palm_tree.png b/public/images/emoji/google_classic/palm_tree.png
new file mode 100644
index 00000000000..27dd3ad7c4f
Binary files /dev/null and b/public/images/emoji/google_classic/palm_tree.png differ
diff --git a/public/images/emoji/google_classic/palms_up_together.png b/public/images/emoji/google_classic/palms_up_together.png
new file mode 100644
index 00000000000..fb66ba11c40
Binary files /dev/null and b/public/images/emoji/google_classic/palms_up_together.png differ
diff --git a/public/images/emoji/google_classic/palms_up_together/2.png b/public/images/emoji/google_classic/palms_up_together/2.png
new file mode 100644
index 00000000000..6d9b2fc8ccd
Binary files /dev/null and b/public/images/emoji/google_classic/palms_up_together/2.png differ
diff --git a/public/images/emoji/google_classic/palms_up_together/3.png b/public/images/emoji/google_classic/palms_up_together/3.png
new file mode 100644
index 00000000000..c5d52f5c7a7
Binary files /dev/null and b/public/images/emoji/google_classic/palms_up_together/3.png differ
diff --git a/public/images/emoji/google_classic/palms_up_together/4.png b/public/images/emoji/google_classic/palms_up_together/4.png
new file mode 100644
index 00000000000..3d4288d10db
Binary files /dev/null and b/public/images/emoji/google_classic/palms_up_together/4.png differ
diff --git a/public/images/emoji/google_classic/palms_up_together/5.png b/public/images/emoji/google_classic/palms_up_together/5.png
new file mode 100644
index 00000000000..6ff36c07cbd
Binary files /dev/null and b/public/images/emoji/google_classic/palms_up_together/5.png differ
diff --git a/public/images/emoji/google_classic/palms_up_together/6.png b/public/images/emoji/google_classic/palms_up_together/6.png
new file mode 100644
index 00000000000..c25d42927d8
Binary files /dev/null and b/public/images/emoji/google_classic/palms_up_together/6.png differ
diff --git a/public/images/emoji/google_classic/panama.png b/public/images/emoji/google_classic/panama.png
new file mode 100644
index 00000000000..a474f416dfe
Binary files /dev/null and b/public/images/emoji/google_classic/panama.png differ
diff --git a/public/images/emoji/google_classic/pancakes.png b/public/images/emoji/google_classic/pancakes.png
new file mode 100644
index 00000000000..2858b04b017
Binary files /dev/null and b/public/images/emoji/google_classic/pancakes.png differ
diff --git a/public/images/emoji/google_classic/panda_face.png b/public/images/emoji/google_classic/panda_face.png
new file mode 100644
index 00000000000..6d340d44c8c
Binary files /dev/null and b/public/images/emoji/google_classic/panda_face.png differ
diff --git a/public/images/emoji/google_classic/paperclip.png b/public/images/emoji/google_classic/paperclip.png
new file mode 100644
index 00000000000..3075e667c45
Binary files /dev/null and b/public/images/emoji/google_classic/paperclip.png differ
diff --git a/public/images/emoji/google_classic/paperclips.png b/public/images/emoji/google_classic/paperclips.png
new file mode 100644
index 00000000000..e34ff5ad2a3
Binary files /dev/null and b/public/images/emoji/google_classic/paperclips.png differ
diff --git a/public/images/emoji/google_classic/papua_new_guinea.png b/public/images/emoji/google_classic/papua_new_guinea.png
new file mode 100644
index 00000000000..3279393b537
Binary files /dev/null and b/public/images/emoji/google_classic/papua_new_guinea.png differ
diff --git a/public/images/emoji/google_classic/paraguay.png b/public/images/emoji/google_classic/paraguay.png
new file mode 100644
index 00000000000..0c5d473eb43
Binary files /dev/null and b/public/images/emoji/google_classic/paraguay.png differ
diff --git a/public/images/emoji/google_classic/parasol_on_ground.png b/public/images/emoji/google_classic/parasol_on_ground.png
new file mode 100644
index 00000000000..f23d6f604ce
Binary files /dev/null and b/public/images/emoji/google_classic/parasol_on_ground.png differ
diff --git a/public/images/emoji/google_classic/park.png b/public/images/emoji/google_classic/park.png
new file mode 100644
index 00000000000..8867d8de41a
Binary files /dev/null and b/public/images/emoji/google_classic/park.png differ
diff --git a/public/images/emoji/google_classic/parking.png b/public/images/emoji/google_classic/parking.png
new file mode 100644
index 00000000000..0c15835e21e
Binary files /dev/null and b/public/images/emoji/google_classic/parking.png differ
diff --git a/public/images/emoji/google_classic/part_alternation_mark.png b/public/images/emoji/google_classic/part_alternation_mark.png
new file mode 100644
index 00000000000..aca1d93a227
Binary files /dev/null and b/public/images/emoji/google_classic/part_alternation_mark.png differ
diff --git a/public/images/emoji/google_classic/partly_sunny.png b/public/images/emoji/google_classic/partly_sunny.png
new file mode 100644
index 00000000000..4338bb43895
Binary files /dev/null and b/public/images/emoji/google_classic/partly_sunny.png differ
diff --git a/public/images/emoji/google_classic/passenger_ship.png b/public/images/emoji/google_classic/passenger_ship.png
new file mode 100644
index 00000000000..b0ce2c2f50a
Binary files /dev/null and b/public/images/emoji/google_classic/passenger_ship.png differ
diff --git a/public/images/emoji/google_classic/passport_control.png b/public/images/emoji/google_classic/passport_control.png
new file mode 100644
index 00000000000..66b170cc77e
Binary files /dev/null and b/public/images/emoji/google_classic/passport_control.png differ
diff --git a/public/images/emoji/google_classic/pause_button.png b/public/images/emoji/google_classic/pause_button.png
new file mode 100644
index 00000000000..1be5733ff4e
Binary files /dev/null and b/public/images/emoji/google_classic/pause_button.png differ
diff --git a/public/images/emoji/google_classic/paw_prints.png b/public/images/emoji/google_classic/paw_prints.png
new file mode 100644
index 00000000000..1fdef760934
Binary files /dev/null and b/public/images/emoji/google_classic/paw_prints.png differ
diff --git a/public/images/emoji/google_classic/peace.png b/public/images/emoji/google_classic/peace.png
new file mode 100644
index 00000000000..a0128d56159
Binary files /dev/null and b/public/images/emoji/google_classic/peace.png differ
diff --git a/public/images/emoji/google_classic/peace_symbol.png b/public/images/emoji/google_classic/peace_symbol.png
new file mode 100644
index 00000000000..a0128d56159
Binary files /dev/null and b/public/images/emoji/google_classic/peace_symbol.png differ
diff --git a/public/images/emoji/google_classic/peach.png b/public/images/emoji/google_classic/peach.png
new file mode 100644
index 00000000000..0de43c9b36a
Binary files /dev/null and b/public/images/emoji/google_classic/peach.png differ
diff --git a/public/images/emoji/google_classic/peanuts.png b/public/images/emoji/google_classic/peanuts.png
new file mode 100644
index 00000000000..bd2c26f7af2
Binary files /dev/null and b/public/images/emoji/google_classic/peanuts.png differ
diff --git a/public/images/emoji/google_classic/pear.png b/public/images/emoji/google_classic/pear.png
new file mode 100644
index 00000000000..0e76c56f8b8
Binary files /dev/null and b/public/images/emoji/google_classic/pear.png differ
diff --git a/public/images/emoji/google_classic/pen.png b/public/images/emoji/google_classic/pen.png
new file mode 100644
index 00000000000..11acae0cdd3
Binary files /dev/null and b/public/images/emoji/google_classic/pen.png differ
diff --git a/public/images/emoji/google_classic/pen_ballpoint.png b/public/images/emoji/google_classic/pen_ballpoint.png
new file mode 100644
index 00000000000..11acae0cdd3
Binary files /dev/null and b/public/images/emoji/google_classic/pen_ballpoint.png differ
diff --git a/public/images/emoji/google_classic/pen_fountain.png b/public/images/emoji/google_classic/pen_fountain.png
new file mode 100644
index 00000000000..4af057ce4ec
Binary files /dev/null and b/public/images/emoji/google_classic/pen_fountain.png differ
diff --git a/public/images/emoji/google_classic/pencil.png b/public/images/emoji/google_classic/pencil.png
new file mode 100644
index 00000000000..54aa560fedf
Binary files /dev/null and b/public/images/emoji/google_classic/pencil.png differ
diff --git a/public/images/emoji/google_classic/pencil2.png b/public/images/emoji/google_classic/pencil2.png
new file mode 100644
index 00000000000..b907b343c6e
Binary files /dev/null and b/public/images/emoji/google_classic/pencil2.png differ
diff --git a/public/images/emoji/google_classic/penguin.png b/public/images/emoji/google_classic/penguin.png
new file mode 100644
index 00000000000..5a5446d2891
Binary files /dev/null and b/public/images/emoji/google_classic/penguin.png differ
diff --git a/public/images/emoji/google_classic/pensive.png b/public/images/emoji/google_classic/pensive.png
new file mode 100644
index 00000000000..abab3533760
Binary files /dev/null and b/public/images/emoji/google_classic/pensive.png differ
diff --git a/public/images/emoji/google_classic/performing_arts.png b/public/images/emoji/google_classic/performing_arts.png
new file mode 100644
index 00000000000..b99a1132cf2
Binary files /dev/null and b/public/images/emoji/google_classic/performing_arts.png differ
diff --git a/public/images/emoji/google_classic/persevere.png b/public/images/emoji/google_classic/persevere.png
new file mode 100644
index 00000000000..9e504248323
Binary files /dev/null and b/public/images/emoji/google_classic/persevere.png differ
diff --git a/public/images/emoji/google_classic/person_climbing.png b/public/images/emoji/google_classic/person_climbing.png
new file mode 100644
index 00000000000..d8a6229d6b9
Binary files /dev/null and b/public/images/emoji/google_classic/person_climbing.png differ
diff --git a/public/images/emoji/google_classic/person_climbing/2.png b/public/images/emoji/google_classic/person_climbing/2.png
new file mode 100644
index 00000000000..71330d66a8c
Binary files /dev/null and b/public/images/emoji/google_classic/person_climbing/2.png differ
diff --git a/public/images/emoji/google_classic/person_climbing/3.png b/public/images/emoji/google_classic/person_climbing/3.png
new file mode 100644
index 00000000000..a1345ecbd25
Binary files /dev/null and b/public/images/emoji/google_classic/person_climbing/3.png differ
diff --git a/public/images/emoji/google_classic/person_climbing/4.png b/public/images/emoji/google_classic/person_climbing/4.png
new file mode 100644
index 00000000000..016b920bcde
Binary files /dev/null and b/public/images/emoji/google_classic/person_climbing/4.png differ
diff --git a/public/images/emoji/google_classic/person_climbing/5.png b/public/images/emoji/google_classic/person_climbing/5.png
new file mode 100644
index 00000000000..4591eb52904
Binary files /dev/null and b/public/images/emoji/google_classic/person_climbing/5.png differ
diff --git a/public/images/emoji/google_classic/person_climbing/6.png b/public/images/emoji/google_classic/person_climbing/6.png
new file mode 100644
index 00000000000..19be3236ae9
Binary files /dev/null and b/public/images/emoji/google_classic/person_climbing/6.png differ
diff --git a/public/images/emoji/google_classic/person_fencing.png b/public/images/emoji/google_classic/person_fencing.png
new file mode 100644
index 00000000000..8bf1817c093
Binary files /dev/null and b/public/images/emoji/google_classic/person_fencing.png differ
diff --git a/public/images/emoji/google_classic/person_frowning.png b/public/images/emoji/google_classic/person_frowning.png
new file mode 100644
index 00000000000..262db0d00b0
Binary files /dev/null and b/public/images/emoji/google_classic/person_frowning.png differ
diff --git a/public/images/emoji/google_classic/person_frowning/2.png b/public/images/emoji/google_classic/person_frowning/2.png
new file mode 100644
index 00000000000..f42a78e451e
Binary files /dev/null and b/public/images/emoji/google_classic/person_frowning/2.png differ
diff --git a/public/images/emoji/google_classic/person_frowning/3.png b/public/images/emoji/google_classic/person_frowning/3.png
new file mode 100644
index 00000000000..84d6e41ab40
Binary files /dev/null and b/public/images/emoji/google_classic/person_frowning/3.png differ
diff --git a/public/images/emoji/google_classic/person_frowning/4.png b/public/images/emoji/google_classic/person_frowning/4.png
new file mode 100644
index 00000000000..2b2ee437e44
Binary files /dev/null and b/public/images/emoji/google_classic/person_frowning/4.png differ
diff --git a/public/images/emoji/google_classic/person_frowning/5.png b/public/images/emoji/google_classic/person_frowning/5.png
new file mode 100644
index 00000000000..417ee806f42
Binary files /dev/null and b/public/images/emoji/google_classic/person_frowning/5.png differ
diff --git a/public/images/emoji/google_classic/person_frowning/6.png b/public/images/emoji/google_classic/person_frowning/6.png
new file mode 100644
index 00000000000..065846524c5
Binary files /dev/null and b/public/images/emoji/google_classic/person_frowning/6.png differ
diff --git a/public/images/emoji/google_classic/person_in_lotus_position.png b/public/images/emoji/google_classic/person_in_lotus_position.png
new file mode 100644
index 00000000000..e9404fd5255
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_lotus_position.png differ
diff --git a/public/images/emoji/google_classic/person_in_lotus_position/2.png b/public/images/emoji/google_classic/person_in_lotus_position/2.png
new file mode 100644
index 00000000000..8817578cf09
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/google_classic/person_in_lotus_position/3.png b/public/images/emoji/google_classic/person_in_lotus_position/3.png
new file mode 100644
index 00000000000..0e9bf46e0b6
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/google_classic/person_in_lotus_position/4.png b/public/images/emoji/google_classic/person_in_lotus_position/4.png
new file mode 100644
index 00000000000..918e3d435a2
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/google_classic/person_in_lotus_position/5.png b/public/images/emoji/google_classic/person_in_lotus_position/5.png
new file mode 100644
index 00000000000..0c01143530e
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/google_classic/person_in_lotus_position/6.png b/public/images/emoji/google_classic/person_in_lotus_position/6.png
new file mode 100644
index 00000000000..fed226dac29
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/google_classic/person_in_steamy_room.png b/public/images/emoji/google_classic/person_in_steamy_room.png
new file mode 100644
index 00000000000..65a0790d926
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_steamy_room.png differ
diff --git a/public/images/emoji/google_classic/person_in_steamy_room/2.png b/public/images/emoji/google_classic/person_in_steamy_room/2.png
new file mode 100644
index 00000000000..7260df1d154
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/google_classic/person_in_steamy_room/3.png b/public/images/emoji/google_classic/person_in_steamy_room/3.png
new file mode 100644
index 00000000000..d14580a3db3
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/google_classic/person_in_steamy_room/4.png b/public/images/emoji/google_classic/person_in_steamy_room/4.png
new file mode 100644
index 00000000000..9313ab2116b
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/google_classic/person_in_steamy_room/5.png b/public/images/emoji/google_classic/person_in_steamy_room/5.png
new file mode 100644
index 00000000000..f432b554b37
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/google_classic/person_in_steamy_room/6.png b/public/images/emoji/google_classic/person_in_steamy_room/6.png
new file mode 100644
index 00000000000..dc7087e0284
Binary files /dev/null and b/public/images/emoji/google_classic/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/google_classic/person_with_ball.png b/public/images/emoji/google_classic/person_with_ball.png
new file mode 100644
index 00000000000..13cb1dcc7d7
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_ball.png differ
diff --git a/public/images/emoji/google_classic/person_with_ball/2.png b/public/images/emoji/google_classic/person_with_ball/2.png
new file mode 100644
index 00000000000..8ea76c0c0a2
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_ball/2.png differ
diff --git a/public/images/emoji/google_classic/person_with_ball/3.png b/public/images/emoji/google_classic/person_with_ball/3.png
new file mode 100644
index 00000000000..399e26300a6
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_ball/3.png differ
diff --git a/public/images/emoji/google_classic/person_with_ball/4.png b/public/images/emoji/google_classic/person_with_ball/4.png
new file mode 100644
index 00000000000..8695943db81
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_ball/4.png differ
diff --git a/public/images/emoji/google_classic/person_with_ball/5.png b/public/images/emoji/google_classic/person_with_ball/5.png
new file mode 100644
index 00000000000..2c62ab9c186
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_ball/5.png differ
diff --git a/public/images/emoji/google_classic/person_with_ball/6.png b/public/images/emoji/google_classic/person_with_ball/6.png
new file mode 100644
index 00000000000..fca559c5903
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_ball/6.png differ
diff --git a/public/images/emoji/google_classic/person_with_blond_hair.png b/public/images/emoji/google_classic/person_with_blond_hair.png
new file mode 100644
index 00000000000..a06b4e01e78
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_blond_hair.png differ
diff --git a/public/images/emoji/google_classic/person_with_blond_hair/2.png b/public/images/emoji/google_classic/person_with_blond_hair/2.png
new file mode 100644
index 00000000000..e9a04252c6c
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/google_classic/person_with_blond_hair/3.png b/public/images/emoji/google_classic/person_with_blond_hair/3.png
new file mode 100644
index 00000000000..75674c347ef
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/google_classic/person_with_blond_hair/4.png b/public/images/emoji/google_classic/person_with_blond_hair/4.png
new file mode 100644
index 00000000000..d1d0f873053
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/google_classic/person_with_blond_hair/5.png b/public/images/emoji/google_classic/person_with_blond_hair/5.png
new file mode 100644
index 00000000000..a6264c605d8
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/google_classic/person_with_blond_hair/6.png b/public/images/emoji/google_classic/person_with_blond_hair/6.png
new file mode 100644
index 00000000000..508746275e4
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/google_classic/person_with_pouting_face.png b/public/images/emoji/google_classic/person_with_pouting_face.png
new file mode 100644
index 00000000000..c0c736f741f
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_pouting_face.png differ
diff --git a/public/images/emoji/google_classic/person_with_pouting_face/2.png b/public/images/emoji/google_classic/person_with_pouting_face/2.png
new file mode 100644
index 00000000000..24fb8258dd5
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/google_classic/person_with_pouting_face/3.png b/public/images/emoji/google_classic/person_with_pouting_face/3.png
new file mode 100644
index 00000000000..69dcb7a0382
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/google_classic/person_with_pouting_face/4.png b/public/images/emoji/google_classic/person_with_pouting_face/4.png
new file mode 100644
index 00000000000..71cab54ed9f
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/google_classic/person_with_pouting_face/5.png b/public/images/emoji/google_classic/person_with_pouting_face/5.png
new file mode 100644
index 00000000000..f991c5b4a8a
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/google_classic/person_with_pouting_face/6.png b/public/images/emoji/google_classic/person_with_pouting_face/6.png
new file mode 100644
index 00000000000..b93a6c1a76c
Binary files /dev/null and b/public/images/emoji/google_classic/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/google_classic/peru.png b/public/images/emoji/google_classic/peru.png
new file mode 100644
index 00000000000..12c33faa184
Binary files /dev/null and b/public/images/emoji/google_classic/peru.png differ
diff --git a/public/images/emoji/google_classic/philippines.png b/public/images/emoji/google_classic/philippines.png
new file mode 100644
index 00000000000..635b172ed00
Binary files /dev/null and b/public/images/emoji/google_classic/philippines.png differ
diff --git a/public/images/emoji/google_classic/phone.png b/public/images/emoji/google_classic/phone.png
new file mode 100644
index 00000000000..a456c17db5f
Binary files /dev/null and b/public/images/emoji/google_classic/phone.png differ
diff --git a/public/images/emoji/google_classic/pick.png b/public/images/emoji/google_classic/pick.png
new file mode 100644
index 00000000000..71711ef1dc3
Binary files /dev/null and b/public/images/emoji/google_classic/pick.png differ
diff --git a/public/images/emoji/google_classic/pie.png b/public/images/emoji/google_classic/pie.png
new file mode 100644
index 00000000000..4f5f474d82c
Binary files /dev/null and b/public/images/emoji/google_classic/pie.png differ
diff --git a/public/images/emoji/google_classic/pig.png b/public/images/emoji/google_classic/pig.png
new file mode 100644
index 00000000000..068633b3a8d
Binary files /dev/null and b/public/images/emoji/google_classic/pig.png differ
diff --git a/public/images/emoji/google_classic/pig2.png b/public/images/emoji/google_classic/pig2.png
new file mode 100644
index 00000000000..6c6f5ff05b6
Binary files /dev/null and b/public/images/emoji/google_classic/pig2.png differ
diff --git a/public/images/emoji/google_classic/pig_nose.png b/public/images/emoji/google_classic/pig_nose.png
new file mode 100644
index 00000000000..172289f230a
Binary files /dev/null and b/public/images/emoji/google_classic/pig_nose.png differ
diff --git a/public/images/emoji/google_classic/pill.png b/public/images/emoji/google_classic/pill.png
new file mode 100644
index 00000000000..a214b591cc8
Binary files /dev/null and b/public/images/emoji/google_classic/pill.png differ
diff --git a/public/images/emoji/google_classic/pineapple.png b/public/images/emoji/google_classic/pineapple.png
new file mode 100644
index 00000000000..c7bbbed3a11
Binary files /dev/null and b/public/images/emoji/google_classic/pineapple.png differ
diff --git a/public/images/emoji/google_classic/ping_pong.png b/public/images/emoji/google_classic/ping_pong.png
new file mode 100644
index 00000000000..e43ef813b10
Binary files /dev/null and b/public/images/emoji/google_classic/ping_pong.png differ
diff --git a/public/images/emoji/google_classic/pisces.png b/public/images/emoji/google_classic/pisces.png
new file mode 100644
index 00000000000..fcac319f367
Binary files /dev/null and b/public/images/emoji/google_classic/pisces.png differ
diff --git a/public/images/emoji/google_classic/pitcairn_islands.png b/public/images/emoji/google_classic/pitcairn_islands.png
new file mode 100644
index 00000000000..ff037c73ba4
Binary files /dev/null and b/public/images/emoji/google_classic/pitcairn_islands.png differ
diff --git a/public/images/emoji/google_classic/pizza.png b/public/images/emoji/google_classic/pizza.png
new file mode 100644
index 00000000000..8ef0aed7119
Binary files /dev/null and b/public/images/emoji/google_classic/pizza.png differ
diff --git a/public/images/emoji/google_classic/place_of_worship.png b/public/images/emoji/google_classic/place_of_worship.png
new file mode 100644
index 00000000000..7783233e9f9
Binary files /dev/null and b/public/images/emoji/google_classic/place_of_worship.png differ
diff --git a/public/images/emoji/google_classic/plate_with_cutlery.png b/public/images/emoji/google_classic/plate_with_cutlery.png
new file mode 100644
index 00000000000..07989f14806
Binary files /dev/null and b/public/images/emoji/google_classic/plate_with_cutlery.png differ
diff --git a/public/images/emoji/google_classic/play_or_pause_button.png b/public/images/emoji/google_classic/play_or_pause_button.png
new file mode 100644
index 00000000000..eb1d4b2473c
Binary files /dev/null and b/public/images/emoji/google_classic/play_or_pause_button.png differ
diff --git a/public/images/emoji/google_classic/play_pause.png b/public/images/emoji/google_classic/play_pause.png
new file mode 100644
index 00000000000..eb1d4b2473c
Binary files /dev/null and b/public/images/emoji/google_classic/play_pause.png differ
diff --git a/public/images/emoji/google_classic/point_down.png b/public/images/emoji/google_classic/point_down.png
new file mode 100644
index 00000000000..8d72ac773f8
Binary files /dev/null and b/public/images/emoji/google_classic/point_down.png differ
diff --git a/public/images/emoji/google_classic/point_down/2.png b/public/images/emoji/google_classic/point_down/2.png
new file mode 100644
index 00000000000..4b846fb8acc
Binary files /dev/null and b/public/images/emoji/google_classic/point_down/2.png differ
diff --git a/public/images/emoji/google_classic/point_down/3.png b/public/images/emoji/google_classic/point_down/3.png
new file mode 100644
index 00000000000..42773fc5d4e
Binary files /dev/null and b/public/images/emoji/google_classic/point_down/3.png differ
diff --git a/public/images/emoji/google_classic/point_down/4.png b/public/images/emoji/google_classic/point_down/4.png
new file mode 100644
index 00000000000..e7bb1914468
Binary files /dev/null and b/public/images/emoji/google_classic/point_down/4.png differ
diff --git a/public/images/emoji/google_classic/point_down/5.png b/public/images/emoji/google_classic/point_down/5.png
new file mode 100644
index 00000000000..d11a27c0552
Binary files /dev/null and b/public/images/emoji/google_classic/point_down/5.png differ
diff --git a/public/images/emoji/google_classic/point_down/6.png b/public/images/emoji/google_classic/point_down/6.png
new file mode 100644
index 00000000000..63e857d769d
Binary files /dev/null and b/public/images/emoji/google_classic/point_down/6.png differ
diff --git a/public/images/emoji/google_classic/point_left.png b/public/images/emoji/google_classic/point_left.png
new file mode 100644
index 00000000000..1705f088c14
Binary files /dev/null and b/public/images/emoji/google_classic/point_left.png differ
diff --git a/public/images/emoji/google_classic/point_left/2.png b/public/images/emoji/google_classic/point_left/2.png
new file mode 100644
index 00000000000..9d6d080ee0e
Binary files /dev/null and b/public/images/emoji/google_classic/point_left/2.png differ
diff --git a/public/images/emoji/google_classic/point_left/3.png b/public/images/emoji/google_classic/point_left/3.png
new file mode 100644
index 00000000000..a4d2216d37c
Binary files /dev/null and b/public/images/emoji/google_classic/point_left/3.png differ
diff --git a/public/images/emoji/google_classic/point_left/4.png b/public/images/emoji/google_classic/point_left/4.png
new file mode 100644
index 00000000000..0428e772537
Binary files /dev/null and b/public/images/emoji/google_classic/point_left/4.png differ
diff --git a/public/images/emoji/google_classic/point_left/5.png b/public/images/emoji/google_classic/point_left/5.png
new file mode 100644
index 00000000000..08a74c0f392
Binary files /dev/null and b/public/images/emoji/google_classic/point_left/5.png differ
diff --git a/public/images/emoji/google_classic/point_left/6.png b/public/images/emoji/google_classic/point_left/6.png
new file mode 100644
index 00000000000..b5879c4afc4
Binary files /dev/null and b/public/images/emoji/google_classic/point_left/6.png differ
diff --git a/public/images/emoji/google_classic/point_right.png b/public/images/emoji/google_classic/point_right.png
new file mode 100644
index 00000000000..3d5f77bbd9d
Binary files /dev/null and b/public/images/emoji/google_classic/point_right.png differ
diff --git a/public/images/emoji/google_classic/point_right/2.png b/public/images/emoji/google_classic/point_right/2.png
new file mode 100644
index 00000000000..958676d7b87
Binary files /dev/null and b/public/images/emoji/google_classic/point_right/2.png differ
diff --git a/public/images/emoji/google_classic/point_right/3.png b/public/images/emoji/google_classic/point_right/3.png
new file mode 100644
index 00000000000..02d077c0375
Binary files /dev/null and b/public/images/emoji/google_classic/point_right/3.png differ
diff --git a/public/images/emoji/google_classic/point_right/4.png b/public/images/emoji/google_classic/point_right/4.png
new file mode 100644
index 00000000000..6c4f6b38bc5
Binary files /dev/null and b/public/images/emoji/google_classic/point_right/4.png differ
diff --git a/public/images/emoji/google_classic/point_right/5.png b/public/images/emoji/google_classic/point_right/5.png
new file mode 100644
index 00000000000..5d715830203
Binary files /dev/null and b/public/images/emoji/google_classic/point_right/5.png differ
diff --git a/public/images/emoji/google_classic/point_right/6.png b/public/images/emoji/google_classic/point_right/6.png
new file mode 100644
index 00000000000..9375d78e0e3
Binary files /dev/null and b/public/images/emoji/google_classic/point_right/6.png differ
diff --git a/public/images/emoji/google_classic/point_up.png b/public/images/emoji/google_classic/point_up.png
new file mode 100644
index 00000000000..4e8393a3854
Binary files /dev/null and b/public/images/emoji/google_classic/point_up.png differ
diff --git a/public/images/emoji/google_classic/point_up/2.png b/public/images/emoji/google_classic/point_up/2.png
new file mode 100644
index 00000000000..8fb4bf0b34d
Binary files /dev/null and b/public/images/emoji/google_classic/point_up/2.png differ
diff --git a/public/images/emoji/google_classic/point_up/3.png b/public/images/emoji/google_classic/point_up/3.png
new file mode 100644
index 00000000000..8a6628105f5
Binary files /dev/null and b/public/images/emoji/google_classic/point_up/3.png differ
diff --git a/public/images/emoji/google_classic/point_up/4.png b/public/images/emoji/google_classic/point_up/4.png
new file mode 100644
index 00000000000..35098fe36f8
Binary files /dev/null and b/public/images/emoji/google_classic/point_up/4.png differ
diff --git a/public/images/emoji/google_classic/point_up/5.png b/public/images/emoji/google_classic/point_up/5.png
new file mode 100644
index 00000000000..4aecde0ca2e
Binary files /dev/null and b/public/images/emoji/google_classic/point_up/5.png differ
diff --git a/public/images/emoji/google_classic/point_up/6.png b/public/images/emoji/google_classic/point_up/6.png
new file mode 100644
index 00000000000..55e5079d200
Binary files /dev/null and b/public/images/emoji/google_classic/point_up/6.png differ
diff --git a/public/images/emoji/google_classic/point_up_2.png b/public/images/emoji/google_classic/point_up_2.png
new file mode 100644
index 00000000000..7bf80c22c29
Binary files /dev/null and b/public/images/emoji/google_classic/point_up_2.png differ
diff --git a/public/images/emoji/google_classic/point_up_2/2.png b/public/images/emoji/google_classic/point_up_2/2.png
new file mode 100644
index 00000000000..7494b29929a
Binary files /dev/null and b/public/images/emoji/google_classic/point_up_2/2.png differ
diff --git a/public/images/emoji/google_classic/point_up_2/3.png b/public/images/emoji/google_classic/point_up_2/3.png
new file mode 100644
index 00000000000..c6294e338a0
Binary files /dev/null and b/public/images/emoji/google_classic/point_up_2/3.png differ
diff --git a/public/images/emoji/google_classic/point_up_2/4.png b/public/images/emoji/google_classic/point_up_2/4.png
new file mode 100644
index 00000000000..5a26a357865
Binary files /dev/null and b/public/images/emoji/google_classic/point_up_2/4.png differ
diff --git a/public/images/emoji/google_classic/point_up_2/5.png b/public/images/emoji/google_classic/point_up_2/5.png
new file mode 100644
index 00000000000..3e245236507
Binary files /dev/null and b/public/images/emoji/google_classic/point_up_2/5.png differ
diff --git a/public/images/emoji/google_classic/point_up_2/6.png b/public/images/emoji/google_classic/point_up_2/6.png
new file mode 100644
index 00000000000..962baadd258
Binary files /dev/null and b/public/images/emoji/google_classic/point_up_2/6.png differ
diff --git a/public/images/emoji/google_classic/poland.png b/public/images/emoji/google_classic/poland.png
new file mode 100644
index 00000000000..fc0784d883c
Binary files /dev/null and b/public/images/emoji/google_classic/poland.png differ
diff --git a/public/images/emoji/google_classic/police_car.png b/public/images/emoji/google_classic/police_car.png
new file mode 100644
index 00000000000..6f98dcfcc14
Binary files /dev/null and b/public/images/emoji/google_classic/police_car.png differ
diff --git a/public/images/emoji/google_classic/policeman.png b/public/images/emoji/google_classic/policeman.png
new file mode 100644
index 00000000000..5705d19c157
Binary files /dev/null and b/public/images/emoji/google_classic/policeman.png differ
diff --git a/public/images/emoji/google_classic/policeman/2.png b/public/images/emoji/google_classic/policeman/2.png
new file mode 100644
index 00000000000..bf89834ff36
Binary files /dev/null and b/public/images/emoji/google_classic/policeman/2.png differ
diff --git a/public/images/emoji/google_classic/policeman/3.png b/public/images/emoji/google_classic/policeman/3.png
new file mode 100644
index 00000000000..0deed50038d
Binary files /dev/null and b/public/images/emoji/google_classic/policeman/3.png differ
diff --git a/public/images/emoji/google_classic/policeman/4.png b/public/images/emoji/google_classic/policeman/4.png
new file mode 100644
index 00000000000..86314c1925b
Binary files /dev/null and b/public/images/emoji/google_classic/policeman/4.png differ
diff --git a/public/images/emoji/google_classic/policeman/5.png b/public/images/emoji/google_classic/policeman/5.png
new file mode 100644
index 00000000000..0cc03cf5a65
Binary files /dev/null and b/public/images/emoji/google_classic/policeman/5.png differ
diff --git a/public/images/emoji/google_classic/policeman/6.png b/public/images/emoji/google_classic/policeman/6.png
new file mode 100644
index 00000000000..1f65e850074
Binary files /dev/null and b/public/images/emoji/google_classic/policeman/6.png differ
diff --git a/public/images/emoji/google_classic/policewoman.png b/public/images/emoji/google_classic/policewoman.png
new file mode 100644
index 00000000000..86f7aeb192d
Binary files /dev/null and b/public/images/emoji/google_classic/policewoman.png differ
diff --git a/public/images/emoji/google_classic/policewoman/2.png b/public/images/emoji/google_classic/policewoman/2.png
new file mode 100644
index 00000000000..354c112bf65
Binary files /dev/null and b/public/images/emoji/google_classic/policewoman/2.png differ
diff --git a/public/images/emoji/google_classic/policewoman/3.png b/public/images/emoji/google_classic/policewoman/3.png
new file mode 100644
index 00000000000..5db48a21a41
Binary files /dev/null and b/public/images/emoji/google_classic/policewoman/3.png differ
diff --git a/public/images/emoji/google_classic/policewoman/4.png b/public/images/emoji/google_classic/policewoman/4.png
new file mode 100644
index 00000000000..ebbb306be71
Binary files /dev/null and b/public/images/emoji/google_classic/policewoman/4.png differ
diff --git a/public/images/emoji/google_classic/policewoman/5.png b/public/images/emoji/google_classic/policewoman/5.png
new file mode 100644
index 00000000000..ecc55e19132
Binary files /dev/null and b/public/images/emoji/google_classic/policewoman/5.png differ
diff --git a/public/images/emoji/google_classic/policewoman/6.png b/public/images/emoji/google_classic/policewoman/6.png
new file mode 100644
index 00000000000..2ce79de31f9
Binary files /dev/null and b/public/images/emoji/google_classic/policewoman/6.png differ
diff --git a/public/images/emoji/google_classic/poo.png b/public/images/emoji/google_classic/poo.png
new file mode 100644
index 00000000000..87d78669668
Binary files /dev/null and b/public/images/emoji/google_classic/poo.png differ
diff --git a/public/images/emoji/google_classic/poodle.png b/public/images/emoji/google_classic/poodle.png
new file mode 100644
index 00000000000..dc4ad28221a
Binary files /dev/null and b/public/images/emoji/google_classic/poodle.png differ
diff --git a/public/images/emoji/google_classic/poop.png b/public/images/emoji/google_classic/poop.png
new file mode 100644
index 00000000000..87d78669668
Binary files /dev/null and b/public/images/emoji/google_classic/poop.png differ
diff --git a/public/images/emoji/google_classic/popcorn.png b/public/images/emoji/google_classic/popcorn.png
new file mode 100644
index 00000000000..55b9d7dbf1b
Binary files /dev/null and b/public/images/emoji/google_classic/popcorn.png differ
diff --git a/public/images/emoji/google_classic/portugal.png b/public/images/emoji/google_classic/portugal.png
new file mode 100644
index 00000000000..395097678cc
Binary files /dev/null and b/public/images/emoji/google_classic/portugal.png differ
diff --git a/public/images/emoji/google_classic/post_office.png b/public/images/emoji/google_classic/post_office.png
new file mode 100644
index 00000000000..eae3454c86c
Binary files /dev/null and b/public/images/emoji/google_classic/post_office.png differ
diff --git a/public/images/emoji/google_classic/postal_horn.png b/public/images/emoji/google_classic/postal_horn.png
new file mode 100644
index 00000000000..ad913668e37
Binary files /dev/null and b/public/images/emoji/google_classic/postal_horn.png differ
diff --git a/public/images/emoji/google_classic/postbox.png b/public/images/emoji/google_classic/postbox.png
new file mode 100644
index 00000000000..ae37adf3d1a
Binary files /dev/null and b/public/images/emoji/google_classic/postbox.png differ
diff --git a/public/images/emoji/google_classic/potable_water.png b/public/images/emoji/google_classic/potable_water.png
new file mode 100644
index 00000000000..2e4b6e90b64
Binary files /dev/null and b/public/images/emoji/google_classic/potable_water.png differ
diff --git a/public/images/emoji/google_classic/potato.png b/public/images/emoji/google_classic/potato.png
new file mode 100644
index 00000000000..040a074c5f6
Binary files /dev/null and b/public/images/emoji/google_classic/potato.png differ
diff --git a/public/images/emoji/google_classic/pouch.png b/public/images/emoji/google_classic/pouch.png
new file mode 100644
index 00000000000..2367b38e630
Binary files /dev/null and b/public/images/emoji/google_classic/pouch.png differ
diff --git a/public/images/emoji/google_classic/poultry_leg.png b/public/images/emoji/google_classic/poultry_leg.png
new file mode 100644
index 00000000000..cf61c8eba04
Binary files /dev/null and b/public/images/emoji/google_classic/poultry_leg.png differ
diff --git a/public/images/emoji/google_classic/pound.png b/public/images/emoji/google_classic/pound.png
new file mode 100644
index 00000000000..9cb7a82163e
Binary files /dev/null and b/public/images/emoji/google_classic/pound.png differ
diff --git a/public/images/emoji/google_classic/pouting_cat.png b/public/images/emoji/google_classic/pouting_cat.png
new file mode 100644
index 00000000000..32754df9bf0
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_cat.png differ
diff --git a/public/images/emoji/google_classic/pouting_man.png b/public/images/emoji/google_classic/pouting_man.png
new file mode 100644
index 00000000000..b9daeb66aaf
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_man.png differ
diff --git a/public/images/emoji/google_classic/pouting_man/2.png b/public/images/emoji/google_classic/pouting_man/2.png
new file mode 100644
index 00000000000..570015ee95d
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_man/2.png differ
diff --git a/public/images/emoji/google_classic/pouting_man/3.png b/public/images/emoji/google_classic/pouting_man/3.png
new file mode 100644
index 00000000000..d0f3ef58555
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_man/3.png differ
diff --git a/public/images/emoji/google_classic/pouting_man/4.png b/public/images/emoji/google_classic/pouting_man/4.png
new file mode 100644
index 00000000000..691a709ae38
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_man/4.png differ
diff --git a/public/images/emoji/google_classic/pouting_man/5.png b/public/images/emoji/google_classic/pouting_man/5.png
new file mode 100644
index 00000000000..0362071c462
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_man/5.png differ
diff --git a/public/images/emoji/google_classic/pouting_man/6.png b/public/images/emoji/google_classic/pouting_man/6.png
new file mode 100644
index 00000000000..e414b56659a
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_man/6.png differ
diff --git a/public/images/emoji/google_classic/pouting_woman.png b/public/images/emoji/google_classic/pouting_woman.png
new file mode 100644
index 00000000000..c0c736f741f
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_woman.png differ
diff --git a/public/images/emoji/google_classic/pouting_woman/2.png b/public/images/emoji/google_classic/pouting_woman/2.png
new file mode 100644
index 00000000000..24fb8258dd5
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_woman/2.png differ
diff --git a/public/images/emoji/google_classic/pouting_woman/3.png b/public/images/emoji/google_classic/pouting_woman/3.png
new file mode 100644
index 00000000000..69dcb7a0382
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_woman/3.png differ
diff --git a/public/images/emoji/google_classic/pouting_woman/4.png b/public/images/emoji/google_classic/pouting_woman/4.png
new file mode 100644
index 00000000000..71cab54ed9f
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_woman/4.png differ
diff --git a/public/images/emoji/google_classic/pouting_woman/5.png b/public/images/emoji/google_classic/pouting_woman/5.png
new file mode 100644
index 00000000000..f991c5b4a8a
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_woman/5.png differ
diff --git a/public/images/emoji/google_classic/pouting_woman/6.png b/public/images/emoji/google_classic/pouting_woman/6.png
new file mode 100644
index 00000000000..b93a6c1a76c
Binary files /dev/null and b/public/images/emoji/google_classic/pouting_woman/6.png differ
diff --git a/public/images/emoji/google_classic/pray.png b/public/images/emoji/google_classic/pray.png
new file mode 100644
index 00000000000..320b8952bd3
Binary files /dev/null and b/public/images/emoji/google_classic/pray.png differ
diff --git a/public/images/emoji/google_classic/pray/2.png b/public/images/emoji/google_classic/pray/2.png
new file mode 100644
index 00000000000..a82d04b3e15
Binary files /dev/null and b/public/images/emoji/google_classic/pray/2.png differ
diff --git a/public/images/emoji/google_classic/pray/3.png b/public/images/emoji/google_classic/pray/3.png
new file mode 100644
index 00000000000..d965f3c759e
Binary files /dev/null and b/public/images/emoji/google_classic/pray/3.png differ
diff --git a/public/images/emoji/google_classic/pray/4.png b/public/images/emoji/google_classic/pray/4.png
new file mode 100644
index 00000000000..d29adcdd61f
Binary files /dev/null and b/public/images/emoji/google_classic/pray/4.png differ
diff --git a/public/images/emoji/google_classic/pray/5.png b/public/images/emoji/google_classic/pray/5.png
new file mode 100644
index 00000000000..79572618ab9
Binary files /dev/null and b/public/images/emoji/google_classic/pray/5.png differ
diff --git a/public/images/emoji/google_classic/pray/6.png b/public/images/emoji/google_classic/pray/6.png
new file mode 100644
index 00000000000..19bdd6605ac
Binary files /dev/null and b/public/images/emoji/google_classic/pray/6.png differ
diff --git a/public/images/emoji/google_classic/prayer_beads.png b/public/images/emoji/google_classic/prayer_beads.png
new file mode 100644
index 00000000000..3016620ec55
Binary files /dev/null and b/public/images/emoji/google_classic/prayer_beads.png differ
diff --git a/public/images/emoji/google_classic/pregnant_woman.png b/public/images/emoji/google_classic/pregnant_woman.png
new file mode 100644
index 00000000000..695a47d32e3
Binary files /dev/null and b/public/images/emoji/google_classic/pregnant_woman.png differ
diff --git a/public/images/emoji/google_classic/pregnant_woman/2.png b/public/images/emoji/google_classic/pregnant_woman/2.png
new file mode 100644
index 00000000000..cd4ddc7dcce
Binary files /dev/null and b/public/images/emoji/google_classic/pregnant_woman/2.png differ
diff --git a/public/images/emoji/google_classic/pregnant_woman/3.png b/public/images/emoji/google_classic/pregnant_woman/3.png
new file mode 100644
index 00000000000..b13089e4f3c
Binary files /dev/null and b/public/images/emoji/google_classic/pregnant_woman/3.png differ
diff --git a/public/images/emoji/google_classic/pregnant_woman/4.png b/public/images/emoji/google_classic/pregnant_woman/4.png
new file mode 100644
index 00000000000..66b98715cf2
Binary files /dev/null and b/public/images/emoji/google_classic/pregnant_woman/4.png differ
diff --git a/public/images/emoji/google_classic/pregnant_woman/5.png b/public/images/emoji/google_classic/pregnant_woman/5.png
new file mode 100644
index 00000000000..28e0d894f79
Binary files /dev/null and b/public/images/emoji/google_classic/pregnant_woman/5.png differ
diff --git a/public/images/emoji/google_classic/pregnant_woman/6.png b/public/images/emoji/google_classic/pregnant_woman/6.png
new file mode 100644
index 00000000000..26ef358abb6
Binary files /dev/null and b/public/images/emoji/google_classic/pregnant_woman/6.png differ
diff --git a/public/images/emoji/google_classic/pretzel.png b/public/images/emoji/google_classic/pretzel.png
new file mode 100644
index 00000000000..9116d6ee9a2
Binary files /dev/null and b/public/images/emoji/google_classic/pretzel.png differ
diff --git a/public/images/emoji/google_classic/previous_track.png b/public/images/emoji/google_classic/previous_track.png
new file mode 100644
index 00000000000..0ef5600a450
Binary files /dev/null and b/public/images/emoji/google_classic/previous_track.png differ
diff --git a/public/images/emoji/google_classic/previous_track_button.png b/public/images/emoji/google_classic/previous_track_button.png
new file mode 100644
index 00000000000..0ef5600a450
Binary files /dev/null and b/public/images/emoji/google_classic/previous_track_button.png differ
diff --git a/public/images/emoji/google_classic/prince.png b/public/images/emoji/google_classic/prince.png
new file mode 100644
index 00000000000..2b9b72f4a26
Binary files /dev/null and b/public/images/emoji/google_classic/prince.png differ
diff --git a/public/images/emoji/google_classic/prince/2.png b/public/images/emoji/google_classic/prince/2.png
new file mode 100644
index 00000000000..59a516444ae
Binary files /dev/null and b/public/images/emoji/google_classic/prince/2.png differ
diff --git a/public/images/emoji/google_classic/prince/3.png b/public/images/emoji/google_classic/prince/3.png
new file mode 100644
index 00000000000..a61389af822
Binary files /dev/null and b/public/images/emoji/google_classic/prince/3.png differ
diff --git a/public/images/emoji/google_classic/prince/4.png b/public/images/emoji/google_classic/prince/4.png
new file mode 100644
index 00000000000..ab73a0d5a0f
Binary files /dev/null and b/public/images/emoji/google_classic/prince/4.png differ
diff --git a/public/images/emoji/google_classic/prince/5.png b/public/images/emoji/google_classic/prince/5.png
new file mode 100644
index 00000000000..25c25b63d84
Binary files /dev/null and b/public/images/emoji/google_classic/prince/5.png differ
diff --git a/public/images/emoji/google_classic/prince/6.png b/public/images/emoji/google_classic/prince/6.png
new file mode 100644
index 00000000000..f8b2357e002
Binary files /dev/null and b/public/images/emoji/google_classic/prince/6.png differ
diff --git a/public/images/emoji/google_classic/princess.png b/public/images/emoji/google_classic/princess.png
new file mode 100644
index 00000000000..2aecbe96a4e
Binary files /dev/null and b/public/images/emoji/google_classic/princess.png differ
diff --git a/public/images/emoji/google_classic/princess/2.png b/public/images/emoji/google_classic/princess/2.png
new file mode 100644
index 00000000000..894c33a2269
Binary files /dev/null and b/public/images/emoji/google_classic/princess/2.png differ
diff --git a/public/images/emoji/google_classic/princess/3.png b/public/images/emoji/google_classic/princess/3.png
new file mode 100644
index 00000000000..39e5864b818
Binary files /dev/null and b/public/images/emoji/google_classic/princess/3.png differ
diff --git a/public/images/emoji/google_classic/princess/4.png b/public/images/emoji/google_classic/princess/4.png
new file mode 100644
index 00000000000..9b8f13575fb
Binary files /dev/null and b/public/images/emoji/google_classic/princess/4.png differ
diff --git a/public/images/emoji/google_classic/princess/5.png b/public/images/emoji/google_classic/princess/5.png
new file mode 100644
index 00000000000..be8010015b5
Binary files /dev/null and b/public/images/emoji/google_classic/princess/5.png differ
diff --git a/public/images/emoji/google_classic/princess/6.png b/public/images/emoji/google_classic/princess/6.png
new file mode 100644
index 00000000000..d9cd288f1cf
Binary files /dev/null and b/public/images/emoji/google_classic/princess/6.png differ
diff --git a/public/images/emoji/google_classic/printer.png b/public/images/emoji/google_classic/printer.png
new file mode 100644
index 00000000000..711fd7fbe13
Binary files /dev/null and b/public/images/emoji/google_classic/printer.png differ
diff --git a/public/images/emoji/google_classic/projector.png b/public/images/emoji/google_classic/projector.png
new file mode 100644
index 00000000000..b626d6088c9
Binary files /dev/null and b/public/images/emoji/google_classic/projector.png differ
diff --git a/public/images/emoji/google_classic/puerto_rico.png b/public/images/emoji/google_classic/puerto_rico.png
new file mode 100644
index 00000000000..e164deaa73b
Binary files /dev/null and b/public/images/emoji/google_classic/puerto_rico.png differ
diff --git a/public/images/emoji/google_classic/punch.png b/public/images/emoji/google_classic/punch.png
new file mode 100644
index 00000000000..f1d24709998
Binary files /dev/null and b/public/images/emoji/google_classic/punch.png differ
diff --git a/public/images/emoji/google_classic/punch/2.png b/public/images/emoji/google_classic/punch/2.png
new file mode 100644
index 00000000000..588d13d528b
Binary files /dev/null and b/public/images/emoji/google_classic/punch/2.png differ
diff --git a/public/images/emoji/google_classic/punch/3.png b/public/images/emoji/google_classic/punch/3.png
new file mode 100644
index 00000000000..70384907f39
Binary files /dev/null and b/public/images/emoji/google_classic/punch/3.png differ
diff --git a/public/images/emoji/google_classic/punch/4.png b/public/images/emoji/google_classic/punch/4.png
new file mode 100644
index 00000000000..04cb1c9ca4d
Binary files /dev/null and b/public/images/emoji/google_classic/punch/4.png differ
diff --git a/public/images/emoji/google_classic/punch/5.png b/public/images/emoji/google_classic/punch/5.png
new file mode 100644
index 00000000000..ddd6f184d24
Binary files /dev/null and b/public/images/emoji/google_classic/punch/5.png differ
diff --git a/public/images/emoji/google_classic/punch/6.png b/public/images/emoji/google_classic/punch/6.png
new file mode 100644
index 00000000000..0a1a2b7c87e
Binary files /dev/null and b/public/images/emoji/google_classic/punch/6.png differ
diff --git a/public/images/emoji/google_classic/purple_heart.png b/public/images/emoji/google_classic/purple_heart.png
new file mode 100644
index 00000000000..2aa3a5a10de
Binary files /dev/null and b/public/images/emoji/google_classic/purple_heart.png differ
diff --git a/public/images/emoji/google_classic/purse.png b/public/images/emoji/google_classic/purse.png
new file mode 100644
index 00000000000..3c1c44845c7
Binary files /dev/null and b/public/images/emoji/google_classic/purse.png differ
diff --git a/public/images/emoji/google_classic/pushpin.png b/public/images/emoji/google_classic/pushpin.png
new file mode 100644
index 00000000000..dcf40de1fd2
Binary files /dev/null and b/public/images/emoji/google_classic/pushpin.png differ
diff --git a/public/images/emoji/google_classic/put_litter_in_its_place.png b/public/images/emoji/google_classic/put_litter_in_its_place.png
new file mode 100644
index 00000000000..9736f427f14
Binary files /dev/null and b/public/images/emoji/google_classic/put_litter_in_its_place.png differ
diff --git a/public/images/emoji/google_classic/qatar.png b/public/images/emoji/google_classic/qatar.png
new file mode 100644
index 00000000000..dd15fb928ee
Binary files /dev/null and b/public/images/emoji/google_classic/qatar.png differ
diff --git a/public/images/emoji/google_classic/question.png b/public/images/emoji/google_classic/question.png
new file mode 100644
index 00000000000..80938421a3d
Binary files /dev/null and b/public/images/emoji/google_classic/question.png differ
diff --git a/public/images/emoji/google_classic/rabbit.png b/public/images/emoji/google_classic/rabbit.png
new file mode 100644
index 00000000000..01024697072
Binary files /dev/null and b/public/images/emoji/google_classic/rabbit.png differ
diff --git a/public/images/emoji/google_classic/rabbit2.png b/public/images/emoji/google_classic/rabbit2.png
new file mode 100644
index 00000000000..cbb91dbda37
Binary files /dev/null and b/public/images/emoji/google_classic/rabbit2.png differ
diff --git a/public/images/emoji/google_classic/race_car.png b/public/images/emoji/google_classic/race_car.png
new file mode 100644
index 00000000000..c26550d13a2
Binary files /dev/null and b/public/images/emoji/google_classic/race_car.png differ
diff --git a/public/images/emoji/google_classic/racehorse.png b/public/images/emoji/google_classic/racehorse.png
new file mode 100644
index 00000000000..6a35a410146
Binary files /dev/null and b/public/images/emoji/google_classic/racehorse.png differ
diff --git a/public/images/emoji/google_classic/racing_car.png b/public/images/emoji/google_classic/racing_car.png
new file mode 100644
index 00000000000..c26550d13a2
Binary files /dev/null and b/public/images/emoji/google_classic/racing_car.png differ
diff --git a/public/images/emoji/google_classic/racing_motorcycle.png b/public/images/emoji/google_classic/racing_motorcycle.png
new file mode 100644
index 00000000000..59a73872fe7
Binary files /dev/null and b/public/images/emoji/google_classic/racing_motorcycle.png differ
diff --git a/public/images/emoji/google_classic/radio.png b/public/images/emoji/google_classic/radio.png
new file mode 100644
index 00000000000..d797df04cbb
Binary files /dev/null and b/public/images/emoji/google_classic/radio.png differ
diff --git a/public/images/emoji/google_classic/radio_button.png b/public/images/emoji/google_classic/radio_button.png
new file mode 100644
index 00000000000..0c767cd8019
Binary files /dev/null and b/public/images/emoji/google_classic/radio_button.png differ
diff --git a/public/images/emoji/google_classic/radioactive.png b/public/images/emoji/google_classic/radioactive.png
new file mode 100644
index 00000000000..e977189f9ee
Binary files /dev/null and b/public/images/emoji/google_classic/radioactive.png differ
diff --git a/public/images/emoji/google_classic/radioactive_sign.png b/public/images/emoji/google_classic/radioactive_sign.png
new file mode 100644
index 00000000000..e977189f9ee
Binary files /dev/null and b/public/images/emoji/google_classic/radioactive_sign.png differ
diff --git a/public/images/emoji/google_classic/rage.png b/public/images/emoji/google_classic/rage.png
new file mode 100644
index 00000000000..17ad7b63073
Binary files /dev/null and b/public/images/emoji/google_classic/rage.png differ
diff --git a/public/images/emoji/google_classic/railroad_track.png b/public/images/emoji/google_classic/railroad_track.png
new file mode 100644
index 00000000000..3a7795e3035
Binary files /dev/null and b/public/images/emoji/google_classic/railroad_track.png differ
diff --git a/public/images/emoji/google_classic/railway_car.png b/public/images/emoji/google_classic/railway_car.png
new file mode 100644
index 00000000000..53cecd4db7e
Binary files /dev/null and b/public/images/emoji/google_classic/railway_car.png differ
diff --git a/public/images/emoji/google_classic/railway_track.png b/public/images/emoji/google_classic/railway_track.png
new file mode 100644
index 00000000000..3a7795e3035
Binary files /dev/null and b/public/images/emoji/google_classic/railway_track.png differ
diff --git a/public/images/emoji/google_classic/rainbow.png b/public/images/emoji/google_classic/rainbow.png
new file mode 100644
index 00000000000..e8246217740
Binary files /dev/null and b/public/images/emoji/google_classic/rainbow.png differ
diff --git a/public/images/emoji/google_classic/rainbow_flag.png b/public/images/emoji/google_classic/rainbow_flag.png
new file mode 100644
index 00000000000..7b3e80b5512
Binary files /dev/null and b/public/images/emoji/google_classic/rainbow_flag.png differ
diff --git a/public/images/emoji/google_classic/raised_back_of_hand.png b/public/images/emoji/google_classic/raised_back_of_hand.png
new file mode 100644
index 00000000000..3f1f3ca76c0
Binary files /dev/null and b/public/images/emoji/google_classic/raised_back_of_hand.png differ
diff --git a/public/images/emoji/google_classic/raised_back_of_hand/2.png b/public/images/emoji/google_classic/raised_back_of_hand/2.png
new file mode 100644
index 00000000000..6769d533677
Binary files /dev/null and b/public/images/emoji/google_classic/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/google_classic/raised_back_of_hand/3.png b/public/images/emoji/google_classic/raised_back_of_hand/3.png
new file mode 100644
index 00000000000..94a457f99bf
Binary files /dev/null and b/public/images/emoji/google_classic/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/google_classic/raised_back_of_hand/4.png b/public/images/emoji/google_classic/raised_back_of_hand/4.png
new file mode 100644
index 00000000000..c833c609633
Binary files /dev/null and b/public/images/emoji/google_classic/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/google_classic/raised_back_of_hand/5.png b/public/images/emoji/google_classic/raised_back_of_hand/5.png
new file mode 100644
index 00000000000..6db627b0925
Binary files /dev/null and b/public/images/emoji/google_classic/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/google_classic/raised_back_of_hand/6.png b/public/images/emoji/google_classic/raised_back_of_hand/6.png
new file mode 100644
index 00000000000..83b4b055186
Binary files /dev/null and b/public/images/emoji/google_classic/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/google_classic/raised_hand.png b/public/images/emoji/google_classic/raised_hand.png
new file mode 100644
index 00000000000..5e035fcfdbb
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand.png differ
diff --git a/public/images/emoji/google_classic/raised_hand/2.png b/public/images/emoji/google_classic/raised_hand/2.png
new file mode 100644
index 00000000000..e3608ce31aa
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand/2.png differ
diff --git a/public/images/emoji/google_classic/raised_hand/3.png b/public/images/emoji/google_classic/raised_hand/3.png
new file mode 100644
index 00000000000..578ed54aec2
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand/3.png differ
diff --git a/public/images/emoji/google_classic/raised_hand/4.png b/public/images/emoji/google_classic/raised_hand/4.png
new file mode 100644
index 00000000000..89b82387974
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand/4.png differ
diff --git a/public/images/emoji/google_classic/raised_hand/5.png b/public/images/emoji/google_classic/raised_hand/5.png
new file mode 100644
index 00000000000..667110258cd
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand/5.png differ
diff --git a/public/images/emoji/google_classic/raised_hand/6.png b/public/images/emoji/google_classic/raised_hand/6.png
new file mode 100644
index 00000000000..6efa5443283
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand/6.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_fingers_splayed.png b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed.png
new file mode 100644
index 00000000000..52ded94d54a
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/2.png
new file mode 100644
index 00000000000..2e59b69be04
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/3.png
new file mode 100644
index 00000000000..53a0fb1b7f9
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/4.png
new file mode 100644
index 00000000000..b2ee62e80d7
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/5.png
new file mode 100644
index 00000000000..6327ab10255
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/6.png
new file mode 100644
index 00000000000..c66b1a2138b
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers.png b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers.png
new file mode 100644
index 00000000000..7294a38c1fa
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/2.png
new file mode 100644
index 00000000000..09c72102235
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/3.png
new file mode 100644
index 00000000000..cca9533abf8
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/4.png
new file mode 100644
index 00000000000..27a01ef28ca
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/5.png
new file mode 100644
index 00000000000..77901ed77f7
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/6.png
new file mode 100644
index 00000000000..56aa2e08625
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/google_classic/raised_hands.png b/public/images/emoji/google_classic/raised_hands.png
new file mode 100644
index 00000000000..0533bab402b
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hands.png differ
diff --git a/public/images/emoji/google_classic/raised_hands/2.png b/public/images/emoji/google_classic/raised_hands/2.png
new file mode 100644
index 00000000000..194d1549386
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hands/2.png differ
diff --git a/public/images/emoji/google_classic/raised_hands/3.png b/public/images/emoji/google_classic/raised_hands/3.png
new file mode 100644
index 00000000000..3f5c8127de9
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hands/3.png differ
diff --git a/public/images/emoji/google_classic/raised_hands/4.png b/public/images/emoji/google_classic/raised_hands/4.png
new file mode 100644
index 00000000000..4f5c3101bb1
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hands/4.png differ
diff --git a/public/images/emoji/google_classic/raised_hands/5.png b/public/images/emoji/google_classic/raised_hands/5.png
new file mode 100644
index 00000000000..0b82cc5c83a
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hands/5.png differ
diff --git a/public/images/emoji/google_classic/raised_hands/6.png b/public/images/emoji/google_classic/raised_hands/6.png
new file mode 100644
index 00000000000..2d9a971d908
Binary files /dev/null and b/public/images/emoji/google_classic/raised_hands/6.png differ
diff --git a/public/images/emoji/google_classic/raising_hand.png b/public/images/emoji/google_classic/raising_hand.png
new file mode 100644
index 00000000000..5cef8797da8
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand.png differ
diff --git a/public/images/emoji/google_classic/raising_hand/2.png b/public/images/emoji/google_classic/raising_hand/2.png
new file mode 100644
index 00000000000..c4eb1a7ad35
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand/2.png differ
diff --git a/public/images/emoji/google_classic/raising_hand/3.png b/public/images/emoji/google_classic/raising_hand/3.png
new file mode 100644
index 00000000000..6555d9d94a9
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand/3.png differ
diff --git a/public/images/emoji/google_classic/raising_hand/4.png b/public/images/emoji/google_classic/raising_hand/4.png
new file mode 100644
index 00000000000..eb42daddf7c
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand/4.png differ
diff --git a/public/images/emoji/google_classic/raising_hand/5.png b/public/images/emoji/google_classic/raising_hand/5.png
new file mode 100644
index 00000000000..bee1d0b320a
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand/5.png differ
diff --git a/public/images/emoji/google_classic/raising_hand/6.png b/public/images/emoji/google_classic/raising_hand/6.png
new file mode 100644
index 00000000000..d94059937b8
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand/6.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_man.png b/public/images/emoji/google_classic/raising_hand_man.png
new file mode 100644
index 00000000000..136d03bdf05
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_man.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_man/2.png b/public/images/emoji/google_classic/raising_hand_man/2.png
new file mode 100644
index 00000000000..11b2b196323
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_man/2.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_man/3.png b/public/images/emoji/google_classic/raising_hand_man/3.png
new file mode 100644
index 00000000000..3f512942396
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_man/3.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_man/4.png b/public/images/emoji/google_classic/raising_hand_man/4.png
new file mode 100644
index 00000000000..011715a2ca2
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_man/4.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_man/5.png b/public/images/emoji/google_classic/raising_hand_man/5.png
new file mode 100644
index 00000000000..bbca2ee3b96
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_man/5.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_man/6.png b/public/images/emoji/google_classic/raising_hand_man/6.png
new file mode 100644
index 00000000000..5aa455d1af4
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_man/6.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_woman.png b/public/images/emoji/google_classic/raising_hand_woman.png
new file mode 100644
index 00000000000..5cef8797da8
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_woman.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_woman/2.png b/public/images/emoji/google_classic/raising_hand_woman/2.png
new file mode 100644
index 00000000000..c4eb1a7ad35
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_woman/3.png b/public/images/emoji/google_classic/raising_hand_woman/3.png
new file mode 100644
index 00000000000..6555d9d94a9
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_woman/4.png b/public/images/emoji/google_classic/raising_hand_woman/4.png
new file mode 100644
index 00000000000..eb42daddf7c
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_woman/5.png b/public/images/emoji/google_classic/raising_hand_woman/5.png
new file mode 100644
index 00000000000..bee1d0b320a
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/google_classic/raising_hand_woman/6.png b/public/images/emoji/google_classic/raising_hand_woman/6.png
new file mode 100644
index 00000000000..d94059937b8
Binary files /dev/null and b/public/images/emoji/google_classic/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/google_classic/ram.png b/public/images/emoji/google_classic/ram.png
new file mode 100644
index 00000000000..6afd11b63c8
Binary files /dev/null and b/public/images/emoji/google_classic/ram.png differ
diff --git a/public/images/emoji/google_classic/ramen.png b/public/images/emoji/google_classic/ramen.png
new file mode 100644
index 00000000000..802587548db
Binary files /dev/null and b/public/images/emoji/google_classic/ramen.png differ
diff --git a/public/images/emoji/google_classic/rat.png b/public/images/emoji/google_classic/rat.png
new file mode 100644
index 00000000000..17bc1265d80
Binary files /dev/null and b/public/images/emoji/google_classic/rat.png differ
diff --git a/public/images/emoji/google_classic/record_button.png b/public/images/emoji/google_classic/record_button.png
new file mode 100644
index 00000000000..d3366b61fb5
Binary files /dev/null and b/public/images/emoji/google_classic/record_button.png differ
diff --git a/public/images/emoji/google_classic/recycle.png b/public/images/emoji/google_classic/recycle.png
new file mode 100644
index 00000000000..04fe0099ed3
Binary files /dev/null and b/public/images/emoji/google_classic/recycle.png differ
diff --git a/public/images/emoji/google_classic/red_car.png b/public/images/emoji/google_classic/red_car.png
new file mode 100644
index 00000000000..9163e78abd8
Binary files /dev/null and b/public/images/emoji/google_classic/red_car.png differ
diff --git a/public/images/emoji/google_classic/red_circle.png b/public/images/emoji/google_classic/red_circle.png
new file mode 100644
index 00000000000..62e9d4c62c1
Binary files /dev/null and b/public/images/emoji/google_classic/red_circle.png differ
diff --git a/public/images/emoji/google_classic/registered.png b/public/images/emoji/google_classic/registered.png
new file mode 100644
index 00000000000..5a06e509847
Binary files /dev/null and b/public/images/emoji/google_classic/registered.png differ
diff --git a/public/images/emoji/google_classic/relaxed.png b/public/images/emoji/google_classic/relaxed.png
new file mode 100644
index 00000000000..fb8c270c8b8
Binary files /dev/null and b/public/images/emoji/google_classic/relaxed.png differ
diff --git a/public/images/emoji/google_classic/relieved.png b/public/images/emoji/google_classic/relieved.png
new file mode 100644
index 00000000000..16bb59dee8f
Binary files /dev/null and b/public/images/emoji/google_classic/relieved.png differ
diff --git a/public/images/emoji/google_classic/reminder_ribbon.png b/public/images/emoji/google_classic/reminder_ribbon.png
new file mode 100644
index 00000000000..c352436d907
Binary files /dev/null and b/public/images/emoji/google_classic/reminder_ribbon.png differ
diff --git a/public/images/emoji/google_classic/repeat.png b/public/images/emoji/google_classic/repeat.png
new file mode 100644
index 00000000000..288e86d9a2e
Binary files /dev/null and b/public/images/emoji/google_classic/repeat.png differ
diff --git a/public/images/emoji/google_classic/repeat_one.png b/public/images/emoji/google_classic/repeat_one.png
new file mode 100644
index 00000000000..1ba3b8e7ca8
Binary files /dev/null and b/public/images/emoji/google_classic/repeat_one.png differ
diff --git a/public/images/emoji/google_classic/rescue_worker_helmet.png b/public/images/emoji/google_classic/rescue_worker_helmet.png
new file mode 100644
index 00000000000..721340bfb01
Binary files /dev/null and b/public/images/emoji/google_classic/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/google_classic/restroom.png b/public/images/emoji/google_classic/restroom.png
new file mode 100644
index 00000000000..b8f203dc7ab
Binary files /dev/null and b/public/images/emoji/google_classic/restroom.png differ
diff --git a/public/images/emoji/google_classic/reunion.png b/public/images/emoji/google_classic/reunion.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/reunion.png differ
diff --git a/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended.png b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended.png
new file mode 100644
index 00000000000..abeb7fe2f41
Binary files /dev/null and b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended.png differ
diff --git a/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/2.png
new file mode 100644
index 00000000000..957841c2b2b
Binary files /dev/null and b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/3.png
new file mode 100644
index 00000000000..a6e41041c11
Binary files /dev/null and b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/4.png
new file mode 100644
index 00000000000..ed6a1374587
Binary files /dev/null and b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/5.png
new file mode 100644
index 00000000000..4cd9f7a7f01
Binary files /dev/null and b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/6.png
new file mode 100644
index 00000000000..ad5a8e50e1e
Binary files /dev/null and b/public/images/emoji/google_classic/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/google_classic/revolving_hearts.png b/public/images/emoji/google_classic/revolving_hearts.png
new file mode 100644
index 00000000000..9ab17fceaa7
Binary files /dev/null and b/public/images/emoji/google_classic/revolving_hearts.png differ
diff --git a/public/images/emoji/google_classic/rewind.png b/public/images/emoji/google_classic/rewind.png
new file mode 100644
index 00000000000..405c5916f52
Binary files /dev/null and b/public/images/emoji/google_classic/rewind.png differ
diff --git a/public/images/emoji/google_classic/rhinoceros.png b/public/images/emoji/google_classic/rhinoceros.png
new file mode 100644
index 00000000000..f3c30050231
Binary files /dev/null and b/public/images/emoji/google_classic/rhinoceros.png differ
diff --git a/public/images/emoji/google_classic/ribbon.png b/public/images/emoji/google_classic/ribbon.png
new file mode 100644
index 00000000000..ce6c110c383
Binary files /dev/null and b/public/images/emoji/google_classic/ribbon.png differ
diff --git a/public/images/emoji/google_classic/rice.png b/public/images/emoji/google_classic/rice.png
new file mode 100644
index 00000000000..3e4d163d947
Binary files /dev/null and b/public/images/emoji/google_classic/rice.png differ
diff --git a/public/images/emoji/google_classic/rice_ball.png b/public/images/emoji/google_classic/rice_ball.png
new file mode 100644
index 00000000000..b069d79b9fe
Binary files /dev/null and b/public/images/emoji/google_classic/rice_ball.png differ
diff --git a/public/images/emoji/google_classic/rice_cracker.png b/public/images/emoji/google_classic/rice_cracker.png
new file mode 100644
index 00000000000..c81bea0aa5b
Binary files /dev/null and b/public/images/emoji/google_classic/rice_cracker.png differ
diff --git a/public/images/emoji/google_classic/rice_scene.png b/public/images/emoji/google_classic/rice_scene.png
new file mode 100644
index 00000000000..bde772e6301
Binary files /dev/null and b/public/images/emoji/google_classic/rice_scene.png differ
diff --git a/public/images/emoji/google_classic/right_anger_bubble.png b/public/images/emoji/google_classic/right_anger_bubble.png
new file mode 100644
index 00000000000..285492d7b7e
Binary files /dev/null and b/public/images/emoji/google_classic/right_anger_bubble.png differ
diff --git a/public/images/emoji/google_classic/ring.png b/public/images/emoji/google_classic/ring.png
new file mode 100644
index 00000000000..3a0cebaeba2
Binary files /dev/null and b/public/images/emoji/google_classic/ring.png differ
diff --git a/public/images/emoji/google_classic/robot.png b/public/images/emoji/google_classic/robot.png
new file mode 100644
index 00000000000..fd0adefab10
Binary files /dev/null and b/public/images/emoji/google_classic/robot.png differ
diff --git a/public/images/emoji/google_classic/robot_face.png b/public/images/emoji/google_classic/robot_face.png
new file mode 100644
index 00000000000..fd0adefab10
Binary files /dev/null and b/public/images/emoji/google_classic/robot_face.png differ
diff --git a/public/images/emoji/google_classic/rocket.png b/public/images/emoji/google_classic/rocket.png
new file mode 100644
index 00000000000..77efcb8983b
Binary files /dev/null and b/public/images/emoji/google_classic/rocket.png differ
diff --git a/public/images/emoji/google_classic/rofl.png b/public/images/emoji/google_classic/rofl.png
new file mode 100644
index 00000000000..febd1745b82
Binary files /dev/null and b/public/images/emoji/google_classic/rofl.png differ
diff --git a/public/images/emoji/google_classic/roll_eyes.png b/public/images/emoji/google_classic/roll_eyes.png
new file mode 100644
index 00000000000..10153f06a46
Binary files /dev/null and b/public/images/emoji/google_classic/roll_eyes.png differ
diff --git a/public/images/emoji/google_classic/rolled_up_newspaper.png b/public/images/emoji/google_classic/rolled_up_newspaper.png
new file mode 100644
index 00000000000..52095afb299
Binary files /dev/null and b/public/images/emoji/google_classic/rolled_up_newspaper.png differ
diff --git a/public/images/emoji/google_classic/roller_coaster.png b/public/images/emoji/google_classic/roller_coaster.png
new file mode 100644
index 00000000000..a304d8eb5c9
Binary files /dev/null and b/public/images/emoji/google_classic/roller_coaster.png differ
diff --git a/public/images/emoji/google_classic/rolling_eyes.png b/public/images/emoji/google_classic/rolling_eyes.png
new file mode 100644
index 00000000000..10153f06a46
Binary files /dev/null and b/public/images/emoji/google_classic/rolling_eyes.png differ
diff --git a/public/images/emoji/google_classic/romania.png b/public/images/emoji/google_classic/romania.png
new file mode 100644
index 00000000000..137427410ba
Binary files /dev/null and b/public/images/emoji/google_classic/romania.png differ
diff --git a/public/images/emoji/google_classic/rooster.png b/public/images/emoji/google_classic/rooster.png
new file mode 100644
index 00000000000..9c1ec084f87
Binary files /dev/null and b/public/images/emoji/google_classic/rooster.png differ
diff --git a/public/images/emoji/google_classic/rose.png b/public/images/emoji/google_classic/rose.png
new file mode 100644
index 00000000000..f845c370112
Binary files /dev/null and b/public/images/emoji/google_classic/rose.png differ
diff --git a/public/images/emoji/google_classic/rosette.png b/public/images/emoji/google_classic/rosette.png
new file mode 100644
index 00000000000..2980fcc9d9c
Binary files /dev/null and b/public/images/emoji/google_classic/rosette.png differ
diff --git a/public/images/emoji/google_classic/rotating_light.png b/public/images/emoji/google_classic/rotating_light.png
new file mode 100644
index 00000000000..fe8be04225a
Binary files /dev/null and b/public/images/emoji/google_classic/rotating_light.png differ
diff --git a/public/images/emoji/google_classic/round_pushpin.png b/public/images/emoji/google_classic/round_pushpin.png
new file mode 100644
index 00000000000..f8c24e20050
Binary files /dev/null and b/public/images/emoji/google_classic/round_pushpin.png differ
diff --git a/public/images/emoji/google_classic/rowboat.png b/public/images/emoji/google_classic/rowboat.png
new file mode 100644
index 00000000000..095b6c531e5
Binary files /dev/null and b/public/images/emoji/google_classic/rowboat.png differ
diff --git a/public/images/emoji/google_classic/rowboat/2.png b/public/images/emoji/google_classic/rowboat/2.png
new file mode 100644
index 00000000000..e05886638da
Binary files /dev/null and b/public/images/emoji/google_classic/rowboat/2.png differ
diff --git a/public/images/emoji/google_classic/rowboat/3.png b/public/images/emoji/google_classic/rowboat/3.png
new file mode 100644
index 00000000000..f13fc798120
Binary files /dev/null and b/public/images/emoji/google_classic/rowboat/3.png differ
diff --git a/public/images/emoji/google_classic/rowboat/4.png b/public/images/emoji/google_classic/rowboat/4.png
new file mode 100644
index 00000000000..f091be82df2
Binary files /dev/null and b/public/images/emoji/google_classic/rowboat/4.png differ
diff --git a/public/images/emoji/google_classic/rowboat/5.png b/public/images/emoji/google_classic/rowboat/5.png
new file mode 100644
index 00000000000..e76c4794579
Binary files /dev/null and b/public/images/emoji/google_classic/rowboat/5.png differ
diff --git a/public/images/emoji/google_classic/rowboat/6.png b/public/images/emoji/google_classic/rowboat/6.png
new file mode 100644
index 00000000000..07a57a05912
Binary files /dev/null and b/public/images/emoji/google_classic/rowboat/6.png differ
diff --git a/public/images/emoji/google_classic/rowing_man.png b/public/images/emoji/google_classic/rowing_man.png
new file mode 100644
index 00000000000..095b6c531e5
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_man.png differ
diff --git a/public/images/emoji/google_classic/rowing_man/2.png b/public/images/emoji/google_classic/rowing_man/2.png
new file mode 100644
index 00000000000..e05886638da
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_man/2.png differ
diff --git a/public/images/emoji/google_classic/rowing_man/3.png b/public/images/emoji/google_classic/rowing_man/3.png
new file mode 100644
index 00000000000..f13fc798120
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_man/3.png differ
diff --git a/public/images/emoji/google_classic/rowing_man/4.png b/public/images/emoji/google_classic/rowing_man/4.png
new file mode 100644
index 00000000000..f091be82df2
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_man/4.png differ
diff --git a/public/images/emoji/google_classic/rowing_man/5.png b/public/images/emoji/google_classic/rowing_man/5.png
new file mode 100644
index 00000000000..e76c4794579
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_man/5.png differ
diff --git a/public/images/emoji/google_classic/rowing_man/6.png b/public/images/emoji/google_classic/rowing_man/6.png
new file mode 100644
index 00000000000..07a57a05912
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_man/6.png differ
diff --git a/public/images/emoji/google_classic/rowing_woman.png b/public/images/emoji/google_classic/rowing_woman.png
new file mode 100644
index 00000000000..ea7083f1192
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_woman.png differ
diff --git a/public/images/emoji/google_classic/rowing_woman/2.png b/public/images/emoji/google_classic/rowing_woman/2.png
new file mode 100644
index 00000000000..bed41c8a35c
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_woman/2.png differ
diff --git a/public/images/emoji/google_classic/rowing_woman/3.png b/public/images/emoji/google_classic/rowing_woman/3.png
new file mode 100644
index 00000000000..9b496e7ed01
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_woman/3.png differ
diff --git a/public/images/emoji/google_classic/rowing_woman/4.png b/public/images/emoji/google_classic/rowing_woman/4.png
new file mode 100644
index 00000000000..2829a07ef8b
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_woman/4.png differ
diff --git a/public/images/emoji/google_classic/rowing_woman/5.png b/public/images/emoji/google_classic/rowing_woman/5.png
new file mode 100644
index 00000000000..0b13406d566
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_woman/5.png differ
diff --git a/public/images/emoji/google_classic/rowing_woman/6.png b/public/images/emoji/google_classic/rowing_woman/6.png
new file mode 100644
index 00000000000..986fa0935ac
Binary files /dev/null and b/public/images/emoji/google_classic/rowing_woman/6.png differ
diff --git a/public/images/emoji/google_classic/ru.png b/public/images/emoji/google_classic/ru.png
new file mode 100644
index 00000000000..c10fad17daf
Binary files /dev/null and b/public/images/emoji/google_classic/ru.png differ
diff --git a/public/images/emoji/google_classic/rugby_football.png b/public/images/emoji/google_classic/rugby_football.png
new file mode 100644
index 00000000000..35be1cf926f
Binary files /dev/null and b/public/images/emoji/google_classic/rugby_football.png differ
diff --git a/public/images/emoji/google_classic/runner.png b/public/images/emoji/google_classic/runner.png
new file mode 100644
index 00000000000..bd9f81b76a7
Binary files /dev/null and b/public/images/emoji/google_classic/runner.png differ
diff --git a/public/images/emoji/google_classic/runner/2.png b/public/images/emoji/google_classic/runner/2.png
new file mode 100644
index 00000000000..d7b4e1979ad
Binary files /dev/null and b/public/images/emoji/google_classic/runner/2.png differ
diff --git a/public/images/emoji/google_classic/runner/3.png b/public/images/emoji/google_classic/runner/3.png
new file mode 100644
index 00000000000..7f75911aafc
Binary files /dev/null and b/public/images/emoji/google_classic/runner/3.png differ
diff --git a/public/images/emoji/google_classic/runner/4.png b/public/images/emoji/google_classic/runner/4.png
new file mode 100644
index 00000000000..f5bcfe6a56e
Binary files /dev/null and b/public/images/emoji/google_classic/runner/4.png differ
diff --git a/public/images/emoji/google_classic/runner/5.png b/public/images/emoji/google_classic/runner/5.png
new file mode 100644
index 00000000000..1beeab29a1d
Binary files /dev/null and b/public/images/emoji/google_classic/runner/5.png differ
diff --git a/public/images/emoji/google_classic/runner/6.png b/public/images/emoji/google_classic/runner/6.png
new file mode 100644
index 00000000000..b48bf142657
Binary files /dev/null and b/public/images/emoji/google_classic/runner/6.png differ
diff --git a/public/images/emoji/google_classic/running_man.png b/public/images/emoji/google_classic/running_man.png
new file mode 100644
index 00000000000..bd9f81b76a7
Binary files /dev/null and b/public/images/emoji/google_classic/running_man.png differ
diff --git a/public/images/emoji/google_classic/running_man/2.png b/public/images/emoji/google_classic/running_man/2.png
new file mode 100644
index 00000000000..d7b4e1979ad
Binary files /dev/null and b/public/images/emoji/google_classic/running_man/2.png differ
diff --git a/public/images/emoji/google_classic/running_man/3.png b/public/images/emoji/google_classic/running_man/3.png
new file mode 100644
index 00000000000..7f75911aafc
Binary files /dev/null and b/public/images/emoji/google_classic/running_man/3.png differ
diff --git a/public/images/emoji/google_classic/running_man/4.png b/public/images/emoji/google_classic/running_man/4.png
new file mode 100644
index 00000000000..f5bcfe6a56e
Binary files /dev/null and b/public/images/emoji/google_classic/running_man/4.png differ
diff --git a/public/images/emoji/google_classic/running_man/5.png b/public/images/emoji/google_classic/running_man/5.png
new file mode 100644
index 00000000000..1beeab29a1d
Binary files /dev/null and b/public/images/emoji/google_classic/running_man/5.png differ
diff --git a/public/images/emoji/google_classic/running_man/6.png b/public/images/emoji/google_classic/running_man/6.png
new file mode 100644
index 00000000000..b48bf142657
Binary files /dev/null and b/public/images/emoji/google_classic/running_man/6.png differ
diff --git a/public/images/emoji/google_classic/running_shirt_with_sash.png b/public/images/emoji/google_classic/running_shirt_with_sash.png
new file mode 100644
index 00000000000..4d796f10a60
Binary files /dev/null and b/public/images/emoji/google_classic/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/google_classic/running_woman.png b/public/images/emoji/google_classic/running_woman.png
new file mode 100644
index 00000000000..f1f81118b7d
Binary files /dev/null and b/public/images/emoji/google_classic/running_woman.png differ
diff --git a/public/images/emoji/google_classic/running_woman/2.png b/public/images/emoji/google_classic/running_woman/2.png
new file mode 100644
index 00000000000..851a7fc1098
Binary files /dev/null and b/public/images/emoji/google_classic/running_woman/2.png differ
diff --git a/public/images/emoji/google_classic/running_woman/3.png b/public/images/emoji/google_classic/running_woman/3.png
new file mode 100644
index 00000000000..166f2d62320
Binary files /dev/null and b/public/images/emoji/google_classic/running_woman/3.png differ
diff --git a/public/images/emoji/google_classic/running_woman/4.png b/public/images/emoji/google_classic/running_woman/4.png
new file mode 100644
index 00000000000..9bbfc1f1bad
Binary files /dev/null and b/public/images/emoji/google_classic/running_woman/4.png differ
diff --git a/public/images/emoji/google_classic/running_woman/5.png b/public/images/emoji/google_classic/running_woman/5.png
new file mode 100644
index 00000000000..f7916fff85b
Binary files /dev/null and b/public/images/emoji/google_classic/running_woman/5.png differ
diff --git a/public/images/emoji/google_classic/running_woman/6.png b/public/images/emoji/google_classic/running_woman/6.png
new file mode 100644
index 00000000000..120a3363611
Binary files /dev/null and b/public/images/emoji/google_classic/running_woman/6.png differ
diff --git a/public/images/emoji/google_classic/rwanda.png b/public/images/emoji/google_classic/rwanda.png
new file mode 100644
index 00000000000..7df663ba99a
Binary files /dev/null and b/public/images/emoji/google_classic/rwanda.png differ
diff --git a/public/images/emoji/google_classic/sa.png b/public/images/emoji/google_classic/sa.png
new file mode 100644
index 00000000000..3bfb06bfffc
Binary files /dev/null and b/public/images/emoji/google_classic/sa.png differ
diff --git a/public/images/emoji/google_classic/sagittarius.png b/public/images/emoji/google_classic/sagittarius.png
new file mode 100644
index 00000000000..e4f3edf680a
Binary files /dev/null and b/public/images/emoji/google_classic/sagittarius.png differ
diff --git a/public/images/emoji/google_classic/sailboat.png b/public/images/emoji/google_classic/sailboat.png
new file mode 100644
index 00000000000..dc2ea1ee659
Binary files /dev/null and b/public/images/emoji/google_classic/sailboat.png differ
diff --git a/public/images/emoji/google_classic/sake.png b/public/images/emoji/google_classic/sake.png
new file mode 100644
index 00000000000..e7072a149a5
Binary files /dev/null and b/public/images/emoji/google_classic/sake.png differ
diff --git a/public/images/emoji/google_classic/samoa.png b/public/images/emoji/google_classic/samoa.png
new file mode 100644
index 00000000000..80b22c8f92b
Binary files /dev/null and b/public/images/emoji/google_classic/samoa.png differ
diff --git a/public/images/emoji/google_classic/san_marino.png b/public/images/emoji/google_classic/san_marino.png
new file mode 100644
index 00000000000..714229ec978
Binary files /dev/null and b/public/images/emoji/google_classic/san_marino.png differ
diff --git a/public/images/emoji/google_classic/sandal.png b/public/images/emoji/google_classic/sandal.png
new file mode 100644
index 00000000000..ca7edf36dfe
Binary files /dev/null and b/public/images/emoji/google_classic/sandal.png differ
diff --git a/public/images/emoji/google_classic/sandwich.png b/public/images/emoji/google_classic/sandwich.png
new file mode 100644
index 00000000000..ba3f9a1cdb7
Binary files /dev/null and b/public/images/emoji/google_classic/sandwich.png differ
diff --git a/public/images/emoji/google_classic/santa.png b/public/images/emoji/google_classic/santa.png
new file mode 100644
index 00000000000..10c906203a4
Binary files /dev/null and b/public/images/emoji/google_classic/santa.png differ
diff --git a/public/images/emoji/google_classic/santa/2.png b/public/images/emoji/google_classic/santa/2.png
new file mode 100644
index 00000000000..5b016f3922e
Binary files /dev/null and b/public/images/emoji/google_classic/santa/2.png differ
diff --git a/public/images/emoji/google_classic/santa/3.png b/public/images/emoji/google_classic/santa/3.png
new file mode 100644
index 00000000000..ae8e0971c55
Binary files /dev/null and b/public/images/emoji/google_classic/santa/3.png differ
diff --git a/public/images/emoji/google_classic/santa/4.png b/public/images/emoji/google_classic/santa/4.png
new file mode 100644
index 00000000000..1244116fb11
Binary files /dev/null and b/public/images/emoji/google_classic/santa/4.png differ
diff --git a/public/images/emoji/google_classic/santa/5.png b/public/images/emoji/google_classic/santa/5.png
new file mode 100644
index 00000000000..e4db0283d83
Binary files /dev/null and b/public/images/emoji/google_classic/santa/5.png differ
diff --git a/public/images/emoji/google_classic/santa/6.png b/public/images/emoji/google_classic/santa/6.png
new file mode 100644
index 00000000000..020a4867820
Binary files /dev/null and b/public/images/emoji/google_classic/santa/6.png differ
diff --git a/public/images/emoji/google_classic/sao_tome_principe.png b/public/images/emoji/google_classic/sao_tome_principe.png
new file mode 100644
index 00000000000..5965beae8b9
Binary files /dev/null and b/public/images/emoji/google_classic/sao_tome_principe.png differ
diff --git a/public/images/emoji/google_classic/satellite.png b/public/images/emoji/google_classic/satellite.png
new file mode 100644
index 00000000000..154b1b5c72a
Binary files /dev/null and b/public/images/emoji/google_classic/satellite.png differ
diff --git a/public/images/emoji/google_classic/satellite_orbital.png b/public/images/emoji/google_classic/satellite_orbital.png
new file mode 100644
index 00000000000..68fb59dc197
Binary files /dev/null and b/public/images/emoji/google_classic/satellite_orbital.png differ
diff --git a/public/images/emoji/google_classic/satisfied.png b/public/images/emoji/google_classic/satisfied.png
new file mode 100644
index 00000000000..04d29aa6a7d
Binary files /dev/null and b/public/images/emoji/google_classic/satisfied.png differ
diff --git a/public/images/emoji/google_classic/saudi_arabia.png b/public/images/emoji/google_classic/saudi_arabia.png
new file mode 100644
index 00000000000..f441bd83bc5
Binary files /dev/null and b/public/images/emoji/google_classic/saudi_arabia.png differ
diff --git a/public/images/emoji/google_classic/sauropod.png b/public/images/emoji/google_classic/sauropod.png
new file mode 100644
index 00000000000..2f4d6199975
Binary files /dev/null and b/public/images/emoji/google_classic/sauropod.png differ
diff --git a/public/images/emoji/google_classic/saxophone.png b/public/images/emoji/google_classic/saxophone.png
new file mode 100644
index 00000000000..7aee7172349
Binary files /dev/null and b/public/images/emoji/google_classic/saxophone.png differ
diff --git a/public/images/emoji/google_classic/scales.png b/public/images/emoji/google_classic/scales.png
new file mode 100644
index 00000000000..5fa43f378a6
Binary files /dev/null and b/public/images/emoji/google_classic/scales.png differ
diff --git a/public/images/emoji/google_classic/scarf.png b/public/images/emoji/google_classic/scarf.png
new file mode 100644
index 00000000000..73653eee2bd
Binary files /dev/null and b/public/images/emoji/google_classic/scarf.png differ
diff --git a/public/images/emoji/google_classic/school.png b/public/images/emoji/google_classic/school.png
new file mode 100644
index 00000000000..752473912d7
Binary files /dev/null and b/public/images/emoji/google_classic/school.png differ
diff --git a/public/images/emoji/google_classic/school_satchel.png b/public/images/emoji/google_classic/school_satchel.png
new file mode 100644
index 00000000000..c9f160564bf
Binary files /dev/null and b/public/images/emoji/google_classic/school_satchel.png differ
diff --git a/public/images/emoji/google_classic/scissors.png b/public/images/emoji/google_classic/scissors.png
new file mode 100644
index 00000000000..bf9a56aeffb
Binary files /dev/null and b/public/images/emoji/google_classic/scissors.png differ
diff --git a/public/images/emoji/google_classic/scorpion.png b/public/images/emoji/google_classic/scorpion.png
new file mode 100644
index 00000000000..390e62321cb
Binary files /dev/null and b/public/images/emoji/google_classic/scorpion.png differ
diff --git a/public/images/emoji/google_classic/scorpius.png b/public/images/emoji/google_classic/scorpius.png
new file mode 100644
index 00000000000..a9a9db203a5
Binary files /dev/null and b/public/images/emoji/google_classic/scorpius.png differ
diff --git a/public/images/emoji/google_classic/scream.png b/public/images/emoji/google_classic/scream.png
new file mode 100644
index 00000000000..81b8c47abac
Binary files /dev/null and b/public/images/emoji/google_classic/scream.png differ
diff --git a/public/images/emoji/google_classic/scream_cat.png b/public/images/emoji/google_classic/scream_cat.png
new file mode 100644
index 00000000000..c0df8e7b37a
Binary files /dev/null and b/public/images/emoji/google_classic/scream_cat.png differ
diff --git a/public/images/emoji/google_classic/scroll.png b/public/images/emoji/google_classic/scroll.png
new file mode 100644
index 00000000000..1e46a06c658
Binary files /dev/null and b/public/images/emoji/google_classic/scroll.png differ
diff --git a/public/images/emoji/google_classic/seat.png b/public/images/emoji/google_classic/seat.png
new file mode 100644
index 00000000000..958c30e9ee8
Binary files /dev/null and b/public/images/emoji/google_classic/seat.png differ
diff --git a/public/images/emoji/google_classic/secret.png b/public/images/emoji/google_classic/secret.png
new file mode 100644
index 00000000000..1bccee14903
Binary files /dev/null and b/public/images/emoji/google_classic/secret.png differ
diff --git a/public/images/emoji/google_classic/see_no_evil.png b/public/images/emoji/google_classic/see_no_evil.png
new file mode 100644
index 00000000000..2851bccdb4c
Binary files /dev/null and b/public/images/emoji/google_classic/see_no_evil.png differ
diff --git a/public/images/emoji/google_classic/seedling.png b/public/images/emoji/google_classic/seedling.png
new file mode 100644
index 00000000000..6e4dda1aecc
Binary files /dev/null and b/public/images/emoji/google_classic/seedling.png differ
diff --git a/public/images/emoji/google_classic/selfie.png b/public/images/emoji/google_classic/selfie.png
new file mode 100644
index 00000000000..b25380a64b9
Binary files /dev/null and b/public/images/emoji/google_classic/selfie.png differ
diff --git a/public/images/emoji/google_classic/selfie/2.png b/public/images/emoji/google_classic/selfie/2.png
new file mode 100644
index 00000000000..54909fff67e
Binary files /dev/null and b/public/images/emoji/google_classic/selfie/2.png differ
diff --git a/public/images/emoji/google_classic/selfie/3.png b/public/images/emoji/google_classic/selfie/3.png
new file mode 100644
index 00000000000..d02cb7ad96d
Binary files /dev/null and b/public/images/emoji/google_classic/selfie/3.png differ
diff --git a/public/images/emoji/google_classic/selfie/4.png b/public/images/emoji/google_classic/selfie/4.png
new file mode 100644
index 00000000000..31864be7949
Binary files /dev/null and b/public/images/emoji/google_classic/selfie/4.png differ
diff --git a/public/images/emoji/google_classic/selfie/5.png b/public/images/emoji/google_classic/selfie/5.png
new file mode 100644
index 00000000000..18069451d19
Binary files /dev/null and b/public/images/emoji/google_classic/selfie/5.png differ
diff --git a/public/images/emoji/google_classic/selfie/6.png b/public/images/emoji/google_classic/selfie/6.png
new file mode 100644
index 00000000000..61869d48bad
Binary files /dev/null and b/public/images/emoji/google_classic/selfie/6.png differ
diff --git a/public/images/emoji/google_classic/senegal.png b/public/images/emoji/google_classic/senegal.png
new file mode 100644
index 00000000000..58c5a41c122
Binary files /dev/null and b/public/images/emoji/google_classic/senegal.png differ
diff --git a/public/images/emoji/google_classic/serbia.png b/public/images/emoji/google_classic/serbia.png
new file mode 100644
index 00000000000..93b29813f22
Binary files /dev/null and b/public/images/emoji/google_classic/serbia.png differ
diff --git a/public/images/emoji/google_classic/seven.png b/public/images/emoji/google_classic/seven.png
new file mode 100644
index 00000000000..799144564f2
Binary files /dev/null and b/public/images/emoji/google_classic/seven.png differ
diff --git a/public/images/emoji/google_classic/seychelles.png b/public/images/emoji/google_classic/seychelles.png
new file mode 100644
index 00000000000..e348872002b
Binary files /dev/null and b/public/images/emoji/google_classic/seychelles.png differ
diff --git a/public/images/emoji/google_classic/shallow_pan_of_food.png b/public/images/emoji/google_classic/shallow_pan_of_food.png
new file mode 100644
index 00000000000..98f69236c2e
Binary files /dev/null and b/public/images/emoji/google_classic/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/google_classic/shamrock.png b/public/images/emoji/google_classic/shamrock.png
new file mode 100644
index 00000000000..2b7f34d0e11
Binary files /dev/null and b/public/images/emoji/google_classic/shamrock.png differ
diff --git a/public/images/emoji/google_classic/shark.png b/public/images/emoji/google_classic/shark.png
new file mode 100644
index 00000000000..21e8849d141
Binary files /dev/null and b/public/images/emoji/google_classic/shark.png differ
diff --git a/public/images/emoji/google_classic/shaved_ice.png b/public/images/emoji/google_classic/shaved_ice.png
new file mode 100644
index 00000000000..9a0d04f498e
Binary files /dev/null and b/public/images/emoji/google_classic/shaved_ice.png differ
diff --git a/public/images/emoji/google_classic/sheep.png b/public/images/emoji/google_classic/sheep.png
new file mode 100644
index 00000000000..fdcd26c8b48
Binary files /dev/null and b/public/images/emoji/google_classic/sheep.png differ
diff --git a/public/images/emoji/google_classic/shell.png b/public/images/emoji/google_classic/shell.png
new file mode 100644
index 00000000000..a6f2b268545
Binary files /dev/null and b/public/images/emoji/google_classic/shell.png differ
diff --git a/public/images/emoji/google_classic/shield.png b/public/images/emoji/google_classic/shield.png
new file mode 100644
index 00000000000..87d0f23c766
Binary files /dev/null and b/public/images/emoji/google_classic/shield.png differ
diff --git a/public/images/emoji/google_classic/shinto_shrine.png b/public/images/emoji/google_classic/shinto_shrine.png
new file mode 100644
index 00000000000..ffa65cb673a
Binary files /dev/null and b/public/images/emoji/google_classic/shinto_shrine.png differ
diff --git a/public/images/emoji/google_classic/ship.png b/public/images/emoji/google_classic/ship.png
new file mode 100644
index 00000000000..6cab94e37d8
Binary files /dev/null and b/public/images/emoji/google_classic/ship.png differ
diff --git a/public/images/emoji/google_classic/shirt.png b/public/images/emoji/google_classic/shirt.png
new file mode 100644
index 00000000000..18fed809641
Binary files /dev/null and b/public/images/emoji/google_classic/shirt.png differ
diff --git a/public/images/emoji/google_classic/shit.png b/public/images/emoji/google_classic/shit.png
new file mode 100644
index 00000000000..87d78669668
Binary files /dev/null and b/public/images/emoji/google_classic/shit.png differ
diff --git a/public/images/emoji/google_classic/shopping.png b/public/images/emoji/google_classic/shopping.png
new file mode 100644
index 00000000000..ad7ba7e2493
Binary files /dev/null and b/public/images/emoji/google_classic/shopping.png differ
diff --git a/public/images/emoji/google_classic/shopping_bags.png b/public/images/emoji/google_classic/shopping_bags.png
new file mode 100644
index 00000000000..ad7ba7e2493
Binary files /dev/null and b/public/images/emoji/google_classic/shopping_bags.png differ
diff --git a/public/images/emoji/google_classic/shopping_cart.png b/public/images/emoji/google_classic/shopping_cart.png
new file mode 100644
index 00000000000..99b349b713e
Binary files /dev/null and b/public/images/emoji/google_classic/shopping_cart.png differ
diff --git a/public/images/emoji/google_classic/shower.png b/public/images/emoji/google_classic/shower.png
new file mode 100644
index 00000000000..6db1dda0ec2
Binary files /dev/null and b/public/images/emoji/google_classic/shower.png differ
diff --git a/public/images/emoji/google_classic/shrimp.png b/public/images/emoji/google_classic/shrimp.png
new file mode 100644
index 00000000000..f3c0189a7e3
Binary files /dev/null and b/public/images/emoji/google_classic/shrimp.png differ
diff --git a/public/images/emoji/google_classic/sierra_leone.png b/public/images/emoji/google_classic/sierra_leone.png
new file mode 100644
index 00000000000..114fe7694bd
Binary files /dev/null and b/public/images/emoji/google_classic/sierra_leone.png differ
diff --git a/public/images/emoji/google_classic/sign_of_the_horns.png b/public/images/emoji/google_classic/sign_of_the_horns.png
new file mode 100644
index 00000000000..d8d0c23c3f8
Binary files /dev/null and b/public/images/emoji/google_classic/sign_of_the_horns.png differ
diff --git a/public/images/emoji/google_classic/sign_of_the_horns/2.png b/public/images/emoji/google_classic/sign_of_the_horns/2.png
new file mode 100644
index 00000000000..8cf0a05b557
Binary files /dev/null and b/public/images/emoji/google_classic/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/google_classic/sign_of_the_horns/3.png b/public/images/emoji/google_classic/sign_of_the_horns/3.png
new file mode 100644
index 00000000000..fe8c1c3ea76
Binary files /dev/null and b/public/images/emoji/google_classic/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/google_classic/sign_of_the_horns/4.png b/public/images/emoji/google_classic/sign_of_the_horns/4.png
new file mode 100644
index 00000000000..640f1216113
Binary files /dev/null and b/public/images/emoji/google_classic/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/google_classic/sign_of_the_horns/5.png b/public/images/emoji/google_classic/sign_of_the_horns/5.png
new file mode 100644
index 00000000000..6758574bbbb
Binary files /dev/null and b/public/images/emoji/google_classic/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/google_classic/sign_of_the_horns/6.png b/public/images/emoji/google_classic/sign_of_the_horns/6.png
new file mode 100644
index 00000000000..e40f2cc1f91
Binary files /dev/null and b/public/images/emoji/google_classic/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/google_classic/signal_strength.png b/public/images/emoji/google_classic/signal_strength.png
new file mode 100644
index 00000000000..2940d4ae747
Binary files /dev/null and b/public/images/emoji/google_classic/signal_strength.png differ
diff --git a/public/images/emoji/google_classic/singapore.png b/public/images/emoji/google_classic/singapore.png
new file mode 100644
index 00000000000..7faeb2cd120
Binary files /dev/null and b/public/images/emoji/google_classic/singapore.png differ
diff --git a/public/images/emoji/google_classic/sint_maarten.png b/public/images/emoji/google_classic/sint_maarten.png
new file mode 100644
index 00000000000..468ceb20c9a
Binary files /dev/null and b/public/images/emoji/google_classic/sint_maarten.png differ
diff --git a/public/images/emoji/google_classic/six.png b/public/images/emoji/google_classic/six.png
new file mode 100644
index 00000000000..893aa6e884e
Binary files /dev/null and b/public/images/emoji/google_classic/six.png differ
diff --git a/public/images/emoji/google_classic/six_pointed_star.png b/public/images/emoji/google_classic/six_pointed_star.png
new file mode 100644
index 00000000000..2a4d9ca7f78
Binary files /dev/null and b/public/images/emoji/google_classic/six_pointed_star.png differ
diff --git a/public/images/emoji/google_classic/skeleton.png b/public/images/emoji/google_classic/skeleton.png
new file mode 100644
index 00000000000..89aaa6cbb0f
Binary files /dev/null and b/public/images/emoji/google_classic/skeleton.png differ
diff --git a/public/images/emoji/google_classic/ski.png b/public/images/emoji/google_classic/ski.png
new file mode 100644
index 00000000000..76d2b036245
Binary files /dev/null and b/public/images/emoji/google_classic/ski.png differ
diff --git a/public/images/emoji/google_classic/skier.png b/public/images/emoji/google_classic/skier.png
new file mode 100644
index 00000000000..091956a1362
Binary files /dev/null and b/public/images/emoji/google_classic/skier.png differ
diff --git a/public/images/emoji/google_classic/skull.png b/public/images/emoji/google_classic/skull.png
new file mode 100644
index 00000000000..89aaa6cbb0f
Binary files /dev/null and b/public/images/emoji/google_classic/skull.png differ
diff --git a/public/images/emoji/google_classic/skull_and_crossbones.png b/public/images/emoji/google_classic/skull_and_crossbones.png
new file mode 100644
index 00000000000..1087099c6f4
Binary files /dev/null and b/public/images/emoji/google_classic/skull_and_crossbones.png differ
diff --git a/public/images/emoji/google_classic/skull_crossbones.png b/public/images/emoji/google_classic/skull_crossbones.png
new file mode 100644
index 00000000000..1087099c6f4
Binary files /dev/null and b/public/images/emoji/google_classic/skull_crossbones.png differ
diff --git a/public/images/emoji/google_classic/sled.png b/public/images/emoji/google_classic/sled.png
new file mode 100644
index 00000000000..01805b1fe76
Binary files /dev/null and b/public/images/emoji/google_classic/sled.png differ
diff --git a/public/images/emoji/google_classic/sleeping.png b/public/images/emoji/google_classic/sleeping.png
new file mode 100644
index 00000000000..d9ec0d7d8d5
Binary files /dev/null and b/public/images/emoji/google_classic/sleeping.png differ
diff --git a/public/images/emoji/google_classic/sleeping_accommodation.png b/public/images/emoji/google_classic/sleeping_accommodation.png
new file mode 100644
index 00000000000..e37df48d03e
Binary files /dev/null and b/public/images/emoji/google_classic/sleeping_accommodation.png differ
diff --git a/public/images/emoji/google_classic/sleeping_bed.png b/public/images/emoji/google_classic/sleeping_bed.png
new file mode 100644
index 00000000000..e37df48d03e
Binary files /dev/null and b/public/images/emoji/google_classic/sleeping_bed.png differ
diff --git a/public/images/emoji/google_classic/sleepy.png b/public/images/emoji/google_classic/sleepy.png
new file mode 100644
index 00000000000..34b9786153f
Binary files /dev/null and b/public/images/emoji/google_classic/sleepy.png differ
diff --git a/public/images/emoji/google_classic/sleuth_or_spy.png b/public/images/emoji/google_classic/sleuth_or_spy.png
new file mode 100644
index 00000000000..b76dce309bf
Binary files /dev/null and b/public/images/emoji/google_classic/sleuth_or_spy.png differ
diff --git a/public/images/emoji/google_classic/sleuth_or_spy/2.png b/public/images/emoji/google_classic/sleuth_or_spy/2.png
new file mode 100644
index 00000000000..d7856fc1c54
Binary files /dev/null and b/public/images/emoji/google_classic/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/google_classic/sleuth_or_spy/3.png b/public/images/emoji/google_classic/sleuth_or_spy/3.png
new file mode 100644
index 00000000000..7913646a104
Binary files /dev/null and b/public/images/emoji/google_classic/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/google_classic/sleuth_or_spy/4.png b/public/images/emoji/google_classic/sleuth_or_spy/4.png
new file mode 100644
index 00000000000..69cb4974a6a
Binary files /dev/null and b/public/images/emoji/google_classic/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/google_classic/sleuth_or_spy/5.png b/public/images/emoji/google_classic/sleuth_or_spy/5.png
new file mode 100644
index 00000000000..53d3133222c
Binary files /dev/null and b/public/images/emoji/google_classic/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/google_classic/sleuth_or_spy/6.png b/public/images/emoji/google_classic/sleuth_or_spy/6.png
new file mode 100644
index 00000000000..d9d076168e7
Binary files /dev/null and b/public/images/emoji/google_classic/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/google_classic/slight_frown.png b/public/images/emoji/google_classic/slight_frown.png
new file mode 100644
index 00000000000..938547aed9f
Binary files /dev/null and b/public/images/emoji/google_classic/slight_frown.png differ
diff --git a/public/images/emoji/google_classic/slight_smile.png b/public/images/emoji/google_classic/slight_smile.png
new file mode 100644
index 00000000000..c8b0a25ea2d
Binary files /dev/null and b/public/images/emoji/google_classic/slight_smile.png differ
diff --git a/public/images/emoji/google_classic/slightly_frowning_face.png b/public/images/emoji/google_classic/slightly_frowning_face.png
new file mode 100644
index 00000000000..938547aed9f
Binary files /dev/null and b/public/images/emoji/google_classic/slightly_frowning_face.png differ
diff --git a/public/images/emoji/google_classic/slightly_smiling.png b/public/images/emoji/google_classic/slightly_smiling.png
new file mode 100644
index 00000000000..c8b0a25ea2d
Binary files /dev/null and b/public/images/emoji/google_classic/slightly_smiling.png differ
diff --git a/public/images/emoji/google_classic/slightly_smiling_face.png b/public/images/emoji/google_classic/slightly_smiling_face.png
new file mode 100644
index 00000000000..c8b0a25ea2d
Binary files /dev/null and b/public/images/emoji/google_classic/slightly_smiling_face.png differ
diff --git a/public/images/emoji/google_classic/slot_machine.png b/public/images/emoji/google_classic/slot_machine.png
new file mode 100644
index 00000000000..42da9edb7ad
Binary files /dev/null and b/public/images/emoji/google_classic/slot_machine.png differ
diff --git a/public/images/emoji/google_classic/slovakia.png b/public/images/emoji/google_classic/slovakia.png
new file mode 100644
index 00000000000..2c28c9b1d3a
Binary files /dev/null and b/public/images/emoji/google_classic/slovakia.png differ
diff --git a/public/images/emoji/google_classic/slovenia.png b/public/images/emoji/google_classic/slovenia.png
new file mode 100644
index 00000000000..400434e443a
Binary files /dev/null and b/public/images/emoji/google_classic/slovenia.png differ
diff --git a/public/images/emoji/google_classic/small_airplane.png b/public/images/emoji/google_classic/small_airplane.png
new file mode 100644
index 00000000000..4bd5d32edc1
Binary files /dev/null and b/public/images/emoji/google_classic/small_airplane.png differ
diff --git a/public/images/emoji/google_classic/small_blue_diamond.png b/public/images/emoji/google_classic/small_blue_diamond.png
new file mode 100644
index 00000000000..5b7e4a70d45
Binary files /dev/null and b/public/images/emoji/google_classic/small_blue_diamond.png differ
diff --git a/public/images/emoji/google_classic/small_orange_diamond.png b/public/images/emoji/google_classic/small_orange_diamond.png
new file mode 100644
index 00000000000..202d6e0bd60
Binary files /dev/null and b/public/images/emoji/google_classic/small_orange_diamond.png differ
diff --git a/public/images/emoji/google_classic/small_red_triangle.png b/public/images/emoji/google_classic/small_red_triangle.png
new file mode 100644
index 00000000000..3223603df14
Binary files /dev/null and b/public/images/emoji/google_classic/small_red_triangle.png differ
diff --git a/public/images/emoji/google_classic/small_red_triangle_down.png b/public/images/emoji/google_classic/small_red_triangle_down.png
new file mode 100644
index 00000000000..407a5e48c78
Binary files /dev/null and b/public/images/emoji/google_classic/small_red_triangle_down.png differ
diff --git a/public/images/emoji/google_classic/smile.png b/public/images/emoji/google_classic/smile.png
new file mode 100644
index 00000000000..cac80903ec2
Binary files /dev/null and b/public/images/emoji/google_classic/smile.png differ
diff --git a/public/images/emoji/google_classic/smile_cat.png b/public/images/emoji/google_classic/smile_cat.png
new file mode 100644
index 00000000000..f4d72befae7
Binary files /dev/null and b/public/images/emoji/google_classic/smile_cat.png differ
diff --git a/public/images/emoji/google_classic/smiley.png b/public/images/emoji/google_classic/smiley.png
new file mode 100644
index 00000000000..8e65729a6c7
Binary files /dev/null and b/public/images/emoji/google_classic/smiley.png differ
diff --git a/public/images/emoji/google_classic/smiley_cat.png b/public/images/emoji/google_classic/smiley_cat.png
new file mode 100644
index 00000000000..7243c2cb5e0
Binary files /dev/null and b/public/images/emoji/google_classic/smiley_cat.png differ
diff --git a/public/images/emoji/google_classic/smiling_imp.png b/public/images/emoji/google_classic/smiling_imp.png
new file mode 100644
index 00000000000..2b4ac8d7fc6
Binary files /dev/null and b/public/images/emoji/google_classic/smiling_imp.png differ
diff --git a/public/images/emoji/google_classic/smirk.png b/public/images/emoji/google_classic/smirk.png
new file mode 100644
index 00000000000..a552663374a
Binary files /dev/null and b/public/images/emoji/google_classic/smirk.png differ
diff --git a/public/images/emoji/google_classic/smirk_cat.png b/public/images/emoji/google_classic/smirk_cat.png
new file mode 100644
index 00000000000..0ad3ed0bedc
Binary files /dev/null and b/public/images/emoji/google_classic/smirk_cat.png differ
diff --git a/public/images/emoji/google_classic/smoking.png b/public/images/emoji/google_classic/smoking.png
new file mode 100644
index 00000000000..106adce9c38
Binary files /dev/null and b/public/images/emoji/google_classic/smoking.png differ
diff --git a/public/images/emoji/google_classic/snail.png b/public/images/emoji/google_classic/snail.png
new file mode 100644
index 00000000000..7014ab0c8b7
Binary files /dev/null and b/public/images/emoji/google_classic/snail.png differ
diff --git a/public/images/emoji/google_classic/snake.png b/public/images/emoji/google_classic/snake.png
new file mode 100644
index 00000000000..197beb5f98f
Binary files /dev/null and b/public/images/emoji/google_classic/snake.png differ
diff --git a/public/images/emoji/google_classic/sneezing_face.png b/public/images/emoji/google_classic/sneezing_face.png
new file mode 100644
index 00000000000..719c040d238
Binary files /dev/null and b/public/images/emoji/google_classic/sneezing_face.png differ
diff --git a/public/images/emoji/google_classic/snow_capped_mountain.png b/public/images/emoji/google_classic/snow_capped_mountain.png
new file mode 100644
index 00000000000..edf4cc1286d
Binary files /dev/null and b/public/images/emoji/google_classic/snow_capped_mountain.png differ
diff --git a/public/images/emoji/google_classic/snowboarder.png b/public/images/emoji/google_classic/snowboarder.png
new file mode 100644
index 00000000000..ab3ca56d38b
Binary files /dev/null and b/public/images/emoji/google_classic/snowboarder.png differ
diff --git a/public/images/emoji/google_classic/snowflake.png b/public/images/emoji/google_classic/snowflake.png
new file mode 100644
index 00000000000..73164302202
Binary files /dev/null and b/public/images/emoji/google_classic/snowflake.png differ
diff --git a/public/images/emoji/google_classic/snowman.png b/public/images/emoji/google_classic/snowman.png
new file mode 100644
index 00000000000..00183b16001
Binary files /dev/null and b/public/images/emoji/google_classic/snowman.png differ
diff --git a/public/images/emoji/google_classic/snowman2.png b/public/images/emoji/google_classic/snowman2.png
new file mode 100644
index 00000000000..4355d9f0dbf
Binary files /dev/null and b/public/images/emoji/google_classic/snowman2.png differ
diff --git a/public/images/emoji/google_classic/snowman_with_snow.png b/public/images/emoji/google_classic/snowman_with_snow.png
new file mode 100644
index 00000000000..4355d9f0dbf
Binary files /dev/null and b/public/images/emoji/google_classic/snowman_with_snow.png differ
diff --git a/public/images/emoji/google_classic/sob.png b/public/images/emoji/google_classic/sob.png
new file mode 100644
index 00000000000..6a09064f502
Binary files /dev/null and b/public/images/emoji/google_classic/sob.png differ
diff --git a/public/images/emoji/google_classic/soccer.png b/public/images/emoji/google_classic/soccer.png
new file mode 100644
index 00000000000..df7c5c761e5
Binary files /dev/null and b/public/images/emoji/google_classic/soccer.png differ
diff --git a/public/images/emoji/google_classic/socks.png b/public/images/emoji/google_classic/socks.png
new file mode 100644
index 00000000000..8f2b9bbe9e3
Binary files /dev/null and b/public/images/emoji/google_classic/socks.png differ
diff --git a/public/images/emoji/google_classic/solomon_islands.png b/public/images/emoji/google_classic/solomon_islands.png
new file mode 100644
index 00000000000..748f64a0f71
Binary files /dev/null and b/public/images/emoji/google_classic/solomon_islands.png differ
diff --git a/public/images/emoji/google_classic/somalia.png b/public/images/emoji/google_classic/somalia.png
new file mode 100644
index 00000000000..e00bcacfa09
Binary files /dev/null and b/public/images/emoji/google_classic/somalia.png differ
diff --git a/public/images/emoji/google_classic/soon.png b/public/images/emoji/google_classic/soon.png
new file mode 100644
index 00000000000..bd0f84f54dc
Binary files /dev/null and b/public/images/emoji/google_classic/soon.png differ
diff --git a/public/images/emoji/google_classic/sos.png b/public/images/emoji/google_classic/sos.png
new file mode 100644
index 00000000000..5bbb147019f
Binary files /dev/null and b/public/images/emoji/google_classic/sos.png differ
diff --git a/public/images/emoji/google_classic/sound.png b/public/images/emoji/google_classic/sound.png
new file mode 100644
index 00000000000..8f71ff5db4a
Binary files /dev/null and b/public/images/emoji/google_classic/sound.png differ
diff --git a/public/images/emoji/google_classic/south_africa.png b/public/images/emoji/google_classic/south_africa.png
new file mode 100644
index 00000000000..0a5608999b2
Binary files /dev/null and b/public/images/emoji/google_classic/south_africa.png differ
diff --git a/public/images/emoji/google_classic/south_georgia_south_sandwich_islands.png b/public/images/emoji/google_classic/south_georgia_south_sandwich_islands.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/google_classic/south_sudan.png b/public/images/emoji/google_classic/south_sudan.png
new file mode 100644
index 00000000000..7527531406a
Binary files /dev/null and b/public/images/emoji/google_classic/south_sudan.png differ
diff --git a/public/images/emoji/google_classic/space_invader.png b/public/images/emoji/google_classic/space_invader.png
new file mode 100644
index 00000000000..f21cc087065
Binary files /dev/null and b/public/images/emoji/google_classic/space_invader.png differ
diff --git a/public/images/emoji/google_classic/spades.png b/public/images/emoji/google_classic/spades.png
new file mode 100644
index 00000000000..a140620266a
Binary files /dev/null and b/public/images/emoji/google_classic/spades.png differ
diff --git a/public/images/emoji/google_classic/spaghetti.png b/public/images/emoji/google_classic/spaghetti.png
new file mode 100644
index 00000000000..997ea8acbfe
Binary files /dev/null and b/public/images/emoji/google_classic/spaghetti.png differ
diff --git a/public/images/emoji/google_classic/sparkle.png b/public/images/emoji/google_classic/sparkle.png
new file mode 100644
index 00000000000..361cedcebde
Binary files /dev/null and b/public/images/emoji/google_classic/sparkle.png differ
diff --git a/public/images/emoji/google_classic/sparkler.png b/public/images/emoji/google_classic/sparkler.png
new file mode 100644
index 00000000000..530c91b32e6
Binary files /dev/null and b/public/images/emoji/google_classic/sparkler.png differ
diff --git a/public/images/emoji/google_classic/sparkles.png b/public/images/emoji/google_classic/sparkles.png
new file mode 100644
index 00000000000..de135381699
Binary files /dev/null and b/public/images/emoji/google_classic/sparkles.png differ
diff --git a/public/images/emoji/google_classic/sparkling_heart.png b/public/images/emoji/google_classic/sparkling_heart.png
new file mode 100644
index 00000000000..1668b2ee48f
Binary files /dev/null and b/public/images/emoji/google_classic/sparkling_heart.png differ
diff --git a/public/images/emoji/google_classic/speak_no_evil.png b/public/images/emoji/google_classic/speak_no_evil.png
new file mode 100644
index 00000000000..25251d6a325
Binary files /dev/null and b/public/images/emoji/google_classic/speak_no_evil.png differ
diff --git a/public/images/emoji/google_classic/speaker.png b/public/images/emoji/google_classic/speaker.png
new file mode 100644
index 00000000000..9a7704da045
Binary files /dev/null and b/public/images/emoji/google_classic/speaker.png differ
diff --git a/public/images/emoji/google_classic/speaking_head.png b/public/images/emoji/google_classic/speaking_head.png
new file mode 100644
index 00000000000..9345acae476
Binary files /dev/null and b/public/images/emoji/google_classic/speaking_head.png differ
diff --git a/public/images/emoji/google_classic/speaking_head_in_silhouette.png b/public/images/emoji/google_classic/speaking_head_in_silhouette.png
new file mode 100644
index 00000000000..9345acae476
Binary files /dev/null and b/public/images/emoji/google_classic/speaking_head_in_silhouette.png differ
diff --git a/public/images/emoji/google_classic/speech_balloon.png b/public/images/emoji/google_classic/speech_balloon.png
new file mode 100644
index 00000000000..3f01b30930e
Binary files /dev/null and b/public/images/emoji/google_classic/speech_balloon.png differ
diff --git a/public/images/emoji/google_classic/speedboat.png b/public/images/emoji/google_classic/speedboat.png
new file mode 100644
index 00000000000..4c6b86d8a9f
Binary files /dev/null and b/public/images/emoji/google_classic/speedboat.png differ
diff --git a/public/images/emoji/google_classic/spider.png b/public/images/emoji/google_classic/spider.png
new file mode 100644
index 00000000000..06da53a7377
Binary files /dev/null and b/public/images/emoji/google_classic/spider.png differ
diff --git a/public/images/emoji/google_classic/spider_web.png b/public/images/emoji/google_classic/spider_web.png
new file mode 100644
index 00000000000..163d2c89a08
Binary files /dev/null and b/public/images/emoji/google_classic/spider_web.png differ
diff --git a/public/images/emoji/google_classic/spiral_calendar.png b/public/images/emoji/google_classic/spiral_calendar.png
new file mode 100644
index 00000000000..4f13ffb5f76
Binary files /dev/null and b/public/images/emoji/google_classic/spiral_calendar.png differ
diff --git a/public/images/emoji/google_classic/spiral_calendar_pad.png b/public/images/emoji/google_classic/spiral_calendar_pad.png
new file mode 100644
index 00000000000..4f13ffb5f76
Binary files /dev/null and b/public/images/emoji/google_classic/spiral_calendar_pad.png differ
diff --git a/public/images/emoji/google_classic/spiral_note_pad.png b/public/images/emoji/google_classic/spiral_note_pad.png
new file mode 100644
index 00000000000..eb6853649e8
Binary files /dev/null and b/public/images/emoji/google_classic/spiral_note_pad.png differ
diff --git a/public/images/emoji/google_classic/spiral_notepad.png b/public/images/emoji/google_classic/spiral_notepad.png
new file mode 100644
index 00000000000..eb6853649e8
Binary files /dev/null and b/public/images/emoji/google_classic/spiral_notepad.png differ
diff --git a/public/images/emoji/google_classic/spoon.png b/public/images/emoji/google_classic/spoon.png
new file mode 100644
index 00000000000..94d5484a09d
Binary files /dev/null and b/public/images/emoji/google_classic/spoon.png differ
diff --git a/public/images/emoji/google_classic/sports_medal.png b/public/images/emoji/google_classic/sports_medal.png
new file mode 100644
index 00000000000..165827b17b6
Binary files /dev/null and b/public/images/emoji/google_classic/sports_medal.png differ
diff --git a/public/images/emoji/google_classic/spy.png b/public/images/emoji/google_classic/spy.png
new file mode 100644
index 00000000000..b76dce309bf
Binary files /dev/null and b/public/images/emoji/google_classic/spy.png differ
diff --git a/public/images/emoji/google_classic/spy/2.png b/public/images/emoji/google_classic/spy/2.png
new file mode 100644
index 00000000000..d7856fc1c54
Binary files /dev/null and b/public/images/emoji/google_classic/spy/2.png differ
diff --git a/public/images/emoji/google_classic/spy/3.png b/public/images/emoji/google_classic/spy/3.png
new file mode 100644
index 00000000000..7913646a104
Binary files /dev/null and b/public/images/emoji/google_classic/spy/3.png differ
diff --git a/public/images/emoji/google_classic/spy/4.png b/public/images/emoji/google_classic/spy/4.png
new file mode 100644
index 00000000000..69cb4974a6a
Binary files /dev/null and b/public/images/emoji/google_classic/spy/4.png differ
diff --git a/public/images/emoji/google_classic/spy/5.png b/public/images/emoji/google_classic/spy/5.png
new file mode 100644
index 00000000000..53d3133222c
Binary files /dev/null and b/public/images/emoji/google_classic/spy/5.png differ
diff --git a/public/images/emoji/google_classic/spy/6.png b/public/images/emoji/google_classic/spy/6.png
new file mode 100644
index 00000000000..d9d076168e7
Binary files /dev/null and b/public/images/emoji/google_classic/spy/6.png differ
diff --git a/public/images/emoji/google_classic/squid.png b/public/images/emoji/google_classic/squid.png
new file mode 100644
index 00000000000..4a366549a34
Binary files /dev/null and b/public/images/emoji/google_classic/squid.png differ
diff --git a/public/images/emoji/google_classic/sri_lanka.png b/public/images/emoji/google_classic/sri_lanka.png
new file mode 100644
index 00000000000..7ec2a340131
Binary files /dev/null and b/public/images/emoji/google_classic/sri_lanka.png differ
diff --git a/public/images/emoji/google_classic/st_barthelemy.png b/public/images/emoji/google_classic/st_barthelemy.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/st_barthelemy.png differ
diff --git a/public/images/emoji/google_classic/st_helena.png b/public/images/emoji/google_classic/st_helena.png
new file mode 100644
index 00000000000..bd0e800e950
Binary files /dev/null and b/public/images/emoji/google_classic/st_helena.png differ
diff --git a/public/images/emoji/google_classic/st_kitts_nevis.png b/public/images/emoji/google_classic/st_kitts_nevis.png
new file mode 100644
index 00000000000..6a2188ce3ee
Binary files /dev/null and b/public/images/emoji/google_classic/st_kitts_nevis.png differ
diff --git a/public/images/emoji/google_classic/st_lucia.png b/public/images/emoji/google_classic/st_lucia.png
new file mode 100644
index 00000000000..fadd1947368
Binary files /dev/null and b/public/images/emoji/google_classic/st_lucia.png differ
diff --git a/public/images/emoji/google_classic/st_martin.png b/public/images/emoji/google_classic/st_martin.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/st_martin.png differ
diff --git a/public/images/emoji/google_classic/st_pierre_miquelon.png b/public/images/emoji/google_classic/st_pierre_miquelon.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/google_classic/st_vincent_grenadines.png b/public/images/emoji/google_classic/st_vincent_grenadines.png
new file mode 100644
index 00000000000..641af67dfae
Binary files /dev/null and b/public/images/emoji/google_classic/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/google_classic/stadium.png b/public/images/emoji/google_classic/stadium.png
new file mode 100644
index 00000000000..4622a592467
Binary files /dev/null and b/public/images/emoji/google_classic/stadium.png differ
diff --git a/public/images/emoji/google_classic/star.png b/public/images/emoji/google_classic/star.png
new file mode 100644
index 00000000000..43d25e24b72
Binary files /dev/null and b/public/images/emoji/google_classic/star.png differ
diff --git a/public/images/emoji/google_classic/star2.png b/public/images/emoji/google_classic/star2.png
new file mode 100644
index 00000000000..791fa6a6774
Binary files /dev/null and b/public/images/emoji/google_classic/star2.png differ
diff --git a/public/images/emoji/google_classic/star_and_crescent.png b/public/images/emoji/google_classic/star_and_crescent.png
new file mode 100644
index 00000000000..cac758b4f24
Binary files /dev/null and b/public/images/emoji/google_classic/star_and_crescent.png differ
diff --git a/public/images/emoji/google_classic/star_of_david.png b/public/images/emoji/google_classic/star_of_david.png
new file mode 100644
index 00000000000..fcfaad6d0ea
Binary files /dev/null and b/public/images/emoji/google_classic/star_of_david.png differ
diff --git a/public/images/emoji/google_classic/star_struck.png b/public/images/emoji/google_classic/star_struck.png
new file mode 100644
index 00000000000..7da8183f394
Binary files /dev/null and b/public/images/emoji/google_classic/star_struck.png differ
diff --git a/public/images/emoji/google_classic/stars.png b/public/images/emoji/google_classic/stars.png
new file mode 100644
index 00000000000..c78acc9a3af
Binary files /dev/null and b/public/images/emoji/google_classic/stars.png differ
diff --git a/public/images/emoji/google_classic/station.png b/public/images/emoji/google_classic/station.png
new file mode 100644
index 00000000000..06ca9379d85
Binary files /dev/null and b/public/images/emoji/google_classic/station.png differ
diff --git a/public/images/emoji/google_classic/statue_of_liberty.png b/public/images/emoji/google_classic/statue_of_liberty.png
new file mode 100644
index 00000000000..f1e1ee69800
Binary files /dev/null and b/public/images/emoji/google_classic/statue_of_liberty.png differ
diff --git a/public/images/emoji/google_classic/steam_locomotive.png b/public/images/emoji/google_classic/steam_locomotive.png
new file mode 100644
index 00000000000..2963435eeee
Binary files /dev/null and b/public/images/emoji/google_classic/steam_locomotive.png differ
diff --git a/public/images/emoji/google_classic/stew.png b/public/images/emoji/google_classic/stew.png
new file mode 100644
index 00000000000..32435295c77
Binary files /dev/null and b/public/images/emoji/google_classic/stew.png differ
diff --git a/public/images/emoji/google_classic/stop_button.png b/public/images/emoji/google_classic/stop_button.png
new file mode 100644
index 00000000000..234329ee037
Binary files /dev/null and b/public/images/emoji/google_classic/stop_button.png differ
diff --git a/public/images/emoji/google_classic/stop_sign.png b/public/images/emoji/google_classic/stop_sign.png
new file mode 100644
index 00000000000..d9b8a830433
Binary files /dev/null and b/public/images/emoji/google_classic/stop_sign.png differ
diff --git a/public/images/emoji/google_classic/stopwatch.png b/public/images/emoji/google_classic/stopwatch.png
new file mode 100644
index 00000000000..7bed0afec8f
Binary files /dev/null and b/public/images/emoji/google_classic/stopwatch.png differ
diff --git a/public/images/emoji/google_classic/straight_ruler.png b/public/images/emoji/google_classic/straight_ruler.png
new file mode 100644
index 00000000000..b9223766a47
Binary files /dev/null and b/public/images/emoji/google_classic/straight_ruler.png differ
diff --git a/public/images/emoji/google_classic/strawberry.png b/public/images/emoji/google_classic/strawberry.png
new file mode 100644
index 00000000000..c48630c28f1
Binary files /dev/null and b/public/images/emoji/google_classic/strawberry.png differ
diff --git a/public/images/emoji/google_classic/stuck_out_tongue.png b/public/images/emoji/google_classic/stuck_out_tongue.png
new file mode 100644
index 00000000000..88cfa38ee25
Binary files /dev/null and b/public/images/emoji/google_classic/stuck_out_tongue.png differ
diff --git a/public/images/emoji/google_classic/stuck_out_tongue_closed_eyes.png b/public/images/emoji/google_classic/stuck_out_tongue_closed_eyes.png
new file mode 100644
index 00000000000..c70ce93270b
Binary files /dev/null and b/public/images/emoji/google_classic/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/google_classic/stuck_out_tongue_winking_eye.png b/public/images/emoji/google_classic/stuck_out_tongue_winking_eye.png
new file mode 100644
index 00000000000..98febc1f235
Binary files /dev/null and b/public/images/emoji/google_classic/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/google_classic/studio_microphone.png b/public/images/emoji/google_classic/studio_microphone.png
new file mode 100644
index 00000000000..bb2539903b9
Binary files /dev/null and b/public/images/emoji/google_classic/studio_microphone.png differ
diff --git a/public/images/emoji/google_classic/stuffed_flatbread.png b/public/images/emoji/google_classic/stuffed_flatbread.png
new file mode 100644
index 00000000000..82c827db39a
Binary files /dev/null and b/public/images/emoji/google_classic/stuffed_flatbread.png differ
diff --git a/public/images/emoji/google_classic/sudan.png b/public/images/emoji/google_classic/sudan.png
new file mode 100644
index 00000000000..00fa26cb543
Binary files /dev/null and b/public/images/emoji/google_classic/sudan.png differ
diff --git a/public/images/emoji/google_classic/sun_behind_large_cloud.png b/public/images/emoji/google_classic/sun_behind_large_cloud.png
new file mode 100644
index 00000000000..43f98996984
Binary files /dev/null and b/public/images/emoji/google_classic/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/google_classic/sun_behind_rain_cloud.png b/public/images/emoji/google_classic/sun_behind_rain_cloud.png
new file mode 100644
index 00000000000..1ef8a371472
Binary files /dev/null and b/public/images/emoji/google_classic/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/google_classic/sun_behind_small_cloud.png b/public/images/emoji/google_classic/sun_behind_small_cloud.png
new file mode 100644
index 00000000000..6a432e0db9d
Binary files /dev/null and b/public/images/emoji/google_classic/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/google_classic/sun_with_face.png b/public/images/emoji/google_classic/sun_with_face.png
new file mode 100644
index 00000000000..9471e1cf426
Binary files /dev/null and b/public/images/emoji/google_classic/sun_with_face.png differ
diff --git a/public/images/emoji/google_classic/sunflower.png b/public/images/emoji/google_classic/sunflower.png
new file mode 100644
index 00000000000..1ffc2c9cfd6
Binary files /dev/null and b/public/images/emoji/google_classic/sunflower.png differ
diff --git a/public/images/emoji/google_classic/sunglasses.png b/public/images/emoji/google_classic/sunglasses.png
new file mode 100644
index 00000000000..fdecf03f7ce
Binary files /dev/null and b/public/images/emoji/google_classic/sunglasses.png differ
diff --git a/public/images/emoji/google_classic/sunny.png b/public/images/emoji/google_classic/sunny.png
new file mode 100644
index 00000000000..b749ef2ee04
Binary files /dev/null and b/public/images/emoji/google_classic/sunny.png differ
diff --git a/public/images/emoji/google_classic/sunrise.png b/public/images/emoji/google_classic/sunrise.png
new file mode 100644
index 00000000000..dbad3698a8b
Binary files /dev/null and b/public/images/emoji/google_classic/sunrise.png differ
diff --git a/public/images/emoji/google_classic/sunrise_over_mountains.png b/public/images/emoji/google_classic/sunrise_over_mountains.png
new file mode 100644
index 00000000000..6e9ec1b0015
Binary files /dev/null and b/public/images/emoji/google_classic/sunrise_over_mountains.png differ
diff --git a/public/images/emoji/google_classic/surfer.png b/public/images/emoji/google_classic/surfer.png
new file mode 100644
index 00000000000..f5e6d0425f2
Binary files /dev/null and b/public/images/emoji/google_classic/surfer.png differ
diff --git a/public/images/emoji/google_classic/surfer/2.png b/public/images/emoji/google_classic/surfer/2.png
new file mode 100644
index 00000000000..0bf7f578ce3
Binary files /dev/null and b/public/images/emoji/google_classic/surfer/2.png differ
diff --git a/public/images/emoji/google_classic/surfer/3.png b/public/images/emoji/google_classic/surfer/3.png
new file mode 100644
index 00000000000..29541aa01f3
Binary files /dev/null and b/public/images/emoji/google_classic/surfer/3.png differ
diff --git a/public/images/emoji/google_classic/surfer/4.png b/public/images/emoji/google_classic/surfer/4.png
new file mode 100644
index 00000000000..cab4b2498c4
Binary files /dev/null and b/public/images/emoji/google_classic/surfer/4.png differ
diff --git a/public/images/emoji/google_classic/surfer/5.png b/public/images/emoji/google_classic/surfer/5.png
new file mode 100644
index 00000000000..833b5ffeaa1
Binary files /dev/null and b/public/images/emoji/google_classic/surfer/5.png differ
diff --git a/public/images/emoji/google_classic/surfer/6.png b/public/images/emoji/google_classic/surfer/6.png
new file mode 100644
index 00000000000..c9badaff42c
Binary files /dev/null and b/public/images/emoji/google_classic/surfer/6.png differ
diff --git a/public/images/emoji/google_classic/surfing_man.png b/public/images/emoji/google_classic/surfing_man.png
new file mode 100644
index 00000000000..f5e6d0425f2
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_man.png differ
diff --git a/public/images/emoji/google_classic/surfing_man/2.png b/public/images/emoji/google_classic/surfing_man/2.png
new file mode 100644
index 00000000000..0bf7f578ce3
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_man/2.png differ
diff --git a/public/images/emoji/google_classic/surfing_man/3.png b/public/images/emoji/google_classic/surfing_man/3.png
new file mode 100644
index 00000000000..29541aa01f3
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_man/3.png differ
diff --git a/public/images/emoji/google_classic/surfing_man/4.png b/public/images/emoji/google_classic/surfing_man/4.png
new file mode 100644
index 00000000000..cab4b2498c4
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_man/4.png differ
diff --git a/public/images/emoji/google_classic/surfing_man/5.png b/public/images/emoji/google_classic/surfing_man/5.png
new file mode 100644
index 00000000000..833b5ffeaa1
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_man/5.png differ
diff --git a/public/images/emoji/google_classic/surfing_man/6.png b/public/images/emoji/google_classic/surfing_man/6.png
new file mode 100644
index 00000000000..c9badaff42c
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_man/6.png differ
diff --git a/public/images/emoji/google_classic/surfing_woman.png b/public/images/emoji/google_classic/surfing_woman.png
new file mode 100644
index 00000000000..a743be6a9e7
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_woman.png differ
diff --git a/public/images/emoji/google_classic/surfing_woman/2.png b/public/images/emoji/google_classic/surfing_woman/2.png
new file mode 100644
index 00000000000..1876c4c5437
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_woman/2.png differ
diff --git a/public/images/emoji/google_classic/surfing_woman/3.png b/public/images/emoji/google_classic/surfing_woman/3.png
new file mode 100644
index 00000000000..974b21fb986
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_woman/3.png differ
diff --git a/public/images/emoji/google_classic/surfing_woman/4.png b/public/images/emoji/google_classic/surfing_woman/4.png
new file mode 100644
index 00000000000..025f8aeb94d
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_woman/4.png differ
diff --git a/public/images/emoji/google_classic/surfing_woman/5.png b/public/images/emoji/google_classic/surfing_woman/5.png
new file mode 100644
index 00000000000..29d3c090893
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_woman/5.png differ
diff --git a/public/images/emoji/google_classic/surfing_woman/6.png b/public/images/emoji/google_classic/surfing_woman/6.png
new file mode 100644
index 00000000000..c6924bd02fe
Binary files /dev/null and b/public/images/emoji/google_classic/surfing_woman/6.png differ
diff --git a/public/images/emoji/google_classic/suriname.png b/public/images/emoji/google_classic/suriname.png
new file mode 100644
index 00000000000..8b5e349ac70
Binary files /dev/null and b/public/images/emoji/google_classic/suriname.png differ
diff --git a/public/images/emoji/google_classic/sushi.png b/public/images/emoji/google_classic/sushi.png
new file mode 100644
index 00000000000..7088a32456a
Binary files /dev/null and b/public/images/emoji/google_classic/sushi.png differ
diff --git a/public/images/emoji/google_classic/sushing_face.png b/public/images/emoji/google_classic/sushing_face.png
new file mode 100644
index 00000000000..e4427cbd153
Binary files /dev/null and b/public/images/emoji/google_classic/sushing_face.png differ
diff --git a/public/images/emoji/google_classic/suspension_railway.png b/public/images/emoji/google_classic/suspension_railway.png
new file mode 100644
index 00000000000..61a177788fc
Binary files /dev/null and b/public/images/emoji/google_classic/suspension_railway.png differ
diff --git a/public/images/emoji/google_classic/svalbard_and_jan_mayen.png b/public/images/emoji/google_classic/svalbard_and_jan_mayen.png
new file mode 100644
index 00000000000..4e8756eef8f
Binary files /dev/null and b/public/images/emoji/google_classic/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/google_classic/swaziland.png b/public/images/emoji/google_classic/swaziland.png
new file mode 100644
index 00000000000..b4ae31475d3
Binary files /dev/null and b/public/images/emoji/google_classic/swaziland.png differ
diff --git a/public/images/emoji/google_classic/sweat.png b/public/images/emoji/google_classic/sweat.png
new file mode 100644
index 00000000000..cf08e685ea7
Binary files /dev/null and b/public/images/emoji/google_classic/sweat.png differ
diff --git a/public/images/emoji/google_classic/sweat_drops.png b/public/images/emoji/google_classic/sweat_drops.png
new file mode 100644
index 00000000000..0f439023b46
Binary files /dev/null and b/public/images/emoji/google_classic/sweat_drops.png differ
diff --git a/public/images/emoji/google_classic/sweat_smile.png b/public/images/emoji/google_classic/sweat_smile.png
new file mode 100644
index 00000000000..b9ece4b9359
Binary files /dev/null and b/public/images/emoji/google_classic/sweat_smile.png differ
diff --git a/public/images/emoji/google_classic/sweden.png b/public/images/emoji/google_classic/sweden.png
new file mode 100644
index 00000000000..8b366b27a99
Binary files /dev/null and b/public/images/emoji/google_classic/sweden.png differ
diff --git a/public/images/emoji/google_classic/sweet_potato.png b/public/images/emoji/google_classic/sweet_potato.png
new file mode 100644
index 00000000000..6657f153b13
Binary files /dev/null and b/public/images/emoji/google_classic/sweet_potato.png differ
diff --git a/public/images/emoji/google_classic/swimmer.png b/public/images/emoji/google_classic/swimmer.png
new file mode 100644
index 00000000000..cef0659d366
Binary files /dev/null and b/public/images/emoji/google_classic/swimmer.png differ
diff --git a/public/images/emoji/google_classic/swimmer/2.png b/public/images/emoji/google_classic/swimmer/2.png
new file mode 100644
index 00000000000..4b05eae811c
Binary files /dev/null and b/public/images/emoji/google_classic/swimmer/2.png differ
diff --git a/public/images/emoji/google_classic/swimmer/3.png b/public/images/emoji/google_classic/swimmer/3.png
new file mode 100644
index 00000000000..e6609b3b2a8
Binary files /dev/null and b/public/images/emoji/google_classic/swimmer/3.png differ
diff --git a/public/images/emoji/google_classic/swimmer/4.png b/public/images/emoji/google_classic/swimmer/4.png
new file mode 100644
index 00000000000..a201e7be68b
Binary files /dev/null and b/public/images/emoji/google_classic/swimmer/4.png differ
diff --git a/public/images/emoji/google_classic/swimmer/5.png b/public/images/emoji/google_classic/swimmer/5.png
new file mode 100644
index 00000000000..f5dc287c86b
Binary files /dev/null and b/public/images/emoji/google_classic/swimmer/5.png differ
diff --git a/public/images/emoji/google_classic/swimmer/6.png b/public/images/emoji/google_classic/swimmer/6.png
new file mode 100644
index 00000000000..b88627894d5
Binary files /dev/null and b/public/images/emoji/google_classic/swimmer/6.png differ
diff --git a/public/images/emoji/google_classic/swimming_man.png b/public/images/emoji/google_classic/swimming_man.png
new file mode 100644
index 00000000000..cef0659d366
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_man.png differ
diff --git a/public/images/emoji/google_classic/swimming_man/2.png b/public/images/emoji/google_classic/swimming_man/2.png
new file mode 100644
index 00000000000..4b05eae811c
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_man/2.png differ
diff --git a/public/images/emoji/google_classic/swimming_man/3.png b/public/images/emoji/google_classic/swimming_man/3.png
new file mode 100644
index 00000000000..e6609b3b2a8
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_man/3.png differ
diff --git a/public/images/emoji/google_classic/swimming_man/4.png b/public/images/emoji/google_classic/swimming_man/4.png
new file mode 100644
index 00000000000..a201e7be68b
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_man/4.png differ
diff --git a/public/images/emoji/google_classic/swimming_man/5.png b/public/images/emoji/google_classic/swimming_man/5.png
new file mode 100644
index 00000000000..f5dc287c86b
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_man/5.png differ
diff --git a/public/images/emoji/google_classic/swimming_man/6.png b/public/images/emoji/google_classic/swimming_man/6.png
new file mode 100644
index 00000000000..b88627894d5
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_man/6.png differ
diff --git a/public/images/emoji/google_classic/swimming_woman.png b/public/images/emoji/google_classic/swimming_woman.png
new file mode 100644
index 00000000000..f03d8971632
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_woman.png differ
diff --git a/public/images/emoji/google_classic/swimming_woman/2.png b/public/images/emoji/google_classic/swimming_woman/2.png
new file mode 100644
index 00000000000..f02d849a525
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_woman/2.png differ
diff --git a/public/images/emoji/google_classic/swimming_woman/3.png b/public/images/emoji/google_classic/swimming_woman/3.png
new file mode 100644
index 00000000000..1fd64825d87
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_woman/3.png differ
diff --git a/public/images/emoji/google_classic/swimming_woman/4.png b/public/images/emoji/google_classic/swimming_woman/4.png
new file mode 100644
index 00000000000..3df68f23129
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_woman/4.png differ
diff --git a/public/images/emoji/google_classic/swimming_woman/5.png b/public/images/emoji/google_classic/swimming_woman/5.png
new file mode 100644
index 00000000000..50d7464eca1
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_woman/5.png differ
diff --git a/public/images/emoji/google_classic/swimming_woman/6.png b/public/images/emoji/google_classic/swimming_woman/6.png
new file mode 100644
index 00000000000..4e152536d8e
Binary files /dev/null and b/public/images/emoji/google_classic/swimming_woman/6.png differ
diff --git a/public/images/emoji/google_classic/switzerland.png b/public/images/emoji/google_classic/switzerland.png
new file mode 100644
index 00000000000..3edab9621c5
Binary files /dev/null and b/public/images/emoji/google_classic/switzerland.png differ
diff --git a/public/images/emoji/google_classic/symbols.png b/public/images/emoji/google_classic/symbols.png
new file mode 100644
index 00000000000..03905490d1b
Binary files /dev/null and b/public/images/emoji/google_classic/symbols.png differ
diff --git a/public/images/emoji/google_classic/synagogue.png b/public/images/emoji/google_classic/synagogue.png
new file mode 100644
index 00000000000..e244775095c
Binary files /dev/null and b/public/images/emoji/google_classic/synagogue.png differ
diff --git a/public/images/emoji/google_classic/syria.png b/public/images/emoji/google_classic/syria.png
new file mode 100644
index 00000000000..0053ad26669
Binary files /dev/null and b/public/images/emoji/google_classic/syria.png differ
diff --git a/public/images/emoji/google_classic/syringe.png b/public/images/emoji/google_classic/syringe.png
new file mode 100644
index 00000000000..9dcffbb44be
Binary files /dev/null and b/public/images/emoji/google_classic/syringe.png differ
diff --git a/public/images/emoji/google_classic/t_rex.png b/public/images/emoji/google_classic/t_rex.png
new file mode 100644
index 00000000000..d8811a56382
Binary files /dev/null and b/public/images/emoji/google_classic/t_rex.png differ
diff --git a/public/images/emoji/google_classic/table_tennis.png b/public/images/emoji/google_classic/table_tennis.png
new file mode 100644
index 00000000000..e43ef813b10
Binary files /dev/null and b/public/images/emoji/google_classic/table_tennis.png differ
diff --git a/public/images/emoji/google_classic/taco.png b/public/images/emoji/google_classic/taco.png
new file mode 100644
index 00000000000..d1234bb4b96
Binary files /dev/null and b/public/images/emoji/google_classic/taco.png differ
diff --git a/public/images/emoji/google_classic/tada.png b/public/images/emoji/google_classic/tada.png
new file mode 100644
index 00000000000..ba7765bc596
Binary files /dev/null and b/public/images/emoji/google_classic/tada.png differ
diff --git a/public/images/emoji/google_classic/taiwan.png b/public/images/emoji/google_classic/taiwan.png
new file mode 100644
index 00000000000..78f6a0bf96d
Binary files /dev/null and b/public/images/emoji/google_classic/taiwan.png differ
diff --git a/public/images/emoji/google_classic/tajikistan.png b/public/images/emoji/google_classic/tajikistan.png
new file mode 100644
index 00000000000..bba0b62472f
Binary files /dev/null and b/public/images/emoji/google_classic/tajikistan.png differ
diff --git a/public/images/emoji/google_classic/takeout_box.png b/public/images/emoji/google_classic/takeout_box.png
new file mode 100644
index 00000000000..08aa6a4843f
Binary files /dev/null and b/public/images/emoji/google_classic/takeout_box.png differ
diff --git a/public/images/emoji/google_classic/tanabata_tree.png b/public/images/emoji/google_classic/tanabata_tree.png
new file mode 100644
index 00000000000..ff84cf3996a
Binary files /dev/null and b/public/images/emoji/google_classic/tanabata_tree.png differ
diff --git a/public/images/emoji/google_classic/tangerine.png b/public/images/emoji/google_classic/tangerine.png
new file mode 100644
index 00000000000..45a5ecd2af2
Binary files /dev/null and b/public/images/emoji/google_classic/tangerine.png differ
diff --git a/public/images/emoji/google_classic/tanzania.png b/public/images/emoji/google_classic/tanzania.png
new file mode 100644
index 00000000000..e297d515023
Binary files /dev/null and b/public/images/emoji/google_classic/tanzania.png differ
diff --git a/public/images/emoji/google_classic/taurus.png b/public/images/emoji/google_classic/taurus.png
new file mode 100644
index 00000000000..36ef13a8323
Binary files /dev/null and b/public/images/emoji/google_classic/taurus.png differ
diff --git a/public/images/emoji/google_classic/taxi.png b/public/images/emoji/google_classic/taxi.png
new file mode 100644
index 00000000000..2635768f55f
Binary files /dev/null and b/public/images/emoji/google_classic/taxi.png differ
diff --git a/public/images/emoji/google_classic/tea.png b/public/images/emoji/google_classic/tea.png
new file mode 100644
index 00000000000..d312f046023
Binary files /dev/null and b/public/images/emoji/google_classic/tea.png differ
diff --git a/public/images/emoji/google_classic/telephone.png b/public/images/emoji/google_classic/telephone.png
new file mode 100644
index 00000000000..a456c17db5f
Binary files /dev/null and b/public/images/emoji/google_classic/telephone.png differ
diff --git a/public/images/emoji/google_classic/telephone_receiver.png b/public/images/emoji/google_classic/telephone_receiver.png
new file mode 100644
index 00000000000..62d5834fd2f
Binary files /dev/null and b/public/images/emoji/google_classic/telephone_receiver.png differ
diff --git a/public/images/emoji/google_classic/telescope.png b/public/images/emoji/google_classic/telescope.png
new file mode 100644
index 00000000000..1a61e8d5082
Binary files /dev/null and b/public/images/emoji/google_classic/telescope.png differ
diff --git a/public/images/emoji/google_classic/ten.png b/public/images/emoji/google_classic/ten.png
new file mode 100644
index 00000000000..6690db7bc30
Binary files /dev/null and b/public/images/emoji/google_classic/ten.png differ
diff --git a/public/images/emoji/google_classic/tennis.png b/public/images/emoji/google_classic/tennis.png
new file mode 100644
index 00000000000..673da9bd812
Binary files /dev/null and b/public/images/emoji/google_classic/tennis.png differ
diff --git a/public/images/emoji/google_classic/tent.png b/public/images/emoji/google_classic/tent.png
new file mode 100644
index 00000000000..99f7a6ef5e1
Binary files /dev/null and b/public/images/emoji/google_classic/tent.png differ
diff --git a/public/images/emoji/google_classic/thailand.png b/public/images/emoji/google_classic/thailand.png
new file mode 100644
index 00000000000..f67c722eb9a
Binary files /dev/null and b/public/images/emoji/google_classic/thailand.png differ
diff --git a/public/images/emoji/google_classic/thermometer.png b/public/images/emoji/google_classic/thermometer.png
new file mode 100644
index 00000000000..1d55d4f631e
Binary files /dev/null and b/public/images/emoji/google_classic/thermometer.png differ
diff --git a/public/images/emoji/google_classic/thermometer_face.png b/public/images/emoji/google_classic/thermometer_face.png
new file mode 100644
index 00000000000..3a7ba22f8ea
Binary files /dev/null and b/public/images/emoji/google_classic/thermometer_face.png differ
diff --git a/public/images/emoji/google_classic/thinking.png b/public/images/emoji/google_classic/thinking.png
new file mode 100644
index 00000000000..1858262d956
Binary files /dev/null and b/public/images/emoji/google_classic/thinking.png differ
diff --git a/public/images/emoji/google_classic/thinking_face.png b/public/images/emoji/google_classic/thinking_face.png
new file mode 100644
index 00000000000..1858262d956
Binary files /dev/null and b/public/images/emoji/google_classic/thinking_face.png differ
diff --git a/public/images/emoji/google_classic/thought_balloon.png b/public/images/emoji/google_classic/thought_balloon.png
new file mode 100644
index 00000000000..67340603ea7
Binary files /dev/null and b/public/images/emoji/google_classic/thought_balloon.png differ
diff --git a/public/images/emoji/google_classic/three.png b/public/images/emoji/google_classic/three.png
new file mode 100644
index 00000000000..0eb09acc5be
Binary files /dev/null and b/public/images/emoji/google_classic/three.png differ
diff --git a/public/images/emoji/google_classic/three_button_mouse.png b/public/images/emoji/google_classic/three_button_mouse.png
new file mode 100644
index 00000000000..220ef6486c1
Binary files /dev/null and b/public/images/emoji/google_classic/three_button_mouse.png differ
diff --git a/public/images/emoji/google_classic/thumbsdown.png b/public/images/emoji/google_classic/thumbsdown.png
new file mode 100644
index 00000000000..8203a027e11
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsdown.png differ
diff --git a/public/images/emoji/google_classic/thumbsdown/2.png b/public/images/emoji/google_classic/thumbsdown/2.png
new file mode 100644
index 00000000000..d4c3fa91cc0
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsdown/2.png differ
diff --git a/public/images/emoji/google_classic/thumbsdown/3.png b/public/images/emoji/google_classic/thumbsdown/3.png
new file mode 100644
index 00000000000..db75861b6ce
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsdown/3.png differ
diff --git a/public/images/emoji/google_classic/thumbsdown/4.png b/public/images/emoji/google_classic/thumbsdown/4.png
new file mode 100644
index 00000000000..758c7116736
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsdown/4.png differ
diff --git a/public/images/emoji/google_classic/thumbsdown/5.png b/public/images/emoji/google_classic/thumbsdown/5.png
new file mode 100644
index 00000000000..ed22fa28152
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsdown/5.png differ
diff --git a/public/images/emoji/google_classic/thumbsdown/6.png b/public/images/emoji/google_classic/thumbsdown/6.png
new file mode 100644
index 00000000000..030635f69ce
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsdown/6.png differ
diff --git a/public/images/emoji/google_classic/thumbsup.png b/public/images/emoji/google_classic/thumbsup.png
new file mode 100644
index 00000000000..bf0f4e543ad
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsup.png differ
diff --git a/public/images/emoji/google_classic/thumbsup/2.png b/public/images/emoji/google_classic/thumbsup/2.png
new file mode 100644
index 00000000000..19b31d1cebc
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsup/2.png differ
diff --git a/public/images/emoji/google_classic/thumbsup/3.png b/public/images/emoji/google_classic/thumbsup/3.png
new file mode 100644
index 00000000000..9d4dffd10f6
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsup/3.png differ
diff --git a/public/images/emoji/google_classic/thumbsup/4.png b/public/images/emoji/google_classic/thumbsup/4.png
new file mode 100644
index 00000000000..92ab6353c19
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsup/4.png differ
diff --git a/public/images/emoji/google_classic/thumbsup/5.png b/public/images/emoji/google_classic/thumbsup/5.png
new file mode 100644
index 00000000000..888e5578ec4
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsup/5.png differ
diff --git a/public/images/emoji/google_classic/thumbsup/6.png b/public/images/emoji/google_classic/thumbsup/6.png
new file mode 100644
index 00000000000..f4912e85b2d
Binary files /dev/null and b/public/images/emoji/google_classic/thumbsup/6.png differ
diff --git a/public/images/emoji/google_classic/thunder_cloud_and_rain.png b/public/images/emoji/google_classic/thunder_cloud_and_rain.png
new file mode 100644
index 00000000000..ea9bc1ea2e5
Binary files /dev/null and b/public/images/emoji/google_classic/thunder_cloud_and_rain.png differ
diff --git a/public/images/emoji/google_classic/thunder_cloud_rain.png b/public/images/emoji/google_classic/thunder_cloud_rain.png
new file mode 100644
index 00000000000..ea9bc1ea2e5
Binary files /dev/null and b/public/images/emoji/google_classic/thunder_cloud_rain.png differ
diff --git a/public/images/emoji/google_classic/ticket.png b/public/images/emoji/google_classic/ticket.png
new file mode 100644
index 00000000000..f7cdc8af145
Binary files /dev/null and b/public/images/emoji/google_classic/ticket.png differ
diff --git a/public/images/emoji/google_classic/tickets.png b/public/images/emoji/google_classic/tickets.png
new file mode 100644
index 00000000000..959ba48a2d2
Binary files /dev/null and b/public/images/emoji/google_classic/tickets.png differ
diff --git a/public/images/emoji/google_classic/tiger.png b/public/images/emoji/google_classic/tiger.png
new file mode 100644
index 00000000000..30d3f60e3f6
Binary files /dev/null and b/public/images/emoji/google_classic/tiger.png differ
diff --git a/public/images/emoji/google_classic/tiger2.png b/public/images/emoji/google_classic/tiger2.png
new file mode 100644
index 00000000000..69fc916af46
Binary files /dev/null and b/public/images/emoji/google_classic/tiger2.png differ
diff --git a/public/images/emoji/google_classic/timer.png b/public/images/emoji/google_classic/timer.png
new file mode 100644
index 00000000000..9ec0b3e7b92
Binary files /dev/null and b/public/images/emoji/google_classic/timer.png differ
diff --git a/public/images/emoji/google_classic/timer_clock.png b/public/images/emoji/google_classic/timer_clock.png
new file mode 100644
index 00000000000..9ec0b3e7b92
Binary files /dev/null and b/public/images/emoji/google_classic/timer_clock.png differ
diff --git a/public/images/emoji/google_classic/timor_leste.png b/public/images/emoji/google_classic/timor_leste.png
new file mode 100644
index 00000000000..e41e8708431
Binary files /dev/null and b/public/images/emoji/google_classic/timor_leste.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_man.png b/public/images/emoji/google_classic/tipping_hand_man.png
new file mode 100644
index 00000000000..f5ee017e120
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_man.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_man/2.png b/public/images/emoji/google_classic/tipping_hand_man/2.png
new file mode 100644
index 00000000000..437295715f1
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_man/3.png b/public/images/emoji/google_classic/tipping_hand_man/3.png
new file mode 100644
index 00000000000..85da8641801
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_man/4.png b/public/images/emoji/google_classic/tipping_hand_man/4.png
new file mode 100644
index 00000000000..5743a1586c9
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_man/5.png b/public/images/emoji/google_classic/tipping_hand_man/5.png
new file mode 100644
index 00000000000..786799a4456
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_man/6.png b/public/images/emoji/google_classic/tipping_hand_man/6.png
new file mode 100644
index 00000000000..1b737304e77
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_woman.png b/public/images/emoji/google_classic/tipping_hand_woman.png
new file mode 100644
index 00000000000..3d4361ed65e
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_woman.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_woman/2.png b/public/images/emoji/google_classic/tipping_hand_woman/2.png
new file mode 100644
index 00000000000..79cc5893c36
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_woman/3.png b/public/images/emoji/google_classic/tipping_hand_woman/3.png
new file mode 100644
index 00000000000..73e64b5f361
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_woman/4.png b/public/images/emoji/google_classic/tipping_hand_woman/4.png
new file mode 100644
index 00000000000..2f6ce066145
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_woman/5.png b/public/images/emoji/google_classic/tipping_hand_woman/5.png
new file mode 100644
index 00000000000..b86a70b3fb6
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/google_classic/tipping_hand_woman/6.png b/public/images/emoji/google_classic/tipping_hand_woman/6.png
new file mode 100644
index 00000000000..dafc8a1ac0e
Binary files /dev/null and b/public/images/emoji/google_classic/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/google_classic/tired_face.png b/public/images/emoji/google_classic/tired_face.png
new file mode 100644
index 00000000000..acf6f96ad84
Binary files /dev/null and b/public/images/emoji/google_classic/tired_face.png differ
diff --git a/public/images/emoji/google_classic/tm.png b/public/images/emoji/google_classic/tm.png
new file mode 100644
index 00000000000..c5338782acb
Binary files /dev/null and b/public/images/emoji/google_classic/tm.png differ
diff --git a/public/images/emoji/google_classic/togo.png b/public/images/emoji/google_classic/togo.png
new file mode 100644
index 00000000000..f7c34caa483
Binary files /dev/null and b/public/images/emoji/google_classic/togo.png differ
diff --git a/public/images/emoji/google_classic/toilet.png b/public/images/emoji/google_classic/toilet.png
new file mode 100644
index 00000000000..0e499703dd2
Binary files /dev/null and b/public/images/emoji/google_classic/toilet.png differ
diff --git a/public/images/emoji/google_classic/tokelau.png b/public/images/emoji/google_classic/tokelau.png
new file mode 100644
index 00000000000..7348e7e1762
Binary files /dev/null and b/public/images/emoji/google_classic/tokelau.png differ
diff --git a/public/images/emoji/google_classic/tokyo_tower.png b/public/images/emoji/google_classic/tokyo_tower.png
new file mode 100644
index 00000000000..380a4ab4a57
Binary files /dev/null and b/public/images/emoji/google_classic/tokyo_tower.png differ
diff --git a/public/images/emoji/google_classic/tomato.png b/public/images/emoji/google_classic/tomato.png
new file mode 100644
index 00000000000..8f3b553b8e3
Binary files /dev/null and b/public/images/emoji/google_classic/tomato.png differ
diff --git a/public/images/emoji/google_classic/tonga.png b/public/images/emoji/google_classic/tonga.png
new file mode 100644
index 00000000000..3a43dc1c4d6
Binary files /dev/null and b/public/images/emoji/google_classic/tonga.png differ
diff --git a/public/images/emoji/google_classic/tongue.png b/public/images/emoji/google_classic/tongue.png
new file mode 100644
index 00000000000..aa8a7fc5f12
Binary files /dev/null and b/public/images/emoji/google_classic/tongue.png differ
diff --git a/public/images/emoji/google_classic/tools.png b/public/images/emoji/google_classic/tools.png
new file mode 100644
index 00000000000..1be385628fb
Binary files /dev/null and b/public/images/emoji/google_classic/tools.png differ
diff --git a/public/images/emoji/google_classic/top.png b/public/images/emoji/google_classic/top.png
new file mode 100644
index 00000000000..7fd84ae9c86
Binary files /dev/null and b/public/images/emoji/google_classic/top.png differ
diff --git a/public/images/emoji/google_classic/tophat.png b/public/images/emoji/google_classic/tophat.png
new file mode 100644
index 00000000000..732d52bdec6
Binary files /dev/null and b/public/images/emoji/google_classic/tophat.png differ
diff --git a/public/images/emoji/google_classic/tornado.png b/public/images/emoji/google_classic/tornado.png
new file mode 100644
index 00000000000..fb8684e1cec
Binary files /dev/null and b/public/images/emoji/google_classic/tornado.png differ
diff --git a/public/images/emoji/google_classic/tr.png b/public/images/emoji/google_classic/tr.png
new file mode 100644
index 00000000000..a004857f487
Binary files /dev/null and b/public/images/emoji/google_classic/tr.png differ
diff --git a/public/images/emoji/google_classic/track_next.png b/public/images/emoji/google_classic/track_next.png
new file mode 100644
index 00000000000..8fa069d5783
Binary files /dev/null and b/public/images/emoji/google_classic/track_next.png differ
diff --git a/public/images/emoji/google_classic/track_previous.png b/public/images/emoji/google_classic/track_previous.png
new file mode 100644
index 00000000000..0ef5600a450
Binary files /dev/null and b/public/images/emoji/google_classic/track_previous.png differ
diff --git a/public/images/emoji/google_classic/trackball.png b/public/images/emoji/google_classic/trackball.png
new file mode 100644
index 00000000000..edf41b6a6e5
Binary files /dev/null and b/public/images/emoji/google_classic/trackball.png differ
diff --git a/public/images/emoji/google_classic/tractor.png b/public/images/emoji/google_classic/tractor.png
new file mode 100644
index 00000000000..98d6ece6ea3
Binary files /dev/null and b/public/images/emoji/google_classic/tractor.png differ
diff --git a/public/images/emoji/google_classic/traffic_light.png b/public/images/emoji/google_classic/traffic_light.png
new file mode 100644
index 00000000000..f9da859d081
Binary files /dev/null and b/public/images/emoji/google_classic/traffic_light.png differ
diff --git a/public/images/emoji/google_classic/train.png b/public/images/emoji/google_classic/train.png
new file mode 100644
index 00000000000..3e79fb1b6e8
Binary files /dev/null and b/public/images/emoji/google_classic/train.png differ
diff --git a/public/images/emoji/google_classic/train2.png b/public/images/emoji/google_classic/train2.png
new file mode 100644
index 00000000000..e46bb807260
Binary files /dev/null and b/public/images/emoji/google_classic/train2.png differ
diff --git a/public/images/emoji/google_classic/tram.png b/public/images/emoji/google_classic/tram.png
new file mode 100644
index 00000000000..4c63eca1b36
Binary files /dev/null and b/public/images/emoji/google_classic/tram.png differ
diff --git a/public/images/emoji/google_classic/triangular_flag_on_post.png b/public/images/emoji/google_classic/triangular_flag_on_post.png
new file mode 100644
index 00000000000..deb43385a0f
Binary files /dev/null and b/public/images/emoji/google_classic/triangular_flag_on_post.png differ
diff --git a/public/images/emoji/google_classic/triangular_ruler.png b/public/images/emoji/google_classic/triangular_ruler.png
new file mode 100644
index 00000000000..968e8073327
Binary files /dev/null and b/public/images/emoji/google_classic/triangular_ruler.png differ
diff --git a/public/images/emoji/google_classic/trident.png b/public/images/emoji/google_classic/trident.png
new file mode 100644
index 00000000000..5ede9698436
Binary files /dev/null and b/public/images/emoji/google_classic/trident.png differ
diff --git a/public/images/emoji/google_classic/trinidad_tobago.png b/public/images/emoji/google_classic/trinidad_tobago.png
new file mode 100644
index 00000000000..04b96f3428c
Binary files /dev/null and b/public/images/emoji/google_classic/trinidad_tobago.png differ
diff --git a/public/images/emoji/google_classic/tristan_da_cunha.png b/public/images/emoji/google_classic/tristan_da_cunha.png
new file mode 100644
index 00000000000..ac2ce5fbf25
Binary files /dev/null and b/public/images/emoji/google_classic/tristan_da_cunha.png differ
diff --git a/public/images/emoji/google_classic/triumph.png b/public/images/emoji/google_classic/triumph.png
new file mode 100644
index 00000000000..56dbe89f4eb
Binary files /dev/null and b/public/images/emoji/google_classic/triumph.png differ
diff --git a/public/images/emoji/google_classic/trolleybus.png b/public/images/emoji/google_classic/trolleybus.png
new file mode 100644
index 00000000000..d708db94f05
Binary files /dev/null and b/public/images/emoji/google_classic/trolleybus.png differ
diff --git a/public/images/emoji/google_classic/trophy.png b/public/images/emoji/google_classic/trophy.png
new file mode 100644
index 00000000000..4ef49749017
Binary files /dev/null and b/public/images/emoji/google_classic/trophy.png differ
diff --git a/public/images/emoji/google_classic/tropical_drink.png b/public/images/emoji/google_classic/tropical_drink.png
new file mode 100644
index 00000000000..def9ee997ca
Binary files /dev/null and b/public/images/emoji/google_classic/tropical_drink.png differ
diff --git a/public/images/emoji/google_classic/tropical_fish.png b/public/images/emoji/google_classic/tropical_fish.png
new file mode 100644
index 00000000000..8aed780373f
Binary files /dev/null and b/public/images/emoji/google_classic/tropical_fish.png differ
diff --git a/public/images/emoji/google_classic/truck.png b/public/images/emoji/google_classic/truck.png
new file mode 100644
index 00000000000..cec1216e81e
Binary files /dev/null and b/public/images/emoji/google_classic/truck.png differ
diff --git a/public/images/emoji/google_classic/trumpet.png b/public/images/emoji/google_classic/trumpet.png
new file mode 100644
index 00000000000..30ff275879e
Binary files /dev/null and b/public/images/emoji/google_classic/trumpet.png differ
diff --git a/public/images/emoji/google_classic/tshirt.png b/public/images/emoji/google_classic/tshirt.png
new file mode 100644
index 00000000000..18fed809641
Binary files /dev/null and b/public/images/emoji/google_classic/tshirt.png differ
diff --git a/public/images/emoji/google_classic/tulip.png b/public/images/emoji/google_classic/tulip.png
new file mode 100644
index 00000000000..f798ed9d40c
Binary files /dev/null and b/public/images/emoji/google_classic/tulip.png differ
diff --git a/public/images/emoji/google_classic/tumbler_glass.png b/public/images/emoji/google_classic/tumbler_glass.png
new file mode 100644
index 00000000000..e7b20fe127c
Binary files /dev/null and b/public/images/emoji/google_classic/tumbler_glass.png differ
diff --git a/public/images/emoji/google_classic/tunisia.png b/public/images/emoji/google_classic/tunisia.png
new file mode 100644
index 00000000000..1bea7fa2d78
Binary files /dev/null and b/public/images/emoji/google_classic/tunisia.png differ
diff --git a/public/images/emoji/google_classic/turkey.png b/public/images/emoji/google_classic/turkey.png
new file mode 100644
index 00000000000..09181dd70e6
Binary files /dev/null and b/public/images/emoji/google_classic/turkey.png differ
diff --git a/public/images/emoji/google_classic/turkmenistan.png b/public/images/emoji/google_classic/turkmenistan.png
new file mode 100644
index 00000000000..1c8a8e2bf3f
Binary files /dev/null and b/public/images/emoji/google_classic/turkmenistan.png differ
diff --git a/public/images/emoji/google_classic/turks_caicos_islands.png b/public/images/emoji/google_classic/turks_caicos_islands.png
new file mode 100644
index 00000000000..af24597ec3b
Binary files /dev/null and b/public/images/emoji/google_classic/turks_caicos_islands.png differ
diff --git a/public/images/emoji/google_classic/turtle.png b/public/images/emoji/google_classic/turtle.png
new file mode 100644
index 00000000000..8389c5dbaa6
Binary files /dev/null and b/public/images/emoji/google_classic/turtle.png differ
diff --git a/public/images/emoji/google_classic/tuvalu.png b/public/images/emoji/google_classic/tuvalu.png
new file mode 100644
index 00000000000..847f760c987
Binary files /dev/null and b/public/images/emoji/google_classic/tuvalu.png differ
diff --git a/public/images/emoji/google_classic/tv.png b/public/images/emoji/google_classic/tv.png
new file mode 100644
index 00000000000..85079ffb8b2
Binary files /dev/null and b/public/images/emoji/google_classic/tv.png differ
diff --git a/public/images/emoji/google_classic/twisted_rightwards_arrows.png b/public/images/emoji/google_classic/twisted_rightwards_arrows.png
new file mode 100644
index 00000000000..fa7708abb32
Binary files /dev/null and b/public/images/emoji/google_classic/twisted_rightwards_arrows.png differ
diff --git a/public/images/emoji/google_classic/two.png b/public/images/emoji/google_classic/two.png
new file mode 100644
index 00000000000..e65d04aa665
Binary files /dev/null and b/public/images/emoji/google_classic/two.png differ
diff --git a/public/images/emoji/google_classic/two_hearts.png b/public/images/emoji/google_classic/two_hearts.png
new file mode 100644
index 00000000000..229a4a6b8a2
Binary files /dev/null and b/public/images/emoji/google_classic/two_hearts.png differ
diff --git a/public/images/emoji/google_classic/two_men_holding_hands.png b/public/images/emoji/google_classic/two_men_holding_hands.png
new file mode 100644
index 00000000000..b66c204e6a2
Binary files /dev/null and b/public/images/emoji/google_classic/two_men_holding_hands.png differ
diff --git a/public/images/emoji/google_classic/two_women_holding_hands.png b/public/images/emoji/google_classic/two_women_holding_hands.png
new file mode 100644
index 00000000000..6a538c4a91f
Binary files /dev/null and b/public/images/emoji/google_classic/two_women_holding_hands.png differ
diff --git a/public/images/emoji/google_classic/u5272.png b/public/images/emoji/google_classic/u5272.png
new file mode 100644
index 00000000000..babe5c8b2e9
Binary files /dev/null and b/public/images/emoji/google_classic/u5272.png differ
diff --git a/public/images/emoji/google_classic/u5408.png b/public/images/emoji/google_classic/u5408.png
new file mode 100644
index 00000000000..f347e846b6e
Binary files /dev/null and b/public/images/emoji/google_classic/u5408.png differ
diff --git a/public/images/emoji/google_classic/u55b6.png b/public/images/emoji/google_classic/u55b6.png
new file mode 100644
index 00000000000..4f46d2340f3
Binary files /dev/null and b/public/images/emoji/google_classic/u55b6.png differ
diff --git a/public/images/emoji/google_classic/u6307.png b/public/images/emoji/google_classic/u6307.png
new file mode 100644
index 00000000000..a33cc2e92ba
Binary files /dev/null and b/public/images/emoji/google_classic/u6307.png differ
diff --git a/public/images/emoji/google_classic/u6708.png b/public/images/emoji/google_classic/u6708.png
new file mode 100644
index 00000000000..def973dc983
Binary files /dev/null and b/public/images/emoji/google_classic/u6708.png differ
diff --git a/public/images/emoji/google_classic/u6709.png b/public/images/emoji/google_classic/u6709.png
new file mode 100644
index 00000000000..dc24cb62f64
Binary files /dev/null and b/public/images/emoji/google_classic/u6709.png differ
diff --git a/public/images/emoji/google_classic/u6e80.png b/public/images/emoji/google_classic/u6e80.png
new file mode 100644
index 00000000000..ff0140c69dd
Binary files /dev/null and b/public/images/emoji/google_classic/u6e80.png differ
diff --git a/public/images/emoji/google_classic/u7121.png b/public/images/emoji/google_classic/u7121.png
new file mode 100644
index 00000000000..ff57e3c9716
Binary files /dev/null and b/public/images/emoji/google_classic/u7121.png differ
diff --git a/public/images/emoji/google_classic/u7533.png b/public/images/emoji/google_classic/u7533.png
new file mode 100644
index 00000000000..a55ddcdd256
Binary files /dev/null and b/public/images/emoji/google_classic/u7533.png differ
diff --git a/public/images/emoji/google_classic/u7981.png b/public/images/emoji/google_classic/u7981.png
new file mode 100644
index 00000000000..367af9cf6d9
Binary files /dev/null and b/public/images/emoji/google_classic/u7981.png differ
diff --git a/public/images/emoji/google_classic/u7a7a.png b/public/images/emoji/google_classic/u7a7a.png
new file mode 100644
index 00000000000..ccc982801d9
Binary files /dev/null and b/public/images/emoji/google_classic/u7a7a.png differ
diff --git a/public/images/emoji/google_classic/uganda.png b/public/images/emoji/google_classic/uganda.png
new file mode 100644
index 00000000000..6d7c8bd0a41
Binary files /dev/null and b/public/images/emoji/google_classic/uganda.png differ
diff --git a/public/images/emoji/google_classic/uk.png b/public/images/emoji/google_classic/uk.png
new file mode 100644
index 00000000000..ee88c3f750f
Binary files /dev/null and b/public/images/emoji/google_classic/uk.png differ
diff --git a/public/images/emoji/google_classic/ukraine.png b/public/images/emoji/google_classic/ukraine.png
new file mode 100644
index 00000000000..abdd04797dc
Binary files /dev/null and b/public/images/emoji/google_classic/ukraine.png differ
diff --git a/public/images/emoji/google_classic/umbrella.png b/public/images/emoji/google_classic/umbrella.png
new file mode 100644
index 00000000000..3945316c2de
Binary files /dev/null and b/public/images/emoji/google_classic/umbrella.png differ
diff --git a/public/images/emoji/google_classic/umbrella2.png b/public/images/emoji/google_classic/umbrella2.png
new file mode 100644
index 00000000000..a9fbd03abaf
Binary files /dev/null and b/public/images/emoji/google_classic/umbrella2.png differ
diff --git a/public/images/emoji/google_classic/umbrella_on_ground.png b/public/images/emoji/google_classic/umbrella_on_ground.png
new file mode 100644
index 00000000000..f23d6f604ce
Binary files /dev/null and b/public/images/emoji/google_classic/umbrella_on_ground.png differ
diff --git a/public/images/emoji/google_classic/unamused.png b/public/images/emoji/google_classic/unamused.png
new file mode 100644
index 00000000000..9edd2a8dc3d
Binary files /dev/null and b/public/images/emoji/google_classic/unamused.png differ
diff --git a/public/images/emoji/google_classic/underage.png b/public/images/emoji/google_classic/underage.png
new file mode 100644
index 00000000000..26cab51e7da
Binary files /dev/null and b/public/images/emoji/google_classic/underage.png differ
diff --git a/public/images/emoji/google_classic/unicorn.png b/public/images/emoji/google_classic/unicorn.png
new file mode 100644
index 00000000000..9a52258b99c
Binary files /dev/null and b/public/images/emoji/google_classic/unicorn.png differ
diff --git a/public/images/emoji/google_classic/unicorn_face.png b/public/images/emoji/google_classic/unicorn_face.png
new file mode 100644
index 00000000000..9a52258b99c
Binary files /dev/null and b/public/images/emoji/google_classic/unicorn_face.png differ
diff --git a/public/images/emoji/google_classic/united_arab_emirates.png b/public/images/emoji/google_classic/united_arab_emirates.png
new file mode 100644
index 00000000000..6e5fe406220
Binary files /dev/null and b/public/images/emoji/google_classic/united_arab_emirates.png differ
diff --git a/public/images/emoji/google_classic/united_nations.png b/public/images/emoji/google_classic/united_nations.png
new file mode 100644
index 00000000000..d695a5cac09
Binary files /dev/null and b/public/images/emoji/google_classic/united_nations.png differ
diff --git a/public/images/emoji/google_classic/unlock.png b/public/images/emoji/google_classic/unlock.png
new file mode 100644
index 00000000000..3e2fb468b7e
Binary files /dev/null and b/public/images/emoji/google_classic/unlock.png differ
diff --git a/public/images/emoji/google_classic/up.png b/public/images/emoji/google_classic/up.png
new file mode 100644
index 00000000000..3b52fffe11a
Binary files /dev/null and b/public/images/emoji/google_classic/up.png differ
diff --git a/public/images/emoji/google_classic/upside_down.png b/public/images/emoji/google_classic/upside_down.png
new file mode 100644
index 00000000000..ea09f4c9a62
Binary files /dev/null and b/public/images/emoji/google_classic/upside_down.png differ
diff --git a/public/images/emoji/google_classic/upside_down_face.png b/public/images/emoji/google_classic/upside_down_face.png
new file mode 100644
index 00000000000..ea09f4c9a62
Binary files /dev/null and b/public/images/emoji/google_classic/upside_down_face.png differ
diff --git a/public/images/emoji/google_classic/urn.png b/public/images/emoji/google_classic/urn.png
new file mode 100644
index 00000000000..eff08b3c1a1
Binary files /dev/null and b/public/images/emoji/google_classic/urn.png differ
diff --git a/public/images/emoji/google_classic/uruguay.png b/public/images/emoji/google_classic/uruguay.png
new file mode 100644
index 00000000000..d451b23ae78
Binary files /dev/null and b/public/images/emoji/google_classic/uruguay.png differ
diff --git a/public/images/emoji/google_classic/us.png b/public/images/emoji/google_classic/us.png
new file mode 100644
index 00000000000..8ba4d5d5381
Binary files /dev/null and b/public/images/emoji/google_classic/us.png differ
diff --git a/public/images/emoji/google_classic/us_outlying_islands.png b/public/images/emoji/google_classic/us_outlying_islands.png
new file mode 100644
index 00000000000..8ba4d5d5381
Binary files /dev/null and b/public/images/emoji/google_classic/us_outlying_islands.png differ
diff --git a/public/images/emoji/google_classic/us_virgin_islands.png b/public/images/emoji/google_classic/us_virgin_islands.png
new file mode 100644
index 00000000000..5d0b6257663
Binary files /dev/null and b/public/images/emoji/google_classic/us_virgin_islands.png differ
diff --git a/public/images/emoji/google_classic/uzbekistan.png b/public/images/emoji/google_classic/uzbekistan.png
new file mode 100644
index 00000000000..26cba98d675
Binary files /dev/null and b/public/images/emoji/google_classic/uzbekistan.png differ
diff --git a/public/images/emoji/google_classic/v.png b/public/images/emoji/google_classic/v.png
new file mode 100644
index 00000000000..989ad11a143
Binary files /dev/null and b/public/images/emoji/google_classic/v.png differ
diff --git a/public/images/emoji/google_classic/v/2.png b/public/images/emoji/google_classic/v/2.png
new file mode 100644
index 00000000000..c7b23374a72
Binary files /dev/null and b/public/images/emoji/google_classic/v/2.png differ
diff --git a/public/images/emoji/google_classic/v/3.png b/public/images/emoji/google_classic/v/3.png
new file mode 100644
index 00000000000..122612e0608
Binary files /dev/null and b/public/images/emoji/google_classic/v/3.png differ
diff --git a/public/images/emoji/google_classic/v/4.png b/public/images/emoji/google_classic/v/4.png
new file mode 100644
index 00000000000..c331a2dac2e
Binary files /dev/null and b/public/images/emoji/google_classic/v/4.png differ
diff --git a/public/images/emoji/google_classic/v/5.png b/public/images/emoji/google_classic/v/5.png
new file mode 100644
index 00000000000..a61f20c40f8
Binary files /dev/null and b/public/images/emoji/google_classic/v/5.png differ
diff --git a/public/images/emoji/google_classic/v/6.png b/public/images/emoji/google_classic/v/6.png
new file mode 100644
index 00000000000..6b645dbe085
Binary files /dev/null and b/public/images/emoji/google_classic/v/6.png differ
diff --git a/public/images/emoji/google_classic/vampire.png b/public/images/emoji/google_classic/vampire.png
new file mode 100644
index 00000000000..962288bd170
Binary files /dev/null and b/public/images/emoji/google_classic/vampire.png differ
diff --git a/public/images/emoji/google_classic/vampire/2.png b/public/images/emoji/google_classic/vampire/2.png
new file mode 100644
index 00000000000..154f2b6e35a
Binary files /dev/null and b/public/images/emoji/google_classic/vampire/2.png differ
diff --git a/public/images/emoji/google_classic/vampire/3.png b/public/images/emoji/google_classic/vampire/3.png
new file mode 100644
index 00000000000..540b48d887f
Binary files /dev/null and b/public/images/emoji/google_classic/vampire/3.png differ
diff --git a/public/images/emoji/google_classic/vampire/4.png b/public/images/emoji/google_classic/vampire/4.png
new file mode 100644
index 00000000000..b05d3bad9ab
Binary files /dev/null and b/public/images/emoji/google_classic/vampire/4.png differ
diff --git a/public/images/emoji/google_classic/vampire/5.png b/public/images/emoji/google_classic/vampire/5.png
new file mode 100644
index 00000000000..2bd9a7b71bb
Binary files /dev/null and b/public/images/emoji/google_classic/vampire/5.png differ
diff --git a/public/images/emoji/google_classic/vampire/6.png b/public/images/emoji/google_classic/vampire/6.png
new file mode 100644
index 00000000000..c88f4ad73bf
Binary files /dev/null and b/public/images/emoji/google_classic/vampire/6.png differ
diff --git a/public/images/emoji/google_classic/vanuatu.png b/public/images/emoji/google_classic/vanuatu.png
new file mode 100644
index 00000000000..5c8a9eef8a8
Binary files /dev/null and b/public/images/emoji/google_classic/vanuatu.png differ
diff --git a/public/images/emoji/google_classic/vatican_city.png b/public/images/emoji/google_classic/vatican_city.png
new file mode 100644
index 00000000000..2ee62e42a86
Binary files /dev/null and b/public/images/emoji/google_classic/vatican_city.png differ
diff --git a/public/images/emoji/google_classic/venezuela.png b/public/images/emoji/google_classic/venezuela.png
new file mode 100644
index 00000000000..a757a43c817
Binary files /dev/null and b/public/images/emoji/google_classic/venezuela.png differ
diff --git a/public/images/emoji/google_classic/vertical_traffic_light.png b/public/images/emoji/google_classic/vertical_traffic_light.png
new file mode 100644
index 00000000000..56bee06af65
Binary files /dev/null and b/public/images/emoji/google_classic/vertical_traffic_light.png differ
diff --git a/public/images/emoji/google_classic/vhs.png b/public/images/emoji/google_classic/vhs.png
new file mode 100644
index 00000000000..6238e740207
Binary files /dev/null and b/public/images/emoji/google_classic/vhs.png differ
diff --git a/public/images/emoji/google_classic/vibration_mode.png b/public/images/emoji/google_classic/vibration_mode.png
new file mode 100644
index 00000000000..5a6aca044b4
Binary files /dev/null and b/public/images/emoji/google_classic/vibration_mode.png differ
diff --git a/public/images/emoji/google_classic/video_camera.png b/public/images/emoji/google_classic/video_camera.png
new file mode 100644
index 00000000000..211279451d4
Binary files /dev/null and b/public/images/emoji/google_classic/video_camera.png differ
diff --git a/public/images/emoji/google_classic/video_game.png b/public/images/emoji/google_classic/video_game.png
new file mode 100644
index 00000000000..38077b5a11f
Binary files /dev/null and b/public/images/emoji/google_classic/video_game.png differ
diff --git a/public/images/emoji/google_classic/vietnam.png b/public/images/emoji/google_classic/vietnam.png
new file mode 100644
index 00000000000..3c2d9ab3834
Binary files /dev/null and b/public/images/emoji/google_classic/vietnam.png differ
diff --git a/public/images/emoji/google_classic/violin.png b/public/images/emoji/google_classic/violin.png
new file mode 100644
index 00000000000..d91a10d8ffb
Binary files /dev/null and b/public/images/emoji/google_classic/violin.png differ
diff --git a/public/images/emoji/google_classic/virgo.png b/public/images/emoji/google_classic/virgo.png
new file mode 100644
index 00000000000..4f17f767a09
Binary files /dev/null and b/public/images/emoji/google_classic/virgo.png differ
diff --git a/public/images/emoji/google_classic/volcano.png b/public/images/emoji/google_classic/volcano.png
new file mode 100644
index 00000000000..4d1cf9b4ee6
Binary files /dev/null and b/public/images/emoji/google_classic/volcano.png differ
diff --git a/public/images/emoji/google_classic/volleyball.png b/public/images/emoji/google_classic/volleyball.png
new file mode 100644
index 00000000000..7503e8aa133
Binary files /dev/null and b/public/images/emoji/google_classic/volleyball.png differ
diff --git a/public/images/emoji/google_classic/vs.png b/public/images/emoji/google_classic/vs.png
new file mode 100644
index 00000000000..98a374dcf09
Binary files /dev/null and b/public/images/emoji/google_classic/vs.png differ
diff --git a/public/images/emoji/google_classic/vulcan.png b/public/images/emoji/google_classic/vulcan.png
new file mode 100644
index 00000000000..7294a38c1fa
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan.png differ
diff --git a/public/images/emoji/google_classic/vulcan/2.png b/public/images/emoji/google_classic/vulcan/2.png
new file mode 100644
index 00000000000..09c72102235
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan/2.png differ
diff --git a/public/images/emoji/google_classic/vulcan/3.png b/public/images/emoji/google_classic/vulcan/3.png
new file mode 100644
index 00000000000..cca9533abf8
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan/3.png differ
diff --git a/public/images/emoji/google_classic/vulcan/4.png b/public/images/emoji/google_classic/vulcan/4.png
new file mode 100644
index 00000000000..27a01ef28ca
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan/4.png differ
diff --git a/public/images/emoji/google_classic/vulcan/5.png b/public/images/emoji/google_classic/vulcan/5.png
new file mode 100644
index 00000000000..77901ed77f7
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan/5.png differ
diff --git a/public/images/emoji/google_classic/vulcan/6.png b/public/images/emoji/google_classic/vulcan/6.png
new file mode 100644
index 00000000000..56aa2e08625
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan/6.png differ
diff --git a/public/images/emoji/google_classic/vulcan_salute.png b/public/images/emoji/google_classic/vulcan_salute.png
new file mode 100644
index 00000000000..7294a38c1fa
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan_salute.png differ
diff --git a/public/images/emoji/google_classic/vulcan_salute/2.png b/public/images/emoji/google_classic/vulcan_salute/2.png
new file mode 100644
index 00000000000..09c72102235
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan_salute/2.png differ
diff --git a/public/images/emoji/google_classic/vulcan_salute/3.png b/public/images/emoji/google_classic/vulcan_salute/3.png
new file mode 100644
index 00000000000..cca9533abf8
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan_salute/3.png differ
diff --git a/public/images/emoji/google_classic/vulcan_salute/4.png b/public/images/emoji/google_classic/vulcan_salute/4.png
new file mode 100644
index 00000000000..27a01ef28ca
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan_salute/4.png differ
diff --git a/public/images/emoji/google_classic/vulcan_salute/5.png b/public/images/emoji/google_classic/vulcan_salute/5.png
new file mode 100644
index 00000000000..77901ed77f7
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan_salute/5.png differ
diff --git a/public/images/emoji/google_classic/vulcan_salute/6.png b/public/images/emoji/google_classic/vulcan_salute/6.png
new file mode 100644
index 00000000000..56aa2e08625
Binary files /dev/null and b/public/images/emoji/google_classic/vulcan_salute/6.png differ
diff --git a/public/images/emoji/google_classic/walking.png b/public/images/emoji/google_classic/walking.png
new file mode 100644
index 00000000000..bbd7b970bea
Binary files /dev/null and b/public/images/emoji/google_classic/walking.png differ
diff --git a/public/images/emoji/google_classic/walking/2.png b/public/images/emoji/google_classic/walking/2.png
new file mode 100644
index 00000000000..2dd36f63f95
Binary files /dev/null and b/public/images/emoji/google_classic/walking/2.png differ
diff --git a/public/images/emoji/google_classic/walking/3.png b/public/images/emoji/google_classic/walking/3.png
new file mode 100644
index 00000000000..a4d95ac0e90
Binary files /dev/null and b/public/images/emoji/google_classic/walking/3.png differ
diff --git a/public/images/emoji/google_classic/walking/4.png b/public/images/emoji/google_classic/walking/4.png
new file mode 100644
index 00000000000..059f45a046c
Binary files /dev/null and b/public/images/emoji/google_classic/walking/4.png differ
diff --git a/public/images/emoji/google_classic/walking/5.png b/public/images/emoji/google_classic/walking/5.png
new file mode 100644
index 00000000000..d19ee2f6d9d
Binary files /dev/null and b/public/images/emoji/google_classic/walking/5.png differ
diff --git a/public/images/emoji/google_classic/walking/6.png b/public/images/emoji/google_classic/walking/6.png
new file mode 100644
index 00000000000..05df581fb57
Binary files /dev/null and b/public/images/emoji/google_classic/walking/6.png differ
diff --git a/public/images/emoji/google_classic/walking_man.png b/public/images/emoji/google_classic/walking_man.png
new file mode 100644
index 00000000000..bbd7b970bea
Binary files /dev/null and b/public/images/emoji/google_classic/walking_man.png differ
diff --git a/public/images/emoji/google_classic/walking_man/2.png b/public/images/emoji/google_classic/walking_man/2.png
new file mode 100644
index 00000000000..2dd36f63f95
Binary files /dev/null and b/public/images/emoji/google_classic/walking_man/2.png differ
diff --git a/public/images/emoji/google_classic/walking_man/3.png b/public/images/emoji/google_classic/walking_man/3.png
new file mode 100644
index 00000000000..a4d95ac0e90
Binary files /dev/null and b/public/images/emoji/google_classic/walking_man/3.png differ
diff --git a/public/images/emoji/google_classic/walking_man/4.png b/public/images/emoji/google_classic/walking_man/4.png
new file mode 100644
index 00000000000..059f45a046c
Binary files /dev/null and b/public/images/emoji/google_classic/walking_man/4.png differ
diff --git a/public/images/emoji/google_classic/walking_man/5.png b/public/images/emoji/google_classic/walking_man/5.png
new file mode 100644
index 00000000000..d19ee2f6d9d
Binary files /dev/null and b/public/images/emoji/google_classic/walking_man/5.png differ
diff --git a/public/images/emoji/google_classic/walking_man/6.png b/public/images/emoji/google_classic/walking_man/6.png
new file mode 100644
index 00000000000..05df581fb57
Binary files /dev/null and b/public/images/emoji/google_classic/walking_man/6.png differ
diff --git a/public/images/emoji/google_classic/walking_woman.png b/public/images/emoji/google_classic/walking_woman.png
new file mode 100644
index 00000000000..bf8507d2f1f
Binary files /dev/null and b/public/images/emoji/google_classic/walking_woman.png differ
diff --git a/public/images/emoji/google_classic/walking_woman/2.png b/public/images/emoji/google_classic/walking_woman/2.png
new file mode 100644
index 00000000000..f690992e0e9
Binary files /dev/null and b/public/images/emoji/google_classic/walking_woman/2.png differ
diff --git a/public/images/emoji/google_classic/walking_woman/3.png b/public/images/emoji/google_classic/walking_woman/3.png
new file mode 100644
index 00000000000..986a51a5236
Binary files /dev/null and b/public/images/emoji/google_classic/walking_woman/3.png differ
diff --git a/public/images/emoji/google_classic/walking_woman/4.png b/public/images/emoji/google_classic/walking_woman/4.png
new file mode 100644
index 00000000000..967649fbfef
Binary files /dev/null and b/public/images/emoji/google_classic/walking_woman/4.png differ
diff --git a/public/images/emoji/google_classic/walking_woman/5.png b/public/images/emoji/google_classic/walking_woman/5.png
new file mode 100644
index 00000000000..494a204ce80
Binary files /dev/null and b/public/images/emoji/google_classic/walking_woman/5.png differ
diff --git a/public/images/emoji/google_classic/walking_woman/6.png b/public/images/emoji/google_classic/walking_woman/6.png
new file mode 100644
index 00000000000..80d3a727e78
Binary files /dev/null and b/public/images/emoji/google_classic/walking_woman/6.png differ
diff --git a/public/images/emoji/google_classic/wallis_futuna.png b/public/images/emoji/google_classic/wallis_futuna.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/wallis_futuna.png differ
diff --git a/public/images/emoji/google_classic/waning_crescent_moon.png b/public/images/emoji/google_classic/waning_crescent_moon.png
new file mode 100644
index 00000000000..993deafc94d
Binary files /dev/null and b/public/images/emoji/google_classic/waning_crescent_moon.png differ
diff --git a/public/images/emoji/google_classic/waning_gibbous_moon.png b/public/images/emoji/google_classic/waning_gibbous_moon.png
new file mode 100644
index 00000000000..b70b1b3b523
Binary files /dev/null and b/public/images/emoji/google_classic/waning_gibbous_moon.png differ
diff --git a/public/images/emoji/google_classic/warning.png b/public/images/emoji/google_classic/warning.png
new file mode 100644
index 00000000000..13f08e539bf
Binary files /dev/null and b/public/images/emoji/google_classic/warning.png differ
diff --git a/public/images/emoji/google_classic/wastebasket.png b/public/images/emoji/google_classic/wastebasket.png
new file mode 100644
index 00000000000..ab1ca0dcbfd
Binary files /dev/null and b/public/images/emoji/google_classic/wastebasket.png differ
diff --git a/public/images/emoji/google_classic/watch.png b/public/images/emoji/google_classic/watch.png
new file mode 100644
index 00000000000..528df360740
Binary files /dev/null and b/public/images/emoji/google_classic/watch.png differ
diff --git a/public/images/emoji/google_classic/water_buffalo.png b/public/images/emoji/google_classic/water_buffalo.png
new file mode 100644
index 00000000000..4888de00f2c
Binary files /dev/null and b/public/images/emoji/google_classic/water_buffalo.png differ
diff --git a/public/images/emoji/google_classic/watermelon.png b/public/images/emoji/google_classic/watermelon.png
new file mode 100644
index 00000000000..bf07ccfa7a7
Binary files /dev/null and b/public/images/emoji/google_classic/watermelon.png differ
diff --git a/public/images/emoji/google_classic/wave.png b/public/images/emoji/google_classic/wave.png
new file mode 100644
index 00000000000..35caa37fd97
Binary files /dev/null and b/public/images/emoji/google_classic/wave.png differ
diff --git a/public/images/emoji/google_classic/wave/2.png b/public/images/emoji/google_classic/wave/2.png
new file mode 100644
index 00000000000..53c412f7910
Binary files /dev/null and b/public/images/emoji/google_classic/wave/2.png differ
diff --git a/public/images/emoji/google_classic/wave/3.png b/public/images/emoji/google_classic/wave/3.png
new file mode 100644
index 00000000000..e16479dc831
Binary files /dev/null and b/public/images/emoji/google_classic/wave/3.png differ
diff --git a/public/images/emoji/google_classic/wave/4.png b/public/images/emoji/google_classic/wave/4.png
new file mode 100644
index 00000000000..c03fe69de4d
Binary files /dev/null and b/public/images/emoji/google_classic/wave/4.png differ
diff --git a/public/images/emoji/google_classic/wave/5.png b/public/images/emoji/google_classic/wave/5.png
new file mode 100644
index 00000000000..fbec719c44f
Binary files /dev/null and b/public/images/emoji/google_classic/wave/5.png differ
diff --git a/public/images/emoji/google_classic/wave/6.png b/public/images/emoji/google_classic/wave/6.png
new file mode 100644
index 00000000000..ce118edeefd
Binary files /dev/null and b/public/images/emoji/google_classic/wave/6.png differ
diff --git a/public/images/emoji/google_classic/waving_black_flag.png b/public/images/emoji/google_classic/waving_black_flag.png
new file mode 100644
index 00000000000..de072bca626
Binary files /dev/null and b/public/images/emoji/google_classic/waving_black_flag.png differ
diff --git a/public/images/emoji/google_classic/waving_white_flag.png b/public/images/emoji/google_classic/waving_white_flag.png
new file mode 100644
index 00000000000..ce4e23c8c72
Binary files /dev/null and b/public/images/emoji/google_classic/waving_white_flag.png differ
diff --git a/public/images/emoji/google_classic/wavy_dash.png b/public/images/emoji/google_classic/wavy_dash.png
new file mode 100644
index 00000000000..e28d0933872
Binary files /dev/null and b/public/images/emoji/google_classic/wavy_dash.png differ
diff --git a/public/images/emoji/google_classic/waxing_crescent_moon.png b/public/images/emoji/google_classic/waxing_crescent_moon.png
new file mode 100644
index 00000000000..0a775f4918e
Binary files /dev/null and b/public/images/emoji/google_classic/waxing_crescent_moon.png differ
diff --git a/public/images/emoji/google_classic/waxing_gibbous_moon.png b/public/images/emoji/google_classic/waxing_gibbous_moon.png
new file mode 100644
index 00000000000..5673a0b3fad
Binary files /dev/null and b/public/images/emoji/google_classic/waxing_gibbous_moon.png differ
diff --git a/public/images/emoji/google_classic/wc.png b/public/images/emoji/google_classic/wc.png
new file mode 100644
index 00000000000..18b1e0b15ac
Binary files /dev/null and b/public/images/emoji/google_classic/wc.png differ
diff --git a/public/images/emoji/google_classic/weary.png b/public/images/emoji/google_classic/weary.png
new file mode 100644
index 00000000000..ced0d21c409
Binary files /dev/null and b/public/images/emoji/google_classic/weary.png differ
diff --git a/public/images/emoji/google_classic/wedding.png b/public/images/emoji/google_classic/wedding.png
new file mode 100644
index 00000000000..e9b39cda21e
Binary files /dev/null and b/public/images/emoji/google_classic/wedding.png differ
diff --git a/public/images/emoji/google_classic/weight_lifter.png b/public/images/emoji/google_classic/weight_lifter.png
new file mode 100644
index 00000000000..eb58823175e
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifter.png differ
diff --git a/public/images/emoji/google_classic/weight_lifter/2.png b/public/images/emoji/google_classic/weight_lifter/2.png
new file mode 100644
index 00000000000..84419dd4f63
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifter/2.png differ
diff --git a/public/images/emoji/google_classic/weight_lifter/3.png b/public/images/emoji/google_classic/weight_lifter/3.png
new file mode 100644
index 00000000000..10a04dbabe6
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifter/3.png differ
diff --git a/public/images/emoji/google_classic/weight_lifter/4.png b/public/images/emoji/google_classic/weight_lifter/4.png
new file mode 100644
index 00000000000..72f83cb18ca
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifter/4.png differ
diff --git a/public/images/emoji/google_classic/weight_lifter/5.png b/public/images/emoji/google_classic/weight_lifter/5.png
new file mode 100644
index 00000000000..d8114472342
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifter/5.png differ
diff --git a/public/images/emoji/google_classic/weight_lifter/6.png b/public/images/emoji/google_classic/weight_lifter/6.png
new file mode 100644
index 00000000000..21be04c656a
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifter/6.png differ
diff --git a/public/images/emoji/google_classic/weight_lifting_man.png b/public/images/emoji/google_classic/weight_lifting_man.png
new file mode 100644
index 00000000000..eb58823175e
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifting_man.png differ
diff --git a/public/images/emoji/google_classic/weight_lifting_man/2.png b/public/images/emoji/google_classic/weight_lifting_man/2.png
new file mode 100644
index 00000000000..84419dd4f63
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/google_classic/weight_lifting_man/3.png b/public/images/emoji/google_classic/weight_lifting_man/3.png
new file mode 100644
index 00000000000..10a04dbabe6
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/google_classic/weight_lifting_man/4.png b/public/images/emoji/google_classic/weight_lifting_man/4.png
new file mode 100644
index 00000000000..72f83cb18ca
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/google_classic/weight_lifting_man/5.png b/public/images/emoji/google_classic/weight_lifting_man/5.png
new file mode 100644
index 00000000000..d8114472342
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/google_classic/weight_lifting_man/6.png b/public/images/emoji/google_classic/weight_lifting_man/6.png
new file mode 100644
index 00000000000..21be04c656a
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/google_classic/weight_lifting_woman.png b/public/images/emoji/google_classic/weight_lifting_woman.png
new file mode 100644
index 00000000000..168dcdf4908
Binary files /dev/null and b/public/images/emoji/google_classic/weight_lifting_woman.png differ
diff --git a/public/images/emoji/google_classic/western_sahara.png b/public/images/emoji/google_classic/western_sahara.png
new file mode 100644
index 00000000000..e8c6bd0d27b
Binary files /dev/null and b/public/images/emoji/google_classic/western_sahara.png differ
diff --git a/public/images/emoji/google_classic/whale.png b/public/images/emoji/google_classic/whale.png
new file mode 100644
index 00000000000..2a83fedd0cc
Binary files /dev/null and b/public/images/emoji/google_classic/whale.png differ
diff --git a/public/images/emoji/google_classic/whale2.png b/public/images/emoji/google_classic/whale2.png
new file mode 100644
index 00000000000..433108acf74
Binary files /dev/null and b/public/images/emoji/google_classic/whale2.png differ
diff --git a/public/images/emoji/google_classic/wheel_of_dharma.png b/public/images/emoji/google_classic/wheel_of_dharma.png
new file mode 100644
index 00000000000..eacaf590e69
Binary files /dev/null and b/public/images/emoji/google_classic/wheel_of_dharma.png differ
diff --git a/public/images/emoji/google_classic/wheelchair.png b/public/images/emoji/google_classic/wheelchair.png
new file mode 100644
index 00000000000..17ab798b1c8
Binary files /dev/null and b/public/images/emoji/google_classic/wheelchair.png differ
diff --git a/public/images/emoji/google_classic/white_check_mark.png b/public/images/emoji/google_classic/white_check_mark.png
new file mode 100644
index 00000000000..fcb38f94828
Binary files /dev/null and b/public/images/emoji/google_classic/white_check_mark.png differ
diff --git a/public/images/emoji/google_classic/white_circle.png b/public/images/emoji/google_classic/white_circle.png
new file mode 100644
index 00000000000..cb1d0f740af
Binary files /dev/null and b/public/images/emoji/google_classic/white_circle.png differ
diff --git a/public/images/emoji/google_classic/white_flag.png b/public/images/emoji/google_classic/white_flag.png
new file mode 100644
index 00000000000..ce4e23c8c72
Binary files /dev/null and b/public/images/emoji/google_classic/white_flag.png differ
diff --git a/public/images/emoji/google_classic/white_flower.png b/public/images/emoji/google_classic/white_flower.png
new file mode 100644
index 00000000000..5486e25da82
Binary files /dev/null and b/public/images/emoji/google_classic/white_flower.png differ
diff --git a/public/images/emoji/google_classic/white_frowning_face.png b/public/images/emoji/google_classic/white_frowning_face.png
new file mode 100644
index 00000000000..db9c6af5b3b
Binary files /dev/null and b/public/images/emoji/google_classic/white_frowning_face.png differ
diff --git a/public/images/emoji/google_classic/white_large_square.png b/public/images/emoji/google_classic/white_large_square.png
new file mode 100644
index 00000000000..f9dda7899df
Binary files /dev/null and b/public/images/emoji/google_classic/white_large_square.png differ
diff --git a/public/images/emoji/google_classic/white_medium_small_square.png b/public/images/emoji/google_classic/white_medium_small_square.png
new file mode 100644
index 00000000000..9768059a106
Binary files /dev/null and b/public/images/emoji/google_classic/white_medium_small_square.png differ
diff --git a/public/images/emoji/google_classic/white_medium_square.png b/public/images/emoji/google_classic/white_medium_square.png
new file mode 100644
index 00000000000..1a0bd021006
Binary files /dev/null and b/public/images/emoji/google_classic/white_medium_square.png differ
diff --git a/public/images/emoji/google_classic/white_small_square.png b/public/images/emoji/google_classic/white_small_square.png
new file mode 100644
index 00000000000..3b2f5b6f419
Binary files /dev/null and b/public/images/emoji/google_classic/white_small_square.png differ
diff --git a/public/images/emoji/google_classic/white_square_button.png b/public/images/emoji/google_classic/white_square_button.png
new file mode 100644
index 00000000000..9daf142f81b
Binary files /dev/null and b/public/images/emoji/google_classic/white_square_button.png differ
diff --git a/public/images/emoji/google_classic/white_sun_behind_cloud.png b/public/images/emoji/google_classic/white_sun_behind_cloud.png
new file mode 100644
index 00000000000..43f98996984
Binary files /dev/null and b/public/images/emoji/google_classic/white_sun_behind_cloud.png differ
diff --git a/public/images/emoji/google_classic/white_sun_behind_cloud_with_rain.png b/public/images/emoji/google_classic/white_sun_behind_cloud_with_rain.png
new file mode 100644
index 00000000000..1ef8a371472
Binary files /dev/null and b/public/images/emoji/google_classic/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/google_classic/white_sun_cloud.png b/public/images/emoji/google_classic/white_sun_cloud.png
new file mode 100644
index 00000000000..43f98996984
Binary files /dev/null and b/public/images/emoji/google_classic/white_sun_cloud.png differ
diff --git a/public/images/emoji/google_classic/white_sun_rain_cloud.png b/public/images/emoji/google_classic/white_sun_rain_cloud.png
new file mode 100644
index 00000000000..1ef8a371472
Binary files /dev/null and b/public/images/emoji/google_classic/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/google_classic/white_sun_small_cloud.png b/public/images/emoji/google_classic/white_sun_small_cloud.png
new file mode 100644
index 00000000000..4338bb43895
Binary files /dev/null and b/public/images/emoji/google_classic/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/google_classic/white_sun_with_small_cloud.png b/public/images/emoji/google_classic/white_sun_with_small_cloud.png
new file mode 100644
index 00000000000..4338bb43895
Binary files /dev/null and b/public/images/emoji/google_classic/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/google_classic/wilted_flower.png b/public/images/emoji/google_classic/wilted_flower.png
new file mode 100644
index 00000000000..24ef290ba42
Binary files /dev/null and b/public/images/emoji/google_classic/wilted_flower.png differ
diff --git a/public/images/emoji/google_classic/wind_blowing_face.png b/public/images/emoji/google_classic/wind_blowing_face.png
new file mode 100644
index 00000000000..dc17bd19744
Binary files /dev/null and b/public/images/emoji/google_classic/wind_blowing_face.png differ
diff --git a/public/images/emoji/google_classic/wind_chime.png b/public/images/emoji/google_classic/wind_chime.png
new file mode 100644
index 00000000000..25ee602d2cd
Binary files /dev/null and b/public/images/emoji/google_classic/wind_chime.png differ
diff --git a/public/images/emoji/google_classic/wind_face.png b/public/images/emoji/google_classic/wind_face.png
new file mode 100644
index 00000000000..dc17bd19744
Binary files /dev/null and b/public/images/emoji/google_classic/wind_face.png differ
diff --git a/public/images/emoji/google_classic/wine_glass.png b/public/images/emoji/google_classic/wine_glass.png
new file mode 100644
index 00000000000..86122bb31e7
Binary files /dev/null and b/public/images/emoji/google_classic/wine_glass.png differ
diff --git a/public/images/emoji/google_classic/wink.png b/public/images/emoji/google_classic/wink.png
new file mode 100644
index 00000000000..7d99dd23c1f
Binary files /dev/null and b/public/images/emoji/google_classic/wink.png differ
diff --git a/public/images/emoji/google_classic/wolf.png b/public/images/emoji/google_classic/wolf.png
new file mode 100644
index 00000000000..dbd16da58b8
Binary files /dev/null and b/public/images/emoji/google_classic/wolf.png differ
diff --git a/public/images/emoji/google_classic/woman.png b/public/images/emoji/google_classic/woman.png
new file mode 100644
index 00000000000..d7770ff9644
Binary files /dev/null and b/public/images/emoji/google_classic/woman.png differ
diff --git a/public/images/emoji/google_classic/woman/2.png b/public/images/emoji/google_classic/woman/2.png
new file mode 100644
index 00000000000..784f33ad52b
Binary files /dev/null and b/public/images/emoji/google_classic/woman/2.png differ
diff --git a/public/images/emoji/google_classic/woman/3.png b/public/images/emoji/google_classic/woman/3.png
new file mode 100644
index 00000000000..fb093984703
Binary files /dev/null and b/public/images/emoji/google_classic/woman/3.png differ
diff --git a/public/images/emoji/google_classic/woman/4.png b/public/images/emoji/google_classic/woman/4.png
new file mode 100644
index 00000000000..381d7b38d88
Binary files /dev/null and b/public/images/emoji/google_classic/woman/4.png differ
diff --git a/public/images/emoji/google_classic/woman/5.png b/public/images/emoji/google_classic/woman/5.png
new file mode 100644
index 00000000000..92e4c0e3517
Binary files /dev/null and b/public/images/emoji/google_classic/woman/5.png differ
diff --git a/public/images/emoji/google_classic/woman/6.png b/public/images/emoji/google_classic/woman/6.png
new file mode 100644
index 00000000000..c1cfaa9c333
Binary files /dev/null and b/public/images/emoji/google_classic/woman/6.png differ
diff --git a/public/images/emoji/google_classic/woman_artist.png b/public/images/emoji/google_classic/woman_artist.png
new file mode 100644
index 00000000000..93b26d8f4f4
Binary files /dev/null and b/public/images/emoji/google_classic/woman_artist.png differ
diff --git a/public/images/emoji/google_classic/woman_artist/2.png b/public/images/emoji/google_classic/woman_artist/2.png
new file mode 100644
index 00000000000..37d9237f85b
Binary files /dev/null and b/public/images/emoji/google_classic/woman_artist/2.png differ
diff --git a/public/images/emoji/google_classic/woman_artist/3.png b/public/images/emoji/google_classic/woman_artist/3.png
new file mode 100644
index 00000000000..30c7ec0ba13
Binary files /dev/null and b/public/images/emoji/google_classic/woman_artist/3.png differ
diff --git a/public/images/emoji/google_classic/woman_artist/4.png b/public/images/emoji/google_classic/woman_artist/4.png
new file mode 100644
index 00000000000..54a6491ca3b
Binary files /dev/null and b/public/images/emoji/google_classic/woman_artist/4.png differ
diff --git a/public/images/emoji/google_classic/woman_artist/5.png b/public/images/emoji/google_classic/woman_artist/5.png
new file mode 100644
index 00000000000..d1f627a7f52
Binary files /dev/null and b/public/images/emoji/google_classic/woman_artist/5.png differ
diff --git a/public/images/emoji/google_classic/woman_artist/6.png b/public/images/emoji/google_classic/woman_artist/6.png
new file mode 100644
index 00000000000..2b833ed2762
Binary files /dev/null and b/public/images/emoji/google_classic/woman_artist/6.png differ
diff --git a/public/images/emoji/google_classic/woman_astronaut.png b/public/images/emoji/google_classic/woman_astronaut.png
new file mode 100644
index 00000000000..ba7bb015264
Binary files /dev/null and b/public/images/emoji/google_classic/woman_astronaut.png differ
diff --git a/public/images/emoji/google_classic/woman_astronaut/2.png b/public/images/emoji/google_classic/woman_astronaut/2.png
new file mode 100644
index 00000000000..e862c384ce4
Binary files /dev/null and b/public/images/emoji/google_classic/woman_astronaut/2.png differ
diff --git a/public/images/emoji/google_classic/woman_astronaut/3.png b/public/images/emoji/google_classic/woman_astronaut/3.png
new file mode 100644
index 00000000000..d930d6782a7
Binary files /dev/null and b/public/images/emoji/google_classic/woman_astronaut/3.png differ
diff --git a/public/images/emoji/google_classic/woman_astronaut/4.png b/public/images/emoji/google_classic/woman_astronaut/4.png
new file mode 100644
index 00000000000..b918ebb71ec
Binary files /dev/null and b/public/images/emoji/google_classic/woman_astronaut/4.png differ
diff --git a/public/images/emoji/google_classic/woman_astronaut/5.png b/public/images/emoji/google_classic/woman_astronaut/5.png
new file mode 100644
index 00000000000..4b9ef8de2e8
Binary files /dev/null and b/public/images/emoji/google_classic/woman_astronaut/5.png differ
diff --git a/public/images/emoji/google_classic/woman_astronaut/6.png b/public/images/emoji/google_classic/woman_astronaut/6.png
new file mode 100644
index 00000000000..734c3aebc37
Binary files /dev/null and b/public/images/emoji/google_classic/woman_astronaut/6.png differ
diff --git a/public/images/emoji/google_classic/woman_cartwheeling.png b/public/images/emoji/google_classic/woman_cartwheeling.png
new file mode 100644
index 00000000000..0e8cea80597
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cartwheeling.png differ
diff --git a/public/images/emoji/google_classic/woman_cartwheeling/2.png b/public/images/emoji/google_classic/woman_cartwheeling/2.png
new file mode 100644
index 00000000000..2d2f7e2f140
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/google_classic/woman_cartwheeling/3.png b/public/images/emoji/google_classic/woman_cartwheeling/3.png
new file mode 100644
index 00000000000..cb68eb0f61a
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/google_classic/woman_cartwheeling/4.png b/public/images/emoji/google_classic/woman_cartwheeling/4.png
new file mode 100644
index 00000000000..b90689366e4
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/google_classic/woman_cartwheeling/5.png b/public/images/emoji/google_classic/woman_cartwheeling/5.png
new file mode 100644
index 00000000000..7e27a7d41d5
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/google_classic/woman_cartwheeling/6.png b/public/images/emoji/google_classic/woman_cartwheeling/6.png
new file mode 100644
index 00000000000..77c9f5f9a15
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/google_classic/woman_cook.png b/public/images/emoji/google_classic/woman_cook.png
new file mode 100644
index 00000000000..3d52a03bd6c
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cook.png differ
diff --git a/public/images/emoji/google_classic/woman_cook/2.png b/public/images/emoji/google_classic/woman_cook/2.png
new file mode 100644
index 00000000000..d374d85eb45
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cook/2.png differ
diff --git a/public/images/emoji/google_classic/woman_cook/3.png b/public/images/emoji/google_classic/woman_cook/3.png
new file mode 100644
index 00000000000..9fbf9691d3f
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cook/3.png differ
diff --git a/public/images/emoji/google_classic/woman_cook/4.png b/public/images/emoji/google_classic/woman_cook/4.png
new file mode 100644
index 00000000000..4e569837abe
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cook/4.png differ
diff --git a/public/images/emoji/google_classic/woman_cook/5.png b/public/images/emoji/google_classic/woman_cook/5.png
new file mode 100644
index 00000000000..94905cff894
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cook/5.png differ
diff --git a/public/images/emoji/google_classic/woman_cook/6.png b/public/images/emoji/google_classic/woman_cook/6.png
new file mode 100644
index 00000000000..ac35fcec3d3
Binary files /dev/null and b/public/images/emoji/google_classic/woman_cook/6.png differ
diff --git a/public/images/emoji/google_classic/woman_facepalming.png b/public/images/emoji/google_classic/woman_facepalming.png
new file mode 100644
index 00000000000..1150e087a69
Binary files /dev/null and b/public/images/emoji/google_classic/woman_facepalming.png differ
diff --git a/public/images/emoji/google_classic/woman_facepalming/2.png b/public/images/emoji/google_classic/woman_facepalming/2.png
new file mode 100644
index 00000000000..504dc1a21c7
Binary files /dev/null and b/public/images/emoji/google_classic/woman_facepalming/2.png differ
diff --git a/public/images/emoji/google_classic/woman_facepalming/3.png b/public/images/emoji/google_classic/woman_facepalming/3.png
new file mode 100644
index 00000000000..f82ee5ab23b
Binary files /dev/null and b/public/images/emoji/google_classic/woman_facepalming/3.png differ
diff --git a/public/images/emoji/google_classic/woman_facepalming/4.png b/public/images/emoji/google_classic/woman_facepalming/4.png
new file mode 100644
index 00000000000..9546f0fd92f
Binary files /dev/null and b/public/images/emoji/google_classic/woman_facepalming/4.png differ
diff --git a/public/images/emoji/google_classic/woman_facepalming/5.png b/public/images/emoji/google_classic/woman_facepalming/5.png
new file mode 100644
index 00000000000..babf0b16c81
Binary files /dev/null and b/public/images/emoji/google_classic/woman_facepalming/5.png differ
diff --git a/public/images/emoji/google_classic/woman_facepalming/6.png b/public/images/emoji/google_classic/woman_facepalming/6.png
new file mode 100644
index 00000000000..ea6855388b6
Binary files /dev/null and b/public/images/emoji/google_classic/woman_facepalming/6.png differ
diff --git a/public/images/emoji/google_classic/woman_factory_worker.png b/public/images/emoji/google_classic/woman_factory_worker.png
new file mode 100644
index 00000000000..0c932d30e58
Binary files /dev/null and b/public/images/emoji/google_classic/woman_factory_worker.png differ
diff --git a/public/images/emoji/google_classic/woman_factory_worker/2.png b/public/images/emoji/google_classic/woman_factory_worker/2.png
new file mode 100644
index 00000000000..f567bb7eaf0
Binary files /dev/null and b/public/images/emoji/google_classic/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/google_classic/woman_factory_worker/3.png b/public/images/emoji/google_classic/woman_factory_worker/3.png
new file mode 100644
index 00000000000..bdbe03d3150
Binary files /dev/null and b/public/images/emoji/google_classic/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/google_classic/woman_factory_worker/4.png b/public/images/emoji/google_classic/woman_factory_worker/4.png
new file mode 100644
index 00000000000..001e43e979d
Binary files /dev/null and b/public/images/emoji/google_classic/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/google_classic/woman_factory_worker/5.png b/public/images/emoji/google_classic/woman_factory_worker/5.png
new file mode 100644
index 00000000000..e9f0816b54d
Binary files /dev/null and b/public/images/emoji/google_classic/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/google_classic/woman_factory_worker/6.png b/public/images/emoji/google_classic/woman_factory_worker/6.png
new file mode 100644
index 00000000000..37ede74a8b6
Binary files /dev/null and b/public/images/emoji/google_classic/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/google_classic/woman_farmer.png b/public/images/emoji/google_classic/woman_farmer.png
new file mode 100644
index 00000000000..f6d6fa7a82d
Binary files /dev/null and b/public/images/emoji/google_classic/woman_farmer.png differ
diff --git a/public/images/emoji/google_classic/woman_farmer/2.png b/public/images/emoji/google_classic/woman_farmer/2.png
new file mode 100644
index 00000000000..2687d32b713
Binary files /dev/null and b/public/images/emoji/google_classic/woman_farmer/2.png differ
diff --git a/public/images/emoji/google_classic/woman_farmer/3.png b/public/images/emoji/google_classic/woman_farmer/3.png
new file mode 100644
index 00000000000..e000862b846
Binary files /dev/null and b/public/images/emoji/google_classic/woman_farmer/3.png differ
diff --git a/public/images/emoji/google_classic/woman_farmer/4.png b/public/images/emoji/google_classic/woman_farmer/4.png
new file mode 100644
index 00000000000..94cba12981c
Binary files /dev/null and b/public/images/emoji/google_classic/woman_farmer/4.png differ
diff --git a/public/images/emoji/google_classic/woman_farmer/5.png b/public/images/emoji/google_classic/woman_farmer/5.png
new file mode 100644
index 00000000000..b79e0141897
Binary files /dev/null and b/public/images/emoji/google_classic/woman_farmer/5.png differ
diff --git a/public/images/emoji/google_classic/woman_farmer/6.png b/public/images/emoji/google_classic/woman_farmer/6.png
new file mode 100644
index 00000000000..9607ee11a36
Binary files /dev/null and b/public/images/emoji/google_classic/woman_farmer/6.png differ
diff --git a/public/images/emoji/google_classic/woman_firefighter.png b/public/images/emoji/google_classic/woman_firefighter.png
new file mode 100644
index 00000000000..4ee147c7efb
Binary files /dev/null and b/public/images/emoji/google_classic/woman_firefighter.png differ
diff --git a/public/images/emoji/google_classic/woman_firefighter/2.png b/public/images/emoji/google_classic/woman_firefighter/2.png
new file mode 100644
index 00000000000..b09c0ab6b35
Binary files /dev/null and b/public/images/emoji/google_classic/woman_firefighter/2.png differ
diff --git a/public/images/emoji/google_classic/woman_firefighter/3.png b/public/images/emoji/google_classic/woman_firefighter/3.png
new file mode 100644
index 00000000000..a051784e4c4
Binary files /dev/null and b/public/images/emoji/google_classic/woman_firefighter/3.png differ
diff --git a/public/images/emoji/google_classic/woman_firefighter/4.png b/public/images/emoji/google_classic/woman_firefighter/4.png
new file mode 100644
index 00000000000..8d4a22cebe1
Binary files /dev/null and b/public/images/emoji/google_classic/woman_firefighter/4.png differ
diff --git a/public/images/emoji/google_classic/woman_firefighter/5.png b/public/images/emoji/google_classic/woman_firefighter/5.png
new file mode 100644
index 00000000000..b52abda8754
Binary files /dev/null and b/public/images/emoji/google_classic/woman_firefighter/5.png differ
diff --git a/public/images/emoji/google_classic/woman_firefighter/6.png b/public/images/emoji/google_classic/woman_firefighter/6.png
new file mode 100644
index 00000000000..57300f59de1
Binary files /dev/null and b/public/images/emoji/google_classic/woman_firefighter/6.png differ
diff --git a/public/images/emoji/google_classic/woman_health_worker.png b/public/images/emoji/google_classic/woman_health_worker.png
new file mode 100644
index 00000000000..e562c2af387
Binary files /dev/null and b/public/images/emoji/google_classic/woman_health_worker.png differ
diff --git a/public/images/emoji/google_classic/woman_health_worker/2.png b/public/images/emoji/google_classic/woman_health_worker/2.png
new file mode 100644
index 00000000000..6fad63ef216
Binary files /dev/null and b/public/images/emoji/google_classic/woman_health_worker/2.png differ
diff --git a/public/images/emoji/google_classic/woman_health_worker/3.png b/public/images/emoji/google_classic/woman_health_worker/3.png
new file mode 100644
index 00000000000..17d829a3e24
Binary files /dev/null and b/public/images/emoji/google_classic/woman_health_worker/3.png differ
diff --git a/public/images/emoji/google_classic/woman_health_worker/4.png b/public/images/emoji/google_classic/woman_health_worker/4.png
new file mode 100644
index 00000000000..97213797344
Binary files /dev/null and b/public/images/emoji/google_classic/woman_health_worker/4.png differ
diff --git a/public/images/emoji/google_classic/woman_health_worker/5.png b/public/images/emoji/google_classic/woman_health_worker/5.png
new file mode 100644
index 00000000000..7b7fcc10a67
Binary files /dev/null and b/public/images/emoji/google_classic/woman_health_worker/5.png differ
diff --git a/public/images/emoji/google_classic/woman_health_worker/6.png b/public/images/emoji/google_classic/woman_health_worker/6.png
new file mode 100644
index 00000000000..1b14b8fd353
Binary files /dev/null and b/public/images/emoji/google_classic/woman_health_worker/6.png differ
diff --git a/public/images/emoji/google_classic/woman_judge.png b/public/images/emoji/google_classic/woman_judge.png
new file mode 100644
index 00000000000..88213612984
Binary files /dev/null and b/public/images/emoji/google_classic/woman_judge.png differ
diff --git a/public/images/emoji/google_classic/woman_judge/2.png b/public/images/emoji/google_classic/woman_judge/2.png
new file mode 100644
index 00000000000..c9dac07cb5f
Binary files /dev/null and b/public/images/emoji/google_classic/woman_judge/2.png differ
diff --git a/public/images/emoji/google_classic/woman_judge/3.png b/public/images/emoji/google_classic/woman_judge/3.png
new file mode 100644
index 00000000000..8bad4ae11a9
Binary files /dev/null and b/public/images/emoji/google_classic/woman_judge/3.png differ
diff --git a/public/images/emoji/google_classic/woman_judge/4.png b/public/images/emoji/google_classic/woman_judge/4.png
new file mode 100644
index 00000000000..a152ae155f7
Binary files /dev/null and b/public/images/emoji/google_classic/woman_judge/4.png differ
diff --git a/public/images/emoji/google_classic/woman_judge/5.png b/public/images/emoji/google_classic/woman_judge/5.png
new file mode 100644
index 00000000000..3004d95c7ae
Binary files /dev/null and b/public/images/emoji/google_classic/woman_judge/5.png differ
diff --git a/public/images/emoji/google_classic/woman_judge/6.png b/public/images/emoji/google_classic/woman_judge/6.png
new file mode 100644
index 00000000000..4ae2a11f828
Binary files /dev/null and b/public/images/emoji/google_classic/woman_judge/6.png differ
diff --git a/public/images/emoji/google_classic/woman_juggling.png b/public/images/emoji/google_classic/woman_juggling.png
new file mode 100644
index 00000000000..9d36683a89b
Binary files /dev/null and b/public/images/emoji/google_classic/woman_juggling.png differ
diff --git a/public/images/emoji/google_classic/woman_juggling/2.png b/public/images/emoji/google_classic/woman_juggling/2.png
new file mode 100644
index 00000000000..65df1c1aaa2
Binary files /dev/null and b/public/images/emoji/google_classic/woman_juggling/2.png differ
diff --git a/public/images/emoji/google_classic/woman_juggling/3.png b/public/images/emoji/google_classic/woman_juggling/3.png
new file mode 100644
index 00000000000..4ff9236cb10
Binary files /dev/null and b/public/images/emoji/google_classic/woman_juggling/3.png differ
diff --git a/public/images/emoji/google_classic/woman_juggling/4.png b/public/images/emoji/google_classic/woman_juggling/4.png
new file mode 100644
index 00000000000..324f50acc5d
Binary files /dev/null and b/public/images/emoji/google_classic/woman_juggling/4.png differ
diff --git a/public/images/emoji/google_classic/woman_juggling/5.png b/public/images/emoji/google_classic/woman_juggling/5.png
new file mode 100644
index 00000000000..e11e82cd354
Binary files /dev/null and b/public/images/emoji/google_classic/woman_juggling/5.png differ
diff --git a/public/images/emoji/google_classic/woman_juggling/6.png b/public/images/emoji/google_classic/woman_juggling/6.png
new file mode 100644
index 00000000000..9b81b668bb3
Binary files /dev/null and b/public/images/emoji/google_classic/woman_juggling/6.png differ
diff --git a/public/images/emoji/google_classic/woman_mechanic.png b/public/images/emoji/google_classic/woman_mechanic.png
new file mode 100644
index 00000000000..7bd6b746eeb
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mechanic.png differ
diff --git a/public/images/emoji/google_classic/woman_mechanic/2.png b/public/images/emoji/google_classic/woman_mechanic/2.png
new file mode 100644
index 00000000000..271992d839a
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mechanic/2.png differ
diff --git a/public/images/emoji/google_classic/woman_mechanic/3.png b/public/images/emoji/google_classic/woman_mechanic/3.png
new file mode 100644
index 00000000000..c7f44fe2d82
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mechanic/3.png differ
diff --git a/public/images/emoji/google_classic/woman_mechanic/4.png b/public/images/emoji/google_classic/woman_mechanic/4.png
new file mode 100644
index 00000000000..a871392feb0
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mechanic/4.png differ
diff --git a/public/images/emoji/google_classic/woman_mechanic/5.png b/public/images/emoji/google_classic/woman_mechanic/5.png
new file mode 100644
index 00000000000..662bdef9dbd
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mechanic/5.png differ
diff --git a/public/images/emoji/google_classic/woman_mechanic/6.png b/public/images/emoji/google_classic/woman_mechanic/6.png
new file mode 100644
index 00000000000..e3b4a04255b
Binary files /dev/null and b/public/images/emoji/google_classic/woman_mechanic/6.png differ
diff --git a/public/images/emoji/google_classic/woman_office_worker.png b/public/images/emoji/google_classic/woman_office_worker.png
new file mode 100644
index 00000000000..b0edf1db138
Binary files /dev/null and b/public/images/emoji/google_classic/woman_office_worker.png differ
diff --git a/public/images/emoji/google_classic/woman_office_worker/2.png b/public/images/emoji/google_classic/woman_office_worker/2.png
new file mode 100644
index 00000000000..0a69994b3be
Binary files /dev/null and b/public/images/emoji/google_classic/woman_office_worker/2.png differ
diff --git a/public/images/emoji/google_classic/woman_office_worker/3.png b/public/images/emoji/google_classic/woman_office_worker/3.png
new file mode 100644
index 00000000000..6749389fc0a
Binary files /dev/null and b/public/images/emoji/google_classic/woman_office_worker/3.png differ
diff --git a/public/images/emoji/google_classic/woman_office_worker/4.png b/public/images/emoji/google_classic/woman_office_worker/4.png
new file mode 100644
index 00000000000..75595bc15f0
Binary files /dev/null and b/public/images/emoji/google_classic/woman_office_worker/4.png differ
diff --git a/public/images/emoji/google_classic/woman_office_worker/5.png b/public/images/emoji/google_classic/woman_office_worker/5.png
new file mode 100644
index 00000000000..27cc0d94642
Binary files /dev/null and b/public/images/emoji/google_classic/woman_office_worker/5.png differ
diff --git a/public/images/emoji/google_classic/woman_office_worker/6.png b/public/images/emoji/google_classic/woman_office_worker/6.png
new file mode 100644
index 00000000000..9850fa78a10
Binary files /dev/null and b/public/images/emoji/google_classic/woman_office_worker/6.png differ
diff --git a/public/images/emoji/google_classic/woman_pilot.png b/public/images/emoji/google_classic/woman_pilot.png
new file mode 100644
index 00000000000..ff343aa6518
Binary files /dev/null and b/public/images/emoji/google_classic/woman_pilot.png differ
diff --git a/public/images/emoji/google_classic/woman_pilot/2.png b/public/images/emoji/google_classic/woman_pilot/2.png
new file mode 100644
index 00000000000..49945ba7502
Binary files /dev/null and b/public/images/emoji/google_classic/woman_pilot/2.png differ
diff --git a/public/images/emoji/google_classic/woman_pilot/3.png b/public/images/emoji/google_classic/woman_pilot/3.png
new file mode 100644
index 00000000000..ead380c5eb2
Binary files /dev/null and b/public/images/emoji/google_classic/woman_pilot/3.png differ
diff --git a/public/images/emoji/google_classic/woman_pilot/4.png b/public/images/emoji/google_classic/woman_pilot/4.png
new file mode 100644
index 00000000000..983576f78ca
Binary files /dev/null and b/public/images/emoji/google_classic/woman_pilot/4.png differ
diff --git a/public/images/emoji/google_classic/woman_pilot/5.png b/public/images/emoji/google_classic/woman_pilot/5.png
new file mode 100644
index 00000000000..3e26e10e085
Binary files /dev/null and b/public/images/emoji/google_classic/woman_pilot/5.png differ
diff --git a/public/images/emoji/google_classic/woman_pilot/6.png b/public/images/emoji/google_classic/woman_pilot/6.png
new file mode 100644
index 00000000000..a317bac91b4
Binary files /dev/null and b/public/images/emoji/google_classic/woman_pilot/6.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_handball.png b/public/images/emoji/google_classic/woman_playing_handball.png
new file mode 100644
index 00000000000..78210ee8313
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_handball.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_handball/2.png b/public/images/emoji/google_classic/woman_playing_handball/2.png
new file mode 100644
index 00000000000..bfa349b9e7e
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_handball/3.png b/public/images/emoji/google_classic/woman_playing_handball/3.png
new file mode 100644
index 00000000000..bfb67b63f94
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_handball/4.png b/public/images/emoji/google_classic/woman_playing_handball/4.png
new file mode 100644
index 00000000000..7b2ff715da2
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_handball/5.png b/public/images/emoji/google_classic/woman_playing_handball/5.png
new file mode 100644
index 00000000000..5a2c3d7d33c
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_handball/6.png b/public/images/emoji/google_classic/woman_playing_handball/6.png
new file mode 100644
index 00000000000..4188b89eb2d
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_water_polo.png b/public/images/emoji/google_classic/woman_playing_water_polo.png
new file mode 100644
index 00000000000..836c32604e7
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_water_polo/2.png b/public/images/emoji/google_classic/woman_playing_water_polo/2.png
new file mode 100644
index 00000000000..05fee0ebf44
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_water_polo/3.png b/public/images/emoji/google_classic/woman_playing_water_polo/3.png
new file mode 100644
index 00000000000..6463f5cc3cf
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_water_polo/4.png b/public/images/emoji/google_classic/woman_playing_water_polo/4.png
new file mode 100644
index 00000000000..4f380cce5e0
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_water_polo/5.png b/public/images/emoji/google_classic/woman_playing_water_polo/5.png
new file mode 100644
index 00000000000..978b23501b7
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/google_classic/woman_playing_water_polo/6.png b/public/images/emoji/google_classic/woman_playing_water_polo/6.png
new file mode 100644
index 00000000000..c5971669bfc
Binary files /dev/null and b/public/images/emoji/google_classic/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/google_classic/woman_scientist.png b/public/images/emoji/google_classic/woman_scientist.png
new file mode 100644
index 00000000000..6dfb912d4a4
Binary files /dev/null and b/public/images/emoji/google_classic/woman_scientist.png differ
diff --git a/public/images/emoji/google_classic/woman_scientist/2.png b/public/images/emoji/google_classic/woman_scientist/2.png
new file mode 100644
index 00000000000..b584aef3e69
Binary files /dev/null and b/public/images/emoji/google_classic/woman_scientist/2.png differ
diff --git a/public/images/emoji/google_classic/woman_scientist/3.png b/public/images/emoji/google_classic/woman_scientist/3.png
new file mode 100644
index 00000000000..9c8f6e9a889
Binary files /dev/null and b/public/images/emoji/google_classic/woman_scientist/3.png differ
diff --git a/public/images/emoji/google_classic/woman_scientist/4.png b/public/images/emoji/google_classic/woman_scientist/4.png
new file mode 100644
index 00000000000..74cc6b8536f
Binary files /dev/null and b/public/images/emoji/google_classic/woman_scientist/4.png differ
diff --git a/public/images/emoji/google_classic/woman_scientist/5.png b/public/images/emoji/google_classic/woman_scientist/5.png
new file mode 100644
index 00000000000..15db1c52cee
Binary files /dev/null and b/public/images/emoji/google_classic/woman_scientist/5.png differ
diff --git a/public/images/emoji/google_classic/woman_scientist/6.png b/public/images/emoji/google_classic/woman_scientist/6.png
new file mode 100644
index 00000000000..0277b89b2a7
Binary files /dev/null and b/public/images/emoji/google_classic/woman_scientist/6.png differ
diff --git a/public/images/emoji/google_classic/woman_shrugging.png b/public/images/emoji/google_classic/woman_shrugging.png
new file mode 100644
index 00000000000..25eff05d606
Binary files /dev/null and b/public/images/emoji/google_classic/woman_shrugging.png differ
diff --git a/public/images/emoji/google_classic/woman_shrugging/2.png b/public/images/emoji/google_classic/woman_shrugging/2.png
new file mode 100644
index 00000000000..56c6c650696
Binary files /dev/null and b/public/images/emoji/google_classic/woman_shrugging/2.png differ
diff --git a/public/images/emoji/google_classic/woman_shrugging/3.png b/public/images/emoji/google_classic/woman_shrugging/3.png
new file mode 100644
index 00000000000..ff1a4bf6b6e
Binary files /dev/null and b/public/images/emoji/google_classic/woman_shrugging/3.png differ
diff --git a/public/images/emoji/google_classic/woman_shrugging/4.png b/public/images/emoji/google_classic/woman_shrugging/4.png
new file mode 100644
index 00000000000..661b0945e89
Binary files /dev/null and b/public/images/emoji/google_classic/woman_shrugging/4.png differ
diff --git a/public/images/emoji/google_classic/woman_shrugging/5.png b/public/images/emoji/google_classic/woman_shrugging/5.png
new file mode 100644
index 00000000000..d10547e374c
Binary files /dev/null and b/public/images/emoji/google_classic/woman_shrugging/5.png differ
diff --git a/public/images/emoji/google_classic/woman_shrugging/6.png b/public/images/emoji/google_classic/woman_shrugging/6.png
new file mode 100644
index 00000000000..a0c0aca2c3f
Binary files /dev/null and b/public/images/emoji/google_classic/woman_shrugging/6.png differ
diff --git a/public/images/emoji/google_classic/woman_singer.png b/public/images/emoji/google_classic/woman_singer.png
new file mode 100644
index 00000000000..cc016795622
Binary files /dev/null and b/public/images/emoji/google_classic/woman_singer.png differ
diff --git a/public/images/emoji/google_classic/woman_singer/2.png b/public/images/emoji/google_classic/woman_singer/2.png
new file mode 100644
index 00000000000..c5a3581bed3
Binary files /dev/null and b/public/images/emoji/google_classic/woman_singer/2.png differ
diff --git a/public/images/emoji/google_classic/woman_singer/3.png b/public/images/emoji/google_classic/woman_singer/3.png
new file mode 100644
index 00000000000..f56992a3f57
Binary files /dev/null and b/public/images/emoji/google_classic/woman_singer/3.png differ
diff --git a/public/images/emoji/google_classic/woman_singer/4.png b/public/images/emoji/google_classic/woman_singer/4.png
new file mode 100644
index 00000000000..51cce0e6bfe
Binary files /dev/null and b/public/images/emoji/google_classic/woman_singer/4.png differ
diff --git a/public/images/emoji/google_classic/woman_singer/5.png b/public/images/emoji/google_classic/woman_singer/5.png
new file mode 100644
index 00000000000..7da9a69649f
Binary files /dev/null and b/public/images/emoji/google_classic/woman_singer/5.png differ
diff --git a/public/images/emoji/google_classic/woman_singer/6.png b/public/images/emoji/google_classic/woman_singer/6.png
new file mode 100644
index 00000000000..497090e161b
Binary files /dev/null and b/public/images/emoji/google_classic/woman_singer/6.png differ
diff --git a/public/images/emoji/google_classic/woman_student.png b/public/images/emoji/google_classic/woman_student.png
new file mode 100644
index 00000000000..603e6a3fc72
Binary files /dev/null and b/public/images/emoji/google_classic/woman_student.png differ
diff --git a/public/images/emoji/google_classic/woman_student/2.png b/public/images/emoji/google_classic/woman_student/2.png
new file mode 100644
index 00000000000..2c303f03bb8
Binary files /dev/null and b/public/images/emoji/google_classic/woman_student/2.png differ
diff --git a/public/images/emoji/google_classic/woman_student/3.png b/public/images/emoji/google_classic/woman_student/3.png
new file mode 100644
index 00000000000..b697785f49b
Binary files /dev/null and b/public/images/emoji/google_classic/woman_student/3.png differ
diff --git a/public/images/emoji/google_classic/woman_student/4.png b/public/images/emoji/google_classic/woman_student/4.png
new file mode 100644
index 00000000000..4c53f7cb938
Binary files /dev/null and b/public/images/emoji/google_classic/woman_student/4.png differ
diff --git a/public/images/emoji/google_classic/woman_student/5.png b/public/images/emoji/google_classic/woman_student/5.png
new file mode 100644
index 00000000000..0e82b068ca9
Binary files /dev/null and b/public/images/emoji/google_classic/woman_student/5.png differ
diff --git a/public/images/emoji/google_classic/woman_student/6.png b/public/images/emoji/google_classic/woman_student/6.png
new file mode 100644
index 00000000000..22afd6de0e8
Binary files /dev/null and b/public/images/emoji/google_classic/woman_student/6.png differ
diff --git a/public/images/emoji/google_classic/woman_teacher.png b/public/images/emoji/google_classic/woman_teacher.png
new file mode 100644
index 00000000000..e2efca98df0
Binary files /dev/null and b/public/images/emoji/google_classic/woman_teacher.png differ
diff --git a/public/images/emoji/google_classic/woman_teacher/2.png b/public/images/emoji/google_classic/woman_teacher/2.png
new file mode 100644
index 00000000000..3e7fbb11fa1
Binary files /dev/null and b/public/images/emoji/google_classic/woman_teacher/2.png differ
diff --git a/public/images/emoji/google_classic/woman_teacher/3.png b/public/images/emoji/google_classic/woman_teacher/3.png
new file mode 100644
index 00000000000..b471f445a77
Binary files /dev/null and b/public/images/emoji/google_classic/woman_teacher/3.png differ
diff --git a/public/images/emoji/google_classic/woman_teacher/4.png b/public/images/emoji/google_classic/woman_teacher/4.png
new file mode 100644
index 00000000000..a9a14a2b5d8
Binary files /dev/null and b/public/images/emoji/google_classic/woman_teacher/4.png differ
diff --git a/public/images/emoji/google_classic/woman_teacher/5.png b/public/images/emoji/google_classic/woman_teacher/5.png
new file mode 100644
index 00000000000..78a76cebdd1
Binary files /dev/null and b/public/images/emoji/google_classic/woman_teacher/5.png differ
diff --git a/public/images/emoji/google_classic/woman_teacher/6.png b/public/images/emoji/google_classic/woman_teacher/6.png
new file mode 100644
index 00000000000..43027a669fc
Binary files /dev/null and b/public/images/emoji/google_classic/woman_teacher/6.png differ
diff --git a/public/images/emoji/google_classic/woman_technologist.png b/public/images/emoji/google_classic/woman_technologist.png
new file mode 100644
index 00000000000..b0a2dba5561
Binary files /dev/null and b/public/images/emoji/google_classic/woman_technologist.png differ
diff --git a/public/images/emoji/google_classic/woman_technologist/2.png b/public/images/emoji/google_classic/woman_technologist/2.png
new file mode 100644
index 00000000000..b5e51293174
Binary files /dev/null and b/public/images/emoji/google_classic/woman_technologist/2.png differ
diff --git a/public/images/emoji/google_classic/woman_technologist/3.png b/public/images/emoji/google_classic/woman_technologist/3.png
new file mode 100644
index 00000000000..b4f93324c21
Binary files /dev/null and b/public/images/emoji/google_classic/woman_technologist/3.png differ
diff --git a/public/images/emoji/google_classic/woman_technologist/4.png b/public/images/emoji/google_classic/woman_technologist/4.png
new file mode 100644
index 00000000000..c3b4b21336f
Binary files /dev/null and b/public/images/emoji/google_classic/woman_technologist/4.png differ
diff --git a/public/images/emoji/google_classic/woman_technologist/5.png b/public/images/emoji/google_classic/woman_technologist/5.png
new file mode 100644
index 00000000000..8329970e7b8
Binary files /dev/null and b/public/images/emoji/google_classic/woman_technologist/5.png differ
diff --git a/public/images/emoji/google_classic/woman_technologist/6.png b/public/images/emoji/google_classic/woman_technologist/6.png
new file mode 100644
index 00000000000..a0aff93692d
Binary files /dev/null and b/public/images/emoji/google_classic/woman_technologist/6.png differ
diff --git a/public/images/emoji/google_classic/woman_with_headscarf.png b/public/images/emoji/google_classic/woman_with_headscarf.png
new file mode 100644
index 00000000000..6b3731cac84
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_headscarf.png differ
diff --git a/public/images/emoji/google_classic/woman_with_headscarf/2.png b/public/images/emoji/google_classic/woman_with_headscarf/2.png
new file mode 100644
index 00000000000..511414ad6c6
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/google_classic/woman_with_headscarf/3.png b/public/images/emoji/google_classic/woman_with_headscarf/3.png
new file mode 100644
index 00000000000..af954353790
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/google_classic/woman_with_headscarf/4.png b/public/images/emoji/google_classic/woman_with_headscarf/4.png
new file mode 100644
index 00000000000..355bdeb6361
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/google_classic/woman_with_headscarf/5.png b/public/images/emoji/google_classic/woman_with_headscarf/5.png
new file mode 100644
index 00000000000..8d0ad7202e3
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/google_classic/woman_with_headscarf/6.png b/public/images/emoji/google_classic/woman_with_headscarf/6.png
new file mode 100644
index 00000000000..3c49195f876
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/google_classic/woman_with_turban.png b/public/images/emoji/google_classic/woman_with_turban.png
new file mode 100644
index 00000000000..05c9316a118
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_turban.png differ
diff --git a/public/images/emoji/google_classic/woman_with_turban/2.png b/public/images/emoji/google_classic/woman_with_turban/2.png
new file mode 100644
index 00000000000..7df227c9470
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_turban/2.png differ
diff --git a/public/images/emoji/google_classic/woman_with_turban/3.png b/public/images/emoji/google_classic/woman_with_turban/3.png
new file mode 100644
index 00000000000..68df0e76248
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_turban/3.png differ
diff --git a/public/images/emoji/google_classic/woman_with_turban/4.png b/public/images/emoji/google_classic/woman_with_turban/4.png
new file mode 100644
index 00000000000..374fd940959
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_turban/4.png differ
diff --git a/public/images/emoji/google_classic/woman_with_turban/5.png b/public/images/emoji/google_classic/woman_with_turban/5.png
new file mode 100644
index 00000000000..03fa002909f
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_turban/5.png differ
diff --git a/public/images/emoji/google_classic/woman_with_turban/6.png b/public/images/emoji/google_classic/woman_with_turban/6.png
new file mode 100644
index 00000000000..224e2749c3d
Binary files /dev/null and b/public/images/emoji/google_classic/woman_with_turban/6.png differ
diff --git a/public/images/emoji/google_classic/womans_clothes.png b/public/images/emoji/google_classic/womans_clothes.png
new file mode 100644
index 00000000000..23f3f022bac
Binary files /dev/null and b/public/images/emoji/google_classic/womans_clothes.png differ
diff --git a/public/images/emoji/google_classic/womans_hat.png b/public/images/emoji/google_classic/womans_hat.png
new file mode 100644
index 00000000000..bb6e9b9a58f
Binary files /dev/null and b/public/images/emoji/google_classic/womans_hat.png differ
diff --git a/public/images/emoji/google_classic/women_wrestling.png b/public/images/emoji/google_classic/women_wrestling.png
new file mode 100644
index 00000000000..27be8a9655c
Binary files /dev/null and b/public/images/emoji/google_classic/women_wrestling.png differ
diff --git a/public/images/emoji/google_classic/womens.png b/public/images/emoji/google_classic/womens.png
new file mode 100644
index 00000000000..9c8b38392b2
Binary files /dev/null and b/public/images/emoji/google_classic/womens.png differ
diff --git a/public/images/emoji/google_classic/world_map.png b/public/images/emoji/google_classic/world_map.png
new file mode 100644
index 00000000000..fc4cfafe8a4
Binary files /dev/null and b/public/images/emoji/google_classic/world_map.png differ
diff --git a/public/images/emoji/google_classic/worried.png b/public/images/emoji/google_classic/worried.png
new file mode 100644
index 00000000000..6a30663f232
Binary files /dev/null and b/public/images/emoji/google_classic/worried.png differ
diff --git a/public/images/emoji/google_classic/worship_symbol.png b/public/images/emoji/google_classic/worship_symbol.png
new file mode 100644
index 00000000000..7783233e9f9
Binary files /dev/null and b/public/images/emoji/google_classic/worship_symbol.png differ
diff --git a/public/images/emoji/google_classic/wrench.png b/public/images/emoji/google_classic/wrench.png
new file mode 100644
index 00000000000..ffd85982eab
Binary files /dev/null and b/public/images/emoji/google_classic/wrench.png differ
diff --git a/public/images/emoji/google_classic/writing_hand.png b/public/images/emoji/google_classic/writing_hand.png
new file mode 100644
index 00000000000..608570fd5b7
Binary files /dev/null and b/public/images/emoji/google_classic/writing_hand.png differ
diff --git a/public/images/emoji/google_classic/writing_hand/2.png b/public/images/emoji/google_classic/writing_hand/2.png
new file mode 100644
index 00000000000..2066e74c912
Binary files /dev/null and b/public/images/emoji/google_classic/writing_hand/2.png differ
diff --git a/public/images/emoji/google_classic/writing_hand/3.png b/public/images/emoji/google_classic/writing_hand/3.png
new file mode 100644
index 00000000000..c3340ea5d1c
Binary files /dev/null and b/public/images/emoji/google_classic/writing_hand/3.png differ
diff --git a/public/images/emoji/google_classic/writing_hand/4.png b/public/images/emoji/google_classic/writing_hand/4.png
new file mode 100644
index 00000000000..c6fd39feb76
Binary files /dev/null and b/public/images/emoji/google_classic/writing_hand/4.png differ
diff --git a/public/images/emoji/google_classic/writing_hand/5.png b/public/images/emoji/google_classic/writing_hand/5.png
new file mode 100644
index 00000000000..8098829f608
Binary files /dev/null and b/public/images/emoji/google_classic/writing_hand/5.png differ
diff --git a/public/images/emoji/google_classic/writing_hand/6.png b/public/images/emoji/google_classic/writing_hand/6.png
new file mode 100644
index 00000000000..b91550cdd63
Binary files /dev/null and b/public/images/emoji/google_classic/writing_hand/6.png differ
diff --git a/public/images/emoji/google_classic/x.png b/public/images/emoji/google_classic/x.png
new file mode 100644
index 00000000000..b950ece572f
Binary files /dev/null and b/public/images/emoji/google_classic/x.png differ
diff --git a/public/images/emoji/google_classic/yellow_heart.png b/public/images/emoji/google_classic/yellow_heart.png
new file mode 100644
index 00000000000..86d15a015b8
Binary files /dev/null and b/public/images/emoji/google_classic/yellow_heart.png differ
diff --git a/public/images/emoji/google_classic/yemen.png b/public/images/emoji/google_classic/yemen.png
new file mode 100644
index 00000000000..c68b313ea5f
Binary files /dev/null and b/public/images/emoji/google_classic/yemen.png differ
diff --git a/public/images/emoji/google_classic/yen.png b/public/images/emoji/google_classic/yen.png
new file mode 100644
index 00000000000..b76abb89c61
Binary files /dev/null and b/public/images/emoji/google_classic/yen.png differ
diff --git a/public/images/emoji/google_classic/yin_yang.png b/public/images/emoji/google_classic/yin_yang.png
new file mode 100644
index 00000000000..143c24116e3
Binary files /dev/null and b/public/images/emoji/google_classic/yin_yang.png differ
diff --git a/public/images/emoji/google_classic/yum.png b/public/images/emoji/google_classic/yum.png
new file mode 100644
index 00000000000..9ca8fab0131
Binary files /dev/null and b/public/images/emoji/google_classic/yum.png differ
diff --git a/public/images/emoji/google_classic/zambia.png b/public/images/emoji/google_classic/zambia.png
new file mode 100644
index 00000000000..7b283558544
Binary files /dev/null and b/public/images/emoji/google_classic/zambia.png differ
diff --git a/public/images/emoji/google_classic/zap.png b/public/images/emoji/google_classic/zap.png
new file mode 100644
index 00000000000..5fbb7ca0035
Binary files /dev/null and b/public/images/emoji/google_classic/zap.png differ
diff --git a/public/images/emoji/google_classic/zebra.png b/public/images/emoji/google_classic/zebra.png
new file mode 100644
index 00000000000..6faa14f55dc
Binary files /dev/null and b/public/images/emoji/google_classic/zebra.png differ
diff --git a/public/images/emoji/google_classic/zero.png b/public/images/emoji/google_classic/zero.png
new file mode 100644
index 00000000000..ce02394db08
Binary files /dev/null and b/public/images/emoji/google_classic/zero.png differ
diff --git a/public/images/emoji/google_classic/zimbabwe.png b/public/images/emoji/google_classic/zimbabwe.png
new file mode 100644
index 00000000000..fc55fe87b53
Binary files /dev/null and b/public/images/emoji/google_classic/zimbabwe.png differ
diff --git a/public/images/emoji/google_classic/zipper_mouth.png b/public/images/emoji/google_classic/zipper_mouth.png
new file mode 100644
index 00000000000..6a9ed782fae
Binary files /dev/null and b/public/images/emoji/google_classic/zipper_mouth.png differ
diff --git a/public/images/emoji/google_classic/zipper_mouth_face.png b/public/images/emoji/google_classic/zipper_mouth_face.png
new file mode 100644
index 00000000000..6a9ed782fae
Binary files /dev/null and b/public/images/emoji/google_classic/zipper_mouth_face.png differ
diff --git a/public/images/emoji/google_classic/zombie.png b/public/images/emoji/google_classic/zombie.png
new file mode 100644
index 00000000000..1bf288fcd4c
Binary files /dev/null and b/public/images/emoji/google_classic/zombie.png differ
diff --git a/public/images/emoji/google_classic/zzz.png b/public/images/emoji/google_classic/zzz.png
new file mode 100644
index 00000000000..1e6a2b5a161
Binary files /dev/null and b/public/images/emoji/google_classic/zzz.png differ
diff --git a/public/images/emoji/twitter/+1/2.png b/public/images/emoji/twitter/+1/2.png
new file mode 100644
index 00000000000..e68d1b077a6
Binary files /dev/null and b/public/images/emoji/twitter/+1/2.png differ
diff --git a/public/images/emoji/twitter/+1/3.png b/public/images/emoji/twitter/+1/3.png
new file mode 100644
index 00000000000..0123a0f8a19
Binary files /dev/null and b/public/images/emoji/twitter/+1/3.png differ
diff --git a/public/images/emoji/twitter/+1/4.png b/public/images/emoji/twitter/+1/4.png
new file mode 100644
index 00000000000..19a0e463893
Binary files /dev/null and b/public/images/emoji/twitter/+1/4.png differ
diff --git a/public/images/emoji/twitter/+1/5.png b/public/images/emoji/twitter/+1/5.png
new file mode 100644
index 00000000000..209c0e4e5b6
Binary files /dev/null and b/public/images/emoji/twitter/+1/5.png differ
diff --git a/public/images/emoji/twitter/+1/6.png b/public/images/emoji/twitter/+1/6.png
new file mode 100644
index 00000000000..9deccd899a9
Binary files /dev/null and b/public/images/emoji/twitter/+1/6.png differ
diff --git a/public/images/emoji/twitter/-1/2.png b/public/images/emoji/twitter/-1/2.png
new file mode 100644
index 00000000000..a3c768cdd0b
Binary files /dev/null and b/public/images/emoji/twitter/-1/2.png differ
diff --git a/public/images/emoji/twitter/-1/3.png b/public/images/emoji/twitter/-1/3.png
new file mode 100644
index 00000000000..2737de44b52
Binary files /dev/null and b/public/images/emoji/twitter/-1/3.png differ
diff --git a/public/images/emoji/twitter/-1/4.png b/public/images/emoji/twitter/-1/4.png
new file mode 100644
index 00000000000..3b87d1364c2
Binary files /dev/null and b/public/images/emoji/twitter/-1/4.png differ
diff --git a/public/images/emoji/twitter/-1/5.png b/public/images/emoji/twitter/-1/5.png
new file mode 100644
index 00000000000..4a8ea96d5b3
Binary files /dev/null and b/public/images/emoji/twitter/-1/5.png differ
diff --git a/public/images/emoji/twitter/-1/6.png b/public/images/emoji/twitter/-1/6.png
new file mode 100644
index 00000000000..3bec88e6afd
Binary files /dev/null and b/public/images/emoji/twitter/-1/6.png differ
diff --git a/public/images/emoji/twitter/1st_place_medal.png b/public/images/emoji/twitter/1st_place_medal.png
new file mode 100644
index 00000000000..92235c693c6
Binary files /dev/null and b/public/images/emoji/twitter/1st_place_medal.png differ
diff --git a/public/images/emoji/twitter/2nd_place_medal.png b/public/images/emoji/twitter/2nd_place_medal.png
new file mode 100644
index 00000000000..6eb5db8e21f
Binary files /dev/null and b/public/images/emoji/twitter/2nd_place_medal.png differ
diff --git a/public/images/emoji/twitter/3rd_place_medal.png b/public/images/emoji/twitter/3rd_place_medal.png
new file mode 100644
index 00000000000..4676f24e21a
Binary files /dev/null and b/public/images/emoji/twitter/3rd_place_medal.png differ
diff --git a/public/images/emoji/twitter/adult.png b/public/images/emoji/twitter/adult.png
new file mode 100644
index 00000000000..53a5eb2ccb9
Binary files /dev/null and b/public/images/emoji/twitter/adult.png differ
diff --git a/public/images/emoji/twitter/adult/2.png b/public/images/emoji/twitter/adult/2.png
new file mode 100644
index 00000000000..8f30fc9e389
Binary files /dev/null and b/public/images/emoji/twitter/adult/2.png differ
diff --git a/public/images/emoji/twitter/adult/3.png b/public/images/emoji/twitter/adult/3.png
new file mode 100644
index 00000000000..36a4e57d1f8
Binary files /dev/null and b/public/images/emoji/twitter/adult/3.png differ
diff --git a/public/images/emoji/twitter/adult/4.png b/public/images/emoji/twitter/adult/4.png
new file mode 100644
index 00000000000..77c57605e93
Binary files /dev/null and b/public/images/emoji/twitter/adult/4.png differ
diff --git a/public/images/emoji/twitter/adult/5.png b/public/images/emoji/twitter/adult/5.png
new file mode 100644
index 00000000000..58bcd6a2fcf
Binary files /dev/null and b/public/images/emoji/twitter/adult/5.png differ
diff --git a/public/images/emoji/twitter/adult/6.png b/public/images/emoji/twitter/adult/6.png
new file mode 100644
index 00000000000..3bc6b5a57a3
Binary files /dev/null and b/public/images/emoji/twitter/adult/6.png differ
diff --git a/public/images/emoji/twitter/afghanistan.png b/public/images/emoji/twitter/afghanistan.png
new file mode 100644
index 00000000000..50c4c6b272e
Binary files /dev/null and b/public/images/emoji/twitter/afghanistan.png differ
diff --git a/public/images/emoji/twitter/airplane.png b/public/images/emoji/twitter/airplane.png
index df94ee2ce9b..f5a217ef09a 100644
Binary files a/public/images/emoji/twitter/airplane.png and b/public/images/emoji/twitter/airplane.png differ
diff --git a/public/images/emoji/twitter/airplane_arriving.png b/public/images/emoji/twitter/airplane_arriving.png
index 59795d6830b..0585a1c36c2 100644
Binary files a/public/images/emoji/twitter/airplane_arriving.png and b/public/images/emoji/twitter/airplane_arriving.png differ
diff --git a/public/images/emoji/twitter/airplane_departure.png b/public/images/emoji/twitter/airplane_departure.png
index 62bc81a282c..dc86670a865 100644
Binary files a/public/images/emoji/twitter/airplane_departure.png and b/public/images/emoji/twitter/airplane_departure.png differ
diff --git a/public/images/emoji/twitter/airplane_small.png b/public/images/emoji/twitter/airplane_small.png
index 6784909fffb..47399184f72 100644
Binary files a/public/images/emoji/twitter/airplane_small.png and b/public/images/emoji/twitter/airplane_small.png differ
diff --git a/public/images/emoji/twitter/aland_islands.png b/public/images/emoji/twitter/aland_islands.png
new file mode 100644
index 00000000000..2ce958b9202
Binary files /dev/null and b/public/images/emoji/twitter/aland_islands.png differ
diff --git a/public/images/emoji/twitter/alarm_clock.png b/public/images/emoji/twitter/alarm_clock.png
index 35417969438..09794594d78 100644
Binary files a/public/images/emoji/twitter/alarm_clock.png and b/public/images/emoji/twitter/alarm_clock.png differ
diff --git a/public/images/emoji/twitter/albania.png b/public/images/emoji/twitter/albania.png
new file mode 100644
index 00000000000..8d428869d47
Binary files /dev/null and b/public/images/emoji/twitter/albania.png differ
diff --git a/public/images/emoji/twitter/algeria.png b/public/images/emoji/twitter/algeria.png
new file mode 100644
index 00000000000..cd3dc01ab28
Binary files /dev/null and b/public/images/emoji/twitter/algeria.png differ
diff --git a/public/images/emoji/twitter/american_samoa.png b/public/images/emoji/twitter/american_samoa.png
new file mode 100644
index 00000000000..f4f58e2e257
Binary files /dev/null and b/public/images/emoji/twitter/american_samoa.png differ
diff --git a/public/images/emoji/twitter/amphora.png b/public/images/emoji/twitter/amphora.png
index 3f32cad88ba..550f047067a 100644
Binary files a/public/images/emoji/twitter/amphora.png and b/public/images/emoji/twitter/amphora.png differ
diff --git a/public/images/emoji/twitter/andorra.png b/public/images/emoji/twitter/andorra.png
new file mode 100644
index 00000000000..0fd73782c23
Binary files /dev/null and b/public/images/emoji/twitter/andorra.png differ
diff --git a/public/images/emoji/twitter/angel.png b/public/images/emoji/twitter/angel.png
index 5a4f3c5c271..718fed87a3c 100644
Binary files a/public/images/emoji/twitter/angel.png and b/public/images/emoji/twitter/angel.png differ
diff --git a/public/images/emoji/twitter/angel/2.png b/public/images/emoji/twitter/angel/2.png
new file mode 100644
index 00000000000..b1363242c3e
Binary files /dev/null and b/public/images/emoji/twitter/angel/2.png differ
diff --git a/public/images/emoji/twitter/angel/3.png b/public/images/emoji/twitter/angel/3.png
new file mode 100644
index 00000000000..4534f4a0f54
Binary files /dev/null and b/public/images/emoji/twitter/angel/3.png differ
diff --git a/public/images/emoji/twitter/angel/4.png b/public/images/emoji/twitter/angel/4.png
new file mode 100644
index 00000000000..a6d457d6e7d
Binary files /dev/null and b/public/images/emoji/twitter/angel/4.png differ
diff --git a/public/images/emoji/twitter/angel/5.png b/public/images/emoji/twitter/angel/5.png
new file mode 100644
index 00000000000..c4442989a6c
Binary files /dev/null and b/public/images/emoji/twitter/angel/5.png differ
diff --git a/public/images/emoji/twitter/angel/6.png b/public/images/emoji/twitter/angel/6.png
new file mode 100644
index 00000000000..05357038808
Binary files /dev/null and b/public/images/emoji/twitter/angel/6.png differ
diff --git a/public/images/emoji/twitter/angola.png b/public/images/emoji/twitter/angola.png
new file mode 100644
index 00000000000..5aca11a07e4
Binary files /dev/null and b/public/images/emoji/twitter/angola.png differ
diff --git a/public/images/emoji/twitter/anguilla.png b/public/images/emoji/twitter/anguilla.png
new file mode 100644
index 00000000000..d1006c6c19b
Binary files /dev/null and b/public/images/emoji/twitter/anguilla.png differ
diff --git a/public/images/emoji/twitter/antarctica.png b/public/images/emoji/twitter/antarctica.png
new file mode 100644
index 00000000000..5a6759de63e
Binary files /dev/null and b/public/images/emoji/twitter/antarctica.png differ
diff --git a/public/images/emoji/twitter/antigua_barbuda.png b/public/images/emoji/twitter/antigua_barbuda.png
new file mode 100644
index 00000000000..e3ff113cbae
Binary files /dev/null and b/public/images/emoji/twitter/antigua_barbuda.png differ
diff --git a/public/images/emoji/twitter/archery.png b/public/images/emoji/twitter/archery.png
index b0c9511fafd..f50a1389fef 100644
Binary files a/public/images/emoji/twitter/archery.png and b/public/images/emoji/twitter/archery.png differ
diff --git a/public/images/emoji/twitter/argentina.png b/public/images/emoji/twitter/argentina.png
new file mode 100644
index 00000000000..1e5e8150987
Binary files /dev/null and b/public/images/emoji/twitter/argentina.png differ
diff --git a/public/images/emoji/twitter/armenia.png b/public/images/emoji/twitter/armenia.png
new file mode 100644
index 00000000000..846307fcf33
Binary files /dev/null and b/public/images/emoji/twitter/armenia.png differ
diff --git a/public/images/emoji/twitter/artificial_satellite.png b/public/images/emoji/twitter/artificial_satellite.png
new file mode 100644
index 00000000000..81715516af6
Binary files /dev/null and b/public/images/emoji/twitter/artificial_satellite.png differ
diff --git a/public/images/emoji/twitter/aruba.png b/public/images/emoji/twitter/aruba.png
new file mode 100644
index 00000000000..459facc13b1
Binary files /dev/null and b/public/images/emoji/twitter/aruba.png differ
diff --git a/public/images/emoji/twitter/ascension_island.png b/public/images/emoji/twitter/ascension_island.png
new file mode 100644
index 00000000000..2e3a1fdd737
Binary files /dev/null and b/public/images/emoji/twitter/ascension_island.png differ
diff --git a/public/images/emoji/twitter/asterisk.png b/public/images/emoji/twitter/asterisk.png
new file mode 100644
index 00000000000..2bfefce2bec
Binary files /dev/null and b/public/images/emoji/twitter/asterisk.png differ
diff --git a/public/images/emoji/twitter/astonished.png b/public/images/emoji/twitter/astonished.png
index 3f7d5a506d4..5deec18db8f 100644
Binary files a/public/images/emoji/twitter/astonished.png and b/public/images/emoji/twitter/astonished.png differ
diff --git a/public/images/emoji/twitter/australia.png b/public/images/emoji/twitter/australia.png
new file mode 100644
index 00000000000..5dbc804e863
Binary files /dev/null and b/public/images/emoji/twitter/australia.png differ
diff --git a/public/images/emoji/twitter/austria.png b/public/images/emoji/twitter/austria.png
new file mode 100644
index 00000000000..58141c9f3c1
Binary files /dev/null and b/public/images/emoji/twitter/austria.png differ
diff --git a/public/images/emoji/twitter/automobile.png b/public/images/emoji/twitter/automobile.png
new file mode 100644
index 00000000000..2fbf351b838
Binary files /dev/null and b/public/images/emoji/twitter/automobile.png differ
diff --git a/public/images/emoji/twitter/avocado.png b/public/images/emoji/twitter/avocado.png
new file mode 100644
index 00000000000..faa8c8fbe79
Binary files /dev/null and b/public/images/emoji/twitter/avocado.png differ
diff --git a/public/images/emoji/twitter/azerbaijan.png b/public/images/emoji/twitter/azerbaijan.png
new file mode 100644
index 00000000000..59b4ecf2a0a
Binary files /dev/null and b/public/images/emoji/twitter/azerbaijan.png differ
diff --git a/public/images/emoji/twitter/baby/2.png b/public/images/emoji/twitter/baby/2.png
new file mode 100644
index 00000000000..9977df9a5b3
Binary files /dev/null and b/public/images/emoji/twitter/baby/2.png differ
diff --git a/public/images/emoji/twitter/baby/3.png b/public/images/emoji/twitter/baby/3.png
new file mode 100644
index 00000000000..aff19a23660
Binary files /dev/null and b/public/images/emoji/twitter/baby/3.png differ
diff --git a/public/images/emoji/twitter/baby/4.png b/public/images/emoji/twitter/baby/4.png
new file mode 100644
index 00000000000..c38253651e1
Binary files /dev/null and b/public/images/emoji/twitter/baby/4.png differ
diff --git a/public/images/emoji/twitter/baby/5.png b/public/images/emoji/twitter/baby/5.png
new file mode 100644
index 00000000000..b4df1272b9b
Binary files /dev/null and b/public/images/emoji/twitter/baby/5.png differ
diff --git a/public/images/emoji/twitter/baby/6.png b/public/images/emoji/twitter/baby/6.png
new file mode 100644
index 00000000000..ba53029fff7
Binary files /dev/null and b/public/images/emoji/twitter/baby/6.png differ
diff --git a/public/images/emoji/twitter/back.png b/public/images/emoji/twitter/back.png
index bea7330b5ad..ffe5dcc6d34 100644
Binary files a/public/images/emoji/twitter/back.png and b/public/images/emoji/twitter/back.png differ
diff --git a/public/images/emoji/twitter/bacon.png b/public/images/emoji/twitter/bacon.png
new file mode 100644
index 00000000000..b1cfa9dc3b5
Binary files /dev/null and b/public/images/emoji/twitter/bacon.png differ
diff --git a/public/images/emoji/twitter/badminton.png b/public/images/emoji/twitter/badminton.png
index 7c2023ce3c8..3b5d0df295d 100644
Binary files a/public/images/emoji/twitter/badminton.png and b/public/images/emoji/twitter/badminton.png differ
diff --git a/public/images/emoji/twitter/baguette_bread.png b/public/images/emoji/twitter/baguette_bread.png
new file mode 100644
index 00000000000..3be5a539033
Binary files /dev/null and b/public/images/emoji/twitter/baguette_bread.png differ
diff --git a/public/images/emoji/twitter/bahamas.png b/public/images/emoji/twitter/bahamas.png
new file mode 100644
index 00000000000..ed95128e196
Binary files /dev/null and b/public/images/emoji/twitter/bahamas.png differ
diff --git a/public/images/emoji/twitter/bahrain.png b/public/images/emoji/twitter/bahrain.png
new file mode 100644
index 00000000000..815a93ef0bf
Binary files /dev/null and b/public/images/emoji/twitter/bahrain.png differ
diff --git a/public/images/emoji/twitter/balance_scale.png b/public/images/emoji/twitter/balance_scale.png
new file mode 100644
index 00000000000..75713abc23d
Binary files /dev/null and b/public/images/emoji/twitter/balance_scale.png differ
diff --git a/public/images/emoji/twitter/banana.png b/public/images/emoji/twitter/banana.png
index dd908f0c01b..b6e8b94639c 100644
Binary files a/public/images/emoji/twitter/banana.png and b/public/images/emoji/twitter/banana.png differ
diff --git a/public/images/emoji/twitter/bangladesh.png b/public/images/emoji/twitter/bangladesh.png
new file mode 100644
index 00000000000..caab400018c
Binary files /dev/null and b/public/images/emoji/twitter/bangladesh.png differ
diff --git a/public/images/emoji/twitter/barbados.png b/public/images/emoji/twitter/barbados.png
new file mode 100644
index 00000000000..830578344d9
Binary files /dev/null and b/public/images/emoji/twitter/barbados.png differ
diff --git a/public/images/emoji/twitter/baseball.png b/public/images/emoji/twitter/baseball.png
index 35576ac24b1..b7ad17d4d7b 100644
Binary files a/public/images/emoji/twitter/baseball.png and b/public/images/emoji/twitter/baseball.png differ
diff --git a/public/images/emoji/twitter/basketball_man.png b/public/images/emoji/twitter/basketball_man.png
new file mode 100644
index 00000000000..ac6a6c2c9f1
Binary files /dev/null and b/public/images/emoji/twitter/basketball_man.png differ
diff --git a/public/images/emoji/twitter/basketball_man/2.png b/public/images/emoji/twitter/basketball_man/2.png
new file mode 100644
index 00000000000..4dad1da7dbe
Binary files /dev/null and b/public/images/emoji/twitter/basketball_man/2.png differ
diff --git a/public/images/emoji/twitter/basketball_man/3.png b/public/images/emoji/twitter/basketball_man/3.png
new file mode 100644
index 00000000000..739f1de58c0
Binary files /dev/null and b/public/images/emoji/twitter/basketball_man/3.png differ
diff --git a/public/images/emoji/twitter/basketball_man/4.png b/public/images/emoji/twitter/basketball_man/4.png
new file mode 100644
index 00000000000..62a23de4665
Binary files /dev/null and b/public/images/emoji/twitter/basketball_man/4.png differ
diff --git a/public/images/emoji/twitter/basketball_man/5.png b/public/images/emoji/twitter/basketball_man/5.png
new file mode 100644
index 00000000000..2cd9628b760
Binary files /dev/null and b/public/images/emoji/twitter/basketball_man/5.png differ
diff --git a/public/images/emoji/twitter/basketball_man/6.png b/public/images/emoji/twitter/basketball_man/6.png
new file mode 100644
index 00000000000..85bfaeb5785
Binary files /dev/null and b/public/images/emoji/twitter/basketball_man/6.png differ
diff --git a/public/images/emoji/twitter/basketball_player.png b/public/images/emoji/twitter/basketball_player.png
index af55a33bfbf..ac6a6c2c9f1 100644
Binary files a/public/images/emoji/twitter/basketball_player.png and b/public/images/emoji/twitter/basketball_player.png differ
diff --git a/public/images/emoji/twitter/basketball_player/2.png b/public/images/emoji/twitter/basketball_player/2.png
new file mode 100644
index 00000000000..4dad1da7dbe
Binary files /dev/null and b/public/images/emoji/twitter/basketball_player/2.png differ
diff --git a/public/images/emoji/twitter/basketball_player/3.png b/public/images/emoji/twitter/basketball_player/3.png
new file mode 100644
index 00000000000..739f1de58c0
Binary files /dev/null and b/public/images/emoji/twitter/basketball_player/3.png differ
diff --git a/public/images/emoji/twitter/basketball_player/4.png b/public/images/emoji/twitter/basketball_player/4.png
new file mode 100644
index 00000000000..62a23de4665
Binary files /dev/null and b/public/images/emoji/twitter/basketball_player/4.png differ
diff --git a/public/images/emoji/twitter/basketball_player/5.png b/public/images/emoji/twitter/basketball_player/5.png
new file mode 100644
index 00000000000..2cd9628b760
Binary files /dev/null and b/public/images/emoji/twitter/basketball_player/5.png differ
diff --git a/public/images/emoji/twitter/basketball_player/6.png b/public/images/emoji/twitter/basketball_player/6.png
new file mode 100644
index 00000000000..85bfaeb5785
Binary files /dev/null and b/public/images/emoji/twitter/basketball_player/6.png differ
diff --git a/public/images/emoji/twitter/basketball_woman.png b/public/images/emoji/twitter/basketball_woman.png
new file mode 100644
index 00000000000..7df66bcfb7b
Binary files /dev/null and b/public/images/emoji/twitter/basketball_woman.png differ
diff --git a/public/images/emoji/twitter/bat.png b/public/images/emoji/twitter/bat.png
new file mode 100644
index 00000000000..d997111fc5f
Binary files /dev/null and b/public/images/emoji/twitter/bat.png differ
diff --git a/public/images/emoji/twitter/bath.png b/public/images/emoji/twitter/bath.png
index d5d52c29ece..ed94dd59b4a 100644
Binary files a/public/images/emoji/twitter/bath.png and b/public/images/emoji/twitter/bath.png differ
diff --git a/public/images/emoji/twitter/bath/2.png b/public/images/emoji/twitter/bath/2.png
new file mode 100644
index 00000000000..fdbe8725c67
Binary files /dev/null and b/public/images/emoji/twitter/bath/2.png differ
diff --git a/public/images/emoji/twitter/bath/3.png b/public/images/emoji/twitter/bath/3.png
new file mode 100644
index 00000000000..033290fcb93
Binary files /dev/null and b/public/images/emoji/twitter/bath/3.png differ
diff --git a/public/images/emoji/twitter/bath/4.png b/public/images/emoji/twitter/bath/4.png
new file mode 100644
index 00000000000..75da71b8d1e
Binary files /dev/null and b/public/images/emoji/twitter/bath/4.png differ
diff --git a/public/images/emoji/twitter/bath/5.png b/public/images/emoji/twitter/bath/5.png
new file mode 100644
index 00000000000..c1315378b28
Binary files /dev/null and b/public/images/emoji/twitter/bath/5.png differ
diff --git a/public/images/emoji/twitter/bath/6.png b/public/images/emoji/twitter/bath/6.png
new file mode 100644
index 00000000000..79dcf75dd36
Binary files /dev/null and b/public/images/emoji/twitter/bath/6.png differ
diff --git a/public/images/emoji/twitter/beach.png b/public/images/emoji/twitter/beach.png
index d74fd5a910e..894e33bee13 100644
Binary files a/public/images/emoji/twitter/beach.png and b/public/images/emoji/twitter/beach.png differ
diff --git a/public/images/emoji/twitter/beach_umbrella.png b/public/images/emoji/twitter/beach_umbrella.png
index d12db22ecb0..894e33bee13 100644
Binary files a/public/images/emoji/twitter/beach_umbrella.png and b/public/images/emoji/twitter/beach_umbrella.png differ
diff --git a/public/images/emoji/twitter/beach_with_umbrella.png b/public/images/emoji/twitter/beach_with_umbrella.png
index d74fd5a910e..894e33bee13 100644
Binary files a/public/images/emoji/twitter/beach_with_umbrella.png and b/public/images/emoji/twitter/beach_with_umbrella.png differ
diff --git a/public/images/emoji/twitter/bearded_person.png b/public/images/emoji/twitter/bearded_person.png
new file mode 100644
index 00000000000..ed22a6cb381
Binary files /dev/null and b/public/images/emoji/twitter/bearded_person.png differ
diff --git a/public/images/emoji/twitter/bearded_person/2.png b/public/images/emoji/twitter/bearded_person/2.png
new file mode 100644
index 00000000000..4a2fdeb3040
Binary files /dev/null and b/public/images/emoji/twitter/bearded_person/2.png differ
diff --git a/public/images/emoji/twitter/bearded_person/3.png b/public/images/emoji/twitter/bearded_person/3.png
new file mode 100644
index 00000000000..b1f6e168d7c
Binary files /dev/null and b/public/images/emoji/twitter/bearded_person/3.png differ
diff --git a/public/images/emoji/twitter/bearded_person/4.png b/public/images/emoji/twitter/bearded_person/4.png
new file mode 100644
index 00000000000..f75b75a74e9
Binary files /dev/null and b/public/images/emoji/twitter/bearded_person/4.png differ
diff --git a/public/images/emoji/twitter/bearded_person/5.png b/public/images/emoji/twitter/bearded_person/5.png
new file mode 100644
index 00000000000..a9665b318a4
Binary files /dev/null and b/public/images/emoji/twitter/bearded_person/5.png differ
diff --git a/public/images/emoji/twitter/bearded_person/6.png b/public/images/emoji/twitter/bearded_person/6.png
new file mode 100644
index 00000000000..a42b3caf88c
Binary files /dev/null and b/public/images/emoji/twitter/bearded_person/6.png differ
diff --git a/public/images/emoji/twitter/bee.png b/public/images/emoji/twitter/bee.png
index 34cf8b08e2d..1dde5bac0d9 100644
Binary files a/public/images/emoji/twitter/bee.png and b/public/images/emoji/twitter/bee.png differ
diff --git a/public/images/emoji/twitter/beetle.png b/public/images/emoji/twitter/beetle.png
index e91b32458a5..47ba5e58713 100644
Binary files a/public/images/emoji/twitter/beetle.png and b/public/images/emoji/twitter/beetle.png differ
diff --git a/public/images/emoji/twitter/beginner.png b/public/images/emoji/twitter/beginner.png
index e7236905abe..d0c3d5200f2 100644
Binary files a/public/images/emoji/twitter/beginner.png and b/public/images/emoji/twitter/beginner.png differ
diff --git a/public/images/emoji/twitter/belarus.png b/public/images/emoji/twitter/belarus.png
new file mode 100644
index 00000000000..e75dc9ec50b
Binary files /dev/null and b/public/images/emoji/twitter/belarus.png differ
diff --git a/public/images/emoji/twitter/belgium.png b/public/images/emoji/twitter/belgium.png
new file mode 100644
index 00000000000..ca401e5985c
Binary files /dev/null and b/public/images/emoji/twitter/belgium.png differ
diff --git a/public/images/emoji/twitter/belize.png b/public/images/emoji/twitter/belize.png
new file mode 100644
index 00000000000..5f6dded80bf
Binary files /dev/null and b/public/images/emoji/twitter/belize.png differ
diff --git a/public/images/emoji/twitter/benin.png b/public/images/emoji/twitter/benin.png
new file mode 100644
index 00000000000..bb74e98818a
Binary files /dev/null and b/public/images/emoji/twitter/benin.png differ
diff --git a/public/images/emoji/twitter/bento.png b/public/images/emoji/twitter/bento.png
index 29e1400dcbf..14261e4878c 100644
Binary files a/public/images/emoji/twitter/bento.png and b/public/images/emoji/twitter/bento.png differ
diff --git a/public/images/emoji/twitter/bermuda.png b/public/images/emoji/twitter/bermuda.png
new file mode 100644
index 00000000000..75f2fac7609
Binary files /dev/null and b/public/images/emoji/twitter/bermuda.png differ
diff --git a/public/images/emoji/twitter/bhutan.png b/public/images/emoji/twitter/bhutan.png
new file mode 100644
index 00000000000..d9a2d20fc1f
Binary files /dev/null and b/public/images/emoji/twitter/bhutan.png differ
diff --git a/public/images/emoji/twitter/bicyclist.png b/public/images/emoji/twitter/bicyclist.png
index 7fa1bacfe56..809093cea9b 100644
Binary files a/public/images/emoji/twitter/bicyclist.png and b/public/images/emoji/twitter/bicyclist.png differ
diff --git a/public/images/emoji/twitter/bicyclist/2.png b/public/images/emoji/twitter/bicyclist/2.png
new file mode 100644
index 00000000000..033fa69539d
Binary files /dev/null and b/public/images/emoji/twitter/bicyclist/2.png differ
diff --git a/public/images/emoji/twitter/bicyclist/3.png b/public/images/emoji/twitter/bicyclist/3.png
new file mode 100644
index 00000000000..15b01ed13fc
Binary files /dev/null and b/public/images/emoji/twitter/bicyclist/3.png differ
diff --git a/public/images/emoji/twitter/bicyclist/4.png b/public/images/emoji/twitter/bicyclist/4.png
new file mode 100644
index 00000000000..b98320c2492
Binary files /dev/null and b/public/images/emoji/twitter/bicyclist/4.png differ
diff --git a/public/images/emoji/twitter/bicyclist/5.png b/public/images/emoji/twitter/bicyclist/5.png
new file mode 100644
index 00000000000..ed6459ad808
Binary files /dev/null and b/public/images/emoji/twitter/bicyclist/5.png differ
diff --git a/public/images/emoji/twitter/bicyclist/6.png b/public/images/emoji/twitter/bicyclist/6.png
new file mode 100644
index 00000000000..775e94a0769
Binary files /dev/null and b/public/images/emoji/twitter/bicyclist/6.png differ
diff --git a/public/images/emoji/twitter/bike.png b/public/images/emoji/twitter/bike.png
index 3f19d3f3be0..e2c20735ff0 100644
Binary files a/public/images/emoji/twitter/bike.png and b/public/images/emoji/twitter/bike.png differ
diff --git a/public/images/emoji/twitter/biking_man.png b/public/images/emoji/twitter/biking_man.png
new file mode 100644
index 00000000000..809093cea9b
Binary files /dev/null and b/public/images/emoji/twitter/biking_man.png differ
diff --git a/public/images/emoji/twitter/biking_man/2.png b/public/images/emoji/twitter/biking_man/2.png
new file mode 100644
index 00000000000..033fa69539d
Binary files /dev/null and b/public/images/emoji/twitter/biking_man/2.png differ
diff --git a/public/images/emoji/twitter/biking_man/3.png b/public/images/emoji/twitter/biking_man/3.png
new file mode 100644
index 00000000000..15b01ed13fc
Binary files /dev/null and b/public/images/emoji/twitter/biking_man/3.png differ
diff --git a/public/images/emoji/twitter/biking_man/4.png b/public/images/emoji/twitter/biking_man/4.png
new file mode 100644
index 00000000000..b98320c2492
Binary files /dev/null and b/public/images/emoji/twitter/biking_man/4.png differ
diff --git a/public/images/emoji/twitter/biking_man/5.png b/public/images/emoji/twitter/biking_man/5.png
new file mode 100644
index 00000000000..ed6459ad808
Binary files /dev/null and b/public/images/emoji/twitter/biking_man/5.png differ
diff --git a/public/images/emoji/twitter/biking_man/6.png b/public/images/emoji/twitter/biking_man/6.png
new file mode 100644
index 00000000000..775e94a0769
Binary files /dev/null and b/public/images/emoji/twitter/biking_man/6.png differ
diff --git a/public/images/emoji/twitter/biking_woman.png b/public/images/emoji/twitter/biking_woman.png
new file mode 100644
index 00000000000..eab8bcf9f62
Binary files /dev/null and b/public/images/emoji/twitter/biking_woman.png differ
diff --git a/public/images/emoji/twitter/biking_woman/2.png b/public/images/emoji/twitter/biking_woman/2.png
new file mode 100644
index 00000000000..39b2f70d9a6
Binary files /dev/null and b/public/images/emoji/twitter/biking_woman/2.png differ
diff --git a/public/images/emoji/twitter/biking_woman/3.png b/public/images/emoji/twitter/biking_woman/3.png
new file mode 100644
index 00000000000..1cdb55d7bd1
Binary files /dev/null and b/public/images/emoji/twitter/biking_woman/3.png differ
diff --git a/public/images/emoji/twitter/biking_woman/4.png b/public/images/emoji/twitter/biking_woman/4.png
new file mode 100644
index 00000000000..1479fbc064f
Binary files /dev/null and b/public/images/emoji/twitter/biking_woman/4.png differ
diff --git a/public/images/emoji/twitter/biking_woman/5.png b/public/images/emoji/twitter/biking_woman/5.png
new file mode 100644
index 00000000000..521d5bf8850
Binary files /dev/null and b/public/images/emoji/twitter/biking_woman/5.png differ
diff --git a/public/images/emoji/twitter/biking_woman/6.png b/public/images/emoji/twitter/biking_woman/6.png
new file mode 100644
index 00000000000..bb3897810e7
Binary files /dev/null and b/public/images/emoji/twitter/biking_woman/6.png differ
diff --git a/public/images/emoji/twitter/billed_cap.png b/public/images/emoji/twitter/billed_cap.png
new file mode 100644
index 00000000000..5cc92e307e1
Binary files /dev/null and b/public/images/emoji/twitter/billed_cap.png differ
diff --git a/public/images/emoji/twitter/bird.png b/public/images/emoji/twitter/bird.png
index 1032597b14f..43ba2d4a9df 100644
Binary files a/public/images/emoji/twitter/bird.png and b/public/images/emoji/twitter/bird.png differ
diff --git a/public/images/emoji/twitter/birthday.png b/public/images/emoji/twitter/birthday.png
index 79404fdb473..9c8a879b677 100644
Binary files a/public/images/emoji/twitter/birthday.png and b/public/images/emoji/twitter/birthday.png differ
diff --git a/public/images/emoji/twitter/black_flag.png b/public/images/emoji/twitter/black_flag.png
new file mode 100644
index 00000000000..5c1237bdad2
Binary files /dev/null and b/public/images/emoji/twitter/black_flag.png differ
diff --git a/public/images/emoji/twitter/black_heart.png b/public/images/emoji/twitter/black_heart.png
new file mode 100644
index 00000000000..b2378197554
Binary files /dev/null and b/public/images/emoji/twitter/black_heart.png differ
diff --git a/public/images/emoji/twitter/black_joker.png b/public/images/emoji/twitter/black_joker.png
index 8d2a53756bb..eea3a53bcf9 100644
Binary files a/public/images/emoji/twitter/black_joker.png and b/public/images/emoji/twitter/black_joker.png differ
diff --git a/public/images/emoji/twitter/blonde_man.png b/public/images/emoji/twitter/blonde_man.png
new file mode 100644
index 00000000000..419c5d22c59
Binary files /dev/null and b/public/images/emoji/twitter/blonde_man.png differ
diff --git a/public/images/emoji/twitter/blonde_man/2.png b/public/images/emoji/twitter/blonde_man/2.png
new file mode 100644
index 00000000000..f6e78cc4488
Binary files /dev/null and b/public/images/emoji/twitter/blonde_man/2.png differ
diff --git a/public/images/emoji/twitter/blonde_man/3.png b/public/images/emoji/twitter/blonde_man/3.png
new file mode 100644
index 00000000000..d26f97cb5bd
Binary files /dev/null and b/public/images/emoji/twitter/blonde_man/3.png differ
diff --git a/public/images/emoji/twitter/blonde_man/4.png b/public/images/emoji/twitter/blonde_man/4.png
new file mode 100644
index 00000000000..ff83f6d7d10
Binary files /dev/null and b/public/images/emoji/twitter/blonde_man/4.png differ
diff --git a/public/images/emoji/twitter/blonde_man/5.png b/public/images/emoji/twitter/blonde_man/5.png
new file mode 100644
index 00000000000..e40e865a497
Binary files /dev/null and b/public/images/emoji/twitter/blonde_man/5.png differ
diff --git a/public/images/emoji/twitter/blonde_man/6.png b/public/images/emoji/twitter/blonde_man/6.png
new file mode 100644
index 00000000000..c04215ecc28
Binary files /dev/null and b/public/images/emoji/twitter/blonde_man/6.png differ
diff --git a/public/images/emoji/twitter/blonde_woman.png b/public/images/emoji/twitter/blonde_woman.png
new file mode 100644
index 00000000000..11e258fa617
Binary files /dev/null and b/public/images/emoji/twitter/blonde_woman.png differ
diff --git a/public/images/emoji/twitter/blonde_woman/2.png b/public/images/emoji/twitter/blonde_woman/2.png
new file mode 100644
index 00000000000..70e3888d3eb
Binary files /dev/null and b/public/images/emoji/twitter/blonde_woman/2.png differ
diff --git a/public/images/emoji/twitter/blonde_woman/3.png b/public/images/emoji/twitter/blonde_woman/3.png
new file mode 100644
index 00000000000..52e92bb7d6b
Binary files /dev/null and b/public/images/emoji/twitter/blonde_woman/3.png differ
diff --git a/public/images/emoji/twitter/blonde_woman/4.png b/public/images/emoji/twitter/blonde_woman/4.png
new file mode 100644
index 00000000000..37108efb1f2
Binary files /dev/null and b/public/images/emoji/twitter/blonde_woman/4.png differ
diff --git a/public/images/emoji/twitter/blonde_woman/5.png b/public/images/emoji/twitter/blonde_woman/5.png
new file mode 100644
index 00000000000..a7c2fcdfd9b
Binary files /dev/null and b/public/images/emoji/twitter/blonde_woman/5.png differ
diff --git a/public/images/emoji/twitter/blonde_woman/6.png b/public/images/emoji/twitter/blonde_woman/6.png
new file mode 100644
index 00000000000..0a8ee484ce3
Binary files /dev/null and b/public/images/emoji/twitter/blonde_woman/6.png differ
diff --git a/public/images/emoji/twitter/boar.png b/public/images/emoji/twitter/boar.png
index 1763c90b3b1..ad255bc8eb4 100644
Binary files a/public/images/emoji/twitter/boar.png and b/public/images/emoji/twitter/boar.png differ
diff --git a/public/images/emoji/twitter/boat.png b/public/images/emoji/twitter/boat.png
new file mode 100644
index 00000000000..3eba365766f
Binary files /dev/null and b/public/images/emoji/twitter/boat.png differ
diff --git a/public/images/emoji/twitter/bolivia.png b/public/images/emoji/twitter/bolivia.png
new file mode 100644
index 00000000000..af9bd4d5e7a
Binary files /dev/null and b/public/images/emoji/twitter/bolivia.png differ
diff --git a/public/images/emoji/twitter/bosnia_herzegovina.png b/public/images/emoji/twitter/bosnia_herzegovina.png
new file mode 100644
index 00000000000..91493ade758
Binary files /dev/null and b/public/images/emoji/twitter/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/twitter/botswana.png b/public/images/emoji/twitter/botswana.png
new file mode 100644
index 00000000000..3697a723dd3
Binary files /dev/null and b/public/images/emoji/twitter/botswana.png differ
diff --git a/public/images/emoji/twitter/bottle_with_popping_cork.png b/public/images/emoji/twitter/bottle_with_popping_cork.png
index d097247136f..49ea37f3899 100644
Binary files a/public/images/emoji/twitter/bottle_with_popping_cork.png and b/public/images/emoji/twitter/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/twitter/bouquet.png b/public/images/emoji/twitter/bouquet.png
index 523e02ce03e..1afe2438e2c 100644
Binary files a/public/images/emoji/twitter/bouquet.png and b/public/images/emoji/twitter/bouquet.png differ
diff --git a/public/images/emoji/twitter/bouvet_island.png b/public/images/emoji/twitter/bouvet_island.png
new file mode 100644
index 00000000000..801a5776543
Binary files /dev/null and b/public/images/emoji/twitter/bouvet_island.png differ
diff --git a/public/images/emoji/twitter/bow.png b/public/images/emoji/twitter/bow.png
index 47553dce0df..c602d42a914 100644
Binary files a/public/images/emoji/twitter/bow.png and b/public/images/emoji/twitter/bow.png differ
diff --git a/public/images/emoji/twitter/bow/2.png b/public/images/emoji/twitter/bow/2.png
new file mode 100644
index 00000000000..6859d977503
Binary files /dev/null and b/public/images/emoji/twitter/bow/2.png differ
diff --git a/public/images/emoji/twitter/bow/3.png b/public/images/emoji/twitter/bow/3.png
new file mode 100644
index 00000000000..db5fd10f100
Binary files /dev/null and b/public/images/emoji/twitter/bow/3.png differ
diff --git a/public/images/emoji/twitter/bow/4.png b/public/images/emoji/twitter/bow/4.png
new file mode 100644
index 00000000000..d61fb8c38d1
Binary files /dev/null and b/public/images/emoji/twitter/bow/4.png differ
diff --git a/public/images/emoji/twitter/bow/5.png b/public/images/emoji/twitter/bow/5.png
new file mode 100644
index 00000000000..1ef277b893f
Binary files /dev/null and b/public/images/emoji/twitter/bow/5.png differ
diff --git a/public/images/emoji/twitter/bow/6.png b/public/images/emoji/twitter/bow/6.png
new file mode 100644
index 00000000000..922ad0843cb
Binary files /dev/null and b/public/images/emoji/twitter/bow/6.png differ
diff --git a/public/images/emoji/twitter/bow_and_arrow.png b/public/images/emoji/twitter/bow_and_arrow.png
index b0c9511fafd..f50a1389fef 100644
Binary files a/public/images/emoji/twitter/bow_and_arrow.png and b/public/images/emoji/twitter/bow_and_arrow.png differ
diff --git a/public/images/emoji/twitter/bowing_man.png b/public/images/emoji/twitter/bowing_man.png
new file mode 100644
index 00000000000..c602d42a914
Binary files /dev/null and b/public/images/emoji/twitter/bowing_man.png differ
diff --git a/public/images/emoji/twitter/bowing_man/2.png b/public/images/emoji/twitter/bowing_man/2.png
new file mode 100644
index 00000000000..6859d977503
Binary files /dev/null and b/public/images/emoji/twitter/bowing_man/2.png differ
diff --git a/public/images/emoji/twitter/bowing_man/3.png b/public/images/emoji/twitter/bowing_man/3.png
new file mode 100644
index 00000000000..db5fd10f100
Binary files /dev/null and b/public/images/emoji/twitter/bowing_man/3.png differ
diff --git a/public/images/emoji/twitter/bowing_man/4.png b/public/images/emoji/twitter/bowing_man/4.png
new file mode 100644
index 00000000000..d61fb8c38d1
Binary files /dev/null and b/public/images/emoji/twitter/bowing_man/4.png differ
diff --git a/public/images/emoji/twitter/bowing_man/5.png b/public/images/emoji/twitter/bowing_man/5.png
new file mode 100644
index 00000000000..1ef277b893f
Binary files /dev/null and b/public/images/emoji/twitter/bowing_man/5.png differ
diff --git a/public/images/emoji/twitter/bowing_man/6.png b/public/images/emoji/twitter/bowing_man/6.png
new file mode 100644
index 00000000000..922ad0843cb
Binary files /dev/null and b/public/images/emoji/twitter/bowing_man/6.png differ
diff --git a/public/images/emoji/twitter/bowing_woman.png b/public/images/emoji/twitter/bowing_woman.png
new file mode 100644
index 00000000000..bbe859ce678
Binary files /dev/null and b/public/images/emoji/twitter/bowing_woman.png differ
diff --git a/public/images/emoji/twitter/bowing_woman/2.png b/public/images/emoji/twitter/bowing_woman/2.png
new file mode 100644
index 00000000000..e6fa7ca7f53
Binary files /dev/null and b/public/images/emoji/twitter/bowing_woman/2.png differ
diff --git a/public/images/emoji/twitter/bowing_woman/3.png b/public/images/emoji/twitter/bowing_woman/3.png
new file mode 100644
index 00000000000..206a3687086
Binary files /dev/null and b/public/images/emoji/twitter/bowing_woman/3.png differ
diff --git a/public/images/emoji/twitter/bowing_woman/4.png b/public/images/emoji/twitter/bowing_woman/4.png
new file mode 100644
index 00000000000..047411f9662
Binary files /dev/null and b/public/images/emoji/twitter/bowing_woman/4.png differ
diff --git a/public/images/emoji/twitter/bowing_woman/5.png b/public/images/emoji/twitter/bowing_woman/5.png
new file mode 100644
index 00000000000..9d43cffab0a
Binary files /dev/null and b/public/images/emoji/twitter/bowing_woman/5.png differ
diff --git a/public/images/emoji/twitter/bowing_woman/6.png b/public/images/emoji/twitter/bowing_woman/6.png
new file mode 100644
index 00000000000..85a701f354e
Binary files /dev/null and b/public/images/emoji/twitter/bowing_woman/6.png differ
diff --git a/public/images/emoji/twitter/bowl_with_spoon.png b/public/images/emoji/twitter/bowl_with_spoon.png
new file mode 100644
index 00000000000..b0d88a73b9d
Binary files /dev/null and b/public/images/emoji/twitter/bowl_with_spoon.png differ
diff --git a/public/images/emoji/twitter/bowling.png b/public/images/emoji/twitter/bowling.png
index 5a586ebdd5f..9c334abe136 100644
Binary files a/public/images/emoji/twitter/bowling.png and b/public/images/emoji/twitter/bowling.png differ
diff --git a/public/images/emoji/twitter/boxing_glove.png b/public/images/emoji/twitter/boxing_glove.png
new file mode 100644
index 00000000000..abb4d248341
Binary files /dev/null and b/public/images/emoji/twitter/boxing_glove.png differ
diff --git a/public/images/emoji/twitter/boy/2.png b/public/images/emoji/twitter/boy/2.png
new file mode 100644
index 00000000000..e84ab48a989
Binary files /dev/null and b/public/images/emoji/twitter/boy/2.png differ
diff --git a/public/images/emoji/twitter/boy/3.png b/public/images/emoji/twitter/boy/3.png
new file mode 100644
index 00000000000..e8975835797
Binary files /dev/null and b/public/images/emoji/twitter/boy/3.png differ
diff --git a/public/images/emoji/twitter/boy/4.png b/public/images/emoji/twitter/boy/4.png
new file mode 100644
index 00000000000..49a32025a6b
Binary files /dev/null and b/public/images/emoji/twitter/boy/4.png differ
diff --git a/public/images/emoji/twitter/boy/5.png b/public/images/emoji/twitter/boy/5.png
new file mode 100644
index 00000000000..7f7734ecdb9
Binary files /dev/null and b/public/images/emoji/twitter/boy/5.png differ
diff --git a/public/images/emoji/twitter/boy/6.png b/public/images/emoji/twitter/boy/6.png
new file mode 100644
index 00000000000..0f350a552e4
Binary files /dev/null and b/public/images/emoji/twitter/boy/6.png differ
diff --git a/public/images/emoji/twitter/brain.png b/public/images/emoji/twitter/brain.png
new file mode 100644
index 00000000000..c8e889faecf
Binary files /dev/null and b/public/images/emoji/twitter/brain.png differ
diff --git a/public/images/emoji/twitter/brazil.png b/public/images/emoji/twitter/brazil.png
new file mode 100644
index 00000000000..a68b1e6b586
Binary files /dev/null and b/public/images/emoji/twitter/brazil.png differ
diff --git a/public/images/emoji/twitter/breast_feeding.png b/public/images/emoji/twitter/breast_feeding.png
new file mode 100644
index 00000000000..815538138bf
Binary files /dev/null and b/public/images/emoji/twitter/breast_feeding.png differ
diff --git a/public/images/emoji/twitter/breast_feeding/2.png b/public/images/emoji/twitter/breast_feeding/2.png
new file mode 100644
index 00000000000..fb591aa4fb4
Binary files /dev/null and b/public/images/emoji/twitter/breast_feeding/2.png differ
diff --git a/public/images/emoji/twitter/breast_feeding/3.png b/public/images/emoji/twitter/breast_feeding/3.png
new file mode 100644
index 00000000000..5adcffa4b94
Binary files /dev/null and b/public/images/emoji/twitter/breast_feeding/3.png differ
diff --git a/public/images/emoji/twitter/breast_feeding/4.png b/public/images/emoji/twitter/breast_feeding/4.png
new file mode 100644
index 00000000000..d166f981b24
Binary files /dev/null and b/public/images/emoji/twitter/breast_feeding/4.png differ
diff --git a/public/images/emoji/twitter/breast_feeding/5.png b/public/images/emoji/twitter/breast_feeding/5.png
new file mode 100644
index 00000000000..7c8cb50a780
Binary files /dev/null and b/public/images/emoji/twitter/breast_feeding/5.png differ
diff --git a/public/images/emoji/twitter/breast_feeding/6.png b/public/images/emoji/twitter/breast_feeding/6.png
new file mode 100644
index 00000000000..e113d8cb428
Binary files /dev/null and b/public/images/emoji/twitter/breast_feeding/6.png differ
diff --git a/public/images/emoji/twitter/bride_with_veil.png b/public/images/emoji/twitter/bride_with_veil.png
index d30ae00c15c..ca5bcd13fcf 100644
Binary files a/public/images/emoji/twitter/bride_with_veil.png and b/public/images/emoji/twitter/bride_with_veil.png differ
diff --git a/public/images/emoji/twitter/bride_with_veil/2.png b/public/images/emoji/twitter/bride_with_veil/2.png
new file mode 100644
index 00000000000..c6f204ead0a
Binary files /dev/null and b/public/images/emoji/twitter/bride_with_veil/2.png differ
diff --git a/public/images/emoji/twitter/bride_with_veil/3.png b/public/images/emoji/twitter/bride_with_veil/3.png
new file mode 100644
index 00000000000..781740ea04b
Binary files /dev/null and b/public/images/emoji/twitter/bride_with_veil/3.png differ
diff --git a/public/images/emoji/twitter/bride_with_veil/4.png b/public/images/emoji/twitter/bride_with_veil/4.png
new file mode 100644
index 00000000000..6cd7c62004e
Binary files /dev/null and b/public/images/emoji/twitter/bride_with_veil/4.png differ
diff --git a/public/images/emoji/twitter/bride_with_veil/5.png b/public/images/emoji/twitter/bride_with_veil/5.png
new file mode 100644
index 00000000000..a48ae997826
Binary files /dev/null and b/public/images/emoji/twitter/bride_with_veil/5.png differ
diff --git a/public/images/emoji/twitter/bride_with_veil/6.png b/public/images/emoji/twitter/bride_with_veil/6.png
new file mode 100644
index 00000000000..6247cc757a0
Binary files /dev/null and b/public/images/emoji/twitter/bride_with_veil/6.png differ
diff --git a/public/images/emoji/twitter/british_indian_ocean_territory.png b/public/images/emoji/twitter/british_indian_ocean_territory.png
new file mode 100644
index 00000000000..e3d2479344f
Binary files /dev/null and b/public/images/emoji/twitter/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/twitter/british_virgin_islands.png b/public/images/emoji/twitter/british_virgin_islands.png
new file mode 100644
index 00000000000..9f758979a16
Binary files /dev/null and b/public/images/emoji/twitter/british_virgin_islands.png differ
diff --git a/public/images/emoji/twitter/broccoli.png b/public/images/emoji/twitter/broccoli.png
new file mode 100644
index 00000000000..5e03a6d23ba
Binary files /dev/null and b/public/images/emoji/twitter/broccoli.png differ
diff --git a/public/images/emoji/twitter/brunei.png b/public/images/emoji/twitter/brunei.png
new file mode 100644
index 00000000000..647e1c4d79b
Binary files /dev/null and b/public/images/emoji/twitter/brunei.png differ
diff --git a/public/images/emoji/twitter/building_construction.png b/public/images/emoji/twitter/building_construction.png
index 0b2cebc9221..24cdec2e5fd 100644
Binary files a/public/images/emoji/twitter/building_construction.png and b/public/images/emoji/twitter/building_construction.png differ
diff --git a/public/images/emoji/twitter/bulgaria.png b/public/images/emoji/twitter/bulgaria.png
new file mode 100644
index 00000000000..5185700c636
Binary files /dev/null and b/public/images/emoji/twitter/bulgaria.png differ
diff --git a/public/images/emoji/twitter/burkina_faso.png b/public/images/emoji/twitter/burkina_faso.png
new file mode 100644
index 00000000000..c519f8a954c
Binary files /dev/null and b/public/images/emoji/twitter/burkina_faso.png differ
diff --git a/public/images/emoji/twitter/burrito.png b/public/images/emoji/twitter/burrito.png
index b4ffcb0ac98..74894241cc2 100644
Binary files a/public/images/emoji/twitter/burrito.png and b/public/images/emoji/twitter/burrito.png differ
diff --git a/public/images/emoji/twitter/burundi.png b/public/images/emoji/twitter/burundi.png
new file mode 100644
index 00000000000..83e731cc34f
Binary files /dev/null and b/public/images/emoji/twitter/burundi.png differ
diff --git a/public/images/emoji/twitter/business_suit_levitating.png b/public/images/emoji/twitter/business_suit_levitating.png
new file mode 100644
index 00000000000..5231c708a03
Binary files /dev/null and b/public/images/emoji/twitter/business_suit_levitating.png differ
diff --git a/public/images/emoji/twitter/business_suit_levitating/2.png b/public/images/emoji/twitter/business_suit_levitating/2.png
new file mode 100644
index 00000000000..753693b093b
Binary files /dev/null and b/public/images/emoji/twitter/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/twitter/business_suit_levitating/3.png b/public/images/emoji/twitter/business_suit_levitating/3.png
new file mode 100644
index 00000000000..f56875edac9
Binary files /dev/null and b/public/images/emoji/twitter/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/twitter/business_suit_levitating/4.png b/public/images/emoji/twitter/business_suit_levitating/4.png
new file mode 100644
index 00000000000..37d74f5c97d
Binary files /dev/null and b/public/images/emoji/twitter/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/twitter/business_suit_levitating/5.png b/public/images/emoji/twitter/business_suit_levitating/5.png
new file mode 100644
index 00000000000..5a48f961920
Binary files /dev/null and b/public/images/emoji/twitter/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/twitter/business_suit_levitating/6.png b/public/images/emoji/twitter/business_suit_levitating/6.png
new file mode 100644
index 00000000000..61507408172
Binary files /dev/null and b/public/images/emoji/twitter/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/twitter/butterfly.png b/public/images/emoji/twitter/butterfly.png
new file mode 100644
index 00000000000..995ea58f802
Binary files /dev/null and b/public/images/emoji/twitter/butterfly.png differ
diff --git a/public/images/emoji/twitter/cake.png b/public/images/emoji/twitter/cake.png
index 56c6355432f..57348384374 100644
Binary files a/public/images/emoji/twitter/cake.png and b/public/images/emoji/twitter/cake.png differ
diff --git a/public/images/emoji/twitter/calendar.png b/public/images/emoji/twitter/calendar.png
index 7c2c806bbb6..f2ccc329179 100644
Binary files a/public/images/emoji/twitter/calendar.png and b/public/images/emoji/twitter/calendar.png differ
diff --git a/public/images/emoji/twitter/call_me_hand.png b/public/images/emoji/twitter/call_me_hand.png
new file mode 100644
index 00000000000..6e50aea9ee9
Binary files /dev/null and b/public/images/emoji/twitter/call_me_hand.png differ
diff --git a/public/images/emoji/twitter/call_me_hand/2.png b/public/images/emoji/twitter/call_me_hand/2.png
new file mode 100644
index 00000000000..31a89ad6336
Binary files /dev/null and b/public/images/emoji/twitter/call_me_hand/2.png differ
diff --git a/public/images/emoji/twitter/call_me_hand/3.png b/public/images/emoji/twitter/call_me_hand/3.png
new file mode 100644
index 00000000000..d619e0b8d79
Binary files /dev/null and b/public/images/emoji/twitter/call_me_hand/3.png differ
diff --git a/public/images/emoji/twitter/call_me_hand/4.png b/public/images/emoji/twitter/call_me_hand/4.png
new file mode 100644
index 00000000000..f99492eb6c9
Binary files /dev/null and b/public/images/emoji/twitter/call_me_hand/4.png differ
diff --git a/public/images/emoji/twitter/call_me_hand/5.png b/public/images/emoji/twitter/call_me_hand/5.png
new file mode 100644
index 00000000000..02be2857ff6
Binary files /dev/null and b/public/images/emoji/twitter/call_me_hand/5.png differ
diff --git a/public/images/emoji/twitter/call_me_hand/6.png b/public/images/emoji/twitter/call_me_hand/6.png
new file mode 100644
index 00000000000..f0c258b55b7
Binary files /dev/null and b/public/images/emoji/twitter/call_me_hand/6.png differ
diff --git a/public/images/emoji/twitter/cambodia.png b/public/images/emoji/twitter/cambodia.png
new file mode 100644
index 00000000000..0a7ca06fb42
Binary files /dev/null and b/public/images/emoji/twitter/cambodia.png differ
diff --git a/public/images/emoji/twitter/camera_flash.png b/public/images/emoji/twitter/camera_flash.png
new file mode 100644
index 00000000000..fd49394ac1d
Binary files /dev/null and b/public/images/emoji/twitter/camera_flash.png differ
diff --git a/public/images/emoji/twitter/camera_with_flash.png b/public/images/emoji/twitter/camera_with_flash.png
index 63e41c52942..fd49394ac1d 100644
Binary files a/public/images/emoji/twitter/camera_with_flash.png and b/public/images/emoji/twitter/camera_with_flash.png differ
diff --git a/public/images/emoji/twitter/cameroon.png b/public/images/emoji/twitter/cameroon.png
new file mode 100644
index 00000000000..b9aaf463487
Binary files /dev/null and b/public/images/emoji/twitter/cameroon.png differ
diff --git a/public/images/emoji/twitter/camping.png b/public/images/emoji/twitter/camping.png
index 0f5da1ddacd..414dc9caf6f 100644
Binary files a/public/images/emoji/twitter/camping.png and b/public/images/emoji/twitter/camping.png differ
diff --git a/public/images/emoji/twitter/canada.png b/public/images/emoji/twitter/canada.png
new file mode 100644
index 00000000000..82664ad79e9
Binary files /dev/null and b/public/images/emoji/twitter/canada.png differ
diff --git a/public/images/emoji/twitter/canary_islands.png b/public/images/emoji/twitter/canary_islands.png
new file mode 100644
index 00000000000..68ccf48d0df
Binary files /dev/null and b/public/images/emoji/twitter/canary_islands.png differ
diff --git a/public/images/emoji/twitter/canned_food.png b/public/images/emoji/twitter/canned_food.png
new file mode 100644
index 00000000000..2e5976e9d2f
Binary files /dev/null and b/public/images/emoji/twitter/canned_food.png differ
diff --git a/public/images/emoji/twitter/canoe.png b/public/images/emoji/twitter/canoe.png
new file mode 100644
index 00000000000..4ee3c9caa7e
Binary files /dev/null and b/public/images/emoji/twitter/canoe.png differ
diff --git a/public/images/emoji/twitter/cape_verde.png b/public/images/emoji/twitter/cape_verde.png
new file mode 100644
index 00000000000..1252c37a6d8
Binary files /dev/null and b/public/images/emoji/twitter/cape_verde.png differ
diff --git a/public/images/emoji/twitter/car.png b/public/images/emoji/twitter/car.png
new file mode 100644
index 00000000000..2fbf351b838
Binary files /dev/null and b/public/images/emoji/twitter/car.png differ
diff --git a/public/images/emoji/twitter/caribbean_netherlands.png b/public/images/emoji/twitter/caribbean_netherlands.png
new file mode 100644
index 00000000000..7780a4a0367
Binary files /dev/null and b/public/images/emoji/twitter/caribbean_netherlands.png differ
diff --git a/public/images/emoji/twitter/carousel_horse.png b/public/images/emoji/twitter/carousel_horse.png
index ac1ac5fb269..1aeaf5f5b09 100644
Binary files a/public/images/emoji/twitter/carousel_horse.png and b/public/images/emoji/twitter/carousel_horse.png differ
diff --git a/public/images/emoji/twitter/carrot.png b/public/images/emoji/twitter/carrot.png
new file mode 100644
index 00000000000..939b6874ea3
Binary files /dev/null and b/public/images/emoji/twitter/carrot.png differ
diff --git a/public/images/emoji/twitter/cat.png b/public/images/emoji/twitter/cat.png
index dc33084aabc..a0bddf1ffe5 100644
Binary files a/public/images/emoji/twitter/cat.png and b/public/images/emoji/twitter/cat.png differ
diff --git a/public/images/emoji/twitter/cayman_islands.png b/public/images/emoji/twitter/cayman_islands.png
new file mode 100644
index 00000000000..70d8309d8c6
Binary files /dev/null and b/public/images/emoji/twitter/cayman_islands.png differ
diff --git a/public/images/emoji/twitter/central_african_republic.png b/public/images/emoji/twitter/central_african_republic.png
new file mode 100644
index 00000000000..a344cb3ae87
Binary files /dev/null and b/public/images/emoji/twitter/central_african_republic.png differ
diff --git a/public/images/emoji/twitter/ceuta_and_melilla.png b/public/images/emoji/twitter/ceuta_and_melilla.png
new file mode 100644
index 00000000000..e0da30d5a6c
Binary files /dev/null and b/public/images/emoji/twitter/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/twitter/chad.png b/public/images/emoji/twitter/chad.png
new file mode 100644
index 00000000000..26b77c821c1
Binary files /dev/null and b/public/images/emoji/twitter/chad.png differ
diff --git a/public/images/emoji/twitter/champagne.png b/public/images/emoji/twitter/champagne.png
index d097247136f..49ea37f3899 100644
Binary files a/public/images/emoji/twitter/champagne.png and b/public/images/emoji/twitter/champagne.png differ
diff --git a/public/images/emoji/twitter/cherry_blossom.png b/public/images/emoji/twitter/cherry_blossom.png
index ab6c9d78911..8c5a8f8c094 100644
Binary files a/public/images/emoji/twitter/cherry_blossom.png and b/public/images/emoji/twitter/cherry_blossom.png differ
diff --git a/public/images/emoji/twitter/chicken.png b/public/images/emoji/twitter/chicken.png
index ea0834b78b6..2299ae10ec4 100644
Binary files a/public/images/emoji/twitter/chicken.png and b/public/images/emoji/twitter/chicken.png differ
diff --git a/public/images/emoji/twitter/child.png b/public/images/emoji/twitter/child.png
new file mode 100644
index 00000000000..33e50494a3a
Binary files /dev/null and b/public/images/emoji/twitter/child.png differ
diff --git a/public/images/emoji/twitter/child/2.png b/public/images/emoji/twitter/child/2.png
new file mode 100644
index 00000000000..7a0e4f1cb75
Binary files /dev/null and b/public/images/emoji/twitter/child/2.png differ
diff --git a/public/images/emoji/twitter/child/3.png b/public/images/emoji/twitter/child/3.png
new file mode 100644
index 00000000000..81a69110e9d
Binary files /dev/null and b/public/images/emoji/twitter/child/3.png differ
diff --git a/public/images/emoji/twitter/child/4.png b/public/images/emoji/twitter/child/4.png
new file mode 100644
index 00000000000..b5c64c9cc84
Binary files /dev/null and b/public/images/emoji/twitter/child/4.png differ
diff --git a/public/images/emoji/twitter/child/5.png b/public/images/emoji/twitter/child/5.png
new file mode 100644
index 00000000000..0763a8bd94c
Binary files /dev/null and b/public/images/emoji/twitter/child/5.png differ
diff --git a/public/images/emoji/twitter/child/6.png b/public/images/emoji/twitter/child/6.png
new file mode 100644
index 00000000000..3ed705b9025
Binary files /dev/null and b/public/images/emoji/twitter/child/6.png differ
diff --git a/public/images/emoji/twitter/chile.png b/public/images/emoji/twitter/chile.png
new file mode 100644
index 00000000000..740d09658ed
Binary files /dev/null and b/public/images/emoji/twitter/chile.png differ
diff --git a/public/images/emoji/twitter/chipmunk.png b/public/images/emoji/twitter/chipmunk.png
index 7abc69e19b7..e46b2790d62 100644
Binary files a/public/images/emoji/twitter/chipmunk.png and b/public/images/emoji/twitter/chipmunk.png differ
diff --git a/public/images/emoji/twitter/chocolate_bar.png b/public/images/emoji/twitter/chocolate_bar.png
index 680b64628b1..735209e166d 100644
Binary files a/public/images/emoji/twitter/chocolate_bar.png and b/public/images/emoji/twitter/chocolate_bar.png differ
diff --git a/public/images/emoji/twitter/chopsticks.png b/public/images/emoji/twitter/chopsticks.png
new file mode 100644
index 00000000000..57064202979
Binary files /dev/null and b/public/images/emoji/twitter/chopsticks.png differ
diff --git a/public/images/emoji/twitter/christmas_island.png b/public/images/emoji/twitter/christmas_island.png
new file mode 100644
index 00000000000..6958b7d8d8f
Binary files /dev/null and b/public/images/emoji/twitter/christmas_island.png differ
diff --git a/public/images/emoji/twitter/christmas_tree.png b/public/images/emoji/twitter/christmas_tree.png
index 45b678cbd34..4ee6b2fef0d 100644
Binary files a/public/images/emoji/twitter/christmas_tree.png and b/public/images/emoji/twitter/christmas_tree.png differ
diff --git a/public/images/emoji/twitter/circus_tent.png b/public/images/emoji/twitter/circus_tent.png
index ddbfcfa5caf..4f04b745a85 100644
Binary files a/public/images/emoji/twitter/circus_tent.png and b/public/images/emoji/twitter/circus_tent.png differ
diff --git a/public/images/emoji/twitter/city_sunset.png b/public/images/emoji/twitter/city_sunset.png
index d34ac7ece6a..17dcd8e49f3 100644
Binary files a/public/images/emoji/twitter/city_sunset.png and b/public/images/emoji/twitter/city_sunset.png differ
diff --git a/public/images/emoji/twitter/clamp.png b/public/images/emoji/twitter/clamp.png
new file mode 100644
index 00000000000..e17edcfc70e
Binary files /dev/null and b/public/images/emoji/twitter/clamp.png differ
diff --git a/public/images/emoji/twitter/clap/2.png b/public/images/emoji/twitter/clap/2.png
new file mode 100644
index 00000000000..20c58c405af
Binary files /dev/null and b/public/images/emoji/twitter/clap/2.png differ
diff --git a/public/images/emoji/twitter/clap/3.png b/public/images/emoji/twitter/clap/3.png
new file mode 100644
index 00000000000..6bbe9de353f
Binary files /dev/null and b/public/images/emoji/twitter/clap/3.png differ
diff --git a/public/images/emoji/twitter/clap/4.png b/public/images/emoji/twitter/clap/4.png
new file mode 100644
index 00000000000..959db77f63a
Binary files /dev/null and b/public/images/emoji/twitter/clap/4.png differ
diff --git a/public/images/emoji/twitter/clap/5.png b/public/images/emoji/twitter/clap/5.png
new file mode 100644
index 00000000000..a767c09a2fe
Binary files /dev/null and b/public/images/emoji/twitter/clap/5.png differ
diff --git a/public/images/emoji/twitter/clap/6.png b/public/images/emoji/twitter/clap/6.png
new file mode 100644
index 00000000000..24839781d41
Binary files /dev/null and b/public/images/emoji/twitter/clap/6.png differ
diff --git a/public/images/emoji/twitter/clapper.png b/public/images/emoji/twitter/clapper.png
index dbf6a08ee13..e180b0340ae 100644
Binary files a/public/images/emoji/twitter/clapper.png and b/public/images/emoji/twitter/clapper.png differ
diff --git a/public/images/emoji/twitter/clinking_glasses.png b/public/images/emoji/twitter/clinking_glasses.png
new file mode 100644
index 00000000000..1b24d16ae00
Binary files /dev/null and b/public/images/emoji/twitter/clinking_glasses.png differ
diff --git a/public/images/emoji/twitter/clipperton_island.png b/public/images/emoji/twitter/clipperton_island.png
new file mode 100644
index 00000000000..7943b73f671
Binary files /dev/null and b/public/images/emoji/twitter/clipperton_island.png differ
diff --git a/public/images/emoji/twitter/clock.png b/public/images/emoji/twitter/clock.png
index cf335766a1b..62a0e894592 100644
Binary files a/public/images/emoji/twitter/clock.png and b/public/images/emoji/twitter/clock.png differ
diff --git a/public/images/emoji/twitter/cloud_with_lightning_and_rain.png b/public/images/emoji/twitter/cloud_with_lightning_and_rain.png
new file mode 100644
index 00000000000..be44d531a75
Binary files /dev/null and b/public/images/emoji/twitter/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/twitter/clown_face.png b/public/images/emoji/twitter/clown_face.png
new file mode 100644
index 00000000000..c78134fdee3
Binary files /dev/null and b/public/images/emoji/twitter/clown_face.png differ
diff --git a/public/images/emoji/twitter/coat.png b/public/images/emoji/twitter/coat.png
new file mode 100644
index 00000000000..c409f9f4c4c
Binary files /dev/null and b/public/images/emoji/twitter/coat.png differ
diff --git a/public/images/emoji/twitter/cocktail.png b/public/images/emoji/twitter/cocktail.png
index dc78191f4bd..fab0609689d 100644
Binary files a/public/images/emoji/twitter/cocktail.png and b/public/images/emoji/twitter/cocktail.png differ
diff --git a/public/images/emoji/twitter/coconut.png b/public/images/emoji/twitter/coconut.png
new file mode 100644
index 00000000000..e76b533149f
Binary files /dev/null and b/public/images/emoji/twitter/coconut.png differ
diff --git a/public/images/emoji/twitter/cocos_islands.png b/public/images/emoji/twitter/cocos_islands.png
new file mode 100644
index 00000000000..c9025e34e4b
Binary files /dev/null and b/public/images/emoji/twitter/cocos_islands.png differ
diff --git a/public/images/emoji/twitter/coffee.png b/public/images/emoji/twitter/coffee.png
index 90990adf2c6..fbea94471b8 100644
Binary files a/public/images/emoji/twitter/coffee.png and b/public/images/emoji/twitter/coffee.png differ
diff --git a/public/images/emoji/twitter/cold_sweat.png b/public/images/emoji/twitter/cold_sweat.png
index 49d200520ee..3c022b97954 100644
Binary files a/public/images/emoji/twitter/cold_sweat.png and b/public/images/emoji/twitter/cold_sweat.png differ
diff --git a/public/images/emoji/twitter/colombia.png b/public/images/emoji/twitter/colombia.png
new file mode 100644
index 00000000000..680f77b22d3
Binary files /dev/null and b/public/images/emoji/twitter/colombia.png differ
diff --git a/public/images/emoji/twitter/comoros.png b/public/images/emoji/twitter/comoros.png
new file mode 100644
index 00000000000..e765f507156
Binary files /dev/null and b/public/images/emoji/twitter/comoros.png differ
diff --git a/public/images/emoji/twitter/computer_mouse.png b/public/images/emoji/twitter/computer_mouse.png
new file mode 100644
index 00000000000..3a71c800c68
Binary files /dev/null and b/public/images/emoji/twitter/computer_mouse.png differ
diff --git a/public/images/emoji/twitter/confetti_ball.png b/public/images/emoji/twitter/confetti_ball.png
index 7b5e40f7e7f..44528c70ace 100644
Binary files a/public/images/emoji/twitter/confetti_ball.png and b/public/images/emoji/twitter/confetti_ball.png differ
diff --git a/public/images/emoji/twitter/congo_brazzaville.png b/public/images/emoji/twitter/congo_brazzaville.png
new file mode 100644
index 00000000000..2eef1d6c176
Binary files /dev/null and b/public/images/emoji/twitter/congo_brazzaville.png differ
diff --git a/public/images/emoji/twitter/congo_kinshasa.png b/public/images/emoji/twitter/congo_kinshasa.png
new file mode 100644
index 00000000000..a34af9d64a3
Binary files /dev/null and b/public/images/emoji/twitter/congo_kinshasa.png differ
diff --git a/public/images/emoji/twitter/construction_site.png b/public/images/emoji/twitter/construction_site.png
index 0b2cebc9221..24cdec2e5fd 100644
Binary files a/public/images/emoji/twitter/construction_site.png and b/public/images/emoji/twitter/construction_site.png differ
diff --git a/public/images/emoji/twitter/construction_worker.png b/public/images/emoji/twitter/construction_worker.png
index c408538fabf..32c0607d305 100644
Binary files a/public/images/emoji/twitter/construction_worker.png and b/public/images/emoji/twitter/construction_worker.png differ
diff --git a/public/images/emoji/twitter/construction_worker/2.png b/public/images/emoji/twitter/construction_worker/2.png
new file mode 100644
index 00000000000..27241c8308f
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker/2.png differ
diff --git a/public/images/emoji/twitter/construction_worker/3.png b/public/images/emoji/twitter/construction_worker/3.png
new file mode 100644
index 00000000000..5793b115dab
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker/3.png differ
diff --git a/public/images/emoji/twitter/construction_worker/4.png b/public/images/emoji/twitter/construction_worker/4.png
new file mode 100644
index 00000000000..8fd2dd6ad62
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker/4.png differ
diff --git a/public/images/emoji/twitter/construction_worker/5.png b/public/images/emoji/twitter/construction_worker/5.png
new file mode 100644
index 00000000000..e460c5cda28
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker/5.png differ
diff --git a/public/images/emoji/twitter/construction_worker/6.png b/public/images/emoji/twitter/construction_worker/6.png
new file mode 100644
index 00000000000..9efbda410b8
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker/6.png differ
diff --git a/public/images/emoji/twitter/construction_worker_man.png b/public/images/emoji/twitter/construction_worker_man.png
new file mode 100644
index 00000000000..32c0607d305
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_man.png differ
diff --git a/public/images/emoji/twitter/construction_worker_man/2.png b/public/images/emoji/twitter/construction_worker_man/2.png
new file mode 100644
index 00000000000..27241c8308f
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_man/2.png differ
diff --git a/public/images/emoji/twitter/construction_worker_man/3.png b/public/images/emoji/twitter/construction_worker_man/3.png
new file mode 100644
index 00000000000..5793b115dab
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_man/3.png differ
diff --git a/public/images/emoji/twitter/construction_worker_man/4.png b/public/images/emoji/twitter/construction_worker_man/4.png
new file mode 100644
index 00000000000..8fd2dd6ad62
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_man/4.png differ
diff --git a/public/images/emoji/twitter/construction_worker_man/5.png b/public/images/emoji/twitter/construction_worker_man/5.png
new file mode 100644
index 00000000000..e460c5cda28
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_man/5.png differ
diff --git a/public/images/emoji/twitter/construction_worker_man/6.png b/public/images/emoji/twitter/construction_worker_man/6.png
new file mode 100644
index 00000000000..9efbda410b8
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_man/6.png differ
diff --git a/public/images/emoji/twitter/construction_worker_woman.png b/public/images/emoji/twitter/construction_worker_woman.png
new file mode 100644
index 00000000000..79632626060
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_woman.png differ
diff --git a/public/images/emoji/twitter/construction_worker_woman/2.png b/public/images/emoji/twitter/construction_worker_woman/2.png
new file mode 100644
index 00000000000..63998c76ae0
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/twitter/construction_worker_woman/3.png b/public/images/emoji/twitter/construction_worker_woman/3.png
new file mode 100644
index 00000000000..83eb2d87495
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/twitter/construction_worker_woman/4.png b/public/images/emoji/twitter/construction_worker_woman/4.png
new file mode 100644
index 00000000000..b518850876c
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/twitter/construction_worker_woman/5.png b/public/images/emoji/twitter/construction_worker_woman/5.png
new file mode 100644
index 00000000000..80eacbdd523
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/twitter/construction_worker_woman/6.png b/public/images/emoji/twitter/construction_worker_woman/6.png
new file mode 100644
index 00000000000..34a1e9e2c0d
Binary files /dev/null and b/public/images/emoji/twitter/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/twitter/control_knobs.png b/public/images/emoji/twitter/control_knobs.png
index c54026dbba7..471e812ed30 100644
Binary files a/public/images/emoji/twitter/control_knobs.png and b/public/images/emoji/twitter/control_knobs.png differ
diff --git a/public/images/emoji/twitter/cook_islands.png b/public/images/emoji/twitter/cook_islands.png
new file mode 100644
index 00000000000..d1e4afbacae
Binary files /dev/null and b/public/images/emoji/twitter/cook_islands.png differ
diff --git a/public/images/emoji/twitter/cop.png b/public/images/emoji/twitter/cop.png
index 5be8c58dc46..fe7b77444a0 100644
Binary files a/public/images/emoji/twitter/cop.png and b/public/images/emoji/twitter/cop.png differ
diff --git a/public/images/emoji/twitter/cop/2.png b/public/images/emoji/twitter/cop/2.png
new file mode 100644
index 00000000000..13b912f19e6
Binary files /dev/null and b/public/images/emoji/twitter/cop/2.png differ
diff --git a/public/images/emoji/twitter/cop/3.png b/public/images/emoji/twitter/cop/3.png
new file mode 100644
index 00000000000..6bdbeca1115
Binary files /dev/null and b/public/images/emoji/twitter/cop/3.png differ
diff --git a/public/images/emoji/twitter/cop/4.png b/public/images/emoji/twitter/cop/4.png
new file mode 100644
index 00000000000..b062756c453
Binary files /dev/null and b/public/images/emoji/twitter/cop/4.png differ
diff --git a/public/images/emoji/twitter/cop/5.png b/public/images/emoji/twitter/cop/5.png
new file mode 100644
index 00000000000..86f0ae990b4
Binary files /dev/null and b/public/images/emoji/twitter/cop/5.png differ
diff --git a/public/images/emoji/twitter/cop/6.png b/public/images/emoji/twitter/cop/6.png
new file mode 100644
index 00000000000..29f3fc63aba
Binary files /dev/null and b/public/images/emoji/twitter/cop/6.png differ
diff --git a/public/images/emoji/twitter/corn.png b/public/images/emoji/twitter/corn.png
index 00d63e9cb52..0bb05b4c1b0 100644
Binary files a/public/images/emoji/twitter/corn.png and b/public/images/emoji/twitter/corn.png differ
diff --git a/public/images/emoji/twitter/costa_rica.png b/public/images/emoji/twitter/costa_rica.png
new file mode 100644
index 00000000000..e6c16e4ea0b
Binary files /dev/null and b/public/images/emoji/twitter/costa_rica.png differ
diff --git a/public/images/emoji/twitter/cote_divoire.png b/public/images/emoji/twitter/cote_divoire.png
new file mode 100644
index 00000000000..c8e9c1eacef
Binary files /dev/null and b/public/images/emoji/twitter/cote_divoire.png differ
diff --git a/public/images/emoji/twitter/couple.png b/public/images/emoji/twitter/couple.png
index c703fb08733..c17e182f547 100644
Binary files a/public/images/emoji/twitter/couple.png and b/public/images/emoji/twitter/couple.png differ
diff --git a/public/images/emoji/twitter/couple_with_heart.png b/public/images/emoji/twitter/couple_with_heart.png
index 3842a5b1868..98680b826f1 100644
Binary files a/public/images/emoji/twitter/couple_with_heart.png and b/public/images/emoji/twitter/couple_with_heart.png differ
diff --git a/public/images/emoji/twitter/couple_with_heart_man_man.png b/public/images/emoji/twitter/couple_with_heart_man_man.png
new file mode 100644
index 00000000000..56d8afc89a0
Binary files /dev/null and b/public/images/emoji/twitter/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/twitter/couple_with_heart_woman_man.png b/public/images/emoji/twitter/couple_with_heart_woman_man.png
new file mode 100644
index 00000000000..98680b826f1
Binary files /dev/null and b/public/images/emoji/twitter/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/twitter/couple_with_heart_woman_woman.png b/public/images/emoji/twitter/couple_with_heart_woman_woman.png
new file mode 100644
index 00000000000..8381dc5b8ef
Binary files /dev/null and b/public/images/emoji/twitter/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/twitter/couplekiss.png b/public/images/emoji/twitter/couplekiss.png
index fe04756efb6..576b77fc174 100644
Binary files a/public/images/emoji/twitter/couplekiss.png and b/public/images/emoji/twitter/couplekiss.png differ
diff --git a/public/images/emoji/twitter/couplekiss_man_man.png b/public/images/emoji/twitter/couplekiss_man_man.png
new file mode 100644
index 00000000000..2de6d98e2f9
Binary files /dev/null and b/public/images/emoji/twitter/couplekiss_man_man.png differ
diff --git a/public/images/emoji/twitter/couplekiss_man_woman.png b/public/images/emoji/twitter/couplekiss_man_woman.png
new file mode 100644
index 00000000000..576b77fc174
Binary files /dev/null and b/public/images/emoji/twitter/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/twitter/couplekiss_woman_woman.png b/public/images/emoji/twitter/couplekiss_woman_woman.png
new file mode 100644
index 00000000000..f238608d9ac
Binary files /dev/null and b/public/images/emoji/twitter/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/twitter/cow.png b/public/images/emoji/twitter/cow.png
index 006bf5d83e8..23a2ba41a1c 100644
Binary files a/public/images/emoji/twitter/cow.png and b/public/images/emoji/twitter/cow.png differ
diff --git a/public/images/emoji/twitter/cow2.png b/public/images/emoji/twitter/cow2.png
index 616318dedb2..e98639283cf 100644
Binary files a/public/images/emoji/twitter/cow2.png and b/public/images/emoji/twitter/cow2.png differ
diff --git a/public/images/emoji/twitter/cowboy_hat_face.png b/public/images/emoji/twitter/cowboy_hat_face.png
new file mode 100644
index 00000000000..efe2c6fcd17
Binary files /dev/null and b/public/images/emoji/twitter/cowboy_hat_face.png differ
diff --git a/public/images/emoji/twitter/crazy_face.png b/public/images/emoji/twitter/crazy_face.png
new file mode 100644
index 00000000000..0aaa1cf7651
Binary files /dev/null and b/public/images/emoji/twitter/crazy_face.png differ
diff --git a/public/images/emoji/twitter/cricket.png b/public/images/emoji/twitter/cricket.png
index 8a0bf65a6c7..1e3c9dfa382 100644
Binary files a/public/images/emoji/twitter/cricket.png and b/public/images/emoji/twitter/cricket.png differ
diff --git a/public/images/emoji/twitter/cricket_bat_and_ball.png b/public/images/emoji/twitter/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..8a0bf65a6c7
Binary files /dev/null and b/public/images/emoji/twitter/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/twitter/croatia.png b/public/images/emoji/twitter/croatia.png
new file mode 100644
index 00000000000..6cc9a0e7485
Binary files /dev/null and b/public/images/emoji/twitter/croatia.png differ
diff --git a/public/images/emoji/twitter/crocodile.png b/public/images/emoji/twitter/crocodile.png
index c80fa94f738..e8a07ebbffe 100644
Binary files a/public/images/emoji/twitter/crocodile.png and b/public/images/emoji/twitter/crocodile.png differ
diff --git a/public/images/emoji/twitter/croissant.png b/public/images/emoji/twitter/croissant.png
new file mode 100644
index 00000000000..c2cea2221f9
Binary files /dev/null and b/public/images/emoji/twitter/croissant.png differ
diff --git a/public/images/emoji/twitter/crossed_fingers.png b/public/images/emoji/twitter/crossed_fingers.png
new file mode 100644
index 00000000000..9ba3b1ff090
Binary files /dev/null and b/public/images/emoji/twitter/crossed_fingers.png differ
diff --git a/public/images/emoji/twitter/crossed_fingers/2.png b/public/images/emoji/twitter/crossed_fingers/2.png
new file mode 100644
index 00000000000..7ce5cd5811a
Binary files /dev/null and b/public/images/emoji/twitter/crossed_fingers/2.png differ
diff --git a/public/images/emoji/twitter/crossed_fingers/3.png b/public/images/emoji/twitter/crossed_fingers/3.png
new file mode 100644
index 00000000000..c6297b1c63b
Binary files /dev/null and b/public/images/emoji/twitter/crossed_fingers/3.png differ
diff --git a/public/images/emoji/twitter/crossed_fingers/4.png b/public/images/emoji/twitter/crossed_fingers/4.png
new file mode 100644
index 00000000000..8ae4d9b0f90
Binary files /dev/null and b/public/images/emoji/twitter/crossed_fingers/4.png differ
diff --git a/public/images/emoji/twitter/crossed_fingers/5.png b/public/images/emoji/twitter/crossed_fingers/5.png
new file mode 100644
index 00000000000..f3529e25376
Binary files /dev/null and b/public/images/emoji/twitter/crossed_fingers/5.png differ
diff --git a/public/images/emoji/twitter/crossed_fingers/6.png b/public/images/emoji/twitter/crossed_fingers/6.png
new file mode 100644
index 00000000000..0265996d383
Binary files /dev/null and b/public/images/emoji/twitter/crossed_fingers/6.png differ
diff --git a/public/images/emoji/twitter/crossed_flags.png b/public/images/emoji/twitter/crossed_flags.png
index f78b11032a3..07b18f76593 100644
Binary files a/public/images/emoji/twitter/crossed_flags.png and b/public/images/emoji/twitter/crossed_flags.png differ
diff --git a/public/images/emoji/twitter/crossed_swords.png b/public/images/emoji/twitter/crossed_swords.png
index 644b016522b..ec1da04367b 100644
Binary files a/public/images/emoji/twitter/crossed_swords.png and b/public/images/emoji/twitter/crossed_swords.png differ
diff --git a/public/images/emoji/twitter/crying_cat_face.png b/public/images/emoji/twitter/crying_cat_face.png
index 17e4845f5c6..c262ae3288e 100644
Binary files a/public/images/emoji/twitter/crying_cat_face.png and b/public/images/emoji/twitter/crying_cat_face.png differ
diff --git a/public/images/emoji/twitter/cuba.png b/public/images/emoji/twitter/cuba.png
new file mode 100644
index 00000000000..4436dee31e9
Binary files /dev/null and b/public/images/emoji/twitter/cuba.png differ
diff --git a/public/images/emoji/twitter/cucumber.png b/public/images/emoji/twitter/cucumber.png
new file mode 100644
index 00000000000..392fdddcc1c
Binary files /dev/null and b/public/images/emoji/twitter/cucumber.png differ
diff --git a/public/images/emoji/twitter/cup_with_straw.png b/public/images/emoji/twitter/cup_with_straw.png
new file mode 100644
index 00000000000..4b2f313f9b2
Binary files /dev/null and b/public/images/emoji/twitter/cup_with_straw.png differ
diff --git a/public/images/emoji/twitter/cupid.png b/public/images/emoji/twitter/cupid.png
index 30f6c4435cc..0e44661a91c 100644
Binary files a/public/images/emoji/twitter/cupid.png and b/public/images/emoji/twitter/cupid.png differ
diff --git a/public/images/emoji/twitter/curacao.png b/public/images/emoji/twitter/curacao.png
new file mode 100644
index 00000000000..e29bde1f8b5
Binary files /dev/null and b/public/images/emoji/twitter/curacao.png differ
diff --git a/public/images/emoji/twitter/curling_stone.png b/public/images/emoji/twitter/curling_stone.png
new file mode 100644
index 00000000000..09027a2fb2e
Binary files /dev/null and b/public/images/emoji/twitter/curling_stone.png differ
diff --git a/public/images/emoji/twitter/curry.png b/public/images/emoji/twitter/curry.png
index 295fa810160..e9e28797319 100644
Binary files a/public/images/emoji/twitter/curry.png and b/public/images/emoji/twitter/curry.png differ
diff --git a/public/images/emoji/twitter/custard.png b/public/images/emoji/twitter/custard.png
index 673db8a3a88..7e0d040771b 100644
Binary files a/public/images/emoji/twitter/custard.png and b/public/images/emoji/twitter/custard.png differ
diff --git a/public/images/emoji/twitter/cut_of_meat.png b/public/images/emoji/twitter/cut_of_meat.png
new file mode 100644
index 00000000000..b66d427e099
Binary files /dev/null and b/public/images/emoji/twitter/cut_of_meat.png differ
diff --git a/public/images/emoji/twitter/cyprus.png b/public/images/emoji/twitter/cyprus.png
new file mode 100644
index 00000000000..7f80f4ed578
Binary files /dev/null and b/public/images/emoji/twitter/cyprus.png differ
diff --git a/public/images/emoji/twitter/czech_republic.png b/public/images/emoji/twitter/czech_republic.png
new file mode 100644
index 00000000000..88558e4ab2a
Binary files /dev/null and b/public/images/emoji/twitter/czech_republic.png differ
diff --git a/public/images/emoji/twitter/dancer.png b/public/images/emoji/twitter/dancer.png
index b39cc3a9e1a..78122daaa5d 100644
Binary files a/public/images/emoji/twitter/dancer.png and b/public/images/emoji/twitter/dancer.png differ
diff --git a/public/images/emoji/twitter/dancer/2.png b/public/images/emoji/twitter/dancer/2.png
new file mode 100644
index 00000000000..2b6ae277462
Binary files /dev/null and b/public/images/emoji/twitter/dancer/2.png differ
diff --git a/public/images/emoji/twitter/dancer/3.png b/public/images/emoji/twitter/dancer/3.png
new file mode 100644
index 00000000000..31649029148
Binary files /dev/null and b/public/images/emoji/twitter/dancer/3.png differ
diff --git a/public/images/emoji/twitter/dancer/4.png b/public/images/emoji/twitter/dancer/4.png
new file mode 100644
index 00000000000..9aa4c2b777b
Binary files /dev/null and b/public/images/emoji/twitter/dancer/4.png differ
diff --git a/public/images/emoji/twitter/dancer/5.png b/public/images/emoji/twitter/dancer/5.png
new file mode 100644
index 00000000000..c87ed99b460
Binary files /dev/null and b/public/images/emoji/twitter/dancer/5.png differ
diff --git a/public/images/emoji/twitter/dancer/6.png b/public/images/emoji/twitter/dancer/6.png
new file mode 100644
index 00000000000..e5b30ff0ec3
Binary files /dev/null and b/public/images/emoji/twitter/dancer/6.png differ
diff --git a/public/images/emoji/twitter/dancers.png b/public/images/emoji/twitter/dancers.png
index 4f9a95af335..f972cc2a77f 100644
Binary files a/public/images/emoji/twitter/dancers.png and b/public/images/emoji/twitter/dancers.png differ
diff --git a/public/images/emoji/twitter/dancing_men.png b/public/images/emoji/twitter/dancing_men.png
new file mode 100644
index 00000000000..dec9fb054b6
Binary files /dev/null and b/public/images/emoji/twitter/dancing_men.png differ
diff --git a/public/images/emoji/twitter/dancing_women.png b/public/images/emoji/twitter/dancing_women.png
new file mode 100644
index 00000000000..f972cc2a77f
Binary files /dev/null and b/public/images/emoji/twitter/dancing_women.png differ
diff --git a/public/images/emoji/twitter/dart.png b/public/images/emoji/twitter/dart.png
index 51cea45f9ca..80dd9608773 100644
Binary files a/public/images/emoji/twitter/dart.png and b/public/images/emoji/twitter/dart.png differ
diff --git a/public/images/emoji/twitter/deer.png b/public/images/emoji/twitter/deer.png
new file mode 100644
index 00000000000..92aa546e945
Binary files /dev/null and b/public/images/emoji/twitter/deer.png differ
diff --git a/public/images/emoji/twitter/denmark.png b/public/images/emoji/twitter/denmark.png
new file mode 100644
index 00000000000..821499e02c7
Binary files /dev/null and b/public/images/emoji/twitter/denmark.png differ
diff --git a/public/images/emoji/twitter/derelict_house.png b/public/images/emoji/twitter/derelict_house.png
new file mode 100644
index 00000000000..a48da604946
Binary files /dev/null and b/public/images/emoji/twitter/derelict_house.png differ
diff --git a/public/images/emoji/twitter/desert.png b/public/images/emoji/twitter/desert.png
index 34cde2e36fa..3ec8a867b45 100644
Binary files a/public/images/emoji/twitter/desert.png and b/public/images/emoji/twitter/desert.png differ
diff --git a/public/images/emoji/twitter/desert_island.png b/public/images/emoji/twitter/desert_island.png
index 37832e01835..2d2e8919fff 100644
Binary files a/public/images/emoji/twitter/desert_island.png and b/public/images/emoji/twitter/desert_island.png differ
diff --git a/public/images/emoji/twitter/diego_garcia.png b/public/images/emoji/twitter/diego_garcia.png
new file mode 100644
index 00000000000..881e01a927f
Binary files /dev/null and b/public/images/emoji/twitter/diego_garcia.png differ
diff --git a/public/images/emoji/twitter/djibouti.png b/public/images/emoji/twitter/djibouti.png
new file mode 100644
index 00000000000..606fe6a1ee5
Binary files /dev/null and b/public/images/emoji/twitter/djibouti.png differ
diff --git a/public/images/emoji/twitter/do_not_litter.png b/public/images/emoji/twitter/do_not_litter.png
index 86e5cfda498..518466b08ab 100644
Binary files a/public/images/emoji/twitter/do_not_litter.png and b/public/images/emoji/twitter/do_not_litter.png differ
diff --git a/public/images/emoji/twitter/dog.png b/public/images/emoji/twitter/dog.png
index 91f68d68850..797c62e8cc3 100644
Binary files a/public/images/emoji/twitter/dog.png and b/public/images/emoji/twitter/dog.png differ
diff --git a/public/images/emoji/twitter/dog2.png b/public/images/emoji/twitter/dog2.png
index 12dd201bcc3..d922415786a 100644
Binary files a/public/images/emoji/twitter/dog2.png and b/public/images/emoji/twitter/dog2.png differ
diff --git a/public/images/emoji/twitter/dolls.png b/public/images/emoji/twitter/dolls.png
index 182370e8ac0..a69e389862e 100644
Binary files a/public/images/emoji/twitter/dolls.png and b/public/images/emoji/twitter/dolls.png differ
diff --git a/public/images/emoji/twitter/dominica.png b/public/images/emoji/twitter/dominica.png
new file mode 100644
index 00000000000..588ece3f433
Binary files /dev/null and b/public/images/emoji/twitter/dominica.png differ
diff --git a/public/images/emoji/twitter/dominican_republic.png b/public/images/emoji/twitter/dominican_republic.png
new file mode 100644
index 00000000000..de48ff449ca
Binary files /dev/null and b/public/images/emoji/twitter/dominican_republic.png differ
diff --git a/public/images/emoji/twitter/doughnut.png b/public/images/emoji/twitter/doughnut.png
index 6c09ea3c739..5c85e0b83c5 100644
Binary files a/public/images/emoji/twitter/doughnut.png and b/public/images/emoji/twitter/doughnut.png differ
diff --git a/public/images/emoji/twitter/dove.png b/public/images/emoji/twitter/dove.png
index 721749b09d0..9fdcff829ad 100644
Binary files a/public/images/emoji/twitter/dove.png and b/public/images/emoji/twitter/dove.png differ
diff --git a/public/images/emoji/twitter/dove_of_peace.png b/public/images/emoji/twitter/dove_of_peace.png
index 721749b09d0..9fdcff829ad 100644
Binary files a/public/images/emoji/twitter/dove_of_peace.png and b/public/images/emoji/twitter/dove_of_peace.png differ
diff --git a/public/images/emoji/twitter/dragon.png b/public/images/emoji/twitter/dragon.png
index 40233507fb6..951a35d0cb4 100644
Binary files a/public/images/emoji/twitter/dragon.png and b/public/images/emoji/twitter/dragon.png differ
diff --git a/public/images/emoji/twitter/dragon_face.png b/public/images/emoji/twitter/dragon_face.png
index 8dbce8f24ba..64acc92aa9e 100644
Binary files a/public/images/emoji/twitter/dragon_face.png and b/public/images/emoji/twitter/dragon_face.png differ
diff --git a/public/images/emoji/twitter/drooling_face.png b/public/images/emoji/twitter/drooling_face.png
new file mode 100644
index 00000000000..2ad3f8a41b1
Binary files /dev/null and b/public/images/emoji/twitter/drooling_face.png differ
diff --git a/public/images/emoji/twitter/drum.png b/public/images/emoji/twitter/drum.png
new file mode 100644
index 00000000000..d0c94c34e49
Binary files /dev/null and b/public/images/emoji/twitter/drum.png differ
diff --git a/public/images/emoji/twitter/duck.png b/public/images/emoji/twitter/duck.png
new file mode 100644
index 00000000000..6adaf8cddb3
Binary files /dev/null and b/public/images/emoji/twitter/duck.png differ
diff --git a/public/images/emoji/twitter/dumpling.png b/public/images/emoji/twitter/dumpling.png
new file mode 100644
index 00000000000..489a779bf69
Binary files /dev/null and b/public/images/emoji/twitter/dumpling.png differ
diff --git a/public/images/emoji/twitter/e-mail.png b/public/images/emoji/twitter/e-mail.png
index e1f706f93bd..fcdd33b0d75 100644
Binary files a/public/images/emoji/twitter/e-mail.png and b/public/images/emoji/twitter/e-mail.png differ
diff --git a/public/images/emoji/twitter/eagle.png b/public/images/emoji/twitter/eagle.png
new file mode 100644
index 00000000000..c9cce258ae2
Binary files /dev/null and b/public/images/emoji/twitter/eagle.png differ
diff --git a/public/images/emoji/twitter/ear/2.png b/public/images/emoji/twitter/ear/2.png
new file mode 100644
index 00000000000..ebd0634eb6d
Binary files /dev/null and b/public/images/emoji/twitter/ear/2.png differ
diff --git a/public/images/emoji/twitter/ear/3.png b/public/images/emoji/twitter/ear/3.png
new file mode 100644
index 00000000000..da8447f5f26
Binary files /dev/null and b/public/images/emoji/twitter/ear/3.png differ
diff --git a/public/images/emoji/twitter/ear/4.png b/public/images/emoji/twitter/ear/4.png
new file mode 100644
index 00000000000..13619101d0a
Binary files /dev/null and b/public/images/emoji/twitter/ear/4.png differ
diff --git a/public/images/emoji/twitter/ear/5.png b/public/images/emoji/twitter/ear/5.png
new file mode 100644
index 00000000000..b488923c4ae
Binary files /dev/null and b/public/images/emoji/twitter/ear/5.png differ
diff --git a/public/images/emoji/twitter/ear/6.png b/public/images/emoji/twitter/ear/6.png
new file mode 100644
index 00000000000..7874afc0a69
Binary files /dev/null and b/public/images/emoji/twitter/ear/6.png differ
diff --git a/public/images/emoji/twitter/ecuador.png b/public/images/emoji/twitter/ecuador.png
new file mode 100644
index 00000000000..cf86fbaad62
Binary files /dev/null and b/public/images/emoji/twitter/ecuador.png differ
diff --git a/public/images/emoji/twitter/egg.png b/public/images/emoji/twitter/egg.png
index 596a7389b83..cec55b549a2 100644
Binary files a/public/images/emoji/twitter/egg.png and b/public/images/emoji/twitter/egg.png differ
diff --git a/public/images/emoji/twitter/egypt.png b/public/images/emoji/twitter/egypt.png
new file mode 100644
index 00000000000..bbbdefa653f
Binary files /dev/null and b/public/images/emoji/twitter/egypt.png differ
diff --git a/public/images/emoji/twitter/eight.png b/public/images/emoji/twitter/eight.png
index 90f774c3920..302a381ec08 100644
Binary files a/public/images/emoji/twitter/eight.png and b/public/images/emoji/twitter/eight.png differ
diff --git a/public/images/emoji/twitter/el_salvador.png b/public/images/emoji/twitter/el_salvador.png
new file mode 100644
index 00000000000..0f24a983698
Binary files /dev/null and b/public/images/emoji/twitter/el_salvador.png differ
diff --git a/public/images/emoji/twitter/elf.png b/public/images/emoji/twitter/elf.png
new file mode 100644
index 00000000000..f8b6dd873e2
Binary files /dev/null and b/public/images/emoji/twitter/elf.png differ
diff --git a/public/images/emoji/twitter/elf/2.png b/public/images/emoji/twitter/elf/2.png
new file mode 100644
index 00000000000..15984024f21
Binary files /dev/null and b/public/images/emoji/twitter/elf/2.png differ
diff --git a/public/images/emoji/twitter/elf/3.png b/public/images/emoji/twitter/elf/3.png
new file mode 100644
index 00000000000..4689243a178
Binary files /dev/null and b/public/images/emoji/twitter/elf/3.png differ
diff --git a/public/images/emoji/twitter/elf/4.png b/public/images/emoji/twitter/elf/4.png
new file mode 100644
index 00000000000..861cbf808ca
Binary files /dev/null and b/public/images/emoji/twitter/elf/4.png differ
diff --git a/public/images/emoji/twitter/elf/5.png b/public/images/emoji/twitter/elf/5.png
new file mode 100644
index 00000000000..50748760101
Binary files /dev/null and b/public/images/emoji/twitter/elf/5.png differ
diff --git a/public/images/emoji/twitter/elf/6.png b/public/images/emoji/twitter/elf/6.png
new file mode 100644
index 00000000000..505c908b180
Binary files /dev/null and b/public/images/emoji/twitter/elf/6.png differ
diff --git a/public/images/emoji/twitter/email.png b/public/images/emoji/twitter/email.png
index e1f706f93bd..fcdd33b0d75 100644
Binary files a/public/images/emoji/twitter/email.png and b/public/images/emoji/twitter/email.png differ
diff --git a/public/images/emoji/twitter/end.png b/public/images/emoji/twitter/end.png
index 398caa50510..6becf76bb18 100644
Binary files a/public/images/emoji/twitter/end.png and b/public/images/emoji/twitter/end.png differ
diff --git a/public/images/emoji/twitter/equatorial_guinea.png b/public/images/emoji/twitter/equatorial_guinea.png
new file mode 100644
index 00000000000..38e992318c3
Binary files /dev/null and b/public/images/emoji/twitter/equatorial_guinea.png differ
diff --git a/public/images/emoji/twitter/eritrea.png b/public/images/emoji/twitter/eritrea.png
new file mode 100644
index 00000000000..630fd664150
Binary files /dev/null and b/public/images/emoji/twitter/eritrea.png differ
diff --git a/public/images/emoji/twitter/estonia.png b/public/images/emoji/twitter/estonia.png
new file mode 100644
index 00000000000..2553a5dbf7d
Binary files /dev/null and b/public/images/emoji/twitter/estonia.png differ
diff --git a/public/images/emoji/twitter/ethiopia.png b/public/images/emoji/twitter/ethiopia.png
new file mode 100644
index 00000000000..d0d78350cdf
Binary files /dev/null and b/public/images/emoji/twitter/ethiopia.png differ
diff --git a/public/images/emoji/twitter/eu.png b/public/images/emoji/twitter/eu.png
new file mode 100644
index 00000000000..938b488ddb8
Binary files /dev/null and b/public/images/emoji/twitter/eu.png differ
diff --git a/public/images/emoji/twitter/exploding_head.png b/public/images/emoji/twitter/exploding_head.png
new file mode 100644
index 00000000000..85532dadc7a
Binary files /dev/null and b/public/images/emoji/twitter/exploding_head.png differ
diff --git a/public/images/emoji/twitter/face_vomiting.png b/public/images/emoji/twitter/face_vomiting.png
new file mode 100644
index 00000000000..cd7c3d1f2b7
Binary files /dev/null and b/public/images/emoji/twitter/face_vomiting.png differ
diff --git a/public/images/emoji/twitter/face_with_hand_over_mouth.png b/public/images/emoji/twitter/face_with_hand_over_mouth.png
new file mode 100644
index 00000000000..aed8f62e0b0
Binary files /dev/null and b/public/images/emoji/twitter/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/twitter/face_with_head_bandage.png b/public/images/emoji/twitter/face_with_head_bandage.png
index f68e8b2f197..97bec4d11f6 100644
Binary files a/public/images/emoji/twitter/face_with_head_bandage.png and b/public/images/emoji/twitter/face_with_head_bandage.png differ
diff --git a/public/images/emoji/twitter/face_with_monocle.png b/public/images/emoji/twitter/face_with_monocle.png
new file mode 100644
index 00000000000..c6fbb4481d5
Binary files /dev/null and b/public/images/emoji/twitter/face_with_monocle.png differ
diff --git a/public/images/emoji/twitter/face_with_raised_eyebrow.png b/public/images/emoji/twitter/face_with_raised_eyebrow.png
new file mode 100644
index 00000000000..887f70e3652
Binary files /dev/null and b/public/images/emoji/twitter/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/twitter/face_with_rolling_eyes.png b/public/images/emoji/twitter/face_with_rolling_eyes.png
index 19f91b44b44..8a864a00bdf 100644
Binary files a/public/images/emoji/twitter/face_with_rolling_eyes.png and b/public/images/emoji/twitter/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/twitter/face_with_symbols_over_mouth.png b/public/images/emoji/twitter/face_with_symbols_over_mouth.png
new file mode 100644
index 00000000000..84bb9ec9c53
Binary files /dev/null and b/public/images/emoji/twitter/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/twitter/face_with_thermometer.png b/public/images/emoji/twitter/face_with_thermometer.png
index 5539251aa4e..c9440239c0d 100644
Binary files a/public/images/emoji/twitter/face_with_thermometer.png and b/public/images/emoji/twitter/face_with_thermometer.png differ
diff --git a/public/images/emoji/twitter/facepunch.png b/public/images/emoji/twitter/facepunch.png
new file mode 100644
index 00000000000..28448af2fb6
Binary files /dev/null and b/public/images/emoji/twitter/facepunch.png differ
diff --git a/public/images/emoji/twitter/facepunch/2.png b/public/images/emoji/twitter/facepunch/2.png
new file mode 100644
index 00000000000..f5511a84165
Binary files /dev/null and b/public/images/emoji/twitter/facepunch/2.png differ
diff --git a/public/images/emoji/twitter/facepunch/3.png b/public/images/emoji/twitter/facepunch/3.png
new file mode 100644
index 00000000000..b836c259f3b
Binary files /dev/null and b/public/images/emoji/twitter/facepunch/3.png differ
diff --git a/public/images/emoji/twitter/facepunch/4.png b/public/images/emoji/twitter/facepunch/4.png
new file mode 100644
index 00000000000..3eb0bb85212
Binary files /dev/null and b/public/images/emoji/twitter/facepunch/4.png differ
diff --git a/public/images/emoji/twitter/facepunch/5.png b/public/images/emoji/twitter/facepunch/5.png
new file mode 100644
index 00000000000..b1004a4f045
Binary files /dev/null and b/public/images/emoji/twitter/facepunch/5.png differ
diff --git a/public/images/emoji/twitter/facepunch/6.png b/public/images/emoji/twitter/facepunch/6.png
new file mode 100644
index 00000000000..570a5d52d93
Binary files /dev/null and b/public/images/emoji/twitter/facepunch/6.png differ
diff --git a/public/images/emoji/twitter/fairy.png b/public/images/emoji/twitter/fairy.png
new file mode 100644
index 00000000000..429938294b2
Binary files /dev/null and b/public/images/emoji/twitter/fairy.png differ
diff --git a/public/images/emoji/twitter/fairy/2.png b/public/images/emoji/twitter/fairy/2.png
new file mode 100644
index 00000000000..91e1de4e5dc
Binary files /dev/null and b/public/images/emoji/twitter/fairy/2.png differ
diff --git a/public/images/emoji/twitter/fairy/3.png b/public/images/emoji/twitter/fairy/3.png
new file mode 100644
index 00000000000..42821806e92
Binary files /dev/null and b/public/images/emoji/twitter/fairy/3.png differ
diff --git a/public/images/emoji/twitter/fairy/4.png b/public/images/emoji/twitter/fairy/4.png
new file mode 100644
index 00000000000..9e8d3adb897
Binary files /dev/null and b/public/images/emoji/twitter/fairy/4.png differ
diff --git a/public/images/emoji/twitter/fairy/5.png b/public/images/emoji/twitter/fairy/5.png
new file mode 100644
index 00000000000..88d190e3926
Binary files /dev/null and b/public/images/emoji/twitter/fairy/5.png differ
diff --git a/public/images/emoji/twitter/fairy/6.png b/public/images/emoji/twitter/fairy/6.png
new file mode 100644
index 00000000000..e6ab8ade743
Binary files /dev/null and b/public/images/emoji/twitter/fairy/6.png differ
diff --git a/public/images/emoji/twitter/falkland_islands.png b/public/images/emoji/twitter/falkland_islands.png
new file mode 100644
index 00000000000..d97a84cea15
Binary files /dev/null and b/public/images/emoji/twitter/falkland_islands.png differ
diff --git a/public/images/emoji/twitter/family.png b/public/images/emoji/twitter/family.png
new file mode 100644
index 00000000000..3d59c46f5a2
Binary files /dev/null and b/public/images/emoji/twitter/family.png differ
diff --git a/public/images/emoji/twitter/family_man_boy.png b/public/images/emoji/twitter/family_man_boy.png
new file mode 100644
index 00000000000..d31b0f6209a
Binary files /dev/null and b/public/images/emoji/twitter/family_man_boy.png differ
diff --git a/public/images/emoji/twitter/family_man_boy_boy.png b/public/images/emoji/twitter/family_man_boy_boy.png
new file mode 100644
index 00000000000..67d15f282cf
Binary files /dev/null and b/public/images/emoji/twitter/family_man_boy_boy.png differ
diff --git a/public/images/emoji/twitter/family_man_girl.png b/public/images/emoji/twitter/family_man_girl.png
new file mode 100644
index 00000000000..4bb3d823f80
Binary files /dev/null and b/public/images/emoji/twitter/family_man_girl.png differ
diff --git a/public/images/emoji/twitter/family_man_girl_boy.png b/public/images/emoji/twitter/family_man_girl_boy.png
new file mode 100644
index 00000000000..a8b6469dcb1
Binary files /dev/null and b/public/images/emoji/twitter/family_man_girl_boy.png differ
diff --git a/public/images/emoji/twitter/family_man_girl_girl.png b/public/images/emoji/twitter/family_man_girl_girl.png
new file mode 100644
index 00000000000..e1aa1a80db0
Binary files /dev/null and b/public/images/emoji/twitter/family_man_girl_girl.png differ
diff --git a/public/images/emoji/twitter/family_man_man_boy.png b/public/images/emoji/twitter/family_man_man_boy.png
new file mode 100644
index 00000000000..f908ca59432
Binary files /dev/null and b/public/images/emoji/twitter/family_man_man_boy.png differ
diff --git a/public/images/emoji/twitter/family_man_man_boy_boy.png b/public/images/emoji/twitter/family_man_man_boy_boy.png
new file mode 100644
index 00000000000..3a5450aa90a
Binary files /dev/null and b/public/images/emoji/twitter/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/twitter/family_man_man_girl.png b/public/images/emoji/twitter/family_man_man_girl.png
new file mode 100644
index 00000000000..40cc392a935
Binary files /dev/null and b/public/images/emoji/twitter/family_man_man_girl.png differ
diff --git a/public/images/emoji/twitter/family_man_man_girl_boy.png b/public/images/emoji/twitter/family_man_man_girl_boy.png
new file mode 100644
index 00000000000..3dac9f07feb
Binary files /dev/null and b/public/images/emoji/twitter/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/twitter/family_man_man_girl_girl.png b/public/images/emoji/twitter/family_man_man_girl_girl.png
new file mode 100644
index 00000000000..985c53eb3c9
Binary files /dev/null and b/public/images/emoji/twitter/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/twitter/family_man_woman_boy.png b/public/images/emoji/twitter/family_man_woman_boy.png
new file mode 100644
index 00000000000..90526b27fc2
Binary files /dev/null and b/public/images/emoji/twitter/family_man_woman_boy.png differ
diff --git a/public/images/emoji/twitter/family_man_woman_boy_boy.png b/public/images/emoji/twitter/family_man_woman_boy_boy.png
new file mode 100644
index 00000000000..e8abd120b19
Binary files /dev/null and b/public/images/emoji/twitter/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/twitter/family_man_woman_boys.png b/public/images/emoji/twitter/family_man_woman_boys.png
index 6e182893e99..e8abd120b19 100644
Binary files a/public/images/emoji/twitter/family_man_woman_boys.png and b/public/images/emoji/twitter/family_man_woman_boys.png differ
diff --git a/public/images/emoji/twitter/family_man_woman_girl.png b/public/images/emoji/twitter/family_man_woman_girl.png
index 87fc9a756b1..b948f1cbca2 100644
Binary files a/public/images/emoji/twitter/family_man_woman_girl.png and b/public/images/emoji/twitter/family_man_woman_girl.png differ
diff --git a/public/images/emoji/twitter/family_man_woman_girl_boy.png b/public/images/emoji/twitter/family_man_woman_girl_boy.png
index 245e06801dd..3d59c46f5a2 100644
Binary files a/public/images/emoji/twitter/family_man_woman_girl_boy.png and b/public/images/emoji/twitter/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/twitter/family_man_woman_girl_girl.png b/public/images/emoji/twitter/family_man_woman_girl_girl.png
new file mode 100644
index 00000000000..8d6fa3ac3e0
Binary files /dev/null and b/public/images/emoji/twitter/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/twitter/family_man_woman_girls.png b/public/images/emoji/twitter/family_man_woman_girls.png
index 932e8dc1fc8..8d6fa3ac3e0 100644
Binary files a/public/images/emoji/twitter/family_man_woman_girls.png and b/public/images/emoji/twitter/family_man_woman_girls.png differ
diff --git a/public/images/emoji/twitter/family_men_boy.png b/public/images/emoji/twitter/family_men_boy.png
index d7f05619869..f908ca59432 100644
Binary files a/public/images/emoji/twitter/family_men_boy.png and b/public/images/emoji/twitter/family_men_boy.png differ
diff --git a/public/images/emoji/twitter/family_men_boys.png b/public/images/emoji/twitter/family_men_boys.png
index 17ef09256e3..3a5450aa90a 100644
Binary files a/public/images/emoji/twitter/family_men_boys.png and b/public/images/emoji/twitter/family_men_boys.png differ
diff --git a/public/images/emoji/twitter/family_men_girl.png b/public/images/emoji/twitter/family_men_girl.png
index cc4a1118485..40cc392a935 100644
Binary files a/public/images/emoji/twitter/family_men_girl.png and b/public/images/emoji/twitter/family_men_girl.png differ
diff --git a/public/images/emoji/twitter/family_men_girl_boy.png b/public/images/emoji/twitter/family_men_girl_boy.png
index 7772e1d79b5..3dac9f07feb 100644
Binary files a/public/images/emoji/twitter/family_men_girl_boy.png and b/public/images/emoji/twitter/family_men_girl_boy.png differ
diff --git a/public/images/emoji/twitter/family_men_girls.png b/public/images/emoji/twitter/family_men_girls.png
index 3367cfcd773..985c53eb3c9 100644
Binary files a/public/images/emoji/twitter/family_men_girls.png and b/public/images/emoji/twitter/family_men_girls.png differ
diff --git a/public/images/emoji/twitter/family_woman_boy.png b/public/images/emoji/twitter/family_woman_boy.png
new file mode 100644
index 00000000000..3b0f755fd8c
Binary files /dev/null and b/public/images/emoji/twitter/family_woman_boy.png differ
diff --git a/public/images/emoji/twitter/family_woman_boy_boy.png b/public/images/emoji/twitter/family_woman_boy_boy.png
new file mode 100644
index 00000000000..f9a18137382
Binary files /dev/null and b/public/images/emoji/twitter/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/twitter/family_woman_girl.png b/public/images/emoji/twitter/family_woman_girl.png
new file mode 100644
index 00000000000..966c36a0b90
Binary files /dev/null and b/public/images/emoji/twitter/family_woman_girl.png differ
diff --git a/public/images/emoji/twitter/family_woman_girl_boy.png b/public/images/emoji/twitter/family_woman_girl_boy.png
new file mode 100644
index 00000000000..68b96718176
Binary files /dev/null and b/public/images/emoji/twitter/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/twitter/family_woman_girl_girl.png b/public/images/emoji/twitter/family_woman_girl_girl.png
new file mode 100644
index 00000000000..1e1995f8bf4
Binary files /dev/null and b/public/images/emoji/twitter/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/twitter/family_woman_woman_boy.png b/public/images/emoji/twitter/family_woman_woman_boy.png
new file mode 100644
index 00000000000..e9ce3234874
Binary files /dev/null and b/public/images/emoji/twitter/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/twitter/family_woman_woman_boy_boy.png b/public/images/emoji/twitter/family_woman_woman_boy_boy.png
new file mode 100644
index 00000000000..99137491627
Binary files /dev/null and b/public/images/emoji/twitter/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/twitter/family_woman_woman_girl.png b/public/images/emoji/twitter/family_woman_woman_girl.png
new file mode 100644
index 00000000000..ce0352c19b5
Binary files /dev/null and b/public/images/emoji/twitter/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/twitter/family_woman_woman_girl_boy.png b/public/images/emoji/twitter/family_woman_woman_girl_boy.png
new file mode 100644
index 00000000000..cb294dd7c07
Binary files /dev/null and b/public/images/emoji/twitter/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/twitter/family_woman_woman_girl_girl.png b/public/images/emoji/twitter/family_woman_woman_girl_girl.png
new file mode 100644
index 00000000000..e751a274016
Binary files /dev/null and b/public/images/emoji/twitter/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/twitter/family_women_boys.png b/public/images/emoji/twitter/family_women_boys.png
index a5394941df0..99137491627 100644
Binary files a/public/images/emoji/twitter/family_women_boys.png and b/public/images/emoji/twitter/family_women_boys.png differ
diff --git a/public/images/emoji/twitter/family_women_girl_boy.png b/public/images/emoji/twitter/family_women_girl_boy.png
index 24cf7536f25..cb294dd7c07 100644
Binary files a/public/images/emoji/twitter/family_women_girl_boy.png and b/public/images/emoji/twitter/family_women_girl_boy.png differ
diff --git a/public/images/emoji/twitter/family_women_girls.png b/public/images/emoji/twitter/family_women_girls.png
index 610f517f2a8..e751a274016 100644
Binary files a/public/images/emoji/twitter/family_women_girls.png and b/public/images/emoji/twitter/family_women_girls.png differ
diff --git a/public/images/emoji/twitter/faroe_islands.png b/public/images/emoji/twitter/faroe_islands.png
new file mode 100644
index 00000000000..5da7953f8d0
Binary files /dev/null and b/public/images/emoji/twitter/faroe_islands.png differ
diff --git a/public/images/emoji/twitter/fearful.png b/public/images/emoji/twitter/fearful.png
index 5c0e5127d71..a8e9ccbb604 100644
Binary files a/public/images/emoji/twitter/fearful.png and b/public/images/emoji/twitter/fearful.png differ
diff --git a/public/images/emoji/twitter/feet.png b/public/images/emoji/twitter/feet.png
index 5d89252f0e9..1869c3930a2 100644
Binary files a/public/images/emoji/twitter/feet.png and b/public/images/emoji/twitter/feet.png differ
diff --git a/public/images/emoji/twitter/female_couple_with_heart.png b/public/images/emoji/twitter/female_couple_with_heart.png
index 16dd7df4dee..8381dc5b8ef 100644
Binary files a/public/images/emoji/twitter/female_couple_with_heart.png and b/public/images/emoji/twitter/female_couple_with_heart.png differ
diff --git a/public/images/emoji/twitter/female_detective.png b/public/images/emoji/twitter/female_detective.png
new file mode 100644
index 00000000000..c1703a7c869
Binary files /dev/null and b/public/images/emoji/twitter/female_detective.png differ
diff --git a/public/images/emoji/twitter/ferris_wheel.png b/public/images/emoji/twitter/ferris_wheel.png
index 3168f01b453..68e00d62fe5 100644
Binary files a/public/images/emoji/twitter/ferris_wheel.png and b/public/images/emoji/twitter/ferris_wheel.png differ
diff --git a/public/images/emoji/twitter/fiji.png b/public/images/emoji/twitter/fiji.png
new file mode 100644
index 00000000000..df504caef6c
Binary files /dev/null and b/public/images/emoji/twitter/fiji.png differ
diff --git a/public/images/emoji/twitter/film_frames.png b/public/images/emoji/twitter/film_frames.png
index 863b2129777..f0fcd6fc1dc 100644
Binary files a/public/images/emoji/twitter/film_frames.png and b/public/images/emoji/twitter/film_frames.png differ
diff --git a/public/images/emoji/twitter/film_strip.png b/public/images/emoji/twitter/film_strip.png
new file mode 100644
index 00000000000..f0fcd6fc1dc
Binary files /dev/null and b/public/images/emoji/twitter/film_strip.png differ
diff --git a/public/images/emoji/twitter/finland.png b/public/images/emoji/twitter/finland.png
new file mode 100644
index 00000000000..5eda4bb8646
Binary files /dev/null and b/public/images/emoji/twitter/finland.png differ
diff --git a/public/images/emoji/twitter/fireworks.png b/public/images/emoji/twitter/fireworks.png
index 2734a6d6e4a..1f7f056b57f 100644
Binary files a/public/images/emoji/twitter/fireworks.png and b/public/images/emoji/twitter/fireworks.png differ
diff --git a/public/images/emoji/twitter/first_quarter_moon_with_face.png b/public/images/emoji/twitter/first_quarter_moon_with_face.png
index ee984ef906f..1d702357e62 100644
Binary files a/public/images/emoji/twitter/first_quarter_moon_with_face.png and b/public/images/emoji/twitter/first_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/twitter/fishing_pole_and_fish.png b/public/images/emoji/twitter/fishing_pole_and_fish.png
index cac34b4f771..936e1559a4d 100644
Binary files a/public/images/emoji/twitter/fishing_pole_and_fish.png and b/public/images/emoji/twitter/fishing_pole_and_fish.png differ
diff --git a/public/images/emoji/twitter/fist.png b/public/images/emoji/twitter/fist.png
index 240544d25ff..30d7e1e2142 100644
Binary files a/public/images/emoji/twitter/fist.png and b/public/images/emoji/twitter/fist.png differ
diff --git a/public/images/emoji/twitter/fist/2.png b/public/images/emoji/twitter/fist/2.png
new file mode 100644
index 00000000000..a9739dc4c1f
Binary files /dev/null and b/public/images/emoji/twitter/fist/2.png differ
diff --git a/public/images/emoji/twitter/fist/3.png b/public/images/emoji/twitter/fist/3.png
new file mode 100644
index 00000000000..634bb802473
Binary files /dev/null and b/public/images/emoji/twitter/fist/3.png differ
diff --git a/public/images/emoji/twitter/fist/4.png b/public/images/emoji/twitter/fist/4.png
new file mode 100644
index 00000000000..42492cdf3d0
Binary files /dev/null and b/public/images/emoji/twitter/fist/4.png differ
diff --git a/public/images/emoji/twitter/fist/5.png b/public/images/emoji/twitter/fist/5.png
new file mode 100644
index 00000000000..0f1ba5dece1
Binary files /dev/null and b/public/images/emoji/twitter/fist/5.png differ
diff --git a/public/images/emoji/twitter/fist/6.png b/public/images/emoji/twitter/fist/6.png
new file mode 100644
index 00000000000..24030c7af73
Binary files /dev/null and b/public/images/emoji/twitter/fist/6.png differ
diff --git a/public/images/emoji/twitter/fist_left.png b/public/images/emoji/twitter/fist_left.png
new file mode 100644
index 00000000000..f1ebb97514a
Binary files /dev/null and b/public/images/emoji/twitter/fist_left.png differ
diff --git a/public/images/emoji/twitter/fist_left/2.png b/public/images/emoji/twitter/fist_left/2.png
new file mode 100644
index 00000000000..1360d252cef
Binary files /dev/null and b/public/images/emoji/twitter/fist_left/2.png differ
diff --git a/public/images/emoji/twitter/fist_left/3.png b/public/images/emoji/twitter/fist_left/3.png
new file mode 100644
index 00000000000..270de69cd23
Binary files /dev/null and b/public/images/emoji/twitter/fist_left/3.png differ
diff --git a/public/images/emoji/twitter/fist_left/4.png b/public/images/emoji/twitter/fist_left/4.png
new file mode 100644
index 00000000000..99e8ae08f3f
Binary files /dev/null and b/public/images/emoji/twitter/fist_left/4.png differ
diff --git a/public/images/emoji/twitter/fist_left/5.png b/public/images/emoji/twitter/fist_left/5.png
new file mode 100644
index 00000000000..5600a525fbb
Binary files /dev/null and b/public/images/emoji/twitter/fist_left/5.png differ
diff --git a/public/images/emoji/twitter/fist_left/6.png b/public/images/emoji/twitter/fist_left/6.png
new file mode 100644
index 00000000000..4db9f46f345
Binary files /dev/null and b/public/images/emoji/twitter/fist_left/6.png differ
diff --git a/public/images/emoji/twitter/fist_right.png b/public/images/emoji/twitter/fist_right.png
new file mode 100644
index 00000000000..010432f2013
Binary files /dev/null and b/public/images/emoji/twitter/fist_right.png differ
diff --git a/public/images/emoji/twitter/fist_right/2.png b/public/images/emoji/twitter/fist_right/2.png
new file mode 100644
index 00000000000..a71348e322b
Binary files /dev/null and b/public/images/emoji/twitter/fist_right/2.png differ
diff --git a/public/images/emoji/twitter/fist_right/3.png b/public/images/emoji/twitter/fist_right/3.png
new file mode 100644
index 00000000000..b62317eca5a
Binary files /dev/null and b/public/images/emoji/twitter/fist_right/3.png differ
diff --git a/public/images/emoji/twitter/fist_right/4.png b/public/images/emoji/twitter/fist_right/4.png
new file mode 100644
index 00000000000..abceea04345
Binary files /dev/null and b/public/images/emoji/twitter/fist_right/4.png differ
diff --git a/public/images/emoji/twitter/fist_right/5.png b/public/images/emoji/twitter/fist_right/5.png
new file mode 100644
index 00000000000..e64682dfe54
Binary files /dev/null and b/public/images/emoji/twitter/fist_right/5.png differ
diff --git a/public/images/emoji/twitter/fist_right/6.png b/public/images/emoji/twitter/fist_right/6.png
new file mode 100644
index 00000000000..daa257c5c26
Binary files /dev/null and b/public/images/emoji/twitter/fist_right/6.png differ
diff --git a/public/images/emoji/twitter/five.png b/public/images/emoji/twitter/five.png
index 75a85c48add..d547d1df555 100644
Binary files a/public/images/emoji/twitter/five.png and b/public/images/emoji/twitter/five.png differ
diff --git a/public/images/emoji/twitter/flag_kr.png b/public/images/emoji/twitter/flag_kr.png
index a0657a04c09..82486f8812c 100644
Binary files a/public/images/emoji/twitter/flag_kr.png and b/public/images/emoji/twitter/flag_kr.png differ
diff --git a/public/images/emoji/twitter/flags.png b/public/images/emoji/twitter/flags.png
index d4cce444c01..76909f76f11 100644
Binary files a/public/images/emoji/twitter/flags.png and b/public/images/emoji/twitter/flags.png differ
diff --git a/public/images/emoji/twitter/fleur_de_lis.png b/public/images/emoji/twitter/fleur_de_lis.png
new file mode 100644
index 00000000000..27cd209049a
Binary files /dev/null and b/public/images/emoji/twitter/fleur_de_lis.png differ
diff --git a/public/images/emoji/twitter/flight_arrival.png b/public/images/emoji/twitter/flight_arrival.png
new file mode 100644
index 00000000000..0585a1c36c2
Binary files /dev/null and b/public/images/emoji/twitter/flight_arrival.png differ
diff --git a/public/images/emoji/twitter/flight_departure.png b/public/images/emoji/twitter/flight_departure.png
new file mode 100644
index 00000000000..dc86670a865
Binary files /dev/null and b/public/images/emoji/twitter/flight_departure.png differ
diff --git a/public/images/emoji/twitter/flying_saucer.png b/public/images/emoji/twitter/flying_saucer.png
new file mode 100644
index 00000000000..7d5c8628554
Binary files /dev/null and b/public/images/emoji/twitter/flying_saucer.png differ
diff --git a/public/images/emoji/twitter/fog.png b/public/images/emoji/twitter/fog.png
index c671f9b2254..f8aee2c7b5e 100644
Binary files a/public/images/emoji/twitter/fog.png and b/public/images/emoji/twitter/fog.png differ
diff --git a/public/images/emoji/twitter/fortune_cookie.png b/public/images/emoji/twitter/fortune_cookie.png
new file mode 100644
index 00000000000..94a8cdca403
Binary files /dev/null and b/public/images/emoji/twitter/fortune_cookie.png differ
diff --git a/public/images/emoji/twitter/fountain_pen.png b/public/images/emoji/twitter/fountain_pen.png
new file mode 100644
index 00000000000..96584c9f579
Binary files /dev/null and b/public/images/emoji/twitter/fountain_pen.png differ
diff --git a/public/images/emoji/twitter/four.png b/public/images/emoji/twitter/four.png
index 77de1b164b3..91b21c1d94c 100644
Binary files a/public/images/emoji/twitter/four.png and b/public/images/emoji/twitter/four.png differ
diff --git a/public/images/emoji/twitter/fox_face.png b/public/images/emoji/twitter/fox_face.png
new file mode 100644
index 00000000000..74bcddb7e72
Binary files /dev/null and b/public/images/emoji/twitter/fox_face.png differ
diff --git a/public/images/emoji/twitter/framed_picture.png b/public/images/emoji/twitter/framed_picture.png
new file mode 100644
index 00000000000..ad38ccf08da
Binary files /dev/null and b/public/images/emoji/twitter/framed_picture.png differ
diff --git a/public/images/emoji/twitter/french_guiana.png b/public/images/emoji/twitter/french_guiana.png
new file mode 100644
index 00000000000..b67d58af241
Binary files /dev/null and b/public/images/emoji/twitter/french_guiana.png differ
diff --git a/public/images/emoji/twitter/french_polynesia.png b/public/images/emoji/twitter/french_polynesia.png
new file mode 100644
index 00000000000..8e67281736f
Binary files /dev/null and b/public/images/emoji/twitter/french_polynesia.png differ
diff --git a/public/images/emoji/twitter/french_southern_territories.png b/public/images/emoji/twitter/french_southern_territories.png
new file mode 100644
index 00000000000..ecc9bec0fa6
Binary files /dev/null and b/public/images/emoji/twitter/french_southern_territories.png differ
diff --git a/public/images/emoji/twitter/fried_egg.png b/public/images/emoji/twitter/fried_egg.png
new file mode 100644
index 00000000000..596a7389b83
Binary files /dev/null and b/public/images/emoji/twitter/fried_egg.png differ
diff --git a/public/images/emoji/twitter/fried_shrimp.png b/public/images/emoji/twitter/fried_shrimp.png
index cdf33177037..0769d43e831 100644
Binary files a/public/images/emoji/twitter/fried_shrimp.png and b/public/images/emoji/twitter/fried_shrimp.png differ
diff --git a/public/images/emoji/twitter/frowning_face.png b/public/images/emoji/twitter/frowning_face.png
new file mode 100644
index 00000000000..1c5988a20b5
Binary files /dev/null and b/public/images/emoji/twitter/frowning_face.png differ
diff --git a/public/images/emoji/twitter/frowning_man.png b/public/images/emoji/twitter/frowning_man.png
new file mode 100644
index 00000000000..e10ce817f85
Binary files /dev/null and b/public/images/emoji/twitter/frowning_man.png differ
diff --git a/public/images/emoji/twitter/frowning_man/2.png b/public/images/emoji/twitter/frowning_man/2.png
new file mode 100644
index 00000000000..5f04a5370d7
Binary files /dev/null and b/public/images/emoji/twitter/frowning_man/2.png differ
diff --git a/public/images/emoji/twitter/frowning_man/3.png b/public/images/emoji/twitter/frowning_man/3.png
new file mode 100644
index 00000000000..8be682c19d4
Binary files /dev/null and b/public/images/emoji/twitter/frowning_man/3.png differ
diff --git a/public/images/emoji/twitter/frowning_man/4.png b/public/images/emoji/twitter/frowning_man/4.png
new file mode 100644
index 00000000000..28b79908428
Binary files /dev/null and b/public/images/emoji/twitter/frowning_man/4.png differ
diff --git a/public/images/emoji/twitter/frowning_man/5.png b/public/images/emoji/twitter/frowning_man/5.png
new file mode 100644
index 00000000000..5f8463196b4
Binary files /dev/null and b/public/images/emoji/twitter/frowning_man/5.png differ
diff --git a/public/images/emoji/twitter/frowning_man/6.png b/public/images/emoji/twitter/frowning_man/6.png
new file mode 100644
index 00000000000..8c92a9c484b
Binary files /dev/null and b/public/images/emoji/twitter/frowning_man/6.png differ
diff --git a/public/images/emoji/twitter/frowning_woman.png b/public/images/emoji/twitter/frowning_woman.png
new file mode 100644
index 00000000000..f1ca30e5382
Binary files /dev/null and b/public/images/emoji/twitter/frowning_woman.png differ
diff --git a/public/images/emoji/twitter/frowning_woman/2.png b/public/images/emoji/twitter/frowning_woman/2.png
new file mode 100644
index 00000000000..7c8f518c957
Binary files /dev/null and b/public/images/emoji/twitter/frowning_woman/2.png differ
diff --git a/public/images/emoji/twitter/frowning_woman/3.png b/public/images/emoji/twitter/frowning_woman/3.png
new file mode 100644
index 00000000000..124d99647d5
Binary files /dev/null and b/public/images/emoji/twitter/frowning_woman/3.png differ
diff --git a/public/images/emoji/twitter/frowning_woman/4.png b/public/images/emoji/twitter/frowning_woman/4.png
new file mode 100644
index 00000000000..f7fe84e3343
Binary files /dev/null and b/public/images/emoji/twitter/frowning_woman/4.png differ
diff --git a/public/images/emoji/twitter/frowning_woman/5.png b/public/images/emoji/twitter/frowning_woman/5.png
new file mode 100644
index 00000000000..5b483c06ad9
Binary files /dev/null and b/public/images/emoji/twitter/frowning_woman/5.png differ
diff --git a/public/images/emoji/twitter/frowning_woman/6.png b/public/images/emoji/twitter/frowning_woman/6.png
new file mode 100644
index 00000000000..d557856b3fe
Binary files /dev/null and b/public/images/emoji/twitter/frowning_woman/6.png differ
diff --git a/public/images/emoji/twitter/fu.png b/public/images/emoji/twitter/fu.png
new file mode 100644
index 00000000000..8e7fce2f49b
Binary files /dev/null and b/public/images/emoji/twitter/fu.png differ
diff --git a/public/images/emoji/twitter/fu/2.png b/public/images/emoji/twitter/fu/2.png
new file mode 100644
index 00000000000..992338bb2b6
Binary files /dev/null and b/public/images/emoji/twitter/fu/2.png differ
diff --git a/public/images/emoji/twitter/fu/3.png b/public/images/emoji/twitter/fu/3.png
new file mode 100644
index 00000000000..aadc06129fe
Binary files /dev/null and b/public/images/emoji/twitter/fu/3.png differ
diff --git a/public/images/emoji/twitter/fu/4.png b/public/images/emoji/twitter/fu/4.png
new file mode 100644
index 00000000000..8ad10be1169
Binary files /dev/null and b/public/images/emoji/twitter/fu/4.png differ
diff --git a/public/images/emoji/twitter/fu/5.png b/public/images/emoji/twitter/fu/5.png
new file mode 100644
index 00000000000..695c4a6cb9c
Binary files /dev/null and b/public/images/emoji/twitter/fu/5.png differ
diff --git a/public/images/emoji/twitter/fu/6.png b/public/images/emoji/twitter/fu/6.png
new file mode 100644
index 00000000000..3457e01312c
Binary files /dev/null and b/public/images/emoji/twitter/fu/6.png differ
diff --git a/public/images/emoji/twitter/full_moon_with_face.png b/public/images/emoji/twitter/full_moon_with_face.png
index 98af01c5e37..decb957645e 100644
Binary files a/public/images/emoji/twitter/full_moon_with_face.png and b/public/images/emoji/twitter/full_moon_with_face.png differ
diff --git a/public/images/emoji/twitter/gabon.png b/public/images/emoji/twitter/gabon.png
new file mode 100644
index 00000000000..6563b2a69f0
Binary files /dev/null and b/public/images/emoji/twitter/gabon.png differ
diff --git a/public/images/emoji/twitter/gambia.png b/public/images/emoji/twitter/gambia.png
new file mode 100644
index 00000000000..707ca2a121b
Binary files /dev/null and b/public/images/emoji/twitter/gambia.png differ
diff --git a/public/images/emoji/twitter/game_die.png b/public/images/emoji/twitter/game_die.png
index de9bd49f9a1..5e5732a995a 100644
Binary files a/public/images/emoji/twitter/game_die.png and b/public/images/emoji/twitter/game_die.png differ
diff --git a/public/images/emoji/twitter/gem.png b/public/images/emoji/twitter/gem.png
index 2fe689f356e..7f48782f4ad 100644
Binary files a/public/images/emoji/twitter/gem.png and b/public/images/emoji/twitter/gem.png differ
diff --git a/public/images/emoji/twitter/genie.png b/public/images/emoji/twitter/genie.png
new file mode 100644
index 00000000000..f0eddcc91ae
Binary files /dev/null and b/public/images/emoji/twitter/genie.png differ
diff --git a/public/images/emoji/twitter/georgia.png b/public/images/emoji/twitter/georgia.png
new file mode 100644
index 00000000000..673f81ef6ff
Binary files /dev/null and b/public/images/emoji/twitter/georgia.png differ
diff --git a/public/images/emoji/twitter/ghana.png b/public/images/emoji/twitter/ghana.png
new file mode 100644
index 00000000000..f1b8829dbab
Binary files /dev/null and b/public/images/emoji/twitter/ghana.png differ
diff --git a/public/images/emoji/twitter/gibraltar.png b/public/images/emoji/twitter/gibraltar.png
new file mode 100644
index 00000000000..cbe9f11a125
Binary files /dev/null and b/public/images/emoji/twitter/gibraltar.png differ
diff --git a/public/images/emoji/twitter/giraffe.png b/public/images/emoji/twitter/giraffe.png
new file mode 100644
index 00000000000..be0e85d2896
Binary files /dev/null and b/public/images/emoji/twitter/giraffe.png differ
diff --git a/public/images/emoji/twitter/girl/2.png b/public/images/emoji/twitter/girl/2.png
new file mode 100644
index 00000000000..bc1291bf4fc
Binary files /dev/null and b/public/images/emoji/twitter/girl/2.png differ
diff --git a/public/images/emoji/twitter/girl/3.png b/public/images/emoji/twitter/girl/3.png
new file mode 100644
index 00000000000..f20d619e3c0
Binary files /dev/null and b/public/images/emoji/twitter/girl/3.png differ
diff --git a/public/images/emoji/twitter/girl/4.png b/public/images/emoji/twitter/girl/4.png
new file mode 100644
index 00000000000..0f50dd516ac
Binary files /dev/null and b/public/images/emoji/twitter/girl/4.png differ
diff --git a/public/images/emoji/twitter/girl/5.png b/public/images/emoji/twitter/girl/5.png
new file mode 100644
index 00000000000..87632adc490
Binary files /dev/null and b/public/images/emoji/twitter/girl/5.png differ
diff --git a/public/images/emoji/twitter/girl/6.png b/public/images/emoji/twitter/girl/6.png
new file mode 100644
index 00000000000..cd828026409
Binary files /dev/null and b/public/images/emoji/twitter/girl/6.png differ
diff --git a/public/images/emoji/twitter/gloves.png b/public/images/emoji/twitter/gloves.png
new file mode 100644
index 00000000000..1a11dd2c560
Binary files /dev/null and b/public/images/emoji/twitter/gloves.png differ
diff --git a/public/images/emoji/twitter/goal_net.png b/public/images/emoji/twitter/goal_net.png
new file mode 100644
index 00000000000..4773a63cf9d
Binary files /dev/null and b/public/images/emoji/twitter/goal_net.png differ
diff --git a/public/images/emoji/twitter/goat.png b/public/images/emoji/twitter/goat.png
index 9fa2979660b..1f7c85cbb9f 100644
Binary files a/public/images/emoji/twitter/goat.png and b/public/images/emoji/twitter/goat.png differ
diff --git a/public/images/emoji/twitter/golfer.png b/public/images/emoji/twitter/golfer.png
index f8a187a8847..36609a56707 100644
Binary files a/public/images/emoji/twitter/golfer.png and b/public/images/emoji/twitter/golfer.png differ
diff --git a/public/images/emoji/twitter/golfer/2.png b/public/images/emoji/twitter/golfer/2.png
new file mode 100644
index 00000000000..93df509c6ee
Binary files /dev/null and b/public/images/emoji/twitter/golfer/2.png differ
diff --git a/public/images/emoji/twitter/golfer/3.png b/public/images/emoji/twitter/golfer/3.png
new file mode 100644
index 00000000000..d986fe75018
Binary files /dev/null and b/public/images/emoji/twitter/golfer/3.png differ
diff --git a/public/images/emoji/twitter/golfer/4.png b/public/images/emoji/twitter/golfer/4.png
new file mode 100644
index 00000000000..3fa61820b6a
Binary files /dev/null and b/public/images/emoji/twitter/golfer/4.png differ
diff --git a/public/images/emoji/twitter/golfer/5.png b/public/images/emoji/twitter/golfer/5.png
new file mode 100644
index 00000000000..22116c217a3
Binary files /dev/null and b/public/images/emoji/twitter/golfer/5.png differ
diff --git a/public/images/emoji/twitter/golfer/6.png b/public/images/emoji/twitter/golfer/6.png
new file mode 100644
index 00000000000..ebbc3263e20
Binary files /dev/null and b/public/images/emoji/twitter/golfer/6.png differ
diff --git a/public/images/emoji/twitter/golfing_man.png b/public/images/emoji/twitter/golfing_man.png
new file mode 100644
index 00000000000..36609a56707
Binary files /dev/null and b/public/images/emoji/twitter/golfing_man.png differ
diff --git a/public/images/emoji/twitter/golfing_man/2.png b/public/images/emoji/twitter/golfing_man/2.png
new file mode 100644
index 00000000000..93df509c6ee
Binary files /dev/null and b/public/images/emoji/twitter/golfing_man/2.png differ
diff --git a/public/images/emoji/twitter/golfing_man/3.png b/public/images/emoji/twitter/golfing_man/3.png
new file mode 100644
index 00000000000..d986fe75018
Binary files /dev/null and b/public/images/emoji/twitter/golfing_man/3.png differ
diff --git a/public/images/emoji/twitter/golfing_man/4.png b/public/images/emoji/twitter/golfing_man/4.png
new file mode 100644
index 00000000000..3fa61820b6a
Binary files /dev/null and b/public/images/emoji/twitter/golfing_man/4.png differ
diff --git a/public/images/emoji/twitter/golfing_man/5.png b/public/images/emoji/twitter/golfing_man/5.png
new file mode 100644
index 00000000000..22116c217a3
Binary files /dev/null and b/public/images/emoji/twitter/golfing_man/5.png differ
diff --git a/public/images/emoji/twitter/golfing_man/6.png b/public/images/emoji/twitter/golfing_man/6.png
new file mode 100644
index 00000000000..ebbc3263e20
Binary files /dev/null and b/public/images/emoji/twitter/golfing_man/6.png differ
diff --git a/public/images/emoji/twitter/golfing_woman.png b/public/images/emoji/twitter/golfing_woman.png
new file mode 100644
index 00000000000..115ceac8f08
Binary files /dev/null and b/public/images/emoji/twitter/golfing_woman.png differ
diff --git a/public/images/emoji/twitter/gorilla.png b/public/images/emoji/twitter/gorilla.png
new file mode 100644
index 00000000000..bd7d3d17fb5
Binary files /dev/null and b/public/images/emoji/twitter/gorilla.png differ
diff --git a/public/images/emoji/twitter/grandma.png b/public/images/emoji/twitter/grandma.png
index fb6a0cc690e..8fe6dc8f16a 100644
Binary files a/public/images/emoji/twitter/grandma.png and b/public/images/emoji/twitter/grandma.png differ
diff --git a/public/images/emoji/twitter/grandma/2.png b/public/images/emoji/twitter/grandma/2.png
new file mode 100644
index 00000000000..7cee24d816e
Binary files /dev/null and b/public/images/emoji/twitter/grandma/2.png differ
diff --git a/public/images/emoji/twitter/grandma/3.png b/public/images/emoji/twitter/grandma/3.png
new file mode 100644
index 00000000000..033fd6c050a
Binary files /dev/null and b/public/images/emoji/twitter/grandma/3.png differ
diff --git a/public/images/emoji/twitter/grandma/4.png b/public/images/emoji/twitter/grandma/4.png
new file mode 100644
index 00000000000..b225a2163f9
Binary files /dev/null and b/public/images/emoji/twitter/grandma/4.png differ
diff --git a/public/images/emoji/twitter/grandma/5.png b/public/images/emoji/twitter/grandma/5.png
new file mode 100644
index 00000000000..b55baa79938
Binary files /dev/null and b/public/images/emoji/twitter/grandma/5.png differ
diff --git a/public/images/emoji/twitter/grandma/6.png b/public/images/emoji/twitter/grandma/6.png
new file mode 100644
index 00000000000..abb1c09fb82
Binary files /dev/null and b/public/images/emoji/twitter/grandma/6.png differ
diff --git a/public/images/emoji/twitter/greece.png b/public/images/emoji/twitter/greece.png
new file mode 100644
index 00000000000..c274ffb629c
Binary files /dev/null and b/public/images/emoji/twitter/greece.png differ
diff --git a/public/images/emoji/twitter/green_salad.png b/public/images/emoji/twitter/green_salad.png
new file mode 100644
index 00000000000..e3325b048e5
Binary files /dev/null and b/public/images/emoji/twitter/green_salad.png differ
diff --git a/public/images/emoji/twitter/greenland.png b/public/images/emoji/twitter/greenland.png
new file mode 100644
index 00000000000..31c8707a434
Binary files /dev/null and b/public/images/emoji/twitter/greenland.png differ
diff --git a/public/images/emoji/twitter/grenada.png b/public/images/emoji/twitter/grenada.png
new file mode 100644
index 00000000000..87f17a6ff22
Binary files /dev/null and b/public/images/emoji/twitter/grenada.png differ
diff --git a/public/images/emoji/twitter/grin.png b/public/images/emoji/twitter/grin.png
index 41bb7be9bbb..9625aa51001 100644
Binary files a/public/images/emoji/twitter/grin.png and b/public/images/emoji/twitter/grin.png differ
diff --git a/public/images/emoji/twitter/grinning.png b/public/images/emoji/twitter/grinning.png
index 4d970b6d78b..39e0a68f19c 100644
Binary files a/public/images/emoji/twitter/grinning.png and b/public/images/emoji/twitter/grinning.png differ
diff --git a/public/images/emoji/twitter/guadeloupe.png b/public/images/emoji/twitter/guadeloupe.png
new file mode 100644
index 00000000000..c9c437901df
Binary files /dev/null and b/public/images/emoji/twitter/guadeloupe.png differ
diff --git a/public/images/emoji/twitter/guam.png b/public/images/emoji/twitter/guam.png
new file mode 100644
index 00000000000..d291c89c97c
Binary files /dev/null and b/public/images/emoji/twitter/guam.png differ
diff --git a/public/images/emoji/twitter/guardsman.png b/public/images/emoji/twitter/guardsman.png
index 6ee3ce550ef..62f207fa74f 100644
Binary files a/public/images/emoji/twitter/guardsman.png and b/public/images/emoji/twitter/guardsman.png differ
diff --git a/public/images/emoji/twitter/guardsman/2.png b/public/images/emoji/twitter/guardsman/2.png
new file mode 100644
index 00000000000..d1188cf3148
Binary files /dev/null and b/public/images/emoji/twitter/guardsman/2.png differ
diff --git a/public/images/emoji/twitter/guardsman/3.png b/public/images/emoji/twitter/guardsman/3.png
new file mode 100644
index 00000000000..c590551ee5c
Binary files /dev/null and b/public/images/emoji/twitter/guardsman/3.png differ
diff --git a/public/images/emoji/twitter/guardsman/4.png b/public/images/emoji/twitter/guardsman/4.png
new file mode 100644
index 00000000000..41296d25878
Binary files /dev/null and b/public/images/emoji/twitter/guardsman/4.png differ
diff --git a/public/images/emoji/twitter/guardsman/5.png b/public/images/emoji/twitter/guardsman/5.png
new file mode 100644
index 00000000000..13ae230651d
Binary files /dev/null and b/public/images/emoji/twitter/guardsman/5.png differ
diff --git a/public/images/emoji/twitter/guardsman/6.png b/public/images/emoji/twitter/guardsman/6.png
new file mode 100644
index 00000000000..1d0a9bd6c95
Binary files /dev/null and b/public/images/emoji/twitter/guardsman/6.png differ
diff --git a/public/images/emoji/twitter/guardswoman.png b/public/images/emoji/twitter/guardswoman.png
new file mode 100644
index 00000000000..fefb6c23e59
Binary files /dev/null and b/public/images/emoji/twitter/guardswoman.png differ
diff --git a/public/images/emoji/twitter/guardswoman/2.png b/public/images/emoji/twitter/guardswoman/2.png
new file mode 100644
index 00000000000..9b3ea56a62d
Binary files /dev/null and b/public/images/emoji/twitter/guardswoman/2.png differ
diff --git a/public/images/emoji/twitter/guardswoman/3.png b/public/images/emoji/twitter/guardswoman/3.png
new file mode 100644
index 00000000000..0ab6714e8dc
Binary files /dev/null and b/public/images/emoji/twitter/guardswoman/3.png differ
diff --git a/public/images/emoji/twitter/guardswoman/4.png b/public/images/emoji/twitter/guardswoman/4.png
new file mode 100644
index 00000000000..4fde6f1fd6b
Binary files /dev/null and b/public/images/emoji/twitter/guardswoman/4.png differ
diff --git a/public/images/emoji/twitter/guardswoman/5.png b/public/images/emoji/twitter/guardswoman/5.png
new file mode 100644
index 00000000000..42349efadde
Binary files /dev/null and b/public/images/emoji/twitter/guardswoman/5.png differ
diff --git a/public/images/emoji/twitter/guardswoman/6.png b/public/images/emoji/twitter/guardswoman/6.png
new file mode 100644
index 00000000000..77ae53aaf1d
Binary files /dev/null and b/public/images/emoji/twitter/guardswoman/6.png differ
diff --git a/public/images/emoji/twitter/guatemala.png b/public/images/emoji/twitter/guatemala.png
new file mode 100644
index 00000000000..b7e7259bc83
Binary files /dev/null and b/public/images/emoji/twitter/guatemala.png differ
diff --git a/public/images/emoji/twitter/guernsey.png b/public/images/emoji/twitter/guernsey.png
new file mode 100644
index 00000000000..f92e78a3246
Binary files /dev/null and b/public/images/emoji/twitter/guernsey.png differ
diff --git a/public/images/emoji/twitter/guinea.png b/public/images/emoji/twitter/guinea.png
new file mode 100644
index 00000000000..dd1482188c6
Binary files /dev/null and b/public/images/emoji/twitter/guinea.png differ
diff --git a/public/images/emoji/twitter/guinea_bissau.png b/public/images/emoji/twitter/guinea_bissau.png
new file mode 100644
index 00000000000..c2ab6fb5073
Binary files /dev/null and b/public/images/emoji/twitter/guinea_bissau.png differ
diff --git a/public/images/emoji/twitter/guyana.png b/public/images/emoji/twitter/guyana.png
new file mode 100644
index 00000000000..2ceb411ad23
Binary files /dev/null and b/public/images/emoji/twitter/guyana.png differ
diff --git a/public/images/emoji/twitter/haircut.png b/public/images/emoji/twitter/haircut.png
index ea58297f9a0..50259f54fef 100644
Binary files a/public/images/emoji/twitter/haircut.png and b/public/images/emoji/twitter/haircut.png differ
diff --git a/public/images/emoji/twitter/haircut/2.png b/public/images/emoji/twitter/haircut/2.png
new file mode 100644
index 00000000000..6318552d6f1
Binary files /dev/null and b/public/images/emoji/twitter/haircut/2.png differ
diff --git a/public/images/emoji/twitter/haircut/3.png b/public/images/emoji/twitter/haircut/3.png
new file mode 100644
index 00000000000..2f36ce4223b
Binary files /dev/null and b/public/images/emoji/twitter/haircut/3.png differ
diff --git a/public/images/emoji/twitter/haircut/4.png b/public/images/emoji/twitter/haircut/4.png
new file mode 100644
index 00000000000..d77285b2769
Binary files /dev/null and b/public/images/emoji/twitter/haircut/4.png differ
diff --git a/public/images/emoji/twitter/haircut/5.png b/public/images/emoji/twitter/haircut/5.png
new file mode 100644
index 00000000000..7920362667e
Binary files /dev/null and b/public/images/emoji/twitter/haircut/5.png differ
diff --git a/public/images/emoji/twitter/haircut/6.png b/public/images/emoji/twitter/haircut/6.png
new file mode 100644
index 00000000000..ee3101d501d
Binary files /dev/null and b/public/images/emoji/twitter/haircut/6.png differ
diff --git a/public/images/emoji/twitter/haircut_man.png b/public/images/emoji/twitter/haircut_man.png
new file mode 100644
index 00000000000..b5a80561e42
Binary files /dev/null and b/public/images/emoji/twitter/haircut_man.png differ
diff --git a/public/images/emoji/twitter/haircut_man/2.png b/public/images/emoji/twitter/haircut_man/2.png
new file mode 100644
index 00000000000..2be41d13bcd
Binary files /dev/null and b/public/images/emoji/twitter/haircut_man/2.png differ
diff --git a/public/images/emoji/twitter/haircut_man/3.png b/public/images/emoji/twitter/haircut_man/3.png
new file mode 100644
index 00000000000..2fab3a1ac2c
Binary files /dev/null and b/public/images/emoji/twitter/haircut_man/3.png differ
diff --git a/public/images/emoji/twitter/haircut_man/4.png b/public/images/emoji/twitter/haircut_man/4.png
new file mode 100644
index 00000000000..7e6d5998c77
Binary files /dev/null and b/public/images/emoji/twitter/haircut_man/4.png differ
diff --git a/public/images/emoji/twitter/haircut_man/5.png b/public/images/emoji/twitter/haircut_man/5.png
new file mode 100644
index 00000000000..5787ce4a5ba
Binary files /dev/null and b/public/images/emoji/twitter/haircut_man/5.png differ
diff --git a/public/images/emoji/twitter/haircut_man/6.png b/public/images/emoji/twitter/haircut_man/6.png
new file mode 100644
index 00000000000..f5d2a283126
Binary files /dev/null and b/public/images/emoji/twitter/haircut_man/6.png differ
diff --git a/public/images/emoji/twitter/haircut_woman.png b/public/images/emoji/twitter/haircut_woman.png
new file mode 100644
index 00000000000..50259f54fef
Binary files /dev/null and b/public/images/emoji/twitter/haircut_woman.png differ
diff --git a/public/images/emoji/twitter/haircut_woman/2.png b/public/images/emoji/twitter/haircut_woman/2.png
new file mode 100644
index 00000000000..6318552d6f1
Binary files /dev/null and b/public/images/emoji/twitter/haircut_woman/2.png differ
diff --git a/public/images/emoji/twitter/haircut_woman/3.png b/public/images/emoji/twitter/haircut_woman/3.png
new file mode 100644
index 00000000000..2f36ce4223b
Binary files /dev/null and b/public/images/emoji/twitter/haircut_woman/3.png differ
diff --git a/public/images/emoji/twitter/haircut_woman/4.png b/public/images/emoji/twitter/haircut_woman/4.png
new file mode 100644
index 00000000000..d77285b2769
Binary files /dev/null and b/public/images/emoji/twitter/haircut_woman/4.png differ
diff --git a/public/images/emoji/twitter/haircut_woman/5.png b/public/images/emoji/twitter/haircut_woman/5.png
new file mode 100644
index 00000000000..7920362667e
Binary files /dev/null and b/public/images/emoji/twitter/haircut_woman/5.png differ
diff --git a/public/images/emoji/twitter/haircut_woman/6.png b/public/images/emoji/twitter/haircut_woman/6.png
new file mode 100644
index 00000000000..ee3101d501d
Binary files /dev/null and b/public/images/emoji/twitter/haircut_woman/6.png differ
diff --git a/public/images/emoji/twitter/haiti.png b/public/images/emoji/twitter/haiti.png
new file mode 100644
index 00000000000..53d2160f9a6
Binary files /dev/null and b/public/images/emoji/twitter/haiti.png differ
diff --git a/public/images/emoji/twitter/hamburger.png b/public/images/emoji/twitter/hamburger.png
index 4c271c16603..10cca5ac3d2 100644
Binary files a/public/images/emoji/twitter/hamburger.png and b/public/images/emoji/twitter/hamburger.png differ
diff --git a/public/images/emoji/twitter/hamster.png b/public/images/emoji/twitter/hamster.png
index 374bb61e927..eaee91f7a79 100644
Binary files a/public/images/emoji/twitter/hamster.png and b/public/images/emoji/twitter/hamster.png differ
diff --git a/public/images/emoji/twitter/hand.png b/public/images/emoji/twitter/hand.png
new file mode 100644
index 00000000000..e18572e405c
Binary files /dev/null and b/public/images/emoji/twitter/hand.png differ
diff --git a/public/images/emoji/twitter/hand/2.png b/public/images/emoji/twitter/hand/2.png
new file mode 100644
index 00000000000..bd7ea42aa4d
Binary files /dev/null and b/public/images/emoji/twitter/hand/2.png differ
diff --git a/public/images/emoji/twitter/hand/3.png b/public/images/emoji/twitter/hand/3.png
new file mode 100644
index 00000000000..f0708d24fbc
Binary files /dev/null and b/public/images/emoji/twitter/hand/3.png differ
diff --git a/public/images/emoji/twitter/hand/4.png b/public/images/emoji/twitter/hand/4.png
new file mode 100644
index 00000000000..9ecd50830ab
Binary files /dev/null and b/public/images/emoji/twitter/hand/4.png differ
diff --git a/public/images/emoji/twitter/hand/5.png b/public/images/emoji/twitter/hand/5.png
new file mode 100644
index 00000000000..f736e8afd37
Binary files /dev/null and b/public/images/emoji/twitter/hand/5.png differ
diff --git a/public/images/emoji/twitter/hand/6.png b/public/images/emoji/twitter/hand/6.png
new file mode 100644
index 00000000000..d387aac9c28
Binary files /dev/null and b/public/images/emoji/twitter/hand/6.png differ
diff --git a/public/images/emoji/twitter/hand_splayed/2.png b/public/images/emoji/twitter/hand_splayed/2.png
new file mode 100644
index 00000000000..37a9048ad78
Binary files /dev/null and b/public/images/emoji/twitter/hand_splayed/2.png differ
diff --git a/public/images/emoji/twitter/hand_splayed/3.png b/public/images/emoji/twitter/hand_splayed/3.png
new file mode 100644
index 00000000000..6ddd74b5862
Binary files /dev/null and b/public/images/emoji/twitter/hand_splayed/3.png differ
diff --git a/public/images/emoji/twitter/hand_splayed/4.png b/public/images/emoji/twitter/hand_splayed/4.png
new file mode 100644
index 00000000000..1d901925fe9
Binary files /dev/null and b/public/images/emoji/twitter/hand_splayed/4.png differ
diff --git a/public/images/emoji/twitter/hand_splayed/5.png b/public/images/emoji/twitter/hand_splayed/5.png
new file mode 100644
index 00000000000..5fcac72a703
Binary files /dev/null and b/public/images/emoji/twitter/hand_splayed/5.png differ
diff --git a/public/images/emoji/twitter/hand_splayed/6.png b/public/images/emoji/twitter/hand_splayed/6.png
new file mode 100644
index 00000000000..74fa972cade
Binary files /dev/null and b/public/images/emoji/twitter/hand_splayed/6.png differ
diff --git a/public/images/emoji/twitter/handshake.png b/public/images/emoji/twitter/handshake.png
new file mode 100644
index 00000000000..6ac8b5fdf6f
Binary files /dev/null and b/public/images/emoji/twitter/handshake.png differ
diff --git a/public/images/emoji/twitter/hatching_chick.png b/public/images/emoji/twitter/hatching_chick.png
index 83889bd72f7..66af0792c96 100644
Binary files a/public/images/emoji/twitter/hatching_chick.png and b/public/images/emoji/twitter/hatching_chick.png differ
diff --git a/public/images/emoji/twitter/head_bandage.png b/public/images/emoji/twitter/head_bandage.png
index f68e8b2f197..97bec4d11f6 100644
Binary files a/public/images/emoji/twitter/head_bandage.png and b/public/images/emoji/twitter/head_bandage.png differ
diff --git a/public/images/emoji/twitter/heard_and_mc_donald_islands.png b/public/images/emoji/twitter/heard_and_mc_donald_islands.png
new file mode 100644
index 00000000000..1b5bf7b178f
Binary files /dev/null and b/public/images/emoji/twitter/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/twitter/heart_eyes_cat.png b/public/images/emoji/twitter/heart_eyes_cat.png
index 781f4bdc67b..dfc121a0bb1 100644
Binary files a/public/images/emoji/twitter/heart_eyes_cat.png and b/public/images/emoji/twitter/heart_eyes_cat.png differ
diff --git a/public/images/emoji/twitter/heavy_heart_exclamation.png b/public/images/emoji/twitter/heavy_heart_exclamation.png
new file mode 100644
index 00000000000..1cb11ddf8bf
Binary files /dev/null and b/public/images/emoji/twitter/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/twitter/hedgehog.png b/public/images/emoji/twitter/hedgehog.png
new file mode 100644
index 00000000000..9b978b35407
Binary files /dev/null and b/public/images/emoji/twitter/hedgehog.png differ
diff --git a/public/images/emoji/twitter/helicopter.png b/public/images/emoji/twitter/helicopter.png
index 2a913d9d331..91a6fd1599c 100644
Binary files a/public/images/emoji/twitter/helicopter.png and b/public/images/emoji/twitter/helicopter.png differ
diff --git a/public/images/emoji/twitter/helmet_with_cross.png b/public/images/emoji/twitter/helmet_with_cross.png
index fa7cdcf33a8..ad220c2eefe 100644
Binary files a/public/images/emoji/twitter/helmet_with_cross.png and b/public/images/emoji/twitter/helmet_with_cross.png differ
diff --git a/public/images/emoji/twitter/helmet_with_white_cross.png b/public/images/emoji/twitter/helmet_with_white_cross.png
index fa7cdcf33a8..ad220c2eefe 100644
Binary files a/public/images/emoji/twitter/helmet_with_white_cross.png and b/public/images/emoji/twitter/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/twitter/herb.png b/public/images/emoji/twitter/herb.png
index 5599ac0a2bd..2cd2474b51d 100644
Binary files a/public/images/emoji/twitter/herb.png and b/public/images/emoji/twitter/herb.png differ
diff --git a/public/images/emoji/twitter/hibiscus.png b/public/images/emoji/twitter/hibiscus.png
index ddf9490610e..00bdf1ea52c 100644
Binary files a/public/images/emoji/twitter/hibiscus.png and b/public/images/emoji/twitter/hibiscus.png differ
diff --git a/public/images/emoji/twitter/hocho.png b/public/images/emoji/twitter/hocho.png
new file mode 100644
index 00000000000..a7425d8c392
Binary files /dev/null and b/public/images/emoji/twitter/hocho.png differ
diff --git a/public/images/emoji/twitter/honduras.png b/public/images/emoji/twitter/honduras.png
new file mode 100644
index 00000000000..d0aff11833e
Binary files /dev/null and b/public/images/emoji/twitter/honduras.png differ
diff --git a/public/images/emoji/twitter/honey_pot.png b/public/images/emoji/twitter/honey_pot.png
index 46871632766..a55fe609b37 100644
Binary files a/public/images/emoji/twitter/honey_pot.png and b/public/images/emoji/twitter/honey_pot.png differ
diff --git a/public/images/emoji/twitter/honeybee.png b/public/images/emoji/twitter/honeybee.png
new file mode 100644
index 00000000000..1dde5bac0d9
Binary files /dev/null and b/public/images/emoji/twitter/honeybee.png differ
diff --git a/public/images/emoji/twitter/hong_kong.png b/public/images/emoji/twitter/hong_kong.png
new file mode 100644
index 00000000000..9db8cbc1023
Binary files /dev/null and b/public/images/emoji/twitter/hong_kong.png differ
diff --git a/public/images/emoji/twitter/horse.png b/public/images/emoji/twitter/horse.png
index e98be98a398..10279f4134c 100644
Binary files a/public/images/emoji/twitter/horse.png and b/public/images/emoji/twitter/horse.png differ
diff --git a/public/images/emoji/twitter/horse_racing.png b/public/images/emoji/twitter/horse_racing.png
index f2320850597..309fc3aa7ac 100644
Binary files a/public/images/emoji/twitter/horse_racing.png and b/public/images/emoji/twitter/horse_racing.png differ
diff --git a/public/images/emoji/twitter/horse_racing/2.png b/public/images/emoji/twitter/horse_racing/2.png
new file mode 100644
index 00000000000..b7215a89024
Binary files /dev/null and b/public/images/emoji/twitter/horse_racing/2.png differ
diff --git a/public/images/emoji/twitter/horse_racing/3.png b/public/images/emoji/twitter/horse_racing/3.png
new file mode 100644
index 00000000000..f38b15d6f35
Binary files /dev/null and b/public/images/emoji/twitter/horse_racing/3.png differ
diff --git a/public/images/emoji/twitter/horse_racing/4.png b/public/images/emoji/twitter/horse_racing/4.png
new file mode 100644
index 00000000000..8639c6ef237
Binary files /dev/null and b/public/images/emoji/twitter/horse_racing/4.png differ
diff --git a/public/images/emoji/twitter/horse_racing/5.png b/public/images/emoji/twitter/horse_racing/5.png
new file mode 100644
index 00000000000..94c756406d8
Binary files /dev/null and b/public/images/emoji/twitter/horse_racing/5.png differ
diff --git a/public/images/emoji/twitter/horse_racing/6.png b/public/images/emoji/twitter/horse_racing/6.png
new file mode 100644
index 00000000000..059178c9e23
Binary files /dev/null and b/public/images/emoji/twitter/horse_racing/6.png differ
diff --git a/public/images/emoji/twitter/houses.png b/public/images/emoji/twitter/houses.png
new file mode 100644
index 00000000000..5f9a0a658b7
Binary files /dev/null and b/public/images/emoji/twitter/houses.png differ
diff --git a/public/images/emoji/twitter/hugging.png b/public/images/emoji/twitter/hugging.png
index 4ed699b11f5..f0eb7db3220 100644
Binary files a/public/images/emoji/twitter/hugging.png and b/public/images/emoji/twitter/hugging.png differ
diff --git a/public/images/emoji/twitter/hugging_face.png b/public/images/emoji/twitter/hugging_face.png
index 4ed699b11f5..f0eb7db3220 100644
Binary files a/public/images/emoji/twitter/hugging_face.png and b/public/images/emoji/twitter/hugging_face.png differ
diff --git a/public/images/emoji/twitter/hugs.png b/public/images/emoji/twitter/hugs.png
new file mode 100644
index 00000000000..f0eb7db3220
Binary files /dev/null and b/public/images/emoji/twitter/hugs.png differ
diff --git a/public/images/emoji/twitter/hungary.png b/public/images/emoji/twitter/hungary.png
new file mode 100644
index 00000000000..98963a97c99
Binary files /dev/null and b/public/images/emoji/twitter/hungary.png differ
diff --git a/public/images/emoji/twitter/ice_cream.png b/public/images/emoji/twitter/ice_cream.png
index 957b1971e68..939a2efca68 100644
Binary files a/public/images/emoji/twitter/ice_cream.png and b/public/images/emoji/twitter/ice_cream.png differ
diff --git a/public/images/emoji/twitter/ice_hockey.png b/public/images/emoji/twitter/ice_hockey.png
new file mode 100644
index 00000000000..7b5a1105c39
Binary files /dev/null and b/public/images/emoji/twitter/ice_hockey.png differ
diff --git a/public/images/emoji/twitter/iceland.png b/public/images/emoji/twitter/iceland.png
new file mode 100644
index 00000000000..399f5a4e85d
Binary files /dev/null and b/public/images/emoji/twitter/iceland.png differ
diff --git a/public/images/emoji/twitter/india.png b/public/images/emoji/twitter/india.png
new file mode 100644
index 00000000000..b95563b7877
Binary files /dev/null and b/public/images/emoji/twitter/india.png differ
diff --git a/public/images/emoji/twitter/indonesia.png b/public/images/emoji/twitter/indonesia.png
new file mode 100644
index 00000000000..09e63e6b9f8
Binary files /dev/null and b/public/images/emoji/twitter/indonesia.png differ
diff --git a/public/images/emoji/twitter/information_desk_person/2.png b/public/images/emoji/twitter/information_desk_person/2.png
new file mode 100644
index 00000000000..a117cff357c
Binary files /dev/null and b/public/images/emoji/twitter/information_desk_person/2.png differ
diff --git a/public/images/emoji/twitter/information_desk_person/3.png b/public/images/emoji/twitter/information_desk_person/3.png
new file mode 100644
index 00000000000..baa70f4a21a
Binary files /dev/null and b/public/images/emoji/twitter/information_desk_person/3.png differ
diff --git a/public/images/emoji/twitter/information_desk_person/4.png b/public/images/emoji/twitter/information_desk_person/4.png
new file mode 100644
index 00000000000..59d41fc875a
Binary files /dev/null and b/public/images/emoji/twitter/information_desk_person/4.png differ
diff --git a/public/images/emoji/twitter/information_desk_person/5.png b/public/images/emoji/twitter/information_desk_person/5.png
new file mode 100644
index 00000000000..3726ca85acd
Binary files /dev/null and b/public/images/emoji/twitter/information_desk_person/5.png differ
diff --git a/public/images/emoji/twitter/information_desk_person/6.png b/public/images/emoji/twitter/information_desk_person/6.png
new file mode 100644
index 00000000000..505a1d85401
Binary files /dev/null and b/public/images/emoji/twitter/information_desk_person/6.png differ
diff --git a/public/images/emoji/twitter/innocent.png b/public/images/emoji/twitter/innocent.png
index 516c432a492..5cb5888fc1a 100644
Binary files a/public/images/emoji/twitter/innocent.png and b/public/images/emoji/twitter/innocent.png differ
diff --git a/public/images/emoji/twitter/iran.png b/public/images/emoji/twitter/iran.png
new file mode 100644
index 00000000000..e30df4c1f50
Binary files /dev/null and b/public/images/emoji/twitter/iran.png differ
diff --git a/public/images/emoji/twitter/iraq.png b/public/images/emoji/twitter/iraq.png
new file mode 100644
index 00000000000..cccd140ba3c
Binary files /dev/null and b/public/images/emoji/twitter/iraq.png differ
diff --git a/public/images/emoji/twitter/ireland.png b/public/images/emoji/twitter/ireland.png
new file mode 100644
index 00000000000..b97ecbcbd48
Binary files /dev/null and b/public/images/emoji/twitter/ireland.png differ
diff --git a/public/images/emoji/twitter/island.png b/public/images/emoji/twitter/island.png
index 37832e01835..2d2e8919fff 100644
Binary files a/public/images/emoji/twitter/island.png and b/public/images/emoji/twitter/island.png differ
diff --git a/public/images/emoji/twitter/isle_of_man.png b/public/images/emoji/twitter/isle_of_man.png
new file mode 100644
index 00000000000..7829f538f8e
Binary files /dev/null and b/public/images/emoji/twitter/isle_of_man.png differ
diff --git a/public/images/emoji/twitter/israel.png b/public/images/emoji/twitter/israel.png
new file mode 100644
index 00000000000..f7bc67925db
Binary files /dev/null and b/public/images/emoji/twitter/israel.png differ
diff --git a/public/images/emoji/twitter/jack_o_lantern.png b/public/images/emoji/twitter/jack_o_lantern.png
index d520e1bdbf5..66651e49b72 100644
Binary files a/public/images/emoji/twitter/jack_o_lantern.png and b/public/images/emoji/twitter/jack_o_lantern.png differ
diff --git a/public/images/emoji/twitter/jamaica.png b/public/images/emoji/twitter/jamaica.png
new file mode 100644
index 00000000000..dc2c8075112
Binary files /dev/null and b/public/images/emoji/twitter/jamaica.png differ
diff --git a/public/images/emoji/twitter/japanese_goblin.png b/public/images/emoji/twitter/japanese_goblin.png
index 9416e35b5e3..e1f040623fc 100644
Binary files a/public/images/emoji/twitter/japanese_goblin.png and b/public/images/emoji/twitter/japanese_goblin.png differ
diff --git a/public/images/emoji/twitter/japanese_ogre.png b/public/images/emoji/twitter/japanese_ogre.png
index 1e322ae5845..77d35ce1265 100644
Binary files a/public/images/emoji/twitter/japanese_ogre.png and b/public/images/emoji/twitter/japanese_ogre.png differ
diff --git a/public/images/emoji/twitter/jersey.png b/public/images/emoji/twitter/jersey.png
new file mode 100644
index 00000000000..adfdbc3c1a6
Binary files /dev/null and b/public/images/emoji/twitter/jersey.png differ
diff --git a/public/images/emoji/twitter/jordan.png b/public/images/emoji/twitter/jordan.png
new file mode 100644
index 00000000000..43a2f9139f4
Binary files /dev/null and b/public/images/emoji/twitter/jordan.png differ
diff --git a/public/images/emoji/twitter/joy.png b/public/images/emoji/twitter/joy.png
index 1158e9d471a..eaa38f615a7 100644
Binary files a/public/images/emoji/twitter/joy.png and b/public/images/emoji/twitter/joy.png differ
diff --git a/public/images/emoji/twitter/joy_cat.png b/public/images/emoji/twitter/joy_cat.png
index 2124b7c10bc..9f541c69f20 100644
Binary files a/public/images/emoji/twitter/joy_cat.png and b/public/images/emoji/twitter/joy_cat.png differ
diff --git a/public/images/emoji/twitter/kaaba.png b/public/images/emoji/twitter/kaaba.png
index b31e29c6924..73219d28c1c 100644
Binary files a/public/images/emoji/twitter/kaaba.png and b/public/images/emoji/twitter/kaaba.png differ
diff --git a/public/images/emoji/twitter/kazakhstan.png b/public/images/emoji/twitter/kazakhstan.png
new file mode 100644
index 00000000000..731858e2cfa
Binary files /dev/null and b/public/images/emoji/twitter/kazakhstan.png differ
diff --git a/public/images/emoji/twitter/kenya.png b/public/images/emoji/twitter/kenya.png
new file mode 100644
index 00000000000..cc55fd69815
Binary files /dev/null and b/public/images/emoji/twitter/kenya.png differ
diff --git a/public/images/emoji/twitter/keycap_ten.png b/public/images/emoji/twitter/keycap_ten.png
new file mode 100644
index 00000000000..77727fec80b
Binary files /dev/null and b/public/images/emoji/twitter/keycap_ten.png differ
diff --git a/public/images/emoji/twitter/kick_scooter.png b/public/images/emoji/twitter/kick_scooter.png
new file mode 100644
index 00000000000..f04615710f9
Binary files /dev/null and b/public/images/emoji/twitter/kick_scooter.png differ
diff --git a/public/images/emoji/twitter/kiribati.png b/public/images/emoji/twitter/kiribati.png
new file mode 100644
index 00000000000..138fd3f2b5b
Binary files /dev/null and b/public/images/emoji/twitter/kiribati.png differ
diff --git a/public/images/emoji/twitter/kissing_cat.png b/public/images/emoji/twitter/kissing_cat.png
index 2a426077e40..ca752f4ae2a 100644
Binary files a/public/images/emoji/twitter/kissing_cat.png and b/public/images/emoji/twitter/kissing_cat.png differ
diff --git a/public/images/emoji/twitter/kiwi_fruit.png b/public/images/emoji/twitter/kiwi_fruit.png
new file mode 100644
index 00000000000..1abebdab603
Binary files /dev/null and b/public/images/emoji/twitter/kiwi_fruit.png differ
diff --git a/public/images/emoji/twitter/kosovo.png b/public/images/emoji/twitter/kosovo.png
new file mode 100644
index 00000000000..efea0b70bde
Binary files /dev/null and b/public/images/emoji/twitter/kosovo.png differ
diff --git a/public/images/emoji/twitter/kr.png b/public/images/emoji/twitter/kr.png
index a0657a04c09..82486f8812c 100644
Binary files a/public/images/emoji/twitter/kr.png and b/public/images/emoji/twitter/kr.png differ
diff --git a/public/images/emoji/twitter/kuwait.png b/public/images/emoji/twitter/kuwait.png
new file mode 100644
index 00000000000..32b00e4806d
Binary files /dev/null and b/public/images/emoji/twitter/kuwait.png differ
diff --git a/public/images/emoji/twitter/kyrgyzstan.png b/public/images/emoji/twitter/kyrgyzstan.png
new file mode 100644
index 00000000000..6ecfc717c9b
Binary files /dev/null and b/public/images/emoji/twitter/kyrgyzstan.png differ
diff --git a/public/images/emoji/twitter/laos.png b/public/images/emoji/twitter/laos.png
new file mode 100644
index 00000000000..5dca502f80e
Binary files /dev/null and b/public/images/emoji/twitter/laos.png differ
diff --git a/public/images/emoji/twitter/large_blue_diamond.png b/public/images/emoji/twitter/large_blue_diamond.png
index a7ed27cf548..967ce3a0592 100644
Binary files a/public/images/emoji/twitter/large_blue_diamond.png and b/public/images/emoji/twitter/large_blue_diamond.png differ
diff --git a/public/images/emoji/twitter/large_orange_diamond.png b/public/images/emoji/twitter/large_orange_diamond.png
index c217bb8d0d9..f3001bd7091 100644
Binary files a/public/images/emoji/twitter/large_orange_diamond.png and b/public/images/emoji/twitter/large_orange_diamond.png differ
diff --git a/public/images/emoji/twitter/last_quarter_moon_with_face.png b/public/images/emoji/twitter/last_quarter_moon_with_face.png
index 68f288277cf..7a31d134842 100644
Binary files a/public/images/emoji/twitter/last_quarter_moon_with_face.png and b/public/images/emoji/twitter/last_quarter_moon_with_face.png differ
diff --git a/public/images/emoji/twitter/latvia.png b/public/images/emoji/twitter/latvia.png
new file mode 100644
index 00000000000..a23d4c4e2e6
Binary files /dev/null and b/public/images/emoji/twitter/latvia.png differ
diff --git a/public/images/emoji/twitter/lebanon.png b/public/images/emoji/twitter/lebanon.png
new file mode 100644
index 00000000000..5b8710dfd72
Binary files /dev/null and b/public/images/emoji/twitter/lebanon.png differ
diff --git a/public/images/emoji/twitter/lemon.png b/public/images/emoji/twitter/lemon.png
index 2305ee80d71..263a61ad0f5 100644
Binary files a/public/images/emoji/twitter/lemon.png and b/public/images/emoji/twitter/lemon.png differ
diff --git a/public/images/emoji/twitter/lesotho.png b/public/images/emoji/twitter/lesotho.png
new file mode 100644
index 00000000000..136ea59d3dc
Binary files /dev/null and b/public/images/emoji/twitter/lesotho.png differ
diff --git a/public/images/emoji/twitter/levitate.png b/public/images/emoji/twitter/levitate.png
index 622ec86bf72..5231c708a03 100644
Binary files a/public/images/emoji/twitter/levitate.png and b/public/images/emoji/twitter/levitate.png differ
diff --git a/public/images/emoji/twitter/levitate/2.png b/public/images/emoji/twitter/levitate/2.png
new file mode 100644
index 00000000000..753693b093b
Binary files /dev/null and b/public/images/emoji/twitter/levitate/2.png differ
diff --git a/public/images/emoji/twitter/levitate/3.png b/public/images/emoji/twitter/levitate/3.png
new file mode 100644
index 00000000000..f56875edac9
Binary files /dev/null and b/public/images/emoji/twitter/levitate/3.png differ
diff --git a/public/images/emoji/twitter/levitate/4.png b/public/images/emoji/twitter/levitate/4.png
new file mode 100644
index 00000000000..37d74f5c97d
Binary files /dev/null and b/public/images/emoji/twitter/levitate/4.png differ
diff --git a/public/images/emoji/twitter/levitate/5.png b/public/images/emoji/twitter/levitate/5.png
new file mode 100644
index 00000000000..5a48f961920
Binary files /dev/null and b/public/images/emoji/twitter/levitate/5.png differ
diff --git a/public/images/emoji/twitter/levitate/6.png b/public/images/emoji/twitter/levitate/6.png
new file mode 100644
index 00000000000..61507408172
Binary files /dev/null and b/public/images/emoji/twitter/levitate/6.png differ
diff --git a/public/images/emoji/twitter/liberia.png b/public/images/emoji/twitter/liberia.png
new file mode 100644
index 00000000000..2828cee4c87
Binary files /dev/null and b/public/images/emoji/twitter/liberia.png differ
diff --git a/public/images/emoji/twitter/libya.png b/public/images/emoji/twitter/libya.png
new file mode 100644
index 00000000000..a6c90e15d4f
Binary files /dev/null and b/public/images/emoji/twitter/libya.png differ
diff --git a/public/images/emoji/twitter/liechtenstein.png b/public/images/emoji/twitter/liechtenstein.png
new file mode 100644
index 00000000000..93605ebfd57
Binary files /dev/null and b/public/images/emoji/twitter/liechtenstein.png differ
diff --git a/public/images/emoji/twitter/lifter.png b/public/images/emoji/twitter/lifter.png
index e0fb05d5e01..be0473304d5 100644
Binary files a/public/images/emoji/twitter/lifter.png and b/public/images/emoji/twitter/lifter.png differ
diff --git a/public/images/emoji/twitter/lifter/2.png b/public/images/emoji/twitter/lifter/2.png
new file mode 100644
index 00000000000..8d680f5b12c
Binary files /dev/null and b/public/images/emoji/twitter/lifter/2.png differ
diff --git a/public/images/emoji/twitter/lifter/3.png b/public/images/emoji/twitter/lifter/3.png
new file mode 100644
index 00000000000..e4e961d5d5d
Binary files /dev/null and b/public/images/emoji/twitter/lifter/3.png differ
diff --git a/public/images/emoji/twitter/lifter/4.png b/public/images/emoji/twitter/lifter/4.png
new file mode 100644
index 00000000000..bcdf20d1757
Binary files /dev/null and b/public/images/emoji/twitter/lifter/4.png differ
diff --git a/public/images/emoji/twitter/lifter/5.png b/public/images/emoji/twitter/lifter/5.png
new file mode 100644
index 00000000000..9b91906952e
Binary files /dev/null and b/public/images/emoji/twitter/lifter/5.png differ
diff --git a/public/images/emoji/twitter/lifter/6.png b/public/images/emoji/twitter/lifter/6.png
new file mode 100644
index 00000000000..c3ce145e9e1
Binary files /dev/null and b/public/images/emoji/twitter/lifter/6.png differ
diff --git a/public/images/emoji/twitter/lion.png b/public/images/emoji/twitter/lion.png
index 8ff236dc423..aace4fa00bf 100644
Binary files a/public/images/emoji/twitter/lion.png and b/public/images/emoji/twitter/lion.png differ
diff --git a/public/images/emoji/twitter/lion_face.png b/public/images/emoji/twitter/lion_face.png
index 8ff236dc423..aace4fa00bf 100644
Binary files a/public/images/emoji/twitter/lion_face.png and b/public/images/emoji/twitter/lion_face.png differ
diff --git a/public/images/emoji/twitter/lithuania.png b/public/images/emoji/twitter/lithuania.png
new file mode 100644
index 00000000000..d4e7e6766a2
Binary files /dev/null and b/public/images/emoji/twitter/lithuania.png differ
diff --git a/public/images/emoji/twitter/lizard.png b/public/images/emoji/twitter/lizard.png
new file mode 100644
index 00000000000..302081914b6
Binary files /dev/null and b/public/images/emoji/twitter/lizard.png differ
diff --git a/public/images/emoji/twitter/loudspeaker.png b/public/images/emoji/twitter/loudspeaker.png
index 377c42203fe..710b5c06682 100644
Binary files a/public/images/emoji/twitter/loudspeaker.png and b/public/images/emoji/twitter/loudspeaker.png differ
diff --git a/public/images/emoji/twitter/love_you_gesture.png b/public/images/emoji/twitter/love_you_gesture.png
new file mode 100644
index 00000000000..14ef7c72b20
Binary files /dev/null and b/public/images/emoji/twitter/love_you_gesture.png differ
diff --git a/public/images/emoji/twitter/love_you_gesture/2.png b/public/images/emoji/twitter/love_you_gesture/2.png
new file mode 100644
index 00000000000..b70217e894c
Binary files /dev/null and b/public/images/emoji/twitter/love_you_gesture/2.png differ
diff --git a/public/images/emoji/twitter/love_you_gesture/3.png b/public/images/emoji/twitter/love_you_gesture/3.png
new file mode 100644
index 00000000000..aa984ea9263
Binary files /dev/null and b/public/images/emoji/twitter/love_you_gesture/3.png differ
diff --git a/public/images/emoji/twitter/love_you_gesture/4.png b/public/images/emoji/twitter/love_you_gesture/4.png
new file mode 100644
index 00000000000..5decb0e8008
Binary files /dev/null and b/public/images/emoji/twitter/love_you_gesture/4.png differ
diff --git a/public/images/emoji/twitter/love_you_gesture/5.png b/public/images/emoji/twitter/love_you_gesture/5.png
new file mode 100644
index 00000000000..e0bb218cc08
Binary files /dev/null and b/public/images/emoji/twitter/love_you_gesture/5.png differ
diff --git a/public/images/emoji/twitter/love_you_gesture/6.png b/public/images/emoji/twitter/love_you_gesture/6.png
new file mode 100644
index 00000000000..bb51bde8bbd
Binary files /dev/null and b/public/images/emoji/twitter/love_you_gesture/6.png differ
diff --git a/public/images/emoji/twitter/lower_left_ballpoint_pen.png b/public/images/emoji/twitter/lower_left_ballpoint_pen.png
index 97d8c722a53..6219ae26cc1 100644
Binary files a/public/images/emoji/twitter/lower_left_ballpoint_pen.png and b/public/images/emoji/twitter/lower_left_ballpoint_pen.png differ
diff --git a/public/images/emoji/twitter/luxembourg.png b/public/images/emoji/twitter/luxembourg.png
new file mode 100644
index 00000000000..a8c6737d1b6
Binary files /dev/null and b/public/images/emoji/twitter/luxembourg.png differ
diff --git a/public/images/emoji/twitter/lying_face.png b/public/images/emoji/twitter/lying_face.png
new file mode 100644
index 00000000000..e31e547296e
Binary files /dev/null and b/public/images/emoji/twitter/lying_face.png differ
diff --git a/public/images/emoji/twitter/macau.png b/public/images/emoji/twitter/macau.png
new file mode 100644
index 00000000000..70620e1d545
Binary files /dev/null and b/public/images/emoji/twitter/macau.png differ
diff --git a/public/images/emoji/twitter/macedonia.png b/public/images/emoji/twitter/macedonia.png
new file mode 100644
index 00000000000..a4c8ef41d2f
Binary files /dev/null and b/public/images/emoji/twitter/macedonia.png differ
diff --git a/public/images/emoji/twitter/madagascar.png b/public/images/emoji/twitter/madagascar.png
new file mode 100644
index 00000000000..708ec7416ce
Binary files /dev/null and b/public/images/emoji/twitter/madagascar.png differ
diff --git a/public/images/emoji/twitter/mage.png b/public/images/emoji/twitter/mage.png
new file mode 100644
index 00000000000..71c1b13f924
Binary files /dev/null and b/public/images/emoji/twitter/mage.png differ
diff --git a/public/images/emoji/twitter/mage/2.png b/public/images/emoji/twitter/mage/2.png
new file mode 100644
index 00000000000..823f6843fad
Binary files /dev/null and b/public/images/emoji/twitter/mage/2.png differ
diff --git a/public/images/emoji/twitter/mage/3.png b/public/images/emoji/twitter/mage/3.png
new file mode 100644
index 00000000000..c2ff6622a04
Binary files /dev/null and b/public/images/emoji/twitter/mage/3.png differ
diff --git a/public/images/emoji/twitter/mage/4.png b/public/images/emoji/twitter/mage/4.png
new file mode 100644
index 00000000000..76d0a52e374
Binary files /dev/null and b/public/images/emoji/twitter/mage/4.png differ
diff --git a/public/images/emoji/twitter/mage/5.png b/public/images/emoji/twitter/mage/5.png
new file mode 100644
index 00000000000..ddb5de55806
Binary files /dev/null and b/public/images/emoji/twitter/mage/5.png differ
diff --git a/public/images/emoji/twitter/mage/6.png b/public/images/emoji/twitter/mage/6.png
new file mode 100644
index 00000000000..302dd62dfb3
Binary files /dev/null and b/public/images/emoji/twitter/mage/6.png differ
diff --git a/public/images/emoji/twitter/malawi.png b/public/images/emoji/twitter/malawi.png
new file mode 100644
index 00000000000..854fd4ce854
Binary files /dev/null and b/public/images/emoji/twitter/malawi.png differ
diff --git a/public/images/emoji/twitter/malaysia.png b/public/images/emoji/twitter/malaysia.png
new file mode 100644
index 00000000000..13137b15ad8
Binary files /dev/null and b/public/images/emoji/twitter/malaysia.png differ
diff --git a/public/images/emoji/twitter/maldives.png b/public/images/emoji/twitter/maldives.png
new file mode 100644
index 00000000000..e0fec7e04b4
Binary files /dev/null and b/public/images/emoji/twitter/maldives.png differ
diff --git a/public/images/emoji/twitter/male_couple_with_heart.png b/public/images/emoji/twitter/male_couple_with_heart.png
index 587278ae57a..56d8afc89a0 100644
Binary files a/public/images/emoji/twitter/male_couple_with_heart.png and b/public/images/emoji/twitter/male_couple_with_heart.png differ
diff --git a/public/images/emoji/twitter/male_couplekiss.png b/public/images/emoji/twitter/male_couplekiss.png
index ea1ec929065..2de6d98e2f9 100644
Binary files a/public/images/emoji/twitter/male_couplekiss.png and b/public/images/emoji/twitter/male_couplekiss.png differ
diff --git a/public/images/emoji/twitter/male_detective.png b/public/images/emoji/twitter/male_detective.png
new file mode 100644
index 00000000000..587e506d98d
Binary files /dev/null and b/public/images/emoji/twitter/male_detective.png differ
diff --git a/public/images/emoji/twitter/male_detective/2.png b/public/images/emoji/twitter/male_detective/2.png
new file mode 100644
index 00000000000..a25d5ea4d44
Binary files /dev/null and b/public/images/emoji/twitter/male_detective/2.png differ
diff --git a/public/images/emoji/twitter/male_detective/3.png b/public/images/emoji/twitter/male_detective/3.png
new file mode 100644
index 00000000000..f100fd13a45
Binary files /dev/null and b/public/images/emoji/twitter/male_detective/3.png differ
diff --git a/public/images/emoji/twitter/male_detective/4.png b/public/images/emoji/twitter/male_detective/4.png
new file mode 100644
index 00000000000..775a8b2f2b0
Binary files /dev/null and b/public/images/emoji/twitter/male_detective/4.png differ
diff --git a/public/images/emoji/twitter/male_detective/5.png b/public/images/emoji/twitter/male_detective/5.png
new file mode 100644
index 00000000000..c9703ba9946
Binary files /dev/null and b/public/images/emoji/twitter/male_detective/5.png differ
diff --git a/public/images/emoji/twitter/male_detective/6.png b/public/images/emoji/twitter/male_detective/6.png
new file mode 100644
index 00000000000..55cc03db8d4
Binary files /dev/null and b/public/images/emoji/twitter/male_detective/6.png differ
diff --git a/public/images/emoji/twitter/mali.png b/public/images/emoji/twitter/mali.png
new file mode 100644
index 00000000000..ef19c197c7b
Binary files /dev/null and b/public/images/emoji/twitter/mali.png differ
diff --git a/public/images/emoji/twitter/malta.png b/public/images/emoji/twitter/malta.png
new file mode 100644
index 00000000000..f6850d62764
Binary files /dev/null and b/public/images/emoji/twitter/malta.png differ
diff --git a/public/images/emoji/twitter/man/2.png b/public/images/emoji/twitter/man/2.png
new file mode 100644
index 00000000000..a570e26c0ae
Binary files /dev/null and b/public/images/emoji/twitter/man/2.png differ
diff --git a/public/images/emoji/twitter/man/3.png b/public/images/emoji/twitter/man/3.png
new file mode 100644
index 00000000000..dd21d97a8af
Binary files /dev/null and b/public/images/emoji/twitter/man/3.png differ
diff --git a/public/images/emoji/twitter/man/4.png b/public/images/emoji/twitter/man/4.png
new file mode 100644
index 00000000000..23d0f10eacd
Binary files /dev/null and b/public/images/emoji/twitter/man/4.png differ
diff --git a/public/images/emoji/twitter/man/5.png b/public/images/emoji/twitter/man/5.png
new file mode 100644
index 00000000000..07aa167d0b3
Binary files /dev/null and b/public/images/emoji/twitter/man/5.png differ
diff --git a/public/images/emoji/twitter/man/6.png b/public/images/emoji/twitter/man/6.png
new file mode 100644
index 00000000000..1262a4ee31c
Binary files /dev/null and b/public/images/emoji/twitter/man/6.png differ
diff --git a/public/images/emoji/twitter/man_artist.png b/public/images/emoji/twitter/man_artist.png
new file mode 100644
index 00000000000..1cc66506970
Binary files /dev/null and b/public/images/emoji/twitter/man_artist.png differ
diff --git a/public/images/emoji/twitter/man_artist/2.png b/public/images/emoji/twitter/man_artist/2.png
new file mode 100644
index 00000000000..4bacb1ea060
Binary files /dev/null and b/public/images/emoji/twitter/man_artist/2.png differ
diff --git a/public/images/emoji/twitter/man_artist/3.png b/public/images/emoji/twitter/man_artist/3.png
new file mode 100644
index 00000000000..05d4d810aa6
Binary files /dev/null and b/public/images/emoji/twitter/man_artist/3.png differ
diff --git a/public/images/emoji/twitter/man_artist/4.png b/public/images/emoji/twitter/man_artist/4.png
new file mode 100644
index 00000000000..4f62b719230
Binary files /dev/null and b/public/images/emoji/twitter/man_artist/4.png differ
diff --git a/public/images/emoji/twitter/man_artist/5.png b/public/images/emoji/twitter/man_artist/5.png
new file mode 100644
index 00000000000..87b201e1066
Binary files /dev/null and b/public/images/emoji/twitter/man_artist/5.png differ
diff --git a/public/images/emoji/twitter/man_artist/6.png b/public/images/emoji/twitter/man_artist/6.png
new file mode 100644
index 00000000000..d3c5344420f
Binary files /dev/null and b/public/images/emoji/twitter/man_artist/6.png differ
diff --git a/public/images/emoji/twitter/man_astronaut.png b/public/images/emoji/twitter/man_astronaut.png
new file mode 100644
index 00000000000..3248c7ea4bb
Binary files /dev/null and b/public/images/emoji/twitter/man_astronaut.png differ
diff --git a/public/images/emoji/twitter/man_astronaut/2.png b/public/images/emoji/twitter/man_astronaut/2.png
new file mode 100644
index 00000000000..3f4608453cb
Binary files /dev/null and b/public/images/emoji/twitter/man_astronaut/2.png differ
diff --git a/public/images/emoji/twitter/man_astronaut/3.png b/public/images/emoji/twitter/man_astronaut/3.png
new file mode 100644
index 00000000000..dfb79a0fa12
Binary files /dev/null and b/public/images/emoji/twitter/man_astronaut/3.png differ
diff --git a/public/images/emoji/twitter/man_astronaut/4.png b/public/images/emoji/twitter/man_astronaut/4.png
new file mode 100644
index 00000000000..ecffb4b3dcd
Binary files /dev/null and b/public/images/emoji/twitter/man_astronaut/4.png differ
diff --git a/public/images/emoji/twitter/man_astronaut/5.png b/public/images/emoji/twitter/man_astronaut/5.png
new file mode 100644
index 00000000000..30a01501b69
Binary files /dev/null and b/public/images/emoji/twitter/man_astronaut/5.png differ
diff --git a/public/images/emoji/twitter/man_astronaut/6.png b/public/images/emoji/twitter/man_astronaut/6.png
new file mode 100644
index 00000000000..1b5c86eeb3e
Binary files /dev/null and b/public/images/emoji/twitter/man_astronaut/6.png differ
diff --git a/public/images/emoji/twitter/man_cartwheeling.png b/public/images/emoji/twitter/man_cartwheeling.png
new file mode 100644
index 00000000000..aaf7c70f746
Binary files /dev/null and b/public/images/emoji/twitter/man_cartwheeling.png differ
diff --git a/public/images/emoji/twitter/man_cartwheeling/2.png b/public/images/emoji/twitter/man_cartwheeling/2.png
new file mode 100644
index 00000000000..431a4461e3c
Binary files /dev/null and b/public/images/emoji/twitter/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/twitter/man_cartwheeling/3.png b/public/images/emoji/twitter/man_cartwheeling/3.png
new file mode 100644
index 00000000000..fb4421abb07
Binary files /dev/null and b/public/images/emoji/twitter/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/twitter/man_cartwheeling/4.png b/public/images/emoji/twitter/man_cartwheeling/4.png
new file mode 100644
index 00000000000..277e11f0c50
Binary files /dev/null and b/public/images/emoji/twitter/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/twitter/man_cartwheeling/5.png b/public/images/emoji/twitter/man_cartwheeling/5.png
new file mode 100644
index 00000000000..dfd446bd8d2
Binary files /dev/null and b/public/images/emoji/twitter/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/twitter/man_cartwheeling/6.png b/public/images/emoji/twitter/man_cartwheeling/6.png
new file mode 100644
index 00000000000..8877efb2711
Binary files /dev/null and b/public/images/emoji/twitter/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/twitter/man_cook.png b/public/images/emoji/twitter/man_cook.png
new file mode 100644
index 00000000000..8fb843406f5
Binary files /dev/null and b/public/images/emoji/twitter/man_cook.png differ
diff --git a/public/images/emoji/twitter/man_cook/2.png b/public/images/emoji/twitter/man_cook/2.png
new file mode 100644
index 00000000000..4dfed228556
Binary files /dev/null and b/public/images/emoji/twitter/man_cook/2.png differ
diff --git a/public/images/emoji/twitter/man_cook/3.png b/public/images/emoji/twitter/man_cook/3.png
new file mode 100644
index 00000000000..072ab0c4753
Binary files /dev/null and b/public/images/emoji/twitter/man_cook/3.png differ
diff --git a/public/images/emoji/twitter/man_cook/4.png b/public/images/emoji/twitter/man_cook/4.png
new file mode 100644
index 00000000000..0d3c6b85351
Binary files /dev/null and b/public/images/emoji/twitter/man_cook/4.png differ
diff --git a/public/images/emoji/twitter/man_cook/5.png b/public/images/emoji/twitter/man_cook/5.png
new file mode 100644
index 00000000000..805aa4fcf67
Binary files /dev/null and b/public/images/emoji/twitter/man_cook/5.png differ
diff --git a/public/images/emoji/twitter/man_cook/6.png b/public/images/emoji/twitter/man_cook/6.png
new file mode 100644
index 00000000000..60d2b62aa26
Binary files /dev/null and b/public/images/emoji/twitter/man_cook/6.png differ
diff --git a/public/images/emoji/twitter/man_dancing.png b/public/images/emoji/twitter/man_dancing.png
new file mode 100644
index 00000000000..f3f2a5b04c7
Binary files /dev/null and b/public/images/emoji/twitter/man_dancing.png differ
diff --git a/public/images/emoji/twitter/man_dancing/2.png b/public/images/emoji/twitter/man_dancing/2.png
new file mode 100644
index 00000000000..040218520e4
Binary files /dev/null and b/public/images/emoji/twitter/man_dancing/2.png differ
diff --git a/public/images/emoji/twitter/man_dancing/3.png b/public/images/emoji/twitter/man_dancing/3.png
new file mode 100644
index 00000000000..8aec654d0ed
Binary files /dev/null and b/public/images/emoji/twitter/man_dancing/3.png differ
diff --git a/public/images/emoji/twitter/man_dancing/4.png b/public/images/emoji/twitter/man_dancing/4.png
new file mode 100644
index 00000000000..3d74099cbba
Binary files /dev/null and b/public/images/emoji/twitter/man_dancing/4.png differ
diff --git a/public/images/emoji/twitter/man_dancing/5.png b/public/images/emoji/twitter/man_dancing/5.png
new file mode 100644
index 00000000000..d41bc277889
Binary files /dev/null and b/public/images/emoji/twitter/man_dancing/5.png differ
diff --git a/public/images/emoji/twitter/man_dancing/6.png b/public/images/emoji/twitter/man_dancing/6.png
new file mode 100644
index 00000000000..01ee2f8efeb
Binary files /dev/null and b/public/images/emoji/twitter/man_dancing/6.png differ
diff --git a/public/images/emoji/twitter/man_facepalming.png b/public/images/emoji/twitter/man_facepalming.png
new file mode 100644
index 00000000000..4967e238dcc
Binary files /dev/null and b/public/images/emoji/twitter/man_facepalming.png differ
diff --git a/public/images/emoji/twitter/man_facepalming/2.png b/public/images/emoji/twitter/man_facepalming/2.png
new file mode 100644
index 00000000000..797300f215f
Binary files /dev/null and b/public/images/emoji/twitter/man_facepalming/2.png differ
diff --git a/public/images/emoji/twitter/man_facepalming/3.png b/public/images/emoji/twitter/man_facepalming/3.png
new file mode 100644
index 00000000000..407e8054b53
Binary files /dev/null and b/public/images/emoji/twitter/man_facepalming/3.png differ
diff --git a/public/images/emoji/twitter/man_facepalming/4.png b/public/images/emoji/twitter/man_facepalming/4.png
new file mode 100644
index 00000000000..6254233090c
Binary files /dev/null and b/public/images/emoji/twitter/man_facepalming/4.png differ
diff --git a/public/images/emoji/twitter/man_facepalming/5.png b/public/images/emoji/twitter/man_facepalming/5.png
new file mode 100644
index 00000000000..5e7da37f052
Binary files /dev/null and b/public/images/emoji/twitter/man_facepalming/5.png differ
diff --git a/public/images/emoji/twitter/man_facepalming/6.png b/public/images/emoji/twitter/man_facepalming/6.png
new file mode 100644
index 00000000000..eca03f4a44f
Binary files /dev/null and b/public/images/emoji/twitter/man_facepalming/6.png differ
diff --git a/public/images/emoji/twitter/man_factory_worker.png b/public/images/emoji/twitter/man_factory_worker.png
new file mode 100644
index 00000000000..4f8d7b6339f
Binary files /dev/null and b/public/images/emoji/twitter/man_factory_worker.png differ
diff --git a/public/images/emoji/twitter/man_factory_worker/2.png b/public/images/emoji/twitter/man_factory_worker/2.png
new file mode 100644
index 00000000000..ac0c07e8d58
Binary files /dev/null and b/public/images/emoji/twitter/man_factory_worker/2.png differ
diff --git a/public/images/emoji/twitter/man_factory_worker/3.png b/public/images/emoji/twitter/man_factory_worker/3.png
new file mode 100644
index 00000000000..f5b09e3c747
Binary files /dev/null and b/public/images/emoji/twitter/man_factory_worker/3.png differ
diff --git a/public/images/emoji/twitter/man_factory_worker/4.png b/public/images/emoji/twitter/man_factory_worker/4.png
new file mode 100644
index 00000000000..d9e2f4f8f99
Binary files /dev/null and b/public/images/emoji/twitter/man_factory_worker/4.png differ
diff --git a/public/images/emoji/twitter/man_factory_worker/5.png b/public/images/emoji/twitter/man_factory_worker/5.png
new file mode 100644
index 00000000000..c6fb8f9c463
Binary files /dev/null and b/public/images/emoji/twitter/man_factory_worker/5.png differ
diff --git a/public/images/emoji/twitter/man_factory_worker/6.png b/public/images/emoji/twitter/man_factory_worker/6.png
new file mode 100644
index 00000000000..196de5ae668
Binary files /dev/null and b/public/images/emoji/twitter/man_factory_worker/6.png differ
diff --git a/public/images/emoji/twitter/man_farmer.png b/public/images/emoji/twitter/man_farmer.png
new file mode 100644
index 00000000000..a275fe56a76
Binary files /dev/null and b/public/images/emoji/twitter/man_farmer.png differ
diff --git a/public/images/emoji/twitter/man_farmer/2.png b/public/images/emoji/twitter/man_farmer/2.png
new file mode 100644
index 00000000000..cf79c4c3110
Binary files /dev/null and b/public/images/emoji/twitter/man_farmer/2.png differ
diff --git a/public/images/emoji/twitter/man_farmer/3.png b/public/images/emoji/twitter/man_farmer/3.png
new file mode 100644
index 00000000000..b0c9648562a
Binary files /dev/null and b/public/images/emoji/twitter/man_farmer/3.png differ
diff --git a/public/images/emoji/twitter/man_farmer/4.png b/public/images/emoji/twitter/man_farmer/4.png
new file mode 100644
index 00000000000..89249787904
Binary files /dev/null and b/public/images/emoji/twitter/man_farmer/4.png differ
diff --git a/public/images/emoji/twitter/man_farmer/5.png b/public/images/emoji/twitter/man_farmer/5.png
new file mode 100644
index 00000000000..dc6e22dbc16
Binary files /dev/null and b/public/images/emoji/twitter/man_farmer/5.png differ
diff --git a/public/images/emoji/twitter/man_farmer/6.png b/public/images/emoji/twitter/man_farmer/6.png
new file mode 100644
index 00000000000..e7df59313d1
Binary files /dev/null and b/public/images/emoji/twitter/man_farmer/6.png differ
diff --git a/public/images/emoji/twitter/man_firefighter.png b/public/images/emoji/twitter/man_firefighter.png
new file mode 100644
index 00000000000..a43787bc209
Binary files /dev/null and b/public/images/emoji/twitter/man_firefighter.png differ
diff --git a/public/images/emoji/twitter/man_firefighter/2.png b/public/images/emoji/twitter/man_firefighter/2.png
new file mode 100644
index 00000000000..9788ff223ed
Binary files /dev/null and b/public/images/emoji/twitter/man_firefighter/2.png differ
diff --git a/public/images/emoji/twitter/man_firefighter/3.png b/public/images/emoji/twitter/man_firefighter/3.png
new file mode 100644
index 00000000000..b92f6491359
Binary files /dev/null and b/public/images/emoji/twitter/man_firefighter/3.png differ
diff --git a/public/images/emoji/twitter/man_firefighter/4.png b/public/images/emoji/twitter/man_firefighter/4.png
new file mode 100644
index 00000000000..2494826b0d1
Binary files /dev/null and b/public/images/emoji/twitter/man_firefighter/4.png differ
diff --git a/public/images/emoji/twitter/man_firefighter/5.png b/public/images/emoji/twitter/man_firefighter/5.png
new file mode 100644
index 00000000000..74caaf3d670
Binary files /dev/null and b/public/images/emoji/twitter/man_firefighter/5.png differ
diff --git a/public/images/emoji/twitter/man_firefighter/6.png b/public/images/emoji/twitter/man_firefighter/6.png
new file mode 100644
index 00000000000..87b1460b99a
Binary files /dev/null and b/public/images/emoji/twitter/man_firefighter/6.png differ
diff --git a/public/images/emoji/twitter/man_health_worker.png b/public/images/emoji/twitter/man_health_worker.png
new file mode 100644
index 00000000000..266219eec10
Binary files /dev/null and b/public/images/emoji/twitter/man_health_worker.png differ
diff --git a/public/images/emoji/twitter/man_health_worker/2.png b/public/images/emoji/twitter/man_health_worker/2.png
new file mode 100644
index 00000000000..07434ed5781
Binary files /dev/null and b/public/images/emoji/twitter/man_health_worker/2.png differ
diff --git a/public/images/emoji/twitter/man_health_worker/3.png b/public/images/emoji/twitter/man_health_worker/3.png
new file mode 100644
index 00000000000..a233efb0c7a
Binary files /dev/null and b/public/images/emoji/twitter/man_health_worker/3.png differ
diff --git a/public/images/emoji/twitter/man_health_worker/4.png b/public/images/emoji/twitter/man_health_worker/4.png
new file mode 100644
index 00000000000..9dbd254708e
Binary files /dev/null and b/public/images/emoji/twitter/man_health_worker/4.png differ
diff --git a/public/images/emoji/twitter/man_health_worker/5.png b/public/images/emoji/twitter/man_health_worker/5.png
new file mode 100644
index 00000000000..3e13cf5b0dc
Binary files /dev/null and b/public/images/emoji/twitter/man_health_worker/5.png differ
diff --git a/public/images/emoji/twitter/man_health_worker/6.png b/public/images/emoji/twitter/man_health_worker/6.png
new file mode 100644
index 00000000000..6fe28eed3cd
Binary files /dev/null and b/public/images/emoji/twitter/man_health_worker/6.png differ
diff --git a/public/images/emoji/twitter/man_in_business_suit_levitating.png b/public/images/emoji/twitter/man_in_business_suit_levitating.png
index 622ec86bf72..5231c708a03 100644
Binary files a/public/images/emoji/twitter/man_in_business_suit_levitating.png and b/public/images/emoji/twitter/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/twitter/man_in_business_suit_levitating/2.png b/public/images/emoji/twitter/man_in_business_suit_levitating/2.png
new file mode 100644
index 00000000000..753693b093b
Binary files /dev/null and b/public/images/emoji/twitter/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/twitter/man_in_business_suit_levitating/3.png b/public/images/emoji/twitter/man_in_business_suit_levitating/3.png
new file mode 100644
index 00000000000..f56875edac9
Binary files /dev/null and b/public/images/emoji/twitter/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/twitter/man_in_business_suit_levitating/4.png b/public/images/emoji/twitter/man_in_business_suit_levitating/4.png
new file mode 100644
index 00000000000..37d74f5c97d
Binary files /dev/null and b/public/images/emoji/twitter/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/twitter/man_in_business_suit_levitating/5.png b/public/images/emoji/twitter/man_in_business_suit_levitating/5.png
new file mode 100644
index 00000000000..5a48f961920
Binary files /dev/null and b/public/images/emoji/twitter/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/twitter/man_in_business_suit_levitating/6.png b/public/images/emoji/twitter/man_in_business_suit_levitating/6.png
new file mode 100644
index 00000000000..61507408172
Binary files /dev/null and b/public/images/emoji/twitter/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/twitter/man_in_tuxedo.png b/public/images/emoji/twitter/man_in_tuxedo.png
new file mode 100644
index 00000000000..68a5498555d
Binary files /dev/null and b/public/images/emoji/twitter/man_in_tuxedo.png differ
diff --git a/public/images/emoji/twitter/man_in_tuxedo/2.png b/public/images/emoji/twitter/man_in_tuxedo/2.png
new file mode 100644
index 00000000000..9115065434d
Binary files /dev/null and b/public/images/emoji/twitter/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/twitter/man_in_tuxedo/3.png b/public/images/emoji/twitter/man_in_tuxedo/3.png
new file mode 100644
index 00000000000..7d21e355055
Binary files /dev/null and b/public/images/emoji/twitter/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/twitter/man_in_tuxedo/4.png b/public/images/emoji/twitter/man_in_tuxedo/4.png
new file mode 100644
index 00000000000..5560c73e7c2
Binary files /dev/null and b/public/images/emoji/twitter/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/twitter/man_in_tuxedo/5.png b/public/images/emoji/twitter/man_in_tuxedo/5.png
new file mode 100644
index 00000000000..0507a8bc08e
Binary files /dev/null and b/public/images/emoji/twitter/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/twitter/man_in_tuxedo/6.png b/public/images/emoji/twitter/man_in_tuxedo/6.png
new file mode 100644
index 00000000000..7e5b9118602
Binary files /dev/null and b/public/images/emoji/twitter/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/twitter/man_judge.png b/public/images/emoji/twitter/man_judge.png
new file mode 100644
index 00000000000..b20c0cd7349
Binary files /dev/null and b/public/images/emoji/twitter/man_judge.png differ
diff --git a/public/images/emoji/twitter/man_judge/2.png b/public/images/emoji/twitter/man_judge/2.png
new file mode 100644
index 00000000000..bdfee1817bb
Binary files /dev/null and b/public/images/emoji/twitter/man_judge/2.png differ
diff --git a/public/images/emoji/twitter/man_judge/3.png b/public/images/emoji/twitter/man_judge/3.png
new file mode 100644
index 00000000000..052c0b0fa21
Binary files /dev/null and b/public/images/emoji/twitter/man_judge/3.png differ
diff --git a/public/images/emoji/twitter/man_judge/4.png b/public/images/emoji/twitter/man_judge/4.png
new file mode 100644
index 00000000000..ddd7e0530df
Binary files /dev/null and b/public/images/emoji/twitter/man_judge/4.png differ
diff --git a/public/images/emoji/twitter/man_judge/5.png b/public/images/emoji/twitter/man_judge/5.png
new file mode 100644
index 00000000000..1a374e14850
Binary files /dev/null and b/public/images/emoji/twitter/man_judge/5.png differ
diff --git a/public/images/emoji/twitter/man_judge/6.png b/public/images/emoji/twitter/man_judge/6.png
new file mode 100644
index 00000000000..4d5fac75dfe
Binary files /dev/null and b/public/images/emoji/twitter/man_judge/6.png differ
diff --git a/public/images/emoji/twitter/man_juggling.png b/public/images/emoji/twitter/man_juggling.png
new file mode 100644
index 00000000000..d6cc6a380df
Binary files /dev/null and b/public/images/emoji/twitter/man_juggling.png differ
diff --git a/public/images/emoji/twitter/man_juggling/2.png b/public/images/emoji/twitter/man_juggling/2.png
new file mode 100644
index 00000000000..631afe697f6
Binary files /dev/null and b/public/images/emoji/twitter/man_juggling/2.png differ
diff --git a/public/images/emoji/twitter/man_juggling/3.png b/public/images/emoji/twitter/man_juggling/3.png
new file mode 100644
index 00000000000..c28f2a5db9f
Binary files /dev/null and b/public/images/emoji/twitter/man_juggling/3.png differ
diff --git a/public/images/emoji/twitter/man_juggling/4.png b/public/images/emoji/twitter/man_juggling/4.png
new file mode 100644
index 00000000000..12d32ecb86a
Binary files /dev/null and b/public/images/emoji/twitter/man_juggling/4.png differ
diff --git a/public/images/emoji/twitter/man_juggling/5.png b/public/images/emoji/twitter/man_juggling/5.png
new file mode 100644
index 00000000000..f04ba21ece3
Binary files /dev/null and b/public/images/emoji/twitter/man_juggling/5.png differ
diff --git a/public/images/emoji/twitter/man_juggling/6.png b/public/images/emoji/twitter/man_juggling/6.png
new file mode 100644
index 00000000000..4b5b1a7d5c6
Binary files /dev/null and b/public/images/emoji/twitter/man_juggling/6.png differ
diff --git a/public/images/emoji/twitter/man_mechanic.png b/public/images/emoji/twitter/man_mechanic.png
new file mode 100644
index 00000000000..df912ad2558
Binary files /dev/null and b/public/images/emoji/twitter/man_mechanic.png differ
diff --git a/public/images/emoji/twitter/man_mechanic/2.png b/public/images/emoji/twitter/man_mechanic/2.png
new file mode 100644
index 00000000000..2d9a40a7b64
Binary files /dev/null and b/public/images/emoji/twitter/man_mechanic/2.png differ
diff --git a/public/images/emoji/twitter/man_mechanic/3.png b/public/images/emoji/twitter/man_mechanic/3.png
new file mode 100644
index 00000000000..0b6093c5612
Binary files /dev/null and b/public/images/emoji/twitter/man_mechanic/3.png differ
diff --git a/public/images/emoji/twitter/man_mechanic/4.png b/public/images/emoji/twitter/man_mechanic/4.png
new file mode 100644
index 00000000000..4b776c98ef2
Binary files /dev/null and b/public/images/emoji/twitter/man_mechanic/4.png differ
diff --git a/public/images/emoji/twitter/man_mechanic/5.png b/public/images/emoji/twitter/man_mechanic/5.png
new file mode 100644
index 00000000000..994526ddb9e
Binary files /dev/null and b/public/images/emoji/twitter/man_mechanic/5.png differ
diff --git a/public/images/emoji/twitter/man_mechanic/6.png b/public/images/emoji/twitter/man_mechanic/6.png
new file mode 100644
index 00000000000..e95117df24a
Binary files /dev/null and b/public/images/emoji/twitter/man_mechanic/6.png differ
diff --git a/public/images/emoji/twitter/man_office_worker.png b/public/images/emoji/twitter/man_office_worker.png
new file mode 100644
index 00000000000..641784af029
Binary files /dev/null and b/public/images/emoji/twitter/man_office_worker.png differ
diff --git a/public/images/emoji/twitter/man_office_worker/2.png b/public/images/emoji/twitter/man_office_worker/2.png
new file mode 100644
index 00000000000..db95aa14314
Binary files /dev/null and b/public/images/emoji/twitter/man_office_worker/2.png differ
diff --git a/public/images/emoji/twitter/man_office_worker/3.png b/public/images/emoji/twitter/man_office_worker/3.png
new file mode 100644
index 00000000000..0da3a36f501
Binary files /dev/null and b/public/images/emoji/twitter/man_office_worker/3.png differ
diff --git a/public/images/emoji/twitter/man_office_worker/4.png b/public/images/emoji/twitter/man_office_worker/4.png
new file mode 100644
index 00000000000..0e7d62291b0
Binary files /dev/null and b/public/images/emoji/twitter/man_office_worker/4.png differ
diff --git a/public/images/emoji/twitter/man_office_worker/5.png b/public/images/emoji/twitter/man_office_worker/5.png
new file mode 100644
index 00000000000..b2ef2f04209
Binary files /dev/null and b/public/images/emoji/twitter/man_office_worker/5.png differ
diff --git a/public/images/emoji/twitter/man_office_worker/6.png b/public/images/emoji/twitter/man_office_worker/6.png
new file mode 100644
index 00000000000..f237971ab0d
Binary files /dev/null and b/public/images/emoji/twitter/man_office_worker/6.png differ
diff --git a/public/images/emoji/twitter/man_pilot.png b/public/images/emoji/twitter/man_pilot.png
new file mode 100644
index 00000000000..196949a366f
Binary files /dev/null and b/public/images/emoji/twitter/man_pilot.png differ
diff --git a/public/images/emoji/twitter/man_pilot/2.png b/public/images/emoji/twitter/man_pilot/2.png
new file mode 100644
index 00000000000..0b3fe7f3492
Binary files /dev/null and b/public/images/emoji/twitter/man_pilot/2.png differ
diff --git a/public/images/emoji/twitter/man_pilot/3.png b/public/images/emoji/twitter/man_pilot/3.png
new file mode 100644
index 00000000000..2af0c956d9d
Binary files /dev/null and b/public/images/emoji/twitter/man_pilot/3.png differ
diff --git a/public/images/emoji/twitter/man_pilot/4.png b/public/images/emoji/twitter/man_pilot/4.png
new file mode 100644
index 00000000000..7098a598caa
Binary files /dev/null and b/public/images/emoji/twitter/man_pilot/4.png differ
diff --git a/public/images/emoji/twitter/man_pilot/5.png b/public/images/emoji/twitter/man_pilot/5.png
new file mode 100644
index 00000000000..790ecc7051e
Binary files /dev/null and b/public/images/emoji/twitter/man_pilot/5.png differ
diff --git a/public/images/emoji/twitter/man_pilot/6.png b/public/images/emoji/twitter/man_pilot/6.png
new file mode 100644
index 00000000000..7082b178d78
Binary files /dev/null and b/public/images/emoji/twitter/man_pilot/6.png differ
diff --git a/public/images/emoji/twitter/man_playing_handball.png b/public/images/emoji/twitter/man_playing_handball.png
new file mode 100644
index 00000000000..8d9964cf037
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_handball.png differ
diff --git a/public/images/emoji/twitter/man_playing_handball/2.png b/public/images/emoji/twitter/man_playing_handball/2.png
new file mode 100644
index 00000000000..33b1d7c764b
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_handball/2.png differ
diff --git a/public/images/emoji/twitter/man_playing_handball/3.png b/public/images/emoji/twitter/man_playing_handball/3.png
new file mode 100644
index 00000000000..1f3f9215d08
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_handball/3.png differ
diff --git a/public/images/emoji/twitter/man_playing_handball/4.png b/public/images/emoji/twitter/man_playing_handball/4.png
new file mode 100644
index 00000000000..20d6288ed7a
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_handball/4.png differ
diff --git a/public/images/emoji/twitter/man_playing_handball/5.png b/public/images/emoji/twitter/man_playing_handball/5.png
new file mode 100644
index 00000000000..b653112d27f
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_handball/5.png differ
diff --git a/public/images/emoji/twitter/man_playing_handball/6.png b/public/images/emoji/twitter/man_playing_handball/6.png
new file mode 100644
index 00000000000..c7dce8c231c
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_handball/6.png differ
diff --git a/public/images/emoji/twitter/man_playing_water_polo.png b/public/images/emoji/twitter/man_playing_water_polo.png
new file mode 100644
index 00000000000..14bc7c68d11
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_water_polo.png differ
diff --git a/public/images/emoji/twitter/man_playing_water_polo/2.png b/public/images/emoji/twitter/man_playing_water_polo/2.png
new file mode 100644
index 00000000000..4f343861d3c
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/twitter/man_playing_water_polo/3.png b/public/images/emoji/twitter/man_playing_water_polo/3.png
new file mode 100644
index 00000000000..3548a2ef8db
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/twitter/man_playing_water_polo/4.png b/public/images/emoji/twitter/man_playing_water_polo/4.png
new file mode 100644
index 00000000000..7b45751b64d
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/twitter/man_playing_water_polo/5.png b/public/images/emoji/twitter/man_playing_water_polo/5.png
new file mode 100644
index 00000000000..3247752e194
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/twitter/man_playing_water_polo/6.png b/public/images/emoji/twitter/man_playing_water_polo/6.png
new file mode 100644
index 00000000000..bd6e616eb20
Binary files /dev/null and b/public/images/emoji/twitter/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/twitter/man_scientist.png b/public/images/emoji/twitter/man_scientist.png
new file mode 100644
index 00000000000..af1f36d1cd5
Binary files /dev/null and b/public/images/emoji/twitter/man_scientist.png differ
diff --git a/public/images/emoji/twitter/man_scientist/2.png b/public/images/emoji/twitter/man_scientist/2.png
new file mode 100644
index 00000000000..5a1e488e80b
Binary files /dev/null and b/public/images/emoji/twitter/man_scientist/2.png differ
diff --git a/public/images/emoji/twitter/man_scientist/3.png b/public/images/emoji/twitter/man_scientist/3.png
new file mode 100644
index 00000000000..7c7d6b849e0
Binary files /dev/null and b/public/images/emoji/twitter/man_scientist/3.png differ
diff --git a/public/images/emoji/twitter/man_scientist/4.png b/public/images/emoji/twitter/man_scientist/4.png
new file mode 100644
index 00000000000..ff16a5535f7
Binary files /dev/null and b/public/images/emoji/twitter/man_scientist/4.png differ
diff --git a/public/images/emoji/twitter/man_scientist/5.png b/public/images/emoji/twitter/man_scientist/5.png
new file mode 100644
index 00000000000..179479a6969
Binary files /dev/null and b/public/images/emoji/twitter/man_scientist/5.png differ
diff --git a/public/images/emoji/twitter/man_scientist/6.png b/public/images/emoji/twitter/man_scientist/6.png
new file mode 100644
index 00000000000..b02e169aaff
Binary files /dev/null and b/public/images/emoji/twitter/man_scientist/6.png differ
diff --git a/public/images/emoji/twitter/man_shrugging.png b/public/images/emoji/twitter/man_shrugging.png
new file mode 100644
index 00000000000..61e00fd0b01
Binary files /dev/null and b/public/images/emoji/twitter/man_shrugging.png differ
diff --git a/public/images/emoji/twitter/man_shrugging/2.png b/public/images/emoji/twitter/man_shrugging/2.png
new file mode 100644
index 00000000000..6db5885ddbd
Binary files /dev/null and b/public/images/emoji/twitter/man_shrugging/2.png differ
diff --git a/public/images/emoji/twitter/man_shrugging/3.png b/public/images/emoji/twitter/man_shrugging/3.png
new file mode 100644
index 00000000000..f1fc833e9c7
Binary files /dev/null and b/public/images/emoji/twitter/man_shrugging/3.png differ
diff --git a/public/images/emoji/twitter/man_shrugging/4.png b/public/images/emoji/twitter/man_shrugging/4.png
new file mode 100644
index 00000000000..9ca39fce99b
Binary files /dev/null and b/public/images/emoji/twitter/man_shrugging/4.png differ
diff --git a/public/images/emoji/twitter/man_shrugging/5.png b/public/images/emoji/twitter/man_shrugging/5.png
new file mode 100644
index 00000000000..ab9cd50150c
Binary files /dev/null and b/public/images/emoji/twitter/man_shrugging/5.png differ
diff --git a/public/images/emoji/twitter/man_shrugging/6.png b/public/images/emoji/twitter/man_shrugging/6.png
new file mode 100644
index 00000000000..a805a9fe340
Binary files /dev/null and b/public/images/emoji/twitter/man_shrugging/6.png differ
diff --git a/public/images/emoji/twitter/man_singer.png b/public/images/emoji/twitter/man_singer.png
new file mode 100644
index 00000000000..f3df8810282
Binary files /dev/null and b/public/images/emoji/twitter/man_singer.png differ
diff --git a/public/images/emoji/twitter/man_singer/2.png b/public/images/emoji/twitter/man_singer/2.png
new file mode 100644
index 00000000000..4e65783bfd5
Binary files /dev/null and b/public/images/emoji/twitter/man_singer/2.png differ
diff --git a/public/images/emoji/twitter/man_singer/3.png b/public/images/emoji/twitter/man_singer/3.png
new file mode 100644
index 00000000000..516eb98afb5
Binary files /dev/null and b/public/images/emoji/twitter/man_singer/3.png differ
diff --git a/public/images/emoji/twitter/man_singer/4.png b/public/images/emoji/twitter/man_singer/4.png
new file mode 100644
index 00000000000..89326187fbb
Binary files /dev/null and b/public/images/emoji/twitter/man_singer/4.png differ
diff --git a/public/images/emoji/twitter/man_singer/5.png b/public/images/emoji/twitter/man_singer/5.png
new file mode 100644
index 00000000000..b899d241e70
Binary files /dev/null and b/public/images/emoji/twitter/man_singer/5.png differ
diff --git a/public/images/emoji/twitter/man_singer/6.png b/public/images/emoji/twitter/man_singer/6.png
new file mode 100644
index 00000000000..a13d0b8c926
Binary files /dev/null and b/public/images/emoji/twitter/man_singer/6.png differ
diff --git a/public/images/emoji/twitter/man_student.png b/public/images/emoji/twitter/man_student.png
new file mode 100644
index 00000000000..897c8af4123
Binary files /dev/null and b/public/images/emoji/twitter/man_student.png differ
diff --git a/public/images/emoji/twitter/man_student/2.png b/public/images/emoji/twitter/man_student/2.png
new file mode 100644
index 00000000000..7acaf3e280b
Binary files /dev/null and b/public/images/emoji/twitter/man_student/2.png differ
diff --git a/public/images/emoji/twitter/man_student/3.png b/public/images/emoji/twitter/man_student/3.png
new file mode 100644
index 00000000000..c24cb607301
Binary files /dev/null and b/public/images/emoji/twitter/man_student/3.png differ
diff --git a/public/images/emoji/twitter/man_student/4.png b/public/images/emoji/twitter/man_student/4.png
new file mode 100644
index 00000000000..f0789f0b596
Binary files /dev/null and b/public/images/emoji/twitter/man_student/4.png differ
diff --git a/public/images/emoji/twitter/man_student/5.png b/public/images/emoji/twitter/man_student/5.png
new file mode 100644
index 00000000000..8471ef972a0
Binary files /dev/null and b/public/images/emoji/twitter/man_student/5.png differ
diff --git a/public/images/emoji/twitter/man_student/6.png b/public/images/emoji/twitter/man_student/6.png
new file mode 100644
index 00000000000..985678e804c
Binary files /dev/null and b/public/images/emoji/twitter/man_student/6.png differ
diff --git a/public/images/emoji/twitter/man_teacher.png b/public/images/emoji/twitter/man_teacher.png
new file mode 100644
index 00000000000..b85d9054667
Binary files /dev/null and b/public/images/emoji/twitter/man_teacher.png differ
diff --git a/public/images/emoji/twitter/man_teacher/2.png b/public/images/emoji/twitter/man_teacher/2.png
new file mode 100644
index 00000000000..e7cdd5b69aa
Binary files /dev/null and b/public/images/emoji/twitter/man_teacher/2.png differ
diff --git a/public/images/emoji/twitter/man_teacher/3.png b/public/images/emoji/twitter/man_teacher/3.png
new file mode 100644
index 00000000000..00f91851cbd
Binary files /dev/null and b/public/images/emoji/twitter/man_teacher/3.png differ
diff --git a/public/images/emoji/twitter/man_teacher/4.png b/public/images/emoji/twitter/man_teacher/4.png
new file mode 100644
index 00000000000..a82ddfb1401
Binary files /dev/null and b/public/images/emoji/twitter/man_teacher/4.png differ
diff --git a/public/images/emoji/twitter/man_teacher/5.png b/public/images/emoji/twitter/man_teacher/5.png
new file mode 100644
index 00000000000..d4140998d30
Binary files /dev/null and b/public/images/emoji/twitter/man_teacher/5.png differ
diff --git a/public/images/emoji/twitter/man_teacher/6.png b/public/images/emoji/twitter/man_teacher/6.png
new file mode 100644
index 00000000000..ed08c11d2b3
Binary files /dev/null and b/public/images/emoji/twitter/man_teacher/6.png differ
diff --git a/public/images/emoji/twitter/man_technologist.png b/public/images/emoji/twitter/man_technologist.png
new file mode 100644
index 00000000000..4d8208bbe1f
Binary files /dev/null and b/public/images/emoji/twitter/man_technologist.png differ
diff --git a/public/images/emoji/twitter/man_technologist/2.png b/public/images/emoji/twitter/man_technologist/2.png
new file mode 100644
index 00000000000..aed10e4c384
Binary files /dev/null and b/public/images/emoji/twitter/man_technologist/2.png differ
diff --git a/public/images/emoji/twitter/man_technologist/3.png b/public/images/emoji/twitter/man_technologist/3.png
new file mode 100644
index 00000000000..21b1243f7d8
Binary files /dev/null and b/public/images/emoji/twitter/man_technologist/3.png differ
diff --git a/public/images/emoji/twitter/man_technologist/4.png b/public/images/emoji/twitter/man_technologist/4.png
new file mode 100644
index 00000000000..f8d2f531dc3
Binary files /dev/null and b/public/images/emoji/twitter/man_technologist/4.png differ
diff --git a/public/images/emoji/twitter/man_technologist/5.png b/public/images/emoji/twitter/man_technologist/5.png
new file mode 100644
index 00000000000..27ea1004131
Binary files /dev/null and b/public/images/emoji/twitter/man_technologist/5.png differ
diff --git a/public/images/emoji/twitter/man_technologist/6.png b/public/images/emoji/twitter/man_technologist/6.png
new file mode 100644
index 00000000000..e6c6bccfffd
Binary files /dev/null and b/public/images/emoji/twitter/man_technologist/6.png differ
diff --git a/public/images/emoji/twitter/man_with_gua_pi_mao.png b/public/images/emoji/twitter/man_with_gua_pi_mao.png
index 8b0d5707344..79b9ed91ff0 100644
Binary files a/public/images/emoji/twitter/man_with_gua_pi_mao.png and b/public/images/emoji/twitter/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/twitter/man_with_gua_pi_mao/2.png b/public/images/emoji/twitter/man_with_gua_pi_mao/2.png
new file mode 100644
index 00000000000..c59baa4f7eb
Binary files /dev/null and b/public/images/emoji/twitter/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/twitter/man_with_gua_pi_mao/3.png b/public/images/emoji/twitter/man_with_gua_pi_mao/3.png
new file mode 100644
index 00000000000..4922909edfc
Binary files /dev/null and b/public/images/emoji/twitter/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/twitter/man_with_gua_pi_mao/4.png b/public/images/emoji/twitter/man_with_gua_pi_mao/4.png
new file mode 100644
index 00000000000..d80252bb5be
Binary files /dev/null and b/public/images/emoji/twitter/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/twitter/man_with_gua_pi_mao/5.png b/public/images/emoji/twitter/man_with_gua_pi_mao/5.png
new file mode 100644
index 00000000000..1870b9ea11d
Binary files /dev/null and b/public/images/emoji/twitter/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/twitter/man_with_gua_pi_mao/6.png b/public/images/emoji/twitter/man_with_gua_pi_mao/6.png
new file mode 100644
index 00000000000..70dba3b9125
Binary files /dev/null and b/public/images/emoji/twitter/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/twitter/man_with_turban.png b/public/images/emoji/twitter/man_with_turban.png
index fe1c0772b7f..ca077edb9fa 100644
Binary files a/public/images/emoji/twitter/man_with_turban.png and b/public/images/emoji/twitter/man_with_turban.png differ
diff --git a/public/images/emoji/twitter/man_with_turban/2.png b/public/images/emoji/twitter/man_with_turban/2.png
new file mode 100644
index 00000000000..3f7c50560fa
Binary files /dev/null and b/public/images/emoji/twitter/man_with_turban/2.png differ
diff --git a/public/images/emoji/twitter/man_with_turban/3.png b/public/images/emoji/twitter/man_with_turban/3.png
new file mode 100644
index 00000000000..955e6875bb1
Binary files /dev/null and b/public/images/emoji/twitter/man_with_turban/3.png differ
diff --git a/public/images/emoji/twitter/man_with_turban/4.png b/public/images/emoji/twitter/man_with_turban/4.png
new file mode 100644
index 00000000000..d4cf3d5619e
Binary files /dev/null and b/public/images/emoji/twitter/man_with_turban/4.png differ
diff --git a/public/images/emoji/twitter/man_with_turban/5.png b/public/images/emoji/twitter/man_with_turban/5.png
new file mode 100644
index 00000000000..df806fe5235
Binary files /dev/null and b/public/images/emoji/twitter/man_with_turban/5.png differ
diff --git a/public/images/emoji/twitter/man_with_turban/6.png b/public/images/emoji/twitter/man_with_turban/6.png
new file mode 100644
index 00000000000..03fad70d6e0
Binary files /dev/null and b/public/images/emoji/twitter/man_with_turban/6.png differ
diff --git a/public/images/emoji/twitter/mantelpiece_clock.png b/public/images/emoji/twitter/mantelpiece_clock.png
new file mode 100644
index 00000000000..62a0e894592
Binary files /dev/null and b/public/images/emoji/twitter/mantelpiece_clock.png differ
diff --git a/public/images/emoji/twitter/mantlepiece_clock.png b/public/images/emoji/twitter/mantlepiece_clock.png
deleted file mode 100644
index cf335766a1b..00000000000
Binary files a/public/images/emoji/twitter/mantlepiece_clock.png and /dev/null differ
diff --git a/public/images/emoji/twitter/map.png b/public/images/emoji/twitter/map.png
index 471c048fa27..8c102ea49de 100644
Binary files a/public/images/emoji/twitter/map.png and b/public/images/emoji/twitter/map.png differ
diff --git a/public/images/emoji/twitter/marshall_islands.png b/public/images/emoji/twitter/marshall_islands.png
new file mode 100644
index 00000000000..35a77d3ec6a
Binary files /dev/null and b/public/images/emoji/twitter/marshall_islands.png differ
diff --git a/public/images/emoji/twitter/martial_arts_uniform.png b/public/images/emoji/twitter/martial_arts_uniform.png
new file mode 100644
index 00000000000..50e9d87cd53
Binary files /dev/null and b/public/images/emoji/twitter/martial_arts_uniform.png differ
diff --git a/public/images/emoji/twitter/martinique.png b/public/images/emoji/twitter/martinique.png
new file mode 100644
index 00000000000..20265c357af
Binary files /dev/null and b/public/images/emoji/twitter/martinique.png differ
diff --git a/public/images/emoji/twitter/massage.png b/public/images/emoji/twitter/massage.png
index 01e380bcf64..e8364a6f97c 100644
Binary files a/public/images/emoji/twitter/massage.png and b/public/images/emoji/twitter/massage.png differ
diff --git a/public/images/emoji/twitter/massage/2.png b/public/images/emoji/twitter/massage/2.png
new file mode 100644
index 00000000000..18b9502a83a
Binary files /dev/null and b/public/images/emoji/twitter/massage/2.png differ
diff --git a/public/images/emoji/twitter/massage/3.png b/public/images/emoji/twitter/massage/3.png
new file mode 100644
index 00000000000..02af90bedcc
Binary files /dev/null and b/public/images/emoji/twitter/massage/3.png differ
diff --git a/public/images/emoji/twitter/massage/4.png b/public/images/emoji/twitter/massage/4.png
new file mode 100644
index 00000000000..2f46bdfc4a1
Binary files /dev/null and b/public/images/emoji/twitter/massage/4.png differ
diff --git a/public/images/emoji/twitter/massage/5.png b/public/images/emoji/twitter/massage/5.png
new file mode 100644
index 00000000000..c0f14dbde9a
Binary files /dev/null and b/public/images/emoji/twitter/massage/5.png differ
diff --git a/public/images/emoji/twitter/massage/6.png b/public/images/emoji/twitter/massage/6.png
new file mode 100644
index 00000000000..46504c4dec4
Binary files /dev/null and b/public/images/emoji/twitter/massage/6.png differ
diff --git a/public/images/emoji/twitter/massage_man.png b/public/images/emoji/twitter/massage_man.png
new file mode 100644
index 00000000000..b2d809725e0
Binary files /dev/null and b/public/images/emoji/twitter/massage_man.png differ
diff --git a/public/images/emoji/twitter/massage_man/2.png b/public/images/emoji/twitter/massage_man/2.png
new file mode 100644
index 00000000000..892e43bd6aa
Binary files /dev/null and b/public/images/emoji/twitter/massage_man/2.png differ
diff --git a/public/images/emoji/twitter/massage_man/3.png b/public/images/emoji/twitter/massage_man/3.png
new file mode 100644
index 00000000000..e9668ae1d81
Binary files /dev/null and b/public/images/emoji/twitter/massage_man/3.png differ
diff --git a/public/images/emoji/twitter/massage_man/4.png b/public/images/emoji/twitter/massage_man/4.png
new file mode 100644
index 00000000000..f891cc952f1
Binary files /dev/null and b/public/images/emoji/twitter/massage_man/4.png differ
diff --git a/public/images/emoji/twitter/massage_man/5.png b/public/images/emoji/twitter/massage_man/5.png
new file mode 100644
index 00000000000..8295da5a875
Binary files /dev/null and b/public/images/emoji/twitter/massage_man/5.png differ
diff --git a/public/images/emoji/twitter/massage_man/6.png b/public/images/emoji/twitter/massage_man/6.png
new file mode 100644
index 00000000000..549596cc7c1
Binary files /dev/null and b/public/images/emoji/twitter/massage_man/6.png differ
diff --git a/public/images/emoji/twitter/massage_woman.png b/public/images/emoji/twitter/massage_woman.png
new file mode 100644
index 00000000000..e8364a6f97c
Binary files /dev/null and b/public/images/emoji/twitter/massage_woman.png differ
diff --git a/public/images/emoji/twitter/massage_woman/2.png b/public/images/emoji/twitter/massage_woman/2.png
new file mode 100644
index 00000000000..18b9502a83a
Binary files /dev/null and b/public/images/emoji/twitter/massage_woman/2.png differ
diff --git a/public/images/emoji/twitter/massage_woman/3.png b/public/images/emoji/twitter/massage_woman/3.png
new file mode 100644
index 00000000000..02af90bedcc
Binary files /dev/null and b/public/images/emoji/twitter/massage_woman/3.png differ
diff --git a/public/images/emoji/twitter/massage_woman/4.png b/public/images/emoji/twitter/massage_woman/4.png
new file mode 100644
index 00000000000..2f46bdfc4a1
Binary files /dev/null and b/public/images/emoji/twitter/massage_woman/4.png differ
diff --git a/public/images/emoji/twitter/massage_woman/5.png b/public/images/emoji/twitter/massage_woman/5.png
new file mode 100644
index 00000000000..c0f14dbde9a
Binary files /dev/null and b/public/images/emoji/twitter/massage_woman/5.png differ
diff --git a/public/images/emoji/twitter/massage_woman/6.png b/public/images/emoji/twitter/massage_woman/6.png
new file mode 100644
index 00000000000..46504c4dec4
Binary files /dev/null and b/public/images/emoji/twitter/massage_woman/6.png differ
diff --git a/public/images/emoji/twitter/mauritania.png b/public/images/emoji/twitter/mauritania.png
new file mode 100644
index 00000000000..23fa26e4ced
Binary files /dev/null and b/public/images/emoji/twitter/mauritania.png differ
diff --git a/public/images/emoji/twitter/mauritius.png b/public/images/emoji/twitter/mauritius.png
new file mode 100644
index 00000000000..846272e3670
Binary files /dev/null and b/public/images/emoji/twitter/mauritius.png differ
diff --git a/public/images/emoji/twitter/mayotte.png b/public/images/emoji/twitter/mayotte.png
new file mode 100644
index 00000000000..43a7879d247
Binary files /dev/null and b/public/images/emoji/twitter/mayotte.png differ
diff --git a/public/images/emoji/twitter/medal_military.png b/public/images/emoji/twitter/medal_military.png
new file mode 100644
index 00000000000..857488da67c
Binary files /dev/null and b/public/images/emoji/twitter/medal_military.png differ
diff --git a/public/images/emoji/twitter/medal_sports.png b/public/images/emoji/twitter/medal_sports.png
new file mode 100644
index 00000000000..57fbc8512fc
Binary files /dev/null and b/public/images/emoji/twitter/medal_sports.png differ
diff --git a/public/images/emoji/twitter/memo.png b/public/images/emoji/twitter/memo.png
new file mode 100644
index 00000000000..9cefdba7eb0
Binary files /dev/null and b/public/images/emoji/twitter/memo.png differ
diff --git a/public/images/emoji/twitter/men_wrestling.png b/public/images/emoji/twitter/men_wrestling.png
new file mode 100644
index 00000000000..ab63e2f4f0f
Binary files /dev/null and b/public/images/emoji/twitter/men_wrestling.png differ
diff --git a/public/images/emoji/twitter/menorah.png b/public/images/emoji/twitter/menorah.png
index bb7276c32ea..fe2a128793a 100644
Binary files a/public/images/emoji/twitter/menorah.png and b/public/images/emoji/twitter/menorah.png differ
diff --git a/public/images/emoji/twitter/merperson.png b/public/images/emoji/twitter/merperson.png
new file mode 100644
index 00000000000..ee1b999e0dd
Binary files /dev/null and b/public/images/emoji/twitter/merperson.png differ
diff --git a/public/images/emoji/twitter/merperson/2.png b/public/images/emoji/twitter/merperson/2.png
new file mode 100644
index 00000000000..b97fbf42e35
Binary files /dev/null and b/public/images/emoji/twitter/merperson/2.png differ
diff --git a/public/images/emoji/twitter/merperson/3.png b/public/images/emoji/twitter/merperson/3.png
new file mode 100644
index 00000000000..9079f60b81e
Binary files /dev/null and b/public/images/emoji/twitter/merperson/3.png differ
diff --git a/public/images/emoji/twitter/merperson/4.png b/public/images/emoji/twitter/merperson/4.png
new file mode 100644
index 00000000000..decc0b58929
Binary files /dev/null and b/public/images/emoji/twitter/merperson/4.png differ
diff --git a/public/images/emoji/twitter/merperson/5.png b/public/images/emoji/twitter/merperson/5.png
new file mode 100644
index 00000000000..e3e3e89cb16
Binary files /dev/null and b/public/images/emoji/twitter/merperson/5.png differ
diff --git a/public/images/emoji/twitter/merperson/6.png b/public/images/emoji/twitter/merperson/6.png
new file mode 100644
index 00000000000..5a5f36684e5
Binary files /dev/null and b/public/images/emoji/twitter/merperson/6.png differ
diff --git a/public/images/emoji/twitter/metal.png b/public/images/emoji/twitter/metal.png
index 788071275e3..72d987aadc3 100644
Binary files a/public/images/emoji/twitter/metal.png and b/public/images/emoji/twitter/metal.png differ
diff --git a/public/images/emoji/twitter/metal/2.png b/public/images/emoji/twitter/metal/2.png
new file mode 100644
index 00000000000..8d87aab277f
Binary files /dev/null and b/public/images/emoji/twitter/metal/2.png differ
diff --git a/public/images/emoji/twitter/metal/3.png b/public/images/emoji/twitter/metal/3.png
new file mode 100644
index 00000000000..39a19cd401f
Binary files /dev/null and b/public/images/emoji/twitter/metal/3.png differ
diff --git a/public/images/emoji/twitter/metal/4.png b/public/images/emoji/twitter/metal/4.png
new file mode 100644
index 00000000000..73bedb2c022
Binary files /dev/null and b/public/images/emoji/twitter/metal/4.png differ
diff --git a/public/images/emoji/twitter/metal/5.png b/public/images/emoji/twitter/metal/5.png
new file mode 100644
index 00000000000..36413ab8cfb
Binary files /dev/null and b/public/images/emoji/twitter/metal/5.png differ
diff --git a/public/images/emoji/twitter/metal/6.png b/public/images/emoji/twitter/metal/6.png
new file mode 100644
index 00000000000..1cb1b661b95
Binary files /dev/null and b/public/images/emoji/twitter/metal/6.png differ
diff --git a/public/images/emoji/twitter/mexico.png b/public/images/emoji/twitter/mexico.png
new file mode 100644
index 00000000000..95e838852b4
Binary files /dev/null and b/public/images/emoji/twitter/mexico.png differ
diff --git a/public/images/emoji/twitter/micronesia.png b/public/images/emoji/twitter/micronesia.png
new file mode 100644
index 00000000000..549d03fdc7c
Binary files /dev/null and b/public/images/emoji/twitter/micronesia.png differ
diff --git a/public/images/emoji/twitter/microphone.png b/public/images/emoji/twitter/microphone.png
index 20e7ca5be3e..bb4de707154 100644
Binary files a/public/images/emoji/twitter/microphone.png and b/public/images/emoji/twitter/microphone.png differ
diff --git a/public/images/emoji/twitter/middle_finger/2.png b/public/images/emoji/twitter/middle_finger/2.png
new file mode 100644
index 00000000000..992338bb2b6
Binary files /dev/null and b/public/images/emoji/twitter/middle_finger/2.png differ
diff --git a/public/images/emoji/twitter/middle_finger/3.png b/public/images/emoji/twitter/middle_finger/3.png
new file mode 100644
index 00000000000..aadc06129fe
Binary files /dev/null and b/public/images/emoji/twitter/middle_finger/3.png differ
diff --git a/public/images/emoji/twitter/middle_finger/4.png b/public/images/emoji/twitter/middle_finger/4.png
new file mode 100644
index 00000000000..8ad10be1169
Binary files /dev/null and b/public/images/emoji/twitter/middle_finger/4.png differ
diff --git a/public/images/emoji/twitter/middle_finger/5.png b/public/images/emoji/twitter/middle_finger/5.png
new file mode 100644
index 00000000000..695c4a6cb9c
Binary files /dev/null and b/public/images/emoji/twitter/middle_finger/5.png differ
diff --git a/public/images/emoji/twitter/middle_finger/6.png b/public/images/emoji/twitter/middle_finger/6.png
new file mode 100644
index 00000000000..3457e01312c
Binary files /dev/null and b/public/images/emoji/twitter/middle_finger/6.png differ
diff --git a/public/images/emoji/twitter/milk_glass.png b/public/images/emoji/twitter/milk_glass.png
new file mode 100644
index 00000000000..d2de8252bba
Binary files /dev/null and b/public/images/emoji/twitter/milk_glass.png differ
diff --git a/public/images/emoji/twitter/moldova.png b/public/images/emoji/twitter/moldova.png
new file mode 100644
index 00000000000..d4463a01473
Binary files /dev/null and b/public/images/emoji/twitter/moldova.png differ
diff --git a/public/images/emoji/twitter/monaco.png b/public/images/emoji/twitter/monaco.png
new file mode 100644
index 00000000000..17833f535af
Binary files /dev/null and b/public/images/emoji/twitter/monaco.png differ
diff --git a/public/images/emoji/twitter/money_mouth.png b/public/images/emoji/twitter/money_mouth.png
index ef52b6424c8..cd2459518eb 100644
Binary files a/public/images/emoji/twitter/money_mouth.png and b/public/images/emoji/twitter/money_mouth.png differ
diff --git a/public/images/emoji/twitter/money_mouth_face.png b/public/images/emoji/twitter/money_mouth_face.png
index ef52b6424c8..cd2459518eb 100644
Binary files a/public/images/emoji/twitter/money_mouth_face.png and b/public/images/emoji/twitter/money_mouth_face.png differ
diff --git a/public/images/emoji/twitter/money_with_wings.png b/public/images/emoji/twitter/money_with_wings.png
index 4761d016550..53121e555ae 100644
Binary files a/public/images/emoji/twitter/money_with_wings.png and b/public/images/emoji/twitter/money_with_wings.png differ
diff --git a/public/images/emoji/twitter/mongolia.png b/public/images/emoji/twitter/mongolia.png
new file mode 100644
index 00000000000..cf978945085
Binary files /dev/null and b/public/images/emoji/twitter/mongolia.png differ
diff --git a/public/images/emoji/twitter/montenegro.png b/public/images/emoji/twitter/montenegro.png
new file mode 100644
index 00000000000..7cbd07cef3c
Binary files /dev/null and b/public/images/emoji/twitter/montenegro.png differ
diff --git a/public/images/emoji/twitter/montserrat.png b/public/images/emoji/twitter/montserrat.png
new file mode 100644
index 00000000000..28712de519d
Binary files /dev/null and b/public/images/emoji/twitter/montserrat.png differ
diff --git a/public/images/emoji/twitter/moon.png b/public/images/emoji/twitter/moon.png
new file mode 100644
index 00000000000..826e38b1b3a
Binary files /dev/null and b/public/images/emoji/twitter/moon.png differ
diff --git a/public/images/emoji/twitter/morocco.png b/public/images/emoji/twitter/morocco.png
new file mode 100644
index 00000000000..7f16d0a66de
Binary files /dev/null and b/public/images/emoji/twitter/morocco.png differ
diff --git a/public/images/emoji/twitter/motor_boat.png b/public/images/emoji/twitter/motor_boat.png
new file mode 100644
index 00000000000..3eba365766f
Binary files /dev/null and b/public/images/emoji/twitter/motor_boat.png differ
diff --git a/public/images/emoji/twitter/motor_scooter.png b/public/images/emoji/twitter/motor_scooter.png
new file mode 100644
index 00000000000..b9659e99a3e
Binary files /dev/null and b/public/images/emoji/twitter/motor_scooter.png differ
diff --git a/public/images/emoji/twitter/motorcycle.png b/public/images/emoji/twitter/motorcycle.png
index 2c7b22a423d..ba7fb373bad 100644
Binary files a/public/images/emoji/twitter/motorcycle.png and b/public/images/emoji/twitter/motorcycle.png differ
diff --git a/public/images/emoji/twitter/motorway.png b/public/images/emoji/twitter/motorway.png
index 84328c865dc..2d5622664b6 100644
Binary files a/public/images/emoji/twitter/motorway.png and b/public/images/emoji/twitter/motorway.png differ
diff --git a/public/images/emoji/twitter/mountain_bicyclist.png b/public/images/emoji/twitter/mountain_bicyclist.png
index f0bc0bf7e79..57a9ff5b9ea 100644
Binary files a/public/images/emoji/twitter/mountain_bicyclist.png and b/public/images/emoji/twitter/mountain_bicyclist.png differ
diff --git a/public/images/emoji/twitter/mountain_bicyclist/2.png b/public/images/emoji/twitter/mountain_bicyclist/2.png
new file mode 100644
index 00000000000..1e1a7ef9311
Binary files /dev/null and b/public/images/emoji/twitter/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/twitter/mountain_bicyclist/3.png b/public/images/emoji/twitter/mountain_bicyclist/3.png
new file mode 100644
index 00000000000..ee2192aa47b
Binary files /dev/null and b/public/images/emoji/twitter/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/twitter/mountain_bicyclist/4.png b/public/images/emoji/twitter/mountain_bicyclist/4.png
new file mode 100644
index 00000000000..556c1d9b21f
Binary files /dev/null and b/public/images/emoji/twitter/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/twitter/mountain_bicyclist/5.png b/public/images/emoji/twitter/mountain_bicyclist/5.png
new file mode 100644
index 00000000000..7fd812e24d9
Binary files /dev/null and b/public/images/emoji/twitter/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/twitter/mountain_bicyclist/6.png b/public/images/emoji/twitter/mountain_bicyclist/6.png
new file mode 100644
index 00000000000..e24f516b290
Binary files /dev/null and b/public/images/emoji/twitter/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_man.png b/public/images/emoji/twitter/mountain_biking_man.png
new file mode 100644
index 00000000000..57a9ff5b9ea
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_man.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_man/2.png b/public/images/emoji/twitter/mountain_biking_man/2.png
new file mode 100644
index 00000000000..1e1a7ef9311
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_man/3.png b/public/images/emoji/twitter/mountain_biking_man/3.png
new file mode 100644
index 00000000000..ee2192aa47b
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_man/4.png b/public/images/emoji/twitter/mountain_biking_man/4.png
new file mode 100644
index 00000000000..556c1d9b21f
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_man/5.png b/public/images/emoji/twitter/mountain_biking_man/5.png
new file mode 100644
index 00000000000..7fd812e24d9
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_man/6.png b/public/images/emoji/twitter/mountain_biking_man/6.png
new file mode 100644
index 00000000000..e24f516b290
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_woman.png b/public/images/emoji/twitter/mountain_biking_woman.png
new file mode 100644
index 00000000000..f752e9cdf3c
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_woman.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_woman/2.png b/public/images/emoji/twitter/mountain_biking_woman/2.png
new file mode 100644
index 00000000000..78e8c2577b8
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_woman/3.png b/public/images/emoji/twitter/mountain_biking_woman/3.png
new file mode 100644
index 00000000000..2e4e5a891d4
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_woman/4.png b/public/images/emoji/twitter/mountain_biking_woman/4.png
new file mode 100644
index 00000000000..ee9fd92c8d7
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_woman/5.png b/public/images/emoji/twitter/mountain_biking_woman/5.png
new file mode 100644
index 00000000000..6f663ca4c08
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/twitter/mountain_biking_woman/6.png b/public/images/emoji/twitter/mountain_biking_woman/6.png
new file mode 100644
index 00000000000..f49e7054c91
Binary files /dev/null and b/public/images/emoji/twitter/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/twitter/mozambique.png b/public/images/emoji/twitter/mozambique.png
new file mode 100644
index 00000000000..07d5cd56f0e
Binary files /dev/null and b/public/images/emoji/twitter/mozambique.png differ
diff --git a/public/images/emoji/twitter/mrs_claus.png b/public/images/emoji/twitter/mrs_claus.png
new file mode 100644
index 00000000000..1923fbd8e93
Binary files /dev/null and b/public/images/emoji/twitter/mrs_claus.png differ
diff --git a/public/images/emoji/twitter/mrs_claus/2.png b/public/images/emoji/twitter/mrs_claus/2.png
new file mode 100644
index 00000000000..a6e57fc30b2
Binary files /dev/null and b/public/images/emoji/twitter/mrs_claus/2.png differ
diff --git a/public/images/emoji/twitter/mrs_claus/3.png b/public/images/emoji/twitter/mrs_claus/3.png
new file mode 100644
index 00000000000..48e81212564
Binary files /dev/null and b/public/images/emoji/twitter/mrs_claus/3.png differ
diff --git a/public/images/emoji/twitter/mrs_claus/4.png b/public/images/emoji/twitter/mrs_claus/4.png
new file mode 100644
index 00000000000..cdefbc93405
Binary files /dev/null and b/public/images/emoji/twitter/mrs_claus/4.png differ
diff --git a/public/images/emoji/twitter/mrs_claus/5.png b/public/images/emoji/twitter/mrs_claus/5.png
new file mode 100644
index 00000000000..de7de0327ab
Binary files /dev/null and b/public/images/emoji/twitter/mrs_claus/5.png differ
diff --git a/public/images/emoji/twitter/mrs_claus/6.png b/public/images/emoji/twitter/mrs_claus/6.png
new file mode 100644
index 00000000000..25324ab4205
Binary files /dev/null and b/public/images/emoji/twitter/mrs_claus/6.png differ
diff --git a/public/images/emoji/twitter/muscle/2.png b/public/images/emoji/twitter/muscle/2.png
new file mode 100644
index 00000000000..9213660c025
Binary files /dev/null and b/public/images/emoji/twitter/muscle/2.png differ
diff --git a/public/images/emoji/twitter/muscle/3.png b/public/images/emoji/twitter/muscle/3.png
new file mode 100644
index 00000000000..8fb22bc29ea
Binary files /dev/null and b/public/images/emoji/twitter/muscle/3.png differ
diff --git a/public/images/emoji/twitter/muscle/4.png b/public/images/emoji/twitter/muscle/4.png
new file mode 100644
index 00000000000..3a2bd0bb5dd
Binary files /dev/null and b/public/images/emoji/twitter/muscle/4.png differ
diff --git a/public/images/emoji/twitter/muscle/5.png b/public/images/emoji/twitter/muscle/5.png
new file mode 100644
index 00000000000..812a7372cd4
Binary files /dev/null and b/public/images/emoji/twitter/muscle/5.png differ
diff --git a/public/images/emoji/twitter/muscle/6.png b/public/images/emoji/twitter/muscle/6.png
new file mode 100644
index 00000000000..41666caafa0
Binary files /dev/null and b/public/images/emoji/twitter/muscle/6.png differ
diff --git a/public/images/emoji/twitter/myanmar.png b/public/images/emoji/twitter/myanmar.png
new file mode 100644
index 00000000000..345829e2a3e
Binary files /dev/null and b/public/images/emoji/twitter/myanmar.png differ
diff --git a/public/images/emoji/twitter/nail_care/2.png b/public/images/emoji/twitter/nail_care/2.png
new file mode 100644
index 00000000000..afb85f1b1b7
Binary files /dev/null and b/public/images/emoji/twitter/nail_care/2.png differ
diff --git a/public/images/emoji/twitter/nail_care/3.png b/public/images/emoji/twitter/nail_care/3.png
new file mode 100644
index 00000000000..d16e8095559
Binary files /dev/null and b/public/images/emoji/twitter/nail_care/3.png differ
diff --git a/public/images/emoji/twitter/nail_care/4.png b/public/images/emoji/twitter/nail_care/4.png
new file mode 100644
index 00000000000..e6c2cbe329f
Binary files /dev/null and b/public/images/emoji/twitter/nail_care/4.png differ
diff --git a/public/images/emoji/twitter/nail_care/5.png b/public/images/emoji/twitter/nail_care/5.png
new file mode 100644
index 00000000000..88c57c45cd4
Binary files /dev/null and b/public/images/emoji/twitter/nail_care/5.png differ
diff --git a/public/images/emoji/twitter/nail_care/6.png b/public/images/emoji/twitter/nail_care/6.png
new file mode 100644
index 00000000000..e955eecd001
Binary files /dev/null and b/public/images/emoji/twitter/nail_care/6.png differ
diff --git a/public/images/emoji/twitter/namibia.png b/public/images/emoji/twitter/namibia.png
new file mode 100644
index 00000000000..f505b371fd5
Binary files /dev/null and b/public/images/emoji/twitter/namibia.png differ
diff --git a/public/images/emoji/twitter/nauru.png b/public/images/emoji/twitter/nauru.png
new file mode 100644
index 00000000000..443c1a5e935
Binary files /dev/null and b/public/images/emoji/twitter/nauru.png differ
diff --git a/public/images/emoji/twitter/nauseated_face.png b/public/images/emoji/twitter/nauseated_face.png
new file mode 100644
index 00000000000..0ec48392c20
Binary files /dev/null and b/public/images/emoji/twitter/nauseated_face.png differ
diff --git a/public/images/emoji/twitter/nepal.png b/public/images/emoji/twitter/nepal.png
new file mode 100644
index 00000000000..cd57822d801
Binary files /dev/null and b/public/images/emoji/twitter/nepal.png differ
diff --git a/public/images/emoji/twitter/nerd.png b/public/images/emoji/twitter/nerd.png
index 6b546277d30..b844baf25b2 100644
Binary files a/public/images/emoji/twitter/nerd.png and b/public/images/emoji/twitter/nerd.png differ
diff --git a/public/images/emoji/twitter/nerd_face.png b/public/images/emoji/twitter/nerd_face.png
index 6b546277d30..b844baf25b2 100644
Binary files a/public/images/emoji/twitter/nerd_face.png and b/public/images/emoji/twitter/nerd_face.png differ
diff --git a/public/images/emoji/twitter/netherlands.png b/public/images/emoji/twitter/netherlands.png
new file mode 100644
index 00000000000..1e37d79d5d4
Binary files /dev/null and b/public/images/emoji/twitter/netherlands.png differ
diff --git a/public/images/emoji/twitter/new_caledonia.png b/public/images/emoji/twitter/new_caledonia.png
new file mode 100644
index 00000000000..45914c48c7d
Binary files /dev/null and b/public/images/emoji/twitter/new_caledonia.png differ
diff --git a/public/images/emoji/twitter/new_moon_with_face.png b/public/images/emoji/twitter/new_moon_with_face.png
index e16a5a5afc2..f4aa3f33207 100644
Binary files a/public/images/emoji/twitter/new_moon_with_face.png and b/public/images/emoji/twitter/new_moon_with_face.png differ
diff --git a/public/images/emoji/twitter/new_zealand.png b/public/images/emoji/twitter/new_zealand.png
new file mode 100644
index 00000000000..9ab60df7b72
Binary files /dev/null and b/public/images/emoji/twitter/new_zealand.png differ
diff --git a/public/images/emoji/twitter/newspaper_roll.png b/public/images/emoji/twitter/newspaper_roll.png
new file mode 100644
index 00000000000..052dcce75f0
Binary files /dev/null and b/public/images/emoji/twitter/newspaper_roll.png differ
diff --git a/public/images/emoji/twitter/next_track_button.png b/public/images/emoji/twitter/next_track_button.png
new file mode 100644
index 00000000000..13953da5d7f
Binary files /dev/null and b/public/images/emoji/twitter/next_track_button.png differ
diff --git a/public/images/emoji/twitter/nicaragua.png b/public/images/emoji/twitter/nicaragua.png
new file mode 100644
index 00000000000..e405151e2d1
Binary files /dev/null and b/public/images/emoji/twitter/nicaragua.png differ
diff --git a/public/images/emoji/twitter/niger.png b/public/images/emoji/twitter/niger.png
new file mode 100644
index 00000000000..fb6c4a4d372
Binary files /dev/null and b/public/images/emoji/twitter/niger.png differ
diff --git a/public/images/emoji/twitter/nigeria.png b/public/images/emoji/twitter/nigeria.png
new file mode 100644
index 00000000000..23c9d9a7627
Binary files /dev/null and b/public/images/emoji/twitter/nigeria.png differ
diff --git a/public/images/emoji/twitter/nine.png b/public/images/emoji/twitter/nine.png
index 1e425523f85..ff2bfa73c3d 100644
Binary files a/public/images/emoji/twitter/nine.png and b/public/images/emoji/twitter/nine.png differ
diff --git a/public/images/emoji/twitter/niue.png b/public/images/emoji/twitter/niue.png
new file mode 100644
index 00000000000..daaa26cc166
Binary files /dev/null and b/public/images/emoji/twitter/niue.png differ
diff --git a/public/images/emoji/twitter/no_bicycles.png b/public/images/emoji/twitter/no_bicycles.png
index a3f3104aab7..06b01f625a7 100644
Binary files a/public/images/emoji/twitter/no_bicycles.png and b/public/images/emoji/twitter/no_bicycles.png differ
diff --git a/public/images/emoji/twitter/no_good.png b/public/images/emoji/twitter/no_good.png
index f388e6454ab..8e7851dcce6 100644
Binary files a/public/images/emoji/twitter/no_good.png and b/public/images/emoji/twitter/no_good.png differ
diff --git a/public/images/emoji/twitter/no_good/2.png b/public/images/emoji/twitter/no_good/2.png
new file mode 100644
index 00000000000..7293f799222
Binary files /dev/null and b/public/images/emoji/twitter/no_good/2.png differ
diff --git a/public/images/emoji/twitter/no_good/3.png b/public/images/emoji/twitter/no_good/3.png
new file mode 100644
index 00000000000..e1aca08cc40
Binary files /dev/null and b/public/images/emoji/twitter/no_good/3.png differ
diff --git a/public/images/emoji/twitter/no_good/4.png b/public/images/emoji/twitter/no_good/4.png
new file mode 100644
index 00000000000..e9e36b07d89
Binary files /dev/null and b/public/images/emoji/twitter/no_good/4.png differ
diff --git a/public/images/emoji/twitter/no_good/5.png b/public/images/emoji/twitter/no_good/5.png
new file mode 100644
index 00000000000..5fc7c201708
Binary files /dev/null and b/public/images/emoji/twitter/no_good/5.png differ
diff --git a/public/images/emoji/twitter/no_good/6.png b/public/images/emoji/twitter/no_good/6.png
new file mode 100644
index 00000000000..b32f8a97d52
Binary files /dev/null and b/public/images/emoji/twitter/no_good/6.png differ
diff --git a/public/images/emoji/twitter/no_good_man.png b/public/images/emoji/twitter/no_good_man.png
new file mode 100644
index 00000000000..482a4698d1e
Binary files /dev/null and b/public/images/emoji/twitter/no_good_man.png differ
diff --git a/public/images/emoji/twitter/no_good_man/2.png b/public/images/emoji/twitter/no_good_man/2.png
new file mode 100644
index 00000000000..faf146004d6
Binary files /dev/null and b/public/images/emoji/twitter/no_good_man/2.png differ
diff --git a/public/images/emoji/twitter/no_good_man/3.png b/public/images/emoji/twitter/no_good_man/3.png
new file mode 100644
index 00000000000..27ba65f98b2
Binary files /dev/null and b/public/images/emoji/twitter/no_good_man/3.png differ
diff --git a/public/images/emoji/twitter/no_good_man/4.png b/public/images/emoji/twitter/no_good_man/4.png
new file mode 100644
index 00000000000..cb7608b4e9c
Binary files /dev/null and b/public/images/emoji/twitter/no_good_man/4.png differ
diff --git a/public/images/emoji/twitter/no_good_man/5.png b/public/images/emoji/twitter/no_good_man/5.png
new file mode 100644
index 00000000000..6498b6f0827
Binary files /dev/null and b/public/images/emoji/twitter/no_good_man/5.png differ
diff --git a/public/images/emoji/twitter/no_good_man/6.png b/public/images/emoji/twitter/no_good_man/6.png
new file mode 100644
index 00000000000..0bac0f4cd47
Binary files /dev/null and b/public/images/emoji/twitter/no_good_man/6.png differ
diff --git a/public/images/emoji/twitter/no_good_woman.png b/public/images/emoji/twitter/no_good_woman.png
new file mode 100644
index 00000000000..8e7851dcce6
Binary files /dev/null and b/public/images/emoji/twitter/no_good_woman.png differ
diff --git a/public/images/emoji/twitter/no_good_woman/2.png b/public/images/emoji/twitter/no_good_woman/2.png
new file mode 100644
index 00000000000..7293f799222
Binary files /dev/null and b/public/images/emoji/twitter/no_good_woman/2.png differ
diff --git a/public/images/emoji/twitter/no_good_woman/3.png b/public/images/emoji/twitter/no_good_woman/3.png
new file mode 100644
index 00000000000..e1aca08cc40
Binary files /dev/null and b/public/images/emoji/twitter/no_good_woman/3.png differ
diff --git a/public/images/emoji/twitter/no_good_woman/4.png b/public/images/emoji/twitter/no_good_woman/4.png
new file mode 100644
index 00000000000..e9e36b07d89
Binary files /dev/null and b/public/images/emoji/twitter/no_good_woman/4.png differ
diff --git a/public/images/emoji/twitter/no_good_woman/5.png b/public/images/emoji/twitter/no_good_woman/5.png
new file mode 100644
index 00000000000..5fc7c201708
Binary files /dev/null and b/public/images/emoji/twitter/no_good_woman/5.png differ
diff --git a/public/images/emoji/twitter/no_good_woman/6.png b/public/images/emoji/twitter/no_good_woman/6.png
new file mode 100644
index 00000000000..b32f8a97d52
Binary files /dev/null and b/public/images/emoji/twitter/no_good_woman/6.png differ
diff --git a/public/images/emoji/twitter/no_smoking.png b/public/images/emoji/twitter/no_smoking.png
index f60796c680e..a89ddf2dbfa 100644
Binary files a/public/images/emoji/twitter/no_smoking.png and b/public/images/emoji/twitter/no_smoking.png differ
diff --git a/public/images/emoji/twitter/norfolk_island.png b/public/images/emoji/twitter/norfolk_island.png
new file mode 100644
index 00000000000..574acba1009
Binary files /dev/null and b/public/images/emoji/twitter/norfolk_island.png differ
diff --git a/public/images/emoji/twitter/north_korea.png b/public/images/emoji/twitter/north_korea.png
new file mode 100644
index 00000000000..d15d10aecec
Binary files /dev/null and b/public/images/emoji/twitter/north_korea.png differ
diff --git a/public/images/emoji/twitter/northern_mariana_islands.png b/public/images/emoji/twitter/northern_mariana_islands.png
new file mode 100644
index 00000000000..962a6171b9c
Binary files /dev/null and b/public/images/emoji/twitter/northern_mariana_islands.png differ
diff --git a/public/images/emoji/twitter/norway.png b/public/images/emoji/twitter/norway.png
new file mode 100644
index 00000000000..004a11d8308
Binary files /dev/null and b/public/images/emoji/twitter/norway.png differ
diff --git a/public/images/emoji/twitter/nose/2.png b/public/images/emoji/twitter/nose/2.png
new file mode 100644
index 00000000000..f3b98d3f93d
Binary files /dev/null and b/public/images/emoji/twitter/nose/2.png differ
diff --git a/public/images/emoji/twitter/nose/3.png b/public/images/emoji/twitter/nose/3.png
new file mode 100644
index 00000000000..f2b1542b1a8
Binary files /dev/null and b/public/images/emoji/twitter/nose/3.png differ
diff --git a/public/images/emoji/twitter/nose/4.png b/public/images/emoji/twitter/nose/4.png
new file mode 100644
index 00000000000..3d3c694a967
Binary files /dev/null and b/public/images/emoji/twitter/nose/4.png differ
diff --git a/public/images/emoji/twitter/nose/5.png b/public/images/emoji/twitter/nose/5.png
new file mode 100644
index 00000000000..dda7ddd74cc
Binary files /dev/null and b/public/images/emoji/twitter/nose/5.png differ
diff --git a/public/images/emoji/twitter/nose/6.png b/public/images/emoji/twitter/nose/6.png
new file mode 100644
index 00000000000..eaebaeec5c8
Binary files /dev/null and b/public/images/emoji/twitter/nose/6.png differ
diff --git a/public/images/emoji/twitter/ok_hand/2.png b/public/images/emoji/twitter/ok_hand/2.png
new file mode 100644
index 00000000000..119e3424f20
Binary files /dev/null and b/public/images/emoji/twitter/ok_hand/2.png differ
diff --git a/public/images/emoji/twitter/ok_hand/3.png b/public/images/emoji/twitter/ok_hand/3.png
new file mode 100644
index 00000000000..ed25cd13771
Binary files /dev/null and b/public/images/emoji/twitter/ok_hand/3.png differ
diff --git a/public/images/emoji/twitter/ok_hand/4.png b/public/images/emoji/twitter/ok_hand/4.png
new file mode 100644
index 00000000000..81ea711e8c8
Binary files /dev/null and b/public/images/emoji/twitter/ok_hand/4.png differ
diff --git a/public/images/emoji/twitter/ok_hand/5.png b/public/images/emoji/twitter/ok_hand/5.png
new file mode 100644
index 00000000000..3dfb147dd82
Binary files /dev/null and b/public/images/emoji/twitter/ok_hand/5.png differ
diff --git a/public/images/emoji/twitter/ok_hand/6.png b/public/images/emoji/twitter/ok_hand/6.png
new file mode 100644
index 00000000000..c8f0791806e
Binary files /dev/null and b/public/images/emoji/twitter/ok_hand/6.png differ
diff --git a/public/images/emoji/twitter/ok_man.png b/public/images/emoji/twitter/ok_man.png
new file mode 100644
index 00000000000..a409be9d6e3
Binary files /dev/null and b/public/images/emoji/twitter/ok_man.png differ
diff --git a/public/images/emoji/twitter/ok_man/2.png b/public/images/emoji/twitter/ok_man/2.png
new file mode 100644
index 00000000000..a053dbd980e
Binary files /dev/null and b/public/images/emoji/twitter/ok_man/2.png differ
diff --git a/public/images/emoji/twitter/ok_man/3.png b/public/images/emoji/twitter/ok_man/3.png
new file mode 100644
index 00000000000..e16633321f5
Binary files /dev/null and b/public/images/emoji/twitter/ok_man/3.png differ
diff --git a/public/images/emoji/twitter/ok_man/4.png b/public/images/emoji/twitter/ok_man/4.png
new file mode 100644
index 00000000000..4634976b5e4
Binary files /dev/null and b/public/images/emoji/twitter/ok_man/4.png differ
diff --git a/public/images/emoji/twitter/ok_man/5.png b/public/images/emoji/twitter/ok_man/5.png
new file mode 100644
index 00000000000..f0003c09eb6
Binary files /dev/null and b/public/images/emoji/twitter/ok_man/5.png differ
diff --git a/public/images/emoji/twitter/ok_man/6.png b/public/images/emoji/twitter/ok_man/6.png
new file mode 100644
index 00000000000..39c7357546e
Binary files /dev/null and b/public/images/emoji/twitter/ok_man/6.png differ
diff --git a/public/images/emoji/twitter/ok_woman.png b/public/images/emoji/twitter/ok_woman.png
index d81cd306343..2cdb61d84d2 100644
Binary files a/public/images/emoji/twitter/ok_woman.png and b/public/images/emoji/twitter/ok_woman.png differ
diff --git a/public/images/emoji/twitter/ok_woman/2.png b/public/images/emoji/twitter/ok_woman/2.png
new file mode 100644
index 00000000000..d83e330d980
Binary files /dev/null and b/public/images/emoji/twitter/ok_woman/2.png differ
diff --git a/public/images/emoji/twitter/ok_woman/3.png b/public/images/emoji/twitter/ok_woman/3.png
new file mode 100644
index 00000000000..24843bf1fcf
Binary files /dev/null and b/public/images/emoji/twitter/ok_woman/3.png differ
diff --git a/public/images/emoji/twitter/ok_woman/4.png b/public/images/emoji/twitter/ok_woman/4.png
new file mode 100644
index 00000000000..2c5502b0ece
Binary files /dev/null and b/public/images/emoji/twitter/ok_woman/4.png differ
diff --git a/public/images/emoji/twitter/ok_woman/5.png b/public/images/emoji/twitter/ok_woman/5.png
new file mode 100644
index 00000000000..b0596ed0424
Binary files /dev/null and b/public/images/emoji/twitter/ok_woman/5.png differ
diff --git a/public/images/emoji/twitter/ok_woman/6.png b/public/images/emoji/twitter/ok_woman/6.png
new file mode 100644
index 00000000000..285153bcb45
Binary files /dev/null and b/public/images/emoji/twitter/ok_woman/6.png differ
diff --git a/public/images/emoji/twitter/older_adult.png b/public/images/emoji/twitter/older_adult.png
new file mode 100644
index 00000000000..8796829b876
Binary files /dev/null and b/public/images/emoji/twitter/older_adult.png differ
diff --git a/public/images/emoji/twitter/older_adult/2.png b/public/images/emoji/twitter/older_adult/2.png
new file mode 100644
index 00000000000..b36f41960e7
Binary files /dev/null and b/public/images/emoji/twitter/older_adult/2.png differ
diff --git a/public/images/emoji/twitter/older_adult/3.png b/public/images/emoji/twitter/older_adult/3.png
new file mode 100644
index 00000000000..dc1441fea56
Binary files /dev/null and b/public/images/emoji/twitter/older_adult/3.png differ
diff --git a/public/images/emoji/twitter/older_adult/4.png b/public/images/emoji/twitter/older_adult/4.png
new file mode 100644
index 00000000000..abc19e06c74
Binary files /dev/null and b/public/images/emoji/twitter/older_adult/4.png differ
diff --git a/public/images/emoji/twitter/older_adult/5.png b/public/images/emoji/twitter/older_adult/5.png
new file mode 100644
index 00000000000..c90549f6813
Binary files /dev/null and b/public/images/emoji/twitter/older_adult/5.png differ
diff --git a/public/images/emoji/twitter/older_adult/6.png b/public/images/emoji/twitter/older_adult/6.png
new file mode 100644
index 00000000000..5152c9c1a3e
Binary files /dev/null and b/public/images/emoji/twitter/older_adult/6.png differ
diff --git a/public/images/emoji/twitter/older_man/2.png b/public/images/emoji/twitter/older_man/2.png
new file mode 100644
index 00000000000..665bce6c46e
Binary files /dev/null and b/public/images/emoji/twitter/older_man/2.png differ
diff --git a/public/images/emoji/twitter/older_man/3.png b/public/images/emoji/twitter/older_man/3.png
new file mode 100644
index 00000000000..98802367ce2
Binary files /dev/null and b/public/images/emoji/twitter/older_man/3.png differ
diff --git a/public/images/emoji/twitter/older_man/4.png b/public/images/emoji/twitter/older_man/4.png
new file mode 100644
index 00000000000..f17d204e7f1
Binary files /dev/null and b/public/images/emoji/twitter/older_man/4.png differ
diff --git a/public/images/emoji/twitter/older_man/5.png b/public/images/emoji/twitter/older_man/5.png
new file mode 100644
index 00000000000..afa38712984
Binary files /dev/null and b/public/images/emoji/twitter/older_man/5.png differ
diff --git a/public/images/emoji/twitter/older_man/6.png b/public/images/emoji/twitter/older_man/6.png
new file mode 100644
index 00000000000..9443440bf8c
Binary files /dev/null and b/public/images/emoji/twitter/older_man/6.png differ
diff --git a/public/images/emoji/twitter/older_woman.png b/public/images/emoji/twitter/older_woman.png
index fb6a0cc690e..8fe6dc8f16a 100644
Binary files a/public/images/emoji/twitter/older_woman.png and b/public/images/emoji/twitter/older_woman.png differ
diff --git a/public/images/emoji/twitter/older_woman/2.png b/public/images/emoji/twitter/older_woman/2.png
new file mode 100644
index 00000000000..7cee24d816e
Binary files /dev/null and b/public/images/emoji/twitter/older_woman/2.png differ
diff --git a/public/images/emoji/twitter/older_woman/3.png b/public/images/emoji/twitter/older_woman/3.png
new file mode 100644
index 00000000000..033fd6c050a
Binary files /dev/null and b/public/images/emoji/twitter/older_woman/3.png differ
diff --git a/public/images/emoji/twitter/older_woman/4.png b/public/images/emoji/twitter/older_woman/4.png
new file mode 100644
index 00000000000..b225a2163f9
Binary files /dev/null and b/public/images/emoji/twitter/older_woman/4.png differ
diff --git a/public/images/emoji/twitter/older_woman/5.png b/public/images/emoji/twitter/older_woman/5.png
new file mode 100644
index 00000000000..b55baa79938
Binary files /dev/null and b/public/images/emoji/twitter/older_woman/5.png differ
diff --git a/public/images/emoji/twitter/older_woman/6.png b/public/images/emoji/twitter/older_woman/6.png
new file mode 100644
index 00000000000..abb1c09fb82
Binary files /dev/null and b/public/images/emoji/twitter/older_woman/6.png differ
diff --git a/public/images/emoji/twitter/om.png b/public/images/emoji/twitter/om.png
new file mode 100644
index 00000000000..bcd7113141c
Binary files /dev/null and b/public/images/emoji/twitter/om.png differ
diff --git a/public/images/emoji/twitter/oman.png b/public/images/emoji/twitter/oman.png
new file mode 100644
index 00000000000..59e0df087e4
Binary files /dev/null and b/public/images/emoji/twitter/oman.png differ
diff --git a/public/images/emoji/twitter/on.png b/public/images/emoji/twitter/on.png
index cb0d26f5a9c..af2da0876d7 100644
Binary files a/public/images/emoji/twitter/on.png and b/public/images/emoji/twitter/on.png differ
diff --git a/public/images/emoji/twitter/oncoming_taxi.png b/public/images/emoji/twitter/oncoming_taxi.png
index c9043c238d1..20ac2e2a962 100644
Binary files a/public/images/emoji/twitter/oncoming_taxi.png and b/public/images/emoji/twitter/oncoming_taxi.png differ
diff --git a/public/images/emoji/twitter/one.png b/public/images/emoji/twitter/one.png
index 9369fcc06bd..9ebc934a30c 100644
Binary files a/public/images/emoji/twitter/one.png and b/public/images/emoji/twitter/one.png differ
diff --git a/public/images/emoji/twitter/open_book.png b/public/images/emoji/twitter/open_book.png
new file mode 100644
index 00000000000..6f220c4b0b9
Binary files /dev/null and b/public/images/emoji/twitter/open_book.png differ
diff --git a/public/images/emoji/twitter/open_hands/2.png b/public/images/emoji/twitter/open_hands/2.png
new file mode 100644
index 00000000000..59c9be18018
Binary files /dev/null and b/public/images/emoji/twitter/open_hands/2.png differ
diff --git a/public/images/emoji/twitter/open_hands/3.png b/public/images/emoji/twitter/open_hands/3.png
new file mode 100644
index 00000000000..e3c3b4d0e14
Binary files /dev/null and b/public/images/emoji/twitter/open_hands/3.png differ
diff --git a/public/images/emoji/twitter/open_hands/4.png b/public/images/emoji/twitter/open_hands/4.png
new file mode 100644
index 00000000000..b4d579904a6
Binary files /dev/null and b/public/images/emoji/twitter/open_hands/4.png differ
diff --git a/public/images/emoji/twitter/open_hands/5.png b/public/images/emoji/twitter/open_hands/5.png
new file mode 100644
index 00000000000..cb9823d24ff
Binary files /dev/null and b/public/images/emoji/twitter/open_hands/5.png differ
diff --git a/public/images/emoji/twitter/open_hands/6.png b/public/images/emoji/twitter/open_hands/6.png
new file mode 100644
index 00000000000..9d316e5ba55
Binary files /dev/null and b/public/images/emoji/twitter/open_hands/6.png differ
diff --git a/public/images/emoji/twitter/open_umbrella.png b/public/images/emoji/twitter/open_umbrella.png
new file mode 100644
index 00000000000..ec99aeb164e
Binary files /dev/null and b/public/images/emoji/twitter/open_umbrella.png differ
diff --git a/public/images/emoji/twitter/orange_heart.png b/public/images/emoji/twitter/orange_heart.png
new file mode 100644
index 00000000000..f217c930a74
Binary files /dev/null and b/public/images/emoji/twitter/orange_heart.png differ
diff --git a/public/images/emoji/twitter/owl.png b/public/images/emoji/twitter/owl.png
new file mode 100644
index 00000000000..905115e7122
Binary files /dev/null and b/public/images/emoji/twitter/owl.png differ
diff --git a/public/images/emoji/twitter/package.png b/public/images/emoji/twitter/package.png
index 10d438ca2fc..44189c349b3 100644
Binary files a/public/images/emoji/twitter/package.png and b/public/images/emoji/twitter/package.png differ
diff --git a/public/images/emoji/twitter/pakistan.png b/public/images/emoji/twitter/pakistan.png
new file mode 100644
index 00000000000..f4c74d1d49c
Binary files /dev/null and b/public/images/emoji/twitter/pakistan.png differ
diff --git a/public/images/emoji/twitter/palau.png b/public/images/emoji/twitter/palau.png
new file mode 100644
index 00000000000..69aace7555f
Binary files /dev/null and b/public/images/emoji/twitter/palau.png differ
diff --git a/public/images/emoji/twitter/palestinian_territories.png b/public/images/emoji/twitter/palestinian_territories.png
new file mode 100644
index 00000000000..2e4399d7627
Binary files /dev/null and b/public/images/emoji/twitter/palestinian_territories.png differ
diff --git a/public/images/emoji/twitter/palms_up_together.png b/public/images/emoji/twitter/palms_up_together.png
new file mode 100644
index 00000000000..fb66ba11c40
Binary files /dev/null and b/public/images/emoji/twitter/palms_up_together.png differ
diff --git a/public/images/emoji/twitter/palms_up_together/2.png b/public/images/emoji/twitter/palms_up_together/2.png
new file mode 100644
index 00000000000..6d9b2fc8ccd
Binary files /dev/null and b/public/images/emoji/twitter/palms_up_together/2.png differ
diff --git a/public/images/emoji/twitter/palms_up_together/3.png b/public/images/emoji/twitter/palms_up_together/3.png
new file mode 100644
index 00000000000..c5d52f5c7a7
Binary files /dev/null and b/public/images/emoji/twitter/palms_up_together/3.png differ
diff --git a/public/images/emoji/twitter/palms_up_together/4.png b/public/images/emoji/twitter/palms_up_together/4.png
new file mode 100644
index 00000000000..3d4288d10db
Binary files /dev/null and b/public/images/emoji/twitter/palms_up_together/4.png differ
diff --git a/public/images/emoji/twitter/palms_up_together/5.png b/public/images/emoji/twitter/palms_up_together/5.png
new file mode 100644
index 00000000000..6ff36c07cbd
Binary files /dev/null and b/public/images/emoji/twitter/palms_up_together/5.png differ
diff --git a/public/images/emoji/twitter/palms_up_together/6.png b/public/images/emoji/twitter/palms_up_together/6.png
new file mode 100644
index 00000000000..c25d42927d8
Binary files /dev/null and b/public/images/emoji/twitter/palms_up_together/6.png differ
diff --git a/public/images/emoji/twitter/panama.png b/public/images/emoji/twitter/panama.png
new file mode 100644
index 00000000000..2a564db4266
Binary files /dev/null and b/public/images/emoji/twitter/panama.png differ
diff --git a/public/images/emoji/twitter/pancakes.png b/public/images/emoji/twitter/pancakes.png
new file mode 100644
index 00000000000..ebd14eecd02
Binary files /dev/null and b/public/images/emoji/twitter/pancakes.png differ
diff --git a/public/images/emoji/twitter/panda_face.png b/public/images/emoji/twitter/panda_face.png
index 2b48135fdcd..24934af6502 100644
Binary files a/public/images/emoji/twitter/panda_face.png and b/public/images/emoji/twitter/panda_face.png differ
diff --git a/public/images/emoji/twitter/papua_new_guinea.png b/public/images/emoji/twitter/papua_new_guinea.png
new file mode 100644
index 00000000000..b449d67794a
Binary files /dev/null and b/public/images/emoji/twitter/papua_new_guinea.png differ
diff --git a/public/images/emoji/twitter/paraguay.png b/public/images/emoji/twitter/paraguay.png
new file mode 100644
index 00000000000..d9eab9434ce
Binary files /dev/null and b/public/images/emoji/twitter/paraguay.png differ
diff --git a/public/images/emoji/twitter/parasol_on_ground.png b/public/images/emoji/twitter/parasol_on_ground.png
new file mode 100644
index 00000000000..2bb23697b7f
Binary files /dev/null and b/public/images/emoji/twitter/parasol_on_ground.png differ
diff --git a/public/images/emoji/twitter/peanuts.png b/public/images/emoji/twitter/peanuts.png
new file mode 100644
index 00000000000..34f4eed2d5f
Binary files /dev/null and b/public/images/emoji/twitter/peanuts.png differ
diff --git a/public/images/emoji/twitter/pen.png b/public/images/emoji/twitter/pen.png
new file mode 100644
index 00000000000..6219ae26cc1
Binary files /dev/null and b/public/images/emoji/twitter/pen.png differ
diff --git a/public/images/emoji/twitter/pen_ballpoint.png b/public/images/emoji/twitter/pen_ballpoint.png
index 97d8c722a53..6219ae26cc1 100644
Binary files a/public/images/emoji/twitter/pen_ballpoint.png and b/public/images/emoji/twitter/pen_ballpoint.png differ
diff --git a/public/images/emoji/twitter/penguin.png b/public/images/emoji/twitter/penguin.png
index 81e227d7e0d..f0820a8c339 100644
Binary files a/public/images/emoji/twitter/penguin.png and b/public/images/emoji/twitter/penguin.png differ
diff --git a/public/images/emoji/twitter/person_climbing.png b/public/images/emoji/twitter/person_climbing.png
new file mode 100644
index 00000000000..d8a6229d6b9
Binary files /dev/null and b/public/images/emoji/twitter/person_climbing.png differ
diff --git a/public/images/emoji/twitter/person_climbing/2.png b/public/images/emoji/twitter/person_climbing/2.png
new file mode 100644
index 00000000000..71330d66a8c
Binary files /dev/null and b/public/images/emoji/twitter/person_climbing/2.png differ
diff --git a/public/images/emoji/twitter/person_climbing/3.png b/public/images/emoji/twitter/person_climbing/3.png
new file mode 100644
index 00000000000..a1345ecbd25
Binary files /dev/null and b/public/images/emoji/twitter/person_climbing/3.png differ
diff --git a/public/images/emoji/twitter/person_climbing/4.png b/public/images/emoji/twitter/person_climbing/4.png
new file mode 100644
index 00000000000..016b920bcde
Binary files /dev/null and b/public/images/emoji/twitter/person_climbing/4.png differ
diff --git a/public/images/emoji/twitter/person_climbing/5.png b/public/images/emoji/twitter/person_climbing/5.png
new file mode 100644
index 00000000000..4591eb52904
Binary files /dev/null and b/public/images/emoji/twitter/person_climbing/5.png differ
diff --git a/public/images/emoji/twitter/person_climbing/6.png b/public/images/emoji/twitter/person_climbing/6.png
new file mode 100644
index 00000000000..19be3236ae9
Binary files /dev/null and b/public/images/emoji/twitter/person_climbing/6.png differ
diff --git a/public/images/emoji/twitter/person_fencing.png b/public/images/emoji/twitter/person_fencing.png
new file mode 100644
index 00000000000..064b747aaec
Binary files /dev/null and b/public/images/emoji/twitter/person_fencing.png differ
diff --git a/public/images/emoji/twitter/person_frowning/2.png b/public/images/emoji/twitter/person_frowning/2.png
new file mode 100644
index 00000000000..7c8f518c957
Binary files /dev/null and b/public/images/emoji/twitter/person_frowning/2.png differ
diff --git a/public/images/emoji/twitter/person_frowning/3.png b/public/images/emoji/twitter/person_frowning/3.png
new file mode 100644
index 00000000000..124d99647d5
Binary files /dev/null and b/public/images/emoji/twitter/person_frowning/3.png differ
diff --git a/public/images/emoji/twitter/person_frowning/4.png b/public/images/emoji/twitter/person_frowning/4.png
new file mode 100644
index 00000000000..f7fe84e3343
Binary files /dev/null and b/public/images/emoji/twitter/person_frowning/4.png differ
diff --git a/public/images/emoji/twitter/person_frowning/5.png b/public/images/emoji/twitter/person_frowning/5.png
new file mode 100644
index 00000000000..5b483c06ad9
Binary files /dev/null and b/public/images/emoji/twitter/person_frowning/5.png differ
diff --git a/public/images/emoji/twitter/person_frowning/6.png b/public/images/emoji/twitter/person_frowning/6.png
new file mode 100644
index 00000000000..d557856b3fe
Binary files /dev/null and b/public/images/emoji/twitter/person_frowning/6.png differ
diff --git a/public/images/emoji/twitter/person_in_lotus_position.png b/public/images/emoji/twitter/person_in_lotus_position.png
new file mode 100644
index 00000000000..e9404fd5255
Binary files /dev/null and b/public/images/emoji/twitter/person_in_lotus_position.png differ
diff --git a/public/images/emoji/twitter/person_in_lotus_position/2.png b/public/images/emoji/twitter/person_in_lotus_position/2.png
new file mode 100644
index 00000000000..8817578cf09
Binary files /dev/null and b/public/images/emoji/twitter/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/twitter/person_in_lotus_position/3.png b/public/images/emoji/twitter/person_in_lotus_position/3.png
new file mode 100644
index 00000000000..0e9bf46e0b6
Binary files /dev/null and b/public/images/emoji/twitter/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/twitter/person_in_lotus_position/4.png b/public/images/emoji/twitter/person_in_lotus_position/4.png
new file mode 100644
index 00000000000..918e3d435a2
Binary files /dev/null and b/public/images/emoji/twitter/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/twitter/person_in_lotus_position/5.png b/public/images/emoji/twitter/person_in_lotus_position/5.png
new file mode 100644
index 00000000000..0c01143530e
Binary files /dev/null and b/public/images/emoji/twitter/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/twitter/person_in_lotus_position/6.png b/public/images/emoji/twitter/person_in_lotus_position/6.png
new file mode 100644
index 00000000000..fed226dac29
Binary files /dev/null and b/public/images/emoji/twitter/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/twitter/person_in_steamy_room.png b/public/images/emoji/twitter/person_in_steamy_room.png
new file mode 100644
index 00000000000..65a0790d926
Binary files /dev/null and b/public/images/emoji/twitter/person_in_steamy_room.png differ
diff --git a/public/images/emoji/twitter/person_in_steamy_room/2.png b/public/images/emoji/twitter/person_in_steamy_room/2.png
new file mode 100644
index 00000000000..7260df1d154
Binary files /dev/null and b/public/images/emoji/twitter/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/twitter/person_in_steamy_room/3.png b/public/images/emoji/twitter/person_in_steamy_room/3.png
new file mode 100644
index 00000000000..d14580a3db3
Binary files /dev/null and b/public/images/emoji/twitter/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/twitter/person_in_steamy_room/4.png b/public/images/emoji/twitter/person_in_steamy_room/4.png
new file mode 100644
index 00000000000..9313ab2116b
Binary files /dev/null and b/public/images/emoji/twitter/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/twitter/person_in_steamy_room/5.png b/public/images/emoji/twitter/person_in_steamy_room/5.png
new file mode 100644
index 00000000000..f432b554b37
Binary files /dev/null and b/public/images/emoji/twitter/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/twitter/person_in_steamy_room/6.png b/public/images/emoji/twitter/person_in_steamy_room/6.png
new file mode 100644
index 00000000000..dc7087e0284
Binary files /dev/null and b/public/images/emoji/twitter/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/twitter/person_with_ball.png b/public/images/emoji/twitter/person_with_ball.png
index af55a33bfbf..ac6a6c2c9f1 100644
Binary files a/public/images/emoji/twitter/person_with_ball.png and b/public/images/emoji/twitter/person_with_ball.png differ
diff --git a/public/images/emoji/twitter/person_with_ball/2.png b/public/images/emoji/twitter/person_with_ball/2.png
new file mode 100644
index 00000000000..4dad1da7dbe
Binary files /dev/null and b/public/images/emoji/twitter/person_with_ball/2.png differ
diff --git a/public/images/emoji/twitter/person_with_ball/3.png b/public/images/emoji/twitter/person_with_ball/3.png
new file mode 100644
index 00000000000..739f1de58c0
Binary files /dev/null and b/public/images/emoji/twitter/person_with_ball/3.png differ
diff --git a/public/images/emoji/twitter/person_with_ball/4.png b/public/images/emoji/twitter/person_with_ball/4.png
new file mode 100644
index 00000000000..62a23de4665
Binary files /dev/null and b/public/images/emoji/twitter/person_with_ball/4.png differ
diff --git a/public/images/emoji/twitter/person_with_ball/5.png b/public/images/emoji/twitter/person_with_ball/5.png
new file mode 100644
index 00000000000..2cd9628b760
Binary files /dev/null and b/public/images/emoji/twitter/person_with_ball/5.png differ
diff --git a/public/images/emoji/twitter/person_with_ball/6.png b/public/images/emoji/twitter/person_with_ball/6.png
new file mode 100644
index 00000000000..85bfaeb5785
Binary files /dev/null and b/public/images/emoji/twitter/person_with_ball/6.png differ
diff --git a/public/images/emoji/twitter/person_with_blond_hair/2.png b/public/images/emoji/twitter/person_with_blond_hair/2.png
new file mode 100644
index 00000000000..f6e78cc4488
Binary files /dev/null and b/public/images/emoji/twitter/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/twitter/person_with_blond_hair/3.png b/public/images/emoji/twitter/person_with_blond_hair/3.png
new file mode 100644
index 00000000000..d26f97cb5bd
Binary files /dev/null and b/public/images/emoji/twitter/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/twitter/person_with_blond_hair/4.png b/public/images/emoji/twitter/person_with_blond_hair/4.png
new file mode 100644
index 00000000000..ff83f6d7d10
Binary files /dev/null and b/public/images/emoji/twitter/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/twitter/person_with_blond_hair/5.png b/public/images/emoji/twitter/person_with_blond_hair/5.png
new file mode 100644
index 00000000000..e40e865a497
Binary files /dev/null and b/public/images/emoji/twitter/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/twitter/person_with_blond_hair/6.png b/public/images/emoji/twitter/person_with_blond_hair/6.png
new file mode 100644
index 00000000000..c04215ecc28
Binary files /dev/null and b/public/images/emoji/twitter/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/twitter/person_with_pouting_face/2.png b/public/images/emoji/twitter/person_with_pouting_face/2.png
new file mode 100644
index 00000000000..bd07cc52fab
Binary files /dev/null and b/public/images/emoji/twitter/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/twitter/person_with_pouting_face/3.png b/public/images/emoji/twitter/person_with_pouting_face/3.png
new file mode 100644
index 00000000000..ef2293b4412
Binary files /dev/null and b/public/images/emoji/twitter/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/twitter/person_with_pouting_face/4.png b/public/images/emoji/twitter/person_with_pouting_face/4.png
new file mode 100644
index 00000000000..9cb90bf69d6
Binary files /dev/null and b/public/images/emoji/twitter/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/twitter/person_with_pouting_face/5.png b/public/images/emoji/twitter/person_with_pouting_face/5.png
new file mode 100644
index 00000000000..97549816c80
Binary files /dev/null and b/public/images/emoji/twitter/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/twitter/person_with_pouting_face/6.png b/public/images/emoji/twitter/person_with_pouting_face/6.png
new file mode 100644
index 00000000000..33332b73655
Binary files /dev/null and b/public/images/emoji/twitter/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/twitter/peru.png b/public/images/emoji/twitter/peru.png
new file mode 100644
index 00000000000..bbb5523f939
Binary files /dev/null and b/public/images/emoji/twitter/peru.png differ
diff --git a/public/images/emoji/twitter/philippines.png b/public/images/emoji/twitter/philippines.png
new file mode 100644
index 00000000000..b26fa86ac23
Binary files /dev/null and b/public/images/emoji/twitter/philippines.png differ
diff --git a/public/images/emoji/twitter/phone.png b/public/images/emoji/twitter/phone.png
new file mode 100644
index 00000000000..749e9f38ae5
Binary files /dev/null and b/public/images/emoji/twitter/phone.png differ
diff --git a/public/images/emoji/twitter/pie.png b/public/images/emoji/twitter/pie.png
new file mode 100644
index 00000000000..4f5f474d82c
Binary files /dev/null and b/public/images/emoji/twitter/pie.png differ
diff --git a/public/images/emoji/twitter/pitcairn_islands.png b/public/images/emoji/twitter/pitcairn_islands.png
new file mode 100644
index 00000000000..3e3d79bca5c
Binary files /dev/null and b/public/images/emoji/twitter/pitcairn_islands.png differ
diff --git a/public/images/emoji/twitter/pizza.png b/public/images/emoji/twitter/pizza.png
index 5dee653646f..010da4d2081 100644
Binary files a/public/images/emoji/twitter/pizza.png and b/public/images/emoji/twitter/pizza.png differ
diff --git a/public/images/emoji/twitter/plate_with_cutlery.png b/public/images/emoji/twitter/plate_with_cutlery.png
new file mode 100644
index 00000000000..df63dcc4f4f
Binary files /dev/null and b/public/images/emoji/twitter/plate_with_cutlery.png differ
diff --git a/public/images/emoji/twitter/play_or_pause_button.png b/public/images/emoji/twitter/play_or_pause_button.png
new file mode 100644
index 00000000000..64b99985414
Binary files /dev/null and b/public/images/emoji/twitter/play_or_pause_button.png differ
diff --git a/public/images/emoji/twitter/point_down/2.png b/public/images/emoji/twitter/point_down/2.png
new file mode 100644
index 00000000000..95c79b224d6
Binary files /dev/null and b/public/images/emoji/twitter/point_down/2.png differ
diff --git a/public/images/emoji/twitter/point_down/3.png b/public/images/emoji/twitter/point_down/3.png
new file mode 100644
index 00000000000..a9724649fab
Binary files /dev/null and b/public/images/emoji/twitter/point_down/3.png differ
diff --git a/public/images/emoji/twitter/point_down/4.png b/public/images/emoji/twitter/point_down/4.png
new file mode 100644
index 00000000000..23e564b81a7
Binary files /dev/null and b/public/images/emoji/twitter/point_down/4.png differ
diff --git a/public/images/emoji/twitter/point_down/5.png b/public/images/emoji/twitter/point_down/5.png
new file mode 100644
index 00000000000..606aa69ee12
Binary files /dev/null and b/public/images/emoji/twitter/point_down/5.png differ
diff --git a/public/images/emoji/twitter/point_down/6.png b/public/images/emoji/twitter/point_down/6.png
new file mode 100644
index 00000000000..35de883a4a7
Binary files /dev/null and b/public/images/emoji/twitter/point_down/6.png differ
diff --git a/public/images/emoji/twitter/point_left/2.png b/public/images/emoji/twitter/point_left/2.png
new file mode 100644
index 00000000000..b5d8fcb9c2e
Binary files /dev/null and b/public/images/emoji/twitter/point_left/2.png differ
diff --git a/public/images/emoji/twitter/point_left/3.png b/public/images/emoji/twitter/point_left/3.png
new file mode 100644
index 00000000000..9a5e8ff555b
Binary files /dev/null and b/public/images/emoji/twitter/point_left/3.png differ
diff --git a/public/images/emoji/twitter/point_left/4.png b/public/images/emoji/twitter/point_left/4.png
new file mode 100644
index 00000000000..e49bf34802a
Binary files /dev/null and b/public/images/emoji/twitter/point_left/4.png differ
diff --git a/public/images/emoji/twitter/point_left/5.png b/public/images/emoji/twitter/point_left/5.png
new file mode 100644
index 00000000000..4e217f472f1
Binary files /dev/null and b/public/images/emoji/twitter/point_left/5.png differ
diff --git a/public/images/emoji/twitter/point_left/6.png b/public/images/emoji/twitter/point_left/6.png
new file mode 100644
index 00000000000..ab8626df333
Binary files /dev/null and b/public/images/emoji/twitter/point_left/6.png differ
diff --git a/public/images/emoji/twitter/point_right/2.png b/public/images/emoji/twitter/point_right/2.png
new file mode 100644
index 00000000000..22d016c6cc5
Binary files /dev/null and b/public/images/emoji/twitter/point_right/2.png differ
diff --git a/public/images/emoji/twitter/point_right/3.png b/public/images/emoji/twitter/point_right/3.png
new file mode 100644
index 00000000000..891f49d8005
Binary files /dev/null and b/public/images/emoji/twitter/point_right/3.png differ
diff --git a/public/images/emoji/twitter/point_right/4.png b/public/images/emoji/twitter/point_right/4.png
new file mode 100644
index 00000000000..f1704b8e3aa
Binary files /dev/null and b/public/images/emoji/twitter/point_right/4.png differ
diff --git a/public/images/emoji/twitter/point_right/5.png b/public/images/emoji/twitter/point_right/5.png
new file mode 100644
index 00000000000..97cd384d0c5
Binary files /dev/null and b/public/images/emoji/twitter/point_right/5.png differ
diff --git a/public/images/emoji/twitter/point_right/6.png b/public/images/emoji/twitter/point_right/6.png
new file mode 100644
index 00000000000..be01ef70a6e
Binary files /dev/null and b/public/images/emoji/twitter/point_right/6.png differ
diff --git a/public/images/emoji/twitter/point_up.png b/public/images/emoji/twitter/point_up.png
index 8628dba3bf1..f921a890da6 100644
Binary files a/public/images/emoji/twitter/point_up.png and b/public/images/emoji/twitter/point_up.png differ
diff --git a/public/images/emoji/twitter/point_up/2.png b/public/images/emoji/twitter/point_up/2.png
new file mode 100644
index 00000000000..e850849c39f
Binary files /dev/null and b/public/images/emoji/twitter/point_up/2.png differ
diff --git a/public/images/emoji/twitter/point_up/3.png b/public/images/emoji/twitter/point_up/3.png
new file mode 100644
index 00000000000..515aab771af
Binary files /dev/null and b/public/images/emoji/twitter/point_up/3.png differ
diff --git a/public/images/emoji/twitter/point_up/4.png b/public/images/emoji/twitter/point_up/4.png
new file mode 100644
index 00000000000..70d08af505a
Binary files /dev/null and b/public/images/emoji/twitter/point_up/4.png differ
diff --git a/public/images/emoji/twitter/point_up/5.png b/public/images/emoji/twitter/point_up/5.png
new file mode 100644
index 00000000000..a41fd4f55e8
Binary files /dev/null and b/public/images/emoji/twitter/point_up/5.png differ
diff --git a/public/images/emoji/twitter/point_up/6.png b/public/images/emoji/twitter/point_up/6.png
new file mode 100644
index 00000000000..6ecd39fe4c2
Binary files /dev/null and b/public/images/emoji/twitter/point_up/6.png differ
diff --git a/public/images/emoji/twitter/point_up_2/2.png b/public/images/emoji/twitter/point_up_2/2.png
new file mode 100644
index 00000000000..827f7f97ef9
Binary files /dev/null and b/public/images/emoji/twitter/point_up_2/2.png differ
diff --git a/public/images/emoji/twitter/point_up_2/3.png b/public/images/emoji/twitter/point_up_2/3.png
new file mode 100644
index 00000000000..0295c5d10e7
Binary files /dev/null and b/public/images/emoji/twitter/point_up_2/3.png differ
diff --git a/public/images/emoji/twitter/point_up_2/4.png b/public/images/emoji/twitter/point_up_2/4.png
new file mode 100644
index 00000000000..9f147d7cf27
Binary files /dev/null and b/public/images/emoji/twitter/point_up_2/4.png differ
diff --git a/public/images/emoji/twitter/point_up_2/5.png b/public/images/emoji/twitter/point_up_2/5.png
new file mode 100644
index 00000000000..9134c284765
Binary files /dev/null and b/public/images/emoji/twitter/point_up_2/5.png differ
diff --git a/public/images/emoji/twitter/point_up_2/6.png b/public/images/emoji/twitter/point_up_2/6.png
new file mode 100644
index 00000000000..23d13f0b160
Binary files /dev/null and b/public/images/emoji/twitter/point_up_2/6.png differ
diff --git a/public/images/emoji/twitter/poland.png b/public/images/emoji/twitter/poland.png
new file mode 100644
index 00000000000..c8872ee52e9
Binary files /dev/null and b/public/images/emoji/twitter/poland.png differ
diff --git a/public/images/emoji/twitter/policeman.png b/public/images/emoji/twitter/policeman.png
new file mode 100644
index 00000000000..fe7b77444a0
Binary files /dev/null and b/public/images/emoji/twitter/policeman.png differ
diff --git a/public/images/emoji/twitter/policeman/2.png b/public/images/emoji/twitter/policeman/2.png
new file mode 100644
index 00000000000..13b912f19e6
Binary files /dev/null and b/public/images/emoji/twitter/policeman/2.png differ
diff --git a/public/images/emoji/twitter/policeman/3.png b/public/images/emoji/twitter/policeman/3.png
new file mode 100644
index 00000000000..6bdbeca1115
Binary files /dev/null and b/public/images/emoji/twitter/policeman/3.png differ
diff --git a/public/images/emoji/twitter/policeman/4.png b/public/images/emoji/twitter/policeman/4.png
new file mode 100644
index 00000000000..b062756c453
Binary files /dev/null and b/public/images/emoji/twitter/policeman/4.png differ
diff --git a/public/images/emoji/twitter/policeman/5.png b/public/images/emoji/twitter/policeman/5.png
new file mode 100644
index 00000000000..86f0ae990b4
Binary files /dev/null and b/public/images/emoji/twitter/policeman/5.png differ
diff --git a/public/images/emoji/twitter/policeman/6.png b/public/images/emoji/twitter/policeman/6.png
new file mode 100644
index 00000000000..29f3fc63aba
Binary files /dev/null and b/public/images/emoji/twitter/policeman/6.png differ
diff --git a/public/images/emoji/twitter/policewoman.png b/public/images/emoji/twitter/policewoman.png
new file mode 100644
index 00000000000..566f93771b3
Binary files /dev/null and b/public/images/emoji/twitter/policewoman.png differ
diff --git a/public/images/emoji/twitter/policewoman/2.png b/public/images/emoji/twitter/policewoman/2.png
new file mode 100644
index 00000000000..f319e4af5db
Binary files /dev/null and b/public/images/emoji/twitter/policewoman/2.png differ
diff --git a/public/images/emoji/twitter/policewoman/3.png b/public/images/emoji/twitter/policewoman/3.png
new file mode 100644
index 00000000000..c1652f098c4
Binary files /dev/null and b/public/images/emoji/twitter/policewoman/3.png differ
diff --git a/public/images/emoji/twitter/policewoman/4.png b/public/images/emoji/twitter/policewoman/4.png
new file mode 100644
index 00000000000..92fe65ff978
Binary files /dev/null and b/public/images/emoji/twitter/policewoman/4.png differ
diff --git a/public/images/emoji/twitter/policewoman/5.png b/public/images/emoji/twitter/policewoman/5.png
new file mode 100644
index 00000000000..0bf22ab60db
Binary files /dev/null and b/public/images/emoji/twitter/policewoman/5.png differ
diff --git a/public/images/emoji/twitter/policewoman/6.png b/public/images/emoji/twitter/policewoman/6.png
new file mode 100644
index 00000000000..13ab6c5e904
Binary files /dev/null and b/public/images/emoji/twitter/policewoman/6.png differ
diff --git a/public/images/emoji/twitter/poodle.png b/public/images/emoji/twitter/poodle.png
index 4029c7552ae..aa6690d790e 100644
Binary files a/public/images/emoji/twitter/poodle.png and b/public/images/emoji/twitter/poodle.png differ
diff --git a/public/images/emoji/twitter/portugal.png b/public/images/emoji/twitter/portugal.png
new file mode 100644
index 00000000000..5646de06226
Binary files /dev/null and b/public/images/emoji/twitter/portugal.png differ
diff --git a/public/images/emoji/twitter/potato.png b/public/images/emoji/twitter/potato.png
new file mode 100644
index 00000000000..3f097365d9f
Binary files /dev/null and b/public/images/emoji/twitter/potato.png differ
diff --git a/public/images/emoji/twitter/pouting_cat.png b/public/images/emoji/twitter/pouting_cat.png
index 87a39c56fa5..973f479afbb 100644
Binary files a/public/images/emoji/twitter/pouting_cat.png and b/public/images/emoji/twitter/pouting_cat.png differ
diff --git a/public/images/emoji/twitter/pouting_man.png b/public/images/emoji/twitter/pouting_man.png
new file mode 100644
index 00000000000..c6392b40a64
Binary files /dev/null and b/public/images/emoji/twitter/pouting_man.png differ
diff --git a/public/images/emoji/twitter/pouting_man/2.png b/public/images/emoji/twitter/pouting_man/2.png
new file mode 100644
index 00000000000..b5f4f2999a6
Binary files /dev/null and b/public/images/emoji/twitter/pouting_man/2.png differ
diff --git a/public/images/emoji/twitter/pouting_man/3.png b/public/images/emoji/twitter/pouting_man/3.png
new file mode 100644
index 00000000000..7ca74c419eb
Binary files /dev/null and b/public/images/emoji/twitter/pouting_man/3.png differ
diff --git a/public/images/emoji/twitter/pouting_man/4.png b/public/images/emoji/twitter/pouting_man/4.png
new file mode 100644
index 00000000000..0e99fe45b11
Binary files /dev/null and b/public/images/emoji/twitter/pouting_man/4.png differ
diff --git a/public/images/emoji/twitter/pouting_man/5.png b/public/images/emoji/twitter/pouting_man/5.png
new file mode 100644
index 00000000000..91faf90cf59
Binary files /dev/null and b/public/images/emoji/twitter/pouting_man/5.png differ
diff --git a/public/images/emoji/twitter/pouting_man/6.png b/public/images/emoji/twitter/pouting_man/6.png
new file mode 100644
index 00000000000..07156230630
Binary files /dev/null and b/public/images/emoji/twitter/pouting_man/6.png differ
diff --git a/public/images/emoji/twitter/pouting_woman.png b/public/images/emoji/twitter/pouting_woman.png
new file mode 100644
index 00000000000..8d764bf4f3c
Binary files /dev/null and b/public/images/emoji/twitter/pouting_woman.png differ
diff --git a/public/images/emoji/twitter/pouting_woman/2.png b/public/images/emoji/twitter/pouting_woman/2.png
new file mode 100644
index 00000000000..bd07cc52fab
Binary files /dev/null and b/public/images/emoji/twitter/pouting_woman/2.png differ
diff --git a/public/images/emoji/twitter/pouting_woman/3.png b/public/images/emoji/twitter/pouting_woman/3.png
new file mode 100644
index 00000000000..ef2293b4412
Binary files /dev/null and b/public/images/emoji/twitter/pouting_woman/3.png differ
diff --git a/public/images/emoji/twitter/pouting_woman/4.png b/public/images/emoji/twitter/pouting_woman/4.png
new file mode 100644
index 00000000000..9cb90bf69d6
Binary files /dev/null and b/public/images/emoji/twitter/pouting_woman/4.png differ
diff --git a/public/images/emoji/twitter/pouting_woman/5.png b/public/images/emoji/twitter/pouting_woman/5.png
new file mode 100644
index 00000000000..97549816c80
Binary files /dev/null and b/public/images/emoji/twitter/pouting_woman/5.png differ
diff --git a/public/images/emoji/twitter/pouting_woman/6.png b/public/images/emoji/twitter/pouting_woman/6.png
new file mode 100644
index 00000000000..33332b73655
Binary files /dev/null and b/public/images/emoji/twitter/pouting_woman/6.png differ
diff --git a/public/images/emoji/twitter/pray/2.png b/public/images/emoji/twitter/pray/2.png
new file mode 100644
index 00000000000..cb41df5b948
Binary files /dev/null and b/public/images/emoji/twitter/pray/2.png differ
diff --git a/public/images/emoji/twitter/pray/3.png b/public/images/emoji/twitter/pray/3.png
new file mode 100644
index 00000000000..40b083f97b8
Binary files /dev/null and b/public/images/emoji/twitter/pray/3.png differ
diff --git a/public/images/emoji/twitter/pray/4.png b/public/images/emoji/twitter/pray/4.png
new file mode 100644
index 00000000000..26896b869a7
Binary files /dev/null and b/public/images/emoji/twitter/pray/4.png differ
diff --git a/public/images/emoji/twitter/pray/5.png b/public/images/emoji/twitter/pray/5.png
new file mode 100644
index 00000000000..db14aa23f9b
Binary files /dev/null and b/public/images/emoji/twitter/pray/5.png differ
diff --git a/public/images/emoji/twitter/pray/6.png b/public/images/emoji/twitter/pray/6.png
new file mode 100644
index 00000000000..1e556c70f2b
Binary files /dev/null and b/public/images/emoji/twitter/pray/6.png differ
diff --git a/public/images/emoji/twitter/prayer_beads.png b/public/images/emoji/twitter/prayer_beads.png
index 06ae366e5f5..71d6e55ae05 100644
Binary files a/public/images/emoji/twitter/prayer_beads.png and b/public/images/emoji/twitter/prayer_beads.png differ
diff --git a/public/images/emoji/twitter/pregnant_woman.png b/public/images/emoji/twitter/pregnant_woman.png
new file mode 100644
index 00000000000..d965748c88b
Binary files /dev/null and b/public/images/emoji/twitter/pregnant_woman.png differ
diff --git a/public/images/emoji/twitter/pregnant_woman/2.png b/public/images/emoji/twitter/pregnant_woman/2.png
new file mode 100644
index 00000000000..5b633046347
Binary files /dev/null and b/public/images/emoji/twitter/pregnant_woman/2.png differ
diff --git a/public/images/emoji/twitter/pregnant_woman/3.png b/public/images/emoji/twitter/pregnant_woman/3.png
new file mode 100644
index 00000000000..5ff2e3c4321
Binary files /dev/null and b/public/images/emoji/twitter/pregnant_woman/3.png differ
diff --git a/public/images/emoji/twitter/pregnant_woman/4.png b/public/images/emoji/twitter/pregnant_woman/4.png
new file mode 100644
index 00000000000..6b6241fefc4
Binary files /dev/null and b/public/images/emoji/twitter/pregnant_woman/4.png differ
diff --git a/public/images/emoji/twitter/pregnant_woman/5.png b/public/images/emoji/twitter/pregnant_woman/5.png
new file mode 100644
index 00000000000..ddc0648e8e4
Binary files /dev/null and b/public/images/emoji/twitter/pregnant_woman/5.png differ
diff --git a/public/images/emoji/twitter/pregnant_woman/6.png b/public/images/emoji/twitter/pregnant_woman/6.png
new file mode 100644
index 00000000000..04918ba7384
Binary files /dev/null and b/public/images/emoji/twitter/pregnant_woman/6.png differ
diff --git a/public/images/emoji/twitter/pretzel.png b/public/images/emoji/twitter/pretzel.png
new file mode 100644
index 00000000000..9116d6ee9a2
Binary files /dev/null and b/public/images/emoji/twitter/pretzel.png differ
diff --git a/public/images/emoji/twitter/previous_track_button.png b/public/images/emoji/twitter/previous_track_button.png
new file mode 100644
index 00000000000..ada39abc337
Binary files /dev/null and b/public/images/emoji/twitter/previous_track_button.png differ
diff --git a/public/images/emoji/twitter/prince.png b/public/images/emoji/twitter/prince.png
new file mode 100644
index 00000000000..5ec0ddf76be
Binary files /dev/null and b/public/images/emoji/twitter/prince.png differ
diff --git a/public/images/emoji/twitter/prince/2.png b/public/images/emoji/twitter/prince/2.png
new file mode 100644
index 00000000000..dd91dd02fa8
Binary files /dev/null and b/public/images/emoji/twitter/prince/2.png differ
diff --git a/public/images/emoji/twitter/prince/3.png b/public/images/emoji/twitter/prince/3.png
new file mode 100644
index 00000000000..d3e36181843
Binary files /dev/null and b/public/images/emoji/twitter/prince/3.png differ
diff --git a/public/images/emoji/twitter/prince/4.png b/public/images/emoji/twitter/prince/4.png
new file mode 100644
index 00000000000..a00e9eb039d
Binary files /dev/null and b/public/images/emoji/twitter/prince/4.png differ
diff --git a/public/images/emoji/twitter/prince/5.png b/public/images/emoji/twitter/prince/5.png
new file mode 100644
index 00000000000..2d2fabb6ec9
Binary files /dev/null and b/public/images/emoji/twitter/prince/5.png differ
diff --git a/public/images/emoji/twitter/prince/6.png b/public/images/emoji/twitter/prince/6.png
new file mode 100644
index 00000000000..5f7f4ec8914
Binary files /dev/null and b/public/images/emoji/twitter/prince/6.png differ
diff --git a/public/images/emoji/twitter/princess.png b/public/images/emoji/twitter/princess.png
index a0ada98dc1a..a0a5e8698ec 100644
Binary files a/public/images/emoji/twitter/princess.png and b/public/images/emoji/twitter/princess.png differ
diff --git a/public/images/emoji/twitter/princess/2.png b/public/images/emoji/twitter/princess/2.png
new file mode 100644
index 00000000000..2ec356843f9
Binary files /dev/null and b/public/images/emoji/twitter/princess/2.png differ
diff --git a/public/images/emoji/twitter/princess/3.png b/public/images/emoji/twitter/princess/3.png
new file mode 100644
index 00000000000..b9a98edea92
Binary files /dev/null and b/public/images/emoji/twitter/princess/3.png differ
diff --git a/public/images/emoji/twitter/princess/4.png b/public/images/emoji/twitter/princess/4.png
new file mode 100644
index 00000000000..ab8b2f22659
Binary files /dev/null and b/public/images/emoji/twitter/princess/4.png differ
diff --git a/public/images/emoji/twitter/princess/5.png b/public/images/emoji/twitter/princess/5.png
new file mode 100644
index 00000000000..2c925ab7823
Binary files /dev/null and b/public/images/emoji/twitter/princess/5.png differ
diff --git a/public/images/emoji/twitter/princess/6.png b/public/images/emoji/twitter/princess/6.png
new file mode 100644
index 00000000000..041f7071176
Binary files /dev/null and b/public/images/emoji/twitter/princess/6.png differ
diff --git a/public/images/emoji/twitter/puerto_rico.png b/public/images/emoji/twitter/puerto_rico.png
new file mode 100644
index 00000000000..05a929944de
Binary files /dev/null and b/public/images/emoji/twitter/puerto_rico.png differ
diff --git a/public/images/emoji/twitter/punch/2.png b/public/images/emoji/twitter/punch/2.png
new file mode 100644
index 00000000000..f5511a84165
Binary files /dev/null and b/public/images/emoji/twitter/punch/2.png differ
diff --git a/public/images/emoji/twitter/punch/3.png b/public/images/emoji/twitter/punch/3.png
new file mode 100644
index 00000000000..b836c259f3b
Binary files /dev/null and b/public/images/emoji/twitter/punch/3.png differ
diff --git a/public/images/emoji/twitter/punch/4.png b/public/images/emoji/twitter/punch/4.png
new file mode 100644
index 00000000000..3eb0bb85212
Binary files /dev/null and b/public/images/emoji/twitter/punch/4.png differ
diff --git a/public/images/emoji/twitter/punch/5.png b/public/images/emoji/twitter/punch/5.png
new file mode 100644
index 00000000000..b1004a4f045
Binary files /dev/null and b/public/images/emoji/twitter/punch/5.png differ
diff --git a/public/images/emoji/twitter/punch/6.png b/public/images/emoji/twitter/punch/6.png
new file mode 100644
index 00000000000..570a5d52d93
Binary files /dev/null and b/public/images/emoji/twitter/punch/6.png differ
diff --git a/public/images/emoji/twitter/purse.png b/public/images/emoji/twitter/purse.png
index de231d06c79..6aeb938679e 100644
Binary files a/public/images/emoji/twitter/purse.png and b/public/images/emoji/twitter/purse.png differ
diff --git a/public/images/emoji/twitter/qatar.png b/public/images/emoji/twitter/qatar.png
new file mode 100644
index 00000000000..f51ae1d0ffd
Binary files /dev/null and b/public/images/emoji/twitter/qatar.png differ
diff --git a/public/images/emoji/twitter/race_car.png b/public/images/emoji/twitter/race_car.png
index 8cf5954690f..894f1b62c24 100644
Binary files a/public/images/emoji/twitter/race_car.png and b/public/images/emoji/twitter/race_car.png differ
diff --git a/public/images/emoji/twitter/racehorse.png b/public/images/emoji/twitter/racehorse.png
index 8713450504d..af92b7244ad 100644
Binary files a/public/images/emoji/twitter/racehorse.png and b/public/images/emoji/twitter/racehorse.png differ
diff --git a/public/images/emoji/twitter/racing_car.png b/public/images/emoji/twitter/racing_car.png
index 8cf5954690f..894f1b62c24 100644
Binary files a/public/images/emoji/twitter/racing_car.png and b/public/images/emoji/twitter/racing_car.png differ
diff --git a/public/images/emoji/twitter/racing_motorcycle.png b/public/images/emoji/twitter/racing_motorcycle.png
index 2c7b22a423d..ba7fb373bad 100644
Binary files a/public/images/emoji/twitter/racing_motorcycle.png and b/public/images/emoji/twitter/racing_motorcycle.png differ
diff --git a/public/images/emoji/twitter/railroad_track.png b/public/images/emoji/twitter/railroad_track.png
index 09bac6b7de7..7b456ff579a 100644
Binary files a/public/images/emoji/twitter/railroad_track.png and b/public/images/emoji/twitter/railroad_track.png differ
diff --git a/public/images/emoji/twitter/railway_car.png b/public/images/emoji/twitter/railway_car.png
index e2ee0c1710a..d47d0786574 100644
Binary files a/public/images/emoji/twitter/railway_car.png and b/public/images/emoji/twitter/railway_car.png differ
diff --git a/public/images/emoji/twitter/railway_track.png b/public/images/emoji/twitter/railway_track.png
index 09bac6b7de7..7b456ff579a 100644
Binary files a/public/images/emoji/twitter/railway_track.png and b/public/images/emoji/twitter/railway_track.png differ
diff --git a/public/images/emoji/twitter/rainbow.png b/public/images/emoji/twitter/rainbow.png
index ec793adc746..3da4abbbc39 100644
Binary files a/public/images/emoji/twitter/rainbow.png and b/public/images/emoji/twitter/rainbow.png differ
diff --git a/public/images/emoji/twitter/rainbow_flag.png b/public/images/emoji/twitter/rainbow_flag.png
new file mode 100644
index 00000000000..af14c94a4f2
Binary files /dev/null and b/public/images/emoji/twitter/rainbow_flag.png differ
diff --git a/public/images/emoji/twitter/raised_back_of_hand.png b/public/images/emoji/twitter/raised_back_of_hand.png
new file mode 100644
index 00000000000..7e8bd4c6ad9
Binary files /dev/null and b/public/images/emoji/twitter/raised_back_of_hand.png differ
diff --git a/public/images/emoji/twitter/raised_back_of_hand/2.png b/public/images/emoji/twitter/raised_back_of_hand/2.png
new file mode 100644
index 00000000000..a65c925100b
Binary files /dev/null and b/public/images/emoji/twitter/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/twitter/raised_back_of_hand/3.png b/public/images/emoji/twitter/raised_back_of_hand/3.png
new file mode 100644
index 00000000000..527e2055be7
Binary files /dev/null and b/public/images/emoji/twitter/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/twitter/raised_back_of_hand/4.png b/public/images/emoji/twitter/raised_back_of_hand/4.png
new file mode 100644
index 00000000000..35a4c34bc74
Binary files /dev/null and b/public/images/emoji/twitter/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/twitter/raised_back_of_hand/5.png b/public/images/emoji/twitter/raised_back_of_hand/5.png
new file mode 100644
index 00000000000..3a75748ef90
Binary files /dev/null and b/public/images/emoji/twitter/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/twitter/raised_back_of_hand/6.png b/public/images/emoji/twitter/raised_back_of_hand/6.png
new file mode 100644
index 00000000000..db1c8f050cf
Binary files /dev/null and b/public/images/emoji/twitter/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/twitter/raised_hand.png b/public/images/emoji/twitter/raised_hand.png
index 8a2c6cc3202..e18572e405c 100644
Binary files a/public/images/emoji/twitter/raised_hand.png and b/public/images/emoji/twitter/raised_hand.png differ
diff --git a/public/images/emoji/twitter/raised_hand/2.png b/public/images/emoji/twitter/raised_hand/2.png
new file mode 100644
index 00000000000..bd7ea42aa4d
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand/2.png differ
diff --git a/public/images/emoji/twitter/raised_hand/3.png b/public/images/emoji/twitter/raised_hand/3.png
new file mode 100644
index 00000000000..f0708d24fbc
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand/3.png differ
diff --git a/public/images/emoji/twitter/raised_hand/4.png b/public/images/emoji/twitter/raised_hand/4.png
new file mode 100644
index 00000000000..9ecd50830ab
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand/4.png differ
diff --git a/public/images/emoji/twitter/raised_hand/5.png b/public/images/emoji/twitter/raised_hand/5.png
new file mode 100644
index 00000000000..f736e8afd37
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand/5.png differ
diff --git a/public/images/emoji/twitter/raised_hand/6.png b/public/images/emoji/twitter/raised_hand/6.png
new file mode 100644
index 00000000000..d387aac9c28
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand/6.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/twitter/raised_hand_with_fingers_splayed/2.png
new file mode 100644
index 00000000000..37a9048ad78
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/twitter/raised_hand_with_fingers_splayed/3.png
new file mode 100644
index 00000000000..6ddd74b5862
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/twitter/raised_hand_with_fingers_splayed/4.png
new file mode 100644
index 00000000000..1d901925fe9
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/twitter/raised_hand_with_fingers_splayed/5.png
new file mode 100644
index 00000000000..5fcac72a703
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/twitter/raised_hand_with_fingers_splayed/6.png
new file mode 100644
index 00000000000..74fa972cade
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/2.png
new file mode 100644
index 00000000000..5cdfab6d9a3
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/3.png
new file mode 100644
index 00000000000..a469f9b420e
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/4.png
new file mode 100644
index 00000000000..a8803b88169
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/5.png
new file mode 100644
index 00000000000..2d9def823e5
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/6.png
new file mode 100644
index 00000000000..bbcb6dc0d34
Binary files /dev/null and b/public/images/emoji/twitter/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/twitter/raised_hands/2.png b/public/images/emoji/twitter/raised_hands/2.png
new file mode 100644
index 00000000000..e745d8b3398
Binary files /dev/null and b/public/images/emoji/twitter/raised_hands/2.png differ
diff --git a/public/images/emoji/twitter/raised_hands/3.png b/public/images/emoji/twitter/raised_hands/3.png
new file mode 100644
index 00000000000..b9cf0595deb
Binary files /dev/null and b/public/images/emoji/twitter/raised_hands/3.png differ
diff --git a/public/images/emoji/twitter/raised_hands/4.png b/public/images/emoji/twitter/raised_hands/4.png
new file mode 100644
index 00000000000..e5cee4c1d9b
Binary files /dev/null and b/public/images/emoji/twitter/raised_hands/4.png differ
diff --git a/public/images/emoji/twitter/raised_hands/5.png b/public/images/emoji/twitter/raised_hands/5.png
new file mode 100644
index 00000000000..4d85ea358a9
Binary files /dev/null and b/public/images/emoji/twitter/raised_hands/5.png differ
diff --git a/public/images/emoji/twitter/raised_hands/6.png b/public/images/emoji/twitter/raised_hands/6.png
new file mode 100644
index 00000000000..07f83be74a6
Binary files /dev/null and b/public/images/emoji/twitter/raised_hands/6.png differ
diff --git a/public/images/emoji/twitter/raising_hand/2.png b/public/images/emoji/twitter/raising_hand/2.png
new file mode 100644
index 00000000000..8918f6323d1
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand/2.png differ
diff --git a/public/images/emoji/twitter/raising_hand/3.png b/public/images/emoji/twitter/raising_hand/3.png
new file mode 100644
index 00000000000..5fa8f64243f
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand/3.png differ
diff --git a/public/images/emoji/twitter/raising_hand/4.png b/public/images/emoji/twitter/raising_hand/4.png
new file mode 100644
index 00000000000..8ddd0ea893b
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand/4.png differ
diff --git a/public/images/emoji/twitter/raising_hand/5.png b/public/images/emoji/twitter/raising_hand/5.png
new file mode 100644
index 00000000000..9278077e53b
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand/5.png differ
diff --git a/public/images/emoji/twitter/raising_hand/6.png b/public/images/emoji/twitter/raising_hand/6.png
new file mode 100644
index 00000000000..e580c7cb642
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand/6.png differ
diff --git a/public/images/emoji/twitter/raising_hand_man.png b/public/images/emoji/twitter/raising_hand_man.png
new file mode 100644
index 00000000000..888c2e010f1
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_man.png differ
diff --git a/public/images/emoji/twitter/raising_hand_man/2.png b/public/images/emoji/twitter/raising_hand_man/2.png
new file mode 100644
index 00000000000..358c2c878bd
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_man/2.png differ
diff --git a/public/images/emoji/twitter/raising_hand_man/3.png b/public/images/emoji/twitter/raising_hand_man/3.png
new file mode 100644
index 00000000000..ebe5b4b0eb9
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_man/3.png differ
diff --git a/public/images/emoji/twitter/raising_hand_man/4.png b/public/images/emoji/twitter/raising_hand_man/4.png
new file mode 100644
index 00000000000..a2d3d552bbf
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_man/4.png differ
diff --git a/public/images/emoji/twitter/raising_hand_man/5.png b/public/images/emoji/twitter/raising_hand_man/5.png
new file mode 100644
index 00000000000..385867923f6
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_man/5.png differ
diff --git a/public/images/emoji/twitter/raising_hand_man/6.png b/public/images/emoji/twitter/raising_hand_man/6.png
new file mode 100644
index 00000000000..21a811c9976
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_man/6.png differ
diff --git a/public/images/emoji/twitter/raising_hand_woman.png b/public/images/emoji/twitter/raising_hand_woman.png
new file mode 100644
index 00000000000..88082b40829
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_woman.png differ
diff --git a/public/images/emoji/twitter/raising_hand_woman/2.png b/public/images/emoji/twitter/raising_hand_woman/2.png
new file mode 100644
index 00000000000..8918f6323d1
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/twitter/raising_hand_woman/3.png b/public/images/emoji/twitter/raising_hand_woman/3.png
new file mode 100644
index 00000000000..5fa8f64243f
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/twitter/raising_hand_woman/4.png b/public/images/emoji/twitter/raising_hand_woman/4.png
new file mode 100644
index 00000000000..8ddd0ea893b
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/twitter/raising_hand_woman/5.png b/public/images/emoji/twitter/raising_hand_woman/5.png
new file mode 100644
index 00000000000..9278077e53b
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/twitter/raising_hand_woman/6.png b/public/images/emoji/twitter/raising_hand_woman/6.png
new file mode 100644
index 00000000000..e580c7cb642
Binary files /dev/null and b/public/images/emoji/twitter/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/twitter/ram.png b/public/images/emoji/twitter/ram.png
index 66c80027f43..a0255d2e783 100644
Binary files a/public/images/emoji/twitter/ram.png and b/public/images/emoji/twitter/ram.png differ
diff --git a/public/images/emoji/twitter/ramen.png b/public/images/emoji/twitter/ramen.png
index 16a2647892b..017fb916385 100644
Binary files a/public/images/emoji/twitter/ramen.png and b/public/images/emoji/twitter/ramen.png differ
diff --git a/public/images/emoji/twitter/reminder_ribbon.png b/public/images/emoji/twitter/reminder_ribbon.png
index c6c9d319225..09d8d0e3081 100644
Binary files a/public/images/emoji/twitter/reminder_ribbon.png and b/public/images/emoji/twitter/reminder_ribbon.png differ
diff --git a/public/images/emoji/twitter/rescue_worker_helmet.png b/public/images/emoji/twitter/rescue_worker_helmet.png
new file mode 100644
index 00000000000..ad220c2eefe
Binary files /dev/null and b/public/images/emoji/twitter/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/twitter/reunion.png b/public/images/emoji/twitter/reunion.png
new file mode 100644
index 00000000000..1679d4c5b9c
Binary files /dev/null and b/public/images/emoji/twitter/reunion.png differ
diff --git a/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/2.png
new file mode 100644
index 00000000000..992338bb2b6
Binary files /dev/null and b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/3.png
new file mode 100644
index 00000000000..aadc06129fe
Binary files /dev/null and b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/4.png
new file mode 100644
index 00000000000..8ad10be1169
Binary files /dev/null and b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/5.png
new file mode 100644
index 00000000000..695c4a6cb9c
Binary files /dev/null and b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/6.png
new file mode 100644
index 00000000000..3457e01312c
Binary files /dev/null and b/public/images/emoji/twitter/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/twitter/rhinoceros.png b/public/images/emoji/twitter/rhinoceros.png
new file mode 100644
index 00000000000..e81681a6031
Binary files /dev/null and b/public/images/emoji/twitter/rhinoceros.png differ
diff --git a/public/images/emoji/twitter/rice.png b/public/images/emoji/twitter/rice.png
index 5018b04fcb6..c8092aac540 100644
Binary files a/public/images/emoji/twitter/rice.png and b/public/images/emoji/twitter/rice.png differ
diff --git a/public/images/emoji/twitter/rocket.png b/public/images/emoji/twitter/rocket.png
index 5cb78bd0c97..c5b0e8bd9cd 100644
Binary files a/public/images/emoji/twitter/rocket.png and b/public/images/emoji/twitter/rocket.png differ
diff --git a/public/images/emoji/twitter/rofl.png b/public/images/emoji/twitter/rofl.png
new file mode 100644
index 00000000000..ab648dd83df
Binary files /dev/null and b/public/images/emoji/twitter/rofl.png differ
diff --git a/public/images/emoji/twitter/roll_eyes.png b/public/images/emoji/twitter/roll_eyes.png
new file mode 100644
index 00000000000..8a864a00bdf
Binary files /dev/null and b/public/images/emoji/twitter/roll_eyes.png differ
diff --git a/public/images/emoji/twitter/rolling_eyes.png b/public/images/emoji/twitter/rolling_eyes.png
index 19f91b44b44..8a864a00bdf 100644
Binary files a/public/images/emoji/twitter/rolling_eyes.png and b/public/images/emoji/twitter/rolling_eyes.png differ
diff --git a/public/images/emoji/twitter/romania.png b/public/images/emoji/twitter/romania.png
new file mode 100644
index 00000000000..2b163248784
Binary files /dev/null and b/public/images/emoji/twitter/romania.png differ
diff --git a/public/images/emoji/twitter/rooster.png b/public/images/emoji/twitter/rooster.png
index 79d6908130c..9e499840f6d 100644
Binary files a/public/images/emoji/twitter/rooster.png and b/public/images/emoji/twitter/rooster.png differ
diff --git a/public/images/emoji/twitter/rowboat.png b/public/images/emoji/twitter/rowboat.png
index 56b905e6f2f..72560f2e25a 100644
Binary files a/public/images/emoji/twitter/rowboat.png and b/public/images/emoji/twitter/rowboat.png differ
diff --git a/public/images/emoji/twitter/rowboat/2.png b/public/images/emoji/twitter/rowboat/2.png
new file mode 100644
index 00000000000..37316291ca0
Binary files /dev/null and b/public/images/emoji/twitter/rowboat/2.png differ
diff --git a/public/images/emoji/twitter/rowboat/3.png b/public/images/emoji/twitter/rowboat/3.png
new file mode 100644
index 00000000000..d57f25f2d8b
Binary files /dev/null and b/public/images/emoji/twitter/rowboat/3.png differ
diff --git a/public/images/emoji/twitter/rowboat/4.png b/public/images/emoji/twitter/rowboat/4.png
new file mode 100644
index 00000000000..8457e4894f7
Binary files /dev/null and b/public/images/emoji/twitter/rowboat/4.png differ
diff --git a/public/images/emoji/twitter/rowboat/5.png b/public/images/emoji/twitter/rowboat/5.png
new file mode 100644
index 00000000000..98db5207f7b
Binary files /dev/null and b/public/images/emoji/twitter/rowboat/5.png differ
diff --git a/public/images/emoji/twitter/rowboat/6.png b/public/images/emoji/twitter/rowboat/6.png
new file mode 100644
index 00000000000..a8cea7bd6d8
Binary files /dev/null and b/public/images/emoji/twitter/rowboat/6.png differ
diff --git a/public/images/emoji/twitter/rowing_man.png b/public/images/emoji/twitter/rowing_man.png
new file mode 100644
index 00000000000..72560f2e25a
Binary files /dev/null and b/public/images/emoji/twitter/rowing_man.png differ
diff --git a/public/images/emoji/twitter/rowing_man/2.png b/public/images/emoji/twitter/rowing_man/2.png
new file mode 100644
index 00000000000..37316291ca0
Binary files /dev/null and b/public/images/emoji/twitter/rowing_man/2.png differ
diff --git a/public/images/emoji/twitter/rowing_man/3.png b/public/images/emoji/twitter/rowing_man/3.png
new file mode 100644
index 00000000000..d57f25f2d8b
Binary files /dev/null and b/public/images/emoji/twitter/rowing_man/3.png differ
diff --git a/public/images/emoji/twitter/rowing_man/4.png b/public/images/emoji/twitter/rowing_man/4.png
new file mode 100644
index 00000000000..8457e4894f7
Binary files /dev/null and b/public/images/emoji/twitter/rowing_man/4.png differ
diff --git a/public/images/emoji/twitter/rowing_man/5.png b/public/images/emoji/twitter/rowing_man/5.png
new file mode 100644
index 00000000000..98db5207f7b
Binary files /dev/null and b/public/images/emoji/twitter/rowing_man/5.png differ
diff --git a/public/images/emoji/twitter/rowing_man/6.png b/public/images/emoji/twitter/rowing_man/6.png
new file mode 100644
index 00000000000..a8cea7bd6d8
Binary files /dev/null and b/public/images/emoji/twitter/rowing_man/6.png differ
diff --git a/public/images/emoji/twitter/rowing_woman.png b/public/images/emoji/twitter/rowing_woman.png
new file mode 100644
index 00000000000..621b0acc040
Binary files /dev/null and b/public/images/emoji/twitter/rowing_woman.png differ
diff --git a/public/images/emoji/twitter/rowing_woman/2.png b/public/images/emoji/twitter/rowing_woman/2.png
new file mode 100644
index 00000000000..0bee4147be6
Binary files /dev/null and b/public/images/emoji/twitter/rowing_woman/2.png differ
diff --git a/public/images/emoji/twitter/rowing_woman/3.png b/public/images/emoji/twitter/rowing_woman/3.png
new file mode 100644
index 00000000000..f51db263218
Binary files /dev/null and b/public/images/emoji/twitter/rowing_woman/3.png differ
diff --git a/public/images/emoji/twitter/rowing_woman/4.png b/public/images/emoji/twitter/rowing_woman/4.png
new file mode 100644
index 00000000000..e61c949d0d6
Binary files /dev/null and b/public/images/emoji/twitter/rowing_woman/4.png differ
diff --git a/public/images/emoji/twitter/rowing_woman/5.png b/public/images/emoji/twitter/rowing_woman/5.png
new file mode 100644
index 00000000000..b21bb84ca6f
Binary files /dev/null and b/public/images/emoji/twitter/rowing_woman/5.png differ
diff --git a/public/images/emoji/twitter/rowing_woman/6.png b/public/images/emoji/twitter/rowing_woman/6.png
new file mode 100644
index 00000000000..cc2a55e7672
Binary files /dev/null and b/public/images/emoji/twitter/rowing_woman/6.png differ
diff --git a/public/images/emoji/twitter/runner.png b/public/images/emoji/twitter/runner.png
index 2d5d3a83b0d..10ab7874a04 100644
Binary files a/public/images/emoji/twitter/runner.png and b/public/images/emoji/twitter/runner.png differ
diff --git a/public/images/emoji/twitter/runner/2.png b/public/images/emoji/twitter/runner/2.png
new file mode 100644
index 00000000000..6c124f83eeb
Binary files /dev/null and b/public/images/emoji/twitter/runner/2.png differ
diff --git a/public/images/emoji/twitter/runner/3.png b/public/images/emoji/twitter/runner/3.png
new file mode 100644
index 00000000000..ebaf30c9067
Binary files /dev/null and b/public/images/emoji/twitter/runner/3.png differ
diff --git a/public/images/emoji/twitter/runner/4.png b/public/images/emoji/twitter/runner/4.png
new file mode 100644
index 00000000000..230bc7a138b
Binary files /dev/null and b/public/images/emoji/twitter/runner/4.png differ
diff --git a/public/images/emoji/twitter/runner/5.png b/public/images/emoji/twitter/runner/5.png
new file mode 100644
index 00000000000..3418e923771
Binary files /dev/null and b/public/images/emoji/twitter/runner/5.png differ
diff --git a/public/images/emoji/twitter/runner/6.png b/public/images/emoji/twitter/runner/6.png
new file mode 100644
index 00000000000..015e260ba4b
Binary files /dev/null and b/public/images/emoji/twitter/runner/6.png differ
diff --git a/public/images/emoji/twitter/running_man.png b/public/images/emoji/twitter/running_man.png
new file mode 100644
index 00000000000..10ab7874a04
Binary files /dev/null and b/public/images/emoji/twitter/running_man.png differ
diff --git a/public/images/emoji/twitter/running_man/2.png b/public/images/emoji/twitter/running_man/2.png
new file mode 100644
index 00000000000..6c124f83eeb
Binary files /dev/null and b/public/images/emoji/twitter/running_man/2.png differ
diff --git a/public/images/emoji/twitter/running_man/3.png b/public/images/emoji/twitter/running_man/3.png
new file mode 100644
index 00000000000..ebaf30c9067
Binary files /dev/null and b/public/images/emoji/twitter/running_man/3.png differ
diff --git a/public/images/emoji/twitter/running_man/4.png b/public/images/emoji/twitter/running_man/4.png
new file mode 100644
index 00000000000..230bc7a138b
Binary files /dev/null and b/public/images/emoji/twitter/running_man/4.png differ
diff --git a/public/images/emoji/twitter/running_man/5.png b/public/images/emoji/twitter/running_man/5.png
new file mode 100644
index 00000000000..3418e923771
Binary files /dev/null and b/public/images/emoji/twitter/running_man/5.png differ
diff --git a/public/images/emoji/twitter/running_man/6.png b/public/images/emoji/twitter/running_man/6.png
new file mode 100644
index 00000000000..015e260ba4b
Binary files /dev/null and b/public/images/emoji/twitter/running_man/6.png differ
diff --git a/public/images/emoji/twitter/running_shirt_with_sash.png b/public/images/emoji/twitter/running_shirt_with_sash.png
index 731947e888f..e28ae6ff4f3 100644
Binary files a/public/images/emoji/twitter/running_shirt_with_sash.png and b/public/images/emoji/twitter/running_shirt_with_sash.png differ
diff --git a/public/images/emoji/twitter/running_woman.png b/public/images/emoji/twitter/running_woman.png
new file mode 100644
index 00000000000..01418f1a8da
Binary files /dev/null and b/public/images/emoji/twitter/running_woman.png differ
diff --git a/public/images/emoji/twitter/running_woman/2.png b/public/images/emoji/twitter/running_woman/2.png
new file mode 100644
index 00000000000..cde0a287031
Binary files /dev/null and b/public/images/emoji/twitter/running_woman/2.png differ
diff --git a/public/images/emoji/twitter/running_woman/3.png b/public/images/emoji/twitter/running_woman/3.png
new file mode 100644
index 00000000000..a9b8ba20cec
Binary files /dev/null and b/public/images/emoji/twitter/running_woman/3.png differ
diff --git a/public/images/emoji/twitter/running_woman/4.png b/public/images/emoji/twitter/running_woman/4.png
new file mode 100644
index 00000000000..e14cb3884a9
Binary files /dev/null and b/public/images/emoji/twitter/running_woman/4.png differ
diff --git a/public/images/emoji/twitter/running_woman/5.png b/public/images/emoji/twitter/running_woman/5.png
new file mode 100644
index 00000000000..54b0cb838b2
Binary files /dev/null and b/public/images/emoji/twitter/running_woman/5.png differ
diff --git a/public/images/emoji/twitter/running_woman/6.png b/public/images/emoji/twitter/running_woman/6.png
new file mode 100644
index 00000000000..114138c0b68
Binary files /dev/null and b/public/images/emoji/twitter/running_woman/6.png differ
diff --git a/public/images/emoji/twitter/rwanda.png b/public/images/emoji/twitter/rwanda.png
new file mode 100644
index 00000000000..a45a988ff58
Binary files /dev/null and b/public/images/emoji/twitter/rwanda.png differ
diff --git a/public/images/emoji/twitter/sake.png b/public/images/emoji/twitter/sake.png
index 5712e64dfa8..b892cbd7538 100644
Binary files a/public/images/emoji/twitter/sake.png and b/public/images/emoji/twitter/sake.png differ
diff --git a/public/images/emoji/twitter/samoa.png b/public/images/emoji/twitter/samoa.png
new file mode 100644
index 00000000000..de81c048d01
Binary files /dev/null and b/public/images/emoji/twitter/samoa.png differ
diff --git a/public/images/emoji/twitter/san_marino.png b/public/images/emoji/twitter/san_marino.png
new file mode 100644
index 00000000000..fa20a008086
Binary files /dev/null and b/public/images/emoji/twitter/san_marino.png differ
diff --git a/public/images/emoji/twitter/sandwich.png b/public/images/emoji/twitter/sandwich.png
new file mode 100644
index 00000000000..ba3f9a1cdb7
Binary files /dev/null and b/public/images/emoji/twitter/sandwich.png differ
diff --git a/public/images/emoji/twitter/santa.png b/public/images/emoji/twitter/santa.png
index 9af2d28bb77..fd2297327fc 100644
Binary files a/public/images/emoji/twitter/santa.png and b/public/images/emoji/twitter/santa.png differ
diff --git a/public/images/emoji/twitter/santa/2.png b/public/images/emoji/twitter/santa/2.png
new file mode 100644
index 00000000000..2a5e77872a9
Binary files /dev/null and b/public/images/emoji/twitter/santa/2.png differ
diff --git a/public/images/emoji/twitter/santa/3.png b/public/images/emoji/twitter/santa/3.png
new file mode 100644
index 00000000000..a71ab0f5c87
Binary files /dev/null and b/public/images/emoji/twitter/santa/3.png differ
diff --git a/public/images/emoji/twitter/santa/4.png b/public/images/emoji/twitter/santa/4.png
new file mode 100644
index 00000000000..f1309c60121
Binary files /dev/null and b/public/images/emoji/twitter/santa/4.png differ
diff --git a/public/images/emoji/twitter/santa/5.png b/public/images/emoji/twitter/santa/5.png
new file mode 100644
index 00000000000..76ce5987f36
Binary files /dev/null and b/public/images/emoji/twitter/santa/5.png differ
diff --git a/public/images/emoji/twitter/santa/6.png b/public/images/emoji/twitter/santa/6.png
new file mode 100644
index 00000000000..fa476d8f99f
Binary files /dev/null and b/public/images/emoji/twitter/santa/6.png differ
diff --git a/public/images/emoji/twitter/sao_tome_principe.png b/public/images/emoji/twitter/sao_tome_principe.png
new file mode 100644
index 00000000000..bbfcbd18df3
Binary files /dev/null and b/public/images/emoji/twitter/sao_tome_principe.png differ
diff --git a/public/images/emoji/twitter/satellite.png b/public/images/emoji/twitter/satellite.png
index 00c384c5d66..63ee7b91319 100644
Binary files a/public/images/emoji/twitter/satellite.png and b/public/images/emoji/twitter/satellite.png differ
diff --git a/public/images/emoji/twitter/satellite_orbital.png b/public/images/emoji/twitter/satellite_orbital.png
index ef004f4ecbc..81715516af6 100644
Binary files a/public/images/emoji/twitter/satellite_orbital.png and b/public/images/emoji/twitter/satellite_orbital.png differ
diff --git a/public/images/emoji/twitter/saudi_arabia.png b/public/images/emoji/twitter/saudi_arabia.png
new file mode 100644
index 00000000000..59954eccbc0
Binary files /dev/null and b/public/images/emoji/twitter/saudi_arabia.png differ
diff --git a/public/images/emoji/twitter/sauropod.png b/public/images/emoji/twitter/sauropod.png
new file mode 100644
index 00000000000..2f4d6199975
Binary files /dev/null and b/public/images/emoji/twitter/sauropod.png differ
diff --git a/public/images/emoji/twitter/saxophone.png b/public/images/emoji/twitter/saxophone.png
index 0db8249b132..3f9041ac17b 100644
Binary files a/public/images/emoji/twitter/saxophone.png and b/public/images/emoji/twitter/saxophone.png differ
diff --git a/public/images/emoji/twitter/scarf.png b/public/images/emoji/twitter/scarf.png
new file mode 100644
index 00000000000..73653eee2bd
Binary files /dev/null and b/public/images/emoji/twitter/scarf.png differ
diff --git a/public/images/emoji/twitter/scissors.png b/public/images/emoji/twitter/scissors.png
index 3e9b3bf9552..de918c6a297 100644
Binary files a/public/images/emoji/twitter/scissors.png and b/public/images/emoji/twitter/scissors.png differ
diff --git a/public/images/emoji/twitter/scorpion.png b/public/images/emoji/twitter/scorpion.png
index 6b0d18e53f1..2215d4642fd 100644
Binary files a/public/images/emoji/twitter/scorpion.png and b/public/images/emoji/twitter/scorpion.png differ
diff --git a/public/images/emoji/twitter/scream.png b/public/images/emoji/twitter/scream.png
index 1efe91af5cb..9960ab5065c 100644
Binary files a/public/images/emoji/twitter/scream.png and b/public/images/emoji/twitter/scream.png differ
diff --git a/public/images/emoji/twitter/scream_cat.png b/public/images/emoji/twitter/scream_cat.png
index 38d004fa684..55ea2a56939 100644
Binary files a/public/images/emoji/twitter/scream_cat.png and b/public/images/emoji/twitter/scream_cat.png differ
diff --git a/public/images/emoji/twitter/selfie.png b/public/images/emoji/twitter/selfie.png
new file mode 100644
index 00000000000..f6411e5444c
Binary files /dev/null and b/public/images/emoji/twitter/selfie.png differ
diff --git a/public/images/emoji/twitter/selfie/2.png b/public/images/emoji/twitter/selfie/2.png
new file mode 100644
index 00000000000..24a81ca396a
Binary files /dev/null and b/public/images/emoji/twitter/selfie/2.png differ
diff --git a/public/images/emoji/twitter/selfie/3.png b/public/images/emoji/twitter/selfie/3.png
new file mode 100644
index 00000000000..712bc730000
Binary files /dev/null and b/public/images/emoji/twitter/selfie/3.png differ
diff --git a/public/images/emoji/twitter/selfie/4.png b/public/images/emoji/twitter/selfie/4.png
new file mode 100644
index 00000000000..77139915b79
Binary files /dev/null and b/public/images/emoji/twitter/selfie/4.png differ
diff --git a/public/images/emoji/twitter/selfie/5.png b/public/images/emoji/twitter/selfie/5.png
new file mode 100644
index 00000000000..f326d7825d1
Binary files /dev/null and b/public/images/emoji/twitter/selfie/5.png differ
diff --git a/public/images/emoji/twitter/selfie/6.png b/public/images/emoji/twitter/selfie/6.png
new file mode 100644
index 00000000000..de9106c369f
Binary files /dev/null and b/public/images/emoji/twitter/selfie/6.png differ
diff --git a/public/images/emoji/twitter/senegal.png b/public/images/emoji/twitter/senegal.png
new file mode 100644
index 00000000000..2d32427625a
Binary files /dev/null and b/public/images/emoji/twitter/senegal.png differ
diff --git a/public/images/emoji/twitter/serbia.png b/public/images/emoji/twitter/serbia.png
new file mode 100644
index 00000000000..a7af1346e56
Binary files /dev/null and b/public/images/emoji/twitter/serbia.png differ
diff --git a/public/images/emoji/twitter/seven.png b/public/images/emoji/twitter/seven.png
index 6547329774d..8ef72161feb 100644
Binary files a/public/images/emoji/twitter/seven.png and b/public/images/emoji/twitter/seven.png differ
diff --git a/public/images/emoji/twitter/seychelles.png b/public/images/emoji/twitter/seychelles.png
new file mode 100644
index 00000000000..e69ca6add18
Binary files /dev/null and b/public/images/emoji/twitter/seychelles.png differ
diff --git a/public/images/emoji/twitter/shallow_pan_of_food.png b/public/images/emoji/twitter/shallow_pan_of_food.png
new file mode 100644
index 00000000000..300f700fcc4
Binary files /dev/null and b/public/images/emoji/twitter/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/twitter/shark.png b/public/images/emoji/twitter/shark.png
new file mode 100644
index 00000000000..856894743dd
Binary files /dev/null and b/public/images/emoji/twitter/shark.png differ
diff --git a/public/images/emoji/twitter/shaved_ice.png b/public/images/emoji/twitter/shaved_ice.png
index 1ecf099ca0e..7cd17c20e6d 100644
Binary files a/public/images/emoji/twitter/shaved_ice.png and b/public/images/emoji/twitter/shaved_ice.png differ
diff --git a/public/images/emoji/twitter/sheep.png b/public/images/emoji/twitter/sheep.png
index b60d354d762..68ace299040 100644
Binary files a/public/images/emoji/twitter/sheep.png and b/public/images/emoji/twitter/sheep.png differ
diff --git a/public/images/emoji/twitter/shopping.png b/public/images/emoji/twitter/shopping.png
new file mode 100644
index 00000000000..ee15abd9933
Binary files /dev/null and b/public/images/emoji/twitter/shopping.png differ
diff --git a/public/images/emoji/twitter/shopping_cart.png b/public/images/emoji/twitter/shopping_cart.png
new file mode 100644
index 00000000000..419cc70376a
Binary files /dev/null and b/public/images/emoji/twitter/shopping_cart.png differ
diff --git a/public/images/emoji/twitter/shrimp.png b/public/images/emoji/twitter/shrimp.png
new file mode 100644
index 00000000000..e45d741b479
Binary files /dev/null and b/public/images/emoji/twitter/shrimp.png differ
diff --git a/public/images/emoji/twitter/sierra_leone.png b/public/images/emoji/twitter/sierra_leone.png
new file mode 100644
index 00000000000..816f090002a
Binary files /dev/null and b/public/images/emoji/twitter/sierra_leone.png differ
diff --git a/public/images/emoji/twitter/sign_of_the_horns.png b/public/images/emoji/twitter/sign_of_the_horns.png
index 788071275e3..72d987aadc3 100644
Binary files a/public/images/emoji/twitter/sign_of_the_horns.png and b/public/images/emoji/twitter/sign_of_the_horns.png differ
diff --git a/public/images/emoji/twitter/sign_of_the_horns/2.png b/public/images/emoji/twitter/sign_of_the_horns/2.png
new file mode 100644
index 00000000000..8d87aab277f
Binary files /dev/null and b/public/images/emoji/twitter/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/twitter/sign_of_the_horns/3.png b/public/images/emoji/twitter/sign_of_the_horns/3.png
new file mode 100644
index 00000000000..39a19cd401f
Binary files /dev/null and b/public/images/emoji/twitter/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/twitter/sign_of_the_horns/4.png b/public/images/emoji/twitter/sign_of_the_horns/4.png
new file mode 100644
index 00000000000..73bedb2c022
Binary files /dev/null and b/public/images/emoji/twitter/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/twitter/sign_of_the_horns/5.png b/public/images/emoji/twitter/sign_of_the_horns/5.png
new file mode 100644
index 00000000000..36413ab8cfb
Binary files /dev/null and b/public/images/emoji/twitter/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/twitter/sign_of_the_horns/6.png b/public/images/emoji/twitter/sign_of_the_horns/6.png
new file mode 100644
index 00000000000..1cb1b661b95
Binary files /dev/null and b/public/images/emoji/twitter/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/twitter/singapore.png b/public/images/emoji/twitter/singapore.png
new file mode 100644
index 00000000000..4cf2332d20f
Binary files /dev/null and b/public/images/emoji/twitter/singapore.png differ
diff --git a/public/images/emoji/twitter/sint_maarten.png b/public/images/emoji/twitter/sint_maarten.png
new file mode 100644
index 00000000000..5248152aba9
Binary files /dev/null and b/public/images/emoji/twitter/sint_maarten.png differ
diff --git a/public/images/emoji/twitter/six.png b/public/images/emoji/twitter/six.png
index 990c260628e..f229efebf12 100644
Binary files a/public/images/emoji/twitter/six.png and b/public/images/emoji/twitter/six.png differ
diff --git a/public/images/emoji/twitter/ski.png b/public/images/emoji/twitter/ski.png
index dec2ce43541..09fe52fa17f 100644
Binary files a/public/images/emoji/twitter/ski.png and b/public/images/emoji/twitter/ski.png differ
diff --git a/public/images/emoji/twitter/skier.png b/public/images/emoji/twitter/skier.png
index c9598b96b07..a4cffe7aca6 100644
Binary files a/public/images/emoji/twitter/skier.png and b/public/images/emoji/twitter/skier.png differ
diff --git a/public/images/emoji/twitter/sled.png b/public/images/emoji/twitter/sled.png
new file mode 100644
index 00000000000..01805b1fe76
Binary files /dev/null and b/public/images/emoji/twitter/sled.png differ
diff --git a/public/images/emoji/twitter/sleeping.png b/public/images/emoji/twitter/sleeping.png
index 55bd19842d2..0a7e19d0be5 100644
Binary files a/public/images/emoji/twitter/sleeping.png and b/public/images/emoji/twitter/sleeping.png differ
diff --git a/public/images/emoji/twitter/sleeping_accommodation/2.png b/public/images/emoji/twitter/sleeping_accommodation/2.png
new file mode 100644
index 00000000000..feb77c5dac0
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/twitter/sleeping_accommodation/3.png b/public/images/emoji/twitter/sleeping_accommodation/3.png
new file mode 100644
index 00000000000..6934d93973f
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/twitter/sleeping_accommodation/4.png b/public/images/emoji/twitter/sleeping_accommodation/4.png
new file mode 100644
index 00000000000..e7705b515e9
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/twitter/sleeping_accommodation/5.png b/public/images/emoji/twitter/sleeping_accommodation/5.png
new file mode 100644
index 00000000000..76d7ae664b3
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/twitter/sleeping_accommodation/6.png b/public/images/emoji/twitter/sleeping_accommodation/6.png
new file mode 100644
index 00000000000..6ea7b534620
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/twitter/sleeping_bed.png b/public/images/emoji/twitter/sleeping_bed.png
new file mode 100644
index 00000000000..70398fd0978
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_bed.png differ
diff --git a/public/images/emoji/twitter/sleeping_bed/2.png b/public/images/emoji/twitter/sleeping_bed/2.png
new file mode 100644
index 00000000000..feb77c5dac0
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_bed/2.png differ
diff --git a/public/images/emoji/twitter/sleeping_bed/3.png b/public/images/emoji/twitter/sleeping_bed/3.png
new file mode 100644
index 00000000000..6934d93973f
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_bed/3.png differ
diff --git a/public/images/emoji/twitter/sleeping_bed/4.png b/public/images/emoji/twitter/sleeping_bed/4.png
new file mode 100644
index 00000000000..e7705b515e9
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_bed/4.png differ
diff --git a/public/images/emoji/twitter/sleeping_bed/5.png b/public/images/emoji/twitter/sleeping_bed/5.png
new file mode 100644
index 00000000000..76d7ae664b3
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_bed/5.png differ
diff --git a/public/images/emoji/twitter/sleeping_bed/6.png b/public/images/emoji/twitter/sleeping_bed/6.png
new file mode 100644
index 00000000000..6ea7b534620
Binary files /dev/null and b/public/images/emoji/twitter/sleeping_bed/6.png differ
diff --git a/public/images/emoji/twitter/sleepy.png b/public/images/emoji/twitter/sleepy.png
index 125521645ea..ff62e358809 100644
Binary files a/public/images/emoji/twitter/sleepy.png and b/public/images/emoji/twitter/sleepy.png differ
diff --git a/public/images/emoji/twitter/sleuth_or_spy.png b/public/images/emoji/twitter/sleuth_or_spy.png
index 6b77a14a23b..587e506d98d 100644
Binary files a/public/images/emoji/twitter/sleuth_or_spy.png and b/public/images/emoji/twitter/sleuth_or_spy.png differ
diff --git a/public/images/emoji/twitter/sleuth_or_spy/2.png b/public/images/emoji/twitter/sleuth_or_spy/2.png
new file mode 100644
index 00000000000..a25d5ea4d44
Binary files /dev/null and b/public/images/emoji/twitter/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/twitter/sleuth_or_spy/3.png b/public/images/emoji/twitter/sleuth_or_spy/3.png
new file mode 100644
index 00000000000..f100fd13a45
Binary files /dev/null and b/public/images/emoji/twitter/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/twitter/sleuth_or_spy/4.png b/public/images/emoji/twitter/sleuth_or_spy/4.png
new file mode 100644
index 00000000000..775a8b2f2b0
Binary files /dev/null and b/public/images/emoji/twitter/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/twitter/sleuth_or_spy/5.png b/public/images/emoji/twitter/sleuth_or_spy/5.png
new file mode 100644
index 00000000000..c9703ba9946
Binary files /dev/null and b/public/images/emoji/twitter/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/twitter/sleuth_or_spy/6.png b/public/images/emoji/twitter/sleuth_or_spy/6.png
new file mode 100644
index 00000000000..55cc03db8d4
Binary files /dev/null and b/public/images/emoji/twitter/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/twitter/slightly_smiling.png b/public/images/emoji/twitter/slightly_smiling.png
new file mode 100644
index 00000000000..89e96a61201
Binary files /dev/null and b/public/images/emoji/twitter/slightly_smiling.png differ
diff --git a/public/images/emoji/twitter/slovakia.png b/public/images/emoji/twitter/slovakia.png
new file mode 100644
index 00000000000..9b716032fd8
Binary files /dev/null and b/public/images/emoji/twitter/slovakia.png differ
diff --git a/public/images/emoji/twitter/slovenia.png b/public/images/emoji/twitter/slovenia.png
new file mode 100644
index 00000000000..6dfbe6eae24
Binary files /dev/null and b/public/images/emoji/twitter/slovenia.png differ
diff --git a/public/images/emoji/twitter/small_airplane.png b/public/images/emoji/twitter/small_airplane.png
index 6784909fffb..47399184f72 100644
Binary files a/public/images/emoji/twitter/small_airplane.png and b/public/images/emoji/twitter/small_airplane.png differ
diff --git a/public/images/emoji/twitter/smile.png b/public/images/emoji/twitter/smile.png
index 46b6e25092d..47264166800 100644
Binary files a/public/images/emoji/twitter/smile.png and b/public/images/emoji/twitter/smile.png differ
diff --git a/public/images/emoji/twitter/smile_cat.png b/public/images/emoji/twitter/smile_cat.png
index de25c5699f3..104ab4e73a5 100644
Binary files a/public/images/emoji/twitter/smile_cat.png and b/public/images/emoji/twitter/smile_cat.png differ
diff --git a/public/images/emoji/twitter/smiley_cat.png b/public/images/emoji/twitter/smiley_cat.png
index d2b189233bc..ea9ae4eb56a 100644
Binary files a/public/images/emoji/twitter/smiley_cat.png and b/public/images/emoji/twitter/smiley_cat.png differ
diff --git a/public/images/emoji/twitter/smirk_cat.png b/public/images/emoji/twitter/smirk_cat.png
index 717af143c66..315fdb05789 100644
Binary files a/public/images/emoji/twitter/smirk_cat.png and b/public/images/emoji/twitter/smirk_cat.png differ
diff --git a/public/images/emoji/twitter/sneezing_face.png b/public/images/emoji/twitter/sneezing_face.png
new file mode 100644
index 00000000000..b1801ae41ff
Binary files /dev/null and b/public/images/emoji/twitter/sneezing_face.png differ
diff --git a/public/images/emoji/twitter/snowboarder.png b/public/images/emoji/twitter/snowboarder.png
index 2c2ae47882c..74f312e46e5 100644
Binary files a/public/images/emoji/twitter/snowboarder.png and b/public/images/emoji/twitter/snowboarder.png differ
diff --git a/public/images/emoji/twitter/snowboarder/2.png b/public/images/emoji/twitter/snowboarder/2.png
new file mode 100644
index 00000000000..a4f49938218
Binary files /dev/null and b/public/images/emoji/twitter/snowboarder/2.png differ
diff --git a/public/images/emoji/twitter/snowboarder/3.png b/public/images/emoji/twitter/snowboarder/3.png
new file mode 100644
index 00000000000..f18d5084305
Binary files /dev/null and b/public/images/emoji/twitter/snowboarder/3.png differ
diff --git a/public/images/emoji/twitter/snowboarder/4.png b/public/images/emoji/twitter/snowboarder/4.png
new file mode 100644
index 00000000000..72183274200
Binary files /dev/null and b/public/images/emoji/twitter/snowboarder/4.png differ
diff --git a/public/images/emoji/twitter/snowboarder/5.png b/public/images/emoji/twitter/snowboarder/5.png
new file mode 100644
index 00000000000..b3372f66d7a
Binary files /dev/null and b/public/images/emoji/twitter/snowboarder/5.png differ
diff --git a/public/images/emoji/twitter/snowboarder/6.png b/public/images/emoji/twitter/snowboarder/6.png
new file mode 100644
index 00000000000..245ed273019
Binary files /dev/null and b/public/images/emoji/twitter/snowboarder/6.png differ
diff --git a/public/images/emoji/twitter/snowman.png b/public/images/emoji/twitter/snowman.png
index 93df265fb2d..b6c90da48d5 100644
Binary files a/public/images/emoji/twitter/snowman.png and b/public/images/emoji/twitter/snowman.png differ
diff --git a/public/images/emoji/twitter/snowman2.png b/public/images/emoji/twitter/snowman2.png
index d73b56cff4f..abefab72343 100644
Binary files a/public/images/emoji/twitter/snowman2.png and b/public/images/emoji/twitter/snowman2.png differ
diff --git a/public/images/emoji/twitter/snowman_with_snow.png b/public/images/emoji/twitter/snowman_with_snow.png
new file mode 100644
index 00000000000..abefab72343
Binary files /dev/null and b/public/images/emoji/twitter/snowman_with_snow.png differ
diff --git a/public/images/emoji/twitter/sob.png b/public/images/emoji/twitter/sob.png
index 674f4df95c1..faf0b07edea 100644
Binary files a/public/images/emoji/twitter/sob.png and b/public/images/emoji/twitter/sob.png differ
diff --git a/public/images/emoji/twitter/soccer.png b/public/images/emoji/twitter/soccer.png
index 4900e927531..28b1b60076f 100644
Binary files a/public/images/emoji/twitter/soccer.png and b/public/images/emoji/twitter/soccer.png differ
diff --git a/public/images/emoji/twitter/socks.png b/public/images/emoji/twitter/socks.png
new file mode 100644
index 00000000000..8f2b9bbe9e3
Binary files /dev/null and b/public/images/emoji/twitter/socks.png differ
diff --git a/public/images/emoji/twitter/solomon_islands.png b/public/images/emoji/twitter/solomon_islands.png
new file mode 100644
index 00000000000..e4476e18806
Binary files /dev/null and b/public/images/emoji/twitter/solomon_islands.png differ
diff --git a/public/images/emoji/twitter/somalia.png b/public/images/emoji/twitter/somalia.png
new file mode 100644
index 00000000000..209fffeaed0
Binary files /dev/null and b/public/images/emoji/twitter/somalia.png differ
diff --git a/public/images/emoji/twitter/soon.png b/public/images/emoji/twitter/soon.png
index 11fe57f6f92..9edaecce852 100644
Binary files a/public/images/emoji/twitter/soon.png and b/public/images/emoji/twitter/soon.png differ
diff --git a/public/images/emoji/twitter/south_africa.png b/public/images/emoji/twitter/south_africa.png
new file mode 100644
index 00000000000..d40f1c75c81
Binary files /dev/null and b/public/images/emoji/twitter/south_africa.png differ
diff --git a/public/images/emoji/twitter/south_georgia_south_sandwich_islands.png b/public/images/emoji/twitter/south_georgia_south_sandwich_islands.png
new file mode 100644
index 00000000000..58f47bcd9b9
Binary files /dev/null and b/public/images/emoji/twitter/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/twitter/south_sudan.png b/public/images/emoji/twitter/south_sudan.png
new file mode 100644
index 00000000000..c7cbc6967c2
Binary files /dev/null and b/public/images/emoji/twitter/south_sudan.png differ
diff --git a/public/images/emoji/twitter/space_invader.png b/public/images/emoji/twitter/space_invader.png
index 043e4950ac3..6d385070792 100644
Binary files a/public/images/emoji/twitter/space_invader.png and b/public/images/emoji/twitter/space_invader.png differ
diff --git a/public/images/emoji/twitter/spaghetti.png b/public/images/emoji/twitter/spaghetti.png
index fb02e2d7edf..4dc8ee44d12 100644
Binary files a/public/images/emoji/twitter/spaghetti.png and b/public/images/emoji/twitter/spaghetti.png differ
diff --git a/public/images/emoji/twitter/sparkler.png b/public/images/emoji/twitter/sparkler.png
index 35bf617ae24..29979fb6961 100644
Binary files a/public/images/emoji/twitter/sparkler.png and b/public/images/emoji/twitter/sparkler.png differ
diff --git a/public/images/emoji/twitter/speedboat.png b/public/images/emoji/twitter/speedboat.png
index ce0b69cc383..212bd89406b 100644
Binary files a/public/images/emoji/twitter/speedboat.png and b/public/images/emoji/twitter/speedboat.png differ
diff --git a/public/images/emoji/twitter/spiral_calendar.png b/public/images/emoji/twitter/spiral_calendar.png
new file mode 100644
index 00000000000..8cd3bd7e57f
Binary files /dev/null and b/public/images/emoji/twitter/spiral_calendar.png differ
diff --git a/public/images/emoji/twitter/spiral_notepad.png b/public/images/emoji/twitter/spiral_notepad.png
new file mode 100644
index 00000000000..b8ebfe080a3
Binary files /dev/null and b/public/images/emoji/twitter/spiral_notepad.png differ
diff --git a/public/images/emoji/twitter/spoon.png b/public/images/emoji/twitter/spoon.png
new file mode 100644
index 00000000000..960cba2bf7f
Binary files /dev/null and b/public/images/emoji/twitter/spoon.png differ
diff --git a/public/images/emoji/twitter/spy.png b/public/images/emoji/twitter/spy.png
index 6b77a14a23b..587e506d98d 100644
Binary files a/public/images/emoji/twitter/spy.png and b/public/images/emoji/twitter/spy.png differ
diff --git a/public/images/emoji/twitter/spy/2.png b/public/images/emoji/twitter/spy/2.png
new file mode 100644
index 00000000000..a25d5ea4d44
Binary files /dev/null and b/public/images/emoji/twitter/spy/2.png differ
diff --git a/public/images/emoji/twitter/spy/3.png b/public/images/emoji/twitter/spy/3.png
new file mode 100644
index 00000000000..f100fd13a45
Binary files /dev/null and b/public/images/emoji/twitter/spy/3.png differ
diff --git a/public/images/emoji/twitter/spy/4.png b/public/images/emoji/twitter/spy/4.png
new file mode 100644
index 00000000000..775a8b2f2b0
Binary files /dev/null and b/public/images/emoji/twitter/spy/4.png differ
diff --git a/public/images/emoji/twitter/spy/5.png b/public/images/emoji/twitter/spy/5.png
new file mode 100644
index 00000000000..c9703ba9946
Binary files /dev/null and b/public/images/emoji/twitter/spy/5.png differ
diff --git a/public/images/emoji/twitter/spy/6.png b/public/images/emoji/twitter/spy/6.png
new file mode 100644
index 00000000000..55cc03db8d4
Binary files /dev/null and b/public/images/emoji/twitter/spy/6.png differ
diff --git a/public/images/emoji/twitter/squid.png b/public/images/emoji/twitter/squid.png
new file mode 100644
index 00000000000..8e1b95f60e9
Binary files /dev/null and b/public/images/emoji/twitter/squid.png differ
diff --git a/public/images/emoji/twitter/sri_lanka.png b/public/images/emoji/twitter/sri_lanka.png
new file mode 100644
index 00000000000..f15b9be56dd
Binary files /dev/null and b/public/images/emoji/twitter/sri_lanka.png differ
diff --git a/public/images/emoji/twitter/st_barthelemy.png b/public/images/emoji/twitter/st_barthelemy.png
new file mode 100644
index 00000000000..e213bf7e406
Binary files /dev/null and b/public/images/emoji/twitter/st_barthelemy.png differ
diff --git a/public/images/emoji/twitter/st_helena.png b/public/images/emoji/twitter/st_helena.png
new file mode 100644
index 00000000000..90fefd0cab2
Binary files /dev/null and b/public/images/emoji/twitter/st_helena.png differ
diff --git a/public/images/emoji/twitter/st_kitts_nevis.png b/public/images/emoji/twitter/st_kitts_nevis.png
new file mode 100644
index 00000000000..d7686f8b603
Binary files /dev/null and b/public/images/emoji/twitter/st_kitts_nevis.png differ
diff --git a/public/images/emoji/twitter/st_lucia.png b/public/images/emoji/twitter/st_lucia.png
new file mode 100644
index 00000000000..92eafffe947
Binary files /dev/null and b/public/images/emoji/twitter/st_lucia.png differ
diff --git a/public/images/emoji/twitter/st_martin.png b/public/images/emoji/twitter/st_martin.png
new file mode 100644
index 00000000000..7943b73f671
Binary files /dev/null and b/public/images/emoji/twitter/st_martin.png differ
diff --git a/public/images/emoji/twitter/st_pierre_miquelon.png b/public/images/emoji/twitter/st_pierre_miquelon.png
new file mode 100644
index 00000000000..b05828b47cb
Binary files /dev/null and b/public/images/emoji/twitter/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/twitter/st_vincent_grenadines.png b/public/images/emoji/twitter/st_vincent_grenadines.png
new file mode 100644
index 00000000000..ddfd25fd227
Binary files /dev/null and b/public/images/emoji/twitter/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/twitter/stadium.png b/public/images/emoji/twitter/stadium.png
index 4ca5f1e8f62..0ad57f80a41 100644
Binary files a/public/images/emoji/twitter/stadium.png and b/public/images/emoji/twitter/stadium.png differ
diff --git a/public/images/emoji/twitter/star_struck.png b/public/images/emoji/twitter/star_struck.png
new file mode 100644
index 00000000000..7da8183f394
Binary files /dev/null and b/public/images/emoji/twitter/star_struck.png differ
diff --git a/public/images/emoji/twitter/station.png b/public/images/emoji/twitter/station.png
index 71ba5b434ad..10758831eb8 100644
Binary files a/public/images/emoji/twitter/station.png and b/public/images/emoji/twitter/station.png differ
diff --git a/public/images/emoji/twitter/stew.png b/public/images/emoji/twitter/stew.png
index 01ccebbb90d..708d29b7335 100644
Binary files a/public/images/emoji/twitter/stew.png and b/public/images/emoji/twitter/stew.png differ
diff --git a/public/images/emoji/twitter/stop_sign.png b/public/images/emoji/twitter/stop_sign.png
new file mode 100644
index 00000000000..cf08756ebf4
Binary files /dev/null and b/public/images/emoji/twitter/stop_sign.png differ
diff --git a/public/images/emoji/twitter/strawberry.png b/public/images/emoji/twitter/strawberry.png
index a7532711075..9471d8e5457 100644
Binary files a/public/images/emoji/twitter/strawberry.png and b/public/images/emoji/twitter/strawberry.png differ
diff --git a/public/images/emoji/twitter/stuffed_flatbread.png b/public/images/emoji/twitter/stuffed_flatbread.png
new file mode 100644
index 00000000000..f5dca14bd2b
Binary files /dev/null and b/public/images/emoji/twitter/stuffed_flatbread.png differ
diff --git a/public/images/emoji/twitter/sudan.png b/public/images/emoji/twitter/sudan.png
new file mode 100644
index 00000000000..3974a07328c
Binary files /dev/null and b/public/images/emoji/twitter/sudan.png differ
diff --git a/public/images/emoji/twitter/sun_behind_large_cloud.png b/public/images/emoji/twitter/sun_behind_large_cloud.png
new file mode 100644
index 00000000000..3ceb40a9ec0
Binary files /dev/null and b/public/images/emoji/twitter/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/twitter/sun_behind_rain_cloud.png b/public/images/emoji/twitter/sun_behind_rain_cloud.png
new file mode 100644
index 00000000000..ef892f1f889
Binary files /dev/null and b/public/images/emoji/twitter/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/twitter/sun_behind_small_cloud.png b/public/images/emoji/twitter/sun_behind_small_cloud.png
new file mode 100644
index 00000000000..90af3591e04
Binary files /dev/null and b/public/images/emoji/twitter/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/twitter/sunglasses.png b/public/images/emoji/twitter/sunglasses.png
index 3cf2e455b16..5a9c57a7be3 100644
Binary files a/public/images/emoji/twitter/sunglasses.png and b/public/images/emoji/twitter/sunglasses.png differ
diff --git a/public/images/emoji/twitter/surfer.png b/public/images/emoji/twitter/surfer.png
index d34fcfdc456..a8ebb685846 100644
Binary files a/public/images/emoji/twitter/surfer.png and b/public/images/emoji/twitter/surfer.png differ
diff --git a/public/images/emoji/twitter/surfer/2.png b/public/images/emoji/twitter/surfer/2.png
new file mode 100644
index 00000000000..970d76a9883
Binary files /dev/null and b/public/images/emoji/twitter/surfer/2.png differ
diff --git a/public/images/emoji/twitter/surfer/3.png b/public/images/emoji/twitter/surfer/3.png
new file mode 100644
index 00000000000..a6ccac92ea4
Binary files /dev/null and b/public/images/emoji/twitter/surfer/3.png differ
diff --git a/public/images/emoji/twitter/surfer/4.png b/public/images/emoji/twitter/surfer/4.png
new file mode 100644
index 00000000000..e329c3cdd20
Binary files /dev/null and b/public/images/emoji/twitter/surfer/4.png differ
diff --git a/public/images/emoji/twitter/surfer/5.png b/public/images/emoji/twitter/surfer/5.png
new file mode 100644
index 00000000000..10e2c7dac99
Binary files /dev/null and b/public/images/emoji/twitter/surfer/5.png differ
diff --git a/public/images/emoji/twitter/surfer/6.png b/public/images/emoji/twitter/surfer/6.png
new file mode 100644
index 00000000000..6ae6255db99
Binary files /dev/null and b/public/images/emoji/twitter/surfer/6.png differ
diff --git a/public/images/emoji/twitter/surfing_man.png b/public/images/emoji/twitter/surfing_man.png
new file mode 100644
index 00000000000..a8ebb685846
Binary files /dev/null and b/public/images/emoji/twitter/surfing_man.png differ
diff --git a/public/images/emoji/twitter/surfing_man/2.png b/public/images/emoji/twitter/surfing_man/2.png
new file mode 100644
index 00000000000..970d76a9883
Binary files /dev/null and b/public/images/emoji/twitter/surfing_man/2.png differ
diff --git a/public/images/emoji/twitter/surfing_man/3.png b/public/images/emoji/twitter/surfing_man/3.png
new file mode 100644
index 00000000000..a6ccac92ea4
Binary files /dev/null and b/public/images/emoji/twitter/surfing_man/3.png differ
diff --git a/public/images/emoji/twitter/surfing_man/4.png b/public/images/emoji/twitter/surfing_man/4.png
new file mode 100644
index 00000000000..e329c3cdd20
Binary files /dev/null and b/public/images/emoji/twitter/surfing_man/4.png differ
diff --git a/public/images/emoji/twitter/surfing_man/5.png b/public/images/emoji/twitter/surfing_man/5.png
new file mode 100644
index 00000000000..10e2c7dac99
Binary files /dev/null and b/public/images/emoji/twitter/surfing_man/5.png differ
diff --git a/public/images/emoji/twitter/surfing_man/6.png b/public/images/emoji/twitter/surfing_man/6.png
new file mode 100644
index 00000000000..6ae6255db99
Binary files /dev/null and b/public/images/emoji/twitter/surfing_man/6.png differ
diff --git a/public/images/emoji/twitter/surfing_woman.png b/public/images/emoji/twitter/surfing_woman.png
new file mode 100644
index 00000000000..5a5e1cefda9
Binary files /dev/null and b/public/images/emoji/twitter/surfing_woman.png differ
diff --git a/public/images/emoji/twitter/surfing_woman/2.png b/public/images/emoji/twitter/surfing_woman/2.png
new file mode 100644
index 00000000000..c66e258d1c7
Binary files /dev/null and b/public/images/emoji/twitter/surfing_woman/2.png differ
diff --git a/public/images/emoji/twitter/surfing_woman/3.png b/public/images/emoji/twitter/surfing_woman/3.png
new file mode 100644
index 00000000000..0e9b7989d64
Binary files /dev/null and b/public/images/emoji/twitter/surfing_woman/3.png differ
diff --git a/public/images/emoji/twitter/surfing_woman/4.png b/public/images/emoji/twitter/surfing_woman/4.png
new file mode 100644
index 00000000000..50f43ce0700
Binary files /dev/null and b/public/images/emoji/twitter/surfing_woman/4.png differ
diff --git a/public/images/emoji/twitter/surfing_woman/5.png b/public/images/emoji/twitter/surfing_woman/5.png
new file mode 100644
index 00000000000..99d3d275355
Binary files /dev/null and b/public/images/emoji/twitter/surfing_woman/5.png differ
diff --git a/public/images/emoji/twitter/surfing_woman/6.png b/public/images/emoji/twitter/surfing_woman/6.png
new file mode 100644
index 00000000000..f30dff2f5a9
Binary files /dev/null and b/public/images/emoji/twitter/surfing_woman/6.png differ
diff --git a/public/images/emoji/twitter/suriname.png b/public/images/emoji/twitter/suriname.png
new file mode 100644
index 00000000000..48afc4adac5
Binary files /dev/null and b/public/images/emoji/twitter/suriname.png differ
diff --git a/public/images/emoji/twitter/sushi.png b/public/images/emoji/twitter/sushi.png
index db6873e592a..ffe8a7f7fe2 100644
Binary files a/public/images/emoji/twitter/sushi.png and b/public/images/emoji/twitter/sushi.png differ
diff --git a/public/images/emoji/twitter/sushing_face.png b/public/images/emoji/twitter/sushing_face.png
new file mode 100644
index 00000000000..e4427cbd153
Binary files /dev/null and b/public/images/emoji/twitter/sushing_face.png differ
diff --git a/public/images/emoji/twitter/svalbard_and_jan_mayen.png b/public/images/emoji/twitter/svalbard_and_jan_mayen.png
new file mode 100644
index 00000000000..004a11d8308
Binary files /dev/null and b/public/images/emoji/twitter/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/twitter/swaziland.png b/public/images/emoji/twitter/swaziland.png
new file mode 100644
index 00000000000..fb5ee97ba24
Binary files /dev/null and b/public/images/emoji/twitter/swaziland.png differ
diff --git a/public/images/emoji/twitter/sweat_smile.png b/public/images/emoji/twitter/sweat_smile.png
index bbacee36f77..3ceaa5bf384 100644
Binary files a/public/images/emoji/twitter/sweat_smile.png and b/public/images/emoji/twitter/sweat_smile.png differ
diff --git a/public/images/emoji/twitter/sweden.png b/public/images/emoji/twitter/sweden.png
new file mode 100644
index 00000000000..3b46fe18abc
Binary files /dev/null and b/public/images/emoji/twitter/sweden.png differ
diff --git a/public/images/emoji/twitter/sweet_potato.png b/public/images/emoji/twitter/sweet_potato.png
index 784fc80a32c..63c6cc807cc 100644
Binary files a/public/images/emoji/twitter/sweet_potato.png and b/public/images/emoji/twitter/sweet_potato.png differ
diff --git a/public/images/emoji/twitter/swimmer.png b/public/images/emoji/twitter/swimmer.png
index 7fa40aa218f..030252ec906 100644
Binary files a/public/images/emoji/twitter/swimmer.png and b/public/images/emoji/twitter/swimmer.png differ
diff --git a/public/images/emoji/twitter/swimmer/2.png b/public/images/emoji/twitter/swimmer/2.png
new file mode 100644
index 00000000000..b6872252b2d
Binary files /dev/null and b/public/images/emoji/twitter/swimmer/2.png differ
diff --git a/public/images/emoji/twitter/swimmer/3.png b/public/images/emoji/twitter/swimmer/3.png
new file mode 100644
index 00000000000..2bb3abf6ea1
Binary files /dev/null and b/public/images/emoji/twitter/swimmer/3.png differ
diff --git a/public/images/emoji/twitter/swimmer/4.png b/public/images/emoji/twitter/swimmer/4.png
new file mode 100644
index 00000000000..bd8139b2daf
Binary files /dev/null and b/public/images/emoji/twitter/swimmer/4.png differ
diff --git a/public/images/emoji/twitter/swimmer/5.png b/public/images/emoji/twitter/swimmer/5.png
new file mode 100644
index 00000000000..32252de704b
Binary files /dev/null and b/public/images/emoji/twitter/swimmer/5.png differ
diff --git a/public/images/emoji/twitter/swimmer/6.png b/public/images/emoji/twitter/swimmer/6.png
new file mode 100644
index 00000000000..d180cb675bf
Binary files /dev/null and b/public/images/emoji/twitter/swimmer/6.png differ
diff --git a/public/images/emoji/twitter/swimming_man.png b/public/images/emoji/twitter/swimming_man.png
new file mode 100644
index 00000000000..030252ec906
Binary files /dev/null and b/public/images/emoji/twitter/swimming_man.png differ
diff --git a/public/images/emoji/twitter/swimming_man/2.png b/public/images/emoji/twitter/swimming_man/2.png
new file mode 100644
index 00000000000..b6872252b2d
Binary files /dev/null and b/public/images/emoji/twitter/swimming_man/2.png differ
diff --git a/public/images/emoji/twitter/swimming_man/3.png b/public/images/emoji/twitter/swimming_man/3.png
new file mode 100644
index 00000000000..2bb3abf6ea1
Binary files /dev/null and b/public/images/emoji/twitter/swimming_man/3.png differ
diff --git a/public/images/emoji/twitter/swimming_man/4.png b/public/images/emoji/twitter/swimming_man/4.png
new file mode 100644
index 00000000000..bd8139b2daf
Binary files /dev/null and b/public/images/emoji/twitter/swimming_man/4.png differ
diff --git a/public/images/emoji/twitter/swimming_man/5.png b/public/images/emoji/twitter/swimming_man/5.png
new file mode 100644
index 00000000000..32252de704b
Binary files /dev/null and b/public/images/emoji/twitter/swimming_man/5.png differ
diff --git a/public/images/emoji/twitter/swimming_man/6.png b/public/images/emoji/twitter/swimming_man/6.png
new file mode 100644
index 00000000000..d180cb675bf
Binary files /dev/null and b/public/images/emoji/twitter/swimming_man/6.png differ
diff --git a/public/images/emoji/twitter/swimming_woman.png b/public/images/emoji/twitter/swimming_woman.png
new file mode 100644
index 00000000000..9963221f611
Binary files /dev/null and b/public/images/emoji/twitter/swimming_woman.png differ
diff --git a/public/images/emoji/twitter/swimming_woman/2.png b/public/images/emoji/twitter/swimming_woman/2.png
new file mode 100644
index 00000000000..59dad2c3e13
Binary files /dev/null and b/public/images/emoji/twitter/swimming_woman/2.png differ
diff --git a/public/images/emoji/twitter/swimming_woman/3.png b/public/images/emoji/twitter/swimming_woman/3.png
new file mode 100644
index 00000000000..66e962335cf
Binary files /dev/null and b/public/images/emoji/twitter/swimming_woman/3.png differ
diff --git a/public/images/emoji/twitter/swimming_woman/4.png b/public/images/emoji/twitter/swimming_woman/4.png
new file mode 100644
index 00000000000..9414644c3e8
Binary files /dev/null and b/public/images/emoji/twitter/swimming_woman/4.png differ
diff --git a/public/images/emoji/twitter/swimming_woman/5.png b/public/images/emoji/twitter/swimming_woman/5.png
new file mode 100644
index 00000000000..ebde0eb37c5
Binary files /dev/null and b/public/images/emoji/twitter/swimming_woman/5.png differ
diff --git a/public/images/emoji/twitter/swimming_woman/6.png b/public/images/emoji/twitter/swimming_woman/6.png
new file mode 100644
index 00000000000..d294454be94
Binary files /dev/null and b/public/images/emoji/twitter/swimming_woman/6.png differ
diff --git a/public/images/emoji/twitter/switzerland.png b/public/images/emoji/twitter/switzerland.png
new file mode 100644
index 00000000000..e0caa61ba63
Binary files /dev/null and b/public/images/emoji/twitter/switzerland.png differ
diff --git a/public/images/emoji/twitter/syria.png b/public/images/emoji/twitter/syria.png
new file mode 100644
index 00000000000..53606f3e075
Binary files /dev/null and b/public/images/emoji/twitter/syria.png differ
diff --git a/public/images/emoji/twitter/syringe.png b/public/images/emoji/twitter/syringe.png
index e48b3960b05..0064516f1b7 100644
Binary files a/public/images/emoji/twitter/syringe.png and b/public/images/emoji/twitter/syringe.png differ
diff --git a/public/images/emoji/twitter/t_rex.png b/public/images/emoji/twitter/t_rex.png
new file mode 100644
index 00000000000..d8811a56382
Binary files /dev/null and b/public/images/emoji/twitter/t_rex.png differ
diff --git a/public/images/emoji/twitter/taco.png b/public/images/emoji/twitter/taco.png
index 8e395d91db4..14247eb307a 100644
Binary files a/public/images/emoji/twitter/taco.png and b/public/images/emoji/twitter/taco.png differ
diff --git a/public/images/emoji/twitter/tada.png b/public/images/emoji/twitter/tada.png
index 424685f2a4b..02ad12d2823 100644
Binary files a/public/images/emoji/twitter/tada.png and b/public/images/emoji/twitter/tada.png differ
diff --git a/public/images/emoji/twitter/taiwan.png b/public/images/emoji/twitter/taiwan.png
new file mode 100644
index 00000000000..dde348b40da
Binary files /dev/null and b/public/images/emoji/twitter/taiwan.png differ
diff --git a/public/images/emoji/twitter/tajikistan.png b/public/images/emoji/twitter/tajikistan.png
new file mode 100644
index 00000000000..7b3697952d5
Binary files /dev/null and b/public/images/emoji/twitter/tajikistan.png differ
diff --git a/public/images/emoji/twitter/takeout_box.png b/public/images/emoji/twitter/takeout_box.png
new file mode 100644
index 00000000000..08aa6a4843f
Binary files /dev/null and b/public/images/emoji/twitter/takeout_box.png differ
diff --git a/public/images/emoji/twitter/tanabata_tree.png b/public/images/emoji/twitter/tanabata_tree.png
index 65d0cdf4094..eb67d0ef81d 100644
Binary files a/public/images/emoji/twitter/tanabata_tree.png and b/public/images/emoji/twitter/tanabata_tree.png differ
diff --git a/public/images/emoji/twitter/tanzania.png b/public/images/emoji/twitter/tanzania.png
new file mode 100644
index 00000000000..d4026fea320
Binary files /dev/null and b/public/images/emoji/twitter/tanzania.png differ
diff --git a/public/images/emoji/twitter/tea.png b/public/images/emoji/twitter/tea.png
index 1fe48e32ff0..19a6fdb7e5e 100644
Binary files a/public/images/emoji/twitter/tea.png and b/public/images/emoji/twitter/tea.png differ
diff --git a/public/images/emoji/twitter/telephone.png b/public/images/emoji/twitter/telephone.png
index cb305644f28..749e9f38ae5 100644
Binary files a/public/images/emoji/twitter/telephone.png and b/public/images/emoji/twitter/telephone.png differ
diff --git a/public/images/emoji/twitter/telescope.png b/public/images/emoji/twitter/telescope.png
index 8174a681989..efa940750b6 100644
Binary files a/public/images/emoji/twitter/telescope.png and b/public/images/emoji/twitter/telescope.png differ
diff --git a/public/images/emoji/twitter/tent.png b/public/images/emoji/twitter/tent.png
index 1a982903ce9..6cbddd76d69 100644
Binary files a/public/images/emoji/twitter/tent.png and b/public/images/emoji/twitter/tent.png differ
diff --git a/public/images/emoji/twitter/thailand.png b/public/images/emoji/twitter/thailand.png
new file mode 100644
index 00000000000..81499f16168
Binary files /dev/null and b/public/images/emoji/twitter/thailand.png differ
diff --git a/public/images/emoji/twitter/thermometer_face.png b/public/images/emoji/twitter/thermometer_face.png
index 5539251aa4e..c9440239c0d 100644
Binary files a/public/images/emoji/twitter/thermometer_face.png and b/public/images/emoji/twitter/thermometer_face.png differ
diff --git a/public/images/emoji/twitter/three.png b/public/images/emoji/twitter/three.png
index cdd7ca9db3c..ed9281a364a 100644
Binary files a/public/images/emoji/twitter/three.png and b/public/images/emoji/twitter/three.png differ
diff --git a/public/images/emoji/twitter/thumbsdown/2.png b/public/images/emoji/twitter/thumbsdown/2.png
new file mode 100644
index 00000000000..a3c768cdd0b
Binary files /dev/null and b/public/images/emoji/twitter/thumbsdown/2.png differ
diff --git a/public/images/emoji/twitter/thumbsdown/3.png b/public/images/emoji/twitter/thumbsdown/3.png
new file mode 100644
index 00000000000..2737de44b52
Binary files /dev/null and b/public/images/emoji/twitter/thumbsdown/3.png differ
diff --git a/public/images/emoji/twitter/thumbsdown/4.png b/public/images/emoji/twitter/thumbsdown/4.png
new file mode 100644
index 00000000000..3b87d1364c2
Binary files /dev/null and b/public/images/emoji/twitter/thumbsdown/4.png differ
diff --git a/public/images/emoji/twitter/thumbsdown/5.png b/public/images/emoji/twitter/thumbsdown/5.png
new file mode 100644
index 00000000000..4a8ea96d5b3
Binary files /dev/null and b/public/images/emoji/twitter/thumbsdown/5.png differ
diff --git a/public/images/emoji/twitter/thumbsdown/6.png b/public/images/emoji/twitter/thumbsdown/6.png
new file mode 100644
index 00000000000..3bec88e6afd
Binary files /dev/null and b/public/images/emoji/twitter/thumbsdown/6.png differ
diff --git a/public/images/emoji/twitter/thumbsup/2.png b/public/images/emoji/twitter/thumbsup/2.png
new file mode 100644
index 00000000000..e68d1b077a6
Binary files /dev/null and b/public/images/emoji/twitter/thumbsup/2.png differ
diff --git a/public/images/emoji/twitter/thumbsup/3.png b/public/images/emoji/twitter/thumbsup/3.png
new file mode 100644
index 00000000000..0123a0f8a19
Binary files /dev/null and b/public/images/emoji/twitter/thumbsup/3.png differ
diff --git a/public/images/emoji/twitter/thumbsup/4.png b/public/images/emoji/twitter/thumbsup/4.png
new file mode 100644
index 00000000000..19a0e463893
Binary files /dev/null and b/public/images/emoji/twitter/thumbsup/4.png differ
diff --git a/public/images/emoji/twitter/thumbsup/5.png b/public/images/emoji/twitter/thumbsup/5.png
new file mode 100644
index 00000000000..209c0e4e5b6
Binary files /dev/null and b/public/images/emoji/twitter/thumbsup/5.png differ
diff --git a/public/images/emoji/twitter/thumbsup/6.png b/public/images/emoji/twitter/thumbsup/6.png
new file mode 100644
index 00000000000..9deccd899a9
Binary files /dev/null and b/public/images/emoji/twitter/thumbsup/6.png differ
diff --git a/public/images/emoji/twitter/tiger.png b/public/images/emoji/twitter/tiger.png
index 2f12f47306e..9ef50eda88b 100644
Binary files a/public/images/emoji/twitter/tiger.png and b/public/images/emoji/twitter/tiger.png differ
diff --git a/public/images/emoji/twitter/tiger2.png b/public/images/emoji/twitter/tiger2.png
index fd5681ab7e9..c7ff0c963cf 100644
Binary files a/public/images/emoji/twitter/tiger2.png and b/public/images/emoji/twitter/tiger2.png differ
diff --git a/public/images/emoji/twitter/timor_leste.png b/public/images/emoji/twitter/timor_leste.png
new file mode 100644
index 00000000000..6706def9912
Binary files /dev/null and b/public/images/emoji/twitter/timor_leste.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_man.png b/public/images/emoji/twitter/tipping_hand_man.png
new file mode 100644
index 00000000000..63e5492220b
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_man.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_man/2.png b/public/images/emoji/twitter/tipping_hand_man/2.png
new file mode 100644
index 00000000000..aec62f49f46
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_man/3.png b/public/images/emoji/twitter/tipping_hand_man/3.png
new file mode 100644
index 00000000000..92e1fe7d224
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_man/4.png b/public/images/emoji/twitter/tipping_hand_man/4.png
new file mode 100644
index 00000000000..813113bb9c5
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_man/5.png b/public/images/emoji/twitter/tipping_hand_man/5.png
new file mode 100644
index 00000000000..a2f29fdac94
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_man/6.png b/public/images/emoji/twitter/tipping_hand_man/6.png
new file mode 100644
index 00000000000..fa68bdb53aa
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_woman.png b/public/images/emoji/twitter/tipping_hand_woman.png
new file mode 100644
index 00000000000..03f50304100
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_woman.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_woman/2.png b/public/images/emoji/twitter/tipping_hand_woman/2.png
new file mode 100644
index 00000000000..a117cff357c
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_woman/3.png b/public/images/emoji/twitter/tipping_hand_woman/3.png
new file mode 100644
index 00000000000..baa70f4a21a
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_woman/4.png b/public/images/emoji/twitter/tipping_hand_woman/4.png
new file mode 100644
index 00000000000..59d41fc875a
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_woman/5.png b/public/images/emoji/twitter/tipping_hand_woman/5.png
new file mode 100644
index 00000000000..3726ca85acd
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/twitter/tipping_hand_woman/6.png b/public/images/emoji/twitter/tipping_hand_woman/6.png
new file mode 100644
index 00000000000..505a1d85401
Binary files /dev/null and b/public/images/emoji/twitter/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/twitter/togo.png b/public/images/emoji/twitter/togo.png
new file mode 100644
index 00000000000..7a542547e05
Binary files /dev/null and b/public/images/emoji/twitter/togo.png differ
diff --git a/public/images/emoji/twitter/tokelau.png b/public/images/emoji/twitter/tokelau.png
new file mode 100644
index 00000000000..f42f8686314
Binary files /dev/null and b/public/images/emoji/twitter/tokelau.png differ
diff --git a/public/images/emoji/twitter/tonga.png b/public/images/emoji/twitter/tonga.png
new file mode 100644
index 00000000000..bfff80acf4d
Binary files /dev/null and b/public/images/emoji/twitter/tonga.png differ
diff --git a/public/images/emoji/twitter/top.png b/public/images/emoji/twitter/top.png
index 4a5d5c956f9..41074daeac3 100644
Binary files a/public/images/emoji/twitter/top.png and b/public/images/emoji/twitter/top.png differ
diff --git a/public/images/emoji/twitter/tornado.png b/public/images/emoji/twitter/tornado.png
new file mode 100644
index 00000000000..fd843824ed3
Binary files /dev/null and b/public/images/emoji/twitter/tornado.png differ
diff --git a/public/images/emoji/twitter/tr.png b/public/images/emoji/twitter/tr.png
new file mode 100644
index 00000000000..3b6fc163790
Binary files /dev/null and b/public/images/emoji/twitter/tr.png differ
diff --git a/public/images/emoji/twitter/trackball.png b/public/images/emoji/twitter/trackball.png
index 06913842189..c2258edc121 100644
Binary files a/public/images/emoji/twitter/trackball.png and b/public/images/emoji/twitter/trackball.png differ
diff --git a/public/images/emoji/twitter/tractor.png b/public/images/emoji/twitter/tractor.png
index f1334c882d6..c441c89305f 100644
Binary files a/public/images/emoji/twitter/tractor.png and b/public/images/emoji/twitter/tractor.png differ
diff --git a/public/images/emoji/twitter/train2.png b/public/images/emoji/twitter/train2.png
index 098821a2e14..744c7e9586e 100644
Binary files a/public/images/emoji/twitter/train2.png and b/public/images/emoji/twitter/train2.png differ
diff --git a/public/images/emoji/twitter/tram.png b/public/images/emoji/twitter/tram.png
index 27c1d3c5cc7..51b66575a68 100644
Binary files a/public/images/emoji/twitter/tram.png and b/public/images/emoji/twitter/tram.png differ
diff --git a/public/images/emoji/twitter/trinidad_tobago.png b/public/images/emoji/twitter/trinidad_tobago.png
new file mode 100644
index 00000000000..14355ce15f6
Binary files /dev/null and b/public/images/emoji/twitter/trinidad_tobago.png differ
diff --git a/public/images/emoji/twitter/tristan_da_cunha.png b/public/images/emoji/twitter/tristan_da_cunha.png
new file mode 100644
index 00000000000..dff4791d41b
Binary files /dev/null and b/public/images/emoji/twitter/tristan_da_cunha.png differ
diff --git a/public/images/emoji/twitter/triumph.png b/public/images/emoji/twitter/triumph.png
index 9782c78ddea..c71d3a89cba 100644
Binary files a/public/images/emoji/twitter/triumph.png and b/public/images/emoji/twitter/triumph.png differ
diff --git a/public/images/emoji/twitter/tropical_drink.png b/public/images/emoji/twitter/tropical_drink.png
index 9eaab4257d6..08fb02b1cae 100644
Binary files a/public/images/emoji/twitter/tropical_drink.png and b/public/images/emoji/twitter/tropical_drink.png differ
diff --git a/public/images/emoji/twitter/tshirt.png b/public/images/emoji/twitter/tshirt.png
new file mode 100644
index 00000000000..4723c7947a6
Binary files /dev/null and b/public/images/emoji/twitter/tshirt.png differ
diff --git a/public/images/emoji/twitter/tulip.png b/public/images/emoji/twitter/tulip.png
index 394ff4acac0..d617275fcd8 100644
Binary files a/public/images/emoji/twitter/tulip.png and b/public/images/emoji/twitter/tulip.png differ
diff --git a/public/images/emoji/twitter/tumbler_glass.png b/public/images/emoji/twitter/tumbler_glass.png
new file mode 100644
index 00000000000..78db9d6036f
Binary files /dev/null and b/public/images/emoji/twitter/tumbler_glass.png differ
diff --git a/public/images/emoji/twitter/tunisia.png b/public/images/emoji/twitter/tunisia.png
new file mode 100644
index 00000000000..2691b42f09a
Binary files /dev/null and b/public/images/emoji/twitter/tunisia.png differ
diff --git a/public/images/emoji/twitter/turkey.png b/public/images/emoji/twitter/turkey.png
index 043a7ac8103..829f5ffdfca 100644
Binary files a/public/images/emoji/twitter/turkey.png and b/public/images/emoji/twitter/turkey.png differ
diff --git a/public/images/emoji/twitter/turkmenistan.png b/public/images/emoji/twitter/turkmenistan.png
new file mode 100644
index 00000000000..a0729e2c292
Binary files /dev/null and b/public/images/emoji/twitter/turkmenistan.png differ
diff --git a/public/images/emoji/twitter/turks_caicos_islands.png b/public/images/emoji/twitter/turks_caicos_islands.png
new file mode 100644
index 00000000000..bb04d27666c
Binary files /dev/null and b/public/images/emoji/twitter/turks_caicos_islands.png differ
diff --git a/public/images/emoji/twitter/tuvalu.png b/public/images/emoji/twitter/tuvalu.png
new file mode 100644
index 00000000000..60fad11afce
Binary files /dev/null and b/public/images/emoji/twitter/tuvalu.png differ
diff --git a/public/images/emoji/twitter/two.png b/public/images/emoji/twitter/two.png
index 3ca9cd02327..572ce89681d 100644
Binary files a/public/images/emoji/twitter/two.png and b/public/images/emoji/twitter/two.png differ
diff --git a/public/images/emoji/twitter/two_men_holding_hands.png b/public/images/emoji/twitter/two_men_holding_hands.png
index ed10e54073f..1e7e303e107 100644
Binary files a/public/images/emoji/twitter/two_men_holding_hands.png and b/public/images/emoji/twitter/two_men_holding_hands.png differ
diff --git a/public/images/emoji/twitter/two_women_holding_hands.png b/public/images/emoji/twitter/two_women_holding_hands.png
index 4a2a92931a0..bf1afc84591 100644
Binary files a/public/images/emoji/twitter/two_women_holding_hands.png and b/public/images/emoji/twitter/two_women_holding_hands.png differ
diff --git a/public/images/emoji/twitter/u7a7a.png b/public/images/emoji/twitter/u7a7a.png
index 00d828d9d40..204ac0670d0 100644
Binary files a/public/images/emoji/twitter/u7a7a.png and b/public/images/emoji/twitter/u7a7a.png differ
diff --git a/public/images/emoji/twitter/uganda.png b/public/images/emoji/twitter/uganda.png
new file mode 100644
index 00000000000..9541a9fe432
Binary files /dev/null and b/public/images/emoji/twitter/uganda.png differ
diff --git a/public/images/emoji/twitter/uk.png b/public/images/emoji/twitter/uk.png
new file mode 100644
index 00000000000..ad2a6622e47
Binary files /dev/null and b/public/images/emoji/twitter/uk.png differ
diff --git a/public/images/emoji/twitter/ukraine.png b/public/images/emoji/twitter/ukraine.png
new file mode 100644
index 00000000000..d24b4e827b0
Binary files /dev/null and b/public/images/emoji/twitter/ukraine.png differ
diff --git a/public/images/emoji/twitter/umbrella.png b/public/images/emoji/twitter/umbrella.png
index e149b9f0f1b..869523fd2c5 100644
Binary files a/public/images/emoji/twitter/umbrella.png and b/public/images/emoji/twitter/umbrella.png differ
diff --git a/public/images/emoji/twitter/umbrella_on_ground.png b/public/images/emoji/twitter/umbrella_on_ground.png
index d12db22ecb0..2bb23697b7f 100644
Binary files a/public/images/emoji/twitter/umbrella_on_ground.png and b/public/images/emoji/twitter/umbrella_on_ground.png differ
diff --git a/public/images/emoji/twitter/underage.png b/public/images/emoji/twitter/underage.png
index 7c5deb816fa..15ac7fdbd55 100644
Binary files a/public/images/emoji/twitter/underage.png and b/public/images/emoji/twitter/underage.png differ
diff --git a/public/images/emoji/twitter/unicorn.png b/public/images/emoji/twitter/unicorn.png
index 60db9271818..7b53a8b310a 100644
Binary files a/public/images/emoji/twitter/unicorn.png and b/public/images/emoji/twitter/unicorn.png differ
diff --git a/public/images/emoji/twitter/unicorn_face.png b/public/images/emoji/twitter/unicorn_face.png
index 60db9271818..7b53a8b310a 100644
Binary files a/public/images/emoji/twitter/unicorn_face.png and b/public/images/emoji/twitter/unicorn_face.png differ
diff --git a/public/images/emoji/twitter/united_arab_emirates.png b/public/images/emoji/twitter/united_arab_emirates.png
new file mode 100644
index 00000000000..0aac4c4b1eb
Binary files /dev/null and b/public/images/emoji/twitter/united_arab_emirates.png differ
diff --git a/public/images/emoji/twitter/united_nations.png b/public/images/emoji/twitter/united_nations.png
new file mode 100644
index 00000000000..d695a5cac09
Binary files /dev/null and b/public/images/emoji/twitter/united_nations.png differ
diff --git a/public/images/emoji/twitter/uruguay.png b/public/images/emoji/twitter/uruguay.png
new file mode 100644
index 00000000000..8196541e261
Binary files /dev/null and b/public/images/emoji/twitter/uruguay.png differ
diff --git a/public/images/emoji/twitter/us_outlying_islands.png b/public/images/emoji/twitter/us_outlying_islands.png
new file mode 100644
index 00000000000..450853eca47
Binary files /dev/null and b/public/images/emoji/twitter/us_outlying_islands.png differ
diff --git a/public/images/emoji/twitter/us_virgin_islands.png b/public/images/emoji/twitter/us_virgin_islands.png
new file mode 100644
index 00000000000..2352c2610b8
Binary files /dev/null and b/public/images/emoji/twitter/us_virgin_islands.png differ
diff --git a/public/images/emoji/twitter/uzbekistan.png b/public/images/emoji/twitter/uzbekistan.png
new file mode 100644
index 00000000000..c268b7f0b2a
Binary files /dev/null and b/public/images/emoji/twitter/uzbekistan.png differ
diff --git a/public/images/emoji/twitter/v.png b/public/images/emoji/twitter/v.png
index 88575a6d26e..0a54bd68346 100644
Binary files a/public/images/emoji/twitter/v.png and b/public/images/emoji/twitter/v.png differ
diff --git a/public/images/emoji/twitter/v/2.png b/public/images/emoji/twitter/v/2.png
new file mode 100644
index 00000000000..0b0dc895afc
Binary files /dev/null and b/public/images/emoji/twitter/v/2.png differ
diff --git a/public/images/emoji/twitter/v/3.png b/public/images/emoji/twitter/v/3.png
new file mode 100644
index 00000000000..5594f492595
Binary files /dev/null and b/public/images/emoji/twitter/v/3.png differ
diff --git a/public/images/emoji/twitter/v/4.png b/public/images/emoji/twitter/v/4.png
new file mode 100644
index 00000000000..242e53e4594
Binary files /dev/null and b/public/images/emoji/twitter/v/4.png differ
diff --git a/public/images/emoji/twitter/v/5.png b/public/images/emoji/twitter/v/5.png
new file mode 100644
index 00000000000..a6362e8500a
Binary files /dev/null and b/public/images/emoji/twitter/v/5.png differ
diff --git a/public/images/emoji/twitter/v/6.png b/public/images/emoji/twitter/v/6.png
new file mode 100644
index 00000000000..1013715b9a9
Binary files /dev/null and b/public/images/emoji/twitter/v/6.png differ
diff --git a/public/images/emoji/twitter/vampire.png b/public/images/emoji/twitter/vampire.png
new file mode 100644
index 00000000000..962288bd170
Binary files /dev/null and b/public/images/emoji/twitter/vampire.png differ
diff --git a/public/images/emoji/twitter/vampire/2.png b/public/images/emoji/twitter/vampire/2.png
new file mode 100644
index 00000000000..154f2b6e35a
Binary files /dev/null and b/public/images/emoji/twitter/vampire/2.png differ
diff --git a/public/images/emoji/twitter/vampire/3.png b/public/images/emoji/twitter/vampire/3.png
new file mode 100644
index 00000000000..540b48d887f
Binary files /dev/null and b/public/images/emoji/twitter/vampire/3.png differ
diff --git a/public/images/emoji/twitter/vampire/4.png b/public/images/emoji/twitter/vampire/4.png
new file mode 100644
index 00000000000..b05d3bad9ab
Binary files /dev/null and b/public/images/emoji/twitter/vampire/4.png differ
diff --git a/public/images/emoji/twitter/vampire/5.png b/public/images/emoji/twitter/vampire/5.png
new file mode 100644
index 00000000000..2bd9a7b71bb
Binary files /dev/null and b/public/images/emoji/twitter/vampire/5.png differ
diff --git a/public/images/emoji/twitter/vampire/6.png b/public/images/emoji/twitter/vampire/6.png
new file mode 100644
index 00000000000..c88f4ad73bf
Binary files /dev/null and b/public/images/emoji/twitter/vampire/6.png differ
diff --git a/public/images/emoji/twitter/vanuatu.png b/public/images/emoji/twitter/vanuatu.png
new file mode 100644
index 00000000000..ebf4b693156
Binary files /dev/null and b/public/images/emoji/twitter/vanuatu.png differ
diff --git a/public/images/emoji/twitter/vatican_city.png b/public/images/emoji/twitter/vatican_city.png
new file mode 100644
index 00000000000..a91fed8815c
Binary files /dev/null and b/public/images/emoji/twitter/vatican_city.png differ
diff --git a/public/images/emoji/twitter/venezuela.png b/public/images/emoji/twitter/venezuela.png
new file mode 100644
index 00000000000..e2b7cff1d89
Binary files /dev/null and b/public/images/emoji/twitter/venezuela.png differ
diff --git a/public/images/emoji/twitter/vietnam.png b/public/images/emoji/twitter/vietnam.png
new file mode 100644
index 00000000000..f888ea94350
Binary files /dev/null and b/public/images/emoji/twitter/vietnam.png differ
diff --git a/public/images/emoji/twitter/vulcan/2.png b/public/images/emoji/twitter/vulcan/2.png
new file mode 100644
index 00000000000..5cdfab6d9a3
Binary files /dev/null and b/public/images/emoji/twitter/vulcan/2.png differ
diff --git a/public/images/emoji/twitter/vulcan/3.png b/public/images/emoji/twitter/vulcan/3.png
new file mode 100644
index 00000000000..a469f9b420e
Binary files /dev/null and b/public/images/emoji/twitter/vulcan/3.png differ
diff --git a/public/images/emoji/twitter/vulcan/4.png b/public/images/emoji/twitter/vulcan/4.png
new file mode 100644
index 00000000000..a8803b88169
Binary files /dev/null and b/public/images/emoji/twitter/vulcan/4.png differ
diff --git a/public/images/emoji/twitter/vulcan/5.png b/public/images/emoji/twitter/vulcan/5.png
new file mode 100644
index 00000000000..2d9def823e5
Binary files /dev/null and b/public/images/emoji/twitter/vulcan/5.png differ
diff --git a/public/images/emoji/twitter/vulcan/6.png b/public/images/emoji/twitter/vulcan/6.png
new file mode 100644
index 00000000000..bbcb6dc0d34
Binary files /dev/null and b/public/images/emoji/twitter/vulcan/6.png differ
diff --git a/public/images/emoji/twitter/vulcan_salute.png b/public/images/emoji/twitter/vulcan_salute.png
new file mode 100644
index 00000000000..62459294572
Binary files /dev/null and b/public/images/emoji/twitter/vulcan_salute.png differ
diff --git a/public/images/emoji/twitter/vulcan_salute/2.png b/public/images/emoji/twitter/vulcan_salute/2.png
new file mode 100644
index 00000000000..5cdfab6d9a3
Binary files /dev/null and b/public/images/emoji/twitter/vulcan_salute/2.png differ
diff --git a/public/images/emoji/twitter/vulcan_salute/3.png b/public/images/emoji/twitter/vulcan_salute/3.png
new file mode 100644
index 00000000000..a469f9b420e
Binary files /dev/null and b/public/images/emoji/twitter/vulcan_salute/3.png differ
diff --git a/public/images/emoji/twitter/vulcan_salute/4.png b/public/images/emoji/twitter/vulcan_salute/4.png
new file mode 100644
index 00000000000..a8803b88169
Binary files /dev/null and b/public/images/emoji/twitter/vulcan_salute/4.png differ
diff --git a/public/images/emoji/twitter/vulcan_salute/5.png b/public/images/emoji/twitter/vulcan_salute/5.png
new file mode 100644
index 00000000000..2d9def823e5
Binary files /dev/null and b/public/images/emoji/twitter/vulcan_salute/5.png differ
diff --git a/public/images/emoji/twitter/vulcan_salute/6.png b/public/images/emoji/twitter/vulcan_salute/6.png
new file mode 100644
index 00000000000..bbcb6dc0d34
Binary files /dev/null and b/public/images/emoji/twitter/vulcan_salute/6.png differ
diff --git a/public/images/emoji/twitter/walking.png b/public/images/emoji/twitter/walking.png
index 671bb160508..620e3d3b36c 100644
Binary files a/public/images/emoji/twitter/walking.png and b/public/images/emoji/twitter/walking.png differ
diff --git a/public/images/emoji/twitter/walking/2.png b/public/images/emoji/twitter/walking/2.png
new file mode 100644
index 00000000000..8972ced603b
Binary files /dev/null and b/public/images/emoji/twitter/walking/2.png differ
diff --git a/public/images/emoji/twitter/walking/3.png b/public/images/emoji/twitter/walking/3.png
new file mode 100644
index 00000000000..1f171060baf
Binary files /dev/null and b/public/images/emoji/twitter/walking/3.png differ
diff --git a/public/images/emoji/twitter/walking/4.png b/public/images/emoji/twitter/walking/4.png
new file mode 100644
index 00000000000..ad9da430ec1
Binary files /dev/null and b/public/images/emoji/twitter/walking/4.png differ
diff --git a/public/images/emoji/twitter/walking/5.png b/public/images/emoji/twitter/walking/5.png
new file mode 100644
index 00000000000..47e4491eb3e
Binary files /dev/null and b/public/images/emoji/twitter/walking/5.png differ
diff --git a/public/images/emoji/twitter/walking/6.png b/public/images/emoji/twitter/walking/6.png
new file mode 100644
index 00000000000..a530b5481a7
Binary files /dev/null and b/public/images/emoji/twitter/walking/6.png differ
diff --git a/public/images/emoji/twitter/walking_man.png b/public/images/emoji/twitter/walking_man.png
new file mode 100644
index 00000000000..620e3d3b36c
Binary files /dev/null and b/public/images/emoji/twitter/walking_man.png differ
diff --git a/public/images/emoji/twitter/walking_man/2.png b/public/images/emoji/twitter/walking_man/2.png
new file mode 100644
index 00000000000..8972ced603b
Binary files /dev/null and b/public/images/emoji/twitter/walking_man/2.png differ
diff --git a/public/images/emoji/twitter/walking_man/3.png b/public/images/emoji/twitter/walking_man/3.png
new file mode 100644
index 00000000000..1f171060baf
Binary files /dev/null and b/public/images/emoji/twitter/walking_man/3.png differ
diff --git a/public/images/emoji/twitter/walking_man/4.png b/public/images/emoji/twitter/walking_man/4.png
new file mode 100644
index 00000000000..ad9da430ec1
Binary files /dev/null and b/public/images/emoji/twitter/walking_man/4.png differ
diff --git a/public/images/emoji/twitter/walking_man/5.png b/public/images/emoji/twitter/walking_man/5.png
new file mode 100644
index 00000000000..47e4491eb3e
Binary files /dev/null and b/public/images/emoji/twitter/walking_man/5.png differ
diff --git a/public/images/emoji/twitter/walking_man/6.png b/public/images/emoji/twitter/walking_man/6.png
new file mode 100644
index 00000000000..a530b5481a7
Binary files /dev/null and b/public/images/emoji/twitter/walking_man/6.png differ
diff --git a/public/images/emoji/twitter/walking_woman.png b/public/images/emoji/twitter/walking_woman.png
new file mode 100644
index 00000000000..5541bff1ede
Binary files /dev/null and b/public/images/emoji/twitter/walking_woman.png differ
diff --git a/public/images/emoji/twitter/walking_woman/2.png b/public/images/emoji/twitter/walking_woman/2.png
new file mode 100644
index 00000000000..3e8f7832c4c
Binary files /dev/null and b/public/images/emoji/twitter/walking_woman/2.png differ
diff --git a/public/images/emoji/twitter/walking_woman/3.png b/public/images/emoji/twitter/walking_woman/3.png
new file mode 100644
index 00000000000..3876ee6e63d
Binary files /dev/null and b/public/images/emoji/twitter/walking_woman/3.png differ
diff --git a/public/images/emoji/twitter/walking_woman/4.png b/public/images/emoji/twitter/walking_woman/4.png
new file mode 100644
index 00000000000..0aad2bc840d
Binary files /dev/null and b/public/images/emoji/twitter/walking_woman/4.png differ
diff --git a/public/images/emoji/twitter/walking_woman/5.png b/public/images/emoji/twitter/walking_woman/5.png
new file mode 100644
index 00000000000..c4d8fc9c356
Binary files /dev/null and b/public/images/emoji/twitter/walking_woman/5.png differ
diff --git a/public/images/emoji/twitter/walking_woman/6.png b/public/images/emoji/twitter/walking_woman/6.png
new file mode 100644
index 00000000000..54cb211d6b9
Binary files /dev/null and b/public/images/emoji/twitter/walking_woman/6.png differ
diff --git a/public/images/emoji/twitter/wallis_futuna.png b/public/images/emoji/twitter/wallis_futuna.png
new file mode 100644
index 00000000000..4672eabedba
Binary files /dev/null and b/public/images/emoji/twitter/wallis_futuna.png differ
diff --git a/public/images/emoji/twitter/watermelon.png b/public/images/emoji/twitter/watermelon.png
index 076112a642c..6d87561e563 100644
Binary files a/public/images/emoji/twitter/watermelon.png and b/public/images/emoji/twitter/watermelon.png differ
diff --git a/public/images/emoji/twitter/wave.png b/public/images/emoji/twitter/wave.png
index 304b214f04d..62e28e168be 100644
Binary files a/public/images/emoji/twitter/wave.png and b/public/images/emoji/twitter/wave.png differ
diff --git a/public/images/emoji/twitter/wave/2.png b/public/images/emoji/twitter/wave/2.png
new file mode 100644
index 00000000000..3d184999242
Binary files /dev/null and b/public/images/emoji/twitter/wave/2.png differ
diff --git a/public/images/emoji/twitter/wave/3.png b/public/images/emoji/twitter/wave/3.png
new file mode 100644
index 00000000000..865d825c206
Binary files /dev/null and b/public/images/emoji/twitter/wave/3.png differ
diff --git a/public/images/emoji/twitter/wave/4.png b/public/images/emoji/twitter/wave/4.png
new file mode 100644
index 00000000000..77ffe01a609
Binary files /dev/null and b/public/images/emoji/twitter/wave/4.png differ
diff --git a/public/images/emoji/twitter/wave/5.png b/public/images/emoji/twitter/wave/5.png
new file mode 100644
index 00000000000..1d869f74c09
Binary files /dev/null and b/public/images/emoji/twitter/wave/5.png differ
diff --git a/public/images/emoji/twitter/wave/6.png b/public/images/emoji/twitter/wave/6.png
new file mode 100644
index 00000000000..66b5dbc074f
Binary files /dev/null and b/public/images/emoji/twitter/wave/6.png differ
diff --git a/public/images/emoji/twitter/wedding.png b/public/images/emoji/twitter/wedding.png
index ac630fc57df..ba45ce4cb5e 100644
Binary files a/public/images/emoji/twitter/wedding.png and b/public/images/emoji/twitter/wedding.png differ
diff --git a/public/images/emoji/twitter/weight_lifter.png b/public/images/emoji/twitter/weight_lifter.png
index e0fb05d5e01..be0473304d5 100644
Binary files a/public/images/emoji/twitter/weight_lifter.png and b/public/images/emoji/twitter/weight_lifter.png differ
diff --git a/public/images/emoji/twitter/weight_lifter/2.png b/public/images/emoji/twitter/weight_lifter/2.png
new file mode 100644
index 00000000000..8d680f5b12c
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifter/2.png differ
diff --git a/public/images/emoji/twitter/weight_lifter/3.png b/public/images/emoji/twitter/weight_lifter/3.png
new file mode 100644
index 00000000000..e4e961d5d5d
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifter/3.png differ
diff --git a/public/images/emoji/twitter/weight_lifter/4.png b/public/images/emoji/twitter/weight_lifter/4.png
new file mode 100644
index 00000000000..bcdf20d1757
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifter/4.png differ
diff --git a/public/images/emoji/twitter/weight_lifter/5.png b/public/images/emoji/twitter/weight_lifter/5.png
new file mode 100644
index 00000000000..9b91906952e
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifter/5.png differ
diff --git a/public/images/emoji/twitter/weight_lifter/6.png b/public/images/emoji/twitter/weight_lifter/6.png
new file mode 100644
index 00000000000..c3ce145e9e1
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifter/6.png differ
diff --git a/public/images/emoji/twitter/weight_lifting_man.png b/public/images/emoji/twitter/weight_lifting_man.png
new file mode 100644
index 00000000000..be0473304d5
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifting_man.png differ
diff --git a/public/images/emoji/twitter/weight_lifting_man/2.png b/public/images/emoji/twitter/weight_lifting_man/2.png
new file mode 100644
index 00000000000..8d680f5b12c
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/twitter/weight_lifting_man/3.png b/public/images/emoji/twitter/weight_lifting_man/3.png
new file mode 100644
index 00000000000..e4e961d5d5d
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/twitter/weight_lifting_man/4.png b/public/images/emoji/twitter/weight_lifting_man/4.png
new file mode 100644
index 00000000000..bcdf20d1757
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/twitter/weight_lifting_man/5.png b/public/images/emoji/twitter/weight_lifting_man/5.png
new file mode 100644
index 00000000000..9b91906952e
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/twitter/weight_lifting_man/6.png b/public/images/emoji/twitter/weight_lifting_man/6.png
new file mode 100644
index 00000000000..c3ce145e9e1
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/twitter/weight_lifting_woman.png b/public/images/emoji/twitter/weight_lifting_woman.png
new file mode 100644
index 00000000000..2279709c85b
Binary files /dev/null and b/public/images/emoji/twitter/weight_lifting_woman.png differ
diff --git a/public/images/emoji/twitter/western_sahara.png b/public/images/emoji/twitter/western_sahara.png
new file mode 100644
index 00000000000..44c0ea20dd7
Binary files /dev/null and b/public/images/emoji/twitter/western_sahara.png differ
diff --git a/public/images/emoji/twitter/white_flag.png b/public/images/emoji/twitter/white_flag.png
new file mode 100644
index 00000000000..5f052fff2af
Binary files /dev/null and b/public/images/emoji/twitter/white_flag.png differ
diff --git a/public/images/emoji/twitter/white_sun_behind_cloud_with_rain.png b/public/images/emoji/twitter/white_sun_behind_cloud_with_rain.png
index 804862c0649..ef892f1f889 100644
Binary files a/public/images/emoji/twitter/white_sun_behind_cloud_with_rain.png and b/public/images/emoji/twitter/white_sun_behind_cloud_with_rain.png differ
diff --git a/public/images/emoji/twitter/white_sun_rain_cloud.png b/public/images/emoji/twitter/white_sun_rain_cloud.png
index 804862c0649..ef892f1f889 100644
Binary files a/public/images/emoji/twitter/white_sun_rain_cloud.png and b/public/images/emoji/twitter/white_sun_rain_cloud.png differ
diff --git a/public/images/emoji/twitter/white_sun_small_cloud.png b/public/images/emoji/twitter/white_sun_small_cloud.png
index 90af3591e04..544e6eafea7 100644
Binary files a/public/images/emoji/twitter/white_sun_small_cloud.png and b/public/images/emoji/twitter/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/twitter/white_sun_with_small_cloud.png b/public/images/emoji/twitter/white_sun_with_small_cloud.png
index 90af3591e04..544e6eafea7 100644
Binary files a/public/images/emoji/twitter/white_sun_with_small_cloud.png and b/public/images/emoji/twitter/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/twitter/wilted_flower.png b/public/images/emoji/twitter/wilted_flower.png
new file mode 100644
index 00000000000..a4e69ff073b
Binary files /dev/null and b/public/images/emoji/twitter/wilted_flower.png differ
diff --git a/public/images/emoji/twitter/wind_face.png b/public/images/emoji/twitter/wind_face.png
new file mode 100644
index 00000000000..f89ef444f72
Binary files /dev/null and b/public/images/emoji/twitter/wind_face.png differ
diff --git a/public/images/emoji/twitter/wine_glass.png b/public/images/emoji/twitter/wine_glass.png
index 23e0fd17d4f..b7b4e4f1f49 100644
Binary files a/public/images/emoji/twitter/wine_glass.png and b/public/images/emoji/twitter/wine_glass.png differ
diff --git a/public/images/emoji/twitter/wolf.png b/public/images/emoji/twitter/wolf.png
index aa813db5c0b..36be9044764 100644
Binary files a/public/images/emoji/twitter/wolf.png and b/public/images/emoji/twitter/wolf.png differ
diff --git a/public/images/emoji/twitter/woman/2.png b/public/images/emoji/twitter/woman/2.png
new file mode 100644
index 00000000000..0fccb432f91
Binary files /dev/null and b/public/images/emoji/twitter/woman/2.png differ
diff --git a/public/images/emoji/twitter/woman/3.png b/public/images/emoji/twitter/woman/3.png
new file mode 100644
index 00000000000..32f6dbe3f8b
Binary files /dev/null and b/public/images/emoji/twitter/woman/3.png differ
diff --git a/public/images/emoji/twitter/woman/4.png b/public/images/emoji/twitter/woman/4.png
new file mode 100644
index 00000000000..95ddc1752be
Binary files /dev/null and b/public/images/emoji/twitter/woman/4.png differ
diff --git a/public/images/emoji/twitter/woman/5.png b/public/images/emoji/twitter/woman/5.png
new file mode 100644
index 00000000000..2c8d8c0ebb4
Binary files /dev/null and b/public/images/emoji/twitter/woman/5.png differ
diff --git a/public/images/emoji/twitter/woman/6.png b/public/images/emoji/twitter/woman/6.png
new file mode 100644
index 00000000000..040247f9292
Binary files /dev/null and b/public/images/emoji/twitter/woman/6.png differ
diff --git a/public/images/emoji/twitter/woman_artist.png b/public/images/emoji/twitter/woman_artist.png
new file mode 100644
index 00000000000..59bef6499ad
Binary files /dev/null and b/public/images/emoji/twitter/woman_artist.png differ
diff --git a/public/images/emoji/twitter/woman_artist/2.png b/public/images/emoji/twitter/woman_artist/2.png
new file mode 100644
index 00000000000..1f10ebc442d
Binary files /dev/null and b/public/images/emoji/twitter/woman_artist/2.png differ
diff --git a/public/images/emoji/twitter/woman_artist/3.png b/public/images/emoji/twitter/woman_artist/3.png
new file mode 100644
index 00000000000..4b6fe289bce
Binary files /dev/null and b/public/images/emoji/twitter/woman_artist/3.png differ
diff --git a/public/images/emoji/twitter/woman_artist/4.png b/public/images/emoji/twitter/woman_artist/4.png
new file mode 100644
index 00000000000..70d36d0287b
Binary files /dev/null and b/public/images/emoji/twitter/woman_artist/4.png differ
diff --git a/public/images/emoji/twitter/woman_artist/5.png b/public/images/emoji/twitter/woman_artist/5.png
new file mode 100644
index 00000000000..ab8ce935d1d
Binary files /dev/null and b/public/images/emoji/twitter/woman_artist/5.png differ
diff --git a/public/images/emoji/twitter/woman_artist/6.png b/public/images/emoji/twitter/woman_artist/6.png
new file mode 100644
index 00000000000..5513232d02c
Binary files /dev/null and b/public/images/emoji/twitter/woman_artist/6.png differ
diff --git a/public/images/emoji/twitter/woman_astronaut.png b/public/images/emoji/twitter/woman_astronaut.png
new file mode 100644
index 00000000000..cdd72ce56da
Binary files /dev/null and b/public/images/emoji/twitter/woman_astronaut.png differ
diff --git a/public/images/emoji/twitter/woman_astronaut/2.png b/public/images/emoji/twitter/woman_astronaut/2.png
new file mode 100644
index 00000000000..51af6656685
Binary files /dev/null and b/public/images/emoji/twitter/woman_astronaut/2.png differ
diff --git a/public/images/emoji/twitter/woman_astronaut/3.png b/public/images/emoji/twitter/woman_astronaut/3.png
new file mode 100644
index 00000000000..f1505464c9d
Binary files /dev/null and b/public/images/emoji/twitter/woman_astronaut/3.png differ
diff --git a/public/images/emoji/twitter/woman_astronaut/4.png b/public/images/emoji/twitter/woman_astronaut/4.png
new file mode 100644
index 00000000000..f5716b1882c
Binary files /dev/null and b/public/images/emoji/twitter/woman_astronaut/4.png differ
diff --git a/public/images/emoji/twitter/woman_astronaut/5.png b/public/images/emoji/twitter/woman_astronaut/5.png
new file mode 100644
index 00000000000..5f8e97f970f
Binary files /dev/null and b/public/images/emoji/twitter/woman_astronaut/5.png differ
diff --git a/public/images/emoji/twitter/woman_astronaut/6.png b/public/images/emoji/twitter/woman_astronaut/6.png
new file mode 100644
index 00000000000..d07a48eaacc
Binary files /dev/null and b/public/images/emoji/twitter/woman_astronaut/6.png differ
diff --git a/public/images/emoji/twitter/woman_cartwheeling.png b/public/images/emoji/twitter/woman_cartwheeling.png
new file mode 100644
index 00000000000..124763691f3
Binary files /dev/null and b/public/images/emoji/twitter/woman_cartwheeling.png differ
diff --git a/public/images/emoji/twitter/woman_cartwheeling/2.png b/public/images/emoji/twitter/woman_cartwheeling/2.png
new file mode 100644
index 00000000000..cbda90bf9f8
Binary files /dev/null and b/public/images/emoji/twitter/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/twitter/woman_cartwheeling/3.png b/public/images/emoji/twitter/woman_cartwheeling/3.png
new file mode 100644
index 00000000000..133d630aae8
Binary files /dev/null and b/public/images/emoji/twitter/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/twitter/woman_cartwheeling/4.png b/public/images/emoji/twitter/woman_cartwheeling/4.png
new file mode 100644
index 00000000000..399f4807f8f
Binary files /dev/null and b/public/images/emoji/twitter/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/twitter/woman_cartwheeling/5.png b/public/images/emoji/twitter/woman_cartwheeling/5.png
new file mode 100644
index 00000000000..bb0785b5022
Binary files /dev/null and b/public/images/emoji/twitter/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/twitter/woman_cartwheeling/6.png b/public/images/emoji/twitter/woman_cartwheeling/6.png
new file mode 100644
index 00000000000..90454bc8b96
Binary files /dev/null and b/public/images/emoji/twitter/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/twitter/woman_cook.png b/public/images/emoji/twitter/woman_cook.png
new file mode 100644
index 00000000000..fb473698634
Binary files /dev/null and b/public/images/emoji/twitter/woman_cook.png differ
diff --git a/public/images/emoji/twitter/woman_cook/2.png b/public/images/emoji/twitter/woman_cook/2.png
new file mode 100644
index 00000000000..dcf2163a16d
Binary files /dev/null and b/public/images/emoji/twitter/woman_cook/2.png differ
diff --git a/public/images/emoji/twitter/woman_cook/3.png b/public/images/emoji/twitter/woman_cook/3.png
new file mode 100644
index 00000000000..00a32101071
Binary files /dev/null and b/public/images/emoji/twitter/woman_cook/3.png differ
diff --git a/public/images/emoji/twitter/woman_cook/4.png b/public/images/emoji/twitter/woman_cook/4.png
new file mode 100644
index 00000000000..ea9400ce130
Binary files /dev/null and b/public/images/emoji/twitter/woman_cook/4.png differ
diff --git a/public/images/emoji/twitter/woman_cook/5.png b/public/images/emoji/twitter/woman_cook/5.png
new file mode 100644
index 00000000000..9c90c090d73
Binary files /dev/null and b/public/images/emoji/twitter/woman_cook/5.png differ
diff --git a/public/images/emoji/twitter/woman_cook/6.png b/public/images/emoji/twitter/woman_cook/6.png
new file mode 100644
index 00000000000..6745e5324ec
Binary files /dev/null and b/public/images/emoji/twitter/woman_cook/6.png differ
diff --git a/public/images/emoji/twitter/woman_facepalming.png b/public/images/emoji/twitter/woman_facepalming.png
new file mode 100644
index 00000000000..0862f45755f
Binary files /dev/null and b/public/images/emoji/twitter/woman_facepalming.png differ
diff --git a/public/images/emoji/twitter/woman_facepalming/2.png b/public/images/emoji/twitter/woman_facepalming/2.png
new file mode 100644
index 00000000000..c2a0c5583d9
Binary files /dev/null and b/public/images/emoji/twitter/woman_facepalming/2.png differ
diff --git a/public/images/emoji/twitter/woman_facepalming/3.png b/public/images/emoji/twitter/woman_facepalming/3.png
new file mode 100644
index 00000000000..2efbdb0954d
Binary files /dev/null and b/public/images/emoji/twitter/woman_facepalming/3.png differ
diff --git a/public/images/emoji/twitter/woman_facepalming/4.png b/public/images/emoji/twitter/woman_facepalming/4.png
new file mode 100644
index 00000000000..93d1697b834
Binary files /dev/null and b/public/images/emoji/twitter/woman_facepalming/4.png differ
diff --git a/public/images/emoji/twitter/woman_facepalming/5.png b/public/images/emoji/twitter/woman_facepalming/5.png
new file mode 100644
index 00000000000..5e7da37f052
Binary files /dev/null and b/public/images/emoji/twitter/woman_facepalming/5.png differ
diff --git a/public/images/emoji/twitter/woman_facepalming/6.png b/public/images/emoji/twitter/woman_facepalming/6.png
new file mode 100644
index 00000000000..d7dcd8dfc0f
Binary files /dev/null and b/public/images/emoji/twitter/woman_facepalming/6.png differ
diff --git a/public/images/emoji/twitter/woman_factory_worker.png b/public/images/emoji/twitter/woman_factory_worker.png
new file mode 100644
index 00000000000..22e9ab5b8d3
Binary files /dev/null and b/public/images/emoji/twitter/woman_factory_worker.png differ
diff --git a/public/images/emoji/twitter/woman_factory_worker/2.png b/public/images/emoji/twitter/woman_factory_worker/2.png
new file mode 100644
index 00000000000..8124db7497d
Binary files /dev/null and b/public/images/emoji/twitter/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/twitter/woman_factory_worker/3.png b/public/images/emoji/twitter/woman_factory_worker/3.png
new file mode 100644
index 00000000000..2e3ad0ee377
Binary files /dev/null and b/public/images/emoji/twitter/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/twitter/woman_factory_worker/4.png b/public/images/emoji/twitter/woman_factory_worker/4.png
new file mode 100644
index 00000000000..461a4dcb8fb
Binary files /dev/null and b/public/images/emoji/twitter/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/twitter/woman_factory_worker/5.png b/public/images/emoji/twitter/woman_factory_worker/5.png
new file mode 100644
index 00000000000..a1e2b6fedf5
Binary files /dev/null and b/public/images/emoji/twitter/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/twitter/woman_factory_worker/6.png b/public/images/emoji/twitter/woman_factory_worker/6.png
new file mode 100644
index 00000000000..8bb53fe8342
Binary files /dev/null and b/public/images/emoji/twitter/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/twitter/woman_farmer.png b/public/images/emoji/twitter/woman_farmer.png
new file mode 100644
index 00000000000..edb763b8c0d
Binary files /dev/null and b/public/images/emoji/twitter/woman_farmer.png differ
diff --git a/public/images/emoji/twitter/woman_farmer/2.png b/public/images/emoji/twitter/woman_farmer/2.png
new file mode 100644
index 00000000000..b8b38757986
Binary files /dev/null and b/public/images/emoji/twitter/woman_farmer/2.png differ
diff --git a/public/images/emoji/twitter/woman_farmer/3.png b/public/images/emoji/twitter/woman_farmer/3.png
new file mode 100644
index 00000000000..50bca0a619b
Binary files /dev/null and b/public/images/emoji/twitter/woman_farmer/3.png differ
diff --git a/public/images/emoji/twitter/woman_farmer/4.png b/public/images/emoji/twitter/woman_farmer/4.png
new file mode 100644
index 00000000000..f990a8c7997
Binary files /dev/null and b/public/images/emoji/twitter/woman_farmer/4.png differ
diff --git a/public/images/emoji/twitter/woman_farmer/5.png b/public/images/emoji/twitter/woman_farmer/5.png
new file mode 100644
index 00000000000..bbdeaac7784
Binary files /dev/null and b/public/images/emoji/twitter/woman_farmer/5.png differ
diff --git a/public/images/emoji/twitter/woman_farmer/6.png b/public/images/emoji/twitter/woman_farmer/6.png
new file mode 100644
index 00000000000..680f352c0a0
Binary files /dev/null and b/public/images/emoji/twitter/woman_farmer/6.png differ
diff --git a/public/images/emoji/twitter/woman_firefighter.png b/public/images/emoji/twitter/woman_firefighter.png
new file mode 100644
index 00000000000..ec9fc0dd0ae
Binary files /dev/null and b/public/images/emoji/twitter/woman_firefighter.png differ
diff --git a/public/images/emoji/twitter/woman_firefighter/2.png b/public/images/emoji/twitter/woman_firefighter/2.png
new file mode 100644
index 00000000000..4108b65e648
Binary files /dev/null and b/public/images/emoji/twitter/woman_firefighter/2.png differ
diff --git a/public/images/emoji/twitter/woman_firefighter/3.png b/public/images/emoji/twitter/woman_firefighter/3.png
new file mode 100644
index 00000000000..648fd207ef9
Binary files /dev/null and b/public/images/emoji/twitter/woman_firefighter/3.png differ
diff --git a/public/images/emoji/twitter/woman_firefighter/4.png b/public/images/emoji/twitter/woman_firefighter/4.png
new file mode 100644
index 00000000000..366f946a1c4
Binary files /dev/null and b/public/images/emoji/twitter/woman_firefighter/4.png differ
diff --git a/public/images/emoji/twitter/woman_firefighter/5.png b/public/images/emoji/twitter/woman_firefighter/5.png
new file mode 100644
index 00000000000..cfd3ac72703
Binary files /dev/null and b/public/images/emoji/twitter/woman_firefighter/5.png differ
diff --git a/public/images/emoji/twitter/woman_firefighter/6.png b/public/images/emoji/twitter/woman_firefighter/6.png
new file mode 100644
index 00000000000..6da20434d92
Binary files /dev/null and b/public/images/emoji/twitter/woman_firefighter/6.png differ
diff --git a/public/images/emoji/twitter/woman_health_worker.png b/public/images/emoji/twitter/woman_health_worker.png
new file mode 100644
index 00000000000..bdd57f781c7
Binary files /dev/null and b/public/images/emoji/twitter/woman_health_worker.png differ
diff --git a/public/images/emoji/twitter/woman_health_worker/2.png b/public/images/emoji/twitter/woman_health_worker/2.png
new file mode 100644
index 00000000000..7e0d10c1f09
Binary files /dev/null and b/public/images/emoji/twitter/woman_health_worker/2.png differ
diff --git a/public/images/emoji/twitter/woman_health_worker/3.png b/public/images/emoji/twitter/woman_health_worker/3.png
new file mode 100644
index 00000000000..06e678a9dbc
Binary files /dev/null and b/public/images/emoji/twitter/woman_health_worker/3.png differ
diff --git a/public/images/emoji/twitter/woman_health_worker/4.png b/public/images/emoji/twitter/woman_health_worker/4.png
new file mode 100644
index 00000000000..86876a9e634
Binary files /dev/null and b/public/images/emoji/twitter/woman_health_worker/4.png differ
diff --git a/public/images/emoji/twitter/woman_health_worker/5.png b/public/images/emoji/twitter/woman_health_worker/5.png
new file mode 100644
index 00000000000..922e25ee9a2
Binary files /dev/null and b/public/images/emoji/twitter/woman_health_worker/5.png differ
diff --git a/public/images/emoji/twitter/woman_health_worker/6.png b/public/images/emoji/twitter/woman_health_worker/6.png
new file mode 100644
index 00000000000..cae11d93383
Binary files /dev/null and b/public/images/emoji/twitter/woman_health_worker/6.png differ
diff --git a/public/images/emoji/twitter/woman_judge.png b/public/images/emoji/twitter/woman_judge.png
new file mode 100644
index 00000000000..302f1fbdd70
Binary files /dev/null and b/public/images/emoji/twitter/woman_judge.png differ
diff --git a/public/images/emoji/twitter/woman_judge/2.png b/public/images/emoji/twitter/woman_judge/2.png
new file mode 100644
index 00000000000..ba942e11df6
Binary files /dev/null and b/public/images/emoji/twitter/woman_judge/2.png differ
diff --git a/public/images/emoji/twitter/woman_judge/3.png b/public/images/emoji/twitter/woman_judge/3.png
new file mode 100644
index 00000000000..943dc444e8a
Binary files /dev/null and b/public/images/emoji/twitter/woman_judge/3.png differ
diff --git a/public/images/emoji/twitter/woman_judge/4.png b/public/images/emoji/twitter/woman_judge/4.png
new file mode 100644
index 00000000000..901c7c2fb9b
Binary files /dev/null and b/public/images/emoji/twitter/woman_judge/4.png differ
diff --git a/public/images/emoji/twitter/woman_judge/5.png b/public/images/emoji/twitter/woman_judge/5.png
new file mode 100644
index 00000000000..be61917660f
Binary files /dev/null and b/public/images/emoji/twitter/woman_judge/5.png differ
diff --git a/public/images/emoji/twitter/woman_judge/6.png b/public/images/emoji/twitter/woman_judge/6.png
new file mode 100644
index 00000000000..3be5920c27d
Binary files /dev/null and b/public/images/emoji/twitter/woman_judge/6.png differ
diff --git a/public/images/emoji/twitter/woman_juggling.png b/public/images/emoji/twitter/woman_juggling.png
new file mode 100644
index 00000000000..5c3deb2d493
Binary files /dev/null and b/public/images/emoji/twitter/woman_juggling.png differ
diff --git a/public/images/emoji/twitter/woman_juggling/2.png b/public/images/emoji/twitter/woman_juggling/2.png
new file mode 100644
index 00000000000..7e0822fd89d
Binary files /dev/null and b/public/images/emoji/twitter/woman_juggling/2.png differ
diff --git a/public/images/emoji/twitter/woman_juggling/3.png b/public/images/emoji/twitter/woman_juggling/3.png
new file mode 100644
index 00000000000..9427c61849f
Binary files /dev/null and b/public/images/emoji/twitter/woman_juggling/3.png differ
diff --git a/public/images/emoji/twitter/woman_juggling/4.png b/public/images/emoji/twitter/woman_juggling/4.png
new file mode 100644
index 00000000000..710119d96b5
Binary files /dev/null and b/public/images/emoji/twitter/woman_juggling/4.png differ
diff --git a/public/images/emoji/twitter/woman_juggling/5.png b/public/images/emoji/twitter/woman_juggling/5.png
new file mode 100644
index 00000000000..2a8d51aaa99
Binary files /dev/null and b/public/images/emoji/twitter/woman_juggling/5.png differ
diff --git a/public/images/emoji/twitter/woman_juggling/6.png b/public/images/emoji/twitter/woman_juggling/6.png
new file mode 100644
index 00000000000..37a7391cfe7
Binary files /dev/null and b/public/images/emoji/twitter/woman_juggling/6.png differ
diff --git a/public/images/emoji/twitter/woman_mechanic.png b/public/images/emoji/twitter/woman_mechanic.png
new file mode 100644
index 00000000000..00c01f4dc78
Binary files /dev/null and b/public/images/emoji/twitter/woman_mechanic.png differ
diff --git a/public/images/emoji/twitter/woman_mechanic/2.png b/public/images/emoji/twitter/woman_mechanic/2.png
new file mode 100644
index 00000000000..2dd109611ef
Binary files /dev/null and b/public/images/emoji/twitter/woman_mechanic/2.png differ
diff --git a/public/images/emoji/twitter/woman_mechanic/3.png b/public/images/emoji/twitter/woman_mechanic/3.png
new file mode 100644
index 00000000000..3029459512e
Binary files /dev/null and b/public/images/emoji/twitter/woman_mechanic/3.png differ
diff --git a/public/images/emoji/twitter/woman_mechanic/4.png b/public/images/emoji/twitter/woman_mechanic/4.png
new file mode 100644
index 00000000000..fd6be2cb760
Binary files /dev/null and b/public/images/emoji/twitter/woman_mechanic/4.png differ
diff --git a/public/images/emoji/twitter/woman_mechanic/5.png b/public/images/emoji/twitter/woman_mechanic/5.png
new file mode 100644
index 00000000000..baec0ca3c51
Binary files /dev/null and b/public/images/emoji/twitter/woman_mechanic/5.png differ
diff --git a/public/images/emoji/twitter/woman_mechanic/6.png b/public/images/emoji/twitter/woman_mechanic/6.png
new file mode 100644
index 00000000000..de62d29f061
Binary files /dev/null and b/public/images/emoji/twitter/woman_mechanic/6.png differ
diff --git a/public/images/emoji/twitter/woman_office_worker.png b/public/images/emoji/twitter/woman_office_worker.png
new file mode 100644
index 00000000000..3ed967832b7
Binary files /dev/null and b/public/images/emoji/twitter/woman_office_worker.png differ
diff --git a/public/images/emoji/twitter/woman_office_worker/2.png b/public/images/emoji/twitter/woman_office_worker/2.png
new file mode 100644
index 00000000000..17b377b41ca
Binary files /dev/null and b/public/images/emoji/twitter/woman_office_worker/2.png differ
diff --git a/public/images/emoji/twitter/woman_office_worker/3.png b/public/images/emoji/twitter/woman_office_worker/3.png
new file mode 100644
index 00000000000..70fea252b05
Binary files /dev/null and b/public/images/emoji/twitter/woman_office_worker/3.png differ
diff --git a/public/images/emoji/twitter/woman_office_worker/4.png b/public/images/emoji/twitter/woman_office_worker/4.png
new file mode 100644
index 00000000000..59cd9724190
Binary files /dev/null and b/public/images/emoji/twitter/woman_office_worker/4.png differ
diff --git a/public/images/emoji/twitter/woman_office_worker/5.png b/public/images/emoji/twitter/woman_office_worker/5.png
new file mode 100644
index 00000000000..410d6e42cf9
Binary files /dev/null and b/public/images/emoji/twitter/woman_office_worker/5.png differ
diff --git a/public/images/emoji/twitter/woman_office_worker/6.png b/public/images/emoji/twitter/woman_office_worker/6.png
new file mode 100644
index 00000000000..77c1ab6c3cd
Binary files /dev/null and b/public/images/emoji/twitter/woman_office_worker/6.png differ
diff --git a/public/images/emoji/twitter/woman_pilot.png b/public/images/emoji/twitter/woman_pilot.png
new file mode 100644
index 00000000000..bdb1f781ee9
Binary files /dev/null and b/public/images/emoji/twitter/woman_pilot.png differ
diff --git a/public/images/emoji/twitter/woman_pilot/2.png b/public/images/emoji/twitter/woman_pilot/2.png
new file mode 100644
index 00000000000..18357b611a1
Binary files /dev/null and b/public/images/emoji/twitter/woman_pilot/2.png differ
diff --git a/public/images/emoji/twitter/woman_pilot/3.png b/public/images/emoji/twitter/woman_pilot/3.png
new file mode 100644
index 00000000000..6ef43682bc7
Binary files /dev/null and b/public/images/emoji/twitter/woman_pilot/3.png differ
diff --git a/public/images/emoji/twitter/woman_pilot/4.png b/public/images/emoji/twitter/woman_pilot/4.png
new file mode 100644
index 00000000000..5b46123bc29
Binary files /dev/null and b/public/images/emoji/twitter/woman_pilot/4.png differ
diff --git a/public/images/emoji/twitter/woman_pilot/5.png b/public/images/emoji/twitter/woman_pilot/5.png
new file mode 100644
index 00000000000..c13b55013ec
Binary files /dev/null and b/public/images/emoji/twitter/woman_pilot/5.png differ
diff --git a/public/images/emoji/twitter/woman_pilot/6.png b/public/images/emoji/twitter/woman_pilot/6.png
new file mode 100644
index 00000000000..fb7ec93f0ca
Binary files /dev/null and b/public/images/emoji/twitter/woman_pilot/6.png differ
diff --git a/public/images/emoji/twitter/woman_playing_handball.png b/public/images/emoji/twitter/woman_playing_handball.png
new file mode 100644
index 00000000000..731f747ab26
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_handball.png differ
diff --git a/public/images/emoji/twitter/woman_playing_handball/2.png b/public/images/emoji/twitter/woman_playing_handball/2.png
new file mode 100644
index 00000000000..52f1ac332db
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/twitter/woman_playing_handball/3.png b/public/images/emoji/twitter/woman_playing_handball/3.png
new file mode 100644
index 00000000000..57ff251cbe3
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/twitter/woman_playing_handball/4.png b/public/images/emoji/twitter/woman_playing_handball/4.png
new file mode 100644
index 00000000000..8b21c5f954e
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/twitter/woman_playing_handball/5.png b/public/images/emoji/twitter/woman_playing_handball/5.png
new file mode 100644
index 00000000000..c09e12ad349
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/twitter/woman_playing_handball/6.png b/public/images/emoji/twitter/woman_playing_handball/6.png
new file mode 100644
index 00000000000..25a5c4edd8e
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/twitter/woman_playing_water_polo.png b/public/images/emoji/twitter/woman_playing_water_polo.png
new file mode 100644
index 00000000000..9f1a2e79e9d
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/twitter/woman_playing_water_polo/2.png b/public/images/emoji/twitter/woman_playing_water_polo/2.png
new file mode 100644
index 00000000000..74118cdc896
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/twitter/woman_playing_water_polo/3.png b/public/images/emoji/twitter/woman_playing_water_polo/3.png
new file mode 100644
index 00000000000..02a40bc83d7
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/twitter/woman_playing_water_polo/4.png b/public/images/emoji/twitter/woman_playing_water_polo/4.png
new file mode 100644
index 00000000000..28e04bc113c
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/twitter/woman_playing_water_polo/5.png b/public/images/emoji/twitter/woman_playing_water_polo/5.png
new file mode 100644
index 00000000000..f112c330bc3
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/twitter/woman_playing_water_polo/6.png b/public/images/emoji/twitter/woman_playing_water_polo/6.png
new file mode 100644
index 00000000000..dd3f628ee91
Binary files /dev/null and b/public/images/emoji/twitter/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/twitter/woman_scientist.png b/public/images/emoji/twitter/woman_scientist.png
new file mode 100644
index 00000000000..debc8aa07e2
Binary files /dev/null and b/public/images/emoji/twitter/woman_scientist.png differ
diff --git a/public/images/emoji/twitter/woman_scientist/2.png b/public/images/emoji/twitter/woman_scientist/2.png
new file mode 100644
index 00000000000..84b54c10bb0
Binary files /dev/null and b/public/images/emoji/twitter/woman_scientist/2.png differ
diff --git a/public/images/emoji/twitter/woman_scientist/3.png b/public/images/emoji/twitter/woman_scientist/3.png
new file mode 100644
index 00000000000..e7aa385a93c
Binary files /dev/null and b/public/images/emoji/twitter/woman_scientist/3.png differ
diff --git a/public/images/emoji/twitter/woman_scientist/4.png b/public/images/emoji/twitter/woman_scientist/4.png
new file mode 100644
index 00000000000..9d294761afa
Binary files /dev/null and b/public/images/emoji/twitter/woman_scientist/4.png differ
diff --git a/public/images/emoji/twitter/woman_scientist/5.png b/public/images/emoji/twitter/woman_scientist/5.png
new file mode 100644
index 00000000000..bfc9f7b48c5
Binary files /dev/null and b/public/images/emoji/twitter/woman_scientist/5.png differ
diff --git a/public/images/emoji/twitter/woman_scientist/6.png b/public/images/emoji/twitter/woman_scientist/6.png
new file mode 100644
index 00000000000..70ebc5bc4f3
Binary files /dev/null and b/public/images/emoji/twitter/woman_scientist/6.png differ
diff --git a/public/images/emoji/twitter/woman_shrugging.png b/public/images/emoji/twitter/woman_shrugging.png
new file mode 100644
index 00000000000..3839c5eacdf
Binary files /dev/null and b/public/images/emoji/twitter/woman_shrugging.png differ
diff --git a/public/images/emoji/twitter/woman_shrugging/2.png b/public/images/emoji/twitter/woman_shrugging/2.png
new file mode 100644
index 00000000000..3ae10f1008d
Binary files /dev/null and b/public/images/emoji/twitter/woman_shrugging/2.png differ
diff --git a/public/images/emoji/twitter/woman_shrugging/3.png b/public/images/emoji/twitter/woman_shrugging/3.png
new file mode 100644
index 00000000000..1be387d41e1
Binary files /dev/null and b/public/images/emoji/twitter/woman_shrugging/3.png differ
diff --git a/public/images/emoji/twitter/woman_shrugging/4.png b/public/images/emoji/twitter/woman_shrugging/4.png
new file mode 100644
index 00000000000..9fbf38dfeab
Binary files /dev/null and b/public/images/emoji/twitter/woman_shrugging/4.png differ
diff --git a/public/images/emoji/twitter/woman_shrugging/5.png b/public/images/emoji/twitter/woman_shrugging/5.png
new file mode 100644
index 00000000000..349d86171e0
Binary files /dev/null and b/public/images/emoji/twitter/woman_shrugging/5.png differ
diff --git a/public/images/emoji/twitter/woman_shrugging/6.png b/public/images/emoji/twitter/woman_shrugging/6.png
new file mode 100644
index 00000000000..82a2b9f0528
Binary files /dev/null and b/public/images/emoji/twitter/woman_shrugging/6.png differ
diff --git a/public/images/emoji/twitter/woman_singer.png b/public/images/emoji/twitter/woman_singer.png
new file mode 100644
index 00000000000..07f59ab15f2
Binary files /dev/null and b/public/images/emoji/twitter/woman_singer.png differ
diff --git a/public/images/emoji/twitter/woman_singer/2.png b/public/images/emoji/twitter/woman_singer/2.png
new file mode 100644
index 00000000000..96578ef833f
Binary files /dev/null and b/public/images/emoji/twitter/woman_singer/2.png differ
diff --git a/public/images/emoji/twitter/woman_singer/3.png b/public/images/emoji/twitter/woman_singer/3.png
new file mode 100644
index 00000000000..3a613507ef2
Binary files /dev/null and b/public/images/emoji/twitter/woman_singer/3.png differ
diff --git a/public/images/emoji/twitter/woman_singer/4.png b/public/images/emoji/twitter/woman_singer/4.png
new file mode 100644
index 00000000000..439f929fb0b
Binary files /dev/null and b/public/images/emoji/twitter/woman_singer/4.png differ
diff --git a/public/images/emoji/twitter/woman_singer/5.png b/public/images/emoji/twitter/woman_singer/5.png
new file mode 100644
index 00000000000..f615d7ef3c0
Binary files /dev/null and b/public/images/emoji/twitter/woman_singer/5.png differ
diff --git a/public/images/emoji/twitter/woman_singer/6.png b/public/images/emoji/twitter/woman_singer/6.png
new file mode 100644
index 00000000000..4d919b04534
Binary files /dev/null and b/public/images/emoji/twitter/woman_singer/6.png differ
diff --git a/public/images/emoji/twitter/woman_student.png b/public/images/emoji/twitter/woman_student.png
new file mode 100644
index 00000000000..60e3c075ebb
Binary files /dev/null and b/public/images/emoji/twitter/woman_student.png differ
diff --git a/public/images/emoji/twitter/woman_student/2.png b/public/images/emoji/twitter/woman_student/2.png
new file mode 100644
index 00000000000..b02489086fd
Binary files /dev/null and b/public/images/emoji/twitter/woman_student/2.png differ
diff --git a/public/images/emoji/twitter/woman_student/3.png b/public/images/emoji/twitter/woman_student/3.png
new file mode 100644
index 00000000000..f6488d33900
Binary files /dev/null and b/public/images/emoji/twitter/woman_student/3.png differ
diff --git a/public/images/emoji/twitter/woman_student/4.png b/public/images/emoji/twitter/woman_student/4.png
new file mode 100644
index 00000000000..05f82e21622
Binary files /dev/null and b/public/images/emoji/twitter/woman_student/4.png differ
diff --git a/public/images/emoji/twitter/woman_student/5.png b/public/images/emoji/twitter/woman_student/5.png
new file mode 100644
index 00000000000..26ceb123206
Binary files /dev/null and b/public/images/emoji/twitter/woman_student/5.png differ
diff --git a/public/images/emoji/twitter/woman_student/6.png b/public/images/emoji/twitter/woman_student/6.png
new file mode 100644
index 00000000000..7fca961910f
Binary files /dev/null and b/public/images/emoji/twitter/woman_student/6.png differ
diff --git a/public/images/emoji/twitter/woman_teacher.png b/public/images/emoji/twitter/woman_teacher.png
new file mode 100644
index 00000000000..d98448f85bd
Binary files /dev/null and b/public/images/emoji/twitter/woman_teacher.png differ
diff --git a/public/images/emoji/twitter/woman_teacher/2.png b/public/images/emoji/twitter/woman_teacher/2.png
new file mode 100644
index 00000000000..6f980a37166
Binary files /dev/null and b/public/images/emoji/twitter/woman_teacher/2.png differ
diff --git a/public/images/emoji/twitter/woman_teacher/3.png b/public/images/emoji/twitter/woman_teacher/3.png
new file mode 100644
index 00000000000..0fb8f0904a8
Binary files /dev/null and b/public/images/emoji/twitter/woman_teacher/3.png differ
diff --git a/public/images/emoji/twitter/woman_teacher/4.png b/public/images/emoji/twitter/woman_teacher/4.png
new file mode 100644
index 00000000000..a8021347936
Binary files /dev/null and b/public/images/emoji/twitter/woman_teacher/4.png differ
diff --git a/public/images/emoji/twitter/woman_teacher/5.png b/public/images/emoji/twitter/woman_teacher/5.png
new file mode 100644
index 00000000000..dcceb1add1a
Binary files /dev/null and b/public/images/emoji/twitter/woman_teacher/5.png differ
diff --git a/public/images/emoji/twitter/woman_teacher/6.png b/public/images/emoji/twitter/woman_teacher/6.png
new file mode 100644
index 00000000000..41dc97c0786
Binary files /dev/null and b/public/images/emoji/twitter/woman_teacher/6.png differ
diff --git a/public/images/emoji/twitter/woman_technologist.png b/public/images/emoji/twitter/woman_technologist.png
new file mode 100644
index 00000000000..d74e604a64c
Binary files /dev/null and b/public/images/emoji/twitter/woman_technologist.png differ
diff --git a/public/images/emoji/twitter/woman_technologist/2.png b/public/images/emoji/twitter/woman_technologist/2.png
new file mode 100644
index 00000000000..931f1fd2bdd
Binary files /dev/null and b/public/images/emoji/twitter/woman_technologist/2.png differ
diff --git a/public/images/emoji/twitter/woman_technologist/3.png b/public/images/emoji/twitter/woman_technologist/3.png
new file mode 100644
index 00000000000..2cb918f752a
Binary files /dev/null and b/public/images/emoji/twitter/woman_technologist/3.png differ
diff --git a/public/images/emoji/twitter/woman_technologist/4.png b/public/images/emoji/twitter/woman_technologist/4.png
new file mode 100644
index 00000000000..f1cb4062e80
Binary files /dev/null and b/public/images/emoji/twitter/woman_technologist/4.png differ
diff --git a/public/images/emoji/twitter/woman_technologist/5.png b/public/images/emoji/twitter/woman_technologist/5.png
new file mode 100644
index 00000000000..5154939f5b0
Binary files /dev/null and b/public/images/emoji/twitter/woman_technologist/5.png differ
diff --git a/public/images/emoji/twitter/woman_technologist/6.png b/public/images/emoji/twitter/woman_technologist/6.png
new file mode 100644
index 00000000000..a427628a98e
Binary files /dev/null and b/public/images/emoji/twitter/woman_technologist/6.png differ
diff --git a/public/images/emoji/twitter/woman_with_headscarf.png b/public/images/emoji/twitter/woman_with_headscarf.png
new file mode 100644
index 00000000000..6b3731cac84
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_headscarf.png differ
diff --git a/public/images/emoji/twitter/woman_with_headscarf/2.png b/public/images/emoji/twitter/woman_with_headscarf/2.png
new file mode 100644
index 00000000000..511414ad6c6
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/twitter/woman_with_headscarf/3.png b/public/images/emoji/twitter/woman_with_headscarf/3.png
new file mode 100644
index 00000000000..af954353790
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/twitter/woman_with_headscarf/4.png b/public/images/emoji/twitter/woman_with_headscarf/4.png
new file mode 100644
index 00000000000..355bdeb6361
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/twitter/woman_with_headscarf/5.png b/public/images/emoji/twitter/woman_with_headscarf/5.png
new file mode 100644
index 00000000000..8d0ad7202e3
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/twitter/woman_with_headscarf/6.png b/public/images/emoji/twitter/woman_with_headscarf/6.png
new file mode 100644
index 00000000000..3c49195f876
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/twitter/woman_with_turban.png b/public/images/emoji/twitter/woman_with_turban.png
new file mode 100644
index 00000000000..884af5800cf
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_turban.png differ
diff --git a/public/images/emoji/twitter/woman_with_turban/2.png b/public/images/emoji/twitter/woman_with_turban/2.png
new file mode 100644
index 00000000000..f4904a0f1c8
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_turban/2.png differ
diff --git a/public/images/emoji/twitter/woman_with_turban/3.png b/public/images/emoji/twitter/woman_with_turban/3.png
new file mode 100644
index 00000000000..1629f28e0b1
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_turban/3.png differ
diff --git a/public/images/emoji/twitter/woman_with_turban/4.png b/public/images/emoji/twitter/woman_with_turban/4.png
new file mode 100644
index 00000000000..be7cbbeb4ee
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_turban/4.png differ
diff --git a/public/images/emoji/twitter/woman_with_turban/5.png b/public/images/emoji/twitter/woman_with_turban/5.png
new file mode 100644
index 00000000000..28845305df9
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_turban/5.png differ
diff --git a/public/images/emoji/twitter/woman_with_turban/6.png b/public/images/emoji/twitter/woman_with_turban/6.png
new file mode 100644
index 00000000000..1831d062fee
Binary files /dev/null and b/public/images/emoji/twitter/woman_with_turban/6.png differ
diff --git a/public/images/emoji/twitter/women_wrestling.png b/public/images/emoji/twitter/women_wrestling.png
new file mode 100644
index 00000000000..11fa66fd954
Binary files /dev/null and b/public/images/emoji/twitter/women_wrestling.png differ
diff --git a/public/images/emoji/twitter/world_map.png b/public/images/emoji/twitter/world_map.png
index 471c048fa27..8c102ea49de 100644
Binary files a/public/images/emoji/twitter/world_map.png and b/public/images/emoji/twitter/world_map.png differ
diff --git a/public/images/emoji/twitter/writing_hand.png b/public/images/emoji/twitter/writing_hand.png
index d4173ad57eb..8ec2032bf40 100644
Binary files a/public/images/emoji/twitter/writing_hand.png and b/public/images/emoji/twitter/writing_hand.png differ
diff --git a/public/images/emoji/twitter/writing_hand/2.png b/public/images/emoji/twitter/writing_hand/2.png
new file mode 100644
index 00000000000..37ac5fc0895
Binary files /dev/null and b/public/images/emoji/twitter/writing_hand/2.png differ
diff --git a/public/images/emoji/twitter/writing_hand/3.png b/public/images/emoji/twitter/writing_hand/3.png
new file mode 100644
index 00000000000..38606d26637
Binary files /dev/null and b/public/images/emoji/twitter/writing_hand/3.png differ
diff --git a/public/images/emoji/twitter/writing_hand/4.png b/public/images/emoji/twitter/writing_hand/4.png
new file mode 100644
index 00000000000..84ae862921f
Binary files /dev/null and b/public/images/emoji/twitter/writing_hand/4.png differ
diff --git a/public/images/emoji/twitter/writing_hand/5.png b/public/images/emoji/twitter/writing_hand/5.png
new file mode 100644
index 00000000000..89644b2736d
Binary files /dev/null and b/public/images/emoji/twitter/writing_hand/5.png differ
diff --git a/public/images/emoji/twitter/writing_hand/6.png b/public/images/emoji/twitter/writing_hand/6.png
new file mode 100644
index 00000000000..c9e50cd3522
Binary files /dev/null and b/public/images/emoji/twitter/writing_hand/6.png differ
diff --git a/public/images/emoji/twitter/yemen.png b/public/images/emoji/twitter/yemen.png
new file mode 100644
index 00000000000..3a37c850413
Binary files /dev/null and b/public/images/emoji/twitter/yemen.png differ
diff --git a/public/images/emoji/twitter/yum.png b/public/images/emoji/twitter/yum.png
index bdea07940d5..1c511243385 100644
Binary files a/public/images/emoji/twitter/yum.png and b/public/images/emoji/twitter/yum.png differ
diff --git a/public/images/emoji/twitter/zambia.png b/public/images/emoji/twitter/zambia.png
new file mode 100644
index 00000000000..3e7d4cbea56
Binary files /dev/null and b/public/images/emoji/twitter/zambia.png differ
diff --git a/public/images/emoji/twitter/zebra.png b/public/images/emoji/twitter/zebra.png
new file mode 100644
index 00000000000..6faa14f55dc
Binary files /dev/null and b/public/images/emoji/twitter/zebra.png differ
diff --git a/public/images/emoji/twitter/zimbabwe.png b/public/images/emoji/twitter/zimbabwe.png
new file mode 100644
index 00000000000..c3af3c54d7e
Binary files /dev/null and b/public/images/emoji/twitter/zimbabwe.png differ
diff --git a/public/images/emoji/twitter/zombie.png b/public/images/emoji/twitter/zombie.png
new file mode 100644
index 00000000000..1bf288fcd4c
Binary files /dev/null and b/public/images/emoji/twitter/zombie.png differ
diff --git a/public/images/emoji/win10/+1/2.png b/public/images/emoji/win10/+1/2.png
new file mode 100644
index 00000000000..edaefac65a0
Binary files /dev/null and b/public/images/emoji/win10/+1/2.png differ
diff --git a/public/images/emoji/win10/+1/3.png b/public/images/emoji/win10/+1/3.png
new file mode 100644
index 00000000000..7d1b8491527
Binary files /dev/null and b/public/images/emoji/win10/+1/3.png differ
diff --git a/public/images/emoji/win10/+1/4.png b/public/images/emoji/win10/+1/4.png
new file mode 100644
index 00000000000..27046532b74
Binary files /dev/null and b/public/images/emoji/win10/+1/4.png differ
diff --git a/public/images/emoji/win10/+1/5.png b/public/images/emoji/win10/+1/5.png
new file mode 100644
index 00000000000..4ff2e844196
Binary files /dev/null and b/public/images/emoji/win10/+1/5.png differ
diff --git a/public/images/emoji/win10/+1/6.png b/public/images/emoji/win10/+1/6.png
new file mode 100644
index 00000000000..86086610355
Binary files /dev/null and b/public/images/emoji/win10/+1/6.png differ
diff --git a/public/images/emoji/win10/-1/2.png b/public/images/emoji/win10/-1/2.png
new file mode 100644
index 00000000000..c3d21d3ce94
Binary files /dev/null and b/public/images/emoji/win10/-1/2.png differ
diff --git a/public/images/emoji/win10/-1/3.png b/public/images/emoji/win10/-1/3.png
new file mode 100644
index 00000000000..71e93c783c8
Binary files /dev/null and b/public/images/emoji/win10/-1/3.png differ
diff --git a/public/images/emoji/win10/-1/4.png b/public/images/emoji/win10/-1/4.png
new file mode 100644
index 00000000000..e886a316e89
Binary files /dev/null and b/public/images/emoji/win10/-1/4.png differ
diff --git a/public/images/emoji/win10/-1/5.png b/public/images/emoji/win10/-1/5.png
new file mode 100644
index 00000000000..972a46a3ad4
Binary files /dev/null and b/public/images/emoji/win10/-1/5.png differ
diff --git a/public/images/emoji/win10/-1/6.png b/public/images/emoji/win10/-1/6.png
new file mode 100644
index 00000000000..9af4ac9bf8a
Binary files /dev/null and b/public/images/emoji/win10/-1/6.png differ
diff --git a/public/images/emoji/win10/100.png b/public/images/emoji/win10/100.png
index 65ba6962de8..dae9aa96a7d 100644
Binary files a/public/images/emoji/win10/100.png and b/public/images/emoji/win10/100.png differ
diff --git a/public/images/emoji/win10/1st_place_medal.png b/public/images/emoji/win10/1st_place_medal.png
new file mode 100644
index 00000000000..6a661192161
Binary files /dev/null and b/public/images/emoji/win10/1st_place_medal.png differ
diff --git a/public/images/emoji/win10/2nd_place_medal.png b/public/images/emoji/win10/2nd_place_medal.png
new file mode 100644
index 00000000000..9c02df9b5c5
Binary files /dev/null and b/public/images/emoji/win10/2nd_place_medal.png differ
diff --git a/public/images/emoji/win10/3rd_place_medal.png b/public/images/emoji/win10/3rd_place_medal.png
new file mode 100644
index 00000000000..67470782aaf
Binary files /dev/null and b/public/images/emoji/win10/3rd_place_medal.png differ
diff --git a/public/images/emoji/win10/adult.png b/public/images/emoji/win10/adult.png
new file mode 100644
index 00000000000..53a5eb2ccb9
Binary files /dev/null and b/public/images/emoji/win10/adult.png differ
diff --git a/public/images/emoji/win10/adult/2.png b/public/images/emoji/win10/adult/2.png
new file mode 100644
index 00000000000..8f30fc9e389
Binary files /dev/null and b/public/images/emoji/win10/adult/2.png differ
diff --git a/public/images/emoji/win10/adult/3.png b/public/images/emoji/win10/adult/3.png
new file mode 100644
index 00000000000..36a4e57d1f8
Binary files /dev/null and b/public/images/emoji/win10/adult/3.png differ
diff --git a/public/images/emoji/win10/adult/4.png b/public/images/emoji/win10/adult/4.png
new file mode 100644
index 00000000000..77c57605e93
Binary files /dev/null and b/public/images/emoji/win10/adult/4.png differ
diff --git a/public/images/emoji/win10/adult/5.png b/public/images/emoji/win10/adult/5.png
new file mode 100644
index 00000000000..58bcd6a2fcf
Binary files /dev/null and b/public/images/emoji/win10/adult/5.png differ
diff --git a/public/images/emoji/win10/adult/6.png b/public/images/emoji/win10/adult/6.png
new file mode 100644
index 00000000000..3bc6b5a57a3
Binary files /dev/null and b/public/images/emoji/win10/adult/6.png differ
diff --git a/public/images/emoji/win10/afghanistan.png b/public/images/emoji/win10/afghanistan.png
new file mode 100644
index 00000000000..50c4c6b272e
Binary files /dev/null and b/public/images/emoji/win10/afghanistan.png differ
diff --git a/public/images/emoji/win10/aland_islands.png b/public/images/emoji/win10/aland_islands.png
new file mode 100644
index 00000000000..2ce958b9202
Binary files /dev/null and b/public/images/emoji/win10/aland_islands.png differ
diff --git a/public/images/emoji/win10/albania.png b/public/images/emoji/win10/albania.png
new file mode 100644
index 00000000000..8d428869d47
Binary files /dev/null and b/public/images/emoji/win10/albania.png differ
diff --git a/public/images/emoji/win10/algeria.png b/public/images/emoji/win10/algeria.png
new file mode 100644
index 00000000000..cd3dc01ab28
Binary files /dev/null and b/public/images/emoji/win10/algeria.png differ
diff --git a/public/images/emoji/win10/american_samoa.png b/public/images/emoji/win10/american_samoa.png
new file mode 100644
index 00000000000..f4f58e2e257
Binary files /dev/null and b/public/images/emoji/win10/american_samoa.png differ
diff --git a/public/images/emoji/win10/andorra.png b/public/images/emoji/win10/andorra.png
new file mode 100644
index 00000000000..0fd73782c23
Binary files /dev/null and b/public/images/emoji/win10/andorra.png differ
diff --git a/public/images/emoji/win10/angel/2.png b/public/images/emoji/win10/angel/2.png
new file mode 100644
index 00000000000..bb97419b7e5
Binary files /dev/null and b/public/images/emoji/win10/angel/2.png differ
diff --git a/public/images/emoji/win10/angel/3.png b/public/images/emoji/win10/angel/3.png
new file mode 100644
index 00000000000..302da0a4da4
Binary files /dev/null and b/public/images/emoji/win10/angel/3.png differ
diff --git a/public/images/emoji/win10/angel/4.png b/public/images/emoji/win10/angel/4.png
new file mode 100644
index 00000000000..b1479fbc181
Binary files /dev/null and b/public/images/emoji/win10/angel/4.png differ
diff --git a/public/images/emoji/win10/angel/5.png b/public/images/emoji/win10/angel/5.png
new file mode 100644
index 00000000000..00942aede05
Binary files /dev/null and b/public/images/emoji/win10/angel/5.png differ
diff --git a/public/images/emoji/win10/angel/6.png b/public/images/emoji/win10/angel/6.png
new file mode 100644
index 00000000000..2f2f0add071
Binary files /dev/null and b/public/images/emoji/win10/angel/6.png differ
diff --git a/public/images/emoji/win10/angola.png b/public/images/emoji/win10/angola.png
new file mode 100644
index 00000000000..5aca11a07e4
Binary files /dev/null and b/public/images/emoji/win10/angola.png differ
diff --git a/public/images/emoji/win10/anguilla.png b/public/images/emoji/win10/anguilla.png
new file mode 100644
index 00000000000..d1006c6c19b
Binary files /dev/null and b/public/images/emoji/win10/anguilla.png differ
diff --git a/public/images/emoji/win10/antarctica.png b/public/images/emoji/win10/antarctica.png
new file mode 100644
index 00000000000..5a6759de63e
Binary files /dev/null and b/public/images/emoji/win10/antarctica.png differ
diff --git a/public/images/emoji/win10/antigua_barbuda.png b/public/images/emoji/win10/antigua_barbuda.png
new file mode 100644
index 00000000000..e3ff113cbae
Binary files /dev/null and b/public/images/emoji/win10/antigua_barbuda.png differ
diff --git a/public/images/emoji/win10/argentina.png b/public/images/emoji/win10/argentina.png
new file mode 100644
index 00000000000..1e5e8150987
Binary files /dev/null and b/public/images/emoji/win10/argentina.png differ
diff --git a/public/images/emoji/win10/armenia.png b/public/images/emoji/win10/armenia.png
new file mode 100644
index 00000000000..846307fcf33
Binary files /dev/null and b/public/images/emoji/win10/armenia.png differ
diff --git a/public/images/emoji/win10/artificial_satellite.png b/public/images/emoji/win10/artificial_satellite.png
new file mode 100644
index 00000000000..1b1553a6b66
Binary files /dev/null and b/public/images/emoji/win10/artificial_satellite.png differ
diff --git a/public/images/emoji/win10/aruba.png b/public/images/emoji/win10/aruba.png
new file mode 100644
index 00000000000..459facc13b1
Binary files /dev/null and b/public/images/emoji/win10/aruba.png differ
diff --git a/public/images/emoji/win10/ascension_island.png b/public/images/emoji/win10/ascension_island.png
new file mode 100644
index 00000000000..2e3a1fdd737
Binary files /dev/null and b/public/images/emoji/win10/ascension_island.png differ
diff --git a/public/images/emoji/win10/asterisk.png b/public/images/emoji/win10/asterisk.png
new file mode 100644
index 00000000000..f847acf58c4
Binary files /dev/null and b/public/images/emoji/win10/asterisk.png differ
diff --git a/public/images/emoji/win10/australia.png b/public/images/emoji/win10/australia.png
new file mode 100644
index 00000000000..5dbc804e863
Binary files /dev/null and b/public/images/emoji/win10/australia.png differ
diff --git a/public/images/emoji/win10/austria.png b/public/images/emoji/win10/austria.png
new file mode 100644
index 00000000000..58141c9f3c1
Binary files /dev/null and b/public/images/emoji/win10/austria.png differ
diff --git a/public/images/emoji/win10/automobile.png b/public/images/emoji/win10/automobile.png
new file mode 100644
index 00000000000..701127a6f3f
Binary files /dev/null and b/public/images/emoji/win10/automobile.png differ
diff --git a/public/images/emoji/win10/avocado.png b/public/images/emoji/win10/avocado.png
new file mode 100644
index 00000000000..15b26bec9c8
Binary files /dev/null and b/public/images/emoji/win10/avocado.png differ
diff --git a/public/images/emoji/win10/azerbaijan.png b/public/images/emoji/win10/azerbaijan.png
new file mode 100644
index 00000000000..59b4ecf2a0a
Binary files /dev/null and b/public/images/emoji/win10/azerbaijan.png differ
diff --git a/public/images/emoji/win10/baby/2.png b/public/images/emoji/win10/baby/2.png
new file mode 100644
index 00000000000..bc634a8eeef
Binary files /dev/null and b/public/images/emoji/win10/baby/2.png differ
diff --git a/public/images/emoji/win10/baby/3.png b/public/images/emoji/win10/baby/3.png
new file mode 100644
index 00000000000..359af1cf4c2
Binary files /dev/null and b/public/images/emoji/win10/baby/3.png differ
diff --git a/public/images/emoji/win10/baby/4.png b/public/images/emoji/win10/baby/4.png
new file mode 100644
index 00000000000..3f56f3815d2
Binary files /dev/null and b/public/images/emoji/win10/baby/4.png differ
diff --git a/public/images/emoji/win10/baby/5.png b/public/images/emoji/win10/baby/5.png
new file mode 100644
index 00000000000..a068cf1ef1a
Binary files /dev/null and b/public/images/emoji/win10/baby/5.png differ
diff --git a/public/images/emoji/win10/baby/6.png b/public/images/emoji/win10/baby/6.png
new file mode 100644
index 00000000000..9cc4b5ebc16
Binary files /dev/null and b/public/images/emoji/win10/baby/6.png differ
diff --git a/public/images/emoji/win10/bacon.png b/public/images/emoji/win10/bacon.png
new file mode 100644
index 00000000000..86cac87e564
Binary files /dev/null and b/public/images/emoji/win10/bacon.png differ
diff --git a/public/images/emoji/win10/baguette_bread.png b/public/images/emoji/win10/baguette_bread.png
new file mode 100644
index 00000000000..da8a82521ae
Binary files /dev/null and b/public/images/emoji/win10/baguette_bread.png differ
diff --git a/public/images/emoji/win10/bahamas.png b/public/images/emoji/win10/bahamas.png
new file mode 100644
index 00000000000..ed95128e196
Binary files /dev/null and b/public/images/emoji/win10/bahamas.png differ
diff --git a/public/images/emoji/win10/bahrain.png b/public/images/emoji/win10/bahrain.png
new file mode 100644
index 00000000000..815a93ef0bf
Binary files /dev/null and b/public/images/emoji/win10/bahrain.png differ
diff --git a/public/images/emoji/win10/balance_scale.png b/public/images/emoji/win10/balance_scale.png
new file mode 100644
index 00000000000..21db689c718
Binary files /dev/null and b/public/images/emoji/win10/balance_scale.png differ
diff --git a/public/images/emoji/win10/bangladesh.png b/public/images/emoji/win10/bangladesh.png
new file mode 100644
index 00000000000..caab400018c
Binary files /dev/null and b/public/images/emoji/win10/bangladesh.png differ
diff --git a/public/images/emoji/win10/barbados.png b/public/images/emoji/win10/barbados.png
new file mode 100644
index 00000000000..830578344d9
Binary files /dev/null and b/public/images/emoji/win10/barbados.png differ
diff --git a/public/images/emoji/win10/basketball_man.png b/public/images/emoji/win10/basketball_man.png
new file mode 100644
index 00000000000..e068ef63398
Binary files /dev/null and b/public/images/emoji/win10/basketball_man.png differ
diff --git a/public/images/emoji/win10/basketball_man/2.png b/public/images/emoji/win10/basketball_man/2.png
new file mode 100644
index 00000000000..d28e4579215
Binary files /dev/null and b/public/images/emoji/win10/basketball_man/2.png differ
diff --git a/public/images/emoji/win10/basketball_man/3.png b/public/images/emoji/win10/basketball_man/3.png
new file mode 100644
index 00000000000..43168676850
Binary files /dev/null and b/public/images/emoji/win10/basketball_man/3.png differ
diff --git a/public/images/emoji/win10/basketball_man/4.png b/public/images/emoji/win10/basketball_man/4.png
new file mode 100644
index 00000000000..50fadc5f6d5
Binary files /dev/null and b/public/images/emoji/win10/basketball_man/4.png differ
diff --git a/public/images/emoji/win10/basketball_man/5.png b/public/images/emoji/win10/basketball_man/5.png
new file mode 100644
index 00000000000..1b1828182cf
Binary files /dev/null and b/public/images/emoji/win10/basketball_man/5.png differ
diff --git a/public/images/emoji/win10/basketball_man/6.png b/public/images/emoji/win10/basketball_man/6.png
new file mode 100644
index 00000000000..d2c934ec3cf
Binary files /dev/null and b/public/images/emoji/win10/basketball_man/6.png differ
diff --git a/public/images/emoji/win10/basketball_player/2.png b/public/images/emoji/win10/basketball_player/2.png
new file mode 100644
index 00000000000..d28e4579215
Binary files /dev/null and b/public/images/emoji/win10/basketball_player/2.png differ
diff --git a/public/images/emoji/win10/basketball_player/3.png b/public/images/emoji/win10/basketball_player/3.png
new file mode 100644
index 00000000000..43168676850
Binary files /dev/null and b/public/images/emoji/win10/basketball_player/3.png differ
diff --git a/public/images/emoji/win10/basketball_player/4.png b/public/images/emoji/win10/basketball_player/4.png
new file mode 100644
index 00000000000..50fadc5f6d5
Binary files /dev/null and b/public/images/emoji/win10/basketball_player/4.png differ
diff --git a/public/images/emoji/win10/basketball_player/5.png b/public/images/emoji/win10/basketball_player/5.png
new file mode 100644
index 00000000000..1b1828182cf
Binary files /dev/null and b/public/images/emoji/win10/basketball_player/5.png differ
diff --git a/public/images/emoji/win10/basketball_player/6.png b/public/images/emoji/win10/basketball_player/6.png
new file mode 100644
index 00000000000..d2c934ec3cf
Binary files /dev/null and b/public/images/emoji/win10/basketball_player/6.png differ
diff --git a/public/images/emoji/win10/basketball_woman.png b/public/images/emoji/win10/basketball_woman.png
new file mode 100644
index 00000000000..b832c5432af
Binary files /dev/null and b/public/images/emoji/win10/basketball_woman.png differ
diff --git a/public/images/emoji/win10/bat.png b/public/images/emoji/win10/bat.png
new file mode 100644
index 00000000000..3b85e21a1a5
Binary files /dev/null and b/public/images/emoji/win10/bat.png differ
diff --git a/public/images/emoji/win10/bath/2.png b/public/images/emoji/win10/bath/2.png
new file mode 100644
index 00000000000..e1582e04272
Binary files /dev/null and b/public/images/emoji/win10/bath/2.png differ
diff --git a/public/images/emoji/win10/bath/3.png b/public/images/emoji/win10/bath/3.png
new file mode 100644
index 00000000000..5f278dc1490
Binary files /dev/null and b/public/images/emoji/win10/bath/3.png differ
diff --git a/public/images/emoji/win10/bath/4.png b/public/images/emoji/win10/bath/4.png
new file mode 100644
index 00000000000..999feded298
Binary files /dev/null and b/public/images/emoji/win10/bath/4.png differ
diff --git a/public/images/emoji/win10/bath/5.png b/public/images/emoji/win10/bath/5.png
new file mode 100644
index 00000000000..1d673a8a6d7
Binary files /dev/null and b/public/images/emoji/win10/bath/5.png differ
diff --git a/public/images/emoji/win10/bath/6.png b/public/images/emoji/win10/bath/6.png
new file mode 100644
index 00000000000..6bdb59978b7
Binary files /dev/null and b/public/images/emoji/win10/bath/6.png differ
diff --git a/public/images/emoji/win10/beach_umbrella.png b/public/images/emoji/win10/beach_umbrella.png
index a3a45c3495c..249b41af25a 100644
Binary files a/public/images/emoji/win10/beach_umbrella.png and b/public/images/emoji/win10/beach_umbrella.png differ
diff --git a/public/images/emoji/win10/bearded_person.png b/public/images/emoji/win10/bearded_person.png
new file mode 100644
index 00000000000..ed22a6cb381
Binary files /dev/null and b/public/images/emoji/win10/bearded_person.png differ
diff --git a/public/images/emoji/win10/bearded_person/2.png b/public/images/emoji/win10/bearded_person/2.png
new file mode 100644
index 00000000000..4a2fdeb3040
Binary files /dev/null and b/public/images/emoji/win10/bearded_person/2.png differ
diff --git a/public/images/emoji/win10/bearded_person/3.png b/public/images/emoji/win10/bearded_person/3.png
new file mode 100644
index 00000000000..b1f6e168d7c
Binary files /dev/null and b/public/images/emoji/win10/bearded_person/3.png differ
diff --git a/public/images/emoji/win10/bearded_person/4.png b/public/images/emoji/win10/bearded_person/4.png
new file mode 100644
index 00000000000..f75b75a74e9
Binary files /dev/null and b/public/images/emoji/win10/bearded_person/4.png differ
diff --git a/public/images/emoji/win10/bearded_person/5.png b/public/images/emoji/win10/bearded_person/5.png
new file mode 100644
index 00000000000..a9665b318a4
Binary files /dev/null and b/public/images/emoji/win10/bearded_person/5.png differ
diff --git a/public/images/emoji/win10/bearded_person/6.png b/public/images/emoji/win10/bearded_person/6.png
new file mode 100644
index 00000000000..a42b3caf88c
Binary files /dev/null and b/public/images/emoji/win10/bearded_person/6.png differ
diff --git a/public/images/emoji/win10/belarus.png b/public/images/emoji/win10/belarus.png
new file mode 100644
index 00000000000..e75dc9ec50b
Binary files /dev/null and b/public/images/emoji/win10/belarus.png differ
diff --git a/public/images/emoji/win10/belgium.png b/public/images/emoji/win10/belgium.png
new file mode 100644
index 00000000000..ca401e5985c
Binary files /dev/null and b/public/images/emoji/win10/belgium.png differ
diff --git a/public/images/emoji/win10/belize.png b/public/images/emoji/win10/belize.png
new file mode 100644
index 00000000000..5f6dded80bf
Binary files /dev/null and b/public/images/emoji/win10/belize.png differ
diff --git a/public/images/emoji/win10/benin.png b/public/images/emoji/win10/benin.png
new file mode 100644
index 00000000000..bb74e98818a
Binary files /dev/null and b/public/images/emoji/win10/benin.png differ
diff --git a/public/images/emoji/win10/bermuda.png b/public/images/emoji/win10/bermuda.png
new file mode 100644
index 00000000000..75f2fac7609
Binary files /dev/null and b/public/images/emoji/win10/bermuda.png differ
diff --git a/public/images/emoji/win10/bhutan.png b/public/images/emoji/win10/bhutan.png
new file mode 100644
index 00000000000..d9a2d20fc1f
Binary files /dev/null and b/public/images/emoji/win10/bhutan.png differ
diff --git a/public/images/emoji/win10/bicyclist.png b/public/images/emoji/win10/bicyclist.png
index f4be93aaecf..a010eea8138 100644
Binary files a/public/images/emoji/win10/bicyclist.png and b/public/images/emoji/win10/bicyclist.png differ
diff --git a/public/images/emoji/win10/bicyclist/2.png b/public/images/emoji/win10/bicyclist/2.png
new file mode 100644
index 00000000000..66f963e17e2
Binary files /dev/null and b/public/images/emoji/win10/bicyclist/2.png differ
diff --git a/public/images/emoji/win10/bicyclist/3.png b/public/images/emoji/win10/bicyclist/3.png
new file mode 100644
index 00000000000..dbe0c76d044
Binary files /dev/null and b/public/images/emoji/win10/bicyclist/3.png differ
diff --git a/public/images/emoji/win10/bicyclist/4.png b/public/images/emoji/win10/bicyclist/4.png
new file mode 100644
index 00000000000..643074dc660
Binary files /dev/null and b/public/images/emoji/win10/bicyclist/4.png differ
diff --git a/public/images/emoji/win10/bicyclist/5.png b/public/images/emoji/win10/bicyclist/5.png
new file mode 100644
index 00000000000..48a9133ef8d
Binary files /dev/null and b/public/images/emoji/win10/bicyclist/5.png differ
diff --git a/public/images/emoji/win10/bicyclist/6.png b/public/images/emoji/win10/bicyclist/6.png
new file mode 100644
index 00000000000..96ebbfa8807
Binary files /dev/null and b/public/images/emoji/win10/bicyclist/6.png differ
diff --git a/public/images/emoji/win10/biking_man.png b/public/images/emoji/win10/biking_man.png
new file mode 100644
index 00000000000..a010eea8138
Binary files /dev/null and b/public/images/emoji/win10/biking_man.png differ
diff --git a/public/images/emoji/win10/biking_man/2.png b/public/images/emoji/win10/biking_man/2.png
new file mode 100644
index 00000000000..66f963e17e2
Binary files /dev/null and b/public/images/emoji/win10/biking_man/2.png differ
diff --git a/public/images/emoji/win10/biking_man/3.png b/public/images/emoji/win10/biking_man/3.png
new file mode 100644
index 00000000000..dbe0c76d044
Binary files /dev/null and b/public/images/emoji/win10/biking_man/3.png differ
diff --git a/public/images/emoji/win10/biking_man/4.png b/public/images/emoji/win10/biking_man/4.png
new file mode 100644
index 00000000000..643074dc660
Binary files /dev/null and b/public/images/emoji/win10/biking_man/4.png differ
diff --git a/public/images/emoji/win10/biking_man/5.png b/public/images/emoji/win10/biking_man/5.png
new file mode 100644
index 00000000000..48a9133ef8d
Binary files /dev/null and b/public/images/emoji/win10/biking_man/5.png differ
diff --git a/public/images/emoji/win10/biking_man/6.png b/public/images/emoji/win10/biking_man/6.png
new file mode 100644
index 00000000000..96ebbfa8807
Binary files /dev/null and b/public/images/emoji/win10/biking_man/6.png differ
diff --git a/public/images/emoji/win10/biking_woman.png b/public/images/emoji/win10/biking_woman.png
new file mode 100644
index 00000000000..ddfc10739c8
Binary files /dev/null and b/public/images/emoji/win10/biking_woman.png differ
diff --git a/public/images/emoji/win10/biking_woman/2.png b/public/images/emoji/win10/biking_woman/2.png
new file mode 100644
index 00000000000..cfc0056372f
Binary files /dev/null and b/public/images/emoji/win10/biking_woman/2.png differ
diff --git a/public/images/emoji/win10/biking_woman/3.png b/public/images/emoji/win10/biking_woman/3.png
new file mode 100644
index 00000000000..68cac784e46
Binary files /dev/null and b/public/images/emoji/win10/biking_woman/3.png differ
diff --git a/public/images/emoji/win10/biking_woman/4.png b/public/images/emoji/win10/biking_woman/4.png
new file mode 100644
index 00000000000..33f65628109
Binary files /dev/null and b/public/images/emoji/win10/biking_woman/4.png differ
diff --git a/public/images/emoji/win10/biking_woman/5.png b/public/images/emoji/win10/biking_woman/5.png
new file mode 100644
index 00000000000..edf5caeb637
Binary files /dev/null and b/public/images/emoji/win10/biking_woman/5.png differ
diff --git a/public/images/emoji/win10/biking_woman/6.png b/public/images/emoji/win10/biking_woman/6.png
new file mode 100644
index 00000000000..74ccb1afaf4
Binary files /dev/null and b/public/images/emoji/win10/biking_woman/6.png differ
diff --git a/public/images/emoji/win10/billed_cap.png b/public/images/emoji/win10/billed_cap.png
new file mode 100644
index 00000000000..5cc92e307e1
Binary files /dev/null and b/public/images/emoji/win10/billed_cap.png differ
diff --git a/public/images/emoji/win10/black_flag.png b/public/images/emoji/win10/black_flag.png
new file mode 100644
index 00000000000..8aea4b35e02
Binary files /dev/null and b/public/images/emoji/win10/black_flag.png differ
diff --git a/public/images/emoji/win10/black_heart.png b/public/images/emoji/win10/black_heart.png
new file mode 100644
index 00000000000..3a13c5b2a78
Binary files /dev/null and b/public/images/emoji/win10/black_heart.png differ
diff --git a/public/images/emoji/win10/blonde_man.png b/public/images/emoji/win10/blonde_man.png
new file mode 100644
index 00000000000..9c71d80def9
Binary files /dev/null and b/public/images/emoji/win10/blonde_man.png differ
diff --git a/public/images/emoji/win10/blonde_man/2.png b/public/images/emoji/win10/blonde_man/2.png
new file mode 100644
index 00000000000..26bfc70d38c
Binary files /dev/null and b/public/images/emoji/win10/blonde_man/2.png differ
diff --git a/public/images/emoji/win10/blonde_man/3.png b/public/images/emoji/win10/blonde_man/3.png
new file mode 100644
index 00000000000..9a496854cbe
Binary files /dev/null and b/public/images/emoji/win10/blonde_man/3.png differ
diff --git a/public/images/emoji/win10/blonde_man/4.png b/public/images/emoji/win10/blonde_man/4.png
new file mode 100644
index 00000000000..3313ce6bbfa
Binary files /dev/null and b/public/images/emoji/win10/blonde_man/4.png differ
diff --git a/public/images/emoji/win10/blonde_man/5.png b/public/images/emoji/win10/blonde_man/5.png
new file mode 100644
index 00000000000..9643cf9dd3e
Binary files /dev/null and b/public/images/emoji/win10/blonde_man/5.png differ
diff --git a/public/images/emoji/win10/blonde_man/6.png b/public/images/emoji/win10/blonde_man/6.png
new file mode 100644
index 00000000000..6626ede2542
Binary files /dev/null and b/public/images/emoji/win10/blonde_man/6.png differ
diff --git a/public/images/emoji/win10/blonde_woman.png b/public/images/emoji/win10/blonde_woman.png
new file mode 100644
index 00000000000..19590a24247
Binary files /dev/null and b/public/images/emoji/win10/blonde_woman.png differ
diff --git a/public/images/emoji/win10/blonde_woman/2.png b/public/images/emoji/win10/blonde_woman/2.png
new file mode 100644
index 00000000000..e6d33f831ad
Binary files /dev/null and b/public/images/emoji/win10/blonde_woman/2.png differ
diff --git a/public/images/emoji/win10/blonde_woman/3.png b/public/images/emoji/win10/blonde_woman/3.png
new file mode 100644
index 00000000000..0409760c7a4
Binary files /dev/null and b/public/images/emoji/win10/blonde_woman/3.png differ
diff --git a/public/images/emoji/win10/blonde_woman/4.png b/public/images/emoji/win10/blonde_woman/4.png
new file mode 100644
index 00000000000..51b55eaaff5
Binary files /dev/null and b/public/images/emoji/win10/blonde_woman/4.png differ
diff --git a/public/images/emoji/win10/blonde_woman/5.png b/public/images/emoji/win10/blonde_woman/5.png
new file mode 100644
index 00000000000..39cba5f9e78
Binary files /dev/null and b/public/images/emoji/win10/blonde_woman/5.png differ
diff --git a/public/images/emoji/win10/blonde_woman/6.png b/public/images/emoji/win10/blonde_woman/6.png
new file mode 100644
index 00000000000..260dbfe0ad2
Binary files /dev/null and b/public/images/emoji/win10/blonde_woman/6.png differ
diff --git a/public/images/emoji/win10/boat.png b/public/images/emoji/win10/boat.png
new file mode 100644
index 00000000000..15abcc4969b
Binary files /dev/null and b/public/images/emoji/win10/boat.png differ
diff --git a/public/images/emoji/win10/bolivia.png b/public/images/emoji/win10/bolivia.png
new file mode 100644
index 00000000000..af9bd4d5e7a
Binary files /dev/null and b/public/images/emoji/win10/bolivia.png differ
diff --git a/public/images/emoji/win10/bosnia_herzegovina.png b/public/images/emoji/win10/bosnia_herzegovina.png
new file mode 100644
index 00000000000..91493ade758
Binary files /dev/null and b/public/images/emoji/win10/bosnia_herzegovina.png differ
diff --git a/public/images/emoji/win10/botswana.png b/public/images/emoji/win10/botswana.png
new file mode 100644
index 00000000000..3697a723dd3
Binary files /dev/null and b/public/images/emoji/win10/botswana.png differ
diff --git a/public/images/emoji/win10/bottle_with_popping_cork.png b/public/images/emoji/win10/bottle_with_popping_cork.png
index 9863b08a595..8c2dce713af 100644
Binary files a/public/images/emoji/win10/bottle_with_popping_cork.png and b/public/images/emoji/win10/bottle_with_popping_cork.png differ
diff --git a/public/images/emoji/win10/bouvet_island.png b/public/images/emoji/win10/bouvet_island.png
new file mode 100644
index 00000000000..801a5776543
Binary files /dev/null and b/public/images/emoji/win10/bouvet_island.png differ
diff --git a/public/images/emoji/win10/bow/2.png b/public/images/emoji/win10/bow/2.png
new file mode 100644
index 00000000000..88bd6251952
Binary files /dev/null and b/public/images/emoji/win10/bow/2.png differ
diff --git a/public/images/emoji/win10/bow/3.png b/public/images/emoji/win10/bow/3.png
new file mode 100644
index 00000000000..2e27c6faa13
Binary files /dev/null and b/public/images/emoji/win10/bow/3.png differ
diff --git a/public/images/emoji/win10/bow/4.png b/public/images/emoji/win10/bow/4.png
new file mode 100644
index 00000000000..acd231d1a0e
Binary files /dev/null and b/public/images/emoji/win10/bow/4.png differ
diff --git a/public/images/emoji/win10/bow/5.png b/public/images/emoji/win10/bow/5.png
new file mode 100644
index 00000000000..946d5b36cad
Binary files /dev/null and b/public/images/emoji/win10/bow/5.png differ
diff --git a/public/images/emoji/win10/bow/6.png b/public/images/emoji/win10/bow/6.png
new file mode 100644
index 00000000000..11afc0356be
Binary files /dev/null and b/public/images/emoji/win10/bow/6.png differ
diff --git a/public/images/emoji/win10/bowing_man.png b/public/images/emoji/win10/bowing_man.png
new file mode 100644
index 00000000000..24a73f18adf
Binary files /dev/null and b/public/images/emoji/win10/bowing_man.png differ
diff --git a/public/images/emoji/win10/bowing_man/2.png b/public/images/emoji/win10/bowing_man/2.png
new file mode 100644
index 00000000000..88bd6251952
Binary files /dev/null and b/public/images/emoji/win10/bowing_man/2.png differ
diff --git a/public/images/emoji/win10/bowing_man/3.png b/public/images/emoji/win10/bowing_man/3.png
new file mode 100644
index 00000000000..2e27c6faa13
Binary files /dev/null and b/public/images/emoji/win10/bowing_man/3.png differ
diff --git a/public/images/emoji/win10/bowing_man/4.png b/public/images/emoji/win10/bowing_man/4.png
new file mode 100644
index 00000000000..acd231d1a0e
Binary files /dev/null and b/public/images/emoji/win10/bowing_man/4.png differ
diff --git a/public/images/emoji/win10/bowing_man/5.png b/public/images/emoji/win10/bowing_man/5.png
new file mode 100644
index 00000000000..946d5b36cad
Binary files /dev/null and b/public/images/emoji/win10/bowing_man/5.png differ
diff --git a/public/images/emoji/win10/bowing_man/6.png b/public/images/emoji/win10/bowing_man/6.png
new file mode 100644
index 00000000000..11afc0356be
Binary files /dev/null and b/public/images/emoji/win10/bowing_man/6.png differ
diff --git a/public/images/emoji/win10/bowing_woman.png b/public/images/emoji/win10/bowing_woman.png
new file mode 100644
index 00000000000..0f21e3e90c2
Binary files /dev/null and b/public/images/emoji/win10/bowing_woman.png differ
diff --git a/public/images/emoji/win10/bowing_woman/2.png b/public/images/emoji/win10/bowing_woman/2.png
new file mode 100644
index 00000000000..a0a1f554b52
Binary files /dev/null and b/public/images/emoji/win10/bowing_woman/2.png differ
diff --git a/public/images/emoji/win10/bowing_woman/3.png b/public/images/emoji/win10/bowing_woman/3.png
new file mode 100644
index 00000000000..7f3410056d2
Binary files /dev/null and b/public/images/emoji/win10/bowing_woman/3.png differ
diff --git a/public/images/emoji/win10/bowing_woman/4.png b/public/images/emoji/win10/bowing_woman/4.png
new file mode 100644
index 00000000000..0f5b83bd929
Binary files /dev/null and b/public/images/emoji/win10/bowing_woman/4.png differ
diff --git a/public/images/emoji/win10/bowing_woman/5.png b/public/images/emoji/win10/bowing_woman/5.png
new file mode 100644
index 00000000000..5730d0af22a
Binary files /dev/null and b/public/images/emoji/win10/bowing_woman/5.png differ
diff --git a/public/images/emoji/win10/bowing_woman/6.png b/public/images/emoji/win10/bowing_woman/6.png
new file mode 100644
index 00000000000..4cefe0dc043
Binary files /dev/null and b/public/images/emoji/win10/bowing_woman/6.png differ
diff --git a/public/images/emoji/win10/bowl_with_spoon.png b/public/images/emoji/win10/bowl_with_spoon.png
new file mode 100644
index 00000000000..b0d88a73b9d
Binary files /dev/null and b/public/images/emoji/win10/bowl_with_spoon.png differ
diff --git a/public/images/emoji/win10/boxing_glove.png b/public/images/emoji/win10/boxing_glove.png
new file mode 100644
index 00000000000..eae7e4dd5e5
Binary files /dev/null and b/public/images/emoji/win10/boxing_glove.png differ
diff --git a/public/images/emoji/win10/boy/2.png b/public/images/emoji/win10/boy/2.png
new file mode 100644
index 00000000000..dc95bb76a49
Binary files /dev/null and b/public/images/emoji/win10/boy/2.png differ
diff --git a/public/images/emoji/win10/boy/3.png b/public/images/emoji/win10/boy/3.png
new file mode 100644
index 00000000000..598f2916486
Binary files /dev/null and b/public/images/emoji/win10/boy/3.png differ
diff --git a/public/images/emoji/win10/boy/4.png b/public/images/emoji/win10/boy/4.png
new file mode 100644
index 00000000000..f275eaf95bd
Binary files /dev/null and b/public/images/emoji/win10/boy/4.png differ
diff --git a/public/images/emoji/win10/boy/5.png b/public/images/emoji/win10/boy/5.png
new file mode 100644
index 00000000000..3f058b1b13b
Binary files /dev/null and b/public/images/emoji/win10/boy/5.png differ
diff --git a/public/images/emoji/win10/boy/6.png b/public/images/emoji/win10/boy/6.png
new file mode 100644
index 00000000000..f967f62157a
Binary files /dev/null and b/public/images/emoji/win10/boy/6.png differ
diff --git a/public/images/emoji/win10/brain.png b/public/images/emoji/win10/brain.png
new file mode 100644
index 00000000000..c8e889faecf
Binary files /dev/null and b/public/images/emoji/win10/brain.png differ
diff --git a/public/images/emoji/win10/brazil.png b/public/images/emoji/win10/brazil.png
new file mode 100644
index 00000000000..a68b1e6b586
Binary files /dev/null and b/public/images/emoji/win10/brazil.png differ
diff --git a/public/images/emoji/win10/breast_feeding.png b/public/images/emoji/win10/breast_feeding.png
new file mode 100644
index 00000000000..815538138bf
Binary files /dev/null and b/public/images/emoji/win10/breast_feeding.png differ
diff --git a/public/images/emoji/win10/breast_feeding/2.png b/public/images/emoji/win10/breast_feeding/2.png
new file mode 100644
index 00000000000..fb591aa4fb4
Binary files /dev/null and b/public/images/emoji/win10/breast_feeding/2.png differ
diff --git a/public/images/emoji/win10/breast_feeding/3.png b/public/images/emoji/win10/breast_feeding/3.png
new file mode 100644
index 00000000000..5adcffa4b94
Binary files /dev/null and b/public/images/emoji/win10/breast_feeding/3.png differ
diff --git a/public/images/emoji/win10/breast_feeding/4.png b/public/images/emoji/win10/breast_feeding/4.png
new file mode 100644
index 00000000000..d166f981b24
Binary files /dev/null and b/public/images/emoji/win10/breast_feeding/4.png differ
diff --git a/public/images/emoji/win10/breast_feeding/5.png b/public/images/emoji/win10/breast_feeding/5.png
new file mode 100644
index 00000000000..7c8cb50a780
Binary files /dev/null and b/public/images/emoji/win10/breast_feeding/5.png differ
diff --git a/public/images/emoji/win10/breast_feeding/6.png b/public/images/emoji/win10/breast_feeding/6.png
new file mode 100644
index 00000000000..e113d8cb428
Binary files /dev/null and b/public/images/emoji/win10/breast_feeding/6.png differ
diff --git a/public/images/emoji/win10/bride_with_veil/2.png b/public/images/emoji/win10/bride_with_veil/2.png
new file mode 100644
index 00000000000..b615e00e259
Binary files /dev/null and b/public/images/emoji/win10/bride_with_veil/2.png differ
diff --git a/public/images/emoji/win10/bride_with_veil/3.png b/public/images/emoji/win10/bride_with_veil/3.png
new file mode 100644
index 00000000000..1751a8e4a22
Binary files /dev/null and b/public/images/emoji/win10/bride_with_veil/3.png differ
diff --git a/public/images/emoji/win10/bride_with_veil/4.png b/public/images/emoji/win10/bride_with_veil/4.png
new file mode 100644
index 00000000000..a094eb0718a
Binary files /dev/null and b/public/images/emoji/win10/bride_with_veil/4.png differ
diff --git a/public/images/emoji/win10/bride_with_veil/5.png b/public/images/emoji/win10/bride_with_veil/5.png
new file mode 100644
index 00000000000..65dc26ba1b3
Binary files /dev/null and b/public/images/emoji/win10/bride_with_veil/5.png differ
diff --git a/public/images/emoji/win10/bride_with_veil/6.png b/public/images/emoji/win10/bride_with_veil/6.png
new file mode 100644
index 00000000000..b9cd75a065b
Binary files /dev/null and b/public/images/emoji/win10/bride_with_veil/6.png differ
diff --git a/public/images/emoji/win10/british_indian_ocean_territory.png b/public/images/emoji/win10/british_indian_ocean_territory.png
new file mode 100644
index 00000000000..e3d2479344f
Binary files /dev/null and b/public/images/emoji/win10/british_indian_ocean_territory.png differ
diff --git a/public/images/emoji/win10/british_virgin_islands.png b/public/images/emoji/win10/british_virgin_islands.png
new file mode 100644
index 00000000000..9f758979a16
Binary files /dev/null and b/public/images/emoji/win10/british_virgin_islands.png differ
diff --git a/public/images/emoji/win10/broccoli.png b/public/images/emoji/win10/broccoli.png
new file mode 100644
index 00000000000..5e03a6d23ba
Binary files /dev/null and b/public/images/emoji/win10/broccoli.png differ
diff --git a/public/images/emoji/win10/brunei.png b/public/images/emoji/win10/brunei.png
new file mode 100644
index 00000000000..647e1c4d79b
Binary files /dev/null and b/public/images/emoji/win10/brunei.png differ
diff --git a/public/images/emoji/win10/bulgaria.png b/public/images/emoji/win10/bulgaria.png
new file mode 100644
index 00000000000..5185700c636
Binary files /dev/null and b/public/images/emoji/win10/bulgaria.png differ
diff --git a/public/images/emoji/win10/burkina_faso.png b/public/images/emoji/win10/burkina_faso.png
new file mode 100644
index 00000000000..c519f8a954c
Binary files /dev/null and b/public/images/emoji/win10/burkina_faso.png differ
diff --git a/public/images/emoji/win10/burundi.png b/public/images/emoji/win10/burundi.png
new file mode 100644
index 00000000000..83e731cc34f
Binary files /dev/null and b/public/images/emoji/win10/burundi.png differ
diff --git a/public/images/emoji/win10/business_suit_levitating.png b/public/images/emoji/win10/business_suit_levitating.png
new file mode 100644
index 00000000000..e7546fc1e00
Binary files /dev/null and b/public/images/emoji/win10/business_suit_levitating.png differ
diff --git a/public/images/emoji/win10/business_suit_levitating/2.png b/public/images/emoji/win10/business_suit_levitating/2.png
new file mode 100644
index 00000000000..de379247570
Binary files /dev/null and b/public/images/emoji/win10/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/win10/business_suit_levitating/3.png b/public/images/emoji/win10/business_suit_levitating/3.png
new file mode 100644
index 00000000000..8da714140ef
Binary files /dev/null and b/public/images/emoji/win10/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/win10/business_suit_levitating/4.png b/public/images/emoji/win10/business_suit_levitating/4.png
new file mode 100644
index 00000000000..2a26043c96c
Binary files /dev/null and b/public/images/emoji/win10/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/win10/business_suit_levitating/5.png b/public/images/emoji/win10/business_suit_levitating/5.png
new file mode 100644
index 00000000000..f38a2f93340
Binary files /dev/null and b/public/images/emoji/win10/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/win10/business_suit_levitating/6.png b/public/images/emoji/win10/business_suit_levitating/6.png
new file mode 100644
index 00000000000..030123a63ee
Binary files /dev/null and b/public/images/emoji/win10/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/win10/butterfly.png b/public/images/emoji/win10/butterfly.png
new file mode 100644
index 00000000000..2cd5a22f338
Binary files /dev/null and b/public/images/emoji/win10/butterfly.png differ
diff --git a/public/images/emoji/win10/call_me_hand.png b/public/images/emoji/win10/call_me_hand.png
new file mode 100644
index 00000000000..90cb0894ed1
Binary files /dev/null and b/public/images/emoji/win10/call_me_hand.png differ
diff --git a/public/images/emoji/win10/call_me_hand/2.png b/public/images/emoji/win10/call_me_hand/2.png
new file mode 100644
index 00000000000..7199711913f
Binary files /dev/null and b/public/images/emoji/win10/call_me_hand/2.png differ
diff --git a/public/images/emoji/win10/call_me_hand/3.png b/public/images/emoji/win10/call_me_hand/3.png
new file mode 100644
index 00000000000..81c24d2c248
Binary files /dev/null and b/public/images/emoji/win10/call_me_hand/3.png differ
diff --git a/public/images/emoji/win10/call_me_hand/4.png b/public/images/emoji/win10/call_me_hand/4.png
new file mode 100644
index 00000000000..c23ad6738b8
Binary files /dev/null and b/public/images/emoji/win10/call_me_hand/4.png differ
diff --git a/public/images/emoji/win10/call_me_hand/5.png b/public/images/emoji/win10/call_me_hand/5.png
new file mode 100644
index 00000000000..076a330a89c
Binary files /dev/null and b/public/images/emoji/win10/call_me_hand/5.png differ
diff --git a/public/images/emoji/win10/call_me_hand/6.png b/public/images/emoji/win10/call_me_hand/6.png
new file mode 100644
index 00000000000..0d54fbe067c
Binary files /dev/null and b/public/images/emoji/win10/call_me_hand/6.png differ
diff --git a/public/images/emoji/win10/cambodia.png b/public/images/emoji/win10/cambodia.png
new file mode 100644
index 00000000000..0a7ca06fb42
Binary files /dev/null and b/public/images/emoji/win10/cambodia.png differ
diff --git a/public/images/emoji/win10/camera_flash.png b/public/images/emoji/win10/camera_flash.png
new file mode 100644
index 00000000000..8dccd471b8a
Binary files /dev/null and b/public/images/emoji/win10/camera_flash.png differ
diff --git a/public/images/emoji/win10/cameroon.png b/public/images/emoji/win10/cameroon.png
new file mode 100644
index 00000000000..b9aaf463487
Binary files /dev/null and b/public/images/emoji/win10/cameroon.png differ
diff --git a/public/images/emoji/win10/canada.png b/public/images/emoji/win10/canada.png
new file mode 100644
index 00000000000..82664ad79e9
Binary files /dev/null and b/public/images/emoji/win10/canada.png differ
diff --git a/public/images/emoji/win10/canary_islands.png b/public/images/emoji/win10/canary_islands.png
new file mode 100644
index 00000000000..68ccf48d0df
Binary files /dev/null and b/public/images/emoji/win10/canary_islands.png differ
diff --git a/public/images/emoji/win10/canned_food.png b/public/images/emoji/win10/canned_food.png
new file mode 100644
index 00000000000..2e5976e9d2f
Binary files /dev/null and b/public/images/emoji/win10/canned_food.png differ
diff --git a/public/images/emoji/win10/canoe.png b/public/images/emoji/win10/canoe.png
new file mode 100644
index 00000000000..aef0256e90e
Binary files /dev/null and b/public/images/emoji/win10/canoe.png differ
diff --git a/public/images/emoji/win10/cape_verde.png b/public/images/emoji/win10/cape_verde.png
new file mode 100644
index 00000000000..1252c37a6d8
Binary files /dev/null and b/public/images/emoji/win10/cape_verde.png differ
diff --git a/public/images/emoji/win10/car.png b/public/images/emoji/win10/car.png
new file mode 100644
index 00000000000..701127a6f3f
Binary files /dev/null and b/public/images/emoji/win10/car.png differ
diff --git a/public/images/emoji/win10/caribbean_netherlands.png b/public/images/emoji/win10/caribbean_netherlands.png
new file mode 100644
index 00000000000..7780a4a0367
Binary files /dev/null and b/public/images/emoji/win10/caribbean_netherlands.png differ
diff --git a/public/images/emoji/win10/carrot.png b/public/images/emoji/win10/carrot.png
new file mode 100644
index 00000000000..848a88be289
Binary files /dev/null and b/public/images/emoji/win10/carrot.png differ
diff --git a/public/images/emoji/win10/cayman_islands.png b/public/images/emoji/win10/cayman_islands.png
new file mode 100644
index 00000000000..70d8309d8c6
Binary files /dev/null and b/public/images/emoji/win10/cayman_islands.png differ
diff --git a/public/images/emoji/win10/central_african_republic.png b/public/images/emoji/win10/central_african_republic.png
new file mode 100644
index 00000000000..a344cb3ae87
Binary files /dev/null and b/public/images/emoji/win10/central_african_republic.png differ
diff --git a/public/images/emoji/win10/ceuta_and_melilla.png b/public/images/emoji/win10/ceuta_and_melilla.png
new file mode 100644
index 00000000000..e0da30d5a6c
Binary files /dev/null and b/public/images/emoji/win10/ceuta_and_melilla.png differ
diff --git a/public/images/emoji/win10/chad.png b/public/images/emoji/win10/chad.png
new file mode 100644
index 00000000000..26b77c821c1
Binary files /dev/null and b/public/images/emoji/win10/chad.png differ
diff --git a/public/images/emoji/win10/champagne.png b/public/images/emoji/win10/champagne.png
index 9863b08a595..8c2dce713af 100644
Binary files a/public/images/emoji/win10/champagne.png and b/public/images/emoji/win10/champagne.png differ
diff --git a/public/images/emoji/win10/child.png b/public/images/emoji/win10/child.png
new file mode 100644
index 00000000000..33e50494a3a
Binary files /dev/null and b/public/images/emoji/win10/child.png differ
diff --git a/public/images/emoji/win10/child/2.png b/public/images/emoji/win10/child/2.png
new file mode 100644
index 00000000000..7a0e4f1cb75
Binary files /dev/null and b/public/images/emoji/win10/child/2.png differ
diff --git a/public/images/emoji/win10/child/3.png b/public/images/emoji/win10/child/3.png
new file mode 100644
index 00000000000..81a69110e9d
Binary files /dev/null and b/public/images/emoji/win10/child/3.png differ
diff --git a/public/images/emoji/win10/child/4.png b/public/images/emoji/win10/child/4.png
new file mode 100644
index 00000000000..b5c64c9cc84
Binary files /dev/null and b/public/images/emoji/win10/child/4.png differ
diff --git a/public/images/emoji/win10/child/5.png b/public/images/emoji/win10/child/5.png
new file mode 100644
index 00000000000..0763a8bd94c
Binary files /dev/null and b/public/images/emoji/win10/child/5.png differ
diff --git a/public/images/emoji/win10/child/6.png b/public/images/emoji/win10/child/6.png
new file mode 100644
index 00000000000..3ed705b9025
Binary files /dev/null and b/public/images/emoji/win10/child/6.png differ
diff --git a/public/images/emoji/win10/chile.png b/public/images/emoji/win10/chile.png
new file mode 100644
index 00000000000..740d09658ed
Binary files /dev/null and b/public/images/emoji/win10/chile.png differ
diff --git a/public/images/emoji/win10/chopsticks.png b/public/images/emoji/win10/chopsticks.png
new file mode 100644
index 00000000000..57064202979
Binary files /dev/null and b/public/images/emoji/win10/chopsticks.png differ
diff --git a/public/images/emoji/win10/christmas_island.png b/public/images/emoji/win10/christmas_island.png
new file mode 100644
index 00000000000..6958b7d8d8f
Binary files /dev/null and b/public/images/emoji/win10/christmas_island.png differ
diff --git a/public/images/emoji/win10/city_sunset.png b/public/images/emoji/win10/city_sunset.png
index 5875e1550cd..13a0c99fdd4 100644
Binary files a/public/images/emoji/win10/city_sunset.png and b/public/images/emoji/win10/city_sunset.png differ
diff --git a/public/images/emoji/win10/clamp.png b/public/images/emoji/win10/clamp.png
new file mode 100644
index 00000000000..4f669a5cee5
Binary files /dev/null and b/public/images/emoji/win10/clamp.png differ
diff --git a/public/images/emoji/win10/clap/2.png b/public/images/emoji/win10/clap/2.png
new file mode 100644
index 00000000000..420e5a4501c
Binary files /dev/null and b/public/images/emoji/win10/clap/2.png differ
diff --git a/public/images/emoji/win10/clap/3.png b/public/images/emoji/win10/clap/3.png
new file mode 100644
index 00000000000..7a043d8551b
Binary files /dev/null and b/public/images/emoji/win10/clap/3.png differ
diff --git a/public/images/emoji/win10/clap/4.png b/public/images/emoji/win10/clap/4.png
new file mode 100644
index 00000000000..90d35165f4f
Binary files /dev/null and b/public/images/emoji/win10/clap/4.png differ
diff --git a/public/images/emoji/win10/clap/5.png b/public/images/emoji/win10/clap/5.png
new file mode 100644
index 00000000000..cea7113aa97
Binary files /dev/null and b/public/images/emoji/win10/clap/5.png differ
diff --git a/public/images/emoji/win10/clap/6.png b/public/images/emoji/win10/clap/6.png
new file mode 100644
index 00000000000..57450f33f8b
Binary files /dev/null and b/public/images/emoji/win10/clap/6.png differ
diff --git a/public/images/emoji/win10/clinking_glasses.png b/public/images/emoji/win10/clinking_glasses.png
new file mode 100644
index 00000000000..1114b6a3c6a
Binary files /dev/null and b/public/images/emoji/win10/clinking_glasses.png differ
diff --git a/public/images/emoji/win10/clipperton_island.png b/public/images/emoji/win10/clipperton_island.png
new file mode 100644
index 00000000000..7943b73f671
Binary files /dev/null and b/public/images/emoji/win10/clipperton_island.png differ
diff --git a/public/images/emoji/win10/cloud_with_lightning_and_rain.png b/public/images/emoji/win10/cloud_with_lightning_and_rain.png
new file mode 100644
index 00000000000..b9874884478
Binary files /dev/null and b/public/images/emoji/win10/cloud_with_lightning_and_rain.png differ
diff --git a/public/images/emoji/win10/clown_face.png b/public/images/emoji/win10/clown_face.png
new file mode 100644
index 00000000000..b610c05f298
Binary files /dev/null and b/public/images/emoji/win10/clown_face.png differ
diff --git a/public/images/emoji/win10/cn.png b/public/images/emoji/win10/cn.png
index 646f950b500..67efed2e4d4 100644
Binary files a/public/images/emoji/win10/cn.png and b/public/images/emoji/win10/cn.png differ
diff --git a/public/images/emoji/win10/coat.png b/public/images/emoji/win10/coat.png
new file mode 100644
index 00000000000..c409f9f4c4c
Binary files /dev/null and b/public/images/emoji/win10/coat.png differ
diff --git a/public/images/emoji/win10/coconut.png b/public/images/emoji/win10/coconut.png
new file mode 100644
index 00000000000..e76b533149f
Binary files /dev/null and b/public/images/emoji/win10/coconut.png differ
diff --git a/public/images/emoji/win10/cocos_islands.png b/public/images/emoji/win10/cocos_islands.png
new file mode 100644
index 00000000000..c9025e34e4b
Binary files /dev/null and b/public/images/emoji/win10/cocos_islands.png differ
diff --git a/public/images/emoji/win10/colombia.png b/public/images/emoji/win10/colombia.png
new file mode 100644
index 00000000000..680f77b22d3
Binary files /dev/null and b/public/images/emoji/win10/colombia.png differ
diff --git a/public/images/emoji/win10/comoros.png b/public/images/emoji/win10/comoros.png
new file mode 100644
index 00000000000..e765f507156
Binary files /dev/null and b/public/images/emoji/win10/comoros.png differ
diff --git a/public/images/emoji/win10/computer_mouse.png b/public/images/emoji/win10/computer_mouse.png
new file mode 100644
index 00000000000..3e39c0f398b
Binary files /dev/null and b/public/images/emoji/win10/computer_mouse.png differ
diff --git a/public/images/emoji/win10/congo_brazzaville.png b/public/images/emoji/win10/congo_brazzaville.png
new file mode 100644
index 00000000000..2eef1d6c176
Binary files /dev/null and b/public/images/emoji/win10/congo_brazzaville.png differ
diff --git a/public/images/emoji/win10/congo_kinshasa.png b/public/images/emoji/win10/congo_kinshasa.png
new file mode 100644
index 00000000000..a34af9d64a3
Binary files /dev/null and b/public/images/emoji/win10/congo_kinshasa.png differ
diff --git a/public/images/emoji/win10/construction_worker/2.png b/public/images/emoji/win10/construction_worker/2.png
new file mode 100644
index 00000000000..ae8b600dfb7
Binary files /dev/null and b/public/images/emoji/win10/construction_worker/2.png differ
diff --git a/public/images/emoji/win10/construction_worker/3.png b/public/images/emoji/win10/construction_worker/3.png
new file mode 100644
index 00000000000..db910f28bb4
Binary files /dev/null and b/public/images/emoji/win10/construction_worker/3.png differ
diff --git a/public/images/emoji/win10/construction_worker/4.png b/public/images/emoji/win10/construction_worker/4.png
new file mode 100644
index 00000000000..05f5de395b2
Binary files /dev/null and b/public/images/emoji/win10/construction_worker/4.png differ
diff --git a/public/images/emoji/win10/construction_worker/5.png b/public/images/emoji/win10/construction_worker/5.png
new file mode 100644
index 00000000000..543e9f90b90
Binary files /dev/null and b/public/images/emoji/win10/construction_worker/5.png differ
diff --git a/public/images/emoji/win10/construction_worker/6.png b/public/images/emoji/win10/construction_worker/6.png
new file mode 100644
index 00000000000..11b08e2d1e4
Binary files /dev/null and b/public/images/emoji/win10/construction_worker/6.png differ
diff --git a/public/images/emoji/win10/construction_worker_man.png b/public/images/emoji/win10/construction_worker_man.png
new file mode 100644
index 00000000000..dcf043a510e
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_man.png differ
diff --git a/public/images/emoji/win10/construction_worker_man/2.png b/public/images/emoji/win10/construction_worker_man/2.png
new file mode 100644
index 00000000000..ae8b600dfb7
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_man/2.png differ
diff --git a/public/images/emoji/win10/construction_worker_man/3.png b/public/images/emoji/win10/construction_worker_man/3.png
new file mode 100644
index 00000000000..db910f28bb4
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_man/3.png differ
diff --git a/public/images/emoji/win10/construction_worker_man/4.png b/public/images/emoji/win10/construction_worker_man/4.png
new file mode 100644
index 00000000000..05f5de395b2
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_man/4.png differ
diff --git a/public/images/emoji/win10/construction_worker_man/5.png b/public/images/emoji/win10/construction_worker_man/5.png
new file mode 100644
index 00000000000..543e9f90b90
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_man/5.png differ
diff --git a/public/images/emoji/win10/construction_worker_man/6.png b/public/images/emoji/win10/construction_worker_man/6.png
new file mode 100644
index 00000000000..11b08e2d1e4
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_man/6.png differ
diff --git a/public/images/emoji/win10/construction_worker_woman.png b/public/images/emoji/win10/construction_worker_woman.png
new file mode 100644
index 00000000000..fcb4278dc16
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_woman.png differ
diff --git a/public/images/emoji/win10/construction_worker_woman/2.png b/public/images/emoji/win10/construction_worker_woman/2.png
new file mode 100644
index 00000000000..00910385a2c
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/win10/construction_worker_woman/3.png b/public/images/emoji/win10/construction_worker_woman/3.png
new file mode 100644
index 00000000000..fa709b7ebdd
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/win10/construction_worker_woman/4.png b/public/images/emoji/win10/construction_worker_woman/4.png
new file mode 100644
index 00000000000..0b24a6171be
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/win10/construction_worker_woman/5.png b/public/images/emoji/win10/construction_worker_woman/5.png
new file mode 100644
index 00000000000..993695eebc5
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/win10/construction_worker_woman/6.png b/public/images/emoji/win10/construction_worker_woman/6.png
new file mode 100644
index 00000000000..4f3747f67b7
Binary files /dev/null and b/public/images/emoji/win10/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/win10/cook_islands.png b/public/images/emoji/win10/cook_islands.png
new file mode 100644
index 00000000000..d1e4afbacae
Binary files /dev/null and b/public/images/emoji/win10/cook_islands.png differ
diff --git a/public/images/emoji/win10/cop/2.png b/public/images/emoji/win10/cop/2.png
new file mode 100644
index 00000000000..9113cfcde1a
Binary files /dev/null and b/public/images/emoji/win10/cop/2.png differ
diff --git a/public/images/emoji/win10/cop/3.png b/public/images/emoji/win10/cop/3.png
new file mode 100644
index 00000000000..6e0c1756add
Binary files /dev/null and b/public/images/emoji/win10/cop/3.png differ
diff --git a/public/images/emoji/win10/cop/4.png b/public/images/emoji/win10/cop/4.png
new file mode 100644
index 00000000000..8cdbe0a180e
Binary files /dev/null and b/public/images/emoji/win10/cop/4.png differ
diff --git a/public/images/emoji/win10/cop/5.png b/public/images/emoji/win10/cop/5.png
new file mode 100644
index 00000000000..a1fd9fdd56e
Binary files /dev/null and b/public/images/emoji/win10/cop/5.png differ
diff --git a/public/images/emoji/win10/cop/6.png b/public/images/emoji/win10/cop/6.png
new file mode 100644
index 00000000000..d31a94ecf5a
Binary files /dev/null and b/public/images/emoji/win10/cop/6.png differ
diff --git a/public/images/emoji/win10/costa_rica.png b/public/images/emoji/win10/costa_rica.png
new file mode 100644
index 00000000000..e6c16e4ea0b
Binary files /dev/null and b/public/images/emoji/win10/costa_rica.png differ
diff --git a/public/images/emoji/win10/cote_divoire.png b/public/images/emoji/win10/cote_divoire.png
new file mode 100644
index 00000000000..c8e9c1eacef
Binary files /dev/null and b/public/images/emoji/win10/cote_divoire.png differ
diff --git a/public/images/emoji/win10/couple_with_heart_man_man.png b/public/images/emoji/win10/couple_with_heart_man_man.png
new file mode 100644
index 00000000000..1f50d4f8ffe
Binary files /dev/null and b/public/images/emoji/win10/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/win10/couple_with_heart_woman_man.png b/public/images/emoji/win10/couple_with_heart_woman_man.png
new file mode 100644
index 00000000000..a8181c3fee9
Binary files /dev/null and b/public/images/emoji/win10/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/win10/couple_with_heart_woman_woman.png b/public/images/emoji/win10/couple_with_heart_woman_woman.png
new file mode 100644
index 00000000000..1156f31e63f
Binary files /dev/null and b/public/images/emoji/win10/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/win10/couplekiss_man_man.png b/public/images/emoji/win10/couplekiss_man_man.png
new file mode 100644
index 00000000000..6933b45c7c3
Binary files /dev/null and b/public/images/emoji/win10/couplekiss_man_man.png differ
diff --git a/public/images/emoji/win10/couplekiss_man_woman.png b/public/images/emoji/win10/couplekiss_man_woman.png
new file mode 100644
index 00000000000..5afee8672b0
Binary files /dev/null and b/public/images/emoji/win10/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/win10/couplekiss_woman_woman.png b/public/images/emoji/win10/couplekiss_woman_woman.png
new file mode 100644
index 00000000000..b5e10de7131
Binary files /dev/null and b/public/images/emoji/win10/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/win10/cowboy_hat_face.png b/public/images/emoji/win10/cowboy_hat_face.png
new file mode 100644
index 00000000000..50976e5e677
Binary files /dev/null and b/public/images/emoji/win10/cowboy_hat_face.png differ
diff --git a/public/images/emoji/win10/crazy_face.png b/public/images/emoji/win10/crazy_face.png
new file mode 100644
index 00000000000..0aaa1cf7651
Binary files /dev/null and b/public/images/emoji/win10/crazy_face.png differ
diff --git a/public/images/emoji/win10/cricket_bat_and_ball.png b/public/images/emoji/win10/cricket_bat_and_ball.png
new file mode 100644
index 00000000000..1714e0d8502
Binary files /dev/null and b/public/images/emoji/win10/cricket_bat_and_ball.png differ
diff --git a/public/images/emoji/win10/croatia.png b/public/images/emoji/win10/croatia.png
new file mode 100644
index 00000000000..6cc9a0e7485
Binary files /dev/null and b/public/images/emoji/win10/croatia.png differ
diff --git a/public/images/emoji/win10/croissant.png b/public/images/emoji/win10/croissant.png
new file mode 100644
index 00000000000..117d8e025a4
Binary files /dev/null and b/public/images/emoji/win10/croissant.png differ
diff --git a/public/images/emoji/win10/crossed_fingers.png b/public/images/emoji/win10/crossed_fingers.png
new file mode 100644
index 00000000000..54711bc7742
Binary files /dev/null and b/public/images/emoji/win10/crossed_fingers.png differ
diff --git a/public/images/emoji/win10/crossed_fingers/2.png b/public/images/emoji/win10/crossed_fingers/2.png
new file mode 100644
index 00000000000..8539710a1d4
Binary files /dev/null and b/public/images/emoji/win10/crossed_fingers/2.png differ
diff --git a/public/images/emoji/win10/crossed_fingers/3.png b/public/images/emoji/win10/crossed_fingers/3.png
new file mode 100644
index 00000000000..51ff3c68b8f
Binary files /dev/null and b/public/images/emoji/win10/crossed_fingers/3.png differ
diff --git a/public/images/emoji/win10/crossed_fingers/4.png b/public/images/emoji/win10/crossed_fingers/4.png
new file mode 100644
index 00000000000..c6af6bd39c7
Binary files /dev/null and b/public/images/emoji/win10/crossed_fingers/4.png differ
diff --git a/public/images/emoji/win10/crossed_fingers/5.png b/public/images/emoji/win10/crossed_fingers/5.png
new file mode 100644
index 00000000000..e89ccdec7a6
Binary files /dev/null and b/public/images/emoji/win10/crossed_fingers/5.png differ
diff --git a/public/images/emoji/win10/crossed_fingers/6.png b/public/images/emoji/win10/crossed_fingers/6.png
new file mode 100644
index 00000000000..cf813f1885e
Binary files /dev/null and b/public/images/emoji/win10/crossed_fingers/6.png differ
diff --git a/public/images/emoji/win10/crystal_ball.png b/public/images/emoji/win10/crystal_ball.png
index 186bd57c25f..4f82b1e1dac 100644
Binary files a/public/images/emoji/win10/crystal_ball.png and b/public/images/emoji/win10/crystal_ball.png differ
diff --git a/public/images/emoji/win10/cuba.png b/public/images/emoji/win10/cuba.png
new file mode 100644
index 00000000000..4436dee31e9
Binary files /dev/null and b/public/images/emoji/win10/cuba.png differ
diff --git a/public/images/emoji/win10/cucumber.png b/public/images/emoji/win10/cucumber.png
new file mode 100644
index 00000000000..cdac0debb11
Binary files /dev/null and b/public/images/emoji/win10/cucumber.png differ
diff --git a/public/images/emoji/win10/cup_with_straw.png b/public/images/emoji/win10/cup_with_straw.png
new file mode 100644
index 00000000000..4b2f313f9b2
Binary files /dev/null and b/public/images/emoji/win10/cup_with_straw.png differ
diff --git a/public/images/emoji/win10/curacao.png b/public/images/emoji/win10/curacao.png
new file mode 100644
index 00000000000..e29bde1f8b5
Binary files /dev/null and b/public/images/emoji/win10/curacao.png differ
diff --git a/public/images/emoji/win10/curling_stone.png b/public/images/emoji/win10/curling_stone.png
new file mode 100644
index 00000000000..09027a2fb2e
Binary files /dev/null and b/public/images/emoji/win10/curling_stone.png differ
diff --git a/public/images/emoji/win10/cut_of_meat.png b/public/images/emoji/win10/cut_of_meat.png
new file mode 100644
index 00000000000..b66d427e099
Binary files /dev/null and b/public/images/emoji/win10/cut_of_meat.png differ
diff --git a/public/images/emoji/win10/cyprus.png b/public/images/emoji/win10/cyprus.png
new file mode 100644
index 00000000000..7f80f4ed578
Binary files /dev/null and b/public/images/emoji/win10/cyprus.png differ
diff --git a/public/images/emoji/win10/czech_republic.png b/public/images/emoji/win10/czech_republic.png
new file mode 100644
index 00000000000..88558e4ab2a
Binary files /dev/null and b/public/images/emoji/win10/czech_republic.png differ
diff --git a/public/images/emoji/win10/dancer.png b/public/images/emoji/win10/dancer.png
index db1c4e4d9e2..270386648a3 100644
Binary files a/public/images/emoji/win10/dancer.png and b/public/images/emoji/win10/dancer.png differ
diff --git a/public/images/emoji/win10/dancer/2.png b/public/images/emoji/win10/dancer/2.png
new file mode 100644
index 00000000000..438ff8d1782
Binary files /dev/null and b/public/images/emoji/win10/dancer/2.png differ
diff --git a/public/images/emoji/win10/dancer/3.png b/public/images/emoji/win10/dancer/3.png
new file mode 100644
index 00000000000..4d8f1e20d79
Binary files /dev/null and b/public/images/emoji/win10/dancer/3.png differ
diff --git a/public/images/emoji/win10/dancer/4.png b/public/images/emoji/win10/dancer/4.png
new file mode 100644
index 00000000000..e5e46ae1cfa
Binary files /dev/null and b/public/images/emoji/win10/dancer/4.png differ
diff --git a/public/images/emoji/win10/dancer/5.png b/public/images/emoji/win10/dancer/5.png
new file mode 100644
index 00000000000..fbfa036302d
Binary files /dev/null and b/public/images/emoji/win10/dancer/5.png differ
diff --git a/public/images/emoji/win10/dancer/6.png b/public/images/emoji/win10/dancer/6.png
new file mode 100644
index 00000000000..ee6919215a5
Binary files /dev/null and b/public/images/emoji/win10/dancer/6.png differ
diff --git a/public/images/emoji/win10/dancers.png b/public/images/emoji/win10/dancers.png
index 7216a94c558..37c9d50af89 100644
Binary files a/public/images/emoji/win10/dancers.png and b/public/images/emoji/win10/dancers.png differ
diff --git a/public/images/emoji/win10/dancing_men.png b/public/images/emoji/win10/dancing_men.png
new file mode 100644
index 00000000000..cb96a35fa44
Binary files /dev/null and b/public/images/emoji/win10/dancing_men.png differ
diff --git a/public/images/emoji/win10/dancing_women.png b/public/images/emoji/win10/dancing_women.png
new file mode 100644
index 00000000000..37c9d50af89
Binary files /dev/null and b/public/images/emoji/win10/dancing_women.png differ
diff --git a/public/images/emoji/win10/de.png b/public/images/emoji/win10/de.png
index 766c519bc8b..746bf11011c 100644
Binary files a/public/images/emoji/win10/de.png and b/public/images/emoji/win10/de.png differ
diff --git a/public/images/emoji/win10/deer.png b/public/images/emoji/win10/deer.png
new file mode 100644
index 00000000000..0dae904d786
Binary files /dev/null and b/public/images/emoji/win10/deer.png differ
diff --git a/public/images/emoji/win10/denmark.png b/public/images/emoji/win10/denmark.png
new file mode 100644
index 00000000000..821499e02c7
Binary files /dev/null and b/public/images/emoji/win10/denmark.png differ
diff --git a/public/images/emoji/win10/derelict_house.png b/public/images/emoji/win10/derelict_house.png
new file mode 100644
index 00000000000..14a514ed42e
Binary files /dev/null and b/public/images/emoji/win10/derelict_house.png differ
diff --git a/public/images/emoji/win10/diego_garcia.png b/public/images/emoji/win10/diego_garcia.png
new file mode 100644
index 00000000000..881e01a927f
Binary files /dev/null and b/public/images/emoji/win10/diego_garcia.png differ
diff --git a/public/images/emoji/win10/djibouti.png b/public/images/emoji/win10/djibouti.png
new file mode 100644
index 00000000000..606fe6a1ee5
Binary files /dev/null and b/public/images/emoji/win10/djibouti.png differ
diff --git a/public/images/emoji/win10/dominica.png b/public/images/emoji/win10/dominica.png
new file mode 100644
index 00000000000..588ece3f433
Binary files /dev/null and b/public/images/emoji/win10/dominica.png differ
diff --git a/public/images/emoji/win10/dominican_republic.png b/public/images/emoji/win10/dominican_republic.png
new file mode 100644
index 00000000000..de48ff449ca
Binary files /dev/null and b/public/images/emoji/win10/dominican_republic.png differ
diff --git a/public/images/emoji/win10/drooling_face.png b/public/images/emoji/win10/drooling_face.png
new file mode 100644
index 00000000000..e6fba4d9f6f
Binary files /dev/null and b/public/images/emoji/win10/drooling_face.png differ
diff --git a/public/images/emoji/win10/drum.png b/public/images/emoji/win10/drum.png
new file mode 100644
index 00000000000..7ac4d13d689
Binary files /dev/null and b/public/images/emoji/win10/drum.png differ
diff --git a/public/images/emoji/win10/duck.png b/public/images/emoji/win10/duck.png
new file mode 100644
index 00000000000..4b69bbdd942
Binary files /dev/null and b/public/images/emoji/win10/duck.png differ
diff --git a/public/images/emoji/win10/dumpling.png b/public/images/emoji/win10/dumpling.png
new file mode 100644
index 00000000000..489a779bf69
Binary files /dev/null and b/public/images/emoji/win10/dumpling.png differ
diff --git a/public/images/emoji/win10/e-mail.png b/public/images/emoji/win10/e-mail.png
index 8b5aca72151..d0d51d40ef5 100644
Binary files a/public/images/emoji/win10/e-mail.png and b/public/images/emoji/win10/e-mail.png differ
diff --git a/public/images/emoji/win10/eagle.png b/public/images/emoji/win10/eagle.png
new file mode 100644
index 00000000000..3d0847166ba
Binary files /dev/null and b/public/images/emoji/win10/eagle.png differ
diff --git a/public/images/emoji/win10/ear/2.png b/public/images/emoji/win10/ear/2.png
new file mode 100644
index 00000000000..f8511328629
Binary files /dev/null and b/public/images/emoji/win10/ear/2.png differ
diff --git a/public/images/emoji/win10/ear/3.png b/public/images/emoji/win10/ear/3.png
new file mode 100644
index 00000000000..9dcda7c654a
Binary files /dev/null and b/public/images/emoji/win10/ear/3.png differ
diff --git a/public/images/emoji/win10/ear/4.png b/public/images/emoji/win10/ear/4.png
new file mode 100644
index 00000000000..12c74ec607a
Binary files /dev/null and b/public/images/emoji/win10/ear/4.png differ
diff --git a/public/images/emoji/win10/ear/5.png b/public/images/emoji/win10/ear/5.png
new file mode 100644
index 00000000000..ebf07310b98
Binary files /dev/null and b/public/images/emoji/win10/ear/5.png differ
diff --git a/public/images/emoji/win10/ear/6.png b/public/images/emoji/win10/ear/6.png
new file mode 100644
index 00000000000..517f25dddce
Binary files /dev/null and b/public/images/emoji/win10/ear/6.png differ
diff --git a/public/images/emoji/win10/ecuador.png b/public/images/emoji/win10/ecuador.png
new file mode 100644
index 00000000000..cf86fbaad62
Binary files /dev/null and b/public/images/emoji/win10/ecuador.png differ
diff --git a/public/images/emoji/win10/egg.png b/public/images/emoji/win10/egg.png
index 42149092674..edcdf7cfa42 100644
Binary files a/public/images/emoji/win10/egg.png and b/public/images/emoji/win10/egg.png differ
diff --git a/public/images/emoji/win10/egypt.png b/public/images/emoji/win10/egypt.png
new file mode 100644
index 00000000000..bbbdefa653f
Binary files /dev/null and b/public/images/emoji/win10/egypt.png differ
diff --git a/public/images/emoji/win10/eight.png b/public/images/emoji/win10/eight.png
index 4fe4c5f23e2..6269d3b91ab 100644
Binary files a/public/images/emoji/win10/eight.png and b/public/images/emoji/win10/eight.png differ
diff --git a/public/images/emoji/win10/el_salvador.png b/public/images/emoji/win10/el_salvador.png
new file mode 100644
index 00000000000..0f24a983698
Binary files /dev/null and b/public/images/emoji/win10/el_salvador.png differ
diff --git a/public/images/emoji/win10/elf.png b/public/images/emoji/win10/elf.png
new file mode 100644
index 00000000000..f8b6dd873e2
Binary files /dev/null and b/public/images/emoji/win10/elf.png differ
diff --git a/public/images/emoji/win10/elf/2.png b/public/images/emoji/win10/elf/2.png
new file mode 100644
index 00000000000..15984024f21
Binary files /dev/null and b/public/images/emoji/win10/elf/2.png differ
diff --git a/public/images/emoji/win10/elf/3.png b/public/images/emoji/win10/elf/3.png
new file mode 100644
index 00000000000..4689243a178
Binary files /dev/null and b/public/images/emoji/win10/elf/3.png differ
diff --git a/public/images/emoji/win10/elf/4.png b/public/images/emoji/win10/elf/4.png
new file mode 100644
index 00000000000..861cbf808ca
Binary files /dev/null and b/public/images/emoji/win10/elf/4.png differ
diff --git a/public/images/emoji/win10/elf/5.png b/public/images/emoji/win10/elf/5.png
new file mode 100644
index 00000000000..50748760101
Binary files /dev/null and b/public/images/emoji/win10/elf/5.png differ
diff --git a/public/images/emoji/win10/elf/6.png b/public/images/emoji/win10/elf/6.png
new file mode 100644
index 00000000000..505c908b180
Binary files /dev/null and b/public/images/emoji/win10/elf/6.png differ
diff --git a/public/images/emoji/win10/email.png b/public/images/emoji/win10/email.png
index 8b5aca72151..d0d51d40ef5 100644
Binary files a/public/images/emoji/win10/email.png and b/public/images/emoji/win10/email.png differ
diff --git a/public/images/emoji/win10/equatorial_guinea.png b/public/images/emoji/win10/equatorial_guinea.png
new file mode 100644
index 00000000000..38e992318c3
Binary files /dev/null and b/public/images/emoji/win10/equatorial_guinea.png differ
diff --git a/public/images/emoji/win10/eritrea.png b/public/images/emoji/win10/eritrea.png
new file mode 100644
index 00000000000..630fd664150
Binary files /dev/null and b/public/images/emoji/win10/eritrea.png differ
diff --git a/public/images/emoji/win10/es.png b/public/images/emoji/win10/es.png
index 7a4fce76b98..e0da30d5a6c 100644
Binary files a/public/images/emoji/win10/es.png and b/public/images/emoji/win10/es.png differ
diff --git a/public/images/emoji/win10/estonia.png b/public/images/emoji/win10/estonia.png
new file mode 100644
index 00000000000..2553a5dbf7d
Binary files /dev/null and b/public/images/emoji/win10/estonia.png differ
diff --git a/public/images/emoji/win10/ethiopia.png b/public/images/emoji/win10/ethiopia.png
new file mode 100644
index 00000000000..d0d78350cdf
Binary files /dev/null and b/public/images/emoji/win10/ethiopia.png differ
diff --git a/public/images/emoji/win10/eu.png b/public/images/emoji/win10/eu.png
new file mode 100644
index 00000000000..938b488ddb8
Binary files /dev/null and b/public/images/emoji/win10/eu.png differ
diff --git a/public/images/emoji/win10/exploding_head.png b/public/images/emoji/win10/exploding_head.png
new file mode 100644
index 00000000000..85532dadc7a
Binary files /dev/null and b/public/images/emoji/win10/exploding_head.png differ
diff --git a/public/images/emoji/win10/face_vomiting.png b/public/images/emoji/win10/face_vomiting.png
new file mode 100644
index 00000000000..cd7c3d1f2b7
Binary files /dev/null and b/public/images/emoji/win10/face_vomiting.png differ
diff --git a/public/images/emoji/win10/face_with_hand_over_mouth.png b/public/images/emoji/win10/face_with_hand_over_mouth.png
new file mode 100644
index 00000000000..aed8f62e0b0
Binary files /dev/null and b/public/images/emoji/win10/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/win10/face_with_monocle.png b/public/images/emoji/win10/face_with_monocle.png
new file mode 100644
index 00000000000..c6fbb4481d5
Binary files /dev/null and b/public/images/emoji/win10/face_with_monocle.png differ
diff --git a/public/images/emoji/win10/face_with_raised_eyebrow.png b/public/images/emoji/win10/face_with_raised_eyebrow.png
new file mode 100644
index 00000000000..887f70e3652
Binary files /dev/null and b/public/images/emoji/win10/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/win10/face_with_symbols_over_mouth.png b/public/images/emoji/win10/face_with_symbols_over_mouth.png
new file mode 100644
index 00000000000..84bb9ec9c53
Binary files /dev/null and b/public/images/emoji/win10/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/win10/facepunch.png b/public/images/emoji/win10/facepunch.png
new file mode 100644
index 00000000000..574c1d8aad2
Binary files /dev/null and b/public/images/emoji/win10/facepunch.png differ
diff --git a/public/images/emoji/win10/facepunch/2.png b/public/images/emoji/win10/facepunch/2.png
new file mode 100644
index 00000000000..10713c080bd
Binary files /dev/null and b/public/images/emoji/win10/facepunch/2.png differ
diff --git a/public/images/emoji/win10/facepunch/3.png b/public/images/emoji/win10/facepunch/3.png
new file mode 100644
index 00000000000..b04e39925ee
Binary files /dev/null and b/public/images/emoji/win10/facepunch/3.png differ
diff --git a/public/images/emoji/win10/facepunch/4.png b/public/images/emoji/win10/facepunch/4.png
new file mode 100644
index 00000000000..984a309cd8f
Binary files /dev/null and b/public/images/emoji/win10/facepunch/4.png differ
diff --git a/public/images/emoji/win10/facepunch/5.png b/public/images/emoji/win10/facepunch/5.png
new file mode 100644
index 00000000000..3ab77933909
Binary files /dev/null and b/public/images/emoji/win10/facepunch/5.png differ
diff --git a/public/images/emoji/win10/facepunch/6.png b/public/images/emoji/win10/facepunch/6.png
new file mode 100644
index 00000000000..a564b18f51c
Binary files /dev/null and b/public/images/emoji/win10/facepunch/6.png differ
diff --git a/public/images/emoji/win10/fairy.png b/public/images/emoji/win10/fairy.png
new file mode 100644
index 00000000000..429938294b2
Binary files /dev/null and b/public/images/emoji/win10/fairy.png differ
diff --git a/public/images/emoji/win10/fairy/2.png b/public/images/emoji/win10/fairy/2.png
new file mode 100644
index 00000000000..91e1de4e5dc
Binary files /dev/null and b/public/images/emoji/win10/fairy/2.png differ
diff --git a/public/images/emoji/win10/fairy/3.png b/public/images/emoji/win10/fairy/3.png
new file mode 100644
index 00000000000..42821806e92
Binary files /dev/null and b/public/images/emoji/win10/fairy/3.png differ
diff --git a/public/images/emoji/win10/fairy/4.png b/public/images/emoji/win10/fairy/4.png
new file mode 100644
index 00000000000..9e8d3adb897
Binary files /dev/null and b/public/images/emoji/win10/fairy/4.png differ
diff --git a/public/images/emoji/win10/fairy/5.png b/public/images/emoji/win10/fairy/5.png
new file mode 100644
index 00000000000..88d190e3926
Binary files /dev/null and b/public/images/emoji/win10/fairy/5.png differ
diff --git a/public/images/emoji/win10/fairy/6.png b/public/images/emoji/win10/fairy/6.png
new file mode 100644
index 00000000000..e6ab8ade743
Binary files /dev/null and b/public/images/emoji/win10/fairy/6.png differ
diff --git a/public/images/emoji/win10/falkland_islands.png b/public/images/emoji/win10/falkland_islands.png
new file mode 100644
index 00000000000..d97a84cea15
Binary files /dev/null and b/public/images/emoji/win10/falkland_islands.png differ
diff --git a/public/images/emoji/win10/family.png b/public/images/emoji/win10/family.png
new file mode 100644
index 00000000000..5c1a61c16b2
Binary files /dev/null and b/public/images/emoji/win10/family.png differ
diff --git a/public/images/emoji/win10/family_man_boy.png b/public/images/emoji/win10/family_man_boy.png
new file mode 100644
index 00000000000..1ff3b48b115
Binary files /dev/null and b/public/images/emoji/win10/family_man_boy.png differ
diff --git a/public/images/emoji/win10/family_man_boy_boy.png b/public/images/emoji/win10/family_man_boy_boy.png
new file mode 100644
index 00000000000..87695616e1d
Binary files /dev/null and b/public/images/emoji/win10/family_man_boy_boy.png differ
diff --git a/public/images/emoji/win10/family_man_girl.png b/public/images/emoji/win10/family_man_girl.png
new file mode 100644
index 00000000000..574c9af8e74
Binary files /dev/null and b/public/images/emoji/win10/family_man_girl.png differ
diff --git a/public/images/emoji/win10/family_man_girl_boy.png b/public/images/emoji/win10/family_man_girl_boy.png
new file mode 100644
index 00000000000..11ea8046fd6
Binary files /dev/null and b/public/images/emoji/win10/family_man_girl_boy.png differ
diff --git a/public/images/emoji/win10/family_man_girl_girl.png b/public/images/emoji/win10/family_man_girl_girl.png
new file mode 100644
index 00000000000..3786bd71486
Binary files /dev/null and b/public/images/emoji/win10/family_man_girl_girl.png differ
diff --git a/public/images/emoji/win10/family_man_man_boy.png b/public/images/emoji/win10/family_man_man_boy.png
new file mode 100644
index 00000000000..e32790925d3
Binary files /dev/null and b/public/images/emoji/win10/family_man_man_boy.png differ
diff --git a/public/images/emoji/win10/family_man_man_boy_boy.png b/public/images/emoji/win10/family_man_man_boy_boy.png
new file mode 100644
index 00000000000..69fb260b1e3
Binary files /dev/null and b/public/images/emoji/win10/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/win10/family_man_man_girl.png b/public/images/emoji/win10/family_man_man_girl.png
new file mode 100644
index 00000000000..3ba9652f9a1
Binary files /dev/null and b/public/images/emoji/win10/family_man_man_girl.png differ
diff --git a/public/images/emoji/win10/family_man_man_girl_boy.png b/public/images/emoji/win10/family_man_man_girl_boy.png
new file mode 100644
index 00000000000..81f5c87934c
Binary files /dev/null and b/public/images/emoji/win10/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/win10/family_man_man_girl_girl.png b/public/images/emoji/win10/family_man_man_girl_girl.png
new file mode 100644
index 00000000000..ea8d77c99ae
Binary files /dev/null and b/public/images/emoji/win10/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/win10/family_man_woman_boy.png b/public/images/emoji/win10/family_man_woman_boy.png
new file mode 100644
index 00000000000..1a4d50e60b0
Binary files /dev/null and b/public/images/emoji/win10/family_man_woman_boy.png differ
diff --git a/public/images/emoji/win10/family_man_woman_boy_boy.png b/public/images/emoji/win10/family_man_woman_boy_boy.png
new file mode 100644
index 00000000000..33fea49e37a
Binary files /dev/null and b/public/images/emoji/win10/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/win10/family_man_woman_boys.png b/public/images/emoji/win10/family_man_woman_boys.png
index fc282c49ad4..33fea49e37a 100644
Binary files a/public/images/emoji/win10/family_man_woman_boys.png and b/public/images/emoji/win10/family_man_woman_boys.png differ
diff --git a/public/images/emoji/win10/family_man_woman_girl.png b/public/images/emoji/win10/family_man_woman_girl.png
index caa399544db..2a6ef392cf4 100644
Binary files a/public/images/emoji/win10/family_man_woman_girl.png and b/public/images/emoji/win10/family_man_woman_girl.png differ
diff --git a/public/images/emoji/win10/family_man_woman_girl_boy.png b/public/images/emoji/win10/family_man_woman_girl_boy.png
index 1e1146dcd06..5c1a61c16b2 100644
Binary files a/public/images/emoji/win10/family_man_woman_girl_boy.png and b/public/images/emoji/win10/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/win10/family_man_woman_girl_girl.png b/public/images/emoji/win10/family_man_woman_girl_girl.png
new file mode 100644
index 00000000000..234c3fae1a4
Binary files /dev/null and b/public/images/emoji/win10/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/win10/family_man_woman_girls.png b/public/images/emoji/win10/family_man_woman_girls.png
index edd279c1c05..234c3fae1a4 100644
Binary files a/public/images/emoji/win10/family_man_woman_girls.png and b/public/images/emoji/win10/family_man_woman_girls.png differ
diff --git a/public/images/emoji/win10/family_men_boy.png b/public/images/emoji/win10/family_men_boy.png
index 065e4bb395f..e32790925d3 100644
Binary files a/public/images/emoji/win10/family_men_boy.png and b/public/images/emoji/win10/family_men_boy.png differ
diff --git a/public/images/emoji/win10/family_men_boys.png b/public/images/emoji/win10/family_men_boys.png
index 3a8ecd5651a..69fb260b1e3 100644
Binary files a/public/images/emoji/win10/family_men_boys.png and b/public/images/emoji/win10/family_men_boys.png differ
diff --git a/public/images/emoji/win10/family_men_girl.png b/public/images/emoji/win10/family_men_girl.png
index 6fd87bc2dd2..3ba9652f9a1 100644
Binary files a/public/images/emoji/win10/family_men_girl.png and b/public/images/emoji/win10/family_men_girl.png differ
diff --git a/public/images/emoji/win10/family_men_girl_boy.png b/public/images/emoji/win10/family_men_girl_boy.png
index 70e7eba386c..81f5c87934c 100644
Binary files a/public/images/emoji/win10/family_men_girl_boy.png and b/public/images/emoji/win10/family_men_girl_boy.png differ
diff --git a/public/images/emoji/win10/family_men_girls.png b/public/images/emoji/win10/family_men_girls.png
index 65bc776461c..ea8d77c99ae 100644
Binary files a/public/images/emoji/win10/family_men_girls.png and b/public/images/emoji/win10/family_men_girls.png differ
diff --git a/public/images/emoji/win10/family_woman_boy.png b/public/images/emoji/win10/family_woman_boy.png
new file mode 100644
index 00000000000..407a5662b12
Binary files /dev/null and b/public/images/emoji/win10/family_woman_boy.png differ
diff --git a/public/images/emoji/win10/family_woman_boy_boy.png b/public/images/emoji/win10/family_woman_boy_boy.png
new file mode 100644
index 00000000000..1a466ab87f6
Binary files /dev/null and b/public/images/emoji/win10/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/win10/family_woman_girl.png b/public/images/emoji/win10/family_woman_girl.png
new file mode 100644
index 00000000000..1e20cb45400
Binary files /dev/null and b/public/images/emoji/win10/family_woman_girl.png differ
diff --git a/public/images/emoji/win10/family_woman_girl_boy.png b/public/images/emoji/win10/family_woman_girl_boy.png
new file mode 100644
index 00000000000..5131a6545ba
Binary files /dev/null and b/public/images/emoji/win10/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/win10/family_woman_girl_girl.png b/public/images/emoji/win10/family_woman_girl_girl.png
new file mode 100644
index 00000000000..e6ecd67fe2e
Binary files /dev/null and b/public/images/emoji/win10/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/win10/family_woman_woman_boy.png b/public/images/emoji/win10/family_woman_woman_boy.png
new file mode 100644
index 00000000000..ece2fb9d80b
Binary files /dev/null and b/public/images/emoji/win10/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/win10/family_woman_woman_boy_boy.png b/public/images/emoji/win10/family_woman_woman_boy_boy.png
new file mode 100644
index 00000000000..fd6469a8d27
Binary files /dev/null and b/public/images/emoji/win10/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/win10/family_woman_woman_girl.png b/public/images/emoji/win10/family_woman_woman_girl.png
new file mode 100644
index 00000000000..92035f6bb51
Binary files /dev/null and b/public/images/emoji/win10/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/win10/family_woman_woman_girl_boy.png b/public/images/emoji/win10/family_woman_woman_girl_boy.png
new file mode 100644
index 00000000000..06902980d6b
Binary files /dev/null and b/public/images/emoji/win10/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/win10/family_woman_woman_girl_girl.png b/public/images/emoji/win10/family_woman_woman_girl_girl.png
new file mode 100644
index 00000000000..145d8a26a95
Binary files /dev/null and b/public/images/emoji/win10/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/win10/family_women_boy.png b/public/images/emoji/win10/family_women_boy.png
index 3ff0e142035..ece2fb9d80b 100644
Binary files a/public/images/emoji/win10/family_women_boy.png and b/public/images/emoji/win10/family_women_boy.png differ
diff --git a/public/images/emoji/win10/family_women_boys.png b/public/images/emoji/win10/family_women_boys.png
index ba07c3b93bf..fd6469a8d27 100644
Binary files a/public/images/emoji/win10/family_women_boys.png and b/public/images/emoji/win10/family_women_boys.png differ
diff --git a/public/images/emoji/win10/family_women_girl.png b/public/images/emoji/win10/family_women_girl.png
index 162d2cb285d..92035f6bb51 100644
Binary files a/public/images/emoji/win10/family_women_girl.png and b/public/images/emoji/win10/family_women_girl.png differ
diff --git a/public/images/emoji/win10/family_women_girl_boy.png b/public/images/emoji/win10/family_women_girl_boy.png
index b761109252a..06902980d6b 100644
Binary files a/public/images/emoji/win10/family_women_girl_boy.png and b/public/images/emoji/win10/family_women_girl_boy.png differ
diff --git a/public/images/emoji/win10/family_women_girls.png b/public/images/emoji/win10/family_women_girls.png
index 2d499378f76..145d8a26a95 100644
Binary files a/public/images/emoji/win10/family_women_girls.png and b/public/images/emoji/win10/family_women_girls.png differ
diff --git a/public/images/emoji/win10/faroe_islands.png b/public/images/emoji/win10/faroe_islands.png
new file mode 100644
index 00000000000..5da7953f8d0
Binary files /dev/null and b/public/images/emoji/win10/faroe_islands.png differ
diff --git a/public/images/emoji/win10/feet.png b/public/images/emoji/win10/feet.png
index c22de58cf47..9d5deb5aab4 100644
Binary files a/public/images/emoji/win10/feet.png and b/public/images/emoji/win10/feet.png differ
diff --git a/public/images/emoji/win10/female_detective.png b/public/images/emoji/win10/female_detective.png
new file mode 100644
index 00000000000..5b4e672cafb
Binary files /dev/null and b/public/images/emoji/win10/female_detective.png differ
diff --git a/public/images/emoji/win10/fiji.png b/public/images/emoji/win10/fiji.png
new file mode 100644
index 00000000000..df504caef6c
Binary files /dev/null and b/public/images/emoji/win10/fiji.png differ
diff --git a/public/images/emoji/win10/film_strip.png b/public/images/emoji/win10/film_strip.png
new file mode 100644
index 00000000000..09256e78ea2
Binary files /dev/null and b/public/images/emoji/win10/film_strip.png differ
diff --git a/public/images/emoji/win10/finland.png b/public/images/emoji/win10/finland.png
new file mode 100644
index 00000000000..5eda4bb8646
Binary files /dev/null and b/public/images/emoji/win10/finland.png differ
diff --git a/public/images/emoji/win10/fist/2.png b/public/images/emoji/win10/fist/2.png
new file mode 100644
index 00000000000..88b32740e98
Binary files /dev/null and b/public/images/emoji/win10/fist/2.png differ
diff --git a/public/images/emoji/win10/fist/3.png b/public/images/emoji/win10/fist/3.png
new file mode 100644
index 00000000000..158912a5702
Binary files /dev/null and b/public/images/emoji/win10/fist/3.png differ
diff --git a/public/images/emoji/win10/fist/4.png b/public/images/emoji/win10/fist/4.png
new file mode 100644
index 00000000000..286c12b8fc2
Binary files /dev/null and b/public/images/emoji/win10/fist/4.png differ
diff --git a/public/images/emoji/win10/fist/5.png b/public/images/emoji/win10/fist/5.png
new file mode 100644
index 00000000000..5b568a36e2e
Binary files /dev/null and b/public/images/emoji/win10/fist/5.png differ
diff --git a/public/images/emoji/win10/fist/6.png b/public/images/emoji/win10/fist/6.png
new file mode 100644
index 00000000000..1fb87ca66c7
Binary files /dev/null and b/public/images/emoji/win10/fist/6.png differ
diff --git a/public/images/emoji/win10/fist_left.png b/public/images/emoji/win10/fist_left.png
new file mode 100644
index 00000000000..af96a90dc01
Binary files /dev/null and b/public/images/emoji/win10/fist_left.png differ
diff --git a/public/images/emoji/win10/fist_left/2.png b/public/images/emoji/win10/fist_left/2.png
new file mode 100644
index 00000000000..2c86532aebe
Binary files /dev/null and b/public/images/emoji/win10/fist_left/2.png differ
diff --git a/public/images/emoji/win10/fist_left/3.png b/public/images/emoji/win10/fist_left/3.png
new file mode 100644
index 00000000000..f7c3f6c98ba
Binary files /dev/null and b/public/images/emoji/win10/fist_left/3.png differ
diff --git a/public/images/emoji/win10/fist_left/4.png b/public/images/emoji/win10/fist_left/4.png
new file mode 100644
index 00000000000..55b1ed472b5
Binary files /dev/null and b/public/images/emoji/win10/fist_left/4.png differ
diff --git a/public/images/emoji/win10/fist_left/5.png b/public/images/emoji/win10/fist_left/5.png
new file mode 100644
index 00000000000..fd15cbfec16
Binary files /dev/null and b/public/images/emoji/win10/fist_left/5.png differ
diff --git a/public/images/emoji/win10/fist_left/6.png b/public/images/emoji/win10/fist_left/6.png
new file mode 100644
index 00000000000..fb90f8da452
Binary files /dev/null and b/public/images/emoji/win10/fist_left/6.png differ
diff --git a/public/images/emoji/win10/fist_right.png b/public/images/emoji/win10/fist_right.png
new file mode 100644
index 00000000000..1075d2a8d75
Binary files /dev/null and b/public/images/emoji/win10/fist_right.png differ
diff --git a/public/images/emoji/win10/fist_right/2.png b/public/images/emoji/win10/fist_right/2.png
new file mode 100644
index 00000000000..6599c83280d
Binary files /dev/null and b/public/images/emoji/win10/fist_right/2.png differ
diff --git a/public/images/emoji/win10/fist_right/3.png b/public/images/emoji/win10/fist_right/3.png
new file mode 100644
index 00000000000..14dee31207b
Binary files /dev/null and b/public/images/emoji/win10/fist_right/3.png differ
diff --git a/public/images/emoji/win10/fist_right/4.png b/public/images/emoji/win10/fist_right/4.png
new file mode 100644
index 00000000000..2c4433c9b6c
Binary files /dev/null and b/public/images/emoji/win10/fist_right/4.png differ
diff --git a/public/images/emoji/win10/fist_right/5.png b/public/images/emoji/win10/fist_right/5.png
new file mode 100644
index 00000000000..1914089b757
Binary files /dev/null and b/public/images/emoji/win10/fist_right/5.png differ
diff --git a/public/images/emoji/win10/fist_right/6.png b/public/images/emoji/win10/fist_right/6.png
new file mode 100644
index 00000000000..59a233c5f2c
Binary files /dev/null and b/public/images/emoji/win10/fist_right/6.png differ
diff --git a/public/images/emoji/win10/five.png b/public/images/emoji/win10/five.png
index 1e284bf610a..5c85432a268 100644
Binary files a/public/images/emoji/win10/five.png and b/public/images/emoji/win10/five.png differ
diff --git a/public/images/emoji/win10/flag_cn.png b/public/images/emoji/win10/flag_cn.png
index 646f950b500..67efed2e4d4 100644
Binary files a/public/images/emoji/win10/flag_cn.png and b/public/images/emoji/win10/flag_cn.png differ
diff --git a/public/images/emoji/win10/flag_de.png b/public/images/emoji/win10/flag_de.png
index 766c519bc8b..746bf11011c 100644
Binary files a/public/images/emoji/win10/flag_de.png and b/public/images/emoji/win10/flag_de.png differ
diff --git a/public/images/emoji/win10/flag_es.png b/public/images/emoji/win10/flag_es.png
index 7a4fce76b98..e0da30d5a6c 100644
Binary files a/public/images/emoji/win10/flag_es.png and b/public/images/emoji/win10/flag_es.png differ
diff --git a/public/images/emoji/win10/flag_fr.png b/public/images/emoji/win10/flag_fr.png
index ec24be1683d..7943b73f671 100644
Binary files a/public/images/emoji/win10/flag_fr.png and b/public/images/emoji/win10/flag_fr.png differ
diff --git a/public/images/emoji/win10/flag_gb.png b/public/images/emoji/win10/flag_gb.png
index 099c1c49f90..ad2a6622e47 100644
Binary files a/public/images/emoji/win10/flag_gb.png and b/public/images/emoji/win10/flag_gb.png differ
diff --git a/public/images/emoji/win10/flag_it.png b/public/images/emoji/win10/flag_it.png
index 72465f2f9d0..13bbb1b1f8d 100644
Binary files a/public/images/emoji/win10/flag_it.png and b/public/images/emoji/win10/flag_it.png differ
diff --git a/public/images/emoji/win10/flag_jp.png b/public/images/emoji/win10/flag_jp.png
index 157eb85d657..cca79ffb9dc 100644
Binary files a/public/images/emoji/win10/flag_jp.png and b/public/images/emoji/win10/flag_jp.png differ
diff --git a/public/images/emoji/win10/flag_kr.png b/public/images/emoji/win10/flag_kr.png
index f711c775b9a..82486f8812c 100644
Binary files a/public/images/emoji/win10/flag_kr.png and b/public/images/emoji/win10/flag_kr.png differ
diff --git a/public/images/emoji/win10/flag_ru.png b/public/images/emoji/win10/flag_ru.png
index 9b23019f392..3ecaefd941b 100644
Binary files a/public/images/emoji/win10/flag_ru.png and b/public/images/emoji/win10/flag_ru.png differ
diff --git a/public/images/emoji/win10/flag_us.png b/public/images/emoji/win10/flag_us.png
index b8aa8dd603b..450853eca47 100644
Binary files a/public/images/emoji/win10/flag_us.png and b/public/images/emoji/win10/flag_us.png differ
diff --git a/public/images/emoji/win10/fleur_de_lis.png b/public/images/emoji/win10/fleur_de_lis.png
new file mode 100644
index 00000000000..1c33f99fcb6
Binary files /dev/null and b/public/images/emoji/win10/fleur_de_lis.png differ
diff --git a/public/images/emoji/win10/flight_arrival.png b/public/images/emoji/win10/flight_arrival.png
new file mode 100644
index 00000000000..a173766ceff
Binary files /dev/null and b/public/images/emoji/win10/flight_arrival.png differ
diff --git a/public/images/emoji/win10/flight_departure.png b/public/images/emoji/win10/flight_departure.png
new file mode 100644
index 00000000000..94788d7f1be
Binary files /dev/null and b/public/images/emoji/win10/flight_departure.png differ
diff --git a/public/images/emoji/win10/flying_saucer.png b/public/images/emoji/win10/flying_saucer.png
new file mode 100644
index 00000000000..7d5c8628554
Binary files /dev/null and b/public/images/emoji/win10/flying_saucer.png differ
diff --git a/public/images/emoji/win10/fortune_cookie.png b/public/images/emoji/win10/fortune_cookie.png
new file mode 100644
index 00000000000..94a8cdca403
Binary files /dev/null and b/public/images/emoji/win10/fortune_cookie.png differ
diff --git a/public/images/emoji/win10/fountain_pen.png b/public/images/emoji/win10/fountain_pen.png
new file mode 100644
index 00000000000..aa1511a56cf
Binary files /dev/null and b/public/images/emoji/win10/fountain_pen.png differ
diff --git a/public/images/emoji/win10/four.png b/public/images/emoji/win10/four.png
index a5d7e4f82e7..3800d040764 100644
Binary files a/public/images/emoji/win10/four.png and b/public/images/emoji/win10/four.png differ
diff --git a/public/images/emoji/win10/fox_face.png b/public/images/emoji/win10/fox_face.png
new file mode 100644
index 00000000000..02e6d297b04
Binary files /dev/null and b/public/images/emoji/win10/fox_face.png differ
diff --git a/public/images/emoji/win10/fr.png b/public/images/emoji/win10/fr.png
index ec24be1683d..7943b73f671 100644
Binary files a/public/images/emoji/win10/fr.png and b/public/images/emoji/win10/fr.png differ
diff --git a/public/images/emoji/win10/framed_picture.png b/public/images/emoji/win10/framed_picture.png
new file mode 100644
index 00000000000..e6eff0fa6e2
Binary files /dev/null and b/public/images/emoji/win10/framed_picture.png differ
diff --git a/public/images/emoji/win10/french_guiana.png b/public/images/emoji/win10/french_guiana.png
new file mode 100644
index 00000000000..b67d58af241
Binary files /dev/null and b/public/images/emoji/win10/french_guiana.png differ
diff --git a/public/images/emoji/win10/french_polynesia.png b/public/images/emoji/win10/french_polynesia.png
new file mode 100644
index 00000000000..8e67281736f
Binary files /dev/null and b/public/images/emoji/win10/french_polynesia.png differ
diff --git a/public/images/emoji/win10/french_southern_territories.png b/public/images/emoji/win10/french_southern_territories.png
new file mode 100644
index 00000000000..ecc9bec0fa6
Binary files /dev/null and b/public/images/emoji/win10/french_southern_territories.png differ
diff --git a/public/images/emoji/win10/fried_egg.png b/public/images/emoji/win10/fried_egg.png
new file mode 100644
index 00000000000..42149092674
Binary files /dev/null and b/public/images/emoji/win10/fried_egg.png differ
diff --git a/public/images/emoji/win10/frowning_face.png b/public/images/emoji/win10/frowning_face.png
new file mode 100644
index 00000000000..4ec64d8ef59
Binary files /dev/null and b/public/images/emoji/win10/frowning_face.png differ
diff --git a/public/images/emoji/win10/frowning_man.png b/public/images/emoji/win10/frowning_man.png
new file mode 100644
index 00000000000..596c3de38aa
Binary files /dev/null and b/public/images/emoji/win10/frowning_man.png differ
diff --git a/public/images/emoji/win10/frowning_man/2.png b/public/images/emoji/win10/frowning_man/2.png
new file mode 100644
index 00000000000..fa79ccd5e0b
Binary files /dev/null and b/public/images/emoji/win10/frowning_man/2.png differ
diff --git a/public/images/emoji/win10/frowning_man/3.png b/public/images/emoji/win10/frowning_man/3.png
new file mode 100644
index 00000000000..3a4793ec935
Binary files /dev/null and b/public/images/emoji/win10/frowning_man/3.png differ
diff --git a/public/images/emoji/win10/frowning_man/4.png b/public/images/emoji/win10/frowning_man/4.png
new file mode 100644
index 00000000000..9701d81ee0a
Binary files /dev/null and b/public/images/emoji/win10/frowning_man/4.png differ
diff --git a/public/images/emoji/win10/frowning_man/5.png b/public/images/emoji/win10/frowning_man/5.png
new file mode 100644
index 00000000000..d13e351ce28
Binary files /dev/null and b/public/images/emoji/win10/frowning_man/5.png differ
diff --git a/public/images/emoji/win10/frowning_man/6.png b/public/images/emoji/win10/frowning_man/6.png
new file mode 100644
index 00000000000..93b558b50da
Binary files /dev/null and b/public/images/emoji/win10/frowning_man/6.png differ
diff --git a/public/images/emoji/win10/frowning_woman.png b/public/images/emoji/win10/frowning_woman.png
new file mode 100644
index 00000000000..925ebd2660a
Binary files /dev/null and b/public/images/emoji/win10/frowning_woman.png differ
diff --git a/public/images/emoji/win10/frowning_woman/2.png b/public/images/emoji/win10/frowning_woman/2.png
new file mode 100644
index 00000000000..f43aa390faf
Binary files /dev/null and b/public/images/emoji/win10/frowning_woman/2.png differ
diff --git a/public/images/emoji/win10/frowning_woman/3.png b/public/images/emoji/win10/frowning_woman/3.png
new file mode 100644
index 00000000000..b93713bc013
Binary files /dev/null and b/public/images/emoji/win10/frowning_woman/3.png differ
diff --git a/public/images/emoji/win10/frowning_woman/4.png b/public/images/emoji/win10/frowning_woman/4.png
new file mode 100644
index 00000000000..ab6e3557e90
Binary files /dev/null and b/public/images/emoji/win10/frowning_woman/4.png differ
diff --git a/public/images/emoji/win10/frowning_woman/5.png b/public/images/emoji/win10/frowning_woman/5.png
new file mode 100644
index 00000000000..72d4d6cf404
Binary files /dev/null and b/public/images/emoji/win10/frowning_woman/5.png differ
diff --git a/public/images/emoji/win10/frowning_woman/6.png b/public/images/emoji/win10/frowning_woman/6.png
new file mode 100644
index 00000000000..901ef717a78
Binary files /dev/null and b/public/images/emoji/win10/frowning_woman/6.png differ
diff --git a/public/images/emoji/win10/fu.png b/public/images/emoji/win10/fu.png
new file mode 100644
index 00000000000..ac5ed367d2d
Binary files /dev/null and b/public/images/emoji/win10/fu.png differ
diff --git a/public/images/emoji/win10/fu/2.png b/public/images/emoji/win10/fu/2.png
new file mode 100644
index 00000000000..fe6bdc07803
Binary files /dev/null and b/public/images/emoji/win10/fu/2.png differ
diff --git a/public/images/emoji/win10/fu/3.png b/public/images/emoji/win10/fu/3.png
new file mode 100644
index 00000000000..6e8798d3343
Binary files /dev/null and b/public/images/emoji/win10/fu/3.png differ
diff --git a/public/images/emoji/win10/fu/4.png b/public/images/emoji/win10/fu/4.png
new file mode 100644
index 00000000000..56655292b82
Binary files /dev/null and b/public/images/emoji/win10/fu/4.png differ
diff --git a/public/images/emoji/win10/fu/5.png b/public/images/emoji/win10/fu/5.png
new file mode 100644
index 00000000000..d7661ab8d5f
Binary files /dev/null and b/public/images/emoji/win10/fu/5.png differ
diff --git a/public/images/emoji/win10/fu/6.png b/public/images/emoji/win10/fu/6.png
new file mode 100644
index 00000000000..7f0c702f9f9
Binary files /dev/null and b/public/images/emoji/win10/fu/6.png differ
diff --git a/public/images/emoji/win10/gabon.png b/public/images/emoji/win10/gabon.png
new file mode 100644
index 00000000000..6563b2a69f0
Binary files /dev/null and b/public/images/emoji/win10/gabon.png differ
diff --git a/public/images/emoji/win10/gambia.png b/public/images/emoji/win10/gambia.png
new file mode 100644
index 00000000000..707ca2a121b
Binary files /dev/null and b/public/images/emoji/win10/gambia.png differ
diff --git a/public/images/emoji/win10/gb.png b/public/images/emoji/win10/gb.png
index 099c1c49f90..ad2a6622e47 100644
Binary files a/public/images/emoji/win10/gb.png and b/public/images/emoji/win10/gb.png differ
diff --git a/public/images/emoji/win10/genie.png b/public/images/emoji/win10/genie.png
new file mode 100644
index 00000000000..f0eddcc91ae
Binary files /dev/null and b/public/images/emoji/win10/genie.png differ
diff --git a/public/images/emoji/win10/georgia.png b/public/images/emoji/win10/georgia.png
new file mode 100644
index 00000000000..673f81ef6ff
Binary files /dev/null and b/public/images/emoji/win10/georgia.png differ
diff --git a/public/images/emoji/win10/ghana.png b/public/images/emoji/win10/ghana.png
new file mode 100644
index 00000000000..f1b8829dbab
Binary files /dev/null and b/public/images/emoji/win10/ghana.png differ
diff --git a/public/images/emoji/win10/gibraltar.png b/public/images/emoji/win10/gibraltar.png
new file mode 100644
index 00000000000..cbe9f11a125
Binary files /dev/null and b/public/images/emoji/win10/gibraltar.png differ
diff --git a/public/images/emoji/win10/giraffe.png b/public/images/emoji/win10/giraffe.png
new file mode 100644
index 00000000000..be0e85d2896
Binary files /dev/null and b/public/images/emoji/win10/giraffe.png differ
diff --git a/public/images/emoji/win10/girl/2.png b/public/images/emoji/win10/girl/2.png
new file mode 100644
index 00000000000..6eb9b6d7ee5
Binary files /dev/null and b/public/images/emoji/win10/girl/2.png differ
diff --git a/public/images/emoji/win10/girl/3.png b/public/images/emoji/win10/girl/3.png
new file mode 100644
index 00000000000..b06266afd72
Binary files /dev/null and b/public/images/emoji/win10/girl/3.png differ
diff --git a/public/images/emoji/win10/girl/4.png b/public/images/emoji/win10/girl/4.png
new file mode 100644
index 00000000000..9de95676903
Binary files /dev/null and b/public/images/emoji/win10/girl/4.png differ
diff --git a/public/images/emoji/win10/girl/5.png b/public/images/emoji/win10/girl/5.png
new file mode 100644
index 00000000000..0357f948a5e
Binary files /dev/null and b/public/images/emoji/win10/girl/5.png differ
diff --git a/public/images/emoji/win10/girl/6.png b/public/images/emoji/win10/girl/6.png
new file mode 100644
index 00000000000..3445626aaf8
Binary files /dev/null and b/public/images/emoji/win10/girl/6.png differ
diff --git a/public/images/emoji/win10/gloves.png b/public/images/emoji/win10/gloves.png
new file mode 100644
index 00000000000..1a11dd2c560
Binary files /dev/null and b/public/images/emoji/win10/gloves.png differ
diff --git a/public/images/emoji/win10/goal_net.png b/public/images/emoji/win10/goal_net.png
new file mode 100644
index 00000000000..2b504c06935
Binary files /dev/null and b/public/images/emoji/win10/goal_net.png differ
diff --git a/public/images/emoji/win10/golfer.png b/public/images/emoji/win10/golfer.png
index 47fc34cff10..aa07ecc1e1b 100644
Binary files a/public/images/emoji/win10/golfer.png and b/public/images/emoji/win10/golfer.png differ
diff --git a/public/images/emoji/win10/golfer/2.png b/public/images/emoji/win10/golfer/2.png
new file mode 100644
index 00000000000..a7c98bcfa73
Binary files /dev/null and b/public/images/emoji/win10/golfer/2.png differ
diff --git a/public/images/emoji/win10/golfer/3.png b/public/images/emoji/win10/golfer/3.png
new file mode 100644
index 00000000000..d465d903fbd
Binary files /dev/null and b/public/images/emoji/win10/golfer/3.png differ
diff --git a/public/images/emoji/win10/golfer/4.png b/public/images/emoji/win10/golfer/4.png
new file mode 100644
index 00000000000..1d90f601f52
Binary files /dev/null and b/public/images/emoji/win10/golfer/4.png differ
diff --git a/public/images/emoji/win10/golfer/5.png b/public/images/emoji/win10/golfer/5.png
new file mode 100644
index 00000000000..34581810df5
Binary files /dev/null and b/public/images/emoji/win10/golfer/5.png differ
diff --git a/public/images/emoji/win10/golfer/6.png b/public/images/emoji/win10/golfer/6.png
new file mode 100644
index 00000000000..a2636a1cf62
Binary files /dev/null and b/public/images/emoji/win10/golfer/6.png differ
diff --git a/public/images/emoji/win10/golfing_man.png b/public/images/emoji/win10/golfing_man.png
new file mode 100644
index 00000000000..aa07ecc1e1b
Binary files /dev/null and b/public/images/emoji/win10/golfing_man.png differ
diff --git a/public/images/emoji/win10/golfing_man/2.png b/public/images/emoji/win10/golfing_man/2.png
new file mode 100644
index 00000000000..a7c98bcfa73
Binary files /dev/null and b/public/images/emoji/win10/golfing_man/2.png differ
diff --git a/public/images/emoji/win10/golfing_man/3.png b/public/images/emoji/win10/golfing_man/3.png
new file mode 100644
index 00000000000..d465d903fbd
Binary files /dev/null and b/public/images/emoji/win10/golfing_man/3.png differ
diff --git a/public/images/emoji/win10/golfing_man/4.png b/public/images/emoji/win10/golfing_man/4.png
new file mode 100644
index 00000000000..1d90f601f52
Binary files /dev/null and b/public/images/emoji/win10/golfing_man/4.png differ
diff --git a/public/images/emoji/win10/golfing_man/5.png b/public/images/emoji/win10/golfing_man/5.png
new file mode 100644
index 00000000000..34581810df5
Binary files /dev/null and b/public/images/emoji/win10/golfing_man/5.png differ
diff --git a/public/images/emoji/win10/golfing_man/6.png b/public/images/emoji/win10/golfing_man/6.png
new file mode 100644
index 00000000000..a2636a1cf62
Binary files /dev/null and b/public/images/emoji/win10/golfing_man/6.png differ
diff --git a/public/images/emoji/win10/golfing_woman.png b/public/images/emoji/win10/golfing_woman.png
new file mode 100644
index 00000000000..a70839fa136
Binary files /dev/null and b/public/images/emoji/win10/golfing_woman.png differ
diff --git a/public/images/emoji/win10/gorilla.png b/public/images/emoji/win10/gorilla.png
new file mode 100644
index 00000000000..0d87c8c1ded
Binary files /dev/null and b/public/images/emoji/win10/gorilla.png differ
diff --git a/public/images/emoji/win10/grandma/2.png b/public/images/emoji/win10/grandma/2.png
new file mode 100644
index 00000000000..43e57aa73ac
Binary files /dev/null and b/public/images/emoji/win10/grandma/2.png differ
diff --git a/public/images/emoji/win10/grandma/3.png b/public/images/emoji/win10/grandma/3.png
new file mode 100644
index 00000000000..8f8c5f94b90
Binary files /dev/null and b/public/images/emoji/win10/grandma/3.png differ
diff --git a/public/images/emoji/win10/grandma/4.png b/public/images/emoji/win10/grandma/4.png
new file mode 100644
index 00000000000..a79d6f6935a
Binary files /dev/null and b/public/images/emoji/win10/grandma/4.png differ
diff --git a/public/images/emoji/win10/grandma/5.png b/public/images/emoji/win10/grandma/5.png
new file mode 100644
index 00000000000..38db39f385d
Binary files /dev/null and b/public/images/emoji/win10/grandma/5.png differ
diff --git a/public/images/emoji/win10/grandma/6.png b/public/images/emoji/win10/grandma/6.png
new file mode 100644
index 00000000000..afd9de68b5a
Binary files /dev/null and b/public/images/emoji/win10/grandma/6.png differ
diff --git a/public/images/emoji/win10/greece.png b/public/images/emoji/win10/greece.png
new file mode 100644
index 00000000000..c274ffb629c
Binary files /dev/null and b/public/images/emoji/win10/greece.png differ
diff --git a/public/images/emoji/win10/green_salad.png b/public/images/emoji/win10/green_salad.png
new file mode 100644
index 00000000000..354c43b176c
Binary files /dev/null and b/public/images/emoji/win10/green_salad.png differ
diff --git a/public/images/emoji/win10/greenland.png b/public/images/emoji/win10/greenland.png
new file mode 100644
index 00000000000..31c8707a434
Binary files /dev/null and b/public/images/emoji/win10/greenland.png differ
diff --git a/public/images/emoji/win10/grenada.png b/public/images/emoji/win10/grenada.png
new file mode 100644
index 00000000000..87f17a6ff22
Binary files /dev/null and b/public/images/emoji/win10/grenada.png differ
diff --git a/public/images/emoji/win10/guadeloupe.png b/public/images/emoji/win10/guadeloupe.png
new file mode 100644
index 00000000000..c9c437901df
Binary files /dev/null and b/public/images/emoji/win10/guadeloupe.png differ
diff --git a/public/images/emoji/win10/guam.png b/public/images/emoji/win10/guam.png
new file mode 100644
index 00000000000..d291c89c97c
Binary files /dev/null and b/public/images/emoji/win10/guam.png differ
diff --git a/public/images/emoji/win10/guardsman/2.png b/public/images/emoji/win10/guardsman/2.png
new file mode 100644
index 00000000000..989998e96d6
Binary files /dev/null and b/public/images/emoji/win10/guardsman/2.png differ
diff --git a/public/images/emoji/win10/guardsman/3.png b/public/images/emoji/win10/guardsman/3.png
new file mode 100644
index 00000000000..7face0a6723
Binary files /dev/null and b/public/images/emoji/win10/guardsman/3.png differ
diff --git a/public/images/emoji/win10/guardsman/4.png b/public/images/emoji/win10/guardsman/4.png
new file mode 100644
index 00000000000..6c029bdf97e
Binary files /dev/null and b/public/images/emoji/win10/guardsman/4.png differ
diff --git a/public/images/emoji/win10/guardsman/5.png b/public/images/emoji/win10/guardsman/5.png
new file mode 100644
index 00000000000..1b24ae62b28
Binary files /dev/null and b/public/images/emoji/win10/guardsman/5.png differ
diff --git a/public/images/emoji/win10/guardsman/6.png b/public/images/emoji/win10/guardsman/6.png
new file mode 100644
index 00000000000..34fdb89bbd4
Binary files /dev/null and b/public/images/emoji/win10/guardsman/6.png differ
diff --git a/public/images/emoji/win10/guardswoman.png b/public/images/emoji/win10/guardswoman.png
new file mode 100644
index 00000000000..44cb5e08543
Binary files /dev/null and b/public/images/emoji/win10/guardswoman.png differ
diff --git a/public/images/emoji/win10/guardswoman/2.png b/public/images/emoji/win10/guardswoman/2.png
new file mode 100644
index 00000000000..5c367842d04
Binary files /dev/null and b/public/images/emoji/win10/guardswoman/2.png differ
diff --git a/public/images/emoji/win10/guardswoman/3.png b/public/images/emoji/win10/guardswoman/3.png
new file mode 100644
index 00000000000..25998daf8bc
Binary files /dev/null and b/public/images/emoji/win10/guardswoman/3.png differ
diff --git a/public/images/emoji/win10/guardswoman/4.png b/public/images/emoji/win10/guardswoman/4.png
new file mode 100644
index 00000000000..9978559be51
Binary files /dev/null and b/public/images/emoji/win10/guardswoman/4.png differ
diff --git a/public/images/emoji/win10/guardswoman/5.png b/public/images/emoji/win10/guardswoman/5.png
new file mode 100644
index 00000000000..46588b09162
Binary files /dev/null and b/public/images/emoji/win10/guardswoman/5.png differ
diff --git a/public/images/emoji/win10/guardswoman/6.png b/public/images/emoji/win10/guardswoman/6.png
new file mode 100644
index 00000000000..37596de848a
Binary files /dev/null and b/public/images/emoji/win10/guardswoman/6.png differ
diff --git a/public/images/emoji/win10/guatemala.png b/public/images/emoji/win10/guatemala.png
new file mode 100644
index 00000000000..b7e7259bc83
Binary files /dev/null and b/public/images/emoji/win10/guatemala.png differ
diff --git a/public/images/emoji/win10/guernsey.png b/public/images/emoji/win10/guernsey.png
new file mode 100644
index 00000000000..f92e78a3246
Binary files /dev/null and b/public/images/emoji/win10/guernsey.png differ
diff --git a/public/images/emoji/win10/guinea.png b/public/images/emoji/win10/guinea.png
new file mode 100644
index 00000000000..dd1482188c6
Binary files /dev/null and b/public/images/emoji/win10/guinea.png differ
diff --git a/public/images/emoji/win10/guinea_bissau.png b/public/images/emoji/win10/guinea_bissau.png
new file mode 100644
index 00000000000..c2ab6fb5073
Binary files /dev/null and b/public/images/emoji/win10/guinea_bissau.png differ
diff --git a/public/images/emoji/win10/guyana.png b/public/images/emoji/win10/guyana.png
new file mode 100644
index 00000000000..2ceb411ad23
Binary files /dev/null and b/public/images/emoji/win10/guyana.png differ
diff --git a/public/images/emoji/win10/haircut/2.png b/public/images/emoji/win10/haircut/2.png
new file mode 100644
index 00000000000..fd9bc6b643a
Binary files /dev/null and b/public/images/emoji/win10/haircut/2.png differ
diff --git a/public/images/emoji/win10/haircut/3.png b/public/images/emoji/win10/haircut/3.png
new file mode 100644
index 00000000000..fbf274a6db3
Binary files /dev/null and b/public/images/emoji/win10/haircut/3.png differ
diff --git a/public/images/emoji/win10/haircut/4.png b/public/images/emoji/win10/haircut/4.png
new file mode 100644
index 00000000000..02525ee727c
Binary files /dev/null and b/public/images/emoji/win10/haircut/4.png differ
diff --git a/public/images/emoji/win10/haircut/5.png b/public/images/emoji/win10/haircut/5.png
new file mode 100644
index 00000000000..22f5d039ece
Binary files /dev/null and b/public/images/emoji/win10/haircut/5.png differ
diff --git a/public/images/emoji/win10/haircut/6.png b/public/images/emoji/win10/haircut/6.png
new file mode 100644
index 00000000000..de404b58c92
Binary files /dev/null and b/public/images/emoji/win10/haircut/6.png differ
diff --git a/public/images/emoji/win10/haircut_man.png b/public/images/emoji/win10/haircut_man.png
new file mode 100644
index 00000000000..081dc539c47
Binary files /dev/null and b/public/images/emoji/win10/haircut_man.png differ
diff --git a/public/images/emoji/win10/haircut_man/2.png b/public/images/emoji/win10/haircut_man/2.png
new file mode 100644
index 00000000000..461d6b961d6
Binary files /dev/null and b/public/images/emoji/win10/haircut_man/2.png differ
diff --git a/public/images/emoji/win10/haircut_man/3.png b/public/images/emoji/win10/haircut_man/3.png
new file mode 100644
index 00000000000..c6b92d608f0
Binary files /dev/null and b/public/images/emoji/win10/haircut_man/3.png differ
diff --git a/public/images/emoji/win10/haircut_man/4.png b/public/images/emoji/win10/haircut_man/4.png
new file mode 100644
index 00000000000..8998b79e774
Binary files /dev/null and b/public/images/emoji/win10/haircut_man/4.png differ
diff --git a/public/images/emoji/win10/haircut_man/5.png b/public/images/emoji/win10/haircut_man/5.png
new file mode 100644
index 00000000000..38b68acaa21
Binary files /dev/null and b/public/images/emoji/win10/haircut_man/5.png differ
diff --git a/public/images/emoji/win10/haircut_man/6.png b/public/images/emoji/win10/haircut_man/6.png
new file mode 100644
index 00000000000..61c0c58eb56
Binary files /dev/null and b/public/images/emoji/win10/haircut_man/6.png differ
diff --git a/public/images/emoji/win10/haircut_woman.png b/public/images/emoji/win10/haircut_woman.png
new file mode 100644
index 00000000000..b1ba7f551d7
Binary files /dev/null and b/public/images/emoji/win10/haircut_woman.png differ
diff --git a/public/images/emoji/win10/haircut_woman/2.png b/public/images/emoji/win10/haircut_woman/2.png
new file mode 100644
index 00000000000..fd9bc6b643a
Binary files /dev/null and b/public/images/emoji/win10/haircut_woman/2.png differ
diff --git a/public/images/emoji/win10/haircut_woman/3.png b/public/images/emoji/win10/haircut_woman/3.png
new file mode 100644
index 00000000000..fbf274a6db3
Binary files /dev/null and b/public/images/emoji/win10/haircut_woman/3.png differ
diff --git a/public/images/emoji/win10/haircut_woman/4.png b/public/images/emoji/win10/haircut_woman/4.png
new file mode 100644
index 00000000000..02525ee727c
Binary files /dev/null and b/public/images/emoji/win10/haircut_woman/4.png differ
diff --git a/public/images/emoji/win10/haircut_woman/5.png b/public/images/emoji/win10/haircut_woman/5.png
new file mode 100644
index 00000000000..22f5d039ece
Binary files /dev/null and b/public/images/emoji/win10/haircut_woman/5.png differ
diff --git a/public/images/emoji/win10/haircut_woman/6.png b/public/images/emoji/win10/haircut_woman/6.png
new file mode 100644
index 00000000000..de404b58c92
Binary files /dev/null and b/public/images/emoji/win10/haircut_woman/6.png differ
diff --git a/public/images/emoji/win10/haiti.png b/public/images/emoji/win10/haiti.png
new file mode 100644
index 00000000000..53d2160f9a6
Binary files /dev/null and b/public/images/emoji/win10/haiti.png differ
diff --git a/public/images/emoji/win10/hand.png b/public/images/emoji/win10/hand.png
new file mode 100644
index 00000000000..17390989cc5
Binary files /dev/null and b/public/images/emoji/win10/hand.png differ
diff --git a/public/images/emoji/win10/hand/2.png b/public/images/emoji/win10/hand/2.png
new file mode 100644
index 00000000000..d78d8500561
Binary files /dev/null and b/public/images/emoji/win10/hand/2.png differ
diff --git a/public/images/emoji/win10/hand/3.png b/public/images/emoji/win10/hand/3.png
new file mode 100644
index 00000000000..bafed3922df
Binary files /dev/null and b/public/images/emoji/win10/hand/3.png differ
diff --git a/public/images/emoji/win10/hand/4.png b/public/images/emoji/win10/hand/4.png
new file mode 100644
index 00000000000..a516ef4e230
Binary files /dev/null and b/public/images/emoji/win10/hand/4.png differ
diff --git a/public/images/emoji/win10/hand/5.png b/public/images/emoji/win10/hand/5.png
new file mode 100644
index 00000000000..71b2ea504a4
Binary files /dev/null and b/public/images/emoji/win10/hand/5.png differ
diff --git a/public/images/emoji/win10/hand/6.png b/public/images/emoji/win10/hand/6.png
new file mode 100644
index 00000000000..46ea5b4e64c
Binary files /dev/null and b/public/images/emoji/win10/hand/6.png differ
diff --git a/public/images/emoji/win10/hand_splayed/2.png b/public/images/emoji/win10/hand_splayed/2.png
new file mode 100644
index 00000000000..f3267a72e5d
Binary files /dev/null and b/public/images/emoji/win10/hand_splayed/2.png differ
diff --git a/public/images/emoji/win10/hand_splayed/3.png b/public/images/emoji/win10/hand_splayed/3.png
new file mode 100644
index 00000000000..f184eba9115
Binary files /dev/null and b/public/images/emoji/win10/hand_splayed/3.png differ
diff --git a/public/images/emoji/win10/hand_splayed/4.png b/public/images/emoji/win10/hand_splayed/4.png
new file mode 100644
index 00000000000..355b8ac9316
Binary files /dev/null and b/public/images/emoji/win10/hand_splayed/4.png differ
diff --git a/public/images/emoji/win10/hand_splayed/5.png b/public/images/emoji/win10/hand_splayed/5.png
new file mode 100644
index 00000000000..6cfb97ebd14
Binary files /dev/null and b/public/images/emoji/win10/hand_splayed/5.png differ
diff --git a/public/images/emoji/win10/hand_splayed/6.png b/public/images/emoji/win10/hand_splayed/6.png
new file mode 100644
index 00000000000..35a9c3a1b31
Binary files /dev/null and b/public/images/emoji/win10/hand_splayed/6.png differ
diff --git a/public/images/emoji/win10/handshake.png b/public/images/emoji/win10/handshake.png
new file mode 100644
index 00000000000..d3885d60c2b
Binary files /dev/null and b/public/images/emoji/win10/handshake.png differ
diff --git a/public/images/emoji/win10/hash.png b/public/images/emoji/win10/hash.png
index 7d06801e1f5..64f9f559649 100644
Binary files a/public/images/emoji/win10/hash.png and b/public/images/emoji/win10/hash.png differ
diff --git a/public/images/emoji/win10/heard_and_mc_donald_islands.png b/public/images/emoji/win10/heard_and_mc_donald_islands.png
new file mode 100644
index 00000000000..1b5bf7b178f
Binary files /dev/null and b/public/images/emoji/win10/heard_and_mc_donald_islands.png differ
diff --git a/public/images/emoji/win10/heavy_heart_exclamation.png b/public/images/emoji/win10/heavy_heart_exclamation.png
new file mode 100644
index 00000000000..57971277add
Binary files /dev/null and b/public/images/emoji/win10/heavy_heart_exclamation.png differ
diff --git a/public/images/emoji/win10/hedgehog.png b/public/images/emoji/win10/hedgehog.png
new file mode 100644
index 00000000000..9b978b35407
Binary files /dev/null and b/public/images/emoji/win10/hedgehog.png differ
diff --git a/public/images/emoji/win10/helmet_with_cross.png b/public/images/emoji/win10/helmet_with_cross.png
index 15d6b81ca55..79e1a5801c1 100644
Binary files a/public/images/emoji/win10/helmet_with_cross.png and b/public/images/emoji/win10/helmet_with_cross.png differ
diff --git a/public/images/emoji/win10/helmet_with_white_cross.png b/public/images/emoji/win10/helmet_with_white_cross.png
index 15d6b81ca55..79e1a5801c1 100644
Binary files a/public/images/emoji/win10/helmet_with_white_cross.png and b/public/images/emoji/win10/helmet_with_white_cross.png differ
diff --git a/public/images/emoji/win10/hocho.png b/public/images/emoji/win10/hocho.png
new file mode 100644
index 00000000000..d62692abb8f
Binary files /dev/null and b/public/images/emoji/win10/hocho.png differ
diff --git a/public/images/emoji/win10/honduras.png b/public/images/emoji/win10/honduras.png
new file mode 100644
index 00000000000..d0aff11833e
Binary files /dev/null and b/public/images/emoji/win10/honduras.png differ
diff --git a/public/images/emoji/win10/honeybee.png b/public/images/emoji/win10/honeybee.png
new file mode 100644
index 00000000000..6b08780115a
Binary files /dev/null and b/public/images/emoji/win10/honeybee.png differ
diff --git a/public/images/emoji/win10/hong_kong.png b/public/images/emoji/win10/hong_kong.png
new file mode 100644
index 00000000000..9db8cbc1023
Binary files /dev/null and b/public/images/emoji/win10/hong_kong.png differ
diff --git a/public/images/emoji/win10/horse_racing/2.png b/public/images/emoji/win10/horse_racing/2.png
new file mode 100644
index 00000000000..4f54540b562
Binary files /dev/null and b/public/images/emoji/win10/horse_racing/2.png differ
diff --git a/public/images/emoji/win10/horse_racing/3.png b/public/images/emoji/win10/horse_racing/3.png
new file mode 100644
index 00000000000..83c9be9dfde
Binary files /dev/null and b/public/images/emoji/win10/horse_racing/3.png differ
diff --git a/public/images/emoji/win10/horse_racing/4.png b/public/images/emoji/win10/horse_racing/4.png
new file mode 100644
index 00000000000..28780497997
Binary files /dev/null and b/public/images/emoji/win10/horse_racing/4.png differ
diff --git a/public/images/emoji/win10/horse_racing/5.png b/public/images/emoji/win10/horse_racing/5.png
new file mode 100644
index 00000000000..6f1cdd7e881
Binary files /dev/null and b/public/images/emoji/win10/horse_racing/5.png differ
diff --git a/public/images/emoji/win10/horse_racing/6.png b/public/images/emoji/win10/horse_racing/6.png
new file mode 100644
index 00000000000..bea56a3899c
Binary files /dev/null and b/public/images/emoji/win10/horse_racing/6.png differ
diff --git a/public/images/emoji/win10/houses.png b/public/images/emoji/win10/houses.png
new file mode 100644
index 00000000000..41bc48e972b
Binary files /dev/null and b/public/images/emoji/win10/houses.png differ
diff --git a/public/images/emoji/win10/hugs.png b/public/images/emoji/win10/hugs.png
new file mode 100644
index 00000000000..a48b73e97b0
Binary files /dev/null and b/public/images/emoji/win10/hugs.png differ
diff --git a/public/images/emoji/win10/hungary.png b/public/images/emoji/win10/hungary.png
new file mode 100644
index 00000000000..98963a97c99
Binary files /dev/null and b/public/images/emoji/win10/hungary.png differ
diff --git a/public/images/emoji/win10/ice_hockey.png b/public/images/emoji/win10/ice_hockey.png
new file mode 100644
index 00000000000..f47c9cd731a
Binary files /dev/null and b/public/images/emoji/win10/ice_hockey.png differ
diff --git a/public/images/emoji/win10/iceland.png b/public/images/emoji/win10/iceland.png
new file mode 100644
index 00000000000..399f5a4e85d
Binary files /dev/null and b/public/images/emoji/win10/iceland.png differ
diff --git a/public/images/emoji/win10/india.png b/public/images/emoji/win10/india.png
new file mode 100644
index 00000000000..b95563b7877
Binary files /dev/null and b/public/images/emoji/win10/india.png differ
diff --git a/public/images/emoji/win10/indonesia.png b/public/images/emoji/win10/indonesia.png
new file mode 100644
index 00000000000..09e63e6b9f8
Binary files /dev/null and b/public/images/emoji/win10/indonesia.png differ
diff --git a/public/images/emoji/win10/information_desk_person/2.png b/public/images/emoji/win10/information_desk_person/2.png
new file mode 100644
index 00000000000..673badf70bf
Binary files /dev/null and b/public/images/emoji/win10/information_desk_person/2.png differ
diff --git a/public/images/emoji/win10/information_desk_person/3.png b/public/images/emoji/win10/information_desk_person/3.png
new file mode 100644
index 00000000000..8f7692e6390
Binary files /dev/null and b/public/images/emoji/win10/information_desk_person/3.png differ
diff --git a/public/images/emoji/win10/information_desk_person/4.png b/public/images/emoji/win10/information_desk_person/4.png
new file mode 100644
index 00000000000..40faf9cee0f
Binary files /dev/null and b/public/images/emoji/win10/information_desk_person/4.png differ
diff --git a/public/images/emoji/win10/information_desk_person/5.png b/public/images/emoji/win10/information_desk_person/5.png
new file mode 100644
index 00000000000..5e457453b5a
Binary files /dev/null and b/public/images/emoji/win10/information_desk_person/5.png differ
diff --git a/public/images/emoji/win10/information_desk_person/6.png b/public/images/emoji/win10/information_desk_person/6.png
new file mode 100644
index 00000000000..3d86515ba99
Binary files /dev/null and b/public/images/emoji/win10/information_desk_person/6.png differ
diff --git a/public/images/emoji/win10/iran.png b/public/images/emoji/win10/iran.png
new file mode 100644
index 00000000000..e30df4c1f50
Binary files /dev/null and b/public/images/emoji/win10/iran.png differ
diff --git a/public/images/emoji/win10/iraq.png b/public/images/emoji/win10/iraq.png
new file mode 100644
index 00000000000..cccd140ba3c
Binary files /dev/null and b/public/images/emoji/win10/iraq.png differ
diff --git a/public/images/emoji/win10/ireland.png b/public/images/emoji/win10/ireland.png
new file mode 100644
index 00000000000..b97ecbcbd48
Binary files /dev/null and b/public/images/emoji/win10/ireland.png differ
diff --git a/public/images/emoji/win10/isle_of_man.png b/public/images/emoji/win10/isle_of_man.png
new file mode 100644
index 00000000000..7829f538f8e
Binary files /dev/null and b/public/images/emoji/win10/isle_of_man.png differ
diff --git a/public/images/emoji/win10/israel.png b/public/images/emoji/win10/israel.png
new file mode 100644
index 00000000000..f7bc67925db
Binary files /dev/null and b/public/images/emoji/win10/israel.png differ
diff --git a/public/images/emoji/win10/it.png b/public/images/emoji/win10/it.png
index 72465f2f9d0..13bbb1b1f8d 100644
Binary files a/public/images/emoji/win10/it.png and b/public/images/emoji/win10/it.png differ
diff --git a/public/images/emoji/win10/jamaica.png b/public/images/emoji/win10/jamaica.png
new file mode 100644
index 00000000000..dc2c8075112
Binary files /dev/null and b/public/images/emoji/win10/jamaica.png differ
diff --git a/public/images/emoji/win10/jersey.png b/public/images/emoji/win10/jersey.png
new file mode 100644
index 00000000000..adfdbc3c1a6
Binary files /dev/null and b/public/images/emoji/win10/jersey.png differ
diff --git a/public/images/emoji/win10/jordan.png b/public/images/emoji/win10/jordan.png
new file mode 100644
index 00000000000..43a2f9139f4
Binary files /dev/null and b/public/images/emoji/win10/jordan.png differ
diff --git a/public/images/emoji/win10/jp.png b/public/images/emoji/win10/jp.png
index 157eb85d657..cca79ffb9dc 100644
Binary files a/public/images/emoji/win10/jp.png and b/public/images/emoji/win10/jp.png differ
diff --git a/public/images/emoji/win10/kazakhstan.png b/public/images/emoji/win10/kazakhstan.png
new file mode 100644
index 00000000000..731858e2cfa
Binary files /dev/null and b/public/images/emoji/win10/kazakhstan.png differ
diff --git a/public/images/emoji/win10/kenya.png b/public/images/emoji/win10/kenya.png
new file mode 100644
index 00000000000..cc55fd69815
Binary files /dev/null and b/public/images/emoji/win10/kenya.png differ
diff --git a/public/images/emoji/win10/keycap_star.png b/public/images/emoji/win10/keycap_star.png
index e69de29bb2d..f847acf58c4 100644
Binary files a/public/images/emoji/win10/keycap_star.png and b/public/images/emoji/win10/keycap_star.png differ
diff --git a/public/images/emoji/win10/keycap_ten.png b/public/images/emoji/win10/keycap_ten.png
new file mode 100644
index 00000000000..22f61b5a84f
Binary files /dev/null and b/public/images/emoji/win10/keycap_ten.png differ
diff --git a/public/images/emoji/win10/kick_scooter.png b/public/images/emoji/win10/kick_scooter.png
new file mode 100644
index 00000000000..4415b232820
Binary files /dev/null and b/public/images/emoji/win10/kick_scooter.png differ
diff --git a/public/images/emoji/win10/kiribati.png b/public/images/emoji/win10/kiribati.png
new file mode 100644
index 00000000000..138fd3f2b5b
Binary files /dev/null and b/public/images/emoji/win10/kiribati.png differ
diff --git a/public/images/emoji/win10/kiwi_fruit.png b/public/images/emoji/win10/kiwi_fruit.png
new file mode 100644
index 00000000000..e597ed22d94
Binary files /dev/null and b/public/images/emoji/win10/kiwi_fruit.png differ
diff --git a/public/images/emoji/win10/kosovo.png b/public/images/emoji/win10/kosovo.png
new file mode 100644
index 00000000000..efea0b70bde
Binary files /dev/null and b/public/images/emoji/win10/kosovo.png differ
diff --git a/public/images/emoji/win10/kr.png b/public/images/emoji/win10/kr.png
index f711c775b9a..82486f8812c 100644
Binary files a/public/images/emoji/win10/kr.png and b/public/images/emoji/win10/kr.png differ
diff --git a/public/images/emoji/win10/kuwait.png b/public/images/emoji/win10/kuwait.png
new file mode 100644
index 00000000000..32b00e4806d
Binary files /dev/null and b/public/images/emoji/win10/kuwait.png differ
diff --git a/public/images/emoji/win10/kyrgyzstan.png b/public/images/emoji/win10/kyrgyzstan.png
new file mode 100644
index 00000000000..6ecfc717c9b
Binary files /dev/null and b/public/images/emoji/win10/kyrgyzstan.png differ
diff --git a/public/images/emoji/win10/laos.png b/public/images/emoji/win10/laos.png
new file mode 100644
index 00000000000..5dca502f80e
Binary files /dev/null and b/public/images/emoji/win10/laos.png differ
diff --git a/public/images/emoji/win10/latvia.png b/public/images/emoji/win10/latvia.png
new file mode 100644
index 00000000000..a23d4c4e2e6
Binary files /dev/null and b/public/images/emoji/win10/latvia.png differ
diff --git a/public/images/emoji/win10/lebanon.png b/public/images/emoji/win10/lebanon.png
new file mode 100644
index 00000000000..5b8710dfd72
Binary files /dev/null and b/public/images/emoji/win10/lebanon.png differ
diff --git a/public/images/emoji/win10/lesotho.png b/public/images/emoji/win10/lesotho.png
new file mode 100644
index 00000000000..136ea59d3dc
Binary files /dev/null and b/public/images/emoji/win10/lesotho.png differ
diff --git a/public/images/emoji/win10/levitate.png b/public/images/emoji/win10/levitate.png
index 0d66bb13e50..e7546fc1e00 100644
Binary files a/public/images/emoji/win10/levitate.png and b/public/images/emoji/win10/levitate.png differ
diff --git a/public/images/emoji/win10/levitate/2.png b/public/images/emoji/win10/levitate/2.png
new file mode 100644
index 00000000000..de379247570
Binary files /dev/null and b/public/images/emoji/win10/levitate/2.png differ
diff --git a/public/images/emoji/win10/levitate/3.png b/public/images/emoji/win10/levitate/3.png
new file mode 100644
index 00000000000..8da714140ef
Binary files /dev/null and b/public/images/emoji/win10/levitate/3.png differ
diff --git a/public/images/emoji/win10/levitate/4.png b/public/images/emoji/win10/levitate/4.png
new file mode 100644
index 00000000000..2a26043c96c
Binary files /dev/null and b/public/images/emoji/win10/levitate/4.png differ
diff --git a/public/images/emoji/win10/levitate/5.png b/public/images/emoji/win10/levitate/5.png
new file mode 100644
index 00000000000..f38a2f93340
Binary files /dev/null and b/public/images/emoji/win10/levitate/5.png differ
diff --git a/public/images/emoji/win10/levitate/6.png b/public/images/emoji/win10/levitate/6.png
new file mode 100644
index 00000000000..030123a63ee
Binary files /dev/null and b/public/images/emoji/win10/levitate/6.png differ
diff --git a/public/images/emoji/win10/liberia.png b/public/images/emoji/win10/liberia.png
new file mode 100644
index 00000000000..2828cee4c87
Binary files /dev/null and b/public/images/emoji/win10/liberia.png differ
diff --git a/public/images/emoji/win10/libya.png b/public/images/emoji/win10/libya.png
new file mode 100644
index 00000000000..a6c90e15d4f
Binary files /dev/null and b/public/images/emoji/win10/libya.png differ
diff --git a/public/images/emoji/win10/liechtenstein.png b/public/images/emoji/win10/liechtenstein.png
new file mode 100644
index 00000000000..93605ebfd57
Binary files /dev/null and b/public/images/emoji/win10/liechtenstein.png differ
diff --git a/public/images/emoji/win10/lifter.png b/public/images/emoji/win10/lifter.png
index 8e05683be02..8251adfa58c 100644
Binary files a/public/images/emoji/win10/lifter.png and b/public/images/emoji/win10/lifter.png differ
diff --git a/public/images/emoji/win10/lifter/2.png b/public/images/emoji/win10/lifter/2.png
new file mode 100644
index 00000000000..da2c03eea22
Binary files /dev/null and b/public/images/emoji/win10/lifter/2.png differ
diff --git a/public/images/emoji/win10/lifter/3.png b/public/images/emoji/win10/lifter/3.png
new file mode 100644
index 00000000000..5cdaedeab1f
Binary files /dev/null and b/public/images/emoji/win10/lifter/3.png differ
diff --git a/public/images/emoji/win10/lifter/4.png b/public/images/emoji/win10/lifter/4.png
new file mode 100644
index 00000000000..2eeab22dca2
Binary files /dev/null and b/public/images/emoji/win10/lifter/4.png differ
diff --git a/public/images/emoji/win10/lifter/5.png b/public/images/emoji/win10/lifter/5.png
new file mode 100644
index 00000000000..e5ae4eb943a
Binary files /dev/null and b/public/images/emoji/win10/lifter/5.png differ
diff --git a/public/images/emoji/win10/lifter/6.png b/public/images/emoji/win10/lifter/6.png
new file mode 100644
index 00000000000..9e7a027f6b6
Binary files /dev/null and b/public/images/emoji/win10/lifter/6.png differ
diff --git a/public/images/emoji/win10/lithuania.png b/public/images/emoji/win10/lithuania.png
new file mode 100644
index 00000000000..d4e7e6766a2
Binary files /dev/null and b/public/images/emoji/win10/lithuania.png differ
diff --git a/public/images/emoji/win10/lizard.png b/public/images/emoji/win10/lizard.png
new file mode 100644
index 00000000000..55498139323
Binary files /dev/null and b/public/images/emoji/win10/lizard.png differ
diff --git a/public/images/emoji/win10/love_you_gesture.png b/public/images/emoji/win10/love_you_gesture.png
new file mode 100644
index 00000000000..14ef7c72b20
Binary files /dev/null and b/public/images/emoji/win10/love_you_gesture.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/2.png b/public/images/emoji/win10/love_you_gesture/2.png
new file mode 100644
index 00000000000..b70217e894c
Binary files /dev/null and b/public/images/emoji/win10/love_you_gesture/2.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/3.png b/public/images/emoji/win10/love_you_gesture/3.png
new file mode 100644
index 00000000000..aa984ea9263
Binary files /dev/null and b/public/images/emoji/win10/love_you_gesture/3.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/4.png b/public/images/emoji/win10/love_you_gesture/4.png
new file mode 100644
index 00000000000..5decb0e8008
Binary files /dev/null and b/public/images/emoji/win10/love_you_gesture/4.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/5.png b/public/images/emoji/win10/love_you_gesture/5.png
new file mode 100644
index 00000000000..e0bb218cc08
Binary files /dev/null and b/public/images/emoji/win10/love_you_gesture/5.png differ
diff --git a/public/images/emoji/win10/love_you_gesture/6.png b/public/images/emoji/win10/love_you_gesture/6.png
new file mode 100644
index 00000000000..bb51bde8bbd
Binary files /dev/null and b/public/images/emoji/win10/love_you_gesture/6.png differ
diff --git a/public/images/emoji/win10/luxembourg.png b/public/images/emoji/win10/luxembourg.png
new file mode 100644
index 00000000000..a8c6737d1b6
Binary files /dev/null and b/public/images/emoji/win10/luxembourg.png differ
diff --git a/public/images/emoji/win10/lying_face.png b/public/images/emoji/win10/lying_face.png
new file mode 100644
index 00000000000..dedcbab92e4
Binary files /dev/null and b/public/images/emoji/win10/lying_face.png differ
diff --git a/public/images/emoji/win10/macau.png b/public/images/emoji/win10/macau.png
new file mode 100644
index 00000000000..70620e1d545
Binary files /dev/null and b/public/images/emoji/win10/macau.png differ
diff --git a/public/images/emoji/win10/macedonia.png b/public/images/emoji/win10/macedonia.png
new file mode 100644
index 00000000000..a4c8ef41d2f
Binary files /dev/null and b/public/images/emoji/win10/macedonia.png differ
diff --git a/public/images/emoji/win10/madagascar.png b/public/images/emoji/win10/madagascar.png
new file mode 100644
index 00000000000..708ec7416ce
Binary files /dev/null and b/public/images/emoji/win10/madagascar.png differ
diff --git a/public/images/emoji/win10/mag.png b/public/images/emoji/win10/mag.png
index bbf7459e253..9ed9210f3ac 100644
Binary files a/public/images/emoji/win10/mag.png and b/public/images/emoji/win10/mag.png differ
diff --git a/public/images/emoji/win10/mag_right.png b/public/images/emoji/win10/mag_right.png
index 65ae1c697b5..c6b0bb5a77f 100644
Binary files a/public/images/emoji/win10/mag_right.png and b/public/images/emoji/win10/mag_right.png differ
diff --git a/public/images/emoji/win10/mage.png b/public/images/emoji/win10/mage.png
new file mode 100644
index 00000000000..71c1b13f924
Binary files /dev/null and b/public/images/emoji/win10/mage.png differ
diff --git a/public/images/emoji/win10/mage/2.png b/public/images/emoji/win10/mage/2.png
new file mode 100644
index 00000000000..823f6843fad
Binary files /dev/null and b/public/images/emoji/win10/mage/2.png differ
diff --git a/public/images/emoji/win10/mage/3.png b/public/images/emoji/win10/mage/3.png
new file mode 100644
index 00000000000..c2ff6622a04
Binary files /dev/null and b/public/images/emoji/win10/mage/3.png differ
diff --git a/public/images/emoji/win10/mage/4.png b/public/images/emoji/win10/mage/4.png
new file mode 100644
index 00000000000..76d0a52e374
Binary files /dev/null and b/public/images/emoji/win10/mage/4.png differ
diff --git a/public/images/emoji/win10/mage/5.png b/public/images/emoji/win10/mage/5.png
new file mode 100644
index 00000000000..ddb5de55806
Binary files /dev/null and b/public/images/emoji/win10/mage/5.png differ
diff --git a/public/images/emoji/win10/mage/6.png b/public/images/emoji/win10/mage/6.png
new file mode 100644
index 00000000000..302dd62dfb3
Binary files /dev/null and b/public/images/emoji/win10/mage/6.png differ
diff --git a/public/images/emoji/win10/malawi.png b/public/images/emoji/win10/malawi.png
new file mode 100644
index 00000000000..854fd4ce854
Binary files /dev/null and b/public/images/emoji/win10/malawi.png differ
diff --git a/public/images/emoji/win10/malaysia.png b/public/images/emoji/win10/malaysia.png
new file mode 100644
index 00000000000..13137b15ad8
Binary files /dev/null and b/public/images/emoji/win10/malaysia.png differ
diff --git a/public/images/emoji/win10/maldives.png b/public/images/emoji/win10/maldives.png
new file mode 100644
index 00000000000..e0fec7e04b4
Binary files /dev/null and b/public/images/emoji/win10/maldives.png differ
diff --git a/public/images/emoji/win10/male_detective.png b/public/images/emoji/win10/male_detective.png
new file mode 100644
index 00000000000..625c4ee8139
Binary files /dev/null and b/public/images/emoji/win10/male_detective.png differ
diff --git a/public/images/emoji/win10/male_detective/2.png b/public/images/emoji/win10/male_detective/2.png
new file mode 100644
index 00000000000..2e3b2bed292
Binary files /dev/null and b/public/images/emoji/win10/male_detective/2.png differ
diff --git a/public/images/emoji/win10/male_detective/3.png b/public/images/emoji/win10/male_detective/3.png
new file mode 100644
index 00000000000..f434db9e086
Binary files /dev/null and b/public/images/emoji/win10/male_detective/3.png differ
diff --git a/public/images/emoji/win10/male_detective/4.png b/public/images/emoji/win10/male_detective/4.png
new file mode 100644
index 00000000000..18e8b564e06
Binary files /dev/null and b/public/images/emoji/win10/male_detective/4.png differ
diff --git a/public/images/emoji/win10/male_detective/5.png b/public/images/emoji/win10/male_detective/5.png
new file mode 100644
index 00000000000..97c22cf8796
Binary files /dev/null and b/public/images/emoji/win10/male_detective/5.png differ
diff --git a/public/images/emoji/win10/male_detective/6.png b/public/images/emoji/win10/male_detective/6.png
new file mode 100644
index 00000000000..38b339fd02b
Binary files /dev/null and b/public/images/emoji/win10/male_detective/6.png differ
diff --git a/public/images/emoji/win10/mali.png b/public/images/emoji/win10/mali.png
new file mode 100644
index 00000000000..ef19c197c7b
Binary files /dev/null and b/public/images/emoji/win10/mali.png differ
diff --git a/public/images/emoji/win10/malta.png b/public/images/emoji/win10/malta.png
new file mode 100644
index 00000000000..f6850d62764
Binary files /dev/null and b/public/images/emoji/win10/malta.png differ
diff --git a/public/images/emoji/win10/man/2.png b/public/images/emoji/win10/man/2.png
new file mode 100644
index 00000000000..c3dd71d6d65
Binary files /dev/null and b/public/images/emoji/win10/man/2.png differ
diff --git a/public/images/emoji/win10/man/3.png b/public/images/emoji/win10/man/3.png
new file mode 100644
index 00000000000..622a55db3bc
Binary files /dev/null and b/public/images/emoji/win10/man/3.png differ
diff --git a/public/images/emoji/win10/man/4.png b/public/images/emoji/win10/man/4.png
new file mode 100644
index 00000000000..c8328bcd9cb
Binary files /dev/null and b/public/images/emoji/win10/man/4.png differ
diff --git a/public/images/emoji/win10/man/5.png b/public/images/emoji/win10/man/5.png
new file mode 100644
index 00000000000..b3551423f9e
Binary files /dev/null and b/public/images/emoji/win10/man/5.png differ
diff --git a/public/images/emoji/win10/man/6.png b/public/images/emoji/win10/man/6.png
new file mode 100644
index 00000000000..5143e4a4d18
Binary files /dev/null and b/public/images/emoji/win10/man/6.png differ
diff --git a/public/images/emoji/win10/man_artist.png b/public/images/emoji/win10/man_artist.png
new file mode 100644
index 00000000000..691c34c2244
Binary files /dev/null and b/public/images/emoji/win10/man_artist.png differ
diff --git a/public/images/emoji/win10/man_artist/2.png b/public/images/emoji/win10/man_artist/2.png
new file mode 100644
index 00000000000..a78ba303175
Binary files /dev/null and b/public/images/emoji/win10/man_artist/2.png differ
diff --git a/public/images/emoji/win10/man_artist/3.png b/public/images/emoji/win10/man_artist/3.png
new file mode 100644
index 00000000000..8a5254e3dc7
Binary files /dev/null and b/public/images/emoji/win10/man_artist/3.png differ
diff --git a/public/images/emoji/win10/man_artist/4.png b/public/images/emoji/win10/man_artist/4.png
new file mode 100644
index 00000000000..cf26eccfa97
Binary files /dev/null and b/public/images/emoji/win10/man_artist/4.png differ
diff --git a/public/images/emoji/win10/man_artist/5.png b/public/images/emoji/win10/man_artist/5.png
new file mode 100644
index 00000000000..1f3ae4be5ab
Binary files /dev/null and b/public/images/emoji/win10/man_artist/5.png differ
diff --git a/public/images/emoji/win10/man_artist/6.png b/public/images/emoji/win10/man_artist/6.png
new file mode 100644
index 00000000000..d7ab289339d
Binary files /dev/null and b/public/images/emoji/win10/man_artist/6.png differ
diff --git a/public/images/emoji/win10/man_astronaut.png b/public/images/emoji/win10/man_astronaut.png
new file mode 100644
index 00000000000..04a2262f977
Binary files /dev/null and b/public/images/emoji/win10/man_astronaut.png differ
diff --git a/public/images/emoji/win10/man_astronaut/2.png b/public/images/emoji/win10/man_astronaut/2.png
new file mode 100644
index 00000000000..151de577616
Binary files /dev/null and b/public/images/emoji/win10/man_astronaut/2.png differ
diff --git a/public/images/emoji/win10/man_astronaut/3.png b/public/images/emoji/win10/man_astronaut/3.png
new file mode 100644
index 00000000000..8b8f72410e3
Binary files /dev/null and b/public/images/emoji/win10/man_astronaut/3.png differ
diff --git a/public/images/emoji/win10/man_astronaut/4.png b/public/images/emoji/win10/man_astronaut/4.png
new file mode 100644
index 00000000000..4868324c27a
Binary files /dev/null and b/public/images/emoji/win10/man_astronaut/4.png differ
diff --git a/public/images/emoji/win10/man_astronaut/5.png b/public/images/emoji/win10/man_astronaut/5.png
new file mode 100644
index 00000000000..5b513003086
Binary files /dev/null and b/public/images/emoji/win10/man_astronaut/5.png differ
diff --git a/public/images/emoji/win10/man_astronaut/6.png b/public/images/emoji/win10/man_astronaut/6.png
new file mode 100644
index 00000000000..e834950548e
Binary files /dev/null and b/public/images/emoji/win10/man_astronaut/6.png differ
diff --git a/public/images/emoji/win10/man_cartwheeling.png b/public/images/emoji/win10/man_cartwheeling.png
new file mode 100644
index 00000000000..430502102d6
Binary files /dev/null and b/public/images/emoji/win10/man_cartwheeling.png differ
diff --git a/public/images/emoji/win10/man_cartwheeling/2.png b/public/images/emoji/win10/man_cartwheeling/2.png
new file mode 100644
index 00000000000..4b06a80d03a
Binary files /dev/null and b/public/images/emoji/win10/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/win10/man_cartwheeling/3.png b/public/images/emoji/win10/man_cartwheeling/3.png
new file mode 100644
index 00000000000..411148e567b
Binary files /dev/null and b/public/images/emoji/win10/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/win10/man_cartwheeling/4.png b/public/images/emoji/win10/man_cartwheeling/4.png
new file mode 100644
index 00000000000..3f58818a085
Binary files /dev/null and b/public/images/emoji/win10/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/win10/man_cartwheeling/5.png b/public/images/emoji/win10/man_cartwheeling/5.png
new file mode 100644
index 00000000000..73b2fa9ad40
Binary files /dev/null and b/public/images/emoji/win10/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/win10/man_cartwheeling/6.png b/public/images/emoji/win10/man_cartwheeling/6.png
new file mode 100644
index 00000000000..536653a6935
Binary files /dev/null and b/public/images/emoji/win10/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/win10/man_cook.png b/public/images/emoji/win10/man_cook.png
new file mode 100644
index 00000000000..86bc19a3b60
Binary files /dev/null and b/public/images/emoji/win10/man_cook.png differ
diff --git a/public/images/emoji/win10/man_cook/2.png b/public/images/emoji/win10/man_cook/2.png
new file mode 100644
index 00000000000..38bd7d3838e
Binary files /dev/null and b/public/images/emoji/win10/man_cook/2.png differ
diff --git a/public/images/emoji/win10/man_cook/3.png b/public/images/emoji/win10/man_cook/3.png
new file mode 100644
index 00000000000..7529993c1c9
Binary files /dev/null and b/public/images/emoji/win10/man_cook/3.png differ
diff --git a/public/images/emoji/win10/man_cook/4.png b/public/images/emoji/win10/man_cook/4.png
new file mode 100644
index 00000000000..cd12c8b016c
Binary files /dev/null and b/public/images/emoji/win10/man_cook/4.png differ
diff --git a/public/images/emoji/win10/man_cook/5.png b/public/images/emoji/win10/man_cook/5.png
new file mode 100644
index 00000000000..7b68addab8f
Binary files /dev/null and b/public/images/emoji/win10/man_cook/5.png differ
diff --git a/public/images/emoji/win10/man_cook/6.png b/public/images/emoji/win10/man_cook/6.png
new file mode 100644
index 00000000000..25b1c5e1bd9
Binary files /dev/null and b/public/images/emoji/win10/man_cook/6.png differ
diff --git a/public/images/emoji/win10/man_dancing.png b/public/images/emoji/win10/man_dancing.png
new file mode 100644
index 00000000000..ba9f58938bb
Binary files /dev/null and b/public/images/emoji/win10/man_dancing.png differ
diff --git a/public/images/emoji/win10/man_dancing/2.png b/public/images/emoji/win10/man_dancing/2.png
new file mode 100644
index 00000000000..be511605160
Binary files /dev/null and b/public/images/emoji/win10/man_dancing/2.png differ
diff --git a/public/images/emoji/win10/man_dancing/3.png b/public/images/emoji/win10/man_dancing/3.png
new file mode 100644
index 00000000000..6f0217753a6
Binary files /dev/null and b/public/images/emoji/win10/man_dancing/3.png differ
diff --git a/public/images/emoji/win10/man_dancing/4.png b/public/images/emoji/win10/man_dancing/4.png
new file mode 100644
index 00000000000..cef8fa1223f
Binary files /dev/null and b/public/images/emoji/win10/man_dancing/4.png differ
diff --git a/public/images/emoji/win10/man_dancing/5.png b/public/images/emoji/win10/man_dancing/5.png
new file mode 100644
index 00000000000..ea1d94be53d
Binary files /dev/null and b/public/images/emoji/win10/man_dancing/5.png differ
diff --git a/public/images/emoji/win10/man_dancing/6.png b/public/images/emoji/win10/man_dancing/6.png
new file mode 100644
index 00000000000..47e5198fffc
Binary files /dev/null and b/public/images/emoji/win10/man_dancing/6.png differ
diff --git a/public/images/emoji/win10/man_facepalming.png b/public/images/emoji/win10/man_facepalming.png
new file mode 100644
index 00000000000..44ca8d78b22
Binary files /dev/null and b/public/images/emoji/win10/man_facepalming.png differ
diff --git a/public/images/emoji/win10/man_facepalming/2.png b/public/images/emoji/win10/man_facepalming/2.png
new file mode 100644
index 00000000000..b3c8601eabf
Binary files /dev/null and b/public/images/emoji/win10/man_facepalming/2.png differ
diff --git a/public/images/emoji/win10/man_facepalming/3.png b/public/images/emoji/win10/man_facepalming/3.png
new file mode 100644
index 00000000000..dd0aa37b990
Binary files /dev/null and b/public/images/emoji/win10/man_facepalming/3.png differ
diff --git a/public/images/emoji/win10/man_facepalming/4.png b/public/images/emoji/win10/man_facepalming/4.png
new file mode 100644
index 00000000000..f7431f6048f
Binary files /dev/null and b/public/images/emoji/win10/man_facepalming/4.png differ
diff --git a/public/images/emoji/win10/man_facepalming/5.png b/public/images/emoji/win10/man_facepalming/5.png
new file mode 100644
index 00000000000..2dfe7989d4a
Binary files /dev/null and b/public/images/emoji/win10/man_facepalming/5.png differ
diff --git a/public/images/emoji/win10/man_facepalming/6.png b/public/images/emoji/win10/man_facepalming/6.png
new file mode 100644
index 00000000000..3ad93446452
Binary files /dev/null and b/public/images/emoji/win10/man_facepalming/6.png differ
diff --git a/public/images/emoji/win10/man_factory_worker.png b/public/images/emoji/win10/man_factory_worker.png
new file mode 100644
index 00000000000..bcfadf30e5f
Binary files /dev/null and b/public/images/emoji/win10/man_factory_worker.png differ
diff --git a/public/images/emoji/win10/man_factory_worker/2.png b/public/images/emoji/win10/man_factory_worker/2.png
new file mode 100644
index 00000000000..ae0b33cc3f2
Binary files /dev/null and b/public/images/emoji/win10/man_factory_worker/2.png differ
diff --git a/public/images/emoji/win10/man_factory_worker/3.png b/public/images/emoji/win10/man_factory_worker/3.png
new file mode 100644
index 00000000000..1b3ed8c8627
Binary files /dev/null and b/public/images/emoji/win10/man_factory_worker/3.png differ
diff --git a/public/images/emoji/win10/man_factory_worker/4.png b/public/images/emoji/win10/man_factory_worker/4.png
new file mode 100644
index 00000000000..1808da3fb5a
Binary files /dev/null and b/public/images/emoji/win10/man_factory_worker/4.png differ
diff --git a/public/images/emoji/win10/man_factory_worker/5.png b/public/images/emoji/win10/man_factory_worker/5.png
new file mode 100644
index 00000000000..65b34264881
Binary files /dev/null and b/public/images/emoji/win10/man_factory_worker/5.png differ
diff --git a/public/images/emoji/win10/man_factory_worker/6.png b/public/images/emoji/win10/man_factory_worker/6.png
new file mode 100644
index 00000000000..d30a669e6e9
Binary files /dev/null and b/public/images/emoji/win10/man_factory_worker/6.png differ
diff --git a/public/images/emoji/win10/man_farmer.png b/public/images/emoji/win10/man_farmer.png
new file mode 100644
index 00000000000..475ea0ef893
Binary files /dev/null and b/public/images/emoji/win10/man_farmer.png differ
diff --git a/public/images/emoji/win10/man_farmer/2.png b/public/images/emoji/win10/man_farmer/2.png
new file mode 100644
index 00000000000..730743bea83
Binary files /dev/null and b/public/images/emoji/win10/man_farmer/2.png differ
diff --git a/public/images/emoji/win10/man_farmer/3.png b/public/images/emoji/win10/man_farmer/3.png
new file mode 100644
index 00000000000..790704e8637
Binary files /dev/null and b/public/images/emoji/win10/man_farmer/3.png differ
diff --git a/public/images/emoji/win10/man_farmer/4.png b/public/images/emoji/win10/man_farmer/4.png
new file mode 100644
index 00000000000..f678ddb44db
Binary files /dev/null and b/public/images/emoji/win10/man_farmer/4.png differ
diff --git a/public/images/emoji/win10/man_farmer/5.png b/public/images/emoji/win10/man_farmer/5.png
new file mode 100644
index 00000000000..aa6c32d2d88
Binary files /dev/null and b/public/images/emoji/win10/man_farmer/5.png differ
diff --git a/public/images/emoji/win10/man_farmer/6.png b/public/images/emoji/win10/man_farmer/6.png
new file mode 100644
index 00000000000..50a6c021ff5
Binary files /dev/null and b/public/images/emoji/win10/man_farmer/6.png differ
diff --git a/public/images/emoji/win10/man_firefighter.png b/public/images/emoji/win10/man_firefighter.png
new file mode 100644
index 00000000000..11778229c81
Binary files /dev/null and b/public/images/emoji/win10/man_firefighter.png differ
diff --git a/public/images/emoji/win10/man_firefighter/2.png b/public/images/emoji/win10/man_firefighter/2.png
new file mode 100644
index 00000000000..dc5d02a64c4
Binary files /dev/null and b/public/images/emoji/win10/man_firefighter/2.png differ
diff --git a/public/images/emoji/win10/man_firefighter/3.png b/public/images/emoji/win10/man_firefighter/3.png
new file mode 100644
index 00000000000..188552cff4e
Binary files /dev/null and b/public/images/emoji/win10/man_firefighter/3.png differ
diff --git a/public/images/emoji/win10/man_firefighter/4.png b/public/images/emoji/win10/man_firefighter/4.png
new file mode 100644
index 00000000000..f64297486c9
Binary files /dev/null and b/public/images/emoji/win10/man_firefighter/4.png differ
diff --git a/public/images/emoji/win10/man_firefighter/5.png b/public/images/emoji/win10/man_firefighter/5.png
new file mode 100644
index 00000000000..0d494de4ca8
Binary files /dev/null and b/public/images/emoji/win10/man_firefighter/5.png differ
diff --git a/public/images/emoji/win10/man_firefighter/6.png b/public/images/emoji/win10/man_firefighter/6.png
new file mode 100644
index 00000000000..95e545a0274
Binary files /dev/null and b/public/images/emoji/win10/man_firefighter/6.png differ
diff --git a/public/images/emoji/win10/man_health_worker.png b/public/images/emoji/win10/man_health_worker.png
new file mode 100644
index 00000000000..e96b1caf8c9
Binary files /dev/null and b/public/images/emoji/win10/man_health_worker.png differ
diff --git a/public/images/emoji/win10/man_health_worker/2.png b/public/images/emoji/win10/man_health_worker/2.png
new file mode 100644
index 00000000000..0d702cda099
Binary files /dev/null and b/public/images/emoji/win10/man_health_worker/2.png differ
diff --git a/public/images/emoji/win10/man_health_worker/3.png b/public/images/emoji/win10/man_health_worker/3.png
new file mode 100644
index 00000000000..7ceedfdc61e
Binary files /dev/null and b/public/images/emoji/win10/man_health_worker/3.png differ
diff --git a/public/images/emoji/win10/man_health_worker/4.png b/public/images/emoji/win10/man_health_worker/4.png
new file mode 100644
index 00000000000..db570ce4c11
Binary files /dev/null and b/public/images/emoji/win10/man_health_worker/4.png differ
diff --git a/public/images/emoji/win10/man_health_worker/5.png b/public/images/emoji/win10/man_health_worker/5.png
new file mode 100644
index 00000000000..ff151e19964
Binary files /dev/null and b/public/images/emoji/win10/man_health_worker/5.png differ
diff --git a/public/images/emoji/win10/man_health_worker/6.png b/public/images/emoji/win10/man_health_worker/6.png
new file mode 100644
index 00000000000..440ff7bad3a
Binary files /dev/null and b/public/images/emoji/win10/man_health_worker/6.png differ
diff --git a/public/images/emoji/win10/man_in_business_suit_levitating.png b/public/images/emoji/win10/man_in_business_suit_levitating.png
index 0d66bb13e50..e7546fc1e00 100644
Binary files a/public/images/emoji/win10/man_in_business_suit_levitating.png and b/public/images/emoji/win10/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/win10/man_in_business_suit_levitating/2.png b/public/images/emoji/win10/man_in_business_suit_levitating/2.png
new file mode 100644
index 00000000000..de379247570
Binary files /dev/null and b/public/images/emoji/win10/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/win10/man_in_business_suit_levitating/3.png b/public/images/emoji/win10/man_in_business_suit_levitating/3.png
new file mode 100644
index 00000000000..8da714140ef
Binary files /dev/null and b/public/images/emoji/win10/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/win10/man_in_business_suit_levitating/4.png b/public/images/emoji/win10/man_in_business_suit_levitating/4.png
new file mode 100644
index 00000000000..2a26043c96c
Binary files /dev/null and b/public/images/emoji/win10/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/win10/man_in_business_suit_levitating/5.png b/public/images/emoji/win10/man_in_business_suit_levitating/5.png
new file mode 100644
index 00000000000..f38a2f93340
Binary files /dev/null and b/public/images/emoji/win10/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/win10/man_in_business_suit_levitating/6.png b/public/images/emoji/win10/man_in_business_suit_levitating/6.png
new file mode 100644
index 00000000000..030123a63ee
Binary files /dev/null and b/public/images/emoji/win10/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/win10/man_in_tuxedo.png b/public/images/emoji/win10/man_in_tuxedo.png
new file mode 100644
index 00000000000..658e56056d7
Binary files /dev/null and b/public/images/emoji/win10/man_in_tuxedo.png differ
diff --git a/public/images/emoji/win10/man_in_tuxedo/2.png b/public/images/emoji/win10/man_in_tuxedo/2.png
new file mode 100644
index 00000000000..1ee9584c1d7
Binary files /dev/null and b/public/images/emoji/win10/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/win10/man_in_tuxedo/3.png b/public/images/emoji/win10/man_in_tuxedo/3.png
new file mode 100644
index 00000000000..6d42b2d60af
Binary files /dev/null and b/public/images/emoji/win10/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/win10/man_in_tuxedo/4.png b/public/images/emoji/win10/man_in_tuxedo/4.png
new file mode 100644
index 00000000000..f7437a388c1
Binary files /dev/null and b/public/images/emoji/win10/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/win10/man_in_tuxedo/5.png b/public/images/emoji/win10/man_in_tuxedo/5.png
new file mode 100644
index 00000000000..4153c02d9a4
Binary files /dev/null and b/public/images/emoji/win10/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/win10/man_in_tuxedo/6.png b/public/images/emoji/win10/man_in_tuxedo/6.png
new file mode 100644
index 00000000000..5be896cf583
Binary files /dev/null and b/public/images/emoji/win10/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/win10/man_judge.png b/public/images/emoji/win10/man_judge.png
new file mode 100644
index 00000000000..2cdafe169ac
Binary files /dev/null and b/public/images/emoji/win10/man_judge.png differ
diff --git a/public/images/emoji/win10/man_judge/2.png b/public/images/emoji/win10/man_judge/2.png
new file mode 100644
index 00000000000..4fce813de9f
Binary files /dev/null and b/public/images/emoji/win10/man_judge/2.png differ
diff --git a/public/images/emoji/win10/man_judge/3.png b/public/images/emoji/win10/man_judge/3.png
new file mode 100644
index 00000000000..a937b4446c5
Binary files /dev/null and b/public/images/emoji/win10/man_judge/3.png differ
diff --git a/public/images/emoji/win10/man_judge/4.png b/public/images/emoji/win10/man_judge/4.png
new file mode 100644
index 00000000000..6ce713dd67a
Binary files /dev/null and b/public/images/emoji/win10/man_judge/4.png differ
diff --git a/public/images/emoji/win10/man_judge/5.png b/public/images/emoji/win10/man_judge/5.png
new file mode 100644
index 00000000000..15bcaf07f76
Binary files /dev/null and b/public/images/emoji/win10/man_judge/5.png differ
diff --git a/public/images/emoji/win10/man_judge/6.png b/public/images/emoji/win10/man_judge/6.png
new file mode 100644
index 00000000000..b542c93ffd5
Binary files /dev/null and b/public/images/emoji/win10/man_judge/6.png differ
diff --git a/public/images/emoji/win10/man_juggling.png b/public/images/emoji/win10/man_juggling.png
new file mode 100644
index 00000000000..e2f2dba17e2
Binary files /dev/null and b/public/images/emoji/win10/man_juggling.png differ
diff --git a/public/images/emoji/win10/man_juggling/2.png b/public/images/emoji/win10/man_juggling/2.png
new file mode 100644
index 00000000000..a75381b34a3
Binary files /dev/null and b/public/images/emoji/win10/man_juggling/2.png differ
diff --git a/public/images/emoji/win10/man_juggling/3.png b/public/images/emoji/win10/man_juggling/3.png
new file mode 100644
index 00000000000..7b5303f92b9
Binary files /dev/null and b/public/images/emoji/win10/man_juggling/3.png differ
diff --git a/public/images/emoji/win10/man_juggling/4.png b/public/images/emoji/win10/man_juggling/4.png
new file mode 100644
index 00000000000..9d274de7ac2
Binary files /dev/null and b/public/images/emoji/win10/man_juggling/4.png differ
diff --git a/public/images/emoji/win10/man_juggling/5.png b/public/images/emoji/win10/man_juggling/5.png
new file mode 100644
index 00000000000..2458aea4fba
Binary files /dev/null and b/public/images/emoji/win10/man_juggling/5.png differ
diff --git a/public/images/emoji/win10/man_juggling/6.png b/public/images/emoji/win10/man_juggling/6.png
new file mode 100644
index 00000000000..d74c810c18f
Binary files /dev/null and b/public/images/emoji/win10/man_juggling/6.png differ
diff --git a/public/images/emoji/win10/man_mechanic.png b/public/images/emoji/win10/man_mechanic.png
new file mode 100644
index 00000000000..1100268d0af
Binary files /dev/null and b/public/images/emoji/win10/man_mechanic.png differ
diff --git a/public/images/emoji/win10/man_mechanic/2.png b/public/images/emoji/win10/man_mechanic/2.png
new file mode 100644
index 00000000000..343b3c1c17c
Binary files /dev/null and b/public/images/emoji/win10/man_mechanic/2.png differ
diff --git a/public/images/emoji/win10/man_mechanic/3.png b/public/images/emoji/win10/man_mechanic/3.png
new file mode 100644
index 00000000000..40a5bf7a4e8
Binary files /dev/null and b/public/images/emoji/win10/man_mechanic/3.png differ
diff --git a/public/images/emoji/win10/man_mechanic/4.png b/public/images/emoji/win10/man_mechanic/4.png
new file mode 100644
index 00000000000..df21676d2c6
Binary files /dev/null and b/public/images/emoji/win10/man_mechanic/4.png differ
diff --git a/public/images/emoji/win10/man_mechanic/5.png b/public/images/emoji/win10/man_mechanic/5.png
new file mode 100644
index 00000000000..f5cf36dda8d
Binary files /dev/null and b/public/images/emoji/win10/man_mechanic/5.png differ
diff --git a/public/images/emoji/win10/man_mechanic/6.png b/public/images/emoji/win10/man_mechanic/6.png
new file mode 100644
index 00000000000..cc8b5e0ef48
Binary files /dev/null and b/public/images/emoji/win10/man_mechanic/6.png differ
diff --git a/public/images/emoji/win10/man_office_worker.png b/public/images/emoji/win10/man_office_worker.png
new file mode 100644
index 00000000000..1f596cdebb8
Binary files /dev/null and b/public/images/emoji/win10/man_office_worker.png differ
diff --git a/public/images/emoji/win10/man_office_worker/2.png b/public/images/emoji/win10/man_office_worker/2.png
new file mode 100644
index 00000000000..271e2e38b29
Binary files /dev/null and b/public/images/emoji/win10/man_office_worker/2.png differ
diff --git a/public/images/emoji/win10/man_office_worker/3.png b/public/images/emoji/win10/man_office_worker/3.png
new file mode 100644
index 00000000000..8095acf7ff2
Binary files /dev/null and b/public/images/emoji/win10/man_office_worker/3.png differ
diff --git a/public/images/emoji/win10/man_office_worker/4.png b/public/images/emoji/win10/man_office_worker/4.png
new file mode 100644
index 00000000000..6899dd44f89
Binary files /dev/null and b/public/images/emoji/win10/man_office_worker/4.png differ
diff --git a/public/images/emoji/win10/man_office_worker/5.png b/public/images/emoji/win10/man_office_worker/5.png
new file mode 100644
index 00000000000..2999d36f969
Binary files /dev/null and b/public/images/emoji/win10/man_office_worker/5.png differ
diff --git a/public/images/emoji/win10/man_office_worker/6.png b/public/images/emoji/win10/man_office_worker/6.png
new file mode 100644
index 00000000000..376a3067c47
Binary files /dev/null and b/public/images/emoji/win10/man_office_worker/6.png differ
diff --git a/public/images/emoji/win10/man_pilot.png b/public/images/emoji/win10/man_pilot.png
new file mode 100644
index 00000000000..109c0a2a366
Binary files /dev/null and b/public/images/emoji/win10/man_pilot.png differ
diff --git a/public/images/emoji/win10/man_pilot/2.png b/public/images/emoji/win10/man_pilot/2.png
new file mode 100644
index 00000000000..5768499647c
Binary files /dev/null and b/public/images/emoji/win10/man_pilot/2.png differ
diff --git a/public/images/emoji/win10/man_pilot/3.png b/public/images/emoji/win10/man_pilot/3.png
new file mode 100644
index 00000000000..54b63a91850
Binary files /dev/null and b/public/images/emoji/win10/man_pilot/3.png differ
diff --git a/public/images/emoji/win10/man_pilot/4.png b/public/images/emoji/win10/man_pilot/4.png
new file mode 100644
index 00000000000..819230e7ece
Binary files /dev/null and b/public/images/emoji/win10/man_pilot/4.png differ
diff --git a/public/images/emoji/win10/man_pilot/5.png b/public/images/emoji/win10/man_pilot/5.png
new file mode 100644
index 00000000000..d367fd46710
Binary files /dev/null and b/public/images/emoji/win10/man_pilot/5.png differ
diff --git a/public/images/emoji/win10/man_pilot/6.png b/public/images/emoji/win10/man_pilot/6.png
new file mode 100644
index 00000000000..0dd8e85bc47
Binary files /dev/null and b/public/images/emoji/win10/man_pilot/6.png differ
diff --git a/public/images/emoji/win10/man_playing_handball.png b/public/images/emoji/win10/man_playing_handball.png
new file mode 100644
index 00000000000..e77cc980cba
Binary files /dev/null and b/public/images/emoji/win10/man_playing_handball.png differ
diff --git a/public/images/emoji/win10/man_playing_handball/2.png b/public/images/emoji/win10/man_playing_handball/2.png
new file mode 100644
index 00000000000..652c6b8ef38
Binary files /dev/null and b/public/images/emoji/win10/man_playing_handball/2.png differ
diff --git a/public/images/emoji/win10/man_playing_handball/3.png b/public/images/emoji/win10/man_playing_handball/3.png
new file mode 100644
index 00000000000..4b9960ee527
Binary files /dev/null and b/public/images/emoji/win10/man_playing_handball/3.png differ
diff --git a/public/images/emoji/win10/man_playing_handball/4.png b/public/images/emoji/win10/man_playing_handball/4.png
new file mode 100644
index 00000000000..f08f2562cc3
Binary files /dev/null and b/public/images/emoji/win10/man_playing_handball/4.png differ
diff --git a/public/images/emoji/win10/man_playing_handball/5.png b/public/images/emoji/win10/man_playing_handball/5.png
new file mode 100644
index 00000000000..f1d3ac6350a
Binary files /dev/null and b/public/images/emoji/win10/man_playing_handball/5.png differ
diff --git a/public/images/emoji/win10/man_playing_handball/6.png b/public/images/emoji/win10/man_playing_handball/6.png
new file mode 100644
index 00000000000..1f55070b6d7
Binary files /dev/null and b/public/images/emoji/win10/man_playing_handball/6.png differ
diff --git a/public/images/emoji/win10/man_playing_water_polo.png b/public/images/emoji/win10/man_playing_water_polo.png
new file mode 100644
index 00000000000..6aa3469fbe6
Binary files /dev/null and b/public/images/emoji/win10/man_playing_water_polo.png differ
diff --git a/public/images/emoji/win10/man_playing_water_polo/2.png b/public/images/emoji/win10/man_playing_water_polo/2.png
new file mode 100644
index 00000000000..08c84c7221e
Binary files /dev/null and b/public/images/emoji/win10/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/win10/man_playing_water_polo/3.png b/public/images/emoji/win10/man_playing_water_polo/3.png
new file mode 100644
index 00000000000..f57b02f1de8
Binary files /dev/null and b/public/images/emoji/win10/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/win10/man_playing_water_polo/4.png b/public/images/emoji/win10/man_playing_water_polo/4.png
new file mode 100644
index 00000000000..ec3fba8e3d6
Binary files /dev/null and b/public/images/emoji/win10/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/win10/man_playing_water_polo/5.png b/public/images/emoji/win10/man_playing_water_polo/5.png
new file mode 100644
index 00000000000..acf3450f23c
Binary files /dev/null and b/public/images/emoji/win10/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/win10/man_playing_water_polo/6.png b/public/images/emoji/win10/man_playing_water_polo/6.png
new file mode 100644
index 00000000000..2ddaf5eaf88
Binary files /dev/null and b/public/images/emoji/win10/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/win10/man_scientist.png b/public/images/emoji/win10/man_scientist.png
new file mode 100644
index 00000000000..a6b1405739c
Binary files /dev/null and b/public/images/emoji/win10/man_scientist.png differ
diff --git a/public/images/emoji/win10/man_scientist/2.png b/public/images/emoji/win10/man_scientist/2.png
new file mode 100644
index 00000000000..a510fd631e2
Binary files /dev/null and b/public/images/emoji/win10/man_scientist/2.png differ
diff --git a/public/images/emoji/win10/man_scientist/3.png b/public/images/emoji/win10/man_scientist/3.png
new file mode 100644
index 00000000000..f1f609bf128
Binary files /dev/null and b/public/images/emoji/win10/man_scientist/3.png differ
diff --git a/public/images/emoji/win10/man_scientist/4.png b/public/images/emoji/win10/man_scientist/4.png
new file mode 100644
index 00000000000..573b9df5d15
Binary files /dev/null and b/public/images/emoji/win10/man_scientist/4.png differ
diff --git a/public/images/emoji/win10/man_scientist/5.png b/public/images/emoji/win10/man_scientist/5.png
new file mode 100644
index 00000000000..5523424e8fc
Binary files /dev/null and b/public/images/emoji/win10/man_scientist/5.png differ
diff --git a/public/images/emoji/win10/man_scientist/6.png b/public/images/emoji/win10/man_scientist/6.png
new file mode 100644
index 00000000000..9441cec85d1
Binary files /dev/null and b/public/images/emoji/win10/man_scientist/6.png differ
diff --git a/public/images/emoji/win10/man_shrugging.png b/public/images/emoji/win10/man_shrugging.png
new file mode 100644
index 00000000000..914a94344af
Binary files /dev/null and b/public/images/emoji/win10/man_shrugging.png differ
diff --git a/public/images/emoji/win10/man_shrugging/2.png b/public/images/emoji/win10/man_shrugging/2.png
new file mode 100644
index 00000000000..77fa2ab73ee
Binary files /dev/null and b/public/images/emoji/win10/man_shrugging/2.png differ
diff --git a/public/images/emoji/win10/man_shrugging/3.png b/public/images/emoji/win10/man_shrugging/3.png
new file mode 100644
index 00000000000..5b75fafe737
Binary files /dev/null and b/public/images/emoji/win10/man_shrugging/3.png differ
diff --git a/public/images/emoji/win10/man_shrugging/4.png b/public/images/emoji/win10/man_shrugging/4.png
new file mode 100644
index 00000000000..3b848336282
Binary files /dev/null and b/public/images/emoji/win10/man_shrugging/4.png differ
diff --git a/public/images/emoji/win10/man_shrugging/5.png b/public/images/emoji/win10/man_shrugging/5.png
new file mode 100644
index 00000000000..dc2bb1d74e6
Binary files /dev/null and b/public/images/emoji/win10/man_shrugging/5.png differ
diff --git a/public/images/emoji/win10/man_shrugging/6.png b/public/images/emoji/win10/man_shrugging/6.png
new file mode 100644
index 00000000000..772524bcdbc
Binary files /dev/null and b/public/images/emoji/win10/man_shrugging/6.png differ
diff --git a/public/images/emoji/win10/man_singer.png b/public/images/emoji/win10/man_singer.png
new file mode 100644
index 00000000000..c271c9670ea
Binary files /dev/null and b/public/images/emoji/win10/man_singer.png differ
diff --git a/public/images/emoji/win10/man_singer/2.png b/public/images/emoji/win10/man_singer/2.png
new file mode 100644
index 00000000000..add09c9a358
Binary files /dev/null and b/public/images/emoji/win10/man_singer/2.png differ
diff --git a/public/images/emoji/win10/man_singer/3.png b/public/images/emoji/win10/man_singer/3.png
new file mode 100644
index 00000000000..de9293a731b
Binary files /dev/null and b/public/images/emoji/win10/man_singer/3.png differ
diff --git a/public/images/emoji/win10/man_singer/4.png b/public/images/emoji/win10/man_singer/4.png
new file mode 100644
index 00000000000..7a0670c937c
Binary files /dev/null and b/public/images/emoji/win10/man_singer/4.png differ
diff --git a/public/images/emoji/win10/man_singer/5.png b/public/images/emoji/win10/man_singer/5.png
new file mode 100644
index 00000000000..8773c19c941
Binary files /dev/null and b/public/images/emoji/win10/man_singer/5.png differ
diff --git a/public/images/emoji/win10/man_singer/6.png b/public/images/emoji/win10/man_singer/6.png
new file mode 100644
index 00000000000..31d83bf5994
Binary files /dev/null and b/public/images/emoji/win10/man_singer/6.png differ
diff --git a/public/images/emoji/win10/man_student.png b/public/images/emoji/win10/man_student.png
new file mode 100644
index 00000000000..bd6d9a8d344
Binary files /dev/null and b/public/images/emoji/win10/man_student.png differ
diff --git a/public/images/emoji/win10/man_student/2.png b/public/images/emoji/win10/man_student/2.png
new file mode 100644
index 00000000000..897c69cef17
Binary files /dev/null and b/public/images/emoji/win10/man_student/2.png differ
diff --git a/public/images/emoji/win10/man_student/3.png b/public/images/emoji/win10/man_student/3.png
new file mode 100644
index 00000000000..5b29dd8ddfc
Binary files /dev/null and b/public/images/emoji/win10/man_student/3.png differ
diff --git a/public/images/emoji/win10/man_student/4.png b/public/images/emoji/win10/man_student/4.png
new file mode 100644
index 00000000000..4f977871e9c
Binary files /dev/null and b/public/images/emoji/win10/man_student/4.png differ
diff --git a/public/images/emoji/win10/man_student/5.png b/public/images/emoji/win10/man_student/5.png
new file mode 100644
index 00000000000..8fdf92ca732
Binary files /dev/null and b/public/images/emoji/win10/man_student/5.png differ
diff --git a/public/images/emoji/win10/man_student/6.png b/public/images/emoji/win10/man_student/6.png
new file mode 100644
index 00000000000..95f73fc6bfb
Binary files /dev/null and b/public/images/emoji/win10/man_student/6.png differ
diff --git a/public/images/emoji/win10/man_teacher.png b/public/images/emoji/win10/man_teacher.png
new file mode 100644
index 00000000000..2778040538a
Binary files /dev/null and b/public/images/emoji/win10/man_teacher.png differ
diff --git a/public/images/emoji/win10/man_teacher/2.png b/public/images/emoji/win10/man_teacher/2.png
new file mode 100644
index 00000000000..02b90f16b17
Binary files /dev/null and b/public/images/emoji/win10/man_teacher/2.png differ
diff --git a/public/images/emoji/win10/man_teacher/3.png b/public/images/emoji/win10/man_teacher/3.png
new file mode 100644
index 00000000000..c7c41c99293
Binary files /dev/null and b/public/images/emoji/win10/man_teacher/3.png differ
diff --git a/public/images/emoji/win10/man_teacher/4.png b/public/images/emoji/win10/man_teacher/4.png
new file mode 100644
index 00000000000..735fe56e711
Binary files /dev/null and b/public/images/emoji/win10/man_teacher/4.png differ
diff --git a/public/images/emoji/win10/man_teacher/5.png b/public/images/emoji/win10/man_teacher/5.png
new file mode 100644
index 00000000000..8399ab36bf1
Binary files /dev/null and b/public/images/emoji/win10/man_teacher/5.png differ
diff --git a/public/images/emoji/win10/man_teacher/6.png b/public/images/emoji/win10/man_teacher/6.png
new file mode 100644
index 00000000000..3379926e962
Binary files /dev/null and b/public/images/emoji/win10/man_teacher/6.png differ
diff --git a/public/images/emoji/win10/man_technologist.png b/public/images/emoji/win10/man_technologist.png
new file mode 100644
index 00000000000..6ea7b1284da
Binary files /dev/null and b/public/images/emoji/win10/man_technologist.png differ
diff --git a/public/images/emoji/win10/man_technologist/2.png b/public/images/emoji/win10/man_technologist/2.png
new file mode 100644
index 00000000000..05ec2e16ba0
Binary files /dev/null and b/public/images/emoji/win10/man_technologist/2.png differ
diff --git a/public/images/emoji/win10/man_technologist/3.png b/public/images/emoji/win10/man_technologist/3.png
new file mode 100644
index 00000000000..106e8743467
Binary files /dev/null and b/public/images/emoji/win10/man_technologist/3.png differ
diff --git a/public/images/emoji/win10/man_technologist/4.png b/public/images/emoji/win10/man_technologist/4.png
new file mode 100644
index 00000000000..087785449a4
Binary files /dev/null and b/public/images/emoji/win10/man_technologist/4.png differ
diff --git a/public/images/emoji/win10/man_technologist/5.png b/public/images/emoji/win10/man_technologist/5.png
new file mode 100644
index 00000000000..f1cc93178a9
Binary files /dev/null and b/public/images/emoji/win10/man_technologist/5.png differ
diff --git a/public/images/emoji/win10/man_technologist/6.png b/public/images/emoji/win10/man_technologist/6.png
new file mode 100644
index 00000000000..98d4ca3146c
Binary files /dev/null and b/public/images/emoji/win10/man_technologist/6.png differ
diff --git a/public/images/emoji/win10/man_with_gua_pi_mao/2.png b/public/images/emoji/win10/man_with_gua_pi_mao/2.png
new file mode 100644
index 00000000000..590dcf4d57d
Binary files /dev/null and b/public/images/emoji/win10/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/win10/man_with_gua_pi_mao/3.png b/public/images/emoji/win10/man_with_gua_pi_mao/3.png
new file mode 100644
index 00000000000..1a197ede0a7
Binary files /dev/null and b/public/images/emoji/win10/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/win10/man_with_gua_pi_mao/4.png b/public/images/emoji/win10/man_with_gua_pi_mao/4.png
new file mode 100644
index 00000000000..d0145ef5594
Binary files /dev/null and b/public/images/emoji/win10/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/win10/man_with_gua_pi_mao/5.png b/public/images/emoji/win10/man_with_gua_pi_mao/5.png
new file mode 100644
index 00000000000..a269d7f44f1
Binary files /dev/null and b/public/images/emoji/win10/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/win10/man_with_gua_pi_mao/6.png b/public/images/emoji/win10/man_with_gua_pi_mao/6.png
new file mode 100644
index 00000000000..fdc795f6144
Binary files /dev/null and b/public/images/emoji/win10/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/win10/man_with_turban.png b/public/images/emoji/win10/man_with_turban.png
index 71a2859e895..922014dd040 100644
Binary files a/public/images/emoji/win10/man_with_turban.png and b/public/images/emoji/win10/man_with_turban.png differ
diff --git a/public/images/emoji/win10/man_with_turban/2.png b/public/images/emoji/win10/man_with_turban/2.png
new file mode 100644
index 00000000000..a9b69c0b8f0
Binary files /dev/null and b/public/images/emoji/win10/man_with_turban/2.png differ
diff --git a/public/images/emoji/win10/man_with_turban/3.png b/public/images/emoji/win10/man_with_turban/3.png
new file mode 100644
index 00000000000..325b81790e7
Binary files /dev/null and b/public/images/emoji/win10/man_with_turban/3.png differ
diff --git a/public/images/emoji/win10/man_with_turban/4.png b/public/images/emoji/win10/man_with_turban/4.png
new file mode 100644
index 00000000000..3be70c04764
Binary files /dev/null and b/public/images/emoji/win10/man_with_turban/4.png differ
diff --git a/public/images/emoji/win10/man_with_turban/5.png b/public/images/emoji/win10/man_with_turban/5.png
new file mode 100644
index 00000000000..95741745713
Binary files /dev/null and b/public/images/emoji/win10/man_with_turban/5.png differ
diff --git a/public/images/emoji/win10/man_with_turban/6.png b/public/images/emoji/win10/man_with_turban/6.png
new file mode 100644
index 00000000000..190944ff210
Binary files /dev/null and b/public/images/emoji/win10/man_with_turban/6.png differ
diff --git a/public/images/emoji/win10/mantlepiece_clock.png b/public/images/emoji/win10/mantelpiece_clock.png
similarity index 100%
rename from public/images/emoji/win10/mantlepiece_clock.png
rename to public/images/emoji/win10/mantelpiece_clock.png
diff --git a/public/images/emoji/win10/marshall_islands.png b/public/images/emoji/win10/marshall_islands.png
new file mode 100644
index 00000000000..35a77d3ec6a
Binary files /dev/null and b/public/images/emoji/win10/marshall_islands.png differ
diff --git a/public/images/emoji/win10/martial_arts_uniform.png b/public/images/emoji/win10/martial_arts_uniform.png
new file mode 100644
index 00000000000..3c28a968ebf
Binary files /dev/null and b/public/images/emoji/win10/martial_arts_uniform.png differ
diff --git a/public/images/emoji/win10/martinique.png b/public/images/emoji/win10/martinique.png
new file mode 100644
index 00000000000..20265c357af
Binary files /dev/null and b/public/images/emoji/win10/martinique.png differ
diff --git a/public/images/emoji/win10/massage.png b/public/images/emoji/win10/massage.png
index 83052970efa..2da4f16a625 100644
Binary files a/public/images/emoji/win10/massage.png and b/public/images/emoji/win10/massage.png differ
diff --git a/public/images/emoji/win10/massage/2.png b/public/images/emoji/win10/massage/2.png
new file mode 100644
index 00000000000..57aa9a51b27
Binary files /dev/null and b/public/images/emoji/win10/massage/2.png differ
diff --git a/public/images/emoji/win10/massage/3.png b/public/images/emoji/win10/massage/3.png
new file mode 100644
index 00000000000..20d135bb474
Binary files /dev/null and b/public/images/emoji/win10/massage/3.png differ
diff --git a/public/images/emoji/win10/massage/4.png b/public/images/emoji/win10/massage/4.png
new file mode 100644
index 00000000000..12fc2c57e5f
Binary files /dev/null and b/public/images/emoji/win10/massage/4.png differ
diff --git a/public/images/emoji/win10/massage/5.png b/public/images/emoji/win10/massage/5.png
new file mode 100644
index 00000000000..22f5d3d02df
Binary files /dev/null and b/public/images/emoji/win10/massage/5.png differ
diff --git a/public/images/emoji/win10/massage/6.png b/public/images/emoji/win10/massage/6.png
new file mode 100644
index 00000000000..23823edac7d
Binary files /dev/null and b/public/images/emoji/win10/massage/6.png differ
diff --git a/public/images/emoji/win10/massage_man.png b/public/images/emoji/win10/massage_man.png
new file mode 100644
index 00000000000..d3d4fe73d42
Binary files /dev/null and b/public/images/emoji/win10/massage_man.png differ
diff --git a/public/images/emoji/win10/massage_man/2.png b/public/images/emoji/win10/massage_man/2.png
new file mode 100644
index 00000000000..9d0ef16cb59
Binary files /dev/null and b/public/images/emoji/win10/massage_man/2.png differ
diff --git a/public/images/emoji/win10/massage_man/3.png b/public/images/emoji/win10/massage_man/3.png
new file mode 100644
index 00000000000..9f66b735876
Binary files /dev/null and b/public/images/emoji/win10/massage_man/3.png differ
diff --git a/public/images/emoji/win10/massage_man/4.png b/public/images/emoji/win10/massage_man/4.png
new file mode 100644
index 00000000000..2cc26f98580
Binary files /dev/null and b/public/images/emoji/win10/massage_man/4.png differ
diff --git a/public/images/emoji/win10/massage_man/5.png b/public/images/emoji/win10/massage_man/5.png
new file mode 100644
index 00000000000..9441915f4b0
Binary files /dev/null and b/public/images/emoji/win10/massage_man/5.png differ
diff --git a/public/images/emoji/win10/massage_man/6.png b/public/images/emoji/win10/massage_man/6.png
new file mode 100644
index 00000000000..8a7d98f3e07
Binary files /dev/null and b/public/images/emoji/win10/massage_man/6.png differ
diff --git a/public/images/emoji/win10/massage_woman.png b/public/images/emoji/win10/massage_woman.png
new file mode 100644
index 00000000000..2da4f16a625
Binary files /dev/null and b/public/images/emoji/win10/massage_woman.png differ
diff --git a/public/images/emoji/win10/massage_woman/2.png b/public/images/emoji/win10/massage_woman/2.png
new file mode 100644
index 00000000000..57aa9a51b27
Binary files /dev/null and b/public/images/emoji/win10/massage_woman/2.png differ
diff --git a/public/images/emoji/win10/massage_woman/3.png b/public/images/emoji/win10/massage_woman/3.png
new file mode 100644
index 00000000000..20d135bb474
Binary files /dev/null and b/public/images/emoji/win10/massage_woman/3.png differ
diff --git a/public/images/emoji/win10/massage_woman/4.png b/public/images/emoji/win10/massage_woman/4.png
new file mode 100644
index 00000000000..12fc2c57e5f
Binary files /dev/null and b/public/images/emoji/win10/massage_woman/4.png differ
diff --git a/public/images/emoji/win10/massage_woman/5.png b/public/images/emoji/win10/massage_woman/5.png
new file mode 100644
index 00000000000..22f5d3d02df
Binary files /dev/null and b/public/images/emoji/win10/massage_woman/5.png differ
diff --git a/public/images/emoji/win10/massage_woman/6.png b/public/images/emoji/win10/massage_woman/6.png
new file mode 100644
index 00000000000..23823edac7d
Binary files /dev/null and b/public/images/emoji/win10/massage_woman/6.png differ
diff --git a/public/images/emoji/win10/mauritania.png b/public/images/emoji/win10/mauritania.png
new file mode 100644
index 00000000000..23fa26e4ced
Binary files /dev/null and b/public/images/emoji/win10/mauritania.png differ
diff --git a/public/images/emoji/win10/mauritius.png b/public/images/emoji/win10/mauritius.png
new file mode 100644
index 00000000000..846272e3670
Binary files /dev/null and b/public/images/emoji/win10/mauritius.png differ
diff --git a/public/images/emoji/win10/mayotte.png b/public/images/emoji/win10/mayotte.png
new file mode 100644
index 00000000000..43a7879d247
Binary files /dev/null and b/public/images/emoji/win10/mayotte.png differ
diff --git a/public/images/emoji/win10/medal_military.png b/public/images/emoji/win10/medal_military.png
new file mode 100644
index 00000000000..a969d6bb872
Binary files /dev/null and b/public/images/emoji/win10/medal_military.png differ
diff --git a/public/images/emoji/win10/medal_sports.png b/public/images/emoji/win10/medal_sports.png
new file mode 100644
index 00000000000..40132b51a76
Binary files /dev/null and b/public/images/emoji/win10/medal_sports.png differ
diff --git a/public/images/emoji/win10/mega.png b/public/images/emoji/win10/mega.png
index ca494674456..57a0efbea70 100644
Binary files a/public/images/emoji/win10/mega.png and b/public/images/emoji/win10/mega.png differ
diff --git a/public/images/emoji/win10/memo.png b/public/images/emoji/win10/memo.png
new file mode 100644
index 00000000000..8e24698e746
Binary files /dev/null and b/public/images/emoji/win10/memo.png differ
diff --git a/public/images/emoji/win10/men_wrestling.png b/public/images/emoji/win10/men_wrestling.png
new file mode 100644
index 00000000000..ffcac108d35
Binary files /dev/null and b/public/images/emoji/win10/men_wrestling.png differ
diff --git a/public/images/emoji/win10/merperson.png b/public/images/emoji/win10/merperson.png
new file mode 100644
index 00000000000..ee1b999e0dd
Binary files /dev/null and b/public/images/emoji/win10/merperson.png differ
diff --git a/public/images/emoji/win10/merperson/2.png b/public/images/emoji/win10/merperson/2.png
new file mode 100644
index 00000000000..b97fbf42e35
Binary files /dev/null and b/public/images/emoji/win10/merperson/2.png differ
diff --git a/public/images/emoji/win10/merperson/3.png b/public/images/emoji/win10/merperson/3.png
new file mode 100644
index 00000000000..9079f60b81e
Binary files /dev/null and b/public/images/emoji/win10/merperson/3.png differ
diff --git a/public/images/emoji/win10/merperson/4.png b/public/images/emoji/win10/merperson/4.png
new file mode 100644
index 00000000000..decc0b58929
Binary files /dev/null and b/public/images/emoji/win10/merperson/4.png differ
diff --git a/public/images/emoji/win10/merperson/5.png b/public/images/emoji/win10/merperson/5.png
new file mode 100644
index 00000000000..e3e3e89cb16
Binary files /dev/null and b/public/images/emoji/win10/merperson/5.png differ
diff --git a/public/images/emoji/win10/merperson/6.png b/public/images/emoji/win10/merperson/6.png
new file mode 100644
index 00000000000..5a5f36684e5
Binary files /dev/null and b/public/images/emoji/win10/merperson/6.png differ
diff --git a/public/images/emoji/win10/metal/2.png b/public/images/emoji/win10/metal/2.png
new file mode 100644
index 00000000000..f4cb9f579e5
Binary files /dev/null and b/public/images/emoji/win10/metal/2.png differ
diff --git a/public/images/emoji/win10/metal/3.png b/public/images/emoji/win10/metal/3.png
new file mode 100644
index 00000000000..02b9eb9bf2d
Binary files /dev/null and b/public/images/emoji/win10/metal/3.png differ
diff --git a/public/images/emoji/win10/metal/4.png b/public/images/emoji/win10/metal/4.png
new file mode 100644
index 00000000000..a9aeb8c2710
Binary files /dev/null and b/public/images/emoji/win10/metal/4.png differ
diff --git a/public/images/emoji/win10/metal/5.png b/public/images/emoji/win10/metal/5.png
new file mode 100644
index 00000000000..ea8e140a702
Binary files /dev/null and b/public/images/emoji/win10/metal/5.png differ
diff --git a/public/images/emoji/win10/metal/6.png b/public/images/emoji/win10/metal/6.png
new file mode 100644
index 00000000000..84336d469cd
Binary files /dev/null and b/public/images/emoji/win10/metal/6.png differ
diff --git a/public/images/emoji/win10/mexico.png b/public/images/emoji/win10/mexico.png
new file mode 100644
index 00000000000..95e838852b4
Binary files /dev/null and b/public/images/emoji/win10/mexico.png differ
diff --git a/public/images/emoji/win10/micronesia.png b/public/images/emoji/win10/micronesia.png
new file mode 100644
index 00000000000..549d03fdc7c
Binary files /dev/null and b/public/images/emoji/win10/micronesia.png differ
diff --git a/public/images/emoji/win10/middle_finger/2.png b/public/images/emoji/win10/middle_finger/2.png
new file mode 100644
index 00000000000..fe6bdc07803
Binary files /dev/null and b/public/images/emoji/win10/middle_finger/2.png differ
diff --git a/public/images/emoji/win10/middle_finger/3.png b/public/images/emoji/win10/middle_finger/3.png
new file mode 100644
index 00000000000..6e8798d3343
Binary files /dev/null and b/public/images/emoji/win10/middle_finger/3.png differ
diff --git a/public/images/emoji/win10/middle_finger/4.png b/public/images/emoji/win10/middle_finger/4.png
new file mode 100644
index 00000000000..56655292b82
Binary files /dev/null and b/public/images/emoji/win10/middle_finger/4.png differ
diff --git a/public/images/emoji/win10/middle_finger/5.png b/public/images/emoji/win10/middle_finger/5.png
new file mode 100644
index 00000000000..d7661ab8d5f
Binary files /dev/null and b/public/images/emoji/win10/middle_finger/5.png differ
diff --git a/public/images/emoji/win10/middle_finger/6.png b/public/images/emoji/win10/middle_finger/6.png
new file mode 100644
index 00000000000..7f0c702f9f9
Binary files /dev/null and b/public/images/emoji/win10/middle_finger/6.png differ
diff --git a/public/images/emoji/win10/milk_glass.png b/public/images/emoji/win10/milk_glass.png
new file mode 100644
index 00000000000..8aaefb7fe98
Binary files /dev/null and b/public/images/emoji/win10/milk_glass.png differ
diff --git a/public/images/emoji/win10/moldova.png b/public/images/emoji/win10/moldova.png
new file mode 100644
index 00000000000..d4463a01473
Binary files /dev/null and b/public/images/emoji/win10/moldova.png differ
diff --git a/public/images/emoji/win10/monaco.png b/public/images/emoji/win10/monaco.png
new file mode 100644
index 00000000000..17833f535af
Binary files /dev/null and b/public/images/emoji/win10/monaco.png differ
diff --git a/public/images/emoji/win10/mongolia.png b/public/images/emoji/win10/mongolia.png
new file mode 100644
index 00000000000..cf978945085
Binary files /dev/null and b/public/images/emoji/win10/mongolia.png differ
diff --git a/public/images/emoji/win10/montenegro.png b/public/images/emoji/win10/montenegro.png
new file mode 100644
index 00000000000..7cbd07cef3c
Binary files /dev/null and b/public/images/emoji/win10/montenegro.png differ
diff --git a/public/images/emoji/win10/montserrat.png b/public/images/emoji/win10/montserrat.png
new file mode 100644
index 00000000000..28712de519d
Binary files /dev/null and b/public/images/emoji/win10/montserrat.png differ
diff --git a/public/images/emoji/win10/moon.png b/public/images/emoji/win10/moon.png
new file mode 100644
index 00000000000..bea4cfab462
Binary files /dev/null and b/public/images/emoji/win10/moon.png differ
diff --git a/public/images/emoji/win10/morocco.png b/public/images/emoji/win10/morocco.png
new file mode 100644
index 00000000000..7f16d0a66de
Binary files /dev/null and b/public/images/emoji/win10/morocco.png differ
diff --git a/public/images/emoji/win10/motor_boat.png b/public/images/emoji/win10/motor_boat.png
new file mode 100644
index 00000000000..15abcc4969b
Binary files /dev/null and b/public/images/emoji/win10/motor_boat.png differ
diff --git a/public/images/emoji/win10/motor_scooter.png b/public/images/emoji/win10/motor_scooter.png
new file mode 100644
index 00000000000..e71daa68a34
Binary files /dev/null and b/public/images/emoji/win10/motor_scooter.png differ
diff --git a/public/images/emoji/win10/mountain_bicyclist.png b/public/images/emoji/win10/mountain_bicyclist.png
index e9d213749c3..8d0ab53fc04 100644
Binary files a/public/images/emoji/win10/mountain_bicyclist.png and b/public/images/emoji/win10/mountain_bicyclist.png differ
diff --git a/public/images/emoji/win10/mountain_bicyclist/2.png b/public/images/emoji/win10/mountain_bicyclist/2.png
new file mode 100644
index 00000000000..8f4194e2d26
Binary files /dev/null and b/public/images/emoji/win10/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/win10/mountain_bicyclist/3.png b/public/images/emoji/win10/mountain_bicyclist/3.png
new file mode 100644
index 00000000000..66636eed106
Binary files /dev/null and b/public/images/emoji/win10/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/win10/mountain_bicyclist/4.png b/public/images/emoji/win10/mountain_bicyclist/4.png
new file mode 100644
index 00000000000..0bab252f22b
Binary files /dev/null and b/public/images/emoji/win10/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/win10/mountain_bicyclist/5.png b/public/images/emoji/win10/mountain_bicyclist/5.png
new file mode 100644
index 00000000000..84c53a5c6cf
Binary files /dev/null and b/public/images/emoji/win10/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/win10/mountain_bicyclist/6.png b/public/images/emoji/win10/mountain_bicyclist/6.png
new file mode 100644
index 00000000000..617665a3814
Binary files /dev/null and b/public/images/emoji/win10/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/win10/mountain_biking_man.png b/public/images/emoji/win10/mountain_biking_man.png
new file mode 100644
index 00000000000..8d0ab53fc04
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_man.png differ
diff --git a/public/images/emoji/win10/mountain_biking_man/2.png b/public/images/emoji/win10/mountain_biking_man/2.png
new file mode 100644
index 00000000000..8f4194e2d26
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/win10/mountain_biking_man/3.png b/public/images/emoji/win10/mountain_biking_man/3.png
new file mode 100644
index 00000000000..66636eed106
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/win10/mountain_biking_man/4.png b/public/images/emoji/win10/mountain_biking_man/4.png
new file mode 100644
index 00000000000..0bab252f22b
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/win10/mountain_biking_man/5.png b/public/images/emoji/win10/mountain_biking_man/5.png
new file mode 100644
index 00000000000..84c53a5c6cf
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/win10/mountain_biking_man/6.png b/public/images/emoji/win10/mountain_biking_man/6.png
new file mode 100644
index 00000000000..617665a3814
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/win10/mountain_biking_woman.png b/public/images/emoji/win10/mountain_biking_woman.png
new file mode 100644
index 00000000000..92aa4061515
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_woman.png differ
diff --git a/public/images/emoji/win10/mountain_biking_woman/2.png b/public/images/emoji/win10/mountain_biking_woman/2.png
new file mode 100644
index 00000000000..6ed3d174004
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/win10/mountain_biking_woman/3.png b/public/images/emoji/win10/mountain_biking_woman/3.png
new file mode 100644
index 00000000000..2c7a657a4f6
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/win10/mountain_biking_woman/4.png b/public/images/emoji/win10/mountain_biking_woman/4.png
new file mode 100644
index 00000000000..e98641829fb
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/win10/mountain_biking_woman/5.png b/public/images/emoji/win10/mountain_biking_woman/5.png
new file mode 100644
index 00000000000..72347b972ee
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/win10/mountain_biking_woman/6.png b/public/images/emoji/win10/mountain_biking_woman/6.png
new file mode 100644
index 00000000000..147c9e9165c
Binary files /dev/null and b/public/images/emoji/win10/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/win10/moyai.png b/public/images/emoji/win10/moyai.png
index 2518282a3e7..cf01961f382 100644
Binary files a/public/images/emoji/win10/moyai.png and b/public/images/emoji/win10/moyai.png differ
diff --git a/public/images/emoji/win10/mozambique.png b/public/images/emoji/win10/mozambique.png
new file mode 100644
index 00000000000..07d5cd56f0e
Binary files /dev/null and b/public/images/emoji/win10/mozambique.png differ
diff --git a/public/images/emoji/win10/mrs_claus.png b/public/images/emoji/win10/mrs_claus.png
new file mode 100644
index 00000000000..749ca7f54dc
Binary files /dev/null and b/public/images/emoji/win10/mrs_claus.png differ
diff --git a/public/images/emoji/win10/mrs_claus/2.png b/public/images/emoji/win10/mrs_claus/2.png
new file mode 100644
index 00000000000..e0f43a59ac6
Binary files /dev/null and b/public/images/emoji/win10/mrs_claus/2.png differ
diff --git a/public/images/emoji/win10/mrs_claus/3.png b/public/images/emoji/win10/mrs_claus/3.png
new file mode 100644
index 00000000000..985611ada72
Binary files /dev/null and b/public/images/emoji/win10/mrs_claus/3.png differ
diff --git a/public/images/emoji/win10/mrs_claus/4.png b/public/images/emoji/win10/mrs_claus/4.png
new file mode 100644
index 00000000000..41067940827
Binary files /dev/null and b/public/images/emoji/win10/mrs_claus/4.png differ
diff --git a/public/images/emoji/win10/mrs_claus/5.png b/public/images/emoji/win10/mrs_claus/5.png
new file mode 100644
index 00000000000..2b5a7e6ce20
Binary files /dev/null and b/public/images/emoji/win10/mrs_claus/5.png differ
diff --git a/public/images/emoji/win10/mrs_claus/6.png b/public/images/emoji/win10/mrs_claus/6.png
new file mode 100644
index 00000000000..c8c327e34dc
Binary files /dev/null and b/public/images/emoji/win10/mrs_claus/6.png differ
diff --git a/public/images/emoji/win10/muscle/2.png b/public/images/emoji/win10/muscle/2.png
new file mode 100644
index 00000000000..3c72a4382bb
Binary files /dev/null and b/public/images/emoji/win10/muscle/2.png differ
diff --git a/public/images/emoji/win10/muscle/3.png b/public/images/emoji/win10/muscle/3.png
new file mode 100644
index 00000000000..d033982ae7a
Binary files /dev/null and b/public/images/emoji/win10/muscle/3.png differ
diff --git a/public/images/emoji/win10/muscle/4.png b/public/images/emoji/win10/muscle/4.png
new file mode 100644
index 00000000000..d56fbc165d8
Binary files /dev/null and b/public/images/emoji/win10/muscle/4.png differ
diff --git a/public/images/emoji/win10/muscle/5.png b/public/images/emoji/win10/muscle/5.png
new file mode 100644
index 00000000000..131c7f05459
Binary files /dev/null and b/public/images/emoji/win10/muscle/5.png differ
diff --git a/public/images/emoji/win10/muscle/6.png b/public/images/emoji/win10/muscle/6.png
new file mode 100644
index 00000000000..7a7d2a0af00
Binary files /dev/null and b/public/images/emoji/win10/muscle/6.png differ
diff --git a/public/images/emoji/win10/myanmar.png b/public/images/emoji/win10/myanmar.png
new file mode 100644
index 00000000000..345829e2a3e
Binary files /dev/null and b/public/images/emoji/win10/myanmar.png differ
diff --git a/public/images/emoji/win10/nail_care/2.png b/public/images/emoji/win10/nail_care/2.png
new file mode 100644
index 00000000000..ad0a6389a53
Binary files /dev/null and b/public/images/emoji/win10/nail_care/2.png differ
diff --git a/public/images/emoji/win10/nail_care/3.png b/public/images/emoji/win10/nail_care/3.png
new file mode 100644
index 00000000000..d99fd9c6311
Binary files /dev/null and b/public/images/emoji/win10/nail_care/3.png differ
diff --git a/public/images/emoji/win10/nail_care/4.png b/public/images/emoji/win10/nail_care/4.png
new file mode 100644
index 00000000000..538ce1d8afb
Binary files /dev/null and b/public/images/emoji/win10/nail_care/4.png differ
diff --git a/public/images/emoji/win10/nail_care/5.png b/public/images/emoji/win10/nail_care/5.png
new file mode 100644
index 00000000000..93a269718f7
Binary files /dev/null and b/public/images/emoji/win10/nail_care/5.png differ
diff --git a/public/images/emoji/win10/nail_care/6.png b/public/images/emoji/win10/nail_care/6.png
new file mode 100644
index 00000000000..1854dda1324
Binary files /dev/null and b/public/images/emoji/win10/nail_care/6.png differ
diff --git a/public/images/emoji/win10/namibia.png b/public/images/emoji/win10/namibia.png
new file mode 100644
index 00000000000..f505b371fd5
Binary files /dev/null and b/public/images/emoji/win10/namibia.png differ
diff --git a/public/images/emoji/win10/nauru.png b/public/images/emoji/win10/nauru.png
new file mode 100644
index 00000000000..443c1a5e935
Binary files /dev/null and b/public/images/emoji/win10/nauru.png differ
diff --git a/public/images/emoji/win10/nauseated_face.png b/public/images/emoji/win10/nauseated_face.png
new file mode 100644
index 00000000000..15f625665a8
Binary files /dev/null and b/public/images/emoji/win10/nauseated_face.png differ
diff --git a/public/images/emoji/win10/nepal.png b/public/images/emoji/win10/nepal.png
new file mode 100644
index 00000000000..cd57822d801
Binary files /dev/null and b/public/images/emoji/win10/nepal.png differ
diff --git a/public/images/emoji/win10/netherlands.png b/public/images/emoji/win10/netherlands.png
new file mode 100644
index 00000000000..1e37d79d5d4
Binary files /dev/null and b/public/images/emoji/win10/netherlands.png differ
diff --git a/public/images/emoji/win10/new_caledonia.png b/public/images/emoji/win10/new_caledonia.png
new file mode 100644
index 00000000000..45914c48c7d
Binary files /dev/null and b/public/images/emoji/win10/new_caledonia.png differ
diff --git a/public/images/emoji/win10/new_zealand.png b/public/images/emoji/win10/new_zealand.png
new file mode 100644
index 00000000000..9ab60df7b72
Binary files /dev/null and b/public/images/emoji/win10/new_zealand.png differ
diff --git a/public/images/emoji/win10/newspaper_roll.png b/public/images/emoji/win10/newspaper_roll.png
new file mode 100644
index 00000000000..91f3335f1bd
Binary files /dev/null and b/public/images/emoji/win10/newspaper_roll.png differ
diff --git a/public/images/emoji/win10/next_track_button.png b/public/images/emoji/win10/next_track_button.png
new file mode 100644
index 00000000000..0f2d82b5536
Binary files /dev/null and b/public/images/emoji/win10/next_track_button.png differ
diff --git a/public/images/emoji/win10/nicaragua.png b/public/images/emoji/win10/nicaragua.png
new file mode 100644
index 00000000000..e405151e2d1
Binary files /dev/null and b/public/images/emoji/win10/nicaragua.png differ
diff --git a/public/images/emoji/win10/niger.png b/public/images/emoji/win10/niger.png
new file mode 100644
index 00000000000..fb6c4a4d372
Binary files /dev/null and b/public/images/emoji/win10/niger.png differ
diff --git a/public/images/emoji/win10/nigeria.png b/public/images/emoji/win10/nigeria.png
new file mode 100644
index 00000000000..23c9d9a7627
Binary files /dev/null and b/public/images/emoji/win10/nigeria.png differ
diff --git a/public/images/emoji/win10/nine.png b/public/images/emoji/win10/nine.png
index 290dc7fe930..f68cbedc51c 100644
Binary files a/public/images/emoji/win10/nine.png and b/public/images/emoji/win10/nine.png differ
diff --git a/public/images/emoji/win10/niue.png b/public/images/emoji/win10/niue.png
new file mode 100644
index 00000000000..daaa26cc166
Binary files /dev/null and b/public/images/emoji/win10/niue.png differ
diff --git a/public/images/emoji/win10/no_good/2.png b/public/images/emoji/win10/no_good/2.png
new file mode 100644
index 00000000000..d45e5a3f471
Binary files /dev/null and b/public/images/emoji/win10/no_good/2.png differ
diff --git a/public/images/emoji/win10/no_good/3.png b/public/images/emoji/win10/no_good/3.png
new file mode 100644
index 00000000000..52b1b6d4798
Binary files /dev/null and b/public/images/emoji/win10/no_good/3.png differ
diff --git a/public/images/emoji/win10/no_good/4.png b/public/images/emoji/win10/no_good/4.png
new file mode 100644
index 00000000000..1e5eda21aa0
Binary files /dev/null and b/public/images/emoji/win10/no_good/4.png differ
diff --git a/public/images/emoji/win10/no_good/5.png b/public/images/emoji/win10/no_good/5.png
new file mode 100644
index 00000000000..984b2c047b3
Binary files /dev/null and b/public/images/emoji/win10/no_good/5.png differ
diff --git a/public/images/emoji/win10/no_good/6.png b/public/images/emoji/win10/no_good/6.png
new file mode 100644
index 00000000000..af360791c00
Binary files /dev/null and b/public/images/emoji/win10/no_good/6.png differ
diff --git a/public/images/emoji/win10/no_good_man.png b/public/images/emoji/win10/no_good_man.png
new file mode 100644
index 00000000000..1b8fedce386
Binary files /dev/null and b/public/images/emoji/win10/no_good_man.png differ
diff --git a/public/images/emoji/win10/no_good_man/2.png b/public/images/emoji/win10/no_good_man/2.png
new file mode 100644
index 00000000000..6e944b57f30
Binary files /dev/null and b/public/images/emoji/win10/no_good_man/2.png differ
diff --git a/public/images/emoji/win10/no_good_man/3.png b/public/images/emoji/win10/no_good_man/3.png
new file mode 100644
index 00000000000..5b540304618
Binary files /dev/null and b/public/images/emoji/win10/no_good_man/3.png differ
diff --git a/public/images/emoji/win10/no_good_man/4.png b/public/images/emoji/win10/no_good_man/4.png
new file mode 100644
index 00000000000..f0766db1c13
Binary files /dev/null and b/public/images/emoji/win10/no_good_man/4.png differ
diff --git a/public/images/emoji/win10/no_good_man/5.png b/public/images/emoji/win10/no_good_man/5.png
new file mode 100644
index 00000000000..6d33d5803ed
Binary files /dev/null and b/public/images/emoji/win10/no_good_man/5.png differ
diff --git a/public/images/emoji/win10/no_good_man/6.png b/public/images/emoji/win10/no_good_man/6.png
new file mode 100644
index 00000000000..1de0bcfae48
Binary files /dev/null and b/public/images/emoji/win10/no_good_man/6.png differ
diff --git a/public/images/emoji/win10/no_good_woman.png b/public/images/emoji/win10/no_good_woman.png
new file mode 100644
index 00000000000..7af9237d4a3
Binary files /dev/null and b/public/images/emoji/win10/no_good_woman.png differ
diff --git a/public/images/emoji/win10/no_good_woman/2.png b/public/images/emoji/win10/no_good_woman/2.png
new file mode 100644
index 00000000000..d45e5a3f471
Binary files /dev/null and b/public/images/emoji/win10/no_good_woman/2.png differ
diff --git a/public/images/emoji/win10/no_good_woman/3.png b/public/images/emoji/win10/no_good_woman/3.png
new file mode 100644
index 00000000000..52b1b6d4798
Binary files /dev/null and b/public/images/emoji/win10/no_good_woman/3.png differ
diff --git a/public/images/emoji/win10/no_good_woman/4.png b/public/images/emoji/win10/no_good_woman/4.png
new file mode 100644
index 00000000000..1e5eda21aa0
Binary files /dev/null and b/public/images/emoji/win10/no_good_woman/4.png differ
diff --git a/public/images/emoji/win10/no_good_woman/5.png b/public/images/emoji/win10/no_good_woman/5.png
new file mode 100644
index 00000000000..984b2c047b3
Binary files /dev/null and b/public/images/emoji/win10/no_good_woman/5.png differ
diff --git a/public/images/emoji/win10/no_good_woman/6.png b/public/images/emoji/win10/no_good_woman/6.png
new file mode 100644
index 00000000000..af360791c00
Binary files /dev/null and b/public/images/emoji/win10/no_good_woman/6.png differ
diff --git a/public/images/emoji/win10/norfolk_island.png b/public/images/emoji/win10/norfolk_island.png
new file mode 100644
index 00000000000..574acba1009
Binary files /dev/null and b/public/images/emoji/win10/norfolk_island.png differ
diff --git a/public/images/emoji/win10/north_korea.png b/public/images/emoji/win10/north_korea.png
new file mode 100644
index 00000000000..d15d10aecec
Binary files /dev/null and b/public/images/emoji/win10/north_korea.png differ
diff --git a/public/images/emoji/win10/northern_mariana_islands.png b/public/images/emoji/win10/northern_mariana_islands.png
new file mode 100644
index 00000000000..962a6171b9c
Binary files /dev/null and b/public/images/emoji/win10/northern_mariana_islands.png differ
diff --git a/public/images/emoji/win10/norway.png b/public/images/emoji/win10/norway.png
new file mode 100644
index 00000000000..004a11d8308
Binary files /dev/null and b/public/images/emoji/win10/norway.png differ
diff --git a/public/images/emoji/win10/nose/2.png b/public/images/emoji/win10/nose/2.png
new file mode 100644
index 00000000000..a8e44999c7c
Binary files /dev/null and b/public/images/emoji/win10/nose/2.png differ
diff --git a/public/images/emoji/win10/nose/3.png b/public/images/emoji/win10/nose/3.png
new file mode 100644
index 00000000000..ba5fe28cf6d
Binary files /dev/null and b/public/images/emoji/win10/nose/3.png differ
diff --git a/public/images/emoji/win10/nose/4.png b/public/images/emoji/win10/nose/4.png
new file mode 100644
index 00000000000..ef914256fa8
Binary files /dev/null and b/public/images/emoji/win10/nose/4.png differ
diff --git a/public/images/emoji/win10/nose/5.png b/public/images/emoji/win10/nose/5.png
new file mode 100644
index 00000000000..98ff9f1c94b
Binary files /dev/null and b/public/images/emoji/win10/nose/5.png differ
diff --git a/public/images/emoji/win10/nose/6.png b/public/images/emoji/win10/nose/6.png
new file mode 100644
index 00000000000..edf1f383f4e
Binary files /dev/null and b/public/images/emoji/win10/nose/6.png differ
diff --git a/public/images/emoji/win10/ok_hand/2.png b/public/images/emoji/win10/ok_hand/2.png
new file mode 100644
index 00000000000..07d64ab431f
Binary files /dev/null and b/public/images/emoji/win10/ok_hand/2.png differ
diff --git a/public/images/emoji/win10/ok_hand/3.png b/public/images/emoji/win10/ok_hand/3.png
new file mode 100644
index 00000000000..bc6b122be62
Binary files /dev/null and b/public/images/emoji/win10/ok_hand/3.png differ
diff --git a/public/images/emoji/win10/ok_hand/4.png b/public/images/emoji/win10/ok_hand/4.png
new file mode 100644
index 00000000000..de35cc5456b
Binary files /dev/null and b/public/images/emoji/win10/ok_hand/4.png differ
diff --git a/public/images/emoji/win10/ok_hand/5.png b/public/images/emoji/win10/ok_hand/5.png
new file mode 100644
index 00000000000..aae1de982f2
Binary files /dev/null and b/public/images/emoji/win10/ok_hand/5.png differ
diff --git a/public/images/emoji/win10/ok_hand/6.png b/public/images/emoji/win10/ok_hand/6.png
new file mode 100644
index 00000000000..a52971409d5
Binary files /dev/null and b/public/images/emoji/win10/ok_hand/6.png differ
diff --git a/public/images/emoji/win10/ok_man.png b/public/images/emoji/win10/ok_man.png
new file mode 100644
index 00000000000..f455c1d8d4d
Binary files /dev/null and b/public/images/emoji/win10/ok_man.png differ
diff --git a/public/images/emoji/win10/ok_man/2.png b/public/images/emoji/win10/ok_man/2.png
new file mode 100644
index 00000000000..48639c6994b
Binary files /dev/null and b/public/images/emoji/win10/ok_man/2.png differ
diff --git a/public/images/emoji/win10/ok_man/3.png b/public/images/emoji/win10/ok_man/3.png
new file mode 100644
index 00000000000..d7e71879018
Binary files /dev/null and b/public/images/emoji/win10/ok_man/3.png differ
diff --git a/public/images/emoji/win10/ok_man/4.png b/public/images/emoji/win10/ok_man/4.png
new file mode 100644
index 00000000000..f41f0c6ec2f
Binary files /dev/null and b/public/images/emoji/win10/ok_man/4.png differ
diff --git a/public/images/emoji/win10/ok_man/5.png b/public/images/emoji/win10/ok_man/5.png
new file mode 100644
index 00000000000..926fa8bd2df
Binary files /dev/null and b/public/images/emoji/win10/ok_man/5.png differ
diff --git a/public/images/emoji/win10/ok_man/6.png b/public/images/emoji/win10/ok_man/6.png
new file mode 100644
index 00000000000..cb3bab329d6
Binary files /dev/null and b/public/images/emoji/win10/ok_man/6.png differ
diff --git a/public/images/emoji/win10/ok_woman/2.png b/public/images/emoji/win10/ok_woman/2.png
new file mode 100644
index 00000000000..9ce0b8596bc
Binary files /dev/null and b/public/images/emoji/win10/ok_woman/2.png differ
diff --git a/public/images/emoji/win10/ok_woman/3.png b/public/images/emoji/win10/ok_woman/3.png
new file mode 100644
index 00000000000..327e1d7a690
Binary files /dev/null and b/public/images/emoji/win10/ok_woman/3.png differ
diff --git a/public/images/emoji/win10/ok_woman/4.png b/public/images/emoji/win10/ok_woman/4.png
new file mode 100644
index 00000000000..76b54b1a381
Binary files /dev/null and b/public/images/emoji/win10/ok_woman/4.png differ
diff --git a/public/images/emoji/win10/ok_woman/5.png b/public/images/emoji/win10/ok_woman/5.png
new file mode 100644
index 00000000000..317a92f195f
Binary files /dev/null and b/public/images/emoji/win10/ok_woman/5.png differ
diff --git a/public/images/emoji/win10/ok_woman/6.png b/public/images/emoji/win10/ok_woman/6.png
new file mode 100644
index 00000000000..4b2ab307ee6
Binary files /dev/null and b/public/images/emoji/win10/ok_woman/6.png differ
diff --git a/public/images/emoji/win10/older_adult.png b/public/images/emoji/win10/older_adult.png
new file mode 100644
index 00000000000..8796829b876
Binary files /dev/null and b/public/images/emoji/win10/older_adult.png differ
diff --git a/public/images/emoji/win10/older_adult/2.png b/public/images/emoji/win10/older_adult/2.png
new file mode 100644
index 00000000000..b36f41960e7
Binary files /dev/null and b/public/images/emoji/win10/older_adult/2.png differ
diff --git a/public/images/emoji/win10/older_adult/3.png b/public/images/emoji/win10/older_adult/3.png
new file mode 100644
index 00000000000..dc1441fea56
Binary files /dev/null and b/public/images/emoji/win10/older_adult/3.png differ
diff --git a/public/images/emoji/win10/older_adult/4.png b/public/images/emoji/win10/older_adult/4.png
new file mode 100644
index 00000000000..abc19e06c74
Binary files /dev/null and b/public/images/emoji/win10/older_adult/4.png differ
diff --git a/public/images/emoji/win10/older_adult/5.png b/public/images/emoji/win10/older_adult/5.png
new file mode 100644
index 00000000000..c90549f6813
Binary files /dev/null and b/public/images/emoji/win10/older_adult/5.png differ
diff --git a/public/images/emoji/win10/older_adult/6.png b/public/images/emoji/win10/older_adult/6.png
new file mode 100644
index 00000000000..5152c9c1a3e
Binary files /dev/null and b/public/images/emoji/win10/older_adult/6.png differ
diff --git a/public/images/emoji/win10/older_man/2.png b/public/images/emoji/win10/older_man/2.png
new file mode 100644
index 00000000000..660b422811d
Binary files /dev/null and b/public/images/emoji/win10/older_man/2.png differ
diff --git a/public/images/emoji/win10/older_man/3.png b/public/images/emoji/win10/older_man/3.png
new file mode 100644
index 00000000000..9aac260ee59
Binary files /dev/null and b/public/images/emoji/win10/older_man/3.png differ
diff --git a/public/images/emoji/win10/older_man/4.png b/public/images/emoji/win10/older_man/4.png
new file mode 100644
index 00000000000..ac794ddc4a1
Binary files /dev/null and b/public/images/emoji/win10/older_man/4.png differ
diff --git a/public/images/emoji/win10/older_man/5.png b/public/images/emoji/win10/older_man/5.png
new file mode 100644
index 00000000000..1898a8a3e1a
Binary files /dev/null and b/public/images/emoji/win10/older_man/5.png differ
diff --git a/public/images/emoji/win10/older_man/6.png b/public/images/emoji/win10/older_man/6.png
new file mode 100644
index 00000000000..e3433415ec9
Binary files /dev/null and b/public/images/emoji/win10/older_man/6.png differ
diff --git a/public/images/emoji/win10/older_woman/2.png b/public/images/emoji/win10/older_woman/2.png
new file mode 100644
index 00000000000..43e57aa73ac
Binary files /dev/null and b/public/images/emoji/win10/older_woman/2.png differ
diff --git a/public/images/emoji/win10/older_woman/3.png b/public/images/emoji/win10/older_woman/3.png
new file mode 100644
index 00000000000..8f8c5f94b90
Binary files /dev/null and b/public/images/emoji/win10/older_woman/3.png differ
diff --git a/public/images/emoji/win10/older_woman/4.png b/public/images/emoji/win10/older_woman/4.png
new file mode 100644
index 00000000000..a79d6f6935a
Binary files /dev/null and b/public/images/emoji/win10/older_woman/4.png differ
diff --git a/public/images/emoji/win10/older_woman/5.png b/public/images/emoji/win10/older_woman/5.png
new file mode 100644
index 00000000000..38db39f385d
Binary files /dev/null and b/public/images/emoji/win10/older_woman/5.png differ
diff --git a/public/images/emoji/win10/older_woman/6.png b/public/images/emoji/win10/older_woman/6.png
new file mode 100644
index 00000000000..afd9de68b5a
Binary files /dev/null and b/public/images/emoji/win10/older_woman/6.png differ
diff --git a/public/images/emoji/win10/om.png b/public/images/emoji/win10/om.png
new file mode 100644
index 00000000000..429aa5904e8
Binary files /dev/null and b/public/images/emoji/win10/om.png differ
diff --git a/public/images/emoji/win10/oman.png b/public/images/emoji/win10/oman.png
new file mode 100644
index 00000000000..59e0df087e4
Binary files /dev/null and b/public/images/emoji/win10/oman.png differ
diff --git a/public/images/emoji/win10/one.png b/public/images/emoji/win10/one.png
index 95e3c094c86..04153a940f9 100644
Binary files a/public/images/emoji/win10/one.png and b/public/images/emoji/win10/one.png differ
diff --git a/public/images/emoji/win10/open_book.png b/public/images/emoji/win10/open_book.png
new file mode 100644
index 00000000000..63bf1ca8543
Binary files /dev/null and b/public/images/emoji/win10/open_book.png differ
diff --git a/public/images/emoji/win10/open_hands/2.png b/public/images/emoji/win10/open_hands/2.png
new file mode 100644
index 00000000000..b3640435b05
Binary files /dev/null and b/public/images/emoji/win10/open_hands/2.png differ
diff --git a/public/images/emoji/win10/open_hands/3.png b/public/images/emoji/win10/open_hands/3.png
new file mode 100644
index 00000000000..1d864b7b626
Binary files /dev/null and b/public/images/emoji/win10/open_hands/3.png differ
diff --git a/public/images/emoji/win10/open_hands/4.png b/public/images/emoji/win10/open_hands/4.png
new file mode 100644
index 00000000000..dc1a758991e
Binary files /dev/null and b/public/images/emoji/win10/open_hands/4.png differ
diff --git a/public/images/emoji/win10/open_hands/5.png b/public/images/emoji/win10/open_hands/5.png
new file mode 100644
index 00000000000..f0d1685aa0a
Binary files /dev/null and b/public/images/emoji/win10/open_hands/5.png differ
diff --git a/public/images/emoji/win10/open_hands/6.png b/public/images/emoji/win10/open_hands/6.png
new file mode 100644
index 00000000000..b42a78d4880
Binary files /dev/null and b/public/images/emoji/win10/open_hands/6.png differ
diff --git a/public/images/emoji/win10/open_umbrella.png b/public/images/emoji/win10/open_umbrella.png
new file mode 100644
index 00000000000..d0f3b039fbb
Binary files /dev/null and b/public/images/emoji/win10/open_umbrella.png differ
diff --git a/public/images/emoji/win10/orange_heart.png b/public/images/emoji/win10/orange_heart.png
new file mode 100644
index 00000000000..f217c930a74
Binary files /dev/null and b/public/images/emoji/win10/orange_heart.png differ
diff --git a/public/images/emoji/win10/owl.png b/public/images/emoji/win10/owl.png
new file mode 100644
index 00000000000..dc5d94366b5
Binary files /dev/null and b/public/images/emoji/win10/owl.png differ
diff --git a/public/images/emoji/win10/pakistan.png b/public/images/emoji/win10/pakistan.png
new file mode 100644
index 00000000000..f4c74d1d49c
Binary files /dev/null and b/public/images/emoji/win10/pakistan.png differ
diff --git a/public/images/emoji/win10/palau.png b/public/images/emoji/win10/palau.png
new file mode 100644
index 00000000000..69aace7555f
Binary files /dev/null and b/public/images/emoji/win10/palau.png differ
diff --git a/public/images/emoji/win10/palestinian_territories.png b/public/images/emoji/win10/palestinian_territories.png
new file mode 100644
index 00000000000..2e4399d7627
Binary files /dev/null and b/public/images/emoji/win10/palestinian_territories.png differ
diff --git a/public/images/emoji/win10/palms_up_together.png b/public/images/emoji/win10/palms_up_together.png
new file mode 100644
index 00000000000..fb66ba11c40
Binary files /dev/null and b/public/images/emoji/win10/palms_up_together.png differ
diff --git a/public/images/emoji/win10/palms_up_together/2.png b/public/images/emoji/win10/palms_up_together/2.png
new file mode 100644
index 00000000000..6d9b2fc8ccd
Binary files /dev/null and b/public/images/emoji/win10/palms_up_together/2.png differ
diff --git a/public/images/emoji/win10/palms_up_together/3.png b/public/images/emoji/win10/palms_up_together/3.png
new file mode 100644
index 00000000000..c5d52f5c7a7
Binary files /dev/null and b/public/images/emoji/win10/palms_up_together/3.png differ
diff --git a/public/images/emoji/win10/palms_up_together/4.png b/public/images/emoji/win10/palms_up_together/4.png
new file mode 100644
index 00000000000..3d4288d10db
Binary files /dev/null and b/public/images/emoji/win10/palms_up_together/4.png differ
diff --git a/public/images/emoji/win10/palms_up_together/5.png b/public/images/emoji/win10/palms_up_together/5.png
new file mode 100644
index 00000000000..6ff36c07cbd
Binary files /dev/null and b/public/images/emoji/win10/palms_up_together/5.png differ
diff --git a/public/images/emoji/win10/palms_up_together/6.png b/public/images/emoji/win10/palms_up_together/6.png
new file mode 100644
index 00000000000..c25d42927d8
Binary files /dev/null and b/public/images/emoji/win10/palms_up_together/6.png differ
diff --git a/public/images/emoji/win10/panama.png b/public/images/emoji/win10/panama.png
new file mode 100644
index 00000000000..2a564db4266
Binary files /dev/null and b/public/images/emoji/win10/panama.png differ
diff --git a/public/images/emoji/win10/pancakes.png b/public/images/emoji/win10/pancakes.png
new file mode 100644
index 00000000000..888d129c10b
Binary files /dev/null and b/public/images/emoji/win10/pancakes.png differ
diff --git a/public/images/emoji/win10/papua_new_guinea.png b/public/images/emoji/win10/papua_new_guinea.png
new file mode 100644
index 00000000000..b449d67794a
Binary files /dev/null and b/public/images/emoji/win10/papua_new_guinea.png differ
diff --git a/public/images/emoji/win10/paraguay.png b/public/images/emoji/win10/paraguay.png
new file mode 100644
index 00000000000..d9eab9434ce
Binary files /dev/null and b/public/images/emoji/win10/paraguay.png differ
diff --git a/public/images/emoji/win10/parasol_on_ground.png b/public/images/emoji/win10/parasol_on_ground.png
new file mode 100644
index 00000000000..a3a45c3495c
Binary files /dev/null and b/public/images/emoji/win10/parasol_on_ground.png differ
diff --git a/public/images/emoji/win10/peanuts.png b/public/images/emoji/win10/peanuts.png
new file mode 100644
index 00000000000..a72719f8ac5
Binary files /dev/null and b/public/images/emoji/win10/peanuts.png differ
diff --git a/public/images/emoji/win10/pen.png b/public/images/emoji/win10/pen.png
new file mode 100644
index 00000000000..fe2c3230090
Binary files /dev/null and b/public/images/emoji/win10/pen.png differ
diff --git a/public/images/emoji/win10/persevere.png b/public/images/emoji/win10/persevere.png
index f7c8cfc4f76..d41c3b5a245 100644
Binary files a/public/images/emoji/win10/persevere.png and b/public/images/emoji/win10/persevere.png differ
diff --git a/public/images/emoji/win10/person_climbing.png b/public/images/emoji/win10/person_climbing.png
new file mode 100644
index 00000000000..d8a6229d6b9
Binary files /dev/null and b/public/images/emoji/win10/person_climbing.png differ
diff --git a/public/images/emoji/win10/person_climbing/2.png b/public/images/emoji/win10/person_climbing/2.png
new file mode 100644
index 00000000000..71330d66a8c
Binary files /dev/null and b/public/images/emoji/win10/person_climbing/2.png differ
diff --git a/public/images/emoji/win10/person_climbing/3.png b/public/images/emoji/win10/person_climbing/3.png
new file mode 100644
index 00000000000..a1345ecbd25
Binary files /dev/null and b/public/images/emoji/win10/person_climbing/3.png differ
diff --git a/public/images/emoji/win10/person_climbing/4.png b/public/images/emoji/win10/person_climbing/4.png
new file mode 100644
index 00000000000..016b920bcde
Binary files /dev/null and b/public/images/emoji/win10/person_climbing/4.png differ
diff --git a/public/images/emoji/win10/person_climbing/5.png b/public/images/emoji/win10/person_climbing/5.png
new file mode 100644
index 00000000000..4591eb52904
Binary files /dev/null and b/public/images/emoji/win10/person_climbing/5.png differ
diff --git a/public/images/emoji/win10/person_climbing/6.png b/public/images/emoji/win10/person_climbing/6.png
new file mode 100644
index 00000000000..19be3236ae9
Binary files /dev/null and b/public/images/emoji/win10/person_climbing/6.png differ
diff --git a/public/images/emoji/win10/person_fencing.png b/public/images/emoji/win10/person_fencing.png
new file mode 100644
index 00000000000..80b516192fb
Binary files /dev/null and b/public/images/emoji/win10/person_fencing.png differ
diff --git a/public/images/emoji/win10/person_frowning/2.png b/public/images/emoji/win10/person_frowning/2.png
new file mode 100644
index 00000000000..f43aa390faf
Binary files /dev/null and b/public/images/emoji/win10/person_frowning/2.png differ
diff --git a/public/images/emoji/win10/person_frowning/3.png b/public/images/emoji/win10/person_frowning/3.png
new file mode 100644
index 00000000000..b93713bc013
Binary files /dev/null and b/public/images/emoji/win10/person_frowning/3.png differ
diff --git a/public/images/emoji/win10/person_frowning/4.png b/public/images/emoji/win10/person_frowning/4.png
new file mode 100644
index 00000000000..ab6e3557e90
Binary files /dev/null and b/public/images/emoji/win10/person_frowning/4.png differ
diff --git a/public/images/emoji/win10/person_frowning/5.png b/public/images/emoji/win10/person_frowning/5.png
new file mode 100644
index 00000000000..72d4d6cf404
Binary files /dev/null and b/public/images/emoji/win10/person_frowning/5.png differ
diff --git a/public/images/emoji/win10/person_frowning/6.png b/public/images/emoji/win10/person_frowning/6.png
new file mode 100644
index 00000000000..901ef717a78
Binary files /dev/null and b/public/images/emoji/win10/person_frowning/6.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position.png b/public/images/emoji/win10/person_in_lotus_position.png
new file mode 100644
index 00000000000..e9404fd5255
Binary files /dev/null and b/public/images/emoji/win10/person_in_lotus_position.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/2.png b/public/images/emoji/win10/person_in_lotus_position/2.png
new file mode 100644
index 00000000000..8817578cf09
Binary files /dev/null and b/public/images/emoji/win10/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/3.png b/public/images/emoji/win10/person_in_lotus_position/3.png
new file mode 100644
index 00000000000..0e9bf46e0b6
Binary files /dev/null and b/public/images/emoji/win10/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/4.png b/public/images/emoji/win10/person_in_lotus_position/4.png
new file mode 100644
index 00000000000..918e3d435a2
Binary files /dev/null and b/public/images/emoji/win10/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/5.png b/public/images/emoji/win10/person_in_lotus_position/5.png
new file mode 100644
index 00000000000..0c01143530e
Binary files /dev/null and b/public/images/emoji/win10/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/win10/person_in_lotus_position/6.png b/public/images/emoji/win10/person_in_lotus_position/6.png
new file mode 100644
index 00000000000..fed226dac29
Binary files /dev/null and b/public/images/emoji/win10/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room.png b/public/images/emoji/win10/person_in_steamy_room.png
new file mode 100644
index 00000000000..65a0790d926
Binary files /dev/null and b/public/images/emoji/win10/person_in_steamy_room.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/2.png b/public/images/emoji/win10/person_in_steamy_room/2.png
new file mode 100644
index 00000000000..7260df1d154
Binary files /dev/null and b/public/images/emoji/win10/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/3.png b/public/images/emoji/win10/person_in_steamy_room/3.png
new file mode 100644
index 00000000000..d14580a3db3
Binary files /dev/null and b/public/images/emoji/win10/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/4.png b/public/images/emoji/win10/person_in_steamy_room/4.png
new file mode 100644
index 00000000000..9313ab2116b
Binary files /dev/null and b/public/images/emoji/win10/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/5.png b/public/images/emoji/win10/person_in_steamy_room/5.png
new file mode 100644
index 00000000000..f432b554b37
Binary files /dev/null and b/public/images/emoji/win10/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/win10/person_in_steamy_room/6.png b/public/images/emoji/win10/person_in_steamy_room/6.png
new file mode 100644
index 00000000000..dc7087e0284
Binary files /dev/null and b/public/images/emoji/win10/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/win10/person_with_ball/2.png b/public/images/emoji/win10/person_with_ball/2.png
new file mode 100644
index 00000000000..d28e4579215
Binary files /dev/null and b/public/images/emoji/win10/person_with_ball/2.png differ
diff --git a/public/images/emoji/win10/person_with_ball/3.png b/public/images/emoji/win10/person_with_ball/3.png
new file mode 100644
index 00000000000..43168676850
Binary files /dev/null and b/public/images/emoji/win10/person_with_ball/3.png differ
diff --git a/public/images/emoji/win10/person_with_ball/4.png b/public/images/emoji/win10/person_with_ball/4.png
new file mode 100644
index 00000000000..50fadc5f6d5
Binary files /dev/null and b/public/images/emoji/win10/person_with_ball/4.png differ
diff --git a/public/images/emoji/win10/person_with_ball/5.png b/public/images/emoji/win10/person_with_ball/5.png
new file mode 100644
index 00000000000..1b1828182cf
Binary files /dev/null and b/public/images/emoji/win10/person_with_ball/5.png differ
diff --git a/public/images/emoji/win10/person_with_ball/6.png b/public/images/emoji/win10/person_with_ball/6.png
new file mode 100644
index 00000000000..d2c934ec3cf
Binary files /dev/null and b/public/images/emoji/win10/person_with_ball/6.png differ
diff --git a/public/images/emoji/win10/person_with_blond_hair/2.png b/public/images/emoji/win10/person_with_blond_hair/2.png
new file mode 100644
index 00000000000..26bfc70d38c
Binary files /dev/null and b/public/images/emoji/win10/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/win10/person_with_blond_hair/3.png b/public/images/emoji/win10/person_with_blond_hair/3.png
new file mode 100644
index 00000000000..9a496854cbe
Binary files /dev/null and b/public/images/emoji/win10/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/win10/person_with_blond_hair/4.png b/public/images/emoji/win10/person_with_blond_hair/4.png
new file mode 100644
index 00000000000..3313ce6bbfa
Binary files /dev/null and b/public/images/emoji/win10/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/win10/person_with_blond_hair/5.png b/public/images/emoji/win10/person_with_blond_hair/5.png
new file mode 100644
index 00000000000..9643cf9dd3e
Binary files /dev/null and b/public/images/emoji/win10/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/win10/person_with_blond_hair/6.png b/public/images/emoji/win10/person_with_blond_hair/6.png
new file mode 100644
index 00000000000..6626ede2542
Binary files /dev/null and b/public/images/emoji/win10/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/win10/person_with_pouting_face/2.png b/public/images/emoji/win10/person_with_pouting_face/2.png
new file mode 100644
index 00000000000..932574a3928
Binary files /dev/null and b/public/images/emoji/win10/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/win10/person_with_pouting_face/3.png b/public/images/emoji/win10/person_with_pouting_face/3.png
new file mode 100644
index 00000000000..eff01b9450e
Binary files /dev/null and b/public/images/emoji/win10/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/win10/person_with_pouting_face/4.png b/public/images/emoji/win10/person_with_pouting_face/4.png
new file mode 100644
index 00000000000..876e4806527
Binary files /dev/null and b/public/images/emoji/win10/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/win10/person_with_pouting_face/5.png b/public/images/emoji/win10/person_with_pouting_face/5.png
new file mode 100644
index 00000000000..6e92b8ebfac
Binary files /dev/null and b/public/images/emoji/win10/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/win10/person_with_pouting_face/6.png b/public/images/emoji/win10/person_with_pouting_face/6.png
new file mode 100644
index 00000000000..8de5a40ba08
Binary files /dev/null and b/public/images/emoji/win10/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/win10/peru.png b/public/images/emoji/win10/peru.png
new file mode 100644
index 00000000000..bbb5523f939
Binary files /dev/null and b/public/images/emoji/win10/peru.png differ
diff --git a/public/images/emoji/win10/philippines.png b/public/images/emoji/win10/philippines.png
new file mode 100644
index 00000000000..b26fa86ac23
Binary files /dev/null and b/public/images/emoji/win10/philippines.png differ
diff --git a/public/images/emoji/win10/phone.png b/public/images/emoji/win10/phone.png
new file mode 100644
index 00000000000..92bcaf872ea
Binary files /dev/null and b/public/images/emoji/win10/phone.png differ
diff --git a/public/images/emoji/win10/pie.png b/public/images/emoji/win10/pie.png
new file mode 100644
index 00000000000..4f5f474d82c
Binary files /dev/null and b/public/images/emoji/win10/pie.png differ
diff --git a/public/images/emoji/win10/pitcairn_islands.png b/public/images/emoji/win10/pitcairn_islands.png
new file mode 100644
index 00000000000..3e3d79bca5c
Binary files /dev/null and b/public/images/emoji/win10/pitcairn_islands.png differ
diff --git a/public/images/emoji/win10/plate_with_cutlery.png b/public/images/emoji/win10/plate_with_cutlery.png
new file mode 100644
index 00000000000..d7a2654b4f3
Binary files /dev/null and b/public/images/emoji/win10/plate_with_cutlery.png differ
diff --git a/public/images/emoji/win10/play_or_pause_button.png b/public/images/emoji/win10/play_or_pause_button.png
new file mode 100644
index 00000000000..0cb9a347d6b
Binary files /dev/null and b/public/images/emoji/win10/play_or_pause_button.png differ
diff --git a/public/images/emoji/win10/point_down/2.png b/public/images/emoji/win10/point_down/2.png
new file mode 100644
index 00000000000..b27889771fe
Binary files /dev/null and b/public/images/emoji/win10/point_down/2.png differ
diff --git a/public/images/emoji/win10/point_down/3.png b/public/images/emoji/win10/point_down/3.png
new file mode 100644
index 00000000000..d30c27f449b
Binary files /dev/null and b/public/images/emoji/win10/point_down/3.png differ
diff --git a/public/images/emoji/win10/point_down/4.png b/public/images/emoji/win10/point_down/4.png
new file mode 100644
index 00000000000..671717cc8f2
Binary files /dev/null and b/public/images/emoji/win10/point_down/4.png differ
diff --git a/public/images/emoji/win10/point_down/5.png b/public/images/emoji/win10/point_down/5.png
new file mode 100644
index 00000000000..ba32e865414
Binary files /dev/null and b/public/images/emoji/win10/point_down/5.png differ
diff --git a/public/images/emoji/win10/point_down/6.png b/public/images/emoji/win10/point_down/6.png
new file mode 100644
index 00000000000..0070ddfc55c
Binary files /dev/null and b/public/images/emoji/win10/point_down/6.png differ
diff --git a/public/images/emoji/win10/point_left/2.png b/public/images/emoji/win10/point_left/2.png
new file mode 100644
index 00000000000..87b614f6128
Binary files /dev/null and b/public/images/emoji/win10/point_left/2.png differ
diff --git a/public/images/emoji/win10/point_left/3.png b/public/images/emoji/win10/point_left/3.png
new file mode 100644
index 00000000000..e1f757ff324
Binary files /dev/null and b/public/images/emoji/win10/point_left/3.png differ
diff --git a/public/images/emoji/win10/point_left/4.png b/public/images/emoji/win10/point_left/4.png
new file mode 100644
index 00000000000..323f7e6e33e
Binary files /dev/null and b/public/images/emoji/win10/point_left/4.png differ
diff --git a/public/images/emoji/win10/point_left/5.png b/public/images/emoji/win10/point_left/5.png
new file mode 100644
index 00000000000..bf73fed4a22
Binary files /dev/null and b/public/images/emoji/win10/point_left/5.png differ
diff --git a/public/images/emoji/win10/point_left/6.png b/public/images/emoji/win10/point_left/6.png
new file mode 100644
index 00000000000..72f1c6686d2
Binary files /dev/null and b/public/images/emoji/win10/point_left/6.png differ
diff --git a/public/images/emoji/win10/point_right/2.png b/public/images/emoji/win10/point_right/2.png
new file mode 100644
index 00000000000..d68cee86a52
Binary files /dev/null and b/public/images/emoji/win10/point_right/2.png differ
diff --git a/public/images/emoji/win10/point_right/3.png b/public/images/emoji/win10/point_right/3.png
new file mode 100644
index 00000000000..7349ad2f50e
Binary files /dev/null and b/public/images/emoji/win10/point_right/3.png differ
diff --git a/public/images/emoji/win10/point_right/4.png b/public/images/emoji/win10/point_right/4.png
new file mode 100644
index 00000000000..ee22412bdef
Binary files /dev/null and b/public/images/emoji/win10/point_right/4.png differ
diff --git a/public/images/emoji/win10/point_right/5.png b/public/images/emoji/win10/point_right/5.png
new file mode 100644
index 00000000000..eb52e4141b0
Binary files /dev/null and b/public/images/emoji/win10/point_right/5.png differ
diff --git a/public/images/emoji/win10/point_right/6.png b/public/images/emoji/win10/point_right/6.png
new file mode 100644
index 00000000000..03e1421c076
Binary files /dev/null and b/public/images/emoji/win10/point_right/6.png differ
diff --git a/public/images/emoji/win10/point_up/2.png b/public/images/emoji/win10/point_up/2.png
new file mode 100644
index 00000000000..823fbc621b0
Binary files /dev/null and b/public/images/emoji/win10/point_up/2.png differ
diff --git a/public/images/emoji/win10/point_up/3.png b/public/images/emoji/win10/point_up/3.png
new file mode 100644
index 00000000000..10993846bfa
Binary files /dev/null and b/public/images/emoji/win10/point_up/3.png differ
diff --git a/public/images/emoji/win10/point_up/4.png b/public/images/emoji/win10/point_up/4.png
new file mode 100644
index 00000000000..efb81bb7cca
Binary files /dev/null and b/public/images/emoji/win10/point_up/4.png differ
diff --git a/public/images/emoji/win10/point_up/5.png b/public/images/emoji/win10/point_up/5.png
new file mode 100644
index 00000000000..52b7ad3369d
Binary files /dev/null and b/public/images/emoji/win10/point_up/5.png differ
diff --git a/public/images/emoji/win10/point_up/6.png b/public/images/emoji/win10/point_up/6.png
new file mode 100644
index 00000000000..7f3bbdefac7
Binary files /dev/null and b/public/images/emoji/win10/point_up/6.png differ
diff --git a/public/images/emoji/win10/point_up_2/2.png b/public/images/emoji/win10/point_up_2/2.png
new file mode 100644
index 00000000000..d6e7f19ed6b
Binary files /dev/null and b/public/images/emoji/win10/point_up_2/2.png differ
diff --git a/public/images/emoji/win10/point_up_2/3.png b/public/images/emoji/win10/point_up_2/3.png
new file mode 100644
index 00000000000..9db6f24c08a
Binary files /dev/null and b/public/images/emoji/win10/point_up_2/3.png differ
diff --git a/public/images/emoji/win10/point_up_2/4.png b/public/images/emoji/win10/point_up_2/4.png
new file mode 100644
index 00000000000..117a9d98e82
Binary files /dev/null and b/public/images/emoji/win10/point_up_2/4.png differ
diff --git a/public/images/emoji/win10/point_up_2/5.png b/public/images/emoji/win10/point_up_2/5.png
new file mode 100644
index 00000000000..6279a091c03
Binary files /dev/null and b/public/images/emoji/win10/point_up_2/5.png differ
diff --git a/public/images/emoji/win10/point_up_2/6.png b/public/images/emoji/win10/point_up_2/6.png
new file mode 100644
index 00000000000..c23a99d7cca
Binary files /dev/null and b/public/images/emoji/win10/point_up_2/6.png differ
diff --git a/public/images/emoji/win10/poland.png b/public/images/emoji/win10/poland.png
new file mode 100644
index 00000000000..c8872ee52e9
Binary files /dev/null and b/public/images/emoji/win10/poland.png differ
diff --git a/public/images/emoji/win10/policeman.png b/public/images/emoji/win10/policeman.png
new file mode 100644
index 00000000000..9de63c18d88
Binary files /dev/null and b/public/images/emoji/win10/policeman.png differ
diff --git a/public/images/emoji/win10/policeman/2.png b/public/images/emoji/win10/policeman/2.png
new file mode 100644
index 00000000000..9113cfcde1a
Binary files /dev/null and b/public/images/emoji/win10/policeman/2.png differ
diff --git a/public/images/emoji/win10/policeman/3.png b/public/images/emoji/win10/policeman/3.png
new file mode 100644
index 00000000000..6e0c1756add
Binary files /dev/null and b/public/images/emoji/win10/policeman/3.png differ
diff --git a/public/images/emoji/win10/policeman/4.png b/public/images/emoji/win10/policeman/4.png
new file mode 100644
index 00000000000..8cdbe0a180e
Binary files /dev/null and b/public/images/emoji/win10/policeman/4.png differ
diff --git a/public/images/emoji/win10/policeman/5.png b/public/images/emoji/win10/policeman/5.png
new file mode 100644
index 00000000000..a1fd9fdd56e
Binary files /dev/null and b/public/images/emoji/win10/policeman/5.png differ
diff --git a/public/images/emoji/win10/policeman/6.png b/public/images/emoji/win10/policeman/6.png
new file mode 100644
index 00000000000..d31a94ecf5a
Binary files /dev/null and b/public/images/emoji/win10/policeman/6.png differ
diff --git a/public/images/emoji/win10/policewoman.png b/public/images/emoji/win10/policewoman.png
new file mode 100644
index 00000000000..33297dcab31
Binary files /dev/null and b/public/images/emoji/win10/policewoman.png differ
diff --git a/public/images/emoji/win10/policewoman/2.png b/public/images/emoji/win10/policewoman/2.png
new file mode 100644
index 00000000000..55a78227ce5
Binary files /dev/null and b/public/images/emoji/win10/policewoman/2.png differ
diff --git a/public/images/emoji/win10/policewoman/3.png b/public/images/emoji/win10/policewoman/3.png
new file mode 100644
index 00000000000..ef50efc1bbe
Binary files /dev/null and b/public/images/emoji/win10/policewoman/3.png differ
diff --git a/public/images/emoji/win10/policewoman/4.png b/public/images/emoji/win10/policewoman/4.png
new file mode 100644
index 00000000000..bfa84f98381
Binary files /dev/null and b/public/images/emoji/win10/policewoman/4.png differ
diff --git a/public/images/emoji/win10/policewoman/5.png b/public/images/emoji/win10/policewoman/5.png
new file mode 100644
index 00000000000..5094944aef3
Binary files /dev/null and b/public/images/emoji/win10/policewoman/5.png differ
diff --git a/public/images/emoji/win10/policewoman/6.png b/public/images/emoji/win10/policewoman/6.png
new file mode 100644
index 00000000000..4cae652ba73
Binary files /dev/null and b/public/images/emoji/win10/policewoman/6.png differ
diff --git a/public/images/emoji/win10/portugal.png b/public/images/emoji/win10/portugal.png
new file mode 100644
index 00000000000..5646de06226
Binary files /dev/null and b/public/images/emoji/win10/portugal.png differ
diff --git a/public/images/emoji/win10/potato.png b/public/images/emoji/win10/potato.png
new file mode 100644
index 00000000000..95225a806de
Binary files /dev/null and b/public/images/emoji/win10/potato.png differ
diff --git a/public/images/emoji/win10/pouting_man.png b/public/images/emoji/win10/pouting_man.png
new file mode 100644
index 00000000000..63685db1f54
Binary files /dev/null and b/public/images/emoji/win10/pouting_man.png differ
diff --git a/public/images/emoji/win10/pouting_man/2.png b/public/images/emoji/win10/pouting_man/2.png
new file mode 100644
index 00000000000..f713e9dd468
Binary files /dev/null and b/public/images/emoji/win10/pouting_man/2.png differ
diff --git a/public/images/emoji/win10/pouting_man/3.png b/public/images/emoji/win10/pouting_man/3.png
new file mode 100644
index 00000000000..dee5f58e2f9
Binary files /dev/null and b/public/images/emoji/win10/pouting_man/3.png differ
diff --git a/public/images/emoji/win10/pouting_man/4.png b/public/images/emoji/win10/pouting_man/4.png
new file mode 100644
index 00000000000..6c3d52305c4
Binary files /dev/null and b/public/images/emoji/win10/pouting_man/4.png differ
diff --git a/public/images/emoji/win10/pouting_man/5.png b/public/images/emoji/win10/pouting_man/5.png
new file mode 100644
index 00000000000..eab31fd31fe
Binary files /dev/null and b/public/images/emoji/win10/pouting_man/5.png differ
diff --git a/public/images/emoji/win10/pouting_man/6.png b/public/images/emoji/win10/pouting_man/6.png
new file mode 100644
index 00000000000..80e694c4a64
Binary files /dev/null and b/public/images/emoji/win10/pouting_man/6.png differ
diff --git a/public/images/emoji/win10/pouting_woman.png b/public/images/emoji/win10/pouting_woman.png
new file mode 100644
index 00000000000..1b55cb71bba
Binary files /dev/null and b/public/images/emoji/win10/pouting_woman.png differ
diff --git a/public/images/emoji/win10/pouting_woman/2.png b/public/images/emoji/win10/pouting_woman/2.png
new file mode 100644
index 00000000000..932574a3928
Binary files /dev/null and b/public/images/emoji/win10/pouting_woman/2.png differ
diff --git a/public/images/emoji/win10/pouting_woman/3.png b/public/images/emoji/win10/pouting_woman/3.png
new file mode 100644
index 00000000000..eff01b9450e
Binary files /dev/null and b/public/images/emoji/win10/pouting_woman/3.png differ
diff --git a/public/images/emoji/win10/pouting_woman/4.png b/public/images/emoji/win10/pouting_woman/4.png
new file mode 100644
index 00000000000..876e4806527
Binary files /dev/null and b/public/images/emoji/win10/pouting_woman/4.png differ
diff --git a/public/images/emoji/win10/pouting_woman/5.png b/public/images/emoji/win10/pouting_woman/5.png
new file mode 100644
index 00000000000..6e92b8ebfac
Binary files /dev/null and b/public/images/emoji/win10/pouting_woman/5.png differ
diff --git a/public/images/emoji/win10/pouting_woman/6.png b/public/images/emoji/win10/pouting_woman/6.png
new file mode 100644
index 00000000000..8de5a40ba08
Binary files /dev/null and b/public/images/emoji/win10/pouting_woman/6.png differ
diff --git a/public/images/emoji/win10/pray/2.png b/public/images/emoji/win10/pray/2.png
new file mode 100644
index 00000000000..16ef86a4e69
Binary files /dev/null and b/public/images/emoji/win10/pray/2.png differ
diff --git a/public/images/emoji/win10/pray/3.png b/public/images/emoji/win10/pray/3.png
new file mode 100644
index 00000000000..845363fe624
Binary files /dev/null and b/public/images/emoji/win10/pray/3.png differ
diff --git a/public/images/emoji/win10/pray/4.png b/public/images/emoji/win10/pray/4.png
new file mode 100644
index 00000000000..271cff1b585
Binary files /dev/null and b/public/images/emoji/win10/pray/4.png differ
diff --git a/public/images/emoji/win10/pray/5.png b/public/images/emoji/win10/pray/5.png
new file mode 100644
index 00000000000..a822e6adda5
Binary files /dev/null and b/public/images/emoji/win10/pray/5.png differ
diff --git a/public/images/emoji/win10/pray/6.png b/public/images/emoji/win10/pray/6.png
new file mode 100644
index 00000000000..77bdd570461
Binary files /dev/null and b/public/images/emoji/win10/pray/6.png differ
diff --git a/public/images/emoji/win10/pregnant_woman.png b/public/images/emoji/win10/pregnant_woman.png
new file mode 100644
index 00000000000..f6f905652f8
Binary files /dev/null and b/public/images/emoji/win10/pregnant_woman.png differ
diff --git a/public/images/emoji/win10/pregnant_woman/2.png b/public/images/emoji/win10/pregnant_woman/2.png
new file mode 100644
index 00000000000..235004a048e
Binary files /dev/null and b/public/images/emoji/win10/pregnant_woman/2.png differ
diff --git a/public/images/emoji/win10/pregnant_woman/3.png b/public/images/emoji/win10/pregnant_woman/3.png
new file mode 100644
index 00000000000..2090c7b6385
Binary files /dev/null and b/public/images/emoji/win10/pregnant_woman/3.png differ
diff --git a/public/images/emoji/win10/pregnant_woman/4.png b/public/images/emoji/win10/pregnant_woman/4.png
new file mode 100644
index 00000000000..a071d1f0a20
Binary files /dev/null and b/public/images/emoji/win10/pregnant_woman/4.png differ
diff --git a/public/images/emoji/win10/pregnant_woman/5.png b/public/images/emoji/win10/pregnant_woman/5.png
new file mode 100644
index 00000000000..7267685c1a3
Binary files /dev/null and b/public/images/emoji/win10/pregnant_woman/5.png differ
diff --git a/public/images/emoji/win10/pregnant_woman/6.png b/public/images/emoji/win10/pregnant_woman/6.png
new file mode 100644
index 00000000000..774aa31452c
Binary files /dev/null and b/public/images/emoji/win10/pregnant_woman/6.png differ
diff --git a/public/images/emoji/win10/pretzel.png b/public/images/emoji/win10/pretzel.png
new file mode 100644
index 00000000000..9116d6ee9a2
Binary files /dev/null and b/public/images/emoji/win10/pretzel.png differ
diff --git a/public/images/emoji/win10/previous_track_button.png b/public/images/emoji/win10/previous_track_button.png
new file mode 100644
index 00000000000..b06fec19f2a
Binary files /dev/null and b/public/images/emoji/win10/previous_track_button.png differ
diff --git a/public/images/emoji/win10/prince.png b/public/images/emoji/win10/prince.png
new file mode 100644
index 00000000000..cda060f30fb
Binary files /dev/null and b/public/images/emoji/win10/prince.png differ
diff --git a/public/images/emoji/win10/prince/2.png b/public/images/emoji/win10/prince/2.png
new file mode 100644
index 00000000000..64318c8edcf
Binary files /dev/null and b/public/images/emoji/win10/prince/2.png differ
diff --git a/public/images/emoji/win10/prince/3.png b/public/images/emoji/win10/prince/3.png
new file mode 100644
index 00000000000..d663d3bc348
Binary files /dev/null and b/public/images/emoji/win10/prince/3.png differ
diff --git a/public/images/emoji/win10/prince/4.png b/public/images/emoji/win10/prince/4.png
new file mode 100644
index 00000000000..13a3b8ec783
Binary files /dev/null and b/public/images/emoji/win10/prince/4.png differ
diff --git a/public/images/emoji/win10/prince/5.png b/public/images/emoji/win10/prince/5.png
new file mode 100644
index 00000000000..298729c255c
Binary files /dev/null and b/public/images/emoji/win10/prince/5.png differ
diff --git a/public/images/emoji/win10/prince/6.png b/public/images/emoji/win10/prince/6.png
new file mode 100644
index 00000000000..2ced21697ca
Binary files /dev/null and b/public/images/emoji/win10/prince/6.png differ
diff --git a/public/images/emoji/win10/princess/2.png b/public/images/emoji/win10/princess/2.png
new file mode 100644
index 00000000000..2d8ba05b00a
Binary files /dev/null and b/public/images/emoji/win10/princess/2.png differ
diff --git a/public/images/emoji/win10/princess/3.png b/public/images/emoji/win10/princess/3.png
new file mode 100644
index 00000000000..104a36077c9
Binary files /dev/null and b/public/images/emoji/win10/princess/3.png differ
diff --git a/public/images/emoji/win10/princess/4.png b/public/images/emoji/win10/princess/4.png
new file mode 100644
index 00000000000..47cd3255127
Binary files /dev/null and b/public/images/emoji/win10/princess/4.png differ
diff --git a/public/images/emoji/win10/princess/5.png b/public/images/emoji/win10/princess/5.png
new file mode 100644
index 00000000000..7021ba9d1b8
Binary files /dev/null and b/public/images/emoji/win10/princess/5.png differ
diff --git a/public/images/emoji/win10/princess/6.png b/public/images/emoji/win10/princess/6.png
new file mode 100644
index 00000000000..3b9bca2b4dc
Binary files /dev/null and b/public/images/emoji/win10/princess/6.png differ
diff --git a/public/images/emoji/win10/puerto_rico.png b/public/images/emoji/win10/puerto_rico.png
new file mode 100644
index 00000000000..05a929944de
Binary files /dev/null and b/public/images/emoji/win10/puerto_rico.png differ
diff --git a/public/images/emoji/win10/punch/2.png b/public/images/emoji/win10/punch/2.png
new file mode 100644
index 00000000000..10713c080bd
Binary files /dev/null and b/public/images/emoji/win10/punch/2.png differ
diff --git a/public/images/emoji/win10/punch/3.png b/public/images/emoji/win10/punch/3.png
new file mode 100644
index 00000000000..b04e39925ee
Binary files /dev/null and b/public/images/emoji/win10/punch/3.png differ
diff --git a/public/images/emoji/win10/punch/4.png b/public/images/emoji/win10/punch/4.png
new file mode 100644
index 00000000000..984a309cd8f
Binary files /dev/null and b/public/images/emoji/win10/punch/4.png differ
diff --git a/public/images/emoji/win10/punch/5.png b/public/images/emoji/win10/punch/5.png
new file mode 100644
index 00000000000..3ab77933909
Binary files /dev/null and b/public/images/emoji/win10/punch/5.png differ
diff --git a/public/images/emoji/win10/punch/6.png b/public/images/emoji/win10/punch/6.png
new file mode 100644
index 00000000000..a564b18f51c
Binary files /dev/null and b/public/images/emoji/win10/punch/6.png differ
diff --git a/public/images/emoji/win10/qatar.png b/public/images/emoji/win10/qatar.png
new file mode 100644
index 00000000000..f51ae1d0ffd
Binary files /dev/null and b/public/images/emoji/win10/qatar.png differ
diff --git a/public/images/emoji/win10/rainbow_flag.png b/public/images/emoji/win10/rainbow_flag.png
new file mode 100644
index 00000000000..83c2d46ab24
Binary files /dev/null and b/public/images/emoji/win10/rainbow_flag.png differ
diff --git a/public/images/emoji/win10/raised_back_of_hand.png b/public/images/emoji/win10/raised_back_of_hand.png
new file mode 100644
index 00000000000..00a0114ea90
Binary files /dev/null and b/public/images/emoji/win10/raised_back_of_hand.png differ
diff --git a/public/images/emoji/win10/raised_back_of_hand/2.png b/public/images/emoji/win10/raised_back_of_hand/2.png
new file mode 100644
index 00000000000..253edb88743
Binary files /dev/null and b/public/images/emoji/win10/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/win10/raised_back_of_hand/3.png b/public/images/emoji/win10/raised_back_of_hand/3.png
new file mode 100644
index 00000000000..f31e390a90a
Binary files /dev/null and b/public/images/emoji/win10/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/win10/raised_back_of_hand/4.png b/public/images/emoji/win10/raised_back_of_hand/4.png
new file mode 100644
index 00000000000..684cd7e13a5
Binary files /dev/null and b/public/images/emoji/win10/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/win10/raised_back_of_hand/5.png b/public/images/emoji/win10/raised_back_of_hand/5.png
new file mode 100644
index 00000000000..b321f86b641
Binary files /dev/null and b/public/images/emoji/win10/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/win10/raised_back_of_hand/6.png b/public/images/emoji/win10/raised_back_of_hand/6.png
new file mode 100644
index 00000000000..043bebc91ed
Binary files /dev/null and b/public/images/emoji/win10/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/win10/raised_hand/2.png b/public/images/emoji/win10/raised_hand/2.png
new file mode 100644
index 00000000000..d78d8500561
Binary files /dev/null and b/public/images/emoji/win10/raised_hand/2.png differ
diff --git a/public/images/emoji/win10/raised_hand/3.png b/public/images/emoji/win10/raised_hand/3.png
new file mode 100644
index 00000000000..bafed3922df
Binary files /dev/null and b/public/images/emoji/win10/raised_hand/3.png differ
diff --git a/public/images/emoji/win10/raised_hand/4.png b/public/images/emoji/win10/raised_hand/4.png
new file mode 100644
index 00000000000..a516ef4e230
Binary files /dev/null and b/public/images/emoji/win10/raised_hand/4.png differ
diff --git a/public/images/emoji/win10/raised_hand/5.png b/public/images/emoji/win10/raised_hand/5.png
new file mode 100644
index 00000000000..71b2ea504a4
Binary files /dev/null and b/public/images/emoji/win10/raised_hand/5.png differ
diff --git a/public/images/emoji/win10/raised_hand/6.png b/public/images/emoji/win10/raised_hand/6.png
new file mode 100644
index 00000000000..46ea5b4e64c
Binary files /dev/null and b/public/images/emoji/win10/raised_hand/6.png differ
diff --git a/public/images/emoji/win10/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/win10/raised_hand_with_fingers_splayed/2.png
new file mode 100644
index 00000000000..f3267a72e5d
Binary files /dev/null and b/public/images/emoji/win10/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/win10/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/win10/raised_hand_with_fingers_splayed/3.png
new file mode 100644
index 00000000000..f184eba9115
Binary files /dev/null and b/public/images/emoji/win10/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/win10/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/win10/raised_hand_with_fingers_splayed/4.png
new file mode 100644
index 00000000000..355b8ac9316
Binary files /dev/null and b/public/images/emoji/win10/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/win10/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/win10/raised_hand_with_fingers_splayed/5.png
new file mode 100644
index 00000000000..6cfb97ebd14
Binary files /dev/null and b/public/images/emoji/win10/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/win10/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/win10/raised_hand_with_fingers_splayed/6.png
new file mode 100644
index 00000000000..35a9c3a1b31
Binary files /dev/null and b/public/images/emoji/win10/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/2.png
new file mode 100644
index 00000000000..317e548907b
Binary files /dev/null and b/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/3.png
new file mode 100644
index 00000000000..981c3dc12b7
Binary files /dev/null and b/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/4.png
new file mode 100644
index 00000000000..7af3f6715c9
Binary files /dev/null and b/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/5.png
new file mode 100644
index 00000000000..1b775210c0e
Binary files /dev/null and b/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/6.png
new file mode 100644
index 00000000000..11d10a9b07c
Binary files /dev/null and b/public/images/emoji/win10/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/win10/raised_hands/2.png b/public/images/emoji/win10/raised_hands/2.png
new file mode 100644
index 00000000000..5f85dc188ca
Binary files /dev/null and b/public/images/emoji/win10/raised_hands/2.png differ
diff --git a/public/images/emoji/win10/raised_hands/3.png b/public/images/emoji/win10/raised_hands/3.png
new file mode 100644
index 00000000000..e8bcd0bd6c2
Binary files /dev/null and b/public/images/emoji/win10/raised_hands/3.png differ
diff --git a/public/images/emoji/win10/raised_hands/4.png b/public/images/emoji/win10/raised_hands/4.png
new file mode 100644
index 00000000000..faa47587a41
Binary files /dev/null and b/public/images/emoji/win10/raised_hands/4.png differ
diff --git a/public/images/emoji/win10/raised_hands/5.png b/public/images/emoji/win10/raised_hands/5.png
new file mode 100644
index 00000000000..74d02ec7f8a
Binary files /dev/null and b/public/images/emoji/win10/raised_hands/5.png differ
diff --git a/public/images/emoji/win10/raised_hands/6.png b/public/images/emoji/win10/raised_hands/6.png
new file mode 100644
index 00000000000..86c5f066fcb
Binary files /dev/null and b/public/images/emoji/win10/raised_hands/6.png differ
diff --git a/public/images/emoji/win10/raising_hand/2.png b/public/images/emoji/win10/raising_hand/2.png
new file mode 100644
index 00000000000..5c8e90945bc
Binary files /dev/null and b/public/images/emoji/win10/raising_hand/2.png differ
diff --git a/public/images/emoji/win10/raising_hand/3.png b/public/images/emoji/win10/raising_hand/3.png
new file mode 100644
index 00000000000..0eb2a755de4
Binary files /dev/null and b/public/images/emoji/win10/raising_hand/3.png differ
diff --git a/public/images/emoji/win10/raising_hand/4.png b/public/images/emoji/win10/raising_hand/4.png
new file mode 100644
index 00000000000..0bb059a3faf
Binary files /dev/null and b/public/images/emoji/win10/raising_hand/4.png differ
diff --git a/public/images/emoji/win10/raising_hand/5.png b/public/images/emoji/win10/raising_hand/5.png
new file mode 100644
index 00000000000..fdba997b6e0
Binary files /dev/null and b/public/images/emoji/win10/raising_hand/5.png differ
diff --git a/public/images/emoji/win10/raising_hand/6.png b/public/images/emoji/win10/raising_hand/6.png
new file mode 100644
index 00000000000..121d8a000a7
Binary files /dev/null and b/public/images/emoji/win10/raising_hand/6.png differ
diff --git a/public/images/emoji/win10/raising_hand_man.png b/public/images/emoji/win10/raising_hand_man.png
new file mode 100644
index 00000000000..24021075bd7
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_man.png differ
diff --git a/public/images/emoji/win10/raising_hand_man/2.png b/public/images/emoji/win10/raising_hand_man/2.png
new file mode 100644
index 00000000000..9ace2368628
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_man/2.png differ
diff --git a/public/images/emoji/win10/raising_hand_man/3.png b/public/images/emoji/win10/raising_hand_man/3.png
new file mode 100644
index 00000000000..75ac82d04be
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_man/3.png differ
diff --git a/public/images/emoji/win10/raising_hand_man/4.png b/public/images/emoji/win10/raising_hand_man/4.png
new file mode 100644
index 00000000000..6ef77eb2846
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_man/4.png differ
diff --git a/public/images/emoji/win10/raising_hand_man/5.png b/public/images/emoji/win10/raising_hand_man/5.png
new file mode 100644
index 00000000000..44dd6aa55fe
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_man/5.png differ
diff --git a/public/images/emoji/win10/raising_hand_man/6.png b/public/images/emoji/win10/raising_hand_man/6.png
new file mode 100644
index 00000000000..098462ab2a9
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_man/6.png differ
diff --git a/public/images/emoji/win10/raising_hand_woman.png b/public/images/emoji/win10/raising_hand_woman.png
new file mode 100644
index 00000000000..f97a50924a5
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_woman.png differ
diff --git a/public/images/emoji/win10/raising_hand_woman/2.png b/public/images/emoji/win10/raising_hand_woman/2.png
new file mode 100644
index 00000000000..5c8e90945bc
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/win10/raising_hand_woman/3.png b/public/images/emoji/win10/raising_hand_woman/3.png
new file mode 100644
index 00000000000..0eb2a755de4
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/win10/raising_hand_woman/4.png b/public/images/emoji/win10/raising_hand_woman/4.png
new file mode 100644
index 00000000000..0bb059a3faf
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/win10/raising_hand_woman/5.png b/public/images/emoji/win10/raising_hand_woman/5.png
new file mode 100644
index 00000000000..fdba997b6e0
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/win10/raising_hand_woman/6.png b/public/images/emoji/win10/raising_hand_woman/6.png
new file mode 100644
index 00000000000..121d8a000a7
Binary files /dev/null and b/public/images/emoji/win10/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/win10/rescue_worker_helmet.png b/public/images/emoji/win10/rescue_worker_helmet.png
new file mode 100644
index 00000000000..79e1a5801c1
Binary files /dev/null and b/public/images/emoji/win10/rescue_worker_helmet.png differ
diff --git a/public/images/emoji/win10/reunion.png b/public/images/emoji/win10/reunion.png
new file mode 100644
index 00000000000..1679d4c5b9c
Binary files /dev/null and b/public/images/emoji/win10/reunion.png differ
diff --git a/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/2.png
new file mode 100644
index 00000000000..fe6bdc07803
Binary files /dev/null and b/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/3.png
new file mode 100644
index 00000000000..6e8798d3343
Binary files /dev/null and b/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/4.png
new file mode 100644
index 00000000000..56655292b82
Binary files /dev/null and b/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/5.png
new file mode 100644
index 00000000000..d7661ab8d5f
Binary files /dev/null and b/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/6.png
new file mode 100644
index 00000000000..7f0c702f9f9
Binary files /dev/null and b/public/images/emoji/win10/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/win10/rhinoceros.png b/public/images/emoji/win10/rhinoceros.png
new file mode 100644
index 00000000000..d2c91aa57d8
Binary files /dev/null and b/public/images/emoji/win10/rhinoceros.png differ
diff --git a/public/images/emoji/win10/rofl.png b/public/images/emoji/win10/rofl.png
new file mode 100644
index 00000000000..39f60567f64
Binary files /dev/null and b/public/images/emoji/win10/rofl.png differ
diff --git a/public/images/emoji/win10/roll_eyes.png b/public/images/emoji/win10/roll_eyes.png
new file mode 100644
index 00000000000..090ee207a4e
Binary files /dev/null and b/public/images/emoji/win10/roll_eyes.png differ
diff --git a/public/images/emoji/win10/romania.png b/public/images/emoji/win10/romania.png
new file mode 100644
index 00000000000..2b163248784
Binary files /dev/null and b/public/images/emoji/win10/romania.png differ
diff --git a/public/images/emoji/win10/rowboat.png b/public/images/emoji/win10/rowboat.png
index da7c189a856..4c3b2069372 100644
Binary files a/public/images/emoji/win10/rowboat.png and b/public/images/emoji/win10/rowboat.png differ
diff --git a/public/images/emoji/win10/rowboat/2.png b/public/images/emoji/win10/rowboat/2.png
new file mode 100644
index 00000000000..b62d6718367
Binary files /dev/null and b/public/images/emoji/win10/rowboat/2.png differ
diff --git a/public/images/emoji/win10/rowboat/3.png b/public/images/emoji/win10/rowboat/3.png
new file mode 100644
index 00000000000..55cc925046c
Binary files /dev/null and b/public/images/emoji/win10/rowboat/3.png differ
diff --git a/public/images/emoji/win10/rowboat/4.png b/public/images/emoji/win10/rowboat/4.png
new file mode 100644
index 00000000000..545fadd1835
Binary files /dev/null and b/public/images/emoji/win10/rowboat/4.png differ
diff --git a/public/images/emoji/win10/rowboat/5.png b/public/images/emoji/win10/rowboat/5.png
new file mode 100644
index 00000000000..877255c1c32
Binary files /dev/null and b/public/images/emoji/win10/rowboat/5.png differ
diff --git a/public/images/emoji/win10/rowboat/6.png b/public/images/emoji/win10/rowboat/6.png
new file mode 100644
index 00000000000..d16b8042961
Binary files /dev/null and b/public/images/emoji/win10/rowboat/6.png differ
diff --git a/public/images/emoji/win10/rowing_man.png b/public/images/emoji/win10/rowing_man.png
new file mode 100644
index 00000000000..4c3b2069372
Binary files /dev/null and b/public/images/emoji/win10/rowing_man.png differ
diff --git a/public/images/emoji/win10/rowing_man/2.png b/public/images/emoji/win10/rowing_man/2.png
new file mode 100644
index 00000000000..b62d6718367
Binary files /dev/null and b/public/images/emoji/win10/rowing_man/2.png differ
diff --git a/public/images/emoji/win10/rowing_man/3.png b/public/images/emoji/win10/rowing_man/3.png
new file mode 100644
index 00000000000..55cc925046c
Binary files /dev/null and b/public/images/emoji/win10/rowing_man/3.png differ
diff --git a/public/images/emoji/win10/rowing_man/4.png b/public/images/emoji/win10/rowing_man/4.png
new file mode 100644
index 00000000000..545fadd1835
Binary files /dev/null and b/public/images/emoji/win10/rowing_man/4.png differ
diff --git a/public/images/emoji/win10/rowing_man/5.png b/public/images/emoji/win10/rowing_man/5.png
new file mode 100644
index 00000000000..877255c1c32
Binary files /dev/null and b/public/images/emoji/win10/rowing_man/5.png differ
diff --git a/public/images/emoji/win10/rowing_man/6.png b/public/images/emoji/win10/rowing_man/6.png
new file mode 100644
index 00000000000..d16b8042961
Binary files /dev/null and b/public/images/emoji/win10/rowing_man/6.png differ
diff --git a/public/images/emoji/win10/rowing_woman.png b/public/images/emoji/win10/rowing_woman.png
new file mode 100644
index 00000000000..e681c59eaf5
Binary files /dev/null and b/public/images/emoji/win10/rowing_woman.png differ
diff --git a/public/images/emoji/win10/rowing_woman/2.png b/public/images/emoji/win10/rowing_woman/2.png
new file mode 100644
index 00000000000..11723ab7501
Binary files /dev/null and b/public/images/emoji/win10/rowing_woman/2.png differ
diff --git a/public/images/emoji/win10/rowing_woman/3.png b/public/images/emoji/win10/rowing_woman/3.png
new file mode 100644
index 00000000000..b55eda457d9
Binary files /dev/null and b/public/images/emoji/win10/rowing_woman/3.png differ
diff --git a/public/images/emoji/win10/rowing_woman/4.png b/public/images/emoji/win10/rowing_woman/4.png
new file mode 100644
index 00000000000..e47493a2747
Binary files /dev/null and b/public/images/emoji/win10/rowing_woman/4.png differ
diff --git a/public/images/emoji/win10/rowing_woman/5.png b/public/images/emoji/win10/rowing_woman/5.png
new file mode 100644
index 00000000000..fdbac0b0ccd
Binary files /dev/null and b/public/images/emoji/win10/rowing_woman/5.png differ
diff --git a/public/images/emoji/win10/rowing_woman/6.png b/public/images/emoji/win10/rowing_woman/6.png
new file mode 100644
index 00000000000..88b7dcb412d
Binary files /dev/null and b/public/images/emoji/win10/rowing_woman/6.png differ
diff --git a/public/images/emoji/win10/ru.png b/public/images/emoji/win10/ru.png
index 9b23019f392..3ecaefd941b 100644
Binary files a/public/images/emoji/win10/ru.png and b/public/images/emoji/win10/ru.png differ
diff --git a/public/images/emoji/win10/runner.png b/public/images/emoji/win10/runner.png
index 32a8cf7b890..acc37342e88 100644
Binary files a/public/images/emoji/win10/runner.png and b/public/images/emoji/win10/runner.png differ
diff --git a/public/images/emoji/win10/runner/2.png b/public/images/emoji/win10/runner/2.png
new file mode 100644
index 00000000000..0f106bab000
Binary files /dev/null and b/public/images/emoji/win10/runner/2.png differ
diff --git a/public/images/emoji/win10/runner/3.png b/public/images/emoji/win10/runner/3.png
new file mode 100644
index 00000000000..4958e4e942e
Binary files /dev/null and b/public/images/emoji/win10/runner/3.png differ
diff --git a/public/images/emoji/win10/runner/4.png b/public/images/emoji/win10/runner/4.png
new file mode 100644
index 00000000000..dbe98788131
Binary files /dev/null and b/public/images/emoji/win10/runner/4.png differ
diff --git a/public/images/emoji/win10/runner/5.png b/public/images/emoji/win10/runner/5.png
new file mode 100644
index 00000000000..02f8c5e2776
Binary files /dev/null and b/public/images/emoji/win10/runner/5.png differ
diff --git a/public/images/emoji/win10/runner/6.png b/public/images/emoji/win10/runner/6.png
new file mode 100644
index 00000000000..1c27c748116
Binary files /dev/null and b/public/images/emoji/win10/runner/6.png differ
diff --git a/public/images/emoji/win10/running_man.png b/public/images/emoji/win10/running_man.png
new file mode 100644
index 00000000000..acc37342e88
Binary files /dev/null and b/public/images/emoji/win10/running_man.png differ
diff --git a/public/images/emoji/win10/running_man/2.png b/public/images/emoji/win10/running_man/2.png
new file mode 100644
index 00000000000..0f106bab000
Binary files /dev/null and b/public/images/emoji/win10/running_man/2.png differ
diff --git a/public/images/emoji/win10/running_man/3.png b/public/images/emoji/win10/running_man/3.png
new file mode 100644
index 00000000000..4958e4e942e
Binary files /dev/null and b/public/images/emoji/win10/running_man/3.png differ
diff --git a/public/images/emoji/win10/running_man/4.png b/public/images/emoji/win10/running_man/4.png
new file mode 100644
index 00000000000..dbe98788131
Binary files /dev/null and b/public/images/emoji/win10/running_man/4.png differ
diff --git a/public/images/emoji/win10/running_man/5.png b/public/images/emoji/win10/running_man/5.png
new file mode 100644
index 00000000000..02f8c5e2776
Binary files /dev/null and b/public/images/emoji/win10/running_man/5.png differ
diff --git a/public/images/emoji/win10/running_man/6.png b/public/images/emoji/win10/running_man/6.png
new file mode 100644
index 00000000000..1c27c748116
Binary files /dev/null and b/public/images/emoji/win10/running_man/6.png differ
diff --git a/public/images/emoji/win10/running_woman.png b/public/images/emoji/win10/running_woman.png
new file mode 100644
index 00000000000..6bbbe6235b6
Binary files /dev/null and b/public/images/emoji/win10/running_woman.png differ
diff --git a/public/images/emoji/win10/running_woman/2.png b/public/images/emoji/win10/running_woman/2.png
new file mode 100644
index 00000000000..8f2147f7d91
Binary files /dev/null and b/public/images/emoji/win10/running_woman/2.png differ
diff --git a/public/images/emoji/win10/running_woman/3.png b/public/images/emoji/win10/running_woman/3.png
new file mode 100644
index 00000000000..e36d7ad0403
Binary files /dev/null and b/public/images/emoji/win10/running_woman/3.png differ
diff --git a/public/images/emoji/win10/running_woman/4.png b/public/images/emoji/win10/running_woman/4.png
new file mode 100644
index 00000000000..ee34edb5548
Binary files /dev/null and b/public/images/emoji/win10/running_woman/4.png differ
diff --git a/public/images/emoji/win10/running_woman/5.png b/public/images/emoji/win10/running_woman/5.png
new file mode 100644
index 00000000000..8a47cee58c3
Binary files /dev/null and b/public/images/emoji/win10/running_woman/5.png differ
diff --git a/public/images/emoji/win10/running_woman/6.png b/public/images/emoji/win10/running_woman/6.png
new file mode 100644
index 00000000000..6a0d134c8d4
Binary files /dev/null and b/public/images/emoji/win10/running_woman/6.png differ
diff --git a/public/images/emoji/win10/rwanda.png b/public/images/emoji/win10/rwanda.png
new file mode 100644
index 00000000000..a45a988ff58
Binary files /dev/null and b/public/images/emoji/win10/rwanda.png differ
diff --git a/public/images/emoji/win10/samoa.png b/public/images/emoji/win10/samoa.png
new file mode 100644
index 00000000000..de81c048d01
Binary files /dev/null and b/public/images/emoji/win10/samoa.png differ
diff --git a/public/images/emoji/win10/san_marino.png b/public/images/emoji/win10/san_marino.png
new file mode 100644
index 00000000000..fa20a008086
Binary files /dev/null and b/public/images/emoji/win10/san_marino.png differ
diff --git a/public/images/emoji/win10/sandwich.png b/public/images/emoji/win10/sandwich.png
new file mode 100644
index 00000000000..ba3f9a1cdb7
Binary files /dev/null and b/public/images/emoji/win10/sandwich.png differ
diff --git a/public/images/emoji/win10/santa/2.png b/public/images/emoji/win10/santa/2.png
new file mode 100644
index 00000000000..9ea4e99148f
Binary files /dev/null and b/public/images/emoji/win10/santa/2.png differ
diff --git a/public/images/emoji/win10/santa/3.png b/public/images/emoji/win10/santa/3.png
new file mode 100644
index 00000000000..dd45301a216
Binary files /dev/null and b/public/images/emoji/win10/santa/3.png differ
diff --git a/public/images/emoji/win10/santa/4.png b/public/images/emoji/win10/santa/4.png
new file mode 100644
index 00000000000..0a9acc7cf84
Binary files /dev/null and b/public/images/emoji/win10/santa/4.png differ
diff --git a/public/images/emoji/win10/santa/5.png b/public/images/emoji/win10/santa/5.png
new file mode 100644
index 00000000000..4ddf67edcf5
Binary files /dev/null and b/public/images/emoji/win10/santa/5.png differ
diff --git a/public/images/emoji/win10/santa/6.png b/public/images/emoji/win10/santa/6.png
new file mode 100644
index 00000000000..d7c3b0fc419
Binary files /dev/null and b/public/images/emoji/win10/santa/6.png differ
diff --git a/public/images/emoji/win10/sao_tome_principe.png b/public/images/emoji/win10/sao_tome_principe.png
new file mode 100644
index 00000000000..bbfcbd18df3
Binary files /dev/null and b/public/images/emoji/win10/sao_tome_principe.png differ
diff --git a/public/images/emoji/win10/saudi_arabia.png b/public/images/emoji/win10/saudi_arabia.png
new file mode 100644
index 00000000000..59954eccbc0
Binary files /dev/null and b/public/images/emoji/win10/saudi_arabia.png differ
diff --git a/public/images/emoji/win10/sauropod.png b/public/images/emoji/win10/sauropod.png
new file mode 100644
index 00000000000..2f4d6199975
Binary files /dev/null and b/public/images/emoji/win10/sauropod.png differ
diff --git a/public/images/emoji/win10/scarf.png b/public/images/emoji/win10/scarf.png
new file mode 100644
index 00000000000..73653eee2bd
Binary files /dev/null and b/public/images/emoji/win10/scarf.png differ
diff --git a/public/images/emoji/win10/selfie.png b/public/images/emoji/win10/selfie.png
new file mode 100644
index 00000000000..04120c6992a
Binary files /dev/null and b/public/images/emoji/win10/selfie.png differ
diff --git a/public/images/emoji/win10/selfie/2.png b/public/images/emoji/win10/selfie/2.png
new file mode 100644
index 00000000000..77498678fca
Binary files /dev/null and b/public/images/emoji/win10/selfie/2.png differ
diff --git a/public/images/emoji/win10/selfie/3.png b/public/images/emoji/win10/selfie/3.png
new file mode 100644
index 00000000000..b1738f03b04
Binary files /dev/null and b/public/images/emoji/win10/selfie/3.png differ
diff --git a/public/images/emoji/win10/selfie/4.png b/public/images/emoji/win10/selfie/4.png
new file mode 100644
index 00000000000..201bfb01122
Binary files /dev/null and b/public/images/emoji/win10/selfie/4.png differ
diff --git a/public/images/emoji/win10/selfie/5.png b/public/images/emoji/win10/selfie/5.png
new file mode 100644
index 00000000000..8518503c554
Binary files /dev/null and b/public/images/emoji/win10/selfie/5.png differ
diff --git a/public/images/emoji/win10/selfie/6.png b/public/images/emoji/win10/selfie/6.png
new file mode 100644
index 00000000000..91e2bc9aae5
Binary files /dev/null and b/public/images/emoji/win10/selfie/6.png differ
diff --git a/public/images/emoji/win10/senegal.png b/public/images/emoji/win10/senegal.png
new file mode 100644
index 00000000000..2d32427625a
Binary files /dev/null and b/public/images/emoji/win10/senegal.png differ
diff --git a/public/images/emoji/win10/serbia.png b/public/images/emoji/win10/serbia.png
new file mode 100644
index 00000000000..a7af1346e56
Binary files /dev/null and b/public/images/emoji/win10/serbia.png differ
diff --git a/public/images/emoji/win10/seven.png b/public/images/emoji/win10/seven.png
index 1c839c4e10d..8e280d07c46 100644
Binary files a/public/images/emoji/win10/seven.png and b/public/images/emoji/win10/seven.png differ
diff --git a/public/images/emoji/win10/seychelles.png b/public/images/emoji/win10/seychelles.png
new file mode 100644
index 00000000000..e69ca6add18
Binary files /dev/null and b/public/images/emoji/win10/seychelles.png differ
diff --git a/public/images/emoji/win10/shallow_pan_of_food.png b/public/images/emoji/win10/shallow_pan_of_food.png
new file mode 100644
index 00000000000..1bab061aab1
Binary files /dev/null and b/public/images/emoji/win10/shallow_pan_of_food.png differ
diff --git a/public/images/emoji/win10/shark.png b/public/images/emoji/win10/shark.png
new file mode 100644
index 00000000000..312241778c1
Binary files /dev/null and b/public/images/emoji/win10/shark.png differ
diff --git a/public/images/emoji/win10/shopping.png b/public/images/emoji/win10/shopping.png
new file mode 100644
index 00000000000..f0b9ad84199
Binary files /dev/null and b/public/images/emoji/win10/shopping.png differ
diff --git a/public/images/emoji/win10/shopping_cart.png b/public/images/emoji/win10/shopping_cart.png
new file mode 100644
index 00000000000..4259b68670d
Binary files /dev/null and b/public/images/emoji/win10/shopping_cart.png differ
diff --git a/public/images/emoji/win10/shrimp.png b/public/images/emoji/win10/shrimp.png
new file mode 100644
index 00000000000..f0e4aabf227
Binary files /dev/null and b/public/images/emoji/win10/shrimp.png differ
diff --git a/public/images/emoji/win10/sierra_leone.png b/public/images/emoji/win10/sierra_leone.png
new file mode 100644
index 00000000000..816f090002a
Binary files /dev/null and b/public/images/emoji/win10/sierra_leone.png differ
diff --git a/public/images/emoji/win10/sign_of_the_horns/2.png b/public/images/emoji/win10/sign_of_the_horns/2.png
new file mode 100644
index 00000000000..f4cb9f579e5
Binary files /dev/null and b/public/images/emoji/win10/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/win10/sign_of_the_horns/3.png b/public/images/emoji/win10/sign_of_the_horns/3.png
new file mode 100644
index 00000000000..02b9eb9bf2d
Binary files /dev/null and b/public/images/emoji/win10/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/win10/sign_of_the_horns/4.png b/public/images/emoji/win10/sign_of_the_horns/4.png
new file mode 100644
index 00000000000..a9aeb8c2710
Binary files /dev/null and b/public/images/emoji/win10/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/win10/sign_of_the_horns/5.png b/public/images/emoji/win10/sign_of_the_horns/5.png
new file mode 100644
index 00000000000..ea8e140a702
Binary files /dev/null and b/public/images/emoji/win10/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/win10/sign_of_the_horns/6.png b/public/images/emoji/win10/sign_of_the_horns/6.png
new file mode 100644
index 00000000000..84336d469cd
Binary files /dev/null and b/public/images/emoji/win10/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/win10/singapore.png b/public/images/emoji/win10/singapore.png
new file mode 100644
index 00000000000..4cf2332d20f
Binary files /dev/null and b/public/images/emoji/win10/singapore.png differ
diff --git a/public/images/emoji/win10/sint_maarten.png b/public/images/emoji/win10/sint_maarten.png
new file mode 100644
index 00000000000..5248152aba9
Binary files /dev/null and b/public/images/emoji/win10/sint_maarten.png differ
diff --git a/public/images/emoji/win10/six.png b/public/images/emoji/win10/six.png
index 8e8a805e87d..230e33849b8 100644
Binary files a/public/images/emoji/win10/six.png and b/public/images/emoji/win10/six.png differ
diff --git a/public/images/emoji/win10/sled.png b/public/images/emoji/win10/sled.png
new file mode 100644
index 00000000000..01805b1fe76
Binary files /dev/null and b/public/images/emoji/win10/sled.png differ
diff --git a/public/images/emoji/win10/sleeping_accommodation/2.png b/public/images/emoji/win10/sleeping_accommodation/2.png
new file mode 100644
index 00000000000..a432127ee26
Binary files /dev/null and b/public/images/emoji/win10/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/win10/sleeping_accommodation/3.png b/public/images/emoji/win10/sleeping_accommodation/3.png
new file mode 100644
index 00000000000..67bdaa91728
Binary files /dev/null and b/public/images/emoji/win10/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/win10/sleeping_accommodation/4.png b/public/images/emoji/win10/sleeping_accommodation/4.png
new file mode 100644
index 00000000000..3473e32be27
Binary files /dev/null and b/public/images/emoji/win10/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/win10/sleeping_accommodation/5.png b/public/images/emoji/win10/sleeping_accommodation/5.png
new file mode 100644
index 00000000000..c7ee71281f1
Binary files /dev/null and b/public/images/emoji/win10/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/win10/sleeping_accommodation/6.png b/public/images/emoji/win10/sleeping_accommodation/6.png
new file mode 100644
index 00000000000..606e3238e5b
Binary files /dev/null and b/public/images/emoji/win10/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/win10/sleeping_bed.png b/public/images/emoji/win10/sleeping_bed.png
new file mode 100644
index 00000000000..22f9cf2543d
Binary files /dev/null and b/public/images/emoji/win10/sleeping_bed.png differ
diff --git a/public/images/emoji/win10/sleeping_bed/2.png b/public/images/emoji/win10/sleeping_bed/2.png
new file mode 100644
index 00000000000..a432127ee26
Binary files /dev/null and b/public/images/emoji/win10/sleeping_bed/2.png differ
diff --git a/public/images/emoji/win10/sleeping_bed/3.png b/public/images/emoji/win10/sleeping_bed/3.png
new file mode 100644
index 00000000000..67bdaa91728
Binary files /dev/null and b/public/images/emoji/win10/sleeping_bed/3.png differ
diff --git a/public/images/emoji/win10/sleeping_bed/4.png b/public/images/emoji/win10/sleeping_bed/4.png
new file mode 100644
index 00000000000..3473e32be27
Binary files /dev/null and b/public/images/emoji/win10/sleeping_bed/4.png differ
diff --git a/public/images/emoji/win10/sleeping_bed/5.png b/public/images/emoji/win10/sleeping_bed/5.png
new file mode 100644
index 00000000000..c7ee71281f1
Binary files /dev/null and b/public/images/emoji/win10/sleeping_bed/5.png differ
diff --git a/public/images/emoji/win10/sleeping_bed/6.png b/public/images/emoji/win10/sleeping_bed/6.png
new file mode 100644
index 00000000000..606e3238e5b
Binary files /dev/null and b/public/images/emoji/win10/sleeping_bed/6.png differ
diff --git a/public/images/emoji/win10/sleuth_or_spy/2.png b/public/images/emoji/win10/sleuth_or_spy/2.png
new file mode 100644
index 00000000000..2e3b2bed292
Binary files /dev/null and b/public/images/emoji/win10/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/win10/sleuth_or_spy/3.png b/public/images/emoji/win10/sleuth_or_spy/3.png
new file mode 100644
index 00000000000..f434db9e086
Binary files /dev/null and b/public/images/emoji/win10/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/win10/sleuth_or_spy/4.png b/public/images/emoji/win10/sleuth_or_spy/4.png
new file mode 100644
index 00000000000..18e8b564e06
Binary files /dev/null and b/public/images/emoji/win10/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/win10/sleuth_or_spy/5.png b/public/images/emoji/win10/sleuth_or_spy/5.png
new file mode 100644
index 00000000000..97c22cf8796
Binary files /dev/null and b/public/images/emoji/win10/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/win10/sleuth_or_spy/6.png b/public/images/emoji/win10/sleuth_or_spy/6.png
new file mode 100644
index 00000000000..38b339fd02b
Binary files /dev/null and b/public/images/emoji/win10/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/win10/slightly_smiling.png b/public/images/emoji/win10/slightly_smiling.png
new file mode 100644
index 00000000000..718d272dd8d
Binary files /dev/null and b/public/images/emoji/win10/slightly_smiling.png differ
diff --git a/public/images/emoji/win10/slovakia.png b/public/images/emoji/win10/slovakia.png
new file mode 100644
index 00000000000..9b716032fd8
Binary files /dev/null and b/public/images/emoji/win10/slovakia.png differ
diff --git a/public/images/emoji/win10/slovenia.png b/public/images/emoji/win10/slovenia.png
new file mode 100644
index 00000000000..6dfbe6eae24
Binary files /dev/null and b/public/images/emoji/win10/slovenia.png differ
diff --git a/public/images/emoji/win10/sneezing_face.png b/public/images/emoji/win10/sneezing_face.png
new file mode 100644
index 00000000000..858eed43404
Binary files /dev/null and b/public/images/emoji/win10/sneezing_face.png differ
diff --git a/public/images/emoji/win10/snowboarder/2.png b/public/images/emoji/win10/snowboarder/2.png
new file mode 100644
index 00000000000..3bca4609809
Binary files /dev/null and b/public/images/emoji/win10/snowboarder/2.png differ
diff --git a/public/images/emoji/win10/snowboarder/3.png b/public/images/emoji/win10/snowboarder/3.png
new file mode 100644
index 00000000000..3de3d071c20
Binary files /dev/null and b/public/images/emoji/win10/snowboarder/3.png differ
diff --git a/public/images/emoji/win10/snowboarder/4.png b/public/images/emoji/win10/snowboarder/4.png
new file mode 100644
index 00000000000..52ac8cb8bcf
Binary files /dev/null and b/public/images/emoji/win10/snowboarder/4.png differ
diff --git a/public/images/emoji/win10/snowboarder/5.png b/public/images/emoji/win10/snowboarder/5.png
new file mode 100644
index 00000000000..0cc104e1bae
Binary files /dev/null and b/public/images/emoji/win10/snowboarder/5.png differ
diff --git a/public/images/emoji/win10/snowboarder/6.png b/public/images/emoji/win10/snowboarder/6.png
new file mode 100644
index 00000000000..a2f1f6e7978
Binary files /dev/null and b/public/images/emoji/win10/snowboarder/6.png differ
diff --git a/public/images/emoji/win10/snowflake.png b/public/images/emoji/win10/snowflake.png
index d91b8e18a52..15c8943929b 100644
Binary files a/public/images/emoji/win10/snowflake.png and b/public/images/emoji/win10/snowflake.png differ
diff --git a/public/images/emoji/win10/snowman_with_snow.png b/public/images/emoji/win10/snowman_with_snow.png
new file mode 100644
index 00000000000..d9bf8ee5804
Binary files /dev/null and b/public/images/emoji/win10/snowman_with_snow.png differ
diff --git a/public/images/emoji/win10/socks.png b/public/images/emoji/win10/socks.png
new file mode 100644
index 00000000000..8f2b9bbe9e3
Binary files /dev/null and b/public/images/emoji/win10/socks.png differ
diff --git a/public/images/emoji/win10/solomon_islands.png b/public/images/emoji/win10/solomon_islands.png
new file mode 100644
index 00000000000..e4476e18806
Binary files /dev/null and b/public/images/emoji/win10/solomon_islands.png differ
diff --git a/public/images/emoji/win10/somalia.png b/public/images/emoji/win10/somalia.png
new file mode 100644
index 00000000000..209fffeaed0
Binary files /dev/null and b/public/images/emoji/win10/somalia.png differ
diff --git a/public/images/emoji/win10/south_africa.png b/public/images/emoji/win10/south_africa.png
new file mode 100644
index 00000000000..d40f1c75c81
Binary files /dev/null and b/public/images/emoji/win10/south_africa.png differ
diff --git a/public/images/emoji/win10/south_georgia_south_sandwich_islands.png b/public/images/emoji/win10/south_georgia_south_sandwich_islands.png
new file mode 100644
index 00000000000..58f47bcd9b9
Binary files /dev/null and b/public/images/emoji/win10/south_georgia_south_sandwich_islands.png differ
diff --git a/public/images/emoji/win10/south_sudan.png b/public/images/emoji/win10/south_sudan.png
new file mode 100644
index 00000000000..c7cbc6967c2
Binary files /dev/null and b/public/images/emoji/win10/south_sudan.png differ
diff --git a/public/images/emoji/win10/spiral_calendar.png b/public/images/emoji/win10/spiral_calendar.png
new file mode 100644
index 00000000000..9e3b1e146f5
Binary files /dev/null and b/public/images/emoji/win10/spiral_calendar.png differ
diff --git a/public/images/emoji/win10/spiral_notepad.png b/public/images/emoji/win10/spiral_notepad.png
new file mode 100644
index 00000000000..356ee6a9179
Binary files /dev/null and b/public/images/emoji/win10/spiral_notepad.png differ
diff --git a/public/images/emoji/win10/spoon.png b/public/images/emoji/win10/spoon.png
new file mode 100644
index 00000000000..208b65fc9b0
Binary files /dev/null and b/public/images/emoji/win10/spoon.png differ
diff --git a/public/images/emoji/win10/spy/2.png b/public/images/emoji/win10/spy/2.png
new file mode 100644
index 00000000000..2e3b2bed292
Binary files /dev/null and b/public/images/emoji/win10/spy/2.png differ
diff --git a/public/images/emoji/win10/spy/3.png b/public/images/emoji/win10/spy/3.png
new file mode 100644
index 00000000000..f434db9e086
Binary files /dev/null and b/public/images/emoji/win10/spy/3.png differ
diff --git a/public/images/emoji/win10/spy/4.png b/public/images/emoji/win10/spy/4.png
new file mode 100644
index 00000000000..18e8b564e06
Binary files /dev/null and b/public/images/emoji/win10/spy/4.png differ
diff --git a/public/images/emoji/win10/spy/5.png b/public/images/emoji/win10/spy/5.png
new file mode 100644
index 00000000000..97c22cf8796
Binary files /dev/null and b/public/images/emoji/win10/spy/5.png differ
diff --git a/public/images/emoji/win10/spy/6.png b/public/images/emoji/win10/spy/6.png
new file mode 100644
index 00000000000..38b339fd02b
Binary files /dev/null and b/public/images/emoji/win10/spy/6.png differ
diff --git a/public/images/emoji/win10/squid.png b/public/images/emoji/win10/squid.png
new file mode 100644
index 00000000000..1ef1123926d
Binary files /dev/null and b/public/images/emoji/win10/squid.png differ
diff --git a/public/images/emoji/win10/sri_lanka.png b/public/images/emoji/win10/sri_lanka.png
new file mode 100644
index 00000000000..f15b9be56dd
Binary files /dev/null and b/public/images/emoji/win10/sri_lanka.png differ
diff --git a/public/images/emoji/win10/st_barthelemy.png b/public/images/emoji/win10/st_barthelemy.png
new file mode 100644
index 00000000000..e213bf7e406
Binary files /dev/null and b/public/images/emoji/win10/st_barthelemy.png differ
diff --git a/public/images/emoji/win10/st_helena.png b/public/images/emoji/win10/st_helena.png
new file mode 100644
index 00000000000..90fefd0cab2
Binary files /dev/null and b/public/images/emoji/win10/st_helena.png differ
diff --git a/public/images/emoji/win10/st_kitts_nevis.png b/public/images/emoji/win10/st_kitts_nevis.png
new file mode 100644
index 00000000000..d7686f8b603
Binary files /dev/null and b/public/images/emoji/win10/st_kitts_nevis.png differ
diff --git a/public/images/emoji/win10/st_lucia.png b/public/images/emoji/win10/st_lucia.png
new file mode 100644
index 00000000000..92eafffe947
Binary files /dev/null and b/public/images/emoji/win10/st_lucia.png differ
diff --git a/public/images/emoji/win10/st_martin.png b/public/images/emoji/win10/st_martin.png
new file mode 100644
index 00000000000..7943b73f671
Binary files /dev/null and b/public/images/emoji/win10/st_martin.png differ
diff --git a/public/images/emoji/win10/st_pierre_miquelon.png b/public/images/emoji/win10/st_pierre_miquelon.png
new file mode 100644
index 00000000000..b05828b47cb
Binary files /dev/null and b/public/images/emoji/win10/st_pierre_miquelon.png differ
diff --git a/public/images/emoji/win10/st_vincent_grenadines.png b/public/images/emoji/win10/st_vincent_grenadines.png
new file mode 100644
index 00000000000..ddfd25fd227
Binary files /dev/null and b/public/images/emoji/win10/st_vincent_grenadines.png differ
diff --git a/public/images/emoji/win10/star_struck.png b/public/images/emoji/win10/star_struck.png
new file mode 100644
index 00000000000..7da8183f394
Binary files /dev/null and b/public/images/emoji/win10/star_struck.png differ
diff --git a/public/images/emoji/win10/stop_sign.png b/public/images/emoji/win10/stop_sign.png
new file mode 100644
index 00000000000..ca997dac302
Binary files /dev/null and b/public/images/emoji/win10/stop_sign.png differ
diff --git a/public/images/emoji/win10/stuffed_flatbread.png b/public/images/emoji/win10/stuffed_flatbread.png
new file mode 100644
index 00000000000..00397d37345
Binary files /dev/null and b/public/images/emoji/win10/stuffed_flatbread.png differ
diff --git a/public/images/emoji/win10/sudan.png b/public/images/emoji/win10/sudan.png
new file mode 100644
index 00000000000..3974a07328c
Binary files /dev/null and b/public/images/emoji/win10/sudan.png differ
diff --git a/public/images/emoji/win10/sun_behind_large_cloud.png b/public/images/emoji/win10/sun_behind_large_cloud.png
new file mode 100644
index 00000000000..fd650f5bb30
Binary files /dev/null and b/public/images/emoji/win10/sun_behind_large_cloud.png differ
diff --git a/public/images/emoji/win10/sun_behind_rain_cloud.png b/public/images/emoji/win10/sun_behind_rain_cloud.png
new file mode 100644
index 00000000000..7013ea4de50
Binary files /dev/null and b/public/images/emoji/win10/sun_behind_rain_cloud.png differ
diff --git a/public/images/emoji/win10/sun_behind_small_cloud.png b/public/images/emoji/win10/sun_behind_small_cloud.png
new file mode 100644
index 00000000000..53525213719
Binary files /dev/null and b/public/images/emoji/win10/sun_behind_small_cloud.png differ
diff --git a/public/images/emoji/win10/surfer.png b/public/images/emoji/win10/surfer.png
index fb460756af6..77a10e6230c 100644
Binary files a/public/images/emoji/win10/surfer.png and b/public/images/emoji/win10/surfer.png differ
diff --git a/public/images/emoji/win10/surfer/2.png b/public/images/emoji/win10/surfer/2.png
new file mode 100644
index 00000000000..b6822a9e01d
Binary files /dev/null and b/public/images/emoji/win10/surfer/2.png differ
diff --git a/public/images/emoji/win10/surfer/3.png b/public/images/emoji/win10/surfer/3.png
new file mode 100644
index 00000000000..466007cdd3b
Binary files /dev/null and b/public/images/emoji/win10/surfer/3.png differ
diff --git a/public/images/emoji/win10/surfer/4.png b/public/images/emoji/win10/surfer/4.png
new file mode 100644
index 00000000000..7592beb3b3b
Binary files /dev/null and b/public/images/emoji/win10/surfer/4.png differ
diff --git a/public/images/emoji/win10/surfer/5.png b/public/images/emoji/win10/surfer/5.png
new file mode 100644
index 00000000000..272ed04574e
Binary files /dev/null and b/public/images/emoji/win10/surfer/5.png differ
diff --git a/public/images/emoji/win10/surfer/6.png b/public/images/emoji/win10/surfer/6.png
new file mode 100644
index 00000000000..dcd327a9936
Binary files /dev/null and b/public/images/emoji/win10/surfer/6.png differ
diff --git a/public/images/emoji/win10/surfing_man.png b/public/images/emoji/win10/surfing_man.png
new file mode 100644
index 00000000000..77a10e6230c
Binary files /dev/null and b/public/images/emoji/win10/surfing_man.png differ
diff --git a/public/images/emoji/win10/surfing_man/2.png b/public/images/emoji/win10/surfing_man/2.png
new file mode 100644
index 00000000000..b6822a9e01d
Binary files /dev/null and b/public/images/emoji/win10/surfing_man/2.png differ
diff --git a/public/images/emoji/win10/surfing_man/3.png b/public/images/emoji/win10/surfing_man/3.png
new file mode 100644
index 00000000000..466007cdd3b
Binary files /dev/null and b/public/images/emoji/win10/surfing_man/3.png differ
diff --git a/public/images/emoji/win10/surfing_man/4.png b/public/images/emoji/win10/surfing_man/4.png
new file mode 100644
index 00000000000..7592beb3b3b
Binary files /dev/null and b/public/images/emoji/win10/surfing_man/4.png differ
diff --git a/public/images/emoji/win10/surfing_man/5.png b/public/images/emoji/win10/surfing_man/5.png
new file mode 100644
index 00000000000..272ed04574e
Binary files /dev/null and b/public/images/emoji/win10/surfing_man/5.png differ
diff --git a/public/images/emoji/win10/surfing_man/6.png b/public/images/emoji/win10/surfing_man/6.png
new file mode 100644
index 00000000000..dcd327a9936
Binary files /dev/null and b/public/images/emoji/win10/surfing_man/6.png differ
diff --git a/public/images/emoji/win10/surfing_woman.png b/public/images/emoji/win10/surfing_woman.png
new file mode 100644
index 00000000000..b899da6939f
Binary files /dev/null and b/public/images/emoji/win10/surfing_woman.png differ
diff --git a/public/images/emoji/win10/surfing_woman/2.png b/public/images/emoji/win10/surfing_woman/2.png
new file mode 100644
index 00000000000..a7bc5f3bf0c
Binary files /dev/null and b/public/images/emoji/win10/surfing_woman/2.png differ
diff --git a/public/images/emoji/win10/surfing_woman/3.png b/public/images/emoji/win10/surfing_woman/3.png
new file mode 100644
index 00000000000..e4d80b9b129
Binary files /dev/null and b/public/images/emoji/win10/surfing_woman/3.png differ
diff --git a/public/images/emoji/win10/surfing_woman/4.png b/public/images/emoji/win10/surfing_woman/4.png
new file mode 100644
index 00000000000..b8510888c08
Binary files /dev/null and b/public/images/emoji/win10/surfing_woman/4.png differ
diff --git a/public/images/emoji/win10/surfing_woman/5.png b/public/images/emoji/win10/surfing_woman/5.png
new file mode 100644
index 00000000000..90fe9d3cf9a
Binary files /dev/null and b/public/images/emoji/win10/surfing_woman/5.png differ
diff --git a/public/images/emoji/win10/surfing_woman/6.png b/public/images/emoji/win10/surfing_woman/6.png
new file mode 100644
index 00000000000..21b0ba1e051
Binary files /dev/null and b/public/images/emoji/win10/surfing_woman/6.png differ
diff --git a/public/images/emoji/win10/suriname.png b/public/images/emoji/win10/suriname.png
new file mode 100644
index 00000000000..48afc4adac5
Binary files /dev/null and b/public/images/emoji/win10/suriname.png differ
diff --git a/public/images/emoji/win10/sushing_face.png b/public/images/emoji/win10/sushing_face.png
new file mode 100644
index 00000000000..e4427cbd153
Binary files /dev/null and b/public/images/emoji/win10/sushing_face.png differ
diff --git a/public/images/emoji/win10/svalbard_and_jan_mayen.png b/public/images/emoji/win10/svalbard_and_jan_mayen.png
new file mode 100644
index 00000000000..004a11d8308
Binary files /dev/null and b/public/images/emoji/win10/svalbard_and_jan_mayen.png differ
diff --git a/public/images/emoji/win10/swaziland.png b/public/images/emoji/win10/swaziland.png
new file mode 100644
index 00000000000..fb5ee97ba24
Binary files /dev/null and b/public/images/emoji/win10/swaziland.png differ
diff --git a/public/images/emoji/win10/sweat_drops.png b/public/images/emoji/win10/sweat_drops.png
index 1b921089420..a1198aaf79d 100644
Binary files a/public/images/emoji/win10/sweat_drops.png and b/public/images/emoji/win10/sweat_drops.png differ
diff --git a/public/images/emoji/win10/sweden.png b/public/images/emoji/win10/sweden.png
new file mode 100644
index 00000000000..3b46fe18abc
Binary files /dev/null and b/public/images/emoji/win10/sweden.png differ
diff --git a/public/images/emoji/win10/swimmer.png b/public/images/emoji/win10/swimmer.png
index 4bcdaecb4de..ba294244a5d 100644
Binary files a/public/images/emoji/win10/swimmer.png and b/public/images/emoji/win10/swimmer.png differ
diff --git a/public/images/emoji/win10/swimmer/2.png b/public/images/emoji/win10/swimmer/2.png
new file mode 100644
index 00000000000..1cbe6239bb6
Binary files /dev/null and b/public/images/emoji/win10/swimmer/2.png differ
diff --git a/public/images/emoji/win10/swimmer/3.png b/public/images/emoji/win10/swimmer/3.png
new file mode 100644
index 00000000000..7c532b88e06
Binary files /dev/null and b/public/images/emoji/win10/swimmer/3.png differ
diff --git a/public/images/emoji/win10/swimmer/4.png b/public/images/emoji/win10/swimmer/4.png
new file mode 100644
index 00000000000..e46de30a6b3
Binary files /dev/null and b/public/images/emoji/win10/swimmer/4.png differ
diff --git a/public/images/emoji/win10/swimmer/5.png b/public/images/emoji/win10/swimmer/5.png
new file mode 100644
index 00000000000..eef6aeffe00
Binary files /dev/null and b/public/images/emoji/win10/swimmer/5.png differ
diff --git a/public/images/emoji/win10/swimmer/6.png b/public/images/emoji/win10/swimmer/6.png
new file mode 100644
index 00000000000..ec0f6f16736
Binary files /dev/null and b/public/images/emoji/win10/swimmer/6.png differ
diff --git a/public/images/emoji/win10/swimming_man.png b/public/images/emoji/win10/swimming_man.png
new file mode 100644
index 00000000000..ba294244a5d
Binary files /dev/null and b/public/images/emoji/win10/swimming_man.png differ
diff --git a/public/images/emoji/win10/swimming_man/2.png b/public/images/emoji/win10/swimming_man/2.png
new file mode 100644
index 00000000000..1cbe6239bb6
Binary files /dev/null and b/public/images/emoji/win10/swimming_man/2.png differ
diff --git a/public/images/emoji/win10/swimming_man/3.png b/public/images/emoji/win10/swimming_man/3.png
new file mode 100644
index 00000000000..7c532b88e06
Binary files /dev/null and b/public/images/emoji/win10/swimming_man/3.png differ
diff --git a/public/images/emoji/win10/swimming_man/4.png b/public/images/emoji/win10/swimming_man/4.png
new file mode 100644
index 00000000000..e46de30a6b3
Binary files /dev/null and b/public/images/emoji/win10/swimming_man/4.png differ
diff --git a/public/images/emoji/win10/swimming_man/5.png b/public/images/emoji/win10/swimming_man/5.png
new file mode 100644
index 00000000000..eef6aeffe00
Binary files /dev/null and b/public/images/emoji/win10/swimming_man/5.png differ
diff --git a/public/images/emoji/win10/swimming_man/6.png b/public/images/emoji/win10/swimming_man/6.png
new file mode 100644
index 00000000000..ec0f6f16736
Binary files /dev/null and b/public/images/emoji/win10/swimming_man/6.png differ
diff --git a/public/images/emoji/win10/swimming_woman.png b/public/images/emoji/win10/swimming_woman.png
new file mode 100644
index 00000000000..ea4853cd299
Binary files /dev/null and b/public/images/emoji/win10/swimming_woman.png differ
diff --git a/public/images/emoji/win10/swimming_woman/2.png b/public/images/emoji/win10/swimming_woman/2.png
new file mode 100644
index 00000000000..c330f66129f
Binary files /dev/null and b/public/images/emoji/win10/swimming_woman/2.png differ
diff --git a/public/images/emoji/win10/swimming_woman/3.png b/public/images/emoji/win10/swimming_woman/3.png
new file mode 100644
index 00000000000..c1106311e55
Binary files /dev/null and b/public/images/emoji/win10/swimming_woman/3.png differ
diff --git a/public/images/emoji/win10/swimming_woman/4.png b/public/images/emoji/win10/swimming_woman/4.png
new file mode 100644
index 00000000000..a7b43072fc0
Binary files /dev/null and b/public/images/emoji/win10/swimming_woman/4.png differ
diff --git a/public/images/emoji/win10/swimming_woman/5.png b/public/images/emoji/win10/swimming_woman/5.png
new file mode 100644
index 00000000000..a3c6fefdf87
Binary files /dev/null and b/public/images/emoji/win10/swimming_woman/5.png differ
diff --git a/public/images/emoji/win10/swimming_woman/6.png b/public/images/emoji/win10/swimming_woman/6.png
new file mode 100644
index 00000000000..e3b91fe2fa3
Binary files /dev/null and b/public/images/emoji/win10/swimming_woman/6.png differ
diff --git a/public/images/emoji/win10/switzerland.png b/public/images/emoji/win10/switzerland.png
new file mode 100644
index 00000000000..e0caa61ba63
Binary files /dev/null and b/public/images/emoji/win10/switzerland.png differ
diff --git a/public/images/emoji/win10/syria.png b/public/images/emoji/win10/syria.png
new file mode 100644
index 00000000000..53606f3e075
Binary files /dev/null and b/public/images/emoji/win10/syria.png differ
diff --git a/public/images/emoji/win10/t_rex.png b/public/images/emoji/win10/t_rex.png
new file mode 100644
index 00000000000..d8811a56382
Binary files /dev/null and b/public/images/emoji/win10/t_rex.png differ
diff --git a/public/images/emoji/win10/taiwan.png b/public/images/emoji/win10/taiwan.png
new file mode 100644
index 00000000000..dde348b40da
Binary files /dev/null and b/public/images/emoji/win10/taiwan.png differ
diff --git a/public/images/emoji/win10/tajikistan.png b/public/images/emoji/win10/tajikistan.png
new file mode 100644
index 00000000000..7b3697952d5
Binary files /dev/null and b/public/images/emoji/win10/tajikistan.png differ
diff --git a/public/images/emoji/win10/takeout_box.png b/public/images/emoji/win10/takeout_box.png
new file mode 100644
index 00000000000..08aa6a4843f
Binary files /dev/null and b/public/images/emoji/win10/takeout_box.png differ
diff --git a/public/images/emoji/win10/tanzania.png b/public/images/emoji/win10/tanzania.png
new file mode 100644
index 00000000000..d4026fea320
Binary files /dev/null and b/public/images/emoji/win10/tanzania.png differ
diff --git a/public/images/emoji/win10/thailand.png b/public/images/emoji/win10/thailand.png
new file mode 100644
index 00000000000..81499f16168
Binary files /dev/null and b/public/images/emoji/win10/thailand.png differ
diff --git a/public/images/emoji/win10/three.png b/public/images/emoji/win10/three.png
index 9cb4d40b0f3..2b641df50a8 100644
Binary files a/public/images/emoji/win10/three.png and b/public/images/emoji/win10/three.png differ
diff --git a/public/images/emoji/win10/thumbsdown/2.png b/public/images/emoji/win10/thumbsdown/2.png
new file mode 100644
index 00000000000..c3d21d3ce94
Binary files /dev/null and b/public/images/emoji/win10/thumbsdown/2.png differ
diff --git a/public/images/emoji/win10/thumbsdown/3.png b/public/images/emoji/win10/thumbsdown/3.png
new file mode 100644
index 00000000000..71e93c783c8
Binary files /dev/null and b/public/images/emoji/win10/thumbsdown/3.png differ
diff --git a/public/images/emoji/win10/thumbsdown/4.png b/public/images/emoji/win10/thumbsdown/4.png
new file mode 100644
index 00000000000..e886a316e89
Binary files /dev/null and b/public/images/emoji/win10/thumbsdown/4.png differ
diff --git a/public/images/emoji/win10/thumbsdown/5.png b/public/images/emoji/win10/thumbsdown/5.png
new file mode 100644
index 00000000000..972a46a3ad4
Binary files /dev/null and b/public/images/emoji/win10/thumbsdown/5.png differ
diff --git a/public/images/emoji/win10/thumbsdown/6.png b/public/images/emoji/win10/thumbsdown/6.png
new file mode 100644
index 00000000000..9af4ac9bf8a
Binary files /dev/null and b/public/images/emoji/win10/thumbsdown/6.png differ
diff --git a/public/images/emoji/win10/thumbsup/2.png b/public/images/emoji/win10/thumbsup/2.png
new file mode 100644
index 00000000000..edaefac65a0
Binary files /dev/null and b/public/images/emoji/win10/thumbsup/2.png differ
diff --git a/public/images/emoji/win10/thumbsup/3.png b/public/images/emoji/win10/thumbsup/3.png
new file mode 100644
index 00000000000..7d1b8491527
Binary files /dev/null and b/public/images/emoji/win10/thumbsup/3.png differ
diff --git a/public/images/emoji/win10/thumbsup/4.png b/public/images/emoji/win10/thumbsup/4.png
new file mode 100644
index 00000000000..27046532b74
Binary files /dev/null and b/public/images/emoji/win10/thumbsup/4.png differ
diff --git a/public/images/emoji/win10/thumbsup/5.png b/public/images/emoji/win10/thumbsup/5.png
new file mode 100644
index 00000000000..4ff2e844196
Binary files /dev/null and b/public/images/emoji/win10/thumbsup/5.png differ
diff --git a/public/images/emoji/win10/thumbsup/6.png b/public/images/emoji/win10/thumbsup/6.png
new file mode 100644
index 00000000000..86086610355
Binary files /dev/null and b/public/images/emoji/win10/thumbsup/6.png differ
diff --git a/public/images/emoji/win10/timor_leste.png b/public/images/emoji/win10/timor_leste.png
new file mode 100644
index 00000000000..6706def9912
Binary files /dev/null and b/public/images/emoji/win10/timor_leste.png differ
diff --git a/public/images/emoji/win10/tipping_hand_man.png b/public/images/emoji/win10/tipping_hand_man.png
new file mode 100644
index 00000000000..f34ad034695
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_man.png differ
diff --git a/public/images/emoji/win10/tipping_hand_man/2.png b/public/images/emoji/win10/tipping_hand_man/2.png
new file mode 100644
index 00000000000..b51c9f00138
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/win10/tipping_hand_man/3.png b/public/images/emoji/win10/tipping_hand_man/3.png
new file mode 100644
index 00000000000..9c25f10ce10
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/win10/tipping_hand_man/4.png b/public/images/emoji/win10/tipping_hand_man/4.png
new file mode 100644
index 00000000000..c0e63d7e1f3
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/win10/tipping_hand_man/5.png b/public/images/emoji/win10/tipping_hand_man/5.png
new file mode 100644
index 00000000000..190e7804a08
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/win10/tipping_hand_man/6.png b/public/images/emoji/win10/tipping_hand_man/6.png
new file mode 100644
index 00000000000..1457e72695e
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/win10/tipping_hand_woman.png b/public/images/emoji/win10/tipping_hand_woman.png
new file mode 100644
index 00000000000..d5f7de6d6d3
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_woman.png differ
diff --git a/public/images/emoji/win10/tipping_hand_woman/2.png b/public/images/emoji/win10/tipping_hand_woman/2.png
new file mode 100644
index 00000000000..673badf70bf
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/win10/tipping_hand_woman/3.png b/public/images/emoji/win10/tipping_hand_woman/3.png
new file mode 100644
index 00000000000..8f7692e6390
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/win10/tipping_hand_woman/4.png b/public/images/emoji/win10/tipping_hand_woman/4.png
new file mode 100644
index 00000000000..40faf9cee0f
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/win10/tipping_hand_woman/5.png b/public/images/emoji/win10/tipping_hand_woman/5.png
new file mode 100644
index 00000000000..5e457453b5a
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/win10/tipping_hand_woman/6.png b/public/images/emoji/win10/tipping_hand_woman/6.png
new file mode 100644
index 00000000000..3d86515ba99
Binary files /dev/null and b/public/images/emoji/win10/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/win10/tired_face.png b/public/images/emoji/win10/tired_face.png
index b34cb3bba15..3f1c72dce55 100644
Binary files a/public/images/emoji/win10/tired_face.png and b/public/images/emoji/win10/tired_face.png differ
diff --git a/public/images/emoji/win10/togo.png b/public/images/emoji/win10/togo.png
new file mode 100644
index 00000000000..7a542547e05
Binary files /dev/null and b/public/images/emoji/win10/togo.png differ
diff --git a/public/images/emoji/win10/tokelau.png b/public/images/emoji/win10/tokelau.png
new file mode 100644
index 00000000000..f42f8686314
Binary files /dev/null and b/public/images/emoji/win10/tokelau.png differ
diff --git a/public/images/emoji/win10/tonga.png b/public/images/emoji/win10/tonga.png
new file mode 100644
index 00000000000..bfff80acf4d
Binary files /dev/null and b/public/images/emoji/win10/tonga.png differ
diff --git a/public/images/emoji/win10/tornado.png b/public/images/emoji/win10/tornado.png
new file mode 100644
index 00000000000..8269d47872f
Binary files /dev/null and b/public/images/emoji/win10/tornado.png differ
diff --git a/public/images/emoji/win10/tr.png b/public/images/emoji/win10/tr.png
new file mode 100644
index 00000000000..3b6fc163790
Binary files /dev/null and b/public/images/emoji/win10/tr.png differ
diff --git a/public/images/emoji/win10/tractor.png b/public/images/emoji/win10/tractor.png
index 92290c70f89..f511682fb40 100644
Binary files a/public/images/emoji/win10/tractor.png and b/public/images/emoji/win10/tractor.png differ
diff --git a/public/images/emoji/win10/trinidad_tobago.png b/public/images/emoji/win10/trinidad_tobago.png
new file mode 100644
index 00000000000..14355ce15f6
Binary files /dev/null and b/public/images/emoji/win10/trinidad_tobago.png differ
diff --git a/public/images/emoji/win10/tristan_da_cunha.png b/public/images/emoji/win10/tristan_da_cunha.png
new file mode 100644
index 00000000000..dff4791d41b
Binary files /dev/null and b/public/images/emoji/win10/tristan_da_cunha.png differ
diff --git a/public/images/emoji/win10/tshirt.png b/public/images/emoji/win10/tshirt.png
new file mode 100644
index 00000000000..0117d49657d
Binary files /dev/null and b/public/images/emoji/win10/tshirt.png differ
diff --git a/public/images/emoji/win10/tumbler_glass.png b/public/images/emoji/win10/tumbler_glass.png
new file mode 100644
index 00000000000..4cfe2053c2d
Binary files /dev/null and b/public/images/emoji/win10/tumbler_glass.png differ
diff --git a/public/images/emoji/win10/tunisia.png b/public/images/emoji/win10/tunisia.png
new file mode 100644
index 00000000000..2691b42f09a
Binary files /dev/null and b/public/images/emoji/win10/tunisia.png differ
diff --git a/public/images/emoji/win10/turkmenistan.png b/public/images/emoji/win10/turkmenistan.png
new file mode 100644
index 00000000000..a0729e2c292
Binary files /dev/null and b/public/images/emoji/win10/turkmenistan.png differ
diff --git a/public/images/emoji/win10/turks_caicos_islands.png b/public/images/emoji/win10/turks_caicos_islands.png
new file mode 100644
index 00000000000..bb04d27666c
Binary files /dev/null and b/public/images/emoji/win10/turks_caicos_islands.png differ
diff --git a/public/images/emoji/win10/tuvalu.png b/public/images/emoji/win10/tuvalu.png
new file mode 100644
index 00000000000..60fad11afce
Binary files /dev/null and b/public/images/emoji/win10/tuvalu.png differ
diff --git a/public/images/emoji/win10/two.png b/public/images/emoji/win10/two.png
index da3eb230b73..6740511b38b 100644
Binary files a/public/images/emoji/win10/two.png and b/public/images/emoji/win10/two.png differ
diff --git a/public/images/emoji/win10/u55b6.png b/public/images/emoji/win10/u55b6.png
index cce8ea89078..2873f57dfad 100644
Binary files a/public/images/emoji/win10/u55b6.png and b/public/images/emoji/win10/u55b6.png differ
diff --git a/public/images/emoji/win10/uganda.png b/public/images/emoji/win10/uganda.png
new file mode 100644
index 00000000000..9541a9fe432
Binary files /dev/null and b/public/images/emoji/win10/uganda.png differ
diff --git a/public/images/emoji/win10/uk.png b/public/images/emoji/win10/uk.png
new file mode 100644
index 00000000000..ad2a6622e47
Binary files /dev/null and b/public/images/emoji/win10/uk.png differ
diff --git a/public/images/emoji/win10/ukraine.png b/public/images/emoji/win10/ukraine.png
new file mode 100644
index 00000000000..d24b4e827b0
Binary files /dev/null and b/public/images/emoji/win10/ukraine.png differ
diff --git a/public/images/emoji/win10/united_arab_emirates.png b/public/images/emoji/win10/united_arab_emirates.png
new file mode 100644
index 00000000000..0aac4c4b1eb
Binary files /dev/null and b/public/images/emoji/win10/united_arab_emirates.png differ
diff --git a/public/images/emoji/win10/united_nations.png b/public/images/emoji/win10/united_nations.png
new file mode 100644
index 00000000000..d695a5cac09
Binary files /dev/null and b/public/images/emoji/win10/united_nations.png differ
diff --git a/public/images/emoji/win10/uruguay.png b/public/images/emoji/win10/uruguay.png
new file mode 100644
index 00000000000..8196541e261
Binary files /dev/null and b/public/images/emoji/win10/uruguay.png differ
diff --git a/public/images/emoji/win10/us.png b/public/images/emoji/win10/us.png
index b8aa8dd603b..450853eca47 100644
Binary files a/public/images/emoji/win10/us.png and b/public/images/emoji/win10/us.png differ
diff --git a/public/images/emoji/win10/us_outlying_islands.png b/public/images/emoji/win10/us_outlying_islands.png
new file mode 100644
index 00000000000..450853eca47
Binary files /dev/null and b/public/images/emoji/win10/us_outlying_islands.png differ
diff --git a/public/images/emoji/win10/us_virgin_islands.png b/public/images/emoji/win10/us_virgin_islands.png
new file mode 100644
index 00000000000..2352c2610b8
Binary files /dev/null and b/public/images/emoji/win10/us_virgin_islands.png differ
diff --git a/public/images/emoji/win10/uzbekistan.png b/public/images/emoji/win10/uzbekistan.png
new file mode 100644
index 00000000000..c268b7f0b2a
Binary files /dev/null and b/public/images/emoji/win10/uzbekistan.png differ
diff --git a/public/images/emoji/win10/v/2.png b/public/images/emoji/win10/v/2.png
new file mode 100644
index 00000000000..8e2ebf35378
Binary files /dev/null and b/public/images/emoji/win10/v/2.png differ
diff --git a/public/images/emoji/win10/v/3.png b/public/images/emoji/win10/v/3.png
new file mode 100644
index 00000000000..4f576a0a661
Binary files /dev/null and b/public/images/emoji/win10/v/3.png differ
diff --git a/public/images/emoji/win10/v/4.png b/public/images/emoji/win10/v/4.png
new file mode 100644
index 00000000000..d3658c2c6ba
Binary files /dev/null and b/public/images/emoji/win10/v/4.png differ
diff --git a/public/images/emoji/win10/v/5.png b/public/images/emoji/win10/v/5.png
new file mode 100644
index 00000000000..13f52508066
Binary files /dev/null and b/public/images/emoji/win10/v/5.png differ
diff --git a/public/images/emoji/win10/v/6.png b/public/images/emoji/win10/v/6.png
new file mode 100644
index 00000000000..2c1688e46c1
Binary files /dev/null and b/public/images/emoji/win10/v/6.png differ
diff --git a/public/images/emoji/win10/vampire.png b/public/images/emoji/win10/vampire.png
new file mode 100644
index 00000000000..962288bd170
Binary files /dev/null and b/public/images/emoji/win10/vampire.png differ
diff --git a/public/images/emoji/win10/vampire/2.png b/public/images/emoji/win10/vampire/2.png
new file mode 100644
index 00000000000..154f2b6e35a
Binary files /dev/null and b/public/images/emoji/win10/vampire/2.png differ
diff --git a/public/images/emoji/win10/vampire/3.png b/public/images/emoji/win10/vampire/3.png
new file mode 100644
index 00000000000..540b48d887f
Binary files /dev/null and b/public/images/emoji/win10/vampire/3.png differ
diff --git a/public/images/emoji/win10/vampire/4.png b/public/images/emoji/win10/vampire/4.png
new file mode 100644
index 00000000000..b05d3bad9ab
Binary files /dev/null and b/public/images/emoji/win10/vampire/4.png differ
diff --git a/public/images/emoji/win10/vampire/5.png b/public/images/emoji/win10/vampire/5.png
new file mode 100644
index 00000000000..2bd9a7b71bb
Binary files /dev/null and b/public/images/emoji/win10/vampire/5.png differ
diff --git a/public/images/emoji/win10/vampire/6.png b/public/images/emoji/win10/vampire/6.png
new file mode 100644
index 00000000000..c88f4ad73bf
Binary files /dev/null and b/public/images/emoji/win10/vampire/6.png differ
diff --git a/public/images/emoji/win10/vanuatu.png b/public/images/emoji/win10/vanuatu.png
new file mode 100644
index 00000000000..ebf4b693156
Binary files /dev/null and b/public/images/emoji/win10/vanuatu.png differ
diff --git a/public/images/emoji/win10/vatican_city.png b/public/images/emoji/win10/vatican_city.png
new file mode 100644
index 00000000000..a91fed8815c
Binary files /dev/null and b/public/images/emoji/win10/vatican_city.png differ
diff --git a/public/images/emoji/win10/venezuela.png b/public/images/emoji/win10/venezuela.png
new file mode 100644
index 00000000000..e2b7cff1d89
Binary files /dev/null and b/public/images/emoji/win10/venezuela.png differ
diff --git a/public/images/emoji/win10/vietnam.png b/public/images/emoji/win10/vietnam.png
new file mode 100644
index 00000000000..f888ea94350
Binary files /dev/null and b/public/images/emoji/win10/vietnam.png differ
diff --git a/public/images/emoji/win10/vulcan/2.png b/public/images/emoji/win10/vulcan/2.png
new file mode 100644
index 00000000000..317e548907b
Binary files /dev/null and b/public/images/emoji/win10/vulcan/2.png differ
diff --git a/public/images/emoji/win10/vulcan/3.png b/public/images/emoji/win10/vulcan/3.png
new file mode 100644
index 00000000000..981c3dc12b7
Binary files /dev/null and b/public/images/emoji/win10/vulcan/3.png differ
diff --git a/public/images/emoji/win10/vulcan/4.png b/public/images/emoji/win10/vulcan/4.png
new file mode 100644
index 00000000000..7af3f6715c9
Binary files /dev/null and b/public/images/emoji/win10/vulcan/4.png differ
diff --git a/public/images/emoji/win10/vulcan/5.png b/public/images/emoji/win10/vulcan/5.png
new file mode 100644
index 00000000000..1b775210c0e
Binary files /dev/null and b/public/images/emoji/win10/vulcan/5.png differ
diff --git a/public/images/emoji/win10/vulcan/6.png b/public/images/emoji/win10/vulcan/6.png
new file mode 100644
index 00000000000..11d10a9b07c
Binary files /dev/null and b/public/images/emoji/win10/vulcan/6.png differ
diff --git a/public/images/emoji/win10/vulcan_salute.png b/public/images/emoji/win10/vulcan_salute.png
new file mode 100644
index 00000000000..d5dbca1ff73
Binary files /dev/null and b/public/images/emoji/win10/vulcan_salute.png differ
diff --git a/public/images/emoji/win10/vulcan_salute/2.png b/public/images/emoji/win10/vulcan_salute/2.png
new file mode 100644
index 00000000000..317e548907b
Binary files /dev/null and b/public/images/emoji/win10/vulcan_salute/2.png differ
diff --git a/public/images/emoji/win10/vulcan_salute/3.png b/public/images/emoji/win10/vulcan_salute/3.png
new file mode 100644
index 00000000000..981c3dc12b7
Binary files /dev/null and b/public/images/emoji/win10/vulcan_salute/3.png differ
diff --git a/public/images/emoji/win10/vulcan_salute/4.png b/public/images/emoji/win10/vulcan_salute/4.png
new file mode 100644
index 00000000000..7af3f6715c9
Binary files /dev/null and b/public/images/emoji/win10/vulcan_salute/4.png differ
diff --git a/public/images/emoji/win10/vulcan_salute/5.png b/public/images/emoji/win10/vulcan_salute/5.png
new file mode 100644
index 00000000000..1b775210c0e
Binary files /dev/null and b/public/images/emoji/win10/vulcan_salute/5.png differ
diff --git a/public/images/emoji/win10/vulcan_salute/6.png b/public/images/emoji/win10/vulcan_salute/6.png
new file mode 100644
index 00000000000..11d10a9b07c
Binary files /dev/null and b/public/images/emoji/win10/vulcan_salute/6.png differ
diff --git a/public/images/emoji/win10/walking.png b/public/images/emoji/win10/walking.png
index 8936319a8e3..cdf31af1558 100644
Binary files a/public/images/emoji/win10/walking.png and b/public/images/emoji/win10/walking.png differ
diff --git a/public/images/emoji/win10/walking/2.png b/public/images/emoji/win10/walking/2.png
new file mode 100644
index 00000000000..8cd431293f4
Binary files /dev/null and b/public/images/emoji/win10/walking/2.png differ
diff --git a/public/images/emoji/win10/walking/3.png b/public/images/emoji/win10/walking/3.png
new file mode 100644
index 00000000000..1ee2612ea8c
Binary files /dev/null and b/public/images/emoji/win10/walking/3.png differ
diff --git a/public/images/emoji/win10/walking/4.png b/public/images/emoji/win10/walking/4.png
new file mode 100644
index 00000000000..c7f577394b7
Binary files /dev/null and b/public/images/emoji/win10/walking/4.png differ
diff --git a/public/images/emoji/win10/walking/5.png b/public/images/emoji/win10/walking/5.png
new file mode 100644
index 00000000000..a5dc06ee02a
Binary files /dev/null and b/public/images/emoji/win10/walking/5.png differ
diff --git a/public/images/emoji/win10/walking/6.png b/public/images/emoji/win10/walking/6.png
new file mode 100644
index 00000000000..5d895f3762c
Binary files /dev/null and b/public/images/emoji/win10/walking/6.png differ
diff --git a/public/images/emoji/win10/walking_man.png b/public/images/emoji/win10/walking_man.png
new file mode 100644
index 00000000000..cdf31af1558
Binary files /dev/null and b/public/images/emoji/win10/walking_man.png differ
diff --git a/public/images/emoji/win10/walking_man/2.png b/public/images/emoji/win10/walking_man/2.png
new file mode 100644
index 00000000000..8cd431293f4
Binary files /dev/null and b/public/images/emoji/win10/walking_man/2.png differ
diff --git a/public/images/emoji/win10/walking_man/3.png b/public/images/emoji/win10/walking_man/3.png
new file mode 100644
index 00000000000..1ee2612ea8c
Binary files /dev/null and b/public/images/emoji/win10/walking_man/3.png differ
diff --git a/public/images/emoji/win10/walking_man/4.png b/public/images/emoji/win10/walking_man/4.png
new file mode 100644
index 00000000000..c7f577394b7
Binary files /dev/null and b/public/images/emoji/win10/walking_man/4.png differ
diff --git a/public/images/emoji/win10/walking_man/5.png b/public/images/emoji/win10/walking_man/5.png
new file mode 100644
index 00000000000..a5dc06ee02a
Binary files /dev/null and b/public/images/emoji/win10/walking_man/5.png differ
diff --git a/public/images/emoji/win10/walking_man/6.png b/public/images/emoji/win10/walking_man/6.png
new file mode 100644
index 00000000000..5d895f3762c
Binary files /dev/null and b/public/images/emoji/win10/walking_man/6.png differ
diff --git a/public/images/emoji/win10/walking_woman.png b/public/images/emoji/win10/walking_woman.png
new file mode 100644
index 00000000000..4ce1ab68dba
Binary files /dev/null and b/public/images/emoji/win10/walking_woman.png differ
diff --git a/public/images/emoji/win10/walking_woman/2.png b/public/images/emoji/win10/walking_woman/2.png
new file mode 100644
index 00000000000..7d57bb6660e
Binary files /dev/null and b/public/images/emoji/win10/walking_woman/2.png differ
diff --git a/public/images/emoji/win10/walking_woman/3.png b/public/images/emoji/win10/walking_woman/3.png
new file mode 100644
index 00000000000..3d298d6bda3
Binary files /dev/null and b/public/images/emoji/win10/walking_woman/3.png differ
diff --git a/public/images/emoji/win10/walking_woman/4.png b/public/images/emoji/win10/walking_woman/4.png
new file mode 100644
index 00000000000..a155e9b154e
Binary files /dev/null and b/public/images/emoji/win10/walking_woman/4.png differ
diff --git a/public/images/emoji/win10/walking_woman/5.png b/public/images/emoji/win10/walking_woman/5.png
new file mode 100644
index 00000000000..c531cdf3f5e
Binary files /dev/null and b/public/images/emoji/win10/walking_woman/5.png differ
diff --git a/public/images/emoji/win10/walking_woman/6.png b/public/images/emoji/win10/walking_woman/6.png
new file mode 100644
index 00000000000..7757ee7914f
Binary files /dev/null and b/public/images/emoji/win10/walking_woman/6.png differ
diff --git a/public/images/emoji/win10/wallis_futuna.png b/public/images/emoji/win10/wallis_futuna.png
new file mode 100644
index 00000000000..4672eabedba
Binary files /dev/null and b/public/images/emoji/win10/wallis_futuna.png differ
diff --git a/public/images/emoji/win10/wave/2.png b/public/images/emoji/win10/wave/2.png
new file mode 100644
index 00000000000..1da3195ccac
Binary files /dev/null and b/public/images/emoji/win10/wave/2.png differ
diff --git a/public/images/emoji/win10/wave/3.png b/public/images/emoji/win10/wave/3.png
new file mode 100644
index 00000000000..337ecf32b86
Binary files /dev/null and b/public/images/emoji/win10/wave/3.png differ
diff --git a/public/images/emoji/win10/wave/4.png b/public/images/emoji/win10/wave/4.png
new file mode 100644
index 00000000000..1709f5ac153
Binary files /dev/null and b/public/images/emoji/win10/wave/4.png differ
diff --git a/public/images/emoji/win10/wave/5.png b/public/images/emoji/win10/wave/5.png
new file mode 100644
index 00000000000..cf236b60928
Binary files /dev/null and b/public/images/emoji/win10/wave/5.png differ
diff --git a/public/images/emoji/win10/wave/6.png b/public/images/emoji/win10/wave/6.png
new file mode 100644
index 00000000000..26135bc7d21
Binary files /dev/null and b/public/images/emoji/win10/wave/6.png differ
diff --git a/public/images/emoji/win10/weight_lifter.png b/public/images/emoji/win10/weight_lifter.png
index 8e05683be02..8251adfa58c 100644
Binary files a/public/images/emoji/win10/weight_lifter.png and b/public/images/emoji/win10/weight_lifter.png differ
diff --git a/public/images/emoji/win10/weight_lifter/2.png b/public/images/emoji/win10/weight_lifter/2.png
new file mode 100644
index 00000000000..da2c03eea22
Binary files /dev/null and b/public/images/emoji/win10/weight_lifter/2.png differ
diff --git a/public/images/emoji/win10/weight_lifter/3.png b/public/images/emoji/win10/weight_lifter/3.png
new file mode 100644
index 00000000000..5cdaedeab1f
Binary files /dev/null and b/public/images/emoji/win10/weight_lifter/3.png differ
diff --git a/public/images/emoji/win10/weight_lifter/4.png b/public/images/emoji/win10/weight_lifter/4.png
new file mode 100644
index 00000000000..2eeab22dca2
Binary files /dev/null and b/public/images/emoji/win10/weight_lifter/4.png differ
diff --git a/public/images/emoji/win10/weight_lifter/5.png b/public/images/emoji/win10/weight_lifter/5.png
new file mode 100644
index 00000000000..e5ae4eb943a
Binary files /dev/null and b/public/images/emoji/win10/weight_lifter/5.png differ
diff --git a/public/images/emoji/win10/weight_lifter/6.png b/public/images/emoji/win10/weight_lifter/6.png
new file mode 100644
index 00000000000..9e7a027f6b6
Binary files /dev/null and b/public/images/emoji/win10/weight_lifter/6.png differ
diff --git a/public/images/emoji/win10/weight_lifting_man.png b/public/images/emoji/win10/weight_lifting_man.png
new file mode 100644
index 00000000000..8251adfa58c
Binary files /dev/null and b/public/images/emoji/win10/weight_lifting_man.png differ
diff --git a/public/images/emoji/win10/weight_lifting_man/2.png b/public/images/emoji/win10/weight_lifting_man/2.png
new file mode 100644
index 00000000000..da2c03eea22
Binary files /dev/null and b/public/images/emoji/win10/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/win10/weight_lifting_man/3.png b/public/images/emoji/win10/weight_lifting_man/3.png
new file mode 100644
index 00000000000..5cdaedeab1f
Binary files /dev/null and b/public/images/emoji/win10/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/win10/weight_lifting_man/4.png b/public/images/emoji/win10/weight_lifting_man/4.png
new file mode 100644
index 00000000000..2eeab22dca2
Binary files /dev/null and b/public/images/emoji/win10/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/win10/weight_lifting_man/5.png b/public/images/emoji/win10/weight_lifting_man/5.png
new file mode 100644
index 00000000000..e5ae4eb943a
Binary files /dev/null and b/public/images/emoji/win10/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/win10/weight_lifting_man/6.png b/public/images/emoji/win10/weight_lifting_man/6.png
new file mode 100644
index 00000000000..9e7a027f6b6
Binary files /dev/null and b/public/images/emoji/win10/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/win10/weight_lifting_woman.png b/public/images/emoji/win10/weight_lifting_woman.png
new file mode 100644
index 00000000000..7fba56ced6a
Binary files /dev/null and b/public/images/emoji/win10/weight_lifting_woman.png differ
diff --git a/public/images/emoji/win10/western_sahara.png b/public/images/emoji/win10/western_sahara.png
new file mode 100644
index 00000000000..44c0ea20dd7
Binary files /dev/null and b/public/images/emoji/win10/western_sahara.png differ
diff --git a/public/images/emoji/win10/wheelchair.png b/public/images/emoji/win10/wheelchair.png
index 34724782752..44afda8c4f2 100644
Binary files a/public/images/emoji/win10/wheelchair.png and b/public/images/emoji/win10/wheelchair.png differ
diff --git a/public/images/emoji/win10/white_flag.png b/public/images/emoji/win10/white_flag.png
new file mode 100644
index 00000000000..0faada583b8
Binary files /dev/null and b/public/images/emoji/win10/white_flag.png differ
diff --git a/public/images/emoji/win10/white_sun_small_cloud.png b/public/images/emoji/win10/white_sun_small_cloud.png
index 53525213719..c8f11a93af2 100644
Binary files a/public/images/emoji/win10/white_sun_small_cloud.png and b/public/images/emoji/win10/white_sun_small_cloud.png differ
diff --git a/public/images/emoji/win10/white_sun_with_small_cloud.png b/public/images/emoji/win10/white_sun_with_small_cloud.png
index 53525213719..c8f11a93af2 100644
Binary files a/public/images/emoji/win10/white_sun_with_small_cloud.png and b/public/images/emoji/win10/white_sun_with_small_cloud.png differ
diff --git a/public/images/emoji/win10/wilted_flower.png b/public/images/emoji/win10/wilted_flower.png
new file mode 100644
index 00000000000..00643756936
Binary files /dev/null and b/public/images/emoji/win10/wilted_flower.png differ
diff --git a/public/images/emoji/win10/wind_face.png b/public/images/emoji/win10/wind_face.png
new file mode 100644
index 00000000000..e452463adc0
Binary files /dev/null and b/public/images/emoji/win10/wind_face.png differ
diff --git a/public/images/emoji/win10/woman/2.png b/public/images/emoji/win10/woman/2.png
new file mode 100644
index 00000000000..8e0291ac871
Binary files /dev/null and b/public/images/emoji/win10/woman/2.png differ
diff --git a/public/images/emoji/win10/woman/3.png b/public/images/emoji/win10/woman/3.png
new file mode 100644
index 00000000000..84f29c8f955
Binary files /dev/null and b/public/images/emoji/win10/woman/3.png differ
diff --git a/public/images/emoji/win10/woman/4.png b/public/images/emoji/win10/woman/4.png
new file mode 100644
index 00000000000..effd86aff9d
Binary files /dev/null and b/public/images/emoji/win10/woman/4.png differ
diff --git a/public/images/emoji/win10/woman/5.png b/public/images/emoji/win10/woman/5.png
new file mode 100644
index 00000000000..2e77babaa2a
Binary files /dev/null and b/public/images/emoji/win10/woman/5.png differ
diff --git a/public/images/emoji/win10/woman/6.png b/public/images/emoji/win10/woman/6.png
new file mode 100644
index 00000000000..52dd80a724c
Binary files /dev/null and b/public/images/emoji/win10/woman/6.png differ
diff --git a/public/images/emoji/win10/woman_artist.png b/public/images/emoji/win10/woman_artist.png
new file mode 100644
index 00000000000..b48409f0cdc
Binary files /dev/null and b/public/images/emoji/win10/woman_artist.png differ
diff --git a/public/images/emoji/win10/woman_artist/2.png b/public/images/emoji/win10/woman_artist/2.png
new file mode 100644
index 00000000000..ef4281efb43
Binary files /dev/null and b/public/images/emoji/win10/woman_artist/2.png differ
diff --git a/public/images/emoji/win10/woman_artist/3.png b/public/images/emoji/win10/woman_artist/3.png
new file mode 100644
index 00000000000..1449edbe43d
Binary files /dev/null and b/public/images/emoji/win10/woman_artist/3.png differ
diff --git a/public/images/emoji/win10/woman_artist/4.png b/public/images/emoji/win10/woman_artist/4.png
new file mode 100644
index 00000000000..aef6a72f769
Binary files /dev/null and b/public/images/emoji/win10/woman_artist/4.png differ
diff --git a/public/images/emoji/win10/woman_artist/5.png b/public/images/emoji/win10/woman_artist/5.png
new file mode 100644
index 00000000000..3ca3fa8d999
Binary files /dev/null and b/public/images/emoji/win10/woman_artist/5.png differ
diff --git a/public/images/emoji/win10/woman_artist/6.png b/public/images/emoji/win10/woman_artist/6.png
new file mode 100644
index 00000000000..6ef26c761b0
Binary files /dev/null and b/public/images/emoji/win10/woman_artist/6.png differ
diff --git a/public/images/emoji/win10/woman_astronaut.png b/public/images/emoji/win10/woman_astronaut.png
new file mode 100644
index 00000000000..8e4c712e0f8
Binary files /dev/null and b/public/images/emoji/win10/woman_astronaut.png differ
diff --git a/public/images/emoji/win10/woman_astronaut/2.png b/public/images/emoji/win10/woman_astronaut/2.png
new file mode 100644
index 00000000000..a8f2cf8d2e6
Binary files /dev/null and b/public/images/emoji/win10/woman_astronaut/2.png differ
diff --git a/public/images/emoji/win10/woman_astronaut/3.png b/public/images/emoji/win10/woman_astronaut/3.png
new file mode 100644
index 00000000000..6fd9cb9c574
Binary files /dev/null and b/public/images/emoji/win10/woman_astronaut/3.png differ
diff --git a/public/images/emoji/win10/woman_astronaut/4.png b/public/images/emoji/win10/woman_astronaut/4.png
new file mode 100644
index 00000000000..a4ec3c15756
Binary files /dev/null and b/public/images/emoji/win10/woman_astronaut/4.png differ
diff --git a/public/images/emoji/win10/woman_astronaut/5.png b/public/images/emoji/win10/woman_astronaut/5.png
new file mode 100644
index 00000000000..d0c500ae173
Binary files /dev/null and b/public/images/emoji/win10/woman_astronaut/5.png differ
diff --git a/public/images/emoji/win10/woman_astronaut/6.png b/public/images/emoji/win10/woman_astronaut/6.png
new file mode 100644
index 00000000000..a40c5cd0531
Binary files /dev/null and b/public/images/emoji/win10/woman_astronaut/6.png differ
diff --git a/public/images/emoji/win10/woman_cartwheeling.png b/public/images/emoji/win10/woman_cartwheeling.png
new file mode 100644
index 00000000000..2582074dd67
Binary files /dev/null and b/public/images/emoji/win10/woman_cartwheeling.png differ
diff --git a/public/images/emoji/win10/woman_cartwheeling/2.png b/public/images/emoji/win10/woman_cartwheeling/2.png
new file mode 100644
index 00000000000..c5292573250
Binary files /dev/null and b/public/images/emoji/win10/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/win10/woman_cartwheeling/3.png b/public/images/emoji/win10/woman_cartwheeling/3.png
new file mode 100644
index 00000000000..65ad851e1d1
Binary files /dev/null and b/public/images/emoji/win10/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/win10/woman_cartwheeling/4.png b/public/images/emoji/win10/woman_cartwheeling/4.png
new file mode 100644
index 00000000000..fcb6e2c2b94
Binary files /dev/null and b/public/images/emoji/win10/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/win10/woman_cartwheeling/5.png b/public/images/emoji/win10/woman_cartwheeling/5.png
new file mode 100644
index 00000000000..e287a20c612
Binary files /dev/null and b/public/images/emoji/win10/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/win10/woman_cartwheeling/6.png b/public/images/emoji/win10/woman_cartwheeling/6.png
new file mode 100644
index 00000000000..7a5729de3cd
Binary files /dev/null and b/public/images/emoji/win10/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/win10/woman_cook.png b/public/images/emoji/win10/woman_cook.png
new file mode 100644
index 00000000000..5226f887eb8
Binary files /dev/null and b/public/images/emoji/win10/woman_cook.png differ
diff --git a/public/images/emoji/win10/woman_cook/2.png b/public/images/emoji/win10/woman_cook/2.png
new file mode 100644
index 00000000000..f5a7c4ae35a
Binary files /dev/null and b/public/images/emoji/win10/woman_cook/2.png differ
diff --git a/public/images/emoji/win10/woman_cook/3.png b/public/images/emoji/win10/woman_cook/3.png
new file mode 100644
index 00000000000..c5c6df5d9f0
Binary files /dev/null and b/public/images/emoji/win10/woman_cook/3.png differ
diff --git a/public/images/emoji/win10/woman_cook/4.png b/public/images/emoji/win10/woman_cook/4.png
new file mode 100644
index 00000000000..0028d11d91c
Binary files /dev/null and b/public/images/emoji/win10/woman_cook/4.png differ
diff --git a/public/images/emoji/win10/woman_cook/5.png b/public/images/emoji/win10/woman_cook/5.png
new file mode 100644
index 00000000000..f9cea0802ee
Binary files /dev/null and b/public/images/emoji/win10/woman_cook/5.png differ
diff --git a/public/images/emoji/win10/woman_cook/6.png b/public/images/emoji/win10/woman_cook/6.png
new file mode 100644
index 00000000000..22c0cd38025
Binary files /dev/null and b/public/images/emoji/win10/woman_cook/6.png differ
diff --git a/public/images/emoji/win10/woman_facepalming.png b/public/images/emoji/win10/woman_facepalming.png
new file mode 100644
index 00000000000..efcb7bbe16e
Binary files /dev/null and b/public/images/emoji/win10/woman_facepalming.png differ
diff --git a/public/images/emoji/win10/woman_facepalming/2.png b/public/images/emoji/win10/woman_facepalming/2.png
new file mode 100644
index 00000000000..389b056b7b1
Binary files /dev/null and b/public/images/emoji/win10/woman_facepalming/2.png differ
diff --git a/public/images/emoji/win10/woman_facepalming/3.png b/public/images/emoji/win10/woman_facepalming/3.png
new file mode 100644
index 00000000000..469afa185d0
Binary files /dev/null and b/public/images/emoji/win10/woman_facepalming/3.png differ
diff --git a/public/images/emoji/win10/woman_facepalming/4.png b/public/images/emoji/win10/woman_facepalming/4.png
new file mode 100644
index 00000000000..f0ef0f22922
Binary files /dev/null and b/public/images/emoji/win10/woman_facepalming/4.png differ
diff --git a/public/images/emoji/win10/woman_facepalming/5.png b/public/images/emoji/win10/woman_facepalming/5.png
new file mode 100644
index 00000000000..1859e5e8a06
Binary files /dev/null and b/public/images/emoji/win10/woman_facepalming/5.png differ
diff --git a/public/images/emoji/win10/woman_facepalming/6.png b/public/images/emoji/win10/woman_facepalming/6.png
new file mode 100644
index 00000000000..71b2946e58c
Binary files /dev/null and b/public/images/emoji/win10/woman_facepalming/6.png differ
diff --git a/public/images/emoji/win10/woman_factory_worker.png b/public/images/emoji/win10/woman_factory_worker.png
new file mode 100644
index 00000000000..a792b3e35ba
Binary files /dev/null and b/public/images/emoji/win10/woman_factory_worker.png differ
diff --git a/public/images/emoji/win10/woman_factory_worker/2.png b/public/images/emoji/win10/woman_factory_worker/2.png
new file mode 100644
index 00000000000..4c53bfa87af
Binary files /dev/null and b/public/images/emoji/win10/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/win10/woman_factory_worker/3.png b/public/images/emoji/win10/woman_factory_worker/3.png
new file mode 100644
index 00000000000..1876562fa83
Binary files /dev/null and b/public/images/emoji/win10/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/win10/woman_factory_worker/4.png b/public/images/emoji/win10/woman_factory_worker/4.png
new file mode 100644
index 00000000000..8aa67d000c1
Binary files /dev/null and b/public/images/emoji/win10/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/win10/woman_factory_worker/5.png b/public/images/emoji/win10/woman_factory_worker/5.png
new file mode 100644
index 00000000000..ffbb53235e7
Binary files /dev/null and b/public/images/emoji/win10/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/win10/woman_factory_worker/6.png b/public/images/emoji/win10/woman_factory_worker/6.png
new file mode 100644
index 00000000000..ead6778dbaa
Binary files /dev/null and b/public/images/emoji/win10/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/win10/woman_farmer.png b/public/images/emoji/win10/woman_farmer.png
new file mode 100644
index 00000000000..77364ef840e
Binary files /dev/null and b/public/images/emoji/win10/woman_farmer.png differ
diff --git a/public/images/emoji/win10/woman_farmer/2.png b/public/images/emoji/win10/woman_farmer/2.png
new file mode 100644
index 00000000000..36a1f3f8e0b
Binary files /dev/null and b/public/images/emoji/win10/woman_farmer/2.png differ
diff --git a/public/images/emoji/win10/woman_farmer/3.png b/public/images/emoji/win10/woman_farmer/3.png
new file mode 100644
index 00000000000..4b7183a98e3
Binary files /dev/null and b/public/images/emoji/win10/woman_farmer/3.png differ
diff --git a/public/images/emoji/win10/woman_farmer/4.png b/public/images/emoji/win10/woman_farmer/4.png
new file mode 100644
index 00000000000..77dc915f05c
Binary files /dev/null and b/public/images/emoji/win10/woman_farmer/4.png differ
diff --git a/public/images/emoji/win10/woman_farmer/5.png b/public/images/emoji/win10/woman_farmer/5.png
new file mode 100644
index 00000000000..44bb4791398
Binary files /dev/null and b/public/images/emoji/win10/woman_farmer/5.png differ
diff --git a/public/images/emoji/win10/woman_farmer/6.png b/public/images/emoji/win10/woman_farmer/6.png
new file mode 100644
index 00000000000..d1e74a220d5
Binary files /dev/null and b/public/images/emoji/win10/woman_farmer/6.png differ
diff --git a/public/images/emoji/win10/woman_firefighter.png b/public/images/emoji/win10/woman_firefighter.png
new file mode 100644
index 00000000000..3734f3f70ca
Binary files /dev/null and b/public/images/emoji/win10/woman_firefighter.png differ
diff --git a/public/images/emoji/win10/woman_firefighter/2.png b/public/images/emoji/win10/woman_firefighter/2.png
new file mode 100644
index 00000000000..e751c2485d8
Binary files /dev/null and b/public/images/emoji/win10/woman_firefighter/2.png differ
diff --git a/public/images/emoji/win10/woman_firefighter/3.png b/public/images/emoji/win10/woman_firefighter/3.png
new file mode 100644
index 00000000000..cf275ec1ece
Binary files /dev/null and b/public/images/emoji/win10/woman_firefighter/3.png differ
diff --git a/public/images/emoji/win10/woman_firefighter/4.png b/public/images/emoji/win10/woman_firefighter/4.png
new file mode 100644
index 00000000000..4ef2a94486a
Binary files /dev/null and b/public/images/emoji/win10/woman_firefighter/4.png differ
diff --git a/public/images/emoji/win10/woman_firefighter/5.png b/public/images/emoji/win10/woman_firefighter/5.png
new file mode 100644
index 00000000000..aa679184008
Binary files /dev/null and b/public/images/emoji/win10/woman_firefighter/5.png differ
diff --git a/public/images/emoji/win10/woman_firefighter/6.png b/public/images/emoji/win10/woman_firefighter/6.png
new file mode 100644
index 00000000000..8bb7d2dfad0
Binary files /dev/null and b/public/images/emoji/win10/woman_firefighter/6.png differ
diff --git a/public/images/emoji/win10/woman_health_worker.png b/public/images/emoji/win10/woman_health_worker.png
new file mode 100644
index 00000000000..01b54dbed46
Binary files /dev/null and b/public/images/emoji/win10/woman_health_worker.png differ
diff --git a/public/images/emoji/win10/woman_health_worker/2.png b/public/images/emoji/win10/woman_health_worker/2.png
new file mode 100644
index 00000000000..26b7e6c7ee8
Binary files /dev/null and b/public/images/emoji/win10/woman_health_worker/2.png differ
diff --git a/public/images/emoji/win10/woman_health_worker/3.png b/public/images/emoji/win10/woman_health_worker/3.png
new file mode 100644
index 00000000000..7757d8cd1f9
Binary files /dev/null and b/public/images/emoji/win10/woman_health_worker/3.png differ
diff --git a/public/images/emoji/win10/woman_health_worker/4.png b/public/images/emoji/win10/woman_health_worker/4.png
new file mode 100644
index 00000000000..f676d72107d
Binary files /dev/null and b/public/images/emoji/win10/woman_health_worker/4.png differ
diff --git a/public/images/emoji/win10/woman_health_worker/5.png b/public/images/emoji/win10/woman_health_worker/5.png
new file mode 100644
index 00000000000..97d90faafa4
Binary files /dev/null and b/public/images/emoji/win10/woman_health_worker/5.png differ
diff --git a/public/images/emoji/win10/woman_health_worker/6.png b/public/images/emoji/win10/woman_health_worker/6.png
new file mode 100644
index 00000000000..fb00bd29e17
Binary files /dev/null and b/public/images/emoji/win10/woman_health_worker/6.png differ
diff --git a/public/images/emoji/win10/woman_judge.png b/public/images/emoji/win10/woman_judge.png
new file mode 100644
index 00000000000..e2a6db57768
Binary files /dev/null and b/public/images/emoji/win10/woman_judge.png differ
diff --git a/public/images/emoji/win10/woman_judge/2.png b/public/images/emoji/win10/woman_judge/2.png
new file mode 100644
index 00000000000..944135de1e0
Binary files /dev/null and b/public/images/emoji/win10/woman_judge/2.png differ
diff --git a/public/images/emoji/win10/woman_judge/3.png b/public/images/emoji/win10/woman_judge/3.png
new file mode 100644
index 00000000000..5ebaef8fb54
Binary files /dev/null and b/public/images/emoji/win10/woman_judge/3.png differ
diff --git a/public/images/emoji/win10/woman_judge/4.png b/public/images/emoji/win10/woman_judge/4.png
new file mode 100644
index 00000000000..31c7eaf112d
Binary files /dev/null and b/public/images/emoji/win10/woman_judge/4.png differ
diff --git a/public/images/emoji/win10/woman_judge/5.png b/public/images/emoji/win10/woman_judge/5.png
new file mode 100644
index 00000000000..75d2be8f95c
Binary files /dev/null and b/public/images/emoji/win10/woman_judge/5.png differ
diff --git a/public/images/emoji/win10/woman_judge/6.png b/public/images/emoji/win10/woman_judge/6.png
new file mode 100644
index 00000000000..a8424feff54
Binary files /dev/null and b/public/images/emoji/win10/woman_judge/6.png differ
diff --git a/public/images/emoji/win10/woman_juggling.png b/public/images/emoji/win10/woman_juggling.png
new file mode 100644
index 00000000000..ba5a214d6ba
Binary files /dev/null and b/public/images/emoji/win10/woman_juggling.png differ
diff --git a/public/images/emoji/win10/woman_juggling/2.png b/public/images/emoji/win10/woman_juggling/2.png
new file mode 100644
index 00000000000..3c934fedefa
Binary files /dev/null and b/public/images/emoji/win10/woman_juggling/2.png differ
diff --git a/public/images/emoji/win10/woman_juggling/3.png b/public/images/emoji/win10/woman_juggling/3.png
new file mode 100644
index 00000000000..57831f7a446
Binary files /dev/null and b/public/images/emoji/win10/woman_juggling/3.png differ
diff --git a/public/images/emoji/win10/woman_juggling/4.png b/public/images/emoji/win10/woman_juggling/4.png
new file mode 100644
index 00000000000..f9041f5b53d
Binary files /dev/null and b/public/images/emoji/win10/woman_juggling/4.png differ
diff --git a/public/images/emoji/win10/woman_juggling/5.png b/public/images/emoji/win10/woman_juggling/5.png
new file mode 100644
index 00000000000..adc0ca84163
Binary files /dev/null and b/public/images/emoji/win10/woman_juggling/5.png differ
diff --git a/public/images/emoji/win10/woman_juggling/6.png b/public/images/emoji/win10/woman_juggling/6.png
new file mode 100644
index 00000000000..e247f142b5a
Binary files /dev/null and b/public/images/emoji/win10/woman_juggling/6.png differ
diff --git a/public/images/emoji/win10/woman_mechanic.png b/public/images/emoji/win10/woman_mechanic.png
new file mode 100644
index 00000000000..4c867d114bd
Binary files /dev/null and b/public/images/emoji/win10/woman_mechanic.png differ
diff --git a/public/images/emoji/win10/woman_mechanic/2.png b/public/images/emoji/win10/woman_mechanic/2.png
new file mode 100644
index 00000000000..844cdb2b5c1
Binary files /dev/null and b/public/images/emoji/win10/woman_mechanic/2.png differ
diff --git a/public/images/emoji/win10/woman_mechanic/3.png b/public/images/emoji/win10/woman_mechanic/3.png
new file mode 100644
index 00000000000..be260498e6f
Binary files /dev/null and b/public/images/emoji/win10/woman_mechanic/3.png differ
diff --git a/public/images/emoji/win10/woman_mechanic/4.png b/public/images/emoji/win10/woman_mechanic/4.png
new file mode 100644
index 00000000000..14426c22142
Binary files /dev/null and b/public/images/emoji/win10/woman_mechanic/4.png differ
diff --git a/public/images/emoji/win10/woman_mechanic/5.png b/public/images/emoji/win10/woman_mechanic/5.png
new file mode 100644
index 00000000000..b766675280e
Binary files /dev/null and b/public/images/emoji/win10/woman_mechanic/5.png differ
diff --git a/public/images/emoji/win10/woman_mechanic/6.png b/public/images/emoji/win10/woman_mechanic/6.png
new file mode 100644
index 00000000000..cc5fac7aa4f
Binary files /dev/null and b/public/images/emoji/win10/woman_mechanic/6.png differ
diff --git a/public/images/emoji/win10/woman_office_worker.png b/public/images/emoji/win10/woman_office_worker.png
new file mode 100644
index 00000000000..66f31fa1a93
Binary files /dev/null and b/public/images/emoji/win10/woman_office_worker.png differ
diff --git a/public/images/emoji/win10/woman_office_worker/2.png b/public/images/emoji/win10/woman_office_worker/2.png
new file mode 100644
index 00000000000..de051b5fced
Binary files /dev/null and b/public/images/emoji/win10/woman_office_worker/2.png differ
diff --git a/public/images/emoji/win10/woman_office_worker/3.png b/public/images/emoji/win10/woman_office_worker/3.png
new file mode 100644
index 00000000000..feeabcba063
Binary files /dev/null and b/public/images/emoji/win10/woman_office_worker/3.png differ
diff --git a/public/images/emoji/win10/woman_office_worker/4.png b/public/images/emoji/win10/woman_office_worker/4.png
new file mode 100644
index 00000000000..0e3cd801ddf
Binary files /dev/null and b/public/images/emoji/win10/woman_office_worker/4.png differ
diff --git a/public/images/emoji/win10/woman_office_worker/5.png b/public/images/emoji/win10/woman_office_worker/5.png
new file mode 100644
index 00000000000..3e57ca8313c
Binary files /dev/null and b/public/images/emoji/win10/woman_office_worker/5.png differ
diff --git a/public/images/emoji/win10/woman_office_worker/6.png b/public/images/emoji/win10/woman_office_worker/6.png
new file mode 100644
index 00000000000..ab8a95df85f
Binary files /dev/null and b/public/images/emoji/win10/woman_office_worker/6.png differ
diff --git a/public/images/emoji/win10/woman_pilot.png b/public/images/emoji/win10/woman_pilot.png
new file mode 100644
index 00000000000..d5ed1cd20cd
Binary files /dev/null and b/public/images/emoji/win10/woman_pilot.png differ
diff --git a/public/images/emoji/win10/woman_pilot/2.png b/public/images/emoji/win10/woman_pilot/2.png
new file mode 100644
index 00000000000..2eef6092cc9
Binary files /dev/null and b/public/images/emoji/win10/woman_pilot/2.png differ
diff --git a/public/images/emoji/win10/woman_pilot/3.png b/public/images/emoji/win10/woman_pilot/3.png
new file mode 100644
index 00000000000..bf9c80138f2
Binary files /dev/null and b/public/images/emoji/win10/woman_pilot/3.png differ
diff --git a/public/images/emoji/win10/woman_pilot/4.png b/public/images/emoji/win10/woman_pilot/4.png
new file mode 100644
index 00000000000..d3f2ae36151
Binary files /dev/null and b/public/images/emoji/win10/woman_pilot/4.png differ
diff --git a/public/images/emoji/win10/woman_pilot/5.png b/public/images/emoji/win10/woman_pilot/5.png
new file mode 100644
index 00000000000..60b47c92f3e
Binary files /dev/null and b/public/images/emoji/win10/woman_pilot/5.png differ
diff --git a/public/images/emoji/win10/woman_pilot/6.png b/public/images/emoji/win10/woman_pilot/6.png
new file mode 100644
index 00000000000..5571205254b
Binary files /dev/null and b/public/images/emoji/win10/woman_pilot/6.png differ
diff --git a/public/images/emoji/win10/woman_playing_handball.png b/public/images/emoji/win10/woman_playing_handball.png
new file mode 100644
index 00000000000..e958a239acc
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_handball.png differ
diff --git a/public/images/emoji/win10/woman_playing_handball/2.png b/public/images/emoji/win10/woman_playing_handball/2.png
new file mode 100644
index 00000000000..fd12d52f2e0
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/win10/woman_playing_handball/3.png b/public/images/emoji/win10/woman_playing_handball/3.png
new file mode 100644
index 00000000000..f48e73c790a
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/win10/woman_playing_handball/4.png b/public/images/emoji/win10/woman_playing_handball/4.png
new file mode 100644
index 00000000000..80332d861a5
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/win10/woman_playing_handball/5.png b/public/images/emoji/win10/woman_playing_handball/5.png
new file mode 100644
index 00000000000..46bd9f75b28
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/win10/woman_playing_handball/6.png b/public/images/emoji/win10/woman_playing_handball/6.png
new file mode 100644
index 00000000000..88ae2c6cd14
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/win10/woman_playing_water_polo.png b/public/images/emoji/win10/woman_playing_water_polo.png
new file mode 100644
index 00000000000..ecdde1c72b7
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/win10/woman_playing_water_polo/2.png b/public/images/emoji/win10/woman_playing_water_polo/2.png
new file mode 100644
index 00000000000..bafeb658e3d
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/win10/woman_playing_water_polo/3.png b/public/images/emoji/win10/woman_playing_water_polo/3.png
new file mode 100644
index 00000000000..7b3d35c0b11
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/win10/woman_playing_water_polo/4.png b/public/images/emoji/win10/woman_playing_water_polo/4.png
new file mode 100644
index 00000000000..5fdbe703b96
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/win10/woman_playing_water_polo/5.png b/public/images/emoji/win10/woman_playing_water_polo/5.png
new file mode 100644
index 00000000000..06a4bc76d5a
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/win10/woman_playing_water_polo/6.png b/public/images/emoji/win10/woman_playing_water_polo/6.png
new file mode 100644
index 00000000000..9ccd04c0eaa
Binary files /dev/null and b/public/images/emoji/win10/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/win10/woman_scientist.png b/public/images/emoji/win10/woman_scientist.png
new file mode 100644
index 00000000000..b18588335ce
Binary files /dev/null and b/public/images/emoji/win10/woman_scientist.png differ
diff --git a/public/images/emoji/win10/woman_scientist/2.png b/public/images/emoji/win10/woman_scientist/2.png
new file mode 100644
index 00000000000..310b7d0a35b
Binary files /dev/null and b/public/images/emoji/win10/woman_scientist/2.png differ
diff --git a/public/images/emoji/win10/woman_scientist/3.png b/public/images/emoji/win10/woman_scientist/3.png
new file mode 100644
index 00000000000..cb18e6e5f51
Binary files /dev/null and b/public/images/emoji/win10/woman_scientist/3.png differ
diff --git a/public/images/emoji/win10/woman_scientist/4.png b/public/images/emoji/win10/woman_scientist/4.png
new file mode 100644
index 00000000000..5d476201cb0
Binary files /dev/null and b/public/images/emoji/win10/woman_scientist/4.png differ
diff --git a/public/images/emoji/win10/woman_scientist/5.png b/public/images/emoji/win10/woman_scientist/5.png
new file mode 100644
index 00000000000..98723aa6d47
Binary files /dev/null and b/public/images/emoji/win10/woman_scientist/5.png differ
diff --git a/public/images/emoji/win10/woman_scientist/6.png b/public/images/emoji/win10/woman_scientist/6.png
new file mode 100644
index 00000000000..58b195d1ec4
Binary files /dev/null and b/public/images/emoji/win10/woman_scientist/6.png differ
diff --git a/public/images/emoji/win10/woman_shrugging.png b/public/images/emoji/win10/woman_shrugging.png
new file mode 100644
index 00000000000..d71e99459a2
Binary files /dev/null and b/public/images/emoji/win10/woman_shrugging.png differ
diff --git a/public/images/emoji/win10/woman_shrugging/2.png b/public/images/emoji/win10/woman_shrugging/2.png
new file mode 100644
index 00000000000..25dc818cb87
Binary files /dev/null and b/public/images/emoji/win10/woman_shrugging/2.png differ
diff --git a/public/images/emoji/win10/woman_shrugging/3.png b/public/images/emoji/win10/woman_shrugging/3.png
new file mode 100644
index 00000000000..9211df35184
Binary files /dev/null and b/public/images/emoji/win10/woman_shrugging/3.png differ
diff --git a/public/images/emoji/win10/woman_shrugging/4.png b/public/images/emoji/win10/woman_shrugging/4.png
new file mode 100644
index 00000000000..b241a786e67
Binary files /dev/null and b/public/images/emoji/win10/woman_shrugging/4.png differ
diff --git a/public/images/emoji/win10/woman_shrugging/5.png b/public/images/emoji/win10/woman_shrugging/5.png
new file mode 100644
index 00000000000..ba257bbef2a
Binary files /dev/null and b/public/images/emoji/win10/woman_shrugging/5.png differ
diff --git a/public/images/emoji/win10/woman_shrugging/6.png b/public/images/emoji/win10/woman_shrugging/6.png
new file mode 100644
index 00000000000..696194810c7
Binary files /dev/null and b/public/images/emoji/win10/woman_shrugging/6.png differ
diff --git a/public/images/emoji/win10/woman_singer.png b/public/images/emoji/win10/woman_singer.png
new file mode 100644
index 00000000000..6b8e960f034
Binary files /dev/null and b/public/images/emoji/win10/woman_singer.png differ
diff --git a/public/images/emoji/win10/woman_singer/2.png b/public/images/emoji/win10/woman_singer/2.png
new file mode 100644
index 00000000000..fef7d28add0
Binary files /dev/null and b/public/images/emoji/win10/woman_singer/2.png differ
diff --git a/public/images/emoji/win10/woman_singer/3.png b/public/images/emoji/win10/woman_singer/3.png
new file mode 100644
index 00000000000..5be4ef6ae79
Binary files /dev/null and b/public/images/emoji/win10/woman_singer/3.png differ
diff --git a/public/images/emoji/win10/woman_singer/4.png b/public/images/emoji/win10/woman_singer/4.png
new file mode 100644
index 00000000000..92ddb5a491e
Binary files /dev/null and b/public/images/emoji/win10/woman_singer/4.png differ
diff --git a/public/images/emoji/win10/woman_singer/5.png b/public/images/emoji/win10/woman_singer/5.png
new file mode 100644
index 00000000000..70424fac7c8
Binary files /dev/null and b/public/images/emoji/win10/woman_singer/5.png differ
diff --git a/public/images/emoji/win10/woman_singer/6.png b/public/images/emoji/win10/woman_singer/6.png
new file mode 100644
index 00000000000..5e3c433ae1b
Binary files /dev/null and b/public/images/emoji/win10/woman_singer/6.png differ
diff --git a/public/images/emoji/win10/woman_student.png b/public/images/emoji/win10/woman_student.png
new file mode 100644
index 00000000000..89a522bd8eb
Binary files /dev/null and b/public/images/emoji/win10/woman_student.png differ
diff --git a/public/images/emoji/win10/woman_student/2.png b/public/images/emoji/win10/woman_student/2.png
new file mode 100644
index 00000000000..8cca6ed2c45
Binary files /dev/null and b/public/images/emoji/win10/woman_student/2.png differ
diff --git a/public/images/emoji/win10/woman_student/3.png b/public/images/emoji/win10/woman_student/3.png
new file mode 100644
index 00000000000..ec867bb467d
Binary files /dev/null and b/public/images/emoji/win10/woman_student/3.png differ
diff --git a/public/images/emoji/win10/woman_student/4.png b/public/images/emoji/win10/woman_student/4.png
new file mode 100644
index 00000000000..c7ed0118926
Binary files /dev/null and b/public/images/emoji/win10/woman_student/4.png differ
diff --git a/public/images/emoji/win10/woman_student/5.png b/public/images/emoji/win10/woman_student/5.png
new file mode 100644
index 00000000000..3cad1581209
Binary files /dev/null and b/public/images/emoji/win10/woman_student/5.png differ
diff --git a/public/images/emoji/win10/woman_student/6.png b/public/images/emoji/win10/woman_student/6.png
new file mode 100644
index 00000000000..fda2bc1f084
Binary files /dev/null and b/public/images/emoji/win10/woman_student/6.png differ
diff --git a/public/images/emoji/win10/woman_teacher.png b/public/images/emoji/win10/woman_teacher.png
new file mode 100644
index 00000000000..241e7dfa56f
Binary files /dev/null and b/public/images/emoji/win10/woman_teacher.png differ
diff --git a/public/images/emoji/win10/woman_teacher/2.png b/public/images/emoji/win10/woman_teacher/2.png
new file mode 100644
index 00000000000..9a6cfbb55e6
Binary files /dev/null and b/public/images/emoji/win10/woman_teacher/2.png differ
diff --git a/public/images/emoji/win10/woman_teacher/3.png b/public/images/emoji/win10/woman_teacher/3.png
new file mode 100644
index 00000000000..2c47f027ab5
Binary files /dev/null and b/public/images/emoji/win10/woman_teacher/3.png differ
diff --git a/public/images/emoji/win10/woman_teacher/4.png b/public/images/emoji/win10/woman_teacher/4.png
new file mode 100644
index 00000000000..7e1562a0a13
Binary files /dev/null and b/public/images/emoji/win10/woman_teacher/4.png differ
diff --git a/public/images/emoji/win10/woman_teacher/5.png b/public/images/emoji/win10/woman_teacher/5.png
new file mode 100644
index 00000000000..30647504bcf
Binary files /dev/null and b/public/images/emoji/win10/woman_teacher/5.png differ
diff --git a/public/images/emoji/win10/woman_teacher/6.png b/public/images/emoji/win10/woman_teacher/6.png
new file mode 100644
index 00000000000..c4b0099353c
Binary files /dev/null and b/public/images/emoji/win10/woman_teacher/6.png differ
diff --git a/public/images/emoji/win10/woman_technologist.png b/public/images/emoji/win10/woman_technologist.png
new file mode 100644
index 00000000000..7f37ebec0b4
Binary files /dev/null and b/public/images/emoji/win10/woman_technologist.png differ
diff --git a/public/images/emoji/win10/woman_technologist/2.png b/public/images/emoji/win10/woman_technologist/2.png
new file mode 100644
index 00000000000..438138ec68d
Binary files /dev/null and b/public/images/emoji/win10/woman_technologist/2.png differ
diff --git a/public/images/emoji/win10/woman_technologist/3.png b/public/images/emoji/win10/woman_technologist/3.png
new file mode 100644
index 00000000000..9d54f921899
Binary files /dev/null and b/public/images/emoji/win10/woman_technologist/3.png differ
diff --git a/public/images/emoji/win10/woman_technologist/4.png b/public/images/emoji/win10/woman_technologist/4.png
new file mode 100644
index 00000000000..cc14c742851
Binary files /dev/null and b/public/images/emoji/win10/woman_technologist/4.png differ
diff --git a/public/images/emoji/win10/woman_technologist/5.png b/public/images/emoji/win10/woman_technologist/5.png
new file mode 100644
index 00000000000..b1769d74e59
Binary files /dev/null and b/public/images/emoji/win10/woman_technologist/5.png differ
diff --git a/public/images/emoji/win10/woman_technologist/6.png b/public/images/emoji/win10/woman_technologist/6.png
new file mode 100644
index 00000000000..8a4078047e1
Binary files /dev/null and b/public/images/emoji/win10/woman_technologist/6.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf.png b/public/images/emoji/win10/woman_with_headscarf.png
new file mode 100644
index 00000000000..6b3731cac84
Binary files /dev/null and b/public/images/emoji/win10/woman_with_headscarf.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/2.png b/public/images/emoji/win10/woman_with_headscarf/2.png
new file mode 100644
index 00000000000..511414ad6c6
Binary files /dev/null and b/public/images/emoji/win10/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/3.png b/public/images/emoji/win10/woman_with_headscarf/3.png
new file mode 100644
index 00000000000..af954353790
Binary files /dev/null and b/public/images/emoji/win10/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/4.png b/public/images/emoji/win10/woman_with_headscarf/4.png
new file mode 100644
index 00000000000..355bdeb6361
Binary files /dev/null and b/public/images/emoji/win10/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/5.png b/public/images/emoji/win10/woman_with_headscarf/5.png
new file mode 100644
index 00000000000..8d0ad7202e3
Binary files /dev/null and b/public/images/emoji/win10/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/win10/woman_with_headscarf/6.png b/public/images/emoji/win10/woman_with_headscarf/6.png
new file mode 100644
index 00000000000..3c49195f876
Binary files /dev/null and b/public/images/emoji/win10/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/win10/woman_with_turban.png b/public/images/emoji/win10/woman_with_turban.png
new file mode 100644
index 00000000000..ee81bb3672d
Binary files /dev/null and b/public/images/emoji/win10/woman_with_turban.png differ
diff --git a/public/images/emoji/win10/woman_with_turban/2.png b/public/images/emoji/win10/woman_with_turban/2.png
new file mode 100644
index 00000000000..194acbb2ac9
Binary files /dev/null and b/public/images/emoji/win10/woman_with_turban/2.png differ
diff --git a/public/images/emoji/win10/woman_with_turban/3.png b/public/images/emoji/win10/woman_with_turban/3.png
new file mode 100644
index 00000000000..f4b713023eb
Binary files /dev/null and b/public/images/emoji/win10/woman_with_turban/3.png differ
diff --git a/public/images/emoji/win10/woman_with_turban/4.png b/public/images/emoji/win10/woman_with_turban/4.png
new file mode 100644
index 00000000000..098d9fb145d
Binary files /dev/null and b/public/images/emoji/win10/woman_with_turban/4.png differ
diff --git a/public/images/emoji/win10/woman_with_turban/5.png b/public/images/emoji/win10/woman_with_turban/5.png
new file mode 100644
index 00000000000..7cb62e18cd5
Binary files /dev/null and b/public/images/emoji/win10/woman_with_turban/5.png differ
diff --git a/public/images/emoji/win10/woman_with_turban/6.png b/public/images/emoji/win10/woman_with_turban/6.png
new file mode 100644
index 00000000000..b946fd69e3c
Binary files /dev/null and b/public/images/emoji/win10/woman_with_turban/6.png differ
diff --git a/public/images/emoji/win10/women_wrestling.png b/public/images/emoji/win10/women_wrestling.png
new file mode 100644
index 00000000000..196e4c84d37
Binary files /dev/null and b/public/images/emoji/win10/women_wrestling.png differ
diff --git a/public/images/emoji/win10/writing_hand/2.png b/public/images/emoji/win10/writing_hand/2.png
new file mode 100644
index 00000000000..c08a31faae6
Binary files /dev/null and b/public/images/emoji/win10/writing_hand/2.png differ
diff --git a/public/images/emoji/win10/writing_hand/3.png b/public/images/emoji/win10/writing_hand/3.png
new file mode 100644
index 00000000000..11b2c126872
Binary files /dev/null and b/public/images/emoji/win10/writing_hand/3.png differ
diff --git a/public/images/emoji/win10/writing_hand/4.png b/public/images/emoji/win10/writing_hand/4.png
new file mode 100644
index 00000000000..2126260f41c
Binary files /dev/null and b/public/images/emoji/win10/writing_hand/4.png differ
diff --git a/public/images/emoji/win10/writing_hand/5.png b/public/images/emoji/win10/writing_hand/5.png
new file mode 100644
index 00000000000..45236df2aa1
Binary files /dev/null and b/public/images/emoji/win10/writing_hand/5.png differ
diff --git a/public/images/emoji/win10/writing_hand/6.png b/public/images/emoji/win10/writing_hand/6.png
new file mode 100644
index 00000000000..8a84783b9be
Binary files /dev/null and b/public/images/emoji/win10/writing_hand/6.png differ
diff --git a/public/images/emoji/win10/yemen.png b/public/images/emoji/win10/yemen.png
new file mode 100644
index 00000000000..3a37c850413
Binary files /dev/null and b/public/images/emoji/win10/yemen.png differ
diff --git a/public/images/emoji/win10/zambia.png b/public/images/emoji/win10/zambia.png
new file mode 100644
index 00000000000..3e7d4cbea56
Binary files /dev/null and b/public/images/emoji/win10/zambia.png differ
diff --git a/public/images/emoji/win10/zebra.png b/public/images/emoji/win10/zebra.png
new file mode 100644
index 00000000000..6faa14f55dc
Binary files /dev/null and b/public/images/emoji/win10/zebra.png differ
diff --git a/public/images/emoji/win10/zero.png b/public/images/emoji/win10/zero.png
index e5b08a12679..4b2b38dce0a 100644
Binary files a/public/images/emoji/win10/zero.png and b/public/images/emoji/win10/zero.png differ
diff --git a/public/images/emoji/win10/zimbabwe.png b/public/images/emoji/win10/zimbabwe.png
new file mode 100644
index 00000000000..c3af3c54d7e
Binary files /dev/null and b/public/images/emoji/win10/zimbabwe.png differ
diff --git a/public/images/emoji/win10/zombie.png b/public/images/emoji/win10/zombie.png
new file mode 100644
index 00000000000..1bf288fcd4c
Binary files /dev/null and b/public/images/emoji/win10/zombie.png differ
diff --git a/public/javascripts/pikaday.js b/public/javascripts/pikaday.js
index 7fec0fc464f..ba7aca0641d 100644
--- a/public/javascripts/pikaday.js
+++ b/public/javascripts/pikaday.js
@@ -59,22 +59,6 @@
         }
     },
 
-    fireEvent = function(el, eventName, data)
-    {
-        var ev;
-
-        if (document.createEvent) {
-            ev = document.createEvent('HTMLEvents');
-            ev.initEvent(eventName, true, false);
-            ev = extend(ev, data);
-            el.dispatchEvent(ev);
-        } else if (document.createEventObject) {
-            ev = document.createEventObject();
-            ev = extend(ev, data);
-            el.fireEvent('on' + eventName, ev);
-        }
-    },
-
     trim = function(str)
     {
         return str.trim ? str.trim() : str.replace(/^\s+|\s+$/g,'');
@@ -160,6 +144,22 @@
         return to;
     },
 
+    fireEvent = function(el, eventName, data)
+    {
+        var ev;
+
+        if (document.createEvent) {
+            ev = document.createEvent('HTMLEvents');
+            ev.initEvent(eventName, true, false);
+            ev = extend(ev, data);
+            el.dispatchEvent(ev);
+        } else if (document.createEventObject) {
+            ev = document.createEventObject();
+            ev = extend(ev, data);
+            el.fireEvent('on' + eventName, ev);
+        }
+    },
+
     adjustCalendar = function(calendar) {
         if (calendar.month < 0) {
             calendar.year -= Math.ceil(Math.abs(calendar.month)/12);
@@ -183,6 +183,9 @@
         // automatically show/hide the picker on `field` focus (default `true` if `field` is set)
         bound: undefined,
 
+        // data-attribute on the input field with an aria assistance tekst (only applied when `bound` is set)
+        ariaLabel: 'Use the arrow keys to pick a date',
+
         // position of the datepicker, relative to the field (default to bottom & left)
         // ('bottom' & 'left' keywords are not used, 'top' & 'right' are modifier on the bottom/left position)
         position: 'bottom left',
@@ -193,6 +196,13 @@
         // the default output format for `.toString()` and `field` value
         format: 'YYYY-MM-DD',
 
+        // the toString function which gets passed a current date object and format
+        // and returns a string
+        toString: null,
+
+        // used to create date object from current input string
+        parse: null,
+
         // the initial date to view when first opened
         defaultDate: null,
 
@@ -216,6 +226,9 @@
         // show week numbers at head of row
         showWeekNumber: false,
 
+        // Week picker mode
+        pickWholeWeek: false,
+
         // used internally (don't config outside)
         minYear: 0,
         maxYear: 9999,
@@ -236,6 +249,9 @@
         // Render days of the calendar grid that fall in the next or previous month
         showDaysInNextAndPreviousMonths: false,
 
+        // Allows user to select days that fall in the next or previous month
+        enableSelectionDaysInNextAndPreviousMonths: false,
+
         // how many months are visible
         numberOfMonths: 1,
 
@@ -246,6 +262,9 @@
         // Specify a DOM element to render the calendar in
         container: undefined,
 
+        // Blur field when date is selected
+        blurFieldOnSelect : true,
+
         // internationalization
         i18n: {
             previousMonth : 'Previous Month',
@@ -258,11 +277,17 @@
         // Theme Classname
         theme: null,
 
+        // events array
+        events: [],
+
         // callback function
         onSelect: null,
         onOpen: null,
         onClose: null,
-        onDraw: null
+        onDraw: null,
+
+        // Enable keyboard input
+        keyboardInput: true
     },
 
 
@@ -281,9 +306,15 @@
     renderDay = function(opts)
     {
         var arr = [];
+        var ariaSelected = 'false';
         if (opts.isEmpty) {
             if (opts.showDaysInNextAndPreviousMonths) {
                 arr.push('is-outside-current-month');
+
+                if(!opts.enableSelectionDaysInNextAndPreviousMonths) {
+                    arr.push('is-selection-disabled');
+                }
+
             } else {
                 return '<td class="is-empty"></td>';
             }
@@ -296,6 +327,10 @@
         }
         if (opts.isSelected) {
             arr.push('is-selected');
+            ariaSelected = 'true';
+        }
+        if (opts.hasEvent) {
+            arr.push('has-event');
         }
         if (opts.isInRange) {
             arr.push('is-inrange');
@@ -306,7 +341,7 @@
         if (opts.isEndRange) {
             arr.push('is-endrange');
         }
-        return '<td data-day="' + opts.day + '" class="' + arr.join(' ') + '">' +
+        return '<td data-day="' + opts.day + '" class="' + arr.join(' ') + '" aria-selected="' + ariaSelected + '">' +
                  '<button class="pika-button pika-day" type="button" ' +
                     'data-pika-year="' + opts.year + '" data-pika-month="' + opts.month + '" data-pika-day="' + opts.day + '">' +
                         opts.day +
@@ -321,9 +356,9 @@
         return '<td class="pika-week">' + weekNum + '</td>';
     },
 
-    renderRow = function(days, isRTL)
+    renderRow = function(days, isRTL, pickWholeWeek, isRowSelected)
     {
-        return '<tr>' + (isRTL ? days.reverse() : days).join('') + '</tr>';
+        return '<tr class="pika-row' + (pickWholeWeek ? ' pick-whole-week' : '') + (isRowSelected ? ' is-selected' : '') + '">' + (isRTL ? days.reverse() : days).join('') + '</tr>';
     },
 
     renderBody = function(rows)
@@ -343,13 +378,13 @@
         return '<thead><tr>' + (opts.isRTL ? arr.reverse() : arr).join('') + '</tr></thead>';
     },
 
-    renderTitle = function(instance, c, year, month, refYear)
+    renderTitle = function(instance, c, year, month, refYear, randId)
     {
         var i, j, arr,
             opts = instance._o,
             isMinYear = year === opts.minYear,
             isMaxYear = year === opts.maxYear,
-            html = '<div class="pika-title">',
+            html = '<div id="' + randId + '" class="pika-title" role="heading" aria-live="assertive">',
             monthHtml,
             yearHtml,
             prev = true,
@@ -361,6 +396,7 @@
                 ((isMinYear && i < opts.minMonth) || (isMaxYear && i > opts.maxMonth) ? 'disabled="disabled"' : '') + '>' +
                 opts.i18n.months[i] + '</option>');
         }
+
         monthHtml = '<div class="pika-label">' + opts.i18n.months[month] + '<select class="pika-select pika-select-month" tabindex="-1">' + arr.join('') + '</select></div>';
 
         if (isArray(opts.yearRange)) {
@@ -402,9 +438,9 @@
         return html += '</div>';
     },
 
-    renderTable = function(opts, data)
+    renderTable = function(opts, data, randId)
     {
-        return '<table cellpadding="0" cellspacing="0" class="pika-table">' + renderHead(opts) + renderBody(data) + '</table>';
+        return '<table cellpadding="0" cellspacing="0" class="pika-table" role="grid" aria-labelledby="' + randId + '">' + renderHead(opts) + renderBody(data) + '</table>';
     },
 
 
@@ -433,7 +469,7 @@
                     if (opts.bound) {
                         sto(function() {
                             self.hide();
-                            if (opts.field) {
+                            if (opts.blurFieldOnSelect && opts.field) {
                                 opts.field.blur();
                             }
                         }, 100);
@@ -474,6 +510,36 @@
             }
         };
 
+        self._onKeyChange = function(e)
+        {
+            e = e || window.event;
+
+            if (self.isVisible()) {
+
+                switch(e.keyCode){
+                    case 13:
+                    case 27:
+                        if (opts.field) {
+                            opts.field.blur();
+                        }
+                        break;
+                    case 37:
+                        e.preventDefault();
+                        self.adjustDate('subtract', 1);
+                        break;
+                    case 38:
+                        self.adjustDate('subtract', 7);
+                        break;
+                    case 39:
+                        self.adjustDate('add', 1);
+                        break;
+                    case 40:
+                        self.adjustDate('add', 7);
+                        break;
+                }
+            }
+        };
+
         self._onInputChange = function(e)
         {
             var date;
@@ -481,7 +547,9 @@
             if (e.firedBy === self) {
                 return;
             }
-            if (hasMoment) {
+            if (opts.parse) {
+                date = opts.parse(opts.field.value, opts.format);
+            } else if (hasMoment) {
                 date = moment(opts.field.value, opts.format, opts.formatStrict);
                 date = (date && date.isValid()) ? date.toDate() : null;
             }
@@ -557,6 +625,10 @@
         addEvent(self.el, 'touchend', self._onMouseDown, true);
         addEvent(self.el, 'change', self._onChange);
 
+        if (opts.keyboardInput) {
+            addEvent(document, 'keydown', self._onKeyChange);
+        }
+
         if (opts.field) {
             if (opts.container) {
                 opts.container.appendChild(self.el);
@@ -670,7 +742,17 @@
          */
         toString: function(format)
         {
-            return !isDate(this._d) ? '' : hasMoment ? moment(this._d).format(format || this._o.format) : this._d.toDateString();
+            format = format || this._o.format;
+            if (!isDate(this._d)) {
+                return '';
+            }
+            if (this._o.toString) {
+              return this._o.toString(this._d, format);
+            }
+            if (hasMoment) {
+              return moment(this._d).format(format);
+            }
+            return this._d.toDateString();
         },
 
         /**
@@ -777,6 +859,22 @@
             this.adjustCalendars();
         },
 
+        adjustDate: function(sign, days) {
+
+            var day = this.getDate() || new Date();
+            var difference = parseInt(days)*24*60*60*1000;
+
+            var newDay;
+
+            if (sign === 'add') {
+                newDay = new Date(day.valueOf() + difference);
+            } else if (sign === 'subtract') {
+                newDay = new Date(day.valueOf() - difference);
+            }
+
+            this.setDate(newDay);
+        },
+
         adjustCalendars: function() {
             this.calendars[0] = adjustCalendar(this.calendars[0]);
             for (var c = 1; c < this._o.numberOfMonths; c++) {
@@ -832,10 +930,18 @@
          */
         setMinDate: function(value)
         {
-            setToStartOfDay(value);
-            this._o.minDate = value;
-            this._o.minYear  = value.getFullYear();
-            this._o.minMonth = value.getMonth();
+            if(value instanceof Date) {
+                setToStartOfDay(value);
+                this._o.minDate = value;
+                this._o.minYear  = value.getFullYear();
+                this._o.minMonth = value.getMonth();
+            } else {
+                this._o.minDate = defaults.minDate;
+                this._o.minYear  = defaults.minYear;
+                this._o.minMonth = defaults.minMonth;
+                this._o.startRange = defaults.startRange;
+            }
+
             this.draw();
         },
 
@@ -844,10 +950,18 @@
          */
         setMaxDate: function(value)
         {
-            setToStartOfDay(value);
-            this._o.maxDate = value;
-            this._o.maxYear = value.getFullYear();
-            this._o.maxMonth = value.getMonth();
+            if(value instanceof Date) {
+                setToStartOfDay(value);
+                this._o.maxDate = value;
+                this._o.maxYear = value.getFullYear();
+                this._o.maxMonth = value.getMonth();
+            } else {
+                this._o.maxDate = defaults.maxDate;
+                this._o.maxYear = defaults.maxYear;
+                this._o.maxMonth = defaults.maxMonth;
+                this._o.endRange = defaults.endRange;
+            }
+
             this.draw();
         },
 
@@ -874,7 +988,8 @@
                 maxYear = opts.maxYear,
                 minMonth = opts.minMonth,
                 maxMonth = opts.maxMonth,
-                html = '';
+                html = '',
+                randId;
 
             if (this._y <= minYear) {
                 this._y = minYear;
@@ -889,8 +1004,10 @@
                 }
             }
 
+            randId = 'pika-title-' + Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 2);
+
             for (var c = 0; c < opts.numberOfMonths; c++) {
-                html += '<div class="pika-lendar">' + renderTitle(this, c, this.calendars[c].year, this.calendars[c].month, this.calendars[0].year) + this.render(this.calendars[c].year, this.calendars[c].month) + '</div>';
+                html += '<div class="pika-lendar">' + renderTitle(this, c, this.calendars[c].year, this.calendars[c].month, this.calendars[0].year, randId) + this.render(this.calendars[c].year, this.calendars[c].month, randId) + '</div>';
             }
 
             this.el.innerHTML = html;
@@ -906,6 +1023,11 @@
             if (typeof this._o.onDraw === 'function') {
                 this._o.onDraw(this);
             }
+
+            if (opts.bound) {
+                // let the screen reader user know to use arrow keys
+                opts.field.setAttribute('aria-label', opts.ariaLabel);
+            }
         },
 
         adjustPosition: function()
@@ -962,7 +1084,7 @@
         /**
          * render HTML for a particular month
          */
-        render: function(year, month)
+        render: function(year, month, randId)
         {
             var opts   = this._o,
                 now    = new Date(),
@@ -988,11 +1110,13 @@
                 after -= 7;
             }
             cells += 7 - after;
+            var isWeekSelected = false;
             for (var i = 0, r = 0; i < cells; i++)
             {
                 var day = new Date(year, month, 1 + (i - before)),
                     isSelected = isDate(this._d) ? compareDates(day, this._d) : false,
                     isToday = compareDates(day, now),
+                    hasEvent = opts.events.indexOf(day.toDateString()) !== -1 ? true : false,
                     isEmpty = i < before || i >= (days + before),
                     dayNumber = 1 + (i - before),
                     monthNumber = month,
@@ -1021,6 +1145,7 @@
                         day: dayNumber,
                         month: monthNumber,
                         year: yearNumber,
+                        hasEvent: hasEvent,
                         isSelected: isSelected,
                         isToday: isToday,
                         isDisabled: isDisabled,
@@ -1028,21 +1153,27 @@
                         isStartRange: isStartRange,
                         isEndRange: isEndRange,
                         isInRange: isInRange,
-                        showDaysInNextAndPreviousMonths: opts.showDaysInNextAndPreviousMonths
+                        showDaysInNextAndPreviousMonths: opts.showDaysInNextAndPreviousMonths,
+                        enableSelectionDaysInNextAndPreviousMonths: opts.enableSelectionDaysInNextAndPreviousMonths
                     };
 
+                if (opts.pickWholeWeek && isSelected) {
+                    isWeekSelected = true;
+                }
+
                 row.push(renderDay(dayConfig));
 
                 if (++r === 7) {
                     if (opts.showWeekNumber) {
                         row.unshift(renderWeek(i - before, month, year));
                     }
-                    data.push(renderRow(row, opts.isRTL));
+                    data.push(renderRow(row, opts.isRTL, opts.pickWholeWeek, isWeekSelected));
                     row = [];
                     r = 0;
+                    isWeekSelected = false;
                 }
             }
-            return renderTable(opts, data);
+            return renderTable(opts, data, randId);
         },
 
         isVisible: function()
@@ -1052,10 +1183,10 @@
 
         show: function()
         {
-            if (!this._v) {
-                removeClass(this.el, 'is-hidden');
+            if (!this.isVisible()) {
                 this._v = true;
                 this.draw();
+                removeClass(this.el, 'is-hidden');
                 if (this._o.bound) {
                     addEvent(document, 'click', this._onClick);
                     this.adjustPosition();
@@ -1089,16 +1220,21 @@
          */
         destroy: function()
         {
+            var opts = this._o;
+
             this.hide();
             removeEvent(this.el, 'mousedown', this._onMouseDown, true);
             removeEvent(this.el, 'touchend', this._onMouseDown, true);
             removeEvent(this.el, 'change', this._onChange);
-            if (this._o.field) {
-                removeEvent(this._o.field, 'change', this._onInputChange);
-                if (this._o.bound) {
-                    removeEvent(this._o.trigger, 'click', this._onInputClick);
-                    removeEvent(this._o.trigger, 'focus', this._onInputFocus);
-                    removeEvent(this._o.trigger, 'blur', this._onInputBlur);
+            if (opts.keyboardInput) {
+                removeEvent(document, 'keydown', this._onKeyChange);
+            }
+            if (opts.field) {
+                removeEvent(opts.field, 'change', this._onInputChange);
+                if (opts.bound) {
+                    removeEvent(opts.trigger, 'click', this._onInputClick);
+                    removeEvent(opts.trigger, 'focus', this._onInputFocus);
+                    removeEvent(opts.trigger, 'blur', this._onInputBlur);
                 }
             }
             if (this.el.parentNode) {
@@ -1109,5 +1245,4 @@
     };
 
     return Pikaday;
-
 }));
diff --git a/script/.gitignore b/script/.gitignore
new file mode 100644
index 00000000000..1fb9ef57453
--- /dev/null
+++ b/script/.gitignore
@@ -0,0 +1 @@
+tmp/*
diff --git a/script/benchmarks/markdown/.gitignore b/script/benchmarks/markdown/.gitignore
new file mode 100644
index 00000000000..1fb9ef57453
--- /dev/null
+++ b/script/benchmarks/markdown/.gitignore
@@ -0,0 +1 @@
+tmp/*
diff --git a/script/benchmarks/markdown/bench.rb b/script/benchmarks/markdown/bench.rb
new file mode 100644
index 00000000000..a1e0cda2851
--- /dev/null
+++ b/script/benchmarks/markdown/bench.rb
@@ -0,0 +1,73 @@
+require 'benchmark/ips'
+require File.expand_path('../../../../config/environment', __FILE__)
+
+
+tests = [
+  ["tiny post", "**hello**"],
+  ["giant post", File.read("giant_post.md")],
+  ["most features", File.read("most_features.md")],
+  ["lots of mentions", File.read("lots_of_mentions.md")]
+]
+
+PrettyText.cook("")
+PrettyText.v8.eval("window.commonmark = window.markdownit('commonmark')")
+
+# Benchmark.ips do |x|
+#   x.report("markdown") do
+#     PrettyText.markdown("x")
+#   end
+#
+#   x.report("cook") do
+#     PrettyText.cook("y")
+#   end
+# end
+#
+# exit
+
+Benchmark.ips do |x|
+  [true,false].each do |sanitize|
+    tests.each do |test, text|
+      x.report("#{test} sanitize: #{sanitize}") do
+        PrettyText.markdown(text, sanitize: sanitize)
+      end
+    end
+  end
+
+
+  tests.each do |test, text|
+    x.report("markdown it no extensions commonmark #{test}") do
+      PrettyText.v8.eval("window.commonmark.render(#{text.inspect})")
+    end
+  end
+end
+
+
+# 18-07-2017 - Sam's NUC
+
+# Calculating -------------------------------------
+# tiny post sanitize: true
+#                         162.766  (±13.5%) i/s -    812.000  in   5.101429s
+# giant post sanitize: true
+#                         133.957  (±11.2%) i/s -    663.000  in   5.029386s
+# most features sanitize: true
+#                          55.319  (±10.8%) i/s -    276.000  in   5.054290s
+# lots of mentions sanitize: true
+#                           0.313  (± 0.0%) i/s -      2.000  in   6.394343s
+# tiny post sanitize: false
+#                         456.209  (±13.6%) i/s -      2.288k in   5.117314s
+# giant post sanitize: false
+#                         331.357  (±10.9%) i/s -      1.650k in   5.046322s
+# most features sanitize: false
+#                          77.038  (±10.4%) i/s -    385.000  in   5.055062s
+# lots of mentions sanitize: false
+#                           0.312  (± 0.0%) i/s -      2.000  in   6.430657s
+# markdown it no extensions commonmark tiny post
+#                           6.916k (± 5.5%) i/s -     34.540k in   5.010354s
+# markdown it no extensions commonmark giant post
+#                           1.044k (± 9.3%) i/s -      5.247k in   5.090534s
+# markdown it no extensions commonmark most features
+#                           1.457k (± 5.0%) i/s -      7.314k in   5.034401s
+# markdown it no extensions commonmark lots of mentions
+#                           2.004k (± 5.2%) i/s -     10.192k in   5.100657s
+# sam@ubuntu markdown %
+#
diff --git a/script/benchmarks/markdown/giant_post.md b/script/benchmarks/markdown/giant_post.md
new file mode 100644
index 00000000000..3da15173e4c
--- /dev/null
+++ b/script/benchmarks/markdown/giant_post.md
@@ -0,0 +1,582 @@
+    [discourse]# ./launcher bootstrap app
+    which: no docker.io in (/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin)
+
+    WARNING: We are about to start downloading the Discourse base image
+    This process may take anywhere between a few minutes to an hour, depending on your network speed
+
+    Please be patient
+
+    Unable to find image 'samsaffron/discourse:1.0.13' locally
+    1.0.13: Pulling from samsaffron/discourse
+    ........
+
+    Fast-forward
+     .travis.yml                                        |   3 -
+     Gemfile                                            |  25 +-
+     Gemfile.lock                                       | 298 ++++++-----
+     README.md                                          |  23 +-
+     .../admin/components/embedding-setting.js.es6      |   5 +
+     .../screened_ip_address_form_component.js          |  23 +-
+     .../admin/controllers/admin-site-settings.js.es6   |  28 +-
+     .../admin/controllers/admin-user-badges.js.es6     |   4 +-
+     .../javascripts/admin/models/admin-user.js.es6     |  12 +-
+     .../javascripts/admin/models/staff_action_log.js   |   3 +-
+     app/assets/javascripts/admin/templates/admin.hbs   |   2 +-
+     .../templates/components/embedding-setting.hbs     |   2 +-
+     .../admin/templates/components/site-setting.hbs    |   2 +-
+     .../javascripts/admin/templates/dashboard.hbs      |   2 +-
+     .../javascripts/admin/templates/embedding.hbs      |   9 +-
+     .../admin/templates/modal/admin_agree_flag.hbs     |   6 +-
+     .../admin/templates/modal/admin_delete_flag.hbs    |   2 +-
+     .../javascripts/admin/templates/plugins-index.hbs  |  19 +-
+     .../admin/templates/site-settings-category.hbs     |   2 +-
+     .../javascripts/admin/templates/site-settings.hbs  |   6 +-
+     .../javascripts/admin/templates/site-text-edit.hbs |   2 +-
+     .../javascripts/admin/templates/user-index.hbs     |  36 +-
+     app/assets/javascripts/discourse.js                |   2 +-
+     .../javascripts/discourse/adapters/rest.js.es6     |  14 +-
+     .../discourse/components/actions-summary.js.es6    |   4 +-
+     .../discourse/components/category-chooser.js.es6   |   2 +-
+     .../discourse/components/d-editor-modal.js.es6     |  52 ++
+     .../discourse/components/d-editor.js.es6           | 263 ++++++++++
+     .../javascripts/discourse/components/d-link.js.es6 |   7 +-
+     .../discourse/components/date-picker.js.es6        |  22 +-
+     .../components/desktop-notification-config.js.es6  |  60 ++-
+     .../discourse/components/image-uploader.js.es6     |   9 +-
+     .../discourse/components/menu-panel.js.es6         |   3 +-
+     .../discourse/components/notification-item.js.es6  |  10 +-
+     .../discourse/components/pagedown-editor.js.es6    |  23 -
+     .../discourse/components/post-gutter.js.es6        |  53 +-
+     .../discourse/components/post-menu.js.es6          |   9 +-
+     .../components/private-message-map.js.es6          |   2 +-
+     .../discourse/components/who-liked.js.es6          |   2 +-
+     .../discourse/controllers/change-owner.js.es6      |   5 +-
+     .../discourse/controllers/composer.js.es6          |   4 +-
+     .../controllers/discovery-sortable.js.es6          |   6 +-
+     .../discourse/controllers/discovery/topics.js.es6  |  11 +-
+     .../discourse/controllers/edit-category.js.es6     |  17 +-
+     .../discourse/controllers/full-page-search.js.es6  |   2 +-
+     .../javascripts/discourse/controllers/login.js.es6 |  37 +-
+     .../discourse/controllers/quote-button.js.es6      |  38 +-
+     .../javascripts/discourse/controllers/topic.js.es6 |  52 +-
+     .../discourse/controllers/user-card.js.es6         |   1 +
+     .../javascripts/discourse/controllers/user.js.es6  |  58 ++-
+     .../javascripts/discourse/dialects/dialect.js      |   2 +-
+     .../discourse/dialects/quote_dialect.js            |  33 +-
+     .../discourse/initializers/enable-emoji.js.es6     |  10 +-
+     .../discourse/initializers/load-all-helpers.js.es6 |  17 +-
+     .../subscribe-user-notifications.js.es6            |  12 +-
+     .../javascripts/discourse/lib/Markdown.Editor.js   |   3 +-
+     .../javascripts/discourse/lib/autocomplete.js.es6  |  15 +-
+     .../discourse/lib/desktop-notifications.js.es6     |  11 +-
+     .../discourse/lib/emoji/emoji-groups.js.es6        |  57 ++
+     .../discourse/lib/emoji/emoji-toolbar.js.es6       | 259 ++++------
+     .../discourse/lib/key-value-store.js.es6           |  16 +-
+     .../discourse/lib/keyboard-shortcuts.js.es6        |  15 +-
+     .../javascripts/discourse/models/post.js.es6       |  12 +-
+     .../javascripts/discourse/models/topic-list.js.es6 |  56 +-
+     .../javascripts/discourse/models/topic.js.es6      |   2 +
+     .../javascripts/discourse/models/user.js.es6       |   4 +
+     .../pre-initializers/dynamic-route-builders.js.es6 |  47 +-
+     .../pre-initializers/sniff-capabilities.js.es6     |  21 +-
+     .../discourse/routes/app-route-map.js.es6          |  31 +-
+     .../discourse/routes/badges-show.js.es6            |   2 +-
+     .../discourse/routes/build-category-route.js.es6   |  44 +-
+     .../discourse/routes/build-static-route.js.es6     |  18 +
+     .../discourse/routes/build-topic-route.js.es6      |  20 +-
+     .../javascripts/discourse/routes/discovery.js.es6  |   4 +
+     .../discourse/routes/forgot-password.js.es6        |  27 +-
+     .../javascripts/discourse/routes/login.js.es6      |  31 +-
+     .../templates/components/category-unread.hbs       |   2 +-
+     .../templates/components/d-editor-modal.hbs        |   7 +
+     .../discourse/templates/components/d-editor.hbs    |  32 ++
+     .../templates/components/edit-category-images.hbs  |   2 +-
+     .../components/edit-category-topic-template.hbs    |   2 +-
+     .../discourse/templates/components/home-logo.hbs   |   3 -
+     .../templates/components/pagedown-editor.hbs       |   4 -
+     .../discourse/templates/components/user-menu.hbs   |   4 +-
+     .../javascripts/discourse/templates/composer.hbs   |   4 +-
+     .../discourse/templates/discovery/topics.hbs       |  23 +-
+     .../templates/emoji-selector-autocomplete.raw.hbs  |  10 +-
+     .../javascripts/discourse/templates/header.hbs     |   2 +-
+     .../discourse/templates/login-preferences.hbs      |   8 +
+     .../templates/mobile/discovery/topics.hbs          |  17 +-
+     .../templates/mobile/list/topic_list_item.raw.hbs  |  49 +-
+     .../discourse/templates/modal/create-account.hbs   |  17 +-
+     .../discourse/templates/modal/dismiss-read.hbs     |  10 +
+     .../discourse/templates/navigation/category.hbs    |   7 +-
+     .../javascripts/discourse/templates/post.hbs       |  13 +-
+     .../discourse/templates/queued-posts.hbs           |   2 +-
+     .../javascripts/discourse/templates/user/about.hbs |   2 +-
+     .../discourse/templates/user/preferences.hbs       |   3 +-
+     .../javascripts/discourse/templates/user/user.hbs  |  13 +-
+     .../discourse/views/cloaked-collection.js.es6      |   3 +
+     .../javascripts/discourse/views/composer.js.es6    |  94 ++--
+     .../discourse/views/embedded-post.js.es6           |   2 +
+     app/assets/javascripts/discourse/views/post.js.es6 |  13 +-
+     .../discourse/views/quote-button.js.es6            |  26 +-
+     .../discourse/views/topic-entrance.js.es6          |  21 +-
+     .../discourse/views/upload-selector.js.es6         |   6 +-
+     app/assets/javascripts/main_include.js             |   6 +-
+     app/assets/stylesheets/common.scss                 |   1 +
+     .../stylesheets/common/admin/admin_base.scss       |   8 -
+     app/assets/stylesheets/common/base/compose.scss    |  12 +-
+     app/assets/stylesheets/common/base/discourse.scss  |  18 -
+     app/assets/stylesheets/common/base/emoji.scss      |   6 +-
+     app/assets/stylesheets/common/base/header.scss     |   6 -
+     app/assets/stylesheets/common/base/modal.scss      |   4 -
+     app/assets/stylesheets/common/base/onebox.scss     |   2 +-
+     .../stylesheets/common/base/topic-admin-menu.scss  |   2 +-
+     app/assets/stylesheets/common/base/topic-post.scss |   2 -
+     app/assets/stylesheets/common/base/topic.scss      |   8 +-
+     app/assets/stylesheets/common/base/upload.scss     |   8 +-
+     .../stylesheets/common/components/badges.css.scss  |   8 +-
+     app/assets/stylesheets/common/d-editor.scss        |  94 ++++
+     app/assets/stylesheets/desktop/compose.scss        |  10 +-
+     app/assets/stylesheets/desktop/discourse.scss      |   2 +-
+     app/assets/stylesheets/desktop/topic-post.scss     |   8 +-
+     app/assets/stylesheets/desktop/topic.scss          |   5 +-
+     app/assets/stylesheets/desktop/upload.scss         |   2 +-
+     app/assets/stylesheets/desktop/user-card.scss      |   2 +-
+     app/assets/stylesheets/desktop/user.scss           |   8 -
+     app/assets/stylesheets/mobile.scss                 |   1 +
+     app/assets/stylesheets/mobile/alert.scss           |   2 +
+     app/assets/stylesheets/mobile/banner.scss          |   4 +-
+     app/assets/stylesheets/mobile/discourse.scss       |   3 +-
+     app/assets/stylesheets/mobile/emoji.scss           |   3 +
+     app/assets/stylesheets/mobile/header.scss          |   4 +-
+     app/assets/stylesheets/mobile/topic-list.scss      |  32 +-
+     app/assets/stylesheets/mobile/topic-post.scss      |  16 +-
+     app/assets/stylesheets/mobile/topic.scss           |   3 +-
+     app/assets/stylesheets/mobile/user.scss            |   8 +-
+     app/controllers/admin/diagnostics_controller.rb    |  13 +
+     app/controllers/admin/email_controller.rb          |   6 +
+     app/controllers/admin/embedding_controller.rb      |   4 +
+     app/controllers/application_controller.rb          |  15 +-
+     app/controllers/categories_controller.rb           |  32 +-
+     app/controllers/list_controller.rb                 |  29 +-
+     app/controllers/manifest_json_controller.rb        |  15 +
+     app/controllers/permalinks_controller.rb           |   2 +-
+     app/controllers/post_action_users_controller.rb    |  22 +
+     app/controllers/post_actions_controller.rb         |  13 +-
+     app/controllers/posts_controller.rb                |  30 +-
+     app/controllers/robots_txt_controller.rb           |   9 +-
+     app/controllers/topics_controller.rb               |   2 +-
+     .../users/omniauth_callbacks_controller.rb         |  25 +-
+     app/controllers/users_controller.rb                |  26 +-
+     app/helpers/application_helper.rb                  |  22 +-
+     app/jobs/regular/post_alert.rb                     |   2 +-
+     app/jobs/regular/process_post.rb                   |   4 +-
+     app/jobs/scheduled/periodical_updates.rb           |   4 +-
+     app/mailers/user_notifications.rb                  |   1 +
+     app/models/admin_dashboard_data.rb                 |   1 +
+     app/models/anon_site_json_cache_observer.rb        |  12 +
+     app/models/badge.rb                                |  28 +-
+     app/models/category.rb                             |  19 +-
+     app/models/category_group.rb                       |   2 +
+     app/models/color_scheme.rb                         |  22 +-
+     app/models/group.rb                                |   7 +
+     app/models/permalink.rb                            |   2 +-
+     app/models/post.rb                                 |  21 +-
+     app/models/post_action.rb                          |   6 +-
+     app/models/post_action_type.rb                     |  10 +
+     app/models/post_analyzer.rb                        |   2 +-
+     app/models/report.rb                               |  13 +-
+     app/models/screened_ip_address.rb                  |   1 +
+     app/models/site.rb                                 |  63 ++-
+     app/models/topic.rb                                |  65 ++-
+     app/models/topic_featured_users.rb                 |   4 +-
+     app/models/topic_link.rb                           |  14 +-
+     app/models/topic_link_click.rb                     |   2 +-
+     app/models/topic_tracking_state.rb                 |  16 +-
+     app/models/topic_user.rb                           |  15 -
+     app/models/upload.rb                               |   5 +-
+     app/models/user.rb                                 |   4 +-
+     app/models/user_history.rb                         |  13 +-
+     app/models/user_profile.rb                         |   2 +
+     app/models/user_profile_view.rb                    |  47 ++
+     app/serializers/admin_detailed_user_serializer.rb  |   2 +-
+     app/serializers/application_serializer.rb          |  25 +
+     app/serializers/badge_serializer.rb                |  15 +-
+     app/serializers/basic_post_serializer.rb           |   6 +-
+     app/serializers/post_action_user_serializer.rb     |   7 +-
+     app/serializers/post_serializer.rb                 |   2 +-
+     app/serializers/site_serializer.rb                 |  26 +-
+     app/serializers/topic_view_serializer.rb           |   8 +-
+     app/serializers/user_history_serializer.rb         |   1 +
+     app/serializers/user_serializer.rb                 |   7 +-
+     app/services/badge_granter.rb                      |  10 +-
+     app/services/post_alerter.rb                       |   3 +-
+     app/services/random_topic_selector.rb              |  16 +-
+     app/services/staff_action_logger.rb                |  62 +++
+     app/views/common/_discourse_javascript.html.erb    |   5 +
+     app/views/layouts/_head.html.erb                   |  11 +-
+     app/views/layouts/application.html.erb             |   1 +
+     app/views/list/list.erb                            |   3 +-
+     app/views/posts/latest.rss.erb                     |   2 +-
+     app/views/topics/plain.html.erb                    |   4 +-
+     app/views/topics/show.html.erb                     |   4 +-
+     app/views/user_notifications/digest.html.erb       |   4 +-
+     .../users/omniauth_callbacks/complete.html.erb     |   4 +-
+     app/views/users/show.html.erb                      |   4 +-
+     config/application.rb                              |   5 +-
+     config/database.yml                                |   2 +
+     config/discourse_defaults.conf                     |   8 +-
+     config/environments/production.rb                  |   2 +-
+     config/environments/profile.rb                     |   2 +-
+     config/environments/test.rb                        |   2 +-
+     config/initializers/04-message_bus.rb              |   2 +-
+     config/initializers/i18n.rb                        |  15 +-
+     config/locales/client.ar.yml                       |  45 +-
+     config/locales/client.bs_BA.yml                    |  28 +-
+     config/locales/client.cs.yml                       |   9 -
+     config/locales/client.da.yml                       | 168 +++++-
+     config/locales/client.de.yml                       |  65 ++-
+     config/locales/client.en.yml                       |  42 +-
+     config/locales/client.es.yml                       |  35 +-
+     config/locales/client.fa_IR.yml                    |   9 -
+     config/locales/client.fi.yml                       | 125 ++++-
+     config/locales/client.fr.yml                       |  56 +-
+     config/locales/client.he.yml                       | 575 +++++++++++----------
+     config/locales/client.it.yml                       | 133 +++--
+     config/locales/client.ja.yml                       |   9 -
+     config/locales/client.ko.yml                       | 496 +++++++++---------
+     config/locales/client.nb_NO.yml                    |  16 +-
+     config/locales/client.nl.yml                       |  43 +-
+     config/locales/client.pl_PL.yml                    |  66 ++-
+     config/locales/client.pt.yml                       |  37 +-
+     config/locales/client.pt_BR.yml                    | 215 +++++++-
+     config/locales/client.ro.yml                       |   8 -
+     config/locales/client.ru.yml                       | 172 ++++--
+     config/locales/client.sq.yml                       |   9 -
+     config/locales/client.sv.yml                       |   9 -
+     config/locales/client.te.yml                       |   8 -
+     config/locales/client.tr_TR.yml                    |  11 +-
+     config/locales/client.uk.yml                       |   6 -
+     config/locales/client.zh_CN.yml                    |  22 +-
+     config/locales/client.zh_TW.yml                    |  11 +-
+     config/locales/server.ar.yml                       |  61 ++-
+     config/locales/server.bs_BA.yml                    |   2 -
+     config/locales/server.cs.yml                       |   1 -
+     config/locales/server.da.yml                       | 107 +++-
+     config/locales/server.de.yml                       | 238 ++++++++-
+     config/locales/server.en.yml                       |  37 +-
+     config/locales/server.es.yml                       | 134 ++++-
+     config/locales/server.fa_IR.yml                    |   2 -
+     config/locales/server.fi.yml                       |  85 ++-
+     config/locales/server.fr.yml                       |   4 -
+     config/locales/server.he.yml                       |  21 +-
+     config/locales/server.it.yml                       |  44 +-
+     config/locales/server.ja.yml                       |   2 -
+     config/locales/server.ko.yml                       |   2 -
+     config/locales/server.nb_NO.yml                    |   1 -
+     config/locales/server.nl.yml                       |   9 +-
+     config/locales/server.pl_PL.yml                    | 236 ++++++++-
+     config/locales/server.pt.yml                       |  31 +-
+     config/locales/server.pt_BR.yml                    |  14 +-
+     config/locales/server.ru.yml                       |  48 +-
+     config/locales/server.sq.yml                       |   2 -
+     config/locales/server.sv.yml                       |   3 +-
+     config/locales/server.te.yml                       |   1 -
+     config/locales/server.tr_TR.yml                    |   4 -
+     config/locales/server.zh_CN.yml                    |  23 +-
+     config/locales/server.zh_TW.yml                    |  38 +-
+     config/routes.rb                                   |   7 +-
+     config/site_settings.yml                           |  26 +-
+     .../20150914021445_create_user_profile_views.rb    |  15 +
+     .../20150914034541_add_views_to_user_profile.rb    |   5 +
+     ...0917071017_add_category_id_to_user_histories.rb |   6 +
+     .../20150924022040_add_fancy_title_to_topic.rb     |   5 +
+     .../20150925000915_exclude_whispers_from_badges.rb |  22 +
+     docs/INSTALL-cloud.md                              |  59 +--
+     docs/VAGRANT.md                                    |   2 +-
+     lib/cooked_post_processor.rb                       |  27 +-
+     lib/discourse.rb                                   |   6 +-
+     lib/discourse_redis.rb                             |   7 +-
+     lib/edit_rate_limiter.rb                           |   6 +-
+     lib/email.rb                                       |   9 +-
+     lib/email/message_builder.rb                       |   2 +-
+     lib/email/renderer.rb                              |   4 +-
+     lib/email/sender.rb                                |   4 +-
+     lib/email/styles.rb                                |  14 +-
+     lib/file_store/base_store.rb                       |   6 +-
+     lib/freedom_patches/i18n_fallbacks.rb              |   2 +
+     lib/freedom_patches/pool_drainer.rb                |  11 +-
+     lib/guardian.rb                                    |   2 +-
+     lib/guardian/category_guardian.rb                  |   7 +-
+     lib/guardian/post_guardian.rb                      |   2 +-
+     lib/html_prettify.rb                               | 407 +++++++++++++++
+     lib/onebox/engine/discourse_local_onebox.rb        |  11 +-
+     lib/oneboxer.rb                                    |  20 +-
+     lib/plugin/auth_provider.rb                        |  21 +-
+     lib/plugin/instance.rb                             |  10 +-
+     lib/post_creator.rb                                |  21 +-
+     lib/post_revisor.rb                                |  10 +-
+     lib/pretty_text.rb                                 |  21 +
+     lib/rate_limiter.rb                                |  11 +-
+     lib/rate_limiter/limit_exceeded.rb                 |  25 +-
+     lib/search.rb                                      |   2 +-
+     lib/site_setting_extension.rb                      |   1 +
+     lib/tasks/assets.rake                              |  27 +-
+     lib/tasks/db.rake                                  |   2 +
+     lib/tasks/posts.rake                               |  20 +-
+     lib/topic_creator.rb                               |   4 +-
+     lib/topic_query.rb                                 |   9 +-
+     lib/topic_view.rb                                  |   6 +-
+     lib/version.rb                                     |   4 +-
+     plugins/poll/config/locales/client.ar.yml          |  74 ++-
+     plugins/poll/config/locales/client.bs_BA.yml       |  13 +-
+     plugins/poll/config/locales/client.cs.yml          |   3 -
+     plugins/poll/config/locales/client.da.yml          |  14 +-
+     plugins/poll/config/locales/client.de.yml          |  12 +-
+     plugins/poll/config/locales/client.en.yml          |  12 +-
+     plugins/poll/config/locales/client.es.yml          |  12 +-
+     plugins/poll/config/locales/client.fa_IR.yml       |   3 -
+     plugins/poll/config/locales/client.fi.yml          |  12 +-
+     plugins/poll/config/locales/client.fr.yml          |   3 -
+     plugins/poll/config/locales/client.he.yml          |  12 +-
+     plugins/poll/config/locales/client.id.yml          |   3 -
+     plugins/poll/config/locales/client.it.yml          |  12 +-
+     plugins/poll/config/locales/client.ja.yml          |   3 -
+     plugins/poll/config/locales/client.ko.yml          |   3 -
+     plugins/poll/config/locales/client.nb_NO.yml       |   3 -
+     plugins/poll/config/locales/client.nl.yml          |   9 +-
+     plugins/poll/config/locales/client.pl_PL.yml       |  15 +-
+     plugins/poll/config/locales/client.pt.yml          |  12 +-
+     plugins/poll/config/locales/client.pt_BR.yml       |  18 +-
+     plugins/poll/config/locales/client.ro.yml          |   3 -
+     plugins/poll/config/locales/client.ru.yml          |  46 +-
+     plugins/poll/config/locales/client.sq.yml          |   3 -
+     plugins/poll/config/locales/client.sv.yml          |   3 -
+     plugins/poll/config/locales/client.tr_TR.yml       |   3 -
+     plugins/poll/config/locales/client.zh_CN.yml       |   9 +-
+     plugins/poll/config/locales/server.ar.yml          |  54 +-
+     plugins/poll/config/locales/server.bs_BA.yml       |   5 +-
+     plugins/poll/config/locales/server.cs.yml          |   2 -
+     plugins/poll/config/locales/server.da.yml          |   8 +-
+     plugins/poll/config/locales/server.de.yml          |   8 +-
+     plugins/poll/config/locales/server.en.yml          |  11 +-
+     plugins/poll/config/locales/server.es.yml          |   8 +-
+     plugins/poll/config/locales/server.fa_IR.yml       |   2 -
+     plugins/poll/config/locales/server.fi.yml          |   8 +-
+     plugins/poll/config/locales/server.fr.yml          |   2 -
+     plugins/poll/config/locales/server.he.yml          |   8 +-
+     plugins/poll/config/locales/server.it.yml          |   8 +-
+     plugins/poll/config/locales/server.ja.yml          |   4 +-
+     plugins/poll/config/locales/server.ko.yml          |   2 -
+     plugins/poll/config/locales/server.nb_NO.yml       |   2 -
+     plugins/poll/config/locales/server.nl.yml          |   8 +-
+     plugins/poll/config/locales/server.pl_PL.yml       |  10 +-
+     plugins/poll/config/locales/server.pt.yml          |   8 +-
+     plugins/poll/config/locales/server.pt_BR.yml       |  11 +-
+     plugins/poll/config/locales/server.ru.yml          |  52 +-
+     plugins/poll/config/locales/server.sq.yml          |   2 -
+     plugins/poll/config/locales/server.sv.yml          |   2 -
+     plugins/poll/config/locales/server.tr_TR.yml       |   2 -
+     plugins/poll/config/locales/server.zh_CN.yml       |   6 +-
+     .../db/migrate/20151016163051_merge_polls_votes.rb |  20 +
+     plugins/poll/plugin.rb                             |  62 ++-
+     .../poll/spec/controllers/posts_controller_spec.rb |  57 +-
+     public/403.ar.html                                 |   4 +-
+     public/403.it.html                                 |   2 +-
+     public/403.zh_CN.html                              |   2 +-
+     public/500.zh_CN.html                              |   2 +-
+     public/images/welcome/reply-post-2x.png            | Bin 549 -> 430 bytes
+     .../welcome/topic-notification-control-2x.png      | Bin 39580 -> 50219 bytes
+     public/javascripts/pikaday.js                      |   6 +-
+     script/import_scripts/base.rb                      |  21 +-
+     script/import_scripts/lithium.rb                   |  22 +-
+     script/import_scripts/mbox.rb                      |  52 +-
+     script/import_scripts/mybb.rb                      |  38 +-
+     .../import_scripts/phpbb3/database/database_3_0.rb |   2 +-
+     .../phpbb3/database/database_base.rb               |   2 +-
+     script/import_scripts/phpbb3/importer.rb           |   8 +-
+     .../phpbb3/importers/message_importer.rb           |  11 +-
+     .../phpbb3/importers/post_importer.rb              |   4 +
+     .../phpbb3/importers/user_importer.rb              |  11 +-
+     script/import_scripts/vbulletin.rb                 |   4 +-
+     spec/components/cooked_post_processor_spec.rb      |  23 +-
+     spec/components/email/receiver_spec.rb             |   8 +-
+     spec/components/email/sender_spec.rb               |   5 +-
+     spec/components/guardian_spec.rb                   |  20 +-
+     spec/components/html_prettify_spec.rb              |  30 ++
+     .../onebox/engine/discourse_local_onebox_spec.rb   |   7 +-
+     spec/components/post_creator_spec.rb               |  36 +-
+     spec/components/pretty_text_spec.rb                |  15 +-
+     spec/components/topic_creator_spec.rb              |  33 +-
+     spec/controllers/categories_controller_spec.rb     |  13 +
+     spec/controllers/manifest_json_controller_spec.rb  |  12 +
+     spec/controllers/permalinks_controller_spec.rb     |  10 +
+     .../post_action_users_controller_spec.rb           |  34 ++
+     spec/controllers/post_actions_controller_spec.rb   |  35 --
+     spec/controllers/posts_controller_spec.rb          |  41 +-
+     spec/controllers/session_controller_spec.rb        |   1 +
+     spec/controllers/users_controller_spec.rb          |  30 +-
+     spec/fabricators/category_group_fabricator.rb      |   5 +
+     spec/fabricators/post_fabricator.rb                |  17 +-
+     spec/fixtures/emails/paragraphs.cooked             |   2 +-
+     spec/helpers/i18n_fallbacks_spec.rb                |  52 ++
+     spec/models/category_spec.rb                       |   9 +
+     spec/models/color_scheme_spec.rb                   |   9 +-
+     spec/models/post_action_spec.rb                    |  16 +
+     spec/models/screened_ip_address_spec.rb            |  61 ++-
+     spec/models/site_spec.rb                           |   3 +
+     spec/models/topic_link_spec.rb                     |   2 +-
+     spec/models/topic_spec.rb                          |  21 +-
+     spec/models/topic_tracking_state_spec.rb           |  16 -
+     spec/models/user_email_observer_spec.rb            |  43 +-
+     spec/models/user_profile_view_spec.rb              |  39 ++
+     spec/models/user_spec.rb                           |  14 +-
+     spec/services/post_alerter_spec.rb                 |  14 +
+     spec/services/staff_action_logger_spec.rb          |  77 +++
+     .../acceptance/category-edit-test.js.es6           |   2 +-
+     .../controllers/admin-user-badges-test.js.es6      |  11 +-
+     test/javascripts/components/d-editor-test.js.es6   | 461 +++++++++++++++++
+     test/javascripts/components/d-link-test.js.es6     |   4 -
+     test/javascripts/helpers/component-test.js.es6     |  12 +-
+     test/javascripts/lib/discourse-test.js.es6         |   7 +
+     test/javascripts/lib/markdown-test.js.es6          |   4 +
+     test/javascripts/models/post-stream-test.js.es6    |   2 +-
+     test/javascripts/test_helper.js                    |   3 +
+     test/stylesheets/test_helper.css                   |   8 +
+     vendor/gems/rails_multisite/.gitignore             |  17 -
+     vendor/gems/rails_multisite/Gemfile                |  14 -
+     vendor/gems/rails_multisite/Guardfile              |   9 -
+     vendor/gems/rails_multisite/LICENSE                |  22 -
+     vendor/gems/rails_multisite/README.md              |  29 --
+     vendor/gems/rails_multisite/Rakefile               |   7 -
+     vendor/gems/rails_multisite/lib/rails_multisite.rb |   3 -
+     .../lib/rails_multisite/connection_management.rb   | 190 -------
+     .../rails_multisite/lib/rails_multisite/railtie.rb |  23 -
+     .../rails_multisite/lib/rails_multisite/version.rb |   3 -
+     vendor/gems/rails_multisite/lib/tasks/db.rake      |  31 --
+     .../gems/rails_multisite/lib/tasks/generators.rake |  26 -
+     .../gems/rails_multisite/rails_multisite.gemspec   |  20 -
+     .../spec/connection_management_rack_spec.rb        |  47 --
+     .../spec/connection_management_spec.rb             |  99 ----
+     .../rails_multisite/spec/fixtures/database.yml     |   6 -
+     .../gems/rails_multisite/spec/fixtures/two_dbs.yml |   6 -
+     vendor/gems/rails_multisite/spec/spec_helper.rb    |  38 --
+     456 files changed, 7519 insertions(+), 3458 deletions(-)
+     create mode 100644 app/assets/javascripts/discourse/components/d-editor-modal.js.es6
+     create mode 100644 app/assets/javascripts/discourse/components/d-editor.js.es6
+     delete mode 100644 app/assets/javascripts/discourse/components/pagedown-editor.js.es6
+     create mode 100644 app/assets/javascripts/discourse/lib/emoji/emoji-groups.js.es6
+     create mode 100644 app/assets/javascripts/discourse/routes/build-static-route.js.es6
+     create mode 100644 app/assets/javascripts/discourse/templates/components/d-editor-modal.hbs
+     create mode 100644 app/assets/javascripts/discourse/templates/components/d-editor.hbs
+     delete mode 100644 app/assets/javascripts/discourse/templates/components/pagedown-editor.hbs
+     create mode 100644 app/assets/javascripts/discourse/templates/login-preferences.hbs
+     create mode 100644 app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
+     create mode 100644 app/assets/stylesheets/common/d-editor.scss
+     create mode 100644 app/assets/stylesheets/mobile/emoji.scss
+     create mode 100644 app/controllers/manifest_json_controller.rb
+     create mode 100644 app/controllers/post_action_users_controller.rb
+     create mode 100644 app/models/anon_site_json_cache_observer.rb
+     create mode 100644 app/models/user_profile_view.rb
+     create mode 100644 db/migrate/20150914021445_create_user_profile_views.rb
+     create mode 100644 db/migrate/20150914034541_add_views_to_user_profile.rb
+     create mode 100644 db/migrate/20150917071017_add_category_id_to_user_histories.rb
+     create mode 100644 db/migrate/20150924022040_add_fancy_title_to_topic.rb
+     create mode 100644 db/migrate/20150925000915_exclude_whispers_from_badges.rb
+     create mode 100644 lib/html_prettify.rb
+     create mode 100644 plugins/poll/db/migrate/20151016163051_merge_polls_votes.rb
+     create mode 100644 spec/components/html_prettify_spec.rb
+     create mode 100644 spec/controllers/manifest_json_controller_spec.rb
+     create mode 100644 spec/controllers/post_action_users_controller_spec.rb
+     create mode 100644 spec/fabricators/category_group_fabricator.rb
+     create mode 100644 spec/helpers/i18n_fallbacks_spec.rb
+     create mode 100644 spec/models/user_profile_view_spec.rb
+     create mode 100644 test/javascripts/components/d-editor-test.js.es6
+     create mode 100644 test/javascripts/lib/discourse-test.js.es6
+     delete mode 100644 vendor/gems/rails_multisite/.gitignore
+     delete mode 100644 vendor/gems/rails_multisite/Gemfile
+     delete mode 100644 vendor/gems/rails_multisite/Guardfile
+     delete mode 100644 vendor/gems/rails_multisite/LICENSE
+     delete mode 100644 vendor/gems/rails_multisite/README.md
+     delete mode 100755 vendor/gems/rails_multisite/Rakefile
+     delete mode 100644 vendor/gems/rails_multisite/lib/rails_multisite.rb
+     delete mode 100644 vendor/gems/rails_multisite/lib/rails_multisite/connection_management.rb
+     delete mode 100644 vendor/gems/rails_multisite/lib/rails_multisite/railtie.rb
+     delete mode 100644 vendor/gems/rails_multisite/lib/rails_multisite/version.rb
+     delete mode 100644 vendor/gems/rails_multisite/lib/tasks/db.rake
+     delete mode 100644 vendor/gems/rails_multisite/lib/tasks/generators.rake
+     delete mode 100644 vendor/gems/rails_multisite/rails_multisite.gemspec
+     delete mode 100644 vendor/gems/rails_multisite/spec/connection_management_rack_spec.rb
+     delete mode 100644 vendor/gems/rails_multisite/spec/connection_management_spec.rb
+     delete mode 100644 vendor/gems/rails_multisite/spec/fixtures/database.yml
+     delete mode 100644 vendor/gems/rails_multisite/spec/fixtures/two_dbs.yml
+     delete mode 100644 vendor/gems/rails_multisite/spec/spec_helper.rb
+
+    I, [2015-10-23T15:53:58.134756 #42]  INFO -- : > cd /var/www/discourse && git fetch origin tests-passed
+    From https://github.com/discourse/discourse
+     * branch            tests-passed -> FETCH_HEAD
+    I, [2015-10-23T15:54:04.068910 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.069344 #42]  INFO -- : > cd /var/www/discourse && git checkout tests-passed
+    Switched to a new branch 'tests-passed'
+    I, [2015-10-23T15:54:04.200168 #42]  INFO -- : Branch tests-passed set up to track remote branch tests-passed from origin.
+
+    I, [2015-10-23T15:54:04.200518 #42]  INFO -- : > cd /var/www/discourse && mkdir -p tmp/pids
+    I, [2015-10-23T15:54:04.205068 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.205515 #42]  INFO -- : > cd /var/www/discourse && mkdir -p tmp/sockets
+    I, [2015-10-23T15:54:04.209201 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.209397 #42]  INFO -- : > cd /var/www/discourse && touch tmp/.gitkeep
+    I, [2015-10-23T15:54:04.213544 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.213795 #42]  INFO -- : > cd /var/www/discourse && mkdir -p                    /shared/log/rails
+    I, [2015-10-23T15:54:04.217537 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.217765 #42]  INFO -- : > cd /var/www/discourse && bash -c "touch -a           /shared/log/rails/{production,production_errors,unicorn.stdout,unicorn.stderr}.log"
+    I, [2015-10-23T15:54:04.222814 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.223049 #42]  INFO -- : > cd /var/www/discourse && bash -c "ln    -s           /shared/log/rails/{production,production_errors,unicorn.stdout,unicorn.stderr}.log /var/www/discourse/log"
+    I, [2015-10-23T15:54:04.229000 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.229490 #42]  INFO -- : > cd /var/www/discourse && bash -c "mkdir -p           /shared/{uploads,backups}"
+    I, [2015-10-23T15:54:04.236051 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.236497 #42]  INFO -- : > cd /var/www/discourse && bash -c "ln    -s           /shared/{uploads,backups} /var/www/discourse/public"
+    I, [2015-10-23T15:54:04.242560 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.242977 #42]  INFO -- : > cd /var/www/discourse && chown -R discourse:www-data /shared/log/rails /shared/uploads /shared/backups
+    I, [2015-10-23T15:54:04.249820 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.250574 #42]  INFO -- : Replacing # redis with sv start redis || exit 1 in /etc/service/unicorn/run
+    I, [2015-10-23T15:54:04.254889 #42]  INFO -- : > cd /var/www/discourse/plugins && mkdir -p plugins
+    I, [2015-10-23T15:54:04.261446 #42]  INFO -- :
+    I, [2015-10-23T15:54:04.261965 #42]  INFO -- : > cd /var/www/discourse/plugins && git clone https://github.com/discourse/docker_manager.git
+    Cloning into 'docker_manager'...
+    I, [2015-10-23T15:54:06.823958 #42]  INFO -- :
+    I, [2015-10-23T15:54:06.826947 #42]  INFO -- : > cp /var/www/discourse/config/nginx.sample.conf /etc/nginx/conf.d/discourse.conf
+    I, [2015-10-23T15:54:06.834182 #42]  INFO -- :
+    I, [2015-10-23T15:54:06.834792 #42]  INFO -- : > rm /etc/nginx/sites-enabled/default
+    I, [2015-10-23T15:54:06.839072 #42]  INFO -- :
+    I, [2015-10-23T15:54:06.839549 #42]  INFO -- : > mkdir -p /var/nginx/cache
+    I, [2015-10-23T15:54:06.843773 #42]  INFO -- :
+    I, [2015-10-23T15:54:06.845326 #42]  INFO -- : Replacing pid /run/nginx.pid; with daemon off; in /etc/nginx/nginx.conf
+    I, [2015-10-23T15:54:06.846966 #42]  INFO -- : Replacing (?m-ix:upstream[^\}]+\}) with upstream discourse { server 127.0.0.1:3000; } in /etc/nginx/conf.d/discourse.conf
+    I, [2015-10-23T15:54:06.848224 #42]  INFO -- : Replacing (?-mix:server_name.+$) with server_name _ ; in /etc/nginx/conf.d/discourse.conf
+    I, [2015-10-23T15:54:06.849445 #42]  INFO -- : Replacing (?-mix:client_max_body_size.+$) with client_max_body_size $upload_size ; in /etc/nginx/conf.d/discourse.conf
+    I, [2015-10-23T15:54:06.851315 #42]  INFO -- : > echo "done configuring web"
+    I, [2015-10-23T15:54:06.856465 #42]  INFO -- : done configuring web
+
+    I, [2015-10-23T15:54:06.858840 #42]  INFO -- : > cd /var/www/discourse && gem update bundler
+    ERROR:  While executing gem ... (Gem::RemoteFetcher::FetchError)
+        hostname "rubygems.global.ssl.fastly.net" does not match the server certificate (https://rubygems.global.ssl.fastly.net/specs.4.8.gz)
+    I, [2015-10-23T15:54:27.329080 #42]  INFO -- : Updating installed gems
+
+    I, [2015-10-23T15:54:27.330007 #42]  INFO -- : Terminating async processes
+    I, [2015-10-23T15:54:27.330217 #42]  INFO -- : Sending INT to HOME=/var/lib/postgresql USER=postgres exec chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/9.3/bin/postmaster -D /etc/postgresql/9.3/main pid: 112
+    2015-10-23 15:54:27 UTC [112-2] LOG:  received fast shutdown request
+    2015-10-23 15:54:27 UTC [112-3] LOG:  aborting any active transactions
+    2015-10-23 15:54:27 UTC [119-2] LOG:  autovacuum launcher shutting down
+    2015-10-23 15:54:27 UTC [116-1] LOG:  shutting down
+    I, [2015-10-23T15:54:27.330394 #42]  INFO -- : Sending TERM to exec chpst -u redis -U redis /usr/bin/redis-server /etc/redis/redis.conf pid: 240
+    240:signal-handler (1445615667) Received SIGTERM scheduling shutdown...
+    240:M 23 Oct 15:54:27.359 # User requested shutdown...
+    240:M 23 Oct 15:54:27.359 * Saving the final RDB snapshot before exiting.
+    240:M 23 Oct 15:54:27.371 * DB saved on disk
+    240:M 23 Oct 15:54:27.371 # Redis is now ready to exit, bye bye...
+    2015-10-23 15:54:31 UTC [116-2] LOG:  database system is shut down
+
+
+    FAILED
+    --------------------
+    RuntimeError: cd /var/www/discourse && gem update bundler failed with return #<Process::Status: pid 335 exit 1>
+    Location of failure: /pups/lib/pups/exec_command.rb:105:in `spawn'
+    exec failed with the params {"cd"=>"$home", "hook"=>"web", "cmd"=>["gem update bundler", "chown -R discourse $home"]}
+    035a935af484328809d3399e2bfca421f5de3165b113fedc7c8dfe76dd7a07f1
+    ** FAILED TO BOOTSTRAP ** please scroll up and look for earlier error messages, there may be more than one
diff --git a/script/benchmarks/markdown/lots_of_mentions.md b/script/benchmarks/markdown/lots_of_mentions.md
new file mode 100644
index 00000000000..39619d4b013
--- /dev/null
+++ b/script/benchmarks/markdown/lots_of_mentions.md
@@ -0,0 +1,84 @@
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
+@sam @bob @bill @jane @marco @fred @figs @fogs @jog
diff --git a/script/benchmarks/markdown/most_features.md b/script/benchmarks/markdown/most_features.md
new file mode 100644
index 00000000000..592a45cf094
--- /dev/null
+++ b/script/benchmarks/markdown/most_features.md
@@ -0,0 +1,201 @@
+Based off https://markdown-it.github.io/ with every feature we support...
+
+
+# h1 Heading 8-)
+## h2 Heading
+### h3 Heading
+#### h4 Heading
+##### h5 Heading
+###### h6 Heading
+
+
+## Horizontal Rules
+
+___
+
+---
+
+***
+
+
+## Emphasis
+
+**This is bold text**
+
+__This is bold text__
+
+*This is italic text*
+
+_This is italic text_
+
+~~Strikethrough~~
+
+
+## Blockquotes
+
+
+> Blockquotes can also be nested...
+>> ...by using additional greater-than signs right next to each other...
+> > > ...or with spaces between arrows.
+
+
+## Lists
+
+Unordered
+
++ Create a list by starting a line with `+`, `-`, or `*`
++ Sub-lists are made by indenting 2 spaces:
+  - Marker character change forces new list start:
+    * Ac tristique libero volutpat at
+    + Facilisis in pretium nisl aliquet
+    - Nulla volutpat aliquam velit
++ Very easy!
+
+Ordered
+
+1. Lorem ipsum dolor sit amet
+2. Consectetur adipiscing elit
+3. Integer molestie lorem at massa
+
+
+1. You can use sequential numbers...
+1. ...or keep all the numbers as `1.`
+
+Start numbering with offset:
+
+57. foo
+1. bar
+
+
+## Code
+
+Inline `code`
+
+Indented code
+
+    // Some comments
+    line 1 of code
+    line 2 of code
+    line 3 of code
+
+
+Block code "fences"
+
+```
+Sample text here...
+```
+
+Syntax highlighting
+
+``` js
+var foo = function (bar) {
+  return bar++;
+};
+
+console.log(foo(5));
+```
+
+
+```text
+var foo = function (bar) {
+  return bar++;
+};
+
+console.log(foo(5));
+```
+
+## Tables
+
+| Option | Description |
+| ------ | ----------- |
+| data   | path to data files to supply the data that will be passed into templates. |
+| engine | engine to be used for processing templates. Handlebars is the default. |
+| ext    | extension to be used for dest files. |
+
+Right aligned columns
+
+| Option | Description |
+| ------:| -----------:|
+| data   | path to data files to supply the data that will be passed into templates. |
+| engine | engine to be used for processing templates. Handlebars is the default. |
+| ext    | extension to be used for dest files. |
+
+
+## Links
+
+[link text](http://dev.nodeca.com)
+
+[link with title](http://nodeca.github.io/pica/demo/ "title text!")
+
+Autoconverted link https://github.com/discourse 
+
+
+## Images
+
+![Minion](/uploads/default/original/1X/f038dc6544a178b470b3014e92377b4dc996b991.png)
+![](/uploads/default/original/1X/974402975b9ec316057a9e331bbade74d225bc46.jpg)
+
+Like links, Images also have a footnote style syntax
+
+![Alt text][id]
+
+With a reference later in the document defining the URL location:
+
+[id]: /uploads/default/original/1X/7bd599f0af2da1f370ea7b49ebec6e73c32d722b.jpg  "The Dojocat"
+
+
+## Plugins
+
+The killer feature of `markdown-it` is very effective support of
+[syntax plugins](https://www.npmjs.org/browse/keyword/markdown-it-plugin).
+
+
+### [Emojies](https://github.com/markdown-it/markdown-it-emoji)
+
+> Classic markup: :wink:  :cry: :laughing: :yum: :surfing_woman:t4:   
+>
+> Shortcuts (emoticons) ;) :) 
+
+see [how to change output](https://github.com/markdown-it/markdown-it-emoji#change-output) with twemoji.
+
+
+### Polls
+
+[poll type=number min=1 max=20 step=1 public=true]
+[/poll]
+
+[details=Summary]This is a spoiler[/details]
+
+
+Multiline spoiler
+
+[details=Summary]
+
+This is a spoiler
+
+[/details]
+
+
+### Mentions
+Mentions ... @sam 
+
+
+### Categories
+
+ #site-feedback
+
+### Inline bbcode
+
+Hello [code]I am code[/code] 
+
+
+
+## A few paragraphs of **bacon**
+
+Bacon ipsum dolor amet boudin ham hock burgdoggen, strip steak leberkas corned beef pork chop rump short loin porchetta shank venison andouille spare ribs turkey. Boudin tri-tip picanha chicken, porchetta beef ribs hamburger leberkas shankle flank pork spare ribs cupim biltong. Meatball pig leberkas sirloin beef tenderloin tongue picanha ham biltong ribeye chicken. Ham beef chuck frankfurter bresaola pig. Beef turkey ground round kevin pork belly doner jowl. Chicken burgdoggen shankle brisket short ribs capicola beef pancetta.
+
+Rump t-bone beef ribs, cupim pork loin bresaola drumstick frankfurter capicola. Doner pastrami shank ribeye turkey ham hock meatloaf sirloin biltong pig ball tip beef ribs short loin shoulder. Meatball ribeye pastrami shank strip steak porchetta burgdoggen jowl short ribs sausage tail beef landjaeger capicola swine. Alcatra pork chop pork loin turkey, rump tenderloin landjaeger meatball swine ham hock strip steak sirloin. Strip steak drumstick tenderloin ground round, tongue ball tip t-bone tri-tip. Tenderloin doner boudin, sausage beef filet mignon short ribs.
+
+Meatloaf pork loin pork belly porchetta landjaeger frankfurter fatback chicken. Short loin boudin bacon pastrami ball tip. Chicken burgdoggen bresaola chuck porchetta. Swine spare ribs cupim, shoulder rump boudin shank pork belly porchetta chicken pancetta beef meatloaf. Prosciutto shoulder hamburger, pig corned beef picanha filet mignon shankle t-bone jowl rump. Tri-tip pork burgdoggen flank salami short loin cow fatback pig ball tip kielbasa venison ham hock.
+
+Flank jowl pastrami beef swine pork loin. Tail strip steak leberkas t-bone sausage, bresaola rump pastrami meatloaf short ribs prosciutto bacon cupim cow. Beef ribs shoulder ham hock beef meatloaf. Doner sausage porchetta, tongue pork chop jerky boudin meatball shoulder hamburger ribeye beef ribs. Pastrami turkey flank tri-tip, sausage ball tip rump ground round shankle.
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 7b25467838f..377eb8b20a5 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -93,7 +93,8 @@ class BulkImport::Base
 
     puts "Loading users indexes..."
     @last_user_id = User.unscoped.maximum(:id)
-    @emails = User.unscoped.pluck(:email).to_set
+    @last_user_email_id = UserEmail.unscoped.maximum(:id)
+    @emails = User.unscoped.joins(:user_emails).pluck(:"user_emails.email").to_set
     @usernames_lower = User.unscoped.pluck(:username_lower).to_set
     @mapped_usernames = UserCustomField.joins(:user).where(name: "import_username").pluck("user_custom_fields.value", "users.username").to_h
 
@@ -119,6 +120,7 @@ class BulkImport::Base
     puts "Updating primary key sequences..."
     @raw_connection.exec("SELECT setval('#{Group.sequence_name}', #{@last_group_id})")
     @raw_connection.exec("SELECT setval('#{User.sequence_name}', #{@last_user_id})")
+    @raw_connection.exec("SELECT setval('#{UserEmail.sequence_name}', #{@last_user_email_id})")
     @raw_connection.exec("SELECT setval('#{Category.sequence_name}', #{@last_category_id})")
     @raw_connection.exec("SELECT setval('#{Topic.sequence_name}', #{@last_topic_id})")
     @raw_connection.exec("SELECT setval('#{Post.sequence_name}', #{@last_post_id})")
@@ -138,11 +140,22 @@ class BulkImport::Base
   }
 
   USER_COLUMNS ||= %i{
-    id username username_lower name email active trust_level admin moderator
+    id username username_lower name active trust_level admin moderator
     date_of_birth ip_address registration_ip_address primary_group_id
     suspended_at suspended_till last_emailed_at created_at updated_at
   }
 
+  USER_EMAIL_COLUMNS ||= %i{
+    id user_id email primary created_at updated_at
+  }
+
+  USER_STAT_COLUMNS ||= %i{
+    user_id topics_entered time_read days_visited posts_read_count
+    likes_given likes_received topic_reply_count new_since read_faq
+    first_post_created_at post_count topic_count bounce_score
+    reset_bounce_score_after
+  }
+
   USER_PROFILE_COLUMNS ||= %i{
     user_id location website bio_raw bio_cooked views
   }
@@ -185,6 +198,8 @@ class BulkImport::Base
     end
   end
 
+  def create_user_emails(rows, &block) create_records(rows, "user_email", USER_EMAIL_COLUMNS, &block); end
+  def create_user_stats(rows, &block) create_records(rows, "user_stat", USER_STAT_COLUMNS, &block); end
   def create_user_profiles(rows, &block); create_records(rows, "user_profile", USER_PROFILE_COLUMNS, &block); end
   def create_group_users(rows, &block); create_records(rows, "group_user", GROUP_USER_COLUMNS, &block); end
   def create_categories(rows, &block); create_records(rows, "category", CATEGORY_COLUMNS, &block); end
@@ -246,6 +261,38 @@ class BulkImport::Base
     user
   end
 
+  def process_user_email(user_email)
+    user_email[:id] = @last_user_email_id += 1;
+    user_email[:user_id] = @users[user_email[:imported_user_id].to_s]
+    user_email[:primary] = true
+    user_email[:created_at] ||= NOW
+    user_email[:updated_at] ||= user_email[:created_at]
+    user_email[:email] ||= random_email
+    user_email[:email].downcase!
+
+    # unique email
+    user_email[:email] = random_email until user_email[:email] =~ EmailValidator.email_regex && @emails.add?(user_email[:email])
+
+    user_email
+  end
+
+  def process_user_stat(user_stat)
+    user_stat[:user_id] = @users[user_stat[:imported_user_id].to_s]
+    user_stat[:topic_reply_count] = user_stat[:post_count] - user_stat[:topic_count]
+    user_stat[:topics_entered] ||= 0
+    user_stat[:time_read] ||= 0
+    user_stat[:days_visited] ||= 0
+    user_stat[:posts_read_count] ||= 0
+    user_stat[:likes_given] ||= 0
+    user_stat[:likes_received] ||= 0
+    user_stat[:topic_reply_count] ||= 0
+    user_stat[:new_since] ||= NOW
+    user_stat[:post_count] ||= 0
+    user_stat[:topic_count] ||= 0
+    user_stat[:bounce_score] ||= 0
+    user_stat
+  end
+
   def process_user_profile(user_profile)
     user_profile[:bio_raw]    = (user_profile[:bio_raw].presence || "").scrub.strip.presence
     user_profile[:bio_cooked] = pre_cook(user_profile[:bio_raw]) if user_profile[:bio_raw].present?
@@ -428,10 +475,9 @@ class BulkImport::Base
 
   def create_records(rows, name, columns)
     start = Time.now
-
     imported_ids = []
     process_method_name = "process_#{name}"
-    sql = "COPY #{name.pluralize} (#{columns.join(",")}) FROM STDIN"
+    sql = "COPY #{name.pluralize} (#{columns.map {|c| "\"#{c}\""}.join(",")}) FROM STDIN"
 
     @raw_connection.copy_data(sql, @encoder) do
       rows.each do |row|
diff --git a/script/bulk_import/vbulletin.rb b/script/bulk_import/vbulletin.rb
index 2121a47b2d3..4de56ae5f93 100644
--- a/script/bulk_import/vbulletin.rb
+++ b/script/bulk_import/vbulletin.rb
@@ -5,6 +5,44 @@ require "htmlentities"
 class BulkImport::VBulletin < BulkImport::Base
 
   SUSPENDED_TILL ||= Date.new(3000, 1, 1)
+  CHARSET_MAP = {
+    "armscii8" => nil,
+    "ascii"    => Encoding::US_ASCII,
+    "big5"     => Encoding::Big5,
+    "binary"   => Encoding::ASCII_8BIT,
+    "cp1250"   => Encoding::Windows_1250,
+    "cp1251"   => Encoding::Windows_1251,
+    "cp1256"   => Encoding::Windows_1256,
+    "cp1257"   => Encoding::Windows_1257,
+    "cp850"    => Encoding::CP850,
+    "cp852"    => Encoding::CP852,
+    "cp866"    => Encoding::IBM866,
+    "cp932"    => Encoding::Windows_31J,
+    "dec8"     => nil,
+    "eucjpms"  => Encoding::EucJP_ms,
+    "euckr"    => Encoding::EUC_KR,
+    "gb2312"   => Encoding::EUC_CN,
+    "gbk"      => Encoding::GBK,
+    "geostd8"  => nil,
+    "greek"    => Encoding::ISO_8859_7,
+    "hebrew"   => Encoding::ISO_8859_8,
+    "hp8"      => nil,
+    "keybcs2"  => nil,
+    "koi8r"    => Encoding::KOI8_R,
+    "koi8u"    => Encoding::KOI8_U,
+    "latin1"   => Encoding::ISO_8859_1,
+    "latin2"   => Encoding::ISO_8859_2,
+    "latin5"   => Encoding::ISO_8859_9,
+    "latin7"   => Encoding::ISO_8859_13,
+    "macce"    => Encoding::MacCentEuro,
+    "macroman" => Encoding::MacRoman,
+    "sjis"     => Encoding::SHIFT_JIS,
+    "swe7"     => nil,
+    "tis620"   => Encoding::TIS_620,
+    "ucs2"     => Encoding::UTF_16BE,
+    "ujis"     => Encoding::EucJP_ms,
+    "utf8"     => Encoding::UTF_8,
+  }
 
   def initialize
     super
@@ -13,11 +51,29 @@ class BulkImport::VBulletin < BulkImport::Base
     username = ENV["DB_USERNAME"] || "root"
     password = ENV["DB_PASSWORD"]
     database = ENV["DB_NAME"] || "vbulletin"
+    charset  = ENV["DB_CHARSET"] || "utf8"
 
     @html_entities = HTMLEntities.new
+    @encoding = CHARSET_MAP[charset]
+
+    @client = Mysql2::Client.new(
+      host: host,
+      username: username,
+      password: password,
+      database: database,
+      encoding: charset
+    )
 
-    @client = Mysql2::Client.new(host: host, username: username, password: password, database: database)
     @client.query_options.merge!(as: :array, cache_rows: false)
+
+    @has_post_thanks = mysql_query(<<-SQL
+        SELECT `COLUMN_NAME`
+          FROM `INFORMATION_SCHEMA`.`COLUMNS`
+         WHERE `TABLE_SCHEMA`='#{database}'
+           AND `TABLE_NAME`='user'
+           AND `COLUMN_NAME` LIKE 'post_thanks_%'
+    SQL
+    ).to_a.count > 0
   end
 
   def execute
@@ -25,6 +81,9 @@ class BulkImport::VBulletin < BulkImport::Base
     import_users
     import_group_users
 
+    import_user_emails
+    import_user_stats
+
     import_user_passwords
     import_user_salts
     import_user_profiles
@@ -51,9 +110,9 @@ class BulkImport::VBulletin < BulkImport::Base
     create_groups(groups) do |row|
       {
         imported_id: row[0],
-        name: html_decode(row[1]),
-        bio_raw: html_decode(row[2]),
-        title: html_decode(row[3]),
+        name: normalize_text(row[1]),
+        bio_raw: normalize_text(row[2]),
+        title: normalize_text(row[3]),
       }
     end
   end
@@ -72,8 +131,7 @@ class BulkImport::VBulletin < BulkImport::Base
     create_users(users) do |row|
       u = {
         imported_id: row[0],
-        username: row[1],
-        email: row[2],
+        username: normalize_text(row[1]),
         created_at: Time.zone.at(row[3]),
         date_of_birth: parse_birthday(row[4]),
         primary_group_id: group_id_from_imported_id(row[6]),
@@ -87,6 +145,59 @@ class BulkImport::VBulletin < BulkImport::Base
     end
   end
 
+  def import_user_emails
+    puts "Importing user emails..."
+
+    users = mysql_stream <<-SQL
+        SELECT user.userid, email, joindate
+          FROM user
+         WHERE user.userid > #{@last_imported_user_id}
+      ORDER BY user.userid
+    SQL
+
+    create_user_emails(users) do |row|
+      {
+        imported_id: row[0],
+        imported_user_id: row[0],
+        email: row[1],
+        created_at: Time.zone.at(row[2])
+      }
+    end
+  end
+
+  def import_user_stats
+    puts "Importing user stats..."
+
+    users = mysql_stream <<-SQL
+              SELECT user.userid, joindate, posts, COUNT(thread.threadid) AS threads, post.dateline
+                     #{", post_thanks_user_amount, post_thanks_thanked_times" if @has_post_thanks}
+                FROM user
+     LEFT OUTER JOIN post ON post.postid = user.lastpostid
+     LEFT OUTER JOIN thread ON user.userid = thread.postuserid
+               WHERE user.userid > #{@last_imported_user_id}
+            GROUP BY user.userid
+            ORDER BY user.userid
+    SQL
+
+    create_user_stats(users) do |row|
+      user = {
+        imported_id: row[0],
+        imported_user_id: row[0],
+        new_since: Time.zone.at(row[1]),
+        post_count: row[2],
+        topic_count: row[3],
+        first_post_created_at: row[4] && Time.zone.at(row[4])
+      }
+
+      if @has_post_thanks
+        user[:likes_given] = row[5]
+        user[:likes_received] = row[6]
+      end
+
+      user
+    end
+  end
+
   def import_group_users
     puts "Importing group users..."
 
@@ -189,8 +300,8 @@ class BulkImport::VBulletin < BulkImport::Base
     create_categories(parent_categories) do |row|
       {
         imported_id: row[0],
-        name: html_decode(row[2]),
-        description: html_decode(row[3]),
+        name: normalize_text(row[2]),
+        description: normalize_text(row[3]),
         position: row[4],
       }
     end
@@ -199,8 +310,8 @@ class BulkImport::VBulletin < BulkImport::Base
     create_categories(children_categories) do |row|
       {
         imported_id: row[0],
-        name: html_decode(row[2]),
-        description: html_decode(row[3]),
+        name: normalize_text(row[2]),
+        description: normalize_text(row[3]),
         position: row[4],
         parent_category_id: category_id_from_imported_id(row[1]),
       }
@@ -223,7 +334,7 @@ class BulkImport::VBulletin < BulkImport::Base
 
       t = {
         imported_id: row[0],
-        title: html_decode(row[1]),
+        title: normalize_text(row[1]),
         category_id: category_id_from_imported_id(row[2]),
         user_id: user_id_from_imported_id(row[3]),
         closed: row[4] == 0,
@@ -261,7 +372,7 @@ class BulkImport::VBulletin < BulkImport::Base
         user_id: user_id_from_imported_id(row[3]),
         created_at: Time.zone.at(row[4]),
         hidden: row[5] == 0,
-        raw: html_decode(row[6]),
+        raw: normalize_text(row[6]),
       }
     end
   end
@@ -289,7 +400,7 @@ class BulkImport::VBulletin < BulkImport::Base
       {
         archetype: Archetype.private_message,
         imported_id: row[0] + PRIVATE_OFFSET,
-        title: title,
+        title: normalize_text(title),
         user_id: user_id_from_imported_id(row[2]),
         created_at: Time.zone.at(row[4]),
       }
@@ -345,22 +456,28 @@ class BulkImport::VBulletin < BulkImport::Base
         topic_id: topic_id,
         user_id: user_id_from_imported_id(row[2]),
         created_at: Time.zone.at(row[4]),
-        raw: html_decode(row[5]),
+        raw: normalize_text(row[5]),
       }
     end
   end
 
   def extract_pm_title(title)
-    html_decode(title).scrub.gsub(/^Re\s*:\s*/i, "")
+    normalize_text(title).scrub.gsub(/^Re\s*:\s*/i, "")
   end
 
-  def html_decode(text)
-    @html_entities.decode((text.presence || "").scrub)
+  def normalize_text(text)
+    @html_entities.decode(normalize_charset(text.presence || "").scrub)
+  end
+
+  def normalize_charset(text)
+    return text if @encoding == Encoding::UTF_8
+    return text && text.encode(@encoding).force_encoding(Encoding::UTF_8)
   end
 
   def parse_birthday(birthday)
     return if birthday.blank?
-    date_of_birth = Date.strptime(birthday, "%m-%d-%Y")
+    date_of_birth = Date.strptime(birthday.gsub(/[^\d-]+/, ""), "%m-%d-%Y") rescue nil
+    return if date_of_birth.nil?
     date_of_birth.year < 1904 ? Date.new(1904, date_of_birth.month, date_of_birth.day) : date_of_birth
   end
 
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 616a534a5d8..4acd2b76a0c 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -203,7 +203,7 @@ class ImportScripts::Base
       return true
     end
   ensure
-    connection.exec('DROP TABLE import_ids')
+    connection.exec('DROP TABLE import_ids') unless connection.nil?
   end
 
   def created_user(user)
@@ -267,7 +267,7 @@ class ImportScripts::Base
     merge = opts.delete(:merge)
     post_create_action = opts.delete(:post_create_action)
 
-    existing = User.where("email = ? OR username = ?", opts[:email].downcase, opts[:username]).first
+    existing = User.joins(:user_emails).where("user_emails.email = ? OR username = ?", opts[:email].downcase, opts[:username]).first
     return existing if existing && (merge || existing.custom_fields["import_id"].to_i == import_id.to_i)
 
     bio_raw = opts.delete(:bio_raw)
@@ -323,8 +323,8 @@ class ImportScripts::Base
       end
     rescue => e
       # try based on email
-      if e.try(:record).try(:errors).try(:messages).try(:[], :email).present?
-        if existing = User.find_by(email: opts[:email].downcase)
+      if e.try(:record).try(:errors).try(:messages).try(:[], :primary_email).present?
+        if existing = User.find_by_email(opts[:email].downcase)
           existing.custom_fields["import_id"] = import_id
           existing.save!
           u = existing
diff --git a/script/import_scripts/jive_api.rb b/script/import_scripts/jive_api.rb
index 068cf7369d2..0441db26280 100644
--- a/script/import_scripts/jive_api.rb
+++ b/script/import_scripts/jive_api.rb
@@ -137,7 +137,7 @@ class ImportScripts::JiveApi < ImportScripts::Base
     loop do
       contents = get("#{path}?#{filters}&sort=dateCreatedAsc&count=#{POST_COUNT}&startIndex=#{start_index}", to_import[:authenticated])
       contents["list"].each do |content|
-        content_id = content["contentID"].presence || content["id"]
+        content_id = content["contentID"].presence || "#{content["type"]}_#{content["id"]}"
 
         custom_fields = { import_id: content_id }
         custom_fields[:import_permalink] = content["permalink"] if content["permalink"].present?
diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb
index bd0a6f00553..54cd27e1d92 100644
--- a/script/import_scripts/lithium.rb
+++ b/script/import_scripts/lithium.rb
@@ -53,7 +53,6 @@ class ImportScripts::Lithium < ImportScripts::Base
 
   def execute
 
-    SiteSetting.allow_html_tables = true
     @max_start_id = Post.maximum(:id)
 
     import_categories
diff --git a/script/import_scripts/mybb.rb b/script/import_scripts/mybb.rb
index c6d104e28ff..8bf101c39ab 100644
--- a/script/import_scripts/mybb.rb
+++ b/script/import_scripts/mybb.rb
@@ -1,30 +1,48 @@
 require "mysql2"
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
+# Before running this script, paste these lines into your shell,
+# then use arrow keys to edit the values
+=begin
+export DB_HOST="localhost"
+export DB_NAME="mybb"
+export DB_PW=""
+export DB_USER="root"
+export TABLE_PREFIX="mybb_"
+export BASE="" #
+=end
+
 # Call it like this:
 #   RAILS_ENV=production ruby script/import_scripts/mybb.rb
 class ImportScripts::MyBB < ImportScripts::Base
 
-  MYBB_DB = "mybb_db"
-  TABLE_PREFIX = "mybb_"
+  DB_HOST ||= ENV['DB_HOST'] || "localhost"
+  DB_NAME ||= ENV['DB_NAME'] || "mybb"
+  DB_PW ||= ENV['DB_PW'] || ""
+  DB_USER ||= ENV['DB_USER'] || "root"
+  TABLE_PREFIX ||= ENV['TABLE_PREFIX'] || "mybb_"
   BATCH_SIZE = 1000
+  BASE = ""
+  QUIET = true
 
   def initialize
     super
 
     @client = Mysql2::Client.new(
-      host: "localhost",
-      username: "root",
-      #password: "",
-      database: MYBB_DB
+      host: DB_HOST,
+      username: DB_USER,
+      password: DB_PW,
+      database: DB_NAME
     )
   end
 
   def execute
+    SiteSetting.disable_emails=true
     import_users
     import_categories
     import_posts
     import_private_messages
+    create_permalinks
     suspend_users
   end
 
@@ -214,10 +232,75 @@ class ImportScripts::MyBB < ImportScripts::Base
     s
   end
 
+  def create_permalinks
+    puts '', 'Creating redirects...', ''
+
+    SiteSetting.permalink_normalizations= '/(\\w+)-(\\d+)[-.].*/\\1-\\2.html'
+    puts '', 'Users...', ''
+    total_users = User.count
+    start_time = Time.now
+    count = 0
+    User.find_each do |u|
+      ucf = u.custom_fields
+      count += 1
+      if ucf && ucf["import_id"] && ucf["import_username"]
+        Permalink.create(url: "#{BASE}/user-#{ucf['import_id']}.html", external_url: "/u/#{u.username}" ) rescue nil
+      end
+      print_status(count, total_users, start_time)
+    end
+
+    puts '', 'Categories...', ''
+    total_categories = Category.count
+    start_time = Time.now
+    count = 0
+    Category.find_each do |cat|
+      ccf = cat.custom_fields
+      count += 1
+      next unless id = ccf["import_id"]
+      unless QUIET
+        puts ("forum-#{id}.html --> /c/#{cat.id}")
+      end
+      Permalink.create( url: "#{BASE}/forum-#{id}.html", category_id: cat.id ) rescue nil
+      print_status(count, total_categories, start_time)
+    end
+
+    puts '', 'Topics...', ''
+    total_posts = Post.count
+    start_time = Time.now
+    count = 0
+    puts '', 'Posts...', ''
+    batches(BATCH_SIZE) do |offset|
+      results = mysql_query("
+        SELECT p.pid id,
+               p.tid topic_id
+          FROM #{TABLE_PREFIX}posts p,
+               #{TABLE_PREFIX}threads t
+         WHERE p.tid = t.tid
+           AND t.firstpost=p.pid
+      ORDER BY p.dateline
+         LIMIT #{BATCH_SIZE}
+        OFFSET #{offset};
+      ")
+      break if results.size < 1
+      results.each do |post|
+        count += 1
+        if topic = topic_lookup_from_imported_post_id(post['id'])
+          id = post['topic_id']
+          Permalink.create( url: "#{BASE}/thread-#{id}.html", topic_id: topic[:topic_id] ) rescue nil
+          unless QUIET
+            puts ("#{BASE}/thread-#{id}.html --> http://localhost:3000/t/#{topic[:topic_id]}")
+          end
+          print_status(count, total_posts, start_time)
+        end
+      end
+    end
+  end
+
+
+
   def mysql_query(sql)
     @client.query(sql, cache_rows: false)
   end
 end
 
 ImportScripts::MyBB.new.perform
-
diff --git a/script/import_scripts/phpbb3/importers/permalink_importer.rb b/script/import_scripts/phpbb3/importers/permalink_importer.rb
index 54d620e44d0..140a160d8fa 100644
--- a/script/import_scripts/phpbb3/importers/permalink_importer.rb
+++ b/script/import_scripts/phpbb3/importers/permalink_importer.rb
@@ -1,5 +1,6 @@
 module ImportScripts::PhpBB3
   class PermalinkImporter
+    CATEGORY_LINK_NORMALIZATION = '/(viewforum.php\?)(?:.*&)?(f=\d+).*/\1\2'
     POST_LINK_NORMALIZATION = '/(viewtopic.php\?)(?:.*&)?(p=\d+).*/\1\2'
     TOPIC_LINK_NORMALIZATION = '/(viewtopic.php\?)(?:.*&)?(t=\d+).*/\1\2'
 
@@ -12,13 +13,9 @@ module ImportScripts::PhpBB3
       normalizations = SiteSetting.permalink_normalizations
       normalizations = normalizations.blank? ? [] : normalizations.split('|')
 
-      if @settings.create_post_links && !normalizations.include?(POST_LINK_NORMALIZATION)
-        normalizations << POST_LINK_NORMALIZATION
-      end
-
-      if @settings.create_topic_links && !normalizations.include?(TOPIC_LINK_NORMALIZATION)
-        normalizations << TOPIC_LINK_NORMALIZATION
-      end
+      add_normalization(normalizations, CATEGORY_LINK_NORMALIZATION) if @settings.create_category_links
+      add_normalization(normalizations, POST_LINK_NORMALIZATION) if @settings.create_post_links
+      add_normalization(normalizations, TOPIC_LINK_NORMALIZATION) if @settings.create_topic_links
 
       SiteSetting.permalink_normalizations = normalizations.join('|')
     end
@@ -28,9 +25,7 @@ module ImportScripts::PhpBB3
 
       url = "viewforum.php?f=#{import_id}"
 
-      if !Permalink.find_by(url: url)
-        Permalink.create(url: url, category_id: category.id)
-      end
+      Permalink.create(url: url, category_id: category.id) unless permalink_exists(url)
     end
 
     def create_for_topic(topic, import_id)
@@ -38,9 +33,7 @@ module ImportScripts::PhpBB3
 
       url = "viewtopic.php?t=#{import_id}"
 
-      if !Permalink.find_by(url: url)
-        Permalink.create(url: url, topic_id: topic.id)
-      end
+      Permalink.create(url: url, topic_id: topic.id) unless permalink_exists(url)
     end
 
     def create_for_post(post, import_id)
@@ -48,9 +41,17 @@ module ImportScripts::PhpBB3
 
       url = "viewtopic.php?p=#{import_id}"
 
-      if !Permalink.find_by(url: url)
-        Permalink.create(url: url, post_id: post.id)
-      end
+      Permalink.create(url: url, post_id: post.id) unless permalink_exists(url)
+    end
+
+    protected
+
+    def add_normalization(normalizations, normalization)
+      normalizations << normalization unless normalizations.include?(normalization)
+    end
+
+    def permalink_exists(url)
+      Permalink.find_by(url: url)
     end
   end
 end
diff --git a/script/import_scripts/phpbb3/importers/post_importer.rb b/script/import_scripts/phpbb3/importers/post_importer.rb
index 1884190d4b3..051695585b7 100644
--- a/script/import_scripts/phpbb3/importers/post_importer.rb
+++ b/script/import_scripts/phpbb3/importers/post_importer.rb
@@ -56,6 +56,7 @@ module ImportScripts::PhpBB3
       mapped[:pinned_globally] = row[:topic_type] == Constants::POST_GLOBAL
       mapped[:post_create_action] = proc do |post|
         @permalink_importer.create_for_topic(post.topic, row[:topic_id])
+        @permalink_importer.create_for_post(post, row[:post_id])
       end
 
       add_poll(row, mapped) if @settings.import_polls
diff --git a/script/import_scripts/quandora/quandora_api.rb b/script/import_scripts/quandora/quandora_api.rb
index 37ef726f1f4..c559d8a710f 100644
--- a/script/import_scripts/quandora/quandora_api.rb
+++ b/script/import_scripts/quandora/quandora_api.rb
@@ -1,6 +1,5 @@
 require 'base64'
 require 'json'
-require 'rest-client'
 
 class QuandoraApi
 
@@ -31,10 +30,10 @@ class QuandoraApi
     url
   end
 
-  def request url
-    JSON.parse(RestClient.get url, auth_header(@username, @password))
+  def request(url)
+    JSON.parse(Excon.get(url, headers: auth_header(@username, @password)))
   end
-  
+
   def list_bases
     response = request list_bases_url
     response['data']
diff --git a/script/import_scripts/socialcast/socialcast_api.rb b/script/import_scripts/socialcast/socialcast_api.rb
index ab27546a484..2c9399b1227 100644
--- a/script/import_scripts/socialcast/socialcast_api.rb
+++ b/script/import_scripts/socialcast/socialcast_api.rb
@@ -1,6 +1,5 @@
 require 'base64'
 require 'json'
-require 'rest-client'
 
 class SocialcastApi
 
@@ -22,7 +21,7 @@ class SocialcastApi
   end
 
   def request url
-    JSON.parse(RestClient.get url, headers)
+    JSON.parse(Excon.get(url, headers: headers)
   end
 
   def list_users(opts={})
diff --git a/script/import_scripts/vanilla_mysql.rb b/script/import_scripts/vanilla_mysql.rb
index f82a489f0a4..60b5ac1350c 100644
--- a/script/import_scripts/vanilla_mysql.rb
+++ b/script/import_scripts/vanilla_mysql.rb
@@ -52,27 +52,26 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     @user_is_deleted = false
     @last_deleted_username = nil
     username = nil
-
+    @last_user_id = -1
     total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}User;").first['count']
-
+    
     batches(BATCH_SIZE) do |offset|
       results = mysql_query(
         "SELECT UserID, Name, Title, Location, About, Email,
                 DateInserted, DateLastActive, InsertIPAddress, Admin
+         WHERE id > #{@last_user_id}
          FROM #{TABLE_PREFIX}User
          ORDER BY UserID ASC
-         LIMIT #{BATCH_SIZE}
-         OFFSET #{offset};")
+         LIMIT #{BATCH_SIZE};")
 
       break if results.size < 1
-
+      @last_user_id = results.to_a.last['UserID']
       next if all_records_exist? :users, results.map {|u| u['UserID'].to_i}
 
       create_users(results, total: total_count, offset: offset) do |user|
         next if user['Email'].blank?
         next if user['Name'].blank?
         next if @lookup.user_id_from_imported_user_id(user['UserID'])
-
         if user['Name'] == '[Deleted User]'
           # EVERY deleted user record in Vanilla has the same username: [Deleted User]
           # Save our UserNameSuggester some pain:
@@ -198,17 +197,20 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     tag_names_sql = "select t.name as tag_name from GDN_Tag t, GDN_TagDiscussion td where t.tagid = td.tagid and td.discussionid = {discussionid} and t.name != '';"
 
     total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}Discussion;").first['count']
-
+    
+    @last_topic_id = -1
+    
     batches(BATCH_SIZE) do |offset|
       discussions = mysql_query(
         "SELECT DiscussionID, CategoryID, Name, Body,
                 DateInserted, InsertUserID
+         WHERE DiscussionID > #{@last_topic_id}
          FROM #{TABLE_PREFIX}Discussion
          ORDER BY DiscussionID ASC
-         LIMIT #{BATCH_SIZE}
-         OFFSET #{offset};")
+         LIMIT #{BATCH_SIZE};")
 
       break if discussions.size < 1
+      @last_topic_id = discussions.to_a.last['DiscussionID']
       next if all_records_exist? :posts, discussions.map {|t| "discussion#" + t['DiscussionID'].to_s}
 
       create_posts(discussions, total: total_count, offset: offset) do |discussion|
@@ -234,17 +236,18 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     puts "", "importing posts..."
 
     total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}Comment;").first['count']
-
+    @last_post_id = -1
     batches(BATCH_SIZE) do |offset|
       comments = mysql_query(
         "SELECT CommentID, DiscussionID, Body,
                 DateInserted, InsertUserID
+         WHERE CommentID > #{@last_post_id}
          FROM #{TABLE_PREFIX}Comment
          ORDER BY CommentID ASC
-         LIMIT #{BATCH_SIZE}
-         OFFSET #{offset};")
+         LIMIT #{BATCH_SIZE};")
 
       break if comments.size < 1
+      @last_post_id = comments.to_a.last['CommentID']
       next if all_records_exist? :posts, comments.map {|comment| "comment#" + comment['CommentID'].to_s}
 
       create_posts(comments, total: total_count, offset: offset) do |comment|
diff --git a/script/pull_translations.rb b/script/pull_translations.rb
index fc03507556a..02951835916 100644
--- a/script/pull_translations.rb
+++ b/script/pull_translations.rb
@@ -62,8 +62,7 @@ END
 
 YML_DIRS = ['config/locales',
             'plugins/poll/config/locales',
-            'plugins/discourse-narrative-bot/config/locales',
-            'vendor/gems/discourse_imgur/lib/discourse_imgur/locale']
+            'plugins/discourse-narrative-bot/config/locales']
 YML_FILE_PREFIXES = ['server', 'client']
 
 def yml_path(dir, prefix, language)
diff --git a/script/require_profiler.rb b/script/require_profiler.rb
index 8d760efe7cb..592f1b7082d 100644
--- a/script/require_profiler.rb
+++ b/script/require_profiler.rb
@@ -115,7 +115,7 @@ end
 RequireProfiler.profile do
   Bundler.definition.dependencies.each do |dep|
     begin
-      require dep.name unless dep.name =~ /timecop/
+      require dep.name
     rescue Exception
       # don't care
     end
diff --git a/script/test_pretty_text.rb b/script/test_pretty_text.rb
new file mode 100644
index 00000000000..b9456788e36
--- /dev/null
+++ b/script/test_pretty_text.rb
@@ -0,0 +1,24 @@
+require File.expand_path("../../config/environment", __FILE__)
+
+
+puts PrettyText.cook "test"
+1000.times do |i|
+  # PrettyText.v8.eval <<~JS
+  #   window.markdownit().render('test');
+  # JS
+  PrettyText.cook "test"
+
+  PrettyText.v8.eval('gc()')
+
+  # if i % 500 == 0
+    #p PrettyText.v8.heap_stats
+  # end
+end
+
+# sam@ubuntu script % ruby test_pretty_text.rb
+# {:total_physical_size=>10556240, :total_heap_size_executable=>5242880, :total_heap_size=>16732160, :used_heap_size=>7483336, :heap_size_limit=>1501560832}
+# {:total_physical_size=>288670880, :total_heap_size_executable=>6291456, :total_heap_size=>292507648, :used_heap_size=>252365360, :heap_size_limit=>1501560832}
+# {:total_physical_size=>543060056, :total_heap_size_executable=>6291456, :total_heap_size=>548360192, :used_heap_size=>503699768, :heap_size_limit=>1501560832}
+# {:total_physical_size=>793401560, :total_heap_size_executable=>6291456, :total_heap_size=>801067008, :used_heap_size=>739517840, :heap_size_limit=>1501560832}
+# {:total_physical_size=>1045932696, :total_heap_size_executable=>6291456, :total_heap_size=>1055870976, :used_heap_size=>992549688, :heap_size_limit=>1501560832}
+# {:total_physical_size=>1298442008, :total_heap_size_executable=>6291456, :total_heap_size=>1309626368, :used_heap_size=>1224681072, :heap_size_limit=>1501560832}
diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb
index cb0bf161308..cee6b950912 100644
--- a/spec/components/admin_user_index_query_spec.rb
+++ b/spec/components/admin_user_index_query_spec.rb
@@ -115,7 +115,7 @@ describe AdminUserIndexQuery do
     it "shows nil values first with asc" do
       users = ::AdminUserIndexQuery.new({ order: "last_emailed", ascending: true }).find_users
 
-      expect(users.count).to eq(2)
+      expect(users.where('users.id > -2').count).to eq(2)
       expect(users.first.username).to eq("system")
       expect(users.first.last_emailed_at).to eq(nil)
     end
@@ -123,7 +123,7 @@ describe AdminUserIndexQuery do
     it "shows nil values last with desc" do
       users = ::AdminUserIndexQuery.new({ order: "last_emailed"}).find_users
 
-      expect(users.count).to eq(2)
+      expect(users.where('users.id > -2').count).to eq(2)
       expect(users.first.last_emailed_at).to_not eq(nil)
     end
 
diff --git a/spec/components/auth/google_oauth2_authenticator_spec.rb b/spec/components/auth/google_oauth2_authenticator_spec.rb
index db28abfd225..fcba68cce46 100644
--- a/spec/components/auth/google_oauth2_authenticator_spec.rb
+++ b/spec/components/auth/google_oauth2_authenticator_spec.rb
@@ -82,4 +82,19 @@ describe Auth::GoogleOAuth2Authenticator do
     end
   end
 
+  context 'after_create_account' do
+    it 'confirms email' do
+      authenticator = Auth::GoogleOAuth2Authenticator.new
+      user = Fabricate(:user)
+      session = {
+        :email_valid => "true",
+        :extra_data => {
+          :google_user_id => 1
+        }
+      }
+      authenticator.after_create_account(user, session)
+      expect(user.email_confirmed?).to eq(true)
+    end
+  end
+
 end
diff --git a/spec/components/column_dropper_spec.rb b/spec/components/column_dropper_spec.rb
index c1274ae6063..b936b8409e2 100644
--- a/spec/components/column_dropper_spec.rb
+++ b/spec/components/column_dropper_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 require 'column_dropper'
 
-describe ColumnDropper do
+RSpec.describe ColumnDropper do
 
   def has_column?(table, column)
     Topic.exec_sql("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
@@ -48,5 +48,76 @@ describe ColumnDropper do
     expect(dropped_proc_called).to eq(true)
 
   end
-end
 
+  describe '.mark_readonly' do
+    let(:table_name) { "table_with_readonly_column" }
+
+    before do
+      ActiveRecord::Base.exec_sql <<~SQL
+      CREATE TABLE #{table_name} (topic_id INTEGER, email TEXT);
+
+      INSERT INTO #{table_name} (topic_id, email)
+      VALUES (1, 'something@email.com');
+      SQL
+
+      ColumnDropper.mark_readonly(table_name, 'email')
+    end
+
+    after do
+      ActiveRecord::Base.connection.reset!
+
+      ActiveRecord::Base.exec_sql <<~SQL
+      DROP TABLE IF EXISTS #{table_name};
+      DROP TRIGGER IF EXISTS #{table_name}_email_readonly ON #{table_name};
+      SQL
+    end
+
+    it 'should prevent updates to the readonly column' do
+      expect do
+        ActiveRecord::Base.connection.raw_connection.exec <<~SQL
+        UPDATE #{table_name}
+        SET email = 'testing@email.com'
+        WHERE topic_id = 1;
+        SQL
+      end.to raise_error(
+        PG::RaiseException,
+        /Discourse: email in #{table_name} is readonly/
+      )
+    end
+
+    it 'should allow updates to the other columns' do
+      ActiveRecord::Base.exec_sql <<~SQL
+      UPDATE #{table_name}
+      SET topic_id = 2
+      WHERE topic_id = 1
+      SQL
+
+      expect(
+        ActiveRecord::Base.exec_sql("SELECT * FROM #{table_name};").values
+      ).to include(["2", "something@email.com"])
+    end
+
+    it 'should prevent insertions to the readonly column' do
+      expect do
+        ActiveRecord::Base.connection.raw_connection.exec <<~SQL
+        INSERT INTO #{table_name} (topic_id, email)
+        VALUES (2, 'something@email.com');
+        SQL
+      end.to raise_error(
+        PG::RaiseException,
+        /Discourse: email in table_with_readonly_column is readonly/
+      )
+    end
+
+    it 'should allow insertions to the other columns' do
+      ActiveRecord::Base.exec_sql <<~SQL
+      INSERT INTO #{table_name} (topic_id)
+      VALUES (2);
+      SQL
+
+      expect(
+        ActiveRecord::Base.exec_sql("SELECT * FROM #{table_name} WHERE topic_id = 2;").values
+      ).to include(["2", nil])
+    end
+  end
+end
diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb
index adf6f81db2e..8e328a3bb76 100644
--- a/spec/components/composer_messages_finder_spec.rb
+++ b/spec/components/composer_messages_finder_spec.rb
@@ -28,7 +28,7 @@ describe ComposerMessagesFinder do
       let(:finder) { ComposerMessagesFinder.new(user, composer_action: 'createTopic') }
 
       before do
-        SiteSetting.stubs(:educate_until_posts).returns(10)
+        SiteSetting.educate_until_posts = 10
       end
 
       it "returns a message for a user who has not posted any topics" do
@@ -66,7 +66,7 @@ describe ComposerMessagesFinder do
       let(:finder) { ComposerMessagesFinder.new(user, composer_action: 'reply') }
 
       before do
-        SiteSetting.stubs(:educate_until_posts).returns(10)
+        SiteSetting.educate_until_posts = 10
       end
 
       it "returns a message for a user who has not posted any topics" do
@@ -152,13 +152,13 @@ describe ComposerMessagesFinder do
     let(:topic) { Fabricate(:topic) }
 
     before do
-      SiteSetting.stubs(:educate_until_posts).returns(10)
+      SiteSetting.educate_until_posts = 10
       user.stubs(:post_count).returns(11)
 
       Fabricate(:post, topic: topic, user: user)
       Fabricate(:post, topic: topic, user: user)
 
-      SiteSetting.stubs(:sequential_replies_threshold).returns(2)
+      SiteSetting.sequential_replies_threshold = 2
     end
 
     it "does not give a message for new topics" do
@@ -189,7 +189,7 @@ describe ComposerMessagesFinder do
       end
 
       it "doesn't notify a user who has less than the `sequential_replies_threshold` threshold posts" do
-        SiteSetting.stubs(:sequential_replies_threshold).returns(5)
+        SiteSetting.sequential_replies_threshold = 5
         expect(finder.check_sequential_replies).to be_blank
       end
 
@@ -224,16 +224,16 @@ describe ComposerMessagesFinder do
     let(:topic) { Fabricate(:topic) }
 
     before do
-      SiteSetting.stubs(:educate_until_posts).returns(10)
+      SiteSetting.educate_until_posts = 10
       user.stubs(:post_count).returns(11)
 
-      SiteSetting.stubs(:summary_posts_required).returns(1)
+      SiteSetting.summary_posts_required = 1
 
       Fabricate(:post, topic: topic, user: user)
       Fabricate(:post, topic: topic, user: user)
       Fabricate(:post, topic: topic, user: Fabricate(:user))
 
-      SiteSetting.stubs(:sequential_replies_threshold).returns(2)
+      SiteSetting.sequential_replies_threshold = 2
     end
 
     it "does not give a message for new topics" do
@@ -254,7 +254,7 @@ describe ComposerMessagesFinder do
       end
 
       it "does not notify if the `summary_posts_required` has not been reached" do
-        SiteSetting.stubs(:summary_posts_required).returns(100)
+        SiteSetting.summary_posts_required = 100
         expect(finder.check_dominating_topic).to be_blank
       end
 
@@ -269,12 +269,12 @@ describe ComposerMessagesFinder do
       end
 
       it "doesn't notify a user if the topic has less than `summary_posts_required` posts" do
-        SiteSetting.stubs(:summary_posts_required).returns(5)
+        SiteSetting.summary_posts_required = 5
         expect(finder.check_dominating_topic).to be_blank
       end
 
       it "doesn't notify a user if they've posted less than the percentage" do
-        SiteSetting.stubs(:dominating_topic_minimum_percent).returns(100)
+        SiteSetting.dominating_topic_minimum_percent = 100
         expect(finder.check_dominating_topic).to be_blank
       end
 
@@ -433,7 +433,7 @@ describe ComposerMessagesFinder do
     context "a reply" do
       context "warn_reviving_old_topic_age is 180 days" do
         before do
-          SiteSetting.stubs(:warn_reviving_old_topic_age).returns(180)
+          SiteSetting.warn_reviving_old_topic_age = 180
         end
 
         it "does not notify if last post is recent" do
@@ -449,7 +449,7 @@ describe ComposerMessagesFinder do
 
       context "warn_reviving_old_topic_age is 0" do
         before do
-          SiteSetting.stubs(:warn_reviving_old_topic_age).returns(0)
+          SiteSetting.warn_reviving_old_topic_age = 0
         end
 
         it "does not notify if last post is new" do
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index dc58e4b8551..9aba43f335c 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -298,21 +298,21 @@ describe CookedPostProcessor do
 
     it "resizes when only width is specified" do
       img = { 'src' => 'http://foo.bar/image3.png', 'width' => 100}
-      SiteSetting.stubs(:crawl_images?).returns(true)
+      SiteSetting.crawl_images = true
       FastImage.expects(:size).returns([200, 400])
       expect(cpp.get_size_from_attributes(img)).to eq([100, 200])
     end
 
     it "resizes when only height is specified" do
       img = { 'src' => 'http://foo.bar/image3.png', 'height' => 100}
-      SiteSetting.stubs(:crawl_images?).returns(true)
+      SiteSetting.crawl_images = true
       FastImage.expects(:size).returns([100, 300])
       expect(cpp.get_size_from_attributes(img)).to eq([33, 100])
     end
 
     it "doesn't raise an error with a weird url" do
       img = { 'src' => nil, 'height' => 100}
-      SiteSetting.stubs(:crawl_images?).returns(true)
+      SiteSetting.crawl_images = true
       expect(cpp.get_size_from_attributes(img)).to be_nil
     end
 
@@ -346,7 +346,7 @@ describe CookedPostProcessor do
     end
 
     it "caches the results" do
-      SiteSetting.stubs(:crawl_images?).returns(true)
+      SiteSetting.crawl_images = true
       FastImage.expects(:size).returns([200, 400])
       cpp.get_size("http://foo.bar/image3.png")
       expect(cpp.get_size("http://foo.bar/image3.png")).to eq([200, 400])
@@ -354,7 +354,9 @@ describe CookedPostProcessor do
 
     context "when crawl_images is disabled" do
 
-      before { SiteSetting.stubs(:crawl_images?).returns(false) }
+      before do
+        SiteSetting.crawl_images = false
+      end
 
       it "doesn't call FastImage" do
         FastImage.expects(:size).never
@@ -457,7 +459,7 @@ describe CookedPostProcessor do
         <a href="http://www.google.com" rel="nofollow noopener">Google</a><br>
         <img src="http://foo.bar/image.png"><br>
         <a class="attachment" href="//test.localhost/uploads/default/original/1X/af2c2618032c679333bebf745e75f9088748d737.txt">text.txt</a> (20 Bytes)<br>
-        <img src="//test.localhost/images/emoji/emoji_one/smile.png?v=3" title=":smile:" class="emoji" alt=":smile:">
+        <img src="//test.localhost/images/emoji/twitter/smile.png?v=5" title=":smile:" class="emoji" alt=":smile:">
       </p>'
     end
 
@@ -471,7 +473,7 @@ describe CookedPostProcessor do
           <a href="http://www.google.com" rel="nofollow noopener">Google</a><br>
           <img src="http://foo.bar/image.png"><br>
           <a class="attachment" href="//my.cdn.com/uploads/default/original/1X/af2c2618032c679333bebf745e75f9088748d737.txt">text.txt</a> (20 Bytes)<br>
-          <img src="//my.cdn.com/images/emoji/emoji_one/smile.png?v=3" title=":smile:" class="emoji" alt=":smile:">
+          <img src="//my.cdn.com/images/emoji/twitter/smile.png?v=5" title=":smile:" class="emoji" alt=":smile:">
         </p>'
       end
 
@@ -483,7 +485,7 @@ describe CookedPostProcessor do
           <a href="http://www.google.com" rel="nofollow noopener">Google</a><br>
           <img src="http://foo.bar/image.png"><br>
           <a class="attachment" href="https://my.cdn.com/uploads/default/original/1X/af2c2618032c679333bebf745e75f9088748d737.txt">text.txt</a> (20 Bytes)<br>
-          <img src="https://my.cdn.com/images/emoji/emoji_one/smile.png?v=3" title=":smile:" class="emoji" alt=":smile:">
+          <img src="https://my.cdn.com/images/emoji/twitter/smile.png?v=5" title=":smile:" class="emoji" alt=":smile:">
         </p>'
       end
 
@@ -496,7 +498,7 @@ describe CookedPostProcessor do
           <a href="http://www.google.com" rel="nofollow noopener">Google</a><br>
           <img src="http://foo.bar/image.png"><br>
           <a class="attachment" href="//test.localhost/uploads/default/original/1X/af2c2618032c679333bebf745e75f9088748d737.txt">text.txt</a> (20 Bytes)<br>
-          <img src="//my.cdn.com/images/emoji/emoji_one/smile.png?v=3" title=":smile:" class="emoji" alt=":smile:">
+          <img src="//my.cdn.com/images/emoji/twitter/smile.png?v=5" title=":smile:" class="emoji" alt=":smile:">
         </p>'
       end
 
@@ -509,7 +511,7 @@ describe CookedPostProcessor do
           <a href="http://www.google.com" rel="nofollow noopener">Google</a><br>
           <img src="http://foo.bar/image.png"><br>
           <a class="attachment" href="//test.localhost/uploads/default/original/1X/af2c2618032c679333bebf745e75f9088748d737.txt">text.txt</a> (20 Bytes)<br>
-          <img src="//my.cdn.com/images/emoji/emoji_one/smile.png?v=3" title=":smile:" class="emoji" alt=":smile:">
+          <img src="//my.cdn.com/images/emoji/twitter/smile.png?v=5" title=":smile:" class="emoji" alt=":smile:">
         </p>'
       end
 
@@ -525,14 +527,15 @@ describe CookedPostProcessor do
     before { cpp.stubs(:available_disk_space).returns(90) }
 
     it "does not run when download_remote_images_to_local is disabled" do
-      SiteSetting.stubs(:download_remote_images_to_local).returns(false)
+      SiteSetting.download_remote_images_to_local = false
       Jobs.expects(:cancel_scheduled_job).never
       cpp.pull_hotlinked_images
     end
 
     context "when download_remote_images_to_local? is enabled" do
-
-      before { SiteSetting.stubs(:download_remote_images_to_local).returns(true) }
+      before do
+        SiteSetting.download_remote_images_to_local = true
+      end
 
       it "does not run when there is not enough disk space" do
         cpp.expects(:disable_if_low_on_disk_space).returns(true)
@@ -649,7 +652,7 @@ describe CookedPostProcessor do
     let(:cpp) { CookedPostProcessor.new(post) }
 
     context "emoji inside a quote" do
-      let(:post) { Fabricate(:post, raw: "time to eat some sweet [quote]:candy:[/quote] mmmm") }
+      let(:post) { Fabricate(:post, raw: "time to eat some sweet \n[quote]\n:candy:\n[/quote]\n mmmm") }
 
       it "doesn't award a badge when the emoji is in a quote" do
         cpp.grant_badges
diff --git a/spec/components/demon/base_spec.rb b/spec/components/demon/base_spec.rb
deleted file mode 100644
index 1f1615fc63e..00000000000
--- a/spec/components/demon/base_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'rails_helper'
-require 'demon/base'
-
-describe Demon do
-
-  class RudeDemon < Demon::Base
-    def self.prefix
-      "rude"
-    end
-
-    def after_fork
-      Signal.trap("HUP"){}
-      Signal.trap("TERM"){}
-      sleep 999999
-    end
-  end
-
-  it "can terminate rude demons" do
-
-    skip("forking rspec has side effects")
-    # Forking rspec has all sorts of weird side effects
-    #  this spec works but we must skip it to keep rspec
-    #  state happy
-
-
-    RudeDemon.start
-    _,demon = RudeDemon.demons.first
-    pid = demon.pid
-    wait_for {
-      demon.alive?
-    }
-
-    demon.stop_timeout = 0.05
-    demon.stop
-    demon.start
-
-    running = !!(Process.kill(0, pid)) rescue false
-    expect(running).to eq(false)
-  end
-end
diff --git a/spec/components/discourse_hub_spec.rb b/spec/components/discourse_hub_spec.rb
index 29699ebeec2..a08b0856a18 100644
--- a/spec/components/discourse_hub_spec.rb
+++ b/spec/components/discourse_hub_spec.rb
@@ -5,7 +5,11 @@ describe DiscourseHub do
   describe '.discourse_version_check' do
     it 'should return just return the json that the hub returns' do
       hub_response = {'success' => 'OK', 'latest_version' => '0.8.1', 'critical_updates' => false}
-      RestClient.stubs(:get).returns( hub_response.to_json )
+
+      stub_request(:get, (ENV['HUB_BASE_URL'] || "http://local.hub:3000/api") + "/version_check").
+        with(query: DiscourseHub.version_check_payload).
+        to_return(status: 200, body: hub_response.to_json)
+
       expect(DiscourseHub.discourse_version_check).to eq(hub_response)
     end
   end
diff --git a/spec/components/discourse_i18n_spec.rb b/spec/components/discourse_i18n_spec.rb
index f41b9caafae..70212a8b0b2 100644
--- a/spec/components/discourse_i18n_spec.rb
+++ b/spec/components/discourse_i18n_spec.rb
@@ -147,7 +147,36 @@ describe I18n::Backend::DiscourseI18n do
       expect(I18n.translate('keys.magic', count: 2)).to eq("no magic keys")
     end
 
-    it 'supports ActiveModel::Naming#human' do
+    it "returns the overriden text when falling back" do
+      TranslationOverride.upsert!('en', 'got', "summer")
+      I18n.backend.store_translations(:en, got: 'winter')
+
+      expect(I18n.translate('got')).to eq('summer')
+      expect(I18n.with_locale(:zh_TW) { I18n.translate('got') }).to eq('summer')
+
+      TranslationOverride.upsert!('en', 'throne', "%{title} is the new queen")
+      I18n.backend.store_translations(:en, throne: "%{title} is the new king")
+
+      expect(I18n.t('throne', title: 'snow')).to eq('snow is the new queen')
+
+      expect(I18n.with_locale(:en) { I18n.t('throne', title: 'snow') })
+        .to eq('snow is the new queen')
+    end
+
+    it "returns override if it exists before falling back" do
+      I18n.backend.store_translations(:en, got: 'winter')
+
+      expect(I18n.translate('got', default: '')).to eq('winter')
+      expect(I18n.with_locale(:ru) { I18n.translate('got', default: '') }).to eq('winter')
+
+      TranslationOverride.upsert!('ru', 'got', "summer")
+      I18n.backend.store_translations(:en, got: 'winter')
+
+      expect(I18n.translate('got', default: '')).to eq('winter')
+      expect(I18n.with_locale(:ru) { I18n.translate('got', default: '') }).to eq('summer')
+    end
+
+    it 'does not affect ActiveModel::Naming#human' do
       Fish = Class.new(ActiveRecord::Base)
 
       TranslationOverride.upsert!('en', 'fish', "fake fish")
diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb
index b1b21cfd5c9..3b458e3131a 100644
--- a/spec/components/discourse_spec.rb
+++ b/spec/components/discourse_spec.rb
@@ -53,12 +53,7 @@ describe Discourse do
     let!(:another_admin) { Fabricate(:admin) }
 
     it 'returns the user specified by the site setting site_contact_username' do
-      SiteSetting.stubs(:site_contact_username).returns(another_admin.username)
-      expect(Discourse.site_contact_user).to eq(another_admin)
-    end
-
-    it 'returns the user specified by the site setting site_contact_username regardless of its case' do
-      SiteSetting.stubs(:site_contact_username).returns(another_admin.username.upcase)
+      SiteSetting.site_contact_username = another_admin.username
       expect(Discourse.site_contact_user).to eq(another_admin)
     end
 
@@ -211,4 +206,3 @@ describe Discourse do
   end
 
 end
-
diff --git a/spec/components/email/message_builder_spec.rb b/spec/components/email/message_builder_spec.rb
index 5cf6d4877ac..3ad30558ed0 100644
--- a/spec/components/email/message_builder_spec.rb
+++ b/spec/components/email/message_builder_spec.rb
@@ -199,11 +199,11 @@ describe Email::MessageBuilder do
   context "template_args" do
     let(:template_args) { builder.template_args }
 
-    it "has the email prefix as the site title when `SiteSetting.email_prefix` is not set" do
+    it "has site title as email_prefix when `SiteSetting.email_prefix` is not present" do
       expect(template_args[:email_prefix]).to eq(SiteSetting.title)
     end
 
-    it "has the email prefix as SiteSetting.email_prefix when it is set" do
+    it "has email prefix as email_prefix when `SiteSetting.email_prefix` is present" do
       SiteSetting.email_prefix = 'some email prefix'
       expect(template_args[:email_prefix]).to eq(SiteSetting.email_prefix)
     end
@@ -217,6 +217,19 @@ describe Email::MessageBuilder do
     end
   end
 
+  context "email prefix in subject" do
+    context "when use_site_subject is true" do
+      let(:message_with_email_prefix) { Email::MessageBuilder.new(to_address,
+                                                                  body: 'hello world',
+                                                                  use_site_subject: true) }
+
+      it "when email_prefix is set it should be present in subject" do
+        SiteSetting.email_prefix = 'some email prefix'
+        expect(message_with_email_prefix.subject).to match(SiteSetting.email_prefix)
+      end
+    end
+  end
+
   context "subject_template" do
 
     let(:templated_builder) { Email::MessageBuilder.new(to_address, template: 'mystery') }
diff --git a/spec/components/email/processor_spec.rb b/spec/components/email/processor_spec.rb
index c30b09ad4ee..73a54d9b53a 100644
--- a/spec/components/email/processor_spec.rb
+++ b/spec/components/email/processor_spec.rb
@@ -3,9 +3,11 @@ require "email/processor"
 
 describe Email::Processor do
 
+  let(:from) { "foo@bar.com" }
+
   describe "rate limits" do
 
-    let(:mail) { "From: foo@bar.com\nTo: bar@foo.com\nSubject: FOO BAR\n\nFoo foo bar bar?" }
+    let(:mail) { "From: #{from}\nTo: bar@foo.com\nSubject: FOO BAR\n\nFoo foo bar bar?" }
     let(:limit_exceeded) { RateLimiter::LimitExceeded.new(10) }
 
     before do
@@ -24,4 +26,65 @@ describe Email::Processor do
 
   end
 
+  context "known error" do
+
+    let(:mail) { "From: #{from}\nTo: bar@foo.com" }
+    let(:mail2) { "From: #{from}\nTo: foo@foo.com" }
+    let(:mail3) { "From: #{from}\nTo: foobar@foo.com" }
+
+    it "only sends one rejection email per day" do
+      key = "rejection_email:#{[from]}:email_reject_empty:#{Date.today}"
+      $redis.expire(key, 0)
+
+      expect {
+        Email::Processor.process!(mail)
+      }.to change { EmailLog.count }.by(1)
+
+      expect {
+        Email::Processor.process!(mail2)
+      }.to change { EmailLog.count }.by(0)
+
+      freeze_time(Date.today + 1)
+
+      key = "rejection_email:#{[from]}:email_reject_empty:#{Date.today}"
+      $redis.expire(key, 0)
+
+      expect {
+        Email::Processor.process!(mail3)
+      }.to change { EmailLog.count }.by(1)
+    end
+  end
+
+  context "unrecognized error" do
+
+    let(:mail) { "From: #{from}\nTo: bar@foo.com\nSubject: FOO BAR\n\nFoo foo bar bar?" }
+    let(:mail2) { "From: #{from}\nTo: foo@foo.com\nSubject: BAR BAR\n\nBar bar bar bar?" }
+
+    it "sends a rejection email on an unrecognized error" do
+      Email::Processor.any_instance.stubs(:can_send_rejection_email?).returns(true)
+      Email::Receiver.any_instance.stubs(:process_internal).raises("boom")
+      Rails.logger.expects(:error)
+
+      Email::Processor.process!(mail)
+      expect(IncomingEmail.first.error).to             eq("boom")
+      expect(IncomingEmail.first.rejection_message).to be_present
+      expect(EmailLog.first.email_type).to             eq("email_reject_unrecognized_error")
+    end
+
+    it "sends more than one rejection email per day" do
+      Email::Receiver.any_instance.stubs(:process_internal).raises("boom")
+      key = "rejection_email:#{[from]}:email_reject_unrecognized_error:#{Date.today}"
+      $redis.expire(key, 0)
+
+      expect {
+        Email::Processor.process!(mail)
+      }.to change { EmailLog.count }.by(1)
+
+      expect {
+        Email::Processor.process!(mail2)
+      }.to change { EmailLog.count }.by(1)
+    end
+
+  end
+
 end
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index 3242e55a414..35d249a9707 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -47,8 +47,16 @@ describe Email::Receiver do
     expect { process(:blocked_sender) }.to raise_error(Email::Receiver::BlockedUserError)
   end
 
-  skip "doesn't raise an InactiveUserError when the sender is staged" do
-    Fabricate(:user, email: "staged@bar.com", active: false, staged: true)
+  it "doesn't raise an InactiveUserError when the sender is staged" do
+    user = Fabricate(:user, email: "staged@bar.com", active: false, staged: true)
+
+    email_log = Fabricate(:email_log,
+      to_address: 'reply+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@bar.com',
+      reply_key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+      user: user,
+      post: Fabricate(:post)
+    )
+
     expect { process(:staged_sender) }.not_to raise_error
   end
 
@@ -89,13 +97,13 @@ describe Email::Receiver do
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
 
-      Timecop.freeze(2.days.from_now) do
-        expect { process(:hard_bounce_via_verp_2) }.to raise_error(Email::Receiver::BouncedEmailError)
+      freeze_time 2.days.from_now
 
-        email_log_2.reload
-        expect(email_log_2.bounced).to eq(true)
-        expect(email_log_2.user.user_stat.bounce_score).to eq(4)
-      end
+      expect { process(:hard_bounce_via_verp_2) }.to raise_error(Email::Receiver::BouncedEmailError)
+
+      email_log_2.reload
+      expect(email_log_2.user.user_stat.bounce_score).to eq(4)
+      expect(email_log_2.bounced).to eq(true)
     end
 
   end
@@ -254,7 +262,7 @@ describe Email::Receiver do
         end
 
         it 'does nothing unless unsubscribe_via_email is turned on' do
-          SiteSetting.stubs("unsubscribe_via_email").returns(false)
+          SiteSetting.unsubscribe_via_email = false
           before_deliveries = ActionMailer::Base.deliveries.count
           expect { process("unsubscribe_subject") }.to raise_error { Email::Receiver::BadDestinationAddress }
           expect(before_deliveries).to eq ActionMailer::Base.deliveries.count
@@ -272,7 +280,7 @@ describe Email::Receiver do
         end
 
         it 'does nothing unless unsubscribe_via_email is turned on' do
-          SiteSetting.stubs(:unsubscribe_via_email).returns(false)
+          SiteSetting.unsubscribe_via_email = false
           before_deliveries = ActionMailer::Base.deliveries.count
           expect { process("unsubscribe_body") }.to raise_error { Email::Receiver::InvalidPost }
           expect(before_deliveries).to eq ActionMailer::Base.deliveries.count
@@ -309,6 +317,18 @@ describe Email::Receiver do
       expect(topic.posts.last.raw).to eq("This is a reply :)\n\n<details class='elided'>\n<summary title='Show trimmed content'>&#183;&#183;&#183;</summary>\n---Original Message---\nThis part should not be included\n</details>")
     end
 
+    it "doesn't include the 'elided' part of the original message when always_show_trimmed_content is disabled" do
+      SiteSetting.always_show_trimmed_content = false
+      expect { process(:original_message) }.to change { topic.posts.count }.from(1).to(2)
+      expect(topic.posts.last.raw).to eq("This is a reply :)")
+    end
+
+    it "adds the 'elided' part of the original message for public replies when always_show_trimmed_content is enabled" do
+      SiteSetting.always_show_trimmed_content = true
+      expect { process(:original_message) }.to change { topic.posts.count }.from(1).to(2)
+      expect(topic.posts.last.raw).to eq("This is a reply :)\n\n<details class='elided'>\n<summary title='Show trimmed content'>&#183;&#183;&#183;</summary>\n---Original Message---\nThis part should not be included\n</details>")
+    end
+
     it "supports attached images in TEXT part" do
       SiteSetting.queue_jobs = true
 
@@ -369,7 +389,7 @@ describe Email::Receiver do
 
     it "invites everyone in the chain but emails configured as 'incoming' (via reply, group or category)" do
       expect { process(:cc) }.to change(Topic, :count)
-      emails = Topic.last.allowed_users.pluck(:email)
+      emails = Topic.last.allowed_users.joins(:user_emails).pluck(:"user_emails.email")
       expect(emails.size).to eq(3)
       expect(emails).to include("someone@else.com", "discourse@bar.com", "wat@bar.com")
     end
@@ -483,6 +503,16 @@ describe Email::Receiver do
       expect { process(:new_user) }.to change(Topic, :count)
     end
 
+    it "adds the 'elided' part of the original message when always_show_trimmed_content is enabled" do
+      SiteSetting.always_show_trimmed_content = true
+
+      Fabricate(:user, email: "existing@bar.com", trust_level: SiteSetting.email_in_min_trust)
+      expect { process(:forwarded_email_to_category) }.to change{Topic.count}.by(1) # Topic created
+
+      new_post, = Post.last
+      expect(new_post.raw).to include("Hi everyone, can you have a look at the email below?","<summary title='Show trimmed content'>&#183;&#183;&#183;</summary>","Discoursing much today?")
+    end
+
     it "works when approving is enabled" do
       SiteSetting.approve_unless_trust_level = 4
 
@@ -555,4 +585,26 @@ describe Email::Receiver do
 
   end
 
+  context "check_address" do
+    before do
+      SiteSetting.reply_by_email_address = "foo+%{reply_key}@bar.com"
+    end
+
+    it "returns nil when the key is invalid" do
+      expect(Email::Receiver.check_address('fake@fake.com')).to be_nil
+      expect(Email::Receiver.check_address('foo+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com')).to be_nil
+    end
+
+    context "with a valid reply" do
+      it "returns the destination when the key is valid" do
+        Fabricate(:email_log, reply_key: '4f97315cc828096c9cb34c6f1a0d6fe8')
+
+        dest = Email::Receiver.check_address('foo+4f97315cc828096c9cb34c6f1a0d6fe8@bar.com')
+        expect(dest).to be_present
+        expect(dest[:type]).to eq(:reply)
+        expect(dest[:obj]).to be_present
+      end
+    end
+  end
+
 end
diff --git a/spec/components/email/styles_spec.rb b/spec/components/email/styles_spec.rb
index 38ccdde9629..d99440dc3e6 100644
--- a/spec/components/email/styles_spec.rb
+++ b/spec/components/email/styles_spec.rb
@@ -24,9 +24,8 @@ describe Email::Styles do
       expect(style.to_html).to be_blank
     end
 
-    # Pending due to email effort @coding-horror made in d2fb2bc4c
-    skip "adds a max-width to images" do
-      frag = basic_fragment("<img src='gigantic.jpg'>")
+    it "adds a max-width to large images" do
+      frag = basic_fragment("<img height='auto' width='auto' src='gigantic.jpg'>")
       expect(frag.at("img")["style"]).to match("max-width")
     end
 
@@ -117,7 +116,7 @@ describe Email::Styles do
 
     context "without https" do
       before do
-        SiteSetting.stubs(:force_https).returns(false)
+        SiteSetting.force_https = false
       end
 
       it "rewrites the href to have http" do
@@ -138,7 +137,7 @@ describe Email::Styles do
 
     context "with https" do
       before do
-        SiteSetting.stubs(:force_https).returns(true)
+        SiteSetting.force_https = true
       end
 
       it "rewrites the forum URL to have https" do
@@ -173,6 +172,13 @@ describe Email::Styles do
       style.strip_avatars_and_emojis
       expect(style.to_html).to match_html("cry_cry")
     end
+
+    it "works if img tag has no attrs" do
+      cooked = "Create a method for click on image and use ng-click in <img> in your slide box...it is simple"
+      style = Email::Styles.new(cooked)
+      style.strip_avatars_and_emojis
+      expect(style.to_html).to eq(cooked)
+    end
   end
 
   context "onebox_styles" do
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index 921e852edf3..eed2ae48110 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -209,13 +209,13 @@ describe FileStore::S3Store do
     end
 
     it "uses the proper endpoint" do
-      SiteSetting.stubs(:s3_region).returns("us-east-1")
+      SiteSetting.s3_region = "us-east-1"
       expect(FileStore::S3Store.new(s3_helper).absolute_base_url).to eq("//s3-upload-bucket.s3.amazonaws.com")
 
-      SiteSetting.stubs(:s3_region).returns("us-east-2")
-      expect(FileStore::S3Store.new(s3_helper).absolute_base_url).to eq("//s3-upload-bucket.s3-us-east-2.amazonaws.com")
+      SiteSetting.s3_region = "us-west-2"
+      expect(FileStore::S3Store.new(s3_helper).absolute_base_url).to eq("//s3-upload-bucket.s3-us-west-2.amazonaws.com")
 
-      SiteSetting.stubs(:s3_region).returns("cn-north-1")
+      SiteSetting.s3_region = "cn-north-1"
       expect(FileStore::S3Store.new(s3_helper).absolute_base_url).to eq("//s3-upload-bucket.s3.cn-north-1.amazonaws.com.cn")
 
     end
diff --git a/spec/components/final_destination_spec.rb b/spec/components/final_destination_spec.rb
index 5956ceb1e15..7e9111e2f8b 100644
--- a/spec/components/final_destination_spec.rb
+++ b/spec/components/final_destination_spec.rb
@@ -4,7 +4,10 @@ require 'final_destination'
 describe FinalDestination do
 
   let(:opts) do
-    { # avoid IP lookups in test
+    {
+      ignore_redirects: ['https://ignore-me.com'],
+
+      # avoid IP lookups in test
       lookup_ip: lambda do |host|
         case host
         when 'eviltrout.com' then '52.84.143.152'
@@ -13,6 +16,7 @@ describe FinalDestination do
         when 'some_thing.example.com' then '104.25.152.10'
         when 'private-host.com' then '192.168.10.1'
         when 'internal-ipv6.com' then '2001:abc:de:01:3:3d0:6a65:c2bf'
+        when 'ignore-me.com' then '53.84.143.152'
         else
           as_ip = IPAddr.new(host) rescue nil
           raise "couldn't lookup #{host}" if as_ip.nil?
@@ -56,6 +60,14 @@ describe FinalDestination do
         stub_request(:head, "https://eviltrout.com").to_return(doc_response)
       end
 
+      it "escapes url" do
+        url = 'https://eviltrout.com?s=180&#038;d=mm&#038;r=g'
+        escaped_url = URI.escape(url)
+        stub_request(:head, escaped_url).to_return(doc_response)
+
+        expect(fd(url).resolve.to_s).to eq(escaped_url)
+      end
+
       it "returns the final url" do
         final = FinalDestination.new('https://eviltrout.com', opts)
         expect(final.resolve.to_s).to eq('https://eviltrout.com')
@@ -64,6 +76,13 @@ describe FinalDestination do
       end
     end
 
+    it "ignores redirects" do
+      final = FinalDestination.new('https://ignore-me.com/some-url', opts)
+      expect(final.resolve.to_s).to eq('https://ignore-me.com/some-url')
+      expect(final.redirected?).to eq(false)
+      expect(final.status).to eq(:resolved)
+    end
+
     context "underscores in URLs" do
       before do
         stub_request(:head, 'https://some_thing.example.com').to_return(doc_response)
@@ -120,6 +139,45 @@ describe FinalDestination do
         expect(final.status).to eq(:invalid_address)
       end
     end
+
+    context "HEAD not supported" do
+      before do
+        stub_request(:get, 'https://eviltrout.com').to_return(
+          status: 301,
+          headers: {
+            "Location" => 'https://discourse.org',
+            'Set-Cookie' => 'evil=trout'
+          }
+        )
+        stub_request(:head, 'https://discourse.org').to_return(status: 200)
+      end
+
+      context "when the status code is 405" do
+        before do
+          stub_request(:head, 'https://eviltrout.com').to_return(status: 405)
+        end
+
+        it "will try a GET" do
+          final = FinalDestination.new('https://eviltrout.com', opts)
+          expect(final.resolve.to_s).to eq('https://discourse.org')
+          expect(final.status).to eq(:resolved)
+          expect(final.cookie).to eq('evil=trout')
+        end
+      end
+
+      context "when the status code is 501" do
+        before do
+          stub_request(:head, 'https://eviltrout.com').to_return(status: 501)
+        end
+
+        it "will try a GET" do
+          final = FinalDestination.new('https://eviltrout.com', opts)
+          expect(final.resolve.to_s).to eq('https://discourse.org')
+          expect(final.status).to eq(:resolved)
+          expect(final.cookie).to eq('evil=trout')
+        end
+      end
+    end
   end
 
   describe '.validate_uri' do
@@ -198,9 +256,29 @@ describe FinalDestination do
       expect(fd("https://[2001:470:1:3a8::251]").is_dest_valid?).to eq(true)
     end
 
-    it "returns true for private ipv6" do
+    it "returns false for private ipv6" do
       expect(fd("https://[fdd7:b450:d4d1:6b44::1]").is_dest_valid?).to eq(false)
     end
+
+    it "returns true for the base uri" do
+      SiteSetting.force_hostname = "final-test.example.com"
+      expect(fd("https://final-test.example.com/onebox").is_dest_valid?).to eq(true)
+    end
+
+    it "returns true for the S3 CDN url" do
+      SiteSetting.s3_cdn_url = "https://s3.example.com"
+      expect(fd("https://s3.example.com/some/thing").is_dest_valid?).to eq(true)
+    end
+
+    it "returns true for the CDN url" do
+      GlobalSetting.stubs(:cdn_url).returns("https://cdn.example.com/discourse")
+      expect(fd("https://cdn.example.com/some/asset").is_dest_valid?).to eq(true)
+    end
+
+    it 'supports whitelisting via a site setting' do
+      SiteSetting.whitelist_internal_hosts = 'private-host.com'
+      expect(fd("https://private-host.com/some/url").is_dest_valid?).to eq(true)
+    end
   end
 
 end
diff --git a/spec/components/freedom_patches/translate_accelerator_spec.rb b/spec/components/freedom_patches/translate_accelerator_spec.rb
index 6fef757ee09..883edd6f1c4 100644
--- a/spec/components/freedom_patches/translate_accelerator_spec.rb
+++ b/spec/components/freedom_patches/translate_accelerator_spec.rb
@@ -14,4 +14,22 @@ describe "translate accelerator" do
     expect(I18n.t(key.to_sym)).to eq(text_overriden)
   end
 
+  describe '.overrides_by_locale' do
+    it 'should cache overrides for each locale' do
+      TranslationOverride.upsert!('en', 'got', "summer")
+      TranslationOverride.upsert!('zh_TW', 'got', "冬季")
+      I18n.backend.store_translations(:en, got: 'winter')
+
+      I18n.overrides_by_locale('en')
+      I18n.overrides_by_locale('zh_TW')
+
+      expect(I18n.instance_variable_get(:@overrides_by_site)).to eq(
+        "default" => {
+          "en" => { "got" => "summer" },
+          "zh_TW" => { "got" => "冬季" }
+        }
+      )
+    end
+  end
+
 end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index f8704c2fb3c..dc7680ea2cf 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -1,4 +1,5 @@
-require 'rails_helper'
+require 'rails_helper';
+
 require 'guardian'
 require_dependency 'post_destroyer'
 
@@ -303,7 +304,7 @@ describe Guardian do
     end
 
     it 'returns true when the site requires approving users and is mod' do
-      SiteSetting.expects(:must_approve_users?).returns(true)
+      SiteSetting.must_approve_users = true
       expect(Guardian.new(moderator).can_invite_to_forum?).to be_truthy
     end
 
@@ -322,11 +323,34 @@ describe Guardian do
     end
 
     it 'returns false when the local logins are disabled' do
-      SiteSetting.stubs(:enable_local_logins).returns(false)
+      SiteSetting.enable_local_logins = false
       expect(Guardian.new(user).can_invite_to_forum?).to be_falsey
       expect(Guardian.new(moderator).can_invite_to_forum?).to be_falsey
     end
 
+    context 'with groups' do
+      let(:group) { Fabricate(:group) }
+      let(:another_group) { Fabricate(:group) }
+      let(:groups) { [group, another_group] }
+
+      before do
+        user.update!(trust_level: TrustLevel[2])
+        group.add_owner(user)
+      end
+
+      it 'returns false when user is not allowed to edit a group' do
+        expect(Guardian.new(user).can_invite_to_forum?(groups)).to eq(false)
+
+        expect(Guardian.new(Fabricate(:admin)).can_invite_to_forum?(groups))
+          .to eq(true)
+      end
+
+      it 'returns true when user is allowed to edit groups' do
+        another_group.add_owner(user)
+
+        expect(Guardian.new(user).can_invite_to_forum?(groups)).to eq(true)
+      end
+    end
   end
 
   describe 'can_invite_to?' do
@@ -434,31 +458,6 @@ describe Guardian do
       expect(Guardian.new.can_see?(nil)).to be_falsey
     end
 
-    describe 'a Group' do
-      let(:group) { Group.new }
-      let(:invisible_group) { Group.new(visible: false, name: 'invisible') }
-
-      it "returns true when the group is visible" do
-        expect(Guardian.new.can_see?(group)).to be_truthy
-      end
-
-      it "returns true when the group is invisible but the user is an admin" do
-        admin = Fabricate.build(:admin)
-        expect(Guardian.new(admin).can_see?(invisible_group)).to be_truthy
-      end
-
-      it "returns true when the group is invisible but the user is a member" do
-        invisible_group.save!
-        member = Fabricate.build(:user)
-        GroupUser.create(group: invisible_group, user: member)
-        expect(Guardian.new(member).can_see?(invisible_group)).to be_truthy
-      end
-
-      it "returns false when the group is invisible" do
-        expect(Guardian.new.can_see?(invisible_group)).to be_falsey
-      end
-    end
-
     describe 'a Category' do
 
       it 'allows public categories' do
@@ -561,7 +560,7 @@ describe Guardian do
 
       it "restricts static doc topics" do
         tos_topic = Fabricate(:topic, user: Discourse.system_user)
-        SiteSetting.stubs(:tos_topic_id).returns(tos_topic.id)
+        SiteSetting.tos_topic_id = tos_topic.id
 
         expect(Guardian.new(build(:user)).can_edit?(tos_topic)).to be_falsey
         expect(Guardian.new(moderator).can_edit?(tos_topic)).to be_falsey
@@ -634,7 +633,7 @@ describe Guardian do
       let(:post_revision) { Fabricate(:post_revision) }
 
       context 'edit_history_visible_to_public is true' do
-        before { SiteSetting.stubs(:edit_history_visible_to_public).returns(true) }
+        before { SiteSetting.edit_history_visible_to_public = true }
 
         it 'is false for nil' do
           expect(Guardian.new.can_see?(nil)).to be_falsey
@@ -650,7 +649,7 @@ describe Guardian do
       end
 
       context 'edit_history_visible_to_public is false' do
-        before { SiteSetting.stubs(:edit_history_visible_to_public).returns(false) }
+        before { SiteSetting.edit_history_visible_to_public = false }
 
         it 'is true for staff' do
           expect(Guardian.new(Fabricate(:admin)).can_see?(post_revision)).to be_truthy
@@ -710,12 +709,12 @@ describe Guardian do
       end
 
       it "is false if user has not met minimum trust level" do
-        SiteSetting.stubs(:min_trust_to_create_topic).returns(1)
+        SiteSetting.min_trust_to_create_topic = 1
         expect(Guardian.new(build(:user, trust_level: 0)).can_create?(Topic,Fabricate(:category))).to be_falsey
       end
 
       it "is true if user has met or exceeded the minimum trust level" do
-        SiteSetting.stubs(:min_trust_to_create_topic).returns(1)
+        SiteSetting.min_trust_to_create_topic = 1
         expect(Guardian.new(build(:user, trust_level: 1)).can_create?(Topic,Fabricate(:category))).to be_truthy
         expect(Guardian.new(build(:user, trust_level: 2)).can_create?(Topic,Fabricate(:category))).to be_truthy
         expect(Guardian.new(build(:admin, trust_level: 0)).can_create?(Topic,Fabricate(:category))).to be_truthy
@@ -1119,7 +1118,7 @@ describe Guardian do
       end
 
       it 'returns false when another user has too low trust level to edit wiki post' do
-        SiteSetting.stubs(:min_trust_to_edit_wiki_post).returns(2)
+        SiteSetting.min_trust_to_edit_wiki_post = 2
         post.wiki = true
         coding_horror.trust_level = 1
 
@@ -1127,7 +1126,7 @@ describe Guardian do
       end
 
       it 'returns true when another user has adequate trust level to edit wiki post' do
-        SiteSetting.stubs(:min_trust_to_edit_wiki_post).returns(2)
+        SiteSetting.min_trust_to_edit_wiki_post = 2
         post.wiki = true
         coding_horror.trust_level = 2
 
@@ -1135,7 +1134,7 @@ describe Guardian do
       end
 
       it 'returns true for post author even when he has too low trust level to edit wiki post' do
-        SiteSetting.stubs(:min_trust_to_edit_wiki_post).returns(2)
+        SiteSetting.min_trust_to_edit_wiki_post = 2
         post.wiki = true
         post.user.trust_level = 1
 
@@ -1144,8 +1143,9 @@ describe Guardian do
 
       context 'post is older than post_edit_time_limit' do
         let(:old_post) { build(:post, topic: topic, user: topic.user, created_at: 6.minutes.ago) }
+
         before do
-          SiteSetting.stubs(:post_edit_time_limit).returns(5)
+          SiteSetting.post_edit_time_limit = 5
         end
 
         it 'returns false to the author of the post' do
@@ -1173,7 +1173,7 @@ describe Guardian do
       context "first post of a static page doc" do
         let!(:tos_topic) { Fabricate(:topic, user: Discourse.system_user) }
         let!(:tos_first_post) { build(:post, topic: tos_topic, user: tos_topic.user) }
-        before { SiteSetting.stubs(:tos_topic_id).returns(tos_topic.id) }
+        before { SiteSetting.tos_topic_id = tos_topic.id }
 
         it "restricts static doc posts" do
           expect(Guardian.new(build(:user)).can_edit?(tos_first_post)).to be_falsey
@@ -1271,7 +1271,7 @@ describe Guardian do
       context 'very old' do
         let(:old_topic) { build(:topic, user: user, created_at: 6.minutes.ago) }
 
-        before { SiteSetting.stubs(:post_edit_time_limit).returns(5) }
+        before { SiteSetting.post_edit_time_limit = 5 }
 
         it 'returns true as a moderator' do
           expect(Guardian.new(moderator).can_edit?(old_topic)).to be_truthy
@@ -1458,7 +1458,7 @@ describe Guardian do
 
       it 'returns false for static doc topics' do
         tos_topic = Fabricate(:topic, user: Discourse.system_user)
-        SiteSetting.stubs(:tos_topic_id).returns(tos_topic.id)
+        SiteSetting.tos_topic_id = tos_topic.id
         expect(Guardian.new(admin).can_delete?(tos_topic)).to be_falsey
       end
     end
@@ -1503,7 +1503,7 @@ describe Guardian do
 
       it 'returns false when post is first in a static doc topic' do
         tos_topic = Fabricate(:topic, user: Discourse.system_user)
-        SiteSetting.stubs(:tos_topic_id).returns(tos_topic.id)
+        SiteSetting.tos_topic_id = tos_topic.id
         post.update_attribute :post_number, 1
         post.update_attribute :topic_id, tos_topic.id
         expect(Guardian.new(admin).can_delete?(post)).to be_falsey
@@ -1512,7 +1512,7 @@ describe Guardian do
       context 'post is older than post_edit_time_limit' do
         let(:old_post) { build(:post, topic: topic, user: topic.user, post_number: 2, created_at: 6.minutes.ago) }
         before do
-          SiteSetting.stubs(:post_edit_time_limit).returns(5)
+          SiteSetting.post_edit_time_limit = 5
         end
 
         it 'returns false to the author of the post' do
@@ -1806,7 +1806,7 @@ describe Guardian do
 
     context "when must_approve_users is false" do
       before do
-        SiteSetting.stubs(:must_approve_users?).returns(false)
+        SiteSetting.must_approve_users = false
       end
 
       it "returns true for a nil user" do
@@ -1820,7 +1820,7 @@ describe Guardian do
 
     context 'when must_approve_users is true' do
       before do
-        SiteSetting.stubs(:must_approve_users?).returns(true)
+        SiteSetting.must_approve_users = true
       end
 
       it "returns false for a nil user" do
@@ -1885,7 +1885,7 @@ describe Guardian do
       it "is true if user is not an admin and first post is not too old" do
         user = Fabricate.build(:user, created_at: 100.days.ago)
         user.stubs(:first_post_created_at).returns(9.days.ago)
-        SiteSetting.stubs(:delete_user_max_post_age).returns(10)
+        SiteSetting.delete_user_max_post_age = 10
         expect(Guardian.new(actor).can_delete_user?(user)).to be_truthy
       end
 
@@ -1896,7 +1896,7 @@ describe Guardian do
       it "is false if user's first post is too old" do
         user = Fabricate.build(:user, created_at: 100.days.ago)
         user.stubs(:first_post_created_at).returns(11.days.ago)
-        SiteSetting.stubs(:delete_user_max_post_age).returns(10)
+        SiteSetting.delete_user_max_post_age = 10
         expect(Guardian.new(actor).can_delete_user?(user)).to be_falsey
       end
     end
@@ -1927,21 +1927,21 @@ describe Guardian do
 
     shared_examples "can_delete_all_posts examples" do
       it "is true if user has no posts" do
-        SiteSetting.stubs(:delete_user_max_post_age).returns(10)
+        SiteSetting.delete_user_max_post_age = 10
         expect(Guardian.new(actor).can_delete_all_posts?(Fabricate(:user, created_at: 100.days.ago))).to be_truthy
       end
 
       it "is true if user's first post is newer than delete_user_max_post_age days old" do
         user = Fabricate(:user, created_at: 100.days.ago)
         user.stubs(:first_post_created_at).returns(9.days.ago)
-        SiteSetting.stubs(:delete_user_max_post_age).returns(10)
+        SiteSetting.delete_user_max_post_age = 10
         expect(Guardian.new(actor).can_delete_all_posts?(user)).to be_truthy
       end
 
       it "is false if user's first post is older than delete_user_max_post_age days old" do
         user = Fabricate(:user, created_at: 100.days.ago)
         user.stubs(:first_post_created_at).returns(11.days.ago)
-        SiteSetting.stubs(:delete_user_max_post_age).returns(10)
+        SiteSetting.delete_user_max_post_age = 10
         expect(Guardian.new(actor).can_delete_all_posts?(user)).to be_falsey
       end
 
@@ -1952,14 +1952,14 @@ describe Guardian do
       it "is true if number of posts is small" do
         u = Fabricate(:user, created_at: 1.day.ago)
         u.stubs(:post_count).returns(1)
-        SiteSetting.stubs(:delete_all_posts_max).returns(10)
+        SiteSetting.delete_all_posts_max = 10
         expect(Guardian.new(actor).can_delete_all_posts?(u)).to be_truthy
       end
 
       it "is false if number of posts is not small" do
         u = Fabricate(:user, created_at: 1.day.ago)
         u.stubs(:post_count).returns(11)
-        SiteSetting.stubs(:delete_all_posts_max).returns(10)
+        SiteSetting.delete_all_posts_max = 10
         expect(Guardian.new(actor).can_delete_all_posts?(u)).to be_falsey
       end
     end
@@ -2089,7 +2089,7 @@ describe Guardian do
 
     context 'for an old user' do
       before do
-        SiteSetting.stubs(:username_change_period).returns(3)
+        SiteSetting.username_change_period = 3
       end
 
       let(:target_user) { Fabricate(:user, created_at: 4.days.ago) }
@@ -2112,7 +2112,7 @@ describe Guardian do
 
     context 'when editing is disabled in preferences' do
       before do
-        SiteSetting.stubs(:username_change_period).returns(0)
+        SiteSetting.username_change_period = 0
       end
 
       include_examples "staff can always change usernames"
@@ -2124,8 +2124,8 @@ describe Guardian do
 
     context 'when SSO username override is active' do
       before do
-        SiteSetting.stubs(:enable_sso).returns(true)
-        SiteSetting.stubs(:sso_overrides_username).returns(true)
+        SiteSetting.enable_sso = true
+        SiteSetting.sso_overrides_username = true
       end
 
       it "is false for admins" do
@@ -2145,7 +2145,7 @@ describe Guardian do
   describe "can_edit_email?" do
     context 'when allowed in settings' do
       before do
-        SiteSetting.stubs(:email_editable?).returns(true)
+        SiteSetting.email_editable = true
       end
 
       it "is false when not logged in" do
@@ -2171,7 +2171,7 @@ describe Guardian do
 
     context 'when not allowed in settings' do
       before do
-        SiteSetting.stubs(:email_editable?).returns(false)
+        SiteSetting.email_editable = false
       end
 
       it "is false when not logged in" do
@@ -2197,8 +2197,9 @@ describe Guardian do
 
     context 'when SSO email override is active' do
       before do
-        SiteSetting.stubs(:enable_sso).returns(true)
-        SiteSetting.stubs(:sso_overrides_email).returns(true)
+        SiteSetting.email_editable = false
+        SiteSetting.enable_sso = true
+        SiteSetting.sso_overrides_email = true
       end
 
       it "is false for admins" do
@@ -2242,7 +2243,7 @@ describe Guardian do
 
     context 'when name is disabled in preferences' do
       before do
-        SiteSetting.stubs(:enable_names).returns(false)
+        SiteSetting.enable_names = false
       end
 
       it 'is false for the user to change their own name' do
@@ -2260,13 +2261,13 @@ describe Guardian do
 
     context 'when name is enabled in preferences' do
       before do
-        SiteSetting.stubs(:enable_names).returns(true)
+        SiteSetting.enable_names = true
       end
 
       context 'when SSO is disabled' do
         before do
-          SiteSetting.stubs(:enable_sso).returns(false)
-          SiteSetting.stubs(:sso_overrides_name).returns(false)
+          SiteSetting.enable_sso = false
+          SiteSetting.sso_overrides_name = false
         end
 
         it 'is true for admins' do
@@ -2284,12 +2285,12 @@ describe Guardian do
 
       context 'when SSO is enabled' do
         before do
-          SiteSetting.stubs(:enable_sso).returns(true)
+          SiteSetting.enable_sso = true
         end
 
         context 'when SSO name override is active' do
           before do
-            SiteSetting.stubs(:sso_overrides_name).returns(true)
+            SiteSetting.sso_overrides_name = true
           end
 
           it 'is false for admins' do
@@ -2307,7 +2308,7 @@ describe Guardian do
 
         context 'when SSO name override is not active' do
           before do
-            SiteSetting.stubs(:sso_overrides_name).returns(false)
+            SiteSetting.sso_overrides_name = false
           end
 
           it 'is true for admins' do
@@ -2436,6 +2437,69 @@ describe Guardian do
     end
   end
 
+  describe(:can_see_group) do
+    it 'Correctly handles owner visibile groups' do
+      group = Group.new(name: 'group', visibility_level: Group.visibility_levels[:owners])
+
+      member = Fabricate(:user)
+      group.add(member)
+      group.save!
+
+      owner = Fabricate(:user)
+      group.add_owner(owner)
+      group.reload
+
+      expect(Guardian.new(admin).can_see_group?(group)).to eq(true)
+      expect(Guardian.new(moderator).can_see_group?(group)).to eq(false)
+      expect(Guardian.new(member).can_see_group?(group)).to eq(false)
+      expect(Guardian.new.can_see_group?(group)).to eq(false)
+      expect(Guardian.new(owner).can_see_group?(group)).to eq(true)
+    end
+
+    it 'Correctly handles staff visibile groups' do
+      group = Group.new(name: 'group', visibility_level: Group.visibility_levels[:staff])
+
+      member = Fabricate(:user)
+      group.add(member)
+      group.save!
+
+      owner = Fabricate(:user)
+      group.add_owner(owner)
+      group.reload
+
+      expect(Guardian.new(member).can_see_group?(group)).to eq(false)
+      expect(Guardian.new(admin).can_see_group?(group)).to eq(true)
+      expect(Guardian.new(moderator).can_see_group?(group)).to eq(true)
+      expect(Guardian.new(owner).can_see_group?(group)).to eq(true)
+      expect(Guardian.new.can_see_group?(group)).to eq(false)
+    end
+
+    it 'Correctly handles member visibile groups' do
+      group = Group.new(name: 'group', visibility_level: Group.visibility_levels[:members])
+
+      member = Fabricate(:user)
+      group.add(member)
+      group.save!
+
+      owner = Fabricate(:user)
+      group.add_owner(owner)
+      group.reload
+
+      expect(Guardian.new(moderator).can_see_group?(group)).to eq(false)
+      expect(Guardian.new.can_see_group?(group)).to eq(false)
+      expect(Guardian.new(admin).can_see_group?(group)).to eq(true)
+      expect(Guardian.new(member).can_see_group?(group)).to eq(true)
+      expect(Guardian.new(owner).can_see_group?(group)).to eq(true)
+    end
+
+    it 'Correctly handles public groups' do
+      group = Group.new(name: 'group', visibility_level: Group.visibility_levels[:public])
+
+      expect(Guardian.new.can_see_group?(group)).to eq(true)
+    end
+
+  end
+
   context 'topic featured link category restriction' do
     before { SiteSetting.topic_featured_link_enabled = true }
     let(:guardian) { Guardian.new }
diff --git a/spec/components/html_normalize_spec.rb b/spec/components/html_normalize_spec.rb
new file mode 100644
index 00000000000..e43fe2fb12c
--- /dev/null
+++ b/spec/components/html_normalize_spec.rb
@@ -0,0 +1,69 @@
+require 'rails_helper'
+require 'html_normalize'
+
+describe HtmlNormalize do
+
+  def n(html)
+    HtmlNormalize.normalize(html)
+  end
+
+  it "handles self closing tags" do
+
+    source = <<-HTML
+<div>
+  <span><img src='testing'>
+  boo</span>
+</div>
+HTML
+    expect(n source).to eq(source.strip)
+  end
+
+  it "Can handle aside" do
+
+      source = <<~HTML
+        <aside class="quote" data-topic="2" data-post="1">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/x/2">This is a test topic <img src="/images/emoji/emoji_one/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a></div>
+          <blockquote>
+          <p>ddd</p>
+          </blockquote></aside>
+HTML
+      expected = <<~HTML
+        <aside class="quote" data-post="1" data-topic="2">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/x/2">This is a test topic <img src="/images/emoji/emoji_one/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a>
+          </div>
+          <blockquote>
+            <p>ddd</p>
+          </blockquote>
+        </aside>
+HTML
+
+      expect(n expected).to eq(n source)
+  end
+
+  it "Can normalize attributes" do
+
+    source = "<a class='a b' name='sam'>b</a>"
+    same = "<a name='sam' class='a b' >b</a>"
+
+    expect(n source).to eq(n same)
+  end
+
+  it "Can indent divs nicely" do
+    source = "<div> <div><div>hello world</div> </div>     </div>"
+    expected = <<~HTML
+        <div>
+          <div>
+            <div>
+              hello world
+            </div>
+          </div>
+        </div>
+HTML
+
+    expect(n source).to eq(expected.strip)
+  end
+end
diff --git a/spec/components/image_sizer_spec.rb b/spec/components/image_sizer_spec.rb
index f371d6acd4b..b0132671016 100644
--- a/spec/components/image_sizer_spec.rb
+++ b/spec/components/image_sizer_spec.rb
@@ -4,8 +4,8 @@ require 'image_sizer'
 describe ImageSizer do
 
   before do
-    SiteSetting.stubs(:max_image_width).returns(500)
-    SiteSetting.stubs(:max_image_height).returns(500)
+    SiteSetting.max_image_width = 500
+    SiteSetting.max_image_height = 500
   end
 
   it 'returns the same dimensions when smaller than the maximums' do
diff --git a/spec/components/inline_oneboxer_spec.rb b/spec/components/inline_oneboxer_spec.rb
new file mode 100644
index 00000000000..8f68f58c3e2
--- /dev/null
+++ b/spec/components/inline_oneboxer_spec.rb
@@ -0,0 +1,88 @@
+require 'rails_helper'
+require_dependency 'inline_oneboxer'
+
+describe InlineOneboxer do
+
+  it "should return nothing with empty input" do
+    expect(InlineOneboxer.new([]).process).to be_blank
+  end
+
+  it "can onebox a topic" do
+    topic = Fabricate(:topic)
+    results = InlineOneboxer.new([topic.url], skip_cache: true).process
+    expect(results).to be_present
+    expect(results[0][:url]).to eq(topic.url)
+    expect(results[0][:title]).to eq(topic.title)
+  end
+
+  it "doesn't onebox private messages" do
+    topic = Fabricate(:private_message_topic)
+    results = InlineOneboxer.new([topic.url], skip_cache: true).process
+    expect(results).to be_blank
+  end
+
+  context "caching" do
+    let(:topic) { Fabricate(:topic) }
+
+    before do
+      InlineOneboxer.purge(topic.url)
+    end
+
+    it "puts an entry in the cache" do
+      expect(InlineOneboxer.cache_lookup(topic.url)).to be_blank
+
+      result = InlineOneboxer.lookup(topic.url)
+      expect(result).to be_present
+
+      cached = InlineOneboxer.cache_lookup(topic.url)
+      expect(cached).to be_present
+      expect(cached[:url]).to eq(topic.url)
+      expect(cached[:title]).to eq(topic.title)
+    end
+  end
+
+  context ".lookup" do
+    it "can lookup one link at a time" do
+      topic = Fabricate(:topic)
+      onebox = InlineOneboxer.lookup(topic.url, skip_cache: true)
+      expect(onebox).to be_present
+      expect(onebox[:url]).to eq(topic.url)
+      expect(onebox[:title]).to eq(topic.title)
+    end
+
+    it "returns nothing for unknown links" do
+      expect(InlineOneboxer.lookup(nil)).to be_nil
+      expect(InlineOneboxer.lookup("/test")).to be_nil
+    end
+
+    it "will return the fancy title" do
+      topic = Fabricate(:topic, title: "Hello :pizza: with an emoji")
+      onebox = InlineOneboxer.lookup(topic.url, skip_cache: true)
+      expect(onebox).to be_present
+      expect(onebox[:url]).to eq(topic.url)
+      expect(onebox[:title]).to eq("Hello 🍕 with an emoji")
+    end
+
+    it "will not crawl domains that aren't whitelisted" do
+      onebox = InlineOneboxer.lookup("https://eviltrout.com", skip_cache: true)
+      expect(onebox).to be_blank
+    end
+
+    it "will lookup whitelisted domains" do
+      SiteSetting.inline_onebox_domains_whitelist = "eviltrout.com"
+      RetrieveTitle.stubs(:crawl).returns("Evil Trout's Blog")
+
+      onebox = InlineOneboxer.lookup(
+        "https://eviltrout.com/some-path",
+        skip_cache: true
+      )
+      expect(onebox).to be_present
+      expect(onebox[:url]).to eq("https://eviltrout.com/some-path")
+      expect(onebox[:title]).to eq("Evil Trout's Blog")
+    end
+
+  end
+
+
+end
+
diff --git a/spec/components/middleware/anonymous_cache_spec.rb b/spec/components/middleware/anonymous_cache_spec.rb
index db0c481c4a8..e7eedaebadf 100644
--- a/spec/components/middleware/anonymous_cache_spec.rb
+++ b/spec/components/middleware/anonymous_cache_spec.rb
@@ -31,6 +31,21 @@ describe Middleware::AnonymousCache::Helper do
     end
   end
 
+  context "per theme cache" do
+    it "handles theme keys" do
+      theme = Theme.create(name: "test", user_id: -1, user_selectable: true)
+
+      with_bad_theme_key = new_helper("HTTP_COOKIE" => "theme_key=abc").cache_key
+      with_no_theme_key = new_helper().cache_key
+
+      expect(with_bad_theme_key).to eq(with_no_theme_key)
+
+      with_good_theme_key = new_helper("HTTP_COOKIE" => "theme_key=#{theme.key}").cache_key
+
+      expect(with_good_theme_key).not_to eq(with_no_theme_key)
+    end
+  end
+
   context "cached" do
     let!(:helper) do
       new_helper("ANON_CACHE_DURATION" => 10)
diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
index c0729285941..5b76dc521fc 100644
--- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb
+++ b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
@@ -5,7 +5,7 @@ describe Onebox::Engine::DiscourseLocalOnebox do
   before { SiteSetting.external_system_avatars_enabled = false }
 
   def build_link(url)
-    %|<a href="#{url}" target="_blank" rel="nofollow noopener">#{url}</a>|
+    %|<a href="#{url}" rel="nofollow noopener">#{url}</a>|
   end
 
   context "for a link to a post" do
diff --git a/spec/components/onebox/engine/flash_video_onebox_spec.rb b/spec/components/onebox/engine/flash_video_onebox_spec.rb
index d63ca37d3ab..f8a873da393 100644
--- a/spec/components/onebox/engine/flash_video_onebox_spec.rb
+++ b/spec/components/onebox/engine/flash_video_onebox_spec.rb
@@ -8,19 +8,19 @@ describe Onebox::Engine::FlashVideoOnebox do
 
   context "when SiteSetting.enable_flash_video_onebox is true" do
     before do
-      SiteSetting.stubs(:enable_flash_video_onebox).returns(true)
+      SiteSetting.enable_flash_video_onebox = true
     end
 
     it "generates a flash video" do
       expect(@o.to_html).to match_html(
-        "<object width='100%' height='100%'><param name='http://player.56.com/v_OTMyNTk1MzE.swf' value='http://player.56.com/v_OTMyNTk1MzE.swf'><embed src='http://player.56.com/v_OTMyNTk1MzE.swf' width='100%' height='100%'></embed></object>" 
+        "<object width='100%' height='100%'><param name='http://player.56.com/v_OTMyNTk1MzE.swf' value='http://player.56.com/v_OTMyNTk1MzE.swf'><embed src='http://player.56.com/v_OTMyNTk1MzE.swf' width='100%' height='100%'></embed></object>"
       )
     end
   end
 
   context "when SiteSetting.enable_flash_video_onebox is false" do
     before do
-      SiteSetting.stubs(:enable_flash_video_onebox).returns(false)
+      SiteSetting.enable_flash_video_onebox = false
     end
 
     it "generates a link" do
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 39fe1443fed..44450021121 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -265,42 +265,54 @@ describe PostCreator do
         expect(post.valid?).to eq(true)
       end
 
+      it 'allows notification email to be skipped' do
+        user_2 = Fabricate(:user)
+
+        creator = PostCreator.new(user,
+          title: 'hi there welcome to my topic',
+          raw: "this is my awesome message @#{user_2.username_lower}",
+          archetype: Archetype.private_message,
+          target_usernames: [user_2.username],
+          post_alert_options: { skip_send_email: true }
+        )
+
+        NotificationEmailer.expects(:process_notification).never
+
+        creator.create
+      end
+
       describe "topic's auto close" do
         before do
           SiteSetting.queue_jobs = true
         end
 
         it "doesn't update topic's auto close when it's not based on last post" do
-          Timecop.freeze do
-            topic = Fabricate(:topic).set_or_create_timer(TopicTimer.types[:close], 12)
+          freeze_time
 
-            PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
-            topic.reload
+          topic = Fabricate(:topic).set_or_create_timer(TopicTimer.types[:close], 12)
+          PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
+          topic.reload
 
-            topic_status_update = TopicTimer.last
-            expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
-            expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
-          end
+          topic_status_update = TopicTimer.last
+          expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
+          expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
         end
 
         it "updates topic's auto close date when it's based on last post" do
-          Timecop.freeze do
-            topic = Fabricate(:topic,
-              topic_timers: [Fabricate(:topic_timer,
-                based_on_last_post: true,
-                execute_at: Time.zone.now - 12.hours,
-                created_at: Time.zone.now - 24.hours
-              )]
-            )
+          freeze_time
+          topic = Fabricate(:topic_timer,
+            based_on_last_post: true,
+            execute_at: Time.zone.now - 12.hours,
+            created_at: Time.zone.now - 24.hours
+          ).topic
 
-            Fabricate(:post, topic: topic)
+          Fabricate(:post, topic: topic)
 
-            PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
+          PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
 
-            topic_status_update = TopicTimer.last
-            expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
-            expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
-          end
+          topic_status_update = TopicTimer.last
+          expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
+          expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
         end
 
       end
@@ -981,4 +993,57 @@ describe PostCreator do
       expect(pc.errors).to be_blank
     end
   end
+
+  context "private message recipients limit (max_allowed_message_recipients) reached" do
+    let(:target_user1) { Fabricate(:coding_horror) }
+    let(:target_user2) { Fabricate(:evil_trout) }
+    let(:target_user3) { Fabricate(:walter_white) }
+
+    before do
+      SiteSetting.max_allowed_message_recipients = 2
+    end
+
+    context "for normal user" do
+      it 'fails when sending message to multiple recipients' do
+        pc = PostCreator.new(
+          user,
+          title: 'this message is for multiple recipients!',
+          raw: "Lorem ipsum dolor sit amet, id elitr praesent mea, ut ius facilis fierent.",
+          archetype: Archetype.private_message,
+          target_usernames: [target_user1.username, target_user2.username, target_user3.username].join(',')
+        )
+        expect(pc).not_to be_valid
+        expect(pc.errors).to be_present
+      end
+
+      it 'succeeds when sending message to multiple recipients if skip_validations is true' do
+        pc = PostCreator.new(
+          user,
+          title: 'this message is for multiple recipients!',
+          raw: "Lorem ipsum dolor sit amet, id elitr praesent mea, ut ius facilis fierent.",
+          archetype: Archetype.private_message,
+          target_usernames: [target_user1.username, target_user2.username, target_user3.username].join(','),
+          skip_validations: true
+        )
+        expect(pc).to be_valid
+        expect(pc.errors).to be_blank
+      end
+    end
+
+    context "always succeeds if the user is staff" do
+      let(:staff_user) { Fabricate(:admin) }
+
+      it 'when sending message to multiple recipients' do
+        pc = PostCreator.new(
+          staff_user,
+          title: 'this message is for multiple recipients!',
+          raw: "Lorem ipsum dolor sit amet, id elitr praesent mea, ut ius facilis fierent.",
+          archetype: Archetype.private_message,
+          target_usernames: [target_user1.username, target_user2.username, target_user3.username].join(',')
+        )
+        expect(pc).to be_valid
+        expect(pc.errors).to be_blank
+      end
+    end
+  end
 end
diff --git a/spec/components/post_destroyer_spec.rb b/spec/components/post_destroyer_spec.rb
index 37b35ab2853..aa67187834d 100644
--- a/spec/components/post_destroyer_spec.rb
+++ b/spec/components/post_destroyer_spec.rb
@@ -51,7 +51,7 @@ describe PostDestroyer do
 
   describe 'destroy_old_stubs' do
     it 'destroys stubs for deleted by user posts' do
-      SiteSetting.stubs(:delete_removed_posts_after).returns(24)
+      SiteSetting.delete_removed_posts_after = 24
       Fabricate(:admin)
       topic = post.topic
       reply1 = create_post(topic: topic)
@@ -102,7 +102,7 @@ describe PostDestroyer do
       PostDestroyer.new(reply1.user, reply1).destroy
       PostDestroyer.new(reply2.user, reply2).destroy
 
-      SiteSetting.stubs(:delete_removed_posts_after).returns(1)
+      SiteSetting.delete_removed_posts_after = 1
 
       reply2.update_column(:updated_at, 70.minutes.ago)
 
@@ -114,7 +114,7 @@ describe PostDestroyer do
       expect(reply1.deleted_at).to eq(nil)
       expect(reply2.deleted_at).not_to eq(nil)
 
-      SiteSetting.stubs(:delete_removed_posts_after).returns(72)
+      SiteSetting.delete_removed_posts_after = 72
 
       reply1.update_column(:updated_at, 2.days.ago)
 
@@ -122,7 +122,7 @@ describe PostDestroyer do
 
       expect(reply1.reload.deleted_at).to eq(nil)
 
-      SiteSetting.stubs(:delete_removed_posts_after).returns(47)
+      SiteSetting.delete_removed_posts_after = 47
 
       PostDestroyer.destroy_stubs
 
@@ -134,7 +134,7 @@ describe PostDestroyer do
       topic = post.topic
       reply1 = create_post(topic: topic)
 
-      SiteSetting.stubs(:delete_removed_posts_after).returns(0)
+      SiteSetting.delete_removed_posts_after = 0
 
       PostDestroyer.new(reply1.user, reply1).destroy
 
@@ -239,6 +239,19 @@ describe PostDestroyer do
       end
     end
 
+    it "accepts a delete_removed_posts_after option" do
+      SiteSetting.delete_removed_posts_after = 0
+
+      PostDestroyer.new(post.user, post, delete_removed_posts_after: 1).destroy
+
+      post.reload
+
+      expect(post.deleted_at).to eq(nil)
+      expect(post.user_deleted).to eq(true)
+
+      expect(post.raw).to eq(I18n.t('js.post.deleted_by_author', count: 1))
+    end
+
     context "as a moderator" do
       it "deletes the post" do
         author = post.user
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index 445c00ecd15..b32fdcdf8c9 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -73,7 +73,7 @@ describe PostRevisor do
 
     describe 'ninja editing' do
       it 'correctly applies edits' do
-        SiteSetting.stubs(:editing_grace_period).returns(1.minute)
+        SiteSetting.editing_grace_period = 1.minute
 
         subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 10.seconds)
         post.reload
@@ -86,7 +86,7 @@ describe PostRevisor do
       end
 
       it "doesn't create a new version" do
-        SiteSetting.stubs(:editing_grace_period).returns(1.minute)
+        SiteSetting.editing_grace_period = 1.minute
 
         # making a revision
         subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + SiteSetting.editing_grace_period + 1.seconds)
@@ -106,7 +106,7 @@ describe PostRevisor do
       let!(:revised_at) { post.updated_at + 2.minutes }
 
       before do
-        SiteSetting.stubs(:editing_grace_period).returns(1.minute.to_i)
+        SiteSetting.editing_grace_period = 1.minute
         subject.revise!(post.user, { raw: 'updated body' }, revised_at: revised_at)
         post.reload
       end
@@ -213,6 +213,22 @@ describe PostRevisor do
         end
       end
 
+      context "invalid description without paragraphs" do
+        before do
+          subject.revise!(post.user, { raw: "# This is a title" })
+          category.reload
+        end
+
+        it "returns a error for the user" do
+          expect(post.errors.present?).to eq(true)
+          expect(post.errors.messages[:base].first).to be I18n.t("category.errors.description_incomplete")
+        end
+
+        it "doesn't update the description of the category" do
+          expect(category.description).to eq(nil)
+        end
+      end
+
       context 'when updating back to the original paragraph' do
         before do
           category.update_column(:description, 'this is my description')
@@ -244,7 +260,7 @@ describe PostRevisor do
       let(:changed_by) { Fabricate(:admin) }
 
       before do
-        SiteSetting.stubs(:newuser_max_images).returns(0)
+        SiteSetting.newuser_max_images = 0
         url = "http://i.imgur.com/wfn7rgU.jpg"
         Oneboxer.stubs(:onebox).with(url, anything).returns("<img src='#{url}'>")
         subject.revise!(changed_by, { raw: "So, post them here!\n#{url}" })
@@ -262,7 +278,7 @@ describe PostRevisor do
 
     describe "new user editing their own post" do
       before do
-        SiteSetting.stubs(:newuser_max_images).returns(0)
+        SiteSetting.newuser_max_images = 0
         url = "http://i.imgur.com/FGg7Vzu.gif"
         Oneboxer.stubs(:cached_onebox).with(url, anything).returns("<img src='#{url}'>")
         subject.revise!(post.user, { raw: "So, post them here!\n#{url}" })
@@ -312,7 +328,7 @@ describe PostRevisor do
 
       context 'second poster posts again quickly' do
         before do
-          SiteSetting.stubs(:editing_grace_period).returns(1.minute.to_i)
+          SiteSetting.editing_grace_period = 1.minute
           subject.revise!(changed_by, { raw: 'yet another updated body' }, revised_at: post.updated_at + 10.seconds)
           post.reload
         end
@@ -326,7 +342,7 @@ describe PostRevisor do
 
       context 'passing skip_revision as true' do
         before do
-          SiteSetting.stubs(:editing_grace_period).returns(1.minute.to_i)
+          SiteSetting.editing_grace_period = 1.minute
           subject.revise!(changed_by, { raw: 'yet another updated body' }, { revised_at: post.updated_at + 10.hours, skip_revision: true })
           post.reload
         end
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 8b0dfae4e92..7853babee63 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -1,25 +1,25 @@
 require 'rails_helper'
 require 'pretty_text'
+require 'html_normalize'
 
 describe PrettyText do
 
+  before do
+    SiteSetting.enable_markdown_typographer = false
+  end
+
+  def n(html)
+    HtmlNormalize.normalize(html)
+  end
+
+  def cook(*args)
+    n(PrettyText.cook(*args))
+  end
+
   let(:wrapped_image) { "<div class=\"lightbox-wrapper\"><a href=\"//localhost:3000/uploads/default/4399/33691397e78b4d75.png\" class=\"lightbox\" title=\"Screen Shot 2014-04-14 at 9.47.10 PM.png\"><img src=\"//localhost:3000/uploads/default/_optimized/bd9/b20/bbbcd6a0c0_655x500.png\" width=\"655\" height=\"500\"><div class=\"meta\">\n<span class=\"filename\">Screen Shot 2014-04-14 at 9.47.10 PM.png</span><span class=\"informations\">966x737 1.47 MB</span><span class=\"expand\"></span>\n</div></a></div>" }
   let(:wrapped_image_excerpt) {  }
 
-  describe "Cooking" do
-
-    describe "off topic quoting" do
-      it "can correctly populate topic title" do
-        topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
-        expected = <<HTML
-<aside class="quote" data-post="2" data-topic="#{topic.id}"><div class="title">
-<div class="quote-controls"></div><a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/#{topic.id}/2">This is a test topic <img src="/images/emoji/emoji_one/slight_smile.png?v=3" title="slight_smile" alt="slight_smile" class="emoji"></a>
-</div>
-<blockquote><p>ddd</p></blockquote></aside>
-HTML
-        expect(PrettyText.cook("[quote=\"EvilTrout, post:2, topic:#{topic.id}\"]ddd\n[/quote]", topic_id: 1)).to match_html expected
-      end
-    end
+  describe "Quoting" do
 
     describe "with avatar" do
       let(:default_avatar) { "//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/{size}.png" }
@@ -29,31 +29,169 @@ HTML
         User.stubs(:default_template).returns(default_avatar)
       end
 
-      it "produces a quote even with new lines in it" do
-        expect(PrettyText.cook("[quote=\"#{user.username}, post:123, topic:456, full:true\"]ddd\n[/quote]")).to match_html "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img alt='' width=\"20\" height=\"20\" src=\"//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">#{user.username}:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
+      it "do off topic quoting with emoji unescape" do
+
+        topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
+        expected = <<~HTML
+          <aside class="quote" data-topic="#{topic.id}" data-post="2">
+          <div class="title">
+            <div class="quote-controls"></div>
+            <a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/#{topic.id}/2">This is a test topic <img src="/images/emoji/twitter/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a>
+          </div>
+          <blockquote>
+            <p>ddd</p>
+          </blockquote>
+          </aside>
+        HTML
+
+        expect(cook("[quote=\"EvilTrout, post:2, topic:#{topic.id}\"]\nddd\n[/quote]", topic_id: 1)).to eq(n(expected))
       end
 
-      it "should produce a quote" do
-        expect(PrettyText.cook("[quote=\"#{user.username}, post:123, topic:456, full:true\"]ddd[/quote]")).to match_html "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img alt='' width=\"20\" height=\"20\" src=\"//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">#{user.username}:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
+      it "indifferent about missing quotations" do
+        md = <<~MD
+          [quote=#{user.username}, post:123, topic:456, full:true]
+
+          ddd
+
+          [/quote]
+        MD
+        html = <<~HTML
+          <aside class="quote" data-post="123" data-topic="456" data-full="true">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <blockquote>
+          <p>ddd</p>
+          </blockquote>
+          </aside>
+        HTML
+
+        expect(PrettyText.cook(md)).to eq(html.strip)
       end
 
+      it "indifferent about curlies and no curlies" do
+        md = <<~MD
+          [quote=“#{user.username}, post:123, topic:456, full:true”]
+
+          ddd
+
+          [/quote]
+        MD
+        html = <<~HTML
+          <aside class="quote" data-post="123" data-topic="456" data-full="true">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <blockquote>
+          <p>ddd</p>
+          </blockquote>
+          </aside>
+        HTML
+
+        expect(PrettyText.cook(md)).to eq(html.strip)
+      end
+
+
       it "trims spaces on quote params" do
-        expect(PrettyText.cook("[quote=\"#{user.username}, post:555, topic: 666\"]ddd[/quote]")).to match_html "<aside class=\"quote\" data-post=\"555\" data-topic=\"666\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img alt='' width=\"20\" height=\"20\" src=\"//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">#{user.username}:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
-      end
+        md = <<~MD
+          [quote="#{user.username}, post:555, topic: 666"]
+          ddd
+          [/quote]
+        MD
 
+        html = <<~HTML
+          <aside class="quote" data-post="555" data-topic="666">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <blockquote>
+          <p>ddd</p>
+          </blockquote>
+          </aside>
+        HTML
+
+        expect(PrettyText.cook(md)).to eq(html.strip)
+      end
     end
 
+    it "can handle quote edge cases" do
+      expect(PrettyText.cook("a\n[quote]\ntest\n[/quote]\n\n\na")).to include('aside')
+      expect(PrettyText.cook("- a\n[quote]\ntest\n[/quote]\n\n\na")).to include('aside')
+      expect(PrettyText.cook("[quote]\ntest")).not_to include('aside')
+      expect(PrettyText.cook("[quote]abc\ntest\n[/quote]")).not_to include('aside')
+      expect(PrettyText.cook("[quote]\ntest\n[/quote]z")).not_to include('aside')
+
+      nested = <<~QUOTE
+        [quote]
+        a
+        [quote]
+        b
+        [/quote]
+        c
+        [/quote]
+      QUOTE
+
+      cooked = PrettyText.cook(nested)
+      expect(cooked.scan('aside').length).to eq(4)
+      expect(cooked.scan('quote]').length).to eq(0)
+    end
+
+    describe "with letter avatar" do
+      let(:user) { Fabricate(:user) }
+
+      context "subfolder" do
+        before do
+          GlobalSetting.stubs(:relative_url_root).returns("/forum")
+          Discourse.stubs(:base_uri).returns("/forum")
+        end
+
+        it "should have correct avatar url" do
+          md = <<~MD
+            [quote="#{user.username}, post:123, topic:456, full:true"]
+            ddd
+            [/quote]
+          MD
+          expect(PrettyText.cook(md)).to include("/forum/letter_avatar_proxy")
+        end
+      end
+    end
+  end
+
+  describe "Mentions" do
+
     it "should handle 3 mentions in a row" do
       expect(PrettyText.cook('@hello @hello @hello')).to match_html "<p><span class=\"mention\">@hello</span> <span class=\"mention\">@hello</span> <span class=\"mention\">@hello</span></p>"
     end
 
-    it "should handle group mentions with a hyphen and without" do
-      expect(PrettyText.cook('@hello @hello-hello')).to match_html "<p><span class=\"mention\">@hello</span> <span class=\"mention\">@hello-hello</span></p>"
+    it "can handle mention edge cases" do
+      expect(PrettyText.cook("hi\n@s")).to eq("<p>hi<br>\n<span class=\"mention\">@s</span></p>")
+      expect(PrettyText.cook("hi\n@ss")).to eq("<p>hi<br>\n<span class=\"mention\">@ss</span></p>")
+      expect(PrettyText.cook("hi\n@s.")).to eq("<p>hi<br>\n<span class=\"mention\">@s</span>.</p>")
+      expect(PrettyText.cook("hi\n@s.s")).to eq("<p>hi<br>\n<span class=\"mention\">@s.s</span></p>")
+      expect(PrettyText.cook("hi\n@.s.s")).to eq("<p>hi<br>\n@.s.s</p>")
+    end
+
+    it "can handle mention with hyperlinks" do
+      Fabricate(:user, username: "sam")
+      expect(PrettyText.cook("hi @sam! hi")).to match_html '<p>hi <a class="mention" href="/u/sam">@sam</a>! hi</p>'
+      expect(PrettyText.cook("hi\n@sam.")).to eq("<p>hi<br>\n<a class=\"mention\" href=\"/u/sam\">@sam</a>.</p>")
+    end
+
+    it "can handle mentions inside a hyperlink" do
+      expect(PrettyText.cook("<a> @inner</a> ")).to match_html '<p><a> @inner</a></p>'
     end
 
 
-    it "should sanitize the html" do
-      expect(PrettyText.cook("<script>alert(42)</script>")).to match_html "<p></p>"
+    it "can handle mentions inside a hyperlink" do
+      expect(PrettyText.cook("[link @inner](http://site.com)")).to match_html '<p><a href="http://site.com" rel="nofollow noopener">link @inner</a></p>'
+    end
+
+    it "can handle a list of mentions" do
+      expect(PrettyText.cook("@a,@b")).to match_html('<p><span class="mention">@a</span>,<span class="mention">@b</span></p>')
+    end
+
+    it "should handle group mentions with a hyphen and without" do
+      expect(PrettyText.cook('@hello @hello-hello')).to match_html "<p><span class=\"mention\">@hello</span> <span class=\"mention\">@hello-hello</span></p>"
     end
 
     it 'should allow for @mentions to have punctuation' do
@@ -62,17 +200,63 @@ HTML
       )
     end
 
-    # see: https://github.com/sparklemotion/nokogiri/issues/1173
-    skip 'allows html entities correctly' do
-      expect(PrettyText.cook("&aleph;&pound;&#162;")).to eq("<p>&aleph;&pound;&#162;</p>")
+    it 'should not treat a medium link as a mention' do
+      expect(PrettyText.cook(". http://test/@sam")).not_to include('mention')
     end
 
   end
 
+  describe "code fences" do
+    it 'indents code correctly' do
+      code = <<~MD
+         X
+         ```
+              #
+              x
+         ```
+      MD
+      cooked = PrettyText.cook(code)
+
+      html = <<~HTML
+        <p>X</p>
+        <pre><code class="lang-auto">     #
+             x
+        </code></pre>
+      HTML
+
+      expect(cooked).to eq(html.strip)
+    end
+
+    it "doesn't replace emoji in code blocks with our emoji sets if emoji is enabled" do
+      expect(PrettyText.cook("```\n💣`\n```\n")).not_to match(/\:bomb\:/)
+    end
+
+    it 'can include code class correctly' do
+      # keep in mind spaces should be trimmed per spec
+      expect(PrettyText.cook("```   ruby the mooby\n`````")).to eq('<pre><code class="lang-ruby"></code></pre>')
+      expect(PrettyText.cook("```cpp\ncpp\n```")).to match_html("<pre><code class='lang-cpp'>cpp\n</code></pre>")
+      expect(PrettyText.cook("```\ncpp\n```")).to match_html("<pre><code class='lang-auto'>cpp\n</code></pre>")
+      expect(PrettyText.cook("```text\ncpp\n```")).to match_html("<pre><code class='lang-nohighlight'>cpp\n</code></pre>")
+
+    end
+
+    it 'indents code correctly' do
+      code = "X\n```\n\n    #\n    x\n```"
+      cooked = PrettyText.cook(code)
+      expect(cooked).to match_html("<p>X</p>\n<pre><code class=\"lang-auto\">\n    #\n    x\n</code></pre>")
+    end
+
+    it 'does censor code fences' do
+      SiteSetting.censored_words = 'apple|banana'
+      expect(PrettyText.cook("# banana")).not_to include('banana')
+    end
+  end
+
+
   describe "rel nofollow" do
     before do
-      SiteSetting.stubs(:add_rel_nofollow_to_user_content).returns(true)
-      SiteSetting.stubs(:exclude_rel_nofollow_domains).returns("foo.com|bar.com")
+      SiteSetting.add_rel_nofollow_to_user_content = true
+      SiteSetting.exclude_rel_nofollow_domains = "foo.com|bar.com"
     end
 
     it "should inject nofollow in all user provided links" do
@@ -275,21 +459,21 @@ HTML
     end
 
     it "should have an option to preserve emoji images" do
-      emoji_image = "<img src='/images/emoji/emoji_one/heart.png?v=1' title=':heart:' class='emoji' alt='heart'>"
+      emoji_image = "<img src='/images/emoji/twitter/heart.png?v=1' title=':heart:' class='emoji' alt='heart'>"
       expect(PrettyText.excerpt(emoji_image, 100, { keep_emoji_images: true })).to match_html(emoji_image)
     end
 
     it "should have an option to remap emoji to code points" do
-      emoji_image = "I <img src='/images/emoji/emoji_one/heart.png?v=1' title=':heart:' class='emoji' alt=':heart:'> you <img src='/images/emoji/emoji_one/heart.png?v=1' title=':unknown:' class='emoji' alt=':unknown:'> "
+      emoji_image = "I <img src='/images/emoji/twitter/heart.png?v=1' title=':heart:' class='emoji' alt=':heart:'> you <img src='/images/emoji/twitter/heart.png?v=1' title=':unknown:' class='emoji' alt=':unknown:'> "
       expect(PrettyText.excerpt(emoji_image, 100, { remap_emoji: true })).to match_html("I ❤  you :unknown:")
     end
 
     it "should have an option to preserve emoji codes" do
-      emoji_code = "<img src='/images/emoji/emoji_one/heart.png?v=1' title=':heart:' class='emoji' alt=':heart:'>"
+      emoji_code = "<img src='/images/emoji/twitter/heart.png?v=1' title=':heart:' class='emoji' alt=':heart:'>"
       expect(PrettyText.excerpt(emoji_code, 100)).to eq(":heart:")
     end
 
-    context 'option ot preserve onebox source' do
+    context 'option to preserve onebox source' do
       it "should return the right excerpt" do
         onebox = "<aside class=\"onebox whitelistedgeneric\">\n  <header class=\"source\">\n    <a href=\"https://meta.discourse.org/t/infrequent-translation-updates-in-stable-branch/31213/9\">meta.discourse.org</a>\n  </header>\n  <article class=\"onebox-body\">\n    <img src=\"https://cdn-enterprise.discourse.org/meta/user_avatar/meta.discourse.org/gerhard/200/70381_1.png\" width=\"\" height=\"\" class=\"thumbnail\">\n\n<h3><a href=\"https://meta.discourse.org/t/infrequent-translation-updates-in-stable-branch/31213/9\">Infrequent translation updates in stable branch</a></h3>\n\n<p>Well, there's an Italian translation for \"New Topic\" in beta, it's been there since November 2014 and it works here on meta.     Do you have any plugins installed? Try disabling them. I'm quite confident that it's either a plugin or a site...</p>\n\n  </article>\n  <div class=\"onebox-metadata\">\n    \n    \n  </div>\n  <div style=\"clear: both\"></div>\n</aside>\n\n\n"
         expected = "<a href=\"https://meta.discourse.org/t/infrequent-translation-updates-in-stable-branch/31213/9\">meta.discourse.org</a>"
@@ -307,7 +491,6 @@ HTML
         )).to eq("boom")
       end
     end
-
   end
 
   describe "strip links" do
@@ -379,20 +562,51 @@ HTML
     end
   end
 
-  it 'can escape *' do
-    expect(PrettyText.cook("***a***a")).to match_html("<p><strong><em>a</em></strong>a</p>")
-    expect(PrettyText.cook("***\\****a")).to match_html("<p><strong><em>*</em></strong>a</p>")
+  it 'Is smart about linebreaks and IMG tags' do
+    raw = <<~MD
+    a <img>
+    <img>
+
+    <img>
+    <img>
+
+    <img>
+    a
+
+    <img>
+    - li
+
+    <img>
+    ```
+    test
+    ```
+
+    ```
+    test
+    ```
+    MD
+
+    html = <<~HTML
+      <p>a <img><br>
+      <img></p>
+      <p><img><br>
+      <img></p>
+      <p><img></p>
+      <p>a</p>
+      <p><img></p>
+      <ul>
+      <li>li</li>
+      </ul>
+      <p><img></p>
+      <pre><code class="lang-auto">test
+      </code></pre>
+      <pre><code class="lang-auto">test
+      </code></pre>
+    HTML
+
+    expect(PrettyText.cook(raw)).to eq(html.strip)
   end
 
-  it 'can include code class correctly' do
-    expect(PrettyText.cook("```cpp\ncpp\n```")).to match_html("<p></p><pre><code class='lang-cpp'>cpp</code></pre>")
-  end
-
-  it 'indents code correctly' do
-    code = "X\n```\n\n    #\n    x\n```"
-    cooked = PrettyText.cook(code)
-    expect(cooked).to match_html("<p>X<br></p>\n\n<p></p><pre><code class=\"lang-auto\">    #\n    x</code></pre>")
-  end
 
   it 'can substitute s3 cdn correctly' do
     SiteSetting.enable_s3_uploads = true
@@ -402,34 +616,21 @@ HTML
     SiteSetting.s3_cdn_url = "https://awesome.cdn"
 
     # add extra img tag to ensure it does not blow up
-    raw = <<HTML
-  <img>
-  <img src='https:#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
-  <img src='http:#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
-  <img src='#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
+    raw = <<~HTML
+      <img>
+      <img src='https:#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
+      <img src='http:#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
+      <img src='#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
+    HTML
 
-HTML
+    html = <<~HTML
+      <p><img><br>
+      <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"><br>
+      <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"><br>
+      <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"></p>
+    HTML
 
-    cooked = <<HTML
-<p>  <img><br>  <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"><br>  <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"><br>  <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"></p>
-HTML
-
-    expect(PrettyText.cook(raw)).to match_html(cooked)
-  end
-
-  describe 'tables' do
-    it 'allows table html' do
-      SiteSetting.allow_html_tables = true
-      table = "<table class='fa-spin'><thead><tr>\n<th class='fa-spin'>test</th></tr></thead><tbody><tr><td>a</td></tr></tbody></table>"
-      match = "<table class=\"md-table\"><thead><tr> <th>test</th> </tr></thead><tbody><tr><td>a</td></tr></tbody></table>"
-      expect(PrettyText.cook(table)).to match_html(match)
-    end
-
-    it 'allows no tables when not enabled' do
-      SiteSetting.allow_html_tables = false
-      table = "<table><thead><tr><th>test</th></tr></thead><tbody><tr><td>a</td></tr></tbody></table>"
-      expect(PrettyText.cook(table)).to match_html("")
-    end
+    expect(PrettyText.cook(raw)).to eq(html.strip)
   end
 
   describe "emoji" do
@@ -441,10 +642,6 @@ HTML
       expect(PrettyText.cook("`💣`")).not_to match(/\:bomb\:/)
     end
 
-    it "doesn't replace emoji in code blocks with our emoji sets if emoji is enabled" do
-      expect(PrettyText.cook("```\n💣`\n```\n")).not_to match(/\:bomb\:/)
-    end
-
     it "replaces some glyphs that are not in the emoji range" do
       expect(PrettyText.cook("☺")).to match(/\:slight_smile\:/)
     end
@@ -453,15 +650,13 @@ HTML
       SiteSetting.enable_emoji = false
       expect(PrettyText.cook("💣")).not_to match(/\:bomb\:/)
     end
-  end
 
-  describe "tag and category links" do
-    it "produces tag links" do
-      Fabricate(:topic, {tags: [Fabricate(:tag, name: 'known')]})
-      expect(PrettyText.cook(" #unknown::tag #known::tag")).to match_html("<p> <span class=\"hashtag\">#unknown::tag</span> <a class=\"hashtag\" href=\"http://test.localhost/tags/known\">#<span>known</span></a></p>")
+    it "replaces skin toned emoji" do
+      expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/blonde_woman/6.png?v=5\" title=\":blonde_woman:t6:\" class=\"emoji\" alt=\":blonde_woman:t6:\"></p>")
+      expect(PrettyText.cook("hello 👩‍🎤")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_singer.png?v=5\" title=\":woman_singer:\" class=\"emoji\" alt=\":woman_singer:\"></p>")
+      expect(PrettyText.cook("hello 👩🏾‍🎓")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_student/5.png?v=5\" title=\":woman_student:t5:\" class=\"emoji\" alt=\":woman_student:t5:\"></p>")
+      expect(PrettyText.cook("hello 🤷‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_shrugging.png?v=5\" title=\":woman_shrugging:\" class=\"emoji\" alt=\":woman_shrugging:\"></p>")
     end
-
-    # TODO does it make sense to generate hashtags for tags that are missing in action?
   end
 
   describe "custom emoji" do
@@ -482,4 +677,313 @@ HTML
     end
   end
 
+  it "replaces skin toned emoji" do
+    expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/blonde_woman/6.png?v=5\" title=\":blonde_woman:t6:\" class=\"emoji\" alt=\":blonde_woman:t6:\"></p>")
+    expect(PrettyText.cook("hello 👩‍🎤")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_singer.png?v=5\" title=\":woman_singer:\" class=\"emoji\" alt=\":woman_singer:\"></p>")
+    expect(PrettyText.cook("hello 👩🏾‍🎓")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_student/5.png?v=5\" title=\":woman_student:t5:\" class=\"emoji\" alt=\":woman_student:t5:\"></p>")
+    expect(PrettyText.cook("hello 🤷‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_shrugging.png?v=5\" title=\":woman_shrugging:\" class=\"emoji\" alt=\":woman_shrugging:\"></p>")
+  end
+
+  it "should not treat a non emoji as an emoji" do
+    expect(PrettyText.cook(':email,class_name:')).not_to include('emoji')
+  end
+
+  it "supports href schemes" do
+    SiteSetting.allowed_href_schemes = "macappstore|steam"
+    cooked = cook("[Steam URL Scheme](steam://store/452530)")
+    expected = '<p><a href="steam://store/452530" rel="nofollow noopener">Steam URL Scheme</a></p>'
+    expect(cooked).to eq(n expected)
+  end
+
+  it "supports forbidden schemes" do
+    SiteSetting.allowed_href_schemes = "macappstore|itunes"
+    cooked = cook("[Steam URL Scheme](steam://store/452530)")
+    expected = '<p><a>Steam URL Scheme</a></p>'
+    expect(cooked).to eq(n expected)
+  end
+
+  it "produces tag links" do
+    Fabricate(:topic, {tags: [Fabricate(:tag, name: 'known')]})
+
+    cooked = PrettyText.cook(" #unknown::tag #known::tag")
+
+    html = <<~HTML
+      <p><span class=\"hashtag\">#unknown::tag</span> <a class=\"hashtag\" href=\"http://test.localhost/tags/known\">#<span>known</span></a></p>
+    HTML
+
+    expect(cooked).to eq(html.strip)
+
+    cooked = PrettyText.cook("[`a` #known::tag here](http://somesite.com)")
+
+    html = <<~HTML
+      <p><a href="http://somesite.com" rel="nofollow noopener"><code>a</code> #known::tag here</a></p>
+    HTML
+
+    expect(cooked).to eq(html.strip)
+
+    cooked = PrettyText.cook("<a href='http://somesite.com'>`a` #known::tag here</a>")
+
+    expect(cooked).to eq(html.strip)
+
+    cooked = PrettyText.cook("<A href='/a'>test</A> #known::tag")
+    html = <<~HTML
+      <p><a href="/a">test</a> <a class="hashtag" href="http://test.localhost/tags/known">#<span>known</span></a></p>
+    HTML
+
+    expect(cooked).to eq(html.strip)
+
+    # ensure it does not fight with the autolinker
+    expect(PrettyText.cook(' http://somewhere.com/#known')).not_to include('hashtag')
+    expect(PrettyText.cook(' http://somewhere.com/?#known')).not_to include('hashtag')
+    expect(PrettyText.cook(' http://somewhere.com/?abc#known')).not_to include('hashtag')
+
+  end
+
+  it "can handle mixed lists" do
+    # known bug in old md engine
+    cooked = PrettyText.cook("* a\n\n1. b")
+    expect(cooked).to match_html("<ul>\n<li>a</li>\n</ul><ol>\n<li>b</li>\n</ol>")
+  end
+
+  it "can handle traditional vs non traditional newlines" do
+    SiteSetting.traditional_markdown_linebreaks = true
+    expect(PrettyText.cook("1\n2")).to match_html "<p>1 2</p>"
+
+    SiteSetting.traditional_markdown_linebreaks = false
+    expect(PrettyText.cook("1\n2")).to match_html "<p>1<br>\n2</p>"
+  end
+
+
+  it "can handle emoji by name" do
+
+    expected = <<HTML
+<p><img src="/images/emoji/twitter/smile.png?v=5\" title=":smile:" class="emoji" alt=":smile:"><img src="/images/emoji/twitter/sunny.png?v=5" title=":sunny:" class="emoji" alt=":sunny:"></p>
+HTML
+    expect(PrettyText.cook(":smile::sunny:")).to eq(expected.strip)
+  end
+
+  it "handles emoji boundaries correctly" do
+    cooked = PrettyText.cook("a,:man:t2:,b")
+    expected = '<p>a,<img src="/images/emoji/twitter/man/2.png?v=5" title=":man:t2:" class="emoji" alt=":man:t2:">,b</p>'
+    expect(cooked).to match(expected.strip)
+  end
+
+  it "can handle emoji by translation" do
+    expected = '<p><img src="/images/emoji/twitter/wink.png?v=5" title=":wink:" class="emoji" alt=":wink:"></p>'
+    expect(PrettyText.cook(";)")).to eq(expected)
+  end
+
+  it "can handle multiple emojis by translation" do
+    cooked = PrettyText.cook(":) ;) :)")
+    expect(cooked.split("img").length-1).to eq(3)
+  end
+
+  it "handles emoji boundries correctly" do
+    expect(PrettyText.cook(",:)")).to include("emoji")
+    expect(PrettyText.cook(":-)\n")).to include("emoji")
+    expect(PrettyText.cook("a :)")).to include("emoji")
+    expect(PrettyText.cook(":),")).not_to include("emoji")
+    expect(PrettyText.cook("abcde ^:;-P")).to include("emoji")
+  end
+
+  it 'can censor words correctly' do
+    SiteSetting.censored_words = 'apple|banana'
+    expect(PrettyText.cook('yay banana yay')).not_to include('banana')
+    expect(PrettyText.cook('yay `banana` yay')).not_to include('banana')
+    expect(PrettyText.cook("# banana")).not_to include('banana')
+    expect(PrettyText.cook("# banana")).to include("\u25a0\u25a0")
+  end
+
+  it 'supports typographer' do
+    SiteSetting.enable_markdown_typographer = true
+    expect(PrettyText.cook('(tm)')).to eq('<p>™</p>')
+
+    SiteSetting.enable_markdown_typographer = false
+    expect(PrettyText.cook('(tm)')).to eq('<p>(tm)</p>')
+  end
+
+  it 'handles onebox correctly' do
+    expect(PrettyText.cook("http://a.com\nhttp://b.com").split("onebox").length).to eq(3)
+    expect(PrettyText.cook("http://a.com\n\nhttp://b.com").split("onebox").length).to eq(3)
+    expect(PrettyText.cook("a\nhttp://a.com")).to include('onebox')
+    expect(PrettyText.cook("> http://a.com")).not_to include('onebox')
+    expect(PrettyText.cook("a\nhttp://a.com a")).not_to include('onebox')
+    expect(PrettyText.cook("a\nhttp://a.com\na")).to include('onebox')
+    expect(PrettyText.cook("http://a.com")).to include('onebox')
+    expect(PrettyText.cook("http://a.com ")).to include('onebox')
+    expect(PrettyText.cook("http://a.com a")).not_to include('onebox')
+    expect(PrettyText.cook("- http://a.com")).not_to include('onebox')
+    expect(PrettyText.cook("<http://a.com>")).not_to include('onebox')
+    expect(PrettyText.cook(" http://a.com")).not_to include('onebox')
+    expect(PrettyText.cook("a\n http://a.com")).not_to include('onebox')
+    expect(PrettyText.cook("sam@sam.com")).not_to include('onebox')
+    expect(PrettyText.cook("<img src='a'>\nhttp://a.com")).to include('onebox')
+  end
+
+  it "can handle bbcode" do
+    expect(PrettyText.cook("a[b]b[/b]c")).to eq('<p>a<span class="bbcode-b">b</span>c</p>')
+    expect(PrettyText.cook("a[i]b[/i]c")).to eq('<p>a<span class="bbcode-i">b</span>c</p>')
+  end
+
+
+  it "can onebox local topics" do
+    op = Fabricate(:post)
+    reply = Fabricate(:post, topic_id: op.topic_id)
+
+
+    url = Discourse.base_url + reply.url
+    quote = create_post(topic_id: op.topic.id, raw: "This is a sample reply with a quote\n\n#{url}")
+    quote.reload
+
+    expect(quote.cooked).not_to include('[quote')
+  end
+
+  it "supports tables" do
+
+    markdown = <<~MD
+      | Tables        | Are           | Cool  |
+      | ------------- |:-------------:| -----:|
+      | col 3 is      | right-aligned | $1600 |
+    MD
+
+    expected = <<~HTML
+      <table>
+      <thead>
+      <tr>
+      <th>Tables</th>
+      <th style="text-align:center">Are</th>
+      <th style="text-align:right">Cool</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr>
+      <td>col 3 is</td>
+      <td style="text-align:center">right-aligned</td>
+      <td style="text-align:right">$1600</td>
+      </tr>
+      </tbody>
+      </table>
+    HTML
+
+    expect(PrettyText.cook(markdown)).to eq(expected.strip)
+  end
+
+
+  it "supports img bbcode" do
+    cooked = PrettyText.cook "[img]http://www.image/test.png[/img]"
+    html = "<p><img src=\"http://www.image/test.png\" alt></p>"
+    expect(cooked).to eq(html)
+  end
+
+  it "provides safety for img bbcode" do
+    cooked = PrettyText.cook "[img]http://aaa.com<script>alert(1);</script>[/img]"
+    html = '<p><img src="http://aaa.com&lt;script&gt;alert(1);&lt;/script&gt;" alt></p>'
+    expect(cooked).to eq(html)
+  end
+
+  it "supports email bbcode" do
+    cooked = PrettyText.cook "[email]sam@sam.com[/email]"
+    html = '<p><a href="mailto:sam@sam.com" data-bbcode="true">sam@sam.com</a></p>'
+    expect(cooked).to eq(html)
+  end
+
+  it "supports url bbcode" do
+    cooked = PrettyText.cook "[url]http://sam.com[/url]"
+    html = '<p><a href="http://sam.com" data-bbcode="true" rel="nofollow noopener">http://sam.com</a></p>';
+    expect(cooked).to eq(html)
+  end
+
+  it "supports nesting tags in url" do
+    cooked = PrettyText.cook("[url=http://sam.com][b]I am sam[/b][/url]")
+    html = '<p><a href="http://sam.com" data-bbcode="true" rel="nofollow noopener"><span class="bbcode-b">I am sam</span></a></p>';
+    expect(cooked).to eq(html)
+  end
+
+  it "supports query params in bbcode url" do
+    cooked = PrettyText.cook("[url=https://www.amazon.com/Camcorder-Hausbell-302S-Control-Infrared/dp/B01KLOA1PI/?tag=discourse]BBcode link[/url]")
+    html = '<p><a href="https://www.amazon.com/Camcorder-Hausbell-302S-Control-Infrared/dp/B01KLOA1PI/?tag=discourse" data-bbcode="true" rel="nofollow noopener">BBcode link</a></p>'
+    expect(cooked).to eq(html)
+  end
+
+  it "supports inline code bbcode" do
+    cooked = PrettyText.cook "Testing [code]codified **stuff** and `more` stuff[/code]"
+    html = "<p>Testing <code>codified **stuff** and `more` stuff</code></p>"
+    expect(cooked).to eq(html)
+  end
+
+  it "supports block code bbcode" do
+    cooked = PrettyText.cook "[code]\ncodified\n\n\n  **stuff** and `more` stuff\n[/code]"
+    html = "<pre><code class=\"lang-auto\">codified\n\n\n  **stuff** and `more` stuff</code></pre>"
+    expect(cooked).to eq(html)
+  end
+
+  it "support special handling for space in urls" do
+    cooked = PrettyText.cook "http://testing.com?a%20b"
+    html = '<p><a href="http://testing.com?a%20b" class="onebox" target="_blank" rel="nofollow noopener">http://testing.com?a%20b</a></p>'
+    expect(cooked).to eq(html)
+  end
+
+  it "supports onebox for decoded urls" do
+    cooked = PrettyText.cook "http://testing.com?a%50b"
+    html = '<p><a href="http://testing.com?a%50b" class="onebox" target="_blank" rel="nofollow noopener">http://testing.com?aPb</a></p>'
+    expect(cooked).to eq(html)
+  end
+
+  it "should sanitize the html" do
+    expect(PrettyText.cook("<test>alert(42)</test>")).to eq "<p>alert(42)</p>"
+  end
+
+  it "should not onebox magically linked urls" do
+    expect(PrettyText.cook('[url]site.com[/url]')).not_to include('onebox')
+  end
+
+  it "should sanitize the html" do
+    expect(PrettyText.cook("<p class='hi'>hi</p>")).to eq "<p>hi</p>"
+  end
+
+  it "should strip SCRIPT" do
+    expect(PrettyText.cook("<script>alert(42)</script>")).to eq ""
+  end
+
+  it "should allow sanitize bypass" do
+    expect(PrettyText.cook("<test>alert(42)</test>", sanitize: false)).to eq "<p><test>alert(42)</test></p>"
+  end
+
+  # custom rule used to specify image dimensions via alt tags
+  describe "image dimensions" do
+    it "allows title plus dimensions" do
+      cooked = PrettyText.cook <<~MD
+        ![title with | title|220x100](http://png.com/my.png)
+        ![](http://png.com/my.png)
+        ![|220x100](http://png.com/my.png)
+        ![stuff](http://png.com/my.png)
+        ![|220x100,50%](http://png.com/my.png)
+      MD
+
+      html = <<~HTML
+        <p><img src="http://png.com/my.png" alt="title with | title" width="220" height="100"><br>
+        <img src="http://png.com/my.png" alt><br>
+        <img src="http://png.com/my.png" alt width="220" height="100"><br>
+        <img src="http://png.com/my.png" alt="stuff"><br>
+        <img src="http://png.com/my.png" alt width="110" height="50"></p>
+      HTML
+
+      expect(cooked).to eq(html.strip)
+    end
+  end
+
+  describe "inline onebox" do
+    it "includes the topic title" do
+      topic = Fabricate(:topic)
+
+      raw = "Hello #{topic.url}"
+
+      cooked = <<~HTML
+        <p>Hello <a href="#{topic.url}">#{topic.title}</a></p>
+      HTML
+
+      expect(PrettyText.cook(raw)).to eq(cooked.strip)
+    end
+  end
+
 end
diff --git a/spec/components/retrieve_title_spec.rb b/spec/components/retrieve_title_spec.rb
new file mode 100644
index 00000000000..8ec078855e7
--- /dev/null
+++ b/spec/components/retrieve_title_spec.rb
@@ -0,0 +1,40 @@
+require 'rails_helper'
+require_dependency 'retrieve_title'
+
+describe RetrieveTitle do
+
+  context "extract_title" do
+
+    it "will extract the value from the title tag" do
+      title = RetrieveTitle.extract_title(
+        "<html><title>My Cool Title</title></html>"
+      )
+
+      expect(title).to eq("My Cool Title")
+    end
+
+    it "will strip whitespace" do
+      title = RetrieveTitle.extract_title(
+        "<html><title>   Another Title\n\n </title></html>"
+      )
+
+      expect(title).to eq("Another Title")
+    end
+
+    it "will prefer the title from an opengraph tag" do
+      title = RetrieveTitle.extract_title(<<~HTML
+        <html>
+          <title>Bad Title</title>
+          <meta property="og:title" content="Good Title" />
+        </html>
+        HTML
+      )
+
+      expect(title).to eq("Good Title")
+    end
+
+  end
+
+end
+
+
diff --git a/spec/components/rtl_spec.rb b/spec/components/rtl_spec.rb
new file mode 100644
index 00000000000..4cc776d26b8
--- /dev/null
+++ b/spec/components/rtl_spec.rb
@@ -0,0 +1,56 @@
+require 'rails_helper'
+require_dependency 'rtl'
+
+describe Rtl do
+
+  let(:user) { Fabricate.build(:user) }
+
+  describe '.css_class' do
+
+    context 'user locale is allowed' do
+      before {
+        SiteSetting.allow_user_locale = true
+      }
+
+      context 'user locale is RTL' do
+        before { user.locale = 'he' }
+
+        it 'returns rtl class' do
+          expect(Rtl.new(user).css_class).to eq('rtl')
+        end
+      end
+
+      context 'user locale is not RTL' do
+        it 'returns empty class' do
+          expect(Rtl.new(user).css_class).to eq('')
+        end
+      end
+
+    end
+
+    context 'user locale is not allowed' do
+      before { SiteSetting.allow_user_locale = false }
+
+      context 'site default locale is RTL' do
+        before { SiteSetting.default_locale = 'he' }
+
+        it 'returns rtl class' do
+          expect(Rtl.new(user).css_class).to eq('rtl')
+        end
+      end
+
+      context 'site default locale is LTR' do
+        before { SiteSetting.default_locale = 'en' }
+
+        context 'user locale is RTL' do
+          before { user.stubs(:locale).returns('he') }
+
+          it 'returns empty class' do
+            expect(Rtl.new(user).css_class).to eq('')
+          end
+        end
+      end
+    end
+
+  end
+end
diff --git a/spec/components/scheduler/manager_spec.rb b/spec/components/scheduler/manager_spec.rb
index 3dc699a1f61..88ccb22639e 100644
--- a/spec/components/scheduler/manager_spec.rb
+++ b/spec/components/scheduler/manager_spec.rb
@@ -58,20 +58,9 @@ describe Scheduler::Manager do
     Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false)
   }
 
-  before {
+  before do
     expect(ActiveRecord::Base.connection_pool.connections.length).to eq(1)
-  }
-
-  after {
-    expect(ActiveRecord::Base.connection_pool.connections.length).to eq(1)
-  }
-
-  it 'can disable stats' do
-    manager = Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false)
-    expect(manager.enable_stats).to eq(false)
-
-    manager = Scheduler::Manager.new(DiscourseRedis.new)
-    expect(manager.enable_stats).to eq(true)
+    @thread_count = Thread.list.count
   end
 
   after do
@@ -80,6 +69,27 @@ describe Scheduler::Manager do
     manager.remove(Testing::SuperLongJob)
     manager.remove(Testing::PerHostJob)
     $redis.flushall
+    expect(ActiveRecord::Base.connection_pool.connections.reject{|c| !c.in_use?}.length).to eq(1)
+
+    # connections that are not in use must be removed
+    # otherwise active record gets super confused
+    ActiveRecord::Base.connection_pool.connections.reject{|c| c.in_use?}.each do |c|
+      ActiveRecord::Base.connection_pool.remove(c)
+    end
+    expect(ActiveRecord::Base.connection_pool.connections.length).to eq(1)
+    wait_for do
+      @thread_count == Thread.list.count
+    end
+  end
+
+  it 'can disable stats' do
+    manager = Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false)
+    expect(manager.enable_stats).to eq(false)
+    manager.stop!
+
+    manager = Scheduler::Manager.new(DiscourseRedis.new)
+    expect(manager.enable_stats).to eq(true)
+    manager.stop!
   end
 
   describe 'per host jobs' do
@@ -105,9 +115,7 @@ describe Scheduler::Manager do
         manager.stop!
 
       end
-
       expect(Testing::PerHostJob.runs).to eq(3)
-
     end
   end
 
@@ -126,7 +134,7 @@ describe Scheduler::Manager do
       expect($redis.zcard(Scheduler::Manager.queue_key)).to eq(0)
     end
 
-    skip 'should recover from crashed manager' do
+    it 'should recover from crashed manager' do
 
       info = manager.schedule_info(Testing::SuperLongJob)
       info.next_run = Time.now.to_i - 1
@@ -142,10 +150,11 @@ describe Scheduler::Manager do
 
       info = manager.schedule_info(Testing::SuperLongJob)
       expect(info.next_run).to be <= Time.now.to_i
+
+      manager.stop!
     end
 
-    # something about logging jobs causing a leak in connection pool in test
-    skip 'should log when job finishes running' do
+    it 'should log when job finishes running' do
 
       Testing::RandomJob.runs = 0
 
diff --git a/spec/components/scheduler/schedule_info_spec.rb b/spec/components/scheduler/schedule_info_spec.rb
index 9b956c73ac9..ca1df2a9466 100644
--- a/spec/components/scheduler/schedule_info_spec.rb
+++ b/spec/components/scheduler/schedule_info_spec.rb
@@ -58,13 +58,15 @@ describe Scheduler::ScheduleInfo do
 
     class DailyJob
       extend ::Scheduler::Schedule
-      daily at: 2.hours
+      daily at: 11.hours
 
       def perform
       end
     end
 
     before do
+      freeze_time Time.parse("2010-01-10 10:00:00")
+
       @info = manager.schedule_info(DailyJob)
       @info.del!
     end
@@ -82,9 +84,13 @@ describe Scheduler::ScheduleInfo do
       expect(@info.valid?).to eq(false)
     end
 
-    skip "will have a due date at the appropriate time if blank" do
+    it "will have a due date at the appropriate time if blank" do
       expect(@info.next_run).to eq(nil)
       @info.schedule!
+
+      expect(JSON.parse($redis.get(@info.key))["next_run"])
+        .to eq((Time.zone.now.midnight + 11.hours).to_i)
+
       expect(@info.valid?).to eq(true)
     end
 
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index c5357481676..3d733299d1a 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -60,6 +60,17 @@ describe Search do
 
   end
 
+  it 'strips zero-width characters from search terms' do
+    term = "\u0063\u0061\u0070\u0079\u200b\u200c\u200d\ufeff\u0062\u0061\u0072\u0061".encode("UTF-8")
+
+    expect(term == 'capybara').to eq(false)
+
+    search = Search.new(term)
+    expect(search.valid?).to eq(true)
+    expect(search.term).to eq('capybara')
+    expect(search.clean_term).to eq('capybara')
+  end
+
   it 'does not search when the search term is too small' do
     search = Search.new('evil', min_search_term_length: 5)
     search.execute
@@ -110,7 +121,7 @@ describe Search do
     end
 
     context 'hiding user profiles' do
-      before { SiteSetting.stubs(:hide_user_profiles_from_public).returns(true) }
+      before { SiteSetting.hide_user_profiles_from_public = true }
 
       it 'returns no result for anon' do
         expect(result.users.length).to eq(0)
@@ -705,15 +716,35 @@ describe Search do
       expect(Search.execute('this is a test #beta').posts.size).to eq(0)
     end
 
-    it "can find with tag" do
-      topic1 = Fabricate(:topic, title: 'Could not, would not, on a boat')
-      topic1.tags = [Fabricate(:tag, name: 'eggs'), Fabricate(:tag, name: 'ham')]
-      Fabricate(:post, topic: topic1)
-      post2 = Fabricate(:post, topic: topic1, raw: "It probably doesn't help that they're green...")
+    context 'tags' do
+      let(:tag1) { Fabricate(:tag, name: 'lunch') }
+      let(:tag2) { Fabricate(:tag, name: 'eggs') }
+      let(:topic1) { Fabricate(:topic, tags: [tag2, Fabricate(:tag)]) }
+      let(:topic2) { Fabricate(:topic, tags: [tag2]) }
+      let(:topic3) { Fabricate(:topic, tags: [tag1, tag2]) }
+      let!(:post1) { Fabricate(:post, topic: topic1)}
+      let!(:post2) { Fabricate(:post, topic: topic2)}
+      let!(:post3) { Fabricate(:post, topic: topic3)}
 
-      expect(Search.execute('green tags:eggs').posts.map(&:id)).to eq([post2.id])
-      expect(Search.execute('green tags:plants').posts.size).to eq(0)
+      it 'can find posts with tag' do
+        post4 = Fabricate(:post, topic: topic3, raw: "It probably doesn't help that they're green...")
+
+        expect(Search.execute('green tags:eggs').posts.map(&:id)).to eq([post4.id])
+        expect(Search.execute('tags:plants').posts.size).to eq(0)
+      end
+
+      it 'can find posts with any tag from multiple tags' do
+        Fabricate(:post)
+
+        expect(Search.execute('tags:eggs,lunch').posts.map(&:id).sort).to eq([post1.id, post2.id, post3.id].sort)
+      end
+
+      it 'can find posts which contains all provided tags' do
+        expect(Search.execute('tags:lunch+eggs').posts.map(&:id)).to eq([post3.id])
+        expect(Search.execute('tags:eggs+lunch').posts.map(&:id)).to eq([post3.id])
+      end
     end
+
   end
 
   it 'can parse complex strings using ts_query helper' do
@@ -770,4 +801,16 @@ describe Search do
     end
   end
 
+  context "search_log_id" do
+    it "returns an id when the search succeeds" do
+      s = Search.new(
+        'indiana jones',
+        search_type: :header,
+        ip_address: '127.0.0.1'
+      )
+      results = s.execute
+      expect(results.search_log_id).to be_present
+    end
+  end
+
 end
diff --git a/spec/components/site_setting_extension_spec.rb b/spec/components/site_setting_extension_spec.rb
index 353c04bd4cd..ce3d5584509 100644
--- a/spec/components/site_setting_extension_spec.rb
+++ b/spec/components/site_setting_extension_spec.rb
@@ -179,7 +179,6 @@ describe SiteSettingExtension do
       end
 
       it "should coerce int to string" do
-        skip "This test is not working on Rspec 2 even"
         settings.test_str = 100
         expect(settings.test_str).to eq("100")
       end
diff --git a/spec/components/spam_handler_spec.rb b/spec/components/spam_handler_spec.rb
index 64508d6ecaa..380784f6ae8 100644
--- a/spec/components/spam_handler_spec.rb
+++ b/spec/components/spam_handler_spec.rb
@@ -7,13 +7,13 @@ describe SpamHandler do
 
     it "works" do
       # max_new_accounts_per_registration_ip = 0 disables the check
-      SiteSetting.stubs(:max_new_accounts_per_registration_ip).returns(0)
+      SiteSetting.max_new_accounts_per_registration_ip = 0
 
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[1])
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
 
       # only prevents registration for TL0
-      SiteSetting.stubs(:max_new_accounts_per_registration_ip).returns(2)
+      SiteSetting.max_new_accounts_per_registration_ip = 2
 
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[1])
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
@@ -24,36 +24,36 @@ describe SpamHandler do
 
     it "doesn't limit registrations since there is a TL2+ user with that IP" do
       # setup
-      SiteSetting.stubs(:max_new_accounts_per_registration_ip).returns(0)
+      SiteSetting.max_new_accounts_per_registration_ip = 0
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[2])
 
       # should not limit registration
-      SiteSetting.stubs(:max_new_accounts_per_registration_ip).returns(1)
+      SiteSetting.max_new_accounts_per_registration_ip = 1
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
     end
 
     it "doesn't limit registrations since there is a staff member with that IP" do
       # setup
-      SiteSetting.stubs(:max_new_accounts_per_registration_ip).returns(0)
+      SiteSetting.max_new_accounts_per_registration_ip = 0
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
       Fabricate(:moderator, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
 
       Group.refresh_automatic_groups!(:staff)
 
       # should not limit registration
-      SiteSetting.stubs(:max_new_accounts_per_registration_ip).returns(1)
+      SiteSetting.max_new_accounts_per_registration_ip = 1
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
     end
 
     it "doesn't limit registrations when the IP is whitelisted" do
       # setup
-      SiteSetting.stubs(:max_new_accounts_per_registration_ip).returns(0)
+      SiteSetting.max_new_accounts_per_registration_ip = 0
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
       ScreenedIpAddress.stubs(:is_whitelisted?).with("42.42.42.42").returns(true)
 
       # should not limit registration
-      SiteSetting.stubs(:max_new_accounts_per_registration_ip).returns(1)
+      SiteSetting.max_new_accounts_per_registration_ip = 1
       Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
     end
 
diff --git a/spec/components/stats_socket_spec.rb b/spec/components/stats_socket_spec.rb
index cac144439ee..773943bda60 100644
--- a/spec/components/stats_socket_spec.rb
+++ b/spec/components/stats_socket_spec.rb
@@ -40,6 +40,18 @@ describe StatsSocket do
     parsed = JSON.parse(line)
 
     expect(parsed.keys.sort).to eq(GC.stat.keys.map(&:to_s).sort)
+
+    # make sure we have libv8 going
+    PrettyText.cook("x")
+
+    socket = UNIXSocket.new(socket_path)
+    socket.send "v8_stat\n", 0
+    line = socket.readline
+    socket.close
+
+    parsed = JSON.parse(line)
+
+    expect(parsed['total_physical_size']).to be>(0)
   end
 
 end
diff --git a/spec/components/stylesheet/compiler_spec.rb b/spec/components/stylesheet/compiler_spec.rb
index c19a4169bd5..6a0e1e50101 100644
--- a/spec/components/stylesheet/compiler_spec.rb
+++ b/spec/components/stylesheet/compiler_spec.rb
@@ -2,12 +2,15 @@ require 'rails_helper'
 require 'stylesheet/compiler'
 
 describe Stylesheet::Compiler do
-  it "can compile desktop mobile and desktop css" do
-    css,_map = Stylesheet::Compiler.compile_asset("desktop")
-    expect(css.length).to be > 1000
+  describe 'compilation' do
+    Dir["#{Rails.root.join("app/assets/stylesheets")}/*.scss"].each do |path|
+      path = File.basename(path, '.scss')
 
-    css,_map = Stylesheet::Compiler.compile_asset("mobile")
-    expect(css.length).to be > 1000
+      it "can compile '#{path}' css" do
+        css, _map = Stylesheet::Compiler.compile_asset(path)
+        expect(css.length).to be > 1000
+      end
+    end
   end
 
   it "supports asset-url" do
@@ -24,5 +27,3 @@ describe Stylesheet::Compiler do
     expect(css).not_to include('image-url')
   end
 end
-
-
diff --git a/spec/components/suggested_topics_builder_spec.rb b/spec/components/suggested_topics_builder_spec.rb
index c860fe0dc11..2b77b222de8 100644
--- a/spec/components/suggested_topics_builder_spec.rb
+++ b/spec/components/suggested_topics_builder_spec.rb
@@ -7,7 +7,7 @@ describe SuggestedTopicsBuilder do
   let(:builder) { SuggestedTopicsBuilder.new(topic) }
 
   before do
-    SiteSetting.stubs(:suggested_topics).returns(5)
+    SiteSetting.suggested_topics = 5
   end
 
   context "splicing category results" do
diff --git a/spec/components/text_sentinel_spec.rb b/spec/components/text_sentinel_spec.rb
index d1f68cff4c4..5707fa9895d 100644
--- a/spec/components/text_sentinel_spec.rb
+++ b/spec/components/text_sentinel_spec.rb
@@ -79,7 +79,7 @@ describe TextSentinel do
     end
 
     it "allows all caps topics when loud posts are allowed" do
-      SiteSetting.stubs(:allow_uppercase_posts).returns(true)
+      SiteSetting.allow_uppercase_posts = true
       expect(TextSentinel.new(valid_string.upcase)).to be_valid
     end
 
@@ -126,8 +126,8 @@ describe TextSentinel do
   context 'title_sentinel' do
 
     it "uses a sensible min entropy value when min title length is less than title_min_entropy" do
-      SiteSetting.stubs(:min_topic_title_length).returns(3)
-      SiteSetting.stubs(:title_min_entropy).returns(10)
+      SiteSetting.min_topic_title_length = 3
+      SiteSetting.title_min_entropy = 10
       expect(TextSentinel.title_sentinel('Hey')).to be_valid
     end
 
@@ -136,15 +136,15 @@ describe TextSentinel do
   context 'body_sentinel' do
 
     it "uses a sensible min entropy value when min body length is less than min entropy" do
-      SiteSetting.stubs(:min_post_length).returns(3)
-      SiteSetting.stubs(:body_min_entropy).returns(7)
+      SiteSetting.min_post_length = 3
+      SiteSetting.body_min_entropy = 7
       expect(TextSentinel.body_sentinel('Yup')).to be_valid
     end
 
     it "uses a sensible min entropy value when min pm body length is less than min entropy" do
-      SiteSetting.stubs(:min_post_length).returns(5)
-      SiteSetting.stubs(:min_private_message_post_length).returns(3)
-      SiteSetting.stubs(:body_min_entropy).returns(7)
+      SiteSetting.min_post_length = 5
+      SiteSetting.min_private_message_post_length = 3
+      SiteSetting.body_min_entropy = 7
       expect(TextSentinel.body_sentinel('Lol', private_message: true)).to be_valid
     end
   end
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index 1e97a81b791..012f642b630 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -14,7 +14,7 @@ describe TopicCreator do
       before do
         TopicCreator.any_instance.expects(:save_topic).returns(true)
         TopicCreator.any_instance.expects(:watch_topic).returns(true)
-        SiteSetting.stubs(:allow_duplicate_topic_titles?).returns(true)
+        SiteSetting.allow_duplicate_topic_titles = true
       end
 
       it "should be possible for an admin to create a topic" do
@@ -26,7 +26,7 @@ describe TopicCreator do
       end
 
       context 'regular user' do
-        before { SiteSetting.stubs(:min_trust_to_create_topic).returns(TrustLevel[0]) }
+        before { SiteSetting.min_trust_to_create_topic = TrustLevel[0] }
 
         it "should be possible for a regular user to create a topic" do
           expect(TopicCreator.create(user, Guardian.new(user), valid_attrs)).to be_valid
@@ -57,7 +57,7 @@ describe TopicCreator do
         before do
           TopicCreator.any_instance.expects(:save_topic).returns(true)
           TopicCreator.any_instance.expects(:watch_topic).returns(true)
-          SiteSetting.stubs(:allow_duplicate_topic_titles?).returns(true)
+          SiteSetting.allow_duplicate_topic_titles = true
         end
 
         it "should be possible for a regular user to send private message" do
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index 4d542032e43..e3cb344d943 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -67,6 +67,35 @@ describe TopicQuery do
 
   end
 
+  context "prioritize_pinned_topics" do
+
+    it "does the pagination correctly" do
+
+      num_topics = 15
+      per_page = 3
+
+      topics = []
+      (num_topics - 1).downto(0).each do |i|
+         topics[i] = Fabricate(:topic)
+      end
+
+      topic_query = TopicQuery.new(user)
+      results = topic_query.send(:default_results)
+
+      expect(topic_query.prioritize_pinned_topics(results, {
+        :per_page => per_page,
+        :page => 0
+      })).to eq(topics[0...per_page])
+
+      expect(topic_query.prioritize_pinned_topics(results, {
+        :per_page => per_page,
+        :page => 1
+      })).to eq(topics[per_page...num_topics])
+
+    end
+
+  end
+
   context 'bookmarks' do
     it "filters and returns bookmarks correctly" do
       post = Fabricate(:post)
diff --git a/spec/components/validators/password_validator_spec.rb b/spec/components/validators/password_validator_spec.rb
index 92f6095c3f1..7166b9e4b9d 100644
--- a/spec/components/validators/password_validator_spec.rb
+++ b/spec/components/validators/password_validator_spec.rb
@@ -19,7 +19,7 @@ describe PasswordValidator do
       end
 
       context "min password length is 8" do
-        before { SiteSetting.stubs(:min_password_length).returns(8) }
+        before { SiteSetting.min_password_length = 8 }
 
         it "doesn't add an error when password is good" do
           @password = "weron235alsfn234"
@@ -56,7 +56,7 @@ describe PasswordValidator do
       end
 
       context "min password length is 12" do
-        before { SiteSetting.stubs(:min_password_length).returns(12) }
+        before { SiteSetting.min_password_length = 12 }
 
         it "adds an error when password length is 11" do
           @password = "gt38sdt92bv"
@@ -68,19 +68,19 @@ describe PasswordValidator do
 
     context "password is commonly used" do
       before do
-        SiteSetting.stubs(:min_password_length).returns(8)
+        SiteSetting.min_password_length = 8
         CommonPasswords.stubs(:common_password?).returns(true)
       end
 
       it "adds an error when block_common_passwords is enabled" do
-        SiteSetting.stubs(:block_common_passwords).returns(true)
+        SiteSetting.block_common_passwords = true
         @password = "password"
         validate
         expect(record.errors[:password]).to include(password_error_message(:common))
       end
 
       it "doesn't add an error when block_common_passwords is disabled" do
-        SiteSetting.stubs(:block_common_passwords).returns(false)
+        SiteSetting.block_common_passwords = false
         @password = "password"
         validate
         expect(record.errors[:password]).not_to be_present
diff --git a/spec/components/validators/post_validator_spec.rb b/spec/components/validators/post_validator_spec.rb
index 25893f34e57..008e92fa16b 100644
--- a/spec/components/validators/post_validator_spec.rb
+++ b/spec/components/validators/post_validator_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 require_dependency 'validators/post_validator'
 
 describe Validators::PostValidator do
-  let(:post) { build(:post) }
+  let(:post) { build(:post, topic: Fabricate(:topic)) }
   let(:validator) { Validators::PostValidator.new({}) }
 
   context "#post_body_validator" do
@@ -144,7 +144,7 @@ describe Validators::PostValidator do
 
   describe "unique_post_validator" do
     before do
-      SiteSetting.stubs(:unique_posts_mins).returns(5)
+      SiteSetting.unique_posts_mins = 5
     end
 
     context "post is unique" do
@@ -193,7 +193,7 @@ describe Validators::PostValidator do
   context "admin editing a static page" do
     before do
       post.acting_user = build(:admin)
-      SiteSetting.stubs(:tos_topic_id).returns(post.topic_id)
+      SiteSetting.tos_topic_id = post.topic_id
     end
 
     include_examples "almost no validations"
diff --git a/spec/components/validators/sso_overrides_email_validator_spec.rb b/spec/components/validators/sso_overrides_email_validator_spec.rb
new file mode 100644
index 00000000000..4efd91a1008
--- /dev/null
+++ b/spec/components/validators/sso_overrides_email_validator_spec.rb
@@ -0,0 +1,71 @@
+require 'rails_helper'
+
+RSpec.describe SsoOverridesEmailValidator do
+  subject { described_class.new }
+
+  describe '#valid_value?' do
+    describe "when 'email editable' is true" do
+      before do
+        SiteSetting.enable_sso = true
+        SiteSetting.email_editable = true
+      end
+
+      describe 'when val is false' do
+        it 'should be valid' do
+          expect(subject.valid_value?('f')).to eq(true)
+        end
+      end
+
+      describe 'when value is true' do
+        it 'should not be valid' do
+          expect(subject.valid_value?('t')).to eq(false)
+
+          expect(subject.error_message).to eq(I18n.t(
+            'site_settings.errors.email_editable_enabled'
+          ))
+        end
+      end
+    end
+
+    describe "when 'email editable' is false" do
+      before do
+        SiteSetting.enable_sso = true
+        SiteSetting.email_editable = false
+      end
+
+      describe 'when value is false' do
+        it 'should be valid' do
+          expect(subject.valid_value?('f')).to eq(true)
+        end
+      end
+
+      describe 'when value is true' do
+        it 'should be valid' do
+          expect(subject.valid_value?('t')).to eq(true)
+        end
+      end
+    end
+
+    describe "when 'enable sso' is false" do
+      before do
+        SiteSetting.enable_sso = false
+      end
+
+      describe 'when value is false' do
+        it 'should be valid' do
+          expect(subject.valid_value?('f')).to eq(true)
+        end
+      end
+
+      describe 'when value is true' do
+        it 'should not be valid' do
+          expect(subject.valid_value?('t')).to eq(false)
+
+          expect(subject.error_message).to eq(I18n.t(
+            'site_settings.errors.enable_sso_disabled'
+          ))
+        end
+      end
+    end
+  end
+end
diff --git a/spec/components/validators/topic_title_length_validator_spec.rb b/spec/components/validators/topic_title_length_validator_spec.rb
index 2f960247ad5..c95fa21e6b6 100644
--- a/spec/components/validators/topic_title_length_validator_spec.rb
+++ b/spec/components/validators/topic_title_length_validator_spec.rb
@@ -39,7 +39,7 @@ describe TopicTitleLengthValidator do
       validate
       expect(record.errors[:title]).to_not be_present
 
-      SiteSetting.stubs(:min_topic_title_length).returns(2)
+      SiteSetting.min_topic_title_length = 2
 
       record.title = 'aaa'
       validate
diff --git a/spec/components/validators/user_full_name_validator_spec.rb b/spec/components/validators/user_full_name_validator_spec.rb
index bfa57b74b4b..d72797a6c6a 100644
--- a/spec/components/validators/user_full_name_validator_spec.rb
+++ b/spec/components/validators/user_full_name_validator_spec.rb
@@ -6,7 +6,7 @@ describe UserFullNameValidator do
   let(:record) { Fabricate.build(:user, name: @name) }
 
   context "name not required" do
-    before { SiteSetting.stubs(:full_name_required).returns(false) }
+    before { SiteSetting.full_name_required = false }
 
     it "allows no name" do
       @name = nil
@@ -22,7 +22,7 @@ describe UserFullNameValidator do
   end
 
   context "name required" do
-    before { SiteSetting.stubs(:full_name_required).returns(true) }
+    before { SiteSetting.full_name_required = true }
 
     it "adds error for nil name" do
       @name = nil
diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb
index 8bc31307cf2..ed567597463 100644
--- a/spec/controllers/admin/dashboard_controller_spec.rb
+++ b/spec/controllers/admin/dashboard_controller_spec.rb
@@ -22,7 +22,7 @@ describe Admin::DashboardController do
 
       context 'version checking is enabled' do
         before do
-          SiteSetting.stubs(:version_checks).returns(true)
+          SiteSetting.version_checks = true
         end
 
         it 'returns discourse version info' do
@@ -34,7 +34,7 @@ describe Admin::DashboardController do
 
       context 'version checking is disabled' do
         before do
-          SiteSetting.stubs(:version_checks).returns(false)
+          SiteSetting.version_checks = false
         end
 
         it 'does not return discourse version info' do
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index d24aaaa5e2b..5e6b51581ff 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -12,46 +12,6 @@ describe Admin::GroupsController do
     expect(Admin::GroupsController < Admin::AdminController).to eq(true)
   end
 
-  context ".index" do
-
-    it "produces valid json for groups" do
-      group = Fabricate.build(:group, name: "test")
-      group.add(@admin)
-      group.save
-
-      xhr :get, :index
-      expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
-      expect(json.select { |r| r["id"] == Group::AUTO_GROUPS[:everyone] }).to be_empty
-      expect(json.select { |r| r["id"] == group.id }).to eq([{
-        "id"=>group.id,
-        "name"=>group.name,
-        "user_count"=>1,
-        "automatic"=>false,
-        "alias_level"=>0,
-        "visible"=>true,
-        "automatic_membership_email_domains"=>nil,
-        "automatic_membership_retroactive"=>false,
-        "title"=>nil,
-        "primary_group"=>false,
-        "grant_trust_level"=>nil,
-        "incoming_email"=>nil,
-        "has_messages"=>false,
-        "flair_url"=>nil,
-        "flair_bg_color"=>nil,
-        "flair_color"=>nil,
-        "bio_raw"=>nil,
-        "bio_cooked"=>nil,
-        "public"=>false,
-        "allow_membership_requests"=>false,
-        "full_name"=>group.full_name,
-        "default_notification_level"=>3
-      }])
-
-    end
-
-  end
-
   context ".bulk" do
     it "can assign users to a group by email or username" do
       group = Fabricate(:group, name: "test", primary_group: true, title: 'WAT', grant_trust_level: 3)
@@ -100,23 +60,22 @@ describe Admin::GroupsController do
 
       expect do
         xhr :put, :update, { id: group.id, group: {
-          visible: "false",
+          visibility_level: Group.visibility_levels[:owners],
           allow_membership_requests: "true"
         } }
+
       end.to change { GroupHistory.count }.by(2)
 
       expect(response).to be_success
 
       group.reload
-      expect(group.visible).to eq(false)
+
+      expect(group.visibility_level).to eq( Group.visibility_levels[:owners])
       expect(group.allow_membership_requests).to eq(true)
     end
 
     it "ignore name change on automatic group" do
-      expect do
-        xhr :put, :update, { id: 1, group: { name: "WAT" } }
-      end.to change { GroupHistory.count }.by(1)
-
+      xhr :put, :update, { id: 1, group: { name: "WAT" } }
       expect(response).to be_success
 
       group = Group.find(1)
diff --git a/spec/controllers/admin/screened_ip_addresses_controller_spec.rb b/spec/controllers/admin/screened_ip_addresses_controller_spec.rb
index 2ababc1a49e..201a2fad5ef 100644
--- a/spec/controllers/admin/screened_ip_addresses_controller_spec.rb
+++ b/spec/controllers/admin/screened_ip_addresses_controller_spec.rb
@@ -42,7 +42,7 @@ describe Admin::ScreenedIpAddressesController do
       Fabricate(:screened_ip_address, ip_address: "42.42.42.5", match_count: 1)
 
       StaffActionLogger.any_instance.expects(:log_roll_up)
-      SiteSetting.stubs(:min_ban_entries_for_roll_up).returns(3)
+      SiteSetting.min_ban_entries_for_roll_up = 3
 
       xhr :post, :roll_up
       expect(response).to be_success
@@ -62,7 +62,7 @@ describe Admin::ScreenedIpAddressesController do
       Fabricate(:screened_ip_address, ip_address: "1.2.42.0/24", match_count: 1)
 
       StaffActionLogger.any_instance.expects(:log_roll_up)
-      SiteSetting.stubs(:min_ban_entries_for_roll_up).returns(5)
+      SiteSetting.min_ban_entries_for_roll_up = 5
 
       xhr :post, :roll_up
       expect(response).to be_success
diff --git a/spec/controllers/admin/site_settings_controller_spec.rb b/spec/controllers/admin/site_settings_controller_spec.rb
index 9d132bb4017..7a2de2d6d0f 100644
--- a/spec/controllers/admin/site_settings_controller_spec.rb
+++ b/spec/controllers/admin/site_settings_controller_spec.rb
@@ -30,20 +30,21 @@ describe Admin::SiteSettingsController do
       end
 
       it 'sets the value when the param is present' do
-        SiteSetting.expects(:'test_setting=').with('hello').once
         xhr :put, :update, id: 'test_setting', test_setting: 'hello'
+
+        expect(SiteSetting.test_setting).to eq('hello')
       end
 
       it 'allows value to be a blank string' do
-        SiteSetting.expects(:'test_setting=').with('').once
         xhr :put, :update, id: 'test_setting', test_setting: ''
+        expect(SiteSetting.test_setting).to eq('')
       end
 
       it 'logs the change' do
-        SiteSetting.stubs(:test_setting).returns('previous')
-        SiteSetting.expects(:'test_setting=').with('hello').once
+        SiteSetting.test_setting = 'previous'
         StaffActionLogger.any_instance.expects(:log_site_setting_change).with('test_setting', 'previous', 'hello')
         xhr :put, :update, id: 'test_setting', test_setting: 'hello'
+        expect(SiteSetting.test_setting).to eq('hello')
       end
 
       it 'does not allow changing of hidden settings' do
diff --git a/spec/controllers/admin/site_texts_controller_spec.rb b/spec/controllers/admin/site_texts_controller_spec.rb
index 557646000fb..bcbef94ba55 100644
--- a/spec/controllers/admin/site_texts_controller_spec.rb
+++ b/spec/controllers/admin/site_texts_controller_spec.rb
@@ -40,11 +40,35 @@ describe Admin::SiteTextsController do
       end
     end
 
-    context '.update and .revert' do
+    context '#update and #revert' do
+      after do
+        TranslationOverride.delete_all
+        I18n.reload!
+      end
+
+      describe 'failure' do
+        before do
+          I18n.backend.store_translations(:en, some_key: '%{first} %{second}')
+        end
+
+        it 'returns the right error message' do
+          xhr :put, :update, id: 'some_key', site_text: { value: 'hello %{key}' }
+
+          expect(response.status).to eq(422)
+
+          body = JSON.parse(response.body)
+
+          expect(body['message']).to eq(I18n.t(
+            'activerecord.errors.models.translation_overrides.attributes.value.missing_interpolation_keys',
+            keys: 'first, second'
+          ))
+        end
+      end
+
       it 'updates and reverts the key' do
         orig_title = I18n.t(:title)
 
-        xhr :put, :update, id: 'title', site_text: {value: 'hello'}
+        xhr :put, :update, id: 'title', site_text: { value: 'hello' }
         expect(response).to be_success
 
         json = ::JSON.parse(response.body)
@@ -56,7 +80,6 @@ describe Admin::SiteTextsController do
         expect(site_text['id']).to eq('title')
         expect(site_text['value']).to eq('hello')
 
-
         # Revert
         xhr :put, :revert, id: 'title'
         expect(response).to be_success
@@ -72,13 +95,28 @@ describe Admin::SiteTextsController do
       end
 
       it 'returns not found for missing keys' do
-        xhr :put, :update, id: 'made_up_no_key_exists', site_text: {value: 'hello'}
+        xhr :put, :update, id: 'made_up_no_key_exists', site_text: { value: 'hello' }
         expect(response).not_to be_success
       end
 
       it 'logs the change' do
-        StaffActionLogger.any_instance.expects(:log_site_text_change).once
-        xhr :put, :update, id: 'title', site_text: {value: 'hello'}
+        original_title = I18n.t(:title)
+
+        xhr :put, :update, id: 'title', site_text: { value: 'yay' }
+
+        log = UserHistory.last
+
+        expect(log.previous_value).to eq(original_title)
+        expect(log.new_value).to eq('yay')
+        expect(log.action).to eq(UserHistory.actions[:change_site_text])
+
+        xhr :put, :revert, id: 'title'
+
+        log = UserHistory.last
+
+        expect(log.previous_value).to eq('yay')
+        expect(log.new_value).to eq(original_title)
+        expect(log.action).to eq(UserHistory.actions[:change_site_text])
       end
     end
   end
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index f0613510857..199f783f395 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -154,6 +154,10 @@ describe Admin::UsersController do
         @another_user = Fabricate(:coding_horror)
       end
 
+      after do
+        $redis.flushall
+      end
+
       it "raises an error when the user doesn't have permission" do
         Guardian.any_instance.expects(:can_grant_admin?).with(@another_user).returns(false)
         xhr :put, :grant_admin, user_id: @another_user.id
@@ -512,7 +516,7 @@ describe Admin::UsersController do
         xhr :post, :invite_admin, name: 'Bill', username: 'bill22', email: 'bill@bill.com'
         expect(response).to be_success
 
-        u = User.find_by(email: 'bill@bill.com')
+        u = User.find_by_email('bill@bill.com')
         expect(u.name).to eq("Bill")
         expect(u.username).to eq("bill22")
         expect(u.admin).to eq(true)
@@ -547,6 +551,7 @@ describe Admin::UsersController do
     before do
       log_in(:admin)
 
+      SiteSetting.email_editable = false
       SiteSetting.enable_sso = true
       SiteSetting.sso_overrides_email = true
       SiteSetting.sso_overrides_name = true
@@ -586,7 +591,7 @@ describe Admin::UsersController do
       xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
       expect(response).to be_success
 
-      user = User.where(email: 'dr@claw.com').first
+      user = User.find_by_email('dr@claw.com')
       expect(user).to be_present
       expect(user.ip_address).to be_blank
     end
@@ -598,7 +603,7 @@ describe Admin::UsersController do
 
       xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
       expect(response.status).to eq(403)
-      expect(JSON.parse(response.body)["message"]).to include("Email can't be blank")
+      expect(JSON.parse(response.body)["message"]).to include("Primary email is invalid")
     end
   end
 end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index dc86db91228..178f26ba13c 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -177,8 +177,8 @@ describe TopicsController do
     context "allow_user_locale disabled" do
       context "accept-language header differs from default locale" do
         before do
-          SiteSetting.stubs(:allow_user_locale).returns(false)
-          SiteSetting.stubs(:default_locale).returns("en")
+          SiteSetting.allow_user_locale = false
+          SiteSetting.default_locale = "en"
           set_accept_language("fr")
         end
 
@@ -206,9 +206,9 @@ describe TopicsController do
     context "set_locale_from_accept_language_header enabled" do
       context "accept-language header differs from default locale" do
         before do
-          SiteSetting.stubs(:allow_user_locale).returns(true)
-          SiteSetting.stubs(:set_locale_from_accept_language_header).returns(true)
-          SiteSetting.stubs(:default_locale).returns("en")
+          SiteSetting.allow_user_locale = true
+          SiteSetting.set_locale_from_accept_language_header = true
+          SiteSetting.default_locale = "en"
           set_accept_language("fr")
         end
 
@@ -234,8 +234,9 @@ describe TopicsController do
 
       context "the preferred locale includes a region" do
         it "returns the locale and region separated by an underscore" do
-          SiteSetting.stubs(:set_locale_from_accept_language_header).returns(true)
-          SiteSetting.stubs(:default_locale).returns("en")
+          SiteSetting.allow_user_locale = true
+          SiteSetting.set_locale_from_accept_language_header = true
+          SiteSetting.default_locale = "en"
           set_accept_language("zh-CN")
 
           get :show, {topic_id: topic.id}
@@ -246,8 +247,8 @@ describe TopicsController do
 
       context 'accept-language header is not set' do
         it 'uses the site default locale' do
-          SiteSetting.stubs(:allow_user_locale).returns(true)
-          SiteSetting.stubs(:default_locale).returns('en')
+          SiteSetting.allow_user_locale = true
+          SiteSetting.default_locale = 'en'
           set_accept_language('')
 
           get :show, {topic_id: topic.id}
diff --git a/spec/controllers/inline_onebox_controller_spec.rb b/spec/controllers/inline_onebox_controller_spec.rb
new file mode 100644
index 00000000000..3170c3e3e72
--- /dev/null
+++ b/spec/controllers/inline_onebox_controller_spec.rb
@@ -0,0 +1,37 @@
+require 'rails_helper'
+
+describe InlineOneboxController do
+
+  it "requires the user to be logged in" do
+    expect { xhr :get, :show, urls: [] }.to raise_error(Discourse::NotLoggedIn)
+  end
+
+  context "logged in" do
+    let!(:user) { log_in(:user) }
+
+    it "returns empty JSON for empty input" do
+      xhr :get, :show, urls: []
+      expect(response).to be_success
+      json = JSON.parse(response.body)
+      expect(json['inline-oneboxes']).to eq([])
+    end
+
+    context "topic link" do
+      let(:topic) { Fabricate(:topic) }
+
+      it "returns information for a valid link" do
+        xhr :get, :show, urls: [ topic.url ]
+        expect(response).to be_success
+        json = JSON.parse(response.body)
+        onebox = json['inline-oneboxes'][0]
+
+        expect(onebox).to be_present
+        expect(onebox['url']).to eq(topic.url)
+        expect(onebox['title']).to eq(topic.title)
+      end
+    end
+
+  end
+
+end
+
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index efb69302d5e..ffd69f985cf 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -52,11 +52,11 @@ describe InvitesController do
 
   end
 
-  context '.create' do
+  context '#create' do
     it 'requires you to be logged in' do
-      expect {
+      expect do
         post :create, email: 'jake@adventuretime.ooo'
-      }.to raise_error(Discourse::NotLoggedIn)
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'while logged in' do
@@ -74,6 +74,8 @@ describe InvitesController do
         invite.reload
         post :create, email: invite.email
         expect(response).not_to be_success
+        json = JSON.parse(response.body)
+        expect(json["failed"]).to be_present
       end
 
       it "allows admins to invite to groups" do
@@ -84,6 +86,18 @@ describe InvitesController do
         expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
       end
 
+      it 'allows group owners to invite to groups' do
+        group = Fabricate(:group)
+        user = log_in
+        user.update!(trust_level: TrustLevel[2])
+        group.add_owner(user)
+
+        post :create, email: email, group_names: group.name
+
+        expect(response).to be_success
+        expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
+      end
+
       it "allows admin to send multiple invites to same email" do
         user = log_in(:admin)
         invite = Invite.invite_by_email("invite@example.com", user)
@@ -91,6 +105,14 @@ describe InvitesController do
         post :create, email: invite.email
         expect(response).to be_success
       end
+
+      it "responds with error message in case of validation failure" do
+        log_in(:admin)
+        post :create, email: "test@mailinator.com"
+        expect(response).not_to be_success
+        json = JSON.parse(response.body)
+        expect(json["errors"]).to be_present
+      end
     end
 
   end
@@ -128,8 +150,8 @@ describe InvitesController do
       end
 
       it "allows multiple group invite" do
-        group_1 = Fabricate(:group, name: "security")
-        group_2 = Fabricate(:group, name: "support")
+        Fabricate(:group, name: "security")
+        Fabricate(:group, name: "support")
         log_in(:admin)
         post :create_invite_link, email: email, group_names: "security,support"
         expect(response).to be_success
@@ -273,7 +295,7 @@ describe InvitesController do
     context 'new registrations are disabled' do
       let(:topic) { Fabricate(:topic) }
       let(:invite) { topic.invite_by_email(topic.user, "iceking@adventuretime.ooo") }
-      before { SiteSetting.stubs(:allow_new_registrations).returns(false) }
+      before { SiteSetting.allow_new_registrations = false }
 
       it "doesn't redeem the invite" do
         Invite.any_instance.stubs(:redeem).never
@@ -293,119 +315,6 @@ describe InvitesController do
     end
   end
 
-  context '.create_disposable_invite' do
-    it 'requires you to be logged in' do
-      expect {
-        post :create, email: 'jake@adventuretime.ooo'
-      }.to raise_error(Discourse::NotLoggedIn)
-    end
-
-    context 'while logged in as normal user' do
-      let(:user) { Fabricate(:user) }
-
-      it "does not create disposable invitation" do
-        log_in
-        post :create_disposable_invite, email: user.email
-        expect(response).not_to be_success
-      end
-    end
-
-    context 'while logged in as admin' do
-      before do
-        log_in(:admin)
-      end
-      let(:user) { Fabricate(:user) }
-
-      it "creates disposable invitation" do
-        post :create_disposable_invite, email: user.email
-        expect(response).to be_success
-        expect(Invite.where(invited_by_id: user.id).count).to eq(1)
-      end
-
-      it "creates multiple disposable invitations" do
-        post :create_disposable_invite, email: user.email, quantity: 10
-        expect(response).to be_success
-        expect(Invite.where(invited_by_id: user.id).count).to eq(10)
-      end
-
-      it "allows group invite" do
-        group = Fabricate(:group)
-        post :create_disposable_invite, email: user.email, group_names: group.name
-        expect(response).to be_success
-        expect(Invite.find_by(invited_by_id: user.id).invited_groups.count).to eq(1)
-      end
-
-      it "allows multiple group invite" do
-        group_1 = Fabricate(:group, name: "security")
-        group_2 = Fabricate(:group, name: "support")
-        post :create_disposable_invite, email: user.email, group_names: "security,support"
-        expect(response).to be_success
-        expect(Invite.find_by(invited_by_id: user.id).invited_groups.count).to eq(2)
-      end
-
-    end
-
-  end
-
-  context '.redeem_disposable_invite' do
-
-    context 'with an invalid invite token' do
-      before do
-        get :redeem_disposable_invite, email: "name@example.com", token: "doesn't exist"
-      end
-
-      it "redirects to the root" do
-        expect(response).to redirect_to("/")
-      end
-
-      it "should not change the session" do
-        expect(session[:current_user_id]).to be_blank
-      end
-    end
-
-    context 'with a valid invite token' do
-      let(:topic) { Fabricate(:topic) }
-      let(:invitee) { Fabricate(:user) }
-      let(:invite) { Invite.create!(invited_by: invitee) }
-
-      it 'converts "space" to "+" in email parameter' do
-        Invite.expects(:redeem_from_token).with(invite.invite_key, "fname+lname@example.com", nil, nil, topic.id)
-        get :redeem_disposable_invite, email: "fname lname@example.com", token: invite.invite_key, topic: topic.id
-      end
-
-      it 'redeems the invite' do
-        Invite.expects(:redeem_from_token).with(invite.invite_key, "name@example.com", nil, nil, topic.id)
-        get :redeem_disposable_invite, email: "name@example.com", token: invite.invite_key, topic: topic.id
-      end
-
-      context 'when redeem returns a user' do
-        let(:user) { Fabricate(:user) }
-
-        before do
-          Invite.expects(:redeem_from_token).with(invite.invite_key, user.email, nil, nil, topic.id).returns(user)
-        end
-
-        it 'logs in user' do
-          events = DiscourseEvent.track_events do
-            get :redeem_disposable_invite,
-              email: user.email,
-              token: invite.invite_key,
-              topic: topic.id
-          end
-
-          expect(events.map { |event| event[:event_name] }).to include(
-            :user_logged_in, :user_first_logged_in
-          )
-
-          expect(session[:current_user_id]).to eq(user.id)
-        end
-
-      end
-
-    end
-
-  end
-
   context '.resend_invite' do
 
     it 'requires you to be logged in' do
diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb
index 0c5b41596bc..ad390120d4c 100644
--- a/spec/controllers/list_controller_spec.rb
+++ b/spec/controllers/list_controller_spec.rb
@@ -8,7 +8,7 @@ describe ListController do
     @post = Fabricate(:post, user: @user)
 
     # forces tests down some code paths
-    SiteSetting.stubs(:top_menu).returns('latest,-video|new|unread|categories|category/beer')
+    SiteSetting.top_menu = 'latest,-video|new|unread|categories|category/beer'
   end
 
   describe 'titles for crawler layout' do
@@ -219,7 +219,22 @@ describe ListController do
           xhr :get, :category_default, category: category.slug
           expect(response).to be_success
         end
+      end
 
+      describe "renders canonical tag" do
+        render_views
+
+        it 'for category default view' do
+          get :category_default, category: category.slug
+          expect(response).to be_success
+          expect(css_select("link[rel=canonical]").length).to eq(1)
+        end
+
+        it 'for category latest view' do
+          get :category_latest, category: category.slug
+          expect(response).to be_success
+          expect(css_select("link[rel=canonical]").length).to eq(1)
+        end
       end
     end
   end
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index 6efb7380a3d..d2f819a044b 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -889,7 +889,7 @@ describe PostsController do
 
     context "when edit history is not visible to the public" do
 
-      before { SiteSetting.stubs(:edit_history_visible_to_public).returns(false) }
+      before { SiteSetting.edit_history_visible_to_public = false }
 
       it "ensures anonymous cannot see the revisions" do
         xhr :get, :revisions, post_id: post_revision.post_id, revision: post_revision.number
@@ -926,7 +926,7 @@ describe PostsController do
 
     context "when edit history is visible to everyone" do
 
-      before { SiteSetting.stubs(:edit_history_visible_to_public).returns(true) }
+      before { SiteSetting.edit_history_visible_to_public = true }
 
       it "ensures anyone can see the revisions" do
         xhr :get, :revisions, post_id: post_revision.post_id, revision: post_revision.number
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index 7e967f0b7d2..2f6ea932f47 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -3,7 +3,6 @@ require 'rails_helper'
 describe SearchController do
 
   context "integration" do
-
     before do
       SearchIndexer.enable
     end
@@ -18,51 +17,108 @@ describe SearchController do
       expect(data['posts'][0]['blurb']).to eq('this is my really awesome post')
       expect(data['topics'][0]['id']).to eq(my_post.topic_id)
     end
-  end
 
+    it 'performs the query with a type filter' do
+      user = Fabricate(:user)
+      my_post = Fabricate(:post, raw: "#{user.username} is a cool person")
+      xhr :get, :query, term: user.username, type_filter: 'topic'
 
-  let(:search_context) { {type: 'user', id: 'eviltrout'} }
+      expect(response).to be_success
+      data = JSON.parse(response.body)
 
-  context "basics" do
-    let(:guardian) { Guardian.new }
-    let(:search) { mock() }
+      expect(data['posts'][0]['id']).to eq(my_post.id)
+      expect(data['users']).to be_blank
 
-    before do
-      Guardian.stubs(:new).returns(guardian)
+      xhr :get, :query, term: user.username, type_filter: 'user'
+      expect(response).to be_success
+      data = JSON.parse(response.body)
+
+      expect(data['posts']).to be_blank
+      expect(data['users'][0]['id']).to eq(user.id)
     end
 
-    it 'performs the query' do
-      Search.expects(:new).with('test', guardian: guardian).returns(search)
-      search.expects(:execute)
+    context 'searching by topic id' do
+      it 'should not be restricted by minimum search term length' do
+        SiteSetting.min_search_term_length = 20000
 
-      xhr :get, :query, term: 'test'
-    end
+        post = Fabricate(:post)
 
-    it 'performs the query with a filter' do
-      Search.expects(:new).with('test', guardian: guardian, type_filter: 'topic').returns(search)
-      search.expects(:execute)
+        xhr(
+          :get,
+          :query,
+          term: post.topic_id,
+          type_filter: 'topic',
+          search_for_id: true
+        )
 
-      xhr :get, :query, term: 'test', type_filter: 'topic'
-    end
+        expect(response).to be_success
+        data = JSON.parse(response.body)
 
-    it "performs the query and returns results including blurbs" do
-      Search.expects(:new).with('test', guardian: guardian, include_blurbs: true).returns(search)
-      search.expects(:execute)
+        expect(data['topics'][0]['id']).to eq(post.topic_id)
+      end
 
-      xhr :get, :query, term: 'test', include_blurbs: 'true'
-    end
+      it "should return the right result" do
+        user = Fabricate(:user)
+        my_post = Fabricate(:post, raw: "#{user.username} is a cool person")
 
-    it 'performs the query with a filter and passes through search_for_id' do
-      Search.expects(:new).with('test', guardian: guardian, search_for_id: true, type_filter: 'topic').returns(search)
-      search.expects(:execute)
+        xhr(
+          :get,
+          :query,
+          term: my_post.topic_id,
+          type_filter: 'topic',
+          search_for_id: true
+        )
 
-      xhr :get, :query, term: 'test', type_filter: 'topic', search_for_id: true
+        expect(response).to be_success
+        data = JSON.parse(response.body)
+
+        expect(data['topics'][0]['id']).to eq(my_post.topic_id)
+      end
     end
   end
 
+  context "#query" do
+    it "logs the search term" do
+      SiteSetting.log_search_queries = true
+      xhr :get, :query, term: 'wookie'
+
+      expect(response).to be_success
+      expect(SearchLog.where(term: 'wookie')).to be_present
+
+      json = JSON.parse(response.body)
+      search_log_id = json['grouped_search_result']['search_log_id']
+      expect(search_log_id).to be_present
+
+      log = SearchLog.where(id: search_log_id).first
+      expect(log).to be_present
+      expect(log.term).to eq('wookie')
+    end
+
+    it "doesn't log when disabled" do
+      SiteSetting.log_search_queries = false
+      xhr :get, :query, term: 'wookie'
+      expect(response).to be_success
+      expect(SearchLog.where(term: 'wookie')).to be_blank
+    end
+  end
+
+  context "#show" do
+    it "logs the search term" do
+      SiteSetting.log_search_queries = true
+      xhr :get, :show, q: 'bantha'
+      expect(response).to be_success
+      expect(SearchLog.where(term: 'bantha')).to be_present
+    end
+
+    it "doesn't log when disabled" do
+      SiteSetting.log_search_queries = false
+      xhr :get, :show, q: 'bantha'
+      expect(response).to be_success
+      expect(SearchLog.where(term: 'bantha')).to be_blank
+    end
+  end
 
   context "search context" do
-
     it "raises an error with an invalid context type" do
       expect {
         xhr :get, :query, term: 'test', search_context: {type: 'security', id: 'hole'}
@@ -76,32 +132,104 @@ describe SearchController do
     end
 
     context "with a user" do
-
       let(:user) { Fabricate(:user) }
-
       it "raises an error if the user can't see the context" do
         Guardian.any_instance.expects(:can_see?).with(user).returns(false)
         xhr :get, :query, term: 'test', search_context: {type: 'user', id: user.username}
         expect(response).not_to be_success
       end
 
-
       it 'performs the query with a search context' do
-        guardian = Guardian.new
-        Guardian.stubs(:new).returns(guardian)
-
-        search = mock()
-        Search.expects(:new).with('test', guardian: guardian, search_context: user).returns(search)
-        search.expects(:execute)
-
         xhr :get, :query, term: 'test', search_context: {type: 'user', id: user.username}
+        expect(response).to be_success
       end
-
     end
 
-
   end
 
+  context "#click" do
+    it "doesn't work wthout the necessary parameters" do
+      expect(-> {
+        xhr :post, :click
+      }).to raise_error(ActionController::ParameterMissing)
+    end
 
+    it "doesn't record the click for a different user" do
+      log_in(:user)
 
+      _, search_log_id = SearchLog.log(
+        term: 'kitty',
+        search_type: :header,
+        user_id: -10,
+        ip_address: '127.0.0.1'
+      )
+
+      xhr :post, :click, {
+        search_log_id: search_log_id,
+        search_result_id: 12345,
+        search_result_type: 'topic'
+      }
+      expect(response).to be_success
+
+      expect(SearchLog.find(search_log_id).clicked_topic_id).to be_blank
+    end
+
+    it "records the click for a logged in user" do
+      user = log_in(:user)
+
+      _, search_log_id = SearchLog.log(
+        term: 'kitty',
+        search_type: :header,
+        user_id: user.id,
+        ip_address: '127.0.0.1'
+      )
+
+      xhr :post, :click, {
+        search_log_id: search_log_id,
+        search_result_id: 12345,
+        search_result_type: 'topic'
+      }
+      expect(response).to be_success
+
+      expect(SearchLog.find(search_log_id).clicked_topic_id).to eq(12345)
+    end
+
+    it "records the click for an anonymous user" do
+      request.stubs(:remote_ip).returns('192.168.0.1')
+
+      _, search_log_id = SearchLog.log(
+        term: 'kitty',
+        search_type: :header,
+        ip_address: '192.168.0.1'
+      )
+
+      xhr :post, :click, {
+        search_log_id: search_log_id,
+        search_result_id: 22222,
+        search_result_type: 'topic'
+      }
+      expect(response).to be_success
+
+      expect(SearchLog.find(search_log_id).clicked_topic_id).to eq(22222)
+    end
+
+    it "doesn't record the click for a different IP" do
+      request.stubs(:remote_ip).returns('192.168.0.2')
+
+      _, search_log_id = SearchLog.log(
+        term: 'kitty',
+        search_type: :header,
+        ip_address: '192.168.0.1'
+      )
+
+      xhr :post, :click, {
+        search_log_id: search_log_id,
+        search_result_id: 22222,
+        search_result_type: 'topic'
+      }
+      expect(response).to be_success
+
+      expect(SearchLog.find(search_log_id).clicked_topic_id).to be_blank
+    end
+  end
 end
diff --git a/spec/controllers/session_controller_spec.rb b/spec/controllers/session_controller_spec.rb
index 679df2d59be..bcf81c32c7a 100644
--- a/spec/controllers/session_controller_spec.rb
+++ b/spec/controllers/session_controller_spec.rb
@@ -36,7 +36,7 @@ describe SessionController do
       # send welcome messages
       Fabricate(:admin)
       # skip for now
-      # SiteSetting.stubs("send_welcome_message").returns(false)
+      # SiteSetting.send_welcome_message = false
     end
 
     def get_sso(return_path)
@@ -343,9 +343,10 @@ describe SessionController do
 
     describe 'local attribute override from SSO payload' do
       before do
-        SiteSetting.stubs("sso_overrides_email").returns(true)
-        SiteSetting.stubs("sso_overrides_username").returns(true)
-        SiteSetting.stubs("sso_overrides_name").returns(true)
+        SiteSetting.email_editable = false
+        SiteSetting.sso_overrides_email = true
+        SiteSetting.sso_overrides_username = true
+        SiteSetting.sso_overrides_name = true
 
         @user = Fabricate(:user)
 
@@ -525,7 +526,7 @@ describe SessionController do
 
       describe 'local logins disabled' do
         it 'fails' do
-          SiteSetting.stubs(:enable_local_logins).returns(false)
+          SiteSetting.enable_local_logins = false
           xhr :post, :create, login: user.username, password: 'myawesomepassword'
           expect(response.status.to_i).to eq(500)
         end
@@ -617,7 +618,7 @@ describe SessionController do
         let(:permitted_ip_address) { '111.234.23.11' }
         before do
           Fabricate(:screened_ip_address, ip_address: permitted_ip_address, action_type: ScreenedIpAddress.actions[:allow_admin])
-          SiteSetting.stubs(:use_admin_ip_whitelist).returns(true)
+          SiteSetting.use_admin_ip_whitelist = true
         end
 
         it 'is successful for admin at the ip address' do
diff --git a/spec/controllers/similar_topics_controller_spec.rb b/spec/controllers/similar_topics_controller_spec.rb
index 93dfa5ef9e0..605bed1d6a6 100644
--- a/spec/controllers/similar_topics_controller_spec.rb
+++ b/spec/controllers/similar_topics_controller_spec.rb
@@ -16,7 +16,7 @@ describe SimilarTopicsController do
 
     it "returns no results if the title length is below the minimum" do
       Topic.expects(:similar_to).never
-      SiteSetting.stubs(:min_title_similar_length).returns(100)
+      SiteSetting.min_title_similar_length = 100
       xhr :get, :index, title: title, raw: raw
       json = ::JSON.parse(response.body)
       expect(json["similar_topics"].size).to eq(0)
@@ -24,7 +24,7 @@ describe SimilarTopicsController do
 
     it "returns no results if the body length is below the minimum" do
       Topic.expects(:similar_to).never
-      SiteSetting.stubs(:min_body_similar_length).returns(100)
+      SiteSetting.min_body_similar_length = 100
       xhr :get, :index, title: title, raw: raw
       json = ::JSON.parse(response.body)
       expect(json["similar_topics"].size).to eq(0)
@@ -33,7 +33,7 @@ describe SimilarTopicsController do
     describe "minimum_topics_similar" do
 
       before do
-        SiteSetting.stubs(:minimum_topics_similar).returns(30)
+        SiteSetting.minimum_topics_similar = 30
       end
 
       after do
@@ -69,4 +69,3 @@ describe SimilarTopicsController do
   end
 
 end
-
diff --git a/spec/controllers/static_controller_spec.rb b/spec/controllers/static_controller_spec.rb
index fba85ae8c11..0f7bf73ca1b 100644
--- a/spec/controllers/static_controller_spec.rb
+++ b/spec/controllers/static_controller_spec.rb
@@ -54,9 +54,9 @@ describe StaticController do
   context 'show' do
     before do
       post = create_post
-      SiteSetting.stubs(:tos_topic_id).returns(post.topic.id)
-      SiteSetting.stubs(:guidelines_topic_id).returns(post.topic.id)
-      SiteSetting.stubs(:privacy_topic_id).returns(post.topic.id)
+      SiteSetting.tos_topic_id = post.topic.id
+      SiteSetting.guidelines_topic_id = post.topic.id
+      SiteSetting.privacy_topic_id = post.topic.id
     end
 
     context "with a static file that's present" do
@@ -87,7 +87,7 @@ describe StaticController do
         end
 
         context "when #{setting_name} site setting is set" do
-          before  { SiteSetting.stubs(setting_name).returns('http://example.com/page') }
+          before  { SiteSetting.public_send("#{setting_name}=", 'http://example.com/page') }
 
           it "redirects to the #{setting_name}" do
             expect(subject).to redirect_to('http://example.com/page')
@@ -110,7 +110,7 @@ describe StaticController do
     end
 
     it "should display the login template when login is required" do
-      SiteSetting.stubs(:login_required).returns(true)
+      SiteSetting.login_required = true
       xhr :get, :show, id: 'login'
       expect(response).to be_success
     end
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
index fcfcdb754d6..909bb1126ef 100644
--- a/spec/controllers/tags_controller_spec.rb
+++ b/spec/controllers/tags_controller_spec.rb
@@ -130,6 +130,21 @@ describe TagsController do
         json = ::JSON.parse(response.body)
         expect(json["results"].map{|j| j["id"]}).to eq(['cooltag'])
       end
+
+      it "supports Chinese and Russian" do
+        tag_names = ['房地产', 'тема-в-разработке']
+        tag_names.each { |name| Fabricate(:tag, name: name) }
+
+        xhr :get, :search, q: '房'
+        expect(response).to be_success
+        json = ::JSON.parse(response.body)
+        expect(json["results"].map{|j| j["id"]}).to eq(['房地产'])
+
+        xhr :get, :search, q: 'тема'
+        expect(response).to be_success
+        json = ::JSON.parse(response.body)
+        expect(json["results"].map{|j| j["id"]}).to eq(['тема-в-разработке'])
+      end
     end
   end
 end
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index 27a87c43abc..163dc86993d 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -996,7 +996,7 @@ describe TopicsController do
 
         context "allow_uncategorized_topics is false" do
           before do
-            SiteSetting.stubs(:allow_uncategorized_topics).returns(false)
+            SiteSetting.allow_uncategorized_topics = false
           end
 
           it "can add a category to an uncategorized topic" do
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 46f987d16e5..63255e4bf2a 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -38,7 +38,7 @@ describe UploadsController do
       end
 
       it 'parameterize the type' do
-        subject.expects(:create_upload).with(logo, nil, "super_long_type_with_charssuper_long_type_with_char")
+        subject.expects(:create_upload).with(logo, nil, "super_long_type_with_charssuper_long_type_with_char", false, false)
         xhr :post, :create, file: logo, type: "super \# long \//\\ type with \\. $%^&*( chars" * 5
       end
 
@@ -52,11 +52,11 @@ describe UploadsController do
         expect(response.status).to eq 200
 
         expect(message.channel).to eq("/uploads/avatar")
-        expect(message.data).to be
+        expect(message.data["id"]).to be
       end
 
       it 'is successful with an attachment' do
-        SiteSetting.stubs(:authorized_extensions).returns("*")
+        SiteSetting.authorized_extensions = "*"
 
         Jobs.expects(:enqueue).never
 
@@ -66,7 +66,7 @@ describe UploadsController do
 
         expect(response.status).to eq 200
         expect(message.channel).to eq("/uploads/composer")
-        expect(message.data).to be
+        expect(message.data["id"]).to be
       end
 
       it 'is successful with synchronous api' do
@@ -110,7 +110,7 @@ describe UploadsController do
       end
 
       it 'properly returns errors' do
-        SiteSetting.stubs(:max_attachment_size_kb).returns(1)
+        SiteSetting.max_attachment_size_kb = 1
 
         Jobs.expects(:enqueue).never
 
@@ -123,17 +123,30 @@ describe UploadsController do
       end
 
       it 'ensures allow_uploaded_avatars is enabled when uploading an avatar' do
-        SiteSetting.stubs(:allow_uploaded_avatars).returns(false)
+        SiteSetting.allow_uploaded_avatars = false
         xhr :post, :create, file: logo, type: "avatar"
         expect(response).to_not be_success
       end
 
       it 'ensures sso_overrides_avatar is not enabled when uploading an avatar' do
-        SiteSetting.stubs(:sso_overrides_avatar).returns(true)
+        SiteSetting.sso_overrides_avatar = true
         xhr :post, :create, file: logo, type: "avatar"
         expect(response).to_not be_success
       end
 
+      it 'allows staff to upload any file in PM' do
+        SiteSetting.authorized_extensions = "jpg"
+        SiteSetting.allow_staff_to_upload_any_file_in_pm = true
+        @user.update_columns(moderator: true)
+
+        message = MessageBus.track_publish do
+          xhr :post, :create, file: text_file, type: "composer", for_private_message: "true"
+        end.first
+
+        expect(response).to be_success
+        expect(message.data["id"]).to be
+      end
+
       it 'returns an error when it could not determine the dimensions of an image' do
         Jobs.expects(:enqueue).with(:create_avatar_thumbnails, anything).never
 
@@ -194,7 +207,7 @@ describe UploadsController do
 
     context "prevent anons from downloading files" do
 
-      before { SiteSetting.stubs(:prevent_anons_from_downloading_files).returns(true) }
+      before { SiteSetting.prevent_anons_from_downloading_files = true }
 
       it "returns 404 when an anonymous user tries to download a file" do
         Upload.expects(:find_by).never
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 37303fb7686..81b2e2295bd 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -307,12 +307,23 @@ describe UsersController do
         expect(user.user_auth_tokens.count).to eq(1)
       end
 
+      it "doesn't redirect to wizard on get" do
+        user = Fabricate(:admin)
+        UserAuthToken.generate!(user_id: user.id)
+
+        token = user.email_tokens.create(email: user.email).token
+        get :password_reset, token: token
+        expect(response).not_to redirect_to(wizard_path)
+      end
+
       it "redirects to the wizard if you're the first admin" do
         user = Fabricate(:admin)
+        UserAuthToken.generate!(user_id: user.id)
+
         token = user.email_tokens.create(email: user.email).token
         get :password_reset, token: token
         put :password_reset, token: token, password: 'hg9ow8yhg98oadminlonger'
-        expect(response).to be_redirect
+        expect(response).to redirect_to(wizard_path)
       end
 
       it "doesn't invalidate the token when loading the page" do
@@ -461,6 +472,17 @@ describe UsersController do
       xhr :post, :create, post_user_params
     end
 
+    context 'when email params is missing' do
+      it 'should raise the right error' do
+        expect do
+          xhr :post, :create,
+            name: @user.name,
+            username: @user.username,
+            passsword: 'tesing12352343'
+        end.to raise_error(ActionController::ParameterMissing)
+      end
+    end
+
     context 'when creating a user' do
       it 'sets the user locale to I18n.locale' do
         SiteSetting.default_locale = 'en'
@@ -800,7 +822,7 @@ describe UsersController do
         it "should succeed without the optional field" do
           xhr :post, :create, create_params
           expect(response).to be_success
-          inserted = User.where(email: @user.email).first
+          inserted = User.find_by_email(@user.email)
           expect(inserted).to be_present
           expect(inserted.custom_fields).to be_present
           expect(inserted.custom_fields["user_field_#{user_field.id}"]).to eq('value1')
@@ -812,7 +834,7 @@ describe UsersController do
           create_params[:user_fields][optional_field.id.to_s] = 'value3'
           xhr :post, :create, create_params.merge(create_params)
           expect(response).to be_success
-          inserted = User.where(email: @user.email).first
+          inserted = User.find_by_email(@user.email)
           expect(inserted).to be_present
           expect(inserted.custom_fields).to be_present
           expect(inserted.custom_fields["user_field_#{user_field.id}"]).to eq('value1')
@@ -824,7 +846,7 @@ describe UsersController do
           create_params[:user_fields][optional_field.id.to_s] = ('x' * 3000)
           xhr :post, :create, create_params.merge(create_params)
           expect(response).to be_success
-          inserted = User.where(email: @user.email).first
+          inserted = User.find_by_email(@user.email)
 
           val = inserted.custom_fields["user_field_#{optional_field.id}"]
           expect(val.length).to eq(UserField.max_length)
@@ -846,7 +868,7 @@ describe UsersController do
         it "should succeed" do
           xhr :post, :create, create_params
           expect(response).to be_success
-          inserted = User.where(email: @user.email).first
+          inserted = User.find_by_email(@user.email)
           expect(inserted).to be_present
           expect(inserted.custom_fields).not_to be_present
           expect(inserted.custom_fields["user_field_#{user_field.id}"]).to be_blank
@@ -861,13 +883,13 @@ describe UsersController do
         xhr :post, :create, email: staged.email, username: "zogstrip", password: "P4ssw0rd$$"
         result = ::JSON.parse(response.body)
         expect(result["success"]).to eq(true)
-        expect(User.find_by(email: staged.email).staged).to eq(false)
+        expect(User.find_by_email(staged.email).staged).to eq(false)
       end
     end
 
   end
 
-  context '.username' do
+  context '#username' do
     it 'raises an error when not logged in' do
       expect { xhr :put, :username, username: 'somename' }.to raise_error(Discourse::NotLoggedIn)
     end
@@ -894,10 +916,17 @@ describe UsersController do
         expect(user.reload.username).to eq(old_username)
       end
 
-      # Bad behavior, this should give a real JSON error, not an InvalidParameters
       it 'raises an error when change_username fails' do
-        User.any_instance.expects(:save).returns(false)
-        expect { xhr :put, :username, username: user.username, new_username: new_username }.to raise_error(Discourse::InvalidParameters)
+        xhr :put, :username, username: user.username, new_username: '@'
+
+        expect(response).to_not be_success
+
+        body = JSON.parse(response.body)
+
+        expect(body['errors'].first).to include(I18n.t(
+          'user.username.short', min: User.username_length.begin
+        ))
+
         expect(user.reload.username).to eq(old_username)
       end
 
@@ -907,11 +936,13 @@ describe UsersController do
         expect(user.reload.username).to eq(new_username)
       end
 
-      skip 'should fail if the user is old', 'ensure_can_edit_username! is not throwing' do
+      it 'should fail if the user is old' do
         # Older than the change period and >1 post
         user.created_at = Time.now - (SiteSetting.username_change_period + 1).days
-        user.stubs(:post_count).returns(200)
-        expect(Guardian.new(user).can_edit_username?(user)).to eq(false)
+        PostCreator.new(user,
+          title: 'This is a test topic',
+          raw: 'This is a test this is a test'
+        ).create
 
         xhr :put, :username, username: user.username, new_username: new_username
 
@@ -2004,6 +2035,7 @@ describe UsersController do
           password: 'qwerqwer123',
           email: user.email
         }
+
         expect(response).to_not be_success
       end
 
diff --git a/spec/fabricators/user_email_fabricator.rb b/spec/fabricators/user_email_fabricator.rb
new file mode 100644
index 00000000000..3d0d0cc8b0c
--- /dev/null
+++ b/spec/fabricators/user_email_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:user_email) do
+  email { sequence(:email) { |i| "bruce#{i}@wayne.com" } }
+  primary true
+end
diff --git a/spec/fixtures/emails/forwarded_email_to_category.eml b/spec/fixtures/emails/forwarded_email_to_category.eml
new file mode 100644
index 00000000000..681ebdaacf3
--- /dev/null
+++ b/spec/fixtures/emails/forwarded_email_to_category.eml
@@ -0,0 +1,18 @@
+Message-ID: <61@foo.bar.mail>
+From: Foo Bar <existing@bar.com>
+To: Category <category@bar.com>
+Date: Mon, 1 Dec 2016 13:37:42 +0100
+Subject: FW: Discoursing much?
+
+Hi everyone, can you have a look at the email below?
+
+From: Some One <some@one.com>
+To: Ba Bar <ba@bar.com>
+Date: Mon, 1 Dec 2016 00:13:37 +0100
+Subject: Discoursing much?
+
+Hello Ba Bar,
+
+Discoursing much today?
+
+XoXo
diff --git a/spec/fixtures/emails/staged_sender.eml b/spec/fixtures/emails/staged_sender.eml
index e7828e9146e..efc9f533fd3 100644
--- a/spec/fixtures/emails/staged_sender.eml
+++ b/spec/fixtures/emails/staged_sender.eml
@@ -1,5 +1,6 @@
 Return-Path: <staged@bar.com>
 From: Foo Bar <staged@bar.com>
+To: reply+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@bar.com
 Date: Fri, 15 Jan 2016 00:12:43 +0100
 Message-ID: <39@foo.bar.mail>
 Mime-Version: 1.0
diff --git a/spec/fixtures/md/spec.txt b/spec/fixtures/md/spec.txt
new file mode 100644
index 00000000000..c66f93b77fc
--- /dev/null
+++ b/spec/fixtures/md/spec.txt
@@ -0,0 +1,9360 @@
+---
+title: CommonMark Spec
+author: John MacFarlane
+version: 0.27
+date: '2016-11-18'
+license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
+...
+
+# Introduction
+
+## What is Markdown?
+
+Markdown is a plain text format for writing structured documents,
+based on conventions used for indicating formatting in email and
+usenet posts.  It was developed in 2004 by John Gruber, who wrote
+the first Markdown-to-HTML converter in Perl, and it soon became
+ubiquitous.  In the next decade, dozens of implementations were
+developed in many languages.  Some extended the original
+Markdown syntax with conventions for footnotes, tables, and
+other document elements.  Some allowed Markdown documents to be
+rendered in formats other than HTML.  Websites like Reddit,
+StackOverflow, and GitHub had millions of people using Markdown.
+And Markdown started to be used beyond the web, to author books,
+articles, slide shows, letters, and lecture notes.
+
+What distinguishes Markdown from many other lightweight markup
+syntaxes, which are often easier to write, is its readability.
+As Gruber writes:
+
+> The overriding design goal for Markdown's formatting syntax is
+> to make it as readable as possible. The idea is that a
+> Markdown-formatted document should be publishable as-is, as
+> plain text, without looking like it's been marked up with tags
+> or formatting instructions.
+> (<http://daringfireball.net/projects/markdown/>)
+
+The point can be illustrated by comparing a sample of
+[AsciiDoc](http://www.methods.co.nz/asciidoc/) with
+an equivalent sample of Markdown.  Here is a sample of
+AsciiDoc from the AsciiDoc manual:
+
+```
+1. List item one.
++
+List item one continued with a second paragraph followed by an
+Indented block.
++
+.................
+$ ls *.sh
+$ mv *.sh ~/tmp
+.................
++
+List item continued with a third paragraph.
+
+2. List item two continued with an open block.
++
+--
+This paragraph is part of the preceding list item.
+
+a. This list is nested and does not require explicit item
+continuation.
++
+This paragraph is part of the preceding list item.
+
+b. List item b.
+
+This paragraph belongs to item two of the outer list.
+--
+```
+
+And here is the equivalent in Markdown:
+```
+1.  List item one.
+
+    List item one continued with a second paragraph followed by an
+    Indented block.
+
+        $ ls *.sh
+        $ mv *.sh ~/tmp
+
+    List item continued with a third paragraph.
+
+2.  List item two continued with an open block.
+
+    This paragraph is part of the preceding list item.
+
+    1. This list is nested and does not require explicit item continuation.
+
+       This paragraph is part of the preceding list item.
+
+    2. List item b.
+
+    This paragraph belongs to item two of the outer list.
+```
+
+The AsciiDoc version is, arguably, easier to write. You don't need
+to worry about indentation.  But the Markdown version is much easier
+to read.  The nesting of list items is apparent to the eye in the
+source, not just in the processed document.
+
+## Why is a spec needed?
+
+John Gruber's [canonical description of Markdown's
+syntax](http://daringfireball.net/projects/markdown/syntax)
+does not specify the syntax unambiguously.  Here are some examples of
+questions it does not answer:
+
+1.  How much indentation is needed for a sublist?  The spec says that
+    continuation paragraphs need to be indented four spaces, but is
+    not fully explicit about sublists.  It is natural to think that
+    they, too, must be indented four spaces, but `Markdown.pl` does
+    not require that.  This is hardly a "corner case," and divergences
+    between implementations on this issue often lead to surprises for
+    users in real documents. (See [this comment by John
+    Gruber](http://article.gmane.org/gmane.text.markdown.general/1997).)
+
+2.  Is a blank line needed before a block quote or heading?
+    Most implementations do not require the blank line.  However,
+    this can lead to unexpected results in hard-wrapped text, and
+    also to ambiguities in parsing (note that some implementations
+    put the heading inside the blockquote, while others do not).
+    (John Gruber has also spoken [in favor of requiring the blank
+    lines](http://article.gmane.org/gmane.text.markdown.general/2146).)
+
+3.  Is a blank line needed before an indented code block?
+    (`Markdown.pl` requires it, but this is not mentioned in the
+    documentation, and some implementations do not require it.)
+
+    ``` markdown
+    paragraph
+        code?
+    ```
+
+4.  What is the exact rule for determining when list items get
+    wrapped in `<p>` tags?  Can a list be partially "loose" and partially
+    "tight"?  What should we do with a list like this?
+
+    ``` markdown
+    1. one
+
+    2. two
+    3. three
+    ```
+
+    Or this?
+
+    ``` markdown
+    1.  one
+        - a
+
+        - b
+    2.  two
+    ```
+
+    (There are some relevant comments by John Gruber
+    [here](http://article.gmane.org/gmane.text.markdown.general/2554).)
+
+5.  Can list markers be indented?  Can ordered list markers be right-aligned?
+
+    ``` markdown
+     8. item 1
+     9. item 2
+    10. item 2a
+    ```
+
+6.  Is this one list with a thematic break in its second item,
+    or two lists separated by a thematic break?
+
+    ``` markdown
+    * a
+    * * * * *
+    * b
+    ```
+
+7.  When list markers change from numbers to bullets, do we have
+    two lists or one?  (The Markdown syntax description suggests two,
+    but the perl scripts and many other implementations produce one.)
+
+    ``` markdown
+    1. fee
+    2. fie
+    -  foe
+    -  fum
+    ```
+
+8.  What are the precedence rules for the markers of inline structure?
+    For example, is the following a valid link, or does the code span
+    take precedence ?
+
+    ``` markdown
+    [a backtick (`)](/url) and [another backtick (`)](/url).
+    ```
+
+9.  What are the precedence rules for markers of emphasis and strong
+    emphasis?  For example, how should the following be parsed?
+
+    ``` markdown
+    *foo *bar* baz*
+    ```
+
+10. What are the precedence rules between block-level and inline-level
+    structure?  For example, how should the following be parsed?
+
+    ``` markdown
+    - `a long code span can contain a hyphen like this
+      - and it can screw things up`
+    ```
+
+11. Can list items include section headings?  (`Markdown.pl` does not
+    allow this, but does allow blockquotes to include headings.)
+
+    ``` markdown
+    - # Heading
+    ```
+
+12. Can list items be empty?
+
+    ``` markdown
+    * a
+    *
+    * b
+    ```
+
+13. Can link references be defined inside block quotes or list items?
+
+    ``` markdown
+    > Blockquote [foo].
+    >
+    > [foo]: /url
+    ```
+
+14. If there are multiple definitions for the same reference, which takes
+    precedence?
+
+    ``` markdown
+    [foo]: /url1
+    [foo]: /url2
+
+    [foo][]
+    ```
+
+In the absence of a spec, early implementers consulted `Markdown.pl`
+to resolve these ambiguities.  But `Markdown.pl` was quite buggy, and
+gave manifestly bad results in many cases, so it was not a
+satisfactory replacement for a spec.
+
+Because there is no unambiguous spec, implementations have diverged
+considerably.  As a result, users are often surprised to find that
+a document that renders one way on one system (say, a github wiki)
+renders differently on another (say, converting to docbook using
+pandoc).  To make matters worse, because nothing in Markdown counts
+as a "syntax error," the divergence often isn't discovered right away.
+
+## About this document
+
+This document attempts to specify Markdown syntax unambiguously.
+It contains many examples with side-by-side Markdown and
+HTML.  These are intended to double as conformance tests.  An
+accompanying script `spec_tests.py` can be used to run the tests
+against any Markdown program:
+
+    python test/spec_tests.py --spec spec.txt --program PROGRAM
+
+Since this document describes how Markdown is to be parsed into
+an abstract syntax tree, it would have made sense to use an abstract
+representation of the syntax tree instead of HTML.  But HTML is capable
+of representing the structural distinctions we need to make, and the
+choice of HTML for the tests makes it possible to run the tests against
+an implementation without writing an abstract syntax tree renderer.
+
+This document is generated from a text file, `spec.txt`, written
+in Markdown with a small extension for the side-by-side tests.
+The script `tools/makespec.py` can be used to convert `spec.txt` into
+HTML or CommonMark (which can then be converted into other formats).
+
+In the examples, the `→` character is used to represent tabs.
+
+# Preliminaries
+
+## Characters and lines
+
+Any sequence of [characters] is a valid CommonMark
+document.
+
+A [character](@) is a Unicode code point.  Although some
+code points (for example, combining accents) do not correspond to
+characters in an intuitive sense, all code points count as characters
+for purposes of this spec.
+
+This spec does not specify an encoding; it thinks of lines as composed
+of [characters] rather than bytes.  A conforming parser may be limited
+to a certain encoding.
+
+A [line](@) is a sequence of zero or more [characters]
+other than newline (`U+000A`) or carriage return (`U+000D`),
+followed by a [line ending] or by the end of file.
+
+A [line ending](@) is a newline (`U+000A`), a carriage return
+(`U+000D`) not followed by a newline, or a carriage return and a
+following newline.
+
+A line containing no characters, or a line containing only spaces
+(`U+0020`) or tabs (`U+0009`), is called a [blank line](@).
+
+The following definitions of character classes will be used in this spec:
+
+A [whitespace character](@) is a space
+(`U+0020`), tab (`U+0009`), newline (`U+000A`), line tabulation (`U+000B`),
+form feed (`U+000C`), or carriage return (`U+000D`).
+
+[Whitespace](@) is a sequence of one or more [whitespace
+characters].
+
+A [Unicode whitespace character](@) is
+any code point in the Unicode `Zs` class, or a tab (`U+0009`),
+carriage return (`U+000D`), newline (`U+000A`), or form feed
+(`U+000C`).
+
+[Unicode whitespace](@) is a sequence of one
+or more [Unicode whitespace characters].
+
+A [space](@) is `U+0020`.
+
+A [non-whitespace character](@) is any character
+that is not a [whitespace character].
+
+An [ASCII punctuation character](@)
+is `!`, `"`, `#`, `$`, `%`, `&`, `'`, `(`, `)`,
+`*`, `+`, `,`, `-`, `.`, `/`, `:`, `;`, `<`, `=`, `>`, `?`, `@`,
+`[`, `\`, `]`, `^`, `_`, `` ` ``, `{`, `|`, `}`, or `~`.
+
+A [punctuation character](@) is an [ASCII
+punctuation character] or anything in
+the Unicode classes `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`.
+
+## Tabs
+
+Tabs in lines are not expanded to [spaces].  However,
+in contexts where whitespace helps to define block structure,
+tabs behave as if they were replaced by spaces with a tab stop
+of 4 characters.
+
+Thus, for example, a tab can be used instead of four spaces
+in an indented code block.  (Note, however, that internal
+tabs are passed through as literal tabs, not expanded to
+spaces.)
+
+```````````````````````````````` example
+→foo→baz→→bim
+.
+<pre><code>foo→baz→→bim
+</code></pre>
+````````````````````````````````
+
+```````````````````````````````` example
+  →foo→baz→→bim
+.
+<pre><code>foo→baz→→bim
+</code></pre>
+````````````````````````````````
+
+```````````````````````````````` example
+    a→a
+    ὐ→a
+.
+<pre><code>a→a
+ὐ→a
+</code></pre>
+````````````````````````````````
+
+In the following example, a continuation paragraph of a list
+item is indented with a tab; this has exactly the same effect
+as indentation with four spaces would:
+
+```````````````````````````````` example
+  - foo
+
+→bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+- foo
+
+→→bar
+.
+<ul>
+<li>
+<p>foo</p>
+<pre><code>  bar
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+Normally the `>` that begins a block quote may be followed
+optionally by a space, which is not considered part of the
+content.  In the following case `>` is followed by a tab,
+which is treated as if it were expanded into spaces.
+Since one of theses spaces is considered part of the
+delimiter, `foo` is considered to be indented six spaces
+inside the block quote context, so we get an indented
+code block starting with two spaces.
+
+```````````````````````````````` example
+>→→foo
+.
+<blockquote>
+<pre><code>  foo
+</code></pre>
+</blockquote>
+````````````````````````````````
+
+```````````````````````````````` example
+-→→foo
+.
+<ul>
+<li>
+<pre><code>  foo
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    foo
+→bar
+.
+<pre><code>foo
+bar
+</code></pre>
+````````````````````````````````
+
+```````````````````````````````` example
+ - foo
+   - bar
+→ - baz
+.
+<ul>
+<li>foo
+<ul>
+<li>bar
+<ul>
+<li>baz</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+#→Foo
+.
+<h1>Foo</h1>
+````````````````````````````````
+
+```````````````````````````````` example
+*→*→*→
+.
+<hr />
+````````````````````````````````
+
+
+## Insecure characters
+
+For security reasons, the Unicode character `U+0000` must be replaced
+with the REPLACEMENT CHARACTER (`U+FFFD`).
+
+# Blocks and inlines
+
+We can think of a document as a sequence of
+[blocks](@)---structural elements like paragraphs, block
+quotations, lists, headings, rules, and code blocks.  Some blocks (like
+block quotes and list items) contain other blocks; others (like
+headings and paragraphs) contain [inline](@) content---text,
+links, emphasized text, images, code, and so on.
+
+## Precedence
+
+Indicators of block structure always take precedence over indicators
+of inline structure.  So, for example, the following is a list with
+two items, not a list with one item containing a code span:
+
+```````````````````````````````` example
+- `one
+- two`
+.
+<ul>
+<li>`one</li>
+<li>two`</li>
+</ul>
+````````````````````````````````
+
+
+This means that parsing can proceed in two steps:  first, the block
+structure of the document can be discerned; second, text lines inside
+paragraphs, headings, and other block constructs can be parsed for inline
+structure.  The second step requires information about link reference
+definitions that will be available only at the end of the first
+step.  Note that the first step requires processing lines in sequence,
+but the second can be parallelized, since the inline parsing of
+one block element does not affect the inline parsing of any other.
+
+## Container blocks and leaf blocks
+
+We can divide blocks into two types:
+[container block](@)s,
+which can contain other blocks, and [leaf block](@)s,
+which cannot.
+
+# Leaf blocks
+
+This section describes the different kinds of leaf block that make up a
+Markdown document.
+
+## Thematic breaks
+
+A line consisting of 0-3 spaces of indentation, followed by a sequence
+of three or more matching `-`, `_`, or `*` characters, each followed
+optionally by any number of spaces, forms a
+[thematic break](@).
+
+```````````````````````````````` example
+***
+---
+___
+.
+<hr />
+<hr />
+<hr />
+````````````````````````````````
+
+
+Wrong characters:
+
+```````````````````````````````` example
++++
+.
+<p>+++</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+===
+.
+<p>===</p>
+````````````````````````````````
+
+
+Not enough characters:
+
+```````````````````````````````` example
+--
+**
+__
+.
+<p>--
+**
+__</p>
+````````````````````````````````
+
+
+One to three spaces indent are allowed:
+
+```````````````````````````````` example
+ ***
+  ***
+   ***
+.
+<hr />
+<hr />
+<hr />
+````````````````````````````````
+
+
+Four spaces is too many:
+
+```````````````````````````````` example
+    ***
+.
+<pre><code>***
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+Foo
+    ***
+.
+<p>Foo
+***</p>
+````````````````````````````````
+
+
+More than three characters may be used:
+
+```````````````````````````````` example
+_____________________________________
+.
+<hr />
+````````````````````````````````
+
+
+Spaces are allowed between the characters:
+
+```````````````````````````````` example
+ - - -
+.
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+ **  * ** * ** * **
+.
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+-     -      -      -
+.
+<hr />
+````````````````````````````````
+
+
+Spaces are allowed at the end:
+
+```````````````````````````````` example
+- - - -    
+.
+<hr />
+````````````````````````````````
+
+
+However, no other characters may occur in the line:
+
+```````````````````````````````` example
+_ _ _ _ a
+
+a------
+
+---a---
+.
+<p>_ _ _ _ a</p>
+<p>a------</p>
+<p>---a---</p>
+````````````````````````````````
+
+
+It is required that all of the [non-whitespace characters] be the same.
+So, this is not a thematic break:
+
+```````````````````````````````` example
+ *-*
+.
+<p><em>-</em></p>
+````````````````````````````````
+
+
+Thematic breaks do not need blank lines before or after:
+
+```````````````````````````````` example
+- foo
+***
+- bar
+.
+<ul>
+<li>foo</li>
+</ul>
+<hr />
+<ul>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+Thematic breaks can interrupt a paragraph:
+
+```````````````````````````````` example
+Foo
+***
+bar
+.
+<p>Foo</p>
+<hr />
+<p>bar</p>
+````````````````````````````````
+
+
+If a line of dashes that meets the above conditions for being a
+thematic break could also be interpreted as the underline of a [setext
+heading], the interpretation as a
+[setext heading] takes precedence. Thus, for example,
+this is a setext heading, not a paragraph followed by a thematic break:
+
+```````````````````````````````` example
+Foo
+---
+bar
+.
+<h2>Foo</h2>
+<p>bar</p>
+````````````````````````````````
+
+
+When both a thematic break and a list item are possible
+interpretations of a line, the thematic break takes precedence:
+
+```````````````````````````````` example
+* Foo
+* * *
+* Bar
+.
+<ul>
+<li>Foo</li>
+</ul>
+<hr />
+<ul>
+<li>Bar</li>
+</ul>
+````````````````````````````````
+
+
+If you want a thematic break in a list item, use a different bullet:
+
+```````````````````````````````` example
+- Foo
+- * * *
+.
+<ul>
+<li>Foo</li>
+<li>
+<hr />
+</li>
+</ul>
+````````````````````````````````
+
+
+## ATX headings
+
+An [ATX heading](@)
+consists of a string of characters, parsed as inline content, between an
+opening sequence of 1--6 unescaped `#` characters and an optional
+closing sequence of any number of unescaped `#` characters.
+The opening sequence of `#` characters must be followed by a
+[space] or by the end of line. The optional closing sequence of `#`s must be
+preceded by a [space] and may be followed by spaces only.  The opening
+`#` character may be indented 0-3 spaces.  The raw contents of the
+heading are stripped of leading and trailing spaces before being parsed
+as inline content.  The heading level is equal to the number of `#`
+characters in the opening sequence.
+
+Simple headings:
+
+```````````````````````````````` example
+# foo
+## foo
+### foo
+#### foo
+##### foo
+###### foo
+.
+<h1>foo</h1>
+<h2>foo</h2>
+<h3>foo</h3>
+<h4>foo</h4>
+<h5>foo</h5>
+<h6>foo</h6>
+````````````````````````````````
+
+
+More than six `#` characters is not a heading:
+
+```````````````````````````````` example
+####### foo
+.
+<p>####### foo</p>
+````````````````````````````````
+
+
+At least one space is required between the `#` characters and the
+heading's contents, unless the heading is empty.  Note that many
+implementations currently do not require the space.  However, the
+space was required by the
+[original ATX implementation](http://www.aaronsw.com/2002/atx/atx.py),
+and it helps prevent things like the following from being parsed as
+headings:
+
+```````````````````````````````` example
+#5 bolt
+
+#hashtag
+.
+<p>#5 bolt</p>
+<p>#hashtag</p>
+````````````````````````````````
+
+
+This is not a heading, because the first `#` is escaped:
+
+```````````````````````````````` example
+\## foo
+.
+<p>## foo</p>
+````````````````````````````````
+
+
+Contents are parsed as inlines:
+
+```````````````````````````````` example
+# foo *bar* \*baz\*
+.
+<h1>foo <em>bar</em> *baz*</h1>
+````````````````````````````````
+
+
+Leading and trailing blanks are ignored in parsing inline content:
+
+```````````````````````````````` example
+#                  foo                     
+.
+<h1>foo</h1>
+````````````````````````````````
+
+
+One to three spaces indentation are allowed:
+
+```````````````````````````````` example
+ ### foo
+  ## foo
+   # foo
+.
+<h3>foo</h3>
+<h2>foo</h2>
+<h1>foo</h1>
+````````````````````````````````
+
+
+Four spaces are too much:
+
+```````````````````````````````` example
+    # foo
+.
+<pre><code># foo
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo
+    # bar
+.
+<p>foo
+# bar</p>
+````````````````````````````````
+
+
+A closing sequence of `#` characters is optional:
+
+```````````````````````````````` example
+## foo ##
+  ###   bar    ###
+.
+<h2>foo</h2>
+<h3>bar</h3>
+````````````````````````````````
+
+
+It need not be the same length as the opening sequence:
+
+```````````````````````````````` example
+# foo ##################################
+##### foo ##
+.
+<h1>foo</h1>
+<h5>foo</h5>
+````````````````````````````````
+
+
+Spaces are allowed after the closing sequence:
+
+```````````````````````````````` example
+### foo ###     
+.
+<h3>foo</h3>
+````````````````````````````````
+
+
+A sequence of `#` characters with anything but [spaces] following it
+is not a closing sequence, but counts as part of the contents of the
+heading:
+
+```````````````````````````````` example
+### foo ### b
+.
+<h3>foo ### b</h3>
+````````````````````````````````
+
+
+The closing sequence must be preceded by a space:
+
+```````````````````````````````` example
+# foo#
+.
+<h1>foo#</h1>
+````````````````````````````````
+
+
+Backslash-escaped `#` characters do not count as part
+of the closing sequence:
+
+```````````````````````````````` example
+### foo \###
+## foo #\##
+# foo \#
+.
+<h3>foo ###</h3>
+<h2>foo ###</h2>
+<h1>foo #</h1>
+````````````````````````````````
+
+
+ATX headings need not be separated from surrounding content by blank
+lines, and they can interrupt paragraphs:
+
+```````````````````````````````` example
+****
+## foo
+****
+.
+<hr />
+<h2>foo</h2>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+Foo bar
+# baz
+Bar foo
+.
+<p>Foo bar</p>
+<h1>baz</h1>
+<p>Bar foo</p>
+````````````````````````````````
+
+
+ATX headings can be empty:
+
+```````````````````````````````` example
+## 
+#
+### ###
+.
+<h2></h2>
+<h1></h1>
+<h3></h3>
+````````````````````````````````
+
+
+## Setext headings
+
+A [setext heading](@) consists of one or more
+lines of text, each containing at least one [non-whitespace
+character], with no more than 3 spaces indentation, followed by
+a [setext heading underline].  The lines of text must be such
+that, were they not followed by the setext heading underline,
+they would be interpreted as a paragraph:  they cannot be
+interpretable as a [code fence], [ATX heading][ATX headings],
+[block quote][block quotes], [thematic break][thematic breaks],
+[list item][list items], or [HTML block][HTML blocks].
+
+A [setext heading underline](@) is a sequence of
+`=` characters or a sequence of `-` characters, with no more than 3
+spaces indentation and any number of trailing spaces.  If a line
+containing a single `-` can be interpreted as an
+empty [list items], it should be interpreted this way
+and not as a [setext heading underline].
+
+The heading is a level 1 heading if `=` characters are used in
+the [setext heading underline], and a level 2 heading if `-`
+characters are used.  The contents of the heading are the result
+of parsing the preceding lines of text as CommonMark inline
+content.
+
+In general, a setext heading need not be preceded or followed by a
+blank line.  However, it cannot interrupt a paragraph, so when a
+setext heading comes after a paragraph, a blank line is needed between
+them.
+
+Simple examples:
+
+```````````````````````````````` example
+Foo *bar*
+=========
+
+Foo *bar*
+---------
+.
+<h1>Foo <em>bar</em></h1>
+<h2>Foo <em>bar</em></h2>
+````````````````````````````````
+
+
+The content of the header may span more than one line:
+
+```````````````````````````````` example
+Foo *bar
+baz*
+====
+.
+<h1>Foo <em>bar
+baz</em></h1>
+````````````````````````````````
+
+
+The underlining can be any length:
+
+```````````````````````````````` example
+Foo
+-------------------------
+
+Foo
+=
+.
+<h2>Foo</h2>
+<h1>Foo</h1>
+````````````````````````````````
+
+
+The heading content can be indented up to three spaces, and need
+not line up with the underlining:
+
+```````````````````````````````` example
+   Foo
+---
+
+  Foo
+-----
+
+  Foo
+  ===
+.
+<h2>Foo</h2>
+<h2>Foo</h2>
+<h1>Foo</h1>
+````````````````````````````````
+
+
+Four spaces indent is too much:
+
+```````````````````````````````` example
+    Foo
+    ---
+
+    Foo
+---
+.
+<pre><code>Foo
+---
+
+Foo
+</code></pre>
+<hr />
+````````````````````````````````
+
+
+The setext heading underline can be indented up to three spaces, and
+may have trailing spaces:
+
+```````````````````````````````` example
+Foo
+   ----      
+.
+<h2>Foo</h2>
+````````````````````````````````
+
+
+Four spaces is too much:
+
+```````````````````````````````` example
+Foo
+    ---
+.
+<p>Foo
+---</p>
+````````````````````````````````
+
+
+The setext heading underline cannot contain internal spaces:
+
+```````````````````````````````` example
+Foo
+= =
+
+Foo
+--- -
+.
+<p>Foo
+= =</p>
+<p>Foo</p>
+<hr />
+````````````````````````````````
+
+
+Trailing spaces in the content line do not cause a line break:
+
+```````````````````````````````` example
+Foo  
+-----
+.
+<h2>Foo</h2>
+````````````````````````````````
+
+
+Nor does a backslash at the end:
+
+```````````````````````````````` example
+Foo\
+----
+.
+<h2>Foo\</h2>
+````````````````````````````````
+
+
+Since indicators of block structure take precedence over
+indicators of inline structure, the following are setext headings:
+
+```````````````````````````````` example
+`Foo
+----
+`
+
+<a title="a lot
+---
+of dashes"/>
+.
+<h2>`Foo</h2>
+<p>`</p>
+<h2>&lt;a title=&quot;a lot</h2>
+<p>of dashes&quot;/&gt;</p>
+````````````````````````````````
+
+
+The setext heading underline cannot be a [lazy continuation
+line] in a list item or block quote:
+
+```````````````````````````````` example
+> Foo
+---
+.
+<blockquote>
+<p>Foo</p>
+</blockquote>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+> foo
+bar
+===
+.
+<blockquote>
+<p>foo
+bar
+===</p>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- Foo
+---
+.
+<ul>
+<li>Foo</li>
+</ul>
+<hr />
+````````````````````````````````
+
+
+A blank line is needed between a paragraph and a following
+setext heading, since otherwise the paragraph becomes part
+of the heading's content:
+
+```````````````````````````````` example
+Foo
+Bar
+---
+.
+<h2>Foo
+Bar</h2>
+````````````````````````````````
+
+
+But in general a blank line is not required before or after
+setext headings:
+
+```````````````````````````````` example
+---
+Foo
+---
+Bar
+---
+Baz
+.
+<hr />
+<h2>Foo</h2>
+<h2>Bar</h2>
+<p>Baz</p>
+````````````````````````````````
+
+
+Setext headings cannot be empty:
+
+```````````````````````````````` example
+
+====
+.
+<p>====</p>
+````````````````````````````````
+
+
+Setext heading text lines must not be interpretable as block
+constructs other than paragraphs.  So, the line of dashes
+in these examples gets interpreted as a thematic break:
+
+```````````````````````````````` example
+---
+---
+.
+<hr />
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+- foo
+-----
+.
+<ul>
+<li>foo</li>
+</ul>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+    foo
+---
+.
+<pre><code>foo
+</code></pre>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+> foo
+-----
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+<hr />
+````````````````````````````````
+
+
+If you want a heading with `> foo` as its literal text, you can
+use backslash escapes:
+
+```````````````````````````````` example
+\> foo
+------
+.
+<h2>&gt; foo</h2>
+````````````````````````````````
+
+
+**Compatibility note:**  Most existing Markdown implementations
+do not allow the text of setext headings to span multiple lines.
+But there is no consensus about how to interpret
+
+``` markdown
+Foo
+bar
+---
+baz
+```
+
+One can find four different interpretations:
+
+1. paragraph "Foo", heading "bar", paragraph "baz"
+2. paragraph "Foo bar", thematic break, paragraph "baz"
+3. paragraph "Foo bar --- baz"
+4. heading "Foo bar", paragraph "baz"
+
+We find interpretation 4 most natural, and interpretation 4
+increases the expressive power of CommonMark, by allowing
+multiline headings.  Authors who want interpretation 1 can
+put a blank line after the first paragraph:
+
+```````````````````````````````` example
+Foo
+
+bar
+---
+baz
+.
+<p>Foo</p>
+<h2>bar</h2>
+<p>baz</p>
+````````````````````````````````
+
+
+Authors who want interpretation 2 can put blank lines around
+the thematic break,
+
+```````````````````````````````` example
+Foo
+bar
+
+---
+
+baz
+.
+<p>Foo
+bar</p>
+<hr />
+<p>baz</p>
+````````````````````````````````
+
+
+or use a thematic break that cannot count as a [setext heading
+underline], such as
+
+```````````````````````````````` example
+Foo
+bar
+* * *
+baz
+.
+<p>Foo
+bar</p>
+<hr />
+<p>baz</p>
+````````````````````````````````
+
+
+Authors who want interpretation 3 can use backslash escapes:
+
+```````````````````````````````` example
+Foo
+bar
+\---
+baz
+.
+<p>Foo
+bar
+---
+baz</p>
+````````````````````````````````
+
+
+## Indented code blocks
+
+An [indented code block](@) is composed of one or more
+[indented chunks] separated by blank lines.
+An [indented chunk](@) is a sequence of non-blank lines,
+each indented four or more spaces. The contents of the code block are
+the literal contents of the lines, including trailing
+[line endings], minus four spaces of indentation.
+An indented code block has no [info string].
+
+An indented code block cannot interrupt a paragraph, so there must be
+a blank line between a paragraph and a following indented code block.
+(A blank line is not needed, however, between a code block and a following
+paragraph.)
+
+```````````````````````````````` example
+    a simple
+      indented code block
+.
+<pre><code>a simple
+  indented code block
+</code></pre>
+````````````````````````````````
+
+
+If there is any ambiguity between an interpretation of indentation
+as a code block and as indicating that material belongs to a [list
+item][list items], the list item interpretation takes precedence:
+
+```````````````````````````````` example
+  - foo
+
+    bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1.  foo
+
+    - bar
+.
+<ol>
+<li>
+<p>foo</p>
+<ul>
+<li>bar</li>
+</ul>
+</li>
+</ol>
+````````````````````````````````
+
+
+
+The contents of a code block are literal text, and do not get parsed
+as Markdown:
+
+```````````````````````````````` example
+    <a/>
+    *hi*
+
+    - one
+.
+<pre><code>&lt;a/&gt;
+*hi*
+
+- one
+</code></pre>
+````````````````````````````````
+
+
+Here we have three chunks separated by blank lines:
+
+```````````````````````````````` example
+    chunk1
+
+    chunk2
+  
+ 
+ 
+    chunk3
+.
+<pre><code>chunk1
+
+chunk2
+
+
+
+chunk3
+</code></pre>
+````````````````````````````````
+
+
+Any initial spaces beyond four will be included in the content, even
+in interior blank lines:
+
+```````````````````````````````` example
+    chunk1
+      
+      chunk2
+.
+<pre><code>chunk1
+  
+  chunk2
+</code></pre>
+````````````````````````````````
+
+
+An indented code block cannot interrupt a paragraph.  (This
+allows hanging indents and the like.)
+
+```````````````````````````````` example
+Foo
+    bar
+
+.
+<p>Foo
+bar</p>
+````````````````````````````````
+
+
+However, any non-blank line with fewer than four leading spaces ends
+the code block immediately.  So a paragraph may occur immediately
+after indented code:
+
+```````````````````````````````` example
+    foo
+bar
+.
+<pre><code>foo
+</code></pre>
+<p>bar</p>
+````````````````````````````````
+
+
+And indented code can occur immediately before and after other kinds of
+blocks:
+
+```````````````````````````````` example
+# Heading
+    foo
+Heading
+------
+    foo
+----
+.
+<h1>Heading</h1>
+<pre><code>foo
+</code></pre>
+<h2>Heading</h2>
+<pre><code>foo
+</code></pre>
+<hr />
+````````````````````````````````
+
+
+The first line can be indented more than four spaces:
+
+```````````````````````````````` example
+        foo
+    bar
+.
+<pre><code>    foo
+bar
+</code></pre>
+````````````````````````````````
+
+
+Blank lines preceding or following an indented code block
+are not included in it:
+
+```````````````````````````````` example
+
+    
+    foo
+    
+
+.
+<pre><code>foo
+</code></pre>
+````````````````````````````````
+
+
+Trailing spaces are included in the code block's content:
+
+```````````````````````````````` example
+    foo  
+.
+<pre><code>foo  
+</code></pre>
+````````````````````````````````
+
+
+
+## Fenced code blocks
+
+A [code fence](@) is a sequence
+of at least three consecutive backtick characters (`` ` ``) or
+tildes (`~`).  (Tildes and backticks cannot be mixed.)
+A [fenced code block](@)
+begins with a code fence, indented no more than three spaces.
+
+The line with the opening code fence may optionally contain some text
+following the code fence; this is trimmed of leading and trailing
+spaces and called the [info string](@).
+The [info string] may not contain any backtick
+characters.  (The reason for this restriction is that otherwise
+some inline code would be incorrectly interpreted as the
+beginning of a fenced code block.)
+
+The content of the code block consists of all subsequent lines, until
+a closing [code fence] of the same type as the code block
+began with (backticks or tildes), and with at least as many backticks
+or tildes as the opening code fence.  If the leading code fence is
+indented N spaces, then up to N spaces of indentation are removed from
+each line of the content (if present).  (If a content line is not
+indented, it is preserved unchanged.  If it is indented less than N
+spaces, all of the indentation is removed.)
+
+The closing code fence may be indented up to three spaces, and may be
+followed only by spaces, which are ignored.  If the end of the
+containing block (or document) is reached and no closing code fence
+has been found, the code block contains all of the lines after the
+opening code fence until the end of the containing block (or
+document).  (An alternative spec would require backtracking in the
+event that a closing code fence is not found.  But this makes parsing
+much less efficient, and there seems to be no real down side to the
+behavior described here.)
+
+A fenced code block may interrupt a paragraph, and does not require
+a blank line either before or after.
+
+The content of a code fence is treated as literal text, not parsed
+as inlines.  The first word of the [info string] is typically used to
+specify the language of the code sample, and rendered in the `class`
+attribute of the `code` tag.  However, this spec does not mandate any
+particular treatment of the [info string].
+
+Here is a simple example with backticks:
+
+```````````````````````````````` example
+```
+<
+ >
+```
+.
+<pre><code>&lt;
+ &gt;
+</code></pre>
+````````````````````````````````
+
+
+With tildes:
+
+```````````````````````````````` example
+~~~
+<
+ >
+~~~
+.
+<pre><code>&lt;
+ &gt;
+</code></pre>
+````````````````````````````````
+
+
+The closing code fence must use the same character as the opening
+fence:
+
+```````````````````````````````` example
+```
+aaa
+~~~
+```
+.
+<pre><code>aaa
+~~~
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~
+aaa
+```
+~~~
+.
+<pre><code>aaa
+```
+</code></pre>
+````````````````````````````````
+
+
+The closing code fence must be at least as long as the opening fence:
+
+```````````````````````````````` example
+````
+aaa
+```
+``````
+.
+<pre><code>aaa
+```
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~~
+aaa
+~~~
+~~~~
+.
+<pre><code>aaa
+~~~
+</code></pre>
+````````````````````````````````
+
+
+Unclosed code blocks are closed by the end of the document
+(or the enclosing [block quote][block quotes] or [list item][list items]):
+
+```````````````````````````````` example
+```
+.
+<pre><code></code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+`````
+
+```
+aaa
+.
+<pre><code>
+```
+aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> ```
+> aaa
+
+bbb
+.
+<blockquote>
+<pre><code>aaa
+</code></pre>
+</blockquote>
+<p>bbb</p>
+````````````````````````````````
+
+
+A code block can have all empty lines as its content:
+
+```````````````````````````````` example
+```
+
+  
+```
+.
+<pre><code>
+  
+</code></pre>
+````````````````````````````````
+
+
+A code block can be empty:
+
+```````````````````````````````` example
+```
+```
+.
+<pre><code></code></pre>
+````````````````````````````````
+
+
+Fences can be indented.  If the opening fence is indented,
+content lines will have equivalent opening indentation removed,
+if present:
+
+```````````````````````````````` example
+ ```
+ aaa
+aaa
+```
+.
+<pre><code>aaa
+aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+  ```
+aaa
+  aaa
+aaa
+  ```
+.
+<pre><code>aaa
+aaa
+aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+   ```
+   aaa
+    aaa
+  aaa
+   ```
+.
+<pre><code>aaa
+ aaa
+aaa
+</code></pre>
+````````````````````````````````
+
+
+Four spaces indentation produces an indented code block:
+
+```````````````````````````````` example
+    ```
+    aaa
+    ```
+.
+<pre><code>```
+aaa
+```
+</code></pre>
+````````````````````````````````
+
+
+Closing fences may be indented by 0-3 spaces, and their indentation
+need not match that of the opening fence:
+
+```````````````````````````````` example
+```
+aaa
+  ```
+.
+<pre><code>aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+   ```
+aaa
+  ```
+.
+<pre><code>aaa
+</code></pre>
+````````````````````````````````
+
+
+This is not a closing fence, because it is indented 4 spaces:
+
+```````````````````````````````` example
+```
+aaa
+    ```
+.
+<pre><code>aaa
+    ```
+</code></pre>
+````````````````````````````````
+
+
+
+Code fences (opening and closing) cannot contain internal spaces:
+
+```````````````````````````````` example
+``` ```
+aaa
+.
+<p><code></code>
+aaa</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~~~~
+aaa
+~~~ ~~
+.
+<pre><code>aaa
+~~~ ~~
+</code></pre>
+````````````````````````````````
+
+
+Fenced code blocks can interrupt paragraphs, and can be followed
+directly by paragraphs, without a blank line between:
+
+```````````````````````````````` example
+foo
+```
+bar
+```
+baz
+.
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+<p>baz</p>
+````````````````````````````````
+
+
+Other blocks can also occur before and after fenced code blocks
+without an intervening blank line:
+
+```````````````````````````````` example
+foo
+---
+~~~
+bar
+~~~
+# baz
+.
+<h2>foo</h2>
+<pre><code>bar
+</code></pre>
+<h1>baz</h1>
+````````````````````````````````
+
+
+An [info string] can be provided after the opening code fence.
+Opening and closing spaces will be stripped, and the first word, prefixed
+with `language-`, is used as the value for the `class` attribute of the
+`code` element within the enclosing `pre` element.
+
+```````````````````````````````` example
+```ruby
+def foo(x)
+  return 3
+end
+```
+.
+<pre><code class="language-ruby">def foo(x)
+  return 3
+end
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~~    ruby startline=3 $%@#$
+def foo(x)
+  return 3
+end
+~~~~~~~
+.
+<pre><code class="language-ruby">def foo(x)
+  return 3
+end
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+````;
+````
+.
+<pre><code class="language-;"></code></pre>
+````````````````````````````````
+
+
+[Info strings] for backtick code blocks cannot contain backticks:
+
+```````````````````````````````` example
+``` aa ```
+foo
+.
+<p><code>aa</code>
+foo</p>
+````````````````````````````````
+
+
+Closing code fences cannot have [info strings]:
+
+```````````````````````````````` example
+```
+``` aaa
+```
+.
+<pre><code>``` aaa
+</code></pre>
+````````````````````````````````
+
+
+
+## HTML blocks
+
+An [HTML block](@) is a group of lines that is treated
+as raw HTML (and will not be escaped in HTML output).
+
+There are seven kinds of [HTML block], which can be defined
+by their start and end conditions.  The block begins with a line that
+meets a [start condition](@) (after up to three spaces
+optional indentation).  It ends with the first subsequent line that
+meets a matching [end condition](@), or the last line of
+the document or other [container block]), if no line is encountered that meets the
+[end condition].  If the first line meets both the [start condition]
+and the [end condition], the block will contain just that line.
+
+1.  **Start condition:**  line begins with the string `<script`,
+`<pre`, or `<style` (case-insensitive), followed by whitespace,
+the string `>`, or the end of the line.\
+**End condition:**  line contains an end tag
+`</script>`, `</pre>`, or `</style>` (case-insensitive; it
+need not match the start tag).
+
+2.  **Start condition:** line begins with the string `<!--`.\
+**End condition:**  line contains the string `-->`.
+
+3.  **Start condition:** line begins with the string `<?`.\
+**End condition:** line contains the string `?>`.
+
+4.  **Start condition:** line begins with the string `<!`
+followed by an uppercase ASCII letter.\
+**End condition:** line contains the character `>`.
+
+5.  **Start condition:**  line begins with the string
+`<![CDATA[`.\
+**End condition:** line contains the string `]]>`.
+
+6.  **Start condition:** line begins the string `<` or `</`
+followed by one of the strings (case-insensitive) `address`,
+`article`, `aside`, `base`, `basefont`, `blockquote`, `body`,
+`caption`, `center`, `col`, `colgroup`, `dd`, `details`, `dialog`,
+`dir`, `div`, `dl`, `dt`, `fieldset`, `figcaption`, `figure`,
+`footer`, `form`, `frame`, `frameset`,
+`h1`, `h2`, `h3`, `h4`, `h5`, `h6`, `head`, `header`, `hr`,
+`html`, `iframe`, `legend`, `li`, `link`, `main`, `menu`, `menuitem`,
+`meta`, `nav`, `noframes`, `ol`, `optgroup`, `option`, `p`, `param`,
+`section`, `source`, `summary`, `table`, `tbody`, `td`,
+`tfoot`, `th`, `thead`, `title`, `tr`, `track`, `ul`, followed
+by [whitespace], the end of the line, the string `>`, or
+the string `/>`.\
+**End condition:** line is followed by a [blank line].
+
+7.  **Start condition:**  line begins with a complete [open tag]
+or [closing tag] (with any [tag name] other than `script`,
+`style`, or `pre`) followed only by [whitespace]
+or the end of the line.\
+**End condition:** line is followed by a [blank line].
+
+All types of [HTML blocks] except type 7 may interrupt
+a paragraph.  Blocks of type 7 may not interrupt a paragraph.
+(This restriction is intended to prevent unwanted interpretation
+of long tags inside a wrapped paragraph as starting HTML blocks.)
+
+Some simple examples follow.  Here are some basic HTML blocks
+of type 6:
+
+```````````````````````````````` example
+<table>
+  <tr>
+    <td>
+           hi
+    </td>
+  </tr>
+</table>
+
+okay.
+.
+<table>
+  <tr>
+    <td>
+           hi
+    </td>
+  </tr>
+</table>
+<p>okay.</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+ <div>
+  *hello*
+         <foo><a>
+.
+ <div>
+  *hello*
+         <foo><a>
+````````````````````````````````
+
+
+A block can also start with a closing tag:
+
+```````````````````````````````` example
+</div>
+*foo*
+.
+</div>
+*foo*
+````````````````````````````````
+
+
+Here we have two HTML blocks with a Markdown paragraph between them:
+
+```````````````````````````````` example
+<DIV CLASS="foo">
+
+*Markdown*
+
+</DIV>
+.
+<DIV CLASS="foo">
+<p><em>Markdown</em></p>
+</DIV>
+````````````````````````````````
+
+
+The tag on the first line can be partial, as long
+as it is split where there would be whitespace:
+
+```````````````````````````````` example
+<div id="foo"
+  class="bar">
+</div>
+.
+<div id="foo"
+  class="bar">
+</div>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<div id="foo" class="bar
+  baz">
+</div>
+.
+<div id="foo" class="bar
+  baz">
+</div>
+````````````````````````````````
+
+
+An open tag need not be closed:
+```````````````````````````````` example
+<div>
+*foo*
+
+*bar*
+.
+<div>
+*foo*
+<p><em>bar</em></p>
+````````````````````````````````
+
+
+
+A partial tag need not even be completed (garbage
+in, garbage out):
+
+```````````````````````````````` example
+<div id="foo"
+*hi*
+.
+<div id="foo"
+*hi*
+````````````````````````````````
+
+
+```````````````````````````````` example
+<div class
+foo
+.
+<div class
+foo
+````````````````````````````````
+
+
+The initial tag doesn't even need to be a valid
+tag, as long as it starts like one:
+
+```````````````````````````````` example
+<div *???-&&&-<---
+*foo*
+.
+<div *???-&&&-<---
+*foo*
+````````````````````````````````
+
+
+In type 6 blocks, the initial tag need not be on a line by
+itself:
+
+```````````````````````````````` example
+<div><a href="bar">*foo*</a></div>
+.
+<div><a href="bar">*foo*</a></div>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<table><tr><td>
+foo
+</td></tr></table>
+.
+<table><tr><td>
+foo
+</td></tr></table>
+````````````````````````````````
+
+
+Everything until the next blank line or end of document
+gets included in the HTML block.  So, in the following
+example, what looks like a Markdown code block
+is actually part of the HTML block, which continues until a blank
+line or the end of the document is reached:
+
+```````````````````````````````` example
+<div></div>
+``` c
+int x = 33;
+```
+.
+<div></div>
+``` c
+int x = 33;
+```
+````````````````````````````````
+
+
+To start an [HTML block] with a tag that is *not* in the
+list of block-level tags in (6), you must put the tag by
+itself on the first line (and it must be complete):
+
+```````````````````````````````` example
+<a href="foo">
+*bar*
+</a>
+.
+<a href="foo">
+*bar*
+</a>
+````````````````````````````````
+
+
+In type 7 blocks, the [tag name] can be anything:
+
+```````````````````````````````` example
+<Warning>
+*bar*
+</Warning>
+.
+<Warning>
+*bar*
+</Warning>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<i class="foo">
+*bar*
+</i>
+.
+<i class="foo">
+*bar*
+</i>
+````````````````````````````````
+
+
+```````````````````````````````` example
+</ins>
+*bar*
+.
+</ins>
+*bar*
+````````````````````````````````
+
+
+These rules are designed to allow us to work with tags that
+can function as either block-level or inline-level tags.
+The `<del>` tag is a nice example.  We can surround content with
+`<del>` tags in three different ways.  In this case, we get a raw
+HTML block, because the `<del>` tag is on a line by itself:
+
+```````````````````````````````` example
+<del>
+*foo*
+</del>
+.
+<del>
+*foo*
+</del>
+````````````````````````````````
+
+
+In this case, we get a raw HTML block that just includes
+the `<del>` tag (because it ends with the following blank
+line).  So the contents get interpreted as CommonMark:
+
+```````````````````````````````` example
+<del>
+
+*foo*
+
+</del>
+.
+<del>
+<p><em>foo</em></p>
+</del>
+````````````````````````````````
+
+
+Finally, in this case, the `<del>` tags are interpreted
+as [raw HTML] *inside* the CommonMark paragraph.  (Because
+the tag is not on a line by itself, we get inline HTML
+rather than an [HTML block].)
+
+```````````````````````````````` example
+<del>*foo*</del>
+.
+<p><del><em>foo</em></del></p>
+````````````````````````````````
+
+
+HTML tags designed to contain literal content
+(`script`, `style`, `pre`), comments, processing instructions,
+and declarations are treated somewhat differently.
+Instead of ending at the first blank line, these blocks
+end at the first line containing a corresponding end tag.
+As a result, these blocks can contain blank lines:
+
+A pre tag (type 1):
+
+```````````````````````````````` example
+<pre language="haskell"><code>
+import Text.HTML.TagSoup
+
+main :: IO ()
+main = print $ parseTags tags
+</code></pre>
+okay
+.
+<pre language="haskell"><code>
+import Text.HTML.TagSoup
+
+main :: IO ()
+main = print $ parseTags tags
+</code></pre>
+<p>okay</p>
+````````````````````````````````
+
+
+A script tag (type 1):
+
+```````````````````````````````` example
+<script type="text/javascript">
+// JavaScript example
+
+document.getElementById("demo").innerHTML = "Hello JavaScript!";
+</script>
+okay
+.
+<script type="text/javascript">
+// JavaScript example
+
+document.getElementById("demo").innerHTML = "Hello JavaScript!";
+</script>
+<p>okay</p>
+````````````````````````````````
+
+
+A style tag (type 1):
+
+```````````````````````````````` example
+<style
+  type="text/css">
+h1 {color:red;}
+
+p {color:blue;}
+</style>
+okay
+.
+<style
+  type="text/css">
+h1 {color:red;}
+
+p {color:blue;}
+</style>
+<p>okay</p>
+````````````````````````````````
+
+
+If there is no matching end tag, the block will end at the
+end of the document (or the enclosing [block quote][block quotes]
+or [list item][list items]):
+
+```````````````````````````````` example
+<style
+  type="text/css">
+
+foo
+.
+<style
+  type="text/css">
+
+foo
+````````````````````````````````
+
+
+```````````````````````````````` example
+> <div>
+> foo
+
+bar
+.
+<blockquote>
+<div>
+foo
+</blockquote>
+<p>bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- <div>
+- foo
+.
+<ul>
+<li>
+<div>
+</li>
+<li>foo</li>
+</ul>
+````````````````````````````````
+
+
+The end tag can occur on the same line as the start tag:
+
+```````````````````````````````` example
+<style>p{color:red;}</style>
+*foo*
+.
+<style>p{color:red;}</style>
+<p><em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<!-- foo -->*bar*
+*baz*
+.
+<!-- foo -->*bar*
+<p><em>baz</em></p>
+````````````````````````````````
+
+
+Note that anything on the last line after the
+end tag will be included in the [HTML block]:
+
+```````````````````````````````` example
+<script>
+foo
+</script>1. *bar*
+.
+<script>
+foo
+</script>1. *bar*
+````````````````````````````````
+
+
+A comment (type 2):
+
+```````````````````````````````` example
+<!-- Foo
+
+bar
+   baz -->
+okay
+.
+<!-- Foo
+
+bar
+   baz -->
+<p>okay</p>
+````````````````````````````````
+
+
+
+A processing instruction (type 3):
+
+```````````````````````````````` example
+<?php
+
+  echo '>';
+
+?>
+okay
+.
+<?php
+
+  echo '>';
+
+?>
+<p>okay</p>
+````````````````````````````````
+
+
+A declaration (type 4):
+
+```````````````````````````````` example
+<!DOCTYPE html>
+.
+<!DOCTYPE html>
+````````````````````````````````
+
+
+CDATA (type 5):
+
+```````````````````````````````` example
+<![CDATA[
+function matchwo(a,b)
+{
+  if (a < b && a < 0) then {
+    return 1;
+
+  } else {
+
+    return 0;
+  }
+}
+]]>
+okay
+.
+<![CDATA[
+function matchwo(a,b)
+{
+  if (a < b && a < 0) then {
+    return 1;
+
+  } else {
+
+    return 0;
+  }
+}
+]]>
+<p>okay</p>
+````````````````````````````````
+
+
+The opening tag can be indented 1-3 spaces, but not 4:
+
+```````````````````````````````` example
+  <!-- foo -->
+
+    <!-- foo -->
+.
+  <!-- foo -->
+<pre><code>&lt;!-- foo --&gt;
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+  <div>
+
+    <div>
+.
+  <div>
+<pre><code>&lt;div&gt;
+</code></pre>
+````````````````````````````````
+
+
+An HTML block of types 1--6 can interrupt a paragraph, and need not be
+preceded by a blank line.
+
+```````````````````````````````` example
+Foo
+<div>
+bar
+</div>
+.
+<p>Foo</p>
+<div>
+bar
+</div>
+````````````````````````````````
+
+
+However, a following blank line is needed, except at the end of
+a document, and except for blocks of types 1--5, above:
+
+```````````````````````````````` example
+<div>
+bar
+</div>
+*foo*
+.
+<div>
+bar
+</div>
+*foo*
+````````````````````````````````
+
+
+HTML blocks of type 7 cannot interrupt a paragraph:
+
+```````````````````````````````` example
+Foo
+<a href="bar">
+baz
+.
+<p>Foo
+<a href="bar">
+baz</p>
+````````````````````````````````
+
+
+This rule differs from John Gruber's original Markdown syntax
+specification, which says:
+
+> The only restrictions are that block-level HTML elements —
+> e.g. `<div>`, `<table>`, `<pre>`, `<p>`, etc. — must be separated from
+> surrounding content by blank lines, and the start and end tags of the
+> block should not be indented with tabs or spaces.
+
+In some ways Gruber's rule is more restrictive than the one given
+here:
+
+- It requires that an HTML block be preceded by a blank line.
+- It does not allow the start tag to be indented.
+- It requires a matching end tag, which it also does not allow to
+  be indented.
+
+Most Markdown implementations (including some of Gruber's own) do not
+respect all of these restrictions.
+
+There is one respect, however, in which Gruber's rule is more liberal
+than the one given here, since it allows blank lines to occur inside
+an HTML block.  There are two reasons for disallowing them here.
+First, it removes the need to parse balanced tags, which is
+expensive and can require backtracking from the end of the document
+if no matching end tag is found. Second, it provides a very simple
+and flexible way of including Markdown content inside HTML tags:
+simply separate the Markdown from the HTML using blank lines:
+
+Compare:
+
+```````````````````````````````` example
+<div>
+
+*Emphasized* text.
+
+</div>
+.
+<div>
+<p><em>Emphasized</em> text.</p>
+</div>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<div>
+*Emphasized* text.
+</div>
+.
+<div>
+*Emphasized* text.
+</div>
+````````````````````````````````
+
+
+Some Markdown implementations have adopted a convention of
+interpreting content inside tags as text if the open tag has
+the attribute `markdown=1`.  The rule given above seems a simpler and
+more elegant way of achieving the same expressive power, which is also
+much simpler to parse.
+
+The main potential drawback is that one can no longer paste HTML
+blocks into Markdown documents with 100% reliability.  However,
+*in most cases* this will work fine, because the blank lines in
+HTML are usually followed by HTML block tags.  For example:
+
+```````````````````````````````` example
+<table>
+
+<tr>
+
+<td>
+Hi
+</td>
+
+</tr>
+
+</table>
+.
+<table>
+<tr>
+<td>
+Hi
+</td>
+</tr>
+</table>
+````````````````````````````````
+
+
+There are problems, however, if the inner tags are indented
+*and* separated by spaces, as then they will be interpreted as
+an indented code block:
+
+```````````````````````````````` example
+<table>
+
+  <tr>
+
+    <td>
+      Hi
+    </td>
+
+  </tr>
+
+</table>
+.
+<table>
+  <tr>
+<pre><code>&lt;td&gt;
+  Hi
+&lt;/td&gt;
+</code></pre>
+  </tr>
+</table>
+````````````````````````````````
+
+
+Fortunately, blank lines are usually not necessary and can be
+deleted.  The exception is inside `<pre>` tags, but as described
+above, raw HTML blocks starting with `<pre>` *can* contain blank
+lines.
+
+## Link reference definitions
+
+A [link reference definition](@)
+consists of a [link label], indented up to three spaces, followed
+by a colon (`:`), optional [whitespace] (including up to one
+[line ending]), a [link destination],
+optional [whitespace] (including up to one
+[line ending]), and an optional [link
+title], which if it is present must be separated
+from the [link destination] by [whitespace].
+No further [non-whitespace characters] may occur on the line.
+
+A [link reference definition]
+does not correspond to a structural element of a document.  Instead, it
+defines a label which can be used in [reference links]
+and reference-style [images] elsewhere in the document.  [Link
+reference definitions] can come either before or after the links that use
+them.
+
+```````````````````````````````` example
+[foo]: /url "title"
+
+[foo]
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+   [foo]: 
+      /url  
+           'the title'  
+
+[foo]
+.
+<p><a href="/url" title="the title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[Foo*bar\]]:my_(url) 'title (with parens)'
+
+[Foo*bar\]]
+.
+<p><a href="my_(url)" title="title (with parens)">Foo*bar]</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[Foo bar]:
+<my%20url>
+'title'
+
+[Foo bar]
+.
+<p><a href="my%20url" title="title">Foo bar</a></p>
+````````````````````````````````
+
+
+The title may extend over multiple lines:
+
+```````````````````````````````` example
+[foo]: /url '
+title
+line1
+line2
+'
+
+[foo]
+.
+<p><a href="/url" title="
+title
+line1
+line2
+">foo</a></p>
+````````````````````````````````
+
+
+However, it may not contain a [blank line]:
+
+```````````````````````````````` example
+[foo]: /url 'title
+
+with blank line'
+
+[foo]
+.
+<p>[foo]: /url 'title</p>
+<p>with blank line'</p>
+<p>[foo]</p>
+````````````````````````````````
+
+
+The title may be omitted:
+
+```````````````````````````````` example
+[foo]:
+/url
+
+[foo]
+.
+<p><a href="/url">foo</a></p>
+````````````````````````````````
+
+
+The link destination may not be omitted:
+
+```````````````````````````````` example
+[foo]:
+
+[foo]
+.
+<p>[foo]:</p>
+<p>[foo]</p>
+````````````````````````````````
+
+
+Both title and destination can contain backslash escapes
+and literal backslashes:
+
+```````````````````````````````` example
+[foo]: /url\bar\*baz "foo\"bar\baz"
+
+[foo]
+.
+<p><a href="/url%5Cbar*baz" title="foo&quot;bar\baz">foo</a></p>
+````````````````````````````````
+
+
+A link can come before its corresponding definition:
+
+```````````````````````````````` example
+[foo]
+
+[foo]: url
+.
+<p><a href="url">foo</a></p>
+````````````````````````````````
+
+
+If there are several matching definitions, the first one takes
+precedence:
+
+```````````````````````````````` example
+[foo]
+
+[foo]: first
+[foo]: second
+.
+<p><a href="first">foo</a></p>
+````````````````````````````````
+
+
+As noted in the section on [Links], matching of labels is
+case-insensitive (see [matches]).
+
+```````````````````````````````` example
+[FOO]: /url
+
+[Foo]
+.
+<p><a href="/url">Foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[ΑΓΩ]: /φου
+
+[αγω]
+.
+<p><a href="/%CF%86%CE%BF%CF%85">αγω</a></p>
+````````````````````````````````
+
+
+Here is a link reference definition with no corresponding link.
+It contributes nothing to the document.
+
+```````````````````````````````` example
+[foo]: /url
+.
+````````````````````````````````
+
+
+Here is another one:
+
+```````````````````````````````` example
+[
+foo
+]: /url
+bar
+.
+<p>bar</p>
+````````````````````````````````
+
+
+This is not a link reference definition, because there are
+[non-whitespace characters] after the title:
+
+```````````````````````````````` example
+[foo]: /url "title" ok
+.
+<p>[foo]: /url &quot;title&quot; ok</p>
+````````````````````````````````
+
+
+This is a link reference definition, but it has no title:
+
+```````````````````````````````` example
+[foo]: /url
+"title" ok
+.
+<p>&quot;title&quot; ok</p>
+````````````````````````````````
+
+
+This is not a link reference definition, because it is indented
+four spaces:
+
+```````````````````````````````` example
+    [foo]: /url "title"
+
+[foo]
+.
+<pre><code>[foo]: /url &quot;title&quot;
+</code></pre>
+<p>[foo]</p>
+````````````````````````````````
+
+
+This is not a link reference definition, because it occurs inside
+a code block:
+
+```````````````````````````````` example
+```
+[foo]: /url
+```
+
+[foo]
+.
+<pre><code>[foo]: /url
+</code></pre>
+<p>[foo]</p>
+````````````````````````````````
+
+
+A [link reference definition] cannot interrupt a paragraph.
+
+```````````````````````````````` example
+Foo
+[bar]: /baz
+
+[bar]
+.
+<p>Foo
+[bar]: /baz</p>
+<p>[bar]</p>
+````````````````````````````````
+
+
+However, it can directly follow other block elements, such as headings
+and thematic breaks, and it need not be followed by a blank line.
+
+```````````````````````````````` example
+# [Foo]
+[foo]: /url
+> bar
+.
+<h1><a href="/url">Foo</a></h1>
+<blockquote>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+Several [link reference definitions]
+can occur one after another, without intervening blank lines.
+
+```````````````````````````````` example
+[foo]: /foo-url "foo"
+[bar]: /bar-url
+  "bar"
+[baz]: /baz-url
+
+[foo],
+[bar],
+[baz]
+.
+<p><a href="/foo-url" title="foo">foo</a>,
+<a href="/bar-url" title="bar">bar</a>,
+<a href="/baz-url">baz</a></p>
+````````````````````````````````
+
+
+[Link reference definitions] can occur
+inside block containers, like lists and block quotations.  They
+affect the entire document, not just the container in which they
+are defined:
+
+```````````````````````````````` example
+[foo]
+
+> [foo]: /url
+.
+<p><a href="/url">foo</a></p>
+<blockquote>
+</blockquote>
+````````````````````````````````
+
+
+
+## Paragraphs
+
+A sequence of non-blank lines that cannot be interpreted as other
+kinds of blocks forms a [paragraph](@).
+The contents of the paragraph are the result of parsing the
+paragraph's raw content as inlines.  The paragraph's raw content
+is formed by concatenating the lines and removing initial and final
+[whitespace].
+
+A simple example with two paragraphs:
+
+```````````````````````````````` example
+aaa
+
+bbb
+.
+<p>aaa</p>
+<p>bbb</p>
+````````````````````````````````
+
+
+Paragraphs can contain multiple lines, but no blank lines:
+
+```````````````````````````````` example
+aaa
+bbb
+
+ccc
+ddd
+.
+<p>aaa
+bbb</p>
+<p>ccc
+ddd</p>
+````````````````````````````````
+
+
+Multiple blank lines between paragraph have no effect:
+
+```````````````````````````````` example
+aaa
+
+
+bbb
+.
+<p>aaa</p>
+<p>bbb</p>
+````````````````````````````````
+
+
+Leading spaces are skipped:
+
+```````````````````````````````` example
+  aaa
+ bbb
+.
+<p>aaa
+bbb</p>
+````````````````````````````````
+
+
+Lines after the first may be indented any amount, since indented
+code blocks cannot interrupt paragraphs.
+
+```````````````````````````````` example
+aaa
+             bbb
+                                       ccc
+.
+<p>aaa
+bbb
+ccc</p>
+````````````````````````````````
+
+
+However, the first line may be indented at most three spaces,
+or an indented code block will be triggered:
+
+```````````````````````````````` example
+   aaa
+bbb
+.
+<p>aaa
+bbb</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    aaa
+bbb
+.
+<pre><code>aaa
+</code></pre>
+<p>bbb</p>
+````````````````````````````````
+
+
+Final spaces are stripped before inline parsing, so a paragraph
+that ends with two or more spaces will not end with a [hard line
+break]:
+
+```````````````````````````````` example
+aaa     
+bbb     
+.
+<p>aaa<br />
+bbb</p>
+````````````````````````````````
+
+
+## Blank lines
+
+[Blank lines] between block-level elements are ignored,
+except for the role they play in determining whether a [list]
+is [tight] or [loose].
+
+Blank lines at the beginning and end of the document are also ignored.
+
+```````````````````````````````` example
+  
+
+aaa
+  
+
+# aaa
+
+  
+.
+<p>aaa</p>
+<h1>aaa</h1>
+````````````````````````````````
+
+
+
+# Container blocks
+
+A [container block] is a block that has other
+blocks as its contents.  There are two basic kinds of container blocks:
+[block quotes] and [list items].
+[Lists] are meta-containers for [list items].
+
+We define the syntax for container blocks recursively.  The general
+form of the definition is:
+
+> If X is a sequence of blocks, then the result of
+> transforming X in such-and-such a way is a container of type Y
+> with these blocks as its content.
+
+So, we explain what counts as a block quote or list item by explaining
+how these can be *generated* from their contents. This should suffice
+to define the syntax, although it does not give a recipe for *parsing*
+these constructions.  (A recipe is provided below in the section entitled
+[A parsing strategy](#appendix-a-parsing-strategy).)
+
+## Block quotes
+
+A [block quote marker](@)
+consists of 0-3 spaces of initial indent, plus (a) the character `>` together
+with a following space, or (b) a single character `>` not followed by a space.
+
+The following rules define [block quotes]:
+
+1.  **Basic case.**  If a string of lines *Ls* constitute a sequence
+    of blocks *Bs*, then the result of prepending a [block quote
+    marker] to the beginning of each line in *Ls*
+    is a [block quote](#block-quotes) containing *Bs*.
+
+2.  **Laziness.**  If a string of lines *Ls* constitute a [block
+    quote](#block-quotes) with contents *Bs*, then the result of deleting
+    the initial [block quote marker] from one or
+    more lines in which the next [non-whitespace character] after the [block
+    quote marker] is [paragraph continuation
+    text] is a block quote with *Bs* as its content.
+    [Paragraph continuation text](@) is text
+    that will be parsed as part of the content of a paragraph, but does
+    not occur at the beginning of the paragraph.
+
+3.  **Consecutiveness.**  A document cannot contain two [block
+    quotes] in a row unless there is a [blank line] between them.
+
+Nothing else counts as a [block quote](#block-quotes).
+
+Here is a simple example:
+
+```````````````````````````````` example
+> # Foo
+> bar
+> baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+The spaces after the `>` characters can be omitted:
+
+```````````````````````````````` example
+># Foo
+>bar
+> baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+The `>` characters can be indented 1-3 spaces:
+
+```````````````````````````````` example
+   > # Foo
+   > bar
+ > baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+Four spaces gives us a code block:
+
+```````````````````````````````` example
+    > # Foo
+    > bar
+    > baz
+.
+<pre><code>&gt; # Foo
+&gt; bar
+&gt; baz
+</code></pre>
+````````````````````````````````
+
+
+The Laziness clause allows us to omit the `>` before
+[paragraph continuation text]:
+
+```````````````````````````````` example
+> # Foo
+> bar
+baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+A block quote can contain some lazy and some non-lazy
+continuation lines:
+
+```````````````````````````````` example
+> bar
+baz
+> foo
+.
+<blockquote>
+<p>bar
+baz
+foo</p>
+</blockquote>
+````````````````````````````````
+
+
+Laziness only applies to lines that would have been continuations of
+paragraphs had they been prepended with [block quote markers].
+For example, the `> ` cannot be omitted in the second line of
+
+``` markdown
+> foo
+> ---
+```
+
+without changing the meaning:
+
+```````````````````````````````` example
+> foo
+---
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+<hr />
+````````````````````````````````
+
+
+Similarly, if we omit the `> ` in the second line of
+
+``` markdown
+> - foo
+> - bar
+```
+
+then the block quote ends after the first line:
+
+```````````````````````````````` example
+> - foo
+- bar
+.
+<blockquote>
+<ul>
+<li>foo</li>
+</ul>
+</blockquote>
+<ul>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+For the same reason, we can't omit the `> ` in front of
+subsequent lines of an indented or fenced code block:
+
+```````````````````````````````` example
+>     foo
+    bar
+.
+<blockquote>
+<pre><code>foo
+</code></pre>
+</blockquote>
+<pre><code>bar
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> ```
+foo
+```
+.
+<blockquote>
+<pre><code></code></pre>
+</blockquote>
+<p>foo</p>
+<pre><code></code></pre>
+````````````````````````````````
+
+
+Note that in the following case, we have a [lazy
+continuation line]:
+
+```````````````````````````````` example
+> foo
+    - bar
+.
+<blockquote>
+<p>foo
+- bar</p>
+</blockquote>
+````````````````````````````````
+
+
+To see why, note that in
+
+```markdown
+> foo
+>     - bar
+```
+
+the `- bar` is indented too far to start a list, and can't
+be an indented code block because indented code blocks cannot
+interrupt paragraphs, so it is [paragraph continuation text].
+
+A block quote can be empty:
+
+```````````````````````````````` example
+>
+.
+<blockquote>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+>
+>  
+> 
+.
+<blockquote>
+</blockquote>
+````````````````````````````````
+
+
+A block quote can have initial or final blank lines:
+
+```````````````````````````````` example
+>
+> foo
+>  
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+````````````````````````````````
+
+
+A blank line always separates block quotes:
+
+```````````````````````````````` example
+> foo
+
+> bar
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+<blockquote>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+(Most current Markdown implementations, including John Gruber's
+original `Markdown.pl`, will parse this example as a single block quote
+with two paragraphs.  But it seems better to allow the author to decide
+whether two block quotes or one are wanted.)
+
+Consecutiveness means that if we put these block quotes together,
+we get a single block quote:
+
+```````````````````````````````` example
+> foo
+> bar
+.
+<blockquote>
+<p>foo
+bar</p>
+</blockquote>
+````````````````````````````````
+
+
+To get a block quote with two paragraphs, use:
+
+```````````````````````````````` example
+> foo
+>
+> bar
+.
+<blockquote>
+<p>foo</p>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+Block quotes can interrupt paragraphs:
+
+```````````````````````````````` example
+foo
+> bar
+.
+<p>foo</p>
+<blockquote>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+In general, blank lines are not needed before or after block
+quotes:
+
+```````````````````````````````` example
+> aaa
+***
+> bbb
+.
+<blockquote>
+<p>aaa</p>
+</blockquote>
+<hr />
+<blockquote>
+<p>bbb</p>
+</blockquote>
+````````````````````````````````
+
+
+However, because of laziness, a blank line is needed between
+a block quote and a following paragraph:
+
+```````````````````````````````` example
+> bar
+baz
+.
+<blockquote>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> bar
+
+baz
+.
+<blockquote>
+<p>bar</p>
+</blockquote>
+<p>baz</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> bar
+>
+baz
+.
+<blockquote>
+<p>bar</p>
+</blockquote>
+<p>baz</p>
+````````````````````````````````
+
+
+It is a consequence of the Laziness rule that any number
+of initial `>`s may be omitted on a continuation line of a
+nested block quote:
+
+```````````````````````````````` example
+> > > foo
+bar
+.
+<blockquote>
+<blockquote>
+<blockquote>
+<p>foo
+bar</p>
+</blockquote>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+>>> foo
+> bar
+>>baz
+.
+<blockquote>
+<blockquote>
+<blockquote>
+<p>foo
+bar
+baz</p>
+</blockquote>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+When including an indented code block in a block quote,
+remember that the [block quote marker] includes
+both the `>` and a following space.  So *five spaces* are needed after
+the `>`:
+
+```````````````````````````````` example
+>     code
+
+>    not code
+.
+<blockquote>
+<pre><code>code
+</code></pre>
+</blockquote>
+<blockquote>
+<p>not code</p>
+</blockquote>
+````````````````````````````````
+
+
+
+## List items
+
+A [list marker](@) is a
+[bullet list marker] or an [ordered list marker].
+
+A [bullet list marker](@)
+is a `-`, `+`, or `*` character.
+
+An [ordered list marker](@)
+is a sequence of 1--9 arabic digits (`0-9`), followed by either a
+`.` character or a `)` character.  (The reason for the length
+limit is that with 10 digits we start seeing integer overflows
+in some browsers.)
+
+The following rules define [list items]:
+
+1.  **Basic case.**  If a sequence of lines *Ls* constitute a sequence of
+    blocks *Bs* starting with a [non-whitespace character] and not separated
+    from each other by more than one blank line, and *M* is a list
+    marker of width *W* followed by 1 ≤ *N* ≤ 4 spaces, then the result
+    of prepending *M* and the following spaces to the first line of
+    *Ls*, and indenting subsequent lines of *Ls* by *W + N* spaces, is a
+    list item with *Bs* as its contents.  The type of the list item
+    (bullet or ordered) is determined by the type of its list marker.
+    If the list item is ordered, then it is also assigned a start
+    number, based on the ordered list marker.
+
+    Exceptions: When the first list item in a [list] interrupts
+    a paragraph---that is, when it starts on a line that would
+    otherwise count as [paragraph continuation text]---then (a)
+    the lines *Ls* must not begin with a blank line, and (b) if
+    the list item is ordered, the start number must be 1.
+
+For example, let *Ls* be the lines
+
+```````````````````````````````` example
+A paragraph
+with two lines.
+
+    indented code
+
+> A block quote.
+.
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+````````````````````````````````
+
+
+And let *M* be the marker `1.`, and *N* = 2.  Then rule #1 says
+that the following is an ordered list item with start number 1,
+and the same contents as *Ls*:
+
+```````````````````````````````` example
+1.  A paragraph
+    with two lines.
+
+        indented code
+
+    > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+The most important thing to notice is that the position of
+the text after the list marker determines how much indentation
+is needed in subsequent blocks in the list item.  If the list
+marker takes up two spaces, and there are three spaces between
+the list marker and the next [non-whitespace character], then blocks
+must be indented five spaces in order to fall under the list
+item.
+
+Here are some examples showing how far content must be indented to be
+put under the list item:
+
+```````````````````````````````` example
+- one
+
+ two
+.
+<ul>
+<li>one</li>
+</ul>
+<p>two</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- one
+
+  two
+.
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+ -    one
+
+     two
+.
+<ul>
+<li>one</li>
+</ul>
+<pre><code> two
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+ -    one
+
+      two
+.
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+It is tempting to think of this in terms of columns:  the continuation
+blocks must be indented at least to the column of the first
+[non-whitespace character] after the list marker. However, that is not quite right.
+The spaces after the list marker determine how much relative indentation
+is needed.  Which column this indentation reaches will depend on
+how the list item is embedded in other constructions, as shown by
+this example:
+
+```````````````````````````````` example
+   > > 1.  one
+>>
+>>     two
+.
+<blockquote>
+<blockquote>
+<ol>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ol>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+Here `two` occurs in the same column as the list marker `1.`,
+but is actually contained in the list item, because there is
+sufficient indentation after the last containing blockquote marker.
+
+The converse is also possible.  In the following example, the word `two`
+occurs far to the right of the initial text of the list item, `one`, but
+it is not considered part of the list item, because it is not indented
+far enough past the blockquote marker:
+
+```````````````````````````````` example
+>>- one
+>>
+  >  > two
+.
+<blockquote>
+<blockquote>
+<ul>
+<li>one</li>
+</ul>
+<p>two</p>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+Note that at least one space is needed between the list marker and
+any following content, so these are not list items:
+
+```````````````````````````````` example
+-one
+
+2.two
+.
+<p>-one</p>
+<p>2.two</p>
+````````````````````````````````
+
+
+A list item may contain blocks that are separated by more than
+one blank line.
+
+```````````````````````````````` example
+- foo
+
+
+  bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+A list item may contain any kind of block:
+
+```````````````````````````````` example
+1.  foo
+
+    ```
+    bar
+    ```
+
+    baz
+
+    > bam
+.
+<ol>
+<li>
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+<p>baz</p>
+<blockquote>
+<p>bam</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+A list item that contains an indented code block will preserve
+empty lines within the code block verbatim.
+
+```````````````````````````````` example
+- Foo
+
+      bar
+
+
+      baz
+.
+<ul>
+<li>
+<p>Foo</p>
+<pre><code>bar
+
+
+baz
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+Note that ordered list start numbers must be nine digits or less:
+
+```````````````````````````````` example
+123456789. ok
+.
+<ol start="123456789">
+<li>ok</li>
+</ol>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1234567890. not ok
+.
+<p>1234567890. not ok</p>
+````````````````````````````````
+
+
+A start number may begin with 0s:
+
+```````````````````````````````` example
+0. ok
+.
+<ol start="0">
+<li>ok</li>
+</ol>
+````````````````````````````````
+
+
+```````````````````````````````` example
+003. ok
+.
+<ol start="3">
+<li>ok</li>
+</ol>
+````````````````````````````````
+
+
+A start number may not be negative:
+
+```````````````````````````````` example
+-1. not ok
+.
+<p>-1. not ok</p>
+````````````````````````````````
+
+
+
+2.  **Item starting with indented code.**  If a sequence of lines *Ls*
+    constitute a sequence of blocks *Bs* starting with an indented code
+    block and not separated from each other by more than one blank line,
+    and *M* is a list marker of width *W* followed by
+    one space, then the result of prepending *M* and the following
+    space to the first line of *Ls*, and indenting subsequent lines of
+    *Ls* by *W + 1* spaces, is a list item with *Bs* as its contents.
+    If a line is empty, then it need not be indented.  The type of the
+    list item (bullet or ordered) is determined by the type of its list
+    marker.  If the list item is ordered, then it is also assigned a
+    start number, based on the ordered list marker.
+
+An indented code block will have to be indented four spaces beyond
+the edge of the region where text will be included in the list item.
+In the following case that is 6 spaces:
+
+```````````````````````````````` example
+- foo
+
+      bar
+.
+<ul>
+<li>
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+
+And in this case it is 11 spaces:
+
+```````````````````````````````` example
+  10.  foo
+
+           bar
+.
+<ol start="10">
+<li>
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+</li>
+</ol>
+````````````````````````````````
+
+
+If the *first* block in the list item is an indented code block,
+then by rule #2, the contents must be indented *one* space after the
+list marker:
+
+```````````````````````````````` example
+    indented code
+
+paragraph
+
+    more code
+.
+<pre><code>indented code
+</code></pre>
+<p>paragraph</p>
+<pre><code>more code
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1.     indented code
+
+   paragraph
+
+       more code
+.
+<ol>
+<li>
+<pre><code>indented code
+</code></pre>
+<p>paragraph</p>
+<pre><code>more code
+</code></pre>
+</li>
+</ol>
+````````````````````````````````
+
+
+Note that an additional space indent is interpreted as space
+inside the code block:
+
+```````````````````````````````` example
+1.      indented code
+
+   paragraph
+
+       more code
+.
+<ol>
+<li>
+<pre><code> indented code
+</code></pre>
+<p>paragraph</p>
+<pre><code>more code
+</code></pre>
+</li>
+</ol>
+````````````````````````````````
+
+
+Note that rules #1 and #2 only apply to two cases:  (a) cases
+in which the lines to be included in a list item begin with a
+[non-whitespace character], and (b) cases in which
+they begin with an indented code
+block.  In a case like the following, where the first block begins with
+a three-space indent, the rules do not allow us to form a list item by
+indenting the whole thing and prepending a list marker:
+
+```````````````````````````````` example
+   foo
+
+bar
+.
+<p>foo</p>
+<p>bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+-    foo
+
+  bar
+.
+<ul>
+<li>foo</li>
+</ul>
+<p>bar</p>
+````````````````````````````````
+
+
+This is not a significant restriction, because when a block begins
+with 1-3 spaces indent, the indentation can always be removed without
+a change in interpretation, allowing rule #1 to be applied.  So, in
+the above case:
+
+```````````````````````````````` example
+-  foo
+
+   bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+3.  **Item starting with a blank line.**  If a sequence of lines *Ls*
+    starting with a single [blank line] constitute a (possibly empty)
+    sequence of blocks *Bs*, not separated from each other by more than
+    one blank line, and *M* is a list marker of width *W*,
+    then the result of prepending *M* to the first line of *Ls*, and
+    indenting subsequent lines of *Ls* by *W + 1* spaces, is a list
+    item with *Bs* as its contents.
+    If a line is empty, then it need not be indented.  The type of the
+    list item (bullet or ordered) is determined by the type of its list
+    marker.  If the list item is ordered, then it is also assigned a
+    start number, based on the ordered list marker.
+
+Here are some list items that start with a blank line but are not empty:
+
+```````````````````````````````` example
+-
+  foo
+-
+  ```
+  bar
+  ```
+-
+      baz
+.
+<ul>
+<li>foo</li>
+<li>
+<pre><code>bar
+</code></pre>
+</li>
+<li>
+<pre><code>baz
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+When the list item starts with a blank line, the number of spaces
+following the list marker doesn't change the required indentation:
+
+```````````````````````````````` example
+-   
+  foo
+.
+<ul>
+<li>foo</li>
+</ul>
+````````````````````````````````
+
+
+A list item can begin with at most one blank line.
+In the following example, `foo` is not part of the list
+item:
+
+```````````````````````````````` example
+-
+
+  foo
+.
+<ul>
+<li></li>
+</ul>
+<p>foo</p>
+````````````````````````````````
+
+
+Here is an empty bullet list item:
+
+```````````````````````````````` example
+- foo
+-
+- bar
+.
+<ul>
+<li>foo</li>
+<li></li>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+It does not matter whether there are spaces following the [list marker]:
+
+```````````````````````````````` example
+- foo
+-   
+- bar
+.
+<ul>
+<li>foo</li>
+<li></li>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+Here is an empty ordered list item:
+
+```````````````````````````````` example
+1. foo
+2.
+3. bar
+.
+<ol>
+<li>foo</li>
+<li></li>
+<li>bar</li>
+</ol>
+````````````````````````````````
+
+
+A list may start or end with an empty list item:
+
+```````````````````````````````` example
+*
+.
+<ul>
+<li></li>
+</ul>
+````````````````````````````````
+
+However, an empty list item cannot interrupt a paragraph:
+
+```````````````````````````````` example
+foo
+*
+
+foo
+1.
+.
+<p>foo
+*</p>
+<p>foo
+1.</p>
+````````````````````````````````
+
+
+4.  **Indentation.**  If a sequence of lines *Ls* constitutes a list item
+    according to rule #1, #2, or #3, then the result of indenting each line
+    of *Ls* by 1-3 spaces (the same for each line) also constitutes a
+    list item with the same contents and attributes.  If a line is
+    empty, then it need not be indented.
+
+Indented one space:
+
+```````````````````````````````` example
+ 1.  A paragraph
+     with two lines.
+
+         indented code
+
+     > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Indented two spaces:
+
+```````````````````````````````` example
+  1.  A paragraph
+      with two lines.
+
+          indented code
+
+      > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Indented three spaces:
+
+```````````````````````````````` example
+   1.  A paragraph
+       with two lines.
+
+           indented code
+
+       > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Four spaces indent gives a code block:
+
+```````````````````````````````` example
+    1.  A paragraph
+        with two lines.
+
+            indented code
+
+        > A block quote.
+.
+<pre><code>1.  A paragraph
+    with two lines.
+
+        indented code
+
+    &gt; A block quote.
+</code></pre>
+````````````````````````````````
+
+
+
+5.  **Laziness.**  If a string of lines *Ls* constitute a [list
+    item](#list-items) with contents *Bs*, then the result of deleting
+    some or all of the indentation from one or more lines in which the
+    next [non-whitespace character] after the indentation is
+    [paragraph continuation text] is a
+    list item with the same contents and attributes.  The unindented
+    lines are called
+    [lazy continuation line](@)s.
+
+Here is an example with [lazy continuation lines]:
+
+```````````````````````````````` example
+  1.  A paragraph
+with two lines.
+
+          indented code
+
+      > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Indentation can be partially deleted:
+
+```````````````````````````````` example
+  1.  A paragraph
+    with two lines.
+.
+<ol>
+<li>A paragraph
+with two lines.</li>
+</ol>
+````````````````````````````````
+
+
+These examples show how laziness can work in nested structures:
+
+```````````````````````````````` example
+> 1. > Blockquote
+continued here.
+.
+<blockquote>
+<ol>
+<li>
+<blockquote>
+<p>Blockquote
+continued here.</p>
+</blockquote>
+</li>
+</ol>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> 1. > Blockquote
+> continued here.
+.
+<blockquote>
+<ol>
+<li>
+<blockquote>
+<p>Blockquote
+continued here.</p>
+</blockquote>
+</li>
+</ol>
+</blockquote>
+````````````````````````````````
+
+
+
+6.  **That's all.** Nothing that is not counted as a list item by rules
+    #1--5 counts as a [list item](#list-items).
+
+The rules for sublists follow from the general rules above.  A sublist
+must be indented the same number of spaces a paragraph would need to be
+in order to be included in the list item.
+
+So, in this case we need two spaces indent:
+
+```````````````````````````````` example
+- foo
+  - bar
+    - baz
+      - boo
+.
+<ul>
+<li>foo
+<ul>
+<li>bar
+<ul>
+<li>baz
+<ul>
+<li>boo</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+One is not enough:
+
+```````````````````````````````` example
+- foo
+ - bar
+  - baz
+   - boo
+.
+<ul>
+<li>foo</li>
+<li>bar</li>
+<li>baz</li>
+<li>boo</li>
+</ul>
+````````````````````````````````
+
+
+Here we need four, because the list marker is wider:
+
+```````````````````````````````` example
+10) foo
+    - bar
+.
+<ol start="10">
+<li>foo
+<ul>
+<li>bar</li>
+</ul>
+</li>
+</ol>
+````````````````````````````````
+
+
+Three is not enough:
+
+```````````````````````````````` example
+10) foo
+   - bar
+.
+<ol start="10">
+<li>foo</li>
+</ol>
+<ul>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+A list may be the first block in a list item:
+
+```````````````````````````````` example
+- - foo
+.
+<ul>
+<li>
+<ul>
+<li>foo</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1. - 2. foo
+.
+<ol>
+<li>
+<ul>
+<li>
+<ol start="2">
+<li>foo</li>
+</ol>
+</li>
+</ul>
+</li>
+</ol>
+````````````````````````````````
+
+
+A list item can contain a heading:
+
+```````````````````````````````` example
+- # Foo
+- Bar
+  ---
+  baz
+.
+<ul>
+<li>
+<h1>Foo</h1>
+</li>
+<li>
+<h2>Bar</h2>
+baz</li>
+</ul>
+````````````````````````````````
+
+
+### Motivation
+
+John Gruber's Markdown spec says the following about list items:
+
+1. "List markers typically start at the left margin, but may be indented
+   by up to three spaces. List markers must be followed by one or more
+   spaces or a tab."
+
+2. "To make lists look nice, you can wrap items with hanging indents....
+   But if you don't want to, you don't have to."
+
+3. "List items may consist of multiple paragraphs. Each subsequent
+   paragraph in a list item must be indented by either 4 spaces or one
+   tab."
+
+4. "It looks nice if you indent every line of the subsequent paragraphs,
+   but here again, Markdown will allow you to be lazy."
+
+5. "To put a blockquote within a list item, the blockquote's `>`
+   delimiters need to be indented."
+
+6. "To put a code block within a list item, the code block needs to be
+   indented twice — 8 spaces or two tabs."
+
+These rules specify that a paragraph under a list item must be indented
+four spaces (presumably, from the left margin, rather than the start of
+the list marker, but this is not said), and that code under a list item
+must be indented eight spaces instead of the usual four.  They also say
+that a block quote must be indented, but not by how much; however, the
+example given has four spaces indentation.  Although nothing is said
+about other kinds of block-level content, it is certainly reasonable to
+infer that *all* block elements under a list item, including other
+lists, must be indented four spaces.  This principle has been called the
+*four-space rule*.
+
+The four-space rule is clear and principled, and if the reference
+implementation `Markdown.pl` had followed it, it probably would have
+become the standard.  However, `Markdown.pl` allowed paragraphs and
+sublists to start with only two spaces indentation, at least on the
+outer level.  Worse, its behavior was inconsistent: a sublist of an
+outer-level list needed two spaces indentation, but a sublist of this
+sublist needed three spaces.  It is not surprising, then, that different
+implementations of Markdown have developed very different rules for
+determining what comes under a list item.  (Pandoc and python-Markdown,
+for example, stuck with Gruber's syntax description and the four-space
+rule, while discount, redcarpet, marked, PHP Markdown, and others
+followed `Markdown.pl`'s behavior more closely.)
+
+Unfortunately, given the divergences between implementations, there
+is no way to give a spec for list items that will be guaranteed not
+to break any existing documents.  However, the spec given here should
+correctly handle lists formatted with either the four-space rule or
+the more forgiving `Markdown.pl` behavior, provided they are laid out
+in a way that is natural for a human to read.
+
+The strategy here is to let the width and indentation of the list marker
+determine the indentation necessary for blocks to fall under the list
+item, rather than having a fixed and arbitrary number.  The writer can
+think of the body of the list item as a unit which gets indented to the
+right enough to fit the list marker (and any indentation on the list
+marker).  (The laziness rule, #5, then allows continuation lines to be
+unindented if needed.)
+
+This rule is superior, we claim, to any rule requiring a fixed level of
+indentation from the margin.  The four-space rule is clear but
+unnatural. It is quite unintuitive that
+
+``` markdown
+- foo
+
+  bar
+
+  - baz
+```
+
+should be parsed as two lists with an intervening paragraph,
+
+``` html
+<ul>
+<li>foo</li>
+</ul>
+<p>bar</p>
+<ul>
+<li>baz</li>
+</ul>
+```
+
+as the four-space rule demands, rather than a single list,
+
+``` html
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+<ul>
+<li>baz</li>
+</ul>
+</li>
+</ul>
+```
+
+The choice of four spaces is arbitrary.  It can be learned, but it is
+not likely to be guessed, and it trips up beginners regularly.
+
+Would it help to adopt a two-space rule?  The problem is that such
+a rule, together with the rule allowing 1--3 spaces indentation of the
+initial list marker, allows text that is indented *less than* the
+original list marker to be included in the list item. For example,
+`Markdown.pl` parses
+
+``` markdown
+   - one
+
+  two
+```
+
+as a single list item, with `two` a continuation paragraph:
+
+``` html
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+```
+
+and similarly
+
+``` markdown
+>   - one
+>
+>  two
+```
+
+as
+
+``` html
+<blockquote>
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+</blockquote>
+```
+
+This is extremely unintuitive.
+
+Rather than requiring a fixed indent from the margin, we could require
+a fixed indent (say, two spaces, or even one space) from the list marker (which
+may itself be indented).  This proposal would remove the last anomaly
+discussed.  Unlike the spec presented above, it would count the following
+as a list item with a subparagraph, even though the paragraph `bar`
+is not indented as far as the first paragraph `foo`:
+
+``` markdown
+ 10. foo
+
+   bar  
+```
+
+Arguably this text does read like a list item with `bar` as a subparagraph,
+which may count in favor of the proposal.  However, on this proposal indented
+code would have to be indented six spaces after the list marker.  And this
+would break a lot of existing Markdown, which has the pattern:
+
+``` markdown
+1.  foo
+
+        indented code
+```
+
+where the code is indented eight spaces.  The spec above, by contrast, will
+parse this text as expected, since the code block's indentation is measured
+from the beginning of `foo`.
+
+The one case that needs special treatment is a list item that *starts*
+with indented code.  How much indentation is required in that case, since
+we don't have a "first paragraph" to measure from?  Rule #2 simply stipulates
+that in such cases, we require one space indentation from the list marker
+(and then the normal four spaces for the indented code).  This will match the
+four-space rule in cases where the list marker plus its initial indentation
+takes four spaces (a common case), but diverge in other cases.
+
+## Lists
+
+A [list](@) is a sequence of one or more
+list items [of the same type].  The list items
+may be separated by any number of blank lines.
+
+Two list items are [of the same type](@)
+if they begin with a [list marker] of the same type.
+Two list markers are of the
+same type if (a) they are bullet list markers using the same character
+(`-`, `+`, or `*`) or (b) they are ordered list numbers with the same
+delimiter (either `.` or `)`).
+
+A list is an [ordered list](@)
+if its constituent list items begin with
+[ordered list markers], and a
+[bullet list](@) if its constituent list
+items begin with [bullet list markers].
+
+The [start number](@)
+of an [ordered list] is determined by the list number of
+its initial list item.  The numbers of subsequent list items are
+disregarded.
+
+A list is [loose](@) if any of its constituent
+list items are separated by blank lines, or if any of its constituent
+list items directly contain two block-level elements with a blank line
+between them.  Otherwise a list is [tight](@).
+(The difference in HTML output is that paragraphs in a loose list are
+wrapped in `<p>` tags, while paragraphs in a tight list are not.)
+
+Changing the bullet or ordered list delimiter starts a new list:
+
+```````````````````````````````` example
+- foo
+- bar
++ baz
+.
+<ul>
+<li>foo</li>
+<li>bar</li>
+</ul>
+<ul>
+<li>baz</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1. foo
+2. bar
+3) baz
+.
+<ol>
+<li>foo</li>
+<li>bar</li>
+</ol>
+<ol start="3">
+<li>baz</li>
+</ol>
+````````````````````````````````
+
+
+In CommonMark, a list can interrupt a paragraph. That is,
+no blank line is needed to separate a paragraph from a following
+list:
+
+```````````````````````````````` example
+Foo
+- bar
+- baz
+.
+<p>Foo</p>
+<ul>
+<li>bar</li>
+<li>baz</li>
+</ul>
+````````````````````````````````
+
+`Markdown.pl` does not allow this, through fear of triggering a list
+via a numeral in a hard-wrapped line:
+
+``` markdown
+The number of windows in my house is
+14.  The number of doors is 6.
+```
+
+Oddly, though, `Markdown.pl` *does* allow a blockquote to
+interrupt a paragraph, even though the same considerations might
+apply.
+
+In CommonMark, we do allow lists to interrupt paragraphs, for
+two reasons.  First, it is natural and not uncommon for people
+to start lists without blank lines:
+
+``` markdown
+I need to buy
+- new shoes
+- a coat
+- a plane ticket
+```
+
+Second, we are attracted to a
+
+> [principle of uniformity](@):
+> if a chunk of text has a certain
+> meaning, it will continue to have the same meaning when put into a
+> container block (such as a list item or blockquote).
+
+(Indeed, the spec for [list items] and [block quotes] presupposes
+this principle.) This principle implies that if
+
+``` markdown
+  * I need to buy
+    - new shoes
+    - a coat
+    - a plane ticket
+```
+
+is a list item containing a paragraph followed by a nested sublist,
+as all Markdown implementations agree it is (though the paragraph
+may be rendered without `<p>` tags, since the list is "tight"),
+then
+
+``` markdown
+I need to buy
+- new shoes
+- a coat
+- a plane ticket
+```
+
+by itself should be a paragraph followed by a nested sublist.
+
+Since it is well established Markdown practice to allow lists to
+interrupt paragraphs inside list items, the [principle of
+uniformity] requires us to allow this outside list items as
+well.  ([reStructuredText](http://docutils.sourceforge.net/rst.html)
+takes a different approach, requiring blank lines before lists
+even inside other list items.)
+
+In order to solve of unwanted lists in paragraphs with
+hard-wrapped numerals, we allow only lists starting with `1` to
+interrupt paragraphs.  Thus,
+
+```````````````````````````````` example
+The number of windows in my house is
+14.  The number of doors is 6.
+.
+<p>The number of windows in my house is
+14.  The number of doors is 6.</p>
+````````````````````````````````
+
+We may still get an unintended result in cases like
+
+```````````````````````````````` example
+The number of windows in my house is
+1.  The number of doors is 6.
+.
+<p>The number of windows in my house is</p>
+<ol>
+<li>The number of doors is 6.</li>
+</ol>
+````````````````````````````````
+
+but this rule should prevent most spurious list captures.
+
+There can be any number of blank lines between items:
+
+```````````````````````````````` example
+- foo
+
+- bar
+
+
+- baz
+.
+<ul>
+<li>
+<p>foo</p>
+</li>
+<li>
+<p>bar</p>
+</li>
+<li>
+<p>baz</p>
+</li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+- foo
+  - bar
+    - baz
+
+
+      bim
+.
+<ul>
+<li>foo
+<ul>
+<li>bar
+<ul>
+<li>
+<p>baz</p>
+<p>bim</p>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+To separate consecutive lists of the same type, or to separate a
+list from an indented code block that would otherwise be parsed
+as a subparagraph of the final list item, you can insert a blank HTML
+comment:
+
+```````````````````````````````` example
+- foo
+- bar
+
+<!-- -->
+
+- baz
+- bim
+.
+<ul>
+<li>foo</li>
+<li>bar</li>
+</ul>
+<!-- -->
+<ul>
+<li>baz</li>
+<li>bim</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+-   foo
+
+    notcode
+
+-   foo
+
+<!-- -->
+
+    code
+.
+<ul>
+<li>
+<p>foo</p>
+<p>notcode</p>
+</li>
+<li>
+<p>foo</p>
+</li>
+</ul>
+<!-- -->
+<pre><code>code
+</code></pre>
+````````````````````````````````
+
+
+List items need not be indented to the same level.  The following
+list items will be treated as items at the same list level,
+since none is indented enough to belong to the previous list
+item:
+
+```````````````````````````````` example
+- a
+ - b
+  - c
+   - d
+    - e
+   - f
+  - g
+ - h
+- i
+.
+<ul>
+<li>a</li>
+<li>b</li>
+<li>c</li>
+<li>d</li>
+<li>e</li>
+<li>f</li>
+<li>g</li>
+<li>h</li>
+<li>i</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1. a
+
+  2. b
+
+    3. c
+.
+<ol>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+</li>
+<li>
+<p>c</p>
+</li>
+</ol>
+````````````````````````````````
+
+
+This is a loose list, because there is a blank line between
+two of the list items:
+
+```````````````````````````````` example
+- a
+- b
+
+- c
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+</li>
+<li>
+<p>c</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+So is this, with a empty second item:
+
+```````````````````````````````` example
+* a
+*
+
+* c
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li></li>
+<li>
+<p>c</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+These are loose lists, even though there is no space between the items,
+because one of the items directly contains two block-level elements
+with a blank line between them:
+
+```````````````````````````````` example
+- a
+- b
+
+  c
+- d
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+<p>c</p>
+</li>
+<li>
+<p>d</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- a
+- b
+
+  [ref]: /url
+- d
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+</li>
+<li>
+<p>d</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+This is a tight list, because the blank lines are in a code block:
+
+```````````````````````````````` example
+- a
+- ```
+  b
+
+
+  ```
+- c
+.
+<ul>
+<li>a</li>
+<li>
+<pre><code>b
+
+
+</code></pre>
+</li>
+<li>c</li>
+</ul>
+````````````````````````````````
+
+
+This is a tight list, because the blank line is between two
+paragraphs of a sublist.  So the sublist is loose while
+the outer list is tight:
+
+```````````````````````````````` example
+- a
+  - b
+
+    c
+- d
+.
+<ul>
+<li>a
+<ul>
+<li>
+<p>b</p>
+<p>c</p>
+</li>
+</ul>
+</li>
+<li>d</li>
+</ul>
+````````````````````````````````
+
+
+This is a tight list, because the blank line is inside the
+block quote:
+
+```````````````````````````````` example
+* a
+  > b
+  >
+* c
+.
+<ul>
+<li>a
+<blockquote>
+<p>b</p>
+</blockquote>
+</li>
+<li>c</li>
+</ul>
+````````````````````````````````
+
+
+This list is tight, because the consecutive block elements
+are not separated by blank lines:
+
+```````````````````````````````` example
+- a
+  > b
+  ```
+  c
+  ```
+- d
+.
+<ul>
+<li>a
+<blockquote>
+<p>b</p>
+</blockquote>
+<pre><code>c
+</code></pre>
+</li>
+<li>d</li>
+</ul>
+````````````````````````````````
+
+
+A single-paragraph list is tight:
+
+```````````````````````````````` example
+- a
+.
+<ul>
+<li>a</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- a
+  - b
+.
+<ul>
+<li>a
+<ul>
+<li>b</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+This list is loose, because of the blank line between the
+two block elements in the list item:
+
+```````````````````````````````` example
+1. ```
+   foo
+   ```
+
+   bar
+.
+<ol>
+<li>
+<pre><code>foo
+</code></pre>
+<p>bar</p>
+</li>
+</ol>
+````````````````````````````````
+
+
+Here the outer list is loose, the inner list tight:
+
+```````````````````````````````` example
+* foo
+  * bar
+
+  baz
+.
+<ul>
+<li>
+<p>foo</p>
+<ul>
+<li>bar</li>
+</ul>
+<p>baz</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- a
+  - b
+  - c
+
+- d
+  - e
+  - f
+.
+<ul>
+<li>
+<p>a</p>
+<ul>
+<li>b</li>
+<li>c</li>
+</ul>
+</li>
+<li>
+<p>d</p>
+<ul>
+<li>e</li>
+<li>f</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+# Inlines
+
+Inlines are parsed sequentially from the beginning of the character
+stream to the end (left to right, in left-to-right languages).
+Thus, for example, in
+
+```````````````````````````````` example
+`hi`lo`
+.
+<p><code>hi</code>lo`</p>
+````````````````````````````````
+
+
+`hi` is parsed as code, leaving the backtick at the end as a literal
+backtick.
+
+## Backslash escapes
+
+Any ASCII punctuation character may be backslash-escaped:
+
+```````````````````````````````` example
+\!\"\#\$\%\&\'\(\)\*\+\,\-\.\/\:\;\<\=\>\?\@\[\\\]\^\_\`\{\|\}\~
+.
+<p>!&quot;#$%&amp;'()*+,-./:;&lt;=&gt;?@[\]^_`{|}~</p>
+````````````````````````````````
+
+
+Backslashes before other characters are treated as literal
+backslashes:
+
+```````````````````````````````` example
+\→\A\a\ \3\φ\«
+.
+<p>\→\A\a\ \3\φ\«</p>
+````````````````````````````````
+
+
+Escaped characters are treated as regular characters and do
+not have their usual Markdown meanings:
+
+```````````````````````````````` example
+\*not emphasized*
+\<br/> not a tag
+\[not a link](/foo)
+\`not code`
+1\. not a list
+\* not a list
+\# not a heading
+\[foo]: /url "not a reference"
+.
+<p>*not emphasized*
+&lt;br/&gt; not a tag
+[not a link](/foo)
+`not code`
+1. not a list
+* not a list
+# not a heading
+[foo]: /url &quot;not a reference&quot;</p>
+````````````````````````````````
+
+
+If a backslash is itself escaped, the following character is not:
+
+```````````````````````````````` example
+\\*emphasis*
+.
+<p>\<em>emphasis</em></p>
+````````````````````````````````
+
+
+A backslash at the end of the line is a [hard line break]:
+
+```````````````````````````````` example
+foo\
+bar
+.
+<p>foo<br />
+bar</p>
+````````````````````````````````
+
+
+Backslash escapes do not work in code blocks, code spans, autolinks, or
+raw HTML:
+
+```````````````````````````````` example
+`` \[\` ``
+.
+<p><code>\[\`</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    \[\]
+.
+<pre><code>\[\]
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~
+\[\]
+~~~
+.
+<pre><code>\[\]
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<http://example.com?find=\*>
+.
+<p><a href="http://example.com?find=%5C*">http://example.com?find=\*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<a href="/bar\/)">
+.
+<a href="/bar\/)">
+````````````````````````````````
+
+
+But they work in all other contexts, including URLs and link titles,
+link references, and [info strings] in [fenced code blocks]:
+
+```````````````````````````````` example
+[foo](/bar\* "ti\*tle")
+.
+<p><a href="/bar*" title="ti*tle">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo]
+
+[foo]: /bar\* "ti\*tle"
+.
+<p><a href="/bar*" title="ti*tle">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+``` foo\+bar
+foo
+```
+.
+<pre><code class="language-foo+bar">foo
+</code></pre>
+````````````````````````````````
+
+
+
+## Entity and numeric character references
+
+All valid HTML entity references and numeric character
+references, except those occuring in code blocks and code spans,
+are recognized as such and treated as equivalent to the
+corresponding Unicode characters.  Conforming CommonMark parsers
+need not store information about whether a particular character
+was represented in the source using a Unicode character or
+an entity reference.
+
+[Entity references](@) consist of `&` + any of the valid
+HTML5 entity names + `;`. The
+document <https://html.spec.whatwg.org/multipage/entities.json>
+is used as an authoritative source for the valid entity
+references and their corresponding code points.
+
+```````````````````````````````` example
+&nbsp; &amp; &copy; &AElig; &Dcaron;
+&frac34; &HilbertSpace; &DifferentialD;
+&ClockwiseContourIntegral; &ngE;
+.
+<p>  &amp; © Æ Ď
+¾ ℋ ⅆ
+∲ ≧̸</p>
+````````````````````````````````
+
+
+[Decimal numeric character
+references](@)
+consist of `&#` + a string of 1--8 arabic digits + `;`. A
+numeric character reference is parsed as the corresponding
+Unicode character. Invalid Unicode code points will be replaced by
+the REPLACEMENT CHARACTER (`U+FFFD`).  For security reasons,
+the code point `U+0000` will also be replaced by `U+FFFD`.
+
+```````````````````````````````` example
+&#35; &#1234; &#992; &#98765432; &#0;
+.
+<p># Ӓ Ϡ � �</p>
+````````````````````````````````
+
+
+[Hexadecimal numeric character
+references](@) consist of `&#` +
+either `X` or `x` + a string of 1-8 hexadecimal digits + `;`.
+They too are parsed as the corresponding Unicode character (this
+time specified with a hexadecimal numeral instead of decimal).
+
+```````````````````````````````` example
+&#X22; &#XD06; &#xcab;
+.
+<p>&quot; ആ ಫ</p>
+````````````````````````````````
+
+
+Here are some nonentities:
+
+```````````````````````````````` example
+&nbsp &x; &#; &#x;
+&ThisIsNotDefined; &hi?;
+.
+<p>&amp;nbsp &amp;x; &amp;#; &amp;#x;
+&amp;ThisIsNotDefined; &amp;hi?;</p>
+````````````````````````````````
+
+
+Although HTML5 does accept some entity references
+without a trailing semicolon (such as `&copy`), these are not
+recognized here, because it makes the grammar too ambiguous:
+
+```````````````````````````````` example
+&copy
+.
+<p>&amp;copy</p>
+````````````````````````````````
+
+
+Strings that are not on the list of HTML5 named entities are not
+recognized as entity references either:
+
+```````````````````````````````` example
+&MadeUpEntity;
+.
+<p>&amp;MadeUpEntity;</p>
+````````````````````````````````
+
+
+Entity and numeric character references are recognized in any
+context besides code spans or code blocks, including
+URLs, [link titles], and [fenced code block][] [info strings]:
+
+```````````````````````````````` example
+<a href="&ouml;&ouml;.html">
+.
+<a href="&ouml;&ouml;.html">
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo](/f&ouml;&ouml; "f&ouml;&ouml;")
+.
+<p><a href="/f%C3%B6%C3%B6" title="föö">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo]
+
+[foo]: /f&ouml;&ouml; "f&ouml;&ouml;"
+.
+<p><a href="/f%C3%B6%C3%B6" title="föö">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+``` f&ouml;&ouml;
+foo
+```
+.
+<pre><code class="language-föö">foo
+</code></pre>
+````````````````````````````````
+
+
+Entity and numeric character references are treated as literal
+text in code spans and code blocks:
+
+```````````````````````````````` example
+`f&ouml;&ouml;`
+.
+<p><code>f&amp;ouml;&amp;ouml;</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    f&ouml;f&ouml;
+.
+<pre><code>f&amp;ouml;f&amp;ouml;
+</code></pre>
+````````````````````````````````
+
+
+## Code spans
+
+A [backtick string](@)
+is a string of one or more backtick characters (`` ` ``) that is neither
+preceded nor followed by a backtick.
+
+A [code span](@) begins with a backtick string and ends with
+a backtick string of equal length.  The contents of the code span are
+the characters between the two backtick strings, with leading and
+trailing spaces and [line endings] removed, and
+[whitespace] collapsed to single spaces.
+
+This is a simple code span:
+
+```````````````````````````````` example
+`foo`
+.
+<p><code>foo</code></p>
+````````````````````````````````
+
+
+Here two backticks are used, because the code contains a backtick.
+This example also illustrates stripping of leading and trailing spaces:
+
+```````````````````````````````` example
+`` foo ` bar  ``
+.
+<p><code>foo ` bar</code></p>
+````````````````````````````````
+
+
+This example shows the motivation for stripping leading and trailing
+spaces:
+
+```````````````````````````````` example
+` `` `
+.
+<p><code>``</code></p>
+````````````````````````````````
+
+
+[Line endings] are treated like spaces:
+
+```````````````````````````````` example
+``
+foo
+``
+.
+<p><code>foo</code></p>
+````````````````````````````````
+
+
+Interior spaces and [line endings] are collapsed into
+single spaces, just as they would be by a browser:
+
+```````````````````````````````` example
+`foo   bar
+  baz`
+.
+<p><code>foo bar baz</code></p>
+````````````````````````````````
+
+
+Not all [Unicode whitespace] (for instance, non-breaking space) is
+collapsed, however:
+
+```````````````````````````````` example
+`a  b`
+.
+<p><code>a  b</code></p>
+````````````````````````````````
+
+
+Q: Why not just leave the spaces, since browsers will collapse them
+anyway?  A:  Because we might be targeting a non-HTML format, and we
+shouldn't rely on HTML-specific rendering assumptions.
+
+(Existing implementations differ in their treatment of internal
+spaces and [line endings].  Some, including `Markdown.pl` and
+`showdown`, convert an internal [line ending] into a
+`<br />` tag.  But this makes things difficult for those who like to
+hard-wrap their paragraphs, since a line break in the midst of a code
+span will cause an unintended line break in the output.  Others just
+leave internal spaces as they are, which is fine if only HTML is being
+targeted.)
+
+```````````````````````````````` example
+`foo `` bar`
+.
+<p><code>foo `` bar</code></p>
+````````````````````````````````
+
+
+Note that backslash escapes do not work in code spans. All backslashes
+are treated literally:
+
+```````````````````````````````` example
+`foo\`bar`
+.
+<p><code>foo\</code>bar`</p>
+````````````````````````````````
+
+
+Backslash escapes are never needed, because one can always choose a
+string of *n* backtick characters as delimiters, where the code does
+not contain any strings of exactly *n* backtick characters.
+
+Code span backticks have higher precedence than any other inline
+constructs except HTML tags and autolinks.  Thus, for example, this is
+not parsed as emphasized text, since the second `*` is part of a code
+span:
+
+```````````````````````````````` example
+*foo`*`
+.
+<p>*foo<code>*</code></p>
+````````````````````````````````
+
+
+And this is not parsed as a link:
+
+```````````````````````````````` example
+[not a `link](/foo`)
+.
+<p>[not a <code>link](/foo</code>)</p>
+````````````````````````````````
+
+
+Code spans, HTML tags, and autolinks have the same precedence.
+Thus, this is code:
+
+```````````````````````````````` example
+`<a href="`">`
+.
+<p><code>&lt;a href=&quot;</code>&quot;&gt;`</p>
+````````````````````````````````
+
+
+But this is an HTML tag:
+
+```````````````````````````````` example
+<a href="`">`
+.
+<p><a href="`">`</p>
+````````````````````````````````
+
+
+And this is code:
+
+```````````````````````````````` example
+`<http://foo.bar.`baz>`
+.
+<p><code>&lt;http://foo.bar.</code>baz&gt;`</p>
+````````````````````````````````
+
+
+But this is an autolink:
+
+```````````````````````````````` example
+<http://foo.bar.`baz>`
+.
+<p><a href="http://foo.bar.%60baz">http://foo.bar.`baz</a>`</p>
+````````````````````````````````
+
+
+When a backtick string is not closed by a matching backtick string,
+we just have literal backticks:
+
+```````````````````````````````` example
+```foo``
+.
+<p>```foo``</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+`foo
+.
+<p>`foo</p>
+````````````````````````````````
+
+
+## Emphasis and strong emphasis
+
+John Gruber's original [Markdown syntax
+description](http://daringfireball.net/projects/markdown/syntax#em) says:
+
+> Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
+> emphasis. Text wrapped with one `*` or `_` will be wrapped with an HTML
+> `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML `<strong>`
+> tag.
+
+This is enough for most users, but these rules leave much undecided,
+especially when it comes to nested emphasis.  The original
+`Markdown.pl` test suite makes it clear that triple `***` and
+`___` delimiters can be used for strong emphasis, and most
+implementations have also allowed the following patterns:
+
+``` markdown
+***strong emph***
+***strong** in emph*
+***emph* in strong**
+**in strong *emph***
+*in emph **strong***
+```
+
+The following patterns are less widely supported, but the intent
+is clear and they are useful (especially in contexts like bibliography
+entries):
+
+``` markdown
+*emph *with emph* in it*
+**strong **with strong** in it**
+```
+
+Many implementations have also restricted intraword emphasis to
+the `*` forms, to avoid unwanted emphasis in words containing
+internal underscores.  (It is best practice to put these in code
+spans, but users often do not.)
+
+``` markdown
+internal emphasis: foo*bar*baz
+no emphasis: foo_bar_baz
+```
+
+The rules given below capture all of these patterns, while allowing
+for efficient parsing strategies that do not backtrack.
+
+First, some definitions.  A [delimiter run](@) is either
+a sequence of one or more `*` characters that is not preceded or
+followed by a `*` character, or a sequence of one or more `_`
+characters that is not preceded or followed by a `_` character.
+
+A [left-flanking delimiter run](@) is
+a [delimiter run] that is (a) not followed by [Unicode whitespace],
+and (b) either not followed by a [punctuation character], or
+preceded by [Unicode whitespace] or a [punctuation character].
+For purposes of this definition, the beginning and the end of
+the line count as Unicode whitespace.
+
+A [right-flanking delimiter run](@) is
+a [delimiter run] that is (a) not preceded by [Unicode whitespace],
+and (b) either not preceded by a [punctuation character], or
+followed by [Unicode whitespace] or a [punctuation character].
+For purposes of this definition, the beginning and the end of
+the line count as Unicode whitespace.
+
+Here are some examples of delimiter runs.
+
+  - left-flanking but not right-flanking:
+
+    ```
+    ***abc
+      _abc
+    **"abc"
+     _"abc"
+    ```
+
+  - right-flanking but not left-flanking:
+
+    ```
+     abc***
+     abc_
+    "abc"**
+    "abc"_
+    ```
+
+  - Both left and right-flanking:
+
+    ```
+     abc***def
+    "abc"_"def"
+    ```
+
+  - Neither left nor right-flanking:
+
+    ```
+    abc *** def
+    a _ b
+    ```
+
+(The idea of distinguishing left-flanking and right-flanking
+delimiter runs based on the character before and the character
+after comes from Roopesh Chander's
+[vfmd](http://www.vfmd.org/vfmd-spec/specification/#procedure-for-identifying-emphasis-tags).
+vfmd uses the terminology "emphasis indicator string" instead of "delimiter
+run," and its rules for distinguishing left- and right-flanking runs
+are a bit more complex than the ones given here.)
+
+The following rules define emphasis and strong emphasis:
+
+1.  A single `*` character [can open emphasis](@)
+    iff (if and only if) it is part of a [left-flanking delimiter run].
+
+2.  A single `_` character [can open emphasis] iff
+    it is part of a [left-flanking delimiter run]
+    and either (a) not part of a [right-flanking delimiter run]
+    or (b) part of a [right-flanking delimiter run]
+    preceded by punctuation.
+
+3.  A single `*` character [can close emphasis](@)
+    iff it is part of a [right-flanking delimiter run].
+
+4.  A single `_` character [can close emphasis] iff
+    it is part of a [right-flanking delimiter run]
+    and either (a) not part of a [left-flanking delimiter run]
+    or (b) part of a [left-flanking delimiter run]
+    followed by punctuation.
+
+5.  A double `**` [can open strong emphasis](@)
+    iff it is part of a [left-flanking delimiter run].
+
+6.  A double `__` [can open strong emphasis] iff
+    it is part of a [left-flanking delimiter run]
+    and either (a) not part of a [right-flanking delimiter run]
+    or (b) part of a [right-flanking delimiter run]
+    preceded by punctuation.
+
+7.  A double `**` [can close strong emphasis](@)
+    iff it is part of a [right-flanking delimiter run].
+
+8.  A double `__` [can close strong emphasis]
+    it is part of a [right-flanking delimiter run]
+    and either (a) not part of a [left-flanking delimiter run]
+    or (b) part of a [left-flanking delimiter run]
+    followed by punctuation.
+
+9.  Emphasis begins with a delimiter that [can open emphasis] and ends
+    with a delimiter that [can close emphasis], and that uses the same
+    character (`_` or `*`) as the opening delimiter.  The
+    opening and closing delimiters must belong to separate
+    [delimiter runs].  If one of the delimiters can both
+    open and close emphasis, then the sum of the lengths of the
+    delimiter runs containing the opening and closing delimiters
+    must not be a multiple of 3.
+
+10. Strong emphasis begins with a delimiter that
+    [can open strong emphasis] and ends with a delimiter that
+    [can close strong emphasis], and that uses the same character
+    (`_` or `*`) as the opening delimiter.  The
+    opening and closing delimiters must belong to separate
+    [delimiter runs].  If one of the delimiters can both open
+    and close strong emphasis, then the sum of the lengths of
+    the delimiter runs containing the opening and closing
+    delimiters must not be a multiple of 3.
+
+11. A literal `*` character cannot occur at the beginning or end of
+    `*`-delimited emphasis or `**`-delimited strong emphasis, unless it
+    is backslash-escaped.
+
+12. A literal `_` character cannot occur at the beginning or end of
+    `_`-delimited emphasis or `__`-delimited strong emphasis, unless it
+    is backslash-escaped.
+
+Where rules 1--12 above are compatible with multiple parsings,
+the following principles resolve ambiguity:
+
+13. The number of nestings should be minimized. Thus, for example,
+    an interpretation `<strong>...</strong>` is always preferred to
+    `<em><em>...</em></em>`.
+
+14. An interpretation `<strong><em>...</em></strong>` is always
+    preferred to `<em><strong>..</strong></em>`.
+
+15. When two potential emphasis or strong emphasis spans overlap,
+    so that the second begins before the first ends and ends after
+    the first ends, the first takes precedence. Thus, for example,
+    `*foo _bar* baz_` is parsed as `<em>foo _bar</em> baz_` rather
+    than `*foo <em>bar* baz</em>`.
+
+16. When there are two potential emphasis or strong emphasis spans
+    with the same closing delimiter, the shorter one (the one that
+    opens later) takes precedence. Thus, for example,
+    `**foo **bar baz**` is parsed as `**foo <strong>bar baz</strong>`
+    rather than `<strong>foo **bar baz</strong>`.
+
+17. Inline code spans, links, images, and HTML tags group more tightly
+    than emphasis.  So, when there is a choice between an interpretation
+    that contains one of these elements and one that does not, the
+    former always wins.  Thus, for example, `*[foo*](bar)` is
+    parsed as `*<a href="bar">foo*</a>` rather than as
+    `<em>[foo</em>](bar)`.
+
+These rules can be illustrated through a series of examples.
+
+Rule 1:
+
+```````````````````````````````` example
+*foo bar*
+.
+<p><em>foo bar</em></p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `*` is followed by
+whitespace, and hence not part of a [left-flanking delimiter run]:
+
+```````````````````````````````` example
+a * foo bar*
+.
+<p>a * foo bar*</p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `*` is preceded
+by an alphanumeric and followed by punctuation, and hence
+not part of a [left-flanking delimiter run]:
+
+```````````````````````````````` example
+a*"foo"*
+.
+<p>a*&quot;foo&quot;*</p>
+````````````````````````````````
+
+
+Unicode nonbreaking spaces count as whitespace, too:
+
+```````````````````````````````` example
+* a *
+.
+<p>* a *</p>
+````````````````````````````````
+
+
+Intraword emphasis with `*` is permitted:
+
+```````````````````````````````` example
+foo*bar*
+.
+<p>foo<em>bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+5*6*78
+.
+<p>5<em>6</em>78</p>
+````````````````````````````````
+
+
+Rule 2:
+
+```````````````````````````````` example
+_foo bar_
+.
+<p><em>foo bar</em></p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `_` is followed by
+whitespace:
+
+```````````````````````````````` example
+_ foo bar_
+.
+<p>_ foo bar_</p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `_` is preceded
+by an alphanumeric and followed by punctuation:
+
+```````````````````````````````` example
+a_"foo"_
+.
+<p>a_&quot;foo&quot;_</p>
+````````````````````````````````
+
+
+Emphasis with `_` is not allowed inside words:
+
+```````````````````````````````` example
+foo_bar_
+.
+<p>foo_bar_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+5_6_78
+.
+<p>5_6_78</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+пристаням_стремятся_
+.
+<p>пристаням_стремятся_</p>
+````````````````````````````````
+
+
+Here `_` does not generate emphasis, because the first delimiter run
+is right-flanking and the second left-flanking:
+
+```````````````````````````````` example
+aa_"bb"_cc
+.
+<p>aa_&quot;bb&quot;_cc</p>
+````````````````````````````````
+
+
+This is emphasis, even though the opening delimiter is
+both left- and right-flanking, because it is preceded by
+punctuation:
+
+```````````````````````````````` example
+foo-_(bar)_
+.
+<p>foo-<em>(bar)</em></p>
+````````````````````````````````
+
+
+Rule 3:
+
+This is not emphasis, because the closing delimiter does
+not match the opening delimiter:
+
+```````````````````````````````` example
+_foo*
+.
+<p>_foo*</p>
+````````````````````````````````
+
+
+This is not emphasis, because the closing `*` is preceded by
+whitespace:
+
+```````````````````````````````` example
+*foo bar *
+.
+<p>*foo bar *</p>
+````````````````````````````````
+
+
+A newline also counts as whitespace:
+
+```````````````````````````````` example
+*foo bar
+*
+.
+<p>*foo bar
+*</p>
+````````````````````````````````
+
+
+This is not emphasis, because the second `*` is
+preceded by punctuation and followed by an alphanumeric
+(hence it is not part of a [right-flanking delimiter run]:
+
+```````````````````````````````` example
+*(*foo)
+.
+<p>*(*foo)</p>
+````````````````````````````````
+
+
+The point of this restriction is more easily appreciated
+with this example:
+
+```````````````````````````````` example
+*(*foo*)*
+.
+<p><em>(<em>foo</em>)</em></p>
+````````````````````````````````
+
+
+Intraword emphasis with `*` is allowed:
+
+```````````````````````````````` example
+*foo*bar
+.
+<p><em>foo</em>bar</p>
+````````````````````````````````
+
+
+
+Rule 4:
+
+This is not emphasis, because the closing `_` is preceded by
+whitespace:
+
+```````````````````````````````` example
+_foo bar _
+.
+<p>_foo bar _</p>
+````````````````````````````````
+
+
+This is not emphasis, because the second `_` is
+preceded by punctuation and followed by an alphanumeric:
+
+```````````````````````````````` example
+_(_foo)
+.
+<p>_(_foo)</p>
+````````````````````````````````
+
+
+This is emphasis within emphasis:
+
+```````````````````````````````` example
+_(_foo_)_
+.
+<p><em>(<em>foo</em>)</em></p>
+````````````````````````````````
+
+
+Intraword emphasis is disallowed for `_`:
+
+```````````````````````````````` example
+_foo_bar
+.
+<p>_foo_bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_пристаням_стремятся
+.
+<p>_пристаням_стремятся</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo_bar_baz_
+.
+<p><em>foo_bar_baz</em></p>
+````````````````````````````````
+
+
+This is emphasis, even though the closing delimiter is
+both left- and right-flanking, because it is followed by
+punctuation:
+
+```````````````````````````````` example
+_(bar)_.
+.
+<p><em>(bar)</em>.</p>
+````````````````````````````````
+
+
+Rule 5:
+
+```````````````````````````````` example
+**foo bar**
+.
+<p><strong>foo bar</strong></p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening delimiter is
+followed by whitespace:
+
+```````````````````````````````` example
+** foo bar**
+.
+<p>** foo bar**</p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening `**` is preceded
+by an alphanumeric and followed by punctuation, and hence
+not part of a [left-flanking delimiter run]:
+
+```````````````````````````````` example
+a**"foo"**
+.
+<p>a**&quot;foo&quot;**</p>
+````````````````````````````````
+
+
+Intraword strong emphasis with `**` is permitted:
+
+```````````````````````````````` example
+foo**bar**
+.
+<p>foo<strong>bar</strong></p>
+````````````````````````````````
+
+
+Rule 6:
+
+```````````````````````````````` example
+__foo bar__
+.
+<p><strong>foo bar</strong></p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening delimiter is
+followed by whitespace:
+
+```````````````````````````````` example
+__ foo bar__
+.
+<p>__ foo bar__</p>
+````````````````````````````````
+
+
+A newline counts as whitespace:
+```````````````````````````````` example
+__
+foo bar__
+.
+<p>__
+foo bar__</p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening `__` is preceded
+by an alphanumeric and followed by punctuation:
+
+```````````````````````````````` example
+a__"foo"__
+.
+<p>a__&quot;foo&quot;__</p>
+````````````````````````````````
+
+
+Intraword strong emphasis is forbidden with `__`:
+
+```````````````````````````````` example
+foo__bar__
+.
+<p>foo__bar__</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+5__6__78
+.
+<p>5__6__78</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+пристаням__стремятся__
+.
+<p>пристаням__стремятся__</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo, __bar__, baz__
+.
+<p><strong>foo, <strong>bar</strong>, baz</strong></p>
+````````````````````````````````
+
+
+This is strong emphasis, even though the opening delimiter is
+both left- and right-flanking, because it is preceded by
+punctuation:
+
+```````````````````````````````` example
+foo-__(bar)__
+.
+<p>foo-<strong>(bar)</strong></p>
+````````````````````````````````
+
+
+
+Rule 7:
+
+This is not strong emphasis, because the closing delimiter is preceded
+by whitespace:
+
+```````````````````````````````` example
+**foo bar **
+.
+<p>**foo bar **</p>
+````````````````````````````````
+
+
+(Nor can it be interpreted as an emphasized `*foo bar *`, because of
+Rule 11.)
+
+This is not strong emphasis, because the second `**` is
+preceded by punctuation and followed by an alphanumeric:
+
+```````````````````````````````` example
+**(**foo)
+.
+<p>**(**foo)</p>
+````````````````````````````````
+
+
+The point of this restriction is more easily appreciated
+with these examples:
+
+```````````````````````````````` example
+*(**foo**)*
+.
+<p><em>(<strong>foo</strong>)</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**Gomphocarpus (*Gomphocarpus physocarpus*, syn.
+*Asclepias physocarpa*)**
+.
+<p><strong>Gomphocarpus (<em>Gomphocarpus physocarpus</em>, syn.
+<em>Asclepias physocarpa</em>)</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo "*bar*" foo**
+.
+<p><strong>foo &quot;<em>bar</em>&quot; foo</strong></p>
+````````````````````````````````
+
+
+Intraword emphasis:
+
+```````````````````````````````` example
+**foo**bar
+.
+<p><strong>foo</strong>bar</p>
+````````````````````````````````
+
+
+Rule 8:
+
+This is not strong emphasis, because the closing delimiter is
+preceded by whitespace:
+
+```````````````````````````````` example
+__foo bar __
+.
+<p>__foo bar __</p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the second `__` is
+preceded by punctuation and followed by an alphanumeric:
+
+```````````````````````````````` example
+__(__foo)
+.
+<p>__(__foo)</p>
+````````````````````````````````
+
+
+The point of this restriction is more easily appreciated
+with this example:
+
+```````````````````````````````` example
+_(__foo__)_
+.
+<p><em>(<strong>foo</strong>)</em></p>
+````````````````````````````````
+
+
+Intraword strong emphasis is forbidden with `__`:
+
+```````````````````````````````` example
+__foo__bar
+.
+<p>__foo__bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__пристаням__стремятся
+.
+<p>__пристаням__стремятся</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo__bar__baz__
+.
+<p><strong>foo__bar__baz</strong></p>
+````````````````````````````````
+
+
+This is strong emphasis, even though the closing delimiter is
+both left- and right-flanking, because it is followed by
+punctuation:
+
+```````````````````````````````` example
+__(bar)__.
+.
+<p><strong>(bar)</strong>.</p>
+````````````````````````````````
+
+
+Rule 9:
+
+Any nonempty sequence of inline elements can be the contents of an
+emphasized span.
+
+```````````````````````````````` example
+*foo [bar](/url)*
+.
+<p><em>foo <a href="/url">bar</a></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo
+bar*
+.
+<p><em>foo
+bar</em></p>
+````````````````````````````````
+
+
+In particular, emphasis and strong emphasis can be nested
+inside emphasis:
+
+```````````````````````````````` example
+_foo __bar__ baz_
+.
+<p><em>foo <strong>bar</strong> baz</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo _bar_ baz_
+.
+<p><em>foo <em>bar</em> baz</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo_ bar_
+.
+<p><em><em>foo</em> bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo *bar**
+.
+<p><em>foo <em>bar</em></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo **bar** baz*
+.
+<p><em>foo <strong>bar</strong> baz</em></p>
+````````````````````````````````
+
+```````````````````````````````` example
+*foo**bar**baz*
+.
+<p><em>foo<strong>bar</strong>baz</em></p>
+````````````````````````````````
+
+Note that in the preceding case, the interpretation
+
+``` markdown
+<p><em>foo</em><em>bar<em></em>baz</em></p>
+```
+
+
+is precluded by the condition that a delimiter that
+can both open and close (like the `*` after `foo`)
+cannot form emphasis if the sum of the lengths of
+the delimiter runs containing the opening and
+closing delimiters is a multiple of 3.
+
+The same condition ensures that the following
+cases are all strong emphasis nested inside
+emphasis, even when the interior spaces are
+omitted:
+
+
+```````````````````````````````` example
+***foo** bar*
+.
+<p><em><strong>foo</strong> bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo **bar***
+.
+<p><em>foo <strong>bar</strong></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo**bar***
+.
+<p><em>foo<strong>bar</strong></em></p>
+````````````````````````````````
+
+
+Indefinite levels of nesting are possible:
+
+```````````````````````````````` example
+*foo **bar *baz* bim** bop*
+.
+<p><em>foo <strong>bar <em>baz</em> bim</strong> bop</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo [*bar*](/url)*
+.
+<p><em>foo <a href="/url"><em>bar</em></a></em></p>
+````````````````````````````````
+
+
+There can be no empty emphasis or strong emphasis:
+
+```````````````````````````````` example
+** is not an empty emphasis
+.
+<p>** is not an empty emphasis</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**** is not an empty strong emphasis
+.
+<p>**** is not an empty strong emphasis</p>
+````````````````````````````````
+
+
+
+Rule 10:
+
+Any nonempty sequence of inline elements can be the contents of an
+strongly emphasized span.
+
+```````````````````````````````` example
+**foo [bar](/url)**
+.
+<p><strong>foo <a href="/url">bar</a></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo
+bar**
+.
+<p><strong>foo
+bar</strong></p>
+````````````````````````````````
+
+
+In particular, emphasis and strong emphasis can be nested
+inside strong emphasis:
+
+```````````````````````````````` example
+__foo _bar_ baz__
+.
+<p><strong>foo <em>bar</em> baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo __bar__ baz__
+.
+<p><strong>foo <strong>bar</strong> baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____foo__ bar__
+.
+<p><strong><strong>foo</strong> bar</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo **bar****
+.
+<p><strong>foo <strong>bar</strong></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo *bar* baz**
+.
+<p><strong>foo <em>bar</em> baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo*bar*baz**
+.
+<p><strong>foo<em>bar</em>baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+***foo* bar**
+.
+<p><strong><em>foo</em> bar</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo *bar***
+.
+<p><strong>foo <em>bar</em></strong></p>
+````````````````````````````````
+
+
+Indefinite levels of nesting are possible:
+
+```````````````````````````````` example
+**foo *bar **baz**
+bim* bop**
+.
+<p><strong>foo <em>bar <strong>baz</strong>
+bim</em> bop</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo [*bar*](/url)**
+.
+<p><strong>foo <a href="/url"><em>bar</em></a></strong></p>
+````````````````````````````````
+
+
+There can be no empty emphasis or strong emphasis:
+
+```````````````````````````````` example
+__ is not an empty emphasis
+.
+<p>__ is not an empty emphasis</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____ is not an empty strong emphasis
+.
+<p>____ is not an empty strong emphasis</p>
+````````````````````````````````
+
+
+
+Rule 11:
+
+```````````````````````````````` example
+foo ***
+.
+<p>foo ***</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo *\**
+.
+<p>foo <em>*</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo *_*
+.
+<p>foo <em>_</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo *****
+.
+<p>foo *****</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo **\***
+.
+<p>foo <strong>*</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo **_**
+.
+<p>foo <strong>_</strong></p>
+````````````````````````````````
+
+
+Note that when delimiters do not match evenly, Rule 11 determines
+that the excess literal `*` characters will appear outside of the
+emphasis, rather than inside it:
+
+```````````````````````````````` example
+**foo*
+.
+<p>*<em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo**
+.
+<p><em>foo</em>*</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+***foo**
+.
+<p>*<strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+****foo*
+.
+<p>***<em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo***
+.
+<p><strong>foo</strong>*</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo****
+.
+<p><em>foo</em>***</p>
+````````````````````````````````
+
+
+
+Rule 12:
+
+```````````````````````````````` example
+foo ___
+.
+<p>foo ___</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo _\__
+.
+<p>foo <em>_</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo _*_
+.
+<p>foo <em>*</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo _____
+.
+<p>foo _____</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo __\___
+.
+<p>foo <strong>_</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo __*__
+.
+<p>foo <strong>*</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo_
+.
+<p>_<em>foo</em></p>
+````````````````````````````````
+
+
+Note that when delimiters do not match evenly, Rule 12 determines
+that the excess literal `_` characters will appear outside of the
+emphasis, rather than inside it:
+
+```````````````````````````````` example
+_foo__
+.
+<p><em>foo</em>_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+___foo__
+.
+<p>_<strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____foo_
+.
+<p>___<em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo___
+.
+<p><strong>foo</strong>_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo____
+.
+<p><em>foo</em>___</p>
+````````````````````````````````
+
+
+Rule 13 implies that if you want emphasis nested directly inside
+emphasis, you must use different delimiters:
+
+```````````````````````````````` example
+**foo**
+.
+<p><strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*_foo_*
+.
+<p><em><em>foo</em></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo__
+.
+<p><strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_*foo*_
+.
+<p><em><em>foo</em></em></p>
+````````````````````````````````
+
+
+However, strong emphasis within strong emphasis is possible without
+switching delimiters:
+
+```````````````````````````````` example
+****foo****
+.
+<p><strong><strong>foo</strong></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____foo____
+.
+<p><strong><strong>foo</strong></strong></p>
+````````````````````````````````
+
+
+
+Rule 13 can be applied to arbitrarily long sequences of
+delimiters:
+
+```````````````````````````````` example
+******foo******
+.
+<p><strong><strong><strong>foo</strong></strong></strong></p>
+````````````````````````````````
+
+
+Rule 14:
+
+```````````````````````````````` example
+***foo***
+.
+<p><strong><em>foo</em></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_____foo_____
+.
+<p><strong><strong><em>foo</em></strong></strong></p>
+````````````````````````````````
+
+
+Rule 15:
+
+```````````````````````````````` example
+*foo _bar* baz_
+.
+<p><em>foo _bar</em> baz_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo __bar *baz bim__ bam*
+.
+<p><em>foo <strong>bar *baz bim</strong> bam</em></p>
+````````````````````````````````
+
+
+Rule 16:
+
+```````````````````````````````` example
+**foo **bar baz**
+.
+<p>**foo <strong>bar baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo *bar baz*
+.
+<p>*foo <em>bar baz</em></p>
+````````````````````````````````
+
+
+Rule 17:
+
+```````````````````````````````` example
+*[bar*](/url)
+.
+<p>*<a href="/url">bar*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo [bar_](/url)
+.
+<p>_foo <a href="/url">bar_</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*<img src="foo" title="*"/>
+.
+<p>*<img src="foo" title="*"/></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**<a href="**">
+.
+<p>**<a href="**"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__<a href="__">
+.
+<p>__<a href="__"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*a `*`*
+.
+<p><em>a <code>*</code></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_a `_`_
+.
+<p><em>a <code>_</code></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**a<http://foo.bar/?q=**>
+.
+<p>**a<a href="http://foo.bar/?q=**">http://foo.bar/?q=**</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__a<http://foo.bar/?q=__>
+.
+<p>__a<a href="http://foo.bar/?q=__">http://foo.bar/?q=__</a></p>
+````````````````````````````````
+
+
+
+## Links
+
+A link contains [link text] (the visible text), a [link destination]
+(the URI that is the link destination), and optionally a [link title].
+There are two basic kinds of links in Markdown.  In [inline links] the
+destination and title are given immediately after the link text.  In
+[reference links] the destination and title are defined elsewhere in
+the document.
+
+A [link text](@) consists of a sequence of zero or more
+inline elements enclosed by square brackets (`[` and `]`).  The
+following rules apply:
+
+- Links may not contain other links, at any level of nesting. If
+  multiple otherwise valid link definitions appear nested inside each
+  other, the inner-most definition is used.
+
+- Brackets are allowed in the [link text] only if (a) they
+  are backslash-escaped or (b) they appear as a matched pair of brackets,
+  with an open bracket `[`, a sequence of zero or more inlines, and
+  a close bracket `]`.
+
+- Backtick [code spans], [autolinks], and raw [HTML tags] bind more tightly
+  than the brackets in link text.  Thus, for example,
+  `` [foo`]` `` could not be a link text, since the second `]`
+  is part of a code span.
+
+- The brackets in link text bind more tightly than markers for
+  [emphasis and strong emphasis]. Thus, for example, `*[foo*](url)` is a link.
+
+A [link destination](@) consists of either
+
+- a sequence of zero or more characters between an opening `<` and a
+  closing `>` that contains no spaces, line breaks, or unescaped
+  `<` or `>` characters, or
+
+- a nonempty sequence of characters that does not include
+  ASCII space or control characters, and includes parentheses
+  only if (a) they are backslash-escaped or (b) they are part of
+  a balanced pair of unescaped parentheses that is not itself
+  inside a balanced pair of unescaped parentheses.
+
+A [link title](@)  consists of either
+
+- a sequence of zero or more characters between straight double-quote
+  characters (`"`), including a `"` character only if it is
+  backslash-escaped, or
+
+- a sequence of zero or more characters between straight single-quote
+  characters (`'`), including a `'` character only if it is
+  backslash-escaped, or
+
+- a sequence of zero or more characters between matching parentheses
+  (`(...)`), including a `)` character only if it is backslash-escaped.
+
+Although [link titles] may span multiple lines, they may not contain
+a [blank line].
+
+An [inline link](@) consists of a [link text] followed immediately
+by a left parenthesis `(`, optional [whitespace], an optional
+[link destination], an optional [link title] separated from the link
+destination by [whitespace], optional [whitespace], and a right
+parenthesis `)`. The link's text consists of the inlines contained
+in the [link text] (excluding the enclosing square brackets).
+The link's URI consists of the link destination, excluding enclosing
+`<...>` if present, with backslash-escapes in effect as described
+above.  The link's title consists of the link title, excluding its
+enclosing delimiters, with backslash-escapes in effect as described
+above.
+
+Here is a simple inline link:
+
+```````````````````````````````` example
+[link](/uri "title")
+.
+<p><a href="/uri" title="title">link</a></p>
+````````````````````````````````
+
+
+The title may be omitted:
+
+```````````````````````````````` example
+[link](/uri)
+.
+<p><a href="/uri">link</a></p>
+````````````````````````````````
+
+
+Both the title and the destination may be omitted:
+
+```````````````````````````````` example
+[link]()
+.
+<p><a href="">link</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](<>)
+.
+<p><a href="">link</a></p>
+````````````````````````````````
+
+
+The destination cannot contain spaces or line breaks,
+even if enclosed in pointy brackets:
+
+```````````````````````````````` example
+[link](/my uri)
+.
+<p>[link](/my uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](</my uri>)
+.
+<p>[link](&lt;/my uri&gt;)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](foo
+bar)
+.
+<p>[link](foo
+bar)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](<foo
+bar>)
+.
+<p>[link](<foo
+bar>)</p>
+````````````````````````````````
+
+Parentheses inside the link destination may be escaped:
+
+```````````````````````````````` example
+[link](\(foo\))
+.
+<p><a href="(foo)">link</a></p>
+````````````````````````````````
+
+One level of balanced parentheses is allowed without escaping:
+
+```````````````````````````````` example
+[link]((foo)and(bar))
+.
+<p><a href="(foo)and(bar)">link</a></p>
+````````````````````````````````
+
+However, if you have parentheses within parentheses, you need to escape
+or use the `<...>` form:
+
+```````````````````````````````` example
+[link](foo(and(bar)))
+.
+<p>[link](foo(and(bar)))</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](foo(and\(bar\)))
+.
+<p><a href="foo(and(bar))">link</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](<foo(and(bar))>)
+.
+<p><a href="foo(and(bar))">link</a></p>
+````````````````````````````````
+
+
+Parentheses and other symbols can also be escaped, as usual
+in Markdown:
+
+```````````````````````````````` example
+[link](foo\)\:)
+.
+<p><a href="foo):">link</a></p>
+````````````````````````````````
+
+
+A link can contain fragment identifiers and queries:
+
+```````````````````````````````` example
+[link](#fragment)
+
+[link](http://example.com#fragment)
+
+[link](http://example.com?foo=3#frag)
+.
+<p><a href="#fragment">link</a></p>
+<p><a href="http://example.com#fragment">link</a></p>
+<p><a href="http://example.com?foo=3#frag">link</a></p>
+````````````````````````````````
+
+
+Note that a backslash before a non-escapable character is
+just a backslash:
+
+```````````````````````````````` example
+[link](foo\bar)
+.
+<p><a href="foo%5Cbar">link</a></p>
+````````````````````````````````
+
+
+URL-escaping should be left alone inside the destination, as all
+URL-escaped characters are also valid URL characters. Entity and
+numerical character references in the destination will be parsed
+into the corresponding Unicode code points, as usual.  These may
+be optionally URL-escaped when written as HTML, but this spec
+does not enforce any particular policy for rendering URLs in
+HTML or other formats.  Renderers may make different decisions
+about how to escape or normalize URLs in the output.
+
+```````````````````````````````` example
+[link](foo%20b&auml;)
+.
+<p><a href="foo%20b%C3%A4">link</a></p>
+````````````````````````````````
+
+
+Note that, because titles can often be parsed as destinations,
+if you try to omit the destination and keep the title, you'll
+get unexpected results:
+
+```````````````````````````````` example
+[link]("title")
+.
+<p><a href="%22title%22">link</a></p>
+````````````````````````````````
+
+
+Titles may be in single quotes, double quotes, or parentheses:
+
+```````````````````````````````` example
+[link](/url "title")
+[link](/url 'title')
+[link](/url (title))
+.
+<p><a href="/url" title="title">link</a>
+<a href="/url" title="title">link</a>
+<a href="/url" title="title">link</a></p>
+````````````````````````````````
+
+
+Backslash escapes and entity and numeric character references
+may be used in titles:
+
+```````````````````````````````` example
+[link](/url "title \"&quot;")
+.
+<p><a href="/url" title="title &quot;&quot;">link</a></p>
+````````````````````````````````
+
+
+Titles must be separated from the link using a [whitespace].
+Other [Unicode whitespace] like non-breaking space doesn't work.
+
+```````````````````````````````` example
+[link](/url "title")
+.
+<p><a href="/url%C2%A0%22title%22">link</a></p>
+````````````````````````````````
+
+
+Nested balanced quotes are not allowed without escaping:
+
+```````````````````````````````` example
+[link](/url "title "and" title")
+.
+<p>[link](/url &quot;title &quot;and&quot; title&quot;)</p>
+````````````````````````````````
+
+
+But it is easy to work around this by using a different quote type:
+
+```````````````````````````````` example
+[link](/url 'title "and" title')
+.
+<p><a href="/url" title="title &quot;and&quot; title">link</a></p>
+````````````````````````````````
+
+
+(Note:  `Markdown.pl` did allow double quotes inside a double-quoted
+title, and its test suite included a test demonstrating this.
+But it is hard to see a good rationale for the extra complexity this
+brings, since there are already many ways---backslash escaping,
+entity and numeric character references, or using a different
+quote type for the enclosing title---to write titles containing
+double quotes.  `Markdown.pl`'s handling of titles has a number
+of other strange features.  For example, it allows single-quoted
+titles in inline links, but not reference links.  And, in
+reference links but not inline links, it allows a title to begin
+with `"` and end with `)`.  `Markdown.pl` 1.0.1 even allows
+titles with no closing quotation mark, though 1.0.2b8 does not.
+It seems preferable to adopt a simple, rational rule that works
+the same way in inline links and link reference definitions.)
+
+[Whitespace] is allowed around the destination and title:
+
+```````````````````````````````` example
+[link](   /uri
+  "title"  )
+.
+<p><a href="/uri" title="title">link</a></p>
+````````````````````````````````
+
+
+But it is not allowed between the link text and the
+following parenthesis:
+
+```````````````````````````````` example
+[link] (/uri)
+.
+<p>[link] (/uri)</p>
+````````````````````````````````
+
+
+The link text may contain balanced brackets, but not unbalanced ones,
+unless they are escaped:
+
+```````````````````````````````` example
+[link [foo [bar]]](/uri)
+.
+<p><a href="/uri">link [foo [bar]]</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link] bar](/uri)
+.
+<p>[link] bar](/uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link [bar](/uri)
+.
+<p>[link <a href="/uri">bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link \[bar](/uri)
+.
+<p><a href="/uri">link [bar</a></p>
+````````````````````````````````
+
+
+The link text may contain inline content:
+
+```````````````````````````````` example
+[link *foo **bar** `#`*](/uri)
+.
+<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[![moon](moon.jpg)](/uri)
+.
+<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
+````````````````````````````````
+
+
+However, links may not contain other links, at any level of nesting.
+
+```````````````````````````````` example
+[foo [bar](/uri)](/uri)
+.
+<p>[foo <a href="/uri">bar</a>](/uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *[bar [baz](/uri)](/uri)*](/uri)
+.
+<p>[foo <em>[bar <a href="/uri">baz</a>](/uri)</em>](/uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![[[foo](uri1)](uri2)](uri3)
+.
+<p><img src="uri3" alt="[foo](uri2)" /></p>
+````````````````````````````````
+
+
+These cases illustrate the precedence of link text grouping over
+emphasis grouping:
+
+```````````````````````````````` example
+*[foo*](/uri)
+.
+<p>*<a href="/uri">foo*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *bar](baz*)
+.
+<p><a href="baz*">foo *bar</a></p>
+````````````````````````````````
+
+
+Note that brackets that *aren't* part of links do not take
+precedence:
+
+```````````````````````````````` example
+*foo [bar* baz]
+.
+<p><em>foo [bar</em> baz]</p>
+````````````````````````````````
+
+
+These cases illustrate the precedence of HTML tags, code spans,
+and autolinks over link grouping:
+
+```````````````````````````````` example
+[foo <bar attr="](baz)">
+.
+<p>[foo <bar attr="](baz)"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo`](/uri)`
+.
+<p>[foo<code>](/uri)</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo<http://example.com/?search=](uri)>
+.
+<p>[foo<a href="http://example.com/?search=%5D(uri)">http://example.com/?search=](uri)</a></p>
+````````````````````````````````
+
+
+There are three kinds of [reference link](@)s:
+[full](#full-reference-link), [collapsed](#collapsed-reference-link),
+and [shortcut](#shortcut-reference-link).
+
+A [full reference link](@)
+consists of a [link text] immediately followed by a [link label]
+that [matches] a [link reference definition] elsewhere in the document.
+
+A [link label](@)  begins with a left bracket (`[`) and ends
+with the first right bracket (`]`) that is not backslash-escaped.
+Between these brackets there must be at least one [non-whitespace character].
+Unescaped square bracket characters are not allowed in
+[link labels].  A link label can have at most 999
+characters inside the square brackets.
+
+One label [matches](@)
+another just in case their normalized forms are equal.  To normalize a
+label, perform the *Unicode case fold* and collapse consecutive internal
+[whitespace] to a single space.  If there are multiple
+matching reference link definitions, the one that comes first in the
+document is used.  (It is desirable in such cases to emit a warning.)
+
+The contents of the first link label are parsed as inlines, which are
+used as the link's text.  The link's URI and title are provided by the
+matching [link reference definition].
+
+Here is a simple example:
+
+```````````````````````````````` example
+[foo][bar]
+
+[bar]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+The rules for the [link text] are the same as with
+[inline links].  Thus:
+
+The link text may contain balanced brackets, but not unbalanced ones,
+unless they are escaped:
+
+```````````````````````````````` example
+[link [foo [bar]]][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">link [foo [bar]]</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link \[bar][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">link [bar</a></p>
+````````````````````````````````
+
+
+The link text may contain inline content:
+
+```````````````````````````````` example
+[link *foo **bar** `#`*][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[![moon](moon.jpg)][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
+````````````````````````````````
+
+
+However, links may not contain other links, at any level of nesting.
+
+```````````````````````````````` example
+[foo [bar](/uri)][ref]
+
+[ref]: /uri
+.
+<p>[foo <a href="/uri">bar</a>]<a href="/uri">ref</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *bar [baz][ref]*][ref]
+
+[ref]: /uri
+.
+<p>[foo <em>bar <a href="/uri">baz</a></em>]<a href="/uri">ref</a></p>
+````````````````````````````````
+
+
+(In the examples above, we have two [shortcut reference links]
+instead of one [full reference link].)
+
+The following cases illustrate the precedence of link text grouping over
+emphasis grouping:
+
+```````````````````````````````` example
+*[foo*][ref]
+
+[ref]: /uri
+.
+<p>*<a href="/uri">foo*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *bar][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">foo *bar</a></p>
+````````````````````````````````
+
+
+These cases illustrate the precedence of HTML tags, code spans,
+and autolinks over link grouping:
+
+```````````````````````````````` example
+[foo <bar attr="][ref]">
+
+[ref]: /uri
+.
+<p>[foo <bar attr="][ref]"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo`][ref]`
+
+[ref]: /uri
+.
+<p>[foo<code>][ref]</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo<http://example.com/?search=][ref]>
+
+[ref]: /uri
+.
+<p>[foo<a href="http://example.com/?search=%5D%5Bref%5D">http://example.com/?search=][ref]</a></p>
+````````````````````````````````
+
+
+Matching is case-insensitive:
+
+```````````````````````````````` example
+[foo][BaR]
+
+[bar]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+Unicode case fold is used:
+
+```````````````````````````````` example
+[Толпой][Толпой] is a Russian word.
+
+[ТОЛПОЙ]: /url
+.
+<p><a href="/url">Толпой</a> is a Russian word.</p>
+````````````````````````````````
+
+
+Consecutive internal [whitespace] is treated as one space for
+purposes of determining matching:
+
+```````````````````````````````` example
+[Foo
+  bar]: /url
+
+[Baz][Foo bar]
+.
+<p><a href="/url">Baz</a></p>
+````````````````````````````````
+
+
+No [whitespace] is allowed between the [link text] and the
+[link label]:
+
+```````````````````````````````` example
+[foo] [bar]
+
+[bar]: /url "title"
+.
+<p>[foo] <a href="/url" title="title">bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo]
+[bar]
+
+[bar]: /url "title"
+.
+<p>[foo]
+<a href="/url" title="title">bar</a></p>
+````````````````````````````````
+
+
+This is a departure from John Gruber's original Markdown syntax
+description, which explicitly allows whitespace between the link
+text and the link label.  It brings reference links in line with
+[inline links], which (according to both original Markdown and
+this spec) cannot have whitespace after the link text.  More
+importantly, it prevents inadvertent capture of consecutive
+[shortcut reference links]. If whitespace is allowed between the
+link text and the link label, then in the following we will have
+a single reference link, not two shortcut reference links, as
+intended:
+
+``` markdown
+[foo]
+[bar]
+
+[foo]: /url1
+[bar]: /url2
+```
+
+(Note that [shortcut reference links] were introduced by Gruber
+himself in a beta version of `Markdown.pl`, but never included
+in the official syntax description.  Without shortcut reference
+links, it is harmless to allow space between the link text and
+link label; but once shortcut references are introduced, it is
+too dangerous to allow this, as it frequently leads to
+unintended results.)
+
+When there are multiple matching [link reference definitions],
+the first is used:
+
+```````````````````````````````` example
+[foo]: /url1
+
+[foo]: /url2
+
+[bar][foo]
+.
+<p><a href="/url1">bar</a></p>
+````````````````````````````````
+
+
+Note that matching is performed on normalized strings, not parsed
+inline content.  So the following does not match, even though the
+labels define equivalent inline content:
+
+```````````````````````````````` example
+[bar][foo\!]
+
+[foo!]: /url
+.
+<p>[bar][foo!]</p>
+````````````````````````````````
+
+
+[Link labels] cannot contain brackets, unless they are
+backslash-escaped:
+
+```````````````````````````````` example
+[foo][ref[]
+
+[ref[]: /uri
+.
+<p>[foo][ref[]</p>
+<p>[ref[]: /uri</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo][ref[bar]]
+
+[ref[bar]]: /uri
+.
+<p>[foo][ref[bar]]</p>
+<p>[ref[bar]]: /uri</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[[[foo]]]
+
+[[[foo]]]: /url
+.
+<p>[[[foo]]]</p>
+<p>[[[foo]]]: /url</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo][ref\[]
+
+[ref\[]: /uri
+.
+<p><a href="/uri">foo</a></p>
+````````````````````````````````
+
+
+Note that in this example `]` is not backslash-escaped:
+
+```````````````````````````````` example
+[bar\\]: /uri
+
+[bar\\]
+.
+<p><a href="/uri">bar\</a></p>
+````````````````````````````````
+
+
+A [link label] must contain at least one [non-whitespace character]:
+
+```````````````````````````````` example
+[]
+
+[]: /uri
+.
+<p>[]</p>
+<p>[]: /uri</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[
+ ]
+
+[
+ ]: /uri
+.
+<p>[
+]</p>
+<p>[
+]: /uri</p>
+````````````````````````````````
+
+
+A [collapsed reference link](@)
+consists of a [link label] that [matches] a
+[link reference definition] elsewhere in the
+document, followed by the string `[]`.
+The contents of the first link label are parsed as inlines,
+which are used as the link's text.  The link's URI and title are
+provided by the matching reference link definition.  Thus,
+`[foo][]` is equivalent to `[foo][foo]`.
+
+```````````````````````````````` example
+[foo][]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[*foo* bar][]
+
+[*foo* bar]: /url "title"
+.
+<p><a href="/url" title="title"><em>foo</em> bar</a></p>
+````````````````````````````````
+
+
+The link labels are case-insensitive:
+
+```````````````````````````````` example
+[Foo][]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">Foo</a></p>
+````````````````````````````````
+
+
+
+As with full reference links, [whitespace] is not
+allowed between the two sets of brackets:
+
+```````````````````````````````` example
+[foo] 
+[]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">foo</a>
+[]</p>
+````````````````````````````````
+
+
+A [shortcut reference link](@)
+consists of a [link label] that [matches] a
+[link reference definition] elsewhere in the
+document and is not followed by `[]` or a link label.
+The contents of the first link label are parsed as inlines,
+which are used as the link's text.  The link's URI and title
+are provided by the matching link reference definition.
+Thus, `[foo]` is equivalent to `[foo][]`.
+
+```````````````````````````````` example
+[foo]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[*foo* bar]
+
+[*foo* bar]: /url "title"
+.
+<p><a href="/url" title="title"><em>foo</em> bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[[*foo* bar]]
+
+[*foo* bar]: /url "title"
+.
+<p>[<a href="/url" title="title"><em>foo</em> bar</a>]</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[[bar [foo]
+
+[foo]: /url
+.
+<p>[[bar <a href="/url">foo</a></p>
+````````````````````````````````
+
+
+The link labels are case-insensitive:
+
+```````````````````````````````` example
+[Foo]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">Foo</a></p>
+````````````````````````````````
+
+
+A space after the link text should be preserved:
+
+```````````````````````````````` example
+[foo] bar
+
+[foo]: /url
+.
+<p><a href="/url">foo</a> bar</p>
+````````````````````````````````
+
+
+If you just want bracketed text, you can backslash-escape the
+opening bracket to avoid links:
+
+```````````````````````````````` example
+\[foo]
+
+[foo]: /url "title"
+.
+<p>[foo]</p>
+````````````````````````````````
+
+
+Note that this is a link, because a link label ends with the first
+following closing bracket:
+
+```````````````````````````````` example
+[foo*]: /url
+
+*[foo*]
+.
+<p>*<a href="/url">foo*</a></p>
+````````````````````````````````
+
+
+Full and compact references take precedence over shortcut
+references:
+
+```````````````````````````````` example
+[foo][bar]
+
+[foo]: /url1
+[bar]: /url2
+.
+<p><a href="/url2">foo</a></p>
+````````````````````````````````
+
+```````````````````````````````` example
+[foo][]
+
+[foo]: /url1
+.
+<p><a href="/url1">foo</a></p>
+````````````````````````````````
+
+Inline links also take precedence:
+
+```````````````````````````````` example
+[foo]()
+
+[foo]: /url1
+.
+<p><a href="">foo</a></p>
+````````````````````````````````
+
+```````````````````````````````` example
+[foo](not a link)
+
+[foo]: /url1
+.
+<p><a href="/url1">foo</a>(not a link)</p>
+````````````````````````````````
+
+In the following case `[bar][baz]` is parsed as a reference,
+`[foo]` as normal text:
+
+```````````````````````````````` example
+[foo][bar][baz]
+
+[baz]: /url
+.
+<p>[foo]<a href="/url">bar</a></p>
+````````````````````````````````
+
+
+Here, though, `[foo][bar]` is parsed as a reference, since
+`[bar]` is defined:
+
+```````````````````````````````` example
+[foo][bar][baz]
+
+[baz]: /url1
+[bar]: /url2
+.
+<p><a href="/url2">foo</a><a href="/url1">baz</a></p>
+````````````````````````````````
+
+
+Here `[foo]` is not parsed as a shortcut reference, because it
+is followed by a link label (even though `[bar]` is not defined):
+
+```````````````````````````````` example
+[foo][bar][baz]
+
+[baz]: /url1
+[foo]: /url2
+.
+<p>[foo]<a href="/url1">bar</a></p>
+````````````````````````````````
+
+
+
+## Images
+
+Syntax for images is like the syntax for links, with one
+difference. Instead of [link text], we have an
+[image description](@).  The rules for this are the
+same as for [link text], except that (a) an
+image description starts with `![` rather than `[`, and
+(b) an image description may contain links.
+An image description has inline elements
+as its contents.  When an image is rendered to HTML,
+this is standardly used as the image's `alt` attribute.
+
+```````````````````````````````` example
+![foo](/url "title")
+.
+<p><img src="/url" alt="foo" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo *bar*]
+
+[foo *bar*]: train.jpg "train & tracks"
+.
+<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo ![bar](/url)](/url2)
+.
+<p><img src="/url2" alt="foo bar" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo [bar](/url)](/url2)
+.
+<p><img src="/url2" alt="foo bar" /></p>
+````````````````````````````````
+
+
+Though this spec is concerned with parsing, not rendering, it is
+recommended that in rendering to HTML, only the plain string content
+of the [image description] be used.  Note that in
+the above example, the alt attribute's value is `foo bar`, not `foo
+[bar](/url)` or `foo <a href="/url">bar</a>`.  Only the plain string
+content is rendered, without formatting.
+
+```````````````````````````````` example
+![foo *bar*][]
+
+[foo *bar*]: train.jpg "train & tracks"
+.
+<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo *bar*][foobar]
+
+[FOOBAR]: train.jpg "train & tracks"
+.
+<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo](train.jpg)
+.
+<p><img src="train.jpg" alt="foo" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+My ![foo bar](/path/to/train.jpg  "title"   )
+.
+<p>My <img src="/path/to/train.jpg" alt="foo bar" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo](<url>)
+.
+<p><img src="url" alt="foo" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![](/url)
+.
+<p><img src="/url" alt="" /></p>
+````````````````````````````````
+
+
+Reference-style:
+
+```````````````````````````````` example
+![foo][bar]
+
+[bar]: /url
+.
+<p><img src="/url" alt="foo" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo][bar]
+
+[BAR]: /url
+.
+<p><img src="/url" alt="foo" /></p>
+````````````````````````````````
+
+
+Collapsed:
+
+```````````````````````````````` example
+![foo][]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="foo" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![*foo* bar][]
+
+[*foo* bar]: /url "title"
+.
+<p><img src="/url" alt="foo bar" title="title" /></p>
+````````````````````````````````
+
+
+The labels are case-insensitive:
+
+```````````````````````````````` example
+![Foo][]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="Foo" title="title" /></p>
+````````````````````````````````
+
+
+As with reference links, [whitespace] is not allowed
+between the two sets of brackets:
+
+```````````````````````````````` example
+![foo] 
+[]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="foo" title="title" />
+[]</p>
+````````````````````````````````
+
+
+Shortcut:
+
+```````````````````````````````` example
+![foo]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="foo" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![*foo* bar]
+
+[*foo* bar]: /url "title"
+.
+<p><img src="/url" alt="foo bar" title="title" /></p>
+````````````````````````````````
+
+
+Note that link labels cannot contain unescaped brackets:
+
+```````````````````````````````` example
+![[foo]]
+
+[[foo]]: /url "title"
+.
+<p>![[foo]]</p>
+<p>[[foo]]: /url &quot;title&quot;</p>
+````````````````````````````````
+
+
+The link labels are case-insensitive:
+
+```````````````````````````````` example
+![Foo]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="Foo" title="title" /></p>
+````````````````````````````````
+
+
+If you just want bracketed text, you can backslash-escape the
+opening `!` and `[`:
+
+```````````````````````````````` example
+\!\[foo]
+
+[foo]: /url "title"
+.
+<p>![foo]</p>
+````````````````````````````````
+
+
+If you want a link after a literal `!`, backslash-escape the
+`!`:
+
+```````````````````````````````` example
+\![foo]
+
+[foo]: /url "title"
+.
+<p>!<a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+## Autolinks
+
+[Autolink](@)s are absolute URIs and email addresses inside
+`<` and `>`. They are parsed as links, with the URL or email address
+as the link label.
+
+A [URI autolink](@) consists of `<`, followed by an
+[absolute URI] not containing `<`, followed by `>`.  It is parsed as
+a link to the URI, with the URI as the link's label.
+
+An [absolute URI](@),
+for these purposes, consists of a [scheme] followed by a colon (`:`)
+followed by zero or more characters other than ASCII
+[whitespace] and control characters, `<`, and `>`.  If
+the URI includes these characters, they must be percent-encoded
+(e.g. `%20` for a space).
+
+For purposes of this spec, a [scheme](@) is any sequence
+of 2--32 characters beginning with an ASCII letter and followed
+by any combination of ASCII letters, digits, or the symbols plus
+("+"), period ("."), or hyphen ("-").
+
+Here are some valid autolinks:
+
+```````````````````````````````` example
+<http://foo.bar.baz>
+.
+<p><a href="http://foo.bar.baz">http://foo.bar.baz</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<http://foo.bar.baz/test?q=hello&id=22&boolean>
+.
+<p><a href="http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean">http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<irc://foo.bar:2233/baz>
+.
+<p><a href="irc://foo.bar:2233/baz">irc://foo.bar:2233/baz</a></p>
+````````````````````````````````
+
+
+Uppercase is also fine:
+
+```````````````````````````````` example
+<MAILTO:FOO@BAR.BAZ>
+.
+<p><a href="MAILTO:FOO@BAR.BAZ">MAILTO:FOO@BAR.BAZ</a></p>
+````````````````````````````````
+
+
+Note that many strings that count as [absolute URIs] for
+purposes of this spec are not valid URIs, because their
+schemes are not registered or because of other problems
+with their syntax:
+
+```````````````````````````````` example
+<a+b+c:d>
+.
+<p><a href="a+b+c:d">a+b+c:d</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<made-up-scheme://foo,bar>
+.
+<p><a href="made-up-scheme://foo,bar">made-up-scheme://foo,bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<http://../>
+.
+<p><a href="http://../">http://../</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<localhost:5001/foo>
+.
+<p><a href="localhost:5001/foo">localhost:5001/foo</a></p>
+````````````````````````````````
+
+
+Spaces are not allowed in autolinks:
+
+```````````````````````````````` example
+<http://foo.bar/baz bim>
+.
+<p>&lt;http://foo.bar/baz bim&gt;</p>
+````````````````````````````````
+
+
+Backslash-escapes do not work inside autolinks:
+
+```````````````````````````````` example
+<http://example.com/\[\>
+.
+<p><a href="http://example.com/%5C%5B%5C">http://example.com/\[\</a></p>
+````````````````````````````````
+
+
+An [email autolink](@)
+consists of `<`, followed by an [email address],
+followed by `>`.  The link's label is the email address,
+and the URL is `mailto:` followed by the email address.
+
+An [email address](@),
+for these purposes, is anything that matches
+the [non-normative regex from the HTML5
+spec](https://html.spec.whatwg.org/multipage/forms.html#e-mail-state-(type=email)):
+
+    /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?
+    (?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
+
+Examples of email autolinks:
+
+```````````````````````````````` example
+<foo@bar.example.com>
+.
+<p><a href="mailto:foo@bar.example.com">foo@bar.example.com</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<foo+special@Bar.baz-bar0.com>
+.
+<p><a href="mailto:foo+special@Bar.baz-bar0.com">foo+special@Bar.baz-bar0.com</a></p>
+````````````````````````````````
+
+
+Backslash-escapes do not work inside email autolinks:
+
+```````````````````````````````` example
+<foo\+@bar.example.com>
+.
+<p>&lt;foo+@bar.example.com&gt;</p>
+````````````````````````````````
+
+
+These are not autolinks:
+
+```````````````````````````````` example
+<>
+.
+<p>&lt;&gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+< http://foo.bar >
+.
+<p>&lt; http://foo.bar &gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<m:abc>
+.
+<p>&lt;m:abc&gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<foo.bar.baz>
+.
+<p>&lt;foo.bar.baz&gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+http://example.com
+.
+<p>http://example.com</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo@bar.example.com
+.
+<p>foo@bar.example.com</p>
+````````````````````````````````
+
+
+## Raw HTML
+
+Text between `<` and `>` that looks like an HTML tag is parsed as a
+raw HTML tag and will be rendered in HTML without escaping.
+Tag and attribute names are not limited to current HTML tags,
+so custom tags (and even, say, DocBook tags) may be used.
+
+Here is the grammar for tags:
+
+A [tag name](@) consists of an ASCII letter
+followed by zero or more ASCII letters, digits, or
+hyphens (`-`).
+
+An [attribute](@) consists of [whitespace],
+an [attribute name], and an optional
+[attribute value specification].
+
+An [attribute name](@)
+consists of an ASCII letter, `_`, or `:`, followed by zero or more ASCII
+letters, digits, `_`, `.`, `:`, or `-`.  (Note:  This is the XML
+specification restricted to ASCII.  HTML5 is laxer.)
+
+An [attribute value specification](@)
+consists of optional [whitespace],
+a `=` character, optional [whitespace], and an [attribute
+value].
+
+An [attribute value](@)
+consists of an [unquoted attribute value],
+a [single-quoted attribute value], or a [double-quoted attribute value].
+
+An [unquoted attribute value](@)
+is a nonempty string of characters not
+including spaces, `"`, `'`, `=`, `<`, `>`, or `` ` ``.
+
+A [single-quoted attribute value](@)
+consists of `'`, zero or more
+characters not including `'`, and a final `'`.
+
+A [double-quoted attribute value](@)
+consists of `"`, zero or more
+characters not including `"`, and a final `"`.
+
+An [open tag](@) consists of a `<` character, a [tag name],
+zero or more [attributes], optional [whitespace], an optional `/`
+character, and a `>` character.
+
+A [closing tag](@) consists of the string `</`, a
+[tag name], optional [whitespace], and the character `>`.
+
+An [HTML comment](@) consists of `<!--` + *text* + `-->`,
+where *text* does not start with `>` or `->`, does not end with `-`,
+and does not contain `--`.  (See the
+[HTML5 spec](http://www.w3.org/TR/html5/syntax.html#comments).)
+
+A [processing instruction](@)
+consists of the string `<?`, a string
+of characters not including the string `?>`, and the string
+`?>`.
+
+A [declaration](@) consists of the
+string `<!`, a name consisting of one or more uppercase ASCII letters,
+[whitespace], a string of characters not including the
+character `>`, and the character `>`.
+
+A [CDATA section](@) consists of
+the string `<![CDATA[`, a string of characters not including the string
+`]]>`, and the string `]]>`.
+
+An [HTML tag](@) consists of an [open tag], a [closing tag],
+an [HTML comment], a [processing instruction], a [declaration],
+or a [CDATA section].
+
+Here are some simple open tags:
+
+```````````````````````````````` example
+<a><bab><c2c>
+.
+<p><a><bab><c2c></p>
+````````````````````````````````
+
+
+Empty elements:
+
+```````````````````````````````` example
+<a/><b2/>
+.
+<p><a/><b2/></p>
+````````````````````````````````
+
+
+[Whitespace] is allowed:
+
+```````````````````````````````` example
+<a  /><b2
+data="foo" >
+.
+<p><a  /><b2
+data="foo" ></p>
+````````````````````````````````
+
+
+With attributes:
+
+```````````````````````````````` example
+<a foo="bar" bam = 'baz <em>"</em>'
+_boolean zoop:33=zoop:33 />
+.
+<p><a foo="bar" bam = 'baz <em>"</em>'
+_boolean zoop:33=zoop:33 /></p>
+````````````````````````````````
+
+
+Custom tag names can be used:
+
+```````````````````````````````` example
+Foo <responsive-image src="foo.jpg" />
+.
+<p>Foo <responsive-image src="foo.jpg" /></p>
+````````````````````````````````
+
+
+Illegal tag names, not parsed as HTML:
+
+```````````````````````````````` example
+<33> <__>
+.
+<p>&lt;33&gt; &lt;__&gt;</p>
+````````````````````````````````
+
+
+Illegal attribute names:
+
+```````````````````````````````` example
+<a h*#ref="hi">
+.
+<p>&lt;a h*#ref=&quot;hi&quot;&gt;</p>
+````````````````````````````````
+
+
+Illegal attribute values:
+
+```````````````````````````````` example
+<a href="hi'> <a href=hi'>
+.
+<p>&lt;a href=&quot;hi'&gt; &lt;a href=hi'&gt;</p>
+````````````````````````````````
+
+
+Illegal [whitespace]:
+
+```````````````````````````````` example
+< a><
+foo><bar/ >
+.
+<p>&lt; a&gt;&lt;
+foo&gt;&lt;bar/ &gt;</p>
+````````````````````````````````
+
+
+Missing [whitespace]:
+
+```````````````````````````````` example
+<a href='bar'title=title>
+.
+<p>&lt;a href='bar'title=title&gt;</p>
+````````````````````````````````
+
+
+Closing tags:
+
+```````````````````````````````` example
+</a></foo >
+.
+<p></a></foo ></p>
+````````````````````````````````
+
+
+Illegal attributes in closing tag:
+
+```````````````````````````````` example
+</a href="foo">
+.
+<p>&lt;/a href=&quot;foo&quot;&gt;</p>
+````````````````````````````````
+
+
+Comments:
+
+```````````````````````````````` example
+foo <!-- this is a
+comment - with hyphen -->
+.
+<p>foo <!-- this is a
+comment - with hyphen --></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo <!-- not a comment -- two hyphens -->
+.
+<p>foo &lt;!-- not a comment -- two hyphens --&gt;</p>
+````````````````````````````````
+
+
+Not comments:
+
+```````````````````````````````` example
+foo <!--> foo -->
+
+foo <!-- foo--->
+.
+<p>foo &lt;!--&gt; foo --&gt;</p>
+<p>foo &lt;!-- foo---&gt;</p>
+````````````````````````````````
+
+
+Processing instructions:
+
+```````````````````````````````` example
+foo <?php echo $a; ?>
+.
+<p>foo <?php echo $a; ?></p>
+````````````````````````````````
+
+
+Declarations:
+
+```````````````````````````````` example
+foo <!ELEMENT br EMPTY>
+.
+<p>foo <!ELEMENT br EMPTY></p>
+````````````````````````````````
+
+
+CDATA sections:
+
+```````````````````````````````` example
+foo <![CDATA[>&<]]>
+.
+<p>foo <![CDATA[>&<]]></p>
+````````````````````````````````
+
+
+Entity and numeric character references are preserved in HTML
+attributes:
+
+```````````````````````````````` example
+foo <a href="&ouml;">
+.
+<p>foo <a href="&ouml;"></p>
+````````````````````````````````
+
+
+Backslash escapes do not work in HTML attributes:
+
+```````````````````````````````` example
+foo <a href="\*">
+.
+<p>foo <a href="\*"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<a href="\"">
+.
+<p>&lt;a href=&quot;&quot;&quot;&gt;</p>
+````````````````````````````````
+
+
+## Hard line breaks
+
+A line break (not in a code span or HTML tag) that is preceded
+by two or more spaces and does not occur at the end of a block
+is parsed as a [hard line break](@) (rendered
+in HTML as a `<br />` tag):
+
+```````````````````````````````` example
+foo  
+baz
+.
+<p>foo<br />
+baz</p>
+````````````````````````````````
+
+
+For a more visible alternative, a backslash before the
+[line ending] may be used instead of two spaces:
+
+```````````````````````````````` example
+foo\
+baz
+.
+<p>foo<br />
+baz</p>
+````````````````````````````````
+
+
+More than two spaces can be used:
+
+```````````````````````````````` example
+foo       
+baz
+.
+<p>foo<br />
+baz</p>
+````````````````````````````````
+
+
+Leading spaces at the beginning of the next line are ignored:
+
+```````````````````````````````` example
+foo  
+     bar
+.
+<p>foo<br />
+bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo\
+     bar
+.
+<p>foo<br />
+bar</p>
+````````````````````````````````
+
+
+Line breaks can occur inside emphasis, links, and other constructs
+that allow inline content:
+
+```````````````````````````````` example
+*foo  
+bar*
+.
+<p><em>foo<br />
+bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo\
+bar*
+.
+<p><em>foo<br />
+bar</em></p>
+````````````````````````````````
+
+
+Line breaks do not occur inside code spans
+
+```````````````````````````````` example
+`code  
+span`
+.
+<p><code>code span</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+`code\
+span`
+.
+<p><code>code\ span</code></p>
+````````````````````````````````
+
+
+or HTML tags:
+
+```````````````````````````````` example
+<a href="foo  
+bar">
+.
+<p><a href="foo  
+bar"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<a href="foo\
+bar">
+.
+<p><a href="foo\
+bar"></p>
+````````````````````````````````
+
+
+Hard line breaks are for separating inline content within a block.
+Neither syntax for hard line breaks works at the end of a paragraph or
+other block element:
+
+```````````````````````````````` example
+foo\
+.
+<p>foo\</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo  
+.
+<p>foo</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+### foo\
+.
+<h3>foo\</h3>
+````````````````````````````````
+
+
+```````````````````````````````` example
+### foo  
+.
+<h3>foo</h3>
+````````````````````````````````
+
+
+## Soft line breaks
+
+A regular line break (not in a code span or HTML tag) that is not
+preceded by two or more spaces or a backslash is parsed as a
+[softbreak](@).  (A softbreak may be rendered in HTML either as a
+[line ending] or as a space. The result will be the same in
+browsers. In the examples here, a [line ending] will be used.)
+
+```````````````````````````````` example
+foo
+baz
+.
+<p>foo
+baz</p>
+````````````````````````````````
+
+
+Spaces at the end of the line and beginning of the next line are
+removed:
+
+```````````````````````````````` example
+foo 
+ baz
+.
+<p>foo
+baz</p>
+````````````````````````````````
+
+
+A conforming parser may render a soft line break in HTML either as a
+line break or as a space.
+
+A renderer may also provide an option to render soft line breaks
+as hard line breaks.
+
+## Textual content
+
+Any characters not given an interpretation by the above rules will
+be parsed as plain textual content.
+
+```````````````````````````````` example
+hello $.;'there
+.
+<p>hello $.;'there</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+Foo χρῆν
+.
+<p>Foo χρῆν</p>
+````````````````````````````````
+
+
+Internal spaces are preserved verbatim:
+
+```````````````````````````````` example
+Multiple     spaces
+.
+<p>Multiple     spaces</p>
+````````````````````````````````
+
+
+<!-- END TESTS -->
+
+# Appendix: A parsing strategy
+
+In this appendix we describe some features of the parsing strategy
+used in the CommonMark reference implementations.
+
+## Overview
+
+Parsing has two phases:
+
+1. In the first phase, lines of input are consumed and the block
+structure of the document---its division into paragraphs, block quotes,
+list items, and so on---is constructed.  Text is assigned to these
+blocks but not parsed. Link reference definitions are parsed and a
+map of links is constructed.
+
+2. In the second phase, the raw text contents of paragraphs and headings
+are parsed into sequences of Markdown inline elements (strings,
+code spans, links, emphasis, and so on), using the map of link
+references constructed in phase 1.
+
+At each point in processing, the document is represented as a tree of
+**blocks**.  The root of the tree is a `document` block.  The `document`
+may have any number of other blocks as **children**.  These children
+may, in turn, have other blocks as children.  The last child of a block
+is normally considered **open**, meaning that subsequent lines of input
+can alter its contents.  (Blocks that are not open are **closed**.)
+Here, for example, is a possible document tree, with the open blocks
+marked by arrows:
+
+``` tree
+-> document
+  -> block_quote
+       paragraph
+         "Lorem ipsum dolor\nsit amet."
+    -> list (type=bullet tight=true bullet_char=-)
+         list_item
+           paragraph
+             "Qui *quodsi iracundia*"
+      -> list_item
+        -> paragraph
+             "aliquando id"
+```
+
+## Phase 1: block structure
+
+Each line that is processed has an effect on this tree.  The line is
+analyzed and, depending on its contents, the document may be altered
+in one or more of the following ways:
+
+1. One or more open blocks may be closed.
+2. One or more new blocks may be created as children of the
+   last open block.
+3. Text may be added to the last (deepest) open block remaining
+   on the tree.
+
+Once a line has been incorporated into the tree in this way,
+it can be discarded, so input can be read in a stream.
+
+For each line, we follow this procedure:
+
+1. First we iterate through the open blocks, starting with the
+root document, and descending through last children down to the last
+open block.  Each block imposes a condition that the line must satisfy
+if the block is to remain open.  For example, a block quote requires a
+`>` character.  A paragraph requires a non-blank line.
+In this phase we may match all or just some of the open
+blocks.  But we cannot close unmatched blocks yet, because we may have a
+[lazy continuation line].
+
+2.  Next, after consuming the continuation markers for existing
+blocks, we look for new block starts (e.g. `>` for a block quote).
+If we encounter a new block start, we close any blocks unmatched
+in step 1 before creating the new block as a child of the last
+matched block.
+
+3.  Finally, we look at the remainder of the line (after block
+markers like `>`, list markers, and indentation have been consumed).
+This is text that can be incorporated into the last open
+block (a paragraph, code block, heading, or raw HTML).
+
+Setext headings are formed when we see a line of a paragraph
+that is a [setext heading underline].
+
+Reference link definitions are detected when a paragraph is closed;
+the accumulated text lines are parsed to see if they begin with
+one or more reference link definitions.  Any remainder becomes a
+normal paragraph.
+
+We can see how this works by considering how the tree above is
+generated by four lines of Markdown:
+
+``` markdown
+> Lorem ipsum dolor
+sit amet.
+> - Qui *quodsi iracundia*
+> - aliquando id
+```
+
+At the outset, our document model is just
+
+``` tree
+-> document
+```
+
+The first line of our text,
+
+``` markdown
+> Lorem ipsum dolor
+```
+
+causes a `block_quote` block to be created as a child of our
+open `document` block, and a `paragraph` block as a child of
+the `block_quote`.  Then the text is added to the last open
+block, the `paragraph`:
+
+``` tree
+-> document
+  -> block_quote
+    -> paragraph
+         "Lorem ipsum dolor"
+```
+
+The next line,
+
+``` markdown
+sit amet.
+```
+
+is a "lazy continuation" of the open `paragraph`, so it gets added
+to the paragraph's text:
+
+``` tree
+-> document
+  -> block_quote
+    -> paragraph
+         "Lorem ipsum dolor\nsit amet."
+```
+
+The third line,
+
+``` markdown
+> - Qui *quodsi iracundia*
+```
+
+causes the `paragraph` block to be closed, and a new `list` block
+opened as a child of the `block_quote`.  A `list_item` is also
+added as a child of the `list`, and a `paragraph` as a child of
+the `list_item`.  The text is then added to the new `paragraph`:
+
+``` tree
+-> document
+  -> block_quote
+       paragraph
+         "Lorem ipsum dolor\nsit amet."
+    -> list (type=bullet tight=true bullet_char=-)
+      -> list_item
+        -> paragraph
+             "Qui *quodsi iracundia*"
+```
+
+The fourth line,
+
+``` markdown
+> - aliquando id
+```
+
+causes the `list_item` (and its child the `paragraph`) to be closed,
+and a new `list_item` opened up as child of the `list`.  A `paragraph`
+is added as a child of the new `list_item`, to contain the text.
+We thus obtain the final tree:
+
+``` tree
+-> document
+  -> block_quote
+       paragraph
+         "Lorem ipsum dolor\nsit amet."
+    -> list (type=bullet tight=true bullet_char=-)
+         list_item
+           paragraph
+             "Qui *quodsi iracundia*"
+      -> list_item
+        -> paragraph
+             "aliquando id"
+```
+
+## Phase 2: inline structure
+
+Once all of the input has been parsed, all open blocks are closed.
+
+We then "walk the tree," visiting every node, and parse raw
+string contents of paragraphs and headings as inlines.  At this
+point we have seen all the link reference definitions, so we can
+resolve reference links as we go.
+
+``` tree
+document
+  block_quote
+    paragraph
+      str "Lorem ipsum dolor"
+      softbreak
+      str "sit amet."
+    list (type=bullet tight=true bullet_char=-)
+      list_item
+        paragraph
+          str "Qui "
+          emph
+            str "quodsi iracundia"
+      list_item
+        paragraph
+          str "aliquando id"
+```
+
+Notice how the [line ending] in the first paragraph has
+been parsed as a `softbreak`, and the asterisks in the first list item
+have become an `emph`.
+
+### An algorithm for parsing nested emphasis and links
+
+By far the trickiest part of inline parsing is handling emphasis,
+strong emphasis, links, and images.  This is done using the following
+algorithm.
+
+When we're parsing inlines and we hit either
+
+- a run of `*` or `_` characters, or
+- a `[` or `![`
+
+we insert a text node with these symbols as its literal content, and we
+add a pointer to this text node to the [delimiter stack](@).
+
+The [delimiter stack] is a doubly linked list.  Each
+element contains a pointer to a text node, plus information about
+
+- the type of delimiter (`[`, `![`, `*`, `_`)
+- the number of delimiters,
+- whether the delimiter is "active" (all are active to start), and
+- whether the delimiter is a potential opener, a potential closer,
+  or both (which depends on what sort of characters precede
+  and follow the delimiters).
+
+When we hit a `]` character, we call the *look for link or image*
+procedure (see below).
+
+When we hit the end of the input, we call the *process emphasis*
+procedure (see below), with `stack_bottom` = NULL.
+
+#### *look for link or image*
+
+Starting at the top of the delimiter stack, we look backwards
+through the stack for an opening `[` or `![` delimiter.
+
+- If we don't find one, we return a literal text node `]`.
+
+- If we do find one, but it's not *active*, we remove the inactive
+  delimiter from the stack, and return a literal text node `]`.
+
+- If we find one and it's active, then we parse ahead to see if
+  we have an inline link/image, reference link/image, compact reference
+  link/image, or shortcut reference link/image.
+
+  + If we don't, then we remove the opening delimiter from the
+    delimiter stack and return a literal text node `]`.
+
+  + If we do, then
+
+    * We return a link or image node whose children are the inlines
+      after the text node pointed to by the opening delimiter.
+
+    * We run *process emphasis* on these inlines, with the `[` opener
+      as `stack_bottom`.
+
+    * We remove the opening delimiter.
+
+    * If we have a link (and not an image), we also set all
+      `[` delimiters before the opening delimiter to *inactive*.  (This
+      will prevent us from getting links within links.)
+
+#### *process emphasis*
+
+Parameter `stack_bottom` sets a lower bound to how far we
+descend in the [delimiter stack].  If it is NULL, we can
+go all the way to the bottom.  Otherwise, we stop before
+visiting `stack_bottom`.
+
+Let `current_position` point to the element on the [delimiter stack]
+just above `stack_bottom` (or the first element if `stack_bottom`
+is NULL).
+
+We keep track of the `openers_bottom` for each delimiter
+type (`*`, `_`).  Initialize this to `stack_bottom`.
+
+Then we repeat the following until we run out of potential
+closers:
+
+- Move `current_position` forward in the delimiter stack (if needed)
+  until we find the first potential closer with delimiter `*` or `_`.
+  (This will be the potential closer closest
+  to the beginning of the input -- the first one in parse order.)
+
+- Now, look back in the stack (staying above `stack_bottom` and
+  the `openers_bottom` for this delimiter type) for the
+  first matching potential opener ("matching" means same delimiter).
+
+- If one is found:
+
+  + Figure out whether we have emphasis or strong emphasis:
+    if both closer and opener spans have length >= 2, we have
+    strong, otherwise regular.
+
+  + Insert an emph or strong emph node accordingly, after
+    the text node corresponding to the opener.
+
+  + Remove any delimiters between the opener and closer from
+    the delimiter stack.
+
+  + Remove 1 (for regular emph) or 2 (for strong emph) delimiters
+    from the opening and closing text nodes.  If they become empty
+    as a result, remove them and remove the corresponding element
+    of the delimiter stack.  If the closing node is removed, reset
+    `current_position` to the next element in the stack.
+
+- If none in found:
+
+  + Set `openers_bottom` to the element before `current_position`.
+    (We know that there are no openers for this kind of closer up to and
+    including this point, so this puts a lower bound on future searches.)
+
+  + If the closer at `current_position` is not a potential opener,
+    remove it from the delimiter stack (since we know it can't
+    be a closer either).
+
+  + Advance `current_position` to the next element in the stack.
+
+After we're done, we remove all delimiters above `stack_bottom` from the
+delimiter stack.
+
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 77b43be5942..9b74645bf91 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -14,7 +14,7 @@ describe ApplicationHelper do
   describe "mobile_view?" do
     context "enable_mobile_theme is true" do
       before do
-        SiteSetting.stubs(:enable_mobile_theme).returns(true)
+        SiteSetting.enable_mobile_theme = true
       end
 
       it "is true if mobile_view is '1' in the session" do
@@ -67,7 +67,7 @@ describe ApplicationHelper do
 
     context "enable_mobile_theme is false" do
       before do
-        SiteSetting.stubs(:enable_mobile_theme).returns(false)
+        SiteSetting.enable_mobile_theme = false
       end
 
       it "is false if mobile_view is '1' in the session" do
diff --git a/spec/integration/groups_spec.rb b/spec/integration/groups_spec.rb
index 788d72c1b1f..c380368de5f 100644
--- a/spec/integration/groups_spec.rb
+++ b/spec/integration/groups_spec.rb
@@ -5,13 +5,8 @@ describe "Groups" do
   let(:group) { Fabricate(:group, users: [user]) }
 
   describe 'viewing groups' do
-    let(:other_group) do
-      Fabricate(:group, name: '0000', visible: true, automatic: false)
-    end
-
-    before do
-      other_group
-      group.update_attributes!(automatic: true, visible: true)
+    let!(:staff_group) do
+      Fabricate(:group, name: '0000', visibility_level: Group.visibility_levels[:staff])
     end
 
     context 'when group directory is disabled' do
@@ -24,6 +19,7 @@ describe "Groups" do
     end
 
     it 'should return the right response' do
+      group
       get "/groups.json"
 
       expect(response).to be_success
@@ -33,8 +29,8 @@ describe "Groups" do
       group_ids = response_body["groups"].map { |g| g["id"] }
 
       expect(response_body["extras"]["group_user_ids"]).to eq([])
-      expect(group_ids).to include(other_group.id)
-      expect(group_ids).to_not include(group.id)
+      expect(group_ids).to include(group.id)
+      expect(group_ids).to_not include(staff_group.id)
       expect(response_body["load_more_groups"]).to eq("/groups?page=1")
       expect(response_body["total_rows_groups"]).to eq(1)
     end
@@ -54,7 +50,7 @@ describe "Groups" do
         group_ids = response_body["groups"].map { |g| g["id"] }
 
         expect(response_body["extras"]["group_user_ids"]).to eq([group.id])
-        expect(group_ids).to include(group.id, other_group.id)
+        expect(group_ids).to include(group.id, staff_group.id)
         expect(response_body["load_more_groups"]).to eq("/groups?page=1")
         expect(response_body["total_rows_groups"]).to eq(10)
       end
@@ -151,26 +147,6 @@ describe "Groups" do
     end
   end
 
-  describe 'owners' do
-    let(:user1) { Fabricate(:user, last_seen_at: Time.zone.now) }
-    let(:user2) { Fabricate(:user, last_seen_at: Time.zone.now - 1 .day) }
-    let(:group) { Fabricate(:group, users: [user, user1, user2]) }
-
-    it 'should return the right list of owners' do
-      group.add_owner(user1)
-      group.add_owner(user2)
-
-      xhr :get, "/groups/#{group.name}/owners"
-
-      expect(response).to be_success
-
-      owners = JSON.parse(response.body)
-
-      expect(owners.count).to eq(2)
-      expect(owners.map { |o| o["id"] }.sort).to eq([user1.id, user2.id])
-    end
-  end
-
   describe 'members' do
     let(:user1) do
       Fabricate(:user,
@@ -340,6 +316,13 @@ describe "Groups" do
 
           expect(response).to be_success
         end
+
+        it "adds by email" do
+          expect { xhr :put, "/groups/#{group.id}/members", user_emails: [user1.email, user2.email].join(",") }
+            .to change { group.users.count }.by(2)
+
+          expect(response).to be_success
+        end
       end
 
       it "returns 422 if member already exists" do
@@ -555,4 +538,137 @@ describe "Groups" do
       end
     end
   end
+
+  describe "requesting membership for a group" do
+    let(:new_user) { Fabricate(:user) }
+
+    it 'requires the user to log in' do
+      expect do
+        xhr :post, "/groups/#{group.name}/request_membership"
+      end.to raise_error(Discourse::NotLoggedIn)
+    end
+
+    it 'should create the right PM' do
+      owner1 = Fabricate(:user, last_seen_at: Time.zone.now)
+      owner2 = Fabricate(:user, last_seen_at: Time.zone.now - 1 .day)
+      [owner1, owner2].each { |owner| group.add_owner(owner) }
+
+      sign_in(user)
+
+      xhr :post, "/groups/#{group.name}/request_membership"
+
+      expect(response).to be_success
+
+      post = Post.last
+      topic = post.topic
+      body = JSON.parse(response.body)
+
+      expect(body['relative_url']).to eq(topic.relative_url)
+      expect(post.user).to eq(user)
+
+      expect(topic.title).to eq(I18n.t('groups.request_membership_pm.title',
+        group_name: group.name
+      ))
+
+      expect(post.raw).to eq(I18n.t(
+        'groups.request_membership_pm.body', group_name: group.name
+      ))
+
+      expect(topic.archetype).to eq(Archetype.private_message)
+      expect(topic.allowed_users).to contain_exactly(user, owner1, owner2)
+      expect(topic.allowed_groups).to eq([])
+    end
+  end
+
+  describe 'search for groups' do
+    let(:hidden_group) do
+      Fabricate(:group,
+        visibility_level: Group.visibility_levels[:owners],
+        name: 'KingOfTheNorth'
+      )
+    end
+
+    before do
+      group.update!(
+        name: 'GOT',
+        full_name: 'Daenerys Targaryen'
+      )
+
+      hidden_group
+    end
+
+    context 'as an anon user' do
+      it "returns the right response" do
+        expect { xhr :get, '/groups/search' }.to raise_error(Discourse::NotLoggedIn)
+      end
+    end
+
+    context 'as a normal user' do
+      it "returns the right response" do
+        sign_in(user)
+
+        xhr :get, '/groups/search'
+
+        expect(response).to be_success
+        groups = JSON.parse(response.body)
+
+        expected_ids = Group::AUTO_GROUPS.map { |name, id| id }
+        expected_ids.delete(Group::AUTO_GROUPS[:everyone])
+        expected_ids << group.id
+
+        expect(groups.map { |group| group["id"] }).to contain_exactly(*expected_ids)
+
+        ['GO', 'nerys'].each do |term|
+          xhr :get, "/groups/search?term=#{term}"
+
+          expect(response).to be_success
+          groups = JSON.parse(response.body)
+
+          expect(groups.length).to eq(1)
+          expect(groups.first['id']).to eq(group.id)
+        end
+
+        xhr :get, "/groups/search?term=KingOfTheNorth"
+
+        expect(response).to be_success
+        groups = JSON.parse(response.body)
+
+        expect(groups).to eq([])
+      end
+    end
+
+    context 'as a group owner' do
+      before do
+        hidden_group.add_owner(user)
+      end
+
+      it "returns the right response" do
+        sign_in(user)
+
+        xhr :get, "/groups/search?term=north"
+
+        expect(response).to be_success
+        groups = JSON.parse(response.body)
+
+        expect(groups.length).to eq(1)
+        expect(groups.first['id']).to eq(hidden_group.id)
+      end
+    end
+
+    context 'as an admin' do
+      it "returns the right response" do
+        sign_in(Fabricate(:admin))
+
+        xhr :get, '/groups/search?ignore_automatic=true'
+
+        expect(response).to be_success
+        groups = JSON.parse(response.body)
+
+        expect(groups.length).to eq(2)
+
+        expect(groups.map { |group| group['id'] })
+          .to contain_exactly(group.id, hidden_group.id)
+      end
+    end
+  end
 end
diff --git a/spec/integration/managing_topic_status_spec.rb b/spec/integration/managing_topic_status_spec.rb
index 0673c279597..eede1cbb096 100644
--- a/spec/integration/managing_topic_status_spec.rb
+++ b/spec/integration/managing_topic_status_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe "Managing a topic's status update", type: :request do
     end
 
     it 'should be able to delete a topic status update' do
-      topic.update!(topic_timers: [Fabricate(:topic_timer)])
+      Fabricate(:topic_timer, topic: topic)
 
       post "/t/#{topic.id}/timer.json",
         time: nil,
diff --git a/spec/integration/omniauth_callbacks_spec.rb b/spec/integration/omniauth_callbacks_spec.rb
index 59b22b2ff45..2f855576963 100644
--- a/spec/integration/omniauth_callbacks_spec.rb
+++ b/spec/integration/omniauth_callbacks_spec.rb
@@ -49,13 +49,13 @@ RSpec.describe "OmniAuth Callbacks" do
       end
 
       it 'should return the right response' do
+        expect(user.email_confirmed?).to eq(false)
+
         events = DiscourseEvent.track_events do
           get "/auth/google_oauth2/callback.json"
         end
 
-        expect(events.map { |event| event[:event_name] }).to include(
-          :user_logged_in, :user_first_logged_in
-        )
+        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
 
         expect(response).to be_success
 
@@ -66,6 +66,27 @@ RSpec.describe "OmniAuth Callbacks" do
         expect(response_body["awaiting_approval"]).to eq(false)
         expect(response_body["not_allowed_from_ip_address"]).to eq(false)
         expect(response_body["admin_not_allowed_from_ip_address"]).to eq(false)
+
+        user.reload
+        expect(user.email_confirmed?).to eq(true)
+      end
+
+      it "should confirm email even when the tokens are expired" do
+        user.email_tokens.update_all(confirmed: false, expired: true)
+
+        user.reload
+        expect(user.email_confirmed?).to eq(false)
+
+        events = DiscourseEvent.track_events do
+          get "/auth/google_oauth2/callback.json"
+        end
+
+        expect(events.map { |event| event[:event_name] }).to include(:user_logged_in, :user_first_logged_in)
+
+        expect(response).to be_success
+
+        user.reload
+        expect(user.email_confirmed?).to eq(true)
       end
 
       context 'when user has not verified his email' do
diff --git a/spec/integration/topic_auto_close_spec.rb b/spec/integration/topic_auto_close_spec.rb
index 75d2e07c2cd..ad4a091cd26 100644
--- a/spec/integration/topic_auto_close_spec.rb
+++ b/spec/integration/topic_auto_close_spec.rb
@@ -33,11 +33,7 @@ describe Topic do
     context 'jobs may be queued' do
       before do
         SiteSetting.queue_jobs = true
-        Timecop.freeze(Time.zone.now)
-      end
-
-      after do
-        Timecop.return
+        freeze_time
       end
 
       context 'category has a default auto-close' do
@@ -78,14 +74,14 @@ describe Topic do
 
           context 'topic is closed manually' do
             it 'should remove the schedule to auto-close the topic' do
-              Timecop.freeze do
-                topic_timer_id = staff_topic.public_topic_timer.id
+              freeze_time
 
-                staff_topic.update_status('closed', true, admin)
+              topic_timer_id = staff_topic.public_topic_timer.id
 
-                expect(TopicTimer.with_deleted.find(topic_timer_id).deleted_at)
-                  .to be_within(1.second).of(Time.zone.now)
-              end
+              staff_topic.update_status('closed', true, admin)
+
+              expect(TopicTimer.with_deleted.find(topic_timer_id).deleted_at)
+                .to be_within(1.second).of(Time.zone.now)
             end
           end
         end
diff --git a/spec/integrity/common_mark_spec.rb b/spec/integrity/common_mark_spec.rb
new file mode 100644
index 00000000000..9d2427d8426
--- /dev/null
+++ b/spec/integrity/common_mark_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+describe "CommonMark" do
+  it 'passes spec' do
+
+    SiteSetting.traditional_markdown_linebreaks = true
+    SiteSetting.enable_markdown_typographer = false
+
+    html,state,md = nil
+    failed = 0
+
+    File.readlines(Rails.root + 'spec/fixtures/md/spec.txt').each do |line|
+      if line == "```````````````````````````````` example\n"
+        state = :example
+        next
+      end
+
+      if line == "````````````````````````````````\n"
+        md.gsub!('→', "\t")
+        html ||= String.new
+        html.gsub!('→', "\t")
+        html.strip!
+
+        # normalize brs
+        html.gsub!('<br />', '<br>')
+        html.gsub!('<hr />', '<hr>')
+        html.gsub!(/<img([^>]+) \/>/, "<img\\1>")
+
+        cooked = PrettyText.markdown(md, sanitize: false, linkify: false)
+        cooked.strip!
+        cooked.gsub!(" class=\"lang-auto\"", '')
+        cooked.gsub!(/<span class="hashtag">(.*)<\/span>/, "\\1")
+        # we don't care about this
+        cooked.gsub!("<blockquote>\n</blockquote>", "<blockquote></blockquote>")
+        html.gsub!("<blockquote>\n</blockquote>", "<blockquote></blockquote>")
+        html.gsub!("language-ruby", "lang-ruby")
+        # strip out unsupported languages
+        html.gsub!(/ class="language-[;f].*"/, "")
+
+        unless cooked == html
+          failed += 1
+          puts "FAILED SPEC"
+          puts "Expected: "
+          puts html
+          puts "Got: "
+          puts cooked
+          puts "Markdown: "
+          puts md
+          puts
+        end
+        html,state,md = nil
+        next
+      end
+
+      if state == :example && line == ".\n"
+        state = :html
+        next
+      end
+
+      if state == :example
+        md = (md || String.new) << line
+      end
+
+      if state == :html
+        html = (html || String.new) << line
+      end
+
+
+    end
+
+    expect(failed).to eq(0)
+  end
+end
diff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rb
index 9dac7ebf689..616e826b121 100644
--- a/spec/integrity/i18n_spec.rb
+++ b/spec/integrity/i18n_spec.rb
@@ -59,6 +59,16 @@ describe "i18n integrity checks" do
     end
   end
 
+  Dir["#{Rails.root}/config/locales/{client,server}.*.yml"].each do |path|
+    it "does not contain invalid interpolation keys for '#{path}'" do
+      matches = File.read(path).scan(/%\{([^a-zA-Z\s]+)\}|\{\{([^a-zA-Z\s]+)\}\}/)
+      matches.flatten!
+      matches.compact!
+      matches.uniq!
+      expect(matches).to eq([])
+    end
+  end
+
   Dir["#{Rails.root}/config/locales/client.*.yml"].each do |path|
     it "has valid client YAML for '#{path}'" do
       yaml = YAML.load_file(path)
diff --git a/spec/jobs/automatic_group_membership_spec.rb b/spec/jobs/automatic_group_membership_spec.rb
index 5989deb4898..55776b99e42 100644
--- a/spec/jobs/automatic_group_membership_spec.rb
+++ b/spec/jobs/automatic_group_membership_spec.rb
@@ -8,19 +8,21 @@ describe Jobs::AutomaticGroupMembership do
   end
 
   it "updates the membership" do
-    user1 = Fabricate(:user, email: "foo@wat.com")
-    user2 = Fabricate(:user, email: "foo@bar.com")
-    user3 = Fabricate(:user, email: "bar@wat.com", staged: true)
-    user4 = Fabricate(:user, email: "abc@wat.com", active: false)
+    user1 = Fabricate(:user, email: "no@bar.com")
+    user2 = Fabricate(:user, email: "no@wat.com")
+    user3 = Fabricate(:user, email: "noo@wat.com", staged: true)
+    user4 = Fabricate(:user, email: "yes@wat.com")
+    EmailToken.confirm(user4.email_tokens.last.token)
+
     group = Fabricate(:group, automatic_membership_email_domains: "wat.com", automatic_membership_retroactive: true)
 
     Jobs::AutomaticGroupMembership.new.execute(group_id: group.id)
 
     group.reload
-    expect(group.users.include?(user1)).to eq(true)
+    expect(group.users.include?(user1)).to eq(false)
     expect(group.users.include?(user2)).to eq(false)
     expect(group.users.include?(user3)).to eq(false)
-    expect(group.users.include?(user4)).to eq(false)
+    expect(group.users.include?(user4)).to eq(true)
   end
 
 end
diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb
index e9f649cbe16..d04a9eda8bd 100644
--- a/spec/jobs/clean_up_uploads_spec.rb
+++ b/spec/jobs/clean_up_uploads_spec.rb
@@ -33,6 +33,18 @@ describe Jobs::CleanUpUploads do
     expect(Upload.find_by(id: logo_upload.id)).to eq(logo_upload)
   end
 
+  it "does not clean up uploads in site settings when they use the CDN" do
+    Discourse.stubs(:asset_host).returns("//my.awesome.cdn")
+
+    logo_small_upload = fabricate_upload
+    SiteSetting.logo_small_url = "#{Discourse.asset_host}#{logo_small_upload.url}"
+
+    Jobs::CleanUpUploads.new.execute(nil)
+
+    expect(Upload.find_by(id: @upload.id)).to eq(nil)
+    expect(Upload.find_by(id: logo_small_upload.id)).to eq(logo_small_upload)
+  end
+
   it "does not delete profile background uploads" do
     profile_background_upload = fabricate_upload
     UserProfile.last.update_attributes!(profile_background: profile_background_upload.url)
diff --git a/spec/jobs/dashboard_stats_spec.rb b/spec/jobs/dashboard_stats_spec.rb
index 1a325f62ee3..9a339c53a87 100644
--- a/spec/jobs/dashboard_stats_spec.rb
+++ b/spec/jobs/dashboard_stats_spec.rb
@@ -2,17 +2,17 @@ require 'rails_helper'
 
 describe Jobs::DashboardStats do
   it 'caches the stats' do
-    Timecop.freeze do
-      begin
-        stats = AdminDashboardData.fetch_stats.to_json
-        cache_key = AdminDashboardData.stats_cache_key
+    freeze_time
 
-        expect($redis.get(cache_key)).to eq(nil)
-        expect(described_class.new.execute({})).to eq(stats)
-        expect($redis.get(cache_key)).to eq(stats)
-      ensure
-        $redis.del(cache_key)
-      end
+    begin
+      stats = AdminDashboardData.fetch_stats.to_json
+      cache_key = AdminDashboardData.stats_cache_key
+
+      expect($redis.get(cache_key)).to eq(nil)
+      expect(described_class.new.execute({})).to eq(stats)
+      expect($redis.get(cache_key)).to eq(stats)
+    ensure
+      $redis.del(cache_key)
     end
   end
 end
diff --git a/spec/jobs/delete_topic_spec.rb b/spec/jobs/delete_topic_spec.rb
index 11a49d7a29c..03ca8a53efa 100644
--- a/spec/jobs/delete_topic_spec.rb
+++ b/spec/jobs/delete_topic_spec.rb
@@ -4,9 +4,7 @@ describe Jobs::DeleteTopic do
   let(:admin) { Fabricate(:admin) }
 
   let(:topic) do
-    Fabricate(:topic,
-      topic_timers: [Fabricate(:topic_timer, user: admin)]
-    )
+    Fabricate(:topic_timer, user: admin).topic
   end
 
   let(:first_post) { create_post(topic: topic) }
@@ -18,47 +16,47 @@ describe Jobs::DeleteTopic do
   it "can delete a topic" do
     first_post
 
-    Timecop.freeze(2.hours.from_now) do
-      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
-      expect(topic.reload).to be_trashed
-      expect(first_post.reload).to be_trashed
-      expect(topic.reload.public_topic_timer).to eq(nil)
-    end
+    freeze_time (2.hours.from_now)
+
+    described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+    expect(topic.reload).to be_trashed
+    expect(first_post.reload).to be_trashed
+    expect(topic.reload.public_topic_timer).to eq(nil)
+
   end
 
   it "should do nothing if topic is already deleted" do
     first_post
     topic.trash!
-    Timecop.freeze(2.hours.from_now) do
-      Topic.any_instance.expects(:trash!).never
-      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
-    end
+
+    freeze_time 2.hours.from_now
+
+    Topic.any_instance.expects(:trash!).never
+    described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
   end
 
   it "should do nothing if it's too early" do
-    t = Fabricate(:topic,
-      topic_timers: [Fabricate(:topic_timer, user: admin, execute_at: 5.hours.from_now)]
-    )
+    t = Fabricate(:topic_timer, user: admin, execute_at: 5.hours.from_now).topic
     create_post(topic: t)
-    Timecop.freeze(4.hours.from_now) do
-      described_class.new.execute(topic_timer_id: t.public_topic_timer.id)
-      expect(t.reload).to_not be_trashed
-    end
+
+    freeze_time 4.hours.from_now
+
+    described_class.new.execute(topic_timer_id: t.public_topic_timer.id)
+    expect(t.reload).to_not be_trashed
   end
 
   describe "user isn't authorized to delete topics" do
     let(:topic) {
-      Fabricate(:topic,
-        topic_timers: [Fabricate(:topic_timer, user: Fabricate(:user))]
-      )
+      Fabricate(:topic_timer, user: Fabricate(:user)).topic
     }
 
     it "shouldn't delete the topic" do
       create_post(topic: topic)
-      Timecop.freeze(2.hours.from_now) do
-        described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
-        expect(topic.reload).to_not be_trashed
-      end
+
+      freeze_time 2.hours.from_now
+
+      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+      expect(topic.reload).to_not be_trashed
     end
   end
 
diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb
index acb3f16403d..089bf243b52 100644
--- a/spec/jobs/enqueue_digest_emails_spec.rb
+++ b/spec/jobs/enqueue_digest_emails_spec.rb
@@ -18,14 +18,9 @@ describe Jobs::EnqueueDigestEmails do
       let!(:unapproved_user) { Fabricate(:active_user, approved: false, last_emailed_at: 8.days.ago, last_seen_at: 10.days.ago) }
 
       before do
-        @original_value = SiteSetting.must_approve_users
         SiteSetting.must_approve_users = true
       end
 
-      after do
-        SiteSetting.must_approve_users = @original_value
-      end
-
       it 'should enqueue the right digest emails' do
         expect(Jobs::EnqueueDigestEmails.new.target_user_ids.include?(unapproved_user.id)).to eq(false)
 
@@ -123,7 +118,7 @@ describe Jobs::EnqueueDigestEmails do
       end
 
       it "enqueues the digest email job" do
-        SiteSetting.stubs(:disable_digest_emails?).returns(false)
+        SiteSetting.disable_digest_emails = false
         Jobs.expects(:enqueue).with(:user_email, type: :digest, user_id: user.id)
         Jobs::EnqueueDigestEmails.new.execute({})
       end
diff --git a/spec/jobs/grant_anniversary_badges_spec.rb b/spec/jobs/grant_anniversary_badges_spec.rb
index a391b8c2f12..69a93dccada 100644
--- a/spec/jobs/grant_anniversary_badges_spec.rb
+++ b/spec/jobs/grant_anniversary_badges_spec.rb
@@ -102,9 +102,10 @@ describe Jobs::GrantAnniversaryBadges do
       user = Fabricate(:user, created_at: 800.days.ago)
       Fabricate(:post, user: user, created_at: 450.days.ago)
 
-      Timecop.freeze(400.days.ago) do
+      freeze_time(400.days.ago) do
         granter.execute({})
       end
+
       badge = user.user_badges.where(badge_id: Badge::Anniversary)
       expect(badge.count).to eq(1)
 
diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb
index a5e6203ac35..9f200eceb24 100644
--- a/spec/jobs/jobs_spec.rb
+++ b/spec/jobs/jobs_spec.rb
@@ -107,17 +107,15 @@ describe Jobs do
 
   describe 'enqueue_at' do
     it 'calls enqueue_in for you' do
-      Timecop.freeze(Time.zone.now) do
-        Jobs.expects(:enqueue_in).with(3 * 60 * 60, :eat_lunch, {}).returns(true)
-        Jobs.enqueue_at(3.hours.from_now, :eat_lunch, {})
-      end
+      freeze_time
+      Jobs.expects(:enqueue_in).with(3 * 60 * 60, :eat_lunch, {}).returns(true)
+      Jobs.enqueue_at(3.hours.from_now, :eat_lunch, {})
     end
 
     it 'handles datetimes that are in the past' do
-      Timecop.freeze(Time.zone.now) do
-        Jobs.expects(:enqueue_in).with(0, :eat_lunch, {}).returns(true)
-        Jobs.enqueue_at(3.hours.ago, :eat_lunch, {})
-      end
+      freeze_time
+      Jobs.expects(:enqueue_in).with(0, :eat_lunch, {}).returns(true)
+      Jobs.enqueue_at(3.hours.ago, :eat_lunch, {})
     end
   end
 
diff --git a/spec/jobs/notify_mailing_list_subscribers_spec.rb b/spec/jobs/notify_mailing_list_subscribers_spec.rb
index 1749b1df15a..acad55f5099 100644
--- a/spec/jobs/notify_mailing_list_subscribers_spec.rb
+++ b/spec/jobs/notify_mailing_list_subscribers_spec.rb
@@ -21,6 +21,13 @@ describe Jobs::NotifyMailingListSubscribers do
       UserNotifications.expects(:mailing_list_notify).with(mailing_list_user, post).once
       Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
     end
+
+    it "triggers :notify_mailing_list_subscribers" do
+      events = DiscourseEvent.track_events do
+        Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
+      end
+      expect(events).to include({ event_name: :notify_mailing_list_subscribers, params: [[mailing_list_user], post] })
+    end
   end
 
   context "when mailing list mode is globally disabled" do
diff --git a/spec/jobs/pending_flags_reminder_spec.rb b/spec/jobs/pending_flags_reminder_spec.rb
index 25f6eb673b0..a99852b02f2 100644
--- a/spec/jobs/pending_flags_reminder_spec.rb
+++ b/spec/jobs/pending_flags_reminder_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe Jobs::PendingFlagsReminder do
   context "notify_about_flags_after is 0" do
-    before { SiteSetting.stubs(:notify_about_flags_after).returns(0) }
+    before { SiteSetting.notify_about_flags_after = 0 }
 
     it "never notifies" do
       PostAction.stubs(:flagged_posts_count).returns(1)
diff --git a/spec/jobs/pending_queued_posts_reminder_spec.rb b/spec/jobs/pending_queued_posts_reminder_spec.rb
index fe5a1c79563..3eb0f6c4b57 100644
--- a/spec/jobs/pending_queued_posts_reminder_spec.rb
+++ b/spec/jobs/pending_queued_posts_reminder_spec.rb
@@ -2,7 +2,7 @@ require "rails_helper"
 
 describe Jobs::PendingQueuedPostReminder do
   context "notify_about_queued_posts_after is 0" do
-    before { SiteSetting.stubs(:notify_about_queued_posts_after).returns(0) }
+    before { SiteSetting.notify_about_queued_posts_after = 0 }
 
     it "never emails" do
       described_class.any_instance.expects(:should_notify_ids).never
diff --git a/spec/jobs/pending_users_reminder_spec.rb b/spec/jobs/pending_users_reminder_spec.rb
index c844184522d..2d13df00d5f 100644
--- a/spec/jobs/pending_users_reminder_spec.rb
+++ b/spec/jobs/pending_users_reminder_spec.rb
@@ -43,7 +43,7 @@ describe Jobs::PendingUsersReminder do
 
   context 'must_approve_users is false' do
     before do
-      SiteSetting.stubs(:must_approve_users).returns(false)
+      SiteSetting.must_approve_users = false
     end
 
     it "doesn't send a message to anyone when there are pending users" do
diff --git a/spec/jobs/process_post_spec.rb b/spec/jobs/process_post_spec.rb
index e240f6ef9d5..9c21d4f5fb8 100644
--- a/spec/jobs/process_post_spec.rb
+++ b/spec/jobs/process_post_spec.rb
@@ -50,7 +50,7 @@ describe Jobs::ProcessPost do
 
     it "extracts links to quoted posts" do
       quoted_post = Fabricate(:post, raw: "This is a post with a link to https://www.discourse.org", post_number: 42)
-      post.update_columns(raw: "This quote is the best\n\n[quote=\"#{quoted_post.user.username}, topic:#{quoted_post.topic_id}, post:#{quoted_post.post_number}\"]#{quoted_post.excerpt}[/quote]")
+      post.update_columns(raw: "This quote is the best\n\n[quote=\"#{quoted_post.user.username}, topic:#{quoted_post.topic_id}, post:#{quoted_post.post_number}\"]\n#{quoted_post.excerpt}\n[/quote]")
       # when creating a quote, we also create the reflexion link
       expect { Jobs::ProcessPost.new.execute(post_id: post.id) }.to change { TopicLink.count }.by(2)
     end
diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb
index 2cb97a1ccad..247ccb37448 100644
--- a/spec/jobs/publish_topic_to_category_spec.rb
+++ b/spec/jobs/publish_topic_to_category_spec.rb
@@ -5,12 +5,15 @@ RSpec.describe Jobs::PublishTopicToCategory do
   let(:another_category) { Fabricate(:category) }
 
   let(:topic) do
-    Fabricate(:topic, category: category, topic_timers: [
-      Fabricate(:topic_timer,
-        status_type: TopicTimer.types[:publish_to_category],
-        category_id: another_category.id
-      )
-    ])
+    topic = Fabricate(:topic, category: category)
+
+    Fabricate(:topic_timer,
+      status_type: TopicTimer.types[:publish_to_category],
+      category_id: another_category.id,
+      topic: topic
+    )
+
+    topic
   end
 
   before do
@@ -26,7 +29,10 @@ RSpec.describe Jobs::PublishTopicToCategory do
 
   describe 'when topic has been deleted' do
     it 'should not publish the topic to the new category' do
-      Timecop.travel(1.hour.ago) { topic }
+      freeze_time 1.hour.ago
+      topic
+
+      freeze_time 1.hour.from_now
       topic.trash!
 
       described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
@@ -38,7 +44,9 @@ RSpec.describe Jobs::PublishTopicToCategory do
   end
 
   it 'should publish the topic to the new category' do
-    Timecop.travel(1.hour.ago) { topic.update!(visible: false) }
+    freeze_time 1.hour.ago do
+      topic.update!(visible: false)
+    end
 
     message = MessageBus.track_publish do
       described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
@@ -59,7 +67,7 @@ RSpec.describe Jobs::PublishTopicToCategory do
 
   describe 'when topic is a private message' do
     before do
-      Timecop.travel(1.hour.ago) do
+      freeze_time 1.hour.ago do
         expect { topic.convert_to_private_message(Discourse.system_user) }
           .to change { topic.private_message? }.to(true)
       end
diff --git a/spec/jobs/pull_hotlinked_images_spec.rb b/spec/jobs/pull_hotlinked_images_spec.rb
index ed680f9983f..19e0049d059 100644
--- a/spec/jobs/pull_hotlinked_images_spec.rb
+++ b/spec/jobs/pull_hotlinked_images_spec.rb
@@ -3,30 +3,102 @@ require 'jobs/regular/pull_hotlinked_images'
 
 describe Jobs::PullHotlinkedImages do
 
-  before do
-    png = Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==")
-    stub_request(:get, "http://wiki.mozilla.org/images/2/2e/Longcat1.png").to_return(body: png)
-    stub_request(:head, "http://wiki.mozilla.org/images/2/2e/Longcat1.png")
-    SiteSetting.download_remote_images_to_local = true
-    FastImage.expects(:size).returns([100, 100]).at_least_once
+  describe '#execute' do
+    let(:image_url) { "http://wiki.mozilla.org/images/2/2e/Longcat1.png" }
+    let(:png) { Base64.decode64("R0lGODlhAQABALMAAAAAAIAAAACAAICAAAAAgIAAgACAgMDAwICAgP8AAAD/AP//AAAA//8A/wD//wBiZCH5BAEAAA8ALAAAAAABAAEAAAQC8EUAOw==") }
+
+    before do
+      stub_request(:get, image_url).to_return(body: png, headers: { "Content-Type" => "image/png" })
+      stub_request(:head, image_url)
+      SiteSetting.download_remote_images_to_local = true
+      FastImage.expects(:size).returns([100, 100]).at_least_once
+    end
+
+    it 'replaces images' do
+      post = Fabricate(:post, raw: "<img src='http://wiki.mozilla.org/images/2/2e/Longcat1.png'>")
+
+      Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
+      post.reload
+
+      expect(post.raw).to match(/^<img src='\/uploads/)
+    end
+
+    it 'replaces images without protocol' do
+      post = Fabricate(:post, raw: "<img src='//wiki.mozilla.org/images/2/2e/Longcat1.png'>")
+
+      Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
+      post.reload
+
+      expect(post.raw).to match(/^<img src='\/uploads/)
+    end
+
+    it 'replaces images without extension' do
+      extensionless_url = "http://wiki.mozilla.org/images/2/2e/Longcat1"
+      stub_request(:get, extensionless_url).to_return(body: png, headers: { "Content-Type" => "image/png" })
+      stub_request(:head, extensionless_url)
+      post = Fabricate(:post, raw: "<img src='#{extensionless_url}'>")
+
+      Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
+      post.reload
+
+      expect(post.raw).to match(/^<img src='\/uploads/)
+    end
+
+    describe 'onebox' do
+      let(:media) { "File:Brisbane_May_2013201.jpg" }
+      let(:url) { "https://commons.wikimedia.org/wiki/#{media}" }
+      let(:api_url) { "https://en.wikipedia.org/w/api.php?action=query&titles=#{media}&prop=imageinfo&iilimit=50&iiprop=timestamp|user|url&iiurlwidth=500&format=json" }
+
+      before do
+        SiteSetting.queue_jobs = true
+        stub_request(:get, url).to_return(body: '')
+        stub_request(:head, url)
+        stub_request(:get, api_url).to_return(body: "{
+          \"query\": {
+            \"pages\": {
+              \"-1\": {
+                \"title\": \"#{media}\",
+                \"imageinfo\": [{
+                  \"thumburl\": \"#{image_url}\",
+                  \"url\": \"#{image_url}\",
+                  \"descriptionurl\": \"#{url}\"
+                }]
+              }
+            }
+          }
+        }")
+        stub_request(:head, api_url)
+      end
+
+      it 'replaces image src' do
+        post = Fabricate(:post, raw: "#{url}")
+
+        Jobs::ProcessPost.new.execute(post_id: post.id)
+        Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
+        Jobs::ProcessPost.new.execute(post_id: post.id)
+        post.reload
+
+        expect(post.cooked).to match(/<img src=.*\/uploads/)
+      end
+    end
   end
 
-  it 'replaces image src' do
-    post = Fabricate(:post, raw: "<img src='http://wiki.mozilla.org/images/2/2e/Longcat1.png'>")
+  describe '#is_valid_image_url' do
+    subject { described_class.new }
 
-    Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
-    post.reload
+    describe 'when url is invalid' do
+      it 'should return false' do
+        expect(subject.is_valid_image_url("null")).to eq(false)
+        expect(subject.is_valid_image_url("meta.discourse.org")).to eq(false)
+      end
+    end
 
-    expect(post.raw).to match(/^<img src='\/uploads/)
-  end
-
-  it 'replaces image src without protocol' do
-    post = Fabricate(:post, raw: "<img src='//wiki.mozilla.org/images/2/2e/Longcat1.png'>")
-
-    Jobs::PullHotlinkedImages.new.execute(post_id: post.id)
-    post.reload
-
-    expect(post.raw).to match(/^<img src='\/uploads/)
+    describe 'when url is valid' do
+      it 'should return true' do
+        expect(subject.is_valid_image_url("http://meta.discourse.org")).to eq(true)
+        expect(subject.is_valid_image_url("//meta.discourse.org")).to eq(true)
+      end
+    end
   end
 
 end
diff --git a/spec/jobs/rebake_custom_emoji_posts_spec.rb b/spec/jobs/rebake_custom_emoji_posts_spec.rb
index 96d40decbdd..1d31b769970 100644
--- a/spec/jobs/rebake_custom_emoji_posts_spec.rb
+++ b/spec/jobs/rebake_custom_emoji_posts_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Jobs::RebakeCustomEmojiPosts do
     post = Fabricate(:post, raw: 'some post with :test: yay')
 
     expect(post.reload.cooked).to eq(
-      "<p>some post with <img src=\"#{upload.url}?v=3\" title=\":test:\" class=\"emoji emoji-custom\" alt=\":test:\"> yay</p>"
+      "<p>some post with <img src=\"#{upload.url}?v=5\" title=\":test:\" class=\"emoji emoji-custom\" alt=\":test:\"> yay</p>"
     )
 
     custom_emoji.destroy!
diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb
index 7c4aff73541..bf440918fdf 100644
--- a/spec/jobs/tl3_promotions_spec.rb
+++ b/spec/jobs/tl3_promotions_spec.rb
@@ -33,7 +33,8 @@ describe Jobs::Tl3Promotions do
 
     it "demotes if was promoted more than X days ago" do
       user = nil
-      Timecop.freeze(4.days.ago) do
+
+      freeze_time 4.days.ago do
         user = create_leader_user
       end
 
@@ -45,7 +46,7 @@ describe Jobs::Tl3Promotions do
 
     it "doesn't demote if user was promoted recently" do
       user = nil
-      Timecop.freeze(1.day.ago) do
+      freeze_time 1.day.ago do
         user = create_leader_user
       end
 
@@ -57,7 +58,7 @@ describe Jobs::Tl3Promotions do
 
     it "doesn't demote if user hasn't lost requirements (low water mark)" do
       user = nil
-      Timecop.freeze(4.days.ago) do
+      freeze_time(4.days.ago) do
         user = create_leader_user
       end
 
diff --git a/spec/jobs/toggle_topic_closed_spec.rb b/spec/jobs/toggle_topic_closed_spec.rb
index 2c4b5c6c8a8..2e36f8abaa8 100644
--- a/spec/jobs/toggle_topic_closed_spec.rb
+++ b/spec/jobs/toggle_topic_closed_spec.rb
@@ -4,9 +4,7 @@ describe Jobs::ToggleTopicClosed do
   let(:admin) { Fabricate(:admin) }
 
   let(:topic) do
-    Fabricate(:topic,
-      topic_timers: [Fabricate(:topic_timer, user: admin)]
-    )
+    Fabricate(:topic_timer, user: admin).topic
   end
 
   before do
@@ -16,7 +14,7 @@ describe Jobs::ToggleTopicClosed do
   it 'should be able to close a topic' do
     topic
 
-    Timecop.travel(1.hour.from_now) do
+    freeze_time(1.hour.from_now) do
       described_class.new.execute(
         topic_timer_id: topic.public_topic_timer.id,
         state: true
@@ -33,7 +31,7 @@ describe Jobs::ToggleTopicClosed do
   it 'should be able to open a topic' do
     topic.update!(closed: true)
 
-    Timecop.travel(1.hour.from_now) do
+    freeze_time(1.hour.from_now) do
       described_class.new.execute(
         topic_timer_id: topic.public_topic_timer.id,
         state: false
@@ -62,9 +60,7 @@ describe Jobs::ToggleTopicClosed do
 
   describe 'when user is not authorized to close topics' do
     let(:topic) do
-      Fabricate(:topic,
-        topic_timers: [Fabricate(:topic_timer, execute_at: 2.hours.from_now)]
-      )
+      Fabricate(:topic_timer, execute_at: 2.hours.from_now).topic
     end
 
     it 'should not do anything' do
diff --git a/spec/jobs/topic_reminder_spec.rb b/spec/jobs/topic_reminder_spec.rb
index fd8b71697e6..518fba6fc60 100644
--- a/spec/jobs/topic_reminder_spec.rb
+++ b/spec/jobs/topic_reminder_spec.rb
@@ -2,9 +2,13 @@ require 'rails_helper'
 
 describe Jobs::TopicReminder do
   let(:admin) { Fabricate(:admin) }
-  let(:topic) { Fabricate(:topic, topic_timers: [
-    Fabricate(:topic_timer, user: admin, status_type: TopicTimer.types[:reminder])
-  ]) }
+
+  let(:topic) do
+    Fabricate(:topic_timer,
+      user: admin,
+      status_type: TopicTimer.types[:reminder]
+    ).topic
+  end
 
   before do
     SiteSetting.queue_jobs = true
@@ -12,43 +16,46 @@ describe Jobs::TopicReminder do
 
   it "should be able to create a reminder" do
     topic_timer = topic.topic_timers.first
-    Timecop.freeze(1.day.from_now) do
-      expect {
-        described_class.new.execute(topic_timer_id: topic_timer.id)
-      }.to change { Notification.count }.by(1)
-      expect( admin.notifications.where(notification_type: Notification.types[:topic_reminder]).first&.topic_id ).to eq(topic.id)
-      expect( TopicTimer.where(id: topic_timer.id).first ).to be_nil
-    end
+    freeze_time 1.day.from_now
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to change { Notification.count }.by(1)
+    expect( admin.notifications.where(notification_type: Notification.types[:topic_reminder]).first&.topic_id ).to eq(topic.id)
+    expect( TopicTimer.where(id: topic_timer.id).first ).to be_nil
   end
 
   it "does nothing if it was trashed before the scheduled time" do
     topic_timer = topic.topic_timers.first
     topic_timer.trash!(Discourse.system_user)
-    Timecop.freeze(1.day.from_now) do
-      expect {
-        described_class.new.execute(topic_timer_id: topic_timer.id)
-      }.to_not change { Notification.count }
-    end
+
+    freeze_time(1.day.from_now)
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to_not change { Notification.count }
   end
 
   it "does nothing if job runs too early" do
     topic_timer = topic.topic_timers.first
     topic_timer.update_attribute(:execute_at, 8.hours.from_now)
-    Timecop.freeze(6.hours.from_now) do
-      expect {
-        described_class.new.execute(topic_timer_id: topic_timer.id)
-      }.to_not change { Notification.count }
-    end
+
+    freeze_time(6.hours.from_now)
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to_not change { Notification.count }
   end
 
   it "does nothing if topic was deleted" do
     topic_timer = topic.topic_timers.first
     topic.trash!
-    Timecop.freeze(1.day.from_now) do
-      expect {
-        described_class.new.execute(topic_timer_id: topic_timer.id)
-      }.to_not change { Notification.count }
-    end
+
+    freeze_time(1.day.from_now)
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to_not change { Notification.count }
   end
-  
+
 end
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index b3cd3c7fe57..27788a7fdfc 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -162,7 +162,7 @@ describe Jobs::UserEmail do
       end
 
       context 'user is anonymous' do
-        before { SiteSetting.stubs(:allow_anonymous_posting).returns(true) }
+        before { SiteSetting.allow_anonymous_posting = true }
 
         it "doesn't send email for a pm from a regular user" do
           Email::Sender.any_instance.expects(:send).never
@@ -332,7 +332,7 @@ describe Jobs::UserEmail do
       end
 
       context 'user is anonymous' do
-        before { SiteSetting.stubs(:allow_anonymous_posting).returns(true) }
+        before { SiteSetting.allow_anonymous_posting = true }
 
         it "doesn't send email for a pm from a regular user" do
           Email::Sender.any_instance.expects(:send).never
diff --git a/spec/mailers/invite_mailer_spec.rb b/spec/mailers/invite_mailer_spec.rb
index 68ce2b4a4a9..ce21d2c957b 100644
--- a/spec/mailers/invite_mailer_spec.rb
+++ b/spec/mailers/invite_mailer_spec.rb
@@ -5,9 +5,9 @@ describe InviteMailer do
   describe "send_invite" do
 
     context "invite to site" do
-      let(:invite) { Fabricate(:invite) }
 
       context "default invite message" do
+        let(:invite) { Fabricate(:invite) }
         let(:invite_mail) { InviteMailer.send_invite(invite) }
 
         it 'renders the invitee email' do
@@ -36,9 +36,10 @@ describe InviteMailer do
       end
 
       context "custom invite message" do
+        let(:invite) { Fabricate(:invite, custom_message: "Hey, you should join this forum!") }
 
         context "custom message includes invite link" do
-          let(:custom_invite_mail) { InviteMailer.send_invite(invite, "Hey, you should join this forum!") }
+          let(:custom_invite_mail) { InviteMailer.send_invite(invite) }
 
           it 'renders the invitee email' do
             expect(custom_invite_mail.to).to eql([invite.email])
@@ -76,9 +77,9 @@ describe InviteMailer do
     context "invite to topic" do
       let(:trust_level_2) { build(:user, trust_level: 2) }
       let(:topic) { Fabricate(:topic, excerpt: "Topic invite support is now available in Discourse!", user: trust_level_2) }
-      let(:invite) { topic.invite(topic.user, 'name@example.com') }
 
       context "default invite message" do
+        let(:invite) { topic.invite(topic.user, 'name@example.com') }
         let(:invite_mail) { InviteMailer.send_invite(invite) }
 
         it 'renders the invitee email' do
@@ -123,7 +124,8 @@ describe InviteMailer do
       end
 
       context "custom invite message" do
-        let(:custom_invite_mail) { InviteMailer.send_invite(invite, "Hey, I thought you might enjoy this topic!") }
+        let(:invite) { topic.invite(topic.user, 'name@example.com', nil, "Hey, I thought you might enjoy this topic!") }
+        let(:custom_invite_mail) { InviteMailer.send_invite(invite) }
 
         it 'renders custom_message' do
           expect(custom_invite_mail.body.encoded).to match("Hey, I thought you might enjoy this topic!")
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index 39ed87a35dc..53df8496662 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -468,6 +468,7 @@ describe UserNotifications do
   shared_examples "notification email building" do
     let(:post) { Fabricate(:post, user: user) }
     let(:mail_type) { "user_#{notification_type}"}
+    let(:mail_template) { "user_notifications.#{mail_type}" }
     let(:username) { "walterwhite"}
     let(:notification) do
       Fabricate(:notification,
@@ -488,7 +489,7 @@ describe UserNotifications do
       end
 
       it "has a template" do
-        expects_build_with(has_entry(:template, "user_notifications.#{mail_type}"))
+        expects_build_with(has_entry(:template, mail_template))
       end
 
       it "overrides the html part" do
@@ -537,10 +538,23 @@ describe UserNotifications do
       end
 
       context "when customized" do
-        let(:custom_body) { "You are now officially notified." }
+        let(:custom_body) do
+          body = <<~BODY
+          You are now officially notified.
+          %{header_instructions}
+          %{message} %{respond_instructions}
+          BODY
+
+          body << "%{context}" if notification_type != :invited_to_topic
+          body
+        end
 
         before do
-          TranslationOverride.upsert!("en", "user_notifications.user_#{notification_type}.text_body_template", custom_body)
+          TranslationOverride.upsert!(
+            "en",
+            "#{mail_template}.text_body_template",
+            custom_body
+          )
         end
 
         it "shouldn't use the default html_override" do
@@ -589,6 +603,33 @@ describe UserNotifications do
   describe "user invited to a private message" do
     include_examples "notification email building" do
       let(:notification_type) { :invited_to_private_message }
+      let(:post) { Fabricate(:private_message_post) }
+      let(:user) { post.user }
+      let(:mail_template) { "user_notifications.user_#{notification_type}_pm" }
+
+      include_examples "respect for private_email"
+      include_examples "no reply by email"
+      include_examples "sets user locale"
+    end
+  end
+
+  describe "group invited to a private message" do
+    include_examples "notification email building" do
+      let(:notification_type) { :invited_to_private_message }
+      let(:post) { Fabricate(:private_message_post) }
+      let(:user) { post.user }
+      let(:group) { Fabricate(:group) }
+      let(:mail_template) { "user_notifications.user_#{notification_type}_pm_group" }
+
+      before do
+        notification.data_hash[:group_id] = group.id
+        notification.save!
+      end
+
+      it "should include the group name" do
+        expects_build_with(has_entry(:group_name, group.name))
+      end
+
       include_examples "respect for private_email"
       include_examples "no reply by email"
       include_examples "sets user locale"
diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb
index f6e1a2c2940..05a078cf9c8 100644
--- a/spec/models/admin_dashboard_data_spec.rb
+++ b/spec/models/admin_dashboard_data_spec.rb
@@ -128,37 +128,37 @@ describe AdminDashboardData do
     shared_examples 'problem detection for login providers' do
       context 'when disabled' do
         it 'returns nil' do
-          SiteSetting.stubs(enable_setting).returns(false)
+          SiteSetting.public_send("#{enable_setting}=", false)
           expect(subject).to be_nil
         end
       end
 
       context 'when enabled' do
         before do
-          SiteSetting.stubs(enable_setting).returns(true)
+          SiteSetting.public_send("#{enable_setting}=", true)
         end
 
         it 'returns nil when key and secret are set' do
-          SiteSetting.stubs(key).returns('12313213')
-          SiteSetting.stubs(secret).returns('12312313123')
+          SiteSetting.public_send("#{key}=", '12313213')
+          SiteSetting.public_send("#{secret}=", '12312313123')
           expect(subject).to be_nil
         end
 
         it 'returns a string when key is not set' do
-          SiteSetting.stubs(key).returns('')
-          SiteSetting.stubs(secret).returns('12312313123')
+          SiteSetting.public_send("#{key}=", '')
+          SiteSetting.public_send("#{secret}=", '12312313123')
           expect(subject).to_not be_nil
         end
 
         it 'returns a string when secret is not set' do
-          SiteSetting.stubs(key).returns('123123')
-          SiteSetting.stubs(secret).returns('')
+          SiteSetting.public_send("#{key}=", '123123')
+          SiteSetting.public_send("#{secret}=", '')
           expect(subject).to_not be_nil
         end
 
         it 'returns a string when key and secret are not set' do
-          SiteSetting.stubs(key).returns('')
-          SiteSetting.stubs(secret).returns('')
+          SiteSetting.public_send("#{key}=", '')
+          SiteSetting.public_send("#{secret}=", '')
           expect(subject).to_not be_nil
         end
       end
@@ -200,7 +200,7 @@ describe AdminDashboardData do
         ['a', ''].repeated_permutation(keys.size) do |*values|
           hash = Hash[keys.zip(values)]
           hash.each do |key,value|
-            SiteSetting.stubs(key).returns(value)
+            SiteSetting.public_send("#{key}=", value)
           end
           yield hash
         end
@@ -209,8 +209,8 @@ describe AdminDashboardData do
       context 'when setting is enabled' do
         let(:setting_enabled) { true }
         before do
-          SiteSetting.stubs(setting_key).returns(setting_enabled)
-          SiteSetting.stubs(bucket_key).returns(bucket_value)
+          SiteSetting.public_send("#{setting_key}=", setting_enabled)
+          SiteSetting.public_send("#{bucket_key}=", bucket_value)
         end
 
         context 'when bucket is blank' do
@@ -226,7 +226,7 @@ describe AdminDashboardData do
         context 'when bucket is filled in' do
           let(:bucket_value) { 'a' }
           before do
-            SiteSetting.stubs(:s3_use_iam_profile).returns(use_iam_profile)
+            SiteSetting.public_send("s3_use_iam_profile=", use_iam_profile)
           end
 
           context 'when using iam profile' do
@@ -257,7 +257,7 @@ describe AdminDashboardData do
 
       context 'when setting is not enabled' do
         before do
-          SiteSetting.stubs(setting_key).returns(false)
+          SiteSetting.public_send("#{setting_key}=", false)
         end
 
         it "always returns nil" do
diff --git a/spec/models/api_key_spec.rb b/spec/models/api_key_spec.rb
index 5d163dc368d..5196c16eb50 100644
--- a/spec/models/api_key_spec.rb
+++ b/spec/models/api_key_spec.rb
@@ -3,14 +3,18 @@ require 'rails_helper'
 require_dependency 'api_key'
 
 describe ApiKey do
+  let(:user) { Fabricate(:user) }
+
   it { is_expected.to belong_to :user }
   it { is_expected.to belong_to :created_by }
-
   it { is_expected.to validate_presence_of :key }
 
-  skip 'validates uniqueness of user_id' do
-    Fabricate(:api_key)
-    is_expected.to validate_uniqueness_of(:user_id)
+  it 'validates uniqueness of user_id' do
+    Fabricate(:api_key, user: user)
+    api_key = Fabricate.build(:api_key, user: user)
+
+    expect(api_key.save).to eq(false)
+    expect(api_key.errors).to include(:user_id)
   end
 
 end
diff --git a/spec/models/application_request_spec.rb b/spec/models/application_request_spec.rb
index 7aca4b71d3e..f8e1315d619 100644
--- a/spec/models/application_request_spec.rb
+++ b/spec/models/application_request_spec.rb
@@ -1,11 +1,14 @@
 require 'rails_helper'
 
 describe ApplicationRequest do
-
   before do
     ApplicationRequest.clear_cache!
   end
 
+  after do
+    ApplicationRequest.clear_cache!
+  end
+
   def inc(key,opts=nil)
     ApplicationRequest.increment!(key,opts)
   end
diff --git a/spec/models/category_list_spec.rb b/spec/models/category_list_spec.rb
index 32da7627967..44bb7c67a5f 100644
--- a/spec/models/category_list_spec.rb
+++ b/spec/models/category_list_spec.rb
@@ -94,7 +94,7 @@ describe CategoryList do
 
     context 'fixed_category_positions is enabled' do
       before do
-        SiteSetting.stubs(:fixed_category_positions).returns(true)
+        SiteSetting.fixed_category_positions = true
       end
 
       it "returns categories in specified order" do
@@ -114,7 +114,7 @@ describe CategoryList do
 
     context 'fixed_category_positions is disabled' do
       before do
-        SiteSetting.stubs(:fixed_category_positions).returns(false)
+        SiteSetting.fixed_category_positions = false
       end
 
       it "returns categories in order of activity" do
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 87e808c26c5..cac2e665303 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -476,7 +476,7 @@ describe Category do
       before do
         post = create_post(user: @category.user, category: @category.id)
 
-        SiteSetting.stubs(:editing_grace_period).returns(1.minute.to_i)
+        SiteSetting.editing_grace_period = 1.minute
         post.revise(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 2.minutes)
 
         Category.update_stats
diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb
index 4c26f04bbbd..63835953c0b 100644
--- a/spec/models/discourse_single_sign_on_spec.rb
+++ b/spec/models/discourse_single_sign_on_spec.rb
@@ -67,15 +67,15 @@ describe DiscourseSingleSignOn do
   let(:ip_address) { "127.0.0.1" }
 
   it "can lookup or create user when name is blank" do
-    # so we can create system messages
-    Fabricate(:admin)
     sso = DiscourseSingleSignOn.new
     sso.username = "test"
     sso.name = ""
     sso.email = "test@test.com"
     sso.external_id = "A"
+    sso.suppress_welcome_message = true
     user = sso.lookup_or_create_user(ip_address)
-    expect(user).to_not be_nil
+
+    expect(user.persisted?).to eq(true)
   end
 
   it "unstaged users" do
@@ -111,6 +111,7 @@ describe DiscourseSingleSignOn do
     sso.external_id = "id"
     sso.admin = true
     sso.moderator = true
+    sso.suppress_welcome_message = true
 
     user = sso.lookup_or_create_user(ip_address)
     staff_group.reload
@@ -158,6 +159,7 @@ describe DiscourseSingleSignOn do
   it "can override name / email / username" do
     admin = Fabricate(:admin)
 
+    SiteSetting.email_editable = false
     SiteSetting.sso_overrides_name = true
     SiteSetting.sso_overrides_email = true
     SiteSetting.sso_overrides_username = true
@@ -233,14 +235,15 @@ describe DiscourseSingleSignOn do
   end
 
   context 'trusting emails' do
-    let(:sso) {
+    let(:sso) do
       sso = DiscourseSingleSignOn.new
       sso.username = "test"
       sso.name = "test"
       sso.email = "test@example.com"
       sso.external_id = "A"
+      sso.suppress_welcome_message = true
       sso
-    }
+    end
 
     it 'activates users by default' do
       user = sso.lookup_or_create_user(ip_address)
@@ -255,6 +258,7 @@ describe DiscourseSingleSignOn do
 
     it 'deactivates accounts that have updated email address' do
 
+      SiteSetting.email_editable = false
       SiteSetting.sso_overrides_email = true
       sso.require_activation = true
 
@@ -267,7 +271,7 @@ describe DiscourseSingleSignOn do
       user = sso.lookup_or_create_user(ip_address)
       expect(user.active).to eq(true)
 
-      user.update_columns(email: 'xXx@themovie.com')
+      user.primary_email.update_columns(email: 'xXx@themovie.com')
 
       user = sso.lookup_or_create_user(ip_address)
       expect(user.email).to eq(old_email)
@@ -327,22 +331,22 @@ describe DiscourseSingleSignOn do
   end
 
   context 'setting bio for a user' do
-    let(:sso) {
+    let(:sso) do
       sso = DiscourseSingleSignOn.new
       sso.username = "test"
       sso.name = "test"
       sso.email = "test@test.com"
       sso.external_id = "100"
       sso.bio = "This **is** the bio"
+      sso.suppress_welcome_message = true
       sso
-    }
+    end
 
     it 'can set bio if supplied on new users or users with empty bio' do
       # new account
       user = sso.lookup_or_create_user(ip_address)
       expect(user.user_profile.bio_cooked).to match_html("<p>This <strong>is</strong> the bio</p>")
 
-
       # no override by default
       sso.bio = "new profile"
       user = sso.lookup_or_create_user(ip_address)
@@ -350,8 +354,7 @@ describe DiscourseSingleSignOn do
       expect(user.user_profile.bio_cooked).to match_html("<p>This <strong>is</strong> the bio</p>")
 
       # yes override for blank
-      user.user_profile.bio_raw = " "
-      user.user_profile.save!
+      user.user_profile.update!(bio_raw: '')
 
       user = sso.lookup_or_create_user(ip_address)
       expect(user.user_profile.bio_cooked).to match_html("<p>new profile</p>")
@@ -362,69 +365,67 @@ describe DiscourseSingleSignOn do
       SiteSetting.sso_overrides_bio = true
 
       user = sso.lookup_or_create_user(ip_address)
-      expect(user.user_profile.bio_cooked).to match_html("<p>new profile 2</p>")
+      expect(user.user_profile.bio_cooked).to match_html("<p>new profile 2</p")
     end
 
   end
 
   context 'when sso_overrides_avatar is not enabled' do
 
-
     it "correctly handles provided avatar_urls" do
-      Sidekiq::Testing.inline! do
-        sso = DiscourseSingleSignOn.new
-        sso.external_id = 666
-        sso.email = "sam@sam.com"
-        sso.name = "sam"
-        sso.username = "sam"
-        sso.avatar_url = "http://awesome.com/image.png"
+      sso = DiscourseSingleSignOn.new
+      sso.external_id = 666
+      sso.email = "sam@sam.com"
+      sso.name = "sam"
+      sso.username = "sam"
+      sso.avatar_url = "http://awesome.com/image.png"
+      sso.suppress_welcome_message = true
 
-        FileHelper.stubs(:download).returns(file_from_fixtures("logo.png"))
-        user = sso.lookup_or_create_user(ip_address)
-        user.reload
-        avatar_id = user.uploaded_avatar_id
+      FileHelper.stubs(:download).returns(file_from_fixtures("logo.png"))
+      user = sso.lookup_or_create_user(ip_address)
+      user.reload
+      avatar_id = user.uploaded_avatar_id
 
-        # initial creation ...
-        expect(avatar_id).to_not eq(nil)
+      # initial creation ...
+      expect(avatar_id).to_not eq(nil)
 
-        # junk avatar id should be updated
-        old_id = user.uploaded_avatar_id
-        Upload.destroy(old_id)
+      # junk avatar id should be updated
+      old_id = user.uploaded_avatar_id
+      Upload.destroy(old_id)
 
-        user = sso.lookup_or_create_user(ip_address)
-        user.reload
-        avatar_id = user.uploaded_avatar_id
+      user = sso.lookup_or_create_user(ip_address)
+      user.reload
+      avatar_id = user.uploaded_avatar_id
 
-        expect(avatar_id).to_not eq(nil)
-        expect(old_id).to_not eq(avatar_id)
+      expect(avatar_id).to_not eq(nil)
+      expect(old_id).to_not eq(avatar_id)
 
-        FileHelper.stubs(:download) { raise "should not be called" }
-        sso.avatar_url = "https://some.new/avatar.png"
-        user = sso.lookup_or_create_user(ip_address)
-        user.reload
+      FileHelper.stubs(:download) { raise "should not be called" }
+      sso.avatar_url = "https://some.new/avatar.png"
+      user = sso.lookup_or_create_user(ip_address)
+      user.reload
 
-        # avatar updated but no override specified ...
-        expect(user.uploaded_avatar_id).to eq(avatar_id)
+      # avatar updated but no override specified ...
+      expect(user.uploaded_avatar_id).to eq(avatar_id)
 
-        sso.avatar_force_update = true
-        FileHelper.stubs(:download).returns(file_from_fixtures("logo-dev.png"))
-        user = sso.lookup_or_create_user(ip_address)
-        user.reload
+      sso.avatar_force_update = true
+      FileHelper.stubs(:download).returns(file_from_fixtures("logo-dev.png"))
+      user = sso.lookup_or_create_user(ip_address)
+      user.reload
 
-        # we better have a new avatar
-        expect(user.uploaded_avatar_id).not_to eq(avatar_id)
-        expect(user.uploaded_avatar_id).not_to eq(nil)
+      # we better have a new avatar
+      expect(user.uploaded_avatar_id).not_to eq(avatar_id)
+      expect(user.uploaded_avatar_id).not_to eq(nil)
 
-        avatar_id = user.uploaded_avatar_id
+      avatar_id = user.uploaded_avatar_id
 
-        sso.avatar_force_update = true
-        FileHelper.stubs(:download) { raise "not found" }
-        user = sso.lookup_or_create_user(ip_address)
-        user.reload
+      sso.avatar_force_update = true
+      FileHelper.stubs(:download) { raise "not found" }
+      user = sso.lookup_or_create_user(ip_address)
+      user.reload
 
-        # we better have the same avatar
-        expect(user.uploaded_avatar_id).to eq(avatar_id)
-      end
+      # we better have the same avatar
+      expect(user.uploaded_avatar_id).to eq(avatar_id)
     end
 
   end
diff --git a/spec/models/emoji_spec.rb b/spec/models/emoji_spec.rb
index 40c214b40aa..d1b7430f760 100644
--- a/spec/models/emoji_spec.rb
+++ b/spec/models/emoji_spec.rb
@@ -28,4 +28,18 @@ describe Emoji do
     end
   end
 
+  describe '.lookup_unicode' do
+    it 'should return the emoji' do
+      expect(Emoji.lookup_unicode("blonde_man")).to eq("👱")
+    end
+
+    it 'should return an aliased emoji' do
+      expect(Emoji.lookup_unicode("anger_right")).to eq("🗯")
+    end
+
+    it 'should return a skin toned emoji' do
+      expect(Emoji.lookup_unicode("blonde_woman:t6")).to eq("👱🏿‍♀️")
+    end
+  end
+
 end
diff --git a/spec/models/given_daily_like_spec.rb b/spec/models/given_daily_like_spec.rb
index b3a86367769..0216c30b041 100644
--- a/spec/models/given_daily_like_spec.rb
+++ b/spec/models/given_daily_like_spec.rb
@@ -21,28 +21,27 @@ describe GivenDailyLike do
     it 'can be incremented and decremented' do
       SiteSetting.max_likes_per_day = 2
 
-      Timecop.freeze(Date.today) do
-        dt = Date.today
+      dt = Date.today
+      freeze_time dt
 
-        expect(value_for(user.id, dt)).to eq(0)
-        expect(limit_reached_for(user.id, dt)).to eq(false)
+      expect(value_for(user.id, dt)).to eq(0)
+      expect(limit_reached_for(user.id, dt)).to eq(false)
 
-        GivenDailyLike.increment_for(user.id)
-        expect(value_for(user.id, dt)).to eq(1)
-        expect(limit_reached_for(user.id, dt)).to eq(false)
+      GivenDailyLike.increment_for(user.id)
+      expect(value_for(user.id, dt)).to eq(1)
+      expect(limit_reached_for(user.id, dt)).to eq(false)
 
-        GivenDailyLike.increment_for(user.id)
-        expect(value_for(user.id, dt)).to eq(2)
-        expect(limit_reached_for(user.id, dt)).to eq(true)
+      GivenDailyLike.increment_for(user.id)
+      expect(value_for(user.id, dt)).to eq(2)
+      expect(limit_reached_for(user.id, dt)).to eq(true)
 
-        GivenDailyLike.decrement_for(user.id)
-        expect(value_for(user.id, dt)).to eq(1)
-        expect(limit_reached_for(user.id, dt)).to eq(false)
+      GivenDailyLike.decrement_for(user.id)
+      expect(value_for(user.id, dt)).to eq(1)
+      expect(limit_reached_for(user.id, dt)).to eq(false)
 
-        GivenDailyLike.decrement_for(user.id)
-        expect(value_for(user.id, dt)).to eq(0)
-        expect(limit_reached_for(user.id, dt)).to eq(false)
-      end
+      GivenDailyLike.decrement_for(user.id)
+      expect(value_for(user.id, dt)).to eq(0)
+      expect(limit_reached_for(user.id, dt)).to eq(false)
     end
 
   end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index b066566c113..3a53b68bd07 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -100,15 +100,15 @@ describe Group do
   end
 
   def real_admins
-    Group[:admins].user_ids - [-1]
+    Group[:admins].user_ids.reject{|id| id < 0}
   end
 
   def real_moderators
-    Group[:moderators].user_ids - [-1]
+    Group[:moderators].user_ids.reject{|id| id < 0}
   end
 
   def real_staff
-    Group[:staff].user_ids - [-1]
+    Group[:staff].user_ids.reject{|id| id < 0}
   end
 
   it "Correctly handles primary groups" do
@@ -180,7 +180,29 @@ describe Group do
   describe '.refresh_automatic_group!' do
     it "makes sure the everyone group is not visible" do
       g = Group.refresh_automatic_group!(:everyone)
-      expect(g.visible).to eq(false)
+      expect(g.visibility_level).to eq(Group.visibility_levels[:owners])
+    end
+
+    it "does not reset the localized name" do
+      begin
+        default_locale = SiteSetting.default_locale
+        I18n.locale = SiteSetting.default_locale = 'fi'
+
+        group = Group.find(Group::AUTO_GROUPS[:everyone])
+        group.update!(name: I18n.t("groups.default_names.everyone"))
+
+        Group.refresh_automatic_group!(:everyone)
+
+        expect(group.reload.name).to eq(I18n.t("groups.default_names.everyone"))
+
+        I18n.locale = SiteSetting.default_locale = 'en'
+
+        Group.refresh_automatic_group!(:everyone)
+
+        expect(group.reload.name).to eq(I18n.t("groups.default_names.everyone"))
+      ensure
+        I18n.locale = SiteSetting.default_locale = default_locale
+      end
     end
 
     it "uses the localized name if name has not been taken" do
@@ -285,11 +307,11 @@ describe Group do
     user2 = Fabricate(:coding_horror)
     user2.change_trust_level!(TrustLevel[3])
 
-    expect(Group[:trust_level_2].user_ids.sort).to eq [-1, user.id, user2.id].sort
+    expect(Group[:trust_level_2].user_ids.sort.reject{|id| id < -1}).to eq [-1, user.id, user2.id].sort
   end
 
   it "Correctly updates all automatic groups upon request" do
-    Fabricate(:admin)
+    admin = Fabricate(:admin)
     user = Fabricate(:user)
     user.change_trust_level!(TrustLevel[2])
 
@@ -301,22 +323,22 @@ describe Group do
     expect(groups.count).to eq Group::AUTO_GROUPS.count
 
     g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:admins]}
-    expect(g.users.count).to eq 2
-    expect(g.user_count).to eq 2
+    expect(g.users.count).to eq(g.user_count)
+    expect(g.users.pluck(:id).sort.reject{|id| id < -1}).to eq([-1, admin.id])
 
     g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:staff]}
-    expect(g.users.count).to eq 2
-    expect(g.user_count).to eq 2
+    expect(g.users.count).to eq (g.user_count)
+    expect(g.users.pluck(:id).sort.reject{|id| id < -1}).to eq([-1, admin.id])
 
     g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:trust_level_1]}
     # admin, system and user
-    expect(g.users.count).to eq 3
-    expect(g.user_count).to eq 3
+    expect(g.users.count).to eq g.user_count
+    expect(g.users.where('users.id > -2').count).to eq 3
 
     g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:trust_level_2]}
     # system and user
-    expect(g.users.count).to eq 2
-    expect(g.user_count).to eq 2
+    expect(g.users.count).to eq g.user_count
+    expect(g.users.where('users.id > -2').count).to eq 2
 
   end
 
@@ -432,44 +454,54 @@ describe Group do
   end
 
   describe ".visible_groups" do
-    let(:group) { Fabricate(:group, visible: false) }
-    let(:group_2) { Fabricate(:group, visible: true) }
-    let(:admin) { Fabricate(:admin) }
-    let(:user) { Fabricate(:user) }
 
-    before do
-      group
-      group_2
+    def can_view?(user, group)
+      Group.visible_groups(user).where(id: group.id).exists?
     end
 
-    describe 'when user is an admin' do
-      it 'should return the right groups' do
-        expect(Group.visible_groups(admin).pluck(:id).sort)
-          .to eq([group.id, group_2.id].concat(Group::AUTO_GROUP_IDS.keys - [0]).sort)
-      end
+    it 'correctly restricts group visibility' do
+      group = Fabricate.build(:group, visibility_level: Group.visibility_levels[:owners])
+      member = Fabricate(:user)
+      group.add(member)
+      group.save!
+
+      owner = Fabricate(:user)
+      group.add_owner(owner)
+
+      moderator = Fabricate(:user, moderator: true)
+      admin = Fabricate(:user, admin: true)
+
+      expect(can_view?(admin, group)).to eq(true)
+      expect(can_view?(owner, group)).to eq(true)
+      expect(can_view?(moderator, group)).to eq(false)
+      expect(can_view?(member, group)).to eq(false)
+      expect(can_view?(nil, group)).to eq(false)
+
+      group.update_columns(visibility_level: Group.visibility_levels[:staff])
+
+      expect(can_view?(admin, group)).to eq(true)
+      expect(can_view?(owner, group)).to eq(true)
+      expect(can_view?(moderator, group)).to eq(true)
+      expect(can_view?(member, group)).to eq(false)
+      expect(can_view?(nil, group)).to eq(false)
+
+      group.update_columns(visibility_level: Group.visibility_levels[:members])
+
+      expect(can_view?(admin, group)).to eq(true)
+      expect(can_view?(owner, group)).to eq(true)
+      expect(can_view?(moderator, group)).to eq(false)
+      expect(can_view?(member, group)).to eq(true)
+      expect(can_view?(nil, group)).to eq(false)
+
+      group.update_columns(visibility_level: Group.visibility_levels[:public])
+
+      expect(can_view?(admin, group)).to eq(true)
+      expect(can_view?(owner, group)).to eq(true)
+      expect(can_view?(moderator, group)).to eq(true)
+      expect(can_view?(member, group)).to eq(true)
+      expect(can_view?(nil, group)).to eq(true)
     end
 
-    describe 'when user is owner of a group' do
-      it 'should return the right groups' do
-        group.add_owner(user)
-
-        expect(Group.visible_groups(user).pluck(:id).sort)
-          .to eq([group.id, group_2.id])
-      end
-    end
-
-    describe 'when user is not the owner of any group' do
-      it 'should return the right groups' do
-        expect(Group.visible_groups(user).pluck(:id).sort)
-          .to eq([group_2.id])
-      end
-    end
-
-    describe 'user is nil' do
-      it 'should return the right groups' do
-        expect(Group.visible_groups(nil).pluck(:id).sort).to eq([group_2.id])
-      end
-    end
   end
 
   describe '#add' do
@@ -487,4 +519,18 @@ describe Group do
       end
     end
   end
+
+  describe '.search_group' do
+    let(:group) { Fabricate(:group, name: 'tEsT', full_name: 'eSTt') }
+
+    it 'should return the right groups' do
+      group
+
+      expect(Group.search_group('te')).to eq([group])
+      expect(Group.search_group('TE')).to eq([group])
+      expect(Group.search_group('es')).to eq([group])
+      expect(Group.search_group('ES')).to eq([group])
+      expect(Group.search_group('test2')).to eq([])
+    end
+  end
 end
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index d1d93fda6bf..3778221dc79 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -93,5 +93,19 @@ describe InviteRedeemer do
       expect(user.confirm_password?(password)).to eq(true)
       expect(user.approved).to eq(true)
     end
+
+    it "can set custom fields" do
+      required_field = Fabricate(:user_field)
+      optional_field= Fabricate(:user_field, required: false)
+      user_fields = {
+        required_field.id.to_s => 'value1',
+        optional_field.id.to_s => 'value2'
+      }
+      user = InviteRedeemer.new(invite, username, name, password, user_fields).redeem
+
+      expect(user).to be_present
+      expect(user.custom_fields["user_field_#{required_field.id}"]).to eq('value1')
+      expect(user.custom_fields["user_field_#{optional_field.id}"]).to eq('value2')
+    end
   end
 end
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index 60c390a681c..c83f689d0f4 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -245,7 +245,7 @@ describe Invite do
 
     context "invite trust levels" do
       it "returns the trust level in default_invitee_trust_level" do
-        SiteSetting.stubs(:default_invitee_trust_level).returns(TrustLevel[3])
+        SiteSetting.default_invitee_trust_level = TrustLevel[3]
         expect(invite.redeem.trust_level).to eq(TrustLevel[3])
       end
     end
@@ -253,7 +253,7 @@ describe Invite do
     context 'inviting when must_approve_users? is enabled' do
       it 'correctly activates accounts' do
         invite.invited_by = Fabricate(:admin)
-        SiteSetting.stubs(:must_approve_users).returns(true)
+        SiteSetting.must_approve_users = true
         user = invite.redeem
         expect(user.approved?).to eq(true)
       end
@@ -465,23 +465,16 @@ describe Invite do
 
   end
 
-  describe '.redeem_from_token' do
-    let(:inviter) { Fabricate(:user) }
-    let(:invite) { Fabricate(:invite, invited_by: inviter, email: 'test@example.com', user_id: nil) }
-    let(:user) { Fabricate(:user, email: invite.email) }
-
-    it 'redeems the invite from token' do
-      Invite.redeem_from_token(invite.invite_key, user.email)
-      invite.reload
-      expect(invite).to be_redeemed
+  describe '.rescind_all_invites_from' do
+    it 'removes all invites sent by a user' do
+      user = Fabricate(:user)
+      invite_1 = Fabricate(:invite, invited_by: user)
+      invite_2 = Fabricate(:invite, invited_by: user)
+      Invite.rescind_all_invites_from(user)
+      invite_1.reload
+      invite_2.reload
+      expect(invite_1.deleted_at).to be_present
+      expect(invite_2.deleted_at).to be_present
     end
-
-    it 'does not redeem the invite if token does not match' do
-      Invite.redeem_from_token("bae0071f995bb4b6f756e80b383778b5", user.email)
-      invite.reload
-      expect(invite).not_to be_redeemed
-    end
-
   end
-
 end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index fa45deb0e74..1c39367f6db 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -44,7 +44,6 @@ describe Notification do
         process_alerts(Fabricate(:post, post_args.merge(raw: "Hello @CodingHorror")))
       }
 
-
       it 'notifies the poster on reply' do
         expect {
           reply = Fabricate(:basic_reply, user: coding_horror, topic: post.topic)
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 9e30886a39c..4906be462a0 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -178,24 +178,23 @@ describe PostAction do
   describe "update_counters" do
 
     it "properly updates topic counters" do
-      Timecop.freeze(Date.today) do
-        # we need this to test it
-        TopicUser.change(codinghorror, post.topic, posted: true)
+      freeze_time Date.today
+      # we need this to test it
+      TopicUser.change(codinghorror, post.topic, posted: true)
 
-        expect(value_for(moderator.id, Date.today)).to eq(0)
+      expect(value_for(moderator.id, Date.today)).to eq(0)
 
-        PostAction.act(moderator, post, PostActionType.types[:like])
-        PostAction.act(codinghorror, second_post, PostActionType.types[:like])
+      PostAction.act(moderator, post, PostActionType.types[:like])
+      PostAction.act(codinghorror, second_post, PostActionType.types[:like])
 
-        post.topic.reload
-        expect(post.topic.like_count).to eq(2)
+      post.topic.reload
+      expect(post.topic.like_count).to eq(2)
 
-        expect(value_for(moderator.id, Date.today)).to eq(1)
+      expect(value_for(moderator.id, Date.today)).to eq(1)
 
-        tu = TopicUser.get(post.topic, codinghorror)
-        expect(tu.liked).to be true
-        expect(tu.bookmarked).to be false
-      end
+      tu = TopicUser.get(post.topic, codinghorror)
+      expect(tu.liked).to be true
+      expect(tu.bookmarked).to be false
     end
 
   end
@@ -249,33 +248,33 @@ describe PostAction do
     end
 
     it 'should increase the `like_count` and `like_score` when a user likes something' do
-      Timecop.freeze(Date.today) do
-        PostAction.act(codinghorror, post, PostActionType.types[:like])
-        post.reload
-        expect(post.like_count).to eq(1)
-        expect(post.like_score).to eq(1)
-        post.topic.reload
-        expect(post.topic.like_count).to eq(1)
-        expect(value_for(codinghorror.id, Date.today)).to eq(1)
+      freeze_time Date.today
 
-        # When a staff member likes it
-        PostAction.act(moderator, post, PostActionType.types[:like])
-        post.reload
-        expect(post.like_count).to eq(2)
-        expect(post.like_score).to eq(4)
+      PostAction.act(codinghorror, post, PostActionType.types[:like])
+      post.reload
+      expect(post.like_count).to eq(1)
+      expect(post.like_score).to eq(1)
+      post.topic.reload
+      expect(post.topic.like_count).to eq(1)
+      expect(value_for(codinghorror.id, Date.today)).to eq(1)
 
-        # Removing likes
-        PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
-        post.reload
-        expect(post.like_count).to eq(1)
-        expect(post.like_score).to eq(3)
-        expect(value_for(codinghorror.id, Date.today)).to eq(0)
+      # When a staff member likes it
+      PostAction.act(moderator, post, PostActionType.types[:like])
+      post.reload
+      expect(post.like_count).to eq(2)
+      expect(post.like_score).to eq(4)
 
-        PostAction.remove_act(moderator, post, PostActionType.types[:like])
-        post.reload
-        expect(post.like_count).to eq(0)
-        expect(post.like_score).to eq(0)
-      end
+      # Removing likes
+      PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
+      post.reload
+      expect(post.like_count).to eq(1)
+      expect(post.like_score).to eq(3)
+      expect(value_for(codinghorror.id, Date.today)).to eq(0)
+
+      PostAction.remove_act(moderator, post, PostActionType.types[:like])
+      post.reload
+      expect(post.like_count).to eq(0)
+      expect(post.like_score).to eq(0)
     end
   end
 
@@ -319,7 +318,7 @@ describe PostAction do
       it "returns the correct flag counts" do
         post = create_post
 
-        SiteSetting.stubs(:flags_required_to_hide_post).returns(7)
+        SiteSetting.flags_required_to_hide_post = 7
 
         # A post with no flags has 0 for flag counts
         expect(PostAction.flag_counts_for(post.id)).to eq([0, 0])
@@ -367,7 +366,7 @@ describe PostAction do
       post = create_post
       walterwhite = Fabricate(:walter_white)
 
-      SiteSetting.stubs(:flags_required_to_hide_post).returns(2)
+      SiteSetting.flags_required_to_hide_post = 2
       Discourse.stubs(:site_contact_user).returns(admin)
 
       PostAction.act(eviltrout, post, PostActionType.types[:spam])
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index ecda5cc6a0c..3046b6118ec 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -85,11 +85,6 @@ describe PostAnalyzer do
         post_analyzer = PostAnalyzer.new(raw_three_links, default_topic_id)
         expect(post_analyzer.linked_hosts).to eq({"discourse.org" => 1, "www.imdb.com" => 1})
       end
-
-      it 'returns blank for ipv6 output' do
-        post_analyzer = PostAnalyzer.new('PING www.google.com(lb-in-x93.1e100.net) 56 data bytes', default_topic_id)
-        expect(post_analyzer.linked_hosts).to be_blank
-      end
     end
   end
 
@@ -181,12 +176,14 @@ describe PostAnalyzer do
     end
 
     it "ignores pre" do
-      post_analyzer = PostAnalyzer.new("<pre>@Jake</pre> @Finn", default_topic_id)
+      # note, CommonMark has rules for dealing with HTML, if your paragraph starts with it
+      # it will no longer be an "inline" so this means that @Finn in this case would not be a mention
+      post_analyzer = PostAnalyzer.new(". <pre>@Jake</pre> @Finn", default_topic_id)
       expect(post_analyzer.raw_mentions).to eq(['finn'])
     end
 
     it "catches content between pre tags" do
-      post_analyzer = PostAnalyzer.new("<pre>hello</pre> @Finn <pre></pre>", default_topic_id)
+      post_analyzer = PostAnalyzer.new(". <pre>hello</pre> @Finn <pre></pre>", default_topic_id)
       expect(post_analyzer.raw_mentions).to eq(['finn'])
     end
 
@@ -201,7 +198,7 @@ describe PostAnalyzer do
     end
 
     it "ignores quotes" do
-      post_analyzer = PostAnalyzer.new("[quote=\"Evil Trout\"]@Jake[/quote] @Finn", default_topic_id)
+      post_analyzer = PostAnalyzer.new("[quote=\"Evil Trout\"]\n@Jake\n[/quote]\n @Finn", default_topic_id)
       expect(post_analyzer.raw_mentions).to eq(['finn'])
     end
 
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index 52e1e02814a..28abdc88763 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -342,6 +342,16 @@ describe PostMover do
           expect(new_post.post_actions.size).to eq(1)
         end
 
+        it "preserves the custom_fields in the new post" do
+          custom_fields = { "some_field" => 'payload' }
+          p1.custom_fields = custom_fields
+          p1.save_custom_fields
+
+          new_topic = topic.move_posts(user, [p1.id], title: "new testing topic name")
+
+          expect(new_topic.first_post.custom_fields).to eq(custom_fields)
+        end
+
       end
 
       context "to an existing topic with a deleted post" do
@@ -381,6 +391,19 @@ describe PostMover do
         end
       end
 
+      context "to an existing closed topic" do
+        let!(:destination_topic) { Fabricate(:topic, closed: true) }
+
+        it "works correctly for admin" do
+          admin = Fabricate(:admin)
+          moved_to = topic.move_posts(admin, [p1.id, p2.id], destination_topic_id: destination_topic.id)
+          expect(moved_to).to be_present
+
+          moved_to.reload
+          expect(moved_to.posts_count).to eq(2)
+          expect(moved_to.highest_post_number).to eq(2)
+        end
+      end
 
     end
   end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 09d7e533be0..0aeeaaa8e14 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -204,7 +204,7 @@ describe Post do
     context "validation" do
 
       before do
-        SiteSetting.stubs(:newuser_max_images).returns(1)
+        SiteSetting.newuser_max_images = 1
       end
 
       context 'newuser' do
@@ -252,7 +252,7 @@ describe Post do
     context "validation" do
 
       before do
-        SiteSetting.stubs(:newuser_max_attachments).returns(1)
+        SiteSetting.newuser_max_attachments = 1
       end
 
       context 'newuser' do
@@ -376,7 +376,7 @@ describe Post do
     context "validation" do
 
       before do
-        SiteSetting.stubs(:newuser_max_links).returns(1)
+        SiteSetting.newuser_max_links = 1
       end
 
       context 'newuser' do
@@ -414,12 +414,14 @@ describe Post do
       end
 
       it "ignores pre" do
-        post = Fabricate.build(:post, post_args.merge(raw: "<pre>@Jake</pre> @Finn"))
+        # we need to force an inline
+        post = Fabricate.build(:post, post_args.merge(raw: "p <pre>@Jake</pre> @Finn"))
         expect(post.raw_mentions).to eq(['finn'])
       end
 
       it "catches content between pre tags" do
-        post = Fabricate.build(:post, post_args.merge(raw: "<pre>hello</pre> @Finn <pre></pre>"))
+        # per common mark we need to force an inline
+        post = Fabricate.build(:post, post_args.merge(raw: "a <pre>hello</pre> @Finn <pre></pre>"))
         expect(post.raw_mentions).to eq(['finn'])
       end
 
@@ -429,7 +431,7 @@ describe Post do
       end
 
       it "ignores quotes" do
-        post = Fabricate.build(:post, post_args.merge(raw: "[quote=\"Evil Trout\"]@Jake[/quote] @Finn"))
+        post = Fabricate.build(:post, post_args.merge(raw: "[quote=\"Evil Trout\"]\n@Jake\n[/quote]\n@Finn"))
         expect(post.raw_mentions).to eq(['finn'])
       end
 
@@ -453,8 +455,8 @@ describe Post do
 
       context 'new user' do
         before do
-          SiteSetting.stubs(:newuser_max_mentions_per_post).returns(1)
-          SiteSetting.stubs(:max_mentions_per_post).returns(5)
+          SiteSetting.newuser_max_mentions_per_post = 1
+          SiteSetting.max_mentions_per_post = 5
         end
 
         it "allows a new user to have newuser_max_mentions_per_post mentions" do
@@ -468,8 +470,8 @@ describe Post do
 
       context "not a new user" do
         before do
-          SiteSetting.stubs(:newuser_max_mentions_per_post).returns(0)
-          SiteSetting.stubs(:max_mentions_per_post).returns(1)
+          SiteSetting.newuser_max_mentions_per_post = 0
+          SiteSetting.max_mentions_per_post = 1
         end
 
         it "allows vmax_mentions_per_post mentions" do
@@ -546,7 +548,7 @@ describe Post do
 
     describe 'ninja editing & edit windows' do
 
-      before { SiteSetting.stubs(:editing_grace_period).returns(1.minute.to_i) }
+      before { SiteSetting.editing_grace_period = 1.minute.to_i }
 
       it 'works' do
         revised_at = post.updated_at + 2.minutes
@@ -741,7 +743,7 @@ describe Post do
     let!(:p3) { Fabricate(:post, post_args.merge(score: 5, percent_rank: 0.99)) }
 
     it "returns the OP and posts above the threshold in summary mode" do
-      SiteSetting.stubs(:summary_percent_filter).returns(66)
+      SiteSetting.summary_percent_filter = 66
       expect(Post.summary.order(:post_number)).to eq([p1, p2])
     end
 
@@ -816,14 +818,14 @@ describe Post do
     end
 
     it "when tl3_links_no_follow is false, should not add nofollow for trust level 3 and higher" do
-      SiteSetting.stubs(:tl3_links_no_follow).returns(false)
+      SiteSetting.tl3_links_no_follow = false
       post.user.trust_level = 3
       post.save
       expect(post.cooked).not_to match(/nofollow/)
     end
 
     it "when tl3_links_no_follow is true, should add nofollow for trust level 3 and higher" do
-      SiteSetting.stubs(:tl3_links_no_follow).returns(true)
+      SiteSetting.tl3_links_no_follow = true
       post.user.trust_level = 3
       post.save
       expect(post.cooked).to match(/nofollow noopener/)
@@ -927,7 +929,7 @@ describe Post do
   end
 
   describe ".unhide!" do
-    before { SiteSetting.stubs(:unique_posts_mins).returns(5) }
+    before { SiteSetting.unique_posts_mins = 5 }
 
     it "will unhide the first post & make the topic visible" do
       hidden_topic = Fabricate(:topic, visible: false)
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 661cea8b2b8..c91eb0493c5 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -40,7 +40,7 @@ describe Report do
 
       context "with #{pluralized}" do
         before(:each) do
-          Timecop.freeze
+          freeze_time
           fabricator = case arg
           when :signup
             :user
@@ -57,7 +57,6 @@ describe Report do
           Fabricate(fabricator, created_at: 30.days.ago)
           Fabricate(fabricator, created_at: 35.days.ago)
         end
-        after(:each) { Timecop.return }
 
         context 'returns a report with data'
           it "returns today's data" do
@@ -87,15 +86,13 @@ describe Report do
 
       context "with #{request_type}" do
         before(:each) do
-          Timecop.freeze
+          freeze_time
           ApplicationRequest.create(date: 35.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 35)
           ApplicationRequest.create(date: 7.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 8)
           ApplicationRequest.create(date: Date.today.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 1)
           ApplicationRequest.create(date: 1.day.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 2)
           ApplicationRequest.create(date: 2.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 3)
         end
-        after(:each) { Timecop.return }
-
 
         context 'returns a report with data' do
           it "returns expected number of recoords" do
diff --git a/spec/models/rtl_spec.rb b/spec/models/rtl_spec.rb
deleted file mode 100644
index 74b3462cc1f..00000000000
--- a/spec/models/rtl_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require 'rails_helper'
-
-describe RTL do
-
-  let(:user) { Fabricate.build(:user) }
-
-  describe '.css_class' do
-
-    context 'user locale is allowed' do
-      before { SiteSetting.stubs(:allow_user_locale).returns(true) }
-
-      context 'user locale is RTL' do
-        before { user.stubs(:locale).returns('he') }
-
-        it 'returns rtl class' do
-          expect(RTL.new(user).css_class).to eq('rtl')
-        end
-      end
-
-      context 'user locale is not RTL' do
-        it 'returns empty class' do
-          expect(RTL.new(user).css_class).to eq('')
-        end
-      end
-
-    end
-
-    context 'user locale is not allowed' do
-      before { SiteSetting.stubs(:allow_user_locale).returns(false) }
-
-      context 'site default locale is RTL' do
-        before { SiteSetting.stubs(:default_locale).returns('he') }
-
-        it 'returns rtl class' do
-          expect(RTL.new(user).css_class).to eq('rtl')
-        end
-      end
-
-      context 'site default locale is LTR' do
-        before { SiteSetting.stubs(:default_locale).returns('en') }
-
-        context 'user locale is RTL' do
-          before { user.stubs(:locale).returns('he') }
-
-          it 'returns empty class' do
-            expect(RTL.new(user).css_class).to eq('')
-          end
-        end
-      end
-    end
-
-  end
-end
diff --git a/spec/models/s3_region_site_setting_spec.rb b/spec/models/s3_region_site_setting_spec.rb
index 9f36a09e28a..8749986801c 100644
--- a/spec/models/s3_region_site_setting_spec.rb
+++ b/spec/models/s3_region_site_setting_spec.rb
@@ -12,10 +12,4 @@ describe S3RegionSiteSetting do
     end
   end
 
-  describe 'values' do
-    it 'returns all the S3 regions' do
-      expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['us-east-1', 'us-west-1', 'us-west-2', 'us-gov-west-1', 'eu-west-1', 'eu-west-2', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-south-1', 'ap-northeast-1', 'ap-northeast-2', 'sa-east-1', 'cn-north-1'].sort)
-    end
-  end
-
 end
diff --git a/spec/models/screened_email_spec.rb b/spec/models/screened_email_spec.rb
index 73647731585..af4e82c43da 100644
--- a/spec/models/screened_email_spec.rb
+++ b/spec/models/screened_email_spec.rb
@@ -78,7 +78,7 @@ describe ScreenedEmail do
 
     shared_examples "when a ScreenedEmail record matches" do
       it "updates statistics" do
-        Timecop.freeze(Time.zone.now) do
+        freeze_time(Time.zone.now) do
           expect { subject }.to change { screened_email.reload.match_count }.by(1)
           expect(screened_email.last_match_at).to be_within_one_second_of(Time.zone.now)
         end
diff --git a/spec/models/screened_ip_address_spec.rb b/spec/models/screened_ip_address_spec.rb
index c26b1151be2..18924015d31 100644
--- a/spec/models/screened_ip_address_spec.rb
+++ b/spec/models/screened_ip_address_spec.rb
@@ -246,7 +246,7 @@ describe ScreenedIpAddress do
       end
 
       context "use_admin_ip_whitelist is true" do
-        before { SiteSetting.stubs(:use_admin_ip_whitelist).returns(true) }
+        before { SiteSetting.use_admin_ip_whitelist = true }
 
         it "returns false when user is nil" do
           expect(described_class.block_admin_login?(nil, '123.12.12.12')).to eq(false)
@@ -277,7 +277,7 @@ describe ScreenedIpAddress do
       end
 
       context "use_admin_ip_whitelist is true" do
-        before { SiteSetting.stubs(:use_admin_ip_whitelist).returns(true) }
+        before { SiteSetting.use_admin_ip_whitelist = true }
 
         it "returns false when user is nil" do
           expect(described_class.block_admin_login?(nil, @permitted_ip_address)).to eq(false)
diff --git a/spec/models/search_log_spec.rb b/spec/models/search_log_spec.rb
new file mode 100644
index 00000000000..34dabb0f38c
--- /dev/null
+++ b/spec/models/search_log_spec.rb
@@ -0,0 +1,180 @@
+require 'rails_helper'
+
+RSpec.describe SearchLog, type: :model do
+
+  describe ".log" do
+
+    context "invalid arguments" do
+      it "no search type returns error" do
+        status, _ = SearchLog.log(
+          term: 'bounty hunter',
+          search_type: :missing,
+          ip_address: '127.0.0.1'
+        )
+        expect(status).to eq(:error)
+      end
+
+      it "no IP returns error" do
+        status, _ = SearchLog.log(
+          term: 'bounty hunter',
+          search_type: :header,
+          ip_address: nil
+        )
+        expect(status).to eq(:error)
+      end
+    end
+
+    context "when anonymous" do
+      it "logs and updates the search" do
+        freeze_time
+        action, log_id = SearchLog.log(
+          term: 'jabba',
+          search_type: :header,
+          ip_address: '192.168.0.33'
+        )
+        expect(action).to eq(:created)
+        log = SearchLog.find(log_id)
+        expect(log.term).to eq('jabba')
+        expect(log.search_type).to eq(SearchLog.search_types[:header])
+        expect(log.ip_address).to eq('192.168.0.33')
+
+        action, updated_log_id = SearchLog.log(
+          term: 'jabba the hut',
+          search_type: :header,
+          ip_address: '192.168.0.33'
+        )
+        expect(action).to eq(:updated)
+        expect(updated_log_id).to eq(log_id)
+      end
+
+      it "creates a new search with a different prefix" do
+        freeze_time
+        action, _ = SearchLog.log(
+          term: 'darth',
+          search_type: :header,
+          ip_address: '127.0.0.1'
+        )
+        expect(action).to eq(:created)
+
+        action, _ = SearchLog.log(
+          term: 'anakin',
+          search_type: :header,
+          ip_address: '127.0.0.1'
+        )
+        expect(action).to eq(:created)
+      end
+
+      it "creates a new search with a different ip" do
+        freeze_time
+        action, _ = SearchLog.log(
+          term: 'darth',
+          search_type: :header,
+          ip_address: '127.0.0.1'
+        )
+        expect(action).to eq(:created)
+
+        action, _ = SearchLog.log(
+          term: 'darth',
+          search_type: :header,
+          ip_address: '127.0.0.2'
+        )
+        expect(action).to eq(:created)
+      end
+    end
+
+    context "when logged in" do
+      let(:user) { Fabricate(:user) }
+
+      it "logs and updates the search" do
+        freeze_time
+        action, log_id = SearchLog.log(
+          term: 'hello',
+          search_type: :full_page,
+          ip_address: '192.168.0.1',
+          user_id: user.id
+        )
+        expect(action).to eq(:created)
+        log = SearchLog.find(log_id)
+        expect(log.term).to eq('hello')
+        expect(log.search_type).to eq(SearchLog.search_types[:full_page])
+        expect(log.ip_address).to eq('192.168.0.1')
+        expect(log.user_id).to eq(user.id)
+
+        action, updated_log_id = SearchLog.log(
+          term: 'hello dolly',
+          search_type: :header,
+          ip_address: '192.168.0.33',
+          user_id: user.id
+        )
+        expect(action).to eq(:updated)
+        expect(updated_log_id).to eq(log_id)
+      end
+
+      it "logs again if time has passed" do
+        freeze_time(10.minutes.ago)
+
+        action, _ = SearchLog.log(
+          term: 'hello',
+          search_type: :full_page,
+          ip_address: '192.168.0.1',
+          user_id: user.id
+        )
+        expect(action).to eq(:created)
+
+        freeze_time(10.minutes.from_now)
+
+        action, _ = SearchLog.log(
+          term: 'hello',
+          search_type: :full_page,
+          ip_address: '192.168.0.1',
+          user_id: user.id
+        )
+
+        expect(action).to eq(:created)
+      end
+
+      it "logs again with a different user" do
+        freeze_time
+
+        action, _ = SearchLog.log(
+          term: 'hello',
+          search_type: :full_page,
+          ip_address: '192.168.0.1',
+          user_id: user.id
+        )
+        expect(action).to eq(:created)
+
+        action, _ = SearchLog.log(
+          term: 'hello dolly',
+          search_type: :full_page,
+          ip_address: '192.168.0.1',
+          user_id: Fabricate(:user).id
+        )
+        expect(action).to eq(:created)
+      end
+
+    end
+  end
+
+  context "clean_up" do
+
+    it "will remove old logs" do
+      SearchLog.log(term: 'jawa', search_type: :header, ip_address: '127.0.0.1')
+      SearchLog.log(term: 'jedi', search_type: :header, ip_address: '127.0.0.1')
+      SearchLog.log(term: 'rey', search_type: :header, ip_address: '127.0.0.1')
+      SearchLog.log(term: 'finn', search_type: :header, ip_address: '127.0.0.1')
+
+      SiteSetting.search_query_log_max_size = 5
+      SearchLog.clean_up
+      expect(SearchLog.count).to eq(4)
+
+      SiteSetting.search_query_log_max_size = 2
+      SearchLog.clean_up
+      expect(SearchLog.count).to eq(2)
+      expect(SearchLog.where(term: 'rey').first).to be_present
+      expect(SearchLog.where(term: 'finn').first).to be_present
+    end
+
+  end
+
+end
diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb
index d1905b2c085..bef6f0237f7 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -128,10 +128,6 @@ describe SiteSetting do
       SiteSetting.force_https = true
     end
 
-    after do
-      SiteSetting.force_https = false
-    end
-
     describe '#use_https' do
       it 'should act as a proxy to the new methods' do
         expect(SiteSetting.use_https).to eq(true)
diff --git a/spec/models/top_menu_item_spec.rb b/spec/models/top_menu_item_spec.rb
index a92df985ffc..61f78e08490 100644
--- a/spec/models/top_menu_item_spec.rb
+++ b/spec/models/top_menu_item_spec.rb
@@ -1,7 +1,10 @@
 require 'rails_helper'
 
 describe TopMenuItem do
-  before(:each) { SiteSetting.stubs(:top_menu).returns('one,-nope|two|three,-not|four,ignored|category/xyz') }
+  before do
+    SiteSetting.top_menu = 'one,-nope|two|three,-not|four,ignored|latest|category/xyz'
+  end
+
   let(:items) { SiteSetting.top_menu_items }
 
   it 'has name' do
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index cee779633be..1c1a7c34314 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -11,7 +11,7 @@ describe TopicConverter do
     context 'success' do
       it "converts private message to regular topic" do
         SiteSetting.allow_uncategorized_topics = true
-        topic = described_class.new(private_message, admin).convert_to_public_topic
+        topic = TopicConverter.new(private_message, admin).convert_to_public_topic
         topic.reload
 
         expect(topic).to be_valid
@@ -26,18 +26,22 @@ describe TopicConverter do
         end
 
         it 'should convert private message into the right category' do
-          topic = described_class.new(private_message, admin).convert_to_public_topic
+          topic = TopicConverter.new(private_message, admin).convert_to_public_topic
           topic.reload
 
           expect(topic).to be_valid
           expect(topic.archetype).to eq("regular")
-          expect(topic.category_id).to eq(category.id)
+
+          first_category = Category.where.not(id: SiteSetting.uncategorized_category_id)
+                                   .where(read_restricted: false).order('id asc').first
+
+          expect(topic.category_id).to eq(first_category.id)
         end
       end
 
       describe 'when a custom category_id is given' do
         it 'should convert private message into the right category' do
-          topic = described_class.new(private_message, admin).convert_to_public_topic(category.id)
+          topic = TopicConverter.new(private_message, admin).convert_to_public_topic(category.id)
 
           expect(topic.reload.category).to eq(category)
         end
diff --git a/spec/models/topic_embed_spec.rb b/spec/models/topic_embed_spec.rb
index 7270c4fc7e9..8da66b32b6d 100644
--- a/spec/models/topic_embed_spec.rb
+++ b/spec/models/topic_embed_spec.rb
@@ -96,8 +96,8 @@ describe TopicEmbed do
 
       response = nil
 
-      before(:each) do
-        SiteSetting.stubs(:embed_classname_whitelist).returns 'emoji , foo'
+      before do
+        SiteSetting.embed_classname_whitelist = 'emoji, foo'
         file.stubs(:read).returns contents
         TopicEmbed.stubs(:open).returns file
         response = TopicEmbed.find_remote(url)
@@ -155,7 +155,7 @@ describe TopicEmbed do
       response = nil
 
       before(:each) do
-        SiteSetting.stubs(:embed_classname_whitelist).returns ' '
+        SiteSetting.embed_classname_whitelist = ''
         file.stubs(:read).returns contents
         TopicEmbed.stubs(:open).returns file
         response = TopicEmbed.find_remote(url)
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 1cee451bafe..c93d6d3e393 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -34,7 +34,7 @@ describe Topic do
           it 'should not be valid' do
             SiteSetting.censored_words = 'pineapple|pen'
 
-            topic.title = 'pen PinEapple apple pen '
+            topic.title = 'pen PinEapple apple pen is a complete sentence'
 
             expect(topic).to_not be_valid
 
@@ -44,6 +44,14 @@ describe Topic do
           end
         end
 
+        describe 'titles with censored words not on boundaries' do
+          it "should be valid" do
+            SiteSetting.censored_words = 'apple'
+            topic.title = "Pineapples are great fruit! Applebee's is a great restaurant"
+            expect(topic).to be_valid
+          end
+        end
+
         describe 'when title does not contain censored words' do
           it 'should be valid' do
             topic.title = 'The cake is a lie'
@@ -177,8 +185,8 @@ describe Topic do
 
   context 'private message title' do
     before do
-      SiteSetting.stubs(:min_topic_title_length).returns(15)
-      SiteSetting.stubs(:min_private_message_title_length).returns(3)
+      SiteSetting.min_topic_title_length = 15
+      SiteSetting.min_private_message_title_length = 3
     end
 
     it 'allows shorter titles' do
@@ -319,7 +327,7 @@ describe Topic do
   context 'category validation' do
     context 'allow_uncategorized_topics is false' do
       before do
-        SiteSetting.stubs(:allow_uncategorized_topics).returns(false)
+        SiteSetting.allow_uncategorized_topics = false
       end
 
       it "does not allow nil category" do
@@ -340,7 +348,7 @@ describe Topic do
 
     context 'allow_uncategorized_topics is true' do
       before do
-        SiteSetting.stubs(:allow_uncategorized_topics).returns(true)
+        SiteSetting.allow_uncategorized_topics = true
       end
 
       it "passes for topics with nil category" do
@@ -439,22 +447,42 @@ describe Topic do
         let(:walter) { Fabricate(:walter_white) }
 
         context 'by group name' do
+          let(:group) { Fabricate(:group) }
 
           it 'can add admin to allowed groups' do
             admins = Group[:admins]
-            admins.alias_level = Group::ALIAS_LEVELS[:everyone]
-            admins.save
+            admins.update!(alias_level: Group::ALIAS_LEVELS[:everyone])
 
             expect(topic.invite_group(topic.user, admins)).to eq(true)
-
             expect(topic.allowed_groups.include?(admins)).to eq(true)
-
             expect(topic.remove_allowed_group(topic.user, 'admins')).to eq(true)
-            topic.reload
-
             expect(topic.allowed_groups.include?(admins)).to eq(false)
           end
 
+          it 'creates a notification for each user in the group' do
+            user = Fabricate(:user)
+            user_2 = Fabricate(:user)
+            Fabricate(:post, topic: topic)
+
+            group.add(user)
+            group.add(user_2)
+
+            group.group_users.find_by(user: user_2).update!(
+              notification_level: NotificationLevels.all[:muted]
+            )
+
+            expect { topic.invite_group(topic.user, group) }
+              .to change { Notification.count }.by(1)
+
+            notification = Notification.last
+
+            expect(notification.user).to eq(user)
+            expect(notification.topic).to eq(topic)
+
+            expect(notification.notification_type)
+              .to eq(Notification.types[:invited_to_private_message])
+          end
+
         end
 
         context 'by username' do
@@ -510,7 +538,7 @@ describe Topic do
   context 'rate limits' do
 
     it "rate limits topic invitations" do
-      SiteSetting.stubs(:max_topic_invitations_per_day).returns(2)
+      SiteSetting.max_topic_invitations_per_day = 2
       RateLimiter.stubs(:disabled?).returns(false)
       RateLimiter.clear_all!
 
@@ -1057,7 +1085,7 @@ describe Topic do
 
       context 'when allow_uncategorized_topics is false' do
         before do
-          SiteSetting.stubs(:allow_uncategorized_topics).returns(false)
+          SiteSetting.allow_uncategorized_topics = false
         end
 
         let!(:topic) { Fabricate(:topic, category: Fabricate(:category)) }
@@ -1127,9 +1155,7 @@ describe Topic do
     let(:topic) { Fabricate.build(:topic) }
 
     let(:closing_topic) do
-      Fabricate(:topic,
-        topic_timers: [Fabricate(:topic_timer, execute_at: 5.hours.from_now)]
-      )
+      Fabricate(:topic_timer, execute_at: 5.hours.from_now).topic
     end
 
     let(:admin) { Fabricate(:admin) }
@@ -1138,68 +1164,60 @@ describe Topic do
     before { Discourse.stubs(:system_user).returns(admin) }
 
     it 'can take a number of hours as an integer' do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], 72, by_user: admin)
-        expect(topic.topic_timers.first.execute_at).to eq(3.days.from_now)
-      end
+      freeze_time now
+
+      topic.set_or_create_timer(TopicTimer.types[:close], 72, by_user: admin)
+      expect(topic.topic_timers.first.execute_at).to eq(3.days.from_now)
     end
 
     it 'can take a number of hours as an integer, with timezone offset' do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], 72, {by_user: admin, timezone_offset: 240})
-        expect(topic.topic_timers.first.execute_at).to eq(3.days.from_now)
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], 72, {by_user: admin, timezone_offset: 240})
+      expect(topic.topic_timers.first.execute_at).to eq(3.days.from_now)
     end
 
     it 'can take a number of hours as a string' do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin)
-        expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin)
+      expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
     end
 
     it 'can take a number of hours as a string, with timezone offset' do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '18', {by_user: admin, timezone_offset: 240})
-        expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '18', {by_user: admin, timezone_offset: 240})
+      expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
     end
 
     it 'can take a number of hours as a string and can handle based on last post' do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '18', {by_user: admin, based_on_last_post: true})
-        expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '18', {by_user: admin, based_on_last_post: true})
+      expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
     end
 
     it "can take a timestamp for a future time" do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-22 5:00', {by_user: admin})
-        expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013,11,22,5,0))
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-22 5:00', {by_user: admin})
+      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013,11,22,5,0))
     end
 
     it "can take a timestamp for a future time, with timezone offset" do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-22 5:00', {by_user: admin, timezone_offset: 240})
-        expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013,11,22,9,0))
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-22 5:00', {by_user: admin, timezone_offset: 240})
+      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013,11,22,9,0))
     end
 
     it "sets a validation error when given a timestamp in the past" do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-19 5:00', {by_user: admin})
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-19 5:00', {by_user: admin})
 
-        expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013,11,19,5,0))
-        expect(topic.topic_timers.first.errors[:execute_at]).to be_present
-      end
+      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013,11,19,5,0))
+      expect(topic.topic_timers.first.errors[:execute_at]).to be_present
     end
 
     it "can take a timestamp with timezone" do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-25T01:35:00-08:00', {by_user: admin})
-        expect(topic.topic_timers.first.execute_at).to eq(Time.utc(2013,11,25,9,35))
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-25T01:35:00-08:00', {by_user: admin})
+      expect(topic.topic_timers.first.execute_at).to eq(Time.utc(2013,11,25,9,35))
     end
 
     it 'sets topic status update user to given user if it is a staff or TL4 user' do
@@ -1241,10 +1259,19 @@ describe Topic do
     end
 
     it 'updates topic status update execute_at if it was already set to close' do
-      Timecop.freeze(now) do
-        closing_topic.set_or_create_timer(TopicTimer.types[:close], 48)
-        expect(closing_topic.reload.public_topic_timer.execute_at).to eq(2.days.from_now)
-      end
+      freeze_time now
+      closing_topic.set_or_create_timer(TopicTimer.types[:close], 48)
+      expect(closing_topic.reload.public_topic_timer.execute_at).to eq(2.days.from_now)
+    end
+
+    it 'should allow status_type to be updated' do
+      freeze_time
+
+      topic_timer = closing_topic.set_or_create_timer(
+        TopicTimer.types[:publish_to_category], 72, by_user: admin
+      )
+
+      expect(topic_timer.execute_at).to eq(3.days.from_now)
     end
 
     it "does not update topic's topic status created_at it was already set to close" do
@@ -1264,10 +1291,10 @@ describe Topic do
 
         expect(topic.reload.closed).to eq(false)
 
-        Timecop.travel(3.hours.from_now) do
-          TopicTimer.ensure_consistency!
-          expect(topic.reload.closed).to eq(true)
-        end
+        freeze_time 3.hours.from_now
+
+        TopicTimer.ensure_consistency!
+        expect(topic.reload.closed).to eq(true)
       end
     end
 
@@ -1284,14 +1311,14 @@ describe Topic do
       end
 
       it "can update a user's existing record" do
-        Timecop.freeze(now) do
-          reminder
-          expect {
-            topic.set_or_create_timer(TopicTimer.types[:reminder], 11, by_user: admin)
-          }.to_not change { TopicTimer.count }
-          reminder.reload
-          expect(reminder.execute_at).to eq(11.hours.from_now)
-        end
+        freeze_time now
+
+        reminder
+        expect {
+          topic.set_or_create_timer(TopicTimer.types[:reminder], 11, by_user: admin)
+        }.to_not change { TopicTimer.count }
+        reminder.reload
+        expect(reminder.execute_at).to eq(11.hours.from_now)
       end
     end
   end
@@ -1375,6 +1402,19 @@ describe Topic do
       expect(Topic.for_digest(user, 1.year.ago, top_order: true)).to eq([topic])
     end
 
+    it "returns topics with no tags too" do
+      user = Fabricate(:user)
+      muted_tag = Fabricate(:tag)
+      TagUser.change(user.id, muted_tag.id, TagUser.notification_levels[:muted])
+      topic1 = Fabricate(:topic, tags: [muted_tag])
+      topic2 = Fabricate(:topic, tags: [Fabricate(:tag), Fabricate(:tag)])
+      topic3 = Fabricate(:topic)
+
+      topics = Topic.for_digest(user, 1.year.ago, top_order: true)
+      expect(topics.size).to eq(2)
+      expect(topics).to contain_exactly(topic2, topic3)
+    end
+
     it "sorts by category notification levels" do
       category1, category2 = Fabricate(:category), Fabricate(:category)
       2.times {|i| Fabricate(:topic, category: category1) }
@@ -1461,16 +1501,15 @@ describe Topic do
 
   describe '#listable_count_per_day' do
     before(:each) do
-      Timecop.freeze
+      freeze_time
+
       Fabricate(:topic)
       Fabricate(:topic, created_at: 1.day.ago)
       Fabricate(:topic, created_at: 1.day.ago)
       Fabricate(:topic, created_at: 2.days.ago)
       Fabricate(:topic, created_at: 4.days.ago)
     end
-    after(:each) do
-      Timecop.return
-    end
+
     let(:listable_topics_count_per_day) { {1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.now.utc.to_date => 1 } }
 
     it 'collect closed interval listable topics count' do
@@ -1598,7 +1637,7 @@ describe Topic do
   end
 
   describe ".count_exceeds_minimun?" do
-    before { SiteSetting.stubs(:minimum_topics_similar).returns(20) }
+    before { SiteSetting.minimum_topics_similar = 20 }
 
     context "when Topic count is geater than minimum_topics_similar" do
       it "should be true" do
@@ -1667,11 +1706,11 @@ describe Topic do
   end
 
   it "doesn't validate the title again if it isn't changing" do
-    SiteSetting.stubs(:min_topic_title_length).returns(5)
+    SiteSetting.min_topic_title_length = 5
     topic = Fabricate(:topic, title: "Short")
     expect(topic).to be_valid
 
-    SiteSetting.stubs(:min_topic_title_length).returns(15)
+    SiteSetting.min_topic_title_length = 15
     topic.last_posted_at = 1.minute.ago
     expect(topic.save).to eq(true)
   end
@@ -1697,7 +1736,7 @@ describe Topic do
 
       it "should add user to the group" do
         expect(Guardian.new(walter).can_see?(group_private_topic)).to be_falsey
-        expect { group_private_topic.invite(group_manager, walter.email) }.to raise_error(Invite::UserExists)
+        group_private_topic.invite(group_manager, walter.email)
         expect(walter.groups).to include(group)
         expect(Guardian.new(walter).can_see?(group_private_topic)).to be_truthy
       end
diff --git a/spec/models/topic_timer_spec.rb b/spec/models/topic_timer_spec.rb
index 7ffd78d2d63..d48760616e6 100644
--- a/spec/models/topic_timer_spec.rb
+++ b/spec/models/topic_timer_spec.rb
@@ -113,63 +113,60 @@ RSpec.describe TopicTimer, type: :model do
 
     describe 'when #execute_at value is changed' do
       it 'reschedules the job' do
-        Timecop.freeze do
-          topic_timer
+        freeze_time
+        topic_timer
 
-          Jobs.expects(:cancel_scheduled_job).with(
-            :toggle_topic_closed, topic_timer_id: topic_timer.id
-          )
+        Jobs.expects(:cancel_scheduled_job).with(
+          :toggle_topic_closed, topic_timer_id: topic_timer.id
+        )
 
-          Jobs.expects(:enqueue_at).with(
-            3.days.from_now, :toggle_topic_closed,
-            topic_timer_id: topic_timer.id,
-            state: true
-          )
+        Jobs.expects(:enqueue_at).with(
+          3.days.from_now, :toggle_topic_closed,
+          topic_timer_id: topic_timer.id,
+          state: true
+        )
 
-          topic_timer.update!(execute_at: 3.days.from_now, created_at: Time.zone.now)
-        end
+        topic_timer.update!(execute_at: 3.days.from_now, created_at: Time.zone.now)
       end
 
       describe 'when execute_at is smaller than the current time' do
         it 'should enqueue the job immediately' do
-          Timecop.freeze do
-            topic_timer
+          freeze_time
+          topic_timer
 
-            Jobs.expects(:enqueue_at).with(
-              Time.zone.now, :toggle_topic_closed,
-              topic_timer_id: topic_timer.id,
-              state: true
-            )
+          Jobs.expects(:enqueue_at).with(
+            Time.zone.now, :toggle_topic_closed,
+            topic_timer_id: topic_timer.id,
+            state: true
+          )
 
-            topic_timer.update!(
-              execute_at: Time.zone.now - 1.hour,
-              created_at: Time.zone.now - 2.hour
-            )
-          end
+          topic_timer.update!(
+            execute_at: Time.zone.now - 1.hour,
+            created_at: Time.zone.now - 2.hour
+          )
         end
       end
     end
 
     describe 'when user is changed' do
       it 'should update the job' do
-        Timecop.freeze do
-          topic_timer
+        freeze_time
+        topic_timer
 
-          Jobs.expects(:cancel_scheduled_job).with(
-            :toggle_topic_closed, topic_timer_id: topic_timer.id
-          )
+        Jobs.expects(:cancel_scheduled_job).with(
+          :toggle_topic_closed, topic_timer_id: topic_timer.id
+        )
 
-          admin = Fabricate(:admin)
+        admin = Fabricate(:admin)
 
-          Jobs.expects(:enqueue_at).with(
-            topic_timer.execute_at,
-            :toggle_topic_closed,
-            topic_timer_id: topic_timer.id,
-            state: true
-          )
+        Jobs.expects(:enqueue_at).with(
+          topic_timer.execute_at,
+          :toggle_topic_closed,
+          topic_timer_id: topic_timer.id,
+          state: true
+        )
 
-          topic_timer.update!(user: admin)
-        end
+        topic_timer.update!(user: admin)
       end
     end
 
@@ -260,7 +257,8 @@ RSpec.describe TopicTimer, type: :model do
       open_topic_timer = Fabricate(:topic_timer,
         status_type: described_class.types[:open],
         execute_at: Time.zone.now - 1.hour,
-        created_at: Time.zone.now - 2.hour
+        created_at: Time.zone.now - 2.hour,
+        topic: Fabricate(:topic, closed: true)
       )
 
       Fabricate(:topic_timer)
diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb
index d1c40d61cdf..e331a73e3d7 100644
--- a/spec/models/translation_override_spec.rb
+++ b/spec/models/translation_override_spec.rb
@@ -1,6 +1,26 @@
 require 'rails_helper'
 
 describe TranslationOverride do
+  context 'validations' do
+    describe '#value' do
+      before do
+        I18n.backend.store_translations(:en, some_key: '%{first} %{second}')
+      end
+
+      describe 'when interpolation keys are missing' do
+        it 'should not be valid' do
+          translation_override = TranslationOverride.upsert!(
+            I18n.locale, 'some_key', '%{first}'
+          )
+
+          expect(translation_override.errors.full_messages).to include(I18n.t(
+            'activerecord.errors.models.translation_overrides.attributes.value.missing_interpolation_keys',
+            keys: 'second'
+          ))
+        end
+      end
+    end
+  end
 
   it "upserts values" do
     TranslationOverride.upsert!('en', 'some.key', 'some value')
@@ -19,4 +39,3 @@ describe TranslationOverride do
   end
 
 end
-
diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index cb0a2b4e445..8b0ad4b4bfb 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -15,22 +15,22 @@ describe TrustLevel3Requirements do
 
   describe "requirements" do
     it "time_period uses site setting" do
-      SiteSetting.stubs(:tl3_time_period).returns(80)
+      SiteSetting.tl3_time_period = 80
       expect(tl3_requirements.time_period).to eq(80)
     end
 
     it "min_days_visited uses site setting" do
-      SiteSetting.stubs(:tl3_requires_days_visited).returns(66)
+      SiteSetting.tl3_requires_days_visited = 66
       expect(tl3_requirements.min_days_visited).to eq(66)
     end
 
     it "min_topics_replied_to uses site setting" do
-      SiteSetting.stubs(:tl3_requires_topics_replied_to).returns(12)
+      SiteSetting.tl3_requires_topics_replied_to = 12
       expect(tl3_requirements.min_topics_replied_to).to eq(12)
     end
 
     it "min_topics_viewed depends on site setting and number of topics created" do
-      SiteSetting.stubs(:tl3_requires_topics_viewed).returns(75)
+      SiteSetting.tl3_requires_topics_viewed = 75
       described_class.stubs(:num_topics_in_time_period).returns(31)
       expect(tl3_requirements.min_topics_viewed).to eq(23)
     end
@@ -43,7 +43,7 @@ describe TrustLevel3Requirements do
     end
 
     it "min_posts_read depends on site setting and number of posts created" do
-      SiteSetting.stubs(:tl3_requires_posts_read).returns(66)
+      SiteSetting.tl3_requires_posts_read = 66
       described_class.stubs(:num_posts_in_time_period).returns(1234)
       expect(tl3_requirements.min_posts_read).to eq(814)
     end
@@ -56,27 +56,27 @@ describe TrustLevel3Requirements do
     end
 
     it "min_topics_viewed_all_time depends on site setting" do
-      SiteSetting.stubs(:tl3_requires_topics_viewed_all_time).returns(75)
+      SiteSetting.tl3_requires_topics_viewed_all_time = 75
       expect(tl3_requirements.min_topics_viewed_all_time).to eq(75)
     end
 
     it "min_posts_read_all_time depends on site setting" do
-      SiteSetting.stubs(:tl3_requires_posts_read_all_time).returns(1001)
+      SiteSetting.tl3_requires_posts_read_all_time = 1001
       expect(tl3_requirements.min_posts_read_all_time).to eq(1001)
     end
 
     it "max_flagged_posts depends on site setting" do
-      SiteSetting.stubs(:tl3_requires_max_flagged).returns(3)
+      SiteSetting.tl3_requires_max_flagged = 3
       expect(tl3_requirements.max_flagged_posts).to eq(3)
     end
 
     it "min_likes_given depends on site setting" do
-      SiteSetting.stubs(:tl3_requires_likes_given).returns(30)
+      SiteSetting.tl3_requires_likes_given = 30
       expect(tl3_requirements.min_likes_given).to eq(30)
     end
 
     it "min_likes_received depends on site setting" do
-      SiteSetting.stubs(:tl3_requires_likes_received).returns(20)
+      SiteSetting.tl3_requires_likes_received = 20
       expect(tl3_requirements.min_likes_received).to eq(20)
       expect(tl3_requirements.min_likes_received_days).to eq(7)
       expect(tl3_requirements.min_likes_received_users).to eq(5)
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index c187ddbe675..d6eaedee761 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -29,7 +29,7 @@ describe Upload do
   context ".create_thumbnail!" do
 
     it "does not create a thumbnail when disabled" do
-      SiteSetting.stubs(:create_thumbnails?).returns(false)
+      SiteSetting.create_thumbnails = false
       OptimizedImage.expects(:create_for).never
       upload.create_thumbnail!(100, 100)
     end
diff --git a/spec/models/user_profile_spec.rb b/spec/models/user_profile_spec.rb
index 34a88c48cd0..5e059bb5861 100644
--- a/spec/models/user_profile_spec.rb
+++ b/spec/models/user_profile_spec.rb
@@ -143,7 +143,7 @@ describe UserProfile do
       end
 
       context 'tl3_links_no_follow is false' do
-        before { SiteSetting.stubs(:tl3_links_no_follow).returns(false) }
+        before { SiteSetting.tl3_links_no_follow = false }
 
         it 'includes the link without nofollow if the user is trust level 3 or higher' do
           user.trust_level = TrustLevel[3]
@@ -169,7 +169,7 @@ describe UserProfile do
       end
 
       context 'tl3_links_no_follow is true' do
-        before { SiteSetting.stubs(:tl3_links_no_follow).returns(true) }
+        before { SiteSetting.tl3_links_no_follow = true }
 
         it 'includes the link with nofollow if the user is trust level 3 or higher' do
           user.trust_level = TrustLevel[3]
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index cf0bd01d015..5d6c536b9d4 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -9,11 +9,10 @@ describe User do
     describe 'emails' do
       let(:user) { Fabricate.build(:user) }
 
-      it { is_expected.to validate_presence_of :email }
-
       describe 'when record has a valid email' do
         it "should be valid" do
           user.email = 'test@gmail.com'
+
           expect(user).to be_valid
         end
       end
@@ -21,7 +20,9 @@ describe User do
       describe 'when record has an invalid email' do
         it 'should not be valid' do
           user.email = 'test@gmailcom'
+
           expect(user).to_not be_valid
+          expect(user.errors.messages).to include(:primary_email)
         end
       end
     end
@@ -30,14 +31,13 @@ describe User do
   describe '#count_by_signup_date' do
     before(:each) do
       User.destroy_all
-      Timecop.freeze
+      freeze_time
       Fabricate(:user)
       Fabricate(:user, created_at: 1.day.ago)
       Fabricate(:user, created_at: 1.day.ago)
       Fabricate(:user, created_at: 2.days.ago)
       Fabricate(:user, created_at: 4.days.ago)
     end
-    after(:each) { Timecop.return }
     let(:signups_by_day) { {1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.now.utc.to_date => 1} }
 
     it 'collect closed interval signups' do
@@ -66,7 +66,7 @@ describe User do
     let(:admin) { Fabricate(:admin) }
 
     it "enqueues a 'signup after approval' email if must_approve_users is true" do
-      SiteSetting.stubs(:must_approve_users).returns(true)
+      SiteSetting.must_approve_users = true
       Jobs.expects(:enqueue).with(
         :critical_user_email, has_entries(type: :signup_after_approval)
       )
@@ -74,7 +74,7 @@ describe User do
     end
 
     it "doesn't enqueue a 'signup after approval' email if must_approve_users is false" do
-      SiteSetting.stubs(:must_approve_users).returns(false)
+      SiteSetting.must_approve_users = false
       Jobs.expects(:enqueue).never
       user.approve(admin)
     end
@@ -648,8 +648,8 @@ describe User do
     let!(:third_visit_date) { 5.hours.from_now }
 
     before do
-      SiteSetting.stubs(:active_user_rate_limit_secs).returns(0)
-      SiteSetting.stubs(:previous_visit_timeout_hours).returns(1)
+      SiteSetting.active_user_rate_limit_secs = 0
+      SiteSetting.previous_visit_timeout_hours = 1
     end
 
     it "should act correctly" do
@@ -715,14 +715,10 @@ describe User do
       let!(:date) { Time.zone.now }
 
       before do
-        Timecop.freeze(date)
+        freeze_time date
         user.update_last_seen!
       end
 
-      after do
-        Timecop.return
-      end
-
       it "updates last_seen_at" do
         expect(user.last_seen_at).to be_within_one_second_of(date)
       end
@@ -739,16 +735,12 @@ describe User do
       context "called twice" do
 
         before do
-          Timecop.freeze(date)
+          freeze_time date
           user.update_last_seen!
           user.update_last_seen!
           user.reload
         end
 
-        after do
-          Timecop.return
-        end
-
         it "doesn't increase days_visited twice" do
           expect(user.user_stat.days_visited).to eq(1)
         end
@@ -759,14 +751,10 @@ describe User do
         let!(:future_date) { 3.days.from_now }
 
         before do
-          Timecop.freeze(future_date)
+          freeze_time future_date
           user.update_last_seen!
         end
 
-        after do
-          Timecop.return
-        end
-
         it "should log a second visited_at record when we log an update later" do
           expect(user.user_visits.count).to eq(2)
         end
@@ -969,7 +957,7 @@ describe User do
 
     before do
       # To make testing easier, say 1 reply is too much
-      SiteSetting.stubs(:newuser_max_replies_per_topic).returns(1)
+      SiteSetting.newuser_max_replies_per_topic = 1
       UserActionCreator.enable
     end
 
@@ -1220,29 +1208,16 @@ describe User do
       )
     }
 
-    it "doesn't automatically add inactive users" do
-      inactive_user = Fabricate(:user, active: false, email: "wat@wat.com")
-      group.reload
-      expect(group.users.include?(inactive_user)).to eq(false)
-    end
-
-    it "doesn't automatically add users with unconfirmed email" do
-      unconfirmed_email_user = Fabricate(:user, active: true, email: "wat@wat.com")
-      unconfirmed_email_user.email_tokens.create(email: unconfirmed_email_user.email)
-      group.reload
-      expect(group.users.include?(unconfirmed_email_user)).to eq(false)
-    end
-
     it "doesn't automatically add staged users" do
       staged_user = Fabricate(:user, active: true, staged: true, email: "wat@wat.com")
+      EmailToken.confirm(staged_user.email_tokens.last.token)
       group.reload
       expect(group.users.include?(staged_user)).to eq(false)
     end
 
     it "is automatically added to a group when the email matches" do
       user = Fabricate(:user, active: true, email: "foo@bar.com")
-      email_token = user.email_tokens.create(email: user.email).token
-      EmailToken.confirm(email_token)
+      EmailToken.confirm(user.email_tokens.last.token)
       group.reload
       expect(group.users.include?(user)).to eq(true)
 
@@ -1263,8 +1238,7 @@ describe User do
 
       user.password_required!
       user.save!
-      email_token = user.email_tokens.create(email: user.email).token
-      EmailToken.confirm(email_token)
+      EmailToken.confirm(user.email_tokens.last.token)
       user.reload
 
       expect(user.title).to eq("bars and wats")
@@ -1511,7 +1485,7 @@ describe User do
 
   describe '.human_users' do
     it 'should only return users with a positive primary key' do
-      Fabricate(:user, id: -2)
+      Fabricate(:user, id: -1979)
       user = Fabricate(:user)
 
       expect(User.human_users).to eq([user])
diff --git a/spec/models/user_visit_spec.rb b/spec/models/user_visit_spec.rb
index 658d1a43c2a..ccb58536a4b 100644
--- a/spec/models/user_visit_spec.rb
+++ b/spec/models/user_visit_spec.rb
@@ -23,14 +23,13 @@ describe UserVisit do
 
   describe '#by_day' do
     before(:each) do
-      Timecop.freeze
+      freeze_time
       user.user_visits.create(visited_at: Time.zone.now)
       user.user_visits.create(visited_at: 1.day.ago)
       other_user.user_visits.create(visited_at: 1.day.ago)
       user.user_visits.create(visited_at: 2.days.ago)
       user.user_visits.create(visited_at: 4.days.ago)
     end
-    after(:each) { Timecop.return }
     let(:visits_by_day) { {1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.zone.now.to_date => 1 } }
 
     it 'collect closed interval visits' do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 6354862d9e5..879742354ee 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -64,7 +64,6 @@ Spork.prefork do
     config.infer_base_class_for_anonymous_controllers = true
 
     config.before(:suite) do
-
       Sidekiq.error_handlers.clear
 
       # Ugly, but needed until we have a user creator
@@ -81,7 +80,8 @@ Spork.prefork do
       #  and pretend they are default.
       # There are a bunch of settings that are seeded, they must be loaded as defaults
       SiteSetting.current.each do |k,v|
-        SiteSetting.defaults[k] = v
+        # skip setting defauls for settings that are in unloaded plugins
+        SiteSetting.defaults[k] = v if SiteSetting.respond_to? k
       end
 
       require_dependency 'site_settings/local_process_provider'
@@ -142,16 +142,39 @@ Spork.prefork do
 
   end
 
+  class TrackTimeStub
+    def self.stubbed
+      false
+    end
+  end
+
   def freeze_time(now=Time.now)
     datetime = DateTime.parse(now.to_s)
     time = Time.parse(now.to_s)
 
     if block_given?
-      raise "Don't use a block with freeze_time"
+      raise "nested freeze time not supported" if TrackTimeStub.stubbed
     end
 
     DateTime.stubs(:now).returns(datetime)
     Time.stubs(:now).returns(time)
+    Date.stubs(:today).returns(datetime.to_date)
+    TrackTimeStub.stubs(:stubbed).returns(true)
+
+    if block_given?
+      begin
+        yield
+      ensure
+        unfreeze_time
+      end
+    end
+  end
+
+  def unfreeze_time
+    DateTime.unstub(:now)
+    Time.unstub(:now)
+    Date.unstub(:today)
+    TrackTimeStub.unstub(:stubbed)
   end
 
   def file_from_fixtures(filename, directory="images")
diff --git a/spec/serializers/basic_group_serializer.rb b/spec/serializers/basic_group_serializer_spec.rb
similarity index 100%
rename from spec/serializers/basic_group_serializer.rb
rename to spec/serializers/basic_group_serializer_spec.rb
diff --git a/spec/serializers/basic_group_user_serializer_spec.rb b/spec/serializers/basic_group_user_serializer_spec.rb
new file mode 100644
index 00000000000..065981604e3
--- /dev/null
+++ b/spec/serializers/basic_group_user_serializer_spec.rb
@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+describe BasicGroupUserSerializer do
+  let(:group) { Fabricate(:group) }
+  let(:user) { Fabricate(:user) }
+
+  before do
+    group.add(user)
+  end
+
+  describe '#owner' do
+    describe 'when scoped to the user' do
+      it 'should be false' do
+        json = described_class.new(
+          GroupUser.last,
+          scope: Guardian.new(user),
+          root: false
+        ).as_json
+
+        expect(json[:owner]).to eq(false)
+      end
+    end
+
+    describe 'when not scoped to the user' do
+      it 'should be nil' do
+        json = described_class.new(
+          GroupUser.last,
+          scope: Guardian.new,
+          root: false
+        ).as_json
+
+        expect(json[:owner]).to eq(nil)
+      end
+    end
+  end
+end
diff --git a/spec/serializers/basic_post_serializer_spec.rb b/spec/serializers/basic_post_serializer_spec.rb
index 63743c5d950..558204460e7 100644
--- a/spec/serializers/basic_post_serializer_spec.rb
+++ b/spec/serializers/basic_post_serializer_spec.rb
@@ -11,12 +11,12 @@ describe BasicPostSerializer do
     let(:json) { serializer.as_json }
 
     it "returns the name it when `enable_names` is true" do
-      SiteSetting.stubs(:enable_names?).returns(true)
+      SiteSetting.enable_names = true
       expect(json[:name]).to be_present
     end
 
     it "doesn't return the name it when `enable_names` is false" do
-      SiteSetting.stubs(:enable_names?).returns(false)
+      SiteSetting.enable_names = false
       expect(json[:name]).to be_blank
     end
 
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 4800b0f9caa..f1a08da4009 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -70,12 +70,12 @@ describe PostSerializer do
     let(:json) { serializer.as_json }
 
     it "returns the display_username it when `enable_names` is on" do
-      SiteSetting.stubs(:enable_names).returns(true)
+      SiteSetting.enable_names = true
       expect(json[:display_username]).to be_present
     end
 
     it "doesn't return the display_username it when `enable_names` is off" do
-      SiteSetting.stubs(:enable_names).returns(false)
+      SiteSetting.enable_names = false
       expect(json[:display_username]).to be_blank
     end
   end
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index 38b5a2be8c6..599020d078d 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -60,7 +60,7 @@ describe UserSerializer do
 
     context "with `enable_names` false" do
       before do
-        SiteSetting.stubs(:enable_names?).returns(false)
+        SiteSetting.enable_names = false
       end
 
       it "has a name" do
@@ -192,7 +192,7 @@ describe UserSerializer do
     end
 
     it "serializes the fields listed in public_user_custom_fields site setting" do
-      SiteSetting.stubs(:public_user_custom_fields).returns('public_field')
+      SiteSetting.public_user_custom_fields = 'public_field'
       expect(json[:custom_fields]['public_field']).to eq(user.custom_fields['public_field'])
       expect(json[:custom_fields]['secret_field']).to eq(nil)
     end
diff --git a/spec/services/auto_block_spec.rb b/spec/services/auto_block_spec.rb
index b2216973de5..e4331ed2338 100644
--- a/spec/services/auto_block_spec.rb
+++ b/spec/services/auto_block_spec.rb
@@ -156,7 +156,7 @@ describe SpamRule::AutoBlock do
       end
 
       it "doesn't send a pm to moderators if notify_mods_when_user_blocked is false" do
-        SiteSetting.stubs(:notify_mods_when_user_blocked).returns(false)
+        SiteSetting.notify_mods_when_user_blocked = false
         GroupMessage.expects(:create).never
         subject.block_user
       end
@@ -236,7 +236,7 @@ describe SpamRule::AutoBlock do
       end
 
       it 'returns false if num_users_to_block_new_user is 0' do
-        SiteSetting.stubs(:num_users_to_block_new_user).returns(0)
+        SiteSetting.num_users_to_block_new_user = 0
         subject.stubs(:num_spam_flags_against_user).returns(100)
         subject.stubs(:num_users_who_flagged_spam_against_user).returns(100)
         expect(subject.block?).to be_falsey
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index cb906c282d5..053bfe9576d 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -38,8 +38,10 @@ describe BadgeGranter do
   describe 'preview' do
     it 'can correctly preview' do
       Fabricate(:user, email: 'sam@gmail.com')
-      result = BadgeGranter.preview('select id user_id, null post_id, created_at granted_at from users
-                                     where email like \'%gmail.com\'', explain: true)
+      result = BadgeGranter.preview('select u.id user_id, null post_id, u.created_at granted_at from users u
+                                     join user_emails ue on ue.user_id = u.id AND ue.primary
+                                     where ue.email like \'%gmail.com\'', explain: true)
+
       expect(result[:grant_count]).to eq(1)
       expect(result[:query_plan]).to be_present
     end
@@ -143,13 +145,11 @@ describe BadgeGranter do
     end
 
     it 'sets granted_at' do
-      time = Time.zone.now
-      Timecop.freeze time
+      time = 1.day.ago
+      freeze_time time
 
       user_badge = BadgeGranter.grant(badge, user)
-      expect(user_badge.granted_at).to eq(time)
-
-      Timecop.return
+      expect(user_badge.granted_at).to be_within(1.second).of(time)
     end
 
     it 'sets granted_by if the option is present' do
diff --git a/spec/services/flag_sockpuppets_spec.rb b/spec/services/flag_sockpuppets_spec.rb
index 9a647e68c69..8dcb69fa372 100644
--- a/spec/services/flag_sockpuppets_spec.rb
+++ b/spec/services/flag_sockpuppets_spec.rb
@@ -10,14 +10,14 @@ describe SpamRule::FlagSockpuppets do
     subject(:perform) { rule.perform }
 
     it 'does nothing if flag_sockpuppets is disabled' do
-      SiteSetting.stubs(:flag_sockpuppets).returns(false)
+      SiteSetting.flag_sockpuppets = false
       rule.expects(:reply_is_from_sockpuppet?).never
       rule.expects(:flag_sockpuppet_users).never
       expect(perform).to eq(false)
     end
 
     context 'flag_sockpuppets is enabled' do
-      before { SiteSetting.stubs(:flag_sockpuppets).returns(true) }
+      before { SiteSetting.flag_sockpuppets = true }
 
       it 'flags posts when it should' do
         rule.expects(:reply_is_from_sockpuppet?).returns(:true)
diff --git a/spec/services/i18n_interpolation_keys_finder_spec.rb b/spec/services/i18n_interpolation_keys_finder_spec.rb
new file mode 100644
index 00000000000..dde36f40407
--- /dev/null
+++ b/spec/services/i18n_interpolation_keys_finder_spec.rb
@@ -0,0 +1,11 @@
+require 'rails_helper'
+require "i18n/i18n_interpolation_keys_finder"
+
+RSpec.describe I18nInterpolationKeysFinder do
+  describe '#find' do
+    it 'should return the right keys' do
+      expect(described_class.find('%{first} %{second}'))
+        .to eq(['first', 'second'])
+    end
+  end
+end
diff --git a/spec/services/post_action_notifier_spec.rb b/spec/services/post_action_notifier_spec.rb
index b04b7c032f4..0f6f5945250 100644
--- a/spec/services/post_action_notifier_spec.rb
+++ b/spec/services/post_action_notifier_spec.rb
@@ -39,7 +39,7 @@ describe PostActionNotifier do
 
     context "edit notifications are disabled" do
 
-      before { SiteSetting.stubs(:disable_edit_notifications).returns(true) }
+      before { SiteSetting.disable_edit_notifications = true }
 
 
       it 'notifies a user of the revision made by another user' do
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index c53e47977e3..b90f55c40d1 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -45,6 +45,21 @@ describe PostAlerter do
 
 
     end
+
+    it "triggers :before_create_notifications_for_users" do
+      pm = Fabricate(:topic, archetype: 'private_message', category_id: nil)
+      op = Fabricate(:post, user_id: pm.user_id, topic: pm)
+      user1 = Fabricate(:user)
+      user2 = Fabricate(:user)
+      group = Fabricate(:group, users: [user2])
+      pm.allowed_users << user1
+      pm.allowed_groups << group
+      events = DiscourseEvent.track_events do
+        PostAlerter.post_created(op)
+      end
+      expect(events).to include({ event_name: :before_create_notifications_for_users, params: [[user1], op] })
+      expect(events).to include({ event_name: :before_create_notifications_for_users, params: [[user2], op] })
+    end
   end
 
   context "unread" do
@@ -71,15 +86,13 @@ describe PostAlerter do
       post.revise(admin, {raw: 'I made a revision'})
 
       # skip this notification cause we already notified on a similar edit
-      Timecop.freeze(2.hours.from_now) do
-        post.revise(admin, {raw: 'I made another revision'})
-      end
+      freeze_time 2.hours.from_now
+      post.revise(admin, {raw: 'I made another revision'})
 
       post.revise(Fabricate(:admin), {raw: 'I made a revision'})
 
-      Timecop.freeze(4.hours.from_now) do
-        post.revise(admin, {raw: 'I made another revision'})
-      end
+      freeze_time 2.hours.from_now
+      post.revise(admin, {raw: 'I made another revision'})
 
       expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(3)
     end
@@ -122,20 +135,27 @@ describe PostAlerter do
       PostAction.act(admin, post, PostActionType.types[:like])
 
       # one like
-      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(1)
+      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count)
+        .to eq(1)
 
-
-      post.user.user_option.update_columns(like_notification_frequency:
-                                           UserOption.like_notification_frequency_type[:always])
+      post.user.user_option.update_columns(
+        like_notification_frequency: UserOption.like_notification_frequency_type[:always]
+      )
 
       admin2 = Fabricate(:admin)
+
+      # Travel 1 hour in time to test that order post_actions by `created_at`
+      freeze_time 1.hour.from_now
       PostAction.act(admin2, post, PostActionType.types[:like])
-      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(1)
+
+      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count)
+        .to eq(1)
 
       # adds info to the notification
-      notification = Notification.find_by(post_number: 1,
-                                          topic_id: post.topic_id)
-
+      notification = Notification.find_by(
+        post_number: 1,
+        topic_id: post.topic_id
+      )
 
       expect(notification.data_hash["count"].to_i).to eq(2)
       expect(notification.data_hash["username2"]).to eq(evil_trout.username)
@@ -144,9 +164,13 @@ describe PostAlerter do
       PostAction.remove_act(evil_trout, post, PostActionType.types[:like])
 
       # rebuilds the missing notification
-      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(1)
-      notification = Notification.find_by(post_number: 1,
-                                          topic_id: post.topic_id)
+      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count)
+        .to eq(1)
+
+      notification = Notification.find_by(
+        post_number: 1,
+        topic_id: post.topic_id
+      )
 
       expect(notification.data_hash["count"]).to eq(2)
       expect(notification.data_hash["username"]).to eq(admin2.username)
@@ -160,10 +184,10 @@ describe PostAlerter do
       admin3 = Fabricate(:admin)
       PostAction.act(admin3, post, PostActionType.types[:like])
 
-      Timecop.freeze(2.days.from_now) do
-        admin4 = Fabricate(:admin)
-        PostAction.act(admin4, post, PostActionType.types[:like])
-      end
+      freeze_time 2.days.from_now
+
+      admin4 = Fabricate(:admin)
+      PostAction.act(admin4, post, PostActionType.types[:like])
 
       # first happend within the same day, no need to notify
       expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(2)
@@ -201,13 +225,23 @@ describe PostAlerter do
         Fabricate(:post, topic: topic, user: topic.user, raw: '[quote="Bruce Wayne, post:1"]whatup[/quote]')
       }.not_to change(topic.user.notifications, :count)
     end
+
+    it "triggers :before_create_notifications_for_users" do
+      post = Fabricate(:post, raw: '[quote="EvilTrout, post:1"]whatup[/quote]')
+      events = DiscourseEvent.track_events do
+        PostAlerter.post_created(post)
+      end
+      expect(events).to include({ event_name: :before_create_notifications_for_users, params: [[evil_trout], post] })
+    end
   end
 
   context 'linked' do
+    let(:post1) { create_post }
+    let(:user) { post1.user }
+    let(:linking_post) { create_post(raw: "my magic topic\n##{Discourse.base_url}#{post1.url}") }
+
     it "will notify correctly on linking" do
-      post1 = create_post
-      user = post1.user
-      create_post(raw: "my magic topic\n##{Discourse.base_url}#{post1.url}")
+      linking_post
 
       expect(user.notifications.count).to eq(1)
 
@@ -228,17 +262,24 @@ describe PostAlerter do
       expect(PostAlerter.new.extract_linked_users(post1).length).to eq(0)
 
     end
+
+    it "triggers :before_create_notifications_for_users" do
+      events = DiscourseEvent.track_events do
+        linking_post
+      end
+      expect(events).to include({ event_name: :before_create_notifications_for_users, params: [[user], linking_post] })
+    end
   end
 
   context '@group mentions' do
 
+    let(:group) { Fabricate(:group, name: 'group', alias_level: Group::ALIAS_LEVELS[:everyone]) }
+    let(:post) { create_post_with_alerts(raw: "Hello @group how are you?") }
+    before { group.add(evil_trout) }
+
     it 'notifies users correctly' do
-
-      group = Fabricate(:group, name: 'group', alias_level: Group::ALIAS_LEVELS[:everyone])
-      group.add(evil_trout)
-
       expect {
-        create_post_with_alerts(raw: "Hello @group how are you?")
+        post
       }.to change(evil_trout.notifications, :count).by(1)
 
       expect(GroupMention.count).to eq(1)
@@ -258,6 +299,13 @@ describe PostAlerter do
 
       expect(GroupMention.count).to eq(3)
     end
+
+    it "triggers :before_create_notifications_for_users" do
+      events = DiscourseEvent.track_events do
+        post
+      end
+      expect(events).to include({ event_name: :before_create_notifications_for_users, params: [[evil_trout], post] })
+    end
   end
 
   context '@mentions' do
@@ -286,6 +334,13 @@ describe PostAlerter do
       }.not_to change(user.notifications, :count)
     end
 
+    it "triggers :before_create_notifications_for_users" do
+      events = DiscourseEvent.track_events do
+        mention_post
+      end
+      expect(events).to include({ event_name: :before_create_notifications_for_users, params: [[evil_trout], mention_post] })
+    end
+
   it "notification comes from editor is mention is added later" do
       admin = Fabricate(:admin)
       post = create_post_with_alerts(user: user, raw: 'No mention here.')
@@ -322,6 +377,18 @@ describe PostAlerter do
 
       expect(user.notifications.last.data_hash["topic_title"]).to eq(original_title)
     end
+
+    it "triggers :post_notification_alert" do
+
+    end
+
+    it "triggers :before_create_notification" do
+      type = Notification.types[:private_message]
+      events = DiscourseEvent.track_events do
+        PostAlerter.new.create_notification(user, type, post, {})
+      end
+      expect(events).to include({ event_name: :before_create_notification, params: [user, type, post, {}] })
+    end
   end
 
   describe "push_notification" do
@@ -329,7 +396,7 @@ describe PostAlerter do
     let(:topic) { mention_post.topic }
 
     it "pushes nothing to suspended users" do
-
+      SiteSetting.queue_jobs = true
       SiteSetting.allowed_user_api_push_urls = "https://site.com/push|https://site2.com/push"
 
       evil_trout.update_columns(suspended_till: 1.year.from_now)
@@ -343,8 +410,7 @@ describe PostAlerter do
                            push_url: "https://site2.com/push")
       end
 
-      RestClient.expects(:post).never
-      mention_post
+      expect { mention_post }.to_not change { Jobs::PushNotification.jobs.count }
     end
 
     it "correctly pushes notifications if configured correctly" do
@@ -362,14 +428,11 @@ describe PostAlerter do
       body = nil
       headers = nil
 
-      # should only happen once even though we are using 2 keys
-      RestClient.expects(:post).with{|_req,_body,_headers|
-        headers = _headers
-        body = _body
+      Excon.expects(:post).with{|_req, _body|
+        headers = _body[:headers]
+        body = _body[:body]
       }.returns("OK")
 
-      mention_post
-
       payload = {
         "secret_key" => SiteSetting.push_api_secret_key,
         "url" => Discourse.base_url,
@@ -399,8 +462,10 @@ describe PostAlerter do
         ]
       }
 
+      mention_post
+
       expect(JSON.parse(body)).to eq(payload)
-      expect(headers[:content_type]).to eq(:json)
+      expect(headers["Content-Type"]).to eq('application/json')
     end
   end
 
@@ -449,5 +514,59 @@ describe PostAlerter do
       PostAlerter.post_created(post)
       expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(1)
     end
+
+    it "triggers :before_create_notifications_for_users" do
+      level = CategoryUser.notification_levels[:watching_first_post]
+      CategoryUser.set_notification_level_for_category(user, level, category.id)
+      events = DiscourseEvent.track_events do
+        PostAlerter.new.after_save_post(post, true)
+      end
+      expect(events).to include({ event_name: :before_create_notifications_for_users, params: [[user], post] })
+    end
+  end
+
+  context "replies" do
+    it "triggers :before_create_notifications_for_users" do
+      user = Fabricate(:user)
+      topic = Fabricate(:topic)
+      post = Fabricate(:post, user: user, topic: topic)
+      reply = Fabricate(:post, topic: topic, reply_to_post_number: 1)
+      events = DiscourseEvent.track_events do
+        PostAlerter.post_created(reply)
+      end
+      expect(events).to include({ event_name: :before_create_notifications_for_users, params: [[user], reply] })
+    end
+  end
+
+  context "watching" do
+    it "triggers :before_create_notifications_for_users" do
+      user = Fabricate(:user)
+      category = Fabricate(:category)
+      topic = Fabricate(:topic, category: category)
+      post = Fabricate(:post, topic: topic)
+      level = CategoryUser.notification_levels[:watching]
+      CategoryUser.set_notification_level_for_category(user, level, category.id)
+      events = DiscourseEvent.track_events do
+        PostAlerter.post_created(post)
+      end
+      expect(events).to include({ event_name: :before_create_notifications_for_users, params: [[user], post] })
+    end
+  end
+
+  context "tags" do
+    context "watching" do
+      it "triggers :before_create_notifications_for_users" do
+        user = Fabricate(:user)
+        tag = Fabricate(:tag)
+        topic = Fabricate(:topic, tags: [tag])
+        post = Fabricate(:post, topic: topic)
+        level = TagUser.notification_levels[:watching]
+        TagUser.change(user.id, tag.id, level)
+        events = DiscourseEvent.track_events do
+          PostAlerter.post_created(post)
+        end
+        expect(events).to include({ event_name: :before_create_notifications_for_users, params: [[user], post] })
+      end
+    end
   end
 end
diff --git a/spec/services/topic_timestamp_changer_spec.rb b/spec/services/topic_timestamp_changer_spec.rb
index 1e9821adeb5..1cc740dab2e 100644
--- a/spec/services/topic_timestamp_changer_spec.rb
+++ b/spec/services/topic_timestamp_changer_spec.rb
@@ -21,26 +21,25 @@ describe TopicTimestampChanger do
       let(:new_timestamp) { old_timestamp - 2.day }
 
       it 'changes the timestamp of the topic and opening post' do
-        Timecop.freeze do
-          TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
+        freeze_time
+        TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
 
-          topic.reload
-          [:created_at, :updated_at, :bumped_at].each do |column|
-            expect(topic.public_send(column)).to be_within(1.second).of(new_timestamp)
-          end
-
-          p1.reload
-          [:created_at, :updated_at].each do |column|
-            expect(p1.public_send(column)).to be_within(1.second).of(new_timestamp)
-          end
-
-          p2.reload
-          [:created_at, :updated_at].each do |column|
-            expect(p2.public_send(column)).to be_within(1.second).of(new_timestamp + 1.day)
-          end
-
-          expect(topic.last_posted_at).to be_within(1.second).of(p2.reload.created_at)
+        topic.reload
+        [:created_at, :updated_at, :bumped_at].each do |column|
+          expect(topic.public_send(column)).to be_within(1.second).of(new_timestamp)
         end
+
+        p1.reload
+        [:created_at, :updated_at].each do |column|
+          expect(p1.public_send(column)).to be_within(1.second).of(new_timestamp)
+        end
+
+        p2.reload
+        [:created_at, :updated_at].each do |column|
+          expect(p2.public_send(column)).to be_within(1.second).of(new_timestamp + 1.day)
+        end
+
+        expect(topic.last_posted_at).to be_within(1.second).of(p2.reload.created_at)
       end
 
       describe 'when posts have timestamps in the future' do
@@ -48,15 +47,16 @@ describe TopicTimestampChanger do
         let(:p3) { Fabricate(:post, topic: topic, created_at: new_timestamp + 3.day) }
 
         it 'should set the new timestamp as the default timestamp' do
-          Timecop.freeze do
-            p3
-            TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
+          freeze_time
 
-            p3.reload
+          p3
 
-            [:created_at, :updated_at].each do |column|
-              expect(p3.public_send(column)).to be_within(1.second).of(new_timestamp)
-            end
+          TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
+
+          p3.reload
+
+          [:created_at, :updated_at].each do |column|
+            expect(p3.public_send(column)).to be_within(1.second).of(new_timestamp)
           end
         end
       end
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index 55b94ff3fbd..76c08201e75 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -2,11 +2,6 @@ require 'rails_helper'
 require_dependency 'user_destroyer'
 
 describe UserDestroyer do
-
-  before do
-    RestClient.stubs(:delete).returns( {success: 'OK'}.to_json )
-  end
-
   describe 'new' do
     it 'raises an error when user is nil' do
       expect { UserDestroyer.new(nil) }.to raise_error(Discourse::InvalidParameters)
@@ -59,10 +54,9 @@ describe UserDestroyer do
       end
 
       it "adds email to block list if block_email is true" do
-        b = Fabricate.build(:screened_email, email: @user.email)
-        ScreenedEmail.expects(:block).with(@user.email, has_key(:ip_address)).returns(b)
-        b.expects(:record_match!).once.returns(true)
-        UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge({block_email: true}))
+        expect {
+          UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge(block_email: true))
+        }.to change { ScreenedEmail.count }.by(1)
       end
     end
 
@@ -233,15 +227,8 @@ describe UserDestroyer do
       context 'and destroy fails' do
         subject(:destroy) { UserDestroyer.new(@admin).destroy(@user) }
 
-        before do
-          @user.stubs(:destroy).returns(false)
-        end
-
-        it 'should return false' do
-          expect(destroy).to eq(false)
-        end
-
         it 'should not log the action' do
+          @user.stubs(:destroy).returns(false)
           StaffActionLogger.any_instance.expects(:log_user_deletion).never
           destroy
         end
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 9238cf9771d..93d967ad8d0 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -64,7 +64,7 @@ module Helpers
   def wait_for(&blk)
     i = 0
     result = false
-    while !result && i < 300
+    while !result && i < 1000
       result = blk.call
       i += 1
       sleep 0.001
diff --git a/spec/support/shared_examples_for_stats_cacheable.rb b/spec/support/shared_examples_for_stats_cacheable.rb
index decaf1f78d5..ee6b7e99a55 100644
--- a/spec/support/shared_examples_for_stats_cacheable.rb
+++ b/spec/support/shared_examples_for_stats_cacheable.rb
@@ -11,10 +11,10 @@ shared_examples_for 'stats cachable' do
     end
 
     it 'returns fetches the stats if stats has not been cached' do
-      Timecop.freeze do
-        $redis.del(described_class.stats_cache_key)
-        expect(described_class.fetch_cached_stats).to eq(JSON.parse(described_class.fetch_stats.to_json))
-      end
+      freeze_time
+
+      $redis.del(described_class.stats_cache_key)
+      expect(described_class.fetch_cached_stats).to eq(JSON.parse(described_class.fetch_stats.to_json))
     end
   end
 
diff --git a/test/javascripts/acceptance/about-test.js.es6 b/test/javascripts/acceptance/about-test.js.es6
index f6547bc6466..c7ef9fb85a7 100644
--- a/test/javascripts/acceptance/about-test.js.es6
+++ b/test/javascripts/acceptance/about-test.js.es6
@@ -1,13 +1,12 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("About");
 
-test("viewing", () => {
+QUnit.test("viewing", assert => {
   visit("/about");
   andThen(() => {
-    ok($('body.about-page').length, "has body class");
-    ok(exists('.about.admins .user-info'), 'has admins');
-    ok(exists('.about.moderators .user-info'), 'has moderators');
-    ok(exists('.about.stats tr td'), 'has stats');
+    assert.ok($('body.about-page').length, "has body class");
+    assert.ok(exists('.about.admins .user-info'), 'has admins');
+    assert.ok(exists('.about.moderators .user-info'), 'has moderators');
+    assert.ok(exists('.about.stats tr td'), 'has stats');
   });
-});
-
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/account-created-test.js.es6 b/test/javascripts/acceptance/account-created-test.js.es6
index 661dc6197c3..a0fc11267ac 100644
--- a/test/javascripts/acceptance/account-created-test.js.es6
+++ b/test/javascripts/acceptance/account-created-test.js.es6
@@ -3,7 +3,7 @@ import PreloadStore from 'preload-store';
 
 acceptance("Account Created");
 
-test("account created - message", assert => {
+QUnit.test("account created - message", assert => {
   PreloadStore.store('accountCreated', {
     message: "Hello World",
   });
@@ -20,7 +20,7 @@ test("account created - message", assert => {
   });
 });
 
-test("account created - resend email", assert => {
+QUnit.test("account created - resend email", assert => {
   PreloadStore.store('accountCreated', {
     message: "Hello World",
     username: 'eviltrout',
@@ -47,7 +47,7 @@ test("account created - resend email", assert => {
 
 });
 
-test("account created - update email - cancel", assert => {
+QUnit.test("account created - update email - cancel", assert => {
   PreloadStore.store('accountCreated', {
     message: "Hello World",
     username: 'eviltrout',
@@ -68,7 +68,7 @@ test("account created - update email - cancel", assert => {
   });
 });
 
-test("account created - update email - submit", assert => {
+QUnit.test("account created - update email - submit", assert => {
   PreloadStore.store('accountCreated', {
     message: "Hello World",
     username: 'eviltrout',
@@ -94,4 +94,4 @@ test("account created - update email - submit", assert => {
     assert.equal(email, 'newemail@example.com');
   });
 
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/admin-site-text-test.js.es6 b/test/javascripts/acceptance/admin-site-text-test.js.es6
index 0cd17959c18..c20dc09f4fa 100644
--- a/test/javascripts/acceptance/admin-site-text-test.js.es6
+++ b/test/javascripts/acceptance/admin-site-text-test.js.es6
@@ -2,33 +2,33 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Admin - Site Texts", { loggedIn: true });
 
-test("search for a key", () => {
+QUnit.test("search for a key", assert => {
   visit("/admin/customize/site_texts");
 
   fillIn('.site-text-search', 'Test');
   andThen(() => {
-    ok(exists('.site-text'));
-    ok(exists(".site-text:not(.overridden)"));
-    ok(exists('.site-text.overridden'));
+    assert.ok(exists('.site-text'));
+    assert.ok(exists(".site-text:not(.overridden)"));
+    assert.ok(exists('.site-text.overridden'));
   });
 
 
   // Only show overridden
   click('.extra-options input');
   andThen(() => {
-    ok(!exists(".site-text:not(.overridden)"));
-    ok(exists('.site-text.overridden'));
+    assert.ok(!exists(".site-text:not(.overridden)"));
+    assert.ok(exists('.site-text.overridden'));
   });
 });
 
 
-test("edit and revert a site text by key", () => {
+QUnit.test("edit and revert a site text by key", assert => {
   visit("/admin/customize/site_texts/site.test");
   andThen(() => {
-    equal(find('.title h3').text(), 'site.test');
-    ok(!exists('.save-messages .saved'));
-    ok(!exists('.save-messages .saved'));
-    ok(!exists('.revert-site-text'));
+    assert.equal(find('.title h3').text(), 'site.test');
+    assert.ok(!exists('.save-messages .saved'));
+    assert.ok(!exists('.save-messages .saved'));
+    assert.ok(!exists('.revert-site-text'));
   });
 
   // Change the value
@@ -36,19 +36,19 @@ test("edit and revert a site text by key", () => {
   click(".save-changes");
 
   andThen(() => {
-    ok(exists('.save-messages .saved'));
-    ok(exists('.revert-site-text'));
+    assert.ok(exists('.save-messages .saved'));
+    assert.ok(exists('.revert-site-text'));
   });
 
   // Revert the changes
   click('.revert-site-text');
   andThen(() => {
-    ok(exists('.bootbox.modal'));
+    assert.ok(exists('.bootbox.modal'));
   });
   click('.bootbox.modal .btn-primary');
 
   andThen(() => {
-    ok(!exists('.save-messages .saved'));
-    ok(!exists('.revert-site-text'));
+    assert.ok(!exists('.save-messages .saved'));
+    assert.ok(!exists('.revert-site-text'));
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/admin-users-list-test.js.es6 b/test/javascripts/acceptance/admin-users-list-test.js.es6
index a391ff9b731..a6d3117e604 100644
--- a/test/javascripts/acceptance/admin-users-list-test.js.es6
+++ b/test/javascripts/acceptance/admin-users-list-test.js.es6
@@ -2,10 +2,10 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Admin - Users List", { loggedIn: true });
 
-test("lists users", () => {
+QUnit.test("lists users", assert => {
   visit("/admin/users/list/active");
   andThen(() => {
-    ok(exists('.users-list .user'));
-    ok(!exists('.user:eq(0) .email small'), 'escapes email');
+    assert.ok(exists('.users-list .user'));
+    assert.ok(!exists('.user:eq(0) .email small'), 'escapes email');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/badges-test.js.es6 b/test/javascripts/acceptance/badges-test.js.es6
index ad1f00c0d53..9052efe2223 100644
--- a/test/javascripts/acceptance/badges-test.js.es6
+++ b/test/javascripts/acceptance/badges-test.js.es6
@@ -2,17 +2,17 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Badges");
 
-test("Visit Badge Pages", () => {
+QUnit.test("Visit Badge Pages", assert => {
   visit("/badges");
   andThen(() => {
-    ok($('body.badges-page').length, "has body class");
-    ok(exists('.badge-groups .badge-card'), "has a list of badges");
+    assert.ok($('body.badges-page').length, "has body class");
+    assert.ok(exists('.badge-groups .badge-card'), "has a list of badges");
   });
 
   visit("/badges/9/autobiographer");
   andThen(() => {
-    ok(exists('.badge-card'), "has the badge in the listing");
-    ok(exists('.user-info'), "has the list of users with that badge");
-    ok(!exists('.badge-card:eq(0) script'));
+    assert.ok(exists('.badge-card'), "has the badge in the listing");
+    assert.ok(exists('.user-info'), "has the list of users with that badge");
+    assert.ok(!exists('.badge-card:eq(0) script'));
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/category-edit-test.js.es6 b/test/javascripts/acceptance/category-edit-test.js.es6
index 185cb7b216f..170a692c05b 100644
--- a/test/javascripts/acceptance/category-edit-test.js.es6
+++ b/test/javascripts/acceptance/category-edit-test.js.es6
@@ -6,7 +6,7 @@ acceptance("Category Edit", {
   settings: { email_in: true }
 });
 
-test("Can open the category modal", assert => {
+QUnit.test("Can open the category modal", assert => {
   visit("/c/bug");
 
   click('.edit-category');
@@ -20,7 +20,7 @@ test("Can open the category modal", assert => {
   });
 });
 
-test("Change the category color", assert => {
+QUnit.test("Change the category color", assert => {
   visit("/c/bug");
 
   click('.edit-category');
@@ -32,7 +32,7 @@ test("Change the category color", assert => {
   });
 });
 
-test("Change the topic template", assert => {
+QUnit.test("Change the topic template", assert => {
   visit("/c/bug");
 
   click('.edit-category');
@@ -45,7 +45,7 @@ test("Change the topic template", assert => {
   });
 });
 
-test("Error Saving", assert => {
+QUnit.test("Error Saving", assert => {
   visit("/c/bug");
 
   click('.edit-category');
@@ -58,19 +58,19 @@ test("Error Saving", assert => {
   });
 });
 
-test("Subcategory list settings", () => {
+QUnit.test("Subcategory list settings", assert => {
   visit("/c/bug");
 
   click('.edit-category');
   click('.edit-category-settings');
 
   andThen(() => {
-    ok(!visible(".subcategory-list-style-field"), "subcategory list style isn't visible by default");
+    assert.ok(!visible(".subcategory-list-style-field"), "subcategory list style isn't visible by default");
   });
 
   click(".show-subcategory-list-field input[type=checkbox]");
   andThen(() => {
-    ok(visible(".subcategory-list-style-field"), "subcategory list style is shown if show subcategory list is checked");
+    assert.ok(visible(".subcategory-list-style-field"), "subcategory list style is shown if show subcategory list is checked");
   });
 
   click('.edit-category-general');
@@ -78,7 +78,7 @@ test("Subcategory list settings", () => {
 
   click('.edit-category-settings');
   andThen(() => {
-    ok(!visible(".show-subcategory-list-field"), "show subcategory list isn't visible for child categories");
-    ok(!visible(".subcategory-list-style-field"), "subcategory list style isn't visible for child categories");
+    assert.ok(!visible(".show-subcategory-list-field"), "show subcategory list isn't visible for child categories");
+    assert.ok(!visible(".subcategory-list-style-field"), "subcategory list style isn't visible for child categories");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/category-hashtag-test.js.es6 b/test/javascripts/acceptance/category-hashtag-test.js.es6
index 99a0c711cd7..813578712c7 100644
--- a/test/javascripts/acceptance/category-hashtag-test.js.es6
+++ b/test/javascripts/acceptance/category-hashtag-test.js.es6
@@ -2,18 +2,18 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Category hashtag", { loggedIn: true });
 
-test("category hashtag is cooked properly", () => {
+QUnit.test("category hashtag is cooked properly", assert => {
   visit("/t/internationalization-localization/280");
   click('#topic-footer-buttons .btn.create');
 
   fillIn('.d-editor-input', "this is a category hashtag #bug");
   andThen(() => {
     // TODO: Test that the autocomplete shows
-    equal(find('.d-editor-preview:visible').html().trim(), "<p>this is a category hashtag <a href=\"/c/bugs\" class=\"hashtag\">#<span>bug</span></a></p>");
+    assert.equal(find('.d-editor-preview:visible').html().trim(), "<p>this is a category hashtag <a href=\"/c/bugs\" class=\"hashtag\">#<span>bug</span></a></p>");
   });
 
   click('#reply-control .btn.create');
   andThen(() => {
-    equal(find('.topic-post:last .cooked p').html().trim(), "this is a category hashtag <a href=\"/c/bugs\" class=\"hashtag\">#<span>bug</span></a>");
+    assert.equal(find('.topic-post:last .cooked p').html().trim(), "this is a category hashtag <a href=\"/c/bugs\" class=\"hashtag\">#<span>bug</span></a>");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index fe086a68058..b155418b78e 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -7,44 +7,44 @@ acceptance("Composer", {
   }
 });
 
-test("Tests the Composer controls", () => {
+QUnit.test("Tests the Composer controls", assert => {
   visit("/");
   andThen(() => {
-    ok(exists('#create-topic'), 'the create button is visible');
+    assert.ok(exists('#create-topic'), 'the create button is visible');
   });
 
   click('#create-topic');
   andThen(() => {
-    ok(exists('.d-editor-input'), 'the composer input is visible');
-    ok(exists('.title-input .popup-tip.bad.hide'), 'title errors are hidden by default');
-    ok(exists('.d-editor-textarea-wrapper .popup-tip.bad.hide'), 'body errors are hidden by default');
+    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
+    assert.ok(exists('.title-input .popup-tip.bad.hide'), 'title errors are hidden by default');
+    assert.ok(exists('.d-editor-textarea-wrapper .popup-tip.bad.hide'), 'body errors are hidden by default');
   });
 
   click('a.toggle-preview');
   andThen(() => {
-    ok(!exists('.d-editor-preview:visible'), "clicking the toggle hides the preview");
+    assert.ok(!exists('.d-editor-preview:visible'), "clicking the toggle hides the preview");
   });
 
   click('a.toggle-preview');
   andThen(() => {
-    ok(exists('.d-editor-preview:visible'), "clicking the toggle shows the preview again");
+    assert.ok(exists('.d-editor-preview:visible'), "clicking the toggle shows the preview again");
   });
 
   click('#reply-control button.create');
   andThen(() => {
-    ok(!exists('.title-input .popup-tip.bad.hide'), 'it shows the empty title error');
-    ok(!exists('.d-editor-wrapper .popup-tip.bad.hide'), 'it shows the empty body error');
+    assert.ok(!exists('.title-input .popup-tip.bad.hide'), 'it shows the empty title error');
+    assert.ok(!exists('.d-editor-wrapper .popup-tip.bad.hide'), 'it shows the empty body error');
   });
 
   fillIn('#reply-title', "this is my new topic title");
   andThen(() => {
-    ok(exists('.title-input .popup-tip.good'), 'the title is now good');
+    assert.ok(exists('.title-input .popup-tip.good'), 'the title is now good');
   });
 
   fillIn('.d-editor-input', "this is the *content* of a post");
   andThen(() => {
-    equal(find('.d-editor-preview').html().trim(), "<p>this is the <em>content</em> of a post</p>", "it previews content");
-    ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'the body is now good');
+    assert.equal(find('.d-editor-preview').html().trim(), "<p>this is the <em>content</em> of a post</p>", "it previews content");
+    assert.ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'the body is now good');
   });
 
   andThen(() => {
@@ -64,89 +64,89 @@ test("Tests the Composer controls", () => {
 
   andThen(() => {
     const example = I18n.t(`composer.bold_text`);
-    equal(find('#reply-control .d-editor-input').val().trim(),
+    assert.equal(find('#reply-control .d-editor-input').val().trim(),
                `this is the *content* of a post**${example}**`,
                "it supports keyboard shortcuts");
   });
 
   click('#reply-control a.cancel');
   andThen(() => {
-    ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
+    assert.ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
   });
 
   click('.modal-footer a:eq(1)');
   andThen(() => {
-    ok(!exists('.bootbox.modal'), 'the confirmation can be cancelled');
+    assert.ok(!exists('.bootbox.modal'), 'the confirmation can be cancelled');
   });
 
 });
 
-test("Create a topic with server side errors", () => {
+QUnit.test("Create a topic with server side errors", assert => {
   visit("/");
   click('#create-topic');
   fillIn('#reply-title', "this title triggers an error");
   fillIn('.d-editor-input', "this is the *content* of a post");
   click('#reply-control button.create');
   andThen(() => {
-    ok(exists('.bootbox.modal'), 'it pops up an error message');
+    assert.ok(exists('.bootbox.modal'), 'it pops up an error message');
   });
   click('.bootbox.modal a.btn-primary');
   andThen(() => {
-    ok(!exists('.bootbox.modal'), 'it dismisses the error');
-    ok(exists('.d-editor-input'), 'the composer input is visible');
+    assert.ok(!exists('.bootbox.modal'), 'it dismisses the error');
+    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
   });
 });
 
-test("Create a Topic", () => {
+QUnit.test("Create a Topic", assert => {
   visit("/");
   click('#create-topic');
   fillIn('#reply-title', "Internationalization Localization");
   fillIn('.d-editor-input', "this is the *content* of a new topic post");
   click('#reply-control button.create');
   andThen(() => {
-    equal(currentURL(), "/t/internationalization-localization/280", "it transitions to the newly created topic URL");
+    assert.equal(currentURL(), "/t/internationalization-localization/280", "it transitions to the newly created topic URL");
   });
 });
 
-test("Create an enqueued Topic", () => {
+QUnit.test("Create an enqueued Topic", assert => {
   visit("/");
   click('#create-topic');
   fillIn('#reply-title', "Internationalization Localization");
   fillIn('.d-editor-input', "enqueue this content please");
   click('#reply-control button.create');
   andThen(() => {
-    ok(visible('#discourse-modal'), 'it pops up a modal');
-    equal(currentURL(), "/", "it doesn't change routes");
+    assert.ok(visible('#discourse-modal'), 'it pops up a modal');
+    assert.equal(currentURL(), "/", "it doesn't change routes");
   });
 
   click('.modal-footer button');
   andThen(() => {
-    ok(invisible('#discourse-modal'), 'the modal can be dismissed');
+    assert.ok(invisible('#discourse-modal'), 'the modal can be dismissed');
   });
 });
 
 
-test("Create a Reply", () => {
+QUnit.test("Create a Reply", assert => {
   visit("/t/internationalization-localization/280");
 
   andThen(() => {
-    ok(!exists('article[data-post-id=12345]'), 'the post is not in the DOM');
+    assert.ok(!exists('article[data-post-id=12345]'), 'the post is not in the DOM');
   });
 
   click('#topic-footer-buttons .btn.create');
   andThen(() => {
-    ok(exists('.d-editor-input'), 'the composer input is visible');
-    ok(!exists('#reply-title'), 'there is no title since this is a reply');
+    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
+    assert.ok(!exists('#reply-title'), 'there is no title since this is a reply');
   });
 
   fillIn('.d-editor-input', 'this is the content of my reply');
   click('#reply-control button.create');
   andThen(() => {
-    equal(find('.cooked:last p').text(), 'this is the content of my reply');
+    assert.equal(find('.cooked:last p').text(), 'this is the content of my reply');
   });
 });
 
-test("Posting on a different topic", (assert) => {
+QUnit.test("Posting on a different topic", (assert) => {
   visit("/t/internationalization-localization/280");
   click('#topic-footer-buttons .btn.create');
   fillIn('.d-editor-input', 'this is the content for a different topic');
@@ -167,106 +167,106 @@ test("Posting on a different topic", (assert) => {
 });
 
 
-test("Create an enqueued Reply", () => {
+QUnit.test("Create an enqueued Reply", assert => {
   visit("/t/internationalization-localization/280");
 
   click('#topic-footer-buttons .btn.create');
   andThen(() => {
-    ok(exists('.d-editor-input'), 'the composer input is visible');
-    ok(!exists('#reply-title'), 'there is no title since this is a reply');
+    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
+    assert.ok(!exists('#reply-title'), 'there is no title since this is a reply');
   });
 
   fillIn('.d-editor-input', 'enqueue this content please');
   click('#reply-control button.create');
   andThen(() => {
-    ok(find('.cooked:last p').text() !== 'enqueue this content please', "it doesn't insert the post");
+    assert.ok(find('.cooked:last p').text() !== 'enqueue this content please', "it doesn't insert the post");
   });
 
   andThen(() => {
-    ok(visible('#discourse-modal'), 'it pops up a modal');
+    assert.ok(visible('#discourse-modal'), 'it pops up a modal');
   });
 
   click('.modal-footer button');
   andThen(() => {
-    ok(invisible('#discourse-modal'), 'the modal can be dismissed');
+    assert.ok(invisible('#discourse-modal'), 'the modal can be dismissed');
   });
 });
 
-test("Edit the first post", () => {
+QUnit.test("Edit the first post", assert => {
   visit("/t/internationalization-localization/280");
 
-  ok(!exists('.topic-post:eq(0) .post-info.edits'), 'it has no edits icon at first');
+  assert.ok(!exists('.topic-post:eq(0) .post-info.edits'), 'it has no edits icon at first');
 
   click('.topic-post:eq(0) button.show-more-actions');
   click('.topic-post:eq(0) button.edit');
   andThen(() => {
-    equal(find('.d-editor-input').val().indexOf('Any plans to support'), 0, 'it populates the input with the post text');
+    assert.equal(find('.d-editor-input').val().indexOf('Any plans to support'), 0, 'it populates the input with the post text');
   });
 
   fillIn('.d-editor-input', "This is the new text for the post");
   fillIn('#reply-title', "This is the new text for the title");
   click('#reply-control button.create');
   andThen(() => {
-    ok(!exists('.d-editor-input'), 'it closes the composer');
-    ok(exists('.topic-post:eq(0) .post-info.edits'), 'it has the edits icon');
-    ok(find('#topic-title h1').text().indexOf('This is the new text for the title') !== -1, 'it shows the new title');
-    ok(find('.topic-post:eq(0) .cooked').text().indexOf('This is the new text for the post') !== -1, 'it updates the post');
+    assert.ok(!exists('.d-editor-input'), 'it closes the composer');
+    assert.ok(exists('.topic-post:eq(0) .post-info.edits'), 'it has the edits icon');
+    assert.ok(find('#topic-title h1').text().indexOf('This is the new text for the title') !== -1, 'it shows the new title');
+    assert.ok(find('.topic-post:eq(0) .cooked').text().indexOf('This is the new text for the post') !== -1, 'it updates the post');
   });
 });
 
-test("Composer can switch between edits", () => {
+QUnit.test("Composer can switch between edits", assert => {
   visit("/t/this-is-a-test-topic/9");
 
   click('.topic-post:eq(0) button.edit');
   andThen(() => {
-    equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
+    assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
   });
   click('.topic-post:eq(1) button.edit');
   andThen(() => {
-    equal(find('.d-editor-input').val().indexOf('This is the second post.'), 0, 'it populates the input with the post text');
+    assert.equal(find('.d-editor-input').val().indexOf('This is the second post.'), 0, 'it populates the input with the post text');
   });
 });
 
-test("Composer with dirty edit can toggle to another edit", () => {
+QUnit.test("Composer with dirty edit can toggle to another edit", assert => {
   visit("/t/this-is-a-test-topic/9");
 
   click('.topic-post:eq(0) button.edit');
   fillIn('.d-editor-input', 'This is a dirty reply');
   click('.topic-post:eq(1) button.edit');
   andThen(() => {
-    ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
+    assert.ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
   });
   click('.modal-footer a:eq(0)');
   andThen(() => {
-    equal(find('.d-editor-input').val().indexOf('This is the second post.'), 0, 'it populates the input with the post text');
+    assert.equal(find('.d-editor-input').val().indexOf('This is the second post.'), 0, 'it populates the input with the post text');
   });
 });
 
-test("Composer can toggle between edit and reply", () => {
+QUnit.test("Composer can toggle between edit and reply", assert => {
   visit("/t/this-is-a-test-topic/9");
 
   click('.topic-post:eq(0) button.edit');
   andThen(() => {
-    equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
+    assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
   });
   click('.topic-post:eq(0) button.reply');
   andThen(() => {
-    equal(find('.d-editor-input').val(), "", 'it clears the input');
+    assert.equal(find('.d-editor-input').val(), "", 'it clears the input');
   });
   click('.topic-post:eq(0) button.edit');
   andThen(() => {
-    equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
+    assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
   });
 });
 
-test("Composer can toggle between reply and createTopic", () => {
+QUnit.test("Composer can toggle between reply and createTopic", assert => {
   visit("/t/this-is-a-test-topic/9");
 
   click('.topic-post:eq(0) button.reply');
   click('button.options');
   click('.popup-menu .fa-eye-slash');
   andThen(() => {
-    ok(
+    assert.ok(
       find('.composer-fields .whisper').text().indexOf(I18n.t("composer.whisper")) > 0,
       'it sets the post type to whisper'
     );
@@ -274,12 +274,12 @@ test("Composer can toggle between reply and createTopic", () => {
 
   visit("/");
   andThen(() => {
-    ok(exists('#create-topic'), 'the create topic button is visible');
+    assert.ok(exists('#create-topic'), 'the create topic button is visible');
   });
 
   click('#create-topic');
   andThen(() => {
-    ok(
+    assert.ok(
       find('.composer-fields .whisper').text().indexOf(I18n.t("composer.whisper")) === -1,
       "it should reset the state of the composer's model"
     );
@@ -288,7 +288,7 @@ test("Composer can toggle between reply and createTopic", () => {
   click('button.options');
   click('.popup-menu .fa-eye-slash');
   andThen(() => {
-    ok(
+    assert.ok(
       find('.composer-fields .whisper').text().indexOf(I18n.t("composer.unlist")) > 0,
       'it sets the topic to unlisted'
     );
@@ -298,29 +298,29 @@ test("Composer can toggle between reply and createTopic", () => {
 
   click('.topic-post:eq(0) button.reply');
   andThen(() => {
-    ok(
+    assert.ok(
       find('.composer-fields .whisper').text().indexOf(I18n.t("composer.unlist")) === -1,
       "it should reset the state of the composer's model"
     );
   });
 });
 
-test("Composer with dirty reply can toggle to edit", () => {
+QUnit.test("Composer with dirty reply can toggle to edit", assert => {
   visit("/t/this-is-a-test-topic/9");
 
   click('.topic-post:eq(0) button.reply');
   fillIn('.d-editor-input', 'This is a dirty reply');
   click('.topic-post:eq(0) button.edit');
   andThen(() => {
-    ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
+    assert.ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
   });
   click('.modal-footer a:eq(0)');
   andThen(() => {
-    equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
+    assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
   });
 });
 
-test("Composer draft with dirty reply can toggle to edit", () => {
+QUnit.test("Composer draft with dirty reply can toggle to edit", assert => {
   visit("/t/this-is-a-test-topic/9");
 
   click('.topic-post:eq(0) button.reply');
@@ -328,10 +328,10 @@ test("Composer draft with dirty reply can toggle to edit", () => {
   click('.toggler');
   click('.topic-post:eq(0) button.edit');
   andThen(() => {
-    ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
+    assert.ok(exists('.bootbox.modal'), 'it pops up a confirmation dialog');
   });
   click('.modal-footer a:eq(0)');
   andThen(() => {
-    equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
+    assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/composer-topic-links-test.js.es6 b/test/javascripts/acceptance/composer-topic-links-test.js.es6
index 3876fcc5cc8..515e01f111b 100644
--- a/test/javascripts/acceptance/composer-topic-links-test.js.es6
+++ b/test/javascripts/acceptance/composer-topic-links-test.js.es6
@@ -9,58 +9,58 @@ acceptance("Composer topic featured links", {
 });
 
 
-test("onebox with title", () => {
+QUnit.test("onebox with title", assert => {
   visit("/");
   click('#create-topic');
   fillIn('#reply-title', "http://www.example.com/has-title.html");
   andThen(() => {
-    ok(find('.d-editor-preview').html().trim().indexOf('onebox') > 0, "it pastes the link into the body and previews it");
-    ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'the body is now good');
-    equal(find('.title-input input').val(), "An interesting article", "title is from the oneboxed article");
+    assert.ok(find('.d-editor-preview').html().trim().indexOf('onebox') > 0, "it pastes the link into the body and previews it");
+    assert.ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'the body is now good');
+    assert.equal(find('.title-input input').val(), "An interesting article", "title is from the oneboxed article");
   });
 });
 
-test("onebox result doesn't include a title", () => {
+QUnit.test("onebox result doesn't include a title", assert => {
   visit("/");
   click('#create-topic');
   fillIn('#reply-title', 'http://www.example.com/no-title.html');
   andThen(() => {
-    ok(find('.d-editor-preview').html().trim().indexOf('onebox') > 0, "it pastes the link into the body and previews it");
-    ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'the body is now good');
-    equal(find('.title-input input').val(), "http://www.example.com/no-title.html", "title is unchanged");
+    assert.ok(find('.d-editor-preview').html().trim().indexOf('onebox') > 0, "it pastes the link into the body and previews it");
+    assert.ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'the body is now good');
+    assert.equal(find('.title-input input').val(), "http://www.example.com/no-title.html", "title is unchanged");
   });
 });
 
-test("no onebox result", () => {
+QUnit.test("no onebox result", assert => {
   visit("/");
   click('#create-topic');
   fillIn('#reply-title', "http://www.example.com/nope-onebox.html");
   andThen(() => {
-    ok(find('.d-editor-preview').html().trim().indexOf('onebox') > 0, "it pastes the link into the body and previews it");
-    ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'link is pasted into body');
-    equal(find('.title-input input').val(), "http://www.example.com/nope-onebox.html", "title is unchanged");
+    assert.ok(find('.d-editor-preview').html().trim().indexOf('onebox') > 0, "it pastes the link into the body and previews it");
+    assert.ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'link is pasted into body');
+    assert.equal(find('.title-input input').val(), "http://www.example.com/nope-onebox.html", "title is unchanged");
   });
 });
 
-test("ignore internal links", () => {
+QUnit.test("ignore internal links", assert => {
   visit("/");
   click('#create-topic');
   const title = "http://" + window.location.hostname + "/internal-page.html";
   fillIn('#reply-title', title);
   andThen(() => {
-    equal(find('.d-editor-preview').html().trim().indexOf('onebox'), -1, "onebox preview doesn't show");
-    equal(find('.d-editor-input').val().length, 0, "link isn't put into the post");
-    equal(find('.title-input input').val(), title, "title is unchanged");
+    assert.equal(find('.d-editor-preview').html().trim().indexOf('onebox'), -1, "onebox preview doesn't show");
+    assert.equal(find('.d-editor-input').val().length, 0, "link isn't put into the post");
+    assert.equal(find('.title-input input').val(), title, "title is unchanged");
   });
 });
 
-test("link is longer than max title length", () => {
+QUnit.test("link is longer than max title length", assert => {
   visit("/");
   click('#create-topic');
   fillIn('#reply-title', "http://www.example.com/has-title-and-a-url-that-is-more-than-80-characters-because-thats-good-for-seo-i-guess.html");
   andThen(() => {
-    ok(find('.d-editor-preview').html().trim().indexOf('onebox') > 0, "it pastes the link into the body and previews it");
-    ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'the body is now good');
-    equal(find('.title-input input').val(), "An interesting article", "title is from the oneboxed article");
+    assert.ok(find('.d-editor-preview').html().trim().indexOf('onebox') > 0, "it pastes the link into the body and previews it");
+    assert.ok(exists('.d-editor-textarea-wrapper .popup-tip.good'), 'the body is now good');
+    assert.equal(find('.title-input input').val(), "An interesting article", "title is from the oneboxed article");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/create-account-user-fields-test.js.es6 b/test/javascripts/acceptance/create-account-user-fields-test.js.es6
index 0b6fec4da4e..cb7a2fe5c56 100644
--- a/test/javascripts/acceptance/create-account-user-fields-test.js.es6
+++ b/test/javascripts/acceptance/create-account-user-fields-test.js.es6
@@ -8,14 +8,14 @@ acceptance("Create Account - User Fields", {
   }
 });
 
-test("create account with user fields", () => {
+QUnit.test("create account with user fields", assert => {
   visit("/");
   click("header .sign-up-button");
 
   andThen(() => {
-    ok(exists('.create-account'), "it shows the create account modal");
-    ok(exists('.user-field'), "it has at least one user field");
-    ok(exists('.modal-footer .btn-primary:disabled'), 'create account is disabled at first');
+    assert.ok(exists('.create-account'), "it shows the create account modal");
+    assert.ok(exists('.user-field'), "it has at least one user field");
+    assert.ok(exists('.modal-footer .btn-primary:disabled'), 'create account is disabled at first');
   });
 
   fillIn('#new-account-name', 'Dr. Good Tuna');
@@ -24,24 +24,24 @@ test("create account with user fields", () => {
   fillIn('#new-account-username', 'goodtuna');
 
   andThen(() => {
-    ok(exists('#username-validation.good'), 'the username validation is good');
-    ok(exists('.modal-footer .btn-primary:disabled'), 'create account is still disabled due to lack of user fields');
+    assert.ok(exists('#username-validation.good'), 'the username validation is good');
+    assert.ok(exists('.modal-footer .btn-primary:disabled'), 'create account is still disabled due to lack of user fields');
   });
 
   fillIn(".user-field input[type=text]:first", "Barky");
 
   andThen(() => {
-    ok(exists('.modal-footer .btn-primary:disabled'), 'create account is disabled because field is not checked');
+    assert.ok(exists('.modal-footer .btn-primary:disabled'), 'create account is disabled because field is not checked');
   });
 
   click(".user-field input[type=checkbox]");
   andThen(() => {
-    not(exists('.modal-footer .btn-primary:disabled'), 'create account is enabled because field is not checked');
+    assert.not(exists('.modal-footer .btn-primary:disabled'), 'create account is enabled because field is not checked');
   });
 
   click(".user-field input[type=checkbox]");
   andThen(() => {
-    ok(exists('.modal-footer .btn-primary:disabled'), 'unclicking the checkbox disables the submit');
+    assert.ok(exists('.modal-footer .btn-primary:disabled'), 'unclicking the checkbox disables the submit');
   });
 
 });
diff --git a/test/javascripts/acceptance/custom-html-set-test.js.es6 b/test/javascripts/acceptance/custom-html-set-test.js.es6
index 3ae0bd63737..6b2508ebf7f 100644
--- a/test/javascripts/acceptance/custom-html-set-test.js.es6
+++ b/test/javascripts/acceptance/custom-html-set-test.js.es6
@@ -4,14 +4,14 @@ import PreloadStore from 'preload-store';
 
 acceptance("CustomHTML set");
 
-test("has no custom HTML in the top", assert => {
+QUnit.test("has no custom HTML in the top", assert => {
   visit("/static/faq");
   andThen(() => {
     assert.ok(!exists('span.custom-html-test'), 'it has no markup');
   });
 });
 
-test("renders set HTML", assert => {
+QUnit.test("renders set HTML", assert => {
   setCustomHTML('top', '<span class="custom-html-test">HTML</span>');
 
   visit("/static/faq");
@@ -20,11 +20,11 @@ test("renders set HTML", assert => {
   });
 });
 
-test("renders preloaded HTML", assert => {
+QUnit.test("renders preloaded HTML", assert => {
   PreloadStore.store('customHTML', {top: "<span class='cookie'>monster</span>"});
 
   visit("/static/faq");
   andThen(() => {
     assert.equal(find('span.cookie').text(), 'monster', 'it inserted the markup');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/custom-html-template-test.js.es6 b/test/javascripts/acceptance/custom-html-template-test.js.es6
index d125236ebbc..bb0d77c8794 100644
--- a/test/javascripts/acceptance/custom-html-template-test.js.es6
+++ b/test/javascripts/acceptance/custom-html-template-test.js.es6
@@ -1,16 +1,16 @@
 import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("CustomHTML template", {
-  setup() {
+  beforeEach() {
     Ember.TEMPLATES['top'] = Ember.HTMLBars.compile(`<span class='top-span'>TOP</span>`);
   },
 
-  teardown() {
+  afterEach() {
     delete Ember.TEMPLATES['top'];
   }
 });
 
-test("renders custom template", assert => {
+QUnit.test("renders custom template", assert => {
   visit("/static/faq");
   andThen(() => {
     assert.equal(find('span.top-span').text(), 'TOP', 'it inserted the template');
diff --git a/test/javascripts/acceptance/emoji-picker-test.js.es6 b/test/javascripts/acceptance/emoji-picker-test.js.es6
new file mode 100644
index 00000000000..56a0f2b9265
--- /dev/null
+++ b/test/javascripts/acceptance/emoji-picker-test.js.es6
@@ -0,0 +1,165 @@
+import { acceptance } from "helpers/qunit-helpers";
+import { IMAGE_VERSION as v } from 'pretty-text/emoji';
+import { resetCache } from 'discourse/components/emoji-picker';
+
+acceptance("EmojiPicker", {
+  loggedIn: true,
+  beforeEach() { resetCache(); }
+});
+
+QUnit.test("emoji picker can be opened/closed", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+
+  click("button.emoji.btn");
+  andThen(() => {
+    assert.notEqual(
+      find('.emoji-picker').html().trim(),
+      "",
+      "it opens the picker"
+    );
+  });
+
+  click("button.emoji.btn");
+  andThen(() => {
+    assert.equal(
+      find('.emoji-picker').html().trim(),
+      "",
+      "it closes the picker"
+      );
+  });
+});
+
+QUnit.test("emojis can be hovered to display info", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+
+  click("button.emoji.btn");
+  andThen(() => {
+    $(".emoji-picker button[title='grinning']").trigger('mouseover');
+    andThen(() => {
+      assert.equal(
+        find('.emoji-picker .info').html().trim(),
+        `<img src=\"/images/emoji/emoji_one/grinning.png?v=${v}\" class=\"emoji\"> <span>:grinning:<span></span></span>`,
+        "it displays emoji info when hovering emoji"
+      );
+    });
+  });
+});
+
+QUnit.test("emoji picker triggers event when picking emoji", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+  click("button.emoji.btn");
+
+  click(".emoji-picker button[title='grinning']");
+  andThen(() => {
+    assert.equal(
+      find('.d-editor-input').val(),
+      ":grinning:",
+      "it adds the emoji code in the editor when selected"
+    );
+  });
+});
+
+QUnit.test("emoji picker has a list of recently used emojis", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+  click("button.emoji.btn");
+
+  click(".emoji-picker .section[data-section='people'] button.emoji[title='grinning']");
+  andThen(() => {
+    assert.equal(
+      find('.emoji-picker .section[data-section="recent"]').css("display"),
+      "block",
+      "it shows recent section"
+    );
+
+    assert.equal(
+      find('.emoji-picker .section[data-section="recent"] .section-group button.emoji').length,
+      1,
+      "it adds the emoji code to the recently used emojis list"
+    );
+  });
+
+  click(".emoji-picker .clear-recent");
+  andThen(() => {
+    assert.equal(
+      find('.emoji-picker .section[data-section="recent"] .section-group button.emoji').length,
+      0,
+      "it has cleared recent emojis"
+    );
+
+    assert.equal(
+      find('.emoji-picker .section[data-section="recent"]').css("display"),
+      "none",
+      "it hides recent section"
+    );
+
+    assert.equal(
+      find('.emoji-picker .category-icon button.emoji[data-section="recent"]').parent().css("display"),
+      "none",
+      "it hides recent category icon"
+    );
+  });
+});
+
+QUnit.test("emoji picker correctly orders recently used emojis", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+
+  click("button.emoji.btn");
+  andThen(() => {
+    click(".emoji-picker button[title='sunglasses']");
+    click(".emoji-picker button[title='grinning']");
+    andThen(() => {
+      assert.equal(
+        find('.section[data-section="recent"] .section-group button.emoji').length,
+        2,
+        "it has multiple recent emojis"
+      );
+
+      assert.equal(
+        /grinning/.test(find('.section[data-section="recent"] .section-group button.emoji').first().css('background-image')),
+        true,
+        "it puts the last used emoji in first"
+      );
+    });
+  });
+});
+
+QUnit.test("emoji picker lazy loads emojis", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+
+  click("button.emoji.btn");
+
+  andThen(() => {
+    assert.equal(
+      find('.emoji-picker button[title="massage_woman"]').css("background-image"),
+      "none",
+      "it doesn't load invisible emojis"
+    );
+  });
+});
+
+
+QUnit.test("emoji picker persists state", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+
+  click("button.emoji.btn");
+  andThen(() => {
+    click('.emoji-picker a.diversity-scale.medium-dark');
+  });
+  click("button.emoji.btn");
+
+  click("button.emoji.btn");
+  andThen(() => {
+    assert.equal(
+      find('.emoji-picker .diversity-scale.medium-dark').hasClass('selected'),
+      true,
+      "it stores diversity scale"
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/emoji-test.js.es6 b/test/javascripts/acceptance/emoji-test.js.es6
new file mode 100644
index 00000000000..23fc2aa8046
--- /dev/null
+++ b/test/javascripts/acceptance/emoji-test.js.es6
@@ -0,0 +1,33 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Emoji", { loggedIn: true });
+
+QUnit.test("emoji is cooked properly", assert => {
+  visit("/t/internationalization-localization/280");
+  click('#topic-footer-buttons .btn.create');
+
+  fillIn('.d-editor-input', "this is an emoji :blonde_woman:");
+  andThen(() => {
+    assert.equal(find('.d-editor-preview:visible').html().trim(), "<p>this is an emoji <img src=\"/images/emoji/emoji_one/blonde_woman.png?v=5\" title=\":blonde_woman:\" class=\"emoji\" alt=\":blonde_woman:\"></p>");
+  });
+
+  click('#reply-control .btn.create');
+  andThen(() => {
+    assert.equal(find('.topic-post:last .cooked p').html().trim(), "this is an emoji <img src=\"/images/emoji/emoji_one/blonde_woman.png?v=5\" title=\":blonde_woman:\" class=\"emoji\" alt=\":blonde_woman:\">");
+  });
+});
+
+QUnit.test("skin toned emoji is cooked properly", assert => {
+  visit("/t/internationalization-localization/280");
+  click('#topic-footer-buttons .btn.create');
+
+  fillIn('.d-editor-input', "this is an emoji :blonde_woman:t5:");
+  andThen(() => {
+    assert.equal(find('.d-editor-preview:visible').html().trim(), "<p>this is an emoji <img src=\"/images/emoji/emoji_one/blonde_woman/5.png?v=5\" title=\":blonde_woman:t5:\" class=\"emoji\" alt=\":blonde_woman:t5:\"></p>");
+  });
+
+  click('#reply-control .btn.create');
+  andThen(() => {
+    assert.equal(find('.topic-post:last .cooked p').html().trim(), "this is an emoji <img src=\"/images/emoji/emoji_one/blonde_woman/5.png?v=5\" title=\":blonde_woman:t5:\" class=\"emoji\" alt=\":blonde_woman:t5:\">");
+  });
+});
diff --git a/test/javascripts/acceptance/group-edit-test.js.es6 b/test/javascripts/acceptance/group-edit-test.js.es6
index 023d9c95f45..676ee7a2fc1 100644
--- a/test/javascripts/acceptance/group-edit-test.js.es6
+++ b/test/javascripts/acceptance/group-edit-test.js.es6
@@ -2,39 +2,39 @@ import { acceptance, logIn } from "helpers/qunit-helpers";
 
 acceptance("Editing Group");
 
-test("Editing group", () => {
+QUnit.test("Editing group", assert => {
   logIn();
   Discourse.reset();
 
   visit("/groups/discourse/edit");
 
   andThen(() => {
-    ok(find('.group-flair-inputs').length === 1, 'it should display avatar flair inputs');
-    ok(find('.group-edit-bio').length === 1, 'it should display group bio input');
-    ok(find('.group-edit-full-name').length === 1, 'it should display group full name input');
-    ok(find('.group-edit-public').length === 1, 'it should display group public input');
-    ok(find('.group-edit-allow-membership-requests').length === 1, 'it should display group allow_membership_requets input');
-    ok(find('.group-members-input .item').length === 7, 'it should display group members');
-    ok(find('.group-members-input-selector').length === 1, 'it should display input to add group members');
-    ok(find('.group-members-input-selector .add[disabled]').length === 1, 'add members button should be disabled');
+    assert.ok(find('.group-flair-inputs').length === 1, 'it should display avatar flair inputs');
+    assert.ok(find('.group-edit-bio').length === 1, 'it should display group bio input');
+    assert.ok(find('.group-edit-full-name').length === 1, 'it should display group full name input');
+    assert.ok(find('.group-edit-public').length === 1, 'it should display group public input');
+    assert.ok(find('.group-edit-allow-membership-requests').length === 1, 'it should display group allow_membership_requets input');
+    assert.ok(find('.group-members-input .item').length === 7, 'it should display group members');
+    assert.ok(find('.group-members-input-selector').length === 1, 'it should display input to add group members');
+    assert.ok(find('.group-members-input-selector .add[disabled]').length === 1, 'add members button should be disabled');
   });
 
   andThen(() => {
-    ok(find('.group-edit-allow-membership-requests[disabled]').length === 1, 'it should disable group allow_membership_request input');
+    assert.ok(find('.group-edit-allow-membership-requests[disabled]').length === 1, 'it should disable group allow_membership_request input');
   });
 
   click('.group-edit-public');
   click('.group-edit-allow-membership-requests');
 
   andThen(() => {
-    ok(find('.group-edit-public[disabled]').length === 1, 'it should disable group public input');
+    assert.ok(find('.group-edit-public[disabled]').length === 1, 'it should disable group public input');
   });
 });
 
-test("Editing group as an anonymous user", () => {
+QUnit.test("Editing group as an anonymous user", assert => {
   visit("/groups/discourse/edit");
 
   andThen(() => {
-    ok(count('.group-members tr') > 0, "it should redirect to members page for an anonymous user");
+    assert.ok(count('.group-members tr') > 0, "it should redirect to members page for an anonymous user");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/group-logs-test.js.es6 b/test/javascripts/acceptance/group-logs-test.js.es6
index 58a1acb7bea..86d760cb0c2 100644
--- a/test/javascripts/acceptance/group-logs-test.js.es6
+++ b/test/javascripts/acceptance/group-logs-test.js.es6
@@ -2,7 +2,7 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Group Logs", {
   loggedIn: true,
-  setup() {
+  beforeEach() {
     const response = object => {
       return [
         200,
@@ -26,15 +26,15 @@ acceptance("Group Logs", {
   }
 });
 
-test("Browsing group logs", () => {
+QUnit.test("Browsing group logs", assert => {
   visit("/groups/snorlax/logs");
 
   andThen(() => {
-    ok(find('tr.group-logs-row').length === 2, 'it should display the right number of logs');
+    assert.ok(find('tr.group-logs-row').length === 2, 'it should display the right number of logs');
     click(find(".group-logs-row button")[0]);
   });
 
   andThen(() => {
-    ok(find('tr.group-logs-row').length === 1, 'it should display the right number of logs');
+    assert.ok(find('tr.group-logs-row').length === 1, 'it should display the right number of logs');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/groups-test.js.es6 b/test/javascripts/acceptance/groups-test.js.es6
index baf138e76d0..0534127ea7b 100644
--- a/test/javascripts/acceptance/groups-test.js.es6
+++ b/test/javascripts/acceptance/groups-test.js.es6
@@ -2,104 +2,104 @@ import { acceptance, logIn } from "helpers/qunit-helpers";
 
 acceptance("Groups");
 
-test("Browsing Groups", () => {
+QUnit.test("Browsing Groups", assert => {
   visit("/groups");
 
   andThen(() => {
-    equal(count('.groups-table-row'), 2, 'it displays visible groups');
-    equal(find('.group-index-join').length, 1, 'it shows button to join group');
-    equal(find('.group-index-request').length, 1, 'it shows button to request for group membership');
+    assert.equal(count('.groups-table-row'), 2, 'it displays visible groups');
+    assert.equal(find('.group-index-join').length, 1, 'it shows button to join group');
+    assert.equal(find('.group-index-request').length, 1, 'it shows button to request for group membership');
   });
 
   click('.group-index-join');
 
   andThen(() => {
-    ok(exists('.modal.login-modal'), 'it shows the login modal');
+    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
   });
 
   click('.login-modal .close');
 
   andThen(() => {
-    ok(invisible('.modal.login-modal'), 'it closes the login modal');
+    assert.ok(invisible('.modal.login-modal'), 'it closes the login modal');
   });
 
   click('.group-index-request');
 
   andThen(() => {
-    ok(exists('.modal.login-modal'), 'it shows the login modal');
+    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
   });
 
   click("a[href='/groups/discourse/members']");
 
   andThen(() => {
-    equal(find('.group-info-name').text().trim(), 'Awesome Team', "it displays the group page");
+    assert.equal(find('.group-info-name').text().trim(), 'Awesome Team', "it displays the group page");
   });
 
   click('.group-index-join');
 
   andThen(() => {
-    ok(exists('.modal.login-modal'), 'it shows the login modal');
+    assert.ok(exists('.modal.login-modal'), 'it shows the login modal');
   });
 });
 
-test("Viewing Group", () => {
+QUnit.test("Viewing Group", assert => {
   visit("/groups/discourse");
 
   andThen(() => {
-    ok(count('.avatar-flair .fa-adjust') === 1, "it displays the group's avatar flair");
-    ok(count('.group-members tr') > 0, "it lists group members");
+    assert.ok(count('.avatar-flair .fa-adjust') === 1, "it displays the group's avatar flair");
+    assert.ok(count('.group-members tr') > 0, "it lists group members");
   });
 
   click(".nav-pills li a[title='Activity']");
 
   andThen(() => {
-    ok(count('.user-stream .item') > 0, "it lists stream items");
+    assert.ok(count('.user-stream .item') > 0, "it lists stream items");
   });
 
   click(".group-activity-nav li a[href='/groups/discourse/activity/topics']");
 
   andThen(() => {
-    ok(count('.user-stream .item') > 0, "it lists stream items");
+    assert.ok(count('.user-stream .item') > 0, "it lists stream items");
   });
 
   click(".group-activity-nav li a[href='/groups/discourse/activity/mentions']");
 
   andThen(() => {
-    ok(count('.user-stream .item') > 0, "it lists stream items");
+    assert.ok(count('.user-stream .item') > 0, "it lists stream items");
   });
 
   andThen(() => {
-    equal(
+    assert.equal(
       find(".group-activity li a[href='/groups/discourse/activity/messages']").length,
       0,
       'it should not show messages tab if user is not a group user or admin'
     );
-    ok(find(".nav-pills li a[title='Edit Group']").length === 0, 'it should not show messages tab if user is not admin');
-    ok(find(".nav-pills li a[title='Logs']").length === 0, 'it should not show Logs tab if user is not admin');
-    ok(count('.user-stream .item') > 0, "it lists stream items");
+    assert.ok(find(".nav-pills li a[title='Edit Group']").length === 0, 'it should not show messages tab if user is not admin');
+    assert.ok(find(".nav-pills li a[title='Logs']").length === 0, 'it should not show Logs tab if user is not admin');
+    assert.ok(count('.user-stream .item') > 0, "it lists stream items");
   });
 });
 
-test("Admin Viewing Group", () => {
+QUnit.test("Admin Viewing Group", assert => {
   logIn();
   Discourse.reset();
 
   visit("/groups/discourse");
 
   andThen(() => {
-    ok(find(".nav-pills li a[title='Edit Group']").length === 1, 'it should show edit group tab if user is admin');
-    ok(find(".nav-pills li a[title='Logs']").length === 1, 'it should show Logs tab if user is admin');
+    assert.ok(find(".nav-pills li a[title='Edit Group']").length === 1, 'it should show edit group tab if user is admin');
+    assert.ok(find(".nav-pills li a[title='Logs']").length === 1, 'it should show Logs tab if user is admin');
 
-    equal(find('.group-info-name').text(), 'Awesome Team', 'it should display the group name');
+    assert.equal(find('.group-info-name').text(), 'Awesome Team', 'it should display the group name');
   });
 
   click(".nav-pills li a[title='Activity']");
 
   andThen(() => {
-    equal(
+    assert.equal(
       find(".group-activity li a[href='/groups/discourse/activity/messages']").length,
       1,
       'it should show messages tab if user is admin'
     );
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/invite-accept-test.js.es6 b/test/javascripts/acceptance/invite-accept-test.js.es6
index f89d5329bc0..697948e69de 100644
--- a/test/javascripts/acceptance/invite-accept-test.js.es6
+++ b/test/javascripts/acceptance/invite-accept-test.js.es6
@@ -7,7 +7,7 @@ acceptance("Invite Accept", {
   }
 });
 
-test("Invite Acceptance Page", () => {
+QUnit.test("Invite Acceptance Page", assert => {
   PreloadStore.store('invite_info', {
     invited_by: {"id":123,"username":"neil","avatar_template":"/user_avatar/localhost/neil/{size}/25_1.png","name":"Neil Lalonde","title":"team"},
     email: "invited@asdf.com",
@@ -16,35 +16,35 @@ test("Invite Acceptance Page", () => {
 
   visit("/invites/myvalidinvitetoken");
   andThen(() => {
-    ok(exists("#new-account-username"), "shows the username input");
-    equal(find("#new-account-username").val(), "invited", "username is prefilled");
-    ok(exists("#new-account-name"), "shows the name input");
-    ok(exists("#new-account-password"), "shows the password input");
-    ok(exists('.invites-show .btn-primary:disabled'), 'submit is disabled because name is not filled');
+    assert.ok(exists("#new-account-username"), "shows the username input");
+    assert.equal(find("#new-account-username").val(), "invited", "username is prefilled");
+    assert.ok(exists("#new-account-name"), "shows the name input");
+    assert.ok(exists("#new-account-password"), "shows the password input");
+    assert.ok(exists('.invites-show .btn-primary:disabled'), 'submit is disabled because name is not filled');
   });
 
   fillIn("#new-account-name", 'John Doe');
   andThen(() => {
-    not(exists('.invites-show .btn-primary:disabled'), 'submit is enabled');
+    assert.not(exists('.invites-show .btn-primary:disabled'), 'submit is enabled');
   });
 
   fillIn("#new-account-username", 'a');
   andThen(() => {
-    ok(exists(".username-input .bad"), "username is not valid");
-    ok(exists('.invites-show .btn-primary:disabled'), 'submit is disabled');
+    assert.ok(exists(".username-input .bad"), "username is not valid");
+    assert.ok(exists('.invites-show .btn-primary:disabled'), 'submit is disabled');
   });
 
   fillIn("#new-account-password", 'aaa');
   andThen(() => {
-    ok(exists(".password-input .bad"), "password is not valid");
-    ok(exists('.invites-show .btn-primary:disabled'), 'submit is disabled');
+    assert.ok(exists(".password-input .bad"), "password is not valid");
+    assert.ok(exists('.invites-show .btn-primary:disabled'), 'submit is disabled');
   });
 
   fillIn("#new-account-username", 'validname');
   fillIn("#new-account-password", 'secur3ty4Y0uAndMe');
   andThen(() => {
-    ok(exists(".username-input .good"), "username is valid");
-    ok(exists(".password-input .good"), "password is valid");
-    not(exists('.invites-show .btn-primary:disabled'), 'submit is enabled');
+    assert.ok(exists(".username-input .good"), "username is valid");
+    assert.ok(exists(".password-input .good"), "password is valid");
+    assert.not(exists('.invites-show .btn-primary:disabled'), 'submit is enabled');
   });
 });
diff --git a/test/javascripts/acceptance/invite-show-user-fields-test.js.es6 b/test/javascripts/acceptance/invite-show-user-fields-test.js.es6
new file mode 100644
index 00000000000..823a5113ce4
--- /dev/null
+++ b/test/javascripts/acceptance/invite-show-user-fields-test.js.es6
@@ -0,0 +1,44 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Accept Invite - User Fields", {
+  site: {
+    user_fields: [{"id":34,"name":"I've read the terms of service","field_type":"confirm","required":true},
+                  {"id":35,"name":"What is your pet's name?","field_type":"text","required":true},
+                  {"id":36,"name":"What's your dad like?","field_type":"text","required":false}]
+  }
+});
+
+QUnit.test("accept invite with user fields", assert => {
+  visit("/invites/myvalidinvitetoken");
+  andThen(() => {
+    assert.ok(exists(".invites-show"), "shows the accept invite page");
+    assert.ok(exists('.user-field'), "it has at least one user field");
+    assert.ok(exists('.invites-show .btn-primary:disabled'), 'submit is disabled');
+  });
+
+  fillIn("#new-account-name", 'John Doe');
+  fillIn("#new-account-username", 'validname');
+  fillIn("#new-account-password", 'secur3ty4Y0uAndMe');
+
+  andThen(() => {
+    assert.ok(exists(".username-input .good"), "username is valid");
+    assert.ok(exists('.invites-show .btn-primary:disabled'), 'submit is still disabled due to lack of user fields');
+  });
+
+  fillIn(".user-field input[type=text]:first", "Barky");
+
+  andThen(() => {
+    assert.ok(exists('.invites-show .btn-primary:disabled'), 'submit is disabled because field is not checked');
+  });
+
+  click(".user-field input[type=checkbox]");
+  andThen(() => {
+    assert.not(exists('.invites-show .btn-primary:disabled'), 'submit is enabled because field is checked');
+  });
+
+  click(".user-field input[type=checkbox]");
+  andThen(() => {
+    assert.ok(exists('.invites-show .btn-primary:disabled'), 'unclicking the checkbox disables the submit');
+  });
+
+});
diff --git a/test/javascripts/acceptance/login-required-test.js.es6 b/test/javascripts/acceptance/login-required-test.js.es6
index 4bbec697a41..6153b12f22a 100644
--- a/test/javascripts/acceptance/login-required-test.js.es6
+++ b/test/javascripts/acceptance/login-required-test.js.es6
@@ -6,24 +6,24 @@ acceptance("Login Required", {
   }
 });
 
-test("redirect", () => {
+QUnit.test("redirect", assert => {
   visit('/latest');
   andThen(() => {
-    equal(currentPath(), "login", "it redirects them to login");
+    assert.equal(currentPath(), "login", "it redirects them to login");
   });
 
   click('#site-logo');
   andThen(() => {
-    equal(currentPath(), "login", "clicking the logo keeps them on login");
+    assert.equal(currentPath(), "login", "clicking the logo keeps them on login");
   });
 
   click('header .login-button');
   andThen(() => {
-    ok(exists('.login-modal'), "they can still access the login modal");
+    assert.ok(exists('.login-modal'), "they can still access the login modal");
   });
 
   click('.modal-header .close');
   andThen(() => {
-    ok(invisible('.login-modal'), "it closes the login modal");
+    assert.ok(invisible('.login-modal'), "it closes the login modal");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/mobile-discovery-test.js.es6 b/test/javascripts/acceptance/mobile-discovery-test.js.es6
index 4d0198bffe7..564c5b4ec1f 100644
--- a/test/javascripts/acceptance/mobile-discovery-test.js.es6
+++ b/test/javascripts/acceptance/mobile-discovery-test.js.es6
@@ -1,15 +1,15 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Topic Discovery - Mobile", { mobileView: true });
 
-test("Visit Discovery Pages", () => {
+QUnit.test("Visit Discovery Pages", assert => {
   visit("/");
   andThen(() => {
-    ok(exists(".topic-list"), "The list of topics was rendered");
-    ok(exists('.topic-list .topic-list-item'), "has topics");
+    assert.ok(exists(".topic-list"), "The list of topics was rendered");
+    assert.ok(exists('.topic-list .topic-list-item'), "has topics");
   });
 
   visit("/categories");
   andThen(() => {
-    ok(exists('.category'), "has a list of categories");
+    assert.ok(exists('.category'), "has a list of categories");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/mobile-sign-in-test.js.es6 b/test/javascripts/acceptance/mobile-sign-in-test.js.es6
index 80831091317..34c03ec7d83 100644
--- a/test/javascripts/acceptance/mobile-sign-in-test.js.es6
+++ b/test/javascripts/acceptance/mobile-sign-in-test.js.es6
@@ -2,10 +2,10 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("Signing In - Mobile", { mobileView: true });
 
-test("sign in", () => {
+QUnit.test("sign in", assert => {
   visit("/");
   click("header .login-button");
   andThen(() => {
-    ok(exists('#login-form'), "it shows the login modal");
+    assert.ok(exists('#login-form'), "it shows the login modal");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/mobile-users-test.js.es6 b/test/javascripts/acceptance/mobile-users-test.js.es6
index 8cc2cb9da1b..70d5f2a0c52 100644
--- a/test/javascripts/acceptance/mobile-users-test.js.es6
+++ b/test/javascripts/acceptance/mobile-users-test.js.es6
@@ -2,9 +2,9 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("User Directory - Mobile", { mobileView: true });
 
-test("Visit Page", () => {
+QUnit.test("Visit Page", assert => {
   visit("/users");
   andThen(() => {
-    ok(exists('.directory .user'), "has a list of users");
+    assert.ok(exists('.directory .user'), "has a list of users");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/modal-test.js.es6 b/test/javascripts/acceptance/modal-test.js.es6
index e3f0986f01b..1a570f222d7 100644
--- a/test/javascripts/acceptance/modal-test.js.es6
+++ b/test/javascripts/acceptance/modal-test.js.es6
@@ -1,30 +1,30 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Modal");
 
-test("modal", () => {
+QUnit.test("modal", assert => {
   visit('/');
 
   andThen(() => {
-    ok(find('#discourse-modal:visible').length === 0, 'there is no modal at first');
+    assert.ok(find('#discourse-modal:visible').length === 0, 'there is no modal at first');
   });
 
   click('.login-button');
   andThen(() => {
-    ok(find('#discourse-modal:visible').length === 1, 'modal should appear');
+    assert.ok(find('#discourse-modal:visible').length === 1, 'modal should appear');
   });
 
   click('.modal-outer-container');
   andThen(() => {
-    ok(find('#discourse-modal:visible').length === 0, 'modal should disappear when you click outside');
+    assert.ok(find('#discourse-modal:visible').length === 0, 'modal should disappear when you click outside');
   });
 
   click('.login-button');
   andThen(() => {
-    ok(find('#discourse-modal:visible').length === 1, 'modal should reappear');
+    assert.ok(find('#discourse-modal:visible').length === 1, 'modal should reappear');
   });
 
   keyEvent('#main-outlet', 'keydown', 27);
   andThen(() => {
-    ok(find('#discourse-modal:visible').length === 0, 'ESC should close the modal');
+    assert.ok(find('#discourse-modal:visible').length === 0, 'ESC should close the modal');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js.es6
index c8eaf488a2d..4706b88c29b 100644
--- a/test/javascripts/acceptance/password-reset-test.js.es6
+++ b/test/javascripts/acceptance/password-reset-test.js.es6
@@ -3,7 +3,7 @@ import PreloadStore from 'preload-store';
 import { parsePostData } from "helpers/create-pretender";
 
 acceptance("Password Reset", {
-  setup() {
+  beforeEach() {
     const response = (object) => {
       return [
         200,
@@ -27,36 +27,35 @@ acceptance("Password Reset", {
   }
 });
 
-test("Password Reset Page", () => {
+QUnit.test("Password Reset Page", assert => {
   PreloadStore.store('password_reset', {is_developer: false});
 
   visit("/u/password-reset/myvalidtoken");
   andThen(() => {
-    ok(exists(".password-reset input"), "shows the input");
+    assert.ok(exists(".password-reset input"), "shows the input");
   });
 
   fillIn('.password-reset input', 'perf3ctly5ecur3');
   andThen(() => {
-    ok(exists(".password-reset .tip.good"), "input looks good");
+    assert.ok(exists(".password-reset .tip.good"), "input looks good");
   });
 
   fillIn('.password-reset input', '123');
   andThen(() => {
-    ok(exists(".password-reset .tip.bad"), "input is not valid");
-    ok(find(".password-reset .tip.bad").html().indexOf(I18n.t('user.password.too_short')) > -1, "password too short");
+    assert.ok(exists(".password-reset .tip.bad"), "input is not valid");
+    assert.ok(find(".password-reset .tip.bad").html().indexOf(I18n.t('user.password.too_short')) > -1, "password too short");
   });
 
   fillIn('.password-reset input', 'jonesyAlienSlayer');
   click('.password-reset form button');
   andThen(() => {
-    ok(exists(".password-reset .tip.bad"), "input is not valid");
-    ok(find(".password-reset .tip.bad").html().indexOf("is the name of your cat") > -1, "server validation error message shows");
+    assert.ok(exists(".password-reset .tip.bad"), "input is not valid");
+    assert.ok(find(".password-reset .tip.bad").html().indexOf("is the name of your cat") > -1, "server validation error message shows");
   });
 
   fillIn('.password-reset input', 'perf3ctly5ecur3');
   click('.password-reset form button');
   andThen(() => {
-    ok(!exists(".password-reset form"), "form is gone");
+    assert.ok(!exists(".password-reset form"), "form is gone");
   });
-});
-
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
index 60a85e3cc77..b7a371d1e32 100644
--- a/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
+++ b/test/javascripts/acceptance/plugin-outlet-connector-class-test.js.es6
@@ -3,7 +3,7 @@ import { extraConnectorClass } from 'discourse/lib/plugin-connectors';
 
 const PREFIX = "javascripts/single-test/connectors";
 acceptance("Plugin Outlet - Connector Class", {
-  setup() {
+  beforeEach() {
     extraConnectorClass('user-profile-primary/hello', {
       actions: {
         sayHello() {
@@ -28,13 +28,13 @@ acceptance("Plugin Outlet - Connector Class", {
     );
   },
 
-  teardown() {
+  afterEach() {
     delete Ember.TEMPLATES[`${PREFIX}/user-profile-primary/hello`];
     delete Ember.TEMPLATES[`${PREFIX}/user-profile-primary/dont-render`];
   }
 });
 
-test("Renders a template into the outlet", assert => {
+QUnit.test("Renders a template into the outlet", assert => {
   visit("/u/eviltrout");
   andThen(() => {
     assert.ok(find('.user-profile-primary-outlet.hello').length === 1, 'it has class names');
@@ -44,4 +44,4 @@ test("Renders a template into the outlet", assert => {
   andThen(() => {
     assert.equal(find('.hello-result').text(), 'hello!', 'actions delegate properly');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
index b74b46395be..3f4722d7576 100644
--- a/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
+++ b/test/javascripts/acceptance/plugin-outlet-multi-template-test.js.es6
@@ -5,20 +5,20 @@ const HELLO   = 'javascripts/multi-test/connectors/user-profile-primary/hello';
 const GOODBYE = 'javascripts/multi-test/connectors/user-profile-primary/goodbye';
 
 acceptance("Plugin Outlet - Multi Template", {
-  setup() {
+  beforeEach() {
     clearCache();
     Ember.TEMPLATES[HELLO] = Ember.HTMLBars.compile(`<span class='hello-span'>Hello</span>`);
     Ember.TEMPLATES[GOODBYE] = Ember.HTMLBars.compile(`<span class='bye-span'>Goodbye</span>`);
   },
 
-  teardown() {
+  afterEach() {
     delete Ember.TEMPLATES[HELLO];
     delete Ember.TEMPLATES[GOODBYE];
     clearCache();
   }
 });
 
-test("Renders a template into the outlet", assert => {
+QUnit.test("Renders a template into the outlet", assert => {
   visit("/u/eviltrout");
   andThen(() => {
     assert.ok(find('.user-profile-primary-outlet.hello').length === 1, 'it has class names');
@@ -26,4 +26,4 @@ test("Renders a template into the outlet", assert => {
     assert.equal(find('.hello-span').text(), 'Hello', 'it renders into the outlet');
     assert.equal(find('.bye-span').text(), 'Goodbye', 'it renders into the outlet');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6 b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
index 63a05b36296..48ae7ba07c2 100644
--- a/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
+++ b/test/javascripts/acceptance/plugin-outlet-single-template-test.js.es6
@@ -2,21 +2,21 @@ import { acceptance } from "helpers/qunit-helpers";
 
 const CONNECTOR = 'javascripts/single-test/connectors/user-profile-primary/hello';
 acceptance("Plugin Outlet - Single Template", {
-  setup() {
+  beforeEach() {
     Ember.TEMPLATES[CONNECTOR] = Ember.HTMLBars.compile(
       `<span class='hello-username'>{{model.username}}</span>`
     );
   },
 
-  teardown() {
+  afterEach() {
     delete Ember.TEMPLATES[CONNECTOR];
   }
 });
 
-test("Renders a template into the outlet", assert => {
+QUnit.test("Renders a template into the outlet", assert => {
   visit("/u/eviltrout");
   andThen(() => {
     assert.ok(find('.user-profile-primary-outlet.hello').length === 1, 'it has class names');
     assert.equal(find('.hello-username').text(), 'eviltrout', 'it renders into the outlet');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/preferences-test.js.es6 b/test/javascripts/acceptance/preferences-test.js.es6
index ccd2aff7b41..e4607f5bcf1 100644
--- a/test/javascripts/acceptance/preferences-test.js.es6
+++ b/test/javascripts/acceptance/preferences-test.js.es6
@@ -1,20 +1,20 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("User Preferences", { loggedIn: true });
 
-test("update some fields", () => {
+QUnit.test("update some fields", assert => {
   visit("/u/eviltrout/preferences");
 
   andThen(() => {
-    ok($('body.user-preferences-page').length, "has the body class");
-    equal(currentURL(), '/u/eviltrout/preferences/account', "defaults to account tab");
-    ok(exists('.user-preferences'), 'it shows the preferences');
+    assert.ok($('body.user-preferences-page').length, "has the body class");
+    assert.equal(currentURL(), '/u/eviltrout/preferences/account', "defaults to account tab");
+    assert.ok(exists('.user-preferences'), 'it shows the preferences');
   });
 
   const savePreferences = () => {
     click('.save-user');
-    ok(!exists('.saved-user'), "it hasn't been saved yet");
+    assert.ok(!exists('.saved-user'), "it hasn't been saved yet");
     andThen(() => {
-      ok(exists('.saved-user'), 'it displays the saved message');
+      assert.ok(exists('.saved-user'), 'it displays the saved message');
     });
   };
 
@@ -37,39 +37,39 @@ test("update some fields", () => {
   fillIn('.category-controls .category-selector', 'faq');
   savePreferences();
 
-  ok(!exists('.preferences-nav .nav-tags a'), "tags tab isn't there when tags are disabled");
+  assert.ok(!exists('.preferences-nav .nav-tags a'), "tags tab isn't there when tags are disabled");
 
   // Error: Unhandled request in test environment: /themes/assets/10d71596-7e4e-4dc0-b368-faa3b6f1ce6d?_=1493833562388 (GET)
   // click(".preferences-nav .nav-interface a");
   // click('.control-group.other input[type=checkbox]:first');
   // savePreferences();
 
-  ok(!exists('.preferences-nav .nav-apps a'), "apps tab isn't there when you have no authorized apps");
+  assert.ok(!exists('.preferences-nav .nav-apps a'), "apps tab isn't there when you have no authorized apps");
 });
 
-test("username", () => {
+QUnit.test("username", assert => {
   visit("/u/eviltrout/preferences/username");
   andThen(() => {
-    ok(exists("#change_username"), "it has the input element");
+    assert.ok(exists("#change_username"), "it has the input element");
   });
 });
 
-test("about me", () => {
+QUnit.test("about me", assert => {
   visit("/u/eviltrout/preferences/about-me");
   andThen(() => {
-    ok(exists(".raw-bio"), "it has the input element");
+    assert.ok(exists(".raw-bio"), "it has the input element");
   });
 });
 
-test("email", () => {
+QUnit.test("email", assert => {
   visit("/u/eviltrout/preferences/email");
   andThen(() => {
-    ok(exists("#change-email"), "it has the input element");
+    assert.ok(exists("#change-email"), "it has the input element");
   });
 
   fillIn("#change-email", 'invalidemail');
 
   andThen(() => {
-    equal(find('.tip.bad').text().trim(), I18n.t('user.email.invalid'), 'it should display invalid email tip');
+    assert.equal(find('.tip.bad').text().trim(), I18n.t('user.email.invalid'), 'it should display invalid email tip');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6 b/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
index e21de0a31ec..5303d53cfe2 100644
--- a/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
+++ b/test/javascripts/acceptance/raw-plugin-outlet-test.js.es6
@@ -2,21 +2,21 @@ import { acceptance } from "helpers/qunit-helpers";
 
 const CONNECTOR = 'javascripts/raw-test/connectors/topic-list-before-status/lala';
 acceptance("Raw Plugin Outlet", {
-  setup() {
+  beforeEach() {
     Discourse.RAW_TEMPLATES[CONNECTOR] = Handlebars.compile(
       `<span class='topic-lala'>{{context.topic.id}}</span>`
     );
   },
 
-  teardown() {
+  afterEach() {
     delete Discourse.RAW_TEMPLATES[CONNECTOR];
   }
 });
 
-test("Renders the raw plugin outlet", assert => {
+QUnit.test("Renders the raw plugin outlet", assert => {
   visit("/");
   andThen(() => {
     assert.ok(find('.topic-lala').length > 0, 'it renders the outlet');
     assert.equal(find('.topic-lala:eq(0)').text(), '11557', 'it has the topic id');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js.es6
index d8050d72f4c..b978f8879d5 100644
--- a/test/javascripts/acceptance/search-full-test.js.es6
+++ b/test/javascripts/acceptance/search-full-test.js.es6
@@ -1,7 +1,7 @@
 import { acceptance, waitFor } from "helpers/qunit-helpers";
 acceptance("Search - Full Page", {
   settings: {tagging_enabled: true},
-  setup() {
+  beforeEach() {
     const response = (object) => {
       return [
         200,
@@ -39,12 +39,12 @@ acceptance("Search - Full Page", {
   }
 });
 
-test("perform various searches", assert => {
+QUnit.test("perform various searches", assert => {
   visit("/search");
 
   andThen(() => {
-    ok($('body.search-page').length, "has body class");
-    ok(exists('.search-container'), "has container class");
+    assert.ok($('body.search-page').length, "has body class");
+    assert.ok(exists('.search-container'), "has container class");
     assert.ok(find('input.search').length > 0);
     assert.ok(find('.fps-topic').length === 0);
   });
@@ -60,7 +60,7 @@ test("perform various searches", assert => {
   andThen(() => assert.ok(find('.fps-topic').length === 1, 'has one post'));
 });
 
-test("open advanced search", assert => {
+QUnit.test("open advanced search", assert => {
   visit("/search");
 
   andThen(() => assert.ok(exists('.search .search-advanced'), 'shows advanced search panel'));
@@ -95,7 +95,7 @@ test("open advanced search", assert => {
 //   });
 // });
 
-test("escape search term", (assert) => {
+QUnit.test("escape search term", (assert) => {
   visit("/search");
   fillIn('.search input.full-page-search', '@<script>prompt(1337)</script>gmail.com');
   click('.search-advanced-btn');
@@ -105,7 +105,7 @@ test("escape search term", (assert) => {
   });
 });
 
-test("update username through advanced search ui", assert => {
+QUnit.test("update username through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
@@ -114,7 +114,7 @@ test("update username through advanced search ui", assert => {
   keyEvent('.search-advanced-options .user-selector', 'keydown', 8);
 
   andThen(() => {
-    waitFor(() => {
+    waitFor(assert, () => {
       assert.ok(visible('.search-advanced-options .autocomplete'), '"autocomplete" popup is visible');
       assert.ok(exists('.search-advanced-options .autocomplete ul li a span.username:contains("admin")'), '"autocomplete" popup has an entry for "admin"');
 
@@ -128,7 +128,7 @@ test("update username through advanced search ui", assert => {
   });
 });
 
-test("update category through advanced search ui", assert => {
+QUnit.test("update category through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
@@ -209,7 +209,7 @@ test("update category through advanced search ui", assert => {
 //   });
 // });
 
-test("update in:likes filter through advanced search ui", assert => {
+QUnit.test("update in:likes filter through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
@@ -221,7 +221,7 @@ test("update in:likes filter through advanced search ui", assert => {
   });
 });
 
-test("update in:private filter through advanced search ui", assert => {
+QUnit.test("update in:private filter through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
@@ -233,7 +233,7 @@ test("update in:private filter through advanced search ui", assert => {
   });
 });
 
-test("update in:seen filter through advanced search ui", assert => {
+QUnit.test("update in:seen filter through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
@@ -248,7 +248,7 @@ test("update in:seen filter through advanced search ui", assert => {
   });
 });
 
-test("update in filter through advanced search ui", assert => {
+QUnit.test("update in filter through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
@@ -261,7 +261,7 @@ test("update in filter through advanced search ui", assert => {
   });
 });
 
-test("update status through advanced search ui", assert => {
+QUnit.test("update status through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
@@ -274,7 +274,7 @@ test("update status through advanced search ui", assert => {
   });
 });
 
-test("update post time through advanced search ui", assert => {
+QUnit.test("update post time through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
@@ -289,7 +289,7 @@ test("update post time through advanced search ui", assert => {
   });
 });
 
-test("update min post count through advanced search ui", assert => {
+QUnit.test("update min post count through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
@@ -301,7 +301,7 @@ test("update min post count through advanced search ui", assert => {
   });
 });
 
-test("validate advanced search when initially empty", assert => {
+QUnit.test("validate advanced search when initially empty", assert => {
   visit("/search?expanded=true");
   click('.search-advanced-options .in-likes');
 
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index b80552708bc..c3d6f11e81b 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -1,7 +1,7 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Search");
 
-test("search", (assert) => {
+QUnit.test("search", (assert) => {
   visit("/");
 
   click('#search-button');
@@ -25,29 +25,29 @@ test("search", (assert) => {
   });
 });
 
-test("search scope checkbox", () => {
+QUnit.test("search scope checkbox", assert => {
   visit("/c/bug");
   click('#search-button');
   andThen(() => {
-    ok(exists('.search-context input:checked'), 'scope to category checkbox is checked');
+    assert.ok(exists('.search-context input:checked'), 'scope to category checkbox is checked');
   });
   click('#search-button');
 
   visit("/t/internationalization-localization/280");
   click('#search-button');
   andThen(() => {
-    not(exists('.search-context input:checked'), 'scope to topic checkbox is not checked');
+    assert.not(exists('.search-context input:checked'), 'scope to topic checkbox is not checked');
   });
   click('#search-button');
 
   visit("/u/eviltrout");
   click('#search-button');
   andThen(() => {
-    ok(exists('.search-context input:checked'), 'scope to user checkbox is checked');
+    assert.ok(exists('.search-context input:checked'), 'scope to user checkbox is checked');
   });
 });
 
-test("Search with context", assert => {
+QUnit.test("Search with context", assert => {
   visit("/t/internationalization-localization/280/1");
 
   click('#search-button');
diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js.es6
index 21403770ba6..12d77228a59 100644
--- a/test/javascripts/acceptance/sign-in-test.js.es6
+++ b/test/javascripts/acceptance/sign-in-test.js.es6
@@ -1,11 +1,11 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Signing In");
 
-test("sign in", () => {
+QUnit.test("sign in", assert => {
   visit("/");
   click("header .login-button");
   andThen(() => {
-    ok(exists('.login-modal'), "it shows the login modal");
+    assert.ok(exists('.login-modal'), "it shows the login modal");
   });
 
   // Test invalid password first
@@ -13,48 +13,48 @@ test("sign in", () => {
   fillIn('#login-account-password', 'incorrect');
   click('.modal-footer .btn-primary');
   andThen(() => {
-    ok(exists('#modal-alert:visible'), 'it displays the login error');
-    not(exists('.modal-footer .btn-primary:disabled'), "enables the login button");
+    assert.ok(exists('#modal-alert:visible'), 'it displays the login error');
+    assert.not(exists('.modal-footer .btn-primary:disabled'), "enables the login button");
   });
 
   // Use the correct password
   fillIn('#login-account-password', 'correct');
   click('.modal-footer .btn-primary');
   andThen(() => {
-    ok(exists('.modal-footer .btn-primary:disabled'), "disables the login button");
+    assert.ok(exists('.modal-footer .btn-primary:disabled'), "disables the login button");
   });
 });
 
-test("sign in - not activated", () => {
+QUnit.test("sign in - not activated", assert => {
   visit("/");
   andThen(() => {
     click("header .login-button");
     andThen(() => {
-      ok(exists('.login-modal'), "it shows the login modal");
+      assert.ok(exists('.login-modal'), "it shows the login modal");
     });
 
     fillIn('#login-account-name', 'eviltrout');
     fillIn('#login-account-password', 'not-activated');
     click('.modal-footer .btn-primary');
     andThen(() => {
-      equal(find('.modal-body b').text(), '<small>eviltrout@example.com</small>');
-      ok(!exists('.modal-body small'), 'it escapes the email address');
+      assert.equal(find('.modal-body b').text(), '<small>eviltrout@example.com</small>');
+      assert.ok(!exists('.modal-body small'), 'it escapes the email address');
     });
 
     click('.modal-footer button.resend');
     andThen(() => {
-      equal(find('.modal-body b').text(), '<small>current@example.com</small>');
-      ok(!exists('.modal-body small'), 'it escapes the email address');
+      assert.equal(find('.modal-body b').text(), '<small>current@example.com</small>');
+      assert.ok(!exists('.modal-body small'), 'it escapes the email address');
     });
   });
 });
 
-test("sign in - not activated - edit email", () => {
+QUnit.test("sign in - not activated - edit email", assert => {
   visit("/");
   andThen(() => {
     click("header .login-button");
     andThen(() => {
-      ok(exists('.login-modal'), "it shows the login modal");
+      assert.ok(exists('.login-modal'), "it shows the login modal");
     });
 
     fillIn('#login-account-name', 'eviltrout');
@@ -62,27 +62,27 @@ test("sign in - not activated - edit email", () => {
     click('.modal-footer .btn-primary');
     click('.modal-footer button.edit-email');
     andThen(() => {
-      equal(find('.activate-new-email').val(), 'current@example.com');
-      equal(find('.modal-footer .btn-primary:disabled').length, 1, "must change email");
+      assert.equal(find('.activate-new-email').val(), 'current@example.com');
+      assert.equal(find('.modal-footer .btn-primary:disabled').length, 1, "must change email");
     });
     fillIn('.activate-new-email', 'different@example.com');
     andThen(() => {
-      equal(find('.modal-footer .btn-primary:disabled').length, 0);
+      assert.equal(find('.modal-footer .btn-primary:disabled').length, 0);
     });
     click(".modal-footer .btn-primary");
     andThen(() => {
-      equal(find('.modal-body b').text(), 'different@example.com');
+      assert.equal(find('.modal-body b').text(), 'different@example.com');
     });
   });
 });
 
-test("create account", () => {
+QUnit.test("create account", assert => {
   visit("/");
   click("header .sign-up-button");
 
   andThen(() => {
-    ok(exists('.create-account'), "it shows the create account modal");
-    ok(exists('.modal-footer .btn-primary:disabled'), 'create account is disabled at first');
+    assert.ok(exists('.create-account'), "it shows the create account modal");
+    assert.ok(exists('.modal-footer .btn-primary:disabled'), 'create account is disabled at first');
   });
 
   fillIn('#new-account-name', 'Dr. Good Tuna');
@@ -92,18 +92,18 @@ test("create account", () => {
   fillIn('#new-account-email', 'good.tuna@test.com');
   fillIn('#new-account-username', 'taken');
   andThen(() => {
-    ok(exists('#username-validation.bad'), 'the username validation is bad');
-    ok(exists('.modal-footer .btn-primary:disabled'), 'create account is still disabled');
+    assert.ok(exists('#username-validation.bad'), 'the username validation is bad');
+    assert.ok(exists('.modal-footer .btn-primary:disabled'), 'create account is still disabled');
   });
 
   fillIn('#new-account-username', 'goodtuna');
   andThen(() => {
-    ok(exists('#username-validation.good'), 'the username validation is good');
-    not(exists('.modal-footer .btn-primary:disabled'), 'create account is enabled');
+    assert.ok(exists('#username-validation.good'), 'the username validation is good');
+    assert.not(exists('.modal-footer .btn-primary:disabled'), 'create account is enabled');
   });
 
   click('.modal-footer .btn-primary');
   andThen(() => {
-    ok(exists('.modal-footer .btn-primary:disabled'), "create account is disabled");
+    assert.ok(exists('.modal-footer .btn-primary:disabled'), "create account is disabled");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/static-test.js.es6 b/test/javascripts/acceptance/static-test.js.es6
index 26bc4e594bc..97592dbd4a9 100644
--- a/test/javascripts/acceptance/static-test.js.es6
+++ b/test/javascripts/acceptance/static-test.js.es6
@@ -1,33 +1,33 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Static");
 
-test("Static Pages", () => {
+QUnit.test("Static Pages", assert => {
   visit("/faq");
   andThen(() => {
-    ok($('body.static-faq').length, "has the body class");
-    ok(exists(".body-page"), "The content is present");
+    assert.ok($('body.static-faq').length, "has the body class");
+    assert.ok(exists(".body-page"), "The content is present");
   });
 
   visit("/guidelines");
   andThen(() => {
-    ok($('body.static-guidelines').length, "has the body class");
-    ok(exists(".body-page"), "The content is present");
+    assert.ok($('body.static-guidelines').length, "has the body class");
+    assert.ok(exists(".body-page"), "The content is present");
   });
 
   visit("/tos");
   andThen(() => {
-    ok($('body.static-tos').length, "has the body class");
-    ok(exists(".body-page"), "The content is present");
+    assert.ok($('body.static-tos').length, "has the body class");
+    assert.ok(exists(".body-page"), "The content is present");
   });
 
   visit("/privacy");
   andThen(() => {
-    ok($('body.static-privacy').length, "has the body class");
-    ok(exists(".body-page"), "The content is present");
+    assert.ok($('body.static-privacy').length, "has the body class");
+    assert.ok(exists(".body-page"), "The content is present");
   });
 
   visit("/login");
   andThen(() => {
-    equal(currentPath(), "discovery.latest", "it redirects them to latest unless `login_required`");
+    assert.equal(currentPath(), "discovery.latest", "it redirects them to latest unless `login_required`");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/tag-hashtag-test.js.es6 b/test/javascripts/acceptance/tag-hashtag-test.js.es6
index e20c0afade6..559b9ff9269 100644
--- a/test/javascripts/acceptance/tag-hashtag-test.js.es6
+++ b/test/javascripts/acceptance/tag-hashtag-test.js.es6
@@ -3,7 +3,7 @@ import { acceptance } from "helpers/qunit-helpers";
 acceptance("Tag Hashtag", {
   loggedIn: true,
   settings: { tagging_enabled: true },
-  setup() {
+  beforeEach() {
     const response = (object) => {
       return [
         200,
@@ -26,18 +26,18 @@ acceptance("Tag Hashtag", {
   }
 });
 
-test("tag is cooked properly", () => {
+QUnit.test("tag is cooked properly", assert => {
   visit("/t/internationalization-localization/280");
   click('#topic-footer-buttons .btn.create');
 
   fillIn('.d-editor-input', "this is a tag hashtag #monkey::tag");
   andThen(() => {
     // TODO: Test that the autocomplete shows
-    equal(find('.d-editor-preview:visible').html().trim(), "<p>this is a tag hashtag <a href=\"/tags/monkey\" class=\"hashtag\">#<span>monkey</span></a></p>");
+    assert.equal(find('.d-editor-preview:visible').html().trim(), "<p>this is a tag hashtag <a href=\"/tags/monkey\" class=\"hashtag\">#<span>monkey</span></a></p>");
   });
 
   click('#reply-control .btn.create');
   andThen(() => {
-    equal(find('.topic-post:last .cooked').html().trim(), "<p>this is a tag hashtag <a href=\"/tags/monkey\" class=\"hashtag\">#<span>monkey</span></a></p>");
+    assert.equal(find('.topic-post:last .cooked').html().trim(), "<p>this is a tag hashtag <a href=\"/tags/monkey\" class=\"hashtag\">#<span>monkey</span></a></p>");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/tags-test.js.es6 b/test/javascripts/acceptance/tags-test.js.es6
index c24cbee8d18..ca7a745a94c 100644
--- a/test/javascripts/acceptance/tags-test.js.es6
+++ b/test/javascripts/acceptance/tags-test.js.es6
@@ -1,11 +1,11 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Tags", { loggedIn: true });
 
-test("list the tags", () => {
+QUnit.test("list the tags", assert => {
   visit("/tags");
 
   andThen(() => {
-    ok($('body.tags-page').length, "has the body class");
-    ok(exists('.tag-eviltrout'), "shows the evil trout tag");
+    assert.ok($('body.tags-page').length, "has the body class");
+    assert.ok(exists('.tag-eviltrout'), "shows the evil trout tag");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/topic-anonymous-test.js.es6 b/test/javascripts/acceptance/topic-anonymous-test.js.es6
index 831968a21c3..f077e99fca3 100644
--- a/test/javascripts/acceptance/topic-anonymous-test.js.es6
+++ b/test/javascripts/acceptance/topic-anonymous-test.js.es6
@@ -1,22 +1,22 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Topic - Anonymous");
 
-test("Enter a Topic", () => {
+QUnit.test("Enter a Topic", assert => {
   visit("/t/internationalization-localization/280/1");
   andThen(() => {
-    ok(exists("#topic"), "The topic was rendered");
-    ok(exists("#topic .cooked"), "The topic has cooked posts");
+    assert.ok(exists("#topic"), "The topic was rendered");
+    assert.ok(exists("#topic .cooked"), "The topic has cooked posts");
   });
 });
 
-test("Enter without an id", () => {
+QUnit.test("Enter without an id", assert => {
   visit("/t/internationalization-localization");
   andThen(() => {
-    ok(exists("#topic"), "The topic was rendered");
+    assert.ok(exists("#topic"), "The topic was rendered");
   });
 });
 
-test("Enter a 404 topic", assert => {
+QUnit.test("Enter a 404 topic", assert => {
   visit("/t/not-found/404");
   andThen(() => {
     assert.ok(!exists("#topic"), "The topic was not rendered");
@@ -24,7 +24,7 @@ test("Enter a 404 topic", assert => {
   });
 });
 
-test("Enter without access", assert => {
+QUnit.test("Enter without access", assert => {
   visit("/t/i-dont-have-access/403");
   andThen(() => {
     assert.ok(!exists("#topic"), "The topic was not rendered");
@@ -32,10 +32,10 @@ test("Enter without access", assert => {
   });
 });
 
-test("Enter with 500 errors", assert => {
+QUnit.test("Enter with 500 errors", assert => {
   visit("/t/throws-error/500");
   andThen(() => {
     assert.ok(!exists("#topic"), "The topic was not rendered");
     assert.ok(exists(".topic-error"), "An error message is displayed");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/topic-discovery-test.js.es6 b/test/javascripts/acceptance/topic-discovery-test.js.es6
index c0767e82829..458c3471a03 100644
--- a/test/javascripts/acceptance/topic-discovery-test.js.es6
+++ b/test/javascripts/acceptance/topic-discovery-test.js.es6
@@ -1,46 +1,46 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Topic Discovery");
 
-test("Visit Discovery Pages", () => {
+QUnit.test("Visit Discovery Pages", assert => {
   visit("/");
   andThen(() => {
-    ok($('body.navigation-topics').length, "has the default navigation");
-    ok(exists(".topic-list"), "The list of topics was rendered");
-    ok(exists('.topic-list .topic-list-item'), "has topics");
+    assert.ok($('body.navigation-topics').length, "has the default navigation");
+    assert.ok(exists(".topic-list"), "The list of topics was rendered");
+    assert.ok(exists('.topic-list .topic-list-item'), "has topics");
   });
 
   visit("/c/bug");
   andThen(() => {
-    ok(exists(".topic-list"), "The list of topics was rendered");
-    ok(exists('.topic-list .topic-list-item'), "has topics");
-    ok(!exists('.category-list'), "doesn't render subcategories");
-    ok($('body.category-bug').length, "has a custom css class for the category id on the body");
+    assert.ok(exists(".topic-list"), "The list of topics was rendered");
+    assert.ok(exists('.topic-list .topic-list-item'), "has topics");
+    assert.ok(!exists('.category-list'), "doesn't render subcategories");
+    assert.ok($('body.category-bug').length, "has a custom css class for the category id on the body");
   });
 
   visit("/categories");
   andThen(() => {
-    ok($('body.navigation-categories').length, "has the body class");
-    ok($('body.category-bug').length === 0, "removes the custom category class");
-    ok(exists('.category'), "has a list of categories");
-    ok($('body.categories-list').length, "has a custom class to indicate categories");
+    assert.ok($('body.navigation-categories').length, "has the body class");
+    assert.ok($('body.category-bug').length === 0, "removes the custom category class");
+    assert.ok(exists('.category'), "has a list of categories");
+    assert.ok($('body.categories-list').length, "has a custom class to indicate categories");
   });
 
   visit("/top");
   andThen(() => {
-    ok($('body.categories-list').length === 0, "removes the `categories-list` class");
-    ok(exists('.topic-list .topic-list-item'), "has topics");
+    assert.ok($('body.categories-list').length === 0, "removes the `categories-list` class");
+    assert.ok(exists('.topic-list .topic-list-item'), "has topics");
   });
 
   visit("/c/feature");
   andThen(() => {
-    ok(exists(".topic-list"), "The list of topics was rendered");
-    ok(exists(".category-boxes"), "The list of subcategories were rendered with box style");
+    assert.ok(exists(".topic-list"), "The list of topics was rendered");
+    assert.ok(exists(".category-boxes"), "The list of subcategories were rendered with box style");
   });
 
   visit("/c/dev");
   andThen(() => {
-    ok(exists(".topic-list"), "The list of topics was rendered");
-    ok(exists(".category-boxes-with-topics"), "The list of subcategories were rendered with box-with-featured-topics style");
-    ok(exists(".category-boxes-with-topics .featured-topics"), "The featured topics are there too");
+    assert.ok(exists(".topic-list"), "The list of topics was rendered");
+    assert.ok(exists(".category-boxes-with-topics"), "The list of subcategories were rendered with box-with-featured-topics style");
+    assert.ok(exists(".category-boxes-with-topics .featured-topics"), "The featured topics are there too");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js.es6 b/test/javascripts/acceptance/topic-notifications-button-test.js.es6
index 4689b86bb09..bb1c314a1c0 100644
--- a/test/javascripts/acceptance/topic-notifications-button-test.js.es6
+++ b/test/javascripts/acceptance/topic-notifications-button-test.js.es6
@@ -1,7 +1,7 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Topic Notifications button", {
   loggedIn: true,
-  setup() {
+  beforeEach() {
     const response = object => {
       return [
         200,
@@ -16,13 +16,13 @@ acceptance("Topic Notifications button", {
   }
 });
 
-test("Updating topic notification level", () => {
+QUnit.test("Updating topic notification level", assert => {
   visit("/t/internationalization-localization/280");
 
   const notificationOptions = "#topic-footer-buttons .notification-options";
 
   andThen(() => {
-    ok(
+    assert.ok(
       exists(`${notificationOptions} .tracking`),
       "it should display the notification options button in the topic's footer"
     );
@@ -32,7 +32,7 @@ test("Updating topic notification level", () => {
   click(`${notificationOptions} .dropdown-menu .watching`);
 
   andThen(() => {
-    ok(
+    assert.ok(
       exists(`${notificationOptions} .watching`),
       "it should display the right notification level"
     );
@@ -44,4 +44,4 @@ test("Updating topic notification level", () => {
     //   'it should display the right notification level in topic timeline'
     // );
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
index 10843ea1698..08b54bfd519 100644
--- a/test/javascripts/acceptance/topic-test.js.es6
+++ b/test/javascripts/acceptance/topic-test.js.es6
@@ -1,20 +1,20 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Topic", { loggedIn: true });
 
-test("Share Popup", () => {
+QUnit.test("Share Popup", assert => {
   visit("/t/internationalization-localization/280");
   andThen(() => {
-    ok(!exists('#share-link.visible'), 'it is not visible');
+    assert.ok(!exists('#share-link.visible'), 'it is not visible');
   });
 
   click("button[data-share-url]");
   andThen(() => {
-    ok(exists('#share-link.visible'), 'it shows the popup');
+    assert.ok(exists('#share-link.visible'), 'it shows the popup');
   });
 
   click('#share-link .close-share');
   andThen(() => {
-    ok(!exists('#share-link.visible'), 'it closes the popup');
+    assert.ok(!exists('#share-link.visible'), 'it closes the popup');
   });
 
   // TODO tgxworld This fails on Travis but we need to push the security fix out
@@ -30,23 +30,23 @@ test("Share Popup", () => {
   // });
 });
 
-test("Showing and hiding the edit controls", () => {
+QUnit.test("Showing and hiding the edit controls", assert => {
   visit("/t/internationalization-localization/280");
 
   click('#topic-title .fa-pencil');
 
   andThen(() => {
-    ok(exists('#edit-title'), 'it shows the editing controls');
+    assert.ok(exists('#edit-title'), 'it shows the editing controls');
   });
 
   fillIn('#edit-title', 'this is the new title');
   click('#topic-title .cancel-edit');
   andThen(() => {
-    ok(!exists('#edit-title'), 'it hides the editing controls');
+    assert.ok(!exists('#edit-title'), 'it hides the editing controls');
   });
 });
 
-test("Updating the topic title and category", () => {
+QUnit.test("Updating the topic title and category", assert => {
   visit("/t/internationalization-localization/280");
   click('#topic-title .fa-pencil');
 
@@ -56,12 +56,12 @@ test("Updating the topic title and category", () => {
   click('#topic-title .submit-edit');
 
   andThen(() => {
-    equal(find('#topic-title .badge-category').text(), 'faq', 'it displays the new category');
-    equal(find('.fancy-title').text().trim(), 'this is the new title', 'it displays the new title');
+    assert.equal(find('#topic-title .badge-category').text(), 'faq', 'it displays the new category');
+    assert.equal(find('.fancy-title').text().trim(), 'this is the new title', 'it displays the new title');
   });
 });
 
-test("Marking a topic as wiki", () => {
+QUnit.test("Marking a topic as wiki", assert => {
   server.put('/posts/398/wiki', () => { // eslint-disable-line no-undef
     return [
       200,
@@ -73,7 +73,7 @@ test("Marking a topic as wiki", () => {
   visit("/t/internationalization-localization/280");
 
   andThen(() => {
-    ok(find('a.wiki').length === 0, 'it does not show the wiki icon');
+    assert.ok(find('a.wiki').length === 0, 'it does not show the wiki icon');
   });
 
   click('.topic-post:eq(0) button.show-more-actions');
@@ -81,39 +81,39 @@ test("Marking a topic as wiki", () => {
   click('.btn.wiki');
 
   andThen(() => {
-    ok(find('a.wiki').length === 1, 'it shows the wiki icon');
+    assert.ok(find('a.wiki').length === 1, 'it shows the wiki icon');
   });
 });
 
-test("Reply as new topic", () => {
+QUnit.test("Reply as new topic", assert => {
   visit("/t/internationalization-localization/280");
   click("button.share:eq(0)");
   click(".reply-as-new-topic a");
 
   andThen(() => {
-    ok(exists('.d-editor-input'), 'the composer input is visible');
+    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
 
-    equal(
+    assert.equal(
       find('.d-editor-input').val().trim(),
       `Continuing the discussion from [Internationalization / localization](${window.location.origin}/t/internationalization-localization/280):`,
       "it fills composer with the ring string"
     );
-    equal(
+    assert.equal(
       find('.category-combobox').select2('data').text, "feature",
       "it fills category selector with the right category"
     );
   });
 });
 
-test("Reply as new message", () => {
+QUnit.test("Reply as new message", assert => {
   visit("/t/pm-for-testing/12");
   click("button.share:eq(0)");
   click(".reply-as-new-topic a");
 
   andThen(() => {
-    ok(exists('.d-editor-input'), 'the composer input is visible');
+    assert.ok(exists('.d-editor-input'), 'the composer input is visible');
 
-    equal(
+    assert.equal(
       find('.d-editor-input').val().trim(),
       `Continuing the discussion from [PM for testing](${window.location.origin}/t/pm-for-testing/12):`,
       "it fills composer with the ring string"
@@ -121,19 +121,32 @@ test("Reply as new message", () => {
 
     const targets = find('.item span', '.composer-fields');
 
-    equal(
+    assert.equal(
       $(targets[0]).text(), "someguy",
       "it fills up the composer with the right user to start the PM to"
     );
 
-    equal(
+    assert.equal(
       $(targets[1]).text(), "test",
       "it fills up the composer with the right user to start the PM to"
     );
 
-    equal(
+    assert.equal(
       $(targets[2]).text(), "Group",
       "it fills up the composer with the right group to start the PM to"
     );
   });
 });
+
+QUnit.test("Updating the topic title with emojis", assert => {
+  visit("/t/internationalization-localization/280");
+  click('#topic-title .fa-pencil');
+
+  fillIn('#edit-title', 'emojis title :bike: :blonde_woman:t6:');
+
+  click('#topic-title .submit-edit');
+
+  andThen(() => {
+    assert.equal(find('.fancy-title').html().trim(), 'emojis title <img src=\"/images/emoji/emoji_one/bike.png?v=5\" title=\"bike\" alt=\"bike\" class=\"emoji\"> <img src=\"/images/emoji/emoji_one/blonde_woman/6.png?v=5\" title=\"blonde_woman:t6\" alt=\"blonde_woman:t6\" class=\"emoji\">', 'it displays the new title with emojis');
+  });
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/unknown-test.js.es6 b/test/javascripts/acceptance/unknown-test.js.es6
index 148d8d2eefd..541df10e1f0 100644
--- a/test/javascripts/acceptance/unknown-test.js.es6
+++ b/test/javascripts/acceptance/unknown-test.js.es6
@@ -1,10 +1,10 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("Unknown");
 
-test("Unknown URL", () => {
-  expect(1);
+QUnit.test("Unknown URL", assert => {
+  assert.expect(1);
   visit("/url-that-doesn't-exist");
   andThen(() => {
-    ok(exists(".page-not-found"), "The not found content is present");
+    assert.ok(exists(".page-not-found"), "The not found content is present");
   });
 });
diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js.es6
index ae9b7c149f4..91f3c62c758 100644
--- a/test/javascripts/acceptance/user-anonymous-test.js.es6
+++ b/test/javascripts/acceptance/user-anonymous-test.js.es6
@@ -1,54 +1,54 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("User Anonymous");
 
-export function hasStream() {
+function hasStream(assert) {
   andThen(() => {
-    ok(exists('.user-main .about'), 'it has the about section');
-    ok(count('.user-stream .item') > 0, 'it has stream items');
+    assert.ok(exists('.user-main .about'), 'it has the about section');
+    assert.ok(count('.user-stream .item') > 0, 'it has stream items');
   });
 }
 
-function hasTopicList() {
+function hasTopicList(assert) {
   andThen(() => {
-    equal(count('.user-stream .item'), 0, "has no stream displayed");
-    ok(count('.topic-list tr') > 0, 'it has a topic list');
+    assert.equal(count('.user-stream .item'), 0, "has no stream displayed");
+    assert.ok(count('.topic-list tr') > 0, 'it has a topic list');
   });
 }
 
-test("Root URL", () => {
+QUnit.test("Root URL", assert => {
   visit("/u/eviltrout");
   andThen(() => {
-    ok($('body.user-summary-page').length, "has the body class");
-    equal(currentPath(), 'user.summary', "it defaults to summary");
+    assert.ok($('body.user-summary-page').length, "has the body class");
+    assert.equal(currentPath(), 'user.summary', "it defaults to summary");
   });
 });
 
-test("Filters", () => {
+QUnit.test("Filters", assert => {
   visit("/u/eviltrout/activity");
   andThen(() => {
-    ok($('body.user-activity-page').length, "has the body class");
+    assert.ok($('body.user-activity-page').length, "has the body class");
   });
-  hasStream();
+  hasStream(assert);
 
   visit("/u/eviltrout/activity/topics");
-  hasTopicList();
+  hasTopicList(assert);
 
   visit("/u/eviltrout/activity/replies");
-  hasStream();
+  hasStream(assert);
 });
 
-test("Badges", () => {
+QUnit.test("Badges", assert => {
   visit("/u/eviltrout/badges");
   andThen(() => {
-    ok($('body.user-badges-page').length, "has the body class");
-    ok(exists(".user-badges-list .badge-card"), "shows a badge");
+    assert.ok($('body.user-badges-page').length, "has the body class");
+    assert.ok(exists(".user-badges-list .badge-card"), "shows a badge");
   });
 });
 
-test("Restricted Routes", () => {
+QUnit.test("Restricted Routes", assert => {
   visit("/u/eviltrout/preferences");
 
   andThen(() => {
-    equal(currentURL(), '/u/eviltrout/activity', "it redirects from preferences");
+    assert.equal(currentURL(), '/u/eviltrout/activity', "it redirects from preferences");
   });
 });
diff --git a/test/javascripts/acceptance/user-card-test.js.es6 b/test/javascripts/acceptance/user-card-test.js.es6
index 4a4d7288bfd..e19d96836b7 100644
--- a/test/javascripts/acceptance/user-card-test.js.es6
+++ b/test/javascripts/acceptance/user-card-test.js.es6
@@ -1,14 +1,14 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("User Card");
 
-test("card", () => {
+QUnit.test("card", assert => {
   visit('/');
 
-  ok(invisible('#user-card'), 'user card is invisible by default');
+  assert.ok(invisible('#user-card'), 'user card is invisible by default');
   click('a[data-user-card=eviltrout]:first');
 
   andThen(() => {
-    ok(visible('#user-card'), 'card should appear');
+    assert.ok(visible('#user-card'), 'card should appear');
   });
 
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6
index 84269cbe08c..22759a7ee7e 100644
--- a/test/javascripts/acceptance/user-test.js.es6
+++ b/test/javascripts/acceptance/user-test.js.es6
@@ -2,32 +2,32 @@ import { acceptance } from "helpers/qunit-helpers";
 
 acceptance("User", {loggedIn: true});
 
-test("Invites", () => {
+QUnit.test("Invites", assert => {
   visit("/u/eviltrout/invited/pending");
   andThen(() => {
-    ok($('body.user-invites-page').length, "has the body class");
+    assert.ok($('body.user-invites-page').length, "has the body class");
   });
 });
 
-test("Messages", () => {
+QUnit.test("Messages", assert => {
   visit("/u/eviltrout/messages");
   andThen(() => {
-    ok($('body.user-messages-page').length, "has the body class");
+    assert.ok($('body.user-messages-page').length, "has the body class");
   });
 });
 
-test("Notifications", () => {
+QUnit.test("Notifications", assert => {
   visit("/u/eviltrout/notifications");
   andThen(() => {
-    ok($('body.user-notifications-page').length, "has the body class");
+    assert.ok($('body.user-notifications-page').length, "has the body class");
   });
 });
 
-test("Root URL - Viewing Self", () => {
+QUnit.test("Root URL - Viewing Self", assert => {
   visit("/u/eviltrout");
   andThen(() => {
-    ok($('body.user-activity-page').length, "has the body class");
-    equal(currentPath(), 'user.userActivity.index', "it defaults to activity");
-    ok(exists('.container.viewing-self'), "has the viewing-self class");
+    assert.ok($('body.user-activity-page').length, "has the body class");
+    assert.equal(currentPath(), 'user.userActivity.index', "it defaults to activity");
+    assert.ok(exists('.container.viewing-self'), "has the viewing-self class");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/acceptance/users-test.js.es6 b/test/javascripts/acceptance/users-test.js.es6
index eb89741d252..427225a774e 100644
--- a/test/javascripts/acceptance/users-test.js.es6
+++ b/test/javascripts/acceptance/users-test.js.es6
@@ -1,17 +1,17 @@
 import { acceptance } from "helpers/qunit-helpers";
 acceptance("User Directory");
 
-test("Visit Page", function() {
+QUnit.test("Visit Page", assert => {
   visit("/users");
   andThen(() => {
-    ok($('body.users-page').length, "has the body class");
-    ok(exists('.directory table tr'), "has a list of users");
+    assert.ok($('body.users-page').length, "has the body class");
+    assert.ok(exists('.directory table tr'), "has a list of users");
   });
 });
 
-test("Visit All Time", function() {
+QUnit.test("Visit All Time", assert => {
   visit("/users?period=all");
   andThen(() => {
-    ok(exists('.time-read'), "has time read column");
+    assert.ok(exists('.time-read'), "has time read column");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6 b/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
index 2c70b5b12fc..41468970937 100644
--- a/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-customize-themes-test.js.es6
@@ -2,13 +2,13 @@ import { mapRoutes } from 'discourse/mapping-router';
 import Theme from 'admin/models/theme';
 
 moduleFor('controller:admin-customize-themes', {
-  setup() {
+  beforeEach() {
     this.registry.register('router:main', mapRoutes());
   },
   needs: ['controller:adminUser']
 });
 
-test("can list sorted themes", function() {
+QUnit.test("can list sorted themes", function(assert) {
 
   const defaultTheme = Theme.create({id: 2, 'default': true, name: 'default'});
   const userTheme = Theme.create({id: 3, 'user_selectable': true, name: 'name'});
@@ -23,7 +23,7 @@ test("can list sorted themes", function() {
   });
 
 
-  deepEqual(controller.get('sortedThemes').map(t=>t.get('name')), [
+  assert.deepEqual(controller.get('sortedThemes').map(t=>t.get('name')), [
     defaultTheme,
     userTheme,
     strayTheme1,
diff --git a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6 b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
index f58845ecfc0..112ef64d041 100644
--- a/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
+++ b/test/javascripts/admin/controllers/admin-user-badges-test.js.es6
@@ -2,13 +2,13 @@ import Badge from 'discourse/models/badge';
 import { mapRoutes } from 'discourse/mapping-router';
 
 moduleFor('controller:admin-user-badges', {
-  setup() {
+  beforeEach() {
     this.registry.register('router:main', mapRoutes());
   },
   needs: ['controller:adminUser']
 });
 
-test("grantableBadges", function() {
+QUnit.test("grantableBadges", function(assert) {
   const badgeFirst = Badge.create({id: 3, name: "A Badge", enabled: true});
   const badgeMiddle = Badge.create({id: 1, name: "My Badge", enabled: true});
   const badgeLast = Badge.create({id: 2, name: "Zoo Badge", enabled: true});
@@ -20,6 +20,6 @@ test("grantableBadges", function() {
   });
 
 
-  not(badgeNames.includes(badgeDisabled), "excludes disabled badges");
-  deepEqual(badgeNames, sortedNames, "sorts badges by name");
+  assert.not(badgeNames.includes(badgeDisabled), "excludes disabled badges");
+  assert.deepEqual(badgeNames, sortedNames, "sorts badges by name");
 });
diff --git a/test/javascripts/admin/models/admin-user-test.js.es6 b/test/javascripts/admin/models/admin-user-test.js.es6
index e735ec9456c..161a8be373b 100644
--- a/test/javascripts/admin/models/admin-user-test.js.es6
+++ b/test/javascripts/admin/models/admin-user-test.js.es6
@@ -1,20 +1,19 @@
-import { blank, present } from 'helpers/qunit-helpers';
 import AdminUser from 'admin/models/admin-user';
 import ApiKey from 'admin/models/api-key';
 
-module("model:admin-user");
+QUnit.module("model:admin-user");
 
-test('generate key', function(assert) {
+QUnit.test('generate key', function(assert) {
   assert.expect(2);
 
   var adminUser = AdminUser.create({id: 333});
   assert.ok(!adminUser.get('api_key'), 'it has no api key by default');
   return adminUser.generateApiKey().then(function() {
-    present(adminUser.get('api_key'), 'it has an api_key now');
+    assert.present(adminUser.get('api_key'), 'it has an api_key now');
   });
 });
 
-test('revoke key', function(assert) {
+QUnit.test('revoke key', function(assert) {
   assert.expect(2);
 
   var apiKey = ApiKey.create({id: 1234, key: 'asdfasdf'}),
@@ -22,6 +21,6 @@ test('revoke key', function(assert) {
 
   assert.equal(adminUser.get('api_key'), apiKey, 'it has the api key in the beginning');
   return adminUser.revokeApiKey().then(function() {
-    blank(adminUser.get('api_key'), 'it cleared the api_key');
+    assert.blank(adminUser.get('api_key'), 'it cleared the api_key');
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/admin/models/theme-test.js.es6 b/test/javascripts/admin/models/theme-test.js.es6
index 88d9d62947e..4a16c584c85 100644
--- a/test/javascripts/admin/models/theme-test.js.es6
+++ b/test/javascripts/admin/models/theme-test.js.es6
@@ -1,8 +1,8 @@
 import Theme from 'admin/models/theme';
 
-module("model:theme");
+QUnit.module("model:theme");
 
-test('can add an upload correctly', function(assert) {
+QUnit.test('can add an upload correctly', function(assert) {
   let theme = Theme.create();
 
   assert.equal(theme.get("uploads.length"), 0, "uploads should be an empty array");
@@ -14,4 +14,4 @@ test('can add an upload correctly', function(assert) {
   assert.equal(fields[0].type_id, 2, 'expecting type id to be set');
 
   assert.equal(theme.get("uploads.length"), 1, "expecting an upload");
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/components/ace-editor-test.js.es6 b/test/javascripts/components/ace-editor-test.js.es6
index 76aa436ff3a..4a05e6f83e2 100644
--- a/test/javascripts/components/ace-editor-test.js.es6
+++ b/test/javascripts/components/ace-editor-test.js.es6
@@ -5,7 +5,7 @@ moduleForComponent('ace-editor', {integration: true});
 componentTest('css editor', {
   template: '{{ace-editor mode="css"}}',
   test(assert) {
-    expect(1);
+    assert.expect(1);
     assert.ok(this.$('.ace_editor').length, 'it renders the ace editor');
   }
 });
@@ -13,7 +13,7 @@ componentTest('css editor', {
 componentTest('html editor', {
   template: '{{ace-editor mode="html" content="<b>wat</b>"}}',
   test(assert) {
-    expect(1);
+    assert.expect(1);
     assert.ok(this.$('.ace_editor').length, 'it renders the ace editor');
   }
 });
diff --git a/test/javascripts/components/combo-box-test.js.es6 b/test/javascripts/components/combo-box-test.js.es6
index 39232362ffb..285d817e3a7 100644
--- a/test/javascripts/components/combo-box-test.js.es6
+++ b/test/javascripts/components/combo-box-test.js.es6
@@ -3,7 +3,7 @@ moduleForComponent('combo-box', {integration: true});
 
 componentTest('with objects', {
   template: '{{combo-box content=items value=value}}',
-  setup() {
+  beforeEach() {
     this.set('items', [{id: 1, name: 'hello'}, {id: 2, name: 'world'}]);
   },
 
@@ -17,7 +17,7 @@ componentTest('with objects', {
 
 componentTest('with objects and valueAttribute', {
   template: '{{combo-box content=items valueAttribute="value"}}',
-  setup() {
+  beforeEach() {
     this.set('items', [{value: 0, name: 'hello'}, {value: 1, name: 'world'}]);
   },
 
@@ -30,7 +30,7 @@ componentTest('with objects and valueAttribute', {
 
 componentTest('with an array', {
   template: '{{combo-box content=items value=value}}',
-  setup() {
+  beforeEach() {
     this.set('items', ['evil', 'trout', 'hat']);
   },
 
@@ -44,7 +44,7 @@ componentTest('with an array', {
 
 componentTest('with none', {
   template: '{{combo-box content=items none="test.none" value=value}}',
-  setup() {
+  beforeEach() {
     I18n.translations[I18n.locale].js.test = {none: 'none'};
     this.set('items', ['evil', 'trout', 'hat']);
   },
@@ -59,7 +59,7 @@ componentTest('with none', {
 
 componentTest('with Object none', {
   template: '{{combo-box content=items none=none value=value selected="something"}}',
-  setup() {
+  beforeEach() {
     this.set('none', { id: 'something', name: 'none' });
     this.set('items', ['evil', 'trout', 'hat']);
   },
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index cddd81828d7..8bc3b0d09d8 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -21,7 +21,7 @@ componentTest('preview sanitizes HTML', {
   template: '{{d-editor value=value}}',
 
   test(assert) {
-    this.set('value', `"><svg onload="prompt(/xss/)"></svg>`);
+    fillIn('.d-editor-input', `"><svg onload="prompt(/xss/)"></svg>`);
     andThen(() => {
       assert.equal(this.$('.d-editor-preview').html().trim(), '<p>\"&gt;</p>');
     });
@@ -31,7 +31,7 @@ componentTest('preview sanitizes HTML', {
 componentTest('updating the value refreshes the preview', {
   template: '{{d-editor value=value}}',
 
-  setup() {
+  beforeEach() {
     this.set('value', 'evil trout');
   },
 
@@ -52,7 +52,7 @@ function jumpEnd(textarea) {
 function testCase(title, testFunc) {
   componentTest(title, {
     template: '{{d-editor value=value}}',
-    setup() {
+    beforeEach() {
       this.set('value', 'hello world.');
     },
     test(assert) {
@@ -65,7 +65,7 @@ function testCase(title, testFunc) {
 function composerTestCase(title, testFunc) {
   componentTest(title, {
     template: '{{d-editor value=value composerEvents=true}}',
-    setup() {
+    beforeEach() {
       this.set('value', 'hello world.');
     },
     test(assert) {
@@ -269,7 +269,7 @@ testCase('link modal (link with description)', function(assert) {
 
 componentTest('advanced code', {
   template: '{{d-editor value=value}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.code_formatting_style = '4-spaces-indent';
     this.set('value',
 `
@@ -304,7 +304,7 @@ function xyz(x, y, z) {
 
 componentTest('code button', {
   template: '{{d-editor value=value}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.code_formatting_style = '4-spaces-indent';
   },
 
@@ -406,7 +406,7 @@ third line`
 
 componentTest('code fences', {
   template: '{{d-editor value=value}}',
-  setup() {
+  beforeEach() {
     this.set('value', '');
   },
 
@@ -514,30 +514,64 @@ third line`
 });
 
 
+componentTest("quote button - empty lines", {
+  template: '{{d-editor value=value composerEvents=true}}',
+  beforeEach() {
+    this.set('value', "one\n\ntwo\n\nthree");
+  },
+  test(assert) {
+    const textarea = jumpEnd(this.$('textarea.d-editor-input')[0]);
+
+    andThen(() => {
+      textarea.selectionStart = 0;
+    });
+
+    click('button.quote');
+    andThen(() => {
+      assert.equal(this.get('value'), "> one\n> \n> two\n> \n> three");
+      assert.equal(textarea.selectionStart, 0);
+      assert.equal(textarea.selectionEnd, 25);
+    });
+
+    click('button.quote');
+    andThen(() => {
+      assert.equal(this.get('value'), "one\n\ntwo\n\nthree");
+    });
+  }
+});
+
 testCase('quote button', function(assert, textarea) {
-  click('button.quote');
-  andThen(() => {
-    assert.equal(this.get('value'), 'hello world.');
-  });
 
   andThen(() => {
     textarea.selectionStart = 6;
-    textarea.selectionEnd = 11;
+    textarea.selectionEnd = 9;
   });
 
   click('button.quote');
   andThen(() => {
-    assert.equal(this.get('value'), 'hello > world.');
-    assert.equal(textarea.selectionStart, 6);
-    assert.equal(textarea.selectionEnd, 13);
+    assert.equal(this.get('value'), 'hello\n\n> wor\n\nld.');
+    assert.equal(textarea.selectionStart, 7);
+    assert.equal(textarea.selectionEnd, 12);
+  });
+
+  click('button.quote');
+
+  andThen(() => {
+    assert.equal(this.get('value'), 'hello\n\nwor\n\nld.');
+    assert.equal(textarea.selectionStart, 7);
+    assert.equal(textarea.selectionEnd, 10);
+  });
+
+  andThen(() => {
+    textarea.selectionStart = 15;
+    textarea.selectionEnd = 15;
   });
 
   click('button.quote');
   andThen(() => {
-    assert.equal(this.get('value'), 'hello world.');
-    assert.equal(textarea.selectionStart, 6);
-    assert.equal(textarea.selectionEnd, 11);
+    assert.equal(this.get('value'), 'hello\n\nwor\n\nld.\n\n> Blockquote');
   });
+
 });
 
 testCase(`bullet button with no selection`, function(assert, textarea) {
@@ -740,7 +774,7 @@ testCase(`doesn't jump to bottom with long text`, function(assert, textarea) {
 
 componentTest('emoji', {
   template: '{{d-editor value=value}}',
-  setup() {
+  beforeEach() {
     // Test adding a custom button
     withPluginApi('0.1', api => {
       api.onToolbarCreate(toolbar => {
@@ -755,19 +789,11 @@ componentTest('emoji', {
     this.set('value', 'hello world.');
   },
   test(assert) {
-    assert.equal($('.emoji-modal').length, 0);
-
     jumpEnd(this.$('textarea.d-editor-input')[0]);
     click('button.emoji');
-    andThen(() => {
-      assert.equal($('.emoji-modal').length, 1);
-    });
-
-    click('a[data-group-id=0]');
-    click('a[title=grinning]');
 
+    click('.emoji-picker .section[data-section="people"] button.emoji[title="grinning"]');
     andThen(() => {
-      assert.ok($('.emoji-modal').length === 0);
       assert.equal(this.get('value'), 'hello world.:grinning:');
     });
   }
diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js.es6
index 930b7270b4f..9f404c151b5 100644
--- a/test/javascripts/components/group-membership-button-test.js.es6
+++ b/test/javascripts/components/group-membership-button-test.js.es6
@@ -1,48 +1,48 @@
 moduleFor('component:group-membership-button');
 
-test('canJoinGroup', function() {
+QUnit.test('canJoinGroup', function(assert) {
   this.subject().setProperties({
     model: { public: false }
   });
 
-  equal(this.subject().get("canJoinGroup"), false, "non public group cannot be joined");
+  assert.equal(this.subject().get("canJoinGroup"), false, "non public group cannot be joined");
 
   this.subject().set("model.public", true);
 
-  equal(this.subject().get("canJoinGroup"), true, "public group can be joined");
+  assert.equal(this.subject().get("canJoinGroup"), true, "public group can be joined");
 
   this.subject().setProperties({ currentUser: null, model: { public: true } });
 
-  equal(this.subject().get("canJoinGroup"), true, "can't join group when not logged in");
+  assert.equal(this.subject().get("canJoinGroup"), true, "can't join group when not logged in");
 });
 
-test('userIsGroupUser', function() {
+QUnit.test('userIsGroupUser', function(assert) {
   this.subject().setProperties({
     model: { is_group_user: true }
   });
 
-  equal(this.subject().get('userIsGroupUser'), true);
+  assert.equal(this.subject().get('userIsGroupUser'), true);
 
   this.subject().set('model.is_group_user', false);
 
-  equal(this.subject().get('userIsGroupUser'), false);
+  assert.equal(this.subject().get('userIsGroupUser'), false);
 
   this.subject().setProperties({ model: { id: 1 }, groupUserIds: [1] });
 
-  equal(this.subject().get('userIsGroupUser'), true);
+  assert.equal(this.subject().get('userIsGroupUser'), true);
 
   this.subject().set('groupUserIds', [3]);
 
-  equal(this.subject().get('userIsGroupUser'), false);
+  assert.equal(this.subject().get('userIsGroupUser'), false);
 
   this.subject().set('groupUserIds', undefined);
 
-  equal(this.subject().get('userIsGroupUser'), false);
+  assert.equal(this.subject().get('userIsGroupUser'), false);
 
   this.subject().setProperties({
     groupUserIds: [1, 3],
     model: { id: 1, is_group_user: false }
   });
 
-  equal(this.subject().get('userIsGroupUser'), false);
+  assert.equal(this.subject().get('userIsGroupUser'), false);
 });
diff --git a/test/javascripts/components/keyboard-shortcuts-test.js.es6 b/test/javascripts/components/keyboard-shortcuts-test.js.es6
index 745a8f3c246..642f35d5432 100644
--- a/test/javascripts/components/keyboard-shortcuts-test.js.es6
+++ b/test/javascripts/components/keyboard-shortcuts-test.js.es6
@@ -3,8 +3,8 @@ import DiscourseURL from 'discourse/lib/url';
 var testMouseTrap;
 import KeyboardShortcuts from 'discourse/lib/keyboard-shortcuts';
 
-module("lib:keyboard-shortcuts", {
-  setup: function() {
+QUnit.module("lib:keyboard-shortcuts", {
+  beforeEach() {
     var _bindings = {};
 
     testMouseTrap = {
@@ -62,7 +62,7 @@ module("lib:keyboard-shortcuts", {
     ].join("\n"));
   },
 
-  teardown: function() {
+  afterEach() {
     $("#qunit-scratch").html("");
   }
 });
@@ -72,11 +72,11 @@ var pathBindings = KeyboardShortcuts.PATH_BINDINGS;
 _.each(pathBindings, function(path, binding) {
   var testName = binding + " goes to " + path;
 
-  test(testName, function() {
+  test(testName, function(assert) {
     KeyboardShortcuts.bindEvents(testMouseTrap);
     testMouseTrap.trigger(binding);
 
-    ok(DiscourseURL.routeTo.calledWith(path));
+    assert.ok(DiscourseURL.routeTo.calledWith(path));
   });
 });
 
@@ -87,10 +87,10 @@ _.each(clickBindings, function(selector, binding) {
 
   var testName = binding + " clicks on " + selector;
 
-  test(testName, function() {
+  test(testName, function(assert) {
     KeyboardShortcuts.bindEvents(testMouseTrap);
     $(selector).on("click", function() {
-      ok(true, selector + " was clicked");
+      assert.ok(true, selector + " was clicked");
     });
 
     _.each(bindings, function(b) {
@@ -104,9 +104,9 @@ var functionBindings = KeyboardShortcuts.FUNCTION_BINDINGS;
 _.each(functionBindings, function(func, binding) {
   var testName = binding + " calls " + func;
 
-  test(testName, function() {
+  test(testName, function(assert) {
     sandbox.stub(KeyboardShortcuts, func, function() {
-      ok(true, func + " is called when " + binding + " is triggered");
+      assert.ok(true, func + " is called when " + binding + " is triggered");
     });
     KeyboardShortcuts.bindEvents(testMouseTrap);
 
@@ -114,40 +114,40 @@ _.each(functionBindings, function(func, binding) {
   });
 });
 
-test("selectDown calls _moveSelection with 1", function() {
+QUnit.test("selectDown calls _moveSelection with 1", assert => {
   var spy = sandbox.spy(KeyboardShortcuts, '_moveSelection');
 
   KeyboardShortcuts.selectDown();
-  ok(spy.calledWith(1), "_moveSelection is called with 1");
+  assert.ok(spy.calledWith(1), "_moveSelection is called with 1");
 });
 
-test("selectUp calls _moveSelection with -1", function() {
+QUnit.test("selectUp calls _moveSelection with -1", assert => {
   var spy = sandbox.spy(KeyboardShortcuts, '_moveSelection');
 
   KeyboardShortcuts.selectUp();
-  ok(spy.calledWith(-1), "_moveSelection is called with -1");
+  assert.ok(spy.calledWith(-1), "_moveSelection is called with -1");
 });
 
-test("goBack calls history.back", function() {
+QUnit.test("goBack calls history.back", assert => {
   var called = false;
   sandbox.stub(history, 'back', function() {
     called = true;
   });
 
   KeyboardShortcuts.goBack();
-  ok(called, "history.back is called");
+  assert.ok(called, "history.back is called");
 });
 
-test("nextSection calls _changeSection with 1", function() {
+QUnit.test("nextSection calls _changeSection with 1", assert => {
   var spy = sandbox.spy(KeyboardShortcuts, '_changeSection');
 
   KeyboardShortcuts.nextSection();
-  ok(spy.calledWith(1), "_changeSection is called with 1");
+  assert.ok(spy.calledWith(1), "_changeSection is called with 1");
 });
 
-test("prevSection calls _changeSection with -1", function() {
+QUnit.test("prevSection calls _changeSection with -1", assert => {
   var spy = sandbox.spy(KeyboardShortcuts, '_changeSection');
 
   KeyboardShortcuts.prevSection();
-  ok(spy.calledWith(-1), "_changeSection is called with -1");
+  assert.ok(spy.calledWith(-1), "_changeSection is called with -1");
 });
diff --git a/test/javascripts/components/text-field-test.js.es6 b/test/javascripts/components/text-field-test.js.es6
index 81b0660052b..e18662c2ab9 100644
--- a/test/javascripts/components/text-field-test.js.es6
+++ b/test/javascripts/components/text-field-test.js.es6
@@ -13,7 +13,7 @@ componentTest("renders correctly with no properties set", {
 componentTest("support a placeholder", {
   template: `{{text-field placeholderKey="placeholder.i18n.key"}}`,
 
-  setup() {
+  beforeEach() {
     sandbox.stub(I18n, "t").returnsArg(0);
   },
 
diff --git a/test/javascripts/components/value-list-test.js.es6 b/test/javascripts/components/value-list-test.js.es6
index 7bb9599eece..feefcbea079 100644
--- a/test/javascripts/components/value-list-test.js.es6
+++ b/test/javascripts/components/value-list-test.js.es6
@@ -30,7 +30,7 @@ componentTest('functionality', {
 
 componentTest('with string delimited values', {
   template: '{{value-list values=valueString}}',
-  setup() {
+  beforeEach() {
     this.set('valueString', "hello\nworld");
   },
 
@@ -49,7 +49,7 @@ componentTest('with string delimited values', {
 
 componentTest('with array values', {
   template: '{{value-list values=valueArray inputType="array"}}',
-  setup() {
+  beforeEach() {
     this.set('valueArray', ['abc', 'def']);
   },
 
diff --git a/test/javascripts/controllers/admin-group-test.js.es6 b/test/javascripts/controllers/admin-group-test.js.es6
index e80e50d6f3c..b03ddf7422b 100644
--- a/test/javascripts/controllers/admin-group-test.js.es6
+++ b/test/javascripts/controllers/admin-group-test.js.es6
@@ -1,33 +1,35 @@
-moduleFor("controller:admin-group");
+moduleFor("controller:admin-group", {
+  needs: ['controller:adminGroupsType']
+});
 
-test("disablePublicSetting", function() {
+QUnit.test("disablePublicSetting", function(assert) {
   this.subject().setProperties({
-    model: { visible: false, allow_membership_requests: false }
+    model: { visibility_level: 1, allow_membership_requests: false }
   });
 
-  equal(this.subject().get("disablePublicSetting"), true, "it should disable setting");
+  assert.equal(this.subject().get("disablePublicSetting"), true, "it should disable setting");
 
-  this.subject().set("model.visible", true);
+  this.subject().set("model.visibility_level", 0);
 
-  equal(this.subject().get("disablePublicSetting"), false, "it should enable setting");
+  assert.equal(this.subject().get("disablePublicSetting"), false, "it should enable setting");
 
   this.subject().set("model.allow_membership_requests", true);
 
-  equal(this.subject().get("disablePublicSetting"), true, "it should disable setting");
+  assert.equal(this.subject().get("disablePublicSetting"), true, "it should disable setting");
 });
 
-test("disableMembershipRequestSetting", function() {
+QUnit.test("disableMembershipRequestSetting", function(assert) {
   this.subject().setProperties({
-    model: { visible: false, public: false, canEveryoneMention: true }
+    model: { visibility_level: 1, public: false, canEveryoneMention: true }
   });
 
-  equal(this.subject().get("disableMembershipRequestSetting"), true, "it should disable setting");
+  assert.equal(this.subject().get("disableMembershipRequestSetting"), true, "it should disable setting");
 
-  this.subject().set("model.visible", true);
+  this.subject().set("model.visibility_level", 0);
 
-  equal(this.subject().get("disableMembershipRequestSetting"), false, "it should enable setting");
+  assert.equal(this.subject().get("disableMembershipRequestSetting"), false, "it should enable setting");
 
   this.subject().set("model.public", true);
 
-  equal(this.subject().get("disableMembershipRequestSetting"), true, "it should disalbe setting");
+  assert.equal(this.subject().get("disableMembershipRequestSetting"), true, "it should disalbe setting");
 });
diff --git a/test/javascripts/controllers/avatar-selector-test.js.es6 b/test/javascripts/controllers/avatar-selector-test.js.es6
index 00514303f48..ce26c62163f 100644
--- a/test/javascripts/controllers/avatar-selector-test.js.es6
+++ b/test/javascripts/controllers/avatar-selector-test.js.es6
@@ -1,13 +1,13 @@
 import { mapRoutes } from 'discourse/mapping-router';
 
 moduleFor("controller:avatar-selector", "controller:avatar-selector", {
-  setup() {
+  beforeEach() {
     this.registry.register('router:main', mapRoutes());
   },
   needs: ['controller:modal']
 });
 
-test("avatarTemplate", function() {
+QUnit.test("avatarTemplate", function(assert) {
   const avatarSelectorController = this.subject();
 
   avatarSelectorController.setProperties({
@@ -17,11 +17,11 @@ test("avatarTemplate", function() {
     custom_avatar_upload_id: 3
   });
 
-  equal(avatarSelectorController.get("selectedUploadId"), 1, "we are using system by default");
+  assert.equal(avatarSelectorController.get("selectedUploadId"), 1, "we are using system by default");
 
   avatarSelectorController.set('selected', 'gravatar');
-  equal(avatarSelectorController.get("selectedUploadId"), 2, "we are using gravatar when set");
+  assert.equal(avatarSelectorController.get("selectedUploadId"), 2, "we are using gravatar when set");
 
   avatarSelectorController.set("selected", "custom");
-  equal(avatarSelectorController.get("selectedUploadId"), 3, "we are using custom when set");
+  assert.equal(avatarSelectorController.get("selectedUploadId"), 3, "we are using custom when set");
 });
diff --git a/test/javascripts/controllers/create-account-test.js.es6 b/test/javascripts/controllers/create-account-test.js.es6
index 11a9045a136..f5604d8169b 100644
--- a/test/javascripts/controllers/create-account-test.js.es6
+++ b/test/javascripts/controllers/create-account-test.js.es6
@@ -1,20 +1,20 @@
 import { mapRoutes } from 'discourse/mapping-router';
 
 moduleFor("controller:create-account", "controller:create-account", {
-  setup() {
+  beforeEach() {
     this.registry.register('router:main', mapRoutes());
   },
   needs: ['controller:modal', 'controller:login']
 });
 
-test('basicUsernameValidation', function() {
+QUnit.test('basicUsernameValidation', function(assert) {
   var subject = this.subject;
 
   var testInvalidUsername = function(username, expectedReason) {
     var controller = subject({ siteSettings: Discourse.SiteSettings });
     controller.set('accountUsername', username);
-    equal(controller.get('basicUsernameValidation.failed'), true, 'username should be invalid: ' + username);
-    equal(controller.get('basicUsernameValidation.reason'), expectedReason, 'username validation reason: ' + username + ', ' + expectedReason);
+    assert.equal(controller.get('basicUsernameValidation.failed'), true, 'username should be invalid: ' + username);
+    assert.equal(controller.get('basicUsernameValidation.reason'), expectedReason, 'username validation reason: ' + username + ', ' + expectedReason);
   };
 
   testInvalidUsername('', undefined);
@@ -24,11 +24,11 @@ test('basicUsernameValidation', function() {
   var controller = subject({ siteSettings: Discourse.SiteSettings });
   controller.set('accountUsername',   'porkchops');
   controller.set('prefilledUsername', 'porkchops');
-  equal(controller.get('basicUsernameValidation.ok'), true, 'Prefilled username is valid');
-  equal(controller.get('basicUsernameValidation.reason'), I18n.t('user.username.prefilled'), 'Prefilled username is valid');
+  assert.equal(controller.get('basicUsernameValidation.ok'), true, 'Prefilled username is valid');
+  assert.equal(controller.get('basicUsernameValidation.reason'), I18n.t('user.username.prefilled'), 'Prefilled username is valid');
 });
 
-test('passwordValidation', function() {
+QUnit.test('passwordValidation', function(assert) {
   var subject = this.subject;
 
   var controller = subject({ siteSettings: Discourse.SiteSettings });
@@ -38,14 +38,14 @@ test('passwordValidation', function() {
   controller.set('prefilledUsername', 'porkchops');
 
   controller.set('accountPassword', 'b4fcdae11f9167');
-  equal(controller.get('passwordValidation.ok'), true, 'Password is ok');
-  equal(controller.get('passwordValidation.reason'), I18n.t('user.password.ok'), 'Password is valid');
+  assert.equal(controller.get('passwordValidation.ok'), true, 'Password is ok');
+  assert.equal(controller.get('passwordValidation.reason'), I18n.t('user.password.ok'), 'Password is valid');
 
   var testInvalidPassword = function(password, expectedReason) {
     var c = subject({ siteSettings: Discourse.SiteSettings });
     c.set('accountPassword', password);
-    equal(c.get('passwordValidation.failed'), true, 'password should be invalid: ' + password);
-    equal(c.get('passwordValidation.reason'), expectedReason, 'password validation reason: ' + password + ', ' + expectedReason);
+    assert.equal(c.get('passwordValidation.failed'), true, 'password should be invalid: ' + password);
+    assert.equal(c.get('passwordValidation.reason'), expectedReason, 'password validation reason: ' + password + ', ' + expectedReason);
   };
 
   testInvalidPassword('', undefined);
diff --git a/test/javascripts/controllers/flag-test.js.es6 b/test/javascripts/controllers/flag-test.js.es6
index 90368082457..0d4b49e16b3 100644
--- a/test/javascripts/controllers/flag-test.js.es6
+++ b/test/javascripts/controllers/flag-test.js.es6
@@ -18,13 +18,13 @@ var buildAdminUser = function(args) {
 };
 
 moduleFor("controller:flag", "controller:flag", {
-  setup() {
+  beforeEach() {
     this.registry.register('router:main', mapRoutes());
   },
   needs: ['controller:modal']
 });
 
-test("canDeleteSpammer not staff", function(){
+QUnit.test("canDeleteSpammer not staff", function(assert) {
   const store = createStore();
 
   var flagController = this.subject({ model: buildPost() });
@@ -32,44 +32,44 @@ test("canDeleteSpammer not staff", function(){
 
   const spamFlag = store.createRecord('post-action-type', {name_key: 'spam'});
   flagController.set('selected', spamFlag);
-  equal(flagController.get('canDeleteSpammer'), false, 'false if current user is not staff');
+  assert.equal(flagController.get('canDeleteSpammer'), false, 'false if current user is not staff');
 });
 
-var canDeleteSpammer = function(flagController, postActionType, expected, testName) {
+var canDeleteSpammer = function(assert, flagController, postActionType, expected, testName) {
   const store = createStore();
   const flag = store.createRecord('post-action-type', {name_key: postActionType});
   flagController.set('selected', flag);
 
-  equal(flagController.get('canDeleteSpammer'), expected, testName);
+  assert.equal(flagController.get('canDeleteSpammer'), expected, testName);
 };
 
-test("canDeleteSpammer spam not selected", function(){
+QUnit.test("canDeleteSpammer spam not selected", function(assert) {
   sandbox.stub(Discourse.User, 'currentProp').withArgs('staff').returns(true);
   var flagController = this.subject({ model: buildPost() });
   flagController.set('userDetails', buildAdminUser({can_delete_all_posts: true, can_be_deleted: true}));
-  canDeleteSpammer(flagController, 'off_topic', false, 'false if current user is staff, but selected is off_topic');
-  canDeleteSpammer(flagController, 'inappropriate', false, 'false if current user is staff, but selected is inappropriate');
-  canDeleteSpammer(flagController, 'notify_user', false, 'false if current user is staff, but selected is notify_user');
-  canDeleteSpammer(flagController, 'notify_moderators', false, 'false if current user is staff, but selected is notify_moderators');
+  canDeleteSpammer(assert, flagController, 'off_topic', false, 'false if current user is staff, but selected is off_topic');
+  canDeleteSpammer(assert, flagController, 'inappropriate', false, 'false if current user is staff, but selected is inappropriate');
+  canDeleteSpammer(assert, flagController, 'notify_user', false, 'false if current user is staff, but selected is notify_user');
+  canDeleteSpammer(assert, flagController, 'notify_moderators', false, 'false if current user is staff, but selected is notify_moderators');
 });
 
-test("canDeleteSpammer spam selected", function(){
+QUnit.test("canDeleteSpammer spam selected", function(assert) {
   sandbox.stub(Discourse.User, 'currentProp').withArgs('staff').returns(true);
   var flagController = this.subject({ model: buildPost() });
   flagController.set('userDetails', buildAdminUser({can_delete_all_posts: true, can_be_deleted: true}));
-  canDeleteSpammer(flagController, 'spam', true, 'true if current user is staff, selected is spam, posts and user can be deleted');
+  canDeleteSpammer(assert, flagController, 'spam', true, 'true if current user is staff, selected is spam, posts and user can be deleted');
 
   flagController.set('userDetails', buildAdminUser({can_delete_all_posts: false, can_be_deleted: true}));
-  canDeleteSpammer(flagController, 'spam', false, 'false if current user is staff, selected is spam, posts cannot be deleted');
+  canDeleteSpammer(assert, flagController, 'spam', false, 'false if current user is staff, selected is spam, posts cannot be deleted');
 
   flagController.set('userDetails', buildAdminUser({can_delete_all_posts: true, can_be_deleted: false}));
-  canDeleteSpammer(flagController, 'spam', false, 'false if current user is staff, selected is spam, user cannot be deleted');
+  canDeleteSpammer(assert, flagController, 'spam', false, 'false if current user is staff, selected is spam, user cannot be deleted');
 
   flagController.set('userDetails', buildAdminUser({can_delete_all_posts: false, can_be_deleted: false}));
-  canDeleteSpammer(flagController, 'spam', false, 'false if current user is staff, selected is spam, user cannot be deleted');
+  canDeleteSpammer(assert, flagController, 'spam', false, 'false if current user is staff, selected is spam, user cannot be deleted');
 });
 
-test("canSendWarning not staff", function(){
+QUnit.test("canSendWarning not staff", function(assert) {
   const store = createStore();
 
   var flagController = this.subject({ model: buildPost() });
@@ -77,28 +77,28 @@ test("canSendWarning not staff", function(){
 
   const notifyUserFlag = store.createRecord('post-action-type', {name_key: 'notify_user'});
   flagController.set('selected', notifyUserFlag);
-  equal(flagController.get('canSendWarning'), false, 'false if current user is not staff');
+  assert.equal(flagController.get('canSendWarning'), false, 'false if current user is not staff');
 });
 
-var canSendWarning = function(flagController, postActionType, expected, testName) {
+var canSendWarning = function(assert, flagController, postActionType, expected, testName) {
   const store = createStore();
   const flag = store.createRecord('post-action-type', {name_key: postActionType});
   flagController.set('selected', flag);
 
-  equal(flagController.get('canSendWarning'), expected, testName);
+  assert.equal(flagController.get('canSendWarning'), expected, testName);
 };
 
-test("canSendWarning notify_user not selected", function(){
+QUnit.test("canSendWarning notify_user not selected", function(assert) {
   sandbox.stub(Discourse.User, 'currentProp').withArgs('staff').returns(true);
   var flagController = this.subject({ model: buildPost() });
-  canSendWarning(flagController, 'off_topic', false, 'false if current user is staff, but selected is off_topic');
-  canSendWarning(flagController, 'inappropriate', false, 'false if current user is staff, but selected is inappropriate');
-  canSendWarning(flagController, 'spam', false, 'false if current user is staff, but selected is spam');
-  canSendWarning(flagController, 'notify_moderators', false, 'false if current user is staff, but selected is notify_moderators');
+  canSendWarning(assert, flagController, 'off_topic', false, 'false if current user is staff, but selected is off_topic');
+  canSendWarning(assert, flagController, 'inappropriate', false, 'false if current user is staff, but selected is inappropriate');
+  canSendWarning(assert, flagController, 'spam', false, 'false if current user is staff, but selected is spam');
+  canSendWarning(assert, flagController, 'notify_moderators', false, 'false if current user is staff, but selected is notify_moderators');
 });
 
-test("canSendWarning notify_user selected", function(){
+QUnit.test("canSendWarning notify_user selected", function(assert) {
   sandbox.stub(Discourse.User, 'currentProp').withArgs('staff').returns(true);
   var flagController = this.subject({ model: buildPost() });
-  canSendWarning(flagController, 'notify_user', true, 'true if current user is staff, selected is notify_user');
+  canSendWarning(assert, flagController, 'notify_user', true, 'true if current user is staff, selected is notify_user');
 });
diff --git a/test/javascripts/controllers/group-test.js.es6 b/test/javascripts/controllers/group-test.js.es6
index 822b14dd424..a5defd2d14a 100644
--- a/test/javascripts/controllers/group-test.js.es6
+++ b/test/javascripts/controllers/group-test.js.es6
@@ -1,19 +1,21 @@
-moduleFor("controller:group");
+moduleFor("controller:group", {
+  needs: ['controller:application']
+});
 
-test("canEditGroup", function() {
+QUnit.test("canEditGroup", function(assert) {
   const GroupController = this.subject();
 
   GroupController.setProperties({
     model: { is_group_owner: true, automatic: true }
   });
 
-  equal(GroupController.get("canEditGroup"), false, "automatic groups cannot be edited");
+  assert.equal(GroupController.get("canEditGroup"), false, "automatic groups cannot be edited");
 
   GroupController.set("model.automatic", false);
 
-  equal(GroupController.get("canEditGroup"), true, "owners can edit groups");
+  assert.equal(GroupController.get("canEditGroup"), true, "owners can edit groups");
 
   GroupController.set("model.is_group_owner", false);
 
-  equal(GroupController.get("canEditGroup"), false, "normal users cannot edit groups");
+  assert.equal(GroupController.get("canEditGroup"), false, "normal users cannot edit groups");
 });
diff --git a/test/javascripts/controllers/history-test.js.es6 b/test/javascripts/controllers/history-test.js.es6
index fc8bbe1f5c0..11fe31a27e2 100644
--- a/test/javascripts/controllers/history-test.js.es6
+++ b/test/javascripts/controllers/history-test.js.es6
@@ -1,27 +1,27 @@
 moduleFor("controller:history");
 
-test("displayEdit", function() {
+QUnit.test("displayEdit", function(assert) {
   const HistoryController = this.subject();
 
   HistoryController.setProperties({
     model: { last_revision: 3, current_revision: 3, can_edit: false }
   });
 
-  equal(
+  assert.equal(
     HistoryController.get("displayEdit"), false,
     "it should not display edit button when user cannot edit the post"
   );
 
   HistoryController.set("model.can_edit", true);
 
-  equal(
+  assert.equal(
     HistoryController.get("displayEdit"), true,
     "it should display edit button when user can edit the post"
   );
 
   HistoryController.set("model.current_revision", 2);
 
-  equal(
+  assert.equal(
     HistoryController.get("displayEdit"), false,
     "it should only display the edit button on the latest revision"
   );
diff --git a/test/javascripts/controllers/topic-test.js.es6 b/test/javascripts/controllers/topic-test.js.es6
index a8e3609e34b..1ae8080bc4e 100644
--- a/test/javascripts/controllers/topic-test.js.es6
+++ b/test/javascripts/controllers/topic-test.js.es6
@@ -1,9 +1,8 @@
-import { blank, present } from 'helpers/qunit-helpers';
 import { mapRoutes } from 'discourse/mapping-router';
 
 moduleFor('controller:topic', 'controller:topic', {
   needs: ['controller:modal', 'controller:composer', 'controller:application'],
-  setup() {
+  beforeEach() {
     this.registry.register('router:main', mapRoutes());
   },
 });
@@ -23,27 +22,27 @@ var buildTopic = function() {
 };
 
 
-test("editingMode", function() {
+QUnit.test("editingMode", function(assert) {
   var topic = buildTopic(),
       topicController = this.subject({model: topic});
 
-  ok(!topicController.get('editingTopic'), "we are not editing by default");
+  assert.ok(!topicController.get('editingTopic'), "we are not editing by default");
 
   topicController.set('model.details.can_edit', false);
   topicController.send('editTopic');
-  ok(!topicController.get('editingTopic'), "calling editTopic doesn't enable editing unless the user can edit");
+  assert.ok(!topicController.get('editingTopic'), "calling editTopic doesn't enable editing unless the user can edit");
 
   topicController.set('model.details.can_edit', true);
   topicController.send('editTopic');
-  ok(topicController.get('editingTopic'), "calling editTopic enables editing if the user can edit");
-  equal(topicController.get('buffered.title'), topic.get('title'));
-  equal(topicController.get('buffered.category_id'), topic.get('category_id'));
+  assert.ok(topicController.get('editingTopic'), "calling editTopic enables editing if the user can edit");
+  assert.equal(topicController.get('buffered.title'), topic.get('title'));
+  assert.equal(topicController.get('buffered.category_id'), topic.get('category_id'));
 
   topicController.send('cancelEditingTopic');
-  ok(!topicController.get('editingTopic'), "cancelling edit mode reverts the property value");
+  assert.ok(!topicController.get('editingTopic'), "cancelling edit mode reverts the property value");
 });
 
-test("toggledSelectedPost", function() {
+QUnit.test("toggledSelectedPost", function(assert) {
   var tc = this.subject({ model: buildTopic() }),
       post = Discourse.Post.create({id: 123, post_number: 2}),
       postStream = tc.get('model.postStream');
@@ -51,38 +50,38 @@ test("toggledSelectedPost", function() {
   postStream.appendPost(post);
   postStream.appendPost(Discourse.Post.create({id: 124, post_number: 3}));
 
-  blank(tc.get('selectedPosts'), "there are no selected posts by default");
-  equal(tc.get('selectedPostsCount'), 0, "there is a selected post count of 0");
-  ok(!tc.postSelected(post), "the post is not selected by default");
+  assert.blank(tc.get('selectedPosts'), "there are no selected posts by default");
+  assert.equal(tc.get('selectedPostsCount'), 0, "there is a selected post count of 0");
+  assert.ok(!tc.postSelected(post), "the post is not selected by default");
 
   tc.send('toggledSelectedPost', post);
-  present(tc.get('selectedPosts'), "there is a selectedPosts collection");
-  equal(tc.get('selectedPostsCount'), 1, "there is a selected post now");
-  ok(tc.postSelected(post), "the post is now selected");
+  assert.present(tc.get('selectedPosts'), "there is a selectedPosts collection");
+  assert.equal(tc.get('selectedPostsCount'), 1, "there is a selected post now");
+  assert.ok(tc.postSelected(post), "the post is now selected");
 
   tc.send('toggledSelectedPost', post);
-  ok(!tc.postSelected(post), "the post is no longer selected");
+  assert.ok(!tc.postSelected(post), "the post is no longer selected");
 
 });
 
-test("selectAll", function() {
+QUnit.test("selectAll", function(assert) {
   var tc = this.subject({model: buildTopic(), appEvents: AppEvents.create()}),
       post = Discourse.Post.create({id: 123, post_number: 2}),
       postStream = tc.get('model.postStream');
 
   postStream.appendPost(post);
 
-  ok(!tc.postSelected(post), "the post is not selected by default");
+  assert.ok(!tc.postSelected(post), "the post is not selected by default");
   tc.send('selectAll');
-  ok(tc.postSelected(post), "the post is now selected");
-  ok(tc.get('allPostsSelected'), "all posts are selected");
+  assert.ok(tc.postSelected(post), "the post is now selected");
+  assert.ok(tc.get('allPostsSelected'), "all posts are selected");
   tc.send('deselectAll');
-  ok(!tc.postSelected(post), "the post is deselected again");
-  ok(!tc.get('allPostsSelected'), "all posts are not selected");
+  assert.ok(!tc.postSelected(post), "the post is deselected again");
+  assert.ok(!tc.get('allPostsSelected'), "all posts are not selected");
 
 });
 
-test("Automating setting of allPostsSelected", function() {
+QUnit.test("Automating setting of allPostsSelected", function(assert) {
   var topic = buildTopic(),
       tc = this.subject({model: topic}),
       post = Discourse.Post.create({id: 123, post_number: 2}),
@@ -90,39 +89,38 @@ test("Automating setting of allPostsSelected", function() {
 
   topic.set('posts_count', 1);
   postStream.appendPost(post);
-  ok(!tc.get('allPostsSelected'), "all posts are not selected by default");
+  assert.ok(!tc.get('allPostsSelected'), "all posts are not selected by default");
 
   tc.send('toggledSelectedPost', post);
-  ok(tc.get('allPostsSelected'), "all posts are selected if we select the only post");
+  assert.ok(tc.get('allPostsSelected'), "all posts are selected if we select the only post");
 
   tc.send('toggledSelectedPost', post);
-  ok(!tc.get('allPostsSelected'), "the posts are no longer automatically selected");
+  assert.ok(!tc.get('allPostsSelected'), "the posts are no longer automatically selected");
 });
 
-test("Select Replies when present", function() {
+QUnit.test("Select Replies when present", function(assert) {
   var topic = buildTopic(),
       tc = this.subject({ model: topic, appEvents: AppEvents.create() }),
       p1 = Discourse.Post.create({id: 1, post_number: 1, reply_count: 1}),
       p2 = Discourse.Post.create({id: 2, post_number: 2}),
       p3 = Discourse.Post.create({id: 2, post_number: 3, reply_to_post_number: 1});
 
-  ok(!tc.postSelected(p3), "replies are not selected by default");
+  assert.ok(!tc.postSelected(p3), "replies are not selected by default");
   tc.send('toggledSelectedPostReplies', p1);
-  ok(tc.postSelected(p1), "it selects the post");
-  ok(!tc.postSelected(p2), "it doesn't select a post that's not a reply");
-  ok(tc.postSelected(p3), "it selects a post that is a reply");
-  equal(tc.get('selectedPostsCount'), 2, "it has a selected posts count of two");
+  assert.ok(tc.postSelected(p1), "it selects the post");
+  assert.ok(!tc.postSelected(p2), "it doesn't select a post that's not a reply");
+  assert.ok(tc.postSelected(p3), "it selects a post that is a reply");
+  assert.equal(tc.get('selectedPostsCount'), 2, "it has a selected posts count of two");
 
   // If we deselected the post whose replies are selected...
   tc.send('toggledSelectedPost', p1);
-  ok(!tc.postSelected(p1), "it deselects the post");
-  ok(!tc.postSelected(p3), "it deselects the replies too");
+  assert.ok(!tc.postSelected(p1), "it deselects the post");
+  assert.ok(!tc.postSelected(p3), "it deselects the replies too");
 
   // If we deselect a reply, it should deselect the parent's replies selected attribute. Weird but what else would make sense?
   tc.send('toggledSelectedPostReplies', p1);
   tc.send('toggledSelectedPost', p3);
-  ok(tc.postSelected(p1), "the post stays selected");
-  ok(!tc.postSelected(p3), "it deselects the replies too");
+  assert.ok(tc.postSelected(p1), "the post stays selected");
+  assert.ok(!tc.postSelected(p3), "it deselects the replies too");
 
 });
-
diff --git a/test/javascripts/ember/resolver-test.js.es6 b/test/javascripts/ember/resolver-test.js.es6
index 648729d6bd3..85424065ecf 100644
--- a/test/javascripts/ember/resolver-test.js.es6
+++ b/test/javascripts/ember/resolver-test.js.es6
@@ -3,10 +3,10 @@ import { setResolverOption, buildResolver } from 'discourse-common/resolver';
 let originalTemplates;
 let resolver;
 
-function lookupTemplate(name, expectedTemplate, message) {
+function lookupTemplate(assert, name, expectedTemplate, message) {
   var parseName = resolver.parseName(name);
   var result = resolver.resolveTemplate(parseName);
-  equal(result, expectedTemplate, message);
+  assert.equal(result, expectedTemplate, message);
 }
 
 function setTemplates(lookupTemplateStrings) {
@@ -17,20 +17,20 @@ function setTemplates(lookupTemplateStrings) {
 
 const DiscourseResolver = buildResolver('discourse');
 
-module("lib:resolver", {
-  setup: function() {
+QUnit.module("lib:resolver", {
+  beforeEach() {
     originalTemplates = Ember.TEMPLATES;
     Ember.TEMPLATES = {};
 
     resolver = DiscourseResolver.create();
   },
 
-  teardown: function() {
+  afterEach() {
     Ember.TEMPLATES = originalTemplates;
   }
 });
 
-test("finds templates in top level dir", function() {
+QUnit.test("finds templates in top level dir", assert => {
   setTemplates([
     "foobar",
     "fooBar",
@@ -38,24 +38,24 @@ test("finds templates in top level dir", function() {
     "foo.bar"
   ]);
 
-  lookupTemplate("template:foobar", "foobar", "by lowcased name");
-  lookupTemplate("template:fooBar", "fooBar", "by camel cased name");
-  lookupTemplate("template:foo_bar", "foo_bar", "by underscored name");
-  lookupTemplate("template:foo.bar", "foo.bar", "by dotted name");
+  lookupTemplate(assert, "template:foobar", "foobar", "by lowcased name");
+  lookupTemplate(assert, "template:fooBar", "fooBar", "by camel cased name");
+  lookupTemplate(assert, "template:foo_bar", "foo_bar", "by underscored name");
+  lookupTemplate(assert, "template:foo.bar", "foo.bar", "by dotted name");
 });
 
-test("finds templates in first-level subdir", function() {
+QUnit.test("finds templates in first-level subdir", assert => {
   setTemplates([
     "foo/bar_baz"
   ]);
 
-  lookupTemplate("template:foo/bar_baz", "foo/bar_baz", "with subdir defined by slash");
-  lookupTemplate("template:foo.bar_baz", "foo/bar_baz", "with subdir defined by dot");
-  lookupTemplate("template:fooBarBaz", "foo/bar_baz", "with subdir defined by first camel case and the rest of camel cases converted to underscores");
-  lookupTemplate("template:foo_bar_baz", "foo/bar_baz", "with subdir defined by first underscore");
+  lookupTemplate(assert, "template:foo/bar_baz", "foo/bar_baz", "with subdir defined by slash");
+  lookupTemplate(assert, "template:foo.bar_baz", "foo/bar_baz", "with subdir defined by dot");
+  lookupTemplate(assert, "template:fooBarBaz", "foo/bar_baz", "with subdir defined by first camel case and the rest of camel cases converted to underscores");
+  lookupTemplate(assert, "template:foo_bar_baz", "foo/bar_baz", "with subdir defined by first underscore");
 });
 
-test("resolves precedence between overlapping top level dir and first level subdir templates", function() {
+QUnit.test("resolves precedence between overlapping top level dir and first level subdir templates", assert => {
   setTemplates([
     "fooBar",
     "foo_bar",
@@ -63,28 +63,28 @@ test("resolves precedence between overlapping top level dir and first level subd
     "foo/bar"
   ]);
 
-  lookupTemplate("template:foo.bar", "foo/bar", "preferring first level subdir for dotted name");
-  lookupTemplate("template:fooBar", "fooBar", "preferring top level dir for camel cased name");
-  lookupTemplate("template:foo_bar", "foo_bar", "preferring top level dir for underscored name");
+  lookupTemplate(assert, "template:foo.bar", "foo/bar", "preferring first level subdir for dotted name");
+  lookupTemplate(assert, "template:fooBar", "fooBar", "preferring top level dir for camel cased name");
+  lookupTemplate(assert, "template:foo_bar", "foo_bar", "preferring top level dir for underscored name");
 });
 
-test("finds templates in subdir deeper than one level", function() {
+QUnit.test("finds templates in subdir deeper than one level", assert => {
   setTemplates([
     "foo/bar/baz/qux"
   ]);
 
-  lookupTemplate("template:foo/bar/baz/qux", "foo/bar/baz/qux", "for subdirs defined by slashes");
-  lookupTemplate("template:foo.bar.baz.qux", "foo/bar/baz/qux", "for subdirs defined by dots");
-  lookupTemplate("template:foo/bar/bazQux", "foo/bar/baz/qux", "for subdirs defined by slashes plus one camel case");
-  lookupTemplate("template:foo/bar/baz_qux", "foo/bar/baz/qux", "for subdirs defined by slashes plus one underscore");
+  lookupTemplate(assert, "template:foo/bar/baz/qux", "foo/bar/baz/qux", "for subdirs defined by slashes");
+  lookupTemplate(assert, "template:foo.bar.baz.qux", "foo/bar/baz/qux", "for subdirs defined by dots");
+  lookupTemplate(assert, "template:foo/bar/bazQux", "foo/bar/baz/qux", "for subdirs defined by slashes plus one camel case");
+  lookupTemplate(assert, "template:foo/bar/baz_qux", "foo/bar/baz/qux", "for subdirs defined by slashes plus one underscore");
 
-  lookupTemplate("template:fooBarBazQux", undefined, "but not for subdirs defined by more than one camel case");
-  lookupTemplate("template:foo_bar_baz_qux", undefined, "but not for subdirs defined by more than one underscore");
-  lookupTemplate("template:foo.bar.bazQux", undefined, "but not for subdirs defined by dots plus one camel case");
-  lookupTemplate("template:foo.bar.baz_qux", undefined, "but not for subdirs defined by dots plus one underscore");
+  lookupTemplate(assert, "template:fooBarBazQux", undefined, "but not for subdirs defined by more than one camel case");
+  lookupTemplate(assert, "template:foo_bar_baz_qux", undefined, "but not for subdirs defined by more than one underscore");
+  lookupTemplate(assert, "template:foo.bar.bazQux", undefined, "but not for subdirs defined by dots plus one camel case");
+  lookupTemplate(assert, "template:foo.bar.baz_qux", undefined, "but not for subdirs defined by dots plus one underscore");
 });
 
-test("resolves mobile templates to 'mobile/' namespace", function() {
+QUnit.test("resolves mobile templates to 'mobile/' namespace", assert => {
   setTemplates([
     "mobile/foo",
     "bar",
@@ -94,12 +94,12 @@ test("resolves mobile templates to 'mobile/' namespace", function() {
 
   setResolverOption('mobileView', true);
 
-  lookupTemplate("template:foo", "mobile/foo", "finding mobile version even if normal one is not present");
-  lookupTemplate("template:bar", "mobile/bar", "preferring mobile version when both mobile and normal versions are present");
-  lookupTemplate("template:baz", "baz", "falling back to a normal version when mobile version is not present");
+  lookupTemplate(assert, "template:foo", "mobile/foo", "finding mobile version even if normal one is not present");
+  lookupTemplate(assert, "template:bar", "mobile/bar", "preferring mobile version when both mobile and normal versions are present");
+  lookupTemplate(assert, "template:baz", "baz", "falling back to a normal version when mobile version is not present");
 });
 
-test("resolves plugin templates to 'javascripts/' namespace", function() {
+QUnit.test("resolves plugin templates to 'javascripts/' namespace", assert => {
   setTemplates([
     "javascripts/foo",
     "bar",
@@ -107,12 +107,12 @@ test("resolves plugin templates to 'javascripts/' namespace", function() {
     "baz"
   ]);
 
-  lookupTemplate("template:foo", "javascripts/foo", "finding plugin version even if normal one is not present");
-  lookupTemplate("template:bar", "javascripts/bar", "preferring plugin version when both versions are present");
-  lookupTemplate("template:baz", "baz", "falling back to a normal version when plugin version is not present");
+  lookupTemplate(assert, "template:foo", "javascripts/foo", "finding plugin version even if normal one is not present");
+  lookupTemplate(assert, "template:bar", "javascripts/bar", "preferring plugin version when both versions are present");
+  lookupTemplate(assert, "template:baz", "baz", "falling back to a normal version when plugin version is not present");
 });
 
-test("resolves templates with 'admin' prefix to 'admin/templates/' namespace", function() {
+QUnit.test("resolves templates with 'admin' prefix to 'admin/templates/' namespace", assert => {
   setTemplates([
     "admin/templates/foo",
     "adminBar",
@@ -121,20 +121,20 @@ test("resolves templates with 'admin' prefix to 'admin/templates/' namespace", f
     "admin/templates/bar"
   ]);
 
-  lookupTemplate("template:adminFoo", "admin/templates/foo", "when prefix is separated by camel case");
-  lookupTemplate("template:admin_foo", "admin/templates/foo", "when prefix is separated by underscore");
-  lookupTemplate("template:admin.foo", "admin/templates/foo", "when prefix is separated by dot");
+  lookupTemplate(assert, "template:adminFoo", "admin/templates/foo", "when prefix is separated by camel case");
+  lookupTemplate(assert, "template:admin_foo", "admin/templates/foo", "when prefix is separated by underscore");
+  lookupTemplate(assert, "template:admin.foo", "admin/templates/foo", "when prefix is separated by dot");
 
-  lookupTemplate("template:adminfoo", undefined, "but not when prefix is not separated in any way");
-  lookupTemplate("template:adminBar", "adminBar", "but not when template with the exact camel cased name exists");
-  lookupTemplate("template:admin_bar", "admin_bar", "but not when template with the exact underscored name exists");
-  lookupTemplate("template:admin.bar", "admin.bar", "but not when template with the exact dotted name exists");
+  lookupTemplate(assert, "template:adminfoo", undefined, "but not when prefix is not separated in any way");
+  lookupTemplate(assert, "template:adminBar", "adminBar", "but not when template with the exact camel cased name exists");
+  lookupTemplate(assert, "template:admin_bar", "admin_bar", "but not when template with the exact underscored name exists");
+  lookupTemplate(assert, "template:admin.bar", "admin.bar", "but not when template with the exact dotted name exists");
 });
 
-test("returns 'not_found' template when template name cannot be resolved", function() {
+QUnit.test("returns 'not_found' template when template name cannot be resolved", assert => {
   setTemplates([
     "not_found"
   ]);
 
-  lookupTemplate("template:foo/bar/baz", "not_found", "");
+  lookupTemplate(assert, "template:foo/bar/baz", "not_found", "");
 });
diff --git a/test/javascripts/fixtures/search-fixtures.js.es6 b/test/javascripts/fixtures/search-fixtures.js.es6
index f979f3d78bb..a0b8e22bdaa 100644
--- a/test/javascripts/fixtures/search-fixtures.js.es6
+++ b/test/javascripts/fixtures/search-fixtures.js.es6
@@ -1413,6 +1413,7 @@ export default {
       }
     ],
     "grouped_search_result": {
+      "term": "dev",
       "more_posts": true,
       "more_users": true,
       "more_categories": null,
diff --git a/test/javascripts/helpers/assertions.js b/test/javascripts/helpers/assertions.js
index 66b6fc8f846..4e6b53b5d16 100644
--- a/test/javascripts/helpers/assertions.js
+++ b/test/javascripts/helpers/assertions.js
@@ -8,14 +8,6 @@ function count(selector) {
   return find(selector).length;
 }
 
-function containsInstance(collection, klass, text) {
-  ok(klass.detectInstance(_.first(collection)), text);
-}
-
-function not(state, message) {
-  ok(!state, message);
-}
-
 function visible(selector) {
   return find(selector + ":visible").length > 0;
 }
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6
index 341c106b33a..4154a461219 100644
--- a/test/javascripts/helpers/component-test.js.es6
+++ b/test/javascripts/helpers/component-test.js.es6
@@ -35,8 +35,8 @@ export default function(name, opts) {
 
     this.registry.register('store:main', store, { instantiate: false });
 
-    if (opts.setup) {
-      opts.setup.call(this, store);
+    if (opts.beforeEach) {
+      opts.beforeEach.call(this, store);
     }
 
     andThen(() => {
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index 85d171a37f0..bfa32ba4af4 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -379,4 +379,4 @@ export default function() {
 
   server.checkPassthrough = request => request.requestHeaders['Discourse-Script'];
   return server;
-}
+}
\ No newline at end of file
diff --git a/test/javascripts/helpers/create-store.js.es6 b/test/javascripts/helpers/create-store.js.es6
index 9ad8d169c51..a1ab5351a81 100644
--- a/test/javascripts/helpers/create-store.js.es6
+++ b/test/javascripts/helpers/create-store.js.es6
@@ -11,8 +11,11 @@ export default function() {
     register: {
       lookup(type) {
         if (type === "adapter:rest") {
-          this._restAdapter = this._restAdapter || RestAdapter.create({ container: this });
-          return (this._restAdapter);
+          if (!this._restAdapter) {
+            this._restAdapter = RestAdapter.create({ owner: this });
+            // this._restAdapter.container = this;
+          }
+          return this._restAdapter;
         }
         if (type === "key-value-store:main") {
           this._kvs = this._kvs || new KeyValueStore();
@@ -34,5 +37,4 @@ export default function() {
       },
     }
   });
-}
-
+}
\ No newline at end of file
diff --git a/test/javascripts/helpers/parse-html.js.es6 b/test/javascripts/helpers/parse-html.js.es6
index c9469fa6b9f..0d3bab90d56 100644
--- a/test/javascripts/helpers/parse-html.js.es6
+++ b/test/javascripts/helpers/parse-html.js.es6
@@ -5,4 +5,4 @@ export default function parseHTML(rawHtml) {
 
   parser.parseComplete(rawHtml);
   return builder.dom;
-}
+}
\ No newline at end of file
diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6
index 32747f9c5a2..6706389e441 100644
--- a/test/javascripts/helpers/qunit-helpers.js.es6
+++ b/test/javascripts/helpers/qunit-helpers.js.es6
@@ -1,4 +1,4 @@
-/* global asyncTest, fixtures */
+/* global QUnit, fixtures */
 
 import sessionFixtures from 'fixtures/session-fixtures';
 import siteFixtures from 'fixtures/site-fixtures';
@@ -40,18 +40,18 @@ window.bootbox.$body = $('#ember-testing');
 $.fn.modal = AcceptanceModal;
 
 function acceptance(name, options) {
-  module("Acceptance: " + name, {
-    setup() {
+  QUnit.module("Acceptance: " + name, {
+    beforeEach() {
       resetMobile();
 
       // For now don't do scrolling stuff in Test Mode
-      HeaderComponent.reopen({examineDockHeader: Ember.K});
+      HeaderComponent.reopen({examineDockHeader: function() { }});
 
       resetExtraClasses();
       const siteJson = siteFixtures['site.json'].site;
       if (options) {
-        if (options.setup) {
-          options.setup.call(this);
+        if (options.beforeEach) {
+          options.beforeEach.call(this);
         }
 
         if (options.mobileView) {
@@ -77,9 +77,9 @@ function acceptance(name, options) {
       Discourse.reset();
     },
 
-    teardown() {
-      if (options && options.teardown) {
-        options.teardown.call(this);
+    afterEach() {
+      if (options && options.afterEach) {
+        options.afterEach.call(this);
       }
       flushMap();
       Discourse.User.resetCurrent();
@@ -102,10 +102,11 @@ function controllerFor(controller, model) {
 }
 
 function asyncTestDiscourse(text, func) {
-  asyncTest(text, function () {
-    var self = this;
-    Ember.run(function () {
-      func.call(self);
+  QUnit.test(text, function(assert) {
+    const done = assert.async();
+    Ember.run(() => {
+      func.call(this, assert);
+      done();
     });
   });
 }
@@ -117,20 +118,46 @@ function fixture(selector) {
   return $("#qunit-fixture");
 }
 
-function present(obj, text) {
-  ok(!Ember.isEmpty(obj), text);
-}
+QUnit.assert.not = function(actual, message) {
+  this.pushResult({
+    result: !actual,
+    actual,
+    expected: !actual,
+    message
+  });
+};
 
-function blank(obj, text) {
-  ok(Ember.isEmpty(obj), text);
-}
+QUnit.assert.blank = function(actual, message) {
+  this.pushResult({
+    result: Ember.isEmpty(actual),
+    actual,
+    message
+  });
+};
 
-function waitFor(callback, timeout) {
+QUnit.assert.present = function(actual, message) {
+  this.pushResult({
+    result: !Ember.isEmpty(actual),
+    actual,
+    message
+  });
+};
+
+QUnit.assert.containsInstance = function(collection, klass, message) {
+  const result = klass.detectInstance(_.first(collection));
+  this.pushResult({
+    result,
+    message
+  });
+};
+
+function waitFor(assert, callback, timeout) {
   timeout = timeout || 500;
-  stop();
+
+  const done = assert.async();
   Ember.run.later(() => {
     callback();
-    start();
+    done();
   }, timeout);
 }
 
@@ -140,6 +167,4 @@ export { acceptance,
          fixture,
          logIn,
          currentUser,
-         blank,
-         present,
          waitFor };
diff --git a/test/javascripts/helpers/site.js.es6 b/test/javascripts/helpers/site.js.es6
index d8ab85a4861..a477be1859c 100644
--- a/test/javascripts/helpers/site.js.es6
+++ b/test/javascripts/helpers/site.js.es6
@@ -1,4 +1,4 @@
 import PreloadStore from 'preload-store';
 
 /*jshint maxlen:10000000 */
-PreloadStore.store("site",{"default_archetype":"regular","notification_types":{"mentioned":1,"replied":2,"quoted":3,"edited":4,"liked":5,"private_message":6,"invited_to_private_message":7,"invitee_accepted":8,"posted":9,"moved_post":10},"post_types":{"regular":1,"moderator_action":2},"groups":[{"id":0,"name":"everyone"},{"id":1,"name":"admins"},{"id":2,"name":"moderators"},{"id":3,"name":"staff"},{"id":10,"name":"trust_level_0"},{"id":11,"name":"trust_level_1"},{"id":12,"name":"trust_level_2"},{"id":13,"name":"trust_level_3"},{"id":14,"name":"trust_level_4"},{"id":20,"name":"ubuntu"},{"id":21,"name":"test"}],"filters":["latest","unread","new","starred","read","posted"],"periods":["yearly","monthly","weekly","daily"],"top_menu_items":["latest","unread","new","starred","read","posted","category","categories","top"],"anonymous_top_menu_items":["latest","category","categories","top"],"uncategorized_category_id":17,"categories":[{"id":5,"name":"extensibility","color":"FE8432","text_color":"FFFFFF","slug":"extensibility","topic_count":102,"description":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.  ","topic_url":"/t/category-definition-for-extensibility/28","hotness":5.0,"read_restricted":false,"permission":null},{"id":7,"name":"dev","color":"000","text_color":"FFFFFF","slug":"dev","topic_count":284,"description":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.","topic_url":"/t/category-definition-for-dev/1026","hotness":5.0,"read_restricted":false,"permission":null},{"id":1,"name":"bug","color":"e9dd00","text_color":"000000","slug":"bug","topic_count":660,"description":"Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","topic_url":"/t/category-definition-for-bug/2","hotness":5.0,"read_restricted":false,"permission":null},{"id":8,"name":"hosting","color":"74CCED","text_color":"FFFFFF","slug":"hosting","topic_count":69,"description":"Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.","topic_url":"/t/category-definition-for-hosting/2626","hotness":5.0,"read_restricted":false,"permission":null},{"id":6,"name":"support","color":"b99","text_color":"FFFFFF","slug":"support","topic_count":782,"description":"Support on configuring, using, and installing Discourse. Not for software development related topics, but for admins and end users configuring and using Discourse.","topic_url":"/t/category-definition-for-support/389","hotness":5.0,"read_restricted":false,"permission":null},{"id":2,"name":"feature","color":"0E76BD","text_color":"FFFFFF","slug":"feature","topic_count":727,"description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.","topic_url":"/t/category-definition-for-feature/11","hotness":5.0,"read_restricted":false,"permission":null},{"id":13,"name":"blog","color":"ED207B","text_color":"FFFFFF","slug":"blog","topic_count":14,"description":"Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.","topic_url":"/t/category-definition-for-blog/5250","hotness":5.0,"read_restricted":false,"permission":null},{"id":12,"name":"discourse hub","color":"b2c79f","text_color":"FFFFFF","slug":"discourse-hub","topic_count":4,"description":"Topics about current or future Discourse Hub functionality at discourse.org including nickname registration, global user pages, and the site directory.","topic_url":"/t/category-definition-for-discourse-hub/3038","hotness":5.0,"read_restricted":false,"permission":null},{"id":11,"name":"login","color":"edb400","text_color":"FFFFFF","slug":"login","topic_count":27,"description":"Topics about logging in to Discourse, using any standard third party provider (Twitter, Facebook, Google), traditional username and password, or with a custom plugin.","topic_url":"/t/category-definition-for-login/2828","hotness":5.0,"read_restricted":false,"permission":null},{"id":3,"name":"meta","color":"aaa","text_color":"FFFFFF","slug":"meta","topic_count":79,"description":"Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.","topic_url":"/t/category-definition-for-meta/24","hotness":5.0,"read_restricted":false,"permission":null},{"id":10,"name":"howto","color":"76923C","text_color":"FFFFFF","slug":"howto","topic_count":58,"description":"Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up. ","topic_url":"/t/category-definition-for-howto/2629","hotness":5.0,"read_restricted":false,"permission":null},{"id":14,"name":"marketplace","color":"8C6238","text_color":"FFFFFF","slug":"marketplace","topic_count":24,"description":"About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.","topic_url":"/t/category-definition-for-marketplace/5425","hotness":5.0,"read_restricted":false,"permission":null},{"id":17,"name":"uncategorized","color":"AB9364","text_color":"FFFFFF","slug":"uncategorized","topic_count":229,"description":"","topic_url":null,"hotness":5.0,"read_restricted":false,"permission":null},{"id":9,"name":"ux","color":"5F497A","text_color":"FFFFFF","slug":"ux","topic_count":184,"description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.","topic_url":"/t/category-definition-for-ux/2628","hotness":5.0,"read_restricted":false,"permission":null},{"id":4,"name":"faq","color":"33b","text_color":"FFFFFF","slug":"faq","topic_count":49,"description":"Topics that come up very often when discussing Discourse will eventually be classified into this Frequently Asked Questions category. Should only be added to popular topics.","topic_url":"/t/category-definition-for-faq/25","hotness":5.0,"read_restricted":false,"permission":null}],"post_action_types":[{"name_key":"bookmark","name":"Bookmark","description":"Bookmark this post","long_form":"bookmarked this post","is_flag":false,"icon":null,"id":1,"is_custom_flag":false},{"name_key":"like","name":"Like","description":"Like this post","long_form":"liked this","is_flag":false,"icon":"heart","id":2,"is_custom_flag":false},{"name_key":"off_topic","name":"Off-Topic","description":"This post is radically off-topic in the current conversation, and should probably be moved to a different topic. If this is a topic, perhaps it does not belong here.","long_form":"flagged this as off-topic","is_flag":true,"icon":null,"id":3,"is_custom_flag":false},{"name_key":"inappropriate","name":"Inappropriate","description":"This post contains content that a reasonable person would consider offensive, abusive, or a violation of <a href=\"/faq\">our community guidelines<\/a>.","long_form":"flagged this as inappropriate","is_flag":true,"icon":null,"id":4,"is_custom_flag":false},{"name_key":"vote","name":"Vote","description":"Vote for this post","long_form":"voted for this post","is_flag":false,"icon":null,"id":5,"is_custom_flag":false},{"name_key":"spam","name":"Spam","description":"This post is an advertisement. It is not useful or relevant to the current conversation, but promotional in nature.","long_form":"flagged this as spam","is_flag":true,"icon":null,"id":8,"is_custom_flag":false},{"name_key":"notify_user","name":"Notify {{username}}","description":"This post contains something I want to talk to this person directly and privately about.","long_form":"notified user","is_flag":true,"icon":null,"id":6,"is_custom_flag":true},{"name_key":"notify_moderators","name":"Notify moderators","description":"This post requires general moderator attention based on the <a href=\"/faq\">FAQ<\/a>, <a href=\"/tos\">TOS<\/a>, or for another reason not listed above.","long_form":"notified moderators","is_flag":true,"icon":null,"id":7,"is_custom_flag":true}],"trust_levels":[{"id":0,"name":"new user"},{"id":1,"name":"basic user"},{"id":2,"name":"member"},{"id":3,"name":"regular"},{"id":4,"name":"leader"}],"archetypes":[{"id":"regular","name":"Regular Topic","options":[]}]});
+PreloadStore.store("site",{"default_archetype":"regular","notification_types":{"mentioned":1,"replied":2,"quoted":3,"edited":4,"liked":5,"private_message":6,"invited_to_private_message":7,"invitee_accepted":8,"posted":9,"moved_post":10},"post_types":{"regular":1,"moderator_action":2},"groups":[{"id":0,"name":"everyone"},{"id":1,"name":"admins"},{"id":2,"name":"moderators"},{"id":3,"name":"staff"},{"id":10,"name":"trust_level_0"},{"id":11,"name":"trust_level_1"},{"id":12,"name":"trust_level_2"},{"id":13,"name":"trust_level_3"},{"id":14,"name":"trust_level_4"},{"id":20,"name":"ubuntu"},{"id":21,"name":"test"}],"filters":["latest","unread","new","starred","read","posted"],"periods":["yearly","monthly","weekly","daily"],"top_menu_items":["latest","unread","new","starred","read","posted","category","categories","top"],"anonymous_top_menu_items":["latest","category","categories","top"],"uncategorized_category_id":17,"categories":[{"id":5,"name":"extensibility","color":"FE8432","text_color":"FFFFFF","slug":"extensibility","topic_count":102,"description":"Topics about extending the functionality of Discourse with plugins, themes, add-ons, or other mechanisms for extensibility.  ","topic_url":"/t/category-definition-for-extensibility/28","hotness":5.0,"read_restricted":false,"permission":null},{"id":7,"name":"dev","color":"000","text_color":"FFFFFF","slug":"dev","topic_count":284,"description":"This category is for topics related to hacking on Discourse: submitting pull requests, configuring development environments, coding conventions, and so forth.","topic_url":"/t/category-definition-for-dev/1026","hotness":5.0,"read_restricted":false,"permission":null},{"id":1,"name":"bug","color":"e9dd00","text_color":"000000","slug":"bug","topic_count":660,"description":"Bug reports on Discourse. Do be sure to search prior to submitting bugs. Include repro steps, and only describe one bug per topic please.","topic_url":"/t/category-definition-for-bug/2","hotness":5.0,"read_restricted":false,"permission":null},{"id":8,"name":"hosting","color":"74CCED","text_color":"FFFFFF","slug":"hosting","topic_count":69,"description":"Topics about hosting Discourse, either on your own servers, in the cloud, or with specific hosting services.","topic_url":"/t/category-definition-for-hosting/2626","hotness":5.0,"read_restricted":false,"permission":null},{"id":6,"name":"support","color":"b99","text_color":"FFFFFF","slug":"support","topic_count":782,"description":"Support on configuring, using, and installing Discourse. Not for software development related topics, but for admins and end users configuring and using Discourse.","topic_url":"/t/category-definition-for-support/389","hotness":5.0,"read_restricted":false,"permission":null},{"id":2,"name":"feature","color":"0E76BD","text_color":"FFFFFF","slug":"feature","topic_count":727,"description":"Discussion about features or potential features of Discourse: how they work, why they work, etc.","topic_url":"/t/category-definition-for-feature/11","hotness":5.0,"read_restricted":false,"permission":null},{"id":13,"name":"blog","color":"ED207B","text_color":"FFFFFF","slug":"blog","topic_count":14,"description":"Discussion topics generated from the official Discourse Blog. These topics are linked from the bottom of each blog entry where the blog comments would normally be.","topic_url":"/t/category-definition-for-blog/5250","hotness":5.0,"read_restricted":false,"permission":null},{"id":12,"name":"discourse hub","color":"b2c79f","text_color":"FFFFFF","slug":"discourse-hub","topic_count":4,"description":"Topics about current or future Discourse Hub functionality at discourse.org including nickname registration, global user pages, and the site directory.","topic_url":"/t/category-definition-for-discourse-hub/3038","hotness":5.0,"read_restricted":false,"permission":null},{"id":11,"name":"login","color":"edb400","text_color":"FFFFFF","slug":"login","topic_count":27,"description":"Topics about logging in to Discourse, using any standard third party provider (Twitter, Facebook, Google), traditional username and password, or with a custom plugin.","topic_url":"/t/category-definition-for-login/2828","hotness":5.0,"read_restricted":false,"permission":null},{"id":3,"name":"meta","color":"aaa","text_color":"FFFFFF","slug":"meta","topic_count":79,"description":"Discussion about meta.discourse.org itself, the organization of this forum about Discourse, how it works, and how we can improve this site.","topic_url":"/t/category-definition-for-meta/24","hotness":5.0,"read_restricted":false,"permission":null},{"id":10,"name":"howto","color":"76923C","text_color":"FFFFFF","slug":"howto","topic_count":58,"description":"Tutorial topics that describe how to set up, configure, or install Discourse using a specific platform or environment. Topics in this category may only be created by trust level 2 and up. ","topic_url":"/t/category-definition-for-howto/2629","hotness":5.0,"read_restricted":false,"permission":null},{"id":14,"name":"marketplace","color":"8C6238","text_color":"FFFFFF","slug":"marketplace","topic_count":24,"description":"About commercial Discourse related stuff: jobs or paid gigs, plugins, themes, hosting, etc.","topic_url":"/t/category-definition-for-marketplace/5425","hotness":5.0,"read_restricted":false,"permission":null},{"id":17,"name":"uncategorized","color":"AB9364","text_color":"FFFFFF","slug":"uncategorized","topic_count":229,"description":"","topic_url":null,"hotness":5.0,"read_restricted":false,"permission":null},{"id":9,"name":"ux","color":"5F497A","text_color":"FFFFFF","slug":"ux","topic_count":184,"description":"Discussion about the user interface of Discourse, how features are presented to the user in the client, including language and UI elements.","topic_url":"/t/category-definition-for-ux/2628","hotness":5.0,"read_restricted":false,"permission":null},{"id":4,"name":"faq","color":"33b","text_color":"FFFFFF","slug":"faq","topic_count":49,"description":"Topics that come up very often when discussing Discourse will eventually be classified into this Frequently Asked Questions category. Should only be added to popular topics.","topic_url":"/t/category-definition-for-faq/25","hotness":5.0,"read_restricted":false,"permission":null}],"post_action_types":[{"name_key":"bookmark","name":"Bookmark","description":"Bookmark this post","long_form":"bookmarked this post","is_flag":false,"icon":null,"id":1,"is_custom_flag":false},{"name_key":"like","name":"Like","description":"Like this post","long_form":"liked this","is_flag":false,"icon":"heart","id":2,"is_custom_flag":false},{"name_key":"off_topic","name":"Off-Topic","description":"This post is radically off-topic in the current conversation, and should probably be moved to a different topic. If this is a topic, perhaps it does not belong here.","long_form":"flagged this as off-topic","is_flag":true,"icon":null,"id":3,"is_custom_flag":false},{"name_key":"inappropriate","name":"Inappropriate","description":"This post contains content that a reasonable person would consider offensive, abusive, or a violation of <a href=\"/faq\">our community guidelines<\/a>.","long_form":"flagged this as inappropriate","is_flag":true,"icon":null,"id":4,"is_custom_flag":false},{"name_key":"vote","name":"Vote","description":"Vote for this post","long_form":"voted for this post","is_flag":false,"icon":null,"id":5,"is_custom_flag":false},{"name_key":"spam","name":"Spam","description":"This post is an advertisement. It is not useful or relevant to the current conversation, but promotional in nature.","long_form":"flagged this as spam","is_flag":true,"icon":null,"id":8,"is_custom_flag":false},{"name_key":"notify_user","name":"Notify {{username}}","description":"This post contains something I want to talk to this person directly and privately about.","long_form":"notified user","is_flag":true,"icon":null,"id":6,"is_custom_flag":true},{"name_key":"notify_moderators","name":"Notify moderators","description":"This post requires general moderator attention based on the <a href=\"/faq\">FAQ<\/a>, <a href=\"/tos\">TOS<\/a>, or for another reason not listed above.","long_form":"notified moderators","is_flag":true,"icon":null,"id":7,"is_custom_flag":true}],"trust_levels":[{"id":0,"name":"new user"},{"id":1,"name":"basic user"},{"id":2,"name":"member"},{"id":3,"name":"regular"},{"id":4,"name":"leader"}],"archetypes":[{"id":"regular","name":"Regular Topic","options":[]}]});
\ No newline at end of file
diff --git a/test/javascripts/helpers/store-pretender.js.es6 b/test/javascripts/helpers/store-pretender.js.es6
index de7ff6b27c8..c47dec3ab93 100644
--- a/test/javascripts/helpers/store-pretender.js.es6
+++ b/test/javascripts/helpers/store-pretender.js.es6
@@ -76,4 +76,4 @@ export default function(helpers) {
   });
 
   this.delete('/widgets/:widget_id', success);
-};
+};
\ No newline at end of file
diff --git a/test/javascripts/helpers/widget-test.js.es6 b/test/javascripts/helpers/widget-test.js.es6
index d30170ff1db..15e43cbe32e 100644
--- a/test/javascripts/helpers/widget-test.js.es6
+++ b/test/javascripts/helpers/widget-test.js.es6
@@ -6,4 +6,4 @@ export function moduleForWidget(name) {
 
 export function widgetTest(name, opts) {
   return componentTest(name, opts);
-}
+}
\ No newline at end of file
diff --git a/test/javascripts/initializers/localization-test.js.es6 b/test/javascripts/initializers/localization-test.js.es6
index 4f6e0670e52..0113be6c716 100644
--- a/test/javascripts/initializers/localization-test.js.es6
+++ b/test/javascripts/initializers/localization-test.js.es6
@@ -1,11 +1,11 @@
 import PreloadStore from 'preload-store';
 import LocalizationInitializer from 'discourse/initializers/localization';
 
-module("initializer:localization", {
+QUnit.module("initializer:localization", {
   _locale: I18n.locale,
   _translations: I18n.translations,
 
-  setup() {
+  beforeEach() {
     I18n.locale = "fr";
 
     I18n.translations = {
@@ -28,16 +28,16 @@ module("initializer:localization", {
     };
   },
 
-  teardown() {
+  afterEach() {
     I18n.locale = this._locale;
     I18n.translations = this._translations;
   }
 });
 
-test("translation overrides", function() {
+QUnit.test("translation overrides", function(assert) {
   PreloadStore.store('translationOverrides', {"js.composer.reply":"WAT","js.topic.reply.help":"foobar"});
   LocalizationInitializer.initialize(this.registry);
 
-  equal(I18n.t("composer.reply"), "WAT", "overrides existing translation in current locale");
-  equal(I18n.t("topic.reply.help"), "foobar", "overrides translation in default locale");
+  assert.equal(I18n.t("composer.reply"), "WAT", "overrides existing translation in current locale");
+  assert.equal(I18n.t("topic.reply.help"), "foobar", "overrides translation in default locale");
 });
diff --git a/test/javascripts/lib/category-badge-test.js.es6 b/test/javascripts/lib/category-badge-test.js.es6
index 385d478c6ad..ffd837a5e61 100644
--- a/test/javascripts/lib/category-badge-test.js.es6
+++ b/test/javascripts/lib/category-badge-test.js.es6
@@ -1,16 +1,15 @@
 import createStore from 'helpers/create-store';
-import { blank, present } from 'helpers/qunit-helpers';
 
-module("lib:category-link");
+QUnit.module("lib:category-link");
 
 import parseHTML from 'helpers/parse-html';
 import { categoryBadgeHTML } from "discourse/helpers/category-link";
 
-test("categoryBadge without a category", function() {
-  blank(categoryBadgeHTML(), "it returns no HTML");
+QUnit.test("categoryBadge without a category", assert => {
+  assert.blank(categoryBadgeHTML(), "it returns no HTML");
 });
 
-test("Regular categoryBadge", function() {
+QUnit.test("Regular categoryBadge", assert => {
   const store = createStore();
   const category = store.createRecord('category', {
           name: 'hello',
@@ -21,28 +20,28 @@ test("Regular categoryBadge", function() {
         });
   const tag = parseHTML(categoryBadgeHTML(category))[0];
 
-  equal(tag.name, 'a', 'it creates a `a` wrapper tag');
-  equal(tag.attributes['class'].trim(), 'badge-wrapper', 'it has the correct class');
+  assert.equal(tag.name, 'a', 'it creates a `a` wrapper tag');
+  assert.equal(tag.attributes['class'].trim(), 'badge-wrapper', 'it has the correct class');
 
   const label = tag.children[1];
-  equal(label.attributes.title, 'cool description', 'it has the correct title');
+  assert.equal(label.attributes.title, 'cool description', 'it has the correct title');
 
-  equal(label.children[0].data, 'hello', 'it has the category name');
+  assert.equal(label.children[0].data, 'hello', 'it has the category name');
 });
 
-test("undefined color", function() {
+QUnit.test("undefined color", assert => {
   const store = createStore();
   const noColor = store.createRecord('category', { name: 'hello', id: 123 });
   const tag = parseHTML(categoryBadgeHTML(noColor))[0];
 
-  blank(tag.attributes.style, "it has no color style because there are no colors");
+  assert.blank(tag.attributes.style, "it has no color style because there are no colors");
 });
 
-test("allowUncategorized", function() {
+QUnit.test("allowUncategorized", assert => {
   const store = createStore();
   const uncategorized = store.createRecord('category', {name: 'uncategorized', id: 345});
   sandbox.stub(Discourse.Site, 'currentProp').withArgs('uncategorized_category_id').returns(345);
 
-  blank(categoryBadgeHTML(uncategorized), "it doesn't return HTML for uncategorized by default");
-  present(categoryBadgeHTML(uncategorized, {allowUncategorized: true}), "it returns HTML");
-});
+  assert.blank(categoryBadgeHTML(uncategorized), "it doesn't return HTML for uncategorized by default");
+  assert.present(categoryBadgeHTML(uncategorized, {allowUncategorized: true}), "it returns HTML");
+});
\ No newline at end of file
diff --git a/test/javascripts/lib/click-track-edit-history-test.js.es6 b/test/javascripts/lib/click-track-edit-history-test.js.es6
index 4350ab6d22b..bf0c6abad94 100644
--- a/test/javascripts/lib/click-track-edit-history-test.js.es6
+++ b/test/javascripts/lib/click-track-edit-history-test.js.es6
@@ -1,4 +1,3 @@
-import { blank } from 'helpers/qunit-helpers';
 import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 
@@ -6,8 +5,8 @@ var windowOpen,
     win,
     redirectTo;
 
-module("lib:click-track-edit-history", {
-  setup: function() {
+QUnit.module("lib:click-track-edit-history", {
+  beforeEach() {
 
     // Prevent any of these tests from navigating away
     win = {focus: function() { } };
@@ -56,56 +55,57 @@ var generateClickEventOn = function(selector) {
   return $.Event("click", { currentTarget: fixture(selector)[0] });
 };
 
-test("does not track clicks on lightboxes", function() {
+QUnit.test("does not track clicks on lightboxes", assert => {
   var clickEvent = generateClickEventOn('.lightbox');
   sandbox.stub(clickEvent, "preventDefault");
-  ok(track(clickEvent));
-  ok(!clickEvent.preventDefault.calledOnce);
+  assert.ok(track(clickEvent));
+  assert.ok(!clickEvent.preventDefault.calledOnce);
 });
 
-test("it calls preventDefault when clicking on an a", function() {
+QUnit.test("it calls preventDefault when clicking on an a", assert => {
   var clickEvent = generateClickEventOn('a');
   sandbox.stub(clickEvent, "preventDefault");
   track(clickEvent);
-  ok(clickEvent.preventDefault.calledOnce);
-  ok(DiscourseURL.redirectTo.calledOnce);
+  assert.ok(clickEvent.preventDefault.calledOnce);
+  assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
-test("does not track clicks when forcibly disabled", function() {
-  ok(track(generateClickEventOn('.no-track-link')));
+QUnit.test("does not track clicks when forcibly disabled", assert => {
+  assert.ok(track(generateClickEventOn('.no-track-link')));
 });
 
-test("does not track clicks on back buttons", function() {
-  ok(track(generateClickEventOn('.back')));
+QUnit.test("does not track clicks on back buttons", assert => {
+  assert.ok(track(generateClickEventOn('.back')));
 });
 
-test("does not track clicks on quote buttons", function() {
-  ok(track(generateClickEventOn('.quote-other-topic')));
+QUnit.test("does not track clicks on quote buttons", assert => {
+  assert.ok(track(generateClickEventOn('.quote-other-topic')));
 });
 
-test("does not track clicks on category badges", () => {
-  ok(track(generateClickEventOn('.hashtag')));
+QUnit.test("does not track clicks on category badges", assert => {
+  assert.ok(track(generateClickEventOn('.hashtag')));
 });
 
-test("removes the href and put it as a data attribute", function() {
+QUnit.test("removes the href and put it as a data attribute", assert => {
   track(generateClickEventOn('a'));
 
   var $link = fixture('a').first();
-  ok($link.hasClass('no-href'));
-  equal($link.data('href'), 'http://www.google.com');
-  blank($link.attr('href'));
-  ok($link.data('auto-route'));
-  ok(DiscourseURL.redirectTo.calledOnce);
+  assert.ok($link.hasClass('no-href'));
+  assert.equal($link.data('href'), 'http://www.google.com');
+  assert.blank($link.attr('href'));
+  assert.ok($link.data('auto-route'));
+  assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
-asyncTestDiscourse("restores the href after a while", function() {
-  expect(1);
+asyncTestDiscourse("restores the href after a while", function(assert) {
+  assert.expect(1);
 
   track(generateClickEventOn('a'));
 
+  const done = assert.async();
   setTimeout(function() {
-    start();
-    equal(fixture('a').attr('href'), "http://www.google.com");
+    done();
+    assert.equal(fixture('a').attr('href'), "http://www.google.com");
   }, 75);
 });
 
@@ -115,32 +115,32 @@ var trackRightClick = function(target) {
   return track(clickEvent);
 };
 
-test("right clicks change the href", function() {
-  ok(trackRightClick('a'));
-  equal(fixture('a').first().prop('href'), "http://www.google.com/");
+QUnit.test("right clicks change the href", assert => {
+  assert.ok(trackRightClick('a'));
+  assert.equal(fixture('a').first().prop('href'), "http://www.google.com/");
 });
 
-test("right clicks are tracked", function() {
+QUnit.test("right clicks are tracked", assert => {
   Discourse.SiteSettings.track_external_right_clicks = true;
   trackRightClick('a');
-  equal(fixture('a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337");
+  assert.equal(fixture('a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337");
 });
 
-test("preventDefault is not called for right clicks", function() {
+QUnit.test("preventDefault is not called for right clicks", assert => {
   var clickEvent = generateClickEventOn('a');
   clickEvent.which = 3;
   sandbox.stub(clickEvent, "preventDefault");
-  ok(track(clickEvent));
-  ok(!clickEvent.preventDefault.calledOnce);
+  assert.ok(track(clickEvent));
+  assert.ok(!clickEvent.preventDefault.calledOnce);
 });
 
 var testOpenInANewTab = function(description, clickEventModifier) {
-  test(description, function() {
+  test(description, function(assert) {
     var clickEvent = generateClickEventOn('a');
     clickEventModifier(clickEvent);
     sandbox.stub(clickEvent, "preventDefault");
-    ok(track(clickEvent));
-    ok(!clickEvent.preventDefault.calledOnce);
+    assert.ok(track(clickEvent));
+    assert.ok(!clickEvent.preventDefault.calledOnce);
   });
 };
 
@@ -160,31 +160,31 @@ testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent)
   clickEvent.button = 2;
 });
 
-test("tracks via AJAX if we're on the same site", function() {
+QUnit.test("tracks via AJAX if we're on the same site", assert => {
   sandbox.stub(DiscourseURL, "routeTo");
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
-  ok(!track(generateClickEventOn('#same-site')));
-  ok(DiscourseURL.routeTo.calledOnce);
+  assert.ok(!track(generateClickEventOn('#same-site')));
+  assert.ok(DiscourseURL.routeTo.calledOnce);
 });
 
-test("does not track via AJAX for attachments", function() {
+QUnit.test("does not track via AJAX for attachments", assert => {
   sandbox.stub(DiscourseURL, "routeTo");
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
-  ok(!track(generateClickEventOn('.attachment')));
-  ok(DiscourseURL.redirectTo.calledOnce);
+  assert.ok(!track(generateClickEventOn('.attachment')));
+  assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
-test("tracks custom urls when opening in another window", function() {
+QUnit.test("tracks custom urls when opening in another window", assert => {
   var clickEvent = generateClickEventOn('a');
   sandbox.stub(Discourse.User, "currentProp").withArgs('external_links_in_new_tab').returns(true);
-  ok(!track(clickEvent));
-  ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank'));
+  assert.ok(!track(clickEvent));
+  assert.ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank'));
 });
 
-test("tracks custom urls when opening in another window", function() {
+QUnit.test("tracks custom urls when opening in another window", assert => {
   var clickEvent = generateClickEventOn('a');
-  ok(!track(clickEvent));
-  ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337'));
+  assert.ok(!track(clickEvent));
+  assert.ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337'));
 });
diff --git a/test/javascripts/lib/click-track-profile-page-test.js.es6 b/test/javascripts/lib/click-track-profile-page-test.js.es6
index bc0b46e5595..9e91d6ea709 100644
--- a/test/javascripts/lib/click-track-profile-page-test.js.es6
+++ b/test/javascripts/lib/click-track-profile-page-test.js.es6
@@ -1,4 +1,3 @@
-import { blank } from 'helpers/qunit-helpers';
 import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 
@@ -6,8 +5,8 @@ var windowOpen,
     win,
     redirectTo;
 
-module("lib:click-track-profile-page", {
-  setup: function() {
+QUnit.module("lib:click-track-profile-page", {
+  beforeEach() {
 
     // Prevent any of these tests from navigating away
     win = {focus: function() { } };
@@ -50,56 +49,57 @@ var generateClickEventOn = function(selector) {
   return $.Event("click", { currentTarget: fixture(selector)[0] });
 };
 
-test("does not track clicks on lightboxes", function() {
+QUnit.test("does not track clicks on lightboxes", assert => {
   var clickEvent = generateClickEventOn('.lightbox');
   sandbox.stub(clickEvent, "preventDefault");
-  ok(track(clickEvent));
-  ok(!clickEvent.preventDefault.calledOnce);
+  assert.ok(track(clickEvent));
+  assert.ok(!clickEvent.preventDefault.calledOnce);
 });
 
-test("it calls preventDefault when clicking on an a", function() {
+QUnit.test("it calls preventDefault when clicking on an a", assert => {
   var clickEvent = generateClickEventOn('a');
   sandbox.stub(clickEvent, "preventDefault");
   track(clickEvent);
-  ok(clickEvent.preventDefault.calledOnce);
-  ok(DiscourseURL.redirectTo.calledOnce);
+  assert.ok(clickEvent.preventDefault.calledOnce);
+  assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
-test("does not track clicks when forcibly disabled", function() {
-  ok(track(generateClickEventOn('.no-track-link')));
+QUnit.test("does not track clicks when forcibly disabled", assert => {
+  assert.ok(track(generateClickEventOn('.no-track-link')));
 });
 
-test("does not track clicks on back buttons", function() {
-  ok(track(generateClickEventOn('.back')));
+QUnit.test("does not track clicks on back buttons", assert => {
+  assert.ok(track(generateClickEventOn('.back')));
 });
 
-test("does not track clicks on quote buttons", function() {
-  ok(track(generateClickEventOn('.quote-other-topic')));
+QUnit.test("does not track clicks on quote buttons", assert => {
+  assert.ok(track(generateClickEventOn('.quote-other-topic')));
 });
 
-test("does not track clicks on category badges", () => {
-  ok(track(generateClickEventOn('.hashtag')));
+QUnit.test("does not track clicks on category badges", assert => {
+  assert.ok(track(generateClickEventOn('.hashtag')));
 });
 
-test("removes the href and put it as a data attribute", function() {
+QUnit.test("removes the href and put it as a data attribute", assert => {
   track(generateClickEventOn('a'));
 
   var $link = fixture('a').first();
-  ok($link.hasClass('no-href'));
-  equal($link.data('href'), 'http://www.google.com');
-  blank($link.attr('href'));
-  ok($link.data('auto-route'));
-  ok(DiscourseURL.redirectTo.calledOnce);
+  assert.ok($link.hasClass('no-href'));
+  assert.equal($link.data('href'), 'http://www.google.com');
+  assert.blank($link.attr('href'));
+  assert.ok($link.data('auto-route'));
+  assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
-asyncTestDiscourse("restores the href after a while", function() {
-  expect(1);
+asyncTestDiscourse("restores the href after a while", function(assert) {
+  assert.expect(1);
 
   track(generateClickEventOn('a'));
 
+  const done = assert.async();
   setTimeout(function() {
-    start();
-    equal(fixture('a').attr('href'), "http://www.google.com");
+    done();
+    assert.equal(fixture('a').attr('href'), "http://www.google.com");
   }, 75);
 });
 
@@ -109,38 +109,38 @@ var trackRightClick = function(target) {
   return track(clickEvent);
 };
 
-test("right clicks change the href", function() {
-  ok(trackRightClick('a'));
-  equal(fixture('a').first().prop('href'), "http://www.google.com/");
+QUnit.test("right clicks change the href", assert => {
+  assert.ok(trackRightClick('a'));
+  assert.equal(fixture('a').first().prop('href'), "http://www.google.com/");
 });
 
-test("right clicks are tracked", function() {
+QUnit.test("right clicks are tracked", assert => {
   Discourse.SiteSettings.track_external_right_clicks = true;
   trackRightClick('a');
-  equal(fixture('.first a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337");
+  assert.equal(fixture('.first a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337");
 });
 
-test("right clicks are tracked for second excerpt", function() {
+QUnit.test("right clicks are tracked for second excerpt", assert => {
   Discourse.SiteSettings.track_external_right_clicks = true;
   trackRightClick('.second a');
-  equal(fixture('.second a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331");
+  assert.equal(fixture('.second a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331");
 });
 
-test("preventDefault is not called for right clicks", function() {
+QUnit.test("preventDefault is not called for right clicks", assert => {
   var clickEvent = generateClickEventOn('a');
   clickEvent.which = 3;
   sandbox.stub(clickEvent, "preventDefault");
-  ok(track(clickEvent));
-  ok(!clickEvent.preventDefault.calledOnce);
+  assert.ok(track(clickEvent));
+  assert.ok(!clickEvent.preventDefault.calledOnce);
 });
 
 var testOpenInANewTab = function(description, clickEventModifier) {
-  test(description, function() {
+  test(description, function(assert) {
     var clickEvent = generateClickEventOn('a');
     clickEventModifier(clickEvent);
     sandbox.stub(clickEvent, "preventDefault");
-    ok(track(clickEvent));
-    ok(!clickEvent.preventDefault.calledOnce);
+    assert.ok(track(clickEvent));
+    assert.ok(!clickEvent.preventDefault.calledOnce);
   });
 };
 
@@ -160,44 +160,44 @@ testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent)
   clickEvent.button = 2;
 });
 
-test("tracks via AJAX if we're on the same site", function() {
+QUnit.test("tracks via AJAX if we're on the same site", assert => {
   sandbox.stub(DiscourseURL, "routeTo");
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
-  ok(!track(generateClickEventOn('#same-site')));
-  ok(DiscourseURL.routeTo.calledOnce);
+  assert.ok(!track(generateClickEventOn('#same-site')));
+  assert.ok(DiscourseURL.routeTo.calledOnce);
 });
 
-test("does not track via AJAX for attachments", function() {
+QUnit.test("does not track via AJAX for attachments", assert => {
   sandbox.stub(DiscourseURL, "routeTo");
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
-  ok(!track(generateClickEventOn('.attachment')));
-  ok(DiscourseURL.redirectTo.calledOnce);
+  assert.ok(!track(generateClickEventOn('.attachment')));
+  assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
-test("tracks custom urls when opening in another window", function() {
+QUnit.test("tracks custom urls when opening in another window", assert => {
   var clickEvent = generateClickEventOn('a');
   sandbox.stub(Discourse.User, "currentProp").withArgs('external_links_in_new_tab').returns(true);
-  ok(!track(clickEvent));
-  ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank'));
+  assert.ok(!track(clickEvent));
+  assert.ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank'));
 });
 
-test("tracks custom urls on second excerpt when opening in another window", function() {
+QUnit.test("tracks custom urls on second excerpt when opening in another window", assert => {
   var clickEvent = generateClickEventOn('.second a');
   sandbox.stub(Discourse.User, "currentProp").withArgs('external_links_in_new_tab').returns(true);
-  ok(!track(clickEvent));
-  ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331', '_blank'));
+  assert.ok(!track(clickEvent));
+  assert.ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331', '_blank'));
 });
 
-test("tracks custom urls when opening in another window", function() {
+QUnit.test("tracks custom urls when opening in another window", assert => {
   var clickEvent = generateClickEventOn('a');
-  ok(!track(clickEvent));
-  ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337'));
+  assert.ok(!track(clickEvent));
+  assert.ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337'));
 });
 
-test("tracks custom urls on second excerpt when opening in another window", function() {
+QUnit.test("tracks custom urls on second excerpt when opening in another window", assert => {
   var clickEvent = generateClickEventOn('.second a');
-  ok(!track(clickEvent));
-  ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331'));
+  assert.ok(!track(clickEvent));
+  assert.ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=24&topic_id=7331'));
 });
diff --git a/test/javascripts/lib/click-track-test.js.es6 b/test/javascripts/lib/click-track-test.js.es6
index cb05ba7e565..5f33e03374b 100644
--- a/test/javascripts/lib/click-track-test.js.es6
+++ b/test/javascripts/lib/click-track-test.js.es6
@@ -1,4 +1,3 @@
-import { blank } from 'helpers/qunit-helpers';
 import DiscourseURL from "discourse/lib/url";
 import ClickTrack from "discourse/lib/click-track";
 
@@ -6,8 +5,8 @@ var windowOpen,
     win,
     redirectTo;
 
-module("lib:click-track", {
-  setup: function() {
+QUnit.module("lib:click-track", {
+  beforeEach() {
     // Prevent any of these tests from navigating away
     win = {focus: function() { } };
     redirectTo = sandbox.stub(DiscourseURL, "redirectTo");
@@ -47,87 +46,88 @@ var generateClickEventOn = function(selector) {
   return $.Event("click", { currentTarget: fixture(selector)[0] });
 };
 
-test("does not track clicks on lightboxes", function() {
+QUnit.test("does not track clicks on lightboxes", function(assert) {
   var clickEvent = generateClickEventOn('.lightbox');
   sandbox.stub(clickEvent, "preventDefault");
-  ok(track(clickEvent));
-  ok(!clickEvent.preventDefault.calledOnce);
+  assert.ok(track(clickEvent));
+  assert.ok(!clickEvent.preventDefault.calledOnce);
 });
 
-test("it calls preventDefault when clicking on an a", function() {
+QUnit.test("it calls preventDefault when clicking on an a", function(assert) {
   var clickEvent = generateClickEventOn('a');
   sandbox.stub(clickEvent, "preventDefault");
   track(clickEvent);
-  ok(clickEvent.preventDefault.calledOnce);
-  ok(DiscourseURL.redirectTo.calledOnce);
+  assert.ok(clickEvent.preventDefault.calledOnce);
+  assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
-test("does not track clicks when forcibly disabled", function() {
-  ok(track(generateClickEventOn('.no-track-link')));
+QUnit.test("does not track clicks when forcibly disabled", function(assert) {
+  assert.ok(track(generateClickEventOn('.no-track-link')));
 });
 
-test("does not track clicks on back buttons", function() {
-  ok(track(generateClickEventOn('.back')));
+QUnit.test("does not track clicks on back buttons", function(assert) {
+  assert.ok(track(generateClickEventOn('.back')));
 });
 
-test("does not track clicks in quotes", function() {
-  ok(track(generateClickEventOn('.inside-quote')));
+QUnit.test("does not track clicks in quotes", function(assert) {
+  assert.ok(track(generateClickEventOn('.inside-quote')));
 });
 
-test("does not track clicks on quote buttons", function() {
-  ok(track(generateClickEventOn('.quote-other-topic')));
+QUnit.test("does not track clicks on quote buttons", function(assert) {
+  assert.ok(track(generateClickEventOn('.quote-other-topic')));
 });
 
-test("does not track clicks on category badges", () => {
-  ok(track(generateClickEventOn('.hashtag')));
+QUnit.test("does not track clicks on category badges", assert => {
+  assert.ok(track(generateClickEventOn('.hashtag')));
 });
 
-test("does not track clicks on mailto", function() {
-  ok(track(generateClickEventOn('.mailto')));
+QUnit.test("does not track clicks on mailto", function(assert) {
+  assert.ok(track(generateClickEventOn('.mailto')));
 });
 
-test("removes the href and put it as a data attribute", function() {
+QUnit.test("removes the href and put it as a data attribute", function(assert) {
   track(generateClickEventOn('a'));
 
   var $link = fixture('a').first();
-  ok($link.hasClass('no-href'));
-  equal($link.data('href'), 'http://www.google.com');
-  blank($link.attr('href'));
-  ok($link.data('auto-route'));
-  ok(DiscourseURL.redirectTo.calledOnce);
+  assert.ok($link.hasClass('no-href'));
+  assert.equal($link.data('href'), 'http://www.google.com');
+  assert.blank($link.attr('href'));
+  assert.ok($link.data('auto-route'));
+  assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
-asyncTestDiscourse("restores the href after a while", function() {
-  expect(1);
+asyncTestDiscourse("restores the href after a while", function(assert) {
+  assert.expect(1);
 
   track(generateClickEventOn('a'));
 
+  const done = assert.async();
   setTimeout(function() {
-    start();
-    equal(fixture('a').attr('href'), "http://www.google.com");
+    done();
+    assert.equal(fixture('a').attr('href'), "http://www.google.com");
   }, 75);
 });
 
-var badgeClickCount = function(id, expected) {
+var badgeClickCount = function(assert, id, expected) {
   track(generateClickEventOn('#' + id));
   var $badge = $('span.badge', fixture('#' + id).first());
-  equal(parseInt($badge.html(), 10), expected);
+  assert.equal(parseInt($badge.html(), 10), expected);
 };
 
-test("does not update badge clicks on my own link", function() {
+QUnit.test("does not update badge clicks on my own link", function(assert) {
   sandbox.stub(Discourse.User, 'currentProp').withArgs('id').returns(314);
-  badgeClickCount('with-badge', 1);
+  badgeClickCount(assert, 'with-badge', 1);
 });
 
-test("does not update badge clicks in my own post", function() {
+QUnit.test("does not update badge clicks in my own post", function(assert) {
   sandbox.stub(Discourse.User, 'currentProp').withArgs('id').returns(3141);
-  badgeClickCount('with-badge-but-not-mine', 1);
+  badgeClickCount(assert, 'with-badge-but-not-mine', 1);
 });
 
-test("updates badge counts correctly", function() {
-  badgeClickCount('inside-onebox', 1);
-  badgeClickCount('inside-onebox-forced', 2);
-  badgeClickCount('with-badge', 2);
+QUnit.test("updates badge counts correctly", function(assert) {
+  badgeClickCount(assert, 'inside-onebox', 1);
+  badgeClickCount(assert, 'inside-onebox-forced', 2);
+  badgeClickCount(assert, 'with-badge', 2);
 });
 
 var trackRightClick = function() {
@@ -136,32 +136,32 @@ var trackRightClick = function() {
   return track(clickEvent);
 };
 
-test("right clicks change the href", function() {
-  ok(trackRightClick());
-  equal(fixture('a').first().prop('href'), "http://www.google.com/");
+QUnit.test("right clicks change the href", function(assert) {
+  assert.ok(trackRightClick());
+  assert.equal(fixture('a').first().prop('href'), "http://www.google.com/");
 });
 
-test("right clicks are tracked", function() {
+QUnit.test("right clicks are tracked", function(assert) {
   Discourse.SiteSettings.track_external_right_clicks = true;
   trackRightClick();
-  equal(fixture('a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337");
+  assert.equal(fixture('a').first().attr('href'), "/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337");
 });
 
-test("preventDefault is not called for right clicks", function() {
+QUnit.test("preventDefault is not called for right clicks", function(assert) {
   var clickEvent = generateClickEventOn('a');
   clickEvent.which = 3;
   sandbox.stub(clickEvent, "preventDefault");
-  ok(track(clickEvent));
-  ok(!clickEvent.preventDefault.calledOnce);
+  assert.ok(track(clickEvent));
+  assert.ok(!clickEvent.preventDefault.calledOnce);
 });
 
 var testOpenInANewTab = function(description, clickEventModifier) {
-  test(description, function() {
+  test(description, function(assert) {
     var clickEvent = generateClickEventOn('a');
     clickEventModifier(clickEvent);
     sandbox.stub(clickEvent, "preventDefault");
-    ok(track(clickEvent));
-    ok(!clickEvent.preventDefault.calledOnce);
+    assert.ok(track(clickEvent));
+    assert.ok(!clickEvent.preventDefault.calledOnce);
   });
 };
 
@@ -181,31 +181,31 @@ testOpenInANewTab("it opens in a new tab on middle click", function(clickEvent)
   clickEvent.button = 2;
 });
 
-test("tracks via AJAX if we're on the same site", function() {
+QUnit.test("tracks via AJAX if we're on the same site", function(assert) {
   sandbox.stub(DiscourseURL, "routeTo");
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
-  ok(!track(generateClickEventOn('#same-site')));
-  ok(DiscourseURL.routeTo.calledOnce);
+  assert.ok(!track(generateClickEventOn('#same-site')));
+  assert.ok(DiscourseURL.routeTo.calledOnce);
 });
 
-test("does not track via AJAX for attachments", function() {
+QUnit.test("does not track via AJAX for attachments", function(assert) {
   sandbox.stub(DiscourseURL, "routeTo");
   sandbox.stub(DiscourseURL, "origin").returns("http://discuss.domain.com");
 
-  ok(!track(generateClickEventOn('.attachment')));
-  ok(DiscourseURL.redirectTo.calledOnce);
+  assert.ok(!track(generateClickEventOn('.attachment')));
+  assert.ok(DiscourseURL.redirectTo.calledOnce);
 });
 
-test("tracks custom urls when opening in another window", function() {
+QUnit.test("tracks custom urls when opening in another window", function(assert) {
   var clickEvent = generateClickEventOn('a');
   sandbox.stub(Discourse.User, "currentProp").withArgs('external_links_in_new_tab').returns(true);
-  ok(!track(clickEvent));
-  ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank'));
+  assert.ok(!track(clickEvent));
+  assert.ok(windowOpen.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337', '_blank'));
 });
 
-test("tracks custom urls when opening in another window", function() {
+QUnit.test("tracks custom urls when opening in another window", function(assert) {
   var clickEvent = generateClickEventOn('a');
-  ok(!track(clickEvent));
-  ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337'));
+  assert.ok(!track(clickEvent));
+  assert.ok(redirectTo.calledWith('/clicks/track?url=http%3A%2F%2Fwww.google.com&post_id=42&topic_id=1337'));
 });
diff --git a/test/javascripts/lib/computed-test.js.es6 b/test/javascripts/lib/computed-test.js.es6
index 658f35e6757..5c29a3adba0 100644
--- a/test/javascripts/lib/computed-test.js.es6
+++ b/test/javascripts/lib/computed-test.js.es6
@@ -1,29 +1,29 @@
 import { setting, propertyEqual, propertyNotEqual, fmt, i18n, url } from 'discourse/lib/computed';
 
-module("lib:computed", {
-  setup: function() {
+QUnit.module("lib:computed", {
+  beforeEach() {
     sandbox.stub(I18n, "t", function(scope) {
       return "%@ translated: " + scope;
     });
   },
 
-  teardown: function() {
+  afterEach() {
     I18n.t.restore();
   }
 });
 
-test("setting", function() {
+QUnit.test("setting", assert => {
   var t = Em.Object.extend({
     vehicle: setting('vehicle'),
     missingProp: setting('madeUpThing')
   }).create();
 
   Discourse.SiteSettings.vehicle = "airplane";
-  equal(t.get('vehicle'), "airplane", "it has the value of the site setting");
-  ok(!t.get('missingProp'), "it is falsy when the site setting is not defined");
+  assert.equal(t.get('vehicle'), "airplane", "it has the value of the site setting");
+  assert.ok(!t.get('missingProp'), "it is falsy when the site setting is not defined");
 });
 
-test("propertyEqual", function() {
+QUnit.test("propertyEqual", assert => {
   var t = Em.Object.extend({
     same: propertyEqual('cookies', 'biscuits')
   }).create({
@@ -31,12 +31,12 @@ test("propertyEqual", function() {
     biscuits: 10
   });
 
-  ok(t.get('same'), "it is true when the properties are the same");
+  assert.ok(t.get('same'), "it is true when the properties are the same");
   t.set('biscuits', 9);
-  ok(!t.get('same'), "it isn't true when one property is different");
+  assert.ok(!t.get('same'), "it isn't true when one property is different");
 });
 
-test("propertyNotEqual", function() {
+QUnit.test("propertyNotEqual", assert => {
   var t = Em.Object.extend({
     diff: propertyNotEqual('cookies', 'biscuits')
   }).create({
@@ -44,13 +44,13 @@ test("propertyNotEqual", function() {
     biscuits: 10
   });
 
-  ok(!t.get('diff'), "it isn't true when the properties are the same");
+  assert.ok(!t.get('diff'), "it isn't true when the properties are the same");
   t.set('biscuits', 9);
-  ok(t.get('diff'), "it is true when one property is different");
+  assert.ok(t.get('diff'), "it is true when one property is different");
 });
 
 
-test("fmt", function() {
+QUnit.test("fmt", assert => {
   var t = Em.Object.extend({
     exclaimyUsername: fmt('username', "!!! %@ !!!"),
     multiple: fmt('username', 'mood', "%@ is %@")
@@ -59,17 +59,17 @@ test("fmt", function() {
     mood: "happy"
   });
 
-  equal(t.get('exclaimyUsername'), '!!! eviltrout !!!', "it inserts the string");
-  equal(t.get('multiple'), "eviltrout is happy", "it inserts multiple strings");
+  assert.equal(t.get('exclaimyUsername'), '!!! eviltrout !!!', "it inserts the string");
+  assert.equal(t.get('multiple'), "eviltrout is happy", "it inserts multiple strings");
 
   t.set('username', 'codinghorror');
-  equal(t.get('multiple'), "codinghorror is happy", "it supports changing properties");
+  assert.equal(t.get('multiple'), "codinghorror is happy", "it supports changing properties");
   t.set('mood', 'ecstatic');
-  equal(t.get('multiple'), "codinghorror is ecstatic", "it supports changing another property");
+  assert.equal(t.get('multiple'), "codinghorror is ecstatic", "it supports changing another property");
 });
 
 
-test("i18n", function() {
+QUnit.test("i18n", assert => {
   var t = Em.Object.extend({
     exclaimyUsername: i18n('username', "!!! %@ !!!"),
     multiple: i18n('username', 'mood', "%@ is %@")
@@ -78,17 +78,17 @@ test("i18n", function() {
     mood: "happy"
   });
 
-  equal(t.get('exclaimyUsername'), '%@ translated: !!! eviltrout !!!', "it inserts the string and then translates");
-  equal(t.get('multiple'), "%@ translated: eviltrout is happy", "it inserts multiple strings and then translates");
+  assert.equal(t.get('exclaimyUsername'), '%@ translated: !!! eviltrout !!!', "it inserts the string and then translates");
+  assert.equal(t.get('multiple'), "%@ translated: eviltrout is happy", "it inserts multiple strings and then translates");
 
   t.set('username', 'codinghorror');
-  equal(t.get('multiple'), "%@ translated: codinghorror is happy", "it supports changing properties");
+  assert.equal(t.get('multiple'), "%@ translated: codinghorror is happy", "it supports changing properties");
   t.set('mood', 'ecstatic');
-  equal(t.get('multiple'), "%@ translated: codinghorror is ecstatic", "it supports changing another property");
+  assert.equal(t.get('multiple'), "%@ translated: codinghorror is ecstatic", "it supports changing another property");
 });
 
 
-test("url", function() {
+QUnit.test("url", assert => {
   var t, testClass;
   
   testClass = Em.Object.extend({
@@ -96,9 +96,9 @@ test("url", function() {
   });
 
   t = testClass.create({ username: 'eviltrout' });
-  equal(t.get('userUrl'), "/u/eviltrout", "it supports urls without a prefix");
+  assert.equal(t.get('userUrl'), "/u/eviltrout", "it supports urls without a prefix");
 
   Discourse.BaseUri = "/prefixed";
   t = testClass.create({ username: 'eviltrout' });
-  equal(t.get('userUrl'), "/prefixed/u/eviltrout", "it supports urls with a prefix");
+  assert.equal(t.get('userUrl'), "/prefixed/u/eviltrout", "it supports urls with a prefix");
 });
diff --git a/test/javascripts/lib/discourse-test.js.es6 b/test/javascripts/lib/discourse-test.js.es6
index a6547741238..4bafe429abb 100644
--- a/test/javascripts/lib/discourse-test.js.es6
+++ b/test/javascripts/lib/discourse-test.js.es6
@@ -1,7 +1,7 @@
-module("lib:discourse");
+QUnit.module("lib:discourse");
 
-test("getURL on subfolder install", function() {
+QUnit.test("getURL on subfolder install", assert => {
   Discourse.BaseUri = "/forum";
-  equal(Discourse.getURL("/"), "/forum/", "root url has subfolder");
-  equal(Discourse.getURL("/u/neil"), "/forum/u/neil", "relative url has subfolder");
-});
+  assert.equal(Discourse.getURL("/"), "/forum/", "root url has subfolder");
+  assert.equal(Discourse.getURL("/u/neil"), "/forum/u/neil", "relative url has subfolder");
+});
\ No newline at end of file
diff --git a/test/javascripts/lib/emoji-test.js.es6 b/test/javascripts/lib/emoji-test.js.es6
index 488d58caa2a..8512b9f05ce 100644
--- a/test/javascripts/lib/emoji-test.js.es6
+++ b/test/javascripts/lib/emoji-test.js.es6
@@ -1,16 +1,16 @@
 import { emojiSearch, IMAGE_VERSION as v } from 'pretty-text/emoji';
 import { emojiUnescape } from 'discourse/lib/text';
 
-module('lib:emoji');
+QUnit.module('lib:emoji');
 
-function testUnescape(input, expected, description) {
-  equal(emojiUnescape(input), expected, description);
-};
+QUnit.test("emojiUnescape", assert => {
+  const testUnescape = (input, expected, description) => {
+    assert.equal(emojiUnescape(input), expected, description);
+  };
 
-test("emojiUnescape", () => {
   testUnescape("Not emoji :O) :frog) :smile)", "Not emoji :O) :frog) :smile)", "title without emoji");
   testUnescape("Not emoji :frog :smile", "Not emoji :frog :smile", "end colon is not optional");
-  testUnescape("emoticons :)", "emoticons <img src='/images/emoji/emoji_one/slight_smile.png?v=3' title='slight_smile' alt='slight_smile' class='emoji'>", "emoticons are still supported");
+  testUnescape("emoticons :)", `emoticons <img src='/images/emoji/emoji_one/slight_smile.png?v=${v}' title='slight_smile' alt='slight_smile' class='emoji'>`, "emoticons are still supported");
   testUnescape("With emoji :O: :frog: :smile:",
     `With emoji <img src='/images/emoji/emoji_one/o.png?v=${v}' title='O' alt='O' class='emoji'> <img src='/images/emoji/emoji_one/frog.png?v=${v}' title='frog' alt='frog' class='emoji'> <img src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`,
     "title with emoji");
@@ -18,15 +18,17 @@ test("emojiUnescape", () => {
   testUnescape("(:frog:) :)", `(<img src='/images/emoji/emoji_one/frog.png?v=${v}' title='frog' alt='frog' class='emoji'>) <img src='/images/emoji/emoji_one/slight_smile.png?v=${v}' title='slight_smile' alt='slight_smile' class='emoji'>`, "non-word characters allowed next to emoji");
   testUnescape(":smile: hi", `<img src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'> hi`, "start of line");
   testUnescape("hi :smile:", `hi <img src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'>`, "end of line");
+  testUnescape("hi :blonde_woman:t4:", `hi <img src='/images/emoji/emoji_one/blonde_woman/4.png?v=${v}' title='blonde_woman:t4' alt='blonde_woman:t4' class='emoji'>`, "support for skin tones");
+  testUnescape("hi :blonde_woman:t4: :blonde_man:t6:", `hi <img src='/images/emoji/emoji_one/blonde_woman/4.png?v=${v}' title='blonde_woman:t4' alt='blonde_woman:t4' class='emoji'> <img src='/images/emoji/emoji_one/blonde_man/6.png?v=${v}' title='blonde_man:t6' alt='blonde_man:t6' class='emoji'>`, "support for multiple skin tones");
+  testUnescape("hi :blonde_man:t6", "hi :blonde_man:t6", "end colon not optional for skin tones");
 
 });
 
-test("Emoji search", () => {
-
+QUnit.test("Emoji search", assert => {
   // able to find an alias
-  equal(emojiSearch("+1").length, 1);
+  assert.equal(emojiSearch("+1").length, 1);
 
   // able to find middle of line search
-  equal(emojiSearch("check", {maxResults: 3}).length, 3);
+  assert.equal(emojiSearch("check", {maxResults: 3}).length, 3);
 
 });
diff --git a/test/javascripts/lib/formatter-test.js.es6 b/test/javascripts/lib/formatter-test.js.es6
index 31be0668ad8..9e929e1853e 100644
--- a/test/javascripts/lib/formatter-test.js.es6
+++ b/test/javascripts/lib/formatter-test.js.es6
@@ -2,12 +2,12 @@ var clock;
 
 import { relativeAge, autoUpdatingRelativeAge, updateRelativeAge, breakUp, number, longDate } from 'discourse/lib/formatter';
 
-module("lib:formatter", {
-  setup: function() {
+QUnit.module("lib:formatter", {
+  beforeEach() {
     clock = sinon.useFakeTimers(new Date(2012,11,31,12,0).getTime());
   },
 
-  teardown: function() {
+  afterEach() {
     clock.restore();
   }
 });
@@ -34,7 +34,7 @@ var shortDate = function(days){
   return moment().subtract(days, 'days').format('MMM D');
 };
 
-test("formating medium length dates", function() {
+QUnit.test("formating medium length dates", assert => {
 
   format = "medium";
   var strip = function(html){
@@ -46,133 +46,133 @@ test("formating medium length dates", function() {
   };
 
   leaveAgo = true;
-  equal(strip(formatMins(1.4)), "1 min ago");
-  equal(strip(formatMins(2)), "2 mins ago");
-  equal(strip(formatMins(55)), "55 mins ago");
-  equal(strip(formatMins(56)), "1 hour ago");
-  equal(strip(formatHours(4)), "4 hours ago");
-  equal(strip(formatHours(22)), "22 hours ago");
-  equal(strip(formatHours(23)), "23 hours ago");
-  equal(strip(formatHours(23.5)), "1 day ago");
-  equal(strip(formatDays(4.85)), "4 days ago");
+  assert.equal(strip(formatMins(1.4)), "1 min ago");
+  assert.equal(strip(formatMins(2)), "2 mins ago");
+  assert.equal(strip(formatMins(55)), "55 mins ago");
+  assert.equal(strip(formatMins(56)), "1 hour ago");
+  assert.equal(strip(formatHours(4)), "4 hours ago");
+  assert.equal(strip(formatHours(22)), "22 hours ago");
+  assert.equal(strip(formatHours(23)), "23 hours ago");
+  assert.equal(strip(formatHours(23.5)), "1 day ago");
+  assert.equal(strip(formatDays(4.85)), "4 days ago");
 
   leaveAgo = false;
-  equal(strip(formatMins(0)), "just now");
-  equal(strip(formatMins(1.4)), "1 min");
-  equal(strip(formatMins(2)), "2 mins");
-  equal(strip(formatMins(55)), "55 mins");
-  equal(strip(formatMins(56)), "1 hour");
-  equal(strip(formatHours(4)), "4 hours");
-  equal(strip(formatHours(22)), "22 hours");
-  equal(strip(formatHours(23)), "23 hours");
-  equal(strip(formatHours(23.5)), "1 day");
-  equal(strip(formatDays(4.85)), "4 days");
+  assert.equal(strip(formatMins(0)), "just now");
+  assert.equal(strip(formatMins(1.4)), "1 min");
+  assert.equal(strip(formatMins(2)), "2 mins");
+  assert.equal(strip(formatMins(55)), "55 mins");
+  assert.equal(strip(formatMins(56)), "1 hour");
+  assert.equal(strip(formatHours(4)), "4 hours");
+  assert.equal(strip(formatHours(22)), "22 hours");
+  assert.equal(strip(formatHours(23)), "23 hours");
+  assert.equal(strip(formatHours(23.5)), "1 day");
+  assert.equal(strip(formatDays(4.85)), "4 days");
 
-  equal(strip(formatDays(6)), shortDate(6));
-  equal(strip(formatDays(100)), shortDate(100)); // eg: Jan 23
-  equal(strip(formatDays(500)), shortDateYear(500));
+  assert.equal(strip(formatDays(6)), shortDate(6));
+  assert.equal(strip(formatDays(100)), shortDate(100)); // eg: Jan 23
+  assert.equal(strip(formatDays(500)), shortDateYear(500));
 
-  equal($(formatDays(0)).attr("title"), longDate(new Date()));
-  equal($(formatDays(0)).attr("class"), "date");
+  assert.equal($(formatDays(0)).attr("title"), longDate(new Date()));
+  assert.equal($(formatDays(0)).attr("class"), "date");
 
   clock.restore();
   clock = sinon.useFakeTimers(new Date(2012,0,9,12,0).getTime()); // Jan 9, 2012
 
-  equal(strip(formatDays(8)), shortDate(8));
-  equal(strip(formatDays(10)), shortDateYear(10));
+  assert.equal(strip(formatDays(8)), shortDate(8));
+  assert.equal(strip(formatDays(10)), shortDateYear(10));
 });
 
-test("formating tiny dates", function() {
+QUnit.test("formating tiny dates", assert => {
   var shortDateYear = function(days){
     return moment().subtract(days, 'days').format("MMM 'YY");
   };
 
   format = "tiny";
-  equal(formatMins(0), "1m");
-  equal(formatMins(1), "1m");
-  equal(formatMins(2), "2m");
-  equal(formatMins(60), "1h");
-  equal(formatHours(4), "4h");
-  equal(formatHours(23), "23h");
-  equal(formatHours(23.5), "1d");
-  equal(formatDays(1), "1d");
-  equal(formatDays(14), "14d");
-  equal(formatDays(15), shortDate(15));
-  equal(formatDays(92), shortDate(92));
-  equal(formatDays(364), shortDate(364));
-  equal(formatDays(365), shortDate(365));
-  equal(formatDays(366), shortDateYear(366)); // leap year
-  equal(formatDays(500), shortDateYear(500));
-  equal(formatDays(365*2 + 1), shortDateYear(365*2 + 1)); // one leap year
+  assert.equal(formatMins(0), "1m");
+  assert.equal(formatMins(1), "1m");
+  assert.equal(formatMins(2), "2m");
+  assert.equal(formatMins(60), "1h");
+  assert.equal(formatHours(4), "4h");
+  assert.equal(formatHours(23), "23h");
+  assert.equal(formatHours(23.5), "1d");
+  assert.equal(formatDays(1), "1d");
+  assert.equal(formatDays(14), "14d");
+  assert.equal(formatDays(15), shortDate(15));
+  assert.equal(formatDays(92), shortDate(92));
+  assert.equal(formatDays(364), shortDate(364));
+  assert.equal(formatDays(365), shortDate(365));
+  assert.equal(formatDays(366), shortDateYear(366)); // leap year
+  assert.equal(formatDays(500), shortDateYear(500));
+  assert.equal(formatDays(365*2 + 1), shortDateYear(365*2 + 1)); // one leap year
 
   var originalValue = Discourse.SiteSettings.relative_date_duration;
   Discourse.SiteSettings.relative_date_duration = 7;
-  equal(formatDays(7), "7d");
-  equal(formatDays(8), shortDate(8));
+  assert.equal(formatDays(7), "7d");
+  assert.equal(formatDays(8), shortDate(8));
 
   Discourse.SiteSettings.relative_date_duration = 1;
-  equal(formatDays(1), "1d");
-  equal(formatDays(2), shortDate(2));
+  assert.equal(formatDays(1), "1d");
+  assert.equal(formatDays(2), shortDate(2));
 
   Discourse.SiteSettings.relative_date_duration = 0;
-  equal(formatMins(0), "1m");
-  equal(formatMins(1), "1m");
-  equal(formatMins(2), "2m");
-  equal(formatMins(60), "1h");
-  equal(formatDays(1), shortDate(1));
-  equal(formatDays(2), shortDate(2));
-  equal(formatDays(366), shortDateYear(366));
+  assert.equal(formatMins(0), "1m");
+  assert.equal(formatMins(1), "1m");
+  assert.equal(formatMins(2), "2m");
+  assert.equal(formatMins(60), "1h");
+  assert.equal(formatDays(1), shortDate(1));
+  assert.equal(formatDays(2), shortDate(2));
+  assert.equal(formatDays(366), shortDateYear(366));
 
   Discourse.SiteSettings.relative_date_duration = null;
-  equal(formatDays(1), '1d');
-  equal(formatDays(14), '14d');
-  equal(formatDays(15), shortDate(15));
+  assert.equal(formatDays(1), '1d');
+  assert.equal(formatDays(14), '14d');
+  assert.equal(formatDays(15), shortDate(15));
 
   Discourse.SiteSettings.relative_date_duration = 14;
 
   clock.restore();
   clock = sinon.useFakeTimers(new Date(2012,0,12,12,0).getTime()); // Jan 12, 2012
 
-  equal(formatDays(11), "11d");
-  equal(formatDays(14), "14d");
-  equal(formatDays(15), shortDateYear(15));
-  equal(formatDays(366), shortDateYear(366));
+  assert.equal(formatDays(11), "11d");
+  assert.equal(formatDays(14), "14d");
+  assert.equal(formatDays(15), shortDateYear(15));
+  assert.equal(formatDays(366), shortDateYear(366));
 
   clock.restore();
   clock = sinon.useFakeTimers(new Date(2012,0,20,12,0).getTime()); // Jan 20, 2012
 
-  equal(formatDays(14), "14d");
-  equal(formatDays(15), shortDate(15));
-  equal(formatDays(20), shortDateYear(20));
+  assert.equal(formatDays(14), "14d");
+  assert.equal(formatDays(15), shortDate(15));
+  assert.equal(formatDays(20), shortDateYear(20));
 
   Discourse.SiteSettings.relative_date_duration = originalValue;
 });
 
-test("autoUpdatingRelativeAge", function() {
+QUnit.test("autoUpdatingRelativeAge", assert => {
   var d = moment().subtract(1, 'day').toDate();
 
   var $elem = $(autoUpdatingRelativeAge(d));
-  equal($elem.data('format'), "tiny");
-  equal($elem.data('time'), d.getTime());
-  equal($elem.attr('title'), undefined);
+  assert.equal($elem.data('format'), "tiny");
+  assert.equal($elem.data('time'), d.getTime());
+  assert.equal($elem.attr('title'), undefined);
 
   $elem = $(autoUpdatingRelativeAge(d, {title: true}));
-  equal($elem.attr('title'), longDate(d));
+  assert.equal($elem.attr('title'), longDate(d));
 
   $elem = $(autoUpdatingRelativeAge(d,{format: 'medium', title: true, leaveAgo: true}));
-  equal($elem.data('format'), "medium-with-ago");
-  equal($elem.data('time'), d.getTime());
-  equal($elem.attr('title'), longDate(d));
-  equal($elem.html(), '1 day ago');
+  assert.equal($elem.data('format'), "medium-with-ago");
+  assert.equal($elem.data('time'), d.getTime());
+  assert.equal($elem.attr('title'), longDate(d));
+  assert.equal($elem.html(), '1 day ago');
 
   $elem = $(autoUpdatingRelativeAge(d,{format: 'medium'}));
-  equal($elem.data('format'), "medium");
-  equal($elem.data('time'), d.getTime());
-  equal($elem.attr('title'), undefined);
-  equal($elem.html(), '1 day');
+  assert.equal($elem.data('format'), "medium");
+  assert.equal($elem.data('time'), d.getTime());
+  assert.equal($elem.attr('title'), undefined);
+  assert.equal($elem.html(), '1 day');
 });
 
-test("updateRelativeAge", function(){
+QUnit.test("updateRelativeAge", assert =>{
 
   var d = new Date();
   var $elem = $(autoUpdatingRelativeAge(d));
@@ -180,7 +180,7 @@ test("updateRelativeAge", function(){
 
   updateRelativeAge($elem);
 
-  equal($elem.html(), "2m");
+  assert.equal($elem.html(), "2m");
 
   d = new Date();
   $elem = $(autoUpdatingRelativeAge(d, {format: 'medium', leaveAgo: true}));
@@ -188,27 +188,27 @@ test("updateRelativeAge", function(){
 
   updateRelativeAge($elem);
 
-  equal($elem.html(), "2 mins ago");
+  assert.equal($elem.html(), "2 mins ago");
 });
 
-test("breakUp", function(){
+QUnit.test("breakUp", assert =>{
 
   var b = function(s,hint){ return breakUp(s,hint); };
 
-  equal(b("hello"), "hello");
-  equal(b("helloworld"), "helloworld");
-  equal(b("HeMans11"), "He<wbr>&#8203;Mans<wbr>&#8203;11");
-  equal(b("he_man"), "he_<wbr>&#8203;man");
-  equal(b("he11111"), "he<wbr>&#8203;11111");
-  equal(b("HRCBob"), "HRC<wbr>&#8203;Bob");
-  equal(b("bobmarleytoo","Bob Marley Too"), "bob<wbr>&#8203;marley<wbr>&#8203;too");
+  assert.equal(b("hello"), "hello");
+  assert.equal(b("helloworld"), "helloworld");
+  assert.equal(b("HeMans11"), "He<wbr>&#8203;Mans<wbr>&#8203;11");
+  assert.equal(b("he_man"), "he_<wbr>&#8203;man");
+  assert.equal(b("he11111"), "he<wbr>&#8203;11111");
+  assert.equal(b("HRCBob"), "HRC<wbr>&#8203;Bob");
+  assert.equal(b("bobmarleytoo","Bob Marley Too"), "bob<wbr>&#8203;marley<wbr>&#8203;too");
 
 });
 
-test("number", function() {
-  equal(number(123), "123", "it returns a string version of the number");
-  equal(number("123"), "123", "it works with a string command");
-  equal(number(NaN), "0", "it returns 0 for NaN");
-  equal(number(3333), "3.3k", "it abbreviates thousands");
-  equal(number(2499999), "2.5M", "it abbreviates millions");
-});
+QUnit.test("number", assert => {
+  assert.equal(number(123), "123", "it returns a string version of the number");
+  assert.equal(number("123"), "123", "it works with a string command");
+  assert.equal(number(NaN), "0", "it returns 0 for NaN");
+  assert.equal(number(3333), "3.3k", "it abbreviates thousands");
+  assert.equal(number(2499999), "2.5M", "it abbreviates millions");
+});
\ No newline at end of file
diff --git a/test/javascripts/lib/i18n-test.js.es6 b/test/javascripts/lib/i18n-test.js.es6
index 9fbfa7beacc..314c4cc6938 100644
--- a/test/javascripts/lib/i18n-test.js.es6
+++ b/test/javascripts/lib/i18n-test.js.es6
@@ -1,8 +1,8 @@
-module("lib:i18n", {
+QUnit.module("lib:i18n", {
   _locale: I18n.locale,
   _translations: I18n.translations,
 
-  setup() {
+  beforeEach() {
     I18n.locale = "fr";
 
     I18n.translations = {
@@ -54,42 +54,42 @@ module("lib:i18n", {
     };
   },
 
-  teardown() {
+  afterEach() {
     I18n.locale = this._locale;
     I18n.translations = this._translations;
   }
 });
 
-test("defaults", function() {
-  equal(I18n.defaultLocale, "en", "it has English as default locale");
-  ok(I18n.pluralizationRules["en"], "it has English pluralizer");
+QUnit.test("defaults", assert => {
+  assert.equal(I18n.defaultLocale, "en", "it has English as default locale");
+  assert.ok(I18n.pluralizationRules["en"], "it has English pluralizer");
 });
 
-test("translations", function() {
-  equal(I18n.t("topic.reply.title"), "Répondre", "uses locale translations when they exist");
-  equal(I18n.t("topic.reply.help"), "begin composing a reply to this topic", "fallbacks to English translations");
-  equal(I18n.t("hello.world"), "Hello World!", "doesn't break if a key is overriden in a locale");
-  equal(I18n.t("hello.universe"), "", "allows empty strings");
+QUnit.test("translations", assert => {
+  assert.equal(I18n.t("topic.reply.title"), "Répondre", "uses locale translations when they exist");
+  assert.equal(I18n.t("topic.reply.help"), "begin composing a reply to this topic", "fallbacks to English translations");
+  assert.equal(I18n.t("hello.world"), "Hello World!", "doesn't break if a key is overriden in a locale");
+  assert.equal(I18n.t("hello.universe"), "", "allows empty strings");
 });
 
-test("extra translations", function() {
+QUnit.test("extra translations", assert => {
   I18n.extras = [{ "admin": { "title": "Discourse Admin" }}];
 
-  equal(I18n.t("admin.title"), "Discourse Admin", "it check extra translations when they exists");
+  assert.equal(I18n.t("admin.title"), "Discourse Admin", "it check extra translations when they exists");
 });
 
-test("pluralizations", function() {
-  equal(I18n.t("character_count", { count: 0 }), "0 ZERO");
-  equal(I18n.t("character_count", { count: 1 }), "1 ONE");
-  equal(I18n.t("character_count", { count: 2 }), "2 TWO");
-  equal(I18n.t("character_count", { count: 3 }), "3 FEW");
-  equal(I18n.t("character_count", { count: 10 }), "10 MANY");
-  equal(I18n.t("character_count", { count: 100 }), "100 OTHER");
+QUnit.test("pluralizations", assert => {
+  assert.equal(I18n.t("character_count", { count: 0 }), "0 ZERO");
+  assert.equal(I18n.t("character_count", { count: 1 }), "1 ONE");
+  assert.equal(I18n.t("character_count", { count: 2 }), "2 TWO");
+  assert.equal(I18n.t("character_count", { count: 3 }), "3 FEW");
+  assert.equal(I18n.t("character_count", { count: 10 }), "10 MANY");
+  assert.equal(I18n.t("character_count", { count: 100 }), "100 OTHER");
 
-  equal(I18n.t("word_count", { count: 0 }), "0 words");
-  equal(I18n.t("word_count", { count: 1 }), "1 word");
-  equal(I18n.t("word_count", { count: 2 }), "2 words");
-  equal(I18n.t("word_count", { count: 3 }), "3 words");
-  equal(I18n.t("word_count", { count: 10 }), "10 words");
-  equal(I18n.t("word_count", { count: 100 }), "100 words");
-});
+  assert.equal(I18n.t("word_count", { count: 0 }), "0 words");
+  assert.equal(I18n.t("word_count", { count: 1 }), "1 word");
+  assert.equal(I18n.t("word_count", { count: 2 }), "2 words");
+  assert.equal(I18n.t("word_count", { count: 3 }), "3 words");
+  assert.equal(I18n.t("word_count", { count: 10 }), "10 words");
+  assert.equal(I18n.t("word_count", { count: 100 }), "100 words");
+});
\ No newline at end of file
diff --git a/test/javascripts/lib/key-value-store-test.js.es6 b/test/javascripts/lib/key-value-store-test.js.es6
index 8f1b0ae4003..1bbafcc5cbc 100644
--- a/test/javascripts/lib/key-value-store-test.js.es6
+++ b/test/javascripts/lib/key-value-store-test.js.es6
@@ -1,18 +1,18 @@
 import KeyValueStore from "discourse/lib/key-value-store";
 
-module("lib:key-value-store");
+QUnit.module("lib:key-value-store");
 
-test("it's able to get the result back from the store", (assert) => {
+QUnit.test("it's able to get the result back from the store", (assert) => {
   const store = new KeyValueStore("_test");
   store.set({ key: "bob", value: "uncle" });
   assert.equal(store.get("bob"), "uncle");
 });
 
-test("is able to nuke the store", (assert) => {
+QUnit.test("is able to nuke the store", (assert) => {
   const store = new KeyValueStore("_test");
   store.set({ key: "bob1", value: "uncle" });
   store.abandonLocal();
   localStorage.a = 1;
   assert.equal(store.get("bob1"), void 0);
   assert.equal(localStorage.a, "1");
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/lib/preload-store-test.js.es6 b/test/javascripts/lib/preload-store-test.js.es6
index 391ac3d2f1e..26f8d04059c 100644
--- a/test/javascripts/lib/preload-store-test.js.es6
+++ b/test/javascripts/lib/preload-store-test.js.es6
@@ -1,74 +1,78 @@
-import { blank } from 'helpers/qunit-helpers';
 import PreloadStore from 'preload-store';
 
-module("preload-store", {
-  setup() {
+QUnit.module("preload-store", {
+  beforeEach() {
     PreloadStore.store('bane', 'evil');
   }
 });
 
-test("get", function() {
-  blank(PreloadStore.get('joker'), "returns blank for a missing key");
-  equal(PreloadStore.get('bane'), 'evil', "returns the value for that key");
+QUnit.test("get", assert => {
+  assert.blank(PreloadStore.get('joker'), "returns blank for a missing key");
+  assert.equal(PreloadStore.get('bane'), 'evil', "returns the value for that key");
 });
 
-test("remove", function() {
+QUnit.test("remove", assert => {
   PreloadStore.remove('bane');
-  blank(PreloadStore.get('bane'), "removes the value if the key exists");
+  assert.blank(PreloadStore.get('bane'), "removes the value if the key exists");
 });
 
-asyncTestDiscourse("getAndRemove returns a promise that resolves to null", function() {
-  expect(1);
+asyncTestDiscourse("getAndRemove returns a promise that resolves to null", function(assert) {
+  assert.expect(1);
 
+  const done = assert.async();
   PreloadStore.getAndRemove('joker').then(function(result) {
-    blank(result);
-    start();
+    assert.blank(result);
+    done();
   });
 });
 
-asyncTestDiscourse("getAndRemove returns a promise that resolves to the result of the finder", function() {
-  expect(1);
+asyncTestDiscourse("getAndRemove returns a promise that resolves to the result of the finder", function(assert) {
+  assert.expect(1);
 
-  var finder = function() { return 'batdance'; };
+  const done = assert.async();
+  const finder = function() { return 'batdance'; };
   PreloadStore.getAndRemove('joker', finder).then(function(result) {
-    equal(result, 'batdance');
-    start();
+    assert.equal(result, 'batdance');
+    done();
   });
 
 });
 
-asyncTestDiscourse("getAndRemove returns a promise that resolves to the result of the finder's promise", function() {
-  expect(1);
+asyncTestDiscourse("getAndRemove returns a promise that resolves to the result of the finder's promise", function(assert) {
+  assert.expect(1);
 
-  var finder = function() {
+  const finder = function() {
     return new Ember.RSVP.Promise(function(resolve) { resolve('hahahah'); });
   };
 
+  const done = assert.async();
   PreloadStore.getAndRemove('joker', finder).then(function(result) {
-    equal(result, 'hahahah');
-    start();
+    assert.equal(result, 'hahahah');
+    done();
   });
 });
 
-asyncTestDiscourse("returns a promise that rejects with the result of the finder's rejected promise", function() {
-  expect(1);
+asyncTestDiscourse("returns a promise that rejects with the result of the finder's rejected promise", function(assert) {
+  assert.expect(1);
 
-  var finder = function() {
+  const finder = function() {
     return new Ember.RSVP.Promise(function(resolve, reject) { reject('error'); });
   };
 
+  const done = assert.async();
   PreloadStore.getAndRemove('joker', finder).then(null, function(result) {
-    equal(result, 'error');
-    start();
+    assert.equal(result, 'error');
+    done();
   });
 
 });
 
-asyncTestDiscourse("returns a promise that resolves to 'evil'", function() {
-  expect(1);
+asyncTestDiscourse("returns a promise that resolves to 'evil'", function(assert) {
+  assert.expect(1);
 
+  const done = assert.async();
   PreloadStore.getAndRemove('bane').then(function(result) {
-    equal(result, 'evil');
-    start();
+    assert.equal(result, 'evil');
+    done();
   });
 });
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6
index 72c1adf30b9..8594976b73a 100644
--- a/test/javascripts/lib/pretty-text-test.js.es6
+++ b/test/javascripts/lib/pretty-text-test.js.es6
@@ -3,9 +3,9 @@ import Post from 'discourse/models/post';
 import { default as PrettyText, buildOptions } from 'pretty-text/pretty-text';
 import { IMAGE_VERSION as v} from 'pretty-text/emoji';
 
-module("lib:pretty-text");
+QUnit.module("lib:pretty-text");
 
-const defaultOpts = buildOptions({
+const rawOpts = {
   siteSettings: {
     enable_emoji: true,
     emoji_set: 'emoji_one',
@@ -15,604 +15,639 @@ const defaultOpts = buildOptions({
     censored_pattern: '\\d{3}-\\d{4}|tech\\w*'
   },
   getURL: url => url
-});
-
-function cooked(input, expected, text) {
-  equal(new PrettyText(defaultOpts).cook(input), expected.replace(/\/>/g, ">"), text);
 };
 
-function cookedOptions(input, opts, expected, text) {
-  equal(new PrettyText(_.merge({}, defaultOpts, opts)).cook(input), expected, text);
+const defaultOpts = buildOptions(rawOpts);
+
+QUnit.assert.cooked = function(input, expected, message) {
+  const actual = new PrettyText(defaultOpts).cook(input);
+  this.pushResult({
+    result: actual === expected.replace(/\/>/g, ">"),
+    actual,
+    expected,
+    message
+  });
 };
 
-function cookedPara(input, expected, text) {
-  cooked(input, `<p>${expected}</p>`, text);
+QUnit.assert.cookedOptions = function(input, opts, expected, message) {
+  const merged = _.merge({}, rawOpts, opts);
+  const actual = new PrettyText(buildOptions(merged)).cook(input);
+  this.pushResult({
+    result: actual === expected,
+    actual,
+    expected,
+    message
+  });
 };
 
-test("buildOptions", () => {
-  ok(buildOptions({ siteSettings: { allow_html_tables: true } }).features.table, 'tables enabled');
-  ok(!buildOptions({ siteSettings: { allow_html_tables: false } }).features.table, 'tables disabled');
+QUnit.assert.cookedPara = function(input, expected, message) {
+  QUnit.assert.cooked(input, `<p>${expected}</p>`, message);
+};
 
-  ok(buildOptions({ siteSettings: { enable_emoji: true } }).features.emoji, 'emoji enabled');
-  ok(!buildOptions({ siteSettings: { enable_emoji: false } }).features.emoji, 'emoji disabled');
+
+QUnit.skip("Pending Engine fixes and spec fixes", assert => {
+  assert.cooked("Derpy: http://derp.com?_test_=1",
+         '<p>Derpy: <a href=https://derp.com?_test_=1"http://derp.com?_test_=1">http://derp.com?_test_=1</a></p>',
+         "works with underscores in urls");
+
+  assert.cooked("**a*_b**", "<p><strong>a*_b</strong></p>", "allows for characters within bold");
 });
 
-test("basic cooking", function() {
-  cooked("hello", "<p>hello</p>", "surrounds text with paragraphs");
-  cooked("**evil**", "<p><strong>evil</strong></p>", "it bolds text.");
-  cooked("__bold__", "<p><strong>bold</strong></p>", "it bolds text.");
-  cooked("*trout*", "<p><em>trout</em></p>", "it italicizes text.");
-  cooked("_trout_", "<p><em>trout</em></p>", "it italicizes text.");
-  cooked("***hello***", "<p><strong><em>hello</em></strong></p>", "it can do bold and italics at once.");
-  cooked("word_with_underscores", "<p>word_with_underscores</p>", "it doesn't do intraword italics");
-  cooked("common/_special_font_face.html.erb", "<p>common/_special_font_face.html.erb</p>", "it doesn't intraword with a slash");
-  cooked("hello \\*evil\\*", "<p>hello *evil*</p>", "it supports escaping of asterisks");
-  cooked("hello \\_evil\\_", "<p>hello _evil_</p>", "it supports escaping of italics");
-  cooked("brussels sprouts are *awful*.", "<p>brussels sprouts are <em>awful</em>.</p>", "it doesn't swallow periods.");
+QUnit.test("buildOptions", assert => {
+  assert.ok(buildOptions({ siteSettings: { enable_emoji: true } }).discourse.features.emoji, 'emoji enabled');
+  assert.ok(!buildOptions({ siteSettings: { enable_emoji: false } }).discourse.features.emoji, 'emoji disabled');
 });
 
-test("Nested bold and italics", function() {
-  cooked("*this is italic **with some bold** inside*", "<p><em>this is italic <strong>with some bold</strong> inside</em></p>", "it handles nested bold in italics");
+QUnit.test("basic cooking", assert => {
+  assert.cooked("hello", "<p>hello</p>", "surrounds text with paragraphs");
+  assert.cooked("**evil**", "<p><strong>evil</strong></p>", "it bolds text.");
+  assert.cooked("__bold__", "<p><strong>bold</strong></p>", "it bolds text.");
+  assert.cooked("*trout*", "<p><em>trout</em></p>", "it italicizes text.");
+  assert.cooked("_trout_", "<p><em>trout</em></p>", "it italicizes text.");
+  assert.cooked("***hello***", "<p><strong><em>hello</em></strong></p>", "it can do bold and italics at once.");
+  assert.cooked("word_with_underscores", "<p>word_with_underscores</p>", "it doesn't do intraword italics");
+  assert.cooked("common/_special_font_face.html.erb", "<p>common/_special_font_face.html.erb</p>", "it doesn't intraword with a slash");
+  assert.cooked("hello \\*evil\\*", "<p>hello *evil*</p>", "it supports escaping of asterisks");
+  assert.cooked("hello \\_evil\\_", "<p>hello _evil_</p>", "it supports escaping of italics");
+  assert.cooked("brussels sprouts are *awful*.", "<p>brussels sprouts are <em>awful</em>.</p>", "it doesn't swallow periods.");
 });
 
-test("Traditional Line Breaks", function() {
+QUnit.test("Nested bold and italics", assert => {
+  assert.cooked("*this is italic **with some bold** inside*", "<p><em>this is italic <strong>with some bold</strong> inside</em></p>", "it handles nested bold in italics");
+});
+
+QUnit.test("Traditional Line Breaks", assert => {
   const input = "1\n2\n3";
-  cooked(input, "<p>1<br/>2<br/>3</p>", "automatically handles trivial newlines");
-
-  const result = new PrettyText({ traditionalMarkdownLinebreaks: true }).cook(input);
-  equal(result, "<p>1\n2\n3</p>");
+  assert.cooked(input, "<p>1<br>\n2<br>\n3</p>", "automatically handles trivial newlines");
+  assert.cookedOptions(input, { siteSettings: {traditional_markdown_linebreaks: true} }, "<p>1\n2\n3</p>");
 });
 
-test("Unbalanced underscores", function() {
-  cooked("[evil_trout][1] hello_\n\n[1]: http://eviltrout.com", "<p><a href=\"http://eviltrout.com\">evil_trout</a> hello_</p>");
+QUnit.test("Unbalanced underscores", assert => {
+  assert.cooked("[evil_trout][1] hello_\n\n[1]: http://eviltrout.com", "<p><a href=\"http://eviltrout.com\">evil_trout</a> hello_</p>");
 });
 
-test("Line Breaks", function() {
-  cooked("[] first choice\n[] second choice",
-         "<p>[] first choice<br/>[] second choice</p>",
+QUnit.test("Line Breaks", assert => {
+  assert.cooked("[] first choice\n[] second choice",
+         "<p>[] first choice<br>\n[] second choice</p>",
          "it handles new lines correctly with [] options");
 
-  cooked("<blockquote>evil</blockquote>\ntrout",
-         "<blockquote>evil</blockquote>\n\n<p>trout</p>",
+  // note this is a change from previous engine but is correct
+  // we have an html block and behavior is defined per common mark
+  // spec
+  // ole engine would wrap trout in a <p>
+  assert.cooked("<blockquote>evil</blockquote>\ntrout",
+         "<blockquote>evil</blockquote>\ntrout",
          "it doesn't insert <br> after blockquotes");
 
-  cooked("leading<blockquote>evil</blockquote>\ntrout",
-         "leading<blockquote>evil</blockquote>\n\n<p>trout</p>",
+  assert.cooked("leading<blockquote>evil</blockquote>\ntrout",
+         "<p>leading<blockquote>evil</blockquote><br>\ntrout</p>",
          "it doesn't insert <br> after blockquotes with leading text");
 });
 
-test("Paragraphs for HTML", function() {
-  cooked("<div>hello world</div>", "<div>hello world</div>", "it doesn't surround <div> with paragraphs");
-  cooked("<p>hello world</p>", "<p>hello world</p>", "it doesn't surround <p> with paragraphs");
-  cooked("<i>hello world</i>", "<p><i>hello world</i></p>", "it surrounds inline <i> html tags with paragraphs");
-  cooked("<b>hello world</b>", "<p><b>hello world</b></p>", "it surrounds inline <b> html tags with paragraphs");
+QUnit.test("Paragraphs for HTML", assert => {
+  assert.cooked("<div>hello world</div>", "<div>hello world</div>", "it doesn't surround <div> with paragraphs");
+  assert.cooked("<p>hello world</p>", "<p>hello world</p>", "it doesn't surround <p> with paragraphs");
+  assert.cooked("<i>hello world</i>", "<p><i>hello world</i></p>", "it surrounds inline <i> html tags with paragraphs");
+  assert.cooked("<b>hello world</b>", "<p><b>hello world</b></p>", "it surrounds inline <b> html tags with paragraphs");
 });
 
-test("Links", function() {
+QUnit.test("Links", assert => {
 
-  cooked("EvilTrout: http://eviltrout.com",
+  assert.cooked("EvilTrout: http://eviltrout.com",
          '<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a></p>',
          "autolinks a URL");
 
-  cooked("Youtube: http://www.youtube.com/watch?v=1MrpeBRkM5A",
+  assert.cooked("Youtube: http://www.youtube.com/watch?v=1MrpeBRkM5A",
          '<p>Youtube: <a href="http://www.youtube.com/watch?v=1MrpeBRkM5A">http://www.youtube.com/watch?v=1MrpeBRkM5A</a></p>',
          "allows links to contain query params");
 
-  cooked("Derpy: http://derp.com?__test=1",
+  assert.cooked("Derpy: http://derp.com?__test=1",
          '<p>Derpy: <a href="http://derp.com?__test=1">http://derp.com?__test=1</a></p>',
          "works with double underscores in urls");
 
-  cooked("Derpy: http://derp.com?_test_=1",
-         '<p>Derpy: <a href="http://derp.com?_test_=1">http://derp.com?_test_=1</a></p>',
-         "works with underscores in urls");
-
-  cooked("Atwood: www.codinghorror.com",
+  assert.cooked("Atwood: www.codinghorror.com",
          '<p>Atwood: <a href="http://www.codinghorror.com">www.codinghorror.com</a></p>',
          "autolinks something that begins with www");
 
-  cooked("Atwood: http://www.codinghorror.com",
+  assert.cooked("Atwood: http://www.codinghorror.com",
          '<p>Atwood: <a href="http://www.codinghorror.com">http://www.codinghorror.com</a></p>',
          "autolinks a URL with http://www");
 
-  cooked("EvilTrout: http://eviltrout.com hello",
+  assert.cooked("EvilTrout: http://eviltrout.com hello",
          '<p>EvilTrout: <a href="http://eviltrout.com">http://eviltrout.com</a> hello</p>',
          "autolinks with trailing text");
 
-  cooked("here is [an example](http://twitter.com)",
+  assert.cooked("here is [an example](http://twitter.com)",
          '<p>here is <a href="http://twitter.com">an example</a></p>',
          "supports markdown style links");
 
-  cooked("Batman: http://en.wikipedia.org/wiki/The_Dark_Knight_(film)",
+  assert.cooked("Batman: http://en.wikipedia.org/wiki/The_Dark_Knight_(film)",
          '<p>Batman: <a href="http://en.wikipedia.org/wiki/The_Dark_Knight_(film)">http://en.wikipedia.org/wiki/The_Dark_Knight_(film)</a></p>',
          "autolinks a URL with parentheses (like Wikipedia)");
 
-  cooked("Here's a tweet:\nhttps://twitter.com/evil_trout/status/345954894420787200",
-         "<p>Here's a tweet:<br/><a href=\"https://twitter.com/evil_trout/status/345954894420787200\" class=\"onebox\" target=\"_blank\">https://twitter.com/evil_trout/status/345954894420787200</a></p>",
+  assert.cooked("Here's a tweet:\nhttps://twitter.com/evil_trout/status/345954894420787200",
+         "<p>Here's a tweet:<br>\n<a href=\"https://twitter.com/evil_trout/status/345954894420787200\" class=\"onebox\" target=\"_blank\">https://twitter.com/evil_trout/status/345954894420787200</a></p>",
          "It doesn't strip the new line.");
 
-  cooked("1. View @eviltrout's profile here: http://meta.discourse.org/u/eviltrout/activity<br/>next line.",
-        "<ol><li>View <span class=\"mention\">@eviltrout</span>'s profile here: <a href=\"http://meta.discourse.org/u/eviltrout/activity\">http://meta.discourse.org/u/eviltrout/activity</a><br>next line.</li></ol>",
+  assert.cooked("1. View @eviltrout's profile here: http://meta.discourse.org/u/eviltrout/activity<br/>next line.",
+        "<ol>\n<li>View <span class=\"mention\">@eviltrout</span>'s profile here: <a href=\"http://meta.discourse.org/u/eviltrout/activity\">http://meta.discourse.org/u/eviltrout/activity</a><br>next line.</li>\n</ol>",
         "allows autolinking within a list without inserting a paragraph.");
 
-  cooked("[3]: http://eviltrout.com", "", "It doesn't autolink markdown link references");
+  assert.cooked("[3]: http://eviltrout.com", "", "It doesn't autolink markdown link references");
 
-  cooked("[]: http://eviltrout.com", "<p>[]: <a href=\"http://eviltrout.com\">http://eviltrout.com</a></p>", "It doesn't accept empty link references");
+  assert.cooked("[]: http://eviltrout.com", "<p>[]: <a href=\"http://eviltrout.com\">http://eviltrout.com</a></p>", "It doesn't accept empty link references");
 
-  cooked("[b]label[/b]: description", "<p><span class=\"bbcode-b\">label</span>: description</p>", "It doesn't accept BBCode as link references");
+  assert.cooked("[b]label[/b]: description", "<p><span class=\"bbcode-b\">label</span>: description</p>", "It doesn't accept BBCode as link references");
 
-  cooked("http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369",
+  assert.cooked("http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369",
          "<p><a href=\"http://discourse.org\">http://discourse.org</a> and " +
          "<a href=\"http://discourse.org/another_url\">http://discourse.org/another_url</a> and " +
          "<a href=\"http://www.imdb.com/name/nm2225369\">http://www.imdb.com/name/nm2225369</a></p>",
          'allows multiple links on one line');
 
-  cooked("* [Evil Trout][1]\n  [1]: http://eviltrout.com",
-         "<ul><li><a href=\"http://eviltrout.com\">Evil Trout</a></li></ul>",
+  assert.cooked("* [Evil Trout][1]\n\n[1]: http://eviltrout.com",
+         "<ul>\n<li><a href=\"http://eviltrout.com\">Evil Trout</a></li>\n</ul>",
          "allows markdown link references in a list");
 
-  cooked("User [MOD]: Hello!",
+  assert.cooked("User [MOD]: Hello!",
          "<p>User [MOD]: Hello!</p>",
          "It does not consider references that are obviously not URLs");
 
-  cooked("<small>http://eviltrout.com</small>", "<p><small><a href=\"http://eviltrout.com\">http://eviltrout.com</a></small></p>", "Links within HTML tags");
+  assert.cooked("<small>http://eviltrout.com</small>", "<p><small><a href=\"http://eviltrout.com\">http://eviltrout.com</a></small></p>", "Links within HTML tags");
 
-  cooked("[http://google.com ... wat](http://discourse.org)",
+  assert.cooked("[http://google.com ... wat](http://discourse.org)",
          "<p><a href=\"http://discourse.org\">http://google.com ... wat</a></p>",
          "it supports links within links");
 
-  cooked("[http://google.com](http://discourse.org)",
+  assert.cooked("[http://google.com](http://discourse.org)",
          "<p><a href=\"http://discourse.org\">http://google.com</a></p>",
          "it supports markdown links where the name and link match");
 
 
-  cooked("[Link](http://www.example.com) (with an outer \"description\")",
-         "<p><a href=\"http://www.example.com\">Link</a> (with an outer \"description\")</p>",
+  assert.cooked("[Link](http://www.example.com) (with an outer \"description\")",
+         "<p><a href=\"http://www.example.com\">Link</a> (with an outer &quot;description&quot;)</p>",
          "it doesn't consume closing parens as part of the url");
 
-  cooked("A link inside parentheses (http://www.example.com)",
+  assert.cooked("A link inside parentheses (http://www.example.com)",
          "<p>A link inside parentheses (<a href=\"http://www.example.com\">http://www.example.com</a>)</p>",
          "it auto-links a url within parentheses");
 
-  cooked("[ul][1]\n\n[1]: http://eviltrout.com",
+  assert.cooked("[ul][1]\n\n[1]: http://eviltrout.com",
          "<p><a href=\"http://eviltrout.com\">ul</a></p>",
          "it can use `ul` as a link name");
 });
 
-test("simple quotes", function() {
-  cooked("> nice!", "<blockquote><p>nice!</p></blockquote>", "it supports simple quotes");
-  cooked(" > nice!", "<blockquote><p>nice!</p></blockquote>", "it allows quotes with preceding spaces");
-  cooked("> level 1\n> > level 2",
-         "<blockquote><p>level 1</p><blockquote><p>level 2</p></blockquote></blockquote>",
+QUnit.test("simple quotes", assert => {
+  assert.cooked("> nice!", "<blockquote>\n<p>nice!</p>\n</blockquote>", "it supports simple quotes");
+  assert.cooked(" > nice!", "<blockquote>\n<p>nice!</p>\n</blockquote>", "it allows quotes with preceding spaces");
+  assert.cooked("> level 1\n> > level 2",
+         "<blockquote>\n<p>level 1</p>\n<blockquote>\n<p>level 2</p>\n</blockquote>\n</blockquote>",
          "it allows nesting of blockquotes");
-  cooked("> level 1\n>  > level 2",
-         "<blockquote><p>level 1</p><blockquote><p>level 2</p></blockquote></blockquote>",
+  assert.cooked("> level 1\n>  > level 2",
+         "<blockquote>\n<p>level 1</p>\n<blockquote>\n<p>level 2</p>\n</blockquote>\n</blockquote>",
          "it allows nesting of blockquotes with spaces");
 
-  cooked("- hello\n\n  > world\n  > eviltrout",
-         "<ul><li>hello</li></ul>\n\n<blockquote><p>world<br/>eviltrout</p></blockquote>",
+  assert.cooked("- hello\n\n  > world\n  > eviltrout",
+`<ul>
+<li>
+<p>hello</p>
+<blockquote>
+<p>world<br>
+eviltrout</p>
+</blockquote>
+</li>
+</ul>`,
          "it allows quotes within a list.");
 
-  cooked("- <p>eviltrout</p>",
-         "<ul><li><p>eviltrout</p></li></ul>",
+  assert.cooked("- <p>eviltrout</p>",
+         "<ul>\n<li>\n<p>eviltrout</p></li>\n</ul>",
          "it allows paragraphs within a list.");
 
 
-  cooked("  > indent 1\n  > indent 2", "<blockquote><p>indent 1<br/>indent 2</p></blockquote>", "allow multiple spaces to indent");
+  assert.cooked("  > indent 1\n  > indent 2", "<blockquote>\n<p>indent 1<br>\nindent 2</p>\n</blockquote>", "allow multiple spaces to indent");
 
 });
 
-test("Quotes", function() {
+QUnit.test("Quotes", assert => {
 
-  cookedOptions("[quote=\"eviltrout, post: 1\"]\na quote\n\nsecond line\n\nthird line[/quote]",
+  assert.cookedOptions("[quote=\"eviltrout, post: 1\"]\na quote\n\nsecond line\n\nthird line\n[/quote]",
                 { topicId: 2 },
-                "<aside class=\"quote\" data-post=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>eviltrout:</div><blockquote>" +
-                "<p>a quote</p><p>second line</p><p>third line</p></blockquote></aside>",
+    `<aside class=\"quote\" data-post=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ eviltrout:</div>
+<blockquote>
+<p>a quote</p>
+<p>second line</p>
+<p>third line</p>
+</blockquote>
+</aside>`,
                 "works with multiple lines");
 
-  cookedOptions("1[quote=\"bob, post:1\"]my quote[/quote]2",
-                { topicId: 2, lookupAvatar: function(name) { return "" + name; }, sanitize: true },
-                "<p>1</p>\n\n<aside class=\"quote\" data-post=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>bob" +
-                "bob:</div><blockquote><p>my quote</p></blockquote></aside>\n\n<p>2</p>",
-                "handles quotes properly");
 
-  cookedOptions("1[quote=\"bob, post:1\"]my quote[/quote]2",
+  assert.cookedOptions("[quote=\"bob, post:1\"]\nmy quote\n[/quote]",
                 { topicId: 2, lookupAvatar: function() { } },
-                "<p>1</p>\n\n<aside class=\"quote\" data-post=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>bob:" +
-                "</div><blockquote><p>my quote</p></blockquote></aside>\n\n<p>2</p>",
+    `<aside class=\"quote\" data-post=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ bob:</div>
+<blockquote>
+<p>my quote</p>
+</blockquote>
+</aside>`,
                 "includes no avatar if none is found");
 
-  cooked(`[quote]\na\n\n[quote]\nb\n[/quote]\n[/quote]`,
-         "<p><aside class=\"quote\"><blockquote><p>a</p><p><aside class=\"quote\"><blockquote><p>b</p></blockquote></aside></p></blockquote></aside></p>",
+  assert.cooked(`[quote]\na\n\n[quote]\nb\n[/quote]\n[/quote]`,
+    `<aside class=\"quote\">
+<blockquote>
+<p>a</p>
+<aside class=\"quote\">
+<blockquote>
+<p>b</p>
+</blockquote>
+</aside>
+</blockquote>
+</aside>`,
          "handles nested quotes properly");
 
 });
 
-test("Mentions", function() {
+QUnit.test("Mentions", assert => {
 
   const alwaysTrue = { mentionLookup: (function() { return "user"; }) };
 
-  cookedOptions("Hello @sam", alwaysTrue,
+  assert.cookedOptions("Hello @sam", alwaysTrue,
                 "<p>Hello <a class=\"mention\" href=\"/u/sam\">@sam</a></p>",
                 "translates mentions to links");
 
-  cooked("[@codinghorror](https://twitter.com/codinghorror)",
+  assert.cooked("[@codinghorror](https://twitter.com/codinghorror)",
          "<p><a href=\"https://twitter.com/codinghorror\">@codinghorror</a></p>",
          "it doesn't do mentions within links");
 
-  cookedOptions("[@codinghorror](https://twitter.com/codinghorror)", alwaysTrue,
+  assert.cookedOptions("[@codinghorror](https://twitter.com/codinghorror)", alwaysTrue,
          "<p><a href=\"https://twitter.com/codinghorror\">@codinghorror</a></p>",
          "it doesn't do link mentions within links");
 
-  cooked("Hello @EvilTrout",
+  assert.cooked("Hello @EvilTrout",
          "<p>Hello <span class=\"mention\">@EvilTrout</span></p>",
          "adds a mention class");
 
-  cooked("robin@email.host",
+  assert.cooked("robin@email.host",
          "<p>robin@email.host</p>",
          "won't add mention class to an email address");
 
-  cooked("hanzo55@yahoo.com",
-         "<p>hanzo55@yahoo.com</p>",
+  assert.cooked("hanzo55@yahoo.com",
+         "<p><a href=\"mailto:hanzo55@yahoo.com\">hanzo55@yahoo.com</a></p>",
          "won't be affected by email addresses that have a number before the @ symbol");
 
-  cooked("@EvilTrout yo",
+  assert.cooked("@EvilTrout yo",
          "<p><span class=\"mention\">@EvilTrout</span> yo</p>",
          "it handles mentions at the beginning of a string");
 
-  cooked("yo\n@EvilTrout",
-         "<p>yo<br/><span class=\"mention\">@EvilTrout</span></p>",
+  assert.cooked("yo\n@EvilTrout",
+         "<p>yo<br>\n<span class=\"mention\">@EvilTrout</span></p>",
          "it handles mentions at the beginning of a new line");
 
-  cooked("`evil` @EvilTrout `trout`",
+  assert.cooked("`evil` @EvilTrout `trout`",
          "<p><code>evil</code> <span class=\"mention\">@EvilTrout</span> <code>trout</code></p>",
          "deals correctly with multiple <code> blocks");
 
-  cooked("```\na @test\n```",
-         "<p><pre><code class=\"lang-auto\">a @test</code></pre></p>",
+  assert.cooked("```\na @test\n```",
+         "<pre><code class=\"lang-auto\">a @test\n</code></pre>",
          "should not do mentions within a code block.");
 
-  cooked("> foo bar baz @eviltrout",
-         "<blockquote><p>foo bar baz <span class=\"mention\">@eviltrout</span></p></blockquote>",
+  assert.cooked("> foo bar baz @eviltrout",
+         "<blockquote>\n<p>foo bar baz <span class=\"mention\">@eviltrout</span></p>\n</blockquote>",
          "handles mentions in simple quotes");
 
-  cooked("> foo bar baz @eviltrout ohmagerd\nlook at this",
-         "<blockquote><p>foo bar baz <span class=\"mention\">@eviltrout</span> ohmagerd<br/>look at this</p></blockquote>",
+  assert.cooked("> foo bar baz @eviltrout ohmagerd\nlook at this",
+         "<blockquote>\n<p>foo bar baz <span class=\"mention\">@eviltrout</span> ohmagerd<br>\nlook at this</p>\n</blockquote>",
          "does mentions properly with trailing text within a simple quote");
 
-  cooked("`code` is okay before @mention",
+  assert.cooked("`code` is okay before @mention",
          "<p><code>code</code> is okay before <span class=\"mention\">@mention</span></p>",
          "Does not mention in an inline code block");
 
-  cooked("@mention is okay before `code`",
+  assert.cooked("@mention is okay before `code`",
          "<p><span class=\"mention\">@mention</span> is okay before <code>code</code></p>",
          "Does not mention in an inline code block");
 
-  cooked("don't `@mention`",
+  assert.cooked("don't `@mention`",
          "<p>don't <code>@mention</code></p>",
          "Does not mention in an inline code block");
 
-  cooked("Yes `@this` should be code @eviltrout",
+  assert.cooked("Yes `@this` should be code @eviltrout",
          "<p>Yes <code>@this</code> should be code <span class=\"mention\">@eviltrout</span></p>",
          "Does not mention in an inline code block");
 
-  cooked("@eviltrout and `@eviltrout`",
+  assert.cooked("@eviltrout and `@eviltrout`",
          "<p><span class=\"mention\">@eviltrout</span> and <code>@eviltrout</code></p>",
          "you can have a mention in an inline code block following a real mention.");
 
-  cooked("1. this is  a list\n\n2. this is an @eviltrout mention\n",
-         "<ol><li><p>this is  a list</p></li><li><p>this is an <span class=\"mention\">@eviltrout</span> mention</p></li></ol>",
+  assert.cooked("1. this is  a list\n\n2. this is an @eviltrout mention\n",
+         "<ol>\n<li>\n<p>this is  a list</p>\n</li>\n<li>\n<p>this is an <span class=\"mention\">@eviltrout</span> mention</p>\n</li>\n</ol>",
          "it mentions properly in a list.");
 
-  cooked("Hello @foo/@bar",
+  assert.cooked("Hello @foo/@bar",
          "<p>Hello <span class=\"mention\">@foo</span>/<span class=\"mention\">@bar</span></p>",
          "handles mentions separated by a slash.");
 
-  cookedOptions("@eviltrout", alwaysTrue,
+  assert.cookedOptions("@eviltrout", alwaysTrue,
                 "<p><a class=\"mention\" href=\"/u/eviltrout\">@eviltrout</a></p>",
                 "it doesn't onebox mentions");
 
-  cookedOptions("<small>a @sam c</small>", alwaysTrue,
+  assert.cookedOptions("<small>a @sam c</small>", alwaysTrue,
                 "<p><small>a <a class=\"mention\" href=\"/u/sam\">@sam</a> c</small></p>",
                 "it allows mentions within HTML tags");
 });
 
-test("Category hashtags", () => {
+QUnit.test("Category hashtags", assert => {
   const alwaysTrue = { categoryHashtagLookup: (function() { return ["http://test.discourse.org/category-hashtag", "category-hashtag"]; }) };
 
-  cookedOptions("Check out #category-hashtag", alwaysTrue,
+  assert.cookedOptions("Check out #category-hashtag", alwaysTrue,
          "<p>Check out <a class=\"hashtag\" href=\"http://test.discourse.org/category-hashtag\">#<span>category-hashtag</span></a></p>",
          "it translates category hashtag into links");
 
-  cooked("Check out #category-hashtag",
+  assert.cooked("Check out #category-hashtag",
          "<p>Check out <span class=\"hashtag\">#category-hashtag</span></p>",
          "it does not translate category hashtag into links if it is not a valid category hashtag");
 
-  cookedOptions("[#category-hashtag](http://www.test.com)", alwaysTrue,
+  assert.cookedOptions("[#category-hashtag](http://www.test.com)", alwaysTrue,
          "<p><a href=\"http://www.test.com\">#category-hashtag</a></p>",
          "it does not translate category hashtag within links");
 
-  cooked("```\n# #category-hashtag\n```",
-         "<p><pre><code class=\"lang-auto\"># #category-hashtag</code></pre></p>",
+  assert.cooked("```\n# #category-hashtag\n```",
+         "<pre><code class=\"lang-auto\"># #category-hashtag\n</code></pre>",
          "it does not translate category hashtags to links in code blocks");
 
-  cooked("># #category-hashtag\n",
-         "<blockquote><h1><span class=\"hashtag\">#category-hashtag</span></h1></blockquote>",
+  assert.cooked("># #category-hashtag\n",
+         "<blockquote>\n<h1><span class=\"hashtag\">#category-hashtag</span></h1>\n</blockquote>",
          "it handles category hashtags in simple quotes");
 
-  cooked("# #category-hashtag",
+  assert.cooked("# #category-hashtag",
          "<h1><span class=\"hashtag\">#category-hashtag</span></h1>",
          "it works within ATX-style headers");
 
-  cooked("don't `#category-hashtag`",
+  assert.cooked("don't `#category-hashtag`",
          "<p>don't <code>#category-hashtag</code></p>",
          "it does not mention in an inline code block");
 
-  cooked("test #hashtag1/#hashtag2",
-         "<p>test <span class=\"hashtag\">#hashtag1</span>/#hashtag2</p>",
-         "it does not convert category hashtag not bounded by spaces");
-
-  cooked("<small>#category-hashtag</small>",
+  assert.cooked("<small>#category-hashtag</small>",
          "<p><small><span class=\"hashtag\">#category-hashtag</span></small></p>",
          "it works between HTML tags");
 });
 
 
-test("Heading", function() {
-  cooked("**Bold**\n----------", "<h2><strong>Bold</strong></h2>", "It will bold the heading");
+QUnit.test("Heading", assert => {
+  assert.cooked("**Bold**\n----------", "<h2><strong>Bold</strong></h2>", "It will bold the heading");
 });
 
-test("bold and italics", function() {
-  cooked("a \"**hello**\"", "<p>a \"<strong>hello</strong>\"</p>", "bolds in quotes");
-  cooked("(**hello**)", "<p>(<strong>hello</strong>)</p>", "bolds in parens");
-  cooked("**hello**\nworld", "<p><strong>hello</strong><br>world</p>", "allows newline after bold");
-  cooked("**hello**\n**world**", "<p><strong>hello</strong><br><strong>world</strong></p>", "newline between two bolds");
-  cooked("**a*_b**", "<p><strong>a*_b</strong></p>", "allows for characters within bold");
-  cooked("** hello**", "<p>** hello**</p>", "does not bold on a space boundary");
-  cooked("**hello **", "<p>**hello **</p>", "does not bold on a space boundary");
-  cooked("你**hello**", "<p>你**hello**</p>", "does not bold chinese intra word");
-  cooked("**你hello**", "<p><strong>你hello</strong></p>", "allows bolded chinese");
+QUnit.test("bold and italics", assert => {
+  assert.cooked("a \"**hello**\"", "<p>a &quot;<strong>hello</strong>&quot;</p>", "bolds in quotes");
+  assert.cooked("(**hello**)", "<p>(<strong>hello</strong>)</p>", "bolds in parens");
+  assert.cooked("**hello**\nworld", "<p><strong>hello</strong><br>\nworld</p>", "allows newline after bold");
+  assert.cooked("**hello**\n**world**", "<p><strong>hello</strong><br>\n<strong>world</strong></p>", "newline between two bolds");
+  assert.cooked("** hello**", "<p>** hello**</p>", "does not bold on a space boundary");
+  assert.cooked("**hello **", "<p>**hello **</p>", "does not bold on a space boundary");
+  assert.cooked("**你hello**", "<p><strong>你hello</strong></p>", "allows bolded chinese");
 });
 
-test("Escaping", function() {
-  cooked("*\\*laughs\\**", "<p><em>*laughs*</em></p>", "allows escaping strong");
-  cooked("*\\_laughs\\_*", "<p><em>_laughs_</em></p>", "allows escaping em");
+QUnit.test("Escaping", assert => {
+  assert.cooked("*\\*laughs\\**", "<p><em>*laughs*</em></p>", "allows escaping strong");
+  assert.cooked("*\\_laughs\\_*", "<p><em>_laughs_</em></p>", "allows escaping em");
 });
 
-test("New Lines", function() {
-  // Note: This behavior was discussed and we determined it does not make sense to do this
-  // unless you're using traditional line breaks
-  cooked("_abc\ndef_", "<p>_abc<br>def_</p>", "it does not allow markup to span new lines");
-  cooked("_abc\n\ndef_", "<p>_abc</p>\n\n<p>def_</p>", "it does not allow markup to span new paragraphs");
+QUnit.test("New Lines", assert => {
+  // historically we would not continue inline em or b across lines,
+  // however commonmark gives us no switch to do so and we would be very non compliant.
+  // turning softbreaks into a newline is just a renderer option, not a parser switch.
+  assert.cooked("_abc\ndef_", "<p><em>abc<br>\ndef</em></p>", "it does allow inlines to span new lines");
+  assert.cooked("_abc\n\ndef_", "<p>_abc</p>\n<p>def_</p>", "it does not allow inlines to span new paragraphs");
 });
 
-test("Oneboxing", function() {
+QUnit.test("Oneboxing", assert => {
 
   function matches(input, regexp) {
     return new PrettyText(defaultOpts).cook(input).match(regexp);
   };
 
-  ok(!matches("- http://www.textfiles.com/bbs/MINDVOX/FORUMS/ethics\n\n- http://drupal.org", /onebox/),
+  assert.ok(!matches("- http://www.textfiles.com/bbs/MINDVOX/FORUMS/ethics\n\n- http://drupal.org", /onebox/),
               "doesn't onebox a link within a list");
 
-  ok(matches("http://test.com", /onebox/), "adds a onebox class to a link on its own line");
-  ok(matches("http://test.com\nhttp://test2.com", /onebox[\s\S]+onebox/m), "supports multiple links");
-  ok(!matches("http://test.com bob", /onebox/), "doesn't onebox links that have trailing text");
+  assert.ok(matches("http://test.com", /onebox/), "adds a onebox class to a link on its own line");
+  assert.ok(matches("http://test.com\nhttp://test2.com", /onebox[\s\S]+onebox/m), "supports multiple links");
+  assert.ok(!matches("http://test.com bob", /onebox/), "doesn't onebox links that have trailing text");
 
-  ok(!matches("[Tom Cruise](http://www.tomcruise.com/)", "onebox"), "Markdown links with labels are not oneboxed");
-  ok(matches("[http://www.tomcruise.com/](http://www.tomcruise.com/)",
+  assert.ok(!matches("[Tom Cruise](http://www.tomcruise.com/)", "onebox"), "Markdown links with labels are not oneboxed");
+  assert.ok(!matches("[http://www.tomcruise.com/](http://www.tomcruise.com/)",
     "onebox"),
-    "Markdown links where the label is the same as the url are oneboxed");
+    "Markdown links where the label is the same as the url but link is explicit");
 
-  cooked("http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street",
+  assert.cooked("http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street",
          "<p><a href=\"http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street\" class=\"onebox\"" +
          " target=\"_blank\">http://en.wikipedia.org/wiki/Homicide:_Life_on_the_Street</a></p>",
          "works with links that have underscores in them");
 
 });
 
-test("links with full urls", function() {
-  cooked("[http://eviltrout.com][1] is a url\n\n[1]: http://eviltrout.com",
+QUnit.test("links with full urls", assert => {
+  assert.cooked("[http://eviltrout.com][1] is a url\n\n[1]: http://eviltrout.com",
          "<p><a href=\"http://eviltrout.com\">http://eviltrout.com</a> is a url</p>",
          "it supports links that are full URLs");
 });
 
-test("Code Blocks", function() {
+QUnit.test("Code Blocks", assert => {
 
-  cooked("<pre>\nhello\n</pre>\n",
-         "<p><pre>hello</pre></p>",
+  assert.cooked("<pre>\nhello\n</pre>\n",
+         "<pre>\nhello\n</pre>",
          "pre blocks don't include extra lines");
 
-  cooked("```\na\nb\nc\n\nd\n```",
-         "<p><pre><code class=\"lang-auto\">a\nb\nc\n\nd</code></pre></p>",
+  assert.cooked("```\na\nb\nc\n\nd\n```",
+         "<pre><code class=\"lang-auto\">a\nb\nc\n\nd\n</code></pre>",
          "it treats new lines properly");
 
-  cooked("```\ntest\n```",
-         "<p><pre><code class=\"lang-auto\">test</code></pre></p>",
+  assert.cooked("```\ntest\n```",
+         "<pre><code class=\"lang-auto\">test\n</code></pre>",
          "it supports basic code blocks");
 
-  cooked("```json\n{hello: 'world'}\n```\ntrailing",
-         "<p><pre><code class=\"lang-json\">{hello: &#x27;world&#x27;}</code></pre></p>\n\n<p>trailing</p>",
+  assert.cooked("```json\n{hello: 'world'}\n```\ntrailing",
+         "<pre><code class=\"lang-json\">{hello: 'world'}\n</code></pre>\n<p>trailing</p>",
          "It does not truncate text after a code block.");
 
-  cooked("```json\nline 1\n\nline 2\n\n\nline3\n```",
-         "<p><pre><code class=\"lang-json\">line 1\n\nline 2\n\n\nline3</code></pre></p>",
+  assert.cooked("```json\nline 1\n\nline 2\n\n\nline3\n```",
+         "<pre><code class=\"lang-json\">line 1\n\nline 2\n\n\nline3\n</code></pre>",
          "it maintains new lines inside a code block.");
 
-  cooked("hello\nworld\n```json\nline 1\n\nline 2\n\n\nline3\n```",
-         "<p>hello<br/>world<br/></p>\n\n<p><pre><code class=\"lang-json\">line 1\n\nline 2\n\n\nline3</code></pre></p>",
+  assert.cooked("hello\nworld\n```json\nline 1\n\nline 2\n\n\nline3\n```",
+         "<p>hello<br>\nworld</p>\n<pre><code class=\"lang-json\">line 1\n\nline 2\n\n\nline3\n</code></pre>",
          "it maintains new lines inside a code block with leading content.");
 
-  cooked("```ruby\n<header>hello</header>\n```",
-         "<p><pre><code class=\"lang-ruby\">&lt;header&gt;hello&lt;/header&gt;</code></pre></p>",
+  assert.cooked("```ruby\n<header>hello</header>\n```",
+         "<pre><code class=\"lang-ruby\">&lt;header&gt;hello&lt;/header&gt;\n</code></pre>",
          "it escapes code in the code block");
 
-  cooked("```text\ntext\n```",
-         "<p><pre><code class=\"lang-nohighlight\">text</code></pre></p>",
+  assert.cooked("```text\ntext\n```",
+         "<pre><code class=\"lang-nohighlight\">text\n</code></pre>",
          "handles text by adding nohighlight");
 
-  cooked("```ruby\n# cool\n```",
-         "<p><pre><code class=\"lang-ruby\"># cool</code></pre></p>",
+  assert.cooked("```ruby\n# cool\n```",
+         "<pre><code class=\"lang-ruby\"># cool\n</code></pre>",
          "it supports changing the language");
 
-  cooked("    ```\n    hello\n    ```",
-         "<pre><code>&#x60;&#x60;&#x60;\nhello\n&#x60;&#x60;&#x60;</code></pre>",
+  assert.cooked("    ```\n    hello\n    ```",
+         "<pre><code>```\nhello\n```</code></pre>",
          "only detect ``` at the beginning of lines");
 
-  cooked("```ruby\ndef self.parse(text)\n\n  text\nend\n```",
-         "<p><pre><code class=\"lang-ruby\">def self.parse(text)\n\n  text\nend</code></pre></p>",
+  assert.cooked("```ruby\ndef self.parse(text)\n\n  text\nend\n```",
+         "<pre><code class=\"lang-ruby\">def self.parse(text)\n\n  text\nend\n</code></pre>",
          "it allows leading spaces on lines in a code block.");
 
-  cooked("```ruby\nhello `eviltrout`\n```",
-         "<p><pre><code class=\"lang-ruby\">hello &#x60;eviltrout&#x60;</code></pre></p>",
+  assert.cooked("```ruby\nhello `eviltrout`\n```",
+         "<pre><code class=\"lang-ruby\">hello `eviltrout`\n</code></pre>",
          "it allows code with backticks in it");
 
-  cooked("```eviltrout\nhello\n```",
-          "<p><pre><code class=\"lang-auto\">hello</code></pre></p>",
+  assert.cooked("```eviltrout\nhello\n```",
+          "<pre><code class=\"lang-auto\">hello\n</code></pre>",
           "it doesn't not whitelist all classes");
 
-  cooked("```\n[quote=\"sam, post:1, topic:9441, full:true\"]This is `<not>` a bug.[/quote]\n```",
-         "<p><pre><code class=\"lang-auto\">[quote=&quot;sam, post:1, topic:9441, full:true&quot;]This is &#x60;&lt;not&gt;&#x60; a bug.[/quote]</code></pre></p>",
+  assert.cooked("```\n[quote=\"sam, post:1, topic:9441, full:true\"]This is `<not>` a bug.[/quote]\n```",
+         "<pre><code class=\"lang-auto\">[quote=&quot;sam, post:1, topic:9441, full:true&quot;]This is `&lt;not&gt;` a bug.[/quote]\n</code></pre>",
          "it allows code with backticks in it");
 
-  cooked("    hello\n<blockquote>test</blockquote>",
-         "<pre><code>hello</code></pre>\n\n<blockquote>test</blockquote>",
+  assert.cooked("    hello\n<blockquote>test</blockquote>",
+         "<pre><code>hello\n</code></pre>\n<blockquote>test</blockquote>",
          "it allows an indented code block to by followed by a `<blockquote>`");
 
-  cooked("``` foo bar ```",
+  assert.cooked("``` foo bar ```",
          "<p><code>foo bar</code></p>",
          "it tolerates misuse of code block tags as inline code");
 
-  cooked("```\nline1\n```\n```\nline2\n\nline3\n```",
-         "<p><pre><code class=\"lang-auto\">line1</code></pre></p>\n\n<p><pre><code class=\"lang-auto\">line2\n\nline3</code></pre></p>",
+  assert.cooked("```\nline1\n```\n```\nline2\n\nline3\n```",
+         "<pre><code class=\"lang-auto\">line1\n</code></pre>\n<pre><code class=\"lang-auto\">line2\n\nline3\n</code></pre>",
          "it does not consume next block's trailing newlines");
 
-  cooked("    <pre>test</pre>",
+  assert.cooked("    <pre>test</pre>",
          "<pre><code>&lt;pre&gt;test&lt;/pre&gt;</code></pre>",
          "it does not parse other block types in markdown code blocks");
 
-  cooked("    [quote]test[/quote]",
+  assert.cooked("    [quote]test[/quote]",
          "<pre><code>[quote]test[/quote]</code></pre>",
          "it does not parse other block types in markdown code blocks");
 
-  cooked("## a\nb\n```\nc\n```",
-         "<h2>a</h2>\n\n<p><pre><code class=\"lang-auto\">c</code></pre></p>",
+  assert.cooked("## a\nb\n```\nc\n```",
+         "<h2>a</h2>\n<p>b</p>\n<pre><code class=\"lang-auto\">c\n</code></pre>",
          "it handles headings with code blocks after them.");
 });
 
-test("URLs in BBCode tags", function() {
+QUnit.test("URLs in BBCode tags", assert => {
 
-  cooked("[img]http://eviltrout.com/eviltrout.png[/img][img]http://samsaffron.com/samsaffron.png[/img]",
-         "<p><img src=\"http://eviltrout.com/eviltrout.png\"/><img src=\"http://samsaffron.com/samsaffron.png\"/></p>",
+  assert.cooked("[img]http://eviltrout.com/eviltrout.png[/img][img]http://samsaffron.com/samsaffron.png[/img]",
+         "<p><img src=\"http://eviltrout.com/eviltrout.png\" alt/><img src=\"http://samsaffron.com/samsaffron.png\" alt/></p>",
          "images are properly parsed");
 
-  cooked("[url]http://discourse.org[/url]",
-         "<p><a href=\"http://discourse.org\">http://discourse.org</a></p>",
+  assert.cooked("[url]http://discourse.org[/url]",
+         "<p><a href=\"http://discourse.org\" data-bbcode=\"true\">http://discourse.org</a></p>",
          "links are properly parsed");
 
-  cooked("[url=http://discourse.org]discourse[/url]",
-         "<p><a href=\"http://discourse.org\">discourse</a></p>",
+  assert.cooked("[url=http://discourse.org]discourse[/url]",
+         "<p><a href=\"http://discourse.org\" data-bbcode=\"true\">discourse</a></p>",
          "named links are properly parsed");
 
 });
 
-test("images", function() {
-  cooked("[![folksy logo](http://folksy.com/images/folksy-colour.png)](http://folksy.com/)",
+QUnit.test("images", assert => {
+  assert.cooked("[![folksy logo](http://folksy.com/images/folksy-colour.png)](http://folksy.com/)",
          "<p><a href=\"http://folksy.com/\"><img src=\"http://folksy.com/images/folksy-colour.png\" alt=\"folksy logo\"/></a></p>",
          "It allows images with links around them");
 
-  cooked("<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==\" alt=\"Red dot\">",
+  assert.cooked("<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==\" alt=\"Red dot\">",
          "<p><img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==\" alt=\"Red dot\"></p>",
          "It allows data images");
 });
 
-test("censoring", function() {
-  cooked("aw shucks, golly gee whiz.",
-         "<p>aw &#9632;&#9632;&#9632;&#9632;&#9632;&#9632;, golly gee &#9632;&#9632;&#9632;&#9632;.</p>",
+QUnit.test("censoring", assert => {
+  assert.cooked("aw shucks, golly gee whiz.",
+         "<p>aw ■■■■■■, golly gee ■■■■.</p>",
          "it censors words in the Site Settings");
 
-  cooked("you are a whizzard! I love cheesewhiz. Whiz.",
-         "<p>you are a whizzard! I love cheesewhiz. &#9632;&#9632;&#9632;&#9632;.</p>",
+  assert.cooked("you are a whizzard! I love cheesewhiz. Whiz.",
+         "<p>you are a whizzard! I love cheesewhiz. ■■■■.</p>",
          "it doesn't censor words unless they have boundaries.");
 
-  cooked("you are a whizzer! I love cheesewhiz. Whiz.",
-         "<p>you are a &#9632;&#9632;&#9632;&#9632;&#9632;&#9632;&#9632;! I love cheesewhiz. &#9632;&#9632;&#9632;&#9632;.</p>",
+  assert.cooked("you are a whizzer! I love cheesewhiz. Whiz.",
+         "<p>you are a ■■■■■■■! I love cheesewhiz. ■■■■.</p>",
          "it censors words even if previous partial matches exist.");
 
-  cooked("The link still works. [whiz](http://www.whiz.com)",
-         "<p>The link still works. <a href=\"http://www.whiz.com\">&#9632;&#9632;&#9632;&#9632;</a></p>",
+  assert.cooked("The link still works. [whiz](http://www.whiz.com)",
+         "<p>The link still works. <a href=\"http://www.whiz.com\">■■■■</a></p>",
          "it won't break links by censoring them.");
 
-  cooked("Call techapj the computer whiz at 555-555-1234 for free help.",
-         "<p>Call &#9632;&#9632;&#9632;&#9632;&#9632;&#9632;&#9632; the computer &#9632;&#9632;&#9632;&#9632; at 555-&#9632;&#9632;&#9632;&#9632;&#9632;&#9632;&#9632;&#9632; for free help.</p>",
+  assert.cooked("Call techapj the computer whiz at 555-555-1234 for free help.",
+         "<p>Call ■■■■■■■ the computer ■■■■ at 555-■■■■■■■■ for free help.</p>",
          "uses both censored words and patterns from site settings");
 
-  cooked("I have a pen, I have an a**le",
-         "<p>I have a pen, I have an &#9632;&#9632;&#9632;&#9632;&#9632;</p>",
+  assert.cooked("I have a pen, I have an a**le",
+         "<p>I have a pen, I have an ■■■■■</p>",
          "it escapes regexp chars");
 });
 
-test("code blocks/spans hoisting", function() {
-  cooked("```\n\n    some code\n```",
-         "<p><pre><code class=\"lang-auto\">    some code</code></pre></p>",
+QUnit.test("code blocks/spans hoisting", assert => {
+  assert.cooked("```\n\n    some code\n```",
+         "<pre><code class=\"lang-auto\">\n    some code\n</code></pre>",
          "it works when nesting standard markdown code blocks within a fenced code block");
 
-  cooked("`$&`",
+  assert.cooked("`$&`",
          "<p><code>$&amp;</code></p>",
          "it works even when hoisting special replacement patterns");
 });
 
-test('basic bbcode', function() {
-  cookedPara("[b]strong[/b]", "<span class=\"bbcode-b\">strong</span>", "bolds text");
-  cookedPara("[i]emphasis[/i]", "<span class=\"bbcode-i\">emphasis</span>", "italics text");
-  cookedPara("[u]underlined[/u]", "<span class=\"bbcode-u\">underlined</span>", "underlines text");
-  cookedPara("[s]strikethrough[/s]", "<span class=\"bbcode-s\">strikethrough</span>", "strikes-through text");
-  cookedPara("[img]http://eviltrout.com/eviltrout.png[/img]", "<img src=\"http://eviltrout.com/eviltrout.png\">", "links images");
-  cookedPara("[email]eviltrout@mailinator.com[/email]", "<a href=\"mailto:eviltrout@mailinator.com\">eviltrout@mailinator.com</a>", "supports [email] without a title");
-  cookedPara("[b]evil [i]trout[/i][/b]",
+QUnit.test('basic bbcode', assert => {
+  assert.cookedPara("[b]strong[/b]", "<span class=\"bbcode-b\">strong</span>", "bolds text");
+  assert.cookedPara("[i]emphasis[/i]", "<span class=\"bbcode-i\">emphasis</span>", "italics text");
+  assert.cookedPara("[u]underlined[/u]", "<span class=\"bbcode-u\">underlined</span>", "underlines text");
+  assert.cookedPara("[s]strikethrough[/s]", "<span class=\"bbcode-s\">strikethrough</span>", "strikes-through text");
+  assert.cookedPara("[img]http://eviltrout.com/eviltrout.png[/img]", "<img src=\"http://eviltrout.com/eviltrout.png\" alt>", "links images");
+  assert.cookedPara("[email]eviltrout@mailinator.com[/email]", "<a href=\"mailto:eviltrout@mailinator.com\" data-bbcode=\"true\">eviltrout@mailinator.com</a>", "supports [email] without a title");
+  assert.cookedPara("[b]evil [i]trout[/i][/b]",
          "<span class=\"bbcode-b\">evil <span class=\"bbcode-i\">trout</span></span>",
          "allows embedding of tags");
-  cookedPara("[EMAIL]eviltrout@mailinator.com[/EMAIL]", "<a href=\"mailto:eviltrout@mailinator.com\">eviltrout@mailinator.com</a>", "supports upper case bbcode");
-  cookedPara("[b]strong [b]stronger[/b][/b]", "<span class=\"bbcode-b\">strong <span class=\"bbcode-b\">stronger</span></span>", "accepts nested bbcode tags");
+  assert.cookedPara("[EMAIL]eviltrout@mailinator.com[/EMAIL]", "<a href=\"mailto:eviltrout@mailinator.com\" data-bbcode=\"true\">eviltrout@mailinator.com</a>", "supports upper case bbcode");
+  assert.cookedPara("[b]strong [b]stronger[/b][/b]", "<span class=\"bbcode-b\">strong <span class=\"bbcode-b\">stronger</span></span>", "accepts nested bbcode tags");
 });
 
-test('urls', function() {
-  cookedPara("[url]not a url[/url]", "not a url", "supports [url] that isn't a url");
-  cookedPara("[url]abc.com[/url]", "abc.com", "no error when a url has no protocol and begins with a");
-  cookedPara("[url]http://bettercallsaul.com[/url]", "<a href=\"http://bettercallsaul.com\">http://bettercallsaul.com</a>", "supports [url] without parameter");
-  cookedPara("[url=http://example.com]example[/url]", "<a href=\"http://example.com\">example</a>", "supports [url] with given href");
-  cookedPara("[url=http://www.example.com][img]http://example.com/logo.png[/img][/url]",
-         "<a href=\"http://www.example.com\"><img src=\"http://example.com/logo.png\"></a>",
+QUnit.test('urls', assert => {
+  assert.cookedPara("[url]not a url[/url]", "not a url", "supports [url] that isn't a url");
+  assert.cookedPara("[url]abc.com[/url]", "<a href=\"http://abc.com\">abc.com</a>", "it magically links using linkify");
+  assert.cookedPara("[url]http://bettercallsaul.com[/url]", "<a href=\"http://bettercallsaul.com\" data-bbcode=\"true\">http://bettercallsaul.com</a>", "supports [url] without parameter");
+  assert.cookedPara("[url=http://example.com]example[/url]", "<a href=\"http://example.com\" data-bbcode=\"true\">example</a>", "supports [url] with given href");
+  assert.cookedPara("[url=http://www.example.com][img]http://example.com/logo.png[/img][/url]",
+         "<a href=\"http://www.example.com\" data-bbcode=\"true\"><img src=\"http://example.com/logo.png\" alt></a>",
          "supports [url] with an embedded [img]");
 });
-test('invalid bbcode', function() {
-  const result = new PrettyText({ lookupAvatar: false }).cook("[code]I am not closed\n\nThis text exists.");
-  equal(result, "<p>[code]I am not closed</p>\n\n<p>This text exists.</p>", "does not raise an error with an open bbcode tag.");
+QUnit.test('invalid bbcode', assert => {
+  assert.cooked("[code]I am not closed\n\nThis text exists.",
+    "<p>[code]I am not closed</p>\n<p>This text exists.</p>",
+    "does not raise an error with an open bbcode tag.");
 });
 
-test('code', function() {
-  cookedPara("[code]\nx++\n[/code]", "<pre><code class=\"lang-auto\">x++</code></pre>", "makes code into pre");
-  cookedPara("[code]\nx++\ny++\nz++\n[/code]", "<pre><code class=\"lang-auto\">x++\ny++\nz++</code></pre>", "makes code into pre");
-  cookedPara("[code]abc\n#def\n[/code]", '<pre><code class=\"lang-auto\">abc\n#def</code></pre>', 'it handles headings in a [code] block');
-  cookedPara("[code]\n   s[/code]",
+QUnit.test('code', assert => {
+  assert.cooked("[code]\nx++\n[/code]", "<pre><code class=\"lang-auto\">x++</code></pre>", "makes code into pre");
+  assert.cooked("[code]\nx++\ny++\nz++\n[/code]", "<pre><code class=\"lang-auto\">x++\ny++\nz++</code></pre>", "makes code into pre");
+  assert.cooked("[code]\nabc\n#def\n[/code]", '<pre><code class=\"lang-auto\">abc\n#def</code></pre>', 'it handles headings in a [code] block');
+  assert.cooked("[code]\n   s\n[/code]",
          "<pre><code class=\"lang-auto\">   s</code></pre>",
          "it doesn't trim leading whitespace");
 });
 
-test('lists', function() {
-  cookedPara("[ul][li]option one[/li][/ul]", "<ul><li>option one</li></ul>", "creates an ul");
-  cookedPara("[ol][li]option one[/li][/ol]", "<ol><li>option one</li></ol>", "creates an ol");
-  cookedPara("[ul]\n[li]option one[/li]\n[li]option two[/li]\n[/ul]", "<ul><li>option one</li><li>option two</li></ul>", "suppresses empty lines in lists");
-});
-
-test('tags with arguments', function() {
-  cookedPara("[url=http://bettercallsaul.com]better call![/url]", "<a href=\"http://bettercallsaul.com\">better call!</a>", "supports [url] with a title");
-  cookedPara("[email=eviltrout@mailinator.com]evil trout[/email]", "<a href=\"mailto:eviltrout@mailinator.com\">evil trout</a>", "supports [email] with a title");
-  cookedPara("[u][i]abc[/i][/u]", "<span class=\"bbcode-u\"><span class=\"bbcode-i\">abc</span></span>", "can nest tags");
-  cookedPara("[b]first[/b] [b]second[/b]", "<span class=\"bbcode-b\">first</span> <span class=\"bbcode-b\">second</span>", "can bold two things on the same line");
+QUnit.test('tags with arguments', assert => {
+  assert.cookedPara("[url=http://bettercallsaul.com]better call![/url]", "<a href=\"http://bettercallsaul.com\" data-bbcode=\"true\">better call!</a>", "supports [url] with a title");
+  assert.cookedPara("[email=eviltrout@mailinator.com]evil trout[/email]", "<a href=\"mailto:eviltrout@mailinator.com\" data-bbcode=\"true\">evil trout</a>", "supports [email] with a title");
+  assert.cookedPara("[u][i]abc[/i][/u]", "<span class=\"bbcode-u\"><span class=\"bbcode-i\">abc</span></span>", "can nest tags");
+  assert.cookedPara("[b]first[/b] [b]second[/b]", "<span class=\"bbcode-b\">first</span> <span class=\"bbcode-b\">second</span>", "can bold two things on the same line");
 });
 
 
-test("quotes", function() {
+QUnit.test("quotes", assert => {
   const post = Post.create({
     cooked: "<p><b>lorem</b> ipsum</p>",
     username: "eviltrout",
@@ -621,7 +656,7 @@ test("quotes", function() {
   });
 
   function formatQuote(val, expected, text) {
-    equal(Quote.build(post, val), expected, text);
+    assert.equal(Quote.build(post, val), expected, text);
   };
 
   formatQuote(undefined, "", "empty string for undefined content");
@@ -646,80 +681,150 @@ test("quotes", function() {
               "[quote=\"eviltrout, post:1, topic:2\"]\nthis is &lt;not&gt; a bug\n[/quote]\n\n",
               "it escapes the contents of the quote");
 
-  cookedPara("[quote]test[/quote]",
-         "<aside class=\"quote\"><blockquote><p>test</p></blockquote></aside>",
+  assert.cooked("[quote]\ntest\n[/quote]",
+         "<aside class=\"quote\">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>",
          "it supports quotes without params");
 
-  cookedPara("[quote]\n*test*\n[/quote]",
-         "<aside class=\"quote\"><blockquote><p><em>test</em></p></blockquote></aside>",
+  assert.cooked("[quote]\n*test*\n[/quote]",
+         "<aside class=\"quote\">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>",
          "it doesn't insert a new line for italics");
 
-  cookedPara("[quote=,script='a'><script>alert('test');//':a][/quote]",
-         "<aside class=\"quote\"><blockquote></blockquote></aside>",
+  assert.cooked("[quote=,script='a'><script>alert('test');//':a]\n[/quote]",
+         "<aside class=\"quote\">\n<blockquote></blockquote>\n</aside>",
          "It will not create a script tag within an attribute");
 });
 
-test("quote formatting", function() {
+QUnit.test("quote formatting", assert => {
 
-  cooked("[quote=\"EvilTrout, post:123, topic:456, full:true\"][sam][/quote]",
-          "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">" +
-          "<div class=\"quote-controls\"></div>EvilTrout:</div><blockquote><p>[sam]</p></blockquote></aside>",
+  assert.cooked("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\n[sam]\n[/quote]",
+`<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ EvilTrout:</div>
+<blockquote>
+<p>[sam]</p>
+</blockquote>
+</aside>`,
           "it allows quotes with [] inside");
 
-  cooked("[quote=\"eviltrout, post:1, topic:1\"]abc[/quote]",
-         "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>eviltrout:" +
-         "</div><blockquote><p>abc</p></blockquote></aside>",
+  assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]",
+`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ eviltrout:</div>
+<blockquote>
+<p>abc</p>
+</blockquote>
+</aside>`,
          "renders quotes properly");
 
-  cooked("[quote=\"eviltrout, post:1, topic:1\"]abc[/quote]\nhello",
-         "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>eviltrout:" +
-         "</div><blockquote><p>abc</p></blockquote></aside>\n\n<p>hello</p>",
+  assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]\nhello",
+`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ eviltrout:</div>
+<blockquote>
+<p>abc</p>
+</blockquote>
+</aside>
+<p>hello</p>`,
          "handles new lines properly");
 
-  cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]\n[/quote]",
-         "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:" +
-         "</div><blockquote><aside class=\"quote\" data-post=\"2\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Bob:" +
-         "</div><blockquote></blockquote></aside></blockquote></aside>",
+  assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]\n[/quote]",
+`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ Alice:</div>
+<blockquote>
+<aside class=\"quote\" data-post=\"2\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ Bob:</div>
+<blockquote></blockquote>
+</aside>
+</blockquote>
+</aside>`,
          "quotes can be nested");
 
-  cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]",
-         "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:" +
-         "</div><blockquote><p>[quote=\"Bob, post:2, topic:1\"]</p></blockquote></aside>",
-         "handles mismatched nested quote tags");
+  assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]",
+`<p>[quote=&quot;Alice, post:1, topic:1&quot;]</p>
+<aside class=\"quote\" data-post=\"2\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ Bob:</div>
+<blockquote></blockquote>
+</aside>`,
 
-  cooked("[quote=\"Alice, post:1, topic:1\"]\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
-          "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:</div><blockquote><p><pre><code class=\"lang-javascript\">var foo =&#x27;foo&#x27;;\nvar bar = &#x27;bar&#x27;;</code></pre></p></blockquote></aside>",
+         "handles mismatched nested quote tags (non greedy)");
+
+  assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
+`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ Alice:</div>
+<blockquote>
+<pre><code class=\"lang-javascript\">var foo ='foo';
+var bar = 'bar';
+</code></pre>
+</blockquote>
+</aside>`,
           "quotes can have code blocks without leading newline");
-  cooked("[quote=\"Alice, post:1, topic:1\"]\n\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
-          "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:</div><blockquote><p><pre><code class=\"lang-javascript\">var foo =&#x27;foo&#x27;;\nvar bar = &#x27;bar&#x27;;</code></pre></p></blockquote></aside>",
+
+  assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
+`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ Alice:</div>
+<blockquote>
+<pre><code class=\"lang-javascript\">var foo ='foo';
+var bar = 'bar';
+</code></pre>
+</blockquote>
+</aside>`,
           "quotes can have code blocks with leading newline");
 });
 
-test("quotes with trailing formatting", function() {
+QUnit.test("quotes with trailing formatting", assert => {
   const result = new PrettyText(defaultOpts).cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\nhello\n[/quote]\n*Test*");
-  equal(result,
-        "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">" +
-        "<div class=\"quote-controls\"></div>EvilTrout:</div><blockquote><p>hello</p></blockquote></aside>\n\n<p><em>Test</em></p>",
+  assert.equal(result,
+`<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ EvilTrout:</div>
+<blockquote>
+<p>hello</p>
+</blockquote>
+</aside>
+<p><em>Test</em></p>`,
         "it allows trailing formatting");
 });
 
-test("enable/disable features", () => {
-  const table = `<table><tr><th>hello</th></tr><tr><td>world</td></tr></table>`;
-  const hasTable = new PrettyText({ features: {table: true}, sanitize: true}).cook(table);
-  equal(hasTable, `<table class="md-table"><tr><th>hello</th></tr><tr><td>world</td></tr></table>`);
+QUnit.test("enable/disable features", assert => {
 
-  const noTable = new PrettyText({ features: { table: false }, sanitize: true}).cook(table);
-  equal(noTable, `<p></p>`, 'tables are stripped when disabled');
+  assert.cookedOptions('|a|\n--\n|a|', { features: {table: false} }, '');
+  assert.cooked('|a|\n--\n|a|',
+`<table>
+<thead>
+<tr>
+<th>a</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>a</td>
+</tr>
+</tbody>
+</table>`);
 });
 
-test("emoji", () => {
-  cooked(":smile:", `<p><img src="/images/emoji/emoji_one/smile.png?v=${v}" title=":smile:" class="emoji" alt=":smile:"></p>`);
-  cooked(":(", `<p><img src="/images/emoji/emoji_one/frowning.png?v=${v}" title=":frowning:" class="emoji" alt=":frowning:"></p>`);
-  cooked("8-)", `<p><img src="/images/emoji/emoji_one/sunglasses.png?v=${v}" title=":sunglasses:" class="emoji" alt=":sunglasses:"></p>`);
+QUnit.test("emoji", assert => {
+  assert.cooked(":smile:", `<p><img src="/images/emoji/emoji_one/smile.png?v=${v}" title=":smile:" class="emoji" alt=":smile:"></p>`);
+  assert.cooked(":(", `<p><img src="/images/emoji/emoji_one/frowning.png?v=${v}" title=":frowning:" class="emoji" alt=":frowning:"></p>`);
+  assert.cooked("8-)", `<p><img src="/images/emoji/emoji_one/sunglasses.png?v=${v}" title=":sunglasses:" class="emoji" alt=":sunglasses:"></p>`);
 });
 
-test("emoji - emojiSet", () => {
-  cookedOptions(":smile:",
-                { emojiSet: 'twitter' },
+QUnit.test("emoji - emojiSet", assert => {
+  assert.cookedOptions(":smile:",
+                { siteSettings : { emoji_set: 'twitter' }},
                 `<p><img src="/images/emoji/twitter/smile.png?v=${v}" title=":smile:" class="emoji" alt=":smile:"></p>`);
 });
diff --git a/test/javascripts/lib/sanitizer-test.js.es6 b/test/javascripts/lib/sanitizer-test.js.es6
index 0722fdb2363..cc5dcb205cb 100644
--- a/test/javascripts/lib/sanitizer-test.js.es6
+++ b/test/javascripts/lib/sanitizer-test.js.es6
@@ -1,26 +1,26 @@
 import { default as PrettyText, buildOptions } from 'pretty-text/pretty-text';
 import { hrefAllowed } from 'pretty-text/sanitizer';
 
-module("lib:sanitizer");
+QUnit.module("lib:sanitizer");
 
-test("sanitize", function() {
+QUnit.test("sanitize", assert => {
   const pt = new PrettyText(buildOptions({ siteSettings: {} }));
-  const cooked = (input, expected, text) => equal(pt.cook(input), expected.replace(/\/>/g, ">"), text);
+  const cooked = (input, expected, text) => assert.equal(pt.cook(input), expected.replace(/\/>/g, ">"), text);
+
+  assert.equal(pt.sanitize("<i class=\"fa-bug fa-spin\">bug</i>"), "<i>bug</i>");
+  assert.equal(pt.sanitize("<div><script>alert('hi');</script></div>"), "<div></div>");
+  assert.equal(pt.sanitize("<div><p class=\"funky\" wrong='1'>hello</p></div>"), "<div><p>hello</p></div>");
+  assert.equal(pt.sanitize("<3 <3"), "&lt;3 &lt;3");
+  assert.equal(pt.sanitize("<_<"), "&lt;_&lt;");
 
-  equal(pt.sanitize("<i class=\"fa-bug fa-spin\">bug</i>"), "<i>bug</i>");
-  equal(pt.sanitize("<div><script>alert('hi');</script></div>"), "<div></div>");
-  equal(pt.sanitize("<div><p class=\"funky\" wrong='1'>hello</p></div>"), "<div><p>hello</p></div>");
-  equal(pt.sanitize("<3 <3"), "&lt;3 &lt;3");
-  equal(pt.sanitize("<_<"), "&lt;_&lt;");
   cooked("hello<script>alert(42)</script>", "<p>hello</p>", "it sanitizes while cooking");
 
   cooked("<a href='http://disneyland.disney.go.com/'>disney</a> <a href='http://reddit.com'>reddit</a>",
          "<p><a href=\"http://disneyland.disney.go.com/\">disney</a> <a href=\"http://reddit.com\">reddit</a></p>",
          "we can embed proper links");
 
-  cooked("<center>hello</center>", "<p>hello</p>", "it does not allow centering");
-  cooked("<table><tr><td>hello</td></tr></table>\nafter", "<p>after</p>", "it does not allow tables");
-  cooked("<blockquote>a\n</blockquote>\n", "<blockquote>a\n\n<br/>\n\n</blockquote>", "it does not double sanitize");
+  cooked("<center>hello</center>", "hello", "it does not allow centering");
+  cooked("<blockquote>a\n</blockquote>\n", "<blockquote>a\n</blockquote>", "it does not double sanitize");
 
   cooked("<iframe src=\"http://discourse.org\" width=\"100\" height=\"42\"></iframe>", "", "it does not allow most iframes");
 
@@ -32,15 +32,15 @@ test("sanitize", function() {
          "<iframe width=\"425\" height=\"350\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" src=\"http://www.openstreetmap.org/export/embed.html?bbox=22.49454975128174%2C51.220338322410775%2C22.523088455200195%2C51.23345342732931&amp;layer=mapnik\"></iframe>",
          "it allows iframe to OpenStreetMap");
 
-  equal(pt.sanitize("<textarea>hullo</textarea>"), "hullo");
-  equal(pt.sanitize("<button>press me!</button>"), "press me!");
-  equal(pt.sanitize("<canvas>draw me!</canvas>"), "draw me!");
-  equal(pt.sanitize("<progress>hello"), "hello");
-  equal(pt.sanitize("<mark>highlight</mark>"), "highlight");
+  assert.equal(pt.sanitize("<textarea>hullo</textarea>"), "hullo");
+  assert.equal(pt.sanitize("<button>press me!</button>"), "press me!");
+  assert.equal(pt.sanitize("<canvas>draw me!</canvas>"), "draw me!");
+  assert.equal(pt.sanitize("<progress>hello"), "hello");
+  assert.equal(pt.sanitize("<mark>highlight</mark>"), "highlight");
 
-  cooked("[the answer](javascript:alert(42))", "<p><a>the answer</a></p>", "it prevents XSS");
+  cooked("[the answer](javascript:alert(42))", "<p>[the answer](javascript:alert(42))</p>", "it prevents XSS");
 
-  cooked("<i class=\"fa fa-bug fa-spin\" style=\"font-size:600%\"></i>\n<!-- -->", "<p><i></i><br/></p>", "it doesn't circumvent XSS with comments");
+  cooked("<i class=\"fa fa-bug fa-spin\" style=\"font-size:600%\"></i>\n<!-- -->", "<p><i></i></p>", "it doesn't circumvent XSS with comments");
 
   cooked("<span class=\"-bbcode-s fa fa-spin\">a</span>", "<p><span>a</span></p>", "it sanitizes spans");
   cooked("<span class=\"fa fa-spin -bbcode-s\">a</span>", "<p><span>a</span></p>", "it sanitizes spans");
@@ -60,26 +60,26 @@ test("sanitize", function() {
   cooked(`<div dir="rtl">RTL text</div>`, `<div dir="rtl">RTL text</div>`);
 });
 
-test("ids on headings", () => {
+QUnit.test("ids on headings", assert => {
   const pt = new PrettyText(buildOptions({ siteSettings: {} }));
-  equal(pt.sanitize("<h3>Test Heading</h3>"), "<h3>Test Heading</h3>");
-  equal(pt.sanitize(`<h1 id="test-heading">Test Heading</h1>`), `<h1 id="test-heading">Test Heading</h1>`);
-  equal(pt.sanitize(`<h2 id="test-heading">Test Heading</h2>`), `<h2 id="test-heading">Test Heading</h2>`);
-  equal(pt.sanitize(`<h3 id="test-heading">Test Heading</h3>`), `<h3 id="test-heading">Test Heading</h3>`);
-  equal(pt.sanitize(`<h4 id="test-heading">Test Heading</h4>`), `<h4 id="test-heading">Test Heading</h4>`);
-  equal(pt.sanitize(`<h5 id="test-heading">Test Heading</h5>`), `<h5 id="test-heading">Test Heading</h5>`);
-  equal(pt.sanitize(`<h6 id="test-heading">Test Heading</h6>`), `<h6 id="test-heading">Test Heading</h6>`);
+  assert.equal(pt.sanitize("<h3>Test Heading</h3>"), "<h3>Test Heading</h3>");
+  assert.equal(pt.sanitize(`<h1 id="test-heading">Test Heading</h1>`), `<h1 id="test-heading">Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h2 id="test-heading">Test Heading</h2>`), `<h2 id="test-heading">Test Heading</h2>`);
+  assert.equal(pt.sanitize(`<h3 id="test-heading">Test Heading</h3>`), `<h3 id="test-heading">Test Heading</h3>`);
+  assert.equal(pt.sanitize(`<h4 id="test-heading">Test Heading</h4>`), `<h4 id="test-heading">Test Heading</h4>`);
+  assert.equal(pt.sanitize(`<h5 id="test-heading">Test Heading</h5>`), `<h5 id="test-heading">Test Heading</h5>`);
+  assert.equal(pt.sanitize(`<h6 id="test-heading">Test Heading</h6>`), `<h6 id="test-heading">Test Heading</h6>`);
 });
 
-test("urlAllowed", () => {
-  const allowed = (url, msg) => equal(hrefAllowed(url), url, msg);
+QUnit.test("urlAllowed", assert => {
+  const allowed = (url, msg) => assert.equal(hrefAllowed(url), url, msg);
 
   allowed("/foo/bar.html", "allows relative urls");
   allowed("http://eviltrout.com/evil/trout", "allows full urls");
   allowed("https://eviltrout.com/evil/trout", "allows https urls");
   allowed("//eviltrout.com/evil/trout", "allows protocol relative urls");
 
-  equal(hrefAllowed("http://google.com/test'onmouseover=alert('XSS!');//.swf"),
+  assert.equal(hrefAllowed("http://google.com/test'onmouseover=alert('XSS!');//.swf"),
         "http://google.com/test%27onmouseover=alert(%27XSS!%27);//.swf",
         "escape single quotes");
 });
diff --git a/test/javascripts/lib/url-test.js.es6 b/test/javascripts/lib/url-test.js.es6
index dd938b5d0c4..71a95467a70 100644
--- a/test/javascripts/lib/url-test.js.es6
+++ b/test/javascripts/lib/url-test.js.es6
@@ -1,40 +1,40 @@
 import { default as DiscourseURL, userPath } from 'discourse/lib/url';
 
-module("lib:url");
+QUnit.module("lib:url");
 
-test("isInternal with a HTTP url", function() {
+QUnit.test("isInternal with a HTTP url", assert => {
   sandbox.stub(DiscourseURL, "origin").returns("http://eviltrout.com");
 
-  not(DiscourseURL.isInternal(null), "a blank URL is not internal");
-  ok(DiscourseURL.isInternal("/test"), "relative URLs are internal");
-  ok(DiscourseURL.isInternal("//eviltrout.com"), "a url on the same host is internal (protocol-less)");
-  ok(DiscourseURL.isInternal("http://eviltrout.com/tophat"), "a url on the same host is internal");
-  ok(DiscourseURL.isInternal("https://eviltrout.com/moustache"), "a url on a HTTPS of the same host is internal");
-  not(DiscourseURL.isInternal("//twitter.com.com"), "a different host is not internal (protocol-less)");
-  not(DiscourseURL.isInternal("http://twitter.com"), "a different host is not internal");
+  assert.not(DiscourseURL.isInternal(null), "a blank URL is not internal");
+  assert.ok(DiscourseURL.isInternal("/test"), "relative URLs are internal");
+  assert.ok(DiscourseURL.isInternal("//eviltrout.com"), "a url on the same host is internal (protocol-less)");
+  assert.ok(DiscourseURL.isInternal("http://eviltrout.com/tophat"), "a url on the same host is internal");
+  assert.ok(DiscourseURL.isInternal("https://eviltrout.com/moustache"), "a url on a HTTPS of the same host is internal");
+  assert.not(DiscourseURL.isInternal("//twitter.com.com"), "a different host is not internal (protocol-less)");
+  assert.not(DiscourseURL.isInternal("http://twitter.com"), "a different host is not internal");
 });
 
-test("isInternal with a HTTPS url", function() {
+QUnit.test("isInternal with a HTTPS url", assert => {
   sandbox.stub(DiscourseURL, "origin").returns("https://eviltrout.com");
-  ok(DiscourseURL.isInternal("http://eviltrout.com/monocle"), "HTTPS urls match HTTP urls");
+  assert.ok(DiscourseURL.isInternal("http://eviltrout.com/monocle"), "HTTPS urls match HTTP urls");
 });
 
-test("isInternal on subfolder install", function() {
+QUnit.test("isInternal on subfolder install", assert => {
   sandbox.stub(DiscourseURL, "origin").returns("http://eviltrout.com/forum");
-  not(DiscourseURL.isInternal("http://eviltrout.com"), "the host root is not internal");
-  not(DiscourseURL.isInternal("http://eviltrout.com/tophat"), "a url on the same host but on a different folder is not internal");
-  ok(DiscourseURL.isInternal("http://eviltrout.com/forum/moustache"), "a url on the same host and on the same folder is internal");
+  assert.not(DiscourseURL.isInternal("http://eviltrout.com"), "the host root is not internal");
+  assert.not(DiscourseURL.isInternal("http://eviltrout.com/tophat"), "a url on the same host but on a different folder is not internal");
+  assert.ok(DiscourseURL.isInternal("http://eviltrout.com/forum/moustache"), "a url on the same host and on the same folder is internal");
 });
 
-test("userPath", assert => {
+QUnit.test("userPath", assert => {
   assert.equal(userPath(), '/u');
   assert.equal(userPath('eviltrout'), '/u/eviltrout');
   assert.equal(userPath('hp.json'), '/u/hp.json');
 });
 
-test("userPath with BaseUri", assert => {
+QUnit.test("userPath with BaseUri", assert => {
   Discourse.BaseUri = "/forum";
   assert.equal(userPath(), '/forum/u');
   assert.equal(userPath('eviltrout'), '/forum/u/eviltrout');
   assert.equal(userPath('hp.json'), '/forum/u/hp.json');
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js.es6
index fba45e9ff73..9cdb8302216 100644
--- a/test/javascripts/lib/user-search-test.js.es6
+++ b/test/javascripts/lib/user-search-test.js.es6
@@ -1,7 +1,7 @@
 import userSearch from 'discourse/lib/user-search';
 
-module("lib:user-search", {
-  setup() {
+QUnit.module("lib:user-search", {
+  beforeEach() {
     const response = (object) => {
       return [
         200,
@@ -57,8 +57,8 @@ module("lib:user-search", {
   }
 });
 
-test("it places groups unconditionally for exact match", function() {
+QUnit.test("it places groups unconditionally for exact match", assert => {
   return userSearch({term: 'Team'}).then((results)=>{
-     equal(results[results.length-1]["name"], "team");
+     assert.equal(results[results.length-1]["name"], "team");
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js.es6
index 403cb2c9719..e903b977923 100644
--- a/test/javascripts/lib/utilities-test.js.es6
+++ b/test/javascripts/lib/utilities-test.js.es6
@@ -1,5 +1,4 @@
 /* global Int8Array:true */
-import { blank } from 'helpers/qunit-helpers';
 import {
   emailValid,
   extractDomainFromUrl,
@@ -17,59 +16,68 @@ import {
   setCaretPosition
 } from 'discourse/lib/utilities';
 
-module("lib:utilities");
+QUnit.module("lib:utilities");
 
-test("emailValid", function() {
-  ok(emailValid('Bob@example.com'), "allows upper case in the first part of emails");
-  ok(emailValid('bob@EXAMPLE.com'), "allows upper case in the email domain");
+QUnit.test("emailValid", assert => {
+  assert.ok(emailValid('Bob@example.com'), "allows upper case in the first part of emails");
+  assert.ok(emailValid('bob@EXAMPLE.com'), "allows upper case in the email domain");
 });
 
-test("extractDomainFromUrl", function() {
-  equal(extractDomainFromUrl('http://meta.discourse.org:443/random'), 'meta.discourse.org', "extract domain name from url");
-  equal(extractDomainFromUrl('meta.discourse.org:443/random'), 'meta.discourse.org', "extract domain regardless of scheme presence");
-  equal(extractDomainFromUrl('http://192.168.0.1:443/random'), '192.168.0.1', "works for IP address");
-  equal(extractDomainFromUrl('http://localhost:443/random'), 'localhost', "works for localhost");
+QUnit.test("extractDomainFromUrl", assert => {
+  assert.equal(extractDomainFromUrl('http://meta.discourse.org:443/random'), 'meta.discourse.org', "extract domain name from url");
+  assert.equal(extractDomainFromUrl('meta.discourse.org:443/random'), 'meta.discourse.org', "extract domain regardless of scheme presence");
+  assert.equal(extractDomainFromUrl('http://192.168.0.1:443/random'), '192.168.0.1', "works for IP address");
+  assert.equal(extractDomainFromUrl('http://localhost:443/random'), 'localhost', "works for localhost");
 });
 
 var validUpload = validateUploadedFiles;
 
-test("validateUploadedFiles", function() {
-  not(validUpload(null), "no files are invalid");
-  not(validUpload(undefined), "undefined files are invalid");
-  not(validUpload([]), "empty array of files is invalid");
+QUnit.test("validateUploadedFiles", assert => {
+  assert.not(validUpload(null), "no files are invalid");
+  assert.not(validUpload(undefined), "undefined files are invalid");
+  assert.not(validUpload([]), "empty array of files is invalid");
 });
 
-test("uploading one file", function() {
+QUnit.test("uploading one file", assert => {
   sandbox.stub(bootbox, "alert");
 
-  not(validUpload([1, 2]));
-  ok(bootbox.alert.calledWith(I18n.t('post.errors.too_many_uploads')));
+  assert.not(validUpload([1, 2]));
+  assert.ok(bootbox.alert.calledWith(I18n.t('post.errors.too_many_uploads')));
 });
 
-test("new user cannot upload images", function() {
+QUnit.test("new user cannot upload images", assert => {
   Discourse.SiteSettings.newuser_max_images = 0;
   Discourse.User.resetCurrent(Discourse.User.create());
   sandbox.stub(bootbox, "alert");
 
-  not(validUpload([{name: "image.png"}]), 'the upload is not valid');
-  ok(bootbox.alert.calledWith(I18n.t('post.errors.image_upload_not_allowed_for_new_user')), 'the alert is called');
+  assert.not(validUpload([{name: "image.png"}]), 'the upload is not valid');
+  assert.ok(bootbox.alert.calledWith(I18n.t('post.errors.image_upload_not_allowed_for_new_user')), 'the alert is called');
 });
 
-test("new user cannot upload attachments", function() {
+QUnit.test("new user cannot upload attachments", assert => {
   Discourse.SiteSettings.newuser_max_attachments = 0;
   sandbox.stub(bootbox, "alert");
   Discourse.User.resetCurrent(Discourse.User.create());
 
-  not(validUpload([{name: "roman.txt"}]));
-  ok(bootbox.alert.calledWith(I18n.t('post.errors.attachment_upload_not_allowed_for_new_user')));
+  assert.not(validUpload([{name: "roman.txt"}]));
+  assert.ok(bootbox.alert.calledWith(I18n.t('post.errors.attachment_upload_not_allowed_for_new_user')));
 });
 
-test("ensures an authorized upload", function() {
-  const html = { name: "unauthorized.html" };
+QUnit.test("ensures an authorized upload", assert => {
+  sandbox.stub(bootbox, "alert");
+  assert.not(validUpload([{ name: "unauthorized.html" }]));
+  assert.ok(bootbox.alert.calledWith(I18n.t('post.errors.upload_not_authorized', { authorized_extensions: authorizedExtensions() })));
+});
+
+QUnit.test("staff can upload anything in PM", assert => {
+  const files = [{ name: "some.docx" }];
+  Discourse.SiteSettings.authorized_extensions = "jpeg";
+  Discourse.User.resetCurrent(Discourse.User.create({ moderator: true }));
+
   sandbox.stub(bootbox, "alert");
 
-  not(validUpload([html]));
-  ok(bootbox.alert.calledWith(I18n.t('post.errors.upload_not_authorized', { authorized_extensions: authorizedExtensions() })));
+  assert.not(validUpload(files));
+  assert.ok(validUpload(files, { isPrivateMessage: true, allowStaffToUploadAnyFileInPm: true }));
 });
 
 var imageSize = 10 * 1024;
@@ -85,19 +93,19 @@ var dummyBlob = function() {
   }
 };
 
-test("allows valid uploads to go through", function() {
+QUnit.test("allows valid uploads to go through", assert => {
   Discourse.User.resetCurrent(Discourse.User.create());
   Discourse.User.currentProp("trust_level", 1);
   sandbox.stub(bootbox, "alert");
 
   // image
   var image = { name: "image.png", size: imageSize };
-  ok(validUpload([image]));
+  assert.ok(validUpload([image]));
   // pasted image
   var pastedImage = dummyBlob();
-  ok(validUpload([pastedImage]));
+  assert.ok(validUpload([pastedImage]));
 
-  not(bootbox.alert.calledOnce);
+  assert.not(bootbox.alert.calledOnce);
 });
 
 var testUploadMarkdown = function(filename) {
@@ -110,27 +118,27 @@ var testUploadMarkdown = function(filename) {
   });
 };
 
-test("getUploadMarkdown", function() {
-  ok(testUploadMarkdown("lolcat.gif") === '<img src="/uploads/123/abcdef.ext" width="100" height="200">');
-  ok(testUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n');
+QUnit.test("getUploadMarkdown", assert => {
+  assert.equal(testUploadMarkdown("lolcat.gif"),'![lolcat|100x200](/uploads/123/abcdef.ext)');
+  assert.ok(testUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n');
 });
 
-test("isAnImage", function() {
+QUnit.test("isAnImage", assert => {
   _.each(["png", "jpg", "jpeg", "bmp", "gif", "tif", "tiff", "ico"], function(extension) {
     var image = "image." + extension;
-    ok(isAnImage(image), image + " is recognized as an image");
-    ok(isAnImage("http://foo.bar/path/to/" + image), image + " is recognized as an image");
+    assert.ok(isAnImage(image), image + " is recognized as an image");
+    assert.ok(isAnImage("http://foo.bar/path/to/" + image), image + " is recognized as an image");
   });
-  not(isAnImage("file.txt"));
-  not(isAnImage("http://foo.bar/path/to/file.txt"));
-  not(isAnImage(""));
+  assert.not(isAnImage("file.txt"));
+  assert.not(isAnImage("http://foo.bar/path/to/file.txt"));
+  assert.not(isAnImage(""));
 });
 
-test("avatarUrl", function() {
+QUnit.test("avatarUrl", assert => {
   var rawSize = getRawSize;
-  blank(avatarUrl('', 'tiny'), "no template returns blank");
-  equal(avatarUrl('/fake/template/{size}.png', 'tiny'), "/fake/template/" + rawSize(20) + ".png", "simple avatar url");
-  equal(avatarUrl('/fake/template/{size}.png', 'large'), "/fake/template/" + rawSize(45) +  ".png", "different size");
+  assert.blank(avatarUrl('', 'tiny'), "no template returns blank");
+  assert.equal(avatarUrl('/fake/template/{size}.png', 'tiny'), "/fake/template/" + rawSize(20) + ".png", "simple avatar url");
+  assert.equal(avatarUrl('/fake/template/{size}.png', 'large'), "/fake/template/" + rawSize(45) +  ".png", "different size");
 });
 
 var setDevicePixelRatio = function(value) {
@@ -141,64 +149,64 @@ var setDevicePixelRatio = function(value) {
   }
 };
 
-test("avatarImg", function() {
+QUnit.test("avatarImg", assert => {
   var oldRatio = window.devicePixelRatio;
   setDevicePixelRatio(2);
 
   var avatarTemplate = "/path/to/avatar/{size}.png";
-  equal(avatarImg({avatarTemplate: avatarTemplate, size: 'tiny'}),
+  assert.equal(avatarImg({avatarTemplate: avatarTemplate, size: 'tiny'}),
         "<img alt='' width='20' height='20' src='/path/to/avatar/40.png' class='avatar'>",
         "it returns the avatar html");
 
-  equal(avatarImg({avatarTemplate: avatarTemplate, size: 'tiny', title: 'evilest trout'}),
+  assert.equal(avatarImg({avatarTemplate: avatarTemplate, size: 'tiny', title: 'evilest trout'}),
         "<img alt='' width='20' height='20' src='/path/to/avatar/40.png' class='avatar' title='evilest trout'>",
         "it adds a title if supplied");
 
-  equal(avatarImg({avatarTemplate: avatarTemplate, size: 'tiny', extraClasses: 'evil fish'}),
+  assert.equal(avatarImg({avatarTemplate: avatarTemplate, size: 'tiny', extraClasses: 'evil fish'}),
         "<img alt='' width='20' height='20' src='/path/to/avatar/40.png' class='avatar evil fish'>",
         "it adds extra classes if supplied");
 
-  blank(avatarImg({avatarTemplate: "", size: 'tiny'}),
+  assert.blank(avatarImg({avatarTemplate: "", size: 'tiny'}),
         "it doesn't render avatars for invalid avatar template");
 
   setDevicePixelRatio(oldRatio);
 });
 
-test("allowsImages", function() {
+QUnit.test("allowsImages", assert => {
   Discourse.SiteSettings.authorized_extensions = "jpg|jpeg|gif";
-  ok(allowsImages(), "works");
+  assert.ok(allowsImages(), "works");
 
   Discourse.SiteSettings.authorized_extensions = ".jpg|.jpeg|.gif";
-  ok(allowsImages(), "works with old extensions syntax");
+  assert.ok(allowsImages(), "works with old extensions syntax");
 
   Discourse.SiteSettings.authorized_extensions = "txt|pdf|*";
-  ok(allowsImages(), "images are allowed when all extensions are allowed");
+  assert.ok(allowsImages(), "images are allowed when all extensions are allowed");
 
   Discourse.SiteSettings.authorized_extensions = "json|jpg|pdf|txt";
-  ok(allowsImages(), "images are allowed when at least one extension is an image extension");
+  assert.ok(allowsImages(), "images are allowed when at least one extension is an image extension");
 });
 
 
-test("allowsAttachments", function() {
+QUnit.test("allowsAttachments", assert => {
   Discourse.SiteSettings.authorized_extensions = "jpg|jpeg|gif";
-  not(allowsAttachments(), "no attachments allowed by default");
+  assert.not(allowsAttachments(), "no attachments allowed by default");
 
   Discourse.SiteSettings.authorized_extensions = "jpg|jpeg|gif|*";
-  ok(allowsAttachments(), "attachments are allowed when all extensions are allowed");
+  assert.ok(allowsAttachments(), "attachments are allowed when all extensions are allowed");
 
   Discourse.SiteSettings.authorized_extensions = "jpg|jpeg|gif|pdf";
-  ok(allowsAttachments(), "attachments are allowed when at least one extension is not an image extension");
+  assert.ok(allowsAttachments(), "attachments are allowed when at least one extension is not an image extension");
 
   Discourse.SiteSettings.authorized_extensions = ".jpg|.jpeg|.gif|.pdf";
-  ok(allowsAttachments(), "works with old extensions syntax");
+  assert.ok(allowsAttachments(), "works with old extensions syntax");
 });
 
-test("defaultHomepage", function() {
+QUnit.test("defaultHomepage", assert => {
   Discourse.SiteSettings.top_menu = "latest|top|hot";
-  equal(defaultHomepage(), "latest", "default homepage is the first item in the top_menu site setting");
+  assert.equal(defaultHomepage(), "latest", "default homepage is the first item in the top_menu site setting");
 });
 
-test("caretRowCol", () => {
+QUnit.test("caretRowCol", assert => {
   var textarea = document.createElement('textarea');
   const content = document.createTextNode("01234\n56789\n012345");
   textarea.appendChild(content);
@@ -208,8 +216,8 @@ test("caretRowCol", () => {
     setCaretPosition(textarea, setCaretPos);
 
     const result = caretRowCol(textarea);
-    equal(result.rowNum, expectedRowNum, "returns the right row of the caret");
-    equal(result.colNum, expectedColNum,  "returns the right col of the caret");
+    assert.equal(result.rowNum, expectedRowNum, "returns the right row of the caret");
+    assert.equal(result.colNum, expectedColNum,  "returns the right col of the caret");
   };
 
   assertResult(0, 1, 0);
diff --git a/test/javascripts/lib/white-lister-test.js.es6 b/test/javascripts/lib/white-lister-test.js.es6
new file mode 100644
index 00000000000..e8bb3d8f300
--- /dev/null
+++ b/test/javascripts/lib/white-lister-test.js.es6
@@ -0,0 +1,48 @@
+import WhiteLister from 'pretty-text/white-lister';
+
+QUnit.module("lib:whiteLister");
+
+QUnit.test("whiteLister", assert => {
+  const whiteLister = new WhiteLister();
+
+  assert.ok(Object.keys(whiteLister.getWhiteList().tagList).length > 1, "should have some defaults");
+
+  whiteLister.disable("default");
+
+  assert.ok(Object.keys(whiteLister.getWhiteList().tagList).length === 0, "should have no defaults if disabled");
+
+  whiteLister.whiteListFeature("test", [
+      'custom.foo',
+      'custom.baz',
+      'custom[data-*]',
+      'custom[rel=nofollow]'
+  ]);
+
+  whiteLister.whiteListFeature("test", [
+    'custom[rel=test]'
+  ]);
+
+  whiteLister.enable("test");
+
+  assert.deepEqual(whiteLister.getWhiteList(), {
+    tagList: {
+      custom: []
+    },
+    attrList: {
+      custom: {
+        "class": ["foo", "baz"],
+        "data-*": ["*"],
+        "rel": ["nofollow", "test"]
+      }
+    }
+  }, 'Expecting a correct white list');
+
+
+  whiteLister.disable("test");
+
+  assert.deepEqual(whiteLister.getWhiteList(), {
+    tagList: {},
+    attrList: {}
+  }, 'Expecting an empty white list');
+
+});
diff --git a/test/javascripts/mdtest/fixtures/Amps and angle encoding.text b/test/javascripts/mdtest/fixtures/Amps and angle encoding.text
deleted file mode 100644
index 0e9527f9311..00000000000
--- a/test/javascripts/mdtest/fixtures/Amps and angle encoding.text	
+++ /dev/null
@@ -1,21 +0,0 @@
-AT&T has an ampersand in their name.
-
-AT&amp;T is another way to write it.
-
-This & that.
-
-4 < 5.
-
-6 > 5.
-
-Here's a [link] [1] with an ampersand in the URL.
-
-Here's a link with an amersand in the link text: [AT&T] [2].
-
-Here's an inline [link](/script?foo=1&bar=2).
-
-Here's an inline [link](</script?foo=1&bar=2>).
-
-
-[1]: http://example.com/?foo=1&bar=2
-[2]: http://att.com/  "AT&T"
\ No newline at end of file
diff --git a/test/javascripts/mdtest/fixtures/Amps and angle encoding.xhtml b/test/javascripts/mdtest/fixtures/Amps and angle encoding.xhtml
deleted file mode 100644
index 483f8ffa166..00000000000
--- a/test/javascripts/mdtest/fixtures/Amps and angle encoding.xhtml	
+++ /dev/null
@@ -1,17 +0,0 @@
-<p>AT&amp;T has an ampersand in their name.</p>
-
-<p>AT&amp;T is another way to write it.</p>
-
-<p>This &amp; that.</p>
-
-<p>4 &lt; 5.</p>
-
-<p>6 &gt; 5.</p>
-
-<p>Here's a <a href="http://example.com/?foo=1&amp;bar=2">link</a> with an ampersand in the URL.</p>
-
-<p>Here's a link with an amersand in the link text: <a href="http://att.com/" title="AT&amp;T">AT&amp;T</a>.</p>
-
-<p>Here's an inline <a href="/script?foo=1&amp;bar=2">link</a>.</p>
-
-<p>Here's an inline <a href="/script?foo=1&amp;bar=2">link</a>.</p>
diff --git a/test/javascripts/mdtest/fixtures/Auto links.text b/test/javascripts/mdtest/fixtures/Auto links.text
deleted file mode 100644
index abbc48869de..00000000000
--- a/test/javascripts/mdtest/fixtures/Auto links.text	
+++ /dev/null
@@ -1,13 +0,0 @@
-Link: <http://example.com/>.
-
-With an ampersand: <http://example.com/?foo=1&bar=2>
-
-* In a list?
-* <http://example.com/>
-* It should.
-
-> Blockquoted: <http://example.com/>
-
-Auto-links should not occur here: `<http://example.com/>`
-
-	or here: <http://example.com/>
\ No newline at end of file
diff --git a/test/javascripts/mdtest/fixtures/Auto links.xhtml b/test/javascripts/mdtest/fixtures/Auto links.xhtml
deleted file mode 100644
index f8df9852c7d..00000000000
--- a/test/javascripts/mdtest/fixtures/Auto links.xhtml	
+++ /dev/null
@@ -1,18 +0,0 @@
-<p>Link: <a href="http://example.com/">http://example.com/</a>.</p>
-
-<p>With an ampersand: <a href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</a></p>
-
-<ul>
-<li>In a list?</li>
-<li><a href="http://example.com/">http://example.com/</a></li>
-<li>It should.</li>
-</ul>
-
-<blockquote>
-  <p>Blockquoted: <a href="http://example.com/">http://example.com/</a></p>
-</blockquote>
-
-<p>Auto-links should not occur here: <code>&lt;http://example.com/&gt;</code></p>
-
-<pre><code>or here: &lt;http://example.com/&gt;
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Backslash escapes.text b/test/javascripts/mdtest/fixtures/Backslash escapes.text
deleted file mode 100644
index e30e9654896..00000000000
--- a/test/javascripts/mdtest/fixtures/Backslash escapes.text	
+++ /dev/null
@@ -1,120 +0,0 @@
-These should all get escaped:
-
-Backslash: \\
-
-Backtick: \`
-
-Asterisk: \*
-
-Underscore: \_
-
-Left brace: \{
-
-Right brace: \}
-
-Left bracket: \[
-
-Right bracket: \]
-
-Left paren: \(
-
-Right paren: \)
-
-Greater-than: \>
-
-Hash: \#
-
-Period: \.
-
-Bang: \!
-
-Plus: \+
-
-Minus: \-
-
-
-
-These should not, because they occur within a code block:
-
-	Backslash: \\
-
-	Backtick: \`
-
-	Asterisk: \*
-
-	Underscore: \_
-
-	Left brace: \{
-
-	Right brace: \}
-
-	Left bracket: \[
-
-	Right bracket: \]
-
-	Left paren: \(
-
-	Right paren: \)
-
-	Greater-than: \>
-
-	Hash: \#
-
-	Period: \.
-
-	Bang: \!
-
-	Plus: \+
-
-	Minus: \-
-
-
-Nor should these, which occur in code spans:
-
-Backslash: `\\`
-
-Backtick: `\``
-
-Asterisk: `\*`
-
-Underscore: `\_`
-
-Left brace: `\{`
-
-Right brace: `\}`
-
-Left bracket: `\[`
-
-Right bracket: `\]`
-
-Left paren: `\(`
-
-Right paren: `\)`
-
-Greater-than: `\>`
-
-Hash: `\#`
-
-Period: `\.`
-
-Bang: `\!`
-
-Plus: `\+`
-
-Minus: `\-`
-
-
-These should get escaped, even though they're matching pairs for
-other Markdown constructs:
-
-\*asterisks\*
-
-\_underscores\_
-
-\`backticks\`
-
-This is a code span with a literal backslash-backtick sequence: `\``
-
-This is a tag with unescaped backticks <span attr='`ticks`'>bar</span>.
-
-This is a tag with backslashes <span attr='\\backslashes\\'>bar</span>.
diff --git a/test/javascripts/mdtest/fixtures/Backslash escapes.xhtml b/test/javascripts/mdtest/fixtures/Backslash escapes.xhtml
deleted file mode 100644
index 750830e8c9e..00000000000
--- a/test/javascripts/mdtest/fixtures/Backslash escapes.xhtml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<p>These should all get escaped:</p>
-
-<p>Backslash: \</p>
-
-<p>Backtick: `</p>
-
-<p>Asterisk: *</p>
-
-<p>Underscore: _</p>
-
-<p>Left brace: {</p>
-
-<p>Right brace: }</p>
-
-<p>Left bracket: [</p>
-
-<p>Right bracket: ]</p>
-
-<p>Left paren: (</p>
-
-<p>Right paren: )</p>
-
-<p>Greater-than: &gt;</p>
-
-<p>Hash: #</p>
-
-<p>Period: .</p>
-
-<p>Bang: !</p>
-
-<p>Plus: +</p>
-
-<p>Minus: -</p>
-
-<p>These should not, because they occur within a code block:</p>
-
-<pre><code>Backslash: \\
-
-Backtick: \&#x60;
-
-Asterisk: \*
-
-Underscore: \_
-
-Left brace: \{
-
-Right brace: \}
-
-Left bracket: \[
-
-Right bracket: \]
-
-Left paren: \(
-
-Right paren: \)
-
-Greater-than: \&gt;
-
-Hash: \#
-
-Period: \.
-
-Bang: \!
-
-Plus: \+
-
-Minus: \-
-</code></pre>
-
-<p>Nor should these, which occur in code spans:</p>
-
-<p>Backslash: <code>\\</code></p>
-
-<p>Backtick: <code>\&#x60;</code></p>
-
-<p>Asterisk: <code>\*</code></p>
-
-<p>Underscore: <code>\_</code></p>
-
-<p>Left brace: <code>\{</code></p>
-
-<p>Right brace: <code>\}</code></p>
-
-<p>Left bracket: <code>\[</code></p>
-
-<p>Right bracket: <code>\]</code></p>
-
-<p>Left paren: <code>\(</code></p>
-
-<p>Right paren: <code>\)</code></p>
-
-<p>Greater-than: <code>\&gt;</code></p>
-
-<p>Hash: <code>\#</code></p>
-
-<p>Period: <code>\.</code></p>
-
-<p>Bang: <code>\!</code></p>
-
-<p>Plus: <code>\+</code></p>
-
-<p>Minus: <code>\-</code></p>
-
-
-<p>These should get escaped, even though they're matching pairs for
-other Markdown constructs:</p>
-
-<p>*asterisks*</p>
-
-<p>_underscores_</p>
-
-<p>`backticks`</p>
-
-<p>This is a code span with a literal backslash-backtick sequence: <code>\&#x60;</code></p>
-
-<p>This is a tag with unescaped backticks <span>bar</span>.</p>
-
-<p>This is a tag with backslashes <span>bar</span>.</p>
diff --git a/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.text b/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.text
deleted file mode 100644
index c31d171049d..00000000000
--- a/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.text	
+++ /dev/null
@@ -1,11 +0,0 @@
-> Example:
-> 
->     sub status {
->         print "working";
->     }
-> 
-> Or:
-> 
->     sub status {
->         return "working";
->     }
diff --git a/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.xhtml b/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.xhtml
deleted file mode 100644
index cb345349955..00000000000
--- a/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.xhtml	
+++ /dev/null
@@ -1,15 +0,0 @@
-<blockquote>
-  <p>Example:</p>
-
-<pre><code>sub status {
-    print &quot;working&quot;;
-}
-</code></pre>
-
-  <p>Or:</p>
-
-<pre><code>sub status {
-    return &quot;working&quot;;
-}
-</code></pre>
-</blockquote>
diff --git a/test/javascripts/mdtest/fixtures/Code Blocks.text b/test/javascripts/mdtest/fixtures/Code Blocks.text
deleted file mode 100644
index b54b09285a7..00000000000
--- a/test/javascripts/mdtest/fixtures/Code Blocks.text	
+++ /dev/null
@@ -1,14 +0,0 @@
-	code block on the first line
-	
-Regular text.
-
-    code block indented by spaces
-
-Regular text.
-
-	the lines in this block  
-	all contain trailing spaces  
-
-Regular Text.
-
-	code block on the last line
\ No newline at end of file
diff --git a/test/javascripts/mdtest/fixtures/Code Blocks.xhtml b/test/javascripts/mdtest/fixtures/Code Blocks.xhtml
deleted file mode 100644
index f6461051af6..00000000000
--- a/test/javascripts/mdtest/fixtures/Code Blocks.xhtml	
+++ /dev/null
@@ -1,17 +0,0 @@
-<pre><code>code block on the first line
-</code></pre>
-
-<p>Regular text.</p>
-
-<pre><code>code block indented by spaces
-</code></pre>
-
-<p>Regular text.</p>
-
-<pre><code>the lines in this block  
-all contain trailing spaces</code></pre>
-
-<p>Regular Text.</p>
-
-<pre><code>code block on the last line
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Code Spans.text b/test/javascripts/mdtest/fixtures/Code Spans.text
deleted file mode 100644
index fbef1f5f1d1..00000000000
--- a/test/javascripts/mdtest/fixtures/Code Spans.text	
+++ /dev/null
@@ -1,5 +0,0 @@
-`<test a="` content of attribute `">`
-
-Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span>
-
-Here's how you put `` `backticks` `` in a code span.
diff --git a/test/javascripts/mdtest/fixtures/Code Spans.xhtml b/test/javascripts/mdtest/fixtures/Code Spans.xhtml
deleted file mode 100644
index e050061d89e..00000000000
--- a/test/javascripts/mdtest/fixtures/Code Spans.xhtml	
+++ /dev/null
@@ -1,5 +0,0 @@
-<p><code>&lt;test a=&quot;</code> content of attribute <code>&quot;&gt;</code></p>
-
-<p>Fix for backticks within HTML tag: <span>like this</span></p>
-
-<p>Here's how you put <code>&#x60;backticks&#x60;</code> in a code span.</p>
diff --git a/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.text b/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.text
deleted file mode 100644
index f8a5b27bf41..00000000000
--- a/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.text	
+++ /dev/null
@@ -1,8 +0,0 @@
-In Markdown 1.0.0 and earlier. Version
-8. This line turns into a list item.
-Because a hard-wrapped line in the
-middle of a paragraph looked like a
-list item.
-
-Here's one with a bullet.
-* criminey.
diff --git a/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.xhtml b/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.xhtml
deleted file mode 100644
index e21ac79a2e0..00000000000
--- a/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.xhtml	
+++ /dev/null
@@ -1,8 +0,0 @@
-<p>In Markdown 1.0.0 and earlier. Version
-8. This line turns into a list item.
-Because a hard-wrapped line in the
-middle of a paragraph looked like a
-list item.</p>
-
-<p>Here's one with a bullet.
-* criminey.</p>
diff --git a/test/javascripts/mdtest/fixtures/Horizontal rules.text b/test/javascripts/mdtest/fixtures/Horizontal rules.text
deleted file mode 100644
index 1594bda27b4..00000000000
--- a/test/javascripts/mdtest/fixtures/Horizontal rules.text	
+++ /dev/null
@@ -1,67 +0,0 @@
-Dashes:
-
----
-
- ---
- 
-  ---
-
-   ---
-
-	---
-
-- - -
-
- - - -
- 
-  - - -
-
-   - - -
-
-	- - -
-
-
-Asterisks:
-
-***
-
- ***
- 
-  ***
-
-   ***
-
-	***
-
-* * *
-
- * * *
- 
-  * * *
-
-   * * *
-
-	* * *
-
-
-Underscores:
-
-___
-
- ___
- 
-  ___
-
-   ___
-
-    ___
-
-_ _ _
-
- _ _ _
- 
-  _ _ _
-
-   _ _ _
-
-    _ _ _
diff --git a/test/javascripts/mdtest/fixtures/Horizontal rules.xhtml b/test/javascripts/mdtest/fixtures/Horizontal rules.xhtml
deleted file mode 100644
index 2dc2ab65659..00000000000
--- a/test/javascripts/mdtest/fixtures/Horizontal rules.xhtml	
+++ /dev/null
@@ -1,71 +0,0 @@
-<p>Dashes:</p>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>---
-</code></pre>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>- - -
-</code></pre>
-
-<p>Asterisks:</p>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>***
-</code></pre>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>* * *
-</code></pre>
-
-<p>Underscores:</p>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>___
-</code></pre>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>_ _ _
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Images.text b/test/javascripts/mdtest/fixtures/Images.text
deleted file mode 100644
index 5707590915a..00000000000
--- a/test/javascripts/mdtest/fixtures/Images.text
+++ /dev/null
@@ -1,26 +0,0 @@
-![Alt text](/path/to/img.jpg)
-
-![Alt text](/path/to/img.jpg "Optional title")
-
-Inline within a paragraph: [alt text](/url/).
-
-![alt text](/url/  "title preceded by two spaces")
-
-![alt text](/url/  "title has spaces afterward"  )
-
-![alt text](</url/>)
-
-![alt text](</url/> "with a title").
-
-![Empty]()
-
-![this is a stupid URL](http://example.com/(parens).jpg)
-
-
-![alt text][foo]
-
-  [foo]: /url/
-
-![alt text][bar]
-
-  [bar]: /url/ "Title here"
\ No newline at end of file
diff --git a/test/javascripts/mdtest/fixtures/Images.xhtml b/test/javascripts/mdtest/fixtures/Images.xhtml
deleted file mode 100644
index fdec8ebcb6c..00000000000
--- a/test/javascripts/mdtest/fixtures/Images.xhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<p><img src="/path/to/img.jpg" alt="Alt text" /></p>
-
-<p><img src="/path/to/img.jpg" alt="Alt text" title="Optional title" /></p>
-
-<p>Inline within a paragraph: <a href="/url/">alt text</a>.</p>
-
-<p><img src="/url/" alt="alt text" title="title preceded by two spaces" /></p>
-
-<p><img src="/url/" alt="alt text" title="title has spaces afterward" /></p>
-
-<p><img src="/url/" alt="alt text" /></p>
-
-<p><img src="/url/" alt="alt text" title="with a title" />.</p>
-
-<p><img alt="Empty" /></p>
-
-<p><img src="http://example.com/(parens).jpg" alt="this is a stupid URL" /></p>
-
-<p><img src="/url/" alt="alt text" /></p>
-
-<p><img src="/url/" alt="alt text" title="Title here" /></p>
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).text b/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).text
deleted file mode 100644
index 0c59e89516f..00000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).text	
+++ /dev/null
@@ -1,30 +0,0 @@
-Simple block on one line:
-
-<div>foo</div>
-
-And nested without indentation:
-
-<div>
-<div>
-<div>
-foo
-</div>
-<div style=">"></div>
-</div>
-<div>bar</div>
-</div>
-
-And with attributes:
-
-<div>
-	<div id="foo">
-	</div>
-</div>
-
-This was broken in 1.0.2b7:
-
-<div class="inlinepage">
-<div class="toggleableend">
-foo
-</div>
-</div>
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).xhtml b/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).xhtml
deleted file mode 100644
index fc51e2a27e5..00000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).xhtml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<p>Simple block on one line:</p>
-
-<div>foo</div>
-
-<p>And nested without indentation:</p>
-
-<div>
-<div>
-<div>
-foo
-</div>
-<div></div>
-</div>
-<div>bar</div>
-</div>
-
-<p>And with attributes:</p>
-
-<div>
-    <div>
-    </div>
-</div>
-
-<p>This was broken in 1.0.2b7:</p>
-
-<div>
-<div>
-foo
-</div>
-</div>
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Simple).text b/test/javascripts/mdtest/fixtures/Inline HTML (Simple).text
deleted file mode 100644
index d3e1d4efc7c..00000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML (Simple).text	
+++ /dev/null
@@ -1,54 +0,0 @@
-Here's a simple block:
-
-<div>
-	foo
-</div>
-
-This should be a code block, though:
-
-	<div>
-		foo
-	</div>
-
-As should this:
-
-	<div>foo</div>
-
-Now, nested:
-
-<div>
-	<div>
-		<div>
-			foo
-		</div>
-	</div>
-</div>
-
-This should just be an HTML comment:
-
-<!-- Comment -->
-
-Multiline:
-
-<!--
-Blah
-Blah
--->
-
-Code block:
-
-	<!-- Comment -->
-
-Just plain comment, with trailing spaces on the line:
-
-<!-- foo -->
-
-Code:
-
-	<hr />
-
-Hr's:
-
-<hr>
-
-<hr class="foo" id="bar">
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Simple).xhtml b/test/javascripts/mdtest/fixtures/Inline HTML (Simple).xhtml
deleted file mode 100644
index 25067beea33..00000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML (Simple).xhtml	
+++ /dev/null
@@ -1,58 +0,0 @@
-<p>Here's a simple block:</p>
-
-<div>
-    foo
-</div>
-
-<p>This should be a code block, though:</p>
-
-<pre><code>&lt;div&gt;
-    foo
-&lt;/div&gt;
-</code></pre>
-
-<p>As should this:</p>
-
-<pre><code>&lt;div&gt;foo&lt;/div&gt;
-</code></pre>
-
-<p>Now, nested:</p>
-
-<div>
-    <div>
-        <div>
-            foo
-        </div>
-    </div>
-</div>
-
-<p>This should just be an HTML comment:</p>
-
-<!-- Comment -->
-
-<p>Multiline:</p>
-
-<!--
-Blah
-Blah
--->
-
-<p>Code block:</p>
-
-<pre><code>&lt;!-- Comment --&gt;
-</code></pre>
-
-<p>Just plain comment, with trailing spaces on the line:</p>
-
-<!-- foo -->
-
-<p>Code:</p>
-
-<pre><code>&lt;hr /&gt;
-</code></pre>
-
-<p>Hr's:</p>
-
-<hr>
-
-<hr>
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML comments.text b/test/javascripts/mdtest/fixtures/Inline HTML comments.text
deleted file mode 100644
index 41d830d0385..00000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML comments.text	
+++ /dev/null
@@ -1,13 +0,0 @@
-Paragraph one.
-
-<!-- This is a simple comment -->
-
-<!--
-	This is another comment.
--->
-
-Paragraph two.
-
-<!-- one comment block -- -- with two comments -->
-
-The end.
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML comments.xhtml b/test/javascripts/mdtest/fixtures/Inline HTML comments.xhtml
deleted file mode 100644
index 3f167a1610e..00000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML comments.xhtml	
+++ /dev/null
@@ -1,13 +0,0 @@
-<p>Paragraph one.</p>
-
-<!-- This is a simple comment -->
-
-<!--
-    This is another comment.
--->
-
-<p>Paragraph two.</p>
-
-<!-- one comment block -- -- with two comments -->
-
-<p>The end.</p>
diff --git a/test/javascripts/mdtest/fixtures/Links, inline style.text b/test/javascripts/mdtest/fixtures/Links, inline style.text
deleted file mode 100644
index ad5f021fce9..00000000000
--- a/test/javascripts/mdtest/fixtures/Links, inline style.text	
+++ /dev/null
@@ -1,24 +0,0 @@
-Just a [LINK](/url/).
-
-[URL and title](/url/ "title").
-
-[URL and title](/url/  "title preceded by two spaces").
-
-[URL and title](/url/	"title preceded by a tab").
-
-[URL and title](/url/ "title has spaces afterward"  ).
-
-[URL wrapped in angle brackets](</url/>).
-
-[URL w/ angle brackets + title](</url/> "Here's the title").
-
-[Empty]().
-
-[With parens in the URL](http://en.wikipedia.org/wiki/WIMP_(computing))
-
-(With outer parens and [parens in url](/foo(bar)))
-
-
-[With parens in the URL](/foo(bar) "and a title")
-
-(With outer parens and [parens in url](/foo(bar) "and a title"))
diff --git a/test/javascripts/mdtest/fixtures/Links, inline style.xhtml b/test/javascripts/mdtest/fixtures/Links, inline style.xhtml
deleted file mode 100644
index 70d02398ec8..00000000000
--- a/test/javascripts/mdtest/fixtures/Links, inline style.xhtml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<p>Just a <a href="/url/">LINK</a>.</p>
-
-<p><a href="/url/" title="title">URL and title</a>.</p>
-
-<p><a href="/url/" title="title preceded by two spaces">URL and title</a>.</p>
-
-<p><a href="/url/" title="title preceded by a tab">URL and title</a>.</p>
-
-<p><a href="/url/" title="title has spaces afterward">URL and title</a>.</p>
-
-<p><a href="/url/">URL wrapped in angle brackets</a>.</p>
-
-<p><a href="/url/" title="Here's the title">URL w/ angle brackets + title</a>.</p>
-
-<p><a>Empty</a>.</p>
-
-<p><a href="http://en.wikipedia.org/wiki/WIMP_(computing)">With parens in the URL</a></p>
-
-<p>(With outer parens and <a href="/foo(bar)">parens in url</a>)</p>
-
-<p><a href="/foo(bar)" title="and a title">With parens in the URL</a></p>
-
-<p>(With outer parens and <a href="/foo(bar)" title="and a title">parens in url</a>)</p>
diff --git a/test/javascripts/mdtest/fixtures/Links, reference style.text b/test/javascripts/mdtest/fixtures/Links, reference style.text
deleted file mode 100644
index 96d4470d10b..00000000000
--- a/test/javascripts/mdtest/fixtures/Links, reference style.text	
+++ /dev/null
@@ -1,71 +0,0 @@
-Foo [bar] [1].
-
-Foo [bar][1].
-
-Foo [bar]
-[1].
-
-[1]: /url/  "Title"
-
-
-With [embedded [brackets]] [b].
-
-
-Indented [once][].
-
-Indented [twice][].
-
-Indented [thrice][].
-
-Indented [four][] times.
-
- [once]: /url
-
-  [twice]: /url
-
-   [thrice]: /url
-
-    [four]: /url
-
-
-[b]: /url/
-
-* * *
-
-[this] [this] should work
-
-So should [this][this].
-
-And [this] [].
-
-And [this][].
-
-And [this].
-
-But not [that] [].
-
-Nor [that][].
-
-Nor [that].
-
-[Something in brackets like [this][] should work]
-
-[Same with [this].]
-
-In this case, [this](/somethingelse/) points to something else.
-
-Backslashing should suppress \[this] and [this\].
-
-[this]: #foo
-
-
-* * *
-
-Here's one where the [link
-breaks] across lines.
-
-Here's another where the [link 
-breaks] across lines, but with a line-ending space.
-
-
-[link breaks]: /url/
diff --git a/test/javascripts/mdtest/fixtures/Links, reference style.xhtml b/test/javascripts/mdtest/fixtures/Links, reference style.xhtml
deleted file mode 100644
index 9eb8ffe694c..00000000000
--- a/test/javascripts/mdtest/fixtures/Links, reference style.xhtml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<p>Foo <a href="/url/" title="Title">bar</a>.</p>
-
-<p>Foo <a href="/url/" title="Title">bar</a>.</p>
-
-<p>Foo <a href="/url/" title="Title">bar</a>.</p>
-
-<p>With <a href="/url/">embedded [brackets]</a>.</p>
-
-<p>Indented <a href="/url">once</a>.</p>
-
-<p>Indented <a href="/url">twice</a>.</p>
-
-<p>Indented <a href="/url">thrice</a>.</p>
-
-<p>Indented [four][] times.</p>
-
-<pre><code>[four]: /url
-</code></pre>
-
-<hr />
-
-<p><a href="#foo">this</a> should work</p>
-
-<p>So should <a href="#foo">this</a>.</p>
-
-<p>And <a href="#foo">this</a>.</p>
-
-<p>And <a href="#foo">this</a>.</p>
-
-<p>And <a href="#foo">this</a>.</p>
-
-<p>But not [that] [].</p>
-
-<p>Nor [that][].</p>
-
-<p>Nor [that].</p>
-
-<p>[Something in brackets like <a href="#foo">this</a> should work]</p>
-
-<p>[Same with <a href="#foo">this</a>.]</p>
-
-<p>In this case, <a href="/somethingelse/">this</a> points to something else.</p>
-
-<p>Backslashing should suppress [this] and [this].</p>
-
-<hr />
-
-<p>Here's one where the <a href="/url/">link
-breaks</a> across lines.</p>
-
-<p>Here's another where the <a href="/url/">link 
-breaks</a> across lines, but with a line-ending space.</p>
diff --git a/test/javascripts/mdtest/fixtures/Links, shortcut references.text b/test/javascripts/mdtest/fixtures/Links, shortcut references.text
deleted file mode 100644
index 8c44c98feed..00000000000
--- a/test/javascripts/mdtest/fixtures/Links, shortcut references.text	
+++ /dev/null
@@ -1,20 +0,0 @@
-This is the [simple case].
-
-[simple case]: /simple
-
-
-
-This one has a [line
-break].
-
-This one has a [line 
-break] with a line-ending space.
-
-[line break]: /foo
-
-
-[this] [that] and the [other]
-
-[this]: /this
-[that]: /that
-[other]: /other
diff --git a/test/javascripts/mdtest/fixtures/Links, shortcut references.xhtml b/test/javascripts/mdtest/fixtures/Links, shortcut references.xhtml
deleted file mode 100644
index bf81e939f5e..00000000000
--- a/test/javascripts/mdtest/fixtures/Links, shortcut references.xhtml	
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>This is the <a href="/simple">simple case</a>.</p>
-
-<p>This one has a <a href="/foo">line
-break</a>.</p>
-
-<p>This one has a <a href="/foo">line 
-break</a> with a line-ending space.</p>
-
-<p><a href="/that">this</a> and the <a href="/other">other</a></p>
diff --git a/test/javascripts/mdtest/fixtures/Literal quotes in titles.text b/test/javascripts/mdtest/fixtures/Literal quotes in titles.text
deleted file mode 100644
index 29d0e4235b2..00000000000
--- a/test/javascripts/mdtest/fixtures/Literal quotes in titles.text	
+++ /dev/null
@@ -1,7 +0,0 @@
-Foo [bar][].
-
-Foo [bar](/url/ "Title with "quotes" inside").
-
-
-  [bar]: /url/ "Title with "quotes" inside"
-
diff --git a/test/javascripts/mdtest/fixtures/Literal quotes in titles.xhtml b/test/javascripts/mdtest/fixtures/Literal quotes in titles.xhtml
deleted file mode 100644
index 611c1ac61f0..00000000000
--- a/test/javascripts/mdtest/fixtures/Literal quotes in titles.xhtml	
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>Foo <a href="/url/" title="Title with &quot;quotes&quot; inside">bar</a>.</p>
-
-<p>Foo <a href="/url/" title="Title with &quot;quotes&quot; inside">bar</a>.</p>
diff --git a/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.text b/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.text
deleted file mode 100644
index 01ce740d5ee..00000000000
--- a/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.text	
+++ /dev/null
@@ -1,306 +0,0 @@
-Markdown: Basics
-================
-
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a class="selected" title="Markdown Basics">Basics</a></li>
-    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-
-Getting the Gist of Markdown's Formatting Syntax
-------------------------------------------------
-
-This page offers a brief overview of what it's like to use Markdown.
-The [syntax page] [s] provides complete, detailed documentation for
-every feature, but Markdown should be very easy to pick up simply by
-looking at a few examples of it in action. The examples on this page
-are written in a before/after style, showing example syntax and the
-HTML output produced by Markdown.
-
-It's also helpful to simply try Markdown out; the [Dingus] [d] is a
-web application that allows you type your own Markdown-formatted text
-and translate it to XHTML.
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL] [src].
-
-  [s]: /projects/markdown/syntax  "Markdown Syntax"
-  [d]: /projects/markdown/dingus  "Markdown Dingus"
-  [src]: /projects/markdown/basics.text
-
-
-## Paragraphs, Headers, Blockquotes ##
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-Markdown offers two styles of headers: *Setext* and *atx*.
-Setext-style headers for `<h1>` and `<h2>` are created by
-"underlining" with equal signs (`=`) and hyphens (`-`), respectively.
-To create an atx-style header, you put 1-6 hash marks (`#`) at the
-beginning of the line -- the number of hashes equals the resulting
-HTML header level.
-
-Blockquotes are indicated using email-style '`>`' angle brackets.
-
-Markdown:
-
-    A First Level Header
-    ====================
-
-    A Second Level Header
-    ---------------------
-
-    Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.
-
-    The quick brown fox jumped over the lazy
-    dog's back.
-
-    ### Header 3
-
-    > This is a blockquote.
-    >
-    > This is the second paragraph in the blockquote.
-    >
-    > ## This is an H2 in a blockquote
-
-
-Output:
-
-    <h1>A First Level Header</h1>
-
-    <h2>A Second Level Header</h2>
-
-    <p>Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.</p>
-
-    <p>The quick brown fox jumped over the lazy
-    dog's back.</p>
-
-    <h3>Header 3</h3>
-
-    <blockquote>
-        <p>This is a blockquote.</p>
-
-        <p>This is the second paragraph in the blockquote.</p>
-
-        <h2>This is an H2 in a blockquote</h2>
-    </blockquote>
-
-
-
-### Phrase Emphasis ###
-
-Markdown uses asterisks and underscores to indicate spans of emphasis.
-
-Markdown:
-
-    Some of these words *are emphasized*.
-    Some of these words _are emphasized also_.
-
-    Use two asterisks for **strong emphasis**.
-    Or, if you prefer, __use two underscores instead__.
-
-Output:
-
-    <p>Some of these words <em>are emphasized</em>.
-    Some of these words <em>are emphasized also</em>.</p>
-
-    <p>Use two asterisks for <strong>strong emphasis</strong>.
-    Or, if you prefer, <strong>use two underscores instead</strong>.</p>
-
-
-
-## Lists ##
-
-Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
-`+`, and `-`) as list markers. These three markers are
-interchangable; this:
-
-    *   Candy.
-    *   Gum.
-    *   Booze.
-
-this:
-
-    +   Candy.
-    +   Gum.
-    +   Booze.
-
-and this:
-
-    -   Candy.
-    -   Gum.
-    -   Booze.
-
-all produce the same output:
-
-    <ul>
-    <li>Candy.</li>
-    <li>Gum.</li>
-    <li>Booze.</li>
-    </ul>
-
-Ordered (numbered) lists use regular numbers, followed by periods, as
-list markers:
-
-    1.  Red
-    2.  Green
-    3.  Blue
-
-Output:
-
-    <ol>
-    <li>Red</li>
-    <li>Green</li>
-    <li>Blue</li>
-    </ol>
-
-If you put blank lines between items, you'll get `<p>` tags for the
-list item text. You can create multi-paragraph list items by indenting
-the paragraphs by 4 spaces or 1 tab:
-
-    *   A list item.
-
-        With multiple paragraphs.
-
-    *   Another item in the list.
-
-Output:
-
-    <ul>
-    <li><p>A list item.</p>
-    <p>With multiple paragraphs.</p></li>
-    <li><p>Another item in the list.</p></li>
-    </ul>
-
-
-
-### Links ###
-
-Markdown supports two styles for creating links: *inline* and
-*reference*. With both styles, you use square brackets to delimit the
-text you want to turn into a link.
-
-Inline-style links use parentheses immediately after the link text.
-For example:
-
-    This is an [example link](http://example.com/).
-
-Output:
-
-    <p>This is an <a href="http://example.com/">
-    example link</a>.</p>
-
-Optionally, you may include a title attribute in the parentheses:
-
-    This is an [example link](http://example.com/ "With a Title").
-
-Output:
-
-    <p>This is an <a href="http://example.com/" title="With a Title">
-    example link</a>.</p>
-
-Reference-style links allow you to refer to your links by names, which
-you define elsewhere in your document:
-
-    I get 10 times more traffic from [Google][1] than from
-    [Yahoo][2] or [MSN][3].
-
-    [1]: http://google.com/        "Google"
-    [2]: http://search.yahoo.com/  "Yahoo Search"
-    [3]: http://search.msn.com/    "MSN Search"
-
-Output:
-
-    <p>I get 10 times more traffic from <a href="http://google.com/"
-    title="Google">Google</a> than from <a href="http://search.yahoo.com/"
-    title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/"
-    title="MSN Search">MSN</a>.</p>
-
-The title attribute is optional. Link names may contain letters,
-numbers and spaces, but are *not* case sensitive:
-
-    I start my morning with a cup of coffee and
-    [The New York Times][NY Times].
-
-    [ny times]: http://www.nytimes.com/
-
-Output:
-
-    <p>I start my morning with a cup of coffee and
-    <a href="http://www.nytimes.com/">The New York Times</a>.</p>
-
-
-### Images ###
-
-Image syntax is very much like link syntax.
-
-Inline (titles are optional):
-
-    ![alt text](/path/to/img.jpg "Title")
-
-Reference-style:
-
-    ![alt text][id]
-
-    [id]: /path/to/img.jpg "Title"
-
-Both of the above examples produce the same output:
-
-    <img src="/path/to/img.jpg" alt="alt text" title="Title" />
-
-
-
-### Code ###
-
-In a regular paragraph, you can create code span by wrapping text in
-backtick quotes. Any ampersands (`&`) and angle brackets (`<` or
-`>`) will automatically be translated into HTML entities. This makes
-it easy to use Markdown to write about HTML example code:
-
-    I strongly recommend against using any `<blink>` tags.
-
-    I wish SmartyPants used named entities like `&amp;mdash;`
-    instead of decimal-encoded entites like `&amp;#8212;`.
-
-Output:
-
-    <p>I strongly recommend against using any
-    <code>&lt;blink&gt;</code> tags.</p>
-
-    <p>I wish SmartyPants used named entities like
-    <code>&amp;mdash;</code> instead of decimal-encoded
-    entites like <code>&amp;#8212;</code>.</p>
-
-
-To specify an entire block of pre-formatted code, indent every line of
-the block by 4 spaces or 1 tab. Just like with code spans, `&`, `<`,
-and `>` characters will be escaped automatically.
-
-Markdown:
-
-    If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:
-
-        <blockquote>
-            <p>For example.</p>
-        </blockquote>
-
-Output:
-
-    <p>If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:</p>
-
-    <pre><code>&lt;blockquote&gt;
-        &lt;p&gt;For example.&lt;/p&gt;
-    &lt;/blockquote&gt;
-    </code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.xhtml b/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.xhtml
deleted file mode 100644
index e971a195a45..00000000000
--- a/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.xhtml	
+++ /dev/null
@@ -1,314 +0,0 @@
-<h1>Markdown: Basics</h1>
-
-<ul>
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a title="Markdown Basics">Basics</a></li>
-    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-<h2>Getting the Gist of Markdown's Formatting Syntax</h2>
-
-<p>This page offers a brief overview of what it's like to use Markdown.
-The <a href="/projects/markdown/syntax" title="Markdown Syntax">syntax page</a> provides complete, detailed documentation for
-every feature, but Markdown should be very easy to pick up simply by
-looking at a few examples of it in action. The examples on this page
-are written in a before/after style, showing example syntax and the
-HTML output produced by Markdown.</p>
-
-<p>It's also helpful to simply try Markdown out; the <a href="/projects/markdown/dingus" title="Markdown Dingus">Dingus</a> is a
-web application that allows you type your own Markdown-formatted text
-and translate it to XHTML.</p>
-
-<p><strong>Note:</strong> This document is itself written using Markdown; you
-can <a href="/projects/markdown/basics.text">see the source for it by adding '.text' to the URL</a>.</p>
-
-<h2>Paragraphs, Headers, Blockquotes</h2>
-
-<p>A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.</p>
-
-<p>Markdown offers two styles of headers: <em>Setext</em> and <em>atx</em>.
-Setext-style headers for <code>&lt;h1&gt;</code> and <code>&lt;h2&gt;</code> are created by
-"underlining" with equal signs (<code>=</code>) and hyphens (<code>-</code>), respectively.
-To create an atx-style header, you put 1-6 hash marks (<code>#</code>) at the
-beginning of the line -- the number of hashes equals the resulting
-HTML header level.</p>
-
-<p>Blockquotes are indicated using email-style '<code>&gt;</code>' angle brackets.</p>
-
-<p>Markdown:</p>
-
-<pre><code>A First Level Header
-====================
-
-A Second Level Header
----------------------
-
-Now is the time for all good men to come to
-the aid of their country. This is just a
-regular paragraph.
-
-The quick brown fox jumped over the lazy
-dog&#x27;s back.
-
-### Header 3
-
-&gt; This is a blockquote.
-&gt;
-&gt; This is the second paragraph in the blockquote.
-&gt;
-&gt; ## This is an H2 in a blockquote
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;h1&gt;A First Level Header&lt;/h1&gt;
-
-&lt;h2&gt;A Second Level Header&lt;/h2&gt;
-
-&lt;p&gt;Now is the time for all good men to come to
-the aid of their country. This is just a
-regular paragraph.&lt;/p&gt;
-
-&lt;p&gt;The quick brown fox jumped over the lazy
-dog&#x27;s back.&lt;/p&gt;
-
-&lt;h3&gt;Header 3&lt;/h3&gt;
-
-&lt;blockquote&gt;
-    &lt;p&gt;This is a blockquote.&lt;/p&gt;
-
-    &lt;p&gt;This is the second paragraph in the blockquote.&lt;/p&gt;
-
-    &lt;h2&gt;This is an H2 in a blockquote&lt;/h2&gt;
-&lt;/blockquote&gt;
-</code></pre>
-
-<h3>Phrase Emphasis</h3>
-
-<p>Markdown uses asterisks and underscores to indicate spans of emphasis.</p>
-
-<p>Markdown:</p>
-
-<pre><code>Some of these words *are emphasized*.
-Some of these words _are emphasized also_.
-
-Use two asterisks for **strong emphasis**.
-Or, if you prefer, __use two underscores instead__.
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;Some of these words &lt;em&gt;are emphasized&lt;/em&gt;.
-Some of these words &lt;em&gt;are emphasized also&lt;/em&gt;.&lt;/p&gt;
-
-&lt;p&gt;Use two asterisks for &lt;strong&gt;strong emphasis&lt;/strong&gt;.
-Or, if you prefer, &lt;strong&gt;use two underscores instead&lt;/strong&gt;.&lt;/p&gt;
-</code></pre>
-
-<h2>Lists</h2>
-
-<p>Unordered (bulleted) lists use asterisks, pluses, and hyphens (<code>*</code>,
-<code>+</code>, and <code>-</code>) as list markers. These three markers are
-interchangable; this:</p>
-
-<pre><code>*   Candy.
-*   Gum.
-*   Booze.
-</code></pre>
-
-<p>this:</p>
-
-<pre><code>+   Candy.
-+   Gum.
-+   Booze.
-</code></pre>
-
-<p>and this:</p>
-
-<pre><code>-   Candy.
--   Gum.
--   Booze.
-</code></pre>
-
-<p>all produce the same output:</p>
-
-<pre><code>&lt;ul&gt;
-&lt;li&gt;Candy.&lt;/li&gt;
-&lt;li&gt;Gum.&lt;/li&gt;
-&lt;li&gt;Booze.&lt;/li&gt;
-&lt;/ul&gt;
-</code></pre>
-
-<p>Ordered (numbered) lists use regular numbers, followed by periods, as
-list markers:</p>
-
-<pre><code>1.  Red
-2.  Green
-3.  Blue
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;ol&gt;
-&lt;li&gt;Red&lt;/li&gt;
-&lt;li&gt;Green&lt;/li&gt;
-&lt;li&gt;Blue&lt;/li&gt;
-&lt;/ol&gt;
-</code></pre>
-
-<p>If you put blank lines between items, you'll get <code>&lt;p&gt;</code> tags for the
-list item text. You can create multi-paragraph list items by indenting
-the paragraphs by 4 spaces or 1 tab:</p>
-
-<pre><code>*   A list item.
-
-    With multiple paragraphs.
-
-*   Another item in the list.
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;ul&gt;
-&lt;li&gt;&lt;p&gt;A list item.&lt;/p&gt;
-&lt;p&gt;With multiple paragraphs.&lt;/p&gt;&lt;/li&gt;
-&lt;li&gt;&lt;p&gt;Another item in the list.&lt;/p&gt;&lt;/li&gt;
-&lt;/ul&gt;
-</code></pre>
-
-<h3>Links</h3>
-
-<p>Markdown supports two styles for creating links: <em>inline</em> and
-<em>reference</em>. With both styles, you use square brackets to delimit the
-text you want to turn into a link.</p>
-
-<p>Inline-style links use parentheses immediately after the link text.
-For example:</p>
-
-<pre><code>This is an [example link](http://example.com/).
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;This is an &lt;a href=&quot;http://example.com/&quot;&gt;
-example link&lt;/a&gt;.&lt;/p&gt;
-</code></pre>
-
-<p>Optionally, you may include a title attribute in the parentheses:</p>
-
-<pre><code>This is an [example link](http://example.com/ &quot;With a Title&quot;).
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;This is an &lt;a href=&quot;http://example.com/&quot; title=&quot;With a Title&quot;&gt;
-example link&lt;/a&gt;.&lt;/p&gt;
-</code></pre>
-
-<p>Reference-style links allow you to refer to your links by names, which
-you define elsewhere in your document:</p>
-
-<pre><code>I get 10 times more traffic from [Google][1] than from
-[Yahoo][2] or [MSN][3].
-
-[1]: http://google.com/        &quot;Google&quot;
-[2]: http://search.yahoo.com/  &quot;Yahoo Search&quot;
-[3]: http://search.msn.com/    &quot;MSN Search&quot;
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;I get 10 times more traffic from &lt;a href=&quot;http://google.com/&quot;
-title=&quot;Google&quot;&gt;Google&lt;/a&gt; than from &lt;a href=&quot;http://search.yahoo.com/&quot;
-title=&quot;Yahoo Search&quot;&gt;Yahoo&lt;/a&gt; or &lt;a href=&quot;http://search.msn.com/&quot;
-title=&quot;MSN Search&quot;&gt;MSN&lt;/a&gt;.&lt;/p&gt;
-</code></pre>
-
-<p>The title attribute is optional. Link names may contain letters,
-numbers and spaces, but are <em>not</em> case sensitive:</p>
-
-<pre><code>I start my morning with a cup of coffee and
-[The New York Times][NY Times].
-
-[ny times]: http://www.nytimes.com/
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;I start my morning with a cup of coffee and
-&lt;a href=&quot;http://www.nytimes.com/&quot;&gt;The New York Times&lt;/a&gt;.&lt;/p&gt;
-</code></pre>
-
-<h3>Images</h3>
-
-<p>Image syntax is very much like link syntax.</p>
-
-<p>Inline (titles are optional):</p>
-
-<pre><code>![alt text](/path/to/img.jpg &quot;Title&quot;)
-</code></pre>
-
-<p>Reference-style:</p>
-
-<pre><code>![alt text][id]
-
-[id]: /path/to/img.jpg &quot;Title&quot;
-</code></pre>
-
-<p>Both of the above examples produce the same output:</p>
-
-<pre><code>&lt;img src=&quot;/path/to/img.jpg&quot; alt=&quot;alt text&quot; title=&quot;Title&quot; /&gt;
-</code></pre>
-
-<h3>Code</h3>
-
-<p>In a regular paragraph, you can create code span by wrapping text in
-backtick quotes. Any ampersands (<code>&amp;</code>) and angle brackets (<code>&lt;</code> or
-<code>&gt;</code>) will automatically be translated into HTML entities. This makes
-it easy to use Markdown to write about HTML example code:</p>
-
-<pre><code>I strongly recommend against using any &#x60;&lt;blink&gt;&#x60; tags.
-
-I wish SmartyPants used named entities like &#x60;&amp;amp;mdash;&#x60;
-instead of decimal-encoded entites like &#x60;&amp;amp;#8212;&#x60;.
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;I strongly recommend against using any
-&lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
-
-&lt;p&gt;I wish SmartyPants used named entities like
-&lt;code&gt;&amp;amp;mdash;&lt;/code&gt; instead of decimal-encoded
-entites like &lt;code&gt;&amp;amp;#8212;&lt;/code&gt;.&lt;/p&gt;
-</code></pre>
-
-<p>To specify an entire block of pre-formatted code, indent every line of
-the block by 4 spaces or 1 tab. Just like with code spans, <code>&amp;</code>, <code>&lt;</code>,
-and <code>&gt;</code> characters will be escaped automatically.</p>
-
-<p>Markdown:</p>
-
-<pre><code>If you want your page to validate under XHTML 1.0 Strict,
-you&#x27;ve got to put paragraph tags in your blockquotes:
-
-    &lt;blockquote&gt;
-        &lt;p&gt;For example.&lt;/p&gt;
-    &lt;/blockquote&gt;
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;If you want your page to validate under XHTML 1.0 Strict,
-you&#x27;ve got to put paragraph tags in your blockquotes:&lt;/p&gt;
-
-&lt;pre&gt;&lt;code&gt;&amp;lt;blockquote&amp;gt;
-    &amp;lt;p&amp;gt;For example.&amp;lt;/p&amp;gt;
-&amp;lt;/blockquote&amp;gt;
-&lt;/code&gt;&lt;/pre&gt;
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.text b/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.text
deleted file mode 100644
index cb70921d1e9..00000000000
--- a/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.text	
+++ /dev/null
@@ -1,888 +0,0 @@
-Markdown: Syntax
-================
-
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
-    <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-
-*   [Overview](#overview)
-    *   [Philosophy](#philosophy)
-    *   [Inline HTML](#html)
-    *   [Automatic Escaping for Special Characters](#autoescape)
-*   [Block Elements](#block)
-    *   [Paragraphs and Line Breaks](#p)
-    *   [Headers](#header)
-    *   [Blockquotes](#blockquote)
-    *   [Lists](#list)
-    *   [Code Blocks](#precode)
-    *   [Horizontal Rules](#hr)
-*   [Span Elements](#span)
-    *   [Links](#link)
-    *   [Emphasis](#em)
-    *   [Code](#code)
-    *   [Images](#img)
-*   [Miscellaneous](#misc)
-    *   [Backslash Escapes](#backslash)
-    *   [Automatic Links](#autolink)
-
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL][src].
-
-  [src]: /projects/markdown/syntax.text
-
-* * *
-
-<h2 id="overview">Overview</h2>
-
-<h3 id="philosophy">Philosophy</h3>
-
-Markdown is intended to be as easy-to-read and easy-to-write as is feasible.
-
-Readability, however, is emphasized above all else. A Markdown-formatted
-document should be publishable as-is, as plain text, without looking
-like it's been marked up with tags or formatting instructions. While
-Markdown's syntax has been influenced by several existing text-to-HTML
-filters -- including [Setext] [1], [atx] [2], [Textile] [3], [reStructuredText] [4],
-[Grutatext] [5], and [EtText] [6] -- the single biggest source of
-inspiration for Markdown's syntax is the format of plain text email.
-
-  [1]: http://docutils.sourceforge.net/mirror/setext.html
-  [2]: http://www.aaronsw.com/2002/atx/
-  [3]: http://textism.com/tools/textile/
-  [4]: http://docutils.sourceforge.net/rst.html
-  [5]: http://www.triptico.com/software/grutatxt.html
-  [6]: http://ettext.taint.org/doc/
-
-To this end, Markdown's syntax is comprised entirely of punctuation
-characters, which punctuation characters have been carefully chosen so
-as to look like what they mean. E.g., asterisks around a word actually
-look like \*emphasis\*. Markdown lists look like, well, lists. Even
-blockquotes look like quoted passages of text, assuming you've ever
-used email.
-
-
-
-<h3 id="html">Inline HTML</h3>
-
-Markdown's syntax is intended for one purpose: to be used as a
-format for *writing* for the web.
-
-Markdown is not a replacement for HTML, or even close to it. Its
-syntax is very small, corresponding only to a very small subset of
-HTML tags. The idea is *not* to create a syntax that makes it easier
-to insert HTML tags. In my opinion, HTML tags are already easy to
-insert. The idea for Markdown is to make it easy to read, write, and
-edit prose. HTML is a *publishing* format; Markdown is a *writing*
-format. Thus, Markdown's formatting syntax only addresses issues that
-can be conveyed in plain text.
-
-For any markup that is not covered by Markdown's syntax, you simply
-use HTML itself. There's no need to preface it or delimit it to
-indicate that you're switching from Markdown to HTML; you just use
-the tags.
-
-The only restrictions are that block-level HTML elements -- e.g. `<div>`,
-`<table>`, `<pre>`, `<p>`, etc. -- must be separated from surrounding
-content by blank lines, and the start and end tags of the block should
-not be indented with tabs or spaces. Markdown is smart enough not
-to add extra (unwanted) `<p>` tags around HTML block-level tags.
-
-For example, to add an HTML table to a Markdown article:
-
-    This is a regular paragraph.
-
-    <table>
-        <tr>
-            <td>Foo</td>
-        </tr>
-    </table>
-
-    This is another regular paragraph.
-
-Note that Markdown formatting syntax is not processed within block-level
-HTML tags. E.g., you can't use Markdown-style `*emphasis*` inside an
-HTML block.
-
-Span-level HTML tags -- e.g. `<span>`, `<cite>`, or `<del>` -- can be
-used anywhere in a Markdown paragraph, list item, or header. If you
-want, you can even use HTML tags instead of Markdown formatting; e.g. if
-you'd prefer to use HTML `<a>` or `<img>` tags instead of Markdown's
-link or image syntax, go right ahead.
-
-Unlike block-level HTML tags, Markdown syntax *is* processed within
-span-level tags.
-
-
-<h3 id="autoescape">Automatic Escaping for Special Characters</h3>
-
-In HTML, there are two characters that demand special treatment: `<`
-and `&`. Left angle brackets are used to start tags; ampersands are
-used to denote HTML entities. If you want to use them as literal
-characters, you must escape them as entities, e.g. `&lt;`, and
-`&amp;`.
-
-Ampersands in particular are bedeviling for web writers. If you want to
-write about 'AT&T', you need to write '`AT&amp;T`'. You even need to
-escape ampersands within URLs. Thus, if you want to link to:
-
-    http://images.google.com/images?num=30&q=larry+bird
-
-you need to encode the URL as:
-
-    http://images.google.com/images?num=30&amp;q=larry+bird
-
-in your anchor tag `href` attribute. Needless to say, this is easy to
-forget, and is probably the single most common source of HTML validation
-errors in otherwise well-marked-up web sites.
-
-Markdown allows you to use these characters naturally, taking care of
-all the necessary escaping for you. If you use an ampersand as part of
-an HTML entity, it remains unchanged; otherwise it will be translated
-into `&amp;`.
-
-So, if you want to include a copyright symbol in your article, you can write:
-
-    &copy;
-
-and Markdown will leave it alone. But if you write:
-
-    AT&T
-
-Markdown will translate it to:
-
-    AT&amp;T
-
-Similarly, because Markdown supports [inline HTML](#html), if you use
-angle brackets as delimiters for HTML tags, Markdown will treat them as
-such. But if you write:
-
-    4 < 5
-
-Markdown will translate it to:
-
-    4 &lt; 5
-
-However, inside Markdown code spans and blocks, angle brackets and
-ampersands are *always* encoded automatically. This makes it easy to use
-Markdown to write about HTML code. (As opposed to raw HTML, which is a
-terrible format for writing about HTML syntax, because every single `<`
-and `&` in your example code needs to be escaped.)
-
-
-* * *
-
-
-<h2 id="block">Block Elements</h2>
-
-
-<h3 id="p">Paragraphs and Line Breaks</h3>
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing but spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-The implication of the "one or more consecutive lines of text" rule is
-that Markdown supports "hard-wrapped" text paragraphs. This differs
-significantly from most other text-to-HTML formatters (including Movable
-Type's "Convert Line Breaks" option) which translate every line break
-character in a paragraph into a `<br />` tag.
-
-When you *do* want to insert a `<br />` break tag using Markdown, you
-end a line with two or more spaces, then type return.
-
-Yes, this takes a tad more effort to create a `<br />`, but a simplistic
-"every line break is a `<br />`" rule wouldn't work for Markdown.
-Markdown's email-style [blockquoting][bq] and multi-paragraph [list items][l]
-work best -- and look better -- when you format them with hard breaks.
-
-  [bq]: #blockquote
-  [l]:  #list
-
-
-
-<h3 id="header">Headers</h3>
-
-Markdown supports two styles of headers, [Setext] [1] and [atx] [2].
-
-Setext-style headers are "underlined" using equal signs (for first-level
-headers) and dashes (for second-level headers). For example:
-
-    This is an H1
-    =============
-
-    This is an H2
-    -------------
-
-Any number of underlining `=`'s or `-`'s will work.
-
-Atx-style headers use 1-6 hash characters at the start of the line,
-corresponding to header levels 1-6. For example:
-
-    # This is an H1
-
-    ## This is an H2
-
-    ###### This is an H6
-
-Optionally, you may "close" atx-style headers. This is purely
-cosmetic -- you can use this if you think it looks better. The
-closing hashes don't even need to match the number of hashes
-used to open the header. (The number of opening hashes
-determines the header level.) :
-
-    # This is an H1 #
-
-    ## This is an H2 ##
-
-    ### This is an H3 ######
-
-
-<h3 id="blockquote">Blockquotes</h3>
-
-Markdown uses email-style `>` characters for blockquoting. If you're
-familiar with quoting passages of text in an email message, then you
-know how to create a blockquote in Markdown. It looks best if you hard
-wrap the text and put a `>` before every line:
-
-    > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-    > consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-    > Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-    >
-    > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-    > id sem consectetuer libero luctus adipiscing.
-
-Markdown allows you to be lazy and only put the `>` before the first
-line of a hard-wrapped paragraph:
-
-    > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-    consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-    Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-
-    > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-    id sem consectetuer libero luctus adipiscing.
-
-Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by
-adding additional levels of `>`:
-
-    > This is the first level of quoting.
-    >
-    > > This is nested blockquote.
-    >
-    > Back to the first level.
-
-Blockquotes can contain other Markdown elements, including headers, lists,
-and code blocks:
-
-	> ## This is a header.
-	>
-	> 1.   This is the first list item.
-	> 2.   This is the second list item.
-	>
-	> Here's some example code:
-	>
-	>     return shell_exec("echo $input | $markdown_script");
-
-Any decent text editor should make email-style quoting easy. For
-example, with BBEdit, you can make a selection and choose Increase
-Quote Level from the Text menu.
-
-
-<h3 id="list">Lists</h3>
-
-Markdown supports ordered (numbered) and unordered (bulleted) lists.
-
-Unordered lists use asterisks, pluses, and hyphens -- interchangably
--- as list markers:
-
-    *   Red
-    *   Green
-    *   Blue
-
-is equivalent to:
-
-    +   Red
-    +   Green
-    +   Blue
-
-and:
-
-    -   Red
-    -   Green
-    -   Blue
-
-Ordered lists use numbers followed by periods:
-
-    1.  Bird
-    2.  McHale
-    3.  Parish
-
-It's important to note that the actual numbers you use to mark the
-list have no effect on the HTML output Markdown produces. The HTML
-Markdown produces from the above list is:
-
-    <ol>
-    <li>Bird</li>
-    <li>McHale</li>
-    <li>Parish</li>
-    </ol>
-
-If you instead wrote the list in Markdown like this:
-
-    1.  Bird
-    1.  McHale
-    1.  Parish
-
-or even:
-
-    3. Bird
-    1. McHale
-    8. Parish
-
-you'd get the exact same HTML output. The point is, if you want to,
-you can use ordinal numbers in your ordered Markdown lists, so that
-the numbers in your source match the numbers in your published HTML.
-But if you want to be lazy, you don't have to.
-
-If you do use lazy list numbering, however, you should still start the
-list with the number 1. At some point in the future, Markdown may support
-starting ordered lists at an arbitrary number.
-
-List markers typically start at the left margin, but may be indented by
-up to three spaces. List markers must be followed by one or more spaces
-or a tab.
-
-To make lists look nice, you can wrap items with hanging indents:
-
-    *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-        Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-        viverra nec, fringilla in, laoreet vitae, risus.
-    *   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-        Suspendisse id sem consectetuer libero luctus adipiscing.
-
-But if you want to be lazy, you don't have to:
-
-    *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-    viverra nec, fringilla in, laoreet vitae, risus.
-    *   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-    Suspendisse id sem consectetuer libero luctus adipiscing.
-
-If list items are separated by blank lines, Markdown will wrap the
-items in `<p>` tags in the HTML output. For example, this input:
-
-    *   Bird
-    *   Magic
-
-will turn into:
-
-    <ul>
-    <li>Bird</li>
-    <li>Magic</li>
-    </ul>
-
-But this:
-
-    *   Bird
-
-    *   Magic
-
-will turn into:
-
-    <ul>
-    <li><p>Bird</p></li>
-    <li><p>Magic</p></li>
-    </ul>
-
-List items may consist of multiple paragraphs. Each subsequent
-paragraph in a list item must be intended by either 4 spaces
-or one tab:
-
-    1.  This is a list item with two paragraphs. Lorem ipsum dolor
-        sit amet, consectetuer adipiscing elit. Aliquam hendrerit
-        mi posuere lectus.
-
-        Vestibulum enim wisi, viverra nec, fringilla in, laoreet
-        vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
-        sit amet velit.
-
-    2.  Suspendisse id sem consectetuer libero luctus adipiscing.
-
-It looks nice if you indent every line of the subsequent
-paragraphs, but here again, Markdown will allow you to be
-lazy:
-
-    *   This is a list item with two paragraphs.
-
-        This is the second paragraph in the list item. You're
-    only required to indent the first line. Lorem ipsum dolor
-    sit amet, consectetuer adipiscing elit.
-
-    *   Another item in the same list.
-
-To put a blockquote within a list item, the blockquote's `>`
-delimiters need to be indented:
-
-    *   A list item with a blockquote:
-
-        > This is a blockquote
-        > inside a list item.
-
-To put a code block within a list item, the code block needs
-to be indented *twice* -- 8 spaces or two tabs:
-
-    *   A list item with a code block:
-
-            <code goes here>
-
-
-It's worth noting that it's possible to trigger an ordered list by
-accident, by writing something like this:
-
-    1986. What a great season.
-
-In other words, a *number-period-space* sequence at the beginning of a
-line. To avoid this, you can backslash-escape the period:
-
-    1986\. What a great season.
-
-
-
-<h3 id="precode">Code Blocks</h3>
-
-Pre-formatted code blocks are used for writing about programming or
-markup source code. Rather than forming normal paragraphs, the lines
-of a code block are interpreted literally. Markdown wraps a code block
-in both `<pre>` and `<code>` tags.
-
-To produce a code block in Markdown, simply indent every line of the
-block by at least 4 spaces or 1 tab. For example, given this input:
-
-    This is a normal paragraph:
-
-        This is a code block.
-
-Markdown will generate:
-
-    <p>This is a normal paragraph:</p>
-
-    <pre><code>This is a code block.
-    </code></pre>
-
-One level of indentation -- 4 spaces or 1 tab -- is removed from each
-line of the code block. For example, this:
-
-    Here is an example of AppleScript:
-
-        tell application "Foo"
-            beep
-        end tell
-
-will turn into:
-
-    <p>Here is an example of AppleScript:</p>
-
-    <pre><code>tell application "Foo"
-        beep
-    end tell
-    </code></pre>
-
-A code block continues until it reaches a line that is not indented
-(or the end of the article).
-
-Within a code block, ampersands (`&`) and angle brackets (`<` and `>`)
-are automatically converted into HTML entities. This makes it very
-easy to include example HTML source code using Markdown -- just paste
-it and indent it, and Markdown will handle the hassle of encoding the
-ampersands and angle brackets. For example, this:
-
-        <div class="footer">
-            &copy; 2004 Foo Corporation
-        </div>
-
-will turn into:
-
-    <pre><code>&lt;div class="footer"&gt;
-        &amp;copy; 2004 Foo Corporation
-    &lt;/div&gt;
-    </code></pre>
-
-Regular Markdown syntax is not processed within code blocks. E.g.,
-asterisks are just literal asterisks within a code block. This means
-it's also easy to use Markdown to write about Markdown's own syntax.
-
-
-
-<h3 id="hr">Horizontal Rules</h3>
-
-You can produce a horizontal rule tag (`<hr />`) by placing three or
-more hyphens, asterisks, or underscores on a line by themselves. If you
-wish, you may use spaces between the hyphens or asterisks. Each of the
-following lines will produce a horizontal rule:
-
-    * * *
-
-    ***
-
-    *****
-
-    - - -
-
-    ---------------------------------------
-
-	_ _ _
-
-
-* * *
-
-<h2 id="span">Span Elements</h2>
-
-<h3 id="link">Links</h3>
-
-Markdown supports two style of links: *inline* and *reference*.
-
-In both styles, the link text is delimited by [square brackets].
-
-To create an inline link, use a set of regular parentheses immediately
-after the link text's closing square bracket. Inside the parentheses,
-put the URL where you want the link to point, along with an *optional*
-title for the link, surrounded in quotes. For example:
-
-    This is [an example](http://example.com/ "Title") inline link.
-
-    [This link](http://example.net/) has no title attribute.
-
-Will produce:
-
-    <p>This is <a href="http://example.com/" title="Title">
-    an example</a> inline link.</p>
-
-    <p><a href="http://example.net/">This link</a> has no
-    title attribute.</p>
-
-If you're referring to a local resource on the same server, you can
-use relative paths:
-
-    See my [About](/about/) page for details.
-
-Reference-style links use a second set of square brackets, inside
-which you place a label of your choosing to identify the link:
-
-    This is [an example][id] reference-style link.
-
-You can optionally use a space to separate the sets of brackets:
-
-    This is [an example] [id] reference-style link.
-
-Then, anywhere in the document, you define your link label like this,
-on a line by itself:
-
-    [id]: http://example.com/  "Optional Title Here"
-
-That is:
-
-*   Square brackets containing the link identifier (optionally
-    indented from the left margin using up to three spaces);
-*   followed by a colon;
-*   followed by one or more spaces (or tabs);
-*   followed by the URL for the link;
-*   optionally followed by a title attribute for the link, enclosed
-    in double or single quotes.
-
-The link URL may, optionally, be surrounded by angle brackets:
-
-    [id]: <http://example.com/>  "Optional Title Here"
-
-You can put the title attribute on the next line and use extra spaces
-or tabs for padding, which tends to look better with longer URLs:
-
-    [id]: http://example.com/longish/path/to/resource/here
-        "Optional Title Here"
-
-Link definitions are only used for creating links during Markdown
-processing, and are stripped from your document in the HTML output.
-
-Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are *not* case sensitive. E.g. these two links:
-
-	[link text][a]
-	[link text][A]
-
-are equivalent.
-
-The *implicit link name* shortcut allows you to omit the name of the
-link, in which case the link text itself is used as the name.
-Just use an empty set of square brackets -- e.g., to link the word
-"Google" to the google.com web site, you could simply write:
-
-	[Google][]
-
-And then define the link:
-
-	[Google]: http://google.com/
-
-Because link names may contain spaces, this shortcut even works for
-multiple words in the link text:
-
-	Visit [Daring Fireball][] for more information.
-
-And then define the link:
-
-	[Daring Fireball]: http://daringfireball.net/
-
-Link definitions can be placed anywhere in your Markdown document. I
-tend to put them immediately after each paragraph in which they're
-used, but if you want, you can put them all at the end of your
-document, sort of like footnotes.
-
-Here's an example of reference links in action:
-
-    I get 10 times more traffic from [Google] [1] than from
-    [Yahoo] [2] or [MSN] [3].
-
-      [1]: http://google.com/        "Google"
-      [2]: http://search.yahoo.com/  "Yahoo Search"
-      [3]: http://search.msn.com/    "MSN Search"
-
-Using the implicit link name shortcut, you could instead write:
-
-    I get 10 times more traffic from [Google][] than from
-    [Yahoo][] or [MSN][].
-
-      [google]: http://google.com/        "Google"
-      [yahoo]:  http://search.yahoo.com/  "Yahoo Search"
-      [msn]:    http://search.msn.com/    "MSN Search"
-
-Both of the above examples will produce the following HTML output:
-
-    <p>I get 10 times more traffic from <a href="http://google.com/"
-    title="Google">Google</a> than from
-    <a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a>
-    or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p>
-
-For comparison, here is the same paragraph written using
-Markdown's inline link style:
-
-    I get 10 times more traffic from [Google](http://google.com/ "Google")
-    than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or
-    [MSN](http://search.msn.com/ "MSN Search").
-
-The point of reference-style links is not that they're easier to
-write. The point is that with reference-style links, your document
-source is vastly more readable. Compare the above examples: using
-reference-style links, the paragraph itself is only 81 characters
-long; with inline-style links, it's 176 characters; and as raw HTML,
-it's 234 characters. In the raw HTML, there's more markup than there
-is text.
-
-With Markdown's reference-style links, a source document much more
-closely resembles the final output, as rendered in a browser. By
-allowing you to move the markup-related metadata out of the paragraph,
-you can add links without interrupting the narrative flow of your
-prose.
-
-
-<h3 id="em">Emphasis</h3>
-
-Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
-emphasis. Text wrapped with one `*` or `_` will be wrapped with an
-HTML `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML
-`<strong>` tag. E.g., this input:
-
-    *single asterisks*
-
-    _single underscores_
-
-    **double asterisks**
-
-    __double underscores__
-
-will produce:
-
-    <em>single asterisks</em>
-
-    <em>single underscores</em>
-
-    <strong>double asterisks</strong>
-
-    <strong>double underscores</strong>
-
-You can use whichever style you prefer; the lone restriction is that
-the same character must be used to open and close an emphasis span.
-
-Emphasis can be used in the middle of a word:
-
-    un*fucking*believable
-
-But if you surround an `*` or `_` with spaces, it'll be treated as a
-literal asterisk or underscore.
-
-To produce a literal asterisk or underscore at a position where it
-would otherwise be used as an emphasis delimiter, you can backslash
-escape it:
-
-    \*this text is surrounded by literal asterisks\*
-
-
-
-<h3 id="code">Code</h3>
-
-To indicate a span of code, wrap it with backtick quotes (`` ` ``).
-Unlike a pre-formatted code block, a code span indicates code within a
-normal paragraph. For example:
-
-    Use the `printf()` function.
-
-will produce:
-
-    <p>Use the <code>printf()</code> function.</p>
-
-To include a literal backtick character within a code span, you can use
-multiple backticks as the opening and closing delimiters:
-
-    ``There is a literal backtick (`) here.``
-
-which will produce this:
-
-    <p><code>There is a literal backtick (`) here.</code></p>
-
-The backtick delimiters surrounding a code span may include spaces --
-one after the opening, one before the closing. This allows you to place
-literal backtick characters at the beginning or end of a code span:
-
-	A single backtick in a code span: `` ` ``
-
-	A backtick-delimited string in a code span: `` `foo` ``
-
-will produce:
-
-	<p>A single backtick in a code span: <code>`</code></p>
-
-	<p>A backtick-delimited string in a code span: <code>`foo`</code></p>
-
-With a code span, ampersands and angle brackets are encoded as HTML
-entities automatically, which makes it easy to include example HTML
-tags. Markdown will turn this:
-
-    Please don't use any `<blink>` tags.
-
-into:
-
-    <p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>
-
-You can write this:
-
-    `&#8212;` is the decimal-encoded equivalent of `&mdash;`.
-
-to produce:
-
-    <p><code>&amp;#8212;</code> is the decimal-encoded
-    equivalent of <code>&amp;mdash;</code>.</p>
-
-
-
-<h3 id="img">Images</h3>
-
-Admittedly, it's fairly difficult to devise a "natural" syntax for
-placing images into a plain text document format.
-
-Markdown uses an image syntax that is intended to resemble the syntax
-for links, allowing for two styles: *inline* and *reference*.
-
-Inline image syntax looks like this:
-
-    ![Alt text](/path/to/img.jpg)
-
-    ![Alt text](/path/to/img.jpg "Optional title")
-
-That is:
-
-*   An exclamation mark: `!`;
-*   followed by a set of square brackets, containing the `alt`
-    attribute text for the image;
-*   followed by a set of parentheses, containing the URL or path to
-    the image, and an optional `title` attribute enclosed in double
-    or single quotes.
-
-Reference-style image syntax looks like this:
-
-    ![Alt text][id]
-
-Where "id" is the name of a defined image reference. Image references
-are defined using syntax identical to link references:
-
-    [id]: url/to/image  "Optional title attribute"
-
-As of this writing, Markdown has no syntax for specifying the
-dimensions of an image; if this is important to you, you can simply
-use regular HTML `<img>` tags.
-
-
-* * *
-
-
-<h2 id="misc">Miscellaneous</h2>
-
-<h3 id="autolink">Automatic Links</h3>
-
-Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:
-
-    <http://example.com/>
-
-Markdown will turn this into:
-
-    <a href="http://example.com/">http://example.com/</a>
-
-Automatic links for email addresses work similarly, except that
-Markdown will also perform a bit of randomized decimal and hex
-entity-encoding to help obscure your address from address-harvesting
-spambots. For example, Markdown will turn this:
-
-    <address@example.com>
-
-into something like this:
-
-    <a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;
-    &#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;
-    &#109;">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;
-    &#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>
-
-which will render in a browser as a clickable link to "address@example.com".
-
-(This sort of entity-encoding trick will indeed fool many, if not
-most, address-harvesting bots, but it definitely won't fool all of
-them. It's better than nothing, but an address published in this way
-will probably eventually start receiving spam.)
-
-
-
-<h3 id="backslash">Backslash Escapes</h3>
-
-Markdown allows you to use backslash escapes to generate literal
-characters which would otherwise have special meaning in Markdown's
-formatting syntax. For example, if you wanted to surround a word with
-literal asterisks (instead of an HTML `<em>` tag), you can backslashes
-before the asterisks, like this:
-
-    \*literal asterisks\*
-
-Markdown provides backslash escapes for the following characters:
-
-    \   backslash
-    `   backtick
-    *   asterisk
-    _   underscore
-    {}  curly braces
-    []  square brackets
-    ()  parentheses
-    #   hash mark
-	+	plus sign
-	-	minus sign (hyphen)
-    .   dot
-    !   exclamation mark
-
diff --git a/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.xhtml b/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.xhtml
deleted file mode 100644
index 41c48857bbc..00000000000
--- a/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.xhtml	
+++ /dev/null
@@ -1,944 +0,0 @@
-<h1>Markdown: Syntax</h1>
-
-<ul>
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
-    <li><a title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-<ul>
-<li><a href="#overview">Overview</a>
-<ul>
-<li><a href="#philosophy">Philosophy</a></li>
-<li><a href="#html">Inline HTML</a></li>
-<li><a href="#autoescape">Automatic Escaping for Special Characters</a></li>
-</ul></li>
-<li><a href="#block">Block Elements</a>
-<ul>
-<li><a href="#p">Paragraphs and Line Breaks</a></li>
-<li><a href="#header">Headers</a></li>
-<li><a href="#blockquote">Blockquotes</a></li>
-<li><a href="#list">Lists</a></li>
-<li><a href="#precode">Code Blocks</a></li>
-<li><a href="#hr">Horizontal Rules</a></li>
-</ul></li>
-<li><a href="#span">Span Elements</a>
-<ul>
-<li><a href="#link">Links</a></li>
-<li><a href="#em">Emphasis</a></li>
-<li><a href="#code">Code</a></li>
-<li><a href="#img">Images</a></li>
-</ul></li>
-<li><a href="#misc">Miscellaneous</a>
-<ul>
-<li><a href="#backslash">Backslash Escapes</a></li>
-<li><a href="#autolink">Automatic Links</a></li>
-</ul></li>
-</ul>
-
-<p><strong>Note:</strong> This document is itself written using Markdown; you
-can <a href="/projects/markdown/syntax.text">see the source for it by adding '.text' to the URL</a>.</p>
-
-<hr />
-
-<h2 id="overview">Overview</h2>
-
-<h3 id="philosophy">Philosophy</h3>
-
-<p>Markdown is intended to be as easy-to-read and easy-to-write as is feasible.</p>
-
-<p>Readability, however, is emphasized above all else. A Markdown-formatted
-document should be publishable as-is, as plain text, without looking
-like it's been marked up with tags or formatting instructions. While
-Markdown's syntax has been influenced by several existing text-to-HTML
-filters -- including <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a>, <a href="http://www.aaronsw.com/2002/atx/">atx</a>, <a href="http://textism.com/tools/textile/">Textile</a>, <a href="http://docutils.sourceforge.net/rst.html">reStructuredText</a>,
-<a href="http://www.triptico.com/software/grutatxt.html">Grutatext</a>, and <a href="http://ettext.taint.org/doc/">EtText</a> -- the single biggest source of
-inspiration for Markdown's syntax is the format of plain text email.</p>
-
-<p>To this end, Markdown's syntax is comprised entirely of punctuation
-characters, which punctuation characters have been carefully chosen so
-as to look like what they mean. E.g., asterisks around a word actually
-look like *emphasis*. Markdown lists look like, well, lists. Even
-blockquotes look like quoted passages of text, assuming you've ever
-used email.</p>
-
-<h3 id="html">Inline HTML</h3>
-
-<p>Markdown's syntax is intended for one purpose: to be used as a
-format for <em>writing</em> for the web.</p>
-
-<p>Markdown is not a replacement for HTML, or even close to it. Its
-syntax is very small, corresponding only to a very small subset of
-HTML tags. The idea is <em>not</em> to create a syntax that makes it easier
-to insert HTML tags. In my opinion, HTML tags are already easy to
-insert. The idea for Markdown is to make it easy to read, write, and
-edit prose. HTML is a <em>publishing</em> format; Markdown is a <em>writing</em>
-format. Thus, Markdown's formatting syntax only addresses issues that
-can be conveyed in plain text.</p>
-
-<p>For any markup that is not covered by Markdown's syntax, you simply
-use HTML itself. There's no need to preface it or delimit it to
-indicate that you're switching from Markdown to HTML; you just use
-the tags.</p>
-
-<p>The only restrictions are that block-level HTML elements -- e.g. <code>&lt;div&gt;</code>,
-<code>&lt;table&gt;</code>, <code>&lt;pre&gt;</code>, <code>&lt;p&gt;</code>, etc. -- must be separated from surrounding
-content by blank lines, and the start and end tags of the block should
-not be indented with tabs or spaces. Markdown is smart enough not
-to add extra (unwanted) <code>&lt;p&gt;</code> tags around HTML block-level tags.</p>
-
-<p>For example, to add an HTML table to a Markdown article:</p>
-
-<pre><code>This is a regular paragraph.
-
-&lt;table&gt;
-    &lt;tr&gt;
-        &lt;td&gt;Foo&lt;/td&gt;
-    &lt;/tr&gt;
-&lt;/table&gt;
-
-This is another regular paragraph.
-</code></pre>
-
-<p>Note that Markdown formatting syntax is not processed within block-level
-HTML tags. E.g., you can't use Markdown-style <code>*emphasis*</code> inside an
-HTML block.</p>
-
-<p>Span-level HTML tags -- e.g. <code>&lt;span&gt;</code>, <code>&lt;cite&gt;</code>, or <code>&lt;del&gt;</code> -- can be
-used anywhere in a Markdown paragraph, list item, or header. If you
-want, you can even use HTML tags instead of Markdown formatting; e.g. if
-you'd prefer to use HTML <code>&lt;a&gt;</code> or <code>&lt;img&gt;</code> tags instead of Markdown's
-link or image syntax, go right ahead.</p>
-
-<p>Unlike block-level HTML tags, Markdown syntax <em>is</em> processed within
-span-level tags.</p>
-
-<h3 id="autoescape">Automatic Escaping for Special Characters</h3>
-
-<p>In HTML, there are two characters that demand special treatment: <code>&lt;</code>
-and <code>&amp;</code>. Left angle brackets are used to start tags; ampersands are
-used to denote HTML entities. If you want to use them as literal
-characters, you must escape them as entities, e.g. <code>&amp;lt;</code>, and
-<code>&amp;amp;</code>.</p>
-
-<p>Ampersands in particular are bedeviling for web writers. If you want to
-write about 'AT&amp;T', you need to write '<code>AT&amp;amp;T</code>'. You even need to
-escape ampersands within URLs. Thus, if you want to link to:</p>
-
-<pre><code>http://images.google.com/images?num=30&amp;q=larry+bird
-</code></pre>
-
-<p>you need to encode the URL as:</p>
-
-<pre><code>http://images.google.com/images?num=30&amp;amp;q=larry+bird
-</code></pre>
-
-<p>in your anchor tag <code>href</code> attribute. Needless to say, this is easy to
-forget, and is probably the single most common source of HTML validation
-errors in otherwise well-marked-up web sites.</p>
-
-<p>Markdown allows you to use these characters naturally, taking care of
-all the necessary escaping for you. If you use an ampersand as part of
-an HTML entity, it remains unchanged; otherwise it will be translated
-into <code>&amp;amp;</code>.</p>
-
-<p>So, if you want to include a copyright symbol in your article, you can write:</p>
-
-<pre><code>&amp;copy;
-</code></pre>
-
-<p>and Markdown will leave it alone. But if you write:</p>
-
-<pre><code>AT&amp;T
-</code></pre>
-
-<p>Markdown will translate it to:</p>
-
-<pre><code>AT&amp;amp;T
-</code></pre>
-
-<p>Similarly, because Markdown supports <a href="#html">inline HTML</a>, if you use
-angle brackets as delimiters for HTML tags, Markdown will treat them as
-such. But if you write:</p>
-
-<pre><code>4 &lt; 5
-</code></pre>
-
-<p>Markdown will translate it to:</p>
-
-<pre><code>4 &amp;lt; 5
-</code></pre>
-
-<p>However, inside Markdown code spans and blocks, angle brackets and
-ampersands are <em>always</em> encoded automatically. This makes it easy to use
-Markdown to write about HTML code. (As opposed to raw HTML, which is a
-terrible format for writing about HTML syntax, because every single <code>&lt;</code>
-and <code>&amp;</code> in your example code needs to be escaped.)</p>
-
-<hr />
-
-<h2 id="block">Block Elements</h2>
-
-<h3 id="p">Paragraphs and Line Breaks</h3>
-
-<p>A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing but spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.</p>
-
-<p>The implication of the "one or more consecutive lines of text" rule is
-that Markdown supports "hard-wrapped" text paragraphs. This differs
-significantly from most other text-to-HTML formatters (including Movable
-Type's "Convert Line Breaks" option) which translate every line break
-character in a paragraph into a <code>&lt;br /&gt;</code> tag.</p>
-
-<p>When you <em>do</em> want to insert a <code>&lt;br /&gt;</code> break tag using Markdown, you
-end a line with two or more spaces, then type return.</p>
-
-<p>Yes, this takes a tad more effort to create a <code>&lt;br /&gt;</code>, but a simplistic
-"every line break is a <code>&lt;br /&gt;</code>" rule wouldn't work for Markdown.
-Markdown's email-style <a href="#blockquote">blockquoting</a> and multi-paragraph <a href="#list">list items</a>
-work best -- and look better -- when you format them with hard breaks.</p>
-
-<h3 id="header">Headers</h3>
-
-<p>Markdown supports two styles of headers, <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a> and <a href="http://www.aaronsw.com/2002/atx/">atx</a>.</p>
-
-<p>Setext-style headers are "underlined" using equal signs (for first-level
-headers) and dashes (for second-level headers). For example:</p>
-
-<pre><code>This is an H1
-=============
-
-This is an H2
--------------
-</code></pre>
-
-<p>Any number of underlining <code>=</code>'s or <code>-</code>'s will work.</p>
-
-<p>Atx-style headers use 1-6 hash characters at the start of the line,
-corresponding to header levels 1-6. For example:</p>
-
-<pre><code># This is an H1
-
-## This is an H2
-
-###### This is an H6
-</code></pre>
-
-<p>Optionally, you may "close" atx-style headers. This is purely
-cosmetic -- you can use this if you think it looks better. The
-closing hashes don't even need to match the number of hashes
-used to open the header. (The number of opening hashes
-determines the header level.) :</p>
-
-<pre><code># This is an H1 #
-
-## This is an H2 ##
-
-### This is an H3 ######
-</code></pre>
-
-<h3 id="blockquote">Blockquotes</h3>
-
-<p>Markdown uses email-style <code>&gt;</code> characters for blockquoting. If you're
-familiar with quoting passages of text in an email message, then you
-know how to create a blockquote in Markdown. It looks best if you hard
-wrap the text and put a <code>&gt;</code> before every line:</p>
-
-<pre><code>&gt; This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-&gt; consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-&gt; Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-&gt;
-&gt; Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-&gt; id sem consectetuer libero luctus adipiscing.
-</code></pre>
-
-<p>Markdown allows you to be lazy and only put the <code>&gt;</code> before the first
-line of a hard-wrapped paragraph:</p>
-
-<pre><code>&gt; This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-
-&gt; Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-id sem consectetuer libero luctus adipiscing.
-</code></pre>
-
-<p>Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by
-adding additional levels of <code>&gt;</code>:</p>
-
-<pre><code>&gt; This is the first level of quoting.
-&gt;
-&gt; &gt; This is nested blockquote.
-&gt;
-&gt; Back to the first level.
-</code></pre>
-
-<p>Blockquotes can contain other Markdown elements, including headers, lists,
-and code blocks:</p>
-
-<pre><code>&gt; ## This is a header.
-&gt;
-&gt; 1.   This is the first list item.
-
-&gt; 2.   This is the second list item.
-
-&gt;
-&gt; Here&#x27;s some example code:
-&gt;
-&gt;     return shell_exec(&quot;echo $input | $markdown_script&quot;);
-</code></pre>
-
-<p>Any decent text editor should make email-style quoting easy. For
-example, with BBEdit, you can make a selection and choose Increase
-Quote Level from the Text menu.</p>
-
-<h3 id="list">Lists</h3>
-
-<p>Markdown supports ordered (numbered) and unordered (bulleted) lists.</p>
-
-<p>Unordered lists use asterisks, pluses, and hyphens -- interchangably
--- as list markers:</p>
-
-<pre><code>*   Red
-*   Green
-*   Blue
-</code></pre>
-
-<p>is equivalent to:</p>
-
-<pre><code>+   Red
-+   Green
-+   Blue
-</code></pre>
-
-<p>and:</p>
-
-<pre><code>-   Red
--   Green
--   Blue
-</code></pre>
-
-<p>Ordered lists use numbers followed by periods:</p>
-
-<pre><code>1.  Bird
-2.  McHale
-3.  Parish
-</code></pre>
-
-<p>It's important to note that the actual numbers you use to mark the
-list have no effect on the HTML output Markdown produces. The HTML
-Markdown produces from the above list is:</p>
-
-<pre><code>&lt;ol&gt;
-&lt;li&gt;Bird&lt;/li&gt;
-&lt;li&gt;McHale&lt;/li&gt;
-&lt;li&gt;Parish&lt;/li&gt;
-&lt;/ol&gt;
-</code></pre>
-
-<p>If you instead wrote the list in Markdown like this:</p>
-
-<pre><code>1.  Bird
-1.  McHale
-1.  Parish
-</code></pre>
-
-<p>or even:</p>
-
-<pre><code>3. Bird
-1. McHale
-8. Parish
-</code></pre>
-
-<p>you'd get the exact same HTML output. The point is, if you want to,
-you can use ordinal numbers in your ordered Markdown lists, so that
-the numbers in your source match the numbers in your published HTML.
-But if you want to be lazy, you don't have to.</p>
-
-<p>If you do use lazy list numbering, however, you should still start the
-list with the number 1. At some point in the future, Markdown may support
-starting ordered lists at an arbitrary number.</p>
-
-<p>List markers typically start at the left margin, but may be indented by
-up to three spaces. List markers must be followed by one or more spaces
-or a tab.</p>
-
-<p>To make lists look nice, you can wrap items with hanging indents:</p>
-
-<pre><code>*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-    viverra nec, fringilla in, laoreet vitae, risus.
-*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-    Suspendisse id sem consectetuer libero luctus adipiscing.
-</code></pre>
-
-<p>But if you want to be lazy, you don't have to:</p>
-
-<pre><code>*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-viverra nec, fringilla in, laoreet vitae, risus.
-*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-Suspendisse id sem consectetuer libero luctus adipiscing.
-</code></pre>
-
-<p>If list items are separated by blank lines, Markdown will wrap the
-items in <code>&lt;p&gt;</code> tags in the HTML output. For example, this input:</p>
-
-<pre><code>*   Bird
-*   Magic
-</code></pre>
-
-<p>will turn into:</p>
-
-<pre><code>&lt;ul&gt;
-&lt;li&gt;Bird&lt;/li&gt;
-&lt;li&gt;Magic&lt;/li&gt;
-&lt;/ul&gt;
-</code></pre>
-
-<p>But this:</p>
-
-<pre><code>*   Bird
-
-*   Magic
-</code></pre>
-
-<p>will turn into:</p>
-
-<pre><code>&lt;ul&gt;
-&lt;li&gt;&lt;p&gt;Bird&lt;/p&gt;&lt;/li&gt;
-&lt;li&gt;&lt;p&gt;Magic&lt;/p&gt;&lt;/li&gt;
-&lt;/ul&gt;
-</code></pre>
-
-<p>List items may consist of multiple paragraphs. Each subsequent
-paragraph in a list item must be intended by either 4 spaces
-or one tab:</p>
-
-<pre><code>1.  This is a list item with two paragraphs. Lorem ipsum dolor
-    sit amet, consectetuer adipiscing elit. Aliquam hendrerit
-    mi posuere lectus.
-
-    Vestibulum enim wisi, viverra nec, fringilla in, laoreet
-    vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
-    sit amet velit.
-
-2.  Suspendisse id sem consectetuer libero luctus adipiscing.
-</code></pre>
-
-<p>It looks nice if you indent every line of the subsequent
-paragraphs, but here again, Markdown will allow you to be
-lazy:</p>
-
-<pre><code>*   This is a list item with two paragraphs.
-
-    This is the second paragraph in the list item. You&#x27;re
-only required to indent the first line. Lorem ipsum dolor
-sit amet, consectetuer adipiscing elit.
-
-*   Another item in the same list.
-</code></pre>
-
-<p>To put a blockquote within a list item, the blockquote's <code>&gt;</code>
-delimiters need to be indented:</p>
-
-<pre><code>*   A list item with a blockquote:
-
-    &gt; This is a blockquote
-    &gt; inside a list item.
-</code></pre>
-
-<p>To put a code block within a list item, the code block needs
-to be indented <em>twice</em> -- 8 spaces or two tabs:</p>
-
-<pre><code>*   A list item with a code block:
-
-        &lt;code goes here&gt;
-</code></pre>
-
-<p>It's worth noting that it's possible to trigger an ordered list by
-accident, by writing something like this:</p>
-
-<pre><code>1986. What a great season.
-</code></pre>
-
-<p>In other words, a <em>number-period-space</em> sequence at the beginning of a
-line. To avoid this, you can backslash-escape the period:</p>
-
-<pre><code>1986\. What a great season.
-</code></pre>
-
-<h3 id="precode">Code Blocks</h3>
-
-<p>Pre-formatted code blocks are used for writing about programming or
-markup source code. Rather than forming normal paragraphs, the lines
-of a code block are interpreted literally. Markdown wraps a code block
-in both <code>&lt;pre&gt;</code> and <code>&lt;code&gt;</code> tags.</p>
-
-<p>To produce a code block in Markdown, simply indent every line of the
-block by at least 4 spaces or 1 tab. For example, given this input:</p>
-
-<pre><code>This is a normal paragraph:
-
-    This is a code block.
-</code></pre>
-
-<p>Markdown will generate:</p>
-
-<pre><code>&lt;p&gt;This is a normal paragraph:&lt;/p&gt;
-
-&lt;pre&gt;&lt;code&gt;This is a code block.
-&lt;/code&gt;&lt;/pre&gt;
-</code></pre>
-
-<p>One level of indentation -- 4 spaces or 1 tab -- is removed from each
-line of the code block. For example, this:</p>
-
-<pre><code>Here is an example of AppleScript:
-
-    tell application &quot;Foo&quot;
-        beep
-    end tell
-</code></pre>
-
-<p>will turn into:</p>
-
-<pre><code>&lt;p&gt;Here is an example of AppleScript:&lt;/p&gt;
-
-&lt;pre&gt;&lt;code&gt;tell application &quot;Foo&quot;
-    beep
-end tell
-&lt;/code&gt;&lt;/pre&gt;
-</code></pre>
-
-<p>A code block continues until it reaches a line that is not indented
-(or the end of the article).</p>
-
-<p>Within a code block, ampersands (<code>&amp;</code>) and angle brackets (<code>&lt;</code> and <code>&gt;</code>)
-are automatically converted into HTML entities. This makes it very
-easy to include example HTML source code using Markdown -- just paste
-it and indent it, and Markdown will handle the hassle of encoding the
-ampersands and angle brackets. For example, this:</p>
-
-<pre><code>    &lt;div class=&quot;footer&quot;&gt;
-        &amp;copy; 2004 Foo Corporation
-    &lt;/div&gt;
-</code></pre>
-
-<p>will turn into:</p>
-
-<pre><code>&lt;pre&gt;&lt;code&gt;&amp;lt;div class=&quot;footer&quot;&amp;gt;
-    &amp;amp;copy; 2004 Foo Corporation
-&amp;lt;/div&amp;gt;
-&lt;/code&gt;&lt;/pre&gt;
-</code></pre>
-
-<p>Regular Markdown syntax is not processed within code blocks. E.g.,
-asterisks are just literal asterisks within a code block. This means
-it's also easy to use Markdown to write about Markdown's own syntax.</p>
-
-<h3 id="hr">Horizontal Rules</h3>
-
-<p>You can produce a horizontal rule tag (<code>&lt;hr /&gt;</code>) by placing three or
-more hyphens, asterisks, or underscores on a line by themselves. If you
-wish, you may use spaces between the hyphens or asterisks. Each of the
-following lines will produce a horizontal rule:</p>
-
-<pre><code>* * *
-
-***
-
-*****
-
-- - -
-
----------------------------------------
-
-_ _ _
-</code></pre>
-
-<hr />
-
-<h2 id="span">Span Elements</h2>
-
-<h3 id="link">Links</h3>
-
-<p>Markdown supports two style of links: <em>inline</em> and <em>reference</em>.</p>
-
-<p>In both styles, the link text is delimited by [square brackets].</p>
-
-<p>To create an inline link, use a set of regular parentheses immediately
-after the link text's closing square bracket. Inside the parentheses,
-put the URL where you want the link to point, along with an <em>optional</em>
-title for the link, surrounded in quotes. For example:</p>
-
-<pre><code>This is [an example](http://example.com/ &quot;Title&quot;) inline link.
-
-[This link](http://example.net/) has no title attribute.
-</code></pre>
-
-<p>Will produce:</p>
-
-<pre><code>&lt;p&gt;This is &lt;a href=&quot;http://example.com/&quot; title=&quot;Title&quot;&gt;
-an example&lt;/a&gt; inline link.&lt;/p&gt;
-
-&lt;p&gt;&lt;a href=&quot;http://example.net/&quot;&gt;This link&lt;/a&gt; has no
-title attribute.&lt;/p&gt;
-</code></pre>
-
-<p>If you're referring to a local resource on the same server, you can
-use relative paths:</p>
-
-<pre><code>See my [About](/about/) page for details.
-</code></pre>
-
-<p>Reference-style links use a second set of square brackets, inside
-which you place a label of your choosing to identify the link:</p>
-
-<pre><code>This is [an example][id] reference-style link.
-</code></pre>
-
-<p>You can optionally use a space to separate the sets of brackets:</p>
-
-<pre><code>This is [an example] [id] reference-style link.
-</code></pre>
-
-<p>Then, anywhere in the document, you define your link label like this,
-on a line by itself:</p>
-
-<pre><code>[id]: http://example.com/  &quot;Optional Title Here&quot;
-</code></pre>
-
-<p>That is:</p>
-
-<ul>
-<li>Square brackets containing the link identifier (optionally
-indented from the left margin using up to three spaces);</li>
-<li>followed by a colon;</li>
-<li>followed by one or more spaces (or tabs);</li>
-<li>followed by the URL for the link;</li>
-<li>optionally followed by a title attribute for the link, enclosed
-in double or single quotes.</li>
-</ul>
-
-<p>The link URL may, optionally, be surrounded by angle brackets:</p>
-
-<pre><code>[id]: &lt;http://example.com/&gt;  &quot;Optional Title Here&quot;
-</code></pre>
-
-<p>You can put the title attribute on the next line and use extra spaces
-or tabs for padding, which tends to look better with longer URLs:</p>
-
-<pre><code>[id]: http://example.com/longish/path/to/resource/here
-    &quot;Optional Title Here&quot;
-</code></pre>
-
-<p>Link definitions are only used for creating links during Markdown
-processing, and are stripped from your document in the HTML output.</p>
-
-<p>Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are <em>not</em> case sensitive. E.g. these two links:</p>
-
-<pre><code>[link text][a]
-[link text][A]
-</code></pre>
-
-<p>are equivalent.</p>
-
-<p>The <em>implicit link name</em> shortcut allows you to omit the name of the
-link, in which case the link text itself is used as the name.
-Just use an empty set of square brackets -- e.g., to link the word
-"Google" to the google.com web site, you could simply write:</p>
-
-<pre><code>[Google][]
-</code></pre>
-
-<p>And then define the link:</p>
-
-<pre><code>[Google]: http://google.com/
-</code></pre>
-
-<p>Because link names may contain spaces, this shortcut even works for
-multiple words in the link text:</p>
-
-<pre><code>Visit [Daring Fireball][] for more information.
-</code></pre>
-
-<p>And then define the link:</p>
-
-<pre><code>[Daring Fireball]: http://daringfireball.net/
-</code></pre>
-
-<p>Link definitions can be placed anywhere in your Markdown document. I
-tend to put them immediately after each paragraph in which they're
-used, but if you want, you can put them all at the end of your
-document, sort of like footnotes.</p>
-
-<p>Here's an example of reference links in action:</p>
-
-<pre><code>I get 10 times more traffic from [Google] [1] than from
-[Yahoo] [2] or [MSN] [3].
-
-  [1]: http://google.com/        &quot;Google&quot;
-  [2]: http://search.yahoo.com/  &quot;Yahoo Search&quot;
-  [3]: http://search.msn.com/    &quot;MSN Search&quot;
-</code></pre>
-
-<p>Using the implicit link name shortcut, you could instead write:</p>
-
-<pre><code>I get 10 times more traffic from [Google][] than from
-[Yahoo][] or [MSN][].
-
-  [google]: http://google.com/        &quot;Google&quot;
-  [yahoo]:  http://search.yahoo.com/  &quot;Yahoo Search&quot;
-  [msn]:    http://search.msn.com/    &quot;MSN Search&quot;
-</code></pre>
-
-<p>Both of the above examples will produce the following HTML output:</p>
-
-<pre><code>&lt;p&gt;I get 10 times more traffic from &lt;a href=&quot;http://google.com/&quot;
-title=&quot;Google&quot;&gt;Google&lt;/a&gt; than from
-&lt;a href=&quot;http://search.yahoo.com/&quot; title=&quot;Yahoo Search&quot;&gt;Yahoo&lt;/a&gt;
-or &lt;a href=&quot;http://search.msn.com/&quot; title=&quot;MSN Search&quot;&gt;MSN&lt;/a&gt;.&lt;/p&gt;
-</code></pre>
-
-<p>For comparison, here is the same paragraph written using
-Markdown's inline link style:</p>
-
-<pre><code>I get 10 times more traffic from [Google](http://google.com/ &quot;Google&quot;)
-than from [Yahoo](http://search.yahoo.com/ &quot;Yahoo Search&quot;) or
-[MSN](http://search.msn.com/ &quot;MSN Search&quot;).
-</code></pre>
-
-<p>The point of reference-style links is not that they're easier to
-write. The point is that with reference-style links, your document
-source is vastly more readable. Compare the above examples: using
-reference-style links, the paragraph itself is only 81 characters
-long; with inline-style links, it's 176 characters; and as raw HTML,
-it's 234 characters. In the raw HTML, there's more markup than there
-is text.</p>
-
-<p>With Markdown's reference-style links, a source document much more
-closely resembles the final output, as rendered in a browser. By
-allowing you to move the markup-related metadata out of the paragraph,
-you can add links without interrupting the narrative flow of your
-prose.</p>
-
-<h3 id="em">Emphasis</h3>
-
-<p>Markdown treats asterisks (<code>*</code>) and underscores (<code>_</code>) as indicators of
-emphasis. Text wrapped with one <code>*</code> or <code>_</code> will be wrapped with an
-HTML <code>&lt;em&gt;</code> tag; double <code>*</code>'s or <code>_</code>'s will be wrapped with an HTML
-<code>&lt;strong&gt;</code> tag. E.g., this input:</p>
-
-<pre><code>*single asterisks*
-
-_single underscores_
-
-**double asterisks**
-
-__double underscores__
-</code></pre>
-
-<p>will produce:</p>
-
-<pre><code>&lt;em&gt;single asterisks&lt;/em&gt;
-
-&lt;em&gt;single underscores&lt;/em&gt;
-
-&lt;strong&gt;double asterisks&lt;/strong&gt;
-
-&lt;strong&gt;double underscores&lt;/strong&gt;
-</code></pre>
-
-<p>You can use whichever style you prefer; the lone restriction is that
-the same character must be used to open and close an emphasis span.</p>
-
-<p>Emphasis can be used in the middle of a word:</p>
-
-<pre><code>un*fucking*believable
-</code></pre>
-
-<p>But if you surround an <code>*</code> or <code>_</code> with spaces, it'll be treated as a
-literal asterisk or underscore.</p>
-
-<p>To produce a literal asterisk or underscore at a position where it
-would otherwise be used as an emphasis delimiter, you can backslash
-escape it:</p>
-
-<pre><code>\*this text is surrounded by literal asterisks\*
-</code></pre>
-
-<h3 id="code">Code</h3>
-
-<p>To indicate a span of code, wrap it with backtick quotes (<code>&#x60;</code>).
-Unlike a pre-formatted code block, a code span indicates code within a
-normal paragraph. For example:</p>
-
-<pre><code>Use the &#x60;printf()&#x60; function.
-</code></pre>
-
-<p>will produce:</p>
-
-<pre><code>&lt;p&gt;Use the &lt;code&gt;printf()&lt;/code&gt; function.&lt;/p&gt;
-</code></pre>
-
-<p>To include a literal backtick character within a code span, you can use
-multiple backticks as the opening and closing delimiters:</p>
-
-<pre><code>&#x60;&#x60;There is a literal backtick (&#x60;) here.&#x60;&#x60;
-</code></pre>
-
-<p>which will produce this:</p>
-
-<pre><code>&lt;p&gt;&lt;code&gt;There is a literal backtick (&#x60;) here.&lt;/code&gt;&lt;/p&gt;
-</code></pre>
-
-<p>The backtick delimiters surrounding a code span may include spaces --
-one after the opening, one before the closing. This allows you to place
-literal backtick characters at the beginning or end of a code span:</p>
-
-<pre><code>A single backtick in a code span: &#x60;&#x60; &#x60; &#x60;&#x60;
-
-A backtick-delimited string in a code span: &#x60;&#x60; &#x60;foo&#x60; &#x60;&#x60;
-</code></pre>
-
-<p>will produce:</p>
-
-<pre><code>&lt;p&gt;A single backtick in a code span: &lt;code&gt;&#x60;&lt;/code&gt;&lt;/p&gt;
-
-&lt;p&gt;A backtick-delimited string in a code span: &lt;code&gt;&#x60;foo&#x60;&lt;/code&gt;&lt;/p&gt;
-</code></pre>
-
-<p>With a code span, ampersands and angle brackets are encoded as HTML
-entities automatically, which makes it easy to include example HTML
-tags. Markdown will turn this:</p>
-
-<pre><code>Please don&#x27;t use any &#x60;&lt;blink&gt;&#x60; tags.
-</code></pre>
-
-<p>into:</p>
-
-<pre><code>&lt;p&gt;Please don&#x27;t use any &lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
-</code></pre>
-
-<p>You can write this:</p>
-
-<pre><code>&#x60;&amp;#8212;&#x60; is the decimal-encoded equivalent of &#x60;&amp;mdash;&#x60;.
-</code></pre>
-
-<p>to produce:</p>
-
-<pre><code>&lt;p&gt;&lt;code&gt;&amp;amp;#8212;&lt;/code&gt; is the decimal-encoded
-equivalent of &lt;code&gt;&amp;amp;mdash;&lt;/code&gt;.&lt;/p&gt;
-</code></pre>
-
-<h3 id="img">Images</h3>
-
-<p>Admittedly, it's fairly difficult to devise a "natural" syntax for
-placing images into a plain text document format.</p>
-
-<p>Markdown uses an image syntax that is intended to resemble the syntax
-for links, allowing for two styles: <em>inline</em> and <em>reference</em>.</p>
-
-<p>Inline image syntax looks like this:</p>
-
-<pre><code>![Alt text](/path/to/img.jpg)
-
-![Alt text](/path/to/img.jpg &quot;Optional title&quot;)
-</code></pre>
-
-<p>That is:</p>
-
-<ul>
-<li>An exclamation mark: <code>!</code>;</li>
-<li>followed by a set of square brackets, containing the <code>alt</code>
-attribute text for the image;</li>
-<li>followed by a set of parentheses, containing the URL or path to
-the image, and an optional <code>title</code> attribute enclosed in double
-or single quotes.</li>
-</ul>
-
-<p>Reference-style image syntax looks like this:</p>
-
-<pre><code>![Alt text][id]
-</code></pre>
-
-<p>Where "id" is the name of a defined image reference. Image references
-are defined using syntax identical to link references:</p>
-
-<pre><code>[id]: url/to/image  &quot;Optional title attribute&quot;
-</code></pre>
-
-<p>As of this writing, Markdown has no syntax for specifying the
-dimensions of an image; if this is important to you, you can simply
-use regular HTML <code>&lt;img&gt;</code> tags.</p>
-
-<hr />
-
-<h2 id="misc">Miscellaneous</h2>
-
-<h3 id="autolink">Automatic Links</h3>
-
-<p>Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:</p>
-
-<pre><code>&lt;http://example.com/&gt;
-</code></pre>
-
-<p>Markdown will turn this into:</p>
-
-<pre><code>&lt;a href=&quot;http://example.com/&quot;&gt;http://example.com/&lt;/a&gt;
-</code></pre>
-
-<p>Automatic links for email addresses work similarly, except that
-Markdown will also perform a bit of randomized decimal and hex
-entity-encoding to help obscure your address from address-harvesting
-spambots. For example, Markdown will turn this:</p>
-
-<pre><code>&lt;address@example.com&gt;
-</code></pre>
-
-<p>into something like this:</p>
-
-<pre><code>&lt;a href=&quot;&amp;#x6D;&amp;#x61;i&amp;#x6C;&amp;#x74;&amp;#x6F;:&amp;#x61;&amp;#x64;&amp;#x64;&amp;#x72;&amp;#x65;
-&amp;#115;&amp;#115;&amp;#64;&amp;#101;&amp;#120;&amp;#x61;&amp;#109;&amp;#x70;&amp;#x6C;e&amp;#x2E;&amp;#99;&amp;#111;
-&amp;#109;&quot;&gt;&amp;#x61;&amp;#x64;&amp;#x64;&amp;#x72;&amp;#x65;&amp;#115;&amp;#115;&amp;#64;&amp;#101;&amp;#120;&amp;#x61;
-&amp;#109;&amp;#x70;&amp;#x6C;e&amp;#x2E;&amp;#99;&amp;#111;&amp;#109;&lt;/a&gt;
-</code></pre>
-
-<p>which will render in a browser as a clickable link to "address@example.com".</p>
-
-<p>(This sort of entity-encoding trick will indeed fool many, if not
-most, address-harvesting bots, but it definitely won't fool all of
-them. It's better than nothing, but an address published in this way
-will probably eventually start receiving spam.)</p>
-
-<h3 id="backslash">Backslash Escapes</h3>
-
-<p>Markdown allows you to use backslash escapes to generate literal
-characters which would otherwise have special meaning in Markdown's
-formatting syntax. For example, if you wanted to surround a word with
-literal asterisks (instead of an HTML <code>&lt;em&gt;</code> tag), you can backslashes
-before the asterisks, like this:</p>
-
-<pre><code>\*literal asterisks\*
-</code></pre>
-
-<p>Markdown provides backslash escapes for the following characters:</p>
-
-<pre><code>\   backslash
-&#x60;   backtick
-*   asterisk
-_   underscore
-{}  curly braces
-[]  square brackets
-()  parentheses
-#   hash mark
-+   plus sign
--   minus sign (hyphen)
-.   dot
-!   exclamation mark
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Nested blockquotes.text b/test/javascripts/mdtest/fixtures/Nested blockquotes.text
deleted file mode 100644
index ed3c624ffbe..00000000000
--- a/test/javascripts/mdtest/fixtures/Nested blockquotes.text	
+++ /dev/null
@@ -1,5 +0,0 @@
-> foo
->
-> > bar
->
-> foo
diff --git a/test/javascripts/mdtest/fixtures/Nested blockquotes.xhtml b/test/javascripts/mdtest/fixtures/Nested blockquotes.xhtml
deleted file mode 100644
index d8ec7f8e03f..00000000000
--- a/test/javascripts/mdtest/fixtures/Nested blockquotes.xhtml	
+++ /dev/null
@@ -1,9 +0,0 @@
-<blockquote>
-  <p>foo</p>
-  
-  <blockquote>
-    <p>bar</p>
-  </blockquote>
-  
-  <p>foo</p>
-</blockquote>
diff --git a/test/javascripts/mdtest/fixtures/Ordered and unordered lists.text b/test/javascripts/mdtest/fixtures/Ordered and unordered lists.text
deleted file mode 100644
index 4c7421c07af..00000000000
--- a/test/javascripts/mdtest/fixtures/Ordered and unordered lists.text	
+++ /dev/null
@@ -1,131 +0,0 @@
-## Unordered
-
-Asterisks tight:
-
-*	asterisk 1
-*	asterisk 2
-*	asterisk 3
-
-
-Asterisks loose:
-
-*	asterisk 1
-
-*	asterisk 2
-
-*	asterisk 3
-
-* * *
-
-Pluses tight:
-
-+	Plus 1
-+	Plus 2
-+	Plus 3
-
-
-Pluses loose:
-
-+	Plus 1
-
-+	Plus 2
-
-+	Plus 3
-
-* * *
-
-
-Minuses tight:
-
--	Minus 1
--	Minus 2
--	Minus 3
-
-
-Minuses loose:
-
--	Minus 1
-
--	Minus 2
-
--	Minus 3
-
-
-## Ordered
-
-Tight:
-
-1.	First
-2.	Second
-3.	Third
-
-and:
-
-1. One
-2. Two
-3. Three
-
-
-Loose using tabs:
-
-1.	First
-
-2.	Second
-
-3.	Third
-
-and using spaces:
-
-1. One
-
-2. Two
-
-3. Three
-
-Multiple paragraphs:
-
-1.	Item 1, graf one.
-
-	Item 1. graf two. The quick brown fox jumped over the lazy dog's
-	back.
-
-2.	Item 2.
-
-3.	Item 3.
-
-
-
-## Nested
-
-*	Tab
-	*	Tab
-		*	Tab
-
-Here's another:
-
-1. First
-2. Second:
-	* Fee
-	* Fie
-	* Foe
-3. Third
-
-Same thing but with paragraphs:
-
-1. First
-
-2. Second:
-	* Fee
-	* Fie
-	* Foe
-
-3. Third
-
-
-This was an error in Markdown 1.0.1:
-
-*	this
-
-	*	sub
-
-	that
diff --git a/test/javascripts/mdtest/fixtures/Ordered and unordered lists.xhtml b/test/javascripts/mdtest/fixtures/Ordered and unordered lists.xhtml
deleted file mode 100644
index ea55846e6b4..00000000000
--- a/test/javascripts/mdtest/fixtures/Ordered and unordered lists.xhtml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<h2>Unordered</h2>
-
-<p>Asterisks tight:</p>
-
-<ul>
-<li>asterisk 1</li>
-<li>asterisk 2</li>
-<li>asterisk 3</li>
-</ul>
-
-<p>Asterisks loose:</p>
-
-<ul>
-<li><p>asterisk 1</p></li>
-<li><p>asterisk 2</p></li>
-<li><p>asterisk 3</p></li>
-</ul>
-
-<hr />
-
-<p>Pluses tight:</p>
-
-<ul>
-<li>Plus 1</li>
-<li>Plus 2</li>
-<li>Plus 3</li>
-</ul>
-
-<p>Pluses loose:</p>
-
-<ul>
-<li><p>Plus 1</p></li>
-<li><p>Plus 2</p></li>
-<li><p>Plus 3</p></li>
-</ul>
-
-<hr />
-
-<p>Minuses tight:</p>
-
-<ul>
-<li>Minus 1</li>
-<li>Minus 2</li>
-<li>Minus 3</li>
-</ul>
-
-<p>Minuses loose:</p>
-
-<ul>
-<li><p>Minus 1</p></li>
-<li><p>Minus 2</p></li>
-<li><p>Minus 3</p></li>
-</ul>
-
-<h2>Ordered</h2>
-
-<p>Tight:</p>
-
-<ol>
-<li>First</li>
-<li>Second</li>
-<li>Third</li>
-</ol>
-
-<p>and:</p>
-
-<ol>
-<li>One</li>
-<li>Two</li>
-<li>Three</li>
-</ol>
-
-<p>Loose using tabs:</p>
-
-<ol>
-<li><p>First</p></li>
-<li><p>Second</p></li>
-<li><p>Third</p></li>
-</ol>
-
-<p>and using spaces:</p>
-
-<ol>
-<li><p>One</p></li>
-<li><p>Two</p></li>
-<li><p>Three</p></li>
-</ol>
-
-<p>Multiple paragraphs:</p>
-
-<ol>
-<li><p>Item 1, graf one.</p>
-
-<p>Item 1. graf two. The quick brown fox jumped over the lazy dog's
-back.</p></li>
-<li><p>Item 2.</p></li>
-<li><p>Item 3.</p></li>
-</ol>
-
-<h2>Nested</h2>
-
-<ul>
-<li>Tab
-<ul>
-<li>Tab
-<ul>
-<li>Tab</li>
-</ul></li>
-</ul></li>
-</ul>
-
-<p>Here's another:</p>
-
-<ol>
-<li>First</li>
-<li>Second:
-<ul>
-<li>Fee</li>
-<li>Fie</li>
-<li>Foe</li>
-</ul></li>
-<li>Third</li>
-</ol>
-
-<p>Same thing but with paragraphs:</p>
-
-<ol>
-<li><p>First</p></li>
-<li><p>Second:</p>
-
-<ul>
-<li>Fee</li>
-<li>Fie</li>
-<li>Foe</li>
-</ul></li>
-<li><p>Third</p></li>
-</ol>
-
-
-<p>This was an error in Markdown 1.0.1:</p>
-
-<ul>
-<li><p>this</p>
-
-<ul><li>sub</li></ul>
-
-<p>that</p></li>
-</ul>
diff --git a/test/javascripts/mdtest/fixtures/Strong and em together.text b/test/javascripts/mdtest/fixtures/Strong and em together.text
deleted file mode 100644
index 95ee690dbe2..00000000000
--- a/test/javascripts/mdtest/fixtures/Strong and em together.text	
+++ /dev/null
@@ -1,7 +0,0 @@
-***This is strong and em.***
-
-So is ***this*** word.
-
-___This is strong and em.___
-
-So is ___this___ word.
diff --git a/test/javascripts/mdtest/fixtures/Strong and em together.xhtml b/test/javascripts/mdtest/fixtures/Strong and em together.xhtml
deleted file mode 100644
index 71ec78c7092..00000000000
--- a/test/javascripts/mdtest/fixtures/Strong and em together.xhtml	
+++ /dev/null
@@ -1,7 +0,0 @@
-<p><strong><em>This is strong and em.</em></strong></p>
-
-<p>So is <strong><em>this</em></strong> word.</p>
-
-<p><strong><em>This is strong and em.</em></strong></p>
-
-<p>So is <strong><em>this</em></strong> word.</p>
diff --git a/test/javascripts/mdtest/fixtures/Tabs.text b/test/javascripts/mdtest/fixtures/Tabs.text
deleted file mode 100644
index 589d1136e19..00000000000
--- a/test/javascripts/mdtest/fixtures/Tabs.text
+++ /dev/null
@@ -1,21 +0,0 @@
-+	this is a list item
-	indented with tabs
-
-+   this is a list item
-    indented with spaces
-
-Code:
-
-	this code block is indented by one tab
-
-And:
-
-		this code block is indented by two tabs
-
-And:
-
-	+	this is an example list item
-		indented with tabs
-	
-	+   this is an example list item
-	    indented with spaces
diff --git a/test/javascripts/mdtest/fixtures/Tabs.xhtml b/test/javascripts/mdtest/fixtures/Tabs.xhtml
deleted file mode 100644
index 3301ba803b7..00000000000
--- a/test/javascripts/mdtest/fixtures/Tabs.xhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<ul>
-<li><p>this is a list item
-indented with tabs</p></li>
-<li><p>this is a list item
-indented with spaces</p></li>
-</ul>
-
-<p>Code:</p>
-
-<pre><code>this code block is indented by one tab
-</code></pre>
-
-<p>And:</p>
-
-<pre><code>    this code block is indented by two tabs
-</code></pre>
-
-<p>And:</p>
-
-<pre><code>+   this is an example list item
-    indented with tabs
-
-+   this is an example list item
-    indented with spaces
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Tidyness.text b/test/javascripts/mdtest/fixtures/Tidyness.text
deleted file mode 100644
index 5f18b8da214..00000000000
--- a/test/javascripts/mdtest/fixtures/Tidyness.text
+++ /dev/null
@@ -1,5 +0,0 @@
-> A list within a blockquote:
-> 
-> *	asterisk 1
-> *	asterisk 2
-> *	asterisk 3
diff --git a/test/javascripts/mdtest/fixtures/Tidyness.xhtml b/test/javascripts/mdtest/fixtures/Tidyness.xhtml
deleted file mode 100644
index f2a8ce70f57..00000000000
--- a/test/javascripts/mdtest/fixtures/Tidyness.xhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<blockquote>
-<p>A list within a blockquote:</p>
-<ul>
-<li>asterisk 1</li>
-<li>asterisk 2</li>
-<li>asterisk 3</li>
-</ul>
-</blockquote>
diff --git a/test/javascripts/mdtest/mdtest.js.es6.erb b/test/javascripts/mdtest/mdtest.js.es6.erb
deleted file mode 100644
index 92047e74130..00000000000
--- a/test/javascripts/mdtest/mdtest.js.es6.erb
+++ /dev/null
@@ -1,87 +0,0 @@
-import { sanitize } from 'pretty-text/sanitizer';
-import { default as PrettyText, buildOptions } from 'pretty-text/pretty-text';
-import { hashString } from 'discourse/lib/hash';
-
-// Run the MDTest spec
-module("MDTest");
-
-// This is cheating, but the trivial differences between sanitization
-// do not affect formatting.
-function normalize(str) {
-  return str.replace(/\n\s*/g, '').
-             replace(/ \/\>/g, '>').
-             replace(/    ?/g, "\t").
-             replace(/&#34;/g, '&quot;');
-}
-
-// We use a custom sanitizer for MD test that hoists out comments. In Discourse
-// they are stripped, but to be compliant with the spec they should not be.
-function sanitizer(result, whiteLister) {
-  let hoisted;
-  const m = result.match(/<!--[\s\S]*?-->/g);
-  if (m && m.length) {
-    hoisted = [];
-    for (let i=0; i<m.length; i++) {
-      const c = m[i];
-      const id = hashString("discourse:hoisted-comment:" + i).toString();
-      result = result.replace(c, id);
-      hoisted.push([c, id]);
-    }
-  }
-
-  result = sanitize(result, whiteLister);
-  if (hoisted) {
-    hoisted.forEach(tuple => result = result.replace(tuple[1], tuple[0]));
-  }
-
-  return result;
-}
-
-function md(input, expected, text, settings) {
-
-  const opts = buildOptions({ siteSettings: settings||{} });
-  opts.traditionalMarkdownLinebreaks = true;
-  opts.sanitizer = sanitizer;
-
-  const cooker = new PrettyText(opts);
-  const result = cooker.cook(input);
-  const resultNorm = normalize(result);
-  const expectedNorm = normalize(expected);
-  const same = (result === expected) || (resultNorm === expectedNorm);
-
-  if (same) {
-    ok(same, text);
-  } else {
-    equal(resultNorm, expectedNorm, text);
-  }
-};
-
-test("first", function(){
-  equal(1, 1, "cool")
-});
-
-<%
-  def mdtest_suite
-    result = ""
-    Dir.glob("#{Rails.root}/test/javascripts/mdtest/fixtures/*.text").each do |f|
-
-      filename_no_ext = f.sub(/\.text$/, '')
-      filename = Pathname.new(filename_no_ext)
-
-      text = File.read(f)
-      html = File.read("#{filename_no_ext}.xhtml");
-      result << "test(\"#{filename}\", function() { md(#{text.to_json}, #{html.to_json}, 'passes MDTest'); });\n"
-    end
-    result
-  end
-%>
-
-<%= mdtest_suite %>
-
-test("whitelisted url scheme", function() {
-  md("[Steam URL Scheme](steam://store/452530)", '<p><a href="steam://store/452530">Steam URL Scheme</a></p>', 'whitelists the steam url', {allowed_href_schemes: "macappstore|steam"});
-});
-
-test("forbidden url scheme", function() {
-  md("[Steam URL Scheme](steam://store/452530)", '<p><a>Steam URL Scheme</a></p>', 'removes the href', {allowed_href_schemes: "macappstore|itunes"});
-});
diff --git a/test/javascripts/mixins/selected-posts-count-test.js.es6 b/test/javascripts/mixins/selected-posts-count-test.js.es6
index c6233a52a30..182ad85de2d 100644
--- a/test/javascripts/mixins/selected-posts-count-test.js.es6
+++ b/test/javascripts/mixins/selected-posts-count-test.js.es6
@@ -1,4 +1,4 @@
-module("mixin:selected-posts-count");
+QUnit.module("mixin:selected-posts-count");
 
 import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
 import Topic from 'discourse/models/topic';
@@ -7,30 +7,30 @@ var buildTestObj = function(params) {
   return Ember.Object.extend(SelectedPostsCount).create(params || {});
 };
 
-test("without selectedPosts", function () {
+QUnit.test("without selectedPosts", assert => {
   var testObj = buildTestObj();
 
-  equal(testObj.get('selectedPostsCount'), 0, "No posts are selected without a selectedPosts property");
+  assert.equal(testObj.get('selectedPostsCount'), 0, "No posts are selected without a selectedPosts property");
 
   testObj.set('selectedPosts', []);
-  equal(testObj.get('selectedPostsCount'), 0, "No posts are selected when selectedPosts is an empty array");
+  assert.equal(testObj.get('selectedPostsCount'), 0, "No posts are selected when selectedPosts is an empty array");
 });
 
-test("with some selectedPosts", function() {
+QUnit.test("with some selectedPosts", assert => {
   var testObj = buildTestObj({ selectedPosts: [Discourse.Post.create({id: 123})] });
-  equal(testObj.get('selectedPostsCount'), 1, "It returns the amount of posts");
+  assert.equal(testObj.get('selectedPostsCount'), 1, "It returns the amount of posts");
 });
 
-test("when all posts are selected and there is a posts_count", function() {
+QUnit.test("when all posts are selected and there is a posts_count", assert => {
   var testObj = buildTestObj({ allPostsSelected: true, posts_count: 1024 });
-  equal(testObj.get('selectedPostsCount'), 1024, "It returns the posts_count");
+  assert.equal(testObj.get('selectedPostsCount'), 1024, "It returns the posts_count");
 });
 
-test("when all posts are selected and there is topic with a posts_count", function() {
+QUnit.test("when all posts are selected and there is topic with a posts_count", assert => {
   var testObj = buildTestObj({
     allPostsSelected: true,
     topic: Topic.create({ posts_count: 3456 })
    });
 
-  equal(testObj.get('selectedPostsCount'), 3456, "It returns the topic's posts_count");
-});
+  assert.equal(testObj.get('selectedPostsCount'), 3456, "It returns the topic's posts_count");
+});
\ No newline at end of file
diff --git a/test/javascripts/mixins/singleton-test.js.es6 b/test/javascripts/mixins/singleton-test.js.es6
index eeca3caa56d..2e5635a4d18 100644
--- a/test/javascripts/mixins/singleton-test.js.es6
+++ b/test/javascripts/mixins/singleton-test.js.es6
@@ -1,45 +1,44 @@
-import { blank, present } from 'helpers/qunit-helpers';
 import Singleton from 'discourse/mixins/singleton';
 
-module("mixin:singleton");
+QUnit.module("mixin:singleton");
 
-test("current", function() {
+QUnit.test("current", assert => {
   var DummyModel = Ember.Object.extend({});
   DummyModel.reopenClass(Singleton);
 
   var current = DummyModel.current();
-  present(current, 'current returns the current instance');
-  equal(current, DummyModel.current(), 'calling it again returns the same instance');
-  notEqual(current, DummyModel.create({}), 'we can create other instances that are not the same as current');
+  assert.present(current, 'current returns the current instance');
+  assert.equal(current, DummyModel.current(), 'calling it again returns the same instance');
+  assert.notEqual(current, DummyModel.create({}), 'we can create other instances that are not the same as current');
 });
 
-test("currentProp reading", function() {
+QUnit.test("currentProp reading", assert => {
   var DummyModel = Ember.Object.extend({});
   DummyModel.reopenClass(Singleton);
   var current = DummyModel.current();
 
-  blank(DummyModel.currentProp('evil'), 'by default attributes are blank');
+  assert.blank(DummyModel.currentProp('evil'), 'by default attributes are blank');
   current.set('evil', 'trout');
-  equal(DummyModel.currentProp('evil'), 'trout', 'after changing the instance, the value is set');
+  assert.equal(DummyModel.currentProp('evil'), 'trout', 'after changing the instance, the value is set');
 });
 
-test("currentProp writing", function() {
+QUnit.test("currentProp writing", assert => {
   var DummyModel = Ember.Object.extend({});
   DummyModel.reopenClass(Singleton);
 
-  blank(DummyModel.currentProp('adventure'), 'by default attributes are blank');
+  assert.blank(DummyModel.currentProp('adventure'), 'by default attributes are blank');
   var result = DummyModel.currentProp('adventure', 'time');
-  equal(result, 'time', 'it returns the new value');
-  equal(DummyModel.currentProp('adventure'), 'time', 'after calling currentProp the value is set');
+  assert.equal(result, 'time', 'it returns the new value');
+  assert.equal(DummyModel.currentProp('adventure'), 'time', 'after calling currentProp the value is set');
 
   DummyModel.currentProp('count', 0);
-  equal(DummyModel.currentProp('count'), 0, 'we can set the value to 0');
+  assert.equal(DummyModel.currentProp('count'), 0, 'we can set the value to 0');
 
   DummyModel.currentProp('adventure', null);
-  equal(DummyModel.currentProp('adventure'), null, 'we can set the value to null');
+  assert.equal(DummyModel.currentProp('adventure'), null, 'we can set the value to null');
 });
 
-test("createCurrent", function() {
+QUnit.test("createCurrent", assert => {
   var Shoe = Ember.Object.extend({});
   Shoe.reopenClass(Singleton, {
     createCurrent: function() {
@@ -47,11 +46,11 @@ test("createCurrent", function() {
     }
   });
 
-  equal(Shoe.currentProp('toes'), 5, 'it created the class using `createCurrent`');
+  assert.equal(Shoe.currentProp('toes'), 5, 'it created the class using `createCurrent`');
 });
 
 
-test("createCurrent that returns null", function() {
+QUnit.test("createCurrent that returns null", assert => {
   var Missing = Ember.Object.extend({});
   Missing.reopenClass(Singleton, {
     createCurrent: function() {
@@ -59,6 +58,6 @@ test("createCurrent that returns null", function() {
     }
   });
 
-  blank(Missing.current(), "it doesn't return an instance");
-  blank(Missing.currentProp('madeup'), "it won't raise an error asking for a property. Will just return null.");
-});
+  assert.blank(Missing.current(), "it doesn't return an instance");
+  assert.blank(Missing.currentProp('madeup'), "it won't raise an error asking for a property. Will just return null.");
+});
\ No newline at end of file
diff --git a/test/javascripts/models/badge-test.js.es6 b/test/javascripts/models/badge-test.js.es6
index 644056d0497..d9a6e0b2d34 100644
--- a/test/javascripts/models/badge-test.js.es6
+++ b/test/javascripts/models/badge-test.js.es6
@@ -1,51 +1,51 @@
 import Badge from 'discourse/models/badge';
 
-module("model:badge");
+QUnit.module("model:badge");
 
-test('newBadge', function() {
+QUnit.test('newBadge', assert => {
   const badge1 = Badge.create({name: "New Badge"}),
       badge2 = Badge.create({id: 1, name: "Old Badge"});
-  ok(badge1.get('newBadge'), "badges without ids are new");
-  ok(!badge2.get('newBadge'), "badges with ids are not new");
+  assert.ok(badge1.get('newBadge'), "badges without ids are new");
+  assert.ok(!badge2.get('newBadge'), "badges with ids are not new");
 });
 
 
-test('createFromJson array', function() {
+QUnit.test('createFromJson array', assert => {
   const badgesJson = {"badge_types":[{"id":6,"name":"Silver 1"}],"badges":[{"id":1126,"name":"Badge 1","description":null,"badge_type_id":6}]};
 
   const badges = Badge.createFromJson(badgesJson);
 
-  ok(Array.isArray(badges), "returns an array");
-  equal(badges[0].get('name'), "Badge 1", "badge details are set");
-  equal(badges[0].get('badge_type.name'), "Silver 1", "badge_type reference is set");
+  assert.ok(Array.isArray(badges), "returns an array");
+  assert.equal(badges[0].get('name'), "Badge 1", "badge details are set");
+  assert.equal(badges[0].get('badge_type.name'), "Silver 1", "badge_type reference is set");
 });
 
-test('createFromJson single', function() {
+QUnit.test('createFromJson single', assert => {
   const badgeJson = {"badge_types":[{"id":6,"name":"Silver 1"}],"badge":{"id":1126,"name":"Badge 1","description":null,"badge_type_id":6}};
 
   const badge = Badge.createFromJson(badgeJson);
 
-  ok(!Array.isArray(badge), "does not returns an array");
+  assert.ok(!Array.isArray(badge), "does not returns an array");
 });
 
-test('updateFromJson', function() {
+QUnit.test('updateFromJson', assert => {
   const badgeJson = {"badge_types":[{"id":6,"name":"Silver 1"}],"badge":{"id":1126,"name":"Badge 1","description":null,"badge_type_id":6}};
   const badge = Badge.create({name: "Badge 1"});
   badge.updateFromJson(badgeJson);
-  equal(badge.get('id'), 1126, "id is set");
-  equal(badge.get('badge_type.name'), "Silver 1", "badge_type reference is set");
+  assert.equal(badge.get('id'), 1126, "id is set");
+  assert.equal(badge.get('badge_type.name'), "Silver 1", "badge_type reference is set");
 });
 
-test('save', function() {
-  expect(0);
+QUnit.test('save', assert => {
+  assert.expect(0);
   const badge = Badge.create({name: "New Badge", description: "This is a new badge.", badge_type_id: 1});
   return badge.save(["name", "description", "badge_type_id"]);
 });
 
-test('destroy', function() {
-  expect(0);
+QUnit.test('destroy', assert => {
+  assert.expect(0);
   const badge = Badge.create({name: "New Badge", description: "This is a new badge.", badge_type_id: 1});
   badge.destroy();
   badge.set('id', 3);
   return badge.destroy();
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/models/category-test.js.es6 b/test/javascripts/models/category-test.js.es6
index ca338686eaa..fc5065566ae 100644
--- a/test/javascripts/models/category-test.js.es6
+++ b/test/javascripts/models/category-test.js.es6
@@ -1,13 +1,13 @@
 import createStore from 'helpers/create-store';
 import Category from 'discourse/models/category';
 
-module("model:category");
+QUnit.module("model:category");
 
-test('slugFor', function(){
+QUnit.test('slugFor', assert =>{
   const store = createStore();
 
   const slugFor = function(cat, val, text) {
-    equal(Discourse.Category.slugFor(cat), val, text);
+    assert.equal(Discourse.Category.slugFor(cat), val, text);
   };
 
   slugFor(store.createRecord('category', {slug: 'hello'}), "hello", "It calculates the proper slug for hello");
@@ -31,8 +31,8 @@ test('slugFor', function(){
 });
 
 
-test('findBySlug', function() {
-  expect(6);
+QUnit.test('findBySlug', assert => {
+  assert.expect(6);
 
   const store = createStore();
   const darth = store.createRecord('category', {id: 1, slug: 'darth'}),
@@ -45,18 +45,18 @@ test('findBySlug', function() {
 
   sandbox.stub(Discourse.Category, 'list').returns(categoryList);
 
-  deepEqual(Discourse.Category.findBySlug('darth'), darth, 'we can find a category');
-  deepEqual(Discourse.Category.findBySlug('luke', 'darth'), luke, 'we can find the other category with parent category');
-  deepEqual(Discourse.Category.findBySlug('熱帶風暴畫眉'), hurricane, 'we can find a category with CJK slug');
-  deepEqual(Discourse.Category.findBySlug('뉴스피드', '熱帶風暴畫眉'), newsFeed, 'we can find a category with CJK slug whose parent slug is also CJK');
-  deepEqual(Discourse.Category.findBySlug('时间', 'darth'), time, 'we can find a category with CJK slug whose parent slug is english');
-  deepEqual(Discourse.Category.findBySlug('bah', '熱帶風暴畫眉'), bah, 'we can find a category with english slug whose parent slug is CJK');
+  assert.deepEqual(Discourse.Category.findBySlug('darth'), darth, 'we can find a category');
+  assert.deepEqual(Discourse.Category.findBySlug('luke', 'darth'), luke, 'we can find the other category with parent category');
+  assert.deepEqual(Discourse.Category.findBySlug('熱帶風暴畫眉'), hurricane, 'we can find a category with CJK slug');
+  assert.deepEqual(Discourse.Category.findBySlug('뉴스피드', '熱帶風暴畫眉'), newsFeed, 'we can find a category with CJK slug whose parent slug is also CJK');
+  assert.deepEqual(Discourse.Category.findBySlug('时间', 'darth'), time, 'we can find a category with CJK slug whose parent slug is english');
+  assert.deepEqual(Discourse.Category.findBySlug('bah', '熱帶風暴畫眉'), bah, 'we can find a category with english slug whose parent slug is CJK');
 
   sandbox.restore();
 });
 
-test('findSingleBySlug', function() {
-  expect(6);
+QUnit.test('findSingleBySlug', assert => {
+  assert.expect(6);
 
   const store = createStore();
   const darth = store.createRecord('category', {id: 1, slug: 'darth'}),
@@ -69,15 +69,15 @@ test('findSingleBySlug', function() {
 
   sandbox.stub(Discourse.Category, 'list').returns(categoryList);
 
-  deepEqual(Discourse.Category.findSingleBySlug('darth'), darth, 'we can find a category');
-  deepEqual(Discourse.Category.findSingleBySlug('darth/luke'), luke, 'we can find the other category with parent category');
-  deepEqual(Discourse.Category.findSingleBySlug('熱帶風暴畫眉'), hurricane, 'we can find a category with CJK slug');
-  deepEqual(Discourse.Category.findSingleBySlug('熱帶風暴畫眉/뉴스피드'), newsFeed, 'we can find a category with CJK slug whose parent slug is also CJK');
-  deepEqual(Discourse.Category.findSingleBySlug('darth/时间'), time, 'we can find a category with CJK slug whose parent slug is english');
-  deepEqual(Discourse.Category.findSingleBySlug('熱帶風暴畫眉/bah'), bah, 'we can find a category with english slug whose parent slug is CJK');
+  assert.deepEqual(Discourse.Category.findSingleBySlug('darth'), darth, 'we can find a category');
+  assert.deepEqual(Discourse.Category.findSingleBySlug('darth/luke'), luke, 'we can find the other category with parent category');
+  assert.deepEqual(Discourse.Category.findSingleBySlug('熱帶風暴畫眉'), hurricane, 'we can find a category with CJK slug');
+  assert.deepEqual(Discourse.Category.findSingleBySlug('熱帶風暴畫眉/뉴스피드'), newsFeed, 'we can find a category with CJK slug whose parent slug is also CJK');
+  assert.deepEqual(Discourse.Category.findSingleBySlug('darth/时间'), time, 'we can find a category with CJK slug whose parent slug is english');
+  assert.deepEqual(Discourse.Category.findSingleBySlug('熱帶風暴畫眉/bah'), bah, 'we can find a category with english slug whose parent slug is CJK');
 });
 
-test('findByIds', function() {
+QUnit.test('findByIds', assert => {
   const store = createStore();
   const categories =  {
     1: store.createRecord('category', {id: 1}),
@@ -85,25 +85,25 @@ test('findByIds', function() {
   };
 
   sandbox.stub(Discourse.Category, 'idMap').returns(categories);
-  deepEqual(Discourse.Category.findByIds([1,2,3]), _.values(categories));
+  assert.deepEqual(Discourse.Category.findByIds([1,2,3]), _.values(categories));
 });
 
-test('search with category name', () => {
+QUnit.test('search with category name', assert => {
   const store = createStore(),
         category1 = store.createRecord('category', { id: 1, name: 'middle term', slug: 'different-slug' }),
         category2 = store.createRecord('category', { id: 2, name: 'middle term', slug: 'another-different-slug' });
 
   sandbox.stub(Category, "listByActivity").returns([category1, category2]);
 
-  deepEqual(Category.search('term', { limit: 0 }), [], "returns an empty array when limit is 0");
-  deepEqual(Category.search(''), [category1, category2], "orders by activity if no term is matched");
-  deepEqual(Category.search('term'), [category1, category2], "orders by activity");
+  assert.deepEqual(Category.search('term', { limit: 0 }), [], "returns an empty array when limit is 0");
+  assert.deepEqual(Category.search(''), [category1, category2], "orders by activity if no term is matched");
+  assert.deepEqual(Category.search('term'), [category1, category2], "orders by activity");
 
   category2.set('name', 'TeRm start');
-  deepEqual(Category.search('tErM'), [category2, category1], "ignores case of category name and search term");
+  assert.deepEqual(Category.search('tErM'), [category2, category1], "ignores case of category name and search term");
 
   category2.set('name', 'term start');
-  deepEqual(Category.search('term'), [category2, category1], "orders matching begin with and then contains");
+  assert.deepEqual(Category.search('term'), [category2, category1], "orders matching begin with and then contains");
 
   sandbox.restore();
 
@@ -112,35 +112,35 @@ test('search with category name', () => {
 
   sandbox.stub(Category, "listByActivity").returns([read_restricted_category, category1, child_category1, category2]);
 
-  deepEqual(Category.search(''),
+  assert.deepEqual(Category.search(''),
             [category1, category2, read_restricted_category],
             "prioritize non read_restricted and does not include child categories when term is blank");
 
-  deepEqual(Category.search('', { limit: 3 }),
+  assert.deepEqual(Category.search('', { limit: 3 }),
             [category1, category2, read_restricted_category],
             "prioritize non read_restricted and does not include child categories categories when term is blank with limit");
 
-  deepEqual(Category.search('term'),
+  assert.deepEqual(Category.search('term'),
             [child_category1, category2, category1, read_restricted_category],
             "prioritize non read_restricted");
 
-  deepEqual(Category.search('term', { limit: 3 }),
+  assert.deepEqual(Category.search('term', { limit: 3 }),
             [child_category1, category2, read_restricted_category],
             "prioritize non read_restricted with limit");
 
   sandbox.restore();
 });
 
-test('search with category slug', () => {
+QUnit.test('search with category slug', assert => {
   const store = createStore(),
         category1 = store.createRecord('category', { id: 1, name: 'middle term', slug: 'different-slug' }),
         category2 = store.createRecord('category', { id: 2, name: 'middle term', slug: 'another-different-slug' });
 
   sandbox.stub(Category, "listByActivity").returns([category1, category2]);
 
-  deepEqual(Category.search('different-slug'), [category1, category2], "returns the right categories");
-  deepEqual(Category.search('another-different'), [category2], "returns the right categories");
+  assert.deepEqual(Category.search('different-slug'), [category1, category2], "returns the right categories");
+  assert.deepEqual(Category.search('another-different'), [category2], "returns the right categories");
 
   category2.set('slug', 'ANOTher-DIFfereNT');
-  deepEqual(Category.search('anOtHer-dIfFeREnt'), [category2], "ignores case of category slug and search term");
+  assert.deepEqual(Category.search('anOtHer-dIfFeREnt'), [category2], "ignores case of category slug and search term");
 });
diff --git a/test/javascripts/models/composer-test.js.es6 b/test/javascripts/models/composer-test.js.es6
index 039d3a18d5d..02475ddb4b6 100644
--- a/test/javascripts/models/composer-test.js.es6
+++ b/test/javascripts/models/composer-test.js.es6
@@ -1,9 +1,8 @@
-import { blank } from 'helpers/qunit-helpers';
 import { currentUser } from 'helpers/qunit-helpers';
 import Composer from 'discourse/models/composer';
 import createStore from 'helpers/create-store';
 
-module("model:composer");
+QUnit.module("model:composer");
 
 function createComposer(opts) {
   opts = opts || {};
@@ -17,10 +16,10 @@ function openComposer(opts) {
   return composer;
 }
 
-test('replyLength', function() {
+QUnit.test('replyLength', assert => {
   const replyLength = function(val, expectedLength) {
     const composer = createComposer({ reply: val });
-    equal(composer.get('replyLength'), expectedLength);
+    assert.equal(composer.get('replyLength'), expectedLength);
   };
 
   replyLength("basic reply", 11, "basic reply length");
@@ -30,11 +29,11 @@ test('replyLength', function() {
   replyLength("1[quote=]not[quote=]counted[/quote]yay[/quote]2", 2, "handles nested quotes correctly");
 });
 
-test('missingReplyCharacters', function() {
+QUnit.test('missingReplyCharacters', assert => {
   Discourse.SiteSettings.min_first_post_length = 40;
   const missingReplyCharacters = function(val, isPM, isFirstPost, expected, message) {
     const composer = createComposer({ reply: val, creatingPrivateMessage: isPM, creatingTopic: isFirstPost });
-    equal(composer.get('missingReplyCharacters'), expected, message);
+    assert.equal(composer.get('missingReplyCharacters'), expected, message);
   };
 
   missingReplyCharacters('hi', false, false, Discourse.SiteSettings.min_post_length - 2, 'too short public post');
@@ -44,144 +43,144 @@ test('missingReplyCharacters', function() {
   const link = "http://imgur.com/gallery/grxX8";
   const composer = createComposer({ canEditTopicFeaturedLink: true, title: link, featuredLink: link, reply: link });
 
-  equal(composer.get('missingReplyCharacters'), 0, "don't require any post content");
+  assert.equal(composer.get('missingReplyCharacters'), 0, "don't require any post content");
 });
 
-test('missingTitleCharacters', function() {
+QUnit.test('missingTitleCharacters', assert => {
   const missingTitleCharacters = function(val, isPM, expected, message) {
     const composer = createComposer({ title: val, creatingPrivateMessage: isPM });
-    equal(composer.get('missingTitleCharacters'), expected, message);
+    assert.equal(composer.get('missingTitleCharacters'), expected, message);
   };
 
   missingTitleCharacters('hi', false, Discourse.SiteSettings.min_topic_title_length - 2, 'too short post title');
   missingTitleCharacters('z', true,  Discourse.SiteSettings.min_private_message_title_length - 1, 'too short pm title');
 });
 
-test('replyDirty', function() {
+QUnit.test('replyDirty', assert => {
   const composer = createComposer();
-  ok(!composer.get('replyDirty'), "by default it's false");
+  assert.ok(!composer.get('replyDirty'), "by default it's false");
 
   composer.setProperties({
     originalText: "hello",
     reply: "hello"
   });
 
-  ok(!composer.get('replyDirty'), "it's false when the originalText is the same as the reply");
+  assert.ok(!composer.get('replyDirty'), "it's false when the originalText is the same as the reply");
   composer.set('reply', 'hello world');
-  ok(composer.get('replyDirty'), "it's true when the reply changes");
+  assert.ok(composer.get('replyDirty'), "it's true when the reply changes");
 });
 
-test("appendText", function() {
+QUnit.test("appendText", assert => {
   const composer = createComposer();
 
-  blank(composer.get('reply'), "the reply is blank by default");
+  assert.blank(composer.get('reply'), "the reply is blank by default");
 
   composer.appendText("hello");
-  equal(composer.get('reply'), "hello", "it appends text to nothing");
+  assert.equal(composer.get('reply'), "hello", "it appends text to nothing");
   composer.appendText(" world");
-  equal(composer.get('reply'), "hello world", "it appends text to existing text");
+  assert.equal(composer.get('reply'), "hello world", "it appends text to existing text");
 
   composer.clearState();
   composer.appendText("a\n\n\n\nb");
   composer.appendText("c",3,{block: true});
 
-  equal(composer.get("reply"), "a\n\nc\n\nb");
+  assert.equal(composer.get("reply"), "a\n\nc\n\nb");
 
   composer.clearState();
   composer.appendText("ab");
   composer.appendText("c",1,{block: true});
 
-  equal(composer.get("reply"), "a\n\nc\n\nb");
+  assert.equal(composer.get("reply"), "a\n\nc\n\nb");
 
   composer.clearState();
   composer.appendText("\nab");
   composer.appendText("c",0,{block: true});
 
-  equal(composer.get("reply"), "c\n\nab");
+  assert.equal(composer.get("reply"), "c\n\nab");
 });
 
-test("prependText", function() {
+QUnit.test("prependText", assert => {
   const composer = createComposer();
 
-  blank(composer.get('reply'), "the reply is blank by default");
+  assert.blank(composer.get('reply'), "the reply is blank by default");
 
   composer.prependText("hello");
-  equal(composer.get('reply'), "hello", "it prepends text to nothing");
+  assert.equal(composer.get('reply'), "hello", "it prepends text to nothing");
 
   composer.prependText("world ");
-  equal(composer.get('reply'), "world hello", "it prepends text to existing text");
+  assert.equal(composer.get('reply'), "world hello", "it prepends text to existing text");
 
   composer.prependText("before new line", {new_line: true});
-  equal(composer.get('reply'), "before new line\n\nworld hello", "it prepends text with new line to existing text");
+  assert.equal(composer.get('reply'), "before new line\n\nworld hello", "it prepends text with new line to existing text");
 });
 
-test("Title length for regular topics", function() {
+QUnit.test("Title length for regular topics", assert => {
   Discourse.SiteSettings.min_topic_title_length = 5;
   Discourse.SiteSettings.max_topic_title_length = 10;
   const composer = createComposer();
 
   composer.set('title', 'asdf');
-  ok(!composer.get('titleLengthValid'), "short titles are not valid");
+  assert.ok(!composer.get('titleLengthValid'), "short titles are not valid");
 
   composer.set('title', 'this is a long title');
-  ok(!composer.get('titleLengthValid'), "long titles are not valid");
+  assert.ok(!composer.get('titleLengthValid'), "long titles are not valid");
 
   composer.set('title', 'just right');
-  ok(composer.get('titleLengthValid'), "in the range is okay");
+  assert.ok(composer.get('titleLengthValid'), "in the range is okay");
 });
 
-test("Title length for private messages", function() {
+QUnit.test("Title length for private messages", assert => {
   Discourse.SiteSettings.min_private_message_title_length = 5;
   Discourse.SiteSettings.max_topic_title_length = 10;
   const composer = createComposer({action: Composer.PRIVATE_MESSAGE});
 
   composer.set('title', 'asdf');
-  ok(!composer.get('titleLengthValid'), "short titles are not valid");
+  assert.ok(!composer.get('titleLengthValid'), "short titles are not valid");
 
   composer.set('title', 'this is a long title');
-  ok(!composer.get('titleLengthValid'), "long titles are not valid");
+  assert.ok(!composer.get('titleLengthValid'), "long titles are not valid");
 
   composer.set('title', 'just right');
-  ok(composer.get('titleLengthValid'), "in the range is okay");
+  assert.ok(composer.get('titleLengthValid'), "in the range is okay");
 });
 
-test("Title length for private messages", function() {
+QUnit.test("Title length for private messages", assert => {
   Discourse.SiteSettings.min_private_message_title_length = 5;
   Discourse.SiteSettings.max_topic_title_length = 10;
   const composer = createComposer({action: Composer.PRIVATE_MESSAGE});
 
   composer.set('title', 'asdf');
-  ok(!composer.get('titleLengthValid'), "short titles are not valid");
+  assert.ok(!composer.get('titleLengthValid'), "short titles are not valid");
 
   composer.set('title', 'this is a long title');
-  ok(!composer.get('titleLengthValid'), "long titles are not valid");
+  assert.ok(!composer.get('titleLengthValid'), "long titles are not valid");
 
   composer.set('title', 'just right');
-  ok(composer.get('titleLengthValid'), "in the range is okay");
+  assert.ok(composer.get('titleLengthValid'), "in the range is okay");
 });
 
-test("Post length for private messages with non human users", function() {
+QUnit.test("Post length for private messages with non human users", assert => {
   const composer = createComposer({
     topic: Ember.Object.create({ pm_with_non_human_user: true })
   });
 
-  equal(composer.get('minimumPostLength'), 1);
+  assert.equal(composer.get('minimumPostLength'), 1);
 });
 
-test('editingFirstPost', function() {
+QUnit.test('editingFirstPost', assert => {
   const composer = createComposer();
-  ok(!composer.get('editingFirstPost'), "it's false by default");
+  assert.ok(!composer.get('editingFirstPost'), "it's false by default");
 
   const post = Discourse.Post.create({id: 123, post_number: 2});
   composer.setProperties({post: post, action: Composer.EDIT });
-  ok(!composer.get('editingFirstPost'), "it's false when not editing the first post");
+  assert.ok(!composer.get('editingFirstPost'), "it's false when not editing the first post");
 
   post.set('post_number', 1);
-  ok(composer.get('editingFirstPost'), "it's true when editing the first post");
+  assert.ok(composer.get('editingFirstPost'), "it's true when editing the first post");
 
 });
 
-test('clearState', function() {
+QUnit.test('clearState', assert => {
   const composer = createComposer({
     originalText: 'asdf',
     reply: 'asdf2',
@@ -191,36 +190,36 @@ test('clearState', function() {
 
   composer.clearState();
 
-  blank(composer.get('originalText'));
-  blank(composer.get('reply'));
-  blank(composer.get('post'));
-  blank(composer.get('title'));
+  assert.blank(composer.get('originalText'));
+  assert.blank(composer.get('reply'));
+  assert.blank(composer.get('post'));
+  assert.blank(composer.get('title'));
 
 });
 
-test('initial category when uncategorized is allowed', function() {
+QUnit.test('initial category when uncategorized is allowed', assert => {
   Discourse.SiteSettings.allow_uncategorized_topics = true;
   const composer = openComposer({action: 'createTopic', draftKey: 'asfd', draftSequence: 1});
-  ok(!composer.get('categoryId'), "Uncategorized by default");
+  assert.ok(!composer.get('categoryId'), "Uncategorized by default");
 });
 
-test('initial category when uncategorized is not allowed', function() {
+QUnit.test('initial category when uncategorized is not allowed', assert => {
   Discourse.SiteSettings.allow_uncategorized_topics = false;
   const composer = openComposer({action: 'createTopic', draftKey: 'asfd', draftSequence: 1});
-  ok(!composer.get('categoryId'), "Uncategorized by default. Must choose a category.");
+  assert.ok(!composer.get('categoryId'), "Uncategorized by default. Must choose a category.");
 });
 
-test('open with a quote', function() {
+QUnit.test('open with a quote', assert => {
   const quote = '[quote="neil, post:5, topic:413"]\nSimmer down you two.\n[/quote]';
   const newComposer = function() {
     return openComposer({action: Composer.REPLY, draftKey: 'asfd', draftSequence: 1, quote: quote});
   };
 
-  equal(newComposer().get('originalText'), quote, "originalText is the quote" );
-  equal(newComposer().get('replyDirty'), false, "replyDirty is initally false with a quote" );
+  assert.equal(newComposer().get('originalText'), quote, "originalText is the quote" );
+  assert.equal(newComposer().get('replyDirty'), false, "replyDirty is initally false with a quote" );
 });
 
-test("Title length for static page topics as admin", function() {
+QUnit.test("Title length for static page topics as admin", assert => {
   Discourse.SiteSettings.min_topic_title_length = 5;
   Discourse.SiteSettings.max_topic_title_length = 10;
   const composer = createComposer();
@@ -229,38 +228,38 @@ test("Title length for static page topics as admin", function() {
   composer.setProperties({post: post, action: Composer.EDIT });
 
   composer.set('title', 'asdf');
-  ok(composer.get('titleLengthValid'), "admins can use short titles");
+  assert.ok(composer.get('titleLengthValid'), "admins can use short titles");
 
   composer.set('title', 'this is a long title');
-  ok(composer.get('titleLengthValid'), "admins can use long titles");
+  assert.ok(composer.get('titleLengthValid'), "admins can use long titles");
 
   composer.set('title', 'just right');
-  ok(composer.get('titleLengthValid'), "in the range is okay");
+  assert.ok(composer.get('titleLengthValid'), "in the range is okay");
 
   composer.set('title', '');
-  ok(!composer.get('titleLengthValid'), "admins must set title to at least 1 character");
+  assert.ok(!composer.get('titleLengthValid'), "admins must set title to at least 1 character");
 });
 
-test("title placeholder depends on what you're doing", function() {
+QUnit.test("title placeholder depends on what you're doing", assert => {
   let composer = createComposer({action: Composer.CREATE_TOPIC});
-  equal(composer.get('titlePlaceholder'), 'composer.title_placeholder', "placeholder for normal topic");
+  assert.equal(composer.get('titlePlaceholder'), 'composer.title_placeholder', "placeholder for normal topic");
 
   composer = createComposer({action: Composer.PRIVATE_MESSAGE});
-  equal(composer.get('titlePlaceholder'), 'composer.title_placeholder', "placeholder for private message");
+  assert.equal(composer.get('titlePlaceholder'), 'composer.title_placeholder', "placeholder for private message");
 
   Discourse.SiteSettings.topic_featured_link_enabled = true;
 
   composer = createComposer({action: Composer.CREATE_TOPIC});
-  equal(composer.get('titlePlaceholder'), 'composer.title_or_link_placeholder', "placeholder invites you to paste a link");
+  assert.equal(composer.get('titlePlaceholder'), 'composer.title_or_link_placeholder', "placeholder invites you to paste a link");
 
   composer = createComposer({action: Composer.PRIVATE_MESSAGE});
-  equal(composer.get('titlePlaceholder'), 'composer.title_placeholder', "placeholder for private message with topic links enabled");
+  assert.equal(composer.get('titlePlaceholder'), 'composer.title_placeholder', "placeholder for private message with topic links enabled");
 });
 
-test("allows featured link before choosing a category", function() {
+QUnit.test("allows featured link before choosing a category", assert => {
   Discourse.SiteSettings.topic_featured_link_enabled = true;
   Discourse.SiteSettings.allow_uncategorized_topics = false;
   let composer = createComposer({action: Composer.CREATE_TOPIC});
-  equal(composer.get('titlePlaceholder'), 'composer.title_or_link_placeholder', "placeholder invites you to paste a link");
-  ok(composer.get('canEditTopicFeaturedLink'), "can paste link");
-});
+  assert.equal(composer.get('titlePlaceholder'), 'composer.title_or_link_placeholder', "placeholder invites you to paste a link");
+  assert.ok(composer.get('canEditTopicFeaturedLink'), "can paste link");
+});
\ No newline at end of file
diff --git a/test/javascripts/models/email-log-test.js.es6 b/test/javascripts/models/email-log-test.js.es6
index 98d4b714f9c..be18f9190f4 100644
--- a/test/javascripts/models/email-log-test.js.es6
+++ b/test/javascripts/models/email-log-test.js.es6
@@ -1,7 +1,7 @@
 import EmailLog from 'admin/models/email-log';
 
-module("Discourse.EmailLog");
+QUnit.module("Discourse.EmailLog");
 
-test("create", function() {
-  ok(EmailLog.create(), "it can be created without arguments");
-});
+QUnit.test("create", assert => {
+  assert.ok(EmailLog.create(), "it can be created without arguments");
+});
\ No newline at end of file
diff --git a/test/javascripts/models/group-test.js.es6 b/test/javascripts/models/group-test.js.es6
index 60f04ed1bbb..3a74d635dd3 100644
--- a/test/javascripts/models/group-test.js.es6
+++ b/test/javascripts/models/group-test.js.es6
@@ -1,13 +1,13 @@
 import Group from 'discourse/models/group';
 
-module("model:group");
+QUnit.module("model:group");
 
-test('displayName', function() {
+QUnit.test('displayName', assert => {
   const group = Group.create({ name: "test", display_name: 'donkey'  });
 
-  ok(group.get('displayName'), "donkey", 'it should return the display name');
+  assert.ok(group.get('displayName'), "donkey", 'it should return the display name');
 
   group.set('display_name', null);
 
-  ok(group.get('displayName'), "test", "it should return the group's name");
-});
+  assert.ok(group.get('displayName'), "test", "it should return the group's name");
+});
\ No newline at end of file
diff --git a/test/javascripts/models/invite-test.js.es6 b/test/javascripts/models/invite-test.js.es6
index e55a414293a..0cdc361fca6 100644
--- a/test/javascripts/models/invite-test.js.es6
+++ b/test/javascripts/models/invite-test.js.es6
@@ -1,7 +1,7 @@
 import Invite from 'discourse/models/invite';
 
-module("model:invite");
+QUnit.module("model:invite");
 
-test("create", function() {
-  ok(Invite.create(), "it can be created without arguments");
-});
+QUnit.test("create", assert => {
+  assert.ok(Invite.create(), "it can be created without arguments");
+});
\ No newline at end of file
diff --git a/test/javascripts/models/model-test.js.es6 b/test/javascripts/models/model-test.js.es6
index 3270af8a555..dba22bd390a 100644
--- a/test/javascripts/models/model-test.js.es6
+++ b/test/javascripts/models/model-test.js.es6
@@ -1,8 +1,8 @@
 import Model from 'discourse/models/model';
 
-module("model:discourse");
+QUnit.module("model:discourse");
 
-test("extractByKey: converts a list of hashes into a hash of instances of specified class, indexed by their ids", function() {
+QUnit.test("extractByKey: converts a list of hashes into a hash of instances of specified class, indexed by their ids", assert => {
   var firstObject = {id: "id_1", foo: "foo_1"};
   var secondObject = {id: "id_2", foo: "foo_2"};
 
@@ -12,10 +12,10 @@ test("extractByKey: converts a list of hashes into a hash of instances of specif
     id_2: Ember.Object.create(secondObject)
   };
 
-  ok(_.isEqual(actual, expected));
+  assert.ok(_.isEqual(actual, expected));
 });
 
-test("extractByKey: returns an empty hash if there isn't anything to convert", function() {
-  deepEqual(Model.extractByKey(), {}, "when called without parameters");
-  deepEqual(Model.extractByKey([]), {}, "when called with an empty array");
+QUnit.test("extractByKey: returns an empty hash if there isn't anything to convert", assert => {
+  assert.deepEqual(Model.extractByKey(), {}, "when called without parameters");
+  assert.deepEqual(Model.extractByKey([]), {}, "when called with an empty array");
 });
diff --git a/test/javascripts/models/nav-item-test.js.es6 b/test/javascripts/models/nav-item-test.js.es6
index 1af1bb14eac..15b75bc0dc6 100644
--- a/test/javascripts/models/nav-item-test.js.es6
+++ b/test/javascripts/models/nav-item-test.js.es6
@@ -1,6 +1,5 @@
-
-module("Discourse.NavItem", {
-  setup: function() {
+QUnit.module("Discourse.NavItem", {
+  beforeEach() {
     Ember.run(function() {
       const asianCategory = Discourse.Category.create({name: '确实是这样', id: 343434});
       Discourse.Site.currentProp('categories').addObject(asianCategory);
@@ -8,11 +7,11 @@ module("Discourse.NavItem", {
   }
 });
 
-test('href', function(){
-  expect(4);
+QUnit.test('href', assert =>{
+  assert.expect(4);
 
   function href(text, expected, label) {
-    equal(Discourse.NavItem.fromText(text, {}).get('href'), expected, label);
+    assert.equal(Discourse.NavItem.fromText(text, {}).get('href'), expected, label);
   }
 
   href('latest', '/latest', 'latest');
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6
index b0c455e8fa9..7418102a173 100644
--- a/test/javascripts/models/post-stream-test.js.es6
+++ b/test/javascripts/models/post-stream-test.js.es6
@@ -1,5 +1,4 @@
-import { blank, present } from 'helpers/qunit-helpers';
-module("model:post-stream");
+QUnit.module("model:post-stream");
 
 import createStore from 'helpers/create-store';
 
@@ -15,93 +14,93 @@ const buildStream = function(id, stream) {
 
 const participant = {username: 'eviltrout'};
 
-test('create', function() {
+QUnit.test('create', assert => {
   const store = createStore();
-  ok(store.createRecord('postStream'), 'it can be created with no parameters');
+  assert.ok(store.createRecord('postStream'), 'it can be created with no parameters');
 });
 
-test('defaults', function() {
+QUnit.test('defaults', assert => {
   const postStream = buildStream(1234);
-  blank(postStream.get('posts'), "there are no posts in a stream by default");
-  ok(!postStream.get('loaded'), "it has never loaded");
-  present(postStream.get('topic'));
+  assert.blank(postStream.get('posts'), "there are no posts in a stream by default");
+  assert.ok(!postStream.get('loaded'), "it has never loaded");
+  assert.present(postStream.get('topic'));
 });
 
-test('appending posts', function() {
+QUnit.test('appending posts', assert => {
   const postStream = buildStream(4567, [1, 3, 4]);
   const store = postStream.store;
 
-  equal(postStream.get('firstPostId'), 1);
-  equal(postStream.get('lastPostId'), 4, "the last post id is 4");
+  assert.equal(postStream.get('firstPostId'), 1);
+  assert.equal(postStream.get('lastPostId'), 4, "the last post id is 4");
 
-  ok(!postStream.get('hasPosts'), "there are no posts by default");
-  ok(!postStream.get('firstPostPresent'), "the first post is not loaded");
-  ok(!postStream.get('loadedAllPosts'), "the last post is not loaded");
-  equal(postStream.get('posts.length'), 0, "it has no posts initially");
+  assert.ok(!postStream.get('hasPosts'), "there are no posts by default");
+  assert.ok(!postStream.get('firstPostPresent'), "the first post is not loaded");
+  assert.ok(!postStream.get('loadedAllPosts'), "the last post is not loaded");
+  assert.equal(postStream.get('posts.length'), 0, "it has no posts initially");
 
   postStream.appendPost(store.createRecord('post', {id: 2, post_number: 2}));
-  ok(!postStream.get('firstPostPresent'), "the first post is still not loaded");
-  equal(postStream.get('posts.length'), 1, "it has one post in the stream");
+  assert.ok(!postStream.get('firstPostPresent'), "the first post is still not loaded");
+  assert.equal(postStream.get('posts.length'), 1, "it has one post in the stream");
 
   postStream.appendPost(store.createRecord('post', {id: 4, post_number: 4}));
-  ok(!postStream.get('firstPostPresent'), "the first post is still loaded");
-  ok(postStream.get('loadedAllPosts'), "the last post is now loaded");
-  equal(postStream.get('posts.length'), 2, "it has two posts in the stream");
+  assert.ok(!postStream.get('firstPostPresent'), "the first post is still loaded");
+  assert.ok(postStream.get('loadedAllPosts'), "the last post is now loaded");
+  assert.equal(postStream.get('posts.length'), 2, "it has two posts in the stream");
 
   postStream.appendPost(store.createRecord('post', {id: 4, post_number: 4}));
-  equal(postStream.get('posts.length'), 2, "it will not add the same post with id twice");
+  assert.equal(postStream.get('posts.length'), 2, "it will not add the same post with id twice");
 
   const stagedPost = store.createRecord('post', {raw: 'incomplete post'});
   postStream.appendPost(stagedPost);
-  equal(postStream.get('posts.length'), 3, "it can handle posts without ids");
+  assert.equal(postStream.get('posts.length'), 3, "it can handle posts without ids");
   postStream.appendPost(stagedPost);
-  equal(postStream.get('posts.length'), 3, "it won't add the same post without an id twice");
+  assert.equal(postStream.get('posts.length'), 3, "it won't add the same post without an id twice");
 
   // change the stream
   postStream.set('stream', [1, 2, 4]);
-  ok(!postStream.get('firstPostPresent'), "the first post no longer loaded since the stream changed.");
-  ok(postStream.get('loadedAllPosts'), "the last post is still the last post in the new stream");
+  assert.ok(!postStream.get('firstPostPresent'), "the first post no longer loaded since the stream changed.");
+  assert.ok(postStream.get('loadedAllPosts'), "the last post is still the last post in the new stream");
 });
 
-test('closestPostNumberFor', function() {
+QUnit.test('closestPostNumberFor', assert => {
   const postStream = buildStream(1231);
   const store = postStream.store;
 
-  blank(postStream.closestPostNumberFor(1), "there is no closest post when nothing is loaded");
+  assert.blank(postStream.closestPostNumberFor(1), "there is no closest post when nothing is loaded");
 
   postStream.appendPost(store.createRecord('post', {id: 1, post_number: 2}));
   postStream.appendPost(store.createRecord('post', {id: 2, post_number: 3}));
 
-  equal(postStream.closestPostNumberFor(2), 2, "If a post is in the stream it returns its post number");
-  equal(postStream.closestPostNumberFor(3), 3, "If a post is in the stream it returns its post number");
-  equal(postStream.closestPostNumberFor(10), 3, "it clips to the upper bound of the stream");
-  equal(postStream.closestPostNumberFor(0), 2, "it clips to the lower bound of the stream");
+  assert.equal(postStream.closestPostNumberFor(2), 2, "If a post is in the stream it returns its post number");
+  assert.equal(postStream.closestPostNumberFor(3), 3, "If a post is in the stream it returns its post number");
+  assert.equal(postStream.closestPostNumberFor(10), 3, "it clips to the upper bound of the stream");
+  assert.equal(postStream.closestPostNumberFor(0), 2, "it clips to the lower bound of the stream");
 });
 
-test('closestDaysAgoFor', function() {
+QUnit.test('closestDaysAgoFor', assert => {
   const postStream = buildStream(1231);
   postStream.set('timelineLookup', [[1, 10], [3, 8], [5, 1]]);
 
-  equal(postStream.closestDaysAgoFor(1), 10);
-  equal(postStream.closestDaysAgoFor(2), 10);
-  equal(postStream.closestDaysAgoFor(3), 8);
-  equal(postStream.closestDaysAgoFor(4), 8);
-  equal(postStream.closestDaysAgoFor(5), 1);
+  assert.equal(postStream.closestDaysAgoFor(1), 10);
+  assert.equal(postStream.closestDaysAgoFor(2), 10);
+  assert.equal(postStream.closestDaysAgoFor(3), 8);
+  assert.equal(postStream.closestDaysAgoFor(4), 8);
+  assert.equal(postStream.closestDaysAgoFor(5), 1);
 
   // Out of bounds
-  equal(postStream.closestDaysAgoFor(-1), 10);
-  equal(postStream.closestDaysAgoFor(0), 10);
-  equal(postStream.closestDaysAgoFor(10), 1);
+  assert.equal(postStream.closestDaysAgoFor(-1), 10);
+  assert.equal(postStream.closestDaysAgoFor(0), 10);
+  assert.equal(postStream.closestDaysAgoFor(10), 1);
 });
 
-test('closestDaysAgoFor - empty', function() {
+QUnit.test('closestDaysAgoFor - empty', assert => {
   const postStream = buildStream(1231);
   postStream.set('timelineLookup', []);
 
-  equal(postStream.closestDaysAgoFor(1), null);
+  assert.equal(postStream.closestDaysAgoFor(1), null);
 });
 
-test('updateFromJson', function() {
+QUnit.test('updateFromJson', assert => {
   const postStream = buildStream(1231);
 
   postStream.updateFromJson({
@@ -110,13 +109,13 @@ test('updateFromJson', function() {
     extra_property: 12
   });
 
-  equal(postStream.get('posts.length'), 1, 'it loaded the posts');
-  containsInstance(postStream.get('posts'), Discourse.Post);
+  assert.equal(postStream.get('posts.length'), 1, 'it loaded the posts');
+  assert.containsInstance(postStream.get('posts'), Discourse.Post);
 
-  equal(postStream.get('extra_property'), 12);
+  assert.equal(postStream.get('extra_property'), 12);
 });
 
-test("removePosts", function() {
+QUnit.test("removePosts", assert => {
   const postStream = buildStream(10000001, [1,2,3]);
   const store = postStream.store;
 
@@ -130,179 +129,179 @@ test("removePosts", function() {
 
   // Removing nothing does nothing
   postStream.removePosts();
-  equal(postStream.get('posts.length'), 3);
+  assert.equal(postStream.get('posts.length'), 3);
 
   postStream.removePosts([p1, p3]);
-  equal(postStream.get('posts.length'), 1);
-  deepEqual(postStream.get('stream'), [2]);
+  assert.equal(postStream.get('posts.length'), 1);
+  assert.deepEqual(postStream.get('stream'), [2]);
 
 });
 
-test("cancelFilter", function() {
+QUnit.test("cancelFilter", assert => {
   const postStream = buildStream(1235);
 
   sandbox.stub(postStream, "refresh").returns(new Ember.RSVP.resolve());
 
   postStream.set('summary', true);
   postStream.cancelFilter();
-  ok(!postStream.get('summary'), "summary is cancelled");
+  assert.ok(!postStream.get('summary'), "summary is cancelled");
 
   postStream.toggleParticipant(participant);
   postStream.cancelFilter();
-  blank(postStream.get('userFilters'), "cancelling the filters clears the userFilters");
+  assert.blank(postStream.get('userFilters'), "cancelling the filters clears the userFilters");
 });
 
-test("findPostIdForPostNumber", function() {
+QUnit.test("findPostIdForPostNumber", assert => {
   const postStream = buildStream(1234, [10, 20, 30, 40, 50, 60, 70]);
   postStream.set('gaps', { before: { 60: [55, 58] } });
 
-  equal(postStream.findPostIdForPostNumber(500), null, 'it returns null when the post cannot be found');
-  equal(postStream.findPostIdForPostNumber(1), 10, 'it finds the postId at the beginning');
-  equal(postStream.findPostIdForPostNumber(5), 50, 'it finds the postId in the middle');
-  equal(postStream.findPostIdForPostNumber(8), 60, 'it respects gaps');
+  assert.equal(postStream.findPostIdForPostNumber(500), null, 'it returns null when the post cannot be found');
+  assert.equal(postStream.findPostIdForPostNumber(1), 10, 'it finds the postId at the beginning');
+  assert.equal(postStream.findPostIdForPostNumber(5), 50, 'it finds the postId in the middle');
+  assert.equal(postStream.findPostIdForPostNumber(8), 60, 'it respects gaps');
 
 });
 
-test("toggleParticipant", function() {
+QUnit.test("toggleParticipant", assert => {
   const postStream = buildStream(1236);
   sandbox.stub(postStream, "refresh").returns(new Ember.RSVP.resolve());
 
-  equal(postStream.get('userFilters.length'), 0, "by default no participants are toggled");
+  assert.equal(postStream.get('userFilters.length'), 0, "by default no participants are toggled");
 
   postStream.toggleParticipant(participant.username);
-  ok(postStream.get('userFilters').includes('eviltrout'), 'eviltrout is in the filters');
+  assert.ok(postStream.get('userFilters').includes('eviltrout'), 'eviltrout is in the filters');
 
   postStream.toggleParticipant(participant.username);
-  blank(postStream.get('userFilters'), "toggling the participant again removes them");
+  assert.blank(postStream.get('userFilters'), "toggling the participant again removes them");
 });
 
-test("streamFilters", function() {
+QUnit.test("streamFilters", assert => {
   const postStream = buildStream(1237);
   sandbox.stub(postStream, "refresh").returns(new Ember.RSVP.resolve());
 
-  deepEqual(postStream.get('streamFilters'), {}, "there are no postFilters by default");
-  ok(postStream.get('hasNoFilters'), "there are no filters by default");
+  assert.deepEqual(postStream.get('streamFilters'), {}, "there are no postFilters by default");
+  assert.ok(postStream.get('hasNoFilters'), "there are no filters by default");
 
   postStream.set('summary', true);
-  deepEqual(postStream.get('streamFilters'), {filter: "summary"}, "postFilters contains the summary flag");
-  ok(!postStream.get('hasNoFilters'), "now there are filters present");
+  assert.deepEqual(postStream.get('streamFilters'), {filter: "summary"}, "postFilters contains the summary flag");
+  assert.ok(!postStream.get('hasNoFilters'), "now there are filters present");
 
   postStream.toggleParticipant(participant.username);
-  deepEqual(postStream.get('streamFilters'), {
+  assert.deepEqual(postStream.get('streamFilters'), {
     username_filters: 'eviltrout',
   }, "streamFilters contains the username we filtered");
 });
 
-test("loading", function() {
+QUnit.test("loading", assert => {
   let postStream = buildStream(1234);
-  ok(!postStream.get('loading'), "we're not loading by default");
+  assert.ok(!postStream.get('loading'), "we're not loading by default");
 
   postStream.set('loadingAbove', true);
-  ok(postStream.get('loading'), "we're loading if loading above");
+  assert.ok(postStream.get('loading'), "we're loading if loading above");
 
   postStream = buildStream(1234);
   postStream.set('loadingBelow', true);
-  ok(postStream.get('loading'), "we're loading if loading below");
+  assert.ok(postStream.get('loading'), "we're loading if loading below");
 
   postStream = buildStream(1234);
   postStream.set('loadingFilter', true);
-  ok(postStream.get('loading'), "we're loading if loading a filter");
+  assert.ok(postStream.get('loading'), "we're loading if loading a filter");
 });
 
-test("nextWindow", function() {
+QUnit.test("nextWindow", assert => {
   const postStream = buildStream(1234, [1,2,3,5,8,9,10,11,13,14,15,16]);
 
-  blank(postStream.get('nextWindow'), 'With no posts loaded, the window is blank');
+  assert.blank(postStream.get('nextWindow'), 'With no posts loaded, the window is blank');
 
   postStream.updateFromJson({ posts: [{id: 1}, {id: 2}] });
-  deepEqual(postStream.get('nextWindow'), [3,5,8,9,10],
+  assert.deepEqual(postStream.get('nextWindow'), [3,5,8,9,10],
             "If we've loaded the first 2 posts, the window should be the 5 after that");
 
   postStream.updateFromJson({ posts: [{id: 13}] });
-  deepEqual(postStream.get('nextWindow'), [14, 15, 16], "Boundary check: stop at the end.");
+  assert.deepEqual(postStream.get('nextWindow'), [14, 15, 16], "Boundary check: stop at the end.");
 
   postStream.updateFromJson({ posts: [{id: 16}] });
-  blank(postStream.get('nextWindow'), "Once we've seen everything there's nothing to load.");
+  assert.blank(postStream.get('nextWindow'), "Once we've seen everything there's nothing to load.");
 });
 
-test("previousWindow", function() {
+QUnit.test("previousWindow", assert => {
   const postStream = buildStream(1234, [1,2,3,5,8,9,10,11,13,14,15,16]);
 
-  blank(postStream.get('previousWindow'), 'With no posts loaded, the window is blank');
+  assert.blank(postStream.get('previousWindow'), 'With no posts loaded, the window is blank');
 
   postStream.updateFromJson({ posts: [{id: 11}, {id: 13}] });
-  deepEqual(postStream.get('previousWindow'), [3, 5, 8, 9, 10],
+  assert.deepEqual(postStream.get('previousWindow'), [3, 5, 8, 9, 10],
             "If we've loaded in the middle, it's the previous 5 posts");
 
   postStream.updateFromJson({ posts: [{id: 3}] });
-  deepEqual(postStream.get('previousWindow'), [1, 2], "Boundary check: stop at the beginning.");
+  assert.deepEqual(postStream.get('previousWindow'), [1, 2], "Boundary check: stop at the beginning.");
 
   postStream.updateFromJson({ posts: [{id: 1}] });
-  blank(postStream.get('previousWindow'), "Once we've seen everything there's nothing to load.");
+  assert.blank(postStream.get('previousWindow'), "Once we've seen everything there's nothing to load.");
 });
 
-test("storePost", function() {
+QUnit.test("storePost", assert => {
   const postStream = buildStream(1234),
         store = postStream.store,
         post = store.createRecord('post', {id: 1, post_number: 100, raw: 'initial value'});
 
-  blank(postStream.get('topic.highest_post_number'), "it has no highest post number yet");
+  assert.blank(postStream.get('topic.highest_post_number'), "it has no highest post number yet");
   let stored = postStream.storePost(post);
-  equal(post, stored, "it returns the post it stored");
-  equal(post.get('topic'), postStream.get('topic'), "it creates the topic reference properly");
-  equal(postStream.get('topic.highest_post_number'), 100, "it set the highest post number");
+  assert.equal(post, stored, "it returns the post it stored");
+  assert.equal(post.get('topic'), postStream.get('topic'), "it creates the topic reference properly");
+  assert.equal(postStream.get('topic.highest_post_number'), 100, "it set the highest post number");
 
   const dupePost = store.createRecord('post', {id: 1, post_number: 100, raw: 'updated value'});
   const storedDupe = postStream.storePost(dupePost);
-  equal(storedDupe, post, "it returns the previously stored post instead to avoid dupes");
-  equal(storedDupe.get('raw'), 'updated value', 'it updates the previously stored post');
+  assert.equal(storedDupe, post, "it returns the previously stored post instead to avoid dupes");
+  assert.equal(storedDupe.get('raw'), 'updated value', 'it updates the previously stored post');
 
   const postWithoutId = store.createRecord('post', {raw: 'hello world'});
   stored = postStream.storePost(postWithoutId);
-  equal(stored, postWithoutId, "it returns the same post back");
+  assert.equal(stored, postWithoutId, "it returns the same post back");
 
 });
 
-test("identity map", function() {
+QUnit.test("identity map", assert => {
   const postStream = buildStream(1234);
   const store = postStream.store;
 
   const p1 = postStream.appendPost(store.createRecord('post', {id: 1, post_number: 1}));
   const p3 = postStream.appendPost(store.createRecord('post', {id: 3, post_number: 4}));
 
-  equal(postStream.findLoadedPost(1), p1, "it can return cached posts by id");
-  blank(postStream.findLoadedPost(4), "it can't find uncached posts");
+  assert.equal(postStream.findLoadedPost(1), p1, "it can return cached posts by id");
+  assert.blank(postStream.findLoadedPost(4), "it can't find uncached posts");
 
   // Find posts by ids uses the identity map
-  postStream.findPostsByIds([1, 2, 3]).then(result => {
-    equal(result.length, 3);
-    equal(result.objectAt(0), p1);
-    equal(result.objectAt(1).get('post_number'), 2);
-    equal(result.objectAt(2), p3);
+  return postStream.findPostsByIds([1, 2, 3]).then(result => {
+    assert.equal(result.length, 3);
+    assert.equal(result.objectAt(0), p1);
+    assert.equal(result.objectAt(1).get('post_number'), 2);
+    assert.equal(result.objectAt(2), p3);
   });
 });
 
-test("loadIntoIdentityMap with no data", () => {
+QUnit.test("loadIntoIdentityMap with no data", assert => {
   return buildStream(1234).loadIntoIdentityMap([]).then(result => {
-    equal(result.length, 0, 'requesting no posts produces no posts');
+    assert.equal(result.length, 0, 'requesting no posts produces no posts');
   });
 });
 
-test("loadIntoIdentityMap with post ids", function() {
+QUnit.test("loadIntoIdentityMap with post ids", assert => {
   const postStream = buildStream(1234);
 
   return postStream.loadIntoIdentityMap([10]).then(function() {
-    present(postStream.findLoadedPost(10), "it adds the returned post to the store");
+    assert.present(postStream.findLoadedPost(10), "it adds the returned post to the store");
   });
 });
 
-test("staging and undoing a new post", function() {
+QUnit.test("staging and undoing a new post", assert => {
   const postStream = buildStream(10101, [1]);
   const store = postStream.store;
 
   const original = store.createRecord('post', {id: 1, post_number: 1, topic_id: 10101});
   postStream.appendPost(original);
-  ok(postStream.get('lastAppended'), original, "the original post is lastAppended");
+  assert.ok(postStream.get('lastAppended'), original, "the original post is lastAppended");
 
   const user = Discourse.User.create({username: 'eviltrout', name: 'eviltrout', id: 321});
   const stagedPost = store.createRecord('post', { raw: 'hello world this is my new post', topic_id: 10101 });
@@ -315,39 +314,39 @@ test("staging and undoing a new post", function() {
 
   // Stage the new post in the stream
   const result = postStream.stagePost(stagedPost, user);
-  equal(result, "staged", "it returns staged");
-  equal(topic.get('highest_post_number'), 2, "it updates the highest_post_number");
-  ok(postStream.get('loading'), "it is loading while the post is being staged");
-  ok(postStream.get('lastAppended'), original, "it doesn't consider staged posts as the lastAppended");
+  assert.equal(result, "staged", "it returns staged");
+  assert.equal(topic.get('highest_post_number'), 2, "it updates the highest_post_number");
+  assert.ok(postStream.get('loading'), "it is loading while the post is being staged");
+  assert.ok(postStream.get('lastAppended'), original, "it doesn't consider staged posts as the lastAppended");
 
-  equal(topic.get('posts_count'), 2, "it increases the post count");
-  present(topic.get('last_posted_at'), "it updates last_posted_at");
-  equal(topic.get('details.last_poster'), user, "it changes the last poster");
+  assert.equal(topic.get('posts_count'), 2, "it increases the post count");
+  assert.present(topic.get('last_posted_at'), "it updates last_posted_at");
+  assert.equal(topic.get('details.last_poster'), user, "it changes the last poster");
 
-  equal(stagedPost.get('topic'), topic, "it assigns the topic reference");
-  equal(stagedPost.get('post_number'), 2, "it is assigned the probable post_number");
-  present(stagedPost.get('created_at'), "it is assigned a created date");
-  ok(postStream.get('posts').includes(stagedPost), "the post is added to the stream");
-  equal(stagedPost.get('id'), -1, "the post has a magical -1 id");
+  assert.equal(stagedPost.get('topic'), topic, "it assigns the topic reference");
+  assert.equal(stagedPost.get('post_number'), 2, "it is assigned the probable post_number");
+  assert.present(stagedPost.get('created_at'), "it is assigned a created date");
+  assert.ok(postStream.get('posts').includes(stagedPost), "the post is added to the stream");
+  assert.equal(stagedPost.get('id'), -1, "the post has a magical -1 id");
 
   // Undoing a created post (there was an error)
   postStream.undoPost(stagedPost);
 
-  ok(!postStream.get('loading'), "it is no longer loading");
-  equal(topic.get('highest_post_number'), 1, "it reverts the highest_post_number");
-  equal(topic.get('posts_count'), 1, "it reverts the post count");
-  equal(postStream.get('filteredPostsCount'), 1, "it retains the filteredPostsCount");
-  ok(!postStream.get('posts').includes(stagedPost), "the post is removed from the stream");
-  ok(postStream.get('lastAppended'), original, "it doesn't consider undid post lastAppended");
+  assert.ok(!postStream.get('loading'), "it is no longer loading");
+  assert.equal(topic.get('highest_post_number'), 1, "it reverts the highest_post_number");
+  assert.equal(topic.get('posts_count'), 1, "it reverts the post count");
+  assert.equal(postStream.get('filteredPostsCount'), 1, "it retains the filteredPostsCount");
+  assert.ok(!postStream.get('posts').includes(stagedPost), "the post is removed from the stream");
+  assert.ok(postStream.get('lastAppended'), original, "it doesn't consider undid post lastAppended");
 });
 
-test("staging and committing a post", function() {
+QUnit.test("staging and committing a post", assert => {
   const postStream = buildStream(10101, [1]);
   const store = postStream.store;
 
   const original = store.createRecord('post', {id: 1, post_number: 1, topic_id: 10101});
   postStream.appendPost(original);
-  ok(postStream.get('lastAppended'), original, "the original post is lastAppended");
+  assert.ok(postStream.get('lastAppended'), original, "the original post is lastAppended");
 
   const user = Discourse.User.create({username: 'eviltrout', name: 'eviltrout', id: 321});
   const stagedPost = store.createRecord('post', { raw: 'hello world this is my new post', topic_id: 10101 });
@@ -357,29 +356,29 @@ test("staging and committing a post", function() {
 
   // Stage the new post in the stream
   let result = postStream.stagePost(stagedPost, user);
-  equal(result, "staged", "it returns staged");
+  assert.equal(result, "staged", "it returns staged");
 
-  ok(postStream.get('loading'), "it is loading while the post is being staged");
+  assert.ok(postStream.get('loading'), "it is loading while the post is being staged");
   stagedPost.setProperties({ id: 1234, raw: "different raw value" });
 
   result = postStream.stagePost(stagedPost, user);
-  equal(result, "alreadyStaging", "you can't stage a post while it is currently staging");
-  ok(postStream.get('lastAppended'), original, "staging a post doesn't change the lastAppended");
+  assert.equal(result, "alreadyStaging", "you can't stage a post while it is currently staging");
+  assert.ok(postStream.get('lastAppended'), original, "staging a post doesn't change the lastAppended");
 
   postStream.commitPost(stagedPost);
-  ok(postStream.get('posts').includes(stagedPost), "the post is still in the stream");
-  ok(!postStream.get('loading'), "it is no longer loading");
+  assert.ok(postStream.get('posts').includes(stagedPost), "the post is still in the stream");
+  assert.ok(!postStream.get('loading'), "it is no longer loading");
 
-  equal(postStream.get('filteredPostsCount'), 2, "it increases the filteredPostsCount");
+  assert.equal(postStream.get('filteredPostsCount'), 2, "it increases the filteredPostsCount");
 
   const found = postStream.findLoadedPost(stagedPost.get('id'));
-  present(found, "the post is in the identity map");
-  ok(postStream.indexOf(stagedPost) > -1, "the post is in the stream");
-  equal(found.get('raw'), 'different raw value', 'it also updated the value in the stream');
-  ok(postStream.get('lastAppended'), found, "comitting a post changes lastAppended");
+  assert.present(found, "the post is in the identity map");
+  assert.ok(postStream.indexOf(stagedPost) > -1, "the post is in the stream");
+  assert.equal(found.get('raw'), 'different raw value', 'it also updated the value in the stream');
+  assert.ok(postStream.get('lastAppended'), found, "comitting a post changes lastAppended");
 });
 
-test("loadedAllPosts when the id changes", function() {
+QUnit.test("loadedAllPosts when the id changes", assert => {
   // This can happen in a race condition between staging a post and it coming through on the
   // message bus. If the id of a post changes we should reconsider the loadedAllPosts property.
   const postStream = buildStream(10101, [1, 2]);
@@ -388,13 +387,13 @@ test("loadedAllPosts when the id changes", function() {
 
   postStream.appendPost(store.createRecord('post', {id: 1, post_number: 1}));
   postStream.appendPost(postWithoutId);
-  ok(!postStream.get('loadedAllPosts'), 'the last post is not loaded');
+  assert.ok(!postStream.get('loadedAllPosts'), 'the last post is not loaded');
 
   postWithoutId.set('id', 2);
-  ok(postStream.get('loadedAllPosts'), 'the last post is loaded now that the post has an id');
+  assert.ok(postStream.get('loadedAllPosts'), 'the last post is loaded now that the post has an id');
 });
 
-test("comitting and triggerNewPostInStream race condition", function() {
+QUnit.test("comitting and triggerNewPostInStream race condition", assert => {
   const postStream = buildStream(4964);
   const store = postStream.store;
 
@@ -403,18 +402,18 @@ test("comitting and triggerNewPostInStream race condition", function() {
   const stagedPost = store.createRecord('post', { raw: 'hello world this is my new post' });
 
   postStream.stagePost(stagedPost, user);
-  equal(postStream.get('filteredPostsCount'), 0, "it has no filteredPostsCount yet");
+  assert.equal(postStream.get('filteredPostsCount'), 0, "it has no filteredPostsCount yet");
   stagedPost.set('id', 123);
 
   sandbox.stub(postStream, 'appendMore');
   postStream.triggerNewPostInStream(123);
-  equal(postStream.get('filteredPostsCount'), 1, "it added the post");
+  assert.equal(postStream.get('filteredPostsCount'), 1, "it added the post");
 
   postStream.commitPost(stagedPost);
-  equal(postStream.get('filteredPostsCount'), 1, "it does not add the same post twice");
+  assert.equal(postStream.get('filteredPostsCount'), 1, "it does not add the same post twice");
 });
 
-test("postsWithPlaceholders", () => {
+QUnit.test("postsWithPlaceholders", assert => {
   const postStream = buildStream(4964, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
   const postsWithPlaceholders = postStream.get('postsWithPlaceholders');
   const store = postStream.store;
@@ -431,28 +430,28 @@ test("postsWithPlaceholders", () => {
   postStream.appendPost(p3);
 
   // Test enumerable and array access
-  equal(postsWithPlaceholders.get('length'), 3);
-  equal(testProxy.get('length'), 3);
-  equal(postsWithPlaceholders.nextObject(0), p1);
-  equal(postsWithPlaceholders.objectAt(0), p1);
-  equal(postsWithPlaceholders.nextObject(1, p1), p2);
-  equal(postsWithPlaceholders.objectAt(1), p2);
-  equal(postsWithPlaceholders.nextObject(2, p2), p3);
-  equal(postsWithPlaceholders.objectAt(2), p3);
+  assert.equal(postsWithPlaceholders.get('length'), 3);
+  assert.equal(testProxy.get('length'), 3);
+  assert.equal(postsWithPlaceholders.nextObject(0), p1);
+  assert.equal(postsWithPlaceholders.objectAt(0), p1);
+  assert.equal(postsWithPlaceholders.nextObject(1, p1), p2);
+  assert.equal(postsWithPlaceholders.objectAt(1), p2);
+  assert.equal(postsWithPlaceholders.nextObject(2, p2), p3);
+  assert.equal(postsWithPlaceholders.objectAt(2), p3);
 
   const promise = postStream.appendMore();
-  equal(postsWithPlaceholders.get('length'), 8, 'we immediately have a larger placeholder window');
-  equal(testProxy.get('length'), 8);
-  ok(!!postsWithPlaceholders.nextObject(3, p3));
-  ok(!!postsWithPlaceholders.objectAt(4));
-  ok(postsWithPlaceholders.objectAt(3) !== p4);
-  ok(testProxy.objectAt(3) !== p4);
+  assert.equal(postsWithPlaceholders.get('length'), 8, 'we immediately have a larger placeholder window');
+  assert.equal(testProxy.get('length'), 8);
+  assert.ok(!!postsWithPlaceholders.nextObject(3, p3));
+  assert.ok(!!postsWithPlaceholders.objectAt(4));
+  assert.ok(postsWithPlaceholders.objectAt(3) !== p4);
+  assert.ok(testProxy.objectAt(3) !== p4);
 
   return promise.then(() => {
-    equal(postsWithPlaceholders.objectAt(3), p4);
-    equal(postsWithPlaceholders.get('length'), 8, 'have a larger placeholder window when loaded');
-    equal(testProxy.get('length'), 8);
-    equal(testProxy.objectAt(3), p4);
+    assert.equal(postsWithPlaceholders.objectAt(3), p4);
+    assert.equal(postsWithPlaceholders.get('length'), 8, 'have a larger placeholder window when loaded');
+    assert.equal(testProxy.get('length'), 8);
+    assert.equal(testProxy.objectAt(3), p4);
   });
 
 });
diff --git a/test/javascripts/models/post-test.js.es6 b/test/javascripts/models/post-test.js.es6
index 1f881df1209..f2c487c1b94 100644
--- a/test/javascripts/models/post-test.js.es6
+++ b/test/javascripts/models/post-test.js.es6
@@ -1,6 +1,4 @@
-import { present, blank } from 'helpers/qunit-helpers';
-
-module("Discourse.Post");
+QUnit.module("Discourse.Post");
 
 var buildPost = function(args) {
   return Discourse.Post.create(_.merge({
@@ -10,29 +8,29 @@ var buildPost = function(args) {
   }, args || {}));
 };
 
-test('defaults', function() {
+QUnit.test('defaults', assert => {
   var post = Discourse.Post.create({id: 1});
-  blank(post.get('deleted_at'), "it has no deleted_at by default");
-  blank(post.get('deleted_by'), "there is no deleted_by by default");
+  assert.blank(post.get('deleted_at'), "it has no deleted_at by default");
+  assert.blank(post.get('deleted_by'), "there is no deleted_by by default");
 });
 
-test('new_user', function() {
+QUnit.test('new_user', assert => {
   var post = Discourse.Post.create({trust_level: 0});
-  ok(post.get('new_user'), "post is from a new user");
+  assert.ok(post.get('new_user'), "post is from a new user");
 
   post.set('trust_level', 1);
-  ok(!post.get('new_user'), "post is no longer from a new user");
+  assert.ok(!post.get('new_user'), "post is no longer from a new user");
 });
 
-test('firstPost', function() {
+QUnit.test('firstPost', assert => {
   var post = Discourse.Post.create({post_number: 1});
-  ok(post.get('firstPost'), "it's the first post");
+  assert.ok(post.get('firstPost'), "it's the first post");
 
   post.set('post_number', 10);
-  ok(!post.get('firstPost'), "post is no longer the first post");
+  assert.ok(!post.get('firstPost'), "post is no longer the first post");
 });
 
-test('updateFromPost', function() {
+QUnit.test('updateFromPost', assert => {
   var post = Discourse.Post.create({
     post_number: 1,
     raw: 'hello world'
@@ -43,33 +41,32 @@ test('updateFromPost', function() {
     wat: function() { return 123; }
   }));
 
-  equal(post.get('raw'), "different raw", "raw field updated");
+  assert.equal(post.get('raw'), "different raw", "raw field updated");
 });
 
-test('destroy by staff', function() {
+QUnit.test('destroy by staff', assert => {
   var user = Discourse.User.create({username: 'staff', staff: true}),
       post = buildPost({user: user});
 
   post.destroy(user);
 
-  present(post.get('deleted_at'), "it has a `deleted_at` field.");
-  equal(post.get('deleted_by'), user, "it has the user in the `deleted_by` field");
+  assert.present(post.get('deleted_at'), "it has a `deleted_at` field.");
+  assert.equal(post.get('deleted_by'), user, "it has the user in the `deleted_by` field");
 
   post.recover();
-  blank(post.get('deleted_at'), "it clears `deleted_at` when recovering");
-  blank(post.get('deleted_by'), "it clears `deleted_by` when recovering");
+  assert.blank(post.get('deleted_at'), "it clears `deleted_at` when recovering");
+  assert.blank(post.get('deleted_by'), "it clears `deleted_by` when recovering");
 
 });
 
-test('destroy by non-staff', function() {
+QUnit.test('destroy by non-staff', assert => {
   var originalCooked = "this is the original cooked value",
       user = Discourse.User.create({username: 'evil trout'}),
       post = buildPost({user: user, cooked: originalCooked});
 
   post.destroy(user);
 
-  ok(!post.get('can_delete'), "the post can't be deleted again in this session");
-  ok(post.get('cooked') !== originalCooked, "the cooked content changed");
-  equal(post.get('version'), 2, "the version number increased");
-});
-
+  assert.ok(!post.get('can_delete'), "the post can't be deleted again in this session");
+  assert.ok(post.get('cooked') !== originalCooked, "the cooked content changed");
+  assert.equal(post.get('version'), 2, "the version number increased");
+});
\ No newline at end of file
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js.es6
index 3fcdd9d037c..1e4f73d89ea 100644
--- a/test/javascripts/models/report-test.js.es6
+++ b/test/javascripts/models/report-test.js.es6
@@ -1,7 +1,6 @@
-import { blank } from 'helpers/qunit-helpers';
 import Report from 'admin/models/report';
 
-module("Report");
+QUnit.module("Report");
 
 function reportWithData(data) {
   return Report.create({
@@ -12,53 +11,53 @@ function reportWithData(data) {
   });
 }
 
-test("counts", function() {
+QUnit.test("counts", assert => {
   var report = reportWithData([5, 4, 3, 2, 1, 100, 99, 98, 1000]);
 
-  equal(report.get('todayCount'), 5);
-  equal(report.get('yesterdayCount'), 4);
-  equal(report.valueFor(2, 4), 6, "adds the values for the given range of days, inclusive");
-  equal(report.get('lastSevenDaysCount'), 307, "sums 7 days excluding today");
+  assert.equal(report.get('todayCount'), 5);
+  assert.equal(report.get('yesterdayCount'), 4);
+  assert.equal(report.valueFor(2, 4), 6, "adds the values for the given range of days, inclusive");
+  assert.equal(report.get('lastSevenDaysCount'), 307, "sums 7 days excluding today");
 
   report.set("method", "average");
-  equal(report.valueFor(2, 4), 2, "averages the values for the given range of days");
+  assert.equal(report.valueFor(2, 4), 2, "averages the values for the given range of days");
 });
 
-test("percentChangeString", function() {
+QUnit.test("percentChangeString", assert => {
   var report = reportWithData([]);
 
-  equal(report.percentChangeString(8, 5), "+60%", "value increased");
-  equal(report.percentChangeString(2, 8), "-75%", "value decreased");
-  equal(report.percentChangeString(8, 8), "0%", "value unchanged");
-  blank(report.percentChangeString(8, 0), "returns blank when previous value was 0");
-  equal(report.percentChangeString(0, 8), "-100%", "yesterday was 0");
-  blank(report.percentChangeString(0, 0), "returns blank when both were 0");
+  assert.equal(report.percentChangeString(8, 5), "+60%", "value increased");
+  assert.equal(report.percentChangeString(2, 8), "-75%", "value decreased");
+  assert.equal(report.percentChangeString(8, 8), "0%", "value unchanged");
+  assert.blank(report.percentChangeString(8, 0), "returns blank when previous value was 0");
+  assert.equal(report.percentChangeString(0, 8), "-100%", "yesterday was 0");
+  assert.blank(report.percentChangeString(0, 0), "returns blank when both were 0");
 });
 
-test("yesterdayCountTitle with valid values", function() {
+QUnit.test("yesterdayCountTitle with valid values", assert => {
   var title = reportWithData([6,8,5,2,1]).get('yesterdayCountTitle');
-  ok(title.indexOf('+60%') !== -1);
-  ok(title.match(/Was 5/));
+  assert.ok(title.indexOf('+60%') !== -1);
+  assert.ok(title.match(/Was 5/));
 });
 
-test("yesterdayCountTitle when two days ago was 0", function() {
+QUnit.test("yesterdayCountTitle when two days ago was 0", assert => {
   var title = reportWithData([6,8,0,2,1]).get('yesterdayCountTitle');
-  equal(title.indexOf('%'), -1);
-  ok(title.match(/Was 0/));
+  assert.equal(title.indexOf('%'), -1);
+  assert.ok(title.match(/Was 0/));
 });
 
 
-test("sevenDayCountTitle", function() {
+QUnit.test("sevenDayCountTitle", assert => {
   var title = reportWithData([100,1,1,1,1,1,1,1,2,2,2,2,2,2,2,100,100]).get('sevenDayCountTitle');
-  ok(title.match(/-50%/));
-  ok(title.match(/Was 14/));
+  assert.ok(title.match(/-50%/));
+  assert.ok(title.match(/Was 14/));
 });
 
-test("thirtyDayCountTitle", function() {
+QUnit.test("thirtyDayCountTitle", assert => {
   var report = reportWithData([5,5,5,5]);
   report.set('prev30Days', 10);
   var title = report.get('thirtyDayCountTitle');
 
-  ok(title.indexOf('+50%') !== -1);
-  ok(title.match(/Was 10/));
-});
+  assert.ok(title.indexOf('+50%') !== -1);
+  assert.ok(title.match(/Was 10/));
+});
\ No newline at end of file
diff --git a/test/javascripts/models/rest-model-test.js.es6 b/test/javascripts/models/rest-model-test.js.es6
index 73a77e7203d..031cb3b0c25 100644
--- a/test/javascripts/models/rest-model-test.js.es6
+++ b/test/javascripts/models/rest-model-test.js.es6
@@ -1,9 +1,9 @@
-module('rest-model');
+QUnit.module('rest-model');
 
 import createStore from 'helpers/create-store';
 import RestModel from 'discourse/models/rest';
 
-test('munging', function() {
+QUnit.test('munging', assert => {
   const store = createStore();
   const Grape = RestModel.extend();
   Grape.reopenClass({
@@ -14,26 +14,26 @@ test('munging', function() {
   });
 
   var g = Grape.create({ store, percent: 0.4 });
-  equal(g.get('inverse'), 0.6, 'it runs `munge` on `create`');
+  assert.equal(g.get('inverse'), 0.6, 'it runs `munge` on `create`');
 });
 
-test('update', function() {
+QUnit.test('update', assert => {
   const store = createStore();
   return store.find('widget', 123).then(function(widget) {
-    equal(widget.get('name'), 'Trout Lure');
+    assert.equal(widget.get('name'), 'Trout Lure');
 
-    ok(!widget.get('isSaving'));
+    assert.ok(!widget.get('isSaving'));
     const promise = widget.update({ name: 'new name' });
-    ok(widget.get('isSaving'));
+    assert.ok(widget.get('isSaving'));
     promise.then(function() {
-      ok(!widget.get('isSaving'));
-      equal(widget.get('name'), 'new name');
+      assert.ok(!widget.get('isSaving'));
+      assert.equal(widget.get('name'), 'new name');
     });
   });
 });
 
-test('updating simultaneously', function() {
-  expect(2);
+QUnit.test('updating simultaneously', assert => {
+  assert.expect(2);
 
   const store = createStore();
   return store.find('widget', 123).then(function(widget) {
@@ -41,37 +41,37 @@ test('updating simultaneously', function() {
     const firstPromise = widget.update({ name: 'new name' });
     const secondPromise = widget.update({ name: 'new name' });
     firstPromise.then(function() {
-      ok(true, 'the first promise succeeeds');
+      assert.ok(true, 'the first promise succeeeds');
     });
 
     secondPromise.catch(function() {
-      ok(true, 'the second promise fails');
+      assert.ok(true, 'the second promise fails');
     });
   });
 });
 
-test('save new', function() {
+QUnit.test('save new', assert => {
   const store = createStore();
   const widget = store.createRecord('widget');
 
-  ok(widget.get('isNew'), 'it is a new record');
-  ok(!widget.get('isCreated'), 'it is not created');
-  ok(!widget.get('isSaving'));
+  assert.ok(widget.get('isNew'), 'it is a new record');
+  assert.ok(!widget.get('isCreated'), 'it is not created');
+  assert.ok(!widget.get('isSaving'));
 
   const promise = widget.save({ name: 'Evil Widget' });
-  ok(widget.get('isSaving'));
+  assert.ok(widget.get('isSaving'));
 
   return promise.then(function() {
-    ok(!widget.get('isSaving'));
-    ok(widget.get('id'), 'it has an id');
-    ok(widget.get('name'), 'Evil Widget');
-    ok(widget.get('isCreated'), 'it is created');
-    ok(!widget.get('isNew'), 'it is no longer new');
+    assert.ok(!widget.get('isSaving'));
+    assert.ok(widget.get('id'), 'it has an id');
+    assert.ok(widget.get('name'), 'Evil Widget');
+    assert.ok(widget.get('isCreated'), 'it is created');
+    assert.ok(!widget.get('isNew'), 'it is no longer new');
   });
 });
 
-test('creating simultaneously', function() {
-  expect(2);
+QUnit.test('creating simultaneously', assert => {
+  assert.expect(2);
 
   const store = createStore();
   const widget = store.createRecord('widget');
@@ -79,20 +79,19 @@ test('creating simultaneously', function() {
   const firstPromise = widget.save({ name: 'Evil Widget' });
   const secondPromise = widget.save({ name: 'Evil Widget' });
   firstPromise.then(function() {
-    ok(true, 'the first promise succeeeds');
+    assert.ok(true, 'the first promise succeeeds');
   });
 
   secondPromise.catch(function() {
-    ok(true, 'the second promise fails');
+    assert.ok(true, 'the second promise fails');
   });
 });
 
-test('destroyRecord', function() {
+QUnit.test('destroyRecord', assert => {
   const store = createStore();
   return store.find('widget', 123).then(function(widget) {
     widget.destroyRecord().then(function(result) {
-      ok(result);
+      assert.ok(result);
     });
   });
 });
-
diff --git a/test/javascripts/models/result-set-test.js.es6 b/test/javascripts/models/result-set-test.js.es6
index 18c9aa0c80f..2912b8ddb80 100644
--- a/test/javascripts/models/result-set-test.js.es6
+++ b/test/javascripts/models/result-set-test.js.es6
@@ -1,49 +1,49 @@
-module('result-set');
+QUnit.module('result-set');
 
 import ResultSet from 'discourse/models/result-set';
 import createStore from 'helpers/create-store';
 
-test('defaults', function() {
+QUnit.test('defaults', assert => {
   const rs = ResultSet.create({ content: [] });
-  equal(rs.get('length'), 0);
-  equal(rs.get('totalRows'), 0);
-  ok(!rs.get('loadMoreUrl'));
-  ok(!rs.get('loading'));
-  ok(!rs.get('loadingMore'));
-  ok(!rs.get('refreshing'));
+  assert.equal(rs.get('length'), 0);
+  assert.equal(rs.get('totalRows'), 0);
+  assert.ok(!rs.get('loadMoreUrl'));
+  assert.ok(!rs.get('loading'));
+  assert.ok(!rs.get('loadingMore'));
+  assert.ok(!rs.get('refreshing'));
 });
 
-test('pagination support', function() {
+QUnit.test('pagination support', assert => {
   const store = createStore();
   return store.findAll('widget').then(function(rs) {
-    equal(rs.get('length'), 2);
-    equal(rs.get('totalRows'), 4);
-    ok(rs.get('loadMoreUrl'), 'has a url to load more');
-    ok(!rs.get('loadingMore'), 'it is not loading more');
-    ok(rs.get('canLoadMore'));
+    assert.equal(rs.get('length'), 2);
+    assert.equal(rs.get('totalRows'), 4);
+    assert.ok(rs.get('loadMoreUrl'), 'has a url to load more');
+    assert.ok(!rs.get('loadingMore'), 'it is not loading more');
+    assert.ok(rs.get('canLoadMore'));
 
     const promise = rs.loadMore();
 
-    ok(rs.get('loadingMore'), 'it is loading more');
+    assert.ok(rs.get('loadingMore'), 'it is loading more');
     promise.then(function() {
-      ok(!rs.get('loadingMore'), 'it finished loading more');
-      equal(rs.get('length'), 4);
-      ok(!rs.get('loadMoreUrl'));
-      ok(!rs.get('canLoadMore'));
+      assert.ok(!rs.get('loadingMore'), 'it finished loading more');
+      assert.equal(rs.get('length'), 4);
+      assert.ok(!rs.get('loadMoreUrl'));
+      assert.ok(!rs.get('canLoadMore'));
     });
   });
 });
 
-test('refresh support', function() {
+QUnit.test('refresh support', assert => {
   const store = createStore();
   return store.findAll('widget').then(function(rs) {
-    equal(rs.get('refreshUrl'), '/widgets?refresh=true', 'it has the refresh url');
+    assert.equal(rs.get('refreshUrl'), '/widgets?refresh=true', 'it has the refresh url');
 
     const promise = rs.refresh();
 
-    ok(rs.get('refreshing'), 'it is refreshing');
+    assert.ok(rs.get('refreshing'), 'it is refreshing');
     promise.then(function() {
-      ok(!rs.get('refreshing'), 'it is finished refreshing');
+      assert.ok(!rs.get('refreshing'), 'it is finished refreshing');
     });
   });
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/models/session-test.js.es6 b/test/javascripts/models/session-test.js.es6
index 320b5fb3665..ff330fd77fe 100644
--- a/test/javascripts/models/session-test.js.es6
+++ b/test/javascripts/models/session-test.js.es6
@@ -1,8 +1,8 @@
 import Session from "discourse/models/session";
 
-module("model:session");
+QUnit.module("model:session");
 
-test('highestSeenByTopic', function() {
+QUnit.test('highestSeenByTopic', assert => {
   const session = Session.current();
-  deepEqual(session.get('highestSeenByTopic'), {}, "by default it returns an empty object");
-});
+  assert.deepEqual(session.get('highestSeenByTopic'), {}, "by default it returns an empty object");
+});
\ No newline at end of file
diff --git a/test/javascripts/models/site-test.js.es6 b/test/javascripts/models/site-test.js.es6
index bc1c3c0ac94..bce69122dc6 100644
--- a/test/javascripts/models/site-test.js.es6
+++ b/test/javascripts/models/site-test.js.es6
@@ -1,23 +1,22 @@
 import createStore from 'helpers/create-store';
-import { blank, present } from 'helpers/qunit-helpers';
 
-module("model:site");
+QUnit.module("model:site");
 
-test('create', function() {
-  ok(Discourse.Site.create(), 'it can create with no parameters');
+QUnit.test('create', assert => {
+  assert.ok(Discourse.Site.create(), 'it can create with no parameters');
 });
 
-test('instance', function() {
+QUnit.test('instance', assert => {
   const site = Discourse.Site.current();
 
-  present(site, "We have a current site singleton");
-  present(site.get('categories'), "The instance has a list of categories");
-  present(site.get('flagTypes'), "The instance has a list of flag types");
-  present(site.get('trustLevels'), "The instance has a list of trust levels");
+  assert.present(site, "We have a current site singleton");
+  assert.present(site.get('categories'), "The instance has a list of categories");
+  assert.present(site.get('flagTypes'), "The instance has a list of flag types");
+  assert.present(site.get('trustLevels'), "The instance has a list of trust levels");
 
 });
 
-test('create categories', function() {
+QUnit.test('create categories', assert => {
   const store = createStore();
   const site = store.createRecord('site', {
     categories: [{ id: 1234, name: 'Test'},
@@ -28,22 +27,22 @@ test('create categories', function() {
   const categories = site.get('categories');
   site.get('sortedCategories');
 
-  present(categories, "The categories are present");
-  equal(categories.length, 3, "it loaded all three categories");
+  assert.present(categories, "The categories are present");
+  assert.equal(categories.length, 3, "it loaded all three categories");
 
   const parent = categories.findBy('id', 1234);
-  present(parent, "it loaded the parent category");
-  blank(parent.get('parentCategory'), 'it has no parent category');
+  assert.present(parent, "it loaded the parent category");
+  assert.blank(parent.get('parentCategory'), 'it has no parent category');
 
   const subcategory = categories.findBy('id', 3456);
-  present(subcategory, "it loaded the subcategory");
-  equal(subcategory.get('parentCategory'), parent, "it has associated the child with the parent");
+  assert.present(subcategory, "it loaded the subcategory");
+  assert.equal(subcategory.get('parentCategory'), parent, "it has associated the child with the parent");
 
   // remove invalid category and child
   categories.removeObject(categories[2]);
   categories.removeObject(categories[1]);
 
-  equal(categories.length, site.get('categoriesByCount').length, "categories by count should change on removal");
-  equal(categories.length, site.get('sortedCategories').length, "sorted categories should change on removal");
+  assert.equal(categories.length, site.get('categoriesByCount').length, "categories by count should change on removal");
+  assert.equal(categories.length, site.get('sortedCategories').length, "sorted categories should change on removal");
 
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/models/staff-action-log-test.js.es6 b/test/javascripts/models/staff-action-log-test.js.es6
index 933dd6271d8..2e9756ff9e7 100644
--- a/test/javascripts/models/staff-action-log-test.js.es6
+++ b/test/javascripts/models/staff-action-log-test.js.es6
@@ -1,7 +1,7 @@
 import StaffActionLog from 'admin/models/staff-action-log';
 
-module("StaffActionLog");
+QUnit.module("StaffActionLog");
 
-test("create", function() {
-  ok(StaffActionLog.create(), "it can be created without arguments");
-});
+QUnit.test("create", assert => {
+  assert.ok(StaffActionLog.create(), "it can be created without arguments");
+});
\ No newline at end of file
diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6
index e54f5740b90..f532ad6f77d 100644
--- a/test/javascripts/models/store-test.js.es6
+++ b/test/javascripts/models/store-test.js.es6
@@ -1,81 +1,81 @@
-module('store:main');
+QUnit.module('store:main');
 
 import createStore from 'helpers/create-store';
 
-test('createRecord', function() {
+QUnit.test('createRecord', assert => {
   const store = createStore();
   const widget = store.createRecord('widget', {id: 111, name: 'hello'});
 
-  ok(!widget.get('isNew'), 'it is not a new record');
-  equal(widget.get('name'), 'hello');
-  equal(widget.get('id'), 111);
+  assert.ok(!widget.get('isNew'), 'it is not a new record');
+  assert.equal(widget.get('name'), 'hello');
+  assert.equal(widget.get('id'), 111);
 });
 
-test('createRecord without an `id`', function() {
+QUnit.test('createRecord without an `id`', assert => {
   const store = createStore();
   const widget = store.createRecord('widget', {name: 'hello'});
 
-  ok(widget.get('isNew'), 'it is a new record');
-  ok(!widget.get('id'), 'there is no id');
+  assert.ok(widget.get('isNew'), 'it is a new record');
+  assert.ok(!widget.get('id'), 'there is no id');
 });
 
-test("createRecord doesn't modify the input `id` field", () => {
+QUnit.test("createRecord doesn't modify the input `id` field", assert => {
   const store = createStore();
   const widget = store.createRecord('widget', {id: 1, name: 'hello'});
 
   const obj = { id: 1, name: 'something' };
 
   const other = store.createRecord('widget', obj);
-  equal(widget, other, 'returns the same record');
-  equal(widget.name, 'something', 'it updates the properties');
-  equal(obj.id, 1, 'it does not remove the id from the input');
+  assert.equal(widget, other, 'returns the same record');
+  assert.equal(widget.name, 'something', 'it updates the properties');
+  assert.equal(obj.id, 1, 'it does not remove the id from the input');
 });
 
-test('createRecord without attributes', function() {
+QUnit.test('createRecord without attributes', assert => {
   const store = createStore();
   const widget = store.createRecord('widget');
 
-  ok(!widget.get('id'), 'there is no id');
-  ok(widget.get('isNew'), 'it is a new record');
+  assert.ok(!widget.get('id'), 'there is no id');
+  assert.ok(widget.get('isNew'), 'it is a new record');
 });
 
-test('createRecord with a record as attributes returns that record from the map', function() {
+QUnit.test('createRecord with a record as attributes returns that record from the map', assert => {
   const store = createStore();
   const widget = store.createRecord('widget', {id: 33});
   const secondWidget = store.createRecord('widget', {id: 33});
 
-  equal(widget, secondWidget, 'they should be the same');
+  assert.equal(widget, secondWidget, 'they should be the same');
 });
 
-test('find', function() {
+QUnit.test('find', assert => {
   const store = createStore();
   return store.find('widget', 123).then(function(w) {
-    equal(w.get('name'), 'Trout Lure');
-    equal(w.get('id'), 123);
-    ok(!w.get('isNew'), 'found records are not new');
+    assert.equal(w.get('name'), 'Trout Lure');
+    assert.equal(w.get('id'), 123);
+    assert.ok(!w.get('isNew'), 'found records are not new');
 
     // A second find by id returns the same object
     store.find('widget', 123).then(function(w2) {
-      equal(w, w2);
+      assert.equal(w, w2);
     });
   });
 });
 
-test('find with object id', function() {
+QUnit.test('find with object id', assert => {
   const store = createStore();
   return store.find('widget', {id: 123}).then(function(w) {
-    equal(w.get('firstObject.name'), 'Trout Lure');
+    assert.equal(w.get('firstObject.name'), 'Trout Lure');
   });
 });
 
-test('find with query param', function() {
+QUnit.test('find with query param', assert => {
   const store = createStore();
   return store.find('widget', {name: 'Trout Lure'}).then(function(w) {
-    equal(w.get('firstObject.id'), 123);
+    assert.equal(w.get('firstObject.id'), 123);
   });
 });
 
-test('findStale with no stale results', (assert) => {
+QUnit.test('findStale with no stale results', (assert) => {
   const store = createStore();
   const stale = store.findStale('widget', {name: 'Trout Lure'});
 
@@ -86,14 +86,14 @@ test('findStale with no stale results', (assert) => {
   });
 });
 
-test('update', function() {
+QUnit.test('update', assert => {
   const store = createStore();
   return store.update('widget', 123, {name: 'hello'}).then(function(result) {
-    ok(result);
+    assert.ok(result);
   });
 });
 
-test('update with a multi world name', function(assert) {
+QUnit.test('update with a multi world name', function(assert) {
   const store = createStore();
   return store.update('cool-thing', 123, {name: 'hello'}).then(function(result) {
     assert.ok(result);
@@ -101,17 +101,17 @@ test('update with a multi world name', function(assert) {
   });
 });
 
-test('findAll', function() {
+QUnit.test('findAll', assert => {
   const store = createStore();
   return store.findAll('widget').then(function(result) {
-    equal(result.get('length'), 2);
+    assert.equal(result.get('length'), 2);
     const w = result.findBy('id', 124);
-    ok(!w.get('isNew'), 'found records are not new');
-    equal(w.get('name'), 'Evil Repellant');
+    assert.ok(!w.get('isNew'), 'found records are not new');
+    assert.equal(w.get('name'), 'Evil Repellant');
   });
 });
 
-test('destroyRecord', function(assert) {
+QUnit.test('destroyRecord', function(assert) {
   const store = createStore();
   return store.find('widget', 123).then(function(w) {
     store.destroyRecord('widget', w).then(function(result) {
@@ -120,7 +120,7 @@ test('destroyRecord', function(assert) {
   });
 });
 
-test('destroyRecord when new', function(assert) {
+QUnit.test('destroyRecord when new', function(assert) {
   const store = createStore();
   const w = store.createRecord('widget', {name: 'hello'});
   store.destroyRecord('widget', w).then(function(result) {
@@ -128,7 +128,7 @@ test('destroyRecord when new', function(assert) {
   });
 });
 
-test('find embedded', function(assert) {
+QUnit.test('find embedded', function(assert) {
   const store = createStore();
   return store.find('fruit', 2).then(function(f) {
     assert.ok(f.get('farmer'), 'it has the embedded object');
@@ -142,7 +142,7 @@ test('find embedded', function(assert) {
   });
 });
 
-test('findAll embedded', function(assert) {
+QUnit.test('findAll embedded', function(assert) {
   const store = createStore();
   return store.findAll('fruit').then(function(fruits) {
     assert.equal(fruits.objectAt(0).get('farmer.name'), 'Old MacDonald');
@@ -156,5 +156,4 @@ test('findAll embedded', function(assert) {
 
     assert.equal(fruits.objectAt(2).get('farmer.name'), 'Luke Skywalker');
   });
-});
-
+});
\ No newline at end of file
diff --git a/test/javascripts/models/topic-details-test.js.es6 b/test/javascripts/models/topic-details-test.js.es6
index 75719ad3e94..760cdaa76a7 100644
--- a/test/javascripts/models/topic-details-test.js.es6
+++ b/test/javascripts/models/topic-details-test.js.es6
@@ -1,5 +1,4 @@
-import { present } from 'helpers/qunit-helpers';
-module("model:topic-details");
+QUnit.module("model:topic-details");
 
 import Topic from 'discourse/models/topic';
 
@@ -8,13 +7,13 @@ var buildDetails = function(id) {
   return topic.get('details');
 };
 
-test('defaults', function() {
+QUnit.test('defaults', assert => {
   var details = buildDetails(1234);
-  present(details, "the details are present by default");
-  ok(!details.get('loaded'), "details are not loaded by default");
+  assert.present(details, "the details are present by default");
+  assert.ok(!details.get('loaded'), "details are not loaded by default");
 });
 
-test('updateFromJson', function() {
+QUnit.test('updateFromJson', assert => {
   var details = buildDetails(1234);
 
   details.updateFromJson({
@@ -22,10 +21,10 @@ test('updateFromJson', function() {
     allowed_users: [{username: 'eviltrout'}]
   });
 
-  equal(details.get('suggested_topics.length'), 2, 'it loaded the suggested_topics');
-  containsInstance(details.get('suggested_topics'), Topic);
+  assert.equal(details.get('suggested_topics.length'), 2, 'it loaded the suggested_topics');
+  assert.containsInstance(details.get('suggested_topics'), Topic);
 
-  equal(details.get('allowed_users.length'), 1, 'it loaded the allowed users');
-  containsInstance(details.get('allowed_users'), Discourse.User);
+  assert.equal(details.get('allowed_users.length'), 1, 'it loaded the allowed users');
+  assert.containsInstance(details.get('allowed_users'), Discourse.User);
 
 });
diff --git a/test/javascripts/models/topic-test.js.es6 b/test/javascripts/models/topic-test.js.es6
index 2c1ceac923a..681a4378a7f 100644
--- a/test/javascripts/models/topic-test.js.es6
+++ b/test/javascripts/models/topic-test.js.es6
@@ -1,40 +1,39 @@
-import { blank, present } from 'helpers/qunit-helpers';
 import { IMAGE_VERSION as v} from 'pretty-text/emoji';
 
-module("model:topic");
+QUnit.module("model:topic");
 
 import Topic from 'discourse/models/topic';
 
-test("defaults", function() {
+QUnit.test("defaults", assert => {
   var topic = Topic.create({id: 1234});
-  blank(topic.get('deleted_at'), 'deleted_at defaults to blank');
-  blank(topic.get('deleted_by'), 'deleted_by defaults to blank');
+  assert.blank(topic.get('deleted_at'), 'deleted_at defaults to blank');
+  assert.blank(topic.get('deleted_by'), 'deleted_by defaults to blank');
 });
 
-test('has details', function() {
+QUnit.test('has details', assert => {
   var topic = Topic.create({id: 1234});
   var topicDetails = topic.get('details');
-  present(topicDetails, "a topic has topicDetails after we create it");
-  equal(topicDetails.get('topic'), topic, "the topicDetails has a reference back to the topic");
+  assert.present(topicDetails, "a topic has topicDetails after we create it");
+  assert.equal(topicDetails.get('topic'), topic, "the topicDetails has a reference back to the topic");
 });
 
-test('has a postStream', function() {
+QUnit.test('has a postStream', assert => {
   var topic = Topic.create({id: 1234});
   var postStream = topic.get('postStream');
-  present(postStream, "a topic has a postStream after we create it");
-  equal(postStream.get('topic'), topic, "the postStream has a reference back to the topic");
+  assert.present(postStream, "a topic has a postStream after we create it");
+  assert.equal(postStream.get('topic'), topic, "the postStream has a reference back to the topic");
 });
 
 
-test('category relationship', function() {
+QUnit.test('category relationship', assert => {
   // It finds the category by id
   var category = Discourse.Category.list()[0],
       topic = Topic.create({id: 1111, category_id: category.get('id') });
 
-  equal(topic.get('category'), category);
+  assert.equal(topic.get('category'), category);
 });
 
-test("updateFromJson", function() {
+QUnit.test("updateFromJson", assert => {
   var topic = Topic.create({id: 1234}),
       category = Discourse.Category.list()[0];
 
@@ -45,34 +44,34 @@ test("updateFromJson", function() {
     category_id: category.get('id')
   });
 
-  blank(topic.get('post_stream'), "it does not update post_stream");
-  equal(topic.get('details.hello'), 'world', 'it updates the details');
-  equal(topic.get('cool'), "property", "it updates other properties");
-  equal(topic.get('category'), category);
+  assert.blank(topic.get('post_stream'), "it does not update post_stream");
+  assert.equal(topic.get('details.hello'), 'world', 'it updates the details');
+  assert.equal(topic.get('cool'), "property", "it updates other properties");
+  assert.equal(topic.get('category'), category);
 });
 
-test("destroy", function() {
+QUnit.test("destroy", assert => {
   var user = Discourse.User.create({username: 'eviltrout'});
   var topic = Topic.create({id: 1234});
 
   topic.destroy(user);
-  present(topic.get('deleted_at'), 'deleted at is set');
-  equal(topic.get('deleted_by'), user, 'deleted by is set');
+  assert.present(topic.get('deleted_at'), 'deleted at is set');
+  assert.equal(topic.get('deleted_by'), user, 'deleted by is set');
 });
 
-test("recover", function() {
+QUnit.test("recover", assert => {
   var user = Discourse.User.create({username: 'eviltrout'});
   var topic = Topic.create({id: 1234, deleted_at: new Date(), deleted_by: user});
 
   topic.recover();
-  blank(topic.get('deleted_at'), "it clears deleted_at");
-  blank(topic.get('deleted_by'), "it clears deleted_by");
+  assert.blank(topic.get('deleted_at'), "it clears deleted_at");
+  assert.blank(topic.get('deleted_by'), "it clears deleted_by");
 });
 
-test('fancyTitle', function() {
+QUnit.test('fancyTitle', assert => {
   var topic = Topic.create({ fancy_title: ":smile: with all :) the emojis :pear::peach:" });
 
-  equal(topic.get('fancyTitle'),
+  assert.equal(topic.get('fancyTitle'),
         `<img src='/images/emoji/emoji_one/smile.png?v=${v}' title='smile' alt='smile' class='emoji'> with all <img src='/images/emoji/emoji_one/slight_smile.png?v=${v}' title='slight_smile' alt='slight_smile' class='emoji'> the emojis <img src='/images/emoji/emoji_one/pear.png?v=${v}' title='pear' alt='pear' class='emoji'><img src='/images/emoji/emoji_one/peach.png?v=${v}' title='peach' alt='peach' class='emoji'>`,
         "supports emojis");
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/models/topic-tracking-state-test.js.es6 b/test/javascripts/models/topic-tracking-state-test.js.es6
index 0814487950c..3c184cb7591 100644
--- a/test/javascripts/models/topic-tracking-state-test.js.es6
+++ b/test/javascripts/models/topic-tracking-state-test.js.es6
@@ -1,9 +1,9 @@
 import TopicTrackingState from 'discourse/models/topic-tracking-state';
 import createStore from 'helpers/create-store';
 
-module("model:topic-tracking-state");
+QUnit.module("model:topic-tracking-state");
 
-test("sync", function (assert) {
+QUnit.test("sync", function (assert) {
   const state = TopicTrackingState.create();
   state.states["t111"] = {last_read_post_number: null};
 
@@ -19,7 +19,7 @@ test("sync", function (assert) {
   assert.equal(list.topics.length, 0, "expect new topic to be removed as it was seen");
 });
 
-test("subscribe to category", function(assert){
+QUnit.test("subscribe to category", function(assert){
 
   const store = createStore();
   const darth = store.createRecord('category', {id: 1, slug: 'darth'}),
@@ -47,4 +47,4 @@ test("subscribe to category", function(assert){
   state.notify({message_type: 'new_topic', topic_id: 3, payload: {category_id: 1, topic_id: 3}});
 
   assert.equal(state.get("incomingCount"), 1, "expect to properly track incoming for subcategory");
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/models/user-action-test.js.es6 b/test/javascripts/models/user-action-test.js.es6
index fd0bd043f1d..93a988acac7 100644
--- a/test/javascripts/models/user-action-test.js.es6
+++ b/test/javascripts/models/user-action-test.js.es6
@@ -1,6 +1,6 @@
-module("Discourse.UserAction");
+QUnit.module("Discourse.UserAction");
 
-test("collapsing likes", function () {
+QUnit.test("collapsing likes", assert => {
   var actions = Discourse.UserAction.collapseStream([
     Discourse.UserAction.create({
       action_type: Discourse.UserAction.TYPES.likes_given,
@@ -20,8 +20,8 @@ test("collapsing likes", function () {
     })
   ]);
 
-  equal(actions.length, 2);
+  assert.equal(actions.length, 2);
 
-  equal(actions[0].get('children.length'), 1);
-  equal(actions[0].get('children')[0].items.length, 2);
-});
+  assert.equal(actions[0].get('children.length'), 1);
+  assert.equal(actions[0].get('children')[0].items.length, 2);
+});
\ No newline at end of file
diff --git a/test/javascripts/models/user-badge-test.js.es6 b/test/javascripts/models/user-badge-test.js.es6
index 5258d98b06c..0794c2f92ca 100644
--- a/test/javascripts/models/user-badge-test.js.es6
+++ b/test/javascripts/models/user-badge-test.js.es6
@@ -1,42 +1,42 @@
 import UserBadge from 'discourse/models/user-badge';
 import badgeFixtures from 'fixtures/user-badges';
 
-module("model:user-badge");
+QUnit.module("model:user-badge");
 
-test('createFromJson single', function() {
+QUnit.test('createFromJson single', assert => {
   const userBadge = UserBadge.createFromJson(badgeFixtures['/user_badges']);
-  ok(!Array.isArray(userBadge), "does not return an array");
-  equal(userBadge.get('badge.name'), "Badge 2", "badge reference is set");
-  equal(userBadge.get('badge.badge_type.name'), "Silver 2", "badge.badge_type reference is set");
-  equal(userBadge.get('granted_by.username'), "anne3", "granted_by reference is set");
+  assert.ok(!Array.isArray(userBadge), "does not return an array");
+  assert.equal(userBadge.get('badge.name'), "Badge 2", "badge reference is set");
+  assert.equal(userBadge.get('badge.badge_type.name'), "Silver 2", "badge.badge_type reference is set");
+  assert.equal(userBadge.get('granted_by.username'), "anne3", "granted_by reference is set");
 });
 
-test('createFromJson array', function() {
+QUnit.test('createFromJson array', assert => {
   const userBadges = UserBadge.createFromJson(badgeFixtures['/user-badges/:username']);
-  ok(Array.isArray(userBadges), "returns an array");
-  equal(userBadges[0].get('granted_by'), null, "granted_by reference is not set when null");
+  assert.ok(Array.isArray(userBadges), "returns an array");
+  assert.equal(userBadges[0].get('granted_by'), null, "granted_by reference is not set when null");
 });
 
-test('findByUsername', function() {
+QUnit.test('findByUsername', assert => {
   return UserBadge.findByUsername("anne3").then(function(badges) {
-    ok(Array.isArray(badges), "returns an array");
+    assert.ok(Array.isArray(badges), "returns an array");
   });
 });
 
-test('findByBadgeId', function() {
+QUnit.test('findByBadgeId', assert => {
   return UserBadge.findByBadgeId(880).then(function(badges) {
-    ok(Array.isArray(badges), "returns an array");
+    assert.ok(Array.isArray(badges), "returns an array");
   });
 });
 
-test('grant', function() {
+QUnit.test('grant', assert => {
   return UserBadge.grant(1, "username").then(function(userBadge) {
-    ok(!Array.isArray(userBadge), "does not return an array");
+    assert.ok(!Array.isArray(userBadge), "does not return an array");
   });
 });
 
-test('revoke', function() {
-  expect(0);
+QUnit.test('revoke', assert => {
+  assert.expect(0);
   const userBadge = UserBadge.create({id: 1});
   return userBadge.revoke();
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/models/user-stream-test.js.es6 b/test/javascripts/models/user-stream-test.js.es6
index c5b35985e30..272dae3d334 100644
--- a/test/javascripts/models/user-stream-test.js.es6
+++ b/test/javascripts/models/user-stream-test.js.es6
@@ -1,32 +1,30 @@
-import { blank, present } from 'helpers/qunit-helpers';
+QUnit.module("Discourse.UserStream");
 
-module("Discourse.UserStream");
-
-test('basics', function(){
+QUnit.test('basics', assert =>{
   var user = Discourse.User.create({id: 1, username: 'eviltrout'});
   var stream = user.get('stream');
-  present(stream, "a user has a stream by default");
-  equal(stream.get('user'), user, "the stream points back to the user");
+  assert.present(stream, "a user has a stream by default");
+  assert.equal(stream.get('user'), user, "the stream points back to the user");
 
-  equal(stream.get('itemsLoaded'), 0, "no items are loaded by default");
-  blank(stream.get('content'), "no content by default");
-  blank(stream.get('filter'), "no filter by default");
+  assert.equal(stream.get('itemsLoaded'), 0, "no items are loaded by default");
+  assert.blank(stream.get('content'), "no content by default");
+  assert.blank(stream.get('filter'), "no filter by default");
 
-  ok(!stream.get('loaded'), "the stream is not loaded by default");
+  assert.ok(!stream.get('loaded'), "the stream is not loaded by default");
 });
 
 
-test('filterParam', function() {
+QUnit.test('filterParam', assert => {
   var user = Discourse.User.create({id: 1, username: 'eviltrout'});
   var stream = user.get('stream');
 
   // defaults to posts/topics
-  equal(stream.get('filterParam'), "4,5");
+  assert.equal(stream.get('filterParam'), "4,5");
 
   stream.set('filter', Discourse.UserAction.TYPES.likes_given);
-  equal(stream.get('filterParam'), Discourse.UserAction.TYPES.likes_given);
+  assert.equal(stream.get('filterParam'), Discourse.UserAction.TYPES.likes_given);
 
   stream.set('filter', Discourse.UserAction.TYPES.replies);
-  equal(stream.get('filterParam'), '6,9');
+  assert.equal(stream.get('filterParam'), '6,9');
 
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/models/user-test.js.es6 b/test/javascripts/models/user-test.js.es6
index ea845d582f2..fb379374952 100644
--- a/test/javascripts/models/user-test.js.es6
+++ b/test/javascripts/models/user-test.js.es6
@@ -1,46 +1,46 @@
 import User from 'discourse/models/user';
 import Group from 'discourse/models/group';
 
-module("model:user");
+QUnit.module("model:user");
 
-test('staff', function(){
+QUnit.test('staff', assert =>{
   var user = User.create({id: 1, username: 'eviltrout'});
 
-  ok(!user.get('staff'), "user is not staff");
+  assert.ok(!user.get('staff'), "user is not staff");
 
   user.toggleProperty('moderator');
-  ok(user.get('staff'), "moderators are staff");
+  assert.ok(user.get('staff'), "moderators are staff");
 
   user.setProperties({moderator: false, admin: true});
-  ok(user.get('staff'), "admins are staff");
+  assert.ok(user.get('staff'), "admins are staff");
 });
 
-test('searchContext', function() {
+QUnit.test('searchContext', assert => {
   var user = User.create({id: 1, username: 'EvilTrout'});
 
-  deepEqual(user.get('searchContext'), {type: 'user', id: 'eviltrout', user: user}, "has a search context");
+  assert.deepEqual(user.get('searchContext'), {type: 'user', id: 'eviltrout', user: user}, "has a search context");
 });
 
-test("isAllowedToUploadAFile", function() {
+QUnit.test("isAllowedToUploadAFile", assert => {
   var user = User.create({ trust_level: 0, admin: true });
-  ok(user.isAllowedToUploadAFile("image"), "admin can always upload a file");
+  assert.ok(user.isAllowedToUploadAFile("image"), "admin can always upload a file");
 
   user.setProperties({ admin: false, moderator: true });
-  ok(user.isAllowedToUploadAFile("image"), "moderator can always upload a file");
+  assert.ok(user.isAllowedToUploadAFile("image"), "moderator can always upload a file");
 });
 
-test('canMangeGroup', function() {
+QUnit.test('canMangeGroup', assert => {
   let user = User.create({ admin: true });
   let group = Group.create({ automatic: true });
 
-  equal(user.canManageGroup(group), false, "automatic groups cannot be managed.");
+  assert.equal(user.canManageGroup(group), false, "automatic groups cannot be managed.");
 
   group.set("automatic", false);
 
-  equal(user.canManageGroup(group), true, "an admin should be able to manage the group");
+  assert.equal(user.canManageGroup(group), true, "an admin should be able to manage the group");
 
   user.set('admin', false);
   group.setProperties({ is_group_owner: true });
 
-  equal(user.canManageGroup(group), true, "a group owner should be able to manage the group");
-});
+  assert.equal(user.canManageGroup(group), true, "a group owner should be able to manage the group");
+});
\ No newline at end of file
diff --git a/test/javascripts/models/version-check-test.js.es6 b/test/javascripts/models/version-check-test.js.es6
index 4b8b6bc94f1..fa1f3d78d84 100644
--- a/test/javascripts/models/version-check-test.js.es6
+++ b/test/javascripts/models/version-check-test.js.es6
@@ -1,10 +1,10 @@
 import VersionCheck from 'admin/models/version-check';
 
-module("VersionCheck");
+QUnit.module("VersionCheck");
 
-test('dataIsOld', function() {
+QUnit.test('dataIsOld', assert => {
   var dataIsOld = function(args, expected, message) {
-    equal(VersionCheck.create(args).get('dataIsOld'), expected, message);
+    assert.equal(VersionCheck.create(args).get('dataIsOld'), expected, message);
   };
 
   dataIsOld({updated_at: moment().subtract(2, 'hours').toJSON()},  false, '2 hours ago');
@@ -12,12 +12,12 @@ test('dataIsOld', function() {
   dataIsOld({updated_at: moment().subtract(2, 'hours').toJSON(), version_check_pending: true},  true, 'version check pending');
 });
 
-test('staleData', function() {
+QUnit.test('staleData', assert => {
   var updatedAt = function(hoursAgo) {
     return moment().subtract(hoursAgo, 'hours').toJSON();
   };
   var staleData = function(args, expected, message) {
-    equal(VersionCheck.create(args).get('staleData'), expected, message);
+    assert.equal(VersionCheck.create(args).get('staleData'), expected, message);
   };
 
   staleData({missing_versions_count: 0, installed_version: '0.9.3', latest_version: '0.9.3', updated_at: updatedAt(2)}, false, 'up to date');
@@ -25,4 +25,4 @@ test('staleData', function() {
   staleData({missing_versions_count: 1, installed_version: '0.9.3', latest_version: '0.9.3', updated_at: updatedAt(2)}, true,  'installed and latest match, but missing_versions_count is not 0');
   staleData({missing_versions_count: 0, installed_version: '0.9.3', latest_version: '0.9.3', updated_at: updatedAt(50)}, true, 'old version check data');
   staleData({version_check_pending: true, missing_versions_count: 0, installed_version: '0.9.4', latest_version: '0.9.3', updated_at: updatedAt(2)}, true, 'version was upgraded, but no version check has been done since the upgrade');
-});
+});
\ No newline at end of file
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 12b73912ba5..e775197aaa6 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -22,6 +22,7 @@
 //= require vendor
 //= require ember-shim
 //= require pretty-text-bundle
+//= require markdown-it-bundle
 //= require application
 //= require plugin
 //= require htmlparser.js
@@ -52,6 +53,8 @@ d.write('<script src="/javascripts/ace/ace.js"></script>');
 d.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');
 d.write('<style>#ember-testing-container { position: absolute; background: white; bottom: 0; right: 0; width: 640px; height: 384px; overflow: auto; z-index: 9999; border: 1px solid #ccc; } #ember-testing { zoom: 50%; }</style>');
 
+Ember.Test.adapter = window.QUnitAdapter.create();
+
 Discourse.rootElement = '#ember-testing';
 Discourse.setupForTesting();
 Discourse.injectTestHelpers();
@@ -108,7 +111,7 @@ QUnit.testStart(function(ctx) {
   window.sandbox.stub(ScrollingDOMMethods, "unbindOnScroll");
 
   // Unless we ever need to test this, let's leave it off.
-  $.fn.autocomplete = Ember.K;
+  $.fn.autocomplete = function() { };
 
   // Don't debounce in test unless we're testing debouncing
   if (ctx.module.indexOf('debounce') === -1) {
@@ -135,11 +138,25 @@ window.asyncTestDiscourse = helpers.asyncTestDiscourse;
 window.controllerFor = helpers.controllerFor;
 window.fixture = helpers.fixture;
 
+function getUrlParameter(name) {
+    name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
+    var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
+    var results = regex.exec(location.search);
+    return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
+};
+
+var skipCore = (getUrlParameter('qunit_skip_core') == '1');
+var pluginPath = getUrlParameter('qunit_single_plugin') ? "\/"+getUrlParameter('qunit_single_plugin')+"\/" : "\/plugins\/";
+
 Object.keys(requirejs.entries).forEach(function(entry) {
-  if ((/\-test/).test(entry)) {
+  var isTest = (/\-test/).test(entry);
+  var regex =  new RegExp(pluginPath)
+  var isPlugin = regex.test(entry);
+
+  if (isTest && (!skipCore || isPlugin)) {
     require(entry, null, null, true);
   }
 });
-require('mdtest/mdtest', null, null, true);
+
 resetSite();
 
diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js.es6
index 6542d17b12c..4e900f14741 100644
--- a/test/javascripts/widgets/actions-summary-test.js.es6
+++ b/test/javascripts/widgets/actions-summary-test.js.es6
@@ -4,7 +4,7 @@ moduleForWidget('actions-summary');
 
 widgetTest('listing actions', {
   template: '{{mount-widget widget="actions-summary" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       actionsSummary: [
         {id: 1, action: 'off_topic', description: 'very off topic'},
@@ -24,7 +24,7 @@ widgetTest('listing actions', {
 
 widgetTest('undo', {
   template: '{{mount-widget widget="actions-summary" args=args undoPostAction=undoPostAction}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       actionsSummary: [
         {action: 'off_topic', description: 'very off topic', canUndo: true},
@@ -45,7 +45,7 @@ widgetTest('undo', {
 
 widgetTest('deferFlags', {
   template: '{{mount-widget widget="actions-summary" args=args deferPostActionFlags="deferPostActionFlags"}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       actionsSummary: [
         {action: 'off_topic', description: 'very off topic', canDeferFlags: true, count: 1},
@@ -66,7 +66,7 @@ widgetTest('deferFlags', {
 
 widgetTest('post deleted', {
   template: '{{mount-widget widget="actions-summary" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       deleted_at: "2016-01-01",
       deletedByUsername: 'eviltrout',
diff --git a/test/javascripts/widgets/hamburger-menu-test.js.es6 b/test/javascripts/widgets/hamburger-menu-test.js.es6
index 9c6454e47ce..c8f67ccf1ec 100644
--- a/test/javascripts/widgets/hamburger-menu-test.js.es6
+++ b/test/javascripts/widgets/hamburger-menu-test.js.es6
@@ -5,7 +5,7 @@ moduleForWidget('hamburger-menu');
 widgetTest('prioritize faq', {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.siteSettings.faq_url = 'http://example.com/faq';
     this.currentUser.set('read_faq', false);
   },
@@ -19,7 +19,7 @@ widgetTest('prioritize faq', {
 widgetTest('prioritize faq - user has read', {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.siteSettings.faq_url = 'http://example.com/faq';
     this.currentUser.set('read_faq', true);
   },
@@ -33,7 +33,7 @@ widgetTest('prioritize faq - user has read', {
 widgetTest('staff menu - not staff', {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.currentUser.set('staff', false);
   },
 
@@ -45,7 +45,7 @@ widgetTest('staff menu - not staff', {
 widgetTest('staff menu', {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.currentUser.setProperties({ staff: true, site_flagged_posts_count: 3 });
   },
 
@@ -60,7 +60,7 @@ widgetTest('staff menu', {
 widgetTest('staff menu - admin', {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.currentUser.setProperties({ staff: true, admin: true });
   },
 
@@ -73,7 +73,7 @@ widgetTest('staff menu - admin', {
 widgetTest('queued posts', {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.currentUser.setProperties({
       staff: true,
       show_queued_posts: true,
@@ -90,7 +90,7 @@ widgetTest('queued posts', {
 widgetTest('queued posts - disabled', {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.currentUser.setProperties({ staff: true, show_queued_posts: false });
   },
 
@@ -127,7 +127,7 @@ widgetTest('general links', {
 widgetTest('badges link - disabled', {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.siteSettings.enable_badges = false;
   },
 
@@ -155,7 +155,7 @@ widgetTest('user directory link', {
 widgetTest('user directory link - disabled', {
   template: '{{mount-widget widget="hamburger-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.siteSettings.enable_user_directory = false;
   },
 
diff --git a/test/javascripts/widgets/header-test.js.es6 b/test/javascripts/widgets/header-test.js.es6
index 71676a0338c..f91ab7755ea 100644
--- a/test/javascripts/widgets/header-test.js.es6
+++ b/test/javascripts/widgets/header-test.js.es6
@@ -14,7 +14,7 @@ widgetTest('sign up / login buttons', {
   template: '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
   anonymous: true,
 
-  setup() {
+  beforeEach() {
     this.set('args', { canSignUp: true });
     this.on('showCreateAccount', () => this.signupShown = true);
     this.on('showLogin', () => this.loginShown = true);
@@ -40,7 +40,7 @@ widgetTest('anon when login required', {
   template: '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
   anonymous: true,
 
-  setup() {
+  beforeEach() {
     this.set('args', { canSignUp: true });
     this.on('showCreateAccount', () => this.signupShown = true);
     this.on('showLogin', () => this.loginShown = true);
@@ -58,7 +58,7 @@ widgetTest('anon when login required', {
 widgetTest('logged in when login required', {
   template: '{{mount-widget widget="header" showCreateAccount="showCreateAccount" showLogin="showLogin" args=args}}',
 
-  setup() {
+  beforeEach() {
     this.set('args', { canSignUp: true });
     this.on('showCreateAccount', () => this.signupShown = true);
     this.on('showLogin', () => this.loginShown = true);
diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6
index 81db555c20b..ddc032391ed 100644
--- a/test/javascripts/widgets/home-logo-test.js.es6
+++ b/test/javascripts/widgets/home-logo-test.js.es6
@@ -9,7 +9,7 @@ const title = "Cool Forum";
 
 widgetTest('basics', {
   template: '{{mount-widget widget="home-logo" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.logo_url = bigLogo;
     this.siteSettings.logo_small_url = smallLogo;
     this.siteSettings.title = title;
@@ -27,7 +27,7 @@ widgetTest('basics', {
 
 widgetTest('basics - minimized', {
   template: '{{mount-widget widget="home-logo" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.logo_url = bigLogo;
     this.siteSettings.logo_small_url= smallLogo;
     this.siteSettings.title = title;
@@ -43,7 +43,7 @@ widgetTest('basics - minimized', {
 
 widgetTest('no logo', {
   template: '{{mount-widget widget="home-logo" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.logo_url = '';
     this.siteSettings.logo_small_url = '';
     this.siteSettings.title = title;
@@ -58,7 +58,7 @@ widgetTest('no logo', {
 
 widgetTest('no logo - minimized', {
   template: '{{mount-widget widget="home-logo" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.logo_url = '';
     this.siteSettings.logo_small_url = '';
     this.siteSettings.title = title;
@@ -72,7 +72,7 @@ widgetTest('no logo - minimized', {
 
 widgetTest('mobile logo', {
   template: '{{mount-widget widget="home-logo" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.mobile_logo_url = mobileLogo;
     this.siteSettings.logo_small_url= smallLogo;
     this.site.mobileView = true;
@@ -86,7 +86,7 @@ widgetTest('mobile logo', {
 
 widgetTest('mobile without logo', {
   template: '{{mount-widget widget="home-logo" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.logo_url = bigLogo;
     this.site.mobileView = true;
   },
diff --git a/test/javascripts/widgets/post-links-test.js.es6 b/test/javascripts/widgets/post-links-test.js.es6
index 3efc3f2b0f6..c3e8f0c267f 100644
--- a/test/javascripts/widgets/post-links-test.js.es6
+++ b/test/javascripts/widgets/post-links-test.js.es6
@@ -4,7 +4,7 @@ moduleForWidget('post-links');
 
 widgetTest("duplicate links", {
   template: '{{mount-widget widget="post-links" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       id: 2,
       links: [
@@ -20,7 +20,7 @@ widgetTest("duplicate links", {
 
 widgetTest("collapsed links", {
   template: '{{mount-widget widget="post-links" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       id: 1,
       links: [
diff --git a/test/javascripts/widgets/post-stream-test.js.es6 b/test/javascripts/widgets/post-stream-test.js.es6
index 2438f8d8abe..a09cc6bcbac 100644
--- a/test/javascripts/widgets/post-stream-test.js.es6
+++ b/test/javascripts/widgets/post-stream-test.js.es6
@@ -7,7 +7,7 @@ moduleForWidget('post-stream');
 function postStreamTest(name, attrs) {
   widgetTest(name, {
     template: `{{mount-widget widget="post-stream" args=(hash posts=posts)}}`,
-    setup() {
+    beforeEach() {
       this.set('posts', attrs.posts.call(this));
     },
     test: attrs.test
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js.es6
index 80b97b548a8..c7702f68c9d 100644
--- a/test/javascripts/widgets/post-test.js.es6
+++ b/test/javascripts/widgets/post-test.js.es6
@@ -4,7 +4,7 @@ moduleForWidget('post');
 
 widgetTest('basic elements', {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { shareUrl: '/example', post_number: 1 });
   },
   test(assert) {
@@ -18,7 +18,7 @@ widgetTest('basic elements', {
 
 widgetTest('wiki', {
   template: '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { wiki: true, version: 2, canViewEditHistory: true });
     this.on('showHistory', () => this.historyShown = true);
   },
@@ -32,7 +32,7 @@ widgetTest('wiki', {
 
 widgetTest('wiki without revision', {
   template: '{{mount-widget widget="post" args=args editPost="editPost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { wiki: true, version: 1, canViewEditHistory: true });
     this.on('editPost', () => this.editPostCalled = true);
   },
@@ -46,7 +46,7 @@ widgetTest('wiki without revision', {
 
 widgetTest('via-email', {
   template: '{{mount-widget widget="post" args=args showRawEmail="showRawEmail"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { via_email: true, canViewRawEmail: true });
     this.on('showRawEmail', () => this.rawEmailShown = true);
   },
@@ -60,7 +60,7 @@ widgetTest('via-email', {
 
 widgetTest('via-email without permission', {
   template: '{{mount-widget widget="post" args=args showRawEmail="showRawEmail"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { via_email: true, canViewRawEmail: false });
     this.on('showRawEmail', () => this.rawEmailShown = true);
   },
@@ -74,7 +74,7 @@ widgetTest('via-email without permission', {
 
 widgetTest('history', {
   template: '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { version: 3, canViewEditHistory: true });
     this.on('showHistory', () => this.historyShown = true);
   },
@@ -88,7 +88,7 @@ widgetTest('history', {
 
 widgetTest('history without view permission', {
   template: '{{mount-widget widget="post" args=args showHistory="showHistory"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { version: 3, canViewEditHistory: false });
     this.on('showHistory', () => this.historyShown = true);
   },
@@ -102,7 +102,7 @@ widgetTest('history without view permission', {
 
 widgetTest('whisper', {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { isWhisper: true });
   },
   test(assert) {
@@ -113,7 +113,7 @@ widgetTest('whisper', {
 
 widgetTest('like count button', {
   template: '{{mount-widget widget="post" model=post args=args}}',
-  setup(store) {
+  beforeEach(store) {
     const topic = store.createRecord('topic', {id: 123});
     const post = store.createRecord('post', {
       id: 1,
@@ -147,7 +147,7 @@ widgetTest('like count button', {
 
 widgetTest(`like count with no likes`, {
   template: '{{mount-widget widget="post" model=post args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { likeCount: 0 });
   },
   test(assert) {
@@ -157,7 +157,7 @@ widgetTest(`like count with no likes`, {
 
 widgetTest('share button', {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { shareUrl: 'http://share-me.example.com' });
   },
   test(assert) {
@@ -167,7 +167,7 @@ widgetTest('share button', {
 
 widgetTest('liking', {
   template: '{{mount-widget widget="post-menu" args=args toggleLike="toggleLike"}}',
-  setup() {
+  beforeEach() {
     const args = { showLike: true, canToggleLike: true };
     this.set('args', args);
     this.on('toggleLike', () => {
@@ -198,7 +198,7 @@ widgetTest('liking', {
 widgetTest('anon liking', {
   template: '{{mount-widget widget="post-menu" args=args showLogin="showLogin"}}',
   anonymous: true,
-  setup() {
+  beforeEach() {
     const args = { showLike: true };
     this.set('args', args);
     this.on("showLogin", () => this.loginShown = true);
@@ -217,7 +217,7 @@ widgetTest('anon liking', {
 
 widgetTest('edit button', {
   template: '{{mount-widget widget="post" args=args editPost="editPost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canEdit: true });
     this.on('editPost', () => this.editPostCalled = true);
   },
@@ -231,7 +231,7 @@ widgetTest('edit button', {
 
 widgetTest(`edit button - can't edit`, {
   template: '{{mount-widget widget="post" args=args editPost="editPost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canEdit: false });
   },
   test(assert) {
@@ -241,7 +241,7 @@ widgetTest(`edit button - can't edit`, {
 
 widgetTest('recover button', {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canDelete: true });
     this.on('deletePost', () => this.deletePostCalled = true);
   },
@@ -255,7 +255,7 @@ widgetTest('recover button', {
 
 widgetTest('delete topic button', {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canDeleteTopic: true });
     this.on('deletePost', () => this.deletePostCalled = true);
   },
@@ -269,7 +269,7 @@ widgetTest('delete topic button', {
 
 widgetTest(`delete topic button - can't delete`, {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canDeleteTopic: false });
   },
   test(assert) {
@@ -279,7 +279,7 @@ widgetTest(`delete topic button - can't delete`, {
 
 widgetTest('recover topic button', {
   template: '{{mount-widget widget="post" args=args recoverPost="recoverPost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canRecoverTopic: true });
     this.on('recoverPost', () => this.recovered = true);
   },
@@ -291,7 +291,7 @@ widgetTest('recover topic button', {
 
 widgetTest(`recover topic button - can't recover`, {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canRecoverTopic: false });
   },
   test(assert) {
@@ -301,7 +301,7 @@ widgetTest(`recover topic button - can't recover`, {
 
 widgetTest('delete post button', {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canDelete: true });
     this.on('deletePost', () => this.deletePostCalled = true);
   },
@@ -315,7 +315,7 @@ widgetTest('delete post button', {
 
 widgetTest(`delete post button - can't delete`, {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canDelete: false });
   },
   test(assert) {
@@ -325,7 +325,7 @@ widgetTest(`delete post button - can't delete`, {
 
 widgetTest('recover post button', {
   template: '{{mount-widget widget="post" args=args recoverPost="recoverPost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canRecover: true });
     this.on('recoverPost', () => this.recovered = true);
   },
@@ -337,7 +337,7 @@ widgetTest('recover post button', {
 
 widgetTest(`recover post button - can't recover`, {
   template: '{{mount-widget widget="post" args=args deletePost="deletePost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canRecover: false });
   },
   test(assert) {
@@ -347,7 +347,7 @@ widgetTest(`recover post button - can't recover`, {
 
 widgetTest(`flagging`, {
   template: '{{mount-widget widget="post" args=args showFlags="showFlags"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canFlag: true });
     this.on('showFlags', () => this.flagsShown = true);
   },
@@ -363,7 +363,7 @@ widgetTest(`flagging`, {
 
 widgetTest(`flagging: can't flag`, {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canFlag: false });
   },
   test(assert) {
@@ -373,7 +373,7 @@ widgetTest(`flagging: can't flag`, {
 
 widgetTest(`read indicator`, {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { read: true });
   },
   test(assert) {
@@ -383,7 +383,7 @@ widgetTest(`read indicator`, {
 
 widgetTest(`unread indicator`, {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { read: false });
   },
   test(assert) {
@@ -393,7 +393,7 @@ widgetTest(`unread indicator`, {
 
 widgetTest("reply directly above (supressed)", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       replyToUsername: 'eviltrout',
       replyToAvatarTemplate: '/images/avatar.png',
@@ -408,7 +408,7 @@ widgetTest("reply directly above (supressed)", {
 
 widgetTest("reply a few posts above (supressed)", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       replyToUsername: 'eviltrout',
       replyToAvatarTemplate: '/images/avatar.png',
@@ -423,7 +423,7 @@ widgetTest("reply a few posts above (supressed)", {
 
 widgetTest("reply directly above", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       replyToUsername: 'eviltrout',
       replyToAvatarTemplate: '/images/avatar.png',
@@ -443,7 +443,7 @@ widgetTest("reply directly above", {
 
 widgetTest("cooked content hidden", {
   template: '{{mount-widget widget="post" args=args expandHidden="expandHidden"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { cooked_hidden: true });
     this.on('expandHidden', () => this.unhidden = true);
   },
@@ -457,7 +457,7 @@ widgetTest("cooked content hidden", {
 
 widgetTest("expand first post", {
   template: '{{mount-widget widget="post" model=post args=args}}',
-  setup(store) {
+  beforeEach(store) {
     this.set('args', { expandablePost: true });
     this.set('post', store.createRecord('post', { id: 1234 }));
   },
@@ -471,7 +471,7 @@ widgetTest("expand first post", {
 
 widgetTest("can't bookmark", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canBookmark: false });
   },
   test(assert) {
@@ -482,7 +482,7 @@ widgetTest("can't bookmark", {
 
 widgetTest("bookmark", {
   template: '{{mount-widget widget="post" args=args toggleBookmark="toggleBookmark"}}',
-  setup() {
+  beforeEach() {
     const args = { canBookmark: true };
 
     this.set('args', args);
@@ -501,7 +501,7 @@ widgetTest("bookmark", {
 
 widgetTest("can't show admin menu when you can't manage", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canManage: false });
   },
   test(assert) {
@@ -511,7 +511,7 @@ widgetTest("can't show admin menu when you can't manage", {
 
 widgetTest("show admin menu", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canManage: true });
   },
   test(assert) {
@@ -529,7 +529,7 @@ widgetTest("show admin menu", {
 
 widgetTest("toggle moderator post", {
   template: '{{mount-widget widget="post" args=args togglePostType="togglePostType"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canManage: true });
     this.on('togglePostType', () => this.toggled = true);
   },
@@ -544,7 +544,7 @@ widgetTest("toggle moderator post", {
 });
 widgetTest("toggle moderator post", {
   template: '{{mount-widget widget="post" args=args togglePostType="togglePostType"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canManage: true });
     this.on('togglePostType', () => this.toggled = true);
   },
@@ -560,7 +560,7 @@ widgetTest("toggle moderator post", {
 
 widgetTest("rebake post", {
   template: '{{mount-widget widget="post" args=args rebakePost="rebakePost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canManage: true });
     this.on('rebakePost', () => this.baked = true);
   },
@@ -576,7 +576,7 @@ widgetTest("rebake post", {
 
 widgetTest("unhide post", {
   template: '{{mount-widget widget="post" args=args unhidePost="unhidePost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canManage: true, hidden: true });
     this.on('unhidePost', () => this.unhidden = true);
   },
@@ -592,7 +592,7 @@ widgetTest("unhide post", {
 
 widgetTest("change owner", {
   template: '{{mount-widget widget="post" args=args changePostOwner="changePostOwner"}}',
-  setup() {
+  beforeEach() {
     this.currentUser.admin = true;
     this.set('args', { canManage: true });
     this.on('changePostOwner', () => this.owned = true);
@@ -609,7 +609,7 @@ widgetTest("change owner", {
 
 widgetTest("reply", {
   template: '{{mount-widget widget="post" args=args replyToPost="replyToPost"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canCreatePost: true });
     this.on('replyToPost', () => this.replied = true);
   },
@@ -623,7 +623,7 @@ widgetTest("reply", {
 
 widgetTest("reply - without permissions", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { canCreatePost: false });
   },
   test(assert) {
@@ -633,7 +633,7 @@ widgetTest("reply - without permissions", {
 
 widgetTest("replies - no replies", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {replyCount: 0});
   },
   test(assert) {
@@ -643,7 +643,7 @@ widgetTest("replies - no replies", {
 
 widgetTest("replies - multiple replies", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.suppress_reply_directly_below = true;
     this.set('args', {replyCount: 2, replyDirectlyBelow: true});
   },
@@ -654,7 +654,7 @@ widgetTest("replies - multiple replies", {
 
 widgetTest("replies - one below, suppressed", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.suppress_reply_directly_below = true;
     this.set('args', {replyCount: 1, replyDirectlyBelow: true});
   },
@@ -665,7 +665,7 @@ widgetTest("replies - one below, suppressed", {
 
 widgetTest("replies - one below, not suppressed", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.suppress_reply_directly_below = false;
     this.set('args', {id: 6654, replyCount: 1, replyDirectlyBelow: true});
   },
@@ -680,7 +680,7 @@ widgetTest("replies - one below, not suppressed", {
 
 widgetTest("topic map not shown", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { showTopicMap: false });
   },
   test(assert) {
@@ -690,7 +690,7 @@ widgetTest("topic map not shown", {
 
 widgetTest("topic map - few posts", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       showTopicMap: true,
       topicPostsCount: 2,
@@ -712,7 +712,7 @@ widgetTest("topic map - few posts", {
 
 widgetTest("topic map - participants", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       showTopicMap: true,
       topicPostsCount: 10,
@@ -739,7 +739,7 @@ widgetTest("topic map - participants", {
 
 widgetTest("topic map - links", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       showTopicMap: true,
       topicLinks: [
@@ -765,7 +765,7 @@ widgetTest("topic map - links", {
       assert.equal(this.$('.topic-map-expanded .topic-link').length, 5, 'it limits the links displayed');
     });
 
-    click('.link-summary a');
+    click('.link-summary button');
     andThen(() => {
       assert.equal(this.$('.topic-map-expanded .topic-link').length, 6, 'all links now shown');
     });
@@ -774,7 +774,7 @@ widgetTest("topic map - links", {
 
 widgetTest("topic map - no summary", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', { showTopicMap: true });
   },
   test(assert) {
@@ -784,7 +784,7 @@ widgetTest("topic map - no summary", {
 
 widgetTest("topic map - has summary", {
   template: '{{mount-widget widget="post" args=args toggleSummary="toggleSummary"}}',
-  setup() {
+  beforeEach() {
     this.set('args', { showTopicMap: true, hasTopicSummary: true });
     this.on('toggleSummary', () => this.summaryToggled = true);
   },
@@ -798,7 +798,7 @@ widgetTest("topic map - has summary", {
 
 widgetTest("pm map", {
   template: '{{mount-widget widget="post" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       showTopicMap: true,
       showPMMap: true,
diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js.es6
index fe9add7afde..d399e91fef2 100644
--- a/test/javascripts/widgets/poster-name-test.js.es6
+++ b/test/javascripts/widgets/poster-name-test.js.es6
@@ -4,7 +4,7 @@ moduleForWidget('poster-name');
 
 widgetTest('basic rendering', {
   template: '{{mount-widget widget="poster-name" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       username: 'eviltrout',
       usernameUrl: '/u/eviltrout',
@@ -23,7 +23,7 @@ widgetTest('basic rendering', {
 
 widgetTest('extra classes and glyphs', {
   template: '{{mount-widget widget="poster-name" args=args}}',
-  setup() {
+  beforeEach() {
     this.set('args', {
       username: 'eviltrout',
       usernameUrl: '/u/eviltrout',
@@ -46,7 +46,7 @@ widgetTest('extra classes and glyphs', {
 
 widgetTest('disable display name on posts', {
   template: '{{mount-widget widget="poster-name" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.display_name_on_posts = false;
     this.set('args', { username: 'eviltrout', name: 'Robin Ward' });
   },
@@ -57,7 +57,7 @@ widgetTest('disable display name on posts', {
 
 widgetTest("doesn't render a name if it's similar to the username", {
   template: '{{mount-widget widget="poster-name" args=args}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.prioritize_username_in_ux = true;
     this.siteSettings.display_name_on_posts = true;
     this.set('args', { username: 'eviltrout', name: 'evil-trout' });
diff --git a/test/javascripts/widgets/topic-participant-test.js.es6 b/test/javascripts/widgets/topic-participant-test.js.es6
index 078d562457f..67ba90a0635 100644
--- a/test/javascripts/widgets/topic-participant-test.js.es6
+++ b/test/javascripts/widgets/topic-participant-test.js.es6
@@ -5,7 +5,7 @@ moduleForWidget('topic-participant');
 widgetTest('one post', {
   template: '{{mount-widget widget="topic-participant" args=args}}',
 
-  setup() {
+  beforeEach() {
     this.set('args', {
       username: 'test',
       avatar_template: '/images/avatar.png',
@@ -23,7 +23,7 @@ widgetTest('one post', {
 widgetTest('many posts, a primary group with flair', {
   template: '{{mount-widget widget="topic-participant" args=args}}',
 
-  setup() {
+  beforeEach() {
     this.set('args', {
       username: 'test',
       avatar_template: '/images/avatar.png',
diff --git a/test/javascripts/widgets/user-menu-test.js.es6 b/test/javascripts/widgets/user-menu-test.js.es6
index 3c043090eb1..c208d91b4b5 100644
--- a/test/javascripts/widgets/user-menu-test.js.es6
+++ b/test/javascripts/widgets/user-menu-test.js.es6
@@ -17,7 +17,7 @@ widgetTest('basics', {
 widgetTest('log out', {
   template: '{{mount-widget widget="user-menu" logout="logout"}}',
 
-  setup() {
+  beforeEach() {
     this.on('logout', () => this.loggedOut = true);
   },
 
@@ -33,7 +33,7 @@ widgetTest('log out', {
 
 widgetTest('private messages - disabled', {
   template: '{{mount-widget widget="user-menu"}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.enable_private_messages = false;
   },
 
@@ -44,7 +44,7 @@ widgetTest('private messages - disabled', {
 
 widgetTest('private messages - enabled', {
   template: '{{mount-widget widget="user-menu"}}',
-  setup() {
+  beforeEach() {
     this.siteSettings.enable_private_messages = true;
   },
 
@@ -56,7 +56,7 @@ widgetTest('private messages - enabled', {
 widgetTest('anonymous', {
   template: '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}',
 
-  setup() {
+  beforeEach() {
     this.currentUser.setProperties({ is_anonymous: false, trust_level: 3 });
     this.siteSettings.allow_anonymous_posting = true;
     this.siteSettings.anonymous_posting_min_trust_level = 3;
@@ -76,7 +76,7 @@ widgetTest('anonymous', {
 widgetTest('anonymous - disabled', {
   template: '{{mount-widget widget="user-menu"}}',
 
-  setup() {
+  beforeEach() {
     this.siteSettings.allow_anonymous_posting = false;
   },
 
@@ -88,7 +88,7 @@ widgetTest('anonymous - disabled', {
 widgetTest('anonymous - switch back', {
   template: '{{mount-widget widget="user-menu" toggleAnonymous="toggleAnonymous"}}',
 
-  setup() {
+  beforeEach() {
     this.currentUser.setProperties({ is_anonymous: true });
     this.siteSettings.allow_anonymous_posting = true;
 
@@ -103,4 +103,3 @@ widgetTest('anonymous - switch back', {
     });
   }
 });
-
diff --git a/test/javascripts/widgets/widget-test.js.es6 b/test/javascripts/widgets/widget-test.js.es6
index ed52f81bee4..7ea8432d7c3 100644
--- a/test/javascripts/widgets/widget-test.js.es6
+++ b/test/javascripts/widgets/widget-test.js.es6
@@ -7,7 +7,7 @@ moduleForWidget('base');
 widgetTest('widget attributes are passed in via args', {
   template: `{{mount-widget widget="hello-test" args=args}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('hello-test', {
       tagName: 'div.test',
 
@@ -27,7 +27,7 @@ widgetTest('widget attributes are passed in via args', {
 widgetTest('buildClasses', {
   template: `{{mount-widget widget="classname-test" args=args}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('classname-test', {
       tagName: 'div.test',
 
@@ -47,7 +47,7 @@ widgetTest('buildClasses', {
 widgetTest('buildAttributes', {
   template: `{{mount-widget widget="attributes-test" args=args}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('attributes-test', {
       tagName: 'div.test',
 
@@ -68,7 +68,7 @@ widgetTest('buildAttributes', {
 widgetTest('buildId', {
   template: `{{mount-widget widget="id-test" args=args}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('id-test', {
       buildId(attrs) {
         return `test-${attrs.id}`;
@@ -86,7 +86,7 @@ widgetTest('buildId', {
 widgetTest('widget state', {
   template: `{{mount-widget widget="state-test"}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('state-test', {
       tagName: 'button.test',
       buildKey: () => `button-test`,
@@ -119,7 +119,7 @@ widgetTest('widget state', {
 widgetTest('widget update with promise', {
   template: `{{mount-widget widget="promise-test"}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('promise-test', {
       tagName: 'button.test',
       buildKey: () => 'promise-test',
@@ -152,7 +152,7 @@ widgetTest('widget update with promise', {
 widgetTest('widget attaching', {
   template: `{{mount-widget widget="attach-test"}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('test-embedded', { tagName: 'div.embedded' });
 
     createWidget('attach-test', {
@@ -172,7 +172,7 @@ widgetTest('widget attaching', {
 widgetTest('widget decorating', {
   template: `{{mount-widget widget="decorate-test"}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('decorate-test', {
       tagName: 'div.decorate',
       html() {
@@ -201,7 +201,7 @@ widgetTest('widget decorating', {
 widgetTest('widget settings', {
   template: `{{mount-widget widget="settings-test"}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('settings-test', {
       tagName: 'div.settings',
 
@@ -223,7 +223,7 @@ widgetTest('widget settings', {
 widgetTest('override settings', {
   template: `{{mount-widget widget="ov-settings-test"}}`,
 
-  setup() {
+  beforeEach() {
     createWidget('ov-settings-test', {
       tagName: 'div.settings',
 
diff --git a/test/stylesheets/test_helper.css b/test/stylesheets/test_helper.css
index f9eddae24dc..c42fb810acf 100644
--- a/test/stylesheets/test_helper.css
+++ b/test/stylesheets/test_helper.css
@@ -3,11 +3,3 @@
 .modal-backdrop {
   display: none;
 }
-
-.emoji-modal-wrapper {
-  display: none;
-}
-
-.emoji-modal {
-  position: relative;
-}
diff --git a/vendor/assets/javascripts/babel.js b/vendor/assets/javascripts/babel.js
new file mode 100644
index 00000000000..8a341e11749
--- /dev/null
+++ b/vendor/assets/javascripts/babel.js
@@ -0,0 +1,62846 @@
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["Babel"] = factory();
+	else
+		root["Babel"] = factory();
+})(this, function() {
+return /******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.loaded = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(0);
+/******/ })
+/************************************************************************/
+/******/ ((function(modules) {
+	// Check all modules for deduplicated modules
+	for(var i in modules) {
+		if(Object.prototype.hasOwnProperty.call(modules, i)) {
+			switch(typeof modules[i]) {
+			case "function": break;
+			case "object":
+				// Module can be created from a template
+				modules[i] = (function(_m) {
+					var args = _m.slice(1), fn = modules[_m[0]];
+					return function (a,b,c) {
+						fn.apply(this, [a,b,c].concat(args));
+					};
+				}(modules[i]));
+				break;
+			default:
+				// Module is a copy of another module
+				modules[i] = modules[modules[i]];
+				break;
+			}
+		}
+	}
+	return modules;
+}([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	Object.defineProperty(exports, "__esModule", {
+	  value: true
+	});
+	exports.version = exports.buildExternalHelpers = exports.availablePresets = exports.availablePlugins = undefined;
+
+	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	exports.transform = transform;
+	exports.transformFromAst = transformFromAst;
+	exports.registerPlugin = registerPlugin;
+	exports.registerPlugins = registerPlugins;
+	exports.registerPreset = registerPreset;
+	exports.registerPresets = registerPresets;
+	exports.transformScriptTags = transformScriptTags;
+	exports.disableScriptTags = disableScriptTags;
+
+	var _babelCore = __webpack_require__(286);
+
+	var Babel = _interopRequireWildcard(_babelCore);
+
+	var _transformScriptTags = __webpack_require__(620);
+
+	function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
+	var isArray = Array.isArray || function (arg) {
+	  return Object.prototype.toString.call(arg) === '[object Array]';
+	};
+
+	/**
+	 * Loads the given name (or [name, options] pair) from the given table object
+	 * holding the available presets or plugins.
+	 *
+	 * Returns undefined if the preset or plugin is not available; passes through
+	 * name unmodified if it (or the first element of the pair) is not a string.
+	 */
+	function loadBuiltin(builtinTable, name) {
+	  if (isArray(name) && typeof name[0] === 'string') {
+	    if (builtinTable.hasOwnProperty(name[0])) {
+	      return [builtinTable[name[0]]].concat(name.slice(1));
+	    }
+	    return;
+	  } else if (typeof name === 'string') {
+	    return builtinTable[name];
+	  }
+	  // Could be an actual preset/plugin module
+	  return name;
+	}
+
+	/**
+	 * Parses plugin names and presets from the specified options.
+	 */
+	function processOptions(options) {
+	  // Parse preset names
+	  var presets = (options.presets || []).map(function (presetName) {
+	    var preset = loadBuiltin(availablePresets, presetName);
+
+	    if (preset) {
+	      // workaround for babel issue
+	      // at some point, babel copies the preset, losing the non-enumerable
+	      // buildPreset key; convert it into an enumerable key.
+	      if (isArray(preset) && _typeof(preset[0]) === 'object' && preset[0].hasOwnProperty('buildPreset')) {
+	        preset[0] = _extends({}, preset[0], { buildPreset: preset[0].buildPreset });
+	      }
+	    } else {
+	      throw new Error('Invalid preset specified in Babel options: "' + presetName + '"');
+	    }
+	    return preset;
+	  });
+
+	  // Parse plugin names
+	  var plugins = (options.plugins || []).map(function (pluginName) {
+	    var plugin = loadBuiltin(availablePlugins, pluginName);
+
+	    if (!plugin) {
+	      throw new Error('Invalid plugin specified in Babel options: "' + pluginName + '"');
+	    }
+	    return plugin;
+	  });
+
+	  return _extends({
+	    babelrc: false
+	  }, options, {
+	    presets: presets,
+	    plugins: plugins
+	  });
+	}
+
+	function transform(code, options) {
+	  return Babel.transform(code, processOptions(options));
+	}
+
+	function transformFromAst(ast, code, options) {
+	  return Babel.transformFromAst(ast, code, processOptions(options));
+	}
+	var availablePlugins = exports.availablePlugins = {};
+	var availablePresets = exports.availablePresets = {};
+	var buildExternalHelpers = exports.buildExternalHelpers = Babel.buildExternalHelpers;
+	/**
+	 * Registers a named plugin for use with Babel.
+	 */
+	function registerPlugin(name, plugin) {
+	  if (availablePlugins.hasOwnProperty(name)) {
+	    console.warn('A plugin named "' + name + '" is already registered, it will be overridden');
+	  }
+	  availablePlugins[name] = plugin;
+	}
+	/**
+	 * Registers multiple plugins for use with Babel. `newPlugins` should be an object where the key
+	 * is the name of the plugin, and the value is the plugin itself.
+	 */
+	function registerPlugins(newPlugins) {
+	  Object.keys(newPlugins).forEach(function (name) {
+	    return registerPlugin(name, newPlugins[name]);
+	  });
+	}
+
+	/**
+	 * Registers a named preset for use with Babel.
+	 */
+	function registerPreset(name, preset) {
+	  if (availablePresets.hasOwnProperty(name)) {
+	    console.warn('A preset named "' + name + '" is already registered, it will be overridden');
+	  }
+	  availablePresets[name] = preset;
+	}
+	/**
+	 * Registers multiple presets for use with Babel. `newPresets` should be an object where the key
+	 * is the name of the preset, and the value is the preset itself.
+	 */
+	function registerPresets(newPresets) {
+	  Object.keys(newPresets).forEach(function (name) {
+	    return registerPreset(name, newPresets[name]);
+	  });
+	}
+
+	// All the plugins we should bundle
+	registerPlugins({
+	  'check-es2015-constants': __webpack_require__(64),
+	  'external-helpers': __webpack_require__(318),
+	  'inline-replace-variables': __webpack_require__(319),
+	  'syntax-async-functions': __webpack_require__(65),
+	  'syntax-async-generators': __webpack_require__(191),
+	  'syntax-class-constructor-call': __webpack_require__(192),
+	  'syntax-class-properties': __webpack_require__(193),
+	  'syntax-decorators': __webpack_require__(124),
+	  'syntax-do-expressions': __webpack_require__(194),
+	  'syntax-exponentiation-operator': __webpack_require__(195),
+	  'syntax-export-extensions': __webpack_require__(196),
+	  'syntax-flow': __webpack_require__(125),
+	  'syntax-function-bind': __webpack_require__(197),
+	  'syntax-function-sent': __webpack_require__(321),
+	  'syntax-jsx': __webpack_require__(126),
+	  'syntax-object-rest-spread': __webpack_require__(198),
+	  'syntax-trailing-function-commas': __webpack_require__(127),
+	  'transform-async-functions': __webpack_require__(322),
+	  'transform-async-to-generator': __webpack_require__(128),
+	  'transform-async-to-module-method': __webpack_require__(324),
+	  'transform-class-constructor-call': __webpack_require__(199),
+	  'transform-class-properties': __webpack_require__(200),
+	  'transform-decorators': __webpack_require__(201),
+	  'transform-decorators-legacy': __webpack_require__(325).default, // <- No clue. Nope.
+	  'transform-do-expressions': __webpack_require__(202),
+	  'transform-es2015-arrow-functions': __webpack_require__(66),
+	  'transform-es2015-block-scoped-functions': __webpack_require__(67),
+	  'transform-es2015-block-scoping': __webpack_require__(68),
+	  'transform-es2015-classes': __webpack_require__(69),
+	  'transform-es2015-computed-properties': __webpack_require__(70),
+	  'transform-es2015-destructuring': __webpack_require__(71),
+	  'transform-es2015-duplicate-keys': __webpack_require__(129),
+	  'transform-es2015-for-of': __webpack_require__(72),
+	  'transform-es2015-function-name': __webpack_require__(73),
+	  'transform-es2015-instanceof': __webpack_require__(328),
+	  'transform-es2015-literals': __webpack_require__(74),
+	  'transform-es2015-modules-amd': __webpack_require__(130),
+	  'transform-es2015-modules-commonjs': __webpack_require__(75),
+	  'transform-es2015-modules-systemjs': __webpack_require__(204),
+	  'transform-es2015-modules-umd': __webpack_require__(205),
+	  'transform-es2015-object-super': __webpack_require__(76),
+	  'transform-es2015-parameters': __webpack_require__(77),
+	  'transform-es2015-shorthand-properties': __webpack_require__(78),
+	  'transform-es2015-spread': __webpack_require__(79),
+	  'transform-es2015-sticky-regex': __webpack_require__(80),
+	  'transform-es2015-template-literals': __webpack_require__(81),
+	  'transform-es2015-typeof-symbol': __webpack_require__(82),
+	  'transform-es2015-unicode-regex': __webpack_require__(83),
+	  'transform-es3-member-expression-literals': __webpack_require__(332),
+	  'transform-es3-property-literals': __webpack_require__(333),
+	  'transform-es5-property-mutators': __webpack_require__(334),
+	  'transform-eval': __webpack_require__(335),
+	  'transform-exponentiation-operator': __webpack_require__(131),
+	  'transform-export-extensions': __webpack_require__(206),
+	  'transform-flow-comments': __webpack_require__(336),
+	  'transform-flow-strip-types': __webpack_require__(207),
+	  'transform-function-bind': __webpack_require__(208),
+	  'transform-jscript': __webpack_require__(337),
+	  'transform-object-assign': __webpack_require__(338),
+	  'transform-object-rest-spread': __webpack_require__(209),
+	  'transform-object-set-prototype-of-to-assign': __webpack_require__(339),
+	  'transform-proto-to-assign': __webpack_require__(340),
+	  'transform-react-constant-elements': __webpack_require__(341),
+	  'transform-react-display-name': __webpack_require__(210),
+	  'transform-react-inline-elements': __webpack_require__(342),
+	  'transform-react-jsx': __webpack_require__(211),
+	  'transform-react-jsx-compat': __webpack_require__(343),
+	  'transform-react-jsx-self': __webpack_require__(345),
+	  'transform-react-jsx-source': __webpack_require__(346),
+	  'transform-regenerator': __webpack_require__(84),
+	  'transform-runtime': __webpack_require__(349),
+	  'transform-strict-mode': __webpack_require__(212),
+	  'undeclared-variables-check': __webpack_require__(350)
+	});
+
+	// All the presets we should bundle
+	registerPresets({
+	  es2015: __webpack_require__(213),
+	  es2016: __webpack_require__(214),
+	  es2017: __webpack_require__(215),
+	  latest: __webpack_require__(352),
+	  react: __webpack_require__(353),
+	  'stage-0': __webpack_require__(354),
+	  'stage-1': __webpack_require__(216),
+	  'stage-2': __webpack_require__(217),
+	  'stage-3': __webpack_require__(218),
+
+	  // ES2015 preset with es2015-modules-commonjs removed
+	  // Plugin list copied from babel-preset-es2015/index.js
+	  'es2015-no-commonjs': {
+	    plugins: [__webpack_require__(81), __webpack_require__(74), __webpack_require__(73), __webpack_require__(66), __webpack_require__(67), __webpack_require__(69), __webpack_require__(76), __webpack_require__(78), __webpack_require__(70), __webpack_require__(72), __webpack_require__(80), __webpack_require__(83), __webpack_require__(64), __webpack_require__(79), __webpack_require__(77), __webpack_require__(71), __webpack_require__(68), __webpack_require__(82), [__webpack_require__(84), { async: false, asyncGenerators: false }]]
+	  },
+
+	  // ES2015 preset with plugins set to loose mode.
+	  // Based off https://github.com/bkonkle/babel-preset-es2015-loose/blob/master/index.js
+	  'es2015-loose': {
+	    plugins: [[__webpack_require__(81), { loose: true }], __webpack_require__(74), __webpack_require__(73), __webpack_require__(66), __webpack_require__(67), [__webpack_require__(69), { loose: true }], __webpack_require__(76), __webpack_require__(78), __webpack_require__(129), [__webpack_require__(70), { loose: true }], [__webpack_require__(72), { loose: true }], __webpack_require__(80), __webpack_require__(83), __webpack_require__(64), [__webpack_require__(79), { loose: true }], __webpack_require__(77), [__webpack_require__(71), { loose: true }], __webpack_require__(68), __webpack_require__(82), [__webpack_require__(75), { loose: true }], [__webpack_require__(84), { async: false, asyncGenerators: false }]]
+	  }
+	});
+
+	var version = exports.version = ("6.25.0");
+
+	// Listen for load event if we're in a browser and then kick off finding and
+	// running of scripts with "text/babel" type.
+	if (typeof window !== 'undefined' && window && window.addEventListener) {
+	  window.addEventListener('DOMContentLoaded', function () {
+	    return transformScriptTags();
+	  }, false);
+	}
+
+	/**
+	 * Transform <script> tags with "text/babel" type.
+	 * @param {Array} scriptTags specify script tags to transform, transform all in the <head> if not given
+	 */
+	function transformScriptTags(scriptTags) {
+	  (0, _transformScriptTags.runScripts)(transform, scriptTags);
+	}
+
+	/**
+	 * Disables automatic transformation of <script> tags with "text/babel" type.
+	 */
+	function disableScriptTags() {
+	  window.removeEventListener('DOMContentLoaded', transformScriptTags);
+	}
+
+/***/ }),
+/* 1 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.createTypeAnnotationBasedOnTypeof = exports.removeTypeDuplicates = exports.createUnionTypeAnnotation = exports.valueToNode = exports.toBlock = exports.toExpression = exports.toStatement = exports.toBindingIdentifierName = exports.toIdentifier = exports.toKeyAlias = exports.toSequenceExpression = exports.toComputedKey = exports.isNodesEquivalent = exports.isImmutable = exports.isScope = exports.isSpecifierDefault = exports.isVar = exports.isBlockScoped = exports.isLet = exports.isValidIdentifier = exports.isReferenced = exports.isBinding = exports.getOuterBindingIdentifiers = exports.getBindingIdentifiers = exports.TYPES = exports.react = exports.DEPRECATED_KEYS = exports.BUILDER_KEYS = exports.NODE_FIELDS = exports.ALIAS_KEYS = exports.VISITOR_KEYS = exports.NOT_LOCAL_BINDING = exports.BLOCK_SCOPED_SYMBOL = exports.INHERIT_KEYS = exports.UNARY_OPERATORS = exports.STRING_UNARY_OPERATORS = exports.NUMBER_UNARY_OPERATORS = exports.BOOLEAN_UNARY_OPERATORS = exports.BINARY_OPERATORS = exports.NUMBER_BINARY_OPERATORS = exports.BOOLEAN_BINARY_OPERATORS = exports.COMPARISON_BINARY_OPERATORS = exports.EQUALITY_BINARY_OPERATORS = exports.BOOLEAN_NUMBER_BINARY_OPERATORS = exports.UPDATE_OPERATORS = exports.LOGICAL_OPERATORS = exports.COMMENT_KEYS = exports.FOR_INIT_KEYS = exports.FLATTENABLE_KEYS = exports.STATEMENT_OR_BLOCK_KEYS = undefined;
+
+	var _getOwnPropertySymbols = __webpack_require__(356);
+
+	var _getOwnPropertySymbols2 = _interopRequireDefault(_getOwnPropertySymbols);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _keys = __webpack_require__(13);
+
+	var _keys2 = _interopRequireDefault(_keys);
+
+	var _stringify = __webpack_require__(34);
+
+	var _stringify2 = _interopRequireDefault(_stringify);
+
+	var _constants = __webpack_require__(134);
+
+	Object.defineProperty(exports, "STATEMENT_OR_BLOCK_KEYS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.STATEMENT_OR_BLOCK_KEYS;
+	  }
+	});
+	Object.defineProperty(exports, "FLATTENABLE_KEYS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.FLATTENABLE_KEYS;
+	  }
+	});
+	Object.defineProperty(exports, "FOR_INIT_KEYS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.FOR_INIT_KEYS;
+	  }
+	});
+	Object.defineProperty(exports, "COMMENT_KEYS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.COMMENT_KEYS;
+	  }
+	});
+	Object.defineProperty(exports, "LOGICAL_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.LOGICAL_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "UPDATE_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.UPDATE_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "BOOLEAN_NUMBER_BINARY_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.BOOLEAN_NUMBER_BINARY_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "EQUALITY_BINARY_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.EQUALITY_BINARY_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "COMPARISON_BINARY_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.COMPARISON_BINARY_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "BOOLEAN_BINARY_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.BOOLEAN_BINARY_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "NUMBER_BINARY_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.NUMBER_BINARY_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "BINARY_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.BINARY_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "BOOLEAN_UNARY_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.BOOLEAN_UNARY_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "NUMBER_UNARY_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.NUMBER_UNARY_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "STRING_UNARY_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.STRING_UNARY_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "UNARY_OPERATORS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.UNARY_OPERATORS;
+	  }
+	});
+	Object.defineProperty(exports, "INHERIT_KEYS", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.INHERIT_KEYS;
+	  }
+	});
+	Object.defineProperty(exports, "BLOCK_SCOPED_SYMBOL", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.BLOCK_SCOPED_SYMBOL;
+	  }
+	});
+	Object.defineProperty(exports, "NOT_LOCAL_BINDING", {
+	  enumerable: true,
+	  get: function get() {
+	    return _constants.NOT_LOCAL_BINDING;
+	  }
+	});
+	exports.is = is;
+	exports.isType = isType;
+	exports.validate = validate;
+	exports.shallowEqual = shallowEqual;
+	exports.appendToMemberExpression = appendToMemberExpression;
+	exports.prependToMemberExpression = prependToMemberExpression;
+	exports.ensureBlock = ensureBlock;
+	exports.clone = clone;
+	exports.cloneWithoutLoc = cloneWithoutLoc;
+	exports.cloneDeep = cloneDeep;
+	exports.buildMatchMemberExpression = buildMatchMemberExpression;
+	exports.removeComments = removeComments;
+	exports.inheritsComments = inheritsComments;
+	exports.inheritTrailingComments = inheritTrailingComments;
+	exports.inheritLeadingComments = inheritLeadingComments;
+	exports.inheritInnerComments = inheritInnerComments;
+	exports.inherits = inherits;
+	exports.assertNode = assertNode;
+	exports.isNode = isNode;
+	exports.traverseFast = traverseFast;
+	exports.removeProperties = removeProperties;
+	exports.removePropertiesDeep = removePropertiesDeep;
+
+	var _retrievers = __webpack_require__(222);
+
+	Object.defineProperty(exports, "getBindingIdentifiers", {
+	  enumerable: true,
+	  get: function get() {
+	    return _retrievers.getBindingIdentifiers;
+	  }
+	});
+	Object.defineProperty(exports, "getOuterBindingIdentifiers", {
+	  enumerable: true,
+	  get: function get() {
+	    return _retrievers.getOuterBindingIdentifiers;
+	  }
+	});
+
+	var _validators = __webpack_require__(391);
+
+	Object.defineProperty(exports, "isBinding", {
+	  enumerable: true,
+	  get: function get() {
+	    return _validators.isBinding;
+	  }
+	});
+	Object.defineProperty(exports, "isReferenced", {
+	  enumerable: true,
+	  get: function get() {
+	    return _validators.isReferenced;
+	  }
+	});
+	Object.defineProperty(exports, "isValidIdentifier", {
+	  enumerable: true,
+	  get: function get() {
+	    return _validators.isValidIdentifier;
+	  }
+	});
+	Object.defineProperty(exports, "isLet", {
+	  enumerable: true,
+	  get: function get() {
+	    return _validators.isLet;
+	  }
+	});
+	Object.defineProperty(exports, "isBlockScoped", {
+	  enumerable: true,
+	  get: function get() {
+	    return _validators.isBlockScoped;
+	  }
+	});
+	Object.defineProperty(exports, "isVar", {
+	  enumerable: true,
+	  get: function get() {
+	    return _validators.isVar;
+	  }
+	});
+	Object.defineProperty(exports, "isSpecifierDefault", {
+	  enumerable: true,
+	  get: function get() {
+	    return _validators.isSpecifierDefault;
+	  }
+	});
+	Object.defineProperty(exports, "isScope", {
+	  enumerable: true,
+	  get: function get() {
+	    return _validators.isScope;
+	  }
+	});
+	Object.defineProperty(exports, "isImmutable", {
+	  enumerable: true,
+	  get: function get() {
+	    return _validators.isImmutable;
+	  }
+	});
+	Object.defineProperty(exports, "isNodesEquivalent", {
+	  enumerable: true,
+	  get: function get() {
+	    return _validators.isNodesEquivalent;
+	  }
+	});
+
+	var _converters = __webpack_require__(381);
+
+	Object.defineProperty(exports, "toComputedKey", {
+	  enumerable: true,
+	  get: function get() {
+	    return _converters.toComputedKey;
+	  }
+	});
+	Object.defineProperty(exports, "toSequenceExpression", {
+	  enumerable: true,
+	  get: function get() {
+	    return _converters.toSequenceExpression;
+	  }
+	});
+	Object.defineProperty(exports, "toKeyAlias", {
+	  enumerable: true,
+	  get: function get() {
+	    return _converters.toKeyAlias;
+	  }
+	});
+	Object.defineProperty(exports, "toIdentifier", {
+	  enumerable: true,
+	  get: function get() {
+	    return _converters.toIdentifier;
+	  }
+	});
+	Object.defineProperty(exports, "toBindingIdentifierName", {
+	  enumerable: true,
+	  get: function get() {
+	    return _converters.toBindingIdentifierName;
+	  }
+	});
+	Object.defineProperty(exports, "toStatement", {
+	  enumerable: true,
+	  get: function get() {
+	    return _converters.toStatement;
+	  }
+	});
+	Object.defineProperty(exports, "toExpression", {
+	  enumerable: true,
+	  get: function get() {
+	    return _converters.toExpression;
+	  }
+	});
+	Object.defineProperty(exports, "toBlock", {
+	  enumerable: true,
+	  get: function get() {
+	    return _converters.toBlock;
+	  }
+	});
+	Object.defineProperty(exports, "valueToNode", {
+	  enumerable: true,
+	  get: function get() {
+	    return _converters.valueToNode;
+	  }
+	});
+
+	var _flow = __webpack_require__(389);
+
+	Object.defineProperty(exports, "createUnionTypeAnnotation", {
+	  enumerable: true,
+	  get: function get() {
+	    return _flow.createUnionTypeAnnotation;
+	  }
+	});
+	Object.defineProperty(exports, "removeTypeDuplicates", {
+	  enumerable: true,
+	  get: function get() {
+	    return _flow.removeTypeDuplicates;
+	  }
+	});
+	Object.defineProperty(exports, "createTypeAnnotationBasedOnTypeof", {
+	  enumerable: true,
+	  get: function get() {
+	    return _flow.createTypeAnnotationBasedOnTypeof;
+	  }
+	});
+
+	var _toFastProperties = __webpack_require__(615);
+
+	var _toFastProperties2 = _interopRequireDefault(_toFastProperties);
+
+	var _clone = __webpack_require__(109);
+
+	var _clone2 = _interopRequireDefault(_clone);
+
+	var _uniq = __webpack_require__(591);
+
+	var _uniq2 = _interopRequireDefault(_uniq);
+
+	__webpack_require__(386);
+
+	var _definitions = __webpack_require__(26);
+
+	var _react2 = __webpack_require__(390);
+
+	var _react = _interopRequireWildcard(_react2);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var t = exports;
+
+	function registerType(type) {
+	  var is = t["is" + type];
+	  if (!is) {
+	    is = t["is" + type] = function (node, opts) {
+	      return t.is(type, node, opts);
+	    };
+	  }
+
+	  t["assert" + type] = function (node, opts) {
+	    opts = opts || {};
+	    if (!is(node, opts)) {
+	      throw new Error("Expected type " + (0, _stringify2.default)(type) + " with option " + (0, _stringify2.default)(opts));
+	    }
+	  };
+	}
+
+	exports.VISITOR_KEYS = _definitions.VISITOR_KEYS;
+	exports.ALIAS_KEYS = _definitions.ALIAS_KEYS;
+	exports.NODE_FIELDS = _definitions.NODE_FIELDS;
+	exports.BUILDER_KEYS = _definitions.BUILDER_KEYS;
+	exports.DEPRECATED_KEYS = _definitions.DEPRECATED_KEYS;
+	exports.react = _react;
+
+	for (var type in t.VISITOR_KEYS) {
+	  registerType(type);
+	}
+
+	t.FLIPPED_ALIAS_KEYS = {};
+
+	(0, _keys2.default)(t.ALIAS_KEYS).forEach(function (type) {
+	  t.ALIAS_KEYS[type].forEach(function (alias) {
+	    var types = t.FLIPPED_ALIAS_KEYS[alias] = t.FLIPPED_ALIAS_KEYS[alias] || [];
+	    types.push(type);
+	  });
+	});
+
+	(0, _keys2.default)(t.FLIPPED_ALIAS_KEYS).forEach(function (type) {
+	  t[type.toUpperCase() + "_TYPES"] = t.FLIPPED_ALIAS_KEYS[type];
+	  registerType(type);
+	});
+
+	var TYPES = exports.TYPES = (0, _keys2.default)(t.VISITOR_KEYS).concat((0, _keys2.default)(t.FLIPPED_ALIAS_KEYS)).concat((0, _keys2.default)(t.DEPRECATED_KEYS));
+
+	function is(type, node, opts) {
+	  if (!node) return false;
+
+	  var matches = isType(node.type, type);
+	  if (!matches) return false;
+
+	  if (typeof opts === "undefined") {
+	    return true;
+	  } else {
+	    return t.shallowEqual(node, opts);
+	  }
+	}
+
+	function isType(nodeType, targetType) {
+	  if (nodeType === targetType) return true;
+
+	  if (t.ALIAS_KEYS[targetType]) return false;
+
+	  var aliases = t.FLIPPED_ALIAS_KEYS[targetType];
+	  if (aliases) {
+	    if (aliases[0] === nodeType) return true;
+
+	    for (var _iterator = aliases, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var alias = _ref;
+
+	      if (nodeType === alias) return true;
+	    }
+	  }
+
+	  return false;
+	}
+
+	(0, _keys2.default)(t.BUILDER_KEYS).forEach(function (type) {
+	  var keys = t.BUILDER_KEYS[type];
+
+	  function builder() {
+	    if (arguments.length > keys.length) {
+	      throw new Error("t." + type + ": Too many arguments passed. Received " + arguments.length + " but can receive " + ("no more than " + keys.length));
+	    }
+
+	    var node = {};
+	    node.type = type;
+
+	    var i = 0;
+
+	    for (var _iterator2 = keys, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var _key = _ref2;
+
+	      var field = t.NODE_FIELDS[type][_key];
+
+	      var arg = arguments[i++];
+	      if (arg === undefined) arg = (0, _clone2.default)(field.default);
+
+	      node[_key] = arg;
+	    }
+
+	    for (var key in node) {
+	      validate(node, key, node[key]);
+	    }
+
+	    return node;
+	  }
+
+	  t[type] = builder;
+	  t[type[0].toLowerCase() + type.slice(1)] = builder;
+	});
+
+	var _loop = function _loop(_type) {
+	  var newType = t.DEPRECATED_KEYS[_type];
+
+	  function proxy(fn) {
+	    return function () {
+	      console.trace("The node type " + _type + " has been renamed to " + newType);
+	      return fn.apply(this, arguments);
+	    };
+	  }
+
+	  t[_type] = t[_type[0].toLowerCase() + _type.slice(1)] = proxy(t[newType]);
+	  t["is" + _type] = proxy(t["is" + newType]);
+	  t["assert" + _type] = proxy(t["assert" + newType]);
+	};
+
+	for (var _type in t.DEPRECATED_KEYS) {
+	  _loop(_type);
+	}
+
+	function validate(node, key, val) {
+	  if (!node) return;
+
+	  var fields = t.NODE_FIELDS[node.type];
+	  if (!fields) return;
+
+	  var field = fields[key];
+	  if (!field || !field.validate) return;
+	  if (field.optional && val == null) return;
+
+	  field.validate(node, key, val);
+	}
+
+	function shallowEqual(actual, expected) {
+	  var keys = (0, _keys2.default)(expected);
+
+	  for (var _iterator3 = keys, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	    var _ref3;
+
+	    if (_isArray3) {
+	      if (_i3 >= _iterator3.length) break;
+	      _ref3 = _iterator3[_i3++];
+	    } else {
+	      _i3 = _iterator3.next();
+	      if (_i3.done) break;
+	      _ref3 = _i3.value;
+	    }
+
+	    var key = _ref3;
+
+	    if (actual[key] !== expected[key]) {
+	      return false;
+	    }
+	  }
+
+	  return true;
+	}
+
+	function appendToMemberExpression(member, append, computed) {
+	  member.object = t.memberExpression(member.object, member.property, member.computed);
+	  member.property = append;
+	  member.computed = !!computed;
+	  return member;
+	}
+
+	function prependToMemberExpression(member, prepend) {
+	  member.object = t.memberExpression(prepend, member.object);
+	  return member;
+	}
+
+	function ensureBlock(node) {
+	  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "body";
+
+	  return node[key] = t.toBlock(node[key], node);
+	}
+
+	function clone(node) {
+	  if (!node) return node;
+	  var newNode = {};
+	  for (var key in node) {
+	    if (key[0] === "_") continue;
+	    newNode[key] = node[key];
+	  }
+	  return newNode;
+	}
+
+	function cloneWithoutLoc(node) {
+	  var newNode = clone(node);
+	  delete newNode.loc;
+	  return newNode;
+	}
+
+	function cloneDeep(node) {
+	  if (!node) return node;
+	  var newNode = {};
+
+	  for (var key in node) {
+	    if (key[0] === "_") continue;
+
+	    var val = node[key];
+
+	    if (val) {
+	      if (val.type) {
+	        val = t.cloneDeep(val);
+	      } else if (Array.isArray(val)) {
+	        val = val.map(t.cloneDeep);
+	      }
+	    }
+
+	    newNode[key] = val;
+	  }
+
+	  return newNode;
+	}
+
+	function buildMatchMemberExpression(match, allowPartial) {
+	  var parts = match.split(".");
+
+	  return function (member) {
+	    if (!t.isMemberExpression(member)) return false;
+
+	    var search = [member];
+	    var i = 0;
+
+	    while (search.length) {
+	      var node = search.shift();
+
+	      if (allowPartial && i === parts.length) {
+	        return true;
+	      }
+
+	      if (t.isIdentifier(node)) {
+	        if (parts[i] !== node.name) return false;
+	      } else if (t.isStringLiteral(node)) {
+	        if (parts[i] !== node.value) return false;
+	      } else if (t.isMemberExpression(node)) {
+	        if (node.computed && !t.isStringLiteral(node.property)) {
+	          return false;
+	        } else {
+	          search.push(node.object);
+	          search.push(node.property);
+	          continue;
+	        }
+	      } else {
+	        return false;
+	      }
+
+	      if (++i > parts.length) {
+	        return false;
+	      }
+	    }
+
+	    return true;
+	  };
+	}
+
+	function removeComments(node) {
+	  for (var _iterator4 = t.COMMENT_KEYS, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	    var _ref4;
+
+	    if (_isArray4) {
+	      if (_i4 >= _iterator4.length) break;
+	      _ref4 = _iterator4[_i4++];
+	    } else {
+	      _i4 = _iterator4.next();
+	      if (_i4.done) break;
+	      _ref4 = _i4.value;
+	    }
+
+	    var key = _ref4;
+
+	    delete node[key];
+	  }
+	  return node;
+	}
+
+	function inheritsComments(child, parent) {
+	  inheritTrailingComments(child, parent);
+	  inheritLeadingComments(child, parent);
+	  inheritInnerComments(child, parent);
+	  return child;
+	}
+
+	function inheritTrailingComments(child, parent) {
+	  _inheritComments("trailingComments", child, parent);
+	}
+
+	function inheritLeadingComments(child, parent) {
+	  _inheritComments("leadingComments", child, parent);
+	}
+
+	function inheritInnerComments(child, parent) {
+	  _inheritComments("innerComments", child, parent);
+	}
+
+	function _inheritComments(key, child, parent) {
+	  if (child && parent) {
+	    child[key] = (0, _uniq2.default)([].concat(child[key], parent[key]).filter(Boolean));
+	  }
+	}
+
+	function inherits(child, parent) {
+	  if (!child || !parent) return child;
+
+	  for (var _iterator5 = t.INHERIT_KEYS.optional, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, _getIterator3.default)(_iterator5);;) {
+	    var _ref5;
+
+	    if (_isArray5) {
+	      if (_i5 >= _iterator5.length) break;
+	      _ref5 = _iterator5[_i5++];
+	    } else {
+	      _i5 = _iterator5.next();
+	      if (_i5.done) break;
+	      _ref5 = _i5.value;
+	    }
+
+	    var _key2 = _ref5;
+
+	    if (child[_key2] == null) {
+	      child[_key2] = parent[_key2];
+	    }
+	  }
+
+	  for (var key in parent) {
+	    if (key[0] === "_") child[key] = parent[key];
+	  }
+
+	  for (var _iterator6 = t.INHERIT_KEYS.force, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : (0, _getIterator3.default)(_iterator6);;) {
+	    var _ref6;
+
+	    if (_isArray6) {
+	      if (_i6 >= _iterator6.length) break;
+	      _ref6 = _iterator6[_i6++];
+	    } else {
+	      _i6 = _iterator6.next();
+	      if (_i6.done) break;
+	      _ref6 = _i6.value;
+	    }
+
+	    var _key3 = _ref6;
+
+	    child[_key3] = parent[_key3];
+	  }
+
+	  t.inheritsComments(child, parent);
+
+	  return child;
+	}
+
+	function assertNode(node) {
+	  if (!isNode(node)) {
+	    throw new TypeError("Not a valid node " + (node && node.type));
+	  }
+	}
+
+	function isNode(node) {
+	  return !!(node && _definitions.VISITOR_KEYS[node.type]);
+	}
+
+	(0, _toFastProperties2.default)(t);
+	(0, _toFastProperties2.default)(t.VISITOR_KEYS);
+
+	function traverseFast(node, enter, opts) {
+	  if (!node) return;
+
+	  var keys = t.VISITOR_KEYS[node.type];
+	  if (!keys) return;
+
+	  opts = opts || {};
+	  enter(node, opts);
+
+	  for (var _iterator7 = keys, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : (0, _getIterator3.default)(_iterator7);;) {
+	    var _ref7;
+
+	    if (_isArray7) {
+	      if (_i7 >= _iterator7.length) break;
+	      _ref7 = _iterator7[_i7++];
+	    } else {
+	      _i7 = _iterator7.next();
+	      if (_i7.done) break;
+	      _ref7 = _i7.value;
+	    }
+
+	    var key = _ref7;
+
+	    var subNode = node[key];
+
+	    if (Array.isArray(subNode)) {
+	      for (var _iterator8 = subNode, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : (0, _getIterator3.default)(_iterator8);;) {
+	        var _ref8;
+
+	        if (_isArray8) {
+	          if (_i8 >= _iterator8.length) break;
+	          _ref8 = _iterator8[_i8++];
+	        } else {
+	          _i8 = _iterator8.next();
+	          if (_i8.done) break;
+	          _ref8 = _i8.value;
+	        }
+
+	        var _node = _ref8;
+
+	        traverseFast(_node, enter, opts);
+	      }
+	    } else {
+	      traverseFast(subNode, enter, opts);
+	    }
+	  }
+	}
+
+	var CLEAR_KEYS = ["tokens", "start", "end", "loc", "raw", "rawValue"];
+
+	var CLEAR_KEYS_PLUS_COMMENTS = t.COMMENT_KEYS.concat(["comments"]).concat(CLEAR_KEYS);
+
+	function removeProperties(node, opts) {
+	  opts = opts || {};
+	  var map = opts.preserveComments ? CLEAR_KEYS : CLEAR_KEYS_PLUS_COMMENTS;
+	  for (var _iterator9 = map, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : (0, _getIterator3.default)(_iterator9);;) {
+	    var _ref9;
+
+	    if (_isArray9) {
+	      if (_i9 >= _iterator9.length) break;
+	      _ref9 = _iterator9[_i9++];
+	    } else {
+	      _i9 = _iterator9.next();
+	      if (_i9.done) break;
+	      _ref9 = _i9.value;
+	    }
+
+	    var _key4 = _ref9;
+
+	    if (node[_key4] != null) node[_key4] = undefined;
+	  }
+
+	  for (var key in node) {
+	    if (key[0] === "_" && node[key] != null) node[key] = undefined;
+	  }
+
+	  var syms = (0, _getOwnPropertySymbols2.default)(node);
+	  for (var _iterator10 = syms, _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : (0, _getIterator3.default)(_iterator10);;) {
+	    var _ref10;
+
+	    if (_isArray10) {
+	      if (_i10 >= _iterator10.length) break;
+	      _ref10 = _iterator10[_i10++];
+	    } else {
+	      _i10 = _iterator10.next();
+	      if (_i10.done) break;
+	      _ref10 = _i10.value;
+	    }
+
+	    var sym = _ref10;
+
+	    node[sym] = null;
+	  }
+	}
+
+	function removePropertiesDeep(tree, opts) {
+	  traverseFast(tree, removeProperties, opts);
+	  return tree;
+	}
+
+/***/ }),
+/* 2 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(400), __esModule: true };
+
+/***/ }),
+/* 3 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (instance, Constructor) {
+	  if (!(instance instanceof Constructor)) {
+	    throw new TypeError("Cannot call a class as a function");
+	  }
+	};
+
+/***/ }),
+/* 4 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	exports.default = function (code, opts) {
+	  var stack = void 0;
+	  try {
+	    throw new Error();
+	  } catch (error) {
+	    if (error.stack) {
+	      stack = error.stack.split("\n").slice(1).join("\n");
+	    }
+	  }
+
+	  opts = (0, _assign2.default)({
+	    allowReturnOutsideFunction: true,
+	    allowSuperOutsideMethod: true,
+	    preserveComments: false
+	  }, opts);
+
+	  var _getAst = function getAst() {
+	    var ast = void 0;
+
+	    try {
+	      ast = babylon.parse(code, opts);
+
+	      ast = _babelTraverse2.default.removeProperties(ast, { preserveComments: opts.preserveComments });
+
+	      _babelTraverse2.default.cheap(ast, function (node) {
+	        node[FROM_TEMPLATE] = true;
+	      });
+	    } catch (err) {
+	      err.stack = err.stack + "from\n" + stack;
+	      throw err;
+	    }
+
+	    _getAst = function getAst() {
+	      return ast;
+	    };
+
+	    return ast;
+	  };
+
+	  return function () {
+	    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+	      args[_key] = arguments[_key];
+	    }
+
+	    return useTemplate(_getAst(), args);
+	  };
+	};
+
+	var _cloneDeep = __webpack_require__(565);
+
+	var _cloneDeep2 = _interopRequireDefault(_cloneDeep);
+
+	var _assign = __webpack_require__(170);
+
+	var _assign2 = _interopRequireDefault(_assign);
+
+	var _has = __webpack_require__(269);
+
+	var _has2 = _interopRequireDefault(_has);
+
+	var _babelTraverse = __webpack_require__(7);
+
+	var _babelTraverse2 = _interopRequireDefault(_babelTraverse);
+
+	var _babylon = __webpack_require__(87);
+
+	var babylon = _interopRequireWildcard(_babylon);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var FROM_TEMPLATE = "_fromTemplate";
+	var TEMPLATE_SKIP = (0, _symbol2.default)();
+
+	function useTemplate(ast, nodes) {
+	  ast = (0, _cloneDeep2.default)(ast);
+	  var _ast = ast,
+	      program = _ast.program;
+
+	  if (nodes.length) {
+	    (0, _babelTraverse2.default)(ast, templateVisitor, null, nodes);
+	  }
+
+	  if (program.body.length > 1) {
+	    return program.body;
+	  } else {
+	    return program.body[0];
+	  }
+	}
+
+	var templateVisitor = {
+	  noScope: true,
+
+	  enter: function enter(path, args) {
+	    var node = path.node;
+
+	    if (node[TEMPLATE_SKIP]) return path.skip();
+
+	    if (t.isExpressionStatement(node)) {
+	      node = node.expression;
+	    }
+
+	    var replacement = void 0;
+
+	    if (t.isIdentifier(node) && node[FROM_TEMPLATE]) {
+	      if ((0, _has2.default)(args[0], node.name)) {
+	        replacement = args[0][node.name];
+	      } else if (node.name[0] === "$") {
+	        var i = +node.name.slice(1);
+	        if (args[i]) replacement = args[i];
+	      }
+	    }
+
+	    if (replacement === null) {
+	      path.remove();
+	    }
+
+	    if (replacement) {
+	      replacement[TEMPLATE_SKIP] = true;
+	      path.replaceInline(replacement);
+	    }
+	  },
+	  exit: function exit(_ref) {
+	    var node = _ref.node;
+
+	    if (!node.loc) _babelTraverse2.default.clearNode(node);
+	  }
+	};
+	module.exports = exports["default"];
+
+/***/ }),
+/* 5 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var core = module.exports = { version: '2.4.0' };
+	if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
+
+/***/ }),
+/* 6 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Checks if `value` is classified as an `Array` object.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is an array, else `false`.
+	 * @example
+	 *
+	 * _.isArray([1, 2, 3]);
+	 * // => true
+	 *
+	 * _.isArray(document.body.children);
+	 * // => false
+	 *
+	 * _.isArray('abc');
+	 * // => false
+	 *
+	 * _.isArray(_.noop);
+	 * // => false
+	 */
+	var isArray = Array.isArray;
+
+	module.exports = isArray;
+
+/***/ }),
+/* 7 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.visitors = exports.Hub = exports.Scope = exports.NodePath = undefined;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _path = __webpack_require__(35);
+
+	Object.defineProperty(exports, "NodePath", {
+	  enumerable: true,
+	  get: function get() {
+	    return _interopRequireDefault(_path).default;
+	  }
+	});
+
+	var _scope = __webpack_require__(133);
+
+	Object.defineProperty(exports, "Scope", {
+	  enumerable: true,
+	  get: function get() {
+	    return _interopRequireDefault(_scope).default;
+	  }
+	});
+
+	var _hub = __webpack_require__(219);
+
+	Object.defineProperty(exports, "Hub", {
+	  enumerable: true,
+	  get: function get() {
+	    return _interopRequireDefault(_hub).default;
+	  }
+	});
+	exports.default = traverse;
+
+	var _context = __webpack_require__(363);
+
+	var _context2 = _interopRequireDefault(_context);
+
+	var _visitors = __webpack_require__(380);
+
+	var visitors = _interopRequireWildcard(_visitors);
+
+	var _babelMessages = __webpack_require__(18);
+
+	var messages = _interopRequireWildcard(_babelMessages);
+
+	var _includes = __webpack_require__(111);
+
+	var _includes2 = _interopRequireDefault(_includes);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _cache = __webpack_require__(86);
+
+	var cache = _interopRequireWildcard(_cache);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.visitors = visitors;
+	function traverse(parent, opts, scope, state, parentPath) {
+	  if (!parent) return;
+	  if (!opts) opts = {};
+
+	  if (!opts.noScope && !scope) {
+	    if (parent.type !== "Program" && parent.type !== "File") {
+	      throw new Error(messages.get("traverseNeedsParent", parent.type));
+	    }
+	  }
+
+	  visitors.explode(opts);
+
+	  traverse.node(parent, opts, scope, state, parentPath);
+	}
+
+	traverse.visitors = visitors;
+	traverse.verify = visitors.verify;
+	traverse.explode = visitors.explode;
+
+	traverse.NodePath = __webpack_require__(35);
+	traverse.Scope = __webpack_require__(133);
+	traverse.Hub = __webpack_require__(219);
+
+	traverse.cheap = function (node, enter) {
+	  return t.traverseFast(node, enter);
+	};
+
+	traverse.node = function (node, opts, scope, state, parentPath, skipKeys) {
+	  var keys = t.VISITOR_KEYS[node.type];
+	  if (!keys) return;
+
+	  var context = new _context2.default(scope, opts, state, parentPath);
+	  for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var key = _ref;
+
+	    if (skipKeys && skipKeys[key]) continue;
+	    if (context.visit(node, key)) return;
+	  }
+	};
+
+	traverse.clearNode = function (node, opts) {
+	  t.removeProperties(node, opts);
+
+	  cache.path.delete(node);
+	};
+
+	traverse.removeProperties = function (tree, opts) {
+	  t.traverseFast(tree, traverse.clearNode, opts);
+	  return tree;
+	};
+
+	function hasBlacklistedType(path, state) {
+	  if (path.node.type === state.type) {
+	    state.has = true;
+	    path.stop();
+	  }
+	}
+
+	traverse.hasType = function (tree, scope, type, blacklistTypes) {
+	  if ((0, _includes2.default)(blacklistTypes, tree.type)) return false;
+
+	  if (tree.type === type) return true;
+
+	  var state = {
+	    has: false,
+	    type: type
+	  };
+
+	  traverse(tree, {
+	    blacklist: blacklistTypes,
+	    enter: hasBlacklistedType
+	  }, scope, state);
+
+	  return state.has;
+	};
+
+	traverse.clearCache = function () {
+	  cache.clear();
+	};
+
+	traverse.clearCache.clearPath = cache.clearPath;
+	traverse.clearCache.clearScope = cache.clearScope;
+
+	traverse.copyCache = function (source, destination) {
+	  if (cache.path.has(source)) {
+	    cache.path.set(destination, cache.path.get(source));
+	  }
+	};
+
+/***/ }),
+/* 8 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	// shim for using process in browser
+	var process = module.exports = {};
+
+	// cached from whatever global is present so that test runners that stub it
+	// don't break things.  But we need to wrap it in a try catch in case it is
+	// wrapped in strict mode code which doesn't define any globals.  It's inside a
+	// function because try/catches deoptimize in certain engines.
+
+	var cachedSetTimeout;
+	var cachedClearTimeout;
+
+	function defaultSetTimout() {
+	    throw new Error('setTimeout has not been defined');
+	}
+	function defaultClearTimeout() {
+	    throw new Error('clearTimeout has not been defined');
+	}
+	(function () {
+	    try {
+	        if (typeof setTimeout === 'function') {
+	            cachedSetTimeout = setTimeout;
+	        } else {
+	            cachedSetTimeout = defaultSetTimout;
+	        }
+	    } catch (e) {
+	        cachedSetTimeout = defaultSetTimout;
+	    }
+	    try {
+	        if (typeof clearTimeout === 'function') {
+	            cachedClearTimeout = clearTimeout;
+	        } else {
+	            cachedClearTimeout = defaultClearTimeout;
+	        }
+	    } catch (e) {
+	        cachedClearTimeout = defaultClearTimeout;
+	    }
+	})();
+	function runTimeout(fun) {
+	    if (cachedSetTimeout === setTimeout) {
+	        //normal enviroments in sane situations
+	        return setTimeout(fun, 0);
+	    }
+	    // if setTimeout wasn't available but was latter defined
+	    if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) {
+	        cachedSetTimeout = setTimeout;
+	        return setTimeout(fun, 0);
+	    }
+	    try {
+	        // when when somebody has screwed with setTimeout but no I.E. maddness
+	        return cachedSetTimeout(fun, 0);
+	    } catch (e) {
+	        try {
+	            // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally
+	            return cachedSetTimeout.call(null, fun, 0);
+	        } catch (e) {
+	            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error
+	            return cachedSetTimeout.call(this, fun, 0);
+	        }
+	    }
+	}
+	function runClearTimeout(marker) {
+	    if (cachedClearTimeout === clearTimeout) {
+	        //normal enviroments in sane situations
+	        return clearTimeout(marker);
+	    }
+	    // if clearTimeout wasn't available but was latter defined
+	    if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) {
+	        cachedClearTimeout = clearTimeout;
+	        return clearTimeout(marker);
+	    }
+	    try {
+	        // when when somebody has screwed with setTimeout but no I.E. maddness
+	        return cachedClearTimeout(marker);
+	    } catch (e) {
+	        try {
+	            // When we are in I.E. but the script has been evaled so I.E. doesn't  trust the global object when called normally
+	            return cachedClearTimeout.call(null, marker);
+	        } catch (e) {
+	            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error.
+	            // Some versions of I.E. have different rules for clearTimeout vs setTimeout
+	            return cachedClearTimeout.call(this, marker);
+	        }
+	    }
+	}
+	var queue = [];
+	var draining = false;
+	var currentQueue;
+	var queueIndex = -1;
+
+	function cleanUpNextTick() {
+	    if (!draining || !currentQueue) {
+	        return;
+	    }
+	    draining = false;
+	    if (currentQueue.length) {
+	        queue = currentQueue.concat(queue);
+	    } else {
+	        queueIndex = -1;
+	    }
+	    if (queue.length) {
+	        drainQueue();
+	    }
+	}
+
+	function drainQueue() {
+	    if (draining) {
+	        return;
+	    }
+	    var timeout = runTimeout(cleanUpNextTick);
+	    draining = true;
+
+	    var len = queue.length;
+	    while (len) {
+	        currentQueue = queue;
+	        queue = [];
+	        while (++queueIndex < len) {
+	            if (currentQueue) {
+	                currentQueue[queueIndex].run();
+	            }
+	        }
+	        queueIndex = -1;
+	        len = queue.length;
+	    }
+	    currentQueue = null;
+	    draining = false;
+	    runClearTimeout(timeout);
+	}
+
+	process.nextTick = function (fun) {
+	    var args = new Array(arguments.length - 1);
+	    if (arguments.length > 1) {
+	        for (var i = 1; i < arguments.length; i++) {
+	            args[i - 1] = arguments[i];
+	        }
+	    }
+	    queue.push(new Item(fun, args));
+	    if (queue.length === 1 && !draining) {
+	        runTimeout(drainQueue);
+	    }
+	};
+
+	// v8 likes predictible objects
+	function Item(fun, array) {
+	    this.fun = fun;
+	    this.array = array;
+	}
+	Item.prototype.run = function () {
+	    this.fun.apply(null, this.array);
+	};
+	process.title = 'browser';
+	process.browser = true;
+	process.env = {};
+	process.argv = [];
+	process.version = ''; // empty string to avoid regexp issues
+	process.versions = {};
+
+	function noop() {}
+
+	process.on = noop;
+	process.addListener = noop;
+	process.once = noop;
+	process.off = noop;
+	process.removeListener = noop;
+	process.removeAllListeners = noop;
+	process.emit = noop;
+	process.prependListener = noop;
+	process.prependOnceListener = noop;
+
+	process.listeners = function (name) {
+	    return [];
+	};
+
+	process.binding = function (name) {
+	    throw new Error('process.binding is not supported');
+	};
+
+	process.cwd = function () {
+	    return '/';
+	};
+	process.chdir = function (dir) {
+	    throw new Error('process.chdir is not supported');
+	};
+	process.umask = function () {
+	    return 0;
+	};
+
+/***/ }),
+/* 9 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(405), __esModule: true };
+
+/***/ }),
+/* 10 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(410), __esModule: true };
+
+/***/ }),
+/* 11 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	exports.__esModule = true;
+
+	var _iterator = __webpack_require__(359);
+
+	var _iterator2 = _interopRequireDefault(_iterator);
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	var _typeof = typeof _symbol2.default === "function" && _typeof2(_iterator2.default) === "symbol" ? function (obj) {
+	  return typeof obj === "undefined" ? "undefined" : _typeof2(obj);
+	} : function (obj) {
+	  return obj && typeof _symbol2.default === "function" && obj.constructor === _symbol2.default && obj !== _symbol2.default.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof2(obj);
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = typeof _symbol2.default === "function" && _typeof(_iterator2.default) === "symbol" ? function (obj) {
+	  return typeof obj === "undefined" ? "undefined" : _typeof(obj);
+	} : function (obj) {
+	  return obj && typeof _symbol2.default === "function" && obj.constructor === _symbol2.default && obj !== _symbol2.default.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof(obj);
+	};
+
+/***/ }),
+/* 12 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var store = __webpack_require__(147)('wks'),
+	    uid = __webpack_require__(95),
+	    _Symbol = __webpack_require__(14).Symbol,
+	    USE_SYMBOL = typeof _Symbol == 'function';
+
+	var $exports = module.exports = function (name) {
+	  return store[name] || (store[name] = USE_SYMBOL && _Symbol[name] || (USE_SYMBOL ? _Symbol : uid)('Symbol.' + name));
+	};
+
+	$exports.store = store;
+
+/***/ }),
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(407), __esModule: true };
+
+/***/ }),
+/* 14 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
+	var global = module.exports = typeof window != 'undefined' && window.Math == Math ? window : typeof self != 'undefined' && self.Math == Math ? self : Function('return this')();
+	if (typeof __g == 'number') __g = global; // eslint-disable-line no-undef
+
+/***/ }),
+/* 15 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var freeGlobal = __webpack_require__(256);
+
+	/** Detect free variable `self`. */
+	var freeSelf = (typeof self === 'undefined' ? 'undefined' : _typeof(self)) == 'object' && self && self.Object === Object && self;
+
+	/** Used as a reference to the global object. */
+	var root = freeGlobal || freeSelf || Function('return this')();
+
+	module.exports = root;
+
+/***/ }),
+/* 16 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	/**
+	 * Checks if `value` is the
+	 * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
+	 * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+	 * @example
+	 *
+	 * _.isObject({});
+	 * // => true
+	 *
+	 * _.isObject([1, 2, 3]);
+	 * // => true
+	 *
+	 * _.isObject(_.noop);
+	 * // => true
+	 *
+	 * _.isObject(null);
+	 * // => false
+	 */
+	function isObject(value) {
+	  var type = typeof value === 'undefined' ? 'undefined' : _typeof(value);
+	  return value != null && (type == 'object' || type == 'function');
+	}
+
+	module.exports = isObject;
+
+/***/ }),
+/* 17 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {'use strict';
+
+	// Copyright Joyent, Inc. and other Node contributors.
+	//
+	// Permission is hereby granted, free of charge, to any person obtaining a
+	// copy of this software and associated documentation files (the
+	// "Software"), to deal in the Software without restriction, including
+	// without limitation the rights to use, copy, modify, merge, publish,
+	// distribute, sublicense, and/or sell copies of the Software, and to permit
+	// persons to whom the Software is furnished to do so, subject to the
+	// following conditions:
+	//
+	// The above copyright notice and this permission notice shall be included
+	// in all copies or substantial portions of the Software.
+	//
+	// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+	// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+	// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+	// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+	// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+	// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+	// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+	// resolves . and .. elements in a path array with directory names there
+	// must be no slashes, empty elements, or device names (c:\) in the array
+	// (so also no leading and trailing slashes - it does not distinguish
+	// relative and absolute paths)
+	function normalizeArray(parts, allowAboveRoot) {
+	  // if the path tries to go above the root, `up` ends up > 0
+	  var up = 0;
+	  for (var i = parts.length - 1; i >= 0; i--) {
+	    var last = parts[i];
+	    if (last === '.') {
+	      parts.splice(i, 1);
+	    } else if (last === '..') {
+	      parts.splice(i, 1);
+	      up++;
+	    } else if (up) {
+	      parts.splice(i, 1);
+	      up--;
+	    }
+	  }
+
+	  // if the path is allowed to go above the root, restore leading ..s
+	  if (allowAboveRoot) {
+	    for (; up--; up) {
+	      parts.unshift('..');
+	    }
+	  }
+
+	  return parts;
+	}
+
+	// Split a filename into [root, dir, basename, ext], unix version
+	// 'root' is just a slash, or nothing.
+	var splitPathRe = /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
+	var splitPath = function splitPath(filename) {
+	  return splitPathRe.exec(filename).slice(1);
+	};
+
+	// path.resolve([from ...], to)
+	// posix version
+	exports.resolve = function () {
+	  var resolvedPath = '',
+	      resolvedAbsolute = false;
+
+	  for (var i = arguments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
+	    var path = i >= 0 ? arguments[i] : process.cwd();
+
+	    // Skip empty and invalid entries
+	    if (typeof path !== 'string') {
+	      throw new TypeError('Arguments to path.resolve must be strings');
+	    } else if (!path) {
+	      continue;
+	    }
+
+	    resolvedPath = path + '/' + resolvedPath;
+	    resolvedAbsolute = path.charAt(0) === '/';
+	  }
+
+	  // At this point the path should be resolved to a full absolute path, but
+	  // handle relative paths to be safe (might happen when process.cwd() fails)
+
+	  // Normalize the path
+	  resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function (p) {
+	    return !!p;
+	  }), !resolvedAbsolute).join('/');
+
+	  return (resolvedAbsolute ? '/' : '') + resolvedPath || '.';
+	};
+
+	// path.normalize(path)
+	// posix version
+	exports.normalize = function (path) {
+	  var isAbsolute = exports.isAbsolute(path),
+	      trailingSlash = substr(path, -1) === '/';
+
+	  // Normalize the path
+	  path = normalizeArray(filter(path.split('/'), function (p) {
+	    return !!p;
+	  }), !isAbsolute).join('/');
+
+	  if (!path && !isAbsolute) {
+	    path = '.';
+	  }
+	  if (path && trailingSlash) {
+	    path += '/';
+	  }
+
+	  return (isAbsolute ? '/' : '') + path;
+	};
+
+	// posix version
+	exports.isAbsolute = function (path) {
+	  return path.charAt(0) === '/';
+	};
+
+	// posix version
+	exports.join = function () {
+	  var paths = Array.prototype.slice.call(arguments, 0);
+	  return exports.normalize(filter(paths, function (p, index) {
+	    if (typeof p !== 'string') {
+	      throw new TypeError('Arguments to path.join must be strings');
+	    }
+	    return p;
+	  }).join('/'));
+	};
+
+	// path.relative(from, to)
+	// posix version
+	exports.relative = function (from, to) {
+	  from = exports.resolve(from).substr(1);
+	  to = exports.resolve(to).substr(1);
+
+	  function trim(arr) {
+	    var start = 0;
+	    for (; start < arr.length; start++) {
+	      if (arr[start] !== '') break;
+	    }
+
+	    var end = arr.length - 1;
+	    for (; end >= 0; end--) {
+	      if (arr[end] !== '') break;
+	    }
+
+	    if (start > end) return [];
+	    return arr.slice(start, end - start + 1);
+	  }
+
+	  var fromParts = trim(from.split('/'));
+	  var toParts = trim(to.split('/'));
+
+	  var length = Math.min(fromParts.length, toParts.length);
+	  var samePartsLength = length;
+	  for (var i = 0; i < length; i++) {
+	    if (fromParts[i] !== toParts[i]) {
+	      samePartsLength = i;
+	      break;
+	    }
+	  }
+
+	  var outputParts = [];
+	  for (var i = samePartsLength; i < fromParts.length; i++) {
+	    outputParts.push('..');
+	  }
+
+	  outputParts = outputParts.concat(toParts.slice(samePartsLength));
+
+	  return outputParts.join('/');
+	};
+
+	exports.sep = '/';
+	exports.delimiter = ':';
+
+	exports.dirname = function (path) {
+	  var result = splitPath(path),
+	      root = result[0],
+	      dir = result[1];
+
+	  if (!root && !dir) {
+	    // No dirname whatsoever
+	    return '.';
+	  }
+
+	  if (dir) {
+	    // It has a dirname, strip trailing slash
+	    dir = dir.substr(0, dir.length - 1);
+	  }
+
+	  return root + dir;
+	};
+
+	exports.basename = function (path, ext) {
+	  var f = splitPath(path)[2];
+	  // TODO: make this comparison case-insensitive on windows?
+	  if (ext && f.substr(-1 * ext.length) === ext) {
+	    f = f.substr(0, f.length - ext.length);
+	  }
+	  return f;
+	};
+
+	exports.extname = function (path) {
+	  return splitPath(path)[3];
+	};
+
+	function filter(xs, f) {
+	  if (xs.filter) return xs.filter(f);
+	  var res = [];
+	  for (var i = 0; i < xs.length; i++) {
+	    if (f(xs[i], i, xs)) res.push(xs[i]);
+	  }
+	  return res;
+	}
+
+	// String.prototype.substr - negative index don't work in IE8
+	var substr = 'ab'.substr(-1) === 'b' ? function (str, start, len) {
+	  return str.substr(start, len);
+	} : function (str, start, len) {
+	  if (start < 0) start = str.length + start;
+	  return str.substr(start, len);
+	};
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 18 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.MESSAGES = undefined;
+
+	var _stringify = __webpack_require__(34);
+
+	var _stringify2 = _interopRequireDefault(_stringify);
+
+	exports.get = get;
+	exports.parseArgs = parseArgs;
+
+	var _util = __webpack_require__(116);
+
+	var util = _interopRequireWildcard(_util);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var MESSAGES = exports.MESSAGES = {
+	  tailCallReassignmentDeopt: "Function reference has been reassigned, so it will probably be dereferenced, therefore we can't optimise this with confidence",
+	  classesIllegalBareSuper: "Illegal use of bare super",
+	  classesIllegalSuperCall: "Direct super call is illegal in non-constructor, use super.$1() instead",
+	  scopeDuplicateDeclaration: "Duplicate declaration $1",
+	  settersNoRest: "Setters aren't allowed to have a rest",
+	  noAssignmentsInForHead: "No assignments allowed in for-in/of head",
+	  expectedMemberExpressionOrIdentifier: "Expected type MemberExpression or Identifier",
+	  invalidParentForThisNode: "We don't know how to handle this node within the current parent - please open an issue",
+	  readOnly: "$1 is read-only",
+	  unknownForHead: "Unknown node type $1 in ForStatement",
+	  didYouMean: "Did you mean $1?",
+	  codeGeneratorDeopt: "Note: The code generator has deoptimised the styling of $1 as it exceeds the max of $2.",
+	  missingTemplatesDirectory: "no templates directory - this is most likely the result of a broken `npm publish`. Please report to https://github.com/babel/babel/issues",
+	  unsupportedOutputType: "Unsupported output type $1",
+	  illegalMethodName: "Illegal method name $1",
+	  lostTrackNodePath: "We lost track of this node's position, likely because the AST was directly manipulated",
+
+	  modulesIllegalExportName: "Illegal export $1",
+	  modulesDuplicateDeclarations: "Duplicate module declarations with the same source but in different scopes",
+
+	  undeclaredVariable: "Reference to undeclared variable $1",
+	  undeclaredVariableType: "Referencing a type alias outside of a type annotation",
+	  undeclaredVariableSuggestion: "Reference to undeclared variable $1 - did you mean $2?",
+
+	  traverseNeedsParent: "You must pass a scope and parentPath unless traversing a Program/File. Instead of that you tried to traverse a $1 node without passing scope and parentPath.",
+	  traverseVerifyRootFunction: "You passed `traverse()` a function when it expected a visitor object, are you sure you didn't mean `{ enter: Function }`?",
+	  traverseVerifyVisitorProperty: "You passed `traverse()` a visitor object with the property $1 that has the invalid property $2",
+	  traverseVerifyNodeType: "You gave us a visitor for the node type $1 but it's not a valid type",
+
+	  pluginNotObject: "Plugin $2 specified in $1 was expected to return an object when invoked but returned $3",
+	  pluginNotFunction: "Plugin $2 specified in $1 was expected to return a function but returned $3",
+	  pluginUnknown: "Unknown plugin $1 specified in $2 at $3, attempted to resolve relative to $4",
+	  pluginInvalidProperty: "Plugin $2 specified in $1 provided an invalid property of $3"
+	};
+
+	function get(key) {
+	  for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+	    args[_key - 1] = arguments[_key];
+	  }
+
+	  var msg = MESSAGES[key];
+	  if (!msg) throw new ReferenceError("Unknown message " + (0, _stringify2.default)(key));
+
+	  args = parseArgs(args);
+
+	  return msg.replace(/\$(\d+)/g, function (str, i) {
+	    return args[i - 1];
+	  });
+	}
+
+	function parseArgs(args) {
+	  return args.map(function (val) {
+	    if (val != null && val.inspect) {
+	      return val.inspect();
+	    } else {
+	      try {
+	        return (0, _stringify2.default)(val) || val + "";
+	      } catch (e) {
+	        return util.inspect(val);
+	      }
+	    }
+	  });
+	}
+
+/***/ }),
+/* 19 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isObject = __webpack_require__(22);
+	module.exports = function (it) {
+	  if (!isObject(it)) throw TypeError(it + ' is not an object!');
+	  return it;
+	};
+
+/***/ }),
+/* 20 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// Thank's IE8 for his funny defineProperty
+	module.exports = !__webpack_require__(36)(function () {
+	  return Object.defineProperty({}, 'a', { get: function get() {
+	      return 7;
+	    } }).a != 7;
+	});
+
+/***/ }),
+/* 21 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var global = __webpack_require__(14),
+	    core = __webpack_require__(5),
+	    ctx = __webpack_require__(54),
+	    hide = __webpack_require__(28),
+	    PROTOTYPE = 'prototype';
+
+	var $export = function $export(type, name, source) {
+	  var IS_FORCED = type & $export.F,
+	      IS_GLOBAL = type & $export.G,
+	      IS_STATIC = type & $export.S,
+	      IS_PROTO = type & $export.P,
+	      IS_BIND = type & $export.B,
+	      IS_WRAP = type & $export.W,
+	      exports = IS_GLOBAL ? core : core[name] || (core[name] = {}),
+	      expProto = exports[PROTOTYPE],
+	      target = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE],
+	      key,
+	      own,
+	      out;
+	  if (IS_GLOBAL) source = name;
+	  for (key in source) {
+	    // contains in native
+	    own = !IS_FORCED && target && target[key] !== undefined;
+	    if (own && key in exports) continue;
+	    // export native or passed
+	    out = own ? target[key] : source[key];
+	    // prevent global pollution for namespaces
+	    exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key]
+	    // bind timers to global for call from export context
+	    : IS_BIND && own ? ctx(out, global
+	    // wrap global constructors for prevent change them in library
+	    ) : IS_WRAP && target[key] == out ? function (C) {
+	      var F = function F(a, b, c) {
+	        if (this instanceof C) {
+	          switch (arguments.length) {
+	            case 0:
+	              return new C();
+	            case 1:
+	              return new C(a);
+	            case 2:
+	              return new C(a, b);
+	          }return new C(a, b, c);
+	        }return C.apply(this, arguments);
+	      };
+	      F[PROTOTYPE] = C[PROTOTYPE];
+	      return F;
+	      // make static versions for prototype methods
+	    }(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out;
+	    // export proto methods to core.%CONSTRUCTOR%.methods.%NAME%
+	    if (IS_PROTO) {
+	      (exports.virtual || (exports.virtual = {}))[key] = out;
+	      // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME%
+	      if (type & $export.R && expProto && !expProto[key]) hide(expProto, key, out);
+	    }
+	  }
+	};
+	// type bitmap
+	$export.F = 1; // forced
+	$export.G = 2; // global
+	$export.S = 4; // static
+	$export.P = 8; // proto
+	$export.B = 16; // bind
+	$export.W = 32; // wrap
+	$export.U = 64; // safe
+	$export.R = 128; // real proto method for `library` 
+	module.exports = $export;
+
+/***/ }),
+/* 22 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	module.exports = function (it) {
+	  return (typeof it === 'undefined' ? 'undefined' : _typeof(it)) === 'object' ? it !== null : typeof it === 'function';
+	};
+
+/***/ }),
+/* 23 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var anObject = __webpack_require__(19),
+	    IE8_DOM_DEFINE = __webpack_require__(226),
+	    toPrimitive = __webpack_require__(150),
+	    dP = Object.defineProperty;
+
+	exports.f = __webpack_require__(20) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
+	  anObject(O);
+	  P = toPrimitive(P, true);
+	  anObject(Attributes);
+	  if (IE8_DOM_DEFINE) try {
+	    return dP(O, P, Attributes);
+	  } catch (e) {/* empty */}
+	  if ('get' in Attributes || 'set' in Attributes) throw TypeError('Accessors not supported!');
+	  if ('value' in Attributes) O[P] = Attributes.value;
+	  return O;
+	};
+
+/***/ }),
+/* 24 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isFunction = __webpack_require__(171),
+	    isLength = __webpack_require__(172);
+
+	/**
+	 * Checks if `value` is array-like. A value is considered array-like if it's
+	 * not a function and has a `value.length` that's an integer greater than or
+	 * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is array-like, else `false`.
+	 * @example
+	 *
+	 * _.isArrayLike([1, 2, 3]);
+	 * // => true
+	 *
+	 * _.isArrayLike(document.body.children);
+	 * // => true
+	 *
+	 * _.isArrayLike('abc');
+	 * // => true
+	 *
+	 * _.isArrayLike(_.noop);
+	 * // => false
+	 */
+	function isArrayLike(value) {
+	  return value != null && isLength(value.length) && !isFunction(value);
+	}
+
+	module.exports = isArrayLike;
+
+/***/ }),
+/* 25 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	/**
+	 * Checks if `value` is object-like. A value is object-like if it's not `null`
+	 * and has a `typeof` result of "object".
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
+	 * @example
+	 *
+	 * _.isObjectLike({});
+	 * // => true
+	 *
+	 * _.isObjectLike([1, 2, 3]);
+	 * // => true
+	 *
+	 * _.isObjectLike(_.noop);
+	 * // => false
+	 *
+	 * _.isObjectLike(null);
+	 * // => false
+	 */
+	function isObjectLike(value) {
+	  return value != null && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) == 'object';
+	}
+
+	module.exports = isObjectLike;
+
+/***/ }),
+/* 26 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.DEPRECATED_KEYS = exports.BUILDER_KEYS = exports.NODE_FIELDS = exports.ALIAS_KEYS = exports.VISITOR_KEYS = undefined;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _stringify = __webpack_require__(34);
+
+	var _stringify2 = _interopRequireDefault(_stringify);
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	exports.assertEach = assertEach;
+	exports.assertOneOf = assertOneOf;
+	exports.assertNodeType = assertNodeType;
+	exports.assertNodeOrValueType = assertNodeOrValueType;
+	exports.assertValueType = assertValueType;
+	exports.chain = chain;
+	exports.default = defineType;
+
+	var _index = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_index);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var VISITOR_KEYS = exports.VISITOR_KEYS = {};
+	var ALIAS_KEYS = exports.ALIAS_KEYS = {};
+	var NODE_FIELDS = exports.NODE_FIELDS = {};
+	var BUILDER_KEYS = exports.BUILDER_KEYS = {};
+	var DEPRECATED_KEYS = exports.DEPRECATED_KEYS = {};
+
+	function getType(val) {
+	  if (Array.isArray(val)) {
+	    return "array";
+	  } else if (val === null) {
+	    return "null";
+	  } else if (val === undefined) {
+	    return "undefined";
+	  } else {
+	    return typeof val === "undefined" ? "undefined" : (0, _typeof3.default)(val);
+	  }
+	}
+
+	function assertEach(callback) {
+	  function validator(node, key, val) {
+	    if (!Array.isArray(val)) return;
+
+	    for (var i = 0; i < val.length; i++) {
+	      callback(node, key + "[" + i + "]", val[i]);
+	    }
+	  }
+	  validator.each = callback;
+	  return validator;
+	}
+
+	function assertOneOf() {
+	  for (var _len = arguments.length, vals = Array(_len), _key = 0; _key < _len; _key++) {
+	    vals[_key] = arguments[_key];
+	  }
+
+	  function validate(node, key, val) {
+	    if (vals.indexOf(val) < 0) {
+	      throw new TypeError("Property " + key + " expected value to be one of " + (0, _stringify2.default)(vals) + " but got " + (0, _stringify2.default)(val));
+	    }
+	  }
+
+	  validate.oneOf = vals;
+
+	  return validate;
+	}
+
+	function assertNodeType() {
+	  for (var _len2 = arguments.length, types = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+	    types[_key2] = arguments[_key2];
+	  }
+
+	  function validate(node, key, val) {
+	    var valid = false;
+
+	    for (var _iterator = types, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var type = _ref;
+
+	      if (t.is(type, val)) {
+	        valid = true;
+	        break;
+	      }
+	    }
+
+	    if (!valid) {
+	      throw new TypeError("Property " + key + " of " + node.type + " expected node to be of a type " + (0, _stringify2.default)(types) + " " + ("but instead got " + (0, _stringify2.default)(val && val.type)));
+	    }
+	  }
+
+	  validate.oneOfNodeTypes = types;
+
+	  return validate;
+	}
+
+	function assertNodeOrValueType() {
+	  for (var _len3 = arguments.length, types = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+	    types[_key3] = arguments[_key3];
+	  }
+
+	  function validate(node, key, val) {
+	    var valid = false;
+
+	    for (var _iterator2 = types, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var type = _ref2;
+
+	      if (getType(val) === type || t.is(type, val)) {
+	        valid = true;
+	        break;
+	      }
+	    }
+
+	    if (!valid) {
+	      throw new TypeError("Property " + key + " of " + node.type + " expected node to be of a type " + (0, _stringify2.default)(types) + " " + ("but instead got " + (0, _stringify2.default)(val && val.type)));
+	    }
+	  }
+
+	  validate.oneOfNodeOrValueTypes = types;
+
+	  return validate;
+	}
+
+	function assertValueType(type) {
+	  function validate(node, key, val) {
+	    var valid = getType(val) === type;
+
+	    if (!valid) {
+	      throw new TypeError("Property " + key + " expected type of " + type + " but got " + getType(val));
+	    }
+	  }
+
+	  validate.type = type;
+
+	  return validate;
+	}
+
+	function chain() {
+	  for (var _len4 = arguments.length, fns = Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+	    fns[_key4] = arguments[_key4];
+	  }
+
+	  function validate() {
+	    for (var _iterator3 = fns, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	      var _ref3;
+
+	      if (_isArray3) {
+	        if (_i3 >= _iterator3.length) break;
+	        _ref3 = _iterator3[_i3++];
+	      } else {
+	        _i3 = _iterator3.next();
+	        if (_i3.done) break;
+	        _ref3 = _i3.value;
+	      }
+
+	      var fn = _ref3;
+
+	      fn.apply(undefined, arguments);
+	    }
+	  }
+	  validate.chainOf = fns;
+	  return validate;
+	}
+
+	function defineType(type) {
+	  var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+	  var inherits = opts.inherits && store[opts.inherits] || {};
+
+	  opts.fields = opts.fields || inherits.fields || {};
+	  opts.visitor = opts.visitor || inherits.visitor || [];
+	  opts.aliases = opts.aliases || inherits.aliases || [];
+	  opts.builder = opts.builder || inherits.builder || opts.visitor || [];
+
+	  if (opts.deprecatedAlias) {
+	    DEPRECATED_KEYS[opts.deprecatedAlias] = type;
+	  }
+
+	  for (var _iterator4 = opts.visitor.concat(opts.builder), _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	    var _ref4;
+
+	    if (_isArray4) {
+	      if (_i4 >= _iterator4.length) break;
+	      _ref4 = _iterator4[_i4++];
+	    } else {
+	      _i4 = _iterator4.next();
+	      if (_i4.done) break;
+	      _ref4 = _i4.value;
+	    }
+
+	    var _key5 = _ref4;
+
+	    opts.fields[_key5] = opts.fields[_key5] || {};
+	  }
+
+	  for (var key in opts.fields) {
+	    var field = opts.fields[key];
+
+	    if (opts.builder.indexOf(key) === -1) {
+	      field.optional = true;
+	    }
+	    if (field.default === undefined) {
+	      field.default = null;
+	    } else if (!field.validate) {
+	      field.validate = assertValueType(getType(field.default));
+	    }
+	  }
+
+	  VISITOR_KEYS[type] = opts.visitor;
+	  BUILDER_KEYS[type] = opts.builder;
+	  NODE_FIELDS[type] = opts.fields;
+	  ALIAS_KEYS[type] = opts.aliases;
+
+	  store[type] = opts;
+	}
+
+	var store = {};
+
+/***/ }),
+/* 27 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	var hasOwnProperty = {}.hasOwnProperty;
+	module.exports = function (it, key) {
+	  return hasOwnProperty.call(it, key);
+	};
+
+/***/ }),
+/* 28 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var dP = __webpack_require__(23),
+	    createDesc = __webpack_require__(92);
+	module.exports = __webpack_require__(20) ? function (object, key, value) {
+	  return dP.f(object, key, createDesc(1, value));
+	} : function (object, key, value) {
+	  object[key] = value;
+	  return object;
+	};
+
+/***/ }),
+/* 29 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Symbol = __webpack_require__(44),
+	    getRawTag = __webpack_require__(525),
+	    objectToString = __webpack_require__(550);
+
+	/** `Object#toString` result references. */
+	var nullTag = '[object Null]',
+	    undefinedTag = '[object Undefined]';
+
+	/** Built-in value references. */
+	var symToStringTag = _Symbol ? _Symbol.toStringTag : undefined;
+
+	/**
+	 * The base implementation of `getTag` without fallbacks for buggy environments.
+	 *
+	 * @private
+	 * @param {*} value The value to query.
+	 * @returns {string} Returns the `toStringTag`.
+	 */
+	function baseGetTag(value) {
+	    if (value == null) {
+	        return value === undefined ? undefinedTag : nullTag;
+	    }
+	    return symToStringTag && symToStringTag in Object(value) ? getRawTag(value) : objectToString(value);
+	}
+
+	module.exports = baseGetTag;
+
+/***/ }),
+/* 30 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var assignValue = __webpack_require__(158),
+	    baseAssignValue = __webpack_require__(159);
+
+	/**
+	 * Copies properties of `source` to `object`.
+	 *
+	 * @private
+	 * @param {Object} source The object to copy properties from.
+	 * @param {Array} props The property identifiers to copy.
+	 * @param {Object} [object={}] The object to copy properties to.
+	 * @param {Function} [customizer] The function to customize copied values.
+	 * @returns {Object} Returns `object`.
+	 */
+	function copyObject(source, props, object, customizer) {
+	  var isNew = !object;
+	  object || (object = {});
+
+	  var index = -1,
+	      length = props.length;
+
+	  while (++index < length) {
+	    var key = props[index];
+
+	    var newValue = customizer ? customizer(object[key], source[key], key, object, source) : undefined;
+
+	    if (newValue === undefined) {
+	      newValue = source[key];
+	    }
+	    if (isNew) {
+	      baseAssignValue(object, key, newValue);
+	    } else {
+	      assignValue(object, key, newValue);
+	    }
+	  }
+	  return object;
+	}
+
+	module.exports = copyObject;
+
+/***/ }),
+/* 31 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var arrayLikeKeys = __webpack_require__(240),
+	    baseKeys = __webpack_require__(491),
+	    isArrayLike = __webpack_require__(24);
+
+	/**
+	 * Creates an array of the own enumerable property names of `object`.
+	 *
+	 * **Note:** Non-object values are coerced to objects. See the
+	 * [ES spec](http://ecma-international.org/ecma-262/7.0/#sec-object.keys)
+	 * for more details.
+	 *
+	 * @static
+	 * @since 0.1.0
+	 * @memberOf _
+	 * @category Object
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the array of property names.
+	 * @example
+	 *
+	 * function Foo() {
+	 *   this.a = 1;
+	 *   this.b = 2;
+	 * }
+	 *
+	 * Foo.prototype.c = 3;
+	 *
+	 * _.keys(new Foo);
+	 * // => ['a', 'b'] (iteration order is not guaranteed)
+	 *
+	 * _.keys('hi');
+	 * // => ['0', '1']
+	 */
+	function keys(object) {
+	  return isArrayLike(object) ? arrayLikeKeys(object) : baseKeys(object);
+	}
+
+	module.exports = keys;
+
+/***/ }),
+/* 32 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = {
+	  filename: {
+	    type: "filename",
+	    description: "filename to use when reading from stdin - this will be used in source-maps, errors etc",
+	    default: "unknown",
+	    shorthand: "f"
+	  },
+
+	  filenameRelative: {
+	    hidden: true,
+	    type: "string"
+	  },
+
+	  inputSourceMap: {
+	    hidden: true
+	  },
+
+	  env: {
+	    hidden: true,
+	    default: {}
+	  },
+
+	  mode: {
+	    description: "",
+	    hidden: true
+	  },
+
+	  retainLines: {
+	    type: "boolean",
+	    default: false,
+	    description: "retain line numbers - will result in really ugly code"
+	  },
+
+	  highlightCode: {
+	    description: "enable/disable ANSI syntax highlighting of code frames (on by default)",
+	    type: "boolean",
+	    default: true
+	  },
+
+	  suppressDeprecationMessages: {
+	    type: "boolean",
+	    default: false,
+	    hidden: true
+	  },
+
+	  presets: {
+	    type: "list",
+	    description: "",
+	    default: []
+	  },
+
+	  plugins: {
+	    type: "list",
+	    default: [],
+	    description: ""
+	  },
+
+	  ignore: {
+	    type: "list",
+	    description: "list of glob paths to **not** compile",
+	    default: []
+	  },
+
+	  only: {
+	    type: "list",
+	    description: "list of glob paths to **only** compile"
+	  },
+
+	  code: {
+	    hidden: true,
+	    default: true,
+	    type: "boolean"
+	  },
+
+	  metadata: {
+	    hidden: true,
+	    default: true,
+	    type: "boolean"
+	  },
+
+	  ast: {
+	    hidden: true,
+	    default: true,
+	    type: "boolean"
+	  },
+
+	  extends: {
+	    type: "string",
+	    hidden: true
+	  },
+
+	  comments: {
+	    type: "boolean",
+	    default: true,
+	    description: "write comments to generated output (true by default)"
+	  },
+
+	  shouldPrintComment: {
+	    hidden: true,
+	    description: "optional callback to control whether a comment should be inserted, when this is used the comments option is ignored"
+	  },
+
+	  wrapPluginVisitorMethod: {
+	    hidden: true,
+	    description: "optional callback to wrap all visitor methods"
+	  },
+
+	  compact: {
+	    type: "booleanString",
+	    default: "auto",
+	    description: "do not include superfluous whitespace characters and line terminators [true|false|auto]"
+	  },
+
+	  minified: {
+	    type: "boolean",
+	    default: false,
+	    description: "save as much bytes when printing [true|false]"
+	  },
+
+	  sourceMap: {
+	    alias: "sourceMaps",
+	    hidden: true
+	  },
+
+	  sourceMaps: {
+	    type: "booleanString",
+	    description: "[true|false|inline]",
+	    default: false,
+	    shorthand: "s"
+	  },
+
+	  sourceMapTarget: {
+	    type: "string",
+	    description: "set `file` on returned source map"
+	  },
+
+	  sourceFileName: {
+	    type: "string",
+	    description: "set `sources[0]` on returned source map"
+	  },
+
+	  sourceRoot: {
+	    type: "filename",
+	    description: "the root from which all sources are relative"
+	  },
+
+	  babelrc: {
+	    description: "Whether or not to look up .babelrc and .babelignore files",
+	    type: "boolean",
+	    default: true
+	  },
+
+	  sourceType: {
+	    description: "",
+	    default: "module"
+	  },
+
+	  auxiliaryCommentBefore: {
+	    type: "string",
+	    description: "print a comment before any injected non-user code"
+	  },
+
+	  auxiliaryCommentAfter: {
+	    type: "string",
+	    description: "print a comment after any injected non-user code"
+	  },
+
+	  resolveModuleSource: {
+	    hidden: true
+	  },
+
+	  getModuleId: {
+	    hidden: true
+	  },
+
+	  moduleRoot: {
+	    type: "filename",
+	    description: "optional prefix for the AMD module formatter that will be prepend to the filename on module definitions"
+	  },
+
+	  moduleIds: {
+	    type: "boolean",
+	    default: false,
+	    shorthand: "M",
+	    description: "insert an explicit id for modules"
+	  },
+
+	  moduleId: {
+	    description: "specify a custom name for module ids",
+	    type: "string"
+	  },
+
+	  passPerPreset: {
+	    description: "Whether to spawn a traversal pass per a preset. By default all presets are merged.",
+	    type: "boolean",
+	    default: false,
+	    hidden: true
+	  },
+
+	  parserOpts: {
+	    description: "Options to pass into the parser, or to change parsers (parserOpts.parser)",
+	    default: false
+	  },
+
+	  generatorOpts: {
+	    description: "Options to pass into the generator, or to change generators (generatorOpts.generator)",
+	    default: false
+	  }
+	};
+
+/***/ }),
+/* 33 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {"use strict";
+
+	exports.__esModule = true;
+
+	var _objectWithoutProperties2 = __webpack_require__(362);
+
+	var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
+	var _stringify = __webpack_require__(34);
+
+	var _stringify2 = _interopRequireDefault(_stringify);
+
+	var _assign = __webpack_require__(85);
+
+	var _assign2 = _interopRequireDefault(_assign);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _node = __webpack_require__(178);
+
+	var context = _interopRequireWildcard(_node);
+
+	var _plugin2 = __webpack_require__(63);
+
+	var _plugin3 = _interopRequireDefault(_plugin2);
+
+	var _babelMessages = __webpack_require__(18);
+
+	var messages = _interopRequireWildcard(_babelMessages);
+
+	var _index = __webpack_require__(51);
+
+	var _resolvePlugin = __webpack_require__(180);
+
+	var _resolvePlugin2 = _interopRequireDefault(_resolvePlugin);
+
+	var _resolvePreset = __webpack_require__(181);
+
+	var _resolvePreset2 = _interopRequireDefault(_resolvePreset);
+
+	var _cloneDeepWith = __webpack_require__(566);
+
+	var _cloneDeepWith2 = _interopRequireDefault(_cloneDeepWith);
+
+	var _clone = __webpack_require__(109);
+
+	var _clone2 = _interopRequireDefault(_clone);
+
+	var _merge = __webpack_require__(289);
+
+	var _merge2 = _interopRequireDefault(_merge);
+
+	var _config2 = __webpack_require__(32);
+
+	var _config3 = _interopRequireDefault(_config2);
+
+	var _removed = __webpack_require__(53);
+
+	var _removed2 = _interopRequireDefault(_removed);
+
+	var _buildConfigChain = __webpack_require__(50);
+
+	var _buildConfigChain2 = _interopRequireDefault(_buildConfigChain);
+
+	var _path = __webpack_require__(17);
+
+	var _path2 = _interopRequireDefault(_path);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var OptionManager = function () {
+	  function OptionManager(log) {
+	    (0, _classCallCheck3.default)(this, OptionManager);
+
+	    this.resolvedConfigs = [];
+	    this.options = OptionManager.createBareOptions();
+	    this.log = log;
+	  }
+
+	  OptionManager.memoisePluginContainer = function memoisePluginContainer(fn, loc, i, alias) {
+	    for (var _iterator = OptionManager.memoisedPlugins, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var cache = _ref;
+
+	      if (cache.container === fn) return cache.plugin;
+	    }
+
+	    var obj = void 0;
+
+	    if (typeof fn === "function") {
+	      obj = fn(context);
+	    } else {
+	      obj = fn;
+	    }
+
+	    if ((typeof obj === "undefined" ? "undefined" : (0, _typeof3.default)(obj)) === "object") {
+	      var _plugin = new _plugin3.default(obj, alias);
+	      OptionManager.memoisedPlugins.push({
+	        container: fn,
+	        plugin: _plugin
+	      });
+	      return _plugin;
+	    } else {
+	      throw new TypeError(messages.get("pluginNotObject", loc, i, typeof obj === "undefined" ? "undefined" : (0, _typeof3.default)(obj)) + loc + i);
+	    }
+	  };
+
+	  OptionManager.createBareOptions = function createBareOptions() {
+	    var opts = {};
+
+	    for (var _key in _config3.default) {
+	      var opt = _config3.default[_key];
+	      opts[_key] = (0, _clone2.default)(opt.default);
+	    }
+
+	    return opts;
+	  };
+
+	  OptionManager.normalisePlugin = function normalisePlugin(plugin, loc, i, alias) {
+	    plugin = plugin.__esModule ? plugin.default : plugin;
+
+	    if (!(plugin instanceof _plugin3.default)) {
+	      if (typeof plugin === "function" || (typeof plugin === "undefined" ? "undefined" : (0, _typeof3.default)(plugin)) === "object") {
+	        plugin = OptionManager.memoisePluginContainer(plugin, loc, i, alias);
+	      } else {
+	        throw new TypeError(messages.get("pluginNotFunction", loc, i, typeof plugin === "undefined" ? "undefined" : (0, _typeof3.default)(plugin)));
+	      }
+	    }
+
+	    plugin.init(loc, i);
+
+	    return plugin;
+	  };
+
+	  OptionManager.normalisePlugins = function normalisePlugins(loc, dirname, plugins) {
+	    return plugins.map(function (val, i) {
+	      var plugin = void 0,
+	          options = void 0;
+
+	      if (!val) {
+	        throw new TypeError("Falsy value found in plugins");
+	      }
+
+	      if (Array.isArray(val)) {
+	        plugin = val[0];
+	        options = val[1];
+	      } else {
+	        plugin = val;
+	      }
+
+	      var alias = typeof plugin === "string" ? plugin : loc + "$" + i;
+
+	      if (typeof plugin === "string") {
+	        var pluginLoc = (0, _resolvePlugin2.default)(plugin, dirname);
+	        if (pluginLoc) {
+	          plugin = __webpack_require__(175)(pluginLoc);
+	        } else {
+	          throw new ReferenceError(messages.get("pluginUnknown", plugin, loc, i, dirname));
+	        }
+	      }
+
+	      plugin = OptionManager.normalisePlugin(plugin, loc, i, alias);
+
+	      return [plugin, options];
+	    });
+	  };
+
+	  OptionManager.prototype.mergeOptions = function mergeOptions(_ref2) {
+	    var _this = this;
+
+	    var rawOpts = _ref2.options,
+	        extendingOpts = _ref2.extending,
+	        alias = _ref2.alias,
+	        loc = _ref2.loc,
+	        dirname = _ref2.dirname;
+
+	    alias = alias || "foreign";
+	    if (!rawOpts) return;
+
+	    if ((typeof rawOpts === "undefined" ? "undefined" : (0, _typeof3.default)(rawOpts)) !== "object" || Array.isArray(rawOpts)) {
+	      this.log.error("Invalid options type for " + alias, TypeError);
+	    }
+
+	    var opts = (0, _cloneDeepWith2.default)(rawOpts, function (val) {
+	      if (val instanceof _plugin3.default) {
+	        return val;
+	      }
+	    });
+
+	    dirname = dirname || process.cwd();
+	    loc = loc || alias;
+
+	    for (var _key2 in opts) {
+	      var option = _config3.default[_key2];
+
+	      if (!option && this.log) {
+	        if (_removed2.default[_key2]) {
+	          this.log.error("Using removed Babel 5 option: " + alias + "." + _key2 + " - " + _removed2.default[_key2].message, ReferenceError);
+	        } else {
+	          var unknownOptErr = "Unknown option: " + alias + "." + _key2 + ". Check out http://babeljs.io/docs/usage/options/ for more information about options.";
+	          var presetConfigErr = "A common cause of this error is the presence of a configuration options object without the corresponding preset name. Example:\n\nInvalid:\n  `{ presets: [{option: value}] }`\nValid:\n  `{ presets: [['presetName', {option: value}]] }`\n\nFor more detailed information on preset configuration, please see http://babeljs.io/docs/plugins/#pluginpresets-options.";
+
+	          this.log.error(unknownOptErr + "\n\n" + presetConfigErr, ReferenceError);
+	        }
+	      }
+	    }
+
+	    (0, _index.normaliseOptions)(opts);
+
+	    if (opts.plugins) {
+	      opts.plugins = OptionManager.normalisePlugins(loc, dirname, opts.plugins);
+	    }
+
+	    if (opts.presets) {
+	      if (opts.passPerPreset) {
+	        opts.presets = this.resolvePresets(opts.presets, dirname, function (preset, presetLoc) {
+	          _this.mergeOptions({
+	            options: preset,
+	            extending: preset,
+	            alias: presetLoc,
+	            loc: presetLoc,
+	            dirname: dirname
+	          });
+	        });
+	      } else {
+	        this.mergePresets(opts.presets, dirname);
+	        delete opts.presets;
+	      }
+	    }
+
+	    if (rawOpts === extendingOpts) {
+	      (0, _assign2.default)(extendingOpts, opts);
+	    } else {
+	      (0, _merge2.default)(extendingOpts || this.options, opts);
+	    }
+	  };
+
+	  OptionManager.prototype.mergePresets = function mergePresets(presets, dirname) {
+	    var _this2 = this;
+
+	    this.resolvePresets(presets, dirname, function (presetOpts, presetLoc) {
+	      _this2.mergeOptions({
+	        options: presetOpts,
+	        alias: presetLoc,
+	        loc: presetLoc,
+	        dirname: _path2.default.dirname(presetLoc || "")
+	      });
+	    });
+	  };
+
+	  OptionManager.prototype.resolvePresets = function resolvePresets(presets, dirname, onResolve) {
+	    return presets.map(function (val) {
+	      var options = void 0;
+	      if (Array.isArray(val)) {
+	        if (val.length > 2) {
+	          throw new Error("Unexpected extra options " + (0, _stringify2.default)(val.slice(2)) + " passed to preset.");
+	        }
+
+	        var _val = val;
+	        val = _val[0];
+	        options = _val[1];
+	      }
+
+	      var presetLoc = void 0;
+	      try {
+	        if (typeof val === "string") {
+	          presetLoc = (0, _resolvePreset2.default)(val, dirname);
+
+	          if (!presetLoc) {
+	            throw new Error("Couldn't find preset " + (0, _stringify2.default)(val) + " relative to directory " + (0, _stringify2.default)(dirname));
+	          }
+
+	          val = __webpack_require__(175)(presetLoc);
+	        }
+
+	        if ((typeof val === "undefined" ? "undefined" : (0, _typeof3.default)(val)) === "object" && val.__esModule) {
+	          if (val.default) {
+	            val = val.default;
+	          } else {
+	            var _val2 = val,
+	                __esModule = _val2.__esModule,
+	                rest = (0, _objectWithoutProperties3.default)(_val2, ["__esModule"]);
+
+	            val = rest;
+	          }
+	        }
+
+	        if ((typeof val === "undefined" ? "undefined" : (0, _typeof3.default)(val)) === "object" && val.buildPreset) val = val.buildPreset;
+
+	        if (typeof val !== "function" && options !== undefined) {
+	          throw new Error("Options " + (0, _stringify2.default)(options) + " passed to " + (presetLoc || "a preset") + " which does not accept options.");
+	        }
+
+	        if (typeof val === "function") val = val(context, options, { dirname: dirname });
+
+	        if ((typeof val === "undefined" ? "undefined" : (0, _typeof3.default)(val)) !== "object") {
+	          throw new Error("Unsupported preset format: " + val + ".");
+	        }
+
+	        onResolve && onResolve(val, presetLoc);
+	      } catch (e) {
+	        if (presetLoc) {
+	          e.message += " (While processing preset: " + (0, _stringify2.default)(presetLoc) + ")";
+	        }
+	        throw e;
+	      }
+	      return val;
+	    });
+	  };
+
+	  OptionManager.prototype.normaliseOptions = function normaliseOptions() {
+	    var opts = this.options;
+
+	    for (var _key3 in _config3.default) {
+	      var option = _config3.default[_key3];
+	      var val = opts[_key3];
+
+	      if (!val && option.optional) continue;
+
+	      if (option.alias) {
+	        opts[option.alias] = opts[option.alias] || val;
+	      } else {
+	        opts[_key3] = val;
+	      }
+	    }
+	  };
+
+	  OptionManager.prototype.init = function init() {
+	    var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+	    for (var _iterator2 = (0, _buildConfigChain2.default)(opts, this.log), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref3;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref3 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref3 = _i2.value;
+	      }
+
+	      var _config = _ref3;
+
+	      this.mergeOptions(_config);
+	    }
+
+	    this.normaliseOptions(opts);
+
+	    return this.options;
+	  };
+
+	  return OptionManager;
+	}();
+
+	exports.default = OptionManager;
+
+	OptionManager.memoisedPlugins = [];
+	module.exports = exports["default"];
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 34 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(401), __esModule: true };
+
+/***/ }),
+/* 35 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _virtualTypes = __webpack_require__(220);
+
+	var virtualTypes = _interopRequireWildcard(_virtualTypes);
+
+	var _debug2 = __webpack_require__(234);
+
+	var _debug3 = _interopRequireDefault(_debug2);
+
+	var _invariant = __webpack_require__(457);
+
+	var _invariant2 = _interopRequireDefault(_invariant);
+
+	var _index = __webpack_require__(7);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	var _assign = __webpack_require__(170);
+
+	var _assign2 = _interopRequireDefault(_assign);
+
+	var _scope = __webpack_require__(133);
+
+	var _scope2 = _interopRequireDefault(_scope);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _cache = __webpack_require__(86);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var _debug = (0, _debug3.default)("babel");
+
+	var NodePath = function () {
+	  function NodePath(hub, parent) {
+	    (0, _classCallCheck3.default)(this, NodePath);
+
+	    this.parent = parent;
+	    this.hub = hub;
+	    this.contexts = [];
+	    this.data = {};
+	    this.shouldSkip = false;
+	    this.shouldStop = false;
+	    this.removed = false;
+	    this.state = null;
+	    this.opts = null;
+	    this.skipKeys = null;
+	    this.parentPath = null;
+	    this.context = null;
+	    this.container = null;
+	    this.listKey = null;
+	    this.inList = false;
+	    this.parentKey = null;
+	    this.key = null;
+	    this.node = null;
+	    this.scope = null;
+	    this.type = null;
+	    this.typeAnnotation = null;
+	  }
+
+	  NodePath.get = function get(_ref) {
+	    var hub = _ref.hub,
+	        parentPath = _ref.parentPath,
+	        parent = _ref.parent,
+	        container = _ref.container,
+	        listKey = _ref.listKey,
+	        key = _ref.key;
+
+	    if (!hub && parentPath) {
+	      hub = parentPath.hub;
+	    }
+
+	    (0, _invariant2.default)(parent, "To get a node path the parent needs to exist");
+
+	    var targetNode = container[key];
+
+	    var paths = _cache.path.get(parent) || [];
+	    if (!_cache.path.has(parent)) {
+	      _cache.path.set(parent, paths);
+	    }
+
+	    var path = void 0;
+
+	    for (var i = 0; i < paths.length; i++) {
+	      var pathCheck = paths[i];
+	      if (pathCheck.node === targetNode) {
+	        path = pathCheck;
+	        break;
+	      }
+	    }
+
+	    if (!path) {
+	      path = new NodePath(hub, parent);
+	      paths.push(path);
+	    }
+
+	    path.setup(parentPath, container, listKey, key);
+
+	    return path;
+	  };
+
+	  NodePath.prototype.getScope = function getScope(scope) {
+	    var ourScope = scope;
+
+	    if (this.isScope()) {
+	      ourScope = new _scope2.default(this, scope);
+	    }
+
+	    return ourScope;
+	  };
+
+	  NodePath.prototype.setData = function setData(key, val) {
+	    return this.data[key] = val;
+	  };
+
+	  NodePath.prototype.getData = function getData(key, def) {
+	    var val = this.data[key];
+	    if (!val && def) val = this.data[key] = def;
+	    return val;
+	  };
+
+	  NodePath.prototype.buildCodeFrameError = function buildCodeFrameError(msg) {
+	    var Error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SyntaxError;
+
+	    return this.hub.file.buildCodeFrameError(this.node, msg, Error);
+	  };
+
+	  NodePath.prototype.traverse = function traverse(visitor, state) {
+	    (0, _index2.default)(this.node, visitor, this.scope, state, this);
+	  };
+
+	  NodePath.prototype.mark = function mark(type, message) {
+	    this.hub.file.metadata.marked.push({
+	      type: type,
+	      message: message,
+	      loc: this.node.loc
+	    });
+	  };
+
+	  NodePath.prototype.set = function set(key, node) {
+	    t.validate(this.node, key, node);
+	    this.node[key] = node;
+	  };
+
+	  NodePath.prototype.getPathLocation = function getPathLocation() {
+	    var parts = [];
+	    var path = this;
+	    do {
+	      var key = path.key;
+	      if (path.inList) key = path.listKey + "[" + key + "]";
+	      parts.unshift(key);
+	    } while (path = path.parentPath);
+	    return parts.join(".");
+	  };
+
+	  NodePath.prototype.debug = function debug(buildMessage) {
+	    if (!_debug.enabled) return;
+	    _debug(this.getPathLocation() + " " + this.type + ": " + buildMessage());
+	  };
+
+	  return NodePath;
+	}();
+
+	exports.default = NodePath;
+
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(364));
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(370));
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(378));
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(368));
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(367));
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(373));
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(366));
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(377));
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(376));
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(369));
+	(0, _assign2.default)(NodePath.prototype, __webpack_require__(365));
+
+	var _loop2 = function _loop2() {
+	  if (_isArray) {
+	    if (_i >= _iterator.length) return "break";
+	    _ref2 = _iterator[_i++];
+	  } else {
+	    _i = _iterator.next();
+	    if (_i.done) return "break";
+	    _ref2 = _i.value;
+	  }
+
+	  var type = _ref2;
+
+	  var typeKey = "is" + type;
+	  NodePath.prototype[typeKey] = function (opts) {
+	    return t[typeKey](this.node, opts);
+	  };
+
+	  NodePath.prototype["assert" + type] = function (opts) {
+	    if (!this[typeKey](opts)) {
+	      throw new TypeError("Expected node path of type " + type);
+	    }
+	  };
+	};
+
+	for (var _iterator = t.TYPES, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	  var _ref2;
+
+	  var _ret2 = _loop2();
+
+	  if (_ret2 === "break") break;
+	}
+
+	var _loop = function _loop(type) {
+	  if (type[0] === "_") return "continue";
+	  if (t.TYPES.indexOf(type) < 0) t.TYPES.push(type);
+
+	  var virtualType = virtualTypes[type];
+
+	  NodePath.prototype["is" + type] = function (opts) {
+	    return virtualType.checkPath(this, opts);
+	  };
+	};
+
+	for (var type in virtualTypes) {
+	  var _ret = _loop(type);
+
+	  if (_ret === "continue") continue;
+	}
+	module.exports = exports["default"];
+
+/***/ }),
+/* 36 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = function (exec) {
+	  try {
+	    return !!exec();
+	  } catch (e) {
+	    return true;
+	  }
+	};
+
+/***/ }),
+/* 37 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// to indexed object, toObject with fallback for non-array-like ES3 strings
+	var IObject = __webpack_require__(140),
+	    defined = __webpack_require__(88);
+	module.exports = function (it) {
+	  return IObject(defined(it));
+	};
+
+/***/ }),
+/* 38 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseIsNative = __webpack_require__(488),
+	    getValue = __webpack_require__(526);
+
+	/**
+	 * Gets the native function at `key` of `object`.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @param {string} key The key of the method to get.
+	 * @returns {*} Returns the function if it's native, else `undefined`.
+	 */
+	function getNative(object, key) {
+	  var value = getValue(object, key);
+	  return baseIsNative(value) ? value : undefined;
+	}
+
+	module.exports = getNative;
+
+/***/ }),
+/* 39 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = function (module) {
+		if (!module.webpackPolyfill) {
+			module.deprecate = function () {};
+			module.paths = [];
+			// module.parent = undefined by default
+			module.children = [];
+			module.webpackPolyfill = 1;
+		}
+		return module;
+	};
+
+/***/ }),
+/* 40 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var node = _ref.node,
+	      parent = _ref.parent,
+	      scope = _ref.scope,
+	      id = _ref.id;
+
+	  if (node.id) return;
+
+	  if ((t.isObjectProperty(parent) || t.isObjectMethod(parent, { kind: "method" })) && (!parent.computed || t.isLiteral(parent.key))) {
+	    id = parent.key;
+	  } else if (t.isVariableDeclarator(parent)) {
+	    id = parent.id;
+
+	    if (t.isIdentifier(id)) {
+	      var binding = scope.parent.getBinding(id.name);
+	      if (binding && binding.constant && scope.getBinding(id.name) === binding) {
+	        node.id = id;
+	        node.id[t.NOT_LOCAL_BINDING] = true;
+	        return;
+	      }
+	    }
+	  } else if (t.isAssignmentExpression(parent)) {
+	    id = parent.left;
+	  } else if (!id) {
+	    return;
+	  }
+
+	  var name = void 0;
+	  if (id && t.isLiteral(id)) {
+	    name = id.value;
+	  } else if (id && t.isIdentifier(id)) {
+	    name = id.name;
+	  } else {
+	    return;
+	  }
+
+	  name = t.toBindingIdentifierName(name);
+	  id = t.identifier(name);
+
+	  id[t.NOT_LOCAL_BINDING] = true;
+
+	  var state = visit(node, name, scope);
+	  return wrap(state, node, id, scope) || node;
+	};
+
+	var _babelHelperGetFunctionArity = __webpack_require__(185);
+
+	var _babelHelperGetFunctionArity2 = _interopRequireDefault(_babelHelperGetFunctionArity);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildPropertyMethodAssignmentWrapper = (0, _babelTemplate2.default)("\n  (function (FUNCTION_KEY) {\n    function FUNCTION_ID() {\n      return FUNCTION_KEY.apply(this, arguments);\n    }\n\n    FUNCTION_ID.toString = function () {\n      return FUNCTION_KEY.toString();\n    }\n\n    return FUNCTION_ID;\n  })(FUNCTION)\n");
+
+	var buildGeneratorPropertyMethodAssignmentWrapper = (0, _babelTemplate2.default)("\n  (function (FUNCTION_KEY) {\n    function* FUNCTION_ID() {\n      return yield* FUNCTION_KEY.apply(this, arguments);\n    }\n\n    FUNCTION_ID.toString = function () {\n      return FUNCTION_KEY.toString();\n    };\n\n    return FUNCTION_ID;\n  })(FUNCTION)\n");
+
+	var visitor = {
+	  "ReferencedIdentifier|BindingIdentifier": function ReferencedIdentifierBindingIdentifier(path, state) {
+	    if (path.node.name !== state.name) return;
+
+	    var localDeclar = path.scope.getBindingIdentifier(state.name);
+	    if (localDeclar !== state.outerDeclar) return;
+
+	    state.selfReference = true;
+	    path.stop();
+	  }
+	};
+
+	function wrap(state, method, id, scope) {
+	  if (state.selfReference) {
+	    if (scope.hasBinding(id.name) && !scope.hasGlobal(id.name)) {
+	      scope.rename(id.name);
+	    } else {
+	      if (!t.isFunction(method)) return;
+
+	      var build = buildPropertyMethodAssignmentWrapper;
+	      if (method.generator) build = buildGeneratorPropertyMethodAssignmentWrapper;
+	      var _template = build({
+	        FUNCTION: method,
+	        FUNCTION_ID: id,
+	        FUNCTION_KEY: scope.generateUidIdentifier(id.name)
+	      }).expression;
+	      _template.callee._skipModulesRemap = true;
+
+	      var params = _template.callee.body.body[0].params;
+	      for (var i = 0, len = (0, _babelHelperGetFunctionArity2.default)(method); i < len; i++) {
+	        params.push(scope.generateUidIdentifier("x"));
+	      }
+
+	      return _template;
+	    }
+	  }
+
+	  method.id = id;
+	  scope.getProgramParent().references[id.name] = true;
+	}
+
+	function visit(node, name, scope) {
+	  var state = {
+	    selfAssignment: false,
+	    selfReference: false,
+	    outerDeclar: scope.getBindingIdentifier(name),
+	    references: [],
+	    name: name
+	  };
+
+	  var binding = scope.getOwnBinding(name);
+
+	  if (binding) {
+	    if (binding.kind === "param") {
+	      state.selfReference = true;
+	    } else {}
+	  } else if (state.outerDeclar || scope.hasGlobal(name)) {
+	    scope.traverse(node, visitor, state);
+	  }
+
+	  return state;
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 41 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _setPrototypeOf = __webpack_require__(357);
+
+	var _setPrototypeOf2 = _interopRequireDefault(_setPrototypeOf);
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = function (subClass, superClass) {
+	  if (typeof superClass !== "function" && superClass !== null) {
+	    throw new TypeError("Super expression must either be null or a function, not " + (typeof superClass === "undefined" ? "undefined" : (0, _typeof3.default)(superClass)));
+	  }
+
+	  subClass.prototype = (0, _create2.default)(superClass && superClass.prototype, {
+	    constructor: {
+	      value: subClass,
+	      enumerable: false,
+	      writable: true,
+	      configurable: true
+	    }
+	  });
+	  if (superClass) _setPrototypeOf2.default ? (0, _setPrototypeOf2.default)(subClass, superClass) : subClass.__proto__ = superClass;
+	};
+
+/***/ }),
+/* 42 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = function (self, call) {
+	  if (!self) {
+	    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+	  }
+
+	  return call && ((typeof call === "undefined" ? "undefined" : (0, _typeof3.default)(call)) === "object" || typeof call === "function") ? call : self;
+	};
+
+/***/ }),
+/* 43 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 19.1.2.14 / 15.2.3.14 Object.keys(O)
+	var $keys = __webpack_require__(232),
+	    enumBugKeys = __webpack_require__(139);
+
+	module.exports = Object.keys || function keys(O) {
+	  return $keys(O, enumBugKeys);
+	};
+
+/***/ }),
+/* 44 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var root = __webpack_require__(15);
+
+	/** Built-in value references. */
+	var _Symbol = root.Symbol;
+
+	module.exports = _Symbol;
+
+/***/ }),
+/* 45 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Performs a
+	 * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+	 * comparison between two values to determine if they are equivalent.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to compare.
+	 * @param {*} other The other value to compare.
+	 * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+	 * @example
+	 *
+	 * var object = { 'a': 1 };
+	 * var other = { 'a': 1 };
+	 *
+	 * _.eq(object, object);
+	 * // => true
+	 *
+	 * _.eq(object, other);
+	 * // => false
+	 *
+	 * _.eq('a', 'a');
+	 * // => true
+	 *
+	 * _.eq('a', Object('a'));
+	 * // => false
+	 *
+	 * _.eq(NaN, NaN);
+	 * // => true
+	 */
+	function eq(value, other) {
+	  return value === other || value !== value && other !== other;
+	}
+
+	module.exports = eq;
+
+/***/ }),
+/* 46 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var arrayLikeKeys = __webpack_require__(240),
+	    baseKeysIn = __webpack_require__(492),
+	    isArrayLike = __webpack_require__(24);
+
+	/**
+	 * Creates an array of the own and inherited enumerable property names of `object`.
+	 *
+	 * **Note:** Non-object values are coerced to objects.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 3.0.0
+	 * @category Object
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the array of property names.
+	 * @example
+	 *
+	 * function Foo() {
+	 *   this.a = 1;
+	 *   this.b = 2;
+	 * }
+	 *
+	 * Foo.prototype.c = 3;
+	 *
+	 * _.keysIn(new Foo);
+	 * // => ['a', 'b', 'c'] (iteration order is not guaranteed)
+	 */
+	function keysIn(object) {
+	  return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object);
+	}
+
+	module.exports = keysIn;
+
+/***/ }),
+/* 47 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var toFinite = __webpack_require__(588);
+
+	/**
+	 * Converts `value` to an integer.
+	 *
+	 * **Note:** This method is loosely based on
+	 * [`ToInteger`](http://www.ecma-international.org/ecma-262/7.0/#sec-tointeger).
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to convert.
+	 * @returns {number} Returns the converted integer.
+	 * @example
+	 *
+	 * _.toInteger(3.2);
+	 * // => 3
+	 *
+	 * _.toInteger(Number.MIN_VALUE);
+	 * // => 0
+	 *
+	 * _.toInteger(Infinity);
+	 * // => 1.7976931348623157e+308
+	 *
+	 * _.toInteger('3.2');
+	 * // => 3
+	 */
+	function toInteger(value) {
+	  var result = toFinite(value),
+	      remainder = result % 1;
+
+	  return result === result ? remainder ? result - remainder : result : 0;
+	}
+
+	module.exports = toInteger;
+
+/***/ }),
+/* 48 */
+/***/ (function(module, exports) {
+
+	/* WEBPACK VAR INJECTION */(function(__webpack_amd_options__) {module.exports = __webpack_amd_options__;
+
+	/* WEBPACK VAR INJECTION */}.call(exports, {}))
+
+/***/ }),
+/* 49 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {"use strict";
+
+	exports.__esModule = true;
+	exports.File = undefined;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	var _assign = __webpack_require__(85);
+
+	var _assign2 = _interopRequireDefault(_assign);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _possibleConstructorReturn2 = __webpack_require__(42);
+
+	var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+	var _inherits2 = __webpack_require__(41);
+
+	var _inherits3 = _interopRequireDefault(_inherits2);
+
+	var _babelHelpers = __webpack_require__(190);
+
+	var _babelHelpers2 = _interopRequireDefault(_babelHelpers);
+
+	var _metadata = __webpack_require__(120);
+
+	var metadataVisitor = _interopRequireWildcard(_metadata);
+
+	var _convertSourceMap = __webpack_require__(399);
+
+	var _convertSourceMap2 = _interopRequireDefault(_convertSourceMap);
+
+	var _optionManager = __webpack_require__(33);
+
+	var _optionManager2 = _interopRequireDefault(_optionManager);
+
+	var _pluginPass = __webpack_require__(295);
+
+	var _pluginPass2 = _interopRequireDefault(_pluginPass);
+
+	var _babelTraverse = __webpack_require__(7);
+
+	var _babelTraverse2 = _interopRequireDefault(_babelTraverse);
+
+	var _sourceMap = __webpack_require__(284);
+
+	var _sourceMap2 = _interopRequireDefault(_sourceMap);
+
+	var _babelGenerator = __webpack_require__(182);
+
+	var _babelGenerator2 = _interopRequireDefault(_babelGenerator);
+
+	var _babelCodeFrame = __webpack_require__(177);
+
+	var _babelCodeFrame2 = _interopRequireDefault(_babelCodeFrame);
+
+	var _defaults = __webpack_require__(268);
+
+	var _defaults2 = _interopRequireDefault(_defaults);
+
+	var _logger = __webpack_require__(119);
+
+	var _logger2 = _interopRequireDefault(_logger);
+
+	var _store = __webpack_require__(118);
+
+	var _store2 = _interopRequireDefault(_store);
+
+	var _babylon = __webpack_require__(87);
+
+	var _util = __webpack_require__(121);
+
+	var util = _interopRequireWildcard(_util);
+
+	var _path = __webpack_require__(17);
+
+	var _path2 = _interopRequireDefault(_path);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _resolve = __webpack_require__(117);
+
+	var _resolve2 = _interopRequireDefault(_resolve);
+
+	var _blockHoist = __webpack_require__(292);
+
+	var _blockHoist2 = _interopRequireDefault(_blockHoist);
+
+	var _shadowFunctions = __webpack_require__(293);
+
+	var _shadowFunctions2 = _interopRequireDefault(_shadowFunctions);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var shebangRegex = /^#!.*/;
+
+	var INTERNAL_PLUGINS = [[_blockHoist2.default], [_shadowFunctions2.default]];
+
+	var errorVisitor = {
+	  enter: function enter(path, state) {
+	    var loc = path.node.loc;
+	    if (loc) {
+	      state.loc = loc;
+	      path.stop();
+	    }
+	  }
+	};
+
+	var File = function (_Store) {
+	  (0, _inherits3.default)(File, _Store);
+
+	  function File() {
+	    var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+	    var pipeline = arguments[1];
+	    (0, _classCallCheck3.default)(this, File);
+
+	    var _this = (0, _possibleConstructorReturn3.default)(this, _Store.call(this));
+
+	    _this.pipeline = pipeline;
+
+	    _this.log = new _logger2.default(_this, opts.filename || "unknown");
+	    _this.opts = _this.initOptions(opts);
+
+	    _this.parserOpts = {
+	      sourceType: _this.opts.sourceType,
+	      sourceFileName: _this.opts.filename,
+	      plugins: []
+	    };
+
+	    _this.pluginVisitors = [];
+	    _this.pluginPasses = [];
+
+	    _this.buildPluginsForOptions(_this.opts);
+
+	    if (_this.opts.passPerPreset) {
+	      _this.perPresetOpts = [];
+	      _this.opts.presets.forEach(function (presetOpts) {
+	        var perPresetOpts = (0, _assign2.default)((0, _create2.default)(_this.opts), presetOpts);
+	        _this.perPresetOpts.push(perPresetOpts);
+	        _this.buildPluginsForOptions(perPresetOpts);
+	      });
+	    }
+
+	    _this.metadata = {
+	      usedHelpers: [],
+	      marked: [],
+	      modules: {
+	        imports: [],
+	        exports: {
+	          exported: [],
+	          specifiers: []
+	        }
+	      }
+	    };
+
+	    _this.dynamicImportTypes = {};
+	    _this.dynamicImportIds = {};
+	    _this.dynamicImports = [];
+	    _this.declarations = {};
+	    _this.usedHelpers = {};
+
+	    _this.path = null;
+	    _this.ast = {};
+
+	    _this.code = "";
+	    _this.shebang = "";
+
+	    _this.hub = new _babelTraverse.Hub(_this);
+	    return _this;
+	  }
+
+	  File.prototype.getMetadata = function getMetadata() {
+	    var has = false;
+	    for (var _iterator = this.ast.program.body, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var node = _ref;
+
+	      if (t.isModuleDeclaration(node)) {
+	        has = true;
+	        break;
+	      }
+	    }
+	    if (has) {
+	      this.path.traverse(metadataVisitor, this);
+	    }
+	  };
+
+	  File.prototype.initOptions = function initOptions(opts) {
+	    opts = new _optionManager2.default(this.log, this.pipeline).init(opts);
+
+	    if (opts.inputSourceMap) {
+	      opts.sourceMaps = true;
+	    }
+
+	    if (opts.moduleId) {
+	      opts.moduleIds = true;
+	    }
+
+	    opts.basename = _path2.default.basename(opts.filename, _path2.default.extname(opts.filename));
+
+	    opts.ignore = util.arrayify(opts.ignore, util.regexify);
+
+	    if (opts.only) opts.only = util.arrayify(opts.only, util.regexify);
+
+	    (0, _defaults2.default)(opts, {
+	      moduleRoot: opts.sourceRoot
+	    });
+
+	    (0, _defaults2.default)(opts, {
+	      sourceRoot: opts.moduleRoot
+	    });
+
+	    (0, _defaults2.default)(opts, {
+	      filenameRelative: opts.filename
+	    });
+
+	    var basenameRelative = _path2.default.basename(opts.filenameRelative);
+
+	    (0, _defaults2.default)(opts, {
+	      sourceFileName: basenameRelative,
+	      sourceMapTarget: basenameRelative
+	    });
+
+	    return opts;
+	  };
+
+	  File.prototype.buildPluginsForOptions = function buildPluginsForOptions(opts) {
+	    if (!Array.isArray(opts.plugins)) {
+	      return;
+	    }
+
+	    var plugins = opts.plugins.concat(INTERNAL_PLUGINS);
+	    var currentPluginVisitors = [];
+	    var currentPluginPasses = [];
+
+	    for (var _iterator2 = plugins, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var ref = _ref2;
+	      var plugin = ref[0],
+	          pluginOpts = ref[1];
+
+	      currentPluginVisitors.push(plugin.visitor);
+	      currentPluginPasses.push(new _pluginPass2.default(this, plugin, pluginOpts));
+
+	      if (plugin.manipulateOptions) {
+	        plugin.manipulateOptions(opts, this.parserOpts, this);
+	      }
+	    }
+
+	    this.pluginVisitors.push(currentPluginVisitors);
+	    this.pluginPasses.push(currentPluginPasses);
+	  };
+
+	  File.prototype.getModuleName = function getModuleName() {
+	    var opts = this.opts;
+	    if (!opts.moduleIds) {
+	      return null;
+	    }
+
+	    if (opts.moduleId != null && !opts.getModuleId) {
+	      return opts.moduleId;
+	    }
+
+	    var filenameRelative = opts.filenameRelative;
+	    var moduleName = "";
+
+	    if (opts.moduleRoot != null) {
+	      moduleName = opts.moduleRoot + "/";
+	    }
+
+	    if (!opts.filenameRelative) {
+	      return moduleName + opts.filename.replace(/^\//, "");
+	    }
+
+	    if (opts.sourceRoot != null) {
+	      var sourceRootRegEx = new RegExp("^" + opts.sourceRoot + "\/?");
+	      filenameRelative = filenameRelative.replace(sourceRootRegEx, "");
+	    }
+
+	    filenameRelative = filenameRelative.replace(/\.(\w*?)$/, "");
+
+	    moduleName += filenameRelative;
+
+	    moduleName = moduleName.replace(/\\/g, "/");
+
+	    if (opts.getModuleId) {
+	      return opts.getModuleId(moduleName) || moduleName;
+	    } else {
+	      return moduleName;
+	    }
+	  };
+
+	  File.prototype.resolveModuleSource = function resolveModuleSource(source) {
+	    var resolveModuleSource = this.opts.resolveModuleSource;
+	    if (resolveModuleSource) source = resolveModuleSource(source, this.opts.filename);
+	    return source;
+	  };
+
+	  File.prototype.addImport = function addImport(source, imported) {
+	    var name = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : imported;
+
+	    var alias = source + ":" + imported;
+	    var id = this.dynamicImportIds[alias];
+
+	    if (!id) {
+	      source = this.resolveModuleSource(source);
+	      id = this.dynamicImportIds[alias] = this.scope.generateUidIdentifier(name);
+
+	      var specifiers = [];
+
+	      if (imported === "*") {
+	        specifiers.push(t.importNamespaceSpecifier(id));
+	      } else if (imported === "default") {
+	        specifiers.push(t.importDefaultSpecifier(id));
+	      } else {
+	        specifiers.push(t.importSpecifier(id, t.identifier(imported)));
+	      }
+
+	      var declar = t.importDeclaration(specifiers, t.stringLiteral(source));
+	      declar._blockHoist = 3;
+
+	      this.path.unshiftContainer("body", declar);
+	    }
+
+	    return id;
+	  };
+
+	  File.prototype.addHelper = function addHelper(name) {
+	    var declar = this.declarations[name];
+	    if (declar) return declar;
+
+	    if (!this.usedHelpers[name]) {
+	      this.metadata.usedHelpers.push(name);
+	      this.usedHelpers[name] = true;
+	    }
+
+	    var generator = this.get("helperGenerator");
+	    var runtime = this.get("helpersNamespace");
+	    if (generator) {
+	      var res = generator(name);
+	      if (res) return res;
+	    } else if (runtime) {
+	      return t.memberExpression(runtime, t.identifier(name));
+	    }
+
+	    var ref = (0, _babelHelpers2.default)(name);
+	    var uid = this.declarations[name] = this.scope.generateUidIdentifier(name);
+
+	    if (t.isFunctionExpression(ref) && !ref.id) {
+	      ref.body._compact = true;
+	      ref._generated = true;
+	      ref.id = uid;
+	      ref.type = "FunctionDeclaration";
+	      this.path.unshiftContainer("body", ref);
+	    } else {
+	      ref._compact = true;
+	      this.scope.push({
+	        id: uid,
+	        init: ref,
+	        unique: true
+	      });
+	    }
+
+	    return uid;
+	  };
+
+	  File.prototype.addTemplateObject = function addTemplateObject(helperName, strings, raw) {
+	    var stringIds = raw.elements.map(function (string) {
+	      return string.value;
+	    });
+	    var name = helperName + "_" + raw.elements.length + "_" + stringIds.join(",");
+
+	    var declar = this.declarations[name];
+	    if (declar) return declar;
+
+	    var uid = this.declarations[name] = this.scope.generateUidIdentifier("templateObject");
+
+	    var helperId = this.addHelper(helperName);
+	    var init = t.callExpression(helperId, [strings, raw]);
+	    init._compact = true;
+	    this.scope.push({
+	      id: uid,
+	      init: init,
+	      _blockHoist: 1.9 });
+	    return uid;
+	  };
+
+	  File.prototype.buildCodeFrameError = function buildCodeFrameError(node, msg) {
+	    var Error = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : SyntaxError;
+
+	    var loc = node && (node.loc || node._loc);
+
+	    var err = new Error(msg);
+
+	    if (loc) {
+	      err.loc = loc.start;
+	    } else {
+	      (0, _babelTraverse2.default)(node, errorVisitor, this.scope, err);
+
+	      err.message += " (This is an error on an internal node. Probably an internal error";
+
+	      if (err.loc) {
+	        err.message += ". Location has been estimated.";
+	      }
+
+	      err.message += ")";
+	    }
+
+	    return err;
+	  };
+
+	  File.prototype.mergeSourceMap = function mergeSourceMap(map) {
+	    var inputMap = this.opts.inputSourceMap;
+
+	    if (inputMap) {
+	      var inputMapConsumer = new _sourceMap2.default.SourceMapConsumer(inputMap);
+	      var outputMapConsumer = new _sourceMap2.default.SourceMapConsumer(map);
+
+	      var mergedGenerator = new _sourceMap2.default.SourceMapGenerator({
+	        file: inputMapConsumer.file,
+	        sourceRoot: inputMapConsumer.sourceRoot
+	      });
+
+	      var source = outputMapConsumer.sources[0];
+
+	      inputMapConsumer.eachMapping(function (mapping) {
+	        var generatedPosition = outputMapConsumer.generatedPositionFor({
+	          line: mapping.generatedLine,
+	          column: mapping.generatedColumn,
+	          source: source
+	        });
+	        if (generatedPosition.column != null) {
+	          mergedGenerator.addMapping({
+	            source: mapping.source,
+
+	            original: mapping.source == null ? null : {
+	              line: mapping.originalLine,
+	              column: mapping.originalColumn
+	            },
+
+	            generated: generatedPosition
+	          });
+	        }
+	      });
+
+	      var mergedMap = mergedGenerator.toJSON();
+	      inputMap.mappings = mergedMap.mappings;
+	      return inputMap;
+	    } else {
+	      return map;
+	    }
+	  };
+
+	  File.prototype.parse = function parse(code) {
+	    var parseCode = _babylon.parse;
+	    var parserOpts = this.opts.parserOpts;
+
+	    if (parserOpts) {
+	      parserOpts = (0, _assign2.default)({}, this.parserOpts, parserOpts);
+
+	      if (parserOpts.parser) {
+	        if (typeof parserOpts.parser === "string") {
+	          var dirname = _path2.default.dirname(this.opts.filename) || process.cwd();
+	          var parser = (0, _resolve2.default)(parserOpts.parser, dirname);
+	          if (parser) {
+	            parseCode = __webpack_require__(174)(parser).parse;
+	          } else {
+	            throw new Error("Couldn't find parser " + parserOpts.parser + " with \"parse\" method " + ("relative to directory " + dirname));
+	          }
+	        } else {
+	          parseCode = parserOpts.parser;
+	        }
+
+	        parserOpts.parser = {
+	          parse: function parse(source) {
+	            return (0, _babylon.parse)(source, parserOpts);
+	          }
+	        };
+	      }
+	    }
+
+	    this.log.debug("Parse start");
+	    var ast = parseCode(code, parserOpts || this.parserOpts);
+	    this.log.debug("Parse stop");
+	    return ast;
+	  };
+
+	  File.prototype._addAst = function _addAst(ast) {
+	    this.path = _babelTraverse.NodePath.get({
+	      hub: this.hub,
+	      parentPath: null,
+	      parent: ast,
+	      container: ast,
+	      key: "program"
+	    }).setContext();
+	    this.scope = this.path.scope;
+	    this.ast = ast;
+	    this.getMetadata();
+	  };
+
+	  File.prototype.addAst = function addAst(ast) {
+	    this.log.debug("Start set AST");
+	    this._addAst(ast);
+	    this.log.debug("End set AST");
+	  };
+
+	  File.prototype.transform = function transform() {
+	    for (var i = 0; i < this.pluginPasses.length; i++) {
+	      var pluginPasses = this.pluginPasses[i];
+	      this.call("pre", pluginPasses);
+	      this.log.debug("Start transform traverse");
+
+	      var visitor = _babelTraverse2.default.visitors.merge(this.pluginVisitors[i], pluginPasses, this.opts.wrapPluginVisitorMethod);
+	      (0, _babelTraverse2.default)(this.ast, visitor, this.scope);
+
+	      this.log.debug("End transform traverse");
+	      this.call("post", pluginPasses);
+	    }
+
+	    return this.generate();
+	  };
+
+	  File.prototype.wrap = function wrap(code, callback) {
+	    code = code + "";
+
+	    try {
+	      if (this.shouldIgnore()) {
+	        return this.makeResult({ code: code, ignored: true });
+	      } else {
+	        return callback();
+	      }
+	    } catch (err) {
+	      if (err._babel) {
+	        throw err;
+	      } else {
+	        err._babel = true;
+	      }
+
+	      var message = err.message = this.opts.filename + ": " + err.message;
+
+	      var loc = err.loc;
+	      if (loc) {
+	        err.codeFrame = (0, _babelCodeFrame2.default)(code, loc.line, loc.column + 1, this.opts);
+	        message += "\n" + err.codeFrame;
+	      }
+
+	      if (process.browser) {
+	        err.message = message;
+	      }
+
+	      if (err.stack) {
+	        var newStack = err.stack.replace(err.message, message);
+	        err.stack = newStack;
+	      }
+
+	      throw err;
+	    }
+	  };
+
+	  File.prototype.addCode = function addCode(code) {
+	    code = (code || "") + "";
+	    code = this.parseInputSourceMap(code);
+	    this.code = code;
+	  };
+
+	  File.prototype.parseCode = function parseCode() {
+	    this.parseShebang();
+	    var ast = this.parse(this.code);
+	    this.addAst(ast);
+	  };
+
+	  File.prototype.shouldIgnore = function shouldIgnore() {
+	    var opts = this.opts;
+	    return util.shouldIgnore(opts.filename, opts.ignore, opts.only);
+	  };
+
+	  File.prototype.call = function call(key, pluginPasses) {
+	    for (var _iterator3 = pluginPasses, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	      var _ref3;
+
+	      if (_isArray3) {
+	        if (_i3 >= _iterator3.length) break;
+	        _ref3 = _iterator3[_i3++];
+	      } else {
+	        _i3 = _iterator3.next();
+	        if (_i3.done) break;
+	        _ref3 = _i3.value;
+	      }
+
+	      var pass = _ref3;
+
+	      var plugin = pass.plugin;
+	      var fn = plugin[key];
+	      if (fn) fn.call(pass, this);
+	    }
+	  };
+
+	  File.prototype.parseInputSourceMap = function parseInputSourceMap(code) {
+	    var opts = this.opts;
+
+	    if (opts.inputSourceMap !== false) {
+	      var inputMap = _convertSourceMap2.default.fromSource(code);
+	      if (inputMap) {
+	        opts.inputSourceMap = inputMap.toObject();
+	        code = _convertSourceMap2.default.removeComments(code);
+	      }
+	    }
+
+	    return code;
+	  };
+
+	  File.prototype.parseShebang = function parseShebang() {
+	    var shebangMatch = shebangRegex.exec(this.code);
+	    if (shebangMatch) {
+	      this.shebang = shebangMatch[0];
+	      this.code = this.code.replace(shebangRegex, "");
+	    }
+	  };
+
+	  File.prototype.makeResult = function makeResult(_ref4) {
+	    var code = _ref4.code,
+	        map = _ref4.map,
+	        ast = _ref4.ast,
+	        ignored = _ref4.ignored;
+
+	    var result = {
+	      metadata: null,
+	      options: this.opts,
+	      ignored: !!ignored,
+	      code: null,
+	      ast: null,
+	      map: map || null
+	    };
+
+	    if (this.opts.code) {
+	      result.code = code;
+	    }
+
+	    if (this.opts.ast) {
+	      result.ast = ast;
+	    }
+
+	    if (this.opts.metadata) {
+	      result.metadata = this.metadata;
+	    }
+
+	    return result;
+	  };
+
+	  File.prototype.generate = function generate() {
+	    var opts = this.opts;
+	    var ast = this.ast;
+
+	    var result = { ast: ast };
+	    if (!opts.code) return this.makeResult(result);
+
+	    var gen = _babelGenerator2.default;
+	    if (opts.generatorOpts.generator) {
+	      gen = opts.generatorOpts.generator;
+
+	      if (typeof gen === "string") {
+	        var dirname = _path2.default.dirname(this.opts.filename) || process.cwd();
+	        var generator = (0, _resolve2.default)(gen, dirname);
+	        if (generator) {
+	          gen = __webpack_require__(174)(generator).print;
+	        } else {
+	          throw new Error("Couldn't find generator " + gen + " with \"print\" method relative " + ("to directory " + dirname));
+	        }
+	      }
+	    }
+
+	    this.log.debug("Generation start");
+
+	    var _result = gen(ast, opts.generatorOpts ? (0, _assign2.default)(opts, opts.generatorOpts) : opts, this.code);
+	    result.code = _result.code;
+	    result.map = _result.map;
+
+	    this.log.debug("Generation end");
+
+	    if (this.shebang) {
+	      result.code = this.shebang + "\n" + result.code;
+	    }
+
+	    if (result.map) {
+	      result.map = this.mergeSourceMap(result.map);
+	    }
+
+	    if (opts.sourceMaps === "inline" || opts.sourceMaps === "both") {
+	      result.code += "\n" + _convertSourceMap2.default.fromObject(result.map).toComment();
+	    }
+
+	    if (opts.sourceMaps === "inline") {
+	      result.map = null;
+	    }
+
+	    return this.makeResult(result);
+	  };
+
+	  return File;
+	}(_store2.default);
+
+	exports.default = File;
+	exports.File = File;
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 50 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {"use strict";
+
+	exports.__esModule = true;
+
+	var _assign = __webpack_require__(85);
+
+	var _assign2 = _interopRequireDefault(_assign);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	exports.default = buildConfigChain;
+
+	var _resolve = __webpack_require__(117);
+
+	var _resolve2 = _interopRequireDefault(_resolve);
+
+	var _json = __webpack_require__(461);
+
+	var _json2 = _interopRequireDefault(_json);
+
+	var _pathIsAbsolute = __webpack_require__(595);
+
+	var _pathIsAbsolute2 = _interopRequireDefault(_pathIsAbsolute);
+
+	var _path = __webpack_require__(17);
+
+	var _path2 = _interopRequireDefault(_path);
+
+	var _fs = __webpack_require__(115);
+
+	var _fs2 = _interopRequireDefault(_fs);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var existsCache = {};
+	var jsonCache = {};
+
+	var BABELIGNORE_FILENAME = ".babelignore";
+	var BABELRC_FILENAME = ".babelrc";
+	var PACKAGE_FILENAME = "package.json";
+
+	function exists(filename) {
+	  var cached = existsCache[filename];
+	  if (cached == null) {
+	    return existsCache[filename] = _fs2.default.existsSync(filename);
+	  } else {
+	    return cached;
+	  }
+	}
+
+	function buildConfigChain() {
+	  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+	  var log = arguments[1];
+
+	  var filename = opts.filename;
+	  var builder = new ConfigChainBuilder(log);
+
+	  if (opts.babelrc !== false) {
+	    builder.findConfigs(filename);
+	  }
+
+	  builder.mergeConfig({
+	    options: opts,
+	    alias: "base",
+	    dirname: filename && _path2.default.dirname(filename)
+	  });
+
+	  return builder.configs;
+	}
+
+	var ConfigChainBuilder = function () {
+	  function ConfigChainBuilder(log) {
+	    (0, _classCallCheck3.default)(this, ConfigChainBuilder);
+
+	    this.resolvedConfigs = [];
+	    this.configs = [];
+	    this.log = log;
+	  }
+
+	  ConfigChainBuilder.prototype.findConfigs = function findConfigs(loc) {
+	    if (!loc) return;
+
+	    if (!(0, _pathIsAbsolute2.default)(loc)) {
+	      loc = _path2.default.join(process.cwd(), loc);
+	    }
+
+	    var foundConfig = false;
+	    var foundIgnore = false;
+
+	    while (loc !== (loc = _path2.default.dirname(loc))) {
+	      if (!foundConfig) {
+	        var configLoc = _path2.default.join(loc, BABELRC_FILENAME);
+	        if (exists(configLoc)) {
+	          this.addConfig(configLoc);
+	          foundConfig = true;
+	        }
+
+	        var pkgLoc = _path2.default.join(loc, PACKAGE_FILENAME);
+	        if (!foundConfig && exists(pkgLoc)) {
+	          foundConfig = this.addConfig(pkgLoc, "babel", JSON);
+	        }
+	      }
+
+	      if (!foundIgnore) {
+	        var ignoreLoc = _path2.default.join(loc, BABELIGNORE_FILENAME);
+	        if (exists(ignoreLoc)) {
+	          this.addIgnoreConfig(ignoreLoc);
+	          foundIgnore = true;
+	        }
+	      }
+
+	      if (foundIgnore && foundConfig) return;
+	    }
+	  };
+
+	  ConfigChainBuilder.prototype.addIgnoreConfig = function addIgnoreConfig(loc) {
+	    var file = _fs2.default.readFileSync(loc, "utf8");
+	    var lines = file.split("\n");
+
+	    lines = lines.map(function (line) {
+	      return line.replace(/#(.*?)$/, "").trim();
+	    }).filter(function (line) {
+	      return !!line;
+	    });
+
+	    if (lines.length) {
+	      this.mergeConfig({
+	        options: { ignore: lines },
+	        alias: loc,
+	        dirname: _path2.default.dirname(loc)
+	      });
+	    }
+	  };
+
+	  ConfigChainBuilder.prototype.addConfig = function addConfig(loc, key) {
+	    var json = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _json2.default;
+
+	    if (this.resolvedConfigs.indexOf(loc) >= 0) {
+	      return false;
+	    }
+
+	    this.resolvedConfigs.push(loc);
+
+	    var content = _fs2.default.readFileSync(loc, "utf8");
+	    var options = void 0;
+
+	    try {
+	      options = jsonCache[content] = jsonCache[content] || json.parse(content);
+	      if (key) options = options[key];
+	    } catch (err) {
+	      err.message = loc + ": Error while parsing JSON - " + err.message;
+	      throw err;
+	    }
+
+	    this.mergeConfig({
+	      options: options,
+	      alias: loc,
+	      dirname: _path2.default.dirname(loc)
+	    });
+
+	    return !!options;
+	  };
+
+	  ConfigChainBuilder.prototype.mergeConfig = function mergeConfig(_ref) {
+	    var options = _ref.options,
+	        alias = _ref.alias,
+	        loc = _ref.loc,
+	        dirname = _ref.dirname;
+
+	    if (!options) {
+	      return false;
+	    }
+
+	    options = (0, _assign2.default)({}, options);
+
+	    dirname = dirname || process.cwd();
+	    loc = loc || alias;
+
+	    if (options.extends) {
+	      var extendsLoc = (0, _resolve2.default)(options.extends, dirname);
+	      if (extendsLoc) {
+	        this.addConfig(extendsLoc);
+	      } else {
+	        if (this.log) this.log.error("Couldn't resolve extends clause of " + options.extends + " in " + alias);
+	      }
+	      delete options.extends;
+	    }
+
+	    this.configs.push({
+	      options: options,
+	      alias: alias,
+	      loc: loc,
+	      dirname: dirname
+	    });
+
+	    var envOpts = void 0;
+	    var envKey = process.env.BABEL_ENV || ("production") || "development";
+	    if (options.env) {
+	      envOpts = options.env[envKey];
+	      delete options.env;
+	    }
+
+	    this.mergeConfig({
+	      options: envOpts,
+	      alias: alias + ".env." + envKey,
+	      dirname: dirname
+	    });
+	  };
+
+	  return ConfigChainBuilder;
+	}();
+
+	module.exports = exports["default"];
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 51 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.config = undefined;
+	exports.normaliseOptions = normaliseOptions;
+
+	var _parsers = __webpack_require__(52);
+
+	var parsers = _interopRequireWildcard(_parsers);
+
+	var _config = __webpack_require__(32);
+
+	var _config2 = _interopRequireDefault(_config);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	exports.config = _config2.default;
+	function normaliseOptions() {
+	  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+	  for (var key in options) {
+	    var val = options[key];
+	    if (val == null) continue;
+
+	    var opt = _config2.default[key];
+	    if (opt && opt.alias) opt = _config2.default[opt.alias];
+	    if (!opt) continue;
+
+	    var parser = parsers[opt.type];
+	    if (parser) val = parser(val);
+
+	    options[key] = val;
+	  }
+
+	  return options;
+	}
+
+/***/ }),
+/* 52 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.filename = undefined;
+	exports.boolean = boolean;
+	exports.booleanString = booleanString;
+	exports.list = list;
+
+	var _slash = __webpack_require__(280);
+
+	var _slash2 = _interopRequireDefault(_slash);
+
+	var _util = __webpack_require__(121);
+
+	var util = _interopRequireWildcard(_util);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var filename = exports.filename = _slash2.default;
+
+	function boolean(val) {
+	  return !!val;
+	}
+
+	function booleanString(val) {
+	  return util.booleanify(val);
+	}
+
+	function list(val) {
+	  return util.list(val);
+	}
+
+/***/ }),
+/* 53 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = {
+	  "auxiliaryComment": {
+	    "message": "Use `auxiliaryCommentBefore` or `auxiliaryCommentAfter`"
+	  },
+	  "blacklist": {
+	    "message": "Put the specific transforms you want in the `plugins` option"
+	  },
+	  "breakConfig": {
+	    "message": "This is not a necessary option in Babel 6"
+	  },
+	  "experimental": {
+	    "message": "Put the specific transforms you want in the `plugins` option"
+	  },
+	  "externalHelpers": {
+	    "message": "Use the `external-helpers` plugin instead. Check out http://babeljs.io/docs/plugins/external-helpers/"
+	  },
+	  "extra": {
+	    "message": ""
+	  },
+	  "jsxPragma": {
+	    "message": "use the `pragma` option in the `react-jsx` plugin . Check out http://babeljs.io/docs/plugins/transform-react-jsx/"
+	  },
+
+	  "loose": {
+	    "message": "Specify the `loose` option for the relevant plugin you are using or use a preset that sets the option."
+	  },
+	  "metadataUsedHelpers": {
+	    "message": "Not required anymore as this is enabled by default"
+	  },
+	  "modules": {
+	    "message": "Use the corresponding module transform plugin in the `plugins` option. Check out http://babeljs.io/docs/plugins/#modules"
+	  },
+	  "nonStandard": {
+	    "message": "Use the `react-jsx` and `flow-strip-types` plugins to support JSX and Flow. Also check out the react preset http://babeljs.io/docs/plugins/preset-react/"
+	  },
+	  "optional": {
+	    "message": "Put the specific transforms you want in the `plugins` option"
+	  },
+	  "sourceMapName": {
+	    "message": "Use the `sourceMapTarget` option"
+	  },
+	  "stage": {
+	    "message": "Check out the corresponding stage-x presets http://babeljs.io/docs/plugins/#presets"
+	  },
+	  "whitelist": {
+	    "message": "Put the specific transforms you want in the `plugins` option"
+	  }
+	};
+
+/***/ }),
+/* 54 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// optional / simple context binding
+	var aFunction = __webpack_require__(414);
+	module.exports = function (fn, that, length) {
+	  aFunction(fn);
+	  if (that === undefined) return fn;
+	  switch (length) {
+	    case 1:
+	      return function (a) {
+	        return fn.call(that, a);
+	      };
+	    case 2:
+	      return function (a, b) {
+	        return fn.call(that, a, b);
+	      };
+	    case 3:
+	      return function (a, b, c) {
+	        return fn.call(that, a, b, c);
+	      };
+	  }
+	  return function () /* ...args */{
+	    return fn.apply(that, arguments);
+	  };
+	};
+
+/***/ }),
+/* 55 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = {};
+
+/***/ }),
+/* 56 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var META = __webpack_require__(95)('meta'),
+	    isObject = __webpack_require__(22),
+	    has = __webpack_require__(27),
+	    setDesc = __webpack_require__(23).f,
+	    id = 0;
+	var isExtensible = Object.isExtensible || function () {
+	  return true;
+	};
+	var FREEZE = !__webpack_require__(36)(function () {
+	  return isExtensible(Object.preventExtensions({}));
+	});
+	var setMeta = function setMeta(it) {
+	  setDesc(it, META, { value: {
+	      i: 'O' + ++id, // object ID
+	      w: {} // weak collections IDs
+	    } });
+	};
+	var fastKey = function fastKey(it, create) {
+	  // return primitive with prefix
+	  if (!isObject(it)) return (typeof it === 'undefined' ? 'undefined' : _typeof(it)) == 'symbol' ? it : (typeof it == 'string' ? 'S' : 'P') + it;
+	  if (!has(it, META)) {
+	    // can't set metadata to uncaught frozen object
+	    if (!isExtensible(it)) return 'F';
+	    // not necessary to add metadata
+	    if (!create) return 'E';
+	    // add missing metadata
+	    setMeta(it);
+	    // return object ID
+	  }return it[META].i;
+	};
+	var getWeak = function getWeak(it, create) {
+	  if (!has(it, META)) {
+	    // can't set metadata to uncaught frozen object
+	    if (!isExtensible(it)) return true;
+	    // not necessary to add metadata
+	    if (!create) return false;
+	    // add missing metadata
+	    setMeta(it);
+	    // return hash weak collections IDs
+	  }return it[META].w;
+	};
+	// add metadata on freeze-family methods calling
+	var onFreeze = function onFreeze(it) {
+	  if (FREEZE && meta.NEED && isExtensible(it) && !has(it, META)) setMeta(it);
+	  return it;
+	};
+	var meta = module.exports = {
+	  KEY: META,
+	  NEED: false,
+	  fastKey: fastKey,
+	  getWeak: getWeak,
+	  onFreeze: onFreeze
+	};
+
+/***/ }),
+/* 57 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(437);
+	var global = __webpack_require__(14),
+	    hide = __webpack_require__(28),
+	    Iterators = __webpack_require__(55),
+	    TO_STRING_TAG = __webpack_require__(12)('toStringTag');
+
+	for (var collections = ['NodeList', 'DOMTokenList', 'MediaList', 'StyleSheetList', 'CSSRuleList'], i = 0; i < 5; i++) {
+	  var NAME = collections[i],
+	      Collection = global[NAME],
+	      proto = Collection && Collection.prototype;
+	  if (proto && !proto[TO_STRING_TAG]) hide(proto, TO_STRING_TAG, NAME);
+	  Iterators[NAME] = Iterators.Array;
+	}
+
+/***/ }),
+/* 58 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * A specialized version of `_.map` for arrays without support for iteratee
+	 * shorthands.
+	 *
+	 * @private
+	 * @param {Array} [array] The array to iterate over.
+	 * @param {Function} iteratee The function invoked per iteration.
+	 * @returns {Array} Returns the new mapped array.
+	 */
+	function arrayMap(array, iteratee) {
+	  var index = -1,
+	      length = array == null ? 0 : array.length,
+	      result = Array(length);
+
+	  while (++index < length) {
+	    result[index] = iteratee(array[index], index, array);
+	  }
+	  return result;
+	}
+
+	module.exports = arrayMap;
+
+/***/ }),
+/* 59 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var baseMatches = __webpack_require__(493),
+	    baseMatchesProperty = __webpack_require__(494),
+	    identity = __webpack_require__(110),
+	    isArray = __webpack_require__(6),
+	    property = __webpack_require__(583);
+
+	/**
+	 * The base implementation of `_.iteratee`.
+	 *
+	 * @private
+	 * @param {*} [value=_.identity] The value to convert to an iteratee.
+	 * @returns {Function} Returns the iteratee.
+	 */
+	function baseIteratee(value) {
+	  // Don't store the `typeof` result in a variable to avoid a JIT bug in Safari 9.
+	  // See https://bugs.webkit.org/show_bug.cgi?id=156034 for more details.
+	  if (typeof value == 'function') {
+	    return value;
+	  }
+	  if (value == null) {
+	    return identity;
+	  }
+	  if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) == 'object') {
+	    return isArray(value) ? baseMatchesProperty(value[0], value[1]) : baseMatches(value);
+	  }
+	  return property(value);
+	}
+
+	module.exports = baseIteratee;
+
+/***/ }),
+/* 60 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var baseGetTag = __webpack_require__(29),
+	    isObjectLike = __webpack_require__(25);
+
+	/** `Object#toString` result references. */
+	var symbolTag = '[object Symbol]';
+
+	/**
+	 * Checks if `value` is classified as a `Symbol` primitive or object.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.
+	 * @example
+	 *
+	 * _.isSymbol(Symbol.iterator);
+	 * // => true
+	 *
+	 * _.isSymbol('abc');
+	 * // => false
+	 */
+	function isSymbol(value) {
+	    return (typeof value === 'undefined' ? 'undefined' : _typeof(value)) == 'symbol' || isObjectLike(value) && baseGetTag(value) == symbolTag;
+	}
+
+	module.exports = isSymbol;
+
+/***/ }),
+/* 61 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/* -*- Mode: js; js-indent-level: 2; -*- */
+	/*
+	 * Copyright 2011 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 */
+
+	/**
+	 * This is a helper function for getting values from parameter/options
+	 * objects.
+	 *
+	 * @param args The object we are extracting values from
+	 * @param name The name of the property we are getting.
+	 * @param defaultValue An optional value to return if the property is missing
+	 * from the object. If this is not specified and the property is missing, an
+	 * error will be thrown.
+	 */
+	function getArg(aArgs, aName, aDefaultValue) {
+	  if (aName in aArgs) {
+	    return aArgs[aName];
+	  } else if (arguments.length === 3) {
+	    return aDefaultValue;
+	  } else {
+	    throw new Error('"' + aName + '" is a required argument.');
+	  }
+	}
+	exports.getArg = getArg;
+
+	var urlRegexp = /^(?:([\w+\-.]+):)?\/\/(?:(\w+:\w+)@)?([\w.]*)(?::(\d+))?(\S*)$/;
+	var dataUrlRegexp = /^data:.+\,.+$/;
+
+	function urlParse(aUrl) {
+	  var match = aUrl.match(urlRegexp);
+	  if (!match) {
+	    return null;
+	  }
+	  return {
+	    scheme: match[1],
+	    auth: match[2],
+	    host: match[3],
+	    port: match[4],
+	    path: match[5]
+	  };
+	}
+	exports.urlParse = urlParse;
+
+	function urlGenerate(aParsedUrl) {
+	  var url = '';
+	  if (aParsedUrl.scheme) {
+	    url += aParsedUrl.scheme + ':';
+	  }
+	  url += '//';
+	  if (aParsedUrl.auth) {
+	    url += aParsedUrl.auth + '@';
+	  }
+	  if (aParsedUrl.host) {
+	    url += aParsedUrl.host;
+	  }
+	  if (aParsedUrl.port) {
+	    url += ":" + aParsedUrl.port;
+	  }
+	  if (aParsedUrl.path) {
+	    url += aParsedUrl.path;
+	  }
+	  return url;
+	}
+	exports.urlGenerate = urlGenerate;
+
+	/**
+	 * Normalizes a path, or the path portion of a URL:
+	 *
+	 * - Replaces consecutive slashes with one slash.
+	 * - Removes unnecessary '.' parts.
+	 * - Removes unnecessary '<dir>/..' parts.
+	 *
+	 * Based on code in the Node.js 'path' core module.
+	 *
+	 * @param aPath The path or url to normalize.
+	 */
+	function normalize(aPath) {
+	  var path = aPath;
+	  var url = urlParse(aPath);
+	  if (url) {
+	    if (!url.path) {
+	      return aPath;
+	    }
+	    path = url.path;
+	  }
+	  var isAbsolute = exports.isAbsolute(path);
+
+	  var parts = path.split(/\/+/);
+	  for (var part, up = 0, i = parts.length - 1; i >= 0; i--) {
+	    part = parts[i];
+	    if (part === '.') {
+	      parts.splice(i, 1);
+	    } else if (part === '..') {
+	      up++;
+	    } else if (up > 0) {
+	      if (part === '') {
+	        // The first part is blank if the path is absolute. Trying to go
+	        // above the root is a no-op. Therefore we can remove all '..' parts
+	        // directly after the root.
+	        parts.splice(i + 1, up);
+	        up = 0;
+	      } else {
+	        parts.splice(i, 2);
+	        up--;
+	      }
+	    }
+	  }
+	  path = parts.join('/');
+
+	  if (path === '') {
+	    path = isAbsolute ? '/' : '.';
+	  }
+
+	  if (url) {
+	    url.path = path;
+	    return urlGenerate(url);
+	  }
+	  return path;
+	}
+	exports.normalize = normalize;
+
+	/**
+	 * Joins two paths/URLs.
+	 *
+	 * @param aRoot The root path or URL.
+	 * @param aPath The path or URL to be joined with the root.
+	 *
+	 * - If aPath is a URL or a data URI, aPath is returned, unless aPath is a
+	 *   scheme-relative URL: Then the scheme of aRoot, if any, is prepended
+	 *   first.
+	 * - Otherwise aPath is a path. If aRoot is a URL, then its path portion
+	 *   is updated with the result and aRoot is returned. Otherwise the result
+	 *   is returned.
+	 *   - If aPath is absolute, the result is aPath.
+	 *   - Otherwise the two paths are joined with a slash.
+	 * - Joining for example 'http://' and 'www.example.com' is also supported.
+	 */
+	function join(aRoot, aPath) {
+	  if (aRoot === "") {
+	    aRoot = ".";
+	  }
+	  if (aPath === "") {
+	    aPath = ".";
+	  }
+	  var aPathUrl = urlParse(aPath);
+	  var aRootUrl = urlParse(aRoot);
+	  if (aRootUrl) {
+	    aRoot = aRootUrl.path || '/';
+	  }
+
+	  // `join(foo, '//www.example.org')`
+	  if (aPathUrl && !aPathUrl.scheme) {
+	    if (aRootUrl) {
+	      aPathUrl.scheme = aRootUrl.scheme;
+	    }
+	    return urlGenerate(aPathUrl);
+	  }
+
+	  if (aPathUrl || aPath.match(dataUrlRegexp)) {
+	    return aPath;
+	  }
+
+	  // `join('http://', 'www.example.com')`
+	  if (aRootUrl && !aRootUrl.host && !aRootUrl.path) {
+	    aRootUrl.host = aPath;
+	    return urlGenerate(aRootUrl);
+	  }
+
+	  var joined = aPath.charAt(0) === '/' ? aPath : normalize(aRoot.replace(/\/+$/, '') + '/' + aPath);
+
+	  if (aRootUrl) {
+	    aRootUrl.path = joined;
+	    return urlGenerate(aRootUrl);
+	  }
+	  return joined;
+	}
+	exports.join = join;
+
+	exports.isAbsolute = function (aPath) {
+	  return aPath.charAt(0) === '/' || !!aPath.match(urlRegexp);
+	};
+
+	/**
+	 * Make a path relative to a URL or another path.
+	 *
+	 * @param aRoot The root path or URL.
+	 * @param aPath The path or URL to be made relative to aRoot.
+	 */
+	function relative(aRoot, aPath) {
+	  if (aRoot === "") {
+	    aRoot = ".";
+	  }
+
+	  aRoot = aRoot.replace(/\/$/, '');
+
+	  // It is possible for the path to be above the root. In this case, simply
+	  // checking whether the root is a prefix of the path won't work. Instead, we
+	  // need to remove components from the root one by one, until either we find
+	  // a prefix that fits, or we run out of components to remove.
+	  var level = 0;
+	  while (aPath.indexOf(aRoot + '/') !== 0) {
+	    var index = aRoot.lastIndexOf("/");
+	    if (index < 0) {
+	      return aPath;
+	    }
+
+	    // If the only part of the root that is left is the scheme (i.e. http://,
+	    // file:///, etc.), one or more slashes (/), or simply nothing at all, we
+	    // have exhausted all components, so the path is not relative to the root.
+	    aRoot = aRoot.slice(0, index);
+	    if (aRoot.match(/^([^\/]+:\/)?\/*$/)) {
+	      return aPath;
+	    }
+
+	    ++level;
+	  }
+
+	  // Make sure we add a "../" for each component we removed from the root.
+	  return Array(level + 1).join("../") + aPath.substr(aRoot.length + 1);
+	}
+	exports.relative = relative;
+
+	var supportsNullProto = function () {
+	  var obj = Object.create(null);
+	  return !('__proto__' in obj);
+	}();
+
+	function identity(s) {
+	  return s;
+	}
+
+	/**
+	 * Because behavior goes wacky when you set `__proto__` on objects, we
+	 * have to prefix all the strings in our set with an arbitrary character.
+	 *
+	 * See https://github.com/mozilla/source-map/pull/31 and
+	 * https://github.com/mozilla/source-map/issues/30
+	 *
+	 * @param String aStr
+	 */
+	function toSetString(aStr) {
+	  if (isProtoString(aStr)) {
+	    return '$' + aStr;
+	  }
+
+	  return aStr;
+	}
+	exports.toSetString = supportsNullProto ? identity : toSetString;
+
+	function fromSetString(aStr) {
+	  if (isProtoString(aStr)) {
+	    return aStr.slice(1);
+	  }
+
+	  return aStr;
+	}
+	exports.fromSetString = supportsNullProto ? identity : fromSetString;
+
+	function isProtoString(s) {
+	  if (!s) {
+	    return false;
+	  }
+
+	  var length = s.length;
+
+	  if (length < 9 /* "__proto__".length */) {
+	      return false;
+	    }
+
+	  if (s.charCodeAt(length - 1) !== 95 /* '_' */ || s.charCodeAt(length - 2) !== 95 /* '_' */ || s.charCodeAt(length - 3) !== 111 /* 'o' */ || s.charCodeAt(length - 4) !== 116 /* 't' */ || s.charCodeAt(length - 5) !== 111 /* 'o' */ || s.charCodeAt(length - 6) !== 114 /* 'r' */ || s.charCodeAt(length - 7) !== 112 /* 'p' */ || s.charCodeAt(length - 8) !== 95 /* '_' */ || s.charCodeAt(length - 9) !== 95 /* '_' */) {
+	      return false;
+	    }
+
+	  for (var i = length - 10; i >= 0; i--) {
+	    if (s.charCodeAt(i) !== 36 /* '$' */) {
+	        return false;
+	      }
+	  }
+
+	  return true;
+	}
+
+	/**
+	 * Comparator between two mappings where the original positions are compared.
+	 *
+	 * Optionally pass in `true` as `onlyCompareGenerated` to consider two
+	 * mappings with the same original source/line/column, but different generated
+	 * line and column the same. Useful when searching for a mapping with a
+	 * stubbed out mapping.
+	 */
+	function compareByOriginalPositions(mappingA, mappingB, onlyCompareOriginal) {
+	  var cmp = mappingA.source - mappingB.source;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.originalLine - mappingB.originalLine;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.originalColumn - mappingB.originalColumn;
+	  if (cmp !== 0 || onlyCompareOriginal) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.generatedLine - mappingB.generatedLine;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  return mappingA.name - mappingB.name;
+	}
+	exports.compareByOriginalPositions = compareByOriginalPositions;
+
+	/**
+	 * Comparator between two mappings with deflated source and name indices where
+	 * the generated positions are compared.
+	 *
+	 * Optionally pass in `true` as `onlyCompareGenerated` to consider two
+	 * mappings with the same generated line and column, but different
+	 * source/name/original line and column the same. Useful when searching for a
+	 * mapping with a stubbed out mapping.
+	 */
+	function compareByGeneratedPositionsDeflated(mappingA, mappingB, onlyCompareGenerated) {
+	  var cmp = mappingA.generatedLine - mappingB.generatedLine;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
+	  if (cmp !== 0 || onlyCompareGenerated) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.source - mappingB.source;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.originalLine - mappingB.originalLine;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.originalColumn - mappingB.originalColumn;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  return mappingA.name - mappingB.name;
+	}
+	exports.compareByGeneratedPositionsDeflated = compareByGeneratedPositionsDeflated;
+
+	function strcmp(aStr1, aStr2) {
+	  if (aStr1 === aStr2) {
+	    return 0;
+	  }
+
+	  if (aStr1 > aStr2) {
+	    return 1;
+	  }
+
+	  return -1;
+	}
+
+	/**
+	 * Comparator between two mappings with inflated source and name strings where
+	 * the generated positions are compared.
+	 */
+	function compareByGeneratedPositionsInflated(mappingA, mappingB) {
+	  var cmp = mappingA.generatedLine - mappingB.generatedLine;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.generatedColumn - mappingB.generatedColumn;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  cmp = strcmp(mappingA.source, mappingB.source);
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.originalLine - mappingB.originalLine;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  cmp = mappingA.originalColumn - mappingB.originalColumn;
+	  if (cmp !== 0) {
+	    return cmp;
+	  }
+
+	  return strcmp(mappingA.name, mappingB.name);
+	}
+	exports.compareByGeneratedPositionsInflated = compareByGeneratedPositionsInflated;
+
+/***/ }),
+/* 62 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(global) {'use strict';
+
+	// compare and isBuffer taken from https://github.com/feross/buffer/blob/680e9e5e488f22aac27599a57dc844a6315928dd/index.js
+	// original notice:
+
+	/*!
+	 * The buffer module from node.js, for the browser.
+	 *
+	 * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+	 * @license  MIT
+	 */
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	function compare(a, b) {
+	  if (a === b) {
+	    return 0;
+	  }
+
+	  var x = a.length;
+	  var y = b.length;
+
+	  for (var i = 0, len = Math.min(x, y); i < len; ++i) {
+	    if (a[i] !== b[i]) {
+	      x = a[i];
+	      y = b[i];
+	      break;
+	    }
+	  }
+
+	  if (x < y) {
+	    return -1;
+	  }
+	  if (y < x) {
+	    return 1;
+	  }
+	  return 0;
+	}
+	function isBuffer(b) {
+	  if (global.Buffer && typeof global.Buffer.isBuffer === 'function') {
+	    return global.Buffer.isBuffer(b);
+	  }
+	  return !!(b != null && b._isBuffer);
+	}
+
+	// based on node assert, original notice:
+
+	// http://wiki.commonjs.org/wiki/Unit_Testing/1.0
+	//
+	// THIS IS NOT TESTED NOR LIKELY TO WORK OUTSIDE V8!
+	//
+	// Originally from narwhal.js (http://narwhaljs.org)
+	// Copyright (c) 2009 Thomas Robinson <280north.com>
+	//
+	// Permission is hereby granted, free of charge, to any person obtaining a copy
+	// of this software and associated documentation files (the 'Software'), to
+	// deal in the Software without restriction, including without limitation the
+	// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+	// sell copies of the Software, and to permit persons to whom the Software is
+	// furnished to do so, subject to the following conditions:
+	//
+	// The above copyright notice and this permission notice shall be included in
+	// all copies or substantial portions of the Software.
+	//
+	// THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	// AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+	// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+	// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+	var util = __webpack_require__(116);
+	var hasOwn = Object.prototype.hasOwnProperty;
+	var pSlice = Array.prototype.slice;
+	var functionsHaveNames = function () {
+	  return function foo() {}.name === 'foo';
+	}();
+	function pToString(obj) {
+	  return Object.prototype.toString.call(obj);
+	}
+	function isView(arrbuf) {
+	  if (isBuffer(arrbuf)) {
+	    return false;
+	  }
+	  if (typeof global.ArrayBuffer !== 'function') {
+	    return false;
+	  }
+	  if (typeof ArrayBuffer.isView === 'function') {
+	    return ArrayBuffer.isView(arrbuf);
+	  }
+	  if (!arrbuf) {
+	    return false;
+	  }
+	  if (arrbuf instanceof DataView) {
+	    return true;
+	  }
+	  if (arrbuf.buffer && arrbuf.buffer instanceof ArrayBuffer) {
+	    return true;
+	  }
+	  return false;
+	}
+	// 1. The assert module provides functions that throw
+	// AssertionError's when particular conditions are not met. The
+	// assert module must conform to the following interface.
+
+	var assert = module.exports = ok;
+
+	// 2. The AssertionError is defined in assert.
+	// new assert.AssertionError({ message: message,
+	//                             actual: actual,
+	//                             expected: expected })
+
+	var regex = /\s*function\s+([^\(\s]*)\s*/;
+	// based on https://github.com/ljharb/function.prototype.name/blob/adeeeec8bfcc6068b187d7d9fb3d5bb1d3a30899/implementation.js
+	function getName(func) {
+	  if (!util.isFunction(func)) {
+	    return;
+	  }
+	  if (functionsHaveNames) {
+	    return func.name;
+	  }
+	  var str = func.toString();
+	  var match = str.match(regex);
+	  return match && match[1];
+	}
+	assert.AssertionError = function AssertionError(options) {
+	  this.name = 'AssertionError';
+	  this.actual = options.actual;
+	  this.expected = options.expected;
+	  this.operator = options.operator;
+	  if (options.message) {
+	    this.message = options.message;
+	    this.generatedMessage = false;
+	  } else {
+	    this.message = getMessage(this);
+	    this.generatedMessage = true;
+	  }
+	  var stackStartFunction = options.stackStartFunction || fail;
+	  if (Error.captureStackTrace) {
+	    Error.captureStackTrace(this, stackStartFunction);
+	  } else {
+	    // non v8 browsers so we can have a stacktrace
+	    var err = new Error();
+	    if (err.stack) {
+	      var out = err.stack;
+
+	      // try to strip useless frames
+	      var fn_name = getName(stackStartFunction);
+	      var idx = out.indexOf('\n' + fn_name);
+	      if (idx >= 0) {
+	        // once we have located the function frame
+	        // we need to strip out everything before it (and its line)
+	        var next_line = out.indexOf('\n', idx + 1);
+	        out = out.substring(next_line + 1);
+	      }
+
+	      this.stack = out;
+	    }
+	  }
+	};
+
+	// assert.AssertionError instanceof Error
+	util.inherits(assert.AssertionError, Error);
+
+	function truncate(s, n) {
+	  if (typeof s === 'string') {
+	    return s.length < n ? s : s.slice(0, n);
+	  } else {
+	    return s;
+	  }
+	}
+	function inspect(something) {
+	  if (functionsHaveNames || !util.isFunction(something)) {
+	    return util.inspect(something);
+	  }
+	  var rawname = getName(something);
+	  var name = rawname ? ': ' + rawname : '';
+	  return '[Function' + name + ']';
+	}
+	function getMessage(self) {
+	  return truncate(inspect(self.actual), 128) + ' ' + self.operator + ' ' + truncate(inspect(self.expected), 128);
+	}
+
+	// At present only the three keys mentioned above are used and
+	// understood by the spec. Implementations or sub modules can pass
+	// other keys to the AssertionError's constructor - they will be
+	// ignored.
+
+	// 3. All of the following functions must throw an AssertionError
+	// when a corresponding condition is not met, with a message that
+	// may be undefined if not provided.  All assertion methods provide
+	// both the actual and expected values to the assertion error for
+	// display purposes.
+
+	function fail(actual, expected, message, operator, stackStartFunction) {
+	  throw new assert.AssertionError({
+	    message: message,
+	    actual: actual,
+	    expected: expected,
+	    operator: operator,
+	    stackStartFunction: stackStartFunction
+	  });
+	}
+
+	// EXTENSION! allows for well behaved errors defined elsewhere.
+	assert.fail = fail;
+
+	// 4. Pure assertion tests whether a value is truthy, as determined
+	// by !!guard.
+	// assert.ok(guard, message_opt);
+	// This statement is equivalent to assert.equal(true, !!guard,
+	// message_opt);. To test strictly for the value true, use
+	// assert.strictEqual(true, guard, message_opt);.
+
+	function ok(value, message) {
+	  if (!value) fail(value, true, message, '==', assert.ok);
+	}
+	assert.ok = ok;
+
+	// 5. The equality assertion tests shallow, coercive equality with
+	// ==.
+	// assert.equal(actual, expected, message_opt);
+
+	assert.equal = function equal(actual, expected, message) {
+	  if (actual != expected) fail(actual, expected, message, '==', assert.equal);
+	};
+
+	// 6. The non-equality assertion tests for whether two objects are not equal
+	// with != assert.notEqual(actual, expected, message_opt);
+
+	assert.notEqual = function notEqual(actual, expected, message) {
+	  if (actual == expected) {
+	    fail(actual, expected, message, '!=', assert.notEqual);
+	  }
+	};
+
+	// 7. The equivalence assertion tests a deep equality relation.
+	// assert.deepEqual(actual, expected, message_opt);
+
+	assert.deepEqual = function deepEqual(actual, expected, message) {
+	  if (!_deepEqual(actual, expected, false)) {
+	    fail(actual, expected, message, 'deepEqual', assert.deepEqual);
+	  }
+	};
+
+	assert.deepStrictEqual = function deepStrictEqual(actual, expected, message) {
+	  if (!_deepEqual(actual, expected, true)) {
+	    fail(actual, expected, message, 'deepStrictEqual', assert.deepStrictEqual);
+	  }
+	};
+
+	function _deepEqual(actual, expected, strict, memos) {
+	  // 7.1. All identical values are equivalent, as determined by ===.
+	  if (actual === expected) {
+	    return true;
+	  } else if (isBuffer(actual) && isBuffer(expected)) {
+	    return compare(actual, expected) === 0;
+
+	    // 7.2. If the expected value is a Date object, the actual value is
+	    // equivalent if it is also a Date object that refers to the same time.
+	  } else if (util.isDate(actual) && util.isDate(expected)) {
+	    return actual.getTime() === expected.getTime();
+
+	    // 7.3 If the expected value is a RegExp object, the actual value is
+	    // equivalent if it is also a RegExp object with the same source and
+	    // properties (`global`, `multiline`, `lastIndex`, `ignoreCase`).
+	  } else if (util.isRegExp(actual) && util.isRegExp(expected)) {
+	    return actual.source === expected.source && actual.global === expected.global && actual.multiline === expected.multiline && actual.lastIndex === expected.lastIndex && actual.ignoreCase === expected.ignoreCase;
+
+	    // 7.4. Other pairs that do not both pass typeof value == 'object',
+	    // equivalence is determined by ==.
+	  } else if ((actual === null || (typeof actual === 'undefined' ? 'undefined' : _typeof(actual)) !== 'object') && (expected === null || (typeof expected === 'undefined' ? 'undefined' : _typeof(expected)) !== 'object')) {
+	    return strict ? actual === expected : actual == expected;
+
+	    // If both values are instances of typed arrays, wrap their underlying
+	    // ArrayBuffers in a Buffer each to increase performance
+	    // This optimization requires the arrays to have the same type as checked by
+	    // Object.prototype.toString (aka pToString). Never perform binary
+	    // comparisons for Float*Arrays, though, since e.g. +0 === -0 but their
+	    // bit patterns are not identical.
+	  } else if (isView(actual) && isView(expected) && pToString(actual) === pToString(expected) && !(actual instanceof Float32Array || actual instanceof Float64Array)) {
+	    return compare(new Uint8Array(actual.buffer), new Uint8Array(expected.buffer)) === 0;
+
+	    // 7.5 For all other Object pairs, including Array objects, equivalence is
+	    // determined by having the same number of owned properties (as verified
+	    // with Object.prototype.hasOwnProperty.call), the same set of keys
+	    // (although not necessarily the same order), equivalent values for every
+	    // corresponding key, and an identical 'prototype' property. Note: this
+	    // accounts for both named and indexed properties on Arrays.
+	  } else if (isBuffer(actual) !== isBuffer(expected)) {
+	    return false;
+	  } else {
+	    memos = memos || { actual: [], expected: [] };
+
+	    var actualIndex = memos.actual.indexOf(actual);
+	    if (actualIndex !== -1) {
+	      if (actualIndex === memos.expected.indexOf(expected)) {
+	        return true;
+	      }
+	    }
+
+	    memos.actual.push(actual);
+	    memos.expected.push(expected);
+
+	    return objEquiv(actual, expected, strict, memos);
+	  }
+	}
+
+	function isArguments(object) {
+	  return Object.prototype.toString.call(object) == '[object Arguments]';
+	}
+
+	function objEquiv(a, b, strict, actualVisitedObjects) {
+	  if (a === null || a === undefined || b === null || b === undefined) return false;
+	  // if one is a primitive, the other must be same
+	  if (util.isPrimitive(a) || util.isPrimitive(b)) return a === b;
+	  if (strict && Object.getPrototypeOf(a) !== Object.getPrototypeOf(b)) return false;
+	  var aIsArgs = isArguments(a);
+	  var bIsArgs = isArguments(b);
+	  if (aIsArgs && !bIsArgs || !aIsArgs && bIsArgs) return false;
+	  if (aIsArgs) {
+	    a = pSlice.call(a);
+	    b = pSlice.call(b);
+	    return _deepEqual(a, b, strict);
+	  }
+	  var ka = objectKeys(a);
+	  var kb = objectKeys(b);
+	  var key, i;
+	  // having the same number of owned properties (keys incorporates
+	  // hasOwnProperty)
+	  if (ka.length !== kb.length) return false;
+	  //the same set of keys (although not necessarily the same order),
+	  ka.sort();
+	  kb.sort();
+	  //~~~cheap key test
+	  for (i = ka.length - 1; i >= 0; i--) {
+	    if (ka[i] !== kb[i]) return false;
+	  }
+	  //equivalent values for every corresponding key, and
+	  //~~~possibly expensive deep test
+	  for (i = ka.length - 1; i >= 0; i--) {
+	    key = ka[i];
+	    if (!_deepEqual(a[key], b[key], strict, actualVisitedObjects)) return false;
+	  }
+	  return true;
+	}
+
+	// 8. The non-equivalence assertion tests for any deep inequality.
+	// assert.notDeepEqual(actual, expected, message_opt);
+
+	assert.notDeepEqual = function notDeepEqual(actual, expected, message) {
+	  if (_deepEqual(actual, expected, false)) {
+	    fail(actual, expected, message, 'notDeepEqual', assert.notDeepEqual);
+	  }
+	};
+
+	assert.notDeepStrictEqual = notDeepStrictEqual;
+	function notDeepStrictEqual(actual, expected, message) {
+	  if (_deepEqual(actual, expected, true)) {
+	    fail(actual, expected, message, 'notDeepStrictEqual', notDeepStrictEqual);
+	  }
+	}
+
+	// 9. The strict equality assertion tests strict equality, as determined by ===.
+	// assert.strictEqual(actual, expected, message_opt);
+
+	assert.strictEqual = function strictEqual(actual, expected, message) {
+	  if (actual !== expected) {
+	    fail(actual, expected, message, '===', assert.strictEqual);
+	  }
+	};
+
+	// 10. The strict non-equality assertion tests for strict inequality, as
+	// determined by !==.  assert.notStrictEqual(actual, expected, message_opt);
+
+	assert.notStrictEqual = function notStrictEqual(actual, expected, message) {
+	  if (actual === expected) {
+	    fail(actual, expected, message, '!==', assert.notStrictEqual);
+	  }
+	};
+
+	function expectedException(actual, expected) {
+	  if (!actual || !expected) {
+	    return false;
+	  }
+
+	  if (Object.prototype.toString.call(expected) == '[object RegExp]') {
+	    return expected.test(actual);
+	  }
+
+	  try {
+	    if (actual instanceof expected) {
+	      return true;
+	    }
+	  } catch (e) {
+	    // Ignore.  The instanceof check doesn't work for arrow functions.
+	  }
+
+	  if (Error.isPrototypeOf(expected)) {
+	    return false;
+	  }
+
+	  return expected.call({}, actual) === true;
+	}
+
+	function _tryBlock(block) {
+	  var error;
+	  try {
+	    block();
+	  } catch (e) {
+	    error = e;
+	  }
+	  return error;
+	}
+
+	function _throws(shouldThrow, block, expected, message) {
+	  var actual;
+
+	  if (typeof block !== 'function') {
+	    throw new TypeError('"block" argument must be a function');
+	  }
+
+	  if (typeof expected === 'string') {
+	    message = expected;
+	    expected = null;
+	  }
+
+	  actual = _tryBlock(block);
+
+	  message = (expected && expected.name ? ' (' + expected.name + ').' : '.') + (message ? ' ' + message : '.');
+
+	  if (shouldThrow && !actual) {
+	    fail(actual, expected, 'Missing expected exception' + message);
+	  }
+
+	  var userProvidedMessage = typeof message === 'string';
+	  var isUnwantedException = !shouldThrow && util.isError(actual);
+	  var isUnexpectedException = !shouldThrow && actual && !expected;
+
+	  if (isUnwantedException && userProvidedMessage && expectedException(actual, expected) || isUnexpectedException) {
+	    fail(actual, expected, 'Got unwanted exception' + message);
+	  }
+
+	  if (shouldThrow && actual && expected && !expectedException(actual, expected) || !shouldThrow && actual) {
+	    throw actual;
+	  }
+	}
+
+	// 11. Expected to throw an error:
+	// assert.throws(block, Error_opt, message_opt);
+
+	assert.throws = function (block, /*optional*/error, /*optional*/message) {
+	  _throws(true, block, error, message);
+	};
+
+	// EXTENSION! This is annoying to write outside this module.
+	assert.doesNotThrow = function (block, /*optional*/error, /*optional*/message) {
+	  _throws(false, block, error, message);
+	};
+
+	assert.ifError = function (err) {
+	  if (err) throw err;
+	};
+
+	var objectKeys = Object.keys || function (obj) {
+	  var keys = [];
+	  for (var key in obj) {
+	    if (hasOwn.call(obj, key)) keys.push(key);
+	  }
+	  return keys;
+	};
+	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
+
+/***/ }),
+/* 63 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _possibleConstructorReturn2 = __webpack_require__(42);
+
+	var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+	var _inherits2 = __webpack_require__(41);
+
+	var _inherits3 = _interopRequireDefault(_inherits2);
+
+	var _optionManager = __webpack_require__(33);
+
+	var _optionManager2 = _interopRequireDefault(_optionManager);
+
+	var _babelMessages = __webpack_require__(18);
+
+	var messages = _interopRequireWildcard(_babelMessages);
+
+	var _store = __webpack_require__(118);
+
+	var _store2 = _interopRequireDefault(_store);
+
+	var _babelTraverse = __webpack_require__(7);
+
+	var _babelTraverse2 = _interopRequireDefault(_babelTraverse);
+
+	var _assign = __webpack_require__(170);
+
+	var _assign2 = _interopRequireDefault(_assign);
+
+	var _clone = __webpack_require__(109);
+
+	var _clone2 = _interopRequireDefault(_clone);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var GLOBAL_VISITOR_PROPS = ["enter", "exit"];
+
+	var Plugin = function (_Store) {
+	  (0, _inherits3.default)(Plugin, _Store);
+
+	  function Plugin(plugin, key) {
+	    (0, _classCallCheck3.default)(this, Plugin);
+
+	    var _this = (0, _possibleConstructorReturn3.default)(this, _Store.call(this));
+
+	    _this.initialized = false;
+	    _this.raw = (0, _assign2.default)({}, plugin);
+	    _this.key = _this.take("name") || key;
+
+	    _this.manipulateOptions = _this.take("manipulateOptions");
+	    _this.post = _this.take("post");
+	    _this.pre = _this.take("pre");
+	    _this.visitor = _this.normaliseVisitor((0, _clone2.default)(_this.take("visitor")) || {});
+	    return _this;
+	  }
+
+	  Plugin.prototype.take = function take(key) {
+	    var val = this.raw[key];
+	    delete this.raw[key];
+	    return val;
+	  };
+
+	  Plugin.prototype.chain = function chain(target, key) {
+	    if (!target[key]) return this[key];
+	    if (!this[key]) return target[key];
+
+	    var fns = [target[key], this[key]];
+
+	    return function () {
+	      var val = void 0;
+
+	      for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+	        args[_key] = arguments[_key];
+	      }
+
+	      for (var _iterator = fns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	        var _ref;
+
+	        if (_isArray) {
+	          if (_i >= _iterator.length) break;
+	          _ref = _iterator[_i++];
+	        } else {
+	          _i = _iterator.next();
+	          if (_i.done) break;
+	          _ref = _i.value;
+	        }
+
+	        var fn = _ref;
+
+	        if (fn) {
+	          var ret = fn.apply(this, args);
+	          if (ret != null) val = ret;
+	        }
+	      }
+	      return val;
+	    };
+	  };
+
+	  Plugin.prototype.maybeInherit = function maybeInherit(loc) {
+	    var inherits = this.take("inherits");
+	    if (!inherits) return;
+
+	    inherits = _optionManager2.default.normalisePlugin(inherits, loc, "inherits");
+
+	    this.manipulateOptions = this.chain(inherits, "manipulateOptions");
+	    this.post = this.chain(inherits, "post");
+	    this.pre = this.chain(inherits, "pre");
+	    this.visitor = _babelTraverse2.default.visitors.merge([inherits.visitor, this.visitor]);
+	  };
+
+	  Plugin.prototype.init = function init(loc, i) {
+	    if (this.initialized) return;
+	    this.initialized = true;
+
+	    this.maybeInherit(loc);
+
+	    for (var key in this.raw) {
+	      throw new Error(messages.get("pluginInvalidProperty", loc, i, key));
+	    }
+	  };
+
+	  Plugin.prototype.normaliseVisitor = function normaliseVisitor(visitor) {
+	    for (var _iterator2 = GLOBAL_VISITOR_PROPS, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var key = _ref2;
+
+	      if (visitor[key]) {
+	        throw new Error("Plugins aren't allowed to specify catch-all enter/exit handlers. " + "Please target individual nodes.");
+	      }
+	    }
+
+	    _babelTraverse2.default.explode(visitor);
+	    return visitor;
+	  };
+
+	  return Plugin;
+	}(_store2.default);
+
+	exports.default = Plugin;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 64 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var messages = _ref.messages;
+
+	  return {
+	    visitor: {
+	      Scope: function Scope(_ref2) {
+	        var scope = _ref2.scope;
+
+	        for (var name in scope.bindings) {
+	          var binding = scope.bindings[name];
+	          if (binding.kind !== "const" && binding.kind !== "module") continue;
+
+	          for (var _iterator = binding.constantViolations, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	            var _ref3;
+
+	            if (_isArray) {
+	              if (_i >= _iterator.length) break;
+	              _ref3 = _iterator[_i++];
+	            } else {
+	              _i = _iterator.next();
+	              if (_i.done) break;
+	              _ref3 = _i.value;
+	            }
+
+	            var violation = _ref3;
+
+	            throw violation.buildCodeFrameError(messages.get("readOnly", name));
+	          }
+	        }
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 65 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("asyncFunctions");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 66 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  return {
+	    visitor: {
+	      ArrowFunctionExpression: function ArrowFunctionExpression(path, state) {
+	        if (state.opts.spec) {
+	          var node = path.node;
+
+	          if (node.shadow) return;
+
+	          node.shadow = { this: false };
+	          node.type = "FunctionExpression";
+
+	          var boundThis = t.thisExpression();
+	          boundThis._forceShadow = path;
+
+	          path.ensureBlock();
+	          path.get("body").unshiftContainer("body", t.expressionStatement(t.callExpression(state.addHelper("newArrowCheck"), [t.thisExpression(), boundThis])));
+
+	          path.replaceWith(t.callExpression(t.memberExpression(node, t.identifier("bind")), [t.thisExpression()]));
+	        } else {
+	          path.arrowFunctionToShadowed();
+	        }
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 67 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function statementList(key, path) {
+	    var paths = path.get(key);
+
+	    for (var _iterator = paths, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref2;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref2 = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref2 = _i.value;
+	      }
+
+	      var _path = _ref2;
+
+	      var func = _path.node;
+	      if (!_path.isFunctionDeclaration()) continue;
+
+	      var declar = t.variableDeclaration("let", [t.variableDeclarator(func.id, t.toExpression(func))]);
+
+	      declar._blockHoist = 2;
+
+	      func.id = null;
+
+	      _path.replaceWith(declar);
+	    }
+	  }
+
+	  return {
+	    visitor: {
+	      BlockStatement: function BlockStatement(path) {
+	        var node = path.node,
+	            parent = path.parent;
+
+	        if (t.isFunction(parent, { body: node }) || t.isExportDeclaration(parent)) {
+	          return;
+	        }
+
+	        statementList("body", path);
+	      },
+	      SwitchCase: function SwitchCase(path) {
+	        statementList("consequent", path);
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 68 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	exports.default = function () {
+	  return {
+	    visitor: {
+	      VariableDeclaration: function VariableDeclaration(path, file) {
+	        var node = path.node,
+	            parent = path.parent,
+	            scope = path.scope;
+
+	        if (!isBlockScoped(node)) return;
+	        convertBlockScopedToVar(path, null, parent, scope, true);
+
+	        if (node._tdzThis) {
+	          var nodes = [node];
+
+	          for (var i = 0; i < node.declarations.length; i++) {
+	            var decl = node.declarations[i];
+	            if (decl.init) {
+	              var assign = t.assignmentExpression("=", decl.id, decl.init);
+	              assign._ignoreBlockScopingTDZ = true;
+	              nodes.push(t.expressionStatement(assign));
+	            }
+	            decl.init = file.addHelper("temporalUndefined");
+	          }
+
+	          node._blockHoist = 2;
+
+	          if (path.isCompletionRecord()) {
+	            nodes.push(t.expressionStatement(scope.buildUndefinedNode()));
+	          }
+
+	          path.replaceWithMultiple(nodes);
+	        }
+	      },
+	      Loop: function Loop(path, file) {
+	        var node = path.node,
+	            parent = path.parent,
+	            scope = path.scope;
+
+	        t.ensureBlock(node);
+	        var blockScoping = new BlockScoping(path, path.get("body"), parent, scope, file);
+	        var replace = blockScoping.run();
+	        if (replace) path.replaceWith(replace);
+	      },
+	      CatchClause: function CatchClause(path, file) {
+	        var parent = path.parent,
+	            scope = path.scope;
+
+	        var blockScoping = new BlockScoping(null, path.get("body"), parent, scope, file);
+	        blockScoping.run();
+	      },
+	      "BlockStatement|SwitchStatement|Program": function BlockStatementSwitchStatementProgram(path, file) {
+	        if (!ignoreBlock(path)) {
+	          var blockScoping = new BlockScoping(null, path, path.parent, path.scope, file);
+	          blockScoping.run();
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _babelTraverse = __webpack_require__(7);
+
+	var _babelTraverse2 = _interopRequireDefault(_babelTraverse);
+
+	var _tdz = __webpack_require__(326);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _values = __webpack_require__(275);
+
+	var _values2 = _interopRequireDefault(_values);
+
+	var _extend = __webpack_require__(569);
+
+	var _extend2 = _interopRequireDefault(_extend);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function ignoreBlock(path) {
+	  return t.isLoop(path.parent) || t.isCatchClause(path.parent);
+	}
+
+	var buildRetCheck = (0, _babelTemplate2.default)("\n  if (typeof RETURN === \"object\") return RETURN.v;\n");
+
+	function isBlockScoped(node) {
+	  if (!t.isVariableDeclaration(node)) return false;
+	  if (node[t.BLOCK_SCOPED_SYMBOL]) return true;
+	  if (node.kind !== "let" && node.kind !== "const") return false;
+	  return true;
+	}
+
+	function convertBlockScopedToVar(path, node, parent, scope) {
+	  var moveBindingsToParent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+
+	  if (!node) {
+	    node = path.node;
+	  }
+
+	  if (!t.isFor(parent)) {
+	    for (var i = 0; i < node.declarations.length; i++) {
+	      var declar = node.declarations[i];
+	      declar.init = declar.init || scope.buildUndefinedNode();
+	    }
+	  }
+
+	  node[t.BLOCK_SCOPED_SYMBOL] = true;
+	  node.kind = "var";
+
+	  if (moveBindingsToParent) {
+	    var parentScope = scope.getFunctionParent();
+	    var ids = path.getBindingIdentifiers();
+	    for (var name in ids) {
+	      var binding = scope.getOwnBinding(name);
+	      if (binding) binding.kind = "var";
+	      scope.moveBindingTo(name, parentScope);
+	    }
+	  }
+	}
+
+	function isVar(node) {
+	  return t.isVariableDeclaration(node, { kind: "var" }) && !isBlockScoped(node);
+	}
+
+	var letReferenceBlockVisitor = _babelTraverse2.default.visitors.merge([{
+	  Loop: {
+	    enter: function enter(path, state) {
+	      state.loopDepth++;
+	    },
+	    exit: function exit(path, state) {
+	      state.loopDepth--;
+	    }
+	  },
+	  Function: function Function(path, state) {
+	    if (state.loopDepth > 0) {
+	      path.traverse(letReferenceFunctionVisitor, state);
+	    }
+	    return path.skip();
+	  }
+	}, _tdz.visitor]);
+
+	var letReferenceFunctionVisitor = _babelTraverse2.default.visitors.merge([{
+	  ReferencedIdentifier: function ReferencedIdentifier(path, state) {
+	    var ref = state.letReferences[path.node.name];
+
+	    if (!ref) return;
+
+	    var localBinding = path.scope.getBindingIdentifier(path.node.name);
+	    if (localBinding && localBinding !== ref) return;
+
+	    state.closurify = true;
+	  }
+	}, _tdz.visitor]);
+
+	var hoistVarDeclarationsVisitor = {
+	  enter: function enter(path, self) {
+	    var node = path.node,
+	        parent = path.parent;
+
+	    if (path.isForStatement()) {
+	      if (isVar(node.init, node)) {
+	        var nodes = self.pushDeclar(node.init);
+	        if (nodes.length === 1) {
+	          node.init = nodes[0];
+	        } else {
+	          node.init = t.sequenceExpression(nodes);
+	        }
+	      }
+	    } else if (path.isFor()) {
+	      if (isVar(node.left, node)) {
+	        self.pushDeclar(node.left);
+	        node.left = node.left.declarations[0].id;
+	      }
+	    } else if (isVar(node, parent)) {
+	      path.replaceWithMultiple(self.pushDeclar(node).map(function (expr) {
+	        return t.expressionStatement(expr);
+	      }));
+	    } else if (path.isFunction()) {
+	      return path.skip();
+	    }
+	  }
+	};
+
+	var loopLabelVisitor = {
+	  LabeledStatement: function LabeledStatement(_ref, state) {
+	    var node = _ref.node;
+
+	    state.innerLabels.push(node.label.name);
+	  }
+	};
+
+	var continuationVisitor = {
+	  enter: function enter(path, state) {
+	    if (path.isAssignmentExpression() || path.isUpdateExpression()) {
+	      var bindings = path.getBindingIdentifiers();
+	      for (var name in bindings) {
+	        if (state.outsideReferences[name] !== path.scope.getBindingIdentifier(name)) continue;
+	        state.reassignments[name] = true;
+	      }
+	    }
+	  }
+	};
+
+	function loopNodeTo(node) {
+	  if (t.isBreakStatement(node)) {
+	    return "break";
+	  } else if (t.isContinueStatement(node)) {
+	    return "continue";
+	  }
+	}
+
+	var loopVisitor = {
+	  Loop: function Loop(path, state) {
+	    var oldIgnoreLabeless = state.ignoreLabeless;
+	    state.ignoreLabeless = true;
+	    path.traverse(loopVisitor, state);
+	    state.ignoreLabeless = oldIgnoreLabeless;
+	    path.skip();
+	  },
+	  Function: function Function(path) {
+	    path.skip();
+	  },
+	  SwitchCase: function SwitchCase(path, state) {
+	    var oldInSwitchCase = state.inSwitchCase;
+	    state.inSwitchCase = true;
+	    path.traverse(loopVisitor, state);
+	    state.inSwitchCase = oldInSwitchCase;
+	    path.skip();
+	  },
+	  "BreakStatement|ContinueStatement|ReturnStatement": function BreakStatementContinueStatementReturnStatement(path, state) {
+	    var node = path.node,
+	        parent = path.parent,
+	        scope = path.scope;
+
+	    if (node[this.LOOP_IGNORE]) return;
+
+	    var replace = void 0;
+	    var loopText = loopNodeTo(node);
+
+	    if (loopText) {
+	      if (node.label) {
+	        if (state.innerLabels.indexOf(node.label.name) >= 0) {
+	          return;
+	        }
+
+	        loopText = loopText + "|" + node.label.name;
+	      } else {
+	        if (state.ignoreLabeless) return;
+
+	        if (state.inSwitchCase) return;
+
+	        if (t.isBreakStatement(node) && t.isSwitchCase(parent)) return;
+	      }
+
+	      state.hasBreakContinue = true;
+	      state.map[loopText] = node;
+	      replace = t.stringLiteral(loopText);
+	    }
+
+	    if (path.isReturnStatement()) {
+	      state.hasReturn = true;
+	      replace = t.objectExpression([t.objectProperty(t.identifier("v"), node.argument || scope.buildUndefinedNode())]);
+	    }
+
+	    if (replace) {
+	      replace = t.returnStatement(replace);
+	      replace[this.LOOP_IGNORE] = true;
+	      path.skip();
+	      path.replaceWith(t.inherits(replace, node));
+	    }
+	  }
+	};
+
+	var BlockScoping = function () {
+	  function BlockScoping(loopPath, blockPath, parent, scope, file) {
+	    (0, _classCallCheck3.default)(this, BlockScoping);
+
+	    this.parent = parent;
+	    this.scope = scope;
+	    this.file = file;
+
+	    this.blockPath = blockPath;
+	    this.block = blockPath.node;
+
+	    this.outsideLetReferences = (0, _create2.default)(null);
+	    this.hasLetReferences = false;
+	    this.letReferences = (0, _create2.default)(null);
+	    this.body = [];
+
+	    if (loopPath) {
+	      this.loopParent = loopPath.parent;
+	      this.loopLabel = t.isLabeledStatement(this.loopParent) && this.loopParent.label;
+	      this.loopPath = loopPath;
+	      this.loop = loopPath.node;
+	    }
+	  }
+
+	  BlockScoping.prototype.run = function run() {
+	    var block = this.block;
+	    if (block._letDone) return;
+	    block._letDone = true;
+
+	    var needsClosure = this.getLetReferences();
+
+	    if (t.isFunction(this.parent) || t.isProgram(this.block)) {
+	      this.updateScopeInfo();
+	      return;
+	    }
+
+	    if (!this.hasLetReferences) return;
+
+	    if (needsClosure) {
+	      this.wrapClosure();
+	    } else {
+	      this.remap();
+	    }
+
+	    this.updateScopeInfo(needsClosure);
+
+	    if (this.loopLabel && !t.isLabeledStatement(this.loopParent)) {
+	      return t.labeledStatement(this.loopLabel, this.loop);
+	    }
+	  };
+
+	  BlockScoping.prototype.updateScopeInfo = function updateScopeInfo(wrappedInClosure) {
+	    var scope = this.scope;
+	    var parentScope = scope.getFunctionParent();
+	    var letRefs = this.letReferences;
+
+	    for (var key in letRefs) {
+	      var ref = letRefs[key];
+	      var binding = scope.getBinding(ref.name);
+	      if (!binding) continue;
+	      if (binding.kind === "let" || binding.kind === "const") {
+	        binding.kind = "var";
+
+	        if (wrappedInClosure) {
+	          scope.removeBinding(ref.name);
+	        } else {
+	          scope.moveBindingTo(ref.name, parentScope);
+	        }
+	      }
+	    }
+	  };
+
+	  BlockScoping.prototype.remap = function remap() {
+	    var letRefs = this.letReferences;
+	    var scope = this.scope;
+
+	    for (var key in letRefs) {
+	      var ref = letRefs[key];
+
+	      if (scope.parentHasBinding(key) || scope.hasGlobal(key)) {
+	        if (scope.hasOwnBinding(key)) scope.rename(ref.name);
+
+	        if (this.blockPath.scope.hasOwnBinding(key)) this.blockPath.scope.rename(ref.name);
+	      }
+	    }
+	  };
+
+	  BlockScoping.prototype.wrapClosure = function wrapClosure() {
+	    if (this.file.opts.throwIfClosureRequired) {
+	      throw this.blockPath.buildCodeFrameError("Compiling let/const in this block would add a closure " + "(throwIfClosureRequired).");
+	    }
+	    var block = this.block;
+
+	    var outsideRefs = this.outsideLetReferences;
+
+	    if (this.loop) {
+	      for (var name in outsideRefs) {
+	        var id = outsideRefs[name];
+
+	        if (this.scope.hasGlobal(id.name) || this.scope.parentHasBinding(id.name)) {
+	          delete outsideRefs[id.name];
+	          delete this.letReferences[id.name];
+
+	          this.scope.rename(id.name);
+
+	          this.letReferences[id.name] = id;
+	          outsideRefs[id.name] = id;
+	        }
+	      }
+	    }
+
+	    this.has = this.checkLoop();
+
+	    this.hoistVarDeclarations();
+
+	    var params = (0, _values2.default)(outsideRefs);
+	    var args = (0, _values2.default)(outsideRefs);
+
+	    var isSwitch = this.blockPath.isSwitchStatement();
+
+	    var fn = t.functionExpression(null, params, t.blockStatement(isSwitch ? [block] : block.body));
+	    fn.shadow = true;
+
+	    this.addContinuations(fn);
+
+	    var ref = fn;
+
+	    if (this.loop) {
+	      ref = this.scope.generateUidIdentifier("loop");
+	      this.loopPath.insertBefore(t.variableDeclaration("var", [t.variableDeclarator(ref, fn)]));
+	    }
+
+	    var call = t.callExpression(ref, args);
+	    var ret = this.scope.generateUidIdentifier("ret");
+
+	    var hasYield = _babelTraverse2.default.hasType(fn.body, this.scope, "YieldExpression", t.FUNCTION_TYPES);
+	    if (hasYield) {
+	      fn.generator = true;
+	      call = t.yieldExpression(call, true);
+	    }
+
+	    var hasAsync = _babelTraverse2.default.hasType(fn.body, this.scope, "AwaitExpression", t.FUNCTION_TYPES);
+	    if (hasAsync) {
+	      fn.async = true;
+	      call = t.awaitExpression(call);
+	    }
+
+	    this.buildClosure(ret, call);
+
+	    if (isSwitch) this.blockPath.replaceWithMultiple(this.body);else block.body = this.body;
+	  };
+
+	  BlockScoping.prototype.buildClosure = function buildClosure(ret, call) {
+	    var has = this.has;
+	    if (has.hasReturn || has.hasBreakContinue) {
+	      this.buildHas(ret, call);
+	    } else {
+	      this.body.push(t.expressionStatement(call));
+	    }
+	  };
+
+	  BlockScoping.prototype.addContinuations = function addContinuations(fn) {
+	    var state = {
+	      reassignments: {},
+	      outsideReferences: this.outsideLetReferences
+	    };
+
+	    this.scope.traverse(fn, continuationVisitor, state);
+
+	    for (var i = 0; i < fn.params.length; i++) {
+	      var param = fn.params[i];
+	      if (!state.reassignments[param.name]) continue;
+
+	      var newParam = this.scope.generateUidIdentifier(param.name);
+	      fn.params[i] = newParam;
+
+	      this.scope.rename(param.name, newParam.name, fn);
+
+	      fn.body.body.push(t.expressionStatement(t.assignmentExpression("=", param, newParam)));
+	    }
+	  };
+
+	  BlockScoping.prototype.getLetReferences = function getLetReferences() {
+	    var _this = this;
+
+	    var block = this.block;
+
+	    var declarators = [];
+
+	    if (this.loop) {
+	      var init = this.loop.left || this.loop.init;
+	      if (isBlockScoped(init)) {
+	        declarators.push(init);
+	        (0, _extend2.default)(this.outsideLetReferences, t.getBindingIdentifiers(init));
+	      }
+	    }
+
+	    var addDeclarationsFromChild = function addDeclarationsFromChild(path, node) {
+	      node = node || path.node;
+	      if (t.isClassDeclaration(node) || t.isFunctionDeclaration(node) || isBlockScoped(node)) {
+	        if (isBlockScoped(node)) {
+	          convertBlockScopedToVar(path, node, block, _this.scope);
+	        }
+	        declarators = declarators.concat(node.declarations || node);
+	      }
+	      if (t.isLabeledStatement(node)) {
+	        addDeclarationsFromChild(path.get("body"), node.body);
+	      }
+	    };
+
+	    if (block.body) {
+	      for (var i = 0; i < block.body.length; i++) {
+	        var declarPath = this.blockPath.get("body")[i];
+	        addDeclarationsFromChild(declarPath);
+	      }
+	    }
+
+	    if (block.cases) {
+	      for (var _i = 0; _i < block.cases.length; _i++) {
+	        var consequents = block.cases[_i].consequent;
+
+	        for (var j = 0; j < consequents.length; j++) {
+	          var _declarPath = this.blockPath.get("cases")[_i];
+	          var declar = consequents[j];
+	          addDeclarationsFromChild(_declarPath, declar);
+	        }
+	      }
+	    }
+
+	    for (var _i2 = 0; _i2 < declarators.length; _i2++) {
+	      var _declar = declarators[_i2];
+
+	      var keys = t.getBindingIdentifiers(_declar, false, true);
+	      (0, _extend2.default)(this.letReferences, keys);
+	      this.hasLetReferences = true;
+	    }
+
+	    if (!this.hasLetReferences) return;
+
+	    var state = {
+	      letReferences: this.letReferences,
+	      closurify: false,
+	      file: this.file,
+	      loopDepth: 0
+	    };
+
+	    var loopOrFunctionParent = this.blockPath.find(function (path) {
+	      return path.isLoop() || path.isFunction();
+	    });
+	    if (loopOrFunctionParent && loopOrFunctionParent.isLoop()) {
+	      state.loopDepth++;
+	    }
+
+	    this.blockPath.traverse(letReferenceBlockVisitor, state);
+
+	    return state.closurify;
+	  };
+
+	  BlockScoping.prototype.checkLoop = function checkLoop() {
+	    var state = {
+	      hasBreakContinue: false,
+	      ignoreLabeless: false,
+	      inSwitchCase: false,
+	      innerLabels: [],
+	      hasReturn: false,
+	      isLoop: !!this.loop,
+	      map: {},
+	      LOOP_IGNORE: (0, _symbol2.default)()
+	    };
+
+	    this.blockPath.traverse(loopLabelVisitor, state);
+	    this.blockPath.traverse(loopVisitor, state);
+
+	    return state;
+	  };
+
+	  BlockScoping.prototype.hoistVarDeclarations = function hoistVarDeclarations() {
+	    this.blockPath.traverse(hoistVarDeclarationsVisitor, this);
+	  };
+
+	  BlockScoping.prototype.pushDeclar = function pushDeclar(node) {
+	    var declars = [];
+	    var names = t.getBindingIdentifiers(node);
+	    for (var name in names) {
+	      declars.push(t.variableDeclarator(names[name]));
+	    }
+
+	    this.body.push(t.variableDeclaration(node.kind, declars));
+
+	    var replace = [];
+
+	    for (var i = 0; i < node.declarations.length; i++) {
+	      var declar = node.declarations[i];
+	      if (!declar.init) continue;
+
+	      var expr = t.assignmentExpression("=", declar.id, declar.init);
+	      replace.push(t.inherits(expr, declar));
+	    }
+
+	    return replace;
+	  };
+
+	  BlockScoping.prototype.buildHas = function buildHas(ret, call) {
+	    var body = this.body;
+
+	    body.push(t.variableDeclaration("var", [t.variableDeclarator(ret, call)]));
+
+	    var retCheck = void 0;
+	    var has = this.has;
+	    var cases = [];
+
+	    if (has.hasReturn) {
+	      retCheck = buildRetCheck({
+	        RETURN: ret
+	      });
+	    }
+
+	    if (has.hasBreakContinue) {
+	      for (var key in has.map) {
+	        cases.push(t.switchCase(t.stringLiteral(key), [has.map[key]]));
+	      }
+
+	      if (has.hasReturn) {
+	        cases.push(t.switchCase(null, [retCheck]));
+	      }
+
+	      if (cases.length === 1) {
+	        var single = cases[0];
+	        body.push(t.ifStatement(t.binaryExpression("===", ret, single.test), single.consequent[0]));
+	      } else {
+	        if (this.loop) {
+	          for (var i = 0; i < cases.length; i++) {
+	            var caseConsequent = cases[i].consequent[0];
+	            if (t.isBreakStatement(caseConsequent) && !caseConsequent.label) {
+	              caseConsequent.label = this.loopLabel = this.loopLabel || this.scope.generateUidIdentifier("loop");
+	            }
+	          }
+	        }
+
+	        body.push(t.switchStatement(ret, cases));
+	      }
+	    } else {
+	      if (has.hasReturn) {
+	        body.push(retCheck);
+	      }
+	    }
+	  };
+
+	  return BlockScoping;
+	}();
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 69 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  var VISITED = (0, _symbol2.default)();
+
+	  return {
+	    visitor: {
+	      ExportDefaultDeclaration: function ExportDefaultDeclaration(path) {
+	        if (!path.get("declaration").isClassDeclaration()) return;
+
+	        var node = path.node;
+
+	        var ref = node.declaration.id || path.scope.generateUidIdentifier("class");
+	        node.declaration.id = ref;
+
+	        path.replaceWith(node.declaration);
+	        path.insertAfter(t.exportDefaultDeclaration(ref));
+	      },
+	      ClassDeclaration: function ClassDeclaration(path) {
+	        var node = path.node;
+
+	        var ref = node.id || path.scope.generateUidIdentifier("class");
+
+	        path.replaceWith(t.variableDeclaration("let", [t.variableDeclarator(ref, t.toExpression(node))]));
+	      },
+	      ClassExpression: function ClassExpression(path, state) {
+	        var node = path.node;
+
+	        if (node[VISITED]) return;
+
+	        var inferred = (0, _babelHelperFunctionName2.default)(path);
+	        if (inferred && inferred !== node) return path.replaceWith(inferred);
+
+	        node[VISITED] = true;
+
+	        var Constructor = _vanilla2.default;
+	        if (state.opts.loose) Constructor = _loose2.default;
+
+	        path.replaceWith(new Constructor(path, state.file).run());
+	      }
+	    }
+	  };
+	};
+
+	var _loose = __webpack_require__(327);
+
+	var _loose2 = _interopRequireDefault(_loose);
+
+	var _vanilla = __webpack_require__(203);
+
+	var _vanilla2 = _interopRequireDefault(_vanilla);
+
+	var _babelHelperFunctionName = __webpack_require__(40);
+
+	var _babelHelperFunctionName2 = _interopRequireDefault(_babelHelperFunctionName);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 70 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types,
+	      template = _ref.template;
+
+	  var buildMutatorMapAssign = template("\n    MUTATOR_MAP_REF[KEY] = MUTATOR_MAP_REF[KEY] || {};\n    MUTATOR_MAP_REF[KEY].KIND = VALUE;\n  ");
+
+	  function getValue(prop) {
+	    if (t.isObjectProperty(prop)) {
+	      return prop.value;
+	    } else if (t.isObjectMethod(prop)) {
+	      return t.functionExpression(null, prop.params, prop.body, prop.generator, prop.async);
+	    }
+	  }
+
+	  function pushAssign(objId, prop, body) {
+	    if (prop.kind === "get" && prop.kind === "set") {
+	      pushMutatorDefine(objId, prop, body);
+	    } else {
+	      body.push(t.expressionStatement(t.assignmentExpression("=", t.memberExpression(objId, prop.key, prop.computed || t.isLiteral(prop.key)), getValue(prop))));
+	    }
+	  }
+
+	  function pushMutatorDefine(_ref2, prop) {
+	    var objId = _ref2.objId,
+	        body = _ref2.body,
+	        getMutatorId = _ref2.getMutatorId,
+	        scope = _ref2.scope;
+
+	    var key = !prop.computed && t.isIdentifier(prop.key) ? t.stringLiteral(prop.key.name) : prop.key;
+
+	    var maybeMemoise = scope.maybeGenerateMemoised(key);
+	    if (maybeMemoise) {
+	      body.push(t.expressionStatement(t.assignmentExpression("=", maybeMemoise, key)));
+	      key = maybeMemoise;
+	    }
+
+	    body.push.apply(body, buildMutatorMapAssign({
+	      MUTATOR_MAP_REF: getMutatorId(),
+	      KEY: key,
+	      VALUE: getValue(prop),
+	      KIND: t.identifier(prop.kind)
+	    }));
+	  }
+
+	  function loose(info) {
+	    for (var _iterator = info.computedProps, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref3;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref3 = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref3 = _i.value;
+	      }
+
+	      var prop = _ref3;
+
+	      if (prop.kind === "get" || prop.kind === "set") {
+	        pushMutatorDefine(info, prop);
+	      } else {
+	        pushAssign(info.objId, prop, info.body);
+	      }
+	    }
+	  }
+
+	  function spec(info) {
+	    var objId = info.objId,
+	        body = info.body,
+	        computedProps = info.computedProps,
+	        state = info.state;
+
+	    for (var _iterator2 = computedProps, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref4;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref4 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref4 = _i2.value;
+	      }
+
+	      var prop = _ref4;
+
+	      var key = t.toComputedKey(prop);
+
+	      if (prop.kind === "get" || prop.kind === "set") {
+	        pushMutatorDefine(info, prop);
+	      } else if (t.isStringLiteral(key, { value: "__proto__" })) {
+	        pushAssign(objId, prop, body);
+	      } else {
+	        if (computedProps.length === 1) {
+	          return t.callExpression(state.addHelper("defineProperty"), [info.initPropExpression, key, getValue(prop)]);
+	        } else {
+	          body.push(t.expressionStatement(t.callExpression(state.addHelper("defineProperty"), [objId, key, getValue(prop)])));
+	        }
+	      }
+	    }
+	  }
+
+	  return {
+	    visitor: {
+	      ObjectExpression: {
+	        exit: function exit(path, state) {
+	          var node = path.node,
+	              parent = path.parent,
+	              scope = path.scope;
+
+	          var hasComputed = false;
+	          for (var _iterator3 = node.properties, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	            var _ref5;
+
+	            if (_isArray3) {
+	              if (_i3 >= _iterator3.length) break;
+	              _ref5 = _iterator3[_i3++];
+	            } else {
+	              _i3 = _iterator3.next();
+	              if (_i3.done) break;
+	              _ref5 = _i3.value;
+	            }
+
+	            var prop = _ref5;
+
+	            hasComputed = prop.computed === true;
+	            if (hasComputed) break;
+	          }
+	          if (!hasComputed) return;
+
+	          var initProps = [];
+	          var computedProps = [];
+	          var foundComputed = false;
+
+	          for (var _iterator4 = node.properties, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	            var _ref6;
+
+	            if (_isArray4) {
+	              if (_i4 >= _iterator4.length) break;
+	              _ref6 = _iterator4[_i4++];
+	            } else {
+	              _i4 = _iterator4.next();
+	              if (_i4.done) break;
+	              _ref6 = _i4.value;
+	            }
+
+	            var _prop = _ref6;
+
+	            if (_prop.computed) {
+	              foundComputed = true;
+	            }
+
+	            if (foundComputed) {
+	              computedProps.push(_prop);
+	            } else {
+	              initProps.push(_prop);
+	            }
+	          }
+
+	          var objId = scope.generateUidIdentifierBasedOnNode(parent);
+	          var initPropExpression = t.objectExpression(initProps);
+	          var body = [];
+
+	          body.push(t.variableDeclaration("var", [t.variableDeclarator(objId, initPropExpression)]));
+
+	          var callback = spec;
+	          if (state.opts.loose) callback = loose;
+
+	          var mutatorRef = void 0;
+
+	          var getMutatorId = function getMutatorId() {
+	            if (!mutatorRef) {
+	              mutatorRef = scope.generateUidIdentifier("mutatorMap");
+
+	              body.push(t.variableDeclaration("var", [t.variableDeclarator(mutatorRef, t.objectExpression([]))]));
+	            }
+
+	            return mutatorRef;
+	          };
+
+	          var single = callback({
+	            scope: scope,
+	            objId: objId,
+	            body: body,
+	            computedProps: computedProps,
+	            initPropExpression: initPropExpression,
+	            getMutatorId: getMutatorId,
+	            state: state
+	          });
+
+	          if (mutatorRef) {
+	            body.push(t.expressionStatement(t.callExpression(state.addHelper("defineEnumerableProperties"), [objId, mutatorRef])));
+	          }
+
+	          if (single) {
+	            path.replaceWith(single);
+	          } else {
+	            body.push(t.expressionStatement(objId));
+	            path.replaceWithMultiple(body);
+	          }
+	        }
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 71 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function variableDeclarationHasPattern(node) {
+	    for (var _iterator = node.declarations, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref2;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref2 = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref2 = _i.value;
+	      }
+
+	      var declar = _ref2;
+
+	      if (t.isPattern(declar.id)) {
+	        return true;
+	      }
+	    }
+	    return false;
+	  }
+
+	  function hasRest(pattern) {
+	    for (var _iterator2 = pattern.elements, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref3;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref3 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref3 = _i2.value;
+	      }
+
+	      var elem = _ref3;
+
+	      if (t.isRestElement(elem)) {
+	        return true;
+	      }
+	    }
+	    return false;
+	  }
+
+	  var arrayUnpackVisitor = {
+	    ReferencedIdentifier: function ReferencedIdentifier(path, state) {
+	      if (state.bindings[path.node.name]) {
+	        state.deopt = true;
+	        path.stop();
+	      }
+	    }
+	  };
+
+	  var DestructuringTransformer = function () {
+	    function DestructuringTransformer(opts) {
+	      (0, _classCallCheck3.default)(this, DestructuringTransformer);
+
+	      this.blockHoist = opts.blockHoist;
+	      this.operator = opts.operator;
+	      this.arrays = {};
+	      this.nodes = opts.nodes || [];
+	      this.scope = opts.scope;
+	      this.file = opts.file;
+	      this.kind = opts.kind;
+	    }
+
+	    DestructuringTransformer.prototype.buildVariableAssignment = function buildVariableAssignment(id, init) {
+	      var op = this.operator;
+	      if (t.isMemberExpression(id)) op = "=";
+
+	      var node = void 0;
+
+	      if (op) {
+	        node = t.expressionStatement(t.assignmentExpression(op, id, init));
+	      } else {
+	        node = t.variableDeclaration(this.kind, [t.variableDeclarator(id, init)]);
+	      }
+
+	      node._blockHoist = this.blockHoist;
+
+	      return node;
+	    };
+
+	    DestructuringTransformer.prototype.buildVariableDeclaration = function buildVariableDeclaration(id, init) {
+	      var declar = t.variableDeclaration("var", [t.variableDeclarator(id, init)]);
+	      declar._blockHoist = this.blockHoist;
+	      return declar;
+	    };
+
+	    DestructuringTransformer.prototype.push = function push(id, init) {
+	      if (t.isObjectPattern(id)) {
+	        this.pushObjectPattern(id, init);
+	      } else if (t.isArrayPattern(id)) {
+	        this.pushArrayPattern(id, init);
+	      } else if (t.isAssignmentPattern(id)) {
+	        this.pushAssignmentPattern(id, init);
+	      } else {
+	        this.nodes.push(this.buildVariableAssignment(id, init));
+	      }
+	    };
+
+	    DestructuringTransformer.prototype.toArray = function toArray(node, count) {
+	      if (this.file.opts.loose || t.isIdentifier(node) && this.arrays[node.name]) {
+	        return node;
+	      } else {
+	        return this.scope.toArray(node, count);
+	      }
+	    };
+
+	    DestructuringTransformer.prototype.pushAssignmentPattern = function pushAssignmentPattern(pattern, valueRef) {
+
+	      var tempValueRef = this.scope.generateUidIdentifierBasedOnNode(valueRef);
+
+	      var declar = t.variableDeclaration("var", [t.variableDeclarator(tempValueRef, valueRef)]);
+	      declar._blockHoist = this.blockHoist;
+	      this.nodes.push(declar);
+
+	      var tempConditional = t.conditionalExpression(t.binaryExpression("===", tempValueRef, t.identifier("undefined")), pattern.right, tempValueRef);
+
+	      var left = pattern.left;
+	      if (t.isPattern(left)) {
+	        var tempValueDefault = t.expressionStatement(t.assignmentExpression("=", tempValueRef, tempConditional));
+	        tempValueDefault._blockHoist = this.blockHoist;
+
+	        this.nodes.push(tempValueDefault);
+	        this.push(left, tempValueRef);
+	      } else {
+	        this.nodes.push(this.buildVariableAssignment(left, tempConditional));
+	      }
+	    };
+
+	    DestructuringTransformer.prototype.pushObjectRest = function pushObjectRest(pattern, objRef, spreadProp, spreadPropIndex) {
+
+	      var keys = [];
+
+	      for (var i = 0; i < pattern.properties.length; i++) {
+	        var prop = pattern.properties[i];
+
+	        if (i >= spreadPropIndex) break;
+
+	        if (t.isRestProperty(prop)) continue;
+
+	        var key = prop.key;
+	        if (t.isIdentifier(key) && !prop.computed) key = t.stringLiteral(prop.key.name);
+	        keys.push(key);
+	      }
+
+	      keys = t.arrayExpression(keys);
+
+	      var value = t.callExpression(this.file.addHelper("objectWithoutProperties"), [objRef, keys]);
+	      this.nodes.push(this.buildVariableAssignment(spreadProp.argument, value));
+	    };
+
+	    DestructuringTransformer.prototype.pushObjectProperty = function pushObjectProperty(prop, propRef) {
+	      if (t.isLiteral(prop.key)) prop.computed = true;
+
+	      var pattern = prop.value;
+	      var objRef = t.memberExpression(propRef, prop.key, prop.computed);
+
+	      if (t.isPattern(pattern)) {
+	        this.push(pattern, objRef);
+	      } else {
+	        this.nodes.push(this.buildVariableAssignment(pattern, objRef));
+	      }
+	    };
+
+	    DestructuringTransformer.prototype.pushObjectPattern = function pushObjectPattern(pattern, objRef) {
+
+	      if (!pattern.properties.length) {
+	        this.nodes.push(t.expressionStatement(t.callExpression(this.file.addHelper("objectDestructuringEmpty"), [objRef])));
+	      }
+
+	      if (pattern.properties.length > 1 && !this.scope.isStatic(objRef)) {
+	        var temp = this.scope.generateUidIdentifierBasedOnNode(objRef);
+	        this.nodes.push(this.buildVariableDeclaration(temp, objRef));
+	        objRef = temp;
+	      }
+
+	      for (var i = 0; i < pattern.properties.length; i++) {
+	        var prop = pattern.properties[i];
+	        if (t.isRestProperty(prop)) {
+	          this.pushObjectRest(pattern, objRef, prop, i);
+	        } else {
+	          this.pushObjectProperty(prop, objRef);
+	        }
+	      }
+	    };
+
+	    DestructuringTransformer.prototype.canUnpackArrayPattern = function canUnpackArrayPattern(pattern, arr) {
+	      if (!t.isArrayExpression(arr)) return false;
+
+	      if (pattern.elements.length > arr.elements.length) return;
+	      if (pattern.elements.length < arr.elements.length && !hasRest(pattern)) return false;
+
+	      for (var _iterator3 = pattern.elements, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	        var _ref4;
+
+	        if (_isArray3) {
+	          if (_i3 >= _iterator3.length) break;
+	          _ref4 = _iterator3[_i3++];
+	        } else {
+	          _i3 = _iterator3.next();
+	          if (_i3.done) break;
+	          _ref4 = _i3.value;
+	        }
+
+	        var elem = _ref4;
+
+	        if (!elem) return false;
+
+	        if (t.isMemberExpression(elem)) return false;
+	      }
+
+	      for (var _iterator4 = arr.elements, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	        var _ref5;
+
+	        if (_isArray4) {
+	          if (_i4 >= _iterator4.length) break;
+	          _ref5 = _iterator4[_i4++];
+	        } else {
+	          _i4 = _iterator4.next();
+	          if (_i4.done) break;
+	          _ref5 = _i4.value;
+	        }
+
+	        var _elem = _ref5;
+
+	        if (t.isSpreadElement(_elem)) return false;
+
+	        if (t.isCallExpression(_elem)) return false;
+
+	        if (t.isMemberExpression(_elem)) return false;
+	      }
+
+	      var bindings = t.getBindingIdentifiers(pattern);
+	      var state = { deopt: false, bindings: bindings };
+	      this.scope.traverse(arr, arrayUnpackVisitor, state);
+	      return !state.deopt;
+	    };
+
+	    DestructuringTransformer.prototype.pushUnpackedArrayPattern = function pushUnpackedArrayPattern(pattern, arr) {
+	      for (var i = 0; i < pattern.elements.length; i++) {
+	        var elem = pattern.elements[i];
+	        if (t.isRestElement(elem)) {
+	          this.push(elem.argument, t.arrayExpression(arr.elements.slice(i)));
+	        } else {
+	          this.push(elem, arr.elements[i]);
+	        }
+	      }
+	    };
+
+	    DestructuringTransformer.prototype.pushArrayPattern = function pushArrayPattern(pattern, arrayRef) {
+	      if (!pattern.elements) return;
+
+	      if (this.canUnpackArrayPattern(pattern, arrayRef)) {
+	        return this.pushUnpackedArrayPattern(pattern, arrayRef);
+	      }
+
+	      var count = !hasRest(pattern) && pattern.elements.length;
+
+	      var toArray = this.toArray(arrayRef, count);
+
+	      if (t.isIdentifier(toArray)) {
+	        arrayRef = toArray;
+	      } else {
+	        arrayRef = this.scope.generateUidIdentifierBasedOnNode(arrayRef);
+	        this.arrays[arrayRef.name] = true;
+	        this.nodes.push(this.buildVariableDeclaration(arrayRef, toArray));
+	      }
+
+	      for (var i = 0; i < pattern.elements.length; i++) {
+	        var elem = pattern.elements[i];
+
+	        if (!elem) continue;
+
+	        var elemRef = void 0;
+
+	        if (t.isRestElement(elem)) {
+	          elemRef = this.toArray(arrayRef);
+	          elemRef = t.callExpression(t.memberExpression(elemRef, t.identifier("slice")), [t.numericLiteral(i)]);
+
+	          elem = elem.argument;
+	        } else {
+	          elemRef = t.memberExpression(arrayRef, t.numericLiteral(i), true);
+	        }
+
+	        this.push(elem, elemRef);
+	      }
+	    };
+
+	    DestructuringTransformer.prototype.init = function init(pattern, ref) {
+
+	      if (!t.isArrayExpression(ref) && !t.isMemberExpression(ref)) {
+	        var memo = this.scope.maybeGenerateMemoised(ref, true);
+	        if (memo) {
+	          this.nodes.push(this.buildVariableDeclaration(memo, ref));
+	          ref = memo;
+	        }
+	      }
+
+	      this.push(pattern, ref);
+
+	      return this.nodes;
+	    };
+
+	    return DestructuringTransformer;
+	  }();
+
+	  return {
+	    visitor: {
+	      ExportNamedDeclaration: function ExportNamedDeclaration(path) {
+	        var declaration = path.get("declaration");
+	        if (!declaration.isVariableDeclaration()) return;
+	        if (!variableDeclarationHasPattern(declaration.node)) return;
+
+	        var specifiers = [];
+
+	        for (var name in path.getOuterBindingIdentifiers(path)) {
+	          var id = t.identifier(name);
+	          specifiers.push(t.exportSpecifier(id, id));
+	        }
+
+	        path.replaceWith(declaration.node);
+	        path.insertAfter(t.exportNamedDeclaration(null, specifiers));
+	      },
+	      ForXStatement: function ForXStatement(path, file) {
+	        var node = path.node,
+	            scope = path.scope;
+
+	        var left = node.left;
+
+	        if (t.isPattern(left)) {
+
+	          var temp = scope.generateUidIdentifier("ref");
+
+	          node.left = t.variableDeclaration("var", [t.variableDeclarator(temp)]);
+
+	          path.ensureBlock();
+
+	          node.body.body.unshift(t.variableDeclaration("var", [t.variableDeclarator(left, temp)]));
+
+	          return;
+	        }
+
+	        if (!t.isVariableDeclaration(left)) return;
+
+	        var pattern = left.declarations[0].id;
+	        if (!t.isPattern(pattern)) return;
+
+	        var key = scope.generateUidIdentifier("ref");
+	        node.left = t.variableDeclaration(left.kind, [t.variableDeclarator(key, null)]);
+
+	        var nodes = [];
+
+	        var destructuring = new DestructuringTransformer({
+	          kind: left.kind,
+	          file: file,
+	          scope: scope,
+	          nodes: nodes
+	        });
+
+	        destructuring.init(pattern, key);
+
+	        path.ensureBlock();
+
+	        var block = node.body;
+	        block.body = nodes.concat(block.body);
+	      },
+	      CatchClause: function CatchClause(_ref6, file) {
+	        var node = _ref6.node,
+	            scope = _ref6.scope;
+
+	        var pattern = node.param;
+	        if (!t.isPattern(pattern)) return;
+
+	        var ref = scope.generateUidIdentifier("ref");
+	        node.param = ref;
+
+	        var nodes = [];
+
+	        var destructuring = new DestructuringTransformer({
+	          kind: "let",
+	          file: file,
+	          scope: scope,
+	          nodes: nodes
+	        });
+	        destructuring.init(pattern, ref);
+
+	        node.body.body = nodes.concat(node.body.body);
+	      },
+	      AssignmentExpression: function AssignmentExpression(path, file) {
+	        var node = path.node,
+	            scope = path.scope;
+
+	        if (!t.isPattern(node.left)) return;
+
+	        var nodes = [];
+
+	        var destructuring = new DestructuringTransformer({
+	          operator: node.operator,
+	          file: file,
+	          scope: scope,
+	          nodes: nodes
+	        });
+
+	        var ref = void 0;
+	        if (path.isCompletionRecord() || !path.parentPath.isExpressionStatement()) {
+	          ref = scope.generateUidIdentifierBasedOnNode(node.right, "ref");
+
+	          nodes.push(t.variableDeclaration("var", [t.variableDeclarator(ref, node.right)]));
+
+	          if (t.isArrayExpression(node.right)) {
+	            destructuring.arrays[ref.name] = true;
+	          }
+	        }
+
+	        destructuring.init(node.left, ref || node.right);
+
+	        if (ref) {
+	          nodes.push(t.expressionStatement(ref));
+	        }
+
+	        path.replaceWithMultiple(nodes);
+	      },
+	      VariableDeclaration: function VariableDeclaration(path, file) {
+	        var node = path.node,
+	            scope = path.scope,
+	            parent = path.parent;
+
+	        if (t.isForXStatement(parent)) return;
+	        if (!parent || !path.container) return;
+	        if (!variableDeclarationHasPattern(node)) return;
+
+	        var nodes = [];
+	        var declar = void 0;
+
+	        for (var i = 0; i < node.declarations.length; i++) {
+	          declar = node.declarations[i];
+
+	          var patternId = declar.init;
+	          var pattern = declar.id;
+
+	          var destructuring = new DestructuringTransformer({
+	            blockHoist: node._blockHoist,
+	            nodes: nodes,
+	            scope: scope,
+	            kind: node.kind,
+	            file: file
+	          });
+
+	          if (t.isPattern(pattern)) {
+	            destructuring.init(pattern, patternId);
+
+	            if (+i !== node.declarations.length - 1) {
+	              t.inherits(nodes[nodes.length - 1], declar);
+	            }
+	          } else {
+	            nodes.push(t.inherits(destructuring.buildVariableAssignment(declar.id, declar.init), declar));
+	          }
+	        }
+
+	        var nodesOut = [];
+	        for (var _iterator5 = nodes, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, _getIterator3.default)(_iterator5);;) {
+	          var _ref7;
+
+	          if (_isArray5) {
+	            if (_i5 >= _iterator5.length) break;
+	            _ref7 = _iterator5[_i5++];
+	          } else {
+	            _i5 = _iterator5.next();
+	            if (_i5.done) break;
+	            _ref7 = _i5.value;
+	          }
+
+	          var _node = _ref7;
+
+	          var tail = nodesOut[nodesOut.length - 1];
+	          if (tail && t.isVariableDeclaration(tail) && t.isVariableDeclaration(_node) && tail.kind === _node.kind) {
+	            var _tail$declarations;
+
+	            (_tail$declarations = tail.declarations).push.apply(_tail$declarations, _node.declarations);
+	          } else {
+	            nodesOut.push(_node);
+	          }
+	        }
+
+	        for (var _iterator6 = nodesOut, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : (0, _getIterator3.default)(_iterator6);;) {
+	          var _ref8;
+
+	          if (_isArray6) {
+	            if (_i6 >= _iterator6.length) break;
+	            _ref8 = _iterator6[_i6++];
+	          } else {
+	            _i6 = _iterator6.next();
+	            if (_i6.done) break;
+	            _ref8 = _i6.value;
+	          }
+
+	          var nodeOut = _ref8;
+
+	          if (!nodeOut.declarations) continue;
+	          for (var _iterator7 = nodeOut.declarations, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : (0, _getIterator3.default)(_iterator7);;) {
+	            var _ref9;
+
+	            if (_isArray7) {
+	              if (_i7 >= _iterator7.length) break;
+	              _ref9 = _iterator7[_i7++];
+	            } else {
+	              _i7 = _iterator7.next();
+	              if (_i7.done) break;
+	              _ref9 = _i7.value;
+	            }
+
+	            var declaration = _ref9;
+	            var name = declaration.id.name;
+
+	            if (scope.bindings[name]) {
+	              scope.bindings[name].kind = nodeOut.kind;
+	            }
+	          }
+	        }
+
+	        if (nodesOut.length === 1) {
+	          path.replaceWith(nodesOut[0]);
+	        } else {
+	          path.replaceWithMultiple(nodesOut);
+	        }
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 72 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var messages = _ref.messages,
+	      template = _ref.template,
+	      t = _ref.types;
+
+	  var buildForOfArray = template("\n    for (var KEY = 0; KEY < ARR.length; KEY++) BODY;\n  ");
+
+	  var buildForOfLoose = template("\n    for (var LOOP_OBJECT = OBJECT,\n             IS_ARRAY = Array.isArray(LOOP_OBJECT),\n             INDEX = 0,\n             LOOP_OBJECT = IS_ARRAY ? LOOP_OBJECT : LOOP_OBJECT[Symbol.iterator]();;) {\n      var ID;\n      if (IS_ARRAY) {\n        if (INDEX >= LOOP_OBJECT.length) break;\n        ID = LOOP_OBJECT[INDEX++];\n      } else {\n        INDEX = LOOP_OBJECT.next();\n        if (INDEX.done) break;\n        ID = INDEX.value;\n      }\n    }\n  ");
+
+	  var buildForOf = template("\n    var ITERATOR_COMPLETION = true;\n    var ITERATOR_HAD_ERROR_KEY = false;\n    var ITERATOR_ERROR_KEY = undefined;\n    try {\n      for (var ITERATOR_KEY = OBJECT[Symbol.iterator](), STEP_KEY; !(ITERATOR_COMPLETION = (STEP_KEY = ITERATOR_KEY.next()).done); ITERATOR_COMPLETION = true) {\n      }\n    } catch (err) {\n      ITERATOR_HAD_ERROR_KEY = true;\n      ITERATOR_ERROR_KEY = err;\n    } finally {\n      try {\n        if (!ITERATOR_COMPLETION && ITERATOR_KEY.return) {\n          ITERATOR_KEY.return();\n        }\n      } finally {\n        if (ITERATOR_HAD_ERROR_KEY) {\n          throw ITERATOR_ERROR_KEY;\n        }\n      }\n    }\n  ");
+
+	  function _ForOfStatementArray(path) {
+	    var node = path.node,
+	        scope = path.scope;
+
+	    var nodes = [];
+	    var right = node.right;
+
+	    if (!t.isIdentifier(right) || !scope.hasBinding(right.name)) {
+	      var uid = scope.generateUidIdentifier("arr");
+	      nodes.push(t.variableDeclaration("var", [t.variableDeclarator(uid, right)]));
+	      right = uid;
+	    }
+
+	    var iterationKey = scope.generateUidIdentifier("i");
+
+	    var loop = buildForOfArray({
+	      BODY: node.body,
+	      KEY: iterationKey,
+	      ARR: right
+	    });
+
+	    t.inherits(loop, node);
+	    t.ensureBlock(loop);
+
+	    var iterationValue = t.memberExpression(right, iterationKey, true);
+
+	    var left = node.left;
+	    if (t.isVariableDeclaration(left)) {
+	      left.declarations[0].init = iterationValue;
+	      loop.body.body.unshift(left);
+	    } else {
+	      loop.body.body.unshift(t.expressionStatement(t.assignmentExpression("=", left, iterationValue)));
+	    }
+
+	    if (path.parentPath.isLabeledStatement()) {
+	      loop = t.labeledStatement(path.parentPath.node.label, loop);
+	    }
+
+	    nodes.push(loop);
+
+	    return nodes;
+	  }
+
+	  return {
+	    visitor: {
+	      ForOfStatement: function ForOfStatement(path, state) {
+	        if (path.get("right").isArrayExpression()) {
+	          if (path.parentPath.isLabeledStatement()) {
+	            return path.parentPath.replaceWithMultiple(_ForOfStatementArray(path));
+	          } else {
+	            return path.replaceWithMultiple(_ForOfStatementArray(path));
+	          }
+	        }
+
+	        var callback = spec;
+	        if (state.opts.loose) callback = loose;
+
+	        var node = path.node;
+
+	        var build = callback(path, state);
+	        var declar = build.declar;
+	        var loop = build.loop;
+	        var block = loop.body;
+
+	        path.ensureBlock();
+
+	        if (declar) {
+	          block.body.push(declar);
+	        }
+
+	        block.body = block.body.concat(node.body.body);
+
+	        t.inherits(loop, node);
+	        t.inherits(loop.body, node.body);
+
+	        if (build.replaceParent) {
+	          path.parentPath.replaceWithMultiple(build.node);
+	          path.remove();
+	        } else {
+	          path.replaceWithMultiple(build.node);
+	        }
+	      }
+	    }
+	  };
+
+	  function loose(path, file) {
+	    var node = path.node,
+	        scope = path.scope,
+	        parent = path.parent;
+	    var left = node.left;
+
+	    var declar = void 0,
+	        id = void 0;
+
+	    if (t.isIdentifier(left) || t.isPattern(left) || t.isMemberExpression(left)) {
+	      id = left;
+	    } else if (t.isVariableDeclaration(left)) {
+	      id = scope.generateUidIdentifier("ref");
+	      declar = t.variableDeclaration(left.kind, [t.variableDeclarator(left.declarations[0].id, id)]);
+	    } else {
+	      throw file.buildCodeFrameError(left, messages.get("unknownForHead", left.type));
+	    }
+
+	    var iteratorKey = scope.generateUidIdentifier("iterator");
+	    var isArrayKey = scope.generateUidIdentifier("isArray");
+
+	    var loop = buildForOfLoose({
+	      LOOP_OBJECT: iteratorKey,
+	      IS_ARRAY: isArrayKey,
+	      OBJECT: node.right,
+	      INDEX: scope.generateUidIdentifier("i"),
+	      ID: id
+	    });
+
+	    if (!declar) {
+	      loop.body.body.shift();
+	    }
+
+	    var isLabeledParent = t.isLabeledStatement(parent);
+	    var labeled = void 0;
+
+	    if (isLabeledParent) {
+	      labeled = t.labeledStatement(parent.label, loop);
+	    }
+
+	    return {
+	      replaceParent: isLabeledParent,
+	      declar: declar,
+	      node: labeled || loop,
+	      loop: loop
+	    };
+	  }
+
+	  function spec(path, file) {
+	    var node = path.node,
+	        scope = path.scope,
+	        parent = path.parent;
+
+	    var left = node.left;
+	    var declar = void 0;
+
+	    var stepKey = scope.generateUidIdentifier("step");
+	    var stepValue = t.memberExpression(stepKey, t.identifier("value"));
+
+	    if (t.isIdentifier(left) || t.isPattern(left) || t.isMemberExpression(left)) {
+	      declar = t.expressionStatement(t.assignmentExpression("=", left, stepValue));
+	    } else if (t.isVariableDeclaration(left)) {
+	      declar = t.variableDeclaration(left.kind, [t.variableDeclarator(left.declarations[0].id, stepValue)]);
+	    } else {
+	      throw file.buildCodeFrameError(left, messages.get("unknownForHead", left.type));
+	    }
+
+	    var iteratorKey = scope.generateUidIdentifier("iterator");
+
+	    var template = buildForOf({
+	      ITERATOR_HAD_ERROR_KEY: scope.generateUidIdentifier("didIteratorError"),
+	      ITERATOR_COMPLETION: scope.generateUidIdentifier("iteratorNormalCompletion"),
+	      ITERATOR_ERROR_KEY: scope.generateUidIdentifier("iteratorError"),
+	      ITERATOR_KEY: iteratorKey,
+	      STEP_KEY: stepKey,
+	      OBJECT: node.right,
+	      BODY: null
+	    });
+
+	    var isLabeledParent = t.isLabeledStatement(parent);
+
+	    var tryBody = template[3].block.body;
+	    var loop = tryBody[0];
+
+	    if (isLabeledParent) {
+	      tryBody[0] = t.labeledStatement(parent.label, loop);
+	    }
+
+	    return {
+	      replaceParent: isLabeledParent,
+	      declar: declar,
+	      loop: loop,
+	      node: template
+	    };
+	  }
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 73 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    visitor: {
+	      FunctionExpression: {
+	        exit: function exit(path) {
+	          if (path.key !== "value" && !path.parentPath.isObjectProperty()) {
+	            var replacement = (0, _babelHelperFunctionName2.default)(path);
+	            if (replacement) path.replaceWith(replacement);
+	          }
+	        }
+	      },
+
+	      ObjectProperty: function ObjectProperty(path) {
+	        var value = path.get("value");
+	        if (value.isFunction()) {
+	          var newNode = (0, _babelHelperFunctionName2.default)(value);
+	          if (newNode) value.replaceWith(newNode);
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _babelHelperFunctionName = __webpack_require__(40);
+
+	var _babelHelperFunctionName2 = _interopRequireDefault(_babelHelperFunctionName);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 74 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    visitor: {
+	      NumericLiteral: function NumericLiteral(_ref) {
+	        var node = _ref.node;
+
+	        if (node.extra && /^0[ob]/i.test(node.extra.raw)) {
+	          node.extra = undefined;
+	        }
+	      },
+	      StringLiteral: function StringLiteral(_ref2) {
+	        var node = _ref2.node;
+
+	        if (node.extra && /\\[u]/gi.test(node.extra.raw)) {
+	          node.extra = undefined;
+	        }
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 75 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _keys = __webpack_require__(13);
+
+	var _keys2 = _interopRequireDefault(_keys);
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	exports.default = function () {
+	  var REASSIGN_REMAP_SKIP = (0, _symbol2.default)();
+
+	  var reassignmentVisitor = {
+	    ReferencedIdentifier: function ReferencedIdentifier(path) {
+	      var name = path.node.name;
+	      var remap = this.remaps[name];
+	      if (!remap) return;
+
+	      if (this.scope.getBinding(name) !== path.scope.getBinding(name)) return;
+
+	      if (path.parentPath.isCallExpression({ callee: path.node })) {
+	        path.replaceWith(t.sequenceExpression([t.numericLiteral(0), remap]));
+	      } else if (path.isJSXIdentifier() && t.isMemberExpression(remap)) {
+	        var object = remap.object,
+	            property = remap.property;
+
+	        path.replaceWith(t.JSXMemberExpression(t.JSXIdentifier(object.name), t.JSXIdentifier(property.name)));
+	      } else {
+	        path.replaceWith(remap);
+	      }
+	      this.requeueInParent(path);
+	    },
+	    AssignmentExpression: function AssignmentExpression(path) {
+	      var node = path.node;
+	      if (node[REASSIGN_REMAP_SKIP]) return;
+
+	      var left = path.get("left");
+	      if (!left.isIdentifier()) return;
+
+	      var name = left.node.name;
+	      var exports = this.exports[name];
+	      if (!exports) return;
+
+	      if (this.scope.getBinding(name) !== path.scope.getBinding(name)) return;
+
+	      node[REASSIGN_REMAP_SKIP] = true;
+
+	      for (var _iterator = exports, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	        var _ref;
+
+	        if (_isArray) {
+	          if (_i >= _iterator.length) break;
+	          _ref = _iterator[_i++];
+	        } else {
+	          _i = _iterator.next();
+	          if (_i.done) break;
+	          _ref = _i.value;
+	        }
+
+	        var reid = _ref;
+
+	        node = buildExportsAssignment(reid, node).expression;
+	      }
+
+	      path.replaceWith(node);
+	      this.requeueInParent(path);
+	    },
+	    UpdateExpression: function UpdateExpression(path) {
+	      var arg = path.get("argument");
+	      if (!arg.isIdentifier()) return;
+
+	      var name = arg.node.name;
+	      var exports = this.exports[name];
+	      if (!exports) return;
+
+	      if (this.scope.getBinding(name) !== path.scope.getBinding(name)) return;
+
+	      var node = t.assignmentExpression(path.node.operator[0] + "=", arg.node, t.numericLiteral(1));
+
+	      if (path.parentPath.isExpressionStatement() && !path.isCompletionRecord() || path.node.prefix) {
+	        path.replaceWith(node);
+	        this.requeueInParent(path);
+	        return;
+	      }
+
+	      var nodes = [];
+	      nodes.push(node);
+
+	      var operator = void 0;
+	      if (path.node.operator === "--") {
+	        operator = "+";
+	      } else {
+	        operator = "-";
+	      }
+	      nodes.push(t.binaryExpression(operator, arg.node, t.numericLiteral(1)));
+
+	      path.replaceWithMultiple(t.sequenceExpression(nodes));
+	    }
+	  };
+
+	  return {
+	    inherits: __webpack_require__(212),
+
+	    visitor: {
+	      ThisExpression: function ThisExpression(path, state) {
+	        if (this.ranCommonJS) return;
+
+	        if (state.opts.allowTopLevelThis !== true && !path.findParent(function (path) {
+	          return !path.is("shadow") && THIS_BREAK_KEYS.indexOf(path.type) >= 0;
+	        })) {
+	          path.replaceWith(t.identifier("undefined"));
+	        }
+	      },
+
+	      Program: {
+	        exit: function exit(path) {
+	          this.ranCommonJS = true;
+
+	          var strict = !!this.opts.strict;
+	          var noInterop = !!this.opts.noInterop;
+
+	          var scope = path.scope;
+
+	          scope.rename("module");
+	          scope.rename("exports");
+	          scope.rename("require");
+
+	          var hasExports = false;
+	          var hasImports = false;
+
+	          var body = path.get("body");
+	          var imports = (0, _create2.default)(null);
+	          var exports = (0, _create2.default)(null);
+
+	          var nonHoistedExportNames = (0, _create2.default)(null);
+
+	          var topNodes = [];
+	          var remaps = (0, _create2.default)(null);
+
+	          var requires = (0, _create2.default)(null);
+
+	          function addRequire(source, blockHoist) {
+	            var cached = requires[source];
+	            if (cached) return cached;
+
+	            var ref = path.scope.generateUidIdentifier((0, _path2.basename)(source, (0, _path2.extname)(source)));
+
+	            var varDecl = t.variableDeclaration("var", [t.variableDeclarator(ref, buildRequire(t.stringLiteral(source)).expression)]);
+
+	            if (imports[source]) {
+	              varDecl.loc = imports[source].loc;
+	            }
+
+	            if (typeof blockHoist === "number" && blockHoist > 0) {
+	              varDecl._blockHoist = blockHoist;
+	            }
+
+	            topNodes.push(varDecl);
+
+	            return requires[source] = ref;
+	          }
+
+	          function addTo(obj, key, arr) {
+	            var existing = obj[key] || [];
+	            obj[key] = existing.concat(arr);
+	          }
+
+	          for (var _iterator2 = body, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	            var _ref2;
+
+	            if (_isArray2) {
+	              if (_i2 >= _iterator2.length) break;
+	              _ref2 = _iterator2[_i2++];
+	            } else {
+	              _i2 = _iterator2.next();
+	              if (_i2.done) break;
+	              _ref2 = _i2.value;
+	            }
+
+	            var _path = _ref2;
+
+	            if (_path.isExportDeclaration()) {
+	              hasExports = true;
+
+	              var specifiers = [].concat(_path.get("declaration"), _path.get("specifiers"));
+	              for (var _iterator4 = specifiers, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	                var _ref4;
+
+	                if (_isArray4) {
+	                  if (_i4 >= _iterator4.length) break;
+	                  _ref4 = _iterator4[_i4++];
+	                } else {
+	                  _i4 = _iterator4.next();
+	                  if (_i4.done) break;
+	                  _ref4 = _i4.value;
+	                }
+
+	                var _specifier2 = _ref4;
+
+	                var ids = _specifier2.getBindingIdentifiers();
+	                if (ids.__esModule) {
+	                  throw _specifier2.buildCodeFrameError("Illegal export \"__esModule\"");
+	                }
+	              }
+	            }
+
+	            if (_path.isImportDeclaration()) {
+	              var _importsEntry$specifi;
+
+	              hasImports = true;
+
+	              var key = _path.node.source.value;
+	              var importsEntry = imports[key] || {
+	                specifiers: [],
+	                maxBlockHoist: 0,
+	                loc: _path.node.loc
+	              };
+
+	              (_importsEntry$specifi = importsEntry.specifiers).push.apply(_importsEntry$specifi, _path.node.specifiers);
+
+	              if (typeof _path.node._blockHoist === "number") {
+	                importsEntry.maxBlockHoist = Math.max(_path.node._blockHoist, importsEntry.maxBlockHoist);
+	              }
+
+	              imports[key] = importsEntry;
+
+	              _path.remove();
+	            } else if (_path.isExportDefaultDeclaration()) {
+	              var declaration = _path.get("declaration");
+	              if (declaration.isFunctionDeclaration()) {
+	                var id = declaration.node.id;
+	                var defNode = t.identifier("default");
+	                if (id) {
+	                  addTo(exports, id.name, defNode);
+	                  topNodes.push(buildExportsAssignment(defNode, id));
+	                  _path.replaceWith(declaration.node);
+	                } else {
+	                  topNodes.push(buildExportsAssignment(defNode, t.toExpression(declaration.node)));
+	                  _path.remove();
+	                }
+	              } else if (declaration.isClassDeclaration()) {
+	                var _id = declaration.node.id;
+	                var _defNode = t.identifier("default");
+	                if (_id) {
+	                  addTo(exports, _id.name, _defNode);
+	                  _path.replaceWithMultiple([declaration.node, buildExportsAssignment(_defNode, _id)]);
+	                } else {
+	                  _path.replaceWith(buildExportsAssignment(_defNode, t.toExpression(declaration.node)));
+
+	                  _path.parentPath.requeue(_path.get("expression.left"));
+	                }
+	              } else {
+	                _path.replaceWith(buildExportsAssignment(t.identifier("default"), declaration.node));
+
+	                _path.parentPath.requeue(_path.get("expression.left"));
+	              }
+	            } else if (_path.isExportNamedDeclaration()) {
+	              var _declaration = _path.get("declaration");
+	              if (_declaration.node) {
+	                if (_declaration.isFunctionDeclaration()) {
+	                  var _id2 = _declaration.node.id;
+	                  addTo(exports, _id2.name, _id2);
+	                  topNodes.push(buildExportsAssignment(_id2, _id2));
+	                  _path.replaceWith(_declaration.node);
+	                } else if (_declaration.isClassDeclaration()) {
+	                  var _id3 = _declaration.node.id;
+	                  addTo(exports, _id3.name, _id3);
+	                  _path.replaceWithMultiple([_declaration.node, buildExportsAssignment(_id3, _id3)]);
+	                  nonHoistedExportNames[_id3.name] = true;
+	                } else if (_declaration.isVariableDeclaration()) {
+	                  var declarators = _declaration.get("declarations");
+	                  for (var _iterator5 = declarators, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, _getIterator3.default)(_iterator5);;) {
+	                    var _ref5;
+
+	                    if (_isArray5) {
+	                      if (_i5 >= _iterator5.length) break;
+	                      _ref5 = _iterator5[_i5++];
+	                    } else {
+	                      _i5 = _iterator5.next();
+	                      if (_i5.done) break;
+	                      _ref5 = _i5.value;
+	                    }
+
+	                    var decl = _ref5;
+
+	                    var _id4 = decl.get("id");
+
+	                    var init = decl.get("init");
+	                    if (!init.node) init.replaceWith(t.identifier("undefined"));
+
+	                    if (_id4.isIdentifier()) {
+	                      addTo(exports, _id4.node.name, _id4.node);
+	                      init.replaceWith(buildExportsAssignment(_id4.node, init.node).expression);
+	                      nonHoistedExportNames[_id4.node.name] = true;
+	                    } else {}
+	                  }
+	                  _path.replaceWith(_declaration.node);
+	                }
+	                continue;
+	              }
+
+	              var _specifiers = _path.get("specifiers");
+	              var nodes = [];
+	              var _source = _path.node.source;
+	              if (_source) {
+	                var ref = addRequire(_source.value, _path.node._blockHoist);
+
+	                for (var _iterator6 = _specifiers, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : (0, _getIterator3.default)(_iterator6);;) {
+	                  var _ref6;
+
+	                  if (_isArray6) {
+	                    if (_i6 >= _iterator6.length) break;
+	                    _ref6 = _iterator6[_i6++];
+	                  } else {
+	                    _i6 = _iterator6.next();
+	                    if (_i6.done) break;
+	                    _ref6 = _i6.value;
+	                  }
+
+	                  var _specifier3 = _ref6;
+
+	                  if (_specifier3.isExportNamespaceSpecifier()) {} else if (_specifier3.isExportDefaultSpecifier()) {} else if (_specifier3.isExportSpecifier()) {
+	                    if (!noInterop && _specifier3.node.local.name === "default") {
+	                      topNodes.push(buildExportsFrom(t.stringLiteral(_specifier3.node.exported.name), t.memberExpression(t.callExpression(this.addHelper("interopRequireDefault"), [ref]), _specifier3.node.local)));
+	                    } else {
+	                      topNodes.push(buildExportsFrom(t.stringLiteral(_specifier3.node.exported.name), t.memberExpression(ref, _specifier3.node.local)));
+	                    }
+	                    nonHoistedExportNames[_specifier3.node.exported.name] = true;
+	                  }
+	                }
+	              } else {
+	                for (var _iterator7 = _specifiers, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : (0, _getIterator3.default)(_iterator7);;) {
+	                  var _ref7;
+
+	                  if (_isArray7) {
+	                    if (_i7 >= _iterator7.length) break;
+	                    _ref7 = _iterator7[_i7++];
+	                  } else {
+	                    _i7 = _iterator7.next();
+	                    if (_i7.done) break;
+	                    _ref7 = _i7.value;
+	                  }
+
+	                  var _specifier4 = _ref7;
+
+	                  if (_specifier4.isExportSpecifier()) {
+	                    addTo(exports, _specifier4.node.local.name, _specifier4.node.exported);
+	                    nonHoistedExportNames[_specifier4.node.exported.name] = true;
+	                    nodes.push(buildExportsAssignment(_specifier4.node.exported, _specifier4.node.local));
+	                  }
+	                }
+	              }
+	              _path.replaceWithMultiple(nodes);
+	            } else if (_path.isExportAllDeclaration()) {
+	              var exportNode = buildExportAll({
+	                OBJECT: addRequire(_path.node.source.value, _path.node._blockHoist)
+	              });
+	              exportNode.loc = _path.node.loc;
+	              topNodes.push(exportNode);
+	              _path.remove();
+	            }
+	          }
+
+	          for (var source in imports) {
+	            var _imports$source = imports[source],
+	                specifiers = _imports$source.specifiers,
+	                maxBlockHoist = _imports$source.maxBlockHoist;
+
+	            if (specifiers.length) {
+	              var uid = addRequire(source, maxBlockHoist);
+
+	              var wildcard = void 0;
+
+	              for (var i = 0; i < specifiers.length; i++) {
+	                var specifier = specifiers[i];
+	                if (t.isImportNamespaceSpecifier(specifier)) {
+	                  if (strict || noInterop) {
+	                    remaps[specifier.local.name] = uid;
+	                  } else {
+	                    var varDecl = t.variableDeclaration("var", [t.variableDeclarator(specifier.local, t.callExpression(this.addHelper("interopRequireWildcard"), [uid]))]);
+
+	                    if (maxBlockHoist > 0) {
+	                      varDecl._blockHoist = maxBlockHoist;
+	                    }
+
+	                    topNodes.push(varDecl);
+	                  }
+	                  wildcard = specifier.local;
+	                } else if (t.isImportDefaultSpecifier(specifier)) {
+	                  specifiers[i] = t.importSpecifier(specifier.local, t.identifier("default"));
+	                }
+	              }
+
+	              for (var _iterator3 = specifiers, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	                var _ref3;
+
+	                if (_isArray3) {
+	                  if (_i3 >= _iterator3.length) break;
+	                  _ref3 = _iterator3[_i3++];
+	                } else {
+	                  _i3 = _iterator3.next();
+	                  if (_i3.done) break;
+	                  _ref3 = _i3.value;
+	                }
+
+	                var _specifier = _ref3;
+
+	                if (t.isImportSpecifier(_specifier)) {
+	                  var target = uid;
+	                  if (_specifier.imported.name === "default") {
+	                    if (wildcard) {
+	                      target = wildcard;
+	                    } else if (!noInterop) {
+	                      target = wildcard = path.scope.generateUidIdentifier(uid.name);
+	                      var _varDecl = t.variableDeclaration("var", [t.variableDeclarator(target, t.callExpression(this.addHelper("interopRequireDefault"), [uid]))]);
+
+	                      if (maxBlockHoist > 0) {
+	                        _varDecl._blockHoist = maxBlockHoist;
+	                      }
+
+	                      topNodes.push(_varDecl);
+	                    }
+	                  }
+	                  remaps[_specifier.local.name] = t.memberExpression(target, t.cloneWithoutLoc(_specifier.imported));
+	                }
+	              }
+	            } else {
+	              var requireNode = buildRequire(t.stringLiteral(source));
+	              requireNode.loc = imports[source].loc;
+	              topNodes.push(requireNode);
+	            }
+	          }
+
+	          if (hasImports && (0, _keys2.default)(nonHoistedExportNames).length) {
+	            var maxHoistedExportsNodeAssignmentLength = 100;
+	            var nonHoistedExportNamesArr = (0, _keys2.default)(nonHoistedExportNames);
+
+	            var _loop = function _loop(currentExportsNodeAssignmentLength) {
+	              var nonHoistedExportNamesChunk = nonHoistedExportNamesArr.slice(currentExportsNodeAssignmentLength, currentExportsNodeAssignmentLength + maxHoistedExportsNodeAssignmentLength);
+
+	              var hoistedExportsNode = t.identifier("undefined");
+
+	              nonHoistedExportNamesChunk.forEach(function (name) {
+	                hoistedExportsNode = buildExportsAssignment(t.identifier(name), hoistedExportsNode).expression;
+	              });
+
+	              var node = t.expressionStatement(hoistedExportsNode);
+	              node._blockHoist = 3;
+
+	              topNodes.unshift(node);
+	            };
+
+	            for (var currentExportsNodeAssignmentLength = 0; currentExportsNodeAssignmentLength < nonHoistedExportNamesArr.length; currentExportsNodeAssignmentLength += maxHoistedExportsNodeAssignmentLength) {
+	              _loop(currentExportsNodeAssignmentLength);
+	            }
+	          }
+
+	          if (hasExports && !strict) {
+	            var buildTemplate = buildExportsModuleDeclaration;
+	            if (this.opts.loose) buildTemplate = buildLooseExportsModuleDeclaration;
+
+	            var declar = buildTemplate();
+	            declar._blockHoist = 3;
+
+	            topNodes.unshift(declar);
+	          }
+
+	          path.unshiftContainer("body", topNodes);
+	          path.traverse(reassignmentVisitor, {
+	            remaps: remaps,
+	            scope: scope,
+	            exports: exports,
+	            requeueInParent: function requeueInParent(newPath) {
+	              return path.requeue(newPath);
+	            }
+	          });
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _path2 = __webpack_require__(17);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildRequire = (0, _babelTemplate2.default)("\n  require($0);\n");
+
+	var buildExportsModuleDeclaration = (0, _babelTemplate2.default)("\n  Object.defineProperty(exports, \"__esModule\", {\n    value: true\n  });\n");
+
+	var buildExportsFrom = (0, _babelTemplate2.default)("\n  Object.defineProperty(exports, $0, {\n    enumerable: true,\n    get: function () {\n      return $1;\n    }\n  });\n");
+
+	var buildLooseExportsModuleDeclaration = (0, _babelTemplate2.default)("\n  exports.__esModule = true;\n");
+
+	var buildExportsAssignment = (0, _babelTemplate2.default)("\n  exports.$0 = $1;\n");
+
+	var buildExportAll = (0, _babelTemplate2.default)("\n  Object.keys(OBJECT).forEach(function (key) {\n    if (key === \"default\" || key === \"__esModule\") return;\n    Object.defineProperty(exports, key, {\n      enumerable: true,\n      get: function () {\n        return OBJECT[key];\n      }\n    });\n  });\n");
+
+	var THIS_BREAK_KEYS = ["FunctionExpression", "FunctionDeclaration", "ClassProperty", "ClassMethod", "ObjectMethod"];
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 76 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function Property(path, node, scope, getObjectRef, file) {
+	    var replaceSupers = new _babelHelperReplaceSupers2.default({
+	      getObjectRef: getObjectRef,
+	      methodNode: node,
+	      methodPath: path,
+	      isStatic: true,
+	      scope: scope,
+	      file: file
+	    });
+
+	    replaceSupers.replace();
+	  }
+
+	  var CONTAINS_SUPER = (0, _symbol2.default)();
+
+	  return {
+	    visitor: {
+	      Super: function Super(path) {
+	        var parentObj = path.findParent(function (path) {
+	          return path.isObjectExpression();
+	        });
+	        if (parentObj) parentObj.node[CONTAINS_SUPER] = true;
+	      },
+
+	      ObjectExpression: {
+	        exit: function exit(path, file) {
+	          if (!path.node[CONTAINS_SUPER]) return;
+
+	          var objectRef = void 0;
+	          var getObjectRef = function getObjectRef() {
+	            return objectRef = objectRef || path.scope.generateUidIdentifier("obj");
+	          };
+
+	          var propPaths = path.get("properties");
+	          for (var _iterator = propPaths, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	            var _ref2;
+
+	            if (_isArray) {
+	              if (_i >= _iterator.length) break;
+	              _ref2 = _iterator[_i++];
+	            } else {
+	              _i = _iterator.next();
+	              if (_i.done) break;
+	              _ref2 = _i.value;
+	            }
+
+	            var propPath = _ref2;
+
+	            if (propPath.isObjectProperty()) propPath = propPath.get("value");
+	            Property(propPath, propPath.node, path.scope, getObjectRef, file);
+	          }
+
+	          if (objectRef) {
+	            path.scope.push({ id: objectRef });
+	            path.replaceWith(t.assignmentExpression("=", objectRef, path.node));
+	          }
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _babelHelperReplaceSupers = __webpack_require__(189);
+
+	var _babelHelperReplaceSupers2 = _interopRequireDefault(_babelHelperReplaceSupers);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 77 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function () {
+	  return {
+	    visitor: _babelTraverse.visitors.merge([{
+	      ArrowFunctionExpression: function ArrowFunctionExpression(path) {
+	        var params = path.get("params");
+	        for (var _iterator = params, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	          var _ref;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref = _i.value;
+	          }
+
+	          var param = _ref;
+
+	          if (param.isRestElement() || param.isAssignmentPattern()) {
+	            path.arrowFunctionToShadowed();
+	            break;
+	          }
+	        }
+	      }
+	    }, destructuring.visitor, rest.visitor, def.visitor])
+	  };
+	};
+
+	var _babelTraverse = __webpack_require__(7);
+
+	var _destructuring = __webpack_require__(330);
+
+	var destructuring = _interopRequireWildcard(_destructuring);
+
+	var _default = __webpack_require__(329);
+
+	var def = _interopRequireWildcard(_default);
+
+	var _rest = __webpack_require__(331);
+
+	var rest = _interopRequireWildcard(_rest);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 78 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    visitor: {
+	      ObjectMethod: function ObjectMethod(path) {
+	        var node = path.node;
+
+	        if (node.kind === "method") {
+	          var func = t.functionExpression(null, node.params, node.body, node.generator, node.async);
+	          func.returnType = node.returnType;
+
+	          path.replaceWith(t.objectProperty(node.key, func, node.computed));
+	        }
+	      },
+	      ObjectProperty: function ObjectProperty(_ref) {
+	        var node = _ref.node;
+
+	        if (node.shorthand) {
+	          node.shorthand = false;
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 79 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function getSpreadLiteral(spread, scope, state) {
+	    if (state.opts.loose && !t.isIdentifier(spread.argument, { name: "arguments" })) {
+	      return spread.argument;
+	    } else {
+	      return scope.toArray(spread.argument, true);
+	    }
+	  }
+
+	  function hasSpread(nodes) {
+	    for (var i = 0; i < nodes.length; i++) {
+	      if (t.isSpreadElement(nodes[i])) {
+	        return true;
+	      }
+	    }
+	    return false;
+	  }
+
+	  function build(props, scope, state) {
+	    var nodes = [];
+
+	    var _props = [];
+
+	    function push() {
+	      if (!_props.length) return;
+	      nodes.push(t.arrayExpression(_props));
+	      _props = [];
+	    }
+
+	    for (var _iterator = props, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref2;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref2 = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref2 = _i.value;
+	      }
+
+	      var prop = _ref2;
+
+	      if (t.isSpreadElement(prop)) {
+	        push();
+	        nodes.push(getSpreadLiteral(prop, scope, state));
+	      } else {
+	        _props.push(prop);
+	      }
+	    }
+
+	    push();
+
+	    return nodes;
+	  }
+
+	  return {
+	    visitor: {
+	      ArrayExpression: function ArrayExpression(path, state) {
+	        var node = path.node,
+	            scope = path.scope;
+
+	        var elements = node.elements;
+	        if (!hasSpread(elements)) return;
+
+	        var nodes = build(elements, scope, state);
+	        var first = nodes.shift();
+
+	        if (!t.isArrayExpression(first)) {
+	          nodes.unshift(first);
+	          first = t.arrayExpression([]);
+	        }
+
+	        path.replaceWith(t.callExpression(t.memberExpression(first, t.identifier("concat")), nodes));
+	      },
+	      CallExpression: function CallExpression(path, state) {
+	        var node = path.node,
+	            scope = path.scope;
+
+	        var args = node.arguments;
+	        if (!hasSpread(args)) return;
+
+	        var calleePath = path.get("callee");
+	        if (calleePath.isSuper()) return;
+
+	        var contextLiteral = t.identifier("undefined");
+
+	        node.arguments = [];
+
+	        var nodes = void 0;
+	        if (args.length === 1 && args[0].argument.name === "arguments") {
+	          nodes = [args[0].argument];
+	        } else {
+	          nodes = build(args, scope, state);
+	        }
+
+	        var first = nodes.shift();
+	        if (nodes.length) {
+	          node.arguments.push(t.callExpression(t.memberExpression(first, t.identifier("concat")), nodes));
+	        } else {
+	          node.arguments.push(first);
+	        }
+
+	        var callee = node.callee;
+
+	        if (calleePath.isMemberExpression()) {
+	          var temp = scope.maybeGenerateMemoised(callee.object);
+	          if (temp) {
+	            callee.object = t.assignmentExpression("=", temp, callee.object);
+	            contextLiteral = temp;
+	          } else {
+	            contextLiteral = callee.object;
+	          }
+	          t.appendToMemberExpression(callee, t.identifier("apply"));
+	        } else {
+	          node.callee = t.memberExpression(node.callee, t.identifier("apply"));
+	        }
+
+	        if (t.isSuper(contextLiteral)) {
+	          contextLiteral = t.thisExpression();
+	        }
+
+	        node.arguments.unshift(contextLiteral);
+	      },
+	      NewExpression: function NewExpression(path, state) {
+	        var node = path.node,
+	            scope = path.scope;
+
+	        var args = node.arguments;
+	        if (!hasSpread(args)) return;
+
+	        var nodes = build(args, scope, state);
+
+	        var context = t.arrayExpression([t.nullLiteral()]);
+
+	        args = t.callExpression(t.memberExpression(context, t.identifier("concat")), nodes);
+
+	        path.replaceWith(t.newExpression(t.callExpression(t.memberExpression(t.memberExpression(t.memberExpression(t.identifier("Function"), t.identifier("prototype")), t.identifier("bind")), t.identifier("apply")), [node.callee, args]), []));
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 80 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    visitor: {
+	      RegExpLiteral: function RegExpLiteral(path) {
+	        var node = path.node;
+
+	        if (!regex.is(node, "y")) return;
+
+	        path.replaceWith(t.newExpression(t.identifier("RegExp"), [t.stringLiteral(node.pattern), t.stringLiteral(node.flags)]));
+	      }
+	    }
+	  };
+	};
+
+	var _babelHelperRegex = __webpack_require__(188);
+
+	var regex = _interopRequireWildcard(_babelHelperRegex);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 81 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function isString(node) {
+	    return t.isLiteral(node) && typeof node.value === "string";
+	  }
+
+	  function buildBinaryExpression(left, right) {
+	    return t.binaryExpression("+", left, right);
+	  }
+
+	  return {
+	    visitor: {
+	      TaggedTemplateExpression: function TaggedTemplateExpression(path, state) {
+	        var node = path.node;
+
+	        var quasi = node.quasi;
+	        var args = [];
+
+	        var strings = [];
+	        var raw = [];
+
+	        for (var _iterator = quasi.quasis, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	          var _ref2;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref2 = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref2 = _i.value;
+	          }
+
+	          var elem = _ref2;
+
+	          strings.push(t.stringLiteral(elem.value.cooked));
+	          raw.push(t.stringLiteral(elem.value.raw));
+	        }
+
+	        strings = t.arrayExpression(strings);
+	        raw = t.arrayExpression(raw);
+
+	        var templateName = "taggedTemplateLiteral";
+	        if (state.opts.loose) templateName += "Loose";
+
+	        var templateObject = state.file.addTemplateObject(templateName, strings, raw);
+	        args.push(templateObject);
+
+	        args = args.concat(quasi.expressions);
+
+	        path.replaceWith(t.callExpression(node.tag, args));
+	      },
+	      TemplateLiteral: function TemplateLiteral(path, state) {
+	        var nodes = [];
+
+	        var expressions = path.get("expressions");
+
+	        for (var _iterator2 = path.node.quasis, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	          var _ref3;
+
+	          if (_isArray2) {
+	            if (_i2 >= _iterator2.length) break;
+	            _ref3 = _iterator2[_i2++];
+	          } else {
+	            _i2 = _iterator2.next();
+	            if (_i2.done) break;
+	            _ref3 = _i2.value;
+	          }
+
+	          var elem = _ref3;
+
+	          nodes.push(t.stringLiteral(elem.value.cooked));
+
+	          var expr = expressions.shift();
+	          if (expr) {
+	            if (state.opts.spec && !expr.isBaseType("string") && !expr.isBaseType("number")) {
+	              nodes.push(t.callExpression(t.identifier("String"), [expr.node]));
+	            } else {
+	              nodes.push(expr.node);
+	            }
+	          }
+	        }
+
+	        nodes = nodes.filter(function (n) {
+	          return !t.isLiteral(n, { value: "" });
+	        });
+
+	        if (!isString(nodes[0]) && !isString(nodes[1])) {
+	          nodes.unshift(t.stringLiteral(""));
+	        }
+
+	        if (nodes.length > 1) {
+	          var root = buildBinaryExpression(nodes.shift(), nodes.shift());
+
+	          for (var _iterator3 = nodes, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	            var _ref4;
+
+	            if (_isArray3) {
+	              if (_i3 >= _iterator3.length) break;
+	              _ref4 = _iterator3[_i3++];
+	            } else {
+	              _i3 = _iterator3.next();
+	              if (_i3.done) break;
+	              _ref4 = _i3.value;
+	            }
+
+	            var node = _ref4;
+
+	            root = buildBinaryExpression(root, node);
+	          }
+
+	          path.replaceWith(root);
+	        } else {
+	          path.replaceWith(nodes[0]);
+	        }
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 82 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  var IGNORE = (0, _symbol2.default)();
+
+	  return {
+	    visitor: {
+	      Scope: function Scope(_ref2) {
+	        var scope = _ref2.scope;
+
+	        if (!scope.getBinding("Symbol")) {
+	          return;
+	        }
+
+	        scope.rename("Symbol");
+	      },
+	      UnaryExpression: function UnaryExpression(path) {
+	        var node = path.node,
+	            parent = path.parent;
+
+	        if (node[IGNORE]) return;
+	        if (path.find(function (path) {
+	          return path.node && !!path.node._generated;
+	        })) return;
+
+	        if (path.parentPath.isBinaryExpression() && t.EQUALITY_BINARY_OPERATORS.indexOf(parent.operator) >= 0) {
+	          var opposite = path.getOpposite();
+	          if (opposite.isLiteral() && opposite.node.value !== "symbol" && opposite.node.value !== "object") {
+	            return;
+	          }
+	        }
+
+	        if (node.operator === "typeof") {
+	          var call = t.callExpression(this.addHelper("typeof"), [node.argument]);
+	          if (path.get("argument").isIdentifier()) {
+	            var undefLiteral = t.stringLiteral("undefined");
+	            var unary = t.unaryExpression("typeof", node.argument);
+	            unary[IGNORE] = true;
+	            path.replaceWith(t.conditionalExpression(t.binaryExpression("===", unary, undefLiteral), undefLiteral, call));
+	          } else {
+	            path.replaceWith(call);
+	          }
+	        }
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 83 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    visitor: {
+	      RegExpLiteral: function RegExpLiteral(_ref) {
+	        var node = _ref.node;
+
+	        if (!regex.is(node, "u")) return;
+	        node.pattern = (0, _regexpuCore2.default)(node.pattern, node.flags);
+	        regex.pullFlag(node, "u");
+	      }
+	    }
+	  };
+	};
+
+	var _regexpuCore = __webpack_require__(603);
+
+	var _regexpuCore2 = _interopRequireDefault(_regexpuCore);
+
+	var _babelHelperRegex = __webpack_require__(188);
+
+	var regex = _interopRequireWildcard(_babelHelperRegex);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 84 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = __webpack_require__(597);
+
+/***/ }),
+/* 85 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(404), __esModule: true };
+
+/***/ }),
+/* 86 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.scope = exports.path = undefined;
+
+	var _weakMap = __webpack_require__(360);
+
+	var _weakMap2 = _interopRequireDefault(_weakMap);
+
+	exports.clear = clear;
+	exports.clearPath = clearPath;
+	exports.clearScope = clearScope;
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var path = exports.path = new _weakMap2.default();
+	var scope = exports.scope = new _weakMap2.default();
+
+	function clear() {
+	  clearPath();
+	  clearScope();
+	}
+
+	function clearPath() {
+	  exports.path = path = new _weakMap2.default();
+	}
+
+	function clearScope() {
+	  exports.scope = scope = new _weakMap2.default();
+	}
+
+/***/ }),
+/* 87 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+	/* eslint max-len: 0 */
+
+	// This is a trick taken from Esprima. It turns out that, on
+	// non-Chrome browsers, to check whether a string is in a set, a
+	// predicate containing a big ugly `switch` statement is faster than
+	// a regular expression, and on Chrome the two are about on par.
+	// This function uses `eval` (non-lexical) to produce such a
+	// predicate from a space-separated string of words.
+	//
+	// It starts by sorting the words by length.
+
+	function makePredicate(words) {
+	  words = words.split(" ");
+	  return function (str) {
+	    return words.indexOf(str) >= 0;
+	  };
+	}
+
+	// Reserved word lists for various dialects of the language
+
+	var reservedWords = {
+	  6: makePredicate("enum await"),
+	  strict: makePredicate("implements interface let package private protected public static yield"),
+	  strictBind: makePredicate("eval arguments")
+	};
+
+	// And the keywords
+
+	var isKeyword = makePredicate("break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this let const class extends export import yield super");
+
+	// ## Character categories
+
+	// Big ugly regular expressions that match characters in the
+	// whitespace, identifier, and identifier-start categories. These
+	// are only applied when a character is found to actually have a
+	// code point above 128.
+	// Generated by `bin/generate-identifier-regex.js`.
+
+	var nonASCIIidentifierStartChars = '\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AE\uA7B0-\uA7B7\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC';
+	var nonASCIIidentifierChars = '\u200C\u200D\xB7\u0300-\u036F\u0387\u0483-\u0487\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u0610-\u061A\u064B-\u0669\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7\u06E8\u06EA-\u06ED\u06F0-\u06F9\u0711\u0730-\u074A\u07A6-\u07B0\u07C0-\u07C9\u07EB-\u07F3\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0859-\u085B\u08D4-\u08E1\u08E3-\u0903\u093A-\u093C\u093E-\u094F\u0951-\u0957\u0962\u0963\u0966-\u096F\u0981-\u0983\u09BC\u09BE-\u09C4\u09C7\u09C8\u09CB-\u09CD\u09D7\u09E2\u09E3\u09E6-\u09EF\u0A01-\u0A03\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A66-\u0A71\u0A75\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AE2\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B3C\u0B3E-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B62\u0B63\u0B66-\u0B6F\u0B82\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C62\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0CBC\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CE2\u0CE3\u0CE6-\u0CEF\u0D01-\u0D03\u0D3E-\u0D44\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0D62\u0D63\u0D66-\u0D6F\u0D82\u0D83\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0E50-\u0E59\u0EB1\u0EB4-\u0EB9\u0EBB\u0EBC\u0EC8-\u0ECD\u0ED0-\u0ED9\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E\u0F3F\u0F71-\u0F84\u0F86\u0F87\u0F8D-\u0F97\u0F99-\u0FBC\u0FC6\u102B-\u103E\u1040-\u1049\u1056-\u1059\u105E-\u1060\u1062-\u1064\u1067-\u106D\u1071-\u1074\u1082-\u108D\u108F-\u109D\u135D-\u135F\u1369-\u1371\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17B4-\u17D3\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u18A9\u1920-\u192B\u1930-\u193B\u1946-\u194F\u19D0-\u19DA\u1A17-\u1A1B\u1A55-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AB0-\u1ABD\u1B00-\u1B04\u1B34-\u1B44\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1B82\u1BA1-\u1BAD\u1BB0-\u1BB9\u1BE6-\u1BF3\u1C24-\u1C37\u1C40-\u1C49\u1C50-\u1C59\u1CD0-\u1CD2\u1CD4-\u1CE8\u1CED\u1CF2-\u1CF4\u1CF8\u1CF9\u1DC0-\u1DF5\u1DFB-\u1DFF\u203F\u2040\u2054\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2CEF-\u2CF1\u2D7F\u2DE0-\u2DFF\u302A-\u302F\u3099\u309A\uA620-\uA629\uA66F\uA674-\uA67D\uA69E\uA69F\uA6F0\uA6F1\uA802\uA806\uA80B\uA823-\uA827\uA880\uA881\uA8B4-\uA8C5\uA8D0-\uA8D9\uA8E0-\uA8F1\uA900-\uA909\uA926-\uA92D\uA947-\uA953\uA980-\uA983\uA9B3-\uA9C0\uA9D0-\uA9D9\uA9E5\uA9F0-\uA9F9\uAA29-\uAA36\uAA43\uAA4C\uAA4D\uAA50-\uAA59\uAA7B-\uAA7D\uAAB0\uAAB2-\uAAB4\uAAB7\uAAB8\uAABE\uAABF\uAAC1\uAAEB-\uAAEF\uAAF5\uAAF6\uABE3-\uABEA\uABEC\uABED\uABF0-\uABF9\uFB1E\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFF10-\uFF19\uFF3F';
+
+	var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
+	var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
+
+	nonASCIIidentifierStartChars = nonASCIIidentifierChars = null;
+
+	// These are a run-length and offset encoded representation of the
+	// >0xffff code points that are a valid part of identifiers. The
+	// offset starts at 0x10000, and each pair of numbers represents an
+	// offset to the next range, and then a size of the range. They were
+	// generated by `bin/generate-identifier-regex.js`.
+	// eslint-disable-next-line comma-spacing
+	var astralIdentifierStartCodes = [0, 11, 2, 25, 2, 18, 2, 1, 2, 14, 3, 13, 35, 122, 70, 52, 268, 28, 4, 48, 48, 31, 17, 26, 6, 37, 11, 29, 3, 35, 5, 7, 2, 4, 43, 157, 19, 35, 5, 35, 5, 39, 9, 51, 157, 310, 10, 21, 11, 7, 153, 5, 3, 0, 2, 43, 2, 1, 4, 0, 3, 22, 11, 22, 10, 30, 66, 18, 2, 1, 11, 21, 11, 25, 71, 55, 7, 1, 65, 0, 16, 3, 2, 2, 2, 26, 45, 28, 4, 28, 36, 7, 2, 27, 28, 53, 11, 21, 11, 18, 14, 17, 111, 72, 56, 50, 14, 50, 785, 52, 76, 44, 33, 24, 27, 35, 42, 34, 4, 0, 13, 47, 15, 3, 22, 0, 2, 0, 36, 17, 2, 24, 85, 6, 2, 0, 2, 3, 2, 14, 2, 9, 8, 46, 39, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 4, 0, 19, 0, 13, 4, 159, 52, 19, 3, 54, 47, 21, 1, 2, 0, 185, 46, 42, 3, 37, 47, 21, 0, 60, 42, 86, 25, 391, 63, 32, 0, 449, 56, 264, 8, 2, 36, 18, 0, 50, 29, 881, 921, 103, 110, 18, 195, 2749, 1070, 4050, 582, 8634, 568, 8, 30, 114, 29, 19, 47, 17, 3, 32, 20, 6, 18, 881, 68, 12, 0, 67, 12, 65, 0, 32, 6124, 20, 754, 9486, 1, 3071, 106, 6, 12, 4, 8, 8, 9, 5991, 84, 2, 70, 2, 1, 3, 0, 3, 1, 3, 3, 2, 11, 2, 0, 2, 6, 2, 64, 2, 3, 3, 7, 2, 6, 2, 27, 2, 3, 2, 4, 2, 0, 4, 6, 2, 339, 3, 24, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 30, 2, 24, 2, 7, 4149, 196, 60, 67, 1213, 3, 2, 26, 2, 1, 2, 0, 3, 0, 2, 9, 2, 3, 2, 0, 2, 0, 7, 0, 5, 0, 2, 0, 2, 0, 2, 2, 2, 1, 2, 0, 3, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 1, 2, 0, 3, 3, 2, 6, 2, 3, 2, 3, 2, 0, 2, 9, 2, 16, 6, 2, 2, 4, 2, 16, 4421, 42710, 42, 4148, 12, 221, 3, 5761, 10591, 541];
+	// eslint-disable-next-line comma-spacing
+	var astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 1306, 2, 54, 14, 32, 9, 16, 3, 46, 10, 54, 9, 7, 2, 37, 13, 2, 9, 52, 0, 13, 2, 49, 13, 10, 2, 4, 9, 83, 11, 7, 0, 161, 11, 6, 9, 7, 3, 57, 0, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 87, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 423, 9, 838, 7, 2, 7, 17, 9, 57, 21, 2, 13, 19882, 9, 135, 4, 60, 6, 26, 9, 1016, 45, 17, 3, 19723, 1, 5319, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 2214, 6, 110, 6, 6, 9, 792487, 239];
+
+	// This has a complexity linear to the value of the code. The
+	// assumption is that looking up astral identifier characters is
+	// rare.
+	function isInAstralSet(code, set) {
+	  var pos = 0x10000;
+	  for (var i = 0; i < set.length; i += 2) {
+	    pos += set[i];
+	    if (pos > code) return false;
+
+	    pos += set[i + 1];
+	    if (pos >= code) return true;
+	  }
+	}
+
+	// Test whether a given character code starts an identifier.
+
+	function isIdentifierStart(code) {
+	  if (code < 65) return code === 36;
+	  if (code < 91) return true;
+	  if (code < 97) return code === 95;
+	  if (code < 123) return true;
+	  if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code));
+	  return isInAstralSet(code, astralIdentifierStartCodes);
+	}
+
+	// Test whether a given character is part of an identifier.
+
+	function isIdentifierChar(code) {
+	  if (code < 48) return code === 36;
+	  if (code < 58) return true;
+	  if (code < 65) return false;
+	  if (code < 91) return true;
+	  if (code < 97) return code === 95;
+	  if (code < 123) return true;
+	  if (code <= 0xffff) return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code));
+	  return isInAstralSet(code, astralIdentifierStartCodes) || isInAstralSet(code, astralIdentifierCodes);
+	}
+
+	// A second optional argument can be given to further configure
+	var defaultOptions = {
+	  // Source type ("script" or "module") for different semantics
+	  sourceType: "script",
+	  // Source filename.
+	  sourceFilename: undefined,
+	  // Line from which to start counting source. Useful for
+	  // integration with other tools.
+	  startLine: 1,
+	  // When enabled, a return at the top level is not considered an
+	  // error.
+	  allowReturnOutsideFunction: false,
+	  // When enabled, import/export statements are not constrained to
+	  // appearing at the top of the program.
+	  allowImportExportEverywhere: false,
+	  // TODO
+	  allowSuperOutsideMethod: false,
+	  // An array of plugins to enable
+	  plugins: [],
+	  // TODO
+	  strictMode: null
+	};
+
+	// Interpret and default an options object
+
+	function getOptions(opts) {
+	  var options = {};
+	  for (var key in defaultOptions) {
+	    options[key] = opts && key in opts ? opts[key] : defaultOptions[key];
+	  }
+	  return options;
+	}
+
+	var _typeof = typeof Symbol === "function" && _typeof2(Symbol.iterator) === "symbol" ? function (obj) {
+	  return typeof obj === 'undefined' ? 'undefined' : _typeof2(obj);
+	} : function (obj) {
+	  return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === 'undefined' ? 'undefined' : _typeof2(obj);
+	};
+
+	var classCallCheck = function classCallCheck(instance, Constructor) {
+	  if (!(instance instanceof Constructor)) {
+	    throw new TypeError("Cannot call a class as a function");
+	  }
+	};
+
+	var inherits = function inherits(subClass, superClass) {
+	  if (typeof superClass !== "function" && superClass !== null) {
+	    throw new TypeError("Super expression must either be null or a function, not " + (typeof superClass === 'undefined' ? 'undefined' : _typeof2(superClass)));
+	  }
+
+	  subClass.prototype = Object.create(superClass && superClass.prototype, {
+	    constructor: {
+	      value: subClass,
+	      enumerable: false,
+	      writable: true,
+	      configurable: true
+	    }
+	  });
+	  if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+	};
+
+	var possibleConstructorReturn = function possibleConstructorReturn(self, call) {
+	  if (!self) {
+	    throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+	  }
+
+	  return call && ((typeof call === 'undefined' ? 'undefined' : _typeof2(call)) === "object" || typeof call === "function") ? call : self;
+	};
+
+	// ## Token types
+
+	// The assignment of fine-grained, information-carrying type objects
+	// allows the tokenizer to store the information it has about a
+	// token in a way that is very cheap for the parser to look up.
+
+	// All token type variables start with an underscore, to make them
+	// easy to recognize.
+
+	// The `beforeExpr` property is used to disambiguate between regular
+	// expressions and divisions. It is set on all token types that can
+	// be followed by an expression (thus, a slash after them would be a
+	// regular expression).
+	//
+	// `isLoop` marks a keyword as starting a loop, which is important
+	// to know when parsing a label, in order to allow or disallow
+	// continue jumps to that label.
+
+	var beforeExpr = true;
+	var startsExpr = true;
+	var isLoop = true;
+	var isAssign = true;
+	var prefix = true;
+	var postfix = true;
+
+	var TokenType = function TokenType(label) {
+	  var conf = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	  classCallCheck(this, TokenType);
+
+	  this.label = label;
+	  this.keyword = conf.keyword;
+	  this.beforeExpr = !!conf.beforeExpr;
+	  this.startsExpr = !!conf.startsExpr;
+	  this.rightAssociative = !!conf.rightAssociative;
+	  this.isLoop = !!conf.isLoop;
+	  this.isAssign = !!conf.isAssign;
+	  this.prefix = !!conf.prefix;
+	  this.postfix = !!conf.postfix;
+	  this.binop = conf.binop || null;
+	  this.updateContext = null;
+	};
+
+	var KeywordTokenType = function (_TokenType) {
+	  inherits(KeywordTokenType, _TokenType);
+
+	  function KeywordTokenType(name) {
+	    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	    classCallCheck(this, KeywordTokenType);
+
+	    options.keyword = name;
+
+	    return possibleConstructorReturn(this, _TokenType.call(this, name, options));
+	  }
+
+	  return KeywordTokenType;
+	}(TokenType);
+
+	var BinopTokenType = function (_TokenType2) {
+	  inherits(BinopTokenType, _TokenType2);
+
+	  function BinopTokenType(name, prec) {
+	    classCallCheck(this, BinopTokenType);
+	    return possibleConstructorReturn(this, _TokenType2.call(this, name, { beforeExpr: beforeExpr, binop: prec }));
+	  }
+
+	  return BinopTokenType;
+	}(TokenType);
+
+	var types = {
+	  num: new TokenType("num", { startsExpr: startsExpr }),
+	  regexp: new TokenType("regexp", { startsExpr: startsExpr }),
+	  string: new TokenType("string", { startsExpr: startsExpr }),
+	  name: new TokenType("name", { startsExpr: startsExpr }),
+	  eof: new TokenType("eof"),
+
+	  // Punctuation token types.
+	  bracketL: new TokenType("[", { beforeExpr: beforeExpr, startsExpr: startsExpr }),
+	  bracketR: new TokenType("]"),
+	  braceL: new TokenType("{", { beforeExpr: beforeExpr, startsExpr: startsExpr }),
+	  braceBarL: new TokenType("{|", { beforeExpr: beforeExpr, startsExpr: startsExpr }),
+	  braceR: new TokenType("}"),
+	  braceBarR: new TokenType("|}"),
+	  parenL: new TokenType("(", { beforeExpr: beforeExpr, startsExpr: startsExpr }),
+	  parenR: new TokenType(")"),
+	  comma: new TokenType(",", { beforeExpr: beforeExpr }),
+	  semi: new TokenType(";", { beforeExpr: beforeExpr }),
+	  colon: new TokenType(":", { beforeExpr: beforeExpr }),
+	  doubleColon: new TokenType("::", { beforeExpr: beforeExpr }),
+	  dot: new TokenType("."),
+	  question: new TokenType("?", { beforeExpr: beforeExpr }),
+	  arrow: new TokenType("=>", { beforeExpr: beforeExpr }),
+	  template: new TokenType("template"),
+	  ellipsis: new TokenType("...", { beforeExpr: beforeExpr }),
+	  backQuote: new TokenType("`", { startsExpr: startsExpr }),
+	  dollarBraceL: new TokenType("${", { beforeExpr: beforeExpr, startsExpr: startsExpr }),
+	  at: new TokenType("@"),
+
+	  // Operators. These carry several kinds of properties to help the
+	  // parser use them properly (the presence of these properties is
+	  // what categorizes them as operators).
+	  //
+	  // `binop`, when present, specifies that this operator is a binary
+	  // operator, and will refer to its precedence.
+	  //
+	  // `prefix` and `postfix` mark the operator as a prefix or postfix
+	  // unary operator.
+	  //
+	  // `isAssign` marks all of `=`, `+=`, `-=` etcetera, which act as
+	  // binary operators with a very low precedence, that should result
+	  // in AssignmentExpression nodes.
+
+	  eq: new TokenType("=", { beforeExpr: beforeExpr, isAssign: isAssign }),
+	  assign: new TokenType("_=", { beforeExpr: beforeExpr, isAssign: isAssign }),
+	  incDec: new TokenType("++/--", { prefix: prefix, postfix: postfix, startsExpr: startsExpr }),
+	  prefix: new TokenType("prefix", { beforeExpr: beforeExpr, prefix: prefix, startsExpr: startsExpr }),
+	  logicalOR: new BinopTokenType("||", 1),
+	  logicalAND: new BinopTokenType("&&", 2),
+	  bitwiseOR: new BinopTokenType("|", 3),
+	  bitwiseXOR: new BinopTokenType("^", 4),
+	  bitwiseAND: new BinopTokenType("&", 5),
+	  equality: new BinopTokenType("==/!=", 6),
+	  relational: new BinopTokenType("</>", 7),
+	  bitShift: new BinopTokenType("<</>>", 8),
+	  plusMin: new TokenType("+/-", { beforeExpr: beforeExpr, binop: 9, prefix: prefix, startsExpr: startsExpr }),
+	  modulo: new BinopTokenType("%", 10),
+	  star: new BinopTokenType("*", 10),
+	  slash: new BinopTokenType("/", 10),
+	  exponent: new TokenType("**", { beforeExpr: beforeExpr, binop: 11, rightAssociative: true })
+	};
+
+	var keywords = {
+	  "break": new KeywordTokenType("break"),
+	  "case": new KeywordTokenType("case", { beforeExpr: beforeExpr }),
+	  "catch": new KeywordTokenType("catch"),
+	  "continue": new KeywordTokenType("continue"),
+	  "debugger": new KeywordTokenType("debugger"),
+	  "default": new KeywordTokenType("default", { beforeExpr: beforeExpr }),
+	  "do": new KeywordTokenType("do", { isLoop: isLoop, beforeExpr: beforeExpr }),
+	  "else": new KeywordTokenType("else", { beforeExpr: beforeExpr }),
+	  "finally": new KeywordTokenType("finally"),
+	  "for": new KeywordTokenType("for", { isLoop: isLoop }),
+	  "function": new KeywordTokenType("function", { startsExpr: startsExpr }),
+	  "if": new KeywordTokenType("if"),
+	  "return": new KeywordTokenType("return", { beforeExpr: beforeExpr }),
+	  "switch": new KeywordTokenType("switch"),
+	  "throw": new KeywordTokenType("throw", { beforeExpr: beforeExpr }),
+	  "try": new KeywordTokenType("try"),
+	  "var": new KeywordTokenType("var"),
+	  "let": new KeywordTokenType("let"),
+	  "const": new KeywordTokenType("const"),
+	  "while": new KeywordTokenType("while", { isLoop: isLoop }),
+	  "with": new KeywordTokenType("with"),
+	  "new": new KeywordTokenType("new", { beforeExpr: beforeExpr, startsExpr: startsExpr }),
+	  "this": new KeywordTokenType("this", { startsExpr: startsExpr }),
+	  "super": new KeywordTokenType("super", { startsExpr: startsExpr }),
+	  "class": new KeywordTokenType("class"),
+	  "extends": new KeywordTokenType("extends", { beforeExpr: beforeExpr }),
+	  "export": new KeywordTokenType("export"),
+	  "import": new KeywordTokenType("import", { startsExpr: startsExpr }),
+	  "yield": new KeywordTokenType("yield", { beforeExpr: beforeExpr, startsExpr: startsExpr }),
+	  "null": new KeywordTokenType("null", { startsExpr: startsExpr }),
+	  "true": new KeywordTokenType("true", { startsExpr: startsExpr }),
+	  "false": new KeywordTokenType("false", { startsExpr: startsExpr }),
+	  "in": new KeywordTokenType("in", { beforeExpr: beforeExpr, binop: 7 }),
+	  "instanceof": new KeywordTokenType("instanceof", { beforeExpr: beforeExpr, binop: 7 }),
+	  "typeof": new KeywordTokenType("typeof", { beforeExpr: beforeExpr, prefix: prefix, startsExpr: startsExpr }),
+	  "void": new KeywordTokenType("void", { beforeExpr: beforeExpr, prefix: prefix, startsExpr: startsExpr }),
+	  "delete": new KeywordTokenType("delete", { beforeExpr: beforeExpr, prefix: prefix, startsExpr: startsExpr })
+	};
+
+	// Map keyword names to token types.
+	Object.keys(keywords).forEach(function (name) {
+	  types["_" + name] = keywords[name];
+	});
+
+	// Matches a whole line break (where CRLF is considered a single
+	// line break). Used to count lines.
+
+	var lineBreak = /\r\n?|\n|\u2028|\u2029/;
+	var lineBreakG = new RegExp(lineBreak.source, "g");
+
+	function isNewLine(code) {
+	  return code === 10 || code === 13 || code === 0x2028 || code === 0x2029;
+	}
+
+	var nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/;
+
+	// The algorithm used to determine whether a regexp can appear at a
+	// given point in the program is loosely based on sweet.js' approach.
+	// See https://github.com/mozilla/sweet.js/wiki/design
+
+	var TokContext = function TokContext(token, isExpr, preserveSpace, override) {
+	  classCallCheck(this, TokContext);
+
+	  this.token = token;
+	  this.isExpr = !!isExpr;
+	  this.preserveSpace = !!preserveSpace;
+	  this.override = override;
+	};
+
+	var types$1 = {
+	  braceStatement: new TokContext("{", false),
+	  braceExpression: new TokContext("{", true),
+	  templateQuasi: new TokContext("${", true),
+	  parenStatement: new TokContext("(", false),
+	  parenExpression: new TokContext("(", true),
+	  template: new TokContext("`", true, true, function (p) {
+	    return p.readTmplToken();
+	  }),
+	  functionExpression: new TokContext("function", true)
+	};
+
+	// Token-specific context update code
+
+	types.parenR.updateContext = types.braceR.updateContext = function () {
+	  if (this.state.context.length === 1) {
+	    this.state.exprAllowed = true;
+	    return;
+	  }
+
+	  var out = this.state.context.pop();
+	  if (out === types$1.braceStatement && this.curContext() === types$1.functionExpression) {
+	    this.state.context.pop();
+	    this.state.exprAllowed = false;
+	  } else if (out === types$1.templateQuasi) {
+	    this.state.exprAllowed = true;
+	  } else {
+	    this.state.exprAllowed = !out.isExpr;
+	  }
+	};
+
+	types.name.updateContext = function (prevType) {
+	  this.state.exprAllowed = false;
+
+	  if (prevType === types._let || prevType === types._const || prevType === types._var) {
+	    if (lineBreak.test(this.input.slice(this.state.end))) {
+	      this.state.exprAllowed = true;
+	    }
+	  }
+	};
+
+	types.braceL.updateContext = function (prevType) {
+	  this.state.context.push(this.braceIsBlock(prevType) ? types$1.braceStatement : types$1.braceExpression);
+	  this.state.exprAllowed = true;
+	};
+
+	types.dollarBraceL.updateContext = function () {
+	  this.state.context.push(types$1.templateQuasi);
+	  this.state.exprAllowed = true;
+	};
+
+	types.parenL.updateContext = function (prevType) {
+	  var statementParens = prevType === types._if || prevType === types._for || prevType === types._with || prevType === types._while;
+	  this.state.context.push(statementParens ? types$1.parenStatement : types$1.parenExpression);
+	  this.state.exprAllowed = true;
+	};
+
+	types.incDec.updateContext = function () {
+	  // tokExprAllowed stays unchanged
+	};
+
+	types._function.updateContext = function () {
+	  if (this.curContext() !== types$1.braceStatement) {
+	    this.state.context.push(types$1.functionExpression);
+	  }
+
+	  this.state.exprAllowed = false;
+	};
+
+	types.backQuote.updateContext = function () {
+	  if (this.curContext() === types$1.template) {
+	    this.state.context.pop();
+	  } else {
+	    this.state.context.push(types$1.template);
+	  }
+	  this.state.exprAllowed = false;
+	};
+
+	// These are used when `options.locations` is on, for the
+	// `startLoc` and `endLoc` properties.
+
+	var Position = function Position(line, col) {
+	  classCallCheck(this, Position);
+
+	  this.line = line;
+	  this.column = col;
+	};
+
+	var SourceLocation = function SourceLocation(start, end) {
+	  classCallCheck(this, SourceLocation);
+
+	  this.start = start;
+	  this.end = end;
+	};
+
+	// The `getLineInfo` function is mostly useful when the
+	// `locations` option is off (for performance reasons) and you
+	// want to find the line/column position for a given character
+	// offset. `input` should be the code string that the offset refers
+	// into.
+
+	function getLineInfo(input, offset) {
+	  for (var line = 1, cur = 0;;) {
+	    lineBreakG.lastIndex = cur;
+	    var match = lineBreakG.exec(input);
+	    if (match && match.index < offset) {
+	      ++line;
+	      cur = match.index + match[0].length;
+	    } else {
+	      return new Position(line, offset - cur);
+	    }
+	  }
+	}
+
+	var State = function () {
+	  function State() {
+	    classCallCheck(this, State);
+	  }
+
+	  State.prototype.init = function init(options, input) {
+	    this.strict = options.strictMode === false ? false : options.sourceType === "module";
+
+	    this.input = input;
+
+	    this.potentialArrowAt = -1;
+
+	    this.inMethod = this.inFunction = this.inGenerator = this.inAsync = this.inPropertyName = this.inType = this.inClassProperty = this.noAnonFunctionType = false;
+
+	    this.labels = [];
+
+	    this.decorators = [];
+
+	    this.tokens = [];
+
+	    this.comments = [];
+
+	    this.trailingComments = [];
+	    this.leadingComments = [];
+	    this.commentStack = [];
+
+	    this.pos = this.lineStart = 0;
+	    this.curLine = options.startLine;
+
+	    this.type = types.eof;
+	    this.value = null;
+	    this.start = this.end = this.pos;
+	    this.startLoc = this.endLoc = this.curPosition();
+
+	    this.lastTokEndLoc = this.lastTokStartLoc = null;
+	    this.lastTokStart = this.lastTokEnd = this.pos;
+
+	    this.context = [types$1.braceStatement];
+	    this.exprAllowed = true;
+
+	    this.containsEsc = this.containsOctal = false;
+	    this.octalPosition = null;
+
+	    this.invalidTemplateEscapePosition = null;
+
+	    this.exportedIdentifiers = [];
+
+	    return this;
+	  };
+
+	  // TODO
+
+
+	  // TODO
+
+
+	  // Used to signify the start of a potential arrow function
+
+
+	  // Flags to track whether we are in a function, a generator.
+
+
+	  // Labels in scope.
+
+
+	  // Leading decorators.
+
+
+	  // Token store.
+
+
+	  // Comment store.
+
+
+	  // Comment attachment store
+
+
+	  // The current position of the tokenizer in the input.
+
+
+	  // Properties of the current token:
+	  // Its type
+
+
+	  // For tokens that include more information than their type, the value
+
+
+	  // Its start and end offset
+
+
+	  // And, if locations are used, the {line, column} object
+	  // corresponding to those offsets
+
+
+	  // Position information for the previous token
+
+
+	  // The context stack is used to superficially track syntactic
+	  // context to predict whether a regular expression is allowed in a
+	  // given position.
+
+
+	  // Used to signal to callers of `readWord1` whether the word
+	  // contained any escape sequences. This is needed because words with
+	  // escape sequences must not be interpreted as keywords.
+
+
+	  // TODO
+
+
+	  // Names of exports store. `default` is stored as a name for both
+	  // `export default foo;` and `export { foo as default };`.
+
+
+	  State.prototype.curPosition = function curPosition() {
+	    return new Position(this.curLine, this.pos - this.lineStart);
+	  };
+
+	  State.prototype.clone = function clone(skipArrays) {
+	    var state = new State();
+	    for (var key in this) {
+	      var val = this[key];
+
+	      if ((!skipArrays || key === "context") && Array.isArray(val)) {
+	        val = val.slice();
+	      }
+
+	      state[key] = val;
+	    }
+	    return state;
+	  };
+
+	  return State;
+	}();
+
+	// Object type used to represent tokens. Note that normally, tokens
+	// simply exist as properties on the parser object. This is only
+	// used for the onToken callback and the external tokenizer.
+
+	var Token = function Token(state) {
+	  classCallCheck(this, Token);
+
+	  this.type = state.type;
+	  this.value = state.value;
+	  this.start = state.start;
+	  this.end = state.end;
+	  this.loc = new SourceLocation(state.startLoc, state.endLoc);
+	};
+
+	// ## Tokenizer
+
+	function codePointToString(code) {
+	  // UTF-16 Decoding
+	  if (code <= 0xFFFF) {
+	    return String.fromCharCode(code);
+	  } else {
+	    return String.fromCharCode((code - 0x10000 >> 10) + 0xD800, (code - 0x10000 & 1023) + 0xDC00);
+	  }
+	}
+
+	var Tokenizer = function () {
+	  function Tokenizer(options, input) {
+	    classCallCheck(this, Tokenizer);
+
+	    this.state = new State();
+	    this.state.init(options, input);
+	  }
+
+	  // Move to the next token
+
+	  Tokenizer.prototype.next = function next() {
+	    if (!this.isLookahead) {
+	      this.state.tokens.push(new Token(this.state));
+	    }
+
+	    this.state.lastTokEnd = this.state.end;
+	    this.state.lastTokStart = this.state.start;
+	    this.state.lastTokEndLoc = this.state.endLoc;
+	    this.state.lastTokStartLoc = this.state.startLoc;
+	    this.nextToken();
+	  };
+
+	  // TODO
+
+	  Tokenizer.prototype.eat = function eat(type) {
+	    if (this.match(type)) {
+	      this.next();
+	      return true;
+	    } else {
+	      return false;
+	    }
+	  };
+
+	  // TODO
+
+	  Tokenizer.prototype.match = function match(type) {
+	    return this.state.type === type;
+	  };
+
+	  // TODO
+
+	  Tokenizer.prototype.isKeyword = function isKeyword$$1(word) {
+	    return isKeyword(word);
+	  };
+
+	  // TODO
+
+	  Tokenizer.prototype.lookahead = function lookahead() {
+	    var old = this.state;
+	    this.state = old.clone(true);
+
+	    this.isLookahead = true;
+	    this.next();
+	    this.isLookahead = false;
+
+	    var curr = this.state.clone(true);
+	    this.state = old;
+	    return curr;
+	  };
+
+	  // Toggle strict mode. Re-reads the next number or string to please
+	  // pedantic tests (`"use strict"; 010;` should fail).
+
+	  Tokenizer.prototype.setStrict = function setStrict(strict) {
+	    this.state.strict = strict;
+	    if (!this.match(types.num) && !this.match(types.string)) return;
+	    this.state.pos = this.state.start;
+	    while (this.state.pos < this.state.lineStart) {
+	      this.state.lineStart = this.input.lastIndexOf("\n", this.state.lineStart - 2) + 1;
+	      --this.state.curLine;
+	    }
+	    this.nextToken();
+	  };
+
+	  Tokenizer.prototype.curContext = function curContext() {
+	    return this.state.context[this.state.context.length - 1];
+	  };
+
+	  // Read a single token, updating the parser object's token-related
+	  // properties.
+
+	  Tokenizer.prototype.nextToken = function nextToken() {
+	    var curContext = this.curContext();
+	    if (!curContext || !curContext.preserveSpace) this.skipSpace();
+
+	    this.state.containsOctal = false;
+	    this.state.octalPosition = null;
+	    this.state.start = this.state.pos;
+	    this.state.startLoc = this.state.curPosition();
+	    if (this.state.pos >= this.input.length) return this.finishToken(types.eof);
+
+	    if (curContext.override) {
+	      return curContext.override(this);
+	    } else {
+	      return this.readToken(this.fullCharCodeAtPos());
+	    }
+	  };
+
+	  Tokenizer.prototype.readToken = function readToken(code) {
+	    // Identifier or keyword. '\uXXXX' sequences are allowed in
+	    // identifiers, so '\' also dispatches to that.
+	    if (isIdentifierStart(code) || code === 92 /* '\' */) {
+	        return this.readWord();
+	      } else {
+	      return this.getTokenFromCode(code);
+	    }
+	  };
+
+	  Tokenizer.prototype.fullCharCodeAtPos = function fullCharCodeAtPos() {
+	    var code = this.input.charCodeAt(this.state.pos);
+	    if (code <= 0xd7ff || code >= 0xe000) return code;
+
+	    var next = this.input.charCodeAt(this.state.pos + 1);
+	    return (code << 10) + next - 0x35fdc00;
+	  };
+
+	  Tokenizer.prototype.pushComment = function pushComment(block, text, start, end, startLoc, endLoc) {
+	    var comment = {
+	      type: block ? "CommentBlock" : "CommentLine",
+	      value: text,
+	      start: start,
+	      end: end,
+	      loc: new SourceLocation(startLoc, endLoc)
+	    };
+
+	    if (!this.isLookahead) {
+	      this.state.tokens.push(comment);
+	      this.state.comments.push(comment);
+	      this.addComment(comment);
+	    }
+	  };
+
+	  Tokenizer.prototype.skipBlockComment = function skipBlockComment() {
+	    var startLoc = this.state.curPosition();
+	    var start = this.state.pos;
+	    var end = this.input.indexOf("*/", this.state.pos += 2);
+	    if (end === -1) this.raise(this.state.pos - 2, "Unterminated comment");
+
+	    this.state.pos = end + 2;
+	    lineBreakG.lastIndex = start;
+	    var match = void 0;
+	    while ((match = lineBreakG.exec(this.input)) && match.index < this.state.pos) {
+	      ++this.state.curLine;
+	      this.state.lineStart = match.index + match[0].length;
+	    }
+
+	    this.pushComment(true, this.input.slice(start + 2, end), start, this.state.pos, startLoc, this.state.curPosition());
+	  };
+
+	  Tokenizer.prototype.skipLineComment = function skipLineComment(startSkip) {
+	    var start = this.state.pos;
+	    var startLoc = this.state.curPosition();
+	    var ch = this.input.charCodeAt(this.state.pos += startSkip);
+	    while (this.state.pos < this.input.length && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) {
+	      ++this.state.pos;
+	      ch = this.input.charCodeAt(this.state.pos);
+	    }
+
+	    this.pushComment(false, this.input.slice(start + startSkip, this.state.pos), start, this.state.pos, startLoc, this.state.curPosition());
+	  };
+
+	  // Called at the start of the parse and after every token. Skips
+	  // whitespace and comments, and.
+
+	  Tokenizer.prototype.skipSpace = function skipSpace() {
+	    loop: while (this.state.pos < this.input.length) {
+	      var ch = this.input.charCodeAt(this.state.pos);
+	      switch (ch) {
+	        case 32:case 160:
+	          // ' '
+	          ++this.state.pos;
+	          break;
+
+	        case 13:
+	          if (this.input.charCodeAt(this.state.pos + 1) === 10) {
+	            ++this.state.pos;
+	          }
+
+	        case 10:case 8232:case 8233:
+	          ++this.state.pos;
+	          ++this.state.curLine;
+	          this.state.lineStart = this.state.pos;
+	          break;
+
+	        case 47:
+	          // '/'
+	          switch (this.input.charCodeAt(this.state.pos + 1)) {
+	            case 42:
+	              // '*'
+	              this.skipBlockComment();
+	              break;
+
+	            case 47:
+	              this.skipLineComment(2);
+	              break;
+
+	            default:
+	              break loop;
+	          }
+	          break;
+
+	        default:
+	          if (ch > 8 && ch < 14 || ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) {
+	            ++this.state.pos;
+	          } else {
+	            break loop;
+	          }
+	      }
+	    }
+	  };
+
+	  // Called at the end of every token. Sets `end`, `val`, and
+	  // maintains `context` and `exprAllowed`, and skips the space after
+	  // the token, so that the next one's `start` will point at the
+	  // right position.
+
+	  Tokenizer.prototype.finishToken = function finishToken(type, val) {
+	    this.state.end = this.state.pos;
+	    this.state.endLoc = this.state.curPosition();
+	    var prevType = this.state.type;
+	    this.state.type = type;
+	    this.state.value = val;
+
+	    this.updateContext(prevType);
+	  };
+
+	  // ### Token reading
+
+	  // This is the function that is called to fetch the next token. It
+	  // is somewhat obscure, because it works in character codes rather
+	  // than characters, and because operator parsing has been inlined
+	  // into it.
+	  //
+	  // All in the name of speed.
+	  //
+
+
+	  Tokenizer.prototype.readToken_dot = function readToken_dot() {
+	    var next = this.input.charCodeAt(this.state.pos + 1);
+	    if (next >= 48 && next <= 57) {
+	      return this.readNumber(true);
+	    }
+
+	    var next2 = this.input.charCodeAt(this.state.pos + 2);
+	    if (next === 46 && next2 === 46) {
+	      // 46 = dot '.'
+	      this.state.pos += 3;
+	      return this.finishToken(types.ellipsis);
+	    } else {
+	      ++this.state.pos;
+	      return this.finishToken(types.dot);
+	    }
+	  };
+
+	  Tokenizer.prototype.readToken_slash = function readToken_slash() {
+	    // '/'
+	    if (this.state.exprAllowed) {
+	      ++this.state.pos;
+	      return this.readRegexp();
+	    }
+
+	    var next = this.input.charCodeAt(this.state.pos + 1);
+	    if (next === 61) {
+	      return this.finishOp(types.assign, 2);
+	    } else {
+	      return this.finishOp(types.slash, 1);
+	    }
+	  };
+
+	  Tokenizer.prototype.readToken_mult_modulo = function readToken_mult_modulo(code) {
+	    // '%*'
+	    var type = code === 42 ? types.star : types.modulo;
+	    var width = 1;
+	    var next = this.input.charCodeAt(this.state.pos + 1);
+
+	    if (next === 42) {
+	      // '*'
+	      width++;
+	      next = this.input.charCodeAt(this.state.pos + 2);
+	      type = types.exponent;
+	    }
+
+	    if (next === 61) {
+	      width++;
+	      type = types.assign;
+	    }
+
+	    return this.finishOp(type, width);
+	  };
+
+	  Tokenizer.prototype.readToken_pipe_amp = function readToken_pipe_amp(code) {
+	    // '|&'
+	    var next = this.input.charCodeAt(this.state.pos + 1);
+	    if (next === code) return this.finishOp(code === 124 ? types.logicalOR : types.logicalAND, 2);
+	    if (next === 61) return this.finishOp(types.assign, 2);
+	    if (code === 124 && next === 125 && this.hasPlugin("flow")) return this.finishOp(types.braceBarR, 2);
+	    return this.finishOp(code === 124 ? types.bitwiseOR : types.bitwiseAND, 1);
+	  };
+
+	  Tokenizer.prototype.readToken_caret = function readToken_caret() {
+	    // '^'
+	    var next = this.input.charCodeAt(this.state.pos + 1);
+	    if (next === 61) {
+	      return this.finishOp(types.assign, 2);
+	    } else {
+	      return this.finishOp(types.bitwiseXOR, 1);
+	    }
+	  };
+
+	  Tokenizer.prototype.readToken_plus_min = function readToken_plus_min(code) {
+	    // '+-'
+	    var next = this.input.charCodeAt(this.state.pos + 1);
+
+	    if (next === code) {
+	      if (next === 45 && this.input.charCodeAt(this.state.pos + 2) === 62 && lineBreak.test(this.input.slice(this.state.lastTokEnd, this.state.pos))) {
+	        // A `-->` line comment
+	        this.skipLineComment(3);
+	        this.skipSpace();
+	        return this.nextToken();
+	      }
+	      return this.finishOp(types.incDec, 2);
+	    }
+
+	    if (next === 61) {
+	      return this.finishOp(types.assign, 2);
+	    } else {
+	      return this.finishOp(types.plusMin, 1);
+	    }
+	  };
+
+	  Tokenizer.prototype.readToken_lt_gt = function readToken_lt_gt(code) {
+	    // '<>'
+	    var next = this.input.charCodeAt(this.state.pos + 1);
+	    var size = 1;
+
+	    if (next === code) {
+	      size = code === 62 && this.input.charCodeAt(this.state.pos + 2) === 62 ? 3 : 2;
+	      if (this.input.charCodeAt(this.state.pos + size) === 61) return this.finishOp(types.assign, size + 1);
+	      return this.finishOp(types.bitShift, size);
+	    }
+
+	    if (next === 33 && code === 60 && this.input.charCodeAt(this.state.pos + 2) === 45 && this.input.charCodeAt(this.state.pos + 3) === 45) {
+	      if (this.inModule) this.unexpected();
+	      // `<!--`, an XML-style comment that should be interpreted as a line comment
+	      this.skipLineComment(4);
+	      this.skipSpace();
+	      return this.nextToken();
+	    }
+
+	    if (next === 61) {
+	      // <= | >=
+	      size = 2;
+	    }
+
+	    return this.finishOp(types.relational, size);
+	  };
+
+	  Tokenizer.prototype.readToken_eq_excl = function readToken_eq_excl(code) {
+	    // '=!'
+	    var next = this.input.charCodeAt(this.state.pos + 1);
+	    if (next === 61) return this.finishOp(types.equality, this.input.charCodeAt(this.state.pos + 2) === 61 ? 3 : 2);
+	    if (code === 61 && next === 62) {
+	      // '=>'
+	      this.state.pos += 2;
+	      return this.finishToken(types.arrow);
+	    }
+	    return this.finishOp(code === 61 ? types.eq : types.prefix, 1);
+	  };
+
+	  Tokenizer.prototype.getTokenFromCode = function getTokenFromCode(code) {
+	    switch (code) {
+	      // The interpretation of a dot depends on whether it is followed
+	      // by a digit or another two dots.
+	      case 46:
+	        // '.'
+	        return this.readToken_dot();
+
+	      // Punctuation tokens.
+	      case 40:
+	        ++this.state.pos;return this.finishToken(types.parenL);
+	      case 41:
+	        ++this.state.pos;return this.finishToken(types.parenR);
+	      case 59:
+	        ++this.state.pos;return this.finishToken(types.semi);
+	      case 44:
+	        ++this.state.pos;return this.finishToken(types.comma);
+	      case 91:
+	        ++this.state.pos;return this.finishToken(types.bracketL);
+	      case 93:
+	        ++this.state.pos;return this.finishToken(types.bracketR);
+
+	      case 123:
+	        if (this.hasPlugin("flow") && this.input.charCodeAt(this.state.pos + 1) === 124) {
+	          return this.finishOp(types.braceBarL, 2);
+	        } else {
+	          ++this.state.pos;
+	          return this.finishToken(types.braceL);
+	        }
+
+	      case 125:
+	        ++this.state.pos;return this.finishToken(types.braceR);
+
+	      case 58:
+	        if (this.hasPlugin("functionBind") && this.input.charCodeAt(this.state.pos + 1) === 58) {
+	          return this.finishOp(types.doubleColon, 2);
+	        } else {
+	          ++this.state.pos;
+	          return this.finishToken(types.colon);
+	        }
+
+	      case 63:
+	        ++this.state.pos;return this.finishToken(types.question);
+	      case 64:
+	        ++this.state.pos;return this.finishToken(types.at);
+
+	      case 96:
+	        // '`'
+	        ++this.state.pos;
+	        return this.finishToken(types.backQuote);
+
+	      case 48:
+	        // '0'
+	        var next = this.input.charCodeAt(this.state.pos + 1);
+	        if (next === 120 || next === 88) return this.readRadixNumber(16); // '0x', '0X' - hex number
+	        if (next === 111 || next === 79) return this.readRadixNumber(8); // '0o', '0O' - octal number
+	        if (next === 98 || next === 66) return this.readRadixNumber(2); // '0b', '0B' - binary number
+	      // Anything else beginning with a digit is an integer, octal
+	      // number, or float.
+	      case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:
+	        // 1-9
+	        return this.readNumber(false);
+
+	      // Quotes produce strings.
+	      case 34:case 39:
+	        // '"', "'"
+	        return this.readString(code);
+
+	      // Operators are parsed inline in tiny state machines. '=' (61) is
+	      // often referred to. `finishOp` simply skips the amount of
+	      // characters it is given as second argument, and returns a token
+	      // of the type given by its first argument.
+
+	      case 47:
+	        // '/'
+	        return this.readToken_slash();
+
+	      case 37:case 42:
+	        // '%*'
+	        return this.readToken_mult_modulo(code);
+
+	      case 124:case 38:
+	        // '|&'
+	        return this.readToken_pipe_amp(code);
+
+	      case 94:
+	        // '^'
+	        return this.readToken_caret();
+
+	      case 43:case 45:
+	        // '+-'
+	        return this.readToken_plus_min(code);
+
+	      case 60:case 62:
+	        // '<>'
+	        return this.readToken_lt_gt(code);
+
+	      case 61:case 33:
+	        // '=!'
+	        return this.readToken_eq_excl(code);
+
+	      case 126:
+	        // '~'
+	        return this.finishOp(types.prefix, 1);
+	    }
+
+	    this.raise(this.state.pos, "Unexpected character '" + codePointToString(code) + "'");
+	  };
+
+	  Tokenizer.prototype.finishOp = function finishOp(type, size) {
+	    var str = this.input.slice(this.state.pos, this.state.pos + size);
+	    this.state.pos += size;
+	    return this.finishToken(type, str);
+	  };
+
+	  Tokenizer.prototype.readRegexp = function readRegexp() {
+	    var start = this.state.pos;
+	    var escaped = void 0,
+	        inClass = void 0;
+	    for (;;) {
+	      if (this.state.pos >= this.input.length) this.raise(start, "Unterminated regular expression");
+	      var ch = this.input.charAt(this.state.pos);
+	      if (lineBreak.test(ch)) {
+	        this.raise(start, "Unterminated regular expression");
+	      }
+	      if (escaped) {
+	        escaped = false;
+	      } else {
+	        if (ch === "[") {
+	          inClass = true;
+	        } else if (ch === "]" && inClass) {
+	          inClass = false;
+	        } else if (ch === "/" && !inClass) {
+	          break;
+	        }
+	        escaped = ch === "\\";
+	      }
+	      ++this.state.pos;
+	    }
+	    var content = this.input.slice(start, this.state.pos);
+	    ++this.state.pos;
+	    // Need to use `readWord1` because '\uXXXX' sequences are allowed
+	    // here (don't ask).
+	    var mods = this.readWord1();
+	    if (mods) {
+	      var validFlags = /^[gmsiyu]*$/;
+	      if (!validFlags.test(mods)) this.raise(start, "Invalid regular expression flag");
+	    }
+	    return this.finishToken(types.regexp, {
+	      pattern: content,
+	      flags: mods
+	    });
+	  };
+
+	  // Read an integer in the given radix. Return null if zero digits
+	  // were read, the integer value otherwise. When `len` is given, this
+	  // will return `null` unless the integer has exactly `len` digits.
+
+	  Tokenizer.prototype.readInt = function readInt(radix, len) {
+	    var start = this.state.pos;
+	    var total = 0;
+
+	    for (var i = 0, e = len == null ? Infinity : len; i < e; ++i) {
+	      var code = this.input.charCodeAt(this.state.pos);
+	      var val = void 0;
+	      if (code >= 97) {
+	        val = code - 97 + 10; // a
+	      } else if (code >= 65) {
+	        val = code - 65 + 10; // A
+	      } else if (code >= 48 && code <= 57) {
+	        val = code - 48; // 0-9
+	      } else {
+	        val = Infinity;
+	      }
+	      if (val >= radix) break;
+	      ++this.state.pos;
+	      total = total * radix + val;
+	    }
+	    if (this.state.pos === start || len != null && this.state.pos - start !== len) return null;
+
+	    return total;
+	  };
+
+	  Tokenizer.prototype.readRadixNumber = function readRadixNumber(radix) {
+	    this.state.pos += 2; // 0x
+	    var val = this.readInt(radix);
+	    if (val == null) this.raise(this.state.start + 2, "Expected number in radix " + radix);
+	    if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.state.pos, "Identifier directly after number");
+	    return this.finishToken(types.num, val);
+	  };
+
+	  // Read an integer, octal integer, or floating-point number.
+
+	  Tokenizer.prototype.readNumber = function readNumber(startsWithDot) {
+	    var start = this.state.pos;
+	    var octal = this.input.charCodeAt(start) === 48; // '0'
+	    var isFloat = false;
+
+	    if (!startsWithDot && this.readInt(10) === null) this.raise(start, "Invalid number");
+	    if (octal && this.state.pos == start + 1) octal = false; // number === 0
+
+	    var next = this.input.charCodeAt(this.state.pos);
+	    if (next === 46 && !octal) {
+	      // '.'
+	      ++this.state.pos;
+	      this.readInt(10);
+	      isFloat = true;
+	      next = this.input.charCodeAt(this.state.pos);
+	    }
+
+	    if ((next === 69 || next === 101) && !octal) {
+	      // 'eE'
+	      next = this.input.charCodeAt(++this.state.pos);
+	      if (next === 43 || next === 45) ++this.state.pos; // '+-'
+	      if (this.readInt(10) === null) this.raise(start, "Invalid number");
+	      isFloat = true;
+	    }
+
+	    if (isIdentifierStart(this.fullCharCodeAtPos())) this.raise(this.state.pos, "Identifier directly after number");
+
+	    var str = this.input.slice(start, this.state.pos);
+	    var val = void 0;
+	    if (isFloat) {
+	      val = parseFloat(str);
+	    } else if (!octal || str.length === 1) {
+	      val = parseInt(str, 10);
+	    } else if (this.state.strict) {
+	      this.raise(start, "Invalid number");
+	    } else if (/[89]/.test(str)) {
+	      val = parseInt(str, 10);
+	    } else {
+	      val = parseInt(str, 8);
+	    }
+	    return this.finishToken(types.num, val);
+	  };
+
+	  // Read a string value, interpreting backslash-escapes.
+
+	  Tokenizer.prototype.readCodePoint = function readCodePoint(throwOnInvalid) {
+	    var ch = this.input.charCodeAt(this.state.pos);
+	    var code = void 0;
+
+	    if (ch === 123) {
+	      // '{'
+	      var codePos = ++this.state.pos;
+	      code = this.readHexChar(this.input.indexOf("}", this.state.pos) - this.state.pos, throwOnInvalid);
+	      ++this.state.pos;
+	      if (code === null) {
+	        --this.state.invalidTemplateEscapePosition; // to point to the '\'' instead of the 'u'
+	      } else if (code > 0x10FFFF) {
+	        if (throwOnInvalid) {
+	          this.raise(codePos, "Code point out of bounds");
+	        } else {
+	          this.state.invalidTemplateEscapePosition = codePos - 2;
+	          return null;
+	        }
+	      }
+	    } else {
+	      code = this.readHexChar(4, throwOnInvalid);
+	    }
+	    return code;
+	  };
+
+	  Tokenizer.prototype.readString = function readString(quote) {
+	    var out = "",
+	        chunkStart = ++this.state.pos;
+	    for (;;) {
+	      if (this.state.pos >= this.input.length) this.raise(this.state.start, "Unterminated string constant");
+	      var ch = this.input.charCodeAt(this.state.pos);
+	      if (ch === quote) break;
+	      if (ch === 92) {
+	        // '\'
+	        out += this.input.slice(chunkStart, this.state.pos);
+	        out += this.readEscapedChar(false);
+	        chunkStart = this.state.pos;
+	      } else {
+	        if (isNewLine(ch)) this.raise(this.state.start, "Unterminated string constant");
+	        ++this.state.pos;
+	      }
+	    }
+	    out += this.input.slice(chunkStart, this.state.pos++);
+	    return this.finishToken(types.string, out);
+	  };
+
+	  // Reads template string tokens.
+
+	  Tokenizer.prototype.readTmplToken = function readTmplToken() {
+	    var out = "",
+	        chunkStart = this.state.pos,
+	        containsInvalid = false;
+	    for (;;) {
+	      if (this.state.pos >= this.input.length) this.raise(this.state.start, "Unterminated template");
+	      var ch = this.input.charCodeAt(this.state.pos);
+	      if (ch === 96 || ch === 36 && this.input.charCodeAt(this.state.pos + 1) === 123) {
+	        // '`', '${'
+	        if (this.state.pos === this.state.start && this.match(types.template)) {
+	          if (ch === 36) {
+	            this.state.pos += 2;
+	            return this.finishToken(types.dollarBraceL);
+	          } else {
+	            ++this.state.pos;
+	            return this.finishToken(types.backQuote);
+	          }
+	        }
+	        out += this.input.slice(chunkStart, this.state.pos);
+	        return this.finishToken(types.template, containsInvalid ? null : out);
+	      }
+	      if (ch === 92) {
+	        // '\'
+	        out += this.input.slice(chunkStart, this.state.pos);
+	        var escaped = this.readEscapedChar(true);
+	        if (escaped === null) {
+	          containsInvalid = true;
+	        } else {
+	          out += escaped;
+	        }
+	        chunkStart = this.state.pos;
+	      } else if (isNewLine(ch)) {
+	        out += this.input.slice(chunkStart, this.state.pos);
+	        ++this.state.pos;
+	        switch (ch) {
+	          case 13:
+	            if (this.input.charCodeAt(this.state.pos) === 10) ++this.state.pos;
+	          case 10:
+	            out += "\n";
+	            break;
+	          default:
+	            out += String.fromCharCode(ch);
+	            break;
+	        }
+	        ++this.state.curLine;
+	        this.state.lineStart = this.state.pos;
+	        chunkStart = this.state.pos;
+	      } else {
+	        ++this.state.pos;
+	      }
+	    }
+	  };
+
+	  // Used to read escaped characters
+
+	  Tokenizer.prototype.readEscapedChar = function readEscapedChar(inTemplate) {
+	    var throwOnInvalid = !inTemplate;
+	    var ch = this.input.charCodeAt(++this.state.pos);
+	    ++this.state.pos;
+	    switch (ch) {
+	      case 110:
+	        return "\n"; // 'n' -> '\n'
+	      case 114:
+	        return "\r"; // 'r' -> '\r'
+	      case 120:
+	        {
+	          // 'x'
+	          var code = this.readHexChar(2, throwOnInvalid);
+	          return code === null ? null : String.fromCharCode(code);
+	        }
+	      case 117:
+	        {
+	          // 'u'
+	          var _code = this.readCodePoint(throwOnInvalid);
+	          return _code === null ? null : codePointToString(_code);
+	        }
+	      case 116:
+	        return "\t"; // 't' -> '\t'
+	      case 98:
+	        return "\b"; // 'b' -> '\b'
+	      case 118:
+	        return "\x0B"; // 'v' -> '\u000b'
+	      case 102:
+	        return "\f"; // 'f' -> '\f'
+	      case 13:
+	        if (this.input.charCodeAt(this.state.pos) === 10) ++this.state.pos; // '\r\n'
+	      case 10:
+	        // ' \n'
+	        this.state.lineStart = this.state.pos;
+	        ++this.state.curLine;
+	        return "";
+	      default:
+	        if (ch >= 48 && ch <= 55) {
+	          var codePos = this.state.pos - 1;
+	          var octalStr = this.input.substr(this.state.pos - 1, 3).match(/^[0-7]+/)[0];
+	          var octal = parseInt(octalStr, 8);
+	          if (octal > 255) {
+	            octalStr = octalStr.slice(0, -1);
+	            octal = parseInt(octalStr, 8);
+	          }
+	          if (octal > 0) {
+	            if (inTemplate) {
+	              this.state.invalidTemplateEscapePosition = codePos;
+	              return null;
+	            } else if (this.state.strict) {
+	              this.raise(codePos, "Octal literal in strict mode");
+	            } else if (!this.state.containsOctal) {
+	              // These properties are only used to throw an error for an octal which occurs
+	              // in a directive which occurs prior to a "use strict" directive.
+	              this.state.containsOctal = true;
+	              this.state.octalPosition = codePos;
+	            }
+	          }
+	          this.state.pos += octalStr.length - 1;
+	          return String.fromCharCode(octal);
+	        }
+	        return String.fromCharCode(ch);
+	    }
+	  };
+
+	  // Used to read character escape sequences ('\x', '\u').
+
+	  Tokenizer.prototype.readHexChar = function readHexChar(len, throwOnInvalid) {
+	    var codePos = this.state.pos;
+	    var n = this.readInt(16, len);
+	    if (n === null) {
+	      if (throwOnInvalid) {
+	        this.raise(codePos, "Bad character escape sequence");
+	      } else {
+	        this.state.pos = codePos - 1;
+	        this.state.invalidTemplateEscapePosition = codePos - 1;
+	      }
+	    }
+	    return n;
+	  };
+
+	  // Read an identifier, and return it as a string. Sets `this.state.containsEsc`
+	  // to whether the word contained a '\u' escape.
+	  //
+	  // Incrementally adds only escaped chars, adding other chunks as-is
+	  // as a micro-optimization.
+
+	  Tokenizer.prototype.readWord1 = function readWord1() {
+	    this.state.containsEsc = false;
+	    var word = "",
+	        first = true,
+	        chunkStart = this.state.pos;
+	    while (this.state.pos < this.input.length) {
+	      var ch = this.fullCharCodeAtPos();
+	      if (isIdentifierChar(ch)) {
+	        this.state.pos += ch <= 0xffff ? 1 : 2;
+	      } else if (ch === 92) {
+	        // "\"
+	        this.state.containsEsc = true;
+
+	        word += this.input.slice(chunkStart, this.state.pos);
+	        var escStart = this.state.pos;
+
+	        if (this.input.charCodeAt(++this.state.pos) !== 117) {
+	          // "u"
+	          this.raise(this.state.pos, 'Expecting Unicode escape sequence \\uXXXX');
+	        }
+
+	        ++this.state.pos;
+	        var esc = this.readCodePoint(true);
+	        if (!(first ? isIdentifierStart : isIdentifierChar)(esc, true)) {
+	          this.raise(escStart, "Invalid Unicode escape");
+	        }
+
+	        word += codePointToString(esc);
+	        chunkStart = this.state.pos;
+	      } else {
+	        break;
+	      }
+	      first = false;
+	    }
+	    return word + this.input.slice(chunkStart, this.state.pos);
+	  };
+
+	  // Read an identifier or keyword token. Will check for reserved
+	  // words when necessary.
+
+	  Tokenizer.prototype.readWord = function readWord() {
+	    var word = this.readWord1();
+	    var type = types.name;
+	    if (!this.state.containsEsc && this.isKeyword(word)) {
+	      type = keywords[word];
+	    }
+	    return this.finishToken(type, word);
+	  };
+
+	  Tokenizer.prototype.braceIsBlock = function braceIsBlock(prevType) {
+	    if (prevType === types.colon) {
+	      var parent = this.curContext();
+	      if (parent === types$1.braceStatement || parent === types$1.braceExpression) {
+	        return !parent.isExpr;
+	      }
+	    }
+
+	    if (prevType === types._return) {
+	      return lineBreak.test(this.input.slice(this.state.lastTokEnd, this.state.start));
+	    }
+
+	    if (prevType === types._else || prevType === types.semi || prevType === types.eof || prevType === types.parenR) {
+	      return true;
+	    }
+
+	    if (prevType === types.braceL) {
+	      return this.curContext() === types$1.braceStatement;
+	    }
+
+	    return !this.state.exprAllowed;
+	  };
+
+	  Tokenizer.prototype.updateContext = function updateContext(prevType) {
+	    var type = this.state.type;
+	    var update = void 0;
+
+	    if (type.keyword && prevType === types.dot) {
+	      this.state.exprAllowed = false;
+	    } else if (update = type.updateContext) {
+	      update.call(this, prevType);
+	    } else {
+	      this.state.exprAllowed = type.beforeExpr;
+	    }
+	  };
+
+	  return Tokenizer;
+	}();
+
+	var plugins = {};
+	var frozenDeprecatedWildcardPluginList = ["jsx", "doExpressions", "objectRestSpread", "decorators", "classProperties", "exportExtensions", "asyncGenerators", "functionBind", "functionSent", "dynamicImport", "flow"];
+
+	var Parser = function (_Tokenizer) {
+	  inherits(Parser, _Tokenizer);
+
+	  function Parser(options, input) {
+	    classCallCheck(this, Parser);
+
+	    options = getOptions(options);
+
+	    var _this = possibleConstructorReturn(this, _Tokenizer.call(this, options, input));
+
+	    _this.options = options;
+	    _this.inModule = _this.options.sourceType === "module";
+	    _this.input = input;
+	    _this.plugins = _this.loadPlugins(_this.options.plugins);
+	    _this.filename = options.sourceFilename;
+
+	    // If enabled, skip leading hashbang line.
+	    if (_this.state.pos === 0 && _this.input[0] === "#" && _this.input[1] === "!") {
+	      _this.skipLineComment(2);
+	    }
+	    return _this;
+	  }
+
+	  Parser.prototype.isReservedWord = function isReservedWord(word) {
+	    if (word === "await") {
+	      return this.inModule;
+	    } else {
+	      return reservedWords[6](word);
+	    }
+	  };
+
+	  Parser.prototype.hasPlugin = function hasPlugin(name) {
+	    if (this.plugins["*"] && frozenDeprecatedWildcardPluginList.indexOf(name) > -1) {
+	      return true;
+	    }
+
+	    return !!this.plugins[name];
+	  };
+
+	  Parser.prototype.extend = function extend(name, f) {
+	    this[name] = f(this[name]);
+	  };
+
+	  Parser.prototype.loadAllPlugins = function loadAllPlugins() {
+	    var _this2 = this;
+
+	    // ensure flow plugin loads last, also ensure estree is not loaded with *
+	    var pluginNames = Object.keys(plugins).filter(function (name) {
+	      return name !== "flow" && name !== "estree";
+	    });
+	    pluginNames.push("flow");
+
+	    pluginNames.forEach(function (name) {
+	      var plugin = plugins[name];
+	      if (plugin) plugin(_this2);
+	    });
+	  };
+
+	  Parser.prototype.loadPlugins = function loadPlugins(pluginList) {
+	    // TODO: Deprecate "*" option in next major version of Babylon
+	    if (pluginList.indexOf("*") >= 0) {
+	      this.loadAllPlugins();
+
+	      return { "*": true };
+	    }
+
+	    var pluginMap = {};
+
+	    if (pluginList.indexOf("flow") >= 0) {
+	      // ensure flow plugin loads last
+	      pluginList = pluginList.filter(function (plugin) {
+	        return plugin !== "flow";
+	      });
+	      pluginList.push("flow");
+	    }
+
+	    if (pluginList.indexOf("estree") >= 0) {
+	      // ensure estree plugin loads first
+	      pluginList = pluginList.filter(function (plugin) {
+	        return plugin !== "estree";
+	      });
+	      pluginList.unshift("estree");
+	    }
+
+	    for (var _iterator = pluginList, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var name = _ref;
+
+	      if (!pluginMap[name]) {
+	        pluginMap[name] = true;
+
+	        var plugin = plugins[name];
+	        if (plugin) plugin(this);
+	      }
+	    }
+
+	    return pluginMap;
+	  };
+
+	  Parser.prototype.parse = function parse() {
+	    var file = this.startNode();
+	    var program = this.startNode();
+	    this.nextToken();
+	    return this.parseTopLevel(file, program);
+	  };
+
+	  return Parser;
+	}(Tokenizer);
+
+	var pp = Parser.prototype;
+
+	// ## Parser utilities
+
+	// TODO
+
+	pp.addExtra = function (node, key, val) {
+	  if (!node) return;
+
+	  var extra = node.extra = node.extra || {};
+	  extra[key] = val;
+	};
+
+	// TODO
+
+	pp.isRelational = function (op) {
+	  return this.match(types.relational) && this.state.value === op;
+	};
+
+	// TODO
+
+	pp.expectRelational = function (op) {
+	  if (this.isRelational(op)) {
+	    this.next();
+	  } else {
+	    this.unexpected(null, types.relational);
+	  }
+	};
+
+	// Tests whether parsed token is a contextual keyword.
+
+	pp.isContextual = function (name) {
+	  return this.match(types.name) && this.state.value === name;
+	};
+
+	// Consumes contextual keyword if possible.
+
+	pp.eatContextual = function (name) {
+	  return this.state.value === name && this.eat(types.name);
+	};
+
+	// Asserts that following token is given contextual keyword.
+
+	pp.expectContextual = function (name, message) {
+	  if (!this.eatContextual(name)) this.unexpected(null, message);
+	};
+
+	// Test whether a semicolon can be inserted at the current position.
+
+	pp.canInsertSemicolon = function () {
+	  return this.match(types.eof) || this.match(types.braceR) || lineBreak.test(this.input.slice(this.state.lastTokEnd, this.state.start));
+	};
+
+	// TODO
+
+	pp.isLineTerminator = function () {
+	  return this.eat(types.semi) || this.canInsertSemicolon();
+	};
+
+	// Consume a semicolon, or, failing that, see if we are allowed to
+	// pretend that there is a semicolon at this position.
+
+	pp.semicolon = function () {
+	  if (!this.isLineTerminator()) this.unexpected(null, types.semi);
+	};
+
+	// Expect a token of a given type. If found, consume it, otherwise,
+	// raise an unexpected token error at given pos.
+
+	pp.expect = function (type, pos) {
+	  return this.eat(type) || this.unexpected(pos, type);
+	};
+
+	// Raise an unexpected token error. Can take the expected token type
+	// instead of a message string.
+
+	pp.unexpected = function (pos) {
+	  var messageOrType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "Unexpected token";
+
+	  if (messageOrType && (typeof messageOrType === "undefined" ? "undefined" : _typeof(messageOrType)) === "object" && messageOrType.label) {
+	    messageOrType = "Unexpected token, expected " + messageOrType.label;
+	  }
+	  this.raise(pos != null ? pos : this.state.start, messageOrType);
+	};
+
+	/* eslint max-len: 0 */
+
+	var pp$1 = Parser.prototype;
+
+	// ### Statement parsing
+
+	// Parse a program. Initializes the parser, reads any number of
+	// statements, and wraps them in a Program node.  Optionally takes a
+	// `program` argument.  If present, the statements will be appended
+	// to its body instead of creating a new node.
+
+	pp$1.parseTopLevel = function (file, program) {
+	  program.sourceType = this.options.sourceType;
+
+	  this.parseBlockBody(program, true, true, types.eof);
+
+	  file.program = this.finishNode(program, "Program");
+	  file.comments = this.state.comments;
+	  file.tokens = this.state.tokens;
+
+	  return this.finishNode(file, "File");
+	};
+
+	var loopLabel = { kind: "loop" };
+	var switchLabel = { kind: "switch" };
+
+	// TODO
+
+	pp$1.stmtToDirective = function (stmt) {
+	  var expr = stmt.expression;
+
+	  var directiveLiteral = this.startNodeAt(expr.start, expr.loc.start);
+	  var directive = this.startNodeAt(stmt.start, stmt.loc.start);
+
+	  var raw = this.input.slice(expr.start, expr.end);
+	  var val = directiveLiteral.value = raw.slice(1, -1); // remove quotes
+
+	  this.addExtra(directiveLiteral, "raw", raw);
+	  this.addExtra(directiveLiteral, "rawValue", val);
+
+	  directive.value = this.finishNodeAt(directiveLiteral, "DirectiveLiteral", expr.end, expr.loc.end);
+
+	  return this.finishNodeAt(directive, "Directive", stmt.end, stmt.loc.end);
+	};
+
+	// Parse a single statement.
+	//
+	// If expecting a statement and finding a slash operator, parse a
+	// regular expression literal. This is to handle cases like
+	// `if (foo) /blah/.exec(foo)`, where looking at the previous token
+	// does not help.
+
+	pp$1.parseStatement = function (declaration, topLevel) {
+	  if (this.match(types.at)) {
+	    this.parseDecorators(true);
+	  }
+
+	  var starttype = this.state.type;
+	  var node = this.startNode();
+
+	  // Most types of statements are recognized by the keyword they
+	  // start with. Many are trivial to parse, some require a bit of
+	  // complexity.
+
+	  switch (starttype) {
+	    case types._break:case types._continue:
+	      return this.parseBreakContinueStatement(node, starttype.keyword);
+	    case types._debugger:
+	      return this.parseDebuggerStatement(node);
+	    case types._do:
+	      return this.parseDoStatement(node);
+	    case types._for:
+	      return this.parseForStatement(node);
+	    case types._function:
+	      if (!declaration) this.unexpected();
+	      return this.parseFunctionStatement(node);
+
+	    case types._class:
+	      if (!declaration) this.unexpected();
+	      return this.parseClass(node, true);
+
+	    case types._if:
+	      return this.parseIfStatement(node);
+	    case types._return:
+	      return this.parseReturnStatement(node);
+	    case types._switch:
+	      return this.parseSwitchStatement(node);
+	    case types._throw:
+	      return this.parseThrowStatement(node);
+	    case types._try:
+	      return this.parseTryStatement(node);
+
+	    case types._let:
+	    case types._const:
+	      if (!declaration) this.unexpected(); // NOTE: falls through to _var
+
+	    case types._var:
+	      return this.parseVarStatement(node, starttype);
+
+	    case types._while:
+	      return this.parseWhileStatement(node);
+	    case types._with:
+	      return this.parseWithStatement(node);
+	    case types.braceL:
+	      return this.parseBlock();
+	    case types.semi:
+	      return this.parseEmptyStatement(node);
+	    case types._export:
+	    case types._import:
+	      if (this.hasPlugin("dynamicImport") && this.lookahead().type === types.parenL) break;
+
+	      if (!this.options.allowImportExportEverywhere) {
+	        if (!topLevel) {
+	          this.raise(this.state.start, "'import' and 'export' may only appear at the top level");
+	        }
+
+	        if (!this.inModule) {
+	          this.raise(this.state.start, "'import' and 'export' may appear only with 'sourceType: module'");
+	        }
+	      }
+	      return starttype === types._import ? this.parseImport(node) : this.parseExport(node);
+
+	    case types.name:
+	      if (this.state.value === "async") {
+	        // peek ahead and see if next token is a function
+	        var state = this.state.clone();
+	        this.next();
+	        if (this.match(types._function) && !this.canInsertSemicolon()) {
+	          this.expect(types._function);
+	          return this.parseFunction(node, true, false, true);
+	        } else {
+	          this.state = state;
+	        }
+	      }
+	  }
+
+	  // If the statement does not start with a statement keyword or a
+	  // brace, it's an ExpressionStatement or LabeledStatement. We
+	  // simply start parsing an expression, and afterwards, if the
+	  // next token is a colon and the expression was a simple
+	  // Identifier node, we switch to interpreting it as a label.
+	  var maybeName = this.state.value;
+	  var expr = this.parseExpression();
+
+	  if (starttype === types.name && expr.type === "Identifier" && this.eat(types.colon)) {
+	    return this.parseLabeledStatement(node, maybeName, expr);
+	  } else {
+	    return this.parseExpressionStatement(node, expr);
+	  }
+	};
+
+	pp$1.takeDecorators = function (node) {
+	  if (this.state.decorators.length) {
+	    node.decorators = this.state.decorators;
+	    this.state.decorators = [];
+	  }
+	};
+
+	pp$1.parseDecorators = function (allowExport) {
+	  while (this.match(types.at)) {
+	    var decorator = this.parseDecorator();
+	    this.state.decorators.push(decorator);
+	  }
+
+	  if (allowExport && this.match(types._export)) {
+	    return;
+	  }
+
+	  if (!this.match(types._class)) {
+	    this.raise(this.state.start, "Leading decorators must be attached to a class declaration");
+	  }
+	};
+
+	pp$1.parseDecorator = function () {
+	  if (!this.hasPlugin("decorators")) {
+	    this.unexpected();
+	  }
+	  var node = this.startNode();
+	  this.next();
+	  node.expression = this.parseMaybeAssign();
+	  return this.finishNode(node, "Decorator");
+	};
+
+	pp$1.parseBreakContinueStatement = function (node, keyword) {
+	  var isBreak = keyword === "break";
+	  this.next();
+
+	  if (this.isLineTerminator()) {
+	    node.label = null;
+	  } else if (!this.match(types.name)) {
+	    this.unexpected();
+	  } else {
+	    node.label = this.parseIdentifier();
+	    this.semicolon();
+	  }
+
+	  // Verify that there is an actual destination to break or
+	  // continue to.
+	  var i = void 0;
+	  for (i = 0; i < this.state.labels.length; ++i) {
+	    var lab = this.state.labels[i];
+	    if (node.label == null || lab.name === node.label.name) {
+	      if (lab.kind != null && (isBreak || lab.kind === "loop")) break;
+	      if (node.label && isBreak) break;
+	    }
+	  }
+	  if (i === this.state.labels.length) this.raise(node.start, "Unsyntactic " + keyword);
+	  return this.finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement");
+	};
+
+	pp$1.parseDebuggerStatement = function (node) {
+	  this.next();
+	  this.semicolon();
+	  return this.finishNode(node, "DebuggerStatement");
+	};
+
+	pp$1.parseDoStatement = function (node) {
+	  this.next();
+	  this.state.labels.push(loopLabel);
+	  node.body = this.parseStatement(false);
+	  this.state.labels.pop();
+	  this.expect(types._while);
+	  node.test = this.parseParenExpression();
+	  this.eat(types.semi);
+	  return this.finishNode(node, "DoWhileStatement");
+	};
+
+	// Disambiguating between a `for` and a `for`/`in` or `for`/`of`
+	// loop is non-trivial. Basically, we have to parse the init `var`
+	// statement or expression, disallowing the `in` operator (see
+	// the second parameter to `parseExpression`), and then check
+	// whether the next token is `in` or `of`. When there is no init
+	// part (semicolon immediately after the opening parenthesis), it
+	// is a regular `for` loop.
+
+	pp$1.parseForStatement = function (node) {
+	  this.next();
+	  this.state.labels.push(loopLabel);
+
+	  var forAwait = false;
+	  if (this.hasPlugin("asyncGenerators") && this.state.inAsync && this.isContextual("await")) {
+	    forAwait = true;
+	    this.next();
+	  }
+	  this.expect(types.parenL);
+
+	  if (this.match(types.semi)) {
+	    if (forAwait) {
+	      this.unexpected();
+	    }
+	    return this.parseFor(node, null);
+	  }
+
+	  if (this.match(types._var) || this.match(types._let) || this.match(types._const)) {
+	    var _init = this.startNode();
+	    var varKind = this.state.type;
+	    this.next();
+	    this.parseVar(_init, true, varKind);
+	    this.finishNode(_init, "VariableDeclaration");
+
+	    if (this.match(types._in) || this.isContextual("of")) {
+	      if (_init.declarations.length === 1 && !_init.declarations[0].init) {
+	        return this.parseForIn(node, _init, forAwait);
+	      }
+	    }
+	    if (forAwait) {
+	      this.unexpected();
+	    }
+	    return this.parseFor(node, _init);
+	  }
+
+	  var refShorthandDefaultPos = { start: 0 };
+	  var init = this.parseExpression(true, refShorthandDefaultPos);
+	  if (this.match(types._in) || this.isContextual("of")) {
+	    var description = this.isContextual("of") ? "for-of statement" : "for-in statement";
+	    this.toAssignable(init, undefined, description);
+	    this.checkLVal(init, undefined, undefined, description);
+	    return this.parseForIn(node, init, forAwait);
+	  } else if (refShorthandDefaultPos.start) {
+	    this.unexpected(refShorthandDefaultPos.start);
+	  }
+	  if (forAwait) {
+	    this.unexpected();
+	  }
+	  return this.parseFor(node, init);
+	};
+
+	pp$1.parseFunctionStatement = function (node) {
+	  this.next();
+	  return this.parseFunction(node, true);
+	};
+
+	pp$1.parseIfStatement = function (node) {
+	  this.next();
+	  node.test = this.parseParenExpression();
+	  node.consequent = this.parseStatement(false);
+	  node.alternate = this.eat(types._else) ? this.parseStatement(false) : null;
+	  return this.finishNode(node, "IfStatement");
+	};
+
+	pp$1.parseReturnStatement = function (node) {
+	  if (!this.state.inFunction && !this.options.allowReturnOutsideFunction) {
+	    this.raise(this.state.start, "'return' outside of function");
+	  }
+
+	  this.next();
+
+	  // In `return` (and `break`/`continue`), the keywords with
+	  // optional arguments, we eagerly look for a semicolon or the
+	  // possibility to insert one.
+
+	  if (this.isLineTerminator()) {
+	    node.argument = null;
+	  } else {
+	    node.argument = this.parseExpression();
+	    this.semicolon();
+	  }
+
+	  return this.finishNode(node, "ReturnStatement");
+	};
+
+	pp$1.parseSwitchStatement = function (node) {
+	  this.next();
+	  node.discriminant = this.parseParenExpression();
+	  node.cases = [];
+	  this.expect(types.braceL);
+	  this.state.labels.push(switchLabel);
+
+	  // Statements under must be grouped (by label) in SwitchCase
+	  // nodes. `cur` is used to keep the node that we are currently
+	  // adding statements to.
+
+	  var cur = void 0;
+	  for (var sawDefault; !this.match(types.braceR);) {
+	    if (this.match(types._case) || this.match(types._default)) {
+	      var isCase = this.match(types._case);
+	      if (cur) this.finishNode(cur, "SwitchCase");
+	      node.cases.push(cur = this.startNode());
+	      cur.consequent = [];
+	      this.next();
+	      if (isCase) {
+	        cur.test = this.parseExpression();
+	      } else {
+	        if (sawDefault) this.raise(this.state.lastTokStart, "Multiple default clauses");
+	        sawDefault = true;
+	        cur.test = null;
+	      }
+	      this.expect(types.colon);
+	    } else {
+	      if (cur) {
+	        cur.consequent.push(this.parseStatement(true));
+	      } else {
+	        this.unexpected();
+	      }
+	    }
+	  }
+	  if (cur) this.finishNode(cur, "SwitchCase");
+	  this.next(); // Closing brace
+	  this.state.labels.pop();
+	  return this.finishNode(node, "SwitchStatement");
+	};
+
+	pp$1.parseThrowStatement = function (node) {
+	  this.next();
+	  if (lineBreak.test(this.input.slice(this.state.lastTokEnd, this.state.start))) this.raise(this.state.lastTokEnd, "Illegal newline after throw");
+	  node.argument = this.parseExpression();
+	  this.semicolon();
+	  return this.finishNode(node, "ThrowStatement");
+	};
+
+	// Reused empty array added for node fields that are always empty.
+
+	var empty = [];
+
+	pp$1.parseTryStatement = function (node) {
+	  this.next();
+
+	  node.block = this.parseBlock();
+	  node.handler = null;
+
+	  if (this.match(types._catch)) {
+	    var clause = this.startNode();
+	    this.next();
+
+	    this.expect(types.parenL);
+	    clause.param = this.parseBindingAtom();
+	    this.checkLVal(clause.param, true, Object.create(null), "catch clause");
+	    this.expect(types.parenR);
+
+	    clause.body = this.parseBlock();
+	    node.handler = this.finishNode(clause, "CatchClause");
+	  }
+
+	  node.guardedHandlers = empty;
+	  node.finalizer = this.eat(types._finally) ? this.parseBlock() : null;
+
+	  if (!node.handler && !node.finalizer) {
+	    this.raise(node.start, "Missing catch or finally clause");
+	  }
+
+	  return this.finishNode(node, "TryStatement");
+	};
+
+	pp$1.parseVarStatement = function (node, kind) {
+	  this.next();
+	  this.parseVar(node, false, kind);
+	  this.semicolon();
+	  return this.finishNode(node, "VariableDeclaration");
+	};
+
+	pp$1.parseWhileStatement = function (node) {
+	  this.next();
+	  node.test = this.parseParenExpression();
+	  this.state.labels.push(loopLabel);
+	  node.body = this.parseStatement(false);
+	  this.state.labels.pop();
+	  return this.finishNode(node, "WhileStatement");
+	};
+
+	pp$1.parseWithStatement = function (node) {
+	  if (this.state.strict) this.raise(this.state.start, "'with' in strict mode");
+	  this.next();
+	  node.object = this.parseParenExpression();
+	  node.body = this.parseStatement(false);
+	  return this.finishNode(node, "WithStatement");
+	};
+
+	pp$1.parseEmptyStatement = function (node) {
+	  this.next();
+	  return this.finishNode(node, "EmptyStatement");
+	};
+
+	pp$1.parseLabeledStatement = function (node, maybeName, expr) {
+	  for (var _iterator = this.state.labels, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var _label = _ref;
+
+	    if (_label.name === maybeName) {
+	      this.raise(expr.start, "Label '" + maybeName + "' is already declared");
+	    }
+	  }
+
+	  var kind = this.state.type.isLoop ? "loop" : this.match(types._switch) ? "switch" : null;
+	  for (var i = this.state.labels.length - 1; i >= 0; i--) {
+	    var label = this.state.labels[i];
+	    if (label.statementStart === node.start) {
+	      label.statementStart = this.state.start;
+	      label.kind = kind;
+	    } else {
+	      break;
+	    }
+	  }
+
+	  this.state.labels.push({ name: maybeName, kind: kind, statementStart: this.state.start });
+	  node.body = this.parseStatement(true);
+	  this.state.labels.pop();
+	  node.label = expr;
+	  return this.finishNode(node, "LabeledStatement");
+	};
+
+	pp$1.parseExpressionStatement = function (node, expr) {
+	  node.expression = expr;
+	  this.semicolon();
+	  return this.finishNode(node, "ExpressionStatement");
+	};
+
+	// Parse a semicolon-enclosed block of statements, handling `"use
+	// strict"` declarations when `allowStrict` is true (used for
+	// function bodies).
+
+	pp$1.parseBlock = function (allowDirectives) {
+	  var node = this.startNode();
+	  this.expect(types.braceL);
+	  this.parseBlockBody(node, allowDirectives, false, types.braceR);
+	  return this.finishNode(node, "BlockStatement");
+	};
+
+	pp$1.isValidDirective = function (stmt) {
+	  return stmt.type === "ExpressionStatement" && stmt.expression.type === "StringLiteral" && !stmt.expression.extra.parenthesized;
+	};
+
+	pp$1.parseBlockBody = function (node, allowDirectives, topLevel, end) {
+	  node.body = [];
+	  node.directives = [];
+
+	  var parsedNonDirective = false;
+	  var oldStrict = void 0;
+	  var octalPosition = void 0;
+
+	  while (!this.eat(end)) {
+	    if (!parsedNonDirective && this.state.containsOctal && !octalPosition) {
+	      octalPosition = this.state.octalPosition;
+	    }
+
+	    var stmt = this.parseStatement(true, topLevel);
+
+	    if (allowDirectives && !parsedNonDirective && this.isValidDirective(stmt)) {
+	      var directive = this.stmtToDirective(stmt);
+	      node.directives.push(directive);
+
+	      if (oldStrict === undefined && directive.value.value === "use strict") {
+	        oldStrict = this.state.strict;
+	        this.setStrict(true);
+
+	        if (octalPosition) {
+	          this.raise(octalPosition, "Octal literal in strict mode");
+	        }
+	      }
+
+	      continue;
+	    }
+
+	    parsedNonDirective = true;
+	    node.body.push(stmt);
+	  }
+
+	  if (oldStrict === false) {
+	    this.setStrict(false);
+	  }
+	};
+
+	// Parse a regular `for` loop. The disambiguation code in
+	// `parseStatement` will already have parsed the init statement or
+	// expression.
+
+	pp$1.parseFor = function (node, init) {
+	  node.init = init;
+	  this.expect(types.semi);
+	  node.test = this.match(types.semi) ? null : this.parseExpression();
+	  this.expect(types.semi);
+	  node.update = this.match(types.parenR) ? null : this.parseExpression();
+	  this.expect(types.parenR);
+	  node.body = this.parseStatement(false);
+	  this.state.labels.pop();
+	  return this.finishNode(node, "ForStatement");
+	};
+
+	// Parse a `for`/`in` and `for`/`of` loop, which are almost
+	// same from parser's perspective.
+
+	pp$1.parseForIn = function (node, init, forAwait) {
+	  var type = void 0;
+	  if (forAwait) {
+	    this.eatContextual("of");
+	    type = "ForAwaitStatement";
+	  } else {
+	    type = this.match(types._in) ? "ForInStatement" : "ForOfStatement";
+	    this.next();
+	  }
+	  node.left = init;
+	  node.right = this.parseExpression();
+	  this.expect(types.parenR);
+	  node.body = this.parseStatement(false);
+	  this.state.labels.pop();
+	  return this.finishNode(node, type);
+	};
+
+	// Parse a list of variable declarations.
+
+	pp$1.parseVar = function (node, isFor, kind) {
+	  node.declarations = [];
+	  node.kind = kind.keyword;
+	  for (;;) {
+	    var decl = this.startNode();
+	    this.parseVarHead(decl);
+	    if (this.eat(types.eq)) {
+	      decl.init = this.parseMaybeAssign(isFor);
+	    } else if (kind === types._const && !(this.match(types._in) || this.isContextual("of"))) {
+	      this.unexpected();
+	    } else if (decl.id.type !== "Identifier" && !(isFor && (this.match(types._in) || this.isContextual("of")))) {
+	      this.raise(this.state.lastTokEnd, "Complex binding patterns require an initialization value");
+	    } else {
+	      decl.init = null;
+	    }
+	    node.declarations.push(this.finishNode(decl, "VariableDeclarator"));
+	    if (!this.eat(types.comma)) break;
+	  }
+	  return node;
+	};
+
+	pp$1.parseVarHead = function (decl) {
+	  decl.id = this.parseBindingAtom();
+	  this.checkLVal(decl.id, true, undefined, "variable declaration");
+	};
+
+	// Parse a function declaration or literal (depending on the
+	// `isStatement` parameter).
+
+	pp$1.parseFunction = function (node, isStatement, allowExpressionBody, isAsync, optionalId) {
+	  var oldInMethod = this.state.inMethod;
+	  this.state.inMethod = false;
+
+	  this.initFunction(node, isAsync);
+
+	  if (this.match(types.star)) {
+	    if (node.async && !this.hasPlugin("asyncGenerators")) {
+	      this.unexpected();
+	    } else {
+	      node.generator = true;
+	      this.next();
+	    }
+	  }
+
+	  if (isStatement && !optionalId && !this.match(types.name) && !this.match(types._yield)) {
+	    this.unexpected();
+	  }
+
+	  if (this.match(types.name) || this.match(types._yield)) {
+	    node.id = this.parseBindingIdentifier();
+	  }
+
+	  this.parseFunctionParams(node);
+	  this.parseFunctionBody(node, allowExpressionBody);
+
+	  this.state.inMethod = oldInMethod;
+
+	  return this.finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression");
+	};
+
+	pp$1.parseFunctionParams = function (node) {
+	  this.expect(types.parenL);
+	  node.params = this.parseBindingList(types.parenR);
+	};
+
+	// Parse a class declaration or literal (depending on the
+	// `isStatement` parameter).
+
+	pp$1.parseClass = function (node, isStatement, optionalId) {
+	  this.next();
+	  this.takeDecorators(node);
+	  this.parseClassId(node, isStatement, optionalId);
+	  this.parseClassSuper(node);
+	  this.parseClassBody(node);
+	  return this.finishNode(node, isStatement ? "ClassDeclaration" : "ClassExpression");
+	};
+
+	pp$1.isClassProperty = function () {
+	  return this.match(types.eq) || this.match(types.semi) || this.match(types.braceR);
+	};
+
+	pp$1.isClassMethod = function () {
+	  return this.match(types.parenL);
+	};
+
+	pp$1.isNonstaticConstructor = function (method) {
+	  return !method.computed && !method.static && (method.key.name === "constructor" || // Identifier
+	  method.key.value === "constructor" // Literal
+	  );
+	};
+
+	pp$1.parseClassBody = function (node) {
+	  // class bodies are implicitly strict
+	  var oldStrict = this.state.strict;
+	  this.state.strict = true;
+
+	  var hadConstructorCall = false;
+	  var hadConstructor = false;
+	  var decorators = [];
+	  var classBody = this.startNode();
+
+	  classBody.body = [];
+
+	  this.expect(types.braceL);
+
+	  while (!this.eat(types.braceR)) {
+	    if (this.eat(types.semi)) {
+	      if (decorators.length > 0) {
+	        this.raise(this.state.lastTokEnd, "Decorators must not be followed by a semicolon");
+	      }
+	      continue;
+	    }
+
+	    if (this.match(types.at)) {
+	      decorators.push(this.parseDecorator());
+	      continue;
+	    }
+
+	    var method = this.startNode();
+
+	    // steal the decorators if there are any
+	    if (decorators.length) {
+	      method.decorators = decorators;
+	      decorators = [];
+	    }
+
+	    method.static = false;
+	    if (this.match(types.name) && this.state.value === "static") {
+	      var key = this.parseIdentifier(true); // eats 'static'
+	      if (this.isClassMethod()) {
+	        // a method named 'static'
+	        method.kind = "method";
+	        method.computed = false;
+	        method.key = key;
+	        this.parseClassMethod(classBody, method, false, false);
+	        continue;
+	      } else if (this.isClassProperty()) {
+	        // a property named 'static'
+	        method.computed = false;
+	        method.key = key;
+	        classBody.body.push(this.parseClassProperty(method));
+	        continue;
+	      }
+	      // otherwise something static
+	      method.static = true;
+	    }
+
+	    if (this.eat(types.star)) {
+	      // a generator
+	      method.kind = "method";
+	      this.parsePropertyName(method);
+	      if (this.isNonstaticConstructor(method)) {
+	        this.raise(method.key.start, "Constructor can't be a generator");
+	      }
+	      if (!method.computed && method.static && (method.key.name === "prototype" || method.key.value === "prototype")) {
+	        this.raise(method.key.start, "Classes may not have static property named prototype");
+	      }
+	      this.parseClassMethod(classBody, method, true, false);
+	    } else {
+	      var isSimple = this.match(types.name);
+	      var _key = this.parsePropertyName(method);
+	      if (!method.computed && method.static && (method.key.name === "prototype" || method.key.value === "prototype")) {
+	        this.raise(method.key.start, "Classes may not have static property named prototype");
+	      }
+	      if (this.isClassMethod()) {
+	        // a normal method
+	        if (this.isNonstaticConstructor(method)) {
+	          if (hadConstructor) {
+	            this.raise(_key.start, "Duplicate constructor in the same class");
+	          } else if (method.decorators) {
+	            this.raise(method.start, "You can't attach decorators to a class constructor");
+	          }
+	          hadConstructor = true;
+	          method.kind = "constructor";
+	        } else {
+	          method.kind = "method";
+	        }
+	        this.parseClassMethod(classBody, method, false, false);
+	      } else if (this.isClassProperty()) {
+	        // a normal property
+	        if (this.isNonstaticConstructor(method)) {
+	          this.raise(method.key.start, "Classes may not have a non-static field named 'constructor'");
+	        }
+	        classBody.body.push(this.parseClassProperty(method));
+	      } else if (isSimple && _key.name === "async" && !this.isLineTerminator()) {
+	        // an async method
+	        var isGenerator = this.hasPlugin("asyncGenerators") && this.eat(types.star);
+	        method.kind = "method";
+	        this.parsePropertyName(method);
+	        if (this.isNonstaticConstructor(method)) {
+	          this.raise(method.key.start, "Constructor can't be an async function");
+	        }
+	        this.parseClassMethod(classBody, method, isGenerator, true);
+	      } else if (isSimple && (_key.name === "get" || _key.name === "set") && !(this.isLineTerminator() && this.match(types.star))) {
+	        // `get\n*` is an uninitialized property named 'get' followed by a generator.
+	        // a getter or setter
+	        method.kind = _key.name;
+	        this.parsePropertyName(method);
+	        if (this.isNonstaticConstructor(method)) {
+	          this.raise(method.key.start, "Constructor can't have get/set modifier");
+	        }
+	        this.parseClassMethod(classBody, method, false, false);
+	        this.checkGetterSetterParamCount(method);
+	      } else if (this.hasPlugin("classConstructorCall") && isSimple && _key.name === "call" && this.match(types.name) && this.state.value === "constructor") {
+	        // a (deprecated) call constructor
+	        if (hadConstructorCall) {
+	          this.raise(method.start, "Duplicate constructor call in the same class");
+	        } else if (method.decorators) {
+	          this.raise(method.start, "You can't attach decorators to a class constructor");
+	        }
+	        hadConstructorCall = true;
+	        method.kind = "constructorCall";
+	        this.parsePropertyName(method); // consume "constructor" and make it the method's name
+	        this.parseClassMethod(classBody, method, false, false);
+	      } else if (this.isLineTerminator()) {
+	        // an uninitialized class property (due to ASI, since we don't otherwise recognize the next token)
+	        if (this.isNonstaticConstructor(method)) {
+	          this.raise(method.key.start, "Classes may not have a non-static field named 'constructor'");
+	        }
+	        classBody.body.push(this.parseClassProperty(method));
+	      } else {
+	        this.unexpected();
+	      }
+	    }
+	  }
+
+	  if (decorators.length) {
+	    this.raise(this.state.start, "You have trailing decorators with no method");
+	  }
+
+	  node.body = this.finishNode(classBody, "ClassBody");
+
+	  this.state.strict = oldStrict;
+	};
+
+	pp$1.parseClassProperty = function (node) {
+	  this.state.inClassProperty = true;
+	  if (this.match(types.eq)) {
+	    if (!this.hasPlugin("classProperties")) this.unexpected();
+	    this.next();
+	    node.value = this.parseMaybeAssign();
+	  } else {
+	    node.value = null;
+	  }
+	  this.semicolon();
+	  this.state.inClassProperty = false;
+	  return this.finishNode(node, "ClassProperty");
+	};
+
+	pp$1.parseClassMethod = function (classBody, method, isGenerator, isAsync) {
+	  this.parseMethod(method, isGenerator, isAsync);
+	  classBody.body.push(this.finishNode(method, "ClassMethod"));
+	};
+
+	pp$1.parseClassId = function (node, isStatement, optionalId) {
+	  if (this.match(types.name)) {
+	    node.id = this.parseIdentifier();
+	  } else {
+	    if (optionalId || !isStatement) {
+	      node.id = null;
+	    } else {
+	      this.unexpected();
+	    }
+	  }
+	};
+
+	pp$1.parseClassSuper = function (node) {
+	  node.superClass = this.eat(types._extends) ? this.parseExprSubscripts() : null;
+	};
+
+	// Parses module export declaration.
+
+	pp$1.parseExport = function (node) {
+	  this.next();
+	  // export * from '...'
+	  if (this.match(types.star)) {
+	    var specifier = this.startNode();
+	    this.next();
+	    if (this.hasPlugin("exportExtensions") && this.eatContextual("as")) {
+	      specifier.exported = this.parseIdentifier();
+	      node.specifiers = [this.finishNode(specifier, "ExportNamespaceSpecifier")];
+	      this.parseExportSpecifiersMaybe(node);
+	      this.parseExportFrom(node, true);
+	    } else {
+	      this.parseExportFrom(node, true);
+	      return this.finishNode(node, "ExportAllDeclaration");
+	    }
+	  } else if (this.hasPlugin("exportExtensions") && this.isExportDefaultSpecifier()) {
+	    var _specifier = this.startNode();
+	    _specifier.exported = this.parseIdentifier(true);
+	    node.specifiers = [this.finishNode(_specifier, "ExportDefaultSpecifier")];
+	    if (this.match(types.comma) && this.lookahead().type === types.star) {
+	      this.expect(types.comma);
+	      var _specifier2 = this.startNode();
+	      this.expect(types.star);
+	      this.expectContextual("as");
+	      _specifier2.exported = this.parseIdentifier();
+	      node.specifiers.push(this.finishNode(_specifier2, "ExportNamespaceSpecifier"));
+	    } else {
+	      this.parseExportSpecifiersMaybe(node);
+	    }
+	    this.parseExportFrom(node, true);
+	  } else if (this.eat(types._default)) {
+	    // export default ...
+	    var expr = this.startNode();
+	    var needsSemi = false;
+	    if (this.eat(types._function)) {
+	      expr = this.parseFunction(expr, true, false, false, true);
+	    } else if (this.match(types._class)) {
+	      expr = this.parseClass(expr, true, true);
+	    } else {
+	      needsSemi = true;
+	      expr = this.parseMaybeAssign();
+	    }
+	    node.declaration = expr;
+	    if (needsSemi) this.semicolon();
+	    this.checkExport(node, true, true);
+	    return this.finishNode(node, "ExportDefaultDeclaration");
+	  } else if (this.shouldParseExportDeclaration()) {
+	    node.specifiers = [];
+	    node.source = null;
+	    node.declaration = this.parseExportDeclaration(node);
+	  } else {
+	    // export { x, y as z } [from '...']
+	    node.declaration = null;
+	    node.specifiers = this.parseExportSpecifiers();
+	    this.parseExportFrom(node);
+	  }
+	  this.checkExport(node, true);
+	  return this.finishNode(node, "ExportNamedDeclaration");
+	};
+
+	pp$1.parseExportDeclaration = function () {
+	  return this.parseStatement(true);
+	};
+
+	pp$1.isExportDefaultSpecifier = function () {
+	  if (this.match(types.name)) {
+	    return this.state.value !== "async";
+	  }
+
+	  if (!this.match(types._default)) {
+	    return false;
+	  }
+
+	  var lookahead = this.lookahead();
+	  return lookahead.type === types.comma || lookahead.type === types.name && lookahead.value === "from";
+	};
+
+	pp$1.parseExportSpecifiersMaybe = function (node) {
+	  if (this.eat(types.comma)) {
+	    node.specifiers = node.specifiers.concat(this.parseExportSpecifiers());
+	  }
+	};
+
+	pp$1.parseExportFrom = function (node, expect) {
+	  if (this.eatContextual("from")) {
+	    node.source = this.match(types.string) ? this.parseExprAtom() : this.unexpected();
+	    this.checkExport(node);
+	  } else {
+	    if (expect) {
+	      this.unexpected();
+	    } else {
+	      node.source = null;
+	    }
+	  }
+
+	  this.semicolon();
+	};
+
+	pp$1.shouldParseExportDeclaration = function () {
+	  return this.state.type.keyword === "var" || this.state.type.keyword === "const" || this.state.type.keyword === "let" || this.state.type.keyword === "function" || this.state.type.keyword === "class" || this.isContextual("async");
+	};
+
+	pp$1.checkExport = function (node, checkNames, isDefault) {
+	  if (checkNames) {
+	    // Check for duplicate exports
+	    if (isDefault) {
+	      // Default exports
+	      this.checkDuplicateExports(node, "default");
+	    } else if (node.specifiers && node.specifiers.length) {
+	      // Named exports
+	      for (var _iterator2 = node.specifiers, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+	        var _ref2;
+
+	        if (_isArray2) {
+	          if (_i2 >= _iterator2.length) break;
+	          _ref2 = _iterator2[_i2++];
+	        } else {
+	          _i2 = _iterator2.next();
+	          if (_i2.done) break;
+	          _ref2 = _i2.value;
+	        }
+
+	        var specifier = _ref2;
+
+	        this.checkDuplicateExports(specifier, specifier.exported.name);
+	      }
+	    } else if (node.declaration) {
+	      // Exported declarations
+	      if (node.declaration.type === "FunctionDeclaration" || node.declaration.type === "ClassDeclaration") {
+	        this.checkDuplicateExports(node, node.declaration.id.name);
+	      } else if (node.declaration.type === "VariableDeclaration") {
+	        for (var _iterator3 = node.declaration.declarations, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+	          var _ref3;
+
+	          if (_isArray3) {
+	            if (_i3 >= _iterator3.length) break;
+	            _ref3 = _iterator3[_i3++];
+	          } else {
+	            _i3 = _iterator3.next();
+	            if (_i3.done) break;
+	            _ref3 = _i3.value;
+	          }
+
+	          var declaration = _ref3;
+
+	          this.checkDeclaration(declaration.id);
+	        }
+	      }
+	    }
+	  }
+
+	  if (this.state.decorators.length) {
+	    var isClass = node.declaration && (node.declaration.type === "ClassDeclaration" || node.declaration.type === "ClassExpression");
+	    if (!node.declaration || !isClass) {
+	      this.raise(node.start, "You can only use decorators on an export when exporting a class");
+	    }
+	    this.takeDecorators(node.declaration);
+	  }
+	};
+
+	pp$1.checkDeclaration = function (node) {
+	  if (node.type === "ObjectPattern") {
+	    for (var _iterator4 = node.properties, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) {
+	      var _ref4;
+
+	      if (_isArray4) {
+	        if (_i4 >= _iterator4.length) break;
+	        _ref4 = _iterator4[_i4++];
+	      } else {
+	        _i4 = _iterator4.next();
+	        if (_i4.done) break;
+	        _ref4 = _i4.value;
+	      }
+
+	      var prop = _ref4;
+
+	      this.checkDeclaration(prop);
+	    }
+	  } else if (node.type === "ArrayPattern") {
+	    for (var _iterator5 = node.elements, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) {
+	      var _ref5;
+
+	      if (_isArray5) {
+	        if (_i5 >= _iterator5.length) break;
+	        _ref5 = _iterator5[_i5++];
+	      } else {
+	        _i5 = _iterator5.next();
+	        if (_i5.done) break;
+	        _ref5 = _i5.value;
+	      }
+
+	      var elem = _ref5;
+
+	      if (elem) {
+	        this.checkDeclaration(elem);
+	      }
+	    }
+	  } else if (node.type === "ObjectProperty") {
+	    this.checkDeclaration(node.value);
+	  } else if (node.type === "RestElement" || node.type === "RestProperty") {
+	    this.checkDeclaration(node.argument);
+	  } else if (node.type === "Identifier") {
+	    this.checkDuplicateExports(node, node.name);
+	  }
+	};
+
+	pp$1.checkDuplicateExports = function (node, name) {
+	  if (this.state.exportedIdentifiers.indexOf(name) > -1) {
+	    this.raiseDuplicateExportError(node, name);
+	  }
+	  this.state.exportedIdentifiers.push(name);
+	};
+
+	pp$1.raiseDuplicateExportError = function (node, name) {
+	  this.raise(node.start, name === "default" ? "Only one default export allowed per module." : "`" + name + "` has already been exported. Exported identifiers must be unique.");
+	};
+
+	// Parses a comma-separated list of module exports.
+
+	pp$1.parseExportSpecifiers = function () {
+	  var nodes = [];
+	  var first = true;
+	  var needsFrom = void 0;
+
+	  // export { x, y as z } [from '...']
+	  this.expect(types.braceL);
+
+	  while (!this.eat(types.braceR)) {
+	    if (first) {
+	      first = false;
+	    } else {
+	      this.expect(types.comma);
+	      if (this.eat(types.braceR)) break;
+	    }
+
+	    var isDefault = this.match(types._default);
+	    if (isDefault && !needsFrom) needsFrom = true;
+
+	    var node = this.startNode();
+	    node.local = this.parseIdentifier(isDefault);
+	    node.exported = this.eatContextual("as") ? this.parseIdentifier(true) : node.local.__clone();
+	    nodes.push(this.finishNode(node, "ExportSpecifier"));
+	  }
+
+	  // https://github.com/ember-cli/ember-cli/pull/3739
+	  if (needsFrom && !this.isContextual("from")) {
+	    this.unexpected();
+	  }
+
+	  return nodes;
+	};
+
+	// Parses import declaration.
+
+	pp$1.parseImport = function (node) {
+	  this.eat(types._import);
+
+	  // import '...'
+	  if (this.match(types.string)) {
+	    node.specifiers = [];
+	    node.source = this.parseExprAtom();
+	  } else {
+	    node.specifiers = [];
+	    this.parseImportSpecifiers(node);
+	    this.expectContextual("from");
+	    node.source = this.match(types.string) ? this.parseExprAtom() : this.unexpected();
+	  }
+	  this.semicolon();
+	  return this.finishNode(node, "ImportDeclaration");
+	};
+
+	// Parses a comma-separated list of module imports.
+
+	pp$1.parseImportSpecifiers = function (node) {
+	  var first = true;
+	  if (this.match(types.name)) {
+	    // import defaultObj, { x, y as z } from '...'
+	    var startPos = this.state.start;
+	    var startLoc = this.state.startLoc;
+	    node.specifiers.push(this.parseImportSpecifierDefault(this.parseIdentifier(), startPos, startLoc));
+	    if (!this.eat(types.comma)) return;
+	  }
+
+	  if (this.match(types.star)) {
+	    var specifier = this.startNode();
+	    this.next();
+	    this.expectContextual("as");
+	    specifier.local = this.parseIdentifier();
+	    this.checkLVal(specifier.local, true, undefined, "import namespace specifier");
+	    node.specifiers.push(this.finishNode(specifier, "ImportNamespaceSpecifier"));
+	    return;
+	  }
+
+	  this.expect(types.braceL);
+	  while (!this.eat(types.braceR)) {
+	    if (first) {
+	      first = false;
+	    } else {
+	      // Detect an attempt to deep destructure
+	      if (this.eat(types.colon)) {
+	        this.unexpected(null, "ES2015 named imports do not destructure. Use another statement for destructuring after the import.");
+	      }
+
+	      this.expect(types.comma);
+	      if (this.eat(types.braceR)) break;
+	    }
+
+	    this.parseImportSpecifier(node);
+	  }
+	};
+
+	pp$1.parseImportSpecifier = function (node) {
+	  var specifier = this.startNode();
+	  specifier.imported = this.parseIdentifier(true);
+	  if (this.eatContextual("as")) {
+	    specifier.local = this.parseIdentifier();
+	  } else {
+	    this.checkReservedWord(specifier.imported.name, specifier.start, true, true);
+	    specifier.local = specifier.imported.__clone();
+	  }
+	  this.checkLVal(specifier.local, true, undefined, "import specifier");
+	  node.specifiers.push(this.finishNode(specifier, "ImportSpecifier"));
+	};
+
+	pp$1.parseImportSpecifierDefault = function (id, startPos, startLoc) {
+	  var node = this.startNodeAt(startPos, startLoc);
+	  node.local = id;
+	  this.checkLVal(node.local, true, undefined, "default import specifier");
+	  return this.finishNode(node, "ImportDefaultSpecifier");
+	};
+
+	var pp$2 = Parser.prototype;
+
+	// Convert existing expression atom to assignable pattern
+	// if possible.
+
+	pp$2.toAssignable = function (node, isBinding, contextDescription) {
+	  if (node) {
+	    switch (node.type) {
+	      case "Identifier":
+	      case "ObjectPattern":
+	      case "ArrayPattern":
+	      case "AssignmentPattern":
+	        break;
+
+	      case "ObjectExpression":
+	        node.type = "ObjectPattern";
+	        for (var _iterator = node.properties, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+	          var _ref;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref = _i.value;
+	          }
+
+	          var prop = _ref;
+
+	          if (prop.type === "ObjectMethod") {
+	            if (prop.kind === "get" || prop.kind === "set") {
+	              this.raise(prop.key.start, "Object pattern can't contain getter or setter");
+	            } else {
+	              this.raise(prop.key.start, "Object pattern can't contain methods");
+	            }
+	          } else {
+	            this.toAssignable(prop, isBinding, "object destructuring pattern");
+	          }
+	        }
+	        break;
+
+	      case "ObjectProperty":
+	        this.toAssignable(node.value, isBinding, contextDescription);
+	        break;
+
+	      case "SpreadProperty":
+	        node.type = "RestProperty";
+	        var arg = node.argument;
+	        this.toAssignable(arg, isBinding, contextDescription);
+	        break;
+
+	      case "ArrayExpression":
+	        node.type = "ArrayPattern";
+	        this.toAssignableList(node.elements, isBinding, contextDescription);
+	        break;
+
+	      case "AssignmentExpression":
+	        if (node.operator === "=") {
+	          node.type = "AssignmentPattern";
+	          delete node.operator;
+	        } else {
+	          this.raise(node.left.end, "Only '=' operator can be used for specifying default value.");
+	        }
+	        break;
+
+	      case "MemberExpression":
+	        if (!isBinding) break;
+
+	      default:
+	        {
+	          var message = "Invalid left-hand side" + (contextDescription ? " in " + contextDescription : /* istanbul ignore next */"expression");
+	          this.raise(node.start, message);
+	        }
+	    }
+	  }
+	  return node;
+	};
+
+	// Convert list of expression atoms to binding list.
+
+	pp$2.toAssignableList = function (exprList, isBinding, contextDescription) {
+	  var end = exprList.length;
+	  if (end) {
+	    var last = exprList[end - 1];
+	    if (last && last.type === "RestElement") {
+	      --end;
+	    } else if (last && last.type === "SpreadElement") {
+	      last.type = "RestElement";
+	      var arg = last.argument;
+	      this.toAssignable(arg, isBinding, contextDescription);
+	      if (arg.type !== "Identifier" && arg.type !== "MemberExpression" && arg.type !== "ArrayPattern") {
+	        this.unexpected(arg.start);
+	      }
+	      --end;
+	    }
+	  }
+	  for (var i = 0; i < end; i++) {
+	    var elt = exprList[i];
+	    if (elt) this.toAssignable(elt, isBinding, contextDescription);
+	  }
+	  return exprList;
+	};
+
+	// Convert list of expression atoms to a list of
+
+	pp$2.toReferencedList = function (exprList) {
+	  return exprList;
+	};
+
+	// Parses spread element.
+
+	pp$2.parseSpread = function (refShorthandDefaultPos) {
+	  var node = this.startNode();
+	  this.next();
+	  node.argument = this.parseMaybeAssign(false, refShorthandDefaultPos);
+	  return this.finishNode(node, "SpreadElement");
+	};
+
+	pp$2.parseRest = function () {
+	  var node = this.startNode();
+	  this.next();
+	  node.argument = this.parseBindingIdentifier();
+	  return this.finishNode(node, "RestElement");
+	};
+
+	pp$2.shouldAllowYieldIdentifier = function () {
+	  return this.match(types._yield) && !this.state.strict && !this.state.inGenerator;
+	};
+
+	pp$2.parseBindingIdentifier = function () {
+	  return this.parseIdentifier(this.shouldAllowYieldIdentifier());
+	};
+
+	// Parses lvalue (assignable) atom.
+
+	pp$2.parseBindingAtom = function () {
+	  switch (this.state.type) {
+	    case types._yield:
+	      if (this.state.strict || this.state.inGenerator) this.unexpected();
+	    // fall-through
+	    case types.name:
+	      return this.parseIdentifier(true);
+
+	    case types.bracketL:
+	      var node = this.startNode();
+	      this.next();
+	      node.elements = this.parseBindingList(types.bracketR, true);
+	      return this.finishNode(node, "ArrayPattern");
+
+	    case types.braceL:
+	      return this.parseObj(true);
+
+	    default:
+	      this.unexpected();
+	  }
+	};
+
+	pp$2.parseBindingList = function (close, allowEmpty) {
+	  var elts = [];
+	  var first = true;
+	  while (!this.eat(close)) {
+	    if (first) {
+	      first = false;
+	    } else {
+	      this.expect(types.comma);
+	    }
+	    if (allowEmpty && this.match(types.comma)) {
+	      elts.push(null);
+	    } else if (this.eat(close)) {
+	      break;
+	    } else if (this.match(types.ellipsis)) {
+	      elts.push(this.parseAssignableListItemTypes(this.parseRest()));
+	      this.expect(close);
+	      break;
+	    } else {
+	      var decorators = [];
+	      while (this.match(types.at)) {
+	        decorators.push(this.parseDecorator());
+	      }
+	      var left = this.parseMaybeDefault();
+	      if (decorators.length) {
+	        left.decorators = decorators;
+	      }
+	      this.parseAssignableListItemTypes(left);
+	      elts.push(this.parseMaybeDefault(left.start, left.loc.start, left));
+	    }
+	  }
+	  return elts;
+	};
+
+	pp$2.parseAssignableListItemTypes = function (param) {
+	  return param;
+	};
+
+	// Parses assignment pattern around given atom if possible.
+
+	pp$2.parseMaybeDefault = function (startPos, startLoc, left) {
+	  startLoc = startLoc || this.state.startLoc;
+	  startPos = startPos || this.state.start;
+	  left = left || this.parseBindingAtom();
+	  if (!this.eat(types.eq)) return left;
+
+	  var node = this.startNodeAt(startPos, startLoc);
+	  node.left = left;
+	  node.right = this.parseMaybeAssign();
+	  return this.finishNode(node, "AssignmentPattern");
+	};
+
+	// Verify that a node is an lval — something that can be assigned
+	// to.
+
+	pp$2.checkLVal = function (expr, isBinding, checkClashes, contextDescription) {
+	  switch (expr.type) {
+	    case "Identifier":
+	      this.checkReservedWord(expr.name, expr.start, false, true);
+
+	      if (checkClashes) {
+	        // we need to prefix this with an underscore for the cases where we have a key of
+	        // `__proto__`. there's a bug in old V8 where the following wouldn't work:
+	        //
+	        //   > var obj = Object.create(null);
+	        //   undefined
+	        //   > obj.__proto__
+	        //   null
+	        //   > obj.__proto__ = true;
+	        //   true
+	        //   > obj.__proto__
+	        //   null
+	        var key = "_" + expr.name;
+
+	        if (checkClashes[key]) {
+	          this.raise(expr.start, "Argument name clash in strict mode");
+	        } else {
+	          checkClashes[key] = true;
+	        }
+	      }
+	      break;
+
+	    case "MemberExpression":
+	      if (isBinding) this.raise(expr.start, (isBinding ? "Binding" : "Assigning to") + " member expression");
+	      break;
+
+	    case "ObjectPattern":
+	      for (var _iterator2 = expr.properties, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+	        var _ref2;
+
+	        if (_isArray2) {
+	          if (_i2 >= _iterator2.length) break;
+	          _ref2 = _iterator2[_i2++];
+	        } else {
+	          _i2 = _iterator2.next();
+	          if (_i2.done) break;
+	          _ref2 = _i2.value;
+	        }
+
+	        var prop = _ref2;
+
+	        if (prop.type === "ObjectProperty") prop = prop.value;
+	        this.checkLVal(prop, isBinding, checkClashes, "object destructuring pattern");
+	      }
+	      break;
+
+	    case "ArrayPattern":
+	      for (var _iterator3 = expr.elements, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+	        var _ref3;
+
+	        if (_isArray3) {
+	          if (_i3 >= _iterator3.length) break;
+	          _ref3 = _iterator3[_i3++];
+	        } else {
+	          _i3 = _iterator3.next();
+	          if (_i3.done) break;
+	          _ref3 = _i3.value;
+	        }
+
+	        var elem = _ref3;
+
+	        if (elem) this.checkLVal(elem, isBinding, checkClashes, "array destructuring pattern");
+	      }
+	      break;
+
+	    case "AssignmentPattern":
+	      this.checkLVal(expr.left, isBinding, checkClashes, "assignment pattern");
+	      break;
+
+	    case "RestProperty":
+	      this.checkLVal(expr.argument, isBinding, checkClashes, "rest property");
+	      break;
+
+	    case "RestElement":
+	      this.checkLVal(expr.argument, isBinding, checkClashes, "rest element");
+	      break;
+
+	    default:
+	      {
+	        var message = (isBinding ? /* istanbul ignore next */"Binding invalid" : "Invalid") + " left-hand side" + (contextDescription ? " in " + contextDescription : /* istanbul ignore next */"expression");
+	        this.raise(expr.start, message);
+	      }
+	  }
+	};
+
+	/* eslint max-len: 0 */
+
+	// A recursive descent parser operates by defining functions for all
+	// syntactic elements, and recursively calling those, each function
+	// advancing the input stream and returning an AST node. Precedence
+	// of constructs (for example, the fact that `!x[1]` means `!(x[1])`
+	// instead of `(!x)[1]` is handled by the fact that the parser
+	// function that parses unary prefix operators is called first, and
+	// in turn calls the function that parses `[]` subscripts — that
+	// way, it'll receive the node for `x[1]` already parsed, and wraps
+	// *that* in the unary operator node.
+	//
+	// Acorn uses an [operator precedence parser][opp] to handle binary
+	// operator precedence, because it is much more compact than using
+	// the technique outlined above, which uses different, nesting
+	// functions to specify precedence, for all of the ten binary
+	// precedence levels that JavaScript defines.
+	//
+	// [opp]: http://en.wikipedia.org/wiki/Operator-precedence_parser
+
+	var pp$3 = Parser.prototype;
+
+	// Check if property name clashes with already added.
+	// Object/class getters and setters are not allowed to clash —
+	// either with each other or with an init property — and in
+	// strict mode, init properties are also not allowed to be repeated.
+
+	pp$3.checkPropClash = function (prop, propHash) {
+	  if (prop.computed || prop.kind) return;
+
+	  var key = prop.key;
+	  // It is either an Identifier or a String/NumericLiteral
+	  var name = key.type === "Identifier" ? key.name : String(key.value);
+
+	  if (name === "__proto__") {
+	    if (propHash.proto) this.raise(key.start, "Redefinition of __proto__ property");
+	    propHash.proto = true;
+	  }
+	};
+
+	// Convenience method to parse an Expression only
+	pp$3.getExpression = function () {
+	  this.nextToken();
+	  var expr = this.parseExpression();
+	  if (!this.match(types.eof)) {
+	    this.unexpected();
+	  }
+	  return expr;
+	};
+
+	// ### Expression parsing
+
+	// These nest, from the most general expression type at the top to
+	// 'atomic', nondivisible expression types at the bottom. Most of
+	// the functions will simply let the function (s) below them parse,
+	// and, *if* the syntactic construct they handle is present, wrap
+	// the AST node that the inner parser gave them in another node.
+
+	// Parse a full expression. The optional arguments are used to
+	// forbid the `in` operator (in for loops initialization expressions)
+	// and provide reference for storing '=' operator inside shorthand
+	// property assignment in contexts where both object expression
+	// and object pattern might appear (so it's possible to raise
+	// delayed syntax error at correct position).
+
+	pp$3.parseExpression = function (noIn, refShorthandDefaultPos) {
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+	  var expr = this.parseMaybeAssign(noIn, refShorthandDefaultPos);
+	  if (this.match(types.comma)) {
+	    var node = this.startNodeAt(startPos, startLoc);
+	    node.expressions = [expr];
+	    while (this.eat(types.comma)) {
+	      node.expressions.push(this.parseMaybeAssign(noIn, refShorthandDefaultPos));
+	    }
+	    this.toReferencedList(node.expressions);
+	    return this.finishNode(node, "SequenceExpression");
+	  }
+	  return expr;
+	};
+
+	// Parse an assignment expression. This includes applications of
+	// operators like `+=`.
+
+	pp$3.parseMaybeAssign = function (noIn, refShorthandDefaultPos, afterLeftParse, refNeedsArrowPos) {
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+
+	  if (this.match(types._yield) && this.state.inGenerator) {
+	    var _left = this.parseYield();
+	    if (afterLeftParse) _left = afterLeftParse.call(this, _left, startPos, startLoc);
+	    return _left;
+	  }
+
+	  var failOnShorthandAssign = void 0;
+	  if (refShorthandDefaultPos) {
+	    failOnShorthandAssign = false;
+	  } else {
+	    refShorthandDefaultPos = { start: 0 };
+	    failOnShorthandAssign = true;
+	  }
+
+	  if (this.match(types.parenL) || this.match(types.name)) {
+	    this.state.potentialArrowAt = this.state.start;
+	  }
+
+	  var left = this.parseMaybeConditional(noIn, refShorthandDefaultPos, refNeedsArrowPos);
+	  if (afterLeftParse) left = afterLeftParse.call(this, left, startPos, startLoc);
+	  if (this.state.type.isAssign) {
+	    var node = this.startNodeAt(startPos, startLoc);
+	    node.operator = this.state.value;
+	    node.left = this.match(types.eq) ? this.toAssignable(left, undefined, "assignment expression") : left;
+	    refShorthandDefaultPos.start = 0; // reset because shorthand default was used correctly
+
+	    this.checkLVal(left, undefined, undefined, "assignment expression");
+
+	    if (left.extra && left.extra.parenthesized) {
+	      var errorMsg = void 0;
+	      if (left.type === "ObjectPattern") {
+	        errorMsg = "`({a}) = 0` use `({a} = 0)`";
+	      } else if (left.type === "ArrayPattern") {
+	        errorMsg = "`([a]) = 0` use `([a] = 0)`";
+	      }
+	      if (errorMsg) {
+	        this.raise(left.start, "You're trying to assign to a parenthesized expression, eg. instead of " + errorMsg);
+	      }
+	    }
+
+	    this.next();
+	    node.right = this.parseMaybeAssign(noIn);
+	    return this.finishNode(node, "AssignmentExpression");
+	  } else if (failOnShorthandAssign && refShorthandDefaultPos.start) {
+	    this.unexpected(refShorthandDefaultPos.start);
+	  }
+
+	  return left;
+	};
+
+	// Parse a ternary conditional (`?:`) operator.
+
+	pp$3.parseMaybeConditional = function (noIn, refShorthandDefaultPos, refNeedsArrowPos) {
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+	  var expr = this.parseExprOps(noIn, refShorthandDefaultPos);
+	  if (refShorthandDefaultPos && refShorthandDefaultPos.start) return expr;
+
+	  return this.parseConditional(expr, noIn, startPos, startLoc, refNeedsArrowPos);
+	};
+
+	pp$3.parseConditional = function (expr, noIn, startPos, startLoc) {
+	  if (this.eat(types.question)) {
+	    var node = this.startNodeAt(startPos, startLoc);
+	    node.test = expr;
+	    node.consequent = this.parseMaybeAssign();
+	    this.expect(types.colon);
+	    node.alternate = this.parseMaybeAssign(noIn);
+	    return this.finishNode(node, "ConditionalExpression");
+	  }
+	  return expr;
+	};
+
+	// Start the precedence parser.
+
+	pp$3.parseExprOps = function (noIn, refShorthandDefaultPos) {
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+	  var expr = this.parseMaybeUnary(refShorthandDefaultPos);
+	  if (refShorthandDefaultPos && refShorthandDefaultPos.start) {
+	    return expr;
+	  } else {
+	    return this.parseExprOp(expr, startPos, startLoc, -1, noIn);
+	  }
+	};
+
+	// Parse binary operators with the operator precedence parsing
+	// algorithm. `left` is the left-hand side of the operator.
+	// `minPrec` provides context that allows the function to stop and
+	// defer further parser to one of its callers when it encounters an
+	// operator that has a lower precedence than the set it is parsing.
+
+	pp$3.parseExprOp = function (left, leftStartPos, leftStartLoc, minPrec, noIn) {
+	  var prec = this.state.type.binop;
+	  if (prec != null && (!noIn || !this.match(types._in))) {
+	    if (prec > minPrec) {
+	      var node = this.startNodeAt(leftStartPos, leftStartLoc);
+	      node.left = left;
+	      node.operator = this.state.value;
+
+	      if (node.operator === "**" && left.type === "UnaryExpression" && left.extra && !left.extra.parenthesizedArgument && !left.extra.parenthesized) {
+	        this.raise(left.argument.start, "Illegal expression. Wrap left hand side or entire exponentiation in parentheses.");
+	      }
+
+	      var op = this.state.type;
+	      this.next();
+
+	      var startPos = this.state.start;
+	      var startLoc = this.state.startLoc;
+	      node.right = this.parseExprOp(this.parseMaybeUnary(), startPos, startLoc, op.rightAssociative ? prec - 1 : prec, noIn);
+
+	      this.finishNode(node, op === types.logicalOR || op === types.logicalAND ? "LogicalExpression" : "BinaryExpression");
+	      return this.parseExprOp(node, leftStartPos, leftStartLoc, minPrec, noIn);
+	    }
+	  }
+	  return left;
+	};
+
+	// Parse unary operators, both prefix and postfix.
+
+	pp$3.parseMaybeUnary = function (refShorthandDefaultPos) {
+	  if (this.state.type.prefix) {
+	    var node = this.startNode();
+	    var update = this.match(types.incDec);
+	    node.operator = this.state.value;
+	    node.prefix = true;
+	    this.next();
+
+	    var argType = this.state.type;
+	    node.argument = this.parseMaybeUnary();
+
+	    this.addExtra(node, "parenthesizedArgument", argType === types.parenL && (!node.argument.extra || !node.argument.extra.parenthesized));
+
+	    if (refShorthandDefaultPos && refShorthandDefaultPos.start) {
+	      this.unexpected(refShorthandDefaultPos.start);
+	    }
+
+	    if (update) {
+	      this.checkLVal(node.argument, undefined, undefined, "prefix operation");
+	    } else if (this.state.strict && node.operator === "delete" && node.argument.type === "Identifier") {
+	      this.raise(node.start, "Deleting local variable in strict mode");
+	    }
+
+	    return this.finishNode(node, update ? "UpdateExpression" : "UnaryExpression");
+	  }
+
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+	  var expr = this.parseExprSubscripts(refShorthandDefaultPos);
+	  if (refShorthandDefaultPos && refShorthandDefaultPos.start) return expr;
+	  while (this.state.type.postfix && !this.canInsertSemicolon()) {
+	    var _node = this.startNodeAt(startPos, startLoc);
+	    _node.operator = this.state.value;
+	    _node.prefix = false;
+	    _node.argument = expr;
+	    this.checkLVal(expr, undefined, undefined, "postfix operation");
+	    this.next();
+	    expr = this.finishNode(_node, "UpdateExpression");
+	  }
+	  return expr;
+	};
+
+	// Parse call, dot, and `[]`-subscript expressions.
+
+	pp$3.parseExprSubscripts = function (refShorthandDefaultPos) {
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+	  var potentialArrowAt = this.state.potentialArrowAt;
+	  var expr = this.parseExprAtom(refShorthandDefaultPos);
+
+	  if (expr.type === "ArrowFunctionExpression" && expr.start === potentialArrowAt) {
+	    return expr;
+	  }
+
+	  if (refShorthandDefaultPos && refShorthandDefaultPos.start) {
+	    return expr;
+	  }
+
+	  return this.parseSubscripts(expr, startPos, startLoc);
+	};
+
+	pp$3.parseSubscripts = function (base, startPos, startLoc, noCalls) {
+	  for (;;) {
+	    if (!noCalls && this.eat(types.doubleColon)) {
+	      var node = this.startNodeAt(startPos, startLoc);
+	      node.object = base;
+	      node.callee = this.parseNoCallExpr();
+	      return this.parseSubscripts(this.finishNode(node, "BindExpression"), startPos, startLoc, noCalls);
+	    } else if (this.eat(types.dot)) {
+	      var _node2 = this.startNodeAt(startPos, startLoc);
+	      _node2.object = base;
+	      _node2.property = this.parseIdentifier(true);
+	      _node2.computed = false;
+	      base = this.finishNode(_node2, "MemberExpression");
+	    } else if (this.eat(types.bracketL)) {
+	      var _node3 = this.startNodeAt(startPos, startLoc);
+	      _node3.object = base;
+	      _node3.property = this.parseExpression();
+	      _node3.computed = true;
+	      this.expect(types.bracketR);
+	      base = this.finishNode(_node3, "MemberExpression");
+	    } else if (!noCalls && this.match(types.parenL)) {
+	      var possibleAsync = this.state.potentialArrowAt === base.start && base.type === "Identifier" && base.name === "async" && !this.canInsertSemicolon();
+	      this.next();
+
+	      var _node4 = this.startNodeAt(startPos, startLoc);
+	      _node4.callee = base;
+	      _node4.arguments = this.parseCallExpressionArguments(types.parenR, possibleAsync);
+	      if (_node4.callee.type === "Import" && _node4.arguments.length !== 1) {
+	        this.raise(_node4.start, "import() requires exactly one argument");
+	      }
+	      base = this.finishNode(_node4, "CallExpression");
+
+	      if (possibleAsync && this.shouldParseAsyncArrow()) {
+	        return this.parseAsyncArrowFromCallExpression(this.startNodeAt(startPos, startLoc), _node4);
+	      } else {
+	        this.toReferencedList(_node4.arguments);
+	      }
+	    } else if (this.match(types.backQuote)) {
+	      var _node5 = this.startNodeAt(startPos, startLoc);
+	      _node5.tag = base;
+	      _node5.quasi = this.parseTemplate(true);
+	      base = this.finishNode(_node5, "TaggedTemplateExpression");
+	    } else {
+	      return base;
+	    }
+	  }
+	};
+
+	pp$3.parseCallExpressionArguments = function (close, possibleAsyncArrow) {
+	  var elts = [];
+	  var innerParenStart = void 0;
+	  var first = true;
+
+	  while (!this.eat(close)) {
+	    if (first) {
+	      first = false;
+	    } else {
+	      this.expect(types.comma);
+	      if (this.eat(close)) break;
+	    }
+
+	    // we need to make sure that if this is an async arrow functions, that we don't allow inner parens inside the params
+	    if (this.match(types.parenL) && !innerParenStart) {
+	      innerParenStart = this.state.start;
+	    }
+
+	    elts.push(this.parseExprListItem(false, possibleAsyncArrow ? { start: 0 } : undefined, possibleAsyncArrow ? { start: 0 } : undefined));
+	  }
+
+	  // we found an async arrow function so let's not allow any inner parens
+	  if (possibleAsyncArrow && innerParenStart && this.shouldParseAsyncArrow()) {
+	    this.unexpected();
+	  }
+
+	  return elts;
+	};
+
+	pp$3.shouldParseAsyncArrow = function () {
+	  return this.match(types.arrow);
+	};
+
+	pp$3.parseAsyncArrowFromCallExpression = function (node, call) {
+	  this.expect(types.arrow);
+	  return this.parseArrowExpression(node, call.arguments, true);
+	};
+
+	// Parse a no-call expression (like argument of `new` or `::` operators).
+
+	pp$3.parseNoCallExpr = function () {
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+	  return this.parseSubscripts(this.parseExprAtom(), startPos, startLoc, true);
+	};
+
+	// Parse an atomic expression — either a single token that is an
+	// expression, an expression started by a keyword like `function` or
+	// `new`, or an expression wrapped in punctuation like `()`, `[]`,
+	// or `{}`.
+
+	pp$3.parseExprAtom = function (refShorthandDefaultPos) {
+	  var canBeArrow = this.state.potentialArrowAt === this.state.start;
+	  var node = void 0;
+
+	  switch (this.state.type) {
+	    case types._super:
+	      if (!this.state.inMethod && !this.state.inClassProperty && !this.options.allowSuperOutsideMethod) {
+	        this.raise(this.state.start, "'super' outside of function or class");
+	      }
+
+	      node = this.startNode();
+	      this.next();
+	      if (!this.match(types.parenL) && !this.match(types.bracketL) && !this.match(types.dot)) {
+	        this.unexpected();
+	      }
+	      if (this.match(types.parenL) && this.state.inMethod !== "constructor" && !this.options.allowSuperOutsideMethod) {
+	        this.raise(node.start, "super() outside of class constructor");
+	      }
+	      return this.finishNode(node, "Super");
+
+	    case types._import:
+	      if (!this.hasPlugin("dynamicImport")) this.unexpected();
+
+	      node = this.startNode();
+	      this.next();
+	      if (!this.match(types.parenL)) {
+	        this.unexpected(null, types.parenL);
+	      }
+	      return this.finishNode(node, "Import");
+
+	    case types._this:
+	      node = this.startNode();
+	      this.next();
+	      return this.finishNode(node, "ThisExpression");
+
+	    case types._yield:
+	      if (this.state.inGenerator) this.unexpected();
+
+	    case types.name:
+	      node = this.startNode();
+	      var allowAwait = this.state.value === "await" && this.state.inAsync;
+	      var allowYield = this.shouldAllowYieldIdentifier();
+	      var id = this.parseIdentifier(allowAwait || allowYield);
+
+	      if (id.name === "await") {
+	        if (this.state.inAsync || this.inModule) {
+	          return this.parseAwait(node);
+	        }
+	      } else if (id.name === "async" && this.match(types._function) && !this.canInsertSemicolon()) {
+	        this.next();
+	        return this.parseFunction(node, false, false, true);
+	      } else if (canBeArrow && id.name === "async" && this.match(types.name)) {
+	        var params = [this.parseIdentifier()];
+	        this.expect(types.arrow);
+	        // let foo = bar => {};
+	        return this.parseArrowExpression(node, params, true);
+	      }
+
+	      if (canBeArrow && !this.canInsertSemicolon() && this.eat(types.arrow)) {
+	        return this.parseArrowExpression(node, [id]);
+	      }
+
+	      return id;
+
+	    case types._do:
+	      if (this.hasPlugin("doExpressions")) {
+	        var _node6 = this.startNode();
+	        this.next();
+	        var oldInFunction = this.state.inFunction;
+	        var oldLabels = this.state.labels;
+	        this.state.labels = [];
+	        this.state.inFunction = false;
+	        _node6.body = this.parseBlock(false, true);
+	        this.state.inFunction = oldInFunction;
+	        this.state.labels = oldLabels;
+	        return this.finishNode(_node6, "DoExpression");
+	      }
+
+	    case types.regexp:
+	      var value = this.state.value;
+	      node = this.parseLiteral(value.value, "RegExpLiteral");
+	      node.pattern = value.pattern;
+	      node.flags = value.flags;
+	      return node;
+
+	    case types.num:
+	      return this.parseLiteral(this.state.value, "NumericLiteral");
+
+	    case types.string:
+	      return this.parseLiteral(this.state.value, "StringLiteral");
+
+	    case types._null:
+	      node = this.startNode();
+	      this.next();
+	      return this.finishNode(node, "NullLiteral");
+
+	    case types._true:case types._false:
+	      node = this.startNode();
+	      node.value = this.match(types._true);
+	      this.next();
+	      return this.finishNode(node, "BooleanLiteral");
+
+	    case types.parenL:
+	      return this.parseParenAndDistinguishExpression(null, null, canBeArrow);
+
+	    case types.bracketL:
+	      node = this.startNode();
+	      this.next();
+	      node.elements = this.parseExprList(types.bracketR, true, refShorthandDefaultPos);
+	      this.toReferencedList(node.elements);
+	      return this.finishNode(node, "ArrayExpression");
+
+	    case types.braceL:
+	      return this.parseObj(false, refShorthandDefaultPos);
+
+	    case types._function:
+	      return this.parseFunctionExpression();
+
+	    case types.at:
+	      this.parseDecorators();
+
+	    case types._class:
+	      node = this.startNode();
+	      this.takeDecorators(node);
+	      return this.parseClass(node, false);
+
+	    case types._new:
+	      return this.parseNew();
+
+	    case types.backQuote:
+	      return this.parseTemplate(false);
+
+	    case types.doubleColon:
+	      node = this.startNode();
+	      this.next();
+	      node.object = null;
+	      var callee = node.callee = this.parseNoCallExpr();
+	      if (callee.type === "MemberExpression") {
+	        return this.finishNode(node, "BindExpression");
+	      } else {
+	        this.raise(callee.start, "Binding should be performed on object property.");
+	      }
+
+	    default:
+	      this.unexpected();
+	  }
+	};
+
+	pp$3.parseFunctionExpression = function () {
+	  var node = this.startNode();
+	  var meta = this.parseIdentifier(true);
+	  if (this.state.inGenerator && this.eat(types.dot) && this.hasPlugin("functionSent")) {
+	    return this.parseMetaProperty(node, meta, "sent");
+	  } else {
+	    return this.parseFunction(node, false);
+	  }
+	};
+
+	pp$3.parseMetaProperty = function (node, meta, propertyName) {
+	  node.meta = meta;
+	  node.property = this.parseIdentifier(true);
+
+	  if (node.property.name !== propertyName) {
+	    this.raise(node.property.start, "The only valid meta property for new is " + meta.name + "." + propertyName);
+	  }
+
+	  return this.finishNode(node, "MetaProperty");
+	};
+
+	pp$3.parseLiteral = function (value, type, startPos, startLoc) {
+	  startPos = startPos || this.state.start;
+	  startLoc = startLoc || this.state.startLoc;
+
+	  var node = this.startNodeAt(startPos, startLoc);
+	  this.addExtra(node, "rawValue", value);
+	  this.addExtra(node, "raw", this.input.slice(startPos, this.state.end));
+	  node.value = value;
+	  this.next();
+	  return this.finishNode(node, type);
+	};
+
+	pp$3.parseParenExpression = function () {
+	  this.expect(types.parenL);
+	  var val = this.parseExpression();
+	  this.expect(types.parenR);
+	  return val;
+	};
+
+	pp$3.parseParenAndDistinguishExpression = function (startPos, startLoc, canBeArrow) {
+	  startPos = startPos || this.state.start;
+	  startLoc = startLoc || this.state.startLoc;
+
+	  var val = void 0;
+	  this.expect(types.parenL);
+
+	  var innerStartPos = this.state.start;
+	  var innerStartLoc = this.state.startLoc;
+	  var exprList = [];
+	  var refShorthandDefaultPos = { start: 0 };
+	  var refNeedsArrowPos = { start: 0 };
+	  var first = true;
+	  var spreadStart = void 0;
+	  var optionalCommaStart = void 0;
+
+	  while (!this.match(types.parenR)) {
+	    if (first) {
+	      first = false;
+	    } else {
+	      this.expect(types.comma, refNeedsArrowPos.start || null);
+	      if (this.match(types.parenR)) {
+	        optionalCommaStart = this.state.start;
+	        break;
+	      }
+	    }
+
+	    if (this.match(types.ellipsis)) {
+	      var spreadNodeStartPos = this.state.start;
+	      var spreadNodeStartLoc = this.state.startLoc;
+	      spreadStart = this.state.start;
+	      exprList.push(this.parseParenItem(this.parseRest(), spreadNodeStartPos, spreadNodeStartLoc));
+	      break;
+	    } else {
+	      exprList.push(this.parseMaybeAssign(false, refShorthandDefaultPos, this.parseParenItem, refNeedsArrowPos));
+	    }
+	  }
+
+	  var innerEndPos = this.state.start;
+	  var innerEndLoc = this.state.startLoc;
+	  this.expect(types.parenR);
+
+	  var arrowNode = this.startNodeAt(startPos, startLoc);
+	  if (canBeArrow && this.shouldParseArrow() && (arrowNode = this.parseArrow(arrowNode))) {
+	    for (var _iterator = exprList, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var param = _ref;
+
+	      if (param.extra && param.extra.parenthesized) this.unexpected(param.extra.parenStart);
+	    }
+
+	    return this.parseArrowExpression(arrowNode, exprList);
+	  }
+
+	  if (!exprList.length) {
+	    this.unexpected(this.state.lastTokStart);
+	  }
+	  if (optionalCommaStart) this.unexpected(optionalCommaStart);
+	  if (spreadStart) this.unexpected(spreadStart);
+	  if (refShorthandDefaultPos.start) this.unexpected(refShorthandDefaultPos.start);
+	  if (refNeedsArrowPos.start) this.unexpected(refNeedsArrowPos.start);
+
+	  if (exprList.length > 1) {
+	    val = this.startNodeAt(innerStartPos, innerStartLoc);
+	    val.expressions = exprList;
+	    this.toReferencedList(val.expressions);
+	    this.finishNodeAt(val, "SequenceExpression", innerEndPos, innerEndLoc);
+	  } else {
+	    val = exprList[0];
+	  }
+
+	  this.addExtra(val, "parenthesized", true);
+	  this.addExtra(val, "parenStart", startPos);
+
+	  return val;
+	};
+
+	pp$3.shouldParseArrow = function () {
+	  return !this.canInsertSemicolon();
+	};
+
+	pp$3.parseArrow = function (node) {
+	  if (this.eat(types.arrow)) {
+	    return node;
+	  }
+	};
+
+	pp$3.parseParenItem = function (node) {
+	  return node;
+	};
+
+	// New's precedence is slightly tricky. It must allow its argument
+	// to be a `[]` or dot subscript expression, but not a call — at
+	// least, not without wrapping it in parentheses. Thus, it uses the
+
+	pp$3.parseNew = function () {
+	  var node = this.startNode();
+	  var meta = this.parseIdentifier(true);
+
+	  if (this.eat(types.dot)) {
+	    var metaProp = this.parseMetaProperty(node, meta, "target");
+
+	    if (!this.state.inFunction) {
+	      this.raise(metaProp.property.start, "new.target can only be used in functions");
+	    }
+
+	    return metaProp;
+	  }
+
+	  node.callee = this.parseNoCallExpr();
+
+	  if (this.eat(types.parenL)) {
+	    node.arguments = this.parseExprList(types.parenR);
+	    this.toReferencedList(node.arguments);
+	  } else {
+	    node.arguments = [];
+	  }
+
+	  return this.finishNode(node, "NewExpression");
+	};
+
+	// Parse template expression.
+
+	pp$3.parseTemplateElement = function (isTagged) {
+	  var elem = this.startNode();
+	  if (this.state.value === null) {
+	    if (!isTagged || !this.hasPlugin("templateInvalidEscapes")) {
+	      this.raise(this.state.invalidTemplateEscapePosition, "Invalid escape sequence in template");
+	    } else {
+	      this.state.invalidTemplateEscapePosition = null;
+	    }
+	  }
+	  elem.value = {
+	    raw: this.input.slice(this.state.start, this.state.end).replace(/\r\n?/g, "\n"),
+	    cooked: this.state.value
+	  };
+	  this.next();
+	  elem.tail = this.match(types.backQuote);
+	  return this.finishNode(elem, "TemplateElement");
+	};
+
+	pp$3.parseTemplate = function (isTagged) {
+	  var node = this.startNode();
+	  this.next();
+	  node.expressions = [];
+	  var curElt = this.parseTemplateElement(isTagged);
+	  node.quasis = [curElt];
+	  while (!curElt.tail) {
+	    this.expect(types.dollarBraceL);
+	    node.expressions.push(this.parseExpression());
+	    this.expect(types.braceR);
+	    node.quasis.push(curElt = this.parseTemplateElement(isTagged));
+	  }
+	  this.next();
+	  return this.finishNode(node, "TemplateLiteral");
+	};
+
+	// Parse an object literal or binding pattern.
+
+	pp$3.parseObj = function (isPattern, refShorthandDefaultPos) {
+	  var decorators = [];
+	  var propHash = Object.create(null);
+	  var first = true;
+	  var node = this.startNode();
+
+	  node.properties = [];
+	  this.next();
+
+	  var firstRestLocation = null;
+
+	  while (!this.eat(types.braceR)) {
+	    if (first) {
+	      first = false;
+	    } else {
+	      this.expect(types.comma);
+	      if (this.eat(types.braceR)) break;
+	    }
+
+	    while (this.match(types.at)) {
+	      decorators.push(this.parseDecorator());
+	    }
+
+	    var prop = this.startNode(),
+	        isGenerator = false,
+	        isAsync = false,
+	        startPos = void 0,
+	        startLoc = void 0;
+	    if (decorators.length) {
+	      prop.decorators = decorators;
+	      decorators = [];
+	    }
+
+	    if (this.hasPlugin("objectRestSpread") && this.match(types.ellipsis)) {
+	      prop = this.parseSpread(isPattern ? { start: 0 } : undefined);
+	      prop.type = isPattern ? "RestProperty" : "SpreadProperty";
+	      if (isPattern) this.toAssignable(prop.argument, true, "object pattern");
+	      node.properties.push(prop);
+	      if (isPattern) {
+	        var position = this.state.start;
+	        if (firstRestLocation !== null) {
+	          this.unexpected(firstRestLocation, "Cannot have multiple rest elements when destructuring");
+	        } else if (this.eat(types.braceR)) {
+	          break;
+	        } else if (this.match(types.comma) && this.lookahead().type === types.braceR) {
+	          // TODO: temporary rollback
+	          // this.unexpected(position, "A trailing comma is not permitted after the rest element");
+	          continue;
+	        } else {
+	          firstRestLocation = position;
+	          continue;
+	        }
+	      } else {
+	        continue;
+	      }
+	    }
+
+	    prop.method = false;
+	    prop.shorthand = false;
+
+	    if (isPattern || refShorthandDefaultPos) {
+	      startPos = this.state.start;
+	      startLoc = this.state.startLoc;
+	    }
+
+	    if (!isPattern) {
+	      isGenerator = this.eat(types.star);
+	    }
+
+	    if (!isPattern && this.isContextual("async")) {
+	      if (isGenerator) this.unexpected();
+
+	      var asyncId = this.parseIdentifier();
+	      if (this.match(types.colon) || this.match(types.parenL) || this.match(types.braceR) || this.match(types.eq) || this.match(types.comma)) {
+	        prop.key = asyncId;
+	        prop.computed = false;
+	      } else {
+	        isAsync = true;
+	        if (this.hasPlugin("asyncGenerators")) isGenerator = this.eat(types.star);
+	        this.parsePropertyName(prop);
+	      }
+	    } else {
+	      this.parsePropertyName(prop);
+	    }
+
+	    this.parseObjPropValue(prop, startPos, startLoc, isGenerator, isAsync, isPattern, refShorthandDefaultPos);
+	    this.checkPropClash(prop, propHash);
+
+	    if (prop.shorthand) {
+	      this.addExtra(prop, "shorthand", true);
+	    }
+
+	    node.properties.push(prop);
+	  }
+
+	  if (firstRestLocation !== null) {
+	    this.unexpected(firstRestLocation, "The rest element has to be the last element when destructuring");
+	  }
+
+	  if (decorators.length) {
+	    this.raise(this.state.start, "You have trailing decorators with no property");
+	  }
+
+	  return this.finishNode(node, isPattern ? "ObjectPattern" : "ObjectExpression");
+	};
+
+	pp$3.isGetterOrSetterMethod = function (prop, isPattern) {
+	  return !isPattern && !prop.computed && prop.key.type === "Identifier" && (prop.key.name === "get" || prop.key.name === "set") && (this.match(types.string) || // get "string"() {}
+	  this.match(types.num) || // get 1() {}
+	  this.match(types.bracketL) || // get ["string"]() {}
+	  this.match(types.name) || // get foo() {}
+	  this.state.type.keyword // get debugger() {}
+	  );
+	};
+
+	// get methods aren't allowed to have any parameters
+	// set methods must have exactly 1 parameter
+	pp$3.checkGetterSetterParamCount = function (method) {
+	  var paramCount = method.kind === "get" ? 0 : 1;
+	  if (method.params.length !== paramCount) {
+	    var start = method.start;
+	    if (method.kind === "get") {
+	      this.raise(start, "getter should have no params");
+	    } else {
+	      this.raise(start, "setter should have exactly one param");
+	    }
+	  }
+	};
+
+	pp$3.parseObjectMethod = function (prop, isGenerator, isAsync, isPattern) {
+	  if (isAsync || isGenerator || this.match(types.parenL)) {
+	    if (isPattern) this.unexpected();
+	    prop.kind = "method";
+	    prop.method = true;
+	    this.parseMethod(prop, isGenerator, isAsync);
+
+	    return this.finishNode(prop, "ObjectMethod");
+	  }
+
+	  if (this.isGetterOrSetterMethod(prop, isPattern)) {
+	    if (isGenerator || isAsync) this.unexpected();
+	    prop.kind = prop.key.name;
+	    this.parsePropertyName(prop);
+	    this.parseMethod(prop);
+	    this.checkGetterSetterParamCount(prop);
+
+	    return this.finishNode(prop, "ObjectMethod");
+	  }
+	};
+
+	pp$3.parseObjectProperty = function (prop, startPos, startLoc, isPattern, refShorthandDefaultPos) {
+	  if (this.eat(types.colon)) {
+	    prop.value = isPattern ? this.parseMaybeDefault(this.state.start, this.state.startLoc) : this.parseMaybeAssign(false, refShorthandDefaultPos);
+
+	    return this.finishNode(prop, "ObjectProperty");
+	  }
+
+	  if (!prop.computed && prop.key.type === "Identifier") {
+	    this.checkReservedWord(prop.key.name, prop.key.start, true, true);
+
+	    if (isPattern) {
+	      prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key.__clone());
+	    } else if (this.match(types.eq) && refShorthandDefaultPos) {
+	      if (!refShorthandDefaultPos.start) {
+	        refShorthandDefaultPos.start = this.state.start;
+	      }
+	      prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key.__clone());
+	    } else {
+	      prop.value = prop.key.__clone();
+	    }
+	    prop.shorthand = true;
+
+	    return this.finishNode(prop, "ObjectProperty");
+	  }
+	};
+
+	pp$3.parseObjPropValue = function (prop, startPos, startLoc, isGenerator, isAsync, isPattern, refShorthandDefaultPos) {
+	  var node = this.parseObjectMethod(prop, isGenerator, isAsync, isPattern) || this.parseObjectProperty(prop, startPos, startLoc, isPattern, refShorthandDefaultPos);
+
+	  if (!node) this.unexpected();
+
+	  return node;
+	};
+
+	pp$3.parsePropertyName = function (prop) {
+	  if (this.eat(types.bracketL)) {
+	    prop.computed = true;
+	    prop.key = this.parseMaybeAssign();
+	    this.expect(types.bracketR);
+	  } else {
+	    prop.computed = false;
+	    var oldInPropertyName = this.state.inPropertyName;
+	    this.state.inPropertyName = true;
+	    prop.key = this.match(types.num) || this.match(types.string) ? this.parseExprAtom() : this.parseIdentifier(true);
+	    this.state.inPropertyName = oldInPropertyName;
+	  }
+	  return prop.key;
+	};
+
+	// Initialize empty function node.
+
+	pp$3.initFunction = function (node, isAsync) {
+	  node.id = null;
+	  node.generator = false;
+	  node.expression = false;
+	  node.async = !!isAsync;
+	};
+
+	// Parse object or class method.
+
+	pp$3.parseMethod = function (node, isGenerator, isAsync) {
+	  var oldInMethod = this.state.inMethod;
+	  this.state.inMethod = node.kind || true;
+	  this.initFunction(node, isAsync);
+	  this.expect(types.parenL);
+	  node.params = this.parseBindingList(types.parenR);
+	  node.generator = !!isGenerator;
+	  this.parseFunctionBody(node);
+	  this.state.inMethod = oldInMethod;
+	  return node;
+	};
+
+	// Parse arrow function expression with given parameters.
+
+	pp$3.parseArrowExpression = function (node, params, isAsync) {
+	  this.initFunction(node, isAsync);
+	  node.params = this.toAssignableList(params, true, "arrow function parameters");
+	  this.parseFunctionBody(node, true);
+	  return this.finishNode(node, "ArrowFunctionExpression");
+	};
+
+	pp$3.isStrictBody = function (node, isExpression) {
+	  if (!isExpression && node.body.directives.length) {
+	    for (var _iterator2 = node.body.directives, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var directive = _ref2;
+
+	      if (directive.value.value === "use strict") {
+	        return true;
+	      }
+	    }
+	  }
+
+	  return false;
+	};
+
+	// Parse function body and check parameters.
+	pp$3.parseFunctionBody = function (node, allowExpression) {
+	  var isExpression = allowExpression && !this.match(types.braceL);
+
+	  var oldInAsync = this.state.inAsync;
+	  this.state.inAsync = node.async;
+	  if (isExpression) {
+	    node.body = this.parseMaybeAssign();
+	    node.expression = true;
+	  } else {
+	    // Start a new scope with regard to labels and the `inFunction`
+	    // flag (restore them to their old value afterwards).
+	    var oldInFunc = this.state.inFunction;
+	    var oldInGen = this.state.inGenerator;
+	    var oldLabels = this.state.labels;
+	    this.state.inFunction = true;this.state.inGenerator = node.generator;this.state.labels = [];
+	    node.body = this.parseBlock(true);
+	    node.expression = false;
+	    this.state.inFunction = oldInFunc;this.state.inGenerator = oldInGen;this.state.labels = oldLabels;
+	  }
+	  this.state.inAsync = oldInAsync;
+
+	  // If this is a strict mode function, verify that argument names
+	  // are not repeated, and it does not try to bind the words `eval`
+	  // or `arguments`.
+	  var isStrict = this.isStrictBody(node, isExpression);
+	  // Also check when allowExpression === true for arrow functions
+	  var checkLVal = this.state.strict || allowExpression || isStrict;
+
+	  if (isStrict && node.id && node.id.type === "Identifier" && node.id.name === "yield") {
+	    this.raise(node.id.start, "Binding yield in strict mode");
+	  }
+
+	  if (checkLVal) {
+	    var nameHash = Object.create(null);
+	    var oldStrict = this.state.strict;
+	    if (isStrict) this.state.strict = true;
+	    if (node.id) {
+	      this.checkLVal(node.id, true, undefined, "function name");
+	    }
+	    for (var _iterator3 = node.params, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
+	      var _ref3;
+
+	      if (_isArray3) {
+	        if (_i3 >= _iterator3.length) break;
+	        _ref3 = _iterator3[_i3++];
+	      } else {
+	        _i3 = _iterator3.next();
+	        if (_i3.done) break;
+	        _ref3 = _i3.value;
+	      }
+
+	      var param = _ref3;
+
+	      if (isStrict && param.type !== "Identifier") {
+	        this.raise(param.start, "Non-simple parameter in strict mode");
+	      }
+	      this.checkLVal(param, true, nameHash, "function parameter list");
+	    }
+	    this.state.strict = oldStrict;
+	  }
+	};
+
+	// Parses a comma-separated list of expressions, and returns them as
+	// an array. `close` is the token type that ends the list, and
+	// `allowEmpty` can be turned on to allow subsequent commas with
+	// nothing in between them to be parsed as `null` (which is needed
+	// for array literals).
+
+	pp$3.parseExprList = function (close, allowEmpty, refShorthandDefaultPos) {
+	  var elts = [];
+	  var first = true;
+
+	  while (!this.eat(close)) {
+	    if (first) {
+	      first = false;
+	    } else {
+	      this.expect(types.comma);
+	      if (this.eat(close)) break;
+	    }
+
+	    elts.push(this.parseExprListItem(allowEmpty, refShorthandDefaultPos));
+	  }
+	  return elts;
+	};
+
+	pp$3.parseExprListItem = function (allowEmpty, refShorthandDefaultPos, refNeedsArrowPos) {
+	  var elt = void 0;
+	  if (allowEmpty && this.match(types.comma)) {
+	    elt = null;
+	  } else if (this.match(types.ellipsis)) {
+	    elt = this.parseSpread(refShorthandDefaultPos);
+	  } else {
+	    elt = this.parseMaybeAssign(false, refShorthandDefaultPos, this.parseParenItem, refNeedsArrowPos);
+	  }
+	  return elt;
+	};
+
+	// Parse the next token as an identifier. If `liberal` is true (used
+	// when parsing properties), it will also convert keywords into
+	// identifiers.
+
+	pp$3.parseIdentifier = function (liberal) {
+	  var node = this.startNode();
+	  if (!liberal) {
+	    this.checkReservedWord(this.state.value, this.state.start, !!this.state.type.keyword, false);
+	  }
+
+	  if (this.match(types.name)) {
+	    node.name = this.state.value;
+	  } else if (this.state.type.keyword) {
+	    node.name = this.state.type.keyword;
+	  } else {
+	    this.unexpected();
+	  }
+
+	  if (!liberal && node.name === "await" && this.state.inAsync) {
+	    this.raise(node.start, "invalid use of await inside of an async function");
+	  }
+
+	  node.loc.identifierName = node.name;
+
+	  this.next();
+	  return this.finishNode(node, "Identifier");
+	};
+
+	pp$3.checkReservedWord = function (word, startLoc, checkKeywords, isBinding) {
+	  if (this.isReservedWord(word) || checkKeywords && this.isKeyword(word)) {
+	    this.raise(startLoc, word + " is a reserved word");
+	  }
+
+	  if (this.state.strict && (reservedWords.strict(word) || isBinding && reservedWords.strictBind(word))) {
+	    this.raise(startLoc, word + " is a reserved word in strict mode");
+	  }
+	};
+
+	// Parses await expression inside async function.
+
+	pp$3.parseAwait = function (node) {
+	  // istanbul ignore next: this condition is checked at the call site so won't be hit here
+	  if (!this.state.inAsync) {
+	    this.unexpected();
+	  }
+	  if (this.match(types.star)) {
+	    this.raise(node.start, "await* has been removed from the async functions proposal. Use Promise.all() instead.");
+	  }
+	  node.argument = this.parseMaybeUnary();
+	  return this.finishNode(node, "AwaitExpression");
+	};
+
+	// Parses yield expression inside generator.
+
+	pp$3.parseYield = function () {
+	  var node = this.startNode();
+	  this.next();
+	  if (this.match(types.semi) || this.canInsertSemicolon() || !this.match(types.star) && !this.state.type.startsExpr) {
+	    node.delegate = false;
+	    node.argument = null;
+	  } else {
+	    node.delegate = this.eat(types.star);
+	    node.argument = this.parseMaybeAssign();
+	  }
+	  return this.finishNode(node, "YieldExpression");
+	};
+
+	// Start an AST node, attaching a start offset.
+
+	var pp$4 = Parser.prototype;
+	var commentKeys = ["leadingComments", "trailingComments", "innerComments"];
+
+	var Node = function () {
+	  function Node(pos, loc, filename) {
+	    classCallCheck(this, Node);
+
+	    this.type = "";
+	    this.start = pos;
+	    this.end = 0;
+	    this.loc = new SourceLocation(loc);
+	    if (filename) this.loc.filename = filename;
+	  }
+
+	  Node.prototype.__clone = function __clone() {
+	    var node2 = new Node();
+	    for (var key in this) {
+	      // Do not clone comments that are already attached to the node
+	      if (commentKeys.indexOf(key) < 0) {
+	        node2[key] = this[key];
+	      }
+	    }
+
+	    return node2;
+	  };
+
+	  return Node;
+	}();
+
+	pp$4.startNode = function () {
+	  return new Node(this.state.start, this.state.startLoc, this.filename);
+	};
+
+	pp$4.startNodeAt = function (pos, loc) {
+	  return new Node(pos, loc, this.filename);
+	};
+
+	function finishNodeAt(node, type, pos, loc) {
+	  node.type = type;
+	  node.end = pos;
+	  node.loc.end = loc;
+	  this.processComment(node);
+	  return node;
+	}
+
+	// Finish an AST node, adding `type` and `end` properties.
+
+	pp$4.finishNode = function (node, type) {
+	  return finishNodeAt.call(this, node, type, this.state.lastTokEnd, this.state.lastTokEndLoc);
+	};
+
+	// Finish node at given position
+
+	pp$4.finishNodeAt = function (node, type, pos, loc) {
+	  return finishNodeAt.call(this, node, type, pos, loc);
+	};
+
+	var pp$5 = Parser.prototype;
+
+	// This function is used to raise exceptions on parse errors. It
+	// takes an offset integer (into the current `input`) to indicate
+	// the location of the error, attaches the position to the end
+	// of the error message, and then raises a `SyntaxError` with that
+	// message.
+
+	pp$5.raise = function (pos, message) {
+	  var loc = getLineInfo(this.input, pos);
+	  message += " (" + loc.line + ":" + loc.column + ")";
+	  var err = new SyntaxError(message);
+	  err.pos = pos;
+	  err.loc = loc;
+	  throw err;
+	};
+
+	/* eslint max-len: 0 */
+
+	/**
+	 * Based on the comment attachment algorithm used in espree and estraverse.
+	 *
+	 * Redistribution and use in source and binary forms, with or without
+	 * modification, are permitted provided that the following conditions are met:
+	 *
+	 * * Redistributions of source code must retain the above copyright
+	 *   notice, this list of conditions and the following disclaimer.
+	 * * Redistributions in binary form must reproduce the above copyright
+	 *   notice, this list of conditions and the following disclaimer in the
+	 *   documentation and/or other materials provided with the distribution.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+	 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+	 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+	 * ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+	 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+	 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 */
+
+	function last(stack) {
+	  return stack[stack.length - 1];
+	}
+
+	var pp$6 = Parser.prototype;
+
+	pp$6.addComment = function (comment) {
+	  if (this.filename) comment.loc.filename = this.filename;
+	  this.state.trailingComments.push(comment);
+	  this.state.leadingComments.push(comment);
+	};
+
+	pp$6.processComment = function (node) {
+	  if (node.type === "Program" && node.body.length > 0) return;
+
+	  var stack = this.state.commentStack;
+
+	  var firstChild = void 0,
+	      lastChild = void 0,
+	      trailingComments = void 0,
+	      i = void 0,
+	      j = void 0;
+
+	  if (this.state.trailingComments.length > 0) {
+	    // If the first comment in trailingComments comes after the
+	    // current node, then we're good - all comments in the array will
+	    // come after the node and so it's safe to add them as official
+	    // trailingComments.
+	    if (this.state.trailingComments[0].start >= node.end) {
+	      trailingComments = this.state.trailingComments;
+	      this.state.trailingComments = [];
+	    } else {
+	      // Otherwise, if the first comment doesn't come after the
+	      // current node, that means we have a mix of leading and trailing
+	      // comments in the array and that leadingComments contains the
+	      // same items as trailingComments. Reset trailingComments to
+	      // zero items and we'll handle this by evaluating leadingComments
+	      // later.
+	      this.state.trailingComments.length = 0;
+	    }
+	  } else {
+	    var lastInStack = last(stack);
+	    if (stack.length > 0 && lastInStack.trailingComments && lastInStack.trailingComments[0].start >= node.end) {
+	      trailingComments = lastInStack.trailingComments;
+	      lastInStack.trailingComments = null;
+	    }
+	  }
+
+	  // Eating the stack.
+	  if (stack.length > 0 && last(stack).start >= node.start) {
+	    firstChild = stack.pop();
+	  }
+
+	  while (stack.length > 0 && last(stack).start >= node.start) {
+	    lastChild = stack.pop();
+	  }
+
+	  if (!lastChild && firstChild) lastChild = firstChild;
+
+	  // Attach comments that follow a trailing comma on the last
+	  // property in an object literal or a trailing comma in function arguments
+	  // as trailing comments
+	  if (firstChild && (firstChild.type === "ObjectProperty" || node.type === "CallExpression") && this.state.leadingComments.length > 0) {
+	    var lastComment = last(this.state.leadingComments);
+	    if (lastComment.start >= node.start) {
+	      if (this.state.commentPreviousNode) {
+	        for (j = 0; j < this.state.leadingComments.length; j++) {
+	          if (this.state.leadingComments[j].end < this.state.commentPreviousNode.end) {
+	            this.state.leadingComments.splice(j, 1);
+	            j--;
+	          }
+	        }
+
+	        if (this.state.leadingComments.length > 0) {
+	          firstChild.trailingComments = this.state.leadingComments;
+	          this.state.leadingComments = [];
+	        }
+	      }
+	    }
+	  }
+
+	  if (lastChild) {
+	    if (lastChild.leadingComments) {
+	      if (lastChild !== node && last(lastChild.leadingComments).end <= node.start) {
+	        node.leadingComments = lastChild.leadingComments;
+	        lastChild.leadingComments = null;
+	      } else {
+	        // A leading comment for an anonymous class had been stolen by its first ClassMethod,
+	        // so this takes back the leading comment.
+	        // See also: https://github.com/eslint/espree/issues/158
+	        for (i = lastChild.leadingComments.length - 2; i >= 0; --i) {
+	          if (lastChild.leadingComments[i].end <= node.start) {
+	            node.leadingComments = lastChild.leadingComments.splice(0, i + 1);
+	            break;
+	          }
+	        }
+	      }
+	    }
+	  } else if (this.state.leadingComments.length > 0) {
+	    if (last(this.state.leadingComments).end <= node.start) {
+	      if (this.state.commentPreviousNode) {
+	        for (j = 0; j < this.state.leadingComments.length; j++) {
+	          if (this.state.leadingComments[j].end < this.state.commentPreviousNode.end) {
+	            this.state.leadingComments.splice(j, 1);
+	            j--;
+	          }
+	        }
+	      }
+	      if (this.state.leadingComments.length > 0) {
+	        node.leadingComments = this.state.leadingComments;
+	        this.state.leadingComments = [];
+	      }
+	    } else {
+	      // https://github.com/eslint/espree/issues/2
+	      //
+	      // In special cases, such as return (without a value) and
+	      // debugger, all comments will end up as leadingComments and
+	      // will otherwise be eliminated. This step runs when the
+	      // commentStack is empty and there are comments left
+	      // in leadingComments.
+	      //
+	      // This loop figures out the stopping point between the actual
+	      // leading and trailing comments by finding the location of the
+	      // first comment that comes after the given node.
+	      for (i = 0; i < this.state.leadingComments.length; i++) {
+	        if (this.state.leadingComments[i].end > node.start) {
+	          break;
+	        }
+	      }
+
+	      // Split the array based on the location of the first comment
+	      // that comes after the node. Keep in mind that this could
+	      // result in an empty array, and if so, the array must be
+	      // deleted.
+	      node.leadingComments = this.state.leadingComments.slice(0, i);
+	      if (node.leadingComments.length === 0) {
+	        node.leadingComments = null;
+	      }
+
+	      // Similarly, trailing comments are attached later. The variable
+	      // must be reset to null if there are no trailing comments.
+	      trailingComments = this.state.leadingComments.slice(i);
+	      if (trailingComments.length === 0) {
+	        trailingComments = null;
+	      }
+	    }
+	  }
+
+	  this.state.commentPreviousNode = node;
+
+	  if (trailingComments) {
+	    if (trailingComments.length && trailingComments[0].start >= node.start && last(trailingComments).end <= node.end) {
+	      node.innerComments = trailingComments;
+	    } else {
+	      node.trailingComments = trailingComments;
+	    }
+	  }
+
+	  stack.push(node);
+	};
+
+	var pp$7 = Parser.prototype;
+
+	pp$7.estreeParseRegExpLiteral = function (_ref) {
+	  var pattern = _ref.pattern,
+	      flags = _ref.flags;
+
+	  var regex = null;
+	  try {
+	    regex = new RegExp(pattern, flags);
+	  } catch (e) {
+	    // In environments that don't support these flags value will
+	    // be null as the regex can't be represented natively.
+	  }
+	  var node = this.estreeParseLiteral(regex);
+	  node.regex = { pattern: pattern, flags: flags };
+
+	  return node;
+	};
+
+	pp$7.estreeParseLiteral = function (value) {
+	  return this.parseLiteral(value, "Literal");
+	};
+
+	pp$7.directiveToStmt = function (directive) {
+	  var directiveLiteral = directive.value;
+
+	  var stmt = this.startNodeAt(directive.start, directive.loc.start);
+	  var expression = this.startNodeAt(directiveLiteral.start, directiveLiteral.loc.start);
+
+	  expression.value = directiveLiteral.value;
+	  expression.raw = directiveLiteral.extra.raw;
+
+	  stmt.expression = this.finishNodeAt(expression, "Literal", directiveLiteral.end, directiveLiteral.loc.end);
+	  stmt.directive = directiveLiteral.extra.raw.slice(1, -1);
+
+	  return this.finishNodeAt(stmt, "ExpressionStatement", directive.end, directive.loc.end);
+	};
+
+	function isSimpleProperty(node) {
+	  return node && node.type === "Property" && node.kind === "init" && node.method === false;
+	}
+
+	var estreePlugin = function estreePlugin(instance) {
+	  instance.extend("checkDeclaration", function (inner) {
+	    return function (node) {
+	      if (isSimpleProperty(node)) {
+	        this.checkDeclaration(node.value);
+	      } else {
+	        inner.call(this, node);
+	      }
+	    };
+	  });
+
+	  instance.extend("checkGetterSetterParamCount", function () {
+	    return function (prop) {
+	      var paramCount = prop.kind === "get" ? 0 : 1;
+	      if (prop.value.params.length !== paramCount) {
+	        var start = prop.start;
+	        if (prop.kind === "get") {
+	          this.raise(start, "getter should have no params");
+	        } else {
+	          this.raise(start, "setter should have exactly one param");
+	        }
+	      }
+	    };
+	  });
+
+	  instance.extend("checkLVal", function (inner) {
+	    return function (expr, isBinding, checkClashes) {
+	      var _this = this;
+
+	      switch (expr.type) {
+	        case "ObjectPattern":
+	          expr.properties.forEach(function (prop) {
+	            _this.checkLVal(prop.type === "Property" ? prop.value : prop, isBinding, checkClashes, "object destructuring pattern");
+	          });
+	          break;
+	        default:
+	          for (var _len = arguments.length, args = Array(_len > 3 ? _len - 3 : 0), _key = 3; _key < _len; _key++) {
+	            args[_key - 3] = arguments[_key];
+	          }
+
+	          inner.call.apply(inner, [this, expr, isBinding, checkClashes].concat(args));
+	      }
+	    };
+	  });
+
+	  instance.extend("checkPropClash", function () {
+	    return function (prop, propHash) {
+	      if (prop.computed || !isSimpleProperty(prop)) return;
+
+	      var key = prop.key;
+	      // It is either an Identifier or a String/NumericLiteral
+	      var name = key.type === "Identifier" ? key.name : String(key.value);
+
+	      if (name === "__proto__") {
+	        if (propHash.proto) this.raise(key.start, "Redefinition of __proto__ property");
+	        propHash.proto = true;
+	      }
+	    };
+	  });
+
+	  instance.extend("isStrictBody", function () {
+	    return function (node, isExpression) {
+	      if (!isExpression && node.body.body.length > 0) {
+	        for (var _iterator = node.body.body, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+	          var _ref2;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref2 = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref2 = _i.value;
+	          }
+
+	          var directive = _ref2;
+
+	          if (directive.type === "ExpressionStatement" && directive.expression.type === "Literal") {
+	            if (directive.expression.value === "use strict") return true;
+	          } else {
+	            // Break for the first non literal expression
+	            break;
+	          }
+	        }
+	      }
+
+	      return false;
+	    };
+	  });
+
+	  instance.extend("isValidDirective", function () {
+	    return function (stmt) {
+	      return stmt.type === "ExpressionStatement" && stmt.expression.type === "Literal" && typeof stmt.expression.value === "string" && (!stmt.expression.extra || !stmt.expression.extra.parenthesized);
+	    };
+	  });
+
+	  instance.extend("parseBlockBody", function (inner) {
+	    return function (node) {
+	      var _this2 = this;
+
+	      for (var _len2 = arguments.length, args = Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+	        args[_key2 - 1] = arguments[_key2];
+	      }
+
+	      inner.call.apply(inner, [this, node].concat(args));
+
+	      node.directives.reverse().forEach(function (directive) {
+	        node.body.unshift(_this2.directiveToStmt(directive));
+	      });
+	      delete node.directives;
+	    };
+	  });
+
+	  instance.extend("parseClassMethod", function (inner) {
+	    return function (classBody) {
+	      for (var _len3 = arguments.length, args = Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+	        args[_key3 - 1] = arguments[_key3];
+	      }
+
+	      inner.call.apply(inner, [this, classBody].concat(args));
+
+	      var body = classBody.body;
+	      body[body.length - 1].type = "MethodDefinition";
+	    };
+	  });
+
+	  instance.extend("parseExprAtom", function (inner) {
+	    return function () {
+	      switch (this.state.type) {
+	        case types.regexp:
+	          return this.estreeParseRegExpLiteral(this.state.value);
+
+	        case types.num:
+	        case types.string:
+	          return this.estreeParseLiteral(this.state.value);
+
+	        case types._null:
+	          return this.estreeParseLiteral(null);
+
+	        case types._true:
+	          return this.estreeParseLiteral(true);
+
+	        case types._false:
+	          return this.estreeParseLiteral(false);
+
+	        default:
+	          for (var _len4 = arguments.length, args = Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+	            args[_key4] = arguments[_key4];
+	          }
+
+	          return inner.call.apply(inner, [this].concat(args));
+	      }
+	    };
+	  });
+
+	  instance.extend("parseLiteral", function (inner) {
+	    return function () {
+	      for (var _len5 = arguments.length, args = Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+	        args[_key5] = arguments[_key5];
+	      }
+
+	      var node = inner.call.apply(inner, [this].concat(args));
+	      node.raw = node.extra.raw;
+	      delete node.extra;
+
+	      return node;
+	    };
+	  });
+
+	  instance.extend("parseMethod", function (inner) {
+	    return function (node) {
+	      var funcNode = this.startNode();
+	      funcNode.kind = node.kind; // provide kind, so inner method correctly sets state
+
+	      for (var _len6 = arguments.length, args = Array(_len6 > 1 ? _len6 - 1 : 0), _key6 = 1; _key6 < _len6; _key6++) {
+	        args[_key6 - 1] = arguments[_key6];
+	      }
+
+	      funcNode = inner.call.apply(inner, [this, funcNode].concat(args));
+	      delete funcNode.kind;
+	      node.value = this.finishNode(funcNode, "FunctionExpression");
+
+	      return node;
+	    };
+	  });
+
+	  instance.extend("parseObjectMethod", function (inner) {
+	    return function () {
+	      for (var _len7 = arguments.length, args = Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
+	        args[_key7] = arguments[_key7];
+	      }
+
+	      var node = inner.call.apply(inner, [this].concat(args));
+
+	      if (node) {
+	        if (node.kind === "method") node.kind = "init";
+	        node.type = "Property";
+	      }
+
+	      return node;
+	    };
+	  });
+
+	  instance.extend("parseObjectProperty", function (inner) {
+	    return function () {
+	      for (var _len8 = arguments.length, args = Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
+	        args[_key8] = arguments[_key8];
+	      }
+
+	      var node = inner.call.apply(inner, [this].concat(args));
+
+	      if (node) {
+	        node.kind = "init";
+	        node.type = "Property";
+	      }
+
+	      return node;
+	    };
+	  });
+
+	  instance.extend("toAssignable", function (inner) {
+	    return function (node, isBinding) {
+	      for (var _len9 = arguments.length, args = Array(_len9 > 2 ? _len9 - 2 : 0), _key9 = 2; _key9 < _len9; _key9++) {
+	        args[_key9 - 2] = arguments[_key9];
+	      }
+
+	      if (isSimpleProperty(node)) {
+	        this.toAssignable.apply(this, [node.value, isBinding].concat(args));
+
+	        return node;
+	      } else if (node.type === "ObjectExpression") {
+	        node.type = "ObjectPattern";
+	        for (var _iterator2 = node.properties, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+	          var _ref3;
+
+	          if (_isArray2) {
+	            if (_i2 >= _iterator2.length) break;
+	            _ref3 = _iterator2[_i2++];
+	          } else {
+	            _i2 = _iterator2.next();
+	            if (_i2.done) break;
+	            _ref3 = _i2.value;
+	          }
+
+	          var prop = _ref3;
+
+	          if (prop.kind === "get" || prop.kind === "set") {
+	            this.raise(prop.key.start, "Object pattern can't contain getter or setter");
+	          } else if (prop.method) {
+	            this.raise(prop.key.start, "Object pattern can't contain methods");
+	          } else {
+	            this.toAssignable(prop, isBinding, "object destructuring pattern");
+	          }
+	        }
+
+	        return node;
+	      }
+
+	      return inner.call.apply(inner, [this, node, isBinding].concat(args));
+	    };
+	  });
+	};
+
+	/* eslint max-len: 0 */
+
+	var primitiveTypes = ["any", "mixed", "empty", "bool", "boolean", "number", "string", "void", "null"];
+
+	var pp$8 = Parser.prototype;
+
+	pp$8.flowParseTypeInitialiser = function (tok) {
+	  var oldInType = this.state.inType;
+	  this.state.inType = true;
+	  this.expect(tok || types.colon);
+
+	  var type = this.flowParseType();
+	  this.state.inType = oldInType;
+	  return type;
+	};
+
+	pp$8.flowParsePredicate = function () {
+	  var node = this.startNode();
+	  var moduloLoc = this.state.startLoc;
+	  var moduloPos = this.state.start;
+	  this.expect(types.modulo);
+	  var checksLoc = this.state.startLoc;
+	  this.expectContextual("checks");
+	  // Force '%' and 'checks' to be adjacent
+	  if (moduloLoc.line !== checksLoc.line || moduloLoc.column !== checksLoc.column - 1) {
+	    this.raise(moduloPos, "Spaces between ´%´ and ´checks´ are not allowed here.");
+	  }
+	  if (this.eat(types.parenL)) {
+	    node.expression = this.parseExpression();
+	    this.expect(types.parenR);
+	    return this.finishNode(node, "DeclaredPredicate");
+	  } else {
+	    return this.finishNode(node, "InferredPredicate");
+	  }
+	};
+
+	pp$8.flowParseTypeAndPredicateInitialiser = function () {
+	  var oldInType = this.state.inType;
+	  this.state.inType = true;
+	  this.expect(types.colon);
+	  var type = null;
+	  var predicate = null;
+	  if (this.match(types.modulo)) {
+	    this.state.inType = oldInType;
+	    predicate = this.flowParsePredicate();
+	  } else {
+	    type = this.flowParseType();
+	    this.state.inType = oldInType;
+	    if (this.match(types.modulo)) {
+	      predicate = this.flowParsePredicate();
+	    }
+	  }
+	  return [type, predicate];
+	};
+
+	pp$8.flowParseDeclareClass = function (node) {
+	  this.next();
+	  this.flowParseInterfaceish(node, true);
+	  return this.finishNode(node, "DeclareClass");
+	};
+
+	pp$8.flowParseDeclareFunction = function (node) {
+	  this.next();
+
+	  var id = node.id = this.parseIdentifier();
+
+	  var typeNode = this.startNode();
+	  var typeContainer = this.startNode();
+
+	  if (this.isRelational("<")) {
+	    typeNode.typeParameters = this.flowParseTypeParameterDeclaration();
+	  } else {
+	    typeNode.typeParameters = null;
+	  }
+
+	  this.expect(types.parenL);
+	  var tmp = this.flowParseFunctionTypeParams();
+	  typeNode.params = tmp.params;
+	  typeNode.rest = tmp.rest;
+	  this.expect(types.parenR);
+	  var predicate = null;
+
+	  var _flowParseTypeAndPred = this.flowParseTypeAndPredicateInitialiser();
+
+	  typeNode.returnType = _flowParseTypeAndPred[0];
+	  predicate = _flowParseTypeAndPred[1];
+
+	  typeContainer.typeAnnotation = this.finishNode(typeNode, "FunctionTypeAnnotation");
+	  typeContainer.predicate = predicate;
+	  id.typeAnnotation = this.finishNode(typeContainer, "TypeAnnotation");
+
+	  this.finishNode(id, id.type);
+
+	  this.semicolon();
+
+	  return this.finishNode(node, "DeclareFunction");
+	};
+
+	pp$8.flowParseDeclare = function (node) {
+	  if (this.match(types._class)) {
+	    return this.flowParseDeclareClass(node);
+	  } else if (this.match(types._function)) {
+	    return this.flowParseDeclareFunction(node);
+	  } else if (this.match(types._var)) {
+	    return this.flowParseDeclareVariable(node);
+	  } else if (this.isContextual("module")) {
+	    if (this.lookahead().type === types.dot) {
+	      return this.flowParseDeclareModuleExports(node);
+	    } else {
+	      return this.flowParseDeclareModule(node);
+	    }
+	  } else if (this.isContextual("type")) {
+	    return this.flowParseDeclareTypeAlias(node);
+	  } else if (this.isContextual("interface")) {
+	    return this.flowParseDeclareInterface(node);
+	  } else {
+	    this.unexpected();
+	  }
+	};
+
+	pp$8.flowParseDeclareVariable = function (node) {
+	  this.next();
+	  node.id = this.flowParseTypeAnnotatableIdentifier();
+	  this.semicolon();
+	  return this.finishNode(node, "DeclareVariable");
+	};
+
+	pp$8.flowParseDeclareModule = function (node) {
+	  this.next();
+
+	  if (this.match(types.string)) {
+	    node.id = this.parseExprAtom();
+	  } else {
+	    node.id = this.parseIdentifier();
+	  }
+
+	  var bodyNode = node.body = this.startNode();
+	  var body = bodyNode.body = [];
+	  this.expect(types.braceL);
+	  while (!this.match(types.braceR)) {
+	    var _bodyNode = this.startNode();
+
+	    if (this.match(types._import)) {
+	      var lookahead = this.lookahead();
+	      if (lookahead.value !== "type" && lookahead.value !== "typeof") {
+	        this.unexpected(null, "Imports within a `declare module` body must always be `import type` or `import typeof`");
+	      }
+
+	      this.parseImport(_bodyNode);
+	    } else {
+	      this.expectContextual("declare", "Only declares and type imports are allowed inside declare module");
+
+	      _bodyNode = this.flowParseDeclare(_bodyNode, true);
+	    }
+
+	    body.push(_bodyNode);
+	  }
+	  this.expect(types.braceR);
+
+	  this.finishNode(bodyNode, "BlockStatement");
+	  return this.finishNode(node, "DeclareModule");
+	};
+
+	pp$8.flowParseDeclareModuleExports = function (node) {
+	  this.expectContextual("module");
+	  this.expect(types.dot);
+	  this.expectContextual("exports");
+	  node.typeAnnotation = this.flowParseTypeAnnotation();
+	  this.semicolon();
+
+	  return this.finishNode(node, "DeclareModuleExports");
+	};
+
+	pp$8.flowParseDeclareTypeAlias = function (node) {
+	  this.next();
+	  this.flowParseTypeAlias(node);
+	  return this.finishNode(node, "DeclareTypeAlias");
+	};
+
+	pp$8.flowParseDeclareInterface = function (node) {
+	  this.next();
+	  this.flowParseInterfaceish(node);
+	  return this.finishNode(node, "DeclareInterface");
+	};
+
+	// Interfaces
+
+	pp$8.flowParseInterfaceish = function (node) {
+	  node.id = this.parseIdentifier();
+
+	  if (this.isRelational("<")) {
+	    node.typeParameters = this.flowParseTypeParameterDeclaration();
+	  } else {
+	    node.typeParameters = null;
+	  }
+
+	  node.extends = [];
+	  node.mixins = [];
+
+	  if (this.eat(types._extends)) {
+	    do {
+	      node.extends.push(this.flowParseInterfaceExtends());
+	    } while (this.eat(types.comma));
+	  }
+
+	  if (this.isContextual("mixins")) {
+	    this.next();
+	    do {
+	      node.mixins.push(this.flowParseInterfaceExtends());
+	    } while (this.eat(types.comma));
+	  }
+
+	  node.body = this.flowParseObjectType(true, false, false);
+	};
+
+	pp$8.flowParseInterfaceExtends = function () {
+	  var node = this.startNode();
+
+	  node.id = this.flowParseQualifiedTypeIdentifier();
+	  if (this.isRelational("<")) {
+	    node.typeParameters = this.flowParseTypeParameterInstantiation();
+	  } else {
+	    node.typeParameters = null;
+	  }
+
+	  return this.finishNode(node, "InterfaceExtends");
+	};
+
+	pp$8.flowParseInterface = function (node) {
+	  this.flowParseInterfaceish(node, false);
+	  return this.finishNode(node, "InterfaceDeclaration");
+	};
+
+	pp$8.flowParseRestrictedIdentifier = function (liberal) {
+	  if (primitiveTypes.indexOf(this.state.value) > -1) {
+	    this.raise(this.state.start, "Cannot overwrite primitive type " + this.state.value);
+	  }
+
+	  return this.parseIdentifier(liberal);
+	};
+
+	// Type aliases
+
+	pp$8.flowParseTypeAlias = function (node) {
+	  node.id = this.flowParseRestrictedIdentifier();
+
+	  if (this.isRelational("<")) {
+	    node.typeParameters = this.flowParseTypeParameterDeclaration();
+	  } else {
+	    node.typeParameters = null;
+	  }
+
+	  node.right = this.flowParseTypeInitialiser(types.eq);
+	  this.semicolon();
+
+	  return this.finishNode(node, "TypeAlias");
+	};
+
+	// Type annotations
+
+	pp$8.flowParseTypeParameter = function () {
+	  var node = this.startNode();
+
+	  var variance = this.flowParseVariance();
+
+	  var ident = this.flowParseTypeAnnotatableIdentifier();
+	  node.name = ident.name;
+	  node.variance = variance;
+	  node.bound = ident.typeAnnotation;
+
+	  if (this.match(types.eq)) {
+	    this.eat(types.eq);
+	    node.default = this.flowParseType();
+	  }
+
+	  return this.finishNode(node, "TypeParameter");
+	};
+
+	pp$8.flowParseTypeParameterDeclaration = function () {
+	  var oldInType = this.state.inType;
+	  var node = this.startNode();
+	  node.params = [];
+
+	  this.state.inType = true;
+
+	  // istanbul ignore else: this condition is already checked at all call sites
+	  if (this.isRelational("<") || this.match(types.jsxTagStart)) {
+	    this.next();
+	  } else {
+	    this.unexpected();
+	  }
+
+	  do {
+	    node.params.push(this.flowParseTypeParameter());
+	    if (!this.isRelational(">")) {
+	      this.expect(types.comma);
+	    }
+	  } while (!this.isRelational(">"));
+	  this.expectRelational(">");
+
+	  this.state.inType = oldInType;
+
+	  return this.finishNode(node, "TypeParameterDeclaration");
+	};
+
+	pp$8.flowParseTypeParameterInstantiation = function () {
+	  var node = this.startNode();
+	  var oldInType = this.state.inType;
+	  node.params = [];
+
+	  this.state.inType = true;
+
+	  this.expectRelational("<");
+	  while (!this.isRelational(">")) {
+	    node.params.push(this.flowParseType());
+	    if (!this.isRelational(">")) {
+	      this.expect(types.comma);
+	    }
+	  }
+	  this.expectRelational(">");
+
+	  this.state.inType = oldInType;
+
+	  return this.finishNode(node, "TypeParameterInstantiation");
+	};
+
+	pp$8.flowParseObjectPropertyKey = function () {
+	  return this.match(types.num) || this.match(types.string) ? this.parseExprAtom() : this.parseIdentifier(true);
+	};
+
+	pp$8.flowParseObjectTypeIndexer = function (node, isStatic, variance) {
+	  node.static = isStatic;
+
+	  this.expect(types.bracketL);
+	  if (this.lookahead().type === types.colon) {
+	    node.id = this.flowParseObjectPropertyKey();
+	    node.key = this.flowParseTypeInitialiser();
+	  } else {
+	    node.id = null;
+	    node.key = this.flowParseType();
+	  }
+	  this.expect(types.bracketR);
+	  node.value = this.flowParseTypeInitialiser();
+	  node.variance = variance;
+
+	  this.flowObjectTypeSemicolon();
+	  return this.finishNode(node, "ObjectTypeIndexer");
+	};
+
+	pp$8.flowParseObjectTypeMethodish = function (node) {
+	  node.params = [];
+	  node.rest = null;
+	  node.typeParameters = null;
+
+	  if (this.isRelational("<")) {
+	    node.typeParameters = this.flowParseTypeParameterDeclaration();
+	  }
+
+	  this.expect(types.parenL);
+	  while (!this.match(types.parenR) && !this.match(types.ellipsis)) {
+	    node.params.push(this.flowParseFunctionTypeParam());
+	    if (!this.match(types.parenR)) {
+	      this.expect(types.comma);
+	    }
+	  }
+
+	  if (this.eat(types.ellipsis)) {
+	    node.rest = this.flowParseFunctionTypeParam();
+	  }
+	  this.expect(types.parenR);
+	  node.returnType = this.flowParseTypeInitialiser();
+
+	  return this.finishNode(node, "FunctionTypeAnnotation");
+	};
+
+	pp$8.flowParseObjectTypeMethod = function (startPos, startLoc, isStatic, key) {
+	  var node = this.startNodeAt(startPos, startLoc);
+	  node.value = this.flowParseObjectTypeMethodish(this.startNodeAt(startPos, startLoc));
+	  node.static = isStatic;
+	  node.key = key;
+	  node.optional = false;
+	  this.flowObjectTypeSemicolon();
+	  return this.finishNode(node, "ObjectTypeProperty");
+	};
+
+	pp$8.flowParseObjectTypeCallProperty = function (node, isStatic) {
+	  var valueNode = this.startNode();
+	  node.static = isStatic;
+	  node.value = this.flowParseObjectTypeMethodish(valueNode);
+	  this.flowObjectTypeSemicolon();
+	  return this.finishNode(node, "ObjectTypeCallProperty");
+	};
+
+	pp$8.flowParseObjectType = function (allowStatic, allowExact, allowSpread) {
+	  var oldInType = this.state.inType;
+	  this.state.inType = true;
+
+	  var nodeStart = this.startNode();
+	  var node = void 0;
+	  var propertyKey = void 0;
+	  var isStatic = false;
+
+	  nodeStart.callProperties = [];
+	  nodeStart.properties = [];
+	  nodeStart.indexers = [];
+
+	  var endDelim = void 0;
+	  var exact = void 0;
+	  if (allowExact && this.match(types.braceBarL)) {
+	    this.expect(types.braceBarL);
+	    endDelim = types.braceBarR;
+	    exact = true;
+	  } else {
+	    this.expect(types.braceL);
+	    endDelim = types.braceR;
+	    exact = false;
+	  }
+
+	  nodeStart.exact = exact;
+
+	  while (!this.match(endDelim)) {
+	    var optional = false;
+	    var startPos = this.state.start;
+	    var startLoc = this.state.startLoc;
+	    node = this.startNode();
+	    if (allowStatic && this.isContextual("static") && this.lookahead().type !== types.colon) {
+	      this.next();
+	      isStatic = true;
+	    }
+
+	    var variancePos = this.state.start;
+	    var variance = this.flowParseVariance();
+
+	    if (this.match(types.bracketL)) {
+	      nodeStart.indexers.push(this.flowParseObjectTypeIndexer(node, isStatic, variance));
+	    } else if (this.match(types.parenL) || this.isRelational("<")) {
+	      if (variance) {
+	        this.unexpected(variancePos);
+	      }
+	      nodeStart.callProperties.push(this.flowParseObjectTypeCallProperty(node, isStatic));
+	    } else {
+	      if (this.match(types.ellipsis)) {
+	        if (!allowSpread) {
+	          this.unexpected(null, "Spread operator cannot appear in class or interface definitions");
+	        }
+	        if (variance) {
+	          this.unexpected(variance.start, "Spread properties cannot have variance");
+	        }
+	        this.expect(types.ellipsis);
+	        node.argument = this.flowParseType();
+	        this.flowObjectTypeSemicolon();
+	        nodeStart.properties.push(this.finishNode(node, "ObjectTypeSpreadProperty"));
+	      } else {
+	        propertyKey = this.flowParseObjectPropertyKey();
+	        if (this.isRelational("<") || this.match(types.parenL)) {
+	          // This is a method property
+	          if (variance) {
+	            this.unexpected(variance.start);
+	          }
+	          nodeStart.properties.push(this.flowParseObjectTypeMethod(startPos, startLoc, isStatic, propertyKey));
+	        } else {
+	          if (this.eat(types.question)) {
+	            optional = true;
+	          }
+	          node.key = propertyKey;
+	          node.value = this.flowParseTypeInitialiser();
+	          node.optional = optional;
+	          node.static = isStatic;
+	          node.variance = variance;
+	          this.flowObjectTypeSemicolon();
+	          nodeStart.properties.push(this.finishNode(node, "ObjectTypeProperty"));
+	        }
+	      }
+	    }
+
+	    isStatic = false;
+	  }
+
+	  this.expect(endDelim);
+
+	  var out = this.finishNode(nodeStart, "ObjectTypeAnnotation");
+
+	  this.state.inType = oldInType;
+
+	  return out;
+	};
+
+	pp$8.flowObjectTypeSemicolon = function () {
+	  if (!this.eat(types.semi) && !this.eat(types.comma) && !this.match(types.braceR) && !this.match(types.braceBarR)) {
+	    this.unexpected();
+	  }
+	};
+
+	pp$8.flowParseQualifiedTypeIdentifier = function (startPos, startLoc, id) {
+	  startPos = startPos || this.state.start;
+	  startLoc = startLoc || this.state.startLoc;
+	  var node = id || this.parseIdentifier();
+
+	  while (this.eat(types.dot)) {
+	    var node2 = this.startNodeAt(startPos, startLoc);
+	    node2.qualification = node;
+	    node2.id = this.parseIdentifier();
+	    node = this.finishNode(node2, "QualifiedTypeIdentifier");
+	  }
+
+	  return node;
+	};
+
+	pp$8.flowParseGenericType = function (startPos, startLoc, id) {
+	  var node = this.startNodeAt(startPos, startLoc);
+
+	  node.typeParameters = null;
+	  node.id = this.flowParseQualifiedTypeIdentifier(startPos, startLoc, id);
+
+	  if (this.isRelational("<")) {
+	    node.typeParameters = this.flowParseTypeParameterInstantiation();
+	  }
+
+	  return this.finishNode(node, "GenericTypeAnnotation");
+	};
+
+	pp$8.flowParseTypeofType = function () {
+	  var node = this.startNode();
+	  this.expect(types._typeof);
+	  node.argument = this.flowParsePrimaryType();
+	  return this.finishNode(node, "TypeofTypeAnnotation");
+	};
+
+	pp$8.flowParseTupleType = function () {
+	  var node = this.startNode();
+	  node.types = [];
+	  this.expect(types.bracketL);
+	  // We allow trailing commas
+	  while (this.state.pos < this.input.length && !this.match(types.bracketR)) {
+	    node.types.push(this.flowParseType());
+	    if (this.match(types.bracketR)) break;
+	    this.expect(types.comma);
+	  }
+	  this.expect(types.bracketR);
+	  return this.finishNode(node, "TupleTypeAnnotation");
+	};
+
+	pp$8.flowParseFunctionTypeParam = function () {
+	  var name = null;
+	  var optional = false;
+	  var typeAnnotation = null;
+	  var node = this.startNode();
+	  var lh = this.lookahead();
+	  if (lh.type === types.colon || lh.type === types.question) {
+	    name = this.parseIdentifier();
+	    if (this.eat(types.question)) {
+	      optional = true;
+	    }
+	    typeAnnotation = this.flowParseTypeInitialiser();
+	  } else {
+	    typeAnnotation = this.flowParseType();
+	  }
+	  node.name = name;
+	  node.optional = optional;
+	  node.typeAnnotation = typeAnnotation;
+	  return this.finishNode(node, "FunctionTypeParam");
+	};
+
+	pp$8.reinterpretTypeAsFunctionTypeParam = function (type) {
+	  var node = this.startNodeAt(type.start, type.loc);
+	  node.name = null;
+	  node.optional = false;
+	  node.typeAnnotation = type;
+	  return this.finishNode(node, "FunctionTypeParam");
+	};
+
+	pp$8.flowParseFunctionTypeParams = function () {
+	  var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+
+	  var ret = { params: params, rest: null };
+	  while (!this.match(types.parenR) && !this.match(types.ellipsis)) {
+	    ret.params.push(this.flowParseFunctionTypeParam());
+	    if (!this.match(types.parenR)) {
+	      this.expect(types.comma);
+	    }
+	  }
+	  if (this.eat(types.ellipsis)) {
+	    ret.rest = this.flowParseFunctionTypeParam();
+	  }
+	  return ret;
+	};
+
+	pp$8.flowIdentToTypeAnnotation = function (startPos, startLoc, node, id) {
+	  switch (id.name) {
+	    case "any":
+	      return this.finishNode(node, "AnyTypeAnnotation");
+
+	    case "void":
+	      return this.finishNode(node, "VoidTypeAnnotation");
+
+	    case "bool":
+	    case "boolean":
+	      return this.finishNode(node, "BooleanTypeAnnotation");
+
+	    case "mixed":
+	      return this.finishNode(node, "MixedTypeAnnotation");
+
+	    case "empty":
+	      return this.finishNode(node, "EmptyTypeAnnotation");
+
+	    case "number":
+	      return this.finishNode(node, "NumberTypeAnnotation");
+
+	    case "string":
+	      return this.finishNode(node, "StringTypeAnnotation");
+
+	    default:
+	      return this.flowParseGenericType(startPos, startLoc, id);
+	  }
+	};
+
+	// The parsing of types roughly parallels the parsing of expressions, and
+	// primary types are kind of like primary expressions...they're the
+	// primitives with which other types are constructed.
+	pp$8.flowParsePrimaryType = function () {
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+	  var node = this.startNode();
+	  var tmp = void 0;
+	  var type = void 0;
+	  var isGroupedType = false;
+	  var oldNoAnonFunctionType = this.state.noAnonFunctionType;
+
+	  switch (this.state.type) {
+	    case types.name:
+	      return this.flowIdentToTypeAnnotation(startPos, startLoc, node, this.parseIdentifier());
+
+	    case types.braceL:
+	      return this.flowParseObjectType(false, false, true);
+
+	    case types.braceBarL:
+	      return this.flowParseObjectType(false, true, true);
+
+	    case types.bracketL:
+	      return this.flowParseTupleType();
+
+	    case types.relational:
+	      if (this.state.value === "<") {
+	        node.typeParameters = this.flowParseTypeParameterDeclaration();
+	        this.expect(types.parenL);
+	        tmp = this.flowParseFunctionTypeParams();
+	        node.params = tmp.params;
+	        node.rest = tmp.rest;
+	        this.expect(types.parenR);
+
+	        this.expect(types.arrow);
+
+	        node.returnType = this.flowParseType();
+
+	        return this.finishNode(node, "FunctionTypeAnnotation");
+	      }
+	      break;
+
+	    case types.parenL:
+	      this.next();
+
+	      // Check to see if this is actually a grouped type
+	      if (!this.match(types.parenR) && !this.match(types.ellipsis)) {
+	        if (this.match(types.name)) {
+	          var token = this.lookahead().type;
+	          isGroupedType = token !== types.question && token !== types.colon;
+	        } else {
+	          isGroupedType = true;
+	        }
+	      }
+
+	      if (isGroupedType) {
+	        this.state.noAnonFunctionType = false;
+	        type = this.flowParseType();
+	        this.state.noAnonFunctionType = oldNoAnonFunctionType;
+
+	        // A `,` or a `) =>` means this is an anonymous function type
+	        if (this.state.noAnonFunctionType || !(this.match(types.comma) || this.match(types.parenR) && this.lookahead().type === types.arrow)) {
+	          this.expect(types.parenR);
+	          return type;
+	        } else {
+	          // Eat a comma if there is one
+	          this.eat(types.comma);
+	        }
+	      }
+
+	      if (type) {
+	        tmp = this.flowParseFunctionTypeParams([this.reinterpretTypeAsFunctionTypeParam(type)]);
+	      } else {
+	        tmp = this.flowParseFunctionTypeParams();
+	      }
+
+	      node.params = tmp.params;
+	      node.rest = tmp.rest;
+
+	      this.expect(types.parenR);
+
+	      this.expect(types.arrow);
+
+	      node.returnType = this.flowParseType();
+
+	      node.typeParameters = null;
+
+	      return this.finishNode(node, "FunctionTypeAnnotation");
+
+	    case types.string:
+	      return this.parseLiteral(this.state.value, "StringLiteralTypeAnnotation");
+
+	    case types._true:case types._false:
+	      node.value = this.match(types._true);
+	      this.next();
+	      return this.finishNode(node, "BooleanLiteralTypeAnnotation");
+
+	    case types.plusMin:
+	      if (this.state.value === "-") {
+	        this.next();
+	        if (!this.match(types.num)) this.unexpected(null, "Unexpected token, expected number");
+
+	        return this.parseLiteral(-this.state.value, "NumericLiteralTypeAnnotation", node.start, node.loc.start);
+	      }
+
+	      this.unexpected();
+	    case types.num:
+	      return this.parseLiteral(this.state.value, "NumericLiteralTypeAnnotation");
+
+	    case types._null:
+	      node.value = this.match(types._null);
+	      this.next();
+	      return this.finishNode(node, "NullLiteralTypeAnnotation");
+
+	    case types._this:
+	      node.value = this.match(types._this);
+	      this.next();
+	      return this.finishNode(node, "ThisTypeAnnotation");
+
+	    case types.star:
+	      this.next();
+	      return this.finishNode(node, "ExistentialTypeParam");
+
+	    default:
+	      if (this.state.type.keyword === "typeof") {
+	        return this.flowParseTypeofType();
+	      }
+	  }
+
+	  this.unexpected();
+	};
+
+	pp$8.flowParsePostfixType = function () {
+	  var startPos = this.state.start,
+	      startLoc = this.state.startLoc;
+	  var type = this.flowParsePrimaryType();
+	  while (!this.canInsertSemicolon() && this.match(types.bracketL)) {
+	    var node = this.startNodeAt(startPos, startLoc);
+	    node.elementType = type;
+	    this.expect(types.bracketL);
+	    this.expect(types.bracketR);
+	    type = this.finishNode(node, "ArrayTypeAnnotation");
+	  }
+	  return type;
+	};
+
+	pp$8.flowParsePrefixType = function () {
+	  var node = this.startNode();
+	  if (this.eat(types.question)) {
+	    node.typeAnnotation = this.flowParsePrefixType();
+	    return this.finishNode(node, "NullableTypeAnnotation");
+	  } else {
+	    return this.flowParsePostfixType();
+	  }
+	};
+
+	pp$8.flowParseAnonFunctionWithoutParens = function () {
+	  var param = this.flowParsePrefixType();
+	  if (!this.state.noAnonFunctionType && this.eat(types.arrow)) {
+	    var node = this.startNodeAt(param.start, param.loc);
+	    node.params = [this.reinterpretTypeAsFunctionTypeParam(param)];
+	    node.rest = null;
+	    node.returnType = this.flowParseType();
+	    node.typeParameters = null;
+	    return this.finishNode(node, "FunctionTypeAnnotation");
+	  }
+	  return param;
+	};
+
+	pp$8.flowParseIntersectionType = function () {
+	  var node = this.startNode();
+	  this.eat(types.bitwiseAND);
+	  var type = this.flowParseAnonFunctionWithoutParens();
+	  node.types = [type];
+	  while (this.eat(types.bitwiseAND)) {
+	    node.types.push(this.flowParseAnonFunctionWithoutParens());
+	  }
+	  return node.types.length === 1 ? type : this.finishNode(node, "IntersectionTypeAnnotation");
+	};
+
+	pp$8.flowParseUnionType = function () {
+	  var node = this.startNode();
+	  this.eat(types.bitwiseOR);
+	  var type = this.flowParseIntersectionType();
+	  node.types = [type];
+	  while (this.eat(types.bitwiseOR)) {
+	    node.types.push(this.flowParseIntersectionType());
+	  }
+	  return node.types.length === 1 ? type : this.finishNode(node, "UnionTypeAnnotation");
+	};
+
+	pp$8.flowParseType = function () {
+	  var oldInType = this.state.inType;
+	  this.state.inType = true;
+	  var type = this.flowParseUnionType();
+	  this.state.inType = oldInType;
+	  return type;
+	};
+
+	pp$8.flowParseTypeAnnotation = function () {
+	  var node = this.startNode();
+	  node.typeAnnotation = this.flowParseTypeInitialiser();
+	  return this.finishNode(node, "TypeAnnotation");
+	};
+
+	pp$8.flowParseTypeAndPredicateAnnotation = function () {
+	  var node = this.startNode();
+
+	  var _flowParseTypeAndPred2 = this.flowParseTypeAndPredicateInitialiser();
+
+	  node.typeAnnotation = _flowParseTypeAndPred2[0];
+	  node.predicate = _flowParseTypeAndPred2[1];
+
+	  return this.finishNode(node, "TypeAnnotation");
+	};
+
+	pp$8.flowParseTypeAnnotatableIdentifier = function () {
+	  var ident = this.flowParseRestrictedIdentifier();
+	  if (this.match(types.colon)) {
+	    ident.typeAnnotation = this.flowParseTypeAnnotation();
+	    this.finishNode(ident, ident.type);
+	  }
+	  return ident;
+	};
+
+	pp$8.typeCastToParameter = function (node) {
+	  node.expression.typeAnnotation = node.typeAnnotation;
+
+	  return this.finishNodeAt(node.expression, node.expression.type, node.typeAnnotation.end, node.typeAnnotation.loc.end);
+	};
+
+	pp$8.flowParseVariance = function () {
+	  var variance = null;
+	  if (this.match(types.plusMin)) {
+	    if (this.state.value === "+") {
+	      variance = "plus";
+	    } else if (this.state.value === "-") {
+	      variance = "minus";
+	    }
+	    this.next();
+	  }
+	  return variance;
+	};
+
+	var flowPlugin = function flowPlugin(instance) {
+	  // plain function return types: function name(): string {}
+	  instance.extend("parseFunctionBody", function (inner) {
+	    return function (node, allowExpression) {
+	      if (this.match(types.colon) && !allowExpression) {
+	        // if allowExpression is true then we're parsing an arrow function and if
+	        // there's a return type then it's been handled elsewhere
+	        node.returnType = this.flowParseTypeAndPredicateAnnotation();
+	      }
+
+	      return inner.call(this, node, allowExpression);
+	    };
+	  });
+
+	  // interfaces
+	  instance.extend("parseStatement", function (inner) {
+	    return function (declaration, topLevel) {
+	      // strict mode handling of `interface` since it's a reserved word
+	      if (this.state.strict && this.match(types.name) && this.state.value === "interface") {
+	        var node = this.startNode();
+	        this.next();
+	        return this.flowParseInterface(node);
+	      } else {
+	        return inner.call(this, declaration, topLevel);
+	      }
+	    };
+	  });
+
+	  // declares, interfaces and type aliases
+	  instance.extend("parseExpressionStatement", function (inner) {
+	    return function (node, expr) {
+	      if (expr.type === "Identifier") {
+	        if (expr.name === "declare") {
+	          if (this.match(types._class) || this.match(types.name) || this.match(types._function) || this.match(types._var)) {
+	            return this.flowParseDeclare(node);
+	          }
+	        } else if (this.match(types.name)) {
+	          if (expr.name === "interface") {
+	            return this.flowParseInterface(node);
+	          } else if (expr.name === "type") {
+	            return this.flowParseTypeAlias(node);
+	          }
+	        }
+	      }
+
+	      return inner.call(this, node, expr);
+	    };
+	  });
+
+	  // export type
+	  instance.extend("shouldParseExportDeclaration", function (inner) {
+	    return function () {
+	      return this.isContextual("type") || this.isContextual("interface") || inner.call(this);
+	    };
+	  });
+
+	  instance.extend("isExportDefaultSpecifier", function (inner) {
+	    return function () {
+	      if (this.match(types.name) && (this.state.value === "type" || this.state.value === "interface")) {
+	        return false;
+	      }
+
+	      return inner.call(this);
+	    };
+	  });
+
+	  instance.extend("parseConditional", function (inner) {
+	    return function (expr, noIn, startPos, startLoc, refNeedsArrowPos) {
+	      // only do the expensive clone if there is a question mark
+	      // and if we come from inside parens
+	      if (refNeedsArrowPos && this.match(types.question)) {
+	        var state = this.state.clone();
+	        try {
+	          return inner.call(this, expr, noIn, startPos, startLoc);
+	        } catch (err) {
+	          if (err instanceof SyntaxError) {
+	            this.state = state;
+	            refNeedsArrowPos.start = err.pos || this.state.start;
+	            return expr;
+	          } else {
+	            // istanbul ignore next: no such error is expected
+	            throw err;
+	          }
+	        }
+	      }
+
+	      return inner.call(this, expr, noIn, startPos, startLoc);
+	    };
+	  });
+
+	  instance.extend("parseParenItem", function (inner) {
+	    return function (node, startPos, startLoc) {
+	      node = inner.call(this, node, startPos, startLoc);
+	      if (this.eat(types.question)) {
+	        node.optional = true;
+	      }
+
+	      if (this.match(types.colon)) {
+	        var typeCastNode = this.startNodeAt(startPos, startLoc);
+	        typeCastNode.expression = node;
+	        typeCastNode.typeAnnotation = this.flowParseTypeAnnotation();
+
+	        return this.finishNode(typeCastNode, "TypeCastExpression");
+	      }
+
+	      return node;
+	    };
+	  });
+
+	  instance.extend("parseExport", function (inner) {
+	    return function (node) {
+	      node = inner.call(this, node);
+	      if (node.type === "ExportNamedDeclaration") {
+	        node.exportKind = node.exportKind || "value";
+	      }
+	      return node;
+	    };
+	  });
+
+	  instance.extend("parseExportDeclaration", function (inner) {
+	    return function (node) {
+	      if (this.isContextual("type")) {
+	        node.exportKind = "type";
+
+	        var declarationNode = this.startNode();
+	        this.next();
+
+	        if (this.match(types.braceL)) {
+	          // export type { foo, bar };
+	          node.specifiers = this.parseExportSpecifiers();
+	          this.parseExportFrom(node);
+	          return null;
+	        } else {
+	          // export type Foo = Bar;
+	          return this.flowParseTypeAlias(declarationNode);
+	        }
+	      } else if (this.isContextual("interface")) {
+	        node.exportKind = "type";
+	        var _declarationNode = this.startNode();
+	        this.next();
+	        return this.flowParseInterface(_declarationNode);
+	      } else {
+	        return inner.call(this, node);
+	      }
+	    };
+	  });
+
+	  instance.extend("parseClassId", function (inner) {
+	    return function (node) {
+	      inner.apply(this, arguments);
+	      if (this.isRelational("<")) {
+	        node.typeParameters = this.flowParseTypeParameterDeclaration();
+	      }
+	    };
+	  });
+
+	  // don't consider `void` to be a keyword as then it'll use the void token type
+	  // and set startExpr
+	  instance.extend("isKeyword", function (inner) {
+	    return function (name) {
+	      if (this.state.inType && name === "void") {
+	        return false;
+	      } else {
+	        return inner.call(this, name);
+	      }
+	    };
+	  });
+
+	  // ensure that inside flow types, we bypass the jsx parser plugin
+	  instance.extend("readToken", function (inner) {
+	    return function (code) {
+	      if (this.state.inType && (code === 62 || code === 60)) {
+	        return this.finishOp(types.relational, 1);
+	      } else {
+	        return inner.call(this, code);
+	      }
+	    };
+	  });
+
+	  // don't lex any token as a jsx one inside a flow type
+	  instance.extend("jsx_readToken", function (inner) {
+	    return function () {
+	      if (!this.state.inType) return inner.call(this);
+	    };
+	  });
+
+	  instance.extend("toAssignable", function (inner) {
+	    return function (node, isBinding, contextDescription) {
+	      if (node.type === "TypeCastExpression") {
+	        return inner.call(this, this.typeCastToParameter(node), isBinding, contextDescription);
+	      } else {
+	        return inner.call(this, node, isBinding, contextDescription);
+	      }
+	    };
+	  });
+
+	  // turn type casts that we found in function parameter head into type annotated params
+	  instance.extend("toAssignableList", function (inner) {
+	    return function (exprList, isBinding, contextDescription) {
+	      for (var i = 0; i < exprList.length; i++) {
+	        var expr = exprList[i];
+	        if (expr && expr.type === "TypeCastExpression") {
+	          exprList[i] = this.typeCastToParameter(expr);
+	        }
+	      }
+	      return inner.call(this, exprList, isBinding, contextDescription);
+	    };
+	  });
+
+	  // this is a list of nodes, from something like a call expression, we need to filter the
+	  // type casts that we've found that are illegal in this context
+	  instance.extend("toReferencedList", function () {
+	    return function (exprList) {
+	      for (var i = 0; i < exprList.length; i++) {
+	        var expr = exprList[i];
+	        if (expr && expr._exprListItem && expr.type === "TypeCastExpression") {
+	          this.raise(expr.start, "Unexpected type cast");
+	        }
+	      }
+
+	      return exprList;
+	    };
+	  });
+
+	  // parse an item inside a expression list eg. `(NODE, NODE)` where NODE represents
+	  // the position where this function is called
+	  instance.extend("parseExprListItem", function (inner) {
+	    return function () {
+	      var container = this.startNode();
+
+	      for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+	        args[_key] = arguments[_key];
+	      }
+
+	      var node = inner.call.apply(inner, [this].concat(args));
+	      if (this.match(types.colon)) {
+	        container._exprListItem = true;
+	        container.expression = node;
+	        container.typeAnnotation = this.flowParseTypeAnnotation();
+	        return this.finishNode(container, "TypeCastExpression");
+	      } else {
+	        return node;
+	      }
+	    };
+	  });
+
+	  instance.extend("checkLVal", function (inner) {
+	    return function (node) {
+	      if (node.type !== "TypeCastExpression") {
+	        return inner.apply(this, arguments);
+	      }
+	    };
+	  });
+
+	  // parse class property type annotations
+	  instance.extend("parseClassProperty", function (inner) {
+	    return function (node) {
+	      delete node.variancePos;
+	      if (this.match(types.colon)) {
+	        node.typeAnnotation = this.flowParseTypeAnnotation();
+	      }
+	      return inner.call(this, node);
+	    };
+	  });
+
+	  // determine whether or not we're currently in the position where a class method would appear
+	  instance.extend("isClassMethod", function (inner) {
+	    return function () {
+	      return this.isRelational("<") || inner.call(this);
+	    };
+	  });
+
+	  // determine whether or not we're currently in the position where a class property would appear
+	  instance.extend("isClassProperty", function (inner) {
+	    return function () {
+	      return this.match(types.colon) || inner.call(this);
+	    };
+	  });
+
+	  instance.extend("isNonstaticConstructor", function (inner) {
+	    return function (method) {
+	      return !this.match(types.colon) && inner.call(this, method);
+	    };
+	  });
+
+	  // parse type parameters for class methods
+	  instance.extend("parseClassMethod", function (inner) {
+	    return function (classBody, method) {
+	      if (method.variance) {
+	        this.unexpected(method.variancePos);
+	      }
+	      delete method.variance;
+	      delete method.variancePos;
+	      if (this.isRelational("<")) {
+	        method.typeParameters = this.flowParseTypeParameterDeclaration();
+	      }
+
+	      for (var _len2 = arguments.length, args = Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
+	        args[_key2 - 2] = arguments[_key2];
+	      }
+
+	      inner.call.apply(inner, [this, classBody, method].concat(args));
+	    };
+	  });
+
+	  // parse a the super class type parameters and implements
+	  instance.extend("parseClassSuper", function (inner) {
+	    return function (node, isStatement) {
+	      inner.call(this, node, isStatement);
+	      if (node.superClass && this.isRelational("<")) {
+	        node.superTypeParameters = this.flowParseTypeParameterInstantiation();
+	      }
+	      if (this.isContextual("implements")) {
+	        this.next();
+	        var implemented = node.implements = [];
+	        do {
+	          var _node = this.startNode();
+	          _node.id = this.parseIdentifier();
+	          if (this.isRelational("<")) {
+	            _node.typeParameters = this.flowParseTypeParameterInstantiation();
+	          } else {
+	            _node.typeParameters = null;
+	          }
+	          implemented.push(this.finishNode(_node, "ClassImplements"));
+	        } while (this.eat(types.comma));
+	      }
+	    };
+	  });
+
+	  instance.extend("parsePropertyName", function (inner) {
+	    return function (node) {
+	      var variancePos = this.state.start;
+	      var variance = this.flowParseVariance();
+	      var key = inner.call(this, node);
+	      node.variance = variance;
+	      node.variancePos = variancePos;
+	      return key;
+	    };
+	  });
+
+	  // parse type parameters for object method shorthand
+	  instance.extend("parseObjPropValue", function (inner) {
+	    return function (prop) {
+	      if (prop.variance) {
+	        this.unexpected(prop.variancePos);
+	      }
+	      delete prop.variance;
+	      delete prop.variancePos;
+
+	      var typeParameters = void 0;
+
+	      // method shorthand
+	      if (this.isRelational("<")) {
+	        typeParameters = this.flowParseTypeParameterDeclaration();
+	        if (!this.match(types.parenL)) this.unexpected();
+	      }
+
+	      inner.apply(this, arguments);
+
+	      // add typeParameters if we found them
+	      if (typeParameters) {
+	        (prop.value || prop).typeParameters = typeParameters;
+	      }
+	    };
+	  });
+
+	  instance.extend("parseAssignableListItemTypes", function () {
+	    return function (param) {
+	      if (this.eat(types.question)) {
+	        param.optional = true;
+	      }
+	      if (this.match(types.colon)) {
+	        param.typeAnnotation = this.flowParseTypeAnnotation();
+	      }
+	      this.finishNode(param, param.type);
+	      return param;
+	    };
+	  });
+
+	  instance.extend("parseMaybeDefault", function (inner) {
+	    return function () {
+	      for (var _len3 = arguments.length, args = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+	        args[_key3] = arguments[_key3];
+	      }
+
+	      var node = inner.apply(this, args);
+
+	      if (node.type === "AssignmentPattern" && node.typeAnnotation && node.right.start < node.typeAnnotation.start) {
+	        this.raise(node.typeAnnotation.start, "Type annotations must come before default assignments, e.g. instead of `age = 25: number` use `age: number = 25`");
+	      }
+
+	      return node;
+	    };
+	  });
+
+	  // parse typeof and type imports
+	  instance.extend("parseImportSpecifiers", function (inner) {
+	    return function (node) {
+	      node.importKind = "value";
+
+	      var kind = null;
+	      if (this.match(types._typeof)) {
+	        kind = "typeof";
+	      } else if (this.isContextual("type")) {
+	        kind = "type";
+	      }
+	      if (kind) {
+	        var lh = this.lookahead();
+	        if (lh.type === types.name && lh.value !== "from" || lh.type === types.braceL || lh.type === types.star) {
+	          this.next();
+	          node.importKind = kind;
+	        }
+	      }
+
+	      inner.call(this, node);
+	    };
+	  });
+
+	  // parse import-type/typeof shorthand
+	  instance.extend("parseImportSpecifier", function () {
+	    return function (node) {
+	      var specifier = this.startNode();
+	      var firstIdentLoc = this.state.start;
+	      var firstIdent = this.parseIdentifier(true);
+
+	      var specifierTypeKind = null;
+	      if (firstIdent.name === "type") {
+	        specifierTypeKind = "type";
+	      } else if (firstIdent.name === "typeof") {
+	        specifierTypeKind = "typeof";
+	      }
+
+	      var isBinding = false;
+	      if (this.isContextual("as")) {
+	        var as_ident = this.parseIdentifier(true);
+	        if (specifierTypeKind !== null && !this.match(types.name) && !this.state.type.keyword) {
+	          // `import {type as ,` or `import {type as }`
+	          specifier.imported = as_ident;
+	          specifier.importKind = specifierTypeKind;
+	          specifier.local = as_ident.__clone();
+	        } else {
+	          // `import {type as foo`
+	          specifier.imported = firstIdent;
+	          specifier.importKind = null;
+	          specifier.local = this.parseIdentifier();
+	        }
+	      } else if (specifierTypeKind !== null && (this.match(types.name) || this.state.type.keyword)) {
+	        // `import {type foo`
+	        specifier.imported = this.parseIdentifier(true);
+	        specifier.importKind = specifierTypeKind;
+	        if (this.eatContextual("as")) {
+	          specifier.local = this.parseIdentifier();
+	        } else {
+	          isBinding = true;
+	          specifier.local = specifier.imported.__clone();
+	        }
+	      } else {
+	        isBinding = true;
+	        specifier.imported = firstIdent;
+	        specifier.importKind = null;
+	        specifier.local = specifier.imported.__clone();
+	      }
+
+	      if ((node.importKind === "type" || node.importKind === "typeof") && (specifier.importKind === "type" || specifier.importKind === "typeof")) {
+	        this.raise(firstIdentLoc, "`The `type` and `typeof` keywords on named imports can only be used on regular `import` statements. It cannot be used with `import type` or `import typeof` statements`");
+	      }
+
+	      if (isBinding) this.checkReservedWord(specifier.local.name, specifier.start, true, true);
+
+	      this.checkLVal(specifier.local, true, undefined, "import specifier");
+	      node.specifiers.push(this.finishNode(specifier, "ImportSpecifier"));
+	    };
+	  });
+
+	  // parse function type parameters - function foo<T>() {}
+	  instance.extend("parseFunctionParams", function (inner) {
+	    return function (node) {
+	      if (this.isRelational("<")) {
+	        node.typeParameters = this.flowParseTypeParameterDeclaration();
+	      }
+	      inner.call(this, node);
+	    };
+	  });
+
+	  // parse flow type annotations on variable declarator heads - let foo: string = bar
+	  instance.extend("parseVarHead", function (inner) {
+	    return function (decl) {
+	      inner.call(this, decl);
+	      if (this.match(types.colon)) {
+	        decl.id.typeAnnotation = this.flowParseTypeAnnotation();
+	        this.finishNode(decl.id, decl.id.type);
+	      }
+	    };
+	  });
+
+	  // parse the return type of an async arrow function - let foo = (async (): number => {});
+	  instance.extend("parseAsyncArrowFromCallExpression", function (inner) {
+	    return function (node, call) {
+	      if (this.match(types.colon)) {
+	        var oldNoAnonFunctionType = this.state.noAnonFunctionType;
+	        this.state.noAnonFunctionType = true;
+	        node.returnType = this.flowParseTypeAnnotation();
+	        this.state.noAnonFunctionType = oldNoAnonFunctionType;
+	      }
+
+	      return inner.call(this, node, call);
+	    };
+	  });
+
+	  // todo description
+	  instance.extend("shouldParseAsyncArrow", function (inner) {
+	    return function () {
+	      return this.match(types.colon) || inner.call(this);
+	    };
+	  });
+
+	  // We need to support type parameter declarations for arrow functions. This
+	  // is tricky. There are three situations we need to handle
+	  //
+	  // 1. This is either JSX or an arrow function. We'll try JSX first. If that
+	  //    fails, we'll try an arrow function. If that fails, we'll throw the JSX
+	  //    error.
+	  // 2. This is an arrow function. We'll parse the type parameter declaration,
+	  //    parse the rest, make sure the rest is an arrow function, and go from
+	  //    there
+	  // 3. This is neither. Just call the inner function
+	  instance.extend("parseMaybeAssign", function (inner) {
+	    return function () {
+	      var jsxError = null;
+
+	      for (var _len4 = arguments.length, args = Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+	        args[_key4] = arguments[_key4];
+	      }
+
+	      if (types.jsxTagStart && this.match(types.jsxTagStart)) {
+	        var state = this.state.clone();
+	        try {
+	          return inner.apply(this, args);
+	        } catch (err) {
+	          if (err instanceof SyntaxError) {
+	            this.state = state;
+
+	            // Remove `tc.j_expr` and `tc.j_oTag` from context added
+	            // by parsing `jsxTagStart` to stop the JSX plugin from
+	            // messing with the tokens
+	            this.state.context.length -= 2;
+
+	            jsxError = err;
+	          } else {
+	            // istanbul ignore next: no such error is expected
+	            throw err;
+	          }
+	        }
+	      }
+
+	      if (jsxError != null || this.isRelational("<")) {
+	        var arrowExpression = void 0;
+	        var typeParameters = void 0;
+	        try {
+	          typeParameters = this.flowParseTypeParameterDeclaration();
+
+	          arrowExpression = inner.apply(this, args);
+	          arrowExpression.typeParameters = typeParameters;
+	          arrowExpression.start = typeParameters.start;
+	          arrowExpression.loc.start = typeParameters.loc.start;
+	        } catch (err) {
+	          throw jsxError || err;
+	        }
+
+	        if (arrowExpression.type === "ArrowFunctionExpression") {
+	          return arrowExpression;
+	        } else if (jsxError != null) {
+	          throw jsxError;
+	        } else {
+	          this.raise(typeParameters.start, "Expected an arrow function after this type parameter declaration");
+	        }
+	      }
+
+	      return inner.apply(this, args);
+	    };
+	  });
+
+	  // handle return types for arrow functions
+	  instance.extend("parseArrow", function (inner) {
+	    return function (node) {
+	      if (this.match(types.colon)) {
+	        var state = this.state.clone();
+	        try {
+	          var oldNoAnonFunctionType = this.state.noAnonFunctionType;
+	          this.state.noAnonFunctionType = true;
+	          var returnType = this.flowParseTypeAndPredicateAnnotation();
+	          this.state.noAnonFunctionType = oldNoAnonFunctionType;
+
+	          if (this.canInsertSemicolon()) this.unexpected();
+	          if (!this.match(types.arrow)) this.unexpected();
+	          // assign after it is clear it is an arrow
+	          node.returnType = returnType;
+	        } catch (err) {
+	          if (err instanceof SyntaxError) {
+	            this.state = state;
+	          } else {
+	            // istanbul ignore next: no such error is expected
+	            throw err;
+	          }
+	        }
+	      }
+
+	      return inner.call(this, node);
+	    };
+	  });
+
+	  instance.extend("shouldParseArrow", function (inner) {
+	    return function () {
+	      return this.match(types.colon) || inner.call(this);
+	    };
+	  });
+	};
+
+	// Adapted from String.fromcodepoint to export the function without modifying String
+	/*! https://mths.be/fromcodepoint v0.2.1 by @mathias */
+
+	// The MIT License (MIT)
+	// Copyright (c) Mathias Bynens
+	//
+	// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+	// associated documentation files (the "Software"), to deal in the Software without restriction,
+	// including without limitation the rights to use, copy, modify, merge, publish, distribute,
+	// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+	// furnished to do so, subject to the following conditions:
+	//
+	// The above copyright notice and this permission notice shall be included in all copies or
+	// substantial portions of the Software.
+	//
+	// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+	// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+	// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+	// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+	var fromCodePoint = String.fromCodePoint;
+
+	if (!fromCodePoint) {
+	  var stringFromCharCode = String.fromCharCode;
+	  var floor = Math.floor;
+	  fromCodePoint = function fromCodePoint() {
+	    var MAX_SIZE = 0x4000;
+	    var codeUnits = [];
+	    var highSurrogate = void 0;
+	    var lowSurrogate = void 0;
+	    var index = -1;
+	    var length = arguments.length;
+	    if (!length) {
+	      return "";
+	    }
+	    var result = "";
+	    while (++index < length) {
+	      var codePoint = Number(arguments[index]);
+	      if (!isFinite(codePoint) || // `NaN`, `+Infinity`, or `-Infinity`
+	      codePoint < 0 || // not a valid Unicode code point
+	      codePoint > 0x10FFFF || // not a valid Unicode code point
+	      floor(codePoint) != codePoint // not an integer
+	      ) {
+	          throw RangeError("Invalid code point: " + codePoint);
+	        }
+	      if (codePoint <= 0xFFFF) {
+	        // BMP code point
+	        codeUnits.push(codePoint);
+	      } else {
+	        // Astral code point; split in surrogate halves
+	        // https://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
+	        codePoint -= 0x10000;
+	        highSurrogate = (codePoint >> 10) + 0xD800;
+	        lowSurrogate = codePoint % 0x400 + 0xDC00;
+	        codeUnits.push(highSurrogate, lowSurrogate);
+	      }
+	      if (index + 1 == length || codeUnits.length > MAX_SIZE) {
+	        result += stringFromCharCode.apply(null, codeUnits);
+	        codeUnits.length = 0;
+	      }
+	    }
+	    return result;
+	  };
+	}
+
+	var fromCodePoint$1 = fromCodePoint;
+
+	var XHTMLEntities = {
+	  quot: "\"",
+	  amp: "&",
+	  apos: "'",
+	  lt: "<",
+	  gt: ">",
+	  nbsp: "\xA0",
+	  iexcl: "\xA1",
+	  cent: "\xA2",
+	  pound: "\xA3",
+	  curren: "\xA4",
+	  yen: "\xA5",
+	  brvbar: "\xA6",
+	  sect: "\xA7",
+	  uml: "\xA8",
+	  copy: "\xA9",
+	  ordf: "\xAA",
+	  laquo: "\xAB",
+	  not: "\xAC",
+	  shy: "\xAD",
+	  reg: "\xAE",
+	  macr: "\xAF",
+	  deg: "\xB0",
+	  plusmn: "\xB1",
+	  sup2: "\xB2",
+	  sup3: "\xB3",
+	  acute: "\xB4",
+	  micro: "\xB5",
+	  para: "\xB6",
+	  middot: "\xB7",
+	  cedil: "\xB8",
+	  sup1: "\xB9",
+	  ordm: "\xBA",
+	  raquo: "\xBB",
+	  frac14: "\xBC",
+	  frac12: "\xBD",
+	  frac34: "\xBE",
+	  iquest: "\xBF",
+	  Agrave: "\xC0",
+	  Aacute: "\xC1",
+	  Acirc: "\xC2",
+	  Atilde: "\xC3",
+	  Auml: "\xC4",
+	  Aring: "\xC5",
+	  AElig: "\xC6",
+	  Ccedil: "\xC7",
+	  Egrave: "\xC8",
+	  Eacute: "\xC9",
+	  Ecirc: "\xCA",
+	  Euml: "\xCB",
+	  Igrave: "\xCC",
+	  Iacute: "\xCD",
+	  Icirc: "\xCE",
+	  Iuml: "\xCF",
+	  ETH: "\xD0",
+	  Ntilde: "\xD1",
+	  Ograve: "\xD2",
+	  Oacute: "\xD3",
+	  Ocirc: "\xD4",
+	  Otilde: "\xD5",
+	  Ouml: "\xD6",
+	  times: "\xD7",
+	  Oslash: "\xD8",
+	  Ugrave: "\xD9",
+	  Uacute: "\xDA",
+	  Ucirc: "\xDB",
+	  Uuml: "\xDC",
+	  Yacute: "\xDD",
+	  THORN: "\xDE",
+	  szlig: "\xDF",
+	  agrave: "\xE0",
+	  aacute: "\xE1",
+	  acirc: "\xE2",
+	  atilde: "\xE3",
+	  auml: "\xE4",
+	  aring: "\xE5",
+	  aelig: "\xE6",
+	  ccedil: "\xE7",
+	  egrave: "\xE8",
+	  eacute: "\xE9",
+	  ecirc: "\xEA",
+	  euml: "\xEB",
+	  igrave: "\xEC",
+	  iacute: "\xED",
+	  icirc: "\xEE",
+	  iuml: "\xEF",
+	  eth: "\xF0",
+	  ntilde: "\xF1",
+	  ograve: "\xF2",
+	  oacute: "\xF3",
+	  ocirc: "\xF4",
+	  otilde: "\xF5",
+	  ouml: "\xF6",
+	  divide: "\xF7",
+	  oslash: "\xF8",
+	  ugrave: "\xF9",
+	  uacute: "\xFA",
+	  ucirc: "\xFB",
+	  uuml: "\xFC",
+	  yacute: "\xFD",
+	  thorn: "\xFE",
+	  yuml: "\xFF",
+	  OElig: '\u0152',
+	  oelig: '\u0153',
+	  Scaron: '\u0160',
+	  scaron: '\u0161',
+	  Yuml: '\u0178',
+	  fnof: '\u0192',
+	  circ: '\u02C6',
+	  tilde: '\u02DC',
+	  Alpha: '\u0391',
+	  Beta: '\u0392',
+	  Gamma: '\u0393',
+	  Delta: '\u0394',
+	  Epsilon: '\u0395',
+	  Zeta: '\u0396',
+	  Eta: '\u0397',
+	  Theta: '\u0398',
+	  Iota: '\u0399',
+	  Kappa: '\u039A',
+	  Lambda: '\u039B',
+	  Mu: '\u039C',
+	  Nu: '\u039D',
+	  Xi: '\u039E',
+	  Omicron: '\u039F',
+	  Pi: '\u03A0',
+	  Rho: '\u03A1',
+	  Sigma: '\u03A3',
+	  Tau: '\u03A4',
+	  Upsilon: '\u03A5',
+	  Phi: '\u03A6',
+	  Chi: '\u03A7',
+	  Psi: '\u03A8',
+	  Omega: '\u03A9',
+	  alpha: '\u03B1',
+	  beta: '\u03B2',
+	  gamma: '\u03B3',
+	  delta: '\u03B4',
+	  epsilon: '\u03B5',
+	  zeta: '\u03B6',
+	  eta: '\u03B7',
+	  theta: '\u03B8',
+	  iota: '\u03B9',
+	  kappa: '\u03BA',
+	  lambda: '\u03BB',
+	  mu: '\u03BC',
+	  nu: '\u03BD',
+	  xi: '\u03BE',
+	  omicron: '\u03BF',
+	  pi: '\u03C0',
+	  rho: '\u03C1',
+	  sigmaf: '\u03C2',
+	  sigma: '\u03C3',
+	  tau: '\u03C4',
+	  upsilon: '\u03C5',
+	  phi: '\u03C6',
+	  chi: '\u03C7',
+	  psi: '\u03C8',
+	  omega: '\u03C9',
+	  thetasym: '\u03D1',
+	  upsih: '\u03D2',
+	  piv: '\u03D6',
+	  ensp: '\u2002',
+	  emsp: '\u2003',
+	  thinsp: '\u2009',
+	  zwnj: '\u200C',
+	  zwj: '\u200D',
+	  lrm: '\u200E',
+	  rlm: '\u200F',
+	  ndash: '\u2013',
+	  mdash: '\u2014',
+	  lsquo: '\u2018',
+	  rsquo: '\u2019',
+	  sbquo: '\u201A',
+	  ldquo: '\u201C',
+	  rdquo: '\u201D',
+	  bdquo: '\u201E',
+	  dagger: '\u2020',
+	  Dagger: '\u2021',
+	  bull: '\u2022',
+	  hellip: '\u2026',
+	  permil: '\u2030',
+	  prime: '\u2032',
+	  Prime: '\u2033',
+	  lsaquo: '\u2039',
+	  rsaquo: '\u203A',
+	  oline: '\u203E',
+	  frasl: '\u2044',
+	  euro: '\u20AC',
+	  image: '\u2111',
+	  weierp: '\u2118',
+	  real: '\u211C',
+	  trade: '\u2122',
+	  alefsym: '\u2135',
+	  larr: '\u2190',
+	  uarr: '\u2191',
+	  rarr: '\u2192',
+	  darr: '\u2193',
+	  harr: '\u2194',
+	  crarr: '\u21B5',
+	  lArr: '\u21D0',
+	  uArr: '\u21D1',
+	  rArr: '\u21D2',
+	  dArr: '\u21D3',
+	  hArr: '\u21D4',
+	  forall: '\u2200',
+	  part: '\u2202',
+	  exist: '\u2203',
+	  empty: '\u2205',
+	  nabla: '\u2207',
+	  isin: '\u2208',
+	  notin: '\u2209',
+	  ni: '\u220B',
+	  prod: '\u220F',
+	  sum: '\u2211',
+	  minus: '\u2212',
+	  lowast: '\u2217',
+	  radic: '\u221A',
+	  prop: '\u221D',
+	  infin: '\u221E',
+	  ang: '\u2220',
+	  and: '\u2227',
+	  or: '\u2228',
+	  cap: '\u2229',
+	  cup: '\u222A',
+	  "int": '\u222B',
+	  there4: '\u2234',
+	  sim: '\u223C',
+	  cong: '\u2245',
+	  asymp: '\u2248',
+	  ne: '\u2260',
+	  equiv: '\u2261',
+	  le: '\u2264',
+	  ge: '\u2265',
+	  sub: '\u2282',
+	  sup: '\u2283',
+	  nsub: '\u2284',
+	  sube: '\u2286',
+	  supe: '\u2287',
+	  oplus: '\u2295',
+	  otimes: '\u2297',
+	  perp: '\u22A5',
+	  sdot: '\u22C5',
+	  lceil: '\u2308',
+	  rceil: '\u2309',
+	  lfloor: '\u230A',
+	  rfloor: '\u230B',
+	  lang: '\u2329',
+	  rang: '\u232A',
+	  loz: '\u25CA',
+	  spades: '\u2660',
+	  clubs: '\u2663',
+	  hearts: '\u2665',
+	  diams: '\u2666'
+	};
+
+	var HEX_NUMBER = /^[\da-fA-F]+$/;
+	var DECIMAL_NUMBER = /^\d+$/;
+
+	types$1.j_oTag = new TokContext("<tag", false);
+	types$1.j_cTag = new TokContext("</tag", false);
+	types$1.j_expr = new TokContext("<tag>...</tag>", true, true);
+
+	types.jsxName = new TokenType("jsxName");
+	types.jsxText = new TokenType("jsxText", { beforeExpr: true });
+	types.jsxTagStart = new TokenType("jsxTagStart", { startsExpr: true });
+	types.jsxTagEnd = new TokenType("jsxTagEnd");
+
+	types.jsxTagStart.updateContext = function () {
+	  this.state.context.push(types$1.j_expr); // treat as beginning of JSX expression
+	  this.state.context.push(types$1.j_oTag); // start opening tag context
+	  this.state.exprAllowed = false;
+	};
+
+	types.jsxTagEnd.updateContext = function (prevType) {
+	  var out = this.state.context.pop();
+	  if (out === types$1.j_oTag && prevType === types.slash || out === types$1.j_cTag) {
+	    this.state.context.pop();
+	    this.state.exprAllowed = this.curContext() === types$1.j_expr;
+	  } else {
+	    this.state.exprAllowed = true;
+	  }
+	};
+
+	var pp$9 = Parser.prototype;
+
+	// Reads inline JSX contents token.
+
+	pp$9.jsxReadToken = function () {
+	  var out = "";
+	  var chunkStart = this.state.pos;
+	  for (;;) {
+	    if (this.state.pos >= this.input.length) {
+	      this.raise(this.state.start, "Unterminated JSX contents");
+	    }
+
+	    var ch = this.input.charCodeAt(this.state.pos);
+
+	    switch (ch) {
+	      case 60: // "<"
+	      case 123:
+	        // "{"
+	        if (this.state.pos === this.state.start) {
+	          if (ch === 60 && this.state.exprAllowed) {
+	            ++this.state.pos;
+	            return this.finishToken(types.jsxTagStart);
+	          }
+	          return this.getTokenFromCode(ch);
+	        }
+	        out += this.input.slice(chunkStart, this.state.pos);
+	        return this.finishToken(types.jsxText, out);
+
+	      case 38:
+	        // "&"
+	        out += this.input.slice(chunkStart, this.state.pos);
+	        out += this.jsxReadEntity();
+	        chunkStart = this.state.pos;
+	        break;
+
+	      default:
+	        if (isNewLine(ch)) {
+	          out += this.input.slice(chunkStart, this.state.pos);
+	          out += this.jsxReadNewLine(true);
+	          chunkStart = this.state.pos;
+	        } else {
+	          ++this.state.pos;
+	        }
+	    }
+	  }
+	};
+
+	pp$9.jsxReadNewLine = function (normalizeCRLF) {
+	  var ch = this.input.charCodeAt(this.state.pos);
+	  var out = void 0;
+	  ++this.state.pos;
+	  if (ch === 13 && this.input.charCodeAt(this.state.pos) === 10) {
+	    ++this.state.pos;
+	    out = normalizeCRLF ? "\n" : "\r\n";
+	  } else {
+	    out = String.fromCharCode(ch);
+	  }
+	  ++this.state.curLine;
+	  this.state.lineStart = this.state.pos;
+
+	  return out;
+	};
+
+	pp$9.jsxReadString = function (quote) {
+	  var out = "";
+	  var chunkStart = ++this.state.pos;
+	  for (;;) {
+	    if (this.state.pos >= this.input.length) {
+	      this.raise(this.state.start, "Unterminated string constant");
+	    }
+
+	    var ch = this.input.charCodeAt(this.state.pos);
+	    if (ch === quote) break;
+	    if (ch === 38) {
+	      // "&"
+	      out += this.input.slice(chunkStart, this.state.pos);
+	      out += this.jsxReadEntity();
+	      chunkStart = this.state.pos;
+	    } else if (isNewLine(ch)) {
+	      out += this.input.slice(chunkStart, this.state.pos);
+	      out += this.jsxReadNewLine(false);
+	      chunkStart = this.state.pos;
+	    } else {
+	      ++this.state.pos;
+	    }
+	  }
+	  out += this.input.slice(chunkStart, this.state.pos++);
+	  return this.finishToken(types.string, out);
+	};
+
+	pp$9.jsxReadEntity = function () {
+	  var str = "";
+	  var count = 0;
+	  var entity = void 0;
+	  var ch = this.input[this.state.pos];
+
+	  var startPos = ++this.state.pos;
+	  while (this.state.pos < this.input.length && count++ < 10) {
+	    ch = this.input[this.state.pos++];
+	    if (ch === ";") {
+	      if (str[0] === "#") {
+	        if (str[1] === "x") {
+	          str = str.substr(2);
+	          if (HEX_NUMBER.test(str)) entity = fromCodePoint$1(parseInt(str, 16));
+	        } else {
+	          str = str.substr(1);
+	          if (DECIMAL_NUMBER.test(str)) entity = fromCodePoint$1(parseInt(str, 10));
+	        }
+	      } else {
+	        entity = XHTMLEntities[str];
+	      }
+	      break;
+	    }
+	    str += ch;
+	  }
+	  if (!entity) {
+	    this.state.pos = startPos;
+	    return "&";
+	  }
+	  return entity;
+	};
+
+	// Read a JSX identifier (valid tag or attribute name).
+	//
+	// Optimized version since JSX identifiers can"t contain
+	// escape characters and so can be read as single slice.
+	// Also assumes that first character was already checked
+	// by isIdentifierStart in readToken.
+
+	pp$9.jsxReadWord = function () {
+	  var ch = void 0;
+	  var start = this.state.pos;
+	  do {
+	    ch = this.input.charCodeAt(++this.state.pos);
+	  } while (isIdentifierChar(ch) || ch === 45); // "-"
+	  return this.finishToken(types.jsxName, this.input.slice(start, this.state.pos));
+	};
+
+	// Transforms JSX element name to string.
+
+	function getQualifiedJSXName(object) {
+	  if (object.type === "JSXIdentifier") {
+	    return object.name;
+	  }
+
+	  if (object.type === "JSXNamespacedName") {
+	    return object.namespace.name + ":" + object.name.name;
+	  }
+
+	  if (object.type === "JSXMemberExpression") {
+	    return getQualifiedJSXName(object.object) + "." + getQualifiedJSXName(object.property);
+	  }
+	}
+
+	// Parse next token as JSX identifier
+
+	pp$9.jsxParseIdentifier = function () {
+	  var node = this.startNode();
+	  if (this.match(types.jsxName)) {
+	    node.name = this.state.value;
+	  } else if (this.state.type.keyword) {
+	    node.name = this.state.type.keyword;
+	  } else {
+	    this.unexpected();
+	  }
+	  this.next();
+	  return this.finishNode(node, "JSXIdentifier");
+	};
+
+	// Parse namespaced identifier.
+
+	pp$9.jsxParseNamespacedName = function () {
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+	  var name = this.jsxParseIdentifier();
+	  if (!this.eat(types.colon)) return name;
+
+	  var node = this.startNodeAt(startPos, startLoc);
+	  node.namespace = name;
+	  node.name = this.jsxParseIdentifier();
+	  return this.finishNode(node, "JSXNamespacedName");
+	};
+
+	// Parses element name in any form - namespaced, member
+	// or single identifier.
+
+	pp$9.jsxParseElementName = function () {
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+	  var node = this.jsxParseNamespacedName();
+	  while (this.eat(types.dot)) {
+	    var newNode = this.startNodeAt(startPos, startLoc);
+	    newNode.object = node;
+	    newNode.property = this.jsxParseIdentifier();
+	    node = this.finishNode(newNode, "JSXMemberExpression");
+	  }
+	  return node;
+	};
+
+	// Parses any type of JSX attribute value.
+
+	pp$9.jsxParseAttributeValue = function () {
+	  var node = void 0;
+	  switch (this.state.type) {
+	    case types.braceL:
+	      node = this.jsxParseExpressionContainer();
+	      if (node.expression.type === "JSXEmptyExpression") {
+	        this.raise(node.start, "JSX attributes must only be assigned a non-empty expression");
+	      } else {
+	        return node;
+	      }
+
+	    case types.jsxTagStart:
+	    case types.string:
+	      node = this.parseExprAtom();
+	      node.extra = null;
+	      return node;
+
+	    default:
+	      this.raise(this.state.start, "JSX value should be either an expression or a quoted JSX text");
+	  }
+	};
+
+	// JSXEmptyExpression is unique type since it doesn't actually parse anything,
+	// and so it should start at the end of last read token (left brace) and finish
+	// at the beginning of the next one (right brace).
+
+	pp$9.jsxParseEmptyExpression = function () {
+	  var node = this.startNodeAt(this.state.lastTokEnd, this.state.lastTokEndLoc);
+	  return this.finishNodeAt(node, "JSXEmptyExpression", this.state.start, this.state.startLoc);
+	};
+
+	// Parse JSX spread child
+
+	pp$9.jsxParseSpreadChild = function () {
+	  var node = this.startNode();
+	  this.expect(types.braceL);
+	  this.expect(types.ellipsis);
+	  node.expression = this.parseExpression();
+	  this.expect(types.braceR);
+
+	  return this.finishNode(node, "JSXSpreadChild");
+	};
+
+	// Parses JSX expression enclosed into curly brackets.
+
+
+	pp$9.jsxParseExpressionContainer = function () {
+	  var node = this.startNode();
+	  this.next();
+	  if (this.match(types.braceR)) {
+	    node.expression = this.jsxParseEmptyExpression();
+	  } else {
+	    node.expression = this.parseExpression();
+	  }
+	  this.expect(types.braceR);
+	  return this.finishNode(node, "JSXExpressionContainer");
+	};
+
+	// Parses following JSX attribute name-value pair.
+
+	pp$9.jsxParseAttribute = function () {
+	  var node = this.startNode();
+	  if (this.eat(types.braceL)) {
+	    this.expect(types.ellipsis);
+	    node.argument = this.parseMaybeAssign();
+	    this.expect(types.braceR);
+	    return this.finishNode(node, "JSXSpreadAttribute");
+	  }
+	  node.name = this.jsxParseNamespacedName();
+	  node.value = this.eat(types.eq) ? this.jsxParseAttributeValue() : null;
+	  return this.finishNode(node, "JSXAttribute");
+	};
+
+	// Parses JSX opening tag starting after "<".
+
+	pp$9.jsxParseOpeningElementAt = function (startPos, startLoc) {
+	  var node = this.startNodeAt(startPos, startLoc);
+	  node.attributes = [];
+	  node.name = this.jsxParseElementName();
+	  while (!this.match(types.slash) && !this.match(types.jsxTagEnd)) {
+	    node.attributes.push(this.jsxParseAttribute());
+	  }
+	  node.selfClosing = this.eat(types.slash);
+	  this.expect(types.jsxTagEnd);
+	  return this.finishNode(node, "JSXOpeningElement");
+	};
+
+	// Parses JSX closing tag starting after "</".
+
+	pp$9.jsxParseClosingElementAt = function (startPos, startLoc) {
+	  var node = this.startNodeAt(startPos, startLoc);
+	  node.name = this.jsxParseElementName();
+	  this.expect(types.jsxTagEnd);
+	  return this.finishNode(node, "JSXClosingElement");
+	};
+
+	// Parses entire JSX element, including it"s opening tag
+	// (starting after "<"), attributes, contents and closing tag.
+
+	pp$9.jsxParseElementAt = function (startPos, startLoc) {
+	  var node = this.startNodeAt(startPos, startLoc);
+	  var children = [];
+	  var openingElement = this.jsxParseOpeningElementAt(startPos, startLoc);
+	  var closingElement = null;
+
+	  if (!openingElement.selfClosing) {
+	    contents: for (;;) {
+	      switch (this.state.type) {
+	        case types.jsxTagStart:
+	          startPos = this.state.start;startLoc = this.state.startLoc;
+	          this.next();
+	          if (this.eat(types.slash)) {
+	            closingElement = this.jsxParseClosingElementAt(startPos, startLoc);
+	            break contents;
+	          }
+	          children.push(this.jsxParseElementAt(startPos, startLoc));
+	          break;
+
+	        case types.jsxText:
+	          children.push(this.parseExprAtom());
+	          break;
+
+	        case types.braceL:
+	          if (this.lookahead().type === types.ellipsis) {
+	            children.push(this.jsxParseSpreadChild());
+	          } else {
+	            children.push(this.jsxParseExpressionContainer());
+	          }
+
+	          break;
+
+	        // istanbul ignore next - should never happen
+	        default:
+	          this.unexpected();
+	      }
+	    }
+
+	    if (getQualifiedJSXName(closingElement.name) !== getQualifiedJSXName(openingElement.name)) {
+	      this.raise(closingElement.start, "Expected corresponding JSX closing tag for <" + getQualifiedJSXName(openingElement.name) + ">");
+	    }
+	  }
+
+	  node.openingElement = openingElement;
+	  node.closingElement = closingElement;
+	  node.children = children;
+	  if (this.match(types.relational) && this.state.value === "<") {
+	    this.raise(this.state.start, "Adjacent JSX elements must be wrapped in an enclosing tag");
+	  }
+	  return this.finishNode(node, "JSXElement");
+	};
+
+	// Parses entire JSX element from current position.
+
+	pp$9.jsxParseElement = function () {
+	  var startPos = this.state.start;
+	  var startLoc = this.state.startLoc;
+	  this.next();
+	  return this.jsxParseElementAt(startPos, startLoc);
+	};
+
+	var jsxPlugin = function jsxPlugin(instance) {
+	  instance.extend("parseExprAtom", function (inner) {
+	    return function (refShortHandDefaultPos) {
+	      if (this.match(types.jsxText)) {
+	        var node = this.parseLiteral(this.state.value, "JSXText");
+	        // https://github.com/babel/babel/issues/2078
+	        node.extra = null;
+	        return node;
+	      } else if (this.match(types.jsxTagStart)) {
+	        return this.jsxParseElement();
+	      } else {
+	        return inner.call(this, refShortHandDefaultPos);
+	      }
+	    };
+	  });
+
+	  instance.extend("readToken", function (inner) {
+	    return function (code) {
+	      if (this.state.inPropertyName) return inner.call(this, code);
+
+	      var context = this.curContext();
+
+	      if (context === types$1.j_expr) {
+	        return this.jsxReadToken();
+	      }
+
+	      if (context === types$1.j_oTag || context === types$1.j_cTag) {
+	        if (isIdentifierStart(code)) {
+	          return this.jsxReadWord();
+	        }
+
+	        if (code === 62) {
+	          ++this.state.pos;
+	          return this.finishToken(types.jsxTagEnd);
+	        }
+
+	        if ((code === 34 || code === 39) && context === types$1.j_oTag) {
+	          return this.jsxReadString(code);
+	        }
+	      }
+
+	      if (code === 60 && this.state.exprAllowed) {
+	        ++this.state.pos;
+	        return this.finishToken(types.jsxTagStart);
+	      }
+
+	      return inner.call(this, code);
+	    };
+	  });
+
+	  instance.extend("updateContext", function (inner) {
+	    return function (prevType) {
+	      if (this.match(types.braceL)) {
+	        var curContext = this.curContext();
+	        if (curContext === types$1.j_oTag) {
+	          this.state.context.push(types$1.braceExpression);
+	        } else if (curContext === types$1.j_expr) {
+	          this.state.context.push(types$1.templateQuasi);
+	        } else {
+	          inner.call(this, prevType);
+	        }
+	        this.state.exprAllowed = true;
+	      } else if (this.match(types.slash) && prevType === types.jsxTagStart) {
+	        this.state.context.length -= 2; // do not consider JSX expr -> JSX open tag -> ... anymore
+	        this.state.context.push(types$1.j_cTag); // reconsider as closing tag context
+	        this.state.exprAllowed = false;
+	      } else {
+	        return inner.call(this, prevType);
+	      }
+	    };
+	  });
+	};
+
+	plugins.estree = estreePlugin;
+	plugins.flow = flowPlugin;
+	plugins.jsx = jsxPlugin;
+
+	function parse(input, options) {
+	  return new Parser(options, input).parse();
+	}
+
+	function parseExpression(input, options) {
+	  var parser = new Parser(options, input);
+	  if (parser.options.strictMode) {
+	    parser.state.strict = true;
+	  }
+	  return parser.getExpression();
+	}
+
+	exports.parse = parse;
+	exports.parseExpression = parseExpression;
+	exports.tokTypes = types;
+
+/***/ }),
+/* 88 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	// 7.2.1 RequireObjectCoercible(argument)
+	module.exports = function (it) {
+	  if (it == undefined) throw TypeError("Can't call method on  " + it);
+	  return it;
+	};
+
+/***/ }),
+/* 89 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var ctx = __webpack_require__(54),
+	    call = __webpack_require__(425),
+	    isArrayIter = __webpack_require__(424),
+	    anObject = __webpack_require__(19),
+	    toLength = __webpack_require__(149),
+	    getIterFn = __webpack_require__(233),
+	    BREAK = {},
+	    RETURN = {};
+	var _exports = module.exports = function (iterable, entries, fn, that, ITERATOR) {
+	  var iterFn = ITERATOR ? function () {
+	    return iterable;
+	  } : getIterFn(iterable),
+	      f = ctx(fn, that, entries ? 2 : 1),
+	      index = 0,
+	      length,
+	      step,
+	      iterator,
+	      result;
+	  if (typeof iterFn != 'function') throw TypeError(iterable + ' is not iterable!');
+	  // fast case for arrays with default iterator
+	  if (isArrayIter(iterFn)) for (length = toLength(iterable.length); length > index; index++) {
+	    result = entries ? f(anObject(step = iterable[index])[0], step[1]) : f(iterable[index]);
+	    if (result === BREAK || result === RETURN) return result;
+	  } else for (iterator = iterFn.call(iterable); !(step = iterator.next()).done;) {
+	    result = call(iterator, f, step.value, entries);
+	    if (result === BREAK || result === RETURN) return result;
+	  }
+	};
+	_exports.BREAK = BREAK;
+	_exports.RETURN = RETURN;
+
+/***/ }),
+/* 90 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
+	var anObject = __webpack_require__(19),
+	    dPs = __webpack_require__(428),
+	    enumBugKeys = __webpack_require__(139),
+	    IE_PROTO = __webpack_require__(146)('IE_PROTO'),
+	    Empty = function Empty() {/* empty */},
+	    PROTOTYPE = 'prototype';
+
+	// Create object with fake `null` prototype: use iframe Object with cleared prototype
+	var _createDict = function createDict() {
+	  // Thrash, waste and sodomy: IE GC bug
+	  var iframe = __webpack_require__(225)('iframe'),
+	      i = enumBugKeys.length,
+	      lt = '<',
+	      gt = '>',
+	      iframeDocument;
+	  iframe.style.display = 'none';
+	  __webpack_require__(423).appendChild(iframe);
+	  iframe.src = 'javascript:'; // eslint-disable-line no-script-url
+	  // createDict = iframe.contentWindow.Object;
+	  // html.removeChild(iframe);
+	  iframeDocument = iframe.contentWindow.document;
+	  iframeDocument.open();
+	  iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
+	  iframeDocument.close();
+	  _createDict = iframeDocument.F;
+	  while (i--) {
+	    delete _createDict[PROTOTYPE][enumBugKeys[i]];
+	  }return _createDict();
+	};
+
+	module.exports = Object.create || function create(O, Properties) {
+	  var result;
+	  if (O !== null) {
+	    Empty[PROTOTYPE] = anObject(O);
+	    result = new Empty();
+	    Empty[PROTOTYPE] = null;
+	    // add "__proto__" for Object.getPrototypeOf polyfill
+	    result[IE_PROTO] = O;
+	  } else result = _createDict();
+	  return Properties === undefined ? result : dPs(result, Properties);
+	};
+
+/***/ }),
+/* 91 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.f = {}.propertyIsEnumerable;
+
+/***/ }),
+/* 92 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = function (bitmap, value) {
+	  return {
+	    enumerable: !(bitmap & 1),
+	    configurable: !(bitmap & 2),
+	    writable: !(bitmap & 4),
+	    value: value
+	  };
+	};
+
+/***/ }),
+/* 93 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var def = __webpack_require__(23).f,
+	    has = __webpack_require__(27),
+	    TAG = __webpack_require__(12)('toStringTag');
+
+	module.exports = function (it, tag, stat) {
+	  if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, { configurable: true, value: tag });
+	};
+
+/***/ }),
+/* 94 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 7.1.13 ToObject(argument)
+	var defined = __webpack_require__(88);
+	module.exports = function (it) {
+	  return Object(defined(it));
+	};
+
+/***/ }),
+/* 95 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var id = 0,
+	    px = Math.random();
+	module.exports = function (key) {
+	  return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
+	};
+
+/***/ }),
+/* 96 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+/***/ }),
+/* 97 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	/*
+	  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
+
+	  Redistribution and use in source and binary forms, with or without
+	  modification, are permitted provided that the following conditions are met:
+
+	    * Redistributions of source code must retain the above copyright
+	      notice, this list of conditions and the following disclaimer.
+	    * Redistributions in binary form must reproduce the above copyright
+	      notice, this list of conditions and the following disclaimer in the
+	      documentation and/or other materials provided with the distribution.
+
+	  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+	  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+	  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+	  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+	  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+	  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	*/
+
+	(function () {
+	  'use strict';
+
+	  exports.ast = __webpack_require__(452);
+	  exports.code = __webpack_require__(235);
+	  exports.keyword = __webpack_require__(453);
+	})();
+	/* vim: set sw=4 ts=4 et tw=80 : */
+
+/***/ }),
+/* 98 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var listCacheClear = __webpack_require__(537),
+	    listCacheDelete = __webpack_require__(538),
+	    listCacheGet = __webpack_require__(539),
+	    listCacheHas = __webpack_require__(540),
+	    listCacheSet = __webpack_require__(541);
+
+	/**
+	 * Creates an list cache object.
+	 *
+	 * @private
+	 * @constructor
+	 * @param {Array} [entries] The key-value pairs to cache.
+	 */
+	function ListCache(entries) {
+	    var index = -1,
+	        length = entries == null ? 0 : entries.length;
+
+	    this.clear();
+	    while (++index < length) {
+	        var entry = entries[index];
+	        this.set(entry[0], entry[1]);
+	    }
+	}
+
+	// Add methods to `ListCache`.
+	ListCache.prototype.clear = listCacheClear;
+	ListCache.prototype['delete'] = listCacheDelete;
+	ListCache.prototype.get = listCacheGet;
+	ListCache.prototype.has = listCacheHas;
+	ListCache.prototype.set = listCacheSet;
+
+	module.exports = ListCache;
+
+/***/ }),
+/* 99 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var ListCache = __webpack_require__(98),
+	    stackClear = __webpack_require__(556),
+	    stackDelete = __webpack_require__(557),
+	    stackGet = __webpack_require__(558),
+	    stackHas = __webpack_require__(559),
+	    stackSet = __webpack_require__(560);
+
+	/**
+	 * Creates a stack cache object to store key-value pairs.
+	 *
+	 * @private
+	 * @constructor
+	 * @param {Array} [entries] The key-value pairs to cache.
+	 */
+	function Stack(entries) {
+	  var data = this.__data__ = new ListCache(entries);
+	  this.size = data.size;
+	}
+
+	// Add methods to `Stack`.
+	Stack.prototype.clear = stackClear;
+	Stack.prototype['delete'] = stackDelete;
+	Stack.prototype.get = stackGet;
+	Stack.prototype.has = stackHas;
+	Stack.prototype.set = stackSet;
+
+	module.exports = Stack;
+
+/***/ }),
+/* 100 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var eq = __webpack_require__(45);
+
+	/**
+	 * Gets the index at which the `key` is found in `array` of key-value pairs.
+	 *
+	 * @private
+	 * @param {Array} array The array to inspect.
+	 * @param {*} key The key to search for.
+	 * @returns {number} Returns the index of the matched value, else `-1`.
+	 */
+	function assocIndexOf(array, key) {
+	  var length = array.length;
+	  while (length--) {
+	    if (eq(array[length][0], key)) {
+	      return length;
+	    }
+	  }
+	  return -1;
+	}
+
+	module.exports = assocIndexOf;
+
+/***/ }),
+/* 101 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var identity = __webpack_require__(110),
+	    overRest = __webpack_require__(551),
+	    setToString = __webpack_require__(554);
+
+	/**
+	 * The base implementation of `_.rest` which doesn't validate or coerce arguments.
+	 *
+	 * @private
+	 * @param {Function} func The function to apply a rest parameter to.
+	 * @param {number} [start=func.length-1] The start position of the rest parameter.
+	 * @returns {Function} Returns the new function.
+	 */
+	function baseRest(func, start) {
+	  return setToString(overRest(func, start, identity), func + '');
+	}
+
+	module.exports = baseRest;
+
+/***/ }),
+/* 102 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * The base implementation of `_.unary` without support for storing metadata.
+	 *
+	 * @private
+	 * @param {Function} func The function to cap arguments for.
+	 * @returns {Function} Returns the new capped function.
+	 */
+	function baseUnary(func) {
+	  return function (value) {
+	    return func(value);
+	  };
+	}
+
+	module.exports = baseUnary;
+
+/***/ }),
+/* 103 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseRest = __webpack_require__(101),
+	    isIterateeCall = __webpack_require__(168);
+
+	/**
+	 * Creates a function like `_.assign`.
+	 *
+	 * @private
+	 * @param {Function} assigner The function to assign values.
+	 * @returns {Function} Returns the new assigner function.
+	 */
+	function createAssigner(assigner) {
+	  return baseRest(function (object, sources) {
+	    var index = -1,
+	        length = sources.length,
+	        customizer = length > 1 ? sources[length - 1] : undefined,
+	        guard = length > 2 ? sources[2] : undefined;
+
+	    customizer = assigner.length > 3 && typeof customizer == 'function' ? (length--, customizer) : undefined;
+
+	    if (guard && isIterateeCall(sources[0], sources[1], guard)) {
+	      customizer = length < 3 ? undefined : customizer;
+	      length = 1;
+	    }
+	    object = Object(object);
+	    while (++index < length) {
+	      var source = sources[index];
+	      if (source) {
+	        assigner(object, source, index, customizer);
+	      }
+	    }
+	    return object;
+	  });
+	}
+
+	module.exports = createAssigner;
+
+/***/ }),
+/* 104 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isKeyable = __webpack_require__(535);
+
+	/**
+	 * Gets the data for `map`.
+	 *
+	 * @private
+	 * @param {Object} map The map to query.
+	 * @param {string} key The reference key.
+	 * @returns {*} Returns the map data.
+	 */
+	function getMapData(map, key) {
+	  var data = map.__data__;
+	  return isKeyable(key) ? data[typeof key == 'string' ? 'string' : 'hash'] : data.map;
+	}
+
+	module.exports = getMapData;
+
+/***/ }),
+/* 105 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/**
+	 * Checks if `value` is likely a prototype object.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a prototype, else `false`.
+	 */
+	function isPrototype(value) {
+	  var Ctor = value && value.constructor,
+	      proto = typeof Ctor == 'function' && Ctor.prototype || objectProto;
+
+	  return value === proto;
+	}
+
+	module.exports = isPrototype;
+
+/***/ }),
+/* 106 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getNative = __webpack_require__(38);
+
+	/* Built-in method references that are verified to be native. */
+	var nativeCreate = getNative(Object, 'create');
+
+	module.exports = nativeCreate;
+
+/***/ }),
+/* 107 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Converts `set` to an array of its values.
+	 *
+	 * @private
+	 * @param {Object} set The set to convert.
+	 * @returns {Array} Returns the values.
+	 */
+	function setToArray(set) {
+	  var index = -1,
+	      result = Array(set.size);
+
+	  set.forEach(function (value) {
+	    result[++index] = value;
+	  });
+	  return result;
+	}
+
+	module.exports = setToArray;
+
+/***/ }),
+/* 108 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isSymbol = __webpack_require__(60);
+
+	/** Used as references for various `Number` constants. */
+	var INFINITY = 1 / 0;
+
+	/**
+	 * Converts `value` to a string key if it's not a string or symbol.
+	 *
+	 * @private
+	 * @param {*} value The value to inspect.
+	 * @returns {string|symbol} Returns the key.
+	 */
+	function toKey(value) {
+	  if (typeof value == 'string' || isSymbol(value)) {
+	    return value;
+	  }
+	  var result = value + '';
+	  return result == '0' && 1 / value == -INFINITY ? '-0' : result;
+	}
+
+	module.exports = toKey;
+
+/***/ }),
+/* 109 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseClone = __webpack_require__(160);
+
+	/** Used to compose bitmasks for cloning. */
+	var CLONE_SYMBOLS_FLAG = 4;
+
+	/**
+	 * Creates a shallow clone of `value`.
+	 *
+	 * **Note:** This method is loosely based on the
+	 * [structured clone algorithm](https://mdn.io/Structured_clone_algorithm)
+	 * and supports cloning arrays, array buffers, booleans, date objects, maps,
+	 * numbers, `Object` objects, regexes, sets, strings, symbols, and typed
+	 * arrays. The own enumerable properties of `arguments` objects are cloned
+	 * as plain objects. An empty object is returned for uncloneable values such
+	 * as error objects, functions, DOM nodes, and WeakMaps.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Lang
+	 * @param {*} value The value to clone.
+	 * @returns {*} Returns the cloned value.
+	 * @see _.cloneDeep
+	 * @example
+	 *
+	 * var objects = [{ 'a': 1 }, { 'b': 2 }];
+	 *
+	 * var shallow = _.clone(objects);
+	 * console.log(shallow[0] === objects[0]);
+	 * // => true
+	 */
+	function clone(value) {
+	  return baseClone(value, CLONE_SYMBOLS_FLAG);
+	}
+
+	module.exports = clone;
+
+/***/ }),
+/* 110 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * This method returns the first argument it receives.
+	 *
+	 * @static
+	 * @since 0.1.0
+	 * @memberOf _
+	 * @category Util
+	 * @param {*} value Any value.
+	 * @returns {*} Returns `value`.
+	 * @example
+	 *
+	 * var object = { 'a': 1 };
+	 *
+	 * console.log(_.identity(object) === object);
+	 * // => true
+	 */
+	function identity(value) {
+	  return value;
+	}
+
+	module.exports = identity;
+
+/***/ }),
+/* 111 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseIndexOf = __webpack_require__(162),
+	    isArrayLike = __webpack_require__(24),
+	    isString = __webpack_require__(578),
+	    toInteger = __webpack_require__(47),
+	    values = __webpack_require__(275);
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeMax = Math.max;
+
+	/**
+	 * Checks if `value` is in `collection`. If `collection` is a string, it's
+	 * checked for a substring of `value`, otherwise
+	 * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+	 * is used for equality comparisons. If `fromIndex` is negative, it's used as
+	 * the offset from the end of `collection`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Collection
+	 * @param {Array|Object|string} collection The collection to inspect.
+	 * @param {*} value The value to search for.
+	 * @param {number} [fromIndex=0] The index to search from.
+	 * @param- {Object} [guard] Enables use as an iteratee for methods like `_.reduce`.
+	 * @returns {boolean} Returns `true` if `value` is found, else `false`.
+	 * @example
+	 *
+	 * _.includes([1, 2, 3], 1);
+	 * // => true
+	 *
+	 * _.includes([1, 2, 3], 1, 2);
+	 * // => false
+	 *
+	 * _.includes({ 'a': 1, 'b': 2 }, 1);
+	 * // => true
+	 *
+	 * _.includes('abcd', 'bc');
+	 * // => true
+	 */
+	function includes(collection, value, fromIndex, guard) {
+	  collection = isArrayLike(collection) ? collection : values(collection);
+	  fromIndex = fromIndex && !guard ? toInteger(fromIndex) : 0;
+
+	  var length = collection.length;
+	  if (fromIndex < 0) {
+	    fromIndex = nativeMax(length + fromIndex, 0);
+	  }
+	  return isString(collection) ? fromIndex <= length && collection.indexOf(value, fromIndex) > -1 : !!length && baseIndexOf(collection, value, fromIndex) > -1;
+	}
+
+	module.exports = includes;
+
+/***/ }),
+/* 112 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseIsArguments = __webpack_require__(484),
+	    isObjectLike = __webpack_require__(25);
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/** Built-in value references. */
+	var propertyIsEnumerable = objectProto.propertyIsEnumerable;
+
+	/**
+	 * Checks if `value` is likely an `arguments` object.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is an `arguments` object,
+	 *  else `false`.
+	 * @example
+	 *
+	 * _.isArguments(function() { return arguments; }());
+	 * // => true
+	 *
+	 * _.isArguments([1, 2, 3]);
+	 * // => false
+	 */
+	var isArguments = baseIsArguments(function () {
+	    return arguments;
+	}()) ? baseIsArguments : function (value) {
+	    return isObjectLike(value) && hasOwnProperty.call(value, 'callee') && !propertyIsEnumerable.call(value, 'callee');
+	};
+
+	module.exports = isArguments;
+
+/***/ }),
+/* 113 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(module) {'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var root = __webpack_require__(15),
+	    stubFalse = __webpack_require__(587);
+
+	/** Detect free variable `exports`. */
+	var freeExports = ( false ? 'undefined' : _typeof(exports)) == 'object' && exports && !exports.nodeType && exports;
+
+	/** Detect free variable `module`. */
+	var freeModule = freeExports && ( false ? 'undefined' : _typeof(module)) == 'object' && module && !module.nodeType && module;
+
+	/** Detect the popular CommonJS extension `module.exports`. */
+	var moduleExports = freeModule && freeModule.exports === freeExports;
+
+	/** Built-in value references. */
+	var Buffer = moduleExports ? root.Buffer : undefined;
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined;
+
+	/**
+	 * Checks if `value` is a buffer.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.3.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a buffer, else `false`.
+	 * @example
+	 *
+	 * _.isBuffer(new Buffer(2));
+	 * // => true
+	 *
+	 * _.isBuffer(new Uint8Array(2));
+	 * // => false
+	 */
+	var isBuffer = nativeIsBuffer || stubFalse;
+
+	module.exports = isBuffer;
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(39)(module)))
+
+/***/ }),
+/* 114 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseToString = __webpack_require__(248);
+
+	/**
+	 * Converts `value` to a string. An empty string is returned for `null`
+	 * and `undefined` values. The sign of `-0` is preserved.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to convert.
+	 * @returns {string} Returns the converted string.
+	 * @example
+	 *
+	 * _.toString(null);
+	 * // => ''
+	 *
+	 * _.toString(-0);
+	 * // => '-0'
+	 *
+	 * _.toString([1, 2, 3]);
+	 * // => '1,2,3'
+	 */
+	function toString(value) {
+	  return value == null ? '' : baseToString(value);
+	}
+
+	module.exports = toString;
+
+/***/ }),
+/* 115 */
+96,
+/* 116 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(global, process) {'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	// Copyright Joyent, Inc. and other Node contributors.
+	//
+	// Permission is hereby granted, free of charge, to any person obtaining a
+	// copy of this software and associated documentation files (the
+	// "Software"), to deal in the Software without restriction, including
+	// without limitation the rights to use, copy, modify, merge, publish,
+	// distribute, sublicense, and/or sell copies of the Software, and to permit
+	// persons to whom the Software is furnished to do so, subject to the
+	// following conditions:
+	//
+	// The above copyright notice and this permission notice shall be included
+	// in all copies or substantial portions of the Software.
+	//
+	// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+	// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+	// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+	// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+	// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+	// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+	// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+	var formatRegExp = /%[sdj%]/g;
+	exports.format = function (f) {
+	  if (!isString(f)) {
+	    var objects = [];
+	    for (var i = 0; i < arguments.length; i++) {
+	      objects.push(inspect(arguments[i]));
+	    }
+	    return objects.join(' ');
+	  }
+
+	  var i = 1;
+	  var args = arguments;
+	  var len = args.length;
+	  var str = String(f).replace(formatRegExp, function (x) {
+	    if (x === '%%') return '%';
+	    if (i >= len) return x;
+	    switch (x) {
+	      case '%s':
+	        return String(args[i++]);
+	      case '%d':
+	        return Number(args[i++]);
+	      case '%j':
+	        try {
+	          return JSON.stringify(args[i++]);
+	        } catch (_) {
+	          return '[Circular]';
+	        }
+	      default:
+	        return x;
+	    }
+	  });
+	  for (var x = args[i]; i < len; x = args[++i]) {
+	    if (isNull(x) || !isObject(x)) {
+	      str += ' ' + x;
+	    } else {
+	      str += ' ' + inspect(x);
+	    }
+	  }
+	  return str;
+	};
+
+	// Mark that a method should not be used.
+	// Returns a modified function which warns once by default.
+	// If --no-deprecation is set, then it is a no-op.
+	exports.deprecate = function (fn, msg) {
+	  // Allow for deprecating things in the process of starting up.
+	  if (isUndefined(global.process)) {
+	    return function () {
+	      return exports.deprecate(fn, msg).apply(this, arguments);
+	    };
+	  }
+
+	  if (process.noDeprecation === true) {
+	    return fn;
+	  }
+
+	  var warned = false;
+	  function deprecated() {
+	    if (!warned) {
+	      if (process.throwDeprecation) {
+	        throw new Error(msg);
+	      } else if (process.traceDeprecation) {
+	        console.trace(msg);
+	      } else {
+	        console.error(msg);
+	      }
+	      warned = true;
+	    }
+	    return fn.apply(this, arguments);
+	  }
+
+	  return deprecated;
+	};
+
+	var debugs = {};
+	var debugEnviron;
+	exports.debuglog = function (set) {
+	  if (isUndefined(debugEnviron)) debugEnviron = process.env.NODE_DEBUG || '';
+	  set = set.toUpperCase();
+	  if (!debugs[set]) {
+	    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
+	      var pid = process.pid;
+	      debugs[set] = function () {
+	        var msg = exports.format.apply(exports, arguments);
+	        console.error('%s %d: %s', set, pid, msg);
+	      };
+	    } else {
+	      debugs[set] = function () {};
+	    }
+	  }
+	  return debugs[set];
+	};
+
+	/**
+	 * Echos the value of a value. Trys to print the value out
+	 * in the best way possible given the different types.
+	 *
+	 * @param {Object} obj The object to print out.
+	 * @param {Object} opts Optional options object that alters the output.
+	 */
+	/* legacy: obj, showHidden, depth, colors*/
+	function inspect(obj, opts) {
+	  // default options
+	  var ctx = {
+	    seen: [],
+	    stylize: stylizeNoColor
+	  };
+	  // legacy...
+	  if (arguments.length >= 3) ctx.depth = arguments[2];
+	  if (arguments.length >= 4) ctx.colors = arguments[3];
+	  if (isBoolean(opts)) {
+	    // legacy...
+	    ctx.showHidden = opts;
+	  } else if (opts) {
+	    // got an "options" object
+	    exports._extend(ctx, opts);
+	  }
+	  // set default options
+	  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
+	  if (isUndefined(ctx.depth)) ctx.depth = 2;
+	  if (isUndefined(ctx.colors)) ctx.colors = false;
+	  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
+	  if (ctx.colors) ctx.stylize = stylizeWithColor;
+	  return formatValue(ctx, obj, ctx.depth);
+	}
+	exports.inspect = inspect;
+
+	// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
+	inspect.colors = {
+	  'bold': [1, 22],
+	  'italic': [3, 23],
+	  'underline': [4, 24],
+	  'inverse': [7, 27],
+	  'white': [37, 39],
+	  'grey': [90, 39],
+	  'black': [30, 39],
+	  'blue': [34, 39],
+	  'cyan': [36, 39],
+	  'green': [32, 39],
+	  'magenta': [35, 39],
+	  'red': [31, 39],
+	  'yellow': [33, 39]
+	};
+
+	// Don't use 'blue' not visible on cmd.exe
+	inspect.styles = {
+	  'special': 'cyan',
+	  'number': 'yellow',
+	  'boolean': 'yellow',
+	  'undefined': 'grey',
+	  'null': 'bold',
+	  'string': 'green',
+	  'date': 'magenta',
+	  // "name": intentionally not styling
+	  'regexp': 'red'
+	};
+
+	function stylizeWithColor(str, styleType) {
+	  var style = inspect.styles[styleType];
+
+	  if (style) {
+	    return '\x1B[' + inspect.colors[style][0] + 'm' + str + '\x1B[' + inspect.colors[style][1] + 'm';
+	  } else {
+	    return str;
+	  }
+	}
+
+	function stylizeNoColor(str, styleType) {
+	  return str;
+	}
+
+	function arrayToHash(array) {
+	  var hash = {};
+
+	  array.forEach(function (val, idx) {
+	    hash[val] = true;
+	  });
+
+	  return hash;
+	}
+
+	function formatValue(ctx, value, recurseTimes) {
+	  // Provide a hook for user-specified inspect functions.
+	  // Check that value is an object with an inspect function on it
+	  if (ctx.customInspect && value && isFunction(value.inspect) &&
+	  // Filter out the util module, it's inspect function is special
+	  value.inspect !== exports.inspect &&
+	  // Also filter out any prototype objects using the circular check.
+	  !(value.constructor && value.constructor.prototype === value)) {
+	    var ret = value.inspect(recurseTimes, ctx);
+	    if (!isString(ret)) {
+	      ret = formatValue(ctx, ret, recurseTimes);
+	    }
+	    return ret;
+	  }
+
+	  // Primitive types cannot have properties
+	  var primitive = formatPrimitive(ctx, value);
+	  if (primitive) {
+	    return primitive;
+	  }
+
+	  // Look up the keys of the object.
+	  var keys = Object.keys(value);
+	  var visibleKeys = arrayToHash(keys);
+
+	  if (ctx.showHidden) {
+	    keys = Object.getOwnPropertyNames(value);
+	  }
+
+	  // IE doesn't make error fields non-enumerable
+	  // http://msdn.microsoft.com/en-us/library/ie/dww52sbt(v=vs.94).aspx
+	  if (isError(value) && (keys.indexOf('message') >= 0 || keys.indexOf('description') >= 0)) {
+	    return formatError(value);
+	  }
+
+	  // Some type of object without properties can be shortcutted.
+	  if (keys.length === 0) {
+	    if (isFunction(value)) {
+	      var name = value.name ? ': ' + value.name : '';
+	      return ctx.stylize('[Function' + name + ']', 'special');
+	    }
+	    if (isRegExp(value)) {
+	      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+	    }
+	    if (isDate(value)) {
+	      return ctx.stylize(Date.prototype.toString.call(value), 'date');
+	    }
+	    if (isError(value)) {
+	      return formatError(value);
+	    }
+	  }
+
+	  var base = '',
+	      array = false,
+	      braces = ['{', '}'];
+
+	  // Make Array say that they are Array
+	  if (isArray(value)) {
+	    array = true;
+	    braces = ['[', ']'];
+	  }
+
+	  // Make functions say that they are functions
+	  if (isFunction(value)) {
+	    var n = value.name ? ': ' + value.name : '';
+	    base = ' [Function' + n + ']';
+	  }
+
+	  // Make RegExps say that they are RegExps
+	  if (isRegExp(value)) {
+	    base = ' ' + RegExp.prototype.toString.call(value);
+	  }
+
+	  // Make dates with properties first say the date
+	  if (isDate(value)) {
+	    base = ' ' + Date.prototype.toUTCString.call(value);
+	  }
+
+	  // Make error with message first say the error
+	  if (isError(value)) {
+	    base = ' ' + formatError(value);
+	  }
+
+	  if (keys.length === 0 && (!array || value.length == 0)) {
+	    return braces[0] + base + braces[1];
+	  }
+
+	  if (recurseTimes < 0) {
+	    if (isRegExp(value)) {
+	      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+	    } else {
+	      return ctx.stylize('[Object]', 'special');
+	    }
+	  }
+
+	  ctx.seen.push(value);
+
+	  var output;
+	  if (array) {
+	    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+	  } else {
+	    output = keys.map(function (key) {
+	      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+	    });
+	  }
+
+	  ctx.seen.pop();
+
+	  return reduceToSingleString(output, base, braces);
+	}
+
+	function formatPrimitive(ctx, value) {
+	  if (isUndefined(value)) return ctx.stylize('undefined', 'undefined');
+	  if (isString(value)) {
+	    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '').replace(/'/g, "\\'").replace(/\\"/g, '"') + '\'';
+	    return ctx.stylize(simple, 'string');
+	  }
+	  if (isNumber(value)) return ctx.stylize('' + value, 'number');
+	  if (isBoolean(value)) return ctx.stylize('' + value, 'boolean');
+	  // For some reason typeof null is "object", so special case here.
+	  if (isNull(value)) return ctx.stylize('null', 'null');
+	}
+
+	function formatError(value) {
+	  return '[' + Error.prototype.toString.call(value) + ']';
+	}
+
+	function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+	  var output = [];
+	  for (var i = 0, l = value.length; i < l; ++i) {
+	    if (hasOwnProperty(value, String(i))) {
+	      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys, String(i), true));
+	    } else {
+	      output.push('');
+	    }
+	  }
+	  keys.forEach(function (key) {
+	    if (!key.match(/^\d+$/)) {
+	      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys, key, true));
+	    }
+	  });
+	  return output;
+	}
+
+	function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+	  var name, str, desc;
+	  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
+	  if (desc.get) {
+	    if (desc.set) {
+	      str = ctx.stylize('[Getter/Setter]', 'special');
+	    } else {
+	      str = ctx.stylize('[Getter]', 'special');
+	    }
+	  } else {
+	    if (desc.set) {
+	      str = ctx.stylize('[Setter]', 'special');
+	    }
+	  }
+	  if (!hasOwnProperty(visibleKeys, key)) {
+	    name = '[' + key + ']';
+	  }
+	  if (!str) {
+	    if (ctx.seen.indexOf(desc.value) < 0) {
+	      if (isNull(recurseTimes)) {
+	        str = formatValue(ctx, desc.value, null);
+	      } else {
+	        str = formatValue(ctx, desc.value, recurseTimes - 1);
+	      }
+	      if (str.indexOf('\n') > -1) {
+	        if (array) {
+	          str = str.split('\n').map(function (line) {
+	            return '  ' + line;
+	          }).join('\n').substr(2);
+	        } else {
+	          str = '\n' + str.split('\n').map(function (line) {
+	            return '   ' + line;
+	          }).join('\n');
+	        }
+	      }
+	    } else {
+	      str = ctx.stylize('[Circular]', 'special');
+	    }
+	  }
+	  if (isUndefined(name)) {
+	    if (array && key.match(/^\d+$/)) {
+	      return str;
+	    }
+	    name = JSON.stringify('' + key);
+	    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+	      name = name.substr(1, name.length - 2);
+	      name = ctx.stylize(name, 'name');
+	    } else {
+	      name = name.replace(/'/g, "\\'").replace(/\\"/g, '"').replace(/(^"|"$)/g, "'");
+	      name = ctx.stylize(name, 'string');
+	    }
+	  }
+
+	  return name + ': ' + str;
+	}
+
+	function reduceToSingleString(output, base, braces) {
+	  var numLinesEst = 0;
+	  var length = output.reduce(function (prev, cur) {
+	    numLinesEst++;
+	    if (cur.indexOf('\n') >= 0) numLinesEst++;
+	    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
+	  }, 0);
+
+	  if (length > 60) {
+	    return braces[0] + (base === '' ? '' : base + '\n ') + ' ' + output.join(',\n  ') + ' ' + braces[1];
+	  }
+
+	  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+	}
+
+	// NOTE: These type checking functions intentionally don't use `instanceof`
+	// because it is fragile and can be easily faked with `Object.create()`.
+	function isArray(ar) {
+	  return Array.isArray(ar);
+	}
+	exports.isArray = isArray;
+
+	function isBoolean(arg) {
+	  return typeof arg === 'boolean';
+	}
+	exports.isBoolean = isBoolean;
+
+	function isNull(arg) {
+	  return arg === null;
+	}
+	exports.isNull = isNull;
+
+	function isNullOrUndefined(arg) {
+	  return arg == null;
+	}
+	exports.isNullOrUndefined = isNullOrUndefined;
+
+	function isNumber(arg) {
+	  return typeof arg === 'number';
+	}
+	exports.isNumber = isNumber;
+
+	function isString(arg) {
+	  return typeof arg === 'string';
+	}
+	exports.isString = isString;
+
+	function isSymbol(arg) {
+	  return (typeof arg === 'undefined' ? 'undefined' : _typeof(arg)) === 'symbol';
+	}
+	exports.isSymbol = isSymbol;
+
+	function isUndefined(arg) {
+	  return arg === void 0;
+	}
+	exports.isUndefined = isUndefined;
+
+	function isRegExp(re) {
+	  return isObject(re) && objectToString(re) === '[object RegExp]';
+	}
+	exports.isRegExp = isRegExp;
+
+	function isObject(arg) {
+	  return (typeof arg === 'undefined' ? 'undefined' : _typeof(arg)) === 'object' && arg !== null;
+	}
+	exports.isObject = isObject;
+
+	function isDate(d) {
+	  return isObject(d) && objectToString(d) === '[object Date]';
+	}
+	exports.isDate = isDate;
+
+	function isError(e) {
+	  return isObject(e) && (objectToString(e) === '[object Error]' || e instanceof Error);
+	}
+	exports.isError = isError;
+
+	function isFunction(arg) {
+	  return typeof arg === 'function';
+	}
+	exports.isFunction = isFunction;
+
+	function isPrimitive(arg) {
+	  return arg === null || typeof arg === 'boolean' || typeof arg === 'number' || typeof arg === 'string' || (typeof arg === 'undefined' ? 'undefined' : _typeof(arg)) === 'symbol' || // ES6 symbol
+	  typeof arg === 'undefined';
+	}
+	exports.isPrimitive = isPrimitive;
+
+	exports.isBuffer = __webpack_require__(618);
+
+	function objectToString(o) {
+	  return Object.prototype.toString.call(o);
+	}
+
+	function pad(n) {
+	  return n < 10 ? '0' + n.toString(10) : n.toString(10);
+	}
+
+	var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+
+	// 26 Feb 16:19:34
+	function timestamp() {
+	  var d = new Date();
+	  var time = [pad(d.getHours()), pad(d.getMinutes()), pad(d.getSeconds())].join(':');
+	  return [d.getDate(), months[d.getMonth()], time].join(' ');
+	}
+
+	// log is just a thin wrapper to console.log that prepends a timestamp
+	exports.log = function () {
+	  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
+	};
+
+	/**
+	 * Inherit the prototype methods from one constructor into another.
+	 *
+	 * The Function.prototype.inherits from lang.js rewritten as a standalone
+	 * function (not on Function.prototype). NOTE: If this file is to be loaded
+	 * during bootstrapping this function needs to be rewritten using some native
+	 * functions as prototype setup using normal JavaScript does not work as
+	 * expected during bootstrapping (see mirror.js in r114903).
+	 *
+	 * @param {function} ctor Constructor function which needs to inherit the
+	 *     prototype.
+	 * @param {function} superCtor Constructor function to inherit prototype from.
+	 */
+	exports.inherits = __webpack_require__(617);
+
+	exports._extend = function (origin, add) {
+	  // Don't do anything if add isn't an object
+	  if (!add || !isObject(add)) return origin;
+
+	  var keys = Object.keys(add);
+	  var i = keys.length;
+	  while (i--) {
+	    origin[keys[i]] = add[keys[i]];
+	  }
+	  return origin;
+	};
+
+	function hasOwnProperty(obj, prop) {
+	  return Object.prototype.hasOwnProperty.call(obj, prop);
+	}
+	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }()), __webpack_require__(8)))
+
+/***/ }),
+/* 117 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {"use strict";
+
+	exports.__esModule = true;
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	exports.default = function (loc) {
+	  var relative = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : process.cwd();
+
+	  if ((typeof _module2.default === "undefined" ? "undefined" : (0, _typeof3.default)(_module2.default)) === "object") return null;
+
+	  var relativeMod = relativeModules[relative];
+
+	  if (!relativeMod) {
+	    relativeMod = new _module2.default();
+
+	    var filename = _path2.default.join(relative, ".babelrc");
+	    relativeMod.id = filename;
+	    relativeMod.filename = filename;
+
+	    relativeMod.paths = _module2.default._nodeModulePaths(relative);
+	    relativeModules[relative] = relativeMod;
+	  }
+
+	  try {
+	    return _module2.default._resolveFilename(loc, relativeMod);
+	  } catch (err) {
+	    return null;
+	  }
+	};
+
+	var _module = __webpack_require__(115);
+
+	var _module2 = _interopRequireDefault(_module);
+
+	var _path = __webpack_require__(17);
+
+	var _path2 = _interopRequireDefault(_path);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var relativeModules = {};
+
+	module.exports = exports["default"];
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 118 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _map = __webpack_require__(132);
+
+	var _map2 = _interopRequireDefault(_map);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _possibleConstructorReturn2 = __webpack_require__(42);
+
+	var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+	var _inherits2 = __webpack_require__(41);
+
+	var _inherits3 = _interopRequireDefault(_inherits2);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var Store = function (_Map) {
+	  (0, _inherits3.default)(Store, _Map);
+
+	  function Store() {
+	    (0, _classCallCheck3.default)(this, Store);
+
+	    var _this = (0, _possibleConstructorReturn3.default)(this, _Map.call(this));
+
+	    _this.dynamicData = {};
+	    return _this;
+	  }
+
+	  Store.prototype.setDynamic = function setDynamic(key, fn) {
+	    this.dynamicData[key] = fn;
+	  };
+
+	  Store.prototype.get = function get(key) {
+	    if (this.has(key)) {
+	      return _Map.prototype.get.call(this, key);
+	    } else {
+	      if (Object.prototype.hasOwnProperty.call(this.dynamicData, key)) {
+	        var val = this.dynamicData[key]();
+	        this.set(key, val);
+	        return val;
+	      }
+	    }
+	  };
+
+	  return Store;
+	}(_map2.default);
+
+	exports.default = Store;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 119 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _node = __webpack_require__(234);
+
+	var _node2 = _interopRequireDefault(_node);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var verboseDebug = (0, _node2.default)("babel:verbose");
+	var generalDebug = (0, _node2.default)("babel");
+
+	var seenDeprecatedMessages = [];
+
+	var Logger = function () {
+	  function Logger(file, filename) {
+	    (0, _classCallCheck3.default)(this, Logger);
+
+	    this.filename = filename;
+	    this.file = file;
+	  }
+
+	  Logger.prototype._buildMessage = function _buildMessage(msg) {
+	    var parts = "[BABEL] " + this.filename;
+	    if (msg) parts += ": " + msg;
+	    return parts;
+	  };
+
+	  Logger.prototype.warn = function warn(msg) {
+	    console.warn(this._buildMessage(msg));
+	  };
+
+	  Logger.prototype.error = function error(msg) {
+	    var Constructor = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Error;
+
+	    throw new Constructor(this._buildMessage(msg));
+	  };
+
+	  Logger.prototype.deprecate = function deprecate(msg) {
+	    if (this.file.opts && this.file.opts.suppressDeprecationMessages) return;
+
+	    msg = this._buildMessage(msg);
+
+	    if (seenDeprecatedMessages.indexOf(msg) >= 0) return;
+
+	    seenDeprecatedMessages.push(msg);
+
+	    console.error(msg);
+	  };
+
+	  Logger.prototype.verbose = function verbose(msg) {
+	    if (verboseDebug.enabled) verboseDebug(this._buildMessage(msg));
+	  };
+
+	  Logger.prototype.debug = function debug(msg) {
+	    if (generalDebug.enabled) generalDebug(this._buildMessage(msg));
+	  };
+
+	  Logger.prototype.deopt = function deopt(node, msg) {
+	    this.debug(msg);
+	  };
+
+	  return Logger;
+	}();
+
+	exports.default = Logger;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 120 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.ImportDeclaration = exports.ModuleDeclaration = undefined;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.ExportDeclaration = ExportDeclaration;
+	exports.Scope = Scope;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var ModuleDeclaration = exports.ModuleDeclaration = {
+	  enter: function enter(path, file) {
+	    var node = path.node;
+
+	    if (node.source) {
+	      node.source.value = file.resolveModuleSource(node.source.value);
+	    }
+	  }
+	};
+
+	var ImportDeclaration = exports.ImportDeclaration = {
+	  exit: function exit(path, file) {
+	    var node = path.node;
+
+	    var specifiers = [];
+	    var imported = [];
+	    file.metadata.modules.imports.push({
+	      source: node.source.value,
+	      imported: imported,
+	      specifiers: specifiers
+	    });
+
+	    for (var _iterator = path.get("specifiers"), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var specifier = _ref;
+
+	      var local = specifier.node.local.name;
+
+	      if (specifier.isImportDefaultSpecifier()) {
+	        imported.push("default");
+	        specifiers.push({
+	          kind: "named",
+	          imported: "default",
+	          local: local
+	        });
+	      }
+
+	      if (specifier.isImportSpecifier()) {
+	        var importedName = specifier.node.imported.name;
+	        imported.push(importedName);
+	        specifiers.push({
+	          kind: "named",
+	          imported: importedName,
+	          local: local
+	        });
+	      }
+
+	      if (specifier.isImportNamespaceSpecifier()) {
+	        imported.push("*");
+	        specifiers.push({
+	          kind: "namespace",
+	          local: local
+	        });
+	      }
+	    }
+	  }
+	};
+
+	function ExportDeclaration(path, file) {
+	  var node = path.node;
+
+	  var source = node.source ? node.source.value : null;
+	  var exports = file.metadata.modules.exports;
+
+	  var declar = path.get("declaration");
+	  if (declar.isStatement()) {
+	    var bindings = declar.getBindingIdentifiers();
+
+	    for (var name in bindings) {
+	      exports.exported.push(name);
+	      exports.specifiers.push({
+	        kind: "local",
+	        local: name,
+	        exported: path.isExportDefaultDeclaration() ? "default" : name
+	      });
+	    }
+	  }
+
+	  if (path.isExportNamedDeclaration() && node.specifiers) {
+	    for (var _iterator2 = node.specifiers, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var specifier = _ref2;
+
+	      var exported = specifier.exported.name;
+	      exports.exported.push(exported);
+
+	      if (t.isExportDefaultSpecifier(specifier)) {
+	        exports.specifiers.push({
+	          kind: "external",
+	          local: exported,
+	          exported: exported,
+	          source: source
+	        });
+	      }
+
+	      if (t.isExportNamespaceSpecifier(specifier)) {
+	        exports.specifiers.push({
+	          kind: "external-namespace",
+	          exported: exported,
+	          source: source
+	        });
+	      }
+
+	      var local = specifier.local;
+	      if (!local) continue;
+
+	      if (source) {
+	        exports.specifiers.push({
+	          kind: "external",
+	          local: local.name,
+	          exported: exported,
+	          source: source
+	        });
+	      }
+
+	      if (!source) {
+	        exports.specifiers.push({
+	          kind: "local",
+	          local: local.name,
+	          exported: exported
+	        });
+	      }
+	    }
+	  }
+
+	  if (path.isExportAllDeclaration()) {
+	    exports.specifiers.push({
+	      kind: "external-all",
+	      source: source
+	    });
+	  }
+	}
+
+	function Scope(path) {
+	  path.skip();
+	}
+
+/***/ }),
+/* 121 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.inspect = exports.inherits = undefined;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _util = __webpack_require__(116);
+
+	Object.defineProperty(exports, "inherits", {
+	  enumerable: true,
+	  get: function get() {
+	    return _util.inherits;
+	  }
+	});
+	Object.defineProperty(exports, "inspect", {
+	  enumerable: true,
+	  get: function get() {
+	    return _util.inspect;
+	  }
+	});
+	exports.canCompile = canCompile;
+	exports.list = list;
+	exports.regexify = regexify;
+	exports.arrayify = arrayify;
+	exports.booleanify = booleanify;
+	exports.shouldIgnore = shouldIgnore;
+
+	var _escapeRegExp = __webpack_require__(568);
+
+	var _escapeRegExp2 = _interopRequireDefault(_escapeRegExp);
+
+	var _startsWith = __webpack_require__(586);
+
+	var _startsWith2 = _interopRequireDefault(_startsWith);
+
+	var _minimatch = __webpack_require__(592);
+
+	var _minimatch2 = _interopRequireDefault(_minimatch);
+
+	var _includes = __webpack_require__(111);
+
+	var _includes2 = _interopRequireDefault(_includes);
+
+	var _isRegExp = __webpack_require__(271);
+
+	var _isRegExp2 = _interopRequireDefault(_isRegExp);
+
+	var _path = __webpack_require__(17);
+
+	var _path2 = _interopRequireDefault(_path);
+
+	var _slash = __webpack_require__(280);
+
+	var _slash2 = _interopRequireDefault(_slash);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function canCompile(filename, altExts) {
+	  var exts = altExts || canCompile.EXTENSIONS;
+	  var ext = _path2.default.extname(filename);
+	  return (0, _includes2.default)(exts, ext);
+	}
+
+	canCompile.EXTENSIONS = [".js", ".jsx", ".es6", ".es"];
+
+	function list(val) {
+	  if (!val) {
+	    return [];
+	  } else if (Array.isArray(val)) {
+	    return val;
+	  } else if (typeof val === "string") {
+	    return val.split(",");
+	  } else {
+	    return [val];
+	  }
+	}
+
+	function regexify(val) {
+	  if (!val) {
+	    return new RegExp(/.^/);
+	  }
+
+	  if (Array.isArray(val)) {
+	    val = new RegExp(val.map(_escapeRegExp2.default).join("|"), "i");
+	  }
+
+	  if (typeof val === "string") {
+	    val = (0, _slash2.default)(val);
+
+	    if ((0, _startsWith2.default)(val, "./") || (0, _startsWith2.default)(val, "*/")) val = val.slice(2);
+	    if ((0, _startsWith2.default)(val, "**/")) val = val.slice(3);
+
+	    var regex = _minimatch2.default.makeRe(val, { nocase: true });
+	    return new RegExp(regex.source.slice(1, -1), "i");
+	  }
+
+	  if ((0, _isRegExp2.default)(val)) {
+	    return val;
+	  }
+
+	  throw new TypeError("illegal type for regexify");
+	}
+
+	function arrayify(val, mapFn) {
+	  if (!val) return [];
+	  if (typeof val === "boolean") return arrayify([val], mapFn);
+	  if (typeof val === "string") return arrayify(list(val), mapFn);
+
+	  if (Array.isArray(val)) {
+	    if (mapFn) val = val.map(mapFn);
+	    return val;
+	  }
+
+	  return [val];
+	}
+
+	function booleanify(val) {
+	  if (val === "true" || val == 1) {
+	    return true;
+	  }
+
+	  if (val === "false" || val == 0 || !val) {
+	    return false;
+	  }
+
+	  return val;
+	}
+
+	function shouldIgnore(filename) {
+	  var ignore = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+	  var only = arguments[2];
+
+	  filename = filename.replace(/\\/g, "/");
+
+	  if (only) {
+	    for (var _iterator = only, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var pattern = _ref;
+
+	      if (_shouldIgnore(pattern, filename)) return false;
+	    }
+	    return true;
+	  } else if (ignore.length) {
+	    for (var _iterator2 = ignore, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var _pattern = _ref2;
+
+	      if (_shouldIgnore(_pattern, filename)) return true;
+	    }
+	  }
+
+	  return false;
+	}
+
+	function _shouldIgnore(pattern, filename) {
+	  if (typeof pattern === "function") {
+	    return pattern(filename);
+	  } else {
+	    return pattern.test(filename);
+	  }
+	}
+
+/***/ }),
+/* 122 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.ArrayPattern = exports.ObjectPattern = exports.RestProperty = exports.SpreadProperty = exports.SpreadElement = undefined;
+	exports.Identifier = Identifier;
+	exports.RestElement = RestElement;
+	exports.ObjectExpression = ObjectExpression;
+	exports.ObjectMethod = ObjectMethod;
+	exports.ObjectProperty = ObjectProperty;
+	exports.ArrayExpression = ArrayExpression;
+	exports.RegExpLiteral = RegExpLiteral;
+	exports.BooleanLiteral = BooleanLiteral;
+	exports.NullLiteral = NullLiteral;
+	exports.NumericLiteral = NumericLiteral;
+	exports.StringLiteral = StringLiteral;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _jsesc = __webpack_require__(460);
+
+	var _jsesc2 = _interopRequireDefault(_jsesc);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function Identifier(node) {
+	  if (node.variance) {
+	    if (node.variance === "plus") {
+	      this.token("+");
+	    } else if (node.variance === "minus") {
+	      this.token("-");
+	    }
+	  }
+
+	  this.word(node.name);
+	}
+
+	function RestElement(node) {
+	  this.token("...");
+	  this.print(node.argument, node);
+	}
+
+	exports.SpreadElement = RestElement;
+	exports.SpreadProperty = RestElement;
+	exports.RestProperty = RestElement;
+	function ObjectExpression(node) {
+	  var props = node.properties;
+
+	  this.token("{");
+	  this.printInnerComments(node);
+
+	  if (props.length) {
+	    this.space();
+	    this.printList(props, node, { indent: true, statement: true });
+	    this.space();
+	  }
+
+	  this.token("}");
+	}
+
+	exports.ObjectPattern = ObjectExpression;
+	function ObjectMethod(node) {
+	  this.printJoin(node.decorators, node);
+	  this._method(node);
+	}
+
+	function ObjectProperty(node) {
+	  this.printJoin(node.decorators, node);
+
+	  if (node.computed) {
+	    this.token("[");
+	    this.print(node.key, node);
+	    this.token("]");
+	  } else {
+	    if (t.isAssignmentPattern(node.value) && t.isIdentifier(node.key) && node.key.name === node.value.left.name) {
+	      this.print(node.value, node);
+	      return;
+	    }
+
+	    this.print(node.key, node);
+
+	    if (node.shorthand && t.isIdentifier(node.key) && t.isIdentifier(node.value) && node.key.name === node.value.name) {
+	      return;
+	    }
+	  }
+
+	  this.token(":");
+	  this.space();
+	  this.print(node.value, node);
+	}
+
+	function ArrayExpression(node) {
+	  var elems = node.elements;
+	  var len = elems.length;
+
+	  this.token("[");
+	  this.printInnerComments(node);
+
+	  for (var i = 0; i < elems.length; i++) {
+	    var elem = elems[i];
+	    if (elem) {
+	      if (i > 0) this.space();
+	      this.print(elem, node);
+	      if (i < len - 1) this.token(",");
+	    } else {
+	      this.token(",");
+	    }
+	  }
+
+	  this.token("]");
+	}
+
+	exports.ArrayPattern = ArrayExpression;
+	function RegExpLiteral(node) {
+	  this.word("/" + node.pattern + "/" + node.flags);
+	}
+
+	function BooleanLiteral(node) {
+	  this.word(node.value ? "true" : "false");
+	}
+
+	function NullLiteral() {
+	  this.word("null");
+	}
+
+	function NumericLiteral(node) {
+	  var raw = this.getPossibleRaw(node);
+	  var value = node.value + "";
+	  if (raw == null) {
+	    this.number(value);
+	  } else if (this.format.minified) {
+	    this.number(raw.length < value.length ? raw : value);
+	  } else {
+	    this.number(raw);
+	  }
+	}
+
+	function StringLiteral(node, parent) {
+	  var raw = this.getPossibleRaw(node);
+	  if (!this.format.minified && raw != null) {
+	    this.token(raw);
+	    return;
+	  }
+
+	  var opts = {
+	    quotes: t.isJSX(parent) ? "double" : this.format.quotes,
+	    wrap: true
+	  };
+	  if (this.format.jsonCompatibleStrings) {
+	    opts.json = true;
+	  }
+	  var val = (0, _jsesc2.default)(node.value, opts);
+
+	  return this.token(val);
+	}
+
+/***/ }),
+/* 123 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (path, file, helpers) {
+	  if (!helpers) {
+	    helpers = { wrapAsync: file };
+	    file = null;
+	  }
+	  path.traverse(awaitVisitor, {
+	    file: file,
+	    wrapAwait: helpers.wrapAwait
+	  });
+
+	  if (path.isClassMethod() || path.isObjectMethod()) {
+	    classOrObjectMethod(path, helpers.wrapAsync);
+	  } else {
+	    plainFunction(path, helpers.wrapAsync);
+	  }
+	};
+
+	var _babelHelperFunctionName = __webpack_require__(40);
+
+	var _babelHelperFunctionName2 = _interopRequireDefault(_babelHelperFunctionName);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _forAwait = __webpack_require__(316);
+
+	var _forAwait2 = _interopRequireDefault(_forAwait);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildWrapper = (0, _babelTemplate2.default)("\n  (() => {\n    var REF = FUNCTION;\n    return function NAME(PARAMS) {\n      return REF.apply(this, arguments);\n    };\n  })\n");
+
+	var namedBuildWrapper = (0, _babelTemplate2.default)("\n  (() => {\n    var REF = FUNCTION;\n    function NAME(PARAMS) {\n      return REF.apply(this, arguments);\n    }\n    return NAME;\n  })\n");
+
+	var awaitVisitor = {
+	  Function: function Function(path) {
+	    if (path.isArrowFunctionExpression() && !path.node.async) {
+	      path.arrowFunctionToShadowed();
+	      return;
+	    }
+	    path.skip();
+	  },
+	  AwaitExpression: function AwaitExpression(_ref, _ref2) {
+	    var node = _ref.node;
+	    var wrapAwait = _ref2.wrapAwait;
+
+	    node.type = "YieldExpression";
+	    if (wrapAwait) {
+	      node.argument = t.callExpression(wrapAwait, [node.argument]);
+	    }
+	  },
+	  ForAwaitStatement: function ForAwaitStatement(path, _ref3) {
+	    var file = _ref3.file,
+	        wrapAwait = _ref3.wrapAwait;
+	    var node = path.node;
+
+	    var build = (0, _forAwait2.default)(path, {
+	      getAsyncIterator: file.addHelper("asyncIterator"),
+	      wrapAwait: wrapAwait
+	    });
+
+	    var declar = build.declar,
+	        loop = build.loop;
+
+	    var block = loop.body;
+
+	    path.ensureBlock();
+
+	    if (declar) {
+	      block.body.push(declar);
+	    }
+
+	    block.body = block.body.concat(node.body.body);
+
+	    t.inherits(loop, node);
+	    t.inherits(loop.body, node.body);
+
+	    if (build.replaceParent) {
+	      path.parentPath.replaceWithMultiple(build.node);
+	      path.remove();
+	    } else {
+	      path.replaceWithMultiple(build.node);
+	    }
+	  }
+	};
+
+	function classOrObjectMethod(path, callId) {
+	  var node = path.node;
+	  var body = node.body;
+
+	  node.async = false;
+
+	  var container = t.functionExpression(null, [], t.blockStatement(body.body), true);
+	  container.shadow = true;
+	  body.body = [t.returnStatement(t.callExpression(t.callExpression(callId, [container]), []))];
+
+	  node.generator = false;
+	}
+
+	function plainFunction(path, callId) {
+	  var node = path.node;
+	  var isDeclaration = path.isFunctionDeclaration();
+	  var asyncFnId = node.id;
+	  var wrapper = buildWrapper;
+
+	  if (path.isArrowFunctionExpression()) {
+	    path.arrowFunctionToShadowed();
+	  } else if (!isDeclaration && asyncFnId) {
+	    wrapper = namedBuildWrapper;
+	  }
+
+	  node.async = false;
+	  node.generator = true;
+
+	  node.id = null;
+
+	  if (isDeclaration) {
+	    node.type = "FunctionExpression";
+	  }
+
+	  var built = t.callExpression(callId, [node]);
+	  var container = wrapper({
+	    NAME: asyncFnId,
+	    REF: path.scope.generateUidIdentifier("ref"),
+	    FUNCTION: built,
+	    PARAMS: node.params.reduce(function (acc, param) {
+	      acc.done = acc.done || t.isAssignmentPattern(param) || t.isRestElement(param);
+
+	      if (!acc.done) {
+	        acc.params.push(path.scope.generateUidIdentifier("x"));
+	      }
+
+	      return acc;
+	    }, {
+	      params: [],
+	      done: false
+	    }).params
+	  }).expression;
+
+	  if (isDeclaration) {
+	    var declar = t.variableDeclaration("let", [t.variableDeclarator(t.identifier(asyncFnId.name), t.callExpression(container, []))]);
+	    declar._blockHoist = true;
+
+	    path.replaceWith(declar);
+	  } else {
+	    var retFunction = container.body.body[1].argument;
+	    if (!asyncFnId) {
+	      (0, _babelHelperFunctionName2.default)({
+	        node: retFunction,
+	        parent: path.parent,
+	        scope: path.scope
+	      });
+	    }
+
+	    if (!retFunction || retFunction.id || node.params.length) {
+	      path.replaceWith(t.callExpression(container, []));
+	    } else {
+	      path.replaceWith(built);
+	    }
+	  }
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 124 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("decorators");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 125 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("flow");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 126 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("jsx");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 127 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("trailingFunctionCommas");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 128 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    inherits: __webpack_require__(65),
+
+	    visitor: {
+	      Function: function Function(path, state) {
+	        if (!path.node.async || path.node.generator) return;
+
+	        (0, _babelHelperRemapAsyncToGenerator2.default)(path, state.file, {
+	          wrapAsync: state.addHelper("asyncToGenerator")
+	        });
+	      }
+	    }
+	  };
+	};
+
+	var _babelHelperRemapAsyncToGenerator = __webpack_require__(123);
+
+	var _babelHelperRemapAsyncToGenerator2 = _interopRequireDefault(_babelHelperRemapAsyncToGenerator);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 129 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	exports.default = function () {
+	  return {
+	    visitor: {
+	      ObjectExpression: function ObjectExpression(path) {
+	        var node = path.node;
+
+	        var plainProps = node.properties.filter(function (prop) {
+	          return !t.isSpreadProperty(prop) && !prop.computed;
+	        });
+
+	        var alreadySeenData = (0, _create2.default)(null);
+	        var alreadySeenGetters = (0, _create2.default)(null);
+	        var alreadySeenSetters = (0, _create2.default)(null);
+
+	        for (var _iterator = plainProps, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	          var _ref;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref = _i.value;
+	          }
+
+	          var prop = _ref;
+
+	          var name = getName(prop.key);
+	          var isDuplicate = false;
+	          switch (prop.kind) {
+	            case "get":
+	              if (alreadySeenData[name] || alreadySeenGetters[name]) {
+	                isDuplicate = true;
+	              }
+	              alreadySeenGetters[name] = true;
+	              break;
+	            case "set":
+	              if (alreadySeenData[name] || alreadySeenSetters[name]) {
+	                isDuplicate = true;
+	              }
+	              alreadySeenSetters[name] = true;
+	              break;
+	            default:
+	              if (alreadySeenData[name] || alreadySeenGetters[name] || alreadySeenSetters[name]) {
+	                isDuplicate = true;
+	              }
+	              alreadySeenData[name] = true;
+	          }
+
+	          if (isDuplicate) {
+	            prop.computed = true;
+	            prop.key = t.stringLiteral(name);
+	          }
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function getName(key) {
+	  if (t.isIdentifier(key)) {
+	    return key.name;
+	  }
+	  return key.value.toString();
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 130 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function isValidRequireCall(path) {
+	    if (!path.isCallExpression()) return false;
+	    if (!path.get("callee").isIdentifier({ name: "require" })) return false;
+	    if (path.scope.getBinding("require")) return false;
+
+	    var args = path.get("arguments");
+	    if (args.length !== 1) return false;
+
+	    var arg = args[0];
+	    if (!arg.isStringLiteral()) return false;
+
+	    return true;
+	  }
+
+	  var amdVisitor = {
+	    ReferencedIdentifier: function ReferencedIdentifier(_ref2) {
+	      var node = _ref2.node,
+	          scope = _ref2.scope;
+
+	      if (node.name === "exports" && !scope.getBinding("exports")) {
+	        this.hasExports = true;
+	      }
+
+	      if (node.name === "module" && !scope.getBinding("module")) {
+	        this.hasModule = true;
+	      }
+	    },
+	    CallExpression: function CallExpression(path) {
+	      if (!isValidRequireCall(path)) return;
+	      this.bareSources.push(path.node.arguments[0]);
+	      path.remove();
+	    },
+	    VariableDeclarator: function VariableDeclarator(path) {
+	      var id = path.get("id");
+	      if (!id.isIdentifier()) return;
+
+	      var init = path.get("init");
+	      if (!isValidRequireCall(init)) return;
+
+	      var source = init.node.arguments[0];
+	      this.sourceNames[source.value] = true;
+	      this.sources.push([id.node, source]);
+
+	      path.remove();
+	    }
+	  };
+
+	  return {
+	    inherits: __webpack_require__(75),
+
+	    pre: function pre() {
+	      this.sources = [];
+	      this.sourceNames = (0, _create2.default)(null);
+
+	      this.bareSources = [];
+
+	      this.hasExports = false;
+	      this.hasModule = false;
+	    },
+
+	    visitor: {
+	      Program: {
+	        exit: function exit(path) {
+	          var _this = this;
+
+	          if (this.ran) return;
+	          this.ran = true;
+
+	          path.traverse(amdVisitor, this);
+
+	          var params = this.sources.map(function (source) {
+	            return source[0];
+	          });
+	          var sources = this.sources.map(function (source) {
+	            return source[1];
+	          });
+
+	          sources = sources.concat(this.bareSources.filter(function (str) {
+	            return !_this.sourceNames[str.value];
+	          }));
+
+	          var moduleName = this.getModuleName();
+	          if (moduleName) moduleName = t.stringLiteral(moduleName);
+
+	          if (this.hasExports) {
+	            sources.unshift(t.stringLiteral("exports"));
+	            params.unshift(t.identifier("exports"));
+	          }
+
+	          if (this.hasModule) {
+	            sources.unshift(t.stringLiteral("module"));
+	            params.unshift(t.identifier("module"));
+	          }
+
+	          var node = path.node;
+
+	          var factory = buildFactory({
+	            PARAMS: params,
+	            BODY: node.body
+	          });
+	          factory.expression.body.directives = node.directives;
+	          node.directives = [];
+
+	          node.body = [buildDefine({
+	            MODULE_NAME: moduleName,
+	            SOURCES: sources,
+	            FACTORY: factory
+	          })];
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildDefine = (0, _babelTemplate2.default)("\n  define(MODULE_NAME, [SOURCES], FACTORY);\n");
+
+	var buildFactory = (0, _babelTemplate2.default)("\n  (function (PARAMS) {\n    BODY;\n  })\n");
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 131 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  return {
+	    inherits: __webpack_require__(195),
+
+	    visitor: (0, _babelHelperBuilderBinaryAssignmentOperatorVisitor2.default)({
+	      operator: "**",
+
+	      build: function build(left, right) {
+	        return t.callExpression(t.memberExpression(t.identifier("Math"), t.identifier("pow")), [left, right]);
+	      }
+	    })
+	  };
+	};
+
+	var _babelHelperBuilderBinaryAssignmentOperatorVisitor = __webpack_require__(312);
+
+	var _babelHelperBuilderBinaryAssignmentOperatorVisitor2 = _interopRequireDefault(_babelHelperBuilderBinaryAssignmentOperatorVisitor);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 132 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(402), __esModule: true };
+
+/***/ }),
+/* 133 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _keys = __webpack_require__(13);
+
+	var _keys2 = _interopRequireDefault(_keys);
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	var _map = __webpack_require__(132);
+
+	var _map2 = _interopRequireDefault(_map);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _includes = __webpack_require__(111);
+
+	var _includes2 = _interopRequireDefault(_includes);
+
+	var _repeat = __webpack_require__(273);
+
+	var _repeat2 = _interopRequireDefault(_repeat);
+
+	var _renamer = __webpack_require__(379);
+
+	var _renamer2 = _interopRequireDefault(_renamer);
+
+	var _index = __webpack_require__(7);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	var _defaults = __webpack_require__(268);
+
+	var _defaults2 = _interopRequireDefault(_defaults);
+
+	var _babelMessages = __webpack_require__(18);
+
+	var messages = _interopRequireWildcard(_babelMessages);
+
+	var _binding2 = __webpack_require__(221);
+
+	var _binding3 = _interopRequireDefault(_binding2);
+
+	var _globals = __webpack_require__(454);
+
+	var _globals2 = _interopRequireDefault(_globals);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _cache = __webpack_require__(86);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var _crawlCallsCount = 0;
+
+	function getCache(path, parentScope, self) {
+	  var scopes = _cache.scope.get(path.node) || [];
+
+	  for (var _iterator = scopes, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var scope = _ref;
+
+	    if (scope.parent === parentScope && scope.path === path) return scope;
+	  }
+
+	  scopes.push(self);
+
+	  if (!_cache.scope.has(path.node)) {
+	    _cache.scope.set(path.node, scopes);
+	  }
+	}
+
+	function gatherNodeParts(node, parts) {
+	  if (t.isModuleDeclaration(node)) {
+	    if (node.source) {
+	      gatherNodeParts(node.source, parts);
+	    } else if (node.specifiers && node.specifiers.length) {
+	      for (var _iterator2 = node.specifiers, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	        var _ref2;
+
+	        if (_isArray2) {
+	          if (_i2 >= _iterator2.length) break;
+	          _ref2 = _iterator2[_i2++];
+	        } else {
+	          _i2 = _iterator2.next();
+	          if (_i2.done) break;
+	          _ref2 = _i2.value;
+	        }
+
+	        var specifier = _ref2;
+
+	        gatherNodeParts(specifier, parts);
+	      }
+	    } else if (node.declaration) {
+	      gatherNodeParts(node.declaration, parts);
+	    }
+	  } else if (t.isModuleSpecifier(node)) {
+	    gatherNodeParts(node.local, parts);
+	  } else if (t.isMemberExpression(node)) {
+	    gatherNodeParts(node.object, parts);
+	    gatherNodeParts(node.property, parts);
+	  } else if (t.isIdentifier(node)) {
+	    parts.push(node.name);
+	  } else if (t.isLiteral(node)) {
+	    parts.push(node.value);
+	  } else if (t.isCallExpression(node)) {
+	    gatherNodeParts(node.callee, parts);
+	  } else if (t.isObjectExpression(node) || t.isObjectPattern(node)) {
+	    for (var _iterator3 = node.properties, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	      var _ref3;
+
+	      if (_isArray3) {
+	        if (_i3 >= _iterator3.length) break;
+	        _ref3 = _iterator3[_i3++];
+	      } else {
+	        _i3 = _iterator3.next();
+	        if (_i3.done) break;
+	        _ref3 = _i3.value;
+	      }
+
+	      var prop = _ref3;
+
+	      gatherNodeParts(prop.key || prop.argument, parts);
+	    }
+	  }
+	}
+
+	var collectorVisitor = {
+	  For: function For(path) {
+	    for (var _iterator4 = t.FOR_INIT_KEYS, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	      var _ref4;
+
+	      if (_isArray4) {
+	        if (_i4 >= _iterator4.length) break;
+	        _ref4 = _iterator4[_i4++];
+	      } else {
+	        _i4 = _iterator4.next();
+	        if (_i4.done) break;
+	        _ref4 = _i4.value;
+	      }
+
+	      var key = _ref4;
+
+	      var declar = path.get(key);
+	      if (declar.isVar()) path.scope.getFunctionParent().registerBinding("var", declar);
+	    }
+	  },
+	  Declaration: function Declaration(path) {
+	    if (path.isBlockScoped()) return;
+
+	    if (path.isExportDeclaration() && path.get("declaration").isDeclaration()) return;
+
+	    path.scope.getFunctionParent().registerDeclaration(path);
+	  },
+	  ReferencedIdentifier: function ReferencedIdentifier(path, state) {
+	    state.references.push(path);
+	  },
+	  ForXStatement: function ForXStatement(path, state) {
+	    var left = path.get("left");
+	    if (left.isPattern() || left.isIdentifier()) {
+	      state.constantViolations.push(left);
+	    }
+	  },
+
+	  ExportDeclaration: {
+	    exit: function exit(path) {
+	      var node = path.node,
+	          scope = path.scope;
+
+	      var declar = node.declaration;
+	      if (t.isClassDeclaration(declar) || t.isFunctionDeclaration(declar)) {
+	        var _id = declar.id;
+	        if (!_id) return;
+
+	        var binding = scope.getBinding(_id.name);
+	        if (binding) binding.reference(path);
+	      } else if (t.isVariableDeclaration(declar)) {
+	        for (var _iterator5 = declar.declarations, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, _getIterator3.default)(_iterator5);;) {
+	          var _ref5;
+
+	          if (_isArray5) {
+	            if (_i5 >= _iterator5.length) break;
+	            _ref5 = _iterator5[_i5++];
+	          } else {
+	            _i5 = _iterator5.next();
+	            if (_i5.done) break;
+	            _ref5 = _i5.value;
+	          }
+
+	          var decl = _ref5;
+
+	          var ids = t.getBindingIdentifiers(decl);
+	          for (var name in ids) {
+	            var _binding = scope.getBinding(name);
+	            if (_binding) _binding.reference(path);
+	          }
+	        }
+	      }
+	    }
+	  },
+
+	  LabeledStatement: function LabeledStatement(path) {
+	    path.scope.getProgramParent().addGlobal(path.node);
+	    path.scope.getBlockParent().registerDeclaration(path);
+	  },
+	  AssignmentExpression: function AssignmentExpression(path, state) {
+	    state.assignments.push(path);
+	  },
+	  UpdateExpression: function UpdateExpression(path, state) {
+	    state.constantViolations.push(path.get("argument"));
+	  },
+	  UnaryExpression: function UnaryExpression(path, state) {
+	    if (path.node.operator === "delete") {
+	      state.constantViolations.push(path.get("argument"));
+	    }
+	  },
+	  BlockScoped: function BlockScoped(path) {
+	    var scope = path.scope;
+	    if (scope.path === path) scope = scope.parent;
+	    scope.getBlockParent().registerDeclaration(path);
+	  },
+	  ClassDeclaration: function ClassDeclaration(path) {
+	    var id = path.node.id;
+	    if (!id) return;
+
+	    var name = id.name;
+	    path.scope.bindings[name] = path.scope.getBinding(name);
+	  },
+	  Block: function Block(path) {
+	    var paths = path.get("body");
+	    for (var _iterator6 = paths, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : (0, _getIterator3.default)(_iterator6);;) {
+	      var _ref6;
+
+	      if (_isArray6) {
+	        if (_i6 >= _iterator6.length) break;
+	        _ref6 = _iterator6[_i6++];
+	      } else {
+	        _i6 = _iterator6.next();
+	        if (_i6.done) break;
+	        _ref6 = _i6.value;
+	      }
+
+	      var bodyPath = _ref6;
+
+	      if (bodyPath.isFunctionDeclaration()) {
+	        path.scope.getBlockParent().registerDeclaration(bodyPath);
+	      }
+	    }
+	  }
+	};
+
+	var uid = 0;
+
+	var Scope = function () {
+	  function Scope(path, parentScope) {
+	    (0, _classCallCheck3.default)(this, Scope);
+
+	    if (parentScope && parentScope.block === path.node) {
+	      return parentScope;
+	    }
+
+	    var cached = getCache(path, parentScope, this);
+	    if (cached) return cached;
+
+	    this.uid = uid++;
+	    this.parent = parentScope;
+	    this.hub = path.hub;
+
+	    this.parentBlock = path.parent;
+	    this.block = path.node;
+	    this.path = path;
+
+	    this.labels = new _map2.default();
+	  }
+
+	  Scope.prototype.traverse = function traverse(node, opts, state) {
+	    (0, _index2.default)(node, opts, this, state, this.path);
+	  };
+
+	  Scope.prototype.generateDeclaredUidIdentifier = function generateDeclaredUidIdentifier() {
+	    var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "temp";
+
+	    var id = this.generateUidIdentifier(name);
+	    this.push({ id: id });
+	    return id;
+	  };
+
+	  Scope.prototype.generateUidIdentifier = function generateUidIdentifier() {
+	    var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "temp";
+
+	    return t.identifier(this.generateUid(name));
+	  };
+
+	  Scope.prototype.generateUid = function generateUid() {
+	    var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "temp";
+
+	    name = t.toIdentifier(name).replace(/^_+/, "").replace(/[0-9]+$/g, "");
+
+	    var uid = void 0;
+	    var i = 0;
+	    do {
+	      uid = this._generateUid(name, i);
+	      i++;
+	    } while (this.hasLabel(uid) || this.hasBinding(uid) || this.hasGlobal(uid) || this.hasReference(uid));
+
+	    var program = this.getProgramParent();
+	    program.references[uid] = true;
+	    program.uids[uid] = true;
+
+	    return uid;
+	  };
+
+	  Scope.prototype._generateUid = function _generateUid(name, i) {
+	    var id = name;
+	    if (i > 1) id += i;
+	    return "_" + id;
+	  };
+
+	  Scope.prototype.generateUidIdentifierBasedOnNode = function generateUidIdentifierBasedOnNode(parent, defaultName) {
+	    var node = parent;
+
+	    if (t.isAssignmentExpression(parent)) {
+	      node = parent.left;
+	    } else if (t.isVariableDeclarator(parent)) {
+	      node = parent.id;
+	    } else if (t.isObjectProperty(node) || t.isObjectMethod(node)) {
+	      node = node.key;
+	    }
+
+	    var parts = [];
+	    gatherNodeParts(node, parts);
+
+	    var id = parts.join("$");
+	    id = id.replace(/^_/, "") || defaultName || "ref";
+
+	    return this.generateUidIdentifier(id.slice(0, 20));
+	  };
+
+	  Scope.prototype.isStatic = function isStatic(node) {
+	    if (t.isThisExpression(node) || t.isSuper(node)) {
+	      return true;
+	    }
+
+	    if (t.isIdentifier(node)) {
+	      var binding = this.getBinding(node.name);
+	      if (binding) {
+	        return binding.constant;
+	      } else {
+	        return this.hasBinding(node.name);
+	      }
+	    }
+
+	    return false;
+	  };
+
+	  Scope.prototype.maybeGenerateMemoised = function maybeGenerateMemoised(node, dontPush) {
+	    if (this.isStatic(node)) {
+	      return null;
+	    } else {
+	      var _id2 = this.generateUidIdentifierBasedOnNode(node);
+	      if (!dontPush) this.push({ id: _id2 });
+	      return _id2;
+	    }
+	  };
+
+	  Scope.prototype.checkBlockScopedCollisions = function checkBlockScopedCollisions(local, kind, name, id) {
+	    if (kind === "param") return;
+
+	    if (kind === "hoisted" && local.kind === "let") return;
+
+	    var duplicate = kind === "let" || local.kind === "let" || local.kind === "const" || local.kind === "module" || local.kind === "param" && (kind === "let" || kind === "const");
+
+	    if (duplicate) {
+	      throw this.hub.file.buildCodeFrameError(id, messages.get("scopeDuplicateDeclaration", name), TypeError);
+	    }
+	  };
+
+	  Scope.prototype.rename = function rename(oldName, newName, block) {
+	    var binding = this.getBinding(oldName);
+	    if (binding) {
+	      newName = newName || this.generateUidIdentifier(oldName).name;
+	      return new _renamer2.default(binding, oldName, newName).rename(block);
+	    }
+	  };
+
+	  Scope.prototype._renameFromMap = function _renameFromMap(map, oldName, newName, value) {
+	    if (map[oldName]) {
+	      map[newName] = value;
+	      map[oldName] = null;
+	    }
+	  };
+
+	  Scope.prototype.dump = function dump() {
+	    var sep = (0, _repeat2.default)("-", 60);
+	    console.log(sep);
+	    var scope = this;
+	    do {
+	      console.log("#", scope.block.type);
+	      for (var name in scope.bindings) {
+	        var binding = scope.bindings[name];
+	        console.log(" -", name, {
+	          constant: binding.constant,
+	          references: binding.references,
+	          violations: binding.constantViolations.length,
+	          kind: binding.kind
+	        });
+	      }
+	    } while (scope = scope.parent);
+	    console.log(sep);
+	  };
+
+	  Scope.prototype.toArray = function toArray(node, i) {
+	    var file = this.hub.file;
+
+	    if (t.isIdentifier(node)) {
+	      var binding = this.getBinding(node.name);
+	      if (binding && binding.constant && binding.path.isGenericType("Array")) return node;
+	    }
+
+	    if (t.isArrayExpression(node)) {
+	      return node;
+	    }
+
+	    if (t.isIdentifier(node, { name: "arguments" })) {
+	      return t.callExpression(t.memberExpression(t.memberExpression(t.memberExpression(t.identifier("Array"), t.identifier("prototype")), t.identifier("slice")), t.identifier("call")), [node]);
+	    }
+
+	    var helperName = "toArray";
+	    var args = [node];
+	    if (i === true) {
+	      helperName = "toConsumableArray";
+	    } else if (i) {
+	      args.push(t.numericLiteral(i));
+	      helperName = "slicedToArray";
+	    }
+	    return t.callExpression(file.addHelper(helperName), args);
+	  };
+
+	  Scope.prototype.hasLabel = function hasLabel(name) {
+	    return !!this.getLabel(name);
+	  };
+
+	  Scope.prototype.getLabel = function getLabel(name) {
+	    return this.labels.get(name);
+	  };
+
+	  Scope.prototype.registerLabel = function registerLabel(path) {
+	    this.labels.set(path.node.label.name, path);
+	  };
+
+	  Scope.prototype.registerDeclaration = function registerDeclaration(path) {
+	    if (path.isLabeledStatement()) {
+	      this.registerLabel(path);
+	    } else if (path.isFunctionDeclaration()) {
+	      this.registerBinding("hoisted", path.get("id"), path);
+	    } else if (path.isVariableDeclaration()) {
+	      var declarations = path.get("declarations");
+	      for (var _iterator7 = declarations, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : (0, _getIterator3.default)(_iterator7);;) {
+	        var _ref7;
+
+	        if (_isArray7) {
+	          if (_i7 >= _iterator7.length) break;
+	          _ref7 = _iterator7[_i7++];
+	        } else {
+	          _i7 = _iterator7.next();
+	          if (_i7.done) break;
+	          _ref7 = _i7.value;
+	        }
+
+	        var declar = _ref7;
+
+	        this.registerBinding(path.node.kind, declar);
+	      }
+	    } else if (path.isClassDeclaration()) {
+	      this.registerBinding("let", path);
+	    } else if (path.isImportDeclaration()) {
+	      var specifiers = path.get("specifiers");
+	      for (var _iterator8 = specifiers, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : (0, _getIterator3.default)(_iterator8);;) {
+	        var _ref8;
+
+	        if (_isArray8) {
+	          if (_i8 >= _iterator8.length) break;
+	          _ref8 = _iterator8[_i8++];
+	        } else {
+	          _i8 = _iterator8.next();
+	          if (_i8.done) break;
+	          _ref8 = _i8.value;
+	        }
+
+	        var specifier = _ref8;
+
+	        this.registerBinding("module", specifier);
+	      }
+	    } else if (path.isExportDeclaration()) {
+	      var _declar = path.get("declaration");
+	      if (_declar.isClassDeclaration() || _declar.isFunctionDeclaration() || _declar.isVariableDeclaration()) {
+	        this.registerDeclaration(_declar);
+	      }
+	    } else {
+	      this.registerBinding("unknown", path);
+	    }
+	  };
+
+	  Scope.prototype.buildUndefinedNode = function buildUndefinedNode() {
+	    if (this.hasBinding("undefined")) {
+	      return t.unaryExpression("void", t.numericLiteral(0), true);
+	    } else {
+	      return t.identifier("undefined");
+	    }
+	  };
+
+	  Scope.prototype.registerConstantViolation = function registerConstantViolation(path) {
+	    var ids = path.getBindingIdentifiers();
+	    for (var name in ids) {
+	      var binding = this.getBinding(name);
+	      if (binding) binding.reassign(path);
+	    }
+	  };
+
+	  Scope.prototype.registerBinding = function registerBinding(kind, path) {
+	    var bindingPath = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : path;
+
+	    if (!kind) throw new ReferenceError("no `kind`");
+
+	    if (path.isVariableDeclaration()) {
+	      var declarators = path.get("declarations");
+	      for (var _iterator9 = declarators, _isArray9 = Array.isArray(_iterator9), _i9 = 0, _iterator9 = _isArray9 ? _iterator9 : (0, _getIterator3.default)(_iterator9);;) {
+	        var _ref9;
+
+	        if (_isArray9) {
+	          if (_i9 >= _iterator9.length) break;
+	          _ref9 = _iterator9[_i9++];
+	        } else {
+	          _i9 = _iterator9.next();
+	          if (_i9.done) break;
+	          _ref9 = _i9.value;
+	        }
+
+	        var declar = _ref9;
+
+	        this.registerBinding(kind, declar);
+	      }
+	      return;
+	    }
+
+	    var parent = this.getProgramParent();
+	    var ids = path.getBindingIdentifiers(true);
+
+	    for (var name in ids) {
+	      for (var _iterator10 = ids[name], _isArray10 = Array.isArray(_iterator10), _i10 = 0, _iterator10 = _isArray10 ? _iterator10 : (0, _getIterator3.default)(_iterator10);;) {
+	        var _ref10;
+
+	        if (_isArray10) {
+	          if (_i10 >= _iterator10.length) break;
+	          _ref10 = _iterator10[_i10++];
+	        } else {
+	          _i10 = _iterator10.next();
+	          if (_i10.done) break;
+	          _ref10 = _i10.value;
+	        }
+
+	        var _id3 = _ref10;
+
+	        var local = this.getOwnBinding(name);
+	        if (local) {
+	          if (local.identifier === _id3) continue;
+
+	          this.checkBlockScopedCollisions(local, kind, name, _id3);
+	        }
+
+	        if (local && local.path.isFlow()) local = null;
+
+	        parent.references[name] = true;
+
+	        this.bindings[name] = new _binding3.default({
+	          identifier: _id3,
+	          existing: local,
+	          scope: this,
+	          path: bindingPath,
+	          kind: kind
+	        });
+	      }
+	    }
+	  };
+
+	  Scope.prototype.addGlobal = function addGlobal(node) {
+	    this.globals[node.name] = node;
+	  };
+
+	  Scope.prototype.hasUid = function hasUid(name) {
+	    var scope = this;
+
+	    do {
+	      if (scope.uids[name]) return true;
+	    } while (scope = scope.parent);
+
+	    return false;
+	  };
+
+	  Scope.prototype.hasGlobal = function hasGlobal(name) {
+	    var scope = this;
+
+	    do {
+	      if (scope.globals[name]) return true;
+	    } while (scope = scope.parent);
+
+	    return false;
+	  };
+
+	  Scope.prototype.hasReference = function hasReference(name) {
+	    var scope = this;
+
+	    do {
+	      if (scope.references[name]) return true;
+	    } while (scope = scope.parent);
+
+	    return false;
+	  };
+
+	  Scope.prototype.isPure = function isPure(node, constantsOnly) {
+	    if (t.isIdentifier(node)) {
+	      var binding = this.getBinding(node.name);
+	      if (!binding) return false;
+	      if (constantsOnly) return binding.constant;
+	      return true;
+	    } else if (t.isClass(node)) {
+	      if (node.superClass && !this.isPure(node.superClass, constantsOnly)) return false;
+	      return this.isPure(node.body, constantsOnly);
+	    } else if (t.isClassBody(node)) {
+	      for (var _iterator11 = node.body, _isArray11 = Array.isArray(_iterator11), _i11 = 0, _iterator11 = _isArray11 ? _iterator11 : (0, _getIterator3.default)(_iterator11);;) {
+	        var _ref11;
+
+	        if (_isArray11) {
+	          if (_i11 >= _iterator11.length) break;
+	          _ref11 = _iterator11[_i11++];
+	        } else {
+	          _i11 = _iterator11.next();
+	          if (_i11.done) break;
+	          _ref11 = _i11.value;
+	        }
+
+	        var method = _ref11;
+
+	        if (!this.isPure(method, constantsOnly)) return false;
+	      }
+	      return true;
+	    } else if (t.isBinary(node)) {
+	      return this.isPure(node.left, constantsOnly) && this.isPure(node.right, constantsOnly);
+	    } else if (t.isArrayExpression(node)) {
+	      for (var _iterator12 = node.elements, _isArray12 = Array.isArray(_iterator12), _i12 = 0, _iterator12 = _isArray12 ? _iterator12 : (0, _getIterator3.default)(_iterator12);;) {
+	        var _ref12;
+
+	        if (_isArray12) {
+	          if (_i12 >= _iterator12.length) break;
+	          _ref12 = _iterator12[_i12++];
+	        } else {
+	          _i12 = _iterator12.next();
+	          if (_i12.done) break;
+	          _ref12 = _i12.value;
+	        }
+
+	        var elem = _ref12;
+
+	        if (!this.isPure(elem, constantsOnly)) return false;
+	      }
+	      return true;
+	    } else if (t.isObjectExpression(node)) {
+	      for (var _iterator13 = node.properties, _isArray13 = Array.isArray(_iterator13), _i13 = 0, _iterator13 = _isArray13 ? _iterator13 : (0, _getIterator3.default)(_iterator13);;) {
+	        var _ref13;
+
+	        if (_isArray13) {
+	          if (_i13 >= _iterator13.length) break;
+	          _ref13 = _iterator13[_i13++];
+	        } else {
+	          _i13 = _iterator13.next();
+	          if (_i13.done) break;
+	          _ref13 = _i13.value;
+	        }
+
+	        var prop = _ref13;
+
+	        if (!this.isPure(prop, constantsOnly)) return false;
+	      }
+	      return true;
+	    } else if (t.isClassMethod(node)) {
+	      if (node.computed && !this.isPure(node.key, constantsOnly)) return false;
+	      if (node.kind === "get" || node.kind === "set") return false;
+	      return true;
+	    } else if (t.isClassProperty(node) || t.isObjectProperty(node)) {
+	      if (node.computed && !this.isPure(node.key, constantsOnly)) return false;
+	      return this.isPure(node.value, constantsOnly);
+	    } else if (t.isUnaryExpression(node)) {
+	      return this.isPure(node.argument, constantsOnly);
+	    } else {
+	      return t.isPureish(node);
+	    }
+	  };
+
+	  Scope.prototype.setData = function setData(key, val) {
+	    return this.data[key] = val;
+	  };
+
+	  Scope.prototype.getData = function getData(key) {
+	    var scope = this;
+	    do {
+	      var data = scope.data[key];
+	      if (data != null) return data;
+	    } while (scope = scope.parent);
+	  };
+
+	  Scope.prototype.removeData = function removeData(key) {
+	    var scope = this;
+	    do {
+	      var data = scope.data[key];
+	      if (data != null) scope.data[key] = null;
+	    } while (scope = scope.parent);
+	  };
+
+	  Scope.prototype.init = function init() {
+	    if (!this.references) this.crawl();
+	  };
+
+	  Scope.prototype.crawl = function crawl() {
+	    _crawlCallsCount++;
+	    this._crawl();
+	    _crawlCallsCount--;
+	  };
+
+	  Scope.prototype._crawl = function _crawl() {
+	    var path = this.path;
+
+	    this.references = (0, _create2.default)(null);
+	    this.bindings = (0, _create2.default)(null);
+	    this.globals = (0, _create2.default)(null);
+	    this.uids = (0, _create2.default)(null);
+	    this.data = (0, _create2.default)(null);
+
+	    if (path.isLoop()) {
+	      for (var _iterator14 = t.FOR_INIT_KEYS, _isArray14 = Array.isArray(_iterator14), _i14 = 0, _iterator14 = _isArray14 ? _iterator14 : (0, _getIterator3.default)(_iterator14);;) {
+	        var _ref14;
+
+	        if (_isArray14) {
+	          if (_i14 >= _iterator14.length) break;
+	          _ref14 = _iterator14[_i14++];
+	        } else {
+	          _i14 = _iterator14.next();
+	          if (_i14.done) break;
+	          _ref14 = _i14.value;
+	        }
+
+	        var key = _ref14;
+
+	        var node = path.get(key);
+	        if (node.isBlockScoped()) this.registerBinding(node.node.kind, node);
+	      }
+	    }
+
+	    if (path.isFunctionExpression() && path.has("id")) {
+	      if (!path.get("id").node[t.NOT_LOCAL_BINDING]) {
+	        this.registerBinding("local", path.get("id"), path);
+	      }
+	    }
+
+	    if (path.isClassExpression() && path.has("id")) {
+	      if (!path.get("id").node[t.NOT_LOCAL_BINDING]) {
+	        this.registerBinding("local", path);
+	      }
+	    }
+
+	    if (path.isFunction()) {
+	      var params = path.get("params");
+	      for (var _iterator15 = params, _isArray15 = Array.isArray(_iterator15), _i15 = 0, _iterator15 = _isArray15 ? _iterator15 : (0, _getIterator3.default)(_iterator15);;) {
+	        var _ref15;
+
+	        if (_isArray15) {
+	          if (_i15 >= _iterator15.length) break;
+	          _ref15 = _iterator15[_i15++];
+	        } else {
+	          _i15 = _iterator15.next();
+	          if (_i15.done) break;
+	          _ref15 = _i15.value;
+	        }
+
+	        var param = _ref15;
+
+	        this.registerBinding("param", param);
+	      }
+	    }
+
+	    if (path.isCatchClause()) {
+	      this.registerBinding("let", path);
+	    }
+
+	    var parent = this.getProgramParent();
+	    if (parent.crawling) return;
+
+	    var state = {
+	      references: [],
+	      constantViolations: [],
+	      assignments: []
+	    };
+
+	    this.crawling = true;
+	    path.traverse(collectorVisitor, state);
+	    this.crawling = false;
+
+	    for (var _iterator16 = state.assignments, _isArray16 = Array.isArray(_iterator16), _i16 = 0, _iterator16 = _isArray16 ? _iterator16 : (0, _getIterator3.default)(_iterator16);;) {
+	      var _ref16;
+
+	      if (_isArray16) {
+	        if (_i16 >= _iterator16.length) break;
+	        _ref16 = _iterator16[_i16++];
+	      } else {
+	        _i16 = _iterator16.next();
+	        if (_i16.done) break;
+	        _ref16 = _i16.value;
+	      }
+
+	      var _path = _ref16;
+
+	      var ids = _path.getBindingIdentifiers();
+	      var programParent = void 0;
+	      for (var name in ids) {
+	        if (_path.scope.getBinding(name)) continue;
+
+	        programParent = programParent || _path.scope.getProgramParent();
+	        programParent.addGlobal(ids[name]);
+	      }
+
+	      _path.scope.registerConstantViolation(_path);
+	    }
+
+	    for (var _iterator17 = state.references, _isArray17 = Array.isArray(_iterator17), _i17 = 0, _iterator17 = _isArray17 ? _iterator17 : (0, _getIterator3.default)(_iterator17);;) {
+	      var _ref17;
+
+	      if (_isArray17) {
+	        if (_i17 >= _iterator17.length) break;
+	        _ref17 = _iterator17[_i17++];
+	      } else {
+	        _i17 = _iterator17.next();
+	        if (_i17.done) break;
+	        _ref17 = _i17.value;
+	      }
+
+	      var ref = _ref17;
+
+	      var binding = ref.scope.getBinding(ref.node.name);
+	      if (binding) {
+	        binding.reference(ref);
+	      } else {
+	        ref.scope.getProgramParent().addGlobal(ref.node);
+	      }
+	    }
+
+	    for (var _iterator18 = state.constantViolations, _isArray18 = Array.isArray(_iterator18), _i18 = 0, _iterator18 = _isArray18 ? _iterator18 : (0, _getIterator3.default)(_iterator18);;) {
+	      var _ref18;
+
+	      if (_isArray18) {
+	        if (_i18 >= _iterator18.length) break;
+	        _ref18 = _iterator18[_i18++];
+	      } else {
+	        _i18 = _iterator18.next();
+	        if (_i18.done) break;
+	        _ref18 = _i18.value;
+	      }
+
+	      var _path2 = _ref18;
+
+	      _path2.scope.registerConstantViolation(_path2);
+	    }
+	  };
+
+	  Scope.prototype.push = function push(opts) {
+	    var path = this.path;
+
+	    if (!path.isBlockStatement() && !path.isProgram()) {
+	      path = this.getBlockParent().path;
+	    }
+
+	    if (path.isSwitchStatement()) {
+	      path = this.getFunctionParent().path;
+	    }
+
+	    if (path.isLoop() || path.isCatchClause() || path.isFunction()) {
+	      t.ensureBlock(path.node);
+	      path = path.get("body");
+	    }
+
+	    var unique = opts.unique;
+	    var kind = opts.kind || "var";
+	    var blockHoist = opts._blockHoist == null ? 2 : opts._blockHoist;
+
+	    var dataKey = "declaration:" + kind + ":" + blockHoist;
+	    var declarPath = !unique && path.getData(dataKey);
+
+	    if (!declarPath) {
+	      var declar = t.variableDeclaration(kind, []);
+	      declar._generated = true;
+	      declar._blockHoist = blockHoist;
+
+	      var _path$unshiftContaine = path.unshiftContainer("body", [declar]);
+
+	      declarPath = _path$unshiftContaine[0];
+
+	      if (!unique) path.setData(dataKey, declarPath);
+	    }
+
+	    var declarator = t.variableDeclarator(opts.id, opts.init);
+	    declarPath.node.declarations.push(declarator);
+	    this.registerBinding(kind, declarPath.get("declarations").pop());
+	  };
+
+	  Scope.prototype.getProgramParent = function getProgramParent() {
+	    var scope = this;
+	    do {
+	      if (scope.path.isProgram()) {
+	        return scope;
+	      }
+	    } while (scope = scope.parent);
+	    throw new Error("We couldn't find a Function or Program...");
+	  };
+
+	  Scope.prototype.getFunctionParent = function getFunctionParent() {
+	    var scope = this;
+	    do {
+	      if (scope.path.isFunctionParent()) {
+	        return scope;
+	      }
+	    } while (scope = scope.parent);
+	    throw new Error("We couldn't find a Function or Program...");
+	  };
+
+	  Scope.prototype.getBlockParent = function getBlockParent() {
+	    var scope = this;
+	    do {
+	      if (scope.path.isBlockParent()) {
+	        return scope;
+	      }
+	    } while (scope = scope.parent);
+	    throw new Error("We couldn't find a BlockStatement, For, Switch, Function, Loop or Program...");
+	  };
+
+	  Scope.prototype.getAllBindings = function getAllBindings() {
+	    var ids = (0, _create2.default)(null);
+
+	    var scope = this;
+	    do {
+	      (0, _defaults2.default)(ids, scope.bindings);
+	      scope = scope.parent;
+	    } while (scope);
+
+	    return ids;
+	  };
+
+	  Scope.prototype.getAllBindingsOfKind = function getAllBindingsOfKind() {
+	    var ids = (0, _create2.default)(null);
+
+	    for (var _iterator19 = arguments, _isArray19 = Array.isArray(_iterator19), _i19 = 0, _iterator19 = _isArray19 ? _iterator19 : (0, _getIterator3.default)(_iterator19);;) {
+	      var _ref19;
+
+	      if (_isArray19) {
+	        if (_i19 >= _iterator19.length) break;
+	        _ref19 = _iterator19[_i19++];
+	      } else {
+	        _i19 = _iterator19.next();
+	        if (_i19.done) break;
+	        _ref19 = _i19.value;
+	      }
+
+	      var kind = _ref19;
+
+	      var scope = this;
+	      do {
+	        for (var name in scope.bindings) {
+	          var binding = scope.bindings[name];
+	          if (binding.kind === kind) ids[name] = binding;
+	        }
+	        scope = scope.parent;
+	      } while (scope);
+	    }
+
+	    return ids;
+	  };
+
+	  Scope.prototype.bindingIdentifierEquals = function bindingIdentifierEquals(name, node) {
+	    return this.getBindingIdentifier(name) === node;
+	  };
+
+	  Scope.prototype.warnOnFlowBinding = function warnOnFlowBinding(binding) {
+	    if (_crawlCallsCount === 0 && binding && binding.path.isFlow()) {
+	      console.warn("\n        You or one of the Babel plugins you are using are using Flow declarations as bindings.\n        Support for this will be removed in version 7. To find out the caller, grep for this\n        message and change it to a `console.trace()`.\n      ");
+	    }
+	    return binding;
+	  };
+
+	  Scope.prototype.getBinding = function getBinding(name) {
+	    var scope = this;
+
+	    do {
+	      var binding = scope.getOwnBinding(name);
+	      if (binding) return this.warnOnFlowBinding(binding);
+	    } while (scope = scope.parent);
+	  };
+
+	  Scope.prototype.getOwnBinding = function getOwnBinding(name) {
+	    return this.warnOnFlowBinding(this.bindings[name]);
+	  };
+
+	  Scope.prototype.getBindingIdentifier = function getBindingIdentifier(name) {
+	    var info = this.getBinding(name);
+	    return info && info.identifier;
+	  };
+
+	  Scope.prototype.getOwnBindingIdentifier = function getOwnBindingIdentifier(name) {
+	    var binding = this.bindings[name];
+	    return binding && binding.identifier;
+	  };
+
+	  Scope.prototype.hasOwnBinding = function hasOwnBinding(name) {
+	    return !!this.getOwnBinding(name);
+	  };
+
+	  Scope.prototype.hasBinding = function hasBinding(name, noGlobals) {
+	    if (!name) return false;
+	    if (this.hasOwnBinding(name)) return true;
+	    if (this.parentHasBinding(name, noGlobals)) return true;
+	    if (this.hasUid(name)) return true;
+	    if (!noGlobals && (0, _includes2.default)(Scope.globals, name)) return true;
+	    if (!noGlobals && (0, _includes2.default)(Scope.contextVariables, name)) return true;
+	    return false;
+	  };
+
+	  Scope.prototype.parentHasBinding = function parentHasBinding(name, noGlobals) {
+	    return this.parent && this.parent.hasBinding(name, noGlobals);
+	  };
+
+	  Scope.prototype.moveBindingTo = function moveBindingTo(name, scope) {
+	    var info = this.getBinding(name);
+	    if (info) {
+	      info.scope.removeOwnBinding(name);
+	      info.scope = scope;
+	      scope.bindings[name] = info;
+	    }
+	  };
+
+	  Scope.prototype.removeOwnBinding = function removeOwnBinding(name) {
+	    delete this.bindings[name];
+	  };
+
+	  Scope.prototype.removeBinding = function removeBinding(name) {
+	    var info = this.getBinding(name);
+	    if (info) {
+	      info.scope.removeOwnBinding(name);
+	    }
+
+	    var scope = this;
+	    do {
+	      if (scope.uids[name]) {
+	        scope.uids[name] = false;
+	      }
+	    } while (scope = scope.parent);
+	  };
+
+	  return Scope;
+	}();
+
+	Scope.globals = (0, _keys2.default)(_globals2.default.builtin);
+	Scope.contextVariables = ["arguments", "undefined", "Infinity", "NaN"];
+	exports.default = Scope;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 134 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.NOT_LOCAL_BINDING = exports.BLOCK_SCOPED_SYMBOL = exports.INHERIT_KEYS = exports.UNARY_OPERATORS = exports.STRING_UNARY_OPERATORS = exports.NUMBER_UNARY_OPERATORS = exports.BOOLEAN_UNARY_OPERATORS = exports.BINARY_OPERATORS = exports.NUMBER_BINARY_OPERATORS = exports.BOOLEAN_BINARY_OPERATORS = exports.COMPARISON_BINARY_OPERATORS = exports.EQUALITY_BINARY_OPERATORS = exports.BOOLEAN_NUMBER_BINARY_OPERATORS = exports.UPDATE_OPERATORS = exports.LOGICAL_OPERATORS = exports.COMMENT_KEYS = exports.FOR_INIT_KEYS = exports.FLATTENABLE_KEYS = exports.STATEMENT_OR_BLOCK_KEYS = undefined;
+
+	var _for = __webpack_require__(358);
+
+	var _for2 = _interopRequireDefault(_for);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var STATEMENT_OR_BLOCK_KEYS = exports.STATEMENT_OR_BLOCK_KEYS = ["consequent", "body", "alternate"];
+	var FLATTENABLE_KEYS = exports.FLATTENABLE_KEYS = ["body", "expressions"];
+	var FOR_INIT_KEYS = exports.FOR_INIT_KEYS = ["left", "init"];
+	var COMMENT_KEYS = exports.COMMENT_KEYS = ["leadingComments", "trailingComments", "innerComments"];
+
+	var LOGICAL_OPERATORS = exports.LOGICAL_OPERATORS = ["||", "&&"];
+	var UPDATE_OPERATORS = exports.UPDATE_OPERATORS = ["++", "--"];
+
+	var BOOLEAN_NUMBER_BINARY_OPERATORS = exports.BOOLEAN_NUMBER_BINARY_OPERATORS = [">", "<", ">=", "<="];
+	var EQUALITY_BINARY_OPERATORS = exports.EQUALITY_BINARY_OPERATORS = ["==", "===", "!=", "!=="];
+	var COMPARISON_BINARY_OPERATORS = exports.COMPARISON_BINARY_OPERATORS = [].concat(EQUALITY_BINARY_OPERATORS, ["in", "instanceof"]);
+	var BOOLEAN_BINARY_OPERATORS = exports.BOOLEAN_BINARY_OPERATORS = [].concat(COMPARISON_BINARY_OPERATORS, BOOLEAN_NUMBER_BINARY_OPERATORS);
+	var NUMBER_BINARY_OPERATORS = exports.NUMBER_BINARY_OPERATORS = ["-", "/", "%", "*", "**", "&", "|", ">>", ">>>", "<<", "^"];
+	var BINARY_OPERATORS = exports.BINARY_OPERATORS = ["+"].concat(NUMBER_BINARY_OPERATORS, BOOLEAN_BINARY_OPERATORS);
+
+	var BOOLEAN_UNARY_OPERATORS = exports.BOOLEAN_UNARY_OPERATORS = ["delete", "!"];
+	var NUMBER_UNARY_OPERATORS = exports.NUMBER_UNARY_OPERATORS = ["+", "-", "++", "--", "~"];
+	var STRING_UNARY_OPERATORS = exports.STRING_UNARY_OPERATORS = ["typeof"];
+	var UNARY_OPERATORS = exports.UNARY_OPERATORS = ["void"].concat(BOOLEAN_UNARY_OPERATORS, NUMBER_UNARY_OPERATORS, STRING_UNARY_OPERATORS);
+
+	var INHERIT_KEYS = exports.INHERIT_KEYS = {
+	  optional: ["typeAnnotation", "typeParameters", "returnType"],
+	  force: ["start", "loc", "end"]
+	};
+
+	var BLOCK_SCOPED_SYMBOL = exports.BLOCK_SCOPED_SYMBOL = (0, _for2.default)("var used to be block scoped");
+	var NOT_LOCAL_BINDING = exports.NOT_LOCAL_BINDING = (0, _for2.default)("should not be considered a local binding");
+
+/***/ }),
+/* 135 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	module.exports = function (it, Constructor, name, forbiddenField) {
+	  if (!(it instanceof Constructor) || forbiddenField !== undefined && forbiddenField in it) {
+	    throw TypeError(name + ': incorrect invocation!');
+	  }return it;
+	};
+
+/***/ }),
+/* 136 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 0 -> Array#forEach
+	// 1 -> Array#map
+	// 2 -> Array#filter
+	// 3 -> Array#some
+	// 4 -> Array#every
+	// 5 -> Array#find
+	// 6 -> Array#findIndex
+	var ctx = __webpack_require__(54),
+	    IObject = __webpack_require__(140),
+	    toObject = __webpack_require__(94),
+	    toLength = __webpack_require__(149),
+	    asc = __webpack_require__(419);
+	module.exports = function (TYPE, $create) {
+	  var IS_MAP = TYPE == 1,
+	      IS_FILTER = TYPE == 2,
+	      IS_SOME = TYPE == 3,
+	      IS_EVERY = TYPE == 4,
+	      IS_FIND_INDEX = TYPE == 6,
+	      NO_HOLES = TYPE == 5 || IS_FIND_INDEX,
+	      create = $create || asc;
+	  return function ($this, callbackfn, that) {
+	    var O = toObject($this),
+	        self = IObject(O),
+	        f = ctx(callbackfn, that, 3),
+	        length = toLength(self.length),
+	        index = 0,
+	        result = IS_MAP ? create($this, length) : IS_FILTER ? create($this, 0) : undefined,
+	        val,
+	        res;
+	    for (; length > index; index++) {
+	      if (NO_HOLES || index in self) {
+	        val = self[index];
+	        res = f(val, index, O);
+	        if (TYPE) {
+	          if (IS_MAP) result[index] = res; // map
+	          else if (res) switch (TYPE) {
+	              case 3:
+	                return true; // some
+	              case 5:
+	                return val; // find
+	              case 6:
+	                return index; // findIndex
+	              case 2:
+	                result.push(val); // filter
+	            } else if (IS_EVERY) return false; // every
+	        }
+	      }
+	    }return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : result;
+	  };
+	};
+
+/***/ }),
+/* 137 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	var toString = {}.toString;
+
+	module.exports = function (it) {
+	  return toString.call(it).slice(8, -1);
+	};
+
+/***/ }),
+/* 138 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var global = __webpack_require__(14),
+	    $export = __webpack_require__(21),
+	    meta = __webpack_require__(56),
+	    fails = __webpack_require__(36),
+	    hide = __webpack_require__(28),
+	    redefineAll = __webpack_require__(144),
+	    forOf = __webpack_require__(89),
+	    anInstance = __webpack_require__(135),
+	    isObject = __webpack_require__(22),
+	    setToStringTag = __webpack_require__(93),
+	    dP = __webpack_require__(23).f,
+	    each = __webpack_require__(136)(0),
+	    DESCRIPTORS = __webpack_require__(20);
+
+	module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
+	  var Base = global[NAME],
+	      C = Base,
+	      ADDER = IS_MAP ? 'set' : 'add',
+	      proto = C && C.prototype,
+	      O = {};
+	  if (!DESCRIPTORS || typeof C != 'function' || !(IS_WEAK || proto.forEach && !fails(function () {
+	    new C().entries().next();
+	  }))) {
+	    // create collection constructor
+	    C = common.getConstructor(wrapper, NAME, IS_MAP, ADDER);
+	    redefineAll(C.prototype, methods);
+	    meta.NEED = true;
+	  } else {
+	    C = wrapper(function (target, iterable) {
+	      anInstance(target, C, NAME, '_c');
+	      target._c = new Base();
+	      if (iterable != undefined) forOf(iterable, IS_MAP, target[ADDER], target);
+	    });
+	    each('add,clear,delete,forEach,get,has,set,keys,values,entries,toJSON'.split(','), function (KEY) {
+	      var IS_ADDER = KEY == 'add' || KEY == 'set';
+	      if (KEY in proto && !(IS_WEAK && KEY == 'clear')) hide(C.prototype, KEY, function (a, b) {
+	        anInstance(this, C, KEY);
+	        if (!IS_ADDER && IS_WEAK && !isObject(a)) return KEY == 'get' ? undefined : false;
+	        var result = this._c[KEY](a === 0 ? 0 : a, b);
+	        return IS_ADDER ? this : result;
+	      });
+	    });
+	    if ('size' in proto) dP(C.prototype, 'size', {
+	      get: function get() {
+	        return this._c.size;
+	      }
+	    });
+	  }
+
+	  setToStringTag(C, NAME);
+
+	  O[NAME] = C;
+	  $export($export.G + $export.W + $export.F, O);
+
+	  if (!IS_WEAK) common.setStrong(C, NAME, IS_MAP);
+
+	  return C;
+	};
+
+/***/ }),
+/* 139 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	// IE 8- don't enum bug keys
+	module.exports = 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'.split(',');
+
+/***/ }),
+/* 140 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// fallback for non-array-like ES3 and non-enumerable old V8 strings
+	var cof = __webpack_require__(137);
+	module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
+	  return cof(it) == 'String' ? it.split('') : Object(it);
+	};
+
+/***/ }),
+/* 141 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var LIBRARY = __webpack_require__(142),
+	    $export = __webpack_require__(21),
+	    redefine = __webpack_require__(145),
+	    hide = __webpack_require__(28),
+	    has = __webpack_require__(27),
+	    Iterators = __webpack_require__(55),
+	    $iterCreate = __webpack_require__(426),
+	    setToStringTag = __webpack_require__(93),
+	    getPrototypeOf = __webpack_require__(430),
+	    ITERATOR = __webpack_require__(12)('iterator'),
+	    BUGGY = !([].keys && 'next' in [].keys()) // Safari has buggy iterators w/o `next`
+	,
+	    FF_ITERATOR = '@@iterator',
+	    KEYS = 'keys',
+	    VALUES = 'values';
+
+	var returnThis = function returnThis() {
+	  return this;
+	};
+
+	module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED) {
+	  $iterCreate(Constructor, NAME, next);
+	  var getMethod = function getMethod(kind) {
+	    if (!BUGGY && kind in proto) return proto[kind];
+	    switch (kind) {
+	      case KEYS:
+	        return function keys() {
+	          return new Constructor(this, kind);
+	        };
+	      case VALUES:
+	        return function values() {
+	          return new Constructor(this, kind);
+	        };
+	    }return function entries() {
+	      return new Constructor(this, kind);
+	    };
+	  };
+	  var TAG = NAME + ' Iterator',
+	      DEF_VALUES = DEFAULT == VALUES,
+	      VALUES_BUG = false,
+	      proto = Base.prototype,
+	      $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT],
+	      $default = $native || getMethod(DEFAULT),
+	      $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined,
+	      $anyNative = NAME == 'Array' ? proto.entries || $native : $native,
+	      methods,
+	      key,
+	      IteratorPrototype;
+	  // Fix native
+	  if ($anyNative) {
+	    IteratorPrototype = getPrototypeOf($anyNative.call(new Base()));
+	    if (IteratorPrototype !== Object.prototype) {
+	      // Set @@toStringTag to native iterators
+	      setToStringTag(IteratorPrototype, TAG, true);
+	      // fix for some old engines
+	      if (!LIBRARY && !has(IteratorPrototype, ITERATOR)) hide(IteratorPrototype, ITERATOR, returnThis);
+	    }
+	  }
+	  // fix Array#{values, @@iterator}.name in V8 / FF
+	  if (DEF_VALUES && $native && $native.name !== VALUES) {
+	    VALUES_BUG = true;
+	    $default = function values() {
+	      return $native.call(this);
+	    };
+	  }
+	  // Define iterator
+	  if ((!LIBRARY || FORCED) && (BUGGY || VALUES_BUG || !proto[ITERATOR])) {
+	    hide(proto, ITERATOR, $default);
+	  }
+	  // Plug for library
+	  Iterators[NAME] = $default;
+	  Iterators[TAG] = returnThis;
+	  if (DEFAULT) {
+	    methods = {
+	      values: DEF_VALUES ? $default : getMethod(VALUES),
+	      keys: IS_SET ? $default : getMethod(KEYS),
+	      entries: $entries
+	    };
+	    if (FORCED) for (key in methods) {
+	      if (!(key in proto)) redefine(proto, key, methods[key]);
+	    } else $export($export.P + $export.F * (BUGGY || VALUES_BUG), NAME, methods);
+	  }
+	  return methods;
+	};
+
+/***/ }),
+/* 142 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = true;
+
+/***/ }),
+/* 143 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.f = Object.getOwnPropertySymbols;
+
+/***/ }),
+/* 144 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var hide = __webpack_require__(28);
+	module.exports = function (target, src, safe) {
+	  for (var key in src) {
+	    if (safe && target[key]) target[key] = src[key];else hide(target, key, src[key]);
+	  }return target;
+	};
+
+/***/ }),
+/* 145 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = __webpack_require__(28);
+
+/***/ }),
+/* 146 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var shared = __webpack_require__(147)('keys'),
+	    uid = __webpack_require__(95);
+	module.exports = function (key) {
+	  return shared[key] || (shared[key] = uid(key));
+	};
+
+/***/ }),
+/* 147 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var global = __webpack_require__(14),
+	    SHARED = '__core-js_shared__',
+	    store = global[SHARED] || (global[SHARED] = {});
+	module.exports = function (key) {
+	  return store[key] || (store[key] = {});
+	};
+
+/***/ }),
+/* 148 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	// 7.1.4 ToInteger
+	var ceil = Math.ceil,
+	    floor = Math.floor;
+	module.exports = function (it) {
+	  return isNaN(it = +it) ? 0 : (it > 0 ? floor : ceil)(it);
+	};
+
+/***/ }),
+/* 149 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 7.1.15 ToLength
+	var toInteger = __webpack_require__(148),
+	    min = Math.min;
+	module.exports = function (it) {
+	  return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0; // pow(2, 53) - 1 == 9007199254740991
+	};
+
+/***/ }),
+/* 150 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 7.1.1 ToPrimitive(input [, PreferredType])
+	var isObject = __webpack_require__(22);
+	// instead of the ES6 spec version, we didn't implement @@toPrimitive case
+	// and the second argument - flag - preferred type is a string
+	module.exports = function (it, S) {
+	  if (!isObject(it)) return it;
+	  var fn, val;
+	  if (S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
+	  if (typeof (fn = it.valueOf) == 'function' && !isObject(val = fn.call(it))) return val;
+	  if (!S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it))) return val;
+	  throw TypeError("Can't convert object to primitive value");
+	};
+
+/***/ }),
+/* 151 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var global = __webpack_require__(14),
+	    core = __webpack_require__(5),
+	    LIBRARY = __webpack_require__(142),
+	    wksExt = __webpack_require__(152),
+	    defineProperty = __webpack_require__(23).f;
+	module.exports = function (name) {
+	  var $Symbol = core.Symbol || (core.Symbol = LIBRARY ? {} : global.Symbol || {});
+	  if (name.charAt(0) != '_' && !(name in $Symbol)) defineProperty($Symbol, name, { value: wksExt.f(name) });
+	};
+
+/***/ }),
+/* 152 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	exports.f = __webpack_require__(12);
+
+/***/ }),
+/* 153 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var $at = __webpack_require__(434)(true);
+
+	// 21.1.3.27 String.prototype[@@iterator]()
+	__webpack_require__(141)(String, 'String', function (iterated) {
+	  this._t = String(iterated); // target
+	  this._i = 0; // next index
+	  // 21.1.5.2.1 %StringIteratorPrototype%.next()
+	}, function () {
+	  var O = this._t,
+	      index = this._i,
+	      point;
+	  if (index >= O.length) return { value: undefined, done: true };
+	  point = $at(O, index);
+	  this._i += point.length;
+	  return { value: point, done: false };
+	});
+
+/***/ }),
+/* 154 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// ECMAScript 6 symbols shim
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var global = __webpack_require__(14),
+	    has = __webpack_require__(27),
+	    DESCRIPTORS = __webpack_require__(20),
+	    $export = __webpack_require__(21),
+	    redefine = __webpack_require__(145),
+	    META = __webpack_require__(56).KEY,
+	    $fails = __webpack_require__(36),
+	    shared = __webpack_require__(147),
+	    setToStringTag = __webpack_require__(93),
+	    uid = __webpack_require__(95),
+	    wks = __webpack_require__(12),
+	    wksExt = __webpack_require__(152),
+	    wksDefine = __webpack_require__(151),
+	    keyOf = __webpack_require__(427),
+	    enumKeys = __webpack_require__(422),
+	    isArray = __webpack_require__(227),
+	    anObject = __webpack_require__(19),
+	    toIObject = __webpack_require__(37),
+	    toPrimitive = __webpack_require__(150),
+	    createDesc = __webpack_require__(92),
+	    _create = __webpack_require__(90),
+	    gOPNExt = __webpack_require__(429),
+	    $GOPD = __webpack_require__(230),
+	    $DP = __webpack_require__(23),
+	    $keys = __webpack_require__(43),
+	    gOPD = $GOPD.f,
+	    dP = $DP.f,
+	    gOPN = gOPNExt.f,
+	    $Symbol = global.Symbol,
+	    $JSON = global.JSON,
+	    _stringify = $JSON && $JSON.stringify,
+	    PROTOTYPE = 'prototype',
+	    HIDDEN = wks('_hidden'),
+	    TO_PRIMITIVE = wks('toPrimitive'),
+	    isEnum = {}.propertyIsEnumerable,
+	    SymbolRegistry = shared('symbol-registry'),
+	    AllSymbols = shared('symbols'),
+	    OPSymbols = shared('op-symbols'),
+	    ObjectProto = Object[PROTOTYPE],
+	    USE_NATIVE = typeof $Symbol == 'function',
+	    QObject = global.QObject;
+	// Don't use setters in Qt Script, https://github.com/zloirock/core-js/issues/173
+	var setter = !QObject || !QObject[PROTOTYPE] || !QObject[PROTOTYPE].findChild;
+
+	// fallback for old Android, https://code.google.com/p/v8/issues/detail?id=687
+	var setSymbolDesc = DESCRIPTORS && $fails(function () {
+	  return _create(dP({}, 'a', {
+	    get: function get() {
+	      return dP(this, 'a', { value: 7 }).a;
+	    }
+	  })).a != 7;
+	}) ? function (it, key, D) {
+	  var protoDesc = gOPD(ObjectProto, key);
+	  if (protoDesc) delete ObjectProto[key];
+	  dP(it, key, D);
+	  if (protoDesc && it !== ObjectProto) dP(ObjectProto, key, protoDesc);
+	} : dP;
+
+	var wrap = function wrap(tag) {
+	  var sym = AllSymbols[tag] = _create($Symbol[PROTOTYPE]);
+	  sym._k = tag;
+	  return sym;
+	};
+
+	var isSymbol = USE_NATIVE && _typeof($Symbol.iterator) == 'symbol' ? function (it) {
+	  return (typeof it === 'undefined' ? 'undefined' : _typeof(it)) == 'symbol';
+	} : function (it) {
+	  return it instanceof $Symbol;
+	};
+
+	var $defineProperty = function defineProperty(it, key, D) {
+	  if (it === ObjectProto) $defineProperty(OPSymbols, key, D);
+	  anObject(it);
+	  key = toPrimitive(key, true);
+	  anObject(D);
+	  if (has(AllSymbols, key)) {
+	    if (!D.enumerable) {
+	      if (!has(it, HIDDEN)) dP(it, HIDDEN, createDesc(1, {}));
+	      it[HIDDEN][key] = true;
+	    } else {
+	      if (has(it, HIDDEN) && it[HIDDEN][key]) it[HIDDEN][key] = false;
+	      D = _create(D, { enumerable: createDesc(0, false) });
+	    }return setSymbolDesc(it, key, D);
+	  }return dP(it, key, D);
+	};
+	var $defineProperties = function defineProperties(it, P) {
+	  anObject(it);
+	  var keys = enumKeys(P = toIObject(P)),
+	      i = 0,
+	      l = keys.length,
+	      key;
+	  while (l > i) {
+	    $defineProperty(it, key = keys[i++], P[key]);
+	  }return it;
+	};
+	var $create = function create(it, P) {
+	  return P === undefined ? _create(it) : $defineProperties(_create(it), P);
+	};
+	var $propertyIsEnumerable = function propertyIsEnumerable(key) {
+	  var E = isEnum.call(this, key = toPrimitive(key, true));
+	  if (this === ObjectProto && has(AllSymbols, key) && !has(OPSymbols, key)) return false;
+	  return E || !has(this, key) || !has(AllSymbols, key) || has(this, HIDDEN) && this[HIDDEN][key] ? E : true;
+	};
+	var $getOwnPropertyDescriptor = function getOwnPropertyDescriptor(it, key) {
+	  it = toIObject(it);
+	  key = toPrimitive(key, true);
+	  if (it === ObjectProto && has(AllSymbols, key) && !has(OPSymbols, key)) return;
+	  var D = gOPD(it, key);
+	  if (D && has(AllSymbols, key) && !(has(it, HIDDEN) && it[HIDDEN][key])) D.enumerable = true;
+	  return D;
+	};
+	var $getOwnPropertyNames = function getOwnPropertyNames(it) {
+	  var names = gOPN(toIObject(it)),
+	      result = [],
+	      i = 0,
+	      key;
+	  while (names.length > i) {
+	    if (!has(AllSymbols, key = names[i++]) && key != HIDDEN && key != META) result.push(key);
+	  }return result;
+	};
+	var $getOwnPropertySymbols = function getOwnPropertySymbols(it) {
+	  var IS_OP = it === ObjectProto,
+	      names = gOPN(IS_OP ? OPSymbols : toIObject(it)),
+	      result = [],
+	      i = 0,
+	      key;
+	  while (names.length > i) {
+	    if (has(AllSymbols, key = names[i++]) && (IS_OP ? has(ObjectProto, key) : true)) result.push(AllSymbols[key]);
+	  }return result;
+	};
+
+	// 19.4.1.1 Symbol([description])
+	if (!USE_NATIVE) {
+	  $Symbol = function _Symbol() {
+	    if (this instanceof $Symbol) throw TypeError('Symbol is not a constructor!');
+	    var tag = uid(arguments.length > 0 ? arguments[0] : undefined);
+	    var $set = function $set(value) {
+	      if (this === ObjectProto) $set.call(OPSymbols, value);
+	      if (has(this, HIDDEN) && has(this[HIDDEN], tag)) this[HIDDEN][tag] = false;
+	      setSymbolDesc(this, tag, createDesc(1, value));
+	    };
+	    if (DESCRIPTORS && setter) setSymbolDesc(ObjectProto, tag, { configurable: true, set: $set });
+	    return wrap(tag);
+	  };
+	  redefine($Symbol[PROTOTYPE], 'toString', function toString() {
+	    return this._k;
+	  });
+
+	  $GOPD.f = $getOwnPropertyDescriptor;
+	  $DP.f = $defineProperty;
+	  __webpack_require__(231).f = gOPNExt.f = $getOwnPropertyNames;
+	  __webpack_require__(91).f = $propertyIsEnumerable;
+	  __webpack_require__(143).f = $getOwnPropertySymbols;
+
+	  if (DESCRIPTORS && !__webpack_require__(142)) {
+	    redefine(ObjectProto, 'propertyIsEnumerable', $propertyIsEnumerable, true);
+	  }
+
+	  wksExt.f = function (name) {
+	    return wrap(wks(name));
+	  };
+	}
+
+	$export($export.G + $export.W + $export.F * !USE_NATIVE, { Symbol: $Symbol });
+
+	for (var symbols =
+	// 19.4.2.2, 19.4.2.3, 19.4.2.4, 19.4.2.6, 19.4.2.8, 19.4.2.9, 19.4.2.10, 19.4.2.11, 19.4.2.12, 19.4.2.13, 19.4.2.14
+	'hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables'.split(','), i = 0; symbols.length > i;) {
+	  wks(symbols[i++]);
+	}for (var symbols = $keys(wks.store), i = 0; symbols.length > i;) {
+	  wksDefine(symbols[i++]);
+	}$export($export.S + $export.F * !USE_NATIVE, 'Symbol', {
+	  // 19.4.2.1 Symbol.for(key)
+	  'for': function _for(key) {
+	    return has(SymbolRegistry, key += '') ? SymbolRegistry[key] : SymbolRegistry[key] = $Symbol(key);
+	  },
+	  // 19.4.2.5 Symbol.keyFor(sym)
+	  keyFor: function keyFor(key) {
+	    if (isSymbol(key)) return keyOf(SymbolRegistry, key);
+	    throw TypeError(key + ' is not a symbol!');
+	  },
+	  useSetter: function useSetter() {
+	    setter = true;
+	  },
+	  useSimple: function useSimple() {
+	    setter = false;
+	  }
+	});
+
+	$export($export.S + $export.F * !USE_NATIVE, 'Object', {
+	  // 19.1.2.2 Object.create(O [, Properties])
+	  create: $create,
+	  // 19.1.2.4 Object.defineProperty(O, P, Attributes)
+	  defineProperty: $defineProperty,
+	  // 19.1.2.3 Object.defineProperties(O, Properties)
+	  defineProperties: $defineProperties,
+	  // 19.1.2.6 Object.getOwnPropertyDescriptor(O, P)
+	  getOwnPropertyDescriptor: $getOwnPropertyDescriptor,
+	  // 19.1.2.7 Object.getOwnPropertyNames(O)
+	  getOwnPropertyNames: $getOwnPropertyNames,
+	  // 19.1.2.8 Object.getOwnPropertySymbols(O)
+	  getOwnPropertySymbols: $getOwnPropertySymbols
+	});
+
+	// 24.3.2 JSON.stringify(value [, replacer [, space]])
+	$JSON && $export($export.S + $export.F * (!USE_NATIVE || $fails(function () {
+	  var S = $Symbol();
+	  // MS Edge converts symbol values to JSON as {}
+	  // WebKit converts symbol values to JSON as null
+	  // V8 throws on boxed symbols
+	  return _stringify([S]) != '[null]' || _stringify({ a: S }) != '{}' || _stringify(Object(S)) != '{}';
+	})), 'JSON', {
+	  stringify: function stringify(it) {
+	    if (it === undefined || isSymbol(it)) return; // IE8 returns string on undefined
+	    var args = [it],
+	        i = 1,
+	        replacer,
+	        $replacer;
+	    while (arguments.length > i) {
+	      args.push(arguments[i++]);
+	    }replacer = args[1];
+	    if (typeof replacer == 'function') $replacer = replacer;
+	    if ($replacer || !isArray(replacer)) replacer = function replacer(key, value) {
+	      if ($replacer) value = $replacer.call(this, key, value);
+	      if (!isSymbol(value)) return value;
+	    };
+	    args[1] = replacer;
+	    return _stringify.apply($JSON, args);
+	  }
+	});
+
+	// 19.4.3.4 Symbol.prototype[@@toPrimitive](hint)
+	$Symbol[PROTOTYPE][TO_PRIMITIVE] || __webpack_require__(28)($Symbol[PROTOTYPE], TO_PRIMITIVE, $Symbol[PROTOTYPE].valueOf);
+	// 19.4.3.5 Symbol.prototype[@@toStringTag]
+	setToStringTag($Symbol, 'Symbol');
+	// 20.2.1.9 Math[@@toStringTag]
+	setToStringTag(Math, 'Math', true);
+	// 24.3.3 JSON[@@toStringTag]
+	setToStringTag(global.JSON, 'JSON', true);
+
+/***/ }),
+/* 155 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getNative = __webpack_require__(38),
+	    root = __webpack_require__(15);
+
+	/* Built-in method references that are verified to be native. */
+	var Map = getNative(root, 'Map');
+
+	module.exports = Map;
+
+/***/ }),
+/* 156 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var mapCacheClear = __webpack_require__(542),
+	    mapCacheDelete = __webpack_require__(543),
+	    mapCacheGet = __webpack_require__(544),
+	    mapCacheHas = __webpack_require__(545),
+	    mapCacheSet = __webpack_require__(546);
+
+	/**
+	 * Creates a map cache object to store key-value pairs.
+	 *
+	 * @private
+	 * @constructor
+	 * @param {Array} [entries] The key-value pairs to cache.
+	 */
+	function MapCache(entries) {
+	    var index = -1,
+	        length = entries == null ? 0 : entries.length;
+
+	    this.clear();
+	    while (++index < length) {
+	        var entry = entries[index];
+	        this.set(entry[0], entry[1]);
+	    }
+	}
+
+	// Add methods to `MapCache`.
+	MapCache.prototype.clear = mapCacheClear;
+	MapCache.prototype['delete'] = mapCacheDelete;
+	MapCache.prototype.get = mapCacheGet;
+	MapCache.prototype.has = mapCacheHas;
+	MapCache.prototype.set = mapCacheSet;
+
+	module.exports = MapCache;
+
+/***/ }),
+/* 157 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Appends the elements of `values` to `array`.
+	 *
+	 * @private
+	 * @param {Array} array The array to modify.
+	 * @param {Array} values The values to append.
+	 * @returns {Array} Returns `array`.
+	 */
+	function arrayPush(array, values) {
+	  var index = -1,
+	      length = values.length,
+	      offset = array.length;
+
+	  while (++index < length) {
+	    array[offset + index] = values[index];
+	  }
+	  return array;
+	}
+
+	module.exports = arrayPush;
+
+/***/ }),
+/* 158 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseAssignValue = __webpack_require__(159),
+	    eq = __webpack_require__(45);
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * Assigns `value` to `key` of `object` if the existing value is not equivalent
+	 * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+	 * for equality comparisons.
+	 *
+	 * @private
+	 * @param {Object} object The object to modify.
+	 * @param {string} key The key of the property to assign.
+	 * @param {*} value The value to assign.
+	 */
+	function assignValue(object, key, value) {
+	  var objValue = object[key];
+	  if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) || value === undefined && !(key in object)) {
+	    baseAssignValue(object, key, value);
+	  }
+	}
+
+	module.exports = assignValue;
+
+/***/ }),
+/* 159 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var defineProperty = __webpack_require__(254);
+
+	/**
+	 * The base implementation of `assignValue` and `assignMergeValue` without
+	 * value checks.
+	 *
+	 * @private
+	 * @param {Object} object The object to modify.
+	 * @param {string} key The key of the property to assign.
+	 * @param {*} value The value to assign.
+	 */
+	function baseAssignValue(object, key, value) {
+	  if (key == '__proto__' && defineProperty) {
+	    defineProperty(object, key, {
+	      'configurable': true,
+	      'enumerable': true,
+	      'value': value,
+	      'writable': true
+	    });
+	  } else {
+	    object[key] = value;
+	  }
+	}
+
+	module.exports = baseAssignValue;
+
+/***/ }),
+/* 160 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var Stack = __webpack_require__(99),
+	    arrayEach = __webpack_require__(469),
+	    assignValue = __webpack_require__(158),
+	    baseAssign = __webpack_require__(474),
+	    baseAssignIn = __webpack_require__(475),
+	    cloneBuffer = __webpack_require__(251),
+	    copyArray = __webpack_require__(164),
+	    copySymbols = __webpack_require__(514),
+	    copySymbolsIn = __webpack_require__(515),
+	    getAllKeys = __webpack_require__(257),
+	    getAllKeysIn = __webpack_require__(523),
+	    getTag = __webpack_require__(259),
+	    initCloneArray = __webpack_require__(532),
+	    initCloneByTag = __webpack_require__(533),
+	    initCloneObject = __webpack_require__(261),
+	    isArray = __webpack_require__(6),
+	    isBuffer = __webpack_require__(113),
+	    isObject = __webpack_require__(16),
+	    keys = __webpack_require__(31);
+
+	/** Used to compose bitmasks for cloning. */
+	var CLONE_DEEP_FLAG = 1,
+	    CLONE_FLAT_FLAG = 2,
+	    CLONE_SYMBOLS_FLAG = 4;
+
+	/** `Object#toString` result references. */
+	var argsTag = '[object Arguments]',
+	    arrayTag = '[object Array]',
+	    boolTag = '[object Boolean]',
+	    dateTag = '[object Date]',
+	    errorTag = '[object Error]',
+	    funcTag = '[object Function]',
+	    genTag = '[object GeneratorFunction]',
+	    mapTag = '[object Map]',
+	    numberTag = '[object Number]',
+	    objectTag = '[object Object]',
+	    regexpTag = '[object RegExp]',
+	    setTag = '[object Set]',
+	    stringTag = '[object String]',
+	    symbolTag = '[object Symbol]',
+	    weakMapTag = '[object WeakMap]';
+
+	var arrayBufferTag = '[object ArrayBuffer]',
+	    dataViewTag = '[object DataView]',
+	    float32Tag = '[object Float32Array]',
+	    float64Tag = '[object Float64Array]',
+	    int8Tag = '[object Int8Array]',
+	    int16Tag = '[object Int16Array]',
+	    int32Tag = '[object Int32Array]',
+	    uint8Tag = '[object Uint8Array]',
+	    uint8ClampedTag = '[object Uint8ClampedArray]',
+	    uint16Tag = '[object Uint16Array]',
+	    uint32Tag = '[object Uint32Array]';
+
+	/** Used to identify `toStringTag` values supported by `_.clone`. */
+	var cloneableTags = {};
+	cloneableTags[argsTag] = cloneableTags[arrayTag] = cloneableTags[arrayBufferTag] = cloneableTags[dataViewTag] = cloneableTags[boolTag] = cloneableTags[dateTag] = cloneableTags[float32Tag] = cloneableTags[float64Tag] = cloneableTags[int8Tag] = cloneableTags[int16Tag] = cloneableTags[int32Tag] = cloneableTags[mapTag] = cloneableTags[numberTag] = cloneableTags[objectTag] = cloneableTags[regexpTag] = cloneableTags[setTag] = cloneableTags[stringTag] = cloneableTags[symbolTag] = cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] = cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
+	cloneableTags[errorTag] = cloneableTags[funcTag] = cloneableTags[weakMapTag] = false;
+
+	/**
+	 * The base implementation of `_.clone` and `_.cloneDeep` which tracks
+	 * traversed objects.
+	 *
+	 * @private
+	 * @param {*} value The value to clone.
+	 * @param {boolean} bitmask The bitmask flags.
+	 *  1 - Deep clone
+	 *  2 - Flatten inherited properties
+	 *  4 - Clone symbols
+	 * @param {Function} [customizer] The function to customize cloning.
+	 * @param {string} [key] The key of `value`.
+	 * @param {Object} [object] The parent object of `value`.
+	 * @param {Object} [stack] Tracks traversed objects and their clone counterparts.
+	 * @returns {*} Returns the cloned value.
+	 */
+	function baseClone(value, bitmask, customizer, key, object, stack) {
+	  var result,
+	      isDeep = bitmask & CLONE_DEEP_FLAG,
+	      isFlat = bitmask & CLONE_FLAT_FLAG,
+	      isFull = bitmask & CLONE_SYMBOLS_FLAG;
+
+	  if (customizer) {
+	    result = object ? customizer(value, key, object, stack) : customizer(value);
+	  }
+	  if (result !== undefined) {
+	    return result;
+	  }
+	  if (!isObject(value)) {
+	    return value;
+	  }
+	  var isArr = isArray(value);
+	  if (isArr) {
+	    result = initCloneArray(value);
+	    if (!isDeep) {
+	      return copyArray(value, result);
+	    }
+	  } else {
+	    var tag = getTag(value),
+	        isFunc = tag == funcTag || tag == genTag;
+
+	    if (isBuffer(value)) {
+	      return cloneBuffer(value, isDeep);
+	    }
+	    if (tag == objectTag || tag == argsTag || isFunc && !object) {
+	      result = isFlat || isFunc ? {} : initCloneObject(value);
+	      if (!isDeep) {
+	        return isFlat ? copySymbolsIn(value, baseAssignIn(result, value)) : copySymbols(value, baseAssign(result, value));
+	      }
+	    } else {
+	      if (!cloneableTags[tag]) {
+	        return object ? value : {};
+	      }
+	      result = initCloneByTag(value, tag, baseClone, isDeep);
+	    }
+	  }
+	  // Check for circular references and return its corresponding clone.
+	  stack || (stack = new Stack());
+	  var stacked = stack.get(value);
+	  if (stacked) {
+	    return stacked;
+	  }
+	  stack.set(value, result);
+
+	  var keysFunc = isFull ? isFlat ? getAllKeysIn : getAllKeys : isFlat ? keysIn : keys;
+
+	  var props = isArr ? undefined : keysFunc(value);
+	  arrayEach(props || value, function (subValue, key) {
+	    if (props) {
+	      key = subValue;
+	      subValue = value[key];
+	    }
+	    // Recursively populate clone (susceptible to call stack limits).
+	    assignValue(result, key, baseClone(subValue, bitmask, customizer, key, value, stack));
+	  });
+	  return result;
+	}
+
+	module.exports = baseClone;
+
+/***/ }),
+/* 161 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * The base implementation of `_.findIndex` and `_.findLastIndex` without
+	 * support for iteratee shorthands.
+	 *
+	 * @private
+	 * @param {Array} array The array to inspect.
+	 * @param {Function} predicate The function invoked per iteration.
+	 * @param {number} fromIndex The index to search from.
+	 * @param {boolean} [fromRight] Specify iterating from right to left.
+	 * @returns {number} Returns the index of the matched value, else `-1`.
+	 */
+	function baseFindIndex(array, predicate, fromIndex, fromRight) {
+	  var length = array.length,
+	      index = fromIndex + (fromRight ? 1 : -1);
+
+	  while (fromRight ? index-- : ++index < length) {
+	    if (predicate(array[index], index, array)) {
+	      return index;
+	    }
+	  }
+	  return -1;
+	}
+
+	module.exports = baseFindIndex;
+
+/***/ }),
+/* 162 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseFindIndex = __webpack_require__(161),
+	    baseIsNaN = __webpack_require__(487),
+	    strictIndexOf = __webpack_require__(561);
+
+	/**
+	 * The base implementation of `_.indexOf` without `fromIndex` bounds checks.
+	 *
+	 * @private
+	 * @param {Array} array The array to inspect.
+	 * @param {*} value The value to search for.
+	 * @param {number} fromIndex The index to search from.
+	 * @returns {number} Returns the index of the matched value, else `-1`.
+	 */
+	function baseIndexOf(array, value, fromIndex) {
+	    return value === value ? strictIndexOf(array, value, fromIndex) : baseFindIndex(array, baseIsNaN, fromIndex);
+	}
+
+	module.exports = baseIndexOf;
+
+/***/ }),
+/* 163 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var Uint8Array = __webpack_require__(238);
+
+	/**
+	 * Creates a clone of `arrayBuffer`.
+	 *
+	 * @private
+	 * @param {ArrayBuffer} arrayBuffer The array buffer to clone.
+	 * @returns {ArrayBuffer} Returns the cloned array buffer.
+	 */
+	function cloneArrayBuffer(arrayBuffer) {
+	  var result = new arrayBuffer.constructor(arrayBuffer.byteLength);
+	  new Uint8Array(result).set(new Uint8Array(arrayBuffer));
+	  return result;
+	}
+
+	module.exports = cloneArrayBuffer;
+
+/***/ }),
+/* 164 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Copies the values of `source` to `array`.
+	 *
+	 * @private
+	 * @param {Array} source The array to copy values from.
+	 * @param {Array} [array=[]] The array to copy values to.
+	 * @returns {Array} Returns `array`.
+	 */
+	function copyArray(source, array) {
+	  var index = -1,
+	      length = source.length;
+
+	  array || (array = Array(length));
+	  while (++index < length) {
+	    array[index] = source[index];
+	  }
+	  return array;
+	}
+
+	module.exports = copyArray;
+
+/***/ }),
+/* 165 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var overArg = __webpack_require__(266);
+
+	/** Built-in value references. */
+	var getPrototype = overArg(Object.getPrototypeOf, Object);
+
+	module.exports = getPrototype;
+
+/***/ }),
+/* 166 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var arrayFilter = __webpack_require__(470),
+	    stubArray = __webpack_require__(274);
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Built-in value references. */
+	var propertyIsEnumerable = objectProto.propertyIsEnumerable;
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeGetSymbols = Object.getOwnPropertySymbols;
+
+	/**
+	 * Creates an array of the own enumerable symbols of `object`.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the array of symbols.
+	 */
+	var getSymbols = !nativeGetSymbols ? stubArray : function (object) {
+	  if (object == null) {
+	    return [];
+	  }
+	  object = Object(object);
+	  return arrayFilter(nativeGetSymbols(object), function (symbol) {
+	    return propertyIsEnumerable.call(object, symbol);
+	  });
+	};
+
+	module.exports = getSymbols;
+
+/***/ }),
+/* 167 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/** Used as references for various `Number` constants. */
+	var MAX_SAFE_INTEGER = 9007199254740991;
+
+	/** Used to detect unsigned integer values. */
+	var reIsUint = /^(?:0|[1-9]\d*)$/;
+
+	/**
+	 * Checks if `value` is a valid array-like index.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
+	 * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
+	 */
+	function isIndex(value, length) {
+	  length = length == null ? MAX_SAFE_INTEGER : length;
+	  return !!length && (typeof value == 'number' || reIsUint.test(value)) && value > -1 && value % 1 == 0 && value < length;
+	}
+
+	module.exports = isIndex;
+
+/***/ }),
+/* 168 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var eq = __webpack_require__(45),
+	    isArrayLike = __webpack_require__(24),
+	    isIndex = __webpack_require__(167),
+	    isObject = __webpack_require__(16);
+
+	/**
+	 * Checks if the given arguments are from an iteratee call.
+	 *
+	 * @private
+	 * @param {*} value The potential iteratee value argument.
+	 * @param {*} index The potential iteratee index or key argument.
+	 * @param {*} object The potential iteratee object argument.
+	 * @returns {boolean} Returns `true` if the arguments are from an iteratee call,
+	 *  else `false`.
+	 */
+	function isIterateeCall(value, index, object) {
+	  if (!isObject(object)) {
+	    return false;
+	  }
+	  var type = typeof index === 'undefined' ? 'undefined' : _typeof(index);
+	  if (type == 'number' ? isArrayLike(object) && isIndex(index, object.length) : type == 'string' && index in object) {
+	    return eq(object[index], value);
+	  }
+	  return false;
+	}
+
+	module.exports = isIterateeCall;
+
+/***/ }),
+/* 169 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var isArray = __webpack_require__(6),
+	    isSymbol = __webpack_require__(60);
+
+	/** Used to match property names within property paths. */
+	var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,
+	    reIsPlainProp = /^\w*$/;
+
+	/**
+	 * Checks if `value` is a property name and not a property path.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @param {Object} [object] The object to query keys on.
+	 * @returns {boolean} Returns `true` if `value` is a property name, else `false`.
+	 */
+	function isKey(value, object) {
+	  if (isArray(value)) {
+	    return false;
+	  }
+	  var type = typeof value === 'undefined' ? 'undefined' : _typeof(value);
+	  if (type == 'number' || type == 'symbol' || type == 'boolean' || value == null || isSymbol(value)) {
+	    return true;
+	  }
+	  return reIsPlainProp.test(value) || !reIsDeepProp.test(value) || object != null && value in Object(object);
+	}
+
+	module.exports = isKey;
+
+/***/ }),
+/* 170 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var assignValue = __webpack_require__(158),
+	    copyObject = __webpack_require__(30),
+	    createAssigner = __webpack_require__(103),
+	    isArrayLike = __webpack_require__(24),
+	    isPrototype = __webpack_require__(105),
+	    keys = __webpack_require__(31);
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * Assigns own enumerable string keyed properties of source objects to the
+	 * destination object. Source objects are applied from left to right.
+	 * Subsequent sources overwrite property assignments of previous sources.
+	 *
+	 * **Note:** This method mutates `object` and is loosely based on
+	 * [`Object.assign`](https://mdn.io/Object/assign).
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.10.0
+	 * @category Object
+	 * @param {Object} object The destination object.
+	 * @param {...Object} [sources] The source objects.
+	 * @returns {Object} Returns `object`.
+	 * @see _.assignIn
+	 * @example
+	 *
+	 * function Foo() {
+	 *   this.a = 1;
+	 * }
+	 *
+	 * function Bar() {
+	 *   this.c = 3;
+	 * }
+	 *
+	 * Foo.prototype.b = 2;
+	 * Bar.prototype.d = 4;
+	 *
+	 * _.assign({ 'a': 0 }, new Foo, new Bar);
+	 * // => { 'a': 1, 'c': 3 }
+	 */
+	var assign = createAssigner(function (object, source) {
+	  if (isPrototype(source) || isArrayLike(source)) {
+	    copyObject(source, keys(source), object);
+	    return;
+	  }
+	  for (var key in source) {
+	    if (hasOwnProperty.call(source, key)) {
+	      assignValue(object, key, source[key]);
+	    }
+	  }
+	});
+
+	module.exports = assign;
+
+/***/ }),
+/* 171 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseGetTag = __webpack_require__(29),
+	    isObject = __webpack_require__(16);
+
+	/** `Object#toString` result references. */
+	var asyncTag = '[object AsyncFunction]',
+	    funcTag = '[object Function]',
+	    genTag = '[object GeneratorFunction]',
+	    proxyTag = '[object Proxy]';
+
+	/**
+	 * Checks if `value` is classified as a `Function` object.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a function, else `false`.
+	 * @example
+	 *
+	 * _.isFunction(_);
+	 * // => true
+	 *
+	 * _.isFunction(/abc/);
+	 * // => false
+	 */
+	function isFunction(value) {
+	    if (!isObject(value)) {
+	        return false;
+	    }
+	    // The use of `Object#toString` avoids issues with the `typeof` operator
+	    // in Safari 9 which returns 'object' for typed arrays and other constructors.
+	    var tag = baseGetTag(value);
+	    return tag == funcTag || tag == genTag || tag == asyncTag || tag == proxyTag;
+	}
+
+	module.exports = isFunction;
+
+/***/ }),
+/* 172 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/** Used as references for various `Number` constants. */
+	var MAX_SAFE_INTEGER = 9007199254740991;
+
+	/**
+	 * Checks if `value` is a valid array-like length.
+	 *
+	 * **Note:** This method is loosely based on
+	 * [`ToLength`](http://ecma-international.org/ecma-262/7.0/#sec-tolength).
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a valid length, else `false`.
+	 * @example
+	 *
+	 * _.isLength(3);
+	 * // => true
+	 *
+	 * _.isLength(Number.MIN_VALUE);
+	 * // => false
+	 *
+	 * _.isLength(Infinity);
+	 * // => false
+	 *
+	 * _.isLength('3');
+	 * // => false
+	 */
+	function isLength(value) {
+	  return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+	}
+
+	module.exports = isLength;
+
+/***/ }),
+/* 173 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseIsTypedArray = __webpack_require__(490),
+	    baseUnary = __webpack_require__(102),
+	    nodeUtil = __webpack_require__(265);
+
+	/* Node.js helper references. */
+	var nodeIsTypedArray = nodeUtil && nodeUtil.isTypedArray;
+
+	/**
+	 * Checks if `value` is classified as a typed array.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 3.0.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a typed array, else `false`.
+	 * @example
+	 *
+	 * _.isTypedArray(new Uint8Array);
+	 * // => true
+	 *
+	 * _.isTypedArray([]);
+	 * // => false
+	 */
+	var isTypedArray = nodeIsTypedArray ? baseUnary(nodeIsTypedArray) : baseIsTypedArray;
+
+	module.exports = isTypedArray;
+
+/***/ }),
+/* 174 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var map = {
+		"./index": 49,
+		"./index.js": 49,
+		"./logger": 119,
+		"./logger.js": 119,
+		"./metadata": 120,
+		"./metadata.js": 120,
+		"./options/build-config-chain": 50,
+		"./options/build-config-chain.js": 50,
+		"./options/config": 32,
+		"./options/config.js": 32,
+		"./options/index": 51,
+		"./options/index.js": 51,
+		"./options/option-manager": 33,
+		"./options/option-manager.js": 33,
+		"./options/parsers": 52,
+		"./options/parsers.js": 52,
+		"./options/removed": 53,
+		"./options/removed.js": 53
+	};
+	function webpackContext(req) {
+		return __webpack_require__(webpackContextResolve(req));
+	};
+	function webpackContextResolve(req) {
+		return map[req] || (function() { throw new Error("Cannot find module '" + req + "'.") }());
+	};
+	webpackContext.keys = function webpackContextKeys() {
+		return Object.keys(map);
+	};
+	webpackContext.resolve = webpackContextResolve;
+	module.exports = webpackContext;
+	webpackContext.id = 174;
+
+
+/***/ }),
+/* 175 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var map = {
+		"./build-config-chain": 50,
+		"./build-config-chain.js": 50,
+		"./config": 32,
+		"./config.js": 32,
+		"./index": 51,
+		"./index.js": 51,
+		"./option-manager": 33,
+		"./option-manager.js": 33,
+		"./parsers": 52,
+		"./parsers.js": 52,
+		"./removed": 53,
+		"./removed.js": 53
+	};
+	function webpackContext(req) {
+		return __webpack_require__(webpackContextResolve(req));
+	};
+	function webpackContextResolve(req) {
+		return map[req] || (function() { throw new Error("Cannot find module '" + req + "'.") }());
+	};
+	webpackContext.keys = function webpackContextKeys() {
+		return Object.keys(map);
+	};
+	webpackContext.resolve = webpackContextResolve;
+	module.exports = webpackContext;
+	webpackContext.id = 175;
+
+
+/***/ }),
+/* 176 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	module.exports = function () {
+		return (/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-PRZcf-nqry=><]/g
+		);
+	};
+
+/***/ }),
+/* 177 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (rawLines, lineNumber, colNumber) {
+	  var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+
+	  colNumber = Math.max(colNumber, 0);
+
+	  var highlighted = opts.highlightCode && _chalk2.default.supportsColor || opts.forceColor;
+	  var chalk = _chalk2.default;
+	  if (opts.forceColor) {
+	    chalk = new _chalk2.default.constructor({ enabled: true });
+	  }
+	  var maybeHighlight = function maybeHighlight(chalkFn, string) {
+	    return highlighted ? chalkFn(string) : string;
+	  };
+	  var defs = getDefs(chalk);
+	  if (highlighted) rawLines = highlight(defs, rawLines);
+
+	  var linesAbove = opts.linesAbove || 2;
+	  var linesBelow = opts.linesBelow || 3;
+
+	  var lines = rawLines.split(NEWLINE);
+	  var start = Math.max(lineNumber - (linesAbove + 1), 0);
+	  var end = Math.min(lines.length, lineNumber + linesBelow);
+
+	  if (!lineNumber && !colNumber) {
+	    start = 0;
+	    end = lines.length;
+	  }
+
+	  var numberMaxWidth = String(end).length;
+
+	  var frame = lines.slice(start, end).map(function (line, index) {
+	    var number = start + 1 + index;
+	    var paddedNumber = (" " + number).slice(-numberMaxWidth);
+	    var gutter = " " + paddedNumber + " | ";
+	    if (number === lineNumber) {
+	      var markerLine = "";
+	      if (colNumber) {
+	        var markerSpacing = line.slice(0, colNumber - 1).replace(/[^\t]/g, " ");
+	        markerLine = ["\n ", maybeHighlight(defs.gutter, gutter.replace(/\d/g, " ")), markerSpacing, maybeHighlight(defs.marker, "^")].join("");
+	      }
+	      return [maybeHighlight(defs.marker, ">"), maybeHighlight(defs.gutter, gutter), line, markerLine].join("");
+	    } else {
+	      return " " + maybeHighlight(defs.gutter, gutter) + line;
+	    }
+	  }).join("\n");
+
+	  if (highlighted) {
+	    return chalk.reset(frame);
+	  } else {
+	    return frame;
+	  }
+	};
+
+	var _jsTokens = __webpack_require__(459);
+
+	var _jsTokens2 = _interopRequireDefault(_jsTokens);
+
+	var _esutils = __webpack_require__(97);
+
+	var _esutils2 = _interopRequireDefault(_esutils);
+
+	var _chalk = __webpack_require__(397);
+
+	var _chalk2 = _interopRequireDefault(_chalk);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function getDefs(chalk) {
+	  return {
+	    keyword: chalk.cyan,
+	    capitalized: chalk.yellow,
+	    jsx_tag: chalk.yellow,
+	    punctuator: chalk.yellow,
+
+	    number: chalk.magenta,
+	    string: chalk.green,
+	    regex: chalk.magenta,
+	    comment: chalk.grey,
+	    invalid: chalk.white.bgRed.bold,
+	    gutter: chalk.grey,
+	    marker: chalk.red.bold
+	  };
+	}
+
+	var NEWLINE = /\r\n|[\n\r\u2028\u2029]/;
+
+	var JSX_TAG = /^[a-z][\w-]*$/i;
+
+	var BRACKET = /^[()\[\]{}]$/;
+
+	function getTokenType(match) {
+	  var _match$slice = match.slice(-2),
+	      offset = _match$slice[0],
+	      text = _match$slice[1];
+
+	  var token = (0, _jsTokens.matchToToken)(match);
+
+	  if (token.type === "name") {
+	    if (_esutils2.default.keyword.isReservedWordES6(token.value)) {
+	      return "keyword";
+	    }
+
+	    if (JSX_TAG.test(token.value) && (text[offset - 1] === "<" || text.substr(offset - 2, 2) == "</")) {
+	      return "jsx_tag";
+	    }
+
+	    if (token.value[0] !== token.value[0].toLowerCase()) {
+	      return "capitalized";
+	    }
+	  }
+
+	  if (token.type === "punctuator" && BRACKET.test(token.value)) {
+	    return "bracket";
+	  }
+
+	  return token.type;
+	}
+
+	function highlight(defs, text) {
+	  return text.replace(_jsTokens2.default, function () {
+	    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+	      args[_key] = arguments[_key];
+	    }
+
+	    var type = getTokenType(args);
+	    var colorize = defs[type];
+	    if (colorize) {
+	      return args[0].split(NEWLINE).map(function (str) {
+	        return colorize(str);
+	      }).join("\n");
+	    } else {
+	      return args[0];
+	    }
+	  });
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 178 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.transformFromAst = exports.transform = exports.analyse = exports.Pipeline = exports.OptionManager = exports.traverse = exports.types = exports.messages = exports.util = exports.version = exports.resolvePreset = exports.resolvePlugin = exports.template = exports.buildExternalHelpers = exports.options = exports.File = undefined;
+
+	var _file = __webpack_require__(49);
+
+	Object.defineProperty(exports, "File", {
+	  enumerable: true,
+	  get: function get() {
+	    return _interopRequireDefault(_file).default;
+	  }
+	});
+
+	var _config = __webpack_require__(32);
+
+	Object.defineProperty(exports, "options", {
+	  enumerable: true,
+	  get: function get() {
+	    return _interopRequireDefault(_config).default;
+	  }
+	});
+
+	var _buildExternalHelpers = __webpack_require__(291);
+
+	Object.defineProperty(exports, "buildExternalHelpers", {
+	  enumerable: true,
+	  get: function get() {
+	    return _interopRequireDefault(_buildExternalHelpers).default;
+	  }
+	});
+
+	var _babelTemplate = __webpack_require__(4);
+
+	Object.defineProperty(exports, "template", {
+	  enumerable: true,
+	  get: function get() {
+	    return _interopRequireDefault(_babelTemplate).default;
+	  }
+	});
+
+	var _resolvePlugin = __webpack_require__(180);
+
+	Object.defineProperty(exports, "resolvePlugin", {
+	  enumerable: true,
+	  get: function get() {
+	    return _interopRequireDefault(_resolvePlugin).default;
+	  }
+	});
+
+	var _resolvePreset = __webpack_require__(181);
+
+	Object.defineProperty(exports, "resolvePreset", {
+	  enumerable: true,
+	  get: function get() {
+	    return _interopRequireDefault(_resolvePreset).default;
+	  }
+	});
+
+	var _package = __webpack_require__(619);
+
+	Object.defineProperty(exports, "version", {
+	  enumerable: true,
+	  get: function get() {
+	    return _package.version;
+	  }
+	});
+	exports.Plugin = Plugin;
+	exports.transformFile = transformFile;
+	exports.transformFileSync = transformFileSync;
+
+	var _fs = __webpack_require__(115);
+
+	var _fs2 = _interopRequireDefault(_fs);
+
+	var _util = __webpack_require__(121);
+
+	var util = _interopRequireWildcard(_util);
+
+	var _babelMessages = __webpack_require__(18);
+
+	var messages = _interopRequireWildcard(_babelMessages);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _babelTraverse = __webpack_require__(7);
+
+	var _babelTraverse2 = _interopRequireDefault(_babelTraverse);
+
+	var _optionManager = __webpack_require__(33);
+
+	var _optionManager2 = _interopRequireDefault(_optionManager);
+
+	var _pipeline = __webpack_require__(294);
+
+	var _pipeline2 = _interopRequireDefault(_pipeline);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.util = util;
+	exports.messages = messages;
+	exports.types = t;
+	exports.traverse = _babelTraverse2.default;
+	exports.OptionManager = _optionManager2.default;
+	function Plugin(alias) {
+	  throw new Error("The (" + alias + ") Babel 5 plugin is being run with Babel 6.");
+	}
+
+	exports.Pipeline = _pipeline2.default;
+
+	var pipeline = new _pipeline2.default();
+	var analyse = exports.analyse = pipeline.analyse.bind(pipeline);
+	var transform = exports.transform = pipeline.transform.bind(pipeline);
+	var transformFromAst = exports.transformFromAst = pipeline.transformFromAst.bind(pipeline);
+
+	function transformFile(filename, opts, callback) {
+	  if (typeof opts === "function") {
+	    callback = opts;
+	    opts = {};
+	  }
+
+	  opts.filename = filename;
+
+	  _fs2.default.readFile(filename, function (err, code) {
+	    var result = void 0;
+
+	    if (!err) {
+	      try {
+	        result = transform(code, opts);
+	      } catch (_err) {
+	        err = _err;
+	      }
+	    }
+
+	    if (err) {
+	      callback(err);
+	    } else {
+	      callback(null, result);
+	    }
+	  });
+	}
+
+	function transformFileSync(filename) {
+	  var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+	  opts.filename = filename;
+	  return transform(_fs2.default.readFileSync(filename, "utf8"), opts);
+	}
+
+/***/ }),
+/* 179 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.default = resolveFromPossibleNames;
+
+	var _resolve = __webpack_require__(117);
+
+	var _resolve2 = _interopRequireDefault(_resolve);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function resolveFromPossibleNames(possibleNames, dirname) {
+	  return possibleNames.reduce(function (accum, curr) {
+	    return accum || (0, _resolve2.default)(curr, dirname);
+	  }, null);
+	}
+	module.exports = exports["default"];
+
+/***/ }),
+/* 180 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {"use strict";
+
+	exports.__esModule = true;
+	exports.default = resolvePlugin;
+
+	var _resolveFromPossibleNames = __webpack_require__(179);
+
+	var _resolveFromPossibleNames2 = _interopRequireDefault(_resolveFromPossibleNames);
+
+	var _getPossiblePluginNames = __webpack_require__(287);
+
+	var _getPossiblePluginNames2 = _interopRequireDefault(_getPossiblePluginNames);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function resolvePlugin(pluginName) {
+	  var dirname = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : process.cwd();
+
+	  return (0, _resolveFromPossibleNames2.default)((0, _getPossiblePluginNames2.default)(pluginName), dirname);
+	}
+	module.exports = exports["default"];
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 181 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {"use strict";
+
+	exports.__esModule = true;
+	exports.default = resolvePreset;
+
+	var _resolveFromPossibleNames = __webpack_require__(179);
+
+	var _resolveFromPossibleNames2 = _interopRequireDefault(_resolveFromPossibleNames);
+
+	var _getPossiblePresetNames = __webpack_require__(288);
+
+	var _getPossiblePresetNames2 = _interopRequireDefault(_getPossiblePresetNames);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function resolvePreset(presetName) {
+	  var dirname = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : process.cwd();
+
+	  return (0, _resolveFromPossibleNames2.default)((0, _getPossiblePresetNames2.default)(presetName), dirname);
+	}
+	module.exports = exports["default"];
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 182 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.CodeGenerator = undefined;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _possibleConstructorReturn2 = __webpack_require__(42);
+
+	var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+	var _inherits2 = __webpack_require__(41);
+
+	var _inherits3 = _interopRequireDefault(_inherits2);
+
+	exports.default = function (ast, opts, code) {
+	  var gen = new Generator(ast, opts, code);
+	  return gen.generate();
+	};
+
+	var _detectIndent = __webpack_require__(450);
+
+	var _detectIndent2 = _interopRequireDefault(_detectIndent);
+
+	var _sourceMap = __webpack_require__(309);
+
+	var _sourceMap2 = _interopRequireDefault(_sourceMap);
+
+	var _babelMessages = __webpack_require__(18);
+
+	var messages = _interopRequireWildcard(_babelMessages);
+
+	var _printer = __webpack_require__(308);
+
+	var _printer2 = _interopRequireDefault(_printer);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var Generator = function (_Printer) {
+	  (0, _inherits3.default)(Generator, _Printer);
+
+	  function Generator(ast) {
+	    var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	    var code = arguments[2];
+	    (0, _classCallCheck3.default)(this, Generator);
+
+	    var tokens = ast.tokens || [];
+	    var format = normalizeOptions(code, opts, tokens);
+	    var map = opts.sourceMaps ? new _sourceMap2.default(opts, code) : null;
+
+	    var _this = (0, _possibleConstructorReturn3.default)(this, _Printer.call(this, format, map, tokens));
+
+	    _this.ast = ast;
+	    return _this;
+	  }
+
+	  Generator.prototype.generate = function generate() {
+	    return _Printer.prototype.generate.call(this, this.ast);
+	  };
+
+	  return Generator;
+	}(_printer2.default);
+
+	function normalizeOptions(code, opts, tokens) {
+	  var style = "  ";
+	  if (code && typeof code === "string") {
+	    var indent = (0, _detectIndent2.default)(code).indent;
+	    if (indent && indent !== " ") style = indent;
+	  }
+
+	  var format = {
+	    auxiliaryCommentBefore: opts.auxiliaryCommentBefore,
+	    auxiliaryCommentAfter: opts.auxiliaryCommentAfter,
+	    shouldPrintComment: opts.shouldPrintComment,
+	    retainLines: opts.retainLines,
+	    retainFunctionParens: opts.retainFunctionParens,
+	    comments: opts.comments == null || opts.comments,
+	    compact: opts.compact,
+	    minified: opts.minified,
+	    concise: opts.concise,
+	    quotes: opts.quotes || findCommonStringDelimiter(code, tokens),
+	    jsonCompatibleStrings: opts.jsonCompatibleStrings,
+	    indent: {
+	      adjustMultilineComment: true,
+	      style: style,
+	      base: 0
+	    },
+	    flowCommaSeparator: opts.flowCommaSeparator
+	  };
+
+	  if (format.minified) {
+	    format.compact = true;
+
+	    format.shouldPrintComment = format.shouldPrintComment || function () {
+	      return format.comments;
+	    };
+	  } else {
+	    format.shouldPrintComment = format.shouldPrintComment || function (value) {
+	      return format.comments || value.indexOf("@license") >= 0 || value.indexOf("@preserve") >= 0;
+	    };
+	  }
+
+	  if (format.compact === "auto") {
+	    format.compact = code.length > 500000;
+
+	    if (format.compact) {
+	      console.error("[BABEL] " + messages.get("codeGeneratorDeopt", opts.filename, "500KB"));
+	    }
+	  }
+
+	  if (format.compact) {
+	    format.indent.adjustMultilineComment = false;
+	  }
+
+	  return format;
+	}
+
+	function findCommonStringDelimiter(code, tokens) {
+	  var DEFAULT_STRING_DELIMITER = "double";
+	  if (!code) {
+	    return DEFAULT_STRING_DELIMITER;
+	  }
+
+	  var occurrences = {
+	    single: 0,
+	    double: 0
+	  };
+
+	  var checked = 0;
+
+	  for (var i = 0; i < tokens.length; i++) {
+	    var token = tokens[i];
+	    if (token.type.label !== "string") continue;
+
+	    var raw = code.slice(token.start, token.end);
+	    if (raw[0] === "'") {
+	      occurrences.single++;
+	    } else {
+	      occurrences.double++;
+	    }
+
+	    checked++;
+	    if (checked >= 3) break;
+	  }
+	  if (occurrences.single > occurrences.double) {
+	    return "single";
+	  } else {
+	    return "double";
+	  }
+	}
+
+	var CodeGenerator = exports.CodeGenerator = function () {
+	  function CodeGenerator(ast, opts, code) {
+	    (0, _classCallCheck3.default)(this, CodeGenerator);
+
+	    this._generator = new Generator(ast, opts, code);
+	  }
+
+	  CodeGenerator.prototype.generate = function generate() {
+	    return this._generator.generate();
+	  };
+
+	  return CodeGenerator;
+	}();
+
+/***/ }),
+/* 183 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _keys = __webpack_require__(13);
+
+	var _keys2 = _interopRequireDefault(_keys);
+
+	exports.needsWhitespace = needsWhitespace;
+	exports.needsWhitespaceBefore = needsWhitespaceBefore;
+	exports.needsWhitespaceAfter = needsWhitespaceAfter;
+	exports.needsParens = needsParens;
+
+	var _whitespace = __webpack_require__(307);
+
+	var _whitespace2 = _interopRequireDefault(_whitespace);
+
+	var _parentheses = __webpack_require__(306);
+
+	var parens = _interopRequireWildcard(_parentheses);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function expandAliases(obj) {
+	  var newObj = {};
+
+	  function add(type, func) {
+	    var fn = newObj[type];
+	    newObj[type] = fn ? function (node, parent, stack) {
+	      var result = fn(node, parent, stack);
+
+	      return result == null ? func(node, parent, stack) : result;
+	    } : func;
+	  }
+
+	  for (var _iterator = (0, _keys2.default)(obj), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var type = _ref;
+
+	    var aliases = t.FLIPPED_ALIAS_KEYS[type];
+	    if (aliases) {
+	      for (var _iterator2 = aliases, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	        var _ref2;
+
+	        if (_isArray2) {
+	          if (_i2 >= _iterator2.length) break;
+	          _ref2 = _iterator2[_i2++];
+	        } else {
+	          _i2 = _iterator2.next();
+	          if (_i2.done) break;
+	          _ref2 = _i2.value;
+	        }
+
+	        var alias = _ref2;
+
+	        add(alias, obj[type]);
+	      }
+	    } else {
+	      add(type, obj[type]);
+	    }
+	  }
+
+	  return newObj;
+	}
+
+	var expandedParens = expandAliases(parens);
+	var expandedWhitespaceNodes = expandAliases(_whitespace2.default.nodes);
+	var expandedWhitespaceList = expandAliases(_whitespace2.default.list);
+
+	function find(obj, node, parent, printStack) {
+	  var fn = obj[node.type];
+	  return fn ? fn(node, parent, printStack) : null;
+	}
+
+	function isOrHasCallExpression(node) {
+	  if (t.isCallExpression(node)) {
+	    return true;
+	  }
+
+	  if (t.isMemberExpression(node)) {
+	    return isOrHasCallExpression(node.object) || !node.computed && isOrHasCallExpression(node.property);
+	  } else {
+	    return false;
+	  }
+	}
+
+	function needsWhitespace(node, parent, type) {
+	  if (!node) return 0;
+
+	  if (t.isExpressionStatement(node)) {
+	    node = node.expression;
+	  }
+
+	  var linesInfo = find(expandedWhitespaceNodes, node, parent);
+
+	  if (!linesInfo) {
+	    var items = find(expandedWhitespaceList, node, parent);
+	    if (items) {
+	      for (var i = 0; i < items.length; i++) {
+	        linesInfo = needsWhitespace(items[i], node, type);
+	        if (linesInfo) break;
+	      }
+	    }
+	  }
+
+	  return linesInfo && linesInfo[type] || 0;
+	}
+
+	function needsWhitespaceBefore(node, parent) {
+	  return needsWhitespace(node, parent, "before");
+	}
+
+	function needsWhitespaceAfter(node, parent) {
+	  return needsWhitespace(node, parent, "after");
+	}
+
+	function needsParens(node, parent, printStack) {
+	  if (!parent) return false;
+
+	  if (t.isNewExpression(parent) && parent.callee === node) {
+	    if (isOrHasCallExpression(node)) return true;
+	  }
+
+	  return find(expandedParens, node, parent, printStack);
+	}
+
+/***/ }),
+/* 184 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _keys = __webpack_require__(13);
+
+	var _keys2 = _interopRequireDefault(_keys);
+
+	exports.push = push;
+	exports.hasComputed = hasComputed;
+	exports.toComputedObjectFromClass = toComputedObjectFromClass;
+	exports.toClassObject = toClassObject;
+	exports.toDefineObject = toDefineObject;
+
+	var _babelHelperFunctionName = __webpack_require__(40);
+
+	var _babelHelperFunctionName2 = _interopRequireDefault(_babelHelperFunctionName);
+
+	var _has = __webpack_require__(269);
+
+	var _has2 = _interopRequireDefault(_has);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function toKind(node) {
+	  if (t.isClassMethod(node) || t.isObjectMethod(node)) {
+	    if (node.kind === "get" || node.kind === "set") {
+	      return node.kind;
+	    }
+	  }
+
+	  return "value";
+	}
+
+	function push(mutatorMap, node, kind, file, scope) {
+	  var alias = t.toKeyAlias(node);
+
+	  var map = {};
+	  if ((0, _has2.default)(mutatorMap, alias)) map = mutatorMap[alias];
+	  mutatorMap[alias] = map;
+
+	  map._inherits = map._inherits || [];
+	  map._inherits.push(node);
+
+	  map._key = node.key;
+
+	  if (node.computed) {
+	    map._computed = true;
+	  }
+
+	  if (node.decorators) {
+	    var decorators = map.decorators = map.decorators || t.arrayExpression([]);
+	    decorators.elements = decorators.elements.concat(node.decorators.map(function (dec) {
+	      return dec.expression;
+	    }).reverse());
+	  }
+
+	  if (map.value || map.initializer) {
+	    throw file.buildCodeFrameError(node, "Key conflict with sibling node");
+	  }
+
+	  var key = void 0,
+	      value = void 0;
+
+	  if (t.isObjectProperty(node) || t.isObjectMethod(node) || t.isClassMethod(node)) {
+	    key = t.toComputedKey(node, node.key);
+	  }
+
+	  if (t.isObjectProperty(node) || t.isClassProperty(node)) {
+	    value = node.value;
+	  } else if (t.isObjectMethod(node) || t.isClassMethod(node)) {
+	    value = t.functionExpression(null, node.params, node.body, node.generator, node.async);
+	    value.returnType = node.returnType;
+	  }
+
+	  var inheritedKind = toKind(node);
+	  if (!kind || inheritedKind !== "value") {
+	    kind = inheritedKind;
+	  }
+
+	  if (scope && t.isStringLiteral(key) && (kind === "value" || kind === "initializer") && t.isFunctionExpression(value)) {
+	    value = (0, _babelHelperFunctionName2.default)({ id: key, node: value, scope: scope });
+	  }
+
+	  if (value) {
+	    t.inheritsComments(value, node);
+	    map[kind] = value;
+	  }
+
+	  return map;
+	}
+
+	function hasComputed(mutatorMap) {
+	  for (var key in mutatorMap) {
+	    if (mutatorMap[key]._computed) {
+	      return true;
+	    }
+	  }
+	  return false;
+	}
+
+	function toComputedObjectFromClass(obj) {
+	  var objExpr = t.arrayExpression([]);
+
+	  for (var i = 0; i < obj.properties.length; i++) {
+	    var prop = obj.properties[i];
+	    var val = prop.value;
+	    val.properties.unshift(t.objectProperty(t.identifier("key"), t.toComputedKey(prop)));
+	    objExpr.elements.push(val);
+	  }
+
+	  return objExpr;
+	}
+
+	function toClassObject(mutatorMap) {
+	  var objExpr = t.objectExpression([]);
+
+	  (0, _keys2.default)(mutatorMap).forEach(function (mutatorMapKey) {
+	    var map = mutatorMap[mutatorMapKey];
+	    var mapNode = t.objectExpression([]);
+
+	    var propNode = t.objectProperty(map._key, mapNode, map._computed);
+
+	    (0, _keys2.default)(map).forEach(function (key) {
+	      var node = map[key];
+	      if (key[0] === "_") return;
+
+	      var inheritNode = node;
+	      if (t.isClassMethod(node) || t.isClassProperty(node)) node = node.value;
+
+	      var prop = t.objectProperty(t.identifier(key), node);
+	      t.inheritsComments(prop, inheritNode);
+	      t.removeComments(inheritNode);
+
+	      mapNode.properties.push(prop);
+	    });
+
+	    objExpr.properties.push(propNode);
+	  });
+
+	  return objExpr;
+	}
+
+	function toDefineObject(mutatorMap) {
+	  (0, _keys2.default)(mutatorMap).forEach(function (key) {
+	    var map = mutatorMap[key];
+	    if (map.value) map.writable = t.booleanLiteral(true);
+	    map.configurable = t.booleanLiteral(true);
+	    map.enumerable = t.booleanLiteral(true);
+	  });
+
+	  return toClassObject(mutatorMap);
+	}
+
+/***/ }),
+/* 185 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (node) {
+	  var params = node.params;
+	  for (var i = 0; i < params.length; i++) {
+	    var param = params[i];
+	    if (t.isAssignmentPattern(param) || t.isRestElement(param)) {
+	      return i;
+	    }
+	  }
+	  return params.length;
+	};
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 186 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (path, emit) {
+	  var kind = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "var";
+
+	  path.traverse(visitor, { kind: kind, emit: emit });
+	};
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var visitor = {
+	  Scope: function Scope(path, state) {
+	    if (state.kind === "let") path.skip();
+	  },
+	  Function: function Function(path) {
+	    path.skip();
+	  },
+	  VariableDeclaration: function VariableDeclaration(path, state) {
+	    if (state.kind && path.node.kind !== state.kind) return;
+
+	    var nodes = [];
+
+	    var declarations = path.get("declarations");
+	    var firstId = void 0;
+
+	    for (var _iterator = declarations, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var declar = _ref;
+
+	      firstId = declar.node.id;
+
+	      if (declar.node.init) {
+	        nodes.push(t.expressionStatement(t.assignmentExpression("=", declar.node.id, declar.node.init)));
+	      }
+
+	      for (var name in declar.getBindingIdentifiers()) {
+	        state.emit(t.identifier(name), name);
+	      }
+	    }
+
+	    if (path.parentPath.isFor({ left: path.node })) {
+	      path.replaceWith(firstId);
+	    } else {
+	      path.replaceWithMultiple(nodes);
+	    }
+	  }
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 187 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (callee, thisNode, args) {
+	  if (args.length === 1 && t.isSpreadElement(args[0]) && t.isIdentifier(args[0].argument, { name: "arguments" })) {
+	    return t.callExpression(t.memberExpression(callee, t.identifier("apply")), [thisNode, args[0].argument]);
+	  } else {
+	    return t.callExpression(t.memberExpression(callee, t.identifier("call")), [thisNode].concat(args));
+	  }
+	};
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 188 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.is = is;
+	exports.pullFlag = pullFlag;
+
+	var _pull = __webpack_require__(272);
+
+	var _pull2 = _interopRequireDefault(_pull);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function is(node, flag) {
+	  return t.isRegExpLiteral(node) && node.flags.indexOf(flag) >= 0;
+	}
+
+	function pullFlag(node, flag) {
+	  var flags = node.flags.split("");
+	  if (node.flags.indexOf(flag) < 0) return;
+	  (0, _pull2.default)(flags, flag);
+	  node.flags = flags.join("");
+	}
+
+/***/ }),
+/* 189 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	var _babelHelperOptimiseCallExpression = __webpack_require__(187);
+
+	var _babelHelperOptimiseCallExpression2 = _interopRequireDefault(_babelHelperOptimiseCallExpression);
+
+	var _babelMessages = __webpack_require__(18);
+
+	var messages = _interopRequireWildcard(_babelMessages);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var HARDCORE_THIS_REF = (0, _symbol2.default)();
+
+	function isIllegalBareSuper(node, parent) {
+	  if (!t.isSuper(node)) return false;
+	  if (t.isMemberExpression(parent, { computed: false })) return false;
+	  if (t.isCallExpression(parent, { callee: node })) return false;
+	  return true;
+	}
+
+	function isMemberExpressionSuper(node) {
+	  return t.isMemberExpression(node) && t.isSuper(node.object);
+	}
+
+	function getPrototypeOfExpression(objectRef, isStatic) {
+	  var targetRef = isStatic ? objectRef : t.memberExpression(objectRef, t.identifier("prototype"));
+
+	  return t.logicalExpression("||", t.memberExpression(targetRef, t.identifier("__proto__")), t.callExpression(t.memberExpression(t.identifier("Object"), t.identifier("getPrototypeOf")), [targetRef]));
+	}
+
+	var visitor = {
+	  Function: function Function(path) {
+	    if (!path.inShadow("this")) {
+	      path.skip();
+	    }
+	  },
+	  ReturnStatement: function ReturnStatement(path, state) {
+	    if (!path.inShadow("this")) {
+	      state.returns.push(path);
+	    }
+	  },
+	  ThisExpression: function ThisExpression(path, state) {
+	    if (!path.node[HARDCORE_THIS_REF]) {
+	      state.thises.push(path);
+	    }
+	  },
+	  enter: function enter(path, state) {
+	    var callback = state.specHandle;
+	    if (state.isLoose) callback = state.looseHandle;
+
+	    var isBareSuper = path.isCallExpression() && path.get("callee").isSuper();
+
+	    var result = callback.call(state, path);
+
+	    if (result) {
+	      state.hasSuper = true;
+	    }
+
+	    if (isBareSuper) {
+	      state.bareSupers.push(path);
+	    }
+
+	    if (result === true) {
+	      path.requeue();
+	    }
+
+	    if (result !== true && result) {
+	      if (Array.isArray(result)) {
+	        path.replaceWithMultiple(result);
+	      } else {
+	        path.replaceWith(result);
+	      }
+	    }
+	  }
+	};
+
+	var ReplaceSupers = function () {
+	  function ReplaceSupers(opts) {
+	    var inClass = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+	    (0, _classCallCheck3.default)(this, ReplaceSupers);
+
+	    this.forceSuperMemoisation = opts.forceSuperMemoisation;
+	    this.methodPath = opts.methodPath;
+	    this.methodNode = opts.methodNode;
+	    this.superRef = opts.superRef;
+	    this.isStatic = opts.isStatic;
+	    this.hasSuper = false;
+	    this.inClass = inClass;
+	    this.isLoose = opts.isLoose;
+	    this.scope = this.methodPath.scope;
+	    this.file = opts.file;
+	    this.opts = opts;
+
+	    this.bareSupers = [];
+	    this.returns = [];
+	    this.thises = [];
+	  }
+
+	  ReplaceSupers.prototype.getObjectRef = function getObjectRef() {
+	    return this.opts.objectRef || this.opts.getObjectRef();
+	  };
+
+	  ReplaceSupers.prototype.setSuperProperty = function setSuperProperty(property, value, isComputed) {
+	    return t.callExpression(this.file.addHelper("set"), [getPrototypeOfExpression(this.getObjectRef(), this.isStatic), isComputed ? property : t.stringLiteral(property.name), value, t.thisExpression()]);
+	  };
+
+	  ReplaceSupers.prototype.getSuperProperty = function getSuperProperty(property, isComputed) {
+	    return t.callExpression(this.file.addHelper("get"), [getPrototypeOfExpression(this.getObjectRef(), this.isStatic), isComputed ? property : t.stringLiteral(property.name), t.thisExpression()]);
+	  };
+
+	  ReplaceSupers.prototype.replace = function replace() {
+	    this.methodPath.traverse(visitor, this);
+	  };
+
+	  ReplaceSupers.prototype.getLooseSuperProperty = function getLooseSuperProperty(id, parent) {
+	    var methodNode = this.methodNode;
+	    var superRef = this.superRef || t.identifier("Function");
+
+	    if (parent.property === id) {
+	      return;
+	    } else if (t.isCallExpression(parent, { callee: id })) {
+	      return;
+	    } else if (t.isMemberExpression(parent) && !methodNode.static) {
+	      return t.memberExpression(superRef, t.identifier("prototype"));
+	    } else {
+	      return superRef;
+	    }
+	  };
+
+	  ReplaceSupers.prototype.looseHandle = function looseHandle(path) {
+	    var node = path.node;
+	    if (path.isSuper()) {
+	      return this.getLooseSuperProperty(node, path.parent);
+	    } else if (path.isCallExpression()) {
+	      var callee = node.callee;
+	      if (!t.isMemberExpression(callee)) return;
+	      if (!t.isSuper(callee.object)) return;
+
+	      t.appendToMemberExpression(callee, t.identifier("call"));
+	      node.arguments.unshift(t.thisExpression());
+	      return true;
+	    }
+	  };
+
+	  ReplaceSupers.prototype.specHandleAssignmentExpression = function specHandleAssignmentExpression(ref, path, node) {
+	    if (node.operator === "=") {
+	      return this.setSuperProperty(node.left.property, node.right, node.left.computed);
+	    } else {
+	      ref = ref || path.scope.generateUidIdentifier("ref");
+	      return [t.variableDeclaration("var", [t.variableDeclarator(ref, node.left)]), t.expressionStatement(t.assignmentExpression("=", node.left, t.binaryExpression(node.operator[0], ref, node.right)))];
+	    }
+	  };
+
+	  ReplaceSupers.prototype.specHandle = function specHandle(path) {
+	    var property = void 0;
+	    var computed = void 0;
+	    var args = void 0;
+
+	    var parent = path.parent;
+	    var node = path.node;
+
+	    if (isIllegalBareSuper(node, parent)) {
+	      throw path.buildCodeFrameError(messages.get("classesIllegalBareSuper"));
+	    }
+
+	    if (t.isCallExpression(node)) {
+	      var callee = node.callee;
+	      if (t.isSuper(callee)) {
+	        return;
+	      } else if (isMemberExpressionSuper(callee)) {
+	        property = callee.property;
+	        computed = callee.computed;
+	        args = node.arguments;
+	      }
+	    } else if (t.isMemberExpression(node) && t.isSuper(node.object)) {
+	      property = node.property;
+	      computed = node.computed;
+	    } else if (t.isUpdateExpression(node) && isMemberExpressionSuper(node.argument)) {
+	      var binary = t.binaryExpression(node.operator[0], node.argument, t.numericLiteral(1));
+	      if (node.prefix) {
+	        return this.specHandleAssignmentExpression(null, path, binary);
+	      } else {
+	        var ref = path.scope.generateUidIdentifier("ref");
+	        return this.specHandleAssignmentExpression(ref, path, binary).concat(t.expressionStatement(ref));
+	      }
+	    } else if (t.isAssignmentExpression(node) && isMemberExpressionSuper(node.left)) {
+	      return this.specHandleAssignmentExpression(null, path, node);
+	    }
+
+	    if (!property) return;
+
+	    var superProperty = this.getSuperProperty(property, computed);
+
+	    if (args) {
+	      return this.optimiseCall(superProperty, args);
+	    } else {
+	      return superProperty;
+	    }
+	  };
+
+	  ReplaceSupers.prototype.optimiseCall = function optimiseCall(callee, args) {
+	    var thisNode = t.thisExpression();
+	    thisNode[HARDCORE_THIS_REF] = true;
+	    return (0, _babelHelperOptimiseCallExpression2.default)(callee, thisNode, args);
+	  };
+
+	  return ReplaceSupers;
+	}();
+
+	exports.default = ReplaceSupers;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 190 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.list = undefined;
+
+	var _keys = __webpack_require__(13);
+
+	var _keys2 = _interopRequireDefault(_keys);
+
+	exports.get = get;
+
+	var _helpers = __webpack_require__(317);
+
+	var _helpers2 = _interopRequireDefault(_helpers);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function get(name) {
+	  var fn = _helpers2.default[name];
+	  if (!fn) throw new ReferenceError("Unknown helper " + name);
+
+	  return fn().expression;
+	}
+
+	var list = exports.list = (0, _keys2.default)(_helpers2.default).map(function (name) {
+	  return name.replace(/^_/, "");
+	}).filter(function (name) {
+	  return name !== "__esModule";
+	});
+
+	exports.default = get;
+
+/***/ }),
+/* 191 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("asyncGenerators");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 192 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("classConstructorCall");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 193 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("classProperties");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 194 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("doExpressions");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 195 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("exponentiationOperator");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 196 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("exportExtensions");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 197 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("functionBind");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 198 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("objectRestSpread");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 199 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  var ALREADY_VISITED = (0, _symbol2.default)();
+
+	  function findConstructorCall(path) {
+	    var methods = path.get("body.body");
+
+	    for (var _iterator = methods, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref2;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref2 = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref2 = _i.value;
+	      }
+
+	      var method = _ref2;
+
+	      if (method.node.kind === "constructorCall") {
+	        return method;
+	      }
+	    }
+
+	    return null;
+	  }
+
+	  function handleClassWithCall(constructorCall, classPath) {
+	    var _classPath = classPath,
+	        node = _classPath.node;
+
+	    var ref = node.id || classPath.scope.generateUidIdentifier("class");
+
+	    if (classPath.parentPath.isExportDefaultDeclaration()) {
+	      classPath = classPath.parentPath;
+	      classPath.insertAfter(t.exportDefaultDeclaration(ref));
+	    }
+
+	    classPath.replaceWithMultiple(buildWrapper({
+	      CLASS_REF: classPath.scope.generateUidIdentifier(ref.name),
+	      CALL_REF: classPath.scope.generateUidIdentifier(ref.name + "Call"),
+	      CALL: t.functionExpression(null, constructorCall.node.params, constructorCall.node.body),
+	      CLASS: t.toExpression(node),
+	      WRAPPER_REF: ref
+	    }));
+
+	    constructorCall.remove();
+	  }
+
+	  return {
+	    inherits: __webpack_require__(192),
+
+	    visitor: {
+	      Class: function Class(path) {
+	        if (path.node[ALREADY_VISITED]) return;
+	        path.node[ALREADY_VISITED] = true;
+
+	        var constructorCall = findConstructorCall(path);
+
+	        if (constructorCall) {
+	          handleClassWithCall(constructorCall, path);
+	        } else {
+	          return;
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildWrapper = (0, _babelTemplate2.default)("\n  let CLASS_REF = CLASS;\n  var CALL_REF = CALL;\n  var WRAPPER_REF = function (...args) {\n    if (this instanceof WRAPPER_REF) {\n      return Reflect.construct(CLASS_REF, args);\n    } else {\n      return CALL_REF.apply(this, args);\n    }\n  };\n  WRAPPER_REF.__proto__ = CLASS_REF;\n  WRAPPER_REF;\n");
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 200 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  var findBareSupers = {
+	    Super: function Super(path) {
+	      if (path.parentPath.isCallExpression({ callee: path.node })) {
+	        this.push(path.parentPath);
+	      }
+	    }
+	  };
+
+	  var referenceVisitor = {
+	    ReferencedIdentifier: function ReferencedIdentifier(path) {
+	      if (this.scope.hasOwnBinding(path.node.name)) {
+	        this.collision = true;
+	        path.skip();
+	      }
+	    }
+	  };
+
+	  var buildObjectDefineProperty = (0, _babelTemplate2.default)("\n    Object.defineProperty(REF, KEY, {\n      // configurable is false by default\n      enumerable: true,\n      writable: true,\n      value: VALUE\n    });\n  ");
+
+	  var buildClassPropertySpec = function buildClassPropertySpec(ref, _ref2) {
+	    var key = _ref2.key,
+	        value = _ref2.value,
+	        computed = _ref2.computed;
+	    return buildObjectDefineProperty({
+	      REF: ref,
+	      KEY: t.isIdentifier(key) && !computed ? t.stringLiteral(key.name) : key,
+	      VALUE: value ? value : t.identifier("undefined")
+	    });
+	  };
+
+	  var buildClassPropertyNonSpec = function buildClassPropertyNonSpec(ref, _ref3) {
+	    var key = _ref3.key,
+	        value = _ref3.value,
+	        computed = _ref3.computed;
+	    return t.expressionStatement(t.assignmentExpression("=", t.memberExpression(ref, key, computed || t.isLiteral(key)), value));
+	  };
+
+	  return {
+	    inherits: __webpack_require__(193),
+
+	    visitor: {
+	      Class: function Class(path, state) {
+	        var buildClassProperty = state.opts.spec ? buildClassPropertySpec : buildClassPropertyNonSpec;
+	        var isDerived = !!path.node.superClass;
+	        var constructor = void 0;
+	        var props = [];
+	        var body = path.get("body");
+
+	        for (var _iterator = body.get("body"), _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	          var _ref4;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref4 = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref4 = _i.value;
+	          }
+
+	          var _path = _ref4;
+
+	          if (_path.isClassProperty()) {
+	            props.push(_path);
+	          } else if (_path.isClassMethod({ kind: "constructor" })) {
+	            constructor = _path;
+	          }
+	        }
+
+	        if (!props.length) return;
+
+	        var nodes = [];
+	        var ref = void 0;
+
+	        if (path.isClassExpression() || !path.node.id) {
+	          (0, _babelHelperFunctionName2.default)(path);
+	          ref = path.scope.generateUidIdentifier("class");
+	        } else {
+	          ref = path.node.id;
+	        }
+
+	        var instanceBody = [];
+
+	        for (var _iterator2 = props, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	          var _ref5;
+
+	          if (_isArray2) {
+	            if (_i2 >= _iterator2.length) break;
+	            _ref5 = _iterator2[_i2++];
+	          } else {
+	            _i2 = _iterator2.next();
+	            if (_i2.done) break;
+	            _ref5 = _i2.value;
+	          }
+
+	          var _prop = _ref5;
+
+	          var propNode = _prop.node;
+	          if (propNode.decorators && propNode.decorators.length > 0) continue;
+
+	          if (!state.opts.spec && !propNode.value) continue;
+
+	          var isStatic = propNode.static;
+
+	          if (isStatic) {
+	            nodes.push(buildClassProperty(ref, propNode));
+	          } else {
+	            if (!propNode.value) continue;
+	            instanceBody.push(buildClassProperty(t.thisExpression(), propNode));
+	          }
+	        }
+
+	        if (instanceBody.length) {
+	          if (!constructor) {
+	            var newConstructor = t.classMethod("constructor", t.identifier("constructor"), [], t.blockStatement([]));
+	            if (isDerived) {
+	              newConstructor.params = [t.restElement(t.identifier("args"))];
+	              newConstructor.body.body.push(t.returnStatement(t.callExpression(t.super(), [t.spreadElement(t.identifier("args"))])));
+	            }
+
+	            var _body$unshiftContaine = body.unshiftContainer("body", newConstructor);
+
+	            constructor = _body$unshiftContaine[0];
+	          }
+
+	          var collisionState = {
+	            collision: false,
+	            scope: constructor.scope
+	          };
+
+	          for (var _iterator3 = props, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	            var _ref6;
+
+	            if (_isArray3) {
+	              if (_i3 >= _iterator3.length) break;
+	              _ref6 = _iterator3[_i3++];
+	            } else {
+	              _i3 = _iterator3.next();
+	              if (_i3.done) break;
+	              _ref6 = _i3.value;
+	            }
+
+	            var prop = _ref6;
+
+	            prop.traverse(referenceVisitor, collisionState);
+	            if (collisionState.collision) break;
+	          }
+
+	          if (collisionState.collision) {
+	            var initialisePropsRef = path.scope.generateUidIdentifier("initialiseProps");
+
+	            nodes.push(t.variableDeclaration("var", [t.variableDeclarator(initialisePropsRef, t.functionExpression(null, [], t.blockStatement(instanceBody)))]));
+
+	            instanceBody = [t.expressionStatement(t.callExpression(t.memberExpression(initialisePropsRef, t.identifier("call")), [t.thisExpression()]))];
+	          }
+
+	          if (isDerived) {
+	            var bareSupers = [];
+	            constructor.traverse(findBareSupers, bareSupers);
+	            for (var _iterator4 = bareSupers, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	              var _ref7;
+
+	              if (_isArray4) {
+	                if (_i4 >= _iterator4.length) break;
+	                _ref7 = _iterator4[_i4++];
+	              } else {
+	                _i4 = _iterator4.next();
+	                if (_i4.done) break;
+	                _ref7 = _i4.value;
+	              }
+
+	              var bareSuper = _ref7;
+
+	              bareSuper.insertAfter(instanceBody);
+	            }
+	          } else {
+	            constructor.get("body").unshiftContainer("body", instanceBody);
+	          }
+	        }
+
+	        for (var _iterator5 = props, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, _getIterator3.default)(_iterator5);;) {
+	          var _ref8;
+
+	          if (_isArray5) {
+	            if (_i5 >= _iterator5.length) break;
+	            _ref8 = _iterator5[_i5++];
+	          } else {
+	            _i5 = _iterator5.next();
+	            if (_i5.done) break;
+	            _ref8 = _i5.value;
+	          }
+
+	          var _prop2 = _ref8;
+
+	          _prop2.remove();
+	        }
+
+	        if (!nodes.length) return;
+
+	        if (path.isClassExpression()) {
+	          path.scope.push({ id: ref });
+	          path.replaceWith(t.assignmentExpression("=", ref, path.node));
+	        } else {
+	          if (!path.node.id) {
+	            path.node.id = ref;
+	          }
+
+	          if (path.parentPath.isExportDeclaration()) {
+	            path = path.parentPath;
+	          }
+	        }
+
+	        path.insertAfter(nodes);
+	      },
+	      ArrowFunctionExpression: function ArrowFunctionExpression(path) {
+	        var classExp = path.get("body");
+	        if (!classExp.isClassExpression()) return;
+
+	        var body = classExp.get("body");
+	        var members = body.get("body");
+	        if (members.some(function (member) {
+	          return member.isClassProperty();
+	        })) {
+	          path.ensureBlock();
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _babelHelperFunctionName = __webpack_require__(40);
+
+	var _babelHelperFunctionName2 = _interopRequireDefault(_babelHelperFunctionName);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 201 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function cleanDecorators(decorators) {
+	    return decorators.reverse().map(function (dec) {
+	      return dec.expression;
+	    });
+	  }
+
+	  function transformClass(path, ref, state) {
+	    var nodes = [];
+
+	    state;
+
+	    var classDecorators = path.node.decorators;
+	    if (classDecorators) {
+	      path.node.decorators = null;
+	      classDecorators = cleanDecorators(classDecorators);
+
+	      for (var _iterator = classDecorators, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	        var _ref2;
+
+	        if (_isArray) {
+	          if (_i >= _iterator.length) break;
+	          _ref2 = _iterator[_i++];
+	        } else {
+	          _i = _iterator.next();
+	          if (_i.done) break;
+	          _ref2 = _i.value;
+	        }
+
+	        var decorator = _ref2;
+
+	        nodes.push(buildClassDecorator({
+	          CLASS_REF: ref,
+	          DECORATOR: decorator
+	        }));
+	      }
+	    }
+
+	    var map = (0, _create2.default)(null);
+
+	    for (var _iterator2 = path.get("body.body"), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref3;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref3 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref3 = _i2.value;
+	      }
+
+	      var method = _ref3;
+
+	      var decorators = method.node.decorators;
+	      if (!decorators) continue;
+
+	      var _alias = t.toKeyAlias(method.node);
+	      map[_alias] = map[_alias] || [];
+	      map[_alias].push(method.node);
+
+	      method.remove();
+	    }
+
+	    for (var alias in map) {
+	      var items = map[alias];
+
+	      items;
+	    }
+
+	    return nodes;
+	  }
+
+	  function hasDecorators(path) {
+	    if (path.isClass()) {
+	      if (path.node.decorators) return true;
+
+	      for (var _iterator3 = path.node.body.body, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	        var _ref4;
+
+	        if (_isArray3) {
+	          if (_i3 >= _iterator3.length) break;
+	          _ref4 = _iterator3[_i3++];
+	        } else {
+	          _i3 = _iterator3.next();
+	          if (_i3.done) break;
+	          _ref4 = _i3.value;
+	        }
+
+	        var method = _ref4;
+
+	        if (method.decorators) {
+	          return true;
+	        }
+	      }
+	    } else if (path.isObjectExpression()) {
+	      for (var _iterator4 = path.node.properties, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	        var _ref5;
+
+	        if (_isArray4) {
+	          if (_i4 >= _iterator4.length) break;
+	          _ref5 = _iterator4[_i4++];
+	        } else {
+	          _i4 = _iterator4.next();
+	          if (_i4.done) break;
+	          _ref5 = _i4.value;
+	        }
+
+	        var prop = _ref5;
+
+	        if (prop.decorators) {
+	          return true;
+	        }
+	      }
+	    }
+
+	    return false;
+	  }
+
+	  function doError(path) {
+	    throw path.buildCodeFrameError("Decorators are not officially supported yet in 6.x pending a proposal update.\nHowever, if you need to use them you can install the legacy decorators transform with:\n\nnpm install babel-plugin-transform-decorators-legacy --save-dev\n\nand add the following line to your .babelrc file:\n\n{\n  \"plugins\": [\"transform-decorators-legacy\"]\n}\n\nThe repo url is: https://github.com/loganfsmyth/babel-plugin-transform-decorators-legacy.\n    ");
+	  }
+
+	  return {
+	    inherits: __webpack_require__(124),
+
+	    visitor: {
+	      ClassExpression: function ClassExpression(path) {
+	        if (!hasDecorators(path)) return;
+	        doError(path);
+
+	        (0, _babelHelperExplodeClass2.default)(path);
+
+	        var ref = path.scope.generateDeclaredUidIdentifier("ref");
+	        var nodes = [];
+
+	        nodes.push(t.assignmentExpression("=", ref, path.node));
+
+	        nodes = nodes.concat(transformClass(path, ref, this));
+
+	        nodes.push(ref);
+
+	        path.replaceWith(t.sequenceExpression(nodes));
+	      },
+	      ClassDeclaration: function ClassDeclaration(path) {
+	        if (!hasDecorators(path)) return;
+	        doError(path);
+	        (0, _babelHelperExplodeClass2.default)(path);
+
+	        var ref = path.node.id;
+	        var nodes = [];
+
+	        nodes = nodes.concat(transformClass(path, ref, this).map(function (expr) {
+	          return t.expressionStatement(expr);
+	        }));
+	        nodes.push(t.expressionStatement(ref));
+
+	        path.insertAfter(nodes);
+	      },
+	      ObjectExpression: function ObjectExpression(path) {
+	        if (!hasDecorators(path)) return;
+	        doError(path);
+	      }
+	    }
+	  };
+	};
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	var _babelHelperExplodeClass = __webpack_require__(315);
+
+	var _babelHelperExplodeClass2 = _interopRequireDefault(_babelHelperExplodeClass);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildClassDecorator = (0, _babelTemplate2.default)("\n  CLASS_REF = DECORATOR(CLASS_REF) || CLASS_REF;\n");
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 202 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    inherits: __webpack_require__(194),
+
+	    visitor: {
+	      DoExpression: function DoExpression(path) {
+	        var body = path.node.body.body;
+	        if (body.length) {
+	          path.replaceWithMultiple(body);
+	        } else {
+	          path.replaceWith(path.scope.buildUndefinedNode());
+	        }
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 203 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _babelTraverse = __webpack_require__(7);
+
+	var _babelHelperReplaceSupers = __webpack_require__(189);
+
+	var _babelHelperReplaceSupers2 = _interopRequireDefault(_babelHelperReplaceSupers);
+
+	var _babelHelperOptimiseCallExpression = __webpack_require__(187);
+
+	var _babelHelperOptimiseCallExpression2 = _interopRequireDefault(_babelHelperOptimiseCallExpression);
+
+	var _babelHelperDefineMap = __webpack_require__(184);
+
+	var defineMap = _interopRequireWildcard(_babelHelperDefineMap);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildDerivedConstructor = (0, _babelTemplate2.default)("\n  (function () {\n    super(...arguments);\n  })\n");
+
+	var noMethodVisitor = {
+	  "FunctionExpression|FunctionDeclaration": function FunctionExpressionFunctionDeclaration(path) {
+	    if (!path.is("shadow")) {
+	      path.skip();
+	    }
+	  },
+	  Method: function Method(path) {
+	    path.skip();
+	  }
+	};
+
+	var verifyConstructorVisitor = _babelTraverse.visitors.merge([noMethodVisitor, {
+	  Super: function Super(path) {
+	    if (this.isDerived && !this.hasBareSuper && !path.parentPath.isCallExpression({ callee: path.node })) {
+	      throw path.buildCodeFrameError("'super.*' is not allowed before super()");
+	    }
+	  },
+
+	  CallExpression: {
+	    exit: function exit(path) {
+	      if (path.get("callee").isSuper()) {
+	        this.hasBareSuper = true;
+
+	        if (!this.isDerived) {
+	          throw path.buildCodeFrameError("super() is only allowed in a derived constructor");
+	        }
+	      }
+	    }
+	  },
+
+	  ThisExpression: function ThisExpression(path) {
+	    if (this.isDerived && !this.hasBareSuper) {
+	      if (!path.inShadow("this")) {
+	        throw path.buildCodeFrameError("'this' is not allowed before super()");
+	      }
+	    }
+	  }
+	}]);
+
+	var findThisesVisitor = _babelTraverse.visitors.merge([noMethodVisitor, {
+	  ThisExpression: function ThisExpression(path) {
+	    this.superThises.push(path);
+	  }
+	}]);
+
+	var ClassTransformer = function () {
+	  function ClassTransformer(path, file) {
+	    (0, _classCallCheck3.default)(this, ClassTransformer);
+
+	    this.parent = path.parent;
+	    this.scope = path.scope;
+	    this.node = path.node;
+	    this.path = path;
+	    this.file = file;
+
+	    this.clearDescriptors();
+
+	    this.instancePropBody = [];
+	    this.instancePropRefs = {};
+	    this.staticPropBody = [];
+	    this.body = [];
+
+	    this.bareSuperAfter = [];
+	    this.bareSupers = [];
+
+	    this.pushedConstructor = false;
+	    this.pushedInherits = false;
+	    this.isLoose = false;
+
+	    this.superThises = [];
+
+	    this.classId = this.node.id;
+
+	    this.classRef = this.node.id ? t.identifier(this.node.id.name) : this.scope.generateUidIdentifier("class");
+
+	    this.superName = this.node.superClass || t.identifier("Function");
+	    this.isDerived = !!this.node.superClass;
+	  }
+
+	  ClassTransformer.prototype.run = function run() {
+	    var _this = this;
+
+	    var superName = this.superName;
+	    var file = this.file;
+	    var body = this.body;
+
+	    var constructorBody = this.constructorBody = t.blockStatement([]);
+	    this.constructor = this.buildConstructor();
+
+	    var closureParams = [];
+	    var closureArgs = [];
+
+	    if (this.isDerived) {
+	      closureArgs.push(superName);
+
+	      superName = this.scope.generateUidIdentifierBasedOnNode(superName);
+	      closureParams.push(superName);
+
+	      this.superName = superName;
+	    }
+
+	    this.buildBody();
+
+	    constructorBody.body.unshift(t.expressionStatement(t.callExpression(file.addHelper("classCallCheck"), [t.thisExpression(), this.classRef])));
+
+	    body = body.concat(this.staticPropBody.map(function (fn) {
+	      return fn(_this.classRef);
+	    }));
+
+	    if (this.classId) {
+	      if (body.length === 1) return t.toExpression(body[0]);
+	    }
+
+	    body.push(t.returnStatement(this.classRef));
+
+	    var container = t.functionExpression(null, closureParams, t.blockStatement(body));
+	    container.shadow = true;
+	    return t.callExpression(container, closureArgs);
+	  };
+
+	  ClassTransformer.prototype.buildConstructor = function buildConstructor() {
+	    var func = t.functionDeclaration(this.classRef, [], this.constructorBody);
+	    t.inherits(func, this.node);
+	    return func;
+	  };
+
+	  ClassTransformer.prototype.pushToMap = function pushToMap(node, enumerable) {
+	    var kind = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "value";
+	    var scope = arguments[3];
+
+	    var mutatorMap = void 0;
+	    if (node.static) {
+	      this.hasStaticDescriptors = true;
+	      mutatorMap = this.staticMutatorMap;
+	    } else {
+	      this.hasInstanceDescriptors = true;
+	      mutatorMap = this.instanceMutatorMap;
+	    }
+
+	    var map = defineMap.push(mutatorMap, node, kind, this.file, scope);
+
+	    if (enumerable) {
+	      map.enumerable = t.booleanLiteral(true);
+	    }
+
+	    return map;
+	  };
+
+	  ClassTransformer.prototype.constructorMeMaybe = function constructorMeMaybe() {
+	    var hasConstructor = false;
+	    var paths = this.path.get("body.body");
+	    for (var _iterator = paths, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var path = _ref;
+
+	      hasConstructor = path.equals("kind", "constructor");
+	      if (hasConstructor) break;
+	    }
+	    if (hasConstructor) return;
+
+	    var params = void 0,
+	        body = void 0;
+
+	    if (this.isDerived) {
+	      var _constructor = buildDerivedConstructor().expression;
+	      params = _constructor.params;
+	      body = _constructor.body;
+	    } else {
+	      params = [];
+	      body = t.blockStatement([]);
+	    }
+
+	    this.path.get("body").unshiftContainer("body", t.classMethod("constructor", t.identifier("constructor"), params, body));
+	  };
+
+	  ClassTransformer.prototype.buildBody = function buildBody() {
+	    this.constructorMeMaybe();
+	    this.pushBody();
+	    this.verifyConstructor();
+
+	    if (this.userConstructor) {
+	      var constructorBody = this.constructorBody;
+	      constructorBody.body = constructorBody.body.concat(this.userConstructor.body.body);
+	      t.inherits(this.constructor, this.userConstructor);
+	      t.inherits(constructorBody, this.userConstructor.body);
+	    }
+
+	    this.pushDescriptors();
+	  };
+
+	  ClassTransformer.prototype.pushBody = function pushBody() {
+	    var classBodyPaths = this.path.get("body.body");
+
+	    for (var _iterator2 = classBodyPaths, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var path = _ref2;
+
+	      var node = path.node;
+
+	      if (path.isClassProperty()) {
+	        throw path.buildCodeFrameError("Missing class properties transform.");
+	      }
+
+	      if (node.decorators) {
+	        throw path.buildCodeFrameError("Method has decorators, put the decorator plugin before the classes one.");
+	      }
+
+	      if (t.isClassMethod(node)) {
+	        var isConstructor = node.kind === "constructor";
+
+	        if (isConstructor) {
+	          path.traverse(verifyConstructorVisitor, this);
+
+	          if (!this.hasBareSuper && this.isDerived) {
+	            throw path.buildCodeFrameError("missing super() call in constructor");
+	          }
+	        }
+
+	        var replaceSupers = new _babelHelperReplaceSupers2.default({
+	          forceSuperMemoisation: isConstructor,
+	          methodPath: path,
+	          methodNode: node,
+	          objectRef: this.classRef,
+	          superRef: this.superName,
+	          isStatic: node.static,
+	          isLoose: this.isLoose,
+	          scope: this.scope,
+	          file: this.file
+	        }, true);
+
+	        replaceSupers.replace();
+
+	        if (isConstructor) {
+	          this.pushConstructor(replaceSupers, node, path);
+	        } else {
+	          this.pushMethod(node, path);
+	        }
+	      }
+	    }
+	  };
+
+	  ClassTransformer.prototype.clearDescriptors = function clearDescriptors() {
+	    this.hasInstanceDescriptors = false;
+	    this.hasStaticDescriptors = false;
+
+	    this.instanceMutatorMap = {};
+	    this.staticMutatorMap = {};
+	  };
+
+	  ClassTransformer.prototype.pushDescriptors = function pushDescriptors() {
+	    this.pushInherits();
+
+	    var body = this.body;
+
+	    var instanceProps = void 0;
+	    var staticProps = void 0;
+
+	    if (this.hasInstanceDescriptors) {
+	      instanceProps = defineMap.toClassObject(this.instanceMutatorMap);
+	    }
+
+	    if (this.hasStaticDescriptors) {
+	      staticProps = defineMap.toClassObject(this.staticMutatorMap);
+	    }
+
+	    if (instanceProps || staticProps) {
+	      if (instanceProps) instanceProps = defineMap.toComputedObjectFromClass(instanceProps);
+	      if (staticProps) staticProps = defineMap.toComputedObjectFromClass(staticProps);
+
+	      var nullNode = t.nullLiteral();
+
+	      var args = [this.classRef, nullNode, nullNode, nullNode, nullNode];
+
+	      if (instanceProps) args[1] = instanceProps;
+	      if (staticProps) args[2] = staticProps;
+
+	      if (this.instanceInitializersId) {
+	        args[3] = this.instanceInitializersId;
+	        body.unshift(this.buildObjectAssignment(this.instanceInitializersId));
+	      }
+
+	      if (this.staticInitializersId) {
+	        args[4] = this.staticInitializersId;
+	        body.unshift(this.buildObjectAssignment(this.staticInitializersId));
+	      }
+
+	      var lastNonNullIndex = 0;
+	      for (var i = 0; i < args.length; i++) {
+	        if (args[i] !== nullNode) lastNonNullIndex = i;
+	      }
+	      args = args.slice(0, lastNonNullIndex + 1);
+
+	      body.push(t.expressionStatement(t.callExpression(this.file.addHelper("createClass"), args)));
+	    }
+
+	    this.clearDescriptors();
+	  };
+
+	  ClassTransformer.prototype.buildObjectAssignment = function buildObjectAssignment(id) {
+	    return t.variableDeclaration("var", [t.variableDeclarator(id, t.objectExpression([]))]);
+	  };
+
+	  ClassTransformer.prototype.wrapSuperCall = function wrapSuperCall(bareSuper, superRef, thisRef, body) {
+	    var bareSuperNode = bareSuper.node;
+
+	    if (this.isLoose) {
+	      bareSuperNode.arguments.unshift(t.thisExpression());
+	      if (bareSuperNode.arguments.length === 2 && t.isSpreadElement(bareSuperNode.arguments[1]) && t.isIdentifier(bareSuperNode.arguments[1].argument, { name: "arguments" })) {
+	        bareSuperNode.arguments[1] = bareSuperNode.arguments[1].argument;
+	        bareSuperNode.callee = t.memberExpression(superRef, t.identifier("apply"));
+	      } else {
+	        bareSuperNode.callee = t.memberExpression(superRef, t.identifier("call"));
+	      }
+	    } else {
+	      bareSuperNode = (0, _babelHelperOptimiseCallExpression2.default)(t.logicalExpression("||", t.memberExpression(this.classRef, t.identifier("__proto__")), t.callExpression(t.memberExpression(t.identifier("Object"), t.identifier("getPrototypeOf")), [this.classRef])), t.thisExpression(), bareSuperNode.arguments);
+	    }
+
+	    var call = t.callExpression(this.file.addHelper("possibleConstructorReturn"), [t.thisExpression(), bareSuperNode]);
+
+	    var bareSuperAfter = this.bareSuperAfter.map(function (fn) {
+	      return fn(thisRef);
+	    });
+
+	    if (bareSuper.parentPath.isExpressionStatement() && bareSuper.parentPath.container === body.node.body && body.node.body.length - 1 === bareSuper.parentPath.key) {
+
+	      if (this.superThises.length || bareSuperAfter.length) {
+	        bareSuper.scope.push({ id: thisRef });
+	        call = t.assignmentExpression("=", thisRef, call);
+	      }
+
+	      if (bareSuperAfter.length) {
+	        call = t.toSequenceExpression([call].concat(bareSuperAfter, [thisRef]));
+	      }
+
+	      bareSuper.parentPath.replaceWith(t.returnStatement(call));
+	    } else {
+	      bareSuper.replaceWithMultiple([t.variableDeclaration("var", [t.variableDeclarator(thisRef, call)])].concat(bareSuperAfter, [t.expressionStatement(thisRef)]));
+	    }
+	  };
+
+	  ClassTransformer.prototype.verifyConstructor = function verifyConstructor() {
+	    var _this2 = this;
+
+	    if (!this.isDerived) return;
+
+	    var path = this.userConstructorPath;
+	    var body = path.get("body");
+
+	    path.traverse(findThisesVisitor, this);
+
+	    var guaranteedSuperBeforeFinish = !!this.bareSupers.length;
+
+	    var superRef = this.superName || t.identifier("Function");
+	    var thisRef = path.scope.generateUidIdentifier("this");
+
+	    for (var _iterator3 = this.bareSupers, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	      var _ref3;
+
+	      if (_isArray3) {
+	        if (_i3 >= _iterator3.length) break;
+	        _ref3 = _iterator3[_i3++];
+	      } else {
+	        _i3 = _iterator3.next();
+	        if (_i3.done) break;
+	        _ref3 = _i3.value;
+	      }
+
+	      var bareSuper = _ref3;
+
+	      this.wrapSuperCall(bareSuper, superRef, thisRef, body);
+
+	      if (guaranteedSuperBeforeFinish) {
+	        bareSuper.find(function (parentPath) {
+	          if (parentPath === path) {
+	            return true;
+	          }
+
+	          if (parentPath.isLoop() || parentPath.isConditional()) {
+	            guaranteedSuperBeforeFinish = false;
+	            return true;
+	          }
+	        });
+	      }
+	    }
+
+	    for (var _iterator4 = this.superThises, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	      var _ref4;
+
+	      if (_isArray4) {
+	        if (_i4 >= _iterator4.length) break;
+	        _ref4 = _iterator4[_i4++];
+	      } else {
+	        _i4 = _iterator4.next();
+	        if (_i4.done) break;
+	        _ref4 = _i4.value;
+	      }
+
+	      var thisPath = _ref4;
+
+	      thisPath.replaceWith(thisRef);
+	    }
+
+	    var wrapReturn = function wrapReturn(returnArg) {
+	      return t.callExpression(_this2.file.addHelper("possibleConstructorReturn"), [thisRef].concat(returnArg || []));
+	    };
+
+	    var bodyPaths = body.get("body");
+	    if (bodyPaths.length && !bodyPaths.pop().isReturnStatement()) {
+	      body.pushContainer("body", t.returnStatement(guaranteedSuperBeforeFinish ? thisRef : wrapReturn()));
+	    }
+
+	    for (var _iterator5 = this.superReturns, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, _getIterator3.default)(_iterator5);;) {
+	      var _ref5;
+
+	      if (_isArray5) {
+	        if (_i5 >= _iterator5.length) break;
+	        _ref5 = _iterator5[_i5++];
+	      } else {
+	        _i5 = _iterator5.next();
+	        if (_i5.done) break;
+	        _ref5 = _i5.value;
+	      }
+
+	      var returnPath = _ref5;
+
+	      if (returnPath.node.argument) {
+	        var ref = returnPath.scope.generateDeclaredUidIdentifier("ret");
+	        returnPath.get("argument").replaceWithMultiple([t.assignmentExpression("=", ref, returnPath.node.argument), wrapReturn(ref)]);
+	      } else {
+	        returnPath.get("argument").replaceWith(wrapReturn());
+	      }
+	    }
+	  };
+
+	  ClassTransformer.prototype.pushMethod = function pushMethod(node, path) {
+	    var scope = path ? path.scope : this.scope;
+
+	    if (node.kind === "method") {
+	      if (this._processMethod(node, scope)) return;
+	    }
+
+	    this.pushToMap(node, false, null, scope);
+	  };
+
+	  ClassTransformer.prototype._processMethod = function _processMethod() {
+	    return false;
+	  };
+
+	  ClassTransformer.prototype.pushConstructor = function pushConstructor(replaceSupers, method, path) {
+	    this.bareSupers = replaceSupers.bareSupers;
+	    this.superReturns = replaceSupers.returns;
+
+	    if (path.scope.hasOwnBinding(this.classRef.name)) {
+	      path.scope.rename(this.classRef.name);
+	    }
+
+	    var construct = this.constructor;
+
+	    this.userConstructorPath = path;
+	    this.userConstructor = method;
+	    this.hasConstructor = true;
+
+	    t.inheritsComments(construct, method);
+
+	    construct._ignoreUserWhitespace = true;
+	    construct.params = method.params;
+
+	    t.inherits(construct.body, method.body);
+	    construct.body.directives = method.body.directives;
+
+	    this._pushConstructor();
+	  };
+
+	  ClassTransformer.prototype._pushConstructor = function _pushConstructor() {
+	    if (this.pushedConstructor) return;
+	    this.pushedConstructor = true;
+
+	    if (this.hasInstanceDescriptors || this.hasStaticDescriptors) {
+	      this.pushDescriptors();
+	    }
+
+	    this.body.push(this.constructor);
+
+	    this.pushInherits();
+	  };
+
+	  ClassTransformer.prototype.pushInherits = function pushInherits() {
+	    if (!this.isDerived || this.pushedInherits) return;
+
+	    this.pushedInherits = true;
+	    this.body.unshift(t.expressionStatement(t.callExpression(this.file.addHelper("inherits"), [this.classRef, this.superName])));
+	  };
+
+	  return ClassTransformer;
+	}();
+
+	exports.default = ClassTransformer;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 204 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  var IGNORE_REASSIGNMENT_SYMBOL = (0, _symbol2.default)();
+
+	  var reassignmentVisitor = {
+	    "AssignmentExpression|UpdateExpression": function AssignmentExpressionUpdateExpression(path) {
+	      if (path.node[IGNORE_REASSIGNMENT_SYMBOL]) return;
+	      path.node[IGNORE_REASSIGNMENT_SYMBOL] = true;
+
+	      var arg = path.get(path.isAssignmentExpression() ? "left" : "argument");
+	      if (!arg.isIdentifier()) return;
+
+	      var name = arg.node.name;
+
+	      if (this.scope.getBinding(name) !== path.scope.getBinding(name)) return;
+
+	      var exportedNames = this.exports[name];
+	      if (!exportedNames) return;
+
+	      var node = path.node;
+
+	      var isPostUpdateExpression = path.isUpdateExpression() && !node.prefix;
+	      if (isPostUpdateExpression) {
+	        if (node.operator === "++") node = t.binaryExpression("+", node.argument, t.numericLiteral(1));else if (node.operator === "--") node = t.binaryExpression("-", node.argument, t.numericLiteral(1));else isPostUpdateExpression = false;
+	      }
+
+	      for (var _iterator = exportedNames, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	        var _ref2;
+
+	        if (_isArray) {
+	          if (_i >= _iterator.length) break;
+	          _ref2 = _iterator[_i++];
+	        } else {
+	          _i = _iterator.next();
+	          if (_i.done) break;
+	          _ref2 = _i.value;
+	        }
+
+	        var exportedName = _ref2;
+
+	        node = this.buildCall(exportedName, node).expression;
+	      }
+
+	      if (isPostUpdateExpression) node = t.sequenceExpression([node, path.node]);
+
+	      path.replaceWith(node);
+	    }
+	  };
+
+	  return {
+	    visitor: {
+	      CallExpression: function CallExpression(path, state) {
+	        if (path.node.callee.type === TYPE_IMPORT) {
+	          var contextIdent = state.contextIdent;
+	          path.replaceWith(t.callExpression(t.memberExpression(contextIdent, t.identifier("import")), path.node.arguments));
+	        }
+	      },
+	      ReferencedIdentifier: function ReferencedIdentifier(path, state) {
+	        if (path.node.name == "__moduleName" && !path.scope.hasBinding("__moduleName")) {
+	          path.replaceWith(t.memberExpression(state.contextIdent, t.identifier("id")));
+	        }
+	      },
+
+	      Program: {
+	        enter: function enter(path, state) {
+	          state.contextIdent = path.scope.generateUidIdentifier("context");
+	        },
+	        exit: function exit(path, state) {
+	          var exportIdent = path.scope.generateUidIdentifier("export");
+	          var contextIdent = state.contextIdent;
+
+	          var exportNames = (0, _create2.default)(null);
+	          var modules = [];
+
+	          var beforeBody = [];
+	          var setters = [];
+	          var sources = [];
+	          var variableIds = [];
+	          var removedPaths = [];
+
+	          function addExportName(key, val) {
+	            exportNames[key] = exportNames[key] || [];
+	            exportNames[key].push(val);
+	          }
+
+	          function pushModule(source, key, specifiers) {
+	            var module = void 0;
+	            modules.forEach(function (m) {
+	              if (m.key === source) {
+	                module = m;
+	              }
+	            });
+	            if (!module) {
+	              modules.push(module = { key: source, imports: [], exports: [] });
+	            }
+	            module[key] = module[key].concat(specifiers);
+	          }
+
+	          function buildExportCall(name, val) {
+	            return t.expressionStatement(t.callExpression(exportIdent, [t.stringLiteral(name), val]));
+	          }
+
+	          var body = path.get("body");
+
+	          var canHoist = true;
+	          for (var _iterator2 = body, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	            var _ref3;
+
+	            if (_isArray2) {
+	              if (_i2 >= _iterator2.length) break;
+	              _ref3 = _iterator2[_i2++];
+	            } else {
+	              _i2 = _iterator2.next();
+	              if (_i2.done) break;
+	              _ref3 = _i2.value;
+	            }
+
+	            var _path = _ref3;
+
+	            if (_path.isExportDeclaration()) _path = _path.get("declaration");
+	            if (_path.isVariableDeclaration() && _path.node.kind !== "var") {
+	              canHoist = false;
+	              break;
+	            }
+	          }
+
+	          for (var _iterator3 = body, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	            var _ref4;
+
+	            if (_isArray3) {
+	              if (_i3 >= _iterator3.length) break;
+	              _ref4 = _iterator3[_i3++];
+	            } else {
+	              _i3 = _iterator3.next();
+	              if (_i3.done) break;
+	              _ref4 = _i3.value;
+	            }
+
+	            var _path2 = _ref4;
+
+	            if (canHoist && _path2.isFunctionDeclaration()) {
+	              beforeBody.push(_path2.node);
+	              removedPaths.push(_path2);
+	            } else if (_path2.isImportDeclaration()) {
+	              var source = _path2.node.source.value;
+	              pushModule(source, "imports", _path2.node.specifiers);
+	              for (var name in _path2.getBindingIdentifiers()) {
+	                _path2.scope.removeBinding(name);
+	                variableIds.push(t.identifier(name));
+	              }
+	              _path2.remove();
+	            } else if (_path2.isExportAllDeclaration()) {
+	              pushModule(_path2.node.source.value, "exports", _path2.node);
+	              _path2.remove();
+	            } else if (_path2.isExportDefaultDeclaration()) {
+	              var declar = _path2.get("declaration");
+	              if (declar.isClassDeclaration() || declar.isFunctionDeclaration()) {
+	                var id = declar.node.id;
+	                var nodes = [];
+
+	                if (id) {
+	                  nodes.push(declar.node);
+	                  nodes.push(buildExportCall("default", id));
+	                  addExportName(id.name, "default");
+	                } else {
+	                  nodes.push(buildExportCall("default", t.toExpression(declar.node)));
+	                }
+
+	                if (!canHoist || declar.isClassDeclaration()) {
+	                  _path2.replaceWithMultiple(nodes);
+	                } else {
+	                  beforeBody = beforeBody.concat(nodes);
+	                  removedPaths.push(_path2);
+	                }
+	              } else {
+	                _path2.replaceWith(buildExportCall("default", declar.node));
+	              }
+	            } else if (_path2.isExportNamedDeclaration()) {
+	              var _declar = _path2.get("declaration");
+
+	              if (_declar.node) {
+	                _path2.replaceWith(_declar);
+
+	                var _nodes = [];
+	                var bindingIdentifiers = void 0;
+	                if (_path2.isFunction()) {
+	                  var node = _declar.node;
+	                  var _name = node.id.name;
+	                  if (canHoist) {
+	                    addExportName(_name, _name);
+	                    beforeBody.push(node);
+	                    beforeBody.push(buildExportCall(_name, node.id));
+	                    removedPaths.push(_path2);
+	                  } else {
+	                    var _bindingIdentifiers;
+
+	                    bindingIdentifiers = (_bindingIdentifiers = {}, _bindingIdentifiers[_name] = node.id, _bindingIdentifiers);
+	                  }
+	                } else {
+	                  bindingIdentifiers = _declar.getBindingIdentifiers();
+	                }
+	                for (var _name2 in bindingIdentifiers) {
+	                  addExportName(_name2, _name2);
+	                  _nodes.push(buildExportCall(_name2, t.identifier(_name2)));
+	                }
+	                _path2.insertAfter(_nodes);
+	              } else {
+	                var specifiers = _path2.node.specifiers;
+	                if (specifiers && specifiers.length) {
+	                  if (_path2.node.source) {
+	                    pushModule(_path2.node.source.value, "exports", specifiers);
+	                    _path2.remove();
+	                  } else {
+	                    var _nodes2 = [];
+
+	                    for (var _iterator7 = specifiers, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : (0, _getIterator3.default)(_iterator7);;) {
+	                      var _ref8;
+
+	                      if (_isArray7) {
+	                        if (_i7 >= _iterator7.length) break;
+	                        _ref8 = _iterator7[_i7++];
+	                      } else {
+	                        _i7 = _iterator7.next();
+	                        if (_i7.done) break;
+	                        _ref8 = _i7.value;
+	                      }
+
+	                      var specifier = _ref8;
+
+	                      _nodes2.push(buildExportCall(specifier.exported.name, specifier.local));
+	                      addExportName(specifier.local.name, specifier.exported.name);
+	                    }
+
+	                    _path2.replaceWithMultiple(_nodes2);
+	                  }
+	                }
+	              }
+	            }
+	          }
+
+	          modules.forEach(function (specifiers) {
+	            var setterBody = [];
+	            var target = path.scope.generateUidIdentifier(specifiers.key);
+
+	            for (var _iterator4 = specifiers.imports, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	              var _ref5;
+
+	              if (_isArray4) {
+	                if (_i4 >= _iterator4.length) break;
+	                _ref5 = _iterator4[_i4++];
+	              } else {
+	                _i4 = _iterator4.next();
+	                if (_i4.done) break;
+	                _ref5 = _i4.value;
+	              }
+
+	              var specifier = _ref5;
+
+	              if (t.isImportNamespaceSpecifier(specifier)) {
+	                setterBody.push(t.expressionStatement(t.assignmentExpression("=", specifier.local, target)));
+	              } else if (t.isImportDefaultSpecifier(specifier)) {
+	                specifier = t.importSpecifier(specifier.local, t.identifier("default"));
+	              }
+
+	              if (t.isImportSpecifier(specifier)) {
+	                setterBody.push(t.expressionStatement(t.assignmentExpression("=", specifier.local, t.memberExpression(target, specifier.imported))));
+	              }
+	            }
+
+	            if (specifiers.exports.length) {
+	              var exportObjRef = path.scope.generateUidIdentifier("exportObj");
+
+	              setterBody.push(t.variableDeclaration("var", [t.variableDeclarator(exportObjRef, t.objectExpression([]))]));
+
+	              for (var _iterator5 = specifiers.exports, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, _getIterator3.default)(_iterator5);;) {
+	                var _ref6;
+
+	                if (_isArray5) {
+	                  if (_i5 >= _iterator5.length) break;
+	                  _ref6 = _iterator5[_i5++];
+	                } else {
+	                  _i5 = _iterator5.next();
+	                  if (_i5.done) break;
+	                  _ref6 = _i5.value;
+	                }
+
+	                var node = _ref6;
+
+	                if (t.isExportAllDeclaration(node)) {
+	                  setterBody.push(buildExportAll({
+	                    KEY: path.scope.generateUidIdentifier("key"),
+	                    EXPORT_OBJ: exportObjRef,
+	                    TARGET: target
+	                  }));
+	                } else if (t.isExportSpecifier(node)) {
+	                  setterBody.push(t.expressionStatement(t.assignmentExpression("=", t.memberExpression(exportObjRef, node.exported), t.memberExpression(target, node.local))));
+	                } else {}
+	              }
+
+	              setterBody.push(t.expressionStatement(t.callExpression(exportIdent, [exportObjRef])));
+	            }
+
+	            sources.push(t.stringLiteral(specifiers.key));
+	            setters.push(t.functionExpression(null, [target], t.blockStatement(setterBody)));
+	          });
+
+	          var moduleName = this.getModuleName();
+	          if (moduleName) moduleName = t.stringLiteral(moduleName);
+
+	          if (canHoist) {
+	            (0, _babelHelperHoistVariables2.default)(path, function (id) {
+	              return variableIds.push(id);
+	            });
+	          }
+
+	          if (variableIds.length) {
+	            beforeBody.unshift(t.variableDeclaration("var", variableIds.map(function (id) {
+	              return t.variableDeclarator(id);
+	            })));
+	          }
+
+	          path.traverse(reassignmentVisitor, {
+	            exports: exportNames,
+	            buildCall: buildExportCall,
+	            scope: path.scope
+	          });
+
+	          for (var _iterator6 = removedPaths, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : (0, _getIterator3.default)(_iterator6);;) {
+	            var _ref7;
+
+	            if (_isArray6) {
+	              if (_i6 >= _iterator6.length) break;
+	              _ref7 = _iterator6[_i6++];
+	            } else {
+	              _i6 = _iterator6.next();
+	              if (_i6.done) break;
+	              _ref7 = _i6.value;
+	            }
+
+	            var _path3 = _ref7;
+
+	            _path3.remove();
+	          }
+
+	          path.node.body = [buildTemplate({
+	            SYSTEM_REGISTER: t.memberExpression(t.identifier(state.opts.systemGlobal || "System"), t.identifier("register")),
+	            BEFORE_BODY: beforeBody,
+	            MODULE_NAME: moduleName,
+	            SETTERS: setters,
+	            SOURCES: sources,
+	            BODY: path.node.body,
+	            EXPORT_IDENTIFIER: exportIdent,
+	            CONTEXT_IDENTIFIER: contextIdent
+	          })];
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _babelHelperHoistVariables = __webpack_require__(186);
+
+	var _babelHelperHoistVariables2 = _interopRequireDefault(_babelHelperHoistVariables);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildTemplate = (0, _babelTemplate2.default)("\n  SYSTEM_REGISTER(MODULE_NAME, [SOURCES], function (EXPORT_IDENTIFIER, CONTEXT_IDENTIFIER) {\n    \"use strict\";\n    BEFORE_BODY;\n    return {\n      setters: [SETTERS],\n      execute: function () {\n        BODY;\n      }\n    };\n  });\n");
+
+	var buildExportAll = (0, _babelTemplate2.default)("\n  for (var KEY in TARGET) {\n    if (KEY !== \"default\" && KEY !== \"__esModule\") EXPORT_OBJ[KEY] = TARGET[KEY];\n  }\n");
+
+	var TYPE_IMPORT = "Import";
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 205 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function isValidDefine(path) {
+	    if (!path.isExpressionStatement()) return;
+
+	    var expr = path.get("expression");
+	    if (!expr.isCallExpression()) return false;
+	    if (!expr.get("callee").isIdentifier({ name: "define" })) return false;
+
+	    var args = expr.get("arguments");
+	    if (args.length === 3 && !args.shift().isStringLiteral()) return false;
+	    if (args.length !== 2) return false;
+	    if (!args.shift().isArrayExpression()) return false;
+	    if (!args.shift().isFunctionExpression()) return false;
+
+	    return true;
+	  }
+
+	  return {
+	    inherits: __webpack_require__(130),
+
+	    visitor: {
+	      Program: {
+	        exit: function exit(path, state) {
+	          var last = path.get("body").pop();
+	          if (!isValidDefine(last)) return;
+
+	          var call = last.node.expression;
+	          var args = call.arguments;
+
+	          var moduleName = args.length === 3 ? args.shift() : null;
+	          var amdArgs = call.arguments[0];
+	          var func = call.arguments[1];
+	          var browserGlobals = state.opts.globals || {};
+
+	          var commonArgs = amdArgs.elements.map(function (arg) {
+	            if (arg.value === "module" || arg.value === "exports") {
+	              return t.identifier(arg.value);
+	            } else {
+	              return t.callExpression(t.identifier("require"), [arg]);
+	            }
+	          });
+
+	          var browserArgs = amdArgs.elements.map(function (arg) {
+	            if (arg.value === "module") {
+	              return t.identifier("mod");
+	            } else if (arg.value === "exports") {
+	              return t.memberExpression(t.identifier("mod"), t.identifier("exports"));
+	            } else {
+	              var memberExpression = void 0;
+
+	              if (state.opts.exactGlobals) {
+	                var globalRef = browserGlobals[arg.value];
+	                if (globalRef) {
+	                  memberExpression = globalRef.split(".").reduce(function (accum, curr) {
+	                    return t.memberExpression(accum, t.identifier(curr));
+	                  }, t.identifier("global"));
+	                } else {
+	                  memberExpression = t.memberExpression(t.identifier("global"), t.identifier(t.toIdentifier(arg.value)));
+	                }
+	              } else {
+	                var requireName = (0, _path.basename)(arg.value, (0, _path.extname)(arg.value));
+	                var globalName = browserGlobals[requireName] || requireName;
+	                memberExpression = t.memberExpression(t.identifier("global"), t.identifier(t.toIdentifier(globalName)));
+	              }
+
+	              return memberExpression;
+	            }
+	          });
+
+	          var moduleNameOrBasename = moduleName ? moduleName.value : this.file.opts.basename;
+	          var globalToAssign = t.memberExpression(t.identifier("global"), t.identifier(t.toIdentifier(moduleNameOrBasename)));
+	          var prerequisiteAssignments = null;
+
+	          if (state.opts.exactGlobals) {
+	            var globalName = browserGlobals[moduleNameOrBasename];
+
+	            if (globalName) {
+	              prerequisiteAssignments = [];
+
+	              var members = globalName.split(".");
+	              globalToAssign = members.slice(1).reduce(function (accum, curr) {
+	                prerequisiteAssignments.push(buildPrerequisiteAssignment({ GLOBAL_REFERENCE: accum }));
+	                return t.memberExpression(accum, t.identifier(curr));
+	              }, t.memberExpression(t.identifier("global"), t.identifier(members[0])));
+	            }
+	          }
+
+	          var globalExport = buildGlobalExport({
+	            BROWSER_ARGUMENTS: browserArgs,
+	            PREREQUISITE_ASSIGNMENTS: prerequisiteAssignments,
+	            GLOBAL_TO_ASSIGN: globalToAssign
+	          });
+
+	          last.replaceWith(buildWrapper({
+	            MODULE_NAME: moduleName,
+	            AMD_ARGUMENTS: amdArgs,
+	            COMMON_ARGUMENTS: commonArgs,
+	            GLOBAL_EXPORT: globalExport,
+	            FUNC: func
+	          }));
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _path = __webpack_require__(17);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildPrerequisiteAssignment = (0, _babelTemplate2.default)("\n  GLOBAL_REFERENCE = GLOBAL_REFERENCE || {}\n");
+
+	var buildGlobalExport = (0, _babelTemplate2.default)("\n  var mod = { exports: {} };\n  factory(BROWSER_ARGUMENTS);\n  PREREQUISITE_ASSIGNMENTS\n  GLOBAL_TO_ASSIGN = mod.exports;\n");
+
+	var buildWrapper = (0, _babelTemplate2.default)("\n  (function (global, factory) {\n    if (typeof define === \"function\" && define.amd) {\n      define(MODULE_NAME, AMD_ARGUMENTS, factory);\n    } else if (typeof exports !== \"undefined\") {\n      factory(COMMON_ARGUMENTS);\n    } else {\n      GLOBAL_EXPORT\n    }\n  })(this, FUNC);\n");
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 206 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function build(node, nodes, scope) {
+	    var first = node.specifiers[0];
+	    if (!t.isExportNamespaceSpecifier(first) && !t.isExportDefaultSpecifier(first)) return;
+
+	    var specifier = node.specifiers.shift();
+	    var uid = scope.generateUidIdentifier(specifier.exported.name);
+
+	    var newSpecifier = void 0;
+	    if (t.isExportNamespaceSpecifier(specifier)) {
+	      newSpecifier = t.importNamespaceSpecifier(uid);
+	    } else {
+	      newSpecifier = t.importDefaultSpecifier(uid);
+	    }
+
+	    nodes.push(t.importDeclaration([newSpecifier], node.source));
+	    nodes.push(t.exportNamedDeclaration(null, [t.exportSpecifier(uid, specifier.exported)]));
+
+	    build(node, nodes, scope);
+	  }
+
+	  return {
+	    inherits: __webpack_require__(196),
+
+	    visitor: {
+	      ExportNamedDeclaration: function ExportNamedDeclaration(path) {
+	        var node = path.node,
+	            scope = path.scope;
+
+	        var nodes = [];
+	        build(node, nodes, scope);
+	        if (!nodes.length) return;
+
+	        if (node.specifiers.length >= 1) {
+	          nodes.push(node);
+	        }
+	        path.replaceWithMultiple(nodes);
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 207 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  var FLOW_DIRECTIVE = "@flow";
+
+	  return {
+	    inherits: __webpack_require__(125),
+
+	    visitor: {
+	      Program: function Program(path, _ref2) {
+	        var comments = _ref2.file.ast.comments;
+
+	        for (var _iterator = comments, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	          var _ref3;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref3 = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref3 = _i.value;
+	          }
+
+	          var comment = _ref3;
+
+	          if (comment.value.indexOf(FLOW_DIRECTIVE) >= 0) {
+	            comment.value = comment.value.replace(FLOW_DIRECTIVE, "");
+
+	            if (!comment.value.replace(/\*/g, "").trim()) comment.ignore = true;
+	          }
+	        }
+	      },
+	      Flow: function Flow(path) {
+	        path.remove();
+	      },
+	      ClassProperty: function ClassProperty(path) {
+	        path.node.variance = null;
+	        path.node.typeAnnotation = null;
+	        if (!path.node.value) path.remove();
+	      },
+	      Class: function Class(path) {
+	        path.node.implements = null;
+
+	        path.get("body.body").forEach(function (child) {
+	          if (child.isClassProperty()) {
+	            child.node.typeAnnotation = null;
+	            if (!child.node.value) child.remove();
+	          }
+	        });
+	      },
+	      AssignmentPattern: function AssignmentPattern(_ref4) {
+	        var node = _ref4.node;
+
+	        node.left.optional = false;
+	      },
+	      Function: function Function(_ref5) {
+	        var node = _ref5.node;
+
+	        for (var i = 0; i < node.params.length; i++) {
+	          var param = node.params[i];
+	          param.optional = false;
+	        }
+	      },
+	      TypeCastExpression: function TypeCastExpression(path) {
+	        var node = path.node;
+
+	        do {
+	          node = node.expression;
+	        } while (t.isTypeCastExpression(node));
+	        path.replaceWith(node);
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 208 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function getTempId(scope) {
+	    var id = scope.path.getData("functionBind");
+	    if (id) return id;
+
+	    id = scope.generateDeclaredUidIdentifier("context");
+	    return scope.path.setData("functionBind", id);
+	  }
+
+	  function getStaticContext(bind, scope) {
+	    var object = bind.object || bind.callee.object;
+	    return scope.isStatic(object) && object;
+	  }
+
+	  function inferBindContext(bind, scope) {
+	    var staticContext = getStaticContext(bind, scope);
+	    if (staticContext) return staticContext;
+
+	    var tempId = getTempId(scope);
+	    if (bind.object) {
+	      bind.callee = t.sequenceExpression([t.assignmentExpression("=", tempId, bind.object), bind.callee]);
+	    } else {
+	      bind.callee.object = t.assignmentExpression("=", tempId, bind.callee.object);
+	    }
+	    return tempId;
+	  }
+
+	  return {
+	    inherits: __webpack_require__(197),
+
+	    visitor: {
+	      CallExpression: function CallExpression(_ref2) {
+	        var node = _ref2.node,
+	            scope = _ref2.scope;
+
+	        var bind = node.callee;
+	        if (!t.isBindExpression(bind)) return;
+
+	        var context = inferBindContext(bind, scope);
+	        node.callee = t.memberExpression(bind.callee, t.identifier("call"));
+	        node.arguments.unshift(context);
+	      },
+	      BindExpression: function BindExpression(path) {
+	        var node = path.node,
+	            scope = path.scope;
+
+	        var context = inferBindContext(node, scope);
+	        path.replaceWith(t.callExpression(t.memberExpression(node.callee, t.identifier("bind")), [context]));
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 209 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function hasRestProperty(path) {
+	    var foundRestProperty = false;
+	    path.traverse({
+	      RestProperty: function RestProperty() {
+	        foundRestProperty = true;
+	        path.stop();
+	      }
+	    });
+	    return foundRestProperty;
+	  }
+
+	  function hasSpread(node) {
+	    for (var _iterator = node.properties, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref2;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref2 = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref2 = _i.value;
+	      }
+
+	      var prop = _ref2;
+
+	      if (t.isSpreadProperty(prop)) {
+	        return true;
+	      }
+	    }
+	    return false;
+	  }
+
+	  function createObjectSpread(file, props, objRef) {
+	    var restProperty = props.pop();
+
+	    var keys = [];
+	    for (var _iterator2 = props, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref3;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref3 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref3 = _i2.value;
+	      }
+
+	      var prop = _ref3;
+
+	      var key = prop.key;
+	      if (t.isIdentifier(key) && !prop.computed) {
+	        key = t.stringLiteral(prop.key.name);
+	      }
+	      keys.push(key);
+	    }
+
+	    return [restProperty.argument, t.callExpression(file.addHelper("objectWithoutProperties"), [objRef, t.arrayExpression(keys)])];
+	  }
+
+	  function replaceRestProperty(parentPath, paramPath, i, numParams) {
+	    if (paramPath.isAssignmentPattern()) {
+	      replaceRestProperty(parentPath, paramPath.get("left"), i, numParams);
+	      return;
+	    }
+
+	    if (paramPath.isObjectPattern() && hasRestProperty(paramPath)) {
+	      var uid = parentPath.scope.generateUidIdentifier("ref");
+
+	      var declar = t.variableDeclaration("let", [t.variableDeclarator(paramPath.node, uid)]);
+	      declar._blockHoist = i ? numParams - i : 1;
+
+	      parentPath.ensureBlock();
+	      parentPath.get("body").unshiftContainer("body", declar);
+	      paramPath.replaceWith(uid);
+	    }
+	  }
+
+	  return {
+	    inherits: __webpack_require__(198),
+
+	    visitor: {
+	      Function: function Function(path) {
+	        var params = path.get("params");
+	        for (var i = 0; i < params.length; i++) {
+	          replaceRestProperty(params[i].parentPath, params[i], i, params.length);
+	        }
+	      },
+	      VariableDeclarator: function VariableDeclarator(path, file) {
+	        if (!path.get("id").isObjectPattern()) {
+	          return;
+	        }
+
+	        var insertionPath = path;
+
+	        path.get("id").traverse({
+	          RestProperty: function RestProperty(path) {
+	            if (this.originalPath.node.id.properties.length > 1 && !t.isIdentifier(this.originalPath.node.init)) {
+	              var initRef = path.scope.generateUidIdentifierBasedOnNode(this.originalPath.node.init, "ref");
+
+	              this.originalPath.insertBefore(t.variableDeclarator(initRef, this.originalPath.node.init));
+
+	              this.originalPath.replaceWith(t.variableDeclarator(this.originalPath.node.id, initRef));
+
+	              return;
+	            }
+
+	            var ref = this.originalPath.node.init;
+
+	            path.findParent(function (path) {
+	              if (path.isObjectProperty()) {
+	                ref = t.memberExpression(ref, t.identifier(path.node.key.name));
+	              } else if (path.isVariableDeclarator()) {
+	                return true;
+	              }
+	            });
+
+	            var _createObjectSpread = createObjectSpread(file, path.parentPath.node.properties, ref),
+	                argument = _createObjectSpread[0],
+	                callExpression = _createObjectSpread[1];
+
+	            insertionPath.insertAfter(t.variableDeclarator(argument, callExpression));
+
+	            insertionPath = insertionPath.getSibling(insertionPath.key + 1);
+
+	            if (path.parentPath.node.properties.length === 0) {
+	              path.findParent(function (path) {
+	                return path.isObjectProperty() || path.isVariableDeclarator();
+	              }).remove();
+	            }
+	          }
+	        }, {
+	          originalPath: path
+	        });
+	      },
+	      ExportNamedDeclaration: function ExportNamedDeclaration(path) {
+	        var declaration = path.get("declaration");
+	        if (!declaration.isVariableDeclaration()) return;
+	        if (!hasRestProperty(declaration)) return;
+
+	        var specifiers = [];
+
+	        for (var name in path.getOuterBindingIdentifiers(path)) {
+	          var id = t.identifier(name);
+	          specifiers.push(t.exportSpecifier(id, id));
+	        }
+
+	        path.replaceWith(declaration.node);
+	        path.insertAfter(t.exportNamedDeclaration(null, specifiers));
+	      },
+	      CatchClause: function CatchClause(path) {
+	        var paramPath = path.get("param");
+	        replaceRestProperty(paramPath.parentPath, paramPath);
+	      },
+	      AssignmentExpression: function AssignmentExpression(path, file) {
+	        var leftPath = path.get("left");
+	        if (leftPath.isObjectPattern() && hasRestProperty(leftPath)) {
+	          var nodes = [];
+
+	          var ref = void 0;
+	          if (path.isCompletionRecord() || path.parentPath.isExpressionStatement()) {
+	            ref = path.scope.generateUidIdentifierBasedOnNode(path.node.right, "ref");
+
+	            nodes.push(t.variableDeclaration("var", [t.variableDeclarator(ref, path.node.right)]));
+	          }
+
+	          var _createObjectSpread2 = createObjectSpread(file, path.node.left.properties, ref),
+	              argument = _createObjectSpread2[0],
+	              callExpression = _createObjectSpread2[1];
+
+	          var nodeWithoutSpread = t.clone(path.node);
+	          nodeWithoutSpread.right = ref;
+	          nodes.push(t.expressionStatement(nodeWithoutSpread));
+	          nodes.push(t.toStatement(t.assignmentExpression("=", argument, callExpression)));
+
+	          if (ref) {
+	            nodes.push(t.expressionStatement(ref));
+	          }
+
+	          path.replaceWithMultiple(nodes);
+	        }
+	      },
+	      ForXStatement: function ForXStatement(path) {
+	        var node = path.node,
+	            scope = path.scope;
+
+	        var leftPath = path.get("left");
+	        var left = node.left;
+
+	        if (t.isObjectPattern(left) && hasRestProperty(leftPath)) {
+	          var temp = scope.generateUidIdentifier("ref");
+
+	          node.left = t.variableDeclaration("var", [t.variableDeclarator(temp)]);
+
+	          path.ensureBlock();
+
+	          node.body.body.unshift(t.variableDeclaration("var", [t.variableDeclarator(left, temp)]));
+
+	          return;
+	        }
+
+	        if (!t.isVariableDeclaration(left)) return;
+
+	        var pattern = left.declarations[0].id;
+	        if (!t.isObjectPattern(pattern)) return;
+
+	        var key = scope.generateUidIdentifier("ref");
+	        node.left = t.variableDeclaration(left.kind, [t.variableDeclarator(key, null)]);
+
+	        path.ensureBlock();
+
+	        node.body.body.unshift(t.variableDeclaration(node.left.kind, [t.variableDeclarator(pattern, key)]));
+	      },
+	      ObjectExpression: function ObjectExpression(path, file) {
+	        if (!hasSpread(path.node)) return;
+
+	        var useBuiltIns = file.opts.useBuiltIns || false;
+	        if (typeof useBuiltIns !== "boolean") {
+	          throw new Error("transform-object-rest-spread currently only accepts a boolean " + "option for useBuiltIns (defaults to false)");
+	        }
+
+	        var args = [];
+	        var props = [];
+
+	        function push() {
+	          if (!props.length) return;
+	          args.push(t.objectExpression(props));
+	          props = [];
+	        }
+
+	        for (var _iterator3 = path.node.properties, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	          var _ref4;
+
+	          if (_isArray3) {
+	            if (_i3 >= _iterator3.length) break;
+	            _ref4 = _iterator3[_i3++];
+	          } else {
+	            _i3 = _iterator3.next();
+	            if (_i3.done) break;
+	            _ref4 = _i3.value;
+	          }
+
+	          var prop = _ref4;
+
+	          if (t.isSpreadProperty(prop)) {
+	            push();
+	            args.push(prop.argument);
+	          } else {
+	            props.push(prop);
+	          }
+	        }
+
+	        push();
+
+	        if (!t.isObjectExpression(args[0])) {
+	          args.unshift(t.objectExpression([]));
+	        }
+
+	        var helper = useBuiltIns ? t.memberExpression(t.identifier("Object"), t.identifier("assign")) : file.addHelper("extends");
+
+	        path.replaceWith(t.callExpression(helper, args));
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 210 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function addDisplayName(id, call) {
+	    var props = call.arguments[0].properties;
+	    var safe = true;
+
+	    for (var i = 0; i < props.length; i++) {
+	      var prop = props[i];
+	      var key = t.toComputedKey(prop);
+	      if (t.isLiteral(key, { value: "displayName" })) {
+	        safe = false;
+	        break;
+	      }
+	    }
+
+	    if (safe) {
+	      props.unshift(t.objectProperty(t.identifier("displayName"), t.stringLiteral(id)));
+	    }
+	  }
+
+	  var isCreateClassCallExpression = t.buildMatchMemberExpression("React.createClass");
+	  var isCreateClassAddon = function isCreateClassAddon(callee) {
+	    return callee.name === "createReactClass";
+	  };
+
+	  function isCreateClass(node) {
+	    if (!node || !t.isCallExpression(node)) return false;
+
+	    if (!isCreateClassCallExpression(node.callee) && !isCreateClassAddon(node.callee)) return false;
+
+	    var args = node.arguments;
+	    if (args.length !== 1) return false;
+
+	    var first = args[0];
+	    if (!t.isObjectExpression(first)) return false;
+
+	    return true;
+	  }
+
+	  return {
+	    visitor: {
+	      ExportDefaultDeclaration: function ExportDefaultDeclaration(_ref2, state) {
+	        var node = _ref2.node;
+
+	        if (isCreateClass(node.declaration)) {
+	          var displayName = state.file.opts.basename;
+
+	          if (displayName === "index") {
+	            displayName = _path2.default.basename(_path2.default.dirname(state.file.opts.filename));
+	          }
+
+	          addDisplayName(displayName, node.declaration);
+	        }
+	      },
+	      CallExpression: function CallExpression(path) {
+	        var node = path.node;
+
+	        if (!isCreateClass(node)) return;
+
+	        var id = void 0;
+
+	        path.find(function (path) {
+	          if (path.isAssignmentExpression()) {
+	            id = path.node.left;
+	          } else if (path.isObjectProperty()) {
+	            id = path.node.key;
+	          } else if (path.isVariableDeclarator()) {
+	            id = path.node.id;
+	          } else if (path.isStatement()) {
+	            return true;
+	          }
+
+	          if (id) return true;
+	        });
+
+	        if (!id) return;
+
+	        if (t.isMemberExpression(id)) {
+	          id = id.property;
+	        }
+
+	        if (t.isIdentifier(id)) {
+	          addDisplayName(id.name, node);
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _path = __webpack_require__(17);
+
+	var _path2 = _interopRequireDefault(_path);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 211 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  var JSX_ANNOTATION_REGEX = /\*?\s*@jsx\s+([^\s]+)/;
+
+	  var visitor = (0, _babelHelperBuilderReactJsx2.default)({
+	    pre: function pre(state) {
+	      var tagName = state.tagName;
+	      var args = state.args;
+	      if (t.react.isCompatTag(tagName)) {
+	        args.push(t.stringLiteral(tagName));
+	      } else {
+	        args.push(state.tagExpr);
+	      }
+	    },
+	    post: function post(state, pass) {
+	      state.callee = pass.get("jsxIdentifier")();
+	    }
+	  });
+
+	  visitor.Program = function (path, state) {
+	    var file = state.file;
+
+	    var id = state.opts.pragma || "React.createElement";
+
+	    for (var _iterator = file.ast.comments, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref2;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref2 = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref2 = _i.value;
+	      }
+
+	      var comment = _ref2;
+
+	      var matches = JSX_ANNOTATION_REGEX.exec(comment.value);
+	      if (matches) {
+	        id = matches[1];
+	        if (id === "React.DOM") {
+	          throw file.buildCodeFrameError(comment, "The @jsx React.DOM pragma has been deprecated as of React 0.12");
+	        } else {
+	          break;
+	        }
+	      }
+	    }
+
+	    state.set("jsxIdentifier", function () {
+	      return id.split(".").map(function (name) {
+	        return t.identifier(name);
+	      }).reduce(function (object, property) {
+	        return t.memberExpression(object, property);
+	      });
+	    });
+	  };
+
+	  return {
+	    inherits: _babelPluginSyntaxJsx2.default,
+	    visitor: visitor
+	  };
+	};
+
+	var _babelPluginSyntaxJsx = __webpack_require__(126);
+
+	var _babelPluginSyntaxJsx2 = _interopRequireDefault(_babelPluginSyntaxJsx);
+
+	var _babelHelperBuilderReactJsx = __webpack_require__(347);
+
+	var _babelHelperBuilderReactJsx2 = _interopRequireDefault(_babelHelperBuilderReactJsx);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 212 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function () {
+	  return {
+	    visitor: {
+	      Program: function Program(path, state) {
+	        if (state.opts.strict === false || state.opts.strictMode === false) return;
+
+	        var node = path.node;
+
+	        for (var _iterator = node.directives, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	          var _ref;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref = _i.value;
+	          }
+
+	          var directive = _ref;
+
+	          if (directive.value.value === "use strict") return;
+	        }
+
+	        path.unshiftContainer("directives", t.directive(t.directiveLiteral("use strict")));
+	      }
+	    }
+	  };
+	};
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 213 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _babelPluginTransformEs2015TemplateLiterals = __webpack_require__(81);
+
+	var _babelPluginTransformEs2015TemplateLiterals2 = _interopRequireDefault(_babelPluginTransformEs2015TemplateLiterals);
+
+	var _babelPluginTransformEs2015Literals = __webpack_require__(74);
+
+	var _babelPluginTransformEs2015Literals2 = _interopRequireDefault(_babelPluginTransformEs2015Literals);
+
+	var _babelPluginTransformEs2015FunctionName = __webpack_require__(73);
+
+	var _babelPluginTransformEs2015FunctionName2 = _interopRequireDefault(_babelPluginTransformEs2015FunctionName);
+
+	var _babelPluginTransformEs2015ArrowFunctions = __webpack_require__(66);
+
+	var _babelPluginTransformEs2015ArrowFunctions2 = _interopRequireDefault(_babelPluginTransformEs2015ArrowFunctions);
+
+	var _babelPluginTransformEs2015BlockScopedFunctions = __webpack_require__(67);
+
+	var _babelPluginTransformEs2015BlockScopedFunctions2 = _interopRequireDefault(_babelPluginTransformEs2015BlockScopedFunctions);
+
+	var _babelPluginTransformEs2015Classes = __webpack_require__(69);
+
+	var _babelPluginTransformEs2015Classes2 = _interopRequireDefault(_babelPluginTransformEs2015Classes);
+
+	var _babelPluginTransformEs2015ObjectSuper = __webpack_require__(76);
+
+	var _babelPluginTransformEs2015ObjectSuper2 = _interopRequireDefault(_babelPluginTransformEs2015ObjectSuper);
+
+	var _babelPluginTransformEs2015ShorthandProperties = __webpack_require__(78);
+
+	var _babelPluginTransformEs2015ShorthandProperties2 = _interopRequireDefault(_babelPluginTransformEs2015ShorthandProperties);
+
+	var _babelPluginTransformEs2015DuplicateKeys = __webpack_require__(129);
+
+	var _babelPluginTransformEs2015DuplicateKeys2 = _interopRequireDefault(_babelPluginTransformEs2015DuplicateKeys);
+
+	var _babelPluginTransformEs2015ComputedProperties = __webpack_require__(70);
+
+	var _babelPluginTransformEs2015ComputedProperties2 = _interopRequireDefault(_babelPluginTransformEs2015ComputedProperties);
+
+	var _babelPluginTransformEs2015ForOf = __webpack_require__(72);
+
+	var _babelPluginTransformEs2015ForOf2 = _interopRequireDefault(_babelPluginTransformEs2015ForOf);
+
+	var _babelPluginTransformEs2015StickyRegex = __webpack_require__(80);
+
+	var _babelPluginTransformEs2015StickyRegex2 = _interopRequireDefault(_babelPluginTransformEs2015StickyRegex);
+
+	var _babelPluginTransformEs2015UnicodeRegex = __webpack_require__(83);
+
+	var _babelPluginTransformEs2015UnicodeRegex2 = _interopRequireDefault(_babelPluginTransformEs2015UnicodeRegex);
+
+	var _babelPluginCheckEs2015Constants = __webpack_require__(64);
+
+	var _babelPluginCheckEs2015Constants2 = _interopRequireDefault(_babelPluginCheckEs2015Constants);
+
+	var _babelPluginTransformEs2015Spread = __webpack_require__(79);
+
+	var _babelPluginTransformEs2015Spread2 = _interopRequireDefault(_babelPluginTransformEs2015Spread);
+
+	var _babelPluginTransformEs2015Parameters = __webpack_require__(77);
+
+	var _babelPluginTransformEs2015Parameters2 = _interopRequireDefault(_babelPluginTransformEs2015Parameters);
+
+	var _babelPluginTransformEs2015Destructuring = __webpack_require__(71);
+
+	var _babelPluginTransformEs2015Destructuring2 = _interopRequireDefault(_babelPluginTransformEs2015Destructuring);
+
+	var _babelPluginTransformEs2015BlockScoping = __webpack_require__(68);
+
+	var _babelPluginTransformEs2015BlockScoping2 = _interopRequireDefault(_babelPluginTransformEs2015BlockScoping);
+
+	var _babelPluginTransformEs2015TypeofSymbol = __webpack_require__(82);
+
+	var _babelPluginTransformEs2015TypeofSymbol2 = _interopRequireDefault(_babelPluginTransformEs2015TypeofSymbol);
+
+	var _babelPluginTransformEs2015ModulesCommonjs = __webpack_require__(75);
+
+	var _babelPluginTransformEs2015ModulesCommonjs2 = _interopRequireDefault(_babelPluginTransformEs2015ModulesCommonjs);
+
+	var _babelPluginTransformEs2015ModulesSystemjs = __webpack_require__(204);
+
+	var _babelPluginTransformEs2015ModulesSystemjs2 = _interopRequireDefault(_babelPluginTransformEs2015ModulesSystemjs);
+
+	var _babelPluginTransformEs2015ModulesAmd = __webpack_require__(130);
+
+	var _babelPluginTransformEs2015ModulesAmd2 = _interopRequireDefault(_babelPluginTransformEs2015ModulesAmd);
+
+	var _babelPluginTransformEs2015ModulesUmd = __webpack_require__(205);
+
+	var _babelPluginTransformEs2015ModulesUmd2 = _interopRequireDefault(_babelPluginTransformEs2015ModulesUmd);
+
+	var _babelPluginTransformRegenerator = __webpack_require__(84);
+
+	var _babelPluginTransformRegenerator2 = _interopRequireDefault(_babelPluginTransformRegenerator);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function preset(context) {
+	  var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+	  var moduleTypes = ["commonjs", "amd", "umd", "systemjs"];
+	  var loose = false;
+	  var modules = "commonjs";
+	  var spec = false;
+
+	  if (opts !== undefined) {
+	    if (opts.loose !== undefined) loose = opts.loose;
+	    if (opts.modules !== undefined) modules = opts.modules;
+	    if (opts.spec !== undefined) spec = opts.spec;
+	  }
+
+	  if (typeof loose !== "boolean") throw new Error("Preset es2015 'loose' option must be a boolean.");
+	  if (typeof spec !== "boolean") throw new Error("Preset es2015 'spec' option must be a boolean.");
+	  if (modules !== false && moduleTypes.indexOf(modules) === -1) {
+	    throw new Error("Preset es2015 'modules' option must be 'false' to indicate no modules\n" + "or a module type which be be one of: 'commonjs' (default), 'amd', 'umd', 'systemjs'");
+	  }
+
+	  var optsLoose = { loose: loose };
+
+	  return {
+	    plugins: [[_babelPluginTransformEs2015TemplateLiterals2.default, { loose: loose, spec: spec }], _babelPluginTransformEs2015Literals2.default, _babelPluginTransformEs2015FunctionName2.default, [_babelPluginTransformEs2015ArrowFunctions2.default, { spec: spec }], _babelPluginTransformEs2015BlockScopedFunctions2.default, [_babelPluginTransformEs2015Classes2.default, optsLoose], _babelPluginTransformEs2015ObjectSuper2.default, _babelPluginTransformEs2015ShorthandProperties2.default, _babelPluginTransformEs2015DuplicateKeys2.default, [_babelPluginTransformEs2015ComputedProperties2.default, optsLoose], [_babelPluginTransformEs2015ForOf2.default, optsLoose], _babelPluginTransformEs2015StickyRegex2.default, _babelPluginTransformEs2015UnicodeRegex2.default, _babelPluginCheckEs2015Constants2.default, [_babelPluginTransformEs2015Spread2.default, optsLoose], _babelPluginTransformEs2015Parameters2.default, [_babelPluginTransformEs2015Destructuring2.default, optsLoose], _babelPluginTransformEs2015BlockScoping2.default, _babelPluginTransformEs2015TypeofSymbol2.default, modules === "commonjs" && [_babelPluginTransformEs2015ModulesCommonjs2.default, optsLoose], modules === "systemjs" && [_babelPluginTransformEs2015ModulesSystemjs2.default, optsLoose], modules === "amd" && [_babelPluginTransformEs2015ModulesAmd2.default, optsLoose], modules === "umd" && [_babelPluginTransformEs2015ModulesUmd2.default, optsLoose], [_babelPluginTransformRegenerator2.default, { async: false, asyncGenerators: false }]].filter(Boolean) };
+	}
+
+	var oldConfig = preset({});
+
+	exports.default = oldConfig;
+
+	Object.defineProperty(oldConfig, "buildPreset", {
+	  configurable: true,
+	  writable: true,
+
+	  enumerable: false,
+	  value: preset
+	});
+	module.exports = exports["default"];
+
+/***/ }),
+/* 214 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _babelPluginTransformExponentiationOperator = __webpack_require__(131);
+
+	var _babelPluginTransformExponentiationOperator2 = _interopRequireDefault(_babelPluginTransformExponentiationOperator);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = {
+	  plugins: [_babelPluginTransformExponentiationOperator2.default]
+	};
+	module.exports = exports["default"];
+
+/***/ }),
+/* 215 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _babelPluginSyntaxTrailingFunctionCommas = __webpack_require__(127);
+
+	var _babelPluginSyntaxTrailingFunctionCommas2 = _interopRequireDefault(_babelPluginSyntaxTrailingFunctionCommas);
+
+	var _babelPluginTransformAsyncToGenerator = __webpack_require__(128);
+
+	var _babelPluginTransformAsyncToGenerator2 = _interopRequireDefault(_babelPluginTransformAsyncToGenerator);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = {
+	  plugins: [_babelPluginSyntaxTrailingFunctionCommas2.default, _babelPluginTransformAsyncToGenerator2.default]
+	};
+	module.exports = exports["default"];
+
+/***/ }),
+/* 216 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _babelPresetStage = __webpack_require__(217);
+
+	var _babelPresetStage2 = _interopRequireDefault(_babelPresetStage);
+
+	var _babelPluginTransformClassConstructorCall = __webpack_require__(199);
+
+	var _babelPluginTransformClassConstructorCall2 = _interopRequireDefault(_babelPluginTransformClassConstructorCall);
+
+	var _babelPluginTransformExportExtensions = __webpack_require__(206);
+
+	var _babelPluginTransformExportExtensions2 = _interopRequireDefault(_babelPluginTransformExportExtensions);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = {
+	  presets: [_babelPresetStage2.default],
+	  plugins: [_babelPluginTransformClassConstructorCall2.default, _babelPluginTransformExportExtensions2.default]
+	};
+	module.exports = exports["default"];
+
+/***/ }),
+/* 217 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _babelPresetStage = __webpack_require__(218);
+
+	var _babelPresetStage2 = _interopRequireDefault(_babelPresetStage);
+
+	var _babelPluginTransformClassProperties = __webpack_require__(200);
+
+	var _babelPluginTransformClassProperties2 = _interopRequireDefault(_babelPluginTransformClassProperties);
+
+	var _babelPluginTransformDecorators = __webpack_require__(201);
+
+	var _babelPluginTransformDecorators2 = _interopRequireDefault(_babelPluginTransformDecorators);
+
+	var _babelPluginSyntaxDynamicImport = __webpack_require__(320);
+
+	var _babelPluginSyntaxDynamicImport2 = _interopRequireDefault(_babelPluginSyntaxDynamicImport);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = {
+	  presets: [_babelPresetStage2.default],
+	  plugins: [_babelPluginSyntaxDynamicImport2.default, _babelPluginTransformClassProperties2.default, _babelPluginTransformDecorators2.default]
+	};
+	module.exports = exports["default"];
+
+/***/ }),
+/* 218 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _babelPluginSyntaxTrailingFunctionCommas = __webpack_require__(127);
+
+	var _babelPluginSyntaxTrailingFunctionCommas2 = _interopRequireDefault(_babelPluginSyntaxTrailingFunctionCommas);
+
+	var _babelPluginTransformAsyncToGenerator = __webpack_require__(128);
+
+	var _babelPluginTransformAsyncToGenerator2 = _interopRequireDefault(_babelPluginTransformAsyncToGenerator);
+
+	var _babelPluginTransformExponentiationOperator = __webpack_require__(131);
+
+	var _babelPluginTransformExponentiationOperator2 = _interopRequireDefault(_babelPluginTransformExponentiationOperator);
+
+	var _babelPluginTransformObjectRestSpread = __webpack_require__(209);
+
+	var _babelPluginTransformObjectRestSpread2 = _interopRequireDefault(_babelPluginTransformObjectRestSpread);
+
+	var _babelPluginTransformAsyncGeneratorFunctions = __webpack_require__(323);
+
+	var _babelPluginTransformAsyncGeneratorFunctions2 = _interopRequireDefault(_babelPluginTransformAsyncGeneratorFunctions);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = {
+	  plugins: [_babelPluginSyntaxTrailingFunctionCommas2.default, _babelPluginTransformAsyncToGenerator2.default, _babelPluginTransformExponentiationOperator2.default, _babelPluginTransformAsyncGeneratorFunctions2.default, _babelPluginTransformObjectRestSpread2.default]
+	};
+	module.exports = exports["default"];
+
+/***/ }),
+/* 219 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var Hub = function Hub(file, options) {
+	  (0, _classCallCheck3.default)(this, Hub);
+
+	  this.file = file;
+	  this.options = options;
+	};
+
+	exports.default = Hub;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 220 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.Flow = exports.Pure = exports.Generated = exports.User = exports.Var = exports.BlockScoped = exports.Referenced = exports.Scope = exports.Expression = exports.Statement = exports.BindingIdentifier = exports.ReferencedMemberExpression = exports.ReferencedIdentifier = undefined;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	var ReferencedIdentifier = exports.ReferencedIdentifier = {
+	  types: ["Identifier", "JSXIdentifier"],
+	  checkPath: function checkPath(_ref, opts) {
+	    var node = _ref.node,
+	        parent = _ref.parent;
+
+	    if (!t.isIdentifier(node, opts) && !t.isJSXMemberExpression(parent, opts)) {
+	      if (t.isJSXIdentifier(node, opts)) {
+	        if (_babelTypes.react.isCompatTag(node.name)) return false;
+	      } else {
+	        return false;
+	      }
+	    }
+
+	    return t.isReferenced(node, parent);
+	  }
+	};
+
+	var ReferencedMemberExpression = exports.ReferencedMemberExpression = {
+	  types: ["MemberExpression"],
+	  checkPath: function checkPath(_ref2) {
+	    var node = _ref2.node,
+	        parent = _ref2.parent;
+
+	    return t.isMemberExpression(node) && t.isReferenced(node, parent);
+	  }
+	};
+
+	var BindingIdentifier = exports.BindingIdentifier = {
+	  types: ["Identifier"],
+	  checkPath: function checkPath(_ref3) {
+	    var node = _ref3.node,
+	        parent = _ref3.parent;
+
+	    return t.isIdentifier(node) && t.isBinding(node, parent);
+	  }
+	};
+
+	var Statement = exports.Statement = {
+	  types: ["Statement"],
+	  checkPath: function checkPath(_ref4) {
+	    var node = _ref4.node,
+	        parent = _ref4.parent;
+
+	    if (t.isStatement(node)) {
+	      if (t.isVariableDeclaration(node)) {
+	        if (t.isForXStatement(parent, { left: node })) return false;
+	        if (t.isForStatement(parent, { init: node })) return false;
+	      }
+
+	      return true;
+	    } else {
+	      return false;
+	    }
+	  }
+	};
+
+	var Expression = exports.Expression = {
+	  types: ["Expression"],
+	  checkPath: function checkPath(path) {
+	    if (path.isIdentifier()) {
+	      return path.isReferencedIdentifier();
+	    } else {
+	      return t.isExpression(path.node);
+	    }
+	  }
+	};
+
+	var Scope = exports.Scope = {
+	  types: ["Scopable"],
+	  checkPath: function checkPath(path) {
+	    return t.isScope(path.node, path.parent);
+	  }
+	};
+
+	var Referenced = exports.Referenced = {
+	  checkPath: function checkPath(path) {
+	    return t.isReferenced(path.node, path.parent);
+	  }
+	};
+
+	var BlockScoped = exports.BlockScoped = {
+	  checkPath: function checkPath(path) {
+	    return t.isBlockScoped(path.node);
+	  }
+	};
+
+	var Var = exports.Var = {
+	  types: ["VariableDeclaration"],
+	  checkPath: function checkPath(path) {
+	    return t.isVar(path.node);
+	  }
+	};
+
+	var User = exports.User = {
+	  checkPath: function checkPath(path) {
+	    return path.node && !!path.node.loc;
+	  }
+	};
+
+	var Generated = exports.Generated = {
+	  checkPath: function checkPath(path) {
+	    return !path.isUser();
+	  }
+	};
+
+	var Pure = exports.Pure = {
+	  checkPath: function checkPath(path, opts) {
+	    return path.scope.isPure(path.node, opts);
+	  }
+	};
+
+	var Flow = exports.Flow = {
+	  types: ["Flow", "ImportDeclaration", "ExportDeclaration", "ImportSpecifier"],
+	  checkPath: function checkPath(_ref5) {
+	    var node = _ref5.node;
+
+	    if (t.isFlow(node)) {
+	      return true;
+	    } else if (t.isImportDeclaration(node)) {
+	      return node.importKind === "type" || node.importKind === "typeof";
+	    } else if (t.isExportDeclaration(node)) {
+	      return node.exportKind === "type";
+	    } else if (t.isImportSpecifier(node)) {
+	      return node.importKind === "type" || node.importKind === "typeof";
+	    } else {
+	      return false;
+	    }
+	  }
+	};
+
+/***/ }),
+/* 221 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var Binding = function () {
+	  function Binding(_ref) {
+	    var existing = _ref.existing,
+	        identifier = _ref.identifier,
+	        scope = _ref.scope,
+	        path = _ref.path,
+	        kind = _ref.kind;
+	    (0, _classCallCheck3.default)(this, Binding);
+
+	    this.identifier = identifier;
+	    this.scope = scope;
+	    this.path = path;
+	    this.kind = kind;
+
+	    this.constantViolations = [];
+	    this.constant = true;
+
+	    this.referencePaths = [];
+	    this.referenced = false;
+	    this.references = 0;
+
+	    this.clearValue();
+
+	    if (existing) {
+	      this.constantViolations = [].concat(existing.path, existing.constantViolations, this.constantViolations);
+	    }
+	  }
+
+	  Binding.prototype.deoptValue = function deoptValue() {
+	    this.clearValue();
+	    this.hasDeoptedValue = true;
+	  };
+
+	  Binding.prototype.setValue = function setValue(value) {
+	    if (this.hasDeoptedValue) return;
+	    this.hasValue = true;
+	    this.value = value;
+	  };
+
+	  Binding.prototype.clearValue = function clearValue() {
+	    this.hasDeoptedValue = false;
+	    this.hasValue = false;
+	    this.value = null;
+	  };
+
+	  Binding.prototype.reassign = function reassign(path) {
+	    this.constant = false;
+	    if (this.constantViolations.indexOf(path) !== -1) {
+	      return;
+	    }
+	    this.constantViolations.push(path);
+	  };
+
+	  Binding.prototype.reference = function reference(path) {
+	    if (this.referencePaths.indexOf(path) !== -1) {
+	      return;
+	    }
+	    this.referenced = true;
+	    this.references++;
+	    this.referencePaths.push(path);
+	  };
+
+	  Binding.prototype.dereference = function dereference() {
+	    this.references--;
+	    this.referenced = !!this.references;
+	  };
+
+	  return Binding;
+	}();
+
+	exports.default = Binding;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 222 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	exports.getBindingIdentifiers = getBindingIdentifiers;
+	exports.getOuterBindingIdentifiers = getOuterBindingIdentifiers;
+
+	var _index = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_index);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function getBindingIdentifiers(node, duplicates, outerOnly) {
+	  var search = [].concat(node);
+	  var ids = (0, _create2.default)(null);
+
+	  while (search.length) {
+	    var id = search.shift();
+	    if (!id) continue;
+
+	    var keys = t.getBindingIdentifiers.keys[id.type];
+
+	    if (t.isIdentifier(id)) {
+	      if (duplicates) {
+	        var _ids = ids[id.name] = ids[id.name] || [];
+	        _ids.push(id);
+	      } else {
+	        ids[id.name] = id;
+	      }
+	      continue;
+	    }
+
+	    if (t.isExportDeclaration(id)) {
+	      if (t.isDeclaration(id.declaration)) {
+	        search.push(id.declaration);
+	      }
+	      continue;
+	    }
+
+	    if (outerOnly) {
+	      if (t.isFunctionDeclaration(id)) {
+	        search.push(id.id);
+	        continue;
+	      }
+
+	      if (t.isFunctionExpression(id)) {
+	        continue;
+	      }
+	    }
+
+	    if (keys) {
+	      for (var i = 0; i < keys.length; i++) {
+	        var key = keys[i];
+	        if (id[key]) {
+	          search = search.concat(id[key]);
+	        }
+	      }
+	    }
+	  }
+
+	  return ids;
+	}
+
+	getBindingIdentifiers.keys = {
+	  DeclareClass: ["id"],
+	  DeclareFunction: ["id"],
+	  DeclareModule: ["id"],
+	  DeclareVariable: ["id"],
+	  InterfaceDeclaration: ["id"],
+	  TypeAlias: ["id"],
+
+	  CatchClause: ["param"],
+	  LabeledStatement: ["label"],
+	  UnaryExpression: ["argument"],
+	  AssignmentExpression: ["left"],
+
+	  ImportSpecifier: ["local"],
+	  ImportNamespaceSpecifier: ["local"],
+	  ImportDefaultSpecifier: ["local"],
+	  ImportDeclaration: ["specifiers"],
+
+	  ExportSpecifier: ["exported"],
+	  ExportNamespaceSpecifier: ["exported"],
+	  ExportDefaultSpecifier: ["exported"],
+
+	  FunctionDeclaration: ["id", "params"],
+	  FunctionExpression: ["id", "params"],
+
+	  ClassDeclaration: ["id"],
+	  ClassExpression: ["id"],
+
+	  RestElement: ["argument"],
+	  UpdateExpression: ["argument"],
+
+	  RestProperty: ["argument"],
+	  ObjectProperty: ["value"],
+
+	  AssignmentPattern: ["left"],
+	  ArrayPattern: ["elements"],
+	  ObjectPattern: ["properties"],
+
+	  VariableDeclaration: ["declarations"],
+	  VariableDeclarator: ["id"]
+	};
+
+	function getOuterBindingIdentifiers(node, duplicates) {
+	  return getBindingIdentifiers(node, duplicates, true);
+	}
+
+/***/ }),
+/* 223 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// getting tag from 19.1.3.6 Object.prototype.toString()
+	var cof = __webpack_require__(137),
+	    TAG = __webpack_require__(12)('toStringTag'
+	// ES3 wrong here
+	),
+	    ARG = cof(function () {
+	  return arguments;
+	}()) == 'Arguments';
+
+	// fallback for IE11 Script Access Denied error
+	var tryGet = function tryGet(it, key) {
+	  try {
+	    return it[key];
+	  } catch (e) {/* empty */}
+	};
+
+	module.exports = function (it) {
+	  var O, T, B;
+	  return it === undefined ? 'Undefined' : it === null ? 'Null'
+	  // @@toStringTag case
+	  : typeof (T = tryGet(O = Object(it), TAG)) == 'string' ? T
+	  // builtinTag case
+	  : ARG ? cof(O
+	  // ES3 arguments fallback
+	  ) : (B = cof(O)) == 'Object' && typeof O.callee == 'function' ? 'Arguments' : B;
+	};
+
+/***/ }),
+/* 224 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var redefineAll = __webpack_require__(144),
+	    getWeak = __webpack_require__(56).getWeak,
+	    anObject = __webpack_require__(19),
+	    isObject = __webpack_require__(22),
+	    anInstance = __webpack_require__(135),
+	    forOf = __webpack_require__(89),
+	    createArrayMethod = __webpack_require__(136),
+	    $has = __webpack_require__(27),
+	    arrayFind = createArrayMethod(5),
+	    arrayFindIndex = createArrayMethod(6),
+	    id = 0;
+
+	// fallback for uncaught frozen keys
+	var uncaughtFrozenStore = function uncaughtFrozenStore(that) {
+	  return that._l || (that._l = new UncaughtFrozenStore());
+	};
+	var UncaughtFrozenStore = function UncaughtFrozenStore() {
+	  this.a = [];
+	};
+	var findUncaughtFrozen = function findUncaughtFrozen(store, key) {
+	  return arrayFind(store.a, function (it) {
+	    return it[0] === key;
+	  });
+	};
+	UncaughtFrozenStore.prototype = {
+	  get: function get(key) {
+	    var entry = findUncaughtFrozen(this, key);
+	    if (entry) return entry[1];
+	  },
+	  has: function has(key) {
+	    return !!findUncaughtFrozen(this, key);
+	  },
+	  set: function set(key, value) {
+	    var entry = findUncaughtFrozen(this, key);
+	    if (entry) entry[1] = value;else this.a.push([key, value]);
+	  },
+	  'delete': function _delete(key) {
+	    var index = arrayFindIndex(this.a, function (it) {
+	      return it[0] === key;
+	    });
+	    if (~index) this.a.splice(index, 1);
+	    return !!~index;
+	  }
+	};
+
+	module.exports = {
+	  getConstructor: function getConstructor(wrapper, NAME, IS_MAP, ADDER) {
+	    var C = wrapper(function (that, iterable) {
+	      anInstance(that, C, NAME, '_i');
+	      that._i = id++; // collection id
+	      that._l = undefined; // leak store for uncaught frozen objects
+	      if (iterable != undefined) forOf(iterable, IS_MAP, that[ADDER], that);
+	    });
+	    redefineAll(C.prototype, {
+	      // 23.3.3.2 WeakMap.prototype.delete(key)
+	      // 23.4.3.3 WeakSet.prototype.delete(value)
+	      'delete': function _delete(key) {
+	        if (!isObject(key)) return false;
+	        var data = getWeak(key);
+	        if (data === true) return uncaughtFrozenStore(this)['delete'](key);
+	        return data && $has(data, this._i) && delete data[this._i];
+	      },
+	      // 23.3.3.4 WeakMap.prototype.has(key)
+	      // 23.4.3.4 WeakSet.prototype.has(value)
+	      has: function has(key) {
+	        if (!isObject(key)) return false;
+	        var data = getWeak(key);
+	        if (data === true) return uncaughtFrozenStore(this).has(key);
+	        return data && $has(data, this._i);
+	      }
+	    });
+	    return C;
+	  },
+	  def: function def(that, key, value) {
+	    var data = getWeak(anObject(key), true);
+	    if (data === true) uncaughtFrozenStore(that).set(key, value);else data[that._i] = value;
+	    return that;
+	  },
+	  ufstore: uncaughtFrozenStore
+	};
+
+/***/ }),
+/* 225 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isObject = __webpack_require__(22),
+	    document = __webpack_require__(14).document
+	// in old IE typeof document.createElement is 'object'
+	,
+	    is = isObject(document) && isObject(document.createElement);
+	module.exports = function (it) {
+	  return is ? document.createElement(it) : {};
+	};
+
+/***/ }),
+/* 226 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = !__webpack_require__(20) && !__webpack_require__(36)(function () {
+	  return Object.defineProperty(__webpack_require__(225)('div'), 'a', { get: function get() {
+	      return 7;
+	    } }).a != 7;
+	});
+
+/***/ }),
+/* 227 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 7.2.2 IsArray(argument)
+	var cof = __webpack_require__(137);
+	module.exports = Array.isArray || function isArray(arg) {
+	  return cof(arg) == 'Array';
+	};
+
+/***/ }),
+/* 228 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = function (done, value) {
+	  return { value: value, done: !!done };
+	};
+
+/***/ }),
+/* 229 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// 19.1.2.1 Object.assign(target, source, ...)
+
+	var getKeys = __webpack_require__(43),
+	    gOPS = __webpack_require__(143),
+	    pIE = __webpack_require__(91),
+	    toObject = __webpack_require__(94),
+	    IObject = __webpack_require__(140),
+	    $assign = Object.assign;
+
+	// should work with symbols and should have deterministic property order (V8 bug)
+	module.exports = !$assign || __webpack_require__(36)(function () {
+	  var A = {},
+	      B = {},
+	      S = Symbol(),
+	      K = 'abcdefghijklmnopqrst';
+	  A[S] = 7;
+	  K.split('').forEach(function (k) {
+	    B[k] = k;
+	  });
+	  return $assign({}, A)[S] != 7 || Object.keys($assign({}, B)).join('') != K;
+	}) ? function assign(target, source) {
+	  // eslint-disable-line no-unused-vars
+	  var T = toObject(target),
+	      aLen = arguments.length,
+	      index = 1,
+	      getSymbols = gOPS.f,
+	      isEnum = pIE.f;
+	  while (aLen > index) {
+	    var S = IObject(arguments[index++]),
+	        keys = getSymbols ? getKeys(S).concat(getSymbols(S)) : getKeys(S),
+	        length = keys.length,
+	        j = 0,
+	        key;
+	    while (length > j) {
+	      if (isEnum.call(S, key = keys[j++])) T[key] = S[key];
+	    }
+	  }return T;
+	} : $assign;
+
+/***/ }),
+/* 230 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var pIE = __webpack_require__(91),
+	    createDesc = __webpack_require__(92),
+	    toIObject = __webpack_require__(37),
+	    toPrimitive = __webpack_require__(150),
+	    has = __webpack_require__(27),
+	    IE8_DOM_DEFINE = __webpack_require__(226),
+	    gOPD = Object.getOwnPropertyDescriptor;
+
+	exports.f = __webpack_require__(20) ? gOPD : function getOwnPropertyDescriptor(O, P) {
+	  O = toIObject(O);
+	  P = toPrimitive(P, true);
+	  if (IE8_DOM_DEFINE) try {
+	    return gOPD(O, P);
+	  } catch (e) {/* empty */}
+	  if (has(O, P)) return createDesc(!pIE.f.call(O, P), O[P]);
+	};
+
+/***/ }),
+/* 231 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 19.1.2.7 / 15.2.3.4 Object.getOwnPropertyNames(O)
+	var $keys = __webpack_require__(232),
+	    hiddenKeys = __webpack_require__(139).concat('length', 'prototype');
+
+	exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
+	  return $keys(O, hiddenKeys);
+	};
+
+/***/ }),
+/* 232 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var has = __webpack_require__(27),
+	    toIObject = __webpack_require__(37),
+	    arrayIndexOf = __webpack_require__(417)(false),
+	    IE_PROTO = __webpack_require__(146)('IE_PROTO');
+
+	module.exports = function (object, names) {
+	  var O = toIObject(object),
+	      i = 0,
+	      result = [],
+	      key;
+	  for (key in O) {
+	    if (key != IE_PROTO) has(O, key) && result.push(key);
+	  } // Don't enum bug & hidden keys
+	  while (names.length > i) {
+	    if (has(O, key = names[i++])) {
+	      ~arrayIndexOf(result, key) || result.push(key);
+	    }
+	  }return result;
+	};
+
+/***/ }),
+/* 233 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var classof = __webpack_require__(223),
+	    ITERATOR = __webpack_require__(12)('iterator'),
+	    Iterators = __webpack_require__(55);
+	module.exports = __webpack_require__(5).getIteratorMethod = function (it) {
+	  if (it != undefined) return it[ITERATOR] || it['@@iterator'] || Iterators[classof(it)];
+	};
+
+/***/ }),
+/* 234 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	/**
+	 * This is the web browser implementation of `debug()`.
+	 *
+	 * Expose `debug()` as the module.
+	 */
+
+	exports = module.exports = __webpack_require__(449);
+	exports.log = log;
+	exports.formatArgs = formatArgs;
+	exports.save = save;
+	exports.load = load;
+	exports.useColors = useColors;
+	exports.storage = 'undefined' != typeof chrome && 'undefined' != typeof chrome.storage ? chrome.storage.local : localstorage();
+
+	/**
+	 * Colors.
+	 */
+
+	exports.colors = ['lightseagreen', 'forestgreen', 'goldenrod', 'dodgerblue', 'darkorchid', 'crimson'];
+
+	/**
+	 * Currently only WebKit-based Web Inspectors, Firefox >= v31,
+	 * and the Firebug extension (any Firefox version) are known
+	 * to support "%c" CSS customizations.
+	 *
+	 * TODO: add a `localStorage` variable to explicitly enable/disable colors
+	 */
+
+	function useColors() {
+	  // NB: In an Electron preload script, document will be defined but not fully
+	  // initialized. Since we know we're in Chrome, we'll just detect this case
+	  // explicitly
+	  if (typeof window !== 'undefined' && window.process && window.process.type === 'renderer') {
+	    return true;
+	  }
+
+	  // is webkit? http://stackoverflow.com/a/16459606/376773
+	  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+	  return typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance ||
+	  // is firebug? http://stackoverflow.com/a/398120/376773
+	  typeof window !== 'undefined' && window.console && (window.console.firebug || window.console.exception && window.console.table) ||
+	  // is firefox >= v31?
+	  // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
+	  typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31 ||
+	  // double check webkit in userAgent just in case we are in a worker
+	  typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/);
+	}
+
+	/**
+	 * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
+	 */
+
+	exports.formatters.j = function (v) {
+	  try {
+	    return JSON.stringify(v);
+	  } catch (err) {
+	    return '[UnexpectedJSONParseError]: ' + err.message;
+	  }
+	};
+
+	/**
+	 * Colorize log arguments if enabled.
+	 *
+	 * @api public
+	 */
+
+	function formatArgs(args) {
+	  var useColors = this.useColors;
+
+	  args[0] = (useColors ? '%c' : '') + this.namespace + (useColors ? ' %c' : ' ') + args[0] + (useColors ? '%c ' : ' ') + '+' + exports.humanize(this.diff);
+
+	  if (!useColors) return;
+
+	  var c = 'color: ' + this.color;
+	  args.splice(1, 0, c, 'color: inherit'
+
+	  // the final "%c" is somewhat tricky, because there could be other
+	  // arguments passed either before or after the %c, so we need to
+	  // figure out the correct index to insert the CSS into
+	  );var index = 0;
+	  var lastC = 0;
+	  args[0].replace(/%[a-zA-Z%]/g, function (match) {
+	    if ('%%' === match) return;
+	    index++;
+	    if ('%c' === match) {
+	      // we only are interested in the *last* %c
+	      // (the user may have provided their own)
+	      lastC = index;
+	    }
+	  });
+
+	  args.splice(lastC, 0, c);
+	}
+
+	/**
+	 * Invokes `console.log()` when available.
+	 * No-op when `console.log` is not a "function".
+	 *
+	 * @api public
+	 */
+
+	function log() {
+	  // this hackery is required for IE8/9, where
+	  // the `console.log` function doesn't have 'apply'
+	  return 'object' === (typeof console === 'undefined' ? 'undefined' : _typeof(console)) && console.log && Function.prototype.apply.call(console.log, console, arguments);
+	}
+
+	/**
+	 * Save `namespaces`.
+	 *
+	 * @param {String} namespaces
+	 * @api private
+	 */
+
+	function save(namespaces) {
+	  try {
+	    if (null == namespaces) {
+	      exports.storage.removeItem('debug');
+	    } else {
+	      exports.storage.debug = namespaces;
+	    }
+	  } catch (e) {}
+	}
+
+	/**
+	 * Load `namespaces`.
+	 *
+	 * @return {String} returns the previously persisted debug modes
+	 * @api private
+	 */
+
+	function load() {
+	  var r;
+	  try {
+	    r = exports.storage.debug;
+	  } catch (e) {}
+
+	  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
+	  if (!r && typeof process !== 'undefined' && 'env' in process) {
+	    r = process.env.DEBUG;
+	  }
+
+	  return r;
+	}
+
+	/**
+	 * Enable namespaces listed in `localStorage.debug` initially.
+	 */
+
+	exports.enable(load());
+
+	/**
+	 * Localstorage attempts to return the localstorage.
+	 *
+	 * This is necessary because safari throws
+	 * when a user disables cookies/localstorage
+	 * and you attempt to access it.
+	 *
+	 * @return {LocalStorage}
+	 * @api private
+	 */
+
+	function localstorage() {
+	  try {
+	    return window.localStorage;
+	  } catch (e) {}
+	}
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 235 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/*
+	  Copyright (C) 2013-2014 Yusuke Suzuki <utatane.tea@gmail.com>
+	  Copyright (C) 2014 Ivan Nikulin <ifaaan@gmail.com>
+
+	  Redistribution and use in source and binary forms, with or without
+	  modification, are permitted provided that the following conditions are met:
+
+	    * Redistributions of source code must retain the above copyright
+	      notice, this list of conditions and the following disclaimer.
+	    * Redistributions in binary form must reproduce the above copyright
+	      notice, this list of conditions and the following disclaimer in the
+	      documentation and/or other materials provided with the distribution.
+
+	  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+	  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+	  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+	  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+	  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+	  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	*/
+
+	(function () {
+	    'use strict';
+
+	    var ES6Regex, ES5Regex, NON_ASCII_WHITESPACES, IDENTIFIER_START, IDENTIFIER_PART, ch;
+
+	    // See `tools/generate-identifier-regex.js`.
+	    ES5Regex = {
+	        // ECMAScript 5.1/Unicode v7.0.0 NonAsciiIdentifierStart:
+	        NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/,
+	        // ECMAScript 5.1/Unicode v7.0.0 NonAsciiIdentifierPart:
+	        NonAsciiIdentifierPart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/
+	    };
+
+	    ES6Regex = {
+	        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierStart:
+	        NonAsciiIdentifierStart: /[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0-\u08B2\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309B-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDE00-\uDE11\uDE13-\uDE2B\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF5D-\uDF61]|\uD805[\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDE00-\uDE2F\uDE44\uDE80-\uDEAA]|\uD806[\uDCA0-\uDCDF\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF98]|\uD809[\uDC00-\uDC6E]|[\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50\uDF93-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D]|\uD87E[\uDC00-\uDE1D]/,
+	        // ECMAScript 6/Unicode v7.0.0 NonAsciiIdentifierPart:
+	        NonAsciiIdentifierPart: /[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDD0-\uDDDA\uDE00-\uDE11\uDE13-\uDE37\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF01-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF98]|\uD809[\uDC00-\uDC6E]|[\uD80C\uD840-\uD868\uD86A-\uD86C][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/
+	    };
+
+	    function isDecimalDigit(ch) {
+	        return 0x30 <= ch && ch <= 0x39; // 0..9
+	    }
+
+	    function isHexDigit(ch) {
+	        return 0x30 <= ch && ch <= 0x39 || // 0..9
+	        0x61 <= ch && ch <= 0x66 || // a..f
+	        0x41 <= ch && ch <= 0x46; // A..F
+	    }
+
+	    function isOctalDigit(ch) {
+	        return ch >= 0x30 && ch <= 0x37; // 0..7
+	    }
+
+	    // 7.2 White Space
+
+	    NON_ASCII_WHITESPACES = [0x1680, 0x180E, 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x202F, 0x205F, 0x3000, 0xFEFF];
+
+	    function isWhiteSpace(ch) {
+	        return ch === 0x20 || ch === 0x09 || ch === 0x0B || ch === 0x0C || ch === 0xA0 || ch >= 0x1680 && NON_ASCII_WHITESPACES.indexOf(ch) >= 0;
+	    }
+
+	    // 7.3 Line Terminators
+
+	    function isLineTerminator(ch) {
+	        return ch === 0x0A || ch === 0x0D || ch === 0x2028 || ch === 0x2029;
+	    }
+
+	    // 7.6 Identifier Names and Identifiers
+
+	    function fromCodePoint(cp) {
+	        if (cp <= 0xFFFF) {
+	            return String.fromCharCode(cp);
+	        }
+	        var cu1 = String.fromCharCode(Math.floor((cp - 0x10000) / 0x400) + 0xD800);
+	        var cu2 = String.fromCharCode((cp - 0x10000) % 0x400 + 0xDC00);
+	        return cu1 + cu2;
+	    }
+
+	    IDENTIFIER_START = new Array(0x80);
+	    for (ch = 0; ch < 0x80; ++ch) {
+	        IDENTIFIER_START[ch] = ch >= 0x61 && ch <= 0x7A || // a..z
+	        ch >= 0x41 && ch <= 0x5A || // A..Z
+	        ch === 0x24 || ch === 0x5F; // $ (dollar) and _ (underscore)
+	    }
+
+	    IDENTIFIER_PART = new Array(0x80);
+	    for (ch = 0; ch < 0x80; ++ch) {
+	        IDENTIFIER_PART[ch] = ch >= 0x61 && ch <= 0x7A || // a..z
+	        ch >= 0x41 && ch <= 0x5A || // A..Z
+	        ch >= 0x30 && ch <= 0x39 || // 0..9
+	        ch === 0x24 || ch === 0x5F; // $ (dollar) and _ (underscore)
+	    }
+
+	    function isIdentifierStartES5(ch) {
+	        return ch < 0x80 ? IDENTIFIER_START[ch] : ES5Regex.NonAsciiIdentifierStart.test(fromCodePoint(ch));
+	    }
+
+	    function isIdentifierPartES5(ch) {
+	        return ch < 0x80 ? IDENTIFIER_PART[ch] : ES5Regex.NonAsciiIdentifierPart.test(fromCodePoint(ch));
+	    }
+
+	    function isIdentifierStartES6(ch) {
+	        return ch < 0x80 ? IDENTIFIER_START[ch] : ES6Regex.NonAsciiIdentifierStart.test(fromCodePoint(ch));
+	    }
+
+	    function isIdentifierPartES6(ch) {
+	        return ch < 0x80 ? IDENTIFIER_PART[ch] : ES6Regex.NonAsciiIdentifierPart.test(fromCodePoint(ch));
+	    }
+
+	    module.exports = {
+	        isDecimalDigit: isDecimalDigit,
+	        isHexDigit: isHexDigit,
+	        isOctalDigit: isOctalDigit,
+	        isWhiteSpace: isWhiteSpace,
+	        isLineTerminator: isLineTerminator,
+	        isIdentifierStartES5: isIdentifierStartES5,
+	        isIdentifierPartES5: isIdentifierPartES5,
+	        isIdentifierStartES6: isIdentifierStartES6,
+	        isIdentifierPartES6: isIdentifierPartES6
+	    };
+	})();
+	/* vim: set sw=4 ts=4 et tw=80 : */
+
+/***/ }),
+/* 236 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getNative = __webpack_require__(38),
+	    root = __webpack_require__(15);
+
+	/* Built-in method references that are verified to be native. */
+	var Set = getNative(root, 'Set');
+
+	module.exports = Set;
+
+/***/ }),
+/* 237 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var MapCache = __webpack_require__(156),
+	    setCacheAdd = __webpack_require__(552),
+	    setCacheHas = __webpack_require__(553);
+
+	/**
+	 *
+	 * Creates an array cache object to store unique values.
+	 *
+	 * @private
+	 * @constructor
+	 * @param {Array} [values] The values to cache.
+	 */
+	function SetCache(values) {
+	    var index = -1,
+	        length = values == null ? 0 : values.length;
+
+	    this.__data__ = new MapCache();
+	    while (++index < length) {
+	        this.add(values[index]);
+	    }
+	}
+
+	// Add methods to `SetCache`.
+	SetCache.prototype.add = SetCache.prototype.push = setCacheAdd;
+	SetCache.prototype.has = setCacheHas;
+
+	module.exports = SetCache;
+
+/***/ }),
+/* 238 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var root = __webpack_require__(15);
+
+	/** Built-in value references. */
+	var Uint8Array = root.Uint8Array;
+
+	module.exports = Uint8Array;
+
+/***/ }),
+/* 239 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * A faster alternative to `Function#apply`, this function invokes `func`
+	 * with the `this` binding of `thisArg` and the arguments of `args`.
+	 *
+	 * @private
+	 * @param {Function} func The function to invoke.
+	 * @param {*} thisArg The `this` binding of `func`.
+	 * @param {Array} args The arguments to invoke `func` with.
+	 * @returns {*} Returns the result of `func`.
+	 */
+	function apply(func, thisArg, args) {
+	  switch (args.length) {
+	    case 0:
+	      return func.call(thisArg);
+	    case 1:
+	      return func.call(thisArg, args[0]);
+	    case 2:
+	      return func.call(thisArg, args[0], args[1]);
+	    case 3:
+	      return func.call(thisArg, args[0], args[1], args[2]);
+	  }
+	  return func.apply(thisArg, args);
+	}
+
+	module.exports = apply;
+
+/***/ }),
+/* 240 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseTimes = __webpack_require__(504),
+	    isArguments = __webpack_require__(112),
+	    isArray = __webpack_require__(6),
+	    isBuffer = __webpack_require__(113),
+	    isIndex = __webpack_require__(167),
+	    isTypedArray = __webpack_require__(173);
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * Creates an array of the enumerable property names of the array-like `value`.
+	 *
+	 * @private
+	 * @param {*} value The value to query.
+	 * @param {boolean} inherited Specify returning inherited property names.
+	 * @returns {Array} Returns the array of property names.
+	 */
+	function arrayLikeKeys(value, inherited) {
+	  var isArr = isArray(value),
+	      isArg = !isArr && isArguments(value),
+	      isBuff = !isArr && !isArg && isBuffer(value),
+	      isType = !isArr && !isArg && !isBuff && isTypedArray(value),
+	      skipIndexes = isArr || isArg || isBuff || isType,
+	      result = skipIndexes ? baseTimes(value.length, String) : [],
+	      length = result.length;
+
+	  for (var key in value) {
+	    if ((inherited || hasOwnProperty.call(value, key)) && !(skipIndexes && (
+	    // Safari 9 has enumerable `arguments.length` in strict mode.
+	    key == 'length' ||
+	    // Node.js 0.10 has enumerable non-index properties on buffers.
+	    isBuff && (key == 'offset' || key == 'parent') ||
+	    // PhantomJS 2 has enumerable non-index properties on typed arrays.
+	    isType && (key == 'buffer' || key == 'byteLength' || key == 'byteOffset') ||
+	    // Skip index properties.
+	    isIndex(key, length)))) {
+	      result.push(key);
+	    }
+	  }
+	  return result;
+	}
+
+	module.exports = arrayLikeKeys;
+
+/***/ }),
+/* 241 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * A specialized version of `_.reduce` for arrays without support for
+	 * iteratee shorthands.
+	 *
+	 * @private
+	 * @param {Array} [array] The array to iterate over.
+	 * @param {Function} iteratee The function invoked per iteration.
+	 * @param {*} [accumulator] The initial value.
+	 * @param {boolean} [initAccum] Specify using the first element of `array` as
+	 *  the initial value.
+	 * @returns {*} Returns the accumulated value.
+	 */
+	function arrayReduce(array, iteratee, accumulator, initAccum) {
+	  var index = -1,
+	      length = array == null ? 0 : array.length;
+
+	  if (initAccum && length) {
+	    accumulator = array[++index];
+	  }
+	  while (++index < length) {
+	    accumulator = iteratee(accumulator, array[index], index, array);
+	  }
+	  return accumulator;
+	}
+
+	module.exports = arrayReduce;
+
+/***/ }),
+/* 242 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseAssignValue = __webpack_require__(159),
+	    eq = __webpack_require__(45);
+
+	/**
+	 * This function is like `assignValue` except that it doesn't assign
+	 * `undefined` values.
+	 *
+	 * @private
+	 * @param {Object} object The object to modify.
+	 * @param {string} key The key of the property to assign.
+	 * @param {*} value The value to assign.
+	 */
+	function assignMergeValue(object, key, value) {
+	  if (value !== undefined && !eq(object[key], value) || value === undefined && !(key in object)) {
+	    baseAssignValue(object, key, value);
+	  }
+	}
+
+	module.exports = assignMergeValue;
+
+/***/ }),
+/* 243 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var createBaseFor = __webpack_require__(518);
+
+	/**
+	 * The base implementation of `baseForOwn` which iterates over `object`
+	 * properties returned by `keysFunc` and invokes `iteratee` for each property.
+	 * Iteratee functions may exit iteration early by explicitly returning `false`.
+	 *
+	 * @private
+	 * @param {Object} object The object to iterate over.
+	 * @param {Function} iteratee The function invoked per iteration.
+	 * @param {Function} keysFunc The function to get the keys of `object`.
+	 * @returns {Object} Returns `object`.
+	 */
+	var baseFor = createBaseFor();
+
+	module.exports = baseFor;
+
+/***/ }),
+/* 244 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var castPath = __webpack_require__(250),
+	    toKey = __webpack_require__(108);
+
+	/**
+	 * The base implementation of `_.get` without support for default values.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @param {Array|string} path The path of the property to get.
+	 * @returns {*} Returns the resolved value.
+	 */
+	function baseGet(object, path) {
+	  path = castPath(path, object);
+
+	  var index = 0,
+	      length = path.length;
+
+	  while (object != null && index < length) {
+	    object = object[toKey(path[index++])];
+	  }
+	  return index && index == length ? object : undefined;
+	}
+
+	module.exports = baseGet;
+
+/***/ }),
+/* 245 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var arrayPush = __webpack_require__(157),
+	    isArray = __webpack_require__(6);
+
+	/**
+	 * The base implementation of `getAllKeys` and `getAllKeysIn` which uses
+	 * `keysFunc` and `symbolsFunc` to get the enumerable property names and
+	 * symbols of `object`.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @param {Function} keysFunc The function to get the keys of `object`.
+	 * @param {Function} symbolsFunc The function to get the symbols of `object`.
+	 * @returns {Array} Returns the array of property names and symbols.
+	 */
+	function baseGetAllKeys(object, keysFunc, symbolsFunc) {
+	  var result = keysFunc(object);
+	  return isArray(object) ? result : arrayPush(result, symbolsFunc(object));
+	}
+
+	module.exports = baseGetAllKeys;
+
+/***/ }),
+/* 246 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseIsEqualDeep = __webpack_require__(485),
+	    isObjectLike = __webpack_require__(25);
+
+	/**
+	 * The base implementation of `_.isEqual` which supports partial comparisons
+	 * and tracks traversed objects.
+	 *
+	 * @private
+	 * @param {*} value The value to compare.
+	 * @param {*} other The other value to compare.
+	 * @param {boolean} bitmask The bitmask flags.
+	 *  1 - Unordered comparison
+	 *  2 - Partial comparison
+	 * @param {Function} [customizer] The function to customize comparisons.
+	 * @param {Object} [stack] Tracks traversed `value` and `other` objects.
+	 * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+	 */
+	function baseIsEqual(value, other, bitmask, customizer, stack) {
+	  if (value === other) {
+	    return true;
+	  }
+	  if (value == null || other == null || !isObjectLike(value) && !isObjectLike(other)) {
+	    return value !== value && other !== other;
+	  }
+	  return baseIsEqualDeep(value, other, bitmask, customizer, baseIsEqual, stack);
+	}
+
+	module.exports = baseIsEqual;
+
+/***/ }),
+/* 247 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseEach = __webpack_require__(478),
+	    isArrayLike = __webpack_require__(24);
+
+	/**
+	 * The base implementation of `_.map` without support for iteratee shorthands.
+	 *
+	 * @private
+	 * @param {Array|Object} collection The collection to iterate over.
+	 * @param {Function} iteratee The function invoked per iteration.
+	 * @returns {Array} Returns the new mapped array.
+	 */
+	function baseMap(collection, iteratee) {
+	  var index = -1,
+	      result = isArrayLike(collection) ? Array(collection.length) : [];
+
+	  baseEach(collection, function (value, key, collection) {
+	    result[++index] = iteratee(value, key, collection);
+	  });
+	  return result;
+	}
+
+	module.exports = baseMap;
+
+/***/ }),
+/* 248 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Symbol = __webpack_require__(44),
+	    arrayMap = __webpack_require__(58),
+	    isArray = __webpack_require__(6),
+	    isSymbol = __webpack_require__(60);
+
+	/** Used as references for various `Number` constants. */
+	var INFINITY = 1 / 0;
+
+	/** Used to convert symbols to primitives and strings. */
+	var symbolProto = _Symbol ? _Symbol.prototype : undefined,
+	    symbolToString = symbolProto ? symbolProto.toString : undefined;
+
+	/**
+	 * The base implementation of `_.toString` which doesn't convert nullish
+	 * values to empty strings.
+	 *
+	 * @private
+	 * @param {*} value The value to process.
+	 * @returns {string} Returns the string.
+	 */
+	function baseToString(value) {
+	  // Exit early for strings to avoid a performance hit in some environments.
+	  if (typeof value == 'string') {
+	    return value;
+	  }
+	  if (isArray(value)) {
+	    // Recursively convert values (susceptible to call stack limits).
+	    return arrayMap(value, baseToString) + '';
+	  }
+	  if (isSymbol(value)) {
+	    return symbolToString ? symbolToString.call(value) : '';
+	  }
+	  var result = value + '';
+	  return result == '0' && 1 / value == -INFINITY ? '-0' : result;
+	}
+
+	module.exports = baseToString;
+
+/***/ }),
+/* 249 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Checks if a `cache` value for `key` exists.
+	 *
+	 * @private
+	 * @param {Object} cache The cache to query.
+	 * @param {string} key The key of the entry to check.
+	 * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+	 */
+	function cacheHas(cache, key) {
+	  return cache.has(key);
+	}
+
+	module.exports = cacheHas;
+
+/***/ }),
+/* 250 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isArray = __webpack_require__(6),
+	    isKey = __webpack_require__(169),
+	    stringToPath = __webpack_require__(562),
+	    toString = __webpack_require__(114);
+
+	/**
+	 * Casts `value` to a path array if it's not one.
+	 *
+	 * @private
+	 * @param {*} value The value to inspect.
+	 * @param {Object} [object] The object to query keys on.
+	 * @returns {Array} Returns the cast property path array.
+	 */
+	function castPath(value, object) {
+	  if (isArray(value)) {
+	    return value;
+	  }
+	  return isKey(value, object) ? [value] : stringToPath(toString(value));
+	}
+
+	module.exports = castPath;
+
+/***/ }),
+/* 251 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(module) {'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var root = __webpack_require__(15);
+
+	/** Detect free variable `exports`. */
+	var freeExports = ( false ? 'undefined' : _typeof(exports)) == 'object' && exports && !exports.nodeType && exports;
+
+	/** Detect free variable `module`. */
+	var freeModule = freeExports && ( false ? 'undefined' : _typeof(module)) == 'object' && module && !module.nodeType && module;
+
+	/** Detect the popular CommonJS extension `module.exports`. */
+	var moduleExports = freeModule && freeModule.exports === freeExports;
+
+	/** Built-in value references. */
+	var Buffer = moduleExports ? root.Buffer : undefined,
+	    allocUnsafe = Buffer ? Buffer.allocUnsafe : undefined;
+
+	/**
+	 * Creates a clone of  `buffer`.
+	 *
+	 * @private
+	 * @param {Buffer} buffer The buffer to clone.
+	 * @param {boolean} [isDeep] Specify a deep clone.
+	 * @returns {Buffer} Returns the cloned buffer.
+	 */
+	function cloneBuffer(buffer, isDeep) {
+	  if (isDeep) {
+	    return buffer.slice();
+	  }
+	  var length = buffer.length,
+	      result = allocUnsafe ? allocUnsafe(length) : new buffer.constructor(length);
+
+	  buffer.copy(result);
+	  return result;
+	}
+
+	module.exports = cloneBuffer;
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(39)(module)))
+
+/***/ }),
+/* 252 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var cloneArrayBuffer = __webpack_require__(163);
+
+	/**
+	 * Creates a clone of `typedArray`.
+	 *
+	 * @private
+	 * @param {Object} typedArray The typed array to clone.
+	 * @param {boolean} [isDeep] Specify a deep clone.
+	 * @returns {Object} Returns the cloned typed array.
+	 */
+	function cloneTypedArray(typedArray, isDeep) {
+	  var buffer = isDeep ? cloneArrayBuffer(typedArray.buffer) : typedArray.buffer;
+	  return new typedArray.constructor(buffer, typedArray.byteOffset, typedArray.length);
+	}
+
+	module.exports = cloneTypedArray;
+
+/***/ }),
+/* 253 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseIteratee = __webpack_require__(59),
+	    isArrayLike = __webpack_require__(24),
+	    keys = __webpack_require__(31);
+
+	/**
+	 * Creates a `_.find` or `_.findLast` function.
+	 *
+	 * @private
+	 * @param {Function} findIndexFunc The function to find the collection index.
+	 * @returns {Function} Returns the new find function.
+	 */
+	function createFind(findIndexFunc) {
+	  return function (collection, predicate, fromIndex) {
+	    var iterable = Object(collection);
+	    if (!isArrayLike(collection)) {
+	      var iteratee = baseIteratee(predicate, 3);
+	      collection = keys(collection);
+	      predicate = function predicate(key) {
+	        return iteratee(iterable[key], key, iterable);
+	      };
+	    }
+	    var index = findIndexFunc(collection, predicate, fromIndex);
+	    return index > -1 ? iterable[iteratee ? collection[index] : index] : undefined;
+	  };
+	}
+
+	module.exports = createFind;
+
+/***/ }),
+/* 254 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getNative = __webpack_require__(38);
+
+	var defineProperty = function () {
+	  try {
+	    var func = getNative(Object, 'defineProperty');
+	    func({}, '', {});
+	    return func;
+	  } catch (e) {}
+	}();
+
+	module.exports = defineProperty;
+
+/***/ }),
+/* 255 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var SetCache = __webpack_require__(237),
+	    arraySome = __webpack_require__(473),
+	    cacheHas = __webpack_require__(249);
+
+	/** Used to compose bitmasks for value comparisons. */
+	var COMPARE_PARTIAL_FLAG = 1,
+	    COMPARE_UNORDERED_FLAG = 2;
+
+	/**
+	 * A specialized version of `baseIsEqualDeep` for arrays with support for
+	 * partial deep comparisons.
+	 *
+	 * @private
+	 * @param {Array} array The array to compare.
+	 * @param {Array} other The other array to compare.
+	 * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+	 * @param {Function} customizer The function to customize comparisons.
+	 * @param {Function} equalFunc The function to determine equivalents of values.
+	 * @param {Object} stack Tracks traversed `array` and `other` objects.
+	 * @returns {boolean} Returns `true` if the arrays are equivalent, else `false`.
+	 */
+	function equalArrays(array, other, bitmask, customizer, equalFunc, stack) {
+	  var isPartial = bitmask & COMPARE_PARTIAL_FLAG,
+	      arrLength = array.length,
+	      othLength = other.length;
+
+	  if (arrLength != othLength && !(isPartial && othLength > arrLength)) {
+	    return false;
+	  }
+	  // Assume cyclic values are equal.
+	  var stacked = stack.get(array);
+	  if (stacked && stack.get(other)) {
+	    return stacked == other;
+	  }
+	  var index = -1,
+	      result = true,
+	      seen = bitmask & COMPARE_UNORDERED_FLAG ? new SetCache() : undefined;
+
+	  stack.set(array, other);
+	  stack.set(other, array);
+
+	  // Ignore non-index properties.
+	  while (++index < arrLength) {
+	    var arrValue = array[index],
+	        othValue = other[index];
+
+	    if (customizer) {
+	      var compared = isPartial ? customizer(othValue, arrValue, index, other, array, stack) : customizer(arrValue, othValue, index, array, other, stack);
+	    }
+	    if (compared !== undefined) {
+	      if (compared) {
+	        continue;
+	      }
+	      result = false;
+	      break;
+	    }
+	    // Recursively compare arrays (susceptible to call stack limits).
+	    if (seen) {
+	      if (!arraySome(other, function (othValue, othIndex) {
+	        if (!cacheHas(seen, othIndex) && (arrValue === othValue || equalFunc(arrValue, othValue, bitmask, customizer, stack))) {
+	          return seen.push(othIndex);
+	        }
+	      })) {
+	        result = false;
+	        break;
+	      }
+	    } else if (!(arrValue === othValue || equalFunc(arrValue, othValue, bitmask, customizer, stack))) {
+	      result = false;
+	      break;
+	    }
+	  }
+	  stack['delete'](array);
+	  stack['delete'](other);
+	  return result;
+	}
+
+	module.exports = equalArrays;
+
+/***/ }),
+/* 256 */
+/***/ (function(module, exports) {
+
+	/* WEBPACK VAR INJECTION */(function(global) {'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	/** Detect free variable `global` from Node.js. */
+	var freeGlobal = (typeof global === 'undefined' ? 'undefined' : _typeof(global)) == 'object' && global && global.Object === Object && global;
+
+	module.exports = freeGlobal;
+	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
+
+/***/ }),
+/* 257 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseGetAllKeys = __webpack_require__(245),
+	    getSymbols = __webpack_require__(166),
+	    keys = __webpack_require__(31);
+
+	/**
+	 * Creates an array of own enumerable property names and symbols of `object`.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the array of property names and symbols.
+	 */
+	function getAllKeys(object) {
+	  return baseGetAllKeys(object, keys, getSymbols);
+	}
+
+	module.exports = getAllKeys;
+
+/***/ }),
+/* 258 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var arrayPush = __webpack_require__(157),
+	    getPrototype = __webpack_require__(165),
+	    getSymbols = __webpack_require__(166),
+	    stubArray = __webpack_require__(274);
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeGetSymbols = Object.getOwnPropertySymbols;
+
+	/**
+	 * Creates an array of the own and inherited enumerable symbols of `object`.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the array of symbols.
+	 */
+	var getSymbolsIn = !nativeGetSymbols ? stubArray : function (object) {
+	  var result = [];
+	  while (object) {
+	    arrayPush(result, getSymbols(object));
+	    object = getPrototype(object);
+	  }
+	  return result;
+	};
+
+	module.exports = getSymbolsIn;
+
+/***/ }),
+/* 259 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var DataView = __webpack_require__(463),
+	    Map = __webpack_require__(155),
+	    Promise = __webpack_require__(465),
+	    Set = __webpack_require__(236),
+	    WeakMap = __webpack_require__(466),
+	    baseGetTag = __webpack_require__(29),
+	    toSource = __webpack_require__(267);
+
+	/** `Object#toString` result references. */
+	var mapTag = '[object Map]',
+	    objectTag = '[object Object]',
+	    promiseTag = '[object Promise]',
+	    setTag = '[object Set]',
+	    weakMapTag = '[object WeakMap]';
+
+	var dataViewTag = '[object DataView]';
+
+	/** Used to detect maps, sets, and weakmaps. */
+	var dataViewCtorString = toSource(DataView),
+	    mapCtorString = toSource(Map),
+	    promiseCtorString = toSource(Promise),
+	    setCtorString = toSource(Set),
+	    weakMapCtorString = toSource(WeakMap);
+
+	/**
+	 * Gets the `toStringTag` of `value`.
+	 *
+	 * @private
+	 * @param {*} value The value to query.
+	 * @returns {string} Returns the `toStringTag`.
+	 */
+	var getTag = baseGetTag;
+
+	// Fallback for data views, maps, sets, and weak maps in IE 11 and promises in Node.js < 6.
+	if (DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag || Map && getTag(new Map()) != mapTag || Promise && getTag(Promise.resolve()) != promiseTag || Set && getTag(new Set()) != setTag || WeakMap && getTag(new WeakMap()) != weakMapTag) {
+	    getTag = function getTag(value) {
+	        var result = baseGetTag(value),
+	            Ctor = result == objectTag ? value.constructor : undefined,
+	            ctorString = Ctor ? toSource(Ctor) : '';
+
+	        if (ctorString) {
+	            switch (ctorString) {
+	                case dataViewCtorString:
+	                    return dataViewTag;
+	                case mapCtorString:
+	                    return mapTag;
+	                case promiseCtorString:
+	                    return promiseTag;
+	                case setCtorString:
+	                    return setTag;
+	                case weakMapCtorString:
+	                    return weakMapTag;
+	            }
+	        }
+	        return result;
+	    };
+	}
+
+	module.exports = getTag;
+
+/***/ }),
+/* 260 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var castPath = __webpack_require__(250),
+	    isArguments = __webpack_require__(112),
+	    isArray = __webpack_require__(6),
+	    isIndex = __webpack_require__(167),
+	    isLength = __webpack_require__(172),
+	    toKey = __webpack_require__(108);
+
+	/**
+	 * Checks if `path` exists on `object`.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @param {Array|string} path The path to check.
+	 * @param {Function} hasFunc The function to check properties.
+	 * @returns {boolean} Returns `true` if `path` exists, else `false`.
+	 */
+	function hasPath(object, path, hasFunc) {
+	  path = castPath(path, object);
+
+	  var index = -1,
+	      length = path.length,
+	      result = false;
+
+	  while (++index < length) {
+	    var key = toKey(path[index]);
+	    if (!(result = object != null && hasFunc(object, key))) {
+	      break;
+	    }
+	    object = object[key];
+	  }
+	  if (result || ++index != length) {
+	    return result;
+	  }
+	  length = object == null ? 0 : object.length;
+	  return !!length && isLength(length) && isIndex(key, length) && (isArray(object) || isArguments(object));
+	}
+
+	module.exports = hasPath;
+
+/***/ }),
+/* 261 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseCreate = __webpack_require__(477),
+	    getPrototype = __webpack_require__(165),
+	    isPrototype = __webpack_require__(105);
+
+	/**
+	 * Initializes an object clone.
+	 *
+	 * @private
+	 * @param {Object} object The object to clone.
+	 * @returns {Object} Returns the initialized clone.
+	 */
+	function initCloneObject(object) {
+	    return typeof object.constructor == 'function' && !isPrototype(object) ? baseCreate(getPrototype(object)) : {};
+	}
+
+	module.exports = initCloneObject;
+
+/***/ }),
+/* 262 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isObject = __webpack_require__(16);
+
+	/**
+	 * Checks if `value` is suitable for strict equality comparisons, i.e. `===`.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` if suitable for strict
+	 *  equality comparisons, else `false`.
+	 */
+	function isStrictComparable(value) {
+	  return value === value && !isObject(value);
+	}
+
+	module.exports = isStrictComparable;
+
+/***/ }),
+/* 263 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Converts `map` to its key-value pairs.
+	 *
+	 * @private
+	 * @param {Object} map The map to convert.
+	 * @returns {Array} Returns the key-value pairs.
+	 */
+	function mapToArray(map) {
+	  var index = -1,
+	      result = Array(map.size);
+
+	  map.forEach(function (value, key) {
+	    result[++index] = [key, value];
+	  });
+	  return result;
+	}
+
+	module.exports = mapToArray;
+
+/***/ }),
+/* 264 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * A specialized version of `matchesProperty` for source values suitable
+	 * for strict equality comparisons, i.e. `===`.
+	 *
+	 * @private
+	 * @param {string} key The key of the property to get.
+	 * @param {*} srcValue The value to match.
+	 * @returns {Function} Returns the new spec function.
+	 */
+	function matchesStrictComparable(key, srcValue) {
+	  return function (object) {
+	    if (object == null) {
+	      return false;
+	    }
+	    return object[key] === srcValue && (srcValue !== undefined || key in Object(object));
+	  };
+	}
+
+	module.exports = matchesStrictComparable;
+
+/***/ }),
+/* 265 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(module) {'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var freeGlobal = __webpack_require__(256);
+
+	/** Detect free variable `exports`. */
+	var freeExports = ( false ? 'undefined' : _typeof(exports)) == 'object' && exports && !exports.nodeType && exports;
+
+	/** Detect free variable `module`. */
+	var freeModule = freeExports && ( false ? 'undefined' : _typeof(module)) == 'object' && module && !module.nodeType && module;
+
+	/** Detect the popular CommonJS extension `module.exports`. */
+	var moduleExports = freeModule && freeModule.exports === freeExports;
+
+	/** Detect free variable `process` from Node.js. */
+	var freeProcess = moduleExports && freeGlobal.process;
+
+	/** Used to access faster Node.js helpers. */
+	var nodeUtil = function () {
+	  try {
+	    return freeProcess && freeProcess.binding && freeProcess.binding('util');
+	  } catch (e) {}
+	}();
+
+	module.exports = nodeUtil;
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(39)(module)))
+
+/***/ }),
+/* 266 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Creates a unary function that invokes `func` with its argument transformed.
+	 *
+	 * @private
+	 * @param {Function} func The function to wrap.
+	 * @param {Function} transform The argument transform.
+	 * @returns {Function} Returns the new function.
+	 */
+	function overArg(func, transform) {
+	  return function (arg) {
+	    return func(transform(arg));
+	  };
+	}
+
+	module.exports = overArg;
+
+/***/ }),
+/* 267 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/** Used for built-in method references. */
+	var funcProto = Function.prototype;
+
+	/** Used to resolve the decompiled source of functions. */
+	var funcToString = funcProto.toString;
+
+	/**
+	 * Converts `func` to its source code.
+	 *
+	 * @private
+	 * @param {Function} func The function to convert.
+	 * @returns {string} Returns the source code.
+	 */
+	function toSource(func) {
+	  if (func != null) {
+	    try {
+	      return funcToString.call(func);
+	    } catch (e) {}
+	    try {
+	      return func + '';
+	    } catch (e) {}
+	  }
+	  return '';
+	}
+
+	module.exports = toSource;
+
+/***/ }),
+/* 268 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var apply = __webpack_require__(239),
+	    assignInWith = __webpack_require__(564),
+	    baseRest = __webpack_require__(101),
+	    customDefaultsAssignIn = __webpack_require__(520);
+
+	/**
+	 * Assigns own and inherited enumerable string keyed properties of source
+	 * objects to the destination object for all destination properties that
+	 * resolve to `undefined`. Source objects are applied from left to right.
+	 * Once a property is set, additional values of the same property are ignored.
+	 *
+	 * **Note:** This method mutates `object`.
+	 *
+	 * @static
+	 * @since 0.1.0
+	 * @memberOf _
+	 * @category Object
+	 * @param {Object} object The destination object.
+	 * @param {...Object} [sources] The source objects.
+	 * @returns {Object} Returns `object`.
+	 * @see _.defaultsDeep
+	 * @example
+	 *
+	 * _.defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+	 * // => { 'a': 1, 'b': 2 }
+	 */
+	var defaults = baseRest(function (args) {
+	  args.push(undefined, customDefaultsAssignIn);
+	  return apply(assignInWith, undefined, args);
+	});
+
+	module.exports = defaults;
+
+/***/ }),
+/* 269 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseHas = __webpack_require__(481),
+	    hasPath = __webpack_require__(260);
+
+	/**
+	 * Checks if `path` is a direct property of `object`.
+	 *
+	 * @static
+	 * @since 0.1.0
+	 * @memberOf _
+	 * @category Object
+	 * @param {Object} object The object to query.
+	 * @param {Array|string} path The path to check.
+	 * @returns {boolean} Returns `true` if `path` exists, else `false`.
+	 * @example
+	 *
+	 * var object = { 'a': { 'b': 2 } };
+	 * var other = _.create({ 'a': _.create({ 'b': 2 }) });
+	 *
+	 * _.has(object, 'a');
+	 * // => true
+	 *
+	 * _.has(object, 'a.b');
+	 * // => true
+	 *
+	 * _.has(object, ['a', 'b']);
+	 * // => true
+	 *
+	 * _.has(other, 'a');
+	 * // => false
+	 */
+	function has(object, path) {
+	  return object != null && hasPath(object, path, baseHas);
+	}
+
+	module.exports = has;
+
+/***/ }),
+/* 270 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseGetTag = __webpack_require__(29),
+	    getPrototype = __webpack_require__(165),
+	    isObjectLike = __webpack_require__(25);
+
+	/** `Object#toString` result references. */
+	var objectTag = '[object Object]';
+
+	/** Used for built-in method references. */
+	var funcProto = Function.prototype,
+	    objectProto = Object.prototype;
+
+	/** Used to resolve the decompiled source of functions. */
+	var funcToString = funcProto.toString;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/** Used to infer the `Object` constructor. */
+	var objectCtorString = funcToString.call(Object);
+
+	/**
+	 * Checks if `value` is a plain object, that is, an object created by the
+	 * `Object` constructor or one with a `[[Prototype]]` of `null`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.8.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a plain object, else `false`.
+	 * @example
+	 *
+	 * function Foo() {
+	 *   this.a = 1;
+	 * }
+	 *
+	 * _.isPlainObject(new Foo);
+	 * // => false
+	 *
+	 * _.isPlainObject([1, 2, 3]);
+	 * // => false
+	 *
+	 * _.isPlainObject({ 'x': 0, 'y': 0 });
+	 * // => true
+	 *
+	 * _.isPlainObject(Object.create(null));
+	 * // => true
+	 */
+	function isPlainObject(value) {
+	  if (!isObjectLike(value) || baseGetTag(value) != objectTag) {
+	    return false;
+	  }
+	  var proto = getPrototype(value);
+	  if (proto === null) {
+	    return true;
+	  }
+	  var Ctor = hasOwnProperty.call(proto, 'constructor') && proto.constructor;
+	  return typeof Ctor == 'function' && Ctor instanceof Ctor && funcToString.call(Ctor) == objectCtorString;
+	}
+
+	module.exports = isPlainObject;
+
+/***/ }),
+/* 271 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseIsRegExp = __webpack_require__(489),
+	    baseUnary = __webpack_require__(102),
+	    nodeUtil = __webpack_require__(265);
+
+	/* Node.js helper references. */
+	var nodeIsRegExp = nodeUtil && nodeUtil.isRegExp;
+
+	/**
+	 * Checks if `value` is classified as a `RegExp` object.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a regexp, else `false`.
+	 * @example
+	 *
+	 * _.isRegExp(/abc/);
+	 * // => true
+	 *
+	 * _.isRegExp('/abc/');
+	 * // => false
+	 */
+	var isRegExp = nodeIsRegExp ? baseUnary(nodeIsRegExp) : baseIsRegExp;
+
+	module.exports = isRegExp;
+
+/***/ }),
+/* 272 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseRest = __webpack_require__(101),
+	    pullAll = __webpack_require__(584);
+
+	/**
+	 * Removes all given values from `array` using
+	 * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+	 * for equality comparisons.
+	 *
+	 * **Note:** Unlike `_.without`, this method mutates `array`. Use `_.remove`
+	 * to remove elements from an array by predicate.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 2.0.0
+	 * @category Array
+	 * @param {Array} array The array to modify.
+	 * @param {...*} [values] The values to remove.
+	 * @returns {Array} Returns `array`.
+	 * @example
+	 *
+	 * var array = ['a', 'b', 'c', 'a', 'b', 'c'];
+	 *
+	 * _.pull(array, 'a', 'c');
+	 * console.log(array);
+	 * // => ['b', 'b']
+	 */
+	var pull = baseRest(pullAll);
+
+	module.exports = pull;
+
+/***/ }),
+/* 273 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseRepeat = __webpack_require__(501),
+	    isIterateeCall = __webpack_require__(168),
+	    toInteger = __webpack_require__(47),
+	    toString = __webpack_require__(114);
+
+	/**
+	 * Repeats the given string `n` times.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 3.0.0
+	 * @category String
+	 * @param {string} [string=''] The string to repeat.
+	 * @param {number} [n=1] The number of times to repeat the string.
+	 * @param- {Object} [guard] Enables use as an iteratee for methods like `_.map`.
+	 * @returns {string} Returns the repeated string.
+	 * @example
+	 *
+	 * _.repeat('*', 3);
+	 * // => '***'
+	 *
+	 * _.repeat('abc', 2);
+	 * // => 'abcabc'
+	 *
+	 * _.repeat('abc', 0);
+	 * // => ''
+	 */
+	function repeat(string, n, guard) {
+	  if (guard ? isIterateeCall(string, n, guard) : n === undefined) {
+	    n = 1;
+	  } else {
+	    n = toInteger(n);
+	  }
+	  return baseRepeat(toString(string), n);
+	}
+
+	module.exports = repeat;
+
+/***/ }),
+/* 274 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * This method returns a new empty array.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.13.0
+	 * @category Util
+	 * @returns {Array} Returns the new empty array.
+	 * @example
+	 *
+	 * var arrays = _.times(2, _.stubArray);
+	 *
+	 * console.log(arrays);
+	 * // => [[], []]
+	 *
+	 * console.log(arrays[0] === arrays[1]);
+	 * // => false
+	 */
+	function stubArray() {
+	  return [];
+	}
+
+	module.exports = stubArray;
+
+/***/ }),
+/* 275 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseValues = __webpack_require__(506),
+	    keys = __webpack_require__(31);
+
+	/**
+	 * Creates an array of the own enumerable string keyed property values of `object`.
+	 *
+	 * **Note:** Non-object values are coerced to objects.
+	 *
+	 * @static
+	 * @since 0.1.0
+	 * @memberOf _
+	 * @category Object
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the array of property values.
+	 * @example
+	 *
+	 * function Foo() {
+	 *   this.a = 1;
+	 *   this.b = 2;
+	 * }
+	 *
+	 * Foo.prototype.c = 3;
+	 *
+	 * _.values(new Foo);
+	 * // => [1, 2] (iteration order is not guaranteed)
+	 *
+	 * _.values('hi');
+	 * // => ['h', 'i']
+	 */
+	function values(object) {
+	  return object == null ? [] : baseValues(object, keys(object));
+	}
+
+	module.exports = values;
+
+/***/ }),
+/* 276 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	var originalObject = Object;
+	var originalDefProp = Object.defineProperty;
+	var originalCreate = Object.create;
+
+	function defProp(obj, name, value) {
+	  if (originalDefProp) try {
+	    originalDefProp.call(originalObject, obj, name, { value: value });
+	  } catch (definePropertyIsBrokenInIE8) {
+	    obj[name] = value;
+	  } else {
+	    obj[name] = value;
+	  }
+	}
+
+	// For functions that will be invoked using .call or .apply, we need to
+	// define those methods on the function objects themselves, rather than
+	// inheriting them from Function.prototype, so that a malicious or clumsy
+	// third party cannot interfere with the functionality of this module by
+	// redefining Function.prototype.call or .apply.
+	function makeSafeToCall(fun) {
+	  if (fun) {
+	    defProp(fun, "call", fun.call);
+	    defProp(fun, "apply", fun.apply);
+	  }
+	  return fun;
+	}
+
+	makeSafeToCall(originalDefProp);
+	makeSafeToCall(originalCreate);
+
+	var hasOwn = makeSafeToCall(Object.prototype.hasOwnProperty);
+	var numToStr = makeSafeToCall(Number.prototype.toString);
+	var strSlice = makeSafeToCall(String.prototype.slice);
+
+	var cloner = function cloner() {};
+	function create(prototype) {
+	  if (originalCreate) {
+	    return originalCreate.call(originalObject, prototype);
+	  }
+	  cloner.prototype = prototype || null;
+	  return new cloner();
+	}
+
+	var rand = Math.random;
+	var uniqueKeys = create(null);
+
+	function makeUniqueKey() {
+	  // Collisions are highly unlikely, but this module is in the business of
+	  // making guarantees rather than safe bets.
+	  do {
+	    var uniqueKey = internString(strSlice.call(numToStr.call(rand(), 36), 2));
+	  } while (hasOwn.call(uniqueKeys, uniqueKey));
+	  return uniqueKeys[uniqueKey] = uniqueKey;
+	}
+
+	function internString(str) {
+	  var obj = {};
+	  obj[str] = true;
+	  return Object.keys(obj)[0];
+	}
+
+	// External users might find this function useful, but it is not necessary
+	// for the typical use of this module.
+	exports.makeUniqueKey = makeUniqueKey;
+
+	// Object.getOwnPropertyNames is the only way to enumerate non-enumerable
+	// properties, so if we wrap it to ignore our secret keys, there should be
+	// no way (except guessing) to access those properties.
+	var originalGetOPNs = Object.getOwnPropertyNames;
+	Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
+	  for (var names = originalGetOPNs(object), src = 0, dst = 0, len = names.length; src < len; ++src) {
+	    if (!hasOwn.call(uniqueKeys, names[src])) {
+	      if (src > dst) {
+	        names[dst] = names[src];
+	      }
+	      ++dst;
+	    }
+	  }
+	  names.length = dst;
+	  return names;
+	};
+
+	function defaultCreatorFn(object) {
+	  return create(null);
+	}
+
+	function makeAccessor(secretCreatorFn) {
+	  var brand = makeUniqueKey();
+	  var passkey = create(null);
+
+	  secretCreatorFn = secretCreatorFn || defaultCreatorFn;
+
+	  function register(object) {
+	    var secret; // Created lazily.
+
+	    function vault(key, forget) {
+	      // Only code that has access to the passkey can retrieve (or forget)
+	      // the secret object.
+	      if (key === passkey) {
+	        return forget ? secret = null : secret || (secret = secretCreatorFn(object));
+	      }
+	    }
+
+	    defProp(object, brand, vault);
+	  }
+
+	  function accessor(object) {
+	    if (!hasOwn.call(object, brand)) register(object);
+	    return object[brand](passkey);
+	  }
+
+	  accessor.forget = function (object) {
+	    if (hasOwn.call(object, brand)) object[brand](passkey, true);
+	  };
+
+	  return accessor;
+	}
+
+	exports.makeAccessor = makeAccessor;
+
+/***/ }),
+/* 277 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(module, global) {'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	/*! https://mths.be/regenerate v1.3.2 by @mathias | MIT license */
+	;(function (root) {
+
+		// Detect free variables `exports`.
+		var freeExports = ( false ? 'undefined' : _typeof(exports)) == 'object' && exports;
+
+		// Detect free variable `module`.
+		var freeModule = ( false ? 'undefined' : _typeof(module)) == 'object' && module && module.exports == freeExports && module;
+
+		// Detect free variable `global`, from Node.js/io.js or Browserified code,
+		// and use it as `root`.
+		var freeGlobal = (typeof global === 'undefined' ? 'undefined' : _typeof(global)) == 'object' && global;
+		if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
+			root = freeGlobal;
+		}
+
+		/*--------------------------------------------------------------------------*/
+
+		var ERRORS = {
+			'rangeOrder': 'A range\u2019s `stop` value must be greater than or equal ' + 'to the `start` value.',
+			'codePointRange': 'Invalid code point value. Code points range from ' + 'U+000000 to U+10FFFF.'
+		};
+
+		// https://mathiasbynens.be/notes/javascript-encoding#surrogate-pairs
+		var HIGH_SURROGATE_MIN = 0xD800;
+		var HIGH_SURROGATE_MAX = 0xDBFF;
+		var LOW_SURROGATE_MIN = 0xDC00;
+		var LOW_SURROGATE_MAX = 0xDFFF;
+
+		// In Regenerate output, `\0` is never preceded by `\` because we sort by
+		// code point value, so let’s keep this regular expression simple.
+		var regexNull = /\\x00([^0123456789]|$)/g;
+
+		var object = {};
+		var hasOwnProperty = object.hasOwnProperty;
+		var extend = function extend(destination, source) {
+			var key;
+			for (key in source) {
+				if (hasOwnProperty.call(source, key)) {
+					destination[key] = source[key];
+				}
+			}
+			return destination;
+		};
+
+		var forEach = function forEach(array, callback) {
+			var index = -1;
+			var length = array.length;
+			while (++index < length) {
+				callback(array[index], index);
+			}
+		};
+
+		var toString = object.toString;
+		var isArray = function isArray(value) {
+			return toString.call(value) == '[object Array]';
+		};
+		var isNumber = function isNumber(value) {
+			return typeof value == 'number' || toString.call(value) == '[object Number]';
+		};
+
+		// This assumes that `number` is a positive integer that `toString()`s nicely
+		// (which is the case for all code point values).
+		var zeroes = '0000';
+		var pad = function pad(number, totalCharacters) {
+			var string = String(number);
+			return string.length < totalCharacters ? (zeroes + string).slice(-totalCharacters) : string;
+		};
+
+		var hex = function hex(number) {
+			return Number(number).toString(16).toUpperCase();
+		};
+
+		var slice = [].slice;
+
+		/*--------------------------------------------------------------------------*/
+
+		var dataFromCodePoints = function dataFromCodePoints(codePoints) {
+			var index = -1;
+			var length = codePoints.length;
+			var max = length - 1;
+			var result = [];
+			var isStart = true;
+			var tmp;
+			var previous = 0;
+			while (++index < length) {
+				tmp = codePoints[index];
+				if (isStart) {
+					result.push(tmp);
+					previous = tmp;
+					isStart = false;
+				} else {
+					if (tmp == previous + 1) {
+						if (index != max) {
+							previous = tmp;
+							continue;
+						} else {
+							isStart = true;
+							result.push(tmp + 1);
+						}
+					} else {
+						// End the previous range and start a new one.
+						result.push(previous + 1, tmp);
+						previous = tmp;
+					}
+				}
+			}
+			if (!isStart) {
+				result.push(tmp + 1);
+			}
+			return result;
+		};
+
+		var dataRemove = function dataRemove(data, codePoint) {
+			// Iterate over the data per `(start, end)` pair.
+			var index = 0;
+			var start;
+			var end;
+			var length = data.length;
+			while (index < length) {
+				start = data[index];
+				end = data[index + 1];
+				if (codePoint >= start && codePoint < end) {
+					// Modify this pair.
+					if (codePoint == start) {
+						if (end == start + 1) {
+							// Just remove `start` and `end`.
+							data.splice(index, 2);
+							return data;
+						} else {
+							// Just replace `start` with a new value.
+							data[index] = codePoint + 1;
+							return data;
+						}
+					} else if (codePoint == end - 1) {
+						// Just replace `end` with a new value.
+						data[index + 1] = codePoint;
+						return data;
+					} else {
+						// Replace `[start, end]` with `[startA, endA, startB, endB]`.
+						data.splice(index, 2, start, codePoint, codePoint + 1, end);
+						return data;
+					}
+				}
+				index += 2;
+			}
+			return data;
+		};
+
+		var dataRemoveRange = function dataRemoveRange(data, rangeStart, rangeEnd) {
+			if (rangeEnd < rangeStart) {
+				throw Error(ERRORS.rangeOrder);
+			}
+			// Iterate over the data per `(start, end)` pair.
+			var index = 0;
+			var start;
+			var end;
+			while (index < data.length) {
+				start = data[index];
+				end = data[index + 1] - 1; // Note: the `- 1` makes `end` inclusive.
+
+				// Exit as soon as no more matching pairs can be found.
+				if (start > rangeEnd) {
+					return data;
+				}
+
+				// Check if this range pair is equal to, or forms a subset of, the range
+				// to be removed.
+				// E.g. we have `[0, 11, 40, 51]` and want to remove 0-10 → `[40, 51]`.
+				// E.g. we have `[40, 51]` and want to remove 0-100 → `[]`.
+				if (rangeStart <= start && rangeEnd >= end) {
+					// Remove this pair.
+					data.splice(index, 2);
+					continue;
+				}
+
+				// Check if both `rangeStart` and `rangeEnd` are within the bounds of
+				// this pair.
+				// E.g. we have `[0, 11]` and want to remove 4-6 → `[0, 4, 7, 11]`.
+				if (rangeStart >= start && rangeEnd < end) {
+					if (rangeStart == start) {
+						// Replace `[start, end]` with `[startB, endB]`.
+						data[index] = rangeEnd + 1;
+						data[index + 1] = end + 1;
+						return data;
+					}
+					// Replace `[start, end]` with `[startA, endA, startB, endB]`.
+					data.splice(index, 2, start, rangeStart, rangeEnd + 1, end + 1);
+					return data;
+				}
+
+				// Check if only `rangeStart` is within the bounds of this pair.
+				// E.g. we have `[0, 11]` and want to remove 4-20 → `[0, 4]`.
+				if (rangeStart >= start && rangeStart <= end) {
+					// Replace `end` with `rangeStart`.
+					data[index + 1] = rangeStart;
+					// Note: we cannot `return` just yet, in case any following pairs still
+					// contain matching code points.
+					// E.g. we have `[0, 11, 14, 31]` and want to remove 4-20
+					// → `[0, 4, 21, 31]`.
+				}
+
+				// Check if only `rangeEnd` is within the bounds of this pair.
+				// E.g. we have `[14, 31]` and want to remove 4-20 → `[21, 31]`.
+				else if (rangeEnd >= start && rangeEnd <= end) {
+						// Just replace `start`.
+						data[index] = rangeEnd + 1;
+						return data;
+					}
+
+				index += 2;
+			}
+			return data;
+		};
+
+		var dataAdd = function dataAdd(data, codePoint) {
+			// Iterate over the data per `(start, end)` pair.
+			var index = 0;
+			var start;
+			var end;
+			var lastIndex = null;
+			var length = data.length;
+			if (codePoint < 0x0 || codePoint > 0x10FFFF) {
+				throw RangeError(ERRORS.codePointRange);
+			}
+			while (index < length) {
+				start = data[index];
+				end = data[index + 1];
+
+				// Check if the code point is already in the set.
+				if (codePoint >= start && codePoint < end) {
+					return data;
+				}
+
+				if (codePoint == start - 1) {
+					// Just replace `start` with a new value.
+					data[index] = codePoint;
+					return data;
+				}
+
+				// At this point, if `start` is `greater` than `codePoint`, insert a new
+				// `[start, end]` pair before the current pair, or after the current pair
+				// if there is a known `lastIndex`.
+				if (start > codePoint) {
+					data.splice(lastIndex != null ? lastIndex + 2 : 0, 0, codePoint, codePoint + 1);
+					return data;
+				}
+
+				if (codePoint == end) {
+					// Check if adding this code point causes two separate ranges to become
+					// a single range, e.g. `dataAdd([0, 4, 5, 10], 4)` → `[0, 10]`.
+					if (codePoint + 1 == data[index + 2]) {
+						data.splice(index, 4, start, data[index + 3]);
+						return data;
+					}
+					// Else, just replace `end` with a new value.
+					data[index + 1] = codePoint + 1;
+					return data;
+				}
+				lastIndex = index;
+				index += 2;
+			}
+			// The loop has finished; add the new pair to the end of the data set.
+			data.push(codePoint, codePoint + 1);
+			return data;
+		};
+
+		var dataAddData = function dataAddData(dataA, dataB) {
+			// Iterate over the data per `(start, end)` pair.
+			var index = 0;
+			var start;
+			var end;
+			var data = dataA.slice();
+			var length = dataB.length;
+			while (index < length) {
+				start = dataB[index];
+				end = dataB[index + 1] - 1;
+				if (start == end) {
+					data = dataAdd(data, start);
+				} else {
+					data = dataAddRange(data, start, end);
+				}
+				index += 2;
+			}
+			return data;
+		};
+
+		var dataRemoveData = function dataRemoveData(dataA, dataB) {
+			// Iterate over the data per `(start, end)` pair.
+			var index = 0;
+			var start;
+			var end;
+			var data = dataA.slice();
+			var length = dataB.length;
+			while (index < length) {
+				start = dataB[index];
+				end = dataB[index + 1] - 1;
+				if (start == end) {
+					data = dataRemove(data, start);
+				} else {
+					data = dataRemoveRange(data, start, end);
+				}
+				index += 2;
+			}
+			return data;
+		};
+
+		var dataAddRange = function dataAddRange(data, rangeStart, rangeEnd) {
+			if (rangeEnd < rangeStart) {
+				throw Error(ERRORS.rangeOrder);
+			}
+			if (rangeStart < 0x0 || rangeStart > 0x10FFFF || rangeEnd < 0x0 || rangeEnd > 0x10FFFF) {
+				throw RangeError(ERRORS.codePointRange);
+			}
+			// Iterate over the data per `(start, end)` pair.
+			var index = 0;
+			var start;
+			var end;
+			var added = false;
+			var length = data.length;
+			while (index < length) {
+				start = data[index];
+				end = data[index + 1];
+
+				if (added) {
+					// The range has already been added to the set; at this point, we just
+					// need to get rid of the following ranges in case they overlap.
+
+					// Check if this range can be combined with the previous range.
+					if (start == rangeEnd + 1) {
+						data.splice(index - 1, 2);
+						return data;
+					}
+
+					// Exit as soon as no more possibly overlapping pairs can be found.
+					if (start > rangeEnd) {
+						return data;
+					}
+
+					// E.g. `[0, 11, 12, 16]` and we’ve added 5-15, so we now have
+					// `[0, 16, 12, 16]`. Remove the `12,16` part, as it lies within the
+					// `0,16` range that was previously added.
+					if (start >= rangeStart && start <= rangeEnd) {
+						// `start` lies within the range that was previously added.
+
+						if (end > rangeStart && end - 1 <= rangeEnd) {
+							// `end` lies within the range that was previously added as well,
+							// so remove this pair.
+							data.splice(index, 2);
+							index -= 2;
+							// Note: we cannot `return` just yet, as there may still be other
+							// overlapping pairs.
+						} else {
+							// `start` lies within the range that was previously added, but
+							// `end` doesn’t. E.g. `[0, 11, 12, 31]` and we’ve added 5-15, so
+							// now we have `[0, 16, 12, 31]`. This must be written as `[0, 31]`.
+							// Remove the previously added `end` and the current `start`.
+							data.splice(index - 1, 2);
+							index -= 2;
+						}
+
+						// Note: we cannot return yet.
+					}
+				} else if (start == rangeEnd + 1) {
+					data[index] = rangeStart;
+					return data;
+				}
+
+				// Check if a new pair must be inserted *before* the current one.
+				else if (start > rangeEnd) {
+						data.splice(index, 0, rangeStart, rangeEnd + 1);
+						return data;
+					} else if (rangeStart >= start && rangeStart < end && rangeEnd + 1 <= end) {
+						// The new range lies entirely within an existing range pair. No action
+						// needed.
+						return data;
+					} else if (
+					// E.g. `[0, 11]` and you add 5-15 → `[0, 16]`.
+					rangeStart >= start && rangeStart < end ||
+					// E.g. `[0, 3]` and you add 3-6 → `[0, 7]`.
+					end == rangeStart) {
+						// Replace `end` with the new value.
+						data[index + 1] = rangeEnd + 1;
+						// Make sure the next range pair doesn’t overlap, e.g. `[0, 11, 12, 14]`
+						// and you add 5-15 → `[0, 16]`, i.e. remove the `12,14` part.
+						added = true;
+						// Note: we cannot `return` just yet.
+					} else if (rangeStart <= start && rangeEnd + 1 >= end) {
+						// The new range is a superset of the old range.
+						data[index] = rangeStart;
+						data[index + 1] = rangeEnd + 1;
+						added = true;
+					}
+
+				index += 2;
+			}
+			// The loop has finished without doing anything; add the new pair to the end
+			// of the data set.
+			if (!added) {
+				data.push(rangeStart, rangeEnd + 1);
+			}
+			return data;
+		};
+
+		var dataContains = function dataContains(data, codePoint) {
+			var index = 0;
+			var length = data.length;
+			// Exit early if `codePoint` is not within `data`’s overall range.
+			var start = data[index];
+			var end = data[length - 1];
+			if (length >= 2) {
+				if (codePoint < start || codePoint > end) {
+					return false;
+				}
+			}
+			// Iterate over the data per `(start, end)` pair.
+			while (index < length) {
+				start = data[index];
+				end = data[index + 1];
+				if (codePoint >= start && codePoint < end) {
+					return true;
+				}
+				index += 2;
+			}
+			return false;
+		};
+
+		var dataIntersection = function dataIntersection(data, codePoints) {
+			var index = 0;
+			var length = codePoints.length;
+			var codePoint;
+			var result = [];
+			while (index < length) {
+				codePoint = codePoints[index];
+				if (dataContains(data, codePoint)) {
+					result.push(codePoint);
+				}
+				++index;
+			}
+			return dataFromCodePoints(result);
+		};
+
+		var dataIsEmpty = function dataIsEmpty(data) {
+			return !data.length;
+		};
+
+		var dataIsSingleton = function dataIsSingleton(data) {
+			// Check if the set only represents a single code point.
+			return data.length == 2 && data[0] + 1 == data[1];
+		};
+
+		var dataToArray = function dataToArray(data) {
+			// Iterate over the data per `(start, end)` pair.
+			var index = 0;
+			var start;
+			var end;
+			var result = [];
+			var length = data.length;
+			while (index < length) {
+				start = data[index];
+				end = data[index + 1];
+				while (start < end) {
+					result.push(start);
+					++start;
+				}
+				index += 2;
+			}
+			return result;
+		};
+
+		/*--------------------------------------------------------------------------*/
+
+		// https://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
+		var floor = Math.floor;
+		var highSurrogate = function highSurrogate(codePoint) {
+			return parseInt(floor((codePoint - 0x10000) / 0x400) + HIGH_SURROGATE_MIN, 10);
+		};
+
+		var lowSurrogate = function lowSurrogate(codePoint) {
+			return parseInt((codePoint - 0x10000) % 0x400 + LOW_SURROGATE_MIN, 10);
+		};
+
+		var stringFromCharCode = String.fromCharCode;
+		var codePointToString = function codePointToString(codePoint) {
+			var string;
+			// https://mathiasbynens.be/notes/javascript-escapes#single
+			// Note: the `\b` escape sequence for U+0008 BACKSPACE in strings has a
+			// different meaning in regular expressions (word boundary), so it cannot
+			// be used here.
+			if (codePoint == 0x09) {
+				string = '\\t';
+			}
+			// Note: IE < 9 treats `'\v'` as `'v'`, so avoid using it.
+			// else if (codePoint == 0x0B) {
+			// 	string = '\\v';
+			// }
+			else if (codePoint == 0x0A) {
+					string = '\\n';
+				} else if (codePoint == 0x0C) {
+					string = '\\f';
+				} else if (codePoint == 0x0D) {
+					string = '\\r';
+				} else if (codePoint == 0x5C) {
+					string = '\\\\';
+				} else if (codePoint == 0x24 || codePoint >= 0x28 && codePoint <= 0x2B || codePoint == 0x2D || codePoint == 0x2E || codePoint == 0x3F || codePoint >= 0x5B && codePoint <= 0x5E || codePoint >= 0x7B && codePoint <= 0x7D) {
+					// The code point maps to an unsafe printable ASCII character;
+					// backslash-escape it. Here’s the list of those symbols:
+					//
+					//     $()*+-.?[\]^{|}
+					//
+					// See #7 for more info.
+					string = '\\' + stringFromCharCode(codePoint);
+				} else if (codePoint >= 0x20 && codePoint <= 0x7E) {
+					// The code point maps to one of these printable ASCII symbols
+					// (including the space character):
+					//
+					//      !"#%&',/0123456789:;<=>@ABCDEFGHIJKLMNO
+					//     PQRSTUVWXYZ_`abcdefghijklmnopqrstuvwxyz~
+					//
+					// These can safely be used directly.
+					string = stringFromCharCode(codePoint);
+				} else if (codePoint <= 0xFF) {
+					// https://mathiasbynens.be/notes/javascript-escapes#hexadecimal
+					string = '\\x' + pad(hex(codePoint), 2);
+				} else {
+					// `codePoint <= 0xFFFF` holds true.
+					// https://mathiasbynens.be/notes/javascript-escapes#unicode
+					string = '\\u' + pad(hex(codePoint), 4);
+				}
+
+			// There’s no need to account for astral symbols / surrogate pairs here,
+			// since `codePointToString` is private and only used for BMP code points.
+			// But if that’s what you need, just add an `else` block with this code:
+			//
+			//     string = '\\u' + pad(hex(highSurrogate(codePoint)), 4)
+			//     	+ '\\u' + pad(hex(lowSurrogate(codePoint)), 4);
+
+			return string;
+		};
+
+		var codePointToStringUnicode = function codePointToStringUnicode(codePoint) {
+			if (codePoint <= 0xFFFF) {
+				return codePointToString(codePoint);
+			}
+			return '\\u{' + codePoint.toString(16).toUpperCase() + '}';
+		};
+
+		var symbolToCodePoint = function symbolToCodePoint(symbol) {
+			var length = symbol.length;
+			var first = symbol.charCodeAt(0);
+			var second;
+			if (first >= HIGH_SURROGATE_MIN && first <= HIGH_SURROGATE_MAX && length > 1 // There is a next code unit.
+			) {
+					// `first` is a high surrogate, and there is a next character. Assume
+					// it’s a low surrogate (else it’s invalid usage of Regenerate anyway).
+					second = symbol.charCodeAt(1);
+					// https://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
+					return (first - HIGH_SURROGATE_MIN) * 0x400 + second - LOW_SURROGATE_MIN + 0x10000;
+				}
+			return first;
+		};
+
+		var createBMPCharacterClasses = function createBMPCharacterClasses(data) {
+			// Iterate over the data per `(start, end)` pair.
+			var result = '';
+			var index = 0;
+			var start;
+			var end;
+			var length = data.length;
+			if (dataIsSingleton(data)) {
+				return codePointToString(data[0]);
+			}
+			while (index < length) {
+				start = data[index];
+				end = data[index + 1] - 1; // Note: the `- 1` makes `end` inclusive.
+				if (start == end) {
+					result += codePointToString(start);
+				} else if (start + 1 == end) {
+					result += codePointToString(start) + codePointToString(end);
+				} else {
+					result += codePointToString(start) + '-' + codePointToString(end);
+				}
+				index += 2;
+			}
+			return '[' + result + ']';
+		};
+
+		var createUnicodeCharacterClasses = function createUnicodeCharacterClasses(data) {
+			// Iterate over the data per `(start, end)` pair.
+			var result = '';
+			var index = 0;
+			var start;
+			var end;
+			var length = data.length;
+			if (dataIsSingleton(data)) {
+				return codePointToStringUnicode(data[0]);
+			}
+			while (index < length) {
+				start = data[index];
+				end = data[index + 1] - 1; // Note: the `- 1` makes `end` inclusive.
+				if (start == end) {
+					result += codePointToStringUnicode(start);
+				} else if (start + 1 == end) {
+					result += codePointToStringUnicode(start) + codePointToStringUnicode(end);
+				} else {
+					result += codePointToStringUnicode(start) + '-' + codePointToStringUnicode(end);
+				}
+				index += 2;
+			}
+			return '[' + result + ']';
+		};
+
+		var splitAtBMP = function splitAtBMP(data) {
+			// Iterate over the data per `(start, end)` pair.
+			var loneHighSurrogates = [];
+			var loneLowSurrogates = [];
+			var bmp = [];
+			var astral = [];
+			var index = 0;
+			var start;
+			var end;
+			var length = data.length;
+			while (index < length) {
+				start = data[index];
+				end = data[index + 1] - 1; // Note: the `- 1` makes `end` inclusive.
+
+				if (start < HIGH_SURROGATE_MIN) {
+
+					// The range starts and ends before the high surrogate range.
+					// E.g. (0, 0x10).
+					if (end < HIGH_SURROGATE_MIN) {
+						bmp.push(start, end + 1);
+					}
+
+					// The range starts before the high surrogate range and ends within it.
+					// E.g. (0, 0xD855).
+					if (end >= HIGH_SURROGATE_MIN && end <= HIGH_SURROGATE_MAX) {
+						bmp.push(start, HIGH_SURROGATE_MIN);
+						loneHighSurrogates.push(HIGH_SURROGATE_MIN, end + 1);
+					}
+
+					// The range starts before the high surrogate range and ends in the low
+					// surrogate range. E.g. (0, 0xDCFF).
+					if (end >= LOW_SURROGATE_MIN && end <= LOW_SURROGATE_MAX) {
+						bmp.push(start, HIGH_SURROGATE_MIN);
+						loneHighSurrogates.push(HIGH_SURROGATE_MIN, HIGH_SURROGATE_MAX + 1);
+						loneLowSurrogates.push(LOW_SURROGATE_MIN, end + 1);
+					}
+
+					// The range starts before the high surrogate range and ends after the
+					// low surrogate range. E.g. (0, 0x10FFFF).
+					if (end > LOW_SURROGATE_MAX) {
+						bmp.push(start, HIGH_SURROGATE_MIN);
+						loneHighSurrogates.push(HIGH_SURROGATE_MIN, HIGH_SURROGATE_MAX + 1);
+						loneLowSurrogates.push(LOW_SURROGATE_MIN, LOW_SURROGATE_MAX + 1);
+						if (end <= 0xFFFF) {
+							bmp.push(LOW_SURROGATE_MAX + 1, end + 1);
+						} else {
+							bmp.push(LOW_SURROGATE_MAX + 1, 0xFFFF + 1);
+							astral.push(0xFFFF + 1, end + 1);
+						}
+					}
+				} else if (start >= HIGH_SURROGATE_MIN && start <= HIGH_SURROGATE_MAX) {
+
+					// The range starts and ends in the high surrogate range.
+					// E.g. (0xD855, 0xD866).
+					if (end >= HIGH_SURROGATE_MIN && end <= HIGH_SURROGATE_MAX) {
+						loneHighSurrogates.push(start, end + 1);
+					}
+
+					// The range starts in the high surrogate range and ends in the low
+					// surrogate range. E.g. (0xD855, 0xDCFF).
+					if (end >= LOW_SURROGATE_MIN && end <= LOW_SURROGATE_MAX) {
+						loneHighSurrogates.push(start, HIGH_SURROGATE_MAX + 1);
+						loneLowSurrogates.push(LOW_SURROGATE_MIN, end + 1);
+					}
+
+					// The range starts in the high surrogate range and ends after the low
+					// surrogate range. E.g. (0xD855, 0x10FFFF).
+					if (end > LOW_SURROGATE_MAX) {
+						loneHighSurrogates.push(start, HIGH_SURROGATE_MAX + 1);
+						loneLowSurrogates.push(LOW_SURROGATE_MIN, LOW_SURROGATE_MAX + 1);
+						if (end <= 0xFFFF) {
+							bmp.push(LOW_SURROGATE_MAX + 1, end + 1);
+						} else {
+							bmp.push(LOW_SURROGATE_MAX + 1, 0xFFFF + 1);
+							astral.push(0xFFFF + 1, end + 1);
+						}
+					}
+				} else if (start >= LOW_SURROGATE_MIN && start <= LOW_SURROGATE_MAX) {
+
+					// The range starts and ends in the low surrogate range.
+					// E.g. (0xDCFF, 0xDDFF).
+					if (end >= LOW_SURROGATE_MIN && end <= LOW_SURROGATE_MAX) {
+						loneLowSurrogates.push(start, end + 1);
+					}
+
+					// The range starts in the low surrogate range and ends after the low
+					// surrogate range. E.g. (0xDCFF, 0x10FFFF).
+					if (end > LOW_SURROGATE_MAX) {
+						loneLowSurrogates.push(start, LOW_SURROGATE_MAX + 1);
+						if (end <= 0xFFFF) {
+							bmp.push(LOW_SURROGATE_MAX + 1, end + 1);
+						} else {
+							bmp.push(LOW_SURROGATE_MAX + 1, 0xFFFF + 1);
+							astral.push(0xFFFF + 1, end + 1);
+						}
+					}
+				} else if (start > LOW_SURROGATE_MAX && start <= 0xFFFF) {
+
+					// The range starts and ends after the low surrogate range.
+					// E.g. (0xFFAA, 0x10FFFF).
+					if (end <= 0xFFFF) {
+						bmp.push(start, end + 1);
+					} else {
+						bmp.push(start, 0xFFFF + 1);
+						astral.push(0xFFFF + 1, end + 1);
+					}
+				} else {
+
+					// The range starts and ends in the astral range.
+					astral.push(start, end + 1);
+				}
+
+				index += 2;
+			}
+			return {
+				'loneHighSurrogates': loneHighSurrogates,
+				'loneLowSurrogates': loneLowSurrogates,
+				'bmp': bmp,
+				'astral': astral
+			};
+		};
+
+		var optimizeSurrogateMappings = function optimizeSurrogateMappings(surrogateMappings) {
+			var result = [];
+			var tmpLow = [];
+			var addLow = false;
+			var mapping;
+			var nextMapping;
+			var highSurrogates;
+			var lowSurrogates;
+			var nextHighSurrogates;
+			var nextLowSurrogates;
+			var index = -1;
+			var length = surrogateMappings.length;
+			while (++index < length) {
+				mapping = surrogateMappings[index];
+				nextMapping = surrogateMappings[index + 1];
+				if (!nextMapping) {
+					result.push(mapping);
+					continue;
+				}
+				highSurrogates = mapping[0];
+				lowSurrogates = mapping[1];
+				nextHighSurrogates = nextMapping[0];
+				nextLowSurrogates = nextMapping[1];
+
+				// Check for identical high surrogate ranges.
+				tmpLow = lowSurrogates;
+				while (nextHighSurrogates && highSurrogates[0] == nextHighSurrogates[0] && highSurrogates[1] == nextHighSurrogates[1]) {
+					// Merge with the next item.
+					if (dataIsSingleton(nextLowSurrogates)) {
+						tmpLow = dataAdd(tmpLow, nextLowSurrogates[0]);
+					} else {
+						tmpLow = dataAddRange(tmpLow, nextLowSurrogates[0], nextLowSurrogates[1] - 1);
+					}
+					++index;
+					mapping = surrogateMappings[index];
+					highSurrogates = mapping[0];
+					lowSurrogates = mapping[1];
+					nextMapping = surrogateMappings[index + 1];
+					nextHighSurrogates = nextMapping && nextMapping[0];
+					nextLowSurrogates = nextMapping && nextMapping[1];
+					addLow = true;
+				}
+				result.push([highSurrogates, addLow ? tmpLow : lowSurrogates]);
+				addLow = false;
+			}
+			return optimizeByLowSurrogates(result);
+		};
+
+		var optimizeByLowSurrogates = function optimizeByLowSurrogates(surrogateMappings) {
+			if (surrogateMappings.length == 1) {
+				return surrogateMappings;
+			}
+			var index = -1;
+			var innerIndex = -1;
+			while (++index < surrogateMappings.length) {
+				var mapping = surrogateMappings[index];
+				var lowSurrogates = mapping[1];
+				var lowSurrogateStart = lowSurrogates[0];
+				var lowSurrogateEnd = lowSurrogates[1];
+				innerIndex = index; // Note: the loop starts at the next index.
+				while (++innerIndex < surrogateMappings.length) {
+					var otherMapping = surrogateMappings[innerIndex];
+					var otherLowSurrogates = otherMapping[1];
+					var otherLowSurrogateStart = otherLowSurrogates[0];
+					var otherLowSurrogateEnd = otherLowSurrogates[1];
+					if (lowSurrogateStart == otherLowSurrogateStart && lowSurrogateEnd == otherLowSurrogateEnd) {
+						// Add the code points in the other item to this one.
+						if (dataIsSingleton(otherMapping[0])) {
+							mapping[0] = dataAdd(mapping[0], otherMapping[0][0]);
+						} else {
+							mapping[0] = dataAddRange(mapping[0], otherMapping[0][0], otherMapping[0][1] - 1);
+						}
+						// Remove the other, now redundant, item.
+						surrogateMappings.splice(innerIndex, 1);
+						--innerIndex;
+					}
+				}
+			}
+			return surrogateMappings;
+		};
+
+		var surrogateSet = function surrogateSet(data) {
+			// Exit early if `data` is an empty set.
+			if (!data.length) {
+				return [];
+			}
+
+			// Iterate over the data per `(start, end)` pair.
+			var index = 0;
+			var start;
+			var end;
+			var startHigh;
+			var startLow;
+			var endHigh;
+			var endLow;
+			var surrogateMappings = [];
+			var length = data.length;
+			while (index < length) {
+				start = data[index];
+				end = data[index + 1] - 1;
+
+				startHigh = highSurrogate(start);
+				startLow = lowSurrogate(start);
+				endHigh = highSurrogate(end);
+				endLow = lowSurrogate(end);
+
+				var startsWithLowestLowSurrogate = startLow == LOW_SURROGATE_MIN;
+				var endsWithHighestLowSurrogate = endLow == LOW_SURROGATE_MAX;
+				var complete = false;
+
+				// Append the previous high-surrogate-to-low-surrogate mappings.
+				// Step 1: `(startHigh, startLow)` to `(startHigh, LOW_SURROGATE_MAX)`.
+				if (startHigh == endHigh || startsWithLowestLowSurrogate && endsWithHighestLowSurrogate) {
+					surrogateMappings.push([[startHigh, endHigh + 1], [startLow, endLow + 1]]);
+					complete = true;
+				} else {
+					surrogateMappings.push([[startHigh, startHigh + 1], [startLow, LOW_SURROGATE_MAX + 1]]);
+				}
+
+				// Step 2: `(startHigh + 1, LOW_SURROGATE_MIN)` to
+				// `(endHigh - 1, LOW_SURROGATE_MAX)`.
+				if (!complete && startHigh + 1 < endHigh) {
+					if (endsWithHighestLowSurrogate) {
+						// Combine step 2 and step 3.
+						surrogateMappings.push([[startHigh + 1, endHigh + 1], [LOW_SURROGATE_MIN, endLow + 1]]);
+						complete = true;
+					} else {
+						surrogateMappings.push([[startHigh + 1, endHigh], [LOW_SURROGATE_MIN, LOW_SURROGATE_MAX + 1]]);
+					}
+				}
+
+				// Step 3. `(endHigh, LOW_SURROGATE_MIN)` to `(endHigh, endLow)`.
+				if (!complete) {
+					surrogateMappings.push([[endHigh, endHigh + 1], [LOW_SURROGATE_MIN, endLow + 1]]);
+				}
+
+				index += 2;
+			}
+
+			// The format of `surrogateMappings` is as follows:
+			//
+			//     [ surrogateMapping1, surrogateMapping2 ]
+			//
+			// i.e.:
+			//
+			//     [
+			//       [ highSurrogates1, lowSurrogates1 ],
+			//       [ highSurrogates2, lowSurrogates2 ]
+			//     ]
+			return optimizeSurrogateMappings(surrogateMappings);
+		};
+
+		var createSurrogateCharacterClasses = function createSurrogateCharacterClasses(surrogateMappings) {
+			var result = [];
+			forEach(surrogateMappings, function (surrogateMapping) {
+				var highSurrogates = surrogateMapping[0];
+				var lowSurrogates = surrogateMapping[1];
+				result.push(createBMPCharacterClasses(highSurrogates) + createBMPCharacterClasses(lowSurrogates));
+			});
+			return result.join('|');
+		};
+
+		var createCharacterClassesFromData = function createCharacterClassesFromData(data, bmpOnly, hasUnicodeFlag) {
+			if (hasUnicodeFlag) {
+				return createUnicodeCharacterClasses(data);
+			}
+			var result = [];
+
+			var parts = splitAtBMP(data);
+			var loneHighSurrogates = parts.loneHighSurrogates;
+			var loneLowSurrogates = parts.loneLowSurrogates;
+			var bmp = parts.bmp;
+			var astral = parts.astral;
+			var hasLoneHighSurrogates = !dataIsEmpty(loneHighSurrogates);
+			var hasLoneLowSurrogates = !dataIsEmpty(loneLowSurrogates);
+
+			var surrogateMappings = surrogateSet(astral);
+
+			if (bmpOnly) {
+				bmp = dataAddData(bmp, loneHighSurrogates);
+				hasLoneHighSurrogates = false;
+				bmp = dataAddData(bmp, loneLowSurrogates);
+				hasLoneLowSurrogates = false;
+			}
+
+			if (!dataIsEmpty(bmp)) {
+				// The data set contains BMP code points that are not high surrogates
+				// needed for astral code points in the set.
+				result.push(createBMPCharacterClasses(bmp));
+			}
+			if (surrogateMappings.length) {
+				// The data set contains astral code points; append character classes
+				// based on their surrogate pairs.
+				result.push(createSurrogateCharacterClasses(surrogateMappings));
+			}
+			// https://gist.github.com/mathiasbynens/bbe7f870208abcfec860
+			if (hasLoneHighSurrogates) {
+				result.push(createBMPCharacterClasses(loneHighSurrogates) +
+				// Make sure the high surrogates aren’t part of a surrogate pair.
+				'(?![\\uDC00-\\uDFFF])');
+			}
+			if (hasLoneLowSurrogates) {
+				result.push(
+				// It is not possible to accurately assert the low surrogates aren’t
+				// part of a surrogate pair, since JavaScript regular expressions do
+				// not support lookbehind.
+				'(?:[^\\uD800-\\uDBFF]|^)' + createBMPCharacterClasses(loneLowSurrogates));
+			}
+			return result.join('|');
+		};
+
+		/*--------------------------------------------------------------------------*/
+
+		// `regenerate` can be used as a constructor (and new methods can be added to
+		// its prototype) but also as a regular function, the latter of which is the
+		// documented and most common usage. For that reason, it’s not capitalized.
+		var regenerate = function regenerate(value) {
+			if (arguments.length > 1) {
+				value = slice.call(arguments);
+			}
+			if (this instanceof regenerate) {
+				this.data = [];
+				return value ? this.add(value) : this;
+			}
+			return new regenerate().add(value);
+		};
+
+		regenerate.version = '1.3.2';
+
+		var proto = regenerate.prototype;
+		extend(proto, {
+			'add': function add(value) {
+				var $this = this;
+				if (value == null) {
+					return $this;
+				}
+				if (value instanceof regenerate) {
+					// Allow passing other Regenerate instances.
+					$this.data = dataAddData($this.data, value.data);
+					return $this;
+				}
+				if (arguments.length > 1) {
+					value = slice.call(arguments);
+				}
+				if (isArray(value)) {
+					forEach(value, function (item) {
+						$this.add(item);
+					});
+					return $this;
+				}
+				$this.data = dataAdd($this.data, isNumber(value) ? value : symbolToCodePoint(value));
+				return $this;
+			},
+			'remove': function remove(value) {
+				var $this = this;
+				if (value == null) {
+					return $this;
+				}
+				if (value instanceof regenerate) {
+					// Allow passing other Regenerate instances.
+					$this.data = dataRemoveData($this.data, value.data);
+					return $this;
+				}
+				if (arguments.length > 1) {
+					value = slice.call(arguments);
+				}
+				if (isArray(value)) {
+					forEach(value, function (item) {
+						$this.remove(item);
+					});
+					return $this;
+				}
+				$this.data = dataRemove($this.data, isNumber(value) ? value : symbolToCodePoint(value));
+				return $this;
+			},
+			'addRange': function addRange(start, end) {
+				var $this = this;
+				$this.data = dataAddRange($this.data, isNumber(start) ? start : symbolToCodePoint(start), isNumber(end) ? end : symbolToCodePoint(end));
+				return $this;
+			},
+			'removeRange': function removeRange(start, end) {
+				var $this = this;
+				var startCodePoint = isNumber(start) ? start : symbolToCodePoint(start);
+				var endCodePoint = isNumber(end) ? end : symbolToCodePoint(end);
+				$this.data = dataRemoveRange($this.data, startCodePoint, endCodePoint);
+				return $this;
+			},
+			'intersection': function intersection(argument) {
+				var $this = this;
+				// Allow passing other Regenerate instances.
+				// TODO: Optimize this by writing and using `dataIntersectionData()`.
+				var array = argument instanceof regenerate ? dataToArray(argument.data) : argument;
+				$this.data = dataIntersection($this.data, array);
+				return $this;
+			},
+			'contains': function contains(codePoint) {
+				return dataContains(this.data, isNumber(codePoint) ? codePoint : symbolToCodePoint(codePoint));
+			},
+			'clone': function clone() {
+				var set = new regenerate();
+				set.data = this.data.slice(0);
+				return set;
+			},
+			'toString': function toString(options) {
+				var result = createCharacterClassesFromData(this.data, options ? options.bmpOnly : false, options ? options.hasUnicodeFlag : false);
+				if (!result) {
+					// For an empty set, return something that can be inserted `/here/` to
+					// form a valid regular expression. Avoid `(?:)` since that matches the
+					// empty string.
+					return '[]';
+				}
+				// Use `\0` instead of `\x00` where possible.
+				return result.replace(regexNull, '\\0$1');
+			},
+			'toRegExp': function toRegExp(flags) {
+				var pattern = this.toString(flags && flags.indexOf('u') != -1 ? { 'hasUnicodeFlag': true } : null);
+				return RegExp(pattern, flags || '');
+			},
+			'valueOf': function valueOf() {
+				// Note: `valueOf` is aliased as `toArray`.
+				return dataToArray(this.data);
+			}
+		});
+
+		proto.toArray = proto.valueOf;
+
+		// Some AMD build optimizers, like r.js, check for specific condition patterns
+		// like the following:
+		if ("function" == 'function' && _typeof(__webpack_require__(48)) == 'object' && __webpack_require__(48)) {
+			!(__WEBPACK_AMD_DEFINE_RESULT__ = function () {
+				return regenerate;
+			}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+		} else if (freeExports && !freeExports.nodeType) {
+			if (freeModule) {
+				// in Node.js, io.js, or RingoJS v0.8.0+
+				freeModule.exports = regenerate;
+			} else {
+				// in Narwhal or RingoJS v0.7.0-
+				freeExports.regenerate = regenerate;
+			}
+		} else {
+			// in Rhino or a web browser
+			root.regenerate = regenerate;
+		}
+	})(undefined);
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(39)(module), (function() { return this; }())))
+
+/***/ }),
+/* 278 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _stringify = __webpack_require__(34);
+
+	var _stringify2 = _interopRequireDefault(_stringify);
+
+	var _assert = __webpack_require__(62);
+
+	var _assert2 = _interopRequireDefault(_assert);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _leap = __webpack_require__(598);
+
+	var leap = _interopRequireWildcard(_leap);
+
+	var _meta = __webpack_require__(599);
+
+	var meta = _interopRequireWildcard(_meta);
+
+	var _util = __webpack_require__(279);
+
+	var util = _interopRequireWildcard(_util);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var hasOwn = Object.prototype.hasOwnProperty; /**
+	                                               * Copyright (c) 2014, Facebook, Inc.
+	                                               * All rights reserved.
+	                                               *
+	                                               * This source code is licensed under the BSD-style license found in the
+	                                               * https://raw.github.com/facebook/regenerator/master/LICENSE file. An
+	                                               * additional grant of patent rights can be found in the PATENTS file in
+	                                               * the same directory.
+	                                               */
+
+	function Emitter(contextId) {
+	  _assert2.default.ok(this instanceof Emitter);
+	  t.assertIdentifier(contextId);
+
+	  // Used to generate unique temporary names.
+	  this.nextTempId = 0;
+
+	  // In order to make sure the context object does not collide with
+	  // anything in the local scope, we might have to rename it, so we
+	  // refer to it symbolically instead of just assuming that it will be
+	  // called "context".
+	  this.contextId = contextId;
+
+	  // An append-only list of Statements that grows each time this.emit is
+	  // called.
+	  this.listing = [];
+
+	  // A sparse array whose keys correspond to locations in this.listing
+	  // that have been marked as branch/jump targets.
+	  this.marked = [true];
+
+	  // The last location will be marked when this.getDispatchLoop is
+	  // called.
+	  this.finalLoc = loc();
+
+	  // A list of all leap.TryEntry statements emitted.
+	  this.tryEntries = [];
+
+	  // Each time we evaluate the body of a loop, we tell this.leapManager
+	  // to enter a nested loop context that determines the meaning of break
+	  // and continue statements therein.
+	  this.leapManager = new leap.LeapManager(this);
+	}
+
+	var Ep = Emitter.prototype;
+	exports.Emitter = Emitter;
+
+	// Offsets into this.listing that could be used as targets for branches or
+	// jumps are represented as numeric Literal nodes. This representation has
+	// the amazingly convenient benefit of allowing the exact value of the
+	// location to be determined at any time, even after generating code that
+	// refers to the location.
+	function loc() {
+	  return t.numericLiteral(-1);
+	}
+
+	// Sets the exact value of the given location to the offset of the next
+	// Statement emitted.
+	Ep.mark = function (loc) {
+	  t.assertLiteral(loc);
+	  var index = this.listing.length;
+	  if (loc.value === -1) {
+	    loc.value = index;
+	  } else {
+	    // Locations can be marked redundantly, but their values cannot change
+	    // once set the first time.
+	    _assert2.default.strictEqual(loc.value, index);
+	  }
+	  this.marked[index] = true;
+	  return loc;
+	};
+
+	Ep.emit = function (node) {
+	  if (t.isExpression(node)) {
+	    node = t.expressionStatement(node);
+	  }
+
+	  t.assertStatement(node);
+	  this.listing.push(node);
+	};
+
+	// Shorthand for emitting assignment statements. This will come in handy
+	// for assignments to temporary variables.
+	Ep.emitAssign = function (lhs, rhs) {
+	  this.emit(this.assign(lhs, rhs));
+	  return lhs;
+	};
+
+	// Shorthand for an assignment statement.
+	Ep.assign = function (lhs, rhs) {
+	  return t.expressionStatement(t.assignmentExpression("=", lhs, rhs));
+	};
+
+	// Convenience function for generating expressions like context.next,
+	// context.sent, and context.rval.
+	Ep.contextProperty = function (name, computed) {
+	  return t.memberExpression(this.contextId, computed ? t.stringLiteral(name) : t.identifier(name), !!computed);
+	};
+
+	// Shorthand for setting context.rval and jumping to `context.stop()`.
+	Ep.stop = function (rval) {
+	  if (rval) {
+	    this.setReturnValue(rval);
+	  }
+
+	  this.jump(this.finalLoc);
+	};
+
+	Ep.setReturnValue = function (valuePath) {
+	  t.assertExpression(valuePath.value);
+
+	  this.emitAssign(this.contextProperty("rval"), this.explodeExpression(valuePath));
+	};
+
+	Ep.clearPendingException = function (tryLoc, assignee) {
+	  t.assertLiteral(tryLoc);
+
+	  var catchCall = t.callExpression(this.contextProperty("catch", true), [tryLoc]);
+
+	  if (assignee) {
+	    this.emitAssign(assignee, catchCall);
+	  } else {
+	    this.emit(catchCall);
+	  }
+	};
+
+	// Emits code for an unconditional jump to the given location, even if the
+	// exact value of the location is not yet known.
+	Ep.jump = function (toLoc) {
+	  this.emitAssign(this.contextProperty("next"), toLoc);
+	  this.emit(t.breakStatement());
+	};
+
+	// Conditional jump.
+	Ep.jumpIf = function (test, toLoc) {
+	  t.assertExpression(test);
+	  t.assertLiteral(toLoc);
+
+	  this.emit(t.ifStatement(test, t.blockStatement([this.assign(this.contextProperty("next"), toLoc), t.breakStatement()])));
+	};
+
+	// Conditional jump, with the condition negated.
+	Ep.jumpIfNot = function (test, toLoc) {
+	  t.assertExpression(test);
+	  t.assertLiteral(toLoc);
+
+	  var negatedTest = void 0;
+	  if (t.isUnaryExpression(test) && test.operator === "!") {
+	    // Avoid double negation.
+	    negatedTest = test.argument;
+	  } else {
+	    negatedTest = t.unaryExpression("!", test);
+	  }
+
+	  this.emit(t.ifStatement(negatedTest, t.blockStatement([this.assign(this.contextProperty("next"), toLoc), t.breakStatement()])));
+	};
+
+	// Returns a unique MemberExpression that can be used to store and
+	// retrieve temporary values. Since the object of the member expression is
+	// the context object, which is presumed to coexist peacefully with all
+	// other local variables, and since we just increment `nextTempId`
+	// monotonically, uniqueness is assured.
+	Ep.makeTempVar = function () {
+	  return this.contextProperty("t" + this.nextTempId++);
+	};
+
+	Ep.getContextFunction = function (id) {
+	  return t.functionExpression(id || null /*Anonymous*/
+	  , [this.contextId], t.blockStatement([this.getDispatchLoop()]), false, // Not a generator anymore!
+	  false // Nor an expression.
+	  );
+	};
+
+	// Turns this.listing into a loop of the form
+	//
+	//   while (1) switch (context.next) {
+	//   case 0:
+	//   ...
+	//   case n:
+	//     return context.stop();
+	//   }
+	//
+	// Each marked location in this.listing will correspond to one generated
+	// case statement.
+	Ep.getDispatchLoop = function () {
+	  var self = this;
+	  var cases = [];
+	  var current = void 0;
+
+	  // If we encounter a break, continue, or return statement in a switch
+	  // case, we can skip the rest of the statements until the next case.
+	  var alreadyEnded = false;
+
+	  self.listing.forEach(function (stmt, i) {
+	    if (self.marked.hasOwnProperty(i)) {
+	      cases.push(t.switchCase(t.numericLiteral(i), current = []));
+	      alreadyEnded = false;
+	    }
+
+	    if (!alreadyEnded) {
+	      current.push(stmt);
+	      if (t.isCompletionStatement(stmt)) alreadyEnded = true;
+	    }
+	  });
+
+	  // Now that we know how many statements there will be in this.listing,
+	  // we can finally resolve this.finalLoc.value.
+	  this.finalLoc.value = this.listing.length;
+
+	  cases.push(t.switchCase(this.finalLoc, [
+	    // Intentionally fall through to the "end" case...
+	  ]),
+
+	  // So that the runtime can jump to the final location without having
+	  // to know its offset, we provide the "end" case as a synonym.
+	  t.switchCase(t.stringLiteral("end"), [
+	  // This will check/clear both context.thrown and context.rval.
+	  t.returnStatement(t.callExpression(this.contextProperty("stop"), []))]));
+
+	  return t.whileStatement(t.numericLiteral(1), t.switchStatement(t.assignmentExpression("=", this.contextProperty("prev"), this.contextProperty("next")), cases));
+	};
+
+	Ep.getTryLocsList = function () {
+	  if (this.tryEntries.length === 0) {
+	    // To avoid adding a needless [] to the majority of runtime.wrap
+	    // argument lists, force the caller to handle this case specially.
+	    return null;
+	  }
+
+	  var lastLocValue = 0;
+
+	  return t.arrayExpression(this.tryEntries.map(function (tryEntry) {
+	    var thisLocValue = tryEntry.firstLoc.value;
+	    _assert2.default.ok(thisLocValue >= lastLocValue, "try entries out of order");
+	    lastLocValue = thisLocValue;
+
+	    var ce = tryEntry.catchEntry;
+	    var fe = tryEntry.finallyEntry;
+
+	    var locs = [tryEntry.firstLoc,
+	    // The null here makes a hole in the array.
+	    ce ? ce.firstLoc : null];
+
+	    if (fe) {
+	      locs[2] = fe.firstLoc;
+	      locs[3] = fe.afterLoc;
+	    }
+
+	    return t.arrayExpression(locs);
+	  }));
+	};
+
+	// All side effects must be realized in order.
+
+	// If any subexpression harbors a leap, all subexpressions must be
+	// neutered of side effects.
+
+	// No destructive modification of AST nodes.
+
+	Ep.explode = function (path, ignoreResult) {
+	  var node = path.node;
+	  var self = this;
+
+	  t.assertNode(node);
+
+	  if (t.isDeclaration(node)) throw getDeclError(node);
+
+	  if (t.isStatement(node)) return self.explodeStatement(path);
+
+	  if (t.isExpression(node)) return self.explodeExpression(path, ignoreResult);
+
+	  switch (node.type) {
+	    case "Program":
+	      return path.get("body").map(self.explodeStatement, self);
+
+	    case "VariableDeclarator":
+	      throw getDeclError(node);
+
+	    // These node types should be handled by their parent nodes
+	    // (ObjectExpression, SwitchStatement, and TryStatement, respectively).
+	    case "Property":
+	    case "SwitchCase":
+	    case "CatchClause":
+	      throw new Error(node.type + " nodes should be handled by their parents");
+
+	    default:
+	      throw new Error("unknown Node of type " + (0, _stringify2.default)(node.type));
+	  }
+	};
+
+	function getDeclError(node) {
+	  return new Error("all declarations should have been transformed into " + "assignments before the Exploder began its work: " + (0, _stringify2.default)(node));
+	}
+
+	Ep.explodeStatement = function (path, labelId) {
+	  var stmt = path.node;
+	  var self = this;
+	  var before = void 0,
+	      after = void 0,
+	      head = void 0;
+
+	  t.assertStatement(stmt);
+
+	  if (labelId) {
+	    t.assertIdentifier(labelId);
+	  } else {
+	    labelId = null;
+	  }
+
+	  // Explode BlockStatement nodes even if they do not contain a yield,
+	  // because we don't want or need the curly braces.
+	  if (t.isBlockStatement(stmt)) {
+	    path.get("body").forEach(function (path) {
+	      self.explodeStatement(path);
+	    });
+	    return;
+	  }
+
+	  if (!meta.containsLeap(stmt)) {
+	    // Technically we should be able to avoid emitting the statement
+	    // altogether if !meta.hasSideEffects(stmt), but that leads to
+	    // confusing generated code (for instance, `while (true) {}` just
+	    // disappears) and is probably a more appropriate job for a dedicated
+	    // dead code elimination pass.
+	    self.emit(stmt);
+	    return;
+	  }
+
+	  switch (stmt.type) {
+	    case "ExpressionStatement":
+	      self.explodeExpression(path.get("expression"), true);
+	      break;
+
+	    case "LabeledStatement":
+	      after = loc();
+
+	      // Did you know you can break from any labeled block statement or
+	      // control structure? Well, you can! Note: when a labeled loop is
+	      // encountered, the leap.LabeledEntry created here will immediately
+	      // enclose a leap.LoopEntry on the leap manager's stack, and both
+	      // entries will have the same label. Though this works just fine, it
+	      // may seem a bit redundant. In theory, we could check here to
+	      // determine if stmt knows how to handle its own label; for example,
+	      // stmt happens to be a WhileStatement and so we know it's going to
+	      // establish its own LoopEntry when we explode it (below). Then this
+	      // LabeledEntry would be unnecessary. Alternatively, we might be
+	      // tempted not to pass stmt.label down into self.explodeStatement,
+	      // because we've handled the label here, but that's a mistake because
+	      // labeled loops may contain labeled continue statements, which is not
+	      // something we can handle in this generic case. All in all, I think a
+	      // little redundancy greatly simplifies the logic of this case, since
+	      // it's clear that we handle all possible LabeledStatements correctly
+	      // here, regardless of whether they interact with the leap manager
+	      // themselves. Also remember that labels and break/continue-to-label
+	      // statements are rare, and all of this logic happens at transform
+	      // time, so it has no additional runtime cost.
+	      self.leapManager.withEntry(new leap.LabeledEntry(after, stmt.label), function () {
+	        self.explodeStatement(path.get("body"), stmt.label);
+	      });
+
+	      self.mark(after);
+
+	      break;
+
+	    case "WhileStatement":
+	      before = loc();
+	      after = loc();
+
+	      self.mark(before);
+	      self.jumpIfNot(self.explodeExpression(path.get("test")), after);
+	      self.leapManager.withEntry(new leap.LoopEntry(after, before, labelId), function () {
+	        self.explodeStatement(path.get("body"));
+	      });
+	      self.jump(before);
+	      self.mark(after);
+
+	      break;
+
+	    case "DoWhileStatement":
+	      var first = loc();
+	      var test = loc();
+	      after = loc();
+
+	      self.mark(first);
+	      self.leapManager.withEntry(new leap.LoopEntry(after, test, labelId), function () {
+	        self.explode(path.get("body"));
+	      });
+	      self.mark(test);
+	      self.jumpIf(self.explodeExpression(path.get("test")), first);
+	      self.mark(after);
+
+	      break;
+
+	    case "ForStatement":
+	      head = loc();
+	      var update = loc();
+	      after = loc();
+
+	      if (stmt.init) {
+	        // We pass true here to indicate that if stmt.init is an expression
+	        // then we do not care about its result.
+	        self.explode(path.get("init"), true);
+	      }
+
+	      self.mark(head);
+
+	      if (stmt.test) {
+	        self.jumpIfNot(self.explodeExpression(path.get("test")), after);
+	      } else {
+	        // No test means continue unconditionally.
+	      }
+
+	      self.leapManager.withEntry(new leap.LoopEntry(after, update, labelId), function () {
+	        self.explodeStatement(path.get("body"));
+	      });
+
+	      self.mark(update);
+
+	      if (stmt.update) {
+	        // We pass true here to indicate that if stmt.update is an
+	        // expression then we do not care about its result.
+	        self.explode(path.get("update"), true);
+	      }
+
+	      self.jump(head);
+
+	      self.mark(after);
+
+	      break;
+
+	    case "TypeCastExpression":
+	      return self.explodeExpression(path.get("expression"));
+
+	    case "ForInStatement":
+	      head = loc();
+	      after = loc();
+
+	      var keyIterNextFn = self.makeTempVar();
+	      self.emitAssign(keyIterNextFn, t.callExpression(util.runtimeProperty("keys"), [self.explodeExpression(path.get("right"))]));
+
+	      self.mark(head);
+
+	      var keyInfoTmpVar = self.makeTempVar();
+	      self.jumpIf(t.memberExpression(t.assignmentExpression("=", keyInfoTmpVar, t.callExpression(keyIterNextFn, [])), t.identifier("done"), false), after);
+
+	      self.emitAssign(stmt.left, t.memberExpression(keyInfoTmpVar, t.identifier("value"), false));
+
+	      self.leapManager.withEntry(new leap.LoopEntry(after, head, labelId), function () {
+	        self.explodeStatement(path.get("body"));
+	      });
+
+	      self.jump(head);
+
+	      self.mark(after);
+
+	      break;
+
+	    case "BreakStatement":
+	      self.emitAbruptCompletion({
+	        type: "break",
+	        target: self.leapManager.getBreakLoc(stmt.label)
+	      });
+
+	      break;
+
+	    case "ContinueStatement":
+	      self.emitAbruptCompletion({
+	        type: "continue",
+	        target: self.leapManager.getContinueLoc(stmt.label)
+	      });
+
+	      break;
+
+	    case "SwitchStatement":
+	      // Always save the discriminant into a temporary variable in case the
+	      // test expressions overwrite values like context.sent.
+	      var disc = self.emitAssign(self.makeTempVar(), self.explodeExpression(path.get("discriminant")));
+
+	      after = loc();
+	      var defaultLoc = loc();
+	      var condition = defaultLoc;
+	      var caseLocs = [];
+
+	      // If there are no cases, .cases might be undefined.
+	      var cases = stmt.cases || [];
+
+	      for (var i = cases.length - 1; i >= 0; --i) {
+	        var c = cases[i];
+	        t.assertSwitchCase(c);
+
+	        if (c.test) {
+	          condition = t.conditionalExpression(t.binaryExpression("===", disc, c.test), caseLocs[i] = loc(), condition);
+	        } else {
+	          caseLocs[i] = defaultLoc;
+	        }
+	      }
+
+	      var discriminant = path.get("discriminant");
+	      discriminant.replaceWith(condition);
+	      self.jump(self.explodeExpression(discriminant));
+
+	      self.leapManager.withEntry(new leap.SwitchEntry(after), function () {
+	        path.get("cases").forEach(function (casePath) {
+	          var i = casePath.key;
+	          self.mark(caseLocs[i]);
+
+	          casePath.get("consequent").forEach(function (path) {
+	            self.explodeStatement(path);
+	          });
+	        });
+	      });
+
+	      self.mark(after);
+	      if (defaultLoc.value === -1) {
+	        self.mark(defaultLoc);
+	        _assert2.default.strictEqual(after.value, defaultLoc.value);
+	      }
+
+	      break;
+
+	    case "IfStatement":
+	      var elseLoc = stmt.alternate && loc();
+	      after = loc();
+
+	      self.jumpIfNot(self.explodeExpression(path.get("test")), elseLoc || after);
+
+	      self.explodeStatement(path.get("consequent"));
+
+	      if (elseLoc) {
+	        self.jump(after);
+	        self.mark(elseLoc);
+	        self.explodeStatement(path.get("alternate"));
+	      }
+
+	      self.mark(after);
+
+	      break;
+
+	    case "ReturnStatement":
+	      self.emitAbruptCompletion({
+	        type: "return",
+	        value: self.explodeExpression(path.get("argument"))
+	      });
+
+	      break;
+
+	    case "WithStatement":
+	      throw new Error("WithStatement not supported in generator functions.");
+
+	    case "TryStatement":
+	      after = loc();
+
+	      var handler = stmt.handler;
+
+	      var catchLoc = handler && loc();
+	      var catchEntry = catchLoc && new leap.CatchEntry(catchLoc, handler.param);
+
+	      var finallyLoc = stmt.finalizer && loc();
+	      var finallyEntry = finallyLoc && new leap.FinallyEntry(finallyLoc, after);
+
+	      var tryEntry = new leap.TryEntry(self.getUnmarkedCurrentLoc(), catchEntry, finallyEntry);
+
+	      self.tryEntries.push(tryEntry);
+	      self.updateContextPrevLoc(tryEntry.firstLoc);
+
+	      self.leapManager.withEntry(tryEntry, function () {
+	        self.explodeStatement(path.get("block"));
+
+	        if (catchLoc) {
+	          if (finallyLoc) {
+	            // If we have both a catch block and a finally block, then
+	            // because we emit the catch block first, we need to jump over
+	            // it to the finally block.
+	            self.jump(finallyLoc);
+	          } else {
+	            // If there is no finally block, then we need to jump over the
+	            // catch block to the fall-through location.
+	            self.jump(after);
+	          }
+
+	          self.updateContextPrevLoc(self.mark(catchLoc));
+
+	          var bodyPath = path.get("handler.body");
+	          var safeParam = self.makeTempVar();
+	          self.clearPendingException(tryEntry.firstLoc, safeParam);
+
+	          bodyPath.traverse(catchParamVisitor, {
+	            safeParam: safeParam,
+	            catchParamName: handler.param.name
+	          });
+
+	          self.leapManager.withEntry(catchEntry, function () {
+	            self.explodeStatement(bodyPath);
+	          });
+	        }
+
+	        if (finallyLoc) {
+	          self.updateContextPrevLoc(self.mark(finallyLoc));
+
+	          self.leapManager.withEntry(finallyEntry, function () {
+	            self.explodeStatement(path.get("finalizer"));
+	          });
+
+	          self.emit(t.returnStatement(t.callExpression(self.contextProperty("finish"), [finallyEntry.firstLoc])));
+	        }
+	      });
+
+	      self.mark(after);
+
+	      break;
+
+	    case "ThrowStatement":
+	      self.emit(t.throwStatement(self.explodeExpression(path.get("argument"))));
+
+	      break;
+
+	    default:
+	      throw new Error("unknown Statement of type " + (0, _stringify2.default)(stmt.type));
+	  }
+	};
+
+	var catchParamVisitor = {
+	  Identifier: function Identifier(path, state) {
+	    if (path.node.name === state.catchParamName && util.isReference(path)) {
+	      path.replaceWith(state.safeParam);
+	    }
+	  },
+
+	  Scope: function Scope(path, state) {
+	    if (path.scope.hasOwnBinding(state.catchParamName)) {
+	      // Don't descend into nested scopes that shadow the catch
+	      // parameter with their own declarations.
+	      path.skip();
+	    }
+	  }
+	};
+
+	Ep.emitAbruptCompletion = function (record) {
+	  if (!isValidCompletion(record)) {
+	    _assert2.default.ok(false, "invalid completion record: " + (0, _stringify2.default)(record));
+	  }
+
+	  _assert2.default.notStrictEqual(record.type, "normal", "normal completions are not abrupt");
+
+	  var abruptArgs = [t.stringLiteral(record.type)];
+
+	  if (record.type === "break" || record.type === "continue") {
+	    t.assertLiteral(record.target);
+	    abruptArgs[1] = record.target;
+	  } else if (record.type === "return" || record.type === "throw") {
+	    if (record.value) {
+	      t.assertExpression(record.value);
+	      abruptArgs[1] = record.value;
+	    }
+	  }
+
+	  this.emit(t.returnStatement(t.callExpression(this.contextProperty("abrupt"), abruptArgs)));
+	};
+
+	function isValidCompletion(record) {
+	  var type = record.type;
+
+	  if (type === "normal") {
+	    return !hasOwn.call(record, "target");
+	  }
+
+	  if (type === "break" || type === "continue") {
+	    return !hasOwn.call(record, "value") && t.isLiteral(record.target);
+	  }
+
+	  if (type === "return" || type === "throw") {
+	    return hasOwn.call(record, "value") && !hasOwn.call(record, "target");
+	  }
+
+	  return false;
+	}
+
+	// Not all offsets into emitter.listing are potential jump targets. For
+	// example, execution typically falls into the beginning of a try block
+	// without jumping directly there. This method returns the current offset
+	// without marking it, so that a switch case will not necessarily be
+	// generated for this offset (I say "not necessarily" because the same
+	// location might end up being marked in the process of emitting other
+	// statements). There's no logical harm in marking such locations as jump
+	// targets, but minimizing the number of switch cases keeps the generated
+	// code shorter.
+	Ep.getUnmarkedCurrentLoc = function () {
+	  return t.numericLiteral(this.listing.length);
+	};
+
+	// The context.prev property takes the value of context.next whenever we
+	// evaluate the switch statement discriminant, which is generally good
+	// enough for tracking the last location we jumped to, but sometimes
+	// context.prev needs to be more precise, such as when we fall
+	// successfully out of a try block and into a finally block without
+	// jumping. This method exists to update context.prev to the freshest
+	// available location. If we were implementing a full interpreter, we
+	// would know the location of the current instruction with complete
+	// precision at all times, but we don't have that luxury here, as it would
+	// be costly and verbose to set context.prev before every statement.
+	Ep.updateContextPrevLoc = function (loc) {
+	  if (loc) {
+	    t.assertLiteral(loc);
+
+	    if (loc.value === -1) {
+	      // If an uninitialized location literal was passed in, set its value
+	      // to the current this.listing.length.
+	      loc.value = this.listing.length;
+	    } else {
+	      // Otherwise assert that the location matches the current offset.
+	      _assert2.default.strictEqual(loc.value, this.listing.length);
+	    }
+	  } else {
+	    loc = this.getUnmarkedCurrentLoc();
+	  }
+
+	  // Make sure context.prev is up to date in case we fell into this try
+	  // statement without jumping to it. TODO Consider avoiding this
+	  // assignment when we know control must have jumped here.
+	  this.emitAssign(this.contextProperty("prev"), loc);
+	};
+
+	Ep.explodeExpression = function (path, ignoreResult) {
+	  var expr = path.node;
+	  if (expr) {
+	    t.assertExpression(expr);
+	  } else {
+	    return expr;
+	  }
+
+	  var self = this;
+	  var result = void 0; // Used optionally by several cases below.
+	  var after = void 0;
+
+	  function finish(expr) {
+	    t.assertExpression(expr);
+	    if (ignoreResult) {
+	      self.emit(expr);
+	    } else {
+	      return expr;
+	    }
+	  }
+
+	  // If the expression does not contain a leap, then we either emit the
+	  // expression as a standalone statement or return it whole.
+	  if (!meta.containsLeap(expr)) {
+	    return finish(expr);
+	  }
+
+	  // If any child contains a leap (such as a yield or labeled continue or
+	  // break statement), then any sibling subexpressions will almost
+	  // certainly have to be exploded in order to maintain the order of their
+	  // side effects relative to the leaping child(ren).
+	  var hasLeapingChildren = meta.containsLeap.onlyChildren(expr);
+
+	  // In order to save the rest of explodeExpression from a combinatorial
+	  // trainwreck of special cases, explodeViaTempVar is responsible for
+	  // deciding when a subexpression needs to be "exploded," which is my
+	  // very technical term for emitting the subexpression as an assignment
+	  // to a temporary variable and the substituting the temporary variable
+	  // for the original subexpression. Think of exploded view diagrams, not
+	  // Michael Bay movies. The point of exploding subexpressions is to
+	  // control the precise order in which the generated code realizes the
+	  // side effects of those subexpressions.
+	  function explodeViaTempVar(tempVar, childPath, ignoreChildResult) {
+	    _assert2.default.ok(!ignoreChildResult || !tempVar, "Ignoring the result of a child expression but forcing it to " + "be assigned to a temporary variable?");
+
+	    var result = self.explodeExpression(childPath, ignoreChildResult);
+
+	    if (ignoreChildResult) {
+	      // Side effects already emitted above.
+
+	    } else if (tempVar || hasLeapingChildren && !t.isLiteral(result)) {
+	      // If tempVar was provided, then the result will always be assigned
+	      // to it, even if the result does not otherwise need to be assigned
+	      // to a temporary variable.  When no tempVar is provided, we have
+	      // the flexibility to decide whether a temporary variable is really
+	      // necessary.  Unfortunately, in general, a temporary variable is
+	      // required whenever any child contains a yield expression, since it
+	      // is difficult to prove (at all, let alone efficiently) whether
+	      // this result would evaluate to the same value before and after the
+	      // yield (see #206).  One narrow case where we can prove it doesn't
+	      // matter (and thus we do not need a temporary variable) is when the
+	      // result in question is a Literal value.
+	      result = self.emitAssign(tempVar || self.makeTempVar(), result);
+	    }
+	    return result;
+	  }
+
+	  // If ignoreResult is true, then we must take full responsibility for
+	  // emitting the expression with all its side effects, and we should not
+	  // return a result.
+
+	  switch (expr.type) {
+	    case "MemberExpression":
+	      return finish(t.memberExpression(self.explodeExpression(path.get("object")), expr.computed ? explodeViaTempVar(null, path.get("property")) : expr.property, expr.computed));
+
+	    case "CallExpression":
+	      var calleePath = path.get("callee");
+	      var argsPath = path.get("arguments");
+
+	      var newCallee = void 0;
+	      var newArgs = [];
+
+	      var hasLeapingArgs = false;
+	      argsPath.forEach(function (argPath) {
+	        hasLeapingArgs = hasLeapingArgs || meta.containsLeap(argPath.node);
+	      });
+
+	      if (t.isMemberExpression(calleePath.node)) {
+	        if (hasLeapingArgs) {
+	          // If the arguments of the CallExpression contained any yield
+	          // expressions, then we need to be sure to evaluate the callee
+	          // before evaluating the arguments, but if the callee was a member
+	          // expression, then we must be careful that the object of the
+	          // member expression still gets bound to `this` for the call.
+
+	          var newObject = explodeViaTempVar(
+	          // Assign the exploded callee.object expression to a temporary
+	          // variable so that we can use it twice without reevaluating it.
+	          self.makeTempVar(), calleePath.get("object"));
+
+	          var newProperty = calleePath.node.computed ? explodeViaTempVar(null, calleePath.get("property")) : calleePath.node.property;
+
+	          newArgs.unshift(newObject);
+
+	          newCallee = t.memberExpression(t.memberExpression(newObject, newProperty, calleePath.node.computed), t.identifier("call"), false);
+	        } else {
+	          newCallee = self.explodeExpression(calleePath);
+	        }
+	      } else {
+	        newCallee = explodeViaTempVar(null, calleePath);
+
+	        if (t.isMemberExpression(newCallee)) {
+	          // If the callee was not previously a MemberExpression, then the
+	          // CallExpression was "unqualified," meaning its `this` object
+	          // should be the global object. If the exploded expression has
+	          // become a MemberExpression (e.g. a context property, probably a
+	          // temporary variable), then we need to force it to be unqualified
+	          // by using the (0, object.property)(...) trick; otherwise, it
+	          // will receive the object of the MemberExpression as its `this`
+	          // object.
+	          newCallee = t.sequenceExpression([t.numericLiteral(0), newCallee]);
+	        }
+	      }
+
+	      argsPath.forEach(function (argPath) {
+	        newArgs.push(explodeViaTempVar(null, argPath));
+	      });
+
+	      return finish(t.callExpression(newCallee, newArgs));
+
+	    case "NewExpression":
+	      return finish(t.newExpression(explodeViaTempVar(null, path.get("callee")), path.get("arguments").map(function (argPath) {
+	        return explodeViaTempVar(null, argPath);
+	      })));
+
+	    case "ObjectExpression":
+	      return finish(t.objectExpression(path.get("properties").map(function (propPath) {
+	        if (propPath.isObjectProperty()) {
+	          return t.objectProperty(propPath.node.key, explodeViaTempVar(null, propPath.get("value")), propPath.node.computed);
+	        } else {
+	          return propPath.node;
+	        }
+	      })));
+
+	    case "ArrayExpression":
+	      return finish(t.arrayExpression(path.get("elements").map(function (elemPath) {
+	        return explodeViaTempVar(null, elemPath);
+	      })));
+
+	    case "SequenceExpression":
+	      var lastIndex = expr.expressions.length - 1;
+
+	      path.get("expressions").forEach(function (exprPath) {
+	        if (exprPath.key === lastIndex) {
+	          result = self.explodeExpression(exprPath, ignoreResult);
+	        } else {
+	          self.explodeExpression(exprPath, true);
+	        }
+	      });
+
+	      return result;
+
+	    case "LogicalExpression":
+	      after = loc();
+
+	      if (!ignoreResult) {
+	        result = self.makeTempVar();
+	      }
+
+	      var left = explodeViaTempVar(result, path.get("left"));
+
+	      if (expr.operator === "&&") {
+	        self.jumpIfNot(left, after);
+	      } else {
+	        _assert2.default.strictEqual(expr.operator, "||");
+	        self.jumpIf(left, after);
+	      }
+
+	      explodeViaTempVar(result, path.get("right"), ignoreResult);
+
+	      self.mark(after);
+
+	      return result;
+
+	    case "ConditionalExpression":
+	      var elseLoc = loc();
+	      after = loc();
+	      var test = self.explodeExpression(path.get("test"));
+
+	      self.jumpIfNot(test, elseLoc);
+
+	      if (!ignoreResult) {
+	        result = self.makeTempVar();
+	      }
+
+	      explodeViaTempVar(result, path.get("consequent"), ignoreResult);
+	      self.jump(after);
+
+	      self.mark(elseLoc);
+	      explodeViaTempVar(result, path.get("alternate"), ignoreResult);
+
+	      self.mark(after);
+
+	      return result;
+
+	    case "UnaryExpression":
+	      return finish(t.unaryExpression(expr.operator,
+	      // Can't (and don't need to) break up the syntax of the argument.
+	      // Think about delete a[b].
+	      self.explodeExpression(path.get("argument")), !!expr.prefix));
+
+	    case "BinaryExpression":
+	      return finish(t.binaryExpression(expr.operator, explodeViaTempVar(null, path.get("left")), explodeViaTempVar(null, path.get("right"))));
+
+	    case "AssignmentExpression":
+	      return finish(t.assignmentExpression(expr.operator, self.explodeExpression(path.get("left")), self.explodeExpression(path.get("right"))));
+
+	    case "UpdateExpression":
+	      return finish(t.updateExpression(expr.operator, self.explodeExpression(path.get("argument")), expr.prefix));
+
+	    case "YieldExpression":
+	      after = loc();
+	      var arg = expr.argument && self.explodeExpression(path.get("argument"));
+
+	      if (arg && expr.delegate) {
+	        var _result = self.makeTempVar();
+
+	        self.emit(t.returnStatement(t.callExpression(self.contextProperty("delegateYield"), [arg, t.stringLiteral(_result.property.name), after])));
+
+	        self.mark(after);
+
+	        return _result;
+	      }
+
+	      self.emitAssign(self.contextProperty("next"), after);
+	      self.emit(t.returnStatement(arg || null));
+	      self.mark(after);
+
+	      return self.contextProperty("sent");
+
+	    default:
+	      throw new Error("unknown Expression of type " + (0, _stringify2.default)(expr.type));
+	  }
+	};
+
+/***/ }),
+/* 279 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.runtimeProperty = runtimeProperty;
+	exports.isReference = isReference;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function runtimeProperty(name) {
+	  return t.memberExpression(t.identifier("regeneratorRuntime"), t.identifier(name), false);
+	} /**
+	   * Copyright (c) 2014, Facebook, Inc.
+	   * All rights reserved.
+	   *
+	   * This source code is licensed under the BSD-style license found in the
+	   * https://raw.github.com/facebook/regenerator/master/LICENSE file. An
+	   * additional grant of patent rights can be found in the PATENTS file in
+	   * the same directory.
+	   */
+
+	function isReference(path) {
+	  return path.isReferenced() || path.parentPath.isAssignmentExpression({ left: path.node });
+	}
+
+/***/ }),
+/* 280 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	module.exports = function (str) {
+		var isExtendedLengthPath = /^\\\\\?\\/.test(str);
+		var hasNonAscii = /[^\x00-\x80]+/.test(str);
+
+		if (isExtendedLengthPath || hasNonAscii) {
+			return str;
+		}
+
+		return str.replace(/\\/g, '/');
+	};
+
+/***/ }),
+/* 281 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	/* -*- Mode: js; js-indent-level: 2; -*- */
+	/*
+	 * Copyright 2011 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 */
+
+	var util = __webpack_require__(61);
+	var has = Object.prototype.hasOwnProperty;
+
+	/**
+	 * A data structure which is a combination of an array and a set. Adding a new
+	 * member is O(1), testing for membership is O(1), and finding the index of an
+	 * element is O(1). Removing elements from the set is not supported. Only
+	 * strings are supported for membership.
+	 */
+	function ArraySet() {
+	  this._array = [];
+	  this._set = Object.create(null);
+	}
+
+	/**
+	 * Static method for creating ArraySet instances from an existing array.
+	 */
+	ArraySet.fromArray = function ArraySet_fromArray(aArray, aAllowDuplicates) {
+	  var set = new ArraySet();
+	  for (var i = 0, len = aArray.length; i < len; i++) {
+	    set.add(aArray[i], aAllowDuplicates);
+	  }
+	  return set;
+	};
+
+	/**
+	 * Return how many unique items are in this ArraySet. If duplicates have been
+	 * added, than those do not count towards the size.
+	 *
+	 * @returns Number
+	 */
+	ArraySet.prototype.size = function ArraySet_size() {
+	  return Object.getOwnPropertyNames(this._set).length;
+	};
+
+	/**
+	 * Add the given string to this set.
+	 *
+	 * @param String aStr
+	 */
+	ArraySet.prototype.add = function ArraySet_add(aStr, aAllowDuplicates) {
+	  var sStr = util.toSetString(aStr);
+	  var isDuplicate = has.call(this._set, sStr);
+	  var idx = this._array.length;
+	  if (!isDuplicate || aAllowDuplicates) {
+	    this._array.push(aStr);
+	  }
+	  if (!isDuplicate) {
+	    this._set[sStr] = idx;
+	  }
+	};
+
+	/**
+	 * Is the given string a member of this set?
+	 *
+	 * @param String aStr
+	 */
+	ArraySet.prototype.has = function ArraySet_has(aStr) {
+	  var sStr = util.toSetString(aStr);
+	  return has.call(this._set, sStr);
+	};
+
+	/**
+	 * What is the index of the given string in the array?
+	 *
+	 * @param String aStr
+	 */
+	ArraySet.prototype.indexOf = function ArraySet_indexOf(aStr) {
+	  var sStr = util.toSetString(aStr);
+	  if (has.call(this._set, sStr)) {
+	    return this._set[sStr];
+	  }
+	  throw new Error('"' + aStr + '" is not in the set.');
+	};
+
+	/**
+	 * What is the element at the given index?
+	 *
+	 * @param Number aIdx
+	 */
+	ArraySet.prototype.at = function ArraySet_at(aIdx) {
+	  if (aIdx >= 0 && aIdx < this._array.length) {
+	    return this._array[aIdx];
+	  }
+	  throw new Error('No element indexed by ' + aIdx);
+	};
+
+	/**
+	 * Returns the array representation of this set (which has the proper indices
+	 * indicated by indexOf). Note that this is a copy of the internal array used
+	 * for storing the members so that no one can mess with internal state.
+	 */
+	ArraySet.prototype.toArray = function ArraySet_toArray() {
+	  return this._array.slice();
+	};
+
+	exports.ArraySet = ArraySet;
+
+/***/ }),
+/* 282 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	/* -*- Mode: js; js-indent-level: 2; -*- */
+	/*
+	 * Copyright 2011 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 *
+	 * Based on the Base 64 VLQ implementation in Closure Compiler:
+	 * https://code.google.com/p/closure-compiler/source/browse/trunk/src/com/google/debugging/sourcemap/Base64VLQ.java
+	 *
+	 * Copyright 2011 The Closure Compiler Authors. All rights reserved.
+	 * Redistribution and use in source and binary forms, with or without
+	 * modification, are permitted provided that the following conditions are
+	 * met:
+	 *
+	 *  * Redistributions of source code must retain the above copyright
+	 *    notice, this list of conditions and the following disclaimer.
+	 *  * Redistributions in binary form must reproduce the above
+	 *    copyright notice, this list of conditions and the following
+	 *    disclaimer in the documentation and/or other materials provided
+	 *    with the distribution.
+	 *  * Neither the name of Google Inc. nor the names of its
+	 *    contributors may be used to endorse or promote products derived
+	 *    from this software without specific prior written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+	 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+	 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+	 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+	 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+	 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+	 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+	 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+	 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 */
+
+	var base64 = __webpack_require__(607);
+
+	// A single base 64 digit can contain 6 bits of data. For the base 64 variable
+	// length quantities we use in the source map spec, the first bit is the sign,
+	// the next four bits are the actual value, and the 6th bit is the
+	// continuation bit. The continuation bit tells us whether there are more
+	// digits in this value following this digit.
+	//
+	//   Continuation
+	//   |    Sign
+	//   |    |
+	//   V    V
+	//   101011
+
+	var VLQ_BASE_SHIFT = 5;
+
+	// binary: 100000
+	var VLQ_BASE = 1 << VLQ_BASE_SHIFT;
+
+	// binary: 011111
+	var VLQ_BASE_MASK = VLQ_BASE - 1;
+
+	// binary: 100000
+	var VLQ_CONTINUATION_BIT = VLQ_BASE;
+
+	/**
+	 * Converts from a two-complement value to a value where the sign bit is
+	 * placed in the least significant bit.  For example, as decimals:
+	 *   1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
+	 *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
+	 */
+	function toVLQSigned(aValue) {
+	  return aValue < 0 ? (-aValue << 1) + 1 : (aValue << 1) + 0;
+	}
+
+	/**
+	 * Converts to a two-complement value from a value where the sign bit is
+	 * placed in the least significant bit.  For example, as decimals:
+	 *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
+	 *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2
+	 */
+	function fromVLQSigned(aValue) {
+	  var isNegative = (aValue & 1) === 1;
+	  var shifted = aValue >> 1;
+	  return isNegative ? -shifted : shifted;
+	}
+
+	/**
+	 * Returns the base 64 VLQ encoded value.
+	 */
+	exports.encode = function base64VLQ_encode(aValue) {
+	  var encoded = "";
+	  var digit;
+
+	  var vlq = toVLQSigned(aValue);
+
+	  do {
+	    digit = vlq & VLQ_BASE_MASK;
+	    vlq >>>= VLQ_BASE_SHIFT;
+	    if (vlq > 0) {
+	      // There are still more digits in this value, so we must make sure the
+	      // continuation bit is marked.
+	      digit |= VLQ_CONTINUATION_BIT;
+	    }
+	    encoded += base64.encode(digit);
+	  } while (vlq > 0);
+
+	  return encoded;
+	};
+
+	/**
+	 * Decodes the next base 64 VLQ value from the given string and returns the
+	 * value and the rest of the string via the out parameter.
+	 */
+	exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
+	  var strLen = aStr.length;
+	  var result = 0;
+	  var shift = 0;
+	  var continuation, digit;
+
+	  do {
+	    if (aIndex >= strLen) {
+	      throw new Error("Expected more digits in base 64 VLQ value.");
+	    }
+
+	    digit = base64.decode(aStr.charCodeAt(aIndex++));
+	    if (digit === -1) {
+	      throw new Error("Invalid base64 digit: " + aStr.charAt(aIndex - 1));
+	    }
+
+	    continuation = !!(digit & VLQ_CONTINUATION_BIT);
+	    digit &= VLQ_BASE_MASK;
+	    result = result + (digit << shift);
+	    shift += VLQ_BASE_SHIFT;
+	  } while (continuation);
+
+	  aOutParam.value = fromVLQSigned(result);
+	  aOutParam.rest = aIndex;
+	};
+
+/***/ }),
+/* 283 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	/* -*- Mode: js; js-indent-level: 2; -*- */
+	/*
+	 * Copyright 2011 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 */
+
+	var base64VLQ = __webpack_require__(282);
+	var util = __webpack_require__(61);
+	var ArraySet = __webpack_require__(281).ArraySet;
+	var MappingList = __webpack_require__(609).MappingList;
+
+	/**
+	 * An instance of the SourceMapGenerator represents a source map which is
+	 * being built incrementally. You may pass an object with the following
+	 * properties:
+	 *
+	 *   - file: The filename of the generated source.
+	 *   - sourceRoot: A root for all relative URLs in this source map.
+	 */
+	function SourceMapGenerator(aArgs) {
+	  if (!aArgs) {
+	    aArgs = {};
+	  }
+	  this._file = util.getArg(aArgs, 'file', null);
+	  this._sourceRoot = util.getArg(aArgs, 'sourceRoot', null);
+	  this._skipValidation = util.getArg(aArgs, 'skipValidation', false);
+	  this._sources = new ArraySet();
+	  this._names = new ArraySet();
+	  this._mappings = new MappingList();
+	  this._sourcesContents = null;
+	}
+
+	SourceMapGenerator.prototype._version = 3;
+
+	/**
+	 * Creates a new SourceMapGenerator based on a SourceMapConsumer
+	 *
+	 * @param aSourceMapConsumer The SourceMap.
+	 */
+	SourceMapGenerator.fromSourceMap = function SourceMapGenerator_fromSourceMap(aSourceMapConsumer) {
+	  var sourceRoot = aSourceMapConsumer.sourceRoot;
+	  var generator = new SourceMapGenerator({
+	    file: aSourceMapConsumer.file,
+	    sourceRoot: sourceRoot
+	  });
+	  aSourceMapConsumer.eachMapping(function (mapping) {
+	    var newMapping = {
+	      generated: {
+	        line: mapping.generatedLine,
+	        column: mapping.generatedColumn
+	      }
+	    };
+
+	    if (mapping.source != null) {
+	      newMapping.source = mapping.source;
+	      if (sourceRoot != null) {
+	        newMapping.source = util.relative(sourceRoot, newMapping.source);
+	      }
+
+	      newMapping.original = {
+	        line: mapping.originalLine,
+	        column: mapping.originalColumn
+	      };
+
+	      if (mapping.name != null) {
+	        newMapping.name = mapping.name;
+	      }
+	    }
+
+	    generator.addMapping(newMapping);
+	  });
+	  aSourceMapConsumer.sources.forEach(function (sourceFile) {
+	    var content = aSourceMapConsumer.sourceContentFor(sourceFile);
+	    if (content != null) {
+	      generator.setSourceContent(sourceFile, content);
+	    }
+	  });
+	  return generator;
+	};
+
+	/**
+	 * Add a single mapping from original source line and column to the generated
+	 * source's line and column for this source map being created. The mapping
+	 * object should have the following properties:
+	 *
+	 *   - generated: An object with the generated line and column positions.
+	 *   - original: An object with the original line and column positions.
+	 *   - source: The original source file (relative to the sourceRoot).
+	 *   - name: An optional original token name for this mapping.
+	 */
+	SourceMapGenerator.prototype.addMapping = function SourceMapGenerator_addMapping(aArgs) {
+	  var generated = util.getArg(aArgs, 'generated');
+	  var original = util.getArg(aArgs, 'original', null);
+	  var source = util.getArg(aArgs, 'source', null);
+	  var name = util.getArg(aArgs, 'name', null);
+
+	  if (!this._skipValidation) {
+	    this._validateMapping(generated, original, source, name);
+	  }
+
+	  if (source != null) {
+	    source = String(source);
+	    if (!this._sources.has(source)) {
+	      this._sources.add(source);
+	    }
+	  }
+
+	  if (name != null) {
+	    name = String(name);
+	    if (!this._names.has(name)) {
+	      this._names.add(name);
+	    }
+	  }
+
+	  this._mappings.add({
+	    generatedLine: generated.line,
+	    generatedColumn: generated.column,
+	    originalLine: original != null && original.line,
+	    originalColumn: original != null && original.column,
+	    source: source,
+	    name: name
+	  });
+	};
+
+	/**
+	 * Set the source content for a source file.
+	 */
+	SourceMapGenerator.prototype.setSourceContent = function SourceMapGenerator_setSourceContent(aSourceFile, aSourceContent) {
+	  var source = aSourceFile;
+	  if (this._sourceRoot != null) {
+	    source = util.relative(this._sourceRoot, source);
+	  }
+
+	  if (aSourceContent != null) {
+	    // Add the source content to the _sourcesContents map.
+	    // Create a new _sourcesContents map if the property is null.
+	    if (!this._sourcesContents) {
+	      this._sourcesContents = Object.create(null);
+	    }
+	    this._sourcesContents[util.toSetString(source)] = aSourceContent;
+	  } else if (this._sourcesContents) {
+	    // Remove the source file from the _sourcesContents map.
+	    // If the _sourcesContents map is empty, set the property to null.
+	    delete this._sourcesContents[util.toSetString(source)];
+	    if (Object.keys(this._sourcesContents).length === 0) {
+	      this._sourcesContents = null;
+	    }
+	  }
+	};
+
+	/**
+	 * Applies the mappings of a sub-source-map for a specific source file to the
+	 * source map being generated. Each mapping to the supplied source file is
+	 * rewritten using the supplied source map. Note: The resolution for the
+	 * resulting mappings is the minimium of this map and the supplied map.
+	 *
+	 * @param aSourceMapConsumer The source map to be applied.
+	 * @param aSourceFile Optional. The filename of the source file.
+	 *        If omitted, SourceMapConsumer's file property will be used.
+	 * @param aSourceMapPath Optional. The dirname of the path to the source map
+	 *        to be applied. If relative, it is relative to the SourceMapConsumer.
+	 *        This parameter is needed when the two source maps aren't in the same
+	 *        directory, and the source map to be applied contains relative source
+	 *        paths. If so, those relative source paths need to be rewritten
+	 *        relative to the SourceMapGenerator.
+	 */
+	SourceMapGenerator.prototype.applySourceMap = function SourceMapGenerator_applySourceMap(aSourceMapConsumer, aSourceFile, aSourceMapPath) {
+	  var sourceFile = aSourceFile;
+	  // If aSourceFile is omitted, we will use the file property of the SourceMap
+	  if (aSourceFile == null) {
+	    if (aSourceMapConsumer.file == null) {
+	      throw new Error('SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, ' + 'or the source map\'s "file" property. Both were omitted.');
+	    }
+	    sourceFile = aSourceMapConsumer.file;
+	  }
+	  var sourceRoot = this._sourceRoot;
+	  // Make "sourceFile" relative if an absolute Url is passed.
+	  if (sourceRoot != null) {
+	    sourceFile = util.relative(sourceRoot, sourceFile);
+	  }
+	  // Applying the SourceMap can add and remove items from the sources and
+	  // the names array.
+	  var newSources = new ArraySet();
+	  var newNames = new ArraySet();
+
+	  // Find mappings for the "sourceFile"
+	  this._mappings.unsortedForEach(function (mapping) {
+	    if (mapping.source === sourceFile && mapping.originalLine != null) {
+	      // Check if it can be mapped by the source map, then update the mapping.
+	      var original = aSourceMapConsumer.originalPositionFor({
+	        line: mapping.originalLine,
+	        column: mapping.originalColumn
+	      });
+	      if (original.source != null) {
+	        // Copy mapping
+	        mapping.source = original.source;
+	        if (aSourceMapPath != null) {
+	          mapping.source = util.join(aSourceMapPath, mapping.source);
+	        }
+	        if (sourceRoot != null) {
+	          mapping.source = util.relative(sourceRoot, mapping.source);
+	        }
+	        mapping.originalLine = original.line;
+	        mapping.originalColumn = original.column;
+	        if (original.name != null) {
+	          mapping.name = original.name;
+	        }
+	      }
+	    }
+
+	    var source = mapping.source;
+	    if (source != null && !newSources.has(source)) {
+	      newSources.add(source);
+	    }
+
+	    var name = mapping.name;
+	    if (name != null && !newNames.has(name)) {
+	      newNames.add(name);
+	    }
+	  }, this);
+	  this._sources = newSources;
+	  this._names = newNames;
+
+	  // Copy sourcesContents of applied map.
+	  aSourceMapConsumer.sources.forEach(function (sourceFile) {
+	    var content = aSourceMapConsumer.sourceContentFor(sourceFile);
+	    if (content != null) {
+	      if (aSourceMapPath != null) {
+	        sourceFile = util.join(aSourceMapPath, sourceFile);
+	      }
+	      if (sourceRoot != null) {
+	        sourceFile = util.relative(sourceRoot, sourceFile);
+	      }
+	      this.setSourceContent(sourceFile, content);
+	    }
+	  }, this);
+	};
+
+	/**
+	 * A mapping can have one of the three levels of data:
+	 *
+	 *   1. Just the generated position.
+	 *   2. The Generated position, original position, and original source.
+	 *   3. Generated and original position, original source, as well as a name
+	 *      token.
+	 *
+	 * To maintain consistency, we validate that any new mapping being added falls
+	 * in to one of these categories.
+	 */
+	SourceMapGenerator.prototype._validateMapping = function SourceMapGenerator_validateMapping(aGenerated, aOriginal, aSource, aName) {
+	  if (aGenerated && 'line' in aGenerated && 'column' in aGenerated && aGenerated.line > 0 && aGenerated.column >= 0 && !aOriginal && !aSource && !aName) {
+	    // Case 1.
+	    return;
+	  } else if (aGenerated && 'line' in aGenerated && 'column' in aGenerated && aOriginal && 'line' in aOriginal && 'column' in aOriginal && aGenerated.line > 0 && aGenerated.column >= 0 && aOriginal.line > 0 && aOriginal.column >= 0 && aSource) {
+	    // Cases 2 and 3.
+	    return;
+	  } else {
+	    throw new Error('Invalid mapping: ' + JSON.stringify({
+	      generated: aGenerated,
+	      source: aSource,
+	      original: aOriginal,
+	      name: aName
+	    }));
+	  }
+	};
+
+	/**
+	 * Serialize the accumulated mappings in to the stream of base 64 VLQs
+	 * specified by the source map format.
+	 */
+	SourceMapGenerator.prototype._serializeMappings = function SourceMapGenerator_serializeMappings() {
+	  var previousGeneratedColumn = 0;
+	  var previousGeneratedLine = 1;
+	  var previousOriginalColumn = 0;
+	  var previousOriginalLine = 0;
+	  var previousName = 0;
+	  var previousSource = 0;
+	  var result = '';
+	  var next;
+	  var mapping;
+	  var nameIdx;
+	  var sourceIdx;
+
+	  var mappings = this._mappings.toArray();
+	  for (var i = 0, len = mappings.length; i < len; i++) {
+	    mapping = mappings[i];
+	    next = '';
+
+	    if (mapping.generatedLine !== previousGeneratedLine) {
+	      previousGeneratedColumn = 0;
+	      while (mapping.generatedLine !== previousGeneratedLine) {
+	        next += ';';
+	        previousGeneratedLine++;
+	      }
+	    } else {
+	      if (i > 0) {
+	        if (!util.compareByGeneratedPositionsInflated(mapping, mappings[i - 1])) {
+	          continue;
+	        }
+	        next += ',';
+	      }
+	    }
+
+	    next += base64VLQ.encode(mapping.generatedColumn - previousGeneratedColumn);
+	    previousGeneratedColumn = mapping.generatedColumn;
+
+	    if (mapping.source != null) {
+	      sourceIdx = this._sources.indexOf(mapping.source);
+	      next += base64VLQ.encode(sourceIdx - previousSource);
+	      previousSource = sourceIdx;
+
+	      // lines are stored 0-based in SourceMap spec version 3
+	      next += base64VLQ.encode(mapping.originalLine - 1 - previousOriginalLine);
+	      previousOriginalLine = mapping.originalLine - 1;
+
+	      next += base64VLQ.encode(mapping.originalColumn - previousOriginalColumn);
+	      previousOriginalColumn = mapping.originalColumn;
+
+	      if (mapping.name != null) {
+	        nameIdx = this._names.indexOf(mapping.name);
+	        next += base64VLQ.encode(nameIdx - previousName);
+	        previousName = nameIdx;
+	      }
+	    }
+
+	    result += next;
+	  }
+
+	  return result;
+	};
+
+	SourceMapGenerator.prototype._generateSourcesContent = function SourceMapGenerator_generateSourcesContent(aSources, aSourceRoot) {
+	  return aSources.map(function (source) {
+	    if (!this._sourcesContents) {
+	      return null;
+	    }
+	    if (aSourceRoot != null) {
+	      source = util.relative(aSourceRoot, source);
+	    }
+	    var key = util.toSetString(source);
+	    return Object.prototype.hasOwnProperty.call(this._sourcesContents, key) ? this._sourcesContents[key] : null;
+	  }, this);
+	};
+
+	/**
+	 * Externalize the source map.
+	 */
+	SourceMapGenerator.prototype.toJSON = function SourceMapGenerator_toJSON() {
+	  var map = {
+	    version: this._version,
+	    sources: this._sources.toArray(),
+	    names: this._names.toArray(),
+	    mappings: this._serializeMappings()
+	  };
+	  if (this._file != null) {
+	    map.file = this._file;
+	  }
+	  if (this._sourceRoot != null) {
+	    map.sourceRoot = this._sourceRoot;
+	  }
+	  if (this._sourcesContents) {
+	    map.sourcesContent = this._generateSourcesContent(map.sources, map.sourceRoot);
+	  }
+
+	  return map;
+	};
+
+	/**
+	 * Render the source map being generated to a string.
+	 */
+	SourceMapGenerator.prototype.toString = function SourceMapGenerator_toString() {
+	  return JSON.stringify(this.toJSON());
+	};
+
+	exports.SourceMapGenerator = SourceMapGenerator;
+
+/***/ }),
+/* 284 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	/*
+	 * Copyright 2009-2011 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE.txt or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 */
+	exports.SourceMapGenerator = __webpack_require__(283).SourceMapGenerator;
+	exports.SourceMapConsumer = __webpack_require__(611).SourceMapConsumer;
+	exports.SourceNode = __webpack_require__(612).SourceNode;
+
+/***/ }),
+/* 285 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(module) {'use strict';
+
+	function assembleStyles() {
+		var styles = {
+			modifiers: {
+				reset: [0, 0],
+				bold: [1, 22], // 21 isn't widely supported and 22 does the same thing
+				dim: [2, 22],
+				italic: [3, 23],
+				underline: [4, 24],
+				inverse: [7, 27],
+				hidden: [8, 28],
+				strikethrough: [9, 29]
+			},
+			colors: {
+				black: [30, 39],
+				red: [31, 39],
+				green: [32, 39],
+				yellow: [33, 39],
+				blue: [34, 39],
+				magenta: [35, 39],
+				cyan: [36, 39],
+				white: [37, 39],
+				gray: [90, 39]
+			},
+			bgColors: {
+				bgBlack: [40, 49],
+				bgRed: [41, 49],
+				bgGreen: [42, 49],
+				bgYellow: [43, 49],
+				bgBlue: [44, 49],
+				bgMagenta: [45, 49],
+				bgCyan: [46, 49],
+				bgWhite: [47, 49]
+			}
+		};
+
+		// fix humans
+		styles.colors.grey = styles.colors.gray;
+
+		Object.keys(styles).forEach(function (groupName) {
+			var group = styles[groupName];
+
+			Object.keys(group).forEach(function (styleName) {
+				var style = group[styleName];
+
+				styles[styleName] = group[styleName] = {
+					open: '\x1B[' + style[0] + 'm',
+					close: '\x1B[' + style[1] + 'm'
+				};
+			});
+
+			Object.defineProperty(styles, groupName, {
+				value: group,
+				enumerable: false
+			});
+		});
+
+		return styles;
+	}
+
+	Object.defineProperty(module, 'exports', {
+		enumerable: true,
+		get: assembleStyles
+	});
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(39)(module)))
+
+/***/ }),
+/* 286 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = __webpack_require__(178);
+
+/***/ }),
+/* 287 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.default = getPossiblePluginNames;
+	function getPossiblePluginNames(pluginName) {
+	  return ["babel-plugin-" + pluginName, pluginName];
+	}
+	module.exports = exports["default"];
+
+/***/ }),
+/* 288 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.default = getPossiblePresetNames;
+	function getPossiblePresetNames(presetName) {
+	  var possibleNames = ["babel-preset-" + presetName, presetName];
+
+	  var matches = presetName.match(/^(@[^/]+)\/(.+)$/);
+	  if (matches) {
+	    var orgName = matches[1],
+	        presetPath = matches[2];
+
+	    possibleNames.push(orgName + "/babel-preset-" + presetPath);
+	  }
+
+	  return possibleNames;
+	}
+	module.exports = exports["default"];
+
+/***/ }),
+/* 289 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (dest, src) {
+	  if (!dest || !src) return;
+
+	  return (0, _mergeWith2.default)(dest, src, function (a, b) {
+	    if (b && Array.isArray(a)) {
+	      var newArray = b.slice(0);
+
+	      for (var _iterator = a, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	        var _ref;
+
+	        if (_isArray) {
+	          if (_i >= _iterator.length) break;
+	          _ref = _iterator[_i++];
+	        } else {
+	          _i = _iterator.next();
+	          if (_i.done) break;
+	          _ref = _i.value;
+	        }
+
+	        var item = _ref;
+
+	        if (newArray.indexOf(item) < 0) {
+	          newArray.push(item);
+	        }
+	      }
+
+	      return newArray;
+	    }
+	  });
+	};
+
+	var _mergeWith = __webpack_require__(581);
+
+	var _mergeWith2 = _interopRequireDefault(_mergeWith);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 290 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (ast, comments, tokens) {
+	  if (ast) {
+	    if (ast.type === "Program") {
+	      return t.file(ast, comments || [], tokens || []);
+	    } else if (ast.type === "File") {
+	      return ast;
+	    }
+	  }
+
+	  throw new Error("Not a valid ast?");
+	};
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 291 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (whitelist) {
+	  var outputType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "global";
+
+	  var namespace = t.identifier("babelHelpers");
+
+	  var builder = function builder(body) {
+	    return buildHelpers(body, namespace, whitelist);
+	  };
+
+	  var tree = void 0;
+
+	  var build = {
+	    global: buildGlobal,
+	    umd: buildUmd,
+	    var: buildVar
+	  }[outputType];
+
+	  if (build) {
+	    tree = build(namespace, builder);
+	  } else {
+	    throw new Error(messages.get("unsupportedOutputType", outputType));
+	  }
+
+	  return (0, _babelGenerator2.default)(tree).code;
+	};
+
+	var _babelHelpers = __webpack_require__(190);
+
+	var helpers = _interopRequireWildcard(_babelHelpers);
+
+	var _babelGenerator = __webpack_require__(182);
+
+	var _babelGenerator2 = _interopRequireDefault(_babelGenerator);
+
+	var _babelMessages = __webpack_require__(18);
+
+	var messages = _interopRequireWildcard(_babelMessages);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	var buildUmdWrapper = (0, _babelTemplate2.default)("\n  (function (root, factory) {\n    if (typeof define === \"function\" && define.amd) {\n      define(AMD_ARGUMENTS, factory);\n    } else if (typeof exports === \"object\") {\n      factory(COMMON_ARGUMENTS);\n    } else {\n      factory(BROWSER_ARGUMENTS);\n    }\n  })(UMD_ROOT, function (FACTORY_PARAMETERS) {\n    FACTORY_BODY\n  });\n");
+
+	function buildGlobal(namespace, builder) {
+	  var body = [];
+	  var container = t.functionExpression(null, [t.identifier("global")], t.blockStatement(body));
+	  var tree = t.program([t.expressionStatement(t.callExpression(container, [helpers.get("selfGlobal")]))]);
+
+	  body.push(t.variableDeclaration("var", [t.variableDeclarator(namespace, t.assignmentExpression("=", t.memberExpression(t.identifier("global"), namespace), t.objectExpression([])))]));
+
+	  builder(body);
+
+	  return tree;
+	}
+
+	function buildUmd(namespace, builder) {
+	  var body = [];
+	  body.push(t.variableDeclaration("var", [t.variableDeclarator(namespace, t.identifier("global"))]));
+
+	  builder(body);
+
+	  return t.program([buildUmdWrapper({
+	    FACTORY_PARAMETERS: t.identifier("global"),
+	    BROWSER_ARGUMENTS: t.assignmentExpression("=", t.memberExpression(t.identifier("root"), namespace), t.objectExpression([])),
+	    COMMON_ARGUMENTS: t.identifier("exports"),
+	    AMD_ARGUMENTS: t.arrayExpression([t.stringLiteral("exports")]),
+	    FACTORY_BODY: body,
+	    UMD_ROOT: t.identifier("this")
+	  })]);
+	}
+
+	function buildVar(namespace, builder) {
+	  var body = [];
+	  body.push(t.variableDeclaration("var", [t.variableDeclarator(namespace, t.objectExpression([]))]));
+	  builder(body);
+	  body.push(t.expressionStatement(namespace));
+	  return t.program(body);
+	}
+
+	function buildHelpers(body, namespace, whitelist) {
+	  helpers.list.forEach(function (name) {
+	    if (whitelist && whitelist.indexOf(name) < 0) return;
+
+	    var key = t.identifier(name);
+	    body.push(t.expressionStatement(t.assignmentExpression("=", t.memberExpression(namespace, key), helpers.get(name))));
+	  });
+	}
+	module.exports = exports["default"];
+
+/***/ }),
+/* 292 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _plugin = __webpack_require__(63);
+
+	var _plugin2 = _interopRequireDefault(_plugin);
+
+	var _sortBy = __webpack_require__(585);
+
+	var _sortBy2 = _interopRequireDefault(_sortBy);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = new _plugin2.default({
+
+	  name: "internal.blockHoist",
+
+	  visitor: {
+	    Block: {
+	      exit: function exit(_ref) {
+	        var node = _ref.node;
+
+	        var hasChange = false;
+	        for (var i = 0; i < node.body.length; i++) {
+	          var bodyNode = node.body[i];
+	          if (bodyNode && bodyNode._blockHoist != null) {
+	            hasChange = true;
+	            break;
+	          }
+	        }
+	        if (!hasChange) return;
+
+	        node.body = (0, _sortBy2.default)(node.body, function (bodyNode) {
+	          var priority = bodyNode && bodyNode._blockHoist;
+	          if (priority == null) priority = 1;
+	          if (priority === true) priority = 2;
+
+	          return -1 * priority;
+	        });
+	      }
+	    }
+	  }
+	});
+	module.exports = exports["default"];
+
+/***/ }),
+/* 293 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _symbol = __webpack_require__(10);
+
+	var _symbol2 = _interopRequireDefault(_symbol);
+
+	var _plugin = __webpack_require__(63);
+
+	var _plugin2 = _interopRequireDefault(_plugin);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var SUPER_THIS_BOUND = (0, _symbol2.default)("super this bound");
+
+	var superVisitor = {
+	  CallExpression: function CallExpression(path) {
+	    if (!path.get("callee").isSuper()) return;
+
+	    var node = path.node;
+
+	    if (node[SUPER_THIS_BOUND]) return;
+	    node[SUPER_THIS_BOUND] = true;
+
+	    path.replaceWith(t.assignmentExpression("=", this.id, node));
+	  }
+	};
+
+	exports.default = new _plugin2.default({
+	  name: "internal.shadowFunctions",
+
+	  visitor: {
+	    ThisExpression: function ThisExpression(path) {
+	      remap(path, "this");
+	    },
+	    ReferencedIdentifier: function ReferencedIdentifier(path) {
+	      if (path.node.name === "arguments") {
+	        remap(path, "arguments");
+	      }
+	    }
+	  }
+	});
+
+	function shouldShadow(path, shadowPath) {
+	  if (path.is("_forceShadow")) {
+	    return true;
+	  } else {
+	    return shadowPath;
+	  }
+	}
+
+	function remap(path, key) {
+	  var shadowPath = path.inShadow(key);
+	  if (!shouldShadow(path, shadowPath)) return;
+
+	  var shadowFunction = path.node._shadowedFunctionLiteral;
+
+	  var currentFunction = void 0;
+	  var passedShadowFunction = false;
+
+	  var fnPath = path.find(function (innerPath) {
+	    if (innerPath.parentPath && innerPath.parentPath.isClassProperty() && innerPath.key === "value") {
+	      return true;
+	    }
+	    if (path === innerPath) return false;
+	    if (innerPath.isProgram() || innerPath.isFunction()) {
+	      currentFunction = currentFunction || innerPath;
+	    }
+
+	    if (innerPath.isProgram()) {
+	      passedShadowFunction = true;
+
+	      return true;
+	    } else if (innerPath.isFunction() && !innerPath.isArrowFunctionExpression()) {
+	      if (shadowFunction) {
+	        if (innerPath === shadowFunction || innerPath.node === shadowFunction.node) return true;
+	      } else {
+	        if (!innerPath.is("shadow")) return true;
+	      }
+
+	      passedShadowFunction = true;
+	      return false;
+	    }
+
+	    return false;
+	  });
+
+	  if (shadowFunction && fnPath.isProgram() && !shadowFunction.isProgram()) {
+	    fnPath = path.findParent(function (p) {
+	      return p.isProgram() || p.isFunction();
+	    });
+	  }
+
+	  if (fnPath === currentFunction) return;
+
+	  if (!passedShadowFunction) return;
+
+	  var cached = fnPath.getData(key);
+	  if (cached) return path.replaceWith(cached);
+
+	  var id = path.scope.generateUidIdentifier(key);
+
+	  fnPath.setData(key, id);
+
+	  var classPath = fnPath.findParent(function (p) {
+	    return p.isClass();
+	  });
+	  var hasSuperClass = !!(classPath && classPath.node && classPath.node.superClass);
+
+	  if (key === "this" && fnPath.isMethod({ kind: "constructor" }) && hasSuperClass) {
+	    fnPath.scope.push({ id: id });
+
+	    fnPath.traverse(superVisitor, { id: id });
+	  } else {
+	    var init = key === "this" ? t.thisExpression() : t.identifier(key);
+
+	    if (shadowFunction) init._shadowedFunctionLiteral = shadowFunction;
+
+	    fnPath.scope.push({ id: id, init: init });
+	  }
+
+	  return path.replaceWith(id);
+	}
+	module.exports = exports["default"];
+
+/***/ }),
+/* 294 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _normalizeAst = __webpack_require__(290);
+
+	var _normalizeAst2 = _interopRequireDefault(_normalizeAst);
+
+	var _plugin = __webpack_require__(63);
+
+	var _plugin2 = _interopRequireDefault(_plugin);
+
+	var _file = __webpack_require__(49);
+
+	var _file2 = _interopRequireDefault(_file);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var Pipeline = function () {
+	  function Pipeline() {
+	    (0, _classCallCheck3.default)(this, Pipeline);
+	  }
+
+	  Pipeline.prototype.lint = function lint(code) {
+	    var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+	    opts.code = false;
+	    opts.mode = "lint";
+	    return this.transform(code, opts);
+	  };
+
+	  Pipeline.prototype.pretransform = function pretransform(code, opts) {
+	    var file = new _file2.default(opts, this);
+	    return file.wrap(code, function () {
+	      file.addCode(code);
+	      file.parseCode(code);
+	      return file;
+	    });
+	  };
+
+	  Pipeline.prototype.transform = function transform(code, opts) {
+	    var file = new _file2.default(opts, this);
+	    return file.wrap(code, function () {
+	      file.addCode(code);
+	      file.parseCode(code);
+	      return file.transform();
+	    });
+	  };
+
+	  Pipeline.prototype.analyse = function analyse(code) {
+	    var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	    var visitor = arguments[2];
+
+	    opts.code = false;
+	    if (visitor) {
+	      opts.plugins = opts.plugins || [];
+	      opts.plugins.push(new _plugin2.default({ visitor: visitor }));
+	    }
+	    return this.transform(code, opts).metadata;
+	  };
+
+	  Pipeline.prototype.transformFromAst = function transformFromAst(ast, code, opts) {
+	    ast = (0, _normalizeAst2.default)(ast);
+
+	    var file = new _file2.default(opts, this);
+	    return file.wrap(code, function () {
+	      file.addCode(code);
+	      file.addAst(ast);
+	      return file.transform();
+	    });
+	  };
+
+	  return Pipeline;
+	}();
+
+	exports.default = Pipeline;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 295 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _possibleConstructorReturn2 = __webpack_require__(42);
+
+	var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+	var _inherits2 = __webpack_require__(41);
+
+	var _inherits3 = _interopRequireDefault(_inherits2);
+
+	var _store = __webpack_require__(118);
+
+	var _store2 = _interopRequireDefault(_store);
+
+	var _file5 = __webpack_require__(49);
+
+	var _file6 = _interopRequireDefault(_file5);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var PluginPass = function (_Store) {
+	  (0, _inherits3.default)(PluginPass, _Store);
+
+	  function PluginPass(file, plugin) {
+	    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+	    (0, _classCallCheck3.default)(this, PluginPass);
+
+	    var _this = (0, _possibleConstructorReturn3.default)(this, _Store.call(this));
+
+	    _this.plugin = plugin;
+	    _this.key = plugin.key;
+	    _this.file = file;
+	    _this.opts = options;
+	    return _this;
+	  }
+
+	  PluginPass.prototype.addHelper = function addHelper() {
+	    var _file;
+
+	    return (_file = this.file).addHelper.apply(_file, arguments);
+	  };
+
+	  PluginPass.prototype.addImport = function addImport() {
+	    var _file2;
+
+	    return (_file2 = this.file).addImport.apply(_file2, arguments);
+	  };
+
+	  PluginPass.prototype.getModuleName = function getModuleName() {
+	    var _file3;
+
+	    return (_file3 = this.file).getModuleName.apply(_file3, arguments);
+	  };
+
+	  PluginPass.prototype.buildCodeFrameError = function buildCodeFrameError() {
+	    var _file4;
+
+	    return (_file4 = this.file).buildCodeFrameError.apply(_file4, arguments);
+	  };
+
+	  return PluginPass;
+	}(_store2.default);
+
+	exports.default = PluginPass;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 296 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _trimRight = __webpack_require__(616);
+
+	var _trimRight2 = _interopRequireDefault(_trimRight);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var SPACES_RE = /^[ \t]+$/;
+
+	var Buffer = function () {
+	  function Buffer(map) {
+	    (0, _classCallCheck3.default)(this, Buffer);
+	    this._map = null;
+	    this._buf = [];
+	    this._last = "";
+	    this._queue = [];
+	    this._position = {
+	      line: 1,
+	      column: 0
+	    };
+	    this._sourcePosition = {
+	      identifierName: null,
+	      line: null,
+	      column: null,
+	      filename: null
+	    };
+
+	    this._map = map;
+	  }
+
+	  Buffer.prototype.get = function get() {
+	    this._flush();
+
+	    var map = this._map;
+	    var result = {
+	      code: (0, _trimRight2.default)(this._buf.join("")),
+	      map: null,
+	      rawMappings: map && map.getRawMappings()
+	    };
+
+	    if (map) {
+	      Object.defineProperty(result, "map", {
+	        configurable: true,
+	        enumerable: true,
+	        get: function get() {
+	          return this.map = map.get();
+	        },
+	        set: function set(value) {
+	          Object.defineProperty(this, "map", { value: value, writable: true });
+	        }
+	      });
+	    }
+
+	    return result;
+	  };
+
+	  Buffer.prototype.append = function append(str) {
+	    this._flush();
+	    var _sourcePosition = this._sourcePosition,
+	        line = _sourcePosition.line,
+	        column = _sourcePosition.column,
+	        filename = _sourcePosition.filename,
+	        identifierName = _sourcePosition.identifierName;
+
+	    this._append(str, line, column, identifierName, filename);
+	  };
+
+	  Buffer.prototype.queue = function queue(str) {
+	    if (str === "\n") while (this._queue.length > 0 && SPACES_RE.test(this._queue[0][0])) {
+	      this._queue.shift();
+	    }var _sourcePosition2 = this._sourcePosition,
+	        line = _sourcePosition2.line,
+	        column = _sourcePosition2.column,
+	        filename = _sourcePosition2.filename,
+	        identifierName = _sourcePosition2.identifierName;
+
+	    this._queue.unshift([str, line, column, identifierName, filename]);
+	  };
+
+	  Buffer.prototype._flush = function _flush() {
+	    var item = void 0;
+	    while (item = this._queue.pop()) {
+	      this._append.apply(this, item);
+	    }
+	  };
+
+	  Buffer.prototype._append = function _append(str, line, column, identifierName, filename) {
+	    if (this._map && str[0] !== "\n") {
+	      this._map.mark(this._position.line, this._position.column, line, column, identifierName, filename);
+	    }
+
+	    this._buf.push(str);
+	    this._last = str[str.length - 1];
+
+	    for (var i = 0; i < str.length; i++) {
+	      if (str[i] === "\n") {
+	        this._position.line++;
+	        this._position.column = 0;
+	      } else {
+	        this._position.column++;
+	      }
+	    }
+	  };
+
+	  Buffer.prototype.removeTrailingNewline = function removeTrailingNewline() {
+	    if (this._queue.length > 0 && this._queue[0][0] === "\n") this._queue.shift();
+	  };
+
+	  Buffer.prototype.removeLastSemicolon = function removeLastSemicolon() {
+	    if (this._queue.length > 0 && this._queue[0][0] === ";") this._queue.shift();
+	  };
+
+	  Buffer.prototype.endsWith = function endsWith(suffix) {
+	    if (suffix.length === 1) {
+	      var last = void 0;
+	      if (this._queue.length > 0) {
+	        var str = this._queue[0][0];
+	        last = str[str.length - 1];
+	      } else {
+	        last = this._last;
+	      }
+
+	      return last === suffix;
+	    }
+
+	    var end = this._last + this._queue.reduce(function (acc, item) {
+	      return item[0] + acc;
+	    }, "");
+	    if (suffix.length <= end.length) {
+	      return end.slice(-suffix.length) === suffix;
+	    }
+
+	    return false;
+	  };
+
+	  Buffer.prototype.hasContent = function hasContent() {
+	    return this._queue.length > 0 || !!this._last;
+	  };
+
+	  Buffer.prototype.source = function source(prop, loc) {
+	    if (prop && !loc) return;
+
+	    var pos = loc ? loc[prop] : null;
+
+	    this._sourcePosition.identifierName = loc && loc.identifierName || null;
+	    this._sourcePosition.line = pos ? pos.line : null;
+	    this._sourcePosition.column = pos ? pos.column : null;
+	    this._sourcePosition.filename = loc && loc.filename || null;
+	  };
+
+	  Buffer.prototype.withSource = function withSource(prop, loc, cb) {
+	    if (!this._map) return cb();
+
+	    var originalLine = this._sourcePosition.line;
+	    var originalColumn = this._sourcePosition.column;
+	    var originalFilename = this._sourcePosition.filename;
+	    var originalIdentifierName = this._sourcePosition.identifierName;
+
+	    this.source(prop, loc);
+
+	    cb();
+
+	    this._sourcePosition.line = originalLine;
+	    this._sourcePosition.column = originalColumn;
+	    this._sourcePosition.filename = originalFilename;
+	    this._sourcePosition.identifierName = originalIdentifierName;
+	  };
+
+	  Buffer.prototype.getCurrentColumn = function getCurrentColumn() {
+	    var extra = this._queue.reduce(function (acc, item) {
+	      return item[0] + acc;
+	    }, "");
+	    var lastIndex = extra.lastIndexOf("\n");
+
+	    return lastIndex === -1 ? this._position.column + extra.length : extra.length - 1 - lastIndex;
+	  };
+
+	  Buffer.prototype.getCurrentLine = function getCurrentLine() {
+	    var extra = this._queue.reduce(function (acc, item) {
+	      return item[0] + acc;
+	    }, "");
+
+	    var count = 0;
+	    for (var i = 0; i < extra.length; i++) {
+	      if (extra[i] === "\n") count++;
+	    }
+
+	    return this._position.line + count;
+	  };
+
+	  return Buffer;
+	}();
+
+	exports.default = Buffer;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 297 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.File = File;
+	exports.Program = Program;
+	exports.BlockStatement = BlockStatement;
+	exports.Noop = Noop;
+	exports.Directive = Directive;
+
+	var _types = __webpack_require__(122);
+
+	Object.defineProperty(exports, "DirectiveLiteral", {
+	  enumerable: true,
+	  get: function get() {
+	    return _types.StringLiteral;
+	  }
+	});
+	function File(node) {
+	  this.print(node.program, node);
+	}
+
+	function Program(node) {
+	  this.printInnerComments(node, false);
+
+	  this.printSequence(node.directives, node);
+	  if (node.directives && node.directives.length) this.newline();
+
+	  this.printSequence(node.body, node);
+	}
+
+	function BlockStatement(node) {
+	  this.token("{");
+	  this.printInnerComments(node);
+
+	  var hasDirectives = node.directives && node.directives.length;
+
+	  if (node.body.length || hasDirectives) {
+	    this.newline();
+
+	    this.printSequence(node.directives, node, { indent: true });
+	    if (hasDirectives) this.newline();
+
+	    this.printSequence(node.body, node, { indent: true });
+	    this.removeTrailingNewline();
+
+	    this.source("end", node.loc);
+
+	    if (!this.endsWith("\n")) this.newline();
+
+	    this.rightBrace();
+	  } else {
+	    this.source("end", node.loc);
+	    this.token("}");
+	  }
+	}
+
+	function Noop() {}
+
+	function Directive(node) {
+	  this.print(node.value, node);
+	  this.semicolon();
+	}
+
+/***/ }),
+/* 298 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.ClassDeclaration = ClassDeclaration;
+	exports.ClassBody = ClassBody;
+	exports.ClassProperty = ClassProperty;
+	exports.ClassMethod = ClassMethod;
+	function ClassDeclaration(node) {
+	  this.printJoin(node.decorators, node);
+	  this.word("class");
+
+	  if (node.id) {
+	    this.space();
+	    this.print(node.id, node);
+	  }
+
+	  this.print(node.typeParameters, node);
+
+	  if (node.superClass) {
+	    this.space();
+	    this.word("extends");
+	    this.space();
+	    this.print(node.superClass, node);
+	    this.print(node.superTypeParameters, node);
+	  }
+
+	  if (node.implements) {
+	    this.space();
+	    this.word("implements");
+	    this.space();
+	    this.printList(node.implements, node);
+	  }
+
+	  this.space();
+	  this.print(node.body, node);
+	}
+
+	exports.ClassExpression = ClassDeclaration;
+	function ClassBody(node) {
+	  this.token("{");
+	  this.printInnerComments(node);
+	  if (node.body.length === 0) {
+	    this.token("}");
+	  } else {
+	    this.newline();
+
+	    this.indent();
+	    this.printSequence(node.body, node);
+	    this.dedent();
+
+	    if (!this.endsWith("\n")) this.newline();
+
+	    this.rightBrace();
+	  }
+	}
+
+	function ClassProperty(node) {
+	  this.printJoin(node.decorators, node);
+
+	  if (node.static) {
+	    this.word("static");
+	    this.space();
+	  }
+	  if (node.computed) {
+	    this.token("[");
+	    this.print(node.key, node);
+	    this.token("]");
+	  } else {
+	    this._variance(node);
+	    this.print(node.key, node);
+	  }
+	  this.print(node.typeAnnotation, node);
+	  if (node.value) {
+	    this.space();
+	    this.token("=");
+	    this.space();
+	    this.print(node.value, node);
+	  }
+	  this.semicolon();
+	}
+
+	function ClassMethod(node) {
+	  this.printJoin(node.decorators, node);
+
+	  if (node.static) {
+	    this.word("static");
+	    this.space();
+	  }
+
+	  if (node.kind === "constructorCall") {
+	    this.word("call");
+	    this.space();
+	  }
+
+	  this._method(node);
+	}
+
+/***/ }),
+/* 299 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.LogicalExpression = exports.BinaryExpression = exports.AwaitExpression = exports.YieldExpression = undefined;
+	exports.UnaryExpression = UnaryExpression;
+	exports.DoExpression = DoExpression;
+	exports.ParenthesizedExpression = ParenthesizedExpression;
+	exports.UpdateExpression = UpdateExpression;
+	exports.ConditionalExpression = ConditionalExpression;
+	exports.NewExpression = NewExpression;
+	exports.SequenceExpression = SequenceExpression;
+	exports.ThisExpression = ThisExpression;
+	exports.Super = Super;
+	exports.Decorator = Decorator;
+	exports.CallExpression = CallExpression;
+	exports.Import = Import;
+	exports.EmptyStatement = EmptyStatement;
+	exports.ExpressionStatement = ExpressionStatement;
+	exports.AssignmentPattern = AssignmentPattern;
+	exports.AssignmentExpression = AssignmentExpression;
+	exports.BindExpression = BindExpression;
+	exports.MemberExpression = MemberExpression;
+	exports.MetaProperty = MetaProperty;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _node = __webpack_require__(183);
+
+	var n = _interopRequireWildcard(_node);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function UnaryExpression(node) {
+	  if (node.operator === "void" || node.operator === "delete" || node.operator === "typeof") {
+	    this.word(node.operator);
+	    this.space();
+	  } else {
+	    this.token(node.operator);
+	  }
+
+	  this.print(node.argument, node);
+	}
+
+	function DoExpression(node) {
+	  this.word("do");
+	  this.space();
+	  this.print(node.body, node);
+	}
+
+	function ParenthesizedExpression(node) {
+	  this.token("(");
+	  this.print(node.expression, node);
+	  this.token(")");
+	}
+
+	function UpdateExpression(node) {
+	  if (node.prefix) {
+	    this.token(node.operator);
+	    this.print(node.argument, node);
+	  } else {
+	    this.print(node.argument, node);
+	    this.token(node.operator);
+	  }
+	}
+
+	function ConditionalExpression(node) {
+	  this.print(node.test, node);
+	  this.space();
+	  this.token("?");
+	  this.space();
+	  this.print(node.consequent, node);
+	  this.space();
+	  this.token(":");
+	  this.space();
+	  this.print(node.alternate, node);
+	}
+
+	function NewExpression(node, parent) {
+	  this.word("new");
+	  this.space();
+	  this.print(node.callee, node);
+	  if (node.arguments.length === 0 && this.format.minified && !t.isCallExpression(parent, { callee: node }) && !t.isMemberExpression(parent) && !t.isNewExpression(parent)) return;
+
+	  this.token("(");
+	  this.printList(node.arguments, node);
+	  this.token(")");
+	}
+
+	function SequenceExpression(node) {
+	  this.printList(node.expressions, node);
+	}
+
+	function ThisExpression() {
+	  this.word("this");
+	}
+
+	function Super() {
+	  this.word("super");
+	}
+
+	function Decorator(node) {
+	  this.token("@");
+	  this.print(node.expression, node);
+	  this.newline();
+	}
+
+	function commaSeparatorNewline() {
+	  this.token(",");
+	  this.newline();
+
+	  if (!this.endsWith("\n")) this.space();
+	}
+
+	function CallExpression(node) {
+	  this.print(node.callee, node);
+
+	  this.token("(");
+
+	  var isPrettyCall = node._prettyCall;
+
+	  var separator = void 0;
+	  if (isPrettyCall) {
+	    separator = commaSeparatorNewline;
+	    this.newline();
+	    this.indent();
+	  }
+
+	  this.printList(node.arguments, node, { separator: separator });
+
+	  if (isPrettyCall) {
+	    this.newline();
+	    this.dedent();
+	  }
+
+	  this.token(")");
+	}
+
+	function Import() {
+	  this.word("import");
+	}
+
+	function buildYieldAwait(keyword) {
+	  return function (node) {
+	    this.word(keyword);
+
+	    if (node.delegate) {
+	      this.token("*");
+	    }
+
+	    if (node.argument) {
+	      this.space();
+	      var terminatorState = this.startTerminatorless();
+	      this.print(node.argument, node);
+	      this.endTerminatorless(terminatorState);
+	    }
+	  };
+	}
+
+	var YieldExpression = exports.YieldExpression = buildYieldAwait("yield");
+	var AwaitExpression = exports.AwaitExpression = buildYieldAwait("await");
+
+	function EmptyStatement() {
+	  this.semicolon(true);
+	}
+
+	function ExpressionStatement(node) {
+	  this.print(node.expression, node);
+	  this.semicolon();
+	}
+
+	function AssignmentPattern(node) {
+	  this.print(node.left, node);
+	  if (node.left.optional) this.token("?");
+	  this.print(node.left.typeAnnotation, node);
+	  this.space();
+	  this.token("=");
+	  this.space();
+	  this.print(node.right, node);
+	}
+
+	function AssignmentExpression(node, parent) {
+	  var parens = this.inForStatementInitCounter && node.operator === "in" && !n.needsParens(node, parent);
+
+	  if (parens) {
+	    this.token("(");
+	  }
+
+	  this.print(node.left, node);
+
+	  this.space();
+	  if (node.operator === "in" || node.operator === "instanceof") {
+	    this.word(node.operator);
+	  } else {
+	    this.token(node.operator);
+	  }
+	  this.space();
+
+	  this.print(node.right, node);
+
+	  if (parens) {
+	    this.token(")");
+	  }
+	}
+
+	function BindExpression(node) {
+	  this.print(node.object, node);
+	  this.token("::");
+	  this.print(node.callee, node);
+	}
+
+	exports.BinaryExpression = AssignmentExpression;
+	exports.LogicalExpression = AssignmentExpression;
+	function MemberExpression(node) {
+	  this.print(node.object, node);
+
+	  if (!node.computed && t.isMemberExpression(node.property)) {
+	    throw new TypeError("Got a MemberExpression for MemberExpression property");
+	  }
+
+	  var computed = node.computed;
+	  if (t.isLiteral(node.property) && typeof node.property.value === "number") {
+	    computed = true;
+	  }
+
+	  if (computed) {
+	    this.token("[");
+	    this.print(node.property, node);
+	    this.token("]");
+	  } else {
+	    this.token(".");
+	    this.print(node.property, node);
+	  }
+	}
+
+	function MetaProperty(node) {
+	  this.print(node.meta, node);
+	  this.token(".");
+	  this.print(node.property, node);
+	}
+
+/***/ }),
+/* 300 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.AnyTypeAnnotation = AnyTypeAnnotation;
+	exports.ArrayTypeAnnotation = ArrayTypeAnnotation;
+	exports.BooleanTypeAnnotation = BooleanTypeAnnotation;
+	exports.BooleanLiteralTypeAnnotation = BooleanLiteralTypeAnnotation;
+	exports.NullLiteralTypeAnnotation = NullLiteralTypeAnnotation;
+	exports.DeclareClass = DeclareClass;
+	exports.DeclareFunction = DeclareFunction;
+	exports.DeclareInterface = DeclareInterface;
+	exports.DeclareModule = DeclareModule;
+	exports.DeclareModuleExports = DeclareModuleExports;
+	exports.DeclareTypeAlias = DeclareTypeAlias;
+	exports.DeclareVariable = DeclareVariable;
+	exports.ExistentialTypeParam = ExistentialTypeParam;
+	exports.FunctionTypeAnnotation = FunctionTypeAnnotation;
+	exports.FunctionTypeParam = FunctionTypeParam;
+	exports.InterfaceExtends = InterfaceExtends;
+	exports._interfaceish = _interfaceish;
+	exports._variance = _variance;
+	exports.InterfaceDeclaration = InterfaceDeclaration;
+	exports.IntersectionTypeAnnotation = IntersectionTypeAnnotation;
+	exports.MixedTypeAnnotation = MixedTypeAnnotation;
+	exports.EmptyTypeAnnotation = EmptyTypeAnnotation;
+	exports.NullableTypeAnnotation = NullableTypeAnnotation;
+
+	var _types = __webpack_require__(122);
+
+	Object.defineProperty(exports, "NumericLiteralTypeAnnotation", {
+	  enumerable: true,
+	  get: function get() {
+	    return _types.NumericLiteral;
+	  }
+	});
+	Object.defineProperty(exports, "StringLiteralTypeAnnotation", {
+	  enumerable: true,
+	  get: function get() {
+	    return _types.StringLiteral;
+	  }
+	});
+	exports.NumberTypeAnnotation = NumberTypeAnnotation;
+	exports.StringTypeAnnotation = StringTypeAnnotation;
+	exports.ThisTypeAnnotation = ThisTypeAnnotation;
+	exports.TupleTypeAnnotation = TupleTypeAnnotation;
+	exports.TypeofTypeAnnotation = TypeofTypeAnnotation;
+	exports.TypeAlias = TypeAlias;
+	exports.TypeAnnotation = TypeAnnotation;
+	exports.TypeParameter = TypeParameter;
+	exports.TypeParameterInstantiation = TypeParameterInstantiation;
+	exports.ObjectTypeAnnotation = ObjectTypeAnnotation;
+	exports.ObjectTypeCallProperty = ObjectTypeCallProperty;
+	exports.ObjectTypeIndexer = ObjectTypeIndexer;
+	exports.ObjectTypeProperty = ObjectTypeProperty;
+	exports.ObjectTypeSpreadProperty = ObjectTypeSpreadProperty;
+	exports.QualifiedTypeIdentifier = QualifiedTypeIdentifier;
+	exports.UnionTypeAnnotation = UnionTypeAnnotation;
+	exports.TypeCastExpression = TypeCastExpression;
+	exports.VoidTypeAnnotation = VoidTypeAnnotation;
+	function AnyTypeAnnotation() {
+	  this.word("any");
+	}
+
+	function ArrayTypeAnnotation(node) {
+	  this.print(node.elementType, node);
+	  this.token("[");
+	  this.token("]");
+	}
+
+	function BooleanTypeAnnotation() {
+	  this.word("boolean");
+	}
+
+	function BooleanLiteralTypeAnnotation(node) {
+	  this.word(node.value ? "true" : "false");
+	}
+
+	function NullLiteralTypeAnnotation() {
+	  this.word("null");
+	}
+
+	function DeclareClass(node) {
+	  this.word("declare");
+	  this.space();
+	  this.word("class");
+	  this.space();
+	  this._interfaceish(node);
+	}
+
+	function DeclareFunction(node) {
+	  this.word("declare");
+	  this.space();
+	  this.word("function");
+	  this.space();
+	  this.print(node.id, node);
+	  this.print(node.id.typeAnnotation.typeAnnotation, node);
+	  this.semicolon();
+	}
+
+	function DeclareInterface(node) {
+	  this.word("declare");
+	  this.space();
+	  this.InterfaceDeclaration(node);
+	}
+
+	function DeclareModule(node) {
+	  this.word("declare");
+	  this.space();
+	  this.word("module");
+	  this.space();
+	  this.print(node.id, node);
+	  this.space();
+	  this.print(node.body, node);
+	}
+
+	function DeclareModuleExports(node) {
+	  this.word("declare");
+	  this.space();
+	  this.word("module");
+	  this.token(".");
+	  this.word("exports");
+	  this.print(node.typeAnnotation, node);
+	}
+
+	function DeclareTypeAlias(node) {
+	  this.word("declare");
+	  this.space();
+	  this.TypeAlias(node);
+	}
+
+	function DeclareVariable(node) {
+	  this.word("declare");
+	  this.space();
+	  this.word("var");
+	  this.space();
+	  this.print(node.id, node);
+	  this.print(node.id.typeAnnotation, node);
+	  this.semicolon();
+	}
+
+	function ExistentialTypeParam() {
+	  this.token("*");
+	}
+
+	function FunctionTypeAnnotation(node, parent) {
+	  this.print(node.typeParameters, node);
+	  this.token("(");
+	  this.printList(node.params, node);
+
+	  if (node.rest) {
+	    if (node.params.length) {
+	      this.token(",");
+	      this.space();
+	    }
+	    this.token("...");
+	    this.print(node.rest, node);
+	  }
+
+	  this.token(")");
+
+	  if (parent.type === "ObjectTypeCallProperty" || parent.type === "DeclareFunction") {
+	    this.token(":");
+	  } else {
+	    this.space();
+	    this.token("=>");
+	  }
+
+	  this.space();
+	  this.print(node.returnType, node);
+	}
+
+	function FunctionTypeParam(node) {
+	  this.print(node.name, node);
+	  if (node.optional) this.token("?");
+	  this.token(":");
+	  this.space();
+	  this.print(node.typeAnnotation, node);
+	}
+
+	function InterfaceExtends(node) {
+	  this.print(node.id, node);
+	  this.print(node.typeParameters, node);
+	}
+
+	exports.ClassImplements = InterfaceExtends;
+	exports.GenericTypeAnnotation = InterfaceExtends;
+	function _interfaceish(node) {
+	  this.print(node.id, node);
+	  this.print(node.typeParameters, node);
+	  if (node.extends.length) {
+	    this.space();
+	    this.word("extends");
+	    this.space();
+	    this.printList(node.extends, node);
+	  }
+	  if (node.mixins && node.mixins.length) {
+	    this.space();
+	    this.word("mixins");
+	    this.space();
+	    this.printList(node.mixins, node);
+	  }
+	  this.space();
+	  this.print(node.body, node);
+	}
+
+	function _variance(node) {
+	  if (node.variance === "plus") {
+	    this.token("+");
+	  } else if (node.variance === "minus") {
+	    this.token("-");
+	  }
+	}
+
+	function InterfaceDeclaration(node) {
+	  this.word("interface");
+	  this.space();
+	  this._interfaceish(node);
+	}
+
+	function andSeparator() {
+	  this.space();
+	  this.token("&");
+	  this.space();
+	}
+
+	function IntersectionTypeAnnotation(node) {
+	  this.printJoin(node.types, node, { separator: andSeparator });
+	}
+
+	function MixedTypeAnnotation() {
+	  this.word("mixed");
+	}
+
+	function EmptyTypeAnnotation() {
+	  this.word("empty");
+	}
+
+	function NullableTypeAnnotation(node) {
+	  this.token("?");
+	  this.print(node.typeAnnotation, node);
+	}
+
+	function NumberTypeAnnotation() {
+	  this.word("number");
+	}
+
+	function StringTypeAnnotation() {
+	  this.word("string");
+	}
+
+	function ThisTypeAnnotation() {
+	  this.word("this");
+	}
+
+	function TupleTypeAnnotation(node) {
+	  this.token("[");
+	  this.printList(node.types, node);
+	  this.token("]");
+	}
+
+	function TypeofTypeAnnotation(node) {
+	  this.word("typeof");
+	  this.space();
+	  this.print(node.argument, node);
+	}
+
+	function TypeAlias(node) {
+	  this.word("type");
+	  this.space();
+	  this.print(node.id, node);
+	  this.print(node.typeParameters, node);
+	  this.space();
+	  this.token("=");
+	  this.space();
+	  this.print(node.right, node);
+	  this.semicolon();
+	}
+
+	function TypeAnnotation(node) {
+	  this.token(":");
+	  this.space();
+	  if (node.optional) this.token("?");
+	  this.print(node.typeAnnotation, node);
+	}
+
+	function TypeParameter(node) {
+	  this._variance(node);
+
+	  this.word(node.name);
+
+	  if (node.bound) {
+	    this.print(node.bound, node);
+	  }
+
+	  if (node.default) {
+	    this.space();
+	    this.token("=");
+	    this.space();
+	    this.print(node.default, node);
+	  }
+	}
+
+	function TypeParameterInstantiation(node) {
+	  this.token("<");
+	  this.printList(node.params, node, {});
+	  this.token(">");
+	}
+
+	exports.TypeParameterDeclaration = TypeParameterInstantiation;
+	function ObjectTypeAnnotation(node) {
+	  var _this = this;
+
+	  if (node.exact) {
+	    this.token("{|");
+	  } else {
+	    this.token("{");
+	  }
+
+	  var props = node.properties.concat(node.callProperties, node.indexers);
+
+	  if (props.length) {
+	    this.space();
+
+	    this.printJoin(props, node, {
+	      addNewlines: function addNewlines(leading) {
+	        if (leading && !props[0]) return 1;
+	      },
+
+	      indent: true,
+	      statement: true,
+	      iterator: function iterator() {
+	        if (props.length !== 1) {
+	          if (_this.format.flowCommaSeparator) {
+	            _this.token(",");
+	          } else {
+	            _this.semicolon();
+	          }
+	          _this.space();
+	        }
+	      }
+	    });
+
+	    this.space();
+	  }
+
+	  if (node.exact) {
+	    this.token("|}");
+	  } else {
+	    this.token("}");
+	  }
+	}
+
+	function ObjectTypeCallProperty(node) {
+	  if (node.static) {
+	    this.word("static");
+	    this.space();
+	  }
+	  this.print(node.value, node);
+	}
+
+	function ObjectTypeIndexer(node) {
+	  if (node.static) {
+	    this.word("static");
+	    this.space();
+	  }
+	  this._variance(node);
+	  this.token("[");
+	  this.print(node.id, node);
+	  this.token(":");
+	  this.space();
+	  this.print(node.key, node);
+	  this.token("]");
+	  this.token(":");
+	  this.space();
+	  this.print(node.value, node);
+	}
+
+	function ObjectTypeProperty(node) {
+	  if (node.static) {
+	    this.word("static");
+	    this.space();
+	  }
+	  this._variance(node);
+	  this.print(node.key, node);
+	  if (node.optional) this.token("?");
+	  this.token(":");
+	  this.space();
+	  this.print(node.value, node);
+	}
+
+	function ObjectTypeSpreadProperty(node) {
+	  this.token("...");
+	  this.print(node.argument, node);
+	}
+
+	function QualifiedTypeIdentifier(node) {
+	  this.print(node.qualification, node);
+	  this.token(".");
+	  this.print(node.id, node);
+	}
+
+	function orSeparator() {
+	  this.space();
+	  this.token("|");
+	  this.space();
+	}
+
+	function UnionTypeAnnotation(node) {
+	  this.printJoin(node.types, node, { separator: orSeparator });
+	}
+
+	function TypeCastExpression(node) {
+	  this.token("(");
+	  this.print(node.expression, node);
+	  this.print(node.typeAnnotation, node);
+	  this.token(")");
+	}
+
+	function VoidTypeAnnotation() {
+	  this.word("void");
+	}
+
+/***/ }),
+/* 301 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.JSXAttribute = JSXAttribute;
+	exports.JSXIdentifier = JSXIdentifier;
+	exports.JSXNamespacedName = JSXNamespacedName;
+	exports.JSXMemberExpression = JSXMemberExpression;
+	exports.JSXSpreadAttribute = JSXSpreadAttribute;
+	exports.JSXExpressionContainer = JSXExpressionContainer;
+	exports.JSXSpreadChild = JSXSpreadChild;
+	exports.JSXText = JSXText;
+	exports.JSXElement = JSXElement;
+	exports.JSXOpeningElement = JSXOpeningElement;
+	exports.JSXClosingElement = JSXClosingElement;
+	exports.JSXEmptyExpression = JSXEmptyExpression;
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function JSXAttribute(node) {
+	  this.print(node.name, node);
+	  if (node.value) {
+	    this.token("=");
+	    this.print(node.value, node);
+	  }
+	}
+
+	function JSXIdentifier(node) {
+	  this.word(node.name);
+	}
+
+	function JSXNamespacedName(node) {
+	  this.print(node.namespace, node);
+	  this.token(":");
+	  this.print(node.name, node);
+	}
+
+	function JSXMemberExpression(node) {
+	  this.print(node.object, node);
+	  this.token(".");
+	  this.print(node.property, node);
+	}
+
+	function JSXSpreadAttribute(node) {
+	  this.token("{");
+	  this.token("...");
+	  this.print(node.argument, node);
+	  this.token("}");
+	}
+
+	function JSXExpressionContainer(node) {
+	  this.token("{");
+	  this.print(node.expression, node);
+	  this.token("}");
+	}
+
+	function JSXSpreadChild(node) {
+	  this.token("{");
+	  this.token("...");
+	  this.print(node.expression, node);
+	  this.token("}");
+	}
+
+	function JSXText(node) {
+	  this.token(node.value);
+	}
+
+	function JSXElement(node) {
+	  var open = node.openingElement;
+	  this.print(open, node);
+	  if (open.selfClosing) return;
+
+	  this.indent();
+	  for (var _iterator = node.children, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var child = _ref;
+
+	    this.print(child, node);
+	  }
+	  this.dedent();
+
+	  this.print(node.closingElement, node);
+	}
+
+	function spaceSeparator() {
+	  this.space();
+	}
+
+	function JSXOpeningElement(node) {
+	  this.token("<");
+	  this.print(node.name, node);
+	  if (node.attributes.length > 0) {
+	    this.space();
+	    this.printJoin(node.attributes, node, { separator: spaceSeparator });
+	  }
+	  if (node.selfClosing) {
+	    this.space();
+	    this.token("/>");
+	  } else {
+	    this.token(">");
+	  }
+	}
+
+	function JSXClosingElement(node) {
+	  this.token("</");
+	  this.print(node.name, node);
+	  this.token(">");
+	}
+
+	function JSXEmptyExpression() {}
+
+/***/ }),
+/* 302 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.FunctionDeclaration = undefined;
+	exports._params = _params;
+	exports._method = _method;
+	exports.FunctionExpression = FunctionExpression;
+	exports.ArrowFunctionExpression = ArrowFunctionExpression;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _params(node) {
+	  var _this = this;
+
+	  this.print(node.typeParameters, node);
+	  this.token("(");
+	  this.printList(node.params, node, {
+	    iterator: function iterator(node) {
+	      if (node.optional) _this.token("?");
+	      _this.print(node.typeAnnotation, node);
+	    }
+	  });
+	  this.token(")");
+
+	  if (node.returnType) {
+	    this.print(node.returnType, node);
+	  }
+	}
+
+	function _method(node) {
+	  var kind = node.kind;
+	  var key = node.key;
+
+	  if (kind === "method" || kind === "init") {
+	    if (node.generator) {
+	      this.token("*");
+	    }
+	  }
+
+	  if (kind === "get" || kind === "set") {
+	    this.word(kind);
+	    this.space();
+	  }
+
+	  if (node.async) {
+	    this.word("async");
+	    this.space();
+	  }
+
+	  if (node.computed) {
+	    this.token("[");
+	    this.print(key, node);
+	    this.token("]");
+	  } else {
+	    this.print(key, node);
+	  }
+
+	  this._params(node);
+	  this.space();
+	  this.print(node.body, node);
+	}
+
+	function FunctionExpression(node) {
+	  if (node.async) {
+	    this.word("async");
+	    this.space();
+	  }
+	  this.word("function");
+	  if (node.generator) this.token("*");
+
+	  if (node.id) {
+	    this.space();
+	    this.print(node.id, node);
+	  } else {
+	    this.space();
+	  }
+
+	  this._params(node);
+	  this.space();
+	  this.print(node.body, node);
+	}
+
+	exports.FunctionDeclaration = FunctionExpression;
+	function ArrowFunctionExpression(node) {
+	  if (node.async) {
+	    this.word("async");
+	    this.space();
+	  }
+
+	  var firstParam = node.params[0];
+
+	  if (node.params.length === 1 && t.isIdentifier(firstParam) && !hasTypes(node, firstParam)) {
+	    this.print(firstParam, node);
+	  } else {
+	    this._params(node);
+	  }
+
+	  this.space();
+	  this.token("=>");
+	  this.space();
+
+	  this.print(node.body, node);
+	}
+
+	function hasTypes(node, param) {
+	  return node.typeParameters || node.returnType || param.typeAnnotation || param.optional || param.trailingComments;
+	}
+
+/***/ }),
+/* 303 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.ImportSpecifier = ImportSpecifier;
+	exports.ImportDefaultSpecifier = ImportDefaultSpecifier;
+	exports.ExportDefaultSpecifier = ExportDefaultSpecifier;
+	exports.ExportSpecifier = ExportSpecifier;
+	exports.ExportNamespaceSpecifier = ExportNamespaceSpecifier;
+	exports.ExportAllDeclaration = ExportAllDeclaration;
+	exports.ExportNamedDeclaration = ExportNamedDeclaration;
+	exports.ExportDefaultDeclaration = ExportDefaultDeclaration;
+	exports.ImportDeclaration = ImportDeclaration;
+	exports.ImportNamespaceSpecifier = ImportNamespaceSpecifier;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function ImportSpecifier(node) {
+	  if (node.importKind === "type" || node.importKind === "typeof") {
+	    this.word(node.importKind);
+	    this.space();
+	  }
+
+	  this.print(node.imported, node);
+	  if (node.local && node.local.name !== node.imported.name) {
+	    this.space();
+	    this.word("as");
+	    this.space();
+	    this.print(node.local, node);
+	  }
+	}
+
+	function ImportDefaultSpecifier(node) {
+	  this.print(node.local, node);
+	}
+
+	function ExportDefaultSpecifier(node) {
+	  this.print(node.exported, node);
+	}
+
+	function ExportSpecifier(node) {
+	  this.print(node.local, node);
+	  if (node.exported && node.local.name !== node.exported.name) {
+	    this.space();
+	    this.word("as");
+	    this.space();
+	    this.print(node.exported, node);
+	  }
+	}
+
+	function ExportNamespaceSpecifier(node) {
+	  this.token("*");
+	  this.space();
+	  this.word("as");
+	  this.space();
+	  this.print(node.exported, node);
+	}
+
+	function ExportAllDeclaration(node) {
+	  this.word("export");
+	  this.space();
+	  this.token("*");
+	  this.space();
+	  this.word("from");
+	  this.space();
+	  this.print(node.source, node);
+	  this.semicolon();
+	}
+
+	function ExportNamedDeclaration() {
+	  this.word("export");
+	  this.space();
+	  ExportDeclaration.apply(this, arguments);
+	}
+
+	function ExportDefaultDeclaration() {
+	  this.word("export");
+	  this.space();
+	  this.word("default");
+	  this.space();
+	  ExportDeclaration.apply(this, arguments);
+	}
+
+	function ExportDeclaration(node) {
+	  if (node.declaration) {
+	    var declar = node.declaration;
+	    this.print(declar, node);
+	    if (!t.isStatement(declar)) this.semicolon();
+	  } else {
+	    if (node.exportKind === "type") {
+	      this.word("type");
+	      this.space();
+	    }
+
+	    var specifiers = node.specifiers.slice(0);
+
+	    var hasSpecial = false;
+	    while (true) {
+	      var first = specifiers[0];
+	      if (t.isExportDefaultSpecifier(first) || t.isExportNamespaceSpecifier(first)) {
+	        hasSpecial = true;
+	        this.print(specifiers.shift(), node);
+	        if (specifiers.length) {
+	          this.token(",");
+	          this.space();
+	        }
+	      } else {
+	        break;
+	      }
+	    }
+
+	    if (specifiers.length || !specifiers.length && !hasSpecial) {
+	      this.token("{");
+	      if (specifiers.length) {
+	        this.space();
+	        this.printList(specifiers, node);
+	        this.space();
+	      }
+	      this.token("}");
+	    }
+
+	    if (node.source) {
+	      this.space();
+	      this.word("from");
+	      this.space();
+	      this.print(node.source, node);
+	    }
+
+	    this.semicolon();
+	  }
+	}
+
+	function ImportDeclaration(node) {
+	  this.word("import");
+	  this.space();
+
+	  if (node.importKind === "type" || node.importKind === "typeof") {
+	    this.word(node.importKind);
+	    this.space();
+	  }
+
+	  var specifiers = node.specifiers.slice(0);
+	  if (specifiers && specifiers.length) {
+	    while (true) {
+	      var first = specifiers[0];
+	      if (t.isImportDefaultSpecifier(first) || t.isImportNamespaceSpecifier(first)) {
+	        this.print(specifiers.shift(), node);
+	        if (specifiers.length) {
+	          this.token(",");
+	          this.space();
+	        }
+	      } else {
+	        break;
+	      }
+	    }
+
+	    if (specifiers.length) {
+	      this.token("{");
+	      this.space();
+	      this.printList(specifiers, node);
+	      this.space();
+	      this.token("}");
+	    }
+
+	    this.space();
+	    this.word("from");
+	    this.space();
+	  }
+
+	  this.print(node.source, node);
+	  this.semicolon();
+	}
+
+	function ImportNamespaceSpecifier(node) {
+	  this.token("*");
+	  this.space();
+	  this.word("as");
+	  this.space();
+	  this.print(node.local, node);
+	}
+
+/***/ }),
+/* 304 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.ThrowStatement = exports.BreakStatement = exports.ReturnStatement = exports.ContinueStatement = exports.ForAwaitStatement = exports.ForOfStatement = exports.ForInStatement = undefined;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.WithStatement = WithStatement;
+	exports.IfStatement = IfStatement;
+	exports.ForStatement = ForStatement;
+	exports.WhileStatement = WhileStatement;
+	exports.DoWhileStatement = DoWhileStatement;
+	exports.LabeledStatement = LabeledStatement;
+	exports.TryStatement = TryStatement;
+	exports.CatchClause = CatchClause;
+	exports.SwitchStatement = SwitchStatement;
+	exports.SwitchCase = SwitchCase;
+	exports.DebuggerStatement = DebuggerStatement;
+	exports.VariableDeclaration = VariableDeclaration;
+	exports.VariableDeclarator = VariableDeclarator;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function WithStatement(node) {
+	  this.word("with");
+	  this.space();
+	  this.token("(");
+	  this.print(node.object, node);
+	  this.token(")");
+	  this.printBlock(node);
+	}
+
+	function IfStatement(node) {
+	  this.word("if");
+	  this.space();
+	  this.token("(");
+	  this.print(node.test, node);
+	  this.token(")");
+	  this.space();
+
+	  var needsBlock = node.alternate && t.isIfStatement(getLastStatement(node.consequent));
+	  if (needsBlock) {
+	    this.token("{");
+	    this.newline();
+	    this.indent();
+	  }
+
+	  this.printAndIndentOnComments(node.consequent, node);
+
+	  if (needsBlock) {
+	    this.dedent();
+	    this.newline();
+	    this.token("}");
+	  }
+
+	  if (node.alternate) {
+	    if (this.endsWith("}")) this.space();
+	    this.word("else");
+	    this.space();
+	    this.printAndIndentOnComments(node.alternate, node);
+	  }
+	}
+
+	function getLastStatement(statement) {
+	  if (!t.isStatement(statement.body)) return statement;
+	  return getLastStatement(statement.body);
+	}
+
+	function ForStatement(node) {
+	  this.word("for");
+	  this.space();
+	  this.token("(");
+
+	  this.inForStatementInitCounter++;
+	  this.print(node.init, node);
+	  this.inForStatementInitCounter--;
+	  this.token(";");
+
+	  if (node.test) {
+	    this.space();
+	    this.print(node.test, node);
+	  }
+	  this.token(";");
+
+	  if (node.update) {
+	    this.space();
+	    this.print(node.update, node);
+	  }
+
+	  this.token(")");
+	  this.printBlock(node);
+	}
+
+	function WhileStatement(node) {
+	  this.word("while");
+	  this.space();
+	  this.token("(");
+	  this.print(node.test, node);
+	  this.token(")");
+	  this.printBlock(node);
+	}
+
+	var buildForXStatement = function buildForXStatement(op) {
+	  return function (node) {
+	    this.word("for");
+	    this.space();
+	    if (op === "await") {
+	      this.word("await");
+	      this.space();
+	    }
+	    this.token("(");
+
+	    this.print(node.left, node);
+	    this.space();
+	    this.word(op === "await" ? "of" : op);
+	    this.space();
+	    this.print(node.right, node);
+	    this.token(")");
+	    this.printBlock(node);
+	  };
+	};
+
+	var ForInStatement = exports.ForInStatement = buildForXStatement("in");
+	var ForOfStatement = exports.ForOfStatement = buildForXStatement("of");
+	var ForAwaitStatement = exports.ForAwaitStatement = buildForXStatement("await");
+
+	function DoWhileStatement(node) {
+	  this.word("do");
+	  this.space();
+	  this.print(node.body, node);
+	  this.space();
+	  this.word("while");
+	  this.space();
+	  this.token("(");
+	  this.print(node.test, node);
+	  this.token(")");
+	  this.semicolon();
+	}
+
+	function buildLabelStatement(prefix) {
+	  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "label";
+
+	  return function (node) {
+	    this.word(prefix);
+
+	    var label = node[key];
+	    if (label) {
+	      this.space();
+
+	      var terminatorState = this.startTerminatorless();
+	      this.print(label, node);
+	      this.endTerminatorless(terminatorState);
+	    }
+
+	    this.semicolon();
+	  };
+	}
+
+	var ContinueStatement = exports.ContinueStatement = buildLabelStatement("continue");
+	var ReturnStatement = exports.ReturnStatement = buildLabelStatement("return", "argument");
+	var BreakStatement = exports.BreakStatement = buildLabelStatement("break");
+	var ThrowStatement = exports.ThrowStatement = buildLabelStatement("throw", "argument");
+
+	function LabeledStatement(node) {
+	  this.print(node.label, node);
+	  this.token(":");
+	  this.space();
+	  this.print(node.body, node);
+	}
+
+	function TryStatement(node) {
+	  this.word("try");
+	  this.space();
+	  this.print(node.block, node);
+	  this.space();
+
+	  if (node.handlers) {
+	    this.print(node.handlers[0], node);
+	  } else {
+	    this.print(node.handler, node);
+	  }
+
+	  if (node.finalizer) {
+	    this.space();
+	    this.word("finally");
+	    this.space();
+	    this.print(node.finalizer, node);
+	  }
+	}
+
+	function CatchClause(node) {
+	  this.word("catch");
+	  this.space();
+	  this.token("(");
+	  this.print(node.param, node);
+	  this.token(")");
+	  this.space();
+	  this.print(node.body, node);
+	}
+
+	function SwitchStatement(node) {
+	  this.word("switch");
+	  this.space();
+	  this.token("(");
+	  this.print(node.discriminant, node);
+	  this.token(")");
+	  this.space();
+	  this.token("{");
+
+	  this.printSequence(node.cases, node, {
+	    indent: true,
+	    addNewlines: function addNewlines(leading, cas) {
+	      if (!leading && node.cases[node.cases.length - 1] === cas) return -1;
+	    }
+	  });
+
+	  this.token("}");
+	}
+
+	function SwitchCase(node) {
+	  if (node.test) {
+	    this.word("case");
+	    this.space();
+	    this.print(node.test, node);
+	    this.token(":");
+	  } else {
+	    this.word("default");
+	    this.token(":");
+	  }
+
+	  if (node.consequent.length) {
+	    this.newline();
+	    this.printSequence(node.consequent, node, { indent: true });
+	  }
+	}
+
+	function DebuggerStatement() {
+	  this.word("debugger");
+	  this.semicolon();
+	}
+
+	function variableDeclarationIdent() {
+	  this.token(",");
+	  this.newline();
+	  if (this.endsWith("\n")) for (var i = 0; i < 4; i++) {
+	    this.space(true);
+	  }
+	}
+
+	function constDeclarationIdent() {
+	  this.token(",");
+	  this.newline();
+	  if (this.endsWith("\n")) for (var i = 0; i < 6; i++) {
+	    this.space(true);
+	  }
+	}
+
+	function VariableDeclaration(node, parent) {
+	  this.word(node.kind);
+	  this.space();
+
+	  var hasInits = false;
+
+	  if (!t.isFor(parent)) {
+	    for (var _iterator = node.declarations, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var declar = _ref;
+
+	      if (declar.init) {
+	        hasInits = true;
+	      }
+	    }
+	  }
+
+	  var separator = void 0;
+	  if (hasInits) {
+	    separator = node.kind === "const" ? constDeclarationIdent : variableDeclarationIdent;
+	  }
+
+	  this.printList(node.declarations, node, { separator: separator });
+
+	  if (t.isFor(parent)) {
+	    if (parent.left === node || parent.init === node) return;
+	  }
+
+	  this.semicolon();
+	}
+
+	function VariableDeclarator(node) {
+	  this.print(node.id, node);
+	  this.print(node.id.typeAnnotation, node);
+	  if (node.init) {
+	    this.space();
+	    this.token("=");
+	    this.space();
+	    this.print(node.init, node);
+	  }
+	}
+
+/***/ }),
+/* 305 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.TaggedTemplateExpression = TaggedTemplateExpression;
+	exports.TemplateElement = TemplateElement;
+	exports.TemplateLiteral = TemplateLiteral;
+	function TaggedTemplateExpression(node) {
+	  this.print(node.tag, node);
+	  this.print(node.quasi, node);
+	}
+
+	function TemplateElement(node, parent) {
+	  var isFirst = parent.quasis[0] === node;
+	  var isLast = parent.quasis[parent.quasis.length - 1] === node;
+
+	  var value = (isFirst ? "`" : "}") + node.value.raw + (isLast ? "`" : "${");
+
+	  this.token(value);
+	}
+
+	function TemplateLiteral(node) {
+	  var quasis = node.quasis;
+
+	  for (var i = 0; i < quasis.length; i++) {
+	    this.print(quasis[i], node);
+
+	    if (i + 1 < quasis.length) {
+	      this.print(node.expressions[i], node);
+	    }
+	  }
+	}
+
+/***/ }),
+/* 306 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.AwaitExpression = exports.FunctionTypeAnnotation = undefined;
+	exports.NullableTypeAnnotation = NullableTypeAnnotation;
+	exports.UpdateExpression = UpdateExpression;
+	exports.ObjectExpression = ObjectExpression;
+	exports.DoExpression = DoExpression;
+	exports.Binary = Binary;
+	exports.BinaryExpression = BinaryExpression;
+	exports.SequenceExpression = SequenceExpression;
+	exports.YieldExpression = YieldExpression;
+	exports.ClassExpression = ClassExpression;
+	exports.UnaryLike = UnaryLike;
+	exports.FunctionExpression = FunctionExpression;
+	exports.ArrowFunctionExpression = ArrowFunctionExpression;
+	exports.ConditionalExpression = ConditionalExpression;
+	exports.AssignmentExpression = AssignmentExpression;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	var PRECEDENCE = {
+	  "||": 0,
+	  "&&": 1,
+	  "|": 2,
+	  "^": 3,
+	  "&": 4,
+	  "==": 5,
+	  "===": 5,
+	  "!=": 5,
+	  "!==": 5,
+	  "<": 6,
+	  ">": 6,
+	  "<=": 6,
+	  ">=": 6,
+	  in: 6,
+	  instanceof: 6,
+	  ">>": 7,
+	  "<<": 7,
+	  ">>>": 7,
+	  "+": 8,
+	  "-": 8,
+	  "*": 9,
+	  "/": 9,
+	  "%": 9,
+	  "**": 10
+	};
+
+	function NullableTypeAnnotation(node, parent) {
+	  return t.isArrayTypeAnnotation(parent);
+	}
+
+	exports.FunctionTypeAnnotation = NullableTypeAnnotation;
+	function UpdateExpression(node, parent) {
+	  return t.isMemberExpression(parent) && parent.object === node;
+	}
+
+	function ObjectExpression(node, parent, printStack) {
+	  return isFirstInStatement(printStack, { considerArrow: true });
+	}
+
+	function DoExpression(node, parent, printStack) {
+	  return isFirstInStatement(printStack);
+	}
+
+	function Binary(node, parent) {
+	  if ((t.isCallExpression(parent) || t.isNewExpression(parent)) && parent.callee === node || t.isUnaryLike(parent) || t.isMemberExpression(parent) && parent.object === node || t.isAwaitExpression(parent)) {
+	    return true;
+	  }
+
+	  if (t.isBinary(parent)) {
+	    var parentOp = parent.operator;
+	    var parentPos = PRECEDENCE[parentOp];
+
+	    var nodeOp = node.operator;
+	    var nodePos = PRECEDENCE[nodeOp];
+
+	    if (parentPos === nodePos && parent.right === node && !t.isLogicalExpression(parent) || parentPos > nodePos) {
+	      return true;
+	    }
+	  }
+
+	  return false;
+	}
+
+	function BinaryExpression(node, parent) {
+	  return node.operator === "in" && (t.isVariableDeclarator(parent) || t.isFor(parent));
+	}
+
+	function SequenceExpression(node, parent) {
+
+	  if (t.isForStatement(parent) || t.isThrowStatement(parent) || t.isReturnStatement(parent) || t.isIfStatement(parent) && parent.test === node || t.isWhileStatement(parent) && parent.test === node || t.isForInStatement(parent) && parent.right === node || t.isSwitchStatement(parent) && parent.discriminant === node || t.isExpressionStatement(parent) && parent.expression === node) {
+	    return false;
+	  }
+
+	  return true;
+	}
+
+	function YieldExpression(node, parent) {
+	  return t.isBinary(parent) || t.isUnaryLike(parent) || t.isCallExpression(parent) || t.isMemberExpression(parent) || t.isNewExpression(parent) || t.isConditionalExpression(parent) && node === parent.test;
+	}
+
+	exports.AwaitExpression = YieldExpression;
+	function ClassExpression(node, parent, printStack) {
+	  return isFirstInStatement(printStack, { considerDefaultExports: true });
+	}
+
+	function UnaryLike(node, parent) {
+	  return t.isMemberExpression(parent, { object: node }) || t.isCallExpression(parent, { callee: node }) || t.isNewExpression(parent, { callee: node });
+	}
+
+	function FunctionExpression(node, parent, printStack) {
+	  return isFirstInStatement(printStack, { considerDefaultExports: true });
+	}
+
+	function ArrowFunctionExpression(node, parent) {
+	  if (t.isExportDeclaration(parent) || t.isBinaryExpression(parent) || t.isLogicalExpression(parent) || t.isUnaryExpression(parent) || t.isTaggedTemplateExpression(parent)) {
+	    return true;
+	  }
+
+	  return UnaryLike(node, parent);
+	}
+
+	function ConditionalExpression(node, parent) {
+	  if (t.isUnaryLike(parent) || t.isBinary(parent) || t.isConditionalExpression(parent, { test: node }) || t.isAwaitExpression(parent)) {
+	    return true;
+	  }
+
+	  return UnaryLike(node, parent);
+	}
+
+	function AssignmentExpression(node) {
+	  if (t.isObjectPattern(node.left)) {
+	    return true;
+	  } else {
+	    return ConditionalExpression.apply(undefined, arguments);
+	  }
+	}
+
+	function isFirstInStatement(printStack) {
+	  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+	      _ref$considerArrow = _ref.considerArrow,
+	      considerArrow = _ref$considerArrow === undefined ? false : _ref$considerArrow,
+	      _ref$considerDefaultE = _ref.considerDefaultExports,
+	      considerDefaultExports = _ref$considerDefaultE === undefined ? false : _ref$considerDefaultE;
+
+	  var i = printStack.length - 1;
+	  var node = printStack[i];
+	  i--;
+	  var parent = printStack[i];
+	  while (i > 0) {
+	    if (t.isExpressionStatement(parent, { expression: node }) || t.isTaggedTemplateExpression(parent) || considerDefaultExports && t.isExportDefaultDeclaration(parent, { declaration: node }) || considerArrow && t.isArrowFunctionExpression(parent, { body: node })) {
+	      return true;
+	    }
+
+	    if (t.isCallExpression(parent, { callee: node }) || t.isSequenceExpression(parent) && parent.expressions[0] === node || t.isMemberExpression(parent, { object: node }) || t.isConditional(parent, { test: node }) || t.isBinary(parent, { left: node }) || t.isAssignmentExpression(parent, { left: node })) {
+	      node = parent;
+	      i--;
+	      parent = printStack[i];
+	    } else {
+	      return false;
+	    }
+	  }
+
+	  return false;
+	}
+
+/***/ }),
+/* 307 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _map = __webpack_require__(579);
+
+	var _map2 = _interopRequireDefault(_map);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function crawl(node) {
+	  var state = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+	  if (t.isMemberExpression(node)) {
+	    crawl(node.object, state);
+	    if (node.computed) crawl(node.property, state);
+	  } else if (t.isBinary(node) || t.isAssignmentExpression(node)) {
+	    crawl(node.left, state);
+	    crawl(node.right, state);
+	  } else if (t.isCallExpression(node)) {
+	    state.hasCall = true;
+	    crawl(node.callee, state);
+	  } else if (t.isFunction(node)) {
+	    state.hasFunction = true;
+	  } else if (t.isIdentifier(node)) {
+	    state.hasHelper = state.hasHelper || isHelper(node.callee);
+	  }
+
+	  return state;
+	}
+
+	function isHelper(node) {
+	  if (t.isMemberExpression(node)) {
+	    return isHelper(node.object) || isHelper(node.property);
+	  } else if (t.isIdentifier(node)) {
+	    return node.name === "require" || node.name[0] === "_";
+	  } else if (t.isCallExpression(node)) {
+	    return isHelper(node.callee);
+	  } else if (t.isBinary(node) || t.isAssignmentExpression(node)) {
+	    return t.isIdentifier(node.left) && isHelper(node.left) || isHelper(node.right);
+	  } else {
+	    return false;
+	  }
+	}
+
+	function isType(node) {
+	  return t.isLiteral(node) || t.isObjectExpression(node) || t.isArrayExpression(node) || t.isIdentifier(node) || t.isMemberExpression(node);
+	}
+
+	exports.nodes = {
+	  AssignmentExpression: function AssignmentExpression(node) {
+	    var state = crawl(node.right);
+	    if (state.hasCall && state.hasHelper || state.hasFunction) {
+	      return {
+	        before: state.hasFunction,
+	        after: true
+	      };
+	    }
+	  },
+	  SwitchCase: function SwitchCase(node, parent) {
+	    return {
+	      before: node.consequent.length || parent.cases[0] === node
+	    };
+	  },
+	  LogicalExpression: function LogicalExpression(node) {
+	    if (t.isFunction(node.left) || t.isFunction(node.right)) {
+	      return {
+	        after: true
+	      };
+	    }
+	  },
+	  Literal: function Literal(node) {
+	    if (node.value === "use strict") {
+	      return {
+	        after: true
+	      };
+	    }
+	  },
+	  CallExpression: function CallExpression(node) {
+	    if (t.isFunction(node.callee) || isHelper(node)) {
+	      return {
+	        before: true,
+	        after: true
+	      };
+	    }
+	  },
+	  VariableDeclaration: function VariableDeclaration(node) {
+	    for (var i = 0; i < node.declarations.length; i++) {
+	      var declar = node.declarations[i];
+
+	      var enabled = isHelper(declar.id) && !isType(declar.init);
+	      if (!enabled) {
+	        var state = crawl(declar.init);
+	        enabled = isHelper(declar.init) && state.hasCall || state.hasFunction;
+	      }
+
+	      if (enabled) {
+	        return {
+	          before: true,
+	          after: true
+	        };
+	      }
+	    }
+	  },
+	  IfStatement: function IfStatement(node) {
+	    if (t.isBlockStatement(node.consequent)) {
+	      return {
+	        before: true,
+	        after: true
+	      };
+	    }
+	  }
+	};
+
+	exports.nodes.ObjectProperty = exports.nodes.ObjectTypeProperty = exports.nodes.ObjectMethod = exports.nodes.SpreadProperty = function (node, parent) {
+	  if (parent.properties[0] === node) {
+	    return {
+	      before: true
+	    };
+	  }
+	};
+
+	exports.list = {
+	  VariableDeclaration: function VariableDeclaration(node) {
+	    return (0, _map2.default)(node.declarations, "init");
+	  },
+	  ArrayExpression: function ArrayExpression(node) {
+	    return node.elements;
+	  },
+	  ObjectExpression: function ObjectExpression(node) {
+	    return node.properties;
+	  }
+	};
+
+	[["Function", true], ["Class", true], ["Loop", true], ["LabeledStatement", true], ["SwitchStatement", true], ["TryStatement", true]].forEach(function (_ref) {
+	  var type = _ref[0],
+	      amounts = _ref[1];
+
+	  if (typeof amounts === "boolean") {
+	    amounts = { after: amounts, before: amounts };
+	  }
+	  [type].concat(t.FLIPPED_ALIAS_KEYS[type] || []).forEach(function (type) {
+	    exports.nodes[type] = function () {
+	      return amounts;
+	    };
+	  });
+	});
+
+/***/ }),
+/* 308 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _assign = __webpack_require__(85);
+
+	var _assign2 = _interopRequireDefault(_assign);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _stringify = __webpack_require__(34);
+
+	var _stringify2 = _interopRequireDefault(_stringify);
+
+	var _weakSet = __webpack_require__(361);
+
+	var _weakSet2 = _interopRequireDefault(_weakSet);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _find = __webpack_require__(570);
+
+	var _find2 = _interopRequireDefault(_find);
+
+	var _findLast = __webpack_require__(572);
+
+	var _findLast2 = _interopRequireDefault(_findLast);
+
+	var _isInteger = __webpack_require__(577);
+
+	var _isInteger2 = _interopRequireDefault(_isInteger);
+
+	var _repeat = __webpack_require__(273);
+
+	var _repeat2 = _interopRequireDefault(_repeat);
+
+	var _buffer = __webpack_require__(296);
+
+	var _buffer2 = _interopRequireDefault(_buffer);
+
+	var _node = __webpack_require__(183);
+
+	var n = _interopRequireWildcard(_node);
+
+	var _whitespace = __webpack_require__(310);
+
+	var _whitespace2 = _interopRequireDefault(_whitespace);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var SCIENTIFIC_NOTATION = /e/i;
+	var ZERO_DECIMAL_INTEGER = /\.0+$/;
+	var NON_DECIMAL_LITERAL = /^0[box]/;
+
+	var Printer = function () {
+	  function Printer(format, map, tokens) {
+	    (0, _classCallCheck3.default)(this, Printer);
+	    this.inForStatementInitCounter = 0;
+	    this._printStack = [];
+	    this._indent = 0;
+	    this._insideAux = false;
+	    this._printedCommentStarts = {};
+	    this._parenPushNewlineState = null;
+	    this._printAuxAfterOnNextUserNode = false;
+	    this._printedComments = new _weakSet2.default();
+	    this._endsWithInteger = false;
+	    this._endsWithWord = false;
+
+	    this.format = format || {};
+	    this._buf = new _buffer2.default(map);
+	    this._whitespace = tokens.length > 0 ? new _whitespace2.default(tokens) : null;
+	  }
+
+	  Printer.prototype.generate = function generate(ast) {
+	    this.print(ast);
+	    this._maybeAddAuxComment();
+
+	    return this._buf.get();
+	  };
+
+	  Printer.prototype.indent = function indent() {
+	    if (this.format.compact || this.format.concise) return;
+
+	    this._indent++;
+	  };
+
+	  Printer.prototype.dedent = function dedent() {
+	    if (this.format.compact || this.format.concise) return;
+
+	    this._indent--;
+	  };
+
+	  Printer.prototype.semicolon = function semicolon() {
+	    var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
+	    this._maybeAddAuxComment();
+	    this._append(";", !force);
+	  };
+
+	  Printer.prototype.rightBrace = function rightBrace() {
+	    if (this.format.minified) {
+	      this._buf.removeLastSemicolon();
+	    }
+	    this.token("}");
+	  };
+
+	  Printer.prototype.space = function space() {
+	    var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
+	    if (this.format.compact) return;
+
+	    if (this._buf.hasContent() && !this.endsWith(" ") && !this.endsWith("\n") || force) {
+	      this._space();
+	    }
+	  };
+
+	  Printer.prototype.word = function word(str) {
+	    if (this._endsWithWord) this._space();
+
+	    this._maybeAddAuxComment();
+	    this._append(str);
+
+	    this._endsWithWord = true;
+	  };
+
+	  Printer.prototype.number = function number(str) {
+	    this.word(str);
+
+	    this._endsWithInteger = (0, _isInteger2.default)(+str) && !NON_DECIMAL_LITERAL.test(str) && !SCIENTIFIC_NOTATION.test(str) && !ZERO_DECIMAL_INTEGER.test(str) && str[str.length - 1] !== ".";
+	  };
+
+	  Printer.prototype.token = function token(str) {
+	    if (str === "--" && this.endsWith("!") || str[0] === "+" && this.endsWith("+") || str[0] === "-" && this.endsWith("-") || str[0] === "." && this._endsWithInteger) {
+	      this._space();
+	    }
+
+	    this._maybeAddAuxComment();
+	    this._append(str);
+	  };
+
+	  Printer.prototype.newline = function newline(i) {
+	    if (this.format.retainLines || this.format.compact) return;
+
+	    if (this.format.concise) {
+	      this.space();
+	      return;
+	    }
+
+	    if (this.endsWith("\n\n")) return;
+
+	    if (typeof i !== "number") i = 1;
+
+	    i = Math.min(2, i);
+	    if (this.endsWith("{\n") || this.endsWith(":\n")) i--;
+	    if (i <= 0) return;
+
+	    for (var j = 0; j < i; j++) {
+	      this._newline();
+	    }
+	  };
+
+	  Printer.prototype.endsWith = function endsWith(str) {
+	    return this._buf.endsWith(str);
+	  };
+
+	  Printer.prototype.removeTrailingNewline = function removeTrailingNewline() {
+	    this._buf.removeTrailingNewline();
+	  };
+
+	  Printer.prototype.source = function source(prop, loc) {
+	    this._catchUp(prop, loc);
+
+	    this._buf.source(prop, loc);
+	  };
+
+	  Printer.prototype.withSource = function withSource(prop, loc, cb) {
+	    this._catchUp(prop, loc);
+
+	    this._buf.withSource(prop, loc, cb);
+	  };
+
+	  Printer.prototype._space = function _space() {
+	    this._append(" ", true);
+	  };
+
+	  Printer.prototype._newline = function _newline() {
+	    this._append("\n", true);
+	  };
+
+	  Printer.prototype._append = function _append(str) {
+	    var queue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+	    this._maybeAddParen(str);
+	    this._maybeIndent(str);
+
+	    if (queue) this._buf.queue(str);else this._buf.append(str);
+
+	    this._endsWithWord = false;
+	    this._endsWithInteger = false;
+	  };
+
+	  Printer.prototype._maybeIndent = function _maybeIndent(str) {
+	    if (this._indent && this.endsWith("\n") && str[0] !== "\n") {
+	      this._buf.queue(this._getIndent());
+	    }
+	  };
+
+	  Printer.prototype._maybeAddParen = function _maybeAddParen(str) {
+	    var parenPushNewlineState = this._parenPushNewlineState;
+	    if (!parenPushNewlineState) return;
+	    this._parenPushNewlineState = null;
+
+	    var i = void 0;
+	    for (i = 0; i < str.length && str[i] === " "; i++) {
+	      continue;
+	    }if (i === str.length) return;
+
+	    var cha = str[i];
+	    if (cha === "\n" || cha === "/") {
+	      this.token("(");
+	      this.indent();
+	      parenPushNewlineState.printed = true;
+	    }
+	  };
+
+	  Printer.prototype._catchUp = function _catchUp(prop, loc) {
+	    if (!this.format.retainLines) return;
+
+	    var pos = loc ? loc[prop] : null;
+	    if (pos && pos.line !== null) {
+	      var count = pos.line - this._buf.getCurrentLine();
+
+	      for (var i = 0; i < count; i++) {
+	        this._newline();
+	      }
+	    }
+	  };
+
+	  Printer.prototype._getIndent = function _getIndent() {
+	    return (0, _repeat2.default)(this.format.indent.style, this._indent);
+	  };
+
+	  Printer.prototype.startTerminatorless = function startTerminatorless() {
+	    return this._parenPushNewlineState = {
+	      printed: false
+	    };
+	  };
+
+	  Printer.prototype.endTerminatorless = function endTerminatorless(state) {
+	    if (state.printed) {
+	      this.dedent();
+	      this.newline();
+	      this.token(")");
+	    }
+	  };
+
+	  Printer.prototype.print = function print(node, parent) {
+	    var _this = this;
+
+	    if (!node) return;
+
+	    var oldConcise = this.format.concise;
+	    if (node._compact) {
+	      this.format.concise = true;
+	    }
+
+	    var printMethod = this[node.type];
+	    if (!printMethod) {
+	      throw new ReferenceError("unknown node of type " + (0, _stringify2.default)(node.type) + " with constructor " + (0, _stringify2.default)(node && node.constructor.name));
+	    }
+
+	    this._printStack.push(node);
+
+	    var oldInAux = this._insideAux;
+	    this._insideAux = !node.loc;
+	    this._maybeAddAuxComment(this._insideAux && !oldInAux);
+
+	    var needsParens = n.needsParens(node, parent, this._printStack);
+	    if (this.format.retainFunctionParens && node.type === "FunctionExpression" && node.extra && node.extra.parenthesized) {
+	      needsParens = true;
+	    }
+	    if (needsParens) this.token("(");
+
+	    this._printLeadingComments(node, parent);
+
+	    var loc = t.isProgram(node) || t.isFile(node) ? null : node.loc;
+	    this.withSource("start", loc, function () {
+	      _this[node.type](node, parent);
+	    });
+
+	    this._printTrailingComments(node, parent);
+
+	    if (needsParens) this.token(")");
+
+	    this._printStack.pop();
+
+	    this.format.concise = oldConcise;
+	    this._insideAux = oldInAux;
+	  };
+
+	  Printer.prototype._maybeAddAuxComment = function _maybeAddAuxComment(enteredPositionlessNode) {
+	    if (enteredPositionlessNode) this._printAuxBeforeComment();
+	    if (!this._insideAux) this._printAuxAfterComment();
+	  };
+
+	  Printer.prototype._printAuxBeforeComment = function _printAuxBeforeComment() {
+	    if (this._printAuxAfterOnNextUserNode) return;
+	    this._printAuxAfterOnNextUserNode = true;
+
+	    var comment = this.format.auxiliaryCommentBefore;
+	    if (comment) {
+	      this._printComment({
+	        type: "CommentBlock",
+	        value: comment
+	      });
+	    }
+	  };
+
+	  Printer.prototype._printAuxAfterComment = function _printAuxAfterComment() {
+	    if (!this._printAuxAfterOnNextUserNode) return;
+	    this._printAuxAfterOnNextUserNode = false;
+
+	    var comment = this.format.auxiliaryCommentAfter;
+	    if (comment) {
+	      this._printComment({
+	        type: "CommentBlock",
+	        value: comment
+	      });
+	    }
+	  };
+
+	  Printer.prototype.getPossibleRaw = function getPossibleRaw(node) {
+	    var extra = node.extra;
+	    if (extra && extra.raw != null && extra.rawValue != null && node.value === extra.rawValue) {
+	      return extra.raw;
+	    }
+	  };
+
+	  Printer.prototype.printJoin = function printJoin(nodes, parent) {
+	    var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+	    if (!nodes || !nodes.length) return;
+
+	    if (opts.indent) this.indent();
+
+	    var newlineOpts = {
+	      addNewlines: opts.addNewlines
+	    };
+
+	    for (var i = 0; i < nodes.length; i++) {
+	      var node = nodes[i];
+	      if (!node) continue;
+
+	      if (opts.statement) this._printNewline(true, node, parent, newlineOpts);
+
+	      this.print(node, parent);
+
+	      if (opts.iterator) {
+	        opts.iterator(node, i);
+	      }
+
+	      if (opts.separator && i < nodes.length - 1) {
+	        opts.separator.call(this);
+	      }
+
+	      if (opts.statement) this._printNewline(false, node, parent, newlineOpts);
+	    }
+
+	    if (opts.indent) this.dedent();
+	  };
+
+	  Printer.prototype.printAndIndentOnComments = function printAndIndentOnComments(node, parent) {
+	    var indent = !!node.leadingComments;
+	    if (indent) this.indent();
+	    this.print(node, parent);
+	    if (indent) this.dedent();
+	  };
+
+	  Printer.prototype.printBlock = function printBlock(parent) {
+	    var node = parent.body;
+
+	    if (!t.isEmptyStatement(node)) {
+	      this.space();
+	    }
+
+	    this.print(node, parent);
+	  };
+
+	  Printer.prototype._printTrailingComments = function _printTrailingComments(node, parent) {
+	    this._printComments(this._getComments(false, node, parent));
+	  };
+
+	  Printer.prototype._printLeadingComments = function _printLeadingComments(node, parent) {
+	    this._printComments(this._getComments(true, node, parent));
+	  };
+
+	  Printer.prototype.printInnerComments = function printInnerComments(node) {
+	    var indent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+
+	    if (!node.innerComments) return;
+	    if (indent) this.indent();
+	    this._printComments(node.innerComments);
+	    if (indent) this.dedent();
+	  };
+
+	  Printer.prototype.printSequence = function printSequence(nodes, parent) {
+	    var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+	    opts.statement = true;
+	    return this.printJoin(nodes, parent, opts);
+	  };
+
+	  Printer.prototype.printList = function printList(items, parent) {
+	    var opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+
+	    if (opts.separator == null) {
+	      opts.separator = commaSeparator;
+	    }
+
+	    return this.printJoin(items, parent, opts);
+	  };
+
+	  Printer.prototype._printNewline = function _printNewline(leading, node, parent, opts) {
+	    var _this2 = this;
+
+	    if (this.format.retainLines || this.format.compact) return;
+
+	    if (this.format.concise) {
+	      this.space();
+	      return;
+	    }
+
+	    var lines = 0;
+
+	    if (node.start != null && !node._ignoreUserWhitespace && this._whitespace) {
+	      if (leading) {
+	        var _comments = node.leadingComments;
+	        var _comment = _comments && (0, _find2.default)(_comments, function (comment) {
+	          return !!comment.loc && _this2.format.shouldPrintComment(comment.value);
+	        });
+
+	        lines = this._whitespace.getNewlinesBefore(_comment || node);
+	      } else {
+	        var _comments2 = node.trailingComments;
+	        var _comment2 = _comments2 && (0, _findLast2.default)(_comments2, function (comment) {
+	          return !!comment.loc && _this2.format.shouldPrintComment(comment.value);
+	        });
+
+	        lines = this._whitespace.getNewlinesAfter(_comment2 || node);
+	      }
+	    } else {
+	      if (!leading) lines++;
+	      if (opts.addNewlines) lines += opts.addNewlines(leading, node) || 0;
+
+	      var needs = n.needsWhitespaceAfter;
+	      if (leading) needs = n.needsWhitespaceBefore;
+	      if (needs(node, parent)) lines++;
+
+	      if (!this._buf.hasContent()) lines = 0;
+	    }
+
+	    this.newline(lines);
+	  };
+
+	  Printer.prototype._getComments = function _getComments(leading, node) {
+	    return node && (leading ? node.leadingComments : node.trailingComments) || [];
+	  };
+
+	  Printer.prototype._printComment = function _printComment(comment) {
+	    var _this3 = this;
+
+	    if (!this.format.shouldPrintComment(comment.value)) return;
+
+	    if (comment.ignore) return;
+
+	    if (this._printedComments.has(comment)) return;
+	    this._printedComments.add(comment);
+
+	    if (comment.start != null) {
+	      if (this._printedCommentStarts[comment.start]) return;
+	      this._printedCommentStarts[comment.start] = true;
+	    }
+
+	    this.newline(this._whitespace ? this._whitespace.getNewlinesBefore(comment) : 0);
+
+	    if (!this.endsWith("[") && !this.endsWith("{")) this.space();
+
+	    var val = comment.type === "CommentLine" ? "//" + comment.value + "\n" : "/*" + comment.value + "*/";
+
+	    if (comment.type === "CommentBlock" && this.format.indent.adjustMultilineComment) {
+	      var offset = comment.loc && comment.loc.start.column;
+	      if (offset) {
+	        var newlineRegex = new RegExp("\\n\\s{1," + offset + "}", "g");
+	        val = val.replace(newlineRegex, "\n");
+	      }
+
+	      var indentSize = Math.max(this._getIndent().length, this._buf.getCurrentColumn());
+	      val = val.replace(/\n(?!$)/g, "\n" + (0, _repeat2.default)(" ", indentSize));
+	    }
+
+	    this.withSource("start", comment.loc, function () {
+	      _this3._append(val);
+	    });
+
+	    this.newline((this._whitespace ? this._whitespace.getNewlinesAfter(comment) : 0) + (comment.type === "CommentLine" ? -1 : 0));
+	  };
+
+	  Printer.prototype._printComments = function _printComments(comments) {
+	    if (!comments || !comments.length) return;
+
+	    for (var _iterator = comments, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var _comment3 = _ref;
+
+	      this._printComment(_comment3);
+	    }
+	  };
+
+	  return Printer;
+	}();
+
+	exports.default = Printer;
+
+	function commaSeparator() {
+	  this.token(",");
+	  this.space();
+	}
+
+	var _arr = [__webpack_require__(305), __webpack_require__(299), __webpack_require__(304), __webpack_require__(298), __webpack_require__(302), __webpack_require__(303), __webpack_require__(122), __webpack_require__(300), __webpack_require__(297), __webpack_require__(301)];
+	for (var _i2 = 0; _i2 < _arr.length; _i2++) {
+	  var generator = _arr[_i2];
+	  (0, _assign2.default)(Printer.prototype, generator);
+	}
+	module.exports = exports["default"];
+
+/***/ }),
+/* 309 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _keys = __webpack_require__(13);
+
+	var _keys2 = _interopRequireDefault(_keys);
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _sourceMap = __webpack_require__(284);
+
+	var _sourceMap2 = _interopRequireDefault(_sourceMap);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var SourceMap = function () {
+	  function SourceMap(opts, code) {
+	    (0, _classCallCheck3.default)(this, SourceMap);
+
+	    this._cachedMap = null;
+	    this._code = code;
+	    this._opts = opts;
+	    this._rawMappings = [];
+	  }
+
+	  SourceMap.prototype.get = function get() {
+	    if (!this._cachedMap) {
+	      var map = this._cachedMap = new _sourceMap2.default.SourceMapGenerator({
+	        file: this._opts.sourceMapTarget,
+	        sourceRoot: this._opts.sourceRoot
+	      });
+
+	      var code = this._code;
+	      if (typeof code === "string") {
+	        map.setSourceContent(this._opts.sourceFileName, code);
+	      } else if ((typeof code === "undefined" ? "undefined" : (0, _typeof3.default)(code)) === "object") {
+	        (0, _keys2.default)(code).forEach(function (sourceFileName) {
+	          map.setSourceContent(sourceFileName, code[sourceFileName]);
+	        });
+	      }
+
+	      this._rawMappings.forEach(map.addMapping, map);
+	    }
+
+	    return this._cachedMap.toJSON();
+	  };
+
+	  SourceMap.prototype.getRawMappings = function getRawMappings() {
+	    return this._rawMappings.slice();
+	  };
+
+	  SourceMap.prototype.mark = function mark(generatedLine, generatedColumn, line, column, identifierName, filename) {
+	    if (this._lastGenLine !== generatedLine && line === null) return;
+
+	    if (this._lastGenLine === generatedLine && this._lastSourceLine === line && this._lastSourceColumn === column) {
+	      return;
+	    }
+
+	    this._cachedMap = null;
+	    this._lastGenLine = generatedLine;
+	    this._lastSourceLine = line;
+	    this._lastSourceColumn = column;
+
+	    this._rawMappings.push({
+	      name: identifierName || undefined,
+	      generated: {
+	        line: generatedLine,
+	        column: generatedColumn
+	      },
+	      source: line == null ? undefined : filename || this._opts.sourceFileName,
+	      original: line == null ? undefined : {
+	        line: line,
+	        column: column
+	      }
+	    });
+	  };
+
+	  return SourceMap;
+	}();
+
+	exports.default = SourceMap;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 310 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var Whitespace = function () {
+	  function Whitespace(tokens) {
+	    (0, _classCallCheck3.default)(this, Whitespace);
+
+	    this.tokens = tokens;
+	    this.used = {};
+	  }
+
+	  Whitespace.prototype.getNewlinesBefore = function getNewlinesBefore(node) {
+	    var startToken = void 0;
+	    var endToken = void 0;
+	    var tokens = this.tokens;
+
+	    var index = this._findToken(function (token) {
+	      return token.start - node.start;
+	    }, 0, tokens.length);
+	    if (index >= 0) {
+	      while (index && node.start === tokens[index - 1].start) {
+	        --index;
+	      }startToken = tokens[index - 1];
+	      endToken = tokens[index];
+	    }
+
+	    return this._getNewlinesBetween(startToken, endToken);
+	  };
+
+	  Whitespace.prototype.getNewlinesAfter = function getNewlinesAfter(node) {
+	    var startToken = void 0;
+	    var endToken = void 0;
+	    var tokens = this.tokens;
+
+	    var index = this._findToken(function (token) {
+	      return token.end - node.end;
+	    }, 0, tokens.length);
+	    if (index >= 0) {
+	      while (index && node.end === tokens[index - 1].end) {
+	        --index;
+	      }startToken = tokens[index];
+	      endToken = tokens[index + 1];
+	      if (endToken.type.label === ",") endToken = tokens[index + 2];
+	    }
+
+	    if (endToken && endToken.type.label === "eof") {
+	      return 1;
+	    } else {
+	      return this._getNewlinesBetween(startToken, endToken);
+	    }
+	  };
+
+	  Whitespace.prototype._getNewlinesBetween = function _getNewlinesBetween(startToken, endToken) {
+	    if (!endToken || !endToken.loc) return 0;
+
+	    var start = startToken ? startToken.loc.end.line : 1;
+	    var end = endToken.loc.start.line;
+	    var lines = 0;
+
+	    for (var line = start; line < end; line++) {
+	      if (typeof this.used[line] === "undefined") {
+	        this.used[line] = true;
+	        lines++;
+	      }
+	    }
+
+	    return lines;
+	  };
+
+	  Whitespace.prototype._findToken = function _findToken(test, start, end) {
+	    if (start >= end) return -1;
+	    var middle = start + end >>> 1;
+	    var match = test(this.tokens[middle]);
+	    if (match < 0) {
+	      return this._findToken(test, middle + 1, end);
+	    } else if (match > 0) {
+	      return this._findToken(test, start, middle);
+	    } else if (match === 0) {
+	      return middle;
+	    }
+	    return -1;
+	  };
+
+	  return Whitespace;
+	}();
+
+	exports.default = Whitespace;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 311 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = bindifyDecorators;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function bindifyDecorators(decorators) {
+	  for (var _iterator = decorators, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var decoratorPath = _ref;
+
+	    var decorator = decoratorPath.node;
+	    var expression = decorator.expression;
+	    if (!t.isMemberExpression(expression)) continue;
+
+	    var temp = decoratorPath.scope.maybeGenerateMemoised(expression.object);
+	    var ref = void 0;
+
+	    var nodes = [];
+
+	    if (temp) {
+	      ref = temp;
+	      nodes.push(t.assignmentExpression("=", temp, expression.object));
+	    } else {
+	      ref = expression.object;
+	    }
+
+	    nodes.push(t.callExpression(t.memberExpression(t.memberExpression(ref, expression.property, expression.computed), t.identifier("bind")), [ref]));
+
+	    if (nodes.length === 1) {
+	      decorator.expression = nodes[0];
+	    } else {
+	      decorator.expression = t.sequenceExpression(nodes);
+	    }
+	  }
+	}
+	module.exports = exports["default"];
+
+/***/ }),
+/* 312 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (opts) {
+	  var visitor = {};
+
+	  function isAssignment(node) {
+	    return node && node.operator === opts.operator + "=";
+	  }
+
+	  function buildAssignment(left, right) {
+	    return t.assignmentExpression("=", left, right);
+	  }
+
+	  visitor.ExpressionStatement = function (path, file) {
+	    if (path.isCompletionRecord()) return;
+
+	    var expr = path.node.expression;
+	    if (!isAssignment(expr)) return;
+
+	    var nodes = [];
+	    var exploded = (0, _babelHelperExplodeAssignableExpression2.default)(expr.left, nodes, file, path.scope, true);
+
+	    nodes.push(t.expressionStatement(buildAssignment(exploded.ref, opts.build(exploded.uid, expr.right))));
+
+	    path.replaceWithMultiple(nodes);
+	  };
+
+	  visitor.AssignmentExpression = function (path, file) {
+	    var node = path.node,
+	        scope = path.scope;
+
+	    if (!isAssignment(node)) return;
+
+	    var nodes = [];
+	    var exploded = (0, _babelHelperExplodeAssignableExpression2.default)(node.left, nodes, file, scope);
+	    nodes.push(buildAssignment(exploded.ref, opts.build(exploded.uid, node.right)));
+	    path.replaceWithMultiple(nodes);
+	  };
+
+	  visitor.BinaryExpression = function (path) {
+	    var node = path.node;
+
+	    if (node.operator === opts.operator) {
+	      path.replaceWith(opts.build(node.left, node.right));
+	    }
+	  };
+
+	  return visitor;
+	};
+
+	var _babelHelperExplodeAssignableExpression = __webpack_require__(314);
+
+	var _babelHelperExplodeAssignableExpression2 = _interopRequireDefault(_babelHelperExplodeAssignableExpression);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 313 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (path) {
+	  var scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : path.scope;
+	  var node = path.node;
+
+	  var container = t.functionExpression(null, [], node.body, node.generator, node.async);
+
+	  var callee = container;
+	  var args = [];
+
+	  (0, _babelHelperHoistVariables2.default)(path, function (id) {
+	    return scope.push({ id: id });
+	  });
+
+	  var state = {
+	    foundThis: false,
+	    foundArguments: false
+	  };
+
+	  path.traverse(visitor, state);
+
+	  if (state.foundArguments) {
+	    callee = t.memberExpression(container, t.identifier("apply"));
+	    args = [];
+
+	    if (state.foundThis) {
+	      args.push(t.thisExpression());
+	    }
+
+	    if (state.foundArguments) {
+	      if (!state.foundThis) args.push(t.nullLiteral());
+	      args.push(t.identifier("arguments"));
+	    }
+	  }
+
+	  var call = t.callExpression(callee, args);
+	  if (node.generator) call = t.yieldExpression(call, true);
+
+	  return t.returnStatement(call);
+	};
+
+	var _babelHelperHoistVariables = __webpack_require__(186);
+
+	var _babelHelperHoistVariables2 = _interopRequireDefault(_babelHelperHoistVariables);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var visitor = {
+	  enter: function enter(path, state) {
+	    if (path.isThisExpression()) {
+	      state.foundThis = true;
+	    }
+
+	    if (path.isReferencedIdentifier({ name: "arguments" })) {
+	      state.foundArguments = true;
+	    }
+	  },
+	  Function: function Function(path) {
+	    path.skip();
+	  }
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 314 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (node, nodes, file, scope, allowedSingleIdent) {
+	  var obj = void 0;
+	  if (t.isIdentifier(node) && allowedSingleIdent) {
+	    obj = node;
+	  } else {
+	    obj = getObjRef(node, nodes, file, scope);
+	  }
+
+	  var ref = void 0,
+	      uid = void 0;
+
+	  if (t.isIdentifier(node)) {
+	    ref = node;
+	    uid = obj;
+	  } else {
+	    var prop = getPropRef(node, nodes, file, scope);
+	    var computed = node.computed || t.isLiteral(prop);
+	    uid = ref = t.memberExpression(obj, prop, computed);
+	  }
+
+	  return {
+	    uid: uid,
+	    ref: ref
+	  };
+	};
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function getObjRef(node, nodes, file, scope) {
+	  var ref = void 0;
+	  if (t.isSuper(node)) {
+	    return node;
+	  } else if (t.isIdentifier(node)) {
+	    if (scope.hasBinding(node.name)) {
+	      return node;
+	    } else {
+	      ref = node;
+	    }
+	  } else if (t.isMemberExpression(node)) {
+	    ref = node.object;
+
+	    if (t.isSuper(ref) || t.isIdentifier(ref) && scope.hasBinding(ref.name)) {
+	      return ref;
+	    }
+	  } else {
+	    throw new Error("We can't explode this node type " + node.type);
+	  }
+
+	  var temp = scope.generateUidIdentifierBasedOnNode(ref);
+	  nodes.push(t.variableDeclaration("var", [t.variableDeclarator(temp, ref)]));
+	  return temp;
+	}
+
+	function getPropRef(node, nodes, file, scope) {
+	  var prop = node.property;
+	  var key = t.toComputedKey(node, prop);
+	  if (t.isLiteral(key) && t.isPureish(key)) return key;
+
+	  var temp = scope.generateUidIdentifierBasedOnNode(prop);
+	  nodes.push(t.variableDeclaration("var", [t.variableDeclarator(temp, prop)]));
+	  return temp;
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 315 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (classPath) {
+	  classPath.assertClass();
+
+	  var memoisedExpressions = [];
+
+	  function maybeMemoise(path) {
+	    if (!path.node || path.isPure()) return;
+
+	    var uid = classPath.scope.generateDeclaredUidIdentifier();
+	    memoisedExpressions.push(t.assignmentExpression("=", uid, path.node));
+	    path.replaceWith(uid);
+	  }
+
+	  function memoiseDecorators(paths) {
+	    if (!Array.isArray(paths) || !paths.length) return;
+
+	    paths = paths.reverse();
+
+	    (0, _babelHelperBindifyDecorators2.default)(paths);
+
+	    for (var _iterator = paths, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var path = _ref;
+
+	      maybeMemoise(path);
+	    }
+	  }
+
+	  maybeMemoise(classPath.get("superClass"));
+	  memoiseDecorators(classPath.get("decorators"), true);
+
+	  var methods = classPath.get("body.body");
+	  for (var _iterator2 = methods, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	    var _ref2;
+
+	    if (_isArray2) {
+	      if (_i2 >= _iterator2.length) break;
+	      _ref2 = _iterator2[_i2++];
+	    } else {
+	      _i2 = _iterator2.next();
+	      if (_i2.done) break;
+	      _ref2 = _i2.value;
+	    }
+
+	    var methodPath = _ref2;
+
+	    if (methodPath.is("computed")) {
+	      maybeMemoise(methodPath.get("key"));
+	    }
+
+	    if (methodPath.has("decorators")) {
+	      memoiseDecorators(classPath.get("decorators"));
+	    }
+	  }
+
+	  if (memoisedExpressions) {
+	    classPath.insertBefore(memoisedExpressions.map(function (expr) {
+	      return t.expressionStatement(expr);
+	    }));
+	  }
+	};
+
+	var _babelHelperBindifyDecorators = __webpack_require__(311);
+
+	var _babelHelperBindifyDecorators2 = _interopRequireDefault(_babelHelperBindifyDecorators);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 316 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (path, helpers) {
+	  var node = path.node,
+	      scope = path.scope,
+	      parent = path.parent;
+
+	  var stepKey = scope.generateUidIdentifier("step");
+	  var stepValue = scope.generateUidIdentifier("value");
+	  var left = node.left;
+	  var declar = void 0;
+
+	  if (t.isIdentifier(left) || t.isPattern(left) || t.isMemberExpression(left)) {
+	    declar = t.expressionStatement(t.assignmentExpression("=", left, stepValue));
+	  } else if (t.isVariableDeclaration(left)) {
+	    declar = t.variableDeclaration(left.kind, [t.variableDeclarator(left.declarations[0].id, stepValue)]);
+	  }
+
+	  var template = buildForAwait();
+
+	  (0, _babelTraverse2.default)(template, forAwaitVisitor, null, {
+	    ITERATOR_HAD_ERROR_KEY: scope.generateUidIdentifier("didIteratorError"),
+	    ITERATOR_COMPLETION: scope.generateUidIdentifier("iteratorNormalCompletion"),
+	    ITERATOR_ERROR_KEY: scope.generateUidIdentifier("iteratorError"),
+	    ITERATOR_KEY: scope.generateUidIdentifier("iterator"),
+	    GET_ITERATOR: helpers.getAsyncIterator,
+	    OBJECT: node.right,
+	    STEP_VALUE: stepValue,
+	    STEP_KEY: stepKey,
+	    AWAIT: helpers.wrapAwait
+	  });
+
+	  template = template.body.body;
+
+	  var isLabeledParent = t.isLabeledStatement(parent);
+	  var tryBody = template[3].block.body;
+	  var loop = tryBody[0];
+
+	  if (isLabeledParent) {
+	    tryBody[0] = t.labeledStatement(parent.label, loop);
+	  }
+
+	  return {
+	    replaceParent: isLabeledParent,
+	    node: template,
+	    declar: declar,
+	    loop: loop
+	  };
+	};
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	var _babelTraverse = __webpack_require__(7);
+
+	var _babelTraverse2 = _interopRequireDefault(_babelTraverse);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	var buildForAwait = (0, _babelTemplate2.default)("\n  function* wrapper() {\n    var ITERATOR_COMPLETION = true;\n    var ITERATOR_HAD_ERROR_KEY = false;\n    var ITERATOR_ERROR_KEY = undefined;\n    try {\n      for (\n        var ITERATOR_KEY = GET_ITERATOR(OBJECT), STEP_KEY, STEP_VALUE;\n        (\n          STEP_KEY = yield AWAIT(ITERATOR_KEY.next()),\n          ITERATOR_COMPLETION = STEP_KEY.done,\n          STEP_VALUE = yield AWAIT(STEP_KEY.value),\n          !ITERATOR_COMPLETION\n        );\n        ITERATOR_COMPLETION = true) {\n      }\n    } catch (err) {\n      ITERATOR_HAD_ERROR_KEY = true;\n      ITERATOR_ERROR_KEY = err;\n    } finally {\n      try {\n        if (!ITERATOR_COMPLETION && ITERATOR_KEY.return) {\n          yield AWAIT(ITERATOR_KEY.return());\n        }\n      } finally {\n        if (ITERATOR_HAD_ERROR_KEY) {\n          throw ITERATOR_ERROR_KEY;\n        }\n      }\n    }\n  }\n");
+
+	var forAwaitVisitor = {
+	  noScope: true,
+
+	  Identifier: function Identifier(path, replacements) {
+	    if (path.node.name in replacements) {
+	      path.replaceInline(replacements[path.node.name]);
+	    }
+	  },
+	  CallExpression: function CallExpression(path, replacements) {
+	    var callee = path.node.callee;
+
+	    if (t.isIdentifier(callee) && callee.name === "AWAIT" && !replacements.AWAIT) {
+	      path.replaceWith(path.node.arguments[0]);
+	    }
+	  }
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 317 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var helpers = {};
+	exports.default = helpers;
+
+	helpers.typeof = (0, _babelTemplate2.default)("\n  (typeof Symbol === \"function\" && typeof Symbol.iterator === \"symbol\")\n    ? function (obj) { return typeof obj; }\n    : function (obj) {\n        return obj && typeof Symbol === \"function\" && obj.constructor === Symbol && obj !== Symbol.prototype\n          ? \"symbol\"\n          : typeof obj;\n      };\n");
+
+	helpers.jsx = (0, _babelTemplate2.default)("\n  (function () {\n    var REACT_ELEMENT_TYPE = (typeof Symbol === \"function\" && Symbol.for && Symbol.for(\"react.element\")) || 0xeac7;\n\n    return function createRawReactElement (type, props, key, children) {\n      var defaultProps = type && type.defaultProps;\n      var childrenLength = arguments.length - 3;\n\n      if (!props && childrenLength !== 0) {\n        // If we're going to assign props.children, we create a new object now\n        // to avoid mutating defaultProps.\n        props = {};\n      }\n      if (props && defaultProps) {\n        for (var propName in defaultProps) {\n          if (props[propName] === void 0) {\n            props[propName] = defaultProps[propName];\n          }\n        }\n      } else if (!props) {\n        props = defaultProps || {};\n      }\n\n      if (childrenLength === 1) {\n        props.children = children;\n      } else if (childrenLength > 1) {\n        var childArray = Array(childrenLength);\n        for (var i = 0; i < childrenLength; i++) {\n          childArray[i] = arguments[i + 3];\n        }\n        props.children = childArray;\n      }\n\n      return {\n        $$typeof: REACT_ELEMENT_TYPE,\n        type: type,\n        key: key === undefined ? null : '' + key,\n        ref: null,\n        props: props,\n        _owner: null,\n      };\n    };\n\n  })()\n");
+
+	helpers.asyncIterator = (0, _babelTemplate2.default)("\n  (function (iterable) {\n    if (typeof Symbol === \"function\") {\n      if (Symbol.asyncIterator) {\n        var method = iterable[Symbol.asyncIterator];\n        if (method != null) return method.call(iterable);\n      }\n      if (Symbol.iterator) {\n        return iterable[Symbol.iterator]();\n      }\n    }\n    throw new TypeError(\"Object is not async iterable\");\n  })\n");
+
+	helpers.asyncGenerator = (0, _babelTemplate2.default)("\n  (function () {\n    function AwaitValue(value) {\n      this.value = value;\n    }\n\n    function AsyncGenerator(gen) {\n      var front, back;\n\n      function send(key, arg) {\n        return new Promise(function (resolve, reject) {\n          var request = {\n            key: key,\n            arg: arg,\n            resolve: resolve,\n            reject: reject,\n            next: null\n          };\n\n          if (back) {\n            back = back.next = request;\n          } else {\n            front = back = request;\n            resume(key, arg);\n          }\n        });\n      }\n\n      function resume(key, arg) {\n        try {\n          var result = gen[key](arg)\n          var value = result.value;\n          if (value instanceof AwaitValue) {\n            Promise.resolve(value.value).then(\n              function (arg) { resume(\"next\", arg); },\n              function (arg) { resume(\"throw\", arg); });\n          } else {\n            settle(result.done ? \"return\" : \"normal\", result.value);\n          }\n        } catch (err) {\n          settle(\"throw\", err);\n        }\n      }\n\n      function settle(type, value) {\n        switch (type) {\n          case \"return\":\n            front.resolve({ value: value, done: true });\n            break;\n          case \"throw\":\n            front.reject(value);\n            break;\n          default:\n            front.resolve({ value: value, done: false });\n            break;\n        }\n\n        front = front.next;\n        if (front) {\n          resume(front.key, front.arg);\n        } else {\n          back = null;\n        }\n      }\n\n      this._invoke = send;\n\n      // Hide \"return\" method if generator return is not supported\n      if (typeof gen.return !== \"function\") {\n        this.return = undefined;\n      }\n    }\n\n    if (typeof Symbol === \"function\" && Symbol.asyncIterator) {\n      AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; };\n    }\n\n    AsyncGenerator.prototype.next = function (arg) { return this._invoke(\"next\", arg); };\n    AsyncGenerator.prototype.throw = function (arg) { return this._invoke(\"throw\", arg); };\n    AsyncGenerator.prototype.return = function (arg) { return this._invoke(\"return\", arg); };\n\n    return {\n      wrap: function (fn) {\n        return function () {\n          return new AsyncGenerator(fn.apply(this, arguments));\n        };\n      },\n      await: function (value) {\n        return new AwaitValue(value);\n      }\n    };\n\n  })()\n");
+
+	helpers.asyncGeneratorDelegate = (0, _babelTemplate2.default)("\n  (function (inner, awaitWrap) {\n    var iter = {}, waiting = false;\n\n    function pump(key, value) {\n      waiting = true;\n      value = new Promise(function (resolve) { resolve(inner[key](value)); });\n      return { done: false, value: awaitWrap(value) };\n    };\n\n    if (typeof Symbol === \"function\" && Symbol.iterator) {\n      iter[Symbol.iterator] = function () { return this; };\n    }\n\n    iter.next = function (value) {\n      if (waiting) {\n        waiting = false;\n        return value;\n      }\n      return pump(\"next\", value);\n    };\n\n    if (typeof inner.throw === \"function\") {\n      iter.throw = function (value) {\n        if (waiting) {\n          waiting = false;\n          throw value;\n        }\n        return pump(\"throw\", value);\n      };\n    }\n\n    if (typeof inner.return === \"function\") {\n      iter.return = function (value) {\n        return pump(\"return\", value);\n      };\n    }\n\n    return iter;\n  })\n");
+
+	helpers.asyncToGenerator = (0, _babelTemplate2.default)("\n  (function (fn) {\n    return function () {\n      var gen = fn.apply(this, arguments);\n      return new Promise(function (resolve, reject) {\n        function step(key, arg) {\n          try {\n            var info = gen[key](arg);\n            var value = info.value;\n          } catch (error) {\n            reject(error);\n            return;\n          }\n\n          if (info.done) {\n            resolve(value);\n          } else {\n            return Promise.resolve(value).then(function (value) {\n              step(\"next\", value);\n            }, function (err) {\n              step(\"throw\", err);\n            });\n          }\n        }\n\n        return step(\"next\");\n      });\n    };\n  })\n");
+
+	helpers.classCallCheck = (0, _babelTemplate2.default)("\n  (function (instance, Constructor) {\n    if (!(instance instanceof Constructor)) {\n      throw new TypeError(\"Cannot call a class as a function\");\n    }\n  });\n");
+
+	helpers.createClass = (0, _babelTemplate2.default)("\n  (function() {\n    function defineProperties(target, props) {\n      for (var i = 0; i < props.length; i ++) {\n        var descriptor = props[i];\n        descriptor.enumerable = descriptor.enumerable || false;\n        descriptor.configurable = true;\n        if (\"value\" in descriptor) descriptor.writable = true;\n        Object.defineProperty(target, descriptor.key, descriptor);\n      }\n    }\n\n    return function (Constructor, protoProps, staticProps) {\n      if (protoProps) defineProperties(Constructor.prototype, protoProps);\n      if (staticProps) defineProperties(Constructor, staticProps);\n      return Constructor;\n    };\n  })()\n");
+
+	helpers.defineEnumerableProperties = (0, _babelTemplate2.default)("\n  (function (obj, descs) {\n    for (var key in descs) {\n      var desc = descs[key];\n      desc.configurable = desc.enumerable = true;\n      if (\"value\" in desc) desc.writable = true;\n      Object.defineProperty(obj, key, desc);\n    }\n    return obj;\n  })\n");
+
+	helpers.defaults = (0, _babelTemplate2.default)("\n  (function (obj, defaults) {\n    var keys = Object.getOwnPropertyNames(defaults);\n    for (var i = 0; i < keys.length; i++) {\n      var key = keys[i];\n      var value = Object.getOwnPropertyDescriptor(defaults, key);\n      if (value && value.configurable && obj[key] === undefined) {\n        Object.defineProperty(obj, key, value);\n      }\n    }\n    return obj;\n  })\n");
+
+	helpers.defineProperty = (0, _babelTemplate2.default)("\n  (function (obj, key, value) {\n    // Shortcircuit the slow defineProperty path when possible.\n    // We are trying to avoid issues where setters defined on the\n    // prototype cause side effects under the fast path of simple\n    // assignment. By checking for existence of the property with\n    // the in operator, we can optimize most of this overhead away.\n    if (key in obj) {\n      Object.defineProperty(obj, key, {\n        value: value,\n        enumerable: true,\n        configurable: true,\n        writable: true\n      });\n    } else {\n      obj[key] = value;\n    }\n    return obj;\n  });\n");
+
+	helpers.extends = (0, _babelTemplate2.default)("\n  Object.assign || (function (target) {\n    for (var i = 1; i < arguments.length; i++) {\n      var source = arguments[i];\n      for (var key in source) {\n        if (Object.prototype.hasOwnProperty.call(source, key)) {\n          target[key] = source[key];\n        }\n      }\n    }\n    return target;\n  })\n");
+
+	helpers.get = (0, _babelTemplate2.default)("\n  (function get(object, property, receiver) {\n    if (object === null) object = Function.prototype;\n\n    var desc = Object.getOwnPropertyDescriptor(object, property);\n\n    if (desc === undefined) {\n      var parent = Object.getPrototypeOf(object);\n\n      if (parent === null) {\n        return undefined;\n      } else {\n        return get(parent, property, receiver);\n      }\n    } else if (\"value\" in desc) {\n      return desc.value;\n    } else {\n      var getter = desc.get;\n\n      if (getter === undefined) {\n        return undefined;\n      }\n\n      return getter.call(receiver);\n    }\n  });\n");
+
+	helpers.inherits = (0, _babelTemplate2.default)("\n  (function (subClass, superClass) {\n    if (typeof superClass !== \"function\" && superClass !== null) {\n      throw new TypeError(\"Super expression must either be null or a function, not \" + typeof superClass);\n    }\n    subClass.prototype = Object.create(superClass && superClass.prototype, {\n      constructor: {\n        value: subClass,\n        enumerable: false,\n        writable: true,\n        configurable: true\n      }\n    });\n    if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;\n  })\n");
+
+	helpers.instanceof = (0, _babelTemplate2.default)("\n  (function (left, right) {\n    if (right != null && typeof Symbol !== \"undefined\" && right[Symbol.hasInstance]) {\n      return right[Symbol.hasInstance](left);\n    } else {\n      return left instanceof right;\n    }\n  });\n");
+
+	helpers.interopRequireDefault = (0, _babelTemplate2.default)("\n  (function (obj) {\n    return obj && obj.__esModule ? obj : { default: obj };\n  })\n");
+
+	helpers.interopRequireWildcard = (0, _babelTemplate2.default)("\n  (function (obj) {\n    if (obj && obj.__esModule) {\n      return obj;\n    } else {\n      var newObj = {};\n      if (obj != null) {\n        for (var key in obj) {\n          if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];\n        }\n      }\n      newObj.default = obj;\n      return newObj;\n    }\n  })\n");
+
+	helpers.newArrowCheck = (0, _babelTemplate2.default)("\n  (function (innerThis, boundThis) {\n    if (innerThis !== boundThis) {\n      throw new TypeError(\"Cannot instantiate an arrow function\");\n    }\n  });\n");
+
+	helpers.objectDestructuringEmpty = (0, _babelTemplate2.default)("\n  (function (obj) {\n    if (obj == null) throw new TypeError(\"Cannot destructure undefined\");\n  });\n");
+
+	helpers.objectWithoutProperties = (0, _babelTemplate2.default)("\n  (function (obj, keys) {\n    var target = {};\n    for (var i in obj) {\n      if (keys.indexOf(i) >= 0) continue;\n      if (!Object.prototype.hasOwnProperty.call(obj, i)) continue;\n      target[i] = obj[i];\n    }\n    return target;\n  })\n");
+
+	helpers.possibleConstructorReturn = (0, _babelTemplate2.default)("\n  (function (self, call) {\n    if (!self) {\n      throw new ReferenceError(\"this hasn't been initialised - super() hasn't been called\");\n    }\n    return call && (typeof call === \"object\" || typeof call === \"function\") ? call : self;\n  });\n");
+
+	helpers.selfGlobal = (0, _babelTemplate2.default)("\n  typeof global === \"undefined\" ? self : global\n");
+
+	helpers.set = (0, _babelTemplate2.default)("\n  (function set(object, property, value, receiver) {\n    var desc = Object.getOwnPropertyDescriptor(object, property);\n\n    if (desc === undefined) {\n      var parent = Object.getPrototypeOf(object);\n\n      if (parent !== null) {\n        set(parent, property, value, receiver);\n      }\n    } else if (\"value\" in desc && desc.writable) {\n      desc.value = value;\n    } else {\n      var setter = desc.set;\n\n      if (setter !== undefined) {\n        setter.call(receiver, value);\n      }\n    }\n\n    return value;\n  });\n");
+
+	helpers.slicedToArray = (0, _babelTemplate2.default)("\n  (function () {\n    // Broken out into a separate function to avoid deoptimizations due to the try/catch for the\n    // array iterator case.\n    function sliceIterator(arr, i) {\n      // this is an expanded form of `for...of` that properly supports abrupt completions of\n      // iterators etc. variable names have been minimised to reduce the size of this massive\n      // helper. sometimes spec compliancy is annoying :(\n      //\n      // _n = _iteratorNormalCompletion\n      // _d = _didIteratorError\n      // _e = _iteratorError\n      // _i = _iterator\n      // _s = _step\n\n      var _arr = [];\n      var _n = true;\n      var _d = false;\n      var _e = undefined;\n      try {\n        for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {\n          _arr.push(_s.value);\n          if (i && _arr.length === i) break;\n        }\n      } catch (err) {\n        _d = true;\n        _e = err;\n      } finally {\n        try {\n          if (!_n && _i[\"return\"]) _i[\"return\"]();\n        } finally {\n          if (_d) throw _e;\n        }\n      }\n      return _arr;\n    }\n\n    return function (arr, i) {\n      if (Array.isArray(arr)) {\n        return arr;\n      } else if (Symbol.iterator in Object(arr)) {\n        return sliceIterator(arr, i);\n      } else {\n        throw new TypeError(\"Invalid attempt to destructure non-iterable instance\");\n      }\n    };\n  })();\n");
+
+	helpers.slicedToArrayLoose = (0, _babelTemplate2.default)("\n  (function (arr, i) {\n    if (Array.isArray(arr)) {\n      return arr;\n    } else if (Symbol.iterator in Object(arr)) {\n      var _arr = [];\n      for (var _iterator = arr[Symbol.iterator](), _step; !(_step = _iterator.next()).done;) {\n        _arr.push(_step.value);\n        if (i && _arr.length === i) break;\n      }\n      return _arr;\n    } else {\n      throw new TypeError(\"Invalid attempt to destructure non-iterable instance\");\n    }\n  });\n");
+
+	helpers.taggedTemplateLiteral = (0, _babelTemplate2.default)("\n  (function (strings, raw) {\n    return Object.freeze(Object.defineProperties(strings, {\n        raw: { value: Object.freeze(raw) }\n    }));\n  });\n");
+
+	helpers.taggedTemplateLiteralLoose = (0, _babelTemplate2.default)("\n  (function (strings, raw) {\n    strings.raw = raw;\n    return strings;\n  });\n");
+
+	helpers.temporalRef = (0, _babelTemplate2.default)("\n  (function (val, name, undef) {\n    if (val === undef) {\n      throw new ReferenceError(name + \" is not defined - temporal dead zone\");\n    } else {\n      return val;\n    }\n  })\n");
+
+	helpers.temporalUndefined = (0, _babelTemplate2.default)("\n  ({})\n");
+
+	helpers.toArray = (0, _babelTemplate2.default)("\n  (function (arr) {\n    return Array.isArray(arr) ? arr : Array.from(arr);\n  });\n");
+
+	helpers.toConsumableArray = (0, _babelTemplate2.default)("\n  (function (arr) {\n    if (Array.isArray(arr)) {\n      for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];\n      return arr2;\n    } else {\n      return Array.from(arr);\n    }\n  });\n");
+	module.exports = exports["default"];
+
+/***/ }),
+/* 318 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  return {
+	    pre: function pre(file) {
+	      file.set("helpersNamespace", t.identifier("babelHelpers"));
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 319 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/**
+	 * Created at 16/5/18.
+	 * @Author Ling.
+	 * @Email i@zeroling.com
+	 */
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var babylon = __webpack_require__(87);
+
+	module.exports = function (babel) {
+	  var t = babel.types;
+	  // cache for performance
+	  var parseMap = {};
+
+	  return {
+	    visitor: {
+	      Identifier: function Identifier(path, state) {
+	        if (path.parent.type === 'MemberExpression') {
+	          return;
+	        }
+	        if (path.parent.type === 'ClassMethod') {
+	          return;
+	        }
+	        if (path.isPure()) {
+	          return;
+	        }
+	        if (!state.opts.hasOwnProperty(path.node.name)) {
+	          return;
+	        }
+	        var replacementDescriptor = state.opts[path.node.name];
+	        if (replacementDescriptor === undefined || replacementDescriptor === null) {
+	          replacementDescriptor = t.identifier(String(replacementDescriptor));
+	        }
+
+	        var type = typeof replacementDescriptor === 'undefined' ? 'undefined' : _typeof(replacementDescriptor);
+	        if (type === 'string' || type === 'boolean') {
+	          replacementDescriptor = {
+	            type: type,
+	            replacement: replacementDescriptor
+	          };
+	        } else if (t.isNode(replacementDescriptor)) {
+	          replacementDescriptor = {
+	            type: 'node',
+	            replacement: replacementDescriptor
+	          };
+	        } else if (type === 'object' && replacementDescriptor.type === 'node' && typeof replacementDescriptor.replacement === 'string') {
+	          replacementDescriptor.replacement = parseMap[replacementDescriptor.replacement] ? parseMap[replacementDescriptor.replacement] : babylon.parseExpression(replacementDescriptor.replacement);
+	        }
+
+	        var replacement = replacementDescriptor.replacement;
+	        switch (replacementDescriptor.type) {
+	          case 'boolean':
+	            path.replaceWith(t.booleanLiteral(replacement));
+	            break;
+	          case 'node':
+	            if (t.isNode(replacement)) {
+	              path.replaceWith(replacement);
+	            }
+	            break;
+	          default:
+	            // treat as string
+	            var str = String(replacement);
+	            path.replaceWith(t.stringLiteral(str));
+	            break;
+	        }
+	      }
+	    }
+	  };
+	};
+
+/***/ }),
+/* 320 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("dynamicImport");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 321 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("functionSent");
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 322 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    inherits: __webpack_require__(65)
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 323 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  var yieldStarVisitor = {
+	    Function: function Function(path) {
+	      path.skip();
+	    },
+	    YieldExpression: function YieldExpression(_ref2, state) {
+	      var node = _ref2.node;
+
+	      if (!node.delegate) return;
+	      var callee = state.addHelper("asyncGeneratorDelegate");
+	      node.argument = t.callExpression(callee, [t.callExpression(state.addHelper("asyncIterator"), [node.argument]), t.memberExpression(state.addHelper("asyncGenerator"), t.identifier("await"))]);
+	    }
+	  };
+
+	  return {
+	    inherits: __webpack_require__(191),
+	    visitor: {
+	      Function: function Function(path, state) {
+	        if (!path.node.async || !path.node.generator) return;
+
+	        path.traverse(yieldStarVisitor, state);
+
+	        (0, _babelHelperRemapAsyncToGenerator2.default)(path, state.file, {
+	          wrapAsync: t.memberExpression(state.addHelper("asyncGenerator"), t.identifier("wrap")),
+	          wrapAwait: t.memberExpression(state.addHelper("asyncGenerator"), t.identifier("await"))
+	        });
+	      }
+	    }
+	  };
+	};
+
+	var _babelHelperRemapAsyncToGenerator = __webpack_require__(123);
+
+	var _babelHelperRemapAsyncToGenerator2 = _interopRequireDefault(_babelHelperRemapAsyncToGenerator);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 324 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    inherits: __webpack_require__(65),
+
+	    visitor: {
+	      Function: function Function(path, state) {
+	        if (!path.node.async || path.node.generator) return;
+
+	        (0, _babelHelperRemapAsyncToGenerator2.default)(path, state.file, {
+	          wrapAsync: state.addImport(state.opts.module, state.opts.method)
+	        });
+	      }
+	    }
+	  };
+	};
+
+	var _babelHelperRemapAsyncToGenerator = __webpack_require__(123);
+
+	var _babelHelperRemapAsyncToGenerator2 = _interopRequireDefault(_babelHelperRemapAsyncToGenerator);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 325 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	Object.defineProperty(exports, "__esModule", {
+	    value: true
+	});
+
+	exports.default = function (_ref) {
+	    var t = _ref.types;
+
+	    /**
+	     * Add a helper to take an initial descriptor, apply some decorators to it, and optionally
+	     * define the property.
+	     */
+	    function ensureApplyDecoratedDescriptorHelper(path, state) {
+	        if (!state.applyDecoratedDescriptor) {
+	            state.applyDecoratedDescriptor = path.scope.generateUidIdentifier('applyDecoratedDescriptor');
+	            var helper = buildApplyDecoratedDescriptor({
+	                NAME: state.applyDecoratedDescriptor
+	            });
+	            path.scope.getProgramParent().path.unshiftContainer('body', helper);
+	        }
+
+	        return state.applyDecoratedDescriptor;
+	    }
+
+	    /**
+	     * Add a helper to call as a replacement for class property definition.
+	     */
+	    function ensureInitializerDefineProp(path, state) {
+	        if (!state.initializerDefineProp) {
+	            state.initializerDefineProp = path.scope.generateUidIdentifier('initDefineProp');
+	            var helper = buildInitializerDefineProperty({
+	                NAME: state.initializerDefineProp
+	            });
+	            path.scope.getProgramParent().path.unshiftContainer('body', helper);
+	        }
+
+	        return state.initializerDefineProp;
+	    }
+
+	    /**
+	     * Add a helper that will throw a useful error if the transform fails to detect the class
+	     * property assignment, so users know something failed.
+	     */
+	    function ensureInitializerWarning(path, state) {
+	        if (!state.initializerWarningHelper) {
+	            state.initializerWarningHelper = path.scope.generateUidIdentifier('initializerWarningHelper');
+	            var helper = buildInitializerWarningHelper({
+	                NAME: state.initializerWarningHelper
+	            });
+	            path.scope.getProgramParent().path.unshiftContainer('body', helper);
+	        }
+
+	        return state.initializerWarningHelper;
+	    }
+
+	    /**
+	     * If the decorator expressions are non-identifiers, hoist them to before the class so we can be sure
+	     * that they are evaluated in order.
+	     */
+	    function applyEnsureOrdering(path) {
+	        // TODO: This should probably also hoist computed properties.
+	        var decorators = (path.isClass() ? [path].concat(path.get('body.body')) : path.get('properties')).reduce(function (acc, prop) {
+	            return acc.concat(prop.node.decorators || []);
+	        }, []);
+
+	        var identDecorators = decorators.filter(function (decorator) {
+	            return !t.isIdentifier(decorator.expression);
+	        });
+	        if (identDecorators.length === 0) return;
+
+	        return t.sequenceExpression(identDecorators.map(function (decorator) {
+	            var expression = decorator.expression;
+	            var id = decorator.expression = path.scope.generateDeclaredUidIdentifier('dec');
+	            return t.assignmentExpression('=', id, expression);
+	        }).concat([path.node]));
+	    }
+
+	    /**
+	     * Given a class expression with class-level decorators, create a new expression
+	     * with the proper decorated behavior.
+	     */
+	    function applyClassDecorators(classPath, state) {
+	        var decorators = classPath.node.decorators || [];
+	        classPath.node.decorators = null;
+
+	        if (decorators.length === 0) return;
+
+	        var name = classPath.scope.generateDeclaredUidIdentifier('class');
+
+	        return decorators.map(function (dec) {
+	            return dec.expression;
+	        }).reverse().reduce(function (acc, decorator) {
+	            return buildClassDecorator({
+	                CLASS_REF: name,
+	                DECORATOR: decorator,
+	                INNER: acc
+	            }).expression;
+	        }, classPath.node);
+	    }
+
+	    /**
+	     * Given a class expression with method-level decorators, create a new expression
+	     * with the proper decorated behavior.
+	     */
+	    function applyMethodDecorators(path, state) {
+	        var hasMethodDecorators = path.node.body.body.some(function (node) {
+	            return (node.decorators || []).length > 0;
+	        });
+
+	        if (!hasMethodDecorators) return;
+
+	        return applyTargetDecorators(path, state, path.node.body.body);
+	    }
+
+	    /**
+	     * Given an object expression with property decorators, create a new expression
+	     * with the proper decorated behavior.
+	     */
+	    function applyObjectDecorators(path, state) {
+	        var hasMethodDecorators = path.node.properties.some(function (node) {
+	            return (node.decorators || []).length > 0;
+	        });
+
+	        if (!hasMethodDecorators) return;
+
+	        return applyTargetDecorators(path, state, path.node.properties);
+	    }
+
+	    /**
+	     * A helper to pull out property decorators into a sequence expression.
+	     */
+	    function applyTargetDecorators(path, state, decoratedProps) {
+	        var descName = path.scope.generateDeclaredUidIdentifier('desc');
+	        var valueTemp = path.scope.generateDeclaredUidIdentifier('value');
+
+	        var name = path.scope.generateDeclaredUidIdentifier(path.isClass() ? 'class' : 'obj');
+
+	        var exprs = decoratedProps.reduce(function (acc, node) {
+	            var decorators = node.decorators || [];
+	            node.decorators = null;
+
+	            if (decorators.length === 0) return acc;
+
+	            if (node.computed) {
+	                throw path.buildCodeFrameError('Computed method/property decorators are not yet supported.');
+	            }
+
+	            var property = t.isLiteral(node.key) ? node.key : t.stringLiteral(node.key.name);
+
+	            var target = path.isClass() && !node.static ? buildClassPrototype({
+	                CLASS_REF: name
+	            }).expression : name;
+
+	            if (t.isClassProperty(node, { static: false })) {
+	                var descriptor = path.scope.generateDeclaredUidIdentifier('descriptor');
+
+	                var initializer = node.value ? t.functionExpression(null, [], t.blockStatement([t.returnStatement(node.value)])) : t.nullLiteral();
+	                node.value = t.callExpression(ensureInitializerWarning(path, state), [descriptor, t.thisExpression()]);
+
+	                acc = acc.concat([t.assignmentExpression('=', descriptor, t.callExpression(ensureApplyDecoratedDescriptorHelper(path, state), [target, property, t.arrayExpression(decorators.map(function (dec) {
+	                    return dec.expression;
+	                })), t.objectExpression([t.objectProperty(t.identifier('enumerable'), t.booleanLiteral(true)), t.objectProperty(t.identifier('initializer'), initializer)])]))]);
+	            } else {
+	                acc = acc.concat(t.callExpression(ensureApplyDecoratedDescriptorHelper(path, state), [target, property, t.arrayExpression(decorators.map(function (dec) {
+	                    return dec.expression;
+	                })), t.isObjectProperty(node) || t.isClassProperty(node, { static: true }) ? buildGetObjectInitializer({
+	                    TEMP: path.scope.generateDeclaredUidIdentifier('init'),
+	                    TARGET: target,
+	                    PROPERTY: property
+	                }).expression : buildGetDescriptor({
+	                    TARGET: target,
+	                    PROPERTY: property
+	                }).expression, target]));
+	            }
+
+	            return acc;
+	        }, []);
+
+	        return t.sequenceExpression([t.assignmentExpression('=', name, path.node), t.sequenceExpression(exprs), name]);
+	    }
+
+	    return {
+	        inherits: __webpack_require__(124),
+
+	        visitor: {
+	            ExportDefaultDeclaration: function ExportDefaultDeclaration(path) {
+	                if (!path.get("declaration").isClassDeclaration()) return;
+
+	                var node = path.node;
+
+	                var ref = node.declaration.id || path.scope.generateUidIdentifier("default");
+	                node.declaration.id = ref;
+
+	                // Split the class declaration and the export into two separate statements.
+	                path.replaceWith(node.declaration);
+	                path.insertAfter(t.exportNamedDeclaration(null, [t.exportSpecifier(ref, t.identifier('default'))]));
+	            },
+	            ClassDeclaration: function ClassDeclaration(path) {
+	                var node = path.node;
+
+	                var ref = node.id || path.scope.generateUidIdentifier("class");
+
+	                path.replaceWith(t.variableDeclaration("let", [t.variableDeclarator(ref, t.toExpression(node))]));
+	            },
+	            ClassExpression: function ClassExpression(path, state) {
+	                // Create a replacement for the class node if there is one. We do one pass to replace classes with
+	                // class decorators, and a second pass to process method decorators.
+	                var decoratedClass = applyEnsureOrdering(path) || applyClassDecorators(path, state) || applyMethodDecorators(path, state);
+
+	                if (decoratedClass) path.replaceWith(decoratedClass);
+	            },
+	            ObjectExpression: function ObjectExpression(path, state) {
+	                var decoratedObject = applyEnsureOrdering(path) || applyObjectDecorators(path, state);
+
+	                if (decoratedObject) path.replaceWith(decoratedObject);
+	            },
+	            AssignmentExpression: function AssignmentExpression(path, state) {
+	                if (!state.initializerWarningHelper) return;
+
+	                if (!path.get('left').isMemberExpression()) return;
+	                if (!path.get('left.property').isIdentifier()) return;
+	                if (!path.get('right').isCallExpression()) return;
+	                if (!path.get('right.callee').isIdentifier({ name: state.initializerWarningHelper.name })) return;
+
+	                path.replaceWith(t.callExpression(ensureInitializerDefineProp(path, state), [path.get('left.object').node, t.stringLiteral(path.get('left.property').node.name), path.get('right.arguments')[0].node, path.get('right.arguments')[1].node]));
+	            }
+	        }
+	    };
+	};
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	function _interopRequireDefault(obj) {
+	    return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildClassDecorator = (0, _babelTemplate2.default)('\n  DECORATOR(CLASS_REF = INNER) || CLASS_REF;\n');
+
+	var buildClassPrototype = (0, _babelTemplate2.default)('\n  CLASS_REF.prototype;\n');
+
+	var buildGetDescriptor = (0, _babelTemplate2.default)('\n    Object.getOwnPropertyDescriptor(TARGET, PROPERTY);\n');
+
+	var buildGetObjectInitializer = (0, _babelTemplate2.default)('\n    (TEMP = Object.getOwnPropertyDescriptor(TARGET, PROPERTY), (TEMP = TEMP ? TEMP.value : undefined), {\n        enumerable: true,\n        configurable: true,\n        writable: true,\n        initializer: function(){\n            return TEMP;\n        }\n    })\n');
+
+	var buildInitializerWarningHelper = (0, _babelTemplate2.default)('\n    function NAME(descriptor, context){\n        throw new Error(\'Decorating class property failed. Please ensure that transform-class-properties is enabled.\');\n    }\n');
+
+	var buildInitializerDefineProperty = (0, _babelTemplate2.default)('\n    function NAME(target, property, descriptor, context){\n        if (!descriptor) return;\n\n        Object.defineProperty(target, property, {\n            enumerable: descriptor.enumerable,\n            configurable: descriptor.configurable,\n            writable: descriptor.writable,\n            value: descriptor.initializer ? descriptor.initializer.call(context) : void 0,\n        });\n    }\n');
+
+	var buildApplyDecoratedDescriptor = (0, _babelTemplate2.default)('\n    function NAME(target, property, decorators, descriptor, context){\n        var desc = {};\n        Object[\'ke\' + \'ys\'](descriptor).forEach(function(key){\n            desc[key] = descriptor[key];\n        });\n        desc.enumerable = !!desc.enumerable;\n        desc.configurable = !!desc.configurable;\n        if (\'value\' in desc || desc.initializer){\n            desc.writable = true;\n        }\n\n        desc = decorators.slice().reverse().reduce(function(desc, decorator){\n            return decorator(target, property, desc) || desc;\n        }, desc);\n\n        if (context && desc.initializer !== void 0){\n            desc.value = desc.initializer ? desc.initializer.call(context) : void 0;\n            desc.initializer = undefined;\n        }\n\n        if (desc.initializer === void 0){\n            // This is a hack to avoid this being processed by \'transform-runtime\'.\n            // See issue #9.\n            Object[\'define\' + \'Property\'](target, property, desc);\n            desc = null;\n        }\n\n        return desc;\n    }\n');
+
+	;
+
+/***/ }),
+/* 326 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.visitor = undefined;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function getTDZStatus(refPath, bindingPath) {
+	  var executionStatus = bindingPath._guessExecutionStatusRelativeTo(refPath);
+
+	  if (executionStatus === "before") {
+	    return "inside";
+	  } else if (executionStatus === "after") {
+	    return "outside";
+	  } else {
+	    return "maybe";
+	  }
+	}
+
+	function buildTDZAssert(node, file) {
+	  return t.callExpression(file.addHelper("temporalRef"), [node, t.stringLiteral(node.name), file.addHelper("temporalUndefined")]);
+	}
+
+	function isReference(node, scope, state) {
+	  var declared = state.letReferences[node.name];
+	  if (!declared) return false;
+
+	  return scope.getBindingIdentifier(node.name) === declared;
+	}
+
+	var visitor = exports.visitor = {
+	  ReferencedIdentifier: function ReferencedIdentifier(path, state) {
+	    if (!this.file.opts.tdz) return;
+
+	    var node = path.node,
+	        parent = path.parent,
+	        scope = path.scope;
+
+	    if (path.parentPath.isFor({ left: node })) return;
+	    if (!isReference(node, scope, state)) return;
+
+	    var bindingPath = scope.getBinding(node.name).path;
+
+	    var status = getTDZStatus(path, bindingPath);
+	    if (status === "inside") return;
+
+	    if (status === "maybe") {
+	      var assert = buildTDZAssert(node, state.file);
+
+	      bindingPath.parent._tdzThis = true;
+
+	      path.skip();
+
+	      if (path.parentPath.isUpdateExpression()) {
+	        if (parent._ignoreBlockScopingTDZ) return;
+	        path.parentPath.replaceWith(t.sequenceExpression([assert, parent]));
+	      } else {
+	        path.replaceWith(assert);
+	      }
+	    } else if (status === "outside") {
+	      path.replaceWith(t.throwStatement(t.inherits(t.newExpression(t.identifier("ReferenceError"), [t.stringLiteral(node.name + " is not defined - temporal dead zone")]), node)));
+	    }
+	  },
+
+	  AssignmentExpression: {
+	    exit: function exit(path, state) {
+	      if (!this.file.opts.tdz) return;
+
+	      var node = path.node;
+
+	      if (node._ignoreBlockScopingTDZ) return;
+
+	      var nodes = [];
+	      var ids = path.getBindingIdentifiers();
+
+	      for (var name in ids) {
+	        var id = ids[name];
+
+	        if (isReference(id, path.scope, state)) {
+	          nodes.push(buildTDZAssert(id, state.file));
+	        }
+	      }
+
+	      if (nodes.length) {
+	        node._ignoreBlockScopingTDZ = true;
+	        nodes.push(node);
+	        path.replaceWithMultiple(nodes.map(t.expressionStatement));
+	      }
+	    }
+	  }
+	};
+
+/***/ }),
+/* 327 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _possibleConstructorReturn2 = __webpack_require__(42);
+
+	var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+	var _inherits2 = __webpack_require__(41);
+
+	var _inherits3 = _interopRequireDefault(_inherits2);
+
+	var _babelHelperFunctionName = __webpack_require__(40);
+
+	var _babelHelperFunctionName2 = _interopRequireDefault(_babelHelperFunctionName);
+
+	var _vanilla = __webpack_require__(203);
+
+	var _vanilla2 = _interopRequireDefault(_vanilla);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var LooseClassTransformer = function (_VanillaTransformer) {
+	  (0, _inherits3.default)(LooseClassTransformer, _VanillaTransformer);
+
+	  function LooseClassTransformer() {
+	    (0, _classCallCheck3.default)(this, LooseClassTransformer);
+
+	    var _this = (0, _possibleConstructorReturn3.default)(this, _VanillaTransformer.apply(this, arguments));
+
+	    _this.isLoose = true;
+	    return _this;
+	  }
+
+	  LooseClassTransformer.prototype._processMethod = function _processMethod(node, scope) {
+	    if (!node.decorators) {
+
+	      var classRef = this.classRef;
+	      if (!node.static) classRef = t.memberExpression(classRef, t.identifier("prototype"));
+	      var methodName = t.memberExpression(classRef, node.key, node.computed || t.isLiteral(node.key));
+
+	      var func = t.functionExpression(null, node.params, node.body, node.generator, node.async);
+	      func.returnType = node.returnType;
+	      var key = t.toComputedKey(node, node.key);
+	      if (t.isStringLiteral(key)) {
+	        func = (0, _babelHelperFunctionName2.default)({
+	          node: func,
+	          id: key,
+	          scope: scope
+	        });
+	      }
+
+	      var expr = t.expressionStatement(t.assignmentExpression("=", methodName, func));
+	      t.inheritsComments(expr, node);
+	      this.body.push(expr);
+	      return true;
+	    }
+	  };
+
+	  return LooseClassTransformer;
+	}(_vanilla2.default);
+
+	exports.default = LooseClassTransformer;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 328 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  return {
+	    visitor: {
+	      BinaryExpression: function BinaryExpression(path) {
+	        var node = path.node;
+
+	        if (node.operator === "instanceof") {
+	          path.replaceWith(t.callExpression(this.addHelper("instanceof"), [node.left, node.right]));
+	        }
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 329 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.visitor = undefined;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _babelHelperGetFunctionArity = __webpack_require__(185);
+
+	var _babelHelperGetFunctionArity2 = _interopRequireDefault(_babelHelperGetFunctionArity);
+
+	var _babelHelperCallDelegate = __webpack_require__(313);
+
+	var _babelHelperCallDelegate2 = _interopRequireDefault(_babelHelperCallDelegate);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildDefaultParam = (0, _babelTemplate2.default)("\n  let VARIABLE_NAME =\n    ARGUMENTS.length > ARGUMENT_KEY && ARGUMENTS[ARGUMENT_KEY] !== undefined ?\n      ARGUMENTS[ARGUMENT_KEY]\n    :\n      DEFAULT_VALUE;\n");
+
+	var buildCutOff = (0, _babelTemplate2.default)("\n  let $0 = $1[$2];\n");
+
+	function hasDefaults(node) {
+	  for (var _iterator = node.params, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var param = _ref;
+
+	    if (!t.isIdentifier(param)) return true;
+	  }
+	  return false;
+	}
+
+	function isSafeBinding(scope, node) {
+	  if (!scope.hasOwnBinding(node.name)) return true;
+
+	  var _scope$getOwnBinding = scope.getOwnBinding(node.name),
+	      kind = _scope$getOwnBinding.kind;
+
+	  return kind === "param" || kind === "local";
+	}
+
+	var iifeVisitor = {
+	  ReferencedIdentifier: function ReferencedIdentifier(path, state) {
+	    var scope = path.scope,
+	        node = path.node;
+
+	    if (node.name === "eval" || !isSafeBinding(scope, node)) {
+	      state.iife = true;
+	      path.stop();
+	    }
+	  },
+	  Scope: function Scope(path) {
+	    path.skip();
+	  }
+	};
+
+	var visitor = exports.visitor = {
+	  Function: function Function(path) {
+	    var node = path.node,
+	        scope = path.scope;
+
+	    if (!hasDefaults(node)) return;
+
+	    path.ensureBlock();
+
+	    var state = {
+	      iife: false,
+	      scope: scope
+	    };
+
+	    var body = [];
+
+	    var argsIdentifier = t.identifier("arguments");
+	    argsIdentifier._shadowedFunctionLiteral = path;
+
+	    function pushDefNode(left, right, i) {
+	      var defNode = buildDefaultParam({
+	        VARIABLE_NAME: left,
+	        DEFAULT_VALUE: right,
+	        ARGUMENT_KEY: t.numericLiteral(i),
+	        ARGUMENTS: argsIdentifier
+	      });
+	      defNode._blockHoist = node.params.length - i;
+	      body.push(defNode);
+	    }
+
+	    var lastNonDefaultParam = (0, _babelHelperGetFunctionArity2.default)(node);
+
+	    var params = path.get("params");
+	    for (var i = 0; i < params.length; i++) {
+	      var param = params[i];
+
+	      if (!param.isAssignmentPattern()) {
+	        if (!state.iife && !param.isIdentifier()) {
+	          param.traverse(iifeVisitor, state);
+	        }
+
+	        continue;
+	      }
+
+	      var left = param.get("left");
+	      var right = param.get("right");
+
+	      if (i >= lastNonDefaultParam || left.isPattern()) {
+	        var placeholder = scope.generateUidIdentifier("x");
+	        placeholder._isDefaultPlaceholder = true;
+	        node.params[i] = placeholder;
+	      } else {
+	        node.params[i] = left.node;
+	      }
+
+	      if (!state.iife) {
+	        if (right.isIdentifier() && !isSafeBinding(scope, right.node)) {
+	          state.iife = true;
+	        } else {
+	          right.traverse(iifeVisitor, state);
+	        }
+	      }
+
+	      pushDefNode(left.node, right.node, i);
+	    }
+
+	    for (var _i2 = lastNonDefaultParam + 1; _i2 < node.params.length; _i2++) {
+	      var _param = node.params[_i2];
+	      if (_param._isDefaultPlaceholder) continue;
+
+	      var declar = buildCutOff(_param, argsIdentifier, t.numericLiteral(_i2));
+	      declar._blockHoist = node.params.length - _i2;
+	      body.push(declar);
+	    }
+
+	    node.params = node.params.slice(0, lastNonDefaultParam);
+
+	    if (state.iife) {
+	      body.push((0, _babelHelperCallDelegate2.default)(path, scope));
+	      path.set("body", t.blockStatement(body));
+	    } else {
+	      path.get("body").unshiftContainer("body", body);
+	    }
+	  }
+	};
+
+/***/ }),
+/* 330 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.visitor = undefined;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	var visitor = exports.visitor = {
+	  Function: function Function(path) {
+	    var params = path.get("params");
+
+	    var hoistTweak = t.isRestElement(params[params.length - 1]) ? 1 : 0;
+	    var outputParamsLength = params.length - hoistTweak;
+
+	    for (var i = 0; i < outputParamsLength; i++) {
+	      var param = params[i];
+	      if (param.isArrayPattern() || param.isObjectPattern()) {
+	        var uid = path.scope.generateUidIdentifier("ref");
+
+	        var declar = t.variableDeclaration("let", [t.variableDeclarator(param.node, uid)]);
+	        declar._blockHoist = outputParamsLength - i;
+
+	        path.ensureBlock();
+	        path.get("body").unshiftContainer("body", declar);
+
+	        param.replaceWith(uid);
+	      }
+	    }
+	  }
+	};
+
+/***/ }),
+/* 331 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.visitor = undefined;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _babelTemplate = __webpack_require__(4);
+
+	var _babelTemplate2 = _interopRequireDefault(_babelTemplate);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var buildRest = (0, _babelTemplate2.default)("\n  for (var LEN = ARGUMENTS.length,\n           ARRAY = Array(ARRAY_LEN),\n           KEY = START;\n       KEY < LEN;\n       KEY++) {\n    ARRAY[ARRAY_KEY] = ARGUMENTS[KEY];\n  }\n");
+
+	var restIndex = (0, _babelTemplate2.default)("\n  ARGUMENTS.length <= INDEX ? undefined : ARGUMENTS[INDEX]\n");
+
+	var restIndexImpure = (0, _babelTemplate2.default)("\n  REF = INDEX, ARGUMENTS.length <= REF ? undefined : ARGUMENTS[REF]\n");
+
+	var restLength = (0, _babelTemplate2.default)("\n  ARGUMENTS.length <= OFFSET ? 0 : ARGUMENTS.length - OFFSET\n");
+
+	var memberExpressionOptimisationVisitor = {
+	  Scope: function Scope(path, state) {
+	    if (!path.scope.bindingIdentifierEquals(state.name, state.outerBinding)) {
+	      path.skip();
+	    }
+	  },
+	  Flow: function Flow(path) {
+	    if (path.isTypeCastExpression()) return;
+
+	    path.skip();
+	  },
+
+	  "Function|ClassProperty": function FunctionClassProperty(path, state) {
+	    var oldNoOptimise = state.noOptimise;
+	    state.noOptimise = true;
+	    path.traverse(memberExpressionOptimisationVisitor, state);
+	    state.noOptimise = oldNoOptimise;
+
+	    path.skip();
+	  },
+
+	  ReferencedIdentifier: function ReferencedIdentifier(path, state) {
+	    var node = path.node;
+
+	    if (node.name === "arguments") {
+	      state.deopted = true;
+	    }
+
+	    if (node.name !== state.name) return;
+
+	    if (state.noOptimise) {
+	      state.deopted = true;
+	    } else {
+	      var parentPath = path.parentPath;
+
+	      if (parentPath.listKey === "params" && parentPath.key < state.offset) {
+	        return;
+	      }
+
+	      if (parentPath.isMemberExpression({ object: node })) {
+	        var grandparentPath = parentPath.parentPath;
+
+	        var argsOptEligible = !state.deopted && !(grandparentPath.isAssignmentExpression() && parentPath.node === grandparentPath.node.left || grandparentPath.isLVal() || grandparentPath.isForXStatement() || grandparentPath.isUpdateExpression() || grandparentPath.isUnaryExpression({ operator: "delete" }) || (grandparentPath.isCallExpression() || grandparentPath.isNewExpression()) && parentPath.node === grandparentPath.node.callee);
+
+	        if (argsOptEligible) {
+	          if (parentPath.node.computed) {
+	            if (parentPath.get("property").isBaseType("number")) {
+	              state.candidates.push({ cause: "indexGetter", path: path });
+	              return;
+	            }
+	          } else if (parentPath.node.property.name === "length") {
+	            state.candidates.push({ cause: "lengthGetter", path: path });
+	            return;
+	          }
+	        }
+	      }
+
+	      if (state.offset === 0 && parentPath.isSpreadElement()) {
+	        var call = parentPath.parentPath;
+	        if (call.isCallExpression() && call.node.arguments.length === 1) {
+	          state.candidates.push({ cause: "argSpread", path: path });
+	          return;
+	        }
+	      }
+
+	      state.references.push(path);
+	    }
+	  },
+	  BindingIdentifier: function BindingIdentifier(_ref, state) {
+	    var node = _ref.node;
+
+	    if (node.name === state.name) {
+	      state.deopted = true;
+	    }
+	  }
+	};
+	function hasRest(node) {
+	  return t.isRestElement(node.params[node.params.length - 1]);
+	}
+
+	function optimiseIndexGetter(path, argsId, offset) {
+	  var index = void 0;
+
+	  if (t.isNumericLiteral(path.parent.property)) {
+	    index = t.numericLiteral(path.parent.property.value + offset);
+	  } else if (offset === 0) {
+	    index = path.parent.property;
+	  } else {
+	    index = t.binaryExpression("+", path.parent.property, t.numericLiteral(offset));
+	  }
+
+	  var scope = path.scope;
+
+	  if (!scope.isPure(index)) {
+	    var temp = scope.generateUidIdentifierBasedOnNode(index);
+	    scope.push({ id: temp, kind: "var" });
+	    path.parentPath.replaceWith(restIndexImpure({
+	      ARGUMENTS: argsId,
+	      INDEX: index,
+	      REF: temp
+	    }));
+	  } else {
+	    path.parentPath.replaceWith(restIndex({
+	      ARGUMENTS: argsId,
+	      INDEX: index
+	    }));
+	  }
+	}
+
+	function optimiseLengthGetter(path, argsId, offset) {
+	  if (offset) {
+	    path.parentPath.replaceWith(restLength({
+	      ARGUMENTS: argsId,
+	      OFFSET: t.numericLiteral(offset)
+	    }));
+	  } else {
+	    path.replaceWith(argsId);
+	  }
+	}
+
+	var visitor = exports.visitor = {
+	  Function: function Function(path) {
+	    var node = path.node,
+	        scope = path.scope;
+
+	    if (!hasRest(node)) return;
+
+	    var rest = node.params.pop().argument;
+
+	    var argsId = t.identifier("arguments");
+
+	    argsId._shadowedFunctionLiteral = path;
+
+	    var state = {
+	      references: [],
+	      offset: node.params.length,
+
+	      argumentsNode: argsId,
+	      outerBinding: scope.getBindingIdentifier(rest.name),
+
+	      candidates: [],
+
+	      name: rest.name,
+
+	      deopted: false
+	    };
+
+	    path.traverse(memberExpressionOptimisationVisitor, state);
+
+	    if (!state.deopted && !state.references.length) {
+	      for (var _iterator = state.candidates, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	        var _ref3;
+
+	        if (_isArray) {
+	          if (_i >= _iterator.length) break;
+	          _ref3 = _iterator[_i++];
+	        } else {
+	          _i = _iterator.next();
+	          if (_i.done) break;
+	          _ref3 = _i.value;
+	        }
+
+	        var _ref4 = _ref3;
+	        var _path = _ref4.path,
+	            cause = _ref4.cause;
+
+	        switch (cause) {
+	          case "indexGetter":
+	            optimiseIndexGetter(_path, argsId, state.offset);
+	            break;
+	          case "lengthGetter":
+	            optimiseLengthGetter(_path, argsId, state.offset);
+	            break;
+	          default:
+	            _path.replaceWith(argsId);
+	        }
+	      }
+	      return;
+	    }
+
+	    state.references = state.references.concat(state.candidates.map(function (_ref5) {
+	      var path = _ref5.path;
+	      return path;
+	    }));
+
+	    state.deopted = state.deopted || !!node.shadow;
+
+	    var start = t.numericLiteral(node.params.length);
+	    var key = scope.generateUidIdentifier("key");
+	    var len = scope.generateUidIdentifier("len");
+
+	    var arrKey = key;
+	    var arrLen = len;
+	    if (node.params.length) {
+	      arrKey = t.binaryExpression("-", key, start);
+
+	      arrLen = t.conditionalExpression(t.binaryExpression(">", len, start), t.binaryExpression("-", len, start), t.numericLiteral(0));
+	    }
+
+	    var loop = buildRest({
+	      ARGUMENTS: argsId,
+	      ARRAY_KEY: arrKey,
+	      ARRAY_LEN: arrLen,
+	      START: start,
+	      ARRAY: rest,
+	      KEY: key,
+	      LEN: len
+	    });
+
+	    if (state.deopted) {
+	      loop._blockHoist = node.params.length + 1;
+	      node.body.body.unshift(loop);
+	    } else {
+	      loop._blockHoist = 1;
+
+	      var target = path.getEarliestCommonAncestorFrom(state.references).getStatementParent();
+
+	      target.findParent(function (path) {
+	        if (path.isLoop()) {
+	          target = path;
+	        } else {
+	          return path.isFunction();
+	        }
+	      });
+
+	      target.insertBefore(loop);
+	    }
+	  }
+	};
+
+/***/ }),
+/* 332 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  return {
+	    visitor: {
+	      MemberExpression: {
+	        exit: function exit(_ref2) {
+	          var node = _ref2.node;
+
+	          var prop = node.property;
+	          if (!node.computed && t.isIdentifier(prop) && !t.isValidIdentifier(prop.name)) {
+	            node.property = t.stringLiteral(prop.name);
+	            node.computed = true;
+	          }
+	        }
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 333 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  return {
+	    visitor: {
+	      ObjectProperty: {
+	        exit: function exit(_ref2) {
+	          var node = _ref2.node;
+
+	          var key = node.key;
+	          if (!node.computed && t.isIdentifier(key) && !t.isValidIdentifier(key.name)) {
+	            node.key = t.stringLiteral(key.name);
+	          }
+	        }
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 334 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  return {
+	    visitor: {
+	      ObjectExpression: function ObjectExpression(path, file) {
+	        var node = path.node;
+
+	        var hasAny = false;
+	        for (var _iterator = node.properties, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	          var _ref2;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref2 = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref2 = _i.value;
+	          }
+
+	          var prop = _ref2;
+
+	          if (prop.kind === "get" || prop.kind === "set") {
+	            hasAny = true;
+	            break;
+	          }
+	        }
+	        if (!hasAny) return;
+
+	        var mutatorMap = {};
+
+	        node.properties = node.properties.filter(function (prop) {
+	          if (!prop.computed && (prop.kind === "get" || prop.kind === "set")) {
+	            defineMap.push(mutatorMap, prop, null, file);
+	            return false;
+	          } else {
+	            return true;
+	          }
+	        });
+
+	        path.replaceWith(t.callExpression(t.memberExpression(t.identifier("Object"), t.identifier("defineProperties")), [node, defineMap.toDefineObject(mutatorMap)]));
+	      }
+	    }
+	  };
+	};
+
+	var _babelHelperDefineMap = __webpack_require__(184);
+
+	var defineMap = _interopRequireWildcard(_babelHelperDefineMap);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 335 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var parse = _ref.parse,
+	      traverse = _ref.traverse;
+
+	  return {
+	    visitor: {
+	      CallExpression: function CallExpression(path) {
+	        if (path.get("callee").isIdentifier({ name: "eval" }) && path.node.arguments.length === 1) {
+	          var evaluate = path.get("arguments")[0].evaluate();
+	          if (!evaluate.confident) return;
+
+	          var code = evaluate.value;
+	          if (typeof code !== "string") return;
+
+	          var ast = parse(code);
+	          traverse.removeProperties(ast);
+	          return ast.program;
+	        }
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 336 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function wrapInFlowComment(path, parent) {
+	    path.addComment("trailing", generateComment(path, parent));
+	    path.replaceWith(t.noop());
+	  }
+
+	  function generateComment(path, parent) {
+	    var comment = path.getSource().replace(/\*-\//g, "*-ESCAPED/").replace(/\*\//g, "*-/");
+	    if (parent && parent.optional) comment = "?" + comment;
+	    if (comment[0] !== ":") comment = ":: " + comment;
+	    return comment;
+	  }
+
+	  return {
+	    inherits: __webpack_require__(125),
+
+	    visitor: {
+	      TypeCastExpression: function TypeCastExpression(path) {
+	        var node = path.node;
+
+	        path.get("expression").addComment("trailing", generateComment(path.get("typeAnnotation")));
+	        path.replaceWith(t.parenthesizedExpression(node.expression));
+	      },
+	      Identifier: function Identifier(path) {
+	        var node = path.node;
+
+	        if (!node.optional || node.typeAnnotation) {
+	          return;
+	        }
+	        path.addComment("trailing", ":: ?");
+	      },
+
+	      AssignmentPattern: {
+	        exit: function exit(_ref2) {
+	          var node = _ref2.node;
+
+	          node.left.optional = false;
+	        }
+	      },
+
+	      Function: {
+	        exit: function exit(_ref3) {
+	          var node = _ref3.node;
+
+	          node.params.forEach(function (param) {
+	            return param.optional = false;
+	          });
+	        }
+	      },
+
+	      ClassProperty: function ClassProperty(path) {
+	        var node = path.node,
+	            parent = path.parent;
+
+	        if (!node.value) wrapInFlowComment(path, parent);
+	      },
+	      "ExportNamedDeclaration|Flow": function ExportNamedDeclarationFlow(path) {
+	        var node = path.node,
+	            parent = path.parent;
+
+	        if (t.isExportNamedDeclaration(node) && !t.isFlow(node.declaration)) {
+	          return;
+	        }
+	        wrapInFlowComment(path, parent);
+	      },
+	      ImportDeclaration: function ImportDeclaration(path) {
+	        var node = path.node,
+	            parent = path.parent;
+
+	        if (t.isImportDeclaration(node) && node.importKind !== "type" && node.importKind !== "typeof") {
+	          return;
+	        }
+	        wrapInFlowComment(path, parent);
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 337 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  return {
+	    visitor: {
+	      FunctionExpression: {
+	        exit: function exit(path) {
+	          var node = path.node;
+
+	          if (!node.id) return;
+	          node._ignoreUserWhitespace = true;
+
+	          path.replaceWith(t.callExpression(t.functionExpression(null, [], t.blockStatement([t.toStatement(node), t.returnStatement(node.id)])), []));
+	        }
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 338 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    visitor: {
+	      CallExpression: function CallExpression(path, file) {
+	        if (path.get("callee").matchesPattern("Object.assign")) {
+	          path.node.callee = file.addHelper("extends");
+	        }
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 339 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return {
+	    visitor: {
+	      CallExpression: function CallExpression(path, file) {
+	        if (path.get("callee").matchesPattern("Object.setPrototypeOf")) {
+	          path.node.callee = file.addHelper("defaults");
+	        }
+	      }
+	    }
+	  };
+	};
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 340 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function isProtoKey(node) {
+	    return t.isLiteral(t.toComputedKey(node, node.key), { value: "__proto__" });
+	  }
+
+	  function isProtoAssignmentExpression(node) {
+	    var left = node.left;
+	    return t.isMemberExpression(left) && t.isLiteral(t.toComputedKey(left, left.property), { value: "__proto__" });
+	  }
+
+	  function buildDefaultsCallExpression(expr, ref, file) {
+	    return t.expressionStatement(t.callExpression(file.addHelper("defaults"), [ref, expr.right]));
+	  }
+
+	  return {
+	    visitor: {
+	      AssignmentExpression: function AssignmentExpression(path, file) {
+	        if (!isProtoAssignmentExpression(path.node)) return;
+
+	        var nodes = [];
+	        var left = path.node.left.object;
+	        var temp = path.scope.maybeGenerateMemoised(left);
+
+	        if (temp) nodes.push(t.expressionStatement(t.assignmentExpression("=", temp, left)));
+	        nodes.push(buildDefaultsCallExpression(path.node, temp || left, file));
+	        if (temp) nodes.push(temp);
+
+	        path.replaceWithMultiple(nodes);
+	      },
+	      ExpressionStatement: function ExpressionStatement(path, file) {
+	        var expr = path.node.expression;
+	        if (!t.isAssignmentExpression(expr, { operator: "=" })) return;
+
+	        if (isProtoAssignmentExpression(expr)) {
+	          path.replaceWith(buildDefaultsCallExpression(expr, expr.left.object, file));
+	        }
+	      },
+	      ObjectExpression: function ObjectExpression(path, file) {
+	        var proto = void 0;
+	        var node = path.node;
+
+	        for (var _iterator = node.properties, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	          var _ref2;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref2 = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref2 = _i.value;
+	          }
+
+	          var prop = _ref2;
+
+	          if (isProtoKey(prop)) {
+	            proto = prop.value;
+	            (0, _pull2.default)(node.properties, prop);
+	          }
+	        }
+
+	        if (proto) {
+	          var args = [t.objectExpression([]), proto];
+	          if (node.properties.length) args.push(node);
+	          path.replaceWith(t.callExpression(file.addHelper("extends"), args));
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _pull = __webpack_require__(272);
+
+	var _pull2 = _interopRequireDefault(_pull);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 341 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  var immutabilityVisitor = {
+	    enter: function enter(path, state) {
+	      var stop = function stop() {
+	        state.isImmutable = false;
+	        path.stop();
+	      };
+
+	      if (path.isJSXClosingElement()) {
+	        path.skip();
+	        return;
+	      }
+
+	      if (path.isJSXIdentifier({ name: "ref" }) && path.parentPath.isJSXAttribute({ name: path.node })) {
+	        return stop();
+	      }
+
+	      if (path.isJSXIdentifier() || path.isIdentifier() || path.isJSXMemberExpression()) {
+	        return;
+	      }
+
+	      if (!path.isImmutable()) {
+	        if (path.isPure()) {
+	          var expressionResult = path.evaluate();
+	          if (expressionResult.confident) {
+	            var value = expressionResult.value;
+
+	            var isMutable = value && (typeof value === "undefined" ? "undefined" : (0, _typeof3.default)(value)) === "object" || typeof value === "function";
+	            if (!isMutable) {
+	              return;
+	            }
+	          } else if (t.isIdentifier(expressionResult.deopt)) {
+	            return;
+	          }
+	        }
+	        stop();
+	      }
+	    }
+	  };
+
+	  return {
+	    visitor: {
+	      JSXElement: function JSXElement(path) {
+	        if (path.node._hoisted) return;
+
+	        var state = { isImmutable: true };
+	        path.traverse(immutabilityVisitor, state);
+
+	        if (state.isImmutable) {
+	          path.hoist();
+	        } else {
+	          path.node._hoisted = true;
+	        }
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 342 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function hasRefOrSpread(attrs) {
+	    for (var i = 0; i < attrs.length; i++) {
+	      var attr = attrs[i];
+	      if (t.isJSXSpreadAttribute(attr)) return true;
+	      if (isJSXAttributeOfName(attr, "ref")) return true;
+	    }
+	    return false;
+	  }
+
+	  function isJSXAttributeOfName(attr, name) {
+	    return t.isJSXAttribute(attr) && t.isJSXIdentifier(attr.name, { name: name });
+	  }
+
+	  function getAttributeValue(attr) {
+	    var value = attr.value;
+	    if (!value) return t.identifier("true");
+	    if (t.isJSXExpressionContainer(value)) value = value.expression;
+	    return value;
+	  }
+
+	  return {
+	    visitor: {
+	      JSXElement: function JSXElement(path, file) {
+	        var node = path.node;
+
+	        var open = node.openingElement;
+	        if (hasRefOrSpread(open.attributes)) return;
+
+	        var props = t.objectExpression([]);
+	        var key = null;
+	        var type = open.name;
+
+	        if (t.isJSXIdentifier(type) && t.react.isCompatTag(type.name)) {
+	          type = t.stringLiteral(type.name);
+	        }
+
+	        function pushProp(objProps, key, value) {
+	          objProps.push(t.objectProperty(key, value));
+	        }
+
+	        for (var _iterator = open.attributes, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	          var _ref2;
+
+	          if (_isArray) {
+	            if (_i >= _iterator.length) break;
+	            _ref2 = _iterator[_i++];
+	          } else {
+	            _i = _iterator.next();
+	            if (_i.done) break;
+	            _ref2 = _i.value;
+	          }
+
+	          var attr = _ref2;
+
+	          if (isJSXAttributeOfName(attr, "key")) {
+	            key = getAttributeValue(attr);
+	          } else {
+	            var name = attr.name.name;
+	            var propertyKey = t.isValidIdentifier(name) ? t.identifier(name) : t.stringLiteral(name);
+	            pushProp(props.properties, propertyKey, getAttributeValue(attr));
+	          }
+	        }
+
+	        var args = [type, props];
+	        if (key || node.children.length) {
+	          var children = t.react.buildChildren(node);
+	          args.push.apply(args, [key || t.unaryExpression("void", t.numericLiteral(0), true)].concat(children));
+	        }
+
+	        var el = t.callExpression(file.addHelper("jsx"), args);
+	        path.replaceWith(el);
+	      }
+	    }
+	  };
+	};
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 343 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  return {
+	    manipulateOptions: function manipulateOptions(opts, parserOpts) {
+	      parserOpts.plugins.push("jsx");
+	    },
+
+	    visitor: (0, _babelHelperBuilderReactJsx2.default)({
+	      pre: function pre(state) {
+	        state.callee = state.tagExpr;
+	      },
+	      post: function post(state) {
+	        if (t.react.isCompatTag(state.tagName)) {
+	          state.call = t.callExpression(t.memberExpression(t.memberExpression(t.identifier("React"), t.identifier("DOM")), state.tagExpr, t.isLiteral(state.tagExpr)), state.args);
+	        }
+	      }
+	    })
+	  };
+	};
+
+	var _babelHelperBuilderReactJsx = __webpack_require__(344);
+
+	var _babelHelperBuilderReactJsx2 = _interopRequireDefault(_babelHelperBuilderReactJsx);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 344 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (opts) {
+	  var visitor = {};
+
+	  visitor.JSXNamespacedName = function (path) {
+	    throw path.buildCodeFrameError("Namespace tags are not supported. ReactJSX is not XML.");
+	  };
+
+	  visitor.JSXElement = {
+	    exit: function exit(path, file) {
+	      var callExpr = buildElementCall(path.get("openingElement"), file);
+
+	      callExpr.arguments = callExpr.arguments.concat(path.node.children);
+
+	      if (callExpr.arguments.length >= 3) {
+	        callExpr._prettyCall = true;
+	      }
+
+	      path.replaceWith(t.inherits(callExpr, path.node));
+	    }
+	  };
+
+	  return visitor;
+
+	  function convertJSXIdentifier(node, parent) {
+	    if (t.isJSXIdentifier(node)) {
+	      if (node.name === "this" && t.isReferenced(node, parent)) {
+	        return t.thisExpression();
+	      } else if (_esutils2.default.keyword.isIdentifierNameES6(node.name)) {
+	        node.type = "Identifier";
+	      } else {
+	        return t.stringLiteral(node.name);
+	      }
+	    } else if (t.isJSXMemberExpression(node)) {
+	      return t.memberExpression(convertJSXIdentifier(node.object, node), convertJSXIdentifier(node.property, node));
+	    }
+
+	    return node;
+	  }
+
+	  function convertAttributeValue(node) {
+	    if (t.isJSXExpressionContainer(node)) {
+	      return node.expression;
+	    } else {
+	      return node;
+	    }
+	  }
+
+	  function convertAttribute(node) {
+	    var value = convertAttributeValue(node.value || t.booleanLiteral(true));
+
+	    if (t.isStringLiteral(value) && !t.isJSXExpressionContainer(node.value)) {
+	      value.value = value.value.replace(/\n\s+/g, " ");
+	    }
+
+	    if (t.isValidIdentifier(node.name.name)) {
+	      node.name.type = "Identifier";
+	    } else {
+	      node.name = t.stringLiteral(node.name.name);
+	    }
+
+	    return t.inherits(t.objectProperty(node.name, value), node);
+	  }
+
+	  function buildElementCall(path, file) {
+	    path.parent.children = t.react.buildChildren(path.parent);
+
+	    var tagExpr = convertJSXIdentifier(path.node.name, path.node);
+	    var args = [];
+
+	    var tagName = void 0;
+	    if (t.isIdentifier(tagExpr)) {
+	      tagName = tagExpr.name;
+	    } else if (t.isLiteral(tagExpr)) {
+	      tagName = tagExpr.value;
+	    }
+
+	    var state = {
+	      tagExpr: tagExpr,
+	      tagName: tagName,
+	      args: args
+	    };
+
+	    if (opts.pre) {
+	      opts.pre(state, file);
+	    }
+
+	    var attribs = path.node.attributes;
+	    if (attribs.length) {
+	      attribs = buildOpeningElementAttributes(attribs, file);
+	    } else {
+	      attribs = t.nullLiteral();
+	    }
+
+	    args.push(attribs);
+
+	    if (opts.post) {
+	      opts.post(state, file);
+	    }
+
+	    return state.call || t.callExpression(state.callee, args);
+	  }
+
+	  function buildOpeningElementAttributes(attribs, file) {
+	    var _props = [];
+	    var objs = [];
+
+	    var useBuiltIns = file.opts.useBuiltIns || false;
+	    if (typeof useBuiltIns !== "boolean") {
+	      throw new Error("transform-react-jsx currently only accepts a boolean option for " + "useBuiltIns (defaults to false)");
+	    }
+
+	    function pushProps() {
+	      if (!_props.length) return;
+
+	      objs.push(t.objectExpression(_props));
+	      _props = [];
+	    }
+
+	    while (attribs.length) {
+	      var prop = attribs.shift();
+	      if (t.isJSXSpreadAttribute(prop)) {
+	        pushProps();
+	        objs.push(prop.argument);
+	      } else {
+	        _props.push(convertAttribute(prop));
+	      }
+	    }
+
+	    pushProps();
+
+	    if (objs.length === 1) {
+	      attribs = objs[0];
+	    } else {
+	      if (!t.isObjectExpression(objs[0])) {
+	        objs.unshift(t.objectExpression([]));
+	      }
+
+	      var helper = useBuiltIns ? t.memberExpression(t.identifier("Object"), t.identifier("assign")) : file.addHelper("extends");
+
+	      attribs = t.callExpression(helper, objs);
+	    }
+
+	    return attribs;
+	  }
+	};
+
+	var _esutils = __webpack_require__(97);
+
+	var _esutils2 = _interopRequireDefault(_esutils);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 345 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  var visitor = {
+	    JSXOpeningElement: function JSXOpeningElement(_ref2) {
+	      var node = _ref2.node;
+
+	      var id = t.jSXIdentifier(TRACE_ID);
+	      var trace = t.thisExpression();
+
+	      node.attributes.push(t.jSXAttribute(id, t.jSXExpressionContainer(trace)));
+	    }
+	  };
+
+	  return {
+	    visitor: visitor
+	  };
+	};
+
+	var TRACE_ID = "__self";
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 346 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function makeTrace(fileNameIdentifier, lineNumber) {
+	    var fileLineLiteral = lineNumber != null ? t.numericLiteral(lineNumber) : t.nullLiteral();
+	    var fileNameProperty = t.objectProperty(t.identifier("fileName"), fileNameIdentifier);
+	    var lineNumberProperty = t.objectProperty(t.identifier("lineNumber"), fileLineLiteral);
+	    return t.objectExpression([fileNameProperty, lineNumberProperty]);
+	  }
+
+	  var visitor = {
+	    JSXOpeningElement: function JSXOpeningElement(path, state) {
+	      var id = t.jSXIdentifier(TRACE_ID);
+	      var location = path.container.openingElement.loc;
+	      if (!location) {
+	        return;
+	      }
+
+	      var attributes = path.container.openingElement.attributes;
+	      for (var i = 0; i < attributes.length; i++) {
+	        var name = attributes[i].name;
+	        if (name && name.name === TRACE_ID) {
+	          return;
+	        }
+	      }
+
+	      if (!state.fileNameIdentifier) {
+	        var fileName = state.file.log.filename !== "unknown" ? state.file.log.filename : null;
+
+	        var fileNameIdentifier = path.scope.generateUidIdentifier(FILE_NAME_VAR);
+	        path.hub.file.scope.push({ id: fileNameIdentifier, init: t.stringLiteral(fileName) });
+	        state.fileNameIdentifier = fileNameIdentifier;
+	      }
+
+	      var trace = makeTrace(state.fileNameIdentifier, location.start.line);
+	      attributes.push(t.jSXAttribute(id, t.jSXExpressionContainer(trace)));
+	    }
+	  };
+
+	  return {
+	    visitor: visitor
+	  };
+	};
+
+	var TRACE_ID = "__source";
+	var FILE_NAME_VAR = "_jsxFileName";
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 347 */
+344,
+/* 348 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = {
+	  builtins: {
+	    Symbol: "symbol",
+	    Promise: "promise",
+	    Map: "map",
+	    WeakMap: "weak-map",
+	    Set: "set",
+	    WeakSet: "weak-set",
+	    Observable: "observable",
+	    setImmediate: "set-immediate",
+	    clearImmediate: "clear-immediate",
+	    asap: "asap"
+	  },
+
+	  methods: {
+	    Array: {
+	      concat: "array/concat",
+	      copyWithin: "array/copy-within",
+	      entries: "array/entries",
+	      every: "array/every",
+	      fill: "array/fill",
+	      filter: "array/filter",
+	      findIndex: "array/find-index",
+	      find: "array/find",
+	      forEach: "array/for-each",
+	      from: "array/from",
+	      includes: "array/includes",
+	      indexOf: "array/index-of",
+
+	      join: "array/join",
+	      keys: "array/keys",
+	      lastIndexOf: "array/last-index-of",
+	      map: "array/map",
+	      of: "array/of",
+	      pop: "array/pop",
+	      push: "array/push",
+	      reduceRight: "array/reduce-right",
+	      reduce: "array/reduce",
+	      reverse: "array/reverse",
+	      shift: "array/shift",
+	      slice: "array/slice",
+	      some: "array/some",
+	      sort: "array/sort",
+	      splice: "array/splice",
+	      unshift: "array/unshift",
+	      values: "array/values"
+	    },
+
+	    JSON: {
+	      stringify: "json/stringify"
+	    },
+
+	    Object: {
+	      assign: "object/assign",
+	      create: "object/create",
+	      defineProperties: "object/define-properties",
+	      defineProperty: "object/define-property",
+	      entries: "object/entries",
+	      freeze: "object/freeze",
+	      getOwnPropertyDescriptor: "object/get-own-property-descriptor",
+	      getOwnPropertyDescriptors: "object/get-own-property-descriptors",
+	      getOwnPropertyNames: "object/get-own-property-names",
+	      getOwnPropertySymbols: "object/get-own-property-symbols",
+	      getPrototypeOf: "object/get-prototype-of",
+	      isExtensible: "object/is-extensible",
+	      isFrozen: "object/is-frozen",
+	      isSealed: "object/is-sealed",
+	      is: "object/is",
+	      keys: "object/keys",
+	      preventExtensions: "object/prevent-extensions",
+	      seal: "object/seal",
+	      setPrototypeOf: "object/set-prototype-of",
+	      values: "object/values"
+	    },
+
+	    RegExp: {
+	      escape: "regexp/escape" },
+
+	    Math: {
+	      acosh: "math/acosh",
+	      asinh: "math/asinh",
+	      atanh: "math/atanh",
+	      cbrt: "math/cbrt",
+	      clz32: "math/clz32",
+	      cosh: "math/cosh",
+	      expm1: "math/expm1",
+	      fround: "math/fround",
+	      hypot: "math/hypot",
+	      imul: "math/imul",
+	      log10: "math/log10",
+	      log1p: "math/log1p",
+	      log2: "math/log2",
+	      sign: "math/sign",
+	      sinh: "math/sinh",
+	      tanh: "math/tanh",
+	      trunc: "math/trunc",
+	      iaddh: "math/iaddh",
+	      isubh: "math/isubh",
+	      imulh: "math/imulh",
+	      umulh: "math/umulh"
+	    },
+
+	    Symbol: {
+	      for: "symbol/for",
+	      hasInstance: "symbol/has-instance",
+	      isConcatSpreadable: "symbol/is-concat-spreadable",
+	      iterator: "symbol/iterator",
+	      keyFor: "symbol/key-for",
+	      match: "symbol/match",
+	      replace: "symbol/replace",
+	      search: "symbol/search",
+	      species: "symbol/species",
+	      split: "symbol/split",
+	      toPrimitive: "symbol/to-primitive",
+	      toStringTag: "symbol/to-string-tag",
+	      unscopables: "symbol/unscopables"
+	    },
+
+	    String: {
+	      at: "string/at",
+	      codePointAt: "string/code-point-at",
+	      endsWith: "string/ends-with",
+	      fromCodePoint: "string/from-code-point",
+	      includes: "string/includes",
+	      matchAll: "string/match-all",
+	      padLeft: "string/pad-left",
+	      padRight: "string/pad-right",
+	      padStart: "string/pad-start",
+	      padEnd: "string/pad-end",
+	      raw: "string/raw",
+	      repeat: "string/repeat",
+	      startsWith: "string/starts-with",
+	      trim: "string/trim",
+	      trimLeft: "string/trim-left",
+	      trimRight: "string/trim-right",
+	      trimStart: "string/trim-start",
+	      trimEnd: "string/trim-end"
+	    },
+
+	    Number: {
+	      EPSILON: "number/epsilon",
+	      isFinite: "number/is-finite",
+	      isInteger: "number/is-integer",
+	      isNaN: "number/is-nan",
+	      isSafeInteger: "number/is-safe-integer",
+	      MAX_SAFE_INTEGER: "number/max-safe-integer",
+	      MIN_SAFE_INTEGER: "number/min-safe-integer",
+	      parseFloat: "number/parse-float",
+	      parseInt: "number/parse-int"
+	    },
+
+	    Reflect: {
+	      apply: "reflect/apply",
+	      construct: "reflect/construct",
+	      defineProperty: "reflect/define-property",
+	      deleteProperty: "reflect/delete-property",
+	      enumerate: "reflect/enumerate",
+	      getOwnPropertyDescriptor: "reflect/get-own-property-descriptor",
+	      getPrototypeOf: "reflect/get-prototype-of",
+	      get: "reflect/get",
+	      has: "reflect/has",
+	      isExtensible: "reflect/is-extensible",
+	      ownKeys: "reflect/own-keys",
+	      preventExtensions: "reflect/prevent-extensions",
+	      setPrototypeOf: "reflect/set-prototype-of",
+	      set: "reflect/set",
+	      defineMetadata: "reflect/define-metadata",
+	      deleteMetadata: "reflect/delete-metadata",
+	      getMetadata: "reflect/get-metadata",
+	      getMetadataKeys: "reflect/get-metadata-keys",
+	      getOwnMetadata: "reflect/get-own-metadata",
+	      getOwnMetadataKeys: "reflect/get-own-metadata-keys",
+	      hasMetadata: "reflect/has-metadata",
+	      hasOwnMetadata: "reflect/has-own-metadata",
+	      metadata: "reflect/metadata"
+	    },
+
+	    System: {
+	      global: "system/global"
+	    },
+
+	    Error: {
+	      isError: "error/is-error" },
+
+	    Date: {},
+
+	    Function: {}
+	  }
+	};
+
+/***/ }),
+/* 349 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.definitions = undefined;
+
+	exports.default = function (_ref) {
+	  var t = _ref.types;
+
+	  function getRuntimeModuleName(opts) {
+	    return opts.moduleName || "babel-runtime";
+	  }
+
+	  function has(obj, key) {
+	    return Object.prototype.hasOwnProperty.call(obj, key);
+	  }
+
+	  var HELPER_BLACKLIST = ["interopRequireWildcard", "interopRequireDefault"];
+
+	  return {
+	    pre: function pre(file) {
+	      var moduleName = getRuntimeModuleName(this.opts);
+
+	      if (this.opts.helpers !== false) {
+	        file.set("helperGenerator", function (name) {
+	          if (HELPER_BLACKLIST.indexOf(name) < 0) {
+	            return file.addImport(moduleName + "/helpers/" + name, "default", name);
+	          }
+	        });
+	      }
+
+	      this.setDynamic("regeneratorIdentifier", function () {
+	        return file.addImport(moduleName + "/regenerator", "default", "regeneratorRuntime");
+	      });
+	    },
+
+	    visitor: {
+	      ReferencedIdentifier: function ReferencedIdentifier(path, state) {
+	        var node = path.node,
+	            parent = path.parent,
+	            scope = path.scope;
+
+	        if (node.name === "regeneratorRuntime" && state.opts.regenerator !== false) {
+	          path.replaceWith(state.get("regeneratorIdentifier"));
+	          return;
+	        }
+
+	        if (state.opts.polyfill === false) return;
+
+	        if (t.isMemberExpression(parent)) return;
+	        if (!has(_definitions2.default.builtins, node.name)) return;
+	        if (scope.getBindingIdentifier(node.name)) return;
+
+	        var moduleName = getRuntimeModuleName(state.opts);
+	        path.replaceWith(state.addImport(moduleName + "/core-js/" + _definitions2.default.builtins[node.name], "default", node.name));
+	      },
+	      CallExpression: function CallExpression(path, state) {
+	        if (state.opts.polyfill === false) return;
+
+	        if (path.node.arguments.length) return;
+
+	        var callee = path.node.callee;
+	        if (!t.isMemberExpression(callee)) return;
+	        if (!callee.computed) return;
+	        if (!path.get("callee.property").matchesPattern("Symbol.iterator")) return;
+
+	        var moduleName = getRuntimeModuleName(state.opts);
+	        path.replaceWith(t.callExpression(state.addImport(moduleName + "/core-js/get-iterator", "default", "getIterator"), [callee.object]));
+	      },
+	      BinaryExpression: function BinaryExpression(path, state) {
+	        if (state.opts.polyfill === false) return;
+
+	        if (path.node.operator !== "in") return;
+	        if (!path.get("left").matchesPattern("Symbol.iterator")) return;
+
+	        var moduleName = getRuntimeModuleName(state.opts);
+	        path.replaceWith(t.callExpression(state.addImport(moduleName + "/core-js/is-iterable", "default", "isIterable"), [path.node.right]));
+	      },
+
+	      MemberExpression: {
+	        enter: function enter(path, state) {
+	          if (state.opts.polyfill === false) return;
+	          if (!path.isReferenced()) return;
+
+	          var node = path.node;
+
+	          var obj = node.object;
+	          var prop = node.property;
+
+	          if (!t.isReferenced(obj, node)) return;
+	          if (node.computed) return;
+	          if (!has(_definitions2.default.methods, obj.name)) return;
+
+	          var methods = _definitions2.default.methods[obj.name];
+	          if (!has(methods, prop.name)) return;
+
+	          if (path.scope.getBindingIdentifier(obj.name)) return;
+
+	          if (obj.name === "Object" && prop.name === "defineProperty" && path.parentPath.isCallExpression()) {
+	            var call = path.parentPath.node;
+	            if (call.arguments.length === 3 && t.isLiteral(call.arguments[1])) return;
+	          }
+
+	          var moduleName = getRuntimeModuleName(state.opts);
+	          path.replaceWith(state.addImport(moduleName + "/core-js/" + methods[prop.name], "default", obj.name + "$" + prop.name));
+	        },
+	        exit: function exit(path, state) {
+	          if (state.opts.polyfill === false) return;
+	          if (!path.isReferenced()) return;
+
+	          var node = path.node;
+
+	          var obj = node.object;
+
+	          if (!has(_definitions2.default.builtins, obj.name)) return;
+	          if (path.scope.getBindingIdentifier(obj.name)) return;
+
+	          var moduleName = getRuntimeModuleName(state.opts);
+	          path.replaceWith(t.memberExpression(state.addImport(moduleName + "/core-js/" + _definitions2.default.builtins[obj.name], "default", obj.name), node.property, node.computed));
+	        }
+	      }
+	    }
+	  };
+	};
+
+	var _definitions = __webpack_require__(348);
+
+	var _definitions2 = _interopRequireDefault(_definitions);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.definitions = _definitions2.default;
+
+/***/ }),
+/* 350 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (_ref) {
+	  var messages = _ref.messages;
+
+	  return {
+	    visitor: {
+	      ReferencedIdentifier: function ReferencedIdentifier(path) {
+	        var node = path.node,
+	            scope = path.scope;
+
+	        var binding = scope.getBinding(node.name);
+	        if (binding && binding.kind === "type" && !path.parentPath.isFlow()) {
+	          throw path.buildCodeFrameError(messages.get("undeclaredVariableType", node.name), ReferenceError);
+	        }
+
+	        if (scope.hasBinding(node.name)) return;
+
+	        var bindings = scope.getAllBindings();
+
+	        var closest = void 0;
+	        var shortest = -1;
+
+	        for (var name in bindings) {
+	          var distance = (0, _leven2.default)(node.name, name);
+	          if (distance <= 0 || distance > 3) continue;
+	          if (distance <= shortest) continue;
+
+	          closest = name;
+	          shortest = distance;
+	        }
+
+	        var msg = void 0;
+	        if (closest) {
+	          msg = messages.get("undeclaredVariableSuggestion", node.name, closest);
+	        } else {
+	          msg = messages.get("undeclaredVariable", node.name);
+	        }
+
+	        throw path.buildCodeFrameError(msg, ReferenceError);
+	      }
+	    }
+	  };
+	};
+
+	var _leven = __webpack_require__(462);
+
+	var _leven2 = _interopRequireDefault(_leven);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 351 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _babelPluginTransformFlowStripTypes = __webpack_require__(207);
+
+	var _babelPluginTransformFlowStripTypes2 = _interopRequireDefault(_babelPluginTransformFlowStripTypes);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = {
+	  plugins: [_babelPluginTransformFlowStripTypes2.default]
+	};
+	module.exports = exports["default"];
+
+/***/ }),
+/* 352 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (context) {
+	  var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+	  return {
+	    presets: [opts.es2015 !== false && [_babelPresetEs2.default.buildPreset, opts.es2015], opts.es2016 !== false && _babelPresetEs4.default, opts.es2017 !== false && _babelPresetEs6.default].filter(Boolean) };
+	};
+
+	var _babelPresetEs = __webpack_require__(213);
+
+	var _babelPresetEs2 = _interopRequireDefault(_babelPresetEs);
+
+	var _babelPresetEs3 = __webpack_require__(214);
+
+	var _babelPresetEs4 = _interopRequireDefault(_babelPresetEs3);
+
+	var _babelPresetEs5 = __webpack_require__(215);
+
+	var _babelPresetEs6 = _interopRequireDefault(_babelPresetEs5);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	module.exports = exports["default"];
+
+/***/ }),
+/* 353 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _babelPresetFlow = __webpack_require__(351);
+
+	var _babelPresetFlow2 = _interopRequireDefault(_babelPresetFlow);
+
+	var _babelPluginTransformReactJsx = __webpack_require__(211);
+
+	var _babelPluginTransformReactJsx2 = _interopRequireDefault(_babelPluginTransformReactJsx);
+
+	var _babelPluginSyntaxJsx = __webpack_require__(126);
+
+	var _babelPluginSyntaxJsx2 = _interopRequireDefault(_babelPluginSyntaxJsx);
+
+	var _babelPluginTransformReactDisplayName = __webpack_require__(210);
+
+	var _babelPluginTransformReactDisplayName2 = _interopRequireDefault(_babelPluginTransformReactDisplayName);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = {
+	  presets: [_babelPresetFlow2.default],
+	  plugins: [_babelPluginTransformReactJsx2.default, _babelPluginSyntaxJsx2.default, _babelPluginTransformReactDisplayName2.default],
+	  env: {
+	    development: {
+	      plugins: []
+	    }
+	  }
+	};
+	module.exports = exports["default"];
+
+/***/ }),
+/* 354 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _babelPresetStage = __webpack_require__(216);
+
+	var _babelPresetStage2 = _interopRequireDefault(_babelPresetStage);
+
+	var _babelPluginTransformDoExpressions = __webpack_require__(202);
+
+	var _babelPluginTransformDoExpressions2 = _interopRequireDefault(_babelPluginTransformDoExpressions);
+
+	var _babelPluginTransformFunctionBind = __webpack_require__(208);
+
+	var _babelPluginTransformFunctionBind2 = _interopRequireDefault(_babelPluginTransformFunctionBind);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	exports.default = {
+	  presets: [_babelPresetStage2.default],
+	  plugins: [_babelPluginTransformDoExpressions2.default, _babelPluginTransformFunctionBind2.default]
+	};
+	module.exports = exports["default"];
+
+/***/ }),
+/* 355 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(403), __esModule: true };
+
+/***/ }),
+/* 356 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(406), __esModule: true };
+
+/***/ }),
+/* 357 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(408), __esModule: true };
+
+/***/ }),
+/* 358 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(409), __esModule: true };
+
+/***/ }),
+/* 359 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(411), __esModule: true };
+
+/***/ }),
+/* 360 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(412), __esModule: true };
+
+/***/ }),
+/* 361 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	module.exports = { "default": __webpack_require__(413), __esModule: true };
+
+/***/ }),
+/* 362 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function (obj, keys) {
+	  var target = {};
+
+	  for (var i in obj) {
+	    if (keys.indexOf(i) >= 0) continue;
+	    if (!Object.prototype.hasOwnProperty.call(obj, i)) continue;
+	    target[i] = obj[i];
+	  }
+
+	  return target;
+	};
+
+/***/ }),
+/* 363 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _path2 = __webpack_require__(35);
+
+	var _path3 = _interopRequireDefault(_path2);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var testing = ("production") === "test";
+
+	var TraversalContext = function () {
+	  function TraversalContext(scope, opts, state, parentPath) {
+	    (0, _classCallCheck3.default)(this, TraversalContext);
+	    this.queue = null;
+
+	    this.parentPath = parentPath;
+	    this.scope = scope;
+	    this.state = state;
+	    this.opts = opts;
+	  }
+
+	  TraversalContext.prototype.shouldVisit = function shouldVisit(node) {
+	    var opts = this.opts;
+	    if (opts.enter || opts.exit) return true;
+
+	    if (opts[node.type]) return true;
+
+	    var keys = t.VISITOR_KEYS[node.type];
+	    if (!keys || !keys.length) return false;
+
+	    for (var _iterator = keys, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var key = _ref;
+
+	      if (node[key]) return true;
+	    }
+
+	    return false;
+	  };
+
+	  TraversalContext.prototype.create = function create(node, obj, key, listKey) {
+	    return _path3.default.get({
+	      parentPath: this.parentPath,
+	      parent: node,
+	      container: obj,
+	      key: key,
+	      listKey: listKey
+	    });
+	  };
+
+	  TraversalContext.prototype.maybeQueue = function maybeQueue(path, notPriority) {
+	    if (this.trap) {
+	      throw new Error("Infinite cycle detected");
+	    }
+
+	    if (this.queue) {
+	      if (notPriority) {
+	        this.queue.push(path);
+	      } else {
+	        this.priorityQueue.push(path);
+	      }
+	    }
+	  };
+
+	  TraversalContext.prototype.visitMultiple = function visitMultiple(container, parent, listKey) {
+	    if (container.length === 0) return false;
+
+	    var queue = [];
+
+	    for (var key = 0; key < container.length; key++) {
+	      var node = container[key];
+	      if (node && this.shouldVisit(node)) {
+	        queue.push(this.create(parent, container, key, listKey));
+	      }
+	    }
+
+	    return this.visitQueue(queue);
+	  };
+
+	  TraversalContext.prototype.visitSingle = function visitSingle(node, key) {
+	    if (this.shouldVisit(node[key])) {
+	      return this.visitQueue([this.create(node, node, key)]);
+	    } else {
+	      return false;
+	    }
+	  };
+
+	  TraversalContext.prototype.visitQueue = function visitQueue(queue) {
+	    this.queue = queue;
+	    this.priorityQueue = [];
+
+	    var visited = [];
+	    var stop = false;
+
+	    for (var _iterator2 = queue, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var path = _ref2;
+
+	      path.resync();
+
+	      if (path.contexts.length === 0 || path.contexts[path.contexts.length - 1] !== this) {
+	        path.pushContext(this);
+	      }
+
+	      if (path.key === null) continue;
+
+	      if (testing && queue.length >= 10000) {
+	        this.trap = true;
+	      }
+
+	      if (visited.indexOf(path.node) >= 0) continue;
+	      visited.push(path.node);
+
+	      if (path.visit()) {
+	        stop = true;
+	        break;
+	      }
+
+	      if (this.priorityQueue.length) {
+	        stop = this.visitQueue(this.priorityQueue);
+	        this.priorityQueue = [];
+	        this.queue = queue;
+	        if (stop) break;
+	      }
+	    }
+
+	    for (var _iterator3 = queue, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	      var _ref3;
+
+	      if (_isArray3) {
+	        if (_i3 >= _iterator3.length) break;
+	        _ref3 = _iterator3[_i3++];
+	      } else {
+	        _i3 = _iterator3.next();
+	        if (_i3.done) break;
+	        _ref3 = _i3.value;
+	      }
+
+	      var _path = _ref3;
+
+	      _path.popContext();
+	    }
+
+	    this.queue = null;
+
+	    return stop;
+	  };
+
+	  TraversalContext.prototype.visit = function visit(node, key) {
+	    var nodes = node[key];
+	    if (!nodes) return false;
+
+	    if (Array.isArray(nodes)) {
+	      return this.visitMultiple(nodes, node, key);
+	    } else {
+	      return this.visitSingle(node, key);
+	    }
+	  };
+
+	  return TraversalContext;
+	}();
+
+	exports.default = TraversalContext;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 364 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.findParent = findParent;
+	exports.find = find;
+	exports.getFunctionParent = getFunctionParent;
+	exports.getStatementParent = getStatementParent;
+	exports.getEarliestCommonAncestorFrom = getEarliestCommonAncestorFrom;
+	exports.getDeepestCommonAncestorFrom = getDeepestCommonAncestorFrom;
+	exports.getAncestry = getAncestry;
+	exports.isAncestor = isAncestor;
+	exports.isDescendant = isDescendant;
+	exports.inType = inType;
+	exports.inShadow = inShadow;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _index = __webpack_require__(35);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function findParent(callback) {
+	  var path = this;
+	  while (path = path.parentPath) {
+	    if (callback(path)) return path;
+	  }
+	  return null;
+	}
+
+	function find(callback) {
+	  var path = this;
+	  do {
+	    if (callback(path)) return path;
+	  } while (path = path.parentPath);
+	  return null;
+	}
+
+	function getFunctionParent() {
+	  return this.findParent(function (path) {
+	    return path.isFunction() || path.isProgram();
+	  });
+	}
+
+	function getStatementParent() {
+	  var path = this;
+	  do {
+	    if (Array.isArray(path.container)) {
+	      return path;
+	    }
+	  } while (path = path.parentPath);
+	}
+
+	function getEarliestCommonAncestorFrom(paths) {
+	  return this.getDeepestCommonAncestorFrom(paths, function (deepest, i, ancestries) {
+	    var earliest = void 0;
+	    var keys = t.VISITOR_KEYS[deepest.type];
+
+	    for (var _iterator = ancestries, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var ancestry = _ref;
+
+	      var path = ancestry[i + 1];
+
+	      if (!earliest) {
+	        earliest = path;
+	        continue;
+	      }
+
+	      if (path.listKey && earliest.listKey === path.listKey) {
+	        if (path.key < earliest.key) {
+	          earliest = path;
+	          continue;
+	        }
+	      }
+
+	      var earliestKeyIndex = keys.indexOf(earliest.parentKey);
+	      var currentKeyIndex = keys.indexOf(path.parentKey);
+	      if (earliestKeyIndex > currentKeyIndex) {
+	        earliest = path;
+	      }
+	    }
+
+	    return earliest;
+	  });
+	}
+
+	function getDeepestCommonAncestorFrom(paths, filter) {
+	  var _this = this;
+
+	  if (!paths.length) {
+	    return this;
+	  }
+
+	  if (paths.length === 1) {
+	    return paths[0];
+	  }
+
+	  var minDepth = Infinity;
+
+	  var lastCommonIndex = void 0,
+	      lastCommon = void 0;
+
+	  var ancestries = paths.map(function (path) {
+	    var ancestry = [];
+
+	    do {
+	      ancestry.unshift(path);
+	    } while ((path = path.parentPath) && path !== _this);
+
+	    if (ancestry.length < minDepth) {
+	      minDepth = ancestry.length;
+	    }
+
+	    return ancestry;
+	  });
+
+	  var first = ancestries[0];
+
+	  depthLoop: for (var i = 0; i < minDepth; i++) {
+	    var shouldMatch = first[i];
+
+	    for (var _iterator2 = ancestries, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var ancestry = _ref2;
+
+	      if (ancestry[i] !== shouldMatch) {
+	        break depthLoop;
+	      }
+	    }
+
+	    lastCommonIndex = i;
+	    lastCommon = shouldMatch;
+	  }
+
+	  if (lastCommon) {
+	    if (filter) {
+	      return filter(lastCommon, lastCommonIndex, ancestries);
+	    } else {
+	      return lastCommon;
+	    }
+	  } else {
+	    throw new Error("Couldn't find intersection");
+	  }
+	}
+
+	function getAncestry() {
+	  var path = this;
+	  var paths = [];
+	  do {
+	    paths.push(path);
+	  } while (path = path.parentPath);
+	  return paths;
+	}
+
+	function isAncestor(maybeDescendant) {
+	  return maybeDescendant.isDescendant(this);
+	}
+
+	function isDescendant(maybeAncestor) {
+	  return !!this.findParent(function (parent) {
+	    return parent === maybeAncestor;
+	  });
+	}
+
+	function inType() {
+	  var path = this;
+	  while (path) {
+	    for (var _iterator3 = arguments, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	      var _ref3;
+
+	      if (_isArray3) {
+	        if (_i3 >= _iterator3.length) break;
+	        _ref3 = _iterator3[_i3++];
+	      } else {
+	        _i3 = _iterator3.next();
+	        if (_i3.done) break;
+	        _ref3 = _i3.value;
+	      }
+
+	      var type = _ref3;
+
+	      if (path.node.type === type) return true;
+	    }
+	    path = path.parentPath;
+	  }
+
+	  return false;
+	}
+
+	function inShadow(key) {
+	  var parentFn = this.isFunction() ? this : this.findParent(function (p) {
+	    return p.isFunction();
+	  });
+	  if (!parentFn) return;
+
+	  if (parentFn.isFunctionExpression() || parentFn.isFunctionDeclaration()) {
+	    var shadow = parentFn.node.shadow;
+
+	    if (shadow && (!key || shadow[key] !== false)) {
+	      return parentFn;
+	    }
+	  } else if (parentFn.isArrowFunctionExpression()) {
+	    return parentFn;
+	  }
+
+	  return null;
+	}
+
+/***/ }),
+/* 365 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.shareCommentsWithSiblings = shareCommentsWithSiblings;
+	exports.addComment = addComment;
+	exports.addComments = addComments;
+	function shareCommentsWithSiblings() {
+	  if (typeof this.key === "string") return;
+
+	  var node = this.node;
+	  if (!node) return;
+
+	  var trailing = node.trailingComments;
+	  var leading = node.leadingComments;
+	  if (!trailing && !leading) return;
+
+	  var prev = this.getSibling(this.key - 1);
+	  var next = this.getSibling(this.key + 1);
+
+	  if (!prev.node) prev = next;
+	  if (!next.node) next = prev;
+
+	  prev.addComments("trailing", leading);
+	  next.addComments("leading", trailing);
+	}
+
+	function addComment(type, content, line) {
+	  this.addComments(type, [{
+	    type: line ? "CommentLine" : "CommentBlock",
+	    value: content
+	  }]);
+	}
+
+	function addComments(type, comments) {
+	  if (!comments) return;
+
+	  var node = this.node;
+	  if (!node) return;
+
+	  var key = type + "Comments";
+
+	  if (node[key]) {
+	    node[key] = node[key].concat(comments);
+	  } else {
+	    node[key] = comments;
+	  }
+	}
+
+/***/ }),
+/* 366 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.call = call;
+	exports._call = _call;
+	exports.isBlacklisted = isBlacklisted;
+	exports.visit = visit;
+	exports.skip = skip;
+	exports.skipKey = skipKey;
+	exports.stop = stop;
+	exports.setScope = setScope;
+	exports.setContext = setContext;
+	exports.resync = resync;
+	exports._resyncParent = _resyncParent;
+	exports._resyncKey = _resyncKey;
+	exports._resyncList = _resyncList;
+	exports._resyncRemoved = _resyncRemoved;
+	exports.popContext = popContext;
+	exports.pushContext = pushContext;
+	exports.setup = setup;
+	exports.setKey = setKey;
+	exports.requeue = requeue;
+	exports._getQueueContexts = _getQueueContexts;
+
+	var _index = __webpack_require__(7);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function call(key) {
+	  var opts = this.opts;
+
+	  this.debug(function () {
+	    return key;
+	  });
+
+	  if (this.node) {
+	    if (this._call(opts[key])) return true;
+	  }
+
+	  if (this.node) {
+	    return this._call(opts[this.node.type] && opts[this.node.type][key]);
+	  }
+
+	  return false;
+	}
+
+	function _call(fns) {
+	  if (!fns) return false;
+
+	  for (var _iterator = fns, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var fn = _ref;
+
+	    if (!fn) continue;
+
+	    var node = this.node;
+	    if (!node) return true;
+
+	    var ret = fn.call(this.state, this, this.state);
+	    if (ret) throw new Error("Unexpected return value from visitor method " + fn);
+
+	    if (this.node !== node) return true;
+
+	    if (this.shouldStop || this.shouldSkip || this.removed) return true;
+	  }
+
+	  return false;
+	}
+
+	function isBlacklisted() {
+	  var blacklist = this.opts.blacklist;
+	  return blacklist && blacklist.indexOf(this.node.type) > -1;
+	}
+
+	function visit() {
+	  if (!this.node) {
+	    return false;
+	  }
+
+	  if (this.isBlacklisted()) {
+	    return false;
+	  }
+
+	  if (this.opts.shouldSkip && this.opts.shouldSkip(this)) {
+	    return false;
+	  }
+
+	  if (this.call("enter") || this.shouldSkip) {
+	    this.debug(function () {
+	      return "Skip...";
+	    });
+	    return this.shouldStop;
+	  }
+
+	  this.debug(function () {
+	    return "Recursing into...";
+	  });
+	  _index2.default.node(this.node, this.opts, this.scope, this.state, this, this.skipKeys);
+
+	  this.call("exit");
+
+	  return this.shouldStop;
+	}
+
+	function skip() {
+	  this.shouldSkip = true;
+	}
+
+	function skipKey(key) {
+	  this.skipKeys[key] = true;
+	}
+
+	function stop() {
+	  this.shouldStop = true;
+	  this.shouldSkip = true;
+	}
+
+	function setScope() {
+	  if (this.opts && this.opts.noScope) return;
+
+	  var target = this.context && this.context.scope;
+
+	  if (!target) {
+	    var path = this.parentPath;
+	    while (path && !target) {
+	      if (path.opts && path.opts.noScope) return;
+
+	      target = path.scope;
+	      path = path.parentPath;
+	    }
+	  }
+
+	  this.scope = this.getScope(target);
+	  if (this.scope) this.scope.init();
+	}
+
+	function setContext(context) {
+	  this.shouldSkip = false;
+	  this.shouldStop = false;
+	  this.removed = false;
+	  this.skipKeys = {};
+
+	  if (context) {
+	    this.context = context;
+	    this.state = context.state;
+	    this.opts = context.opts;
+	  }
+
+	  this.setScope();
+
+	  return this;
+	}
+
+	function resync() {
+	  if (this.removed) return;
+
+	  this._resyncParent();
+	  this._resyncList();
+	  this._resyncKey();
+	}
+
+	function _resyncParent() {
+	  if (this.parentPath) {
+	    this.parent = this.parentPath.node;
+	  }
+	}
+
+	function _resyncKey() {
+	  if (!this.container) return;
+
+	  if (this.node === this.container[this.key]) return;
+
+	  if (Array.isArray(this.container)) {
+	    for (var i = 0; i < this.container.length; i++) {
+	      if (this.container[i] === this.node) {
+	        return this.setKey(i);
+	      }
+	    }
+	  } else {
+	    for (var key in this.container) {
+	      if (this.container[key] === this.node) {
+	        return this.setKey(key);
+	      }
+	    }
+	  }
+
+	  this.key = null;
+	}
+
+	function _resyncList() {
+	  if (!this.parent || !this.inList) return;
+
+	  var newContainer = this.parent[this.listKey];
+	  if (this.container === newContainer) return;
+
+	  this.container = newContainer || null;
+	}
+
+	function _resyncRemoved() {
+	  if (this.key == null || !this.container || this.container[this.key] !== this.node) {
+	    this._markRemoved();
+	  }
+	}
+
+	function popContext() {
+	  this.contexts.pop();
+	  this.setContext(this.contexts[this.contexts.length - 1]);
+	}
+
+	function pushContext(context) {
+	  this.contexts.push(context);
+	  this.setContext(context);
+	}
+
+	function setup(parentPath, container, listKey, key) {
+	  this.inList = !!listKey;
+	  this.listKey = listKey;
+	  this.parentKey = listKey || key;
+	  this.container = container;
+
+	  this.parentPath = parentPath || this.parentPath;
+	  this.setKey(key);
+	}
+
+	function setKey(key) {
+	  this.key = key;
+	  this.node = this.container[this.key];
+	  this.type = this.node && this.node.type;
+	}
+
+	function requeue() {
+	  var pathToQueue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this;
+
+	  if (pathToQueue.removed) return;
+
+	  var contexts = this.contexts;
+
+	  for (var _iterator2 = contexts, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	    var _ref2;
+
+	    if (_isArray2) {
+	      if (_i2 >= _iterator2.length) break;
+	      _ref2 = _iterator2[_i2++];
+	    } else {
+	      _i2 = _iterator2.next();
+	      if (_i2.done) break;
+	      _ref2 = _i2.value;
+	    }
+
+	    var context = _ref2;
+
+	    context.maybeQueue(pathToQueue);
+	  }
+	}
+
+	function _getQueueContexts() {
+	  var path = this;
+	  var contexts = this.contexts;
+	  while (!contexts.length) {
+	    path = path.parentPath;
+	    contexts = path.contexts;
+	  }
+	  return contexts;
+	}
+
+/***/ }),
+/* 367 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.toComputedKey = toComputedKey;
+	exports.ensureBlock = ensureBlock;
+	exports.arrowFunctionToShadowed = arrowFunctionToShadowed;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function toComputedKey() {
+	  var node = this.node;
+
+	  var key = void 0;
+	  if (this.isMemberExpression()) {
+	    key = node.property;
+	  } else if (this.isProperty() || this.isMethod()) {
+	    key = node.key;
+	  } else {
+	    throw new ReferenceError("todo");
+	  }
+
+	  if (!node.computed) {
+	    if (t.isIdentifier(key)) key = t.stringLiteral(key.name);
+	  }
+
+	  return key;
+	}
+
+	function ensureBlock() {
+	  return t.ensureBlock(this.node);
+	}
+
+	function arrowFunctionToShadowed() {
+	  if (!this.isArrowFunctionExpression()) return;
+
+	  this.ensureBlock();
+
+	  var node = this.node;
+
+	  node.expression = false;
+	  node.type = "FunctionExpression";
+	  node.shadow = node.shadow || true;
+	}
+
+/***/ }),
+/* 368 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(global) {"use strict";
+
+	exports.__esModule = true;
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _map = __webpack_require__(132);
+
+	var _map2 = _interopRequireDefault(_map);
+
+	exports.evaluateTruthy = evaluateTruthy;
+	exports.evaluate = evaluate;
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var VALID_CALLEES = ["String", "Number", "Math"];
+	var INVALID_METHODS = ["random"];
+
+	function evaluateTruthy() {
+	  var res = this.evaluate();
+	  if (res.confident) return !!res.value;
+	}
+
+	function evaluate() {
+	  var confident = true;
+	  var deoptPath = void 0;
+	  var seen = new _map2.default();
+
+	  function deopt(path) {
+	    if (!confident) return;
+	    deoptPath = path;
+	    confident = false;
+	  }
+
+	  var value = evaluate(this);
+	  if (!confident) value = undefined;
+	  return {
+	    confident: confident,
+	    deopt: deoptPath,
+	    value: value
+	  };
+
+	  function evaluate(path) {
+	    var node = path.node;
+
+	    if (seen.has(node)) {
+	      var existing = seen.get(node);
+	      if (existing.resolved) {
+	        return existing.value;
+	      } else {
+	        deopt(path);
+	        return;
+	      }
+	    } else {
+	      var item = { resolved: false };
+	      seen.set(node, item);
+
+	      var val = _evaluate(path);
+	      if (confident) {
+	        item.resolved = true;
+	        item.value = val;
+	      }
+	      return val;
+	    }
+	  }
+
+	  function _evaluate(path) {
+	    if (!confident) return;
+
+	    var node = path.node;
+
+	    if (path.isSequenceExpression()) {
+	      var exprs = path.get("expressions");
+	      return evaluate(exprs[exprs.length - 1]);
+	    }
+
+	    if (path.isStringLiteral() || path.isNumericLiteral() || path.isBooleanLiteral()) {
+	      return node.value;
+	    }
+
+	    if (path.isNullLiteral()) {
+	      return null;
+	    }
+
+	    if (path.isTemplateLiteral()) {
+	      var str = "";
+
+	      var i = 0;
+	      var _exprs = path.get("expressions");
+
+	      for (var _iterator = node.quasis, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	        var _ref;
+
+	        if (_isArray) {
+	          if (_i >= _iterator.length) break;
+	          _ref = _iterator[_i++];
+	        } else {
+	          _i = _iterator.next();
+	          if (_i.done) break;
+	          _ref = _i.value;
+	        }
+
+	        var elem = _ref;
+
+	        if (!confident) break;
+
+	        str += elem.value.cooked;
+
+	        var expr = _exprs[i++];
+	        if (expr) str += String(evaluate(expr));
+	      }
+
+	      if (!confident) return;
+	      return str;
+	    }
+
+	    if (path.isConditionalExpression()) {
+	      var testResult = evaluate(path.get("test"));
+	      if (!confident) return;
+	      if (testResult) {
+	        return evaluate(path.get("consequent"));
+	      } else {
+	        return evaluate(path.get("alternate"));
+	      }
+	    }
+
+	    if (path.isExpressionWrapper()) {
+	      return evaluate(path.get("expression"));
+	    }
+
+	    if (path.isMemberExpression() && !path.parentPath.isCallExpression({ callee: node })) {
+	      var property = path.get("property");
+	      var object = path.get("object");
+
+	      if (object.isLiteral() && property.isIdentifier()) {
+	        var _value = object.node.value;
+	        var type = typeof _value === "undefined" ? "undefined" : (0, _typeof3.default)(_value);
+	        if (type === "number" || type === "string") {
+	          return _value[property.node.name];
+	        }
+	      }
+	    }
+
+	    if (path.isReferencedIdentifier()) {
+	      var binding = path.scope.getBinding(node.name);
+
+	      if (binding && binding.constantViolations.length > 0) {
+	        return deopt(binding.path);
+	      }
+
+	      if (binding && path.node.start < binding.path.node.end) {
+	        return deopt(binding.path);
+	      }
+
+	      if (binding && binding.hasValue) {
+	        return binding.value;
+	      } else {
+	        if (node.name === "undefined") {
+	          return binding ? deopt(binding.path) : undefined;
+	        } else if (node.name === "Infinity") {
+	          return binding ? deopt(binding.path) : Infinity;
+	        } else if (node.name === "NaN") {
+	          return binding ? deopt(binding.path) : NaN;
+	        }
+
+	        var resolved = path.resolve();
+	        if (resolved === path) {
+	          return deopt(path);
+	        } else {
+	          return evaluate(resolved);
+	        }
+	      }
+	    }
+
+	    if (path.isUnaryExpression({ prefix: true })) {
+	      if (node.operator === "void") {
+	        return undefined;
+	      }
+
+	      var argument = path.get("argument");
+	      if (node.operator === "typeof" && (argument.isFunction() || argument.isClass())) {
+	        return "function";
+	      }
+
+	      var arg = evaluate(argument);
+	      if (!confident) return;
+	      switch (node.operator) {
+	        case "!":
+	          return !arg;
+	        case "+":
+	          return +arg;
+	        case "-":
+	          return -arg;
+	        case "~":
+	          return ~arg;
+	        case "typeof":
+	          return typeof arg === "undefined" ? "undefined" : (0, _typeof3.default)(arg);
+	      }
+	    }
+
+	    if (path.isArrayExpression()) {
+	      var arr = [];
+	      var elems = path.get("elements");
+	      for (var _iterator2 = elems, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	        var _ref2;
+
+	        if (_isArray2) {
+	          if (_i2 >= _iterator2.length) break;
+	          _ref2 = _iterator2[_i2++];
+	        } else {
+	          _i2 = _iterator2.next();
+	          if (_i2.done) break;
+	          _ref2 = _i2.value;
+	        }
+
+	        var _elem = _ref2;
+
+	        _elem = _elem.evaluate();
+
+	        if (_elem.confident) {
+	          arr.push(_elem.value);
+	        } else {
+	          return deopt(_elem);
+	        }
+	      }
+	      return arr;
+	    }
+
+	    if (path.isObjectExpression()) {
+	      var obj = {};
+	      var props = path.get("properties");
+	      for (var _iterator3 = props, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	        var _ref3;
+
+	        if (_isArray3) {
+	          if (_i3 >= _iterator3.length) break;
+	          _ref3 = _iterator3[_i3++];
+	        } else {
+	          _i3 = _iterator3.next();
+	          if (_i3.done) break;
+	          _ref3 = _i3.value;
+	        }
+
+	        var prop = _ref3;
+
+	        if (prop.isObjectMethod() || prop.isSpreadProperty()) {
+	          return deopt(prop);
+	        }
+	        var keyPath = prop.get("key");
+	        var key = keyPath;
+	        if (prop.node.computed) {
+	          key = key.evaluate();
+	          if (!key.confident) {
+	            return deopt(keyPath);
+	          }
+	          key = key.value;
+	        } else if (key.isIdentifier()) {
+	          key = key.node.name;
+	        } else {
+	          key = key.node.value;
+	        }
+	        var valuePath = prop.get("value");
+	        var _value2 = valuePath.evaluate();
+	        if (!_value2.confident) {
+	          return deopt(valuePath);
+	        }
+	        _value2 = _value2.value;
+	        obj[key] = _value2;
+	      }
+	      return obj;
+	    }
+
+	    if (path.isLogicalExpression()) {
+	      var wasConfident = confident;
+	      var left = evaluate(path.get("left"));
+	      var leftConfident = confident;
+	      confident = wasConfident;
+	      var right = evaluate(path.get("right"));
+	      var rightConfident = confident;
+	      confident = leftConfident && rightConfident;
+
+	      switch (node.operator) {
+	        case "||":
+	          if (left && leftConfident) {
+	            confident = true;
+	            return left;
+	          }
+
+	          if (!confident) return;
+
+	          return left || right;
+	        case "&&":
+	          if (!left && leftConfident || !right && rightConfident) {
+	            confident = true;
+	          }
+
+	          if (!confident) return;
+
+	          return left && right;
+	      }
+	    }
+
+	    if (path.isBinaryExpression()) {
+	      var _left = evaluate(path.get("left"));
+	      if (!confident) return;
+	      var _right = evaluate(path.get("right"));
+	      if (!confident) return;
+
+	      switch (node.operator) {
+	        case "-":
+	          return _left - _right;
+	        case "+":
+	          return _left + _right;
+	        case "/":
+	          return _left / _right;
+	        case "*":
+	          return _left * _right;
+	        case "%":
+	          return _left % _right;
+	        case "**":
+	          return Math.pow(_left, _right);
+	        case "<":
+	          return _left < _right;
+	        case ">":
+	          return _left > _right;
+	        case "<=":
+	          return _left <= _right;
+	        case ">=":
+	          return _left >= _right;
+	        case "==":
+	          return _left == _right;
+	        case "!=":
+	          return _left != _right;
+	        case "===":
+	          return _left === _right;
+	        case "!==":
+	          return _left !== _right;
+	        case "|":
+	          return _left | _right;
+	        case "&":
+	          return _left & _right;
+	        case "^":
+	          return _left ^ _right;
+	        case "<<":
+	          return _left << _right;
+	        case ">>":
+	          return _left >> _right;
+	        case ">>>":
+	          return _left >>> _right;
+	      }
+	    }
+
+	    if (path.isCallExpression()) {
+	      var callee = path.get("callee");
+	      var context = void 0;
+	      var func = void 0;
+
+	      if (callee.isIdentifier() && !path.scope.getBinding(callee.node.name, true) && VALID_CALLEES.indexOf(callee.node.name) >= 0) {
+	        func = global[node.callee.name];
+	      }
+
+	      if (callee.isMemberExpression()) {
+	        var _object = callee.get("object");
+	        var _property = callee.get("property");
+
+	        if (_object.isIdentifier() && _property.isIdentifier() && VALID_CALLEES.indexOf(_object.node.name) >= 0 && INVALID_METHODS.indexOf(_property.node.name) < 0) {
+	          context = global[_object.node.name];
+	          func = context[_property.node.name];
+	        }
+
+	        if (_object.isLiteral() && _property.isIdentifier()) {
+	          var _type = (0, _typeof3.default)(_object.node.value);
+	          if (_type === "string" || _type === "number") {
+	            context = _object.node.value;
+	            func = context[_property.node.name];
+	          }
+	        }
+	      }
+
+	      if (func) {
+	        var args = path.get("arguments").map(evaluate);
+	        if (!confident) return;
+
+	        return func.apply(context, args);
+	      }
+	    }
+
+	    deopt(path);
+	  }
+	}
+	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
+
+/***/ }),
+/* 369 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _create = __webpack_require__(9);
+
+	var _create2 = _interopRequireDefault(_create);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.getStatementParent = getStatementParent;
+	exports.getOpposite = getOpposite;
+	exports.getCompletionRecords = getCompletionRecords;
+	exports.getSibling = getSibling;
+	exports.getPrevSibling = getPrevSibling;
+	exports.getNextSibling = getNextSibling;
+	exports.getAllNextSiblings = getAllNextSiblings;
+	exports.getAllPrevSiblings = getAllPrevSiblings;
+	exports.get = get;
+	exports._getKey = _getKey;
+	exports._getPattern = _getPattern;
+	exports.getBindingIdentifiers = getBindingIdentifiers;
+	exports.getOuterBindingIdentifiers = getOuterBindingIdentifiers;
+	exports.getBindingIdentifierPaths = getBindingIdentifierPaths;
+	exports.getOuterBindingIdentifierPaths = getOuterBindingIdentifierPaths;
+
+	var _index = __webpack_require__(35);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function getStatementParent() {
+	  var path = this;
+
+	  do {
+	    if (!path.parentPath || Array.isArray(path.container) && path.isStatement()) {
+	      break;
+	    } else {
+	      path = path.parentPath;
+	    }
+	  } while (path);
+
+	  if (path && (path.isProgram() || path.isFile())) {
+	    throw new Error("File/Program node, we can't possibly find a statement parent to this");
+	  }
+
+	  return path;
+	}
+
+	function getOpposite() {
+	  if (this.key === "left") {
+	    return this.getSibling("right");
+	  } else if (this.key === "right") {
+	    return this.getSibling("left");
+	  }
+	}
+
+	function getCompletionRecords() {
+	  var paths = [];
+
+	  var add = function add(path) {
+	    if (path) paths = paths.concat(path.getCompletionRecords());
+	  };
+
+	  if (this.isIfStatement()) {
+	    add(this.get("consequent"));
+	    add(this.get("alternate"));
+	  } else if (this.isDoExpression() || this.isFor() || this.isWhile()) {
+	    add(this.get("body"));
+	  } else if (this.isProgram() || this.isBlockStatement()) {
+	    add(this.get("body").pop());
+	  } else if (this.isFunction()) {
+	    return this.get("body").getCompletionRecords();
+	  } else if (this.isTryStatement()) {
+	    add(this.get("block"));
+	    add(this.get("handler"));
+	    add(this.get("finalizer"));
+	  } else {
+	    paths.push(this);
+	  }
+
+	  return paths;
+	}
+
+	function getSibling(key) {
+	  return _index2.default.get({
+	    parentPath: this.parentPath,
+	    parent: this.parent,
+	    container: this.container,
+	    listKey: this.listKey,
+	    key: key
+	  });
+	}
+
+	function getPrevSibling() {
+	  return this.getSibling(this.key - 1);
+	}
+
+	function getNextSibling() {
+	  return this.getSibling(this.key + 1);
+	}
+
+	function getAllNextSiblings() {
+	  var _key = this.key;
+	  var sibling = this.getSibling(++_key);
+	  var siblings = [];
+	  while (sibling.node) {
+	    siblings.push(sibling);
+	    sibling = this.getSibling(++_key);
+	  }
+	  return siblings;
+	}
+
+	function getAllPrevSiblings() {
+	  var _key = this.key;
+	  var sibling = this.getSibling(--_key);
+	  var siblings = [];
+	  while (sibling.node) {
+	    siblings.push(sibling);
+	    sibling = this.getSibling(--_key);
+	  }
+	  return siblings;
+	}
+
+	function get(key, context) {
+	  if (context === true) context = this.context;
+	  var parts = key.split(".");
+	  if (parts.length === 1) {
+	    return this._getKey(key, context);
+	  } else {
+	    return this._getPattern(parts, context);
+	  }
+	}
+
+	function _getKey(key, context) {
+	  var _this = this;
+
+	  var node = this.node;
+	  var container = node[key];
+
+	  if (Array.isArray(container)) {
+	    return container.map(function (_, i) {
+	      return _index2.default.get({
+	        listKey: key,
+	        parentPath: _this,
+	        parent: node,
+	        container: container,
+	        key: i
+	      }).setContext(context);
+	    });
+	  } else {
+	    return _index2.default.get({
+	      parentPath: this,
+	      parent: node,
+	      container: node,
+	      key: key
+	    }).setContext(context);
+	  }
+	}
+
+	function _getPattern(parts, context) {
+	  var path = this;
+	  for (var _iterator = parts, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var part = _ref;
+
+	    if (part === ".") {
+	      path = path.parentPath;
+	    } else {
+	      if (Array.isArray(path)) {
+	        path = path[part];
+	      } else {
+	        path = path.get(part, context);
+	      }
+	    }
+	  }
+	  return path;
+	}
+
+	function getBindingIdentifiers(duplicates) {
+	  return t.getBindingIdentifiers(this.node, duplicates);
+	}
+
+	function getOuterBindingIdentifiers(duplicates) {
+	  return t.getOuterBindingIdentifiers(this.node, duplicates);
+	}
+
+	function getBindingIdentifierPaths() {
+	  var duplicates = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+	  var outerOnly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+	  var path = this;
+	  var search = [].concat(path);
+	  var ids = (0, _create2.default)(null);
+
+	  while (search.length) {
+	    var id = search.shift();
+	    if (!id) continue;
+	    if (!id.node) continue;
+
+	    var keys = t.getBindingIdentifiers.keys[id.node.type];
+
+	    if (id.isIdentifier()) {
+	      if (duplicates) {
+	        var _ids = ids[id.node.name] = ids[id.node.name] || [];
+	        _ids.push(id);
+	      } else {
+	        ids[id.node.name] = id;
+	      }
+	      continue;
+	    }
+
+	    if (id.isExportDeclaration()) {
+	      var declaration = id.get("declaration");
+	      if (declaration.isDeclaration()) {
+	        search.push(declaration);
+	      }
+	      continue;
+	    }
+
+	    if (outerOnly) {
+	      if (id.isFunctionDeclaration()) {
+	        search.push(id.get("id"));
+	        continue;
+	      }
+	      if (id.isFunctionExpression()) {
+	        continue;
+	      }
+	    }
+
+	    if (keys) {
+	      for (var i = 0; i < keys.length; i++) {
+	        var key = keys[i];
+	        var child = id.get(key);
+	        if (Array.isArray(child) || child.node) {
+	          search = search.concat(child);
+	        }
+	      }
+	    }
+	  }
+
+	  return ids;
+	}
+
+	function getOuterBindingIdentifierPaths(duplicates) {
+	  return this.getBindingIdentifierPaths(duplicates, true);
+	}
+
+/***/ }),
+/* 370 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.getTypeAnnotation = getTypeAnnotation;
+	exports._getTypeAnnotation = _getTypeAnnotation;
+	exports.isBaseType = isBaseType;
+	exports.couldBeBaseType = couldBeBaseType;
+	exports.baseTypeStrictlyMatches = baseTypeStrictlyMatches;
+	exports.isGenericType = isGenericType;
+
+	var _inferers = __webpack_require__(372);
+
+	var inferers = _interopRequireWildcard(_inferers);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function getTypeAnnotation() {
+	  if (this.typeAnnotation) return this.typeAnnotation;
+
+	  var type = this._getTypeAnnotation() || t.anyTypeAnnotation();
+	  if (t.isTypeAnnotation(type)) type = type.typeAnnotation;
+	  return this.typeAnnotation = type;
+	}
+
+	function _getTypeAnnotation() {
+	  var node = this.node;
+
+	  if (!node) {
+	    if (this.key === "init" && this.parentPath.isVariableDeclarator()) {
+	      var declar = this.parentPath.parentPath;
+	      var declarParent = declar.parentPath;
+
+	      if (declar.key === "left" && declarParent.isForInStatement()) {
+	        return t.stringTypeAnnotation();
+	      }
+
+	      if (declar.key === "left" && declarParent.isForOfStatement()) {
+	        return t.anyTypeAnnotation();
+	      }
+
+	      return t.voidTypeAnnotation();
+	    } else {
+	      return;
+	    }
+	  }
+
+	  if (node.typeAnnotation) {
+	    return node.typeAnnotation;
+	  }
+
+	  var inferer = inferers[node.type];
+	  if (inferer) {
+	    return inferer.call(this, node);
+	  }
+
+	  inferer = inferers[this.parentPath.type];
+	  if (inferer && inferer.validParent) {
+	    return this.parentPath.getTypeAnnotation();
+	  }
+	}
+
+	function isBaseType(baseName, soft) {
+	  return _isBaseType(baseName, this.getTypeAnnotation(), soft);
+	}
+
+	function _isBaseType(baseName, type, soft) {
+	  if (baseName === "string") {
+	    return t.isStringTypeAnnotation(type);
+	  } else if (baseName === "number") {
+	    return t.isNumberTypeAnnotation(type);
+	  } else if (baseName === "boolean") {
+	    return t.isBooleanTypeAnnotation(type);
+	  } else if (baseName === "any") {
+	    return t.isAnyTypeAnnotation(type);
+	  } else if (baseName === "mixed") {
+	    return t.isMixedTypeAnnotation(type);
+	  } else if (baseName === "empty") {
+	    return t.isEmptyTypeAnnotation(type);
+	  } else if (baseName === "void") {
+	    return t.isVoidTypeAnnotation(type);
+	  } else {
+	    if (soft) {
+	      return false;
+	    } else {
+	      throw new Error("Unknown base type " + baseName);
+	    }
+	  }
+	}
+
+	function couldBeBaseType(name) {
+	  var type = this.getTypeAnnotation();
+	  if (t.isAnyTypeAnnotation(type)) return true;
+
+	  if (t.isUnionTypeAnnotation(type)) {
+	    for (var _iterator = type.types, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var type2 = _ref;
+
+	      if (t.isAnyTypeAnnotation(type2) || _isBaseType(name, type2, true)) {
+	        return true;
+	      }
+	    }
+	    return false;
+	  } else {
+	    return _isBaseType(name, type, true);
+	  }
+	}
+
+	function baseTypeStrictlyMatches(right) {
+	  var left = this.getTypeAnnotation();
+	  right = right.getTypeAnnotation();
+
+	  if (!t.isAnyTypeAnnotation(left) && t.isFlowBaseAnnotation(left)) {
+	    return right.type === left.type;
+	  }
+	}
+
+	function isGenericType(genericName) {
+	  var type = this.getTypeAnnotation();
+	  return t.isGenericTypeAnnotation(type) && t.isIdentifier(type.id, { name: genericName });
+	}
+
+/***/ }),
+/* 371 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.default = function (node) {
+	  if (!this.isReferenced()) return;
+
+	  var binding = this.scope.getBinding(node.name);
+	  if (binding) {
+	    if (binding.identifier.typeAnnotation) {
+	      return binding.identifier.typeAnnotation;
+	    } else {
+	      return getTypeAnnotationBindingConstantViolations(this, node.name);
+	    }
+	  }
+
+	  if (node.name === "undefined") {
+	    return t.voidTypeAnnotation();
+	  } else if (node.name === "NaN" || node.name === "Infinity") {
+	    return t.numberTypeAnnotation();
+	  } else if (node.name === "arguments") {}
+	};
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function getTypeAnnotationBindingConstantViolations(path, name) {
+	  var binding = path.scope.getBinding(name);
+
+	  var types = [];
+	  path.typeAnnotation = t.unionTypeAnnotation(types);
+
+	  var functionConstantViolations = [];
+	  var constantViolations = getConstantViolationsBefore(binding, path, functionConstantViolations);
+
+	  var testType = getConditionalAnnotation(path, name);
+	  if (testType) {
+	    var testConstantViolations = getConstantViolationsBefore(binding, testType.ifStatement);
+
+	    constantViolations = constantViolations.filter(function (path) {
+	      return testConstantViolations.indexOf(path) < 0;
+	    });
+
+	    types.push(testType.typeAnnotation);
+	  }
+
+	  if (constantViolations.length) {
+	    constantViolations = constantViolations.concat(functionConstantViolations);
+
+	    for (var _iterator = constantViolations, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var violation = _ref;
+
+	      types.push(violation.getTypeAnnotation());
+	    }
+	  }
+
+	  if (types.length) {
+	    return t.createUnionTypeAnnotation(types);
+	  }
+	}
+
+	function getConstantViolationsBefore(binding, path, functions) {
+	  var violations = binding.constantViolations.slice();
+	  violations.unshift(binding.path);
+	  return violations.filter(function (violation) {
+	    violation = violation.resolve();
+	    var status = violation._guessExecutionStatusRelativeTo(path);
+	    if (functions && status === "function") functions.push(violation);
+	    return status === "before";
+	  });
+	}
+
+	function inferAnnotationFromBinaryExpression(name, path) {
+	  var operator = path.node.operator;
+
+	  var right = path.get("right").resolve();
+	  var left = path.get("left").resolve();
+
+	  var target = void 0;
+	  if (left.isIdentifier({ name: name })) {
+	    target = right;
+	  } else if (right.isIdentifier({ name: name })) {
+	    target = left;
+	  }
+	  if (target) {
+	    if (operator === "===") {
+	      return target.getTypeAnnotation();
+	    } else if (t.BOOLEAN_NUMBER_BINARY_OPERATORS.indexOf(operator) >= 0) {
+	      return t.numberTypeAnnotation();
+	    } else {
+	      return;
+	    }
+	  } else {
+	    if (operator !== "===") return;
+	  }
+
+	  var typeofPath = void 0;
+	  var typePath = void 0;
+	  if (left.isUnaryExpression({ operator: "typeof" })) {
+	    typeofPath = left;
+	    typePath = right;
+	  } else if (right.isUnaryExpression({ operator: "typeof" })) {
+	    typeofPath = right;
+	    typePath = left;
+	  }
+	  if (!typePath && !typeofPath) return;
+
+	  typePath = typePath.resolve();
+	  if (!typePath.isLiteral()) return;
+
+	  var typeValue = typePath.node.value;
+	  if (typeof typeValue !== "string") return;
+
+	  if (!typeofPath.get("argument").isIdentifier({ name: name })) return;
+
+	  return t.createTypeAnnotationBasedOnTypeof(typePath.node.value);
+	}
+
+	function getParentConditionalPath(path) {
+	  var parentPath = void 0;
+	  while (parentPath = path.parentPath) {
+	    if (parentPath.isIfStatement() || parentPath.isConditionalExpression()) {
+	      if (path.key === "test") {
+	        return;
+	      } else {
+	        return parentPath;
+	      }
+	    } else {
+	      path = parentPath;
+	    }
+	  }
+	}
+
+	function getConditionalAnnotation(path, name) {
+	  var ifStatement = getParentConditionalPath(path);
+	  if (!ifStatement) return;
+
+	  var test = ifStatement.get("test");
+	  var paths = [test];
+	  var types = [];
+
+	  do {
+	    var _path = paths.shift().resolve();
+
+	    if (_path.isLogicalExpression()) {
+	      paths.push(_path.get("left"));
+	      paths.push(_path.get("right"));
+	    }
+
+	    if (_path.isBinaryExpression()) {
+	      var type = inferAnnotationFromBinaryExpression(name, _path);
+	      if (type) types.push(type);
+	    }
+	  } while (paths.length);
+
+	  if (types.length) {
+	    return {
+	      typeAnnotation: t.createUnionTypeAnnotation(types),
+	      ifStatement: ifStatement
+	    };
+	  } else {
+	    return getConditionalAnnotation(ifStatement, name);
+	  }
+	}
+	module.exports = exports["default"];
+
+/***/ }),
+/* 372 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.ClassDeclaration = exports.ClassExpression = exports.FunctionDeclaration = exports.ArrowFunctionExpression = exports.FunctionExpression = exports.Identifier = undefined;
+
+	var _infererReference = __webpack_require__(371);
+
+	Object.defineProperty(exports, "Identifier", {
+	  enumerable: true,
+	  get: function get() {
+	    return _interopRequireDefault(_infererReference).default;
+	  }
+	});
+	exports.VariableDeclarator = VariableDeclarator;
+	exports.TypeCastExpression = TypeCastExpression;
+	exports.NewExpression = NewExpression;
+	exports.TemplateLiteral = TemplateLiteral;
+	exports.UnaryExpression = UnaryExpression;
+	exports.BinaryExpression = BinaryExpression;
+	exports.LogicalExpression = LogicalExpression;
+	exports.ConditionalExpression = ConditionalExpression;
+	exports.SequenceExpression = SequenceExpression;
+	exports.AssignmentExpression = AssignmentExpression;
+	exports.UpdateExpression = UpdateExpression;
+	exports.StringLiteral = StringLiteral;
+	exports.NumericLiteral = NumericLiteral;
+	exports.BooleanLiteral = BooleanLiteral;
+	exports.NullLiteral = NullLiteral;
+	exports.RegExpLiteral = RegExpLiteral;
+	exports.ObjectExpression = ObjectExpression;
+	exports.ArrayExpression = ArrayExpression;
+	exports.RestElement = RestElement;
+	exports.CallExpression = CallExpression;
+	exports.TaggedTemplateExpression = TaggedTemplateExpression;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function VariableDeclarator() {
+	  var id = this.get("id");
+
+	  if (id.isIdentifier()) {
+	    return this.get("init").getTypeAnnotation();
+	  } else {
+	    return;
+	  }
+	}
+
+	function TypeCastExpression(node) {
+	  return node.typeAnnotation;
+	}
+
+	TypeCastExpression.validParent = true;
+
+	function NewExpression(node) {
+	  if (this.get("callee").isIdentifier()) {
+	    return t.genericTypeAnnotation(node.callee);
+	  }
+	}
+
+	function TemplateLiteral() {
+	  return t.stringTypeAnnotation();
+	}
+
+	function UnaryExpression(node) {
+	  var operator = node.operator;
+
+	  if (operator === "void") {
+	    return t.voidTypeAnnotation();
+	  } else if (t.NUMBER_UNARY_OPERATORS.indexOf(operator) >= 0) {
+	    return t.numberTypeAnnotation();
+	  } else if (t.STRING_UNARY_OPERATORS.indexOf(operator) >= 0) {
+	    return t.stringTypeAnnotation();
+	  } else if (t.BOOLEAN_UNARY_OPERATORS.indexOf(operator) >= 0) {
+	    return t.booleanTypeAnnotation();
+	  }
+	}
+
+	function BinaryExpression(node) {
+	  var operator = node.operator;
+
+	  if (t.NUMBER_BINARY_OPERATORS.indexOf(operator) >= 0) {
+	    return t.numberTypeAnnotation();
+	  } else if (t.BOOLEAN_BINARY_OPERATORS.indexOf(operator) >= 0) {
+	    return t.booleanTypeAnnotation();
+	  } else if (operator === "+") {
+	    var right = this.get("right");
+	    var left = this.get("left");
+
+	    if (left.isBaseType("number") && right.isBaseType("number")) {
+	      return t.numberTypeAnnotation();
+	    } else if (left.isBaseType("string") || right.isBaseType("string")) {
+	      return t.stringTypeAnnotation();
+	    }
+
+	    return t.unionTypeAnnotation([t.stringTypeAnnotation(), t.numberTypeAnnotation()]);
+	  }
+	}
+
+	function LogicalExpression() {
+	  return t.createUnionTypeAnnotation([this.get("left").getTypeAnnotation(), this.get("right").getTypeAnnotation()]);
+	}
+
+	function ConditionalExpression() {
+	  return t.createUnionTypeAnnotation([this.get("consequent").getTypeAnnotation(), this.get("alternate").getTypeAnnotation()]);
+	}
+
+	function SequenceExpression() {
+	  return this.get("expressions").pop().getTypeAnnotation();
+	}
+
+	function AssignmentExpression() {
+	  return this.get("right").getTypeAnnotation();
+	}
+
+	function UpdateExpression(node) {
+	  var operator = node.operator;
+	  if (operator === "++" || operator === "--") {
+	    return t.numberTypeAnnotation();
+	  }
+	}
+
+	function StringLiteral() {
+	  return t.stringTypeAnnotation();
+	}
+
+	function NumericLiteral() {
+	  return t.numberTypeAnnotation();
+	}
+
+	function BooleanLiteral() {
+	  return t.booleanTypeAnnotation();
+	}
+
+	function NullLiteral() {
+	  return t.nullLiteralTypeAnnotation();
+	}
+
+	function RegExpLiteral() {
+	  return t.genericTypeAnnotation(t.identifier("RegExp"));
+	}
+
+	function ObjectExpression() {
+	  return t.genericTypeAnnotation(t.identifier("Object"));
+	}
+
+	function ArrayExpression() {
+	  return t.genericTypeAnnotation(t.identifier("Array"));
+	}
+
+	function RestElement() {
+	  return ArrayExpression();
+	}
+
+	RestElement.validParent = true;
+
+	function Func() {
+	  return t.genericTypeAnnotation(t.identifier("Function"));
+	}
+
+	exports.FunctionExpression = Func;
+	exports.ArrowFunctionExpression = Func;
+	exports.FunctionDeclaration = Func;
+	exports.ClassExpression = Func;
+	exports.ClassDeclaration = Func;
+	function CallExpression() {
+	  return resolveCall(this.get("callee"));
+	}
+
+	function TaggedTemplateExpression() {
+	  return resolveCall(this.get("tag"));
+	}
+
+	function resolveCall(callee) {
+	  callee = callee.resolve();
+
+	  if (callee.isFunction()) {
+	    if (callee.is("async")) {
+	      if (callee.is("generator")) {
+	        return t.genericTypeAnnotation(t.identifier("AsyncIterator"));
+	      } else {
+	        return t.genericTypeAnnotation(t.identifier("Promise"));
+	      }
+	    } else {
+	      if (callee.node.returnType) {
+	        return callee.node.returnType;
+	      } else {}
+	    }
+	  }
+	}
+
+/***/ }),
+/* 373 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.is = undefined;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.matchesPattern = matchesPattern;
+	exports.has = has;
+	exports.isStatic = isStatic;
+	exports.isnt = isnt;
+	exports.equals = equals;
+	exports.isNodeType = isNodeType;
+	exports.canHaveVariableDeclarationOrExpression = canHaveVariableDeclarationOrExpression;
+	exports.canSwapBetweenExpressionAndStatement = canSwapBetweenExpressionAndStatement;
+	exports.isCompletionRecord = isCompletionRecord;
+	exports.isStatementOrBlock = isStatementOrBlock;
+	exports.referencesImport = referencesImport;
+	exports.getSource = getSource;
+	exports.willIMaybeExecuteBefore = willIMaybeExecuteBefore;
+	exports._guessExecutionStatusRelativeTo = _guessExecutionStatusRelativeTo;
+	exports._guessExecutionStatusRelativeToDifferentFunctions = _guessExecutionStatusRelativeToDifferentFunctions;
+	exports.resolve = resolve;
+	exports._resolve = _resolve;
+
+	var _includes = __webpack_require__(111);
+
+	var _includes2 = _interopRequireDefault(_includes);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function matchesPattern(pattern, allowPartial) {
+	  if (!this.isMemberExpression()) return false;
+
+	  var parts = pattern.split(".");
+	  var search = [this.node];
+	  var i = 0;
+
+	  function matches(name) {
+	    var part = parts[i];
+	    return part === "*" || name === part;
+	  }
+
+	  while (search.length) {
+	    var node = search.shift();
+
+	    if (allowPartial && i === parts.length) {
+	      return true;
+	    }
+
+	    if (t.isIdentifier(node)) {
+	      if (!matches(node.name)) return false;
+	    } else if (t.isLiteral(node)) {
+	      if (!matches(node.value)) return false;
+	    } else if (t.isMemberExpression(node)) {
+	      if (node.computed && !t.isLiteral(node.property)) {
+	        return false;
+	      } else {
+	        search.unshift(node.property);
+	        search.unshift(node.object);
+	        continue;
+	      }
+	    } else if (t.isThisExpression(node)) {
+	      if (!matches("this")) return false;
+	    } else {
+	      return false;
+	    }
+
+	    if (++i > parts.length) {
+	      return false;
+	    }
+	  }
+
+	  return i === parts.length;
+	}
+
+	function has(key) {
+	  var val = this.node && this.node[key];
+	  if (val && Array.isArray(val)) {
+	    return !!val.length;
+	  } else {
+	    return !!val;
+	  }
+	}
+
+	function isStatic() {
+	  return this.scope.isStatic(this.node);
+	}
+
+	var is = exports.is = has;
+
+	function isnt(key) {
+	  return !this.has(key);
+	}
+
+	function equals(key, value) {
+	  return this.node[key] === value;
+	}
+
+	function isNodeType(type) {
+	  return t.isType(this.type, type);
+	}
+
+	function canHaveVariableDeclarationOrExpression() {
+	  return (this.key === "init" || this.key === "left") && this.parentPath.isFor();
+	}
+
+	function canSwapBetweenExpressionAndStatement(replacement) {
+	  if (this.key !== "body" || !this.parentPath.isArrowFunctionExpression()) {
+	    return false;
+	  }
+
+	  if (this.isExpression()) {
+	    return t.isBlockStatement(replacement);
+	  } else if (this.isBlockStatement()) {
+	    return t.isExpression(replacement);
+	  }
+
+	  return false;
+	}
+
+	function isCompletionRecord(allowInsideFunction) {
+	  var path = this;
+	  var first = true;
+
+	  do {
+	    var container = path.container;
+
+	    if (path.isFunction() && !first) {
+	      return !!allowInsideFunction;
+	    }
+
+	    first = false;
+
+	    if (Array.isArray(container) && path.key !== container.length - 1) {
+	      return false;
+	    }
+	  } while ((path = path.parentPath) && !path.isProgram());
+
+	  return true;
+	}
+
+	function isStatementOrBlock() {
+	  if (this.parentPath.isLabeledStatement() || t.isBlockStatement(this.container)) {
+	    return false;
+	  } else {
+	    return (0, _includes2.default)(t.STATEMENT_OR_BLOCK_KEYS, this.key);
+	  }
+	}
+
+	function referencesImport(moduleSource, importName) {
+	  if (!this.isReferencedIdentifier()) return false;
+
+	  var binding = this.scope.getBinding(this.node.name);
+	  if (!binding || binding.kind !== "module") return false;
+
+	  var path = binding.path;
+	  var parent = path.parentPath;
+	  if (!parent.isImportDeclaration()) return false;
+
+	  if (parent.node.source.value === moduleSource) {
+	    if (!importName) return true;
+	  } else {
+	    return false;
+	  }
+
+	  if (path.isImportDefaultSpecifier() && importName === "default") {
+	    return true;
+	  }
+
+	  if (path.isImportNamespaceSpecifier() && importName === "*") {
+	    return true;
+	  }
+
+	  if (path.isImportSpecifier() && path.node.imported.name === importName) {
+	    return true;
+	  }
+
+	  return false;
+	}
+
+	function getSource() {
+	  var node = this.node;
+	  if (node.end) {
+	    return this.hub.file.code.slice(node.start, node.end);
+	  } else {
+	    return "";
+	  }
+	}
+
+	function willIMaybeExecuteBefore(target) {
+	  return this._guessExecutionStatusRelativeTo(target) !== "after";
+	}
+
+	function _guessExecutionStatusRelativeTo(target) {
+	  var targetFuncParent = target.scope.getFunctionParent();
+	  var selfFuncParent = this.scope.getFunctionParent();
+
+	  if (targetFuncParent.node !== selfFuncParent.node) {
+	    var status = this._guessExecutionStatusRelativeToDifferentFunctions(targetFuncParent);
+	    if (status) {
+	      return status;
+	    } else {
+	      target = targetFuncParent.path;
+	    }
+	  }
+
+	  var targetPaths = target.getAncestry();
+	  if (targetPaths.indexOf(this) >= 0) return "after";
+
+	  var selfPaths = this.getAncestry();
+
+	  var commonPath = void 0;
+	  var targetIndex = void 0;
+	  var selfIndex = void 0;
+	  for (selfIndex = 0; selfIndex < selfPaths.length; selfIndex++) {
+	    var selfPath = selfPaths[selfIndex];
+	    targetIndex = targetPaths.indexOf(selfPath);
+	    if (targetIndex >= 0) {
+	      commonPath = selfPath;
+	      break;
+	    }
+	  }
+	  if (!commonPath) {
+	    return "before";
+	  }
+
+	  var targetRelationship = targetPaths[targetIndex - 1];
+	  var selfRelationship = selfPaths[selfIndex - 1];
+	  if (!targetRelationship || !selfRelationship) {
+	    return "before";
+	  }
+
+	  if (targetRelationship.listKey && targetRelationship.container === selfRelationship.container) {
+	    return targetRelationship.key > selfRelationship.key ? "before" : "after";
+	  }
+
+	  var targetKeyPosition = t.VISITOR_KEYS[targetRelationship.type].indexOf(targetRelationship.key);
+	  var selfKeyPosition = t.VISITOR_KEYS[selfRelationship.type].indexOf(selfRelationship.key);
+	  return targetKeyPosition > selfKeyPosition ? "before" : "after";
+	}
+
+	function _guessExecutionStatusRelativeToDifferentFunctions(targetFuncParent) {
+	  var targetFuncPath = targetFuncParent.path;
+	  if (!targetFuncPath.isFunctionDeclaration()) return;
+
+	  var binding = targetFuncPath.scope.getBinding(targetFuncPath.node.id.name);
+
+	  if (!binding.references) return "before";
+
+	  var referencePaths = binding.referencePaths;
+
+	  for (var _iterator = referencePaths, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var path = _ref;
+
+	    if (path.key !== "callee" || !path.parentPath.isCallExpression()) {
+	      return;
+	    }
+	  }
+
+	  var allStatus = void 0;
+
+	  for (var _iterator2 = referencePaths, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	    var _ref2;
+
+	    if (_isArray2) {
+	      if (_i2 >= _iterator2.length) break;
+	      _ref2 = _iterator2[_i2++];
+	    } else {
+	      _i2 = _iterator2.next();
+	      if (_i2.done) break;
+	      _ref2 = _i2.value;
+	    }
+
+	    var _path = _ref2;
+
+	    var childOfFunction = !!_path.find(function (path) {
+	      return path.node === targetFuncPath.node;
+	    });
+	    if (childOfFunction) continue;
+
+	    var status = this._guessExecutionStatusRelativeTo(_path);
+
+	    if (allStatus) {
+	      if (allStatus !== status) return;
+	    } else {
+	      allStatus = status;
+	    }
+	  }
+
+	  return allStatus;
+	}
+
+	function resolve(dangerous, resolved) {
+	  return this._resolve(dangerous, resolved) || this;
+	}
+
+	function _resolve(dangerous, resolved) {
+	  if (resolved && resolved.indexOf(this) >= 0) return;
+
+	  resolved = resolved || [];
+	  resolved.push(this);
+
+	  if (this.isVariableDeclarator()) {
+	    if (this.get("id").isIdentifier()) {
+	      return this.get("init").resolve(dangerous, resolved);
+	    } else {}
+	  } else if (this.isReferencedIdentifier()) {
+	    var binding = this.scope.getBinding(this.node.name);
+	    if (!binding) return;
+
+	    if (!binding.constant) return;
+
+	    if (binding.kind === "module") return;
+
+	    if (binding.path !== this) {
+	      var ret = binding.path.resolve(dangerous, resolved);
+
+	      if (this.find(function (parent) {
+	        return parent.node === ret.node;
+	      })) return;
+	      return ret;
+	    }
+	  } else if (this.isTypeCastExpression()) {
+	    return this.get("expression").resolve(dangerous, resolved);
+	  } else if (dangerous && this.isMemberExpression()) {
+
+	    var targetKey = this.toComputedKey();
+	    if (!t.isLiteral(targetKey)) return;
+
+	    var targetName = targetKey.value;
+
+	    var target = this.get("object").resolve(dangerous, resolved);
+
+	    if (target.isObjectExpression()) {
+	      var props = target.get("properties");
+	      for (var _iterator3 = props, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	        var _ref3;
+
+	        if (_isArray3) {
+	          if (_i3 >= _iterator3.length) break;
+	          _ref3 = _iterator3[_i3++];
+	        } else {
+	          _i3 = _iterator3.next();
+	          if (_i3.done) break;
+	          _ref3 = _i3.value;
+	        }
+
+	        var prop = _ref3;
+
+	        if (!prop.isProperty()) continue;
+
+	        var key = prop.get("key");
+
+	        var match = prop.isnt("computed") && key.isIdentifier({ name: targetName });
+
+	        match = match || key.isLiteral({ value: targetName });
+
+	        if (match) return prop.get("value").resolve(dangerous, resolved);
+	      }
+	    } else if (target.isArrayExpression() && !isNaN(+targetName)) {
+	      var elems = target.get("elements");
+	      var elem = elems[targetName];
+	      if (elem) return elem.resolve(dangerous, resolved);
+	    }
+	  }
+	}
+
+/***/ }),
+/* 374 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var referenceVisitor = {
+	  ReferencedIdentifier: function ReferencedIdentifier(path, state) {
+	    if (path.isJSXIdentifier() && _babelTypes.react.isCompatTag(path.node.name) && !path.parentPath.isJSXMemberExpression()) {
+	      return;
+	    }
+
+	    if (path.node.name === "this") {
+	      var scope = path.scope;
+	      do {
+	        if (scope.path.isFunction() && !scope.path.isArrowFunctionExpression()) break;
+	      } while (scope = scope.parent);
+	      if (scope) state.breakOnScopePaths.push(scope.path);
+	    }
+
+	    var binding = path.scope.getBinding(path.node.name);
+	    if (!binding) return;
+
+	    if (binding !== state.scope.getBinding(path.node.name)) return;
+
+	    state.bindings[path.node.name] = binding;
+	  }
+	};
+
+	var PathHoister = function () {
+	  function PathHoister(path, scope) {
+	    (0, _classCallCheck3.default)(this, PathHoister);
+
+	    this.breakOnScopePaths = [];
+
+	    this.bindings = {};
+
+	    this.scopes = [];
+
+	    this.scope = scope;
+	    this.path = path;
+
+	    this.attachAfter = false;
+	  }
+
+	  PathHoister.prototype.isCompatibleScope = function isCompatibleScope(scope) {
+	    for (var key in this.bindings) {
+	      var binding = this.bindings[key];
+	      if (!scope.bindingIdentifierEquals(key, binding.identifier)) {
+	        return false;
+	      }
+	    }
+
+	    return true;
+	  };
+
+	  PathHoister.prototype.getCompatibleScopes = function getCompatibleScopes() {
+	    var scope = this.path.scope;
+	    do {
+	      if (this.isCompatibleScope(scope)) {
+	        this.scopes.push(scope);
+	      } else {
+	        break;
+	      }
+
+	      if (this.breakOnScopePaths.indexOf(scope.path) >= 0) {
+	        break;
+	      }
+	    } while (scope = scope.parent);
+	  };
+
+	  PathHoister.prototype.getAttachmentPath = function getAttachmentPath() {
+	    var path = this._getAttachmentPath();
+	    if (!path) return;
+
+	    var targetScope = path.scope;
+
+	    if (targetScope.path === path) {
+	      targetScope = path.scope.parent;
+	    }
+
+	    if (targetScope.path.isProgram() || targetScope.path.isFunction()) {
+	      for (var name in this.bindings) {
+	        if (!targetScope.hasOwnBinding(name)) continue;
+
+	        var binding = this.bindings[name];
+
+	        if (binding.kind === "param") continue;
+
+	        if (this.getAttachmentParentForPath(binding.path).key > path.key) {
+	          this.attachAfter = true;
+	          path = binding.path;
+
+	          for (var _iterator = binding.constantViolations, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	            var _ref;
+
+	            if (_isArray) {
+	              if (_i >= _iterator.length) break;
+	              _ref = _iterator[_i++];
+	            } else {
+	              _i = _iterator.next();
+	              if (_i.done) break;
+	              _ref = _i.value;
+	            }
+
+	            var violationPath = _ref;
+
+	            if (this.getAttachmentParentForPath(violationPath).key > path.key) {
+	              path = violationPath;
+	            }
+	          }
+	        }
+	      }
+	    }
+
+	    if (path.parentPath.isExportDeclaration()) {
+	      path = path.parentPath;
+	    }
+
+	    return path;
+	  };
+
+	  PathHoister.prototype._getAttachmentPath = function _getAttachmentPath() {
+	    var scopes = this.scopes;
+
+	    var scope = scopes.pop();
+
+	    if (!scope) return;
+
+	    if (scope.path.isFunction()) {
+	      if (this.hasOwnParamBindings(scope)) {
+	        if (this.scope === scope) return;
+
+	        return scope.path.get("body").get("body")[0];
+	      } else {
+	        return this.getNextScopeAttachmentParent();
+	      }
+	    } else if (scope.path.isProgram()) {
+	      return this.getNextScopeAttachmentParent();
+	    }
+	  };
+
+	  PathHoister.prototype.getNextScopeAttachmentParent = function getNextScopeAttachmentParent() {
+	    var scope = this.scopes.pop();
+	    if (scope) return this.getAttachmentParentForPath(scope.path);
+	  };
+
+	  PathHoister.prototype.getAttachmentParentForPath = function getAttachmentParentForPath(path) {
+	    do {
+	      if (!path.parentPath || Array.isArray(path.container) && path.isStatement() || path.isVariableDeclarator() && path.parentPath.node !== null && path.parentPath.node.declarations.length > 1) return path;
+	    } while (path = path.parentPath);
+	  };
+
+	  PathHoister.prototype.hasOwnParamBindings = function hasOwnParamBindings(scope) {
+	    for (var name in this.bindings) {
+	      if (!scope.hasOwnBinding(name)) continue;
+
+	      var binding = this.bindings[name];
+
+	      if (binding.kind === "param" && binding.constant) return true;
+	    }
+	    return false;
+	  };
+
+	  PathHoister.prototype.run = function run() {
+	    var node = this.path.node;
+	    if (node._hoisted) return;
+	    node._hoisted = true;
+
+	    this.path.traverse(referenceVisitor, this);
+
+	    this.getCompatibleScopes();
+
+	    var attachTo = this.getAttachmentPath();
+	    if (!attachTo) return;
+
+	    if (attachTo.getFunctionParent() === this.path.getFunctionParent()) return;
+
+	    var uid = attachTo.scope.generateUidIdentifier("ref");
+	    var declarator = t.variableDeclarator(uid, this.path.node);
+
+	    var insertFn = this.attachAfter ? "insertAfter" : "insertBefore";
+	    attachTo[insertFn]([attachTo.isVariableDeclarator() ? declarator : t.variableDeclaration("var", [declarator])]);
+
+	    var parent = this.path.parentPath;
+	    if (parent.isJSXElement() && this.path.container === parent.node.children) {
+	      uid = t.JSXExpressionContainer(uid);
+	    }
+
+	    this.path.replaceWith(uid);
+	  };
+
+	  return PathHoister;
+	}();
+
+	exports.default = PathHoister;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 375 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	var hooks = exports.hooks = [function (self, parent) {
+	  var removeParent = self.key === "test" && (parent.isWhile() || parent.isSwitchCase()) || self.key === "declaration" && parent.isExportDeclaration() || self.key === "body" && parent.isLabeledStatement() || self.listKey === "declarations" && parent.isVariableDeclaration() && parent.node.declarations.length === 1 || self.key === "expression" && parent.isExpressionStatement();
+
+	  if (removeParent) {
+	    parent.remove();
+	    return true;
+	  }
+	}, function (self, parent) {
+	  if (parent.isSequenceExpression() && parent.node.expressions.length === 1) {
+	    parent.replaceWith(parent.node.expressions[0]);
+	    return true;
+	  }
+	}, function (self, parent) {
+	  if (parent.isBinary()) {
+	    if (self.key === "left") {
+	      parent.replaceWith(parent.node.right);
+	    } else {
+	      parent.replaceWith(parent.node.left);
+	    }
+	    return true;
+	  }
+	}, function (self, parent) {
+	  if (parent.isIfStatement() && (self.key === "consequent" || self.key === "alternate") || self.key === "body" && (parent.isLoop() || parent.isArrowFunctionExpression())) {
+	    self.replaceWith({
+	      type: "BlockStatement",
+	      body: []
+	    });
+	    return true;
+	  }
+	}];
+
+/***/ }),
+/* 376 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.insertBefore = insertBefore;
+	exports._containerInsert = _containerInsert;
+	exports._containerInsertBefore = _containerInsertBefore;
+	exports._containerInsertAfter = _containerInsertAfter;
+	exports._maybePopFromStatements = _maybePopFromStatements;
+	exports.insertAfter = insertAfter;
+	exports.updateSiblingKeys = updateSiblingKeys;
+	exports._verifyNodeList = _verifyNodeList;
+	exports.unshiftContainer = unshiftContainer;
+	exports.pushContainer = pushContainer;
+	exports.hoist = hoist;
+
+	var _cache = __webpack_require__(86);
+
+	var _hoister = __webpack_require__(374);
+
+	var _hoister2 = _interopRequireDefault(_hoister);
+
+	var _index = __webpack_require__(35);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function insertBefore(nodes) {
+	  this._assertUnremoved();
+
+	  nodes = this._verifyNodeList(nodes);
+
+	  if (this.parentPath.isExpressionStatement() || this.parentPath.isLabeledStatement()) {
+	    return this.parentPath.insertBefore(nodes);
+	  } else if (this.isNodeType("Expression") || this.parentPath.isForStatement() && this.key === "init") {
+	    if (this.node) nodes.push(this.node);
+	    this.replaceExpressionWithStatements(nodes);
+	  } else {
+	    this._maybePopFromStatements(nodes);
+	    if (Array.isArray(this.container)) {
+	      return this._containerInsertBefore(nodes);
+	    } else if (this.isStatementOrBlock()) {
+	      if (this.node) nodes.push(this.node);
+	      this._replaceWith(t.blockStatement(nodes));
+	    } else {
+	      throw new Error("We don't know what to do with this node type. " + "We were previously a Statement but we can't fit in here?");
+	    }
+	  }
+
+	  return [this];
+	}
+
+	function _containerInsert(from, nodes) {
+	  this.updateSiblingKeys(from, nodes.length);
+
+	  var paths = [];
+
+	  for (var i = 0; i < nodes.length; i++) {
+	    var to = from + i;
+	    var node = nodes[i];
+	    this.container.splice(to, 0, node);
+
+	    if (this.context) {
+	      var path = this.context.create(this.parent, this.container, to, this.listKey);
+
+	      if (this.context.queue) path.pushContext(this.context);
+	      paths.push(path);
+	    } else {
+	      paths.push(_index2.default.get({
+	        parentPath: this.parentPath,
+	        parent: this.parent,
+	        container: this.container,
+	        listKey: this.listKey,
+	        key: to
+	      }));
+	    }
+	  }
+
+	  var contexts = this._getQueueContexts();
+
+	  for (var _iterator = paths, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var _path = _ref;
+
+	    _path.setScope();
+	    _path.debug(function () {
+	      return "Inserted.";
+	    });
+
+	    for (var _iterator2 = contexts, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var context = _ref2;
+
+	      context.maybeQueue(_path, true);
+	    }
+	  }
+
+	  return paths;
+	}
+
+	function _containerInsertBefore(nodes) {
+	  return this._containerInsert(this.key, nodes);
+	}
+
+	function _containerInsertAfter(nodes) {
+	  return this._containerInsert(this.key + 1, nodes);
+	}
+
+	function _maybePopFromStatements(nodes) {
+	  var last = nodes[nodes.length - 1];
+	  var isIdentifier = t.isIdentifier(last) || t.isExpressionStatement(last) && t.isIdentifier(last.expression);
+
+	  if (isIdentifier && !this.isCompletionRecord()) {
+	    nodes.pop();
+	  }
+	}
+
+	function insertAfter(nodes) {
+	  this._assertUnremoved();
+
+	  nodes = this._verifyNodeList(nodes);
+
+	  if (this.parentPath.isExpressionStatement() || this.parentPath.isLabeledStatement()) {
+	    return this.parentPath.insertAfter(nodes);
+	  } else if (this.isNodeType("Expression") || this.parentPath.isForStatement() && this.key === "init") {
+	    if (this.node) {
+	      var temp = this.scope.generateDeclaredUidIdentifier();
+	      nodes.unshift(t.expressionStatement(t.assignmentExpression("=", temp, this.node)));
+	      nodes.push(t.expressionStatement(temp));
+	    }
+	    this.replaceExpressionWithStatements(nodes);
+	  } else {
+	    this._maybePopFromStatements(nodes);
+	    if (Array.isArray(this.container)) {
+	      return this._containerInsertAfter(nodes);
+	    } else if (this.isStatementOrBlock()) {
+	      if (this.node) nodes.unshift(this.node);
+	      this._replaceWith(t.blockStatement(nodes));
+	    } else {
+	      throw new Error("We don't know what to do with this node type. " + "We were previously a Statement but we can't fit in here?");
+	    }
+	  }
+
+	  return [this];
+	}
+
+	function updateSiblingKeys(fromIndex, incrementBy) {
+	  if (!this.parent) return;
+
+	  var paths = _cache.path.get(this.parent);
+	  for (var i = 0; i < paths.length; i++) {
+	    var path = paths[i];
+	    if (path.key >= fromIndex) {
+	      path.key += incrementBy;
+	    }
+	  }
+	}
+
+	function _verifyNodeList(nodes) {
+	  if (!nodes) {
+	    return [];
+	  }
+
+	  if (nodes.constructor !== Array) {
+	    nodes = [nodes];
+	  }
+
+	  for (var i = 0; i < nodes.length; i++) {
+	    var node = nodes[i];
+	    var msg = void 0;
+
+	    if (!node) {
+	      msg = "has falsy node";
+	    } else if ((typeof node === "undefined" ? "undefined" : (0, _typeof3.default)(node)) !== "object") {
+	      msg = "contains a non-object node";
+	    } else if (!node.type) {
+	      msg = "without a type";
+	    } else if (node instanceof _index2.default) {
+	      msg = "has a NodePath when it expected a raw object";
+	    }
+
+	    if (msg) {
+	      var type = Array.isArray(node) ? "array" : typeof node === "undefined" ? "undefined" : (0, _typeof3.default)(node);
+	      throw new Error("Node list " + msg + " with the index of " + i + " and type of " + type);
+	    }
+	  }
+
+	  return nodes;
+	}
+
+	function unshiftContainer(listKey, nodes) {
+	  this._assertUnremoved();
+
+	  nodes = this._verifyNodeList(nodes);
+
+	  var path = _index2.default.get({
+	    parentPath: this,
+	    parent: this.node,
+	    container: this.node[listKey],
+	    listKey: listKey,
+	    key: 0
+	  });
+
+	  return path.insertBefore(nodes);
+	}
+
+	function pushContainer(listKey, nodes) {
+	  this._assertUnremoved();
+
+	  nodes = this._verifyNodeList(nodes);
+
+	  var container = this.node[listKey];
+	  var path = _index2.default.get({
+	    parentPath: this,
+	    parent: this.node,
+	    container: container,
+	    listKey: listKey,
+	    key: container.length
+	  });
+
+	  return path.replaceWithMultiple(nodes);
+	}
+
+	function hoist() {
+	  var scope = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.scope;
+
+	  var hoister = new _hoister2.default(this, scope);
+	  return hoister.run();
+	}
+
+/***/ }),
+/* 377 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.remove = remove;
+	exports._callRemovalHooks = _callRemovalHooks;
+	exports._remove = _remove;
+	exports._markRemoved = _markRemoved;
+	exports._assertUnremoved = _assertUnremoved;
+
+	var _removalHooks = __webpack_require__(375);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function remove() {
+	  this._assertUnremoved();
+
+	  this.resync();
+
+	  if (this._callRemovalHooks()) {
+	    this._markRemoved();
+	    return;
+	  }
+
+	  this.shareCommentsWithSiblings();
+	  this._remove();
+	  this._markRemoved();
+	}
+
+	function _callRemovalHooks() {
+	  for (var _iterator = _removalHooks.hooks, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	    var _ref;
+
+	    if (_isArray) {
+	      if (_i >= _iterator.length) break;
+	      _ref = _iterator[_i++];
+	    } else {
+	      _i = _iterator.next();
+	      if (_i.done) break;
+	      _ref = _i.value;
+	    }
+
+	    var fn = _ref;
+
+	    if (fn(this, this.parentPath)) return true;
+	  }
+	}
+
+	function _remove() {
+	  if (Array.isArray(this.container)) {
+	    this.container.splice(this.key, 1);
+	    this.updateSiblingKeys(this.key, -1);
+	  } else {
+	    this._replaceWith(null);
+	  }
+	}
+
+	function _markRemoved() {
+	  this.shouldSkip = true;
+	  this.removed = true;
+	  this.node = null;
+	}
+
+	function _assertUnremoved() {
+	  if (this.removed) {
+	    throw this.buildCodeFrameError("NodePath has been removed so is read-only.");
+	  }
+	}
+
+/***/ }),
+/* 378 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.replaceWithMultiple = replaceWithMultiple;
+	exports.replaceWithSourceString = replaceWithSourceString;
+	exports.replaceWith = replaceWith;
+	exports._replaceWith = _replaceWith;
+	exports.replaceExpressionWithStatements = replaceExpressionWithStatements;
+	exports.replaceInline = replaceInline;
+
+	var _babelCodeFrame = __webpack_require__(177);
+
+	var _babelCodeFrame2 = _interopRequireDefault(_babelCodeFrame);
+
+	var _index = __webpack_require__(7);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	var _index3 = __webpack_require__(35);
+
+	var _index4 = _interopRequireDefault(_index3);
+
+	var _babylon = __webpack_require__(87);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var hoistVariablesVisitor = {
+	  Function: function Function(path) {
+	    path.skip();
+	  },
+	  VariableDeclaration: function VariableDeclaration(path) {
+	    if (path.node.kind !== "var") return;
+
+	    var bindings = path.getBindingIdentifiers();
+	    for (var key in bindings) {
+	      path.scope.push({ id: bindings[key] });
+	    }
+
+	    var exprs = [];
+
+	    for (var _iterator = path.node.declarations, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var declar = _ref;
+
+	      if (declar.init) {
+	        exprs.push(t.expressionStatement(t.assignmentExpression("=", declar.id, declar.init)));
+	      }
+	    }
+
+	    path.replaceWithMultiple(exprs);
+	  }
+	};
+
+	function replaceWithMultiple(nodes) {
+	  this.resync();
+
+	  nodes = this._verifyNodeList(nodes);
+	  t.inheritLeadingComments(nodes[0], this.node);
+	  t.inheritTrailingComments(nodes[nodes.length - 1], this.node);
+	  this.node = this.container[this.key] = null;
+	  this.insertAfter(nodes);
+
+	  if (this.node) {
+	    this.requeue();
+	  } else {
+	    this.remove();
+	  }
+	}
+
+	function replaceWithSourceString(replacement) {
+	  this.resync();
+
+	  try {
+	    replacement = "(" + replacement + ")";
+	    replacement = (0, _babylon.parse)(replacement);
+	  } catch (err) {
+	    var loc = err.loc;
+	    if (loc) {
+	      err.message += " - make sure this is an expression.";
+	      err.message += "\n" + (0, _babelCodeFrame2.default)(replacement, loc.line, loc.column + 1);
+	    }
+	    throw err;
+	  }
+
+	  replacement = replacement.program.body[0].expression;
+	  _index2.default.removeProperties(replacement);
+	  return this.replaceWith(replacement);
+	}
+
+	function replaceWith(replacement) {
+	  this.resync();
+
+	  if (this.removed) {
+	    throw new Error("You can't replace this node, we've already removed it");
+	  }
+
+	  if (replacement instanceof _index4.default) {
+	    replacement = replacement.node;
+	  }
+
+	  if (!replacement) {
+	    throw new Error("You passed `path.replaceWith()` a falsy node, use `path.remove()` instead");
+	  }
+
+	  if (this.node === replacement) {
+	    return;
+	  }
+
+	  if (this.isProgram() && !t.isProgram(replacement)) {
+	    throw new Error("You can only replace a Program root node with another Program node");
+	  }
+
+	  if (Array.isArray(replacement)) {
+	    throw new Error("Don't use `path.replaceWith()` with an array of nodes, use `path.replaceWithMultiple()`");
+	  }
+
+	  if (typeof replacement === "string") {
+	    throw new Error("Don't use `path.replaceWith()` with a source string, use `path.replaceWithSourceString()`");
+	  }
+
+	  if (this.isNodeType("Statement") && t.isExpression(replacement)) {
+	    if (!this.canHaveVariableDeclarationOrExpression() && !this.canSwapBetweenExpressionAndStatement(replacement)) {
+	      replacement = t.expressionStatement(replacement);
+	    }
+	  }
+
+	  if (this.isNodeType("Expression") && t.isStatement(replacement)) {
+	    if (!this.canHaveVariableDeclarationOrExpression() && !this.canSwapBetweenExpressionAndStatement(replacement)) {
+	      return this.replaceExpressionWithStatements([replacement]);
+	    }
+	  }
+
+	  var oldNode = this.node;
+	  if (oldNode) {
+	    t.inheritsComments(replacement, oldNode);
+	    t.removeComments(oldNode);
+	  }
+
+	  this._replaceWith(replacement);
+	  this.type = replacement.type;
+
+	  this.setScope();
+
+	  this.requeue();
+	}
+
+	function _replaceWith(node) {
+	  if (!this.container) {
+	    throw new ReferenceError("Container is falsy");
+	  }
+
+	  if (this.inList) {
+	    t.validate(this.parent, this.key, [node]);
+	  } else {
+	    t.validate(this.parent, this.key, node);
+	  }
+
+	  this.debug(function () {
+	    return "Replace with " + (node && node.type);
+	  });
+
+	  this.node = this.container[this.key] = node;
+	}
+
+	function replaceExpressionWithStatements(nodes) {
+	  this.resync();
+
+	  var toSequenceExpression = t.toSequenceExpression(nodes, this.scope);
+
+	  if (t.isSequenceExpression(toSequenceExpression)) {
+	    var exprs = toSequenceExpression.expressions;
+
+	    if (exprs.length >= 2 && this.parentPath.isExpressionStatement()) {
+	      this._maybePopFromStatements(exprs);
+	    }
+
+	    if (exprs.length === 1) {
+	      this.replaceWith(exprs[0]);
+	    } else {
+	      this.replaceWith(toSequenceExpression);
+	    }
+	  } else if (toSequenceExpression) {
+	    this.replaceWith(toSequenceExpression);
+	  } else {
+	    var container = t.functionExpression(null, [], t.blockStatement(nodes));
+	    container.shadow = true;
+
+	    this.replaceWith(t.callExpression(container, []));
+	    this.traverse(hoistVariablesVisitor);
+
+	    var completionRecords = this.get("callee").getCompletionRecords();
+	    for (var _iterator2 = completionRecords, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	      var _ref2;
+
+	      if (_isArray2) {
+	        if (_i2 >= _iterator2.length) break;
+	        _ref2 = _iterator2[_i2++];
+	      } else {
+	        _i2 = _iterator2.next();
+	        if (_i2.done) break;
+	        _ref2 = _i2.value;
+	      }
+
+	      var path = _ref2;
+
+	      if (!path.isExpressionStatement()) continue;
+
+	      var loop = path.findParent(function (path) {
+	        return path.isLoop();
+	      });
+	      if (loop) {
+	        var uid = loop.getData("expressionReplacementReturnUid");
+
+	        if (!uid) {
+	          var callee = this.get("callee");
+	          uid = callee.scope.generateDeclaredUidIdentifier("ret");
+	          callee.get("body").pushContainer("body", t.returnStatement(uid));
+	          loop.setData("expressionReplacementReturnUid", uid);
+	        } else {
+	          uid = t.identifier(uid.name);
+	        }
+
+	        path.get("expression").replaceWith(t.assignmentExpression("=", uid, path.node.expression));
+	      } else {
+	        path.replaceWith(t.returnStatement(path.node.expression));
+	      }
+	    }
+
+	    return this.node;
+	  }
+	}
+
+	function replaceInline(nodes) {
+	  this.resync();
+
+	  if (Array.isArray(nodes)) {
+	    if (Array.isArray(this.container)) {
+	      nodes = this._verifyNodeList(nodes);
+	      this._containerInsertAfter(nodes);
+	      return this.remove();
+	    } else {
+	      return this.replaceWithMultiple(nodes);
+	    }
+	  } else {
+	    return this.replaceWith(nodes);
+	  }
+	}
+
+/***/ }),
+/* 379 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _classCallCheck2 = __webpack_require__(3);
+
+	var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+	var _binding = __webpack_require__(221);
+
+	var _binding2 = _interopRequireDefault(_binding);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var renameVisitor = {
+	  ReferencedIdentifier: function ReferencedIdentifier(_ref, state) {
+	    var node = _ref.node;
+
+	    if (node.name === state.oldName) {
+	      node.name = state.newName;
+	    }
+	  },
+	  Scope: function Scope(path, state) {
+	    if (!path.scope.bindingIdentifierEquals(state.oldName, state.binding.identifier)) {
+	      path.skip();
+	    }
+	  },
+	  "AssignmentExpression|Declaration": function AssignmentExpressionDeclaration(path, state) {
+	    var ids = path.getOuterBindingIdentifiers();
+
+	    for (var name in ids) {
+	      if (name === state.oldName) ids[name].name = state.newName;
+	    }
+	  }
+	};
+
+	var Renamer = function () {
+	  function Renamer(binding, oldName, newName) {
+	    (0, _classCallCheck3.default)(this, Renamer);
+
+	    this.newName = newName;
+	    this.oldName = oldName;
+	    this.binding = binding;
+	  }
+
+	  Renamer.prototype.maybeConvertFromExportDeclaration = function maybeConvertFromExportDeclaration(parentDeclar) {
+	    var exportDeclar = parentDeclar.parentPath.isExportDeclaration() && parentDeclar.parentPath;
+	    if (!exportDeclar) return;
+
+	    var isDefault = exportDeclar.isExportDefaultDeclaration();
+
+	    if (isDefault && (parentDeclar.isFunctionDeclaration() || parentDeclar.isClassDeclaration()) && !parentDeclar.node.id) {
+	      parentDeclar.node.id = parentDeclar.scope.generateUidIdentifier("default");
+	    }
+
+	    var bindingIdentifiers = parentDeclar.getOuterBindingIdentifiers();
+	    var specifiers = [];
+
+	    for (var name in bindingIdentifiers) {
+	      var localName = name === this.oldName ? this.newName : name;
+	      var exportedName = isDefault ? "default" : name;
+	      specifiers.push(t.exportSpecifier(t.identifier(localName), t.identifier(exportedName)));
+	    }
+
+	    if (specifiers.length) {
+	      var aliasDeclar = t.exportNamedDeclaration(null, specifiers);
+
+	      if (parentDeclar.isFunctionDeclaration()) {
+	        aliasDeclar._blockHoist = 3;
+	      }
+
+	      exportDeclar.insertAfter(aliasDeclar);
+	      exportDeclar.replaceWith(parentDeclar.node);
+	    }
+	  };
+
+	  Renamer.prototype.maybeConvertFromClassFunctionDeclaration = function maybeConvertFromClassFunctionDeclaration(path) {
+	    return;
+
+	    if (!path.isFunctionDeclaration() && !path.isClassDeclaration()) return;
+	    if (this.binding.kind !== "hoisted") return;
+
+	    path.node.id = t.identifier(this.oldName);
+	    path.node._blockHoist = 3;
+
+	    path.replaceWith(t.variableDeclaration("let", [t.variableDeclarator(t.identifier(this.newName), t.toExpression(path.node))]));
+	  };
+
+	  Renamer.prototype.maybeConvertFromClassFunctionExpression = function maybeConvertFromClassFunctionExpression(path) {
+	    return;
+
+	    if (!path.isFunctionExpression() && !path.isClassExpression()) return;
+	    if (this.binding.kind !== "local") return;
+
+	    path.node.id = t.identifier(this.oldName);
+
+	    this.binding.scope.parent.push({
+	      id: t.identifier(this.newName)
+	    });
+
+	    path.replaceWith(t.assignmentExpression("=", t.identifier(this.newName), path.node));
+	  };
+
+	  Renamer.prototype.rename = function rename(block) {
+	    var binding = this.binding,
+	        oldName = this.oldName,
+	        newName = this.newName;
+	    var scope = binding.scope,
+	        path = binding.path;
+
+	    var parentDeclar = path.find(function (path) {
+	      return path.isDeclaration() || path.isFunctionExpression();
+	    });
+	    if (parentDeclar) {
+	      this.maybeConvertFromExportDeclaration(parentDeclar);
+	    }
+
+	    scope.traverse(block || scope.block, renameVisitor, this);
+
+	    if (!block) {
+	      scope.removeOwnBinding(oldName);
+	      scope.bindings[newName] = binding;
+	      this.binding.identifier.name = newName;
+	    }
+
+	    if (binding.type === "hoisted") {}
+
+	    if (parentDeclar) {
+	      this.maybeConvertFromClassFunctionDeclaration(parentDeclar);
+	      this.maybeConvertFromClassFunctionExpression(parentDeclar);
+	    }
+	  };
+
+	  return Renamer;
+	}();
+
+	exports.default = Renamer;
+	module.exports = exports["default"];
+
+/***/ }),
+/* 380 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	var _keys = __webpack_require__(13);
+
+	var _keys2 = _interopRequireDefault(_keys);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.explode = explode;
+	exports.verify = verify;
+	exports.merge = merge;
+
+	var _virtualTypes = __webpack_require__(220);
+
+	var virtualTypes = _interopRequireWildcard(_virtualTypes);
+
+	var _babelMessages = __webpack_require__(18);
+
+	var messages = _interopRequireWildcard(_babelMessages);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _clone = __webpack_require__(109);
+
+	var _clone2 = _interopRequireDefault(_clone);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function explode(visitor) {
+	  if (visitor._exploded) return visitor;
+	  visitor._exploded = true;
+
+	  for (var nodeType in visitor) {
+	    if (shouldIgnoreKey(nodeType)) continue;
+
+	    var parts = nodeType.split("|");
+	    if (parts.length === 1) continue;
+
+	    var fns = visitor[nodeType];
+	    delete visitor[nodeType];
+
+	    for (var _iterator = parts, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var part = _ref;
+
+	      visitor[part] = fns;
+	    }
+	  }
+
+	  verify(visitor);
+
+	  delete visitor.__esModule;
+
+	  ensureEntranceObjects(visitor);
+
+	  ensureCallbackArrays(visitor);
+
+	  for (var _iterator2 = (0, _keys2.default)(visitor), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	    var _ref2;
+
+	    if (_isArray2) {
+	      if (_i2 >= _iterator2.length) break;
+	      _ref2 = _iterator2[_i2++];
+	    } else {
+	      _i2 = _iterator2.next();
+	      if (_i2.done) break;
+	      _ref2 = _i2.value;
+	    }
+
+	    var _nodeType3 = _ref2;
+
+	    if (shouldIgnoreKey(_nodeType3)) continue;
+
+	    var wrapper = virtualTypes[_nodeType3];
+	    if (!wrapper) continue;
+
+	    var _fns2 = visitor[_nodeType3];
+	    for (var type in _fns2) {
+	      _fns2[type] = wrapCheck(wrapper, _fns2[type]);
+	    }
+
+	    delete visitor[_nodeType3];
+
+	    if (wrapper.types) {
+	      for (var _iterator4 = wrapper.types, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : (0, _getIterator3.default)(_iterator4);;) {
+	        var _ref4;
+
+	        if (_isArray4) {
+	          if (_i4 >= _iterator4.length) break;
+	          _ref4 = _iterator4[_i4++];
+	        } else {
+	          _i4 = _iterator4.next();
+	          if (_i4.done) break;
+	          _ref4 = _i4.value;
+	        }
+
+	        var _type = _ref4;
+
+	        if (visitor[_type]) {
+	          mergePair(visitor[_type], _fns2);
+	        } else {
+	          visitor[_type] = _fns2;
+	        }
+	      }
+	    } else {
+	      mergePair(visitor, _fns2);
+	    }
+	  }
+
+	  for (var _nodeType in visitor) {
+	    if (shouldIgnoreKey(_nodeType)) continue;
+
+	    var _fns = visitor[_nodeType];
+
+	    var aliases = t.FLIPPED_ALIAS_KEYS[_nodeType];
+
+	    var deprecratedKey = t.DEPRECATED_KEYS[_nodeType];
+	    if (deprecratedKey) {
+	      console.trace("Visitor defined for " + _nodeType + " but it has been renamed to " + deprecratedKey);
+	      aliases = [deprecratedKey];
+	    }
+
+	    if (!aliases) continue;
+
+	    delete visitor[_nodeType];
+
+	    for (var _iterator3 = aliases, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : (0, _getIterator3.default)(_iterator3);;) {
+	      var _ref3;
+
+	      if (_isArray3) {
+	        if (_i3 >= _iterator3.length) break;
+	        _ref3 = _iterator3[_i3++];
+	      } else {
+	        _i3 = _iterator3.next();
+	        if (_i3.done) break;
+	        _ref3 = _i3.value;
+	      }
+
+	      var alias = _ref3;
+
+	      var existing = visitor[alias];
+	      if (existing) {
+	        mergePair(existing, _fns);
+	      } else {
+	        visitor[alias] = (0, _clone2.default)(_fns);
+	      }
+	    }
+	  }
+
+	  for (var _nodeType2 in visitor) {
+	    if (shouldIgnoreKey(_nodeType2)) continue;
+
+	    ensureCallbackArrays(visitor[_nodeType2]);
+	  }
+
+	  return visitor;
+	}
+
+	function verify(visitor) {
+	  if (visitor._verified) return;
+
+	  if (typeof visitor === "function") {
+	    throw new Error(messages.get("traverseVerifyRootFunction"));
+	  }
+
+	  for (var nodeType in visitor) {
+	    if (nodeType === "enter" || nodeType === "exit") {
+	      validateVisitorMethods(nodeType, visitor[nodeType]);
+	    }
+
+	    if (shouldIgnoreKey(nodeType)) continue;
+
+	    if (t.TYPES.indexOf(nodeType) < 0) {
+	      throw new Error(messages.get("traverseVerifyNodeType", nodeType));
+	    }
+
+	    var visitors = visitor[nodeType];
+	    if ((typeof visitors === "undefined" ? "undefined" : (0, _typeof3.default)(visitors)) === "object") {
+	      for (var visitorKey in visitors) {
+	        if (visitorKey === "enter" || visitorKey === "exit") {
+	          validateVisitorMethods(nodeType + "." + visitorKey, visitors[visitorKey]);
+	        } else {
+	          throw new Error(messages.get("traverseVerifyVisitorProperty", nodeType, visitorKey));
+	        }
+	      }
+	    }
+	  }
+
+	  visitor._verified = true;
+	}
+
+	function validateVisitorMethods(path, val) {
+	  var fns = [].concat(val);
+	  for (var _iterator5 = fns, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : (0, _getIterator3.default)(_iterator5);;) {
+	    var _ref5;
+
+	    if (_isArray5) {
+	      if (_i5 >= _iterator5.length) break;
+	      _ref5 = _iterator5[_i5++];
+	    } else {
+	      _i5 = _iterator5.next();
+	      if (_i5.done) break;
+	      _ref5 = _i5.value;
+	    }
+
+	    var fn = _ref5;
+
+	    if (typeof fn !== "function") {
+	      throw new TypeError("Non-function found defined in " + path + " with type " + (typeof fn === "undefined" ? "undefined" : (0, _typeof3.default)(fn)));
+	    }
+	  }
+	}
+
+	function merge(visitors) {
+	  var states = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+	  var wrapper = arguments[2];
+
+	  var rootVisitor = {};
+
+	  for (var i = 0; i < visitors.length; i++) {
+	    var visitor = visitors[i];
+	    var state = states[i];
+
+	    explode(visitor);
+
+	    for (var type in visitor) {
+	      var visitorType = visitor[type];
+
+	      if (state || wrapper) {
+	        visitorType = wrapWithStateOrWrapper(visitorType, state, wrapper);
+	      }
+
+	      var nodeVisitor = rootVisitor[type] = rootVisitor[type] || {};
+	      mergePair(nodeVisitor, visitorType);
+	    }
+	  }
+
+	  return rootVisitor;
+	}
+
+	function wrapWithStateOrWrapper(oldVisitor, state, wrapper) {
+	  var newVisitor = {};
+
+	  var _loop = function _loop(key) {
+	    var fns = oldVisitor[key];
+
+	    if (!Array.isArray(fns)) return "continue";
+
+	    fns = fns.map(function (fn) {
+	      var newFn = fn;
+
+	      if (state) {
+	        newFn = function newFn(path) {
+	          return fn.call(state, path, state);
+	        };
+	      }
+
+	      if (wrapper) {
+	        newFn = wrapper(state.key, key, newFn);
+	      }
+
+	      return newFn;
+	    });
+
+	    newVisitor[key] = fns;
+	  };
+
+	  for (var key in oldVisitor) {
+	    var _ret = _loop(key);
+
+	    if (_ret === "continue") continue;
+	  }
+
+	  return newVisitor;
+	}
+
+	function ensureEntranceObjects(obj) {
+	  for (var key in obj) {
+	    if (shouldIgnoreKey(key)) continue;
+
+	    var fns = obj[key];
+	    if (typeof fns === "function") {
+	      obj[key] = { enter: fns };
+	    }
+	  }
+	}
+
+	function ensureCallbackArrays(obj) {
+	  if (obj.enter && !Array.isArray(obj.enter)) obj.enter = [obj.enter];
+	  if (obj.exit && !Array.isArray(obj.exit)) obj.exit = [obj.exit];
+	}
+
+	function wrapCheck(wrapper, fn) {
+	  var newFn = function newFn(path) {
+	    if (wrapper.checkPath(path)) {
+	      return fn.apply(this, arguments);
+	    }
+	  };
+	  newFn.toString = function () {
+	    return fn.toString();
+	  };
+	  return newFn;
+	}
+
+	function shouldIgnoreKey(key) {
+	  if (key[0] === "_") return true;
+
+	  if (key === "enter" || key === "exit" || key === "shouldSkip") return true;
+
+	  if (key === "blacklist" || key === "noScope" || key === "skipKeys") return true;
+
+	  return false;
+	}
+
+	function mergePair(dest, src) {
+	  for (var key in src) {
+	    dest[key] = [].concat(dest[key] || [], src[key]);
+	  }
+	}
+
+/***/ }),
+/* 381 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _maxSafeInteger = __webpack_require__(355);
+
+	var _maxSafeInteger2 = _interopRequireDefault(_maxSafeInteger);
+
+	var _stringify = __webpack_require__(34);
+
+	var _stringify2 = _interopRequireDefault(_stringify);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.toComputedKey = toComputedKey;
+	exports.toSequenceExpression = toSequenceExpression;
+	exports.toKeyAlias = toKeyAlias;
+	exports.toIdentifier = toIdentifier;
+	exports.toBindingIdentifierName = toBindingIdentifierName;
+	exports.toStatement = toStatement;
+	exports.toExpression = toExpression;
+	exports.toBlock = toBlock;
+	exports.valueToNode = valueToNode;
+
+	var _isPlainObject = __webpack_require__(270);
+
+	var _isPlainObject2 = _interopRequireDefault(_isPlainObject);
+
+	var _isRegExp = __webpack_require__(271);
+
+	var _isRegExp2 = _interopRequireDefault(_isRegExp);
+
+	var _index = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_index);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function toComputedKey(node) {
+	  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : node.key || node.property;
+
+	  if (!node.computed) {
+	    if (t.isIdentifier(key)) key = t.stringLiteral(key.name);
+	  }
+	  return key;
+	}
+
+	function toSequenceExpression(nodes, scope) {
+	  if (!nodes || !nodes.length) return;
+
+	  var declars = [];
+	  var bailed = false;
+
+	  var result = convert(nodes);
+	  if (bailed) return;
+
+	  for (var i = 0; i < declars.length; i++) {
+	    scope.push(declars[i]);
+	  }
+
+	  return result;
+
+	  function convert(nodes) {
+	    var ensureLastUndefined = false;
+	    var exprs = [];
+
+	    for (var _iterator = nodes, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	      var _ref;
+
+	      if (_isArray) {
+	        if (_i >= _iterator.length) break;
+	        _ref = _iterator[_i++];
+	      } else {
+	        _i = _iterator.next();
+	        if (_i.done) break;
+	        _ref = _i.value;
+	      }
+
+	      var node = _ref;
+
+	      if (t.isExpression(node)) {
+	        exprs.push(node);
+	      } else if (t.isExpressionStatement(node)) {
+	        exprs.push(node.expression);
+	      } else if (t.isVariableDeclaration(node)) {
+	        if (node.kind !== "var") return bailed = true;
+
+	        for (var _iterator2 = node.declarations, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	          var _ref2;
+
+	          if (_isArray2) {
+	            if (_i2 >= _iterator2.length) break;
+	            _ref2 = _iterator2[_i2++];
+	          } else {
+	            _i2 = _iterator2.next();
+	            if (_i2.done) break;
+	            _ref2 = _i2.value;
+	          }
+
+	          var declar = _ref2;
+
+	          var bindings = t.getBindingIdentifiers(declar);
+	          for (var key in bindings) {
+	            declars.push({
+	              kind: node.kind,
+	              id: bindings[key]
+	            });
+	          }
+
+	          if (declar.init) {
+	            exprs.push(t.assignmentExpression("=", declar.id, declar.init));
+	          }
+	        }
+
+	        ensureLastUndefined = true;
+	        continue;
+	      } else if (t.isIfStatement(node)) {
+	        var consequent = node.consequent ? convert([node.consequent]) : scope.buildUndefinedNode();
+	        var alternate = node.alternate ? convert([node.alternate]) : scope.buildUndefinedNode();
+	        if (!consequent || !alternate) return bailed = true;
+
+	        exprs.push(t.conditionalExpression(node.test, consequent, alternate));
+	      } else if (t.isBlockStatement(node)) {
+	        exprs.push(convert(node.body));
+	      } else if (t.isEmptyStatement(node)) {
+	        ensureLastUndefined = true;
+	        continue;
+	      } else {
+	        return bailed = true;
+	      }
+
+	      ensureLastUndefined = false;
+	    }
+
+	    if (ensureLastUndefined || exprs.length === 0) {
+	      exprs.push(scope.buildUndefinedNode());
+	    }
+
+	    if (exprs.length === 1) {
+	      return exprs[0];
+	    } else {
+	      return t.sequenceExpression(exprs);
+	    }
+	  }
+	}
+
+	function toKeyAlias(node) {
+	  var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : node.key;
+
+	  var alias = void 0;
+
+	  if (node.kind === "method") {
+	    return toKeyAlias.increment() + "";
+	  } else if (t.isIdentifier(key)) {
+	    alias = key.name;
+	  } else if (t.isStringLiteral(key)) {
+	    alias = (0, _stringify2.default)(key.value);
+	  } else {
+	    alias = (0, _stringify2.default)(t.removePropertiesDeep(t.cloneDeep(key)));
+	  }
+
+	  if (node.computed) {
+	    alias = "[" + alias + "]";
+	  }
+
+	  if (node.static) {
+	    alias = "static:" + alias;
+	  }
+
+	  return alias;
+	}
+
+	toKeyAlias.uid = 0;
+
+	toKeyAlias.increment = function () {
+	  if (toKeyAlias.uid >= _maxSafeInteger2.default) {
+	    return toKeyAlias.uid = 0;
+	  } else {
+	    return toKeyAlias.uid++;
+	  }
+	};
+
+	function toIdentifier(name) {
+	  name = name + "";
+
+	  name = name.replace(/[^a-zA-Z0-9$_]/g, "-");
+
+	  name = name.replace(/^[-0-9]+/, "");
+
+	  name = name.replace(/[-\s]+(.)?/g, function (match, c) {
+	    return c ? c.toUpperCase() : "";
+	  });
+
+	  if (!t.isValidIdentifier(name)) {
+	    name = "_" + name;
+	  }
+
+	  return name || "_";
+	}
+
+	function toBindingIdentifierName(name) {
+	  name = toIdentifier(name);
+	  if (name === "eval" || name === "arguments") name = "_" + name;
+	  return name;
+	}
+
+	function toStatement(node, ignore) {
+	  if (t.isStatement(node)) {
+	    return node;
+	  }
+
+	  var mustHaveId = false;
+	  var newType = void 0;
+
+	  if (t.isClass(node)) {
+	    mustHaveId = true;
+	    newType = "ClassDeclaration";
+	  } else if (t.isFunction(node)) {
+	    mustHaveId = true;
+	    newType = "FunctionDeclaration";
+	  } else if (t.isAssignmentExpression(node)) {
+	    return t.expressionStatement(node);
+	  }
+
+	  if (mustHaveId && !node.id) {
+	    newType = false;
+	  }
+
+	  if (!newType) {
+	    if (ignore) {
+	      return false;
+	    } else {
+	      throw new Error("cannot turn " + node.type + " to a statement");
+	    }
+	  }
+
+	  node.type = newType;
+
+	  return node;
+	}
+
+	function toExpression(node) {
+	  if (t.isExpressionStatement(node)) {
+	    node = node.expression;
+	  }
+
+	  if (t.isExpression(node)) {
+	    return node;
+	  }
+
+	  if (t.isClass(node)) {
+	    node.type = "ClassExpression";
+	  } else if (t.isFunction(node)) {
+	    node.type = "FunctionExpression";
+	  }
+
+	  if (!t.isExpression(node)) {
+	    throw new Error("cannot turn " + node.type + " to an expression");
+	  }
+
+	  return node;
+	}
+
+	function toBlock(node, parent) {
+	  if (t.isBlockStatement(node)) {
+	    return node;
+	  }
+
+	  if (t.isEmptyStatement(node)) {
+	    node = [];
+	  }
+
+	  if (!Array.isArray(node)) {
+	    if (!t.isStatement(node)) {
+	      if (t.isFunction(parent)) {
+	        node = t.returnStatement(node);
+	      } else {
+	        node = t.expressionStatement(node);
+	      }
+	    }
+
+	    node = [node];
+	  }
+
+	  return t.blockStatement(node);
+	}
+
+	function valueToNode(value) {
+	  if (value === undefined) {
+	    return t.identifier("undefined");
+	  }
+
+	  if (value === true || value === false) {
+	    return t.booleanLiteral(value);
+	  }
+
+	  if (value === null) {
+	    return t.nullLiteral();
+	  }
+
+	  if (typeof value === "string") {
+	    return t.stringLiteral(value);
+	  }
+
+	  if (typeof value === "number") {
+	    return t.numericLiteral(value);
+	  }
+
+	  if ((0, _isRegExp2.default)(value)) {
+	    var pattern = value.source;
+	    var flags = value.toString().match(/\/([a-z]+|)$/)[1];
+	    return t.regExpLiteral(pattern, flags);
+	  }
+
+	  if (Array.isArray(value)) {
+	    return t.arrayExpression(value.map(t.valueToNode));
+	  }
+
+	  if ((0, _isPlainObject2.default)(value)) {
+	    var props = [];
+	    for (var key in value) {
+	      var nodeKey = void 0;
+	      if (t.isValidIdentifier(key)) {
+	        nodeKey = t.identifier(key);
+	      } else {
+	        nodeKey = t.stringLiteral(key);
+	      }
+	      props.push(t.objectProperty(nodeKey, t.valueToNode(value[key])));
+	    }
+	    return t.objectExpression(props);
+	  }
+
+	  throw new Error("don't know how to turn this value into a node");
+	}
+
+/***/ }),
+/* 382 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _index = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_index);
+
+	var _constants = __webpack_require__(134);
+
+	var _index2 = __webpack_require__(26);
+
+	var _index3 = _interopRequireDefault(_index2);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	(0, _index3.default)("ArrayExpression", {
+	  fields: {
+	    elements: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeOrValueType)("null", "Expression", "SpreadElement"))),
+	      default: []
+	    }
+	  },
+	  visitor: ["elements"],
+	  aliases: ["Expression"]
+	});
+
+	(0, _index3.default)("AssignmentExpression", {
+	  fields: {
+	    operator: {
+	      validate: (0, _index2.assertValueType)("string")
+	    },
+	    left: {
+	      validate: (0, _index2.assertNodeType)("LVal")
+	    },
+	    right: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    }
+	  },
+	  builder: ["operator", "left", "right"],
+	  visitor: ["left", "right"],
+	  aliases: ["Expression"]
+	});
+
+	(0, _index3.default)("BinaryExpression", {
+	  builder: ["operator", "left", "right"],
+	  fields: {
+	    operator: {
+	      validate: _index2.assertOneOf.apply(undefined, _constants.BINARY_OPERATORS)
+	    },
+	    left: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    right: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    }
+	  },
+	  visitor: ["left", "right"],
+	  aliases: ["Binary", "Expression"]
+	});
+
+	(0, _index3.default)("Directive", {
+	  visitor: ["value"],
+	  fields: {
+	    value: {
+	      validate: (0, _index2.assertNodeType)("DirectiveLiteral")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("DirectiveLiteral", {
+	  builder: ["value"],
+	  fields: {
+	    value: {
+	      validate: (0, _index2.assertValueType)("string")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("BlockStatement", {
+	  builder: ["body", "directives"],
+	  visitor: ["directives", "body"],
+	  fields: {
+	    directives: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Directive"))),
+	      default: []
+	    },
+	    body: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Statement")))
+	    }
+	  },
+	  aliases: ["Scopable", "BlockParent", "Block", "Statement"]
+	});
+
+	(0, _index3.default)("BreakStatement", {
+	  visitor: ["label"],
+	  fields: {
+	    label: {
+	      validate: (0, _index2.assertNodeType)("Identifier"),
+	      optional: true
+	    }
+	  },
+	  aliases: ["Statement", "Terminatorless", "CompletionStatement"]
+	});
+
+	(0, _index3.default)("CallExpression", {
+	  visitor: ["callee", "arguments"],
+	  fields: {
+	    callee: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    arguments: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Expression", "SpreadElement")))
+	    }
+	  },
+	  aliases: ["Expression"]
+	});
+
+	(0, _index3.default)("CatchClause", {
+	  visitor: ["param", "body"],
+	  fields: {
+	    param: {
+	      validate: (0, _index2.assertNodeType)("Identifier")
+	    },
+	    body: {
+	      validate: (0, _index2.assertNodeType)("BlockStatement")
+	    }
+	  },
+	  aliases: ["Scopable"]
+	});
+
+	(0, _index3.default)("ConditionalExpression", {
+	  visitor: ["test", "consequent", "alternate"],
+	  fields: {
+	    test: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    consequent: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    alternate: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    }
+	  },
+	  aliases: ["Expression", "Conditional"]
+	});
+
+	(0, _index3.default)("ContinueStatement", {
+	  visitor: ["label"],
+	  fields: {
+	    label: {
+	      validate: (0, _index2.assertNodeType)("Identifier"),
+	      optional: true
+	    }
+	  },
+	  aliases: ["Statement", "Terminatorless", "CompletionStatement"]
+	});
+
+	(0, _index3.default)("DebuggerStatement", {
+	  aliases: ["Statement"]
+	});
+
+	(0, _index3.default)("DoWhileStatement", {
+	  visitor: ["test", "body"],
+	  fields: {
+	    test: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    body: {
+	      validate: (0, _index2.assertNodeType)("Statement")
+	    }
+	  },
+	  aliases: ["Statement", "BlockParent", "Loop", "While", "Scopable"]
+	});
+
+	(0, _index3.default)("EmptyStatement", {
+	  aliases: ["Statement"]
+	});
+
+	(0, _index3.default)("ExpressionStatement", {
+	  visitor: ["expression"],
+	  fields: {
+	    expression: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    }
+	  },
+	  aliases: ["Statement", "ExpressionWrapper"]
+	});
+
+	(0, _index3.default)("File", {
+	  builder: ["program", "comments", "tokens"],
+	  visitor: ["program"],
+	  fields: {
+	    program: {
+	      validate: (0, _index2.assertNodeType)("Program")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("ForInStatement", {
+	  visitor: ["left", "right", "body"],
+	  aliases: ["Scopable", "Statement", "For", "BlockParent", "Loop", "ForXStatement"],
+	  fields: {
+	    left: {
+	      validate: (0, _index2.assertNodeType)("VariableDeclaration", "LVal")
+	    },
+	    right: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    body: {
+	      validate: (0, _index2.assertNodeType)("Statement")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("ForStatement", {
+	  visitor: ["init", "test", "update", "body"],
+	  aliases: ["Scopable", "Statement", "For", "BlockParent", "Loop"],
+	  fields: {
+	    init: {
+	      validate: (0, _index2.assertNodeType)("VariableDeclaration", "Expression"),
+	      optional: true
+	    },
+	    test: {
+	      validate: (0, _index2.assertNodeType)("Expression"),
+	      optional: true
+	    },
+	    update: {
+	      validate: (0, _index2.assertNodeType)("Expression"),
+	      optional: true
+	    },
+	    body: {
+	      validate: (0, _index2.assertNodeType)("Statement")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("FunctionDeclaration", {
+	  builder: ["id", "params", "body", "generator", "async"],
+	  visitor: ["id", "params", "body", "returnType", "typeParameters"],
+	  fields: {
+	    id: {
+	      validate: (0, _index2.assertNodeType)("Identifier")
+	    },
+	    params: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("LVal")))
+	    },
+	    body: {
+	      validate: (0, _index2.assertNodeType)("BlockStatement")
+	    },
+	    generator: {
+	      default: false,
+	      validate: (0, _index2.assertValueType)("boolean")
+	    },
+	    async: {
+	      default: false,
+	      validate: (0, _index2.assertValueType)("boolean")
+	    }
+	  },
+	  aliases: ["Scopable", "Function", "BlockParent", "FunctionParent", "Statement", "Pureish", "Declaration"]
+	});
+
+	(0, _index3.default)("FunctionExpression", {
+	  inherits: "FunctionDeclaration",
+	  aliases: ["Scopable", "Function", "BlockParent", "FunctionParent", "Expression", "Pureish"],
+	  fields: {
+	    id: {
+	      validate: (0, _index2.assertNodeType)("Identifier"),
+	      optional: true
+	    },
+	    params: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("LVal")))
+	    },
+	    body: {
+	      validate: (0, _index2.assertNodeType)("BlockStatement")
+	    },
+	    generator: {
+	      default: false,
+	      validate: (0, _index2.assertValueType)("boolean")
+	    },
+	    async: {
+	      default: false,
+	      validate: (0, _index2.assertValueType)("boolean")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("Identifier", {
+	  builder: ["name"],
+	  visitor: ["typeAnnotation"],
+	  aliases: ["Expression", "LVal"],
+	  fields: {
+	    name: {
+	      validate: function validate(node, key, val) {
+	        if (!t.isValidIdentifier(val)) {}
+	      }
+	    },
+	    decorators: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Decorator")))
+	    }
+	  }
+	});
+
+	(0, _index3.default)("IfStatement", {
+	  visitor: ["test", "consequent", "alternate"],
+	  aliases: ["Statement", "Conditional"],
+	  fields: {
+	    test: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    consequent: {
+	      validate: (0, _index2.assertNodeType)("Statement")
+	    },
+	    alternate: {
+	      optional: true,
+	      validate: (0, _index2.assertNodeType)("Statement")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("LabeledStatement", {
+	  visitor: ["label", "body"],
+	  aliases: ["Statement"],
+	  fields: {
+	    label: {
+	      validate: (0, _index2.assertNodeType)("Identifier")
+	    },
+	    body: {
+	      validate: (0, _index2.assertNodeType)("Statement")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("StringLiteral", {
+	  builder: ["value"],
+	  fields: {
+	    value: {
+	      validate: (0, _index2.assertValueType)("string")
+	    }
+	  },
+	  aliases: ["Expression", "Pureish", "Literal", "Immutable"]
+	});
+
+	(0, _index3.default)("NumericLiteral", {
+	  builder: ["value"],
+	  deprecatedAlias: "NumberLiteral",
+	  fields: {
+	    value: {
+	      validate: (0, _index2.assertValueType)("number")
+	    }
+	  },
+	  aliases: ["Expression", "Pureish", "Literal", "Immutable"]
+	});
+
+	(0, _index3.default)("NullLiteral", {
+	  aliases: ["Expression", "Pureish", "Literal", "Immutable"]
+	});
+
+	(0, _index3.default)("BooleanLiteral", {
+	  builder: ["value"],
+	  fields: {
+	    value: {
+	      validate: (0, _index2.assertValueType)("boolean")
+	    }
+	  },
+	  aliases: ["Expression", "Pureish", "Literal", "Immutable"]
+	});
+
+	(0, _index3.default)("RegExpLiteral", {
+	  builder: ["pattern", "flags"],
+	  deprecatedAlias: "RegexLiteral",
+	  aliases: ["Expression", "Literal"],
+	  fields: {
+	    pattern: {
+	      validate: (0, _index2.assertValueType)("string")
+	    },
+	    flags: {
+	      validate: (0, _index2.assertValueType)("string"),
+	      default: ""
+	    }
+	  }
+	});
+
+	(0, _index3.default)("LogicalExpression", {
+	  builder: ["operator", "left", "right"],
+	  visitor: ["left", "right"],
+	  aliases: ["Binary", "Expression"],
+	  fields: {
+	    operator: {
+	      validate: _index2.assertOneOf.apply(undefined, _constants.LOGICAL_OPERATORS)
+	    },
+	    left: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    right: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("MemberExpression", {
+	  builder: ["object", "property", "computed"],
+	  visitor: ["object", "property"],
+	  aliases: ["Expression", "LVal"],
+	  fields: {
+	    object: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    property: {
+	      validate: function validate(node, key, val) {
+	        var expectedType = node.computed ? "Expression" : "Identifier";
+	        (0, _index2.assertNodeType)(expectedType)(node, key, val);
+	      }
+	    },
+	    computed: {
+	      default: false
+	    }
+	  }
+	});
+
+	(0, _index3.default)("NewExpression", {
+	  visitor: ["callee", "arguments"],
+	  aliases: ["Expression"],
+	  fields: {
+	    callee: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    arguments: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Expression", "SpreadElement")))
+	    }
+	  }
+	});
+
+	(0, _index3.default)("Program", {
+	  visitor: ["directives", "body"],
+	  builder: ["body", "directives"],
+	  fields: {
+	    directives: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Directive"))),
+	      default: []
+	    },
+	    body: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Statement")))
+	    }
+	  },
+	  aliases: ["Scopable", "BlockParent", "Block", "FunctionParent"]
+	});
+
+	(0, _index3.default)("ObjectExpression", {
+	  visitor: ["properties"],
+	  aliases: ["Expression"],
+	  fields: {
+	    properties: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("ObjectMethod", "ObjectProperty", "SpreadProperty")))
+	    }
+	  }
+	});
+
+	(0, _index3.default)("ObjectMethod", {
+	  builder: ["kind", "key", "params", "body", "computed"],
+	  fields: {
+	    kind: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("string"), (0, _index2.assertOneOf)("method", "get", "set")),
+	      default: "method"
+	    },
+	    computed: {
+	      validate: (0, _index2.assertValueType)("boolean"),
+	      default: false
+	    },
+	    key: {
+	      validate: function validate(node, key, val) {
+	        var expectedTypes = node.computed ? ["Expression"] : ["Identifier", "StringLiteral", "NumericLiteral"];
+	        _index2.assertNodeType.apply(undefined, expectedTypes)(node, key, val);
+	      }
+	    },
+	    decorators: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Decorator")))
+	    },
+	    body: {
+	      validate: (0, _index2.assertNodeType)("BlockStatement")
+	    },
+	    generator: {
+	      default: false,
+	      validate: (0, _index2.assertValueType)("boolean")
+	    },
+	    async: {
+	      default: false,
+	      validate: (0, _index2.assertValueType)("boolean")
+	    }
+	  },
+	  visitor: ["key", "params", "body", "decorators", "returnType", "typeParameters"],
+	  aliases: ["UserWhitespacable", "Function", "Scopable", "BlockParent", "FunctionParent", "Method", "ObjectMember"]
+	});
+
+	(0, _index3.default)("ObjectProperty", {
+	  builder: ["key", "value", "computed", "shorthand", "decorators"],
+	  fields: {
+	    computed: {
+	      validate: (0, _index2.assertValueType)("boolean"),
+	      default: false
+	    },
+	    key: {
+	      validate: function validate(node, key, val) {
+	        var expectedTypes = node.computed ? ["Expression"] : ["Identifier", "StringLiteral", "NumericLiteral"];
+	        _index2.assertNodeType.apply(undefined, expectedTypes)(node, key, val);
+	      }
+	    },
+	    value: {
+	      validate: (0, _index2.assertNodeType)("Expression", "Pattern", "RestElement")
+	    },
+	    shorthand: {
+	      validate: (0, _index2.assertValueType)("boolean"),
+	      default: false
+	    },
+	    decorators: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Decorator"))),
+	      optional: true
+	    }
+	  },
+	  visitor: ["key", "value", "decorators"],
+	  aliases: ["UserWhitespacable", "Property", "ObjectMember"]
+	});
+
+	(0, _index3.default)("RestElement", {
+	  visitor: ["argument", "typeAnnotation"],
+	  aliases: ["LVal"],
+	  fields: {
+	    argument: {
+	      validate: (0, _index2.assertNodeType)("LVal")
+	    },
+	    decorators: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Decorator")))
+	    }
+	  }
+	});
+
+	(0, _index3.default)("ReturnStatement", {
+	  visitor: ["argument"],
+	  aliases: ["Statement", "Terminatorless", "CompletionStatement"],
+	  fields: {
+	    argument: {
+	      validate: (0, _index2.assertNodeType)("Expression"),
+	      optional: true
+	    }
+	  }
+	});
+
+	(0, _index3.default)("SequenceExpression", {
+	  visitor: ["expressions"],
+	  fields: {
+	    expressions: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Expression")))
+	    }
+	  },
+	  aliases: ["Expression"]
+	});
+
+	(0, _index3.default)("SwitchCase", {
+	  visitor: ["test", "consequent"],
+	  fields: {
+	    test: {
+	      validate: (0, _index2.assertNodeType)("Expression"),
+	      optional: true
+	    },
+	    consequent: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("Statement")))
+	    }
+	  }
+	});
+
+	(0, _index3.default)("SwitchStatement", {
+	  visitor: ["discriminant", "cases"],
+	  aliases: ["Statement", "BlockParent", "Scopable"],
+	  fields: {
+	    discriminant: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    cases: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("SwitchCase")))
+	    }
+	  }
+	});
+
+	(0, _index3.default)("ThisExpression", {
+	  aliases: ["Expression"]
+	});
+
+	(0, _index3.default)("ThrowStatement", {
+	  visitor: ["argument"],
+	  aliases: ["Statement", "Terminatorless", "CompletionStatement"],
+	  fields: {
+	    argument: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("TryStatement", {
+	  visitor: ["block", "handler", "finalizer"],
+	  aliases: ["Statement"],
+	  fields: {
+	    body: {
+	      validate: (0, _index2.assertNodeType)("BlockStatement")
+	    },
+	    handler: {
+	      optional: true,
+	      handler: (0, _index2.assertNodeType)("BlockStatement")
+	    },
+	    finalizer: {
+	      optional: true,
+	      validate: (0, _index2.assertNodeType)("BlockStatement")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("UnaryExpression", {
+	  builder: ["operator", "argument", "prefix"],
+	  fields: {
+	    prefix: {
+	      default: true
+	    },
+	    argument: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    operator: {
+	      validate: _index2.assertOneOf.apply(undefined, _constants.UNARY_OPERATORS)
+	    }
+	  },
+	  visitor: ["argument"],
+	  aliases: ["UnaryLike", "Expression"]
+	});
+
+	(0, _index3.default)("UpdateExpression", {
+	  builder: ["operator", "argument", "prefix"],
+	  fields: {
+	    prefix: {
+	      default: false
+	    },
+	    argument: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    operator: {
+	      validate: _index2.assertOneOf.apply(undefined, _constants.UPDATE_OPERATORS)
+	    }
+	  },
+	  visitor: ["argument"],
+	  aliases: ["Expression"]
+	});
+
+	(0, _index3.default)("VariableDeclaration", {
+	  builder: ["kind", "declarations"],
+	  visitor: ["declarations"],
+	  aliases: ["Statement", "Declaration"],
+	  fields: {
+	    kind: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("string"), (0, _index2.assertOneOf)("var", "let", "const"))
+	    },
+	    declarations: {
+	      validate: (0, _index2.chain)((0, _index2.assertValueType)("array"), (0, _index2.assertEach)((0, _index2.assertNodeType)("VariableDeclarator")))
+	    }
+	  }
+	});
+
+	(0, _index3.default)("VariableDeclarator", {
+	  visitor: ["id", "init"],
+	  fields: {
+	    id: {
+	      validate: (0, _index2.assertNodeType)("LVal")
+	    },
+	    init: {
+	      optional: true,
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("WhileStatement", {
+	  visitor: ["test", "body"],
+	  aliases: ["Statement", "BlockParent", "Loop", "While", "Scopable"],
+	  fields: {
+	    test: {
+	      validate: (0, _index2.assertNodeType)("Expression")
+	    },
+	    body: {
+	      validate: (0, _index2.assertNodeType)("BlockStatement", "Statement")
+	    }
+	  }
+	});
+
+	(0, _index3.default)("WithStatement", {
+	  visitor: ["object", "body"],
+	  aliases: ["Statement"],
+	  fields: {
+	    object: {
+	      object: (0, _index2.assertNodeType)("Expression")
+	    },
+	    body: {
+	      validate: (0, _index2.assertNodeType)("BlockStatement", "Statement")
+	    }
+	  }
+	});
+
+/***/ }),
+/* 383 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _index = __webpack_require__(26);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	(0, _index2.default)("AssignmentPattern", {
+	  visitor: ["left", "right"],
+	  aliases: ["Pattern", "LVal"],
+	  fields: {
+	    left: {
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    },
+	    right: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    },
+	    decorators: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("Decorator")))
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ArrayPattern", {
+	  visitor: ["elements", "typeAnnotation"],
+	  aliases: ["Pattern", "LVal"],
+	  fields: {
+	    elements: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("Identifier", "Pattern", "RestElement")))
+	    },
+	    decorators: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("Decorator")))
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ArrowFunctionExpression", {
+	  builder: ["params", "body", "async"],
+	  visitor: ["params", "body", "returnType", "typeParameters"],
+	  aliases: ["Scopable", "Function", "BlockParent", "FunctionParent", "Expression", "Pureish"],
+	  fields: {
+	    params: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("LVal")))
+	    },
+	    body: {
+	      validate: (0, _index.assertNodeType)("BlockStatement", "Expression")
+	    },
+	    async: {
+	      validate: (0, _index.assertValueType)("boolean"),
+	      default: false
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ClassBody", {
+	  visitor: ["body"],
+	  fields: {
+	    body: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("ClassMethod", "ClassProperty")))
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ClassDeclaration", {
+	  builder: ["id", "superClass", "body", "decorators"],
+	  visitor: ["id", "body", "superClass", "mixins", "typeParameters", "superTypeParameters", "implements", "decorators"],
+	  aliases: ["Scopable", "Class", "Statement", "Declaration", "Pureish"],
+	  fields: {
+	    id: {
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    },
+	    body: {
+	      validate: (0, _index.assertNodeType)("ClassBody")
+	    },
+	    superClass: {
+	      optional: true,
+	      validate: (0, _index.assertNodeType)("Expression")
+	    },
+	    decorators: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("Decorator")))
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ClassExpression", {
+	  inherits: "ClassDeclaration",
+	  aliases: ["Scopable", "Class", "Expression", "Pureish"],
+	  fields: {
+	    id: {
+	      optional: true,
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    },
+	    body: {
+	      validate: (0, _index.assertNodeType)("ClassBody")
+	    },
+	    superClass: {
+	      optional: true,
+	      validate: (0, _index.assertNodeType)("Expression")
+	    },
+	    decorators: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("Decorator")))
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ExportAllDeclaration", {
+	  visitor: ["source"],
+	  aliases: ["Statement", "Declaration", "ModuleDeclaration", "ExportDeclaration"],
+	  fields: {
+	    source: {
+	      validate: (0, _index.assertNodeType)("StringLiteral")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ExportDefaultDeclaration", {
+	  visitor: ["declaration"],
+	  aliases: ["Statement", "Declaration", "ModuleDeclaration", "ExportDeclaration"],
+	  fields: {
+	    declaration: {
+	      validate: (0, _index.assertNodeType)("FunctionDeclaration", "ClassDeclaration", "Expression")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ExportNamedDeclaration", {
+	  visitor: ["declaration", "specifiers", "source"],
+	  aliases: ["Statement", "Declaration", "ModuleDeclaration", "ExportDeclaration"],
+	  fields: {
+	    declaration: {
+	      validate: (0, _index.assertNodeType)("Declaration"),
+	      optional: true
+	    },
+	    specifiers: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("ExportSpecifier")))
+	    },
+	    source: {
+	      validate: (0, _index.assertNodeType)("StringLiteral"),
+	      optional: true
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ExportSpecifier", {
+	  visitor: ["local", "exported"],
+	  aliases: ["ModuleSpecifier"],
+	  fields: {
+	    local: {
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    },
+	    exported: {
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ForOfStatement", {
+	  visitor: ["left", "right", "body"],
+	  aliases: ["Scopable", "Statement", "For", "BlockParent", "Loop", "ForXStatement"],
+	  fields: {
+	    left: {
+	      validate: (0, _index.assertNodeType)("VariableDeclaration", "LVal")
+	    },
+	    right: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    },
+	    body: {
+	      validate: (0, _index.assertNodeType)("Statement")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ImportDeclaration", {
+	  visitor: ["specifiers", "source"],
+	  aliases: ["Statement", "Declaration", "ModuleDeclaration"],
+	  fields: {
+	    specifiers: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("ImportSpecifier", "ImportDefaultSpecifier", "ImportNamespaceSpecifier")))
+	    },
+	    source: {
+	      validate: (0, _index.assertNodeType)("StringLiteral")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ImportDefaultSpecifier", {
+	  visitor: ["local"],
+	  aliases: ["ModuleSpecifier"],
+	  fields: {
+	    local: {
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ImportNamespaceSpecifier", {
+	  visitor: ["local"],
+	  aliases: ["ModuleSpecifier"],
+	  fields: {
+	    local: {
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ImportSpecifier", {
+	  visitor: ["local", "imported"],
+	  aliases: ["ModuleSpecifier"],
+	  fields: {
+	    local: {
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    },
+	    imported: {
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    },
+	    importKind: {
+	      validate: (0, _index.assertOneOf)(null, "type", "typeof")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("MetaProperty", {
+	  visitor: ["meta", "property"],
+	  aliases: ["Expression"],
+	  fields: {
+	    meta: {
+	      validate: (0, _index.assertValueType)("string")
+	    },
+	    property: {
+	      validate: (0, _index.assertValueType)("string")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ClassMethod", {
+	  aliases: ["Function", "Scopable", "BlockParent", "FunctionParent", "Method"],
+	  builder: ["kind", "key", "params", "body", "computed", "static"],
+	  visitor: ["key", "params", "body", "decorators", "returnType", "typeParameters"],
+	  fields: {
+	    kind: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("string"), (0, _index.assertOneOf)("get", "set", "method", "constructor")),
+	      default: "method"
+	    },
+	    computed: {
+	      default: false,
+	      validate: (0, _index.assertValueType)("boolean")
+	    },
+	    static: {
+	      default: false,
+	      validate: (0, _index.assertValueType)("boolean")
+	    },
+	    key: {
+	      validate: function validate(node, key, val) {
+	        var expectedTypes = node.computed ? ["Expression"] : ["Identifier", "StringLiteral", "NumericLiteral"];
+	        _index.assertNodeType.apply(undefined, expectedTypes)(node, key, val);
+	      }
+	    },
+	    params: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("LVal")))
+	    },
+	    body: {
+	      validate: (0, _index.assertNodeType)("BlockStatement")
+	    },
+	    generator: {
+	      default: false,
+	      validate: (0, _index.assertValueType)("boolean")
+	    },
+	    async: {
+	      default: false,
+	      validate: (0, _index.assertValueType)("boolean")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ObjectPattern", {
+	  visitor: ["properties", "typeAnnotation"],
+	  aliases: ["Pattern", "LVal"],
+	  fields: {
+	    properties: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("RestProperty", "Property")))
+	    },
+	    decorators: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("Decorator")))
+	    }
+	  }
+	});
+
+	(0, _index2.default)("SpreadElement", {
+	  visitor: ["argument"],
+	  aliases: ["UnaryLike"],
+	  fields: {
+	    argument: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("Super", {
+	  aliases: ["Expression"]
+	});
+
+	(0, _index2.default)("TaggedTemplateExpression", {
+	  visitor: ["tag", "quasi"],
+	  aliases: ["Expression"],
+	  fields: {
+	    tag: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    },
+	    quasi: {
+	      validate: (0, _index.assertNodeType)("TemplateLiteral")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("TemplateElement", {
+	  builder: ["value", "tail"],
+	  fields: {
+	    value: {},
+	    tail: {
+	      validate: (0, _index.assertValueType)("boolean"),
+	      default: false
+	    }
+	  }
+	});
+
+	(0, _index2.default)("TemplateLiteral", {
+	  visitor: ["quasis", "expressions"],
+	  aliases: ["Expression", "Literal"],
+	  fields: {
+	    quasis: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("TemplateElement")))
+	    },
+	    expressions: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("Expression")))
+	    }
+	  }
+	});
+
+	(0, _index2.default)("YieldExpression", {
+	  builder: ["argument", "delegate"],
+	  visitor: ["argument"],
+	  aliases: ["Expression", "Terminatorless"],
+	  fields: {
+	    delegate: {
+	      validate: (0, _index.assertValueType)("boolean"),
+	      default: false
+	    },
+	    argument: {
+	      optional: true,
+	      validate: (0, _index.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+/***/ }),
+/* 384 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _index = __webpack_require__(26);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	(0, _index2.default)("AwaitExpression", {
+	  builder: ["argument"],
+	  visitor: ["argument"],
+	  aliases: ["Expression", "Terminatorless"],
+	  fields: {
+	    argument: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ForAwaitStatement", {
+	  visitor: ["left", "right", "body"],
+	  aliases: ["Scopable", "Statement", "For", "BlockParent", "Loop", "ForXStatement"],
+	  fields: {
+	    left: {
+	      validate: (0, _index.assertNodeType)("VariableDeclaration", "LVal")
+	    },
+	    right: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    },
+	    body: {
+	      validate: (0, _index.assertNodeType)("Statement")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("BindExpression", {
+	  visitor: ["object", "callee"],
+	  aliases: ["Expression"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("Import", {
+	  aliases: ["Expression"]
+	});
+
+	(0, _index2.default)("Decorator", {
+	  visitor: ["expression"],
+	  fields: {
+	    expression: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("DoExpression", {
+	  visitor: ["body"],
+	  aliases: ["Expression"],
+	  fields: {
+	    body: {
+	      validate: (0, _index.assertNodeType)("BlockStatement")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ExportDefaultSpecifier", {
+	  visitor: ["exported"],
+	  aliases: ["ModuleSpecifier"],
+	  fields: {
+	    exported: {
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("ExportNamespaceSpecifier", {
+	  visitor: ["exported"],
+	  aliases: ["ModuleSpecifier"],
+	  fields: {
+	    exported: {
+	      validate: (0, _index.assertNodeType)("Identifier")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("RestProperty", {
+	  visitor: ["argument"],
+	  aliases: ["UnaryLike"],
+	  fields: {
+	    argument: {
+	      validate: (0, _index.assertNodeType)("LVal")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("SpreadProperty", {
+	  visitor: ["argument"],
+	  aliases: ["UnaryLike"],
+	  fields: {
+	    argument: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+/***/ }),
+/* 385 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _index = __webpack_require__(26);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	(0, _index2.default)("AnyTypeAnnotation", {
+	  aliases: ["Flow", "FlowBaseAnnotation"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("ArrayTypeAnnotation", {
+	  visitor: ["elementType"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("BooleanTypeAnnotation", {
+	  aliases: ["Flow", "FlowBaseAnnotation"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("BooleanLiteralTypeAnnotation", {
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("NullLiteralTypeAnnotation", {
+	  aliases: ["Flow", "FlowBaseAnnotation"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("ClassImplements", {
+	  visitor: ["id", "typeParameters"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("ClassProperty", {
+	  visitor: ["key", "value", "typeAnnotation", "decorators"],
+	  builder: ["key", "value", "typeAnnotation", "decorators", "computed"],
+	  aliases: ["Property"],
+	  fields: {
+	    computed: {
+	      validate: (0, _index.assertValueType)("boolean"),
+	      default: false
+	    }
+	  }
+	});
+
+	(0, _index2.default)("DeclareClass", {
+	  visitor: ["id", "typeParameters", "extends", "body"],
+	  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("DeclareFunction", {
+	  visitor: ["id"],
+	  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("DeclareInterface", {
+	  visitor: ["id", "typeParameters", "extends", "body"],
+	  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("DeclareModule", {
+	  visitor: ["id", "body"],
+	  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("DeclareModuleExports", {
+	  visitor: ["typeAnnotation"],
+	  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("DeclareTypeAlias", {
+	  visitor: ["id", "typeParameters", "right"],
+	  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("DeclareVariable", {
+	  visitor: ["id"],
+	  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("ExistentialTypeParam", {
+	  aliases: ["Flow"]
+	});
+
+	(0, _index2.default)("FunctionTypeAnnotation", {
+	  visitor: ["typeParameters", "params", "rest", "returnType"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("FunctionTypeParam", {
+	  visitor: ["name", "typeAnnotation"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("GenericTypeAnnotation", {
+	  visitor: ["id", "typeParameters"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("InterfaceExtends", {
+	  visitor: ["id", "typeParameters"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("InterfaceDeclaration", {
+	  visitor: ["id", "typeParameters", "extends", "body"],
+	  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("IntersectionTypeAnnotation", {
+	  visitor: ["types"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("MixedTypeAnnotation", {
+	  aliases: ["Flow", "FlowBaseAnnotation"]
+	});
+
+	(0, _index2.default)("EmptyTypeAnnotation", {
+	  aliases: ["Flow", "FlowBaseAnnotation"]
+	});
+
+	(0, _index2.default)("NullableTypeAnnotation", {
+	  visitor: ["typeAnnotation"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("NumericLiteralTypeAnnotation", {
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("NumberTypeAnnotation", {
+	  aliases: ["Flow", "FlowBaseAnnotation"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("StringLiteralTypeAnnotation", {
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("StringTypeAnnotation", {
+	  aliases: ["Flow", "FlowBaseAnnotation"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("ThisTypeAnnotation", {
+	  aliases: ["Flow", "FlowBaseAnnotation"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("TupleTypeAnnotation", {
+	  visitor: ["types"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("TypeofTypeAnnotation", {
+	  visitor: ["argument"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("TypeAlias", {
+	  visitor: ["id", "typeParameters", "right"],
+	  aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("TypeAnnotation", {
+	  visitor: ["typeAnnotation"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("TypeCastExpression", {
+	  visitor: ["expression", "typeAnnotation"],
+	  aliases: ["Flow", "ExpressionWrapper", "Expression"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("TypeParameter", {
+	  visitor: ["bound"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("TypeParameterDeclaration", {
+	  visitor: ["params"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("TypeParameterInstantiation", {
+	  visitor: ["params"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("ObjectTypeAnnotation", {
+	  visitor: ["properties", "indexers", "callProperties"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("ObjectTypeCallProperty", {
+	  visitor: ["value"],
+	  aliases: ["Flow", "UserWhitespacable"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("ObjectTypeIndexer", {
+	  visitor: ["id", "key", "value"],
+	  aliases: ["Flow", "UserWhitespacable"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("ObjectTypeProperty", {
+	  visitor: ["key", "value"],
+	  aliases: ["Flow", "UserWhitespacable"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("ObjectTypeSpreadProperty", {
+	  visitor: ["argument"],
+	  aliases: ["Flow", "UserWhitespacable"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("QualifiedTypeIdentifier", {
+	  visitor: ["id", "qualification"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("UnionTypeAnnotation", {
+	  visitor: ["types"],
+	  aliases: ["Flow"],
+	  fields: {}
+	});
+
+	(0, _index2.default)("VoidTypeAnnotation", {
+	  aliases: ["Flow", "FlowBaseAnnotation"],
+	  fields: {}
+	});
+
+/***/ }),
+/* 386 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	__webpack_require__(26);
+
+	__webpack_require__(382);
+
+	__webpack_require__(383);
+
+	__webpack_require__(385);
+
+	__webpack_require__(387);
+
+	__webpack_require__(388);
+
+	__webpack_require__(384);
+
+/***/ }),
+/* 387 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _index = __webpack_require__(26);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	(0, _index2.default)("JSXAttribute", {
+	  visitor: ["name", "value"],
+	  aliases: ["JSX", "Immutable"],
+	  fields: {
+	    name: {
+	      validate: (0, _index.assertNodeType)("JSXIdentifier", "JSXNamespacedName")
+	    },
+	    value: {
+	      optional: true,
+	      validate: (0, _index.assertNodeType)("JSXElement", "StringLiteral", "JSXExpressionContainer")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("JSXClosingElement", {
+	  visitor: ["name"],
+	  aliases: ["JSX", "Immutable"],
+	  fields: {
+	    name: {
+	      validate: (0, _index.assertNodeType)("JSXIdentifier", "JSXMemberExpression")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("JSXElement", {
+	  builder: ["openingElement", "closingElement", "children", "selfClosing"],
+	  visitor: ["openingElement", "children", "closingElement"],
+	  aliases: ["JSX", "Immutable", "Expression"],
+	  fields: {
+	    openingElement: {
+	      validate: (0, _index.assertNodeType)("JSXOpeningElement")
+	    },
+	    closingElement: {
+	      optional: true,
+	      validate: (0, _index.assertNodeType)("JSXClosingElement")
+	    },
+	    children: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("JSXText", "JSXExpressionContainer", "JSXSpreadChild", "JSXElement")))
+	    }
+	  }
+	});
+
+	(0, _index2.default)("JSXEmptyExpression", {
+	  aliases: ["JSX", "Expression"]
+	});
+
+	(0, _index2.default)("JSXExpressionContainer", {
+	  visitor: ["expression"],
+	  aliases: ["JSX", "Immutable"],
+	  fields: {
+	    expression: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("JSXSpreadChild", {
+	  visitor: ["expression"],
+	  aliases: ["JSX", "Immutable"],
+	  fields: {
+	    expression: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("JSXIdentifier", {
+	  builder: ["name"],
+	  aliases: ["JSX", "Expression"],
+	  fields: {
+	    name: {
+	      validate: (0, _index.assertValueType)("string")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("JSXMemberExpression", {
+	  visitor: ["object", "property"],
+	  aliases: ["JSX", "Expression"],
+	  fields: {
+	    object: {
+	      validate: (0, _index.assertNodeType)("JSXMemberExpression", "JSXIdentifier")
+	    },
+	    property: {
+	      validate: (0, _index.assertNodeType)("JSXIdentifier")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("JSXNamespacedName", {
+	  visitor: ["namespace", "name"],
+	  aliases: ["JSX"],
+	  fields: {
+	    namespace: {
+	      validate: (0, _index.assertNodeType)("JSXIdentifier")
+	    },
+	    name: {
+	      validate: (0, _index.assertNodeType)("JSXIdentifier")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("JSXOpeningElement", {
+	  builder: ["name", "attributes", "selfClosing"],
+	  visitor: ["name", "attributes"],
+	  aliases: ["JSX", "Immutable"],
+	  fields: {
+	    name: {
+	      validate: (0, _index.assertNodeType)("JSXIdentifier", "JSXMemberExpression")
+	    },
+	    selfClosing: {
+	      default: false,
+	      validate: (0, _index.assertValueType)("boolean")
+	    },
+	    attributes: {
+	      validate: (0, _index.chain)((0, _index.assertValueType)("array"), (0, _index.assertEach)((0, _index.assertNodeType)("JSXAttribute", "JSXSpreadAttribute")))
+	    }
+	  }
+	});
+
+	(0, _index2.default)("JSXSpreadAttribute", {
+	  visitor: ["argument"],
+	  aliases: ["JSX"],
+	  fields: {
+	    argument: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+	(0, _index2.default)("JSXText", {
+	  aliases: ["JSX", "Immutable"],
+	  builder: ["value"],
+	  fields: {
+	    value: {
+	      validate: (0, _index.assertValueType)("string")
+	    }
+	  }
+	});
+
+/***/ }),
+/* 388 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _index = __webpack_require__(26);
+
+	var _index2 = _interopRequireDefault(_index);
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	(0, _index2.default)("Noop", {
+	  visitor: []
+	});
+
+	(0, _index2.default)("ParenthesizedExpression", {
+	  visitor: ["expression"],
+	  aliases: ["Expression", "ExpressionWrapper"],
+	  fields: {
+	    expression: {
+	      validate: (0, _index.assertNodeType)("Expression")
+	    }
+	  }
+	});
+
+/***/ }),
+/* 389 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.createUnionTypeAnnotation = createUnionTypeAnnotation;
+	exports.removeTypeDuplicates = removeTypeDuplicates;
+	exports.createTypeAnnotationBasedOnTypeof = createTypeAnnotationBasedOnTypeof;
+
+	var _index = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_index);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function createUnionTypeAnnotation(types) {
+	  var flattened = removeTypeDuplicates(types);
+
+	  if (flattened.length === 1) {
+	    return flattened[0];
+	  } else {
+	    return t.unionTypeAnnotation(flattened);
+	  }
+	}
+
+	function removeTypeDuplicates(nodes) {
+	  var generics = {};
+	  var bases = {};
+
+	  var typeGroups = [];
+
+	  var types = [];
+
+	  for (var i = 0; i < nodes.length; i++) {
+	    var node = nodes[i];
+	    if (!node) continue;
+
+	    if (types.indexOf(node) >= 0) {
+	      continue;
+	    }
+
+	    if (t.isAnyTypeAnnotation(node)) {
+	      return [node];
+	    }
+
+	    if (t.isFlowBaseAnnotation(node)) {
+	      bases[node.type] = node;
+	      continue;
+	    }
+
+	    if (t.isUnionTypeAnnotation(node)) {
+	      if (typeGroups.indexOf(node.types) < 0) {
+	        nodes = nodes.concat(node.types);
+	        typeGroups.push(node.types);
+	      }
+	      continue;
+	    }
+
+	    if (t.isGenericTypeAnnotation(node)) {
+	      var name = node.id.name;
+
+	      if (generics[name]) {
+	        var existing = generics[name];
+	        if (existing.typeParameters) {
+	          if (node.typeParameters) {
+	            existing.typeParameters.params = removeTypeDuplicates(existing.typeParameters.params.concat(node.typeParameters.params));
+	          }
+	        } else {
+	          existing = node.typeParameters;
+	        }
+	      } else {
+	        generics[name] = node;
+	      }
+
+	      continue;
+	    }
+
+	    types.push(node);
+	  }
+
+	  for (var type in bases) {
+	    types.push(bases[type]);
+	  }
+
+	  for (var _name in generics) {
+	    types.push(generics[_name]);
+	  }
+
+	  return types;
+	}
+
+	function createTypeAnnotationBasedOnTypeof(type) {
+	  if (type === "string") {
+	    return t.stringTypeAnnotation();
+	  } else if (type === "number") {
+	    return t.numberTypeAnnotation();
+	  } else if (type === "undefined") {
+	    return t.voidTypeAnnotation();
+	  } else if (type === "boolean") {
+	    return t.booleanTypeAnnotation();
+	  } else if (type === "function") {
+	    return t.genericTypeAnnotation(t.identifier("Function"));
+	  } else if (type === "object") {
+	    return t.genericTypeAnnotation(t.identifier("Object"));
+	  } else if (type === "symbol") {
+	    return t.genericTypeAnnotation(t.identifier("Symbol"));
+	  } else {
+	    throw new Error("Invalid typeof value");
+	  }
+	}
+
+/***/ }),
+/* 390 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.isReactComponent = undefined;
+	exports.isCompatTag = isCompatTag;
+	exports.buildChildren = buildChildren;
+
+	var _index = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_index);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	var isReactComponent = exports.isReactComponent = t.buildMatchMemberExpression("React.Component");
+
+	function isCompatTag(tagName) {
+	  return !!tagName && /^[a-z]|\-/.test(tagName);
+	}
+
+	function cleanJSXElementLiteralChild(child, args) {
+	  var lines = child.value.split(/\r\n|\n|\r/);
+
+	  var lastNonEmptyLine = 0;
+
+	  for (var i = 0; i < lines.length; i++) {
+	    if (lines[i].match(/[^ \t]/)) {
+	      lastNonEmptyLine = i;
+	    }
+	  }
+
+	  var str = "";
+
+	  for (var _i = 0; _i < lines.length; _i++) {
+	    var line = lines[_i];
+
+	    var isFirstLine = _i === 0;
+	    var isLastLine = _i === lines.length - 1;
+	    var isLastNonEmptyLine = _i === lastNonEmptyLine;
+
+	    var trimmedLine = line.replace(/\t/g, " ");
+
+	    if (!isFirstLine) {
+	      trimmedLine = trimmedLine.replace(/^[ ]+/, "");
+	    }
+
+	    if (!isLastLine) {
+	      trimmedLine = trimmedLine.replace(/[ ]+$/, "");
+	    }
+
+	    if (trimmedLine) {
+	      if (!isLastNonEmptyLine) {
+	        trimmedLine += " ";
+	      }
+
+	      str += trimmedLine;
+	    }
+	  }
+
+	  if (str) args.push(t.stringLiteral(str));
+	}
+
+	function buildChildren(node) {
+	  var elems = [];
+
+	  for (var i = 0; i < node.children.length; i++) {
+	    var child = node.children[i];
+
+	    if (t.isJSXText(child)) {
+	      cleanJSXElementLiteralChild(child, elems);
+	      continue;
+	    }
+
+	    if (t.isJSXExpressionContainer(child)) child = child.expression;
+	    if (t.isJSXEmptyExpression(child)) continue;
+
+	    elems.push(child);
+	  }
+
+	  return elems;
+	}
+
+/***/ }),
+/* 391 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	var _keys = __webpack_require__(13);
+
+	var _keys2 = _interopRequireDefault(_keys);
+
+	var _typeof2 = __webpack_require__(11);
+
+	var _typeof3 = _interopRequireDefault(_typeof2);
+
+	var _getIterator2 = __webpack_require__(2);
+
+	var _getIterator3 = _interopRequireDefault(_getIterator2);
+
+	exports.isBinding = isBinding;
+	exports.isReferenced = isReferenced;
+	exports.isValidIdentifier = isValidIdentifier;
+	exports.isLet = isLet;
+	exports.isBlockScoped = isBlockScoped;
+	exports.isVar = isVar;
+	exports.isSpecifierDefault = isSpecifierDefault;
+	exports.isScope = isScope;
+	exports.isImmutable = isImmutable;
+	exports.isNodesEquivalent = isNodesEquivalent;
+
+	var _retrievers = __webpack_require__(222);
+
+	var _esutils = __webpack_require__(97);
+
+	var _esutils2 = _interopRequireDefault(_esutils);
+
+	var _index = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_index);
+
+	var _constants = __webpack_require__(134);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function isBinding(node, parent) {
+	  var keys = _retrievers.getBindingIdentifiers.keys[parent.type];
+	  if (keys) {
+	    for (var i = 0; i < keys.length; i++) {
+	      var key = keys[i];
+	      var val = parent[key];
+	      if (Array.isArray(val)) {
+	        if (val.indexOf(node) >= 0) return true;
+	      } else {
+	        if (val === node) return true;
+	      }
+	    }
+	  }
+
+	  return false;
+	}
+
+	function isReferenced(node, parent) {
+	  switch (parent.type) {
+	    case "BindExpression":
+	      return parent.object === node || parent.callee === node;
+
+	    case "MemberExpression":
+	    case "JSXMemberExpression":
+	      if (parent.property === node && parent.computed) {
+	        return true;
+	      } else if (parent.object === node) {
+	        return true;
+	      } else {
+	        return false;
+	      }
+
+	    case "MetaProperty":
+	      return false;
+
+	    case "ObjectProperty":
+	      if (parent.key === node) {
+	        return parent.computed;
+	      }
+
+	    case "VariableDeclarator":
+	      return parent.id !== node;
+
+	    case "ArrowFunctionExpression":
+	    case "FunctionDeclaration":
+	    case "FunctionExpression":
+	      for (var _iterator = parent.params, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : (0, _getIterator3.default)(_iterator);;) {
+	        var _ref;
+
+	        if (_isArray) {
+	          if (_i >= _iterator.length) break;
+	          _ref = _iterator[_i++];
+	        } else {
+	          _i = _iterator.next();
+	          if (_i.done) break;
+	          _ref = _i.value;
+	        }
+
+	        var param = _ref;
+
+	        if (param === node) return false;
+	      }
+
+	      return parent.id !== node;
+
+	    case "ExportSpecifier":
+	      if (parent.source) {
+	        return false;
+	      } else {
+	        return parent.local === node;
+	      }
+
+	    case "ExportNamespaceSpecifier":
+	    case "ExportDefaultSpecifier":
+	      return false;
+
+	    case "JSXAttribute":
+	      return parent.name !== node;
+
+	    case "ClassProperty":
+	      if (parent.key === node) {
+	        return parent.computed;
+	      } else {
+	        return parent.value === node;
+	      }
+
+	    case "ImportDefaultSpecifier":
+	    case "ImportNamespaceSpecifier":
+	    case "ImportSpecifier":
+	      return false;
+
+	    case "ClassDeclaration":
+	    case "ClassExpression":
+	      return parent.id !== node;
+
+	    case "ClassMethod":
+	    case "ObjectMethod":
+	      return parent.key === node && parent.computed;
+
+	    case "LabeledStatement":
+	      return false;
+
+	    case "CatchClause":
+	      return parent.param !== node;
+
+	    case "RestElement":
+	      return false;
+
+	    case "AssignmentExpression":
+	      return parent.right === node;
+
+	    case "AssignmentPattern":
+	      return parent.right === node;
+
+	    case "ObjectPattern":
+	    case "ArrayPattern":
+	      return false;
+	  }
+
+	  return true;
+	}
+
+	function isValidIdentifier(name) {
+	  if (typeof name !== "string" || _esutils2.default.keyword.isReservedWordES6(name, true)) {
+	    return false;
+	  } else if (name === "await") {
+	    return false;
+	  } else {
+	    return _esutils2.default.keyword.isIdentifierNameES6(name);
+	  }
+	}
+
+	function isLet(node) {
+	  return t.isVariableDeclaration(node) && (node.kind !== "var" || node[_constants.BLOCK_SCOPED_SYMBOL]);
+	}
+
+	function isBlockScoped(node) {
+	  return t.isFunctionDeclaration(node) || t.isClassDeclaration(node) || t.isLet(node);
+	}
+
+	function isVar(node) {
+	  return t.isVariableDeclaration(node, { kind: "var" }) && !node[_constants.BLOCK_SCOPED_SYMBOL];
+	}
+
+	function isSpecifierDefault(specifier) {
+	  return t.isImportDefaultSpecifier(specifier) || t.isIdentifier(specifier.imported || specifier.exported, { name: "default" });
+	}
+
+	function isScope(node, parent) {
+	  if (t.isBlockStatement(node) && t.isFunction(parent, { body: node })) {
+	    return false;
+	  }
+
+	  return t.isScopable(node);
+	}
+
+	function isImmutable(node) {
+	  if (t.isType(node.type, "Immutable")) return true;
+
+	  if (t.isIdentifier(node)) {
+	    if (node.name === "undefined") {
+	      return true;
+	    } else {
+	      return false;
+	    }
+	  }
+
+	  return false;
+	}
+
+	function isNodesEquivalent(a, b) {
+	  if ((typeof a === "undefined" ? "undefined" : (0, _typeof3.default)(a)) !== "object" || (typeof a === "undefined" ? "undefined" : (0, _typeof3.default)(a)) !== "object" || a == null || b == null) {
+	    return a === b;
+	  }
+
+	  if (a.type !== b.type) {
+	    return false;
+	  }
+
+	  var fields = (0, _keys2.default)(t.NODE_FIELDS[a.type] || a.type);
+
+	  for (var _iterator2 = fields, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : (0, _getIterator3.default)(_iterator2);;) {
+	    var _ref2;
+
+	    if (_isArray2) {
+	      if (_i2 >= _iterator2.length) break;
+	      _ref2 = _iterator2[_i2++];
+	    } else {
+	      _i2 = _iterator2.next();
+	      if (_i2.done) break;
+	      _ref2 = _i2.value;
+	    }
+
+	    var field = _ref2;
+
+	    if ((0, _typeof3.default)(a[field]) !== (0, _typeof3.default)(b[field])) {
+	      return false;
+	    }
+
+	    if (Array.isArray(a[field])) {
+	      if (!Array.isArray(b[field])) {
+	        return false;
+	      }
+	      if (a[field].length !== b[field].length) {
+	        return false;
+	      }
+
+	      for (var i = 0; i < a[field].length; i++) {
+	        if (!isNodesEquivalent(a[field][i], b[field][i])) {
+	          return false;
+	        }
+	      }
+	      continue;
+	    }
+
+	    if (!isNodesEquivalent(a[field], b[field])) {
+	      return false;
+	    }
+	  }
+
+	  return true;
+	}
+
+/***/ }),
+/* 392 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = balanced;
+	function balanced(a, b, str) {
+	  if (a instanceof RegExp) a = maybeMatch(a, str);
+	  if (b instanceof RegExp) b = maybeMatch(b, str);
+
+	  var r = range(a, b, str);
+
+	  return r && {
+	    start: r[0],
+	    end: r[1],
+	    pre: str.slice(0, r[0]),
+	    body: str.slice(r[0] + a.length, r[1]),
+	    post: str.slice(r[1] + b.length)
+	  };
+	}
+
+	function maybeMatch(reg, str) {
+	  var m = str.match(reg);
+	  return m ? m[0] : null;
+	}
+
+	balanced.range = range;
+	function range(a, b, str) {
+	  var begs, beg, left, right, result;
+	  var ai = str.indexOf(a);
+	  var bi = str.indexOf(b, ai + 1);
+	  var i = ai;
+
+	  if (ai >= 0 && bi > 0) {
+	    begs = [];
+	    left = str.length;
+
+	    while (i >= 0 && !result) {
+	      if (i == ai) {
+	        begs.push(i);
+	        ai = str.indexOf(a, i + 1);
+	      } else if (begs.length == 1) {
+	        result = [begs.pop(), bi];
+	      } else {
+	        beg = begs.pop();
+	        if (beg < left) {
+	          left = beg;
+	          right = bi;
+	        }
+
+	        bi = str.indexOf(b, i + 1);
+	      }
+
+	      i = ai < bi && ai >= 0 ? ai : bi;
+	    }
+
+	    if (begs.length) {
+	      result = [left, right];
+	    }
+	  }
+
+	  return result;
+	}
+
+/***/ }),
+/* 393 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	exports.byteLength = byteLength;
+	exports.toByteArray = toByteArray;
+	exports.fromByteArray = fromByteArray;
+
+	var lookup = [];
+	var revLookup = [];
+	var Arr = typeof Uint8Array !== 'undefined' ? Uint8Array : Array;
+
+	var code = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+	for (var i = 0, len = code.length; i < len; ++i) {
+	  lookup[i] = code[i];
+	  revLookup[code.charCodeAt(i)] = i;
+	}
+
+	revLookup['-'.charCodeAt(0)] = 62;
+	revLookup['_'.charCodeAt(0)] = 63;
+
+	function placeHoldersCount(b64) {
+	  var len = b64.length;
+	  if (len % 4 > 0) {
+	    throw new Error('Invalid string. Length must be a multiple of 4');
+	  }
+
+	  // the number of equal signs (place holders)
+	  // if there are two placeholders, than the two characters before it
+	  // represent one byte
+	  // if there is only one, then the three characters before it represent 2 bytes
+	  // this is just a cheap hack to not do indexOf twice
+	  return b64[len - 2] === '=' ? 2 : b64[len - 1] === '=' ? 1 : 0;
+	}
+
+	function byteLength(b64) {
+	  // base64 is 4/3 + up to two characters of the original data
+	  return b64.length * 3 / 4 - placeHoldersCount(b64);
+	}
+
+	function toByteArray(b64) {
+	  var i, j, l, tmp, placeHolders, arr;
+	  var len = b64.length;
+	  placeHolders = placeHoldersCount(b64);
+
+	  arr = new Arr(len * 3 / 4 - placeHolders);
+
+	  // if there are placeholders, only get up to the last complete 4 chars
+	  l = placeHolders > 0 ? len - 4 : len;
+
+	  var L = 0;
+
+	  for (i = 0, j = 0; i < l; i += 4, j += 3) {
+	    tmp = revLookup[b64.charCodeAt(i)] << 18 | revLookup[b64.charCodeAt(i + 1)] << 12 | revLookup[b64.charCodeAt(i + 2)] << 6 | revLookup[b64.charCodeAt(i + 3)];
+	    arr[L++] = tmp >> 16 & 0xFF;
+	    arr[L++] = tmp >> 8 & 0xFF;
+	    arr[L++] = tmp & 0xFF;
+	  }
+
+	  if (placeHolders === 2) {
+	    tmp = revLookup[b64.charCodeAt(i)] << 2 | revLookup[b64.charCodeAt(i + 1)] >> 4;
+	    arr[L++] = tmp & 0xFF;
+	  } else if (placeHolders === 1) {
+	    tmp = revLookup[b64.charCodeAt(i)] << 10 | revLookup[b64.charCodeAt(i + 1)] << 4 | revLookup[b64.charCodeAt(i + 2)] >> 2;
+	    arr[L++] = tmp >> 8 & 0xFF;
+	    arr[L++] = tmp & 0xFF;
+	  }
+
+	  return arr;
+	}
+
+	function tripletToBase64(num) {
+	  return lookup[num >> 18 & 0x3F] + lookup[num >> 12 & 0x3F] + lookup[num >> 6 & 0x3F] + lookup[num & 0x3F];
+	}
+
+	function encodeChunk(uint8, start, end) {
+	  var tmp;
+	  var output = [];
+	  for (var i = start; i < end; i += 3) {
+	    tmp = (uint8[i] << 16) + (uint8[i + 1] << 8) + uint8[i + 2];
+	    output.push(tripletToBase64(tmp));
+	  }
+	  return output.join('');
+	}
+
+	function fromByteArray(uint8) {
+	  var tmp;
+	  var len = uint8.length;
+	  var extraBytes = len % 3; // if we have 1 byte left, pad 2 bytes
+	  var output = '';
+	  var parts = [];
+	  var maxChunkLength = 16383; // must be multiple of 3
+
+	  // go through the array every three bytes, we'll deal with trailing stuff later
+	  for (var i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) {
+	    parts.push(encodeChunk(uint8, i, i + maxChunkLength > len2 ? len2 : i + maxChunkLength));
+	  }
+
+	  // pad the end with zeros, but make sure to not forget the extra bytes
+	  if (extraBytes === 1) {
+	    tmp = uint8[len - 1];
+	    output += lookup[tmp >> 2];
+	    output += lookup[tmp << 4 & 0x3F];
+	    output += '==';
+	  } else if (extraBytes === 2) {
+	    tmp = (uint8[len - 2] << 8) + uint8[len - 1];
+	    output += lookup[tmp >> 10];
+	    output += lookup[tmp >> 4 & 0x3F];
+	    output += lookup[tmp << 2 & 0x3F];
+	    output += '=';
+	  }
+
+	  parts.push(output);
+
+	  return parts.join('');
+	}
+
+/***/ }),
+/* 394 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var concatMap = __webpack_require__(398);
+	var balanced = __webpack_require__(392);
+
+	module.exports = expandTop;
+
+	var escSlash = '\0SLASH' + Math.random() + '\0';
+	var escOpen = '\0OPEN' + Math.random() + '\0';
+	var escClose = '\0CLOSE' + Math.random() + '\0';
+	var escComma = '\0COMMA' + Math.random() + '\0';
+	var escPeriod = '\0PERIOD' + Math.random() + '\0';
+
+	function numeric(str) {
+	  return parseInt(str, 10) == str ? parseInt(str, 10) : str.charCodeAt(0);
+	}
+
+	function escapeBraces(str) {
+	  return str.split('\\\\').join(escSlash).split('\\{').join(escOpen).split('\\}').join(escClose).split('\\,').join(escComma).split('\\.').join(escPeriod);
+	}
+
+	function unescapeBraces(str) {
+	  return str.split(escSlash).join('\\').split(escOpen).join('{').split(escClose).join('}').split(escComma).join(',').split(escPeriod).join('.');
+	}
+
+	// Basically just str.split(","), but handling cases
+	// where we have nested braced sections, which should be
+	// treated as individual members, like {a,{b,c},d}
+	function parseCommaParts(str) {
+	  if (!str) return [''];
+
+	  var parts = [];
+	  var m = balanced('{', '}', str);
+
+	  if (!m) return str.split(',');
+
+	  var pre = m.pre;
+	  var body = m.body;
+	  var post = m.post;
+	  var p = pre.split(',');
+
+	  p[p.length - 1] += '{' + body + '}';
+	  var postParts = parseCommaParts(post);
+	  if (post.length) {
+	    p[p.length - 1] += postParts.shift();
+	    p.push.apply(p, postParts);
+	  }
+
+	  parts.push.apply(parts, p);
+
+	  return parts;
+	}
+
+	function expandTop(str) {
+	  if (!str) return [];
+
+	  // I don't know why Bash 4.3 does this, but it does.
+	  // Anything starting with {} will have the first two bytes preserved
+	  // but *only* at the top level, so {},a}b will not expand to anything,
+	  // but a{},b}c will be expanded to [a}c,abc].
+	  // One could argue that this is a bug in Bash, but since the goal of
+	  // this module is to match Bash's rules, we escape a leading {}
+	  if (str.substr(0, 2) === '{}') {
+	    str = '\\{\\}' + str.substr(2);
+	  }
+
+	  return expand(escapeBraces(str), true).map(unescapeBraces);
+	}
+
+	function identity(e) {
+	  return e;
+	}
+
+	function embrace(str) {
+	  return '{' + str + '}';
+	}
+	function isPadded(el) {
+	  return (/^-?0\d/.test(el)
+	  );
+	}
+
+	function lte(i, y) {
+	  return i <= y;
+	}
+	function gte(i, y) {
+	  return i >= y;
+	}
+
+	function expand(str, isTop) {
+	  var expansions = [];
+
+	  var m = balanced('{', '}', str);
+	  if (!m || /\$$/.test(m.pre)) return [str];
+
+	  var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+	  var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+	  var isSequence = isNumericSequence || isAlphaSequence;
+	  var isOptions = m.body.indexOf(',') >= 0;
+	  if (!isSequence && !isOptions) {
+	    // {a},b}
+	    if (m.post.match(/,.*\}/)) {
+	      str = m.pre + '{' + m.body + escClose + m.post;
+	      return expand(str);
+	    }
+	    return [str];
+	  }
+
+	  var n;
+	  if (isSequence) {
+	    n = m.body.split(/\.\./);
+	  } else {
+	    n = parseCommaParts(m.body);
+	    if (n.length === 1) {
+	      // x{{a,b}}y ==> x{a}y x{b}y
+	      n = expand(n[0], false).map(embrace);
+	      if (n.length === 1) {
+	        var post = m.post.length ? expand(m.post, false) : [''];
+	        return post.map(function (p) {
+	          return m.pre + n[0] + p;
+	        });
+	      }
+	    }
+	  }
+
+	  // at this point, n is the parts, and we know it's not a comma set
+	  // with a single entry.
+
+	  // no need to expand pre, since it is guaranteed to be free of brace-sets
+	  var pre = m.pre;
+	  var post = m.post.length ? expand(m.post, false) : [''];
+
+	  var N;
+
+	  if (isSequence) {
+	    var x = numeric(n[0]);
+	    var y = numeric(n[1]);
+	    var width = Math.max(n[0].length, n[1].length);
+	    var incr = n.length == 3 ? Math.abs(numeric(n[2])) : 1;
+	    var test = lte;
+	    var reverse = y < x;
+	    if (reverse) {
+	      incr *= -1;
+	      test = gte;
+	    }
+	    var pad = n.some(isPadded);
+
+	    N = [];
+
+	    for (var i = x; test(i, y); i += incr) {
+	      var c;
+	      if (isAlphaSequence) {
+	        c = String.fromCharCode(i);
+	        if (c === '\\') c = '';
+	      } else {
+	        c = String(i);
+	        if (pad) {
+	          var need = width - c.length;
+	          if (need > 0) {
+	            var z = new Array(need + 1).join('0');
+	            if (i < 0) c = '-' + z + c.slice(1);else c = z + c;
+	          }
+	        }
+	      }
+	      N.push(c);
+	    }
+	  } else {
+	    N = concatMap(n, function (el) {
+	      return expand(el, false);
+	    });
+	  }
+
+	  for (var j = 0; j < N.length; j++) {
+	    for (var k = 0; k < post.length; k++) {
+	      var expansion = pre + N[j] + post[k];
+	      if (!isTop || isSequence || expansion) expansions.push(expansion);
+	    }
+	  }
+
+	  return expansions;
+	}
+
+/***/ }),
+/* 395 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(global) {/*!
+	 * The buffer module from node.js, for the browser.
+	 *
+	 * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+	 * @license  MIT
+	 */
+	/* eslint-disable no-proto */
+
+	'use strict';
+
+	var base64 = __webpack_require__(393);
+	var ieee754 = __webpack_require__(456);
+	var isArray = __webpack_require__(396);
+
+	exports.Buffer = Buffer;
+	exports.SlowBuffer = SlowBuffer;
+	exports.INSPECT_MAX_BYTES = 50;
+
+	/**
+	 * If `Buffer.TYPED_ARRAY_SUPPORT`:
+	 *   === true    Use Uint8Array implementation (fastest)
+	 *   === false   Use Object implementation (most compatible, even IE6)
+	 *
+	 * Browsers that support typed arrays are IE 10+, Firefox 4+, Chrome 7+, Safari 5.1+,
+	 * Opera 11.6+, iOS 4.2+.
+	 *
+	 * Due to various browser bugs, sometimes the Object implementation will be used even
+	 * when the browser supports typed arrays.
+	 *
+	 * Note:
+	 *
+	 *   - Firefox 4-29 lacks support for adding new properties to `Uint8Array` instances,
+	 *     See: https://bugzilla.mozilla.org/show_bug.cgi?id=695438.
+	 *
+	 *   - Chrome 9-10 is missing the `TypedArray.prototype.subarray` function.
+	 *
+	 *   - IE10 has a broken `TypedArray.prototype.subarray` function which returns arrays of
+	 *     incorrect length in some situations.
+
+	 * We detect these buggy browsers and set `Buffer.TYPED_ARRAY_SUPPORT` to `false` so they
+	 * get the Object implementation, which is slower but behaves correctly.
+	 */
+	Buffer.TYPED_ARRAY_SUPPORT = global.TYPED_ARRAY_SUPPORT !== undefined ? global.TYPED_ARRAY_SUPPORT : typedArraySupport
+
+	/*
+	 * Export kMaxLength after typed array support is determined.
+	 */
+	();exports.kMaxLength = kMaxLength();
+
+	function typedArraySupport() {
+	  try {
+	    var arr = new Uint8Array(1);
+	    arr.__proto__ = { __proto__: Uint8Array.prototype, foo: function foo() {
+	        return 42;
+	      } };
+	    return arr.foo() === 42 && // typed array instances can be augmented
+	    typeof arr.subarray === 'function' && // chrome 9-10 lack `subarray`
+	    arr.subarray(1, 1).byteLength === 0; // ie10 has broken `subarray`
+	  } catch (e) {
+	    return false;
+	  }
+	}
+
+	function kMaxLength() {
+	  return Buffer.TYPED_ARRAY_SUPPORT ? 0x7fffffff : 0x3fffffff;
+	}
+
+	function createBuffer(that, length) {
+	  if (kMaxLength() < length) {
+	    throw new RangeError('Invalid typed array length');
+	  }
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    // Return an augmented `Uint8Array` instance, for best performance
+	    that = new Uint8Array(length);
+	    that.__proto__ = Buffer.prototype;
+	  } else {
+	    // Fallback: Return an object instance of the Buffer class
+	    if (that === null) {
+	      that = new Buffer(length);
+	    }
+	    that.length = length;
+	  }
+
+	  return that;
+	}
+
+	/**
+	 * The Buffer constructor returns instances of `Uint8Array` that have their
+	 * prototype changed to `Buffer.prototype`. Furthermore, `Buffer` is a subclass of
+	 * `Uint8Array`, so the returned instances will have all the node `Buffer` methods
+	 * and the `Uint8Array` methods. Square bracket notation works as expected -- it
+	 * returns a single octet.
+	 *
+	 * The `Uint8Array` prototype remains unmodified.
+	 */
+
+	function Buffer(arg, encodingOrOffset, length) {
+	  if (!Buffer.TYPED_ARRAY_SUPPORT && !(this instanceof Buffer)) {
+	    return new Buffer(arg, encodingOrOffset, length);
+	  }
+
+	  // Common case.
+	  if (typeof arg === 'number') {
+	    if (typeof encodingOrOffset === 'string') {
+	      throw new Error('If encoding is specified then the first argument must be a string');
+	    }
+	    return allocUnsafe(this, arg);
+	  }
+	  return from(this, arg, encodingOrOffset, length);
+	}
+
+	Buffer.poolSize = 8192; // not used by this implementation
+
+	// TODO: Legacy, not needed anymore. Remove in next major version.
+	Buffer._augment = function (arr) {
+	  arr.__proto__ = Buffer.prototype;
+	  return arr;
+	};
+
+	function from(that, value, encodingOrOffset, length) {
+	  if (typeof value === 'number') {
+	    throw new TypeError('"value" argument must not be a number');
+	  }
+
+	  if (typeof ArrayBuffer !== 'undefined' && value instanceof ArrayBuffer) {
+	    return fromArrayBuffer(that, value, encodingOrOffset, length);
+	  }
+
+	  if (typeof value === 'string') {
+	    return fromString(that, value, encodingOrOffset);
+	  }
+
+	  return fromObject(that, value);
+	}
+
+	/**
+	 * Functionally equivalent to Buffer(arg, encoding) but throws a TypeError
+	 * if value is a number.
+	 * Buffer.from(str[, encoding])
+	 * Buffer.from(array)
+	 * Buffer.from(buffer)
+	 * Buffer.from(arrayBuffer[, byteOffset[, length]])
+	 **/
+	Buffer.from = function (value, encodingOrOffset, length) {
+	  return from(null, value, encodingOrOffset, length);
+	};
+
+	if (Buffer.TYPED_ARRAY_SUPPORT) {
+	  Buffer.prototype.__proto__ = Uint8Array.prototype;
+	  Buffer.__proto__ = Uint8Array;
+	  if (typeof Symbol !== 'undefined' && Symbol.species && Buffer[Symbol.species] === Buffer) {
+	    // Fix subarray() in ES2016. See: https://github.com/feross/buffer/pull/97
+	    Object.defineProperty(Buffer, Symbol.species, {
+	      value: null,
+	      configurable: true
+	    });
+	  }
+	}
+
+	function assertSize(size) {
+	  if (typeof size !== 'number') {
+	    throw new TypeError('"size" argument must be a number');
+	  } else if (size < 0) {
+	    throw new RangeError('"size" argument must not be negative');
+	  }
+	}
+
+	function alloc(that, size, fill, encoding) {
+	  assertSize(size);
+	  if (size <= 0) {
+	    return createBuffer(that, size);
+	  }
+	  if (fill !== undefined) {
+	    // Only pay attention to encoding if it's a string. This
+	    // prevents accidentally sending in a number that would
+	    // be interpretted as a start offset.
+	    return typeof encoding === 'string' ? createBuffer(that, size).fill(fill, encoding) : createBuffer(that, size).fill(fill);
+	  }
+	  return createBuffer(that, size);
+	}
+
+	/**
+	 * Creates a new filled Buffer instance.
+	 * alloc(size[, fill[, encoding]])
+	 **/
+	Buffer.alloc = function (size, fill, encoding) {
+	  return alloc(null, size, fill, encoding);
+	};
+
+	function allocUnsafe(that, size) {
+	  assertSize(size);
+	  that = createBuffer(that, size < 0 ? 0 : checked(size) | 0);
+	  if (!Buffer.TYPED_ARRAY_SUPPORT) {
+	    for (var i = 0; i < size; ++i) {
+	      that[i] = 0;
+	    }
+	  }
+	  return that;
+	}
+
+	/**
+	 * Equivalent to Buffer(num), by default creates a non-zero-filled Buffer instance.
+	 * */
+	Buffer.allocUnsafe = function (size) {
+	  return allocUnsafe(null, size);
+	};
+	/**
+	 * Equivalent to SlowBuffer(num), by default creates a non-zero-filled Buffer instance.
+	 */
+	Buffer.allocUnsafeSlow = function (size) {
+	  return allocUnsafe(null, size);
+	};
+
+	function fromString(that, string, encoding) {
+	  if (typeof encoding !== 'string' || encoding === '') {
+	    encoding = 'utf8';
+	  }
+
+	  if (!Buffer.isEncoding(encoding)) {
+	    throw new TypeError('"encoding" must be a valid string encoding');
+	  }
+
+	  var length = byteLength(string, encoding) | 0;
+	  that = createBuffer(that, length);
+
+	  var actual = that.write(string, encoding);
+
+	  if (actual !== length) {
+	    // Writing a hex string, for example, that contains invalid characters will
+	    // cause everything after the first invalid character to be ignored. (e.g.
+	    // 'abxxcd' will be treated as 'ab')
+	    that = that.slice(0, actual);
+	  }
+
+	  return that;
+	}
+
+	function fromArrayLike(that, array) {
+	  var length = array.length < 0 ? 0 : checked(array.length) | 0;
+	  that = createBuffer(that, length);
+	  for (var i = 0; i < length; i += 1) {
+	    that[i] = array[i] & 255;
+	  }
+	  return that;
+	}
+
+	function fromArrayBuffer(that, array, byteOffset, length) {
+	  array.byteLength; // this throws if `array` is not a valid ArrayBuffer
+
+	  if (byteOffset < 0 || array.byteLength < byteOffset) {
+	    throw new RangeError('\'offset\' is out of bounds');
+	  }
+
+	  if (array.byteLength < byteOffset + (length || 0)) {
+	    throw new RangeError('\'length\' is out of bounds');
+	  }
+
+	  if (byteOffset === undefined && length === undefined) {
+	    array = new Uint8Array(array);
+	  } else if (length === undefined) {
+	    array = new Uint8Array(array, byteOffset);
+	  } else {
+	    array = new Uint8Array(array, byteOffset, length);
+	  }
+
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    // Return an augmented `Uint8Array` instance, for best performance
+	    that = array;
+	    that.__proto__ = Buffer.prototype;
+	  } else {
+	    // Fallback: Return an object instance of the Buffer class
+	    that = fromArrayLike(that, array);
+	  }
+	  return that;
+	}
+
+	function fromObject(that, obj) {
+	  if (Buffer.isBuffer(obj)) {
+	    var len = checked(obj.length) | 0;
+	    that = createBuffer(that, len);
+
+	    if (that.length === 0) {
+	      return that;
+	    }
+
+	    obj.copy(that, 0, 0, len);
+	    return that;
+	  }
+
+	  if (obj) {
+	    if (typeof ArrayBuffer !== 'undefined' && obj.buffer instanceof ArrayBuffer || 'length' in obj) {
+	      if (typeof obj.length !== 'number' || isnan(obj.length)) {
+	        return createBuffer(that, 0);
+	      }
+	      return fromArrayLike(that, obj);
+	    }
+
+	    if (obj.type === 'Buffer' && isArray(obj.data)) {
+	      return fromArrayLike(that, obj.data);
+	    }
+	  }
+
+	  throw new TypeError('First argument must be a string, Buffer, ArrayBuffer, Array, or array-like object.');
+	}
+
+	function checked(length) {
+	  // Note: cannot use `length < kMaxLength()` here because that fails when
+	  // length is NaN (which is otherwise coerced to zero.)
+	  if (length >= kMaxLength()) {
+	    throw new RangeError('Attempt to allocate Buffer larger than maximum ' + 'size: 0x' + kMaxLength().toString(16) + ' bytes');
+	  }
+	  return length | 0;
+	}
+
+	function SlowBuffer(length) {
+	  if (+length != length) {
+	    // eslint-disable-line eqeqeq
+	    length = 0;
+	  }
+	  return Buffer.alloc(+length);
+	}
+
+	Buffer.isBuffer = function isBuffer(b) {
+	  return !!(b != null && b._isBuffer);
+	};
+
+	Buffer.compare = function compare(a, b) {
+	  if (!Buffer.isBuffer(a) || !Buffer.isBuffer(b)) {
+	    throw new TypeError('Arguments must be Buffers');
+	  }
+
+	  if (a === b) return 0;
+
+	  var x = a.length;
+	  var y = b.length;
+
+	  for (var i = 0, len = Math.min(x, y); i < len; ++i) {
+	    if (a[i] !== b[i]) {
+	      x = a[i];
+	      y = b[i];
+	      break;
+	    }
+	  }
+
+	  if (x < y) return -1;
+	  if (y < x) return 1;
+	  return 0;
+	};
+
+	Buffer.isEncoding = function isEncoding(encoding) {
+	  switch (String(encoding).toLowerCase()) {
+	    case 'hex':
+	    case 'utf8':
+	    case 'utf-8':
+	    case 'ascii':
+	    case 'latin1':
+	    case 'binary':
+	    case 'base64':
+	    case 'ucs2':
+	    case 'ucs-2':
+	    case 'utf16le':
+	    case 'utf-16le':
+	      return true;
+	    default:
+	      return false;
+	  }
+	};
+
+	Buffer.concat = function concat(list, length) {
+	  if (!isArray(list)) {
+	    throw new TypeError('"list" argument must be an Array of Buffers');
+	  }
+
+	  if (list.length === 0) {
+	    return Buffer.alloc(0);
+	  }
+
+	  var i;
+	  if (length === undefined) {
+	    length = 0;
+	    for (i = 0; i < list.length; ++i) {
+	      length += list[i].length;
+	    }
+	  }
+
+	  var buffer = Buffer.allocUnsafe(length);
+	  var pos = 0;
+	  for (i = 0; i < list.length; ++i) {
+	    var buf = list[i];
+	    if (!Buffer.isBuffer(buf)) {
+	      throw new TypeError('"list" argument must be an Array of Buffers');
+	    }
+	    buf.copy(buffer, pos);
+	    pos += buf.length;
+	  }
+	  return buffer;
+	};
+
+	function byteLength(string, encoding) {
+	  if (Buffer.isBuffer(string)) {
+	    return string.length;
+	  }
+	  if (typeof ArrayBuffer !== 'undefined' && typeof ArrayBuffer.isView === 'function' && (ArrayBuffer.isView(string) || string instanceof ArrayBuffer)) {
+	    return string.byteLength;
+	  }
+	  if (typeof string !== 'string') {
+	    string = '' + string;
+	  }
+
+	  var len = string.length;
+	  if (len === 0) return 0;
+
+	  // Use a for loop to avoid recursion
+	  var loweredCase = false;
+	  for (;;) {
+	    switch (encoding) {
+	      case 'ascii':
+	      case 'latin1':
+	      case 'binary':
+	        return len;
+	      case 'utf8':
+	      case 'utf-8':
+	      case undefined:
+	        return utf8ToBytes(string).length;
+	      case 'ucs2':
+	      case 'ucs-2':
+	      case 'utf16le':
+	      case 'utf-16le':
+	        return len * 2;
+	      case 'hex':
+	        return len >>> 1;
+	      case 'base64':
+	        return base64ToBytes(string).length;
+	      default:
+	        if (loweredCase) return utf8ToBytes(string).length; // assume utf8
+	        encoding = ('' + encoding).toLowerCase();
+	        loweredCase = true;
+	    }
+	  }
+	}
+	Buffer.byteLength = byteLength;
+
+	function slowToString(encoding, start, end) {
+	  var loweredCase = false;
+
+	  // No need to verify that "this.length <= MAX_UINT32" since it's a read-only
+	  // property of a typed array.
+
+	  // This behaves neither like String nor Uint8Array in that we set start/end
+	  // to their upper/lower bounds if the value passed is out of range.
+	  // undefined is handled specially as per ECMA-262 6th Edition,
+	  // Section 13.3.3.7 Runtime Semantics: KeyedBindingInitialization.
+	  if (start === undefined || start < 0) {
+	    start = 0;
+	  }
+	  // Return early if start > this.length. Done here to prevent potential uint32
+	  // coercion fail below.
+	  if (start > this.length) {
+	    return '';
+	  }
+
+	  if (end === undefined || end > this.length) {
+	    end = this.length;
+	  }
+
+	  if (end <= 0) {
+	    return '';
+	  }
+
+	  // Force coersion to uint32. This will also coerce falsey/NaN values to 0.
+	  end >>>= 0;
+	  start >>>= 0;
+
+	  if (end <= start) {
+	    return '';
+	  }
+
+	  if (!encoding) encoding = 'utf8';
+
+	  while (true) {
+	    switch (encoding) {
+	      case 'hex':
+	        return hexSlice(this, start, end);
+
+	      case 'utf8':
+	      case 'utf-8':
+	        return utf8Slice(this, start, end);
+
+	      case 'ascii':
+	        return asciiSlice(this, start, end);
+
+	      case 'latin1':
+	      case 'binary':
+	        return latin1Slice(this, start, end);
+
+	      case 'base64':
+	        return base64Slice(this, start, end);
+
+	      case 'ucs2':
+	      case 'ucs-2':
+	      case 'utf16le':
+	      case 'utf-16le':
+	        return utf16leSlice(this, start, end);
+
+	      default:
+	        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding);
+	        encoding = (encoding + '').toLowerCase();
+	        loweredCase = true;
+	    }
+	  }
+	}
+
+	// The property is used by `Buffer.isBuffer` and `is-buffer` (in Safari 5-7) to detect
+	// Buffer instances.
+	Buffer.prototype._isBuffer = true;
+
+	function swap(b, n, m) {
+	  var i = b[n];
+	  b[n] = b[m];
+	  b[m] = i;
+	}
+
+	Buffer.prototype.swap16 = function swap16() {
+	  var len = this.length;
+	  if (len % 2 !== 0) {
+	    throw new RangeError('Buffer size must be a multiple of 16-bits');
+	  }
+	  for (var i = 0; i < len; i += 2) {
+	    swap(this, i, i + 1);
+	  }
+	  return this;
+	};
+
+	Buffer.prototype.swap32 = function swap32() {
+	  var len = this.length;
+	  if (len % 4 !== 0) {
+	    throw new RangeError('Buffer size must be a multiple of 32-bits');
+	  }
+	  for (var i = 0; i < len; i += 4) {
+	    swap(this, i, i + 3);
+	    swap(this, i + 1, i + 2);
+	  }
+	  return this;
+	};
+
+	Buffer.prototype.swap64 = function swap64() {
+	  var len = this.length;
+	  if (len % 8 !== 0) {
+	    throw new RangeError('Buffer size must be a multiple of 64-bits');
+	  }
+	  for (var i = 0; i < len; i += 8) {
+	    swap(this, i, i + 7);
+	    swap(this, i + 1, i + 6);
+	    swap(this, i + 2, i + 5);
+	    swap(this, i + 3, i + 4);
+	  }
+	  return this;
+	};
+
+	Buffer.prototype.toString = function toString() {
+	  var length = this.length | 0;
+	  if (length === 0) return '';
+	  if (arguments.length === 0) return utf8Slice(this, 0, length);
+	  return slowToString.apply(this, arguments);
+	};
+
+	Buffer.prototype.equals = function equals(b) {
+	  if (!Buffer.isBuffer(b)) throw new TypeError('Argument must be a Buffer');
+	  if (this === b) return true;
+	  return Buffer.compare(this, b) === 0;
+	};
+
+	Buffer.prototype.inspect = function inspect() {
+	  var str = '';
+	  var max = exports.INSPECT_MAX_BYTES;
+	  if (this.length > 0) {
+	    str = this.toString('hex', 0, max).match(/.{2}/g).join(' ');
+	    if (this.length > max) str += ' ... ';
+	  }
+	  return '<Buffer ' + str + '>';
+	};
+
+	Buffer.prototype.compare = function compare(target, start, end, thisStart, thisEnd) {
+	  if (!Buffer.isBuffer(target)) {
+	    throw new TypeError('Argument must be a Buffer');
+	  }
+
+	  if (start === undefined) {
+	    start = 0;
+	  }
+	  if (end === undefined) {
+	    end = target ? target.length : 0;
+	  }
+	  if (thisStart === undefined) {
+	    thisStart = 0;
+	  }
+	  if (thisEnd === undefined) {
+	    thisEnd = this.length;
+	  }
+
+	  if (start < 0 || end > target.length || thisStart < 0 || thisEnd > this.length) {
+	    throw new RangeError('out of range index');
+	  }
+
+	  if (thisStart >= thisEnd && start >= end) {
+	    return 0;
+	  }
+	  if (thisStart >= thisEnd) {
+	    return -1;
+	  }
+	  if (start >= end) {
+	    return 1;
+	  }
+
+	  start >>>= 0;
+	  end >>>= 0;
+	  thisStart >>>= 0;
+	  thisEnd >>>= 0;
+
+	  if (this === target) return 0;
+
+	  var x = thisEnd - thisStart;
+	  var y = end - start;
+	  var len = Math.min(x, y);
+
+	  var thisCopy = this.slice(thisStart, thisEnd);
+	  var targetCopy = target.slice(start, end);
+
+	  for (var i = 0; i < len; ++i) {
+	    if (thisCopy[i] !== targetCopy[i]) {
+	      x = thisCopy[i];
+	      y = targetCopy[i];
+	      break;
+	    }
+	  }
+
+	  if (x < y) return -1;
+	  if (y < x) return 1;
+	  return 0;
+	};
+
+	// Finds either the first index of `val` in `buffer` at offset >= `byteOffset`,
+	// OR the last index of `val` in `buffer` at offset <= `byteOffset`.
+	//
+	// Arguments:
+	// - buffer - a Buffer to search
+	// - val - a string, Buffer, or number
+	// - byteOffset - an index into `buffer`; will be clamped to an int32
+	// - encoding - an optional encoding, relevant is val is a string
+	// - dir - true for indexOf, false for lastIndexOf
+	function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
+	  // Empty buffer means no match
+	  if (buffer.length === 0) return -1;
+
+	  // Normalize byteOffset
+	  if (typeof byteOffset === 'string') {
+	    encoding = byteOffset;
+	    byteOffset = 0;
+	  } else if (byteOffset > 0x7fffffff) {
+	    byteOffset = 0x7fffffff;
+	  } else if (byteOffset < -0x80000000) {
+	    byteOffset = -0x80000000;
+	  }
+	  byteOffset = +byteOffset; // Coerce to Number.
+	  if (isNaN(byteOffset)) {
+	    // byteOffset: it it's undefined, null, NaN, "foo", etc, search whole buffer
+	    byteOffset = dir ? 0 : buffer.length - 1;
+	  }
+
+	  // Normalize byteOffset: negative offsets start from the end of the buffer
+	  if (byteOffset < 0) byteOffset = buffer.length + byteOffset;
+	  if (byteOffset >= buffer.length) {
+	    if (dir) return -1;else byteOffset = buffer.length - 1;
+	  } else if (byteOffset < 0) {
+	    if (dir) byteOffset = 0;else return -1;
+	  }
+
+	  // Normalize val
+	  if (typeof val === 'string') {
+	    val = Buffer.from(val, encoding);
+	  }
+
+	  // Finally, search either indexOf (if dir is true) or lastIndexOf
+	  if (Buffer.isBuffer(val)) {
+	    // Special case: looking for empty string/buffer always fails
+	    if (val.length === 0) {
+	      return -1;
+	    }
+	    return arrayIndexOf(buffer, val, byteOffset, encoding, dir);
+	  } else if (typeof val === 'number') {
+	    val = val & 0xFF; // Search for a byte value [0-255]
+	    if (Buffer.TYPED_ARRAY_SUPPORT && typeof Uint8Array.prototype.indexOf === 'function') {
+	      if (dir) {
+	        return Uint8Array.prototype.indexOf.call(buffer, val, byteOffset);
+	      } else {
+	        return Uint8Array.prototype.lastIndexOf.call(buffer, val, byteOffset);
+	      }
+	    }
+	    return arrayIndexOf(buffer, [val], byteOffset, encoding, dir);
+	  }
+
+	  throw new TypeError('val must be string, number or Buffer');
+	}
+
+	function arrayIndexOf(arr, val, byteOffset, encoding, dir) {
+	  var indexSize = 1;
+	  var arrLength = arr.length;
+	  var valLength = val.length;
+
+	  if (encoding !== undefined) {
+	    encoding = String(encoding).toLowerCase();
+	    if (encoding === 'ucs2' || encoding === 'ucs-2' || encoding === 'utf16le' || encoding === 'utf-16le') {
+	      if (arr.length < 2 || val.length < 2) {
+	        return -1;
+	      }
+	      indexSize = 2;
+	      arrLength /= 2;
+	      valLength /= 2;
+	      byteOffset /= 2;
+	    }
+	  }
+
+	  function read(buf, i) {
+	    if (indexSize === 1) {
+	      return buf[i];
+	    } else {
+	      return buf.readUInt16BE(i * indexSize);
+	    }
+	  }
+
+	  var i;
+	  if (dir) {
+	    var foundIndex = -1;
+	    for (i = byteOffset; i < arrLength; i++) {
+	      if (read(arr, i) === read(val, foundIndex === -1 ? 0 : i - foundIndex)) {
+	        if (foundIndex === -1) foundIndex = i;
+	        if (i - foundIndex + 1 === valLength) return foundIndex * indexSize;
+	      } else {
+	        if (foundIndex !== -1) i -= i - foundIndex;
+	        foundIndex = -1;
+	      }
+	    }
+	  } else {
+	    if (byteOffset + valLength > arrLength) byteOffset = arrLength - valLength;
+	    for (i = byteOffset; i >= 0; i--) {
+	      var found = true;
+	      for (var j = 0; j < valLength; j++) {
+	        if (read(arr, i + j) !== read(val, j)) {
+	          found = false;
+	          break;
+	        }
+	      }
+	      if (found) return i;
+	    }
+	  }
+
+	  return -1;
+	}
+
+	Buffer.prototype.includes = function includes(val, byteOffset, encoding) {
+	  return this.indexOf(val, byteOffset, encoding) !== -1;
+	};
+
+	Buffer.prototype.indexOf = function indexOf(val, byteOffset, encoding) {
+	  return bidirectionalIndexOf(this, val, byteOffset, encoding, true);
+	};
+
+	Buffer.prototype.lastIndexOf = function lastIndexOf(val, byteOffset, encoding) {
+	  return bidirectionalIndexOf(this, val, byteOffset, encoding, false);
+	};
+
+	function hexWrite(buf, string, offset, length) {
+	  offset = Number(offset) || 0;
+	  var remaining = buf.length - offset;
+	  if (!length) {
+	    length = remaining;
+	  } else {
+	    length = Number(length);
+	    if (length > remaining) {
+	      length = remaining;
+	    }
+	  }
+
+	  // must be an even number of digits
+	  var strLen = string.length;
+	  if (strLen % 2 !== 0) throw new TypeError('Invalid hex string');
+
+	  if (length > strLen / 2) {
+	    length = strLen / 2;
+	  }
+	  for (var i = 0; i < length; ++i) {
+	    var parsed = parseInt(string.substr(i * 2, 2), 16);
+	    if (isNaN(parsed)) return i;
+	    buf[offset + i] = parsed;
+	  }
+	  return i;
+	}
+
+	function utf8Write(buf, string, offset, length) {
+	  return blitBuffer(utf8ToBytes(string, buf.length - offset), buf, offset, length);
+	}
+
+	function asciiWrite(buf, string, offset, length) {
+	  return blitBuffer(asciiToBytes(string), buf, offset, length);
+	}
+
+	function latin1Write(buf, string, offset, length) {
+	  return asciiWrite(buf, string, offset, length);
+	}
+
+	function base64Write(buf, string, offset, length) {
+	  return blitBuffer(base64ToBytes(string), buf, offset, length);
+	}
+
+	function ucs2Write(buf, string, offset, length) {
+	  return blitBuffer(utf16leToBytes(string, buf.length - offset), buf, offset, length);
+	}
+
+	Buffer.prototype.write = function write(string, offset, length, encoding) {
+	  // Buffer#write(string)
+	  if (offset === undefined) {
+	    encoding = 'utf8';
+	    length = this.length;
+	    offset = 0;
+	    // Buffer#write(string, encoding)
+	  } else if (length === undefined && typeof offset === 'string') {
+	    encoding = offset;
+	    length = this.length;
+	    offset = 0;
+	    // Buffer#write(string, offset[, length][, encoding])
+	  } else if (isFinite(offset)) {
+	    offset = offset | 0;
+	    if (isFinite(length)) {
+	      length = length | 0;
+	      if (encoding === undefined) encoding = 'utf8';
+	    } else {
+	      encoding = length;
+	      length = undefined;
+	    }
+	    // legacy write(string, encoding, offset, length) - remove in v0.13
+	  } else {
+	    throw new Error('Buffer.write(string, encoding, offset[, length]) is no longer supported');
+	  }
+
+	  var remaining = this.length - offset;
+	  if (length === undefined || length > remaining) length = remaining;
+
+	  if (string.length > 0 && (length < 0 || offset < 0) || offset > this.length) {
+	    throw new RangeError('Attempt to write outside buffer bounds');
+	  }
+
+	  if (!encoding) encoding = 'utf8';
+
+	  var loweredCase = false;
+	  for (;;) {
+	    switch (encoding) {
+	      case 'hex':
+	        return hexWrite(this, string, offset, length);
+
+	      case 'utf8':
+	      case 'utf-8':
+	        return utf8Write(this, string, offset, length);
+
+	      case 'ascii':
+	        return asciiWrite(this, string, offset, length);
+
+	      case 'latin1':
+	      case 'binary':
+	        return latin1Write(this, string, offset, length);
+
+	      case 'base64':
+	        // Warning: maxLength not taken into account in base64Write
+	        return base64Write(this, string, offset, length);
+
+	      case 'ucs2':
+	      case 'ucs-2':
+	      case 'utf16le':
+	      case 'utf-16le':
+	        return ucs2Write(this, string, offset, length);
+
+	      default:
+	        if (loweredCase) throw new TypeError('Unknown encoding: ' + encoding);
+	        encoding = ('' + encoding).toLowerCase();
+	        loweredCase = true;
+	    }
+	  }
+	};
+
+	Buffer.prototype.toJSON = function toJSON() {
+	  return {
+	    type: 'Buffer',
+	    data: Array.prototype.slice.call(this._arr || this, 0)
+	  };
+	};
+
+	function base64Slice(buf, start, end) {
+	  if (start === 0 && end === buf.length) {
+	    return base64.fromByteArray(buf);
+	  } else {
+	    return base64.fromByteArray(buf.slice(start, end));
+	  }
+	}
+
+	function utf8Slice(buf, start, end) {
+	  end = Math.min(buf.length, end);
+	  var res = [];
+
+	  var i = start;
+	  while (i < end) {
+	    var firstByte = buf[i];
+	    var codePoint = null;
+	    var bytesPerSequence = firstByte > 0xEF ? 4 : firstByte > 0xDF ? 3 : firstByte > 0xBF ? 2 : 1;
+
+	    if (i + bytesPerSequence <= end) {
+	      var secondByte, thirdByte, fourthByte, tempCodePoint;
+
+	      switch (bytesPerSequence) {
+	        case 1:
+	          if (firstByte < 0x80) {
+	            codePoint = firstByte;
+	          }
+	          break;
+	        case 2:
+	          secondByte = buf[i + 1];
+	          if ((secondByte & 0xC0) === 0x80) {
+	            tempCodePoint = (firstByte & 0x1F) << 0x6 | secondByte & 0x3F;
+	            if (tempCodePoint > 0x7F) {
+	              codePoint = tempCodePoint;
+	            }
+	          }
+	          break;
+	        case 3:
+	          secondByte = buf[i + 1];
+	          thirdByte = buf[i + 2];
+	          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80) {
+	            tempCodePoint = (firstByte & 0xF) << 0xC | (secondByte & 0x3F) << 0x6 | thirdByte & 0x3F;
+	            if (tempCodePoint > 0x7FF && (tempCodePoint < 0xD800 || tempCodePoint > 0xDFFF)) {
+	              codePoint = tempCodePoint;
+	            }
+	          }
+	          break;
+	        case 4:
+	          secondByte = buf[i + 1];
+	          thirdByte = buf[i + 2];
+	          fourthByte = buf[i + 3];
+	          if ((secondByte & 0xC0) === 0x80 && (thirdByte & 0xC0) === 0x80 && (fourthByte & 0xC0) === 0x80) {
+	            tempCodePoint = (firstByte & 0xF) << 0x12 | (secondByte & 0x3F) << 0xC | (thirdByte & 0x3F) << 0x6 | fourthByte & 0x3F;
+	            if (tempCodePoint > 0xFFFF && tempCodePoint < 0x110000) {
+	              codePoint = tempCodePoint;
+	            }
+	          }
+	      }
+	    }
+
+	    if (codePoint === null) {
+	      // we did not generate a valid codePoint so insert a
+	      // replacement char (U+FFFD) and advance only 1 byte
+	      codePoint = 0xFFFD;
+	      bytesPerSequence = 1;
+	    } else if (codePoint > 0xFFFF) {
+	      // encode to utf16 (surrogate pair dance)
+	      codePoint -= 0x10000;
+	      res.push(codePoint >>> 10 & 0x3FF | 0xD800);
+	      codePoint = 0xDC00 | codePoint & 0x3FF;
+	    }
+
+	    res.push(codePoint);
+	    i += bytesPerSequence;
+	  }
+
+	  return decodeCodePointsArray(res);
+	}
+
+	// Based on http://stackoverflow.com/a/22747272/680742, the browser with
+	// the lowest limit is Chrome, with 0x10000 args.
+	// We go 1 magnitude less, for safety
+	var MAX_ARGUMENTS_LENGTH = 0x1000;
+
+	function decodeCodePointsArray(codePoints) {
+	  var len = codePoints.length;
+	  if (len <= MAX_ARGUMENTS_LENGTH) {
+	    return String.fromCharCode.apply(String, codePoints // avoid extra slice()
+	    );
+	  }
+
+	  // Decode in chunks to avoid "call stack size exceeded".
+	  var res = '';
+	  var i = 0;
+	  while (i < len) {
+	    res += String.fromCharCode.apply(String, codePoints.slice(i, i += MAX_ARGUMENTS_LENGTH));
+	  }
+	  return res;
+	}
+
+	function asciiSlice(buf, start, end) {
+	  var ret = '';
+	  end = Math.min(buf.length, end);
+
+	  for (var i = start; i < end; ++i) {
+	    ret += String.fromCharCode(buf[i] & 0x7F);
+	  }
+	  return ret;
+	}
+
+	function latin1Slice(buf, start, end) {
+	  var ret = '';
+	  end = Math.min(buf.length, end);
+
+	  for (var i = start; i < end; ++i) {
+	    ret += String.fromCharCode(buf[i]);
+	  }
+	  return ret;
+	}
+
+	function hexSlice(buf, start, end) {
+	  var len = buf.length;
+
+	  if (!start || start < 0) start = 0;
+	  if (!end || end < 0 || end > len) end = len;
+
+	  var out = '';
+	  for (var i = start; i < end; ++i) {
+	    out += toHex(buf[i]);
+	  }
+	  return out;
+	}
+
+	function utf16leSlice(buf, start, end) {
+	  var bytes = buf.slice(start, end);
+	  var res = '';
+	  for (var i = 0; i < bytes.length; i += 2) {
+	    res += String.fromCharCode(bytes[i] + bytes[i + 1] * 256);
+	  }
+	  return res;
+	}
+
+	Buffer.prototype.slice = function slice(start, end) {
+	  var len = this.length;
+	  start = ~~start;
+	  end = end === undefined ? len : ~~end;
+
+	  if (start < 0) {
+	    start += len;
+	    if (start < 0) start = 0;
+	  } else if (start > len) {
+	    start = len;
+	  }
+
+	  if (end < 0) {
+	    end += len;
+	    if (end < 0) end = 0;
+	  } else if (end > len) {
+	    end = len;
+	  }
+
+	  if (end < start) end = start;
+
+	  var newBuf;
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    newBuf = this.subarray(start, end);
+	    newBuf.__proto__ = Buffer.prototype;
+	  } else {
+	    var sliceLen = end - start;
+	    newBuf = new Buffer(sliceLen, undefined);
+	    for (var i = 0; i < sliceLen; ++i) {
+	      newBuf[i] = this[i + start];
+	    }
+	  }
+
+	  return newBuf;
+	};
+
+	/*
+	 * Need to make sure that buffer isn't trying to write out of bounds.
+	 */
+	function checkOffset(offset, ext, length) {
+	  if (offset % 1 !== 0 || offset < 0) throw new RangeError('offset is not uint');
+	  if (offset + ext > length) throw new RangeError('Trying to access beyond buffer length');
+	}
+
+	Buffer.prototype.readUIntLE = function readUIntLE(offset, byteLength, noAssert) {
+	  offset = offset | 0;
+	  byteLength = byteLength | 0;
+	  if (!noAssert) checkOffset(offset, byteLength, this.length);
+
+	  var val = this[offset];
+	  var mul = 1;
+	  var i = 0;
+	  while (++i < byteLength && (mul *= 0x100)) {
+	    val += this[offset + i] * mul;
+	  }
+
+	  return val;
+	};
+
+	Buffer.prototype.readUIntBE = function readUIntBE(offset, byteLength, noAssert) {
+	  offset = offset | 0;
+	  byteLength = byteLength | 0;
+	  if (!noAssert) {
+	    checkOffset(offset, byteLength, this.length);
+	  }
+
+	  var val = this[offset + --byteLength];
+	  var mul = 1;
+	  while (byteLength > 0 && (mul *= 0x100)) {
+	    val += this[offset + --byteLength] * mul;
+	  }
+
+	  return val;
+	};
+
+	Buffer.prototype.readUInt8 = function readUInt8(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 1, this.length);
+	  return this[offset];
+	};
+
+	Buffer.prototype.readUInt16LE = function readUInt16LE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 2, this.length);
+	  return this[offset] | this[offset + 1] << 8;
+	};
+
+	Buffer.prototype.readUInt16BE = function readUInt16BE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 2, this.length);
+	  return this[offset] << 8 | this[offset + 1];
+	};
+
+	Buffer.prototype.readUInt32LE = function readUInt32LE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 4, this.length);
+
+	  return (this[offset] | this[offset + 1] << 8 | this[offset + 2] << 16) + this[offset + 3] * 0x1000000;
+	};
+
+	Buffer.prototype.readUInt32BE = function readUInt32BE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 4, this.length);
+
+	  return this[offset] * 0x1000000 + (this[offset + 1] << 16 | this[offset + 2] << 8 | this[offset + 3]);
+	};
+
+	Buffer.prototype.readIntLE = function readIntLE(offset, byteLength, noAssert) {
+	  offset = offset | 0;
+	  byteLength = byteLength | 0;
+	  if (!noAssert) checkOffset(offset, byteLength, this.length);
+
+	  var val = this[offset];
+	  var mul = 1;
+	  var i = 0;
+	  while (++i < byteLength && (mul *= 0x100)) {
+	    val += this[offset + i] * mul;
+	  }
+	  mul *= 0x80;
+
+	  if (val >= mul) val -= Math.pow(2, 8 * byteLength);
+
+	  return val;
+	};
+
+	Buffer.prototype.readIntBE = function readIntBE(offset, byteLength, noAssert) {
+	  offset = offset | 0;
+	  byteLength = byteLength | 0;
+	  if (!noAssert) checkOffset(offset, byteLength, this.length);
+
+	  var i = byteLength;
+	  var mul = 1;
+	  var val = this[offset + --i];
+	  while (i > 0 && (mul *= 0x100)) {
+	    val += this[offset + --i] * mul;
+	  }
+	  mul *= 0x80;
+
+	  if (val >= mul) val -= Math.pow(2, 8 * byteLength);
+
+	  return val;
+	};
+
+	Buffer.prototype.readInt8 = function readInt8(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 1, this.length);
+	  if (!(this[offset] & 0x80)) return this[offset];
+	  return (0xff - this[offset] + 1) * -1;
+	};
+
+	Buffer.prototype.readInt16LE = function readInt16LE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 2, this.length);
+	  var val = this[offset] | this[offset + 1] << 8;
+	  return val & 0x8000 ? val | 0xFFFF0000 : val;
+	};
+
+	Buffer.prototype.readInt16BE = function readInt16BE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 2, this.length);
+	  var val = this[offset + 1] | this[offset] << 8;
+	  return val & 0x8000 ? val | 0xFFFF0000 : val;
+	};
+
+	Buffer.prototype.readInt32LE = function readInt32LE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 4, this.length);
+
+	  return this[offset] | this[offset + 1] << 8 | this[offset + 2] << 16 | this[offset + 3] << 24;
+	};
+
+	Buffer.prototype.readInt32BE = function readInt32BE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 4, this.length);
+
+	  return this[offset] << 24 | this[offset + 1] << 16 | this[offset + 2] << 8 | this[offset + 3];
+	};
+
+	Buffer.prototype.readFloatLE = function readFloatLE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 4, this.length);
+	  return ieee754.read(this, offset, true, 23, 4);
+	};
+
+	Buffer.prototype.readFloatBE = function readFloatBE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 4, this.length);
+	  return ieee754.read(this, offset, false, 23, 4);
+	};
+
+	Buffer.prototype.readDoubleLE = function readDoubleLE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 8, this.length);
+	  return ieee754.read(this, offset, true, 52, 8);
+	};
+
+	Buffer.prototype.readDoubleBE = function readDoubleBE(offset, noAssert) {
+	  if (!noAssert) checkOffset(offset, 8, this.length);
+	  return ieee754.read(this, offset, false, 52, 8);
+	};
+
+	function checkInt(buf, value, offset, ext, max, min) {
+	  if (!Buffer.isBuffer(buf)) throw new TypeError('"buffer" argument must be a Buffer instance');
+	  if (value > max || value < min) throw new RangeError('"value" argument is out of bounds');
+	  if (offset + ext > buf.length) throw new RangeError('Index out of range');
+	}
+
+	Buffer.prototype.writeUIntLE = function writeUIntLE(value, offset, byteLength, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  byteLength = byteLength | 0;
+	  if (!noAssert) {
+	    var maxBytes = Math.pow(2, 8 * byteLength) - 1;
+	    checkInt(this, value, offset, byteLength, maxBytes, 0);
+	  }
+
+	  var mul = 1;
+	  var i = 0;
+	  this[offset] = value & 0xFF;
+	  while (++i < byteLength && (mul *= 0x100)) {
+	    this[offset + i] = value / mul & 0xFF;
+	  }
+
+	  return offset + byteLength;
+	};
+
+	Buffer.prototype.writeUIntBE = function writeUIntBE(value, offset, byteLength, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  byteLength = byteLength | 0;
+	  if (!noAssert) {
+	    var maxBytes = Math.pow(2, 8 * byteLength) - 1;
+	    checkInt(this, value, offset, byteLength, maxBytes, 0);
+	  }
+
+	  var i = byteLength - 1;
+	  var mul = 1;
+	  this[offset + i] = value & 0xFF;
+	  while (--i >= 0 && (mul *= 0x100)) {
+	    this[offset + i] = value / mul & 0xFF;
+	  }
+
+	  return offset + byteLength;
+	};
+
+	Buffer.prototype.writeUInt8 = function writeUInt8(value, offset, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) checkInt(this, value, offset, 1, 0xff, 0);
+	  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value);
+	  this[offset] = value & 0xff;
+	  return offset + 1;
+	};
+
+	function objectWriteUInt16(buf, value, offset, littleEndian) {
+	  if (value < 0) value = 0xffff + value + 1;
+	  for (var i = 0, j = Math.min(buf.length - offset, 2); i < j; ++i) {
+	    buf[offset + i] = (value & 0xff << 8 * (littleEndian ? i : 1 - i)) >>> (littleEndian ? i : 1 - i) * 8;
+	  }
+	}
+
+	Buffer.prototype.writeUInt16LE = function writeUInt16LE(value, offset, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0);
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    this[offset] = value & 0xff;
+	    this[offset + 1] = value >>> 8;
+	  } else {
+	    objectWriteUInt16(this, value, offset, true);
+	  }
+	  return offset + 2;
+	};
+
+	Buffer.prototype.writeUInt16BE = function writeUInt16BE(value, offset, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) checkInt(this, value, offset, 2, 0xffff, 0);
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    this[offset] = value >>> 8;
+	    this[offset + 1] = value & 0xff;
+	  } else {
+	    objectWriteUInt16(this, value, offset, false);
+	  }
+	  return offset + 2;
+	};
+
+	function objectWriteUInt32(buf, value, offset, littleEndian) {
+	  if (value < 0) value = 0xffffffff + value + 1;
+	  for (var i = 0, j = Math.min(buf.length - offset, 4); i < j; ++i) {
+	    buf[offset + i] = value >>> (littleEndian ? i : 3 - i) * 8 & 0xff;
+	  }
+	}
+
+	Buffer.prototype.writeUInt32LE = function writeUInt32LE(value, offset, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0);
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    this[offset + 3] = value >>> 24;
+	    this[offset + 2] = value >>> 16;
+	    this[offset + 1] = value >>> 8;
+	    this[offset] = value & 0xff;
+	  } else {
+	    objectWriteUInt32(this, value, offset, true);
+	  }
+	  return offset + 4;
+	};
+
+	Buffer.prototype.writeUInt32BE = function writeUInt32BE(value, offset, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) checkInt(this, value, offset, 4, 0xffffffff, 0);
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    this[offset] = value >>> 24;
+	    this[offset + 1] = value >>> 16;
+	    this[offset + 2] = value >>> 8;
+	    this[offset + 3] = value & 0xff;
+	  } else {
+	    objectWriteUInt32(this, value, offset, false);
+	  }
+	  return offset + 4;
+	};
+
+	Buffer.prototype.writeIntLE = function writeIntLE(value, offset, byteLength, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) {
+	    var limit = Math.pow(2, 8 * byteLength - 1);
+
+	    checkInt(this, value, offset, byteLength, limit - 1, -limit);
+	  }
+
+	  var i = 0;
+	  var mul = 1;
+	  var sub = 0;
+	  this[offset] = value & 0xFF;
+	  while (++i < byteLength && (mul *= 0x100)) {
+	    if (value < 0 && sub === 0 && this[offset + i - 1] !== 0) {
+	      sub = 1;
+	    }
+	    this[offset + i] = (value / mul >> 0) - sub & 0xFF;
+	  }
+
+	  return offset + byteLength;
+	};
+
+	Buffer.prototype.writeIntBE = function writeIntBE(value, offset, byteLength, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) {
+	    var limit = Math.pow(2, 8 * byteLength - 1);
+
+	    checkInt(this, value, offset, byteLength, limit - 1, -limit);
+	  }
+
+	  var i = byteLength - 1;
+	  var mul = 1;
+	  var sub = 0;
+	  this[offset + i] = value & 0xFF;
+	  while (--i >= 0 && (mul *= 0x100)) {
+	    if (value < 0 && sub === 0 && this[offset + i + 1] !== 0) {
+	      sub = 1;
+	    }
+	    this[offset + i] = (value / mul >> 0) - sub & 0xFF;
+	  }
+
+	  return offset + byteLength;
+	};
+
+	Buffer.prototype.writeInt8 = function writeInt8(value, offset, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) checkInt(this, value, offset, 1, 0x7f, -0x80);
+	  if (!Buffer.TYPED_ARRAY_SUPPORT) value = Math.floor(value);
+	  if (value < 0) value = 0xff + value + 1;
+	  this[offset] = value & 0xff;
+	  return offset + 1;
+	};
+
+	Buffer.prototype.writeInt16LE = function writeInt16LE(value, offset, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000);
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    this[offset] = value & 0xff;
+	    this[offset + 1] = value >>> 8;
+	  } else {
+	    objectWriteUInt16(this, value, offset, true);
+	  }
+	  return offset + 2;
+	};
+
+	Buffer.prototype.writeInt16BE = function writeInt16BE(value, offset, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) checkInt(this, value, offset, 2, 0x7fff, -0x8000);
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    this[offset] = value >>> 8;
+	    this[offset + 1] = value & 0xff;
+	  } else {
+	    objectWriteUInt16(this, value, offset, false);
+	  }
+	  return offset + 2;
+	};
+
+	Buffer.prototype.writeInt32LE = function writeInt32LE(value, offset, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000);
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    this[offset] = value & 0xff;
+	    this[offset + 1] = value >>> 8;
+	    this[offset + 2] = value >>> 16;
+	    this[offset + 3] = value >>> 24;
+	  } else {
+	    objectWriteUInt32(this, value, offset, true);
+	  }
+	  return offset + 4;
+	};
+
+	Buffer.prototype.writeInt32BE = function writeInt32BE(value, offset, noAssert) {
+	  value = +value;
+	  offset = offset | 0;
+	  if (!noAssert) checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000);
+	  if (value < 0) value = 0xffffffff + value + 1;
+	  if (Buffer.TYPED_ARRAY_SUPPORT) {
+	    this[offset] = value >>> 24;
+	    this[offset + 1] = value >>> 16;
+	    this[offset + 2] = value >>> 8;
+	    this[offset + 3] = value & 0xff;
+	  } else {
+	    objectWriteUInt32(this, value, offset, false);
+	  }
+	  return offset + 4;
+	};
+
+	function checkIEEE754(buf, value, offset, ext, max, min) {
+	  if (offset + ext > buf.length) throw new RangeError('Index out of range');
+	  if (offset < 0) throw new RangeError('Index out of range');
+	}
+
+	function writeFloat(buf, value, offset, littleEndian, noAssert) {
+	  if (!noAssert) {
+	    checkIEEE754(buf, value, offset, 4, 3.4028234663852886e+38, -3.4028234663852886e+38);
+	  }
+	  ieee754.write(buf, value, offset, littleEndian, 23, 4);
+	  return offset + 4;
+	}
+
+	Buffer.prototype.writeFloatLE = function writeFloatLE(value, offset, noAssert) {
+	  return writeFloat(this, value, offset, true, noAssert);
+	};
+
+	Buffer.prototype.writeFloatBE = function writeFloatBE(value, offset, noAssert) {
+	  return writeFloat(this, value, offset, false, noAssert);
+	};
+
+	function writeDouble(buf, value, offset, littleEndian, noAssert) {
+	  if (!noAssert) {
+	    checkIEEE754(buf, value, offset, 8, 1.7976931348623157E+308, -1.7976931348623157E+308);
+	  }
+	  ieee754.write(buf, value, offset, littleEndian, 52, 8);
+	  return offset + 8;
+	}
+
+	Buffer.prototype.writeDoubleLE = function writeDoubleLE(value, offset, noAssert) {
+	  return writeDouble(this, value, offset, true, noAssert);
+	};
+
+	Buffer.prototype.writeDoubleBE = function writeDoubleBE(value, offset, noAssert) {
+	  return writeDouble(this, value, offset, false, noAssert);
+	};
+
+	// copy(targetBuffer, targetStart=0, sourceStart=0, sourceEnd=buffer.length)
+	Buffer.prototype.copy = function copy(target, targetStart, start, end) {
+	  if (!start) start = 0;
+	  if (!end && end !== 0) end = this.length;
+	  if (targetStart >= target.length) targetStart = target.length;
+	  if (!targetStart) targetStart = 0;
+	  if (end > 0 && end < start) end = start;
+
+	  // Copy 0 bytes; we're done
+	  if (end === start) return 0;
+	  if (target.length === 0 || this.length === 0) return 0;
+
+	  // Fatal error conditions
+	  if (targetStart < 0) {
+	    throw new RangeError('targetStart out of bounds');
+	  }
+	  if (start < 0 || start >= this.length) throw new RangeError('sourceStart out of bounds');
+	  if (end < 0) throw new RangeError('sourceEnd out of bounds');
+
+	  // Are we oob?
+	  if (end > this.length) end = this.length;
+	  if (target.length - targetStart < end - start) {
+	    end = target.length - targetStart + start;
+	  }
+
+	  var len = end - start;
+	  var i;
+
+	  if (this === target && start < targetStart && targetStart < end) {
+	    // descending copy from end
+	    for (i = len - 1; i >= 0; --i) {
+	      target[i + targetStart] = this[i + start];
+	    }
+	  } else if (len < 1000 || !Buffer.TYPED_ARRAY_SUPPORT) {
+	    // ascending copy from start
+	    for (i = 0; i < len; ++i) {
+	      target[i + targetStart] = this[i + start];
+	    }
+	  } else {
+	    Uint8Array.prototype.set.call(target, this.subarray(start, start + len), targetStart);
+	  }
+
+	  return len;
+	};
+
+	// Usage:
+	//    buffer.fill(number[, offset[, end]])
+	//    buffer.fill(buffer[, offset[, end]])
+	//    buffer.fill(string[, offset[, end]][, encoding])
+	Buffer.prototype.fill = function fill(val, start, end, encoding) {
+	  // Handle string cases:
+	  if (typeof val === 'string') {
+	    if (typeof start === 'string') {
+	      encoding = start;
+	      start = 0;
+	      end = this.length;
+	    } else if (typeof end === 'string') {
+	      encoding = end;
+	      end = this.length;
+	    }
+	    if (val.length === 1) {
+	      var code = val.charCodeAt(0);
+	      if (code < 256) {
+	        val = code;
+	      }
+	    }
+	    if (encoding !== undefined && typeof encoding !== 'string') {
+	      throw new TypeError('encoding must be a string');
+	    }
+	    if (typeof encoding === 'string' && !Buffer.isEncoding(encoding)) {
+	      throw new TypeError('Unknown encoding: ' + encoding);
+	    }
+	  } else if (typeof val === 'number') {
+	    val = val & 255;
+	  }
+
+	  // Invalid ranges are not set to a default, so can range check early.
+	  if (start < 0 || this.length < start || this.length < end) {
+	    throw new RangeError('Out of range index');
+	  }
+
+	  if (end <= start) {
+	    return this;
+	  }
+
+	  start = start >>> 0;
+	  end = end === undefined ? this.length : end >>> 0;
+
+	  if (!val) val = 0;
+
+	  var i;
+	  if (typeof val === 'number') {
+	    for (i = start; i < end; ++i) {
+	      this[i] = val;
+	    }
+	  } else {
+	    var bytes = Buffer.isBuffer(val) ? val : utf8ToBytes(new Buffer(val, encoding).toString());
+	    var len = bytes.length;
+	    for (i = 0; i < end - start; ++i) {
+	      this[i + start] = bytes[i % len];
+	    }
+	  }
+
+	  return this;
+	};
+
+	// HELPER FUNCTIONS
+	// ================
+
+	var INVALID_BASE64_RE = /[^+\/0-9A-Za-z-_]/g;
+
+	function base64clean(str) {
+	  // Node strips out invalid characters like \n and \t from the string, base64-js does not
+	  str = stringtrim(str).replace(INVALID_BASE64_RE, ''
+	  // Node converts strings with length < 2 to ''
+	  );if (str.length < 2) return '';
+	  // Node allows for non-padded base64 strings (missing trailing ===), base64-js does not
+	  while (str.length % 4 !== 0) {
+	    str = str + '=';
+	  }
+	  return str;
+	}
+
+	function stringtrim(str) {
+	  if (str.trim) return str.trim();
+	  return str.replace(/^\s+|\s+$/g, '');
+	}
+
+	function toHex(n) {
+	  if (n < 16) return '0' + n.toString(16);
+	  return n.toString(16);
+	}
+
+	function utf8ToBytes(string, units) {
+	  units = units || Infinity;
+	  var codePoint;
+	  var length = string.length;
+	  var leadSurrogate = null;
+	  var bytes = [];
+
+	  for (var i = 0; i < length; ++i) {
+	    codePoint = string.charCodeAt(i
+
+	    // is surrogate component
+	    );if (codePoint > 0xD7FF && codePoint < 0xE000) {
+	      // last char was a lead
+	      if (!leadSurrogate) {
+	        // no lead yet
+	        if (codePoint > 0xDBFF) {
+	          // unexpected trail
+	          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD);
+	          continue;
+	        } else if (i + 1 === length) {
+	          // unpaired lead
+	          if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD);
+	          continue;
+	        }
+
+	        // valid lead
+	        leadSurrogate = codePoint;
+
+	        continue;
+	      }
+
+	      // 2 leads in a row
+	      if (codePoint < 0xDC00) {
+	        if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD);
+	        leadSurrogate = codePoint;
+	        continue;
+	      }
+
+	      // valid surrogate pair
+	      codePoint = (leadSurrogate - 0xD800 << 10 | codePoint - 0xDC00) + 0x10000;
+	    } else if (leadSurrogate) {
+	      // valid bmp char, but last char was a lead
+	      if ((units -= 3) > -1) bytes.push(0xEF, 0xBF, 0xBD);
+	    }
+
+	    leadSurrogate = null;
+
+	    // encode utf8
+	    if (codePoint < 0x80) {
+	      if ((units -= 1) < 0) break;
+	      bytes.push(codePoint);
+	    } else if (codePoint < 0x800) {
+	      if ((units -= 2) < 0) break;
+	      bytes.push(codePoint >> 0x6 | 0xC0, codePoint & 0x3F | 0x80);
+	    } else if (codePoint < 0x10000) {
+	      if ((units -= 3) < 0) break;
+	      bytes.push(codePoint >> 0xC | 0xE0, codePoint >> 0x6 & 0x3F | 0x80, codePoint & 0x3F | 0x80);
+	    } else if (codePoint < 0x110000) {
+	      if ((units -= 4) < 0) break;
+	      bytes.push(codePoint >> 0x12 | 0xF0, codePoint >> 0xC & 0x3F | 0x80, codePoint >> 0x6 & 0x3F | 0x80, codePoint & 0x3F | 0x80);
+	    } else {
+	      throw new Error('Invalid code point');
+	    }
+	  }
+
+	  return bytes;
+	}
+
+	function asciiToBytes(str) {
+	  var byteArray = [];
+	  for (var i = 0; i < str.length; ++i) {
+	    // Node's code seems to be doing this and not & 0x7F..
+	    byteArray.push(str.charCodeAt(i) & 0xFF);
+	  }
+	  return byteArray;
+	}
+
+	function utf16leToBytes(str, units) {
+	  var c, hi, lo;
+	  var byteArray = [];
+	  for (var i = 0; i < str.length; ++i) {
+	    if ((units -= 2) < 0) break;
+
+	    c = str.charCodeAt(i);
+	    hi = c >> 8;
+	    lo = c % 256;
+	    byteArray.push(lo);
+	    byteArray.push(hi);
+	  }
+
+	  return byteArray;
+	}
+
+	function base64ToBytes(str) {
+	  return base64.toByteArray(base64clean(str));
+	}
+
+	function blitBuffer(src, dst, offset, length) {
+	  for (var i = 0; i < length; ++i) {
+	    if (i + offset >= dst.length || i >= src.length) break;
+	    dst[i + offset] = src[i];
+	  }
+	  return i;
+	}
+
+	function isnan(val) {
+	  return val !== val; // eslint-disable-line no-self-compare
+	}
+	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
+
+/***/ }),
+/* 396 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var toString = {}.toString;
+
+	module.exports = Array.isArray || function (arr) {
+	  return toString.call(arr) == '[object Array]';
+	};
+
+/***/ }),
+/* 397 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {'use strict';
+
+	var escapeStringRegexp = __webpack_require__(451);
+	var ansiStyles = __webpack_require__(285);
+	var stripAnsi = __webpack_require__(613);
+	var hasAnsi = __webpack_require__(455);
+	var supportsColor = __webpack_require__(614);
+	var defineProps = Object.defineProperties;
+	var isSimpleWindowsTerm = process.platform === 'win32' && !/^xterm/i.test(process.env.TERM);
+
+	function Chalk(options) {
+		// detect mode if not set manually
+		this.enabled = !options || options.enabled === undefined ? supportsColor : options.enabled;
+	}
+
+	// use bright blue on Windows as the normal blue color is illegible
+	if (isSimpleWindowsTerm) {
+		ansiStyles.blue.open = '\x1B[94m';
+	}
+
+	var styles = function () {
+		var ret = {};
+
+		Object.keys(ansiStyles).forEach(function (key) {
+			ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g');
+
+			ret[key] = {
+				get: function get() {
+					return build.call(this, this._styles.concat(key));
+				}
+			};
+		});
+
+		return ret;
+	}();
+
+	var proto = defineProps(function chalk() {}, styles);
+
+	function build(_styles) {
+		var builder = function builder() {
+			return applyStyle.apply(builder, arguments);
+		};
+
+		builder._styles = _styles;
+		builder.enabled = this.enabled;
+		// __proto__ is used because we must return a function, but there is
+		// no way to create a function with a different prototype.
+		/* eslint-disable no-proto */
+		builder.__proto__ = proto;
+
+		return builder;
+	}
+
+	function applyStyle() {
+		// support varags, but simply cast to string in case there's only one arg
+		var args = arguments;
+		var argsLen = args.length;
+		var str = argsLen !== 0 && String(arguments[0]);
+
+		if (argsLen > 1) {
+			// don't slice `arguments`, it prevents v8 optimizations
+			for (var a = 1; a < argsLen; a++) {
+				str += ' ' + args[a];
+			}
+		}
+
+		if (!this.enabled || !str) {
+			return str;
+		}
+
+		var nestedStyles = this._styles;
+		var i = nestedStyles.length;
+
+		// Turns out that on Windows dimmed gray text becomes invisible in cmd.exe,
+		// see https://github.com/chalk/chalk/issues/58
+		// If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop.
+		var originalDim = ansiStyles.dim.open;
+		if (isSimpleWindowsTerm && (nestedStyles.indexOf('gray') !== -1 || nestedStyles.indexOf('grey') !== -1)) {
+			ansiStyles.dim.open = '';
+		}
+
+		while (i--) {
+			var code = ansiStyles[nestedStyles[i]];
+
+			// Replace any instances already present with a re-opening code
+			// otherwise only the part of the string until said closing code
+			// will be colored, and the rest will simply be 'plain'.
+			str = code.open + str.replace(code.closeRe, code.open) + code.close;
+		}
+
+		// Reset the original 'dim' if we changed it to work around the Windows dimmed gray issue.
+		ansiStyles.dim.open = originalDim;
+
+		return str;
+	}
+
+	function init() {
+		var ret = {};
+
+		Object.keys(styles).forEach(function (name) {
+			ret[name] = {
+				get: function get() {
+					return build.call(this, [name]);
+				}
+			};
+		});
+
+		return ret;
+	}
+
+	defineProps(Chalk.prototype, init());
+
+	module.exports = new Chalk();
+	module.exports.styles = ansiStyles;
+	module.exports.hasColor = hasAnsi;
+	module.exports.stripColor = stripAnsi;
+	module.exports.supportsColor = supportsColor;
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 398 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	module.exports = function (xs, fn) {
+	    var res = [];
+	    for (var i = 0; i < xs.length; i++) {
+	        var x = fn(xs[i], i);
+	        if (isArray(x)) res.push.apply(res, x);else res.push(x);
+	    }
+	    return res;
+	};
+
+	var isArray = Array.isArray || function (xs) {
+	    return Object.prototype.toString.call(xs) === '[object Array]';
+	};
+
+/***/ }),
+/* 399 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(Buffer) {'use strict';
+
+	var fs = __webpack_require__(115);
+	var path = __webpack_require__(17);
+
+	Object.defineProperty(exports, 'commentRegex', {
+	  get: function getCommentRegex() {
+	    return (/^\s*\/(?:\/|\*)[@#]\s+sourceMappingURL=data:(?:application|text)\/json;(?:charset[:=]\S+?;)?base64,(?:.*)$/mg
+	    );
+	  }
+	});
+
+	Object.defineProperty(exports, 'mapFileCommentRegex', {
+	  get: function getMapFileCommentRegex() {
+	    //Example (Extra space between slashes added to solve Safari bug. Exclude space in production):
+	    //     / /# sourceMappingURL=foo.js.map           /*# sourceMappingURL=foo.js.map */
+	    return (/(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/){1}[ \t]*$)/mg
+	    );
+	  }
+	});
+
+	function decodeBase64(base64) {
+	  return new Buffer(base64, 'base64').toString();
+	}
+
+	function stripComment(sm) {
+	  return sm.split(',').pop();
+	}
+
+	function readFromFileMap(sm, dir) {
+	  // NOTE: this will only work on the server since it attempts to read the map file
+
+	  var r = exports.mapFileCommentRegex.exec(sm);
+
+	  // for some odd reason //# .. captures in 1 and /* .. */ in 2
+	  var filename = r[1] || r[2];
+	  var filepath = path.resolve(dir, filename);
+
+	  try {
+	    return fs.readFileSync(filepath, 'utf8');
+	  } catch (e) {
+	    throw new Error('An error occurred while trying to read the map file at ' + filepath + '\n' + e);
+	  }
+	}
+
+	function Converter(sm, opts) {
+	  opts = opts || {};
+
+	  if (opts.isFileComment) sm = readFromFileMap(sm, opts.commentFileDir);
+	  if (opts.hasComment) sm = stripComment(sm);
+	  if (opts.isEncoded) sm = decodeBase64(sm);
+	  if (opts.isJSON || opts.isEncoded) sm = JSON.parse(sm);
+
+	  this.sourcemap = sm;
+	}
+
+	Converter.prototype.toJSON = function (space) {
+	  return JSON.stringify(this.sourcemap, null, space);
+	};
+
+	Converter.prototype.toBase64 = function () {
+	  var json = this.toJSON();
+	  return new Buffer(json).toString('base64');
+	};
+
+	Converter.prototype.toComment = function (options) {
+	  var base64 = this.toBase64();
+	  var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64;
+	  return options && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
+	};
+
+	// returns copy instead of original
+	Converter.prototype.toObject = function () {
+	  return JSON.parse(this.toJSON());
+	};
+
+	Converter.prototype.addProperty = function (key, value) {
+	  if (this.sourcemap.hasOwnProperty(key)) throw new Error('property %s already exists on the sourcemap, use set property instead');
+	  return this.setProperty(key, value);
+	};
+
+	Converter.prototype.setProperty = function (key, value) {
+	  this.sourcemap[key] = value;
+	  return this;
+	};
+
+	Converter.prototype.getProperty = function (key) {
+	  return this.sourcemap[key];
+	};
+
+	exports.fromObject = function (obj) {
+	  return new Converter(obj);
+	};
+
+	exports.fromJSON = function (json) {
+	  return new Converter(json, { isJSON: true });
+	};
+
+	exports.fromBase64 = function (base64) {
+	  return new Converter(base64, { isEncoded: true });
+	};
+
+	exports.fromComment = function (comment) {
+	  comment = comment.replace(/^\/\*/g, '//').replace(/\*\/$/g, '');
+
+	  return new Converter(comment, { isEncoded: true, hasComment: true });
+	};
+
+	exports.fromMapFileComment = function (comment, dir) {
+	  return new Converter(comment, { commentFileDir: dir, isFileComment: true, isJSON: true });
+	};
+
+	// Finds last sourcemap comment in file or returns null if none was found
+	exports.fromSource = function (content) {
+	  var m = content.match(exports.commentRegex);
+	  return m ? exports.fromComment(m.pop()) : null;
+	};
+
+	// Finds last sourcemap comment in file or returns null if none was found
+	exports.fromMapFileSource = function (content, dir) {
+	  var m = content.match(exports.mapFileCommentRegex);
+	  return m ? exports.fromMapFileComment(m.pop(), dir) : null;
+	};
+
+	exports.removeComments = function (src) {
+	  return src.replace(exports.commentRegex, '');
+	};
+
+	exports.removeMapFileComments = function (src) {
+	  return src.replace(exports.mapFileCommentRegex, '');
+	};
+
+	exports.generateMapFileComment = function (file, options) {
+	  var data = 'sourceMappingURL=' + file;
+	  return options && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
+	};
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(395).Buffer))
+
+/***/ }),
+/* 400 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(57);
+	__webpack_require__(153);
+	module.exports = __webpack_require__(436);
+
+/***/ }),
+/* 401 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var core = __webpack_require__(5),
+	    $JSON = core.JSON || (core.JSON = { stringify: JSON.stringify });
+	module.exports = function stringify(it) {
+	  // eslint-disable-line no-unused-vars
+	  return $JSON.stringify.apply($JSON, arguments);
+	};
+
+/***/ }),
+/* 402 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(96);
+	__webpack_require__(153);
+	__webpack_require__(57);
+	__webpack_require__(438);
+	__webpack_require__(446);
+	module.exports = __webpack_require__(5).Map;
+
+/***/ }),
+/* 403 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(439);
+	module.exports = 0x1fffffffffffff;
+
+/***/ }),
+/* 404 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(440);
+	module.exports = __webpack_require__(5).Object.assign;
+
+/***/ }),
+/* 405 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(441);
+	var $Object = __webpack_require__(5).Object;
+	module.exports = function create(P, D) {
+	  return $Object.create(P, D);
+	};
+
+/***/ }),
+/* 406 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(154);
+	module.exports = __webpack_require__(5).Object.getOwnPropertySymbols;
+
+/***/ }),
+/* 407 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(442);
+	module.exports = __webpack_require__(5).Object.keys;
+
+/***/ }),
+/* 408 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(443);
+	module.exports = __webpack_require__(5).Object.setPrototypeOf;
+
+/***/ }),
+/* 409 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(154);
+	module.exports = __webpack_require__(5).Symbol['for'];
+
+/***/ }),
+/* 410 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(154);
+	__webpack_require__(96);
+	__webpack_require__(447);
+	__webpack_require__(448);
+	module.exports = __webpack_require__(5).Symbol;
+
+/***/ }),
+/* 411 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(153);
+	__webpack_require__(57);
+	module.exports = __webpack_require__(152).f('iterator');
+
+/***/ }),
+/* 412 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(96);
+	__webpack_require__(57);
+	__webpack_require__(444);
+	module.exports = __webpack_require__(5).WeakMap;
+
+/***/ }),
+/* 413 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(96);
+	__webpack_require__(57);
+	__webpack_require__(445);
+	module.exports = __webpack_require__(5).WeakSet;
+
+/***/ }),
+/* 414 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	module.exports = function (it) {
+	  if (typeof it != 'function') throw TypeError(it + ' is not a function!');
+	  return it;
+	};
+
+/***/ }),
+/* 415 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	module.exports = function () {/* empty */};
+
+/***/ }),
+/* 416 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var forOf = __webpack_require__(89);
+
+	module.exports = function (iter, ITERATOR) {
+	  var result = [];
+	  forOf(iter, false, result.push, result, ITERATOR);
+	  return result;
+	};
+
+/***/ }),
+/* 417 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// false -> Array#indexOf
+	// true  -> Array#includes
+	var toIObject = __webpack_require__(37),
+	    toLength = __webpack_require__(149),
+	    toIndex = __webpack_require__(435);
+	module.exports = function (IS_INCLUDES) {
+	  return function ($this, el, fromIndex) {
+	    var O = toIObject($this),
+	        length = toLength(O.length),
+	        index = toIndex(fromIndex, length),
+	        value;
+	    // Array#includes uses SameValueZero equality algorithm
+	    if (IS_INCLUDES && el != el) while (length > index) {
+	      value = O[index++];
+	      if (value != value) return true;
+	      // Array#toIndex ignores holes, Array#includes - not
+	    } else for (; length > index; index++) {
+	      if (IS_INCLUDES || index in O) {
+	        if (O[index] === el) return IS_INCLUDES || index || 0;
+	      }
+	    }return !IS_INCLUDES && -1;
+	  };
+	};
+
+/***/ }),
+/* 418 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isObject = __webpack_require__(22),
+	    isArray = __webpack_require__(227),
+	    SPECIES = __webpack_require__(12)('species');
+
+	module.exports = function (original) {
+	  var C;
+	  if (isArray(original)) {
+	    C = original.constructor;
+	    // cross-realm fallback
+	    if (typeof C == 'function' && (C === Array || isArray(C.prototype))) C = undefined;
+	    if (isObject(C)) {
+	      C = C[SPECIES];
+	      if (C === null) C = undefined;
+	    }
+	  }return C === undefined ? Array : C;
+	};
+
+/***/ }),
+/* 419 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 9.4.2.3 ArraySpeciesCreate(originalArray, length)
+	var speciesConstructor = __webpack_require__(418);
+
+	module.exports = function (original, length) {
+	  return new (speciesConstructor(original))(length);
+	};
+
+/***/ }),
+/* 420 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var dP = __webpack_require__(23).f,
+	    create = __webpack_require__(90),
+	    redefineAll = __webpack_require__(144),
+	    ctx = __webpack_require__(54),
+	    anInstance = __webpack_require__(135),
+	    defined = __webpack_require__(88),
+	    forOf = __webpack_require__(89),
+	    $iterDefine = __webpack_require__(141),
+	    step = __webpack_require__(228),
+	    setSpecies = __webpack_require__(433),
+	    DESCRIPTORS = __webpack_require__(20),
+	    fastKey = __webpack_require__(56).fastKey,
+	    SIZE = DESCRIPTORS ? '_s' : 'size';
+
+	var getEntry = function getEntry(that, key) {
+	  // fast case
+	  var index = fastKey(key),
+	      entry;
+	  if (index !== 'F') return that._i[index];
+	  // frozen object case
+	  for (entry = that._f; entry; entry = entry.n) {
+	    if (entry.k == key) return entry;
+	  }
+	};
+
+	module.exports = {
+	  getConstructor: function getConstructor(wrapper, NAME, IS_MAP, ADDER) {
+	    var C = wrapper(function (that, iterable) {
+	      anInstance(that, C, NAME, '_i');
+	      that._i = create(null); // index
+	      that._f = undefined; // first entry
+	      that._l = undefined; // last entry
+	      that[SIZE] = 0; // size
+	      if (iterable != undefined) forOf(iterable, IS_MAP, that[ADDER], that);
+	    });
+	    redefineAll(C.prototype, {
+	      // 23.1.3.1 Map.prototype.clear()
+	      // 23.2.3.2 Set.prototype.clear()
+	      clear: function clear() {
+	        for (var that = this, data = that._i, entry = that._f; entry; entry = entry.n) {
+	          entry.r = true;
+	          if (entry.p) entry.p = entry.p.n = undefined;
+	          delete data[entry.i];
+	        }
+	        that._f = that._l = undefined;
+	        that[SIZE] = 0;
+	      },
+	      // 23.1.3.3 Map.prototype.delete(key)
+	      // 23.2.3.4 Set.prototype.delete(value)
+	      'delete': function _delete(key) {
+	        var that = this,
+	            entry = getEntry(that, key);
+	        if (entry) {
+	          var next = entry.n,
+	              prev = entry.p;
+	          delete that._i[entry.i];
+	          entry.r = true;
+	          if (prev) prev.n = next;
+	          if (next) next.p = prev;
+	          if (that._f == entry) that._f = next;
+	          if (that._l == entry) that._l = prev;
+	          that[SIZE]--;
+	        }return !!entry;
+	      },
+	      // 23.2.3.6 Set.prototype.forEach(callbackfn, thisArg = undefined)
+	      // 23.1.3.5 Map.prototype.forEach(callbackfn, thisArg = undefined)
+	      forEach: function forEach(callbackfn /*, that = undefined */) {
+	        anInstance(this, C, 'forEach');
+	        var f = ctx(callbackfn, arguments.length > 1 ? arguments[1] : undefined, 3),
+	            entry;
+	        while (entry = entry ? entry.n : this._f) {
+	          f(entry.v, entry.k, this);
+	          // revert to the last existing entry
+	          while (entry && entry.r) {
+	            entry = entry.p;
+	          }
+	        }
+	      },
+	      // 23.1.3.7 Map.prototype.has(key)
+	      // 23.2.3.7 Set.prototype.has(value)
+	      has: function has(key) {
+	        return !!getEntry(this, key);
+	      }
+	    });
+	    if (DESCRIPTORS) dP(C.prototype, 'size', {
+	      get: function get() {
+	        return defined(this[SIZE]);
+	      }
+	    });
+	    return C;
+	  },
+	  def: function def(that, key, value) {
+	    var entry = getEntry(that, key),
+	        prev,
+	        index;
+	    // change existing entry
+	    if (entry) {
+	      entry.v = value;
+	      // create new entry
+	    } else {
+	      that._l = entry = {
+	        i: index = fastKey(key, true), // <- index
+	        k: key, // <- key
+	        v: value, // <- value
+	        p: prev = that._l, // <- previous entry
+	        n: undefined, // <- next entry
+	        r: false // <- removed
+	      };
+	      if (!that._f) that._f = entry;
+	      if (prev) prev.n = entry;
+	      that[SIZE]++;
+	      // add to index
+	      if (index !== 'F') that._i[index] = entry;
+	    }return that;
+	  },
+	  getEntry: getEntry,
+	  setStrong: function setStrong(C, NAME, IS_MAP) {
+	    // add .keys, .values, .entries, [@@iterator]
+	    // 23.1.3.4, 23.1.3.8, 23.1.3.11, 23.1.3.12, 23.2.3.5, 23.2.3.8, 23.2.3.10, 23.2.3.11
+	    $iterDefine(C, NAME, function (iterated, kind) {
+	      this._t = iterated; // target
+	      this._k = kind; // kind
+	      this._l = undefined; // previous
+	    }, function () {
+	      var that = this,
+	          kind = that._k,
+	          entry = that._l;
+	      // revert to the last existing entry
+	      while (entry && entry.r) {
+	        entry = entry.p;
+	      } // get next entry
+	      if (!that._t || !(that._l = entry = entry ? entry.n : that._t._f)) {
+	        // or finish the iteration
+	        that._t = undefined;
+	        return step(1);
+	      }
+	      // return step by kind
+	      if (kind == 'keys') return step(0, entry.k);
+	      if (kind == 'values') return step(0, entry.v);
+	      return step(0, [entry.k, entry.v]);
+	    }, IS_MAP ? 'entries' : 'values', !IS_MAP, true);
+
+	    // add [@@species], 23.1.2.2, 23.2.2.2
+	    setSpecies(NAME);
+	  }
+	};
+
+/***/ }),
+/* 421 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// https://github.com/DavidBruant/Map-Set.prototype.toJSON
+	var classof = __webpack_require__(223),
+	    from = __webpack_require__(416);
+	module.exports = function (NAME) {
+	  return function toJSON() {
+	    if (classof(this) != NAME) throw TypeError(NAME + "#toJSON isn't generic");
+	    return from(this);
+	  };
+	};
+
+/***/ }),
+/* 422 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// all enumerable object keys, includes symbols
+	var getKeys = __webpack_require__(43),
+	    gOPS = __webpack_require__(143),
+	    pIE = __webpack_require__(91);
+	module.exports = function (it) {
+	  var result = getKeys(it),
+	      getSymbols = gOPS.f;
+	  if (getSymbols) {
+	    var symbols = getSymbols(it),
+	        isEnum = pIE.f,
+	        i = 0,
+	        key;
+	    while (symbols.length > i) {
+	      if (isEnum.call(it, key = symbols[i++])) result.push(key);
+	    }
+	  }return result;
+	};
+
+/***/ }),
+/* 423 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = __webpack_require__(14).document && document.documentElement;
+
+/***/ }),
+/* 424 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// check on default Array iterator
+	var Iterators = __webpack_require__(55),
+	    ITERATOR = __webpack_require__(12)('iterator'),
+	    ArrayProto = Array.prototype;
+
+	module.exports = function (it) {
+	  return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
+	};
+
+/***/ }),
+/* 425 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// call something on iterator step with safe closing on error
+	var anObject = __webpack_require__(19);
+	module.exports = function (iterator, fn, value, entries) {
+	  try {
+	    return entries ? fn(anObject(value)[0], value[1]) : fn(value);
+	    // 7.4.6 IteratorClose(iterator, completion)
+	  } catch (e) {
+	    var ret = iterator['return'];
+	    if (ret !== undefined) anObject(ret.call(iterator));
+	    throw e;
+	  }
+	};
+
+/***/ }),
+/* 426 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var create = __webpack_require__(90),
+	    descriptor = __webpack_require__(92),
+	    setToStringTag = __webpack_require__(93),
+	    IteratorPrototype = {};
+
+	// 25.1.2.1.1 %IteratorPrototype%[@@iterator]()
+	__webpack_require__(28)(IteratorPrototype, __webpack_require__(12)('iterator'), function () {
+	  return this;
+	});
+
+	module.exports = function (Constructor, NAME, next) {
+	  Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
+	  setToStringTag(Constructor, NAME + ' Iterator');
+	};
+
+/***/ }),
+/* 427 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getKeys = __webpack_require__(43),
+	    toIObject = __webpack_require__(37);
+	module.exports = function (object, el) {
+	  var O = toIObject(object),
+	      keys = getKeys(O),
+	      length = keys.length,
+	      index = 0,
+	      key;
+	  while (length > index) {
+	    if (O[key = keys[index++]] === el) return key;
+	  }
+	};
+
+/***/ }),
+/* 428 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var dP = __webpack_require__(23),
+	    anObject = __webpack_require__(19),
+	    getKeys = __webpack_require__(43);
+
+	module.exports = __webpack_require__(20) ? Object.defineProperties : function defineProperties(O, Properties) {
+	  anObject(O);
+	  var keys = getKeys(Properties),
+	      length = keys.length,
+	      i = 0,
+	      P;
+	  while (length > i) {
+	    dP.f(O, P = keys[i++], Properties[P]);
+	  }return O;
+	};
+
+/***/ }),
+/* 429 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	// fallback for IE11 buggy Object.getOwnPropertyNames with iframe and window
+	var toIObject = __webpack_require__(37),
+	    gOPN = __webpack_require__(231).f,
+	    toString = {}.toString;
+
+	var windowNames = (typeof window === 'undefined' ? 'undefined' : _typeof(window)) == 'object' && window && Object.getOwnPropertyNames ? Object.getOwnPropertyNames(window) : [];
+
+	var getWindowNames = function getWindowNames(it) {
+	  try {
+	    return gOPN(it);
+	  } catch (e) {
+	    return windowNames.slice();
+	  }
+	};
+
+	module.exports.f = function getOwnPropertyNames(it) {
+	  return windowNames && toString.call(it) == '[object Window]' ? getWindowNames(it) : gOPN(toIObject(it));
+	};
+
+/***/ }),
+/* 430 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O)
+	var has = __webpack_require__(27),
+	    toObject = __webpack_require__(94),
+	    IE_PROTO = __webpack_require__(146)('IE_PROTO'),
+	    ObjectProto = Object.prototype;
+
+	module.exports = Object.getPrototypeOf || function (O) {
+	  O = toObject(O);
+	  if (has(O, IE_PROTO)) return O[IE_PROTO];
+	  if (typeof O.constructor == 'function' && O instanceof O.constructor) {
+	    return O.constructor.prototype;
+	  }return O instanceof Object ? ObjectProto : null;
+	};
+
+/***/ }),
+/* 431 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// most Object methods by ES6 should accept primitives
+	var $export = __webpack_require__(21),
+	    core = __webpack_require__(5),
+	    fails = __webpack_require__(36);
+	module.exports = function (KEY, exec) {
+	  var fn = (core.Object || {})[KEY] || Object[KEY],
+	      exp = {};
+	  exp[KEY] = exec(fn);
+	  $export($export.S + $export.F * fails(function () {
+	    fn(1);
+	  }), 'Object', exp);
+	};
+
+/***/ }),
+/* 432 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// Works with __proto__ only. Old v8 can't work with null proto objects.
+	/* eslint-disable no-proto */
+	var isObject = __webpack_require__(22),
+	    anObject = __webpack_require__(19);
+	var check = function check(O, proto) {
+	  anObject(O);
+	  if (!isObject(proto) && proto !== null) throw TypeError(proto + ": can't set as prototype!");
+	};
+	module.exports = {
+	  set: Object.setPrototypeOf || ('__proto__' in {} ? // eslint-disable-line
+	  function (test, buggy, set) {
+	    try {
+	      set = __webpack_require__(54)(Function.call, __webpack_require__(230).f(Object.prototype, '__proto__').set, 2);
+	      set(test, []);
+	      buggy = !(test instanceof Array);
+	    } catch (e) {
+	      buggy = true;
+	    }
+	    return function setPrototypeOf(O, proto) {
+	      check(O, proto);
+	      if (buggy) O.__proto__ = proto;else set(O, proto);
+	      return O;
+	    };
+	  }({}, false) : undefined),
+	  check: check
+	};
+
+/***/ }),
+/* 433 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var global = __webpack_require__(14),
+	    core = __webpack_require__(5),
+	    dP = __webpack_require__(23),
+	    DESCRIPTORS = __webpack_require__(20),
+	    SPECIES = __webpack_require__(12)('species');
+
+	module.exports = function (KEY) {
+	  var C = typeof core[KEY] == 'function' ? core[KEY] : global[KEY];
+	  if (DESCRIPTORS && C && !C[SPECIES]) dP.f(C, SPECIES, {
+	    configurable: true,
+	    get: function get() {
+	      return this;
+	    }
+	  });
+	};
+
+/***/ }),
+/* 434 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var toInteger = __webpack_require__(148),
+	    defined = __webpack_require__(88);
+	// true  -> String#at
+	// false -> String#codePointAt
+	module.exports = function (TO_STRING) {
+	  return function (that, pos) {
+	    var s = String(defined(that)),
+	        i = toInteger(pos),
+	        l = s.length,
+	        a,
+	        b;
+	    if (i < 0 || i >= l) return TO_STRING ? '' : undefined;
+	    a = s.charCodeAt(i);
+	    return a < 0xd800 || a > 0xdbff || i + 1 === l || (b = s.charCodeAt(i + 1)) < 0xdc00 || b > 0xdfff ? TO_STRING ? s.charAt(i) : a : TO_STRING ? s.slice(i, i + 2) : (a - 0xd800 << 10) + (b - 0xdc00) + 0x10000;
+	  };
+	};
+
+/***/ }),
+/* 435 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var toInteger = __webpack_require__(148),
+	    max = Math.max,
+	    min = Math.min;
+	module.exports = function (index, length) {
+	  index = toInteger(index);
+	  return index < 0 ? max(index + length, 0) : min(index, length);
+	};
+
+/***/ }),
+/* 436 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var anObject = __webpack_require__(19),
+	    get = __webpack_require__(233);
+	module.exports = __webpack_require__(5).getIterator = function (it) {
+	  var iterFn = get(it);
+	  if (typeof iterFn != 'function') throw TypeError(it + ' is not iterable!');
+	  return anObject(iterFn.call(it));
+	};
+
+/***/ }),
+/* 437 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var addToUnscopables = __webpack_require__(415),
+	    step = __webpack_require__(228),
+	    Iterators = __webpack_require__(55),
+	    toIObject = __webpack_require__(37);
+
+	// 22.1.3.4 Array.prototype.entries()
+	// 22.1.3.13 Array.prototype.keys()
+	// 22.1.3.29 Array.prototype.values()
+	// 22.1.3.30 Array.prototype[@@iterator]()
+	module.exports = __webpack_require__(141)(Array, 'Array', function (iterated, kind) {
+	  this._t = toIObject(iterated); // target
+	  this._i = 0; // next index
+	  this._k = kind; // kind
+	  // 22.1.5.2.1 %ArrayIteratorPrototype%.next()
+	}, function () {
+	  var O = this._t,
+	      kind = this._k,
+	      index = this._i++;
+	  if (!O || index >= O.length) {
+	    this._t = undefined;
+	    return step(1);
+	  }
+	  if (kind == 'keys') return step(0, index);
+	  if (kind == 'values') return step(0, O[index]);
+	  return step(0, [index, O[index]]);
+	}, 'values');
+
+	// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7)
+	Iterators.Arguments = Iterators.Array;
+
+	addToUnscopables('keys');
+	addToUnscopables('values');
+	addToUnscopables('entries');
+
+/***/ }),
+/* 438 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var strong = __webpack_require__(420);
+
+	// 23.1 Map Objects
+	module.exports = __webpack_require__(138)('Map', function (get) {
+	  return function Map() {
+	    return get(this, arguments.length > 0 ? arguments[0] : undefined);
+	  };
+	}, {
+	  // 23.1.3.6 Map.prototype.get(key)
+	  get: function get(key) {
+	    var entry = strong.getEntry(this, key);
+	    return entry && entry.v;
+	  },
+	  // 23.1.3.9 Map.prototype.set(key, value)
+	  set: function set(key, value) {
+	    return strong.def(this, key === 0 ? 0 : key, value);
+	  }
+	}, strong, true);
+
+/***/ }),
+/* 439 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 20.1.2.6 Number.MAX_SAFE_INTEGER
+	var $export = __webpack_require__(21);
+
+	$export($export.S, 'Number', { MAX_SAFE_INTEGER: 0x1fffffffffffff });
+
+/***/ }),
+/* 440 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 19.1.3.1 Object.assign(target, source)
+	var $export = __webpack_require__(21);
+
+	$export($export.S + $export.F, 'Object', { assign: __webpack_require__(229) });
+
+/***/ }),
+/* 441 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var $export = __webpack_require__(21
+	// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties])
+	);$export($export.S, 'Object', { create: __webpack_require__(90) });
+
+/***/ }),
+/* 442 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 19.1.2.14 Object.keys(O)
+	var toObject = __webpack_require__(94),
+	    $keys = __webpack_require__(43);
+
+	__webpack_require__(431)('keys', function () {
+	  return function keys(it) {
+	    return $keys(toObject(it));
+	  };
+	});
+
+/***/ }),
+/* 443 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// 19.1.3.19 Object.setPrototypeOf(O, proto)
+	var $export = __webpack_require__(21);
+	$export($export.S, 'Object', { setPrototypeOf: __webpack_require__(432).set });
+
+/***/ }),
+/* 444 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var each = __webpack_require__(136)(0),
+	    redefine = __webpack_require__(145),
+	    meta = __webpack_require__(56),
+	    assign = __webpack_require__(229),
+	    weak = __webpack_require__(224),
+	    isObject = __webpack_require__(22),
+	    getWeak = meta.getWeak,
+	    isExtensible = Object.isExtensible,
+	    uncaughtFrozenStore = weak.ufstore,
+	    tmp = {},
+	    InternalMap;
+
+	var wrapper = function wrapper(get) {
+	  return function WeakMap() {
+	    return get(this, arguments.length > 0 ? arguments[0] : undefined);
+	  };
+	};
+
+	var methods = {
+	  // 23.3.3.3 WeakMap.prototype.get(key)
+	  get: function get(key) {
+	    if (isObject(key)) {
+	      var data = getWeak(key);
+	      if (data === true) return uncaughtFrozenStore(this).get(key);
+	      return data ? data[this._i] : undefined;
+	    }
+	  },
+	  // 23.3.3.5 WeakMap.prototype.set(key, value)
+	  set: function set(key, value) {
+	    return weak.def(this, key, value);
+	  }
+	};
+
+	// 23.3 WeakMap Objects
+	var $WeakMap = module.exports = __webpack_require__(138)('WeakMap', wrapper, methods, weak, true, true);
+
+	// IE11 WeakMap frozen keys fix
+	if (new $WeakMap().set((Object.freeze || Object)(tmp), 7).get(tmp) != 7) {
+	  InternalMap = weak.getConstructor(wrapper);
+	  assign(InternalMap.prototype, methods);
+	  meta.NEED = true;
+	  each(['delete', 'has', 'get', 'set'], function (key) {
+	    var proto = $WeakMap.prototype,
+	        method = proto[key];
+	    redefine(proto, key, function (a, b) {
+	      // store frozen objects on internal weakmap shim
+	      if (isObject(a) && !isExtensible(a)) {
+	        if (!this._f) this._f = new InternalMap();
+	        var result = this._f[key](a, b);
+	        return key == 'set' ? this : result;
+	        // store all the rest on native weakmap
+	      }return method.call(this, a, b);
+	    });
+	  });
+	}
+
+/***/ }),
+/* 445 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var weak = __webpack_require__(224);
+
+	// 23.4 WeakSet Objects
+	__webpack_require__(138)('WeakSet', function (get) {
+	  return function WeakSet() {
+	    return get(this, arguments.length > 0 ? arguments[0] : undefined);
+	  };
+	}, {
+	  // 23.4.3.1 WeakSet.prototype.add(value)
+	  add: function add(value) {
+	    return weak.def(this, value, true);
+	  }
+	}, weak, false, true);
+
+/***/ }),
+/* 446 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// https://github.com/DavidBruant/Map-Set.prototype.toJSON
+	var $export = __webpack_require__(21);
+
+	$export($export.P + $export.R, 'Map', { toJSON: __webpack_require__(421)('Map') });
+
+/***/ }),
+/* 447 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(151)('asyncIterator');
+
+/***/ }),
+/* 448 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	__webpack_require__(151)('observable');
+
+/***/ }),
+/* 449 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	/**
+	 * This is the common logic for both the Node.js and web browser
+	 * implementations of `debug()`.
+	 *
+	 * Expose `debug()` as the module.
+	 */
+
+	exports = module.exports = createDebug.debug = createDebug['default'] = createDebug;
+	exports.coerce = coerce;
+	exports.disable = disable;
+	exports.enable = enable;
+	exports.enabled = enabled;
+	exports.humanize = __webpack_require__(593);
+
+	/**
+	 * The currently active debug mode names, and names to skip.
+	 */
+
+	exports.names = [];
+	exports.skips = [];
+
+	/**
+	 * Map of special "%n" handling functions, for the debug "format" argument.
+	 *
+	 * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
+	 */
+
+	exports.formatters = {};
+
+	/**
+	 * Previous log timestamp.
+	 */
+
+	var prevTime;
+
+	/**
+	 * Select a color.
+	 * @param {String} namespace
+	 * @return {Number}
+	 * @api private
+	 */
+
+	function selectColor(namespace) {
+	  var hash = 0,
+	      i;
+
+	  for (i in namespace) {
+	    hash = (hash << 5) - hash + namespace.charCodeAt(i);
+	    hash |= 0; // Convert to 32bit integer
+	  }
+
+	  return exports.colors[Math.abs(hash) % exports.colors.length];
+	}
+
+	/**
+	 * Create a debugger with the given `namespace`.
+	 *
+	 * @param {String} namespace
+	 * @return {Function}
+	 * @api public
+	 */
+
+	function createDebug(namespace) {
+
+	  function debug() {
+	    // disabled?
+	    if (!debug.enabled) return;
+
+	    var self = debug;
+
+	    // set `diff` timestamp
+	    var curr = +new Date();
+	    var ms = curr - (prevTime || curr);
+	    self.diff = ms;
+	    self.prev = prevTime;
+	    self.curr = curr;
+	    prevTime = curr;
+
+	    // turn the `arguments` into a proper Array
+	    var args = new Array(arguments.length);
+	    for (var i = 0; i < args.length; i++) {
+	      args[i] = arguments[i];
+	    }
+
+	    args[0] = exports.coerce(args[0]);
+
+	    if ('string' !== typeof args[0]) {
+	      // anything else let's inspect with %O
+	      args.unshift('%O');
+	    }
+
+	    // apply any `formatters` transformations
+	    var index = 0;
+	    args[0] = args[0].replace(/%([a-zA-Z%])/g, function (match, format) {
+	      // if we encounter an escaped % then don't increase the array index
+	      if (match === '%%') return match;
+	      index++;
+	      var formatter = exports.formatters[format];
+	      if ('function' === typeof formatter) {
+	        var val = args[index];
+	        match = formatter.call(self, val);
+
+	        // now we need to remove `args[index]` since it's inlined in the `format`
+	        args.splice(index, 1);
+	        index--;
+	      }
+	      return match;
+	    });
+
+	    // apply env-specific formatting (colors, etc.)
+	    exports.formatArgs.call(self, args);
+
+	    var logFn = debug.log || exports.log || console.log.bind(console);
+	    logFn.apply(self, args);
+	  }
+
+	  debug.namespace = namespace;
+	  debug.enabled = exports.enabled(namespace);
+	  debug.useColors = exports.useColors();
+	  debug.color = selectColor(namespace);
+
+	  // env-specific initialization logic for debug instances
+	  if ('function' === typeof exports.init) {
+	    exports.init(debug);
+	  }
+
+	  return debug;
+	}
+
+	/**
+	 * Enables a debug mode by namespaces. This can include modes
+	 * separated by a colon and wildcards.
+	 *
+	 * @param {String} namespaces
+	 * @api public
+	 */
+
+	function enable(namespaces) {
+	  exports.save(namespaces);
+
+	  exports.names = [];
+	  exports.skips = [];
+
+	  var split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+	  var len = split.length;
+
+	  for (var i = 0; i < len; i++) {
+	    if (!split[i]) continue; // ignore empty strings
+	    namespaces = split[i].replace(/\*/g, '.*?');
+	    if (namespaces[0] === '-') {
+	      exports.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
+	    } else {
+	      exports.names.push(new RegExp('^' + namespaces + '$'));
+	    }
+	  }
+	}
+
+	/**
+	 * Disable debug output.
+	 *
+	 * @api public
+	 */
+
+	function disable() {
+	  exports.enable('');
+	}
+
+	/**
+	 * Returns true if the given mode name is enabled, false otherwise.
+	 *
+	 * @param {String} name
+	 * @return {Boolean}
+	 * @api public
+	 */
+
+	function enabled(name) {
+	  var i, len;
+	  for (i = 0, len = exports.skips.length; i < len; i++) {
+	    if (exports.skips[i].test(name)) {
+	      return false;
+	    }
+	  }
+	  for (i = 0, len = exports.names.length; i < len; i++) {
+	    if (exports.names[i].test(name)) {
+	      return true;
+	    }
+	  }
+	  return false;
+	}
+
+	/**
+	 * Coerce `val`.
+	 *
+	 * @param {Mixed} val
+	 * @return {Mixed}
+	 * @api private
+	 */
+
+	function coerce(val) {
+	  if (val instanceof Error) return val.stack || val.message;
+	  return val;
+	}
+
+/***/ }),
+/* 450 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* eslint-disable guard-for-in */
+	'use strict';
+
+	var repeating = __webpack_require__(606);
+
+	// detect either spaces or tabs but not both to properly handle tabs
+	// for indentation and spaces for alignment
+	var INDENT_RE = /^(?:( )+|\t+)/;
+
+	function getMostUsed(indents) {
+		var result = 0;
+		var maxUsed = 0;
+		var maxWeight = 0;
+
+		for (var n in indents) {
+			var indent = indents[n];
+			var u = indent[0];
+			var w = indent[1];
+
+			if (u > maxUsed || u === maxUsed && w > maxWeight) {
+				maxUsed = u;
+				maxWeight = w;
+				result = Number(n);
+			}
+		}
+
+		return result;
+	}
+
+	module.exports = function (str) {
+		if (typeof str !== 'string') {
+			throw new TypeError('Expected a string');
+		}
+
+		// used to see if tabs or spaces are the most used
+		var tabs = 0;
+		var spaces = 0;
+
+		// remember the size of previous line's indentation
+		var prev = 0;
+
+		// remember how many indents/unindents as occurred for a given size
+		// and how much lines follow a given indentation
+		//
+		// indents = {
+		//    3: [1, 0],
+		//    4: [1, 5],
+		//    5: [1, 0],
+		//   12: [1, 0],
+		// }
+		var indents = {};
+
+		// pointer to the array of last used indent
+		var current;
+
+		// whether the last action was an indent (opposed to an unindent)
+		var isIndent;
+
+		str.split(/\n/g).forEach(function (line) {
+			if (!line) {
+				// ignore empty lines
+				return;
+			}
+
+			var indent;
+			var matches = line.match(INDENT_RE);
+
+			if (!matches) {
+				indent = 0;
+			} else {
+				indent = matches[0].length;
+
+				if (matches[1]) {
+					spaces++;
+				} else {
+					tabs++;
+				}
+			}
+
+			var diff = indent - prev;
+			prev = indent;
+
+			if (diff) {
+				// an indent or unindent has been detected
+
+				isIndent = diff > 0;
+
+				current = indents[isIndent ? diff : -diff];
+
+				if (current) {
+					current[0]++;
+				} else {
+					current = indents[diff] = [1, 0];
+				}
+			} else if (current) {
+				// if the last action was an indent, increment the weight
+				current[1] += Number(isIndent);
+			}
+		});
+
+		var amount = getMostUsed(indents);
+
+		var type;
+		var actual;
+		if (!amount) {
+			type = null;
+			actual = '';
+		} else if (spaces >= tabs) {
+			type = 'space';
+			actual = repeating(' ', amount);
+		} else {
+			type = 'tab';
+			actual = repeating('\t', amount);
+		}
+
+		return {
+			amount: amount,
+			type: type,
+			indent: actual
+		};
+	};
+
+/***/ }),
+/* 451 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g;
+
+	module.exports = function (str) {
+		if (typeof str !== 'string') {
+			throw new TypeError('Expected a string');
+		}
+
+		return str.replace(matchOperatorsRe, '\\$&');
+	};
+
+/***/ }),
+/* 452 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/*
+	  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
+
+	  Redistribution and use in source and binary forms, with or without
+	  modification, are permitted provided that the following conditions are met:
+
+	    * Redistributions of source code must retain the above copyright
+	      notice, this list of conditions and the following disclaimer.
+	    * Redistributions in binary form must reproduce the above copyright
+	      notice, this list of conditions and the following disclaimer in the
+	      documentation and/or other materials provided with the distribution.
+
+	  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+	  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+	  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+	  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+	  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+	  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	*/
+
+	(function () {
+	    'use strict';
+
+	    function isExpression(node) {
+	        if (node == null) {
+	            return false;
+	        }
+	        switch (node.type) {
+	            case 'ArrayExpression':
+	            case 'AssignmentExpression':
+	            case 'BinaryExpression':
+	            case 'CallExpression':
+	            case 'ConditionalExpression':
+	            case 'FunctionExpression':
+	            case 'Identifier':
+	            case 'Literal':
+	            case 'LogicalExpression':
+	            case 'MemberExpression':
+	            case 'NewExpression':
+	            case 'ObjectExpression':
+	            case 'SequenceExpression':
+	            case 'ThisExpression':
+	            case 'UnaryExpression':
+	            case 'UpdateExpression':
+	                return true;
+	        }
+	        return false;
+	    }
+
+	    function isIterationStatement(node) {
+	        if (node == null) {
+	            return false;
+	        }
+	        switch (node.type) {
+	            case 'DoWhileStatement':
+	            case 'ForInStatement':
+	            case 'ForStatement':
+	            case 'WhileStatement':
+	                return true;
+	        }
+	        return false;
+	    }
+
+	    function isStatement(node) {
+	        if (node == null) {
+	            return false;
+	        }
+	        switch (node.type) {
+	            case 'BlockStatement':
+	            case 'BreakStatement':
+	            case 'ContinueStatement':
+	            case 'DebuggerStatement':
+	            case 'DoWhileStatement':
+	            case 'EmptyStatement':
+	            case 'ExpressionStatement':
+	            case 'ForInStatement':
+	            case 'ForStatement':
+	            case 'IfStatement':
+	            case 'LabeledStatement':
+	            case 'ReturnStatement':
+	            case 'SwitchStatement':
+	            case 'ThrowStatement':
+	            case 'TryStatement':
+	            case 'VariableDeclaration':
+	            case 'WhileStatement':
+	            case 'WithStatement':
+	                return true;
+	        }
+	        return false;
+	    }
+
+	    function isSourceElement(node) {
+	        return isStatement(node) || node != null && node.type === 'FunctionDeclaration';
+	    }
+
+	    function trailingStatement(node) {
+	        switch (node.type) {
+	            case 'IfStatement':
+	                if (node.alternate != null) {
+	                    return node.alternate;
+	                }
+	                return node.consequent;
+
+	            case 'LabeledStatement':
+	            case 'ForStatement':
+	            case 'ForInStatement':
+	            case 'WhileStatement':
+	            case 'WithStatement':
+	                return node.body;
+	        }
+	        return null;
+	    }
+
+	    function isProblematicIfStatement(node) {
+	        var current;
+
+	        if (node.type !== 'IfStatement') {
+	            return false;
+	        }
+	        if (node.alternate == null) {
+	            return false;
+	        }
+	        current = node.consequent;
+	        do {
+	            if (current.type === 'IfStatement') {
+	                if (current.alternate == null) {
+	                    return true;
+	                }
+	            }
+	            current = trailingStatement(current);
+	        } while (current);
+
+	        return false;
+	    }
+
+	    module.exports = {
+	        isExpression: isExpression,
+	        isStatement: isStatement,
+	        isIterationStatement: isIterationStatement,
+	        isSourceElement: isSourceElement,
+	        isProblematicIfStatement: isProblematicIfStatement,
+
+	        trailingStatement: trailingStatement
+	    };
+	})();
+	/* vim: set sw=4 ts=4 et tw=80 : */
+
+/***/ }),
+/* 453 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	/*
+	  Copyright (C) 2013 Yusuke Suzuki <utatane.tea@gmail.com>
+
+	  Redistribution and use in source and binary forms, with or without
+	  modification, are permitted provided that the following conditions are met:
+
+	    * Redistributions of source code must retain the above copyright
+	      notice, this list of conditions and the following disclaimer.
+	    * Redistributions in binary form must reproduce the above copyright
+	      notice, this list of conditions and the following disclaimer in the
+	      documentation and/or other materials provided with the distribution.
+
+	  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+	  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+	  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+	  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+	  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+	  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	*/
+
+	(function () {
+	    'use strict';
+
+	    var code = __webpack_require__(235);
+
+	    function isStrictModeReservedWordES6(id) {
+	        switch (id) {
+	            case 'implements':
+	            case 'interface':
+	            case 'package':
+	            case 'private':
+	            case 'protected':
+	            case 'public':
+	            case 'static':
+	            case 'let':
+	                return true;
+	            default:
+	                return false;
+	        }
+	    }
+
+	    function isKeywordES5(id, strict) {
+	        // yield should not be treated as keyword under non-strict mode.
+	        if (!strict && id === 'yield') {
+	            return false;
+	        }
+	        return isKeywordES6(id, strict);
+	    }
+
+	    function isKeywordES6(id, strict) {
+	        if (strict && isStrictModeReservedWordES6(id)) {
+	            return true;
+	        }
+
+	        switch (id.length) {
+	            case 2:
+	                return id === 'if' || id === 'in' || id === 'do';
+	            case 3:
+	                return id === 'var' || id === 'for' || id === 'new' || id === 'try';
+	            case 4:
+	                return id === 'this' || id === 'else' || id === 'case' || id === 'void' || id === 'with' || id === 'enum';
+	            case 5:
+	                return id === 'while' || id === 'break' || id === 'catch' || id === 'throw' || id === 'const' || id === 'yield' || id === 'class' || id === 'super';
+	            case 6:
+	                return id === 'return' || id === 'typeof' || id === 'delete' || id === 'switch' || id === 'export' || id === 'import';
+	            case 7:
+	                return id === 'default' || id === 'finally' || id === 'extends';
+	            case 8:
+	                return id === 'function' || id === 'continue' || id === 'debugger';
+	            case 10:
+	                return id === 'instanceof';
+	            default:
+	                return false;
+	        }
+	    }
+
+	    function isReservedWordES5(id, strict) {
+	        return id === 'null' || id === 'true' || id === 'false' || isKeywordES5(id, strict);
+	    }
+
+	    function isReservedWordES6(id, strict) {
+	        return id === 'null' || id === 'true' || id === 'false' || isKeywordES6(id, strict);
+	    }
+
+	    function isRestrictedWord(id) {
+	        return id === 'eval' || id === 'arguments';
+	    }
+
+	    function isIdentifierNameES5(id) {
+	        var i, iz, ch;
+
+	        if (id.length === 0) {
+	            return false;
+	        }
+
+	        ch = id.charCodeAt(0);
+	        if (!code.isIdentifierStartES5(ch)) {
+	            return false;
+	        }
+
+	        for (i = 1, iz = id.length; i < iz; ++i) {
+	            ch = id.charCodeAt(i);
+	            if (!code.isIdentifierPartES5(ch)) {
+	                return false;
+	            }
+	        }
+	        return true;
+	    }
+
+	    function decodeUtf16(lead, trail) {
+	        return (lead - 0xD800) * 0x400 + (trail - 0xDC00) + 0x10000;
+	    }
+
+	    function isIdentifierNameES6(id) {
+	        var i, iz, ch, lowCh, check;
+
+	        if (id.length === 0) {
+	            return false;
+	        }
+
+	        check = code.isIdentifierStartES6;
+	        for (i = 0, iz = id.length; i < iz; ++i) {
+	            ch = id.charCodeAt(i);
+	            if (0xD800 <= ch && ch <= 0xDBFF) {
+	                ++i;
+	                if (i >= iz) {
+	                    return false;
+	                }
+	                lowCh = id.charCodeAt(i);
+	                if (!(0xDC00 <= lowCh && lowCh <= 0xDFFF)) {
+	                    return false;
+	                }
+	                ch = decodeUtf16(ch, lowCh);
+	            }
+	            if (!check(ch)) {
+	                return false;
+	            }
+	            check = code.isIdentifierPartES6;
+	        }
+	        return true;
+	    }
+
+	    function isIdentifierES5(id, strict) {
+	        return isIdentifierNameES5(id) && !isReservedWordES5(id, strict);
+	    }
+
+	    function isIdentifierES6(id, strict) {
+	        return isIdentifierNameES6(id) && !isReservedWordES6(id, strict);
+	    }
+
+	    module.exports = {
+	        isKeywordES5: isKeywordES5,
+	        isKeywordES6: isKeywordES6,
+	        isReservedWordES5: isReservedWordES5,
+	        isReservedWordES6: isReservedWordES6,
+	        isRestrictedWord: isRestrictedWord,
+	        isIdentifierNameES5: isIdentifierNameES5,
+	        isIdentifierNameES6: isIdentifierNameES6,
+	        isIdentifierES5: isIdentifierES5,
+	        isIdentifierES6: isIdentifierES6
+	    };
+	})();
+	/* vim: set sw=4 ts=4 et tw=80 : */
+
+/***/ }),
+/* 454 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = __webpack_require__(621);
+
+/***/ }),
+/* 455 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var ansiRegex = __webpack_require__(176);
+	var re = new RegExp(ansiRegex().source); // remove the `g` flag
+	module.exports = re.test.bind(re);
+
+/***/ }),
+/* 456 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	exports.read = function (buffer, offset, isLE, mLen, nBytes) {
+	  var e, m;
+	  var eLen = nBytes * 8 - mLen - 1;
+	  var eMax = (1 << eLen) - 1;
+	  var eBias = eMax >> 1;
+	  var nBits = -7;
+	  var i = isLE ? nBytes - 1 : 0;
+	  var d = isLE ? -1 : 1;
+	  var s = buffer[offset + i];
+
+	  i += d;
+
+	  e = s & (1 << -nBits) - 1;
+	  s >>= -nBits;
+	  nBits += eLen;
+	  for (; nBits > 0; e = e * 256 + buffer[offset + i], i += d, nBits -= 8) {}
+
+	  m = e & (1 << -nBits) - 1;
+	  e >>= -nBits;
+	  nBits += mLen;
+	  for (; nBits > 0; m = m * 256 + buffer[offset + i], i += d, nBits -= 8) {}
+
+	  if (e === 0) {
+	    e = 1 - eBias;
+	  } else if (e === eMax) {
+	    return m ? NaN : (s ? -1 : 1) * Infinity;
+	  } else {
+	    m = m + Math.pow(2, mLen);
+	    e = e - eBias;
+	  }
+	  return (s ? -1 : 1) * m * Math.pow(2, e - mLen);
+	};
+
+	exports.write = function (buffer, value, offset, isLE, mLen, nBytes) {
+	  var e, m, c;
+	  var eLen = nBytes * 8 - mLen - 1;
+	  var eMax = (1 << eLen) - 1;
+	  var eBias = eMax >> 1;
+	  var rt = mLen === 23 ? Math.pow(2, -24) - Math.pow(2, -77) : 0;
+	  var i = isLE ? 0 : nBytes - 1;
+	  var d = isLE ? 1 : -1;
+	  var s = value < 0 || value === 0 && 1 / value < 0 ? 1 : 0;
+
+	  value = Math.abs(value);
+
+	  if (isNaN(value) || value === Infinity) {
+	    m = isNaN(value) ? 1 : 0;
+	    e = eMax;
+	  } else {
+	    e = Math.floor(Math.log(value) / Math.LN2);
+	    if (value * (c = Math.pow(2, -e)) < 1) {
+	      e--;
+	      c *= 2;
+	    }
+	    if (e + eBias >= 1) {
+	      value += rt / c;
+	    } else {
+	      value += rt * Math.pow(2, 1 - eBias);
+	    }
+	    if (value * c >= 2) {
+	      e++;
+	      c /= 2;
+	    }
+
+	    if (e + eBias >= eMax) {
+	      m = 0;
+	      e = eMax;
+	    } else if (e + eBias >= 1) {
+	      m = (value * c - 1) * Math.pow(2, mLen);
+	      e = e + eBias;
+	    } else {
+	      m = value * Math.pow(2, eBias - 1) * Math.pow(2, mLen);
+	      e = 0;
+	    }
+	  }
+
+	  for (; mLen >= 8; buffer[offset + i] = m & 0xff, i += d, m /= 256, mLen -= 8) {}
+
+	  e = e << mLen | m;
+	  eLen += mLen;
+	  for (; eLen > 0; buffer[offset + i] = e & 0xff, i += d, e /= 256, eLen -= 8) {}
+
+	  buffer[offset + i - d] |= s * 128;
+	};
+
+/***/ }),
+/* 457 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/**
+	 * Copyright 2013-2015, Facebook, Inc.
+	 * All rights reserved.
+	 *
+	 * This source code is licensed under the BSD-style license found in the
+	 * LICENSE file in the root directory of this source tree. An additional grant
+	 * of patent rights can be found in the PATENTS file in the same directory.
+	 */
+
+	'use strict';
+
+	/**
+	 * Use invariant() to assert state which your program assumes to be true.
+	 *
+	 * Provide sprintf-style format (only %s is supported) and arguments
+	 * to provide information about what broke and what you were
+	 * expecting.
+	 *
+	 * The invariant message will be stripped in production, but the invariant
+	 * will remain to ensure logic does not differ in production.
+	 */
+
+	var invariant = function invariant(condition, format, a, b, c, d, e, f) {
+	  if (false) {
+	    if (format === undefined) {
+	      throw new Error('invariant requires an error message argument');
+	    }
+	  }
+
+	  if (!condition) {
+	    var error;
+	    if (format === undefined) {
+	      error = new Error('Minified exception occurred; use the non-minified dev environment ' + 'for the full error message and additional helpful warnings.');
+	    } else {
+	      var args = [a, b, c, d, e, f];
+	      var argIndex = 0;
+	      error = new Error(format.replace(/%s/g, function () {
+	        return args[argIndex++];
+	      }));
+	      error.name = 'Invariant Violation';
+	    }
+
+	    error.framesToPop = 1; // we don't care about invariant's own frame
+	    throw error;
+	  }
+	};
+
+	module.exports = invariant;
+
+/***/ }),
+/* 458 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var numberIsNan = __webpack_require__(594);
+
+	module.exports = Number.isFinite || function (val) {
+		return !(typeof val !== 'number' || numberIsNan(val) || val === Infinity || val === -Infinity);
+	};
+
+/***/ }),
+/* 459 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	// Copyright 2014, 2015, 2016, 2017 Simon Lydell
+	// License: MIT. (See LICENSE.)
+
+	Object.defineProperty(exports, "__esModule", {
+	  value: true
+	}
+
+	// This regex comes from regex.coffee, and is inserted here by generate-index.js
+	// (run `npm run build`).
+	);exports.default = /((['"])(?:(?!\2|\\).|\\(?:\r\n|[\s\S]))*(\2)?|`(?:[^`\\$]|\\[\s\S]|\$(?!\{)|\$\{(?:[^{}]|\{[^}]*\}?)*\}?)*(`)?)|(\/\/.*)|(\/\*(?:[^*]|\*(?!\/))*(\*\/)?)|(\/(?!\*)(?:\[(?:(?![\]\\]).|\\.)*\]|(?![\/\]\\]).|\\.)+\/(?:(?!\s*(?:\b|[\u0080-\uFFFF$\\'"~({]|[+\-!](?!=)|\.?\d))|[gmiyu]{1,5}\b(?![\u0080-\uFFFF$\\]|\s*(?:[+\-*%&|^<>!=?({]|\/(?![\/*])))))|(0[xX][\da-fA-F]+|0[oO][0-7]+|0[bB][01]+|(?:\d*\.\d+|\d+\.?)(?:[eE][+-]?\d+)?)|((?!\d)(?:(?!\s)[$\w\u0080-\uFFFF]|\\u[\da-fA-F]{4}|\\u\{[\da-fA-F]+\})+)|(--|\+\+|&&|\|\||=>|\.{3}|(?:[+\-\/%&|^]|\*{1,2}|<{1,2}|>{1,3}|!=?|={1,2})=?|[?~.,:;[\](){}])|(\s+)|(^$|[\s\S])/g;
+
+	exports.matchToToken = function (match) {
+	  var token = { type: "invalid", value: match[0] };
+	  if (match[1]) token.type = "string", token.closed = !!(match[3] || match[4]);else if (match[5]) token.type = "comment";else if (match[6]) token.type = "comment", token.closed = !!match[7];else if (match[8]) token.type = "regex";else if (match[9]) token.type = "number";else if (match[10]) token.type = "name";else if (match[11]) token.type = "punctuator";else if (match[12]) token.type = "whitespace";
+	  return token;
+	};
+
+/***/ }),
+/* 460 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(module, global) {'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	/*! https://mths.be/jsesc v1.3.0 by @mathias */
+	;(function (root) {
+
+		// Detect free variables `exports`
+		var freeExports = ( false ? 'undefined' : _typeof(exports)) == 'object' && exports;
+
+		// Detect free variable `module`
+		var freeModule = ( false ? 'undefined' : _typeof(module)) == 'object' && module && module.exports == freeExports && module;
+
+		// Detect free variable `global`, from Node.js or Browserified code,
+		// and use it as `root`
+		var freeGlobal = (typeof global === 'undefined' ? 'undefined' : _typeof(global)) == 'object' && global;
+		if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
+			root = freeGlobal;
+		}
+
+		/*--------------------------------------------------------------------------*/
+
+		var object = {};
+		var hasOwnProperty = object.hasOwnProperty;
+		var forOwn = function forOwn(object, callback) {
+			var key;
+			for (key in object) {
+				if (hasOwnProperty.call(object, key)) {
+					callback(key, object[key]);
+				}
+			}
+		};
+
+		var extend = function extend(destination, source) {
+			if (!source) {
+				return destination;
+			}
+			forOwn(source, function (key, value) {
+				destination[key] = value;
+			});
+			return destination;
+		};
+
+		var forEach = function forEach(array, callback) {
+			var length = array.length;
+			var index = -1;
+			while (++index < length) {
+				callback(array[index]);
+			}
+		};
+
+		var toString = object.toString;
+		var isArray = function isArray(value) {
+			return toString.call(value) == '[object Array]';
+		};
+		var isObject = function isObject(value) {
+			// This is a very simple check, but it’s good enough for what we need.
+			return toString.call(value) == '[object Object]';
+		};
+		var isString = function isString(value) {
+			return typeof value == 'string' || toString.call(value) == '[object String]';
+		};
+		var isNumber = function isNumber(value) {
+			return typeof value == 'number' || toString.call(value) == '[object Number]';
+		};
+		var isFunction = function isFunction(value) {
+			// In a perfect world, the `typeof` check would be sufficient. However,
+			// in Chrome 1–12, `typeof /x/ == 'object'`, and in IE 6–8
+			// `typeof alert == 'object'` and similar for other host objects.
+			return typeof value == 'function' || toString.call(value) == '[object Function]';
+		};
+		var isMap = function isMap(value) {
+			return toString.call(value) == '[object Map]';
+		};
+		var isSet = function isSet(value) {
+			return toString.call(value) == '[object Set]';
+		};
+
+		/*--------------------------------------------------------------------------*/
+
+		// https://mathiasbynens.be/notes/javascript-escapes#single
+		var singleEscapes = {
+			'"': '\\"',
+			'\'': '\\\'',
+			'\\': '\\\\',
+			'\b': '\\b',
+			'\f': '\\f',
+			'\n': '\\n',
+			'\r': '\\r',
+			'\t': '\\t'
+			// `\v` is omitted intentionally, because in IE < 9, '\v' == 'v'.
+			// '\v': '\\x0B'
+		};
+		var regexSingleEscape = /["'\\\b\f\n\r\t]/;
+
+		var regexDigit = /[0-9]/;
+		var regexWhitelist = /[ !#-&\(-\[\]-~]/;
+
+		var jsesc = function jsesc(argument, options) {
+			// Handle options
+			var defaults = {
+				'escapeEverything': false,
+				'escapeEtago': false,
+				'quotes': 'single',
+				'wrap': false,
+				'es6': false,
+				'json': false,
+				'compact': true,
+				'lowercaseHex': false,
+				'numbers': 'decimal',
+				'indent': '\t',
+				'__indent__': '',
+				'__inline1__': false,
+				'__inline2__': false
+			};
+			var json = options && options.json;
+			if (json) {
+				defaults.quotes = 'double';
+				defaults.wrap = true;
+			}
+			options = extend(defaults, options);
+			if (options.quotes != 'single' && options.quotes != 'double') {
+				options.quotes = 'single';
+			}
+			var quote = options.quotes == 'double' ? '"' : '\'';
+			var compact = options.compact;
+			var indent = options.indent;
+			var lowercaseHex = options.lowercaseHex;
+			var oldIndent = '';
+			var inline1 = options.__inline1__;
+			var inline2 = options.__inline2__;
+			var newLine = compact ? '' : '\n';
+			var result;
+			var isEmpty = true;
+			var useBinNumbers = options.numbers == 'binary';
+			var useOctNumbers = options.numbers == 'octal';
+			var useDecNumbers = options.numbers == 'decimal';
+			var useHexNumbers = options.numbers == 'hexadecimal';
+
+			if (json && argument && isFunction(argument.toJSON)) {
+				argument = argument.toJSON();
+			}
+
+			if (!isString(argument)) {
+				if (isMap(argument)) {
+					if (argument.size == 0) {
+						return 'new Map()';
+					}
+					if (!compact) {
+						options.__inline1__ = true;
+					}
+					return 'new Map(' + jsesc(Array.from(argument), options) + ')';
+				}
+				if (isSet(argument)) {
+					if (argument.size == 0) {
+						return 'new Set()';
+					}
+					return 'new Set(' + jsesc(Array.from(argument), options) + ')';
+				}
+				if (isArray(argument)) {
+					result = [];
+					options.wrap = true;
+					if (inline1) {
+						options.__inline1__ = false;
+						options.__inline2__ = true;
+					} else {
+						oldIndent = options.__indent__;
+						indent += oldIndent;
+						options.__indent__ = indent;
+					}
+					forEach(argument, function (value) {
+						isEmpty = false;
+						if (inline2) {
+							options.__inline2__ = false;
+						}
+						result.push((compact || inline2 ? '' : indent) + jsesc(value, options));
+					});
+					if (isEmpty) {
+						return '[]';
+					}
+					if (inline2) {
+						return '[' + result.join(', ') + ']';
+					}
+					return '[' + newLine + result.join(',' + newLine) + newLine + (compact ? '' : oldIndent) + ']';
+				} else if (isNumber(argument)) {
+					if (json) {
+						// Some number values (e.g. `Infinity`) cannot be represented in JSON.
+						return JSON.stringify(argument);
+					}
+					if (useDecNumbers) {
+						return String(argument);
+					}
+					if (useHexNumbers) {
+						var tmp = argument.toString(16);
+						if (!lowercaseHex) {
+							tmp = tmp.toUpperCase();
+						}
+						return '0x' + tmp;
+					}
+					if (useBinNumbers) {
+						return '0b' + argument.toString(2);
+					}
+					if (useOctNumbers) {
+						return '0o' + argument.toString(8);
+					}
+				} else if (!isObject(argument)) {
+					if (json) {
+						// For some values (e.g. `undefined`, `function` objects),
+						// `JSON.stringify(value)` returns `undefined` (which isn’t valid
+						// JSON) instead of `'null'`.
+						return JSON.stringify(argument) || 'null';
+					}
+					return String(argument);
+				} else {
+					// it’s an object
+					result = [];
+					options.wrap = true;
+					oldIndent = options.__indent__;
+					indent += oldIndent;
+					options.__indent__ = indent;
+					forOwn(argument, function (key, value) {
+						isEmpty = false;
+						result.push((compact ? '' : indent) + jsesc(key, options) + ':' + (compact ? '' : ' ') + jsesc(value, options));
+					});
+					if (isEmpty) {
+						return '{}';
+					}
+					return '{' + newLine + result.join(',' + newLine) + newLine + (compact ? '' : oldIndent) + '}';
+				}
+			}
+
+			var string = argument;
+			// Loop over each code unit in the string and escape it
+			var index = -1;
+			var length = string.length;
+			var first;
+			var second;
+			var codePoint;
+			result = '';
+			while (++index < length) {
+				var character = string.charAt(index);
+				if (options.es6) {
+					first = string.charCodeAt(index);
+					if ( // check if it’s the start of a surrogate pair
+					first >= 0xD800 && first <= 0xDBFF && // high surrogate
+					length > index + 1 // there is a next code unit
+					) {
+							second = string.charCodeAt(index + 1);
+							if (second >= 0xDC00 && second <= 0xDFFF) {
+								// low surrogate
+								// https://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
+								codePoint = (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000;
+								var hexadecimal = codePoint.toString(16);
+								if (!lowercaseHex) {
+									hexadecimal = hexadecimal.toUpperCase();
+								}
+								result += '\\u{' + hexadecimal + '}';
+								index++;
+								continue;
+							}
+						}
+				}
+				if (!options.escapeEverything) {
+					if (regexWhitelist.test(character)) {
+						// It’s a printable ASCII character that is not `"`, `'` or `\`,
+						// so don’t escape it.
+						result += character;
+						continue;
+					}
+					if (character == '"') {
+						result += quote == character ? '\\"' : character;
+						continue;
+					}
+					if (character == '\'') {
+						result += quote == character ? '\\\'' : character;
+						continue;
+					}
+				}
+				if (character == '\0' && !json && !regexDigit.test(string.charAt(index + 1))) {
+					result += '\\0';
+					continue;
+				}
+				if (regexSingleEscape.test(character)) {
+					// no need for a `hasOwnProperty` check here
+					result += singleEscapes[character];
+					continue;
+				}
+				var charCode = character.charCodeAt(0);
+				var hexadecimal = charCode.toString(16);
+				if (!lowercaseHex) {
+					hexadecimal = hexadecimal.toUpperCase();
+				}
+				var longhand = hexadecimal.length > 2 || json;
+				var escaped = '\\' + (longhand ? 'u' : 'x') + ('0000' + hexadecimal).slice(longhand ? -4 : -2);
+				result += escaped;
+				continue;
+			}
+			if (options.wrap) {
+				result = quote + result + quote;
+			}
+			if (options.escapeEtago) {
+				// https://mathiasbynens.be/notes/etago
+				return result.replace(/<\/(script|style)/gi, '<\\/$1');
+			}
+			return result;
+		};
+
+		jsesc.version = '1.3.0';
+
+		/*--------------------------------------------------------------------------*/
+
+		// Some AMD build optimizers, like r.js, check for specific condition patterns
+		// like the following:
+		if ("function" == 'function' && _typeof(__webpack_require__(48)) == 'object' && __webpack_require__(48)) {
+			!(__WEBPACK_AMD_DEFINE_RESULT__ = function () {
+				return jsesc;
+			}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+		} else if (freeExports && !freeExports.nodeType) {
+			if (freeModule) {
+				// in Node.js or RingoJS v0.8.0+
+				freeModule.exports = jsesc;
+			} else {
+				// in Narwhal or RingoJS v0.7.0-
+				freeExports.jsesc = jsesc;
+			}
+		} else {
+			// in Rhino or a web browser
+			root.jsesc = jsesc;
+		}
+	})(undefined);
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(39)(module), (function() { return this; }())))
+
+/***/ }),
+/* 461 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	// json5.js
+	// Modern JSON. See README.md for details.
+	//
+	// This file is based directly off of Douglas Crockford's json_parse.js:
+	// https://github.com/douglascrockford/JSON-js/blob/master/json_parse.js
+
+	var JSON5 = ( false ? "undefined" : _typeof(exports)) === 'object' ? exports : {};
+
+	JSON5.parse = function () {
+	    "use strict";
+
+	    // This is a function that can parse a JSON5 text, producing a JavaScript
+	    // data structure. It is a simple, recursive descent parser. It does not use
+	    // eval or regular expressions, so it can be used as a model for implementing
+	    // a JSON5 parser in other languages.
+
+	    // We are defining the function inside of another function to avoid creating
+	    // global variables.
+
+	    var at,
+	        // The index of the current character
+	    lineNumber,
+	        // The current line number
+	    columnNumber,
+	        // The current column number
+	    ch,
+	        // The current character
+	    escapee = {
+	        "'": "'",
+	        '"': '"',
+	        '\\': '\\',
+	        '/': '/',
+	        '\n': '', // Replace escaped newlines in strings w/ empty string
+	        b: '\b',
+	        f: '\f',
+	        n: '\n',
+	        r: '\r',
+	        t: '\t'
+	    },
+	        ws = [' ', '\t', '\r', '\n', '\v', '\f', '\xA0', "\uFEFF"],
+	        text,
+	        renderChar = function renderChar(chr) {
+	        return chr === '' ? 'EOF' : "'" + chr + "'";
+	    },
+	        error = function error(m) {
+
+	        // Call error when something is wrong.
+
+	        var error = new SyntaxError();
+	        // beginning of message suffix to agree with that provided by Gecko - see https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse
+	        error.message = m + " at line " + lineNumber + " column " + columnNumber + " of the JSON5 data. Still to read: " + JSON.stringify(text.substring(at - 1, at + 19));
+	        error.at = at;
+	        // These two property names have been chosen to agree with the ones in Gecko, the only popular
+	        // environment which seems to supply this info on JSON.parse
+	        error.lineNumber = lineNumber;
+	        error.columnNumber = columnNumber;
+	        throw error;
+	    },
+	        next = function next(c) {
+
+	        // If a c parameter is provided, verify that it matches the current character.
+
+	        if (c && c !== ch) {
+	            error("Expected " + renderChar(c) + " instead of " + renderChar(ch));
+	        }
+
+	        // Get the next character. When there are no more characters,
+	        // return the empty string.
+
+	        ch = text.charAt(at);
+	        at++;
+	        columnNumber++;
+	        if (ch === '\n' || ch === '\r' && peek() !== '\n') {
+	            lineNumber++;
+	            columnNumber = 0;
+	        }
+	        return ch;
+	    },
+	        peek = function peek() {
+
+	        // Get the next character without consuming it or
+	        // assigning it to the ch varaible.
+
+	        return text.charAt(at);
+	    },
+	        identifier = function identifier() {
+
+	        // Parse an identifier. Normally, reserved words are disallowed here, but we
+	        // only use this for unquoted object keys, where reserved words are allowed,
+	        // so we don't check for those here. References:
+	        // - http://es5.github.com/#x7.6
+	        // - https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Core_Language_Features#Variables
+	        // - http://docstore.mik.ua/orelly/webprog/jscript/ch02_07.htm
+	        // TODO Identifiers can have Unicode "letters" in them; add support for those.
+
+	        var key = ch;
+
+	        // Identifiers must start with a letter, _ or $.
+	        if (ch !== '_' && ch !== '$' && (ch < 'a' || ch > 'z') && (ch < 'A' || ch > 'Z')) {
+	            error("Bad identifier as unquoted key");
+	        }
+
+	        // Subsequent characters can contain digits.
+	        while (next() && (ch === '_' || ch === '$' || ch >= 'a' && ch <= 'z' || ch >= 'A' && ch <= 'Z' || ch >= '0' && ch <= '9')) {
+	            key += ch;
+	        }
+
+	        return key;
+	    },
+	        number = function number() {
+
+	        // Parse a number value.
+
+	        var number,
+	            sign = '',
+	            string = '',
+	            base = 10;
+
+	        if (ch === '-' || ch === '+') {
+	            sign = ch;
+	            next(ch);
+	        }
+
+	        // support for Infinity (could tweak to allow other words):
+	        if (ch === 'I') {
+	            number = word();
+	            if (typeof number !== 'number' || isNaN(number)) {
+	                error('Unexpected word for number');
+	            }
+	            return sign === '-' ? -number : number;
+	        }
+
+	        // support for NaN
+	        if (ch === 'N') {
+	            number = word();
+	            if (!isNaN(number)) {
+	                error('expected word to be NaN');
+	            }
+	            // ignore sign as -NaN also is NaN
+	            return number;
+	        }
+
+	        if (ch === '0') {
+	            string += ch;
+	            next();
+	            if (ch === 'x' || ch === 'X') {
+	                string += ch;
+	                next();
+	                base = 16;
+	            } else if (ch >= '0' && ch <= '9') {
+	                error('Octal literal');
+	            }
+	        }
+
+	        switch (base) {
+	            case 10:
+	                while (ch >= '0' && ch <= '9') {
+	                    string += ch;
+	                    next();
+	                }
+	                if (ch === '.') {
+	                    string += '.';
+	                    while (next() && ch >= '0' && ch <= '9') {
+	                        string += ch;
+	                    }
+	                }
+	                if (ch === 'e' || ch === 'E') {
+	                    string += ch;
+	                    next();
+	                    if (ch === '-' || ch === '+') {
+	                        string += ch;
+	                        next();
+	                    }
+	                    while (ch >= '0' && ch <= '9') {
+	                        string += ch;
+	                        next();
+	                    }
+	                }
+	                break;
+	            case 16:
+	                while (ch >= '0' && ch <= '9' || ch >= 'A' && ch <= 'F' || ch >= 'a' && ch <= 'f') {
+	                    string += ch;
+	                    next();
+	                }
+	                break;
+	        }
+
+	        if (sign === '-') {
+	            number = -string;
+	        } else {
+	            number = +string;
+	        }
+
+	        if (!isFinite(number)) {
+	            error("Bad number");
+	        } else {
+	            return number;
+	        }
+	    },
+	        string = function string() {
+
+	        // Parse a string value.
+
+	        var hex,
+	            i,
+	            string = '',
+	            delim,
+	            // double quote or single quote
+	        uffff;
+
+	        // When parsing for string values, we must look for ' or " and \ characters.
+
+	        if (ch === '"' || ch === "'") {
+	            delim = ch;
+	            while (next()) {
+	                if (ch === delim) {
+	                    next();
+	                    return string;
+	                } else if (ch === '\\') {
+	                    next();
+	                    if (ch === 'u') {
+	                        uffff = 0;
+	                        for (i = 0; i < 4; i += 1) {
+	                            hex = parseInt(next(), 16);
+	                            if (!isFinite(hex)) {
+	                                break;
+	                            }
+	                            uffff = uffff * 16 + hex;
+	                        }
+	                        string += String.fromCharCode(uffff);
+	                    } else if (ch === '\r') {
+	                        if (peek() === '\n') {
+	                            next();
+	                        }
+	                    } else if (typeof escapee[ch] === 'string') {
+	                        string += escapee[ch];
+	                    } else {
+	                        break;
+	                    }
+	                } else if (ch === '\n') {
+	                    // unescaped newlines are invalid; see:
+	                    // https://github.com/aseemk/json5/issues/24
+	                    // TODO this feels special-cased; are there other
+	                    // invalid unescaped chars?
+	                    break;
+	                } else {
+	                    string += ch;
+	                }
+	            }
+	        }
+	        error("Bad string");
+	    },
+	        inlineComment = function inlineComment() {
+
+	        // Skip an inline comment, assuming this is one. The current character should
+	        // be the second / character in the // pair that begins this inline comment.
+	        // To finish the inline comment, we look for a newline or the end of the text.
+
+	        if (ch !== '/') {
+	            error("Not an inline comment");
+	        }
+
+	        do {
+	            next();
+	            if (ch === '\n' || ch === '\r') {
+	                next();
+	                return;
+	            }
+	        } while (ch);
+	    },
+	        blockComment = function blockComment() {
+
+	        // Skip a block comment, assuming this is one. The current character should be
+	        // the * character in the /* pair that begins this block comment.
+	        // To finish the block comment, we look for an ending */ pair of characters,
+	        // but we also watch for the end of text before the comment is terminated.
+
+	        if (ch !== '*') {
+	            error("Not a block comment");
+	        }
+
+	        do {
+	            next();
+	            while (ch === '*') {
+	                next('*');
+	                if (ch === '/') {
+	                    next('/');
+	                    return;
+	                }
+	            }
+	        } while (ch);
+
+	        error("Unterminated block comment");
+	    },
+	        comment = function comment() {
+
+	        // Skip a comment, whether inline or block-level, assuming this is one.
+	        // Comments always begin with a / character.
+
+	        if (ch !== '/') {
+	            error("Not a comment");
+	        }
+
+	        next('/');
+
+	        if (ch === '/') {
+	            inlineComment();
+	        } else if (ch === '*') {
+	            blockComment();
+	        } else {
+	            error("Unrecognized comment");
+	        }
+	    },
+	        white = function white() {
+
+	        // Skip whitespace and comments.
+	        // Note that we're detecting comments by only a single / character.
+	        // This works since regular expressions are not valid JSON(5), but this will
+	        // break if there are other valid values that begin with a / character!
+
+	        while (ch) {
+	            if (ch === '/') {
+	                comment();
+	            } else if (ws.indexOf(ch) >= 0) {
+	                next();
+	            } else {
+	                return;
+	            }
+	        }
+	    },
+	        word = function word() {
+
+	        // true, false, or null.
+
+	        switch (ch) {
+	            case 't':
+	                next('t');
+	                next('r');
+	                next('u');
+	                next('e');
+	                return true;
+	            case 'f':
+	                next('f');
+	                next('a');
+	                next('l');
+	                next('s');
+	                next('e');
+	                return false;
+	            case 'n':
+	                next('n');
+	                next('u');
+	                next('l');
+	                next('l');
+	                return null;
+	            case 'I':
+	                next('I');
+	                next('n');
+	                next('f');
+	                next('i');
+	                next('n');
+	                next('i');
+	                next('t');
+	                next('y');
+	                return Infinity;
+	            case 'N':
+	                next('N');
+	                next('a');
+	                next('N');
+	                return NaN;
+	        }
+	        error("Unexpected " + renderChar(ch));
+	    },
+	        value,
+	        // Place holder for the value function.
+
+	    array = function array() {
+
+	        // Parse an array value.
+
+	        var array = [];
+
+	        if (ch === '[') {
+	            next('[');
+	            white();
+	            while (ch) {
+	                if (ch === ']') {
+	                    next(']');
+	                    return array; // Potentially empty array
+	                }
+	                // ES5 allows omitting elements in arrays, e.g. [,] and
+	                // [,null]. We don't allow this in JSON5.
+	                if (ch === ',') {
+	                    error("Missing array element");
+	                } else {
+	                    array.push(value());
+	                }
+	                white();
+	                // If there's no comma after this value, this needs to
+	                // be the end of the array.
+	                if (ch !== ',') {
+	                    next(']');
+	                    return array;
+	                }
+	                next(',');
+	                white();
+	            }
+	        }
+	        error("Bad array");
+	    },
+	        object = function object() {
+
+	        // Parse an object value.
+
+	        var key,
+	            object = {};
+
+	        if (ch === '{') {
+	            next('{');
+	            white();
+	            while (ch) {
+	                if (ch === '}') {
+	                    next('}');
+	                    return object; // Potentially empty object
+	                }
+
+	                // Keys can be unquoted. If they are, they need to be
+	                // valid JS identifiers.
+	                if (ch === '"' || ch === "'") {
+	                    key = string();
+	                } else {
+	                    key = identifier();
+	                }
+
+	                white();
+	                next(':');
+	                object[key] = value();
+	                white();
+	                // If there's no comma after this pair, this needs to be
+	                // the end of the object.
+	                if (ch !== ',') {
+	                    next('}');
+	                    return object;
+	                }
+	                next(',');
+	                white();
+	            }
+	        }
+	        error("Bad object");
+	    };
+
+	    value = function value() {
+
+	        // Parse a JSON value. It could be an object, an array, a string, a number,
+	        // or a word.
+
+	        white();
+	        switch (ch) {
+	            case '{':
+	                return object();
+	            case '[':
+	                return array();
+	            case '"':
+	            case "'":
+	                return string();
+	            case '-':
+	            case '+':
+	            case '.':
+	                return number();
+	            default:
+	                return ch >= '0' && ch <= '9' ? number() : word();
+	        }
+	    };
+
+	    // Return the json_parse function. It will have access to all of the above
+	    // functions and variables.
+
+	    return function (source, reviver) {
+	        var result;
+
+	        text = String(source);
+	        at = 0;
+	        lineNumber = 1;
+	        columnNumber = 1;
+	        ch = ' ';
+	        result = value();
+	        white();
+	        if (ch) {
+	            error("Syntax error");
+	        }
+
+	        // If there is a reviver function, we recursively walk the new structure,
+	        // passing each name/value pair to the reviver function for possible
+	        // transformation, starting with a temporary root object that holds the result
+	        // in an empty key. If there is not a reviver function, we simply return the
+	        // result.
+
+	        return typeof reviver === 'function' ? function walk(holder, key) {
+	            var k,
+	                v,
+	                value = holder[key];
+	            if (value && (typeof value === "undefined" ? "undefined" : _typeof(value)) === 'object') {
+	                for (k in value) {
+	                    if (Object.prototype.hasOwnProperty.call(value, k)) {
+	                        v = walk(value, k);
+	                        if (v !== undefined) {
+	                            value[k] = v;
+	                        } else {
+	                            delete value[k];
+	                        }
+	                    }
+	                }
+	            }
+	            return reviver.call(holder, key, value);
+	        }({ '': result }, '') : result;
+	    };
+	}();
+
+	// JSON5 stringify will not quote keys where appropriate
+	JSON5.stringify = function (obj, replacer, space) {
+	    if (replacer && typeof replacer !== "function" && !isArray(replacer)) {
+	        throw new Error('Replacer must be a function or an array');
+	    }
+	    var getReplacedValueOrUndefined = function getReplacedValueOrUndefined(holder, key, isTopLevel) {
+	        var value = holder[key];
+
+	        // Replace the value with its toJSON value first, if possible
+	        if (value && value.toJSON && typeof value.toJSON === "function") {
+	            value = value.toJSON();
+	        }
+
+	        // If the user-supplied replacer if a function, call it. If it's an array, check objects' string keys for
+	        // presence in the array (removing the key/value pair from the resulting JSON if the key is missing).
+	        if (typeof replacer === "function") {
+	            return replacer.call(holder, key, value);
+	        } else if (replacer) {
+	            if (isTopLevel || isArray(holder) || replacer.indexOf(key) >= 0) {
+	                return value;
+	            } else {
+	                return undefined;
+	            }
+	        } else {
+	            return value;
+	        }
+	    };
+
+	    function isWordChar(c) {
+	        return c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || c === '_' || c === '$';
+	    }
+
+	    function isWordStart(c) {
+	        return c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c === '_' || c === '$';
+	    }
+
+	    function isWord(key) {
+	        if (typeof key !== 'string') {
+	            return false;
+	        }
+	        if (!isWordStart(key[0])) {
+	            return false;
+	        }
+	        var i = 1,
+	            length = key.length;
+	        while (i < length) {
+	            if (!isWordChar(key[i])) {
+	                return false;
+	            }
+	            i++;
+	        }
+	        return true;
+	    }
+
+	    // export for use in tests
+	    JSON5.isWord = isWord;
+
+	    // polyfills
+	    function isArray(obj) {
+	        if (Array.isArray) {
+	            return Array.isArray(obj);
+	        } else {
+	            return Object.prototype.toString.call(obj) === '[object Array]';
+	        }
+	    }
+
+	    function isDate(obj) {
+	        return Object.prototype.toString.call(obj) === '[object Date]';
+	    }
+
+	    var objStack = [];
+	    function checkForCircular(obj) {
+	        for (var i = 0; i < objStack.length; i++) {
+	            if (objStack[i] === obj) {
+	                throw new TypeError("Converting circular structure to JSON");
+	            }
+	        }
+	    }
+
+	    function makeIndent(str, num, noNewLine) {
+	        if (!str) {
+	            return "";
+	        }
+	        // indentation no more than 10 chars
+	        if (str.length > 10) {
+	            str = str.substring(0, 10);
+	        }
+
+	        var indent = noNewLine ? "" : "\n";
+	        for (var i = 0; i < num; i++) {
+	            indent += str;
+	        }
+
+	        return indent;
+	    }
+
+	    var indentStr;
+	    if (space) {
+	        if (typeof space === "string") {
+	            indentStr = space;
+	        } else if (typeof space === "number" && space >= 0) {
+	            indentStr = makeIndent(" ", space, true);
+	        } else {
+	            // ignore space parameter
+	        }
+	    }
+
+	    // Copied from Crokford's implementation of JSON
+	    // See https://github.com/douglascrockford/JSON-js/blob/e39db4b7e6249f04a195e7dd0840e610cc9e941e/json2.js#L195
+	    // Begin
+	    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+	        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+	        meta = { // table of character substitutions
+	        '\b': '\\b',
+	        '\t': '\\t',
+	        '\n': '\\n',
+	        '\f': '\\f',
+	        '\r': '\\r',
+	        '"': '\\"',
+	        '\\': '\\\\'
+	    };
+	    function escapeString(string) {
+
+	        // If the string contains no control characters, no quote characters, and no
+	        // backslash characters, then we can safely slap some quotes around it.
+	        // Otherwise we must also replace the offending characters with safe escape
+	        // sequences.
+	        escapable.lastIndex = 0;
+	        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+	            var c = meta[a];
+	            return typeof c === 'string' ? c : "\\u" + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+	        }) + '"' : '"' + string + '"';
+	    }
+	    // End
+
+	    function internalStringify(holder, key, isTopLevel) {
+	        var buffer, res;
+
+	        // Replace the value, if necessary
+	        var obj_part = getReplacedValueOrUndefined(holder, key, isTopLevel);
+
+	        if (obj_part && !isDate(obj_part)) {
+	            // unbox objects
+	            // don't unbox dates, since will turn it into number
+	            obj_part = obj_part.valueOf();
+	        }
+	        switch (typeof obj_part === "undefined" ? "undefined" : _typeof(obj_part)) {
+	            case "boolean":
+	                return obj_part.toString();
+
+	            case "number":
+	                if (isNaN(obj_part) || !isFinite(obj_part)) {
+	                    return "null";
+	                }
+	                return obj_part.toString();
+
+	            case "string":
+	                return escapeString(obj_part.toString());
+
+	            case "object":
+	                if (obj_part === null) {
+	                    return "null";
+	                } else if (isArray(obj_part)) {
+	                    checkForCircular(obj_part);
+	                    buffer = "[";
+	                    objStack.push(obj_part);
+
+	                    for (var i = 0; i < obj_part.length; i++) {
+	                        res = internalStringify(obj_part, i, false);
+	                        buffer += makeIndent(indentStr, objStack.length);
+	                        if (res === null || typeof res === "undefined") {
+	                            buffer += "null";
+	                        } else {
+	                            buffer += res;
+	                        }
+	                        if (i < obj_part.length - 1) {
+	                            buffer += ",";
+	                        } else if (indentStr) {
+	                            buffer += "\n";
+	                        }
+	                    }
+	                    objStack.pop();
+	                    if (obj_part.length) {
+	                        buffer += makeIndent(indentStr, objStack.length, true);
+	                    }
+	                    buffer += "]";
+	                } else {
+	                    checkForCircular(obj_part);
+	                    buffer = "{";
+	                    var nonEmpty = false;
+	                    objStack.push(obj_part);
+	                    for (var prop in obj_part) {
+	                        if (obj_part.hasOwnProperty(prop)) {
+	                            var value = internalStringify(obj_part, prop, false);
+	                            isTopLevel = false;
+	                            if (typeof value !== "undefined" && value !== null) {
+	                                buffer += makeIndent(indentStr, objStack.length);
+	                                nonEmpty = true;
+	                                key = isWord(prop) ? prop : escapeString(prop);
+	                                buffer += key + ":" + (indentStr ? ' ' : '') + value + ",";
+	                            }
+	                        }
+	                    }
+	                    objStack.pop();
+	                    if (nonEmpty) {
+	                        buffer = buffer.substring(0, buffer.length - 1) + makeIndent(indentStr, objStack.length) + "}";
+	                    } else {
+	                        buffer = '{}';
+	                    }
+	                }
+	                return buffer;
+	            default:
+	                // functions and undefined should be ignored
+	                return undefined;
+	        }
+	    }
+
+	    // special case...when undefined is used inside of
+	    // a compound object/array, return null.
+	    // but when top-level, return undefined
+	    var topLevelHolder = { "": obj };
+	    if (obj === undefined) {
+	        return getReplacedValueOrUndefined(topLevelHolder, '', true);
+	    }
+	    return internalStringify(topLevelHolder, '', true);
+	};
+
+/***/ }),
+/* 462 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var arr = [];
+	var charCodeCache = [];
+
+	module.exports = function (a, b) {
+		if (a === b) {
+			return 0;
+		}
+
+		var aLen = a.length;
+		var bLen = b.length;
+
+		if (aLen === 0) {
+			return bLen;
+		}
+
+		if (bLen === 0) {
+			return aLen;
+		}
+
+		var bCharCode;
+		var ret;
+		var tmp;
+		var tmp2;
+		var i = 0;
+		var j = 0;
+
+		while (i < aLen) {
+			charCodeCache[i] = a.charCodeAt(i);
+			arr[i] = ++i;
+		}
+
+		while (j < bLen) {
+			bCharCode = b.charCodeAt(j);
+			tmp = j++;
+			ret = j;
+
+			for (i = 0; i < aLen; i++) {
+				tmp2 = bCharCode === charCodeCache[i] ? tmp : tmp + 1;
+				tmp = arr[i];
+				ret = arr[i] = tmp > ret ? tmp2 > ret ? ret + 1 : tmp2 : tmp2 > tmp ? tmp + 1 : tmp2;
+			}
+		}
+
+		return ret;
+	};
+
+/***/ }),
+/* 463 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getNative = __webpack_require__(38),
+	    root = __webpack_require__(15);
+
+	/* Built-in method references that are verified to be native. */
+	var DataView = getNative(root, 'DataView');
+
+	module.exports = DataView;
+
+/***/ }),
+/* 464 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var hashClear = __webpack_require__(527),
+	    hashDelete = __webpack_require__(528),
+	    hashGet = __webpack_require__(529),
+	    hashHas = __webpack_require__(530),
+	    hashSet = __webpack_require__(531);
+
+	/**
+	 * Creates a hash object.
+	 *
+	 * @private
+	 * @constructor
+	 * @param {Array} [entries] The key-value pairs to cache.
+	 */
+	function Hash(entries) {
+	    var index = -1,
+	        length = entries == null ? 0 : entries.length;
+
+	    this.clear();
+	    while (++index < length) {
+	        var entry = entries[index];
+	        this.set(entry[0], entry[1]);
+	    }
+	}
+
+	// Add methods to `Hash`.
+	Hash.prototype.clear = hashClear;
+	Hash.prototype['delete'] = hashDelete;
+	Hash.prototype.get = hashGet;
+	Hash.prototype.has = hashHas;
+	Hash.prototype.set = hashSet;
+
+	module.exports = Hash;
+
+/***/ }),
+/* 465 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getNative = __webpack_require__(38),
+	    root = __webpack_require__(15);
+
+	/* Built-in method references that are verified to be native. */
+	var Promise = getNative(root, 'Promise');
+
+	module.exports = Promise;
+
+/***/ }),
+/* 466 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getNative = __webpack_require__(38),
+	    root = __webpack_require__(15);
+
+	/* Built-in method references that are verified to be native. */
+	var WeakMap = getNative(root, 'WeakMap');
+
+	module.exports = WeakMap;
+
+/***/ }),
+/* 467 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Adds the key-value `pair` to `map`.
+	 *
+	 * @private
+	 * @param {Object} map The map to modify.
+	 * @param {Array} pair The key-value pair to add.
+	 * @returns {Object} Returns `map`.
+	 */
+	function addMapEntry(map, pair) {
+	  // Don't return `map.set` because it's not chainable in IE 11.
+	  map.set(pair[0], pair[1]);
+	  return map;
+	}
+
+	module.exports = addMapEntry;
+
+/***/ }),
+/* 468 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Adds `value` to `set`.
+	 *
+	 * @private
+	 * @param {Object} set The set to modify.
+	 * @param {*} value The value to add.
+	 * @returns {Object} Returns `set`.
+	 */
+	function addSetEntry(set, value) {
+	  // Don't return `set.add` because it's not chainable in IE 11.
+	  set.add(value);
+	  return set;
+	}
+
+	module.exports = addSetEntry;
+
+/***/ }),
+/* 469 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * A specialized version of `_.forEach` for arrays without support for
+	 * iteratee shorthands.
+	 *
+	 * @private
+	 * @param {Array} [array] The array to iterate over.
+	 * @param {Function} iteratee The function invoked per iteration.
+	 * @returns {Array} Returns `array`.
+	 */
+	function arrayEach(array, iteratee) {
+	  var index = -1,
+	      length = array == null ? 0 : array.length;
+
+	  while (++index < length) {
+	    if (iteratee(array[index], index, array) === false) {
+	      break;
+	    }
+	  }
+	  return array;
+	}
+
+	module.exports = arrayEach;
+
+/***/ }),
+/* 470 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * A specialized version of `_.filter` for arrays without support for
+	 * iteratee shorthands.
+	 *
+	 * @private
+	 * @param {Array} [array] The array to iterate over.
+	 * @param {Function} predicate The function invoked per iteration.
+	 * @returns {Array} Returns the new filtered array.
+	 */
+	function arrayFilter(array, predicate) {
+	  var index = -1,
+	      length = array == null ? 0 : array.length,
+	      resIndex = 0,
+	      result = [];
+
+	  while (++index < length) {
+	    var value = array[index];
+	    if (predicate(value, index, array)) {
+	      result[resIndex++] = value;
+	    }
+	  }
+	  return result;
+	}
+
+	module.exports = arrayFilter;
+
+/***/ }),
+/* 471 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseIndexOf = __webpack_require__(162);
+
+	/**
+	 * A specialized version of `_.includes` for arrays without support for
+	 * specifying an index to search from.
+	 *
+	 * @private
+	 * @param {Array} [array] The array to inspect.
+	 * @param {*} target The value to search for.
+	 * @returns {boolean} Returns `true` if `target` is found, else `false`.
+	 */
+	function arrayIncludes(array, value) {
+	  var length = array == null ? 0 : array.length;
+	  return !!length && baseIndexOf(array, value, 0) > -1;
+	}
+
+	module.exports = arrayIncludes;
+
+/***/ }),
+/* 472 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * This function is like `arrayIncludes` except that it accepts a comparator.
+	 *
+	 * @private
+	 * @param {Array} [array] The array to inspect.
+	 * @param {*} target The value to search for.
+	 * @param {Function} comparator The comparator invoked per element.
+	 * @returns {boolean} Returns `true` if `target` is found, else `false`.
+	 */
+	function arrayIncludesWith(array, value, comparator) {
+	  var index = -1,
+	      length = array == null ? 0 : array.length;
+
+	  while (++index < length) {
+	    if (comparator(value, array[index])) {
+	      return true;
+	    }
+	  }
+	  return false;
+	}
+
+	module.exports = arrayIncludesWith;
+
+/***/ }),
+/* 473 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * A specialized version of `_.some` for arrays without support for iteratee
+	 * shorthands.
+	 *
+	 * @private
+	 * @param {Array} [array] The array to iterate over.
+	 * @param {Function} predicate The function invoked per iteration.
+	 * @returns {boolean} Returns `true` if any element passes the predicate check,
+	 *  else `false`.
+	 */
+	function arraySome(array, predicate) {
+	  var index = -1,
+	      length = array == null ? 0 : array.length;
+
+	  while (++index < length) {
+	    if (predicate(array[index], index, array)) {
+	      return true;
+	    }
+	  }
+	  return false;
+	}
+
+	module.exports = arraySome;
+
+/***/ }),
+/* 474 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var copyObject = __webpack_require__(30),
+	    keys = __webpack_require__(31);
+
+	/**
+	 * The base implementation of `_.assign` without support for multiple sources
+	 * or `customizer` functions.
+	 *
+	 * @private
+	 * @param {Object} object The destination object.
+	 * @param {Object} source The source object.
+	 * @returns {Object} Returns `object`.
+	 */
+	function baseAssign(object, source) {
+	  return object && copyObject(source, keys(source), object);
+	}
+
+	module.exports = baseAssign;
+
+/***/ }),
+/* 475 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var copyObject = __webpack_require__(30),
+	    keysIn = __webpack_require__(46);
+
+	/**
+	 * The base implementation of `_.assignIn` without support for multiple sources
+	 * or `customizer` functions.
+	 *
+	 * @private
+	 * @param {Object} object The destination object.
+	 * @param {Object} source The source object.
+	 * @returns {Object} Returns `object`.
+	 */
+	function baseAssignIn(object, source) {
+	  return object && copyObject(source, keysIn(source), object);
+	}
+
+	module.exports = baseAssignIn;
+
+/***/ }),
+/* 476 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * The base implementation of `_.clamp` which doesn't coerce arguments.
+	 *
+	 * @private
+	 * @param {number} number The number to clamp.
+	 * @param {number} [lower] The lower bound.
+	 * @param {number} upper The upper bound.
+	 * @returns {number} Returns the clamped number.
+	 */
+	function baseClamp(number, lower, upper) {
+	  if (number === number) {
+	    if (upper !== undefined) {
+	      number = number <= upper ? number : upper;
+	    }
+	    if (lower !== undefined) {
+	      number = number >= lower ? number : lower;
+	    }
+	  }
+	  return number;
+	}
+
+	module.exports = baseClamp;
+
+/***/ }),
+/* 477 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isObject = __webpack_require__(16);
+
+	/** Built-in value references. */
+	var objectCreate = Object.create;
+
+	/**
+	 * The base implementation of `_.create` without support for assigning
+	 * properties to the created object.
+	 *
+	 * @private
+	 * @param {Object} proto The object to inherit from.
+	 * @returns {Object} Returns the new object.
+	 */
+	var baseCreate = function () {
+	  function object() {}
+	  return function (proto) {
+	    if (!isObject(proto)) {
+	      return {};
+	    }
+	    if (objectCreate) {
+	      return objectCreate(proto);
+	    }
+	    object.prototype = proto;
+	    var result = new object();
+	    object.prototype = undefined;
+	    return result;
+	  };
+	}();
+
+	module.exports = baseCreate;
+
+/***/ }),
+/* 478 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseForOwn = __webpack_require__(480),
+	    createBaseEach = __webpack_require__(517);
+
+	/**
+	 * The base implementation of `_.forEach` without support for iteratee shorthands.
+	 *
+	 * @private
+	 * @param {Array|Object} collection The collection to iterate over.
+	 * @param {Function} iteratee The function invoked per iteration.
+	 * @returns {Array|Object} Returns `collection`.
+	 */
+	var baseEach = createBaseEach(baseForOwn);
+
+	module.exports = baseEach;
+
+/***/ }),
+/* 479 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var arrayPush = __webpack_require__(157),
+	    isFlattenable = __webpack_require__(534);
+
+	/**
+	 * The base implementation of `_.flatten` with support for restricting flattening.
+	 *
+	 * @private
+	 * @param {Array} array The array to flatten.
+	 * @param {number} depth The maximum recursion depth.
+	 * @param {boolean} [predicate=isFlattenable] The function invoked per iteration.
+	 * @param {boolean} [isStrict] Restrict to values that pass `predicate` checks.
+	 * @param {Array} [result=[]] The initial result value.
+	 * @returns {Array} Returns the new flattened array.
+	 */
+	function baseFlatten(array, depth, predicate, isStrict, result) {
+	  var index = -1,
+	      length = array.length;
+
+	  predicate || (predicate = isFlattenable);
+	  result || (result = []);
+
+	  while (++index < length) {
+	    var value = array[index];
+	    if (depth > 0 && predicate(value)) {
+	      if (depth > 1) {
+	        // Recursively flatten arrays (susceptible to call stack limits).
+	        baseFlatten(value, depth - 1, predicate, isStrict, result);
+	      } else {
+	        arrayPush(result, value);
+	      }
+	    } else if (!isStrict) {
+	      result[result.length] = value;
+	    }
+	  }
+	  return result;
+	}
+
+	module.exports = baseFlatten;
+
+/***/ }),
+/* 480 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseFor = __webpack_require__(243),
+	    keys = __webpack_require__(31);
+
+	/**
+	 * The base implementation of `_.forOwn` without support for iteratee shorthands.
+	 *
+	 * @private
+	 * @param {Object} object The object to iterate over.
+	 * @param {Function} iteratee The function invoked per iteration.
+	 * @returns {Object} Returns `object`.
+	 */
+	function baseForOwn(object, iteratee) {
+	  return object && baseFor(object, iteratee, keys);
+	}
+
+	module.exports = baseForOwn;
+
+/***/ }),
+/* 481 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * The base implementation of `_.has` without support for deep paths.
+	 *
+	 * @private
+	 * @param {Object} [object] The object to query.
+	 * @param {Array|string} key The key to check.
+	 * @returns {boolean} Returns `true` if `key` exists, else `false`.
+	 */
+	function baseHas(object, key) {
+	  return object != null && hasOwnProperty.call(object, key);
+	}
+
+	module.exports = baseHas;
+
+/***/ }),
+/* 482 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * The base implementation of `_.hasIn` without support for deep paths.
+	 *
+	 * @private
+	 * @param {Object} [object] The object to query.
+	 * @param {Array|string} key The key to check.
+	 * @returns {boolean} Returns `true` if `key` exists, else `false`.
+	 */
+	function baseHasIn(object, key) {
+	  return object != null && key in Object(object);
+	}
+
+	module.exports = baseHasIn;
+
+/***/ }),
+/* 483 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * This function is like `baseIndexOf` except that it accepts a comparator.
+	 *
+	 * @private
+	 * @param {Array} array The array to inspect.
+	 * @param {*} value The value to search for.
+	 * @param {number} fromIndex The index to search from.
+	 * @param {Function} comparator The comparator invoked per element.
+	 * @returns {number} Returns the index of the matched value, else `-1`.
+	 */
+	function baseIndexOfWith(array, value, fromIndex, comparator) {
+	  var index = fromIndex - 1,
+	      length = array.length;
+
+	  while (++index < length) {
+	    if (comparator(array[index], value)) {
+	      return index;
+	    }
+	  }
+	  return -1;
+	}
+
+	module.exports = baseIndexOfWith;
+
+/***/ }),
+/* 484 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseGetTag = __webpack_require__(29),
+	    isObjectLike = __webpack_require__(25);
+
+	/** `Object#toString` result references. */
+	var argsTag = '[object Arguments]';
+
+	/**
+	 * The base implementation of `_.isArguments`.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is an `arguments` object,
+	 */
+	function baseIsArguments(value) {
+	  return isObjectLike(value) && baseGetTag(value) == argsTag;
+	}
+
+	module.exports = baseIsArguments;
+
+/***/ }),
+/* 485 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var Stack = __webpack_require__(99),
+	    equalArrays = __webpack_require__(255),
+	    equalByTag = __webpack_require__(521),
+	    equalObjects = __webpack_require__(522),
+	    getTag = __webpack_require__(259),
+	    isArray = __webpack_require__(6),
+	    isBuffer = __webpack_require__(113),
+	    isTypedArray = __webpack_require__(173);
+
+	/** Used to compose bitmasks for value comparisons. */
+	var COMPARE_PARTIAL_FLAG = 1;
+
+	/** `Object#toString` result references. */
+	var argsTag = '[object Arguments]',
+	    arrayTag = '[object Array]',
+	    objectTag = '[object Object]';
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * A specialized version of `baseIsEqual` for arrays and objects which performs
+	 * deep comparisons and tracks traversed objects enabling objects with circular
+	 * references to be compared.
+	 *
+	 * @private
+	 * @param {Object} object The object to compare.
+	 * @param {Object} other The other object to compare.
+	 * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+	 * @param {Function} customizer The function to customize comparisons.
+	 * @param {Function} equalFunc The function to determine equivalents of values.
+	 * @param {Object} [stack] Tracks traversed `object` and `other` objects.
+	 * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+	 */
+	function baseIsEqualDeep(object, other, bitmask, customizer, equalFunc, stack) {
+	  var objIsArr = isArray(object),
+	      othIsArr = isArray(other),
+	      objTag = objIsArr ? arrayTag : getTag(object),
+	      othTag = othIsArr ? arrayTag : getTag(other);
+
+	  objTag = objTag == argsTag ? objectTag : objTag;
+	  othTag = othTag == argsTag ? objectTag : othTag;
+
+	  var objIsObj = objTag == objectTag,
+	      othIsObj = othTag == objectTag,
+	      isSameTag = objTag == othTag;
+
+	  if (isSameTag && isBuffer(object)) {
+	    if (!isBuffer(other)) {
+	      return false;
+	    }
+	    objIsArr = true;
+	    objIsObj = false;
+	  }
+	  if (isSameTag && !objIsObj) {
+	    stack || (stack = new Stack());
+	    return objIsArr || isTypedArray(object) ? equalArrays(object, other, bitmask, customizer, equalFunc, stack) : equalByTag(object, other, objTag, bitmask, customizer, equalFunc, stack);
+	  }
+	  if (!(bitmask & COMPARE_PARTIAL_FLAG)) {
+	    var objIsWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'),
+	        othIsWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');
+
+	    if (objIsWrapped || othIsWrapped) {
+	      var objUnwrapped = objIsWrapped ? object.value() : object,
+	          othUnwrapped = othIsWrapped ? other.value() : other;
+
+	      stack || (stack = new Stack());
+	      return equalFunc(objUnwrapped, othUnwrapped, bitmask, customizer, stack);
+	    }
+	  }
+	  if (!isSameTag) {
+	    return false;
+	  }
+	  stack || (stack = new Stack());
+	  return equalObjects(object, other, bitmask, customizer, equalFunc, stack);
+	}
+
+	module.exports = baseIsEqualDeep;
+
+/***/ }),
+/* 486 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var Stack = __webpack_require__(99),
+	    baseIsEqual = __webpack_require__(246);
+
+	/** Used to compose bitmasks for value comparisons. */
+	var COMPARE_PARTIAL_FLAG = 1,
+	    COMPARE_UNORDERED_FLAG = 2;
+
+	/**
+	 * The base implementation of `_.isMatch` without support for iteratee shorthands.
+	 *
+	 * @private
+	 * @param {Object} object The object to inspect.
+	 * @param {Object} source The object of property values to match.
+	 * @param {Array} matchData The property names, values, and compare flags to match.
+	 * @param {Function} [customizer] The function to customize comparisons.
+	 * @returns {boolean} Returns `true` if `object` is a match, else `false`.
+	 */
+	function baseIsMatch(object, source, matchData, customizer) {
+	  var index = matchData.length,
+	      length = index,
+	      noCustomizer = !customizer;
+
+	  if (object == null) {
+	    return !length;
+	  }
+	  object = Object(object);
+	  while (index--) {
+	    var data = matchData[index];
+	    if (noCustomizer && data[2] ? data[1] !== object[data[0]] : !(data[0] in object)) {
+	      return false;
+	    }
+	  }
+	  while (++index < length) {
+	    data = matchData[index];
+	    var key = data[0],
+	        objValue = object[key],
+	        srcValue = data[1];
+
+	    if (noCustomizer && data[2]) {
+	      if (objValue === undefined && !(key in object)) {
+	        return false;
+	      }
+	    } else {
+	      var stack = new Stack();
+	      if (customizer) {
+	        var result = customizer(objValue, srcValue, key, object, source, stack);
+	      }
+	      if (!(result === undefined ? baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG, customizer, stack) : result)) {
+	        return false;
+	      }
+	    }
+	  }
+	  return true;
+	}
+
+	module.exports = baseIsMatch;
+
+/***/ }),
+/* 487 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * The base implementation of `_.isNaN` without support for number objects.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is `NaN`, else `false`.
+	 */
+	function baseIsNaN(value) {
+	  return value !== value;
+	}
+
+	module.exports = baseIsNaN;
+
+/***/ }),
+/* 488 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isFunction = __webpack_require__(171),
+	    isMasked = __webpack_require__(536),
+	    isObject = __webpack_require__(16),
+	    toSource = __webpack_require__(267);
+
+	/**
+	 * Used to match `RegExp`
+	 * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
+	 */
+	var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
+
+	/** Used to detect host constructors (Safari). */
+	var reIsHostCtor = /^\[object .+?Constructor\]$/;
+
+	/** Used for built-in method references. */
+	var funcProto = Function.prototype,
+	    objectProto = Object.prototype;
+
+	/** Used to resolve the decompiled source of functions. */
+	var funcToString = funcProto.toString;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/** Used to detect if a method is native. */
+	var reIsNative = RegExp('^' + funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&').replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$');
+
+	/**
+	 * The base implementation of `_.isNative` without bad shim checks.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a native function,
+	 *  else `false`.
+	 */
+	function baseIsNative(value) {
+	  if (!isObject(value) || isMasked(value)) {
+	    return false;
+	  }
+	  var pattern = isFunction(value) ? reIsNative : reIsHostCtor;
+	  return pattern.test(toSource(value));
+	}
+
+	module.exports = baseIsNative;
+
+/***/ }),
+/* 489 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseGetTag = __webpack_require__(29),
+	    isObjectLike = __webpack_require__(25);
+
+	/** `Object#toString` result references. */
+	var regexpTag = '[object RegExp]';
+
+	/**
+	 * The base implementation of `_.isRegExp` without Node.js optimizations.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a regexp, else `false`.
+	 */
+	function baseIsRegExp(value) {
+	  return isObjectLike(value) && baseGetTag(value) == regexpTag;
+	}
+
+	module.exports = baseIsRegExp;
+
+/***/ }),
+/* 490 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseGetTag = __webpack_require__(29),
+	    isLength = __webpack_require__(172),
+	    isObjectLike = __webpack_require__(25);
+
+	/** `Object#toString` result references. */
+	var argsTag = '[object Arguments]',
+	    arrayTag = '[object Array]',
+	    boolTag = '[object Boolean]',
+	    dateTag = '[object Date]',
+	    errorTag = '[object Error]',
+	    funcTag = '[object Function]',
+	    mapTag = '[object Map]',
+	    numberTag = '[object Number]',
+	    objectTag = '[object Object]',
+	    regexpTag = '[object RegExp]',
+	    setTag = '[object Set]',
+	    stringTag = '[object String]',
+	    weakMapTag = '[object WeakMap]';
+
+	var arrayBufferTag = '[object ArrayBuffer]',
+	    dataViewTag = '[object DataView]',
+	    float32Tag = '[object Float32Array]',
+	    float64Tag = '[object Float64Array]',
+	    int8Tag = '[object Int8Array]',
+	    int16Tag = '[object Int16Array]',
+	    int32Tag = '[object Int32Array]',
+	    uint8Tag = '[object Uint8Array]',
+	    uint8ClampedTag = '[object Uint8ClampedArray]',
+	    uint16Tag = '[object Uint16Array]',
+	    uint32Tag = '[object Uint32Array]';
+
+	/** Used to identify `toStringTag` values of typed arrays. */
+	var typedArrayTags = {};
+	typedArrayTags[float32Tag] = typedArrayTags[float64Tag] = typedArrayTags[int8Tag] = typedArrayTags[int16Tag] = typedArrayTags[int32Tag] = typedArrayTags[uint8Tag] = typedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] = typedArrayTags[uint32Tag] = true;
+	typedArrayTags[argsTag] = typedArrayTags[arrayTag] = typedArrayTags[arrayBufferTag] = typedArrayTags[boolTag] = typedArrayTags[dataViewTag] = typedArrayTags[dateTag] = typedArrayTags[errorTag] = typedArrayTags[funcTag] = typedArrayTags[mapTag] = typedArrayTags[numberTag] = typedArrayTags[objectTag] = typedArrayTags[regexpTag] = typedArrayTags[setTag] = typedArrayTags[stringTag] = typedArrayTags[weakMapTag] = false;
+
+	/**
+	 * The base implementation of `_.isTypedArray` without Node.js optimizations.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a typed array, else `false`.
+	 */
+	function baseIsTypedArray(value) {
+	    return isObjectLike(value) && isLength(value.length) && !!typedArrayTags[baseGetTag(value)];
+	}
+
+	module.exports = baseIsTypedArray;
+
+/***/ }),
+/* 491 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isPrototype = __webpack_require__(105),
+	    nativeKeys = __webpack_require__(548);
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * The base implementation of `_.keys` which doesn't treat sparse arrays as dense.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the array of property names.
+	 */
+	function baseKeys(object) {
+	  if (!isPrototype(object)) {
+	    return nativeKeys(object);
+	  }
+	  var result = [];
+	  for (var key in Object(object)) {
+	    if (hasOwnProperty.call(object, key) && key != 'constructor') {
+	      result.push(key);
+	    }
+	  }
+	  return result;
+	}
+
+	module.exports = baseKeys;
+
+/***/ }),
+/* 492 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isObject = __webpack_require__(16),
+	    isPrototype = __webpack_require__(105),
+	    nativeKeysIn = __webpack_require__(549);
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * The base implementation of `_.keysIn` which doesn't treat sparse arrays as dense.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the array of property names.
+	 */
+	function baseKeysIn(object) {
+	  if (!isObject(object)) {
+	    return nativeKeysIn(object);
+	  }
+	  var isProto = isPrototype(object),
+	      result = [];
+
+	  for (var key in object) {
+	    if (!(key == 'constructor' && (isProto || !hasOwnProperty.call(object, key)))) {
+	      result.push(key);
+	    }
+	  }
+	  return result;
+	}
+
+	module.exports = baseKeysIn;
+
+/***/ }),
+/* 493 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseIsMatch = __webpack_require__(486),
+	    getMatchData = __webpack_require__(524),
+	    matchesStrictComparable = __webpack_require__(264);
+
+	/**
+	 * The base implementation of `_.matches` which doesn't clone `source`.
+	 *
+	 * @private
+	 * @param {Object} source The object of property values to match.
+	 * @returns {Function} Returns the new spec function.
+	 */
+	function baseMatches(source) {
+	  var matchData = getMatchData(source);
+	  if (matchData.length == 1 && matchData[0][2]) {
+	    return matchesStrictComparable(matchData[0][0], matchData[0][1]);
+	  }
+	  return function (object) {
+	    return object === source || baseIsMatch(object, source, matchData);
+	  };
+	}
+
+	module.exports = baseMatches;
+
+/***/ }),
+/* 494 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseIsEqual = __webpack_require__(246),
+	    get = __webpack_require__(574),
+	    hasIn = __webpack_require__(575),
+	    isKey = __webpack_require__(169),
+	    isStrictComparable = __webpack_require__(262),
+	    matchesStrictComparable = __webpack_require__(264),
+	    toKey = __webpack_require__(108);
+
+	/** Used to compose bitmasks for value comparisons. */
+	var COMPARE_PARTIAL_FLAG = 1,
+	    COMPARE_UNORDERED_FLAG = 2;
+
+	/**
+	 * The base implementation of `_.matchesProperty` which doesn't clone `srcValue`.
+	 *
+	 * @private
+	 * @param {string} path The path of the property to get.
+	 * @param {*} srcValue The value to match.
+	 * @returns {Function} Returns the new spec function.
+	 */
+	function baseMatchesProperty(path, srcValue) {
+	  if (isKey(path) && isStrictComparable(srcValue)) {
+	    return matchesStrictComparable(toKey(path), srcValue);
+	  }
+	  return function (object) {
+	    var objValue = get(object, path);
+	    return objValue === undefined && objValue === srcValue ? hasIn(object, path) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
+	  };
+	}
+
+	module.exports = baseMatchesProperty;
+
+/***/ }),
+/* 495 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var Stack = __webpack_require__(99),
+	    assignMergeValue = __webpack_require__(242),
+	    baseFor = __webpack_require__(243),
+	    baseMergeDeep = __webpack_require__(496),
+	    isObject = __webpack_require__(16),
+	    keysIn = __webpack_require__(46);
+
+	/**
+	 * The base implementation of `_.merge` without support for multiple sources.
+	 *
+	 * @private
+	 * @param {Object} object The destination object.
+	 * @param {Object} source The source object.
+	 * @param {number} srcIndex The index of `source`.
+	 * @param {Function} [customizer] The function to customize merged values.
+	 * @param {Object} [stack] Tracks traversed source values and their merged
+	 *  counterparts.
+	 */
+	function baseMerge(object, source, srcIndex, customizer, stack) {
+	  if (object === source) {
+	    return;
+	  }
+	  baseFor(source, function (srcValue, key) {
+	    if (isObject(srcValue)) {
+	      stack || (stack = new Stack());
+	      baseMergeDeep(object, source, key, srcIndex, baseMerge, customizer, stack);
+	    } else {
+	      var newValue = customizer ? customizer(object[key], srcValue, key + '', object, source, stack) : undefined;
+
+	      if (newValue === undefined) {
+	        newValue = srcValue;
+	      }
+	      assignMergeValue(object, key, newValue);
+	    }
+	  }, keysIn);
+	}
+
+	module.exports = baseMerge;
+
+/***/ }),
+/* 496 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var assignMergeValue = __webpack_require__(242),
+	    cloneBuffer = __webpack_require__(251),
+	    cloneTypedArray = __webpack_require__(252),
+	    copyArray = __webpack_require__(164),
+	    initCloneObject = __webpack_require__(261),
+	    isArguments = __webpack_require__(112),
+	    isArray = __webpack_require__(6),
+	    isArrayLikeObject = __webpack_require__(576),
+	    isBuffer = __webpack_require__(113),
+	    isFunction = __webpack_require__(171),
+	    isObject = __webpack_require__(16),
+	    isPlainObject = __webpack_require__(270),
+	    isTypedArray = __webpack_require__(173),
+	    toPlainObject = __webpack_require__(590);
+
+	/**
+	 * A specialized version of `baseMerge` for arrays and objects which performs
+	 * deep merges and tracks traversed objects enabling objects with circular
+	 * references to be merged.
+	 *
+	 * @private
+	 * @param {Object} object The destination object.
+	 * @param {Object} source The source object.
+	 * @param {string} key The key of the value to merge.
+	 * @param {number} srcIndex The index of `source`.
+	 * @param {Function} mergeFunc The function to merge values.
+	 * @param {Function} [customizer] The function to customize assigned values.
+	 * @param {Object} [stack] Tracks traversed source values and their merged
+	 *  counterparts.
+	 */
+	function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, stack) {
+	  var objValue = object[key],
+	      srcValue = source[key],
+	      stacked = stack.get(srcValue);
+
+	  if (stacked) {
+	    assignMergeValue(object, key, stacked);
+	    return;
+	  }
+	  var newValue = customizer ? customizer(objValue, srcValue, key + '', object, source, stack) : undefined;
+
+	  var isCommon = newValue === undefined;
+
+	  if (isCommon) {
+	    var isArr = isArray(srcValue),
+	        isBuff = !isArr && isBuffer(srcValue),
+	        isTyped = !isArr && !isBuff && isTypedArray(srcValue);
+
+	    newValue = srcValue;
+	    if (isArr || isBuff || isTyped) {
+	      if (isArray(objValue)) {
+	        newValue = objValue;
+	      } else if (isArrayLikeObject(objValue)) {
+	        newValue = copyArray(objValue);
+	      } else if (isBuff) {
+	        isCommon = false;
+	        newValue = cloneBuffer(srcValue, true);
+	      } else if (isTyped) {
+	        isCommon = false;
+	        newValue = cloneTypedArray(srcValue, true);
+	      } else {
+	        newValue = [];
+	      }
+	    } else if (isPlainObject(srcValue) || isArguments(srcValue)) {
+	      newValue = objValue;
+	      if (isArguments(objValue)) {
+	        newValue = toPlainObject(objValue);
+	      } else if (!isObject(objValue) || srcIndex && isFunction(objValue)) {
+	        newValue = initCloneObject(srcValue);
+	      }
+	    } else {
+	      isCommon = false;
+	    }
+	  }
+	  if (isCommon) {
+	    // Recursively merge objects and arrays (susceptible to call stack limits).
+	    stack.set(srcValue, newValue);
+	    mergeFunc(newValue, srcValue, srcIndex, customizer, stack);
+	    stack['delete'](srcValue);
+	  }
+	  assignMergeValue(object, key, newValue);
+	}
+
+	module.exports = baseMergeDeep;
+
+/***/ }),
+/* 497 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var arrayMap = __webpack_require__(58),
+	    baseIteratee = __webpack_require__(59),
+	    baseMap = __webpack_require__(247),
+	    baseSortBy = __webpack_require__(503),
+	    baseUnary = __webpack_require__(102),
+	    compareMultiple = __webpack_require__(513),
+	    identity = __webpack_require__(110);
+
+	/**
+	 * The base implementation of `_.orderBy` without param guards.
+	 *
+	 * @private
+	 * @param {Array|Object} collection The collection to iterate over.
+	 * @param {Function[]|Object[]|string[]} iteratees The iteratees to sort by.
+	 * @param {string[]} orders The sort orders of `iteratees`.
+	 * @returns {Array} Returns the new sorted array.
+	 */
+	function baseOrderBy(collection, iteratees, orders) {
+	  var index = -1;
+	  iteratees = arrayMap(iteratees.length ? iteratees : [identity], baseUnary(baseIteratee));
+
+	  var result = baseMap(collection, function (value, key, collection) {
+	    var criteria = arrayMap(iteratees, function (iteratee) {
+	      return iteratee(value);
+	    });
+	    return { 'criteria': criteria, 'index': ++index, 'value': value };
+	  });
+
+	  return baseSortBy(result, function (object, other) {
+	    return compareMultiple(object, other, orders);
+	  });
+	}
+
+	module.exports = baseOrderBy;
+
+/***/ }),
+/* 498 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * The base implementation of `_.property` without support for deep paths.
+	 *
+	 * @private
+	 * @param {string} key The key of the property to get.
+	 * @returns {Function} Returns the new accessor function.
+	 */
+	function baseProperty(key) {
+	  return function (object) {
+	    return object == null ? undefined : object[key];
+	  };
+	}
+
+	module.exports = baseProperty;
+
+/***/ }),
+/* 499 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseGet = __webpack_require__(244);
+
+	/**
+	 * A specialized version of `baseProperty` which supports deep paths.
+	 *
+	 * @private
+	 * @param {Array|string} path The path of the property to get.
+	 * @returns {Function} Returns the new accessor function.
+	 */
+	function basePropertyDeep(path) {
+	  return function (object) {
+	    return baseGet(object, path);
+	  };
+	}
+
+	module.exports = basePropertyDeep;
+
+/***/ }),
+/* 500 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var arrayMap = __webpack_require__(58),
+	    baseIndexOf = __webpack_require__(162),
+	    baseIndexOfWith = __webpack_require__(483),
+	    baseUnary = __webpack_require__(102),
+	    copyArray = __webpack_require__(164);
+
+	/** Used for built-in method references. */
+	var arrayProto = Array.prototype;
+
+	/** Built-in value references. */
+	var splice = arrayProto.splice;
+
+	/**
+	 * The base implementation of `_.pullAllBy` without support for iteratee
+	 * shorthands.
+	 *
+	 * @private
+	 * @param {Array} array The array to modify.
+	 * @param {Array} values The values to remove.
+	 * @param {Function} [iteratee] The iteratee invoked per element.
+	 * @param {Function} [comparator] The comparator invoked per element.
+	 * @returns {Array} Returns `array`.
+	 */
+	function basePullAll(array, values, iteratee, comparator) {
+	  var indexOf = comparator ? baseIndexOfWith : baseIndexOf,
+	      index = -1,
+	      length = values.length,
+	      seen = array;
+
+	  if (array === values) {
+	    values = copyArray(values);
+	  }
+	  if (iteratee) {
+	    seen = arrayMap(array, baseUnary(iteratee));
+	  }
+	  while (++index < length) {
+	    var fromIndex = 0,
+	        value = values[index],
+	        computed = iteratee ? iteratee(value) : value;
+
+	    while ((fromIndex = indexOf(seen, computed, fromIndex, comparator)) > -1) {
+	      if (seen !== array) {
+	        splice.call(seen, fromIndex, 1);
+	      }
+	      splice.call(array, fromIndex, 1);
+	    }
+	  }
+	  return array;
+	}
+
+	module.exports = basePullAll;
+
+/***/ }),
+/* 501 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/** Used as references for various `Number` constants. */
+	var MAX_SAFE_INTEGER = 9007199254740991;
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeFloor = Math.floor;
+
+	/**
+	 * The base implementation of `_.repeat` which doesn't coerce arguments.
+	 *
+	 * @private
+	 * @param {string} string The string to repeat.
+	 * @param {number} n The number of times to repeat the string.
+	 * @returns {string} Returns the repeated string.
+	 */
+	function baseRepeat(string, n) {
+	  var result = '';
+	  if (!string || n < 1 || n > MAX_SAFE_INTEGER) {
+	    return result;
+	  }
+	  // Leverage the exponentiation by squaring algorithm for a faster repeat.
+	  // See https://en.wikipedia.org/wiki/Exponentiation_by_squaring for more details.
+	  do {
+	    if (n % 2) {
+	      result += string;
+	    }
+	    n = nativeFloor(n / 2);
+	    if (n) {
+	      string += string;
+	    }
+	  } while (n);
+
+	  return result;
+	}
+
+	module.exports = baseRepeat;
+
+/***/ }),
+/* 502 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var constant = __webpack_require__(567),
+	    defineProperty = __webpack_require__(254),
+	    identity = __webpack_require__(110);
+
+	/**
+	 * The base implementation of `setToString` without support for hot loop shorting.
+	 *
+	 * @private
+	 * @param {Function} func The function to modify.
+	 * @param {Function} string The `toString` result.
+	 * @returns {Function} Returns `func`.
+	 */
+	var baseSetToString = !defineProperty ? identity : function (func, string) {
+	  return defineProperty(func, 'toString', {
+	    'configurable': true,
+	    'enumerable': false,
+	    'value': constant(string),
+	    'writable': true
+	  });
+	};
+
+	module.exports = baseSetToString;
+
+/***/ }),
+/* 503 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * The base implementation of `_.sortBy` which uses `comparer` to define the
+	 * sort order of `array` and replaces criteria objects with their corresponding
+	 * values.
+	 *
+	 * @private
+	 * @param {Array} array The array to sort.
+	 * @param {Function} comparer The function to define sort order.
+	 * @returns {Array} Returns `array`.
+	 */
+	function baseSortBy(array, comparer) {
+	  var length = array.length;
+
+	  array.sort(comparer);
+	  while (length--) {
+	    array[length] = array[length].value;
+	  }
+	  return array;
+	}
+
+	module.exports = baseSortBy;
+
+/***/ }),
+/* 504 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * The base implementation of `_.times` without support for iteratee shorthands
+	 * or max array length checks.
+	 *
+	 * @private
+	 * @param {number} n The number of times to invoke `iteratee`.
+	 * @param {Function} iteratee The function invoked per iteration.
+	 * @returns {Array} Returns the array of results.
+	 */
+	function baseTimes(n, iteratee) {
+	  var index = -1,
+	      result = Array(n);
+
+	  while (++index < n) {
+	    result[index] = iteratee(index);
+	  }
+	  return result;
+	}
+
+	module.exports = baseTimes;
+
+/***/ }),
+/* 505 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var SetCache = __webpack_require__(237),
+	    arrayIncludes = __webpack_require__(471),
+	    arrayIncludesWith = __webpack_require__(472),
+	    cacheHas = __webpack_require__(249),
+	    createSet = __webpack_require__(519),
+	    setToArray = __webpack_require__(107);
+
+	/** Used as the size to enable large array optimizations. */
+	var LARGE_ARRAY_SIZE = 200;
+
+	/**
+	 * The base implementation of `_.uniqBy` without support for iteratee shorthands.
+	 *
+	 * @private
+	 * @param {Array} array The array to inspect.
+	 * @param {Function} [iteratee] The iteratee invoked per element.
+	 * @param {Function} [comparator] The comparator invoked per element.
+	 * @returns {Array} Returns the new duplicate free array.
+	 */
+	function baseUniq(array, iteratee, comparator) {
+	  var index = -1,
+	      includes = arrayIncludes,
+	      length = array.length,
+	      isCommon = true,
+	      result = [],
+	      seen = result;
+
+	  if (comparator) {
+	    isCommon = false;
+	    includes = arrayIncludesWith;
+	  } else if (length >= LARGE_ARRAY_SIZE) {
+	    var set = iteratee ? null : createSet(array);
+	    if (set) {
+	      return setToArray(set);
+	    }
+	    isCommon = false;
+	    includes = cacheHas;
+	    seen = new SetCache();
+	  } else {
+	    seen = iteratee ? [] : result;
+	  }
+	  outer: while (++index < length) {
+	    var value = array[index],
+	        computed = iteratee ? iteratee(value) : value;
+
+	    value = comparator || value !== 0 ? value : 0;
+	    if (isCommon && computed === computed) {
+	      var seenIndex = seen.length;
+	      while (seenIndex--) {
+	        if (seen[seenIndex] === computed) {
+	          continue outer;
+	        }
+	      }
+	      if (iteratee) {
+	        seen.push(computed);
+	      }
+	      result.push(value);
+	    } else if (!includes(seen, computed, comparator)) {
+	      if (seen !== result) {
+	        seen.push(computed);
+	      }
+	      result.push(value);
+	    }
+	  }
+	  return result;
+	}
+
+	module.exports = baseUniq;
+
+/***/ }),
+/* 506 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var arrayMap = __webpack_require__(58);
+
+	/**
+	 * The base implementation of `_.values` and `_.valuesIn` which creates an
+	 * array of `object` property values corresponding to the property names
+	 * of `props`.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @param {Array} props The property names to get values for.
+	 * @returns {Object} Returns the array of property values.
+	 */
+	function baseValues(object, props) {
+	  return arrayMap(props, function (key) {
+	    return object[key];
+	  });
+	}
+
+	module.exports = baseValues;
+
+/***/ }),
+/* 507 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var cloneArrayBuffer = __webpack_require__(163);
+
+	/**
+	 * Creates a clone of `dataView`.
+	 *
+	 * @private
+	 * @param {Object} dataView The data view to clone.
+	 * @param {boolean} [isDeep] Specify a deep clone.
+	 * @returns {Object} Returns the cloned data view.
+	 */
+	function cloneDataView(dataView, isDeep) {
+	  var buffer = isDeep ? cloneArrayBuffer(dataView.buffer) : dataView.buffer;
+	  return new dataView.constructor(buffer, dataView.byteOffset, dataView.byteLength);
+	}
+
+	module.exports = cloneDataView;
+
+/***/ }),
+/* 508 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var addMapEntry = __webpack_require__(467),
+	    arrayReduce = __webpack_require__(241),
+	    mapToArray = __webpack_require__(263);
+
+	/** Used to compose bitmasks for cloning. */
+	var CLONE_DEEP_FLAG = 1;
+
+	/**
+	 * Creates a clone of `map`.
+	 *
+	 * @private
+	 * @param {Object} map The map to clone.
+	 * @param {Function} cloneFunc The function to clone values.
+	 * @param {boolean} [isDeep] Specify a deep clone.
+	 * @returns {Object} Returns the cloned map.
+	 */
+	function cloneMap(map, isDeep, cloneFunc) {
+	  var array = isDeep ? cloneFunc(mapToArray(map), CLONE_DEEP_FLAG) : mapToArray(map);
+	  return arrayReduce(array, addMapEntry, new map.constructor());
+	}
+
+	module.exports = cloneMap;
+
+/***/ }),
+/* 509 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/** Used to match `RegExp` flags from their coerced string values. */
+	var reFlags = /\w*$/;
+
+	/**
+	 * Creates a clone of `regexp`.
+	 *
+	 * @private
+	 * @param {Object} regexp The regexp to clone.
+	 * @returns {Object} Returns the cloned regexp.
+	 */
+	function cloneRegExp(regexp) {
+	  var result = new regexp.constructor(regexp.source, reFlags.exec(regexp));
+	  result.lastIndex = regexp.lastIndex;
+	  return result;
+	}
+
+	module.exports = cloneRegExp;
+
+/***/ }),
+/* 510 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var addSetEntry = __webpack_require__(468),
+	    arrayReduce = __webpack_require__(241),
+	    setToArray = __webpack_require__(107);
+
+	/** Used to compose bitmasks for cloning. */
+	var CLONE_DEEP_FLAG = 1;
+
+	/**
+	 * Creates a clone of `set`.
+	 *
+	 * @private
+	 * @param {Object} set The set to clone.
+	 * @param {Function} cloneFunc The function to clone values.
+	 * @param {boolean} [isDeep] Specify a deep clone.
+	 * @returns {Object} Returns the cloned set.
+	 */
+	function cloneSet(set, isDeep, cloneFunc) {
+	  var array = isDeep ? cloneFunc(setToArray(set), CLONE_DEEP_FLAG) : setToArray(set);
+	  return arrayReduce(array, addSetEntry, new set.constructor());
+	}
+
+	module.exports = cloneSet;
+
+/***/ }),
+/* 511 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Symbol = __webpack_require__(44);
+
+	/** Used to convert symbols to primitives and strings. */
+	var symbolProto = _Symbol ? _Symbol.prototype : undefined,
+	    symbolValueOf = symbolProto ? symbolProto.valueOf : undefined;
+
+	/**
+	 * Creates a clone of the `symbol` object.
+	 *
+	 * @private
+	 * @param {Object} symbol The symbol object to clone.
+	 * @returns {Object} Returns the cloned symbol object.
+	 */
+	function cloneSymbol(symbol) {
+	  return symbolValueOf ? Object(symbolValueOf.call(symbol)) : {};
+	}
+
+	module.exports = cloneSymbol;
+
+/***/ }),
+/* 512 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isSymbol = __webpack_require__(60);
+
+	/**
+	 * Compares values to sort them in ascending order.
+	 *
+	 * @private
+	 * @param {*} value The value to compare.
+	 * @param {*} other The other value to compare.
+	 * @returns {number} Returns the sort order indicator for `value`.
+	 */
+	function compareAscending(value, other) {
+	  if (value !== other) {
+	    var valIsDefined = value !== undefined,
+	        valIsNull = value === null,
+	        valIsReflexive = value === value,
+	        valIsSymbol = isSymbol(value);
+
+	    var othIsDefined = other !== undefined,
+	        othIsNull = other === null,
+	        othIsReflexive = other === other,
+	        othIsSymbol = isSymbol(other);
+
+	    if (!othIsNull && !othIsSymbol && !valIsSymbol && value > other || valIsSymbol && othIsDefined && othIsReflexive && !othIsNull && !othIsSymbol || valIsNull && othIsDefined && othIsReflexive || !valIsDefined && othIsReflexive || !valIsReflexive) {
+	      return 1;
+	    }
+	    if (!valIsNull && !valIsSymbol && !othIsSymbol && value < other || othIsSymbol && valIsDefined && valIsReflexive && !valIsNull && !valIsSymbol || othIsNull && valIsDefined && valIsReflexive || !othIsDefined && valIsReflexive || !othIsReflexive) {
+	      return -1;
+	    }
+	  }
+	  return 0;
+	}
+
+	module.exports = compareAscending;
+
+/***/ }),
+/* 513 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var compareAscending = __webpack_require__(512);
+
+	/**
+	 * Used by `_.orderBy` to compare multiple properties of a value to another
+	 * and stable sort them.
+	 *
+	 * If `orders` is unspecified, all values are sorted in ascending order. Otherwise,
+	 * specify an order of "desc" for descending or "asc" for ascending sort order
+	 * of corresponding values.
+	 *
+	 * @private
+	 * @param {Object} object The object to compare.
+	 * @param {Object} other The other object to compare.
+	 * @param {boolean[]|string[]} orders The order to sort by for each property.
+	 * @returns {number} Returns the sort order indicator for `object`.
+	 */
+	function compareMultiple(object, other, orders) {
+	  var index = -1,
+	      objCriteria = object.criteria,
+	      othCriteria = other.criteria,
+	      length = objCriteria.length,
+	      ordersLength = orders.length;
+
+	  while (++index < length) {
+	    var result = compareAscending(objCriteria[index], othCriteria[index]);
+	    if (result) {
+	      if (index >= ordersLength) {
+	        return result;
+	      }
+	      var order = orders[index];
+	      return result * (order == 'desc' ? -1 : 1);
+	    }
+	  }
+	  // Fixes an `Array#sort` bug in the JS engine embedded in Adobe applications
+	  // that causes it, under certain circumstances, to provide the same value for
+	  // `object` and `other`. See https://github.com/jashkenas/underscore/pull/1247
+	  // for more details.
+	  //
+	  // This also ensures a stable sort in V8 and other engines.
+	  // See https://bugs.chromium.org/p/v8/issues/detail?id=90 for more details.
+	  return object.index - other.index;
+	}
+
+	module.exports = compareMultiple;
+
+/***/ }),
+/* 514 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var copyObject = __webpack_require__(30),
+	    getSymbols = __webpack_require__(166);
+
+	/**
+	 * Copies own symbols of `source` to `object`.
+	 *
+	 * @private
+	 * @param {Object} source The object to copy symbols from.
+	 * @param {Object} [object={}] The object to copy symbols to.
+	 * @returns {Object} Returns `object`.
+	 */
+	function copySymbols(source, object) {
+	  return copyObject(source, getSymbols(source), object);
+	}
+
+	module.exports = copySymbols;
+
+/***/ }),
+/* 515 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var copyObject = __webpack_require__(30),
+	    getSymbolsIn = __webpack_require__(258);
+
+	/**
+	 * Copies own and inherited symbols of `source` to `object`.
+	 *
+	 * @private
+	 * @param {Object} source The object to copy symbols from.
+	 * @param {Object} [object={}] The object to copy symbols to.
+	 * @returns {Object} Returns `object`.
+	 */
+	function copySymbolsIn(source, object) {
+	  return copyObject(source, getSymbolsIn(source), object);
+	}
+
+	module.exports = copySymbolsIn;
+
+/***/ }),
+/* 516 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var root = __webpack_require__(15);
+
+	/** Used to detect overreaching core-js shims. */
+	var coreJsData = root['__core-js_shared__'];
+
+	module.exports = coreJsData;
+
+/***/ }),
+/* 517 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isArrayLike = __webpack_require__(24);
+
+	/**
+	 * Creates a `baseEach` or `baseEachRight` function.
+	 *
+	 * @private
+	 * @param {Function} eachFunc The function to iterate over a collection.
+	 * @param {boolean} [fromRight] Specify iterating from right to left.
+	 * @returns {Function} Returns the new base function.
+	 */
+	function createBaseEach(eachFunc, fromRight) {
+	  return function (collection, iteratee) {
+	    if (collection == null) {
+	      return collection;
+	    }
+	    if (!isArrayLike(collection)) {
+	      return eachFunc(collection, iteratee);
+	    }
+	    var length = collection.length,
+	        index = fromRight ? length : -1,
+	        iterable = Object(collection);
+
+	    while (fromRight ? index-- : ++index < length) {
+	      if (iteratee(iterable[index], index, iterable) === false) {
+	        break;
+	      }
+	    }
+	    return collection;
+	  };
+	}
+
+	module.exports = createBaseEach;
+
+/***/ }),
+/* 518 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Creates a base function for methods like `_.forIn` and `_.forOwn`.
+	 *
+	 * @private
+	 * @param {boolean} [fromRight] Specify iterating from right to left.
+	 * @returns {Function} Returns the new base function.
+	 */
+	function createBaseFor(fromRight) {
+	  return function (object, iteratee, keysFunc) {
+	    var index = -1,
+	        iterable = Object(object),
+	        props = keysFunc(object),
+	        length = props.length;
+
+	    while (length--) {
+	      var key = props[fromRight ? length : ++index];
+	      if (iteratee(iterable[key], key, iterable) === false) {
+	        break;
+	      }
+	    }
+	    return object;
+	  };
+	}
+
+	module.exports = createBaseFor;
+
+/***/ }),
+/* 519 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var Set = __webpack_require__(236),
+	    noop = __webpack_require__(582),
+	    setToArray = __webpack_require__(107);
+
+	/** Used as references for various `Number` constants. */
+	var INFINITY = 1 / 0;
+
+	/**
+	 * Creates a set object of `values`.
+	 *
+	 * @private
+	 * @param {Array} values The values to add to the set.
+	 * @returns {Object} Returns the new set.
+	 */
+	var createSet = !(Set && 1 / setToArray(new Set([, -0]))[1] == INFINITY) ? noop : function (values) {
+	  return new Set(values);
+	};
+
+	module.exports = createSet;
+
+/***/ }),
+/* 520 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var eq = __webpack_require__(45);
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * Used by `_.defaults` to customize its `_.assignIn` use to assign properties
+	 * of source objects to the destination object for all destination properties
+	 * that resolve to `undefined`.
+	 *
+	 * @private
+	 * @param {*} objValue The destination value.
+	 * @param {*} srcValue The source value.
+	 * @param {string} key The key of the property to assign.
+	 * @param {Object} object The parent object of `objValue`.
+	 * @returns {*} Returns the value to assign.
+	 */
+	function customDefaultsAssignIn(objValue, srcValue, key, object) {
+	  if (objValue === undefined || eq(objValue, objectProto[key]) && !hasOwnProperty.call(object, key)) {
+	    return srcValue;
+	  }
+	  return objValue;
+	}
+
+	module.exports = customDefaultsAssignIn;
+
+/***/ }),
+/* 521 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Symbol = __webpack_require__(44),
+	    Uint8Array = __webpack_require__(238),
+	    eq = __webpack_require__(45),
+	    equalArrays = __webpack_require__(255),
+	    mapToArray = __webpack_require__(263),
+	    setToArray = __webpack_require__(107);
+
+	/** Used to compose bitmasks for value comparisons. */
+	var COMPARE_PARTIAL_FLAG = 1,
+	    COMPARE_UNORDERED_FLAG = 2;
+
+	/** `Object#toString` result references. */
+	var boolTag = '[object Boolean]',
+	    dateTag = '[object Date]',
+	    errorTag = '[object Error]',
+	    mapTag = '[object Map]',
+	    numberTag = '[object Number]',
+	    regexpTag = '[object RegExp]',
+	    setTag = '[object Set]',
+	    stringTag = '[object String]',
+	    symbolTag = '[object Symbol]';
+
+	var arrayBufferTag = '[object ArrayBuffer]',
+	    dataViewTag = '[object DataView]';
+
+	/** Used to convert symbols to primitives and strings. */
+	var symbolProto = _Symbol ? _Symbol.prototype : undefined,
+	    symbolValueOf = symbolProto ? symbolProto.valueOf : undefined;
+
+	/**
+	 * A specialized version of `baseIsEqualDeep` for comparing objects of
+	 * the same `toStringTag`.
+	 *
+	 * **Note:** This function only supports comparing values with tags of
+	 * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
+	 *
+	 * @private
+	 * @param {Object} object The object to compare.
+	 * @param {Object} other The other object to compare.
+	 * @param {string} tag The `toStringTag` of the objects to compare.
+	 * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+	 * @param {Function} customizer The function to customize comparisons.
+	 * @param {Function} equalFunc The function to determine equivalents of values.
+	 * @param {Object} stack Tracks traversed `object` and `other` objects.
+	 * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+	 */
+	function equalByTag(object, other, tag, bitmask, customizer, equalFunc, stack) {
+	  switch (tag) {
+	    case dataViewTag:
+	      if (object.byteLength != other.byteLength || object.byteOffset != other.byteOffset) {
+	        return false;
+	      }
+	      object = object.buffer;
+	      other = other.buffer;
+
+	    case arrayBufferTag:
+	      if (object.byteLength != other.byteLength || !equalFunc(new Uint8Array(object), new Uint8Array(other))) {
+	        return false;
+	      }
+	      return true;
+
+	    case boolTag:
+	    case dateTag:
+	    case numberTag:
+	      // Coerce booleans to `1` or `0` and dates to milliseconds.
+	      // Invalid dates are coerced to `NaN`.
+	      return eq(+object, +other);
+
+	    case errorTag:
+	      return object.name == other.name && object.message == other.message;
+
+	    case regexpTag:
+	    case stringTag:
+	      // Coerce regexes to strings and treat strings, primitives and objects,
+	      // as equal. See http://www.ecma-international.org/ecma-262/7.0/#sec-regexp.prototype.tostring
+	      // for more details.
+	      return object == other + '';
+
+	    case mapTag:
+	      var convert = mapToArray;
+
+	    case setTag:
+	      var isPartial = bitmask & COMPARE_PARTIAL_FLAG;
+	      convert || (convert = setToArray);
+
+	      if (object.size != other.size && !isPartial) {
+	        return false;
+	      }
+	      // Assume cyclic values are equal.
+	      var stacked = stack.get(object);
+	      if (stacked) {
+	        return stacked == other;
+	      }
+	      bitmask |= COMPARE_UNORDERED_FLAG;
+
+	      // Recursively compare objects (susceptible to call stack limits).
+	      stack.set(object, other);
+	      var result = equalArrays(convert(object), convert(other), bitmask, customizer, equalFunc, stack);
+	      stack['delete'](object);
+	      return result;
+
+	    case symbolTag:
+	      if (symbolValueOf) {
+	        return symbolValueOf.call(object) == symbolValueOf.call(other);
+	      }
+	  }
+	  return false;
+	}
+
+	module.exports = equalByTag;
+
+/***/ }),
+/* 522 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getAllKeys = __webpack_require__(257);
+
+	/** Used to compose bitmasks for value comparisons. */
+	var COMPARE_PARTIAL_FLAG = 1;
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * A specialized version of `baseIsEqualDeep` for objects with support for
+	 * partial deep comparisons.
+	 *
+	 * @private
+	 * @param {Object} object The object to compare.
+	 * @param {Object} other The other object to compare.
+	 * @param {number} bitmask The bitmask flags. See `baseIsEqual` for more details.
+	 * @param {Function} customizer The function to customize comparisons.
+	 * @param {Function} equalFunc The function to determine equivalents of values.
+	 * @param {Object} stack Tracks traversed `object` and `other` objects.
+	 * @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
+	 */
+	function equalObjects(object, other, bitmask, customizer, equalFunc, stack) {
+	  var isPartial = bitmask & COMPARE_PARTIAL_FLAG,
+	      objProps = getAllKeys(object),
+	      objLength = objProps.length,
+	      othProps = getAllKeys(other),
+	      othLength = othProps.length;
+
+	  if (objLength != othLength && !isPartial) {
+	    return false;
+	  }
+	  var index = objLength;
+	  while (index--) {
+	    var key = objProps[index];
+	    if (!(isPartial ? key in other : hasOwnProperty.call(other, key))) {
+	      return false;
+	    }
+	  }
+	  // Assume cyclic values are equal.
+	  var stacked = stack.get(object);
+	  if (stacked && stack.get(other)) {
+	    return stacked == other;
+	  }
+	  var result = true;
+	  stack.set(object, other);
+	  stack.set(other, object);
+
+	  var skipCtor = isPartial;
+	  while (++index < objLength) {
+	    key = objProps[index];
+	    var objValue = object[key],
+	        othValue = other[key];
+
+	    if (customizer) {
+	      var compared = isPartial ? customizer(othValue, objValue, key, other, object, stack) : customizer(objValue, othValue, key, object, other, stack);
+	    }
+	    // Recursively compare objects (susceptible to call stack limits).
+	    if (!(compared === undefined ? objValue === othValue || equalFunc(objValue, othValue, bitmask, customizer, stack) : compared)) {
+	      result = false;
+	      break;
+	    }
+	    skipCtor || (skipCtor = key == 'constructor');
+	  }
+	  if (result && !skipCtor) {
+	    var objCtor = object.constructor,
+	        othCtor = other.constructor;
+
+	    // Non `Object` object instances with different constructors are not equal.
+	    if (objCtor != othCtor && 'constructor' in object && 'constructor' in other && !(typeof objCtor == 'function' && objCtor instanceof objCtor && typeof othCtor == 'function' && othCtor instanceof othCtor)) {
+	      result = false;
+	    }
+	  }
+	  stack['delete'](object);
+	  stack['delete'](other);
+	  return result;
+	}
+
+	module.exports = equalObjects;
+
+/***/ }),
+/* 523 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseGetAllKeys = __webpack_require__(245),
+	    getSymbolsIn = __webpack_require__(258),
+	    keysIn = __webpack_require__(46);
+
+	/**
+	 * Creates an array of own and inherited enumerable property names and
+	 * symbols of `object`.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the array of property names and symbols.
+	 */
+	function getAllKeysIn(object) {
+	  return baseGetAllKeys(object, keysIn, getSymbolsIn);
+	}
+
+	module.exports = getAllKeysIn;
+
+/***/ }),
+/* 524 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isStrictComparable = __webpack_require__(262),
+	    keys = __webpack_require__(31);
+
+	/**
+	 * Gets the property names, values, and compare flags of `object`.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the match data of `object`.
+	 */
+	function getMatchData(object) {
+	    var result = keys(object),
+	        length = result.length;
+
+	    while (length--) {
+	        var key = result[length],
+	            value = object[key];
+
+	        result[length] = [key, value, isStrictComparable(value)];
+	    }
+	    return result;
+	}
+
+	module.exports = getMatchData;
+
+/***/ }),
+/* 525 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Symbol = __webpack_require__(44);
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * Used to resolve the
+	 * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+	 * of values.
+	 */
+	var nativeObjectToString = objectProto.toString;
+
+	/** Built-in value references. */
+	var symToStringTag = _Symbol ? _Symbol.toStringTag : undefined;
+
+	/**
+	 * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
+	 *
+	 * @private
+	 * @param {*} value The value to query.
+	 * @returns {string} Returns the raw `toStringTag`.
+	 */
+	function getRawTag(value) {
+	  var isOwn = hasOwnProperty.call(value, symToStringTag),
+	      tag = value[symToStringTag];
+
+	  try {
+	    value[symToStringTag] = undefined;
+	    var unmasked = true;
+	  } catch (e) {}
+
+	  var result = nativeObjectToString.call(value);
+	  if (unmasked) {
+	    if (isOwn) {
+	      value[symToStringTag] = tag;
+	    } else {
+	      delete value[symToStringTag];
+	    }
+	  }
+	  return result;
+	}
+
+	module.exports = getRawTag;
+
+/***/ }),
+/* 526 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Gets the value at `key` of `object`.
+	 *
+	 * @private
+	 * @param {Object} [object] The object to query.
+	 * @param {string} key The key of the property to get.
+	 * @returns {*} Returns the property value.
+	 */
+	function getValue(object, key) {
+	  return object == null ? undefined : object[key];
+	}
+
+	module.exports = getValue;
+
+/***/ }),
+/* 527 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var nativeCreate = __webpack_require__(106);
+
+	/**
+	 * Removes all key-value entries from the hash.
+	 *
+	 * @private
+	 * @name clear
+	 * @memberOf Hash
+	 */
+	function hashClear() {
+	  this.__data__ = nativeCreate ? nativeCreate(null) : {};
+	  this.size = 0;
+	}
+
+	module.exports = hashClear;
+
+/***/ }),
+/* 528 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Removes `key` and its value from the hash.
+	 *
+	 * @private
+	 * @name delete
+	 * @memberOf Hash
+	 * @param {Object} hash The hash to modify.
+	 * @param {string} key The key of the value to remove.
+	 * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+	 */
+	function hashDelete(key) {
+	  var result = this.has(key) && delete this.__data__[key];
+	  this.size -= result ? 1 : 0;
+	  return result;
+	}
+
+	module.exports = hashDelete;
+
+/***/ }),
+/* 529 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var nativeCreate = __webpack_require__(106);
+
+	/** Used to stand-in for `undefined` hash values. */
+	var HASH_UNDEFINED = '__lodash_hash_undefined__';
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * Gets the hash value for `key`.
+	 *
+	 * @private
+	 * @name get
+	 * @memberOf Hash
+	 * @param {string} key The key of the value to get.
+	 * @returns {*} Returns the entry value.
+	 */
+	function hashGet(key) {
+	  var data = this.__data__;
+	  if (nativeCreate) {
+	    var result = data[key];
+	    return result === HASH_UNDEFINED ? undefined : result;
+	  }
+	  return hasOwnProperty.call(data, key) ? data[key] : undefined;
+	}
+
+	module.exports = hashGet;
+
+/***/ }),
+/* 530 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var nativeCreate = __webpack_require__(106);
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * Checks if a hash value for `key` exists.
+	 *
+	 * @private
+	 * @name has
+	 * @memberOf Hash
+	 * @param {string} key The key of the entry to check.
+	 * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+	 */
+	function hashHas(key) {
+	  var data = this.__data__;
+	  return nativeCreate ? data[key] !== undefined : hasOwnProperty.call(data, key);
+	}
+
+	module.exports = hashHas;
+
+/***/ }),
+/* 531 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var nativeCreate = __webpack_require__(106);
+
+	/** Used to stand-in for `undefined` hash values. */
+	var HASH_UNDEFINED = '__lodash_hash_undefined__';
+
+	/**
+	 * Sets the hash `key` to `value`.
+	 *
+	 * @private
+	 * @name set
+	 * @memberOf Hash
+	 * @param {string} key The key of the value to set.
+	 * @param {*} value The value to set.
+	 * @returns {Object} Returns the hash instance.
+	 */
+	function hashSet(key, value) {
+	  var data = this.__data__;
+	  this.size += this.has(key) ? 0 : 1;
+	  data[key] = nativeCreate && value === undefined ? HASH_UNDEFINED : value;
+	  return this;
+	}
+
+	module.exports = hashSet;
+
+/***/ }),
+/* 532 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/** Used to check objects for own properties. */
+	var hasOwnProperty = objectProto.hasOwnProperty;
+
+	/**
+	 * Initializes an array clone.
+	 *
+	 * @private
+	 * @param {Array} array The array to clone.
+	 * @returns {Array} Returns the initialized clone.
+	 */
+	function initCloneArray(array) {
+	  var length = array.length,
+	      result = array.constructor(length);
+
+	  // Add properties assigned by `RegExp#exec`.
+	  if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {
+	    result.index = array.index;
+	    result.input = array.input;
+	  }
+	  return result;
+	}
+
+	module.exports = initCloneArray;
+
+/***/ }),
+/* 533 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var cloneArrayBuffer = __webpack_require__(163),
+	    cloneDataView = __webpack_require__(507),
+	    cloneMap = __webpack_require__(508),
+	    cloneRegExp = __webpack_require__(509),
+	    cloneSet = __webpack_require__(510),
+	    cloneSymbol = __webpack_require__(511),
+	    cloneTypedArray = __webpack_require__(252);
+
+	/** `Object#toString` result references. */
+	var boolTag = '[object Boolean]',
+	    dateTag = '[object Date]',
+	    mapTag = '[object Map]',
+	    numberTag = '[object Number]',
+	    regexpTag = '[object RegExp]',
+	    setTag = '[object Set]',
+	    stringTag = '[object String]',
+	    symbolTag = '[object Symbol]';
+
+	var arrayBufferTag = '[object ArrayBuffer]',
+	    dataViewTag = '[object DataView]',
+	    float32Tag = '[object Float32Array]',
+	    float64Tag = '[object Float64Array]',
+	    int8Tag = '[object Int8Array]',
+	    int16Tag = '[object Int16Array]',
+	    int32Tag = '[object Int32Array]',
+	    uint8Tag = '[object Uint8Array]',
+	    uint8ClampedTag = '[object Uint8ClampedArray]',
+	    uint16Tag = '[object Uint16Array]',
+	    uint32Tag = '[object Uint32Array]';
+
+	/**
+	 * Initializes an object clone based on its `toStringTag`.
+	 *
+	 * **Note:** This function only supports cloning values with tags of
+	 * `Boolean`, `Date`, `Error`, `Number`, `RegExp`, or `String`.
+	 *
+	 * @private
+	 * @param {Object} object The object to clone.
+	 * @param {string} tag The `toStringTag` of the object to clone.
+	 * @param {Function} cloneFunc The function to clone values.
+	 * @param {boolean} [isDeep] Specify a deep clone.
+	 * @returns {Object} Returns the initialized clone.
+	 */
+	function initCloneByTag(object, tag, cloneFunc, isDeep) {
+	  var Ctor = object.constructor;
+	  switch (tag) {
+	    case arrayBufferTag:
+	      return cloneArrayBuffer(object);
+
+	    case boolTag:
+	    case dateTag:
+	      return new Ctor(+object);
+
+	    case dataViewTag:
+	      return cloneDataView(object, isDeep);
+
+	    case float32Tag:case float64Tag:
+	    case int8Tag:case int16Tag:case int32Tag:
+	    case uint8Tag:case uint8ClampedTag:case uint16Tag:case uint32Tag:
+	      return cloneTypedArray(object, isDeep);
+
+	    case mapTag:
+	      return cloneMap(object, isDeep, cloneFunc);
+
+	    case numberTag:
+	    case stringTag:
+	      return new Ctor(object);
+
+	    case regexpTag:
+	      return cloneRegExp(object);
+
+	    case setTag:
+	      return cloneSet(object, isDeep, cloneFunc);
+
+	    case symbolTag:
+	      return cloneSymbol(object);
+	  }
+	}
+
+	module.exports = initCloneByTag;
+
+/***/ }),
+/* 534 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var _Symbol = __webpack_require__(44),
+	    isArguments = __webpack_require__(112),
+	    isArray = __webpack_require__(6);
+
+	/** Built-in value references. */
+	var spreadableSymbol = _Symbol ? _Symbol.isConcatSpreadable : undefined;
+
+	/**
+	 * Checks if `value` is a flattenable `arguments` object or array.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is flattenable, else `false`.
+	 */
+	function isFlattenable(value) {
+	    return isArray(value) || isArguments(value) || !!(spreadableSymbol && value && value[spreadableSymbol]);
+	}
+
+	module.exports = isFlattenable;
+
+/***/ }),
+/* 535 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	/**
+	 * Checks if `value` is suitable for use as unique object key.
+	 *
+	 * @private
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is suitable, else `false`.
+	 */
+	function isKeyable(value) {
+	  var type = typeof value === 'undefined' ? 'undefined' : _typeof(value);
+	  return type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean' ? value !== '__proto__' : value === null;
+	}
+
+	module.exports = isKeyable;
+
+/***/ }),
+/* 536 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var coreJsData = __webpack_require__(516);
+
+	/** Used to detect methods masquerading as native. */
+	var maskSrcKey = function () {
+	  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
+	  return uid ? 'Symbol(src)_1.' + uid : '';
+	}();
+
+	/**
+	 * Checks if `func` has its source masked.
+	 *
+	 * @private
+	 * @param {Function} func The function to check.
+	 * @returns {boolean} Returns `true` if `func` is masked, else `false`.
+	 */
+	function isMasked(func) {
+	  return !!maskSrcKey && maskSrcKey in func;
+	}
+
+	module.exports = isMasked;
+
+/***/ }),
+/* 537 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Removes all key-value entries from the list cache.
+	 *
+	 * @private
+	 * @name clear
+	 * @memberOf ListCache
+	 */
+	function listCacheClear() {
+	  this.__data__ = [];
+	  this.size = 0;
+	}
+
+	module.exports = listCacheClear;
+
+/***/ }),
+/* 538 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var assocIndexOf = __webpack_require__(100);
+
+	/** Used for built-in method references. */
+	var arrayProto = Array.prototype;
+
+	/** Built-in value references. */
+	var splice = arrayProto.splice;
+
+	/**
+	 * Removes `key` and its value from the list cache.
+	 *
+	 * @private
+	 * @name delete
+	 * @memberOf ListCache
+	 * @param {string} key The key of the value to remove.
+	 * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+	 */
+	function listCacheDelete(key) {
+	  var data = this.__data__,
+	      index = assocIndexOf(data, key);
+
+	  if (index < 0) {
+	    return false;
+	  }
+	  var lastIndex = data.length - 1;
+	  if (index == lastIndex) {
+	    data.pop();
+	  } else {
+	    splice.call(data, index, 1);
+	  }
+	  --this.size;
+	  return true;
+	}
+
+	module.exports = listCacheDelete;
+
+/***/ }),
+/* 539 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var assocIndexOf = __webpack_require__(100);
+
+	/**
+	 * Gets the list cache value for `key`.
+	 *
+	 * @private
+	 * @name get
+	 * @memberOf ListCache
+	 * @param {string} key The key of the value to get.
+	 * @returns {*} Returns the entry value.
+	 */
+	function listCacheGet(key) {
+	  var data = this.__data__,
+	      index = assocIndexOf(data, key);
+
+	  return index < 0 ? undefined : data[index][1];
+	}
+
+	module.exports = listCacheGet;
+
+/***/ }),
+/* 540 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var assocIndexOf = __webpack_require__(100);
+
+	/**
+	 * Checks if a list cache value for `key` exists.
+	 *
+	 * @private
+	 * @name has
+	 * @memberOf ListCache
+	 * @param {string} key The key of the entry to check.
+	 * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+	 */
+	function listCacheHas(key) {
+	  return assocIndexOf(this.__data__, key) > -1;
+	}
+
+	module.exports = listCacheHas;
+
+/***/ }),
+/* 541 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var assocIndexOf = __webpack_require__(100);
+
+	/**
+	 * Sets the list cache `key` to `value`.
+	 *
+	 * @private
+	 * @name set
+	 * @memberOf ListCache
+	 * @param {string} key The key of the value to set.
+	 * @param {*} value The value to set.
+	 * @returns {Object} Returns the list cache instance.
+	 */
+	function listCacheSet(key, value) {
+	  var data = this.__data__,
+	      index = assocIndexOf(data, key);
+
+	  if (index < 0) {
+	    ++this.size;
+	    data.push([key, value]);
+	  } else {
+	    data[index][1] = value;
+	  }
+	  return this;
+	}
+
+	module.exports = listCacheSet;
+
+/***/ }),
+/* 542 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var Hash = __webpack_require__(464),
+	    ListCache = __webpack_require__(98),
+	    Map = __webpack_require__(155);
+
+	/**
+	 * Removes all key-value entries from the map.
+	 *
+	 * @private
+	 * @name clear
+	 * @memberOf MapCache
+	 */
+	function mapCacheClear() {
+	  this.size = 0;
+	  this.__data__ = {
+	    'hash': new Hash(),
+	    'map': new (Map || ListCache)(),
+	    'string': new Hash()
+	  };
+	}
+
+	module.exports = mapCacheClear;
+
+/***/ }),
+/* 543 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getMapData = __webpack_require__(104);
+
+	/**
+	 * Removes `key` and its value from the map.
+	 *
+	 * @private
+	 * @name delete
+	 * @memberOf MapCache
+	 * @param {string} key The key of the value to remove.
+	 * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+	 */
+	function mapCacheDelete(key) {
+	  var result = getMapData(this, key)['delete'](key);
+	  this.size -= result ? 1 : 0;
+	  return result;
+	}
+
+	module.exports = mapCacheDelete;
+
+/***/ }),
+/* 544 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getMapData = __webpack_require__(104);
+
+	/**
+	 * Gets the map value for `key`.
+	 *
+	 * @private
+	 * @name get
+	 * @memberOf MapCache
+	 * @param {string} key The key of the value to get.
+	 * @returns {*} Returns the entry value.
+	 */
+	function mapCacheGet(key) {
+	  return getMapData(this, key).get(key);
+	}
+
+	module.exports = mapCacheGet;
+
+/***/ }),
+/* 545 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getMapData = __webpack_require__(104);
+
+	/**
+	 * Checks if a map value for `key` exists.
+	 *
+	 * @private
+	 * @name has
+	 * @memberOf MapCache
+	 * @param {string} key The key of the entry to check.
+	 * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+	 */
+	function mapCacheHas(key) {
+	  return getMapData(this, key).has(key);
+	}
+
+	module.exports = mapCacheHas;
+
+/***/ }),
+/* 546 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var getMapData = __webpack_require__(104);
+
+	/**
+	 * Sets the map `key` to `value`.
+	 *
+	 * @private
+	 * @name set
+	 * @memberOf MapCache
+	 * @param {string} key The key of the value to set.
+	 * @param {*} value The value to set.
+	 * @returns {Object} Returns the map cache instance.
+	 */
+	function mapCacheSet(key, value) {
+	  var data = getMapData(this, key),
+	      size = data.size;
+
+	  data.set(key, value);
+	  this.size += data.size == size ? 0 : 1;
+	  return this;
+	}
+
+	module.exports = mapCacheSet;
+
+/***/ }),
+/* 547 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var memoize = __webpack_require__(580);
+
+	/** Used as the maximum memoize cache size. */
+	var MAX_MEMOIZE_SIZE = 500;
+
+	/**
+	 * A specialized version of `_.memoize` which clears the memoized function's
+	 * cache when it exceeds `MAX_MEMOIZE_SIZE`.
+	 *
+	 * @private
+	 * @param {Function} func The function to have its output memoized.
+	 * @returns {Function} Returns the new memoized function.
+	 */
+	function memoizeCapped(func) {
+	  var result = memoize(func, function (key) {
+	    if (cache.size === MAX_MEMOIZE_SIZE) {
+	      cache.clear();
+	    }
+	    return key;
+	  });
+
+	  var cache = result.cache;
+	  return result;
+	}
+
+	module.exports = memoizeCapped;
+
+/***/ }),
+/* 548 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var overArg = __webpack_require__(266);
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeKeys = overArg(Object.keys, Object);
+
+	module.exports = nativeKeys;
+
+/***/ }),
+/* 549 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * This function is like
+	 * [`Object.keys`](http://ecma-international.org/ecma-262/7.0/#sec-object.keys)
+	 * except that it includes inherited enumerable properties.
+	 *
+	 * @private
+	 * @param {Object} object The object to query.
+	 * @returns {Array} Returns the array of property names.
+	 */
+	function nativeKeysIn(object) {
+	  var result = [];
+	  if (object != null) {
+	    for (var key in Object(object)) {
+	      result.push(key);
+	    }
+	  }
+	  return result;
+	}
+
+	module.exports = nativeKeysIn;
+
+/***/ }),
+/* 550 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/** Used for built-in method references. */
+	var objectProto = Object.prototype;
+
+	/**
+	 * Used to resolve the
+	 * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+	 * of values.
+	 */
+	var nativeObjectToString = objectProto.toString;
+
+	/**
+	 * Converts `value` to a string using `Object.prototype.toString`.
+	 *
+	 * @private
+	 * @param {*} value The value to convert.
+	 * @returns {string} Returns the converted string.
+	 */
+	function objectToString(value) {
+	  return nativeObjectToString.call(value);
+	}
+
+	module.exports = objectToString;
+
+/***/ }),
+/* 551 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var apply = __webpack_require__(239);
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeMax = Math.max;
+
+	/**
+	 * A specialized version of `baseRest` which transforms the rest array.
+	 *
+	 * @private
+	 * @param {Function} func The function to apply a rest parameter to.
+	 * @param {number} [start=func.length-1] The start position of the rest parameter.
+	 * @param {Function} transform The rest array transform.
+	 * @returns {Function} Returns the new function.
+	 */
+	function overRest(func, start, transform) {
+	  start = nativeMax(start === undefined ? func.length - 1 : start, 0);
+	  return function () {
+	    var args = arguments,
+	        index = -1,
+	        length = nativeMax(args.length - start, 0),
+	        array = Array(length);
+
+	    while (++index < length) {
+	      array[index] = args[start + index];
+	    }
+	    index = -1;
+	    var otherArgs = Array(start + 1);
+	    while (++index < start) {
+	      otherArgs[index] = args[index];
+	    }
+	    otherArgs[start] = transform(array);
+	    return apply(func, this, otherArgs);
+	  };
+	}
+
+	module.exports = overRest;
+
+/***/ }),
+/* 552 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/** Used to stand-in for `undefined` hash values. */
+	var HASH_UNDEFINED = '__lodash_hash_undefined__';
+
+	/**
+	 * Adds `value` to the array cache.
+	 *
+	 * @private
+	 * @name add
+	 * @memberOf SetCache
+	 * @alias push
+	 * @param {*} value The value to cache.
+	 * @returns {Object} Returns the cache instance.
+	 */
+	function setCacheAdd(value) {
+	  this.__data__.set(value, HASH_UNDEFINED);
+	  return this;
+	}
+
+	module.exports = setCacheAdd;
+
+/***/ }),
+/* 553 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Checks if `value` is in the array cache.
+	 *
+	 * @private
+	 * @name has
+	 * @memberOf SetCache
+	 * @param {*} value The value to search for.
+	 * @returns {number} Returns `true` if `value` is found, else `false`.
+	 */
+	function setCacheHas(value) {
+	  return this.__data__.has(value);
+	}
+
+	module.exports = setCacheHas;
+
+/***/ }),
+/* 554 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseSetToString = __webpack_require__(502),
+	    shortOut = __webpack_require__(555);
+
+	/**
+	 * Sets the `toString` method of `func` to return `string`.
+	 *
+	 * @private
+	 * @param {Function} func The function to modify.
+	 * @param {Function} string The `toString` result.
+	 * @returns {Function} Returns `func`.
+	 */
+	var setToString = shortOut(baseSetToString);
+
+	module.exports = setToString;
+
+/***/ }),
+/* 555 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/** Used to detect hot functions by number of calls within a span of milliseconds. */
+	var HOT_COUNT = 800,
+	    HOT_SPAN = 16;
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeNow = Date.now;
+
+	/**
+	 * Creates a function that'll short out and invoke `identity` instead
+	 * of `func` when it's called `HOT_COUNT` or more times in `HOT_SPAN`
+	 * milliseconds.
+	 *
+	 * @private
+	 * @param {Function} func The function to restrict.
+	 * @returns {Function} Returns the new shortable function.
+	 */
+	function shortOut(func) {
+	  var count = 0,
+	      lastCalled = 0;
+
+	  return function () {
+	    var stamp = nativeNow(),
+	        remaining = HOT_SPAN - (stamp - lastCalled);
+
+	    lastCalled = stamp;
+	    if (remaining > 0) {
+	      if (++count >= HOT_COUNT) {
+	        return arguments[0];
+	      }
+	    } else {
+	      count = 0;
+	    }
+	    return func.apply(undefined, arguments);
+	  };
+	}
+
+	module.exports = shortOut;
+
+/***/ }),
+/* 556 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var ListCache = __webpack_require__(98);
+
+	/**
+	 * Removes all key-value entries from the stack.
+	 *
+	 * @private
+	 * @name clear
+	 * @memberOf Stack
+	 */
+	function stackClear() {
+	  this.__data__ = new ListCache();
+	  this.size = 0;
+	}
+
+	module.exports = stackClear;
+
+/***/ }),
+/* 557 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/**
+	 * Removes `key` and its value from the stack.
+	 *
+	 * @private
+	 * @name delete
+	 * @memberOf Stack
+	 * @param {string} key The key of the value to remove.
+	 * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+	 */
+	function stackDelete(key) {
+	  var data = this.__data__,
+	      result = data['delete'](key);
+
+	  this.size = data.size;
+	  return result;
+	}
+
+	module.exports = stackDelete;
+
+/***/ }),
+/* 558 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Gets the stack value for `key`.
+	 *
+	 * @private
+	 * @name get
+	 * @memberOf Stack
+	 * @param {string} key The key of the value to get.
+	 * @returns {*} Returns the entry value.
+	 */
+	function stackGet(key) {
+	  return this.__data__.get(key);
+	}
+
+	module.exports = stackGet;
+
+/***/ }),
+/* 559 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Checks if a stack value for `key` exists.
+	 *
+	 * @private
+	 * @name has
+	 * @memberOf Stack
+	 * @param {string} key The key of the entry to check.
+	 * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+	 */
+	function stackHas(key) {
+	  return this.__data__.has(key);
+	}
+
+	module.exports = stackHas;
+
+/***/ }),
+/* 560 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var ListCache = __webpack_require__(98),
+	    Map = __webpack_require__(155),
+	    MapCache = __webpack_require__(156);
+
+	/** Used as the size to enable large array optimizations. */
+	var LARGE_ARRAY_SIZE = 200;
+
+	/**
+	 * Sets the stack `key` to `value`.
+	 *
+	 * @private
+	 * @name set
+	 * @memberOf Stack
+	 * @param {string} key The key of the value to set.
+	 * @param {*} value The value to set.
+	 * @returns {Object} Returns the stack cache instance.
+	 */
+	function stackSet(key, value) {
+	  var data = this.__data__;
+	  if (data instanceof ListCache) {
+	    var pairs = data.__data__;
+	    if (!Map || pairs.length < LARGE_ARRAY_SIZE - 1) {
+	      pairs.push([key, value]);
+	      this.size = ++data.size;
+	      return this;
+	    }
+	    data = this.__data__ = new MapCache(pairs);
+	  }
+	  data.set(key, value);
+	  this.size = data.size;
+	  return this;
+	}
+
+	module.exports = stackSet;
+
+/***/ }),
+/* 561 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * A specialized version of `_.indexOf` which performs strict equality
+	 * comparisons of values, i.e. `===`.
+	 *
+	 * @private
+	 * @param {Array} array The array to inspect.
+	 * @param {*} value The value to search for.
+	 * @param {number} fromIndex The index to search from.
+	 * @returns {number} Returns the index of the matched value, else `-1`.
+	 */
+	function strictIndexOf(array, value, fromIndex) {
+	  var index = fromIndex - 1,
+	      length = array.length;
+
+	  while (++index < length) {
+	    if (array[index] === value) {
+	      return index;
+	    }
+	  }
+	  return -1;
+	}
+
+	module.exports = strictIndexOf;
+
+/***/ }),
+/* 562 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var memoizeCapped = __webpack_require__(547);
+
+	/** Used to match property names within property paths. */
+	var reLeadingDot = /^\./,
+	    rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g;
+
+	/** Used to match backslashes in property paths. */
+	var reEscapeChar = /\\(\\)?/g;
+
+	/**
+	 * Converts `string` to a property path array.
+	 *
+	 * @private
+	 * @param {string} string The string to convert.
+	 * @returns {Array} Returns the property path array.
+	 */
+	var stringToPath = memoizeCapped(function (string) {
+	  var result = [];
+	  if (reLeadingDot.test(string)) {
+	    result.push('');
+	  }
+	  string.replace(rePropName, function (match, number, quote, string) {
+	    result.push(quote ? string.replace(reEscapeChar, '$1') : number || match);
+	  });
+	  return result;
+	});
+
+	module.exports = stringToPath;
+
+/***/ }),
+/* 563 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var copyObject = __webpack_require__(30),
+	    createAssigner = __webpack_require__(103),
+	    keysIn = __webpack_require__(46);
+
+	/**
+	 * This method is like `_.assign` except that it iterates over own and
+	 * inherited source properties.
+	 *
+	 * **Note:** This method mutates `object`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @alias extend
+	 * @category Object
+	 * @param {Object} object The destination object.
+	 * @param {...Object} [sources] The source objects.
+	 * @returns {Object} Returns `object`.
+	 * @see _.assign
+	 * @example
+	 *
+	 * function Foo() {
+	 *   this.a = 1;
+	 * }
+	 *
+	 * function Bar() {
+	 *   this.c = 3;
+	 * }
+	 *
+	 * Foo.prototype.b = 2;
+	 * Bar.prototype.d = 4;
+	 *
+	 * _.assignIn({ 'a': 0 }, new Foo, new Bar);
+	 * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4 }
+	 */
+	var assignIn = createAssigner(function (object, source) {
+	  copyObject(source, keysIn(source), object);
+	});
+
+	module.exports = assignIn;
+
+/***/ }),
+/* 564 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var copyObject = __webpack_require__(30),
+	    createAssigner = __webpack_require__(103),
+	    keysIn = __webpack_require__(46);
+
+	/**
+	 * This method is like `_.assignIn` except that it accepts `customizer`
+	 * which is invoked to produce the assigned values. If `customizer` returns
+	 * `undefined`, assignment is handled by the method instead. The `customizer`
+	 * is invoked with five arguments: (objValue, srcValue, key, object, source).
+	 *
+	 * **Note:** This method mutates `object`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @alias extendWith
+	 * @category Object
+	 * @param {Object} object The destination object.
+	 * @param {...Object} sources The source objects.
+	 * @param {Function} [customizer] The function to customize assigned values.
+	 * @returns {Object} Returns `object`.
+	 * @see _.assignWith
+	 * @example
+	 *
+	 * function customizer(objValue, srcValue) {
+	 *   return _.isUndefined(objValue) ? srcValue : objValue;
+	 * }
+	 *
+	 * var defaults = _.partialRight(_.assignInWith, customizer);
+	 *
+	 * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+	 * // => { 'a': 1, 'b': 2 }
+	 */
+	var assignInWith = createAssigner(function (object, source, srcIndex, customizer) {
+	  copyObject(source, keysIn(source), object, customizer);
+	});
+
+	module.exports = assignInWith;
+
+/***/ }),
+/* 565 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseClone = __webpack_require__(160);
+
+	/** Used to compose bitmasks for cloning. */
+	var CLONE_DEEP_FLAG = 1,
+	    CLONE_SYMBOLS_FLAG = 4;
+
+	/**
+	 * This method is like `_.clone` except that it recursively clones `value`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 1.0.0
+	 * @category Lang
+	 * @param {*} value The value to recursively clone.
+	 * @returns {*} Returns the deep cloned value.
+	 * @see _.clone
+	 * @example
+	 *
+	 * var objects = [{ 'a': 1 }, { 'b': 2 }];
+	 *
+	 * var deep = _.cloneDeep(objects);
+	 * console.log(deep[0] === objects[0]);
+	 * // => false
+	 */
+	function cloneDeep(value) {
+	  return baseClone(value, CLONE_DEEP_FLAG | CLONE_SYMBOLS_FLAG);
+	}
+
+	module.exports = cloneDeep;
+
+/***/ }),
+/* 566 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseClone = __webpack_require__(160);
+
+	/** Used to compose bitmasks for cloning. */
+	var CLONE_DEEP_FLAG = 1,
+	    CLONE_SYMBOLS_FLAG = 4;
+
+	/**
+	 * This method is like `_.cloneWith` except that it recursively clones `value`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to recursively clone.
+	 * @param {Function} [customizer] The function to customize cloning.
+	 * @returns {*} Returns the deep cloned value.
+	 * @see _.cloneWith
+	 * @example
+	 *
+	 * function customizer(value) {
+	 *   if (_.isElement(value)) {
+	 *     return value.cloneNode(true);
+	 *   }
+	 * }
+	 *
+	 * var el = _.cloneDeepWith(document.body, customizer);
+	 *
+	 * console.log(el === document.body);
+	 * // => false
+	 * console.log(el.nodeName);
+	 * // => 'BODY'
+	 * console.log(el.childNodes.length);
+	 * // => 20
+	 */
+	function cloneDeepWith(value, customizer) {
+	  customizer = typeof customizer == 'function' ? customizer : undefined;
+	  return baseClone(value, CLONE_DEEP_FLAG | CLONE_SYMBOLS_FLAG, customizer);
+	}
+
+	module.exports = cloneDeepWith;
+
+/***/ }),
+/* 567 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * Creates a function that returns `value`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 2.4.0
+	 * @category Util
+	 * @param {*} value The value to return from the new function.
+	 * @returns {Function} Returns the new constant function.
+	 * @example
+	 *
+	 * var objects = _.times(2, _.constant({ 'a': 1 }));
+	 *
+	 * console.log(objects);
+	 * // => [{ 'a': 1 }, { 'a': 1 }]
+	 *
+	 * console.log(objects[0] === objects[1]);
+	 * // => true
+	 */
+	function constant(value) {
+	  return function () {
+	    return value;
+	  };
+	}
+
+	module.exports = constant;
+
+/***/ }),
+/* 568 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var toString = __webpack_require__(114);
+
+	/**
+	 * Used to match `RegExp`
+	 * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
+	 */
+	var reRegExpChar = /[\\^$.*+?()[\]{}|]/g,
+	    reHasRegExpChar = RegExp(reRegExpChar.source);
+
+	/**
+	 * Escapes the `RegExp` special characters "^", "$", "\", ".", "*", "+",
+	 * "?", "(", ")", "[", "]", "{", "}", and "|" in `string`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 3.0.0
+	 * @category String
+	 * @param {string} [string=''] The string to escape.
+	 * @returns {string} Returns the escaped string.
+	 * @example
+	 *
+	 * _.escapeRegExp('[lodash](https://lodash.com/)');
+	 * // => '\[lodash\]\(https://lodash\.com/\)'
+	 */
+	function escapeRegExp(string) {
+	  string = toString(string);
+	  return string && reHasRegExpChar.test(string) ? string.replace(reRegExpChar, '\\$&') : string;
+	}
+
+	module.exports = escapeRegExp;
+
+/***/ }),
+/* 569 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = __webpack_require__(563);
+
+/***/ }),
+/* 570 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var createFind = __webpack_require__(253),
+	    findIndex = __webpack_require__(571);
+
+	/**
+	 * Iterates over elements of `collection`, returning the first element
+	 * `predicate` returns truthy for. The predicate is invoked with three
+	 * arguments: (value, index|key, collection).
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Collection
+	 * @param {Array|Object} collection The collection to inspect.
+	 * @param {Function} [predicate=_.identity] The function invoked per iteration.
+	 * @param {number} [fromIndex=0] The index to search from.
+	 * @returns {*} Returns the matched element, else `undefined`.
+	 * @example
+	 *
+	 * var users = [
+	 *   { 'user': 'barney',  'age': 36, 'active': true },
+	 *   { 'user': 'fred',    'age': 40, 'active': false },
+	 *   { 'user': 'pebbles', 'age': 1,  'active': true }
+	 * ];
+	 *
+	 * _.find(users, function(o) { return o.age < 40; });
+	 * // => object for 'barney'
+	 *
+	 * // The `_.matches` iteratee shorthand.
+	 * _.find(users, { 'age': 1, 'active': true });
+	 * // => object for 'pebbles'
+	 *
+	 * // The `_.matchesProperty` iteratee shorthand.
+	 * _.find(users, ['active', false]);
+	 * // => object for 'fred'
+	 *
+	 * // The `_.property` iteratee shorthand.
+	 * _.find(users, 'active');
+	 * // => object for 'barney'
+	 */
+	var find = createFind(findIndex);
+
+	module.exports = find;
+
+/***/ }),
+/* 571 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseFindIndex = __webpack_require__(161),
+	    baseIteratee = __webpack_require__(59),
+	    toInteger = __webpack_require__(47);
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeMax = Math.max;
+
+	/**
+	 * This method is like `_.find` except that it returns the index of the first
+	 * element `predicate` returns truthy for instead of the element itself.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 1.1.0
+	 * @category Array
+	 * @param {Array} array The array to inspect.
+	 * @param {Function} [predicate=_.identity] The function invoked per iteration.
+	 * @param {number} [fromIndex=0] The index to search from.
+	 * @returns {number} Returns the index of the found element, else `-1`.
+	 * @example
+	 *
+	 * var users = [
+	 *   { 'user': 'barney',  'active': false },
+	 *   { 'user': 'fred',    'active': false },
+	 *   { 'user': 'pebbles', 'active': true }
+	 * ];
+	 *
+	 * _.findIndex(users, function(o) { return o.user == 'barney'; });
+	 * // => 0
+	 *
+	 * // The `_.matches` iteratee shorthand.
+	 * _.findIndex(users, { 'user': 'fred', 'active': false });
+	 * // => 1
+	 *
+	 * // The `_.matchesProperty` iteratee shorthand.
+	 * _.findIndex(users, ['active', false]);
+	 * // => 0
+	 *
+	 * // The `_.property` iteratee shorthand.
+	 * _.findIndex(users, 'active');
+	 * // => 2
+	 */
+	function findIndex(array, predicate, fromIndex) {
+	  var length = array == null ? 0 : array.length;
+	  if (!length) {
+	    return -1;
+	  }
+	  var index = fromIndex == null ? 0 : toInteger(fromIndex);
+	  if (index < 0) {
+	    index = nativeMax(length + index, 0);
+	  }
+	  return baseFindIndex(array, baseIteratee(predicate, 3), index);
+	}
+
+	module.exports = findIndex;
+
+/***/ }),
+/* 572 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var createFind = __webpack_require__(253),
+	    findLastIndex = __webpack_require__(573);
+
+	/**
+	 * This method is like `_.find` except that it iterates over elements of
+	 * `collection` from right to left.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 2.0.0
+	 * @category Collection
+	 * @param {Array|Object} collection The collection to inspect.
+	 * @param {Function} [predicate=_.identity] The function invoked per iteration.
+	 * @param {number} [fromIndex=collection.length-1] The index to search from.
+	 * @returns {*} Returns the matched element, else `undefined`.
+	 * @example
+	 *
+	 * _.findLast([1, 2, 3, 4], function(n) {
+	 *   return n % 2 == 1;
+	 * });
+	 * // => 3
+	 */
+	var findLast = createFind(findLastIndex);
+
+	module.exports = findLast;
+
+/***/ }),
+/* 573 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseFindIndex = __webpack_require__(161),
+	    baseIteratee = __webpack_require__(59),
+	    toInteger = __webpack_require__(47);
+
+	/* Built-in method references for those with the same name as other `lodash` methods. */
+	var nativeMax = Math.max,
+	    nativeMin = Math.min;
+
+	/**
+	 * This method is like `_.findIndex` except that it iterates over elements
+	 * of `collection` from right to left.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 2.0.0
+	 * @category Array
+	 * @param {Array} array The array to inspect.
+	 * @param {Function} [predicate=_.identity] The function invoked per iteration.
+	 * @param {number} [fromIndex=array.length-1] The index to search from.
+	 * @returns {number} Returns the index of the found element, else `-1`.
+	 * @example
+	 *
+	 * var users = [
+	 *   { 'user': 'barney',  'active': true },
+	 *   { 'user': 'fred',    'active': false },
+	 *   { 'user': 'pebbles', 'active': false }
+	 * ];
+	 *
+	 * _.findLastIndex(users, function(o) { return o.user == 'pebbles'; });
+	 * // => 2
+	 *
+	 * // The `_.matches` iteratee shorthand.
+	 * _.findLastIndex(users, { 'user': 'barney', 'active': true });
+	 * // => 0
+	 *
+	 * // The `_.matchesProperty` iteratee shorthand.
+	 * _.findLastIndex(users, ['active', false]);
+	 * // => 2
+	 *
+	 * // The `_.property` iteratee shorthand.
+	 * _.findLastIndex(users, 'active');
+	 * // => 0
+	 */
+	function findLastIndex(array, predicate, fromIndex) {
+	  var length = array == null ? 0 : array.length;
+	  if (!length) {
+	    return -1;
+	  }
+	  var index = length - 1;
+	  if (fromIndex !== undefined) {
+	    index = toInteger(fromIndex);
+	    index = fromIndex < 0 ? nativeMax(length + index, 0) : nativeMin(index, length - 1);
+	  }
+	  return baseFindIndex(array, baseIteratee(predicate, 3), index, true);
+	}
+
+	module.exports = findLastIndex;
+
+/***/ }),
+/* 574 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseGet = __webpack_require__(244);
+
+	/**
+	 * Gets the value at `path` of `object`. If the resolved value is
+	 * `undefined`, the `defaultValue` is returned in its place.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 3.7.0
+	 * @category Object
+	 * @param {Object} object The object to query.
+	 * @param {Array|string} path The path of the property to get.
+	 * @param {*} [defaultValue] The value returned for `undefined` resolved values.
+	 * @returns {*} Returns the resolved value.
+	 * @example
+	 *
+	 * var object = { 'a': [{ 'b': { 'c': 3 } }] };
+	 *
+	 * _.get(object, 'a[0].b.c');
+	 * // => 3
+	 *
+	 * _.get(object, ['a', '0', 'b', 'c']);
+	 * // => 3
+	 *
+	 * _.get(object, 'a.b.c', 'default');
+	 * // => 'default'
+	 */
+	function get(object, path, defaultValue) {
+	  var result = object == null ? undefined : baseGet(object, path);
+	  return result === undefined ? defaultValue : result;
+	}
+
+	module.exports = get;
+
+/***/ }),
+/* 575 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseHasIn = __webpack_require__(482),
+	    hasPath = __webpack_require__(260);
+
+	/**
+	 * Checks if `path` is a direct or inherited property of `object`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Object
+	 * @param {Object} object The object to query.
+	 * @param {Array|string} path The path to check.
+	 * @returns {boolean} Returns `true` if `path` exists, else `false`.
+	 * @example
+	 *
+	 * var object = _.create({ 'a': _.create({ 'b': 2 }) });
+	 *
+	 * _.hasIn(object, 'a');
+	 * // => true
+	 *
+	 * _.hasIn(object, 'a.b');
+	 * // => true
+	 *
+	 * _.hasIn(object, ['a', 'b']);
+	 * // => true
+	 *
+	 * _.hasIn(object, 'b');
+	 * // => false
+	 */
+	function hasIn(object, path) {
+	  return object != null && hasPath(object, path, baseHasIn);
+	}
+
+	module.exports = hasIn;
+
+/***/ }),
+/* 576 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isArrayLike = __webpack_require__(24),
+	    isObjectLike = __webpack_require__(25);
+
+	/**
+	 * This method is like `_.isArrayLike` except that it also checks if `value`
+	 * is an object.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is an array-like object,
+	 *  else `false`.
+	 * @example
+	 *
+	 * _.isArrayLikeObject([1, 2, 3]);
+	 * // => true
+	 *
+	 * _.isArrayLikeObject(document.body.children);
+	 * // => true
+	 *
+	 * _.isArrayLikeObject('abc');
+	 * // => false
+	 *
+	 * _.isArrayLikeObject(_.noop);
+	 * // => false
+	 */
+	function isArrayLikeObject(value) {
+	  return isObjectLike(value) && isArrayLike(value);
+	}
+
+	module.exports = isArrayLikeObject;
+
+/***/ }),
+/* 577 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var toInteger = __webpack_require__(47);
+
+	/**
+	 * Checks if `value` is an integer.
+	 *
+	 * **Note:** This method is based on
+	 * [`Number.isInteger`](https://mdn.io/Number/isInteger).
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is an integer, else `false`.
+	 * @example
+	 *
+	 * _.isInteger(3);
+	 * // => true
+	 *
+	 * _.isInteger(Number.MIN_VALUE);
+	 * // => false
+	 *
+	 * _.isInteger(Infinity);
+	 * // => false
+	 *
+	 * _.isInteger('3');
+	 * // => false
+	 */
+	function isInteger(value) {
+	  return typeof value == 'number' && value == toInteger(value);
+	}
+
+	module.exports = isInteger;
+
+/***/ }),
+/* 578 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseGetTag = __webpack_require__(29),
+	    isArray = __webpack_require__(6),
+	    isObjectLike = __webpack_require__(25);
+
+	/** `Object#toString` result references. */
+	var stringTag = '[object String]';
+
+	/**
+	 * Checks if `value` is classified as a `String` primitive or object.
+	 *
+	 * @static
+	 * @since 0.1.0
+	 * @memberOf _
+	 * @category Lang
+	 * @param {*} value The value to check.
+	 * @returns {boolean} Returns `true` if `value` is a string, else `false`.
+	 * @example
+	 *
+	 * _.isString('abc');
+	 * // => true
+	 *
+	 * _.isString(1);
+	 * // => false
+	 */
+	function isString(value) {
+	    return typeof value == 'string' || !isArray(value) && isObjectLike(value) && baseGetTag(value) == stringTag;
+	}
+
+	module.exports = isString;
+
+/***/ }),
+/* 579 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var arrayMap = __webpack_require__(58),
+	    baseIteratee = __webpack_require__(59),
+	    baseMap = __webpack_require__(247),
+	    isArray = __webpack_require__(6);
+
+	/**
+	 * Creates an array of values by running each element in `collection` thru
+	 * `iteratee`. The iteratee is invoked with three arguments:
+	 * (value, index|key, collection).
+	 *
+	 * Many lodash methods are guarded to work as iteratees for methods like
+	 * `_.every`, `_.filter`, `_.map`, `_.mapValues`, `_.reject`, and `_.some`.
+	 *
+	 * The guarded methods are:
+	 * `ary`, `chunk`, `curry`, `curryRight`, `drop`, `dropRight`, `every`,
+	 * `fill`, `invert`, `parseInt`, `random`, `range`, `rangeRight`, `repeat`,
+	 * `sampleSize`, `slice`, `some`, `sortBy`, `split`, `take`, `takeRight`,
+	 * `template`, `trim`, `trimEnd`, `trimStart`, and `words`
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Collection
+	 * @param {Array|Object} collection The collection to iterate over.
+	 * @param {Function} [iteratee=_.identity] The function invoked per iteration.
+	 * @returns {Array} Returns the new mapped array.
+	 * @example
+	 *
+	 * function square(n) {
+	 *   return n * n;
+	 * }
+	 *
+	 * _.map([4, 8], square);
+	 * // => [16, 64]
+	 *
+	 * _.map({ 'a': 4, 'b': 8 }, square);
+	 * // => [16, 64] (iteration order is not guaranteed)
+	 *
+	 * var users = [
+	 *   { 'user': 'barney' },
+	 *   { 'user': 'fred' }
+	 * ];
+	 *
+	 * // The `_.property` iteratee shorthand.
+	 * _.map(users, 'user');
+	 * // => ['barney', 'fred']
+	 */
+	function map(collection, iteratee) {
+	  var func = isArray(collection) ? arrayMap : baseMap;
+	  return func(collection, baseIteratee(iteratee, 3));
+	}
+
+	module.exports = map;
+
+/***/ }),
+/* 580 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var MapCache = __webpack_require__(156);
+
+	/** Error message constants. */
+	var FUNC_ERROR_TEXT = 'Expected a function';
+
+	/**
+	 * Creates a function that memoizes the result of `func`. If `resolver` is
+	 * provided, it determines the cache key for storing the result based on the
+	 * arguments provided to the memoized function. By default, the first argument
+	 * provided to the memoized function is used as the map cache key. The `func`
+	 * is invoked with the `this` binding of the memoized function.
+	 *
+	 * **Note:** The cache is exposed as the `cache` property on the memoized
+	 * function. Its creation may be customized by replacing the `_.memoize.Cache`
+	 * constructor with one whose instances implement the
+	 * [`Map`](http://ecma-international.org/ecma-262/7.0/#sec-properties-of-the-map-prototype-object)
+	 * method interface of `clear`, `delete`, `get`, `has`, and `set`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Function
+	 * @param {Function} func The function to have its output memoized.
+	 * @param {Function} [resolver] The function to resolve the cache key.
+	 * @returns {Function} Returns the new memoized function.
+	 * @example
+	 *
+	 * var object = { 'a': 1, 'b': 2 };
+	 * var other = { 'c': 3, 'd': 4 };
+	 *
+	 * var values = _.memoize(_.values);
+	 * values(object);
+	 * // => [1, 2]
+	 *
+	 * values(other);
+	 * // => [3, 4]
+	 *
+	 * object.a = 2;
+	 * values(object);
+	 * // => [1, 2]
+	 *
+	 * // Modify the result cache.
+	 * values.cache.set(object, ['a', 'b']);
+	 * values(object);
+	 * // => ['a', 'b']
+	 *
+	 * // Replace `_.memoize.Cache`.
+	 * _.memoize.Cache = WeakMap;
+	 */
+	function memoize(func, resolver) {
+	  if (typeof func != 'function' || resolver != null && typeof resolver != 'function') {
+	    throw new TypeError(FUNC_ERROR_TEXT);
+	  }
+	  var memoized = function memoized() {
+	    var args = arguments,
+	        key = resolver ? resolver.apply(this, args) : args[0],
+	        cache = memoized.cache;
+
+	    if (cache.has(key)) {
+	      return cache.get(key);
+	    }
+	    var result = func.apply(this, args);
+	    memoized.cache = cache.set(key, result) || cache;
+	    return result;
+	  };
+	  memoized.cache = new (memoize.Cache || MapCache)();
+	  return memoized;
+	}
+
+	// Expose `MapCache`.
+	memoize.Cache = MapCache;
+
+	module.exports = memoize;
+
+/***/ }),
+/* 581 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseMerge = __webpack_require__(495),
+	    createAssigner = __webpack_require__(103);
+
+	/**
+	 * This method is like `_.merge` except that it accepts `customizer` which
+	 * is invoked to produce the merged values of the destination and source
+	 * properties. If `customizer` returns `undefined`, merging is handled by the
+	 * method instead. The `customizer` is invoked with six arguments:
+	 * (objValue, srcValue, key, object, source, stack).
+	 *
+	 * **Note:** This method mutates `object`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Object
+	 * @param {Object} object The destination object.
+	 * @param {...Object} sources The source objects.
+	 * @param {Function} customizer The function to customize assigned values.
+	 * @returns {Object} Returns `object`.
+	 * @example
+	 *
+	 * function customizer(objValue, srcValue) {
+	 *   if (_.isArray(objValue)) {
+	 *     return objValue.concat(srcValue);
+	 *   }
+	 * }
+	 *
+	 * var object = { 'a': [1], 'b': [2] };
+	 * var other = { 'a': [3], 'b': [4] };
+	 *
+	 * _.mergeWith(object, other, customizer);
+	 * // => { 'a': [1, 3], 'b': [2, 4] }
+	 */
+	var mergeWith = createAssigner(function (object, source, srcIndex, customizer) {
+	  baseMerge(object, source, srcIndex, customizer);
+	});
+
+	module.exports = mergeWith;
+
+/***/ }),
+/* 582 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * This method returns `undefined`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 2.3.0
+	 * @category Util
+	 * @example
+	 *
+	 * _.times(2, _.noop);
+	 * // => [undefined, undefined]
+	 */
+	function noop() {
+	  // No operation performed.
+	}
+
+	module.exports = noop;
+
+/***/ }),
+/* 583 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseProperty = __webpack_require__(498),
+	    basePropertyDeep = __webpack_require__(499),
+	    isKey = __webpack_require__(169),
+	    toKey = __webpack_require__(108);
+
+	/**
+	 * Creates a function that returns the value at `path` of a given object.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 2.4.0
+	 * @category Util
+	 * @param {Array|string} path The path of the property to get.
+	 * @returns {Function} Returns the new accessor function.
+	 * @example
+	 *
+	 * var objects = [
+	 *   { 'a': { 'b': 2 } },
+	 *   { 'a': { 'b': 1 } }
+	 * ];
+	 *
+	 * _.map(objects, _.property('a.b'));
+	 * // => [2, 1]
+	 *
+	 * _.map(_.sortBy(objects, _.property(['a', 'b'])), 'a.b');
+	 * // => [1, 2]
+	 */
+	function property(path) {
+	  return isKey(path) ? baseProperty(toKey(path)) : basePropertyDeep(path);
+	}
+
+	module.exports = property;
+
+/***/ }),
+/* 584 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var basePullAll = __webpack_require__(500);
+
+	/**
+	 * This method is like `_.pull` except that it accepts an array of values to remove.
+	 *
+	 * **Note:** Unlike `_.difference`, this method mutates `array`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Array
+	 * @param {Array} array The array to modify.
+	 * @param {Array} values The values to remove.
+	 * @returns {Array} Returns `array`.
+	 * @example
+	 *
+	 * var array = ['a', 'b', 'c', 'a', 'b', 'c'];
+	 *
+	 * _.pullAll(array, ['a', 'c']);
+	 * console.log(array);
+	 * // => ['b', 'b']
+	 */
+	function pullAll(array, values) {
+	  return array && array.length && values && values.length ? basePullAll(array, values) : array;
+	}
+
+	module.exports = pullAll;
+
+/***/ }),
+/* 585 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseFlatten = __webpack_require__(479),
+	    baseOrderBy = __webpack_require__(497),
+	    baseRest = __webpack_require__(101),
+	    isIterateeCall = __webpack_require__(168);
+
+	/**
+	 * Creates an array of elements, sorted in ascending order by the results of
+	 * running each element in a collection thru each iteratee. This method
+	 * performs a stable sort, that is, it preserves the original sort order of
+	 * equal elements. The iteratees are invoked with one argument: (value).
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Collection
+	 * @param {Array|Object} collection The collection to iterate over.
+	 * @param {...(Function|Function[])} [iteratees=[_.identity]]
+	 *  The iteratees to sort by.
+	 * @returns {Array} Returns the new sorted array.
+	 * @example
+	 *
+	 * var users = [
+	 *   { 'user': 'fred',   'age': 48 },
+	 *   { 'user': 'barney', 'age': 36 },
+	 *   { 'user': 'fred',   'age': 40 },
+	 *   { 'user': 'barney', 'age': 34 }
+	 * ];
+	 *
+	 * _.sortBy(users, [function(o) { return o.user; }]);
+	 * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 40]]
+	 *
+	 * _.sortBy(users, ['user', 'age']);
+	 * // => objects for [['barney', 34], ['barney', 36], ['fred', 40], ['fred', 48]]
+	 */
+	var sortBy = baseRest(function (collection, iteratees) {
+	  if (collection == null) {
+	    return [];
+	  }
+	  var length = iteratees.length;
+	  if (length > 1 && isIterateeCall(collection, iteratees[0], iteratees[1])) {
+	    iteratees = [];
+	  } else if (length > 2 && isIterateeCall(iteratees[0], iteratees[1], iteratees[2])) {
+	    iteratees = [iteratees[0]];
+	  }
+	  return baseOrderBy(collection, baseFlatten(iteratees, 1), []);
+	});
+
+	module.exports = sortBy;
+
+/***/ }),
+/* 586 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseClamp = __webpack_require__(476),
+	    baseToString = __webpack_require__(248),
+	    toInteger = __webpack_require__(47),
+	    toString = __webpack_require__(114);
+
+	/**
+	 * Checks if `string` starts with the given target string.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 3.0.0
+	 * @category String
+	 * @param {string} [string=''] The string to inspect.
+	 * @param {string} [target] The string to search for.
+	 * @param {number} [position=0] The position to search from.
+	 * @returns {boolean} Returns `true` if `string` starts with `target`,
+	 *  else `false`.
+	 * @example
+	 *
+	 * _.startsWith('abc', 'a');
+	 * // => true
+	 *
+	 * _.startsWith('abc', 'b');
+	 * // => false
+	 *
+	 * _.startsWith('abc', 'b', 1);
+	 * // => true
+	 */
+	function startsWith(string, target, position) {
+	  string = toString(string);
+	  position = position == null ? 0 : baseClamp(toInteger(position), 0, string.length);
+
+	  target = baseToString(target);
+	  return string.slice(position, position + target.length) == target;
+	}
+
+	module.exports = startsWith;
+
+/***/ }),
+/* 587 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/**
+	 * This method returns `false`.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.13.0
+	 * @category Util
+	 * @returns {boolean} Returns `false`.
+	 * @example
+	 *
+	 * _.times(2, _.stubFalse);
+	 * // => [false, false]
+	 */
+	function stubFalse() {
+	  return false;
+	}
+
+	module.exports = stubFalse;
+
+/***/ }),
+/* 588 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var toNumber = __webpack_require__(589);
+
+	/** Used as references for various `Number` constants. */
+	var INFINITY = 1 / 0,
+	    MAX_INTEGER = 1.7976931348623157e+308;
+
+	/**
+	 * Converts `value` to a finite number.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.12.0
+	 * @category Lang
+	 * @param {*} value The value to convert.
+	 * @returns {number} Returns the converted number.
+	 * @example
+	 *
+	 * _.toFinite(3.2);
+	 * // => 3.2
+	 *
+	 * _.toFinite(Number.MIN_VALUE);
+	 * // => 5e-324
+	 *
+	 * _.toFinite(Infinity);
+	 * // => 1.7976931348623157e+308
+	 *
+	 * _.toFinite('3.2');
+	 * // => 3.2
+	 */
+	function toFinite(value) {
+	  if (!value) {
+	    return value === 0 ? value : 0;
+	  }
+	  value = toNumber(value);
+	  if (value === INFINITY || value === -INFINITY) {
+	    var sign = value < 0 ? -1 : 1;
+	    return sign * MAX_INTEGER;
+	  }
+	  return value === value ? value : 0;
+	}
+
+	module.exports = toFinite;
+
+/***/ }),
+/* 589 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isObject = __webpack_require__(16),
+	    isSymbol = __webpack_require__(60);
+
+	/** Used as references for various `Number` constants. */
+	var NAN = 0 / 0;
+
+	/** Used to match leading and trailing whitespace. */
+	var reTrim = /^\s+|\s+$/g;
+
+	/** Used to detect bad signed hexadecimal string values. */
+	var reIsBadHex = /^[-+]0x[0-9a-f]+$/i;
+
+	/** Used to detect binary string values. */
+	var reIsBinary = /^0b[01]+$/i;
+
+	/** Used to detect octal string values. */
+	var reIsOctal = /^0o[0-7]+$/i;
+
+	/** Built-in method references without a dependency on `root`. */
+	var freeParseInt = parseInt;
+
+	/**
+	 * Converts `value` to a number.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.0.0
+	 * @category Lang
+	 * @param {*} value The value to process.
+	 * @returns {number} Returns the number.
+	 * @example
+	 *
+	 * _.toNumber(3.2);
+	 * // => 3.2
+	 *
+	 * _.toNumber(Number.MIN_VALUE);
+	 * // => 5e-324
+	 *
+	 * _.toNumber(Infinity);
+	 * // => Infinity
+	 *
+	 * _.toNumber('3.2');
+	 * // => 3.2
+	 */
+	function toNumber(value) {
+	  if (typeof value == 'number') {
+	    return value;
+	  }
+	  if (isSymbol(value)) {
+	    return NAN;
+	  }
+	  if (isObject(value)) {
+	    var other = typeof value.valueOf == 'function' ? value.valueOf() : value;
+	    value = isObject(other) ? other + '' : other;
+	  }
+	  if (typeof value != 'string') {
+	    return value === 0 ? value : +value;
+	  }
+	  value = value.replace(reTrim, '');
+	  var isBinary = reIsBinary.test(value);
+	  return isBinary || reIsOctal.test(value) ? freeParseInt(value.slice(2), isBinary ? 2 : 8) : reIsBadHex.test(value) ? NAN : +value;
+	}
+
+	module.exports = toNumber;
+
+/***/ }),
+/* 590 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var copyObject = __webpack_require__(30),
+	    keysIn = __webpack_require__(46);
+
+	/**
+	 * Converts `value` to a plain object flattening inherited enumerable string
+	 * keyed properties of `value` to own properties of the plain object.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 3.0.0
+	 * @category Lang
+	 * @param {*} value The value to convert.
+	 * @returns {Object} Returns the converted plain object.
+	 * @example
+	 *
+	 * function Foo() {
+	 *   this.b = 2;
+	 * }
+	 *
+	 * Foo.prototype.c = 3;
+	 *
+	 * _.assign({ 'a': 1 }, new Foo);
+	 * // => { 'a': 1, 'b': 2 }
+	 *
+	 * _.assign({ 'a': 1 }, _.toPlainObject(new Foo));
+	 * // => { 'a': 1, 'b': 2, 'c': 3 }
+	 */
+	function toPlainObject(value) {
+	  return copyObject(value, keysIn(value));
+	}
+
+	module.exports = toPlainObject;
+
+/***/ }),
+/* 591 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var baseUniq = __webpack_require__(505);
+
+	/**
+	 * Creates a duplicate-free version of an array, using
+	 * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+	 * for equality comparisons, in which only the first occurrence of each element
+	 * is kept. The order of result values is determined by the order they occur
+	 * in the array.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 0.1.0
+	 * @category Array
+	 * @param {Array} array The array to inspect.
+	 * @returns {Array} Returns the new duplicate free array.
+	 * @example
+	 *
+	 * _.uniq([2, 1, 2]);
+	 * // => [2, 1]
+	 */
+	function uniq(array) {
+	  return array && array.length ? baseUniq(array) : [];
+	}
+
+	module.exports = uniq;
+
+/***/ }),
+/* 592 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	module.exports = minimatch;
+	minimatch.Minimatch = Minimatch;
+
+	var path = { sep: '/' };
+	try {
+	  path = __webpack_require__(17);
+	} catch (er) {}
+
+	var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {};
+	var expand = __webpack_require__(394);
+
+	var plTypes = {
+	  '!': { open: '(?:(?!(?:', close: '))[^/]*?)' },
+	  '?': { open: '(?:', close: ')?' },
+	  '+': { open: '(?:', close: ')+' },
+	  '*': { open: '(?:', close: ')*' },
+	  '@': { open: '(?:', close: ')' }
+
+	  // any single thing other than /
+	  // don't need to escape / when using new RegExp()
+	};var qmark = '[^/]';
+
+	// * => any number of characters
+	var star = qmark + '*?';
+
+	// ** when dots are allowed.  Anything goes, except .. and .
+	// not (^ or / followed by one or two dots followed by $ or /),
+	// followed by anything, any number of times.
+	var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?';
+
+	// not a ^ or / followed by a dot,
+	// followed by anything, any number of times.
+	var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?';
+
+	// characters that need to be escaped in RegExp.
+	var reSpecials = charSet('().*{}+?[]^$\\!'
+
+	// "abc" -> { a:true, b:true, c:true }
+	);function charSet(s) {
+	  return s.split('').reduce(function (set, c) {
+	    set[c] = true;
+	    return set;
+	  }, {});
+	}
+
+	// normalizes slashes.
+	var slashSplit = /\/+/;
+
+	minimatch.filter = filter;
+	function filter(pattern, options) {
+	  options = options || {};
+	  return function (p, i, list) {
+	    return minimatch(p, pattern, options);
+	  };
+	}
+
+	function ext(a, b) {
+	  a = a || {};
+	  b = b || {};
+	  var t = {};
+	  Object.keys(b).forEach(function (k) {
+	    t[k] = b[k];
+	  });
+	  Object.keys(a).forEach(function (k) {
+	    t[k] = a[k];
+	  });
+	  return t;
+	}
+
+	minimatch.defaults = function (def) {
+	  if (!def || !Object.keys(def).length) return minimatch;
+
+	  var orig = minimatch;
+
+	  var m = function minimatch(p, pattern, options) {
+	    return orig.minimatch(p, pattern, ext(def, options));
+	  };
+
+	  m.Minimatch = function Minimatch(pattern, options) {
+	    return new orig.Minimatch(pattern, ext(def, options));
+	  };
+
+	  return m;
+	};
+
+	Minimatch.defaults = function (def) {
+	  if (!def || !Object.keys(def).length) return Minimatch;
+	  return minimatch.defaults(def).Minimatch;
+	};
+
+	function minimatch(p, pattern, options) {
+	  if (typeof pattern !== 'string') {
+	    throw new TypeError('glob pattern string required');
+	  }
+
+	  if (!options) options = {};
+
+	  // shortcut: comments match nothing.
+	  if (!options.nocomment && pattern.charAt(0) === '#') {
+	    return false;
+	  }
+
+	  // "" only matches ""
+	  if (pattern.trim() === '') return p === '';
+
+	  return new Minimatch(pattern, options).match(p);
+	}
+
+	function Minimatch(pattern, options) {
+	  if (!(this instanceof Minimatch)) {
+	    return new Minimatch(pattern, options);
+	  }
+
+	  if (typeof pattern !== 'string') {
+	    throw new TypeError('glob pattern string required');
+	  }
+
+	  if (!options) options = {};
+	  pattern = pattern.trim
+
+	  // windows support: need to use /, not \
+	  ();if (path.sep !== '/') {
+	    pattern = pattern.split(path.sep).join('/');
+	  }
+
+	  this.options = options;
+	  this.set = [];
+	  this.pattern = pattern;
+	  this.regexp = null;
+	  this.negate = false;
+	  this.comment = false;
+	  this.empty = false;
+
+	  // make the set of regexps etc.
+	  this.make();
+	}
+
+	Minimatch.prototype.debug = function () {};
+
+	Minimatch.prototype.make = make;
+	function make() {
+	  // don't do it more than once.
+	  if (this._made) return;
+
+	  var pattern = this.pattern;
+	  var options = this.options;
+
+	  // empty patterns and comments match nothing.
+	  if (!options.nocomment && pattern.charAt(0) === '#') {
+	    this.comment = true;
+	    return;
+	  }
+	  if (!pattern) {
+	    this.empty = true;
+	    return;
+	  }
+
+	  // step 1: figure out negation, etc.
+	  this.parseNegate
+
+	  // step 2: expand braces
+	  ();var set = this.globSet = this.braceExpand();
+
+	  if (options.debug) this.debug = console.error;
+
+	  this.debug(this.pattern, set
+
+	  // step 3: now we have a set, so turn each one into a series of path-portion
+	  // matching patterns.
+	  // These will be regexps, except in the case of "**", which is
+	  // set to the GLOBSTAR object for globstar behavior,
+	  // and will not contain any / characters
+	  );set = this.globParts = set.map(function (s) {
+	    return s.split(slashSplit);
+	  });
+
+	  this.debug(this.pattern, set
+
+	  // glob --> regexps
+	  );set = set.map(function (s, si, set) {
+	    return s.map(this.parse, this);
+	  }, this);
+
+	  this.debug(this.pattern, set
+
+	  // filter out everything that didn't compile properly.
+	  );set = set.filter(function (s) {
+	    return s.indexOf(false) === -1;
+	  });
+
+	  this.debug(this.pattern, set);
+
+	  this.set = set;
+	}
+
+	Minimatch.prototype.parseNegate = parseNegate;
+	function parseNegate() {
+	  var pattern = this.pattern;
+	  var negate = false;
+	  var options = this.options;
+	  var negateOffset = 0;
+
+	  if (options.nonegate) return;
+
+	  for (var i = 0, l = pattern.length; i < l && pattern.charAt(i) === '!'; i++) {
+	    negate = !negate;
+	    negateOffset++;
+	  }
+
+	  if (negateOffset) this.pattern = pattern.substr(negateOffset);
+	  this.negate = negate;
+	}
+
+	// Brace expansion:
+	// a{b,c}d -> abd acd
+	// a{b,}c -> abc ac
+	// a{0..3}d -> a0d a1d a2d a3d
+	// a{b,c{d,e}f}g -> abg acdfg acefg
+	// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg
+	//
+	// Invalid sets are not expanded.
+	// a{2..}b -> a{2..}b
+	// a{b}c -> a{b}c
+	minimatch.braceExpand = function (pattern, options) {
+	  return braceExpand(pattern, options);
+	};
+
+	Minimatch.prototype.braceExpand = braceExpand;
+
+	function braceExpand(pattern, options) {
+	  if (!options) {
+	    if (this instanceof Minimatch) {
+	      options = this.options;
+	    } else {
+	      options = {};
+	    }
+	  }
+
+	  pattern = typeof pattern === 'undefined' ? this.pattern : pattern;
+
+	  if (typeof pattern === 'undefined') {
+	    throw new TypeError('undefined pattern');
+	  }
+
+	  if (options.nobrace || !pattern.match(/\{.*\}/)) {
+	    // shortcut. no need to expand.
+	    return [pattern];
+	  }
+
+	  return expand(pattern);
+	}
+
+	// parse a component of the expanded set.
+	// At this point, no pattern may contain "/" in it
+	// so we're going to return a 2d array, where each entry is the full
+	// pattern, split on '/', and then turned into a regular expression.
+	// A regexp is made at the end which joins each array with an
+	// escaped /, and another full one which joins each regexp with |.
+	//
+	// Following the lead of Bash 4.1, note that "**" only has special meaning
+	// when it is the *only* thing in a path portion.  Otherwise, any series
+	// of * is equivalent to a single *.  Globstar behavior is enabled by
+	// default, and can be disabled by setting options.noglobstar.
+	Minimatch.prototype.parse = parse;
+	var SUBPARSE = {};
+	function parse(pattern, isSub) {
+	  if (pattern.length > 1024 * 64) {
+	    throw new TypeError('pattern is too long');
+	  }
+
+	  var options = this.options;
+
+	  // shortcuts
+	  if (!options.noglobstar && pattern === '**') return GLOBSTAR;
+	  if (pattern === '') return '';
+
+	  var re = '';
+	  var hasMagic = !!options.nocase;
+	  var escaping = false;
+	  // ? => one single character
+	  var patternListStack = [];
+	  var negativeLists = [];
+	  var stateChar;
+	  var inClass = false;
+	  var reClassStart = -1;
+	  var classStart = -1;
+	  // . and .. never match anything that doesn't start with .,
+	  // even when options.dot is set.
+	  var patternStart = pattern.charAt(0) === '.' ? '' // anything
+	  // not (start or / followed by . or .. followed by / or end)
+	  : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))' : '(?!\\.)';
+	  var self = this;
+
+	  function clearStateChar() {
+	    if (stateChar) {
+	      // we had some state-tracking character
+	      // that wasn't consumed by this pass.
+	      switch (stateChar) {
+	        case '*':
+	          re += star;
+	          hasMagic = true;
+	          break;
+	        case '?':
+	          re += qmark;
+	          hasMagic = true;
+	          break;
+	        default:
+	          re += '\\' + stateChar;
+	          break;
+	      }
+	      self.debug('clearStateChar %j %j', stateChar, re);
+	      stateChar = false;
+	    }
+	  }
+
+	  for (var i = 0, len = pattern.length, c; i < len && (c = pattern.charAt(i)); i++) {
+	    this.debug('%s\t%s %s %j', pattern, i, re, c
+
+	    // skip over any that are escaped.
+	    );if (escaping && reSpecials[c]) {
+	      re += '\\' + c;
+	      escaping = false;
+	      continue;
+	    }
+
+	    switch (c) {
+	      case '/':
+	        // completely not allowed, even escaped.
+	        // Should already be path-split by now.
+	        return false;
+
+	      case '\\':
+	        clearStateChar();
+	        escaping = true;
+	        continue;
+
+	      // the various stateChar values
+	      // for the "extglob" stuff.
+	      case '?':
+	      case '*':
+	      case '+':
+	      case '@':
+	      case '!':
+	        this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c
+
+	        // all of those are literals inside a class, except that
+	        // the glob [!a] means [^a] in regexp
+	        );if (inClass) {
+	          this.debug('  in class');
+	          if (c === '!' && i === classStart + 1) c = '^';
+	          re += c;
+	          continue;
+	        }
+
+	        // if we already have a stateChar, then it means
+	        // that there was something like ** or +? in there.
+	        // Handle the stateChar, then proceed with this one.
+	        self.debug('call clearStateChar %j', stateChar);
+	        clearStateChar();
+	        stateChar = c;
+	        // if extglob is disabled, then +(asdf|foo) isn't a thing.
+	        // just clear the statechar *now*, rather than even diving into
+	        // the patternList stuff.
+	        if (options.noext) clearStateChar();
+	        continue;
+
+	      case '(':
+	        if (inClass) {
+	          re += '(';
+	          continue;
+	        }
+
+	        if (!stateChar) {
+	          re += '\\(';
+	          continue;
+	        }
+
+	        patternListStack.push({
+	          type: stateChar,
+	          start: i - 1,
+	          reStart: re.length,
+	          open: plTypes[stateChar].open,
+	          close: plTypes[stateChar].close
+	        }
+	        // negation is (?:(?!js)[^/]*)
+	        );re += stateChar === '!' ? '(?:(?!(?:' : '(?:';
+	        this.debug('plType %j %j', stateChar, re);
+	        stateChar = false;
+	        continue;
+
+	      case ')':
+	        if (inClass || !patternListStack.length) {
+	          re += '\\)';
+	          continue;
+	        }
+
+	        clearStateChar();
+	        hasMagic = true;
+	        var pl = patternListStack.pop
+	        // negation is (?:(?!js)[^/]*)
+	        // The others are (?:<pattern>)<type>
+	        ();re += pl.close;
+	        if (pl.type === '!') {
+	          negativeLists.push(pl);
+	        }
+	        pl.reEnd = re.length;
+	        continue;
+
+	      case '|':
+	        if (inClass || !patternListStack.length || escaping) {
+	          re += '\\|';
+	          escaping = false;
+	          continue;
+	        }
+
+	        clearStateChar();
+	        re += '|';
+	        continue;
+
+	      // these are mostly the same in regexp and glob
+	      case '[':
+	        // swallow any state-tracking char before the [
+	        clearStateChar();
+
+	        if (inClass) {
+	          re += '\\' + c;
+	          continue;
+	        }
+
+	        inClass = true;
+	        classStart = i;
+	        reClassStart = re.length;
+	        re += c;
+	        continue;
+
+	      case ']':
+	        //  a right bracket shall lose its special
+	        //  meaning and represent itself in
+	        //  a bracket expression if it occurs
+	        //  first in the list.  -- POSIX.2 2.8.3.2
+	        if (i === classStart + 1 || !inClass) {
+	          re += '\\' + c;
+	          escaping = false;
+	          continue;
+	        }
+
+	        // handle the case where we left a class open.
+	        // "[z-a]" is valid, equivalent to "\[z-a\]"
+	        if (inClass) {
+	          // split where the last [ was, make sure we don't have
+	          // an invalid re. if so, re-walk the contents of the
+	          // would-be class to re-translate any characters that
+	          // were passed through as-is
+	          // TODO: It would probably be faster to determine this
+	          // without a try/catch and a new RegExp, but it's tricky
+	          // to do safely.  For now, this is safe and works.
+	          var cs = pattern.substring(classStart + 1, i);
+	          try {
+	            RegExp('[' + cs + ']');
+	          } catch (er) {
+	            // not a valid class!
+	            var sp = this.parse(cs, SUBPARSE);
+	            re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]';
+	            hasMagic = hasMagic || sp[1];
+	            inClass = false;
+	            continue;
+	          }
+	        }
+
+	        // finish up the class.
+	        hasMagic = true;
+	        inClass = false;
+	        re += c;
+	        continue;
+
+	      default:
+	        // swallow any state char that wasn't consumed
+	        clearStateChar();
+
+	        if (escaping) {
+	          // no need
+	          escaping = false;
+	        } else if (reSpecials[c] && !(c === '^' && inClass)) {
+	          re += '\\';
+	        }
+
+	        re += c;
+
+	    } // switch
+	  } // for
+
+	  // handle the case where we left a class open.
+	  // "[abc" is valid, equivalent to "\[abc"
+	  if (inClass) {
+	    // split where the last [ was, and escape it
+	    // this is a huge pita.  We now have to re-walk
+	    // the contents of the would-be class to re-translate
+	    // any characters that were passed through as-is
+	    cs = pattern.substr(classStart + 1);
+	    sp = this.parse(cs, SUBPARSE);
+	    re = re.substr(0, reClassStart) + '\\[' + sp[0];
+	    hasMagic = hasMagic || sp[1];
+	  }
+
+	  // handle the case where we had a +( thing at the *end*
+	  // of the pattern.
+	  // each pattern list stack adds 3 chars, and we need to go through
+	  // and escape any | chars that were passed through as-is for the regexp.
+	  // Go through and escape them, taking care not to double-escape any
+	  // | chars that were already escaped.
+	  for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
+	    var tail = re.slice(pl.reStart + pl.open.length);
+	    this.debug('setting tail', re, pl
+	    // maybe some even number of \, then maybe 1 \, followed by a |
+	    );tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
+	      if (!$2) {
+	        // the | isn't already escaped, so escape it.
+	        $2 = '\\';
+	      }
+
+	      // need to escape all those slashes *again*, without escaping the
+	      // one that we need for escaping the | character.  As it works out,
+	      // escaping an even number of slashes can be done by simply repeating
+	      // it exactly after itself.  That's why this trick works.
+	      //
+	      // I am sorry that you have to see this.
+	      return $1 + $1 + $2 + '|';
+	    });
+
+	    this.debug('tail=%j\n   %s', tail, tail, pl, re);
+	    var t = pl.type === '*' ? star : pl.type === '?' ? qmark : '\\' + pl.type;
+
+	    hasMagic = true;
+	    re = re.slice(0, pl.reStart) + t + '\\(' + tail;
+	  }
+
+	  // handle trailing things that only matter at the very end.
+	  clearStateChar();
+	  if (escaping) {
+	    // trailing \\
+	    re += '\\\\';
+	  }
+
+	  // only need to apply the nodot start if the re starts with
+	  // something that could conceivably capture a dot
+	  var addPatternStart = false;
+	  switch (re.charAt(0)) {
+	    case '.':
+	    case '[':
+	    case '(':
+	      addPatternStart = true;
+	  }
+
+	  // Hack to work around lack of negative lookbehind in JS
+	  // A pattern like: *.!(x).!(y|z) needs to ensure that a name
+	  // like 'a.xyz.yz' doesn't match.  So, the first negative
+	  // lookahead, has to look ALL the way ahead, to the end of
+	  // the pattern.
+	  for (var n = negativeLists.length - 1; n > -1; n--) {
+	    var nl = negativeLists[n];
+
+	    var nlBefore = re.slice(0, nl.reStart);
+	    var nlFirst = re.slice(nl.reStart, nl.reEnd - 8);
+	    var nlLast = re.slice(nl.reEnd - 8, nl.reEnd);
+	    var nlAfter = re.slice(nl.reEnd);
+
+	    nlLast += nlAfter;
+
+	    // Handle nested stuff like *(*.js|!(*.json)), where open parens
+	    // mean that we should *not* include the ) in the bit that is considered
+	    // "after" the negated section.
+	    var openParensBefore = nlBefore.split('(').length - 1;
+	    var cleanAfter = nlAfter;
+	    for (i = 0; i < openParensBefore; i++) {
+	      cleanAfter = cleanAfter.replace(/\)[+*?]?/, '');
+	    }
+	    nlAfter = cleanAfter;
+
+	    var dollar = '';
+	    if (nlAfter === '' && isSub !== SUBPARSE) {
+	      dollar = '$';
+	    }
+	    var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast;
+	    re = newRe;
+	  }
+
+	  // if the re is not "" at this point, then we need to make sure
+	  // it doesn't match against an empty path part.
+	  // Otherwise a/* will match a/, which it should not.
+	  if (re !== '' && hasMagic) {
+	    re = '(?=.)' + re;
+	  }
+
+	  if (addPatternStart) {
+	    re = patternStart + re;
+	  }
+
+	  // parsing just a piece of a larger pattern.
+	  if (isSub === SUBPARSE) {
+	    return [re, hasMagic];
+	  }
+
+	  // skip the regexp for non-magical patterns
+	  // unescape anything in it, though, so that it'll be
+	  // an exact match against a file etc.
+	  if (!hasMagic) {
+	    return globUnescape(pattern);
+	  }
+
+	  var flags = options.nocase ? 'i' : '';
+	  try {
+	    var regExp = new RegExp('^' + re + '$', flags);
+	  } catch (er) {
+	    // If it was an invalid regular expression, then it can't match
+	    // anything.  This trick looks for a character after the end of
+	    // the string, which is of course impossible, except in multi-line
+	    // mode, but it's not a /m regex.
+	    return new RegExp('$.');
+	  }
+
+	  regExp._glob = pattern;
+	  regExp._src = re;
+
+	  return regExp;
+	}
+
+	minimatch.makeRe = function (pattern, options) {
+	  return new Minimatch(pattern, options || {}).makeRe();
+	};
+
+	Minimatch.prototype.makeRe = makeRe;
+	function makeRe() {
+	  if (this.regexp || this.regexp === false) return this.regexp;
+
+	  // at this point, this.set is a 2d array of partial
+	  // pattern strings, or "**".
+	  //
+	  // It's better to use .match().  This function shouldn't
+	  // be used, really, but it's pretty convenient sometimes,
+	  // when you just want to work with a regex.
+	  var set = this.set;
+
+	  if (!set.length) {
+	    this.regexp = false;
+	    return this.regexp;
+	  }
+	  var options = this.options;
+
+	  var twoStar = options.noglobstar ? star : options.dot ? twoStarDot : twoStarNoDot;
+	  var flags = options.nocase ? 'i' : '';
+
+	  var re = set.map(function (pattern) {
+	    return pattern.map(function (p) {
+	      return p === GLOBSTAR ? twoStar : typeof p === 'string' ? regExpEscape(p) : p._src;
+	    }).join('\\\/');
+	  }).join('|'
+
+	  // must match entire pattern
+	  // ending in a * or ** will make it less strict.
+	  );re = '^(?:' + re + ')$';
+
+	  // can match anything, as long as it's not this.
+	  if (this.negate) re = '^(?!' + re + ').*$';
+
+	  try {
+	    this.regexp = new RegExp(re, flags);
+	  } catch (ex) {
+	    this.regexp = false;
+	  }
+	  return this.regexp;
+	}
+
+	minimatch.match = function (list, pattern, options) {
+	  options = options || {};
+	  var mm = new Minimatch(pattern, options);
+	  list = list.filter(function (f) {
+	    return mm.match(f);
+	  });
+	  if (mm.options.nonull && !list.length) {
+	    list.push(pattern);
+	  }
+	  return list;
+	};
+
+	Minimatch.prototype.match = match;
+	function match(f, partial) {
+	  this.debug('match', f, this.pattern
+	  // short-circuit in the case of busted things.
+	  // comments, etc.
+	  );if (this.comment) return false;
+	  if (this.empty) return f === '';
+
+	  if (f === '/' && partial) return true;
+
+	  var options = this.options;
+
+	  // windows: need to use /, not \
+	  if (path.sep !== '/') {
+	    f = f.split(path.sep).join('/');
+	  }
+
+	  // treat the test path as a set of pathparts.
+	  f = f.split(slashSplit);
+	  this.debug(this.pattern, 'split', f
+
+	  // just ONE of the pattern sets in this.set needs to match
+	  // in order for it to be valid.  If negating, then just one
+	  // match means that we have failed.
+	  // Either way, return on the first hit.
+
+	  );var set = this.set;
+	  this.debug(this.pattern, 'set', set
+
+	  // Find the basename of the path by looking for the last non-empty segment
+	  );var filename;
+	  var i;
+	  for (i = f.length - 1; i >= 0; i--) {
+	    filename = f[i];
+	    if (filename) break;
+	  }
+
+	  for (i = 0; i < set.length; i++) {
+	    var pattern = set[i];
+	    var file = f;
+	    if (options.matchBase && pattern.length === 1) {
+	      file = [filename];
+	    }
+	    var hit = this.matchOne(file, pattern, partial);
+	    if (hit) {
+	      if (options.flipNegate) return true;
+	      return !this.negate;
+	    }
+	  }
+
+	  // didn't get any hits.  this is success if it's a negative
+	  // pattern, failure otherwise.
+	  if (options.flipNegate) return false;
+	  return this.negate;
+	}
+
+	// set partial to true to test if, for example,
+	// "/a/b" matches the start of "/*/b/*/d"
+	// Partial means, if you run out of file before you run
+	// out of pattern, then that's fine, as long as all
+	// the parts match.
+	Minimatch.prototype.matchOne = function (file, pattern, partial) {
+	  var options = this.options;
+
+	  this.debug('matchOne', { 'this': this, file: file, pattern: pattern });
+
+	  this.debug('matchOne', file.length, pattern.length);
+
+	  for (var fi = 0, pi = 0, fl = file.length, pl = pattern.length; fi < fl && pi < pl; fi++, pi++) {
+	    this.debug('matchOne loop');
+	    var p = pattern[pi];
+	    var f = file[fi];
+
+	    this.debug(pattern, p, f
+
+	    // should be impossible.
+	    // some invalid regexp stuff in the set.
+	    );if (p === false) return false;
+
+	    if (p === GLOBSTAR) {
+	      this.debug('GLOBSTAR', [pattern, p, f]
+
+	      // "**"
+	      // a/**/b/**/c would match the following:
+	      // a/b/x/y/z/c
+	      // a/x/y/z/b/c
+	      // a/b/x/b/x/c
+	      // a/b/c
+	      // To do this, take the rest of the pattern after
+	      // the **, and see if it would match the file remainder.
+	      // If so, return success.
+	      // If not, the ** "swallows" a segment, and try again.
+	      // This is recursively awful.
+	      //
+	      // a/**/b/**/c matching a/b/x/y/z/c
+	      // - a matches a
+	      // - doublestar
+	      //   - matchOne(b/x/y/z/c, b/**/c)
+	      //     - b matches b
+	      //     - doublestar
+	      //       - matchOne(x/y/z/c, c) -> no
+	      //       - matchOne(y/z/c, c) -> no
+	      //       - matchOne(z/c, c) -> no
+	      //       - matchOne(c, c) yes, hit
+	      );var fr = fi;
+	      var pr = pi + 1;
+	      if (pr === pl) {
+	        this.debug('** at the end'
+	        // a ** at the end will just swallow the rest.
+	        // We have found a match.
+	        // however, it will not swallow /.x, unless
+	        // options.dot is set.
+	        // . and .. are *never* matched by **, for explosively
+	        // exponential reasons.
+	        );for (; fi < fl; fi++) {
+	          if (file[fi] === '.' || file[fi] === '..' || !options.dot && file[fi].charAt(0) === '.') return false;
+	        }
+	        return true;
+	      }
+
+	      // ok, let's see if we can swallow whatever we can.
+	      while (fr < fl) {
+	        var swallowee = file[fr];
+
+	        this.debug('\nglobstar while', file, fr, pattern, pr, swallowee
+
+	        // XXX remove this slice.  Just pass the start index.
+	        );if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
+	          this.debug('globstar found match!', fr, fl, swallowee
+	          // found a match.
+	          );return true;
+	        } else {
+	          // can't swallow "." or ".." ever.
+	          // can only swallow ".foo" when explicitly asked.
+	          if (swallowee === '.' || swallowee === '..' || !options.dot && swallowee.charAt(0) === '.') {
+	            this.debug('dot detected!', file, fr, pattern, pr);
+	            break;
+	          }
+
+	          // ** swallows a segment, and continue.
+	          this.debug('globstar swallow a segment, and continue');
+	          fr++;
+	        }
+	      }
+
+	      // no match was found.
+	      // However, in partial mode, we can't say this is necessarily over.
+	      // If there's more *pattern* left, then
+	      if (partial) {
+	        // ran out of file
+	        this.debug('\n>>> no match, partial?', file, fr, pattern, pr);
+	        if (fr === fl) return true;
+	      }
+	      return false;
+	    }
+
+	    // something other than **
+	    // non-magic patterns just have to match exactly
+	    // patterns with magic have been turned into regexps.
+	    var hit;
+	    if (typeof p === 'string') {
+	      if (options.nocase) {
+	        hit = f.toLowerCase() === p.toLowerCase();
+	      } else {
+	        hit = f === p;
+	      }
+	      this.debug('string match', p, f, hit);
+	    } else {
+	      hit = f.match(p);
+	      this.debug('pattern match', p, f, hit);
+	    }
+
+	    if (!hit) return false;
+	  }
+
+	  // Note: ending in / means that we'll get a final ""
+	  // at the end of the pattern.  This can only match a
+	  // corresponding "" at the end of the file.
+	  // If the file ends in /, then it can only match a
+	  // a pattern that ends in /, unless the pattern just
+	  // doesn't have any more for it. But, a/b/ should *not*
+	  // match "a/b/*", even though "" matches against the
+	  // [^/]*? pattern, except in partial mode, where it might
+	  // simply not be reached yet.
+	  // However, a/b/ should still satisfy a/*
+
+	  // now either we fell off the end of the pattern, or we're done.
+	  if (fi === fl && pi === pl) {
+	    // ran out of pattern and filename at the same time.
+	    // an exact hit!
+	    return true;
+	  } else if (fi === fl) {
+	    // ran out of file, but still had pattern left.
+	    // this is ok if we're doing the match as part of
+	    // a glob fs traversal.
+	    return partial;
+	  } else if (pi === pl) {
+	    // ran out of pattern, still have file left.
+	    // this is only acceptable if we're on the very last
+	    // empty segment of a file with a trailing slash.
+	    // a/* should match a/b/
+	    var emptyFileEnd = fi === fl - 1 && file[fi] === '';
+	    return emptyFileEnd;
+	  }
+
+	  // should be unreachable.
+	  throw new Error('wtf?');
+	};
+
+	// replace stuff like \* with *
+	function globUnescape(s) {
+	  return s.replace(/\\(.)/g, '$1');
+	}
+
+	function regExpEscape(s) {
+	  return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+	}
+
+/***/ }),
+/* 593 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	/**
+	 * Helpers.
+	 */
+
+	var s = 1000;
+	var m = s * 60;
+	var h = m * 60;
+	var d = h * 24;
+	var y = d * 365.25;
+
+	/**
+	 * Parse or format the given `val`.
+	 *
+	 * Options:
+	 *
+	 *  - `long` verbose formatting [false]
+	 *
+	 * @param {String|Number} val
+	 * @param {Object} [options]
+	 * @throws {Error} throw an error if val is not a non-empty string or a number
+	 * @return {String|Number}
+	 * @api public
+	 */
+
+	module.exports = function (val, options) {
+	  options = options || {};
+	  var type = typeof val === 'undefined' ? 'undefined' : _typeof(val);
+	  if (type === 'string' && val.length > 0) {
+	    return parse(val);
+	  } else if (type === 'number' && isNaN(val) === false) {
+	    return options.long ? fmtLong(val) : fmtShort(val);
+	  }
+	  throw new Error('val is not a non-empty string or a valid number. val=' + JSON.stringify(val));
+	};
+
+	/**
+	 * Parse the given `str` and return milliseconds.
+	 *
+	 * @param {String} str
+	 * @return {Number}
+	 * @api private
+	 */
+
+	function parse(str) {
+	  str = String(str);
+	  if (str.length > 100) {
+	    return;
+	  }
+	  var match = /^((?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|years?|yrs?|y)?$/i.exec(str);
+	  if (!match) {
+	    return;
+	  }
+	  var n = parseFloat(match[1]);
+	  var type = (match[2] || 'ms').toLowerCase();
+	  switch (type) {
+	    case 'years':
+	    case 'year':
+	    case 'yrs':
+	    case 'yr':
+	    case 'y':
+	      return n * y;
+	    case 'days':
+	    case 'day':
+	    case 'd':
+	      return n * d;
+	    case 'hours':
+	    case 'hour':
+	    case 'hrs':
+	    case 'hr':
+	    case 'h':
+	      return n * h;
+	    case 'minutes':
+	    case 'minute':
+	    case 'mins':
+	    case 'min':
+	    case 'm':
+	      return n * m;
+	    case 'seconds':
+	    case 'second':
+	    case 'secs':
+	    case 'sec':
+	    case 's':
+	      return n * s;
+	    case 'milliseconds':
+	    case 'millisecond':
+	    case 'msecs':
+	    case 'msec':
+	    case 'ms':
+	      return n;
+	    default:
+	      return undefined;
+	  }
+	}
+
+	/**
+	 * Short format for `ms`.
+	 *
+	 * @param {Number} ms
+	 * @return {String}
+	 * @api private
+	 */
+
+	function fmtShort(ms) {
+	  if (ms >= d) {
+	    return Math.round(ms / d) + 'd';
+	  }
+	  if (ms >= h) {
+	    return Math.round(ms / h) + 'h';
+	  }
+	  if (ms >= m) {
+	    return Math.round(ms / m) + 'm';
+	  }
+	  if (ms >= s) {
+	    return Math.round(ms / s) + 's';
+	  }
+	  return ms + 'ms';
+	}
+
+	/**
+	 * Long format for `ms`.
+	 *
+	 * @param {Number} ms
+	 * @return {String}
+	 * @api private
+	 */
+
+	function fmtLong(ms) {
+	  return plural(ms, d, 'day') || plural(ms, h, 'hour') || plural(ms, m, 'minute') || plural(ms, s, 'second') || ms + ' ms';
+	}
+
+	/**
+	 * Pluralization helper.
+	 */
+
+	function plural(ms, n, name) {
+	  if (ms < n) {
+	    return;
+	  }
+	  if (ms < n * 1.5) {
+	    return Math.floor(ms / n) + ' ' + name;
+	  }
+	  return Math.ceil(ms / n) + ' ' + name + 's';
+	}
+
+/***/ }),
+/* 594 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	module.exports = Number.isNaN || function (x) {
+		return x !== x;
+	};
+
+/***/ }),
+/* 595 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {'use strict';
+
+	function posix(path) {
+		return path.charAt(0) === '/';
+	}
+
+	function win32(path) {
+		// https://github.com/nodejs/node/blob/b3fcc245fb25539909ef1d5eaa01dbf92e168633/lib/path.js#L56
+		var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/;
+		var result = splitDeviceRe.exec(path);
+		var device = result[1] || '';
+		var isUnc = Boolean(device && device.charAt(1) !== ':');
+
+		// UNC paths are always absolute
+		return Boolean(result[2] || isUnc);
+	}
+
+	module.exports = process.platform === 'win32' ? win32 : posix;
+	module.exports.posix = posix;
+	module.exports.win32 = win32;
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 596 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _keys = __webpack_require__(13);
+
+	var _keys2 = _interopRequireDefault(_keys);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var hasOwn = Object.prototype.hasOwnProperty;
+
+	// The hoist function takes a FunctionExpression or FunctionDeclaration
+	// and replaces any Declaration nodes in its body with assignments, then
+	// returns a VariableDeclaration containing just the names of the removed
+	// declarations.
+	/**
+	 * Copyright (c) 2014, Facebook, Inc.
+	 * All rights reserved.
+	 *
+	 * This source code is licensed under the BSD-style license found in the
+	 * https://raw.github.com/facebook/regenerator/master/LICENSE file. An
+	 * additional grant of patent rights can be found in the PATENTS file in
+	 * the same directory.
+	 */
+
+	exports.hoist = function (funPath) {
+	  t.assertFunction(funPath.node);
+
+	  var vars = {};
+
+	  function varDeclToExpr(vdec, includeIdentifiers) {
+	    t.assertVariableDeclaration(vdec);
+	    // TODO assert.equal(vdec.kind, "var");
+	    var exprs = [];
+
+	    vdec.declarations.forEach(function (dec) {
+	      // Note: We duplicate 'dec.id' here to ensure that the variable declaration IDs don't
+	      // have the same 'loc' value, since that can make sourcemaps and retainLines behave poorly.
+	      vars[dec.id.name] = t.identifier(dec.id.name);
+
+	      if (dec.init) {
+	        exprs.push(t.assignmentExpression("=", dec.id, dec.init));
+	      } else if (includeIdentifiers) {
+	        exprs.push(dec.id);
+	      }
+	    });
+
+	    if (exprs.length === 0) return null;
+
+	    if (exprs.length === 1) return exprs[0];
+
+	    return t.sequenceExpression(exprs);
+	  }
+
+	  funPath.get("body").traverse({
+	    VariableDeclaration: {
+	      exit: function exit(path) {
+	        var expr = varDeclToExpr(path.node, false);
+	        if (expr === null) {
+	          path.remove();
+	        } else {
+	          // We don't need to traverse this expression any further because
+	          // there can't be any new declarations inside an expression.
+	          path.replaceWith(t.expressionStatement(expr));
+	        }
+
+	        // Since the original node has been either removed or replaced,
+	        // avoid traversing it any further.
+	        path.skip();
+	      }
+	    },
+
+	    ForStatement: function ForStatement(path) {
+	      var init = path.node.init;
+	      if (t.isVariableDeclaration(init)) {
+	        path.get("init").replaceWith(varDeclToExpr(init, false));
+	      }
+	    },
+
+	    ForXStatement: function ForXStatement(path) {
+	      var left = path.get("left");
+	      if (left.isVariableDeclaration()) {
+	        left.replaceWith(varDeclToExpr(left.node, true));
+	      }
+	    },
+
+	    FunctionDeclaration: function FunctionDeclaration(path) {
+	      var node = path.node;
+	      vars[node.id.name] = node.id;
+
+	      var assignment = t.expressionStatement(t.assignmentExpression("=", node.id, t.functionExpression(node.id, node.params, node.body, node.generator, node.expression)));
+
+	      if (path.parentPath.isBlockStatement()) {
+	        // Insert the assignment form before the first statement in the
+	        // enclosing block.
+	        path.parentPath.unshiftContainer("body", assignment);
+
+	        // Remove the function declaration now that we've inserted the
+	        // equivalent assignment form at the beginning of the block.
+	        path.remove();
+	      } else {
+	        // If the parent node is not a block statement, then we can just
+	        // replace the declaration with the equivalent assignment form
+	        // without worrying about hoisting it.
+	        path.replaceWith(assignment);
+	      }
+
+	      // Don't hoist variables out of inner functions.
+	      path.skip();
+	    },
+
+	    FunctionExpression: function FunctionExpression(path) {
+	      // Don't descend into nested function expressions.
+	      path.skip();
+	    }
+	  });
+
+	  var paramNames = {};
+	  funPath.get("params").forEach(function (paramPath) {
+	    var param = paramPath.node;
+	    if (t.isIdentifier(param)) {
+	      paramNames[param.name] = param;
+	    } else {
+	      // Variables declared by destructuring parameter patterns will be
+	      // harmlessly re-declared.
+	    }
+	  });
+
+	  var declarations = [];
+
+	  (0, _keys2.default)(vars).forEach(function (name) {
+	    if (!hasOwn.call(paramNames, name)) {
+	      declarations.push(t.variableDeclarator(vars[name], null));
+	    }
+	  });
+
+	  if (declarations.length === 0) {
+	    return null; // Be sure to handle this case!
+	  }
+
+	  return t.variableDeclaration("var", declarations);
+	};
+
+/***/ }),
+/* 597 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+
+	exports.default = function () {
+	  return __webpack_require__(601);
+	};
+
+/***/ }),
+/* 598 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _assert = __webpack_require__(62);
+
+	var _assert2 = _interopRequireDefault(_assert);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _util = __webpack_require__(116);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	function Entry() {
+	  _assert2.default.ok(this instanceof Entry);
+	} /**
+	   * Copyright (c) 2014, Facebook, Inc.
+	   * All rights reserved.
+	   *
+	   * This source code is licensed under the BSD-style license found in the
+	   * https://raw.github.com/facebook/regenerator/master/LICENSE file. An
+	   * additional grant of patent rights can be found in the PATENTS file in
+	   * the same directory.
+	   */
+
+	function FunctionEntry(returnLoc) {
+	  Entry.call(this);
+	  t.assertLiteral(returnLoc);
+	  this.returnLoc = returnLoc;
+	}
+
+	(0, _util.inherits)(FunctionEntry, Entry);
+	exports.FunctionEntry = FunctionEntry;
+
+	function LoopEntry(breakLoc, continueLoc, label) {
+	  Entry.call(this);
+
+	  t.assertLiteral(breakLoc);
+	  t.assertLiteral(continueLoc);
+
+	  if (label) {
+	    t.assertIdentifier(label);
+	  } else {
+	    label = null;
+	  }
+
+	  this.breakLoc = breakLoc;
+	  this.continueLoc = continueLoc;
+	  this.label = label;
+	}
+
+	(0, _util.inherits)(LoopEntry, Entry);
+	exports.LoopEntry = LoopEntry;
+
+	function SwitchEntry(breakLoc) {
+	  Entry.call(this);
+	  t.assertLiteral(breakLoc);
+	  this.breakLoc = breakLoc;
+	}
+
+	(0, _util.inherits)(SwitchEntry, Entry);
+	exports.SwitchEntry = SwitchEntry;
+
+	function TryEntry(firstLoc, catchEntry, finallyEntry) {
+	  Entry.call(this);
+
+	  t.assertLiteral(firstLoc);
+
+	  if (catchEntry) {
+	    _assert2.default.ok(catchEntry instanceof CatchEntry);
+	  } else {
+	    catchEntry = null;
+	  }
+
+	  if (finallyEntry) {
+	    _assert2.default.ok(finallyEntry instanceof FinallyEntry);
+	  } else {
+	    finallyEntry = null;
+	  }
+
+	  // Have to have one or the other (or both).
+	  _assert2.default.ok(catchEntry || finallyEntry);
+
+	  this.firstLoc = firstLoc;
+	  this.catchEntry = catchEntry;
+	  this.finallyEntry = finallyEntry;
+	}
+
+	(0, _util.inherits)(TryEntry, Entry);
+	exports.TryEntry = TryEntry;
+
+	function CatchEntry(firstLoc, paramId) {
+	  Entry.call(this);
+
+	  t.assertLiteral(firstLoc);
+	  t.assertIdentifier(paramId);
+
+	  this.firstLoc = firstLoc;
+	  this.paramId = paramId;
+	}
+
+	(0, _util.inherits)(CatchEntry, Entry);
+	exports.CatchEntry = CatchEntry;
+
+	function FinallyEntry(firstLoc, afterLoc) {
+	  Entry.call(this);
+	  t.assertLiteral(firstLoc);
+	  t.assertLiteral(afterLoc);
+	  this.firstLoc = firstLoc;
+	  this.afterLoc = afterLoc;
+	}
+
+	(0, _util.inherits)(FinallyEntry, Entry);
+	exports.FinallyEntry = FinallyEntry;
+
+	function LabeledEntry(breakLoc, label) {
+	  Entry.call(this);
+
+	  t.assertLiteral(breakLoc);
+	  t.assertIdentifier(label);
+
+	  this.breakLoc = breakLoc;
+	  this.label = label;
+	}
+
+	(0, _util.inherits)(LabeledEntry, Entry);
+	exports.LabeledEntry = LabeledEntry;
+
+	function LeapManager(emitter) {
+	  _assert2.default.ok(this instanceof LeapManager);
+
+	  var Emitter = __webpack_require__(278).Emitter;
+	  _assert2.default.ok(emitter instanceof Emitter);
+
+	  this.emitter = emitter;
+	  this.entryStack = [new FunctionEntry(emitter.finalLoc)];
+	}
+
+	var LMp = LeapManager.prototype;
+	exports.LeapManager = LeapManager;
+
+	LMp.withEntry = function (entry, callback) {
+	  _assert2.default.ok(entry instanceof Entry);
+	  this.entryStack.push(entry);
+	  try {
+	    callback.call(this.emitter);
+	  } finally {
+	    var popped = this.entryStack.pop();
+	    _assert2.default.strictEqual(popped, entry);
+	  }
+	};
+
+	LMp._findLeapLocation = function (property, label) {
+	  for (var i = this.entryStack.length - 1; i >= 0; --i) {
+	    var entry = this.entryStack[i];
+	    var loc = entry[property];
+	    if (loc) {
+	      if (label) {
+	        if (entry.label && entry.label.name === label.name) {
+	          return loc;
+	        }
+	      } else if (entry instanceof LabeledEntry) {
+	        // Ignore LabeledEntry entries unless we are actually breaking to
+	        // a label.
+	      } else {
+	        return loc;
+	      }
+	    }
+	  }
+
+	  return null;
+	};
+
+	LMp.getBreakLoc = function (label) {
+	  return this._findLeapLocation("breakLoc", label);
+	};
+
+	LMp.getContinueLoc = function (label) {
+	  return this._findLeapLocation("continueLoc", label);
+	};
+
+/***/ }),
+/* 599 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _assert = __webpack_require__(62);
+
+	var _assert2 = _interopRequireDefault(_assert);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	var m = __webpack_require__(276).makeAccessor(); /**
+	                                            * Copyright (c) 2014, Facebook, Inc.
+	                                            * All rights reserved.
+	                                            *
+	                                            * This source code is licensed under the BSD-style license found in the
+	                                            * https://raw.github.com/facebook/regenerator/master/LICENSE file. An
+	                                            * additional grant of patent rights can be found in the PATENTS file in
+	                                            * the same directory.
+	                                            */
+
+	var hasOwn = Object.prototype.hasOwnProperty;
+
+	function makePredicate(propertyName, knownTypes) {
+	  function onlyChildren(node) {
+	    t.assertNode(node);
+
+	    // Assume no side effects until we find out otherwise.
+	    var result = false;
+
+	    function check(child) {
+	      if (result) {
+	        // Do nothing.
+	      } else if (Array.isArray(child)) {
+	        child.some(check);
+	      } else if (t.isNode(child)) {
+	        _assert2.default.strictEqual(result, false);
+	        result = predicate(child);
+	      }
+	      return result;
+	    }
+
+	    var keys = t.VISITOR_KEYS[node.type];
+	    if (keys) {
+	      for (var i = 0; i < keys.length; i++) {
+	        var key = keys[i];
+	        var child = node[key];
+	        check(child);
+	      }
+	    }
+
+	    return result;
+	  }
+
+	  function predicate(node) {
+	    t.assertNode(node);
+
+	    var meta = m(node);
+	    if (hasOwn.call(meta, propertyName)) return meta[propertyName];
+
+	    // Certain types are "opaque," which means they have no side
+	    // effects or leaps and we don't care about their subexpressions.
+	    if (hasOwn.call(opaqueTypes, node.type)) return meta[propertyName] = false;
+
+	    if (hasOwn.call(knownTypes, node.type)) return meta[propertyName] = true;
+
+	    return meta[propertyName] = onlyChildren(node);
+	  }
+
+	  predicate.onlyChildren = onlyChildren;
+
+	  return predicate;
+	}
+
+	var opaqueTypes = {
+	  FunctionExpression: true,
+	  ArrowFunctionExpression: true
+	};
+
+	// These types potentially have side effects regardless of what side
+	// effects their subexpressions have.
+	var sideEffectTypes = {
+	  CallExpression: true, // Anything could happen!
+	  ForInStatement: true, // Modifies the key variable.
+	  UnaryExpression: true, // Think delete.
+	  BinaryExpression: true, // Might invoke .toString() or .valueOf().
+	  AssignmentExpression: true, // Side-effecting by definition.
+	  UpdateExpression: true, // Updates are essentially assignments.
+	  NewExpression: true // Similar to CallExpression.
+	};
+
+	// These types are the direct cause of all leaps in control flow.
+	var leapTypes = {
+	  YieldExpression: true,
+	  BreakStatement: true,
+	  ContinueStatement: true,
+	  ReturnStatement: true,
+	  ThrowStatement: true
+	};
+
+	// All leap types are also side effect types.
+	for (var type in leapTypes) {
+	  if (hasOwn.call(leapTypes, type)) {
+	    sideEffectTypes[type] = leapTypes[type];
+	  }
+	}
+
+	exports.hasSideEffects = makePredicate("hasSideEffects", sideEffectTypes);
+	exports.containsLeap = makePredicate("containsLeap", leapTypes);
+
+/***/ }),
+/* 600 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	exports.__esModule = true;
+	exports.default = replaceShorthandObjectMethod;
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	// this function converts a shorthand object generator method into a normal
+	// (non-shorthand) object property which is a generator function expression. for
+	// example, this:
+	//
+	//  var foo = {
+	//    *bar(baz) { return 5; }
+	//  }
+	//
+	// should be replaced with:
+	//
+	//  var foo = {
+	//    bar: function*(baz) { return 5; }
+	//  }
+	//
+	// to do this, it clones the parameter array and the body of the object generator
+	// method into a new FunctionExpression.
+	//
+	// this method can be passed any Function AST node path, and it will return
+	// either:
+	//   a) the path that was passed in (iff the path did not need to be replaced) or
+	//   b) the path of the new FunctionExpression that was created as a replacement
+	//     (iff the path did need to be replaced)
+	//
+	// In either case, though, the caller can count on the fact that the return value
+	// is a Function AST node path.
+	//
+	// If this function is called with an AST node path that is not a Function (or with an
+	// argument that isn't an AST node path), it will throw an error.
+	function replaceShorthandObjectMethod(path) {
+	  if (!path.node || !t.isFunction(path.node)) {
+	    throw new Error("replaceShorthandObjectMethod can only be called on Function AST node paths.");
+	  }
+
+	  // this function only replaces shorthand object methods (called ObjectMethod
+	  // in Babel-speak).
+	  if (!t.isObjectMethod(path.node)) {
+	    return path;
+	  }
+
+	  // this function only replaces generators.
+	  if (!path.node.generator) {
+	    return path;
+	  }
+
+	  var parameters = path.node.params.map(function (param) {
+	    return t.cloneDeep(param);
+	  });
+
+	  var functionExpression = t.functionExpression(null, // id
+	  parameters, // params
+	  t.cloneDeep(path.node.body), // body
+	  path.node.generator, path.node.async);
+
+	  path.replaceWith(t.objectProperty(t.cloneDeep(path.node.key), // key
+	  functionExpression, //value
+	  path.node.computed, // computed
+	  false // shorthand
+	  ));
+
+	  // path now refers to the ObjectProperty AST node path, but we want to return a
+	  // Function AST node path for the function expression we created. we know that
+	  // the FunctionExpression we just created is the value of the ObjectProperty,
+	  // so return the "value" path off of this path.
+	  return path.get("value");
+	}
+
+/***/ }),
+/* 601 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	var _assert = __webpack_require__(62);
+
+	var _assert2 = _interopRequireDefault(_assert);
+
+	var _babelTypes = __webpack_require__(1);
+
+	var t = _interopRequireWildcard(_babelTypes);
+
+	var _hoist = __webpack_require__(596);
+
+	var _emit = __webpack_require__(278);
+
+	var _replaceShorthandObjectMethod = __webpack_require__(600);
+
+	var _replaceShorthandObjectMethod2 = _interopRequireDefault(_replaceShorthandObjectMethod);
+
+	var _util = __webpack_require__(279);
+
+	var util = _interopRequireWildcard(_util);
+
+	function _interopRequireWildcard(obj) {
+	  if (obj && obj.__esModule) {
+	    return obj;
+	  } else {
+	    var newObj = {};if (obj != null) {
+	      for (var key in obj) {
+	        if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
+	      }
+	    }newObj.default = obj;return newObj;
+	  }
+	}
+
+	function _interopRequireDefault(obj) {
+	  return obj && obj.__esModule ? obj : { default: obj };
+	}
+
+	/**
+	 * Copyright (c) 2014, Facebook, Inc.
+	 * All rights reserved.
+	 *
+	 * This source code is licensed under the BSD-style license found in the
+	 * https://raw.github.com/facebook/regenerator/master/LICENSE file. An
+	 * additional grant of patent rights can be found in the PATENTS file in
+	 * the same directory.
+	 */
+
+	var getMarkInfo = __webpack_require__(276).makeAccessor();
+
+	exports.visitor = {
+	  Function: {
+	    exit: function exit(path, state) {
+	      var node = path.node;
+
+	      if (node.generator) {
+	        if (node.async) {
+	          // Async generator
+	          if (state.opts.asyncGenerators === false) return;
+	        } else {
+	          // Plain generator
+	          if (state.opts.generators === false) return;
+	        }
+	      } else if (node.async) {
+	        // Async function
+	        if (state.opts.async === false) return;
+	      } else {
+	        // Not a generator or async function.
+	        return;
+	      }
+
+	      // if this is an ObjectMethod, we need to convert it to an ObjectProperty
+	      path = (0, _replaceShorthandObjectMethod2.default)(path);
+	      node = path.node;
+
+	      var contextId = path.scope.generateUidIdentifier("context");
+	      var argsId = path.scope.generateUidIdentifier("args");
+
+	      path.ensureBlock();
+	      var bodyBlockPath = path.get("body");
+
+	      if (node.async) {
+	        bodyBlockPath.traverse(awaitVisitor);
+	      }
+
+	      bodyBlockPath.traverse(functionSentVisitor, {
+	        context: contextId
+	      });
+
+	      var outerBody = [];
+	      var innerBody = [];
+
+	      bodyBlockPath.get("body").forEach(function (childPath) {
+	        var node = childPath.node;
+	        if (t.isExpressionStatement(node) && t.isStringLiteral(node.expression)) {
+	          // Babylon represents directives like "use strict" as elements
+	          // of a bodyBlockPath.node.directives array, but they could just
+	          // as easily be represented (by other parsers) as traditional
+	          // string-literal-valued expression statements, so we need to
+	          // handle that here. (#248)
+	          outerBody.push(node);
+	        } else if (node && node._blockHoist != null) {
+	          outerBody.push(node);
+	        } else {
+	          innerBody.push(node);
+	        }
+	      });
+
+	      if (outerBody.length > 0) {
+	        // Only replace the inner body if we actually hoisted any statements
+	        // to the outer body.
+	        bodyBlockPath.node.body = innerBody;
+	      }
+
+	      var outerFnExpr = getOuterFnExpr(path);
+	      // Note that getOuterFnExpr has the side-effect of ensuring that the
+	      // function has a name (so node.id will always be an Identifier), even
+	      // if a temporary name has to be synthesized.
+	      t.assertIdentifier(node.id);
+	      var innerFnId = t.identifier(node.id.name + "$");
+
+	      // Turn all declarations into vars, and replace the original
+	      // declarations with equivalent assignment expressions.
+	      var vars = (0, _hoist.hoist)(path);
+
+	      var didRenameArguments = renameArguments(path, argsId);
+	      if (didRenameArguments) {
+	        vars = vars || t.variableDeclaration("var", []);
+	        var argumentIdentifier = t.identifier("arguments");
+	        // we need to do this as otherwise arguments in arrow functions gets hoisted
+	        argumentIdentifier._shadowedFunctionLiteral = path;
+	        vars.declarations.push(t.variableDeclarator(argsId, argumentIdentifier));
+	      }
+
+	      var emitter = new _emit.Emitter(contextId);
+	      emitter.explode(path.get("body"));
+
+	      if (vars && vars.declarations.length > 0) {
+	        outerBody.push(vars);
+	      }
+
+	      var wrapArgs = [emitter.getContextFunction(innerFnId),
+	      // Async functions that are not generators don't care about the
+	      // outer function because they don't need it to be marked and don't
+	      // inherit from its .prototype.
+	      node.generator ? outerFnExpr : t.nullLiteral(), t.thisExpression()];
+
+	      var tryLocsList = emitter.getTryLocsList();
+	      if (tryLocsList) {
+	        wrapArgs.push(tryLocsList);
+	      }
+
+	      var wrapCall = t.callExpression(util.runtimeProperty(node.async ? "async" : "wrap"), wrapArgs);
+
+	      outerBody.push(t.returnStatement(wrapCall));
+	      node.body = t.blockStatement(outerBody);
+
+	      var oldDirectives = bodyBlockPath.node.directives;
+	      if (oldDirectives) {
+	        // Babylon represents directives like "use strict" as elements of
+	        // a bodyBlockPath.node.directives array. (#248)
+	        node.body.directives = oldDirectives;
+	      }
+
+	      var wasGeneratorFunction = node.generator;
+	      if (wasGeneratorFunction) {
+	        node.generator = false;
+	      }
+
+	      if (node.async) {
+	        node.async = false;
+	      }
+
+	      if (wasGeneratorFunction && t.isExpression(node)) {
+	        path.replaceWith(t.callExpression(util.runtimeProperty("mark"), [node]));
+	      }
+
+	      // Generators are processed in 'exit' handlers so that regenerator only has to run on
+	      // an ES5 AST, but that means traversal will not pick up newly inserted references
+	      // to things like 'regeneratorRuntime'. To avoid this, we explicitly requeue.
+	      path.requeue();
+	    }
+	  }
+	};
+
+	// Given a NodePath for a Function, return an Expression node that can be
+	// used to refer reliably to the function object from inside the function.
+	// This expression is essentially a replacement for arguments.callee, with
+	// the key advantage that it works in strict mode.
+	function getOuterFnExpr(funPath) {
+	  var node = funPath.node;
+	  t.assertFunction(node);
+
+	  if (!node.id) {
+	    // Default-exported function declarations, and function expressions may not
+	    // have a name to reference, so we explicitly add one.
+	    node.id = funPath.scope.parent.generateUidIdentifier("callee");
+	  }
+
+	  if (node.generator && // Non-generator functions don't need to be marked.
+	  t.isFunctionDeclaration(node)) {
+	    var pp = funPath.findParent(function (path) {
+	      return path.isProgram() || path.isBlockStatement();
+	    });
+
+	    if (!pp) {
+	      return node.id;
+	    }
+
+	    var markDecl = getRuntimeMarkDecl(pp);
+	    var markedArray = markDecl.declarations[0].id;
+	    var funDeclIdArray = markDecl.declarations[0].init.callee.object;
+	    t.assertArrayExpression(funDeclIdArray);
+
+	    var index = funDeclIdArray.elements.length;
+	    funDeclIdArray.elements.push(node.id);
+
+	    return t.memberExpression(markedArray, t.numericLiteral(index), true);
+	  }
+
+	  return node.id;
+	}
+
+	function getRuntimeMarkDecl(blockPath) {
+	  var block = blockPath.node;
+	  _assert2.default.ok(Array.isArray(block.body));
+
+	  var info = getMarkInfo(block);
+	  if (info.decl) {
+	    return info.decl;
+	  }
+
+	  info.decl = t.variableDeclaration("var", [t.variableDeclarator(blockPath.scope.generateUidIdentifier("marked"), t.callExpression(t.memberExpression(t.arrayExpression([]), t.identifier("map"), false), [util.runtimeProperty("mark")]))]);
+
+	  blockPath.unshiftContainer("body", info.decl);
+
+	  return info.decl;
+	}
+
+	function renameArguments(funcPath, argsId) {
+	  var state = {
+	    didRenameArguments: false,
+	    argsId: argsId
+	  };
+
+	  funcPath.traverse(argumentsVisitor, state);
+
+	  // If the traversal replaced any arguments references, then we need to
+	  // alias the outer function's arguments binding (be it the implicit
+	  // arguments object or some other parameter or variable) to the variable
+	  // named by argsId.
+	  return state.didRenameArguments;
+	}
+
+	var argumentsVisitor = {
+	  "FunctionExpression|FunctionDeclaration": function FunctionExpressionFunctionDeclaration(path) {
+	    path.skip();
+	  },
+
+	  Identifier: function Identifier(path, state) {
+	    if (path.node.name === "arguments" && util.isReference(path)) {
+	      path.replaceWith(state.argsId);
+	      state.didRenameArguments = true;
+	    }
+	  }
+	};
+
+	var functionSentVisitor = {
+	  MetaProperty: function MetaProperty(path) {
+	    var node = path.node;
+
+	    if (node.meta.name === "function" && node.property.name === "sent") {
+	      path.replaceWith(t.memberExpression(this.context, t.identifier("_sent")));
+	    }
+	  }
+	};
+
+	var awaitVisitor = {
+	  Function: function Function(path) {
+	    path.skip(); // Don't descend into nested function scopes.
+	  },
+
+	  AwaitExpression: function AwaitExpression(path) {
+	    // Convert await expressions to yield expressions.
+	    var argument = path.node.argument;
+
+	    // Transforming `await x` to `yield regeneratorRuntime.awrap(x)`
+	    // causes the argument to be wrapped in such a way that the runtime
+	    // can distinguish between awaited and merely yielded values.
+	    path.replaceWith(t.yieldExpression(t.callExpression(util.runtimeProperty("awrap"), [argument]), false));
+	  }
+	};
+
+/***/ }),
+/* 602 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	// Generated by `/scripts/character-class-escape-sets.js`. Do not edit.
+	var regenerate = __webpack_require__(277);
+
+	exports.REGULAR = {
+		'd': regenerate().addRange(0x30, 0x39),
+		'D': regenerate().addRange(0x0, 0x2F).addRange(0x3A, 0xFFFF),
+		's': regenerate(0x20, 0xA0, 0x1680, 0x202F, 0x205F, 0x3000, 0xFEFF).addRange(0x9, 0xD).addRange(0x2000, 0x200A).addRange(0x2028, 0x2029),
+		'S': regenerate().addRange(0x0, 0x8).addRange(0xE, 0x1F).addRange(0x21, 0x9F).addRange(0xA1, 0x167F).addRange(0x1681, 0x1FFF).addRange(0x200B, 0x2027).addRange(0x202A, 0x202E).addRange(0x2030, 0x205E).addRange(0x2060, 0x2FFF).addRange(0x3001, 0xFEFE).addRange(0xFF00, 0xFFFF),
+		'w': regenerate(0x5F).addRange(0x30, 0x39).addRange(0x41, 0x5A).addRange(0x61, 0x7A),
+		'W': regenerate(0x60).addRange(0x0, 0x2F).addRange(0x3A, 0x40).addRange(0x5B, 0x5E).addRange(0x7B, 0xFFFF)
+	};
+
+	exports.UNICODE = {
+		'd': regenerate().addRange(0x30, 0x39),
+		'D': regenerate().addRange(0x0, 0x2F).addRange(0x3A, 0x10FFFF),
+		's': regenerate(0x20, 0xA0, 0x1680, 0x202F, 0x205F, 0x3000, 0xFEFF).addRange(0x9, 0xD).addRange(0x2000, 0x200A).addRange(0x2028, 0x2029),
+		'S': regenerate().addRange(0x0, 0x8).addRange(0xE, 0x1F).addRange(0x21, 0x9F).addRange(0xA1, 0x167F).addRange(0x1681, 0x1FFF).addRange(0x200B, 0x2027).addRange(0x202A, 0x202E).addRange(0x2030, 0x205E).addRange(0x2060, 0x2FFF).addRange(0x3001, 0xFEFE).addRange(0xFF00, 0x10FFFF),
+		'w': regenerate(0x5F).addRange(0x30, 0x39).addRange(0x41, 0x5A).addRange(0x61, 0x7A),
+		'W': regenerate(0x60).addRange(0x0, 0x2F).addRange(0x3A, 0x40).addRange(0x5B, 0x5E).addRange(0x7B, 0x10FFFF)
+	};
+
+	exports.UNICODE_IGNORE_CASE = {
+		'd': regenerate().addRange(0x30, 0x39),
+		'D': regenerate().addRange(0x0, 0x2F).addRange(0x3A, 0x10FFFF),
+		's': regenerate(0x20, 0xA0, 0x1680, 0x202F, 0x205F, 0x3000, 0xFEFF).addRange(0x9, 0xD).addRange(0x2000, 0x200A).addRange(0x2028, 0x2029),
+		'S': regenerate().addRange(0x0, 0x8).addRange(0xE, 0x1F).addRange(0x21, 0x9F).addRange(0xA1, 0x167F).addRange(0x1681, 0x1FFF).addRange(0x200B, 0x2027).addRange(0x202A, 0x202E).addRange(0x2030, 0x205E).addRange(0x2060, 0x2FFF).addRange(0x3001, 0xFEFE).addRange(0xFF00, 0x10FFFF),
+		'w': regenerate(0x5F, 0x17F, 0x212A).addRange(0x30, 0x39).addRange(0x41, 0x5A).addRange(0x61, 0x7A),
+		'W': regenerate(0x4B, 0x53, 0x60).addRange(0x0, 0x2F).addRange(0x3A, 0x40).addRange(0x5B, 0x5E).addRange(0x7B, 0x10FFFF)
+	};
+
+/***/ }),
+/* 603 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var generate = __webpack_require__(604).generate;
+	var parse = __webpack_require__(605).parse;
+	var regenerate = __webpack_require__(277);
+	var iuMappings = __webpack_require__(622);
+	var ESCAPE_SETS = __webpack_require__(602);
+
+	function getCharacterClassEscapeSet(character) {
+		if (unicode) {
+			if (ignoreCase) {
+				return ESCAPE_SETS.UNICODE_IGNORE_CASE[character];
+			}
+			return ESCAPE_SETS.UNICODE[character];
+		}
+		return ESCAPE_SETS.REGULAR[character];
+	}
+
+	var object = {};
+	var hasOwnProperty = object.hasOwnProperty;
+	function has(object, property) {
+		return hasOwnProperty.call(object, property);
+	}
+
+	// Prepare a Regenerate set containing all code points, used for negative
+	// character classes (if any).
+	var UNICODE_SET = regenerate().addRange(0x0, 0x10FFFF);
+	// Without the `u` flag, the range stops at 0xFFFF.
+	// https://mths.be/es6#sec-pattern-semantics
+	var BMP_SET = regenerate().addRange(0x0, 0xFFFF);
+
+	// Prepare a Regenerate set containing all code points that are supposed to be
+	// matched by `/./u`. https://mths.be/es6#sec-atom
+	var DOT_SET_UNICODE = UNICODE_SET.clone // all Unicode code points
+	().remove(
+	// minus `LineTerminator`s (https://mths.be/es6#sec-line-terminators):
+	0x000A, // Line Feed <LF>
+	0x000D, // Carriage Return <CR>
+	0x2028, // Line Separator <LS>
+	0x2029 // Paragraph Separator <PS>
+	);
+	// Prepare a Regenerate set containing all code points that are supposed to be
+	// matched by `/./` (only BMP code points).
+	var DOT_SET = DOT_SET_UNICODE.clone().intersection(BMP_SET);
+
+	// Add a range of code points + any case-folded code points in that range to a
+	// set.
+	regenerate.prototype.iuAddRange = function (min, max) {
+		var $this = this;
+		do {
+			var folded = caseFold(min);
+			if (folded) {
+				$this.add(folded);
+			}
+		} while (++min <= max);
+		return $this;
+	};
+
+	function assign(target, source) {
+		for (var key in source) {
+			// Note: `hasOwnProperty` is not needed here.
+			target[key] = source[key];
+		}
+	}
+
+	function update(item, pattern) {
+		// TODO: Test if memoizing `pattern` here is worth the effort.
+		if (!pattern) {
+			return;
+		}
+		var tree = parse(pattern, '');
+		switch (tree.type) {
+			case 'characterClass':
+			case 'group':
+			case 'value':
+				// No wrapping needed.
+				break;
+			default:
+				// Wrap the pattern in a non-capturing group.
+				tree = wrap(tree, pattern);
+		}
+		assign(item, tree);
+	}
+
+	function wrap(tree, pattern) {
+		// Wrap the pattern in a non-capturing group.
+		return {
+			'type': 'group',
+			'behavior': 'ignore',
+			'body': [tree],
+			'raw': '(?:' + pattern + ')'
+		};
+	}
+
+	function caseFold(codePoint) {
+		return has(iuMappings, codePoint) ? iuMappings[codePoint] : false;
+	}
+
+	var ignoreCase = false;
+	var unicode = false;
+	function processCharacterClass(characterClassItem) {
+		var set = regenerate();
+		var body = characterClassItem.body.forEach(function (item) {
+			switch (item.type) {
+				case 'value':
+					set.add(item.codePoint);
+					if (ignoreCase && unicode) {
+						var folded = caseFold(item.codePoint);
+						if (folded) {
+							set.add(folded);
+						}
+					}
+					break;
+				case 'characterClassRange':
+					var min = item.min.codePoint;
+					var max = item.max.codePoint;
+					set.addRange(min, max);
+					if (ignoreCase && unicode) {
+						set.iuAddRange(min, max);
+					}
+					break;
+				case 'characterClassEscape':
+					set.add(getCharacterClassEscapeSet(item.value));
+					break;
+				// The `default` clause is only here as a safeguard; it should never be
+				// reached. Code coverage tools should ignore it.
+				/* istanbul ignore next */
+				default:
+					throw Error('Unknown term type: ' + item.type);
+			}
+		});
+		if (characterClassItem.negative) {
+			set = (unicode ? UNICODE_SET : BMP_SET).clone().remove(set);
+		}
+		update(characterClassItem, set.toString());
+		return characterClassItem;
+	}
+
+	function processTerm(item) {
+		switch (item.type) {
+			case 'dot':
+				update(item, (unicode ? DOT_SET_UNICODE : DOT_SET).toString());
+				break;
+			case 'characterClass':
+				item = processCharacterClass(item);
+				break;
+			case 'characterClassEscape':
+				update(item, getCharacterClassEscapeSet(item.value).toString());
+				break;
+			case 'alternative':
+			case 'disjunction':
+			case 'group':
+			case 'quantifier':
+				item.body = item.body.map(processTerm);
+				break;
+			case 'value':
+				var codePoint = item.codePoint;
+				var set = regenerate(codePoint);
+				if (ignoreCase && unicode) {
+					var folded = caseFold(codePoint);
+					if (folded) {
+						set.add(folded);
+					}
+				}
+				update(item, set.toString());
+				break;
+			case 'anchor':
+			case 'empty':
+			case 'group':
+			case 'reference':
+				// Nothing to do here.
+				break;
+			// The `default` clause is only here as a safeguard; it should never be
+			// reached. Code coverage tools should ignore it.
+			/* istanbul ignore next */
+			default:
+				throw Error('Unknown term type: ' + item.type);
+		}
+		return item;
+	};
+
+	module.exports = function (pattern, flags) {
+		var tree = parse(pattern, flags);
+		ignoreCase = flags ? flags.indexOf('i') > -1 : false;
+		unicode = flags ? flags.indexOf('u') > -1 : false;
+		assign(tree, processTerm(tree));
+		return generate(tree);
+	};
+
+/***/ }),
+/* 604 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	var __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(module, global) {'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	/*!
+	 * RegJSGen
+	 * Copyright 2014 Benjamin Tan <https://d10.github.io/>
+	 * Available under MIT license <http://d10.mit-license.org/>
+	 */
+	;(function () {
+	  'use strict';
+
+	  /** Used to determine if values are of the language type `Object` */
+
+	  var objectTypes = {
+	    'function': true,
+	    'object': true
+	  };
+
+	  /** Used as a reference to the global object */
+	  var root = objectTypes[typeof window === 'undefined' ? 'undefined' : _typeof(window)] && window || this;
+
+	  /** Backup possible global object */
+	  var oldRoot = root;
+
+	  /** Detect free variable `exports` */
+	  var freeExports = objectTypes[ false ? 'undefined' : _typeof(exports)] && exports;
+
+	  /** Detect free variable `module` */
+	  var freeModule = objectTypes[ false ? 'undefined' : _typeof(module)] && module && !module.nodeType && module;
+
+	  /** Detect free variable `global` from Node.js or Browserified code and use it as `root` */
+	  var freeGlobal = freeExports && freeModule && (typeof global === 'undefined' ? 'undefined' : _typeof(global)) == 'object' && global;
+	  if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal || freeGlobal.self === freeGlobal)) {
+	    root = freeGlobal;
+	  }
+
+	  /*--------------------------------------------------------------------------*/
+
+	  /*! Based on https://mths.be/fromcodepoint v0.2.0 by @mathias */
+
+	  var stringFromCharCode = String.fromCharCode;
+	  var floor = Math.floor;
+	  function fromCodePoint() {
+	    var MAX_SIZE = 0x4000;
+	    var codeUnits = [];
+	    var highSurrogate;
+	    var lowSurrogate;
+	    var index = -1;
+	    var length = arguments.length;
+	    if (!length) {
+	      return '';
+	    }
+	    var result = '';
+	    while (++index < length) {
+	      var codePoint = Number(arguments[index]);
+	      if (!isFinite(codePoint) || // `NaN`, `+Infinity`, or `-Infinity`
+	      codePoint < 0 || // not a valid Unicode code point
+	      codePoint > 0x10FFFF || // not a valid Unicode code point
+	      floor(codePoint) != codePoint // not an integer
+	      ) {
+	          throw RangeError('Invalid code point: ' + codePoint);
+	        }
+	      if (codePoint <= 0xFFFF) {
+	        // BMP code point
+	        codeUnits.push(codePoint);
+	      } else {
+	        // Astral code point; split in surrogate halves
+	        // http://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae
+	        codePoint -= 0x10000;
+	        highSurrogate = (codePoint >> 10) + 0xD800;
+	        lowSurrogate = codePoint % 0x400 + 0xDC00;
+	        codeUnits.push(highSurrogate, lowSurrogate);
+	      }
+	      if (index + 1 == length || codeUnits.length > MAX_SIZE) {
+	        result += stringFromCharCode.apply(null, codeUnits);
+	        codeUnits.length = 0;
+	      }
+	    }
+	    return result;
+	  }
+
+	  function assertType(type, expected) {
+	    if (expected.indexOf('|') == -1) {
+	      if (type == expected) {
+	        return;
+	      }
+
+	      throw Error('Invalid node type: ' + type);
+	    }
+
+	    expected = assertType.hasOwnProperty(expected) ? assertType[expected] : assertType[expected] = RegExp('^(?:' + expected + ')$');
+
+	    if (expected.test(type)) {
+	      return;
+	    }
+
+	    throw Error('Invalid node type: ' + type);
+	  }
+
+	  /*--------------------------------------------------------------------------*/
+
+	  function generate(node) {
+	    var type = node.type;
+
+	    if (generate.hasOwnProperty(type) && typeof generate[type] == 'function') {
+	      return generate[type](node);
+	    }
+
+	    throw Error('Invalid node type: ' + type);
+	  }
+
+	  /*--------------------------------------------------------------------------*/
+
+	  function generateAlternative(node) {
+	    assertType(node.type, 'alternative');
+
+	    var terms = node.body,
+	        length = terms ? terms.length : 0;
+
+	    if (length == 1) {
+	      return generateTerm(terms[0]);
+	    } else {
+	      var i = -1,
+	          result = '';
+
+	      while (++i < length) {
+	        result += generateTerm(terms[i]);
+	      }
+
+	      return result;
+	    }
+	  }
+
+	  function generateAnchor(node) {
+	    assertType(node.type, 'anchor');
+
+	    switch (node.kind) {
+	      case 'start':
+	        return '^';
+	      case 'end':
+	        return '$';
+	      case 'boundary':
+	        return '\\b';
+	      case 'not-boundary':
+	        return '\\B';
+	      default:
+	        throw Error('Invalid assertion');
+	    }
+	  }
+
+	  function generateAtom(node) {
+	    assertType(node.type, 'anchor|characterClass|characterClassEscape|dot|group|reference|value');
+
+	    return generate(node);
+	  }
+
+	  function generateCharacterClass(node) {
+	    assertType(node.type, 'characterClass');
+
+	    var classRanges = node.body,
+	        length = classRanges ? classRanges.length : 0;
+
+	    var i = -1,
+	        result = '[';
+
+	    if (node.negative) {
+	      result += '^';
+	    }
+
+	    while (++i < length) {
+	      result += generateClassAtom(classRanges[i]);
+	    }
+
+	    result += ']';
+
+	    return result;
+	  }
+
+	  function generateCharacterClassEscape(node) {
+	    assertType(node.type, 'characterClassEscape');
+
+	    return '\\' + node.value;
+	  }
+
+	  function generateCharacterClassRange(node) {
+	    assertType(node.type, 'characterClassRange');
+
+	    var min = node.min,
+	        max = node.max;
+
+	    if (min.type == 'characterClassRange' || max.type == 'characterClassRange') {
+	      throw Error('Invalid character class range');
+	    }
+
+	    return generateClassAtom(min) + '-' + generateClassAtom(max);
+	  }
+
+	  function generateClassAtom(node) {
+	    assertType(node.type, 'anchor|characterClassEscape|characterClassRange|dot|value');
+
+	    return generate(node);
+	  }
+
+	  function generateDisjunction(node) {
+	    assertType(node.type, 'disjunction');
+
+	    var body = node.body,
+	        length = body ? body.length : 0;
+
+	    if (length == 0) {
+	      throw Error('No body');
+	    } else if (length == 1) {
+	      return generate(body[0]);
+	    } else {
+	      var i = -1,
+	          result = '';
+
+	      while (++i < length) {
+	        if (i != 0) {
+	          result += '|';
+	        }
+	        result += generate(body[i]);
+	      }
+
+	      return result;
+	    }
+	  }
+
+	  function generateDot(node) {
+	    assertType(node.type, 'dot');
+
+	    return '.';
+	  }
+
+	  function generateGroup(node) {
+	    assertType(node.type, 'group');
+
+	    var result = '(';
+
+	    switch (node.behavior) {
+	      case 'normal':
+	        break;
+	      case 'ignore':
+	        result += '?:';
+	        break;
+	      case 'lookahead':
+	        result += '?=';
+	        break;
+	      case 'negativeLookahead':
+	        result += '?!';
+	        break;
+	      default:
+	        throw Error('Invalid behaviour: ' + node.behaviour);
+	    }
+
+	    var body = node.body,
+	        length = body ? body.length : 0;
+
+	    if (length == 1) {
+	      result += generate(body[0]);
+	    } else {
+	      var i = -1;
+
+	      while (++i < length) {
+	        result += generate(body[i]);
+	      }
+	    }
+
+	    result += ')';
+
+	    return result;
+	  }
+
+	  function generateQuantifier(node) {
+	    assertType(node.type, 'quantifier');
+
+	    var quantifier = '',
+	        min = node.min,
+	        max = node.max;
+
+	    switch (max) {
+	      case undefined:
+	      case null:
+	        switch (min) {
+	          case 0:
+	            quantifier = '*';
+	            break;
+	          case 1:
+	            quantifier = '+';
+	            break;
+	          default:
+	            quantifier = '{' + min + ',}';
+	            break;
+	        }
+	        break;
+	      default:
+	        if (min == max) {
+	          quantifier = '{' + min + '}';
+	        } else if (min == 0 && max == 1) {
+	          quantifier = '?';
+	        } else {
+	          quantifier = '{' + min + ',' + max + '}';
+	        }
+	        break;
+	    }
+
+	    if (!node.greedy) {
+	      quantifier += '?';
+	    }
+
+	    return generateAtom(node.body[0]) + quantifier;
+	  }
+
+	  function generateReference(node) {
+	    assertType(node.type, 'reference');
+
+	    return '\\' + node.matchIndex;
+	  }
+
+	  function generateTerm(node) {
+	    assertType(node.type, 'anchor|characterClass|characterClassEscape|empty|group|quantifier|reference|value');
+
+	    return generate(node);
+	  }
+
+	  function generateValue(node) {
+	    assertType(node.type, 'value');
+
+	    var kind = node.kind,
+	        codePoint = node.codePoint;
+
+	    switch (kind) {
+	      case 'controlLetter':
+	        return '\\c' + fromCodePoint(codePoint + 64);
+	      case 'hexadecimalEscape':
+	        return '\\x' + ('00' + codePoint.toString(16).toUpperCase()).slice(-2);
+	      case 'identifier':
+	        return '\\' + fromCodePoint(codePoint);
+	      case 'null':
+	        return '\\' + codePoint;
+	      case 'octal':
+	        return '\\' + codePoint.toString(8);
+	      case 'singleEscape':
+	        switch (codePoint) {
+	          case 0x0008:
+	            return '\\b';
+	          case 0x009:
+	            return '\\t';
+	          case 0x00A:
+	            return '\\n';
+	          case 0x00B:
+	            return '\\v';
+	          case 0x00C:
+	            return '\\f';
+	          case 0x00D:
+	            return '\\r';
+	          default:
+	            throw Error('Invalid codepoint: ' + codePoint);
+	        }
+	      case 'symbol':
+	        return fromCodePoint(codePoint);
+	      case 'unicodeEscape':
+	        return '\\u' + ('0000' + codePoint.toString(16).toUpperCase()).slice(-4);
+	      case 'unicodeCodePointEscape':
+	        return '\\u{' + codePoint.toString(16).toUpperCase() + '}';
+	      default:
+	        throw Error('Unsupported node kind: ' + kind);
+	    }
+	  }
+
+	  /*--------------------------------------------------------------------------*/
+
+	  generate.alternative = generateAlternative;
+	  generate.anchor = generateAnchor;
+	  generate.characterClass = generateCharacterClass;
+	  generate.characterClassEscape = generateCharacterClassEscape;
+	  generate.characterClassRange = generateCharacterClassRange;
+	  generate.disjunction = generateDisjunction;
+	  generate.dot = generateDot;
+	  generate.group = generateGroup;
+	  generate.quantifier = generateQuantifier;
+	  generate.reference = generateReference;
+	  generate.value = generateValue;
+
+	  /*--------------------------------------------------------------------------*/
+
+	  // export regjsgen
+	  // some AMD build optimizers, like r.js, check for condition patterns like the following:
+	  if ("function" == 'function' && _typeof(__webpack_require__(48)) == 'object' && __webpack_require__(48)) {
+	    // define as an anonymous module so, through path mapping, it can be aliased
+	    !(__WEBPACK_AMD_DEFINE_RESULT__ = function () {
+	      return {
+	        'generate': generate
+	      };
+	    }.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+	  }
+	  // check for `exports` after `define` in case a build optimizer adds an `exports` object
+	  else if (freeExports && freeModule) {
+	      // in Narwhal, Node.js, Rhino -require, or RingoJS
+	      freeExports.generate = generate;
+	    }
+	    // in a browser or Rhino
+	    else {
+	        root.regjsgen = {
+	          'generate': generate
+	        };
+	      }
+	}).call(undefined);
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(39)(module), (function() { return this; }())))
+
+/***/ }),
+/* 605 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	// regjsparser
+	//
+	// ==================================================================
+	//
+	// See ECMA-262 Standard: 15.10.1
+	//
+	// NOTE: The ECMA-262 standard uses the term "Assertion" for /^/. Here the
+	//   term "Anchor" is used.
+	//
+	// Pattern ::
+	//      Disjunction
+	//
+	// Disjunction ::
+	//      Alternative
+	//      Alternative | Disjunction
+	//
+	// Alternative ::
+	//      [empty]
+	//      Alternative Term
+	//
+	// Term ::
+	//      Anchor
+	//      Atom
+	//      Atom Quantifier
+	//
+	// Anchor ::
+	//      ^
+	//      $
+	//      \ b
+	//      \ B
+	//      ( ? = Disjunction )
+	//      ( ? ! Disjunction )
+	//
+	// Quantifier ::
+	//      QuantifierPrefix
+	//      QuantifierPrefix ?
+	//
+	// QuantifierPrefix ::
+	//      *
+	//      +
+	//      ?
+	//      { DecimalDigits }
+	//      { DecimalDigits , }
+	//      { DecimalDigits , DecimalDigits }
+	//
+	// Atom ::
+	//      PatternCharacter
+	//      .
+	//      \ AtomEscape
+	//      CharacterClass
+	//      ( Disjunction )
+	//      ( ? : Disjunction )
+	//
+	// PatternCharacter ::
+	//      SourceCharacter but not any of: ^ $ \ . * + ? ( ) [ ] { } |
+	//
+	// AtomEscape ::
+	//      DecimalEscape
+	//      CharacterEscape
+	//      CharacterClassEscape
+	//
+	// CharacterEscape[U] ::
+	//      ControlEscape
+	//      c ControlLetter
+	//      HexEscapeSequence
+	//      RegExpUnicodeEscapeSequence[?U] (ES6)
+	//      IdentityEscape[?U]
+	//
+	// ControlEscape ::
+	//      one of f n r t v
+	// ControlLetter ::
+	//      one of
+	//          a b c d e f g h i j k l m n o p q r s t u v w x y z
+	//          A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+	//
+	// IdentityEscape ::
+	//      SourceCharacter but not IdentifierPart
+	//      <ZWJ>
+	//      <ZWNJ>
+	//
+	// DecimalEscape ::
+	//      DecimalIntegerLiteral [lookahead ∉ DecimalDigit]
+	//
+	// CharacterClassEscape ::
+	//      one of d D s S w W
+	//
+	// CharacterClass ::
+	//      [ [lookahead ∉ {^}] ClassRanges ]
+	//      [ ^ ClassRanges ]
+	//
+	// ClassRanges ::
+	//      [empty]
+	//      NonemptyClassRanges
+	//
+	// NonemptyClassRanges ::
+	//      ClassAtom
+	//      ClassAtom NonemptyClassRangesNoDash
+	//      ClassAtom - ClassAtom ClassRanges
+	//
+	// NonemptyClassRangesNoDash ::
+	//      ClassAtom
+	//      ClassAtomNoDash NonemptyClassRangesNoDash
+	//      ClassAtomNoDash - ClassAtom ClassRanges
+	//
+	// ClassAtom ::
+	//      -
+	//      ClassAtomNoDash
+	//
+	// ClassAtomNoDash ::
+	//      SourceCharacter but not one of \ or ] or -
+	//      \ ClassEscape
+	//
+	// ClassEscape ::
+	//      DecimalEscape
+	//      b
+	//      CharacterEscape
+	//      CharacterClassEscape
+
+	(function () {
+
+	  function parse(str, flags) {
+	    function addRaw(node) {
+	      node.raw = str.substring(node.range[0], node.range[1]);
+	      return node;
+	    }
+
+	    function updateRawStart(node, start) {
+	      node.range[0] = start;
+	      return addRaw(node);
+	    }
+
+	    function createAnchor(kind, rawLength) {
+	      return addRaw({
+	        type: 'anchor',
+	        kind: kind,
+	        range: [pos - rawLength, pos]
+	      });
+	    }
+
+	    function createValue(kind, codePoint, from, to) {
+	      return addRaw({
+	        type: 'value',
+	        kind: kind,
+	        codePoint: codePoint,
+	        range: [from, to]
+	      });
+	    }
+
+	    function createEscaped(kind, codePoint, value, fromOffset) {
+	      fromOffset = fromOffset || 0;
+	      return createValue(kind, codePoint, pos - (value.length + fromOffset), pos);
+	    }
+
+	    function createCharacter(matches) {
+	      var _char = matches[0];
+	      var first = _char.charCodeAt(0);
+	      if (hasUnicodeFlag) {
+	        var second;
+	        if (_char.length === 1 && first >= 0xD800 && first <= 0xDBFF) {
+	          second = lookahead().charCodeAt(0);
+	          if (second >= 0xDC00 && second <= 0xDFFF) {
+	            // Unicode surrogate pair
+	            pos++;
+	            return createValue('symbol', (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000, pos - 2, pos);
+	          }
+	        }
+	      }
+	      return createValue('symbol', first, pos - 1, pos);
+	    }
+
+	    function createDisjunction(alternatives, from, to) {
+	      return addRaw({
+	        type: 'disjunction',
+	        body: alternatives,
+	        range: [from, to]
+	      });
+	    }
+
+	    function createDot() {
+	      return addRaw({
+	        type: 'dot',
+	        range: [pos - 1, pos]
+	      });
+	    }
+
+	    function createCharacterClassEscape(value) {
+	      return addRaw({
+	        type: 'characterClassEscape',
+	        value: value,
+	        range: [pos - 2, pos]
+	      });
+	    }
+
+	    function createReference(matchIndex) {
+	      return addRaw({
+	        type: 'reference',
+	        matchIndex: parseInt(matchIndex, 10),
+	        range: [pos - 1 - matchIndex.length, pos]
+	      });
+	    }
+
+	    function createGroup(behavior, disjunction, from, to) {
+	      return addRaw({
+	        type: 'group',
+	        behavior: behavior,
+	        body: disjunction,
+	        range: [from, to]
+	      });
+	    }
+
+	    function createQuantifier(min, max, from, to) {
+	      if (to == null) {
+	        from = pos - 1;
+	        to = pos;
+	      }
+
+	      return addRaw({
+	        type: 'quantifier',
+	        min: min,
+	        max: max,
+	        greedy: true,
+	        body: null, // set later on
+	        range: [from, to]
+	      });
+	    }
+
+	    function createAlternative(terms, from, to) {
+	      return addRaw({
+	        type: 'alternative',
+	        body: terms,
+	        range: [from, to]
+	      });
+	    }
+
+	    function createCharacterClass(classRanges, negative, from, to) {
+	      return addRaw({
+	        type: 'characterClass',
+	        body: classRanges,
+	        negative: negative,
+	        range: [from, to]
+	      });
+	    }
+
+	    function createClassRange(min, max, from, to) {
+	      // See 15.10.2.15:
+	      if (min.codePoint > max.codePoint) {
+	        bail('invalid range in character class', min.raw + '-' + max.raw, from, to);
+	      }
+
+	      return addRaw({
+	        type: 'characterClassRange',
+	        min: min,
+	        max: max,
+	        range: [from, to]
+	      });
+	    }
+
+	    function flattenBody(body) {
+	      if (body.type === 'alternative') {
+	        return body.body;
+	      } else {
+	        return [body];
+	      }
+	    }
+
+	    function isEmpty(obj) {
+	      return obj.type === 'empty';
+	    }
+
+	    function incr(amount) {
+	      amount = amount || 1;
+	      var res = str.substring(pos, pos + amount);
+	      pos += amount || 1;
+	      return res;
+	    }
+
+	    function skip(value) {
+	      if (!match(value)) {
+	        bail('character', value);
+	      }
+	    }
+
+	    function match(value) {
+	      if (str.indexOf(value, pos) === pos) {
+	        return incr(value.length);
+	      }
+	    }
+
+	    function lookahead() {
+	      return str[pos];
+	    }
+
+	    function current(value) {
+	      return str.indexOf(value, pos) === pos;
+	    }
+
+	    function next(value) {
+	      return str[pos + 1] === value;
+	    }
+
+	    function matchReg(regExp) {
+	      var subStr = str.substring(pos);
+	      var res = subStr.match(regExp);
+	      if (res) {
+	        res.range = [];
+	        res.range[0] = pos;
+	        incr(res[0].length);
+	        res.range[1] = pos;
+	      }
+	      return res;
+	    }
+
+	    function parseDisjunction() {
+	      // Disjunction ::
+	      //      Alternative
+	      //      Alternative | Disjunction
+	      var res = [],
+	          from = pos;
+	      res.push(parseAlternative());
+
+	      while (match('|')) {
+	        res.push(parseAlternative());
+	      }
+
+	      if (res.length === 1) {
+	        return res[0];
+	      }
+
+	      return createDisjunction(res, from, pos);
+	    }
+
+	    function parseAlternative() {
+	      var res = [],
+	          from = pos;
+	      var term;
+
+	      // Alternative ::
+	      //      [empty]
+	      //      Alternative Term
+	      while (term = parseTerm()) {
+	        res.push(term);
+	      }
+
+	      if (res.length === 1) {
+	        return res[0];
+	      }
+
+	      return createAlternative(res, from, pos);
+	    }
+
+	    function parseTerm() {
+	      // Term ::
+	      //      Anchor
+	      //      Atom
+	      //      Atom Quantifier
+
+	      if (pos >= str.length || current('|') || current(')')) {
+	        return null; /* Means: The term is empty */
+	      }
+
+	      var anchor = parseAnchor();
+
+	      if (anchor) {
+	        return anchor;
+	      }
+
+	      var atom = parseAtom();
+	      if (!atom) {
+	        bail('Expected atom');
+	      }
+	      var quantifier = parseQuantifier() || false;
+	      if (quantifier) {
+	        quantifier.body = flattenBody(atom);
+	        // The quantifier contains the atom. Therefore, the beginning of the
+	        // quantifier range is given by the beginning of the atom.
+	        updateRawStart(quantifier, atom.range[0]);
+	        return quantifier;
+	      }
+	      return atom;
+	    }
+
+	    function parseGroup(matchA, typeA, matchB, typeB) {
+	      var type = null,
+	          from = pos;
+
+	      if (match(matchA)) {
+	        type = typeA;
+	      } else if (match(matchB)) {
+	        type = typeB;
+	      } else {
+	        return false;
+	      }
+
+	      var body = parseDisjunction();
+	      if (!body) {
+	        bail('Expected disjunction');
+	      }
+	      skip(')');
+	      var group = createGroup(type, flattenBody(body), from, pos);
+
+	      if (type == 'normal') {
+	        // Keep track of the number of closed groups. This is required for
+	        // parseDecimalEscape(). In case the string is parsed a second time the
+	        // value already holds the total count and no incrementation is required.
+	        if (firstIteration) {
+	          closedCaptureCounter++;
+	        }
+	      }
+	      return group;
+	    }
+
+	    function parseAnchor() {
+	      // Anchor ::
+	      //      ^
+	      //      $
+	      //      \ b
+	      //      \ B
+	      //      ( ? = Disjunction )
+	      //      ( ? ! Disjunction )
+	      var res,
+	          from = pos;
+
+	      if (match('^')) {
+	        return createAnchor('start', 1 /* rawLength */);
+	      } else if (match('$')) {
+	        return createAnchor('end', 1 /* rawLength */);
+	      } else if (match('\\b')) {
+	        return createAnchor('boundary', 2 /* rawLength */);
+	      } else if (match('\\B')) {
+	        return createAnchor('not-boundary', 2 /* rawLength */);
+	      } else {
+	        return parseGroup('(?=', 'lookahead', '(?!', 'negativeLookahead');
+	      }
+	    }
+
+	    function parseQuantifier() {
+	      // Quantifier ::
+	      //      QuantifierPrefix
+	      //      QuantifierPrefix ?
+	      //
+	      // QuantifierPrefix ::
+	      //      *
+	      //      +
+	      //      ?
+	      //      { DecimalDigits }
+	      //      { DecimalDigits , }
+	      //      { DecimalDigits , DecimalDigits }
+
+	      var res,
+	          from = pos;
+	      var quantifier;
+	      var min, max;
+
+	      if (match('*')) {
+	        quantifier = createQuantifier(0);
+	      } else if (match('+')) {
+	        quantifier = createQuantifier(1);
+	      } else if (match('?')) {
+	        quantifier = createQuantifier(0, 1);
+	      } else if (res = matchReg(/^\{([0-9]+)\}/)) {
+	        min = parseInt(res[1], 10);
+	        quantifier = createQuantifier(min, min, res.range[0], res.range[1]);
+	      } else if (res = matchReg(/^\{([0-9]+),\}/)) {
+	        min = parseInt(res[1], 10);
+	        quantifier = createQuantifier(min, undefined, res.range[0], res.range[1]);
+	      } else if (res = matchReg(/^\{([0-9]+),([0-9]+)\}/)) {
+	        min = parseInt(res[1], 10);
+	        max = parseInt(res[2], 10);
+	        if (min > max) {
+	          bail('numbers out of order in {} quantifier', '', from, pos);
+	        }
+	        quantifier = createQuantifier(min, max, res.range[0], res.range[1]);
+	      }
+
+	      if (quantifier) {
+	        if (match('?')) {
+	          quantifier.greedy = false;
+	          quantifier.range[1] += 1;
+	        }
+	      }
+
+	      return quantifier;
+	    }
+
+	    function parseAtom() {
+	      // Atom ::
+	      //      PatternCharacter
+	      //      .
+	      //      \ AtomEscape
+	      //      CharacterClass
+	      //      ( Disjunction )
+	      //      ( ? : Disjunction )
+
+	      var res;
+
+	      // jviereck: allow ']', '}' here as well to be compatible with browser's
+	      //   implementations: ']'.match(/]/);
+	      // if (res = matchReg(/^[^^$\\.*+?()[\]{}|]/)) {
+	      if (res = matchReg(/^[^^$\\.*+?(){[|]/)) {
+	        //      PatternCharacter
+	        return createCharacter(res);
+	      } else if (match('.')) {
+	        //      .
+	        return createDot();
+	      } else if (match('\\')) {
+	        //      \ AtomEscape
+	        res = parseAtomEscape();
+	        if (!res) {
+	          bail('atomEscape');
+	        }
+	        return res;
+	      } else if (res = parseCharacterClass()) {
+	        return res;
+	      } else {
+	        //      ( Disjunction )
+	        //      ( ? : Disjunction )
+	        return parseGroup('(?:', 'ignore', '(', 'normal');
+	      }
+	    }
+
+	    function parseUnicodeSurrogatePairEscape(firstEscape) {
+	      if (hasUnicodeFlag) {
+	        var first, second;
+	        if (firstEscape.kind == 'unicodeEscape' && (first = firstEscape.codePoint) >= 0xD800 && first <= 0xDBFF && current('\\') && next('u')) {
+	          var prevPos = pos;
+	          pos++;
+	          var secondEscape = parseClassEscape();
+	          if (secondEscape.kind == 'unicodeEscape' && (second = secondEscape.codePoint) >= 0xDC00 && second <= 0xDFFF) {
+	            // Unicode surrogate pair
+	            firstEscape.range[1] = secondEscape.range[1];
+	            firstEscape.codePoint = (first - 0xD800) * 0x400 + second - 0xDC00 + 0x10000;
+	            firstEscape.type = 'value';
+	            firstEscape.kind = 'unicodeCodePointEscape';
+	            addRaw(firstEscape);
+	          } else {
+	            pos = prevPos;
+	          }
+	        }
+	      }
+	      return firstEscape;
+	    }
+
+	    function parseClassEscape() {
+	      return parseAtomEscape(true);
+	    }
+
+	    function parseAtomEscape(insideCharacterClass) {
+	      // AtomEscape ::
+	      //      DecimalEscape
+	      //      CharacterEscape
+	      //      CharacterClassEscape
+
+	      var res,
+	          from = pos;
+
+	      res = parseDecimalEscape();
+	      if (res) {
+	        return res;
+	      }
+
+	      // For ClassEscape
+	      if (insideCharacterClass) {
+	        if (match('b')) {
+	          // 15.10.2.19
+	          // The production ClassEscape :: b evaluates by returning the
+	          // CharSet containing the one character <BS> (Unicode value 0008).
+	          return createEscaped('singleEscape', 0x0008, '\\b');
+	        } else if (match('B')) {
+	          bail('\\B not possible inside of CharacterClass', '', from);
+	        }
+	      }
+
+	      res = parseCharacterEscape();
+
+	      return res;
+	    }
+
+	    function parseDecimalEscape() {
+	      // DecimalEscape ::
+	      //      DecimalIntegerLiteral [lookahead ∉ DecimalDigit]
+	      //      CharacterClassEscape :: one of d D s S w W
+
+	      var res, match;
+
+	      if (res = matchReg(/^(?!0)\d+/)) {
+	        match = res[0];
+	        var refIdx = parseInt(res[0], 10);
+	        if (refIdx <= closedCaptureCounter) {
+	          // If the number is smaller than the normal-groups found so
+	          // far, then it is a reference...
+	          return createReference(res[0]);
+	        } else {
+	          // ... otherwise it needs to be interpreted as a octal (if the
+	          // number is in an octal format). If it is NOT octal format,
+	          // then the slash is ignored and the number is matched later
+	          // as normal characters.
+
+	          // Recall the negative decision to decide if the input must be parsed
+	          // a second time with the total normal-groups.
+	          backrefDenied.push(refIdx);
+
+	          // Reset the position again, as maybe only parts of the previous
+	          // matched numbers are actual octal numbers. E.g. in '019' only
+	          // the '01' should be matched.
+	          incr(-res[0].length);
+	          if (res = matchReg(/^[0-7]{1,3}/)) {
+	            return createEscaped('octal', parseInt(res[0], 8), res[0], 1);
+	          } else {
+	            // If we end up here, we have a case like /\91/. Then the
+	            // first slash is to be ignored and the 9 & 1 to be treated
+	            // like ordinary characters. Create a character for the
+	            // first number only here - other number-characters
+	            // (if available) will be matched later.
+	            res = createCharacter(matchReg(/^[89]/));
+	            return updateRawStart(res, res.range[0] - 1);
+	          }
+	        }
+	      }
+	      // Only allow octal numbers in the following. All matched numbers start
+	      // with a zero (if the do not, the previous if-branch is executed).
+	      // If the number is not octal format and starts with zero (e.g. `091`)
+	      // then only the zeros `0` is treated here and the `91` are ordinary
+	      // characters.
+	      // Example:
+	      //   /\091/.exec('\091')[0].length === 3
+	      else if (res = matchReg(/^[0-7]{1,3}/)) {
+	          match = res[0];
+	          if (/^0{1,3}$/.test(match)) {
+	            // If they are all zeros, then only take the first one.
+	            return createEscaped('null', 0x0000, '0', match.length + 1);
+	          } else {
+	            return createEscaped('octal', parseInt(match, 8), match, 1);
+	          }
+	        } else if (res = matchReg(/^[dDsSwW]/)) {
+	          return createCharacterClassEscape(res[0]);
+	        }
+	      return false;
+	    }
+
+	    function parseCharacterEscape() {
+	      // CharacterEscape ::
+	      //      ControlEscape
+	      //      c ControlLetter
+	      //      HexEscapeSequence
+	      //      UnicodeEscapeSequence
+	      //      IdentityEscape
+
+	      var res;
+	      if (res = matchReg(/^[fnrtv]/)) {
+	        // ControlEscape
+	        var codePoint = 0;
+	        switch (res[0]) {
+	          case 't':
+	            codePoint = 0x009;break;
+	          case 'n':
+	            codePoint = 0x00A;break;
+	          case 'v':
+	            codePoint = 0x00B;break;
+	          case 'f':
+	            codePoint = 0x00C;break;
+	          case 'r':
+	            codePoint = 0x00D;break;
+	        }
+	        return createEscaped('singleEscape', codePoint, '\\' + res[0]);
+	      } else if (res = matchReg(/^c([a-zA-Z])/)) {
+	        // c ControlLetter
+	        return createEscaped('controlLetter', res[1].charCodeAt(0) % 32, res[1], 2);
+	      } else if (res = matchReg(/^x([0-9a-fA-F]{2})/)) {
+	        // HexEscapeSequence
+	        return createEscaped('hexadecimalEscape', parseInt(res[1], 16), res[1], 2);
+	      } else if (res = matchReg(/^u([0-9a-fA-F]{4})/)) {
+	        // UnicodeEscapeSequence
+	        return parseUnicodeSurrogatePairEscape(createEscaped('unicodeEscape', parseInt(res[1], 16), res[1], 2));
+	      } else if (hasUnicodeFlag && (res = matchReg(/^u\{([0-9a-fA-F]+)\}/))) {
+	        // RegExpUnicodeEscapeSequence (ES6 Unicode code point escape)
+	        return createEscaped('unicodeCodePointEscape', parseInt(res[1], 16), res[1], 4);
+	      } else {
+	        // IdentityEscape
+	        return parseIdentityEscape();
+	      }
+	    }
+
+	    // Taken from the Esprima parser.
+	    function isIdentifierPart(ch) {
+	      // Generated by `tools/generate-identifier-regex.js`.
+	      var NonAsciiIdentifierPart = new RegExp('[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B2\u08E4-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19D9\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA69D\uA69F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA7AD\uA7B0\uA7B1\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64\uAB65\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2D\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]');
+
+	      return ch === 36 || ch === 95 || // $ (dollar) and _ (underscore)
+	      ch >= 65 && ch <= 90 || // A..Z
+	      ch >= 97 && ch <= 122 || // a..z
+	      ch >= 48 && ch <= 57 || // 0..9
+	      ch === 92 || // \ (backslash)
+	      ch >= 0x80 && NonAsciiIdentifierPart.test(String.fromCharCode(ch));
+	    }
+
+	    function parseIdentityEscape() {
+	      // IdentityEscape ::
+	      //      SourceCharacter but not IdentifierPart
+	      //      <ZWJ>
+	      //      <ZWNJ>
+
+	      var ZWJ = '\u200C';
+	      var ZWNJ = '\u200D';
+
+	      var tmp;
+
+	      if (!isIdentifierPart(lookahead())) {
+	        tmp = incr();
+	        return createEscaped('identifier', tmp.charCodeAt(0), tmp, 1);
+	      }
+
+	      if (match(ZWJ)) {
+	        // <ZWJ>
+	        return createEscaped('identifier', 0x200C, ZWJ);
+	      } else if (match(ZWNJ)) {
+	        // <ZWNJ>
+	        return createEscaped('identifier', 0x200D, ZWNJ);
+	      }
+
+	      return null;
+	    }
+
+	    function parseCharacterClass() {
+	      // CharacterClass ::
+	      //      [ [lookahead ∉ {^}] ClassRanges ]
+	      //      [ ^ ClassRanges ]
+
+	      var res,
+	          from = pos;
+	      if (res = matchReg(/^\[\^/)) {
+	        res = parseClassRanges();
+	        skip(']');
+	        return createCharacterClass(res, true, from, pos);
+	      } else if (match('[')) {
+	        res = parseClassRanges();
+	        skip(']');
+	        return createCharacterClass(res, false, from, pos);
+	      }
+
+	      return null;
+	    }
+
+	    function parseClassRanges() {
+	      // ClassRanges ::
+	      //      [empty]
+	      //      NonemptyClassRanges
+
+	      var res;
+	      if (current(']')) {
+	        // Empty array means nothing insinde of the ClassRange.
+	        return [];
+	      } else {
+	        res = parseNonemptyClassRanges();
+	        if (!res) {
+	          bail('nonEmptyClassRanges');
+	        }
+	        return res;
+	      }
+	    }
+
+	    function parseHelperClassRanges(atom) {
+	      var from, to, res;
+	      if (current('-') && !next(']')) {
+	        // ClassAtom - ClassAtom ClassRanges
+	        skip('-');
+
+	        res = parseClassAtom();
+	        if (!res) {
+	          bail('classAtom');
+	        }
+	        to = pos;
+	        var classRanges = parseClassRanges();
+	        if (!classRanges) {
+	          bail('classRanges');
+	        }
+	        from = atom.range[0];
+	        if (classRanges.type === 'empty') {
+	          return [createClassRange(atom, res, from, to)];
+	        }
+	        return [createClassRange(atom, res, from, to)].concat(classRanges);
+	      }
+
+	      res = parseNonemptyClassRangesNoDash();
+	      if (!res) {
+	        bail('nonEmptyClassRangesNoDash');
+	      }
+
+	      return [atom].concat(res);
+	    }
+
+	    function parseNonemptyClassRanges() {
+	      // NonemptyClassRanges ::
+	      //      ClassAtom
+	      //      ClassAtom NonemptyClassRangesNoDash
+	      //      ClassAtom - ClassAtom ClassRanges
+
+	      var atom = parseClassAtom();
+	      if (!atom) {
+	        bail('classAtom');
+	      }
+
+	      if (current(']')) {
+	        // ClassAtom
+	        return [atom];
+	      }
+
+	      // ClassAtom NonemptyClassRangesNoDash
+	      // ClassAtom - ClassAtom ClassRanges
+	      return parseHelperClassRanges(atom);
+	    }
+
+	    function parseNonemptyClassRangesNoDash() {
+	      // NonemptyClassRangesNoDash ::
+	      //      ClassAtom
+	      //      ClassAtomNoDash NonemptyClassRangesNoDash
+	      //      ClassAtomNoDash - ClassAtom ClassRanges
+
+	      var res = parseClassAtom();
+	      if (!res) {
+	        bail('classAtom');
+	      }
+	      if (current(']')) {
+	        //      ClassAtom
+	        return res;
+	      }
+
+	      // ClassAtomNoDash NonemptyClassRangesNoDash
+	      // ClassAtomNoDash - ClassAtom ClassRanges
+	      return parseHelperClassRanges(res);
+	    }
+
+	    function parseClassAtom() {
+	      // ClassAtom ::
+	      //      -
+	      //      ClassAtomNoDash
+	      if (match('-')) {
+	        return createCharacter('-');
+	      } else {
+	        return parseClassAtomNoDash();
+	      }
+	    }
+
+	    function parseClassAtomNoDash() {
+	      // ClassAtomNoDash ::
+	      //      SourceCharacter but not one of \ or ] or -
+	      //      \ ClassEscape
+
+	      var res;
+	      if (res = matchReg(/^[^\\\]-]/)) {
+	        return createCharacter(res[0]);
+	      } else if (match('\\')) {
+	        res = parseClassEscape();
+	        if (!res) {
+	          bail('classEscape');
+	        }
+
+	        return parseUnicodeSurrogatePairEscape(res);
+	      }
+	    }
+
+	    function bail(message, details, from, to) {
+	      from = from == null ? pos : from;
+	      to = to == null ? from : to;
+
+	      var contextStart = Math.max(0, from - 10);
+	      var contextEnd = Math.min(to + 10, str.length);
+
+	      // Output a bit of context and a line pointing to where our error is.
+	      //
+	      // We are assuming that there are no actual newlines in the content as this is a regular expression.
+	      var context = '    ' + str.substring(contextStart, contextEnd);
+	      var pointer = '    ' + new Array(from - contextStart + 1).join(' ') + '^';
+
+	      throw SyntaxError(message + ' at position ' + from + (details ? ': ' + details : '') + '\n' + context + '\n' + pointer);
+	    }
+
+	    var backrefDenied = [];
+	    var closedCaptureCounter = 0;
+	    var firstIteration = true;
+	    var hasUnicodeFlag = (flags || "").indexOf("u") !== -1;
+	    var pos = 0;
+
+	    // Convert the input to a string and treat the empty string special.
+	    str = String(str);
+	    if (str === '') {
+	      str = '(?:)';
+	    }
+
+	    var result = parseDisjunction();
+
+	    if (result.range[1] !== str.length) {
+	      bail('Could not parse entire input - got stuck', '', result.range[1]);
+	    }
+
+	    // The spec requires to interpret the `\2` in `/\2()()/` as backreference.
+	    // As the parser collects the number of capture groups as the string is
+	    // parsed it is impossible to make these decisions at the point when the
+	    // `\2` is handled. In case the local decision turns out to be wrong after
+	    // the parsing has finished, the input string is parsed a second time with
+	    // the total number of capture groups set.
+	    //
+	    // SEE: https://github.com/jviereck/regjsparser/issues/70
+	    for (var i = 0; i < backrefDenied.length; i++) {
+	      if (backrefDenied[i] <= closedCaptureCounter) {
+	        // Parse the input a second time.
+	        pos = 0;
+	        firstIteration = false;
+	        return parseDisjunction();
+	      }
+	    }
+
+	    return result;
+	  }
+
+	  var regjsparser = {
+	    parse: parse
+	  };
+
+	  if (typeof module !== 'undefined' && module.exports) {
+	    module.exports = regjsparser;
+	  } else {
+	    window.regjsparser = regjsparser;
+	  }
+	})();
+
+/***/ }),
+/* 606 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var isFinite = __webpack_require__(458);
+
+	module.exports = function (str, n) {
+		if (typeof str !== 'string') {
+			throw new TypeError('Expected `input` to be a string');
+		}
+
+		if (n < 0 || !isFinite(n)) {
+			throw new TypeError('Expected `count` to be a positive finite number');
+		}
+
+		var ret = '';
+
+		do {
+			if (n & 1) {
+				ret += str;
+			}
+
+			str += str;
+		} while (n >>= 1);
+
+		return ret;
+	};
+
+/***/ }),
+/* 607 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	/* -*- Mode: js; js-indent-level: 2; -*- */
+	/*
+	 * Copyright 2011 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 */
+
+	var intToCharMap = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
+
+	/**
+	 * Encode an integer in the range of 0 to 63 to a single base 64 digit.
+	 */
+	exports.encode = function (number) {
+	  if (0 <= number && number < intToCharMap.length) {
+	    return intToCharMap[number];
+	  }
+	  throw new TypeError("Must be between 0 and 63: " + number);
+	};
+
+	/**
+	 * Decode a single base 64 character code digit to an integer. Returns -1 on
+	 * failure.
+	 */
+	exports.decode = function (charCode) {
+	  var bigA = 65; // 'A'
+	  var bigZ = 90; // 'Z'
+
+	  var littleA = 97; // 'a'
+	  var littleZ = 122; // 'z'
+
+	  var zero = 48; // '0'
+	  var nine = 57; // '9'
+
+	  var plus = 43; // '+'
+	  var slash = 47; // '/'
+
+	  var littleOffset = 26;
+	  var numberOffset = 52;
+
+	  // 0 - 25: ABCDEFGHIJKLMNOPQRSTUVWXYZ
+	  if (bigA <= charCode && charCode <= bigZ) {
+	    return charCode - bigA;
+	  }
+
+	  // 26 - 51: abcdefghijklmnopqrstuvwxyz
+	  if (littleA <= charCode && charCode <= littleZ) {
+	    return charCode - littleA + littleOffset;
+	  }
+
+	  // 52 - 61: 0123456789
+	  if (zero <= charCode && charCode <= nine) {
+	    return charCode - zero + numberOffset;
+	  }
+
+	  // 62: +
+	  if (charCode == plus) {
+	    return 62;
+	  }
+
+	  // 63: /
+	  if (charCode == slash) {
+	    return 63;
+	  }
+
+	  // Invalid base64 digit.
+	  return -1;
+	};
+
+/***/ }),
+/* 608 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/* -*- Mode: js; js-indent-level: 2; -*- */
+	/*
+	 * Copyright 2011 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 */
+
+	exports.GREATEST_LOWER_BOUND = 1;
+	exports.LEAST_UPPER_BOUND = 2;
+
+	/**
+	 * Recursive implementation of binary search.
+	 *
+	 * @param aLow Indices here and lower do not contain the needle.
+	 * @param aHigh Indices here and higher do not contain the needle.
+	 * @param aNeedle The element being searched for.
+	 * @param aHaystack The non-empty array being searched.
+	 * @param aCompare Function which takes two elements and returns -1, 0, or 1.
+	 * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
+	 *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
+	 *     closest element that is smaller than or greater than the one we are
+	 *     searching for, respectively, if the exact element cannot be found.
+	 */
+	function recursiveSearch(aLow, aHigh, aNeedle, aHaystack, aCompare, aBias) {
+	  // This function terminates when one of the following is true:
+	  //
+	  //   1. We find the exact element we are looking for.
+	  //
+	  //   2. We did not find the exact element, but we can return the index of
+	  //      the next-closest element.
+	  //
+	  //   3. We did not find the exact element, and there is no next-closest
+	  //      element than the one we are searching for, so we return -1.
+	  var mid = Math.floor((aHigh - aLow) / 2) + aLow;
+	  var cmp = aCompare(aNeedle, aHaystack[mid], true);
+	  if (cmp === 0) {
+	    // Found the element we are looking for.
+	    return mid;
+	  } else if (cmp > 0) {
+	    // Our needle is greater than aHaystack[mid].
+	    if (aHigh - mid > 1) {
+	      // The element is in the upper half.
+	      return recursiveSearch(mid, aHigh, aNeedle, aHaystack, aCompare, aBias);
+	    }
+
+	    // The exact needle element was not found in this haystack. Determine if
+	    // we are in termination case (3) or (2) and return the appropriate thing.
+	    if (aBias == exports.LEAST_UPPER_BOUND) {
+	      return aHigh < aHaystack.length ? aHigh : -1;
+	    } else {
+	      return mid;
+	    }
+	  } else {
+	    // Our needle is less than aHaystack[mid].
+	    if (mid - aLow > 1) {
+	      // The element is in the lower half.
+	      return recursiveSearch(aLow, mid, aNeedle, aHaystack, aCompare, aBias);
+	    }
+
+	    // we are in termination case (3) or (2) and return the appropriate thing.
+	    if (aBias == exports.LEAST_UPPER_BOUND) {
+	      return mid;
+	    } else {
+	      return aLow < 0 ? -1 : aLow;
+	    }
+	  }
+	}
+
+	/**
+	 * This is an implementation of binary search which will always try and return
+	 * the index of the closest element if there is no exact hit. This is because
+	 * mappings between original and generated line/col pairs are single points,
+	 * and there is an implicit region between each of them, so a miss just means
+	 * that you aren't on the very start of a region.
+	 *
+	 * @param aNeedle The element you are looking for.
+	 * @param aHaystack The array that is being searched.
+	 * @param aCompare A function which takes the needle and an element in the
+	 *     array and returns -1, 0, or 1 depending on whether the needle is less
+	 *     than, equal to, or greater than the element, respectively.
+	 * @param aBias Either 'binarySearch.GREATEST_LOWER_BOUND' or
+	 *     'binarySearch.LEAST_UPPER_BOUND'. Specifies whether to return the
+	 *     closest element that is smaller than or greater than the one we are
+	 *     searching for, respectively, if the exact element cannot be found.
+	 *     Defaults to 'binarySearch.GREATEST_LOWER_BOUND'.
+	 */
+	exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
+	  if (aHaystack.length === 0) {
+	    return -1;
+	  }
+
+	  var index = recursiveSearch(-1, aHaystack.length, aNeedle, aHaystack, aCompare, aBias || exports.GREATEST_LOWER_BOUND);
+	  if (index < 0) {
+	    return -1;
+	  }
+
+	  // We have found either the exact element, or the next-closest element than
+	  // the one we are searching for. However, there may be more than one such
+	  // element. Make sure we always return the smallest of these.
+	  while (index - 1 >= 0) {
+	    if (aCompare(aHaystack[index], aHaystack[index - 1], true) !== 0) {
+	      break;
+	    }
+	    --index;
+	  }
+
+	  return index;
+	};
+
+/***/ }),
+/* 609 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	/* -*- Mode: js; js-indent-level: 2; -*- */
+	/*
+	 * Copyright 2014 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 */
+
+	var util = __webpack_require__(61);
+
+	/**
+	 * Determine whether mappingB is after mappingA with respect to generated
+	 * position.
+	 */
+	function generatedPositionAfter(mappingA, mappingB) {
+	  // Optimized for most common case
+	  var lineA = mappingA.generatedLine;
+	  var lineB = mappingB.generatedLine;
+	  var columnA = mappingA.generatedColumn;
+	  var columnB = mappingB.generatedColumn;
+	  return lineB > lineA || lineB == lineA && columnB >= columnA || util.compareByGeneratedPositionsInflated(mappingA, mappingB) <= 0;
+	}
+
+	/**
+	 * A data structure to provide a sorted view of accumulated mappings in a
+	 * performance conscious manner. It trades a neglibable overhead in general
+	 * case for a large speedup in case of mappings being added in order.
+	 */
+	function MappingList() {
+	  this._array = [];
+	  this._sorted = true;
+	  // Serves as infimum
+	  this._last = { generatedLine: -1, generatedColumn: 0 };
+	}
+
+	/**
+	 * Iterate through internal items. This method takes the same arguments that
+	 * `Array.prototype.forEach` takes.
+	 *
+	 * NOTE: The order of the mappings is NOT guaranteed.
+	 */
+	MappingList.prototype.unsortedForEach = function MappingList_forEach(aCallback, aThisArg) {
+	  this._array.forEach(aCallback, aThisArg);
+	};
+
+	/**
+	 * Add the given source mapping.
+	 *
+	 * @param Object aMapping
+	 */
+	MappingList.prototype.add = function MappingList_add(aMapping) {
+	  if (generatedPositionAfter(this._last, aMapping)) {
+	    this._last = aMapping;
+	    this._array.push(aMapping);
+	  } else {
+	    this._sorted = false;
+	    this._array.push(aMapping);
+	  }
+	};
+
+	/**
+	 * Returns the flat, sorted array of mappings. The mappings are sorted by
+	 * generated position.
+	 *
+	 * WARNING: This method returns internal data without copying, for
+	 * performance. The return value must NOT be mutated, and should be treated as
+	 * an immutable borrow. If you want to take ownership, you must make your own
+	 * copy.
+	 */
+	MappingList.prototype.toArray = function MappingList_toArray() {
+	  if (!this._sorted) {
+	    this._array.sort(util.compareByGeneratedPositionsInflated);
+	    this._sorted = true;
+	  }
+	  return this._array;
+	};
+
+	exports.MappingList = MappingList;
+
+/***/ }),
+/* 610 */
+/***/ (function(module, exports) {
+
+	"use strict";
+
+	/* -*- Mode: js; js-indent-level: 2; -*- */
+	/*
+	 * Copyright 2011 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 */
+
+	// It turns out that some (most?) JavaScript engines don't self-host
+	// `Array.prototype.sort`. This makes sense because C++ will likely remain
+	// faster than JS when doing raw CPU-intensive sorting. However, when using a
+	// custom comparator function, calling back and forth between the VM's C++ and
+	// JIT'd JS is rather slow *and* loses JIT type information, resulting in
+	// worse generated code for the comparator function than would be optimal. In
+	// fact, when sorting with a comparator, these costs outweigh the benefits of
+	// sorting in C++. By using our own JS-implemented Quick Sort (below), we get
+	// a ~3500ms mean speed-up in `bench/bench.html`.
+
+	/**
+	 * Swap the elements indexed by `x` and `y` in the array `ary`.
+	 *
+	 * @param {Array} ary
+	 *        The array.
+	 * @param {Number} x
+	 *        The index of the first item.
+	 * @param {Number} y
+	 *        The index of the second item.
+	 */
+	function swap(ary, x, y) {
+	  var temp = ary[x];
+	  ary[x] = ary[y];
+	  ary[y] = temp;
+	}
+
+	/**
+	 * Returns a random integer within the range `low .. high` inclusive.
+	 *
+	 * @param {Number} low
+	 *        The lower bound on the range.
+	 * @param {Number} high
+	 *        The upper bound on the range.
+	 */
+	function randomIntInRange(low, high) {
+	  return Math.round(low + Math.random() * (high - low));
+	}
+
+	/**
+	 * The Quick Sort algorithm.
+	 *
+	 * @param {Array} ary
+	 *        An array to sort.
+	 * @param {function} comparator
+	 *        Function to use to compare two items.
+	 * @param {Number} p
+	 *        Start index of the array
+	 * @param {Number} r
+	 *        End index of the array
+	 */
+	function doQuickSort(ary, comparator, p, r) {
+	  // If our lower bound is less than our upper bound, we (1) partition the
+	  // array into two pieces and (2) recurse on each half. If it is not, this is
+	  // the empty array and our base case.
+
+	  if (p < r) {
+	    // (1) Partitioning.
+	    //
+	    // The partitioning chooses a pivot between `p` and `r` and moves all
+	    // elements that are less than or equal to the pivot to the before it, and
+	    // all the elements that are greater than it after it. The effect is that
+	    // once partition is done, the pivot is in the exact place it will be when
+	    // the array is put in sorted order, and it will not need to be moved
+	    // again. This runs in O(n) time.
+
+	    // Always choose a random pivot so that an input array which is reverse
+	    // sorted does not cause O(n^2) running time.
+	    var pivotIndex = randomIntInRange(p, r);
+	    var i = p - 1;
+
+	    swap(ary, pivotIndex, r);
+	    var pivot = ary[r];
+
+	    // Immediately after `j` is incremented in this loop, the following hold
+	    // true:
+	    //
+	    //   * Every element in `ary[p .. i]` is less than or equal to the pivot.
+	    //
+	    //   * Every element in `ary[i+1 .. j-1]` is greater than the pivot.
+	    for (var j = p; j < r; j++) {
+	      if (comparator(ary[j], pivot) <= 0) {
+	        i += 1;
+	        swap(ary, i, j);
+	      }
+	    }
+
+	    swap(ary, i + 1, j);
+	    var q = i + 1;
+
+	    // (2) Recurse on each half.
+
+	    doQuickSort(ary, comparator, p, q - 1);
+	    doQuickSort(ary, comparator, q + 1, r);
+	  }
+	}
+
+	/**
+	 * Sort the given array in-place with the given comparator function.
+	 *
+	 * @param {Array} ary
+	 *        An array to sort.
+	 * @param {function} comparator
+	 *        Function to use to compare two items.
+	 */
+	exports.quickSort = function (ary, comparator) {
+	  doQuickSort(ary, comparator, 0, ary.length - 1);
+	};
+
+/***/ }),
+/* 611 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	/* -*- Mode: js; js-indent-level: 2; -*- */
+	/*
+	 * Copyright 2011 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 */
+
+	var util = __webpack_require__(61);
+	var binarySearch = __webpack_require__(608);
+	var ArraySet = __webpack_require__(281).ArraySet;
+	var base64VLQ = __webpack_require__(282);
+	var quickSort = __webpack_require__(610).quickSort;
+
+	function SourceMapConsumer(aSourceMap) {
+	  var sourceMap = aSourceMap;
+	  if (typeof aSourceMap === 'string') {
+	    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
+	  }
+
+	  return sourceMap.sections != null ? new IndexedSourceMapConsumer(sourceMap) : new BasicSourceMapConsumer(sourceMap);
+	}
+
+	SourceMapConsumer.fromSourceMap = function (aSourceMap) {
+	  return BasicSourceMapConsumer.fromSourceMap(aSourceMap);
+	};
+
+	/**
+	 * The version of the source mapping spec that we are consuming.
+	 */
+	SourceMapConsumer.prototype._version = 3;
+
+	// `__generatedMappings` and `__originalMappings` are arrays that hold the
+	// parsed mapping coordinates from the source map's "mappings" attribute. They
+	// are lazily instantiated, accessed via the `_generatedMappings` and
+	// `_originalMappings` getters respectively, and we only parse the mappings
+	// and create these arrays once queried for a source location. We jump through
+	// these hoops because there can be many thousands of mappings, and parsing
+	// them is expensive, so we only want to do it if we must.
+	//
+	// Each object in the arrays is of the form:
+	//
+	//     {
+	//       generatedLine: The line number in the generated code,
+	//       generatedColumn: The column number in the generated code,
+	//       source: The path to the original source file that generated this
+	//               chunk of code,
+	//       originalLine: The line number in the original source that
+	//                     corresponds to this chunk of generated code,
+	//       originalColumn: The column number in the original source that
+	//                       corresponds to this chunk of generated code,
+	//       name: The name of the original symbol which generated this chunk of
+	//             code.
+	//     }
+	//
+	// All properties except for `generatedLine` and `generatedColumn` can be
+	// `null`.
+	//
+	// `_generatedMappings` is ordered by the generated positions.
+	//
+	// `_originalMappings` is ordered by the original positions.
+
+	SourceMapConsumer.prototype.__generatedMappings = null;
+	Object.defineProperty(SourceMapConsumer.prototype, '_generatedMappings', {
+	  get: function get() {
+	    if (!this.__generatedMappings) {
+	      this._parseMappings(this._mappings, this.sourceRoot);
+	    }
+
+	    return this.__generatedMappings;
+	  }
+	});
+
+	SourceMapConsumer.prototype.__originalMappings = null;
+	Object.defineProperty(SourceMapConsumer.prototype, '_originalMappings', {
+	  get: function get() {
+	    if (!this.__originalMappings) {
+	      this._parseMappings(this._mappings, this.sourceRoot);
+	    }
+
+	    return this.__originalMappings;
+	  }
+	});
+
+	SourceMapConsumer.prototype._charIsMappingSeparator = function SourceMapConsumer_charIsMappingSeparator(aStr, index) {
+	  var c = aStr.charAt(index);
+	  return c === ";" || c === ",";
+	};
+
+	/**
+	 * Parse the mappings in a string in to a data structure which we can easily
+	 * query (the ordered arrays in the `this.__generatedMappings` and
+	 * `this.__originalMappings` properties).
+	 */
+	SourceMapConsumer.prototype._parseMappings = function SourceMapConsumer_parseMappings(aStr, aSourceRoot) {
+	  throw new Error("Subclasses must implement _parseMappings");
+	};
+
+	SourceMapConsumer.GENERATED_ORDER = 1;
+	SourceMapConsumer.ORIGINAL_ORDER = 2;
+
+	SourceMapConsumer.GREATEST_LOWER_BOUND = 1;
+	SourceMapConsumer.LEAST_UPPER_BOUND = 2;
+
+	/**
+	 * Iterate over each mapping between an original source/line/column and a
+	 * generated line/column in this source map.
+	 *
+	 * @param Function aCallback
+	 *        The function that is called with each mapping.
+	 * @param Object aContext
+	 *        Optional. If specified, this object will be the value of `this` every
+	 *        time that `aCallback` is called.
+	 * @param aOrder
+	 *        Either `SourceMapConsumer.GENERATED_ORDER` or
+	 *        `SourceMapConsumer.ORIGINAL_ORDER`. Specifies whether you want to
+	 *        iterate over the mappings sorted by the generated file's line/column
+	 *        order or the original's source/line/column order, respectively. Defaults to
+	 *        `SourceMapConsumer.GENERATED_ORDER`.
+	 */
+	SourceMapConsumer.prototype.eachMapping = function SourceMapConsumer_eachMapping(aCallback, aContext, aOrder) {
+	  var context = aContext || null;
+	  var order = aOrder || SourceMapConsumer.GENERATED_ORDER;
+
+	  var mappings;
+	  switch (order) {
+	    case SourceMapConsumer.GENERATED_ORDER:
+	      mappings = this._generatedMappings;
+	      break;
+	    case SourceMapConsumer.ORIGINAL_ORDER:
+	      mappings = this._originalMappings;
+	      break;
+	    default:
+	      throw new Error("Unknown order of iteration.");
+	  }
+
+	  var sourceRoot = this.sourceRoot;
+	  mappings.map(function (mapping) {
+	    var source = mapping.source === null ? null : this._sources.at(mapping.source);
+	    if (source != null && sourceRoot != null) {
+	      source = util.join(sourceRoot, source);
+	    }
+	    return {
+	      source: source,
+	      generatedLine: mapping.generatedLine,
+	      generatedColumn: mapping.generatedColumn,
+	      originalLine: mapping.originalLine,
+	      originalColumn: mapping.originalColumn,
+	      name: mapping.name === null ? null : this._names.at(mapping.name)
+	    };
+	  }, this).forEach(aCallback, context);
+	};
+
+	/**
+	 * Returns all generated line and column information for the original source,
+	 * line, and column provided. If no column is provided, returns all mappings
+	 * corresponding to a either the line we are searching for or the next
+	 * closest line that has any mappings. Otherwise, returns all mappings
+	 * corresponding to the given line and either the column we are searching for
+	 * or the next closest column that has any offsets.
+	 *
+	 * The only argument is an object with the following properties:
+	 *
+	 *   - source: The filename of the original source.
+	 *   - line: The line number in the original source.
+	 *   - column: Optional. the column number in the original source.
+	 *
+	 * and an array of objects is returned, each with the following properties:
+	 *
+	 *   - line: The line number in the generated source, or null.
+	 *   - column: The column number in the generated source, or null.
+	 */
+	SourceMapConsumer.prototype.allGeneratedPositionsFor = function SourceMapConsumer_allGeneratedPositionsFor(aArgs) {
+	  var line = util.getArg(aArgs, 'line');
+
+	  // When there is no exact match, BasicSourceMapConsumer.prototype._findMapping
+	  // returns the index of the closest mapping less than the needle. By
+	  // setting needle.originalColumn to 0, we thus find the last mapping for
+	  // the given line, provided such a mapping exists.
+	  var needle = {
+	    source: util.getArg(aArgs, 'source'),
+	    originalLine: line,
+	    originalColumn: util.getArg(aArgs, 'column', 0)
+	  };
+
+	  if (this.sourceRoot != null) {
+	    needle.source = util.relative(this.sourceRoot, needle.source);
+	  }
+	  if (!this._sources.has(needle.source)) {
+	    return [];
+	  }
+	  needle.source = this._sources.indexOf(needle.source);
+
+	  var mappings = [];
+
+	  var index = this._findMapping(needle, this._originalMappings, "originalLine", "originalColumn", util.compareByOriginalPositions, binarySearch.LEAST_UPPER_BOUND);
+	  if (index >= 0) {
+	    var mapping = this._originalMappings[index];
+
+	    if (aArgs.column === undefined) {
+	      var originalLine = mapping.originalLine;
+
+	      // Iterate until either we run out of mappings, or we run into
+	      // a mapping for a different line than the one we found. Since
+	      // mappings are sorted, this is guaranteed to find all mappings for
+	      // the line we found.
+	      while (mapping && mapping.originalLine === originalLine) {
+	        mappings.push({
+	          line: util.getArg(mapping, 'generatedLine', null),
+	          column: util.getArg(mapping, 'generatedColumn', null),
+	          lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
+	        });
+
+	        mapping = this._originalMappings[++index];
+	      }
+	    } else {
+	      var originalColumn = mapping.originalColumn;
+
+	      // Iterate until either we run out of mappings, or we run into
+	      // a mapping for a different line than the one we were searching for.
+	      // Since mappings are sorted, this is guaranteed to find all mappings for
+	      // the line we are searching for.
+	      while (mapping && mapping.originalLine === line && mapping.originalColumn == originalColumn) {
+	        mappings.push({
+	          line: util.getArg(mapping, 'generatedLine', null),
+	          column: util.getArg(mapping, 'generatedColumn', null),
+	          lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
+	        });
+
+	        mapping = this._originalMappings[++index];
+	      }
+	    }
+	  }
+
+	  return mappings;
+	};
+
+	exports.SourceMapConsumer = SourceMapConsumer;
+
+	/**
+	 * A BasicSourceMapConsumer instance represents a parsed source map which we can
+	 * query for information about the original file positions by giving it a file
+	 * position in the generated source.
+	 *
+	 * The only parameter is the raw source map (either as a JSON string, or
+	 * already parsed to an object). According to the spec, source maps have the
+	 * following attributes:
+	 *
+	 *   - version: Which version of the source map spec this map is following.
+	 *   - sources: An array of URLs to the original source files.
+	 *   - names: An array of identifiers which can be referrenced by individual mappings.
+	 *   - sourceRoot: Optional. The URL root from which all sources are relative.
+	 *   - sourcesContent: Optional. An array of contents of the original source files.
+	 *   - mappings: A string of base64 VLQs which contain the actual mappings.
+	 *   - file: Optional. The generated file this source map is associated with.
+	 *
+	 * Here is an example source map, taken from the source map spec[0]:
+	 *
+	 *     {
+	 *       version : 3,
+	 *       file: "out.js",
+	 *       sourceRoot : "",
+	 *       sources: ["foo.js", "bar.js"],
+	 *       names: ["src", "maps", "are", "fun"],
+	 *       mappings: "AA,AB;;ABCDE;"
+	 *     }
+	 *
+	 * [0]: https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit?pli=1#
+	 */
+	function BasicSourceMapConsumer(aSourceMap) {
+	  var sourceMap = aSourceMap;
+	  if (typeof aSourceMap === 'string') {
+	    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
+	  }
+
+	  var version = util.getArg(sourceMap, 'version');
+	  var sources = util.getArg(sourceMap, 'sources');
+	  // Sass 3.3 leaves out the 'names' array, so we deviate from the spec (which
+	  // requires the array) to play nice here.
+	  var names = util.getArg(sourceMap, 'names', []);
+	  var sourceRoot = util.getArg(sourceMap, 'sourceRoot', null);
+	  var sourcesContent = util.getArg(sourceMap, 'sourcesContent', null);
+	  var mappings = util.getArg(sourceMap, 'mappings');
+	  var file = util.getArg(sourceMap, 'file', null);
+
+	  // Once again, Sass deviates from the spec and supplies the version as a
+	  // string rather than a number, so we use loose equality checking here.
+	  if (version != this._version) {
+	    throw new Error('Unsupported version: ' + version);
+	  }
+
+	  sources = sources.map(String
+	  // Some source maps produce relative source paths like "./foo.js" instead of
+	  // "foo.js".  Normalize these first so that future comparisons will succeed.
+	  // See bugzil.la/1090768.
+	  ).map(util.normalize
+	  // Always ensure that absolute sources are internally stored relative to
+	  // the source root, if the source root is absolute. Not doing this would
+	  // be particularly problematic when the source root is a prefix of the
+	  // source (valid, but why??). See github issue #199 and bugzil.la/1188982.
+	  ).map(function (source) {
+	    return sourceRoot && util.isAbsolute(sourceRoot) && util.isAbsolute(source) ? util.relative(sourceRoot, source) : source;
+	  });
+
+	  // Pass `true` below to allow duplicate names and sources. While source maps
+	  // are intended to be compressed and deduplicated, the TypeScript compiler
+	  // sometimes generates source maps with duplicates in them. See Github issue
+	  // #72 and bugzil.la/889492.
+	  this._names = ArraySet.fromArray(names.map(String), true);
+	  this._sources = ArraySet.fromArray(sources, true);
+
+	  this.sourceRoot = sourceRoot;
+	  this.sourcesContent = sourcesContent;
+	  this._mappings = mappings;
+	  this.file = file;
+	}
+
+	BasicSourceMapConsumer.prototype = Object.create(SourceMapConsumer.prototype);
+	BasicSourceMapConsumer.prototype.consumer = SourceMapConsumer;
+
+	/**
+	 * Create a BasicSourceMapConsumer from a SourceMapGenerator.
+	 *
+	 * @param SourceMapGenerator aSourceMap
+	 *        The source map that will be consumed.
+	 * @returns BasicSourceMapConsumer
+	 */
+	BasicSourceMapConsumer.fromSourceMap = function SourceMapConsumer_fromSourceMap(aSourceMap) {
+	  var smc = Object.create(BasicSourceMapConsumer.prototype);
+
+	  var names = smc._names = ArraySet.fromArray(aSourceMap._names.toArray(), true);
+	  var sources = smc._sources = ArraySet.fromArray(aSourceMap._sources.toArray(), true);
+	  smc.sourceRoot = aSourceMap._sourceRoot;
+	  smc.sourcesContent = aSourceMap._generateSourcesContent(smc._sources.toArray(), smc.sourceRoot);
+	  smc.file = aSourceMap._file;
+
+	  // Because we are modifying the entries (by converting string sources and
+	  // names to indices into the sources and names ArraySets), we have to make
+	  // a copy of the entry or else bad things happen. Shared mutable state
+	  // strikes again! See github issue #191.
+
+	  var generatedMappings = aSourceMap._mappings.toArray().slice();
+	  var destGeneratedMappings = smc.__generatedMappings = [];
+	  var destOriginalMappings = smc.__originalMappings = [];
+
+	  for (var i = 0, length = generatedMappings.length; i < length; i++) {
+	    var srcMapping = generatedMappings[i];
+	    var destMapping = new Mapping();
+	    destMapping.generatedLine = srcMapping.generatedLine;
+	    destMapping.generatedColumn = srcMapping.generatedColumn;
+
+	    if (srcMapping.source) {
+	      destMapping.source = sources.indexOf(srcMapping.source);
+	      destMapping.originalLine = srcMapping.originalLine;
+	      destMapping.originalColumn = srcMapping.originalColumn;
+
+	      if (srcMapping.name) {
+	        destMapping.name = names.indexOf(srcMapping.name);
+	      }
+
+	      destOriginalMappings.push(destMapping);
+	    }
+
+	    destGeneratedMappings.push(destMapping);
+	  }
+
+	  quickSort(smc.__originalMappings, util.compareByOriginalPositions);
+
+	  return smc;
+	};
+
+	/**
+	 * The version of the source mapping spec that we are consuming.
+	 */
+	BasicSourceMapConsumer.prototype._version = 3;
+
+	/**
+	 * The list of original sources.
+	 */
+	Object.defineProperty(BasicSourceMapConsumer.prototype, 'sources', {
+	  get: function get() {
+	    return this._sources.toArray().map(function (s) {
+	      return this.sourceRoot != null ? util.join(this.sourceRoot, s) : s;
+	    }, this);
+	  }
+	});
+
+	/**
+	 * Provide the JIT with a nice shape / hidden class.
+	 */
+	function Mapping() {
+	  this.generatedLine = 0;
+	  this.generatedColumn = 0;
+	  this.source = null;
+	  this.originalLine = null;
+	  this.originalColumn = null;
+	  this.name = null;
+	}
+
+	/**
+	 * Parse the mappings in a string in to a data structure which we can easily
+	 * query (the ordered arrays in the `this.__generatedMappings` and
+	 * `this.__originalMappings` properties).
+	 */
+	BasicSourceMapConsumer.prototype._parseMappings = function SourceMapConsumer_parseMappings(aStr, aSourceRoot) {
+	  var generatedLine = 1;
+	  var previousGeneratedColumn = 0;
+	  var previousOriginalLine = 0;
+	  var previousOriginalColumn = 0;
+	  var previousSource = 0;
+	  var previousName = 0;
+	  var length = aStr.length;
+	  var index = 0;
+	  var cachedSegments = {};
+	  var temp = {};
+	  var originalMappings = [];
+	  var generatedMappings = [];
+	  var mapping, str, segment, end, value;
+
+	  while (index < length) {
+	    if (aStr.charAt(index) === ';') {
+	      generatedLine++;
+	      index++;
+	      previousGeneratedColumn = 0;
+	    } else if (aStr.charAt(index) === ',') {
+	      index++;
+	    } else {
+	      mapping = new Mapping();
+	      mapping.generatedLine = generatedLine;
+
+	      // Because each offset is encoded relative to the previous one,
+	      // many segments often have the same encoding. We can exploit this
+	      // fact by caching the parsed variable length fields of each segment,
+	      // allowing us to avoid a second parse if we encounter the same
+	      // segment again.
+	      for (end = index; end < length; end++) {
+	        if (this._charIsMappingSeparator(aStr, end)) {
+	          break;
+	        }
+	      }
+	      str = aStr.slice(index, end);
+
+	      segment = cachedSegments[str];
+	      if (segment) {
+	        index += str.length;
+	      } else {
+	        segment = [];
+	        while (index < end) {
+	          base64VLQ.decode(aStr, index, temp);
+	          value = temp.value;
+	          index = temp.rest;
+	          segment.push(value);
+	        }
+
+	        if (segment.length === 2) {
+	          throw new Error('Found a source, but no line and column');
+	        }
+
+	        if (segment.length === 3) {
+	          throw new Error('Found a source and line, but no column');
+	        }
+
+	        cachedSegments[str] = segment;
+	      }
+
+	      // Generated column.
+	      mapping.generatedColumn = previousGeneratedColumn + segment[0];
+	      previousGeneratedColumn = mapping.generatedColumn;
+
+	      if (segment.length > 1) {
+	        // Original source.
+	        mapping.source = previousSource + segment[1];
+	        previousSource += segment[1];
+
+	        // Original line.
+	        mapping.originalLine = previousOriginalLine + segment[2];
+	        previousOriginalLine = mapping.originalLine;
+	        // Lines are stored 0-based
+	        mapping.originalLine += 1;
+
+	        // Original column.
+	        mapping.originalColumn = previousOriginalColumn + segment[3];
+	        previousOriginalColumn = mapping.originalColumn;
+
+	        if (segment.length > 4) {
+	          // Original name.
+	          mapping.name = previousName + segment[4];
+	          previousName += segment[4];
+	        }
+	      }
+
+	      generatedMappings.push(mapping);
+	      if (typeof mapping.originalLine === 'number') {
+	        originalMappings.push(mapping);
+	      }
+	    }
+	  }
+
+	  quickSort(generatedMappings, util.compareByGeneratedPositionsDeflated);
+	  this.__generatedMappings = generatedMappings;
+
+	  quickSort(originalMappings, util.compareByOriginalPositions);
+	  this.__originalMappings = originalMappings;
+	};
+
+	/**
+	 * Find the mapping that best matches the hypothetical "needle" mapping that
+	 * we are searching for in the given "haystack" of mappings.
+	 */
+	BasicSourceMapConsumer.prototype._findMapping = function SourceMapConsumer_findMapping(aNeedle, aMappings, aLineName, aColumnName, aComparator, aBias) {
+	  // To return the position we are searching for, we must first find the
+	  // mapping for the given position and then return the opposite position it
+	  // points to. Because the mappings are sorted, we can use binary search to
+	  // find the best mapping.
+
+	  if (aNeedle[aLineName] <= 0) {
+	    throw new TypeError('Line must be greater than or equal to 1, got ' + aNeedle[aLineName]);
+	  }
+	  if (aNeedle[aColumnName] < 0) {
+	    throw new TypeError('Column must be greater than or equal to 0, got ' + aNeedle[aColumnName]);
+	  }
+
+	  return binarySearch.search(aNeedle, aMappings, aComparator, aBias);
+	};
+
+	/**
+	 * Compute the last column for each generated mapping. The last column is
+	 * inclusive.
+	 */
+	BasicSourceMapConsumer.prototype.computeColumnSpans = function SourceMapConsumer_computeColumnSpans() {
+	  for (var index = 0; index < this._generatedMappings.length; ++index) {
+	    var mapping = this._generatedMappings[index];
+
+	    // Mappings do not contain a field for the last generated columnt. We
+	    // can come up with an optimistic estimate, however, by assuming that
+	    // mappings are contiguous (i.e. given two consecutive mappings, the
+	    // first mapping ends where the second one starts).
+	    if (index + 1 < this._generatedMappings.length) {
+	      var nextMapping = this._generatedMappings[index + 1];
+
+	      if (mapping.generatedLine === nextMapping.generatedLine) {
+	        mapping.lastGeneratedColumn = nextMapping.generatedColumn - 1;
+	        continue;
+	      }
+	    }
+
+	    // The last mapping for each line spans the entire line.
+	    mapping.lastGeneratedColumn = Infinity;
+	  }
+	};
+
+	/**
+	 * Returns the original source, line, and column information for the generated
+	 * source's line and column positions provided. The only argument is an object
+	 * with the following properties:
+	 *
+	 *   - line: The line number in the generated source.
+	 *   - column: The column number in the generated source.
+	 *   - bias: Either 'SourceMapConsumer.GREATEST_LOWER_BOUND' or
+	 *     'SourceMapConsumer.LEAST_UPPER_BOUND'. Specifies whether to return the
+	 *     closest element that is smaller than or greater than the one we are
+	 *     searching for, respectively, if the exact element cannot be found.
+	 *     Defaults to 'SourceMapConsumer.GREATEST_LOWER_BOUND'.
+	 *
+	 * and an object is returned with the following properties:
+	 *
+	 *   - source: The original source file, or null.
+	 *   - line: The line number in the original source, or null.
+	 *   - column: The column number in the original source, or null.
+	 *   - name: The original identifier, or null.
+	 */
+	BasicSourceMapConsumer.prototype.originalPositionFor = function SourceMapConsumer_originalPositionFor(aArgs) {
+	  var needle = {
+	    generatedLine: util.getArg(aArgs, 'line'),
+	    generatedColumn: util.getArg(aArgs, 'column')
+	  };
+
+	  var index = this._findMapping(needle, this._generatedMappings, "generatedLine", "generatedColumn", util.compareByGeneratedPositionsDeflated, util.getArg(aArgs, 'bias', SourceMapConsumer.GREATEST_LOWER_BOUND));
+
+	  if (index >= 0) {
+	    var mapping = this._generatedMappings[index];
+
+	    if (mapping.generatedLine === needle.generatedLine) {
+	      var source = util.getArg(mapping, 'source', null);
+	      if (source !== null) {
+	        source = this._sources.at(source);
+	        if (this.sourceRoot != null) {
+	          source = util.join(this.sourceRoot, source);
+	        }
+	      }
+	      var name = util.getArg(mapping, 'name', null);
+	      if (name !== null) {
+	        name = this._names.at(name);
+	      }
+	      return {
+	        source: source,
+	        line: util.getArg(mapping, 'originalLine', null),
+	        column: util.getArg(mapping, 'originalColumn', null),
+	        name: name
+	      };
+	    }
+	  }
+
+	  return {
+	    source: null,
+	    line: null,
+	    column: null,
+	    name: null
+	  };
+	};
+
+	/**
+	 * Return true if we have the source content for every source in the source
+	 * map, false otherwise.
+	 */
+	BasicSourceMapConsumer.prototype.hasContentsOfAllSources = function BasicSourceMapConsumer_hasContentsOfAllSources() {
+	  if (!this.sourcesContent) {
+	    return false;
+	  }
+	  return this.sourcesContent.length >= this._sources.size() && !this.sourcesContent.some(function (sc) {
+	    return sc == null;
+	  });
+	};
+
+	/**
+	 * Returns the original source content. The only argument is the url of the
+	 * original source file. Returns null if no original source content is
+	 * available.
+	 */
+	BasicSourceMapConsumer.prototype.sourceContentFor = function SourceMapConsumer_sourceContentFor(aSource, nullOnMissing) {
+	  if (!this.sourcesContent) {
+	    return null;
+	  }
+
+	  if (this.sourceRoot != null) {
+	    aSource = util.relative(this.sourceRoot, aSource);
+	  }
+
+	  if (this._sources.has(aSource)) {
+	    return this.sourcesContent[this._sources.indexOf(aSource)];
+	  }
+
+	  var url;
+	  if (this.sourceRoot != null && (url = util.urlParse(this.sourceRoot))) {
+	    // XXX: file:// URIs and absolute paths lead to unexpected behavior for
+	    // many users. We can help them out when they expect file:// URIs to
+	    // behave like it would if they were running a local HTTP server. See
+	    // https://bugzilla.mozilla.org/show_bug.cgi?id=885597.
+	    var fileUriAbsPath = aSource.replace(/^file:\/\//, "");
+	    if (url.scheme == "file" && this._sources.has(fileUriAbsPath)) {
+	      return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)];
+	    }
+
+	    if ((!url.path || url.path == "/") && this._sources.has("/" + aSource)) {
+	      return this.sourcesContent[this._sources.indexOf("/" + aSource)];
+	    }
+	  }
+
+	  // This function is used recursively from
+	  // IndexedSourceMapConsumer.prototype.sourceContentFor. In that case, we
+	  // don't want to throw if we can't find the source - we just want to
+	  // return null, so we provide a flag to exit gracefully.
+	  if (nullOnMissing) {
+	    return null;
+	  } else {
+	    throw new Error('"' + aSource + '" is not in the SourceMap.');
+	  }
+	};
+
+	/**
+	 * Returns the generated line and column information for the original source,
+	 * line, and column positions provided. The only argument is an object with
+	 * the following properties:
+	 *
+	 *   - source: The filename of the original source.
+	 *   - line: The line number in the original source.
+	 *   - column: The column number in the original source.
+	 *   - bias: Either 'SourceMapConsumer.GREATEST_LOWER_BOUND' or
+	 *     'SourceMapConsumer.LEAST_UPPER_BOUND'. Specifies whether to return the
+	 *     closest element that is smaller than or greater than the one we are
+	 *     searching for, respectively, if the exact element cannot be found.
+	 *     Defaults to 'SourceMapConsumer.GREATEST_LOWER_BOUND'.
+	 *
+	 * and an object is returned with the following properties:
+	 *
+	 *   - line: The line number in the generated source, or null.
+	 *   - column: The column number in the generated source, or null.
+	 */
+	BasicSourceMapConsumer.prototype.generatedPositionFor = function SourceMapConsumer_generatedPositionFor(aArgs) {
+	  var source = util.getArg(aArgs, 'source');
+	  if (this.sourceRoot != null) {
+	    source = util.relative(this.sourceRoot, source);
+	  }
+	  if (!this._sources.has(source)) {
+	    return {
+	      line: null,
+	      column: null,
+	      lastColumn: null
+	    };
+	  }
+	  source = this._sources.indexOf(source);
+
+	  var needle = {
+	    source: source,
+	    originalLine: util.getArg(aArgs, 'line'),
+	    originalColumn: util.getArg(aArgs, 'column')
+	  };
+
+	  var index = this._findMapping(needle, this._originalMappings, "originalLine", "originalColumn", util.compareByOriginalPositions, util.getArg(aArgs, 'bias', SourceMapConsumer.GREATEST_LOWER_BOUND));
+
+	  if (index >= 0) {
+	    var mapping = this._originalMappings[index];
+
+	    if (mapping.source === needle.source) {
+	      return {
+	        line: util.getArg(mapping, 'generatedLine', null),
+	        column: util.getArg(mapping, 'generatedColumn', null),
+	        lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
+	      };
+	    }
+	  }
+
+	  return {
+	    line: null,
+	    column: null,
+	    lastColumn: null
+	  };
+	};
+
+	exports.BasicSourceMapConsumer = BasicSourceMapConsumer;
+
+	/**
+	 * An IndexedSourceMapConsumer instance represents a parsed source map which
+	 * we can query for information. It differs from BasicSourceMapConsumer in
+	 * that it takes "indexed" source maps (i.e. ones with a "sections" field) as
+	 * input.
+	 *
+	 * The only parameter is a raw source map (either as a JSON string, or already
+	 * parsed to an object). According to the spec for indexed source maps, they
+	 * have the following attributes:
+	 *
+	 *   - version: Which version of the source map spec this map is following.
+	 *   - file: Optional. The generated file this source map is associated with.
+	 *   - sections: A list of section definitions.
+	 *
+	 * Each value under the "sections" field has two fields:
+	 *   - offset: The offset into the original specified at which this section
+	 *       begins to apply, defined as an object with a "line" and "column"
+	 *       field.
+	 *   - map: A source map definition. This source map could also be indexed,
+	 *       but doesn't have to be.
+	 *
+	 * Instead of the "map" field, it's also possible to have a "url" field
+	 * specifying a URL to retrieve a source map from, but that's currently
+	 * unsupported.
+	 *
+	 * Here's an example source map, taken from the source map spec[0], but
+	 * modified to omit a section which uses the "url" field.
+	 *
+	 *  {
+	 *    version : 3,
+	 *    file: "app.js",
+	 *    sections: [{
+	 *      offset: {line:100, column:10},
+	 *      map: {
+	 *        version : 3,
+	 *        file: "section.js",
+	 *        sources: ["foo.js", "bar.js"],
+	 *        names: ["src", "maps", "are", "fun"],
+	 *        mappings: "AAAA,E;;ABCDE;"
+	 *      }
+	 *    }],
+	 *  }
+	 *
+	 * [0]: https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#heading=h.535es3xeprgt
+	 */
+	function IndexedSourceMapConsumer(aSourceMap) {
+	  var sourceMap = aSourceMap;
+	  if (typeof aSourceMap === 'string') {
+	    sourceMap = JSON.parse(aSourceMap.replace(/^\)\]\}'/, ''));
+	  }
+
+	  var version = util.getArg(sourceMap, 'version');
+	  var sections = util.getArg(sourceMap, 'sections');
+
+	  if (version != this._version) {
+	    throw new Error('Unsupported version: ' + version);
+	  }
+
+	  this._sources = new ArraySet();
+	  this._names = new ArraySet();
+
+	  var lastOffset = {
+	    line: -1,
+	    column: 0
+	  };
+	  this._sections = sections.map(function (s) {
+	    if (s.url) {
+	      // The url field will require support for asynchronicity.
+	      // See https://github.com/mozilla/source-map/issues/16
+	      throw new Error('Support for url field in sections not implemented.');
+	    }
+	    var offset = util.getArg(s, 'offset');
+	    var offsetLine = util.getArg(offset, 'line');
+	    var offsetColumn = util.getArg(offset, 'column');
+
+	    if (offsetLine < lastOffset.line || offsetLine === lastOffset.line && offsetColumn < lastOffset.column) {
+	      throw new Error('Section offsets must be ordered and non-overlapping.');
+	    }
+	    lastOffset = offset;
+
+	    return {
+	      generatedOffset: {
+	        // The offset fields are 0-based, but we use 1-based indices when
+	        // encoding/decoding from VLQ.
+	        generatedLine: offsetLine + 1,
+	        generatedColumn: offsetColumn + 1
+	      },
+	      consumer: new SourceMapConsumer(util.getArg(s, 'map'))
+	    };
+	  });
+	}
+
+	IndexedSourceMapConsumer.prototype = Object.create(SourceMapConsumer.prototype);
+	IndexedSourceMapConsumer.prototype.constructor = SourceMapConsumer;
+
+	/**
+	 * The version of the source mapping spec that we are consuming.
+	 */
+	IndexedSourceMapConsumer.prototype._version = 3;
+
+	/**
+	 * The list of original sources.
+	 */
+	Object.defineProperty(IndexedSourceMapConsumer.prototype, 'sources', {
+	  get: function get() {
+	    var sources = [];
+	    for (var i = 0; i < this._sections.length; i++) {
+	      for (var j = 0; j < this._sections[i].consumer.sources.length; j++) {
+	        sources.push(this._sections[i].consumer.sources[j]);
+	      }
+	    }
+	    return sources;
+	  }
+	});
+
+	/**
+	 * Returns the original source, line, and column information for the generated
+	 * source's line and column positions provided. The only argument is an object
+	 * with the following properties:
+	 *
+	 *   - line: The line number in the generated source.
+	 *   - column: The column number in the generated source.
+	 *
+	 * and an object is returned with the following properties:
+	 *
+	 *   - source: The original source file, or null.
+	 *   - line: The line number in the original source, or null.
+	 *   - column: The column number in the original source, or null.
+	 *   - name: The original identifier, or null.
+	 */
+	IndexedSourceMapConsumer.prototype.originalPositionFor = function IndexedSourceMapConsumer_originalPositionFor(aArgs) {
+	  var needle = {
+	    generatedLine: util.getArg(aArgs, 'line'),
+	    generatedColumn: util.getArg(aArgs, 'column')
+	  };
+
+	  // Find the section containing the generated position we're trying to map
+	  // to an original position.
+	  var sectionIndex = binarySearch.search(needle, this._sections, function (needle, section) {
+	    var cmp = needle.generatedLine - section.generatedOffset.generatedLine;
+	    if (cmp) {
+	      return cmp;
+	    }
+
+	    return needle.generatedColumn - section.generatedOffset.generatedColumn;
+	  });
+	  var section = this._sections[sectionIndex];
+
+	  if (!section) {
+	    return {
+	      source: null,
+	      line: null,
+	      column: null,
+	      name: null
+	    };
+	  }
+
+	  return section.consumer.originalPositionFor({
+	    line: needle.generatedLine - (section.generatedOffset.generatedLine - 1),
+	    column: needle.generatedColumn - (section.generatedOffset.generatedLine === needle.generatedLine ? section.generatedOffset.generatedColumn - 1 : 0),
+	    bias: aArgs.bias
+	  });
+	};
+
+	/**
+	 * Return true if we have the source content for every source in the source
+	 * map, false otherwise.
+	 */
+	IndexedSourceMapConsumer.prototype.hasContentsOfAllSources = function IndexedSourceMapConsumer_hasContentsOfAllSources() {
+	  return this._sections.every(function (s) {
+	    return s.consumer.hasContentsOfAllSources();
+	  });
+	};
+
+	/**
+	 * Returns the original source content. The only argument is the url of the
+	 * original source file. Returns null if no original source content is
+	 * available.
+	 */
+	IndexedSourceMapConsumer.prototype.sourceContentFor = function IndexedSourceMapConsumer_sourceContentFor(aSource, nullOnMissing) {
+	  for (var i = 0; i < this._sections.length; i++) {
+	    var section = this._sections[i];
+
+	    var content = section.consumer.sourceContentFor(aSource, true);
+	    if (content) {
+	      return content;
+	    }
+	  }
+	  if (nullOnMissing) {
+	    return null;
+	  } else {
+	    throw new Error('"' + aSource + '" is not in the SourceMap.');
+	  }
+	};
+
+	/**
+	 * Returns the generated line and column information for the original source,
+	 * line, and column positions provided. The only argument is an object with
+	 * the following properties:
+	 *
+	 *   - source: The filename of the original source.
+	 *   - line: The line number in the original source.
+	 *   - column: The column number in the original source.
+	 *
+	 * and an object is returned with the following properties:
+	 *
+	 *   - line: The line number in the generated source, or null.
+	 *   - column: The column number in the generated source, or null.
+	 */
+	IndexedSourceMapConsumer.prototype.generatedPositionFor = function IndexedSourceMapConsumer_generatedPositionFor(aArgs) {
+	  for (var i = 0; i < this._sections.length; i++) {
+	    var section = this._sections[i];
+
+	    // Only consider this section if the requested source is in the list of
+	    // sources of the consumer.
+	    if (section.consumer.sources.indexOf(util.getArg(aArgs, 'source')) === -1) {
+	      continue;
+	    }
+	    var generatedPosition = section.consumer.generatedPositionFor(aArgs);
+	    if (generatedPosition) {
+	      var ret = {
+	        line: generatedPosition.line + (section.generatedOffset.generatedLine - 1),
+	        column: generatedPosition.column + (section.generatedOffset.generatedLine === generatedPosition.line ? section.generatedOffset.generatedColumn - 1 : 0)
+	      };
+	      return ret;
+	    }
+	  }
+
+	  return {
+	    line: null,
+	    column: null
+	  };
+	};
+
+	/**
+	 * Parse the mappings in a string in to a data structure which we can easily
+	 * query (the ordered arrays in the `this.__generatedMappings` and
+	 * `this.__originalMappings` properties).
+	 */
+	IndexedSourceMapConsumer.prototype._parseMappings = function IndexedSourceMapConsumer_parseMappings(aStr, aSourceRoot) {
+	  this.__generatedMappings = [];
+	  this.__originalMappings = [];
+	  for (var i = 0; i < this._sections.length; i++) {
+	    var section = this._sections[i];
+	    var sectionMappings = section.consumer._generatedMappings;
+	    for (var j = 0; j < sectionMappings.length; j++) {
+	      var mapping = sectionMappings[j];
+
+	      var source = section.consumer._sources.at(mapping.source);
+	      if (section.consumer.sourceRoot !== null) {
+	        source = util.join(section.consumer.sourceRoot, source);
+	      }
+	      this._sources.add(source);
+	      source = this._sources.indexOf(source);
+
+	      var name = section.consumer._names.at(mapping.name);
+	      this._names.add(name);
+	      name = this._names.indexOf(name);
+
+	      // The mappings coming from the consumer for the section have
+	      // generated positions relative to the start of the section, so we
+	      // need to offset them to be relative to the start of the concatenated
+	      // generated file.
+	      var adjustedMapping = {
+	        source: source,
+	        generatedLine: mapping.generatedLine + (section.generatedOffset.generatedLine - 1),
+	        generatedColumn: mapping.generatedColumn + (section.generatedOffset.generatedLine === mapping.generatedLine ? section.generatedOffset.generatedColumn - 1 : 0),
+	        originalLine: mapping.originalLine,
+	        originalColumn: mapping.originalColumn,
+	        name: name
+	      };
+
+	      this.__generatedMappings.push(adjustedMapping);
+	      if (typeof adjustedMapping.originalLine === 'number') {
+	        this.__originalMappings.push(adjustedMapping);
+	      }
+	    }
+	  }
+
+	  quickSort(this.__generatedMappings, util.compareByGeneratedPositionsDeflated);
+	  quickSort(this.__originalMappings, util.compareByOriginalPositions);
+	};
+
+	exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
+
+/***/ }),
+/* 612 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	/* -*- Mode: js; js-indent-level: 2; -*- */
+	/*
+	 * Copyright 2011 Mozilla Foundation and contributors
+	 * Licensed under the New BSD license. See LICENSE or:
+	 * http://opensource.org/licenses/BSD-3-Clause
+	 */
+
+	var SourceMapGenerator = __webpack_require__(283).SourceMapGenerator;
+	var util = __webpack_require__(61);
+
+	// Matches a Windows-style `\r\n` newline or a `\n` newline used by all other
+	// operating systems these days (capturing the result).
+	var REGEX_NEWLINE = /(\r?\n)/;
+
+	// Newline character code for charCodeAt() comparisons
+	var NEWLINE_CODE = 10;
+
+	// Private symbol for identifying `SourceNode`s when multiple versions of
+	// the source-map library are loaded. This MUST NOT CHANGE across
+	// versions!
+	var isSourceNode = "$$$isSourceNode$$$";
+
+	/**
+	 * SourceNodes provide a way to abstract over interpolating/concatenating
+	 * snippets of generated JavaScript source code while maintaining the line and
+	 * column information associated with the original source code.
+	 *
+	 * @param aLine The original line number.
+	 * @param aColumn The original column number.
+	 * @param aSource The original source's filename.
+	 * @param aChunks Optional. An array of strings which are snippets of
+	 *        generated JS, or other SourceNodes.
+	 * @param aName The original identifier.
+	 */
+	function SourceNode(aLine, aColumn, aSource, aChunks, aName) {
+	  this.children = [];
+	  this.sourceContents = {};
+	  this.line = aLine == null ? null : aLine;
+	  this.column = aColumn == null ? null : aColumn;
+	  this.source = aSource == null ? null : aSource;
+	  this.name = aName == null ? null : aName;
+	  this[isSourceNode] = true;
+	  if (aChunks != null) this.add(aChunks);
+	}
+
+	/**
+	 * Creates a SourceNode from generated code and a SourceMapConsumer.
+	 *
+	 * @param aGeneratedCode The generated code
+	 * @param aSourceMapConsumer The SourceMap for the generated code
+	 * @param aRelativePath Optional. The path that relative sources in the
+	 *        SourceMapConsumer should be relative to.
+	 */
+	SourceNode.fromStringWithSourceMap = function SourceNode_fromStringWithSourceMap(aGeneratedCode, aSourceMapConsumer, aRelativePath) {
+	  // The SourceNode we want to fill with the generated code
+	  // and the SourceMap
+	  var node = new SourceNode();
+
+	  // All even indices of this array are one line of the generated code,
+	  // while all odd indices are the newlines between two adjacent lines
+	  // (since `REGEX_NEWLINE` captures its match).
+	  // Processed fragments are removed from this array, by calling `shiftNextLine`.
+	  var remainingLines = aGeneratedCode.split(REGEX_NEWLINE);
+	  var shiftNextLine = function shiftNextLine() {
+	    var lineContents = remainingLines.shift();
+	    // The last line of a file might not have a newline.
+	    var newLine = remainingLines.shift() || "";
+	    return lineContents + newLine;
+	  };
+
+	  // We need to remember the position of "remainingLines"
+	  var lastGeneratedLine = 1,
+	      lastGeneratedColumn = 0;
+
+	  // The generate SourceNodes we need a code range.
+	  // To extract it current and last mapping is used.
+	  // Here we store the last mapping.
+	  var lastMapping = null;
+
+	  aSourceMapConsumer.eachMapping(function (mapping) {
+	    if (lastMapping !== null) {
+	      // We add the code from "lastMapping" to "mapping":
+	      // First check if there is a new line in between.
+	      if (lastGeneratedLine < mapping.generatedLine) {
+	        // Associate first line with "lastMapping"
+	        addMappingWithCode(lastMapping, shiftNextLine());
+	        lastGeneratedLine++;
+	        lastGeneratedColumn = 0;
+	        // The remaining code is added without mapping
+	      } else {
+	        // There is no new line in between.
+	        // Associate the code between "lastGeneratedColumn" and
+	        // "mapping.generatedColumn" with "lastMapping"
+	        var nextLine = remainingLines[0];
+	        var code = nextLine.substr(0, mapping.generatedColumn - lastGeneratedColumn);
+	        remainingLines[0] = nextLine.substr(mapping.generatedColumn - lastGeneratedColumn);
+	        lastGeneratedColumn = mapping.generatedColumn;
+	        addMappingWithCode(lastMapping, code);
+	        // No more remaining code, continue
+	        lastMapping = mapping;
+	        return;
+	      }
+	    }
+	    // We add the generated code until the first mapping
+	    // to the SourceNode without any mapping.
+	    // Each line is added as separate string.
+	    while (lastGeneratedLine < mapping.generatedLine) {
+	      node.add(shiftNextLine());
+	      lastGeneratedLine++;
+	    }
+	    if (lastGeneratedColumn < mapping.generatedColumn) {
+	      var nextLine = remainingLines[0];
+	      node.add(nextLine.substr(0, mapping.generatedColumn));
+	      remainingLines[0] = nextLine.substr(mapping.generatedColumn);
+	      lastGeneratedColumn = mapping.generatedColumn;
+	    }
+	    lastMapping = mapping;
+	  }, this);
+	  // We have processed all mappings.
+	  if (remainingLines.length > 0) {
+	    if (lastMapping) {
+	      // Associate the remaining code in the current line with "lastMapping"
+	      addMappingWithCode(lastMapping, shiftNextLine());
+	    }
+	    // and add the remaining lines without any mapping
+	    node.add(remainingLines.join(""));
+	  }
+
+	  // Copy sourcesContent into SourceNode
+	  aSourceMapConsumer.sources.forEach(function (sourceFile) {
+	    var content = aSourceMapConsumer.sourceContentFor(sourceFile);
+	    if (content != null) {
+	      if (aRelativePath != null) {
+	        sourceFile = util.join(aRelativePath, sourceFile);
+	      }
+	      node.setSourceContent(sourceFile, content);
+	    }
+	  });
+
+	  return node;
+
+	  function addMappingWithCode(mapping, code) {
+	    if (mapping === null || mapping.source === undefined) {
+	      node.add(code);
+	    } else {
+	      var source = aRelativePath ? util.join(aRelativePath, mapping.source) : mapping.source;
+	      node.add(new SourceNode(mapping.originalLine, mapping.originalColumn, source, code, mapping.name));
+	    }
+	  }
+	};
+
+	/**
+	 * Add a chunk of generated JS to this source node.
+	 *
+	 * @param aChunk A string snippet of generated JS code, another instance of
+	 *        SourceNode, or an array where each member is one of those things.
+	 */
+	SourceNode.prototype.add = function SourceNode_add(aChunk) {
+	  if (Array.isArray(aChunk)) {
+	    aChunk.forEach(function (chunk) {
+	      this.add(chunk);
+	    }, this);
+	  } else if (aChunk[isSourceNode] || typeof aChunk === "string") {
+	    if (aChunk) {
+	      this.children.push(aChunk);
+	    }
+	  } else {
+	    throw new TypeError("Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk);
+	  }
+	  return this;
+	};
+
+	/**
+	 * Add a chunk of generated JS to the beginning of this source node.
+	 *
+	 * @param aChunk A string snippet of generated JS code, another instance of
+	 *        SourceNode, or an array where each member is one of those things.
+	 */
+	SourceNode.prototype.prepend = function SourceNode_prepend(aChunk) {
+	  if (Array.isArray(aChunk)) {
+	    for (var i = aChunk.length - 1; i >= 0; i--) {
+	      this.prepend(aChunk[i]);
+	    }
+	  } else if (aChunk[isSourceNode] || typeof aChunk === "string") {
+	    this.children.unshift(aChunk);
+	  } else {
+	    throw new TypeError("Expected a SourceNode, string, or an array of SourceNodes and strings. Got " + aChunk);
+	  }
+	  return this;
+	};
+
+	/**
+	 * Walk over the tree of JS snippets in this node and its children. The
+	 * walking function is called once for each snippet of JS and is passed that
+	 * snippet and the its original associated source's line/column location.
+	 *
+	 * @param aFn The traversal function.
+	 */
+	SourceNode.prototype.walk = function SourceNode_walk(aFn) {
+	  var chunk;
+	  for (var i = 0, len = this.children.length; i < len; i++) {
+	    chunk = this.children[i];
+	    if (chunk[isSourceNode]) {
+	      chunk.walk(aFn);
+	    } else {
+	      if (chunk !== '') {
+	        aFn(chunk, { source: this.source,
+	          line: this.line,
+	          column: this.column,
+	          name: this.name });
+	      }
+	    }
+	  }
+	};
+
+	/**
+	 * Like `String.prototype.join` except for SourceNodes. Inserts `aStr` between
+	 * each of `this.children`.
+	 *
+	 * @param aSep The separator.
+	 */
+	SourceNode.prototype.join = function SourceNode_join(aSep) {
+	  var newChildren;
+	  var i;
+	  var len = this.children.length;
+	  if (len > 0) {
+	    newChildren = [];
+	    for (i = 0; i < len - 1; i++) {
+	      newChildren.push(this.children[i]);
+	      newChildren.push(aSep);
+	    }
+	    newChildren.push(this.children[i]);
+	    this.children = newChildren;
+	  }
+	  return this;
+	};
+
+	/**
+	 * Call String.prototype.replace on the very right-most source snippet. Useful
+	 * for trimming whitespace from the end of a source node, etc.
+	 *
+	 * @param aPattern The pattern to replace.
+	 * @param aReplacement The thing to replace the pattern with.
+	 */
+	SourceNode.prototype.replaceRight = function SourceNode_replaceRight(aPattern, aReplacement) {
+	  var lastChild = this.children[this.children.length - 1];
+	  if (lastChild[isSourceNode]) {
+	    lastChild.replaceRight(aPattern, aReplacement);
+	  } else if (typeof lastChild === 'string') {
+	    this.children[this.children.length - 1] = lastChild.replace(aPattern, aReplacement);
+	  } else {
+	    this.children.push(''.replace(aPattern, aReplacement));
+	  }
+	  return this;
+	};
+
+	/**
+	 * Set the source content for a source file. This will be added to the SourceMapGenerator
+	 * in the sourcesContent field.
+	 *
+	 * @param aSourceFile The filename of the source file
+	 * @param aSourceContent The content of the source file
+	 */
+	SourceNode.prototype.setSourceContent = function SourceNode_setSourceContent(aSourceFile, aSourceContent) {
+	  this.sourceContents[util.toSetString(aSourceFile)] = aSourceContent;
+	};
+
+	/**
+	 * Walk over the tree of SourceNodes. The walking function is called for each
+	 * source file content and is passed the filename and source content.
+	 *
+	 * @param aFn The traversal function.
+	 */
+	SourceNode.prototype.walkSourceContents = function SourceNode_walkSourceContents(aFn) {
+	  for (var i = 0, len = this.children.length; i < len; i++) {
+	    if (this.children[i][isSourceNode]) {
+	      this.children[i].walkSourceContents(aFn);
+	    }
+	  }
+
+	  var sources = Object.keys(this.sourceContents);
+	  for (var i = 0, len = sources.length; i < len; i++) {
+	    aFn(util.fromSetString(sources[i]), this.sourceContents[sources[i]]);
+	  }
+	};
+
+	/**
+	 * Return the string representation of this source node. Walks over the tree
+	 * and concatenates all the various snippets together to one string.
+	 */
+	SourceNode.prototype.toString = function SourceNode_toString() {
+	  var str = "";
+	  this.walk(function (chunk) {
+	    str += chunk;
+	  });
+	  return str;
+	};
+
+	/**
+	 * Returns the string representation of this source node along with a source
+	 * map.
+	 */
+	SourceNode.prototype.toStringWithSourceMap = function SourceNode_toStringWithSourceMap(aArgs) {
+	  var generated = {
+	    code: "",
+	    line: 1,
+	    column: 0
+	  };
+	  var map = new SourceMapGenerator(aArgs);
+	  var sourceMappingActive = false;
+	  var lastOriginalSource = null;
+	  var lastOriginalLine = null;
+	  var lastOriginalColumn = null;
+	  var lastOriginalName = null;
+	  this.walk(function (chunk, original) {
+	    generated.code += chunk;
+	    if (original.source !== null && original.line !== null && original.column !== null) {
+	      if (lastOriginalSource !== original.source || lastOriginalLine !== original.line || lastOriginalColumn !== original.column || lastOriginalName !== original.name) {
+	        map.addMapping({
+	          source: original.source,
+	          original: {
+	            line: original.line,
+	            column: original.column
+	          },
+	          generated: {
+	            line: generated.line,
+	            column: generated.column
+	          },
+	          name: original.name
+	        });
+	      }
+	      lastOriginalSource = original.source;
+	      lastOriginalLine = original.line;
+	      lastOriginalColumn = original.column;
+	      lastOriginalName = original.name;
+	      sourceMappingActive = true;
+	    } else if (sourceMappingActive) {
+	      map.addMapping({
+	        generated: {
+	          line: generated.line,
+	          column: generated.column
+	        }
+	      });
+	      lastOriginalSource = null;
+	      sourceMappingActive = false;
+	    }
+	    for (var idx = 0, length = chunk.length; idx < length; idx++) {
+	      if (chunk.charCodeAt(idx) === NEWLINE_CODE) {
+	        generated.line++;
+	        generated.column = 0;
+	        // Mappings end at eol
+	        if (idx + 1 === length) {
+	          lastOriginalSource = null;
+	          sourceMappingActive = false;
+	        } else if (sourceMappingActive) {
+	          map.addMapping({
+	            source: original.source,
+	            original: {
+	              line: original.line,
+	              column: original.column
+	            },
+	            generated: {
+	              line: generated.line,
+	              column: generated.column
+	            },
+	            name: original.name
+	          });
+	        }
+	      } else {
+	        generated.column++;
+	      }
+	    }
+	  });
+	  this.walkSourceContents(function (sourceFile, sourceContent) {
+	    map.setSourceContent(sourceFile, sourceContent);
+	  });
+
+	  return { code: generated.code, map: map };
+	};
+
+	exports.SourceNode = SourceNode;
+
+/***/ }),
+/* 613 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	var ansiRegex = __webpack_require__(176)();
+
+	module.exports = function (str) {
+		return typeof str === 'string' ? str.replace(ansiRegex, '') : str;
+	};
+
+/***/ }),
+/* 614 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {'use strict';
+
+	var argv = process.argv;
+
+	var terminator = argv.indexOf('--');
+	var hasFlag = function hasFlag(flag) {
+		flag = '--' + flag;
+		var pos = argv.indexOf(flag);
+		return pos !== -1 && (terminator !== -1 ? pos < terminator : true);
+	};
+
+	module.exports = function () {
+		if ('FORCE_COLOR' in process.env) {
+			return true;
+		}
+
+		if (hasFlag('no-color') || hasFlag('no-colors') || hasFlag('color=false')) {
+			return false;
+		}
+
+		if (hasFlag('color') || hasFlag('colors') || hasFlag('color=true') || hasFlag('color=always')) {
+			return true;
+		}
+
+		if (process.stdout && !process.stdout.isTTY) {
+			return false;
+		}
+
+		if (process.platform === 'win32') {
+			return true;
+		}
+
+		if ('COLORTERM' in process.env) {
+			return true;
+		}
+
+		if (process.env.TERM === 'dumb') {
+			return false;
+		}
+
+		if (/^screen|^xterm|^vt100|color|ansi|cygwin|linux/i.test(process.env.TERM)) {
+			return true;
+		}
+
+		return false;
+	}();
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8)))
+
+/***/ }),
+/* 615 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	module.exports = function toFastproperties(o) {
+		function Sub() {}
+		Sub.prototype = o;
+		var receiver = new Sub(); // create an instance
+		function ic() {
+			return _typeof(receiver.foo);
+		} // perform access
+		ic();
+		ic();
+		return o;
+		eval("o" + o); // ensure no dead code elimination
+	};
+
+/***/ }),
+/* 616 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	module.exports = function (str) {
+		var tail = str.length;
+
+		while (/[\s\uFEFF\u00A0]/.test(str[tail - 1])) {
+			tail--;
+		}
+
+		return str.slice(0, tail);
+	};
+
+/***/ }),
+/* 617 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	if (typeof Object.create === 'function') {
+	  // implementation from standard node.js 'util' module
+	  module.exports = function inherits(ctor, superCtor) {
+	    ctor.super_ = superCtor;
+	    ctor.prototype = Object.create(superCtor.prototype, {
+	      constructor: {
+	        value: ctor,
+	        enumerable: false,
+	        writable: true,
+	        configurable: true
+	      }
+	    });
+	  };
+	} else {
+	  // old school shim for old browsers
+	  module.exports = function inherits(ctor, superCtor) {
+	    ctor.super_ = superCtor;
+	    var TempCtor = function TempCtor() {};
+	    TempCtor.prototype = superCtor.prototype;
+	    ctor.prototype = new TempCtor();
+	    ctor.prototype.constructor = ctor;
+	  };
+	}
+
+/***/ }),
+/* 618 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	module.exports = function isBuffer(arg) {
+	  return arg && (typeof arg === 'undefined' ? 'undefined' : _typeof(arg)) === 'object' && typeof arg.copy === 'function' && typeof arg.fill === 'function' && typeof arg.readUInt8 === 'function';
+	};
+
+/***/ }),
+/* 619 */
+/***/ (function(module, exports, __webpack_require__) {
+
+	"use strict";
+
+	Object.defineProperty(exports, "__esModule", {
+	  value: true
+	});
+	/**
+	 * A shim that replaces Babel's require('package.json') statement.
+	 * Babel requires the entire package.json file just to get the version number.
+	 */
+	var version = exports.version = ("6.25.0");
+
+/***/ }),
+/* 620 */
+/***/ (function(module, exports) {
+
+	'use strict';
+
+	Object.defineProperty(exports, "__esModule", {
+	  value: true
+	});
+
+	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+	exports.runScripts = runScripts;
+	/**
+	 * Copyright 2013-2015, Facebook, Inc.
+	 * All rights reserved.
+	 *
+	 * This source code is licensed under the BSD-style license found in the
+	 * LICENSE file in the root directory of the React source tree. An additional
+	 * grant of patent rights can be found in the PATENTS file in the same directory.
+	 */
+
+	var scriptTypes = ['text/jsx', 'text/babel'];
+
+	var headEl = void 0;
+	var inlineScriptCount = 0;
+
+	/**
+	 * Actually transform the code.
+	 */
+	function transformCode(transformFn, script) {
+	  var source = void 0;
+	  if (script.url != null) {
+	    source = script.url;
+	  } else {
+	    source = 'Inline Babel script';
+	    inlineScriptCount++;
+	    if (inlineScriptCount > 1) {
+	      source += ' (' + inlineScriptCount + ')';
+	    }
+	  }
+
+	  return transformFn(script.content, _extends({
+	    filename: source
+	  }, buildBabelOptions(script))).code;
+	}
+
+	/**
+	 * Builds the Babel options for transforming the specified script, using some
+	 * sensible default presets and plugins if none were explicitly provided.
+	 */
+	function buildBabelOptions(script) {
+	  return {
+	    presets: script.presets || ['react', 'es2015'],
+	    plugins: script.plugins || ['transform-class-properties', 'transform-object-rest-spread', 'transform-flow-strip-types'],
+	    sourceMaps: 'inline'
+	  };
+	}
+
+	/**
+	 * Appends a script element at the end of the <head> with the content of code,
+	 * after transforming it.
+	 */
+	function run(transformFn, script) {
+	  var scriptEl = document.createElement('script');
+	  scriptEl.text = transformCode(transformFn, script);
+	  headEl.appendChild(scriptEl);
+	}
+
+	/**
+	 * Load script from the provided url and pass the content to the callback.
+	 */
+	function load(url, successCallback, errorCallback) {
+	  var xhr = new XMLHttpRequest();
+
+	  // async, however scripts will be executed in the order they are in the
+	  // DOM to mirror normal script loading.
+	  xhr.open('GET', url, true);
+	  if ('overrideMimeType' in xhr) {
+	    xhr.overrideMimeType('text/plain');
+	  }
+	  xhr.onreadystatechange = function () {
+	    if (xhr.readyState === 4) {
+	      if (xhr.status === 0 || xhr.status === 200) {
+	        successCallback(xhr.responseText);
+	      } else {
+	        errorCallback();
+	        throw new Error('Could not load ' + url);
+	      }
+	    }
+	  };
+	  return xhr.send(null);
+	}
+
+	/**
+	 * Converts a comma-separated data attribute string into an array of values. If
+	 * the string is empty, returns an empty array. If the string is not defined,
+	 * returns null.
+	 */
+	function getPluginsOrPresetsFromScript(script, attributeName) {
+	  var rawValue = script.getAttribute(attributeName);
+	  if (rawValue === '') {
+	    // Empty string means to not load ANY presets or plugins
+	    return [];
+	  }
+	  if (!rawValue) {
+	    // Any other falsy value (null, undefined) means we're not overriding this
+	    // setting, and should use the default.
+	    return null;
+	  }
+	  return rawValue.split(',').map(function (item) {
+	    return item.trim();
+	  });
+	}
+
+	/**
+	 * Loop over provided script tags and get the content, via innerHTML if an
+	 * inline script, or by using XHR. Transforms are applied if needed. The scripts
+	 * are executed in the order they are found on the page.
+	 */
+	function loadScripts(transformFn, scripts) {
+	  var result = [];
+	  var count = scripts.length;
+
+	  function check() {
+	    var script, i;
+
+	    for (i = 0; i < count; i++) {
+	      script = result[i];
+
+	      if (script.loaded && !script.executed) {
+	        script.executed = true;
+	        run(transformFn, script);
+	      } else if (!script.loaded && !script.error && !script.async) {
+	        break;
+	      }
+	    }
+	  }
+
+	  scripts.forEach(function (script, i) {
+	    var scriptData = {
+	      // script.async is always true for non-JavaScript script tags
+	      async: script.hasAttribute('async'),
+	      error: false,
+	      executed: false,
+	      plugins: getPluginsOrPresetsFromScript(script, 'data-plugins'),
+	      presets: getPluginsOrPresetsFromScript(script, 'data-presets')
+	    };
+
+	    if (script.src) {
+	      result[i] = _extends({}, scriptData, {
+	        content: null,
+	        loaded: false,
+	        url: script.src
+	      });
+
+	      load(script.src, function (content) {
+	        result[i].loaded = true;
+	        result[i].content = content;
+	        check();
+	      }, function () {
+	        result[i].error = true;
+	        check();
+	      });
+	    } else {
+	      result[i] = _extends({}, scriptData, {
+	        content: script.innerHTML,
+	        loaded: true,
+	        url: null
+	      });
+	    }
+	  });
+
+	  check();
+	}
+
+	/**
+	 * Run script tags with type="text/jsx".
+	 * @param {Array} scriptTags specify script tags to run, run all in the <head> if not given
+	 */
+	function runScripts(transformFn, scripts) {
+	  headEl = document.getElementsByTagName('head')[0];
+	  if (!scripts) {
+	    scripts = document.getElementsByTagName('script');
+	  }
+
+	  // Array.prototype.slice cannot be used on NodeList on IE8
+	  var jsxScripts = [];
+	  for (var i = 0; i < scripts.length; i++) {
+	    var script = scripts.item(i);
+	    // Support the old type="text/jsx;harmony=true"
+	    var type = script.type.split(';')[0];
+	    if (scriptTypes.indexOf(type) !== -1) {
+	      jsxScripts.push(script);
+	    }
+	  }
+
+	  if (jsxScripts.length === 0) {
+	    return;
+	  }
+
+	  console.warn('You are using the in-browser Babel transformer. Be sure to precompile ' + 'your scripts for production - https://babeljs.io/docs/setup/');
+
+	  loadScripts(transformFn, jsxScripts);
+	}
+
+/***/ }),
+/* 621 */
+/***/ (function(module, exports) {
+
+	module.exports = {
+		"builtin": {
+			"Array": false,
+			"ArrayBuffer": false,
+			"Boolean": false,
+			"constructor": false,
+			"DataView": false,
+			"Date": false,
+			"decodeURI": false,
+			"decodeURIComponent": false,
+			"encodeURI": false,
+			"encodeURIComponent": false,
+			"Error": false,
+			"escape": false,
+			"eval": false,
+			"EvalError": false,
+			"Float32Array": false,
+			"Float64Array": false,
+			"Function": false,
+			"hasOwnProperty": false,
+			"Infinity": false,
+			"Int16Array": false,
+			"Int32Array": false,
+			"Int8Array": false,
+			"isFinite": false,
+			"isNaN": false,
+			"isPrototypeOf": false,
+			"JSON": false,
+			"Map": false,
+			"Math": false,
+			"NaN": false,
+			"Number": false,
+			"Object": false,
+			"parseFloat": false,
+			"parseInt": false,
+			"Promise": false,
+			"propertyIsEnumerable": false,
+			"Proxy": false,
+			"RangeError": false,
+			"ReferenceError": false,
+			"Reflect": false,
+			"RegExp": false,
+			"Set": false,
+			"String": false,
+			"Symbol": false,
+			"SyntaxError": false,
+			"System": false,
+			"toLocaleString": false,
+			"toString": false,
+			"TypeError": false,
+			"Uint16Array": false,
+			"Uint32Array": false,
+			"Uint8Array": false,
+			"Uint8ClampedArray": false,
+			"undefined": false,
+			"unescape": false,
+			"URIError": false,
+			"valueOf": false,
+			"WeakMap": false,
+			"WeakSet": false
+		},
+		"es5": {
+			"Array": false,
+			"Boolean": false,
+			"constructor": false,
+			"Date": false,
+			"decodeURI": false,
+			"decodeURIComponent": false,
+			"encodeURI": false,
+			"encodeURIComponent": false,
+			"Error": false,
+			"escape": false,
+			"eval": false,
+			"EvalError": false,
+			"Function": false,
+			"hasOwnProperty": false,
+			"Infinity": false,
+			"isFinite": false,
+			"isNaN": false,
+			"isPrototypeOf": false,
+			"JSON": false,
+			"Math": false,
+			"NaN": false,
+			"Number": false,
+			"Object": false,
+			"parseFloat": false,
+			"parseInt": false,
+			"propertyIsEnumerable": false,
+			"RangeError": false,
+			"ReferenceError": false,
+			"RegExp": false,
+			"String": false,
+			"SyntaxError": false,
+			"toLocaleString": false,
+			"toString": false,
+			"TypeError": false,
+			"undefined": false,
+			"unescape": false,
+			"URIError": false,
+			"valueOf": false
+		},
+		"es6": {
+			"Array": false,
+			"ArrayBuffer": false,
+			"Boolean": false,
+			"constructor": false,
+			"DataView": false,
+			"Date": false,
+			"decodeURI": false,
+			"decodeURIComponent": false,
+			"encodeURI": false,
+			"encodeURIComponent": false,
+			"Error": false,
+			"escape": false,
+			"eval": false,
+			"EvalError": false,
+			"Float32Array": false,
+			"Float64Array": false,
+			"Function": false,
+			"hasOwnProperty": false,
+			"Infinity": false,
+			"Int16Array": false,
+			"Int32Array": false,
+			"Int8Array": false,
+			"isFinite": false,
+			"isNaN": false,
+			"isPrototypeOf": false,
+			"JSON": false,
+			"Map": false,
+			"Math": false,
+			"NaN": false,
+			"Number": false,
+			"Object": false,
+			"parseFloat": false,
+			"parseInt": false,
+			"Promise": false,
+			"propertyIsEnumerable": false,
+			"Proxy": false,
+			"RangeError": false,
+			"ReferenceError": false,
+			"Reflect": false,
+			"RegExp": false,
+			"Set": false,
+			"String": false,
+			"Symbol": false,
+			"SyntaxError": false,
+			"System": false,
+			"toLocaleString": false,
+			"toString": false,
+			"TypeError": false,
+			"Uint16Array": false,
+			"Uint32Array": false,
+			"Uint8Array": false,
+			"Uint8ClampedArray": false,
+			"undefined": false,
+			"unescape": false,
+			"URIError": false,
+			"valueOf": false,
+			"WeakMap": false,
+			"WeakSet": false
+		},
+		"browser": {
+			"addEventListener": false,
+			"alert": false,
+			"AnalyserNode": false,
+			"Animation": false,
+			"AnimationEffectReadOnly": false,
+			"AnimationEffectTiming": false,
+			"AnimationEffectTimingReadOnly": false,
+			"AnimationEvent": false,
+			"AnimationPlaybackEvent": false,
+			"AnimationTimeline": false,
+			"applicationCache": false,
+			"ApplicationCache": false,
+			"ApplicationCacheErrorEvent": false,
+			"atob": false,
+			"Attr": false,
+			"Audio": false,
+			"AudioBuffer": false,
+			"AudioBufferSourceNode": false,
+			"AudioContext": false,
+			"AudioDestinationNode": false,
+			"AudioListener": false,
+			"AudioNode": false,
+			"AudioParam": false,
+			"AudioProcessingEvent": false,
+			"AutocompleteErrorEvent": false,
+			"BarProp": false,
+			"BatteryManager": false,
+			"BeforeUnloadEvent": false,
+			"BiquadFilterNode": false,
+			"Blob": false,
+			"blur": false,
+			"btoa": false,
+			"Cache": false,
+			"caches": false,
+			"CacheStorage": false,
+			"cancelAnimationFrame": false,
+			"cancelIdleCallback": false,
+			"CanvasGradient": false,
+			"CanvasPattern": false,
+			"CanvasRenderingContext2D": false,
+			"CDATASection": false,
+			"ChannelMergerNode": false,
+			"ChannelSplitterNode": false,
+			"CharacterData": false,
+			"clearInterval": false,
+			"clearTimeout": false,
+			"clientInformation": false,
+			"ClientRect": false,
+			"ClientRectList": false,
+			"ClipboardEvent": false,
+			"close": false,
+			"closed": false,
+			"CloseEvent": false,
+			"Comment": false,
+			"CompositionEvent": false,
+			"confirm": false,
+			"console": false,
+			"ConvolverNode": false,
+			"createImageBitmap": false,
+			"Credential": false,
+			"CredentialsContainer": false,
+			"crypto": false,
+			"Crypto": false,
+			"CryptoKey": false,
+			"CSS": false,
+			"CSSAnimation": false,
+			"CSSFontFaceRule": false,
+			"CSSImportRule": false,
+			"CSSKeyframeRule": false,
+			"CSSKeyframesRule": false,
+			"CSSMediaRule": false,
+			"CSSPageRule": false,
+			"CSSRule": false,
+			"CSSRuleList": false,
+			"CSSStyleDeclaration": false,
+			"CSSStyleRule": false,
+			"CSSStyleSheet": false,
+			"CSSSupportsRule": false,
+			"CSSTransition": false,
+			"CSSUnknownRule": false,
+			"CSSViewportRule": false,
+			"customElements": false,
+			"CustomEvent": false,
+			"DataTransfer": false,
+			"DataTransferItem": false,
+			"DataTransferItemList": false,
+			"Debug": false,
+			"defaultStatus": false,
+			"defaultstatus": false,
+			"DelayNode": false,
+			"DeviceMotionEvent": false,
+			"DeviceOrientationEvent": false,
+			"devicePixelRatio": false,
+			"dispatchEvent": false,
+			"document": false,
+			"Document": false,
+			"DocumentFragment": false,
+			"DocumentTimeline": false,
+			"DocumentType": false,
+			"DOMError": false,
+			"DOMException": false,
+			"DOMImplementation": false,
+			"DOMParser": false,
+			"DOMSettableTokenList": false,
+			"DOMStringList": false,
+			"DOMStringMap": false,
+			"DOMTokenList": false,
+			"DragEvent": false,
+			"DynamicsCompressorNode": false,
+			"Element": false,
+			"ElementTimeControl": false,
+			"ErrorEvent": false,
+			"event": false,
+			"Event": false,
+			"EventSource": false,
+			"EventTarget": false,
+			"external": false,
+			"FederatedCredential": false,
+			"fetch": false,
+			"File": false,
+			"FileError": false,
+			"FileList": false,
+			"FileReader": false,
+			"find": false,
+			"focus": false,
+			"FocusEvent": false,
+			"FontFace": false,
+			"FormData": false,
+			"frameElement": false,
+			"frames": false,
+			"GainNode": false,
+			"Gamepad": false,
+			"GamepadButton": false,
+			"GamepadEvent": false,
+			"getComputedStyle": false,
+			"getSelection": false,
+			"HashChangeEvent": false,
+			"Headers": false,
+			"history": false,
+			"History": false,
+			"HTMLAllCollection": false,
+			"HTMLAnchorElement": false,
+			"HTMLAppletElement": false,
+			"HTMLAreaElement": false,
+			"HTMLAudioElement": false,
+			"HTMLBaseElement": false,
+			"HTMLBlockquoteElement": false,
+			"HTMLBodyElement": false,
+			"HTMLBRElement": false,
+			"HTMLButtonElement": false,
+			"HTMLCanvasElement": false,
+			"HTMLCollection": false,
+			"HTMLContentElement": false,
+			"HTMLDataListElement": false,
+			"HTMLDetailsElement": false,
+			"HTMLDialogElement": false,
+			"HTMLDirectoryElement": false,
+			"HTMLDivElement": false,
+			"HTMLDListElement": false,
+			"HTMLDocument": false,
+			"HTMLElement": false,
+			"HTMLEmbedElement": false,
+			"HTMLFieldSetElement": false,
+			"HTMLFontElement": false,
+			"HTMLFormControlsCollection": false,
+			"HTMLFormElement": false,
+			"HTMLFrameElement": false,
+			"HTMLFrameSetElement": false,
+			"HTMLHeadElement": false,
+			"HTMLHeadingElement": false,
+			"HTMLHRElement": false,
+			"HTMLHtmlElement": false,
+			"HTMLIFrameElement": false,
+			"HTMLImageElement": false,
+			"HTMLInputElement": false,
+			"HTMLIsIndexElement": false,
+			"HTMLKeygenElement": false,
+			"HTMLLabelElement": false,
+			"HTMLLayerElement": false,
+			"HTMLLegendElement": false,
+			"HTMLLIElement": false,
+			"HTMLLinkElement": false,
+			"HTMLMapElement": false,
+			"HTMLMarqueeElement": false,
+			"HTMLMediaElement": false,
+			"HTMLMenuElement": false,
+			"HTMLMetaElement": false,
+			"HTMLMeterElement": false,
+			"HTMLModElement": false,
+			"HTMLObjectElement": false,
+			"HTMLOListElement": false,
+			"HTMLOptGroupElement": false,
+			"HTMLOptionElement": false,
+			"HTMLOptionsCollection": false,
+			"HTMLOutputElement": false,
+			"HTMLParagraphElement": false,
+			"HTMLParamElement": false,
+			"HTMLPictureElement": false,
+			"HTMLPreElement": false,
+			"HTMLProgressElement": false,
+			"HTMLQuoteElement": false,
+			"HTMLScriptElement": false,
+			"HTMLSelectElement": false,
+			"HTMLShadowElement": false,
+			"HTMLSourceElement": false,
+			"HTMLSpanElement": false,
+			"HTMLStyleElement": false,
+			"HTMLTableCaptionElement": false,
+			"HTMLTableCellElement": false,
+			"HTMLTableColElement": false,
+			"HTMLTableElement": false,
+			"HTMLTableRowElement": false,
+			"HTMLTableSectionElement": false,
+			"HTMLTemplateElement": false,
+			"HTMLTextAreaElement": false,
+			"HTMLTitleElement": false,
+			"HTMLTrackElement": false,
+			"HTMLUListElement": false,
+			"HTMLUnknownElement": false,
+			"HTMLVideoElement": false,
+			"IDBCursor": false,
+			"IDBCursorWithValue": false,
+			"IDBDatabase": false,
+			"IDBEnvironment": false,
+			"IDBFactory": false,
+			"IDBIndex": false,
+			"IDBKeyRange": false,
+			"IDBObjectStore": false,
+			"IDBOpenDBRequest": false,
+			"IDBRequest": false,
+			"IDBTransaction": false,
+			"IDBVersionChangeEvent": false,
+			"Image": false,
+			"ImageBitmap": false,
+			"ImageData": false,
+			"indexedDB": false,
+			"innerHeight": false,
+			"innerWidth": false,
+			"InputEvent": false,
+			"InputMethodContext": false,
+			"IntersectionObserver": false,
+			"IntersectionObserverEntry": false,
+			"Intl": false,
+			"KeyboardEvent": false,
+			"KeyframeEffect": false,
+			"KeyframeEffectReadOnly": false,
+			"length": false,
+			"localStorage": false,
+			"location": false,
+			"Location": false,
+			"locationbar": false,
+			"matchMedia": false,
+			"MediaElementAudioSourceNode": false,
+			"MediaEncryptedEvent": false,
+			"MediaError": false,
+			"MediaKeyError": false,
+			"MediaKeyEvent": false,
+			"MediaKeyMessageEvent": false,
+			"MediaKeys": false,
+			"MediaKeySession": false,
+			"MediaKeyStatusMap": false,
+			"MediaKeySystemAccess": false,
+			"MediaList": false,
+			"MediaQueryList": false,
+			"MediaQueryListEvent": false,
+			"MediaSource": false,
+			"MediaRecorder": false,
+			"MediaStream": false,
+			"MediaStreamAudioDestinationNode": false,
+			"MediaStreamAudioSourceNode": false,
+			"MediaStreamEvent": false,
+			"MediaStreamTrack": false,
+			"menubar": false,
+			"MessageChannel": false,
+			"MessageEvent": false,
+			"MessagePort": false,
+			"MIDIAccess": false,
+			"MIDIConnectionEvent": false,
+			"MIDIInput": false,
+			"MIDIInputMap": false,
+			"MIDIMessageEvent": false,
+			"MIDIOutput": false,
+			"MIDIOutputMap": false,
+			"MIDIPort": false,
+			"MimeType": false,
+			"MimeTypeArray": false,
+			"MouseEvent": false,
+			"moveBy": false,
+			"moveTo": false,
+			"MutationEvent": false,
+			"MutationObserver": false,
+			"MutationRecord": false,
+			"name": false,
+			"NamedNodeMap": false,
+			"navigator": false,
+			"Navigator": false,
+			"Node": false,
+			"NodeFilter": false,
+			"NodeIterator": false,
+			"NodeList": false,
+			"Notification": false,
+			"OfflineAudioCompletionEvent": false,
+			"OfflineAudioContext": false,
+			"offscreenBuffering": false,
+			"onbeforeunload": true,
+			"onblur": true,
+			"onerror": true,
+			"onfocus": true,
+			"onload": true,
+			"onresize": true,
+			"onunload": true,
+			"open": false,
+			"openDatabase": false,
+			"opener": false,
+			"opera": false,
+			"Option": false,
+			"OscillatorNode": false,
+			"outerHeight": false,
+			"outerWidth": false,
+			"PageTransitionEvent": false,
+			"pageXOffset": false,
+			"pageYOffset": false,
+			"parent": false,
+			"PasswordCredential": false,
+			"Path2D": false,
+			"performance": false,
+			"Performance": false,
+			"PerformanceEntry": false,
+			"PerformanceMark": false,
+			"PerformanceMeasure": false,
+			"PerformanceNavigation": false,
+			"PerformanceResourceTiming": false,
+			"PerformanceTiming": false,
+			"PeriodicWave": false,
+			"Permissions": false,
+			"PermissionStatus": false,
+			"personalbar": false,
+			"Plugin": false,
+			"PluginArray": false,
+			"PopStateEvent": false,
+			"postMessage": false,
+			"print": false,
+			"ProcessingInstruction": false,
+			"ProgressEvent": false,
+			"PromiseRejectionEvent": false,
+			"prompt": false,
+			"PushManager": false,
+			"PushSubscription": false,
+			"RadioNodeList": false,
+			"Range": false,
+			"ReadableByteStream": false,
+			"ReadableStream": false,
+			"removeEventListener": false,
+			"Request": false,
+			"requestAnimationFrame": false,
+			"requestIdleCallback": false,
+			"resizeBy": false,
+			"resizeTo": false,
+			"Response": false,
+			"RTCIceCandidate": false,
+			"RTCSessionDescription": false,
+			"RTCPeerConnection": false,
+			"screen": false,
+			"Screen": false,
+			"screenLeft": false,
+			"ScreenOrientation": false,
+			"screenTop": false,
+			"screenX": false,
+			"screenY": false,
+			"ScriptProcessorNode": false,
+			"scroll": false,
+			"scrollbars": false,
+			"scrollBy": false,
+			"scrollTo": false,
+			"scrollX": false,
+			"scrollY": false,
+			"SecurityPolicyViolationEvent": false,
+			"Selection": false,
+			"self": false,
+			"ServiceWorker": false,
+			"ServiceWorkerContainer": false,
+			"ServiceWorkerRegistration": false,
+			"sessionStorage": false,
+			"setInterval": false,
+			"setTimeout": false,
+			"ShadowRoot": false,
+			"SharedKeyframeList": false,
+			"SharedWorker": false,
+			"showModalDialog": false,
+			"SiteBoundCredential": false,
+			"speechSynthesis": false,
+			"SpeechSynthesisEvent": false,
+			"SpeechSynthesisUtterance": false,
+			"status": false,
+			"statusbar": false,
+			"stop": false,
+			"Storage": false,
+			"StorageEvent": false,
+			"styleMedia": false,
+			"StyleSheet": false,
+			"StyleSheetList": false,
+			"SubtleCrypto": false,
+			"SVGAElement": false,
+			"SVGAltGlyphDefElement": false,
+			"SVGAltGlyphElement": false,
+			"SVGAltGlyphItemElement": false,
+			"SVGAngle": false,
+			"SVGAnimateColorElement": false,
+			"SVGAnimatedAngle": false,
+			"SVGAnimatedBoolean": false,
+			"SVGAnimatedEnumeration": false,
+			"SVGAnimatedInteger": false,
+			"SVGAnimatedLength": false,
+			"SVGAnimatedLengthList": false,
+			"SVGAnimatedNumber": false,
+			"SVGAnimatedNumberList": false,
+			"SVGAnimatedPathData": false,
+			"SVGAnimatedPoints": false,
+			"SVGAnimatedPreserveAspectRatio": false,
+			"SVGAnimatedRect": false,
+			"SVGAnimatedString": false,
+			"SVGAnimatedTransformList": false,
+			"SVGAnimateElement": false,
+			"SVGAnimateMotionElement": false,
+			"SVGAnimateTransformElement": false,
+			"SVGAnimationElement": false,
+			"SVGCircleElement": false,
+			"SVGClipPathElement": false,
+			"SVGColor": false,
+			"SVGColorProfileElement": false,
+			"SVGColorProfileRule": false,
+			"SVGComponentTransferFunctionElement": false,
+			"SVGCSSRule": false,
+			"SVGCursorElement": false,
+			"SVGDefsElement": false,
+			"SVGDescElement": false,
+			"SVGDiscardElement": false,
+			"SVGDocument": false,
+			"SVGElement": false,
+			"SVGElementInstance": false,
+			"SVGElementInstanceList": false,
+			"SVGEllipseElement": false,
+			"SVGEvent": false,
+			"SVGExternalResourcesRequired": false,
+			"SVGFEBlendElement": false,
+			"SVGFEColorMatrixElement": false,
+			"SVGFEComponentTransferElement": false,
+			"SVGFECompositeElement": false,
+			"SVGFEConvolveMatrixElement": false,
+			"SVGFEDiffuseLightingElement": false,
+			"SVGFEDisplacementMapElement": false,
+			"SVGFEDistantLightElement": false,
+			"SVGFEDropShadowElement": false,
+			"SVGFEFloodElement": false,
+			"SVGFEFuncAElement": false,
+			"SVGFEFuncBElement": false,
+			"SVGFEFuncGElement": false,
+			"SVGFEFuncRElement": false,
+			"SVGFEGaussianBlurElement": false,
+			"SVGFEImageElement": false,
+			"SVGFEMergeElement": false,
+			"SVGFEMergeNodeElement": false,
+			"SVGFEMorphologyElement": false,
+			"SVGFEOffsetElement": false,
+			"SVGFEPointLightElement": false,
+			"SVGFESpecularLightingElement": false,
+			"SVGFESpotLightElement": false,
+			"SVGFETileElement": false,
+			"SVGFETurbulenceElement": false,
+			"SVGFilterElement": false,
+			"SVGFilterPrimitiveStandardAttributes": false,
+			"SVGFitToViewBox": false,
+			"SVGFontElement": false,
+			"SVGFontFaceElement": false,
+			"SVGFontFaceFormatElement": false,
+			"SVGFontFaceNameElement": false,
+			"SVGFontFaceSrcElement": false,
+			"SVGFontFaceUriElement": false,
+			"SVGForeignObjectElement": false,
+			"SVGGElement": false,
+			"SVGGeometryElement": false,
+			"SVGGlyphElement": false,
+			"SVGGlyphRefElement": false,
+			"SVGGradientElement": false,
+			"SVGGraphicsElement": false,
+			"SVGHKernElement": false,
+			"SVGICCColor": false,
+			"SVGImageElement": false,
+			"SVGLangSpace": false,
+			"SVGLength": false,
+			"SVGLengthList": false,
+			"SVGLinearGradientElement": false,
+			"SVGLineElement": false,
+			"SVGLocatable": false,
+			"SVGMarkerElement": false,
+			"SVGMaskElement": false,
+			"SVGMatrix": false,
+			"SVGMetadataElement": false,
+			"SVGMissingGlyphElement": false,
+			"SVGMPathElement": false,
+			"SVGNumber": false,
+			"SVGNumberList": false,
+			"SVGPaint": false,
+			"SVGPathElement": false,
+			"SVGPathSeg": false,
+			"SVGPathSegArcAbs": false,
+			"SVGPathSegArcRel": false,
+			"SVGPathSegClosePath": false,
+			"SVGPathSegCurvetoCubicAbs": false,
+			"SVGPathSegCurvetoCubicRel": false,
+			"SVGPathSegCurvetoCubicSmoothAbs": false,
+			"SVGPathSegCurvetoCubicSmoothRel": false,
+			"SVGPathSegCurvetoQuadraticAbs": false,
+			"SVGPathSegCurvetoQuadraticRel": false,
+			"SVGPathSegCurvetoQuadraticSmoothAbs": false,
+			"SVGPathSegCurvetoQuadraticSmoothRel": false,
+			"SVGPathSegLinetoAbs": false,
+			"SVGPathSegLinetoHorizontalAbs": false,
+			"SVGPathSegLinetoHorizontalRel": false,
+			"SVGPathSegLinetoRel": false,
+			"SVGPathSegLinetoVerticalAbs": false,
+			"SVGPathSegLinetoVerticalRel": false,
+			"SVGPathSegList": false,
+			"SVGPathSegMovetoAbs": false,
+			"SVGPathSegMovetoRel": false,
+			"SVGPatternElement": false,
+			"SVGPoint": false,
+			"SVGPointList": false,
+			"SVGPolygonElement": false,
+			"SVGPolylineElement": false,
+			"SVGPreserveAspectRatio": false,
+			"SVGRadialGradientElement": false,
+			"SVGRect": false,
+			"SVGRectElement": false,
+			"SVGRenderingIntent": false,
+			"SVGScriptElement": false,
+			"SVGSetElement": false,
+			"SVGStopElement": false,
+			"SVGStringList": false,
+			"SVGStylable": false,
+			"SVGStyleElement": false,
+			"SVGSVGElement": false,
+			"SVGSwitchElement": false,
+			"SVGSymbolElement": false,
+			"SVGTests": false,
+			"SVGTextContentElement": false,
+			"SVGTextElement": false,
+			"SVGTextPathElement": false,
+			"SVGTextPositioningElement": false,
+			"SVGTitleElement": false,
+			"SVGTransform": false,
+			"SVGTransformable": false,
+			"SVGTransformList": false,
+			"SVGTRefElement": false,
+			"SVGTSpanElement": false,
+			"SVGUnitTypes": false,
+			"SVGURIReference": false,
+			"SVGUseElement": false,
+			"SVGViewElement": false,
+			"SVGViewSpec": false,
+			"SVGVKernElement": false,
+			"SVGZoomAndPan": false,
+			"SVGZoomEvent": false,
+			"Text": false,
+			"TextDecoder": false,
+			"TextEncoder": false,
+			"TextEvent": false,
+			"TextMetrics": false,
+			"TextTrack": false,
+			"TextTrackCue": false,
+			"TextTrackCueList": false,
+			"TextTrackList": false,
+			"TimeEvent": false,
+			"TimeRanges": false,
+			"toolbar": false,
+			"top": false,
+			"Touch": false,
+			"TouchEvent": false,
+			"TouchList": false,
+			"TrackEvent": false,
+			"TransitionEvent": false,
+			"TreeWalker": false,
+			"UIEvent": false,
+			"URL": false,
+			"URLSearchParams": false,
+			"ValidityState": false,
+			"VTTCue": false,
+			"WaveShaperNode": false,
+			"WebGLActiveInfo": false,
+			"WebGLBuffer": false,
+			"WebGLContextEvent": false,
+			"WebGLFramebuffer": false,
+			"WebGLProgram": false,
+			"WebGLRenderbuffer": false,
+			"WebGLRenderingContext": false,
+			"WebGLShader": false,
+			"WebGLShaderPrecisionFormat": false,
+			"WebGLTexture": false,
+			"WebGLUniformLocation": false,
+			"WebSocket": false,
+			"WheelEvent": false,
+			"window": false,
+			"Window": false,
+			"Worker": false,
+			"XDomainRequest": false,
+			"XMLDocument": false,
+			"XMLHttpRequest": false,
+			"XMLHttpRequestEventTarget": false,
+			"XMLHttpRequestProgressEvent": false,
+			"XMLHttpRequestUpload": false,
+			"XMLSerializer": false,
+			"XPathEvaluator": false,
+			"XPathException": false,
+			"XPathExpression": false,
+			"XPathNamespace": false,
+			"XPathNSResolver": false,
+			"XPathResult": false,
+			"XSLTProcessor": false
+		},
+		"worker": {
+			"applicationCache": false,
+			"atob": false,
+			"Blob": false,
+			"BroadcastChannel": false,
+			"btoa": false,
+			"Cache": false,
+			"caches": false,
+			"clearInterval": false,
+			"clearTimeout": false,
+			"close": true,
+			"console": false,
+			"fetch": false,
+			"FileReaderSync": false,
+			"FormData": false,
+			"Headers": false,
+			"IDBCursor": false,
+			"IDBCursorWithValue": false,
+			"IDBDatabase": false,
+			"IDBFactory": false,
+			"IDBIndex": false,
+			"IDBKeyRange": false,
+			"IDBObjectStore": false,
+			"IDBOpenDBRequest": false,
+			"IDBRequest": false,
+			"IDBTransaction": false,
+			"IDBVersionChangeEvent": false,
+			"ImageData": false,
+			"importScripts": true,
+			"indexedDB": false,
+			"location": false,
+			"MessageChannel": false,
+			"MessagePort": false,
+			"name": false,
+			"navigator": false,
+			"Notification": false,
+			"onclose": true,
+			"onconnect": true,
+			"onerror": true,
+			"onlanguagechange": true,
+			"onmessage": true,
+			"onoffline": true,
+			"ononline": true,
+			"onrejectionhandled": true,
+			"onunhandledrejection": true,
+			"performance": false,
+			"Performance": false,
+			"PerformanceEntry": false,
+			"PerformanceMark": false,
+			"PerformanceMeasure": false,
+			"PerformanceNavigation": false,
+			"PerformanceResourceTiming": false,
+			"PerformanceTiming": false,
+			"postMessage": true,
+			"Promise": false,
+			"Request": false,
+			"Response": false,
+			"self": true,
+			"ServiceWorkerRegistration": false,
+			"setInterval": false,
+			"setTimeout": false,
+			"TextDecoder": false,
+			"TextEncoder": false,
+			"URL": false,
+			"URLSearchParams": false,
+			"WebSocket": false,
+			"Worker": false,
+			"XMLHttpRequest": false
+		},
+		"node": {
+			"__dirname": false,
+			"__filename": false,
+			"arguments": false,
+			"Buffer": false,
+			"clearImmediate": false,
+			"clearInterval": false,
+			"clearTimeout": false,
+			"console": false,
+			"exports": true,
+			"GLOBAL": false,
+			"global": false,
+			"Intl": false,
+			"module": false,
+			"process": false,
+			"require": false,
+			"root": false,
+			"setImmediate": false,
+			"setInterval": false,
+			"setTimeout": false
+		},
+		"commonjs": {
+			"exports": true,
+			"module": false,
+			"require": false,
+			"global": false
+		},
+		"amd": {
+			"define": false,
+			"require": false
+		},
+		"mocha": {
+			"after": false,
+			"afterEach": false,
+			"before": false,
+			"beforeEach": false,
+			"context": false,
+			"describe": false,
+			"it": false,
+			"mocha": false,
+			"run": false,
+			"setup": false,
+			"specify": false,
+			"suite": false,
+			"suiteSetup": false,
+			"suiteTeardown": false,
+			"teardown": false,
+			"test": false,
+			"xcontext": false,
+			"xdescribe": false,
+			"xit": false,
+			"xspecify": false
+		},
+		"jasmine": {
+			"afterAll": false,
+			"afterEach": false,
+			"beforeAll": false,
+			"beforeEach": false,
+			"describe": false,
+			"expect": false,
+			"fail": false,
+			"fdescribe": false,
+			"fit": false,
+			"it": false,
+			"jasmine": false,
+			"pending": false,
+			"runs": false,
+			"spyOn": false,
+			"spyOnProperty": false,
+			"waits": false,
+			"waitsFor": false,
+			"xdescribe": false,
+			"xit": false
+		},
+		"jest": {
+			"afterAll": false,
+			"afterEach": false,
+			"beforeAll": false,
+			"beforeEach": false,
+			"check": false,
+			"describe": false,
+			"expect": false,
+			"gen": false,
+			"it": false,
+			"fdescribe": false,
+			"fit": false,
+			"jest": false,
+			"pit": false,
+			"require": false,
+			"test": false,
+			"xdescribe": false,
+			"xit": false,
+			"xtest": false
+		},
+		"qunit": {
+			"asyncTest": false,
+			"deepEqual": false,
+			"equal": false,
+			"expect": false,
+			"module": false,
+			"notDeepEqual": false,
+			"notEqual": false,
+			"notOk": false,
+			"notPropEqual": false,
+			"notStrictEqual": false,
+			"ok": false,
+			"propEqual": false,
+			"QUnit": false,
+			"raises": false,
+			"start": false,
+			"stop": false,
+			"strictEqual": false,
+			"test": false,
+			"throws": false
+		},
+		"phantomjs": {
+			"console": true,
+			"exports": true,
+			"phantom": true,
+			"require": true,
+			"WebPage": true
+		},
+		"couch": {
+			"emit": false,
+			"exports": false,
+			"getRow": false,
+			"log": false,
+			"module": false,
+			"provides": false,
+			"require": false,
+			"respond": false,
+			"send": false,
+			"start": false,
+			"sum": false
+		},
+		"rhino": {
+			"defineClass": false,
+			"deserialize": false,
+			"gc": false,
+			"help": false,
+			"importClass": false,
+			"importPackage": false,
+			"java": false,
+			"load": false,
+			"loadClass": false,
+			"Packages": false,
+			"print": false,
+			"quit": false,
+			"readFile": false,
+			"readUrl": false,
+			"runCommand": false,
+			"seal": false,
+			"serialize": false,
+			"spawn": false,
+			"sync": false,
+			"toint32": false,
+			"version": false
+		},
+		"nashorn": {
+			"__DIR__": false,
+			"__FILE__": false,
+			"__LINE__": false,
+			"com": false,
+			"edu": false,
+			"exit": false,
+			"Java": false,
+			"java": false,
+			"javafx": false,
+			"JavaImporter": false,
+			"javax": false,
+			"JSAdapter": false,
+			"load": false,
+			"loadWithNewGlobal": false,
+			"org": false,
+			"Packages": false,
+			"print": false,
+			"quit": false
+		},
+		"wsh": {
+			"ActiveXObject": true,
+			"Enumerator": true,
+			"GetObject": true,
+			"ScriptEngine": true,
+			"ScriptEngineBuildVersion": true,
+			"ScriptEngineMajorVersion": true,
+			"ScriptEngineMinorVersion": true,
+			"VBArray": true,
+			"WScript": true,
+			"WSH": true,
+			"XDomainRequest": true
+		},
+		"jquery": {
+			"$": false,
+			"jQuery": false
+		},
+		"yui": {
+			"Y": false,
+			"YUI": false,
+			"YUI_config": false
+		},
+		"shelljs": {
+			"cat": false,
+			"cd": false,
+			"chmod": false,
+			"config": false,
+			"cp": false,
+			"dirs": false,
+			"echo": false,
+			"env": false,
+			"error": false,
+			"exec": false,
+			"exit": false,
+			"find": false,
+			"grep": false,
+			"ls": false,
+			"ln": false,
+			"mkdir": false,
+			"mv": false,
+			"popd": false,
+			"pushd": false,
+			"pwd": false,
+			"rm": false,
+			"sed": false,
+			"set": false,
+			"target": false,
+			"tempdir": false,
+			"test": false,
+			"touch": false,
+			"which": false
+		},
+		"prototypejs": {
+			"$": false,
+			"$$": false,
+			"$A": false,
+			"$break": false,
+			"$continue": false,
+			"$F": false,
+			"$H": false,
+			"$R": false,
+			"$w": false,
+			"Abstract": false,
+			"Ajax": false,
+			"Autocompleter": false,
+			"Builder": false,
+			"Class": false,
+			"Control": false,
+			"Draggable": false,
+			"Draggables": false,
+			"Droppables": false,
+			"Effect": false,
+			"Element": false,
+			"Enumerable": false,
+			"Event": false,
+			"Field": false,
+			"Form": false,
+			"Hash": false,
+			"Insertion": false,
+			"ObjectRange": false,
+			"PeriodicalExecuter": false,
+			"Position": false,
+			"Prototype": false,
+			"Scriptaculous": false,
+			"Selector": false,
+			"Sortable": false,
+			"SortableObserver": false,
+			"Sound": false,
+			"Template": false,
+			"Toggle": false,
+			"Try": false
+		},
+		"meteor": {
+			"$": false,
+			"_": false,
+			"Accounts": false,
+			"AccountsClient": false,
+			"AccountsServer": false,
+			"AccountsCommon": false,
+			"App": false,
+			"Assets": false,
+			"Blaze": false,
+			"check": false,
+			"Cordova": false,
+			"DDP": false,
+			"DDPServer": false,
+			"DDPRateLimiter": false,
+			"Deps": false,
+			"EJSON": false,
+			"Email": false,
+			"HTTP": false,
+			"Log": false,
+			"Match": false,
+			"Meteor": false,
+			"Mongo": false,
+			"MongoInternals": false,
+			"Npm": false,
+			"Package": false,
+			"Plugin": false,
+			"process": false,
+			"Random": false,
+			"ReactiveDict": false,
+			"ReactiveVar": false,
+			"Router": false,
+			"ServiceConfiguration": false,
+			"Session": false,
+			"share": false,
+			"Spacebars": false,
+			"Template": false,
+			"Tinytest": false,
+			"Tracker": false,
+			"UI": false,
+			"Utils": false,
+			"WebApp": false,
+			"WebAppInternals": false
+		},
+		"mongo": {
+			"_isWindows": false,
+			"_rand": false,
+			"BulkWriteResult": false,
+			"cat": false,
+			"cd": false,
+			"connect": false,
+			"db": false,
+			"getHostName": false,
+			"getMemInfo": false,
+			"hostname": false,
+			"ISODate": false,
+			"listFiles": false,
+			"load": false,
+			"ls": false,
+			"md5sumFile": false,
+			"mkdir": false,
+			"Mongo": false,
+			"NumberInt": false,
+			"NumberLong": false,
+			"ObjectId": false,
+			"PlanCache": false,
+			"print": false,
+			"printjson": false,
+			"pwd": false,
+			"quit": false,
+			"removeFile": false,
+			"rs": false,
+			"sh": false,
+			"UUID": false,
+			"version": false,
+			"WriteResult": false
+		},
+		"applescript": {
+			"$": false,
+			"Application": false,
+			"Automation": false,
+			"console": false,
+			"delay": false,
+			"Library": false,
+			"ObjC": false,
+			"ObjectSpecifier": false,
+			"Path": false,
+			"Progress": false,
+			"Ref": false
+		},
+		"serviceworker": {
+			"caches": false,
+			"Cache": false,
+			"CacheStorage": false,
+			"Client": false,
+			"clients": false,
+			"Clients": false,
+			"ExtendableEvent": false,
+			"ExtendableMessageEvent": false,
+			"FetchEvent": false,
+			"importScripts": false,
+			"registration": false,
+			"self": false,
+			"ServiceWorker": false,
+			"ServiceWorkerContainer": false,
+			"ServiceWorkerGlobalScope": false,
+			"ServiceWorkerMessageEvent": false,
+			"ServiceWorkerRegistration": false,
+			"skipWaiting": false,
+			"WindowClient": false
+		},
+		"atomtest": {
+			"advanceClock": false,
+			"fakeClearInterval": false,
+			"fakeClearTimeout": false,
+			"fakeSetInterval": false,
+			"fakeSetTimeout": false,
+			"resetTimeouts": false,
+			"waitsForPromise": false
+		},
+		"embertest": {
+			"andThen": false,
+			"click": false,
+			"currentPath": false,
+			"currentRouteName": false,
+			"currentURL": false,
+			"fillIn": false,
+			"find": false,
+			"findWithAssert": false,
+			"keyEvent": false,
+			"pauseTest": false,
+			"resumeTest": false,
+			"triggerEvent": false,
+			"visit": false
+		},
+		"protractor": {
+			"$": false,
+			"$$": false,
+			"browser": false,
+			"By": false,
+			"by": false,
+			"DartObject": false,
+			"element": false,
+			"protractor": false
+		},
+		"shared-node-browser": {
+			"clearInterval": false,
+			"clearTimeout": false,
+			"console": false,
+			"setInterval": false,
+			"setTimeout": false
+		},
+		"webextensions": {
+			"browser": false,
+			"chrome": false,
+			"opr": false
+		},
+		"greasemonkey": {
+			"GM_addStyle": false,
+			"GM_deleteValue": false,
+			"GM_getResourceText": false,
+			"GM_getResourceURL": false,
+			"GM_getValue": false,
+			"GM_info": false,
+			"GM_listValues": false,
+			"GM_log": false,
+			"GM_openInTab": false,
+			"GM_registerMenuCommand": false,
+			"GM_setClipboard": false,
+			"GM_setValue": false,
+			"GM_xmlhttpRequest": false,
+			"unsafeWindow": false
+		}
+	};
+
+/***/ }),
+/* 622 */
+/***/ (function(module, exports) {
+
+	module.exports = {
+		"75": 8490,
+		"83": 383,
+		"107": 8490,
+		"115": 383,
+		"181": 924,
+		"197": 8491,
+		"383": 83,
+		"452": 453,
+		"453": 452,
+		"455": 456,
+		"456": 455,
+		"458": 459,
+		"459": 458,
+		"497": 498,
+		"498": 497,
+		"837": 8126,
+		"914": 976,
+		"917": 1013,
+		"920": 1012,
+		"921": 8126,
+		"922": 1008,
+		"924": 181,
+		"928": 982,
+		"929": 1009,
+		"931": 962,
+		"934": 981,
+		"937": 8486,
+		"962": 931,
+		"976": 914,
+		"977": 1012,
+		"981": 934,
+		"982": 928,
+		"1008": 922,
+		"1009": 929,
+		"1012": [
+			920,
+			977
+		],
+		"1013": 917,
+		"7776": 7835,
+		"7835": 7776,
+		"8126": [
+			837,
+			921
+		],
+		"8486": 937,
+		"8490": 75,
+		"8491": 197,
+		"66560": 66600,
+		"66561": 66601,
+		"66562": 66602,
+		"66563": 66603,
+		"66564": 66604,
+		"66565": 66605,
+		"66566": 66606,
+		"66567": 66607,
+		"66568": 66608,
+		"66569": 66609,
+		"66570": 66610,
+		"66571": 66611,
+		"66572": 66612,
+		"66573": 66613,
+		"66574": 66614,
+		"66575": 66615,
+		"66576": 66616,
+		"66577": 66617,
+		"66578": 66618,
+		"66579": 66619,
+		"66580": 66620,
+		"66581": 66621,
+		"66582": 66622,
+		"66583": 66623,
+		"66584": 66624,
+		"66585": 66625,
+		"66586": 66626,
+		"66587": 66627,
+		"66588": 66628,
+		"66589": 66629,
+		"66590": 66630,
+		"66591": 66631,
+		"66592": 66632,
+		"66593": 66633,
+		"66594": 66634,
+		"66595": 66635,
+		"66596": 66636,
+		"66597": 66637,
+		"66598": 66638,
+		"66599": 66639,
+		"66600": 66560,
+		"66601": 66561,
+		"66602": 66562,
+		"66603": 66563,
+		"66604": 66564,
+		"66605": 66565,
+		"66606": 66566,
+		"66607": 66567,
+		"66608": 66568,
+		"66609": 66569,
+		"66610": 66570,
+		"66611": 66571,
+		"66612": 66572,
+		"66613": 66573,
+		"66614": 66574,
+		"66615": 66575,
+		"66616": 66576,
+		"66617": 66577,
+		"66618": 66578,
+		"66619": 66579,
+		"66620": 66580,
+		"66621": 66581,
+		"66622": 66582,
+		"66623": 66583,
+		"66624": 66584,
+		"66625": 66585,
+		"66626": 66586,
+		"66627": 66587,
+		"66628": 66588,
+		"66629": 66589,
+		"66630": 66590,
+		"66631": 66591,
+		"66632": 66592,
+		"66633": 66593,
+		"66634": 66594,
+		"66635": 66595,
+		"66636": 66596,
+		"66637": 66597,
+		"66638": 66598,
+		"66639": 66599,
+		"68736": 68800,
+		"68737": 68801,
+		"68738": 68802,
+		"68739": 68803,
+		"68740": 68804,
+		"68741": 68805,
+		"68742": 68806,
+		"68743": 68807,
+		"68744": 68808,
+		"68745": 68809,
+		"68746": 68810,
+		"68747": 68811,
+		"68748": 68812,
+		"68749": 68813,
+		"68750": 68814,
+		"68751": 68815,
+		"68752": 68816,
+		"68753": 68817,
+		"68754": 68818,
+		"68755": 68819,
+		"68756": 68820,
+		"68757": 68821,
+		"68758": 68822,
+		"68759": 68823,
+		"68760": 68824,
+		"68761": 68825,
+		"68762": 68826,
+		"68763": 68827,
+		"68764": 68828,
+		"68765": 68829,
+		"68766": 68830,
+		"68767": 68831,
+		"68768": 68832,
+		"68769": 68833,
+		"68770": 68834,
+		"68771": 68835,
+		"68772": 68836,
+		"68773": 68837,
+		"68774": 68838,
+		"68775": 68839,
+		"68776": 68840,
+		"68777": 68841,
+		"68778": 68842,
+		"68779": 68843,
+		"68780": 68844,
+		"68781": 68845,
+		"68782": 68846,
+		"68783": 68847,
+		"68784": 68848,
+		"68785": 68849,
+		"68786": 68850,
+		"68800": 68736,
+		"68801": 68737,
+		"68802": 68738,
+		"68803": 68739,
+		"68804": 68740,
+		"68805": 68741,
+		"68806": 68742,
+		"68807": 68743,
+		"68808": 68744,
+		"68809": 68745,
+		"68810": 68746,
+		"68811": 68747,
+		"68812": 68748,
+		"68813": 68749,
+		"68814": 68750,
+		"68815": 68751,
+		"68816": 68752,
+		"68817": 68753,
+		"68818": 68754,
+		"68819": 68755,
+		"68820": 68756,
+		"68821": 68757,
+		"68822": 68758,
+		"68823": 68759,
+		"68824": 68760,
+		"68825": 68761,
+		"68826": 68762,
+		"68827": 68763,
+		"68828": 68764,
+		"68829": 68765,
+		"68830": 68766,
+		"68831": 68767,
+		"68832": 68768,
+		"68833": 68769,
+		"68834": 68770,
+		"68835": 68771,
+		"68836": 68772,
+		"68837": 68773,
+		"68838": 68774,
+		"68839": 68775,
+		"68840": 68776,
+		"68841": 68777,
+		"68842": 68778,
+		"68843": 68779,
+		"68844": 68780,
+		"68845": 68781,
+		"68846": 68782,
+		"68847": 68783,
+		"68848": 68784,
+		"68849": 68785,
+		"68850": 68786,
+		"71840": 71872,
+		"71841": 71873,
+		"71842": 71874,
+		"71843": 71875,
+		"71844": 71876,
+		"71845": 71877,
+		"71846": 71878,
+		"71847": 71879,
+		"71848": 71880,
+		"71849": 71881,
+		"71850": 71882,
+		"71851": 71883,
+		"71852": 71884,
+		"71853": 71885,
+		"71854": 71886,
+		"71855": 71887,
+		"71856": 71888,
+		"71857": 71889,
+		"71858": 71890,
+		"71859": 71891,
+		"71860": 71892,
+		"71861": 71893,
+		"71862": 71894,
+		"71863": 71895,
+		"71864": 71896,
+		"71865": 71897,
+		"71866": 71898,
+		"71867": 71899,
+		"71868": 71900,
+		"71869": 71901,
+		"71870": 71902,
+		"71871": 71903,
+		"71872": 71840,
+		"71873": 71841,
+		"71874": 71842,
+		"71875": 71843,
+		"71876": 71844,
+		"71877": 71845,
+		"71878": 71846,
+		"71879": 71847,
+		"71880": 71848,
+		"71881": 71849,
+		"71882": 71850,
+		"71883": 71851,
+		"71884": 71852,
+		"71885": 71853,
+		"71886": 71854,
+		"71887": 71855,
+		"71888": 71856,
+		"71889": 71857,
+		"71890": 71858,
+		"71891": 71859,
+		"71892": 71860,
+		"71893": 71861,
+		"71894": 71862,
+		"71895": 71863,
+		"71896": 71864,
+		"71897": 71865,
+		"71898": 71866,
+		"71899": 71867,
+		"71900": 71868,
+		"71901": 71869,
+		"71902": 71870,
+		"71903": 71871
+	};
+
+/***/ })
+/******/ ])))
+});
+;
\ No newline at end of file
diff --git a/vendor/assets/javascripts/better_markdown.js b/vendor/assets/javascripts/better_markdown.js
deleted file mode 100644
index 836b1c7e313..00000000000
--- a/vendor/assets/javascripts/better_markdown.js
+++ /dev/null
@@ -1,1518 +0,0 @@
-/*
-  This is a fork of markdown-js with a few changes to support discourse:
-
-  * We have replaced the strong/em handlers because we prefer them only to work on word
-    boundaries.
-
-  * [MOD]: non-url is fixed
-
-  // Fix code within attrs
-  if (prev && (typeof prev[0] === "string") && prev[0].match(/<[^>]+$/)) { return; }
-
-  // __RAW
-
-  // if ( next_block.match(is_list_re) || (next_block.match(/^ /) && (!next_block.match(/^ *\>/))) ) {
-
-*/
-
-// Released under MIT license
-// Copyright (c) 2009-2010 Dominic Baggott
-// Copyright (c) 2009-2010 Ash Berlin
-// Copyright (c) 2011 Christoph Dorn <christoph@christophdorn.com> (http://www.christophdorn.com)
-
-/*jshint browser:true, devel:true */
-
-(function(expose) {
-
-  var MarkdownHelpers = {};
-
-  // For Spidermonkey based engines
-  function mk_block_toSource() {
-    return "Markdown.mk_block( " +
-            uneval(this.toString()) +
-            ", " +
-            uneval(this.trailing) +
-            ", " +
-            uneval(this.lineNumber) +
-            " )";
-  }
-
-  // node
-  function mk_block_inspect() {
-    var util = require("util");
-    return "Markdown.mk_block( " +
-            util.inspect(this.toString()) +
-            ", " +
-            util.inspect(this.trailing) +
-            ", " +
-            util.inspect(this.lineNumber) +
-            " )";
-
-  }
-
-  MarkdownHelpers.mk_block = function(block, trail, line) {
-    // Be helpful for default case in tests.
-    if ( arguments.length === 1 )
-      trail = "\n\n";
-
-    // We actually need a String object, not a string primitive
-    /* jshint -W053 */
-    var s = new String(block);
-    s.trailing = trail;
-    // To make it clear its not just a string
-    s.inspect = mk_block_inspect;
-    s.toSource = mk_block_toSource;
-
-    if ( line !== undefined )
-      s.lineNumber = line;
-
-    return s;
-  };
-
-  var isArray = MarkdownHelpers.isArray = Array.isArray || function(obj) {
-    return Object.prototype.toString.call(obj) === "[object Array]";
-  };
-
-  // Don't mess with Array.prototype. Its not friendly
-  if ( Array.prototype.forEach ) {
-    MarkdownHelpers.forEach = function forEach( arr, cb, thisp ) {
-      return arr.forEach( cb, thisp );
-    };
-  }
-  else {
-    MarkdownHelpers.forEach = function forEach(arr, cb, thisp) {
-      for (var i = 0; i < arr.length; i++)
-        cb.call(thisp || arr, arr[i], i, arr);
-    };
-  }
-
-  MarkdownHelpers.isEmpty = function isEmpty( obj ) {
-    for ( var key in obj ) {
-      if ( hasOwnProperty.call( obj, key ) )
-        return false;
-    }
-    return true;
-  };
-
-  MarkdownHelpers.extract_attr = function extract_attr( jsonml ) {
-    return isArray(jsonml)
-        && jsonml.length > 1
-        && typeof jsonml[ 1 ] === "object"
-        && !( isArray(jsonml[ 1 ]) )
-        ? jsonml[ 1 ]
-        : undefined;
-  };
-
- /**
-   *  class Markdown
-   *
-   *  Markdown processing in Javascript done right. We have very particular views
-   *  on what constitutes 'right' which include:
-   *
-   *  - produces well-formed HTML (this means that em and strong nesting is
-   *    important)
-   *
-   *  - has an intermediate representation to allow processing of parsed data (We
-   *    in fact have two, both as [JsonML]: a markdown tree and an HTML tree).
-   *
-   *  - is easily extensible to add new dialects without having to rewrite the
-   *    entire parsing mechanics
-   *
-   *  - has a good test suite
-   *
-   *  This implementation fulfills all of these (except that the test suite could
-   *  do with expanding to automatically run all the fixtures from other Markdown
-   *  implementations.)
-   *
-   *  ##### Intermediate Representation
-   *
-   *  *TODO* Talk about this :) Its JsonML, but document the node names we use.
-   *
-   *  [JsonML]: http://jsonml.org/ "JSON Markup Language"
-   **/
-  var Markdown = function(dialect) {
-    switch (typeof dialect) {
-    case "undefined":
-      this.dialect = Markdown.dialects.Gruber;
-      break;
-    case "object":
-      this.dialect = dialect;
-      break;
-    default:
-      if ( dialect in Markdown.dialects )
-        this.dialect = Markdown.dialects[dialect];
-      else
-        throw new Error("Unknown Markdown dialect '" + String(dialect) + "'");
-      break;
-    }
-    this.em_state = [];
-    this.strong_state = [];
-    this.debug_indent = "";
-  };
-
-  /**
-   * Markdown.dialects
-   *
-   * Namespace of built-in dialects.
-   **/
-  Markdown.dialects = {};
-
-  // Imported functions
-  var mk_block = Markdown.mk_block = MarkdownHelpers.mk_block,
-      isArray = MarkdownHelpers.isArray;
-
-  /**
-   *  parse( markdown, [dialect] ) -> JsonML
-   *  - markdown (String): markdown string to parse
-   *  - dialect (String | Dialect): the dialect to use, defaults to gruber
-   *
-   *  Parse `markdown` and return a markdown document as a Markdown.JsonML tree.
-   **/
-  Markdown.parse = function( source, dialect ) {
-    // dialect will default if undefined
-    var md = new Markdown( dialect );
-    return md.toTree( source );
-  };
-
-  /**
-   *  count_lines( str ) -> count
-   *  - str (String): String whose lines we want to count
-   *
-   *  Counts the number of linebreaks in `str`
-   **/
-  function count_lines( str ) {
-    return str.split("\n").length - 1;
-  }
-
-  // Internal - split source into rough blocks
-  Markdown.prototype.split_blocks = function splitBlocks( input ) {
-    input = input.replace(/(\r\n|\n|\r)/g, "\n");
-    // [\s\S] matches _anything_ (newline or space)
-    // [^] is equivalent but doesn't work in IEs.
-    var re = /([\s\S]+?)($|\n#|\n(?:\s*\n|$)+)/g,
-        blocks = [],
-        m;
-
-    var line_no = 1;
-
-    if ( ( m = /^(\s*\n)/.exec(input) ) !== null ) {
-      // skip (but count) leading blank lines
-      line_no += count_lines( m[0] );
-      re.lastIndex = m[0].length;
-    }
-
-    while ( ( m = re.exec(input) ) !== null ) {
-      if (m[2] === "\n#") {
-        m[2] = "\n";
-        re.lastIndex--;
-      }
-      blocks.push( mk_block( m[1], m[2], line_no ) );
-      line_no += count_lines( m[0] );
-    }
-
-    return blocks;
-  };
-
-  /**
-   *  Markdown#processBlock( block, next ) -> undefined | [ JsonML, ... ]
-   *  - block (String): the block to process
-   *  - next (Array): the following blocks
-   *
-   * Process `block` and return an array of JsonML nodes representing `block`.
-   *
-   * It does this by asking each block level function in the dialect to process
-   * the block until one can. Succesful handling is indicated by returning an
-   * array (with zero or more JsonML nodes), failure by a false value.
-   *
-   * Blocks handlers are responsible for calling [[Markdown#processInline]]
-   * themselves as appropriate.
-   *
-   * If the blocks were split incorrectly or adjacent blocks need collapsing you
-   * can adjust `next` in place using shift/splice etc.
-   *
-   * If any of this default behaviour is not right for the dialect, you can
-   * define a `__call__` method on the dialect that will get invoked to handle
-   * the block processing.
-   */
-  Markdown.prototype.processBlock = function processBlock( block, next ) {
-    var cbs = this.dialect.block,
-        ord = cbs.__order__;
-
-    if ( "__call__" in cbs )
-      return cbs.__call__.call(this, block, next);
-
-    for ( var i = 0; i < ord.length; i++ ) {
-      //D:this.debug( "Testing", ord[i] );
-      var res = cbs[ ord[i] ].call( this, block, next );
-      if ( res ) {
-        //D:this.debug("  matched");
-        if ( !isArray(res) || ( res.length > 0 && !( isArray(res[0]) ) && ( typeof res[0] !== "string")) )
-          this.debug(ord[i], "didn't return a proper array");
-        //D:this.debug( "" );
-        return res;
-      }
-    }
-
-    // Uhoh! no match! Should we throw an error?
-    return [];
-  };
-
-  Markdown.prototype.processInline = function processInline( block ) {
-    return this.dialect.inline.__call__.call( this, String( block ) );
-  };
-
-  /**
-   *  Markdown#toTree( source ) -> JsonML
-   *  - source (String): markdown source to parse
-   *
-   *  Parse `source` into a JsonML tree representing the markdown document.
-   **/
-  // custom_tree means set this.tree to `custom_tree` and restore old value on return
-  Markdown.prototype.toTree = function toTree( source, custom_root ) {
-    var blocks = source instanceof Array ? source : this.split_blocks( source );
-
-    // Make tree a member variable so its easier to mess with in extensions
-    var old_tree = this.tree;
-    try {
-      this.tree = custom_root || this.tree || [ "markdown" ];
-
-      blocks_loop:
-      while ( blocks.length ) {
-        var b = this.processBlock( blocks.shift(), blocks );
-
-        // Reference blocks and the like won't return any content
-        if ( !b.length )
-          continue blocks_loop;
-
-        this.tree.push.apply( this.tree, b );
-      }
-      return this.tree;
-    }
-    finally {
-      if ( custom_root )
-        this.tree = old_tree;
-    }
-  };
-
-  // Noop by default
-  Markdown.prototype.debug = function () {
-    var args = Array.prototype.slice.call( arguments);
-    args.unshift(this.debug_indent);
-    if ( typeof print !== "undefined" )
-      print.apply( print, args );
-    if ( typeof console !== "undefined" && typeof console.log !== "undefined" )
-      console.log.apply( null, args );
-  };
-
-  Markdown.prototype.loop_re_over_block = function( re, block, cb ) {
-    // Dont use /g regexps with this
-    var m,
-        b = block.valueOf();
-
-    while ( b.length && (m = re.exec(b) ) !== null ) {
-      b = b.substr( m[0].length );
-      cb.call(this, m);
-    }
-    return b;
-  };
-
-  // Build default order from insertion order.
-  Markdown.buildBlockOrder = function(d) {
-    var ord = [[]];
-    for ( var i in d ) {
-      if ( i === "__order__" || i === "__call__" )
-        continue;
-
-      var priority = d[i].priority || 0;
-      ord[priority] = ord[priority] || [];
-      ord[priority].push( i );
-    }
-
-    var flattend = [];
-    for (i=ord.length-1; i>=0; i--){
-      if (ord[i]) {
-        for (var j=0; j<ord[i].length; j++){
-          flattend.push(ord[i][j]);
-        }
-      }
-    }
-
-    d.__order__ = flattend;
-  };
-
-  // Build patterns for inline matcher
-  Markdown.buildInlinePatterns = function(d) {
-    var patterns = [];
-
-    for ( var i in d ) {
-      // __foo__ is reserved and not a pattern
-      if ( i.match( /^__.*__$/) )
-        continue;
-      var l = i.replace( /([\\.*+?^$|()\[\]{}])/g, "\\$1" )
-               .replace( /\n/, "\\n" );
-      patterns.push( i.length === 1 ? l : "(?:" + l + ")" );
-    }
-
-    patterns = patterns.join("|");
-    d.__patterns__ = patterns;
-    //print("patterns:", uneval( patterns ) );
-
-    var fn = d.__call__;
-    d.__call__ = function(text, pattern) {
-      if ( pattern !== undefined )
-        return fn.call(this, text, pattern);
-      else
-        return fn.call(this, text, patterns);
-    };
-  };
-
-  var extract_attr = MarkdownHelpers.extract_attr;
-
-  /**
-   *  renderJsonML( jsonml[, options] ) -> String
-   *  - jsonml (Array): JsonML array to render to XML
-   *  - options (Object): options
-   *
-   *  Converts the given JsonML into well-formed XML.
-   *
-   *  The options currently understood are:
-   *
-   *  - root (Boolean): wether or not the root node should be included in the
-   *    output, or just its children. The default `false` is to not include the
-   *    root itself.
-   */
-  Markdown.renderJsonML = function( jsonml, options ) {
-    options = options || {};
-    // include the root element in the rendered output?
-    options.root = options.root || false;
-
-    var content = [];
-
-    if ( options.root ) {
-      content.push( render_tree( jsonml ) );
-    }
-    else {
-      jsonml.shift(); // get rid of the tag
-      if ( jsonml.length && typeof jsonml[ 0 ] === "object" && !( jsonml[ 0 ] instanceof Array ) )
-        jsonml.shift(); // get rid of the attributes
-
-      while ( jsonml.length )
-        content.push( render_tree( jsonml.shift() ) );
-    }
-
-    return content.join( "\n\n" );
-  };
-
-  /**
-   *  toHTMLTree( markdown, [dialect] ) -> JsonML
-   *  toHTMLTree( md_tree ) -> JsonML
-   *  - markdown (String): markdown string to parse
-   *  - dialect (String | Dialect): the dialect to use, defaults to gruber
-   *  - md_tree (Markdown.JsonML): parsed markdown tree
-   *
-   *  Turn markdown into HTML, represented as a JsonML tree. If a string is given
-   *  to this function, it is first parsed into a markdown tree by calling
-   *  [[parse]].
-   **/
-  Markdown.toHTMLTree = function toHTMLTree( input, dialect , options ) {
-
-    // convert string input to an MD tree
-    if ( typeof input === "string" )
-      input = this.parse( input, dialect );
-
-    // Now convert the MD tree to an HTML tree
-
-    // remove references from the tree
-    var attrs = extract_attr( input ),
-        refs = {};
-
-    if ( attrs && attrs.references )
-      refs = attrs.references;
-
-
-    var html = convert_tree_to_html( input, refs , options );
-    merge_text_nodes( html );
-    return html;
-  };
-
-  /**
-   *  toHTML( markdown, [dialect]  ) -> String
-   *  toHTML( md_tree ) -> String
-   *  - markdown (String): markdown string to parse
-   *  - md_tree (Markdown.JsonML): parsed markdown tree
-   *
-   *  Take markdown (either as a string or as a JsonML tree) and run it through
-   *  [[toHTMLTree]] then turn it into a well-formated HTML fragment.
-   **/
-  Markdown.toHTML = function toHTML( source , dialect , options ) {
-    var input = this.toHTMLTree( source , dialect , options );
-
-    return this.renderJsonML( input );
-  };
-
-  function escapeHTML( text ) {
-    if (text && text.length > 0) {
-      return text.replace( /&/g, "&amp;" )
-                 .replace( /</g, "&lt;" )
-                 .replace( />/g, "&gt;" )
-                 .replace( /"/g, "&quot;" )
-                 .replace( /'/g, "&#39;" );
-    } else {
-      return "";
-    }
-  }
-
-  function render_tree( jsonml ) {
-    // basic case
-    if ( typeof jsonml === "string" )
-      return jsonml;
-
-    if ( jsonml[0] === "__RAW" ) {
-      return jsonml[1];
-    }
-
-    var tag = jsonml.shift(),
-        attributes = {},
-        content = [];
-
-    if ( jsonml.length && typeof jsonml[ 0 ] === "object" && !( jsonml[ 0 ] instanceof Array ) )
-      attributes = jsonml.shift();
-
-    while ( jsonml.length )
-      content.push( render_tree( jsonml.shift() ) );
-
-    var tag_attrs = "";
-    if (typeof attributes.src !== 'undefined') {
-      tag_attrs += ' src="' + escapeHTML( attributes.src ) + '"';
-      delete attributes.src;
-    }
-
-    for ( var a in attributes ) {
-      var escaped = escapeHTML( attributes[ a ]);
-      if (escaped && escaped.length) {
-        tag_attrs += " " + a + '="' + escaped + '"';
-      }
-    }
-
-    // be careful about adding whitespace here for inline elements
-    if ( tag === "img" || tag === "br" || tag === "hr" )
-      return "<"+ tag + tag_attrs + "/>";
-    else
-      return "<"+ tag + tag_attrs + ">" + content.join( "" ) + "</" + tag + ">";
-  }
-
-  function convert_tree_to_html( tree, references, options ) {
-    var i;
-    options = options || {};
-
-    // shallow clone
-    var jsonml = tree.slice( 0 );
-
-    if ( typeof options.preprocessTreeNode === "function" )
-      jsonml = options.preprocessTreeNode(jsonml, references);
-
-    // Clone attributes if they exist
-    var attrs = extract_attr( jsonml );
-    if ( attrs ) {
-      jsonml[ 1 ] = {};
-      for ( i in attrs ) {
-        jsonml[ 1 ][ i ] = attrs[ i ];
-      }
-      attrs = jsonml[ 1 ];
-    }
-
-    // basic case
-    if ( typeof jsonml === "string" )
-      return jsonml;
-
-    // convert this node
-    switch ( jsonml[ 0 ] ) {
-    case "header":
-      jsonml[ 0 ] = "h" + jsonml[ 1 ].level;
-      delete jsonml[ 1 ].level;
-      break;
-    case "bulletlist":
-      jsonml[ 0 ] = "ul";
-      break;
-    case "numberlist":
-      jsonml[ 0 ] = "ol";
-      break;
-    case "listitem":
-      jsonml[ 0 ] = "li";
-      break;
-    case "para":
-      jsonml[ 0 ] = "p";
-      break;
-    case "markdown":
-      jsonml[ 0 ] = "html";
-      if ( attrs )
-        delete attrs.references;
-      break;
-    case "code_block":
-      jsonml[ 0 ] = "pre";
-      i = attrs ? 2 : 1;
-      var code = [ "code" ];
-      code.push.apply( code, jsonml.splice( i, jsonml.length - i ) );
-      jsonml[ i ] = code;
-      break;
-    case "inlinecode":
-      jsonml[ 0 ] = "code";
-      break;
-    case "img":
-      jsonml[ 1 ].src = jsonml[ 1 ].href;
-      delete jsonml[ 1 ].href;
-      break;
-    case "linebreak":
-      jsonml[ 0 ] = "br";
-      break;
-    case "link":
-      jsonml[ 0 ] = "a";
-      break;
-    case "link_ref":
-      jsonml[ 0 ] = "a";
-
-      // grab this ref and clean up the attribute node
-      var ref = references[ attrs.ref ];
-
-      // if the reference exists, make the link
-      if ( ref ) {
-        delete attrs.ref;
-
-        // add in the href and title, if present
-        attrs.href = ref.href;
-        if ( ref.title )
-          attrs.title = ref.title;
-
-        // get rid of the unneeded original text
-        delete attrs.original;
-      }
-      // the reference doesn't exist, so revert to plain text
-      else {
-        return attrs.original;
-      }
-      break;
-    case "img_ref":
-      jsonml[ 0 ] = "img";
-
-      // grab this ref and clean up the attribute node
-      var ref = references[ attrs.ref ];
-
-      // if the reference exists, make the link
-      if ( ref ) {
-        delete attrs.ref;
-
-        // add in the href and title, if present
-        attrs.src = ref.href;
-        if ( ref.title )
-          attrs.title = ref.title;
-
-        // get rid of the unneeded original text
-        delete attrs.original;
-      }
-      // the reference doesn't exist, so revert to plain text
-      else {
-        return attrs.original;
-      }
-      break;
-    }
-
-    // convert all the children
-    i = 1;
-
-    // deal with the attribute node, if it exists
-    if ( attrs ) {
-      // if there are keys, skip over it
-      for ( var key in jsonml[ 1 ] ) {
-        i = 2;
-        break;
-      }
-      // if there aren't, remove it
-      if ( i === 1 )
-        jsonml.splice( i, 1 );
-    }
-
-    for ( ; i < jsonml.length; ++i ) {
-      jsonml[ i ] = convert_tree_to_html( jsonml[ i ], references, options );
-    }
-
-    return jsonml;
-  }
-
-  // merges adjacent text nodes into a single node
-  function merge_text_nodes( jsonml ) {
-    // skip the tag name and attribute hash
-    var i = extract_attr( jsonml ) ? 2 : 1;
-
-    while ( i < jsonml.length ) {
-      // if it's a string check the next item too
-      if ( typeof jsonml[ i ] === "string" ) {
-        if ( i + 1 < jsonml.length && typeof jsonml[ i + 1 ] === "string" ) {
-          // merge the second string into the first and remove it
-          jsonml[ i ] += jsonml.splice( i + 1, 1 )[ 0 ];
-        }
-        else {
-          ++i;
-        }
-      }
-      // if it's not a string recurse
-      else {
-        merge_text_nodes( jsonml[ i ] );
-        ++i;
-      }
-    }
-  }
-
-  var DialectHelpers = {};
-  DialectHelpers.inline_until_char = function( text, want ) {
-    var consumed = 0,
-        nodes = [],
-        patterns = this.dialect.inline.__patterns__.replace('|_|', '|');
-
-    while ( true ) {
-      if ( text.charAt( consumed ) === want ) {
-        // Found the character we were looking for
-        consumed++;
-        return [ consumed, nodes ];
-      }
-
-      if ( consumed >= text.length ) {
-        // No closing char found. Abort.
-        return [consumed, null, nodes];
-      }
-
-      var res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ), patterns, [text.substr(0, consumed)]);
-      consumed += res[ 0 ];
-      // Add any returned nodes.
-      nodes.push.apply( nodes, res.slice( 1 ) );
-    }
-  };
-
-  // Helper function to make sub-classing a dialect easier
-  DialectHelpers.subclassDialect = function( d ) {
-    function Block() {}
-    Block.prototype = d.block;
-    function Inline() {}
-    Inline.prototype = d.inline;
-
-    return { block: new Block(), inline: new Inline() };
-  };
-
-  var forEach = MarkdownHelpers.forEach,
-      extract_attr = MarkdownHelpers.extract_attr,
-      mk_block = MarkdownHelpers.mk_block,
-      isEmpty = MarkdownHelpers.isEmpty,
-      inline_until_char = DialectHelpers.inline_until_char;
-
-  // A robust regexp for matching URLs. Thakns: https://gist.github.com/dperini/729294
-  var urlRegexp = /(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?/i.source;
-
-  /**
-   * Gruber dialect
-   *
-   * The default dialect that follows the rules set out by John Gruber's
-   * markdown.pl as closely as possible. Well actually we follow the behaviour of
-   * that script which in some places is not exactly what the syntax web page
-   * says.
-   **/
-  var Gruber = {
-    block: {
-      atxHeader: function atxHeader( block, next ) {
-        var m = block.match( /^(#{1,6})\s*(.*?)\s*#*\s*(?:\n|$)/ );
-
-        if ( !m )
-          return undefined;
-
-        var header = [ "header", { level: m[ 1 ].length } ];
-        Array.prototype.push.apply(header, this.processInline(m[ 2 ]));
-
-        if ( m[0].length < block.length )
-          next.unshift( mk_block( block.substr( m[0].length ), block.trailing, block.lineNumber + 2 ) );
-
-        return [ header ];
-      },
-
-      setextHeader: function setextHeader( block, next ) {
-        var m = block.match( /^(.*)\n([-=])\2\2+(?:\n|$)/ );
-
-        if ( !m )
-          return undefined;
-
-        var level = ( m[ 2 ] === "=" ) ? 1 : 2,
-            header = [ "header", { level : level } ].concat( this.processInline(m[ 1 ]) );
-
-        if ( m[0].length < block.length )
-          next.unshift( mk_block( block.substr( m[0].length ), block.trailing, block.lineNumber + 2 ) );
-
-        return [ header ];
-      },
-
-      code: function code( block, next ) {
-        // |    Foo
-        // |bar
-        // should be a code block followed by a paragraph. Fun
-        //
-        // There might also be adjacent code block to merge.
-
-        var ret = [],
-            re = /^(?: {0,3}\t| {4})(.*)\n?/;
-
-        // 4 spaces + content
-        if ( !block.match( re ) )
-          return undefined;
-
-        block_search:
-        do {
-          // Now pull out the rest of the lines
-          var b = this.loop_re_over_block(
-                    re, block.valueOf(), function( m ) { ret.push( m[1] ); } );
-
-          if ( b.length ) {
-            // Case alluded to in first comment. push it back on as a new block
-            next.unshift( mk_block(b, block.trailing) );
-            break block_search;
-          }
-          else if ( next.length ) {
-            // Check the next block - it might be code too
-            if ( !next[0].match( re ) )
-              break block_search;
-
-            // Pull how how many blanks lines follow - minus two to account for .join
-            ret.push ( block.trailing.replace(/[^\n]/g, "").substring(2) );
-
-            block = next.shift();
-          }
-          else {
-            break block_search;
-          }
-        } while ( true );
-
-        return [ [ "code_block", ret.join("\n") ] ];
-      },
-
-      horizRule: function horizRule( block, next ) {
-        // this needs to find any hr in the block to handle abutting blocks
-        var m = block.match( /^(?:([\s\S]*?)\n)?[ \t]*([-_*])(?:[ \t]*\2){2,}[ \t]*(?:\n([\s\S]*))?$/ );
-
-        if ( !m )
-          return undefined;
-
-        var jsonml = [ [ "hr" ] ];
-
-        // if there's a leading abutting block, process it
-        if ( m[ 1 ] ) {
-          var contained = mk_block( m[ 1 ], "", block.lineNumber );
-          jsonml.unshift.apply( jsonml, this.toTree( contained, [] ) );
-        }
-
-        // if there's a trailing abutting block, stick it into next
-        if ( m[ 3 ] )
-          next.unshift( mk_block( m[ 3 ], block.trailing, block.lineNumber + 1 ) );
-
-        return jsonml;
-      },
-
-      // There are two types of lists. Tight and loose. Tight lists have no whitespace
-      // between the items (and result in text just in the <li>) and loose lists,
-      // which have an empty line between list items, resulting in (one or more)
-      // paragraphs inside the <li>.
-      //
-      // There are all sorts weird edge cases about the original markdown.pl's
-      // handling of lists:
-      //
-      // * Nested lists are supposed to be indented by four chars per level. But
-      //   if they aren't, you can get a nested list by indenting by less than
-      //   four so long as the indent doesn't match an indent of an existing list
-      //   item in the 'nest stack'.
-      //
-      // * The type of the list (bullet or number) is controlled just by the
-      //    first item at the indent. Subsequent changes are ignored unless they
-      //    are for nested lists
-      //
-      lists: (function( ) {
-        // Use a closure to hide a few variables.
-        var any_list = "[*+-]|\\d+\\.",
-            bullet_list = /[*+-]/,
-            // Capture leading indent as it matters for determining nested lists.
-            is_list_re = new RegExp( "^( {0,3})(" + any_list + ")[ \t]+" ),
-            indent_re = "(?: {0,3}\\t| {4})";
-
-        // TODO: Cache this regexp for certain depths.
-        // Create a regexp suitable for matching an li for a given stack depth
-        function regex_for_depth( depth ) {
-          return new RegExp(
-            // m[1] = indent, m[2] = list_type
-            "(?:^(" + indent_re + "{0," + depth + "} {0,3})(" + any_list + ")\\s+)|" +
-            // m[3] = cont
-            "(^" + indent_re + "{0," + (depth-1) + "}[ ]{0,4})"
-          );
-        }
-        function expand_tab( input ) {
-          return input.replace( / {0,3}\t/g, "    " );
-        }
-
-        // Add inline content `inline` to `li`. inline comes from processInline
-        // so is an array of content
-        function add(li, loose, inline, nl) {
-          if ( loose ) {
-            li.push( [ "para" ].concat(inline) );
-            return;
-          }
-          // Hmmm, should this be any block level element or just paras?
-          var add_to = li[li.length -1] instanceof Array && li[li.length - 1][0] === "para"
-                     ? li[li.length -1]
-                     : li;
-
-          // If there is already some content in this list, add the new line in
-          if ( nl && li.length > 1 )
-            inline.unshift(nl);
-
-          for ( var i = 0; i < inline.length; i++ ) {
-            var what = inline[i],
-                is_str = typeof what === "string";
-            if ( is_str && add_to.length > 1 && typeof add_to[add_to.length-1] === "string" )
-              add_to[ add_to.length-1 ] += what;
-            else
-              add_to.push( what );
-          }
-        }
-
-        // contained means have an indent greater than the current one. On
-        // *every* line in the block
-        function get_contained_blocks( depth, blocks ) {
-
-          var re = new RegExp( "^(" + indent_re + "{" + depth + "}.*?\\n?)*$" ),
-              replace = new RegExp("^" + indent_re + "{" + depth + "}", "gm"),
-              ret = [];
-
-
-          while ( blocks.length > 0 ) {
-            // HACK: Fixes a v8 issue
-            test = blocks[0].replace(/^ {8,}/, '        ');
-            if ( re.exec( test ) ) {
-              var b = blocks.shift(),
-                  // Now remove that indent
-                  x = b.replace( replace, "");
-
-              ret.push( mk_block( x, b.trailing, b.lineNumber ) );
-            }
-            else
-              break;
-          }
-          return ret;
-        }
-
-        // passed to stack.forEach to turn list items up the stack into paras
-        function paragraphify(s, i, stack) {
-          var list = s.list;
-          var last_li = list[list.length-1];
-
-          if ( last_li[1] instanceof Array && last_li[1][0] === "para" )
-            return;
-
-          if ( i + 1 === stack.length ) {
-            // Last stack frame
-            // Keep the same array, but replace the contents
-            last_li.push( ["para"].concat( last_li.splice(1, last_li.length - 1) ) );
-          }
-          else {
-            var sublist = last_li.pop();
-            last_li.push( ["para"].concat( last_li.splice(1, last_li.length - 1) ), sublist );
-          }
-        }
-
-        // The matcher function
-        return function( block, next ) {
-          var m = block.match( is_list_re );
-          if ( !m )
-            return undefined;
-
-          function make_list( m ) {
-            var list = bullet_list.exec( m[2] )
-                     ? ["bulletlist"]
-                     : ["numberlist"];
-
-            stack.push( { list: list, indent: m[1] } );
-            return list;
-          }
-
-          var stack = [], // Stack of lists for nesting.
-              list = make_list( m ),
-              last_li,
-              loose = false,
-              ret = [ stack[0].list ],
-              i;
-
-          // Loop to search over block looking for inner block elements and loose lists
-          loose_search:
-          while ( true ) {
-            // Split into lines preserving new lines at end of line
-            var lines = block.split( /(?=\n)/ );
-
-            // We have to grab all lines for a li and call processInline on them
-            // once as there are some inline things that can span lines.
-            var li_accumulate = "", nl = "";
-
-            // Loop over the lines in this block looking for tight lists.
-            tight_search:
-            for ( var line_no = 0; line_no < lines.length; line_no++ ) {
-              nl = "";
-              var l = lines[line_no].replace(/^\n/, function(n) { nl = n; return ""; });
-
-              // TODO: really should cache this
-              var line_re = regex_for_depth( stack.length );
-
-              m = l.match( line_re );
-              //print( "line:", uneval(l), "\nline match:", uneval(m) );
-
-              // We have a list item
-              if ( m[1] !== undefined ) {
-                // Process the previous list item, if any
-                if ( li_accumulate.length ) {
-                  add( last_li, loose, this.processInline( li_accumulate ), nl );
-                  // Loose mode will have been dealt with. Reset it
-                  loose = false;
-                  li_accumulate = "";
-                }
-
-                m[1] = expand_tab( m[1] );
-                var wanted_depth = Math.floor(m[1].length/4)+1;
-                //print( "want:", wanted_depth, "stack:", stack.length);
-                if ( wanted_depth > stack.length ) {
-                  // Deep enough for a nested list outright
-                  //print ( "new nested list" );
-                  list = make_list( m );
-                  last_li.push( list );
-                  last_li = list[1] = [ "listitem" ];
-                }
-                else {
-                  // We aren't deep enough to be strictly a new level. This is
-                  // where Md.pl goes nuts. If the indent matches a level in the
-                  // stack, put it there, else put it one deeper then the
-                  // wanted_depth deserves.
-                  var found = false;
-                  for ( i = 0; i < stack.length; i++ ) {
-                    if ( stack[ i ].indent !== m[1] )
-                      continue;
-
-                    list = stack[ i ].list;
-                    stack.splice( i+1, stack.length - (i+1) );
-                    found = true;
-                    break;
-                  }
-
-                  if (!found) {
-                    //print("not found. l:", uneval(l));
-                    wanted_depth++;
-                    if ( wanted_depth <= stack.length ) {
-                      stack.splice(wanted_depth, stack.length - wanted_depth);
-                      //print("Desired depth now", wanted_depth, "stack:", stack.length);
-                      list = stack[wanted_depth-1].list;
-                      //print("list:", uneval(list) );
-                    }
-                    else {
-                      //print ("made new stack for messy indent");
-                      list = make_list(m);
-                      last_li.push(list);
-                    }
-                  }
-
-                  //print( uneval(list), "last", list === stack[stack.length-1].list );
-                  last_li = [ "listitem" ];
-                  list.push(last_li);
-                } // end depth of shenegains
-                nl = "";
-              }
-
-              // Add content
-              if ( l.length > m[0].length )
-                li_accumulate += nl + l.substr( m[0].length );
-            } // tight_search
-
-            if ( li_accumulate.length ) {
-
-              var contents = this.processBlock(li_accumulate, []),
-                  firstBlock = contents[0];
-
-              if (firstBlock) {
-                firstBlock.shift();
-                contents.splice.apply(contents, [0, 1].concat(firstBlock));
-                add( last_li, loose, contents, nl );
-
-                // Let's not creating a trailing \n after content in the li
-                if(last_li[last_li.length-1] === "\n") {
-                  last_li.pop();
-                }
-
-                // Loose mode will have been dealt with. Reset it
-                loose = false;
-                li_accumulate = "";
-              }
-            }
-
-            // Look at the next block - we might have a loose list. Or an extra
-            // paragraph for the current li
-            var contained = get_contained_blocks( stack.length, next );
-
-            // Deal with code blocks or properly nested lists
-            if ( contained.length > 0 ) {
-              // Make sure all listitems up the stack are paragraphs
-              forEach( stack, paragraphify, this);
-
-              last_li.push.apply( last_li, this.toTree( contained, [] ) );
-            }
-
-            var next_block = next[0] && next[0].valueOf() || "";
-
-            if ( next_block.match(is_list_re) )  {
-              block = next.shift();
-
-              // Check for an HR following a list: features/lists/hr_abutting
-              var hr = this.dialect.block.horizRule.call( this, block, next );
-
-              if ( hr ) {
-                ret.push.apply(ret, hr);
-                break;
-              }
-
-              // Add paragraphs if the indentation level stays the same
-              if (stack[stack.length-1].indent === block.match(/^\s*/)[0]) {
-                forEach( stack, paragraphify, this);
-              }
-
-              loose = true;
-              continue loose_search;
-            }
-            break;
-          } // loose_search
-
-          return ret;
-        };
-      })(),
-
-      blockquote: function blockquote( block, next ) {
-
-        // Handle quotes that have spaces before them
-        var m = /(^|\n) +(\>[\s\S]*)/.exec(block);
-        if (m && m[2] && m[2].length) {
-          var blockContents = block.replace(/(^|\n) +\>/, "$1>");
-          next.unshift(blockContents);
-          return [];
-        }
-
-        if ( !block.match( /^>/m ) )
-          return undefined;
-
-        var jsonml = [];
-
-        // separate out the leading abutting block, if any. I.e. in this case:
-        //
-        //  a
-        //  > b
-        //
-        if ( block[ 0 ] !== ">" ) {
-          var lines = block.split( /\n/ ),
-              prev = [],
-              line_no = block.lineNumber;
-
-          // keep shifting lines until you find a crotchet
-          while ( lines.length && lines[ 0 ][ 0 ] !== ">" ) {
-            prev.push( lines.shift() );
-            line_no++;
-          }
-
-          var abutting = mk_block( prev.join( "\n" ), "\n", block.lineNumber );
-          jsonml.push.apply( jsonml, this.processBlock( abutting, [] ) );
-          // reassemble new block of just block quotes!
-          block = mk_block( lines.join( "\n" ), block.trailing, line_no );
-        }
-
-        // if the next block is also a blockquote merge it in
-        while ( next.length && next[ 0 ][ 0 ] === ">" ) {
-          var b = next.shift();
-          block = mk_block( block + block.trailing + b, b.trailing, block.lineNumber );
-        }
-
-        // Strip off the leading "> " and re-process as a block.
-        var input = block.replace( /^> ?/gm, "" ),
-            old_tree = this.tree,
-            processedBlock = this.toTree( input, [ "blockquote" ] ),
-            attr = extract_attr( processedBlock );
-
-        // If any link references were found get rid of them
-        if ( attr && attr.references ) {
-          delete attr.references;
-          // And then remove the attribute object if it's empty
-          if ( isEmpty( attr ) )
-            processedBlock.splice( 1, 1 );
-        }
-
-        jsonml.push( processedBlock );
-        return jsonml;
-      },
-
-      referenceDefn: function referenceDefn( block, next) {
-        var re = /^\s*\[([^\[\]]+)\]:\s*(\S+)(?:\s+(?:(['"])(.*)\3|\((.*?)\)))?\n?/;
-        // interesting matches are [ , ref_id, url, , title, title ]
-
-        if ( !block.match(re) )
-          return undefined;
-
-        var attrs = create_attrs.call( this );
-
-        var b = this.loop_re_over_block(re, block, function( m ) {
-          create_reference(attrs, m);
-        } );
-
-        if ( b.length )
-          next.unshift( mk_block( b, block.trailing ) );
-
-        return [];
-      },
-
-      para: function para( block ) {
-        // everything's a para!
-        return [ ["para"].concat( this.processInline( block ) ) ];
-      }
-    },
-
-    inline: {
-
-      __oneElement__: function oneElement( text, patterns_or_re, previous_nodes ) {
-
-        // PERF NOTE: rewritten to avoid greedy match regex \([\s\S]*?)(...)\
-        // greedy match performs horribly with large inline blocks, it can be so
-        // slow it will crash chrome
-        patterns_or_re = patterns_or_re || this.dialect.inline.__patterns__;
-
-        var search_re = new RegExp(patterns_or_re.source || patterns_or_re);
-        var pos = text.search(search_re);
-
-        if (pos === -1) {
-          return [ text.length, text ];
-        } else if (pos !== 0) {
-          // Some un-interesting text matched. Return that first
-          return [pos, text.substring(0,pos)];
-        }
-
-        var match_re = new RegExp( "^(" + (patterns_or_re.source || patterns_or_re) + ")" );
-        var m = match_re.exec( text );
-        var res;
-        if ( m[1] in this.dialect.inline ) {
-          res = this.dialect.inline[ m[1] ].call(
-                    this,
-                    text.substr( m.index ), m, previous_nodes || [] );
-
-          // If no inline code executed, fallback
-          if (!res) {
-            var fn = this.dialect.inline[m[1][0]];
-            if (fn) {
-              res = fn.call(
-                    this,
-                    text.substr( m.index ), m, previous_nodes || [] );
-            }
-          }
-        }
-        // Default for now to make dev easier. just slurp special and output it.
-        res = res || [ m[1].length, m[1] ];
-        return res;
-      },
-
-      __call__: function inline( text, patterns ) {
-
-        var out = [],
-            res;
-
-        function add(x) {
-          //D:self.debug("  adding output", uneval(x));
-          if ( typeof x === "string" && typeof out[out.length-1] === "string" )
-            out[ out.length-1 ] += x;
-          else
-            out.push(x);
-        }
-
-        while ( text.length > 0 ) {
-          res = this.dialect.inline.__oneElement__.call(this, text, patterns, out );
-          text = text.substr( res.shift() );
-          forEach(res, add );
-        }
-
-        return out;
-      },
-
-      // These characters are interesting elsewhere, so have rules for them so that
-      // chunks of plain text blocks don't include them
-      "]": function () {},
-      "}": function () {},
-
-      __escape__ : /^\\[\\`\*_{}<>\[\]()#\+.!\-]/,
-
-      "\\": function escaped( text ) {
-        // [ length of input processed, node/children to add... ]
-        // Only esacape: \ ` * _ { } [ ] ( ) # * + - . !
-        if ( this.dialect.inline.__escape__.exec( text ) )
-          return [ 2, text.charAt( 1 ) ];
-        else
-          // Not an esacpe
-          return [ 1, "\\" ];
-      },
-
-      "![": function image( text ) {
-
-        // Without this guard V8 crashes hard on the RegExp
-        if (text.indexOf('(') >= 0 && text.indexOf(')') === -1) { return; }
-
-        // Unlike images, alt text is plain text only. no other elements are
-        // allowed in there
-
-        // ![Alt text](/path/to/img.jpg "Optional title")
-        //      1          2            3       4         <--- captures
-        //
-        // First attempt to use a strong URL regexp to catch things like parentheses. If it misses, use the
-        // old one.
-        var origMatcher = /^!\[(.*?)\][ \t]*\([ \t]*([^")]*?)(?:[ \t]+(["'])(.*?)\3)?[ \t]*\)/;
-            m = text.match(new RegExp("^!\\[(.*?)][ \\t]*\\((" + urlRegexp + ")\\)([ \\t])*([\"'].*[\"'])?")) ||
-                text.match(origMatcher);
-
-        if (m && m[2].indexOf(")]") !== -1) { m = text.match(origMatcher); }
-
-        if ( m ) {
-          if ( m[2] && m[2][0] === "<" && m[2][m[2].length-1] === ">" )
-            m[2] = m[2].substring( 1, m[2].length - 1 );
-
-          m[2] = this.dialect.inline.__call__.call( this, m[2], /\\/ )[0];
-
-          var attrs = { alt: m[1], href: m[2] || "" };
-          if ( m[4] !== undefined)
-            attrs.title = m[4];
-
-          return [ m[0].length, [ "img", attrs ] ];
-        }
-
-        // ![Alt text][id]
-        m = text.match( /^!\[(.*?)\][ \t]*\[(.*?)\]/ );
-
-        if ( m ) {
-          // We can't check if the reference is known here as it likely wont be
-          // found till after. Check it in md tree->hmtl tree conversion
-          return [ m[0].length, [ "img_ref", { alt: m[1], ref: m[2].toLowerCase(), original: m[0] } ] ];
-        }
-
-        // Just consume the '!['
-        return [ 2, "![" ];
-      },
-
-      "[": function link( text ) {
-
-        var open = 1;
-        for (var i=0; i<text.length; i++) {
-          var c = text.charAt(i);
-          if (c === '[') { open++; }
-          if (c === ']') { open--; }
-
-          if (open > 3) { return [1, "["]; }
-        }
-
-        var orig = String(text);
-        // Inline content is possible inside `link text`
-        var res = inline_until_char.call( this, text.substr(1), "]" );
-
-        // No closing ']' found. Just consume the [
-        if ( !res[1] ) {
-          return [ res[0] + 1, text.charAt(0) ].concat(res[2]);
-        }
-
-        if ( res[0] == 1 ) { return [ 2, "[]" ]; } // empty link found.
-
-        var consumed = 1 + res[ 0 ],
-            children = res[ 1 ],
-            link,
-            attrs;
-
-        // At this point the first [...] has been parsed. See what follows to find
-        // out which kind of link we are (reference or direct url)
-        text = text.substr( consumed );
-
-        // [link text](/path/to/img.jpg "Optional title")
-        //                 1            2       3         <--- captures
-        // This will capture up to the last paren in the block. We then pull
-        // back based on if there a matching ones in the url
-        //    ([here](/url/(test))
-        // The parens have to be balanced
-        var m = text.match( /^\s*\([ \t]*([^"'\s]*)(?:[ \t]+(["'])(.*?)\2)?[ \t]*\)/ );
-        if ( m ) {
-          var url = m[1].replace(/\s+$/, '');
-          consumed += m[0].length;
-
-          if ( url && url[0] === "<" && url[url.length-1] === ">" )
-            url = url.substring( 1, url.length - 1 );
-
-          // If there is a title we don't have to worry about parens in the url
-          if ( !m[3] ) {
-            var open_parens = 1; // One open that isn't in the capture
-            for ( var len = 0; len < url.length; len++ ) {
-              switch ( url[len] ) {
-              case "(":
-                open_parens++;
-                break;
-              case ")":
-                if ( --open_parens === 0) {
-                  consumed -= url.length - len;
-                  url = url.substring(0, len);
-                }
-                break;
-              }
-            }
-          }
-
-          // Process escapes only
-          url = this.dialect.inline.__call__.call( this, url, /\\/ )[0];
-
-          attrs = { href: url || "" };
-          if ( m[3] !== undefined)
-            attrs.title = m[3];
-
-          link = [ "link", attrs ].concat( children );
-          return [ consumed, link ];
-        }
-
-        if (text.indexOf('(') === 0 && text.indexOf(')') !== -1) {
-          m = text.match(new RegExp("^\\((" + urlRegexp + ")\\)"));
-          if (m && m[1]) {
-            consumed += m[0].length;
-            link = ["link", {href: m[1]}].concat(children);
-            return [consumed, link];
-          }
-        }
-
-        // [Alt text][id]
-        // [Alt text] [id]
-        m = text.match( /^\s*\[(.*?)\]/ );
-        if ( m ) {
-
-          consumed += m[ 0 ].length;
-
-          // [links][] uses links as its reference
-          attrs = { ref: ( m[ 1 ] || String(children) ).toLowerCase(),  original: orig.substr( 0, consumed ) };
-
-          if (children && children.length > 0) {
-            link = [ "link_ref", attrs ].concat( children );
-
-            // We can't check if the reference is known here as it likely wont be
-            // found till after. Check it in md tree->hmtl tree conversion.
-            // Store the original so that conversion can revert if the ref isn't found.
-            return [ consumed, link ];
-          }
-        }
-
-        // Another check for references
-        m = orig.match(/^\s*\[(.*?)\]:\s*(\S+)(?:\s+(?:(['"])(.*?)\3|\((.*?)\)))?\n?/);
-        if (m &&
-            (/^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/i.test(m[2]) ||
-             /(\/[\w~,;\-\./?%&+#=]*)/.test(m[2]))) {
-          attrs = create_attrs.call(this);
-          create_reference(attrs, m);
-
-          return [ m[0].length ];
-        }
-
-        // [id]
-        // Only if id is plain (no formatting.)
-        if ( children.length === 1 && typeof children[0] === "string" ) {
-
-          var normalized = children[0].toLowerCase().replace(/\s+/, ' ');
-          attrs = { ref: normalized,  original: orig.substr( 0, consumed ) };
-          link = [ "link_ref", attrs, children[0] ];
-          return [ consumed, link ];
-        }
-
-        // Just consume the "["
-        return [ 1, "[" ];
-      },
-
-      "<": function autoLink( text ) {
-        var m;
-
-        if ( ( m = text.match( /^<(?:((https?|ftp|mailto):[^>]+)|(.*?@.*?\.[a-zA-Z]+))>/ ) ) !== null ) {
-          if ( m[3] )
-            return [ m[0].length, [ "link", { href: "mailto:" + m[3] }, m[3] ] ];
-          else if ( m[2] === "mailto" )
-            return [ m[0].length, [ "link", { href: m[1] }, m[1].substr("mailto:".length ) ] ];
-          else
-            return [ m[0].length, [ "link", { href: m[1] }, m[1] ] ];
-        }
-
-        return [ 1, "<" ];
-      },
-
-      "`": function inlineCode( text, match, prev ) {
-
-        // If we're in a tag, don't do it.
-        if (prev && (typeof prev[0] === "string") && prev[0].match(/<[^>]+$/)) { return; }
-
-        // Inline code block. as many backticks as you like to start it
-        // Always skip over the opening ticks.
-        var m = text.match( /(`+)(([\s\S]*?)\1)/ );
-
-        if ( m && m[2] )
-          return [ m[1].length + m[2].length, [ "inlinecode", m[3] ] ];
-        else {
-          // TODO: No matching end code found - warn!
-          return [ 1, "`" ];
-        }
-      },
-
-      "  \n": function lineBreak() {
-        return [ 3, [ "linebreak" ] ];
-      }
-
-    }
-  };
-
-  // A helper function to create attributes
-  function create_attrs() {
-    if ( !extract_attr( this.tree ) ) {
-      this.tree.splice( 1, 0, {} );
-    }
-
-    var attrs = extract_attr( this.tree );
-
-    // make a references hash if it doesn't exist
-    if ( attrs.references === undefined ) {
-      attrs.references = {};
-    }
-
-    return attrs;
-  }
-
-  // Create references for attributes
-  function create_reference(attrs, m) {
-    if ( m[2] && m[2][0] === "<" && m[2][m[2].length-1] === ">" )
-      m[2] = m[2].substring( 1, m[2].length - 1 );
-
-    var ref = attrs.references[ m[1].toLowerCase() ] = {
-      href: m[2]
-    };
-
-    if ( m[4] !== undefined )
-      ref.title = m[4];
-    else if ( m[5] !== undefined )
-      ref.title = m[5];
-  }
-
-  Markdown.dialects.Gruber = Gruber;
-  Markdown.buildBlockOrder ( Markdown.dialects.Gruber.block );
-  Markdown.buildInlinePatterns( Markdown.dialects.Gruber.inline );
-
-// Include all our dependencies and return the resulting library.
-
-  expose.Markdown = Markdown;
-  expose.parse = Markdown.parse;
-  expose.toHTML = Markdown.toHTML;
-  expose.toHTMLTree = Markdown.toHTMLTree;
-  expose.renderJsonML = Markdown.renderJsonML;
-  expose.DialectHelpers = DialectHelpers;
-
-})(function() {
-  window.BetterMarkdown = {};
-  return window.BetterMarkdown;
-}());
diff --git a/vendor/assets/javascripts/div_resizer.js b/vendor/assets/javascripts/div_resizer.js
index 66ddfe9585b..9bb7b3ccc20 100644
--- a/vendor/assets/javascripts/div_resizer.js
+++ b/vendor/assets/javascripts/div_resizer.js
@@ -38,6 +38,8 @@ startDrag = function(e, opts) {
 };
 
 performDrag = function(e, opts) {
+  $(div).trigger("div-resizing");
+
   var size, sizePx, thisMousePos;
   thisMousePos = mousePosition(e).y;
   size = originalDivHeight + (originalPos - thisMousePos);
diff --git a/vendor/assets/javascripts/ember-qunit.js b/vendor/assets/javascripts/ember-qunit.js
index cf41920e2e6..fd722360ee7 100644
--- a/vendor/assets/javascripts/ember-qunit.js
+++ b/vendor/assets/javascripts/ember-qunit.js
@@ -1,116 +1,318 @@
 (function() {
 
-var define, requireModule, require, requirejs;
+var loader, define, requireModule, require, requirejs;
 
-(function() {
+(function (global) {
+  'use strict';
+
+  var heimdall = global.heimdall;
+
+  function dict() {
+    var obj = Object.create(null);
+    obj['__'] = undefined;
+    delete obj['__'];
+    return obj;
+  }
+
+  // Save off the original values of these globals, so we can restore them if someone asks us to
+  var oldGlobals = {
+    loader: loader,
+    define: define,
+    requireModule: requireModule,
+    require: require,
+    requirejs: requirejs
+  };
+
+  requirejs = require = requireModule = function (name) {
+    var pending = [];
+    var mod = findModule(name, '(require)', pending);
+
+    for (var i = pending.length - 1; i >= 0; i--) {
+      pending[i].exports();
+    }
+
+    return mod.module.exports;
+  };
+
+  loader = {
+    noConflict: function (aliases) {
+      var oldName, newName;
+
+      for (oldName in aliases) {
+        if (aliases.hasOwnProperty(oldName)) {
+          if (oldGlobals.hasOwnProperty(oldName)) {
+            newName = aliases[oldName];
+
+            global[newName] = global[oldName];
+            global[oldName] = oldGlobals[oldName];
+          }
+        }
+      }
+    }
+  };
 
   var _isArray;
   if (!Array.isArray) {
     _isArray = function (x) {
-      return Object.prototype.toString.call(x) === "[object Array]";
+      return Object.prototype.toString.call(x) === '[object Array]';
     };
   } else {
     _isArray = Array.isArray;
   }
-  
-  var registry = {}, seen = {}, state = {};
-  var FAILED = false;
 
-  define = function(name, deps, callback) {
-  
-    if (!_isArray(deps)) {
-      callback = deps;
-      deps     =  [];
-    }
-  
-    registry[name] = {
-      deps: deps,
-      callback: callback
-    };
-  };
+  var registry = dict();
+  var seen = dict();
 
-  function reify(deps, name, seen) {
-    var length = deps.length;
-    var reified = new Array(length);
-    var dep;
-    var exports;
+  var uuid = 0;
 
-    for (var i = 0, l = length; i < l; i++) {
-      dep = deps[i];
-      if (dep === 'exports') {
-        exports = reified[i] = seen;
-      } else {
-        reified[i] = require(resolve(dep, name));
-      }
-    }
-
-    return {
-      deps: reified,
-      exports: exports
-    };
+  function unsupportedModule(length) {
+    throw new Error('an unsupported module was defined, expected `define(name, deps, module)` instead got: `' + length + '` arguments to define`');
   }
 
-  requirejs = require = requireModule = function(name) {
-    if (state[name] !== FAILED &&
-        seen.hasOwnProperty(name)) {
-      return seen[name];
+  var defaultDeps = ['require', 'exports', 'module'];
+
+  function Module(name, deps, callback, alias) {
+    this.id = uuid++;
+    this.name = name;
+    this.deps = !deps.length && callback.length ? defaultDeps : deps;
+    this.module = { exports: {} };
+    this.callback = callback;
+    this.hasExportsAsDep = false;
+    this.isAlias = alias;
+    this.reified = new Array(deps.length);
+
+    /*
+       Each module normally passes through these states, in order:
+         new       : initial state
+         pending   : this module is scheduled to be executed
+         reifying  : this module's dependencies are being executed
+         reified   : this module's dependencies finished executing successfully
+         errored   : this module's dependencies failed to execute
+         finalized : this module executed successfully
+     */
+    this.state = 'new';
+  }
+
+  Module.prototype.makeDefaultExport = function () {
+    var exports = this.module.exports;
+    if (exports !== null && (typeof exports === 'object' || typeof exports === 'function') && exports['default'] === undefined && Object.isExtensible(exports)) {
+      exports['default'] = exports;
     }
-
-    if (!registry[name]) {
-      throw new Error('Could not find module ' + name);
-    }
-
-    var mod = registry[name];
-    var reified;
-    var module;
-    var loaded = false;
-
-    seen[name] = { }; // placeholder for run-time cycles
-
-    try {
-      reified = reify(mod.deps, name, seen[name]);
-      module = mod.callback.apply(this, reified.deps);
-      loaded = true;
-    } finally {
-      if (!loaded) {
-        state[name] = FAILED;
-      }
-    }
-
-    return reified.exports ? seen[name] : (seen[name] = module);
   };
 
+  Module.prototype.exports = function () {
+    // if finalized, there is no work to do. If reifying, there is a
+    // circular dependency so we must return our (partial) exports.
+    if (this.state === 'finalized' || this.state === 'reifying') {
+      return this.module.exports;
+    }
+
+    if (loader.wrapModules) {
+      this.callback = loader.wrapModules(this.name, this.callback);
+    }
+
+    this.reify();
+
+    var result = this.callback.apply(this, this.reified);
+    this.state = 'finalized';
+
+    if (!(this.hasExportsAsDep && result === undefined)) {
+      this.module.exports = result;
+    }
+    this.makeDefaultExport();
+    return this.module.exports;
+  };
+
+  Module.prototype.unsee = function () {
+    this.state = 'new';
+    this.module = { exports: {} };
+  };
+
+  Module.prototype.reify = function () {
+    if (this.state === 'reified') {
+      return;
+    }
+    this.state = 'reifying';
+    try {
+      this.reified = this._reify();
+      this.state = 'reified';
+    } finally {
+      if (this.state === 'reifying') {
+        this.state = 'errored';
+      }
+    }
+  };
+
+  Module.prototype._reify = function () {
+    var reified = this.reified.slice();
+    for (var i = 0; i < reified.length; i++) {
+      var mod = reified[i];
+      reified[i] = mod.exports ? mod.exports : mod.module.exports();
+    }
+    return reified;
+  };
+
+  Module.prototype.findDeps = function (pending) {
+    if (this.state !== 'new') {
+      return;
+    }
+
+    this.state = 'pending';
+
+    var deps = this.deps;
+
+    for (var i = 0; i < deps.length; i++) {
+      var dep = deps[i];
+      var entry = this.reified[i] = { exports: undefined, module: undefined };
+      if (dep === 'exports') {
+        this.hasExportsAsDep = true;
+        entry.exports = this.module.exports;
+      } else if (dep === 'require') {
+        entry.exports = this.makeRequire();
+      } else if (dep === 'module') {
+        entry.exports = this.module;
+      } else {
+        entry.module = findModule(resolve(dep, this.name), this.name, pending);
+      }
+    }
+  };
+
+  Module.prototype.makeRequire = function () {
+    var name = this.name;
+    var r = function (dep) {
+      return require(resolve(dep, name));
+    };
+    r['default'] = r;
+    r.has = function (dep) {
+      return has(resolve(dep, name));
+    };
+    return r;
+  };
+
+  define = function (name, deps, callback) {
+    var module = registry[name];
+
+    // If a module for this name has already been defined and is in any state
+    // other than `new` (meaning it has been or is currently being required),
+    // then we return early to avoid redefinition.
+    if (module && module.state !== 'new') {
+      return;
+    }
+
+    if (arguments.length < 2) {
+      unsupportedModule(arguments.length);
+    }
+
+    if (!_isArray(deps)) {
+      callback = deps;
+      deps = [];
+    }
+
+    if (callback instanceof Alias) {
+      registry[name] = new Module(callback.name, deps, callback, true);
+    } else {
+      registry[name] = new Module(name, deps, callback, false);
+    }
+  };
+
+  // we don't support all of AMD
+  // define.amd = {};
+
+  function Alias(path) {
+    this.name = path;
+  }
+
+  define.alias = function (path) {
+    return new Alias(path);
+  };
+
+  function missingModule(name, referrer) {
+    throw new Error('Could not find module `' + name + '` imported from `' + referrer + '`');
+  }
+
+  function findModule(name, referrer, pending) {
+    var mod = registry[name] || registry[name + '/index'];
+
+    while (mod && mod.isAlias) {
+      mod = registry[mod.name];
+    }
+
+    if (!mod) {
+      missingModule(name, referrer);
+    }
+
+    if (pending && mod.state !== 'pending' && mod.state !== 'finalized') {
+      mod.findDeps(pending);
+      pending.push(mod);
+    }
+    return mod;
+  }
+
   function resolve(child, name) {
-    if (child.charAt(0) !== '.') { return child; }
+    if (child.charAt(0) !== '.') {
+      return child;
+    }
 
     var parts = child.split('/');
     var nameParts = name.split('/');
-    var parentBase;
-
-    if (nameParts.length === 1) {
-      parentBase = nameParts;
-    } else {
-      parentBase = nameParts.slice(0, -1);
-    }
+    var parentBase = nameParts.slice(0, -1);
 
     for (var i = 0, l = parts.length; i < l; i++) {
       var part = parts[i];
 
-      if (part === '..') { parentBase.pop(); }
-      else if (part === '.') { continue; }
-      else { parentBase.push(part); }
+      if (part === '..') {
+        if (parentBase.length === 0) {
+          throw new Error('Cannot access parent module of root');
+        }
+        parentBase.pop();
+      } else if (part === '.') {
+        continue;
+      } else {
+        parentBase.push(part);
+      }
     }
 
     return parentBase.join('/');
   }
 
-  requirejs.entries = requirejs._eak_seen = registry;
-  requirejs.clear = function(){
-    requirejs.entries = requirejs._eak_seen = registry = {};
-    seen = state = {};
-  };
-})();
+  function has(name) {
+    return !!(registry[name] || registry[name + '/index']);
+  }
 
+  requirejs.entries = requirejs._eak_seen = registry;
+  requirejs.has = has;
+  requirejs.unsee = function (moduleName) {
+    findModule(moduleName, '(unsee)', false).unsee();
+  };
+
+  requirejs.clear = function () {
+    requirejs.entries = requirejs._eak_seen = registry = dict();
+    seen = dict();
+  };
+
+  // This code primes the JS engine for good performance by warming the
+  // JIT compiler for these functions.
+  define('foo', function () {});
+  define('foo/bar', [], function () {});
+  define('foo/asdf', ['module', 'exports', 'require'], function (module, exports, require) {
+    if (require.has('foo/bar')) {
+      require('foo/bar');
+    }
+  });
+  define('foo/baz', [], define.alias('foo'));
+  define('foo/quz', define.alias('foo'));
+  define('foo/bar', ['foo', './quz', './baz', './asdf', './bar', '../foo'], function () {});
+  define('foo/main', ['foo/bar'], function () {});
+
+  require('foo/main');
+  require.unsee('foo/bar');
+
+  requirejs.clear();
+
+  if (typeof exports === 'object' && typeof module === 'object' && module.exports) {
+    module.exports = { require: require, define: define };
+  }
+})(this);
 define('ember-qunit', ['exports', 'ember-qunit/module-for', 'ember-qunit/module-for-component', 'ember-qunit/module-for-model', 'ember-qunit/adapter', 'ember-test-helpers', 'qunit'], function (exports, _emberQunitModuleFor, _emberQunitModuleForComponent, _emberQunitModuleForModel, _emberQunitAdapter, _emberTestHelpers, _qunit) {
   'use strict';
 
@@ -118,6 +320,7 @@ define('ember-qunit', ['exports', 'ember-qunit/module-for', 'ember-qunit/module-
   exports.test = _qunit.test;
   exports.skip = _qunit.skip;
   exports.only = _qunit.only;
+  exports.todo = _qunit.todo;
   exports.moduleFor = _emberQunitModuleFor['default'];
   exports.moduleForComponent = _emberQunitModuleForComponent['default'];
   exports.moduleForModel = _emberQunitModuleForModel['default'];
@@ -133,11 +336,15 @@ define('ember-qunit/adapter', ['exports', 'ember', 'qunit'], function (exports,
     },
 
     asyncStart: function asyncStart() {
-      this.doneCallbacks.push(_qunit['default'].config.current.assert.async());
+      this.doneCallbacks.push(_qunit['default'].config.current ? _qunit['default'].config.current.assert.async() : null);
     },
 
     asyncEnd: function asyncEnd() {
-      this.doneCallbacks.pop()();
+      var done = this.doneCallbacks.pop();
+      // This can be null if asyncStart() was called outside of a test
+      if (done) {
+        done();
+      }
     },
 
     exception: function exception(error) {
@@ -177,75 +384,78 @@ define('ember-qunit/qunit-module', ['exports', 'ember', 'qunit'], function (expo
 
   exports.createModule = createModule;
 
-  function beforeEachCallback(callbacks) {
+  function noop() {}
+
+  function callbackFor(name, callbacks) {
     if (typeof callbacks !== 'object') {
-      return;
+      return noop;
     }
     if (!callbacks) {
-      return;
+      return noop;
     }
 
-    var beforeEach;
+    var callback = noop;
 
-    if (callbacks.beforeEach) {
-      beforeEach = callbacks.beforeEach;
-      delete callbacks.beforeEach;
+    if (callbacks[name]) {
+      callback = callbacks[name];
+      delete callbacks[name];
     }
 
-    return beforeEach;
-  }
-
-  function afterEachCallback(callbacks) {
-    if (typeof callbacks !== 'object') {
-      return;
-    }
-    if (!callbacks) {
-      return;
-    }
-
-    var afterEach;
-
-    if (callbacks.afterEach) {
-      afterEach = callbacks.afterEach;
-      delete callbacks.afterEach;
-    }
-
-    return afterEach;
+    return callback;
   }
 
   function createModule(Constructor, name, description, callbacks) {
-    var _beforeEach = beforeEachCallback(callbacks || description);
-    var _afterEach = afterEachCallback(callbacks || description);
+    if (!callbacks && typeof description === 'object') {
+      callbacks = description;
+      description = name;
+    }
 
-    var module = new Constructor(name, description, callbacks);
+    var _before = callbackFor('before', callbacks);
+    var _beforeEach = callbackFor('beforeEach', callbacks);
+    var _afterEach = callbackFor('afterEach', callbacks);
+    var _after = callbackFor('after', callbacks);
+
+    var module;
+    var moduleName = typeof description === 'string' ? description : name;
+
+    _qunit.module(moduleName, {
+      before: function before() {
+        // storing this in closure scope to avoid exposing these
+        // private internals to the test context
+        module = new Constructor(name, description, callbacks);
+        return _before.apply(this, arguments);
+      },
 
-    _qunit.module(module.name, {
       beforeEach: function beforeEach() {
-        var _this = this,
+        var _module2,
+            _this = this,
             _arguments = arguments;
 
         // provide the test context to the underlying module
         module.setContext(this);
 
-        return module.setup.apply(module, arguments).then(function () {
-          if (_beforeEach) {
-            return _beforeEach.apply(_this, _arguments);
-          }
+        return (_module2 = module).setup.apply(_module2, arguments).then(function () {
+          return _beforeEach.apply(_this, _arguments);
         });
       },
 
       afterEach: function afterEach() {
         var _arguments2 = arguments;
 
-        var result = undefined;
-
-        if (_afterEach) {
-          result = _afterEach.apply(this, arguments);
-        }
-
+        var result = _afterEach.apply(this, arguments);
         return _ember['default'].RSVP.resolve(result).then(function () {
-          return module.teardown.apply(module, _arguments2);
+          var _module3;
+
+          return (_module3 = module).teardown.apply(_module3, _arguments2);
         });
+      },
+
+      after: function after() {
+        try {
+          return _after.apply(this, arguments);
+        } finally {
+          _after = _afterEach = _before = _beforeEach = callbacks = module = null;
+        }
       }
     });
   }
@@ -546,8 +756,8 @@ define('ember-test-helpers/abstract-test-module', ['exports', './wait', './test-
 
   exports['default'] = _default;
 });
-define('ember-test-helpers/build-registry', ['exports', 'ember'], function (exports, _ember) {
-  /* globals global, self, requirejs, require */
+define('ember-test-helpers/build-registry', ['exports', 'require', 'ember'], function (exports, _require, _ember) {
+  /* globals global, self, requirejs */
 
   'use strict';
 
@@ -586,7 +796,7 @@ define('ember-test-helpers/build-registry', ['exports', 'ember'], function (expo
     function register(name, factory) {
       var thingToRegisterWith = registry || container;
 
-      if (!container.lookupFactory(name)) {
+      if (!(container.factoryFor ? container.factoryFor(name) : container.lookupFactory(name))) {
         thingToRegisterWith.register(name, factory);
       }
     }
@@ -647,7 +857,7 @@ define('ember-test-helpers/build-registry', ['exports', 'ember'], function (expo
       // available on the globalContext and hence ember-data wouldn't be setup
       // correctly for the tests; that's why we import and call setupContainer
       // here; also see https://github.com/emberjs/data/issues/4071 for context
-      var setupContainer = require('ember-data/setup-container')['default'];
+      var setupContainer = _require['default']('ember-data/setup-container')['default'];
       setupContainer(registry || container);
     } else if (globalContext.DS) {
       var DS = globalContext.DS;
@@ -786,12 +996,13 @@ define('ember-test-helpers/test-module-for-component', ['exports', './test-modul
       }
 
       var integrationOption = callbacks.integration;
+      var hasNeeds = Array.isArray(callbacks.needs);
 
       _TestModule.call(this, 'component:' + componentName, description, callbacks);
 
       this.componentName = componentName;
 
-      if (callbacks.needs || callbacks.unit || integrationOption === false) {
+      if (hasNeeds || callbacks.unit || integrationOption === false) {
         this.isUnitTest = true;
       } else if (integrationOption) {
         this.isUnitTest = false;
@@ -901,7 +1112,7 @@ define('ember-test-helpers/test-module-for-component', ['exports', './test-modul
 
       // only setup the injection if we are running against a version
       // of Ember that has `-view-registry:main` (Ember >= 1.12)
-      if (this.container.lookupFactory('-view-registry:main')) {
+      if (this.container.factoryFor ? this.container.factoryFor('-view-registry:main') : this.container.lookupFactory('-view-registry:main')) {
         (this.registry || this.container).injection('component', '_viewRegistry', '-view-registry:main');
       }
 
@@ -932,7 +1143,7 @@ define('ember-test-helpers/test-module-for-component', ['exports', './test-modul
     context.dispatcher.setup({}, '#ember-testing');
 
     var hasRendered = false;
-    var OutletView = module.container.lookupFactory('view:-outlet');
+    var OutletView = module.container.factoryFor ? module.container.factoryFor('view:-outlet') : module.container.lookupFactory('view:-outlet');
     var OutletTemplate = module.container.lookup('template:-outlet');
     var toplevelView = module.component = OutletView.create();
     var hasOutletTemplate = !!OutletTemplate;
@@ -1078,13 +1289,6 @@ define('ember-test-helpers/test-module-for-integration', ['exports', 'ember', '.
 
   function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-  var ACTION_KEY = undefined;
-  if (_hasEmberVersion['default'](2, 0)) {
-    ACTION_KEY = 'actions';
-  } else {
-    ACTION_KEY = '_actions';
-  }
-
   var isPreGlimmer = !_hasEmberVersion['default'](1, 13);
 
   var _default = (function (_AbstractTestModule) {
@@ -1168,7 +1372,7 @@ define('ember-test-helpers/test-module-for-integration', ['exports', 'ember', '.
       var container = this.container;
 
       var factory = function factory() {
-        return container.lookupFactory(subjectName);
+        return container.factoryFor ? container.factoryFor(subjectName) : container.lookupFactory(subjectName);
       };
 
       _AbstractTestModule.prototype.setupContext.call(this, {
@@ -1201,7 +1405,7 @@ define('ember-test-helpers/test-module-for-integration', ['exports', 'ember', '.
 
       // only setup the injection if we are running against a version
       // of Ember that has `-view-registry:main` (Ember >= 1.12)
-      if (this.container.lookupFactory('-view-registry:main')) {
+      if (this.container.factoryFor ? this.container.factoryFor('-view-registry:main') : this.container.lookupFactory('-view-registry:main')) {
         (this.registry || this.container).injection('component', '_viewRegistry', '-view-registry:main');
       }
     };
@@ -1286,8 +1490,8 @@ define('ember-test-helpers/test-module-for-integration', ['exports', 'ember', '.
 
   exports['default'] = _default;
 });
-define('ember-test-helpers/test-module-for-model', ['exports', './test-module', 'ember'], function (exports, _testModule, _ember) {
-  /* global DS, require, requirejs */ // added here to prevent an import from erroring when ED is not present
+define('ember-test-helpers/test-module-for-model', ['exports', 'require', './test-module', 'ember'], function (exports, _require, _testModule, _ember) {
+  /* global DS, requirejs */ // added here to prevent an import from erroring when ED is not present
 
   'use strict';
 
@@ -1314,10 +1518,10 @@ define('ember-test-helpers/test-module-for-model', ['exports', './test-module',
       var callbacks = this.callbacks;
       var modelName = this.modelName;
 
-      var adapterFactory = container.lookupFactory('adapter:application');
+      var adapterFactory = container.factoryFor ? container.factoryFor('adapter:application') : container.lookupFactory('adapter:application');
       if (!adapterFactory) {
         if (requirejs.entries['ember-data/adapters/json-api']) {
-          adapterFactory = require('ember-data/adapters/json-api')['default'];
+          adapterFactory = _require['default']('ember-data/adapters/json-api')['default'];
         }
 
         // when ember-data/adapters/json-api is provided via ember-cli shims
@@ -1466,7 +1670,7 @@ define('ember-test-helpers/test-module', ['exports', 'ember', './abstract-test-m
       var container = this.container;
 
       var factory = function factory() {
-        return container.lookupFactory(subjectName);
+        return container.factoryFor ? container.factoryFor(subjectName) : container.lookupFactory(subjectName);
       };
 
       _AbstractTestModule.prototype.setupContext.call(this, {
@@ -1767,21 +1971,21 @@ define("qunit", ["exports"], function (exports) {
   var skip = QUnit.skip;
   exports.skip = skip;
   var only = QUnit.only;
-
   exports.only = only;
+  var todo = QUnit.todo;
+
+  exports.todo = todo;
   exports["default"] = QUnit;
 });
 define("ember", ["exports"], function(__exports__) {
   __exports__["default"] = window.Ember;
 });
 
-var emberQunit = requireModule("ember-qunit");
+var emberQUnit = requireModule("ember-qunit");
 
-window.moduleFor = emberQunit.moduleFor;
-window.moduleForComponent = emberQunit.moduleForComponent;
-window.moduleForModel = emberQunit.moduleForModel;
-window.test = emberQunit.test;
-window.setResolver = emberQunit.setResolver;
+for (var exportName in emberQUnit) {
+  window[exportName] = emberQUnit[exportName];
+}
 
 })();
 //# sourceMappingURL=ember-qunit.map
\ No newline at end of file
diff --git a/vendor/assets/javascripts/markdown-it.js b/vendor/assets/javascripts/markdown-it.js
new file mode 100644
index 00000000000..2de3b1c16e4
--- /dev/null
+++ b/vendor/assets/javascripts/markdown-it.js
@@ -0,0 +1,7968 @@
+/*! markdown-it 8.3.1 https://github.com//markdown-it/markdown-it @license MIT */(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.markdownit = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+// HTML5 entities map: { name -> utf16string }
+//
+'use strict';
+
+/*eslint quotes:0*/
+module.exports = require('entities/maps/entities.json');
+
+},{"entities/maps/entities.json":52}],2:[function(require,module,exports){
+// List of valid html blocks names, accorting to commonmark spec
+// http://jgm.github.io/CommonMark/spec.html#html-blocks
+
+'use strict';
+
+
+module.exports = [
+  'address',
+  'article',
+  'aside',
+  'base',
+  'basefont',
+  'blockquote',
+  'body',
+  'caption',
+  'center',
+  'col',
+  'colgroup',
+  'dd',
+  'details',
+  'dialog',
+  'dir',
+  'div',
+  'dl',
+  'dt',
+  'fieldset',
+  'figcaption',
+  'figure',
+  'footer',
+  'form',
+  'frame',
+  'frameset',
+  'h1',
+  'h2',
+  'h3',
+  'h4',
+  'h5',
+  'h6',
+  'head',
+  'header',
+  'hr',
+  'html',
+  'iframe',
+  'legend',
+  'li',
+  'link',
+  'main',
+  'menu',
+  'menuitem',
+  'meta',
+  'nav',
+  'noframes',
+  'ol',
+  'optgroup',
+  'option',
+  'p',
+  'param',
+  'pre',
+  'section',
+  'source',
+  'title',
+  'summary',
+  'table',
+  'tbody',
+  'td',
+  'tfoot',
+  'th',
+  'thead',
+  'title',
+  'tr',
+  'track',
+  'ul'
+];
+
+},{}],3:[function(require,module,exports){
+// Regexps to match html elements
+
+'use strict';
+
+var attr_name     = '[a-zA-Z_:][a-zA-Z0-9:._-]*';
+
+var unquoted      = '[^"\'=<>`\\x00-\\x20]+';
+var single_quoted = "'[^']*'";
+var double_quoted = '"[^"]*"';
+
+var attr_value  = '(?:' + unquoted + '|' + single_quoted + '|' + double_quoted + ')';
+
+var attribute   = '(?:\\s+' + attr_name + '(?:\\s*=\\s*' + attr_value + ')?)';
+
+var open_tag    = '<[A-Za-z][A-Za-z0-9\\-]*' + attribute + '*\\s*\\/?>';
+
+var close_tag   = '<\\/[A-Za-z][A-Za-z0-9\\-]*\\s*>';
+var comment     = '<!---->|<!--(?:-?[^>-])(?:-?[^-])*-->';
+var processing  = '<[?].*?[?]>';
+var declaration = '<![A-Z]+\\s+[^>]*>';
+var cdata       = '<!\\[CDATA\\[[\\s\\S]*?\\]\\]>';
+
+var HTML_TAG_RE = new RegExp('^(?:' + open_tag + '|' + close_tag + '|' + comment +
+                        '|' + processing + '|' + declaration + '|' + cdata + ')');
+var HTML_OPEN_CLOSE_TAG_RE = new RegExp('^(?:' + open_tag + '|' + close_tag + ')');
+
+module.exports.HTML_TAG_RE = HTML_TAG_RE;
+module.exports.HTML_OPEN_CLOSE_TAG_RE = HTML_OPEN_CLOSE_TAG_RE;
+
+},{}],4:[function(require,module,exports){
+// Utilities
+//
+'use strict';
+
+
+function _class(obj) { return Object.prototype.toString.call(obj); }
+
+function isString(obj) { return _class(obj) === '[object String]'; }
+
+var _hasOwnProperty = Object.prototype.hasOwnProperty;
+
+function has(object, key) {
+  return _hasOwnProperty.call(object, key);
+}
+
+// Merge objects
+//
+function assign(obj /*from1, from2, from3, ...*/) {
+  var sources = Array.prototype.slice.call(arguments, 1);
+
+  sources.forEach(function (source) {
+    if (!source) { return; }
+
+    if (typeof source !== 'object') {
+      throw new TypeError(source + 'must be object');
+    }
+
+    Object.keys(source).forEach(function (key) {
+      obj[key] = source[key];
+    });
+  });
+
+  return obj;
+}
+
+// Remove element from array and put another array at those position.
+// Useful for some operations with tokens
+function arrayReplaceAt(src, pos, newElements) {
+  return [].concat(src.slice(0, pos), newElements, src.slice(pos + 1));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+function isValidEntityCode(c) {
+  /*eslint no-bitwise:0*/
+  // broken sequence
+  if (c >= 0xD800 && c <= 0xDFFF) { return false; }
+  // never used
+  if (c >= 0xFDD0 && c <= 0xFDEF) { return false; }
+  if ((c & 0xFFFF) === 0xFFFF || (c & 0xFFFF) === 0xFFFE) { return false; }
+  // control codes
+  if (c >= 0x00 && c <= 0x08) { return false; }
+  if (c === 0x0B) { return false; }
+  if (c >= 0x0E && c <= 0x1F) { return false; }
+  if (c >= 0x7F && c <= 0x9F) { return false; }
+  // out of range
+  if (c > 0x10FFFF) { return false; }
+  return true;
+}
+
+function fromCodePoint(c) {
+  /*eslint no-bitwise:0*/
+  if (c > 0xffff) {
+    c -= 0x10000;
+    var surrogate1 = 0xd800 + (c >> 10),
+        surrogate2 = 0xdc00 + (c & 0x3ff);
+
+    return String.fromCharCode(surrogate1, surrogate2);
+  }
+  return String.fromCharCode(c);
+}
+
+
+var UNESCAPE_MD_RE  = /\\([!"#$%&'()*+,\-.\/:;<=>?@[\\\]^_`{|}~])/g;
+var ENTITY_RE       = /&([a-z#][a-z0-9]{1,31});/gi;
+var UNESCAPE_ALL_RE = new RegExp(UNESCAPE_MD_RE.source + '|' + ENTITY_RE.source, 'gi');
+
+var DIGITAL_ENTITY_TEST_RE = /^#((?:x[a-f0-9]{1,8}|[0-9]{1,8}))/i;
+
+var entities = require('./entities');
+
+function replaceEntityPattern(match, name) {
+  var code = 0;
+
+  if (has(entities, name)) {
+    return entities[name];
+  }
+
+  if (name.charCodeAt(0) === 0x23/* # */ && DIGITAL_ENTITY_TEST_RE.test(name)) {
+    code = name[1].toLowerCase() === 'x' ?
+      parseInt(name.slice(2), 16)
+    :
+      parseInt(name.slice(1), 10);
+    if (isValidEntityCode(code)) {
+      return fromCodePoint(code);
+    }
+  }
+
+  return match;
+}
+
+/*function replaceEntities(str) {
+  if (str.indexOf('&') < 0) { return str; }
+
+  return str.replace(ENTITY_RE, replaceEntityPattern);
+}*/
+
+function unescapeMd(str) {
+  if (str.indexOf('\\') < 0) { return str; }
+  return str.replace(UNESCAPE_MD_RE, '$1');
+}
+
+function unescapeAll(str) {
+  if (str.indexOf('\\') < 0 && str.indexOf('&') < 0) { return str; }
+
+  return str.replace(UNESCAPE_ALL_RE, function (match, escaped, entity) {
+    if (escaped) { return escaped; }
+    return replaceEntityPattern(match, entity);
+  });
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+var HTML_ESCAPE_TEST_RE = /[&<>"]/;
+var HTML_ESCAPE_REPLACE_RE = /[&<>"]/g;
+var HTML_REPLACEMENTS = {
+  '&': '&amp;',
+  '<': '&lt;',
+  '>': '&gt;',
+  '"': '&quot;'
+};
+
+function replaceUnsafeChar(ch) {
+  return HTML_REPLACEMENTS[ch];
+}
+
+function escapeHtml(str) {
+  if (HTML_ESCAPE_TEST_RE.test(str)) {
+    return str.replace(HTML_ESCAPE_REPLACE_RE, replaceUnsafeChar);
+  }
+  return str;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+var REGEXP_ESCAPE_RE = /[.?*+^$[\]\\(){}|-]/g;
+
+function escapeRE(str) {
+  return str.replace(REGEXP_ESCAPE_RE, '\\$&');
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+function isSpace(code) {
+  switch (code) {
+    case 0x09:
+    case 0x20:
+      return true;
+  }
+  return false;
+}
+
+// Zs (unicode class) || [\t\f\v\r\n]
+function isWhiteSpace(code) {
+  if (code >= 0x2000 && code <= 0x200A) { return true; }
+  switch (code) {
+    case 0x09: // \t
+    case 0x0A: // \n
+    case 0x0B: // \v
+    case 0x0C: // \f
+    case 0x0D: // \r
+    case 0x20:
+    case 0xA0:
+    case 0x1680:
+    case 0x202F:
+    case 0x205F:
+    case 0x3000:
+      return true;
+  }
+  return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+/*eslint-disable max-len*/
+var UNICODE_PUNCT_RE = require('uc.micro/categories/P/regex');
+
+// Currently without astral characters support.
+function isPunctChar(ch) {
+  return UNICODE_PUNCT_RE.test(ch);
+}
+
+
+// Markdown ASCII punctuation characters.
+//
+// !, ", #, $, %, &, ', (, ), *, +, ,, -, ., /, :, ;, <, =, >, ?, @, [, \, ], ^, _, `, {, |, }, or ~
+// http://spec.commonmark.org/0.15/#ascii-punctuation-character
+//
+// Don't confuse with unicode punctuation !!! It lacks some chars in ascii range.
+//
+function isMdAsciiPunct(ch) {
+  switch (ch) {
+    case 0x21/* ! */:
+    case 0x22/* " */:
+    case 0x23/* # */:
+    case 0x24/* $ */:
+    case 0x25/* % */:
+    case 0x26/* & */:
+    case 0x27/* ' */:
+    case 0x28/* ( */:
+    case 0x29/* ) */:
+    case 0x2A/* * */:
+    case 0x2B/* + */:
+    case 0x2C/* , */:
+    case 0x2D/* - */:
+    case 0x2E/* . */:
+    case 0x2F/* / */:
+    case 0x3A/* : */:
+    case 0x3B/* ; */:
+    case 0x3C/* < */:
+    case 0x3D/* = */:
+    case 0x3E/* > */:
+    case 0x3F/* ? */:
+    case 0x40/* @ */:
+    case 0x5B/* [ */:
+    case 0x5C/* \ */:
+    case 0x5D/* ] */:
+    case 0x5E/* ^ */:
+    case 0x5F/* _ */:
+    case 0x60/* ` */:
+    case 0x7B/* { */:
+    case 0x7C/* | */:
+    case 0x7D/* } */:
+    case 0x7E/* ~ */:
+      return true;
+    default:
+      return false;
+  }
+}
+
+// Hepler to unify [reference labels].
+//
+function normalizeReference(str) {
+  // use .toUpperCase() instead of .toLowerCase()
+  // here to avoid a conflict with Object.prototype
+  // members (most notably, `__proto__`)
+  return str.trim().replace(/\s+/g, ' ').toUpperCase();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Re-export libraries commonly used in both markdown-it and its plugins,
+// so plugins won't have to depend on them explicitly, which reduces their
+// bundled size (e.g. a browser build).
+//
+exports.lib                 = {};
+exports.lib.mdurl           = require('mdurl');
+exports.lib.ucmicro         = require('uc.micro');
+
+exports.assign              = assign;
+exports.isString            = isString;
+exports.has                 = has;
+exports.unescapeMd          = unescapeMd;
+exports.unescapeAll         = unescapeAll;
+exports.isValidEntityCode   = isValidEntityCode;
+exports.fromCodePoint       = fromCodePoint;
+// exports.replaceEntities     = replaceEntities;
+exports.escapeHtml          = escapeHtml;
+exports.arrayReplaceAt      = arrayReplaceAt;
+exports.isSpace             = isSpace;
+exports.isWhiteSpace        = isWhiteSpace;
+exports.isMdAsciiPunct      = isMdAsciiPunct;
+exports.isPunctChar         = isPunctChar;
+exports.escapeRE            = escapeRE;
+exports.normalizeReference  = normalizeReference;
+
+},{"./entities":1,"mdurl":58,"uc.micro":65,"uc.micro/categories/P/regex":63}],5:[function(require,module,exports){
+// Just a shortcut for bulk export
+'use strict';
+
+
+exports.parseLinkLabel       = require('./parse_link_label');
+exports.parseLinkDestination = require('./parse_link_destination');
+exports.parseLinkTitle       = require('./parse_link_title');
+
+},{"./parse_link_destination":6,"./parse_link_label":7,"./parse_link_title":8}],6:[function(require,module,exports){
+// Parse link destination
+//
+'use strict';
+
+
+var isSpace     = require('../common/utils').isSpace;
+var unescapeAll = require('../common/utils').unescapeAll;
+
+
+module.exports = function parseLinkDestination(str, pos, max) {
+  var code, level,
+      lines = 0,
+      start = pos,
+      result = {
+        ok: false,
+        pos: 0,
+        lines: 0,
+        str: ''
+      };
+
+  if (str.charCodeAt(pos) === 0x3C /* < */) {
+    pos++;
+    while (pos < max) {
+      code = str.charCodeAt(pos);
+      if (code === 0x0A /* \n */ || isSpace(code)) { return result; }
+      if (code === 0x3E /* > */) {
+        result.pos = pos + 1;
+        result.str = unescapeAll(str.slice(start + 1, pos));
+        result.ok = true;
+        return result;
+      }
+      if (code === 0x5C /* \ */ && pos + 1 < max) {
+        pos += 2;
+        continue;
+      }
+
+      pos++;
+    }
+
+    // no closing '>'
+    return result;
+  }
+
+  // this should be ... } else { ... branch
+
+  level = 0;
+  while (pos < max) {
+    code = str.charCodeAt(pos);
+
+    if (code === 0x20) { break; }
+
+    // ascii control characters
+    if (code < 0x20 || code === 0x7F) { break; }
+
+    if (code === 0x5C /* \ */ && pos + 1 < max) {
+      pos += 2;
+      continue;
+    }
+
+    if (code === 0x28 /* ( */) {
+      level++;
+      if (level > 1) { break; }
+    }
+
+    if (code === 0x29 /* ) */) {
+      level--;
+      if (level < 0) { break; }
+    }
+
+    pos++;
+  }
+
+  if (start === pos) { return result; }
+
+  result.str = unescapeAll(str.slice(start, pos));
+  result.lines = lines;
+  result.pos = pos;
+  result.ok = true;
+  return result;
+};
+
+},{"../common/utils":4}],7:[function(require,module,exports){
+// Parse link label
+//
+// this function assumes that first character ("[") already matches;
+// returns the end of the label
+//
+'use strict';
+
+module.exports = function parseLinkLabel(state, start, disableNested) {
+  var level, found, marker, prevPos,
+      labelEnd = -1,
+      max = state.posMax,
+      oldPos = state.pos;
+
+  state.pos = start + 1;
+  level = 1;
+
+  while (state.pos < max) {
+    marker = state.src.charCodeAt(state.pos);
+    if (marker === 0x5D /* ] */) {
+      level--;
+      if (level === 0) {
+        found = true;
+        break;
+      }
+    }
+
+    prevPos = state.pos;
+    state.md.inline.skipToken(state);
+    if (marker === 0x5B /* [ */) {
+      if (prevPos === state.pos - 1) {
+        // increase level if we find text `[`, which is not a part of any token
+        level++;
+      } else if (disableNested) {
+        state.pos = oldPos;
+        return -1;
+      }
+    }
+  }
+
+  if (found) {
+    labelEnd = state.pos;
+  }
+
+  // restore old state
+  state.pos = oldPos;
+
+  return labelEnd;
+};
+
+},{}],8:[function(require,module,exports){
+// Parse link title
+//
+'use strict';
+
+
+var unescapeAll = require('../common/utils').unescapeAll;
+
+
+module.exports = function parseLinkTitle(str, pos, max) {
+  var code,
+      marker,
+      lines = 0,
+      start = pos,
+      result = {
+        ok: false,
+        pos: 0,
+        lines: 0,
+        str: ''
+      };
+
+  if (pos >= max) { return result; }
+
+  marker = str.charCodeAt(pos);
+
+  if (marker !== 0x22 /* " */ && marker !== 0x27 /* ' */ && marker !== 0x28 /* ( */) { return result; }
+
+  pos++;
+
+  // if opening marker is "(", switch it to closing marker ")"
+  if (marker === 0x28) { marker = 0x29; }
+
+  while (pos < max) {
+    code = str.charCodeAt(pos);
+    if (code === marker) {
+      result.pos = pos + 1;
+      result.lines = lines;
+      result.str = unescapeAll(str.slice(start + 1, pos));
+      result.ok = true;
+      return result;
+    } else if (code === 0x0A) {
+      lines++;
+    } else if (code === 0x5C /* \ */ && pos + 1 < max) {
+      pos++;
+      if (str.charCodeAt(pos) === 0x0A) {
+        lines++;
+      }
+    }
+
+    pos++;
+  }
+
+  return result;
+};
+
+},{"../common/utils":4}],9:[function(require,module,exports){
+// Main parser class
+
+'use strict';
+
+
+var utils        = require('./common/utils');
+var helpers      = require('./helpers');
+var Renderer     = require('./renderer');
+var ParserCore   = require('./parser_core');
+var ParserBlock  = require('./parser_block');
+var ParserInline = require('./parser_inline');
+var LinkifyIt    = require('linkify-it');
+var mdurl        = require('mdurl');
+var punycode     = require('punycode');
+
+
+var config = {
+  'default': require('./presets/default'),
+  zero: require('./presets/zero'),
+  commonmark: require('./presets/commonmark')
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// This validator can prohibit more than really needed to prevent XSS. It's a
+// tradeoff to keep code simple and to be secure by default.
+//
+// If you need different setup - override validator method as you wish. Or
+// replace it with dummy function and use external sanitizer.
+//
+
+var BAD_PROTO_RE = /^(vbscript|javascript|file|data):/;
+var GOOD_DATA_RE = /^data:image\/(gif|png|jpeg|webp);/;
+
+function validateLink(url) {
+  // url should be normalized at this point, and existing entities are decoded
+  var str = url.trim().toLowerCase();
+
+  return BAD_PROTO_RE.test(str) ? (GOOD_DATA_RE.test(str) ? true : false) : true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+
+var RECODE_HOSTNAME_FOR = [ 'http:', 'https:', 'mailto:' ];
+
+function normalizeLink(url) {
+  var parsed = mdurl.parse(url, true);
+
+  if (parsed.hostname) {
+    // Encode hostnames in urls like:
+    // `http://host/`, `https://host/`, `mailto:user@host`, `//host/`
+    //
+    // We don't encode unknown schemas, because it's likely that we encode
+    // something we shouldn't (e.g. `skype:name` treated as `skype:host`)
+    //
+    if (!parsed.protocol || RECODE_HOSTNAME_FOR.indexOf(parsed.protocol) >= 0) {
+      try {
+        parsed.hostname = punycode.toASCII(parsed.hostname);
+      } catch (er) { /**/ }
+    }
+  }
+
+  return mdurl.encode(mdurl.format(parsed));
+}
+
+function normalizeLinkText(url) {
+  var parsed = mdurl.parse(url, true);
+
+  if (parsed.hostname) {
+    // Encode hostnames in urls like:
+    // `http://host/`, `https://host/`, `mailto:user@host`, `//host/`
+    //
+    // We don't encode unknown schemas, because it's likely that we encode
+    // something we shouldn't (e.g. `skype:name` treated as `skype:host`)
+    //
+    if (!parsed.protocol || RECODE_HOSTNAME_FOR.indexOf(parsed.protocol) >= 0) {
+      try {
+        parsed.hostname = punycode.toUnicode(parsed.hostname);
+      } catch (er) { /**/ }
+    }
+  }
+
+  return mdurl.decode(mdurl.format(parsed));
+}
+
+
+/**
+ * class MarkdownIt
+ *
+ * Main parser/renderer class.
+ *
+ * ##### Usage
+ *
+ * ```javascript
+ * // node.js, "classic" way:
+ * var MarkdownIt = require('markdown-it'),
+ *     md = new MarkdownIt();
+ * var result = md.render('# markdown-it rulezz!');
+ *
+ * // node.js, the same, but with sugar:
+ * var md = require('markdown-it')();
+ * var result = md.render('# markdown-it rulezz!');
+ *
+ * // browser without AMD, added to "window" on script load
+ * // Note, there are no dash.
+ * var md = window.markdownit();
+ * var result = md.render('# markdown-it rulezz!');
+ * ```
+ *
+ * Single line rendering, without paragraph wrap:
+ *
+ * ```javascript
+ * var md = require('markdown-it')();
+ * var result = md.renderInline('__markdown-it__ rulezz!');
+ * ```
+ **/
+
+/**
+ * new MarkdownIt([presetName, options])
+ * - presetName (String): optional, `commonmark` / `zero`
+ * - options (Object)
+ *
+ * Creates parser instanse with given config. Can be called without `new`.
+ *
+ * ##### presetName
+ *
+ * MarkdownIt provides named presets as a convenience to quickly
+ * enable/disable active syntax rules and options for common use cases.
+ *
+ * - ["commonmark"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/commonmark.js) -
+ *   configures parser to strict [CommonMark](http://commonmark.org/) mode.
+ * - [default](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/default.js) -
+ *   similar to GFM, used when no preset name given. Enables all available rules,
+ *   but still without html, typographer & autolinker.
+ * - ["zero"](https://github.com/markdown-it/markdown-it/blob/master/lib/presets/zero.js) -
+ *   all rules disabled. Useful to quickly setup your config via `.enable()`.
+ *   For example, when you need only `bold` and `italic` markup and nothing else.
+ *
+ * ##### options:
+ *
+ * - __html__ - `false`. Set `true` to enable HTML tags in source. Be careful!
+ *   That's not safe! You may need external sanitizer to protect output from XSS.
+ *   It's better to extend features via plugins, instead of enabling HTML.
+ * - __xhtmlOut__ - `false`. Set `true` to add '/' when closing single tags
+ *   (`<br />`). This is needed only for full CommonMark compatibility. In real
+ *   world you will need HTML output.
+ * - __breaks__ - `false`. Set `true` to convert `\n` in paragraphs into `<br>`.
+ * - __langPrefix__ - `language-`. CSS language class prefix for fenced blocks.
+ *   Can be useful for external highlighters.
+ * - __linkify__ - `false`. Set `true` to autoconvert URL-like text to links.
+ * - __typographer__  - `false`. Set `true` to enable [some language-neutral
+ *   replacement](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/replacements.js) +
+ *   quotes beautification (smartquotes).
+ * - __quotes__ - `“”‘’`, String or Array. Double + single quotes replacement
+ *   pairs, when typographer enabled and smartquotes on. For example, you can
+ *   use `'«»„“'` for Russian, `'„“‚‘'` for German, and
+ *   `['«\xA0', '\xA0»', '‹\xA0', '\xA0›']` for French (including nbsp).
+ * - __highlight__ - `null`. Highlighter function for fenced code blocks.
+ *   Highlighter `function (str, lang)` should return escaped HTML. It can also
+ *   return empty string if the source was not changed and should be escaped
+ *   externaly. If result starts with <pre... internal wrapper is skipped.
+ *
+ * ##### Example
+ *
+ * ```javascript
+ * // commonmark mode
+ * var md = require('markdown-it')('commonmark');
+ *
+ * // default mode
+ * var md = require('markdown-it')();
+ *
+ * // enable everything
+ * var md = require('markdown-it')({
+ *   html: true,
+ *   linkify: true,
+ *   typographer: true
+ * });
+ * ```
+ *
+ * ##### Syntax highlighting
+ *
+ * ```js
+ * var hljs = require('highlight.js') // https://highlightjs.org/
+ *
+ * var md = require('markdown-it')({
+ *   highlight: function (str, lang) {
+ *     if (lang && hljs.getLanguage(lang)) {
+ *       try {
+ *         return hljs.highlight(lang, str, true).value;
+ *       } catch (__) {}
+ *     }
+ *
+ *     return ''; // use external default escaping
+ *   }
+ * });
+ * ```
+ *
+ * Or with full wrapper override (if you need assign class to `<pre>`):
+ *
+ * ```javascript
+ * var hljs = require('highlight.js') // https://highlightjs.org/
+ *
+ * // Actual default values
+ * var md = require('markdown-it')({
+ *   highlight: function (str, lang) {
+ *     if (lang && hljs.getLanguage(lang)) {
+ *       try {
+ *         return '<pre class="hljs"><code>' +
+ *                hljs.highlight(lang, str, true).value +
+ *                '</code></pre>';
+ *       } catch (__) {}
+ *     }
+ *
+ *     return '<pre class="hljs"><code>' + md.utils.escapeHtml(str) + '</code></pre>';
+ *   }
+ * });
+ * ```
+ *
+ **/
+function MarkdownIt(presetName, options) {
+  if (!(this instanceof MarkdownIt)) {
+    return new MarkdownIt(presetName, options);
+  }
+
+  if (!options) {
+    if (!utils.isString(presetName)) {
+      options = presetName || {};
+      presetName = 'default';
+    }
+  }
+
+  /**
+   * MarkdownIt#inline -> ParserInline
+   *
+   * Instance of [[ParserInline]]. You may need it to add new rules when
+   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and
+   * [[MarkdownIt.enable]].
+   **/
+  this.inline = new ParserInline();
+
+  /**
+   * MarkdownIt#block -> ParserBlock
+   *
+   * Instance of [[ParserBlock]]. You may need it to add new rules when
+   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and
+   * [[MarkdownIt.enable]].
+   **/
+  this.block = new ParserBlock();
+
+  /**
+   * MarkdownIt#core -> Core
+   *
+   * Instance of [[Core]] chain executor. You may need it to add new rules when
+   * writing plugins. For simple rules control use [[MarkdownIt.disable]] and
+   * [[MarkdownIt.enable]].
+   **/
+  this.core = new ParserCore();
+
+  /**
+   * MarkdownIt#renderer -> Renderer
+   *
+   * Instance of [[Renderer]]. Use it to modify output look. Or to add rendering
+   * rules for new token types, generated by plugins.
+   *
+   * ##### Example
+   *
+   * ```javascript
+   * var md = require('markdown-it')();
+   *
+   * function myToken(tokens, idx, options, env, self) {
+   *   //...
+   *   return result;
+   * };
+   *
+   * md.renderer.rules['my_token'] = myToken
+   * ```
+   *
+   * See [[Renderer]] docs and [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.js).
+   **/
+  this.renderer = new Renderer();
+
+  /**
+   * MarkdownIt#linkify -> LinkifyIt
+   *
+   * [linkify-it](https://github.com/markdown-it/linkify-it) instance.
+   * Used by [linkify](https://github.com/markdown-it/markdown-it/blob/master/lib/rules_core/linkify.js)
+   * rule.
+   **/
+  this.linkify = new LinkifyIt();
+
+  /**
+   * MarkdownIt#validateLink(url) -> Boolean
+   *
+   * Link validation function. CommonMark allows too much in links. By default
+   * we disable `javascript:`, `vbscript:`, `file:` schemas, and almost all `data:...` schemas
+   * except some embedded image types.
+   *
+   * You can change this behaviour:
+   *
+   * ```javascript
+   * var md = require('markdown-it')();
+   * // enable everything
+   * md.validateLink = function () { return true; }
+   * ```
+   **/
+  this.validateLink = validateLink;
+
+  /**
+   * MarkdownIt#normalizeLink(url) -> String
+   *
+   * Function used to encode link url to a machine-readable format,
+   * which includes url-encoding, punycode, etc.
+   **/
+  this.normalizeLink = normalizeLink;
+
+  /**
+   * MarkdownIt#normalizeLinkText(url) -> String
+   *
+   * Function used to decode link url to a human-readable format`
+   **/
+  this.normalizeLinkText = normalizeLinkText;
+
+
+  // Expose utils & helpers for easy acces from plugins
+
+  /**
+   * MarkdownIt#utils -> utils
+   *
+   * Assorted utility functions, useful to write plugins. See details
+   * [here](https://github.com/markdown-it/markdown-it/blob/master/lib/common/utils.js).
+   **/
+  this.utils = utils;
+
+  /**
+   * MarkdownIt#helpers -> helpers
+   *
+   * Link components parser functions, useful to write plugins. See details
+   * [here](https://github.com/markdown-it/markdown-it/blob/master/lib/helpers).
+   **/
+  this.helpers = utils.assign({}, helpers);
+
+
+  this.options = {};
+  this.configure(presetName);
+
+  if (options) { this.set(options); }
+}
+
+
+/** chainable
+ * MarkdownIt.set(options)
+ *
+ * Set parser options (in the same format as in constructor). Probably, you
+ * will never need it, but you can change options after constructor call.
+ *
+ * ##### Example
+ *
+ * ```javascript
+ * var md = require('markdown-it')()
+ *             .set({ html: true, breaks: true })
+ *             .set({ typographer, true });
+ * ```
+ *
+ * __Note:__ To achieve the best possible performance, don't modify a
+ * `markdown-it` instance options on the fly. If you need multiple configurations
+ * it's best to create multiple instances and initialize each with separate
+ * config.
+ **/
+MarkdownIt.prototype.set = function (options) {
+  utils.assign(this.options, options);
+  return this;
+};
+
+
+/** chainable, internal
+ * MarkdownIt.configure(presets)
+ *
+ * Batch load of all options and compenent settings. This is internal method,
+ * and you probably will not need it. But if you with - see available presets
+ * and data structure [here](https://github.com/markdown-it/markdown-it/tree/master/lib/presets)
+ *
+ * We strongly recommend to use presets instead of direct config loads. That
+ * will give better compatibility with next versions.
+ **/
+MarkdownIt.prototype.configure = function (presets) {
+  var self = this, presetName;
+
+  if (utils.isString(presets)) {
+    presetName = presets;
+    presets = config[presetName];
+    if (!presets) { throw new Error('Wrong `markdown-it` preset "' + presetName + '", check name'); }
+  }
+
+  if (!presets) { throw new Error('Wrong `markdown-it` preset, can\'t be empty'); }
+
+  if (presets.options) { self.set(presets.options); }
+
+  if (presets.components) {
+    Object.keys(presets.components).forEach(function (name) {
+      if (presets.components[name].rules) {
+        self[name].ruler.enableOnly(presets.components[name].rules);
+      }
+      if (presets.components[name].rules2) {
+        self[name].ruler2.enableOnly(presets.components[name].rules2);
+      }
+    });
+  }
+  return this;
+};
+
+
+/** chainable
+ * MarkdownIt.enable(list, ignoreInvalid)
+ * - list (String|Array): rule name or list of rule names to enable
+ * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
+ *
+ * Enable list or rules. It will automatically find appropriate components,
+ * containing rules with given names. If rule not found, and `ignoreInvalid`
+ * not set - throws exception.
+ *
+ * ##### Example
+ *
+ * ```javascript
+ * var md = require('markdown-it')()
+ *             .enable(['sub', 'sup'])
+ *             .disable('smartquotes');
+ * ```
+ **/
+MarkdownIt.prototype.enable = function (list, ignoreInvalid) {
+  var result = [];
+
+  if (!Array.isArray(list)) { list = [ list ]; }
+
+  [ 'core', 'block', 'inline' ].forEach(function (chain) {
+    result = result.concat(this[chain].ruler.enable(list, true));
+  }, this);
+
+  result = result.concat(this.inline.ruler2.enable(list, true));
+
+  var missed = list.filter(function (name) { return result.indexOf(name) < 0; });
+
+  if (missed.length && !ignoreInvalid) {
+    throw new Error('MarkdownIt. Failed to enable unknown rule(s): ' + missed);
+  }
+
+  return this;
+};
+
+
+/** chainable
+ * MarkdownIt.disable(list, ignoreInvalid)
+ * - list (String|Array): rule name or list of rule names to disable.
+ * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
+ *
+ * The same as [[MarkdownIt.enable]], but turn specified rules off.
+ **/
+MarkdownIt.prototype.disable = function (list, ignoreInvalid) {
+  var result = [];
+
+  if (!Array.isArray(list)) { list = [ list ]; }
+
+  [ 'core', 'block', 'inline' ].forEach(function (chain) {
+    result = result.concat(this[chain].ruler.disable(list, true));
+  }, this);
+
+  result = result.concat(this.inline.ruler2.disable(list, true));
+
+  var missed = list.filter(function (name) { return result.indexOf(name) < 0; });
+
+  if (missed.length && !ignoreInvalid) {
+    throw new Error('MarkdownIt. Failed to disable unknown rule(s): ' + missed);
+  }
+  return this;
+};
+
+
+/** chainable
+ * MarkdownIt.use(plugin, params)
+ *
+ * Load specified plugin with given params into current parser instance.
+ * It's just a sugar to call `plugin(md, params)` with curring.
+ *
+ * ##### Example
+ *
+ * ```javascript
+ * var iterator = require('markdown-it-for-inline');
+ * var md = require('markdown-it')()
+ *             .use(iterator, 'foo_replace', 'text', function (tokens, idx) {
+ *               tokens[idx].content = tokens[idx].content.replace(/foo/g, 'bar');
+ *             });
+ * ```
+ **/
+MarkdownIt.prototype.use = function (plugin /*, params, ... */) {
+  var args = [ this ].concat(Array.prototype.slice.call(arguments, 1));
+  plugin.apply(plugin, args);
+  return this;
+};
+
+
+/** internal
+ * MarkdownIt.parse(src, env) -> Array
+ * - src (String): source string
+ * - env (Object): environment sandbox
+ *
+ * Parse input string and returns list of block tokens (special token type
+ * "inline" will contain list of inline tokens). You should not call this
+ * method directly, until you write custom renderer (for example, to produce
+ * AST).
+ *
+ * `env` is used to pass data between "distributed" rules and return additional
+ * metadata like reference info, needed for the renderer. It also can be used to
+ * inject data in specific cases. Usually, you will be ok to pass `{}`,
+ * and then pass updated object to renderer.
+ **/
+MarkdownIt.prototype.parse = function (src, env) {
+  if (typeof src !== 'string') {
+    throw new Error('Input data should be a String');
+  }
+
+  var state = new this.core.State(src, this, env);
+
+  this.core.process(state);
+
+  return state.tokens;
+};
+
+
+/**
+ * MarkdownIt.render(src [, env]) -> String
+ * - src (String): source string
+ * - env (Object): environment sandbox
+ *
+ * Render markdown string into html. It does all magic for you :).
+ *
+ * `env` can be used to inject additional metadata (`{}` by default).
+ * But you will not need it with high probability. See also comment
+ * in [[MarkdownIt.parse]].
+ **/
+MarkdownIt.prototype.render = function (src, env) {
+  env = env || {};
+
+  return this.renderer.render(this.parse(src, env), this.options, env);
+};
+
+
+/** internal
+ * MarkdownIt.parseInline(src, env) -> Array
+ * - src (String): source string
+ * - env (Object): environment sandbox
+ *
+ * The same as [[MarkdownIt.parse]] but skip all block rules. It returns the
+ * block tokens list with the single `inline` element, containing parsed inline
+ * tokens in `children` property. Also updates `env` object.
+ **/
+MarkdownIt.prototype.parseInline = function (src, env) {
+  var state = new this.core.State(src, this, env);
+
+  state.inlineMode = true;
+  this.core.process(state);
+
+  return state.tokens;
+};
+
+
+/**
+ * MarkdownIt.renderInline(src [, env]) -> String
+ * - src (String): source string
+ * - env (Object): environment sandbox
+ *
+ * Similar to [[MarkdownIt.render]] but for single paragraph content. Result
+ * will NOT be wrapped into `<p>` tags.
+ **/
+MarkdownIt.prototype.renderInline = function (src, env) {
+  env = env || {};
+
+  return this.renderer.render(this.parseInline(src, env), this.options, env);
+};
+
+
+module.exports = MarkdownIt;
+
+},{"./common/utils":4,"./helpers":5,"./parser_block":10,"./parser_core":11,"./parser_inline":12,"./presets/commonmark":13,"./presets/default":14,"./presets/zero":15,"./renderer":16,"linkify-it":53,"mdurl":58,"punycode":60}],10:[function(require,module,exports){
+/** internal
+ * class ParserBlock
+ *
+ * Block-level tokenizer.
+ **/
+'use strict';
+
+
+var Ruler           = require('./ruler');
+
+
+var _rules = [
+  // First 2 params - rule name & source. Secondary array - list of rules,
+  // which can be terminated by this one.
+  [ 'table',      require('./rules_block/table'),      [ 'paragraph', 'reference' ] ],
+  [ 'code',       require('./rules_block/code') ],
+  [ 'fence',      require('./rules_block/fence'),      [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
+  [ 'blockquote', require('./rules_block/blockquote'), [ 'paragraph', 'reference', 'list' ] ],
+  [ 'hr',         require('./rules_block/hr'),         [ 'paragraph', 'reference', 'blockquote', 'list' ] ],
+  [ 'list',       require('./rules_block/list'),       [ 'paragraph', 'reference', 'blockquote' ] ],
+  [ 'reference',  require('./rules_block/reference') ],
+  [ 'heading',    require('./rules_block/heading'),    [ 'paragraph', 'reference', 'blockquote' ] ],
+  [ 'lheading',   require('./rules_block/lheading') ],
+  [ 'html_block', require('./rules_block/html_block'), [ 'paragraph', 'reference', 'blockquote' ] ],
+  [ 'paragraph',  require('./rules_block/paragraph') ]
+];
+
+
+/**
+ * new ParserBlock()
+ **/
+function ParserBlock() {
+  /**
+   * ParserBlock#ruler -> Ruler
+   *
+   * [[Ruler]] instance. Keep configuration of block rules.
+   **/
+  this.ruler = new Ruler();
+
+  for (var i = 0; i < _rules.length; i++) {
+    this.ruler.push(_rules[i][0], _rules[i][1], { alt: (_rules[i][2] || []).slice() });
+  }
+}
+
+
+// Generate tokens for input range
+//
+ParserBlock.prototype.tokenize = function (state, startLine, endLine) {
+  var ok, i,
+      rules = this.ruler.getRules(''),
+      len = rules.length,
+      line = startLine,
+      hasEmptyLines = false,
+      maxNesting = state.md.options.maxNesting;
+
+  while (line < endLine) {
+    state.line = line = state.skipEmptyLines(line);
+    if (line >= endLine) { break; }
+
+    // Termination condition for nested calls.
+    // Nested calls currently used for blockquotes & lists
+    if (state.sCount[line] < state.blkIndent) { break; }
+
+    // If nesting level exceeded - skip tail to the end. That's not ordinary
+    // situation and we should not care about content.
+    if (state.level >= maxNesting) {
+      state.line = endLine;
+      break;
+    }
+
+    // Try all possible rules.
+    // On success, rule should:
+    //
+    // - update `state.line`
+    // - update `state.tokens`
+    // - return true
+
+    for (i = 0; i < len; i++) {
+      ok = rules[i](state, line, endLine, false);
+      if (ok) { break; }
+    }
+
+    // set state.tight iff we had an empty line before current tag
+    // i.e. latest empty line should not count
+    state.tight = !hasEmptyLines;
+
+    // paragraph might "eat" one newline after it in nested lists
+    if (state.isEmpty(state.line - 1)) {
+      hasEmptyLines = true;
+    }
+
+    line = state.line;
+
+    if (line < endLine && state.isEmpty(line)) {
+      hasEmptyLines = true;
+      line++;
+      state.line = line;
+    }
+  }
+};
+
+
+/**
+ * ParserBlock.parse(str, md, env, outTokens)
+ *
+ * Process input string and push block tokens into `outTokens`
+ **/
+ParserBlock.prototype.parse = function (src, md, env, outTokens) {
+  var state;
+
+  if (!src) { return; }
+
+  state = new this.State(src, md, env, outTokens);
+
+  this.tokenize(state, state.line, state.lineMax);
+};
+
+
+ParserBlock.prototype.State = require('./rules_block/state_block');
+
+
+module.exports = ParserBlock;
+
+},{"./ruler":17,"./rules_block/blockquote":18,"./rules_block/code":19,"./rules_block/fence":20,"./rules_block/heading":21,"./rules_block/hr":22,"./rules_block/html_block":23,"./rules_block/lheading":24,"./rules_block/list":25,"./rules_block/paragraph":26,"./rules_block/reference":27,"./rules_block/state_block":28,"./rules_block/table":29}],11:[function(require,module,exports){
+/** internal
+ * class Core
+ *
+ * Top-level rules executor. Glues block/inline parsers and does intermediate
+ * transformations.
+ **/
+'use strict';
+
+
+var Ruler  = require('./ruler');
+
+
+var _rules = [
+  [ 'normalize',      require('./rules_core/normalize')      ],
+  [ 'block',          require('./rules_core/block')          ],
+  [ 'inline',         require('./rules_core/inline')         ],
+  [ 'linkify',        require('./rules_core/linkify')        ],
+  [ 'replacements',   require('./rules_core/replacements')   ],
+  [ 'smartquotes',    require('./rules_core/smartquotes')    ]
+];
+
+
+/**
+ * new Core()
+ **/
+function Core() {
+  /**
+   * Core#ruler -> Ruler
+   *
+   * [[Ruler]] instance. Keep configuration of core rules.
+   **/
+  this.ruler = new Ruler();
+
+  for (var i = 0; i < _rules.length; i++) {
+    this.ruler.push(_rules[i][0], _rules[i][1]);
+  }
+}
+
+
+/**
+ * Core.process(state)
+ *
+ * Executes core chain rules.
+ **/
+Core.prototype.process = function (state) {
+  var i, l, rules;
+
+  rules = this.ruler.getRules('');
+
+  for (i = 0, l = rules.length; i < l; i++) {
+    rules[i](state);
+  }
+};
+
+Core.prototype.State = require('./rules_core/state_core');
+
+
+module.exports = Core;
+
+},{"./ruler":17,"./rules_core/block":30,"./rules_core/inline":31,"./rules_core/linkify":32,"./rules_core/normalize":33,"./rules_core/replacements":34,"./rules_core/smartquotes":35,"./rules_core/state_core":36}],12:[function(require,module,exports){
+/** internal
+ * class ParserInline
+ *
+ * Tokenizes paragraph content.
+ **/
+'use strict';
+
+
+var Ruler           = require('./ruler');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Parser rules
+
+var _rules = [
+  [ 'text',            require('./rules_inline/text') ],
+  [ 'newline',         require('./rules_inline/newline') ],
+  [ 'escape',          require('./rules_inline/escape') ],
+  [ 'backticks',       require('./rules_inline/backticks') ],
+  [ 'strikethrough',   require('./rules_inline/strikethrough').tokenize ],
+  [ 'emphasis',        require('./rules_inline/emphasis').tokenize ],
+  [ 'link',            require('./rules_inline/link') ],
+  [ 'image',           require('./rules_inline/image') ],
+  [ 'autolink',        require('./rules_inline/autolink') ],
+  [ 'html_inline',     require('./rules_inline/html_inline') ],
+  [ 'entity',          require('./rules_inline/entity') ]
+];
+
+var _rules2 = [
+  [ 'balance_pairs',   require('./rules_inline/balance_pairs') ],
+  [ 'strikethrough',   require('./rules_inline/strikethrough').postProcess ],
+  [ 'emphasis',        require('./rules_inline/emphasis').postProcess ],
+  [ 'text_collapse',   require('./rules_inline/text_collapse') ]
+];
+
+
+/**
+ * new ParserInline()
+ **/
+function ParserInline() {
+  var i;
+
+  /**
+   * ParserInline#ruler -> Ruler
+   *
+   * [[Ruler]] instance. Keep configuration of inline rules.
+   **/
+  this.ruler = new Ruler();
+
+  for (i = 0; i < _rules.length; i++) {
+    this.ruler.push(_rules[i][0], _rules[i][1]);
+  }
+
+  /**
+   * ParserInline#ruler2 -> Ruler
+   *
+   * [[Ruler]] instance. Second ruler used for post-processing
+   * (e.g. in emphasis-like rules).
+   **/
+  this.ruler2 = new Ruler();
+
+  for (i = 0; i < _rules2.length; i++) {
+    this.ruler2.push(_rules2[i][0], _rules2[i][1]);
+  }
+}
+
+
+// Skip single token by running all rules in validation mode;
+// returns `true` if any rule reported success
+//
+ParserInline.prototype.skipToken = function (state) {
+  var ok, i, pos = state.pos,
+      rules = this.ruler.getRules(''),
+      len = rules.length,
+      maxNesting = state.md.options.maxNesting,
+      cache = state.cache;
+
+
+  if (typeof cache[pos] !== 'undefined') {
+    state.pos = cache[pos];
+    return;
+  }
+
+  if (state.level < maxNesting) {
+    for (i = 0; i < len; i++) {
+      // Increment state.level and decrement it later to limit recursion.
+      // It's harmless to do here, because no tokens are created. But ideally,
+      // we'd need a separate private state variable for this purpose.
+      //
+      state.level++;
+      ok = rules[i](state, true);
+      state.level--;
+
+      if (ok) { break; }
+    }
+  } else {
+    // Too much nesting, just skip until the end of the paragraph.
+    //
+    // NOTE: this will cause links to behave incorrectly in the following case,
+    //       when an amount of `[` is exactly equal to `maxNesting + 1`:
+    //
+    //       [[[[[[[[[[[[[[[[[[[[[foo]()
+    //
+    // TODO: remove this workaround when CM standard will allow nested links
+    //       (we can replace it by preventing links from being parsed in
+    //       validation mode)
+    //
+    state.pos = state.posMax;
+  }
+
+  if (!ok) { state.pos++; }
+  cache[pos] = state.pos;
+};
+
+
+// Generate tokens for input range
+//
+ParserInline.prototype.tokenize = function (state) {
+  var ok, i,
+      rules = this.ruler.getRules(''),
+      len = rules.length,
+      end = state.posMax,
+      maxNesting = state.md.options.maxNesting;
+
+  while (state.pos < end) {
+    // Try all possible rules.
+    // On success, rule should:
+    //
+    // - update `state.pos`
+    // - update `state.tokens`
+    // - return true
+
+    if (state.level < maxNesting) {
+      for (i = 0; i < len; i++) {
+        ok = rules[i](state, false);
+        if (ok) { break; }
+      }
+    }
+
+    if (ok) {
+      if (state.pos >= end) { break; }
+      continue;
+    }
+
+    state.pending += state.src[state.pos++];
+  }
+
+  if (state.pending) {
+    state.pushPending();
+  }
+};
+
+
+/**
+ * ParserInline.parse(str, md, env, outTokens)
+ *
+ * Process input string and push inline tokens into `outTokens`
+ **/
+ParserInline.prototype.parse = function (str, md, env, outTokens) {
+  var i, rules, len;
+  var state = new this.State(str, md, env, outTokens);
+
+  this.tokenize(state);
+
+  rules = this.ruler2.getRules('');
+  len = rules.length;
+
+  for (i = 0; i < len; i++) {
+    rules[i](state);
+  }
+};
+
+
+ParserInline.prototype.State = require('./rules_inline/state_inline');
+
+
+module.exports = ParserInline;
+
+},{"./ruler":17,"./rules_inline/autolink":37,"./rules_inline/backticks":38,"./rules_inline/balance_pairs":39,"./rules_inline/emphasis":40,"./rules_inline/entity":41,"./rules_inline/escape":42,"./rules_inline/html_inline":43,"./rules_inline/image":44,"./rules_inline/link":45,"./rules_inline/newline":46,"./rules_inline/state_inline":47,"./rules_inline/strikethrough":48,"./rules_inline/text":49,"./rules_inline/text_collapse":50}],13:[function(require,module,exports){
+// Commonmark default options
+
+'use strict';
+
+
+module.exports = {
+  options: {
+    html:         true,         // Enable HTML tags in source
+    xhtmlOut:     true,         // Use '/' to close single tags (<br />)
+    breaks:       false,        // Convert '\n' in paragraphs into <br>
+    langPrefix:   'language-',  // CSS language prefix for fenced blocks
+    linkify:      false,        // autoconvert URL-like texts to links
+
+    // Enable some language-neutral replacements + quotes beautification
+    typographer:  false,
+
+    // Double + single quotes replacement pairs, when typographer enabled,
+    // and smartquotes on. Could be either a String or an Array.
+    //
+    // For example, you can use '«»„“' for Russian, '„“‚‘' for German,
+    // and ['«\xA0', '\xA0»', '‹\xA0', '\xA0›'] for French (including nbsp).
+    quotes: '\u201c\u201d\u2018\u2019', /* “”‘’ */
+
+    // Highlighter function. Should return escaped HTML,
+    // or '' if the source string is not changed and should be escaped externaly.
+    // If result starts with <pre... internal wrapper is skipped.
+    //
+    // function (/*str, lang*/) { return ''; }
+    //
+    highlight: null,
+
+    maxNesting:   20            // Internal protection, recursion limit
+  },
+
+  components: {
+
+    core: {
+      rules: [
+        'normalize',
+        'block',
+        'inline'
+      ]
+    },
+
+    block: {
+      rules: [
+        'blockquote',
+        'code',
+        'fence',
+        'heading',
+        'hr',
+        'html_block',
+        'lheading',
+        'list',
+        'reference',
+        'paragraph'
+      ]
+    },
+
+    inline: {
+      rules: [
+        'autolink',
+        'backticks',
+        'emphasis',
+        'entity',
+        'escape',
+        'html_inline',
+        'image',
+        'link',
+        'newline',
+        'text'
+      ],
+      rules2: [
+        'balance_pairs',
+        'emphasis',
+        'text_collapse'
+      ]
+    }
+  }
+};
+
+},{}],14:[function(require,module,exports){
+// markdown-it default options
+
+'use strict';
+
+
+module.exports = {
+  options: {
+    html:         false,        // Enable HTML tags in source
+    xhtmlOut:     false,        // Use '/' to close single tags (<br />)
+    breaks:       false,        // Convert '\n' in paragraphs into <br>
+    langPrefix:   'language-',  // CSS language prefix for fenced blocks
+    linkify:      false,        // autoconvert URL-like texts to links
+
+    // Enable some language-neutral replacements + quotes beautification
+    typographer:  false,
+
+    // Double + single quotes replacement pairs, when typographer enabled,
+    // and smartquotes on. Could be either a String or an Array.
+    //
+    // For example, you can use '«»„“' for Russian, '„“‚‘' for German,
+    // and ['«\xA0', '\xA0»', '‹\xA0', '\xA0›'] for French (including nbsp).
+    quotes: '\u201c\u201d\u2018\u2019', /* “”‘’ */
+
+    // Highlighter function. Should return escaped HTML,
+    // or '' if the source string is not changed and should be escaped externaly.
+    // If result starts with <pre... internal wrapper is skipped.
+    //
+    // function (/*str, lang*/) { return ''; }
+    //
+    highlight: null,
+
+    maxNesting:   100            // Internal protection, recursion limit
+  },
+
+  components: {
+
+    core: {},
+    block: {},
+    inline: {}
+  }
+};
+
+},{}],15:[function(require,module,exports){
+// "Zero" preset, with nothing enabled. Useful for manual configuring of simple
+// modes. For example, to parse bold/italic only.
+
+'use strict';
+
+
+module.exports = {
+  options: {
+    html:         false,        // Enable HTML tags in source
+    xhtmlOut:     false,        // Use '/' to close single tags (<br />)
+    breaks:       false,        // Convert '\n' in paragraphs into <br>
+    langPrefix:   'language-',  // CSS language prefix for fenced blocks
+    linkify:      false,        // autoconvert URL-like texts to links
+
+    // Enable some language-neutral replacements + quotes beautification
+    typographer:  false,
+
+    // Double + single quotes replacement pairs, when typographer enabled,
+    // and smartquotes on. Could be either a String or an Array.
+    //
+    // For example, you can use '«»„“' for Russian, '„“‚‘' for German,
+    // and ['«\xA0', '\xA0»', '‹\xA0', '\xA0›'] for French (including nbsp).
+    quotes: '\u201c\u201d\u2018\u2019', /* “”‘’ */
+
+    // Highlighter function. Should return escaped HTML,
+    // or '' if the source string is not changed and should be escaped externaly.
+    // If result starts with <pre... internal wrapper is skipped.
+    //
+    // function (/*str, lang*/) { return ''; }
+    //
+    highlight: null,
+
+    maxNesting:   20            // Internal protection, recursion limit
+  },
+
+  components: {
+
+    core: {
+      rules: [
+        'normalize',
+        'block',
+        'inline'
+      ]
+    },
+
+    block: {
+      rules: [
+        'paragraph'
+      ]
+    },
+
+    inline: {
+      rules: [
+        'text'
+      ],
+      rules2: [
+        'balance_pairs',
+        'text_collapse'
+      ]
+    }
+  }
+};
+
+},{}],16:[function(require,module,exports){
+/**
+ * class Renderer
+ *
+ * Generates HTML from parsed token stream. Each instance has independent
+ * copy of rules. Those can be rewritten with ease. Also, you can add new
+ * rules if you create plugin and adds new token types.
+ **/
+'use strict';
+
+
+var assign          = require('./common/utils').assign;
+var unescapeAll     = require('./common/utils').unescapeAll;
+var escapeHtml      = require('./common/utils').escapeHtml;
+
+
+////////////////////////////////////////////////////////////////////////////////
+
+var default_rules = {};
+
+
+default_rules.code_inline = function (tokens, idx, options, env, slf) {
+  var token = tokens[idx];
+
+  return  '<code' + slf.renderAttrs(token) + '>' +
+          escapeHtml(tokens[idx].content) +
+          '</code>';
+};
+
+
+default_rules.code_block = function (tokens, idx, options, env, slf) {
+  var token = tokens[idx];
+
+  return  '<pre' + slf.renderAttrs(token) + '><code>' +
+          escapeHtml(tokens[idx].content) +
+          '</code></pre>\n';
+};
+
+
+default_rules.fence = function (tokens, idx, options, env, slf) {
+  var token = tokens[idx],
+      info = token.info ? unescapeAll(token.info).trim() : '',
+      langName = '',
+      highlighted, i, tmpAttrs, tmpToken;
+
+  if (info) {
+    langName = info.split(/\s+/g)[0];
+  }
+
+  if (options.highlight) {
+    highlighted = options.highlight(token.content, langName) || escapeHtml(token.content);
+  } else {
+    highlighted = escapeHtml(token.content);
+  }
+
+  if (highlighted.indexOf('<pre') === 0) {
+    return highlighted + '\n';
+  }
+
+  // If language exists, inject class gently, without mudofying original token.
+  // May be, one day we will add .clone() for token and simplify this part, but
+  // now we prefer to keep things local.
+  if (info) {
+    i        = token.attrIndex('class');
+    tmpAttrs = token.attrs ? token.attrs.slice() : [];
+
+    if (i < 0) {
+      tmpAttrs.push([ 'class', options.langPrefix + langName ]);
+    } else {
+      tmpAttrs[i][1] += ' ' + options.langPrefix + langName;
+    }
+
+    // Fake token just to render attributes
+    tmpToken = {
+      attrs: tmpAttrs
+    };
+
+    return  '<pre><code' + slf.renderAttrs(tmpToken) + '>'
+          + highlighted
+          + '</code></pre>\n';
+  }
+
+
+  return  '<pre><code' + slf.renderAttrs(token) + '>'
+        + highlighted
+        + '</code></pre>\n';
+};
+
+
+default_rules.image = function (tokens, idx, options, env, slf) {
+  var token = tokens[idx];
+
+  // "alt" attr MUST be set, even if empty. Because it's mandatory and
+  // should be placed on proper position for tests.
+  //
+  // Replace content with actual value
+
+  token.attrs[token.attrIndex('alt')][1] =
+    slf.renderInlineAsText(token.children, options, env);
+
+  return slf.renderToken(tokens, idx, options);
+};
+
+
+default_rules.hardbreak = function (tokens, idx, options /*, env */) {
+  return options.xhtmlOut ? '<br />\n' : '<br>\n';
+};
+default_rules.softbreak = function (tokens, idx, options /*, env */) {
+  return options.breaks ? (options.xhtmlOut ? '<br />\n' : '<br>\n') : '\n';
+};
+
+
+default_rules.text = function (tokens, idx /*, options, env */) {
+  return escapeHtml(tokens[idx].content);
+};
+
+
+default_rules.html_block = function (tokens, idx /*, options, env */) {
+  return tokens[idx].content;
+};
+default_rules.html_inline = function (tokens, idx /*, options, env */) {
+  return tokens[idx].content;
+};
+
+
+/**
+ * new Renderer()
+ *
+ * Creates new [[Renderer]] instance and fill [[Renderer#rules]] with defaults.
+ **/
+function Renderer() {
+
+  /**
+   * Renderer#rules -> Object
+   *
+   * Contains render rules for tokens. Can be updated and extended.
+   *
+   * ##### Example
+   *
+   * ```javascript
+   * var md = require('markdown-it')();
+   *
+   * md.renderer.rules.strong_open  = function () { return '<b>'; };
+   * md.renderer.rules.strong_close = function () { return '</b>'; };
+   *
+   * var result = md.renderInline(...);
+   * ```
+   *
+   * Each rule is called as independed static function with fixed signature:
+   *
+   * ```javascript
+   * function my_token_render(tokens, idx, options, env, renderer) {
+   *   // ...
+   *   return renderedHTML;
+   * }
+   * ```
+   *
+   * See [source code](https://github.com/markdown-it/markdown-it/blob/master/lib/renderer.js)
+   * for more details and examples.
+   **/
+  this.rules = assign({}, default_rules);
+}
+
+
+/**
+ * Renderer.renderAttrs(token) -> String
+ *
+ * Render token attributes to string.
+ **/
+Renderer.prototype.renderAttrs = function renderAttrs(token) {
+  var i, l, result;
+
+  if (!token.attrs) { return ''; }
+
+  result = '';
+
+  for (i = 0, l = token.attrs.length; i < l; i++) {
+    result += ' ' + escapeHtml(token.attrs[i][0]) + '="' + escapeHtml(token.attrs[i][1]) + '"';
+  }
+
+  return result;
+};
+
+
+/**
+ * Renderer.renderToken(tokens, idx, options) -> String
+ * - tokens (Array): list of tokens
+ * - idx (Numbed): token index to render
+ * - options (Object): params of parser instance
+ *
+ * Default token renderer. Can be overriden by custom function
+ * in [[Renderer#rules]].
+ **/
+Renderer.prototype.renderToken = function renderToken(tokens, idx, options) {
+  var nextToken,
+      result = '',
+      needLf = false,
+      token = tokens[idx];
+
+  // Tight list paragraphs
+  if (token.hidden) {
+    return '';
+  }
+
+  // Insert a newline between hidden paragraph and subsequent opening
+  // block-level tag.
+  //
+  // For example, here we should insert a newline before blockquote:
+  //  - a
+  //    >
+  //
+  if (token.block && token.nesting !== -1 && idx && tokens[idx - 1].hidden) {
+    result += '\n';
+  }
+
+  // Add token name, e.g. `<img`
+  result += (token.nesting === -1 ? '</' : '<') + token.tag;
+
+  // Encode attributes, e.g. `<img src="foo"`
+  result += this.renderAttrs(token);
+
+  // Add a slash for self-closing tags, e.g. `<img src="foo" /`
+  if (token.nesting === 0 && options.xhtmlOut) {
+    result += ' /';
+  }
+
+  // Check if we need to add a newline after this tag
+  if (token.block) {
+    needLf = true;
+
+    if (token.nesting === 1) {
+      if (idx + 1 < tokens.length) {
+        nextToken = tokens[idx + 1];
+
+        if (nextToken.type === 'inline' || nextToken.hidden) {
+          // Block-level tag containing an inline tag.
+          //
+          needLf = false;
+
+        } else if (nextToken.nesting === -1 && nextToken.tag === token.tag) {
+          // Opening tag + closing tag of the same type. E.g. `<li></li>`.
+          //
+          needLf = false;
+        }
+      }
+    }
+  }
+
+  result += needLf ? '>\n' : '>';
+
+  return result;
+};
+
+
+/**
+ * Renderer.renderInline(tokens, options, env) -> String
+ * - tokens (Array): list on block tokens to renter
+ * - options (Object): params of parser instance
+ * - env (Object): additional data from parsed input (references, for example)
+ *
+ * The same as [[Renderer.render]], but for single token of `inline` type.
+ **/
+Renderer.prototype.renderInline = function (tokens, options, env) {
+  var type,
+      result = '',
+      rules = this.rules;
+
+  for (var i = 0, len = tokens.length; i < len; i++) {
+    type = tokens[i].type;
+
+    if (typeof rules[type] !== 'undefined') {
+      result += rules[type](tokens, i, options, env, this);
+    } else {
+      result += this.renderToken(tokens, i, options);
+    }
+  }
+
+  return result;
+};
+
+
+/** internal
+ * Renderer.renderInlineAsText(tokens, options, env) -> String
+ * - tokens (Array): list on block tokens to renter
+ * - options (Object): params of parser instance
+ * - env (Object): additional data from parsed input (references, for example)
+ *
+ * Special kludge for image `alt` attributes to conform CommonMark spec.
+ * Don't try to use it! Spec requires to show `alt` content with stripped markup,
+ * instead of simple escaping.
+ **/
+Renderer.prototype.renderInlineAsText = function (tokens, options, env) {
+  var result = '';
+
+  for (var i = 0, len = tokens.length; i < len; i++) {
+    if (tokens[i].type === 'text') {
+      result += tokens[i].content;
+    } else if (tokens[i].type === 'image') {
+      result += this.renderInlineAsText(tokens[i].children, options, env);
+    }
+  }
+
+  return result;
+};
+
+
+/**
+ * Renderer.render(tokens, options, env) -> String
+ * - tokens (Array): list on block tokens to renter
+ * - options (Object): params of parser instance
+ * - env (Object): additional data from parsed input (references, for example)
+ *
+ * Takes token stream and generates HTML. Probably, you will never need to call
+ * this method directly.
+ **/
+Renderer.prototype.render = function (tokens, options, env) {
+  var i, len, type,
+      result = '',
+      rules = this.rules;
+
+  for (i = 0, len = tokens.length; i < len; i++) {
+    type = tokens[i].type;
+
+    if (type === 'inline') {
+      result += this.renderInline(tokens[i].children, options, env);
+    } else if (typeof rules[type] !== 'undefined') {
+      result += rules[tokens[i].type](tokens, i, options, env, this);
+    } else {
+      result += this.renderToken(tokens, i, options, env);
+    }
+  }
+
+  return result;
+};
+
+module.exports = Renderer;
+
+},{"./common/utils":4}],17:[function(require,module,exports){
+/**
+ * class Ruler
+ *
+ * Helper class, used by [[MarkdownIt#core]], [[MarkdownIt#block]] and
+ * [[MarkdownIt#inline]] to manage sequences of functions (rules):
+ *
+ * - keep rules in defined order
+ * - assign the name to each rule
+ * - enable/disable rules
+ * - add/replace rules
+ * - allow assign rules to additional named chains (in the same)
+ * - cacheing lists of active rules
+ *
+ * You will not need use this class directly until write plugins. For simple
+ * rules control use [[MarkdownIt.disable]], [[MarkdownIt.enable]] and
+ * [[MarkdownIt.use]].
+ **/
+'use strict';
+
+
+/**
+ * new Ruler()
+ **/
+function Ruler() {
+  // List of added rules. Each element is:
+  //
+  // {
+  //   name: XXX,
+  //   enabled: Boolean,
+  //   fn: Function(),
+  //   alt: [ name2, name3 ]
+  // }
+  //
+  this.__rules__ = [];
+
+  // Cached rule chains.
+  //
+  // First level - chain name, '' for default.
+  // Second level - diginal anchor for fast filtering by charcodes.
+  //
+  this.__cache__ = null;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Helper methods, should not be used directly
+
+
+// Find rule index by name
+//
+Ruler.prototype.__find__ = function (name) {
+  for (var i = 0; i < this.__rules__.length; i++) {
+    if (this.__rules__[i].name === name) {
+      return i;
+    }
+  }
+  return -1;
+};
+
+
+// Build rules lookup cache
+//
+Ruler.prototype.__compile__ = function () {
+  var self = this;
+  var chains = [ '' ];
+
+  // collect unique names
+  self.__rules__.forEach(function (rule) {
+    if (!rule.enabled) { return; }
+
+    rule.alt.forEach(function (altName) {
+      if (chains.indexOf(altName) < 0) {
+        chains.push(altName);
+      }
+    });
+  });
+
+  self.__cache__ = {};
+
+  chains.forEach(function (chain) {
+    self.__cache__[chain] = [];
+    self.__rules__.forEach(function (rule) {
+      if (!rule.enabled) { return; }
+
+      if (chain && rule.alt.indexOf(chain) < 0) { return; }
+
+      self.__cache__[chain].push(rule.fn);
+    });
+  });
+};
+
+
+/**
+ * Ruler.at(name, fn [, options])
+ * - name (String): rule name to replace.
+ * - fn (Function): new rule function.
+ * - options (Object): new rule options (not mandatory).
+ *
+ * Replace rule by name with new function & options. Throws error if name not
+ * found.
+ *
+ * ##### Options:
+ *
+ * - __alt__ - array with names of "alternate" chains.
+ *
+ * ##### Example
+ *
+ * Replace existing typorgapher replacement rule with new one:
+ *
+ * ```javascript
+ * var md = require('markdown-it')();
+ *
+ * md.core.ruler.at('replacements', function replace(state) {
+ *   //...
+ * });
+ * ```
+ **/
+Ruler.prototype.at = function (name, fn, options) {
+  var index = this.__find__(name);
+  var opt = options || {};
+
+  if (index === -1) { throw new Error('Parser rule not found: ' + name); }
+
+  this.__rules__[index].fn = fn;
+  this.__rules__[index].alt = opt.alt || [];
+  this.__cache__ = null;
+};
+
+
+/**
+ * Ruler.before(beforeName, ruleName, fn [, options])
+ * - beforeName (String): new rule will be added before this one.
+ * - ruleName (String): name of added rule.
+ * - fn (Function): rule function.
+ * - options (Object): rule options (not mandatory).
+ *
+ * Add new rule to chain before one with given name. See also
+ * [[Ruler.after]], [[Ruler.push]].
+ *
+ * ##### Options:
+ *
+ * - __alt__ - array with names of "alternate" chains.
+ *
+ * ##### Example
+ *
+ * ```javascript
+ * var md = require('markdown-it')();
+ *
+ * md.block.ruler.before('paragraph', 'my_rule', function replace(state) {
+ *   //...
+ * });
+ * ```
+ **/
+Ruler.prototype.before = function (beforeName, ruleName, fn, options) {
+  var index = this.__find__(beforeName);
+  var opt = options || {};
+
+  if (index === -1) { throw new Error('Parser rule not found: ' + beforeName); }
+
+  this.__rules__.splice(index, 0, {
+    name: ruleName,
+    enabled: true,
+    fn: fn,
+    alt: opt.alt || []
+  });
+
+  this.__cache__ = null;
+};
+
+
+/**
+ * Ruler.after(afterName, ruleName, fn [, options])
+ * - afterName (String): new rule will be added after this one.
+ * - ruleName (String): name of added rule.
+ * - fn (Function): rule function.
+ * - options (Object): rule options (not mandatory).
+ *
+ * Add new rule to chain after one with given name. See also
+ * [[Ruler.before]], [[Ruler.push]].
+ *
+ * ##### Options:
+ *
+ * - __alt__ - array with names of "alternate" chains.
+ *
+ * ##### Example
+ *
+ * ```javascript
+ * var md = require('markdown-it')();
+ *
+ * md.inline.ruler.after('text', 'my_rule', function replace(state) {
+ *   //...
+ * });
+ * ```
+ **/
+Ruler.prototype.after = function (afterName, ruleName, fn, options) {
+  var index = this.__find__(afterName);
+  var opt = options || {};
+
+  if (index === -1) { throw new Error('Parser rule not found: ' + afterName); }
+
+  this.__rules__.splice(index + 1, 0, {
+    name: ruleName,
+    enabled: true,
+    fn: fn,
+    alt: opt.alt || []
+  });
+
+  this.__cache__ = null;
+};
+
+/**
+ * Ruler.push(ruleName, fn [, options])
+ * - ruleName (String): name of added rule.
+ * - fn (Function): rule function.
+ * - options (Object): rule options (not mandatory).
+ *
+ * Push new rule to the end of chain. See also
+ * [[Ruler.before]], [[Ruler.after]].
+ *
+ * ##### Options:
+ *
+ * - __alt__ - array with names of "alternate" chains.
+ *
+ * ##### Example
+ *
+ * ```javascript
+ * var md = require('markdown-it')();
+ *
+ * md.core.ruler.push('my_rule', function replace(state) {
+ *   //...
+ * });
+ * ```
+ **/
+Ruler.prototype.push = function (ruleName, fn, options) {
+  var opt = options || {};
+
+  this.__rules__.push({
+    name: ruleName,
+    enabled: true,
+    fn: fn,
+    alt: opt.alt || []
+  });
+
+  this.__cache__ = null;
+};
+
+
+/**
+ * Ruler.enable(list [, ignoreInvalid]) -> Array
+ * - list (String|Array): list of rule names to enable.
+ * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
+ *
+ * Enable rules with given names. If any rule name not found - throw Error.
+ * Errors can be disabled by second param.
+ *
+ * Returns list of found rule names (if no exception happened).
+ *
+ * See also [[Ruler.disable]], [[Ruler.enableOnly]].
+ **/
+Ruler.prototype.enable = function (list, ignoreInvalid) {
+  if (!Array.isArray(list)) { list = [ list ]; }
+
+  var result = [];
+
+  // Search by name and enable
+  list.forEach(function (name) {
+    var idx = this.__find__(name);
+
+    if (idx < 0) {
+      if (ignoreInvalid) { return; }
+      throw new Error('Rules manager: invalid rule name ' + name);
+    }
+    this.__rules__[idx].enabled = true;
+    result.push(name);
+  }, this);
+
+  this.__cache__ = null;
+  return result;
+};
+
+
+/**
+ * Ruler.enableOnly(list [, ignoreInvalid])
+ * - list (String|Array): list of rule names to enable (whitelist).
+ * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
+ *
+ * Enable rules with given names, and disable everything else. If any rule name
+ * not found - throw Error. Errors can be disabled by second param.
+ *
+ * See also [[Ruler.disable]], [[Ruler.enable]].
+ **/
+Ruler.prototype.enableOnly = function (list, ignoreInvalid) {
+  if (!Array.isArray(list)) { list = [ list ]; }
+
+  this.__rules__.forEach(function (rule) { rule.enabled = false; });
+
+  this.enable(list, ignoreInvalid);
+};
+
+
+/**
+ * Ruler.disable(list [, ignoreInvalid]) -> Array
+ * - list (String|Array): list of rule names to disable.
+ * - ignoreInvalid (Boolean): set `true` to ignore errors when rule not found.
+ *
+ * Disable rules with given names. If any rule name not found - throw Error.
+ * Errors can be disabled by second param.
+ *
+ * Returns list of found rule names (if no exception happened).
+ *
+ * See also [[Ruler.enable]], [[Ruler.enableOnly]].
+ **/
+Ruler.prototype.disable = function (list, ignoreInvalid) {
+  if (!Array.isArray(list)) { list = [ list ]; }
+
+  var result = [];
+
+  // Search by name and disable
+  list.forEach(function (name) {
+    var idx = this.__find__(name);
+
+    if (idx < 0) {
+      if (ignoreInvalid) { return; }
+      throw new Error('Rules manager: invalid rule name ' + name);
+    }
+    this.__rules__[idx].enabled = false;
+    result.push(name);
+  }, this);
+
+  this.__cache__ = null;
+  return result;
+};
+
+
+/**
+ * Ruler.getRules(chainName) -> Array
+ *
+ * Return array of active functions (rules) for given chain name. It analyzes
+ * rules configuration, compiles caches if not exists and returns result.
+ *
+ * Default chain name is `''` (empty string). It can't be skipped. That's
+ * done intentionally, to keep signature monomorphic for high speed.
+ **/
+Ruler.prototype.getRules = function (chainName) {
+  if (this.__cache__ === null) {
+    this.__compile__();
+  }
+
+  // Chain can be empty, if rules disabled. But we still have to return Array.
+  return this.__cache__[chainName] || [];
+};
+
+module.exports = Ruler;
+
+},{}],18:[function(require,module,exports){
+// Block quotes
+
+'use strict';
+
+var isSpace = require('../common/utils').isSpace;
+
+
+module.exports = function blockquote(state, startLine, endLine, silent) {
+  var adjustTab,
+      ch,
+      i,
+      initial,
+      isOutdented,
+      l,
+      lastLineEmpty,
+      lines,
+      nextLine,
+      offset,
+      oldBMarks,
+      oldBSCount,
+      oldIndent,
+      oldParentType,
+      oldSCount,
+      oldTShift,
+      spaceAfterMarker,
+      terminate,
+      terminatorRules,
+      token,
+      oldLineMax = state.lineMax,
+      pos = state.bMarks[startLine] + state.tShift[startLine],
+      max = state.eMarks[startLine];
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+
+  // check the block quote marker
+  if (state.src.charCodeAt(pos++) !== 0x3E/* > */) { return false; }
+
+  // we know that it's going to be a valid blockquote,
+  // so no point trying to find the end of it in silent mode
+  if (silent) { return true; }
+
+  // skip spaces after ">" and re-calculate offset
+  initial = offset = state.sCount[startLine] + pos - (state.bMarks[startLine] + state.tShift[startLine]);
+
+  // skip one optional space after '>'
+  if (state.src.charCodeAt(pos) === 0x20 /* space */) {
+    // ' >   test '
+    //     ^ -- position start of line here:
+    pos++;
+    initial++;
+    offset++;
+    adjustTab = false;
+    spaceAfterMarker = true;
+  } else if (state.src.charCodeAt(pos) === 0x09 /* tab */) {
+    spaceAfterMarker = true;
+
+    if ((state.bsCount[startLine] + offset) % 4 === 3) {
+      // '  >\t  test '
+      //       ^ -- position start of line here (tab has width===1)
+      pos++;
+      initial++;
+      offset++;
+      adjustTab = false;
+    } else {
+      // ' >\t  test '
+      //    ^ -- position start of line here + shift bsCount slightly
+      //         to make extra space appear
+      adjustTab = true;
+    }
+  } else {
+    spaceAfterMarker = false;
+  }
+
+  oldBMarks = [ state.bMarks[startLine] ];
+  state.bMarks[startLine] = pos;
+
+  while (pos < max) {
+    ch = state.src.charCodeAt(pos);
+
+    if (isSpace(ch)) {
+      if (ch === 0x09) {
+        offset += 4 - (offset + state.bsCount[startLine] + (adjustTab ? 1 : 0)) % 4;
+      } else {
+        offset++;
+      }
+    } else {
+      break;
+    }
+
+    pos++;
+  }
+
+  oldBSCount = [ state.bsCount[startLine] ];
+  state.bsCount[startLine] = state.sCount[startLine] + 1 + (spaceAfterMarker ? 1 : 0);
+
+  lastLineEmpty = pos >= max;
+
+  oldSCount = [ state.sCount[startLine] ];
+  state.sCount[startLine] = offset - initial;
+
+  oldTShift = [ state.tShift[startLine] ];
+  state.tShift[startLine] = pos - state.bMarks[startLine];
+
+  terminatorRules = state.md.block.ruler.getRules('blockquote');
+
+  oldParentType = state.parentType;
+  state.parentType = 'blockquote';
+
+  // Search the end of the block
+  //
+  // Block ends with either:
+  //  1. an empty line outside:
+  //     ```
+  //     > test
+  //
+  //     ```
+  //  2. an empty line inside:
+  //     ```
+  //     >
+  //     test
+  //     ```
+  //  3. another tag:
+  //     ```
+  //     > test
+  //      - - -
+  //     ```
+  for (nextLine = startLine + 1; nextLine < endLine; nextLine++) {
+    // check if it's outdented, i.e. it's inside list item and indented
+    // less than said list item:
+    //
+    // ```
+    // 1. anything
+    //    > current blockquote
+    // 2. checking this line
+    // ```
+    isOutdented = state.sCount[nextLine] < state.blkIndent;
+
+    pos = state.bMarks[nextLine] + state.tShift[nextLine];
+    max = state.eMarks[nextLine];
+
+    if (pos >= max) {
+      // Case 1: line is not inside the blockquote, and this line is empty.
+      break;
+    }
+
+    if (state.src.charCodeAt(pos++) === 0x3E/* > */ && !isOutdented) {
+      // This line is inside the blockquote.
+
+      // skip spaces after ">" and re-calculate offset
+      initial = offset = state.sCount[nextLine] + pos - (state.bMarks[nextLine] + state.tShift[nextLine]);
+
+      // skip one optional space after '>'
+      if (state.src.charCodeAt(pos) === 0x20 /* space */) {
+        // ' >   test '
+        //     ^ -- position start of line here:
+        pos++;
+        initial++;
+        offset++;
+        adjustTab = false;
+        spaceAfterMarker = true;
+      } else if (state.src.charCodeAt(pos) === 0x09 /* tab */) {
+        spaceAfterMarker = true;
+
+        if ((state.bsCount[nextLine] + offset) % 4 === 3) {
+          // '  >\t  test '
+          //       ^ -- position start of line here (tab has width===1)
+          pos++;
+          initial++;
+          offset++;
+          adjustTab = false;
+        } else {
+          // ' >\t  test '
+          //    ^ -- position start of line here + shift bsCount slightly
+          //         to make extra space appear
+          adjustTab = true;
+        }
+      } else {
+        spaceAfterMarker = false;
+      }
+
+      oldBMarks.push(state.bMarks[nextLine]);
+      state.bMarks[nextLine] = pos;
+
+      while (pos < max) {
+        ch = state.src.charCodeAt(pos);
+
+        if (isSpace(ch)) {
+          if (ch === 0x09) {
+            offset += 4 - (offset + state.bsCount[nextLine] + (adjustTab ? 1 : 0)) % 4;
+          } else {
+            offset++;
+          }
+        } else {
+          break;
+        }
+
+        pos++;
+      }
+
+      lastLineEmpty = pos >= max;
+
+      oldBSCount.push(state.bsCount[nextLine]);
+      state.bsCount[nextLine] = state.sCount[nextLine] + 1 + (spaceAfterMarker ? 1 : 0);
+
+      oldSCount.push(state.sCount[nextLine]);
+      state.sCount[nextLine] = offset - initial;
+
+      oldTShift.push(state.tShift[nextLine]);
+      state.tShift[nextLine] = pos - state.bMarks[nextLine];
+      continue;
+    }
+
+    // Case 2: line is not inside the blockquote, and the last line was empty.
+    if (lastLineEmpty) { break; }
+
+    // Case 3: another tag found.
+    terminate = false;
+    for (i = 0, l = terminatorRules.length; i < l; i++) {
+      if (terminatorRules[i](state, nextLine, endLine, true)) {
+        terminate = true;
+        break;
+      }
+    }
+
+    if (terminate) {
+      // Quirk to enforce "hard termination mode" for paragraphs;
+      // normally if you call `tokenize(state, startLine, nextLine)`,
+      // paragraphs will look below nextLine for paragraph continuation,
+      // but if blockquote is terminated by another tag, they shouldn't
+      state.lineMax = nextLine;
+
+      if (state.blkIndent !== 0) {
+        // state.blkIndent was non-zero, we now set it to zero,
+        // so we need to re-calculate all offsets to appear as
+        // if indent wasn't changed
+        oldBMarks.push(state.bMarks[nextLine]);
+        oldBSCount.push(state.bsCount[nextLine]);
+        oldTShift.push(state.tShift[nextLine]);
+        oldSCount.push(state.sCount[nextLine]);
+        state.sCount[nextLine] -= state.blkIndent;
+      }
+
+      break;
+    }
+
+    if (isOutdented) break;
+
+    oldBMarks.push(state.bMarks[nextLine]);
+    oldBSCount.push(state.bsCount[nextLine]);
+    oldTShift.push(state.tShift[nextLine]);
+    oldSCount.push(state.sCount[nextLine]);
+
+    // A negative indentation means that this is a paragraph continuation
+    //
+    state.sCount[nextLine] = -1;
+  }
+
+  oldIndent = state.blkIndent;
+  state.blkIndent = 0;
+
+  token        = state.push('blockquote_open', 'blockquote', 1);
+  token.markup = '>';
+  token.map    = lines = [ startLine, 0 ];
+
+  state.md.block.tokenize(state, startLine, nextLine);
+
+  token        = state.push('blockquote_close', 'blockquote', -1);
+  token.markup = '>';
+
+  state.lineMax = oldLineMax;
+  state.parentType = oldParentType;
+  lines[1] = state.line;
+
+  // Restore original tShift; this might not be necessary since the parser
+  // has already been here, but just to make sure we can do that.
+  for (i = 0; i < oldTShift.length; i++) {
+    state.bMarks[i + startLine] = oldBMarks[i];
+    state.tShift[i + startLine] = oldTShift[i];
+    state.sCount[i + startLine] = oldSCount[i];
+    state.bsCount[i + startLine] = oldBSCount[i];
+  }
+  state.blkIndent = oldIndent;
+
+  return true;
+};
+
+},{"../common/utils":4}],19:[function(require,module,exports){
+// Code block (4 spaces padded)
+
+'use strict';
+
+
+module.exports = function code(state, startLine, endLine/*, silent*/) {
+  var nextLine, last, token;
+
+  if (state.sCount[startLine] - state.blkIndent < 4) { return false; }
+
+  last = nextLine = startLine + 1;
+
+  while (nextLine < endLine) {
+    if (state.isEmpty(nextLine)) {
+      nextLine++;
+      continue;
+    }
+
+    if (state.sCount[nextLine] - state.blkIndent >= 4) {
+      nextLine++;
+      last = nextLine;
+      continue;
+    }
+    break;
+  }
+
+  state.line = last;
+
+  token         = state.push('code_block', 'code', 0);
+  token.content = state.getLines(startLine, last, 4 + state.blkIndent, true);
+  token.map     = [ startLine, state.line ];
+
+  return true;
+};
+
+},{}],20:[function(require,module,exports){
+// fences (``` lang, ~~~ lang)
+
+'use strict';
+
+
+module.exports = function fence(state, startLine, endLine, silent) {
+  var marker, len, params, nextLine, mem, token, markup,
+      haveEndMarker = false,
+      pos = state.bMarks[startLine] + state.tShift[startLine],
+      max = state.eMarks[startLine];
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+
+  if (pos + 3 > max) { return false; }
+
+  marker = state.src.charCodeAt(pos);
+
+  if (marker !== 0x7E/* ~ */ && marker !== 0x60 /* ` */) {
+    return false;
+  }
+
+  // scan marker length
+  mem = pos;
+  pos = state.skipChars(pos, marker);
+
+  len = pos - mem;
+
+  if (len < 3) { return false; }
+
+  markup = state.src.slice(mem, pos);
+  params = state.src.slice(pos, max);
+
+  if (params.indexOf(String.fromCharCode(marker)) >= 0) { return false; }
+
+  // Since start is found, we can report success here in validation mode
+  if (silent) { return true; }
+
+  // search end of block
+  nextLine = startLine;
+
+  for (;;) {
+    nextLine++;
+    if (nextLine >= endLine) {
+      // unclosed block should be autoclosed by end of document.
+      // also block seems to be autoclosed by end of parent
+      break;
+    }
+
+    pos = mem = state.bMarks[nextLine] + state.tShift[nextLine];
+    max = state.eMarks[nextLine];
+
+    if (pos < max && state.sCount[nextLine] < state.blkIndent) {
+      // non-empty line with negative indent should stop the list:
+      // - ```
+      //  test
+      break;
+    }
+
+    if (state.src.charCodeAt(pos) !== marker) { continue; }
+
+    if (state.sCount[nextLine] - state.blkIndent >= 4) {
+      // closing fence should be indented less than 4 spaces
+      continue;
+    }
+
+    pos = state.skipChars(pos, marker);
+
+    // closing code fence must be at least as long as the opening one
+    if (pos - mem < len) { continue; }
+
+    // make sure tail has spaces only
+    pos = state.skipSpaces(pos);
+
+    if (pos < max) { continue; }
+
+    haveEndMarker = true;
+    // found!
+    break;
+  }
+
+  // If a fence has heading spaces, they should be removed from its inner block
+  len = state.sCount[startLine];
+
+  state.line = nextLine + (haveEndMarker ? 1 : 0);
+
+  token         = state.push('fence', 'code', 0);
+  token.info    = params;
+  token.content = state.getLines(startLine + 1, nextLine, len, true);
+  token.markup  = markup;
+  token.map     = [ startLine, state.line ];
+
+  return true;
+};
+
+},{}],21:[function(require,module,exports){
+// heading (#, ##, ...)
+
+'use strict';
+
+var isSpace = require('../common/utils').isSpace;
+
+
+module.exports = function heading(state, startLine, endLine, silent) {
+  var ch, level, tmp, token,
+      pos = state.bMarks[startLine] + state.tShift[startLine],
+      max = state.eMarks[startLine];
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+
+  ch  = state.src.charCodeAt(pos);
+
+  if (ch !== 0x23/* # */ || pos >= max) { return false; }
+
+  // count heading level
+  level = 1;
+  ch = state.src.charCodeAt(++pos);
+  while (ch === 0x23/* # */ && pos < max && level <= 6) {
+    level++;
+    ch = state.src.charCodeAt(++pos);
+  }
+
+  if (level > 6 || (pos < max && !isSpace(ch))) { return false; }
+
+  if (silent) { return true; }
+
+  // Let's cut tails like '    ###  ' from the end of string
+
+  max = state.skipSpacesBack(max, pos);
+  tmp = state.skipCharsBack(max, 0x23, pos); // #
+  if (tmp > pos && isSpace(state.src.charCodeAt(tmp - 1))) {
+    max = tmp;
+  }
+
+  state.line = startLine + 1;
+
+  token        = state.push('heading_open', 'h' + String(level), 1);
+  token.markup = '########'.slice(0, level);
+  token.map    = [ startLine, state.line ];
+
+  token          = state.push('inline', '', 0);
+  token.content  = state.src.slice(pos, max).trim();
+  token.map      = [ startLine, state.line ];
+  token.children = [];
+
+  token        = state.push('heading_close', 'h' + String(level), -1);
+  token.markup = '########'.slice(0, level);
+
+  return true;
+};
+
+},{"../common/utils":4}],22:[function(require,module,exports){
+// Horizontal rule
+
+'use strict';
+
+var isSpace = require('../common/utils').isSpace;
+
+
+module.exports = function hr(state, startLine, endLine, silent) {
+  var marker, cnt, ch, token,
+      pos = state.bMarks[startLine] + state.tShift[startLine],
+      max = state.eMarks[startLine];
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+
+  marker = state.src.charCodeAt(pos++);
+
+  // Check hr marker
+  if (marker !== 0x2A/* * */ &&
+      marker !== 0x2D/* - */ &&
+      marker !== 0x5F/* _ */) {
+    return false;
+  }
+
+  // markers can be mixed with spaces, but there should be at least 3 of them
+
+  cnt = 1;
+  while (pos < max) {
+    ch = state.src.charCodeAt(pos++);
+    if (ch !== marker && !isSpace(ch)) { return false; }
+    if (ch === marker) { cnt++; }
+  }
+
+  if (cnt < 3) { return false; }
+
+  if (silent) { return true; }
+
+  state.line = startLine + 1;
+
+  token        = state.push('hr', 'hr', 0);
+  token.map    = [ startLine, state.line ];
+  token.markup = Array(cnt + 1).join(String.fromCharCode(marker));
+
+  return true;
+};
+
+},{"../common/utils":4}],23:[function(require,module,exports){
+// HTML block
+
+'use strict';
+
+
+var block_names = require('../common/html_blocks');
+var HTML_OPEN_CLOSE_TAG_RE = require('../common/html_re').HTML_OPEN_CLOSE_TAG_RE;
+
+// An array of opening and corresponding closing sequences for html tags,
+// last argument defines whether it can terminate a paragraph or not
+//
+var HTML_SEQUENCES = [
+  [ /^<(script|pre|style)(?=(\s|>|$))/i, /<\/(script|pre|style)>/i, true ],
+  [ /^<!--/,        /-->/,   true ],
+  [ /^<\?/,         /\?>/,   true ],
+  [ /^<![A-Z]/,     />/,     true ],
+  [ /^<!\[CDATA\[/, /\]\]>/, true ],
+  [ new RegExp('^</?(' + block_names.join('|') + ')(?=(\\s|/?>|$))', 'i'), /^$/, true ],
+  [ new RegExp(HTML_OPEN_CLOSE_TAG_RE.source + '\\s*$'),  /^$/, false ]
+];
+
+
+module.exports = function html_block(state, startLine, endLine, silent) {
+  var i, nextLine, token, lineText,
+      pos = state.bMarks[startLine] + state.tShift[startLine],
+      max = state.eMarks[startLine];
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+
+  if (!state.md.options.html) { return false; }
+
+  if (state.src.charCodeAt(pos) !== 0x3C/* < */) { return false; }
+
+  lineText = state.src.slice(pos, max);
+
+  for (i = 0; i < HTML_SEQUENCES.length; i++) {
+    if (HTML_SEQUENCES[i][0].test(lineText)) { break; }
+  }
+
+  if (i === HTML_SEQUENCES.length) { return false; }
+
+  if (silent) {
+    // true if this sequence can be a terminator, false otherwise
+    return HTML_SEQUENCES[i][2];
+  }
+
+  nextLine = startLine + 1;
+
+  // If we are here - we detected HTML block.
+  // Let's roll down till block end.
+  if (!HTML_SEQUENCES[i][1].test(lineText)) {
+    for (; nextLine < endLine; nextLine++) {
+      if (state.sCount[nextLine] < state.blkIndent) { break; }
+
+      pos = state.bMarks[nextLine] + state.tShift[nextLine];
+      max = state.eMarks[nextLine];
+      lineText = state.src.slice(pos, max);
+
+      if (HTML_SEQUENCES[i][1].test(lineText)) {
+        if (lineText.length !== 0) { nextLine++; }
+        break;
+      }
+    }
+  }
+
+  state.line = nextLine;
+
+  token         = state.push('html_block', '', 0);
+  token.map     = [ startLine, nextLine ];
+  token.content = state.getLines(startLine, nextLine, state.blkIndent, true);
+
+  return true;
+};
+
+},{"../common/html_blocks":2,"../common/html_re":3}],24:[function(require,module,exports){
+// lheading (---, ===)
+
+'use strict';
+
+
+module.exports = function lheading(state, startLine, endLine/*, silent*/) {
+  var content, terminate, i, l, token, pos, max, level, marker,
+      nextLine = startLine + 1, oldParentType,
+      terminatorRules = state.md.block.ruler.getRules('paragraph');
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+
+  oldParentType = state.parentType;
+  state.parentType = 'paragraph'; // use paragraph to match terminatorRules
+
+  // jump line-by-line until empty one or EOF
+  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
+    // this would be a code block normally, but after paragraph
+    // it's considered a lazy continuation regardless of what's there
+    if (state.sCount[nextLine] - state.blkIndent > 3) { continue; }
+
+    //
+    // Check for underline in setext header
+    //
+    if (state.sCount[nextLine] >= state.blkIndent) {
+      pos = state.bMarks[nextLine] + state.tShift[nextLine];
+      max = state.eMarks[nextLine];
+
+      if (pos < max) {
+        marker = state.src.charCodeAt(pos);
+
+        if (marker === 0x2D/* - */ || marker === 0x3D/* = */) {
+          pos = state.skipChars(pos, marker);
+          pos = state.skipSpaces(pos);
+
+          if (pos >= max) {
+            level = (marker === 0x3D/* = */ ? 1 : 2);
+            break;
+          }
+        }
+      }
+    }
+
+    // quirk for blockquotes, this line should already be checked by that rule
+    if (state.sCount[nextLine] < 0) { continue; }
+
+    // Some tags can terminate paragraph without empty line.
+    terminate = false;
+    for (i = 0, l = terminatorRules.length; i < l; i++) {
+      if (terminatorRules[i](state, nextLine, endLine, true)) {
+        terminate = true;
+        break;
+      }
+    }
+    if (terminate) { break; }
+  }
+
+  if (!level) {
+    // Didn't find valid underline
+    return false;
+  }
+
+  content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
+
+  state.line = nextLine + 1;
+
+  token          = state.push('heading_open', 'h' + String(level), 1);
+  token.markup   = String.fromCharCode(marker);
+  token.map      = [ startLine, state.line ];
+
+  token          = state.push('inline', '', 0);
+  token.content  = content;
+  token.map      = [ startLine, state.line - 1 ];
+  token.children = [];
+
+  token          = state.push('heading_close', 'h' + String(level), -1);
+  token.markup   = String.fromCharCode(marker);
+
+  state.parentType = oldParentType;
+
+  return true;
+};
+
+},{}],25:[function(require,module,exports){
+// Lists
+
+'use strict';
+
+var isSpace = require('../common/utils').isSpace;
+
+
+// Search `[-+*][\n ]`, returns next pos arter marker on success
+// or -1 on fail.
+function skipBulletListMarker(state, startLine) {
+  var marker, pos, max, ch;
+
+  pos = state.bMarks[startLine] + state.tShift[startLine];
+  max = state.eMarks[startLine];
+
+  marker = state.src.charCodeAt(pos++);
+  // Check bullet
+  if (marker !== 0x2A/* * */ &&
+      marker !== 0x2D/* - */ &&
+      marker !== 0x2B/* + */) {
+    return -1;
+  }
+
+  if (pos < max) {
+    ch = state.src.charCodeAt(pos);
+
+    if (!isSpace(ch)) {
+      // " -test " - is not a list item
+      return -1;
+    }
+  }
+
+  return pos;
+}
+
+// Search `\d+[.)][\n ]`, returns next pos arter marker on success
+// or -1 on fail.
+function skipOrderedListMarker(state, startLine) {
+  var ch,
+      start = state.bMarks[startLine] + state.tShift[startLine],
+      pos = start,
+      max = state.eMarks[startLine];
+
+  // List marker should have at least 2 chars (digit + dot)
+  if (pos + 1 >= max) { return -1; }
+
+  ch = state.src.charCodeAt(pos++);
+
+  if (ch < 0x30/* 0 */ || ch > 0x39/* 9 */) { return -1; }
+
+  for (;;) {
+    // EOL -> fail
+    if (pos >= max) { return -1; }
+
+    ch = state.src.charCodeAt(pos++);
+
+    if (ch >= 0x30/* 0 */ && ch <= 0x39/* 9 */) {
+
+      // List marker should have no more than 9 digits
+      // (prevents integer overflow in browsers)
+      if (pos - start >= 10) { return -1; }
+
+      continue;
+    }
+
+    // found valid marker
+    if (ch === 0x29/* ) */ || ch === 0x2e/* . */) {
+      break;
+    }
+
+    return -1;
+  }
+
+
+  if (pos < max) {
+    ch = state.src.charCodeAt(pos);
+
+    if (!isSpace(ch)) {
+      // " 1.test " - is not a list item
+      return -1;
+    }
+  }
+  return pos;
+}
+
+function markTightParagraphs(state, idx) {
+  var i, l,
+      level = state.level + 2;
+
+  for (i = idx + 2, l = state.tokens.length - 2; i < l; i++) {
+    if (state.tokens[i].level === level && state.tokens[i].type === 'paragraph_open') {
+      state.tokens[i + 2].hidden = true;
+      state.tokens[i].hidden = true;
+      i += 2;
+    }
+  }
+}
+
+
+module.exports = function list(state, startLine, endLine, silent) {
+  var ch,
+      contentStart,
+      i,
+      indent,
+      indentAfterMarker,
+      initial,
+      isOrdered,
+      itemLines,
+      l,
+      listLines,
+      listTokIdx,
+      markerCharCode,
+      markerValue,
+      max,
+      nextLine,
+      offset,
+      oldIndent,
+      oldLIndent,
+      oldParentType,
+      oldTShift,
+      oldTight,
+      pos,
+      posAfterMarker,
+      prevEmptyEnd,
+      start,
+      terminate,
+      terminatorRules,
+      token,
+      isTerminatingParagraph = false,
+      tight = true;
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+
+  // limit conditions when list can interrupt
+  // a paragraph (validation mode only)
+  if (silent && state.parentType === 'paragraph') {
+    // Next list item should still terminate previous list item;
+    //
+    // This code can fail if plugins use blkIndent as well as lists,
+    // but I hope the spec gets fixed long before that happens.
+    //
+    if (state.tShift[startLine] >= state.blkIndent) {
+      isTerminatingParagraph = true;
+    }
+  }
+
+  // Detect list type and position after marker
+  if ((posAfterMarker = skipOrderedListMarker(state, startLine)) >= 0) {
+    isOrdered = true;
+    start = state.bMarks[startLine] + state.tShift[startLine];
+    markerValue = Number(state.src.substr(start, posAfterMarker - start - 1));
+
+    // If we're starting a new ordered list right after
+    // a paragraph, it should start with 1.
+    if (isTerminatingParagraph && markerValue !== 1) return false;
+
+  } else if ((posAfterMarker = skipBulletListMarker(state, startLine)) >= 0) {
+    isOrdered = false;
+
+  } else {
+    return false;
+  }
+
+  // If we're starting a new unordered list right after
+  // a paragraph, first line should not be empty.
+  if (isTerminatingParagraph) {
+    if (state.skipSpaces(posAfterMarker) >= state.eMarks[startLine]) return false;
+  }
+
+  // We should terminate list on style change. Remember first one to compare.
+  markerCharCode = state.src.charCodeAt(posAfterMarker - 1);
+
+  // For validation mode we can terminate immediately
+  if (silent) { return true; }
+
+  // Start list
+  listTokIdx = state.tokens.length;
+
+  if (isOrdered) {
+    token       = state.push('ordered_list_open', 'ol', 1);
+    if (markerValue !== 1) {
+      token.attrs = [ [ 'start', markerValue ] ];
+    }
+
+  } else {
+    token       = state.push('bullet_list_open', 'ul', 1);
+  }
+
+  token.map    = listLines = [ startLine, 0 ];
+  token.markup = String.fromCharCode(markerCharCode);
+
+  //
+  // Iterate list items
+  //
+
+  nextLine = startLine;
+  prevEmptyEnd = false;
+  terminatorRules = state.md.block.ruler.getRules('list');
+
+  oldParentType = state.parentType;
+  state.parentType = 'list';
+
+  while (nextLine < endLine) {
+    pos = posAfterMarker;
+    max = state.eMarks[nextLine];
+
+    initial = offset = state.sCount[nextLine] + posAfterMarker - (state.bMarks[startLine] + state.tShift[startLine]);
+
+    while (pos < max) {
+      ch = state.src.charCodeAt(pos);
+
+      if (isSpace(ch)) {
+        if (ch === 0x09) {
+          offset += 4 - (offset + state.bsCount[nextLine]) % 4;
+        } else {
+          offset++;
+        }
+      } else {
+        break;
+      }
+
+      pos++;
+    }
+
+    contentStart = pos;
+
+    if (contentStart >= max) {
+      // trimming space in "-    \n  3" case, indent is 1 here
+      indentAfterMarker = 1;
+    } else {
+      indentAfterMarker = offset - initial;
+    }
+
+    // If we have more than 4 spaces, the indent is 1
+    // (the rest is just indented code block)
+    if (indentAfterMarker > 4) { indentAfterMarker = 1; }
+
+    // "  -  test"
+    //  ^^^^^ - calculating total length of this thing
+    indent = initial + indentAfterMarker;
+
+    // Run subparser & write tokens
+    token        = state.push('list_item_open', 'li', 1);
+    token.markup = String.fromCharCode(markerCharCode);
+    token.map    = itemLines = [ startLine, 0 ];
+
+    oldIndent = state.blkIndent;
+    oldTight = state.tight;
+    oldTShift = state.tShift[startLine];
+    oldLIndent = state.sCount[startLine];
+    state.blkIndent = indent;
+    state.tight = true;
+    state.tShift[startLine] = contentStart - state.bMarks[startLine];
+    state.sCount[startLine] = offset;
+
+    if (contentStart >= max && state.isEmpty(startLine + 1)) {
+      // workaround for this case
+      // (list item is empty, list terminates before "foo"):
+      // ~~~~~~~~
+      //   -
+      //
+      //     foo
+      // ~~~~~~~~
+      state.line = Math.min(state.line + 2, endLine);
+    } else {
+      state.md.block.tokenize(state, startLine, endLine, true);
+    }
+
+    // If any of list item is tight, mark list as tight
+    if (!state.tight || prevEmptyEnd) {
+      tight = false;
+    }
+    // Item become loose if finish with empty line,
+    // but we should filter last element, because it means list finish
+    prevEmptyEnd = (state.line - startLine) > 1 && state.isEmpty(state.line - 1);
+
+    state.blkIndent = oldIndent;
+    state.tShift[startLine] = oldTShift;
+    state.sCount[startLine] = oldLIndent;
+    state.tight = oldTight;
+
+    token        = state.push('list_item_close', 'li', -1);
+    token.markup = String.fromCharCode(markerCharCode);
+
+    nextLine = startLine = state.line;
+    itemLines[1] = nextLine;
+    contentStart = state.bMarks[startLine];
+
+    if (nextLine >= endLine) { break; }
+
+    //
+    // Try to check if list is terminated or continued.
+    //
+    if (state.sCount[nextLine] < state.blkIndent) { break; }
+
+    // fail if terminating block found
+    terminate = false;
+    for (i = 0, l = terminatorRules.length; i < l; i++) {
+      if (terminatorRules[i](state, nextLine, endLine, true)) {
+        terminate = true;
+        break;
+      }
+    }
+    if (terminate) { break; }
+
+    // fail if list has another type
+    if (isOrdered) {
+      posAfterMarker = skipOrderedListMarker(state, nextLine);
+      if (posAfterMarker < 0) { break; }
+    } else {
+      posAfterMarker = skipBulletListMarker(state, nextLine);
+      if (posAfterMarker < 0) { break; }
+    }
+
+    if (markerCharCode !== state.src.charCodeAt(posAfterMarker - 1)) { break; }
+  }
+
+  // Finilize list
+  if (isOrdered) {
+    token = state.push('ordered_list_close', 'ol', -1);
+  } else {
+    token = state.push('bullet_list_close', 'ul', -1);
+  }
+  token.markup = String.fromCharCode(markerCharCode);
+
+  listLines[1] = nextLine;
+  state.line = nextLine;
+
+  state.parentType = oldParentType;
+
+  // mark paragraphs tight if needed
+  if (tight) {
+    markTightParagraphs(state, listTokIdx);
+  }
+
+  return true;
+};
+
+},{"../common/utils":4}],26:[function(require,module,exports){
+// Paragraph
+
+'use strict';
+
+
+module.exports = function paragraph(state, startLine/*, endLine*/) {
+  var content, terminate, i, l, token, oldParentType,
+      nextLine = startLine + 1,
+      terminatorRules = state.md.block.ruler.getRules('paragraph'),
+      endLine = state.lineMax;
+
+  oldParentType = state.parentType;
+  state.parentType = 'paragraph';
+
+  // jump line-by-line until empty one or EOF
+  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
+    // this would be a code block normally, but after paragraph
+    // it's considered a lazy continuation regardless of what's there
+    if (state.sCount[nextLine] - state.blkIndent > 3) { continue; }
+
+    // quirk for blockquotes, this line should already be checked by that rule
+    if (state.sCount[nextLine] < 0) { continue; }
+
+    // Some tags can terminate paragraph without empty line.
+    terminate = false;
+    for (i = 0, l = terminatorRules.length; i < l; i++) {
+      if (terminatorRules[i](state, nextLine, endLine, true)) {
+        terminate = true;
+        break;
+      }
+    }
+    if (terminate) { break; }
+  }
+
+  content = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
+
+  state.line = nextLine;
+
+  token          = state.push('paragraph_open', 'p', 1);
+  token.map      = [ startLine, state.line ];
+
+  token          = state.push('inline', '', 0);
+  token.content  = content;
+  token.map      = [ startLine, state.line ];
+  token.children = [];
+
+  token          = state.push('paragraph_close', 'p', -1);
+
+  state.parentType = oldParentType;
+
+  return true;
+};
+
+},{}],27:[function(require,module,exports){
+'use strict';
+
+
+var normalizeReference   = require('../common/utils').normalizeReference;
+var isSpace              = require('../common/utils').isSpace;
+
+
+module.exports = function reference(state, startLine, _endLine, silent) {
+  var ch,
+      destEndPos,
+      destEndLineNo,
+      endLine,
+      href,
+      i,
+      l,
+      label,
+      labelEnd,
+      oldParentType,
+      res,
+      start,
+      str,
+      terminate,
+      terminatorRules,
+      title,
+      lines = 0,
+      pos = state.bMarks[startLine] + state.tShift[startLine],
+      max = state.eMarks[startLine],
+      nextLine = startLine + 1;
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+
+  if (state.src.charCodeAt(pos) !== 0x5B/* [ */) { return false; }
+
+  // Simple check to quickly interrupt scan on [link](url) at the start of line.
+  // Can be useful on practice: https://github.com/markdown-it/markdown-it/issues/54
+  while (++pos < max) {
+    if (state.src.charCodeAt(pos) === 0x5D /* ] */ &&
+        state.src.charCodeAt(pos - 1) !== 0x5C/* \ */) {
+      if (pos + 1 === max) { return false; }
+      if (state.src.charCodeAt(pos + 1) !== 0x3A/* : */) { return false; }
+      break;
+    }
+  }
+
+  endLine = state.lineMax;
+
+  // jump line-by-line until empty one or EOF
+  terminatorRules = state.md.block.ruler.getRules('reference');
+
+  oldParentType = state.parentType;
+  state.parentType = 'reference';
+
+  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
+    // this would be a code block normally, but after paragraph
+    // it's considered a lazy continuation regardless of what's there
+    if (state.sCount[nextLine] - state.blkIndent > 3) { continue; }
+
+    // quirk for blockquotes, this line should already be checked by that rule
+    if (state.sCount[nextLine] < 0) { continue; }
+
+    // Some tags can terminate paragraph without empty line.
+    terminate = false;
+    for (i = 0, l = terminatorRules.length; i < l; i++) {
+      if (terminatorRules[i](state, nextLine, endLine, true)) {
+        terminate = true;
+        break;
+      }
+    }
+    if (terminate) { break; }
+  }
+
+  str = state.getLines(startLine, nextLine, state.blkIndent, false).trim();
+  max = str.length;
+
+  for (pos = 1; pos < max; pos++) {
+    ch = str.charCodeAt(pos);
+    if (ch === 0x5B /* [ */) {
+      return false;
+    } else if (ch === 0x5D /* ] */) {
+      labelEnd = pos;
+      break;
+    } else if (ch === 0x0A /* \n */) {
+      lines++;
+    } else if (ch === 0x5C /* \ */) {
+      pos++;
+      if (pos < max && str.charCodeAt(pos) === 0x0A) {
+        lines++;
+      }
+    }
+  }
+
+  if (labelEnd < 0 || str.charCodeAt(labelEnd + 1) !== 0x3A/* : */) { return false; }
+
+  // [label]:   destination   'title'
+  //         ^^^ skip optional whitespace here
+  for (pos = labelEnd + 2; pos < max; pos++) {
+    ch = str.charCodeAt(pos);
+    if (ch === 0x0A) {
+      lines++;
+    } else if (isSpace(ch)) {
+      /*eslint no-empty:0*/
+    } else {
+      break;
+    }
+  }
+
+  // [label]:   destination   'title'
+  //            ^^^^^^^^^^^ parse this
+  res = state.md.helpers.parseLinkDestination(str, pos, max);
+  if (!res.ok) { return false; }
+
+  href = state.md.normalizeLink(res.str);
+  if (!state.md.validateLink(href)) { return false; }
+
+  pos = res.pos;
+  lines += res.lines;
+
+  // save cursor state, we could require to rollback later
+  destEndPos = pos;
+  destEndLineNo = lines;
+
+  // [label]:   destination   'title'
+  //                       ^^^ skipping those spaces
+  start = pos;
+  for (; pos < max; pos++) {
+    ch = str.charCodeAt(pos);
+    if (ch === 0x0A) {
+      lines++;
+    } else if (isSpace(ch)) {
+      /*eslint no-empty:0*/
+    } else {
+      break;
+    }
+  }
+
+  // [label]:   destination   'title'
+  //                          ^^^^^^^ parse this
+  res = state.md.helpers.parseLinkTitle(str, pos, max);
+  if (pos < max && start !== pos && res.ok) {
+    title = res.str;
+    pos = res.pos;
+    lines += res.lines;
+  } else {
+    title = '';
+    pos = destEndPos;
+    lines = destEndLineNo;
+  }
+
+  // skip trailing spaces until the rest of the line
+  while (pos < max) {
+    ch = str.charCodeAt(pos);
+    if (!isSpace(ch)) { break; }
+    pos++;
+  }
+
+  if (pos < max && str.charCodeAt(pos) !== 0x0A) {
+    if (title) {
+      // garbage at the end of the line after title,
+      // but it could still be a valid reference if we roll back
+      title = '';
+      pos = destEndPos;
+      lines = destEndLineNo;
+      while (pos < max) {
+        ch = str.charCodeAt(pos);
+        if (!isSpace(ch)) { break; }
+        pos++;
+      }
+    }
+  }
+
+  if (pos < max && str.charCodeAt(pos) !== 0x0A) {
+    // garbage at the end of the line
+    return false;
+  }
+
+  label = normalizeReference(str.slice(1, labelEnd));
+  if (!label) {
+    // CommonMark 0.20 disallows empty labels
+    return false;
+  }
+
+  // Reference can not terminate anything. This check is for safety only.
+  /*istanbul ignore if*/
+  if (silent) { return true; }
+
+  if (typeof state.env.references === 'undefined') {
+    state.env.references = {};
+  }
+  if (typeof state.env.references[label] === 'undefined') {
+    state.env.references[label] = { title: title, href: href };
+  }
+
+  state.parentType = oldParentType;
+
+  state.line = startLine + lines + 1;
+  return true;
+};
+
+},{"../common/utils":4}],28:[function(require,module,exports){
+// Parser state class
+
+'use strict';
+
+var Token = require('../token');
+var isSpace = require('../common/utils').isSpace;
+
+
+function StateBlock(src, md, env, tokens) {
+  var ch, s, start, pos, len, indent, offset, indent_found;
+
+  this.src = src;
+
+  // link to parser instance
+  this.md     = md;
+
+  this.env = env;
+
+  //
+  // Internal state vartiables
+  //
+
+  this.tokens = tokens;
+
+  this.bMarks = [];  // line begin offsets for fast jumps
+  this.eMarks = [];  // line end offsets for fast jumps
+  this.tShift = [];  // offsets of the first non-space characters (tabs not expanded)
+  this.sCount = [];  // indents for each line (tabs expanded)
+
+  // An amount of virtual spaces (tabs expanded) between beginning
+  // of each line (bMarks) and real beginning of that line.
+  //
+  // It exists only as a hack because blockquotes override bMarks
+  // losing information in the process.
+  //
+  // It's used only when expanding tabs, you can think about it as
+  // an initial tab length, e.g. bsCount=21 applied to string `\t123`
+  // means first tab should be expanded to 4-21%4 === 3 spaces.
+  //
+  this.bsCount = [];
+
+  // block parser variables
+  this.blkIndent  = 0; // required block content indent
+                       // (for example, if we are in list)
+  this.line       = 0; // line index in src
+  this.lineMax    = 0; // lines count
+  this.tight      = false;  // loose/tight mode for lists
+  this.ddIndent   = -1; // indent of the current dd block (-1 if there isn't any)
+
+  // can be 'blockquote', 'list', 'root', 'paragraph' or 'reference'
+  // used in lists to determine if they interrupt a paragraph
+  this.parentType = 'root';
+
+  this.level = 0;
+
+  // renderer
+  this.result = '';
+
+  // Create caches
+  // Generate markers.
+  s = this.src;
+  indent_found = false;
+
+  for (start = pos = indent = offset = 0, len = s.length; pos < len; pos++) {
+    ch = s.charCodeAt(pos);
+
+    if (!indent_found) {
+      if (isSpace(ch)) {
+        indent++;
+
+        if (ch === 0x09) {
+          offset += 4 - offset % 4;
+        } else {
+          offset++;
+        }
+        continue;
+      } else {
+        indent_found = true;
+      }
+    }
+
+    if (ch === 0x0A || pos === len - 1) {
+      if (ch !== 0x0A) { pos++; }
+      this.bMarks.push(start);
+      this.eMarks.push(pos);
+      this.tShift.push(indent);
+      this.sCount.push(offset);
+      this.bsCount.push(0);
+
+      indent_found = false;
+      indent = 0;
+      offset = 0;
+      start = pos + 1;
+    }
+  }
+
+  // Push fake entry to simplify cache bounds checks
+  this.bMarks.push(s.length);
+  this.eMarks.push(s.length);
+  this.tShift.push(0);
+  this.sCount.push(0);
+  this.bsCount.push(0);
+
+  this.lineMax = this.bMarks.length - 1; // don't count last fake line
+}
+
+// Push new token to "stream".
+//
+StateBlock.prototype.push = function (type, tag, nesting) {
+  var token = new Token(type, tag, nesting);
+  token.block = true;
+
+  if (nesting < 0) { this.level--; }
+  token.level = this.level;
+  if (nesting > 0) { this.level++; }
+
+  this.tokens.push(token);
+  return token;
+};
+
+StateBlock.prototype.isEmpty = function isEmpty(line) {
+  return this.bMarks[line] + this.tShift[line] >= this.eMarks[line];
+};
+
+StateBlock.prototype.skipEmptyLines = function skipEmptyLines(from) {
+  for (var max = this.lineMax; from < max; from++) {
+    if (this.bMarks[from] + this.tShift[from] < this.eMarks[from]) {
+      break;
+    }
+  }
+  return from;
+};
+
+// Skip spaces from given position.
+StateBlock.prototype.skipSpaces = function skipSpaces(pos) {
+  var ch;
+
+  for (var max = this.src.length; pos < max; pos++) {
+    ch = this.src.charCodeAt(pos);
+    if (!isSpace(ch)) { break; }
+  }
+  return pos;
+};
+
+// Skip spaces from given position in reverse.
+StateBlock.prototype.skipSpacesBack = function skipSpacesBack(pos, min) {
+  if (pos <= min) { return pos; }
+
+  while (pos > min) {
+    if (!isSpace(this.src.charCodeAt(--pos))) { return pos + 1; }
+  }
+  return pos;
+};
+
+// Skip char codes from given position
+StateBlock.prototype.skipChars = function skipChars(pos, code) {
+  for (var max = this.src.length; pos < max; pos++) {
+    if (this.src.charCodeAt(pos) !== code) { break; }
+  }
+  return pos;
+};
+
+// Skip char codes reverse from given position - 1
+StateBlock.prototype.skipCharsBack = function skipCharsBack(pos, code, min) {
+  if (pos <= min) { return pos; }
+
+  while (pos > min) {
+    if (code !== this.src.charCodeAt(--pos)) { return pos + 1; }
+  }
+  return pos;
+};
+
+// cut lines range from source.
+StateBlock.prototype.getLines = function getLines(begin, end, indent, keepLastLF) {
+  var i, lineIndent, ch, first, last, queue, lineStart,
+      line = begin;
+
+  if (begin >= end) {
+    return '';
+  }
+
+  queue = new Array(end - begin);
+
+  for (i = 0; line < end; line++, i++) {
+    lineIndent = 0;
+    lineStart = first = this.bMarks[line];
+
+    if (line + 1 < end || keepLastLF) {
+      // No need for bounds check because we have fake entry on tail.
+      last = this.eMarks[line] + 1;
+    } else {
+      last = this.eMarks[line];
+    }
+
+    while (first < last && lineIndent < indent) {
+      ch = this.src.charCodeAt(first);
+
+      if (isSpace(ch)) {
+        if (ch === 0x09) {
+          lineIndent += 4 - (lineIndent + this.bsCount[line]) % 4;
+        } else {
+          lineIndent++;
+        }
+      } else if (first - lineStart < this.tShift[line]) {
+        // patched tShift masked characters to look like spaces (blockquotes, list markers)
+        lineIndent++;
+      } else {
+        break;
+      }
+
+      first++;
+    }
+
+    if (lineIndent > indent) {
+      // partially expanding tabs in code blocks, e.g '\t\tfoobar'
+      // with indent=2 becomes '  \tfoobar'
+      queue[i] = new Array(lineIndent - indent + 1).join(' ') + this.src.slice(first, last);
+    } else {
+      queue[i] = this.src.slice(first, last);
+    }
+  }
+
+  return queue.join('');
+};
+
+// re-export Token class to use in block rules
+StateBlock.prototype.Token = Token;
+
+
+module.exports = StateBlock;
+
+},{"../common/utils":4,"../token":51}],29:[function(require,module,exports){
+// GFM table, non-standard
+
+'use strict';
+
+var isSpace = require('../common/utils').isSpace;
+
+
+function getLine(state, line) {
+  var pos = state.bMarks[line] + state.blkIndent,
+      max = state.eMarks[line];
+
+  return state.src.substr(pos, max - pos);
+}
+
+function escapedSplit(str) {
+  var result = [],
+      pos = 0,
+      max = str.length,
+      ch,
+      escapes = 0,
+      lastPos = 0,
+      backTicked = false,
+      lastBackTick = 0;
+
+  ch  = str.charCodeAt(pos);
+
+  while (pos < max) {
+    if (ch === 0x60/* ` */) {
+      if (backTicked) {
+        // make \` close code sequence, but not open it;
+        // the reason is: `\` is correct code block
+        backTicked = false;
+        lastBackTick = pos;
+      } else if (escapes % 2 === 0) {
+        backTicked = true;
+        lastBackTick = pos;
+      }
+    } else if (ch === 0x7c/* | */ && (escapes % 2 === 0) && !backTicked) {
+      result.push(str.substring(lastPos, pos));
+      lastPos = pos + 1;
+    }
+
+    if (ch === 0x5c/* \ */) {
+      escapes++;
+    } else {
+      escapes = 0;
+    }
+
+    pos++;
+
+    // If there was an un-closed backtick, go back to just after
+    // the last backtick, but as if it was a normal character
+    if (pos === max && backTicked) {
+      backTicked = false;
+      pos = lastBackTick + 1;
+    }
+
+    ch = str.charCodeAt(pos);
+  }
+
+  result.push(str.substring(lastPos));
+
+  return result;
+}
+
+
+module.exports = function table(state, startLine, endLine, silent) {
+  var ch, lineText, pos, i, nextLine, columns, columnCount, token,
+      aligns, t, tableLines, tbodyLines;
+
+  // should have at least two lines
+  if (startLine + 2 > endLine) { return false; }
+
+  nextLine = startLine + 1;
+
+  if (state.sCount[nextLine] < state.blkIndent) { return false; }
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[nextLine] - state.blkIndent >= 4) { return false; }
+
+  // first character of the second line should be '|', '-', ':',
+  // and no other characters are allowed but spaces;
+  // basically, this is the equivalent of /^[-:|][-:|\s]*$/ regexp
+
+  pos = state.bMarks[nextLine] + state.tShift[nextLine];
+  if (pos >= state.eMarks[nextLine]) { return false; }
+
+  ch = state.src.charCodeAt(pos++);
+  if (ch !== 0x7C/* | */ && ch !== 0x2D/* - */ && ch !== 0x3A/* : */) { return false; }
+
+  while (pos < state.eMarks[nextLine]) {
+    ch = state.src.charCodeAt(pos);
+
+    if (ch !== 0x7C/* | */ && ch !== 0x2D/* - */ && ch !== 0x3A/* : */ && !isSpace(ch)) { return false; }
+
+    pos++;
+  }
+
+  lineText = getLine(state, startLine + 1);
+
+  columns = lineText.split('|');
+  aligns = [];
+  for (i = 0; i < columns.length; i++) {
+    t = columns[i].trim();
+    if (!t) {
+      // allow empty columns before and after table, but not in between columns;
+      // e.g. allow ` |---| `, disallow ` ---||--- `
+      if (i === 0 || i === columns.length - 1) {
+        continue;
+      } else {
+        return false;
+      }
+    }
+
+    if (!/^:?-+:?$/.test(t)) { return false; }
+    if (t.charCodeAt(t.length - 1) === 0x3A/* : */) {
+      aligns.push(t.charCodeAt(0) === 0x3A/* : */ ? 'center' : 'right');
+    } else if (t.charCodeAt(0) === 0x3A/* : */) {
+      aligns.push('left');
+    } else {
+      aligns.push('');
+    }
+  }
+
+  lineText = getLine(state, startLine).trim();
+  if (lineText.indexOf('|') === -1) { return false; }
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+  columns = escapedSplit(lineText.replace(/^\||\|$/g, ''));
+
+  // header row will define an amount of columns in the entire table,
+  // and align row shouldn't be smaller than that (the rest of the rows can)
+  columnCount = columns.length;
+  if (columnCount > aligns.length) { return false; }
+
+  if (silent) { return true; }
+
+  token     = state.push('table_open', 'table', 1);
+  token.map = tableLines = [ startLine, 0 ];
+
+  token     = state.push('thead_open', 'thead', 1);
+  token.map = [ startLine, startLine + 1 ];
+
+  token     = state.push('tr_open', 'tr', 1);
+  token.map = [ startLine, startLine + 1 ];
+
+  for (i = 0; i < columns.length; i++) {
+    token          = state.push('th_open', 'th', 1);
+    token.map      = [ startLine, startLine + 1 ];
+    if (aligns[i]) {
+      token.attrs  = [ [ 'style', 'text-align:' + aligns[i] ] ];
+    }
+
+    token          = state.push('inline', '', 0);
+    token.content  = columns[i].trim();
+    token.map      = [ startLine, startLine + 1 ];
+    token.children = [];
+
+    token          = state.push('th_close', 'th', -1);
+  }
+
+  token     = state.push('tr_close', 'tr', -1);
+  token     = state.push('thead_close', 'thead', -1);
+
+  token     = state.push('tbody_open', 'tbody', 1);
+  token.map = tbodyLines = [ startLine + 2, 0 ];
+
+  for (nextLine = startLine + 2; nextLine < endLine; nextLine++) {
+    if (state.sCount[nextLine] < state.blkIndent) { break; }
+
+    lineText = getLine(state, nextLine).trim();
+    if (lineText.indexOf('|') === -1) { break; }
+    if (state.sCount[nextLine] - state.blkIndent >= 4) { break; }
+    columns = escapedSplit(lineText.replace(/^\||\|$/g, ''));
+
+    token = state.push('tr_open', 'tr', 1);
+    for (i = 0; i < columnCount; i++) {
+      token          = state.push('td_open', 'td', 1);
+      if (aligns[i]) {
+        token.attrs  = [ [ 'style', 'text-align:' + aligns[i] ] ];
+      }
+
+      token          = state.push('inline', '', 0);
+      token.content  = columns[i] ? columns[i].trim() : '';
+      token.children = [];
+
+      token          = state.push('td_close', 'td', -1);
+    }
+    token = state.push('tr_close', 'tr', -1);
+  }
+  token = state.push('tbody_close', 'tbody', -1);
+  token = state.push('table_close', 'table', -1);
+
+  tableLines[1] = tbodyLines[1] = nextLine;
+  state.line = nextLine;
+  return true;
+};
+
+},{"../common/utils":4}],30:[function(require,module,exports){
+'use strict';
+
+
+module.exports = function block(state) {
+  var token;
+
+  if (state.inlineMode) {
+    token          = new state.Token('inline', '', 0);
+    token.content  = state.src;
+    token.map      = [ 0, 1 ];
+    token.children = [];
+    state.tokens.push(token);
+  } else {
+    state.md.block.parse(state.src, state.md, state.env, state.tokens);
+  }
+};
+
+},{}],31:[function(require,module,exports){
+'use strict';
+
+module.exports = function inline(state) {
+  var tokens = state.tokens, tok, i, l;
+
+  // Parse inlines
+  for (i = 0, l = tokens.length; i < l; i++) {
+    tok = tokens[i];
+    if (tok.type === 'inline') {
+      state.md.inline.parse(tok.content, state.md, state.env, tok.children);
+    }
+  }
+};
+
+},{}],32:[function(require,module,exports){
+// Replace link-like texts with link nodes.
+//
+// Currently restricted by `md.validateLink()` to http/https/ftp
+//
+'use strict';
+
+
+var arrayReplaceAt = require('../common/utils').arrayReplaceAt;
+
+
+function isLinkOpen(str) {
+  return /^<a[>\s]/i.test(str);
+}
+function isLinkClose(str) {
+  return /^<\/a\s*>/i.test(str);
+}
+
+
+module.exports = function linkify(state) {
+  var i, j, l, tokens, token, currentToken, nodes, ln, text, pos, lastPos,
+      level, htmlLinkLevel, url, fullUrl, urlText,
+      blockTokens = state.tokens,
+      links;
+
+  if (!state.md.options.linkify) { return; }
+
+  for (j = 0, l = blockTokens.length; j < l; j++) {
+    if (blockTokens[j].type !== 'inline' ||
+        !state.md.linkify.pretest(blockTokens[j].content)) {
+      continue;
+    }
+
+    tokens = blockTokens[j].children;
+
+    htmlLinkLevel = 0;
+
+    // We scan from the end, to keep position when new tags added.
+    // Use reversed logic in links start/end match
+    for (i = tokens.length - 1; i >= 0; i--) {
+      currentToken = tokens[i];
+
+      // Skip content of markdown links
+      if (currentToken.type === 'link_close') {
+        i--;
+        while (tokens[i].level !== currentToken.level && tokens[i].type !== 'link_open') {
+          i--;
+        }
+        continue;
+      }
+
+      // Skip content of html tag links
+      if (currentToken.type === 'html_inline') {
+        if (isLinkOpen(currentToken.content) && htmlLinkLevel > 0) {
+          htmlLinkLevel--;
+        }
+        if (isLinkClose(currentToken.content)) {
+          htmlLinkLevel++;
+        }
+      }
+      if (htmlLinkLevel > 0) { continue; }
+
+      if (currentToken.type === 'text' && state.md.linkify.test(currentToken.content)) {
+
+        text = currentToken.content;
+        links = state.md.linkify.match(text);
+
+        // Now split string to nodes
+        nodes = [];
+        level = currentToken.level;
+        lastPos = 0;
+
+        for (ln = 0; ln < links.length; ln++) {
+
+          url = links[ln].url;
+          fullUrl = state.md.normalizeLink(url);
+          if (!state.md.validateLink(fullUrl)) { continue; }
+
+          urlText = links[ln].text;
+
+          // Linkifier might send raw hostnames like "example.com", where url
+          // starts with domain name. So we prepend http:// in those cases,
+          // and remove it afterwards.
+          //
+          if (!links[ln].schema) {
+            urlText = state.md.normalizeLinkText('http://' + urlText).replace(/^http:\/\//, '');
+          } else if (links[ln].schema === 'mailto:' && !/^mailto:/i.test(urlText)) {
+            urlText = state.md.normalizeLinkText('mailto:' + urlText).replace(/^mailto:/, '');
+          } else {
+            urlText = state.md.normalizeLinkText(urlText);
+          }
+
+          pos = links[ln].index;
+
+          if (pos > lastPos) {
+            token         = new state.Token('text', '', 0);
+            token.content = text.slice(lastPos, pos);
+            token.level   = level;
+            nodes.push(token);
+          }
+
+          token         = new state.Token('link_open', 'a', 1);
+          token.attrs   = [ [ 'href', fullUrl ] ];
+          token.level   = level++;
+          token.markup  = 'linkify';
+          token.info    = 'auto';
+          nodes.push(token);
+
+          token         = new state.Token('text', '', 0);
+          token.content = urlText;
+          token.level   = level;
+          nodes.push(token);
+
+          token         = new state.Token('link_close', 'a', -1);
+          token.level   = --level;
+          token.markup  = 'linkify';
+          token.info    = 'auto';
+          nodes.push(token);
+
+          lastPos = links[ln].lastIndex;
+        }
+        if (lastPos < text.length) {
+          token         = new state.Token('text', '', 0);
+          token.content = text.slice(lastPos);
+          token.level   = level;
+          nodes.push(token);
+        }
+
+        // replace current node
+        blockTokens[j].children = tokens = arrayReplaceAt(tokens, i, nodes);
+      }
+    }
+  }
+};
+
+},{"../common/utils":4}],33:[function(require,module,exports){
+// Normalize input string
+
+'use strict';
+
+
+var NEWLINES_RE  = /\r[\n\u0085]?|[\u2424\u2028\u0085]/g;
+var NULL_RE      = /\u0000/g;
+
+
+module.exports = function inline(state) {
+  var str;
+
+  // Normalize newlines
+  str = state.src.replace(NEWLINES_RE, '\n');
+
+  // Replace NULL characters
+  str = str.replace(NULL_RE, '\uFFFD');
+
+  state.src = str;
+};
+
+},{}],34:[function(require,module,exports){
+// Simple typographyc replacements
+//
+// (c) (C) → ©
+// (tm) (TM) → ™
+// (r) (R) → ®
+// +- → ±
+// (p) (P) -> §
+// ... → … (also ?.... → ?.., !.... → !..)
+// ???????? → ???, !!!!! → !!!, `,,` → `,`
+// -- → &ndash;, --- → &mdash;
+//
+'use strict';
+
+// TODO:
+// - fractionals 1/2, 1/4, 3/4 -> ½, ¼, ¾
+// - miltiplication 2 x 4 -> 2 × 4
+
+var RARE_RE = /\+-|\.\.|\?\?\?\?|!!!!|,,|--/;
+
+// Workaround for phantomjs - need regex without /g flag,
+// or root check will fail every second time
+var SCOPED_ABBR_TEST_RE = /\((c|tm|r|p)\)/i;
+
+var SCOPED_ABBR_RE = /\((c|tm|r|p)\)/ig;
+var SCOPED_ABBR = {
+  c: '©',
+  r: '®',
+  p: '§',
+  tm: '™'
+};
+
+function replaceFn(match, name) {
+  return SCOPED_ABBR[name.toLowerCase()];
+}
+
+function replace_scoped(inlineTokens) {
+  var i, token, inside_autolink = 0;
+
+  for (i = inlineTokens.length - 1; i >= 0; i--) {
+    token = inlineTokens[i];
+
+    if (token.type === 'text' && !inside_autolink) {
+      token.content = token.content.replace(SCOPED_ABBR_RE, replaceFn);
+    }
+
+    if (token.type === 'link_open' && token.info === 'auto') {
+      inside_autolink--;
+    }
+
+    if (token.type === 'link_close' && token.info === 'auto') {
+      inside_autolink++;
+    }
+  }
+}
+
+function replace_rare(inlineTokens) {
+  var i, token, inside_autolink = 0;
+
+  for (i = inlineTokens.length - 1; i >= 0; i--) {
+    token = inlineTokens[i];
+
+    if (token.type === 'text' && !inside_autolink) {
+      if (RARE_RE.test(token.content)) {
+        token.content = token.content
+                    .replace(/\+-/g, '±')
+                    // .., ..., ....... -> …
+                    // but ?..... & !..... -> ?.. & !..
+                    .replace(/\.{2,}/g, '…').replace(/([?!])…/g, '$1..')
+                    .replace(/([?!]){4,}/g, '$1$1$1').replace(/,{2,}/g, ',')
+                    // em-dash
+                    .replace(/(^|[^-])---([^-]|$)/mg, '$1\u2014$2')
+                    // en-dash
+                    .replace(/(^|\s)--(\s|$)/mg, '$1\u2013$2')
+                    .replace(/(^|[^-\s])--([^-\s]|$)/mg, '$1\u2013$2');
+      }
+    }
+
+    if (token.type === 'link_open' && token.info === 'auto') {
+      inside_autolink--;
+    }
+
+    if (token.type === 'link_close' && token.info === 'auto') {
+      inside_autolink++;
+    }
+  }
+}
+
+
+module.exports = function replace(state) {
+  var blkIdx;
+
+  if (!state.md.options.typographer) { return; }
+
+  for (blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {
+
+    if (state.tokens[blkIdx].type !== 'inline') { continue; }
+
+    if (SCOPED_ABBR_TEST_RE.test(state.tokens[blkIdx].content)) {
+      replace_scoped(state.tokens[blkIdx].children);
+    }
+
+    if (RARE_RE.test(state.tokens[blkIdx].content)) {
+      replace_rare(state.tokens[blkIdx].children);
+    }
+
+  }
+};
+
+},{}],35:[function(require,module,exports){
+// Convert straight quotation marks to typographic ones
+//
+'use strict';
+
+
+var isWhiteSpace   = require('../common/utils').isWhiteSpace;
+var isPunctChar    = require('../common/utils').isPunctChar;
+var isMdAsciiPunct = require('../common/utils').isMdAsciiPunct;
+
+var QUOTE_TEST_RE = /['"]/;
+var QUOTE_RE = /['"]/g;
+var APOSTROPHE = '\u2019'; /* ’ */
+
+
+function replaceAt(str, index, ch) {
+  return str.substr(0, index) + ch + str.substr(index + 1);
+}
+
+function process_inlines(tokens, state) {
+  var i, token, text, t, pos, max, thisLevel, item, lastChar, nextChar,
+      isLastPunctChar, isNextPunctChar, isLastWhiteSpace, isNextWhiteSpace,
+      canOpen, canClose, j, isSingle, stack, openQuote, closeQuote;
+
+  stack = [];
+
+  for (i = 0; i < tokens.length; i++) {
+    token = tokens[i];
+
+    thisLevel = tokens[i].level;
+
+    for (j = stack.length - 1; j >= 0; j--) {
+      if (stack[j].level <= thisLevel) { break; }
+    }
+    stack.length = j + 1;
+
+    if (token.type !== 'text') { continue; }
+
+    text = token.content;
+    pos = 0;
+    max = text.length;
+
+    /*eslint no-labels:0,block-scoped-var:0*/
+    OUTER:
+    while (pos < max) {
+      QUOTE_RE.lastIndex = pos;
+      t = QUOTE_RE.exec(text);
+      if (!t) { break; }
+
+      canOpen = canClose = true;
+      pos = t.index + 1;
+      isSingle = (t[0] === "'");
+
+      // Find previous character,
+      // default to space if it's the beginning of the line
+      //
+      lastChar = 0x20;
+
+      if (t.index - 1 >= 0) {
+        lastChar = text.charCodeAt(t.index - 1);
+      } else {
+        for (j = i - 1; j >= 0; j--) {
+          if (tokens[j].type !== 'text') { continue; }
+
+          lastChar = tokens[j].content.charCodeAt(tokens[j].content.length - 1);
+          break;
+        }
+      }
+
+      // Find next character,
+      // default to space if it's the end of the line
+      //
+      nextChar = 0x20;
+
+      if (pos < max) {
+        nextChar = text.charCodeAt(pos);
+      } else {
+        for (j = i + 1; j < tokens.length; j++) {
+          if (tokens[j].type !== 'text') { continue; }
+
+          nextChar = tokens[j].content.charCodeAt(0);
+          break;
+        }
+      }
+
+      isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
+      isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
+
+      isLastWhiteSpace = isWhiteSpace(lastChar);
+      isNextWhiteSpace = isWhiteSpace(nextChar);
+
+      if (isNextWhiteSpace) {
+        canOpen = false;
+      } else if (isNextPunctChar) {
+        if (!(isLastWhiteSpace || isLastPunctChar)) {
+          canOpen = false;
+        }
+      }
+
+      if (isLastWhiteSpace) {
+        canClose = false;
+      } else if (isLastPunctChar) {
+        if (!(isNextWhiteSpace || isNextPunctChar)) {
+          canClose = false;
+        }
+      }
+
+      if (nextChar === 0x22 /* " */ && t[0] === '"') {
+        if (lastChar >= 0x30 /* 0 */ && lastChar <= 0x39 /* 9 */) {
+          // special case: 1"" - count first quote as an inch
+          canClose = canOpen = false;
+        }
+      }
+
+      if (canOpen && canClose) {
+        // treat this as the middle of the word
+        canOpen = false;
+        canClose = isNextPunctChar;
+      }
+
+      if (!canOpen && !canClose) {
+        // middle of word
+        if (isSingle) {
+          token.content = replaceAt(token.content, t.index, APOSTROPHE);
+        }
+        continue;
+      }
+
+      if (canClose) {
+        // this could be a closing quote, rewind the stack to get a match
+        for (j = stack.length - 1; j >= 0; j--) {
+          item = stack[j];
+          if (stack[j].level < thisLevel) { break; }
+          if (item.single === isSingle && stack[j].level === thisLevel) {
+            item = stack[j];
+
+            if (isSingle) {
+              openQuote = state.md.options.quotes[2];
+              closeQuote = state.md.options.quotes[3];
+            } else {
+              openQuote = state.md.options.quotes[0];
+              closeQuote = state.md.options.quotes[1];
+            }
+
+            // replace token.content *before* tokens[item.token].content,
+            // because, if they are pointing at the same token, replaceAt
+            // could mess up indices when quote length != 1
+            token.content = replaceAt(token.content, t.index, closeQuote);
+            tokens[item.token].content = replaceAt(
+              tokens[item.token].content, item.pos, openQuote);
+
+            pos += closeQuote.length - 1;
+            if (item.token === i) { pos += openQuote.length - 1; }
+
+            text = token.content;
+            max = text.length;
+
+            stack.length = j;
+            continue OUTER;
+          }
+        }
+      }
+
+      if (canOpen) {
+        stack.push({
+          token: i,
+          pos: t.index,
+          single: isSingle,
+          level: thisLevel
+        });
+      } else if (canClose && isSingle) {
+        token.content = replaceAt(token.content, t.index, APOSTROPHE);
+      }
+    }
+  }
+}
+
+
+module.exports = function smartquotes(state) {
+  /*eslint max-depth:0*/
+  var blkIdx;
+
+  if (!state.md.options.typographer) { return; }
+
+  for (blkIdx = state.tokens.length - 1; blkIdx >= 0; blkIdx--) {
+
+    if (state.tokens[blkIdx].type !== 'inline' ||
+        !QUOTE_TEST_RE.test(state.tokens[blkIdx].content)) {
+      continue;
+    }
+
+    process_inlines(state.tokens[blkIdx].children, state);
+  }
+};
+
+},{"../common/utils":4}],36:[function(require,module,exports){
+// Core state object
+//
+'use strict';
+
+var Token = require('../token');
+
+
+function StateCore(src, md, env) {
+  this.src = src;
+  this.env = env;
+  this.tokens = [];
+  this.inlineMode = false;
+  this.md = md; // link to parser instance
+}
+
+// re-export Token class to use in core rules
+StateCore.prototype.Token = Token;
+
+
+module.exports = StateCore;
+
+},{"../token":51}],37:[function(require,module,exports){
+// Process autolinks '<protocol:...>'
+
+'use strict';
+
+
+/*eslint max-len:0*/
+var EMAIL_RE    = /^<([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)>/;
+var AUTOLINK_RE = /^<([a-zA-Z][a-zA-Z0-9+.\-]{1,31}):([^<>\x00-\x20]*)>/;
+
+
+module.exports = function autolink(state, silent) {
+  var tail, linkMatch, emailMatch, url, fullUrl, token,
+      pos = state.pos;
+
+  if (state.src.charCodeAt(pos) !== 0x3C/* < */) { return false; }
+
+  tail = state.src.slice(pos);
+
+  if (tail.indexOf('>') < 0) { return false; }
+
+  if (AUTOLINK_RE.test(tail)) {
+    linkMatch = tail.match(AUTOLINK_RE);
+
+    url = linkMatch[0].slice(1, -1);
+    fullUrl = state.md.normalizeLink(url);
+    if (!state.md.validateLink(fullUrl)) { return false; }
+
+    if (!silent) {
+      token         = state.push('link_open', 'a', 1);
+      token.attrs   = [ [ 'href', fullUrl ] ];
+      token.markup  = 'autolink';
+      token.info    = 'auto';
+
+      token         = state.push('text', '', 0);
+      token.content = state.md.normalizeLinkText(url);
+
+      token         = state.push('link_close', 'a', -1);
+      token.markup  = 'autolink';
+      token.info    = 'auto';
+    }
+
+    state.pos += linkMatch[0].length;
+    return true;
+  }
+
+  if (EMAIL_RE.test(tail)) {
+    emailMatch = tail.match(EMAIL_RE);
+
+    url = emailMatch[0].slice(1, -1);
+    fullUrl = state.md.normalizeLink('mailto:' + url);
+    if (!state.md.validateLink(fullUrl)) { return false; }
+
+    if (!silent) {
+      token         = state.push('link_open', 'a', 1);
+      token.attrs   = [ [ 'href', fullUrl ] ];
+      token.markup  = 'autolink';
+      token.info    = 'auto';
+
+      token         = state.push('text', '', 0);
+      token.content = state.md.normalizeLinkText(url);
+
+      token         = state.push('link_close', 'a', -1);
+      token.markup  = 'autolink';
+      token.info    = 'auto';
+    }
+
+    state.pos += emailMatch[0].length;
+    return true;
+  }
+
+  return false;
+};
+
+},{}],38:[function(require,module,exports){
+// Parse backticks
+
+'use strict';
+
+module.exports = function backtick(state, silent) {
+  var start, max, marker, matchStart, matchEnd, token,
+      pos = state.pos,
+      ch = state.src.charCodeAt(pos);
+
+  if (ch !== 0x60/* ` */) { return false; }
+
+  start = pos;
+  pos++;
+  max = state.posMax;
+
+  while (pos < max && state.src.charCodeAt(pos) === 0x60/* ` */) { pos++; }
+
+  marker = state.src.slice(start, pos);
+
+  matchStart = matchEnd = pos;
+
+  while ((matchStart = state.src.indexOf('`', matchEnd)) !== -1) {
+    matchEnd = matchStart + 1;
+
+    while (matchEnd < max && state.src.charCodeAt(matchEnd) === 0x60/* ` */) { matchEnd++; }
+
+    if (matchEnd - matchStart === marker.length) {
+      if (!silent) {
+        token         = state.push('code_inline', 'code', 0);
+        token.markup  = marker;
+        token.content = state.src.slice(pos, matchStart)
+                                 .replace(/[ \n]+/g, ' ')
+                                 .trim();
+      }
+      state.pos = matchEnd;
+      return true;
+    }
+  }
+
+  if (!silent) { state.pending += marker; }
+  state.pos += marker.length;
+  return true;
+};
+
+},{}],39:[function(require,module,exports){
+// For each opening emphasis-like marker find a matching closing one
+//
+'use strict';
+
+
+module.exports = function link_pairs(state) {
+  var i, j, lastDelim, currDelim,
+      delimiters = state.delimiters,
+      max = state.delimiters.length;
+
+  for (i = 0; i < max; i++) {
+    lastDelim = delimiters[i];
+
+    if (!lastDelim.close) { continue; }
+
+    j = i - lastDelim.jump - 1;
+
+    while (j >= 0) {
+      currDelim = delimiters[j];
+
+      if (currDelim.open &&
+          currDelim.marker === lastDelim.marker &&
+          currDelim.end < 0 &&
+          currDelim.level === lastDelim.level) {
+
+        // typeofs are for backward compatibility with plugins
+        var odd_match = (currDelim.close || lastDelim.open) &&
+                        typeof currDelim.length !== 'undefined' &&
+                        typeof lastDelim.length !== 'undefined' &&
+                        (currDelim.length + lastDelim.length) % 3 === 0;
+
+        if (!odd_match) {
+          lastDelim.jump = i - j;
+          lastDelim.open = false;
+          currDelim.end  = i;
+          currDelim.jump = 0;
+          break;
+        }
+      }
+
+      j -= currDelim.jump + 1;
+    }
+  }
+};
+
+},{}],40:[function(require,module,exports){
+// Process *this* and _that_
+//
+'use strict';
+
+
+// Insert each marker as a separate text token, and add it to delimiter list
+//
+module.exports.tokenize = function emphasis(state, silent) {
+  var i, scanned, token,
+      start = state.pos,
+      marker = state.src.charCodeAt(start);
+
+  if (silent) { return false; }
+
+  if (marker !== 0x5F /* _ */ && marker !== 0x2A /* * */) { return false; }
+
+  scanned = state.scanDelims(state.pos, marker === 0x2A);
+
+  for (i = 0; i < scanned.length; i++) {
+    token         = state.push('text', '', 0);
+    token.content = String.fromCharCode(marker);
+
+    state.delimiters.push({
+      // Char code of the starting marker (number).
+      //
+      marker: marker,
+
+      // Total length of these series of delimiters.
+      //
+      length: scanned.length,
+
+      // An amount of characters before this one that's equivalent to
+      // current one. In plain English: if this delimiter does not open
+      // an emphasis, neither do previous `jump` characters.
+      //
+      // Used to skip sequences like "*****" in one step, for 1st asterisk
+      // value will be 0, for 2nd it's 1 and so on.
+      //
+      jump:   i,
+
+      // A position of the token this delimiter corresponds to.
+      //
+      token:  state.tokens.length - 1,
+
+      // Token level.
+      //
+      level:  state.level,
+
+      // If this delimiter is matched as a valid opener, `end` will be
+      // equal to its position, otherwise it's `-1`.
+      //
+      end:    -1,
+
+      // Boolean flags that determine if this delimiter could open or close
+      // an emphasis.
+      //
+      open:   scanned.can_open,
+      close:  scanned.can_close
+    });
+  }
+
+  state.pos += scanned.length;
+
+  return true;
+};
+
+
+// Walk through delimiter list and replace text tokens with tags
+//
+module.exports.postProcess = function emphasis(state) {
+  var i,
+      startDelim,
+      endDelim,
+      token,
+      ch,
+      isStrong,
+      delimiters = state.delimiters,
+      max = state.delimiters.length;
+
+  for (i = 0; i < max; i++) {
+    startDelim = delimiters[i];
+
+    if (startDelim.marker !== 0x5F/* _ */ && startDelim.marker !== 0x2A/* * */) {
+      continue;
+    }
+
+    // Process only opening markers
+    if (startDelim.end === -1) {
+      continue;
+    }
+
+    endDelim = delimiters[startDelim.end];
+
+    // If the next delimiter has the same marker and is adjacent to this one,
+    // merge those into one strong delimiter.
+    //
+    // `<em><em>whatever</em></em>` -> `<strong>whatever</strong>`
+    //
+    isStrong = i + 1 < max &&
+               delimiters[i + 1].end === startDelim.end - 1 &&
+               delimiters[i + 1].token === startDelim.token + 1 &&
+               delimiters[startDelim.end - 1].token === endDelim.token - 1 &&
+               delimiters[i + 1].marker === startDelim.marker;
+
+    ch = String.fromCharCode(startDelim.marker);
+
+    token         = state.tokens[startDelim.token];
+    token.type    = isStrong ? 'strong_open' : 'em_open';
+    token.tag     = isStrong ? 'strong' : 'em';
+    token.nesting = 1;
+    token.markup  = isStrong ? ch + ch : ch;
+    token.content = '';
+
+    token         = state.tokens[endDelim.token];
+    token.type    = isStrong ? 'strong_close' : 'em_close';
+    token.tag     = isStrong ? 'strong' : 'em';
+    token.nesting = -1;
+    token.markup  = isStrong ? ch + ch : ch;
+    token.content = '';
+
+    if (isStrong) {
+      state.tokens[delimiters[i + 1].token].content = '';
+      state.tokens[delimiters[startDelim.end - 1].token].content = '';
+      i++;
+    }
+  }
+};
+
+},{}],41:[function(require,module,exports){
+// Process html entity - &#123;, &#xAF;, &quot;, ...
+
+'use strict';
+
+var entities          = require('../common/entities');
+var has               = require('../common/utils').has;
+var isValidEntityCode = require('../common/utils').isValidEntityCode;
+var fromCodePoint     = require('../common/utils').fromCodePoint;
+
+
+var DIGITAL_RE = /^&#((?:x[a-f0-9]{1,8}|[0-9]{1,8}));/i;
+var NAMED_RE   = /^&([a-z][a-z0-9]{1,31});/i;
+
+
+module.exports = function entity(state, silent) {
+  var ch, code, match, pos = state.pos, max = state.posMax;
+
+  if (state.src.charCodeAt(pos) !== 0x26/* & */) { return false; }
+
+  if (pos + 1 < max) {
+    ch = state.src.charCodeAt(pos + 1);
+
+    if (ch === 0x23 /* # */) {
+      match = state.src.slice(pos).match(DIGITAL_RE);
+      if (match) {
+        if (!silent) {
+          code = match[1][0].toLowerCase() === 'x' ? parseInt(match[1].slice(1), 16) : parseInt(match[1], 10);
+          state.pending += isValidEntityCode(code) ? fromCodePoint(code) : fromCodePoint(0xFFFD);
+        }
+        state.pos += match[0].length;
+        return true;
+      }
+    } else {
+      match = state.src.slice(pos).match(NAMED_RE);
+      if (match) {
+        if (has(entities, match[1])) {
+          if (!silent) { state.pending += entities[match[1]]; }
+          state.pos += match[0].length;
+          return true;
+        }
+      }
+    }
+  }
+
+  if (!silent) { state.pending += '&'; }
+  state.pos++;
+  return true;
+};
+
+},{"../common/entities":1,"../common/utils":4}],42:[function(require,module,exports){
+// Proceess escaped chars and hardbreaks
+
+'use strict';
+
+var isSpace = require('../common/utils').isSpace;
+
+var ESCAPED = [];
+
+for (var i = 0; i < 256; i++) { ESCAPED.push(0); }
+
+'\\!"#$%&\'()*+,./:;<=>?@[]^_`{|}~-'
+  .split('').forEach(function (ch) { ESCAPED[ch.charCodeAt(0)] = 1; });
+
+
+module.exports = function escape(state, silent) {
+  var ch, pos = state.pos, max = state.posMax;
+
+  if (state.src.charCodeAt(pos) !== 0x5C/* \ */) { return false; }
+
+  pos++;
+
+  if (pos < max) {
+    ch = state.src.charCodeAt(pos);
+
+    if (ch < 256 && ESCAPED[ch] !== 0) {
+      if (!silent) { state.pending += state.src[pos]; }
+      state.pos += 2;
+      return true;
+    }
+
+    if (ch === 0x0A) {
+      if (!silent) {
+        state.push('hardbreak', 'br', 0);
+      }
+
+      pos++;
+      // skip leading whitespaces from next line
+      while (pos < max) {
+        ch = state.src.charCodeAt(pos);
+        if (!isSpace(ch)) { break; }
+        pos++;
+      }
+
+      state.pos = pos;
+      return true;
+    }
+  }
+
+  if (!silent) { state.pending += '\\'; }
+  state.pos++;
+  return true;
+};
+
+},{"../common/utils":4}],43:[function(require,module,exports){
+// Process html tags
+
+'use strict';
+
+
+var HTML_TAG_RE = require('../common/html_re').HTML_TAG_RE;
+
+
+function isLetter(ch) {
+  /*eslint no-bitwise:0*/
+  var lc = ch | 0x20; // to lower case
+  return (lc >= 0x61/* a */) && (lc <= 0x7a/* z */);
+}
+
+
+module.exports = function html_inline(state, silent) {
+  var ch, match, max, token,
+      pos = state.pos;
+
+  if (!state.md.options.html) { return false; }
+
+  // Check start
+  max = state.posMax;
+  if (state.src.charCodeAt(pos) !== 0x3C/* < */ ||
+      pos + 2 >= max) {
+    return false;
+  }
+
+  // Quick fail on second char
+  ch = state.src.charCodeAt(pos + 1);
+  if (ch !== 0x21/* ! */ &&
+      ch !== 0x3F/* ? */ &&
+      ch !== 0x2F/* / */ &&
+      !isLetter(ch)) {
+    return false;
+  }
+
+  match = state.src.slice(pos).match(HTML_TAG_RE);
+  if (!match) { return false; }
+
+  if (!silent) {
+    token         = state.push('html_inline', '', 0);
+    token.content = state.src.slice(pos, pos + match[0].length);
+  }
+  state.pos += match[0].length;
+  return true;
+};
+
+},{"../common/html_re":3}],44:[function(require,module,exports){
+// Process ![image](<src> "title")
+
+'use strict';
+
+var normalizeReference   = require('../common/utils').normalizeReference;
+var isSpace              = require('../common/utils').isSpace;
+
+
+module.exports = function image(state, silent) {
+  var attrs,
+      code,
+      content,
+      label,
+      labelEnd,
+      labelStart,
+      pos,
+      ref,
+      res,
+      title,
+      token,
+      tokens,
+      start,
+      href = '',
+      oldPos = state.pos,
+      max = state.posMax;
+
+  if (state.src.charCodeAt(state.pos) !== 0x21/* ! */) { return false; }
+  if (state.src.charCodeAt(state.pos + 1) !== 0x5B/* [ */) { return false; }
+
+  labelStart = state.pos + 2;
+  labelEnd = state.md.helpers.parseLinkLabel(state, state.pos + 1, false);
+
+  // parser failed to find ']', so it's not a valid link
+  if (labelEnd < 0) { return false; }
+
+  pos = labelEnd + 1;
+  if (pos < max && state.src.charCodeAt(pos) === 0x28/* ( */) {
+    //
+    // Inline link
+    //
+
+    // [link](  <href>  "title"  )
+    //        ^^ skipping these spaces
+    pos++;
+    for (; pos < max; pos++) {
+      code = state.src.charCodeAt(pos);
+      if (!isSpace(code) && code !== 0x0A) { break; }
+    }
+    if (pos >= max) { return false; }
+
+    // [link](  <href>  "title"  )
+    //          ^^^^^^ parsing link destination
+    start = pos;
+    res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);
+    if (res.ok) {
+      href = state.md.normalizeLink(res.str);
+      if (state.md.validateLink(href)) {
+        pos = res.pos;
+      } else {
+        href = '';
+      }
+    }
+
+    // [link](  <href>  "title"  )
+    //                ^^ skipping these spaces
+    start = pos;
+    for (; pos < max; pos++) {
+      code = state.src.charCodeAt(pos);
+      if (!isSpace(code) && code !== 0x0A) { break; }
+    }
+
+    // [link](  <href>  "title"  )
+    //                  ^^^^^^^ parsing link title
+    res = state.md.helpers.parseLinkTitle(state.src, pos, state.posMax);
+    if (pos < max && start !== pos && res.ok) {
+      title = res.str;
+      pos = res.pos;
+
+      // [link](  <href>  "title"  )
+      //                         ^^ skipping these spaces
+      for (; pos < max; pos++) {
+        code = state.src.charCodeAt(pos);
+        if (!isSpace(code) && code !== 0x0A) { break; }
+      }
+    } else {
+      title = '';
+    }
+
+    if (pos >= max || state.src.charCodeAt(pos) !== 0x29/* ) */) {
+      state.pos = oldPos;
+      return false;
+    }
+    pos++;
+  } else {
+    //
+    // Link reference
+    //
+    if (typeof state.env.references === 'undefined') { return false; }
+
+    if (pos < max && state.src.charCodeAt(pos) === 0x5B/* [ */) {
+      start = pos + 1;
+      pos = state.md.helpers.parseLinkLabel(state, pos);
+      if (pos >= 0) {
+        label = state.src.slice(start, pos++);
+      } else {
+        pos = labelEnd + 1;
+      }
+    } else {
+      pos = labelEnd + 1;
+    }
+
+    // covers label === '' and label === undefined
+    // (collapsed reference link and shortcut reference link respectively)
+    if (!label) { label = state.src.slice(labelStart, labelEnd); }
+
+    ref = state.env.references[normalizeReference(label)];
+    if (!ref) {
+      state.pos = oldPos;
+      return false;
+    }
+    href = ref.href;
+    title = ref.title;
+  }
+
+  //
+  // We found the end of the link, and know for a fact it's a valid link;
+  // so all that's left to do is to call tokenizer.
+  //
+  if (!silent) {
+    content = state.src.slice(labelStart, labelEnd);
+
+    state.md.inline.parse(
+      content,
+      state.md,
+      state.env,
+      tokens = []
+    );
+
+    token          = state.push('image', 'img', 0);
+    token.attrs    = attrs = [ [ 'src', href ], [ 'alt', '' ] ];
+    token.children = tokens;
+    token.content  = content;
+
+    if (title) {
+      attrs.push([ 'title', title ]);
+    }
+  }
+
+  state.pos = pos;
+  state.posMax = max;
+  return true;
+};
+
+},{"../common/utils":4}],45:[function(require,module,exports){
+// Process [link](<to> "stuff")
+
+'use strict';
+
+var normalizeReference   = require('../common/utils').normalizeReference;
+var isSpace              = require('../common/utils').isSpace;
+
+
+module.exports = function link(state, silent) {
+  var attrs,
+      code,
+      label,
+      labelEnd,
+      labelStart,
+      pos,
+      res,
+      ref,
+      title,
+      token,
+      href = '',
+      oldPos = state.pos,
+      max = state.posMax,
+      start = state.pos,
+      parseReference = true;
+
+  if (state.src.charCodeAt(state.pos) !== 0x5B/* [ */) { return false; }
+
+  labelStart = state.pos + 1;
+  labelEnd = state.md.helpers.parseLinkLabel(state, state.pos, true);
+
+  // parser failed to find ']', so it's not a valid link
+  if (labelEnd < 0) { return false; }
+
+  pos = labelEnd + 1;
+  if (pos < max && state.src.charCodeAt(pos) === 0x28/* ( */) {
+    //
+    // Inline link
+    //
+
+    // might have found a valid shortcut link, disable reference parsing
+    parseReference = false;
+
+    // [link](  <href>  "title"  )
+    //        ^^ skipping these spaces
+    pos++;
+    for (; pos < max; pos++) {
+      code = state.src.charCodeAt(pos);
+      if (!isSpace(code) && code !== 0x0A) { break; }
+    }
+    if (pos >= max) { return false; }
+
+    // [link](  <href>  "title"  )
+    //          ^^^^^^ parsing link destination
+    start = pos;
+    res = state.md.helpers.parseLinkDestination(state.src, pos, state.posMax);
+    if (res.ok) {
+      href = state.md.normalizeLink(res.str);
+      if (state.md.validateLink(href)) {
+        pos = res.pos;
+      } else {
+        href = '';
+      }
+    }
+
+    // [link](  <href>  "title"  )
+    //                ^^ skipping these spaces
+    start = pos;
+    for (; pos < max; pos++) {
+      code = state.src.charCodeAt(pos);
+      if (!isSpace(code) && code !== 0x0A) { break; }
+    }
+
+    // [link](  <href>  "title"  )
+    //                  ^^^^^^^ parsing link title
+    res = state.md.helpers.parseLinkTitle(state.src, pos, state.posMax);
+    if (pos < max && start !== pos && res.ok) {
+      title = res.str;
+      pos = res.pos;
+
+      // [link](  <href>  "title"  )
+      //                         ^^ skipping these spaces
+      for (; pos < max; pos++) {
+        code = state.src.charCodeAt(pos);
+        if (!isSpace(code) && code !== 0x0A) { break; }
+      }
+    } else {
+      title = '';
+    }
+
+    if (pos >= max || state.src.charCodeAt(pos) !== 0x29/* ) */) {
+      // parsing a valid shortcut link failed, fallback to reference
+      parseReference = true;
+    }
+    pos++;
+  }
+
+  if (parseReference) {
+    //
+    // Link reference
+    //
+    if (typeof state.env.references === 'undefined') { return false; }
+
+    if (pos < max && state.src.charCodeAt(pos) === 0x5B/* [ */) {
+      start = pos + 1;
+      pos = state.md.helpers.parseLinkLabel(state, pos);
+      if (pos >= 0) {
+        label = state.src.slice(start, pos++);
+      } else {
+        pos = labelEnd + 1;
+      }
+    } else {
+      pos = labelEnd + 1;
+    }
+
+    // covers label === '' and label === undefined
+    // (collapsed reference link and shortcut reference link respectively)
+    if (!label) { label = state.src.slice(labelStart, labelEnd); }
+
+    ref = state.env.references[normalizeReference(label)];
+    if (!ref) {
+      state.pos = oldPos;
+      return false;
+    }
+    href = ref.href;
+    title = ref.title;
+  }
+
+  //
+  // We found the end of the link, and know for a fact it's a valid link;
+  // so all that's left to do is to call tokenizer.
+  //
+  if (!silent) {
+    state.pos = labelStart;
+    state.posMax = labelEnd;
+
+    token        = state.push('link_open', 'a', 1);
+    token.attrs  = attrs = [ [ 'href', href ] ];
+    if (title) {
+      attrs.push([ 'title', title ]);
+    }
+
+    state.md.inline.tokenize(state);
+
+    token        = state.push('link_close', 'a', -1);
+  }
+
+  state.pos = pos;
+  state.posMax = max;
+  return true;
+};
+
+},{"../common/utils":4}],46:[function(require,module,exports){
+// Proceess '\n'
+
+'use strict';
+
+var isSpace = require('../common/utils').isSpace;
+
+
+module.exports = function newline(state, silent) {
+  var pmax, max, pos = state.pos;
+
+  if (state.src.charCodeAt(pos) !== 0x0A/* \n */) { return false; }
+
+  pmax = state.pending.length - 1;
+  max = state.posMax;
+
+  // '  \n' -> hardbreak
+  // Lookup in pending chars is bad practice! Don't copy to other rules!
+  // Pending string is stored in concat mode, indexed lookups will cause
+  // convertion to flat mode.
+  if (!silent) {
+    if (pmax >= 0 && state.pending.charCodeAt(pmax) === 0x20) {
+      if (pmax >= 1 && state.pending.charCodeAt(pmax - 1) === 0x20) {
+        state.pending = state.pending.replace(/ +$/, '');
+        state.push('hardbreak', 'br', 0);
+      } else {
+        state.pending = state.pending.slice(0, -1);
+        state.push('softbreak', 'br', 0);
+      }
+
+    } else {
+      state.push('softbreak', 'br', 0);
+    }
+  }
+
+  pos++;
+
+  // skip heading spaces for next line
+  while (pos < max && isSpace(state.src.charCodeAt(pos))) { pos++; }
+
+  state.pos = pos;
+  return true;
+};
+
+},{"../common/utils":4}],47:[function(require,module,exports){
+// Inline parser state
+
+'use strict';
+
+
+var Token          = require('../token');
+var isWhiteSpace   = require('../common/utils').isWhiteSpace;
+var isPunctChar    = require('../common/utils').isPunctChar;
+var isMdAsciiPunct = require('../common/utils').isMdAsciiPunct;
+
+
+function StateInline(src, md, env, outTokens) {
+  this.src = src;
+  this.env = env;
+  this.md = md;
+  this.tokens = outTokens;
+
+  this.pos = 0;
+  this.posMax = this.src.length;
+  this.level = 0;
+  this.pending = '';
+  this.pendingLevel = 0;
+
+  this.cache = {};        // Stores { start: end } pairs. Useful for backtrack
+                          // optimization of pairs parse (emphasis, strikes).
+
+  this.delimiters = [];   // Emphasis-like delimiters
+}
+
+
+// Flush pending text
+//
+StateInline.prototype.pushPending = function () {
+  var token = new Token('text', '', 0);
+  token.content = this.pending;
+  token.level = this.pendingLevel;
+  this.tokens.push(token);
+  this.pending = '';
+  return token;
+};
+
+
+// Push new token to "stream".
+// If pending text exists - flush it as text token
+//
+StateInline.prototype.push = function (type, tag, nesting) {
+  if (this.pending) {
+    this.pushPending();
+  }
+
+  var token = new Token(type, tag, nesting);
+
+  if (nesting < 0) { this.level--; }
+  token.level = this.level;
+  if (nesting > 0) { this.level++; }
+
+  this.pendingLevel = this.level;
+  this.tokens.push(token);
+  return token;
+};
+
+
+// Scan a sequence of emphasis-like markers, and determine whether
+// it can start an emphasis sequence or end an emphasis sequence.
+//
+//  - start - position to scan from (it should point at a valid marker);
+//  - canSplitWord - determine if these markers can be found inside a word
+//
+StateInline.prototype.scanDelims = function (start, canSplitWord) {
+  var pos = start, lastChar, nextChar, count, can_open, can_close,
+      isLastWhiteSpace, isLastPunctChar,
+      isNextWhiteSpace, isNextPunctChar,
+      left_flanking = true,
+      right_flanking = true,
+      max = this.posMax,
+      marker = this.src.charCodeAt(start);
+
+  // treat beginning of the line as a whitespace
+  lastChar = start > 0 ? this.src.charCodeAt(start - 1) : 0x20;
+
+  while (pos < max && this.src.charCodeAt(pos) === marker) { pos++; }
+
+  count = pos - start;
+
+  // treat end of the line as a whitespace
+  nextChar = pos < max ? this.src.charCodeAt(pos) : 0x20;
+
+  isLastPunctChar = isMdAsciiPunct(lastChar) || isPunctChar(String.fromCharCode(lastChar));
+  isNextPunctChar = isMdAsciiPunct(nextChar) || isPunctChar(String.fromCharCode(nextChar));
+
+  isLastWhiteSpace = isWhiteSpace(lastChar);
+  isNextWhiteSpace = isWhiteSpace(nextChar);
+
+  if (isNextWhiteSpace) {
+    left_flanking = false;
+  } else if (isNextPunctChar) {
+    if (!(isLastWhiteSpace || isLastPunctChar)) {
+      left_flanking = false;
+    }
+  }
+
+  if (isLastWhiteSpace) {
+    right_flanking = false;
+  } else if (isLastPunctChar) {
+    if (!(isNextWhiteSpace || isNextPunctChar)) {
+      right_flanking = false;
+    }
+  }
+
+  if (!canSplitWord) {
+    can_open  = left_flanking  && (!right_flanking || isLastPunctChar);
+    can_close = right_flanking && (!left_flanking  || isNextPunctChar);
+  } else {
+    can_open  = left_flanking;
+    can_close = right_flanking;
+  }
+
+  return {
+    can_open:  can_open,
+    can_close: can_close,
+    length:    count
+  };
+};
+
+
+// re-export Token class to use in block rules
+StateInline.prototype.Token = Token;
+
+
+module.exports = StateInline;
+
+},{"../common/utils":4,"../token":51}],48:[function(require,module,exports){
+// ~~strike through~~
+//
+'use strict';
+
+
+// Insert each marker as a separate text token, and add it to delimiter list
+//
+module.exports.tokenize = function strikethrough(state, silent) {
+  var i, scanned, token, len, ch,
+      start = state.pos,
+      marker = state.src.charCodeAt(start);
+
+  if (silent) { return false; }
+
+  if (marker !== 0x7E/* ~ */) { return false; }
+
+  scanned = state.scanDelims(state.pos, true);
+  len = scanned.length;
+  ch = String.fromCharCode(marker);
+
+  if (len < 2) { return false; }
+
+  if (len % 2) {
+    token         = state.push('text', '', 0);
+    token.content = ch;
+    len--;
+  }
+
+  for (i = 0; i < len; i += 2) {
+    token         = state.push('text', '', 0);
+    token.content = ch + ch;
+
+    state.delimiters.push({
+      marker: marker,
+      jump:   i,
+      token:  state.tokens.length - 1,
+      level:  state.level,
+      end:    -1,
+      open:   scanned.can_open,
+      close:  scanned.can_close
+    });
+  }
+
+  state.pos += scanned.length;
+
+  return true;
+};
+
+
+// Walk through delimiter list and replace text tokens with tags
+//
+module.exports.postProcess = function strikethrough(state) {
+  var i, j,
+      startDelim,
+      endDelim,
+      token,
+      loneMarkers = [],
+      delimiters = state.delimiters,
+      max = state.delimiters.length;
+
+  for (i = 0; i < max; i++) {
+    startDelim = delimiters[i];
+
+    if (startDelim.marker !== 0x7E/* ~ */) {
+      continue;
+    }
+
+    if (startDelim.end === -1) {
+      continue;
+    }
+
+    endDelim = delimiters[startDelim.end];
+
+    token         = state.tokens[startDelim.token];
+    token.type    = 's_open';
+    token.tag     = 's';
+    token.nesting = 1;
+    token.markup  = '~~';
+    token.content = '';
+
+    token         = state.tokens[endDelim.token];
+    token.type    = 's_close';
+    token.tag     = 's';
+    token.nesting = -1;
+    token.markup  = '~~';
+    token.content = '';
+
+    if (state.tokens[endDelim.token - 1].type === 'text' &&
+        state.tokens[endDelim.token - 1].content === '~') {
+
+      loneMarkers.push(endDelim.token - 1);
+    }
+  }
+
+  // If a marker sequence has an odd number of characters, it's splitted
+  // like this: `~~~~~` -> `~` + `~~` + `~~`, leaving one marker at the
+  // start of the sequence.
+  //
+  // So, we have to move all those markers after subsequent s_close tags.
+  //
+  while (loneMarkers.length) {
+    i = loneMarkers.pop();
+    j = i + 1;
+
+    while (j < state.tokens.length && state.tokens[j].type === 's_close') {
+      j++;
+    }
+
+    j--;
+
+    if (i !== j) {
+      token = state.tokens[j];
+      state.tokens[j] = state.tokens[i];
+      state.tokens[i] = token;
+    }
+  }
+};
+
+},{}],49:[function(require,module,exports){
+// Skip text characters for text token, place those to pending buffer
+// and increment current pos
+
+'use strict';
+
+
+// Rule to skip pure text
+// '{}$%@~+=:' reserved for extentions
+
+// !, ", #, $, %, &, ', (, ), *, +, ,, -, ., /, :, ;, <, =, >, ?, @, [, \, ], ^, _, `, {, |, }, or ~
+
+// !!!! Don't confuse with "Markdown ASCII Punctuation" chars
+// http://spec.commonmark.org/0.15/#ascii-punctuation-character
+function isTerminatorChar(ch) {
+  switch (ch) {
+    case 0x0A/* \n */:
+    case 0x21/* ! */:
+    case 0x23/* # */:
+    case 0x24/* $ */:
+    case 0x25/* % */:
+    case 0x26/* & */:
+    case 0x2A/* * */:
+    case 0x2B/* + */:
+    case 0x2D/* - */:
+    case 0x3A/* : */:
+    case 0x3C/* < */:
+    case 0x3D/* = */:
+    case 0x3E/* > */:
+    case 0x40/* @ */:
+    case 0x5B/* [ */:
+    case 0x5C/* \ */:
+    case 0x5D/* ] */:
+    case 0x5E/* ^ */:
+    case 0x5F/* _ */:
+    case 0x60/* ` */:
+    case 0x7B/* { */:
+    case 0x7D/* } */:
+    case 0x7E/* ~ */:
+      return true;
+    default:
+      return false;
+  }
+}
+
+module.exports = function text(state, silent) {
+  var pos = state.pos;
+
+  while (pos < state.posMax && !isTerminatorChar(state.src.charCodeAt(pos))) {
+    pos++;
+  }
+
+  if (pos === state.pos) { return false; }
+
+  if (!silent) { state.pending += state.src.slice(state.pos, pos); }
+
+  state.pos = pos;
+
+  return true;
+};
+
+// Alternative implementation, for memory.
+//
+// It costs 10% of performance, but allows extend terminators list, if place it
+// to `ParcerInline` property. Probably, will switch to it sometime, such
+// flexibility required.
+
+/*
+var TERMINATOR_RE = /[\n!#$%&*+\-:<=>@[\\\]^_`{}~]/;
+
+module.exports = function text(state, silent) {
+  var pos = state.pos,
+      idx = state.src.slice(pos).search(TERMINATOR_RE);
+
+  // first char is terminator -> empty text
+  if (idx === 0) { return false; }
+
+  // no terminator -> text till end of string
+  if (idx < 0) {
+    if (!silent) { state.pending += state.src.slice(pos); }
+    state.pos = state.src.length;
+    return true;
+  }
+
+  if (!silent) { state.pending += state.src.slice(pos, pos + idx); }
+
+  state.pos += idx;
+
+  return true;
+};*/
+
+},{}],50:[function(require,module,exports){
+// Merge adjacent text nodes into one, and re-calculate all token levels
+//
+'use strict';
+
+
+module.exports = function text_collapse(state) {
+  var curr, last,
+      level = 0,
+      tokens = state.tokens,
+      max = state.tokens.length;
+
+  for (curr = last = 0; curr < max; curr++) {
+    // re-calculate levels
+    level += tokens[curr].nesting;
+    tokens[curr].level = level;
+
+    if (tokens[curr].type === 'text' &&
+        curr + 1 < max &&
+        tokens[curr + 1].type === 'text') {
+
+      // collapse two adjacent text nodes
+      tokens[curr + 1].content = tokens[curr].content + tokens[curr + 1].content;
+    } else {
+      if (curr !== last) { tokens[last] = tokens[curr]; }
+
+      last++;
+    }
+  }
+
+  if (curr !== last) {
+    tokens.length = last;
+  }
+};
+
+},{}],51:[function(require,module,exports){
+// Token class
+
+'use strict';
+
+
+/**
+ * class Token
+ **/
+
+/**
+ * new Token(type, tag, nesting)
+ *
+ * Create new token and fill passed properties.
+ **/
+function Token(type, tag, nesting) {
+  /**
+   * Token#type -> String
+   *
+   * Type of the token (string, e.g. "paragraph_open")
+   **/
+  this.type     = type;
+
+  /**
+   * Token#tag -> String
+   *
+   * html tag name, e.g. "p"
+   **/
+  this.tag      = tag;
+
+  /**
+   * Token#attrs -> Array
+   *
+   * Html attributes. Format: `[ [ name1, value1 ], [ name2, value2 ] ]`
+   **/
+  this.attrs    = null;
+
+  /**
+   * Token#map -> Array
+   *
+   * Source map info. Format: `[ line_begin, line_end ]`
+   **/
+  this.map      = null;
+
+  /**
+   * Token#nesting -> Number
+   *
+   * Level change (number in {-1, 0, 1} set), where:
+   *
+   * -  `1` means the tag is opening
+   * -  `0` means the tag is self-closing
+   * - `-1` means the tag is closing
+   **/
+  this.nesting  = nesting;
+
+  /**
+   * Token#level -> Number
+   *
+   * nesting level, the same as `state.level`
+   **/
+  this.level    = 0;
+
+  /**
+   * Token#children -> Array
+   *
+   * An array of child nodes (inline and img tokens)
+   **/
+  this.children = null;
+
+  /**
+   * Token#content -> String
+   *
+   * In a case of self-closing tag (code, html, fence, etc.),
+   * it has contents of this tag.
+   **/
+  this.content  = '';
+
+  /**
+   * Token#markup -> String
+   *
+   * '*' or '_' for emphasis, fence string for fence, etc.
+   **/
+  this.markup   = '';
+
+  /**
+   * Token#info -> String
+   *
+   * fence infostring
+   **/
+  this.info     = '';
+
+  /**
+   * Token#meta -> Object
+   *
+   * A place for plugins to store an arbitrary data
+   **/
+  this.meta     = null;
+
+  /**
+   * Token#block -> Boolean
+   *
+   * True for block-level tokens, false for inline tokens.
+   * Used in renderer to calculate line breaks
+   **/
+  this.block    = false;
+
+  /**
+   * Token#hidden -> Boolean
+   *
+   * If it's true, ignore this element when rendering. Used for tight lists
+   * to hide paragraphs.
+   **/
+  this.hidden   = false;
+}
+
+
+/**
+ * Token.attrIndex(name) -> Number
+ *
+ * Search attribute index by name.
+ **/
+Token.prototype.attrIndex = function attrIndex(name) {
+  var attrs, i, len;
+
+  if (!this.attrs) { return -1; }
+
+  attrs = this.attrs;
+
+  for (i = 0, len = attrs.length; i < len; i++) {
+    if (attrs[i][0] === name) { return i; }
+  }
+  return -1;
+};
+
+
+/**
+ * Token.attrPush(attrData)
+ *
+ * Add `[ name, value ]` attribute to list. Init attrs if necessary
+ **/
+Token.prototype.attrPush = function attrPush(attrData) {
+  if (this.attrs) {
+    this.attrs.push(attrData);
+  } else {
+    this.attrs = [ attrData ];
+  }
+};
+
+
+/**
+ * Token.attrSet(name, value)
+ *
+ * Set `name` attribute to `value`. Override old value if exists.
+ **/
+Token.prototype.attrSet = function attrSet(name, value) {
+  var idx = this.attrIndex(name),
+      attrData = [ name, value ];
+
+  if (idx < 0) {
+    this.attrPush(attrData);
+  } else {
+    this.attrs[idx] = attrData;
+  }
+};
+
+
+/**
+ * Token.attrGet(name)
+ *
+ * Get the value of attribute `name`, or null if it does not exist.
+ **/
+Token.prototype.attrGet = function attrGet(name) {
+  var idx = this.attrIndex(name), value = null;
+  if (idx >= 0) {
+    value = this.attrs[idx][1];
+  }
+  return value;
+};
+
+
+/**
+ * Token.attrJoin(name, value)
+ *
+ * Join value to existing attribute via space. Or create new attribute if not
+ * exists. Useful to operate with token classes.
+ **/
+Token.prototype.attrJoin = function attrJoin(name, value) {
+  var idx = this.attrIndex(name);
+
+  if (idx < 0) {
+    this.attrPush([ name, value ]);
+  } else {
+    this.attrs[idx][1] = this.attrs[idx][1] + ' ' + value;
+  }
+};
+
+
+module.exports = Token;
+
+},{}],52:[function(require,module,exports){
+module.exports={"Aacute":"\u00C1","aacute":"\u00E1","Abreve":"\u0102","abreve":"\u0103","ac":"\u223E","acd":"\u223F","acE":"\u223E\u0333","Acirc":"\u00C2","acirc":"\u00E2","acute":"\u00B4","Acy":"\u0410","acy":"\u0430","AElig":"\u00C6","aelig":"\u00E6","af":"\u2061","Afr":"\uD835\uDD04","afr":"\uD835\uDD1E","Agrave":"\u00C0","agrave":"\u00E0","alefsym":"\u2135","aleph":"\u2135","Alpha":"\u0391","alpha":"\u03B1","Amacr":"\u0100","amacr":"\u0101","amalg":"\u2A3F","amp":"&","AMP":"&","andand":"\u2A55","And":"\u2A53","and":"\u2227","andd":"\u2A5C","andslope":"\u2A58","andv":"\u2A5A","ang":"\u2220","ange":"\u29A4","angle":"\u2220","angmsdaa":"\u29A8","angmsdab":"\u29A9","angmsdac":"\u29AA","angmsdad":"\u29AB","angmsdae":"\u29AC","angmsdaf":"\u29AD","angmsdag":"\u29AE","angmsdah":"\u29AF","angmsd":"\u2221","angrt":"\u221F","angrtvb":"\u22BE","angrtvbd":"\u299D","angsph":"\u2222","angst":"\u00C5","angzarr":"\u237C","Aogon":"\u0104","aogon":"\u0105","Aopf":"\uD835\uDD38","aopf":"\uD835\uDD52","apacir":"\u2A6F","ap":"\u2248","apE":"\u2A70","ape":"\u224A","apid":"\u224B","apos":"'","ApplyFunction":"\u2061","approx":"\u2248","approxeq":"\u224A","Aring":"\u00C5","aring":"\u00E5","Ascr":"\uD835\uDC9C","ascr":"\uD835\uDCB6","Assign":"\u2254","ast":"*","asymp":"\u2248","asympeq":"\u224D","Atilde":"\u00C3","atilde":"\u00E3","Auml":"\u00C4","auml":"\u00E4","awconint":"\u2233","awint":"\u2A11","backcong":"\u224C","backepsilon":"\u03F6","backprime":"\u2035","backsim":"\u223D","backsimeq":"\u22CD","Backslash":"\u2216","Barv":"\u2AE7","barvee":"\u22BD","barwed":"\u2305","Barwed":"\u2306","barwedge":"\u2305","bbrk":"\u23B5","bbrktbrk":"\u23B6","bcong":"\u224C","Bcy":"\u0411","bcy":"\u0431","bdquo":"\u201E","becaus":"\u2235","because":"\u2235","Because":"\u2235","bemptyv":"\u29B0","bepsi":"\u03F6","bernou":"\u212C","Bernoullis":"\u212C","Beta":"\u0392","beta":"\u03B2","beth":"\u2136","between":"\u226C","Bfr":"\uD835\uDD05","bfr":"\uD835\uDD1F","bigcap":"\u22C2","bigcirc":"\u25EF","bigcup":"\u22C3","bigodot":"\u2A00","bigoplus":"\u2A01","bigotimes":"\u2A02","bigsqcup":"\u2A06","bigstar":"\u2605","bigtriangledown":"\u25BD","bigtriangleup":"\u25B3","biguplus":"\u2A04","bigvee":"\u22C1","bigwedge":"\u22C0","bkarow":"\u290D","blacklozenge":"\u29EB","blacksquare":"\u25AA","blacktriangle":"\u25B4","blacktriangledown":"\u25BE","blacktriangleleft":"\u25C2","blacktriangleright":"\u25B8","blank":"\u2423","blk12":"\u2592","blk14":"\u2591","blk34":"\u2593","block":"\u2588","bne":"=\u20E5","bnequiv":"\u2261\u20E5","bNot":"\u2AED","bnot":"\u2310","Bopf":"\uD835\uDD39","bopf":"\uD835\uDD53","bot":"\u22A5","bottom":"\u22A5","bowtie":"\u22C8","boxbox":"\u29C9","boxdl":"\u2510","boxdL":"\u2555","boxDl":"\u2556","boxDL":"\u2557","boxdr":"\u250C","boxdR":"\u2552","boxDr":"\u2553","boxDR":"\u2554","boxh":"\u2500","boxH":"\u2550","boxhd":"\u252C","boxHd":"\u2564","boxhD":"\u2565","boxHD":"\u2566","boxhu":"\u2534","boxHu":"\u2567","boxhU":"\u2568","boxHU":"\u2569","boxminus":"\u229F","boxplus":"\u229E","boxtimes":"\u22A0","boxul":"\u2518","boxuL":"\u255B","boxUl":"\u255C","boxUL":"\u255D","boxur":"\u2514","boxuR":"\u2558","boxUr":"\u2559","boxUR":"\u255A","boxv":"\u2502","boxV":"\u2551","boxvh":"\u253C","boxvH":"\u256A","boxVh":"\u256B","boxVH":"\u256C","boxvl":"\u2524","boxvL":"\u2561","boxVl":"\u2562","boxVL":"\u2563","boxvr":"\u251C","boxvR":"\u255E","boxVr":"\u255F","boxVR":"\u2560","bprime":"\u2035","breve":"\u02D8","Breve":"\u02D8","brvbar":"\u00A6","bscr":"\uD835\uDCB7","Bscr":"\u212C","bsemi":"\u204F","bsim":"\u223D","bsime":"\u22CD","bsolb":"\u29C5","bsol":"\\","bsolhsub":"\u27C8","bull":"\u2022","bullet":"\u2022","bump":"\u224E","bumpE":"\u2AAE","bumpe":"\u224F","Bumpeq":"\u224E","bumpeq":"\u224F","Cacute":"\u0106","cacute":"\u0107","capand":"\u2A44","capbrcup":"\u2A49","capcap":"\u2A4B","cap":"\u2229","Cap":"\u22D2","capcup":"\u2A47","capdot":"\u2A40","CapitalDifferentialD":"\u2145","caps":"\u2229\uFE00","caret":"\u2041","caron":"\u02C7","Cayleys":"\u212D","ccaps":"\u2A4D","Ccaron":"\u010C","ccaron":"\u010D","Ccedil":"\u00C7","ccedil":"\u00E7","Ccirc":"\u0108","ccirc":"\u0109","Cconint":"\u2230","ccups":"\u2A4C","ccupssm":"\u2A50","Cdot":"\u010A","cdot":"\u010B","cedil":"\u00B8","Cedilla":"\u00B8","cemptyv":"\u29B2","cent":"\u00A2","centerdot":"\u00B7","CenterDot":"\u00B7","cfr":"\uD835\uDD20","Cfr":"\u212D","CHcy":"\u0427","chcy":"\u0447","check":"\u2713","checkmark":"\u2713","Chi":"\u03A7","chi":"\u03C7","circ":"\u02C6","circeq":"\u2257","circlearrowleft":"\u21BA","circlearrowright":"\u21BB","circledast":"\u229B","circledcirc":"\u229A","circleddash":"\u229D","CircleDot":"\u2299","circledR":"\u00AE","circledS":"\u24C8","CircleMinus":"\u2296","CirclePlus":"\u2295","CircleTimes":"\u2297","cir":"\u25CB","cirE":"\u29C3","cire":"\u2257","cirfnint":"\u2A10","cirmid":"\u2AEF","cirscir":"\u29C2","ClockwiseContourIntegral":"\u2232","CloseCurlyDoubleQuote":"\u201D","CloseCurlyQuote":"\u2019","clubs":"\u2663","clubsuit":"\u2663","colon":":","Colon":"\u2237","Colone":"\u2A74","colone":"\u2254","coloneq":"\u2254","comma":",","commat":"@","comp":"\u2201","compfn":"\u2218","complement":"\u2201","complexes":"\u2102","cong":"\u2245","congdot":"\u2A6D","Congruent":"\u2261","conint":"\u222E","Conint":"\u222F","ContourIntegral":"\u222E","copf":"\uD835\uDD54","Copf":"\u2102","coprod":"\u2210","Coproduct":"\u2210","copy":"\u00A9","COPY":"\u00A9","copysr":"\u2117","CounterClockwiseContourIntegral":"\u2233","crarr":"\u21B5","cross":"\u2717","Cross":"\u2A2F","Cscr":"\uD835\uDC9E","cscr":"\uD835\uDCB8","csub":"\u2ACF","csube":"\u2AD1","csup":"\u2AD0","csupe":"\u2AD2","ctdot":"\u22EF","cudarrl":"\u2938","cudarrr":"\u2935","cuepr":"\u22DE","cuesc":"\u22DF","cularr":"\u21B6","cularrp":"\u293D","cupbrcap":"\u2A48","cupcap":"\u2A46","CupCap":"\u224D","cup":"\u222A","Cup":"\u22D3","cupcup":"\u2A4A","cupdot":"\u228D","cupor":"\u2A45","cups":"\u222A\uFE00","curarr":"\u21B7","curarrm":"\u293C","curlyeqprec":"\u22DE","curlyeqsucc":"\u22DF","curlyvee":"\u22CE","curlywedge":"\u22CF","curren":"\u00A4","curvearrowleft":"\u21B6","curvearrowright":"\u21B7","cuvee":"\u22CE","cuwed":"\u22CF","cwconint":"\u2232","cwint":"\u2231","cylcty":"\u232D","dagger":"\u2020","Dagger":"\u2021","daleth":"\u2138","darr":"\u2193","Darr":"\u21A1","dArr":"\u21D3","dash":"\u2010","Dashv":"\u2AE4","dashv":"\u22A3","dbkarow":"\u290F","dblac":"\u02DD","Dcaron":"\u010E","dcaron":"\u010F","Dcy":"\u0414","dcy":"\u0434","ddagger":"\u2021","ddarr":"\u21CA","DD":"\u2145","dd":"\u2146","DDotrahd":"\u2911","ddotseq":"\u2A77","deg":"\u00B0","Del":"\u2207","Delta":"\u0394","delta":"\u03B4","demptyv":"\u29B1","dfisht":"\u297F","Dfr":"\uD835\uDD07","dfr":"\uD835\uDD21","dHar":"\u2965","dharl":"\u21C3","dharr":"\u21C2","DiacriticalAcute":"\u00B4","DiacriticalDot":"\u02D9","DiacriticalDoubleAcute":"\u02DD","DiacriticalGrave":"`","DiacriticalTilde":"\u02DC","diam":"\u22C4","diamond":"\u22C4","Diamond":"\u22C4","diamondsuit":"\u2666","diams":"\u2666","die":"\u00A8","DifferentialD":"\u2146","digamma":"\u03DD","disin":"\u22F2","div":"\u00F7","divide":"\u00F7","divideontimes":"\u22C7","divonx":"\u22C7","DJcy":"\u0402","djcy":"\u0452","dlcorn":"\u231E","dlcrop":"\u230D","dollar":"$","Dopf":"\uD835\uDD3B","dopf":"\uD835\uDD55","Dot":"\u00A8","dot":"\u02D9","DotDot":"\u20DC","doteq":"\u2250","doteqdot":"\u2251","DotEqual":"\u2250","dotminus":"\u2238","dotplus":"\u2214","dotsquare":"\u22A1","doublebarwedge":"\u2306","DoubleContourIntegral":"\u222F","DoubleDot":"\u00A8","DoubleDownArrow":"\u21D3","DoubleLeftArrow":"\u21D0","DoubleLeftRightArrow":"\u21D4","DoubleLeftTee":"\u2AE4","DoubleLongLeftArrow":"\u27F8","DoubleLongLeftRightArrow":"\u27FA","DoubleLongRightArrow":"\u27F9","DoubleRightArrow":"\u21D2","DoubleRightTee":"\u22A8","DoubleUpArrow":"\u21D1","DoubleUpDownArrow":"\u21D5","DoubleVerticalBar":"\u2225","DownArrowBar":"\u2913","downarrow":"\u2193","DownArrow":"\u2193","Downarrow":"\u21D3","DownArrowUpArrow":"\u21F5","DownBreve":"\u0311","downdownarrows":"\u21CA","downharpoonleft":"\u21C3","downharpoonright":"\u21C2","DownLeftRightVector":"\u2950","DownLeftTeeVector":"\u295E","DownLeftVectorBar":"\u2956","DownLeftVector":"\u21BD","DownRightTeeVector":"\u295F","DownRightVectorBar":"\u2957","DownRightVector":"\u21C1","DownTeeArrow":"\u21A7","DownTee":"\u22A4","drbkarow":"\u2910","drcorn":"\u231F","drcrop":"\u230C","Dscr":"\uD835\uDC9F","dscr":"\uD835\uDCB9","DScy":"\u0405","dscy":"\u0455","dsol":"\u29F6","Dstrok":"\u0110","dstrok":"\u0111","dtdot":"\u22F1","dtri":"\u25BF","dtrif":"\u25BE","duarr":"\u21F5","duhar":"\u296F","dwangle":"\u29A6","DZcy":"\u040F","dzcy":"\u045F","dzigrarr":"\u27FF","Eacute":"\u00C9","eacute":"\u00E9","easter":"\u2A6E","Ecaron":"\u011A","ecaron":"\u011B","Ecirc":"\u00CA","ecirc":"\u00EA","ecir":"\u2256","ecolon":"\u2255","Ecy":"\u042D","ecy":"\u044D","eDDot":"\u2A77","Edot":"\u0116","edot":"\u0117","eDot":"\u2251","ee":"\u2147","efDot":"\u2252","Efr":"\uD835\uDD08","efr":"\uD835\uDD22","eg":"\u2A9A","Egrave":"\u00C8","egrave":"\u00E8","egs":"\u2A96","egsdot":"\u2A98","el":"\u2A99","Element":"\u2208","elinters":"\u23E7","ell":"\u2113","els":"\u2A95","elsdot":"\u2A97","Emacr":"\u0112","emacr":"\u0113","empty":"\u2205","emptyset":"\u2205","EmptySmallSquare":"\u25FB","emptyv":"\u2205","EmptyVerySmallSquare":"\u25AB","emsp13":"\u2004","emsp14":"\u2005","emsp":"\u2003","ENG":"\u014A","eng":"\u014B","ensp":"\u2002","Eogon":"\u0118","eogon":"\u0119","Eopf":"\uD835\uDD3C","eopf":"\uD835\uDD56","epar":"\u22D5","eparsl":"\u29E3","eplus":"\u2A71","epsi":"\u03B5","Epsilon":"\u0395","epsilon":"\u03B5","epsiv":"\u03F5","eqcirc":"\u2256","eqcolon":"\u2255","eqsim":"\u2242","eqslantgtr":"\u2A96","eqslantless":"\u2A95","Equal":"\u2A75","equals":"=","EqualTilde":"\u2242","equest":"\u225F","Equilibrium":"\u21CC","equiv":"\u2261","equivDD":"\u2A78","eqvparsl":"\u29E5","erarr":"\u2971","erDot":"\u2253","escr":"\u212F","Escr":"\u2130","esdot":"\u2250","Esim":"\u2A73","esim":"\u2242","Eta":"\u0397","eta":"\u03B7","ETH":"\u00D0","eth":"\u00F0","Euml":"\u00CB","euml":"\u00EB","euro":"\u20AC","excl":"!","exist":"\u2203","Exists":"\u2203","expectation":"\u2130","exponentiale":"\u2147","ExponentialE":"\u2147","fallingdotseq":"\u2252","Fcy":"\u0424","fcy":"\u0444","female":"\u2640","ffilig":"\uFB03","fflig":"\uFB00","ffllig":"\uFB04","Ffr":"\uD835\uDD09","ffr":"\uD835\uDD23","filig":"\uFB01","FilledSmallSquare":"\u25FC","FilledVerySmallSquare":"\u25AA","fjlig":"fj","flat":"\u266D","fllig":"\uFB02","fltns":"\u25B1","fnof":"\u0192","Fopf":"\uD835\uDD3D","fopf":"\uD835\uDD57","forall":"\u2200","ForAll":"\u2200","fork":"\u22D4","forkv":"\u2AD9","Fouriertrf":"\u2131","fpartint":"\u2A0D","frac12":"\u00BD","frac13":"\u2153","frac14":"\u00BC","frac15":"\u2155","frac16":"\u2159","frac18":"\u215B","frac23":"\u2154","frac25":"\u2156","frac34":"\u00BE","frac35":"\u2157","frac38":"\u215C","frac45":"\u2158","frac56":"\u215A","frac58":"\u215D","frac78":"\u215E","frasl":"\u2044","frown":"\u2322","fscr":"\uD835\uDCBB","Fscr":"\u2131","gacute":"\u01F5","Gamma":"\u0393","gamma":"\u03B3","Gammad":"\u03DC","gammad":"\u03DD","gap":"\u2A86","Gbreve":"\u011E","gbreve":"\u011F","Gcedil":"\u0122","Gcirc":"\u011C","gcirc":"\u011D","Gcy":"\u0413","gcy":"\u0433","Gdot":"\u0120","gdot":"\u0121","ge":"\u2265","gE":"\u2267","gEl":"\u2A8C","gel":"\u22DB","geq":"\u2265","geqq":"\u2267","geqslant":"\u2A7E","gescc":"\u2AA9","ges":"\u2A7E","gesdot":"\u2A80","gesdoto":"\u2A82","gesdotol":"\u2A84","gesl":"\u22DB\uFE00","gesles":"\u2A94","Gfr":"\uD835\uDD0A","gfr":"\uD835\uDD24","gg":"\u226B","Gg":"\u22D9","ggg":"\u22D9","gimel":"\u2137","GJcy":"\u0403","gjcy":"\u0453","gla":"\u2AA5","gl":"\u2277","glE":"\u2A92","glj":"\u2AA4","gnap":"\u2A8A","gnapprox":"\u2A8A","gne":"\u2A88","gnE":"\u2269","gneq":"\u2A88","gneqq":"\u2269","gnsim":"\u22E7","Gopf":"\uD835\uDD3E","gopf":"\uD835\uDD58","grave":"`","GreaterEqual":"\u2265","GreaterEqualLess":"\u22DB","GreaterFullEqual":"\u2267","GreaterGreater":"\u2AA2","GreaterLess":"\u2277","GreaterSlantEqual":"\u2A7E","GreaterTilde":"\u2273","Gscr":"\uD835\uDCA2","gscr":"\u210A","gsim":"\u2273","gsime":"\u2A8E","gsiml":"\u2A90","gtcc":"\u2AA7","gtcir":"\u2A7A","gt":">","GT":">","Gt":"\u226B","gtdot":"\u22D7","gtlPar":"\u2995","gtquest":"\u2A7C","gtrapprox":"\u2A86","gtrarr":"\u2978","gtrdot":"\u22D7","gtreqless":"\u22DB","gtreqqless":"\u2A8C","gtrless":"\u2277","gtrsim":"\u2273","gvertneqq":"\u2269\uFE00","gvnE":"\u2269\uFE00","Hacek":"\u02C7","hairsp":"\u200A","half":"\u00BD","hamilt":"\u210B","HARDcy":"\u042A","hardcy":"\u044A","harrcir":"\u2948","harr":"\u2194","hArr":"\u21D4","harrw":"\u21AD","Hat":"^","hbar":"\u210F","Hcirc":"\u0124","hcirc":"\u0125","hearts":"\u2665","heartsuit":"\u2665","hellip":"\u2026","hercon":"\u22B9","hfr":"\uD835\uDD25","Hfr":"\u210C","HilbertSpace":"\u210B","hksearow":"\u2925","hkswarow":"\u2926","hoarr":"\u21FF","homtht":"\u223B","hookleftarrow":"\u21A9","hookrightarrow":"\u21AA","hopf":"\uD835\uDD59","Hopf":"\u210D","horbar":"\u2015","HorizontalLine":"\u2500","hscr":"\uD835\uDCBD","Hscr":"\u210B","hslash":"\u210F","Hstrok":"\u0126","hstrok":"\u0127","HumpDownHump":"\u224E","HumpEqual":"\u224F","hybull":"\u2043","hyphen":"\u2010","Iacute":"\u00CD","iacute":"\u00ED","ic":"\u2063","Icirc":"\u00CE","icirc":"\u00EE","Icy":"\u0418","icy":"\u0438","Idot":"\u0130","IEcy":"\u0415","iecy":"\u0435","iexcl":"\u00A1","iff":"\u21D4","ifr":"\uD835\uDD26","Ifr":"\u2111","Igrave":"\u00CC","igrave":"\u00EC","ii":"\u2148","iiiint":"\u2A0C","iiint":"\u222D","iinfin":"\u29DC","iiota":"\u2129","IJlig":"\u0132","ijlig":"\u0133","Imacr":"\u012A","imacr":"\u012B","image":"\u2111","ImaginaryI":"\u2148","imagline":"\u2110","imagpart":"\u2111","imath":"\u0131","Im":"\u2111","imof":"\u22B7","imped":"\u01B5","Implies":"\u21D2","incare":"\u2105","in":"\u2208","infin":"\u221E","infintie":"\u29DD","inodot":"\u0131","intcal":"\u22BA","int":"\u222B","Int":"\u222C","integers":"\u2124","Integral":"\u222B","intercal":"\u22BA","Intersection":"\u22C2","intlarhk":"\u2A17","intprod":"\u2A3C","InvisibleComma":"\u2063","InvisibleTimes":"\u2062","IOcy":"\u0401","iocy":"\u0451","Iogon":"\u012E","iogon":"\u012F","Iopf":"\uD835\uDD40","iopf":"\uD835\uDD5A","Iota":"\u0399","iota":"\u03B9","iprod":"\u2A3C","iquest":"\u00BF","iscr":"\uD835\uDCBE","Iscr":"\u2110","isin":"\u2208","isindot":"\u22F5","isinE":"\u22F9","isins":"\u22F4","isinsv":"\u22F3","isinv":"\u2208","it":"\u2062","Itilde":"\u0128","itilde":"\u0129","Iukcy":"\u0406","iukcy":"\u0456","Iuml":"\u00CF","iuml":"\u00EF","Jcirc":"\u0134","jcirc":"\u0135","Jcy":"\u0419","jcy":"\u0439","Jfr":"\uD835\uDD0D","jfr":"\uD835\uDD27","jmath":"\u0237","Jopf":"\uD835\uDD41","jopf":"\uD835\uDD5B","Jscr":"\uD835\uDCA5","jscr":"\uD835\uDCBF","Jsercy":"\u0408","jsercy":"\u0458","Jukcy":"\u0404","jukcy":"\u0454","Kappa":"\u039A","kappa":"\u03BA","kappav":"\u03F0","Kcedil":"\u0136","kcedil":"\u0137","Kcy":"\u041A","kcy":"\u043A","Kfr":"\uD835\uDD0E","kfr":"\uD835\uDD28","kgreen":"\u0138","KHcy":"\u0425","khcy":"\u0445","KJcy":"\u040C","kjcy":"\u045C","Kopf":"\uD835\uDD42","kopf":"\uD835\uDD5C","Kscr":"\uD835\uDCA6","kscr":"\uD835\uDCC0","lAarr":"\u21DA","Lacute":"\u0139","lacute":"\u013A","laemptyv":"\u29B4","lagran":"\u2112","Lambda":"\u039B","lambda":"\u03BB","lang":"\u27E8","Lang":"\u27EA","langd":"\u2991","langle":"\u27E8","lap":"\u2A85","Laplacetrf":"\u2112","laquo":"\u00AB","larrb":"\u21E4","larrbfs":"\u291F","larr":"\u2190","Larr":"\u219E","lArr":"\u21D0","larrfs":"\u291D","larrhk":"\u21A9","larrlp":"\u21AB","larrpl":"\u2939","larrsim":"\u2973","larrtl":"\u21A2","latail":"\u2919","lAtail":"\u291B","lat":"\u2AAB","late":"\u2AAD","lates":"\u2AAD\uFE00","lbarr":"\u290C","lBarr":"\u290E","lbbrk":"\u2772","lbrace":"{","lbrack":"[","lbrke":"\u298B","lbrksld":"\u298F","lbrkslu":"\u298D","Lcaron":"\u013D","lcaron":"\u013E","Lcedil":"\u013B","lcedil":"\u013C","lceil":"\u2308","lcub":"{","Lcy":"\u041B","lcy":"\u043B","ldca":"\u2936","ldquo":"\u201C","ldquor":"\u201E","ldrdhar":"\u2967","ldrushar":"\u294B","ldsh":"\u21B2","le":"\u2264","lE":"\u2266","LeftAngleBracket":"\u27E8","LeftArrowBar":"\u21E4","leftarrow":"\u2190","LeftArrow":"\u2190","Leftarrow":"\u21D0","LeftArrowRightArrow":"\u21C6","leftarrowtail":"\u21A2","LeftCeiling":"\u2308","LeftDoubleBracket":"\u27E6","LeftDownTeeVector":"\u2961","LeftDownVectorBar":"\u2959","LeftDownVector":"\u21C3","LeftFloor":"\u230A","leftharpoondown":"\u21BD","leftharpoonup":"\u21BC","leftleftarrows":"\u21C7","leftrightarrow":"\u2194","LeftRightArrow":"\u2194","Leftrightarrow":"\u21D4","leftrightarrows":"\u21C6","leftrightharpoons":"\u21CB","leftrightsquigarrow":"\u21AD","LeftRightVector":"\u294E","LeftTeeArrow":"\u21A4","LeftTee":"\u22A3","LeftTeeVector":"\u295A","leftthreetimes":"\u22CB","LeftTriangleBar":"\u29CF","LeftTriangle":"\u22B2","LeftTriangleEqual":"\u22B4","LeftUpDownVector":"\u2951","LeftUpTeeVector":"\u2960","LeftUpVectorBar":"\u2958","LeftUpVector":"\u21BF","LeftVectorBar":"\u2952","LeftVector":"\u21BC","lEg":"\u2A8B","leg":"\u22DA","leq":"\u2264","leqq":"\u2266","leqslant":"\u2A7D","lescc":"\u2AA8","les":"\u2A7D","lesdot":"\u2A7F","lesdoto":"\u2A81","lesdotor":"\u2A83","lesg":"\u22DA\uFE00","lesges":"\u2A93","lessapprox":"\u2A85","lessdot":"\u22D6","lesseqgtr":"\u22DA","lesseqqgtr":"\u2A8B","LessEqualGreater":"\u22DA","LessFullEqual":"\u2266","LessGreater":"\u2276","lessgtr":"\u2276","LessLess":"\u2AA1","lesssim":"\u2272","LessSlantEqual":"\u2A7D","LessTilde":"\u2272","lfisht":"\u297C","lfloor":"\u230A","Lfr":"\uD835\uDD0F","lfr":"\uD835\uDD29","lg":"\u2276","lgE":"\u2A91","lHar":"\u2962","lhard":"\u21BD","lharu":"\u21BC","lharul":"\u296A","lhblk":"\u2584","LJcy":"\u0409","ljcy":"\u0459","llarr":"\u21C7","ll":"\u226A","Ll":"\u22D8","llcorner":"\u231E","Lleftarrow":"\u21DA","llhard":"\u296B","lltri":"\u25FA","Lmidot":"\u013F","lmidot":"\u0140","lmoustache":"\u23B0","lmoust":"\u23B0","lnap":"\u2A89","lnapprox":"\u2A89","lne":"\u2A87","lnE":"\u2268","lneq":"\u2A87","lneqq":"\u2268","lnsim":"\u22E6","loang":"\u27EC","loarr":"\u21FD","lobrk":"\u27E6","longleftarrow":"\u27F5","LongLeftArrow":"\u27F5","Longleftarrow":"\u27F8","longleftrightarrow":"\u27F7","LongLeftRightArrow":"\u27F7","Longleftrightarrow":"\u27FA","longmapsto":"\u27FC","longrightarrow":"\u27F6","LongRightArrow":"\u27F6","Longrightarrow":"\u27F9","looparrowleft":"\u21AB","looparrowright":"\u21AC","lopar":"\u2985","Lopf":"\uD835\uDD43","lopf":"\uD835\uDD5D","loplus":"\u2A2D","lotimes":"\u2A34","lowast":"\u2217","lowbar":"_","LowerLeftArrow":"\u2199","LowerRightArrow":"\u2198","loz":"\u25CA","lozenge":"\u25CA","lozf":"\u29EB","lpar":"(","lparlt":"\u2993","lrarr":"\u21C6","lrcorner":"\u231F","lrhar":"\u21CB","lrhard":"\u296D","lrm":"\u200E","lrtri":"\u22BF","lsaquo":"\u2039","lscr":"\uD835\uDCC1","Lscr":"\u2112","lsh":"\u21B0","Lsh":"\u21B0","lsim":"\u2272","lsime":"\u2A8D","lsimg":"\u2A8F","lsqb":"[","lsquo":"\u2018","lsquor":"\u201A","Lstrok":"\u0141","lstrok":"\u0142","ltcc":"\u2AA6","ltcir":"\u2A79","lt":"<","LT":"<","Lt":"\u226A","ltdot":"\u22D6","lthree":"\u22CB","ltimes":"\u22C9","ltlarr":"\u2976","ltquest":"\u2A7B","ltri":"\u25C3","ltrie":"\u22B4","ltrif":"\u25C2","ltrPar":"\u2996","lurdshar":"\u294A","luruhar":"\u2966","lvertneqq":"\u2268\uFE00","lvnE":"\u2268\uFE00","macr":"\u00AF","male":"\u2642","malt":"\u2720","maltese":"\u2720","Map":"\u2905","map":"\u21A6","mapsto":"\u21A6","mapstodown":"\u21A7","mapstoleft":"\u21A4","mapstoup":"\u21A5","marker":"\u25AE","mcomma":"\u2A29","Mcy":"\u041C","mcy":"\u043C","mdash":"\u2014","mDDot":"\u223A","measuredangle":"\u2221","MediumSpace":"\u205F","Mellintrf":"\u2133","Mfr":"\uD835\uDD10","mfr":"\uD835\uDD2A","mho":"\u2127","micro":"\u00B5","midast":"*","midcir":"\u2AF0","mid":"\u2223","middot":"\u00B7","minusb":"\u229F","minus":"\u2212","minusd":"\u2238","minusdu":"\u2A2A","MinusPlus":"\u2213","mlcp":"\u2ADB","mldr":"\u2026","mnplus":"\u2213","models":"\u22A7","Mopf":"\uD835\uDD44","mopf":"\uD835\uDD5E","mp":"\u2213","mscr":"\uD835\uDCC2","Mscr":"\u2133","mstpos":"\u223E","Mu":"\u039C","mu":"\u03BC","multimap":"\u22B8","mumap":"\u22B8","nabla":"\u2207","Nacute":"\u0143","nacute":"\u0144","nang":"\u2220\u20D2","nap":"\u2249","napE":"\u2A70\u0338","napid":"\u224B\u0338","napos":"\u0149","napprox":"\u2249","natural":"\u266E","naturals":"\u2115","natur":"\u266E","nbsp":"\u00A0","nbump":"\u224E\u0338","nbumpe":"\u224F\u0338","ncap":"\u2A43","Ncaron":"\u0147","ncaron":"\u0148","Ncedil":"\u0145","ncedil":"\u0146","ncong":"\u2247","ncongdot":"\u2A6D\u0338","ncup":"\u2A42","Ncy":"\u041D","ncy":"\u043D","ndash":"\u2013","nearhk":"\u2924","nearr":"\u2197","neArr":"\u21D7","nearrow":"\u2197","ne":"\u2260","nedot":"\u2250\u0338","NegativeMediumSpace":"\u200B","NegativeThickSpace":"\u200B","NegativeThinSpace":"\u200B","NegativeVeryThinSpace":"\u200B","nequiv":"\u2262","nesear":"\u2928","nesim":"\u2242\u0338","NestedGreaterGreater":"\u226B","NestedLessLess":"\u226A","NewLine":"\n","nexist":"\u2204","nexists":"\u2204","Nfr":"\uD835\uDD11","nfr":"\uD835\uDD2B","ngE":"\u2267\u0338","nge":"\u2271","ngeq":"\u2271","ngeqq":"\u2267\u0338","ngeqslant":"\u2A7E\u0338","nges":"\u2A7E\u0338","nGg":"\u22D9\u0338","ngsim":"\u2275","nGt":"\u226B\u20D2","ngt":"\u226F","ngtr":"\u226F","nGtv":"\u226B\u0338","nharr":"\u21AE","nhArr":"\u21CE","nhpar":"\u2AF2","ni":"\u220B","nis":"\u22FC","nisd":"\u22FA","niv":"\u220B","NJcy":"\u040A","njcy":"\u045A","nlarr":"\u219A","nlArr":"\u21CD","nldr":"\u2025","nlE":"\u2266\u0338","nle":"\u2270","nleftarrow":"\u219A","nLeftarrow":"\u21CD","nleftrightarrow":"\u21AE","nLeftrightarrow":"\u21CE","nleq":"\u2270","nleqq":"\u2266\u0338","nleqslant":"\u2A7D\u0338","nles":"\u2A7D\u0338","nless":"\u226E","nLl":"\u22D8\u0338","nlsim":"\u2274","nLt":"\u226A\u20D2","nlt":"\u226E","nltri":"\u22EA","nltrie":"\u22EC","nLtv":"\u226A\u0338","nmid":"\u2224","NoBreak":"\u2060","NonBreakingSpace":"\u00A0","nopf":"\uD835\uDD5F","Nopf":"\u2115","Not":"\u2AEC","not":"\u00AC","NotCongruent":"\u2262","NotCupCap":"\u226D","NotDoubleVerticalBar":"\u2226","NotElement":"\u2209","NotEqual":"\u2260","NotEqualTilde":"\u2242\u0338","NotExists":"\u2204","NotGreater":"\u226F","NotGreaterEqual":"\u2271","NotGreaterFullEqual":"\u2267\u0338","NotGreaterGreater":"\u226B\u0338","NotGreaterLess":"\u2279","NotGreaterSlantEqual":"\u2A7E\u0338","NotGreaterTilde":"\u2275","NotHumpDownHump":"\u224E\u0338","NotHumpEqual":"\u224F\u0338","notin":"\u2209","notindot":"\u22F5\u0338","notinE":"\u22F9\u0338","notinva":"\u2209","notinvb":"\u22F7","notinvc":"\u22F6","NotLeftTriangleBar":"\u29CF\u0338","NotLeftTriangle":"\u22EA","NotLeftTriangleEqual":"\u22EC","NotLess":"\u226E","NotLessEqual":"\u2270","NotLessGreater":"\u2278","NotLessLess":"\u226A\u0338","NotLessSlantEqual":"\u2A7D\u0338","NotLessTilde":"\u2274","NotNestedGreaterGreater":"\u2AA2\u0338","NotNestedLessLess":"\u2AA1\u0338","notni":"\u220C","notniva":"\u220C","notnivb":"\u22FE","notnivc":"\u22FD","NotPrecedes":"\u2280","NotPrecedesEqual":"\u2AAF\u0338","NotPrecedesSlantEqual":"\u22E0","NotReverseElement":"\u220C","NotRightTriangleBar":"\u29D0\u0338","NotRightTriangle":"\u22EB","NotRightTriangleEqual":"\u22ED","NotSquareSubset":"\u228F\u0338","NotSquareSubsetEqual":"\u22E2","NotSquareSuperset":"\u2290\u0338","NotSquareSupersetEqual":"\u22E3","NotSubset":"\u2282\u20D2","NotSubsetEqual":"\u2288","NotSucceeds":"\u2281","NotSucceedsEqual":"\u2AB0\u0338","NotSucceedsSlantEqual":"\u22E1","NotSucceedsTilde":"\u227F\u0338","NotSuperset":"\u2283\u20D2","NotSupersetEqual":"\u2289","NotTilde":"\u2241","NotTildeEqual":"\u2244","NotTildeFullEqual":"\u2247","NotTildeTilde":"\u2249","NotVerticalBar":"\u2224","nparallel":"\u2226","npar":"\u2226","nparsl":"\u2AFD\u20E5","npart":"\u2202\u0338","npolint":"\u2A14","npr":"\u2280","nprcue":"\u22E0","nprec":"\u2280","npreceq":"\u2AAF\u0338","npre":"\u2AAF\u0338","nrarrc":"\u2933\u0338","nrarr":"\u219B","nrArr":"\u21CF","nrarrw":"\u219D\u0338","nrightarrow":"\u219B","nRightarrow":"\u21CF","nrtri":"\u22EB","nrtrie":"\u22ED","nsc":"\u2281","nsccue":"\u22E1","nsce":"\u2AB0\u0338","Nscr":"\uD835\uDCA9","nscr":"\uD835\uDCC3","nshortmid":"\u2224","nshortparallel":"\u2226","nsim":"\u2241","nsime":"\u2244","nsimeq":"\u2244","nsmid":"\u2224","nspar":"\u2226","nsqsube":"\u22E2","nsqsupe":"\u22E3","nsub":"\u2284","nsubE":"\u2AC5\u0338","nsube":"\u2288","nsubset":"\u2282\u20D2","nsubseteq":"\u2288","nsubseteqq":"\u2AC5\u0338","nsucc":"\u2281","nsucceq":"\u2AB0\u0338","nsup":"\u2285","nsupE":"\u2AC6\u0338","nsupe":"\u2289","nsupset":"\u2283\u20D2","nsupseteq":"\u2289","nsupseteqq":"\u2AC6\u0338","ntgl":"\u2279","Ntilde":"\u00D1","ntilde":"\u00F1","ntlg":"\u2278","ntriangleleft":"\u22EA","ntrianglelefteq":"\u22EC","ntriangleright":"\u22EB","ntrianglerighteq":"\u22ED","Nu":"\u039D","nu":"\u03BD","num":"#","numero":"\u2116","numsp":"\u2007","nvap":"\u224D\u20D2","nvdash":"\u22AC","nvDash":"\u22AD","nVdash":"\u22AE","nVDash":"\u22AF","nvge":"\u2265\u20D2","nvgt":">\u20D2","nvHarr":"\u2904","nvinfin":"\u29DE","nvlArr":"\u2902","nvle":"\u2264\u20D2","nvlt":"<\u20D2","nvltrie":"\u22B4\u20D2","nvrArr":"\u2903","nvrtrie":"\u22B5\u20D2","nvsim":"\u223C\u20D2","nwarhk":"\u2923","nwarr":"\u2196","nwArr":"\u21D6","nwarrow":"\u2196","nwnear":"\u2927","Oacute":"\u00D3","oacute":"\u00F3","oast":"\u229B","Ocirc":"\u00D4","ocirc":"\u00F4","ocir":"\u229A","Ocy":"\u041E","ocy":"\u043E","odash":"\u229D","Odblac":"\u0150","odblac":"\u0151","odiv":"\u2A38","odot":"\u2299","odsold":"\u29BC","OElig":"\u0152","oelig":"\u0153","ofcir":"\u29BF","Ofr":"\uD835\uDD12","ofr":"\uD835\uDD2C","ogon":"\u02DB","Ograve":"\u00D2","ograve":"\u00F2","ogt":"\u29C1","ohbar":"\u29B5","ohm":"\u03A9","oint":"\u222E","olarr":"\u21BA","olcir":"\u29BE","olcross":"\u29BB","oline":"\u203E","olt":"\u29C0","Omacr":"\u014C","omacr":"\u014D","Omega":"\u03A9","omega":"\u03C9","Omicron":"\u039F","omicron":"\u03BF","omid":"\u29B6","ominus":"\u2296","Oopf":"\uD835\uDD46","oopf":"\uD835\uDD60","opar":"\u29B7","OpenCurlyDoubleQuote":"\u201C","OpenCurlyQuote":"\u2018","operp":"\u29B9","oplus":"\u2295","orarr":"\u21BB","Or":"\u2A54","or":"\u2228","ord":"\u2A5D","order":"\u2134","orderof":"\u2134","ordf":"\u00AA","ordm":"\u00BA","origof":"\u22B6","oror":"\u2A56","orslope":"\u2A57","orv":"\u2A5B","oS":"\u24C8","Oscr":"\uD835\uDCAA","oscr":"\u2134","Oslash":"\u00D8","oslash":"\u00F8","osol":"\u2298","Otilde":"\u00D5","otilde":"\u00F5","otimesas":"\u2A36","Otimes":"\u2A37","otimes":"\u2297","Ouml":"\u00D6","ouml":"\u00F6","ovbar":"\u233D","OverBar":"\u203E","OverBrace":"\u23DE","OverBracket":"\u23B4","OverParenthesis":"\u23DC","para":"\u00B6","parallel":"\u2225","par":"\u2225","parsim":"\u2AF3","parsl":"\u2AFD","part":"\u2202","PartialD":"\u2202","Pcy":"\u041F","pcy":"\u043F","percnt":"%","period":".","permil":"\u2030","perp":"\u22A5","pertenk":"\u2031","Pfr":"\uD835\uDD13","pfr":"\uD835\uDD2D","Phi":"\u03A6","phi":"\u03C6","phiv":"\u03D5","phmmat":"\u2133","phone":"\u260E","Pi":"\u03A0","pi":"\u03C0","pitchfork":"\u22D4","piv":"\u03D6","planck":"\u210F","planckh":"\u210E","plankv":"\u210F","plusacir":"\u2A23","plusb":"\u229E","pluscir":"\u2A22","plus":"+","plusdo":"\u2214","plusdu":"\u2A25","pluse":"\u2A72","PlusMinus":"\u00B1","plusmn":"\u00B1","plussim":"\u2A26","plustwo":"\u2A27","pm":"\u00B1","Poincareplane":"\u210C","pointint":"\u2A15","popf":"\uD835\uDD61","Popf":"\u2119","pound":"\u00A3","prap":"\u2AB7","Pr":"\u2ABB","pr":"\u227A","prcue":"\u227C","precapprox":"\u2AB7","prec":"\u227A","preccurlyeq":"\u227C","Precedes":"\u227A","PrecedesEqual":"\u2AAF","PrecedesSlantEqual":"\u227C","PrecedesTilde":"\u227E","preceq":"\u2AAF","precnapprox":"\u2AB9","precneqq":"\u2AB5","precnsim":"\u22E8","pre":"\u2AAF","prE":"\u2AB3","precsim":"\u227E","prime":"\u2032","Prime":"\u2033","primes":"\u2119","prnap":"\u2AB9","prnE":"\u2AB5","prnsim":"\u22E8","prod":"\u220F","Product":"\u220F","profalar":"\u232E","profline":"\u2312","profsurf":"\u2313","prop":"\u221D","Proportional":"\u221D","Proportion":"\u2237","propto":"\u221D","prsim":"\u227E","prurel":"\u22B0","Pscr":"\uD835\uDCAB","pscr":"\uD835\uDCC5","Psi":"\u03A8","psi":"\u03C8","puncsp":"\u2008","Qfr":"\uD835\uDD14","qfr":"\uD835\uDD2E","qint":"\u2A0C","qopf":"\uD835\uDD62","Qopf":"\u211A","qprime":"\u2057","Qscr":"\uD835\uDCAC","qscr":"\uD835\uDCC6","quaternions":"\u210D","quatint":"\u2A16","quest":"?","questeq":"\u225F","quot":"\"","QUOT":"\"","rAarr":"\u21DB","race":"\u223D\u0331","Racute":"\u0154","racute":"\u0155","radic":"\u221A","raemptyv":"\u29B3","rang":"\u27E9","Rang":"\u27EB","rangd":"\u2992","range":"\u29A5","rangle":"\u27E9","raquo":"\u00BB","rarrap":"\u2975","rarrb":"\u21E5","rarrbfs":"\u2920","rarrc":"\u2933","rarr":"\u2192","Rarr":"\u21A0","rArr":"\u21D2","rarrfs":"\u291E","rarrhk":"\u21AA","rarrlp":"\u21AC","rarrpl":"\u2945","rarrsim":"\u2974","Rarrtl":"\u2916","rarrtl":"\u21A3","rarrw":"\u219D","ratail":"\u291A","rAtail":"\u291C","ratio":"\u2236","rationals":"\u211A","rbarr":"\u290D","rBarr":"\u290F","RBarr":"\u2910","rbbrk":"\u2773","rbrace":"}","rbrack":"]","rbrke":"\u298C","rbrksld":"\u298E","rbrkslu":"\u2990","Rcaron":"\u0158","rcaron":"\u0159","Rcedil":"\u0156","rcedil":"\u0157","rceil":"\u2309","rcub":"}","Rcy":"\u0420","rcy":"\u0440","rdca":"\u2937","rdldhar":"\u2969","rdquo":"\u201D","rdquor":"\u201D","rdsh":"\u21B3","real":"\u211C","realine":"\u211B","realpart":"\u211C","reals":"\u211D","Re":"\u211C","rect":"\u25AD","reg":"\u00AE","REG":"\u00AE","ReverseElement":"\u220B","ReverseEquilibrium":"\u21CB","ReverseUpEquilibrium":"\u296F","rfisht":"\u297D","rfloor":"\u230B","rfr":"\uD835\uDD2F","Rfr":"\u211C","rHar":"\u2964","rhard":"\u21C1","rharu":"\u21C0","rharul":"\u296C","Rho":"\u03A1","rho":"\u03C1","rhov":"\u03F1","RightAngleBracket":"\u27E9","RightArrowBar":"\u21E5","rightarrow":"\u2192","RightArrow":"\u2192","Rightarrow":"\u21D2","RightArrowLeftArrow":"\u21C4","rightarrowtail":"\u21A3","RightCeiling":"\u2309","RightDoubleBracket":"\u27E7","RightDownTeeVector":"\u295D","RightDownVectorBar":"\u2955","RightDownVector":"\u21C2","RightFloor":"\u230B","rightharpoondown":"\u21C1","rightharpoonup":"\u21C0","rightleftarrows":"\u21C4","rightleftharpoons":"\u21CC","rightrightarrows":"\u21C9","rightsquigarrow":"\u219D","RightTeeArrow":"\u21A6","RightTee":"\u22A2","RightTeeVector":"\u295B","rightthreetimes":"\u22CC","RightTriangleBar":"\u29D0","RightTriangle":"\u22B3","RightTriangleEqual":"\u22B5","RightUpDownVector":"\u294F","RightUpTeeVector":"\u295C","RightUpVectorBar":"\u2954","RightUpVector":"\u21BE","RightVectorBar":"\u2953","RightVector":"\u21C0","ring":"\u02DA","risingdotseq":"\u2253","rlarr":"\u21C4","rlhar":"\u21CC","rlm":"\u200F","rmoustache":"\u23B1","rmoust":"\u23B1","rnmid":"\u2AEE","roang":"\u27ED","roarr":"\u21FE","robrk":"\u27E7","ropar":"\u2986","ropf":"\uD835\uDD63","Ropf":"\u211D","roplus":"\u2A2E","rotimes":"\u2A35","RoundImplies":"\u2970","rpar":")","rpargt":"\u2994","rppolint":"\u2A12","rrarr":"\u21C9","Rrightarrow":"\u21DB","rsaquo":"\u203A","rscr":"\uD835\uDCC7","Rscr":"\u211B","rsh":"\u21B1","Rsh":"\u21B1","rsqb":"]","rsquo":"\u2019","rsquor":"\u2019","rthree":"\u22CC","rtimes":"\u22CA","rtri":"\u25B9","rtrie":"\u22B5","rtrif":"\u25B8","rtriltri":"\u29CE","RuleDelayed":"\u29F4","ruluhar":"\u2968","rx":"\u211E","Sacute":"\u015A","sacute":"\u015B","sbquo":"\u201A","scap":"\u2AB8","Scaron":"\u0160","scaron":"\u0161","Sc":"\u2ABC","sc":"\u227B","sccue":"\u227D","sce":"\u2AB0","scE":"\u2AB4","Scedil":"\u015E","scedil":"\u015F","Scirc":"\u015C","scirc":"\u015D","scnap":"\u2ABA","scnE":"\u2AB6","scnsim":"\u22E9","scpolint":"\u2A13","scsim":"\u227F","Scy":"\u0421","scy":"\u0441","sdotb":"\u22A1","sdot":"\u22C5","sdote":"\u2A66","searhk":"\u2925","searr":"\u2198","seArr":"\u21D8","searrow":"\u2198","sect":"\u00A7","semi":";","seswar":"\u2929","setminus":"\u2216","setmn":"\u2216","sext":"\u2736","Sfr":"\uD835\uDD16","sfr":"\uD835\uDD30","sfrown":"\u2322","sharp":"\u266F","SHCHcy":"\u0429","shchcy":"\u0449","SHcy":"\u0428","shcy":"\u0448","ShortDownArrow":"\u2193","ShortLeftArrow":"\u2190","shortmid":"\u2223","shortparallel":"\u2225","ShortRightArrow":"\u2192","ShortUpArrow":"\u2191","shy":"\u00AD","Sigma":"\u03A3","sigma":"\u03C3","sigmaf":"\u03C2","sigmav":"\u03C2","sim":"\u223C","simdot":"\u2A6A","sime":"\u2243","simeq":"\u2243","simg":"\u2A9E","simgE":"\u2AA0","siml":"\u2A9D","simlE":"\u2A9F","simne":"\u2246","simplus":"\u2A24","simrarr":"\u2972","slarr":"\u2190","SmallCircle":"\u2218","smallsetminus":"\u2216","smashp":"\u2A33","smeparsl":"\u29E4","smid":"\u2223","smile":"\u2323","smt":"\u2AAA","smte":"\u2AAC","smtes":"\u2AAC\uFE00","SOFTcy":"\u042C","softcy":"\u044C","solbar":"\u233F","solb":"\u29C4","sol":"/","Sopf":"\uD835\uDD4A","sopf":"\uD835\uDD64","spades":"\u2660","spadesuit":"\u2660","spar":"\u2225","sqcap":"\u2293","sqcaps":"\u2293\uFE00","sqcup":"\u2294","sqcups":"\u2294\uFE00","Sqrt":"\u221A","sqsub":"\u228F","sqsube":"\u2291","sqsubset":"\u228F","sqsubseteq":"\u2291","sqsup":"\u2290","sqsupe":"\u2292","sqsupset":"\u2290","sqsupseteq":"\u2292","square":"\u25A1","Square":"\u25A1","SquareIntersection":"\u2293","SquareSubset":"\u228F","SquareSubsetEqual":"\u2291","SquareSuperset":"\u2290","SquareSupersetEqual":"\u2292","SquareUnion":"\u2294","squarf":"\u25AA","squ":"\u25A1","squf":"\u25AA","srarr":"\u2192","Sscr":"\uD835\uDCAE","sscr":"\uD835\uDCC8","ssetmn":"\u2216","ssmile":"\u2323","sstarf":"\u22C6","Star":"\u22C6","star":"\u2606","starf":"\u2605","straightepsilon":"\u03F5","straightphi":"\u03D5","strns":"\u00AF","sub":"\u2282","Sub":"\u22D0","subdot":"\u2ABD","subE":"\u2AC5","sube":"\u2286","subedot":"\u2AC3","submult":"\u2AC1","subnE":"\u2ACB","subne":"\u228A","subplus":"\u2ABF","subrarr":"\u2979","subset":"\u2282","Subset":"\u22D0","subseteq":"\u2286","subseteqq":"\u2AC5","SubsetEqual":"\u2286","subsetneq":"\u228A","subsetneqq":"\u2ACB","subsim":"\u2AC7","subsub":"\u2AD5","subsup":"\u2AD3","succapprox":"\u2AB8","succ":"\u227B","succcurlyeq":"\u227D","Succeeds":"\u227B","SucceedsEqual":"\u2AB0","SucceedsSlantEqual":"\u227D","SucceedsTilde":"\u227F","succeq":"\u2AB0","succnapprox":"\u2ABA","succneqq":"\u2AB6","succnsim":"\u22E9","succsim":"\u227F","SuchThat":"\u220B","sum":"\u2211","Sum":"\u2211","sung":"\u266A","sup1":"\u00B9","sup2":"\u00B2","sup3":"\u00B3","sup":"\u2283","Sup":"\u22D1","supdot":"\u2ABE","supdsub":"\u2AD8","supE":"\u2AC6","supe":"\u2287","supedot":"\u2AC4","Superset":"\u2283","SupersetEqual":"\u2287","suphsol":"\u27C9","suphsub":"\u2AD7","suplarr":"\u297B","supmult":"\u2AC2","supnE":"\u2ACC","supne":"\u228B","supplus":"\u2AC0","supset":"\u2283","Supset":"\u22D1","supseteq":"\u2287","supseteqq":"\u2AC6","supsetneq":"\u228B","supsetneqq":"\u2ACC","supsim":"\u2AC8","supsub":"\u2AD4","supsup":"\u2AD6","swarhk":"\u2926","swarr":"\u2199","swArr":"\u21D9","swarrow":"\u2199","swnwar":"\u292A","szlig":"\u00DF","Tab":"\t","target":"\u2316","Tau":"\u03A4","tau":"\u03C4","tbrk":"\u23B4","Tcaron":"\u0164","tcaron":"\u0165","Tcedil":"\u0162","tcedil":"\u0163","Tcy":"\u0422","tcy":"\u0442","tdot":"\u20DB","telrec":"\u2315","Tfr":"\uD835\uDD17","tfr":"\uD835\uDD31","there4":"\u2234","therefore":"\u2234","Therefore":"\u2234","Theta":"\u0398","theta":"\u03B8","thetasym":"\u03D1","thetav":"\u03D1","thickapprox":"\u2248","thicksim":"\u223C","ThickSpace":"\u205F\u200A","ThinSpace":"\u2009","thinsp":"\u2009","thkap":"\u2248","thksim":"\u223C","THORN":"\u00DE","thorn":"\u00FE","tilde":"\u02DC","Tilde":"\u223C","TildeEqual":"\u2243","TildeFullEqual":"\u2245","TildeTilde":"\u2248","timesbar":"\u2A31","timesb":"\u22A0","times":"\u00D7","timesd":"\u2A30","tint":"\u222D","toea":"\u2928","topbot":"\u2336","topcir":"\u2AF1","top":"\u22A4","Topf":"\uD835\uDD4B","topf":"\uD835\uDD65","topfork":"\u2ADA","tosa":"\u2929","tprime":"\u2034","trade":"\u2122","TRADE":"\u2122","triangle":"\u25B5","triangledown":"\u25BF","triangleleft":"\u25C3","trianglelefteq":"\u22B4","triangleq":"\u225C","triangleright":"\u25B9","trianglerighteq":"\u22B5","tridot":"\u25EC","trie":"\u225C","triminus":"\u2A3A","TripleDot":"\u20DB","triplus":"\u2A39","trisb":"\u29CD","tritime":"\u2A3B","trpezium":"\u23E2","Tscr":"\uD835\uDCAF","tscr":"\uD835\uDCC9","TScy":"\u0426","tscy":"\u0446","TSHcy":"\u040B","tshcy":"\u045B","Tstrok":"\u0166","tstrok":"\u0167","twixt":"\u226C","twoheadleftarrow":"\u219E","twoheadrightarrow":"\u21A0","Uacute":"\u00DA","uacute":"\u00FA","uarr":"\u2191","Uarr":"\u219F","uArr":"\u21D1","Uarrocir":"\u2949","Ubrcy":"\u040E","ubrcy":"\u045E","Ubreve":"\u016C","ubreve":"\u016D","Ucirc":"\u00DB","ucirc":"\u00FB","Ucy":"\u0423","ucy":"\u0443","udarr":"\u21C5","Udblac":"\u0170","udblac":"\u0171","udhar":"\u296E","ufisht":"\u297E","Ufr":"\uD835\uDD18","ufr":"\uD835\uDD32","Ugrave":"\u00D9","ugrave":"\u00F9","uHar":"\u2963","uharl":"\u21BF","uharr":"\u21BE","uhblk":"\u2580","ulcorn":"\u231C","ulcorner":"\u231C","ulcrop":"\u230F","ultri":"\u25F8","Umacr":"\u016A","umacr":"\u016B","uml":"\u00A8","UnderBar":"_","UnderBrace":"\u23DF","UnderBracket":"\u23B5","UnderParenthesis":"\u23DD","Union":"\u22C3","UnionPlus":"\u228E","Uogon":"\u0172","uogon":"\u0173","Uopf":"\uD835\uDD4C","uopf":"\uD835\uDD66","UpArrowBar":"\u2912","uparrow":"\u2191","UpArrow":"\u2191","Uparrow":"\u21D1","UpArrowDownArrow":"\u21C5","updownarrow":"\u2195","UpDownArrow":"\u2195","Updownarrow":"\u21D5","UpEquilibrium":"\u296E","upharpoonleft":"\u21BF","upharpoonright":"\u21BE","uplus":"\u228E","UpperLeftArrow":"\u2196","UpperRightArrow":"\u2197","upsi":"\u03C5","Upsi":"\u03D2","upsih":"\u03D2","Upsilon":"\u03A5","upsilon":"\u03C5","UpTeeArrow":"\u21A5","UpTee":"\u22A5","upuparrows":"\u21C8","urcorn":"\u231D","urcorner":"\u231D","urcrop":"\u230E","Uring":"\u016E","uring":"\u016F","urtri":"\u25F9","Uscr":"\uD835\uDCB0","uscr":"\uD835\uDCCA","utdot":"\u22F0","Utilde":"\u0168","utilde":"\u0169","utri":"\u25B5","utrif":"\u25B4","uuarr":"\u21C8","Uuml":"\u00DC","uuml":"\u00FC","uwangle":"\u29A7","vangrt":"\u299C","varepsilon":"\u03F5","varkappa":"\u03F0","varnothing":"\u2205","varphi":"\u03D5","varpi":"\u03D6","varpropto":"\u221D","varr":"\u2195","vArr":"\u21D5","varrho":"\u03F1","varsigma":"\u03C2","varsubsetneq":"\u228A\uFE00","varsubsetneqq":"\u2ACB\uFE00","varsupsetneq":"\u228B\uFE00","varsupsetneqq":"\u2ACC\uFE00","vartheta":"\u03D1","vartriangleleft":"\u22B2","vartriangleright":"\u22B3","vBar":"\u2AE8","Vbar":"\u2AEB","vBarv":"\u2AE9","Vcy":"\u0412","vcy":"\u0432","vdash":"\u22A2","vDash":"\u22A8","Vdash":"\u22A9","VDash":"\u22AB","Vdashl":"\u2AE6","veebar":"\u22BB","vee":"\u2228","Vee":"\u22C1","veeeq":"\u225A","vellip":"\u22EE","verbar":"|","Verbar":"\u2016","vert":"|","Vert":"\u2016","VerticalBar":"\u2223","VerticalLine":"|","VerticalSeparator":"\u2758","VerticalTilde":"\u2240","VeryThinSpace":"\u200A","Vfr":"\uD835\uDD19","vfr":"\uD835\uDD33","vltri":"\u22B2","vnsub":"\u2282\u20D2","vnsup":"\u2283\u20D2","Vopf":"\uD835\uDD4D","vopf":"\uD835\uDD67","vprop":"\u221D","vrtri":"\u22B3","Vscr":"\uD835\uDCB1","vscr":"\uD835\uDCCB","vsubnE":"\u2ACB\uFE00","vsubne":"\u228A\uFE00","vsupnE":"\u2ACC\uFE00","vsupne":"\u228B\uFE00","Vvdash":"\u22AA","vzigzag":"\u299A","Wcirc":"\u0174","wcirc":"\u0175","wedbar":"\u2A5F","wedge":"\u2227","Wedge":"\u22C0","wedgeq":"\u2259","weierp":"\u2118","Wfr":"\uD835\uDD1A","wfr":"\uD835\uDD34","Wopf":"\uD835\uDD4E","wopf":"\uD835\uDD68","wp":"\u2118","wr":"\u2240","wreath":"\u2240","Wscr":"\uD835\uDCB2","wscr":"\uD835\uDCCC","xcap":"\u22C2","xcirc":"\u25EF","xcup":"\u22C3","xdtri":"\u25BD","Xfr":"\uD835\uDD1B","xfr":"\uD835\uDD35","xharr":"\u27F7","xhArr":"\u27FA","Xi":"\u039E","xi":"\u03BE","xlarr":"\u27F5","xlArr":"\u27F8","xmap":"\u27FC","xnis":"\u22FB","xodot":"\u2A00","Xopf":"\uD835\uDD4F","xopf":"\uD835\uDD69","xoplus":"\u2A01","xotime":"\u2A02","xrarr":"\u27F6","xrArr":"\u27F9","Xscr":"\uD835\uDCB3","xscr":"\uD835\uDCCD","xsqcup":"\u2A06","xuplus":"\u2A04","xutri":"\u25B3","xvee":"\u22C1","xwedge":"\u22C0","Yacute":"\u00DD","yacute":"\u00FD","YAcy":"\u042F","yacy":"\u044F","Ycirc":"\u0176","ycirc":"\u0177","Ycy":"\u042B","ycy":"\u044B","yen":"\u00A5","Yfr":"\uD835\uDD1C","yfr":"\uD835\uDD36","YIcy":"\u0407","yicy":"\u0457","Yopf":"\uD835\uDD50","yopf":"\uD835\uDD6A","Yscr":"\uD835\uDCB4","yscr":"\uD835\uDCCE","YUcy":"\u042E","yucy":"\u044E","yuml":"\u00FF","Yuml":"\u0178","Zacute":"\u0179","zacute":"\u017A","Zcaron":"\u017D","zcaron":"\u017E","Zcy":"\u0417","zcy":"\u0437","Zdot":"\u017B","zdot":"\u017C","zeetrf":"\u2128","ZeroWidthSpace":"\u200B","Zeta":"\u0396","zeta":"\u03B6","zfr":"\uD835\uDD37","Zfr":"\u2128","ZHcy":"\u0416","zhcy":"\u0436","zigrarr":"\u21DD","zopf":"\uD835\uDD6B","Zopf":"\u2124","Zscr":"\uD835\uDCB5","zscr":"\uD835\uDCCF","zwj":"\u200D","zwnj":"\u200C"}
+},{}],53:[function(require,module,exports){
+'use strict';
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Helpers
+
+// Merge objects
+//
+function assign(obj /*from1, from2, from3, ...*/) {
+  var sources = Array.prototype.slice.call(arguments, 1);
+
+  sources.forEach(function (source) {
+    if (!source) { return; }
+
+    Object.keys(source).forEach(function (key) {
+      obj[key] = source[key];
+    });
+  });
+
+  return obj;
+}
+
+function _class(obj) { return Object.prototype.toString.call(obj); }
+function isString(obj) { return _class(obj) === '[object String]'; }
+function isObject(obj) { return _class(obj) === '[object Object]'; }
+function isRegExp(obj) { return _class(obj) === '[object RegExp]'; }
+function isFunction(obj) { return _class(obj) === '[object Function]'; }
+
+
+function escapeRE(str) { return str.replace(/[.?*+^$[\]\\(){}|-]/g, '\\$&'); }
+
+////////////////////////////////////////////////////////////////////////////////
+
+
+var defaultOptions = {
+  fuzzyLink: true,
+  fuzzyEmail: true,
+  fuzzyIP: false
+};
+
+
+function isOptionsObj(obj) {
+  return Object.keys(obj || {}).reduce(function (acc, k) {
+    return acc || defaultOptions.hasOwnProperty(k);
+  }, false);
+}
+
+
+var defaultSchemas = {
+  'http:': {
+    validate: function (text, pos, self) {
+      var tail = text.slice(pos);
+
+      if (!self.re.http) {
+        // compile lazily, because "host"-containing variables can change on tlds update.
+        self.re.http =  new RegExp(
+          '^\\/\\/' + self.re.src_auth + self.re.src_host_port_strict + self.re.src_path, 'i'
+        );
+      }
+      if (self.re.http.test(tail)) {
+        return tail.match(self.re.http)[0].length;
+      }
+      return 0;
+    }
+  },
+  'https:':  'http:',
+  'ftp:':    'http:',
+  '//':      {
+    validate: function (text, pos, self) {
+      var tail = text.slice(pos);
+
+      if (!self.re.no_http) {
+      // compile lazily, because "host"-containing variables can change on tlds update.
+        self.re.no_http =  new RegExp(
+          '^' +
+          self.re.src_auth +
+          // Don't allow single-level domains, because of false positives like '//test'
+          // with code comments
+          '(?:localhost|(?:(?:' + self.re.src_domain + ')\\.)+' + self.re.src_domain_root + ')' +
+          self.re.src_port +
+          self.re.src_host_terminator +
+          self.re.src_path,
+
+          'i'
+        );
+      }
+
+      if (self.re.no_http.test(tail)) {
+        // should not be `://` & `///`, that protects from errors in protocol name
+        if (pos >= 3 && text[pos - 3] === ':') { return 0; }
+        if (pos >= 3 && text[pos - 3] === '/') { return 0; }
+        return tail.match(self.re.no_http)[0].length;
+      }
+      return 0;
+    }
+  },
+  'mailto:': {
+    validate: function (text, pos, self) {
+      var tail = text.slice(pos);
+
+      if (!self.re.mailto) {
+        self.re.mailto =  new RegExp(
+          '^' + self.re.src_email_name + '@' + self.re.src_host_strict, 'i'
+        );
+      }
+      if (self.re.mailto.test(tail)) {
+        return tail.match(self.re.mailto)[0].length;
+      }
+      return 0;
+    }
+  }
+};
+
+/*eslint-disable max-len*/
+
+// RE pattern for 2-character tlds (autogenerated by ./support/tlds_2char_gen.js)
+var tlds_2ch_src_re = 'a[cdefgilmnoqrstuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrstuvwxyz]|n[acefgilopruz]|om|p[aefghklmnrstwy]|qa|r[eosuw]|s[abcdeghijklmnortuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]';
+
+// DON'T try to make PRs with changes. Extend TLDs with LinkifyIt.tlds() instead
+var tlds_default = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');
+
+/*eslint-enable max-len*/
+
+////////////////////////////////////////////////////////////////////////////////
+
+function resetScanCache(self) {
+  self.__index__ = -1;
+  self.__text_cache__   = '';
+}
+
+function createValidator(re) {
+  return function (text, pos) {
+    var tail = text.slice(pos);
+
+    if (re.test(tail)) {
+      return tail.match(re)[0].length;
+    }
+    return 0;
+  };
+}
+
+function createNormalizer() {
+  return function (match, self) {
+    self.normalize(match);
+  };
+}
+
+// Schemas compiler. Build regexps.
+//
+function compile(self) {
+
+  // Load & clone RE patterns.
+  var re = self.re = require('./lib/re')(self.__opts__);
+
+  // Define dynamic patterns
+  var tlds = self.__tlds__.slice();
+
+  self.onCompile();
+
+  if (!self.__tlds_replaced__) {
+    tlds.push(tlds_2ch_src_re);
+  }
+  tlds.push(re.src_xn);
+
+  re.src_tlds = tlds.join('|');
+
+  function untpl(tpl) { return tpl.replace('%TLDS%', re.src_tlds); }
+
+  re.email_fuzzy      = RegExp(untpl(re.tpl_email_fuzzy), 'i');
+  re.link_fuzzy       = RegExp(untpl(re.tpl_link_fuzzy), 'i');
+  re.link_no_ip_fuzzy = RegExp(untpl(re.tpl_link_no_ip_fuzzy), 'i');
+  re.host_fuzzy_test  = RegExp(untpl(re.tpl_host_fuzzy_test), 'i');
+
+  //
+  // Compile each schema
+  //
+
+  var aliases = [];
+
+  self.__compiled__ = {}; // Reset compiled data
+
+  function schemaError(name, val) {
+    throw new Error('(LinkifyIt) Invalid schema "' + name + '": ' + val);
+  }
+
+  Object.keys(self.__schemas__).forEach(function (name) {
+    var val = self.__schemas__[name];
+
+    // skip disabled methods
+    if (val === null) { return; }
+
+    var compiled = { validate: null, link: null };
+
+    self.__compiled__[name] = compiled;
+
+    if (isObject(val)) {
+      if (isRegExp(val.validate)) {
+        compiled.validate = createValidator(val.validate);
+      } else if (isFunction(val.validate)) {
+        compiled.validate = val.validate;
+      } else {
+        schemaError(name, val);
+      }
+
+      if (isFunction(val.normalize)) {
+        compiled.normalize = val.normalize;
+      } else if (!val.normalize) {
+        compiled.normalize = createNormalizer();
+      } else {
+        schemaError(name, val);
+      }
+
+      return;
+    }
+
+    if (isString(val)) {
+      aliases.push(name);
+      return;
+    }
+
+    schemaError(name, val);
+  });
+
+  //
+  // Compile postponed aliases
+  //
+
+  aliases.forEach(function (alias) {
+    if (!self.__compiled__[self.__schemas__[alias]]) {
+      // Silently fail on missed schemas to avoid errons on disable.
+      // schemaError(alias, self.__schemas__[alias]);
+      return;
+    }
+
+    self.__compiled__[alias].validate =
+      self.__compiled__[self.__schemas__[alias]].validate;
+    self.__compiled__[alias].normalize =
+      self.__compiled__[self.__schemas__[alias]].normalize;
+  });
+
+  //
+  // Fake record for guessed links
+  //
+  self.__compiled__[''] = { validate: null, normalize: createNormalizer() };
+
+  //
+  // Build schema condition
+  //
+  var slist = Object.keys(self.__compiled__)
+                      .filter(function (name) {
+                        // Filter disabled & fake schemas
+                        return name.length > 0 && self.__compiled__[name];
+                      })
+                      .map(escapeRE)
+                      .join('|');
+  // (?!_) cause 1.5x slowdown
+  self.re.schema_test   = RegExp('(^|(?!_)(?:[><\uff5c]|' + re.src_ZPCc + '))(' + slist + ')', 'i');
+  self.re.schema_search = RegExp('(^|(?!_)(?:[><\uff5c]|' + re.src_ZPCc + '))(' + slist + ')', 'ig');
+
+  self.re.pretest       = RegExp(
+                            '(' + self.re.schema_test.source + ')|' +
+                            '(' + self.re.host_fuzzy_test.source + ')|' +
+                            '@',
+                            'i');
+
+  //
+  // Cleanup
+  //
+
+  resetScanCache(self);
+}
+
+/**
+ * class Match
+ *
+ * Match result. Single element of array, returned by [[LinkifyIt#match]]
+ **/
+function Match(self, shift) {
+  var start = self.__index__,
+      end   = self.__last_index__,
+      text  = self.__text_cache__.slice(start, end);
+
+  /**
+   * Match#schema -> String
+   *
+   * Prefix (protocol) for matched string.
+   **/
+  this.schema    = self.__schema__.toLowerCase();
+  /**
+   * Match#index -> Number
+   *
+   * First position of matched string.
+   **/
+  this.index     = start + shift;
+  /**
+   * Match#lastIndex -> Number
+   *
+   * Next position after matched string.
+   **/
+  this.lastIndex = end + shift;
+  /**
+   * Match#raw -> String
+   *
+   * Matched string.
+   **/
+  this.raw       = text;
+  /**
+   * Match#text -> String
+   *
+   * Notmalized text of matched string.
+   **/
+  this.text      = text;
+  /**
+   * Match#url -> String
+   *
+   * Normalized url of matched string.
+   **/
+  this.url       = text;
+}
+
+function createMatch(self, shift) {
+  var match = new Match(self, shift);
+
+  self.__compiled__[match.schema].normalize(match, self);
+
+  return match;
+}
+
+
+/**
+ * class LinkifyIt
+ **/
+
+/**
+ * new LinkifyIt(schemas, options)
+ * - schemas (Object): Optional. Additional schemas to validate (prefix/validator)
+ * - options (Object): { fuzzyLink|fuzzyEmail|fuzzyIP: true|false }
+ *
+ * Creates new linkifier instance with optional additional schemas.
+ * Can be called without `new` keyword for convenience.
+ *
+ * By default understands:
+ *
+ * - `http(s)://...` , `ftp://...`, `mailto:...` & `//...` links
+ * - "fuzzy" links and emails (example.com, foo@bar.com).
+ *
+ * `schemas` is an object, where each key/value describes protocol/rule:
+ *
+ * - __key__ - link prefix (usually, protocol name with `:` at the end, `skype:`
+ *   for example). `linkify-it` makes shure that prefix is not preceeded with
+ *   alphanumeric char and symbols. Only whitespaces and punctuation allowed.
+ * - __value__ - rule to check tail after link prefix
+ *   - _String_ - just alias to existing rule
+ *   - _Object_
+ *     - _validate_ - validator function (should return matched length on success),
+ *       or `RegExp`.
+ *     - _normalize_ - optional function to normalize text & url of matched result
+ *       (for example, for @twitter mentions).
+ *
+ * `options`:
+ *
+ * - __fuzzyLink__ - recognige URL-s without `http(s):` prefix. Default `true`.
+ * - __fuzzyIP__ - allow IPs in fuzzy links above. Can conflict with some texts
+ *   like version numbers. Default `false`.
+ * - __fuzzyEmail__ - recognize emails without `mailto:` prefix.
+ *
+ **/
+function LinkifyIt(schemas, options) {
+  if (!(this instanceof LinkifyIt)) {
+    return new LinkifyIt(schemas, options);
+  }
+
+  if (!options) {
+    if (isOptionsObj(schemas)) {
+      options = schemas;
+      schemas = {};
+    }
+  }
+
+  this.__opts__           = assign({}, defaultOptions, options);
+
+  // Cache last tested result. Used to skip repeating steps on next `match` call.
+  this.__index__          = -1;
+  this.__last_index__     = -1; // Next scan position
+  this.__schema__         = '';
+  this.__text_cache__     = '';
+
+  this.__schemas__        = assign({}, defaultSchemas, schemas);
+  this.__compiled__       = {};
+
+  this.__tlds__           = tlds_default;
+  this.__tlds_replaced__  = false;
+
+  this.re = {};
+
+  compile(this);
+}
+
+
+/** chainable
+ * LinkifyIt#add(schema, definition)
+ * - schema (String): rule name (fixed pattern prefix)
+ * - definition (String|RegExp|Object): schema definition
+ *
+ * Add new rule definition. See constructor description for details.
+ **/
+LinkifyIt.prototype.add = function add(schema, definition) {
+  this.__schemas__[schema] = definition;
+  compile(this);
+  return this;
+};
+
+
+/** chainable
+ * LinkifyIt#set(options)
+ * - options (Object): { fuzzyLink|fuzzyEmail|fuzzyIP: true|false }
+ *
+ * Set recognition options for links without schema.
+ **/
+LinkifyIt.prototype.set = function set(options) {
+  this.__opts__ = assign(this.__opts__, options);
+  return this;
+};
+
+
+/**
+ * LinkifyIt#test(text) -> Boolean
+ *
+ * Searches linkifiable pattern and returns `true` on success or `false` on fail.
+ **/
+LinkifyIt.prototype.test = function test(text) {
+  // Reset scan cache
+  this.__text_cache__ = text;
+  this.__index__      = -1;
+
+  if (!text.length) { return false; }
+
+  var m, ml, me, len, shift, next, re, tld_pos, at_pos;
+
+  // try to scan for link with schema - that's the most simple rule
+  if (this.re.schema_test.test(text)) {
+    re = this.re.schema_search;
+    re.lastIndex = 0;
+    while ((m = re.exec(text)) !== null) {
+      len = this.testSchemaAt(text, m[2], re.lastIndex);
+      if (len) {
+        this.__schema__     = m[2];
+        this.__index__      = m.index + m[1].length;
+        this.__last_index__ = m.index + m[0].length + len;
+        break;
+      }
+    }
+  }
+
+  if (this.__opts__.fuzzyLink && this.__compiled__['http:']) {
+    // guess schemaless links
+    tld_pos = text.search(this.re.host_fuzzy_test);
+    if (tld_pos >= 0) {
+      // if tld is located after found link - no need to check fuzzy pattern
+      if (this.__index__ < 0 || tld_pos < this.__index__) {
+        if ((ml = text.match(this.__opts__.fuzzyIP ? this.re.link_fuzzy : this.re.link_no_ip_fuzzy)) !== null) {
+
+          shift = ml.index + ml[1].length;
+
+          if (this.__index__ < 0 || shift < this.__index__) {
+            this.__schema__     = '';
+            this.__index__      = shift;
+            this.__last_index__ = ml.index + ml[0].length;
+          }
+        }
+      }
+    }
+  }
+
+  if (this.__opts__.fuzzyEmail && this.__compiled__['mailto:']) {
+    // guess schemaless emails
+    at_pos = text.indexOf('@');
+    if (at_pos >= 0) {
+      // We can't skip this check, because this cases are possible:
+      // 192.168.1.1@gmail.com, my.in@example.com
+      if ((me = text.match(this.re.email_fuzzy)) !== null) {
+
+        shift = me.index + me[1].length;
+        next  = me.index + me[0].length;
+
+        if (this.__index__ < 0 || shift < this.__index__ ||
+            (shift === this.__index__ && next > this.__last_index__)) {
+          this.__schema__     = 'mailto:';
+          this.__index__      = shift;
+          this.__last_index__ = next;
+        }
+      }
+    }
+  }
+
+  return this.__index__ >= 0;
+};
+
+
+/**
+ * LinkifyIt#pretest(text) -> Boolean
+ *
+ * Very quick check, that can give false positives. Returns true if link MAY BE
+ * can exists. Can be used for speed optimization, when you need to check that
+ * link NOT exists.
+ **/
+LinkifyIt.prototype.pretest = function pretest(text) {
+  return this.re.pretest.test(text);
+};
+
+
+/**
+ * LinkifyIt#testSchemaAt(text, name, position) -> Number
+ * - text (String): text to scan
+ * - name (String): rule (schema) name
+ * - position (Number): text offset to check from
+ *
+ * Similar to [[LinkifyIt#test]] but checks only specific protocol tail exactly
+ * at given position. Returns length of found pattern (0 on fail).
+ **/
+LinkifyIt.prototype.testSchemaAt = function testSchemaAt(text, schema, pos) {
+  // If not supported schema check requested - terminate
+  if (!this.__compiled__[schema.toLowerCase()]) {
+    return 0;
+  }
+  return this.__compiled__[schema.toLowerCase()].validate(text, pos, this);
+};
+
+
+/**
+ * LinkifyIt#match(text) -> Array|null
+ *
+ * Returns array of found link descriptions or `null` on fail. We strongly
+ * recommend to use [[LinkifyIt#test]] first, for best speed.
+ *
+ * ##### Result match description
+ *
+ * - __schema__ - link schema, can be empty for fuzzy links, or `//` for
+ *   protocol-neutral  links.
+ * - __index__ - offset of matched text
+ * - __lastIndex__ - index of next char after mathch end
+ * - __raw__ - matched text
+ * - __text__ - normalized text
+ * - __url__ - link, generated from matched text
+ **/
+LinkifyIt.prototype.match = function match(text) {
+  var shift = 0, result = [];
+
+  // Try to take previous element from cache, if .test() called before
+  if (this.__index__ >= 0 && this.__text_cache__ === text) {
+    result.push(createMatch(this, shift));
+    shift = this.__last_index__;
+  }
+
+  // Cut head if cache was used
+  var tail = shift ? text.slice(shift) : text;
+
+  // Scan string until end reached
+  while (this.test(tail)) {
+    result.push(createMatch(this, shift));
+
+    tail = tail.slice(this.__last_index__);
+    shift += this.__last_index__;
+  }
+
+  if (result.length) {
+    return result;
+  }
+
+  return null;
+};
+
+
+/** chainable
+ * LinkifyIt#tlds(list [, keepOld]) -> this
+ * - list (Array): list of tlds
+ * - keepOld (Boolean): merge with current list if `true` (`false` by default)
+ *
+ * Load (or merge) new tlds list. Those are user for fuzzy links (without prefix)
+ * to avoid false positives. By default this algorythm used:
+ *
+ * - hostname with any 2-letter root zones are ok.
+ * - biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф
+ *   are ok.
+ * - encoded (`xn--...`) root zones are ok.
+ *
+ * If list is replaced, then exact match for 2-chars root zones will be checked.
+ **/
+LinkifyIt.prototype.tlds = function tlds(list, keepOld) {
+  list = Array.isArray(list) ? list : [ list ];
+
+  if (!keepOld) {
+    this.__tlds__ = list.slice();
+    this.__tlds_replaced__ = true;
+    compile(this);
+    return this;
+  }
+
+  this.__tlds__ = this.__tlds__.concat(list)
+                                  .sort()
+                                  .filter(function (el, idx, arr) {
+                                    return el !== arr[idx - 1];
+                                  })
+                                  .reverse();
+
+  compile(this);
+  return this;
+};
+
+/**
+ * LinkifyIt#normalize(match)
+ *
+ * Default normalizer (if schema does not define it's own).
+ **/
+LinkifyIt.prototype.normalize = function normalize(match) {
+
+  // Do minimal possible changes by default. Need to collect feedback prior
+  // to move forward https://github.com/markdown-it/linkify-it/issues/1
+
+  if (!match.schema) { match.url = 'http://' + match.url; }
+
+  if (match.schema === 'mailto:' && !/^mailto:/i.test(match.url)) {
+    match.url = 'mailto:' + match.url;
+  }
+};
+
+
+/**
+ * LinkifyIt#onCompile()
+ *
+ * Override to modify basic RegExp-s.
+ **/
+LinkifyIt.prototype.onCompile = function onCompile() {
+};
+
+
+module.exports = LinkifyIt;
+
+},{"./lib/re":54}],54:[function(require,module,exports){
+'use strict';
+
+
+module.exports = function (opts) {
+  var re = {};
+
+  // Use direct extract instead of `regenerate` to reduse browserified size
+  re.src_Any = require('uc.micro/properties/Any/regex').source;
+  re.src_Cc  = require('uc.micro/categories/Cc/regex').source;
+  re.src_Z   = require('uc.micro/categories/Z/regex').source;
+  re.src_P   = require('uc.micro/categories/P/regex').source;
+
+  // \p{\Z\P\Cc\CF} (white spaces + control + format + punctuation)
+  re.src_ZPCc = [ re.src_Z, re.src_P, re.src_Cc ].join('|');
+
+  // \p{\Z\Cc} (white spaces + control)
+  re.src_ZCc = [ re.src_Z, re.src_Cc ].join('|');
+
+  // Experimental. List of chars, completely prohibited in links
+  // because can separate it from other part of text
+  var text_separators = '[><\uff5c]';
+
+  // All possible word characters (everything without punctuation, spaces & controls)
+  // Defined via punctuation & spaces to save space
+  // Should be something like \p{\L\N\S\M} (\w but without `_`)
+  re.src_pseudo_letter       = '(?:(?!' + text_separators + '|' + re.src_ZPCc + ')' + re.src_Any + ')';
+  // The same as abothe but without [0-9]
+  // var src_pseudo_letter_non_d = '(?:(?![0-9]|' + src_ZPCc + ')' + src_Any + ')';
+
+  ////////////////////////////////////////////////////////////////////////////////
+
+  re.src_ip4 =
+
+    '(?:(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
+
+  // Prohibit any of "@/[]()" in user/pass to avoid wrong domain fetch.
+  re.src_auth    = '(?:(?:(?!' + re.src_ZCc + '|[@/\\[\\]()]).)+@)?';
+
+  re.src_port =
+
+    '(?::(?:6(?:[0-4]\\d{3}|5(?:[0-4]\\d{2}|5(?:[0-2]\\d|3[0-5])))|[1-5]?\\d{1,4}))?';
+
+  re.src_host_terminator =
+
+    '(?=$|' + text_separators + '|' + re.src_ZPCc + ')(?!-|_|:\\d|\\.-|\\.(?!$|' + re.src_ZPCc + '))';
+
+  re.src_path =
+
+    '(?:' +
+      '[/?#]' +
+        '(?:' +
+          '(?!' + re.src_ZCc + '|' + text_separators + '|[()[\\]{}.,"\'?!\\-]).|' +
+          '\\[(?:(?!' + re.src_ZCc + '|\\]).)*\\]|' +
+          '\\((?:(?!' + re.src_ZCc + '|[)]).)*\\)|' +
+          '\\{(?:(?!' + re.src_ZCc + '|[}]).)*\\}|' +
+          '\\"(?:(?!' + re.src_ZCc + '|["]).)+\\"|' +
+          "\\'(?:(?!" + re.src_ZCc + "|[']).)+\\'|" +
+          "\\'(?=" + re.src_pseudo_letter + '|[-]).|' +  // allow `I'm_king` if no pair found
+          '\\.{2,3}[a-zA-Z0-9%/]|' + // github has ... in commit range links. Restrict to
+                                     // - english
+                                     // - percent-encoded
+                                     // - parts of file path
+                                     // until more examples found.
+          '\\.(?!' + re.src_ZCc + '|[.]).|' +
+          (opts && opts['---'] ?
+            '\\-(?!--(?:[^-]|$))(?:-*)|' // `---` => long dash, terminate
+          :
+            '\\-+|'
+          ) +
+          '\\,(?!' + re.src_ZCc + ').|' +      // allow `,,,` in paths
+          '\\!(?!' + re.src_ZCc + '|[!]).|' +
+          '\\?(?!' + re.src_ZCc + '|[?]).' +
+        ')+' +
+      '|\\/' +
+    ')?';
+
+  re.src_email_name =
+
+    '[\\-;:&=\\+\\$,\\"\\.a-zA-Z0-9_]+';
+
+  re.src_xn =
+
+    'xn--[a-z0-9\\-]{1,59}';
+
+  // More to read about domain names
+  // http://serverfault.com/questions/638260/
+
+  re.src_domain_root =
+
+    // Allow letters & digits (http://test1)
+    '(?:' +
+      re.src_xn +
+      '|' +
+      re.src_pseudo_letter + '{1,63}' +
+    ')';
+
+  re.src_domain =
+
+    '(?:' +
+      re.src_xn +
+      '|' +
+      '(?:' + re.src_pseudo_letter + ')' +
+      '|' +
+      // don't allow `--` in domain names, because:
+      // - that can conflict with markdown &mdash; / &ndash;
+      // - nobody use those anyway
+      '(?:' + re.src_pseudo_letter + '(?:-(?!-)|' + re.src_pseudo_letter + '){0,61}' + re.src_pseudo_letter + ')' +
+    ')';
+
+  re.src_host =
+
+    '(?:' +
+    // Don't need IP check, because digits are already allowed in normal domain names
+    //   src_ip4 +
+    // '|' +
+      '(?:(?:(?:' + re.src_domain + ')\\.)*' + re.src_domain/*_root*/ + ')' +
+    ')';
+
+  re.tpl_host_fuzzy =
+
+    '(?:' +
+      re.src_ip4 +
+    '|' +
+      '(?:(?:(?:' + re.src_domain + ')\\.)+(?:%TLDS%))' +
+    ')';
+
+  re.tpl_host_no_ip_fuzzy =
+
+    '(?:(?:(?:' + re.src_domain + ')\\.)+(?:%TLDS%))';
+
+  re.src_host_strict =
+
+    re.src_host + re.src_host_terminator;
+
+  re.tpl_host_fuzzy_strict =
+
+    re.tpl_host_fuzzy + re.src_host_terminator;
+
+  re.src_host_port_strict =
+
+    re.src_host + re.src_port + re.src_host_terminator;
+
+  re.tpl_host_port_fuzzy_strict =
+
+    re.tpl_host_fuzzy + re.src_port + re.src_host_terminator;
+
+  re.tpl_host_port_no_ip_fuzzy_strict =
+
+    re.tpl_host_no_ip_fuzzy + re.src_port + re.src_host_terminator;
+
+
+  ////////////////////////////////////////////////////////////////////////////////
+  // Main rules
+
+  // Rude test fuzzy links by host, for quick deny
+  re.tpl_host_fuzzy_test =
+
+    'localhost|www\\.|\\.\\d{1,3}\\.|(?:\\.(?:%TLDS%)(?:' + re.src_ZPCc + '|>|$))';
+
+  re.tpl_email_fuzzy =
+
+      '(^|' + text_separators + '|\\(|' + re.src_ZCc + ')(' + re.src_email_name + '@' + re.tpl_host_fuzzy_strict + ')';
+
+  re.tpl_link_fuzzy =
+      // Fuzzy link can't be prepended with .:/\- and non punctuation.
+      // but can start with > (markdown blockquote)
+      '(^|(?![.:/\\-_@])(?:[$+<=>^`|\uff5c]|' + re.src_ZPCc + '))' +
+      '((?![$+<=>^`|\uff5c])' + re.tpl_host_port_fuzzy_strict + re.src_path + ')';
+
+  re.tpl_link_no_ip_fuzzy =
+      // Fuzzy link can't be prepended with .:/\- and non punctuation.
+      // but can start with > (markdown blockquote)
+      '(^|(?![.:/\\-_@])(?:[$+<=>^`|\uff5c]|' + re.src_ZPCc + '))' +
+      '((?![$+<=>^`|\uff5c])' + re.tpl_host_port_no_ip_fuzzy_strict + re.src_path + ')';
+
+  return re;
+};
+
+},{"uc.micro/categories/Cc/regex":61,"uc.micro/categories/P/regex":63,"uc.micro/categories/Z/regex":64,"uc.micro/properties/Any/regex":66}],55:[function(require,module,exports){
+
+'use strict';
+
+
+/* eslint-disable no-bitwise */
+
+var decodeCache = {};
+
+function getDecodeCache(exclude) {
+  var i, ch, cache = decodeCache[exclude];
+  if (cache) { return cache; }
+
+  cache = decodeCache[exclude] = [];
+
+  for (i = 0; i < 128; i++) {
+    ch = String.fromCharCode(i);
+    cache.push(ch);
+  }
+
+  for (i = 0; i < exclude.length; i++) {
+    ch = exclude.charCodeAt(i);
+    cache[ch] = '%' + ('0' + ch.toString(16).toUpperCase()).slice(-2);
+  }
+
+  return cache;
+}
+
+
+// Decode percent-encoded string.
+//
+function decode(string, exclude) {
+  var cache;
+
+  if (typeof exclude !== 'string') {
+    exclude = decode.defaultChars;
+  }
+
+  cache = getDecodeCache(exclude);
+
+  return string.replace(/(%[a-f0-9]{2})+/gi, function(seq) {
+    var i, l, b1, b2, b3, b4, chr,
+        result = '';
+
+    for (i = 0, l = seq.length; i < l; i += 3) {
+      b1 = parseInt(seq.slice(i + 1, i + 3), 16);
+
+      if (b1 < 0x80) {
+        result += cache[b1];
+        continue;
+      }
+
+      if ((b1 & 0xE0) === 0xC0 && (i + 3 < l)) {
+        // 110xxxxx 10xxxxxx
+        b2 = parseInt(seq.slice(i + 4, i + 6), 16);
+
+        if ((b2 & 0xC0) === 0x80) {
+          chr = ((b1 << 6) & 0x7C0) | (b2 & 0x3F);
+
+          if (chr < 0x80) {
+            result += '\ufffd\ufffd';
+          } else {
+            result += String.fromCharCode(chr);
+          }
+
+          i += 3;
+          continue;
+        }
+      }
+
+      if ((b1 & 0xF0) === 0xE0 && (i + 6 < l)) {
+        // 1110xxxx 10xxxxxx 10xxxxxx
+        b2 = parseInt(seq.slice(i + 4, i + 6), 16);
+        b3 = parseInt(seq.slice(i + 7, i + 9), 16);
+
+        if ((b2 & 0xC0) === 0x80 && (b3 & 0xC0) === 0x80) {
+          chr = ((b1 << 12) & 0xF000) | ((b2 << 6) & 0xFC0) | (b3 & 0x3F);
+
+          if (chr < 0x800 || (chr >= 0xD800 && chr <= 0xDFFF)) {
+            result += '\ufffd\ufffd\ufffd';
+          } else {
+            result += String.fromCharCode(chr);
+          }
+
+          i += 6;
+          continue;
+        }
+      }
+
+      if ((b1 & 0xF8) === 0xF0 && (i + 9 < l)) {
+        // 111110xx 10xxxxxx 10xxxxxx 10xxxxxx
+        b2 = parseInt(seq.slice(i + 4, i + 6), 16);
+        b3 = parseInt(seq.slice(i + 7, i + 9), 16);
+        b4 = parseInt(seq.slice(i + 10, i + 12), 16);
+
+        if ((b2 & 0xC0) === 0x80 && (b3 & 0xC0) === 0x80 && (b4 & 0xC0) === 0x80) {
+          chr = ((b1 << 18) & 0x1C0000) | ((b2 << 12) & 0x3F000) | ((b3 << 6) & 0xFC0) | (b4 & 0x3F);
+
+          if (chr < 0x10000 || chr > 0x10FFFF) {
+            result += '\ufffd\ufffd\ufffd\ufffd';
+          } else {
+            chr -= 0x10000;
+            result += String.fromCharCode(0xD800 + (chr >> 10), 0xDC00 + (chr & 0x3FF));
+          }
+
+          i += 9;
+          continue;
+        }
+      }
+
+      result += '\ufffd';
+    }
+
+    return result;
+  });
+}
+
+
+decode.defaultChars   = ';/?:@&=+$,#';
+decode.componentChars = '';
+
+
+module.exports = decode;
+
+},{}],56:[function(require,module,exports){
+
+'use strict';
+
+
+var encodeCache = {};
+
+
+// Create a lookup array where anything but characters in `chars` string
+// and alphanumeric chars is percent-encoded.
+//
+function getEncodeCache(exclude) {
+  var i, ch, cache = encodeCache[exclude];
+  if (cache) { return cache; }
+
+  cache = encodeCache[exclude] = [];
+
+  for (i = 0; i < 128; i++) {
+    ch = String.fromCharCode(i);
+
+    if (/^[0-9a-z]$/i.test(ch)) {
+      // always allow unencoded alphanumeric characters
+      cache.push(ch);
+    } else {
+      cache.push('%' + ('0' + i.toString(16).toUpperCase()).slice(-2));
+    }
+  }
+
+  for (i = 0; i < exclude.length; i++) {
+    cache[exclude.charCodeAt(i)] = exclude[i];
+  }
+
+  return cache;
+}
+
+
+// Encode unsafe characters with percent-encoding, skipping already
+// encoded sequences.
+//
+//  - string       - string to encode
+//  - exclude      - list of characters to ignore (in addition to a-zA-Z0-9)
+//  - keepEscaped  - don't encode '%' in a correct escape sequence (default: true)
+//
+function encode(string, exclude, keepEscaped) {
+  var i, l, code, nextCode, cache,
+      result = '';
+
+  if (typeof exclude !== 'string') {
+    // encode(string, keepEscaped)
+    keepEscaped  = exclude;
+    exclude = encode.defaultChars;
+  }
+
+  if (typeof keepEscaped === 'undefined') {
+    keepEscaped = true;
+  }
+
+  cache = getEncodeCache(exclude);
+
+  for (i = 0, l = string.length; i < l; i++) {
+    code = string.charCodeAt(i);
+
+    if (keepEscaped && code === 0x25 /* % */ && i + 2 < l) {
+      if (/^[0-9a-f]{2}$/i.test(string.slice(i + 1, i + 3))) {
+        result += string.slice(i, i + 3);
+        i += 2;
+        continue;
+      }
+    }
+
+    if (code < 128) {
+      result += cache[code];
+      continue;
+    }
+
+    if (code >= 0xD800 && code <= 0xDFFF) {
+      if (code >= 0xD800 && code <= 0xDBFF && i + 1 < l) {
+        nextCode = string.charCodeAt(i + 1);
+        if (nextCode >= 0xDC00 && nextCode <= 0xDFFF) {
+          result += encodeURIComponent(string[i] + string[i + 1]);
+          i++;
+          continue;
+        }
+      }
+      result += '%EF%BF%BD';
+      continue;
+    }
+
+    result += encodeURIComponent(string[i]);
+  }
+
+  return result;
+}
+
+encode.defaultChars   = ";/?:@&=+$,-_.!~*'()#";
+encode.componentChars = "-_.!~*'()";
+
+
+module.exports = encode;
+
+},{}],57:[function(require,module,exports){
+
+'use strict';
+
+
+module.exports = function format(url) {
+  var result = '';
+
+  result += url.protocol || '';
+  result += url.slashes ? '//' : '';
+  result += url.auth ? url.auth + '@' : '';
+
+  if (url.hostname && url.hostname.indexOf(':') !== -1) {
+    // ipv6 address
+    result += '[' + url.hostname + ']';
+  } else {
+    result += url.hostname || '';
+  }
+
+  result += url.port ? ':' + url.port : '';
+  result += url.pathname || '';
+  result += url.search || '';
+  result += url.hash || '';
+
+  return result;
+};
+
+},{}],58:[function(require,module,exports){
+'use strict';
+
+
+module.exports.encode = require('./encode');
+module.exports.decode = require('./decode');
+module.exports.format = require('./format');
+module.exports.parse  = require('./parse');
+
+},{"./decode":55,"./encode":56,"./format":57,"./parse":59}],59:[function(require,module,exports){
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+
+//
+// Changes from joyent/node:
+//
+// 1. No leading slash in paths,
+//    e.g. in `url.parse('http://foo?bar')` pathname is ``, not `/`
+//
+// 2. Backslashes are not replaced with slashes,
+//    so `http:\\example.org\` is treated like a relative path
+//
+// 3. Trailing colon is treated like a part of the path,
+//    i.e. in `http://example.org:foo` pathname is `:foo`
+//
+// 4. Nothing is URL-encoded in the resulting object,
+//    (in joyent/node some chars in auth and paths are encoded)
+//
+// 5. `url.parse()` does not have `parseQueryString` argument
+//
+// 6. Removed extraneous result properties: `host`, `path`, `query`, etc.,
+//    which can be constructed using other parts of the url.
+//
+
+
+function Url() {
+  this.protocol = null;
+  this.slashes = null;
+  this.auth = null;
+  this.port = null;
+  this.hostname = null;
+  this.hash = null;
+  this.search = null;
+  this.pathname = null;
+}
+
+// Reference: RFC 3986, RFC 1808, RFC 2396
+
+// define these here so at least they only have to be
+// compiled once on the first module load.
+var protocolPattern = /^([a-z0-9.+-]+:)/i,
+    portPattern = /:[0-9]*$/,
+
+    // Special case for a simple path URL
+    simplePathPattern = /^(\/\/?(?!\/)[^\?\s]*)(\?[^\s]*)?$/,
+
+    // RFC 2396: characters reserved for delimiting URLs.
+    // We actually just auto-escape these.
+    delims = [ '<', '>', '"', '`', ' ', '\r', '\n', '\t' ],
+
+    // RFC 2396: characters not allowed for various reasons.
+    unwise = [ '{', '}', '|', '\\', '^', '`' ].concat(delims),
+
+    // Allowed by RFCs, but cause of XSS attacks.  Always escape these.
+    autoEscape = [ '\'' ].concat(unwise),
+    // Characters that are never ever allowed in a hostname.
+    // Note that any invalid chars are also handled, but these
+    // are the ones that are *expected* to be seen, so we fast-path
+    // them.
+    nonHostChars = [ '%', '/', '?', ';', '#' ].concat(autoEscape),
+    hostEndingChars = [ '/', '?', '#' ],
+    hostnameMaxLen = 255,
+    hostnamePartPattern = /^[+a-z0-9A-Z_-]{0,63}$/,
+    hostnamePartStart = /^([+a-z0-9A-Z_-]{0,63})(.*)$/,
+    // protocols that can allow "unsafe" and "unwise" chars.
+    /* eslint-disable no-script-url */
+    // protocols that never have a hostname.
+    hostlessProtocol = {
+      'javascript': true,
+      'javascript:': true
+    },
+    // protocols that always contain a // bit.
+    slashedProtocol = {
+      'http': true,
+      'https': true,
+      'ftp': true,
+      'gopher': true,
+      'file': true,
+      'http:': true,
+      'https:': true,
+      'ftp:': true,
+      'gopher:': true,
+      'file:': true
+    };
+    /* eslint-enable no-script-url */
+
+function urlParse(url, slashesDenoteHost) {
+  if (url && url instanceof Url) { return url; }
+
+  var u = new Url();
+  u.parse(url, slashesDenoteHost);
+  return u;
+}
+
+Url.prototype.parse = function(url, slashesDenoteHost) {
+  var i, l, lowerProto, hec, slashes,
+      rest = url;
+
+  // trim before proceeding.
+  // This is to support parse stuff like "  http://foo.com  \n"
+  rest = rest.trim();
+
+  if (!slashesDenoteHost && url.split('#').length === 1) {
+    // Try fast path regexp
+    var simplePath = simplePathPattern.exec(rest);
+    if (simplePath) {
+      this.pathname = simplePath[1];
+      if (simplePath[2]) {
+        this.search = simplePath[2];
+      }
+      return this;
+    }
+  }
+
+  var proto = protocolPattern.exec(rest);
+  if (proto) {
+    proto = proto[0];
+    lowerProto = proto.toLowerCase();
+    this.protocol = proto;
+    rest = rest.substr(proto.length);
+  }
+
+  // figure out if it's got a host
+  // user@server is *always* interpreted as a hostname, and url
+  // resolution will treat //foo/bar as host=foo,path=bar because that's
+  // how the browser resolves relative URLs.
+  if (slashesDenoteHost || proto || rest.match(/^\/\/[^@\/]+@[^@\/]+/)) {
+    slashes = rest.substr(0, 2) === '//';
+    if (slashes && !(proto && hostlessProtocol[proto])) {
+      rest = rest.substr(2);
+      this.slashes = true;
+    }
+  }
+
+  if (!hostlessProtocol[proto] &&
+      (slashes || (proto && !slashedProtocol[proto]))) {
+
+    // there's a hostname.
+    // the first instance of /, ?, ;, or # ends the host.
+    //
+    // If there is an @ in the hostname, then non-host chars *are* allowed
+    // to the left of the last @ sign, unless some host-ending character
+    // comes *before* the @-sign.
+    // URLs are obnoxious.
+    //
+    // ex:
+    // http://a@b@c/ => user:a@b host:c
+    // http://a@b?@c => user:a host:c path:/?@c
+
+    // v0.12 TODO(isaacs): This is not quite how Chrome does things.
+    // Review our test case against browsers more comprehensively.
+
+    // find the first instance of any hostEndingChars
+    var hostEnd = -1;
+    for (i = 0; i < hostEndingChars.length; i++) {
+      hec = rest.indexOf(hostEndingChars[i]);
+      if (hec !== -1 && (hostEnd === -1 || hec < hostEnd)) {
+        hostEnd = hec;
+      }
+    }
+
+    // at this point, either we have an explicit point where the
+    // auth portion cannot go past, or the last @ char is the decider.
+    var auth, atSign;
+    if (hostEnd === -1) {
+      // atSign can be anywhere.
+      atSign = rest.lastIndexOf('@');
+    } else {
+      // atSign must be in auth portion.
+      // http://a@b/c@d => host:b auth:a path:/c@d
+      atSign = rest.lastIndexOf('@', hostEnd);
+    }
+
+    // Now we have a portion which is definitely the auth.
+    // Pull that off.
+    if (atSign !== -1) {
+      auth = rest.slice(0, atSign);
+      rest = rest.slice(atSign + 1);
+      this.auth = auth;
+    }
+
+    // the host is the remaining to the left of the first non-host char
+    hostEnd = -1;
+    for (i = 0; i < nonHostChars.length; i++) {
+      hec = rest.indexOf(nonHostChars[i]);
+      if (hec !== -1 && (hostEnd === -1 || hec < hostEnd)) {
+        hostEnd = hec;
+      }
+    }
+    // if we still have not hit it, then the entire thing is a host.
+    if (hostEnd === -1) {
+      hostEnd = rest.length;
+    }
+
+    if (rest[hostEnd - 1] === ':') { hostEnd--; }
+    var host = rest.slice(0, hostEnd);
+    rest = rest.slice(hostEnd);
+
+    // pull out port.
+    this.parseHost(host);
+
+    // we've indicated that there is a hostname,
+    // so even if it's empty, it has to be present.
+    this.hostname = this.hostname || '';
+
+    // if hostname begins with [ and ends with ]
+    // assume that it's an IPv6 address.
+    var ipv6Hostname = this.hostname[0] === '[' &&
+        this.hostname[this.hostname.length - 1] === ']';
+
+    // validate a little.
+    if (!ipv6Hostname) {
+      var hostparts = this.hostname.split(/\./);
+      for (i = 0, l = hostparts.length; i < l; i++) {
+        var part = hostparts[i];
+        if (!part) { continue; }
+        if (!part.match(hostnamePartPattern)) {
+          var newpart = '';
+          for (var j = 0, k = part.length; j < k; j++) {
+            if (part.charCodeAt(j) > 127) {
+              // we replace non-ASCII char with a temporary placeholder
+              // we need this to make sure size of hostname is not
+              // broken by replacing non-ASCII by nothing
+              newpart += 'x';
+            } else {
+              newpart += part[j];
+            }
+          }
+          // we test again with ASCII char only
+          if (!newpart.match(hostnamePartPattern)) {
+            var validParts = hostparts.slice(0, i);
+            var notHost = hostparts.slice(i + 1);
+            var bit = part.match(hostnamePartStart);
+            if (bit) {
+              validParts.push(bit[1]);
+              notHost.unshift(bit[2]);
+            }
+            if (notHost.length) {
+              rest = notHost.join('.') + rest;
+            }
+            this.hostname = validParts.join('.');
+            break;
+          }
+        }
+      }
+    }
+
+    if (this.hostname.length > hostnameMaxLen) {
+      this.hostname = '';
+    }
+
+    // strip [ and ] from the hostname
+    // the host field still retains them, though
+    if (ipv6Hostname) {
+      this.hostname = this.hostname.substr(1, this.hostname.length - 2);
+    }
+  }
+
+  // chop off from the tail first.
+  var hash = rest.indexOf('#');
+  if (hash !== -1) {
+    // got a fragment string.
+    this.hash = rest.substr(hash);
+    rest = rest.slice(0, hash);
+  }
+  var qm = rest.indexOf('?');
+  if (qm !== -1) {
+    this.search = rest.substr(qm);
+    rest = rest.slice(0, qm);
+  }
+  if (rest) { this.pathname = rest; }
+  if (slashedProtocol[lowerProto] &&
+      this.hostname && !this.pathname) {
+    this.pathname = '';
+  }
+
+  return this;
+};
+
+Url.prototype.parseHost = function(host) {
+  var port = portPattern.exec(host);
+  if (port) {
+    port = port[0];
+    if (port !== ':') {
+      this.port = port.substr(1);
+    }
+    host = host.substr(0, host.length - port.length);
+  }
+  if (host) { this.hostname = host; }
+};
+
+module.exports = urlParse;
+
+},{}],60:[function(require,module,exports){
+(function (global){
+/*! https://mths.be/punycode v1.4.1 by @mathias */
+;(function(root) {
+
+	/** Detect free variables */
+	var freeExports = typeof exports == 'object' && exports &&
+		!exports.nodeType && exports;
+	var freeModule = typeof module == 'object' && module &&
+		!module.nodeType && module;
+	var freeGlobal = typeof global == 'object' && global;
+	if (
+		freeGlobal.global === freeGlobal ||
+		freeGlobal.window === freeGlobal ||
+		freeGlobal.self === freeGlobal
+	) {
+		root = freeGlobal;
+	}
+
+	/**
+	 * The `punycode` object.
+	 * @name punycode
+	 * @type Object
+	 */
+	var punycode,
+
+	/** Highest positive signed 32-bit float value */
+	maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
+
+	/** Bootstring parameters */
+	base = 36,
+	tMin = 1,
+	tMax = 26,
+	skew = 38,
+	damp = 700,
+	initialBias = 72,
+	initialN = 128, // 0x80
+	delimiter = '-', // '\x2D'
+
+	/** Regular expressions */
+	regexPunycode = /^xn--/,
+	regexNonASCII = /[^\x20-\x7E]/, // unprintable ASCII chars + non-ASCII chars
+	regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
+
+	/** Error messages */
+	errors = {
+		'overflow': 'Overflow: input needs wider integers to process',
+		'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
+		'invalid-input': 'Invalid input'
+	},
+
+	/** Convenience shortcuts */
+	baseMinusTMin = base - tMin,
+	floor = Math.floor,
+	stringFromCharCode = String.fromCharCode,
+
+	/** Temporary variable */
+	key;
+
+	/*--------------------------------------------------------------------------*/
+
+	/**
+	 * A generic error utility function.
+	 * @private
+	 * @param {String} type The error type.
+	 * @returns {Error} Throws a `RangeError` with the applicable error message.
+	 */
+	function error(type) {
+		throw new RangeError(errors[type]);
+	}
+
+	/**
+	 * A generic `Array#map` utility function.
+	 * @private
+	 * @param {Array} array The array to iterate over.
+	 * @param {Function} callback The function that gets called for every array
+	 * item.
+	 * @returns {Array} A new array of values returned by the callback function.
+	 */
+	function map(array, fn) {
+		var length = array.length;
+		var result = [];
+		while (length--) {
+			result[length] = fn(array[length]);
+		}
+		return result;
+	}
+
+	/**
+	 * A simple `Array#map`-like wrapper to work with domain name strings or email
+	 * addresses.
+	 * @private
+	 * @param {String} domain The domain name or email address.
+	 * @param {Function} callback The function that gets called for every
+	 * character.
+	 * @returns {Array} A new string of characters returned by the callback
+	 * function.
+	 */
+	function mapDomain(string, fn) {
+		var parts = string.split('@');
+		var result = '';
+		if (parts.length > 1) {
+			// In email addresses, only the domain name should be punycoded. Leave
+			// the local part (i.e. everything up to `@`) intact.
+			result = parts[0] + '@';
+			string = parts[1];
+		}
+		// Avoid `split(regex)` for IE8 compatibility. See #17.
+		string = string.replace(regexSeparators, '\x2E');
+		var labels = string.split('.');
+		var encoded = map(labels, fn).join('.');
+		return result + encoded;
+	}
+
+	/**
+	 * Creates an array containing the numeric code points of each Unicode
+	 * character in the string. While JavaScript uses UCS-2 internally,
+	 * this function will convert a pair of surrogate halves (each of which
+	 * UCS-2 exposes as separate characters) into a single code point,
+	 * matching UTF-16.
+	 * @see `punycode.ucs2.encode`
+	 * @see <https://mathiasbynens.be/notes/javascript-encoding>
+	 * @memberOf punycode.ucs2
+	 * @name decode
+	 * @param {String} string The Unicode input string (UCS-2).
+	 * @returns {Array} The new array of code points.
+	 */
+	function ucs2decode(string) {
+		var output = [],
+		    counter = 0,
+		    length = string.length,
+		    value,
+		    extra;
+		while (counter < length) {
+			value = string.charCodeAt(counter++);
+			if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
+				// high surrogate, and there is a next character
+				extra = string.charCodeAt(counter++);
+				if ((extra & 0xFC00) == 0xDC00) { // low surrogate
+					output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
+				} else {
+					// unmatched surrogate; only append this code unit, in case the next
+					// code unit is the high surrogate of a surrogate pair
+					output.push(value);
+					counter--;
+				}
+			} else {
+				output.push(value);
+			}
+		}
+		return output;
+	}
+
+	/**
+	 * Creates a string based on an array of numeric code points.
+	 * @see `punycode.ucs2.decode`
+	 * @memberOf punycode.ucs2
+	 * @name encode
+	 * @param {Array} codePoints The array of numeric code points.
+	 * @returns {String} The new Unicode string (UCS-2).
+	 */
+	function ucs2encode(array) {
+		return map(array, function(value) {
+			var output = '';
+			if (value > 0xFFFF) {
+				value -= 0x10000;
+				output += stringFromCharCode(value >>> 10 & 0x3FF | 0xD800);
+				value = 0xDC00 | value & 0x3FF;
+			}
+			output += stringFromCharCode(value);
+			return output;
+		}).join('');
+	}
+
+	/**
+	 * Converts a basic code point into a digit/integer.
+	 * @see `digitToBasic()`
+	 * @private
+	 * @param {Number} codePoint The basic numeric code point value.
+	 * @returns {Number} The numeric value of a basic code point (for use in
+	 * representing integers) in the range `0` to `base - 1`, or `base` if
+	 * the code point does not represent a value.
+	 */
+	function basicToDigit(codePoint) {
+		if (codePoint - 48 < 10) {
+			return codePoint - 22;
+		}
+		if (codePoint - 65 < 26) {
+			return codePoint - 65;
+		}
+		if (codePoint - 97 < 26) {
+			return codePoint - 97;
+		}
+		return base;
+	}
+
+	/**
+	 * Converts a digit/integer into a basic code point.
+	 * @see `basicToDigit()`
+	 * @private
+	 * @param {Number} digit The numeric value of a basic code point.
+	 * @returns {Number} The basic code point whose value (when used for
+	 * representing integers) is `digit`, which needs to be in the range
+	 * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
+	 * used; else, the lowercase form is used. The behavior is undefined
+	 * if `flag` is non-zero and `digit` has no uppercase form.
+	 */
+	function digitToBasic(digit, flag) {
+		//  0..25 map to ASCII a..z or A..Z
+		// 26..35 map to ASCII 0..9
+		return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
+	}
+
+	/**
+	 * Bias adaptation function as per section 3.4 of RFC 3492.
+	 * https://tools.ietf.org/html/rfc3492#section-3.4
+	 * @private
+	 */
+	function adapt(delta, numPoints, firstTime) {
+		var k = 0;
+		delta = firstTime ? floor(delta / damp) : delta >> 1;
+		delta += floor(delta / numPoints);
+		for (/* no initialization */; delta > baseMinusTMin * tMax >> 1; k += base) {
+			delta = floor(delta / baseMinusTMin);
+		}
+		return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
+	}
+
+	/**
+	 * Converts a Punycode string of ASCII-only symbols to a string of Unicode
+	 * symbols.
+	 * @memberOf punycode
+	 * @param {String} input The Punycode string of ASCII-only symbols.
+	 * @returns {String} The resulting string of Unicode symbols.
+	 */
+	function decode(input) {
+		// Don't use UCS-2
+		var output = [],
+		    inputLength = input.length,
+		    out,
+		    i = 0,
+		    n = initialN,
+		    bias = initialBias,
+		    basic,
+		    j,
+		    index,
+		    oldi,
+		    w,
+		    k,
+		    digit,
+		    t,
+		    /** Cached calculation results */
+		    baseMinusT;
+
+		// Handle the basic code points: let `basic` be the number of input code
+		// points before the last delimiter, or `0` if there is none, then copy
+		// the first basic code points to the output.
+
+		basic = input.lastIndexOf(delimiter);
+		if (basic < 0) {
+			basic = 0;
+		}
+
+		for (j = 0; j < basic; ++j) {
+			// if it's not a basic code point
+			if (input.charCodeAt(j) >= 0x80) {
+				error('not-basic');
+			}
+			output.push(input.charCodeAt(j));
+		}
+
+		// Main decoding loop: start just after the last delimiter if any basic code
+		// points were copied; start at the beginning otherwise.
+
+		for (index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {
+
+			// `index` is the index of the next character to be consumed.
+			// Decode a generalized variable-length integer into `delta`,
+			// which gets added to `i`. The overflow checking is easier
+			// if we increase `i` as we go, then subtract off its starting
+			// value at the end to obtain `delta`.
+			for (oldi = i, w = 1, k = base; /* no condition */; k += base) {
+
+				if (index >= inputLength) {
+					error('invalid-input');
+				}
+
+				digit = basicToDigit(input.charCodeAt(index++));
+
+				if (digit >= base || digit > floor((maxInt - i) / w)) {
+					error('overflow');
+				}
+
+				i += digit * w;
+				t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+
+				if (digit < t) {
+					break;
+				}
+
+				baseMinusT = base - t;
+				if (w > floor(maxInt / baseMinusT)) {
+					error('overflow');
+				}
+
+				w *= baseMinusT;
+
+			}
+
+			out = output.length + 1;
+			bias = adapt(i - oldi, out, oldi == 0);
+
+			// `i` was supposed to wrap around from `out` to `0`,
+			// incrementing `n` each time, so we'll fix that now:
+			if (floor(i / out) > maxInt - n) {
+				error('overflow');
+			}
+
+			n += floor(i / out);
+			i %= out;
+
+			// Insert `n` at position `i` of the output
+			output.splice(i++, 0, n);
+
+		}
+
+		return ucs2encode(output);
+	}
+
+	/**
+	 * Converts a string of Unicode symbols (e.g. a domain name label) to a
+	 * Punycode string of ASCII-only symbols.
+	 * @memberOf punycode
+	 * @param {String} input The string of Unicode symbols.
+	 * @returns {String} The resulting Punycode string of ASCII-only symbols.
+	 */
+	function encode(input) {
+		var n,
+		    delta,
+		    handledCPCount,
+		    basicLength,
+		    bias,
+		    j,
+		    m,
+		    q,
+		    k,
+		    t,
+		    currentValue,
+		    output = [],
+		    /** `inputLength` will hold the number of code points in `input`. */
+		    inputLength,
+		    /** Cached calculation results */
+		    handledCPCountPlusOne,
+		    baseMinusT,
+		    qMinusT;
+
+		// Convert the input in UCS-2 to Unicode
+		input = ucs2decode(input);
+
+		// Cache the length
+		inputLength = input.length;
+
+		// Initialize the state
+		n = initialN;
+		delta = 0;
+		bias = initialBias;
+
+		// Handle the basic code points
+		for (j = 0; j < inputLength; ++j) {
+			currentValue = input[j];
+			if (currentValue < 0x80) {
+				output.push(stringFromCharCode(currentValue));
+			}
+		}
+
+		handledCPCount = basicLength = output.length;
+
+		// `handledCPCount` is the number of code points that have been handled;
+		// `basicLength` is the number of basic code points.
+
+		// Finish the basic string - if it is not empty - with a delimiter
+		if (basicLength) {
+			output.push(delimiter);
+		}
+
+		// Main encoding loop:
+		while (handledCPCount < inputLength) {
+
+			// All non-basic code points < n have been handled already. Find the next
+			// larger one:
+			for (m = maxInt, j = 0; j < inputLength; ++j) {
+				currentValue = input[j];
+				if (currentValue >= n && currentValue < m) {
+					m = currentValue;
+				}
+			}
+
+			// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
+			// but guard against overflow
+			handledCPCountPlusOne = handledCPCount + 1;
+			if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
+				error('overflow');
+			}
+
+			delta += (m - n) * handledCPCountPlusOne;
+			n = m;
+
+			for (j = 0; j < inputLength; ++j) {
+				currentValue = input[j];
+
+				if (currentValue < n && ++delta > maxInt) {
+					error('overflow');
+				}
+
+				if (currentValue == n) {
+					// Represent delta as a generalized variable-length integer
+					for (q = delta, k = base; /* no condition */; k += base) {
+						t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+						if (q < t) {
+							break;
+						}
+						qMinusT = q - t;
+						baseMinusT = base - t;
+						output.push(
+							stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))
+						);
+						q = floor(qMinusT / baseMinusT);
+					}
+
+					output.push(stringFromCharCode(digitToBasic(q, 0)));
+					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);
+					delta = 0;
+					++handledCPCount;
+				}
+			}
+
+			++delta;
+			++n;
+
+		}
+		return output.join('');
+	}
+
+	/**
+	 * Converts a Punycode string representing a domain name or an email address
+	 * to Unicode. Only the Punycoded parts of the input will be converted, i.e.
+	 * it doesn't matter if you call it on a string that has already been
+	 * converted to Unicode.
+	 * @memberOf punycode
+	 * @param {String} input The Punycoded domain name or email address to
+	 * convert to Unicode.
+	 * @returns {String} The Unicode representation of the given Punycode
+	 * string.
+	 */
+	function toUnicode(input) {
+		return mapDomain(input, function(string) {
+			return regexPunycode.test(string)
+				? decode(string.slice(4).toLowerCase())
+				: string;
+		});
+	}
+
+	/**
+	 * Converts a Unicode string representing a domain name or an email address to
+	 * Punycode. Only the non-ASCII parts of the domain name will be converted,
+	 * i.e. it doesn't matter if you call it with a domain that's already in
+	 * ASCII.
+	 * @memberOf punycode
+	 * @param {String} input The domain name or email address to convert, as a
+	 * Unicode string.
+	 * @returns {String} The Punycode representation of the given domain name or
+	 * email address.
+	 */
+	function toASCII(input) {
+		return mapDomain(input, function(string) {
+			return regexNonASCII.test(string)
+				? 'xn--' + encode(string)
+				: string;
+		});
+	}
+
+	/*--------------------------------------------------------------------------*/
+
+	/** Define the public API */
+	punycode = {
+		/**
+		 * A string representing the current Punycode.js version number.
+		 * @memberOf punycode
+		 * @type String
+		 */
+		'version': '1.4.1',
+		/**
+		 * An object of methods to convert from JavaScript's internal character
+		 * representation (UCS-2) to Unicode code points, and back.
+		 * @see <https://mathiasbynens.be/notes/javascript-encoding>
+		 * @memberOf punycode
+		 * @type Object
+		 */
+		'ucs2': {
+			'decode': ucs2decode,
+			'encode': ucs2encode
+		},
+		'decode': decode,
+		'encode': encode,
+		'toASCII': toASCII,
+		'toUnicode': toUnicode
+	};
+
+	/** Expose `punycode` */
+	// Some AMD build optimizers, like r.js, check for specific condition patterns
+	// like the following:
+	if (
+		typeof define == 'function' &&
+		typeof define.amd == 'object' &&
+		define.amd
+	) {
+		define('punycode', function() {
+			return punycode;
+		});
+	} else if (freeExports && freeModule) {
+		if (module.exports == freeExports) {
+			// in Node.js, io.js, or RingoJS v0.8.0+
+			freeModule.exports = punycode;
+		} else {
+			// in Narwhal or RingoJS v0.7.0-
+			for (key in punycode) {
+				punycode.hasOwnProperty(key) && (freeExports[key] = punycode[key]);
+			}
+		}
+	} else {
+		// in Rhino or a web browser
+		root.punycode = punycode;
+	}
+
+}(this));
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{}],61:[function(require,module,exports){
+module.exports=/[\0-\x1F\x7F-\x9F]/
+},{}],62:[function(require,module,exports){
+module.exports=/[\xAD\u0600-\u0605\u061C\u06DD\u070F\u08E2\u180E\u200B-\u200F\u202A-\u202E\u2060-\u2064\u2066-\u206F\uFEFF\uFFF9-\uFFFB]|\uD804\uDCBD|\uD82F[\uDCA0-\uDCA3]|\uD834[\uDD73-\uDD7A]|\uDB40[\uDC01\uDC20-\uDC7F]/
+},{}],63:[function(require,module,exports){
+module.exports=/[!-#%-\*,-/:;\?@\[-\]_\{\}\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E44\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDC4B-\uDC4F\uDC5B\uDC5D\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDE60-\uDE6C\uDF3C-\uDF3E]|\uD807[\uDC41-\uDC45\uDC70\uDC71]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]|\uD83A[\uDD5E\uDD5F]/
+},{}],64:[function(require,module,exports){
+module.exports=/[ \xA0\u1680\u2000-\u200A\u202F\u205F\u3000]/
+},{}],65:[function(require,module,exports){
+'use strict';
+
+exports.Any = require('./properties/Any/regex');
+exports.Cc  = require('./categories/Cc/regex');
+exports.Cf  = require('./categories/Cf/regex');
+exports.P   = require('./categories/P/regex');
+exports.Z   = require('./categories/Z/regex');
+
+},{"./categories/Cc/regex":61,"./categories/Cf/regex":62,"./categories/P/regex":63,"./categories/Z/regex":64,"./properties/Any/regex":66}],66:[function(require,module,exports){
+module.exports=/[\0-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/
+},{}],67:[function(require,module,exports){
+'use strict';
+
+
+module.exports = require('./lib/');
+
+},{"./lib/":9}]},{},[67])(67)
+});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/qunit.js b/vendor/assets/javascripts/qunit.js
index 5df0822ea42..3cda99631a9 100644
--- a/vendor/assets/javascripts/qunit.js
+++ b/vendor/assets/javascripts/qunit.js
@@ -1,4334 +1,4926 @@
 /*!
- * QUnit 1.23.1
+ * QUnit 2.3.3
  * https://qunitjs.com/
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2016-04-12T17:29Z
+ * Date: 2017-06-02T14:07Z
  */
+(function (global$1) {
+  'use strict';
 
-( function( global ) {
-
-var QUnit = {};
-
-var Date = global.Date;
-var now = Date.now || function() {
-	return new Date().getTime();
-};
-
-var setTimeout = global.setTimeout;
-var clearTimeout = global.clearTimeout;
-
-// Store a local window from the global to allow direct references.
-var window = global.window;
-
-var defined = {
-	document: window && window.document !== undefined,
-	setTimeout: setTimeout !== undefined,
-	sessionStorage: ( function() {
-		var x = "qunit-test-string";
-		try {
-			sessionStorage.setItem( x, x );
-			sessionStorage.removeItem( x );
-			return true;
-		} catch ( e ) {
-			return false;
-		}
-	}() )
-};
-
-var fileName = ( sourceFromStacktrace( 0 ) || "" ).replace( /(:\d+)+\)?/, "" ).replace( /.+\//, "" );
-var globalStartCalled = false;
-var runStarted = false;
-
-var toString = Object.prototype.toString,
-	hasOwn = Object.prototype.hasOwnProperty;
-
-// Returns a new Array with the elements that are in a but not in b
-function diff( a, b ) {
-	var i, j,
-		result = a.slice();
-
-	for ( i = 0; i < result.length; i++ ) {
-		for ( j = 0; j < b.length; j++ ) {
-			if ( result[ i ] === b[ j ] ) {
-				result.splice( i, 1 );
-				i--;
-				break;
-			}
-		}
-	}
-	return result;
-}
-
-// From jquery.js
-function inArray( elem, array ) {
-	if ( array.indexOf ) {
-		return array.indexOf( elem );
-	}
-
-	for ( var i = 0, length = array.length; i < length; i++ ) {
-		if ( array[ i ] === elem ) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-/**
- * Makes a clone of an object using only Array or Object as base,
- * and copies over the own enumerable properties.
- *
- * @param {Object} obj
- * @return {Object} New object with only the own properties (recursively).
- */
-function objectValues ( obj ) {
-	var key, val,
-		vals = QUnit.is( "array", obj ) ? [] : {};
-	for ( key in obj ) {
-		if ( hasOwn.call( obj, key ) ) {
-			val = obj[ key ];
-			vals[ key ] = val === Object( val ) ? objectValues( val ) : val;
-		}
-	}
-	return vals;
-}
-
-function extend( a, b, undefOnly ) {
-	for ( var prop in b ) {
-		if ( hasOwn.call( b, prop ) ) {
-
-			// Avoid "Member not found" error in IE8 caused by messing with window.constructor
-			// This block runs on every environment, so `global` is being used instead of `window`
-			// to avoid errors on node.
-			if ( prop !== "constructor" || a !== global ) {
-				if ( b[ prop ] === undefined ) {
-					delete a[ prop ];
-				} else if ( !( undefOnly && typeof a[ prop ] !== "undefined" ) ) {
-					a[ prop ] = b[ prop ];
-				}
-			}
-		}
-	}
-
-	return a;
-}
-
-function objectType( obj ) {
-	if ( typeof obj === "undefined" ) {
-		return "undefined";
-	}
-
-	// Consider: typeof null === object
-	if ( obj === null ) {
-		return "null";
-	}
-
-	var match = toString.call( obj ).match( /^\[object\s(.*)\]$/ ),
-		type = match && match[ 1 ];
-
-	switch ( type ) {
-		case "Number":
-			if ( isNaN( obj ) ) {
-				return "nan";
-			}
-			return "number";
-		case "String":
-		case "Boolean":
-		case "Array":
-		case "Set":
-		case "Map":
-		case "Date":
-		case "RegExp":
-		case "Function":
-		case "Symbol":
-			return type.toLowerCase();
-	}
-	if ( typeof obj === "object" ) {
-		return "object";
-	}
-}
-
-// Safe object type checking
-function is( type, obj ) {
-	return QUnit.objectType( obj ) === type;
-}
-
-// Doesn't support IE6 to IE9, it will return undefined on these browsers
-// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
-function extractStacktrace( e, offset ) {
-	offset = offset === undefined ? 4 : offset;
-
-	var stack, include, i;
-
-	if ( e.stack ) {
-		stack = e.stack.split( "\n" );
-		if ( /^error$/i.test( stack[ 0 ] ) ) {
-			stack.shift();
-		}
-		if ( fileName ) {
-			include = [];
-			for ( i = offset; i < stack.length; i++ ) {
-				if ( stack[ i ].indexOf( fileName ) !== -1 ) {
-					break;
-				}
-				include.push( stack[ i ] );
-			}
-			if ( include.length ) {
-				return include.join( "\n" );
-			}
-		}
-		return stack[ offset ];
-
-	// Support: Safari <=6 only
-	} else if ( e.sourceURL ) {
-
-		// Exclude useless self-reference for generated Error objects
-		if ( /qunit.js$/.test( e.sourceURL ) ) {
-			return;
-		}
-
-		// For actual exceptions, this is useful
-		return e.sourceURL + ":" + e.line;
-	}
-}
-
-function sourceFromStacktrace( offset ) {
-	var error = new Error();
-
-	// Support: Safari <=7 only, IE <=10 - 11 only
-	// Not all browsers generate the `stack` property for `new Error()`, see also #636
-	if ( !error.stack ) {
-		try {
-			throw error;
-		} catch ( err ) {
-			error = err;
-		}
-	}
-
-	return extractStacktrace( error, offset );
-}
-
-/**
- * Config object: Maintain internal state
- * Later exposed as QUnit.config
- * `config` initialized at top of scope
- */
-var config = {
-
-	// The queue of tests to run
-	queue: [],
-
-	// Block until document ready
-	blocking: true,
-
-	// By default, run previously failed tests first
-	// very useful in combination with "Hide passed tests" checked
-	reorder: true,
-
-	// By default, modify document.title when suite is done
-	altertitle: true,
-
-	// HTML Reporter: collapse every test except the first failing test
-	// If false, all failing tests will be expanded
-	collapse: true,
-
-	// By default, scroll to top of the page when suite is done
-	scrolltop: true,
-
-	// Depth up-to which object will be dumped
-	maxDepth: 5,
-
-	// When enabled, all tests must call expect()
-	requireExpects: false,
-
-	// Placeholder for user-configurable form-exposed URL parameters
-	urlConfig: [],
-
-	// Set of all modules.
-	modules: [],
-
-	// Stack of nested modules
-	moduleStack: [],
-
-	// The first unnamed module
-	currentModule: {
-		name: "",
-		tests: []
-	},
-
-	callbacks: {}
-};
-
-// Push a loose unnamed module to the modules collection
-config.modules.push( config.currentModule );
-
-var loggingCallbacks = {};
-
-// Register logging callbacks
-function registerLoggingCallbacks( obj ) {
-	var i, l, key,
-		callbackNames = [ "begin", "done", "log", "testStart", "testDone",
-			"moduleStart", "moduleDone" ];
-
-	function registerLoggingCallback( key ) {
-		var loggingCallback = function( callback ) {
-			if ( objectType( callback ) !== "function" ) {
-				throw new Error(
-					"QUnit logging methods require a callback function as their first parameters."
-				);
-			}
-
-			config.callbacks[ key ].push( callback );
-		};
-
-		// DEPRECATED: This will be removed on QUnit 2.0.0+
-		// Stores the registered functions allowing restoring
-		// at verifyLoggingCallbacks() if modified
-		loggingCallbacks[ key ] = loggingCallback;
-
-		return loggingCallback;
-	}
-
-	for ( i = 0, l = callbackNames.length; i < l; i++ ) {
-		key = callbackNames[ i ];
-
-		// Initialize key collection of logging callback
-		if ( objectType( config.callbacks[ key ] ) === "undefined" ) {
-			config.callbacks[ key ] = [];
-		}
-
-		obj[ key ] = registerLoggingCallback( key );
-	}
-}
-
-function runLoggingCallbacks( key, args ) {
-	var i, l, callbacks;
-
-	callbacks = config.callbacks[ key ];
-	for ( i = 0, l = callbacks.length; i < l; i++ ) {
-		callbacks[ i ]( args );
-	}
-}
-
-// DEPRECATED: This will be removed on 2.0.0+
-// This function verifies if the loggingCallbacks were modified by the user
-// If so, it will restore it, assign the given callback and print a console warning
-function verifyLoggingCallbacks() {
-	var loggingCallback, userCallback;
-
-	for ( loggingCallback in loggingCallbacks ) {
-		if ( QUnit[ loggingCallback ] !== loggingCallbacks[ loggingCallback ] ) {
-
-			userCallback = QUnit[ loggingCallback ];
-
-			// Restore the callback function
-			QUnit[ loggingCallback ] = loggingCallbacks[ loggingCallback ];
-
-			// Assign the deprecated given callback
-			QUnit[ loggingCallback ]( userCallback );
-
-			if ( global.console && global.console.warn ) {
-				global.console.warn(
-					"QUnit." + loggingCallback + " was replaced with a new value.\n" +
-					"Please, check out the documentation on how to apply logging callbacks.\n" +
-					"Reference: https://api.qunitjs.com/category/callbacks/"
-				);
-			}
-		}
-	}
-}
-
-( function() {
-	if ( !defined.document ) {
-		return;
-	}
-
-	// `onErrorFnPrev` initialized at top of scope
-	// Preserve other handlers
-	var onErrorFnPrev = window.onerror;
-
-	// Cover uncaught exceptions
-	// Returning true will suppress the default browser handler,
-	// returning false will let it run.
-	window.onerror = function( error, filePath, linerNr ) {
-		var ret = false;
-		if ( onErrorFnPrev ) {
-			ret = onErrorFnPrev( error, filePath, linerNr );
-		}
-
-		// Treat return value as window.onerror itself does,
-		// Only do our handling if not suppressed.
-		if ( ret !== true ) {
-			if ( QUnit.config.current ) {
-				if ( QUnit.config.current.ignoreGlobalErrors ) {
-					return true;
-				}
-				QUnit.pushFailure( error, filePath + ":" + linerNr );
-			} else {
-				QUnit.test( "global failure", extend( function() {
-					QUnit.pushFailure( error, filePath + ":" + linerNr );
-				}, { validTest: true } ) );
-			}
-			return false;
-		}
-
-		return ret;
-	};
-}() );
-
-// Figure out if we're running the tests from a server or not
-QUnit.isLocal = !( defined.document && window.location.protocol !== "file:" );
-
-// Expose the current QUnit version
-QUnit.version = "1.23.1";
-
-extend( QUnit, {
-
-	// Call on start of module test to prepend name to all tests
-	module: function( name, testEnvironment, executeNow ) {
-		var module, moduleFns;
-		var currentModule = config.currentModule;
-
-		if ( arguments.length === 2 ) {
-			if ( objectType( testEnvironment ) === "function" ) {
-				executeNow = testEnvironment;
-				testEnvironment = undefined;
-			}
-		}
-
-		// DEPRECATED: handles setup/teardown functions,
-		// beforeEach and afterEach should be used instead
-		if ( testEnvironment && testEnvironment.setup ) {
-			testEnvironment.beforeEach = testEnvironment.setup;
-			delete testEnvironment.setup;
-		}
-		if ( testEnvironment && testEnvironment.teardown ) {
-			testEnvironment.afterEach = testEnvironment.teardown;
-			delete testEnvironment.teardown;
-		}
-
-		module = createModule();
-
-		moduleFns = {
-			beforeEach: setHook( module, "beforeEach" ),
-			afterEach: setHook( module, "afterEach" )
-		};
-
-		if ( objectType( executeNow ) === "function" ) {
-			config.moduleStack.push( module );
-			setCurrentModule( module );
-			executeNow.call( module.testEnvironment, moduleFns );
-			config.moduleStack.pop();
-			module = module.parentModule || currentModule;
-		}
-
-		setCurrentModule( module );
-
-		function createModule() {
-			var parentModule = config.moduleStack.length ?
-				config.moduleStack.slice( -1 )[ 0 ] : null;
-			var moduleName = parentModule !== null ?
-				[ parentModule.name, name ].join( " > " ) : name;
-			var module = {
-				name: moduleName,
-				parentModule: parentModule,
-				tests: [],
-				moduleId: generateHash( moduleName )
-			};
-
-			var env = {};
-			if ( parentModule ) {
-				extend( env, parentModule.testEnvironment );
-				delete env.beforeEach;
-				delete env.afterEach;
-			}
-			extend( env, testEnvironment );
-			module.testEnvironment = env;
-
-			config.modules.push( module );
-			return module;
-		}
-
-		function setCurrentModule( module ) {
-			config.currentModule = module;
-		}
-
-	},
-
-	// DEPRECATED: QUnit.asyncTest() will be removed in QUnit 2.0.
-	asyncTest: asyncTest,
-
-	test: test,
-
-	skip: skip,
-
-	only: only,
-
-	// DEPRECATED: The functionality of QUnit.start() will be altered in QUnit 2.0.
-	// In QUnit 2.0, invoking it will ONLY affect the `QUnit.config.autostart` blocking behavior.
-	start: function( count ) {
-		var globalStartAlreadyCalled = globalStartCalled;
-
-		if ( !config.current ) {
-			globalStartCalled = true;
-
-			if ( runStarted ) {
-				throw new Error( "Called start() outside of a test context while already started" );
-			} else if ( globalStartAlreadyCalled || count > 1 ) {
-				throw new Error( "Called start() outside of a test context too many times" );
-			} else if ( config.autostart ) {
-				throw new Error( "Called start() outside of a test context when " +
-					"QUnit.config.autostart was true" );
-			} else if ( !config.pageLoaded ) {
-
-				// The page isn't completely loaded yet, so bail out and let `QUnit.load` handle it
-				config.autostart = true;
-				return;
-			}
-		} else {
-
-			// If a test is running, adjust its semaphore
-			config.current.semaphore -= count || 1;
-
-			// If semaphore is non-numeric, throw error
-			if ( isNaN( config.current.semaphore ) ) {
-				config.current.semaphore = 0;
-
-				QUnit.pushFailure(
-					"Called start() with a non-numeric decrement.",
-					sourceFromStacktrace( 2 )
-				);
-				return;
-			}
-
-			// Don't start until equal number of stop-calls
-			if ( config.current.semaphore > 0 ) {
-				return;
-			}
-
-			// Throw an Error if start is called more often than stop
-			if ( config.current.semaphore < 0 ) {
-				config.current.semaphore = 0;
-
-				QUnit.pushFailure(
-					"Called start() while already started (test's semaphore was 0 already)",
-					sourceFromStacktrace( 2 )
-				);
-				return;
-			}
-		}
-
-		resumeProcessing();
-	},
-
-	// DEPRECATED: QUnit.stop() will be removed in QUnit 2.0.
-	stop: function( count ) {
-
-		// If there isn't a test running, don't allow QUnit.stop() to be called
-		if ( !config.current ) {
-			throw new Error( "Called stop() outside of a test context" );
-		}
-
-		// If a test is running, adjust its semaphore
-		config.current.semaphore += count || 1;
-
-		pauseProcessing();
-	},
-
-	config: config,
-
-	is: is,
-
-	objectType: objectType,
-
-	extend: extend,
-
-	load: function() {
-		config.pageLoaded = true;
-
-		// Initialize the configuration options
-		extend( config, {
-			stats: { all: 0, bad: 0 },
-			moduleStats: { all: 0, bad: 0 },
-			started: 0,
-			updateRate: 1000,
-			autostart: true,
-			filter: ""
-		}, true );
-
-		config.blocking = false;
-
-		if ( config.autostart ) {
-			resumeProcessing();
-		}
-	},
-
-	stack: function( offset ) {
-		offset = ( offset || 0 ) + 2;
-		return sourceFromStacktrace( offset );
-	}
-} );
-
-registerLoggingCallbacks( QUnit );
-
-function begin() {
-	var i, l,
-		modulesLog = [];
-
-	// If the test run hasn't officially begun yet
-	if ( !config.started ) {
-
-		// Record the time of the test run's beginning
-		config.started = now();
-
-		verifyLoggingCallbacks();
-
-		// Delete the loose unnamed module if unused.
-		if ( config.modules[ 0 ].name === "" && config.modules[ 0 ].tests.length === 0 ) {
-			config.modules.shift();
-		}
-
-		// Avoid unnecessary information by not logging modules' test environments
-		for ( i = 0, l = config.modules.length; i < l; i++ ) {
-			modulesLog.push( {
-				name: config.modules[ i ].name,
-				tests: config.modules[ i ].tests
-			} );
-		}
-
-		// The test run is officially beginning now
-		runLoggingCallbacks( "begin", {
-			totalTests: Test.count,
-			modules: modulesLog
-		} );
-	}
-
-	config.blocking = false;
-	process( true );
-}
-
-function process( last ) {
-	function next() {
-		process( last );
-	}
-	var start = now();
-	config.depth = ( config.depth || 0 ) + 1;
-
-	while ( config.queue.length && !config.blocking ) {
-		if ( !defined.setTimeout || config.updateRate <= 0 ||
-				( ( now() - start ) < config.updateRate ) ) {
-			if ( config.current ) {
-
-				// Reset async tracking for each phase of the Test lifecycle
-				config.current.usedAsync = false;
-			}
-			config.queue.shift()();
-		} else {
-			setTimeout( next, 13 );
-			break;
-		}
-	}
-	config.depth--;
-	if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) {
-		done();
-	}
-}
-
-function pauseProcessing() {
-	config.blocking = true;
-
-	if ( config.testTimeout && defined.setTimeout ) {
-		clearTimeout( config.timeout );
-		config.timeout = setTimeout( function() {
-			if ( config.current ) {
-				config.current.semaphore = 0;
-				QUnit.pushFailure( "Test timed out", sourceFromStacktrace( 2 ) );
-			} else {
-				throw new Error( "Test timed out" );
-			}
-			resumeProcessing();
-		}, config.testTimeout );
-	}
-}
-
-function resumeProcessing() {
-	runStarted = true;
-
-	// A slight delay to allow this iteration of the event loop to finish (more assertions, etc.)
-	if ( defined.setTimeout ) {
-		setTimeout( function() {
-			if ( config.current && config.current.semaphore > 0 ) {
-				return;
-			}
-			if ( config.timeout ) {
-				clearTimeout( config.timeout );
-			}
-
-			begin();
-		}, 13 );
-	} else {
-		begin();
-	}
-}
-
-function done() {
-	var runtime, passed;
-
-	config.autorun = true;
-
-	// Log the last module results
-	if ( config.previousModule ) {
-		runLoggingCallbacks( "moduleDone", {
-			name: config.previousModule.name,
-			tests: config.previousModule.tests,
-			failed: config.moduleStats.bad,
-			passed: config.moduleStats.all - config.moduleStats.bad,
-			total: config.moduleStats.all,
-			runtime: now() - config.moduleStats.started
-		} );
-	}
-	delete config.previousModule;
-
-	runtime = now() - config.started;
-	passed = config.stats.all - config.stats.bad;
-
-	runLoggingCallbacks( "done", {
-		failed: config.stats.bad,
-		passed: passed,
-		total: config.stats.all,
-		runtime: runtime
-	} );
-}
-
-function setHook( module, hookName ) {
-	if ( module.testEnvironment === undefined ) {
-		module.testEnvironment = {};
-	}
-
-	return function( callback ) {
-		module.testEnvironment[ hookName ] = callback;
-	};
-}
-
-var focused = false;
-var priorityCount = 0;
-var unitSampler;
-
-function Test( settings ) {
-	var i, l;
-
-	++Test.count;
-
-	extend( this, settings );
-	this.assertions = [];
-	this.semaphore = 0;
-	this.usedAsync = false;
-	this.module = config.currentModule;
-	this.stack = sourceFromStacktrace( 3 );
-
-	// Register unique strings
-	for ( i = 0, l = this.module.tests; i < l.length; i++ ) {
-		if ( this.module.tests[ i ].name === this.testName ) {
-			this.testName += " ";
-		}
-	}
-
-	this.testId = generateHash( this.module.name, this.testName );
-
-	this.module.tests.push( {
-		name: this.testName,
-		testId: this.testId
-	} );
-
-	if ( settings.skip ) {
-
-		// Skipped tests will fully ignore any sent callback
-		this.callback = function() {};
-		this.async = false;
-		this.expected = 0;
-	} else {
-		this.assert = new Assert( this );
-	}
-}
-
-Test.count = 0;
-
-Test.prototype = {
-	before: function() {
-		if (
-
-			// Emit moduleStart when we're switching from one module to another
-			this.module !== config.previousModule ||
-
-				// They could be equal (both undefined) but if the previousModule property doesn't
-				// yet exist it means this is the first test in a suite that isn't wrapped in a
-				// module, in which case we'll just emit a moduleStart event for 'undefined'.
-				// Without this, reporters can get testStart before moduleStart  which is a problem.
-				!hasOwn.call( config, "previousModule" )
-		) {
-			if ( hasOwn.call( config, "previousModule" ) ) {
-				runLoggingCallbacks( "moduleDone", {
-					name: config.previousModule.name,
-					tests: config.previousModule.tests,
-					failed: config.moduleStats.bad,
-					passed: config.moduleStats.all - config.moduleStats.bad,
-					total: config.moduleStats.all,
-					runtime: now() - config.moduleStats.started
-				} );
-			}
-			config.previousModule = this.module;
-			config.moduleStats = { all: 0, bad: 0, started: now() };
-			runLoggingCallbacks( "moduleStart", {
-				name: this.module.name,
-				tests: this.module.tests
-			} );
-		}
-
-		config.current = this;
-
-		if ( this.module.testEnvironment ) {
-			delete this.module.testEnvironment.beforeEach;
-			delete this.module.testEnvironment.afterEach;
-		}
-		this.testEnvironment = extend( {}, this.module.testEnvironment );
-
-		this.started = now();
-		runLoggingCallbacks( "testStart", {
-			name: this.testName,
-			module: this.module.name,
-			testId: this.testId
-		} );
-
-		if ( !config.pollution ) {
-			saveGlobal();
-		}
-	},
-
-	run: function() {
-		var promise;
-
-		config.current = this;
-
-		if ( this.async ) {
-			QUnit.stop();
-		}
-
-		this.callbackStarted = now();
-
-		if ( config.notrycatch ) {
-			runTest( this );
-			return;
-		}
-
-		try {
-			runTest( this );
-		} catch ( e ) {
-			this.pushFailure( "Died on test #" + ( this.assertions.length + 1 ) + " " +
-				this.stack + ": " + ( e.message || e ), extractStacktrace( e, 0 ) );
-
-			// Else next test will carry the responsibility
-			saveGlobal();
-
-			// Restart the tests if they're blocking
-			if ( config.blocking ) {
-				QUnit.start();
-			}
-		}
-
-		function runTest( test ) {
-			promise = test.callback.call( test.testEnvironment, test.assert );
-			test.resolvePromise( promise );
-		}
-	},
-
-	after: function() {
-		checkPollution();
-	},
-
-	queueHook: function( hook, hookName ) {
-		var promise,
-			test = this;
-		return function runHook() {
-			config.current = test;
-			if ( config.notrycatch ) {
-				callHook();
-				return;
-			}
-			try {
-				callHook();
-			} catch ( error ) {
-				test.pushFailure( hookName + " failed on " + test.testName + ": " +
-				( error.message || error ), extractStacktrace( error, 0 ) );
-			}
-
-			function callHook() {
-				promise = hook.call( test.testEnvironment, test.assert );
-				test.resolvePromise( promise, hookName );
-			}
-		};
-	},
-
-	// Currently only used for module level hooks, can be used to add global level ones
-	hooks: function( handler ) {
-		var hooks = [];
-
-		function processHooks( test, module ) {
-			if ( module.parentModule ) {
-				processHooks( test, module.parentModule );
-			}
-			if ( module.testEnvironment &&
-				QUnit.objectType( module.testEnvironment[ handler ] ) === "function" ) {
-				hooks.push( test.queueHook( module.testEnvironment[ handler ], handler ) );
-			}
-		}
-
-		// Hooks are ignored on skipped tests
-		if ( !this.skip ) {
-			processHooks( this, this.module );
-		}
-		return hooks;
-	},
-
-	finish: function() {
-		config.current = this;
-		if ( config.requireExpects && this.expected === null ) {
-			this.pushFailure( "Expected number of assertions to be defined, but expect() was " +
-				"not called.", this.stack );
-		} else if ( this.expected !== null && this.expected !== this.assertions.length ) {
-			this.pushFailure( "Expected " + this.expected + " assertions, but " +
-				this.assertions.length + " were run", this.stack );
-		} else if ( this.expected === null && !this.assertions.length ) {
-			this.pushFailure( "Expected at least one assertion, but none were run - call " +
-				"expect(0) to accept zero assertions.", this.stack );
-		}
-
-		var i,
-			bad = 0;
-
-		this.runtime = now() - this.started;
-		config.stats.all += this.assertions.length;
-		config.moduleStats.all += this.assertions.length;
-
-		for ( i = 0; i < this.assertions.length; i++ ) {
-			if ( !this.assertions[ i ].result ) {
-				bad++;
-				config.stats.bad++;
-				config.moduleStats.bad++;
-			}
-		}
-
-		runLoggingCallbacks( "testDone", {
-			name: this.testName,
-			module: this.module.name,
-			skipped: !!this.skip,
-			failed: bad,
-			passed: this.assertions.length - bad,
-			total: this.assertions.length,
-			runtime: this.runtime,
-
-			// HTML Reporter use
-			assertions: this.assertions,
-			testId: this.testId,
-
-			// Source of Test
-			source: this.stack,
-
-			// DEPRECATED: this property will be removed in 2.0.0, use runtime instead
-			duration: this.runtime
-		} );
-
-		// QUnit.reset() is deprecated and will be replaced for a new
-		// fixture reset function on QUnit 2.0/2.1.
-		// It's still called here for backwards compatibility handling
-		QUnit.reset();
-
-		config.current = undefined;
-	},
-
-	queue: function() {
-		var priority,
-			test = this;
-
-		if ( !this.valid() ) {
-			return;
-		}
-
-		function run() {
-
-			// Each of these can by async
-			synchronize( [
-				function() {
-					test.before();
-				},
-
-				test.hooks( "beforeEach" ),
-				function() {
-					test.run();
-				},
-
-				test.hooks( "afterEach" ).reverse(),
-
-				function() {
-					test.after();
-				},
-				function() {
-					test.finish();
-				}
-			] );
-		}
-
-		// Prioritize previously failed tests, detected from sessionStorage
-		priority = QUnit.config.reorder && defined.sessionStorage &&
-				+sessionStorage.getItem( "qunit-test-" + this.module.name + "-" + this.testName );
-
-		return synchronize( run, priority, config.seed );
-	},
-
-	pushResult: function( resultInfo ) {
-
-		// Destructure of resultInfo = { result, actual, expected, message, negative }
-		var source,
-			details = {
-				module: this.module.name,
-				name: this.testName,
-				result: resultInfo.result,
-				message: resultInfo.message,
-				actual: resultInfo.actual,
-				expected: resultInfo.expected,
-				testId: this.testId,
-				negative: resultInfo.negative || false,
-				runtime: now() - this.started
-			};
-
-		if ( !resultInfo.result ) {
-			source = sourceFromStacktrace();
-
-			if ( source ) {
-				details.source = source;
-			}
-		}
-
-		runLoggingCallbacks( "log", details );
-
-		this.assertions.push( {
-			result: !!resultInfo.result,
-			message: resultInfo.message
-		} );
-	},
-
-	pushFailure: function( message, source, actual ) {
-		if ( !( this instanceof Test ) ) {
-			throw new Error( "pushFailure() assertion outside test context, was " +
-				sourceFromStacktrace( 2 ) );
-		}
-
-		var details = {
-				module: this.module.name,
-				name: this.testName,
-				result: false,
-				message: message || "error",
-				actual: actual || null,
-				testId: this.testId,
-				runtime: now() - this.started
-			};
-
-		if ( source ) {
-			details.source = source;
-		}
-
-		runLoggingCallbacks( "log", details );
-
-		this.assertions.push( {
-			result: false,
-			message: message
-		} );
-	},
-
-	resolvePromise: function( promise, phase ) {
-		var then, message,
-			test = this;
-		if ( promise != null ) {
-			then = promise.then;
-			if ( QUnit.objectType( then ) === "function" ) {
-				QUnit.stop();
-				then.call(
-					promise,
-					function() { QUnit.start(); },
-					function( error ) {
-						message = "Promise rejected " +
-							( !phase ? "during" : phase.replace( /Each$/, "" ) ) +
-							" " + test.testName + ": " + ( error.message || error );
-						test.pushFailure( message, extractStacktrace( error, 0 ) );
-
-						// Else next test will carry the responsibility
-						saveGlobal();
-
-						// Unblock
-						QUnit.start();
-					}
-				);
-			}
-		}
-	},
-
-	valid: function() {
-		var filter = config.filter,
-			regexFilter = /^(!?)\/([\w\W]*)\/(i?$)/.exec( filter ),
-			module = config.module && config.module.toLowerCase(),
-			fullName = ( this.module.name + ": " + this.testName );
-
-		function moduleChainNameMatch( testModule ) {
-			var testModuleName = testModule.name ? testModule.name.toLowerCase() : null;
-			if ( testModuleName === module ) {
-				return true;
-			} else if ( testModule.parentModule ) {
-				return moduleChainNameMatch( testModule.parentModule );
-			} else {
-				return false;
-			}
-		}
-
-		function moduleChainIdMatch( testModule ) {
-			return inArray( testModule.moduleId, config.moduleId ) > -1 ||
-				testModule.parentModule && moduleChainIdMatch( testModule.parentModule );
-		}
-
-		// Internally-generated tests are always valid
-		if ( this.callback && this.callback.validTest ) {
-			return true;
-		}
-
-		if ( config.moduleId && config.moduleId.length > 0 &&
-			!moduleChainIdMatch( this.module ) ) {
-
-			return false;
-		}
-
-		if ( config.testId && config.testId.length > 0 &&
-			inArray( this.testId, config.testId ) < 0 ) {
-
-			return false;
-		}
-
-		if ( module && !moduleChainNameMatch( this.module ) ) {
-			return false;
-		}
-
-		if ( !filter ) {
-			return true;
-		}
-
-		return regexFilter ?
-			this.regexFilter( !!regexFilter[ 1 ], regexFilter[ 2 ], regexFilter[ 3 ], fullName ) :
-			this.stringFilter( filter, fullName );
-	},
-
-	regexFilter: function( exclude, pattern, flags, fullName ) {
-		var regex = new RegExp( pattern, flags );
-		var match = regex.test( fullName );
-
-		return match !== exclude;
-	},
-
-	stringFilter: function( filter, fullName ) {
-		filter = filter.toLowerCase();
-		fullName = fullName.toLowerCase();
-
-		var include = filter.charAt( 0 ) !== "!";
-		if ( !include ) {
-			filter = filter.slice( 1 );
-		}
-
-		// If the filter matches, we need to honour include
-		if ( fullName.indexOf( filter ) !== -1 ) {
-			return include;
-		}
-
-		// Otherwise, do the opposite
-		return !include;
-	}
-};
-
-// Resets the test setup. Useful for tests that modify the DOM.
-/*
-DEPRECATED: Use multiple tests instead of resetting inside a test.
-Use testStart or testDone for custom cleanup.
-This method will throw an error in 2.0, and will be removed in 2.1
-*/
-QUnit.reset = function() {
-
-	// Return on non-browser environments
-	// This is necessary to not break on node tests
-	if ( !defined.document ) {
-		return;
-	}
-
-	var fixture = defined.document && document.getElementById &&
-			document.getElementById( "qunit-fixture" );
-
-	if ( fixture ) {
-		fixture.innerHTML = config.fixture;
-	}
-};
-
-QUnit.pushFailure = function() {
-	if ( !QUnit.config.current ) {
-		throw new Error( "pushFailure() assertion outside test context, in " +
-			sourceFromStacktrace( 2 ) );
-	}
-
-	// Gets current test obj
-	var currentTest = QUnit.config.current;
-
-	return currentTest.pushFailure.apply( currentTest, arguments );
-};
-
-// Based on Java's String.hashCode, a simple but not
-// rigorously collision resistant hashing function
-function generateHash( module, testName ) {
-	var hex,
-		i = 0,
-		hash = 0,
-		str = module + "\x1C" + testName,
-		len = str.length;
-
-	for ( ; i < len; i++ ) {
-		hash  = ( ( hash << 5 ) - hash ) + str.charCodeAt( i );
-		hash |= 0;
-	}
-
-	// Convert the possibly negative integer hash code into an 8 character hex string, which isn't
-	// strictly necessary but increases user understanding that the id is a SHA-like hash
-	hex = ( 0x100000000 + hash ).toString( 16 );
-	if ( hex.length < 8 ) {
-		hex = "0000000" + hex;
-	}
-
-	return hex.slice( -8 );
-}
-
-function synchronize( callback, priority, seed ) {
-	var last = !priority,
-		index;
-
-	if ( QUnit.objectType( callback ) === "array" ) {
-		while ( callback.length ) {
-			synchronize( callback.shift() );
-		}
-		return;
-	}
-
-	if ( priority ) {
-		config.queue.splice( priorityCount++, 0, callback );
-	} else if ( seed ) {
-		if ( !unitSampler ) {
-			unitSampler = unitSamplerGenerator( seed );
-		}
-
-		// Insert into a random position after all priority items
-		index = Math.floor( unitSampler() * ( config.queue.length - priorityCount + 1 ) );
-		config.queue.splice( priorityCount + index, 0, callback );
-	} else {
-		config.queue.push( callback );
-	}
-
-	if ( config.autorun && !config.blocking ) {
-		process( last );
-	}
-}
-
-function unitSamplerGenerator( seed ) {
-
-	// 32-bit xorshift, requires only a nonzero seed
-	// http://excamera.com/sphinx/article-xorshift.html
-	var sample = parseInt( generateHash( seed ), 16 ) || -1;
-	return function() {
-		sample ^= sample << 13;
-		sample ^= sample >>> 17;
-		sample ^= sample << 5;
-
-		// ECMAScript has no unsigned number type
-		if ( sample < 0 ) {
-			sample += 0x100000000;
-		}
-
-		return sample / 0x100000000;
-	};
-}
-
-function saveGlobal() {
-	config.pollution = [];
-
-	if ( config.noglobals ) {
-		for ( var key in global ) {
-			if ( hasOwn.call( global, key ) ) {
-
-				// In Opera sometimes DOM element ids show up here, ignore them
-				if ( /^qunit-test-output/.test( key ) ) {
-					continue;
-				}
-				config.pollution.push( key );
-			}
-		}
-	}
-}
-
-function checkPollution() {
-	var newGlobals,
-		deletedGlobals,
-		old = config.pollution;
-
-	saveGlobal();
-
-	newGlobals = diff( config.pollution, old );
-	if ( newGlobals.length > 0 ) {
-		QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join( ", " ) );
-	}
-
-	deletedGlobals = diff( old, config.pollution );
-	if ( deletedGlobals.length > 0 ) {
-		QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join( ", " ) );
-	}
-}
-
-// Will be exposed as QUnit.asyncTest
-function asyncTest( testName, expected, callback ) {
-	if ( arguments.length === 2 ) {
-		callback = expected;
-		expected = null;
-	}
-
-	QUnit.test( testName, expected, callback, true );
-}
-
-// Will be exposed as QUnit.test
-function test( testName, expected, callback, async ) {
-	if ( focused )  { return; }
-
-	var newTest;
-
-	if ( arguments.length === 2 ) {
-		callback = expected;
-		expected = null;
-	}
-
-	newTest = new Test( {
-		testName: testName,
-		expected: expected,
-		async: async,
-		callback: callback
-	} );
-
-	newTest.queue();
-}
-
-// Will be exposed as QUnit.skip
-function skip( testName ) {
-	if ( focused )  { return; }
-
-	var test = new Test( {
-		testName: testName,
-		skip: true
-	} );
-
-	test.queue();
-}
-
-// Will be exposed as QUnit.only
-function only( testName, expected, callback, async ) {
-	var newTest;
-
-	if ( focused )  { return; }
-
-	QUnit.config.queue.length = 0;
-	focused = true;
-
-	if ( arguments.length === 2 ) {
-		callback = expected;
-		expected = null;
-	}
-
-	newTest = new Test( {
-		testName: testName,
-		expected: expected,
-		async: async,
-		callback: callback
-	} );
-
-	newTest.queue();
-}
-
-function Assert( testContext ) {
-	this.test = testContext;
-}
-
-// Assert helpers
-QUnit.assert = Assert.prototype = {
-
-	// Specify the number of expected assertions to guarantee that failed test
-	// (no assertions are run at all) don't slip through.
-	expect: function( asserts ) {
-		if ( arguments.length === 1 ) {
-			this.test.expected = asserts;
-		} else {
-			return this.test.expected;
-		}
-	},
-
-	// Increment this Test's semaphore counter, then return a function that
-	// decrements that counter a maximum of once.
-	async: function( count ) {
-		var test = this.test,
-			popped = false,
-			acceptCallCount = count;
-
-		if ( typeof acceptCallCount === "undefined" ) {
-			acceptCallCount = 1;
-		}
-
-		test.semaphore += 1;
-		test.usedAsync = true;
-		pauseProcessing();
-
-		return function done() {
-
-			if ( popped ) {
-				test.pushFailure( "Too many calls to the `assert.async` callback",
-					sourceFromStacktrace( 2 ) );
-				return;
-			}
-			acceptCallCount -= 1;
-			if ( acceptCallCount > 0 ) {
-				return;
-			}
-
-			test.semaphore -= 1;
-			popped = true;
-			resumeProcessing();
-		};
-	},
-
-	// Exports test.push() to the user API
-	// Alias of pushResult.
-	push: function( result, actual, expected, message, negative ) {
-		var currentAssert = this instanceof Assert ? this : QUnit.config.current.assert;
-		return currentAssert.pushResult( {
-			result: result,
-			actual: actual,
-			expected: expected,
-			message: message,
-			negative: negative
-		} );
-	},
-
-	pushResult: function( resultInfo ) {
-
-		// Destructure of resultInfo = { result, actual, expected, message, negative }
-		var assert = this,
-			currentTest = ( assert instanceof Assert && assert.test ) || QUnit.config.current;
-
-		// Backwards compatibility fix.
-		// Allows the direct use of global exported assertions and QUnit.assert.*
-		// Although, it's use is not recommended as it can leak assertions
-		// to other tests from async tests, because we only get a reference to the current test,
-		// not exactly the test where assertion were intended to be called.
-		if ( !currentTest ) {
-			throw new Error( "assertion outside test context, in " + sourceFromStacktrace( 2 ) );
-		}
-
-		if ( currentTest.usedAsync === true && currentTest.semaphore === 0 ) {
-			currentTest.pushFailure( "Assertion after the final `assert.async` was resolved",
-				sourceFromStacktrace( 2 ) );
-
-			// Allow this assertion to continue running anyway...
-		}
-
-		if ( !( assert instanceof Assert ) ) {
-			assert = currentTest.assert;
-		}
-
-		return assert.test.pushResult( resultInfo );
-	},
-
-	ok: function( result, message ) {
-		message = message || ( result ? "okay" : "failed, expected argument to be truthy, was: " +
-			QUnit.dump.parse( result ) );
-		this.pushResult( {
-			result: !!result,
-			actual: result,
-			expected: true,
-			message: message
-		} );
-	},
-
-	notOk: function( result, message ) {
-		message = message || ( !result ? "okay" : "failed, expected argument to be falsy, was: " +
-			QUnit.dump.parse( result ) );
-		this.pushResult( {
-			result: !result,
-			actual: result,
-			expected: false,
-			message: message
-		} );
-	},
-
-	equal: function( actual, expected, message ) {
-		/*jshint eqeqeq:false */
-		this.pushResult( {
-			result: expected == actual,
-			actual: actual,
-			expected: expected,
-			message: message
-		} );
-	},
-
-	notEqual: function( actual, expected, message ) {
-		/*jshint eqeqeq:false */
-		this.pushResult( {
-			result: expected != actual,
-			actual: actual,
-			expected: expected,
-			message: message,
-			negative: true
-		} );
-	},
-
-	propEqual: function( actual, expected, message ) {
-		actual = objectValues( actual );
-		expected = objectValues( expected );
-		this.pushResult( {
-			result: QUnit.equiv( actual, expected ),
-			actual: actual,
-			expected: expected,
-			message: message
-		} );
-	},
-
-	notPropEqual: function( actual, expected, message ) {
-		actual = objectValues( actual );
-		expected = objectValues( expected );
-		this.pushResult( {
-			result: !QUnit.equiv( actual, expected ),
-			actual: actual,
-			expected: expected,
-			message: message,
-			negative: true
-		} );
-	},
-
-	deepEqual: function( actual, expected, message ) {
-		this.pushResult( {
-			result: QUnit.equiv( actual, expected ),
-			actual: actual,
-			expected: expected,
-			message: message
-		} );
-	},
-
-	notDeepEqual: function( actual, expected, message ) {
-		this.pushResult( {
-			result: !QUnit.equiv( actual, expected ),
-			actual: actual,
-			expected: expected,
-			message: message,
-			negative: true
-		} );
-	},
-
-	strictEqual: function( actual, expected, message ) {
-		this.pushResult( {
-			result: expected === actual,
-			actual: actual,
-			expected: expected,
-			message: message
-		} );
-	},
-
-	notStrictEqual: function( actual, expected, message ) {
-		this.pushResult( {
-			result: expected !== actual,
-			actual: actual,
-			expected: expected,
-			message: message,
-			negative: true
-		} );
-	},
-
-	"throws": function( block, expected, message ) {
-		var actual, expectedType,
-			expectedOutput = expected,
-			ok = false,
-			currentTest = ( this instanceof Assert && this.test ) || QUnit.config.current;
-
-		// 'expected' is optional unless doing string comparison
-		if ( message == null && typeof expected === "string" ) {
-			message = expected;
-			expected = null;
-		}
-
-		currentTest.ignoreGlobalErrors = true;
-		try {
-			block.call( currentTest.testEnvironment );
-		} catch ( e ) {
-			actual = e;
-		}
-		currentTest.ignoreGlobalErrors = false;
-
-		if ( actual ) {
-			expectedType = QUnit.objectType( expected );
-
-			// We don't want to validate thrown error
-			if ( !expected ) {
-				ok = true;
-				expectedOutput = null;
-
-			// Expected is a regexp
-			} else if ( expectedType === "regexp" ) {
-				ok = expected.test( errorString( actual ) );
-
-			// Expected is a string
-			} else if ( expectedType === "string" ) {
-				ok = expected === errorString( actual );
-
-			// Expected is a constructor, maybe an Error constructor
-			} else if ( expectedType === "function" && actual instanceof expected ) {
-				ok = true;
-
-			// Expected is an Error object
-			} else if ( expectedType === "object" ) {
-				ok = actual instanceof expected.constructor &&
-					actual.name === expected.name &&
-					actual.message === expected.message;
-
-			// Expected is a validation function which returns true if validation passed
-			} else if ( expectedType === "function" && expected.call( {}, actual ) === true ) {
-				expectedOutput = null;
-				ok = true;
-			}
-		}
-
-		currentTest.assert.pushResult( {
-			result: ok,
-			actual: actual,
-			expected: expectedOutput,
-			message: message
-		} );
-	}
-};
-
-// Provide an alternative to assert.throws(), for environments that consider throws a reserved word
-// Known to us are: Closure Compiler, Narwhal
-( function() {
-	/*jshint sub:true */
-	Assert.prototype.raises = Assert.prototype [ "throws" ]; //jscs:ignore requireDotNotation
-}() );
-
-function errorString( error ) {
-	var name, message,
-		resultErrorString = error.toString();
-	if ( resultErrorString.substring( 0, 7 ) === "[object" ) {
-		name = error.name ? error.name.toString() : "Error";
-		message = error.message ? error.message.toString() : "";
-		if ( name && message ) {
-			return name + ": " + message;
-		} else if ( name ) {
-			return name;
-		} else if ( message ) {
-			return message;
-		} else {
-			return "Error";
-		}
-	} else {
-		return resultErrorString;
-	}
-}
-
-// Test for equality any JavaScript type.
-// Author: Philippe Rathé <prathe@gmail.com>
-QUnit.equiv = ( function() {
-
-	// Stack to decide between skip/abort functions
-	var callers = [];
-
-	// Stack to avoiding loops from circular referencing
-	var parents = [];
-	var parentsB = [];
-
-	var getProto = Object.getPrototypeOf || function( obj ) {
-
-		/*jshint proto: true */
-		return obj.__proto__;
-	};
-
-	function useStrictEquality( b, a ) {
-
-		// To catch short annotation VS 'new' annotation of a declaration. e.g.:
-		// `var i = 1;`
-		// `var j = new Number(1);`
-		if ( typeof a === "object" ) {
-			a = a.valueOf();
-		}
-		if ( typeof b === "object" ) {
-			b = b.valueOf();
-		}
-
-		return a === b;
-	}
-
-	function compareConstructors( a, b ) {
-		var protoA = getProto( a );
-		var protoB = getProto( b );
-
-		// Comparing constructors is more strict than using `instanceof`
-		if ( a.constructor === b.constructor ) {
-			return true;
-		}
-
-		// Ref #851
-		// If the obj prototype descends from a null constructor, treat it
-		// as a null prototype.
-		if ( protoA && protoA.constructor === null ) {
-			protoA = null;
-		}
-		if ( protoB && protoB.constructor === null ) {
-			protoB = null;
-		}
-
-		// Allow objects with no prototype to be equivalent to
-		// objects with Object as their constructor.
-		if ( ( protoA === null && protoB === Object.prototype ) ||
-				( protoB === null && protoA === Object.prototype ) ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	function getRegExpFlags( regexp ) {
-		return "flags" in regexp ? regexp.flags : regexp.toString().match( /[gimuy]*$/ )[ 0 ];
-	}
-
-	var callbacks = {
-		"string": useStrictEquality,
-		"boolean": useStrictEquality,
-		"number": useStrictEquality,
-		"null": useStrictEquality,
-		"undefined": useStrictEquality,
-		"symbol": useStrictEquality,
-		"date": useStrictEquality,
-
-		"nan": function() {
-			return true;
-		},
-
-		"regexp": function( b, a ) {
-			return a.source === b.source &&
-
-				// Include flags in the comparison
-				getRegExpFlags( a ) === getRegExpFlags( b );
-		},
-
-		// - skip when the property is a method of an instance (OOP)
-		// - abort otherwise,
-		// initial === would have catch identical references anyway
-		"function": function() {
-			var caller = callers[ callers.length - 1 ];
-			return caller !== Object && typeof caller !== "undefined";
-		},
-
-		"array": function( b, a ) {
-			var i, j, len, loop, aCircular, bCircular;
-
-			len = a.length;
-			if ( len !== b.length ) {
-
-				// Safe and faster
-				return false;
-			}
-
-			// Track reference to avoid circular references
-			parents.push( a );
-			parentsB.push( b );
-			for ( i = 0; i < len; i++ ) {
-				loop = false;
-				for ( j = 0; j < parents.length; j++ ) {
-					aCircular = parents[ j ] === a[ i ];
-					bCircular = parentsB[ j ] === b[ i ];
-					if ( aCircular || bCircular ) {
-						if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
-							loop = true;
-						} else {
-							parents.pop();
-							parentsB.pop();
-							return false;
-						}
-					}
-				}
-				if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
-					parents.pop();
-					parentsB.pop();
-					return false;
-				}
-			}
-			parents.pop();
-			parentsB.pop();
-			return true;
-		},
-
-		"set": function( b, a ) {
-			var innerEq,
-				outerEq = true;
-
-			if ( a.size !== b.size ) {
-				return false;
-			}
-
-			a.forEach( function( aVal ) {
-				innerEq = false;
-
-				b.forEach( function( bVal ) {
-					if ( innerEquiv( bVal, aVal ) ) {
-						innerEq = true;
-					}
-				} );
-
-				if ( !innerEq ) {
-					outerEq = false;
-				}
-			} );
-
-			return outerEq;
-		},
-
-		"map": function( b, a ) {
-			var innerEq,
-				outerEq = true;
-
-			if ( a.size !== b.size ) {
-				return false;
-			}
-
-			a.forEach( function( aVal, aKey ) {
-				innerEq = false;
-
-				b.forEach( function( bVal, bKey ) {
-					if ( innerEquiv( [ bVal, bKey ], [ aVal, aKey ] ) ) {
-						innerEq = true;
-					}
-				} );
-
-				if ( !innerEq ) {
-					outerEq = false;
-				}
-			} );
-
-			return outerEq;
-		},
-
-		"object": function( b, a ) {
-			var i, j, loop, aCircular, bCircular;
-
-			// Default to true
-			var eq = true;
-			var aProperties = [];
-			var bProperties = [];
-
-			if ( compareConstructors( a, b ) === false ) {
-				return false;
-			}
-
-			// Stack constructor before traversing properties
-			callers.push( a.constructor );
-
-			// Track reference to avoid circular references
-			parents.push( a );
-			parentsB.push( b );
-
-			// Be strict: don't ensure hasOwnProperty and go deep
-			for ( i in a ) {
-				loop = false;
-				for ( j = 0; j < parents.length; j++ ) {
-					aCircular = parents[ j ] === a[ i ];
-					bCircular = parentsB[ j ] === b[ i ];
-					if ( aCircular || bCircular ) {
-						if ( a[ i ] === b[ i ] || aCircular && bCircular ) {
-							loop = true;
-						} else {
-							eq = false;
-							break;
-						}
-					}
-				}
-				aProperties.push( i );
-				if ( !loop && !innerEquiv( a[ i ], b[ i ] ) ) {
-					eq = false;
-					break;
-				}
-			}
-
-			parents.pop();
-			parentsB.pop();
-
-			// Unstack, we are done
-			callers.pop();
-
-			for ( i in b ) {
-
-				// Collect b's properties
-				bProperties.push( i );
-			}
-
-			// Ensures identical properties name
-			return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
-		}
-	};
-
-	function typeEquiv( a, b ) {
-		var type = QUnit.objectType( a );
-		return QUnit.objectType( b ) === type && callbacks[ type ]( b, a );
-	}
-
-	// The real equiv function
-	function innerEquiv( a, b ) {
-
-		// We're done when there's nothing more to compare
-		if ( arguments.length < 2 ) {
-			return true;
-		}
-
-		// Require type-specific equality
-		return ( a === b || typeEquiv( a, b ) ) &&
-
-			// ...across all consecutive argument pairs
-			( arguments.length === 2 || innerEquiv.apply( this, [].slice.call( arguments, 1 ) ) );
-	}
-
-	return innerEquiv;
-}() );
-
-// Based on jsDump by Ariel Flesler
-// http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html
-QUnit.dump = ( function() {
-	function quote( str ) {
-		return "\"" + str.toString().replace( /\\/g, "\\\\" ).replace( /"/g, "\\\"" ) + "\"";
-	}
-	function literal( o ) {
-		return o + "";
-	}
-	function join( pre, arr, post ) {
-		var s = dump.separator(),
-			base = dump.indent(),
-			inner = dump.indent( 1 );
-		if ( arr.join ) {
-			arr = arr.join( "," + s + inner );
-		}
-		if ( !arr ) {
-			return pre + post;
-		}
-		return [ pre, inner + arr, base + post ].join( s );
-	}
-	function array( arr, stack ) {
-		var i = arr.length,
-			ret = new Array( i );
-
-		if ( dump.maxDepth && dump.depth > dump.maxDepth ) {
-			return "[object Array]";
-		}
-
-		this.up();
-		while ( i-- ) {
-			ret[ i ] = this.parse( arr[ i ], undefined, stack );
-		}
-		this.down();
-		return join( "[", ret, "]" );
-	}
-
-	var reName = /^function (\w+)/,
-		dump = {
-
-			// The objType is used mostly internally, you can fix a (custom) type in advance
-			parse: function( obj, objType, stack ) {
-				stack = stack || [];
-				var res, parser, parserType,
-					inStack = inArray( obj, stack );
-
-				if ( inStack !== -1 ) {
-					return "recursion(" + ( inStack - stack.length ) + ")";
-				}
-
-				objType = objType || this.typeOf( obj  );
-				parser = this.parsers[ objType ];
-				parserType = typeof parser;
-
-				if ( parserType === "function" ) {
-					stack.push( obj );
-					res = parser.call( this, obj, stack );
-					stack.pop();
-					return res;
-				}
-				return ( parserType === "string" ) ? parser : this.parsers.error;
-			},
-			typeOf: function( obj ) {
-				var type;
-				if ( obj === null ) {
-					type = "null";
-				} else if ( typeof obj === "undefined" ) {
-					type = "undefined";
-				} else if ( QUnit.is( "regexp", obj ) ) {
-					type = "regexp";
-				} else if ( QUnit.is( "date", obj ) ) {
-					type = "date";
-				} else if ( QUnit.is( "function", obj ) ) {
-					type = "function";
-				} else if ( obj.setInterval !== undefined &&
-						obj.document !== undefined &&
-						obj.nodeType === undefined ) {
-					type = "window";
-				} else if ( obj.nodeType === 9 ) {
-					type = "document";
-				} else if ( obj.nodeType ) {
-					type = "node";
-				} else if (
-
-					// Native arrays
-					toString.call( obj ) === "[object Array]" ||
-
-					// NodeList objects
-					( typeof obj.length === "number" && obj.item !== undefined &&
-					( obj.length ? obj.item( 0 ) === obj[ 0 ] : ( obj.item( 0 ) === null &&
-					obj[ 0 ] === undefined ) ) )
-				) {
-					type = "array";
-				} else if ( obj.constructor === Error.prototype.constructor ) {
-					type = "error";
-				} else {
-					type = typeof obj;
-				}
-				return type;
-			},
-
-			separator: function() {
-				return this.multiline ? this.HTML ? "<br />" : "\n" : this.HTML ? "&#160;" : " ";
-			},
-
-			// Extra can be a number, shortcut for increasing-calling-decreasing
-			indent: function( extra ) {
-				if ( !this.multiline ) {
-					return "";
-				}
-				var chr = this.indentChar;
-				if ( this.HTML ) {
-					chr = chr.replace( /\t/g, "   " ).replace( / /g, "&#160;" );
-				}
-				return new Array( this.depth + ( extra || 0 ) ).join( chr );
-			},
-			up: function( a ) {
-				this.depth += a || 1;
-			},
-			down: function( a ) {
-				this.depth -= a || 1;
-			},
-			setParser: function( name, parser ) {
-				this.parsers[ name ] = parser;
-			},
-
-			// The next 3 are exposed so you can use them
-			quote: quote,
-			literal: literal,
-			join: join,
-			depth: 1,
-			maxDepth: QUnit.config.maxDepth,
-
-			// This is the list of parsers, to modify them, use dump.setParser
-			parsers: {
-				window: "[Window]",
-				document: "[Document]",
-				error: function( error ) {
-					return "Error(\"" + error.message + "\")";
-				},
-				unknown: "[Unknown]",
-				"null": "null",
-				"undefined": "undefined",
-				"function": function( fn ) {
-					var ret = "function",
-
-						// Functions never have name in IE
-						name = "name" in fn ? fn.name : ( reName.exec( fn ) || [] )[ 1 ];
-
-					if ( name ) {
-						ret += " " + name;
-					}
-					ret += "(";
-
-					ret = [ ret, dump.parse( fn, "functionArgs" ), "){" ].join( "" );
-					return join( ret, dump.parse( fn, "functionCode" ), "}" );
-				},
-				array: array,
-				nodelist: array,
-				"arguments": array,
-				object: function( map, stack ) {
-					var keys, key, val, i, nonEnumerableProperties,
-						ret = [];
-
-					if ( dump.maxDepth && dump.depth > dump.maxDepth ) {
-						return "[object Object]";
-					}
-
-					dump.up();
-					keys = [];
-					for ( key in map ) {
-						keys.push( key );
-					}
-
-					// Some properties are not always enumerable on Error objects.
-					nonEnumerableProperties = [ "message", "name" ];
-					for ( i in nonEnumerableProperties ) {
-						key = nonEnumerableProperties[ i ];
-						if ( key in map && inArray( key, keys ) < 0 ) {
-							keys.push( key );
-						}
-					}
-					keys.sort();
-					for ( i = 0; i < keys.length; i++ ) {
-						key = keys[ i ];
-						val = map[ key ];
-						ret.push( dump.parse( key, "key" ) + ": " +
-							dump.parse( val, undefined, stack ) );
-					}
-					dump.down();
-					return join( "{", ret, "}" );
-				},
-				node: function( node ) {
-					var len, i, val,
-						open = dump.HTML ? "&lt;" : "<",
-						close = dump.HTML ? "&gt;" : ">",
-						tag = node.nodeName.toLowerCase(),
-						ret = open + tag,
-						attrs = node.attributes;
-
-					if ( attrs ) {
-						for ( i = 0, len = attrs.length; i < len; i++ ) {
-							val = attrs[ i ].nodeValue;
-
-							// IE6 includes all attributes in .attributes, even ones not explicitly
-							// set. Those have values like undefined, null, 0, false, "" or
-							// "inherit".
-							if ( val && val !== "inherit" ) {
-								ret += " " + attrs[ i ].nodeName + "=" +
-									dump.parse( val, "attribute" );
-							}
-						}
-					}
-					ret += close;
-
-					// Show content of TextNode or CDATASection
-					if ( node.nodeType === 3 || node.nodeType === 4 ) {
-						ret += node.nodeValue;
-					}
-
-					return ret + open + "/" + tag + close;
-				},
-
-				// Function calls it internally, it's the arguments part of the function
-				functionArgs: function( fn ) {
-					var args,
-						l = fn.length;
-
-					if ( !l ) {
-						return "";
-					}
-
-					args = new Array( l );
-					while ( l-- ) {
-
-						// 97 is 'a'
-						args[ l ] = String.fromCharCode( 97 + l );
-					}
-					return " " + args.join( ", " ) + " ";
-				},
-
-				// Object calls it internally, the key part of an item in a map
-				key: quote,
-
-				// Function calls it internally, it's the content of the function
-				functionCode: "[code]",
-
-				// Node calls it internally, it's a html attribute value
-				attribute: quote,
-				string: quote,
-				date: quote,
-				regexp: literal,
-				number: literal,
-				"boolean": literal
-			},
-
-			// If true, entities are escaped ( <, >, \t, space and \n )
-			HTML: false,
-
-			// Indentation unit
-			indentChar: "  ",
-
-			// If true, items in a collection, are separated by a \n, else just a space.
-			multiline: true
-		};
-
-	return dump;
-}() );
-
-// Back compat
-QUnit.jsDump = QUnit.dump;
-
-// Deprecated
-// Extend assert methods to QUnit for Backwards compatibility
-( function() {
-	var i,
-		assertions = Assert.prototype;
-
-	function applyCurrent( current ) {
-		return function() {
-			var assert = new Assert( QUnit.config.current );
-			current.apply( assert, arguments );
-		};
-	}
-
-	for ( i in assertions ) {
-		QUnit[ i ] = applyCurrent( assertions[ i ] );
-	}
-}() );
-
-// For browser, export only select globals
-if ( defined.document ) {
-
-	( function() {
-		var i, l,
-			keys = [
-				"test",
-				"module",
-				"expect",
-				"asyncTest",
-				"start",
-				"stop",
-				"ok",
-				"notOk",
-				"equal",
-				"notEqual",
-				"propEqual",
-				"notPropEqual",
-				"deepEqual",
-				"notDeepEqual",
-				"strictEqual",
-				"notStrictEqual",
-				"throws",
-				"raises"
-			];
-
-		for ( i = 0, l = keys.length; i < l; i++ ) {
-			window[ keys[ i ] ] = QUnit[ keys[ i ] ];
-		}
-	}() );
-
-	window.QUnit = QUnit;
-}
-
-// For nodejs
-if ( typeof module !== "undefined" && module && module.exports ) {
-	module.exports = QUnit;
-
-	// For consistency with CommonJS environments' exports
-	module.exports.QUnit = QUnit;
-}
-
-// For CommonJS with exports, but without module.exports, like Rhino
-if ( typeof exports !== "undefined" && exports ) {
-	exports.QUnit = QUnit;
-}
-
-if ( typeof define === "function" && define.amd ) {
-	define( function() {
-		return QUnit;
-	} );
-	QUnit.config.autostart = false;
-}
-
-// Get a reference to the global object, like window in browsers
-}( ( function() {
-	return this;
-}() ) ) );
-
-( function() {
-
-// Only interact with URLs via window.location
-var location = typeof window !== "undefined" && window.location;
-if ( !location ) {
-	return;
-}
-
-var urlParams = getUrlParams();
-
-QUnit.urlParams = urlParams;
-
-// Match module/test by inclusion in an array
-QUnit.config.moduleId = [].concat( urlParams.moduleId || [] );
-QUnit.config.testId = [].concat( urlParams.testId || [] );
-
-// Exact case-insensitive match of the module name
-QUnit.config.module = urlParams.module;
-
-// Regular expression or case-insenstive substring match against "moduleName: testName"
-QUnit.config.filter = urlParams.filter;
-
-// Test order randomization
-if ( urlParams.seed === true ) {
-
-	// Generate a random seed if the option is specified without a value
-	QUnit.config.seed = Math.random().toString( 36 ).slice( 2 );
-} else if ( urlParams.seed ) {
-	QUnit.config.seed = urlParams.seed;
-}
-
-// Add URL-parameter-mapped config values with UI form rendering data
-QUnit.config.urlConfig.push(
-	{
-		id: "hidepassed",
-		label: "Hide passed tests",
-		tooltip: "Only show tests and assertions that fail. Stored as query-strings."
-	},
-	{
-		id: "noglobals",
-		label: "Check for Globals",
-		tooltip: "Enabling this will test if any test introduces new properties on the " +
-			"global object (`window` in Browsers). Stored as query-strings."
-	},
-	{
-		id: "notrycatch",
-		label: "No try-catch",
-		tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging " +
-			"exceptions in IE reasonable. Stored as query-strings."
-	}
-);
-
-QUnit.begin( function() {
-	var i, option,
-		urlConfig = QUnit.config.urlConfig;
-
-	for ( i = 0; i < urlConfig.length; i++ ) {
-
-		// Options can be either strings or objects with nonempty "id" properties
-		option = QUnit.config.urlConfig[ i ];
-		if ( typeof option !== "string" ) {
-			option = option.id;
-		}
-
-		if ( QUnit.config[ option ] === undefined ) {
-			QUnit.config[ option ] = urlParams[ option ];
-		}
-	}
-} );
-
-function getUrlParams() {
-	var i, param, name, value;
-	var urlParams = {};
-	var params = location.search.slice( 1 ).split( "&" );
-	var length = params.length;
-
-	for ( i = 0; i < length; i++ ) {
-		if ( params[ i ] ) {
-			param = params[ i ].split( "=" );
-			name = decodeURIComponent( param[ 0 ] );
-
-			// Allow just a key to turn on a flag, e.g., test.html?noglobals
-			value = param.length === 1 ||
-				decodeURIComponent( param.slice( 1 ).join( "=" ) ) ;
-			if ( urlParams[ name ] ) {
-				urlParams[ name ] = [].concat( urlParams[ name ], value );
-			} else {
-				urlParams[ name ] = value;
-			}
-		}
-	}
-
-	return urlParams;
-}
-
-// Don't load the HTML Reporter on non-browser environments
-if ( typeof window === "undefined" || !window.document ) {
-	return;
-}
-
-// Deprecated QUnit.init - Ref #530
-// Re-initialize the configuration options
-QUnit.init = function() {
-	var config = QUnit.config;
-
-	config.stats = { all: 0, bad: 0 };
-	config.moduleStats = { all: 0, bad: 0 };
-	config.started = 0;
-	config.updateRate = 1000;
-	config.blocking = false;
-	config.autostart = true;
-	config.autorun = false;
-	config.filter = "";
-	config.queue = [];
-
-	appendInterface();
-};
-
-var config = QUnit.config,
-	document = window.document,
-	collapseNext = false,
-	hasOwn = Object.prototype.hasOwnProperty,
-	unfilteredUrl = setUrl( { filter: undefined, module: undefined,
-		moduleId: undefined, testId: undefined } ),
-	defined = {
-		sessionStorage: ( function() {
-			var x = "qunit-test-string";
-			try {
-				sessionStorage.setItem( x, x );
-				sessionStorage.removeItem( x );
-				return true;
-			} catch ( e ) {
-				return false;
-			}
-		}() )
-	},
-	modulesList = [];
-
-/**
-* Escape text for attribute or text content.
-*/
-function escapeText( s ) {
-	if ( !s ) {
-		return "";
-	}
-	s = s + "";
-
-	// Both single quotes and double quotes (for attributes)
-	return s.replace( /['"<>&]/g, function( s ) {
-		switch ( s ) {
-		case "'":
-			return "&#039;";
-		case "\"":
-			return "&quot;";
-		case "<":
-			return "&lt;";
-		case ">":
-			return "&gt;";
-		case "&":
-			return "&amp;";
-		}
-	} );
-}
-
-/**
- * @param {HTMLElement} elem
- * @param {string} type
- * @param {Function} fn
- */
-function addEvent( elem, type, fn ) {
-	if ( elem.addEventListener ) {
-
-		// Standards-based browsers
-		elem.addEventListener( type, fn, false );
-	} else if ( elem.attachEvent ) {
-
-		// Support: IE <9
-		elem.attachEvent( "on" + type, function() {
-			var event = window.event;
-			if ( !event.target ) {
-				event.target = event.srcElement || document;
-			}
-
-			fn.call( elem, event );
-		} );
-	}
-}
-
-/**
- * @param {Array|NodeList} elems
- * @param {string} type
- * @param {Function} fn
- */
-function addEvents( elems, type, fn ) {
-	var i = elems.length;
-	while ( i-- ) {
-		addEvent( elems[ i ], type, fn );
-	}
-}
-
-function hasClass( elem, name ) {
-	return ( " " + elem.className + " " ).indexOf( " " + name + " " ) >= 0;
-}
-
-function addClass( elem, name ) {
-	if ( !hasClass( elem, name ) ) {
-		elem.className += ( elem.className ? " " : "" ) + name;
-	}
-}
-
-function toggleClass( elem, name, force ) {
-	if ( force || typeof force === "undefined" && !hasClass( elem, name ) ) {
-		addClass( elem, name );
-	} else {
-		removeClass( elem, name );
-	}
-}
-
-function removeClass( elem, name ) {
-	var set = " " + elem.className + " ";
-
-	// Class name may appear multiple times
-	while ( set.indexOf( " " + name + " " ) >= 0 ) {
-		set = set.replace( " " + name + " ", " " );
-	}
-
-	// Trim for prettiness
-	elem.className = typeof set.trim === "function" ? set.trim() : set.replace( /^\s+|\s+$/g, "" );
-}
-
-function id( name ) {
-	return document.getElementById && document.getElementById( name );
-}
-
-function getUrlConfigHtml() {
-	var i, j, val,
-		escaped, escapedTooltip,
-		selection = false,
-		urlConfig = config.urlConfig,
-		urlConfigHtml = "";
-
-	for ( i = 0; i < urlConfig.length; i++ ) {
-
-		// Options can be either strings or objects with nonempty "id" properties
-		val = config.urlConfig[ i ];
-		if ( typeof val === "string" ) {
-			val = {
-				id: val,
-				label: val
-			};
-		}
-
-		escaped = escapeText( val.id );
-		escapedTooltip = escapeText( val.tooltip );
-
-		if ( !val.value || typeof val.value === "string" ) {
-			urlConfigHtml += "<input id='qunit-urlconfig-" + escaped +
-				"' name='" + escaped + "' type='checkbox'" +
-				( val.value ? " value='" + escapeText( val.value ) + "'" : "" ) +
-				( config[ val.id ] ? " checked='checked'" : "" ) +
-				" title='" + escapedTooltip + "' /><label for='qunit-urlconfig-" + escaped +
-				"' title='" + escapedTooltip + "'>" + val.label + "</label>";
-		} else {
-			urlConfigHtml += "<label for='qunit-urlconfig-" + escaped +
-				"' title='" + escapedTooltip + "'>" + val.label +
-				": </label><select id='qunit-urlconfig-" + escaped +
-				"' name='" + escaped + "' title='" + escapedTooltip + "'><option></option>";
-
-			if ( QUnit.is( "array", val.value ) ) {
-				for ( j = 0; j < val.value.length; j++ ) {
-					escaped = escapeText( val.value[ j ] );
-					urlConfigHtml += "<option value='" + escaped + "'" +
-						( config[ val.id ] === val.value[ j ] ?
-							( selection = true ) && " selected='selected'" : "" ) +
-						">" + escaped + "</option>";
-				}
-			} else {
-				for ( j in val.value ) {
-					if ( hasOwn.call( val.value, j ) ) {
-						urlConfigHtml += "<option value='" + escapeText( j ) + "'" +
-							( config[ val.id ] === j ?
-								( selection = true ) && " selected='selected'" : "" ) +
-							">" + escapeText( val.value[ j ] ) + "</option>";
-					}
-				}
-			}
-			if ( config[ val.id ] && !selection ) {
-				escaped = escapeText( config[ val.id ] );
-				urlConfigHtml += "<option value='" + escaped +
-					"' selected='selected' disabled='disabled'>" + escaped + "</option>";
-			}
-			urlConfigHtml += "</select>";
-		}
-	}
-
-	return urlConfigHtml;
-}
-
-// Handle "click" events on toolbar checkboxes and "change" for select menus.
-// Updates the URL with the new state of `config.urlConfig` values.
-function toolbarChanged() {
-	var updatedUrl, value, tests,
-		field = this,
-		params = {};
-
-	// Detect if field is a select menu or a checkbox
-	if ( "selectedIndex" in field ) {
-		value = field.options[ field.selectedIndex ].value || undefined;
-	} else {
-		value = field.checked ? ( field.defaultValue || true ) : undefined;
-	}
-
-	params[ field.name ] = value;
-	updatedUrl = setUrl( params );
-
-	// Check if we can apply the change without a page refresh
-	if ( "hidepassed" === field.name && "replaceState" in window.history ) {
-		QUnit.urlParams[ field.name ] = value;
-		config[ field.name ] = value || false;
-		tests = id( "qunit-tests" );
-		if ( tests ) {
-			toggleClass( tests, "hidepass", value || false );
-		}
-		window.history.replaceState( null, "", updatedUrl );
-	} else {
-		window.location = updatedUrl;
-	}
-}
-
-function setUrl( params ) {
-	var key, arrValue, i,
-		querystring = "?",
-		location = window.location;
-
-	params = QUnit.extend( QUnit.extend( {}, QUnit.urlParams ), params );
-
-	for ( key in params ) {
-
-		// Skip inherited or undefined properties
-		if ( hasOwn.call( params, key ) && params[ key ] !== undefined ) {
-
-			// Output a parameter for each value of this key (but usually just one)
-			arrValue = [].concat( params[ key ] );
-			for ( i = 0; i < arrValue.length; i++ ) {
-				querystring += encodeURIComponent( key );
-				if ( arrValue[ i ] !== true ) {
-					querystring += "=" + encodeURIComponent( arrValue[ i ] );
-				}
-				querystring += "&";
-			}
-		}
-	}
-	return location.protocol + "//" + location.host +
-		location.pathname + querystring.slice( 0, -1 );
-}
-
-function applyUrlParams() {
-	var selectedModule,
-		modulesList = id( "qunit-modulefilter" ),
-		filter = id( "qunit-filter-input" ).value;
-
-	selectedModule = modulesList ?
-		decodeURIComponent( modulesList.options[ modulesList.selectedIndex ].value ) :
-		undefined;
-
-	window.location = setUrl( {
-		module: ( selectedModule === "" ) ? undefined : selectedModule,
-		filter: ( filter === "" ) ? undefined : filter,
-
-		// Remove moduleId and testId filters
-		moduleId: undefined,
-		testId: undefined
-	} );
-}
-
-function toolbarUrlConfigContainer() {
-	var urlConfigContainer = document.createElement( "span" );
-
-	urlConfigContainer.innerHTML = getUrlConfigHtml();
-	addClass( urlConfigContainer, "qunit-url-config" );
-
-	// For oldIE support:
-	// * Add handlers to the individual elements instead of the container
-	// * Use "click" instead of "change" for checkboxes
-	addEvents( urlConfigContainer.getElementsByTagName( "input" ), "click", toolbarChanged );
-	addEvents( urlConfigContainer.getElementsByTagName( "select" ), "change", toolbarChanged );
-
-	return urlConfigContainer;
-}
-
-function toolbarLooseFilter() {
-	var filter = document.createElement( "form" ),
-		label = document.createElement( "label" ),
-		input = document.createElement( "input" ),
-		button = document.createElement( "button" );
-
-	addClass( filter, "qunit-filter" );
-
-	label.innerHTML = "Filter: ";
-
-	input.type = "text";
-	input.value = config.filter || "";
-	input.name = "filter";
-	input.id = "qunit-filter-input";
-
-	button.innerHTML = "Go";
-
-	label.appendChild( input );
-
-	filter.appendChild( label );
-	filter.appendChild( button );
-	addEvent( filter, "submit", function( ev ) {
-		applyUrlParams();
-
-		if ( ev && ev.preventDefault ) {
-			ev.preventDefault();
-		}
-
-		return false;
-	} );
-
-	return filter;
-}
-
-function toolbarModuleFilterHtml() {
-	var i,
-		moduleFilterHtml = "";
-
-	if ( !modulesList.length ) {
-		return false;
-	}
-
-	moduleFilterHtml += "<label for='qunit-modulefilter'>Module: </label>" +
-		"<select id='qunit-modulefilter' name='modulefilter'><option value='' " +
-		( QUnit.urlParams.module === undefined ? "selected='selected'" : "" ) +
-		">< All Modules ></option>";
-
-	for ( i = 0; i < modulesList.length; i++ ) {
-		moduleFilterHtml += "<option value='" +
-			escapeText( encodeURIComponent( modulesList[ i ] ) ) + "' " +
-			( QUnit.urlParams.module === modulesList[ i ] ? "selected='selected'" : "" ) +
-			">" + escapeText( modulesList[ i ] ) + "</option>";
-	}
-	moduleFilterHtml += "</select>";
-
-	return moduleFilterHtml;
-}
-
-function toolbarModuleFilter() {
-	var toolbar = id( "qunit-testrunner-toolbar" ),
-		moduleFilter = document.createElement( "span" ),
-		moduleFilterHtml = toolbarModuleFilterHtml();
-
-	if ( !toolbar || !moduleFilterHtml ) {
-		return false;
-	}
-
-	moduleFilter.setAttribute( "id", "qunit-modulefilter-container" );
-	moduleFilter.innerHTML = moduleFilterHtml;
-
-	addEvent( moduleFilter.lastChild, "change", applyUrlParams );
-
-	toolbar.appendChild( moduleFilter );
-}
-
-function appendToolbar() {
-	var toolbar = id( "qunit-testrunner-toolbar" );
-
-	if ( toolbar ) {
-		toolbar.appendChild( toolbarUrlConfigContainer() );
-		toolbar.appendChild( toolbarLooseFilter() );
-		toolbarModuleFilter();
-	}
-}
-
-function appendHeader() {
-	var header = id( "qunit-header" );
-
-	if ( header ) {
-		header.innerHTML = "<a href='" + escapeText( unfilteredUrl ) + "'>" + header.innerHTML +
-			"</a> ";
-	}
-}
-
-function appendBanner() {
-	var banner = id( "qunit-banner" );
-
-	if ( banner ) {
-		banner.className = "";
-	}
-}
-
-function appendTestResults() {
-	var tests = id( "qunit-tests" ),
-		result = id( "qunit-testresult" );
-
-	if ( result ) {
-		result.parentNode.removeChild( result );
-	}
-
-	if ( tests ) {
-		tests.innerHTML = "";
-		result = document.createElement( "p" );
-		result.id = "qunit-testresult";
-		result.className = "result";
-		tests.parentNode.insertBefore( result, tests );
-		result.innerHTML = "Running...<br />&#160;";
-	}
-}
-
-function storeFixture() {
-	var fixture = id( "qunit-fixture" );
-	if ( fixture ) {
-		config.fixture = fixture.innerHTML;
-	}
-}
-
-function appendFilteredTest() {
-	var testId = QUnit.config.testId;
-	if ( !testId || testId.length <= 0 ) {
-		return "";
-	}
-	return "<div id='qunit-filteredTest'>Rerunning selected tests: " +
-		escapeText( testId.join( ", " ) ) +
-		" <a id='qunit-clearFilter' href='" +
-		escapeText( unfilteredUrl ) +
-		"'>Run all tests</a></div>";
-}
-
-function appendUserAgent() {
-	var userAgent = id( "qunit-userAgent" );
-
-	if ( userAgent ) {
-		userAgent.innerHTML = "";
-		userAgent.appendChild(
-			document.createTextNode(
-				"QUnit " + QUnit.version + "; " + navigator.userAgent
-			)
-		);
-	}
-}
-
-function appendInterface() {
-	var qunit = id( "qunit" );
-
-	if ( qunit ) {
-		qunit.innerHTML =
-			"<h1 id='qunit-header'>" + escapeText( document.title ) + "</h1>" +
-			"<h2 id='qunit-banner'></h2>" +
-			"<div id='qunit-testrunner-toolbar'></div>" +
-			appendFilteredTest() +
-			"<h2 id='qunit-userAgent'></h2>" +
-			"<ol id='qunit-tests'></ol>";
-	}
-
-	appendHeader();
-	appendBanner();
-	appendTestResults();
-	appendUserAgent();
-	appendToolbar();
-}
-
-function appendTestsList( modules ) {
-	var i, l, x, z, test, moduleObj;
-
-	for ( i = 0, l = modules.length; i < l; i++ ) {
-		moduleObj = modules[ i ];
-
-		for ( x = 0, z = moduleObj.tests.length; x < z; x++ ) {
-			test = moduleObj.tests[ x ];
-
-			appendTest( test.name, test.testId, moduleObj.name );
-		}
-	}
-}
-
-function appendTest( name, testId, moduleName ) {
-	var title, rerunTrigger, testBlock, assertList,
-		tests = id( "qunit-tests" );
-
-	if ( !tests ) {
-		return;
-	}
-
-	title = document.createElement( "strong" );
-	title.innerHTML = getNameHtml( name, moduleName );
-
-	rerunTrigger = document.createElement( "a" );
-	rerunTrigger.innerHTML = "Rerun";
-	rerunTrigger.href = setUrl( { testId: testId } );
-
-	testBlock = document.createElement( "li" );
-	testBlock.appendChild( title );
-	testBlock.appendChild( rerunTrigger );
-	testBlock.id = "qunit-test-output-" + testId;
-
-	assertList = document.createElement( "ol" );
-	assertList.className = "qunit-assert-list";
-
-	testBlock.appendChild( assertList );
-
-	tests.appendChild( testBlock );
-}
-
-// HTML Reporter initialization and load
-QUnit.begin( function( details ) {
-	var i, moduleObj, tests;
-
-	// Sort modules by name for the picker
-	for ( i = 0; i < details.modules.length; i++ ) {
-		moduleObj = details.modules[ i ];
-		if ( moduleObj.name ) {
-			modulesList.push( moduleObj.name );
-		}
-	}
-	modulesList.sort( function( a, b ) {
-		return a.localeCompare( b );
-	} );
-
-	// Capture fixture HTML from the page
-	storeFixture();
-
-	// Initialize QUnit elements
-	appendInterface();
-	appendTestsList( details.modules );
-	tests = id( "qunit-tests" );
-	if ( tests && config.hidepassed ) {
-		addClass( tests, "hidepass" );
-	}
-} );
-
-QUnit.done( function( details ) {
-	var i, key,
-		banner = id( "qunit-banner" ),
-		tests = id( "qunit-tests" ),
-		html = [
-			"Tests completed in ",
-			details.runtime,
-			" milliseconds.<br />",
-			"<span class='passed'>",
-			details.passed,
-			"</span> assertions of <span class='total'>",
-			details.total,
-			"</span> passed, <span class='failed'>",
-			details.failed,
-			"</span> failed."
-		].join( "" );
-
-	if ( banner ) {
-		banner.className = details.failed ? "qunit-fail" : "qunit-pass";
-	}
-
-	if ( tests ) {
-		id( "qunit-testresult" ).innerHTML = html;
-	}
-
-	if ( config.altertitle && document.title ) {
-
-		// Show ✖ for good, ✔ for bad suite result in title
-		// use escape sequences in case file gets loaded with non-utf-8-charset
-		document.title = [
-			( details.failed ? "\u2716" : "\u2714" ),
-			document.title.replace( /^[\u2714\u2716] /i, "" )
-		].join( " " );
-	}
-
-	// Clear own sessionStorage items if all tests passed
-	if ( config.reorder && defined.sessionStorage && details.failed === 0 ) {
-		for ( i = 0; i < sessionStorage.length; i++ ) {
-			key = sessionStorage.key( i++ );
-			if ( key.indexOf( "qunit-test-" ) === 0 ) {
-				sessionStorage.removeItem( key );
-			}
-		}
-	}
-
-	// Scroll back to top to show results
-	if ( config.scrolltop && window.scrollTo ) {
-		window.scrollTo( 0, 0 );
-	}
-} );
-
-function getNameHtml( name, module ) {
-	var nameHtml = "";
-
-	if ( module ) {
-		nameHtml = "<span class='module-name'>" + escapeText( module ) + "</span>: ";
-	}
-
-	nameHtml += "<span class='test-name'>" + escapeText( name ) + "</span>";
-
-	return nameHtml;
-}
-
-QUnit.testStart( function( details ) {
-	var running, testBlock, bad;
-
-	testBlock = id( "qunit-test-output-" + details.testId );
-	if ( testBlock ) {
-		testBlock.className = "running";
-	} else {
-
-		// Report later registered tests
-		appendTest( details.name, details.testId, details.module );
-	}
-
-	running = id( "qunit-testresult" );
-	if ( running ) {
-		bad = QUnit.config.reorder && defined.sessionStorage &&
-			+sessionStorage.getItem( "qunit-test-" + details.module + "-" + details.name );
-
-		running.innerHTML = ( bad ?
-			"Rerunning previously failed test: <br />" :
-			"Running: <br />" ) +
-			getNameHtml( details.name, details.module );
-	}
-
-} );
-
-function stripHtml( string ) {
-
-	// Strip tags, html entity and whitespaces
-	return string.replace( /<\/?[^>]+(>|$)/g, "" ).replace( /\&quot;/g, "" ).replace( /\s+/g, "" );
-}
-
-QUnit.log( function( details ) {
-	var assertList, assertLi,
-		message, expected, actual, diff,
-		showDiff = false,
-		testItem = id( "qunit-test-output-" + details.testId );
-
-	if ( !testItem ) {
-		return;
-	}
-
-	message = escapeText( details.message ) || ( details.result ? "okay" : "failed" );
-	message = "<span class='test-message'>" + message + "</span>";
-	message += "<span class='runtime'>@ " + details.runtime + " ms</span>";
-
-	// The pushFailure doesn't provide details.expected
-	// when it calls, it's implicit to also not show expected and diff stuff
-	// Also, we need to check details.expected existence, as it can exist and be undefined
-	if ( !details.result && hasOwn.call( details, "expected" ) ) {
-		if ( details.negative ) {
-			expected = "NOT " + QUnit.dump.parse( details.expected );
-		} else {
-			expected = QUnit.dump.parse( details.expected );
-		}
-
-		actual = QUnit.dump.parse( details.actual );
-		message += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" +
-			escapeText( expected ) +
-			"</pre></td></tr>";
-
-		if ( actual !== expected ) {
-
-			message += "<tr class='test-actual'><th>Result: </th><td><pre>" +
-				escapeText( actual ) + "</pre></td></tr>";
-
-			// Don't show diff if actual or expected are booleans
-			if ( !( /^(true|false)$/.test( actual ) ) &&
-					!( /^(true|false)$/.test( expected ) ) ) {
-				diff = QUnit.diff( expected, actual );
-				showDiff = stripHtml( diff ).length !==
-					stripHtml( expected ).length +
-					stripHtml( actual ).length;
-			}
-
-			// Don't show diff if expected and actual are totally different
-			if ( showDiff ) {
-				message += "<tr class='test-diff'><th>Diff: </th><td><pre>" +
-					diff + "</pre></td></tr>";
-			}
-		} else if ( expected.indexOf( "[object Array]" ) !== -1 ||
-				expected.indexOf( "[object Object]" ) !== -1 ) {
-			message += "<tr class='test-message'><th>Message: </th><td>" +
-				"Diff suppressed as the depth of object is more than current max depth (" +
-				QUnit.config.maxDepth + ").<p>Hint: Use <code>QUnit.dump.maxDepth</code> to " +
-				" run with a higher max depth or <a href='" +
-				escapeText( setUrl( { maxDepth: -1 } ) ) + "'>" +
-				"Rerun</a> without max depth.</p></td></tr>";
-		} else {
-			message += "<tr class='test-message'><th>Message: </th><td>" +
-				"Diff suppressed as the expected and actual results have an equivalent" +
-				" serialization</td></tr>";
-		}
-
-		if ( details.source ) {
-			message += "<tr class='test-source'><th>Source: </th><td><pre>" +
-				escapeText( details.source ) + "</pre></td></tr>";
-		}
-
-		message += "</table>";
-
-	// This occurs when pushFailure is set and we have an extracted stack trace
-	} else if ( !details.result && details.source ) {
-		message += "<table>" +
-			"<tr class='test-source'><th>Source: </th><td><pre>" +
-			escapeText( details.source ) + "</pre></td></tr>" +
-			"</table>";
-	}
-
-	assertList = testItem.getElementsByTagName( "ol" )[ 0 ];
-
-	assertLi = document.createElement( "li" );
-	assertLi.className = details.result ? "pass" : "fail";
-	assertLi.innerHTML = message;
-	assertList.appendChild( assertLi );
-} );
-
-QUnit.testDone( function( details ) {
-	var testTitle, time, testItem, assertList,
-		good, bad, testCounts, skipped, sourceName,
-		tests = id( "qunit-tests" );
-
-	if ( !tests ) {
-		return;
-	}
-
-	testItem = id( "qunit-test-output-" + details.testId );
-
-	assertList = testItem.getElementsByTagName( "ol" )[ 0 ];
-
-	good = details.passed;
-	bad = details.failed;
-
-	// Store result when possible
-	if ( config.reorder && defined.sessionStorage ) {
-		if ( bad ) {
-			sessionStorage.setItem( "qunit-test-" + details.module + "-" + details.name, bad );
-		} else {
-			sessionStorage.removeItem( "qunit-test-" + details.module + "-" + details.name );
-		}
-	}
-
-	if ( bad === 0 ) {
-
-		// Collapse the passing tests
-		addClass( assertList, "qunit-collapsed" );
-	} else if ( bad && config.collapse && !collapseNext ) {
-
-		// Skip collapsing the first failing test
-		collapseNext = true;
-	} else {
-
-		// Collapse remaining tests
-		addClass( assertList, "qunit-collapsed" );
-	}
-
-	// The testItem.firstChild is the test name
-	testTitle = testItem.firstChild;
-
-	testCounts = bad ?
-		"<b class='failed'>" + bad + "</b>, " + "<b class='passed'>" + good + "</b>, " :
-		"";
-
-	testTitle.innerHTML += " <b class='counts'>(" + testCounts +
-		details.assertions.length + ")</b>";
-
-	if ( details.skipped ) {
-		testItem.className = "skipped";
-		skipped = document.createElement( "em" );
-		skipped.className = "qunit-skipped-label";
-		skipped.innerHTML = "skipped";
-		testItem.insertBefore( skipped, testTitle );
-	} else {
-		addEvent( testTitle, "click", function() {
-			toggleClass( assertList, "qunit-collapsed" );
-		} );
-
-		testItem.className = bad ? "fail" : "pass";
-
-		time = document.createElement( "span" );
-		time.className = "runtime";
-		time.innerHTML = details.runtime + " ms";
-		testItem.insertBefore( time, assertList );
-	}
-
-	// Show the source of the test when showing assertions
-	if ( details.source ) {
-		sourceName = document.createElement( "p" );
-		sourceName.innerHTML = "<strong>Source: </strong>" + details.source;
-		addClass( sourceName, "qunit-source" );
-		if ( bad === 0 ) {
-			addClass( sourceName, "qunit-collapsed" );
-		}
-		addEvent( testTitle, "click", function() {
-			toggleClass( sourceName, "qunit-collapsed" );
-		} );
-		testItem.appendChild( sourceName );
-	}
-} );
-
-// Avoid readyState issue with phantomjs
-// Ref: #818
-var notPhantom = ( function( p ) {
-	return !( p && p.version && p.version.major > 0 );
-} )( window.phantom );
-
-if ( notPhantom && document.readyState === "complete" ) {
-	QUnit.load();
-} else {
-	addEvent( window, "load", QUnit.load );
-}
-
-/*
- * This file is a modified version of google-diff-match-patch's JavaScript implementation
- * (https://code.google.com/p/google-diff-match-patch/source/browse/trunk/javascript/diff_match_patch_uncompressed.js),
- * modifications are licensed as more fully set forth in LICENSE.txt.
- *
- * The original source of google-diff-match-patch is attributable and licensed as follows:
- *
- * Copyright 2006 Google Inc.
- * https://code.google.com/p/google-diff-match-patch/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * More Info:
- *  https://code.google.com/p/google-diff-match-patch/
- *
- * Usage: QUnit.diff(expected, actual)
- *
- */
-QUnit.diff = ( function() {
-	function DiffMatchPatch() {
-	}
-
-	//  DIFF FUNCTIONS
-
-	/**
-	 * The data structure representing a diff is an array of tuples:
-	 * [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']]
-	 * which means: delete 'Hello', add 'Goodbye' and keep ' world.'
-	 */
-	var DIFF_DELETE = -1,
-		DIFF_INSERT = 1,
-		DIFF_EQUAL = 0;
-
-	/**
-	 * Find the differences between two texts.  Simplifies the problem by stripping
-	 * any common prefix or suffix off the texts before diffing.
-	 * @param {string} text1 Old string to be diffed.
-	 * @param {string} text2 New string to be diffed.
-	 * @param {boolean=} optChecklines Optional speedup flag. If present and false,
-	 *     then don't run a line-level diff first to identify the changed areas.
-	 *     Defaults to true, which does a faster, slightly less optimal diff.
-	 * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
-	 */
-	DiffMatchPatch.prototype.DiffMain = function( text1, text2, optChecklines ) {
-		var deadline, checklines, commonlength,
-			commonprefix, commonsuffix, diffs;
-
-		// The diff must be complete in up to 1 second.
-		deadline = ( new Date() ).getTime() + 1000;
-
-		// Check for null inputs.
-		if ( text1 === null || text2 === null ) {
-			throw new Error( "Null input. (DiffMain)" );
-		}
-
-		// Check for equality (speedup).
-		if ( text1 === text2 ) {
-			if ( text1 ) {
-				return [
-					[ DIFF_EQUAL, text1 ]
-				];
-			}
-			return [];
-		}
-
-		if ( typeof optChecklines === "undefined" ) {
-			optChecklines = true;
-		}
-
-		checklines = optChecklines;
-
-		// Trim off common prefix (speedup).
-		commonlength = this.diffCommonPrefix( text1, text2 );
-		commonprefix = text1.substring( 0, commonlength );
-		text1 = text1.substring( commonlength );
-		text2 = text2.substring( commonlength );
-
-		// Trim off common suffix (speedup).
-		commonlength = this.diffCommonSuffix( text1, text2 );
-		commonsuffix = text1.substring( text1.length - commonlength );
-		text1 = text1.substring( 0, text1.length - commonlength );
-		text2 = text2.substring( 0, text2.length - commonlength );
-
-		// Compute the diff on the middle block.
-		diffs = this.diffCompute( text1, text2, checklines, deadline );
-
-		// Restore the prefix and suffix.
-		if ( commonprefix ) {
-			diffs.unshift( [ DIFF_EQUAL, commonprefix ] );
-		}
-		if ( commonsuffix ) {
-			diffs.push( [ DIFF_EQUAL, commonsuffix ] );
-		}
-		this.diffCleanupMerge( diffs );
-		return diffs;
-	};
-
-	/**
-	 * Reduce the number of edits by eliminating operationally trivial equalities.
-	 * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
-	 */
-	DiffMatchPatch.prototype.diffCleanupEfficiency = function( diffs ) {
-		var changes, equalities, equalitiesLength, lastequality,
-			pointer, preIns, preDel, postIns, postDel;
-		changes = false;
-		equalities = []; // Stack of indices where equalities are found.
-		equalitiesLength = 0; // Keeping our own length var is faster in JS.
-		/** @type {?string} */
-		lastequality = null;
-
-		// Always equal to diffs[equalities[equalitiesLength - 1]][1]
-		pointer = 0; // Index of current position.
-
-		// Is there an insertion operation before the last equality.
-		preIns = false;
-
-		// Is there a deletion operation before the last equality.
-		preDel = false;
-
-		// Is there an insertion operation after the last equality.
-		postIns = false;
-
-		// Is there a deletion operation after the last equality.
-		postDel = false;
-		while ( pointer < diffs.length ) {
-
-			// Equality found.
-			if ( diffs[ pointer ][ 0 ] === DIFF_EQUAL ) {
-				if ( diffs[ pointer ][ 1 ].length < 4 && ( postIns || postDel ) ) {
-
-					// Candidate found.
-					equalities[ equalitiesLength++ ] = pointer;
-					preIns = postIns;
-					preDel = postDel;
-					lastequality = diffs[ pointer ][ 1 ];
-				} else {
-
-					// Not a candidate, and can never become one.
-					equalitiesLength = 0;
-					lastequality = null;
-				}
-				postIns = postDel = false;
-
-			// An insertion or deletion.
-			} else {
-
-				if ( diffs[ pointer ][ 0 ] === DIFF_DELETE ) {
-					postDel = true;
-				} else {
-					postIns = true;
-				}
-
-				/*
-				 * Five types to be split:
-				 * <ins>A</ins><del>B</del>XY<ins>C</ins><del>D</del>
-				 * <ins>A</ins>X<ins>C</ins><del>D</del>
-				 * <ins>A</ins><del>B</del>X<ins>C</ins>
-				 * <ins>A</del>X<ins>C</ins><del>D</del>
-				 * <ins>A</ins><del>B</del>X<del>C</del>
-				 */
-				if ( lastequality && ( ( preIns && preDel && postIns && postDel ) ||
-						( ( lastequality.length < 2 ) &&
-						( preIns + preDel + postIns + postDel ) === 3 ) ) ) {
-
-					// Duplicate record.
-					diffs.splice(
-						equalities[ equalitiesLength - 1 ],
-						0,
-						[ DIFF_DELETE, lastequality ]
-					);
-
-					// Change second copy to insert.
-					diffs[ equalities[ equalitiesLength - 1 ] + 1 ][ 0 ] = DIFF_INSERT;
-					equalitiesLength--; // Throw away the equality we just deleted;
-					lastequality = null;
-					if ( preIns && preDel ) {
-
-						// No changes made which could affect previous entry, keep going.
-						postIns = postDel = true;
-						equalitiesLength = 0;
-					} else {
-						equalitiesLength--; // Throw away the previous equality.
-						pointer = equalitiesLength > 0 ? equalities[ equalitiesLength - 1 ] : -1;
-						postIns = postDel = false;
-					}
-					changes = true;
-				}
-			}
-			pointer++;
-		}
-
-		if ( changes ) {
-			this.diffCleanupMerge( diffs );
-		}
-	};
-
-	/**
-	 * Convert a diff array into a pretty HTML report.
-	 * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
-	 * @param {integer} string to be beautified.
-	 * @return {string} HTML representation.
-	 */
-	DiffMatchPatch.prototype.diffPrettyHtml = function( diffs ) {
-		var op, data, x,
-			html = [];
-		for ( x = 0; x < diffs.length; x++ ) {
-			op = diffs[ x ][ 0 ]; // Operation (insert, delete, equal)
-			data = diffs[ x ][ 1 ]; // Text of change.
-			switch ( op ) {
-			case DIFF_INSERT:
-				html[ x ] = "<ins>" + escapeText( data ) + "</ins>";
-				break;
-			case DIFF_DELETE:
-				html[ x ] = "<del>" + escapeText( data ) + "</del>";
-				break;
-			case DIFF_EQUAL:
-				html[ x ] = "<span>" + escapeText( data ) + "</span>";
-				break;
-			}
-		}
-		return html.join( "" );
-	};
-
-	/**
-	 * Determine the common prefix of two strings.
-	 * @param {string} text1 First string.
-	 * @param {string} text2 Second string.
-	 * @return {number} The number of characters common to the start of each
-	 *     string.
-	 */
-	DiffMatchPatch.prototype.diffCommonPrefix = function( text1, text2 ) {
-		var pointermid, pointermax, pointermin, pointerstart;
-
-		// Quick check for common null cases.
-		if ( !text1 || !text2 || text1.charAt( 0 ) !== text2.charAt( 0 ) ) {
-			return 0;
-		}
-
-		// Binary search.
-		// Performance analysis: https://neil.fraser.name/news/2007/10/09/
-		pointermin = 0;
-		pointermax = Math.min( text1.length, text2.length );
-		pointermid = pointermax;
-		pointerstart = 0;
-		while ( pointermin < pointermid ) {
-			if ( text1.substring( pointerstart, pointermid ) ===
-					text2.substring( pointerstart, pointermid ) ) {
-				pointermin = pointermid;
-				pointerstart = pointermin;
-			} else {
-				pointermax = pointermid;
-			}
-			pointermid = Math.floor( ( pointermax - pointermin ) / 2 + pointermin );
-		}
-		return pointermid;
-	};
-
-	/**
-	 * Determine the common suffix of two strings.
-	 * @param {string} text1 First string.
-	 * @param {string} text2 Second string.
-	 * @return {number} The number of characters common to the end of each string.
-	 */
-	DiffMatchPatch.prototype.diffCommonSuffix = function( text1, text2 ) {
-		var pointermid, pointermax, pointermin, pointerend;
-
-		// Quick check for common null cases.
-		if ( !text1 ||
-				!text2 ||
-				text1.charAt( text1.length - 1 ) !== text2.charAt( text2.length - 1 ) ) {
-			return 0;
-		}
-
-		// Binary search.
-		// Performance analysis: https://neil.fraser.name/news/2007/10/09/
-		pointermin = 0;
-		pointermax = Math.min( text1.length, text2.length );
-		pointermid = pointermax;
-		pointerend = 0;
-		while ( pointermin < pointermid ) {
-			if ( text1.substring( text1.length - pointermid, text1.length - pointerend ) ===
-					text2.substring( text2.length - pointermid, text2.length - pointerend ) ) {
-				pointermin = pointermid;
-				pointerend = pointermin;
-			} else {
-				pointermax = pointermid;
-			}
-			pointermid = Math.floor( ( pointermax - pointermin ) / 2 + pointermin );
-		}
-		return pointermid;
-	};
-
-	/**
-	 * Find the differences between two texts.  Assumes that the texts do not
-	 * have any common prefix or suffix.
-	 * @param {string} text1 Old string to be diffed.
-	 * @param {string} text2 New string to be diffed.
-	 * @param {boolean} checklines Speedup flag.  If false, then don't run a
-	 *     line-level diff first to identify the changed areas.
-	 *     If true, then run a faster, slightly less optimal diff.
-	 * @param {number} deadline Time when the diff should be complete by.
-	 * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
-	 * @private
-	 */
-	DiffMatchPatch.prototype.diffCompute = function( text1, text2, checklines, deadline ) {
-		var diffs, longtext, shorttext, i, hm,
-			text1A, text2A, text1B, text2B,
-			midCommon, diffsA, diffsB;
-
-		if ( !text1 ) {
-
-			// Just add some text (speedup).
-			return [
-				[ DIFF_INSERT, text2 ]
-			];
-		}
-
-		if ( !text2 ) {
-
-			// Just delete some text (speedup).
-			return [
-				[ DIFF_DELETE, text1 ]
-			];
-		}
-
-		longtext = text1.length > text2.length ? text1 : text2;
-		shorttext = text1.length > text2.length ? text2 : text1;
-		i = longtext.indexOf( shorttext );
-		if ( i !== -1 ) {
-
-			// Shorter text is inside the longer text (speedup).
-			diffs = [
-				[ DIFF_INSERT, longtext.substring( 0, i ) ],
-				[ DIFF_EQUAL, shorttext ],
-				[ DIFF_INSERT, longtext.substring( i + shorttext.length ) ]
-			];
-
-			// Swap insertions for deletions if diff is reversed.
-			if ( text1.length > text2.length ) {
-				diffs[ 0 ][ 0 ] = diffs[ 2 ][ 0 ] = DIFF_DELETE;
-			}
-			return diffs;
-		}
-
-		if ( shorttext.length === 1 ) {
-
-			// Single character string.
-			// After the previous speedup, the character can't be an equality.
-			return [
-				[ DIFF_DELETE, text1 ],
-				[ DIFF_INSERT, text2 ]
-			];
-		}
-
-		// Check to see if the problem can be split in two.
-		hm = this.diffHalfMatch( text1, text2 );
-		if ( hm ) {
-
-			// A half-match was found, sort out the return data.
-			text1A = hm[ 0 ];
-			text1B = hm[ 1 ];
-			text2A = hm[ 2 ];
-			text2B = hm[ 3 ];
-			midCommon = hm[ 4 ];
-
-			// Send both pairs off for separate processing.
-			diffsA = this.DiffMain( text1A, text2A, checklines, deadline );
-			diffsB = this.DiffMain( text1B, text2B, checklines, deadline );
-
-			// Merge the results.
-			return diffsA.concat( [
-				[ DIFF_EQUAL, midCommon ]
-			], diffsB );
-		}
-
-		if ( checklines && text1.length > 100 && text2.length > 100 ) {
-			return this.diffLineMode( text1, text2, deadline );
-		}
-
-		return this.diffBisect( text1, text2, deadline );
-	};
-
-	/**
-	 * Do the two texts share a substring which is at least half the length of the
-	 * longer text?
-	 * This speedup can produce non-minimal diffs.
-	 * @param {string} text1 First string.
-	 * @param {string} text2 Second string.
-	 * @return {Array.<string>} Five element Array, containing the prefix of
-	 *     text1, the suffix of text1, the prefix of text2, the suffix of
-	 *     text2 and the common middle.  Or null if there was no match.
-	 * @private
-	 */
-	DiffMatchPatch.prototype.diffHalfMatch = function( text1, text2 ) {
-		var longtext, shorttext, dmp,
-			text1A, text2B, text2A, text1B, midCommon,
-			hm1, hm2, hm;
-
-		longtext = text1.length > text2.length ? text1 : text2;
-		shorttext = text1.length > text2.length ? text2 : text1;
-		if ( longtext.length < 4 || shorttext.length * 2 < longtext.length ) {
-			return null; // Pointless.
-		}
-		dmp = this; // 'this' becomes 'window' in a closure.
-
-		/**
-		 * Does a substring of shorttext exist within longtext such that the substring
-		 * is at least half the length of longtext?
-		 * Closure, but does not reference any external variables.
-		 * @param {string} longtext Longer string.
-		 * @param {string} shorttext Shorter string.
-		 * @param {number} i Start index of quarter length substring within longtext.
-		 * @return {Array.<string>} Five element Array, containing the prefix of
-		 *     longtext, the suffix of longtext, the prefix of shorttext, the suffix
-		 *     of shorttext and the common middle.  Or null if there was no match.
-		 * @private
-		 */
-		function diffHalfMatchI( longtext, shorttext, i ) {
-			var seed, j, bestCommon, prefixLength, suffixLength,
-				bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB;
-
-			// Start with a 1/4 length substring at position i as a seed.
-			seed = longtext.substring( i, i + Math.floor( longtext.length / 4 ) );
-			j = -1;
-			bestCommon = "";
-			while ( ( j = shorttext.indexOf( seed, j + 1 ) ) !== -1 ) {
-				prefixLength = dmp.diffCommonPrefix( longtext.substring( i ),
-					shorttext.substring( j ) );
-				suffixLength = dmp.diffCommonSuffix( longtext.substring( 0, i ),
-					shorttext.substring( 0, j ) );
-				if ( bestCommon.length < suffixLength + prefixLength ) {
-					bestCommon = shorttext.substring( j - suffixLength, j ) +
-						shorttext.substring( j, j + prefixLength );
-					bestLongtextA = longtext.substring( 0, i - suffixLength );
-					bestLongtextB = longtext.substring( i + prefixLength );
-					bestShorttextA = shorttext.substring( 0, j - suffixLength );
-					bestShorttextB = shorttext.substring( j + prefixLength );
-				}
-			}
-			if ( bestCommon.length * 2 >= longtext.length ) {
-				return [ bestLongtextA, bestLongtextB,
-					bestShorttextA, bestShorttextB, bestCommon
-				];
-			} else {
-				return null;
-			}
-		}
-
-		// First check if the second quarter is the seed for a half-match.
-		hm1 = diffHalfMatchI( longtext, shorttext,
-			Math.ceil( longtext.length / 4 ) );
-
-		// Check again based on the third quarter.
-		hm2 = diffHalfMatchI( longtext, shorttext,
-			Math.ceil( longtext.length / 2 ) );
-		if ( !hm1 && !hm2 ) {
-			return null;
-		} else if ( !hm2 ) {
-			hm = hm1;
-		} else if ( !hm1 ) {
-			hm = hm2;
-		} else {
-
-			// Both matched.  Select the longest.
-			hm = hm1[ 4 ].length > hm2[ 4 ].length ? hm1 : hm2;
-		}
-
-		// A half-match was found, sort out the return data.
-		text1A, text1B, text2A, text2B;
-		if ( text1.length > text2.length ) {
-			text1A = hm[ 0 ];
-			text1B = hm[ 1 ];
-			text2A = hm[ 2 ];
-			text2B = hm[ 3 ];
-		} else {
-			text2A = hm[ 0 ];
-			text2B = hm[ 1 ];
-			text1A = hm[ 2 ];
-			text1B = hm[ 3 ];
-		}
-		midCommon = hm[ 4 ];
-		return [ text1A, text1B, text2A, text2B, midCommon ];
-	};
-
-	/**
-	 * Do a quick line-level diff on both strings, then rediff the parts for
-	 * greater accuracy.
-	 * This speedup can produce non-minimal diffs.
-	 * @param {string} text1 Old string to be diffed.
-	 * @param {string} text2 New string to be diffed.
-	 * @param {number} deadline Time when the diff should be complete by.
-	 * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
-	 * @private
-	 */
-	DiffMatchPatch.prototype.diffLineMode = function( text1, text2, deadline ) {
-		var a, diffs, linearray, pointer, countInsert,
-			countDelete, textInsert, textDelete, j;
-
-		// Scan the text on a line-by-line basis first.
-		a = this.diffLinesToChars( text1, text2 );
-		text1 = a.chars1;
-		text2 = a.chars2;
-		linearray = a.lineArray;
-
-		diffs = this.DiffMain( text1, text2, false, deadline );
-
-		// Convert the diff back to original text.
-		this.diffCharsToLines( diffs, linearray );
-
-		// Eliminate freak matches (e.g. blank lines)
-		this.diffCleanupSemantic( diffs );
-
-		// Rediff any replacement blocks, this time character-by-character.
-		// Add a dummy entry at the end.
-		diffs.push( [ DIFF_EQUAL, "" ] );
-		pointer = 0;
-		countDelete = 0;
-		countInsert = 0;
-		textDelete = "";
-		textInsert = "";
-		while ( pointer < diffs.length ) {
-			switch ( diffs[ pointer ][ 0 ] ) {
-			case DIFF_INSERT:
-				countInsert++;
-				textInsert += diffs[ pointer ][ 1 ];
-				break;
-			case DIFF_DELETE:
-				countDelete++;
-				textDelete += diffs[ pointer ][ 1 ];
-				break;
-			case DIFF_EQUAL:
-
-				// Upon reaching an equality, check for prior redundancies.
-				if ( countDelete >= 1 && countInsert >= 1 ) {
-
-					// Delete the offending records and add the merged ones.
-					diffs.splice( pointer - countDelete - countInsert,
-						countDelete + countInsert );
-					pointer = pointer - countDelete - countInsert;
-					a = this.DiffMain( textDelete, textInsert, false, deadline );
-					for ( j = a.length - 1; j >= 0; j-- ) {
-						diffs.splice( pointer, 0, a[ j ] );
-					}
-					pointer = pointer + a.length;
-				}
-				countInsert = 0;
-				countDelete = 0;
-				textDelete = "";
-				textInsert = "";
-				break;
-			}
-			pointer++;
-		}
-		diffs.pop(); // Remove the dummy entry at the end.
-
-		return diffs;
-	};
-
-	/**
-	 * Find the 'middle snake' of a diff, split the problem in two
-	 * and return the recursively constructed diff.
-	 * See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations.
-	 * @param {string} text1 Old string to be diffed.
-	 * @param {string} text2 New string to be diffed.
-	 * @param {number} deadline Time at which to bail if not yet complete.
-	 * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
-	 * @private
-	 */
-	DiffMatchPatch.prototype.diffBisect = function( text1, text2, deadline ) {
-		var text1Length, text2Length, maxD, vOffset, vLength,
-			v1, v2, x, delta, front, k1start, k1end, k2start,
-			k2end, k2Offset, k1Offset, x1, x2, y1, y2, d, k1, k2;
-
-		// Cache the text lengths to prevent multiple calls.
-		text1Length = text1.length;
-		text2Length = text2.length;
-		maxD = Math.ceil( ( text1Length + text2Length ) / 2 );
-		vOffset = maxD;
-		vLength = 2 * maxD;
-		v1 = new Array( vLength );
-		v2 = new Array( vLength );
-
-		// Setting all elements to -1 is faster in Chrome & Firefox than mixing
-		// integers and undefined.
-		for ( x = 0; x < vLength; x++ ) {
-			v1[ x ] = -1;
-			v2[ x ] = -1;
-		}
-		v1[ vOffset + 1 ] = 0;
-		v2[ vOffset + 1 ] = 0;
-		delta = text1Length - text2Length;
-
-		// If the total number of characters is odd, then the front path will collide
-		// with the reverse path.
-		front = ( delta % 2 !== 0 );
-
-		// Offsets for start and end of k loop.
-		// Prevents mapping of space beyond the grid.
-		k1start = 0;
-		k1end = 0;
-		k2start = 0;
-		k2end = 0;
-		for ( d = 0; d < maxD; d++ ) {
-
-			// Bail out if deadline is reached.
-			if ( ( new Date() ).getTime() > deadline ) {
-				break;
-			}
-
-			// Walk the front path one step.
-			for ( k1 = -d + k1start; k1 <= d - k1end; k1 += 2 ) {
-				k1Offset = vOffset + k1;
-				if ( k1 === -d || ( k1 !== d && v1[ k1Offset - 1 ] < v1[ k1Offset + 1 ] ) ) {
-					x1 = v1[ k1Offset + 1 ];
-				} else {
-					x1 = v1[ k1Offset - 1 ] + 1;
-				}
-				y1 = x1 - k1;
-				while ( x1 < text1Length && y1 < text2Length &&
-					text1.charAt( x1 ) === text2.charAt( y1 ) ) {
-					x1++;
-					y1++;
-				}
-				v1[ k1Offset ] = x1;
-				if ( x1 > text1Length ) {
-
-					// Ran off the right of the graph.
-					k1end += 2;
-				} else if ( y1 > text2Length ) {
-
-					// Ran off the bottom of the graph.
-					k1start += 2;
-				} else if ( front ) {
-					k2Offset = vOffset + delta - k1;
-					if ( k2Offset >= 0 && k2Offset < vLength && v2[ k2Offset ] !== -1 ) {
-
-						// Mirror x2 onto top-left coordinate system.
-						x2 = text1Length - v2[ k2Offset ];
-						if ( x1 >= x2 ) {
-
-							// Overlap detected.
-							return this.diffBisectSplit( text1, text2, x1, y1, deadline );
-						}
-					}
-				}
-			}
-
-			// Walk the reverse path one step.
-			for ( k2 = -d + k2start; k2 <= d - k2end; k2 += 2 ) {
-				k2Offset = vOffset + k2;
-				if ( k2 === -d || ( k2 !== d && v2[ k2Offset - 1 ] < v2[ k2Offset + 1 ] ) ) {
-					x2 = v2[ k2Offset + 1 ];
-				} else {
-					x2 = v2[ k2Offset - 1 ] + 1;
-				}
-				y2 = x2 - k2;
-				while ( x2 < text1Length && y2 < text2Length &&
-					text1.charAt( text1Length - x2 - 1 ) ===
-					text2.charAt( text2Length - y2 - 1 ) ) {
-					x2++;
-					y2++;
-				}
-				v2[ k2Offset ] = x2;
-				if ( x2 > text1Length ) {
-
-					// Ran off the left of the graph.
-					k2end += 2;
-				} else if ( y2 > text2Length ) {
-
-					// Ran off the top of the graph.
-					k2start += 2;
-				} else if ( !front ) {
-					k1Offset = vOffset + delta - k2;
-					if ( k1Offset >= 0 && k1Offset < vLength && v1[ k1Offset ] !== -1 ) {
-						x1 = v1[ k1Offset ];
-						y1 = vOffset + x1 - k1Offset;
-
-						// Mirror x2 onto top-left coordinate system.
-						x2 = text1Length - x2;
-						if ( x1 >= x2 ) {
-
-							// Overlap detected.
-							return this.diffBisectSplit( text1, text2, x1, y1, deadline );
-						}
-					}
-				}
-			}
-		}
-
-		// Diff took too long and hit the deadline or
-		// number of diffs equals number of characters, no commonality at all.
-		return [
-			[ DIFF_DELETE, text1 ],
-			[ DIFF_INSERT, text2 ]
-		];
-	};
-
-	/**
-	 * Given the location of the 'middle snake', split the diff in two parts
-	 * and recurse.
-	 * @param {string} text1 Old string to be diffed.
-	 * @param {string} text2 New string to be diffed.
-	 * @param {number} x Index of split point in text1.
-	 * @param {number} y Index of split point in text2.
-	 * @param {number} deadline Time at which to bail if not yet complete.
-	 * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
-	 * @private
-	 */
-	DiffMatchPatch.prototype.diffBisectSplit = function( text1, text2, x, y, deadline ) {
-		var text1a, text1b, text2a, text2b, diffs, diffsb;
-		text1a = text1.substring( 0, x );
-		text2a = text2.substring( 0, y );
-		text1b = text1.substring( x );
-		text2b = text2.substring( y );
-
-		// Compute both diffs serially.
-		diffs = this.DiffMain( text1a, text2a, false, deadline );
-		diffsb = this.DiffMain( text1b, text2b, false, deadline );
-
-		return diffs.concat( diffsb );
-	};
-
-	/**
-	 * Reduce the number of edits by eliminating semantically trivial equalities.
-	 * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
-	 */
-	DiffMatchPatch.prototype.diffCleanupSemantic = function( diffs ) {
-		var changes, equalities, equalitiesLength, lastequality,
-			pointer, lengthInsertions2, lengthDeletions2, lengthInsertions1,
-			lengthDeletions1, deletion, insertion, overlapLength1, overlapLength2;
-		changes = false;
-		equalities = []; // Stack of indices where equalities are found.
-		equalitiesLength = 0; // Keeping our own length var is faster in JS.
-		/** @type {?string} */
-		lastequality = null;
-
-		// Always equal to diffs[equalities[equalitiesLength - 1]][1]
-		pointer = 0; // Index of current position.
-
-		// Number of characters that changed prior to the equality.
-		lengthInsertions1 = 0;
-		lengthDeletions1 = 0;
-
-		// Number of characters that changed after the equality.
-		lengthInsertions2 = 0;
-		lengthDeletions2 = 0;
-		while ( pointer < diffs.length ) {
-			if ( diffs[ pointer ][ 0 ] === DIFF_EQUAL ) { // Equality found.
-				equalities[ equalitiesLength++ ] = pointer;
-				lengthInsertions1 = lengthInsertions2;
-				lengthDeletions1 = lengthDeletions2;
-				lengthInsertions2 = 0;
-				lengthDeletions2 = 0;
-				lastequality = diffs[ pointer ][ 1 ];
-			} else { // An insertion or deletion.
-				if ( diffs[ pointer ][ 0 ] === DIFF_INSERT ) {
-					lengthInsertions2 += diffs[ pointer ][ 1 ].length;
-				} else {
-					lengthDeletions2 += diffs[ pointer ][ 1 ].length;
-				}
-
-				// Eliminate an equality that is smaller or equal to the edits on both
-				// sides of it.
-				if ( lastequality && ( lastequality.length <=
-						Math.max( lengthInsertions1, lengthDeletions1 ) ) &&
-						( lastequality.length <= Math.max( lengthInsertions2,
-							lengthDeletions2 ) ) ) {
-
-					// Duplicate record.
-					diffs.splice(
-						equalities[ equalitiesLength - 1 ],
-						0,
-						[ DIFF_DELETE, lastequality ]
-					);
-
-					// Change second copy to insert.
-					diffs[ equalities[ equalitiesLength - 1 ] + 1 ][ 0 ] = DIFF_INSERT;
-
-					// Throw away the equality we just deleted.
-					equalitiesLength--;
-
-					// Throw away the previous equality (it needs to be reevaluated).
-					equalitiesLength--;
-					pointer = equalitiesLength > 0 ? equalities[ equalitiesLength - 1 ] : -1;
-
-					// Reset the counters.
-					lengthInsertions1 = 0;
-					lengthDeletions1 = 0;
-					lengthInsertions2 = 0;
-					lengthDeletions2 = 0;
-					lastequality = null;
-					changes = true;
-				}
-			}
-			pointer++;
-		}
-
-		// Normalize the diff.
-		if ( changes ) {
-			this.diffCleanupMerge( diffs );
-		}
-
-		// Find any overlaps between deletions and insertions.
-		// e.g: <del>abcxxx</del><ins>xxxdef</ins>
-		//   -> <del>abc</del>xxx<ins>def</ins>
-		// e.g: <del>xxxabc</del><ins>defxxx</ins>
-		//   -> <ins>def</ins>xxx<del>abc</del>
-		// Only extract an overlap if it is as big as the edit ahead or behind it.
-		pointer = 1;
-		while ( pointer < diffs.length ) {
-			if ( diffs[ pointer - 1 ][ 0 ] === DIFF_DELETE &&
-					diffs[ pointer ][ 0 ] === DIFF_INSERT ) {
-				deletion = diffs[ pointer - 1 ][ 1 ];
-				insertion = diffs[ pointer ][ 1 ];
-				overlapLength1 = this.diffCommonOverlap( deletion, insertion );
-				overlapLength2 = this.diffCommonOverlap( insertion, deletion );
-				if ( overlapLength1 >= overlapLength2 ) {
-					if ( overlapLength1 >= deletion.length / 2 ||
-							overlapLength1 >= insertion.length / 2 ) {
-
-						// Overlap found.  Insert an equality and trim the surrounding edits.
-						diffs.splice(
-							pointer,
-							0,
-							[ DIFF_EQUAL, insertion.substring( 0, overlapLength1 ) ]
-						);
-						diffs[ pointer - 1 ][ 1 ] =
-							deletion.substring( 0, deletion.length - overlapLength1 );
-						diffs[ pointer + 1 ][ 1 ] = insertion.substring( overlapLength1 );
-						pointer++;
-					}
-				} else {
-					if ( overlapLength2 >= deletion.length / 2 ||
-							overlapLength2 >= insertion.length / 2 ) {
-
-						// Reverse overlap found.
-						// Insert an equality and swap and trim the surrounding edits.
-						diffs.splice(
-							pointer,
-							0,
-							[ DIFF_EQUAL, deletion.substring( 0, overlapLength2 ) ]
-						);
-
-						diffs[ pointer - 1 ][ 0 ] = DIFF_INSERT;
-						diffs[ pointer - 1 ][ 1 ] =
-							insertion.substring( 0, insertion.length - overlapLength2 );
-						diffs[ pointer + 1 ][ 0 ] = DIFF_DELETE;
-						diffs[ pointer + 1 ][ 1 ] =
-							deletion.substring( overlapLength2 );
-						pointer++;
-					}
-				}
-				pointer++;
-			}
-			pointer++;
-		}
-	};
-
-	/**
-	 * Determine if the suffix of one string is the prefix of another.
-	 * @param {string} text1 First string.
-	 * @param {string} text2 Second string.
-	 * @return {number} The number of characters common to the end of the first
-	 *     string and the start of the second string.
-	 * @private
-	 */
-	DiffMatchPatch.prototype.diffCommonOverlap = function( text1, text2 ) {
-		var text1Length, text2Length, textLength,
-			best, length, pattern, found;
-
-		// Cache the text lengths to prevent multiple calls.
-		text1Length = text1.length;
-		text2Length = text2.length;
-
-		// Eliminate the null case.
-		if ( text1Length === 0 || text2Length === 0 ) {
-			return 0;
-		}
-
-		// Truncate the longer string.
-		if ( text1Length > text2Length ) {
-			text1 = text1.substring( text1Length - text2Length );
-		} else if ( text1Length < text2Length ) {
-			text2 = text2.substring( 0, text1Length );
-		}
-		textLength = Math.min( text1Length, text2Length );
-
-		// Quick check for the worst case.
-		if ( text1 === text2 ) {
-			return textLength;
-		}
-
-		// Start by looking for a single character match
-		// and increase length until no match is found.
-		// Performance analysis: https://neil.fraser.name/news/2010/11/04/
-		best = 0;
-		length = 1;
-		while ( true ) {
-			pattern = text1.substring( textLength - length );
-			found = text2.indexOf( pattern );
-			if ( found === -1 ) {
-				return best;
-			}
-			length += found;
-			if ( found === 0 || text1.substring( textLength - length ) ===
-					text2.substring( 0, length ) ) {
-				best = length;
-				length++;
-			}
-		}
-	};
-
-	/**
-	 * Split two texts into an array of strings.  Reduce the texts to a string of
-	 * hashes where each Unicode character represents one line.
-	 * @param {string} text1 First string.
-	 * @param {string} text2 Second string.
-	 * @return {{chars1: string, chars2: string, lineArray: !Array.<string>}}
-	 *     An object containing the encoded text1, the encoded text2 and
-	 *     the array of unique strings.
-	 *     The zeroth element of the array of unique strings is intentionally blank.
-	 * @private
-	 */
-	DiffMatchPatch.prototype.diffLinesToChars = function( text1, text2 ) {
-		var lineArray, lineHash, chars1, chars2;
-		lineArray = []; // E.g. lineArray[4] === 'Hello\n'
-		lineHash = {};  // E.g. lineHash['Hello\n'] === 4
-
-		// '\x00' is a valid character, but various debuggers don't like it.
-		// So we'll insert a junk entry to avoid generating a null character.
-		lineArray[ 0 ] = "";
-
-		/**
-		 * Split a text into an array of strings.  Reduce the texts to a string of
-		 * hashes where each Unicode character represents one line.
-		 * Modifies linearray and linehash through being a closure.
-		 * @param {string} text String to encode.
-		 * @return {string} Encoded string.
-		 * @private
-		 */
-		function diffLinesToCharsMunge( text ) {
-			var chars, lineStart, lineEnd, lineArrayLength, line;
-			chars = "";
-
-			// Walk the text, pulling out a substring for each line.
-			// text.split('\n') would would temporarily double our memory footprint.
-			// Modifying text would create many large strings to garbage collect.
-			lineStart = 0;
-			lineEnd = -1;
-
-			// Keeping our own length variable is faster than looking it up.
-			lineArrayLength = lineArray.length;
-			while ( lineEnd < text.length - 1 ) {
-				lineEnd = text.indexOf( "\n", lineStart );
-				if ( lineEnd === -1 ) {
-					lineEnd = text.length - 1;
-				}
-				line = text.substring( lineStart, lineEnd + 1 );
-				lineStart = lineEnd + 1;
-
-				if ( lineHash.hasOwnProperty ? lineHash.hasOwnProperty( line ) :
-							( lineHash[ line ] !== undefined ) ) {
-					chars += String.fromCharCode( lineHash[ line ] );
-				} else {
-					chars += String.fromCharCode( lineArrayLength );
-					lineHash[ line ] = lineArrayLength;
-					lineArray[ lineArrayLength++ ] = line;
-				}
-			}
-			return chars;
-		}
-
-		chars1 = diffLinesToCharsMunge( text1 );
-		chars2 = diffLinesToCharsMunge( text2 );
-		return {
-			chars1: chars1,
-			chars2: chars2,
-			lineArray: lineArray
-		};
-	};
-
-	/**
-	 * Rehydrate the text in a diff from a string of line hashes to real lines of
-	 * text.
-	 * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
-	 * @param {!Array.<string>} lineArray Array of unique strings.
-	 * @private
-	 */
-	DiffMatchPatch.prototype.diffCharsToLines = function( diffs, lineArray ) {
-		var x, chars, text, y;
-		for ( x = 0; x < diffs.length; x++ ) {
-			chars = diffs[ x ][ 1 ];
-			text = [];
-			for ( y = 0; y < chars.length; y++ ) {
-				text[ y ] = lineArray[ chars.charCodeAt( y ) ];
-			}
-			diffs[ x ][ 1 ] = text.join( "" );
-		}
-	};
-
-	/**
-	 * Reorder and merge like edit sections.  Merge equalities.
-	 * Any edit section can move as long as it doesn't cross an equality.
-	 * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
-	 */
-	DiffMatchPatch.prototype.diffCleanupMerge = function( diffs ) {
-		var pointer, countDelete, countInsert, textInsert, textDelete,
-			commonlength, changes, diffPointer, position;
-		diffs.push( [ DIFF_EQUAL, "" ] ); // Add a dummy entry at the end.
-		pointer = 0;
-		countDelete = 0;
-		countInsert = 0;
-		textDelete = "";
-		textInsert = "";
-		commonlength;
-		while ( pointer < diffs.length ) {
-			switch ( diffs[ pointer ][ 0 ] ) {
-			case DIFF_INSERT:
-				countInsert++;
-				textInsert += diffs[ pointer ][ 1 ];
-				pointer++;
-				break;
-			case DIFF_DELETE:
-				countDelete++;
-				textDelete += diffs[ pointer ][ 1 ];
-				pointer++;
-				break;
-			case DIFF_EQUAL:
-
-				// Upon reaching an equality, check for prior redundancies.
-				if ( countDelete + countInsert > 1 ) {
-					if ( countDelete !== 0 && countInsert !== 0 ) {
-
-						// Factor out any common prefixes.
-						commonlength = this.diffCommonPrefix( textInsert, textDelete );
-						if ( commonlength !== 0 ) {
-							if ( ( pointer - countDelete - countInsert ) > 0 &&
-									diffs[ pointer - countDelete - countInsert - 1 ][ 0 ] ===
-									DIFF_EQUAL ) {
-								diffs[ pointer - countDelete - countInsert - 1 ][ 1 ] +=
-									textInsert.substring( 0, commonlength );
-							} else {
-								diffs.splice( 0, 0, [ DIFF_EQUAL,
-									textInsert.substring( 0, commonlength )
-								] );
-								pointer++;
-							}
-							textInsert = textInsert.substring( commonlength );
-							textDelete = textDelete.substring( commonlength );
-						}
-
-						// Factor out any common suffixies.
-						commonlength = this.diffCommonSuffix( textInsert, textDelete );
-						if ( commonlength !== 0 ) {
-							diffs[ pointer ][ 1 ] = textInsert.substring( textInsert.length -
-									commonlength ) + diffs[ pointer ][ 1 ];
-							textInsert = textInsert.substring( 0, textInsert.length -
-								commonlength );
-							textDelete = textDelete.substring( 0, textDelete.length -
-								commonlength );
-						}
-					}
-
-					// Delete the offending records and add the merged ones.
-					if ( countDelete === 0 ) {
-						diffs.splice( pointer - countInsert,
-							countDelete + countInsert, [ DIFF_INSERT, textInsert ] );
-					} else if ( countInsert === 0 ) {
-						diffs.splice( pointer - countDelete,
-							countDelete + countInsert, [ DIFF_DELETE, textDelete ] );
-					} else {
-						diffs.splice(
-							pointer - countDelete - countInsert,
-							countDelete + countInsert,
-							[ DIFF_DELETE, textDelete ], [ DIFF_INSERT, textInsert ]
-						);
-					}
-					pointer = pointer - countDelete - countInsert +
-						( countDelete ? 1 : 0 ) + ( countInsert ? 1 : 0 ) + 1;
-				} else if ( pointer !== 0 && diffs[ pointer - 1 ][ 0 ] === DIFF_EQUAL ) {
-
-					// Merge this equality with the previous one.
-					diffs[ pointer - 1 ][ 1 ] += diffs[ pointer ][ 1 ];
-					diffs.splice( pointer, 1 );
-				} else {
-					pointer++;
-				}
-				countInsert = 0;
-				countDelete = 0;
-				textDelete = "";
-				textInsert = "";
-				break;
-			}
-		}
-		if ( diffs[ diffs.length - 1 ][ 1 ] === "" ) {
-			diffs.pop(); // Remove the dummy entry at the end.
-		}
-
-		// Second pass: look for single edits surrounded on both sides by equalities
-		// which can be shifted sideways to eliminate an equality.
-		// e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC
-		changes = false;
-		pointer = 1;
-
-		// Intentionally ignore the first and last element (don't need checking).
-		while ( pointer < diffs.length - 1 ) {
-			if ( diffs[ pointer - 1 ][ 0 ] === DIFF_EQUAL &&
-					diffs[ pointer + 1 ][ 0 ] === DIFF_EQUAL ) {
-
-				diffPointer = diffs[ pointer ][ 1 ];
-				position = diffPointer.substring(
-					diffPointer.length - diffs[ pointer - 1 ][ 1 ].length
-				);
-
-				// This is a single edit surrounded by equalities.
-				if ( position === diffs[ pointer - 1 ][ 1 ] ) {
-
-					// Shift the edit over the previous equality.
-					diffs[ pointer ][ 1 ] = diffs[ pointer - 1 ][ 1 ] +
-						diffs[ pointer ][ 1 ].substring( 0, diffs[ pointer ][ 1 ].length -
-							diffs[ pointer - 1 ][ 1 ].length );
-					diffs[ pointer + 1 ][ 1 ] =
-						diffs[ pointer - 1 ][ 1 ] + diffs[ pointer + 1 ][ 1 ];
-					diffs.splice( pointer - 1, 1 );
-					changes = true;
-				} else if ( diffPointer.substring( 0, diffs[ pointer + 1 ][ 1 ].length ) ===
-						diffs[ pointer + 1 ][ 1 ] ) {
-
-					// Shift the edit over the next equality.
-					diffs[ pointer - 1 ][ 1 ] += diffs[ pointer + 1 ][ 1 ];
-					diffs[ pointer ][ 1 ] =
-						diffs[ pointer ][ 1 ].substring( diffs[ pointer + 1 ][ 1 ].length ) +
-						diffs[ pointer + 1 ][ 1 ];
-					diffs.splice( pointer + 1, 1 );
-					changes = true;
-				}
-			}
-			pointer++;
-		}
-
-		// If shifts were made, the diff needs reordering and another shift sweep.
-		if ( changes ) {
-			this.diffCleanupMerge( diffs );
-		}
-	};
-
-	return function( o, n ) {
-		var diff, output, text;
-		diff = new DiffMatchPatch();
-		output = diff.DiffMain( o, n );
-		diff.diffCleanupEfficiency( output );
-		text = diff.diffPrettyHtml( output );
-
-		return text;
-	};
-}() );
-
-}() );
+  global$1 = 'default' in global$1 ? global$1['default'] : global$1;
+
+  var window = global$1.window;
+  var self$1 = global$1.self;
+  var console = global$1.console;
+  var setTimeout = global$1.setTimeout;
+  var clearTimeout = global$1.clearTimeout;
+
+  var document = window && window.document;
+  var navigator = window && window.navigator;
+
+  var localSessionStorage = function () {
+  	var x = "qunit-test-string";
+  	try {
+  		global$1.sessionStorage.setItem(x, x);
+  		global$1.sessionStorage.removeItem(x);
+  		return global$1.sessionStorage;
+  	} catch (e) {
+  		return undefined;
+  	}
+  }();
+
+  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  };
+
+
+
+
+
+
+
+
+
+
+
+  var classCallCheck = function (instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  };
+
+  var createClass = function () {
+    function defineProperties(target, props) {
+      for (var i = 0; i < props.length; i++) {
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+      }
+    }
+
+    return function (Constructor, protoProps, staticProps) {
+      if (protoProps) defineProperties(Constructor.prototype, protoProps);
+      if (staticProps) defineProperties(Constructor, staticProps);
+      return Constructor;
+    };
+  }();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  var toConsumableArray = function (arr) {
+    if (Array.isArray(arr)) {
+      for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
+
+      return arr2;
+    } else {
+      return Array.from(arr);
+    }
+  };
+
+  var toString = Object.prototype.toString;
+  var hasOwn = Object.prototype.hasOwnProperty;
+  var now = Date.now || function () {
+  	return new Date().getTime();
+  };
+
+  var defined = {
+  	document: window && window.document !== undefined,
+  	setTimeout: setTimeout !== undefined
+  };
+
+  // Returns a new Array with the elements that are in a but not in b
+  function diff(a, b) {
+  	var i,
+  	    j,
+  	    result = a.slice();
+
+  	for (i = 0; i < result.length; i++) {
+  		for (j = 0; j < b.length; j++) {
+  			if (result[i] === b[j]) {
+  				result.splice(i, 1);
+  				i--;
+  				break;
+  			}
+  		}
+  	}
+  	return result;
+  }
+
+  /**
+   * Determines whether an element exists in a given array or not.
+   *
+   * @method inArray
+   * @param {Any} elem
+   * @param {Array} array
+   * @return {Boolean}
+   */
+  function inArray(elem, array) {
+  	return array.indexOf(elem) !== -1;
+  }
+
+  /**
+   * Makes a clone of an object using only Array or Object as base,
+   * and copies over the own enumerable properties.
+   *
+   * @param {Object} obj
+   * @return {Object} New object with only the own properties (recursively).
+   */
+  function objectValues(obj) {
+  	var key,
+  	    val,
+  	    vals = is("array", obj) ? [] : {};
+  	for (key in obj) {
+  		if (hasOwn.call(obj, key)) {
+  			val = obj[key];
+  			vals[key] = val === Object(val) ? objectValues(val) : val;
+  		}
+  	}
+  	return vals;
+  }
+
+  function extend(a, b, undefOnly) {
+  	for (var prop in b) {
+  		if (hasOwn.call(b, prop)) {
+  			if (b[prop] === undefined) {
+  				delete a[prop];
+  			} else if (!(undefOnly && typeof a[prop] !== "undefined")) {
+  				a[prop] = b[prop];
+  			}
+  		}
+  	}
+
+  	return a;
+  }
+
+  function objectType(obj) {
+  	if (typeof obj === "undefined") {
+  		return "undefined";
+  	}
+
+  	// Consider: typeof null === object
+  	if (obj === null) {
+  		return "null";
+  	}
+
+  	var match = toString.call(obj).match(/^\[object\s(.*)\]$/),
+  	    type = match && match[1];
+
+  	switch (type) {
+  		case "Number":
+  			if (isNaN(obj)) {
+  				return "nan";
+  			}
+  			return "number";
+  		case "String":
+  		case "Boolean":
+  		case "Array":
+  		case "Set":
+  		case "Map":
+  		case "Date":
+  		case "RegExp":
+  		case "Function":
+  		case "Symbol":
+  			return type.toLowerCase();
+  	}
+
+  	if ((typeof obj === "undefined" ? "undefined" : _typeof(obj)) === "object") {
+  		return "object";
+  	}
+  }
+
+  // Safe object type checking
+  function is(type, obj) {
+  	return objectType(obj) === type;
+  }
+
+  // Based on Java's String.hashCode, a simple but not
+  // rigorously collision resistant hashing function
+  function generateHash(module, testName) {
+  	var str = module + "\x1C" + testName;
+  	var hash = 0;
+
+  	for (var i = 0; i < str.length; i++) {
+  		hash = (hash << 5) - hash + str.charCodeAt(i);
+  		hash |= 0;
+  	}
+
+  	// Convert the possibly negative integer hash code into an 8 character hex string, which isn't
+  	// strictly necessary but increases user understanding that the id is a SHA-like hash
+  	var hex = (0x100000000 + hash).toString(16);
+  	if (hex.length < 8) {
+  		hex = "0000000" + hex;
+  	}
+
+  	return hex.slice(-8);
+  }
+
+  // Test for equality any JavaScript type.
+  // Authors: Philippe Rathé <prathe@gmail.com>, David Chan <david@troi.org>
+  var equiv = (function () {
+
+  	// Value pairs queued for comparison. Used for breadth-first processing order, recursion
+  	// detection and avoiding repeated comparison (see below for details).
+  	// Elements are { a: val, b: val }.
+  	var pairs = [];
+
+  	var getProto = Object.getPrototypeOf || function (obj) {
+  		return obj.__proto__;
+  	};
+
+  	function useStrictEquality(a, b) {
+
+  		// This only gets called if a and b are not strict equal, and is used to compare on
+  		// the primitive values inside object wrappers. For example:
+  		// `var i = 1;`
+  		// `var j = new Number(1);`
+  		// Neither a nor b can be null, as a !== b and they have the same type.
+  		if ((typeof a === "undefined" ? "undefined" : _typeof(a)) === "object") {
+  			a = a.valueOf();
+  		}
+  		if ((typeof b === "undefined" ? "undefined" : _typeof(b)) === "object") {
+  			b = b.valueOf();
+  		}
+
+  		return a === b;
+  	}
+
+  	function compareConstructors(a, b) {
+  		var protoA = getProto(a);
+  		var protoB = getProto(b);
+
+  		// Comparing constructors is more strict than using `instanceof`
+  		if (a.constructor === b.constructor) {
+  			return true;
+  		}
+
+  		// Ref #851
+  		// If the obj prototype descends from a null constructor, treat it
+  		// as a null prototype.
+  		if (protoA && protoA.constructor === null) {
+  			protoA = null;
+  		}
+  		if (protoB && protoB.constructor === null) {
+  			protoB = null;
+  		}
+
+  		// Allow objects with no prototype to be equivalent to
+  		// objects with Object as their constructor.
+  		if (protoA === null && protoB === Object.prototype || protoB === null && protoA === Object.prototype) {
+  			return true;
+  		}
+
+  		return false;
+  	}
+
+  	function getRegExpFlags(regexp) {
+  		return "flags" in regexp ? regexp.flags : regexp.toString().match(/[gimuy]*$/)[0];
+  	}
+
+  	function isContainer(val) {
+  		return ["object", "array", "map", "set"].indexOf(objectType(val)) !== -1;
+  	}
+
+  	function breadthFirstCompareChild(a, b) {
+
+  		// If a is a container not reference-equal to b, postpone the comparison to the
+  		// end of the pairs queue -- unless (a, b) has been seen before, in which case skip
+  		// over the pair.
+  		if (a === b) {
+  			return true;
+  		}
+  		if (!isContainer(a)) {
+  			return typeEquiv(a, b);
+  		}
+  		if (pairs.every(function (pair) {
+  			return pair.a !== a || pair.b !== b;
+  		})) {
+
+  			// Not yet started comparing this pair
+  			pairs.push({ a: a, b: b });
+  		}
+  		return true;
+  	}
+
+  	var callbacks = {
+  		"string": useStrictEquality,
+  		"boolean": useStrictEquality,
+  		"number": useStrictEquality,
+  		"null": useStrictEquality,
+  		"undefined": useStrictEquality,
+  		"symbol": useStrictEquality,
+  		"date": useStrictEquality,
+
+  		"nan": function nan() {
+  			return true;
+  		},
+
+  		"regexp": function regexp(a, b) {
+  			return a.source === b.source &&
+
+  			// Include flags in the comparison
+  			getRegExpFlags(a) === getRegExpFlags(b);
+  		},
+
+  		// abort (identical references / instance methods were skipped earlier)
+  		"function": function _function() {
+  			return false;
+  		},
+
+  		"array": function array(a, b) {
+  			var i, len;
+
+  			len = a.length;
+  			if (len !== b.length) {
+
+  				// Safe and faster
+  				return false;
+  			}
+
+  			for (i = 0; i < len; i++) {
+
+  				// Compare non-containers; queue non-reference-equal containers
+  				if (!breadthFirstCompareChild(a[i], b[i])) {
+  					return false;
+  				}
+  			}
+  			return true;
+  		},
+
+  		// Define sets a and b to be equivalent if for each element aVal in a, there
+  		// is some element bVal in b such that aVal and bVal are equivalent. Element
+  		// repetitions are not counted, so these are equivalent:
+  		// a = new Set( [ {}, [], [] ] );
+  		// b = new Set( [ {}, {}, [] ] );
+  		"set": function set$$1(a, b) {
+  			var innerEq,
+  			    outerEq = true;
+
+  			if (a.size !== b.size) {
+
+  				// This optimization has certain quirks because of the lack of
+  				// repetition counting. For instance, adding the same
+  				// (reference-identical) element to two equivalent sets can
+  				// make them non-equivalent.
+  				return false;
+  			}
+
+  			a.forEach(function (aVal) {
+
+  				// Short-circuit if the result is already known. (Using for...of
+  				// with a break clause would be cleaner here, but it would cause
+  				// a syntax error on older Javascript implementations even if
+  				// Set is unused)
+  				if (!outerEq) {
+  					return;
+  				}
+
+  				innerEq = false;
+
+  				b.forEach(function (bVal) {
+  					var parentPairs;
+
+  					// Likewise, short-circuit if the result is already known
+  					if (innerEq) {
+  						return;
+  					}
+
+  					// Swap out the global pairs list, as the nested call to
+  					// innerEquiv will clobber its contents
+  					parentPairs = pairs;
+  					if (innerEquiv(bVal, aVal)) {
+  						innerEq = true;
+  					}
+
+  					// Replace the global pairs list
+  					pairs = parentPairs;
+  				});
+
+  				if (!innerEq) {
+  					outerEq = false;
+  				}
+  			});
+
+  			return outerEq;
+  		},
+
+  		// Define maps a and b to be equivalent if for each key-value pair (aKey, aVal)
+  		// in a, there is some key-value pair (bKey, bVal) in b such that
+  		// [ aKey, aVal ] and [ bKey, bVal ] are equivalent. Key repetitions are not
+  		// counted, so these are equivalent:
+  		// a = new Map( [ [ {}, 1 ], [ {}, 1 ], [ [], 1 ] ] );
+  		// b = new Map( [ [ {}, 1 ], [ [], 1 ], [ [], 1 ] ] );
+  		"map": function map(a, b) {
+  			var innerEq,
+  			    outerEq = true;
+
+  			if (a.size !== b.size) {
+
+  				// This optimization has certain quirks because of the lack of
+  				// repetition counting. For instance, adding the same
+  				// (reference-identical) key-value pair to two equivalent maps
+  				// can make them non-equivalent.
+  				return false;
+  			}
+
+  			a.forEach(function (aVal, aKey) {
+
+  				// Short-circuit if the result is already known. (Using for...of
+  				// with a break clause would be cleaner here, but it would cause
+  				// a syntax error on older Javascript implementations even if
+  				// Map is unused)
+  				if (!outerEq) {
+  					return;
+  				}
+
+  				innerEq = false;
+
+  				b.forEach(function (bVal, bKey) {
+  					var parentPairs;
+
+  					// Likewise, short-circuit if the result is already known
+  					if (innerEq) {
+  						return;
+  					}
+
+  					// Swap out the global pairs list, as the nested call to
+  					// innerEquiv will clobber its contents
+  					parentPairs = pairs;
+  					if (innerEquiv([bVal, bKey], [aVal, aKey])) {
+  						innerEq = true;
+  					}
+
+  					// Replace the global pairs list
+  					pairs = parentPairs;
+  				});
+
+  				if (!innerEq) {
+  					outerEq = false;
+  				}
+  			});
+
+  			return outerEq;
+  		},
+
+  		"object": function object(a, b) {
+  			var i,
+  			    aProperties = [],
+  			    bProperties = [];
+
+  			if (compareConstructors(a, b) === false) {
+  				return false;
+  			}
+
+  			// Be strict: don't ensure hasOwnProperty and go deep
+  			for (i in a) {
+
+  				// Collect a's properties
+  				aProperties.push(i);
+
+  				// Skip OOP methods that look the same
+  				if (a.constructor !== Object && typeof a.constructor !== "undefined" && typeof a[i] === "function" && typeof b[i] === "function" && a[i].toString() === b[i].toString()) {
+  					continue;
+  				}
+
+  				// Compare non-containers; queue non-reference-equal containers
+  				if (!breadthFirstCompareChild(a[i], b[i])) {
+  					return false;
+  				}
+  			}
+
+  			for (i in b) {
+
+  				// Collect b's properties
+  				bProperties.push(i);
+  			}
+
+  			// Ensures identical properties name
+  			return typeEquiv(aProperties.sort(), bProperties.sort());
+  		}
+  	};
+
+  	function typeEquiv(a, b) {
+  		var type = objectType(a);
+
+  		// Callbacks for containers will append to the pairs queue to achieve breadth-first
+  		// search order. The pairs queue is also used to avoid reprocessing any pair of
+  		// containers that are reference-equal to a previously visited pair (a special case
+  		// this being recursion detection).
+  		//
+  		// Because of this approach, once typeEquiv returns a false value, it should not be
+  		// called again without clearing the pair queue else it may wrongly report a visited
+  		// pair as being equivalent.
+  		return objectType(b) === type && callbacks[type](a, b);
+  	}
+
+  	function innerEquiv(a, b) {
+  		var i, pair;
+
+  		// We're done when there's nothing more to compare
+  		if (arguments.length < 2) {
+  			return true;
+  		}
+
+  		// Clear the global pair queue and add the top-level values being compared
+  		pairs = [{ a: a, b: b }];
+
+  		for (i = 0; i < pairs.length; i++) {
+  			pair = pairs[i];
+
+  			// Perform type-specific comparison on any pairs that are not strictly
+  			// equal. For container types, that comparison will postpone comparison
+  			// of any sub-container pair to the end of the pair queue. This gives
+  			// breadth-first search order. It also avoids the reprocessing of
+  			// reference-equal siblings, cousins etc, which can have a significant speed
+  			// impact when comparing a container of small objects each of which has a
+  			// reference to the same (singleton) large object.
+  			if (pair.a !== pair.b && !typeEquiv(pair.a, pair.b)) {
+  				return false;
+  			}
+  		}
+
+  		// ...across all consecutive argument pairs
+  		return arguments.length === 2 || innerEquiv.apply(this, [].slice.call(arguments, 1));
+  	}
+
+  	return innerEquiv;
+  })();
+
+  /**
+   * Config object: Maintain internal state
+   * Later exposed as QUnit.config
+   * `config` initialized at top of scope
+   */
+  var config = {
+
+  	// The queue of tests to run
+  	queue: [],
+
+  	// Block until document ready
+  	blocking: true,
+
+  	// By default, run previously failed tests first
+  	// very useful in combination with "Hide passed tests" checked
+  	reorder: true,
+
+  	// By default, modify document.title when suite is done
+  	altertitle: true,
+
+  	// HTML Reporter: collapse every test except the first failing test
+  	// If false, all failing tests will be expanded
+  	collapse: true,
+
+  	// By default, scroll to top of the page when suite is done
+  	scrolltop: true,
+
+  	// Depth up-to which object will be dumped
+  	maxDepth: 5,
+
+  	// When enabled, all tests must call expect()
+  	requireExpects: false,
+
+  	// Placeholder for user-configurable form-exposed URL parameters
+  	urlConfig: [],
+
+  	// Set of all modules.
+  	modules: [],
+
+  	// The first unnamed module
+  	currentModule: {
+  		name: "",
+  		tests: [],
+  		childModules: [],
+  		testsRun: 0,
+  		unskippedTestsRun: 0
+  	},
+
+  	callbacks: {},
+
+  	// The storage module to use for reordering tests
+  	storage: localSessionStorage
+  };
+
+  // take a predefined QUnit.config and extend the defaults
+  var globalConfig = window && window.QUnit && window.QUnit.config;
+
+  // only extend the global config if there is no QUnit overload
+  if (window && window.QUnit && !window.QUnit.version) {
+  	extend(config, globalConfig);
+  }
+
+  // Push a loose unnamed module to the modules collection
+  config.modules.push(config.currentModule);
+
+  // Based on jsDump by Ariel Flesler
+  // http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html
+  var dump = (function () {
+  	function quote(str) {
+  		return "\"" + str.toString().replace(/\\/g, "\\\\").replace(/"/g, "\\\"") + "\"";
+  	}
+  	function literal(o) {
+  		return o + "";
+  	}
+  	function join(pre, arr, post) {
+  		var s = dump.separator(),
+  		    base = dump.indent(),
+  		    inner = dump.indent(1);
+  		if (arr.join) {
+  			arr = arr.join("," + s + inner);
+  		}
+  		if (!arr) {
+  			return pre + post;
+  		}
+  		return [pre, inner + arr, base + post].join(s);
+  	}
+  	function array(arr, stack) {
+  		var i = arr.length,
+  		    ret = new Array(i);
+
+  		if (dump.maxDepth && dump.depth > dump.maxDepth) {
+  			return "[object Array]";
+  		}
+
+  		this.up();
+  		while (i--) {
+  			ret[i] = this.parse(arr[i], undefined, stack);
+  		}
+  		this.down();
+  		return join("[", ret, "]");
+  	}
+
+  	function isArray(obj) {
+  		return (
+
+  			//Native Arrays
+  			toString.call(obj) === "[object Array]" ||
+
+  			// NodeList objects
+  			typeof obj.length === "number" && obj.item !== undefined && (obj.length ? obj.item(0) === obj[0] : obj.item(0) === null && obj[0] === undefined)
+  		);
+  	}
+
+  	var reName = /^function (\w+)/,
+  	    dump = {
+
+  		// The objType is used mostly internally, you can fix a (custom) type in advance
+  		parse: function parse(obj, objType, stack) {
+  			stack = stack || [];
+  			var res,
+  			    parser,
+  			    parserType,
+  			    objIndex = stack.indexOf(obj);
+
+  			if (objIndex !== -1) {
+  				return "recursion(" + (objIndex - stack.length) + ")";
+  			}
+
+  			objType = objType || this.typeOf(obj);
+  			parser = this.parsers[objType];
+  			parserType = typeof parser === "undefined" ? "undefined" : _typeof(parser);
+
+  			if (parserType === "function") {
+  				stack.push(obj);
+  				res = parser.call(this, obj, stack);
+  				stack.pop();
+  				return res;
+  			}
+  			return parserType === "string" ? parser : this.parsers.error;
+  		},
+  		typeOf: function typeOf(obj) {
+  			var type;
+
+  			if (obj === null) {
+  				type = "null";
+  			} else if (typeof obj === "undefined") {
+  				type = "undefined";
+  			} else if (is("regexp", obj)) {
+  				type = "regexp";
+  			} else if (is("date", obj)) {
+  				type = "date";
+  			} else if (is("function", obj)) {
+  				type = "function";
+  			} else if (obj.setInterval !== undefined && obj.document !== undefined && obj.nodeType === undefined) {
+  				type = "window";
+  			} else if (obj.nodeType === 9) {
+  				type = "document";
+  			} else if (obj.nodeType) {
+  				type = "node";
+  			} else if (isArray(obj)) {
+  				type = "array";
+  			} else if (obj.constructor === Error.prototype.constructor) {
+  				type = "error";
+  			} else {
+  				type = typeof obj === "undefined" ? "undefined" : _typeof(obj);
+  			}
+  			return type;
+  		},
+
+  		separator: function separator() {
+  			if (this.multiline) {
+  				return this.HTML ? "<br />" : "\n";
+  			} else {
+  				return this.HTML ? "&#160;" : " ";
+  			}
+  		},
+
+  		// Extra can be a number, shortcut for increasing-calling-decreasing
+  		indent: function indent(extra) {
+  			if (!this.multiline) {
+  				return "";
+  			}
+  			var chr = this.indentChar;
+  			if (this.HTML) {
+  				chr = chr.replace(/\t/g, "   ").replace(/ /g, "&#160;");
+  			}
+  			return new Array(this.depth + (extra || 0)).join(chr);
+  		},
+  		up: function up(a) {
+  			this.depth += a || 1;
+  		},
+  		down: function down(a) {
+  			this.depth -= a || 1;
+  		},
+  		setParser: function setParser(name, parser) {
+  			this.parsers[name] = parser;
+  		},
+
+  		// The next 3 are exposed so you can use them
+  		quote: quote,
+  		literal: literal,
+  		join: join,
+  		depth: 1,
+  		maxDepth: config.maxDepth,
+
+  		// This is the list of parsers, to modify them, use dump.setParser
+  		parsers: {
+  			window: "[Window]",
+  			document: "[Document]",
+  			error: function error(_error) {
+  				return "Error(\"" + _error.message + "\")";
+  			},
+  			unknown: "[Unknown]",
+  			"null": "null",
+  			"undefined": "undefined",
+  			"function": function _function(fn) {
+  				var ret = "function",
+
+
+  				// Functions never have name in IE
+  				name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1];
+
+  				if (name) {
+  					ret += " " + name;
+  				}
+  				ret += "(";
+
+  				ret = [ret, dump.parse(fn, "functionArgs"), "){"].join("");
+  				return join(ret, dump.parse(fn, "functionCode"), "}");
+  			},
+  			array: array,
+  			nodelist: array,
+  			"arguments": array,
+  			object: function object(map, stack) {
+  				var keys,
+  				    key,
+  				    val,
+  				    i,
+  				    nonEnumerableProperties,
+  				    ret = [];
+
+  				if (dump.maxDepth && dump.depth > dump.maxDepth) {
+  					return "[object Object]";
+  				}
+
+  				dump.up();
+  				keys = [];
+  				for (key in map) {
+  					keys.push(key);
+  				}
+
+  				// Some properties are not always enumerable on Error objects.
+  				nonEnumerableProperties = ["message", "name"];
+  				for (i in nonEnumerableProperties) {
+  					key = nonEnumerableProperties[i];
+  					if (key in map && !inArray(key, keys)) {
+  						keys.push(key);
+  					}
+  				}
+  				keys.sort();
+  				for (i = 0; i < keys.length; i++) {
+  					key = keys[i];
+  					val = map[key];
+  					ret.push(dump.parse(key, "key") + ": " + dump.parse(val, undefined, stack));
+  				}
+  				dump.down();
+  				return join("{", ret, "}");
+  			},
+  			node: function node(_node) {
+  				var len,
+  				    i,
+  				    val,
+  				    open = dump.HTML ? "&lt;" : "<",
+  				    close = dump.HTML ? "&gt;" : ">",
+  				    tag = _node.nodeName.toLowerCase(),
+  				    ret = open + tag,
+  				    attrs = _node.attributes;
+
+  				if (attrs) {
+  					for (i = 0, len = attrs.length; i < len; i++) {
+  						val = attrs[i].nodeValue;
+
+  						// IE6 includes all attributes in .attributes, even ones not explicitly
+  						// set. Those have values like undefined, null, 0, false, "" or
+  						// "inherit".
+  						if (val && val !== "inherit") {
+  							ret += " " + attrs[i].nodeName + "=" + dump.parse(val, "attribute");
+  						}
+  					}
+  				}
+  				ret += close;
+
+  				// Show content of TextNode or CDATASection
+  				if (_node.nodeType === 3 || _node.nodeType === 4) {
+  					ret += _node.nodeValue;
+  				}
+
+  				return ret + open + "/" + tag + close;
+  			},
+
+  			// Function calls it internally, it's the arguments part of the function
+  			functionArgs: function functionArgs(fn) {
+  				var args,
+  				    l = fn.length;
+
+  				if (!l) {
+  					return "";
+  				}
+
+  				args = new Array(l);
+  				while (l--) {
+
+  					// 97 is 'a'
+  					args[l] = String.fromCharCode(97 + l);
+  				}
+  				return " " + args.join(", ") + " ";
+  			},
+
+  			// Object calls it internally, the key part of an item in a map
+  			key: quote,
+
+  			// Function calls it internally, it's the content of the function
+  			functionCode: "[code]",
+
+  			// Node calls it internally, it's a html attribute value
+  			attribute: quote,
+  			string: quote,
+  			date: quote,
+  			regexp: literal,
+  			number: literal,
+  			"boolean": literal,
+  			symbol: function symbol(sym) {
+  				return sym.toString();
+  			}
+  		},
+
+  		// If true, entities are escaped ( <, >, \t, space and \n )
+  		HTML: false,
+
+  		// Indentation unit
+  		indentChar: "  ",
+
+  		// If true, items in a collection, are separated by a \n, else just a space.
+  		multiline: true
+  	};
+
+  	return dump;
+  })();
+
+  var LISTENERS = Object.create(null);
+  var SUPPORTED_EVENTS = ["runStart", "suiteStart", "testStart", "assertion", "testEnd", "suiteEnd", "runEnd"];
+
+  /**
+   * Emits an event with the specified data to all currently registered listeners.
+   * Callbacks will fire in the order in which they are registered (FIFO). This
+   * function is not exposed publicly; it is used by QUnit internals to emit
+   * logging events.
+   *
+   * @private
+   * @method emit
+   * @param {String} eventName
+   * @param {Object} data
+   * @return {Void}
+   */
+  function emit(eventName, data) {
+  	if (objectType(eventName) !== "string") {
+  		throw new TypeError("eventName must be a string when emitting an event");
+  	}
+
+  	// Clone the callbacks in case one of them registers a new callback
+  	var originalCallbacks = LISTENERS[eventName];
+  	var callbacks = originalCallbacks ? [].concat(toConsumableArray(originalCallbacks)) : [];
+
+  	for (var i = 0; i < callbacks.length; i++) {
+  		callbacks[i](data);
+  	}
+  }
+
+  /**
+   * Registers a callback as a listener to the specified event.
+   *
+   * @public
+   * @method on
+   * @param {String} eventName
+   * @param {Function} callback
+   * @return {Void}
+   */
+  function on(eventName, callback) {
+  	if (objectType(eventName) !== "string") {
+  		throw new TypeError("eventName must be a string when registering a listener");
+  	} else if (!inArray(eventName, SUPPORTED_EVENTS)) {
+  		var events = SUPPORTED_EVENTS.join(", ");
+  		throw new Error("\"" + eventName + "\" is not a valid event; must be one of: " + events + ".");
+  	} else if (objectType(callback) !== "function") {
+  		throw new TypeError("callback must be a function when registering a listener");
+  	}
+
+  	if (!LISTENERS[eventName]) {
+  		LISTENERS[eventName] = [];
+  	}
+
+  	// Don't register the same callback more than once
+  	if (!inArray(callback, LISTENERS[eventName])) {
+  		LISTENERS[eventName].push(callback);
+  	}
+  }
+
+  // Register logging callbacks
+  function registerLoggingCallbacks(obj) {
+  	var i,
+  	    l,
+  	    key,
+  	    callbackNames = ["begin", "done", "log", "testStart", "testDone", "moduleStart", "moduleDone"];
+
+  	function registerLoggingCallback(key) {
+  		var loggingCallback = function loggingCallback(callback) {
+  			if (objectType(callback) !== "function") {
+  				throw new Error("QUnit logging methods require a callback function as their first parameters.");
+  			}
+
+  			config.callbacks[key].push(callback);
+  		};
+
+  		return loggingCallback;
+  	}
+
+  	for (i = 0, l = callbackNames.length; i < l; i++) {
+  		key = callbackNames[i];
+
+  		// Initialize key collection of logging callback
+  		if (objectType(config.callbacks[key]) === "undefined") {
+  			config.callbacks[key] = [];
+  		}
+
+  		obj[key] = registerLoggingCallback(key);
+  	}
+  }
+
+  function runLoggingCallbacks(key, args) {
+  	var i, l, callbacks;
+
+  	callbacks = config.callbacks[key];
+  	for (i = 0, l = callbacks.length; i < l; i++) {
+  		callbacks[i](args);
+  	}
+  }
+
+  // Doesn't support IE9, it will return undefined on these browsers
+  // See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
+  var fileName = (sourceFromStacktrace(0) || "").replace(/(:\d+)+\)?/, "").replace(/.+\//, "");
+
+  function extractStacktrace(e, offset) {
+  	offset = offset === undefined ? 4 : offset;
+
+  	var stack, include, i;
+
+  	if (e && e.stack) {
+  		stack = e.stack.split("\n");
+  		if (/^error$/i.test(stack[0])) {
+  			stack.shift();
+  		}
+  		if (fileName) {
+  			include = [];
+  			for (i = offset; i < stack.length; i++) {
+  				if (stack[i].indexOf(fileName) !== -1) {
+  					break;
+  				}
+  				include.push(stack[i]);
+  			}
+  			if (include.length) {
+  				return include.join("\n");
+  			}
+  		}
+  		return stack[offset];
+  	}
+  }
+
+  function sourceFromStacktrace(offset) {
+  	var error = new Error();
+
+  	// Support: Safari <=7 only, IE <=10 - 11 only
+  	// Not all browsers generate the `stack` property for `new Error()`, see also #636
+  	if (!error.stack) {
+  		try {
+  			throw error;
+  		} catch (err) {
+  			error = err;
+  		}
+  	}
+
+  	return extractStacktrace(error, offset);
+  }
+
+  var priorityCount = 0;
+  var unitSampler = void 0;
+
+  /**
+   * Advances the ProcessingQueue to the next item if it is ready.
+   * @param {Boolean} last
+   */
+  function advance() {
+  	var start = now();
+  	config.depth = (config.depth || 0) + 1;
+
+  	while (config.queue.length && !config.blocking) {
+  		var elapsedTime = now() - start;
+
+  		if (!defined.setTimeout || config.updateRate <= 0 || elapsedTime < config.updateRate) {
+  			if (priorityCount > 0) {
+  				priorityCount--;
+  			}
+
+  			config.queue.shift()();
+  		} else {
+  			setTimeout(advance, 13);
+  			break;
+  		}
+  	}
+
+  	config.depth--;
+
+  	if (!config.blocking && !config.queue.length && config.depth === 0) {
+  		done();
+  	}
+  }
+
+  function addToQueueImmediate(callback) {
+  	if (objectType(callback) === "array") {
+  		while (callback.length) {
+  			addToQueueImmediate(callback.pop());
+  		}
+
+  		return;
+  	}
+
+  	config.queue.unshift(callback);
+  	priorityCount++;
+  }
+
+  /**
+   * Adds a function to the ProcessingQueue for execution.
+   * @param {Function|Array} callback
+   * @param {Boolean} priority
+   * @param {String} seed
+   */
+  function addToQueue(callback, prioritize, seed) {
+  	if (prioritize) {
+  		config.queue.splice(priorityCount++, 0, callback);
+  	} else if (seed) {
+  		if (!unitSampler) {
+  			unitSampler = unitSamplerGenerator(seed);
+  		}
+
+  		// Insert into a random position after all prioritized items
+  		var index = Math.floor(unitSampler() * (config.queue.length - priorityCount + 1));
+  		config.queue.splice(priorityCount + index, 0, callback);
+  	} else {
+  		config.queue.push(callback);
+  	}
+  }
+
+  /**
+   * Creates a seeded "sample" generator which is used for randomizing tests.
+   */
+  function unitSamplerGenerator(seed) {
+
+  	// 32-bit xorshift, requires only a nonzero seed
+  	// http://excamera.com/sphinx/article-xorshift.html
+  	var sample = parseInt(generateHash(seed), 16) || -1;
+  	return function () {
+  		sample ^= sample << 13;
+  		sample ^= sample >>> 17;
+  		sample ^= sample << 5;
+
+  		// ECMAScript has no unsigned number type
+  		if (sample < 0) {
+  			sample += 0x100000000;
+  		}
+
+  		return sample / 0x100000000;
+  	};
+  }
+
+  /**
+   * This function is called when the ProcessingQueue is done processing all
+   * items. It handles emitting the final run events.
+   */
+  function done() {
+  	var storage = config.storage;
+
+  	ProcessingQueue.finished = true;
+
+  	var runtime = now() - config.started;
+  	var passed = config.stats.all - config.stats.bad;
+
+  	emit("runEnd", globalSuite.end(true));
+  	runLoggingCallbacks("done", {
+  		passed: passed,
+  		failed: config.stats.bad,
+  		total: config.stats.all,
+  		runtime: runtime
+  	});
+
+  	// Clear own storage items if all tests passed
+  	if (storage && config.stats.bad === 0) {
+  		for (var i = storage.length - 1; i >= 0; i--) {
+  			var key = storage.key(i);
+
+  			if (key.indexOf("qunit-test-") === 0) {
+  				storage.removeItem(key);
+  			}
+  		}
+  	}
+  }
+
+  var ProcessingQueue = {
+  	finished: false,
+  	add: addToQueue,
+  	addImmediate: addToQueueImmediate,
+  	advance: advance
+  };
+
+  var TestReport = function () {
+  	function TestReport(name, suite, options) {
+  		classCallCheck(this, TestReport);
+
+  		this.name = name;
+  		this.suiteName = suite.name;
+  		this.fullName = suite.fullName.concat(name);
+  		this.runtime = 0;
+  		this.assertions = [];
+
+  		this.skipped = !!options.skip;
+  		this.todo = !!options.todo;
+
+  		this.valid = options.valid;
+
+  		this._startTime = 0;
+  		this._endTime = 0;
+
+  		suite.pushTest(this);
+  	}
+
+  	createClass(TestReport, [{
+  		key: "start",
+  		value: function start(recordTime) {
+  			if (recordTime) {
+  				this._startTime = Date.now();
+  			}
+
+  			return {
+  				name: this.name,
+  				suiteName: this.suiteName,
+  				fullName: this.fullName.slice()
+  			};
+  		}
+  	}, {
+  		key: "end",
+  		value: function end(recordTime) {
+  			if (recordTime) {
+  				this._endTime = Date.now();
+  			}
+
+  			return extend(this.start(), {
+  				runtime: this.getRuntime(),
+  				status: this.getStatus(),
+  				errors: this.getFailedAssertions(),
+  				assertions: this.getAssertions()
+  			});
+  		}
+  	}, {
+  		key: "pushAssertion",
+  		value: function pushAssertion(assertion) {
+  			this.assertions.push(assertion);
+  		}
+  	}, {
+  		key: "getRuntime",
+  		value: function getRuntime() {
+  			return this._endTime - this._startTime;
+  		}
+  	}, {
+  		key: "getStatus",
+  		value: function getStatus() {
+  			if (this.skipped) {
+  				return "skipped";
+  			}
+
+  			var testPassed = this.getFailedAssertions().length > 0 ? this.todo : !this.todo;
+
+  			if (!testPassed) {
+  				return "failed";
+  			} else if (this.todo) {
+  				return "todo";
+  			} else {
+  				return "passed";
+  			}
+  		}
+  	}, {
+  		key: "getFailedAssertions",
+  		value: function getFailedAssertions() {
+  			return this.assertions.filter(function (assertion) {
+  				return !assertion.passed;
+  			});
+  		}
+  	}, {
+  		key: "getAssertions",
+  		value: function getAssertions() {
+  			return this.assertions.slice();
+  		}
+
+  		// Remove actual and expected values from assertions. This is to prevent
+  		// leaking memory throughout a test suite.
+
+  	}, {
+  		key: "slimAssertions",
+  		value: function slimAssertions() {
+  			this.assertions = this.assertions.map(function (assertion) {
+  				delete assertion.actual;
+  				delete assertion.expected;
+  				return assertion;
+  			});
+  		}
+  	}]);
+  	return TestReport;
+  }();
+
+  var focused = false;
+
+  function Test(settings) {
+  	var i, l;
+
+  	++Test.count;
+
+  	this.expected = null;
+  	extend(this, settings);
+  	this.assertions = [];
+  	this.semaphore = 0;
+  	this.module = config.currentModule;
+  	this.stack = sourceFromStacktrace(3);
+  	this.steps = [];
+
+  	this.testReport = new TestReport(settings.testName, this.module.suiteReport, {
+  		todo: settings.todo,
+  		skip: settings.skip,
+  		valid: this.valid()
+  	});
+
+  	// Register unique strings
+  	for (i = 0, l = this.module.tests; i < l.length; i++) {
+  		if (this.module.tests[i].name === this.testName) {
+  			this.testName += " ";
+  		}
+  	}
+
+  	this.testId = generateHash(this.module.name, this.testName);
+
+  	this.module.tests.push({
+  		name: this.testName,
+  		testId: this.testId,
+  		skip: !!settings.skip
+  	});
+
+  	if (settings.skip) {
+
+  		// Skipped tests will fully ignore any sent callback
+  		this.callback = function () {};
+  		this.async = false;
+  		this.expected = 0;
+  	} else {
+  		this.assert = new Assert(this);
+  	}
+  }
+
+  Test.count = 0;
+
+  function getNotStartedModules(startModule) {
+  	var module = startModule,
+  	    modules = [];
+
+  	while (module && module.testsRun === 0) {
+  		modules.push(module);
+  		module = module.parentModule;
+  	}
+
+  	return modules;
+  }
+
+  Test.prototype = {
+  	before: function before() {
+  		var i,
+  		    startModule,
+  		    module = this.module,
+  		    notStartedModules = getNotStartedModules(module);
+
+  		for (i = notStartedModules.length - 1; i >= 0; i--) {
+  			startModule = notStartedModules[i];
+  			startModule.stats = { all: 0, bad: 0, started: now() };
+  			emit("suiteStart", startModule.suiteReport.start(true));
+  			runLoggingCallbacks("moduleStart", {
+  				name: startModule.name,
+  				tests: startModule.tests
+  			});
+  		}
+
+  		config.current = this;
+
+  		this.testEnvironment = extend({}, module.testEnvironment);
+
+  		this.started = now();
+  		emit("testStart", this.testReport.start(true));
+  		runLoggingCallbacks("testStart", {
+  			name: this.testName,
+  			module: module.name,
+  			testId: this.testId,
+  			previousFailure: this.previousFailure
+  		});
+
+  		if (!config.pollution) {
+  			saveGlobal();
+  		}
+  	},
+
+  	run: function run() {
+  		var promise;
+
+  		config.current = this;
+
+  		this.callbackStarted = now();
+
+  		if (config.notrycatch) {
+  			runTest(this);
+  			return;
+  		}
+
+  		try {
+  			runTest(this);
+  		} catch (e) {
+  			this.pushFailure("Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + (e.message || e), extractStacktrace(e, 0));
+
+  			// Else next test will carry the responsibility
+  			saveGlobal();
+
+  			// Restart the tests if they're blocking
+  			if (config.blocking) {
+  				internalRecover(this);
+  			}
+  		}
+
+  		function runTest(test) {
+  			promise = test.callback.call(test.testEnvironment, test.assert);
+  			test.resolvePromise(promise);
+  		}
+  	},
+
+  	after: function after() {
+  		checkPollution();
+  	},
+
+  	queueHook: function queueHook(hook, hookName, hookOwner) {
+  		var promise,
+  		    test = this;
+  		return function runHook() {
+  			if (hookName === "before") {
+  				if (hookOwner.unskippedTestsRun !== 0) {
+  					return;
+  				}
+
+  				test.preserveEnvironment = true;
+  			}
+
+  			if (hookName === "after" && hookOwner.unskippedTestsRun !== numberOfUnskippedTests(hookOwner) - 1 && config.queue.length > 2) {
+  				return;
+  			}
+
+  			config.current = test;
+  			if (config.notrycatch) {
+  				callHook();
+  				return;
+  			}
+  			try {
+  				callHook();
+  			} catch (error) {
+  				test.pushFailure(hookName + " failed on " + test.testName + ": " + (error.message || error), extractStacktrace(error, 0));
+  			}
+
+  			function callHook() {
+  				promise = hook.call(test.testEnvironment, test.assert);
+  				test.resolvePromise(promise, hookName);
+  			}
+  		};
+  	},
+
+  	// Currently only used for module level hooks, can be used to add global level ones
+  	hooks: function hooks(handler) {
+  		var hooks = [];
+
+  		function processHooks(test, module) {
+  			if (module.parentModule) {
+  				processHooks(test, module.parentModule);
+  			}
+  			if (module.hooks && objectType(module.hooks[handler]) === "function") {
+  				hooks.push(test.queueHook(module.hooks[handler], handler, module));
+  			}
+  		}
+
+  		// Hooks are ignored on skipped tests
+  		if (!this.skip) {
+  			processHooks(this, this.module);
+  		}
+  		return hooks;
+  	},
+
+  	finish: function finish() {
+  		config.current = this;
+  		if (config.requireExpects && this.expected === null) {
+  			this.pushFailure("Expected number of assertions to be defined, but expect() was " + "not called.", this.stack);
+  		} else if (this.expected !== null && this.expected !== this.assertions.length) {
+  			this.pushFailure("Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack);
+  		} else if (this.expected === null && !this.assertions.length) {
+  			this.pushFailure("Expected at least one assertion, but none were run - call " + "expect(0) to accept zero assertions.", this.stack);
+  		}
+
+  		var i,
+  		    module = this.module,
+  		    moduleName = module.name,
+  		    testName = this.testName,
+  		    skipped = !!this.skip,
+  		    todo = !!this.todo,
+  		    bad = 0,
+  		    storage = config.storage;
+
+  		this.runtime = now() - this.started;
+
+  		config.stats.all += this.assertions.length;
+  		module.stats.all += this.assertions.length;
+
+  		for (i = 0; i < this.assertions.length; i++) {
+  			if (!this.assertions[i].result) {
+  				bad++;
+  				config.stats.bad++;
+  				module.stats.bad++;
+  			}
+  		}
+
+  		notifyTestsRan(module, skipped);
+
+  		// Store result when possible
+  		if (storage) {
+  			if (bad) {
+  				storage.setItem("qunit-test-" + moduleName + "-" + testName, bad);
+  			} else {
+  				storage.removeItem("qunit-test-" + moduleName + "-" + testName);
+  			}
+  		}
+
+  		// After emitting the js-reporters event we cleanup the assertion data to
+  		// avoid leaking it. It is not used by the legacy testDone callbacks.
+  		emit("testEnd", this.testReport.end(true));
+  		this.testReport.slimAssertions();
+
+  		runLoggingCallbacks("testDone", {
+  			name: testName,
+  			module: moduleName,
+  			skipped: skipped,
+  			todo: todo,
+  			failed: bad,
+  			passed: this.assertions.length - bad,
+  			total: this.assertions.length,
+  			runtime: skipped ? 0 : this.runtime,
+
+  			// HTML Reporter use
+  			assertions: this.assertions,
+  			testId: this.testId,
+
+  			// Source of Test
+  			source: this.stack
+  		});
+
+  		if (module.testsRun === numberOfTests(module)) {
+  			logSuiteEnd(module);
+
+  			// Check if the parent modules, iteratively, are done. If that the case,
+  			// we emit the `suiteEnd` event and trigger `moduleDone` callback.
+  			var parent = module.parentModule;
+  			while (parent && parent.testsRun === numberOfTests(parent)) {
+  				logSuiteEnd(parent);
+  				parent = parent.parentModule;
+  			}
+  		}
+
+  		config.current = undefined;
+
+  		function logSuiteEnd(module) {
+  			emit("suiteEnd", module.suiteReport.end(true));
+  			runLoggingCallbacks("moduleDone", {
+  				name: module.name,
+  				tests: module.tests,
+  				failed: module.stats.bad,
+  				passed: module.stats.all - module.stats.bad,
+  				total: module.stats.all,
+  				runtime: now() - module.stats.started
+  			});
+  		}
+  	},
+
+  	preserveTestEnvironment: function preserveTestEnvironment() {
+  		if (this.preserveEnvironment) {
+  			this.module.testEnvironment = this.testEnvironment;
+  			this.testEnvironment = extend({}, this.module.testEnvironment);
+  		}
+  	},
+
+  	queue: function queue() {
+  		var test = this;
+
+  		if (!this.valid()) {
+  			return;
+  		}
+
+  		function runTest() {
+
+  			// Each of these can by async
+  			ProcessingQueue.addImmediate([function () {
+  				test.before();
+  			}, test.hooks("before"), function () {
+  				test.preserveTestEnvironment();
+  			}, test.hooks("beforeEach"), function () {
+  				test.run();
+  			}, test.hooks("afterEach").reverse(), test.hooks("after").reverse(), function () {
+  				test.after();
+  			}, function () {
+  				test.finish();
+  			}]);
+  		}
+
+  		var previousFailCount = config.storage && +config.storage.getItem("qunit-test-" + this.module.name + "-" + this.testName);
+
+  		// Prioritize previously failed tests, detected from storage
+  		var prioritize = config.reorder && !!previousFailCount;
+
+  		this.previousFailure = !!previousFailCount;
+
+  		ProcessingQueue.add(runTest, prioritize, config.seed);
+
+  		// If the queue has already finished, we manually process the new test
+  		if (ProcessingQueue.finished) {
+  			ProcessingQueue.advance();
+  		}
+  	},
+
+
+  	pushResult: function pushResult(resultInfo) {
+  		if (this !== config.current) {
+  			throw new Error("Assertion occured after test had finished.");
+  		}
+
+  		// Destructure of resultInfo = { result, actual, expected, message, negative }
+  		var source,
+  		    details = {
+  			module: this.module.name,
+  			name: this.testName,
+  			result: resultInfo.result,
+  			message: resultInfo.message,
+  			actual: resultInfo.actual,
+  			expected: resultInfo.expected,
+  			testId: this.testId,
+  			negative: resultInfo.negative || false,
+  			runtime: now() - this.started,
+  			todo: !!this.todo
+  		};
+
+  		if (!resultInfo.result) {
+  			source = resultInfo.source || sourceFromStacktrace();
+
+  			if (source) {
+  				details.source = source;
+  			}
+  		}
+
+  		this.logAssertion(details);
+
+  		this.assertions.push({
+  			result: !!resultInfo.result,
+  			message: resultInfo.message
+  		});
+  	},
+
+  	pushFailure: function pushFailure(message, source, actual) {
+  		if (!(this instanceof Test)) {
+  			throw new Error("pushFailure() assertion outside test context, was " + sourceFromStacktrace(2));
+  		}
+
+  		this.pushResult({
+  			result: false,
+  			message: message || "error",
+  			actual: actual || null,
+  			expected: null,
+  			source: source
+  		});
+  	},
+
+  	/**
+    * Log assertion details using both the old QUnit.log interface and
+    * QUnit.on( "assertion" ) interface.
+    *
+    * @private
+    */
+  	logAssertion: function logAssertion(details) {
+  		runLoggingCallbacks("log", details);
+
+  		var assertion = {
+  			passed: details.result,
+  			actual: details.actual,
+  			expected: details.expected,
+  			message: details.message,
+  			stack: details.source,
+  			todo: details.todo
+  		};
+  		this.testReport.pushAssertion(assertion);
+  		emit("assertion", assertion);
+  	},
+
+
+  	resolvePromise: function resolvePromise(promise, phase) {
+  		var then,
+  		    resume,
+  		    message,
+  		    test = this;
+  		if (promise != null) {
+  			then = promise.then;
+  			if (objectType(then) === "function") {
+  				resume = internalStop(test);
+  				then.call(promise, function () {
+  					resume();
+  				}, function (error) {
+  					message = "Promise rejected " + (!phase ? "during" : phase.replace(/Each$/, "")) + " \"" + test.testName + "\": " + (error && error.message || error);
+  					test.pushFailure(message, extractStacktrace(error, 0));
+
+  					// Else next test will carry the responsibility
+  					saveGlobal();
+
+  					// Unblock
+  					resume();
+  				});
+  			}
+  		}
+  	},
+
+  	valid: function valid() {
+  		var filter = config.filter,
+  		    regexFilter = /^(!?)\/([\w\W]*)\/(i?$)/.exec(filter),
+  		    module = config.module && config.module.toLowerCase(),
+  		    fullName = this.module.name + ": " + this.testName;
+
+  		function moduleChainNameMatch(testModule) {
+  			var testModuleName = testModule.name ? testModule.name.toLowerCase() : null;
+  			if (testModuleName === module) {
+  				return true;
+  			} else if (testModule.parentModule) {
+  				return moduleChainNameMatch(testModule.parentModule);
+  			} else {
+  				return false;
+  			}
+  		}
+
+  		function moduleChainIdMatch(testModule) {
+  			return inArray(testModule.moduleId, config.moduleId) || testModule.parentModule && moduleChainIdMatch(testModule.parentModule);
+  		}
+
+  		// Internally-generated tests are always valid
+  		if (this.callback && this.callback.validTest) {
+  			return true;
+  		}
+
+  		if (config.moduleId && config.moduleId.length > 0 && !moduleChainIdMatch(this.module)) {
+
+  			return false;
+  		}
+
+  		if (config.testId && config.testId.length > 0 && !inArray(this.testId, config.testId)) {
+
+  			return false;
+  		}
+
+  		if (module && !moduleChainNameMatch(this.module)) {
+  			return false;
+  		}
+
+  		if (!filter) {
+  			return true;
+  		}
+
+  		return regexFilter ? this.regexFilter(!!regexFilter[1], regexFilter[2], regexFilter[3], fullName) : this.stringFilter(filter, fullName);
+  	},
+
+  	regexFilter: function regexFilter(exclude, pattern, flags, fullName) {
+  		var regex = new RegExp(pattern, flags);
+  		var match = regex.test(fullName);
+
+  		return match !== exclude;
+  	},
+
+  	stringFilter: function stringFilter(filter, fullName) {
+  		filter = filter.toLowerCase();
+  		fullName = fullName.toLowerCase();
+
+  		var include = filter.charAt(0) !== "!";
+  		if (!include) {
+  			filter = filter.slice(1);
+  		}
+
+  		// If the filter matches, we need to honour include
+  		if (fullName.indexOf(filter) !== -1) {
+  			return include;
+  		}
+
+  		// Otherwise, do the opposite
+  		return !include;
+  	}
+  };
+
+  function pushFailure() {
+  	if (!config.current) {
+  		throw new Error("pushFailure() assertion outside test context, in " + sourceFromStacktrace(2));
+  	}
+
+  	// Gets current test obj
+  	var currentTest = config.current;
+
+  	return currentTest.pushFailure.apply(currentTest, arguments);
+  }
+
+  function saveGlobal() {
+  	config.pollution = [];
+
+  	if (config.noglobals) {
+  		for (var key in global$1) {
+  			if (hasOwn.call(global$1, key)) {
+
+  				// In Opera sometimes DOM element ids show up here, ignore them
+  				if (/^qunit-test-output/.test(key)) {
+  					continue;
+  				}
+  				config.pollution.push(key);
+  			}
+  		}
+  	}
+  }
+
+  function checkPollution() {
+  	var newGlobals,
+  	    deletedGlobals,
+  	    old = config.pollution;
+
+  	saveGlobal();
+
+  	newGlobals = diff(config.pollution, old);
+  	if (newGlobals.length > 0) {
+  		pushFailure("Introduced global variable(s): " + newGlobals.join(", "));
+  	}
+
+  	deletedGlobals = diff(old, config.pollution);
+  	if (deletedGlobals.length > 0) {
+  		pushFailure("Deleted global variable(s): " + deletedGlobals.join(", "));
+  	}
+  }
+
+  // Will be exposed as QUnit.test
+  function test(testName, callback) {
+  	if (focused) {
+  		return;
+  	}
+
+  	var newTest = new Test({
+  		testName: testName,
+  		callback: callback
+  	});
+
+  	newTest.queue();
+  }
+
+  function todo(testName, callback) {
+  	if (focused) {
+  		return;
+  	}
+
+  	var newTest = new Test({
+  		testName: testName,
+  		callback: callback,
+  		todo: true
+  	});
+
+  	newTest.queue();
+  }
+
+  // Will be exposed as QUnit.skip
+  function skip(testName) {
+  	if (focused) {
+  		return;
+  	}
+
+  	var test = new Test({
+  		testName: testName,
+  		skip: true
+  	});
+
+  	test.queue();
+  }
+
+  // Will be exposed as QUnit.only
+  function only(testName, callback) {
+  	if (focused) {
+  		return;
+  	}
+
+  	config.queue.length = 0;
+  	focused = true;
+
+  	var newTest = new Test({
+  		testName: testName,
+  		callback: callback
+  	});
+
+  	newTest.queue();
+  }
+
+  // Put a hold on processing and return a function that will release it.
+  function internalStop(test) {
+  	var released = false;
+
+  	test.semaphore += 1;
+  	config.blocking = true;
+
+  	// Set a recovery timeout, if so configured.
+  	if (config.testTimeout && defined.setTimeout) {
+  		clearTimeout(config.timeout);
+  		config.timeout = setTimeout(function () {
+  			pushFailure("Test timed out", sourceFromStacktrace(2));
+  			internalRecover(test);
+  		}, config.testTimeout);
+  	}
+
+  	return function resume() {
+  		if (released) {
+  			return;
+  		}
+
+  		released = true;
+  		test.semaphore -= 1;
+  		internalStart(test);
+  	};
+  }
+
+  // Forcefully release all processing holds.
+  function internalRecover(test) {
+  	test.semaphore = 0;
+  	internalStart(test);
+  }
+
+  // Release a processing hold, scheduling a resumption attempt if no holds remain.
+  function internalStart(test) {
+
+  	// If semaphore is non-numeric, throw error
+  	if (isNaN(test.semaphore)) {
+  		test.semaphore = 0;
+
+  		pushFailure("Invalid value on test.semaphore", sourceFromStacktrace(2));
+  		return;
+  	}
+
+  	// Don't start until equal number of stop-calls
+  	if (test.semaphore > 0) {
+  		return;
+  	}
+
+  	// Throw an Error if start is called more often than stop
+  	if (test.semaphore < 0) {
+  		test.semaphore = 0;
+
+  		pushFailure("Tried to restart test while already started (test's semaphore was 0 already)", sourceFromStacktrace(2));
+  		return;
+  	}
+
+  	// Add a slight delay to allow more assertions etc.
+  	if (defined.setTimeout) {
+  		if (config.timeout) {
+  			clearTimeout(config.timeout);
+  		}
+  		config.timeout = setTimeout(function () {
+  			if (test.semaphore > 0) {
+  				return;
+  			}
+
+  			if (config.timeout) {
+  				clearTimeout(config.timeout);
+  			}
+
+  			begin();
+  		}, 13);
+  	} else {
+  		begin();
+  	}
+  }
+
+  function collectTests(module) {
+  	var tests = [].concat(module.tests);
+  	var modules = [].concat(toConsumableArray(module.childModules));
+
+  	// Do a breadth-first traversal of the child modules
+  	while (modules.length) {
+  		var nextModule = modules.shift();
+  		tests.push.apply(tests, nextModule.tests);
+  		modules.push.apply(modules, toConsumableArray(nextModule.childModules));
+  	}
+
+  	return tests;
+  }
+
+  function numberOfTests(module) {
+  	return collectTests(module).length;
+  }
+
+  function numberOfUnskippedTests(module) {
+  	return collectTests(module).filter(function (test) {
+  		return !test.skip;
+  	}).length;
+  }
+
+  function notifyTestsRan(module, skipped) {
+  	module.testsRun++;
+  	if (!skipped) {
+  		module.unskippedTestsRun++;
+  	}
+  	while (module = module.parentModule) {
+  		module.testsRun++;
+  		if (!skipped) {
+  			module.unskippedTestsRun++;
+  		}
+  	}
+  }
+
+  /**
+   * Returns a function that proxies to the given method name on the globals
+   * console object. The proxy will also detect if the console doesn't exist and
+   * will appropriately no-op. This allows support for IE9, which doesn't have a
+   * console if the developer tools are not open.
+   */
+  function consoleProxy(method) {
+  	return function () {
+  		if (console) {
+  			console[method].apply(console, arguments);
+  		}
+  	};
+  }
+
+  var Logger = {
+  	warn: consoleProxy("warn")
+  };
+
+  var Assert = function () {
+  	function Assert(testContext) {
+  		classCallCheck(this, Assert);
+
+  		this.test = testContext;
+  	}
+
+  	// Assert helpers
+
+  	// Documents a "step", which is a string value, in a test as a passing assertion
+
+
+  	createClass(Assert, [{
+  		key: "step",
+  		value: function step(message) {
+  			var result = !!message;
+
+  			this.test.steps.push(message);
+
+  			return this.pushResult({
+  				result: result,
+  				message: message || "You must provide a message to assert.step"
+  			});
+  		}
+
+  		// Verifies the steps in a test match a given array of string values
+
+  	}, {
+  		key: "verifySteps",
+  		value: function verifySteps(steps, message) {
+  			this.deepEqual(this.test.steps, steps, message);
+  		}
+
+  		// Specify the number of expected assertions to guarantee that failed test
+  		// (no assertions are run at all) don't slip through.
+
+  	}, {
+  		key: "expect",
+  		value: function expect(asserts) {
+  			if (arguments.length === 1) {
+  				this.test.expected = asserts;
+  			} else {
+  				return this.test.expected;
+  			}
+  		}
+
+  		// Put a hold on processing and return a function that will release it a maximum of once.
+
+  	}, {
+  		key: "async",
+  		value: function async(count) {
+  			var test$$1 = this.test;
+
+  			var popped = false,
+  			    acceptCallCount = count;
+
+  			if (typeof acceptCallCount === "undefined") {
+  				acceptCallCount = 1;
+  			}
+
+  			var resume = internalStop(test$$1);
+
+  			return function done() {
+  				if (config.current !== test$$1) {
+  					throw Error("assert.async callback called after test finished.");
+  				}
+
+  				if (popped) {
+  					test$$1.pushFailure("Too many calls to the `assert.async` callback", sourceFromStacktrace(2));
+  					return;
+  				}
+
+  				acceptCallCount -= 1;
+  				if (acceptCallCount > 0) {
+  					return;
+  				}
+
+  				popped = true;
+  				resume();
+  			};
+  		}
+
+  		// Exports test.push() to the user API
+  		// Alias of pushResult.
+
+  	}, {
+  		key: "push",
+  		value: function push(result, actual, expected, message, negative) {
+  			Logger.warn("assert.push is deprecated and will be removed in QUnit 3.0." + " Please use assert.pushResult instead (http://api.qunitjs.com/pushResult/).");
+
+  			var currentAssert = this instanceof Assert ? this : config.current.assert;
+  			return currentAssert.pushResult({
+  				result: result,
+  				actual: actual,
+  				expected: expected,
+  				message: message,
+  				negative: negative
+  			});
+  		}
+  	}, {
+  		key: "pushResult",
+  		value: function pushResult(resultInfo) {
+
+  			// Destructure of resultInfo = { result, actual, expected, message, negative }
+  			var assert = this;
+  			var currentTest = assert instanceof Assert && assert.test || config.current;
+
+  			// Backwards compatibility fix.
+  			// Allows the direct use of global exported assertions and QUnit.assert.*
+  			// Although, it's use is not recommended as it can leak assertions
+  			// to other tests from async tests, because we only get a reference to the current test,
+  			// not exactly the test where assertion were intended to be called.
+  			if (!currentTest) {
+  				throw new Error("assertion outside test context, in " + sourceFromStacktrace(2));
+  			}
+
+  			if (!(assert instanceof Assert)) {
+  				assert = currentTest.assert;
+  			}
+
+  			return assert.test.pushResult(resultInfo);
+  		}
+  	}, {
+  		key: "ok",
+  		value: function ok(result, message) {
+  			if (!message) {
+  				message = result ? "okay" : "failed, expected argument to be truthy, was: " + dump.parse(result);
+  			}
+
+  			this.pushResult({
+  				result: !!result,
+  				actual: result,
+  				expected: true,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "notOk",
+  		value: function notOk(result, message) {
+  			if (!message) {
+  				message = !result ? "okay" : "failed, expected argument to be falsy, was: " + dump.parse(result);
+  			}
+
+  			this.pushResult({
+  				result: !result,
+  				actual: result,
+  				expected: false,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "equal",
+  		value: function equal(actual, expected, message) {
+
+  			// eslint-disable-next-line eqeqeq
+  			var result = expected == actual;
+
+  			this.pushResult({
+  				result: result,
+  				actual: actual,
+  				expected: expected,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "notEqual",
+  		value: function notEqual(actual, expected, message) {
+
+  			// eslint-disable-next-line eqeqeq
+  			var result = expected != actual;
+
+  			this.pushResult({
+  				result: result,
+  				actual: actual,
+  				expected: expected,
+  				message: message,
+  				negative: true
+  			});
+  		}
+  	}, {
+  		key: "propEqual",
+  		value: function propEqual(actual, expected, message) {
+  			actual = objectValues(actual);
+  			expected = objectValues(expected);
+
+  			this.pushResult({
+  				result: equiv(actual, expected),
+  				actual: actual,
+  				expected: expected,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "notPropEqual",
+  		value: function notPropEqual(actual, expected, message) {
+  			actual = objectValues(actual);
+  			expected = objectValues(expected);
+
+  			this.pushResult({
+  				result: !equiv(actual, expected),
+  				actual: actual,
+  				expected: expected,
+  				message: message,
+  				negative: true
+  			});
+  		}
+  	}, {
+  		key: "deepEqual",
+  		value: function deepEqual(actual, expected, message) {
+  			this.pushResult({
+  				result: equiv(actual, expected),
+  				actual: actual,
+  				expected: expected,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "notDeepEqual",
+  		value: function notDeepEqual(actual, expected, message) {
+  			this.pushResult({
+  				result: !equiv(actual, expected),
+  				actual: actual,
+  				expected: expected,
+  				message: message,
+  				negative: true
+  			});
+  		}
+  	}, {
+  		key: "strictEqual",
+  		value: function strictEqual(actual, expected, message) {
+  			this.pushResult({
+  				result: expected === actual,
+  				actual: actual,
+  				expected: expected,
+  				message: message
+  			});
+  		}
+  	}, {
+  		key: "notStrictEqual",
+  		value: function notStrictEqual(actual, expected, message) {
+  			this.pushResult({
+  				result: expected !== actual,
+  				actual: actual,
+  				expected: expected,
+  				message: message,
+  				negative: true
+  			});
+  		}
+  	}, {
+  		key: "throws",
+  		value: function throws(block, expected, message) {
+  			var actual = void 0,
+  			    result = false;
+
+  			var currentTest = this instanceof Assert && this.test || config.current;
+
+  			// 'expected' is optional unless doing string comparison
+  			if (objectType(expected) === "string") {
+  				if (message == null) {
+  					message = expected;
+  					expected = null;
+  				} else {
+  					throw new Error("throws/raises does not accept a string value for the expected argument.\n" + "Use a non-string object value (e.g. regExp) instead if it's necessary.");
+  				}
+  			}
+
+  			currentTest.ignoreGlobalErrors = true;
+  			try {
+  				block.call(currentTest.testEnvironment);
+  			} catch (e) {
+  				actual = e;
+  			}
+  			currentTest.ignoreGlobalErrors = false;
+
+  			if (actual) {
+  				var expectedType = objectType(expected);
+
+  				// We don't want to validate thrown error
+  				if (!expected) {
+  					result = true;
+  					expected = null;
+
+  					// Expected is a regexp
+  				} else if (expectedType === "regexp") {
+  					result = expected.test(errorString(actual));
+
+  					// Expected is a constructor, maybe an Error constructor
+  				} else if (expectedType === "function" && actual instanceof expected) {
+  					result = true;
+
+  					// Expected is an Error object
+  				} else if (expectedType === "object") {
+  					result = actual instanceof expected.constructor && actual.name === expected.name && actual.message === expected.message;
+
+  					// Expected is a validation function which returns true if validation passed
+  				} else if (expectedType === "function" && expected.call({}, actual) === true) {
+  					expected = null;
+  					result = true;
+  				}
+  			}
+
+  			currentTest.assert.pushResult({
+  				result: result,
+  				actual: actual,
+  				expected: expected,
+  				message: message
+  			});
+  		}
+  	}]);
+  	return Assert;
+  }();
+
+  // Provide an alternative to assert.throws(), for environments that consider throws a reserved word
+  // Known to us are: Closure Compiler, Narwhal
+  // eslint-disable-next-line dot-notation
+
+
+  Assert.prototype.raises = Assert.prototype["throws"];
+
+  /**
+   * Converts an error into a simple string for comparisons.
+   *
+   * @param {Error} error
+   * @return {String}
+   */
+  function errorString(error) {
+  	var resultErrorString = error.toString();
+
+  	if (resultErrorString.substring(0, 7) === "[object") {
+  		var name = error.name ? error.name.toString() : "Error";
+  		var message = error.message ? error.message.toString() : "";
+
+  		if (name && message) {
+  			return name + ": " + message;
+  		} else if (name) {
+  			return name;
+  		} else if (message) {
+  			return message;
+  		} else {
+  			return "Error";
+  		}
+  	} else {
+  		return resultErrorString;
+  	}
+  }
+
+  /* global module, exports, define */
+  function exportQUnit(QUnit) {
+
+  	if (defined.document) {
+
+  		// QUnit may be defined when it is preconfigured but then only QUnit and QUnit.config may be defined.
+  		if (window.QUnit && window.QUnit.version) {
+  			throw new Error("QUnit has already been defined.");
+  		}
+
+  		window.QUnit = QUnit;
+  	}
+
+  	// For nodejs
+  	if (typeof module !== "undefined" && module && module.exports) {
+  		module.exports = QUnit;
+
+  		// For consistency with CommonJS environments' exports
+  		module.exports.QUnit = QUnit;
+  	}
+
+  	// For CommonJS with exports, but without module.exports, like Rhino
+  	if (typeof exports !== "undefined" && exports) {
+  		exports.QUnit = QUnit;
+  	}
+
+  	if (typeof define === "function" && define.amd) {
+  		define(function () {
+  			return QUnit;
+  		});
+  		QUnit.config.autostart = false;
+  	}
+
+  	// For Web/Service Workers
+  	if (self$1 && self$1.WorkerGlobalScope && self$1 instanceof self$1.WorkerGlobalScope) {
+  		self$1.QUnit = QUnit;
+  	}
+  }
+
+  var SuiteReport = function () {
+  	function SuiteReport(name, parentSuite) {
+  		classCallCheck(this, SuiteReport);
+
+  		this.name = name;
+  		this.fullName = parentSuite ? parentSuite.fullName.concat(name) : [];
+
+  		this.tests = [];
+  		this.childSuites = [];
+
+  		if (parentSuite) {
+  			parentSuite.pushChildSuite(this);
+  		}
+  	}
+
+  	createClass(SuiteReport, [{
+  		key: "start",
+  		value: function start(recordTime) {
+  			if (recordTime) {
+  				this._startTime = Date.now();
+  			}
+
+  			return {
+  				name: this.name,
+  				fullName: this.fullName.slice(),
+  				tests: this.tests.map(function (test) {
+  					return test.start();
+  				}),
+  				childSuites: this.childSuites.map(function (suite) {
+  					return suite.start();
+  				}),
+  				testCounts: {
+  					total: this.getTestCounts().total
+  				}
+  			};
+  		}
+  	}, {
+  		key: "end",
+  		value: function end(recordTime) {
+  			if (recordTime) {
+  				this._endTime = Date.now();
+  			}
+
+  			return {
+  				name: this.name,
+  				fullName: this.fullName.slice(),
+  				tests: this.tests.map(function (test) {
+  					return test.end();
+  				}),
+  				childSuites: this.childSuites.map(function (suite) {
+  					return suite.end();
+  				}),
+  				testCounts: this.getTestCounts(),
+  				runtime: this.getRuntime(),
+  				status: this.getStatus()
+  			};
+  		}
+  	}, {
+  		key: "pushChildSuite",
+  		value: function pushChildSuite(suite) {
+  			this.childSuites.push(suite);
+  		}
+  	}, {
+  		key: "pushTest",
+  		value: function pushTest(test) {
+  			this.tests.push(test);
+  		}
+  	}, {
+  		key: "getRuntime",
+  		value: function getRuntime() {
+  			return this._endTime - this._startTime;
+  		}
+  	}, {
+  		key: "getTestCounts",
+  		value: function getTestCounts() {
+  			var counts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : { passed: 0, failed: 0, skipped: 0, todo: 0, total: 0 };
+
+  			counts = this.tests.reduce(function (counts, test) {
+  				if (test.valid) {
+  					counts[test.getStatus()]++;
+  					counts.total++;
+  				}
+
+  				return counts;
+  			}, counts);
+
+  			return this.childSuites.reduce(function (counts, suite) {
+  				return suite.getTestCounts(counts);
+  			}, counts);
+  		}
+  	}, {
+  		key: "getStatus",
+  		value: function getStatus() {
+  			var _getTestCounts = this.getTestCounts(),
+  			    total = _getTestCounts.total,
+  			    failed = _getTestCounts.failed,
+  			    skipped = _getTestCounts.skipped,
+  			    todo = _getTestCounts.todo;
+
+  			if (failed) {
+  				return "failed";
+  			} else {
+  				if (skipped === total) {
+  					return "skipped";
+  				} else if (todo === total) {
+  					return "todo";
+  				} else {
+  					return "passed";
+  				}
+  			}
+  		}
+  	}]);
+  	return SuiteReport;
+  }();
+
+  // Handle an unhandled exception. By convention, returns true if further
+  // error handling should be suppressed and false otherwise.
+  // In this case, we will only suppress further error handling if the
+  // "ignoreGlobalErrors" configuration option is enabled.
+  function onError(error) {
+  	for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+  		args[_key - 1] = arguments[_key];
+  	}
+
+  	if (config.current) {
+  		if (config.current.ignoreGlobalErrors) {
+  			return true;
+  		}
+  		pushFailure.apply(undefined, [error.message, error.fileName + ":" + error.lineNumber].concat(args));
+  	} else {
+  		test("global failure", extend(function () {
+  			pushFailure.apply(undefined, [error.message, error.fileName + ":" + error.lineNumber].concat(args));
+  		}, { validTest: true }));
+  	}
+
+  	return false;
+  }
+
+  var QUnit = {};
+  var globalSuite = new SuiteReport();
+
+  // The initial "currentModule" represents the global (or top-level) module that
+  // is not explicitly defined by the user, therefore we add the "globalSuite" to
+  // it since each module has a suiteReport associated with it.
+  config.currentModule.suiteReport = globalSuite;
+
+  var moduleStack = [];
+  var globalStartCalled = false;
+  var runStarted = false;
+
+  // Figure out if we're running the tests from a server or not
+  QUnit.isLocal = !(defined.document && window.location.protocol !== "file:");
+
+  // Expose the current QUnit version
+  QUnit.version = "2.3.3";
+
+  function createModule(name, testEnvironment) {
+  	var parentModule = moduleStack.length ? moduleStack.slice(-1)[0] : null;
+  	var moduleName = parentModule !== null ? [parentModule.name, name].join(" > ") : name;
+  	var parentSuite = parentModule ? parentModule.suiteReport : globalSuite;
+
+  	var module = {
+  		name: moduleName,
+  		parentModule: parentModule,
+  		tests: [],
+  		moduleId: generateHash(moduleName),
+  		testsRun: 0,
+  		unskippedTestsRun: 0,
+  		childModules: [],
+  		suiteReport: new SuiteReport(name, parentSuite)
+  	};
+
+  	var env = {};
+  	if (parentModule) {
+  		parentModule.childModules.push(module);
+  		extend(env, parentModule.testEnvironment);
+  	}
+  	extend(env, testEnvironment);
+  	module.testEnvironment = env;
+
+  	config.modules.push(module);
+  	return module;
+  }
+
+  extend(QUnit, {
+  	on: on,
+
+  	// Call on start of module test to prepend name to all tests
+  	module: function module(name, testEnvironment, executeNow) {
+  		if (arguments.length === 2) {
+  			if (objectType(testEnvironment) === "function") {
+  				executeNow = testEnvironment;
+  				testEnvironment = undefined;
+  			}
+  		}
+
+  		var module = createModule(name, testEnvironment);
+
+  		// Move any hooks to a 'hooks' object
+  		if (module.testEnvironment) {
+  			module.hooks = {
+  				before: module.testEnvironment.before,
+  				beforeEach: module.testEnvironment.beforeEach,
+  				afterEach: module.testEnvironment.afterEach,
+  				after: module.testEnvironment.after
+  			};
+
+  			delete module.testEnvironment.before;
+  			delete module.testEnvironment.beforeEach;
+  			delete module.testEnvironment.afterEach;
+  			delete module.testEnvironment.after;
+  		}
+
+  		var moduleFns = {
+  			before: setHook(module, "before"),
+  			beforeEach: setHook(module, "beforeEach"),
+  			afterEach: setHook(module, "afterEach"),
+  			after: setHook(module, "after")
+  		};
+
+  		var currentModule = config.currentModule;
+  		if (objectType(executeNow) === "function") {
+  			moduleStack.push(module);
+  			config.currentModule = module;
+  			executeNow.call(module.testEnvironment, moduleFns);
+  			moduleStack.pop();
+  			module = module.parentModule || currentModule;
+  		}
+
+  		config.currentModule = module;
+  	},
+
+  	test: test,
+
+  	todo: todo,
+
+  	skip: skip,
+
+  	only: only,
+
+  	start: function start(count) {
+  		var globalStartAlreadyCalled = globalStartCalled;
+
+  		if (!config.current) {
+  			globalStartCalled = true;
+
+  			if (runStarted) {
+  				throw new Error("Called start() while test already started running");
+  			} else if (globalStartAlreadyCalled || count > 1) {
+  				throw new Error("Called start() outside of a test context too many times");
+  			} else if (config.autostart) {
+  				throw new Error("Called start() outside of a test context when " + "QUnit.config.autostart was true");
+  			} else if (!config.pageLoaded) {
+
+  				// The page isn't completely loaded yet, so we set autostart and then
+  				// load if we're in Node or wait for the browser's load event.
+  				config.autostart = true;
+
+  				// Starts from Node even if .load was not previously called. We still return
+  				// early otherwise we'll wind up "beginning" twice.
+  				if (!defined.document) {
+  					QUnit.load();
+  				}
+
+  				return;
+  			}
+  		} else {
+  			throw new Error("QUnit.start cannot be called inside a test context.");
+  		}
+
+  		scheduleBegin();
+  	},
+
+  	config: config,
+
+  	is: is,
+
+  	objectType: objectType,
+
+  	extend: extend,
+
+  	load: function load() {
+  		config.pageLoaded = true;
+
+  		// Initialize the configuration options
+  		extend(config, {
+  			stats: { all: 0, bad: 0 },
+  			started: 0,
+  			updateRate: 1000,
+  			autostart: true,
+  			filter: ""
+  		}, true);
+
+  		if (!runStarted) {
+  			config.blocking = false;
+
+  			if (config.autostart) {
+  				scheduleBegin();
+  			}
+  		}
+  	},
+
+  	stack: function stack(offset) {
+  		offset = (offset || 0) + 2;
+  		return sourceFromStacktrace(offset);
+  	},
+
+  	onError: onError
+  });
+
+  QUnit.pushFailure = pushFailure;
+  QUnit.assert = Assert.prototype;
+  QUnit.equiv = equiv;
+  QUnit.dump = dump;
+
+  registerLoggingCallbacks(QUnit);
+
+  function scheduleBegin() {
+
+  	runStarted = true;
+
+  	// Add a slight delay to allow definition of more modules and tests.
+  	if (defined.setTimeout) {
+  		setTimeout(function () {
+  			begin();
+  		}, 13);
+  	} else {
+  		begin();
+  	}
+  }
+
+  function begin() {
+  	var i,
+  	    l,
+  	    modulesLog = [];
+
+  	// If the test run hasn't officially begun yet
+  	if (!config.started) {
+
+  		// Record the time of the test run's beginning
+  		config.started = now();
+
+  		// Delete the loose unnamed module if unused.
+  		if (config.modules[0].name === "" && config.modules[0].tests.length === 0) {
+  			config.modules.shift();
+  		}
+
+  		// Avoid unnecessary information by not logging modules' test environments
+  		for (i = 0, l = config.modules.length; i < l; i++) {
+  			modulesLog.push({
+  				name: config.modules[i].name,
+  				tests: config.modules[i].tests
+  			});
+  		}
+
+  		// The test run is officially beginning now
+  		emit("runStart", globalSuite.start(true));
+  		runLoggingCallbacks("begin", {
+  			totalTests: Test.count,
+  			modules: modulesLog
+  		});
+  	}
+
+  	config.blocking = false;
+  	ProcessingQueue.advance();
+  }
+
+  function setHook(module, hookName) {
+  	if (!module.hooks) {
+  		module.hooks = {};
+  	}
+
+  	return function (callback) {
+  		module.hooks[hookName] = callback;
+  	};
+  }
+
+  exportQUnit(QUnit);
+
+  (function () {
+
+  	if (typeof window === "undefined" || typeof document === "undefined") {
+  		return;
+  	}
+
+  	var config = QUnit.config,
+  	    hasOwn = Object.prototype.hasOwnProperty;
+
+  	// Stores fixture HTML for resetting later
+  	function storeFixture() {
+
+  		// Avoid overwriting user-defined values
+  		if (hasOwn.call(config, "fixture")) {
+  			return;
+  		}
+
+  		var fixture = document.getElementById("qunit-fixture");
+  		if (fixture) {
+  			config.fixture = fixture.innerHTML;
+  		}
+  	}
+
+  	QUnit.begin(storeFixture);
+
+  	// Resets the fixture DOM element if available.
+  	function resetFixture() {
+  		if (config.fixture == null) {
+  			return;
+  		}
+
+  		var fixture = document.getElementById("qunit-fixture");
+  		if (fixture) {
+  			fixture.innerHTML = config.fixture;
+  		}
+  	}
+
+  	QUnit.testStart(resetFixture);
+  })();
+
+  (function () {
+
+  	// Only interact with URLs via window.location
+  	var location = typeof window !== "undefined" && window.location;
+  	if (!location) {
+  		return;
+  	}
+
+  	var urlParams = getUrlParams();
+
+  	QUnit.urlParams = urlParams;
+
+  	// Match module/test by inclusion in an array
+  	QUnit.config.moduleId = [].concat(urlParams.moduleId || []);
+  	QUnit.config.testId = [].concat(urlParams.testId || []);
+
+  	// Exact case-insensitive match of the module name
+  	QUnit.config.module = urlParams.module;
+
+  	// Regular expression or case-insenstive substring match against "moduleName: testName"
+  	QUnit.config.filter = urlParams.filter;
+
+  	// Test order randomization
+  	if (urlParams.seed === true) {
+
+  		// Generate a random seed if the option is specified without a value
+  		QUnit.config.seed = Math.random().toString(36).slice(2);
+  	} else if (urlParams.seed) {
+  		QUnit.config.seed = urlParams.seed;
+  	}
+
+  	// Add URL-parameter-mapped config values with UI form rendering data
+  	QUnit.config.urlConfig.push({
+  		id: "hidepassed",
+  		label: "Hide passed tests",
+  		tooltip: "Only show tests and assertions that fail. Stored as query-strings."
+  	}, {
+  		id: "noglobals",
+  		label: "Check for Globals",
+  		tooltip: "Enabling this will test if any test introduces new properties on the " + "global object (`window` in Browsers). Stored as query-strings."
+  	}, {
+  		id: "notrycatch",
+  		label: "No try-catch",
+  		tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging " + "exceptions in IE reasonable. Stored as query-strings."
+  	});
+
+  	QUnit.begin(function () {
+  		var i,
+  		    option,
+  		    urlConfig = QUnit.config.urlConfig;
+
+  		for (i = 0; i < urlConfig.length; i++) {
+
+  			// Options can be either strings or objects with nonempty "id" properties
+  			option = QUnit.config.urlConfig[i];
+  			if (typeof option !== "string") {
+  				option = option.id;
+  			}
+
+  			if (QUnit.config[option] === undefined) {
+  				QUnit.config[option] = urlParams[option];
+  			}
+  		}
+  	});
+
+  	function getUrlParams() {
+  		var i, param, name, value;
+  		var urlParams = Object.create(null);
+  		var params = location.search.slice(1).split("&");
+  		var length = params.length;
+
+  		for (i = 0; i < length; i++) {
+  			if (params[i]) {
+  				param = params[i].split("=");
+  				name = decodeQueryParam(param[0]);
+
+  				// Allow just a key to turn on a flag, e.g., test.html?noglobals
+  				value = param.length === 1 || decodeQueryParam(param.slice(1).join("="));
+  				if (name in urlParams) {
+  					urlParams[name] = [].concat(urlParams[name], value);
+  				} else {
+  					urlParams[name] = value;
+  				}
+  			}
+  		}
+
+  		return urlParams;
+  	}
+
+  	function decodeQueryParam(param) {
+  		return decodeURIComponent(param.replace(/\+/g, "%20"));
+  	}
+  })();
+
+  var stats = {
+  	passedTests: 0,
+  	failedTests: 0,
+  	skippedTests: 0,
+  	todoTests: 0
+  };
+
+  // Escape text for attribute or text content.
+  function escapeText(s) {
+  	if (!s) {
+  		return "";
+  	}
+  	s = s + "";
+
+  	// Both single quotes and double quotes (for attributes)
+  	return s.replace(/['"<>&]/g, function (s) {
+  		switch (s) {
+  			case "'":
+  				return "&#039;";
+  			case "\"":
+  				return "&quot;";
+  			case "<":
+  				return "&lt;";
+  			case ">":
+  				return "&gt;";
+  			case "&":
+  				return "&amp;";
+  		}
+  	});
+  }
+
+  (function () {
+
+  	// Don't load the HTML Reporter on non-browser environments
+  	if (typeof window === "undefined" || !window.document) {
+  		return;
+  	}
+
+  	var config = QUnit.config,
+  	    document$$1 = window.document,
+  	    collapseNext = false,
+  	    hasOwn = Object.prototype.hasOwnProperty,
+  	    unfilteredUrl = setUrl({ filter: undefined, module: undefined,
+  		moduleId: undefined, testId: undefined }),
+  	    modulesList = [];
+
+  	function addEvent(elem, type, fn) {
+  		elem.addEventListener(type, fn, false);
+  	}
+
+  	function removeEvent(elem, type, fn) {
+  		elem.removeEventListener(type, fn, false);
+  	}
+
+  	function addEvents(elems, type, fn) {
+  		var i = elems.length;
+  		while (i--) {
+  			addEvent(elems[i], type, fn);
+  		}
+  	}
+
+  	function hasClass(elem, name) {
+  		return (" " + elem.className + " ").indexOf(" " + name + " ") >= 0;
+  	}
+
+  	function addClass(elem, name) {
+  		if (!hasClass(elem, name)) {
+  			elem.className += (elem.className ? " " : "") + name;
+  		}
+  	}
+
+  	function toggleClass(elem, name, force) {
+  		if (force || typeof force === "undefined" && !hasClass(elem, name)) {
+  			addClass(elem, name);
+  		} else {
+  			removeClass(elem, name);
+  		}
+  	}
+
+  	function removeClass(elem, name) {
+  		var set = " " + elem.className + " ";
+
+  		// Class name may appear multiple times
+  		while (set.indexOf(" " + name + " ") >= 0) {
+  			set = set.replace(" " + name + " ", " ");
+  		}
+
+  		// Trim for prettiness
+  		elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, "");
+  	}
+
+  	function id(name) {
+  		return document$$1.getElementById && document$$1.getElementById(name);
+  	}
+
+  	function abortTests() {
+  		var abortButton = id("qunit-abort-tests-button");
+  		if (abortButton) {
+  			abortButton.disabled = true;
+  			abortButton.innerHTML = "Aborting...";
+  		}
+  		QUnit.config.queue.length = 0;
+  		return false;
+  	}
+
+  	function interceptNavigation(ev) {
+  		applyUrlParams();
+
+  		if (ev && ev.preventDefault) {
+  			ev.preventDefault();
+  		}
+
+  		return false;
+  	}
+
+  	function getUrlConfigHtml() {
+  		var i,
+  		    j,
+  		    val,
+  		    escaped,
+  		    escapedTooltip,
+  		    selection = false,
+  		    urlConfig = config.urlConfig,
+  		    urlConfigHtml = "";
+
+  		for (i = 0; i < urlConfig.length; i++) {
+
+  			// Options can be either strings or objects with nonempty "id" properties
+  			val = config.urlConfig[i];
+  			if (typeof val === "string") {
+  				val = {
+  					id: val,
+  					label: val
+  				};
+  			}
+
+  			escaped = escapeText(val.id);
+  			escapedTooltip = escapeText(val.tooltip);
+
+  			if (!val.value || typeof val.value === "string") {
+  				urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'><input id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' type='checkbox'" + (val.value ? " value='" + escapeText(val.value) + "'" : "") + (config[val.id] ? " checked='checked'" : "") + " title='" + escapedTooltip + "' />" + escapeText(val.label) + "</label>";
+  			} else {
+  				urlConfigHtml += "<label for='qunit-urlconfig-" + escaped + "' title='" + escapedTooltip + "'>" + val.label + ": </label><select id='qunit-urlconfig-" + escaped + "' name='" + escaped + "' title='" + escapedTooltip + "'><option></option>";
+
+  				if (QUnit.is("array", val.value)) {
+  					for (j = 0; j < val.value.length; j++) {
+  						escaped = escapeText(val.value[j]);
+  						urlConfigHtml += "<option value='" + escaped + "'" + (config[val.id] === val.value[j] ? (selection = true) && " selected='selected'" : "") + ">" + escaped + "</option>";
+  					}
+  				} else {
+  					for (j in val.value) {
+  						if (hasOwn.call(val.value, j)) {
+  							urlConfigHtml += "<option value='" + escapeText(j) + "'" + (config[val.id] === j ? (selection = true) && " selected='selected'" : "") + ">" + escapeText(val.value[j]) + "</option>";
+  						}
+  					}
+  				}
+  				if (config[val.id] && !selection) {
+  					escaped = escapeText(config[val.id]);
+  					urlConfigHtml += "<option value='" + escaped + "' selected='selected' disabled='disabled'>" + escaped + "</option>";
+  				}
+  				urlConfigHtml += "</select>";
+  			}
+  		}
+
+  		return urlConfigHtml;
+  	}
+
+  	// Handle "click" events on toolbar checkboxes and "change" for select menus.
+  	// Updates the URL with the new state of `config.urlConfig` values.
+  	function toolbarChanged() {
+  		var updatedUrl,
+  		    value,
+  		    tests,
+  		    field = this,
+  		    params = {};
+
+  		// Detect if field is a select menu or a checkbox
+  		if ("selectedIndex" in field) {
+  			value = field.options[field.selectedIndex].value || undefined;
+  		} else {
+  			value = field.checked ? field.defaultValue || true : undefined;
+  		}
+
+  		params[field.name] = value;
+  		updatedUrl = setUrl(params);
+
+  		// Check if we can apply the change without a page refresh
+  		if ("hidepassed" === field.name && "replaceState" in window.history) {
+  			QUnit.urlParams[field.name] = value;
+  			config[field.name] = value || false;
+  			tests = id("qunit-tests");
+  			if (tests) {
+  				toggleClass(tests, "hidepass", value || false);
+  			}
+  			window.history.replaceState(null, "", updatedUrl);
+  		} else {
+  			window.location = updatedUrl;
+  		}
+  	}
+
+  	function setUrl(params) {
+  		var key,
+  		    arrValue,
+  		    i,
+  		    querystring = "?",
+  		    location = window.location;
+
+  		params = QUnit.extend(QUnit.extend({}, QUnit.urlParams), params);
+
+  		for (key in params) {
+
+  			// Skip inherited or undefined properties
+  			if (hasOwn.call(params, key) && params[key] !== undefined) {
+
+  				// Output a parameter for each value of this key (but usually just one)
+  				arrValue = [].concat(params[key]);
+  				for (i = 0; i < arrValue.length; i++) {
+  					querystring += encodeURIComponent(key);
+  					if (arrValue[i] !== true) {
+  						querystring += "=" + encodeURIComponent(arrValue[i]);
+  					}
+  					querystring += "&";
+  				}
+  			}
+  		}
+  		return location.protocol + "//" + location.host + location.pathname + querystring.slice(0, -1);
+  	}
+
+  	function applyUrlParams() {
+  		var i,
+  		    selectedModules = [],
+  		    modulesList = id("qunit-modulefilter-dropdown-list").getElementsByTagName("input"),
+  		    filter = id("qunit-filter-input").value;
+
+  		for (i = 0; i < modulesList.length; i++) {
+  			if (modulesList[i].checked) {
+  				selectedModules.push(modulesList[i].value);
+  			}
+  		}
+
+  		window.location = setUrl({
+  			filter: filter === "" ? undefined : filter,
+  			moduleId: selectedModules.length === 0 ? undefined : selectedModules,
+
+  			// Remove module and testId filter
+  			module: undefined,
+  			testId: undefined
+  		});
+  	}
+
+  	function toolbarUrlConfigContainer() {
+  		var urlConfigContainer = document$$1.createElement("span");
+
+  		urlConfigContainer.innerHTML = getUrlConfigHtml();
+  		addClass(urlConfigContainer, "qunit-url-config");
+
+  		addEvents(urlConfigContainer.getElementsByTagName("input"), "change", toolbarChanged);
+  		addEvents(urlConfigContainer.getElementsByTagName("select"), "change", toolbarChanged);
+
+  		return urlConfigContainer;
+  	}
+
+  	function abortTestsButton() {
+  		var button = document$$1.createElement("button");
+  		button.id = "qunit-abort-tests-button";
+  		button.innerHTML = "Abort";
+  		addEvent(button, "click", abortTests);
+  		return button;
+  	}
+
+  	function toolbarLooseFilter() {
+  		var filter = document$$1.createElement("form"),
+  		    label = document$$1.createElement("label"),
+  		    input = document$$1.createElement("input"),
+  		    button = document$$1.createElement("button");
+
+  		addClass(filter, "qunit-filter");
+
+  		label.innerHTML = "Filter: ";
+
+  		input.type = "text";
+  		input.value = config.filter || "";
+  		input.name = "filter";
+  		input.id = "qunit-filter-input";
+
+  		button.innerHTML = "Go";
+
+  		label.appendChild(input);
+
+  		filter.appendChild(label);
+  		filter.appendChild(document$$1.createTextNode(" "));
+  		filter.appendChild(button);
+  		addEvent(filter, "submit", interceptNavigation);
+
+  		return filter;
+  	}
+
+  	function moduleListHtml() {
+  		var i,
+  		    checked,
+  		    html = "";
+
+  		for (i = 0; i < config.modules.length; i++) {
+  			if (config.modules[i].name !== "") {
+  				checked = config.moduleId.indexOf(config.modules[i].moduleId) > -1;
+  				html += "<li><label class='clickable" + (checked ? " checked" : "") + "'><input type='checkbox' " + "value='" + config.modules[i].moduleId + "'" + (checked ? " checked='checked'" : "") + " />" + escapeText(config.modules[i].name) + "</label></li>";
+  			}
+  		}
+
+  		return html;
+  	}
+
+  	function toolbarModuleFilter() {
+  		var allCheckbox,
+  		    commit,
+  		    reset,
+  		    moduleFilter = document$$1.createElement("form"),
+  		    label = document$$1.createElement("label"),
+  		    moduleSearch = document$$1.createElement("input"),
+  		    dropDown = document$$1.createElement("div"),
+  		    actions = document$$1.createElement("span"),
+  		    dropDownList = document$$1.createElement("ul"),
+  		    dirty = false;
+
+  		moduleSearch.id = "qunit-modulefilter-search";
+  		addEvent(moduleSearch, "input", searchInput);
+  		addEvent(moduleSearch, "input", searchFocus);
+  		addEvent(moduleSearch, "focus", searchFocus);
+  		addEvent(moduleSearch, "click", searchFocus);
+
+  		label.id = "qunit-modulefilter-search-container";
+  		label.innerHTML = "Module: ";
+  		label.appendChild(moduleSearch);
+
+  		actions.id = "qunit-modulefilter-actions";
+  		actions.innerHTML = "<button style='display:none'>Apply</button>" + "<button type='reset' style='display:none'>Reset</button>" + "<label class='clickable" + (config.moduleId.length ? "" : " checked") + "'><input type='checkbox'" + (config.moduleId.length ? "" : " checked='checked'") + ">All modules</label>";
+  		allCheckbox = actions.lastChild.firstChild;
+  		commit = actions.firstChild;
+  		reset = commit.nextSibling;
+  		addEvent(commit, "click", applyUrlParams);
+
+  		dropDownList.id = "qunit-modulefilter-dropdown-list";
+  		dropDownList.innerHTML = moduleListHtml();
+
+  		dropDown.id = "qunit-modulefilter-dropdown";
+  		dropDown.style.display = "none";
+  		dropDown.appendChild(actions);
+  		dropDown.appendChild(dropDownList);
+  		addEvent(dropDown, "change", selectionChange);
+  		selectionChange();
+
+  		moduleFilter.id = "qunit-modulefilter";
+  		moduleFilter.appendChild(label);
+  		moduleFilter.appendChild(dropDown);
+  		addEvent(moduleFilter, "submit", interceptNavigation);
+  		addEvent(moduleFilter, "reset", function () {
+
+  			// Let the reset happen, then update styles
+  			window.setTimeout(selectionChange);
+  		});
+
+  		// Enables show/hide for the dropdown
+  		function searchFocus() {
+  			if (dropDown.style.display !== "none") {
+  				return;
+  			}
+
+  			dropDown.style.display = "block";
+  			addEvent(document$$1, "click", hideHandler);
+  			addEvent(document$$1, "keydown", hideHandler);
+
+  			// Hide on Escape keydown or outside-container click
+  			function hideHandler(e) {
+  				var inContainer = moduleFilter.contains(e.target);
+
+  				if (e.keyCode === 27 || !inContainer) {
+  					if (e.keyCode === 27 && inContainer) {
+  						moduleSearch.focus();
+  					}
+  					dropDown.style.display = "none";
+  					removeEvent(document$$1, "click", hideHandler);
+  					removeEvent(document$$1, "keydown", hideHandler);
+  					moduleSearch.value = "";
+  					searchInput();
+  				}
+  			}
+  		}
+
+  		// Processes module search box input
+  		function searchInput() {
+  			var i,
+  			    item,
+  			    searchText = moduleSearch.value.toLowerCase(),
+  			    listItems = dropDownList.children;
+
+  			for (i = 0; i < listItems.length; i++) {
+  				item = listItems[i];
+  				if (!searchText || item.textContent.toLowerCase().indexOf(searchText) > -1) {
+  					item.style.display = "";
+  				} else {
+  					item.style.display = "none";
+  				}
+  			}
+  		}
+
+  		// Processes selection changes
+  		function selectionChange(evt) {
+  			var i,
+  			    item,
+  			    checkbox = evt && evt.target || allCheckbox,
+  			    modulesList = dropDownList.getElementsByTagName("input"),
+  			    selectedNames = [];
+
+  			toggleClass(checkbox.parentNode, "checked", checkbox.checked);
+
+  			dirty = false;
+  			if (checkbox.checked && checkbox !== allCheckbox) {
+  				allCheckbox.checked = false;
+  				removeClass(allCheckbox.parentNode, "checked");
+  			}
+  			for (i = 0; i < modulesList.length; i++) {
+  				item = modulesList[i];
+  				if (!evt) {
+  					toggleClass(item.parentNode, "checked", item.checked);
+  				} else if (checkbox === allCheckbox && checkbox.checked) {
+  					item.checked = false;
+  					removeClass(item.parentNode, "checked");
+  				}
+  				dirty = dirty || item.checked !== item.defaultChecked;
+  				if (item.checked) {
+  					selectedNames.push(item.parentNode.textContent);
+  				}
+  			}
+
+  			commit.style.display = reset.style.display = dirty ? "" : "none";
+  			moduleSearch.placeholder = selectedNames.join(", ") || allCheckbox.parentNode.textContent;
+  			moduleSearch.title = "Type to filter list. Current selection:\n" + (selectedNames.join("\n") || allCheckbox.parentNode.textContent);
+  		}
+
+  		return moduleFilter;
+  	}
+
+  	function appendToolbar() {
+  		var toolbar = id("qunit-testrunner-toolbar");
+
+  		if (toolbar) {
+  			toolbar.appendChild(toolbarUrlConfigContainer());
+  			toolbar.appendChild(toolbarModuleFilter());
+  			toolbar.appendChild(toolbarLooseFilter());
+  			toolbar.appendChild(document$$1.createElement("div")).className = "clearfix";
+  		}
+  	}
+
+  	function appendHeader() {
+  		var header = id("qunit-header");
+
+  		if (header) {
+  			header.innerHTML = "<a href='" + escapeText(unfilteredUrl) + "'>" + header.innerHTML + "</a> ";
+  		}
+  	}
+
+  	function appendBanner() {
+  		var banner = id("qunit-banner");
+
+  		if (banner) {
+  			banner.className = "";
+  		}
+  	}
+
+  	function appendTestResults() {
+  		var tests = id("qunit-tests"),
+  		    result = id("qunit-testresult"),
+  		    controls;
+
+  		if (result) {
+  			result.parentNode.removeChild(result);
+  		}
+
+  		if (tests) {
+  			tests.innerHTML = "";
+  			result = document$$1.createElement("p");
+  			result.id = "qunit-testresult";
+  			result.className = "result";
+  			tests.parentNode.insertBefore(result, tests);
+  			result.innerHTML = "<div id=\"qunit-testresult-display\">Running...<br />&#160;</div>" + "<div id=\"qunit-testresult-controls\"></div>" + "<div class=\"clearfix\"></div>";
+  			controls = id("qunit-testresult-controls");
+  		}
+
+  		if (controls) {
+  			controls.appendChild(abortTestsButton());
+  		}
+  	}
+
+  	function appendFilteredTest() {
+  		var testId = QUnit.config.testId;
+  		if (!testId || testId.length <= 0) {
+  			return "";
+  		}
+  		return "<div id='qunit-filteredTest'>Rerunning selected tests: " + escapeText(testId.join(", ")) + " <a id='qunit-clearFilter' href='" + escapeText(unfilteredUrl) + "'>Run all tests</a></div>";
+  	}
+
+  	function appendUserAgent() {
+  		var userAgent = id("qunit-userAgent");
+
+  		if (userAgent) {
+  			userAgent.innerHTML = "";
+  			userAgent.appendChild(document$$1.createTextNode("QUnit " + QUnit.version + "; " + navigator.userAgent));
+  		}
+  	}
+
+  	function appendInterface() {
+  		var qunit = id("qunit");
+
+  		if (qunit) {
+  			qunit.innerHTML = "<h1 id='qunit-header'>" + escapeText(document$$1.title) + "</h1>" + "<h2 id='qunit-banner'></h2>" + "<div id='qunit-testrunner-toolbar'></div>" + appendFilteredTest() + "<h2 id='qunit-userAgent'></h2>" + "<ol id='qunit-tests'></ol>";
+  		}
+
+  		appendHeader();
+  		appendBanner();
+  		appendTestResults();
+  		appendUserAgent();
+  		appendToolbar();
+  	}
+
+  	function appendTestsList(modules) {
+  		var i, l, x, z, test, moduleObj;
+
+  		for (i = 0, l = modules.length; i < l; i++) {
+  			moduleObj = modules[i];
+
+  			for (x = 0, z = moduleObj.tests.length; x < z; x++) {
+  				test = moduleObj.tests[x];
+
+  				appendTest(test.name, test.testId, moduleObj.name);
+  			}
+  		}
+  	}
+
+  	function appendTest(name, testId, moduleName) {
+  		var title,
+  		    rerunTrigger,
+  		    testBlock,
+  		    assertList,
+  		    tests = id("qunit-tests");
+
+  		if (!tests) {
+  			return;
+  		}
+
+  		title = document$$1.createElement("strong");
+  		title.innerHTML = getNameHtml(name, moduleName);
+
+  		rerunTrigger = document$$1.createElement("a");
+  		rerunTrigger.innerHTML = "Rerun";
+  		rerunTrigger.href = setUrl({ testId: testId });
+
+  		testBlock = document$$1.createElement("li");
+  		testBlock.appendChild(title);
+  		testBlock.appendChild(rerunTrigger);
+  		testBlock.id = "qunit-test-output-" + testId;
+
+  		assertList = document$$1.createElement("ol");
+  		assertList.className = "qunit-assert-list";
+
+  		testBlock.appendChild(assertList);
+
+  		tests.appendChild(testBlock);
+  	}
+
+  	// HTML Reporter initialization and load
+  	QUnit.begin(function (details) {
+  		var i, moduleObj, tests;
+
+  		// Sort modules by name for the picker
+  		for (i = 0; i < details.modules.length; i++) {
+  			moduleObj = details.modules[i];
+  			if (moduleObj.name) {
+  				modulesList.push(moduleObj.name);
+  			}
+  		}
+  		modulesList.sort(function (a, b) {
+  			return a.localeCompare(b);
+  		});
+
+  		// Initialize QUnit elements
+  		appendInterface();
+  		appendTestsList(details.modules);
+  		tests = id("qunit-tests");
+  		if (tests && config.hidepassed) {
+  			addClass(tests, "hidepass");
+  		}
+  	});
+
+  	QUnit.done(function (details) {
+  		var banner = id("qunit-banner"),
+  		    tests = id("qunit-tests"),
+  		    abortButton = id("qunit-abort-tests-button"),
+  		    totalTests = stats.passedTests + stats.skippedTests + stats.todoTests + stats.failedTests,
+  		    html = [totalTests, " tests completed in ", details.runtime, " milliseconds, with ", stats.failedTests, " failed, ", stats.skippedTests, " skipped, and ", stats.todoTests, " todo.<br />", "<span class='passed'>", details.passed, "</span> assertions of <span class='total'>", details.total, "</span> passed, <span class='failed'>", details.failed, "</span> failed."].join(""),
+  		    test,
+  		    assertLi,
+  		    assertList;
+
+  		// Update remaing tests to aborted
+  		if (abortButton && abortButton.disabled) {
+  			html = "Tests aborted after " + details.runtime + " milliseconds.";
+
+  			for (var i = 0; i < tests.children.length; i++) {
+  				test = tests.children[i];
+  				if (test.className === "" || test.className === "running") {
+  					test.className = "aborted";
+  					assertList = test.getElementsByTagName("ol")[0];
+  					assertLi = document$$1.createElement("li");
+  					assertLi.className = "fail";
+  					assertLi.innerHTML = "Test aborted.";
+  					assertList.appendChild(assertLi);
+  				}
+  			}
+  		}
+
+  		if (banner && (!abortButton || abortButton.disabled === false)) {
+  			banner.className = stats.failedTests ? "qunit-fail" : "qunit-pass";
+  		}
+
+  		if (abortButton) {
+  			abortButton.parentNode.removeChild(abortButton);
+  		}
+
+  		if (tests) {
+  			id("qunit-testresult-display").innerHTML = html;
+  		}
+
+  		if (config.altertitle && document$$1.title) {
+
+  			// Show ✖ for good, ✔ for bad suite result in title
+  			// use escape sequences in case file gets loaded with non-utf-8-charset
+  			document$$1.title = [stats.failedTests ? "\u2716" : "\u2714", document$$1.title.replace(/^[\u2714\u2716] /i, "")].join(" ");
+  		}
+
+  		// Scroll back to top to show results
+  		if (config.scrolltop && window.scrollTo) {
+  			window.scrollTo(0, 0);
+  		}
+  	});
+
+  	function getNameHtml(name, module) {
+  		var nameHtml = "";
+
+  		if (module) {
+  			nameHtml = "<span class='module-name'>" + escapeText(module) + "</span>: ";
+  		}
+
+  		nameHtml += "<span class='test-name'>" + escapeText(name) + "</span>";
+
+  		return nameHtml;
+  	}
+
+  	QUnit.testStart(function (details) {
+  		var running, testBlock, bad;
+
+  		testBlock = id("qunit-test-output-" + details.testId);
+  		if (testBlock) {
+  			testBlock.className = "running";
+  		} else {
+
+  			// Report later registered tests
+  			appendTest(details.name, details.testId, details.module);
+  		}
+
+  		running = id("qunit-testresult-display");
+  		if (running) {
+  			bad = QUnit.config.reorder && details.previousFailure;
+
+  			running.innerHTML = (bad ? "Rerunning previously failed test: <br />" : "Running: <br />") + getNameHtml(details.name, details.module);
+  		}
+  	});
+
+  	function stripHtml(string) {
+
+  		// Strip tags, html entity and whitespaces
+  		return string.replace(/<\/?[^>]+(>|$)/g, "").replace(/\&quot;/g, "").replace(/\s+/g, "");
+  	}
+
+  	QUnit.log(function (details) {
+  		var assertList,
+  		    assertLi,
+  		    message,
+  		    expected,
+  		    actual,
+  		    diff,
+  		    showDiff = false,
+  		    testItem = id("qunit-test-output-" + details.testId);
+
+  		if (!testItem) {
+  			return;
+  		}
+
+  		message = escapeText(details.message) || (details.result ? "okay" : "failed");
+  		message = "<span class='test-message'>" + message + "</span>";
+  		message += "<span class='runtime'>@ " + details.runtime + " ms</span>";
+
+  		// The pushFailure doesn't provide details.expected
+  		// when it calls, it's implicit to also not show expected and diff stuff
+  		// Also, we need to check details.expected existence, as it can exist and be undefined
+  		if (!details.result && hasOwn.call(details, "expected")) {
+  			if (details.negative) {
+  				expected = "NOT " + QUnit.dump.parse(details.expected);
+  			} else {
+  				expected = QUnit.dump.parse(details.expected);
+  			}
+
+  			actual = QUnit.dump.parse(details.actual);
+  			message += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + escapeText(expected) + "</pre></td></tr>";
+
+  			if (actual !== expected) {
+
+  				message += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeText(actual) + "</pre></td></tr>";
+
+  				if (typeof details.actual === "number" && typeof details.expected === "number") {
+  					if (!isNaN(details.actual) && !isNaN(details.expected)) {
+  						showDiff = true;
+  						diff = details.actual - details.expected;
+  						diff = (diff > 0 ? "+" : "") + diff;
+  					}
+  				} else if (typeof details.actual !== "boolean" && typeof details.expected !== "boolean") {
+  					diff = QUnit.diff(expected, actual);
+
+  					// don't show diff if there is zero overlap
+  					showDiff = stripHtml(diff).length !== stripHtml(expected).length + stripHtml(actual).length;
+  				}
+
+  				if (showDiff) {
+  					message += "<tr class='test-diff'><th>Diff: </th><td><pre>" + diff + "</pre></td></tr>";
+  				}
+  			} else if (expected.indexOf("[object Array]") !== -1 || expected.indexOf("[object Object]") !== -1) {
+  				message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the depth of object is more than current max depth (" + QUnit.config.maxDepth + ").<p>Hint: Use <code>QUnit.dump.maxDepth</code> to " + " run with a higher max depth or <a href='" + escapeText(setUrl({ maxDepth: -1 })) + "'>" + "Rerun</a> without max depth.</p></td></tr>";
+  			} else {
+  				message += "<tr class='test-message'><th>Message: </th><td>" + "Diff suppressed as the expected and actual results have an equivalent" + " serialization</td></tr>";
+  			}
+
+  			if (details.source) {
+  				message += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>";
+  			}
+
+  			message += "</table>";
+
+  			// This occurs when pushFailure is set and we have an extracted stack trace
+  		} else if (!details.result && details.source) {
+  			message += "<table>" + "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText(details.source) + "</pre></td></tr>" + "</table>";
+  		}
+
+  		assertList = testItem.getElementsByTagName("ol")[0];
+
+  		assertLi = document$$1.createElement("li");
+  		assertLi.className = details.result ? "pass" : "fail";
+  		assertLi.innerHTML = message;
+  		assertList.appendChild(assertLi);
+  	});
+
+  	QUnit.testDone(function (details) {
+  		var testTitle,
+  		    time,
+  		    testItem,
+  		    assertList,
+  		    good,
+  		    bad,
+  		    testCounts,
+  		    skipped,
+  		    sourceName,
+  		    tests = id("qunit-tests");
+
+  		if (!tests) {
+  			return;
+  		}
+
+  		testItem = id("qunit-test-output-" + details.testId);
+
+  		assertList = testItem.getElementsByTagName("ol")[0];
+
+  		good = details.passed;
+  		bad = details.failed;
+
+  		// This test passed if it has no unexpected failed assertions
+  		var testPassed = details.failed > 0 ? details.todo : !details.todo;
+
+  		if (testPassed) {
+
+  			// Collapse the passing tests
+  			addClass(assertList, "qunit-collapsed");
+  		} else if (config.collapse) {
+  			if (!collapseNext) {
+
+  				// Skip collapsing the first failing test
+  				collapseNext = true;
+  			} else {
+
+  				// Collapse remaining tests
+  				addClass(assertList, "qunit-collapsed");
+  			}
+  		}
+
+  		// The testItem.firstChild is the test name
+  		testTitle = testItem.firstChild;
+
+  		testCounts = bad ? "<b class='failed'>" + bad + "</b>, " + "<b class='passed'>" + good + "</b>, " : "";
+
+  		testTitle.innerHTML += " <b class='counts'>(" + testCounts + details.assertions.length + ")</b>";
+
+  		if (details.skipped) {
+  			stats.skippedTests++;
+
+  			testItem.className = "skipped";
+  			skipped = document$$1.createElement("em");
+  			skipped.className = "qunit-skipped-label";
+  			skipped.innerHTML = "skipped";
+  			testItem.insertBefore(skipped, testTitle);
+  		} else {
+  			addEvent(testTitle, "click", function () {
+  				toggleClass(assertList, "qunit-collapsed");
+  			});
+
+  			testItem.className = testPassed ? "pass" : "fail";
+
+  			if (details.todo) {
+  				var todoLabel = document$$1.createElement("em");
+  				todoLabel.className = "qunit-todo-label";
+  				todoLabel.innerHTML = "todo";
+  				testItem.className += " todo";
+  				testItem.insertBefore(todoLabel, testTitle);
+  			}
+
+  			time = document$$1.createElement("span");
+  			time.className = "runtime";
+  			time.innerHTML = details.runtime + " ms";
+  			testItem.insertBefore(time, assertList);
+
+  			if (!testPassed) {
+  				stats.failedTests++;
+  			} else if (details.todo) {
+  				stats.todoTests++;
+  			} else {
+  				stats.passedTests++;
+  			}
+  		}
+
+  		// Show the source of the test when showing assertions
+  		if (details.source) {
+  			sourceName = document$$1.createElement("p");
+  			sourceName.innerHTML = "<strong>Source: </strong>" + details.source;
+  			addClass(sourceName, "qunit-source");
+  			if (testPassed) {
+  				addClass(sourceName, "qunit-collapsed");
+  			}
+  			addEvent(testTitle, "click", function () {
+  				toggleClass(sourceName, "qunit-collapsed");
+  			});
+  			testItem.appendChild(sourceName);
+  		}
+  	});
+
+  	// Avoid readyState issue with phantomjs
+  	// Ref: #818
+  	var notPhantom = function (p) {
+  		return !(p && p.version && p.version.major > 0);
+  	}(window.phantom);
+
+  	if (notPhantom && document$$1.readyState === "complete") {
+  		QUnit.load();
+  	} else {
+  		addEvent(window, "load", QUnit.load);
+  	}
+
+  	// Wrap window.onerror. We will call the original window.onerror to see if
+  	// the existing handler fully handles the error; if not, we will call the
+  	// QUnit.onError function.
+  	var originalWindowOnError = window.onerror;
+
+  	// Cover uncaught exceptions
+  	// Returning true will suppress the default browser handler,
+  	// returning false will let it run.
+  	window.onerror = function (message, fileName, lineNumber) {
+  		var ret = false;
+  		if (originalWindowOnError) {
+  			for (var _len = arguments.length, args = Array(_len > 3 ? _len - 3 : 0), _key = 3; _key < _len; _key++) {
+  				args[_key - 3] = arguments[_key];
+  			}
+
+  			ret = originalWindowOnError.call.apply(originalWindowOnError, [this, message, fileName, lineNumber].concat(args));
+  		}
+
+  		// Treat return value as window.onerror itself does,
+  		// Only do our handling if not suppressed.
+  		if (ret !== true) {
+  			var error = {
+  				message: message,
+  				fileName: fileName,
+  				lineNumber: lineNumber
+  			};
+
+  			ret = QUnit.onError(error);
+  		}
+
+  		return ret;
+  	};
+  })();
+
+  /*
+   * This file is a modified version of google-diff-match-patch's JavaScript implementation
+   * (https://code.google.com/p/google-diff-match-patch/source/browse/trunk/javascript/diff_match_patch_uncompressed.js),
+   * modifications are licensed as more fully set forth in LICENSE.txt.
+   *
+   * The original source of google-diff-match-patch is attributable and licensed as follows:
+   *
+   * Copyright 2006 Google Inc.
+   * https://code.google.com/p/google-diff-match-patch/
+   *
+   * Licensed under the Apache License, Version 2.0 (the "License");
+   * you may not use this file except in compliance with the License.
+   * You may obtain a copy of the License at
+   *
+   * https://www.apache.org/licenses/LICENSE-2.0
+   *
+   * Unless required by applicable law or agreed to in writing, software
+   * distributed under the License is distributed on an "AS IS" BASIS,
+   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   * See the License for the specific language governing permissions and
+   * limitations under the License.
+   *
+   * More Info:
+   *  https://code.google.com/p/google-diff-match-patch/
+   *
+   * Usage: QUnit.diff(expected, actual)
+   *
+   */
+  QUnit.diff = function () {
+  	function DiffMatchPatch() {}
+
+  	//  DIFF FUNCTIONS
+
+  	/**
+    * The data structure representing a diff is an array of tuples:
+    * [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']]
+    * which means: delete 'Hello', add 'Goodbye' and keep ' world.'
+    */
+  	var DIFF_DELETE = -1,
+  	    DIFF_INSERT = 1,
+  	    DIFF_EQUAL = 0;
+
+  	/**
+    * Find the differences between two texts.  Simplifies the problem by stripping
+    * any common prefix or suffix off the texts before diffing.
+    * @param {string} text1 Old string to be diffed.
+    * @param {string} text2 New string to be diffed.
+    * @param {boolean=} optChecklines Optional speedup flag. If present and false,
+    *     then don't run a line-level diff first to identify the changed areas.
+    *     Defaults to true, which does a faster, slightly less optimal diff.
+    * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
+    */
+  	DiffMatchPatch.prototype.DiffMain = function (text1, text2, optChecklines) {
+  		var deadline, checklines, commonlength, commonprefix, commonsuffix, diffs;
+
+  		// The diff must be complete in up to 1 second.
+  		deadline = new Date().getTime() + 1000;
+
+  		// Check for null inputs.
+  		if (text1 === null || text2 === null) {
+  			throw new Error("Null input. (DiffMain)");
+  		}
+
+  		// Check for equality (speedup).
+  		if (text1 === text2) {
+  			if (text1) {
+  				return [[DIFF_EQUAL, text1]];
+  			}
+  			return [];
+  		}
+
+  		if (typeof optChecklines === "undefined") {
+  			optChecklines = true;
+  		}
+
+  		checklines = optChecklines;
+
+  		// Trim off common prefix (speedup).
+  		commonlength = this.diffCommonPrefix(text1, text2);
+  		commonprefix = text1.substring(0, commonlength);
+  		text1 = text1.substring(commonlength);
+  		text2 = text2.substring(commonlength);
+
+  		// Trim off common suffix (speedup).
+  		commonlength = this.diffCommonSuffix(text1, text2);
+  		commonsuffix = text1.substring(text1.length - commonlength);
+  		text1 = text1.substring(0, text1.length - commonlength);
+  		text2 = text2.substring(0, text2.length - commonlength);
+
+  		// Compute the diff on the middle block.
+  		diffs = this.diffCompute(text1, text2, checklines, deadline);
+
+  		// Restore the prefix and suffix.
+  		if (commonprefix) {
+  			diffs.unshift([DIFF_EQUAL, commonprefix]);
+  		}
+  		if (commonsuffix) {
+  			diffs.push([DIFF_EQUAL, commonsuffix]);
+  		}
+  		this.diffCleanupMerge(diffs);
+  		return diffs;
+  	};
+
+  	/**
+    * Reduce the number of edits by eliminating operationally trivial equalities.
+    * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
+    */
+  	DiffMatchPatch.prototype.diffCleanupEfficiency = function (diffs) {
+  		var changes, equalities, equalitiesLength, lastequality, pointer, preIns, preDel, postIns, postDel;
+  		changes = false;
+  		equalities = []; // Stack of indices where equalities are found.
+  		equalitiesLength = 0; // Keeping our own length var is faster in JS.
+  		/** @type {?string} */
+  		lastequality = null;
+
+  		// Always equal to diffs[equalities[equalitiesLength - 1]][1]
+  		pointer = 0; // Index of current position.
+
+  		// Is there an insertion operation before the last equality.
+  		preIns = false;
+
+  		// Is there a deletion operation before the last equality.
+  		preDel = false;
+
+  		// Is there an insertion operation after the last equality.
+  		postIns = false;
+
+  		// Is there a deletion operation after the last equality.
+  		postDel = false;
+  		while (pointer < diffs.length) {
+
+  			// Equality found.
+  			if (diffs[pointer][0] === DIFF_EQUAL) {
+  				if (diffs[pointer][1].length < 4 && (postIns || postDel)) {
+
+  					// Candidate found.
+  					equalities[equalitiesLength++] = pointer;
+  					preIns = postIns;
+  					preDel = postDel;
+  					lastequality = diffs[pointer][1];
+  				} else {
+
+  					// Not a candidate, and can never become one.
+  					equalitiesLength = 0;
+  					lastequality = null;
+  				}
+  				postIns = postDel = false;
+
+  				// An insertion or deletion.
+  			} else {
+
+  				if (diffs[pointer][0] === DIFF_DELETE) {
+  					postDel = true;
+  				} else {
+  					postIns = true;
+  				}
+
+  				/*
+       * Five types to be split:
+       * <ins>A</ins><del>B</del>XY<ins>C</ins><del>D</del>
+       * <ins>A</ins>X<ins>C</ins><del>D</del>
+       * <ins>A</ins><del>B</del>X<ins>C</ins>
+       * <ins>A</del>X<ins>C</ins><del>D</del>
+       * <ins>A</ins><del>B</del>X<del>C</del>
+       */
+  				if (lastequality && (preIns && preDel && postIns && postDel || lastequality.length < 2 && preIns + preDel + postIns + postDel === 3)) {
+
+  					// Duplicate record.
+  					diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]);
+
+  					// Change second copy to insert.
+  					diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
+  					equalitiesLength--; // Throw away the equality we just deleted;
+  					lastequality = null;
+  					if (preIns && preDel) {
+
+  						// No changes made which could affect previous entry, keep going.
+  						postIns = postDel = true;
+  						equalitiesLength = 0;
+  					} else {
+  						equalitiesLength--; // Throw away the previous equality.
+  						pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1;
+  						postIns = postDel = false;
+  					}
+  					changes = true;
+  				}
+  			}
+  			pointer++;
+  		}
+
+  		if (changes) {
+  			this.diffCleanupMerge(diffs);
+  		}
+  	};
+
+  	/**
+    * Convert a diff array into a pretty HTML report.
+    * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
+    * @param {integer} string to be beautified.
+    * @return {string} HTML representation.
+    */
+  	DiffMatchPatch.prototype.diffPrettyHtml = function (diffs) {
+  		var op,
+  		    data,
+  		    x,
+  		    html = [];
+  		for (x = 0; x < diffs.length; x++) {
+  			op = diffs[x][0]; // Operation (insert, delete, equal)
+  			data = diffs[x][1]; // Text of change.
+  			switch (op) {
+  				case DIFF_INSERT:
+  					html[x] = "<ins>" + escapeText(data) + "</ins>";
+  					break;
+  				case DIFF_DELETE:
+  					html[x] = "<del>" + escapeText(data) + "</del>";
+  					break;
+  				case DIFF_EQUAL:
+  					html[x] = "<span>" + escapeText(data) + "</span>";
+  					break;
+  			}
+  		}
+  		return html.join("");
+  	};
+
+  	/**
+    * Determine the common prefix of two strings.
+    * @param {string} text1 First string.
+    * @param {string} text2 Second string.
+    * @return {number} The number of characters common to the start of each
+    *     string.
+    */
+  	DiffMatchPatch.prototype.diffCommonPrefix = function (text1, text2) {
+  		var pointermid, pointermax, pointermin, pointerstart;
+
+  		// Quick check for common null cases.
+  		if (!text1 || !text2 || text1.charAt(0) !== text2.charAt(0)) {
+  			return 0;
+  		}
+
+  		// Binary search.
+  		// Performance analysis: https://neil.fraser.name/news/2007/10/09/
+  		pointermin = 0;
+  		pointermax = Math.min(text1.length, text2.length);
+  		pointermid = pointermax;
+  		pointerstart = 0;
+  		while (pointermin < pointermid) {
+  			if (text1.substring(pointerstart, pointermid) === text2.substring(pointerstart, pointermid)) {
+  				pointermin = pointermid;
+  				pointerstart = pointermin;
+  			} else {
+  				pointermax = pointermid;
+  			}
+  			pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
+  		}
+  		return pointermid;
+  	};
+
+  	/**
+    * Determine the common suffix of two strings.
+    * @param {string} text1 First string.
+    * @param {string} text2 Second string.
+    * @return {number} The number of characters common to the end of each string.
+    */
+  	DiffMatchPatch.prototype.diffCommonSuffix = function (text1, text2) {
+  		var pointermid, pointermax, pointermin, pointerend;
+
+  		// Quick check for common null cases.
+  		if (!text1 || !text2 || text1.charAt(text1.length - 1) !== text2.charAt(text2.length - 1)) {
+  			return 0;
+  		}
+
+  		// Binary search.
+  		// Performance analysis: https://neil.fraser.name/news/2007/10/09/
+  		pointermin = 0;
+  		pointermax = Math.min(text1.length, text2.length);
+  		pointermid = pointermax;
+  		pointerend = 0;
+  		while (pointermin < pointermid) {
+  			if (text1.substring(text1.length - pointermid, text1.length - pointerend) === text2.substring(text2.length - pointermid, text2.length - pointerend)) {
+  				pointermin = pointermid;
+  				pointerend = pointermin;
+  			} else {
+  				pointermax = pointermid;
+  			}
+  			pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
+  		}
+  		return pointermid;
+  	};
+
+  	/**
+    * Find the differences between two texts.  Assumes that the texts do not
+    * have any common prefix or suffix.
+    * @param {string} text1 Old string to be diffed.
+    * @param {string} text2 New string to be diffed.
+    * @param {boolean} checklines Speedup flag.  If false, then don't run a
+    *     line-level diff first to identify the changed areas.
+    *     If true, then run a faster, slightly less optimal diff.
+    * @param {number} deadline Time when the diff should be complete by.
+    * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffCompute = function (text1, text2, checklines, deadline) {
+  		var diffs, longtext, shorttext, i, hm, text1A, text2A, text1B, text2B, midCommon, diffsA, diffsB;
+
+  		if (!text1) {
+
+  			// Just add some text (speedup).
+  			return [[DIFF_INSERT, text2]];
+  		}
+
+  		if (!text2) {
+
+  			// Just delete some text (speedup).
+  			return [[DIFF_DELETE, text1]];
+  		}
+
+  		longtext = text1.length > text2.length ? text1 : text2;
+  		shorttext = text1.length > text2.length ? text2 : text1;
+  		i = longtext.indexOf(shorttext);
+  		if (i !== -1) {
+
+  			// Shorter text is inside the longer text (speedup).
+  			diffs = [[DIFF_INSERT, longtext.substring(0, i)], [DIFF_EQUAL, shorttext], [DIFF_INSERT, longtext.substring(i + shorttext.length)]];
+
+  			// Swap insertions for deletions if diff is reversed.
+  			if (text1.length > text2.length) {
+  				diffs[0][0] = diffs[2][0] = DIFF_DELETE;
+  			}
+  			return diffs;
+  		}
+
+  		if (shorttext.length === 1) {
+
+  			// Single character string.
+  			// After the previous speedup, the character can't be an equality.
+  			return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]];
+  		}
+
+  		// Check to see if the problem can be split in two.
+  		hm = this.diffHalfMatch(text1, text2);
+  		if (hm) {
+
+  			// A half-match was found, sort out the return data.
+  			text1A = hm[0];
+  			text1B = hm[1];
+  			text2A = hm[2];
+  			text2B = hm[3];
+  			midCommon = hm[4];
+
+  			// Send both pairs off for separate processing.
+  			diffsA = this.DiffMain(text1A, text2A, checklines, deadline);
+  			diffsB = this.DiffMain(text1B, text2B, checklines, deadline);
+
+  			// Merge the results.
+  			return diffsA.concat([[DIFF_EQUAL, midCommon]], diffsB);
+  		}
+
+  		if (checklines && text1.length > 100 && text2.length > 100) {
+  			return this.diffLineMode(text1, text2, deadline);
+  		}
+
+  		return this.diffBisect(text1, text2, deadline);
+  	};
+
+  	/**
+    * Do the two texts share a substring which is at least half the length of the
+    * longer text?
+    * This speedup can produce non-minimal diffs.
+    * @param {string} text1 First string.
+    * @param {string} text2 Second string.
+    * @return {Array.<string>} Five element Array, containing the prefix of
+    *     text1, the suffix of text1, the prefix of text2, the suffix of
+    *     text2 and the common middle.  Or null if there was no match.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffHalfMatch = function (text1, text2) {
+  		var longtext, shorttext, dmp, text1A, text2B, text2A, text1B, midCommon, hm1, hm2, hm;
+
+  		longtext = text1.length > text2.length ? text1 : text2;
+  		shorttext = text1.length > text2.length ? text2 : text1;
+  		if (longtext.length < 4 || shorttext.length * 2 < longtext.length) {
+  			return null; // Pointless.
+  		}
+  		dmp = this; // 'this' becomes 'window' in a closure.
+
+  		/**
+     * Does a substring of shorttext exist within longtext such that the substring
+     * is at least half the length of longtext?
+     * Closure, but does not reference any external variables.
+     * @param {string} longtext Longer string.
+     * @param {string} shorttext Shorter string.
+     * @param {number} i Start index of quarter length substring within longtext.
+     * @return {Array.<string>} Five element Array, containing the prefix of
+     *     longtext, the suffix of longtext, the prefix of shorttext, the suffix
+     *     of shorttext and the common middle.  Or null if there was no match.
+     * @private
+     */
+  		function diffHalfMatchI(longtext, shorttext, i) {
+  			var seed, j, bestCommon, prefixLength, suffixLength, bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB;
+
+  			// Start with a 1/4 length substring at position i as a seed.
+  			seed = longtext.substring(i, i + Math.floor(longtext.length / 4));
+  			j = -1;
+  			bestCommon = "";
+  			while ((j = shorttext.indexOf(seed, j + 1)) !== -1) {
+  				prefixLength = dmp.diffCommonPrefix(longtext.substring(i), shorttext.substring(j));
+  				suffixLength = dmp.diffCommonSuffix(longtext.substring(0, i), shorttext.substring(0, j));
+  				if (bestCommon.length < suffixLength + prefixLength) {
+  					bestCommon = shorttext.substring(j - suffixLength, j) + shorttext.substring(j, j + prefixLength);
+  					bestLongtextA = longtext.substring(0, i - suffixLength);
+  					bestLongtextB = longtext.substring(i + prefixLength);
+  					bestShorttextA = shorttext.substring(0, j - suffixLength);
+  					bestShorttextB = shorttext.substring(j + prefixLength);
+  				}
+  			}
+  			if (bestCommon.length * 2 >= longtext.length) {
+  				return [bestLongtextA, bestLongtextB, bestShorttextA, bestShorttextB, bestCommon];
+  			} else {
+  				return null;
+  			}
+  		}
+
+  		// First check if the second quarter is the seed for a half-match.
+  		hm1 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 4));
+
+  		// Check again based on the third quarter.
+  		hm2 = diffHalfMatchI(longtext, shorttext, Math.ceil(longtext.length / 2));
+  		if (!hm1 && !hm2) {
+  			return null;
+  		} else if (!hm2) {
+  			hm = hm1;
+  		} else if (!hm1) {
+  			hm = hm2;
+  		} else {
+
+  			// Both matched.  Select the longest.
+  			hm = hm1[4].length > hm2[4].length ? hm1 : hm2;
+  		}
+
+  		// A half-match was found, sort out the return data.
+  		if (text1.length > text2.length) {
+  			text1A = hm[0];
+  			text1B = hm[1];
+  			text2A = hm[2];
+  			text2B = hm[3];
+  		} else {
+  			text2A = hm[0];
+  			text2B = hm[1];
+  			text1A = hm[2];
+  			text1B = hm[3];
+  		}
+  		midCommon = hm[4];
+  		return [text1A, text1B, text2A, text2B, midCommon];
+  	};
+
+  	/**
+    * Do a quick line-level diff on both strings, then rediff the parts for
+    * greater accuracy.
+    * This speedup can produce non-minimal diffs.
+    * @param {string} text1 Old string to be diffed.
+    * @param {string} text2 New string to be diffed.
+    * @param {number} deadline Time when the diff should be complete by.
+    * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffLineMode = function (text1, text2, deadline) {
+  		var a, diffs, linearray, pointer, countInsert, countDelete, textInsert, textDelete, j;
+
+  		// Scan the text on a line-by-line basis first.
+  		a = this.diffLinesToChars(text1, text2);
+  		text1 = a.chars1;
+  		text2 = a.chars2;
+  		linearray = a.lineArray;
+
+  		diffs = this.DiffMain(text1, text2, false, deadline);
+
+  		// Convert the diff back to original text.
+  		this.diffCharsToLines(diffs, linearray);
+
+  		// Eliminate freak matches (e.g. blank lines)
+  		this.diffCleanupSemantic(diffs);
+
+  		// Rediff any replacement blocks, this time character-by-character.
+  		// Add a dummy entry at the end.
+  		diffs.push([DIFF_EQUAL, ""]);
+  		pointer = 0;
+  		countDelete = 0;
+  		countInsert = 0;
+  		textDelete = "";
+  		textInsert = "";
+  		while (pointer < diffs.length) {
+  			switch (diffs[pointer][0]) {
+  				case DIFF_INSERT:
+  					countInsert++;
+  					textInsert += diffs[pointer][1];
+  					break;
+  				case DIFF_DELETE:
+  					countDelete++;
+  					textDelete += diffs[pointer][1];
+  					break;
+  				case DIFF_EQUAL:
+
+  					// Upon reaching an equality, check for prior redundancies.
+  					if (countDelete >= 1 && countInsert >= 1) {
+
+  						// Delete the offending records and add the merged ones.
+  						diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert);
+  						pointer = pointer - countDelete - countInsert;
+  						a = this.DiffMain(textDelete, textInsert, false, deadline);
+  						for (j = a.length - 1; j >= 0; j--) {
+  							diffs.splice(pointer, 0, a[j]);
+  						}
+  						pointer = pointer + a.length;
+  					}
+  					countInsert = 0;
+  					countDelete = 0;
+  					textDelete = "";
+  					textInsert = "";
+  					break;
+  			}
+  			pointer++;
+  		}
+  		diffs.pop(); // Remove the dummy entry at the end.
+
+  		return diffs;
+  	};
+
+  	/**
+    * Find the 'middle snake' of a diff, split the problem in two
+    * and return the recursively constructed diff.
+    * See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations.
+    * @param {string} text1 Old string to be diffed.
+    * @param {string} text2 New string to be diffed.
+    * @param {number} deadline Time at which to bail if not yet complete.
+    * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffBisect = function (text1, text2, deadline) {
+  		var text1Length, text2Length, maxD, vOffset, vLength, v1, v2, x, delta, front, k1start, k1end, k2start, k2end, k2Offset, k1Offset, x1, x2, y1, y2, d, k1, k2;
+
+  		// Cache the text lengths to prevent multiple calls.
+  		text1Length = text1.length;
+  		text2Length = text2.length;
+  		maxD = Math.ceil((text1Length + text2Length) / 2);
+  		vOffset = maxD;
+  		vLength = 2 * maxD;
+  		v1 = new Array(vLength);
+  		v2 = new Array(vLength);
+
+  		// Setting all elements to -1 is faster in Chrome & Firefox than mixing
+  		// integers and undefined.
+  		for (x = 0; x < vLength; x++) {
+  			v1[x] = -1;
+  			v2[x] = -1;
+  		}
+  		v1[vOffset + 1] = 0;
+  		v2[vOffset + 1] = 0;
+  		delta = text1Length - text2Length;
+
+  		// If the total number of characters is odd, then the front path will collide
+  		// with the reverse path.
+  		front = delta % 2 !== 0;
+
+  		// Offsets for start and end of k loop.
+  		// Prevents mapping of space beyond the grid.
+  		k1start = 0;
+  		k1end = 0;
+  		k2start = 0;
+  		k2end = 0;
+  		for (d = 0; d < maxD; d++) {
+
+  			// Bail out if deadline is reached.
+  			if (new Date().getTime() > deadline) {
+  				break;
+  			}
+
+  			// Walk the front path one step.
+  			for (k1 = -d + k1start; k1 <= d - k1end; k1 += 2) {
+  				k1Offset = vOffset + k1;
+  				if (k1 === -d || k1 !== d && v1[k1Offset - 1] < v1[k1Offset + 1]) {
+  					x1 = v1[k1Offset + 1];
+  				} else {
+  					x1 = v1[k1Offset - 1] + 1;
+  				}
+  				y1 = x1 - k1;
+  				while (x1 < text1Length && y1 < text2Length && text1.charAt(x1) === text2.charAt(y1)) {
+  					x1++;
+  					y1++;
+  				}
+  				v1[k1Offset] = x1;
+  				if (x1 > text1Length) {
+
+  					// Ran off the right of the graph.
+  					k1end += 2;
+  				} else if (y1 > text2Length) {
+
+  					// Ran off the bottom of the graph.
+  					k1start += 2;
+  				} else if (front) {
+  					k2Offset = vOffset + delta - k1;
+  					if (k2Offset >= 0 && k2Offset < vLength && v2[k2Offset] !== -1) {
+
+  						// Mirror x2 onto top-left coordinate system.
+  						x2 = text1Length - v2[k2Offset];
+  						if (x1 >= x2) {
+
+  							// Overlap detected.
+  							return this.diffBisectSplit(text1, text2, x1, y1, deadline);
+  						}
+  					}
+  				}
+  			}
+
+  			// Walk the reverse path one step.
+  			for (k2 = -d + k2start; k2 <= d - k2end; k2 += 2) {
+  				k2Offset = vOffset + k2;
+  				if (k2 === -d || k2 !== d && v2[k2Offset - 1] < v2[k2Offset + 1]) {
+  					x2 = v2[k2Offset + 1];
+  				} else {
+  					x2 = v2[k2Offset - 1] + 1;
+  				}
+  				y2 = x2 - k2;
+  				while (x2 < text1Length && y2 < text2Length && text1.charAt(text1Length - x2 - 1) === text2.charAt(text2Length - y2 - 1)) {
+  					x2++;
+  					y2++;
+  				}
+  				v2[k2Offset] = x2;
+  				if (x2 > text1Length) {
+
+  					// Ran off the left of the graph.
+  					k2end += 2;
+  				} else if (y2 > text2Length) {
+
+  					// Ran off the top of the graph.
+  					k2start += 2;
+  				} else if (!front) {
+  					k1Offset = vOffset + delta - k2;
+  					if (k1Offset >= 0 && k1Offset < vLength && v1[k1Offset] !== -1) {
+  						x1 = v1[k1Offset];
+  						y1 = vOffset + x1 - k1Offset;
+
+  						// Mirror x2 onto top-left coordinate system.
+  						x2 = text1Length - x2;
+  						if (x1 >= x2) {
+
+  							// Overlap detected.
+  							return this.diffBisectSplit(text1, text2, x1, y1, deadline);
+  						}
+  					}
+  				}
+  			}
+  		}
+
+  		// Diff took too long and hit the deadline or
+  		// number of diffs equals number of characters, no commonality at all.
+  		return [[DIFF_DELETE, text1], [DIFF_INSERT, text2]];
+  	};
+
+  	/**
+    * Given the location of the 'middle snake', split the diff in two parts
+    * and recurse.
+    * @param {string} text1 Old string to be diffed.
+    * @param {string} text2 New string to be diffed.
+    * @param {number} x Index of split point in text1.
+    * @param {number} y Index of split point in text2.
+    * @param {number} deadline Time at which to bail if not yet complete.
+    * @return {!Array.<!DiffMatchPatch.Diff>} Array of diff tuples.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffBisectSplit = function (text1, text2, x, y, deadline) {
+  		var text1a, text1b, text2a, text2b, diffs, diffsb;
+  		text1a = text1.substring(0, x);
+  		text2a = text2.substring(0, y);
+  		text1b = text1.substring(x);
+  		text2b = text2.substring(y);
+
+  		// Compute both diffs serially.
+  		diffs = this.DiffMain(text1a, text2a, false, deadline);
+  		diffsb = this.DiffMain(text1b, text2b, false, deadline);
+
+  		return diffs.concat(diffsb);
+  	};
+
+  	/**
+    * Reduce the number of edits by eliminating semantically trivial equalities.
+    * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
+    */
+  	DiffMatchPatch.prototype.diffCleanupSemantic = function (diffs) {
+  		var changes, equalities, equalitiesLength, lastequality, pointer, lengthInsertions2, lengthDeletions2, lengthInsertions1, lengthDeletions1, deletion, insertion, overlapLength1, overlapLength2;
+  		changes = false;
+  		equalities = []; // Stack of indices where equalities are found.
+  		equalitiesLength = 0; // Keeping our own length var is faster in JS.
+  		/** @type {?string} */
+  		lastequality = null;
+
+  		// Always equal to diffs[equalities[equalitiesLength - 1]][1]
+  		pointer = 0; // Index of current position.
+
+  		// Number of characters that changed prior to the equality.
+  		lengthInsertions1 = 0;
+  		lengthDeletions1 = 0;
+
+  		// Number of characters that changed after the equality.
+  		lengthInsertions2 = 0;
+  		lengthDeletions2 = 0;
+  		while (pointer < diffs.length) {
+  			if (diffs[pointer][0] === DIFF_EQUAL) {
+  				// Equality found.
+  				equalities[equalitiesLength++] = pointer;
+  				lengthInsertions1 = lengthInsertions2;
+  				lengthDeletions1 = lengthDeletions2;
+  				lengthInsertions2 = 0;
+  				lengthDeletions2 = 0;
+  				lastequality = diffs[pointer][1];
+  			} else {
+  				// An insertion or deletion.
+  				if (diffs[pointer][0] === DIFF_INSERT) {
+  					lengthInsertions2 += diffs[pointer][1].length;
+  				} else {
+  					lengthDeletions2 += diffs[pointer][1].length;
+  				}
+
+  				// Eliminate an equality that is smaller or equal to the edits on both
+  				// sides of it.
+  				if (lastequality && lastequality.length <= Math.max(lengthInsertions1, lengthDeletions1) && lastequality.length <= Math.max(lengthInsertions2, lengthDeletions2)) {
+
+  					// Duplicate record.
+  					diffs.splice(equalities[equalitiesLength - 1], 0, [DIFF_DELETE, lastequality]);
+
+  					// Change second copy to insert.
+  					diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
+
+  					// Throw away the equality we just deleted.
+  					equalitiesLength--;
+
+  					// Throw away the previous equality (it needs to be reevaluated).
+  					equalitiesLength--;
+  					pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1;
+
+  					// Reset the counters.
+  					lengthInsertions1 = 0;
+  					lengthDeletions1 = 0;
+  					lengthInsertions2 = 0;
+  					lengthDeletions2 = 0;
+  					lastequality = null;
+  					changes = true;
+  				}
+  			}
+  			pointer++;
+  		}
+
+  		// Normalize the diff.
+  		if (changes) {
+  			this.diffCleanupMerge(diffs);
+  		}
+
+  		// Find any overlaps between deletions and insertions.
+  		// e.g: <del>abcxxx</del><ins>xxxdef</ins>
+  		//   -> <del>abc</del>xxx<ins>def</ins>
+  		// e.g: <del>xxxabc</del><ins>defxxx</ins>
+  		//   -> <ins>def</ins>xxx<del>abc</del>
+  		// Only extract an overlap if it is as big as the edit ahead or behind it.
+  		pointer = 1;
+  		while (pointer < diffs.length) {
+  			if (diffs[pointer - 1][0] === DIFF_DELETE && diffs[pointer][0] === DIFF_INSERT) {
+  				deletion = diffs[pointer - 1][1];
+  				insertion = diffs[pointer][1];
+  				overlapLength1 = this.diffCommonOverlap(deletion, insertion);
+  				overlapLength2 = this.diffCommonOverlap(insertion, deletion);
+  				if (overlapLength1 >= overlapLength2) {
+  					if (overlapLength1 >= deletion.length / 2 || overlapLength1 >= insertion.length / 2) {
+
+  						// Overlap found.  Insert an equality and trim the surrounding edits.
+  						diffs.splice(pointer, 0, [DIFF_EQUAL, insertion.substring(0, overlapLength1)]);
+  						diffs[pointer - 1][1] = deletion.substring(0, deletion.length - overlapLength1);
+  						diffs[pointer + 1][1] = insertion.substring(overlapLength1);
+  						pointer++;
+  					}
+  				} else {
+  					if (overlapLength2 >= deletion.length / 2 || overlapLength2 >= insertion.length / 2) {
+
+  						// Reverse overlap found.
+  						// Insert an equality and swap and trim the surrounding edits.
+  						diffs.splice(pointer, 0, [DIFF_EQUAL, deletion.substring(0, overlapLength2)]);
+
+  						diffs[pointer - 1][0] = DIFF_INSERT;
+  						diffs[pointer - 1][1] = insertion.substring(0, insertion.length - overlapLength2);
+  						diffs[pointer + 1][0] = DIFF_DELETE;
+  						diffs[pointer + 1][1] = deletion.substring(overlapLength2);
+  						pointer++;
+  					}
+  				}
+  				pointer++;
+  			}
+  			pointer++;
+  		}
+  	};
+
+  	/**
+    * Determine if the suffix of one string is the prefix of another.
+    * @param {string} text1 First string.
+    * @param {string} text2 Second string.
+    * @return {number} The number of characters common to the end of the first
+    *     string and the start of the second string.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffCommonOverlap = function (text1, text2) {
+  		var text1Length, text2Length, textLength, best, length, pattern, found;
+
+  		// Cache the text lengths to prevent multiple calls.
+  		text1Length = text1.length;
+  		text2Length = text2.length;
+
+  		// Eliminate the null case.
+  		if (text1Length === 0 || text2Length === 0) {
+  			return 0;
+  		}
+
+  		// Truncate the longer string.
+  		if (text1Length > text2Length) {
+  			text1 = text1.substring(text1Length - text2Length);
+  		} else if (text1Length < text2Length) {
+  			text2 = text2.substring(0, text1Length);
+  		}
+  		textLength = Math.min(text1Length, text2Length);
+
+  		// Quick check for the worst case.
+  		if (text1 === text2) {
+  			return textLength;
+  		}
+
+  		// Start by looking for a single character match
+  		// and increase length until no match is found.
+  		// Performance analysis: https://neil.fraser.name/news/2010/11/04/
+  		best = 0;
+  		length = 1;
+  		while (true) {
+  			pattern = text1.substring(textLength - length);
+  			found = text2.indexOf(pattern);
+  			if (found === -1) {
+  				return best;
+  			}
+  			length += found;
+  			if (found === 0 || text1.substring(textLength - length) === text2.substring(0, length)) {
+  				best = length;
+  				length++;
+  			}
+  		}
+  	};
+
+  	/**
+    * Split two texts into an array of strings.  Reduce the texts to a string of
+    * hashes where each Unicode character represents one line.
+    * @param {string} text1 First string.
+    * @param {string} text2 Second string.
+    * @return {{chars1: string, chars2: string, lineArray: !Array.<string>}}
+    *     An object containing the encoded text1, the encoded text2 and
+    *     the array of unique strings.
+    *     The zeroth element of the array of unique strings is intentionally blank.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffLinesToChars = function (text1, text2) {
+  		var lineArray, lineHash, chars1, chars2;
+  		lineArray = []; // E.g. lineArray[4] === 'Hello\n'
+  		lineHash = {}; // E.g. lineHash['Hello\n'] === 4
+
+  		// '\x00' is a valid character, but various debuggers don't like it.
+  		// So we'll insert a junk entry to avoid generating a null character.
+  		lineArray[0] = "";
+
+  		/**
+     * Split a text into an array of strings.  Reduce the texts to a string of
+     * hashes where each Unicode character represents one line.
+     * Modifies linearray and linehash through being a closure.
+     * @param {string} text String to encode.
+     * @return {string} Encoded string.
+     * @private
+     */
+  		function diffLinesToCharsMunge(text) {
+  			var chars, lineStart, lineEnd, lineArrayLength, line;
+  			chars = "";
+
+  			// Walk the text, pulling out a substring for each line.
+  			// text.split('\n') would would temporarily double our memory footprint.
+  			// Modifying text would create many large strings to garbage collect.
+  			lineStart = 0;
+  			lineEnd = -1;
+
+  			// Keeping our own length variable is faster than looking it up.
+  			lineArrayLength = lineArray.length;
+  			while (lineEnd < text.length - 1) {
+  				lineEnd = text.indexOf("\n", lineStart);
+  				if (lineEnd === -1) {
+  					lineEnd = text.length - 1;
+  				}
+  				line = text.substring(lineStart, lineEnd + 1);
+  				lineStart = lineEnd + 1;
+
+  				if (lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) : lineHash[line] !== undefined) {
+  					chars += String.fromCharCode(lineHash[line]);
+  				} else {
+  					chars += String.fromCharCode(lineArrayLength);
+  					lineHash[line] = lineArrayLength;
+  					lineArray[lineArrayLength++] = line;
+  				}
+  			}
+  			return chars;
+  		}
+
+  		chars1 = diffLinesToCharsMunge(text1);
+  		chars2 = diffLinesToCharsMunge(text2);
+  		return {
+  			chars1: chars1,
+  			chars2: chars2,
+  			lineArray: lineArray
+  		};
+  	};
+
+  	/**
+    * Rehydrate the text in a diff from a string of line hashes to real lines of
+    * text.
+    * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
+    * @param {!Array.<string>} lineArray Array of unique strings.
+    * @private
+    */
+  	DiffMatchPatch.prototype.diffCharsToLines = function (diffs, lineArray) {
+  		var x, chars, text, y;
+  		for (x = 0; x < diffs.length; x++) {
+  			chars = diffs[x][1];
+  			text = [];
+  			for (y = 0; y < chars.length; y++) {
+  				text[y] = lineArray[chars.charCodeAt(y)];
+  			}
+  			diffs[x][1] = text.join("");
+  		}
+  	};
+
+  	/**
+    * Reorder and merge like edit sections.  Merge equalities.
+    * Any edit section can move as long as it doesn't cross an equality.
+    * @param {!Array.<!DiffMatchPatch.Diff>} diffs Array of diff tuples.
+    */
+  	DiffMatchPatch.prototype.diffCleanupMerge = function (diffs) {
+  		var pointer, countDelete, countInsert, textInsert, textDelete, commonlength, changes, diffPointer, position;
+  		diffs.push([DIFF_EQUAL, ""]); // Add a dummy entry at the end.
+  		pointer = 0;
+  		countDelete = 0;
+  		countInsert = 0;
+  		textDelete = "";
+  		textInsert = "";
+
+  		while (pointer < diffs.length) {
+  			switch (diffs[pointer][0]) {
+  				case DIFF_INSERT:
+  					countInsert++;
+  					textInsert += diffs[pointer][1];
+  					pointer++;
+  					break;
+  				case DIFF_DELETE:
+  					countDelete++;
+  					textDelete += diffs[pointer][1];
+  					pointer++;
+  					break;
+  				case DIFF_EQUAL:
+
+  					// Upon reaching an equality, check for prior redundancies.
+  					if (countDelete + countInsert > 1) {
+  						if (countDelete !== 0 && countInsert !== 0) {
+
+  							// Factor out any common prefixes.
+  							commonlength = this.diffCommonPrefix(textInsert, textDelete);
+  							if (commonlength !== 0) {
+  								if (pointer - countDelete - countInsert > 0 && diffs[pointer - countDelete - countInsert - 1][0] === DIFF_EQUAL) {
+  									diffs[pointer - countDelete - countInsert - 1][1] += textInsert.substring(0, commonlength);
+  								} else {
+  									diffs.splice(0, 0, [DIFF_EQUAL, textInsert.substring(0, commonlength)]);
+  									pointer++;
+  								}
+  								textInsert = textInsert.substring(commonlength);
+  								textDelete = textDelete.substring(commonlength);
+  							}
+
+  							// Factor out any common suffixies.
+  							commonlength = this.diffCommonSuffix(textInsert, textDelete);
+  							if (commonlength !== 0) {
+  								diffs[pointer][1] = textInsert.substring(textInsert.length - commonlength) + diffs[pointer][1];
+  								textInsert = textInsert.substring(0, textInsert.length - commonlength);
+  								textDelete = textDelete.substring(0, textDelete.length - commonlength);
+  							}
+  						}
+
+  						// Delete the offending records and add the merged ones.
+  						if (countDelete === 0) {
+  							diffs.splice(pointer - countInsert, countDelete + countInsert, [DIFF_INSERT, textInsert]);
+  						} else if (countInsert === 0) {
+  							diffs.splice(pointer - countDelete, countDelete + countInsert, [DIFF_DELETE, textDelete]);
+  						} else {
+  							diffs.splice(pointer - countDelete - countInsert, countDelete + countInsert, [DIFF_DELETE, textDelete], [DIFF_INSERT, textInsert]);
+  						}
+  						pointer = pointer - countDelete - countInsert + (countDelete ? 1 : 0) + (countInsert ? 1 : 0) + 1;
+  					} else if (pointer !== 0 && diffs[pointer - 1][0] === DIFF_EQUAL) {
+
+  						// Merge this equality with the previous one.
+  						diffs[pointer - 1][1] += diffs[pointer][1];
+  						diffs.splice(pointer, 1);
+  					} else {
+  						pointer++;
+  					}
+  					countInsert = 0;
+  					countDelete = 0;
+  					textDelete = "";
+  					textInsert = "";
+  					break;
+  			}
+  		}
+  		if (diffs[diffs.length - 1][1] === "") {
+  			diffs.pop(); // Remove the dummy entry at the end.
+  		}
+
+  		// Second pass: look for single edits surrounded on both sides by equalities
+  		// which can be shifted sideways to eliminate an equality.
+  		// e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC
+  		changes = false;
+  		pointer = 1;
+
+  		// Intentionally ignore the first and last element (don't need checking).
+  		while (pointer < diffs.length - 1) {
+  			if (diffs[pointer - 1][0] === DIFF_EQUAL && diffs[pointer + 1][0] === DIFF_EQUAL) {
+
+  				diffPointer = diffs[pointer][1];
+  				position = diffPointer.substring(diffPointer.length - diffs[pointer - 1][1].length);
+
+  				// This is a single edit surrounded by equalities.
+  				if (position === diffs[pointer - 1][1]) {
+
+  					// Shift the edit over the previous equality.
+  					diffs[pointer][1] = diffs[pointer - 1][1] + diffs[pointer][1].substring(0, diffs[pointer][1].length - diffs[pointer - 1][1].length);
+  					diffs[pointer + 1][1] = diffs[pointer - 1][1] + diffs[pointer + 1][1];
+  					diffs.splice(pointer - 1, 1);
+  					changes = true;
+  				} else if (diffPointer.substring(0, diffs[pointer + 1][1].length) === diffs[pointer + 1][1]) {
+
+  					// Shift the edit over the next equality.
+  					diffs[pointer - 1][1] += diffs[pointer + 1][1];
+  					diffs[pointer][1] = diffs[pointer][1].substring(diffs[pointer + 1][1].length) + diffs[pointer + 1][1];
+  					diffs.splice(pointer + 1, 1);
+  					changes = true;
+  				}
+  			}
+  			pointer++;
+  		}
+
+  		// If shifts were made, the diff needs reordering and another shift sweep.
+  		if (changes) {
+  			this.diffCleanupMerge(diffs);
+  		}
+  	};
+
+  	return function (o, n) {
+  		var diff, output, text;
+  		diff = new DiffMatchPatch();
+  		output = diff.DiffMain(o, n);
+  		diff.diffCleanupEfficiency(output);
+  		text = diff.diffPrettyHtml(output);
+
+  		return text;
+  	};
+  }();
+
+}((function() { return this; }())));
diff --git a/vendor/assets/javascripts/run-qunit.js b/vendor/assets/javascripts/run-qunit.js
index 7f0335fea55..d614ade7250 100644
--- a/vendor/assets/javascripts/run-qunit.js
+++ b/vendor/assets/javascripts/run-qunit.js
@@ -36,7 +36,7 @@ page.open(args[0], function(status) {
   } else {
     page.evaluate(logQUnit);
 
-    var timeout = parseInt(args[1] || 200000, 10),
+    var timeout = parseInt(args[1] || 300000, 10),
         start = Date.now();
 
     var interval = setInterval(function() {
diff --git a/vendor/gems/discourse_imgur/Gemfile b/vendor/gems/discourse_imgur/Gemfile
deleted file mode 100644
index fcb7fdc2990..00000000000
--- a/vendor/gems/discourse_imgur/Gemfile
+++ /dev/null
@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-group :test do
-  gem 'rails'  
-  gem 'rspec'  
-  gem 'mocha'
-end
-
-# TODO: We need our own gem server 
-gem 'discourse_plugin', path: '../discourse_plugin'
-
-# Specify your gem's dependencies in rails_multisite.gemspec
-gemspec
diff --git a/vendor/gems/discourse_imgur/LICENSE.txt b/vendor/gems/discourse_imgur/LICENSE.txt
deleted file mode 100644
index 864fc8d8dbc..00000000000
--- a/vendor/gems/discourse_imgur/LICENSE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2013 Régis Hanol
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/gems/discourse_imgur/README.md b/vendor/gems/discourse_imgur/README.md
deleted file mode 100644
index a266e8fc361..00000000000
--- a/vendor/gems/discourse_imgur/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# DiscourseImgur
-
-Add support for Imgur storage
\ No newline at end of file
diff --git a/vendor/gems/discourse_imgur/Rakefile b/vendor/gems/discourse_imgur/Rakefile
deleted file mode 100755
index 56bb7292a1e..00000000000
--- a/vendor/gems/discourse_imgur/Rakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:test) do |spec|
-    spec.pattern = 'spec/*_spec.rb'
-end
diff --git a/vendor/gems/discourse_imgur/discourse_imgur.gemspec b/vendor/gems/discourse_imgur/discourse_imgur.gemspec
deleted file mode 100644
index c3a5eac8eca..00000000000
--- a/vendor/gems/discourse_imgur/discourse_imgur.gemspec
+++ /dev/null
@@ -1,23 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'discourse_imgur/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "discourse_imgur"
-  spec.version       = DiscourseImgur::VERSION
-  spec.authors       = ["Régis Hanol"]
-  spec.email         = ["regis@hanol.fr"]
-  spec.description   = %q{Add support for Imgur}
-  spec.summary       = %q{Add support for Imgur}
-  spec.homepage      = ""
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-end
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur.rb b/vendor/gems/discourse_imgur/lib/discourse_imgur.rb
deleted file mode 100644
index 5ee2b66908f..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require "discourse_imgur/version"
-require 'discourse_imgur/engine' if defined?(Rails) && (!Rails.env.test?)
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/engine.rb b/vendor/gems/discourse_imgur/lib/discourse_imgur/engine.rb
deleted file mode 100644
index 4b1ca1262bb..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/engine.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'discourse_imgur/plugin'
-
-module DiscourseImgur
-  
-  class Engine < Rails::Engine
-
-    engine_name 'discourse_imgur'
-
-    initializer "discourse_imgur.configure_rails_initialization" do |app|
-
-      app.config.after_initialize do
-        DiscoursePluginRegistry.setup(DiscourseImgur::Plugin)
-      end
-
-    end
-
-  end
-
-end
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/imgur.rb b/vendor/gems/discourse_imgur/lib/discourse_imgur/imgur.rb
deleted file mode 100644
index 1e4f084a059..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/imgur.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'rest_client'
-
-# /!\ WARNING /!\
-# This plugin has been extracted from the Discourse source code and has not been tested.
-# It really needs some love <3
-# /!\ WARNING /!\
-
-
-module Imgur
-
-  def self.store_file(file, image_info, upload_id)
-    raise Discourse::SiteSettingMissing.new("imgur_endpoint")   if SiteSetting.imgur_endpoint.blank?
-    raise Discourse::SiteSettingMissing.new("imgur_client_id")  if SiteSetting.imgur_client_id.blank?
-
-    @imgur_loaded = require 'imgur' unless @imgur_loaded
-
-    blob = file.read
-
-    response = RestClient.post(
-      SiteSetting.imgur_endpoint,
-      { image: Base64.encode64(blob) },
-      { 'Authorization' => "ClientID #{SiteSetting.imgur_client_id}" }
-    )
-
-    json = JSON.parse(response.body)['data'] rescue nil
-
-    return nil if json.blank?
-    return json['link']
-  end
-
-end
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ar.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ar.yml
deleted file mode 100644
index 5762c78cd6b..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ar.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-ar:
-  site_settings:
-    enable_imgur: "فعّل واجهة برمجة التطبيقات لموقع Imgur للرفع، لا تستضف الملفات محلّيّا"
-    imgur_client_id: "معرّفك على imgur.com مطلوب لرفع الصور"
-    imgur_client_secret: "سرّ العميل (Client secret) على imgur.com. ليس مطلوبا حاليا لرفع الصور، ولكن قد يكون كذلك لاحقا."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.bs_BA.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.bs_BA.yml
deleted file mode 100644
index c38ed551f0b..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.bs_BA.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-bs_BA:
-  site_settings:
-    enable_imgur: "Enable imgur api for uploading, don't host files locally"
-    imgur_client_id: "Your imgur.com client ID, required for image upload to function"
-    imgur_client_secret: "Your imgur.com client secret. Not currently required for image upload to function, but may be at some point."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.cs.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.cs.yml
deleted file mode 100644
index 4b3df7e8107..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.cs.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-cs:
-  site_settings:
-    enable_imgur: "Používat imgur pro ukládání obrázků, nehostovat obrázky lokálně"
-    imgur_client_id: "Přístupový klíč 'client ID' pro imgur.com - vyžadováno pro upload obrázků"
-    imgur_client_secret: "Přístupový klíč 'client secret' pro imgur.com - vyžadováno pro upload obrázků"
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.da.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.da.yml
deleted file mode 100644
index fdc220122e4..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.da.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-da:
-  site_settings:
-    enable_imgur: "Slå imgur api til for upload, gem ikke filer lokalt"
-    imgur_client_id: "Dit imgur.com klient ID, nødvendigt for billed upload funktionen"
-    imgur_client_secret: "Din imgur.com client secret. ikke nødvendig i øjeblikket for billed upload funktionen, men måske nødvendig i fremtiden."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.de.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.de.yml
deleted file mode 100644
index 1191c76d539..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.de.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-de:
-  site_settings:
-    enable_imgur: "Aktiviere die imgur API zum Hochladen, sodass Dateien nicht lokal gehostet werden."
-    imgur_client_id: "Deine imgur.com Client-ID. Diese wird benötigt, um Bilder hochladen zu können."
-    imgur_client_secret: "Dein imgur.com Client-Secret. Dieses wird zurzeit für das Hochladen von Bildern nicht benötigt, könnte aber in Zukunft benötigt werden."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.el.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.el.yml
deleted file mode 100644
index baaa21e4178..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.el.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-el:
-  site_settings:
-    enable_imgur: "Να ενεργοποιηθεί το API  του imgur για το ανέβασμα εικόνων. Έτσι τα αρχεία δε θα φιλοξενούνται τοπικά στο διακομιστή."
-    imgur_client_id: "Το αναγνωριστικό ID του imgur.com απαιτείται για να λειτουργήσει το ανέβασμα εικόνων."
-    imgur_client_secret: "Ο μυστικός κωδικός για το imgur.com. Δεν απαιτείται για την λειτουργία ανεβάσματος των εικόνων, αλλά μπορεί να χρειαστεί στο μέλλον."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.en.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.en.yml
deleted file mode 100644
index f56be13979f..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.en.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# encoding: utf-8
-#
-# This file contains content for the server portion of Discourse used by Ruby
-#
-# To work with us on translations, see:
-# https://www.transifex.com/projects/p/discourse-org/
-#
-# This is a "source" file, which is used by Transifex to get translations for other languages.
-# After this file is changed, it needs to be pushed by a maintainer to Transifex:
-#
-#   tx push -s
-#
-# Read more here: https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882
-#
-# To validate this YAML file after you change it, please paste it into
-# http://yamllint.com/
-
-en:
-  site_settings:
-    enable_imgur: "Enable imgur api for uploading, don't host files locally"
-    imgur_client_id: "Your imgur.com client ID, required for image upload to function"
-    imgur_client_secret: "Your imgur.com client secret. Not currently required for image upload to function, but may be at some point."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.es.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.es.yml
deleted file mode 100644
index 61c3687dc50..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.es.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-es:
-  site_settings:
-    enable_imgur: "Activar la api de imgur para subir imágenes, no almacenarlas como archivos en local"
-    imgur_client_id: "Tu ID de cliente en imgur.com - requerido para la función de subida de imágenes"
-    imgur_client_secret: "Tu clave secreta de cliente en imgur.com - actualmente no requerido para la función de subida de imágenes, pero podría requerirse en algún momento"
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.et.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.et.yml
deleted file mode 100644
index 6fa6c194dfe..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.et.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-et:
-  site_settings:
-    enable_imgur: "Luba imgur api üleslaadimiseks, ära hoia faile lokaalselt"
-    imgur_client_id: "Sinu imgur.com kliendi-ID, vaja piltide üleslaadimiseks"
-    imgur_client_secret: "Sinu imgur.com kliendi saladus. Ei ole hetkel vaja piltide üleslaadimise toimimiseks aga võib tulevikus vajalikuks osutuda."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.fa_IR.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.fa_IR.yml
deleted file mode 100644
index d5004390ca9..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.fa_IR.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-fa_IR:
-  site_settings:
-    enable_imgur: "API Iimgur را برای بارگذاری  فعال کنید. فایل ها را بصورت محلی میزبانی نکنید."
-    imgur_client_id: "شناسه مشتری imgur.com شما٬ برای آپلود تصویر به عملکرد مورد نیاز است "
-    imgur_client_secret: "مقدال client secret خود در سایت imgur.com شاید برای کارکرد آپلود عکس نیاز نباشد، ولی ممکن است برای قسمت‌های دیگر نیاز باشد."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.fi.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.fi.yml
deleted file mode 100644
index 4fe83f5e04b..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.fi.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-fi:
-  site_settings:
-    enable_imgur: "Lataa kuvat imguriin käyttäen apia, älä tallenna kuvia paikallisesti palvelimelle"
-    imgur_client_id: "Imgur.com client ID, vaaditaan kuvien lataamiseksi"
-    imgur_client_secret: "Client secret -salausavaimesi Imgur.comissa. Ei tällä hetkellä pakollinen kuvien lataamiseksi, mutta saattaa tulla pakolliseksi tulevaisuudessa."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.fr.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.fr.yml
deleted file mode 100644
index 3433035a822..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.fr.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-fr:
-  site_settings:
-    enable_imgur: "Activer l'envoi des images avec l'API imgur, ne stockera pas les fichiers localement"
-    imgur_client_id: "Votre ID client imgur.com, requis pour que l'envoi d'images fonctionne."
-    imgur_client_secret: "Votre secret imgur.com. Pas nécessaire pour que l'envoi d'image fonctionne, mais pourrais le devenir."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.gl.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.gl.yml
deleted file mode 100644
index 0823370a17b..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.gl.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-gl:
-  site_settings:
-    enable_imgur: "Activar a api de imgur para enviar, non gardar ficheiros localmente"
-    imgur_client_id: "ID do teu cliente de imgur.com, requirido para que funcione o envío de imaxes"
-    imgur_client_secret: "O teu secreto para o cliente de imgur.com. Non requirido neste intre para enviar imaxes pero quizais posteriormente."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.he.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.he.yml
deleted file mode 100644
index 113de6bfd24..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.he.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-he:
-  site_settings:
-    enable_imgur: "אפשר להעלות imgur API, אל תאכסן קבצים באופן מקומי."
-    imgur_client_id: "זהות הלקוח (Client ID) שלך ב-imgur.com נדרשת לשם העלאת התמונה."
-    imgur_client_secret: "סיסמת הלקוח (client secret) שלך לא נדרשת כרגע כדי לאפשר העלאת התמונה, אבל עשוייה להידרש בשלב כלשהו בהמשך."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.id.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.id.yml
deleted file mode 100644
index a649611aef3..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.id.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-id:
-  site_settings:
-    enable_imgur: "Aktifkan api imgur untuk pengunggahan, jangan menghost berkas secara lokal"
-    imgur_client_id: "Client ID imgur.com Anda, diperlukan untuk unggah gambar"
-    imgur_client_secret: "Klien imgur.com anda rahasia. Tidak dibutuhkan untuk fungsi mengungggah gambar, tapi bisa juga dibutuhkan pada titik tertentu."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.it.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.it.yml
deleted file mode 100644
index c725c179d18..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.it.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-it:
-  site_settings:
-    enable_imgur: "Utilizza le api imgur per l'upload, non salvare file in locale"
-    imgur_client_id: "Il tuo ID utente imgur.com, necessario affinché funzioni il caricamento immagini"
-    imgur_client_secret: "La tua password imgur.com. Attualmente non richiesta affinché funzioni il caricamento immagini, ma potrebbe esserlo in futuro."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ja.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ja.yml
deleted file mode 100644
index 32f9bbc0f85..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ja.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-ja:
-  site_settings:
-    enable_imgur: "アップロードするため、imgur apiを有効にしています、ファイルはローカルにホストされません"
-    imgur_client_id: "画像をアップロードするためには、imgur.comのアカウントが必要です。"
-    imgur_client_secret: "あなたのimgur.comクライアントは秘密です。今は使用されていない画像アップロードに必要です、しかしいずれは必要になるでしょう。"
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ko.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ko.yml
deleted file mode 100644
index 6c373f5d89b..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ko.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-ko:
-  site_settings:
-    enable_imgur: "로컬에 이미지를 저장하지 않고 imgur api를 통해 이미지 업로드 활성화. "
-    imgur_client_id: "이미지 업로드를 위해 imgur.com의 client ID 가 필요합니다."
-    imgur_client_secret: "imgur.com의 클라이언트 secret 키. 현재 이미지 업로드 기능에선 필수가 아니지만 언젠가 필요합니다."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.nb_NO.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.nb_NO.yml
deleted file mode 100644
index 00d96483865..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.nb_NO.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-nb_NO:
-  site_settings:
-    enable_imgur: "Aktiver imgurs API for opplasting, ikke lagre filene lokalt"
-    imgur_client_id: "Din klient-ID for imgur.com, påkrevet for at bildeopplasting skal fungere"
-    imgur_client_secret: "Din client secret for imgur.com. Denne er for øyeblikket ikke påkrevet for opplasting av bilder, men kan bli det i fremtiden."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.nl.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.nl.yml
deleted file mode 100644
index f03ea5a5bce..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.nl.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-nl:
-  site_settings:
-    enable_imgur: "De imgur-API voor uploaden inschakelen, bestanden niet lokaal hosten"
-    imgur_client_id: "Je client-ID voor imgur.com, nodig om afbeeldingen te kunnen uploaden"
-    imgur_client_secret: "Je clientgeheim voor imgur.com. Op dit moment nog niet nodig voor het uploaden van afbeeldingen, mogelijk later wel."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.pl_PL.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.pl_PL.yml
deleted file mode 100644
index 057e2409fd8..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.pl_PL.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-pl_PL:
-  site_settings:
-    enable_imgur: "Włącz Imgur API, aby przesyłać pliki - nie przechowuj plików lokalnie."
-    imgur_client_id: "Twój \"client_id\" z imgur.com, wymagany przez funkcję przesyłania plików."
-    imgur_client_secret: "Twój parametr \"client_secret\" z Imgur.com. Aktualnie nie wymagany dla funkcji przesyłania obrazów, jednak może stać się wymagany w przyszłości."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.pt.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.pt.yml
deleted file mode 100644
index a1dfb056660..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.pt.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-pt:
-  site_settings:
-    enable_imgur: "Ativar a API do imgur para carregamento, não armazenar ficheiros localmente"
-    imgur_client_id: "O seu ID de cliente do imgur.com, necessário para ativar o carregamento de imagens"
-    imgur_client_secret: "A sua chave privada de cliente do imgur.com. Não é necessária de momento para o carregamento de imagens, mas pode vir a ser no futuro."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.pt_BR.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.pt_BR.yml
deleted file mode 100644
index 43875263386..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.pt_BR.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-pt_BR:
-  site_settings:
-    enable_imgur: "Ligar a api do imgur para upload, para não hospedar arquivos localmente"
-    imgur_client_id: "Seu client ID do imgur.com, necessário para a função de upload de imagem"
-    imgur_client_secret: "Seu client secret do imgur.com. Não é necessário para upload de imagem, mas pode ser em algum momento."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ro.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ro.yml
deleted file mode 100644
index 31204c8dae0..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ro.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-ro:
-  site_settings:
-    enable_imgur: "Activează API-ul imgur pentru încărcare, nu găzdui fişiere local"
-    imgur_client_id: "ID-ul de client imgur.com este necesar pentru ca încărcarea de imagini să funcționeze"
-    imgur_client_secret: "Cheia secretă de client imgur.com. Nu este necesar în mod curent pentru ca încărcarea de imagini să funcționeze, dar ar putea fi la un moment dat."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ru.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ru.yml
deleted file mode 100644
index ef88ca99729..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ru.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-ru:
-  site_settings:
-    enable_imgur: "Загружать картинки на imgur.com с помощью API, чтобы не хранить их локально на своем сервере"
-    imgur_client_id: "ID клиента на imgur.com для загрузки картинок"
-    imgur_client_secret: "Секретный код imgur.com для загрузки картинок. На данном этапе не используется, но может быть задействован со временем."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.sk.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.sk.yml
deleted file mode 100644
index 60f6f6db4e3..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.sk.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-sk:
-  site_settings:
-    enable_imgur: "Zapnúť imgur api pre upload, nehostujte súbory lokálne"
-    imgur_client_id: "Vaše imgur.com klientské ID potrebné pre funkčnosť uploadu obrázku"
-    imgur_client_secret: "Váš imgur.com klientský kľúč. Nie je aktuálne potrebný pre funkčnosť uploadu obrázkov, ale je možné že v budúcnosti bude."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.sq.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.sq.yml
deleted file mode 100644
index 1270a7125f0..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.sq.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-sq:
-  site_settings:
-    enable_imgur: "Aktivizo api-n e imgur për ngarkimin, skedarët nuk mbarten lokalisht"
-    imgur_client_id: "Për ngarkimit e fileve në imgur.com kërkohet ID-ja juaj e klientit"
-    imgur_client_secret: "Kyçi juaj sekret për imgur.com. Nuk është e domosdoshme për ngarkimin e imazheve, por mund të nevojitet në të ardhmen."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.sv.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.sv.yml
deleted file mode 100644
index a1b522afcab..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.sv.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-sv:
-  site_settings:
-    enable_imgur: "Använd imgur för uppladdning istället för att spara lokalt"
-    imgur_client_id: "Ditt klient-ID på imgur.com, krävs för uppladdning av bilder ska fungera"
-    imgur_client_secret: "Din klient-hemlighet på imgur.com. Ej obligatorisk för uppladdning av bilder just nu, men kan komma att bli i framtiden."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.te.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.te.yml
deleted file mode 100644
index 9f65aef693b..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.te.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-te:
-  site_settings:
-    enable_imgur: "దస్త్రాలు స్థానికంగా ఉంచవద్దు. imgur ను చేతనం చేయి"
-    imgur_client_id: "మీ imgur.com క్లైంట్ ఐడీ. బొమ్మ ఎగుమతి ప్రమేయానికి కావాలి."
-    imgur_client_secret: "మీ imgur.com క్లైంట్ రహస్యం. ప్రస్తుతం బొమ్మ ఎగుమతించు ప్రమేయానికి అవసరం లేదు, కానీ భవిష్యత్తులో అవసరం కావచ్చు."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.tr_TR.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.tr_TR.yml
deleted file mode 100644
index a9c90a45cc4..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.tr_TR.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-tr_TR:
-  site_settings:
-    enable_imgur: "Yükleme için imgur api'sini etkinleştirin, dosyaları yerel olarak barındırmayın"
-    imgur_client_id: "Imgur.com kullanıcı ID'niz, fotoğraf yükleme işlevi için gerekli"
-    imgur_client_secret: "Imgur.com kullanıcı anahtarınız. Fotoğraf yükleme işlevi için şu an gerekli değil, ama ileride bazı durumlarda gerekli olabilir."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.uk.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.uk.yml
deleted file mode 100644
index 5a24cdaf53f..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.uk.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-uk:
-  site_settings:
-    enable_imgur: "Завантажувати зображення на imgur замість того, щоб зберігати їх локально"
-    imgur_client_id: "Ваше client ID imgur.com. Необхідне для завантаження зображень"
-    imgur_client_secret: "Ваш секретний ключ imgur.com. Зараз його можна не вказувати, але він може знадобитися."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ur.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ur.yml
deleted file mode 100644
index ad976dd5cdc..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ur.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-ur:
-  site_settings:
-    enable_imgur: " اپلوڈنگ کیلئے imgur API فعال کریں، مقامی طور پر فائلوں کو سٹور نہ کریں۔"
-    imgur_client_id: "آپ کی imgur.com کلائنٹ ID، تصویر اّپلوڈ کرنے کے لئے درکار ہے۔"
-    imgur_client_secret: "آپ کا imgur.com کلائنٹ سیکرٹ۔ فی الحالل تصویر اپ لوڈ کرنے کے لئے ضروری نہیں، لیکن مستقبل میں ضرورت پر سکتی ہے۔"
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.vi.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.vi.yml
deleted file mode 100644
index ffcb6d19b8b..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.vi.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-vi:
-  site_settings:
-    enable_imgur: "Kích hoạt Imgur API để tải file lên, ảnh của bạn sẽ được lưu trữ bởi dịch vụ của Imgur."
-    imgur_client_id: "Bạn cần Client ID của imgur.com cho chức năng tải file lên."
-    imgur_client_secret: "Client secret của bạn tại imgur.com chưa cần để kích hoạt chức năng tải file lên, nhưng nó sẽ cần trong tương lai khi bạn sử dụng chức năng này."
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.zh_CN.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.zh_CN.yml
deleted file mode 100644
index 89e9b86536d..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.zh_CN.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-zh_CN:
-  site_settings:
-    enable_imgur: "上传文件到 imgur，不在本地存储"
-    imgur_client_id: "你的 imgur.com client ID，启用图片上传必填"
-    imgur_client_secret: "你的 imgur.com 客户密钥。目前不需要此密钥即可使用上传图片功能，但可能在以后会用到。"
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.zh_TW.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.zh_TW.yml
deleted file mode 100644
index a904776c4fa..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.zh_TW.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# encoding: utf-8
-#
-# Never edit this file. It will be overwritten when translations are pulled from Transifex.
-#
-# To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-org/
-
-zh_TW:
-  site_settings:
-    enable_imgur: "啟用 imgur API 來上傳檔案，檔案不保存於伺服器上"
-    imgur_client_id: "你的 imgur.com 的客戶端 ID，以便圖片上傳能正常運作。"
-    imgur_client_secret: "你的 imgur.com 的客戶端 secret。目前圖片上傳功能並不需要這項資訊，但將來可能需要。"
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/plugin.rb b/vendor/gems/discourse_imgur/lib/discourse_imgur/plugin.rb
deleted file mode 100644
index 700c4e7a007..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/plugin.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'discourse_plugin'
-
-# /!\ WARNING /!\
-# This plugin has been extracted from the Discourse source code and has not been tested.
-# It really needs some love <3
-# /!\ WARNING /!\
-
-module DiscourseImgur
-
-  class Plugin < DiscoursePlugin
-
-    def setup
-      # add_setting(:enable_imgur, false)
-      # add_setting(:imgur_client_id, '')
-      # add_setting(:imgur_endpoint, "https://api.imgur.com/3/image.json")
-
-      # TODO: Mix the following logic in Upload#store_file
-      # return Imgur.store_file(file, image_info, upload_id) if SiteSetting.enable_imgur?
-    end
-
-  end
-
-end
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/version.rb b/vendor/gems/discourse_imgur/lib/discourse_imgur/version.rb
deleted file mode 100644
index 5b5ab058a41..00000000000
--- a/vendor/gems/discourse_imgur/lib/discourse_imgur/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module DiscourseImgur
-  VERSION = "0.0.1"
-end
diff --git a/vendor/gems/discourse_imgur/spec/imgur_spec.rb b/vendor/gems/discourse_imgur/spec/imgur_spec.rb
deleted file mode 100644
index b350ad5dc69..00000000000
--- a/vendor/gems/discourse_imgur/spec/imgur_spec.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'spec_helper'
-require 'discourse_imgur/imgur'
-
-# /!\ WARNING /!\
-# This plugin has been extracted from the Discourse source code and has not been tested.
-# It really needs some love <3
-# /!\ WARNING /!\
-
-describe Imgur do
-
-  describe "store_file" do
-
-    let(:file) { Rails.root.join('app', 'assets', 'images', 'logo.png') }
-    let(:image_info) { FastImage.new(file) }
-    let(:params) { [SiteSetting.imgur_endpoint, { image: Base64.encode64(file.read) }, { 'Authorization' => "ClientID #{SiteSetting.imgur_client_id}" }] }
-
-    before(:each) do
-      SiteSetting.stubs(:imgur_endpoint).returns("imgur_endpoint")
-      SiteSetting.stubs(:imgur_client_id).returns("imgur_client_id")
-    end
-
-    it 'returns the url of the Imgur upload if successful' do
-      json = {
-        data: {
-          id: 'fake',
-          link: 'http://imgur.com/fake.png',
-          deletehash: 'a3kaoad30'
-        },
-        success: true,
-        status: 200
-      }.to_json
-
-      response = mock
-      response.expects(:body).returns(json)
-      RestClient.expects(:post).with(*params).returns(response)
-
-      Imgur.store_file(file, image_info, 1).should == 'http://imgur.com/fake.png'
-    end
-
-    it 'returns nil if the request fails' do
-      json = {
-        success: false,
-        status: 400
-      }.to_json
-
-      response = mock
-      response.expects(:body).returns(json)
-      RestClient.expects(:post).with(*params).returns(response)
-
-      Imgur.store_file(file, image_info, 1).should be_nil
-    end
-
-  end
-
-end
diff --git a/vendor/gems/discourse_imgur/spec/spec_helper.rb b/vendor/gems/discourse_imgur/spec/spec_helper.rb
deleted file mode 100644
index e8279d775a9..00000000000
--- a/vendor/gems/discourse_imgur/spec/spec_helper.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'rubygems'
-require 'rails'
-
-ENV["RAILS_ENV"] ||= 'test'
-
-RSpec.configure do |config|
-
-  config.mock_framework = :mocha
-  config.color_enabled = true
-
-end